diff --git a/.circleci/OWNERS b/.circleci/OWNERS
index 002922bb9cc9..69a88bfe0386 100644
--- a/.circleci/OWNERS
+++ b/.circleci/OWNERS
@@ -4,7 +4,7 @@
 {
   rules: [
     {
-      owners: [{name: 'ampproject/wg-infra'}, {name: 'rsimha', notify: true}],
+      owners: [{name: 'ampproject/wg-infra'}],
     },
   ],
 }
diff --git a/.circleci/check_config.sh b/.circleci/check_config.sh
index 3732eeeef7c5..f2bce219d9b5 100755
--- a/.circleci/check_config.sh
+++ b/.circleci/check_config.sh
@@ -11,8 +11,8 @@ RED() { echo -e "\033[0;31m$1\033[0m"; }
 YELLOW() { echo -e "\033[0;33m$1\033[0m"; }
 CYAN() { echo -e "\033[0;36m$1\033[0m"; }
 
-# Push builds are only run against the main branch and amp-release branches.
-if [[ "$CIRCLE_BRANCH" == "main" || "$CIRCLE_BRANCH" =~ ^amp-release-* ]]; then
+# Push builds are only run against the main, nightly, and amp-release branches.
+if [[ "$CIRCLE_BRANCH" == "main" || "$CIRCLE_BRANCH" == "nightly" || "$CIRCLE_BRANCH" =~ ^amp-release-* ]]; then
   echo $(GREEN "Nothing to do because $CIRCLE_BRANCH is not a PR branch.")
   exit 0
 fi
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0fa4cc316e17..9b22ac658fbe 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,8 +1,10 @@
 version: 2.1
 
 orbs:
-  browser-tools: circleci/browser-tools@1.2.3
-  node: circleci/node@4.7.0
+  browser-tools: circleci/browser-tools@1.5.1
+  codecov: codecov/codecov@5.0.0
+  macos: circleci/macos@2.5.2
+  node: circleci/node@6.3.0
 
 push_and_pr_builds: &push_and_pr_builds
   filters:
@@ -10,13 +12,6 @@ push_and_pr_builds: &push_and_pr_builds
       ignore:
         - nightly
 
-push_builds_only: &push_builds_only
-  filters:
-    branches:
-      only:
-        - main
-        - /^amp-release-.*$/
-
 release_builds_only: &release_builds_only
   filters:
     branches:
@@ -24,14 +19,6 @@ release_builds_only: &release_builds_only
         - nightly
         - /^amp-release-.*$/
 
-pr_builds_only: &pr_builds_only
-  filters:
-    branches:
-      ignore:
-        - main
-        - /^amp-release-.*$/
-        - nightly
-
 experiment_job: &experiment_job
   parameters:
     exp:
@@ -39,12 +26,30 @@ experiment_job: &experiment_job
       type: enum
       enum: ['A', 'B', 'C']
   environment:
-    EXP: << parameters.exp >>
+    FLAVOR: experiment<< parameters.exp >>
+
+dist_job: &dist_job
+  parameters:
+    module:
+      description: 'Whether to build Module or Nomodule'
+      type: enum
+      enum: ['Module', 'Nomodule']
+    purpose:
+      description: 'What is the downstream purpose of this build'
+      type: enum
+      enum: ['Test', 'Bundle Size']
+
+test_types_job: &test_types_job
+  parameters:
+    test_type:
+      description: 'Which test type to run'
+      type: enum
+      enum: ['Unit', 'Integration', 'End-to-End']
 
 executors:
   base-docker-small:
     docker:
-      - image: cimg/base:stable
+      - image: cimg/base:current
     resource_class: small
   node-docker-medium:
     docker:
@@ -58,76 +63,118 @@ executors:
     docker:
       - image: cimg/node:lts-browsers
     resource_class: xlarge
-  jdk-docker-xlarge:
+  jdk-docker-2xlarge:
     docker:
-      - image: cimg/openjdk:17.0-node
-    resource_class: xlarge
+      - image: cimg/openjdk:21.0.5-node
+    resource_class: 2xlarge
   macos-medium:
     macos:
-      xcode: 12.4.0
-    resource_class: medium
+      xcode: 15.3.0
+    resource_class: macos.m1.medium.gen1
 
 commands:
   checkout_repo:
-    parameters:
-      save-git-cache:
-        type: boolean
-        default: false
     steps:
       - restore_cache:
-          name: 'Restore Git Cache'
+          name: '♻️ Restore Git Cache'
           keys:
-            - git-cache-{{ arch }}-v2-{{ .Branch }}-{{ .Revision }}
-            - git-cache-{{ arch }}-v2-{{ .Branch }}-
-            - git-cache-{{ arch }}-v2-
+            - git-cache-{{ arch }}-v3-main-{{ .Revision }}
+            - git-cache-{{ arch }}-v3-main-
+            - git-cache-{{ arch }}-v3-
       - checkout
       - when:
-          condition: << parameters.save-git-cache >>
+          condition:
+            equal: ['main', << pipeline.git.branch >>]
           steps:
+            - run:
+                name: '🗜️ Garbage Collection for Git'
+                command: git gc --auto
             - save_cache:
-                name: 'Save Git Cache'
-                key: git-cache-{{ arch }}-v2-{{ .Branch }}-{{ .Revision }}
+                name: '💾 Save Git Cache'
+                key: git-cache-{{ arch }}-v3-main-{{ .Revision }}
                 paths:
                   - .git
-  setup_node_environment:
-    steps:
-      - node/install:
-          lts: true
-          install-npm: false
-      - node/install-packages
   setup_vm:
+    parameters:
+      is-initializing-job:
+        description: 'True when this is an initializing job, which would perform several caching and workspace setup steps'
+        type: boolean
+        default: false
+      node-version:
+        type: string
+        default: 'lts/*'
     steps:
-      - attach_workspace:
-          at: /tmp
-      - run:
-          name: 'Configure Temporary Workspace'
-          command: |
-            mv /tmp/workspace /tmp/restored-workspace
-            mkdir -p /tmp/workspace
-      - run:
-          name: 'Maybe Gracefully Halt'
-          command: /tmp/restored-workspace/maybe_gracefully_halt.sh
-      - checkout_repo
+      - unless:
+          condition: << parameters.is-initializing-job >>
+          steps:
+            - checkout_repo
+            - attach_workspace:
+                at: /tmp
+            - run:
+                name: '⚙️ Configure Temporary Workspace'
+                command: |
+                  mv /tmp/workspace /tmp/restored-workspace
+                  mkdir -p /tmp/workspace
+            - run:
+                name: '❓ Maybe Gracefully Halt'
+                command: /tmp/restored-workspace/maybe_gracefully_halt.sh
+            - run:
+                name: '⚙️ Configure Development Environment'
+                command: |
+                  ./.circleci/fetch_merge_commit.sh
+                  ./.circleci/restore_build_output.sh
+                  cat ./build-system/test-configs/hosts | sudo tee -a /etc/hosts
+      - restore_cache:
+          name: '♻️ Restore nvm Cache'
+          keys:
+            - nvm-cache-{{ arch }}-v2-<< parameters.node-version >>-
       - run:
-          name: 'Configure Development Environment'
-          command: |
-            ./.circleci/fetch_merge_commit.sh
-            ./.circleci/restore_build_output.sh
-            cat ./build-system/test-configs/hosts | sudo tee -a /etc/hosts
-      - setup_node_environment
+          name: '♻️ Create .nvmrc file'
+          command: echo << parameters.node-version >> > .nvmrc
+      - node/install
+      - when:
+          condition: << parameters.is-initializing-job >>
+          steps:
+            - run:
+                name: '⚙️ Create nvm Cache Checksum File'
+                command: node -v > ~/.node-version
+            - save_cache:
+                name: '💾 Save nvm Cache'
+                key: nvm-cache-{{ arch }}-v2-<< parameters.node-version >>-{{ checksum "~/.node-version" }}
+                paths:
+                  - ~/.nvm/.cache
+      - restore_cache:
+          name: '♻️ Restore node_modules/ Cache'
+          keys:
+            - node-modules-cache-{{ arch }}-v3-{{ checksum "package-lock.json" }}
+      - when:
+          condition: << parameters.is-initializing-job >>
+          steps:
+            - run:
+                name: '💿 Install npm Packages'
+                command: if [[ ! -d node_modules/ ]]; then npm ci; fi
+            - save_cache:
+                name: '💾 Save node_modules/ Cache'
+                key: node-modules-cache-{{ arch }}-v3-{{ checksum "package-lock.json" }}
+                paths:
+                  - node_modules/
   teardown_vm:
     steps:
       - persist_to_workspace:
+          name: '📁 Persist Temporary Workspace'
           root: /tmp
           paths:
             - workspace
   install_chrome:
     steps:
       - run:
-          name: 'Get Pinned Chrome Version'
+          name: '⚙️ Get Pinned Chrome Version'
           command: ./.circleci/get_pinned_chrome_version.sh
+      - run:
+          name: '💿 Update list of available apt packages'
+          command: sudo apt update
       - browser-tools/install-chrome:
-          chrome-version: ${CHROME_VERSION}
+          # chrome-version is set in ./.circleci/get_pinned_chrome_version.sh, see files for details.
           replace-existing: true
       - browser-tools/install-chromedriver
   install_firefox:
@@ -136,25 +183,17 @@ commands:
   install_edge:
     steps:
       - run:
-          name: 'Install Microsoft Edge'
+          name: '💿 Install Microsoft Edge'
           command: ./.circleci/install_microsoft_edge.sh
-  enable_safari_automation:
-    steps:
-      - run:
-          name: 'Enable Safari Automation'
-          command: |
-            defaults write com.apple.Safari AllowRemoteAutomation 1
-            defaults write com.apple.Safari IncludeDevelopMenu 1
-            sudo safaridriver --enable
   store_test_output:
     steps:
-      - store_artifacts:
-          path: result-reports
       - store_test_results:
+          name: '⬆️ Store Test Results'
           path: result-reports
   store_filelist:
     steps:
       - store_artifacts:
+          name: '⬆️ Store Artifact filelist.txt'
           path: /tmp/filelist.txt
   skip_on_push_builds:
     steps:
@@ -165,26 +204,34 @@ commands:
               value: << pipeline.git.branch >>
           steps:
             - run:
-                name: 'Skip Job on Push Builds'
+                name: '➡️ Skip Job on Push Builds'
                 command: circleci-agent step halt
 
 jobs:
   initialize_repository:
     executor:
-      name: base-docker-small
+      name: node-docker-medium
     steps:
-      - checkout_repo:
-          save-git-cache: true
+      - checkout_repo
       - run:
-          name: 'Initialize Repository'
+          name: '⚙️ Initialize Repository'
           command: ./.circleci/initialize_repo.sh
       - run:
-          name: 'Check Config'
+          name: '🔍 Check Config'
           command: ./.circleci/check_config.sh
       - run:
-          name: 'Initialize Workspace'
+          name: '⚙️ Initialize Temporary Workspace'
           command: cp .circleci/maybe_gracefully_halt.sh /tmp/workspace
+      - setup_vm:
+          is-initializing-job: true
       - teardown_vm
+  initialize_mac_os:
+    executor:
+      name: macos-medium
+    steps:
+      - checkout_repo
+      - setup_vm:
+          is-initializing-job: true
   checks:
     executor:
       name: node-docker-medium
@@ -192,7 +239,7 @@ jobs:
       - setup_vm
       - install_chrome
       - run:
-          name: '⭐ Checks ⭐'
+          name: '⭐⭐⭐ Checks ⭐⭐⭐'
           command: node build-system/pr-check/checks.js
       - teardown_vm
   unminified_build:
@@ -201,55 +248,37 @@ jobs:
     steps:
       - setup_vm
       - run:
-          name: '⭐ Unminified Build ⭐'
+          name: '⭐⭐⭐ Unminified Build ⭐⭐⭐'
           command: node build-system/pr-check/unminified-build.js
       - teardown_vm
-  nomodule_build_test:
+  dist:
     executor:
       name: node-docker-xlarge
+    <<: *dist_job
+    parallelism: 3
     steps:
       - setup_vm
       - run:
-          name: '⭐ Nomodule Build ⭐'
-          command: node build-system/pr-check/nomodule-build.js
+          name: '⭐⭐⭐ << parameters.module >> Build (<< parameters.purpose >>) ⭐⭐⭐'
+          command: node build-system/pr-check/dist.js --type "<< parameters.module >> Build (<< parameters.purpose >>)"
       - teardown_vm
-  module_build_test:
+  dist_3p:
     executor:
       name: node-docker-xlarge
+    <<: *dist_job
     steps:
       - setup_vm
+      - when:
+          condition:
+            and:
+              - equal: ['Module', <<parameters.module >>]
+              - equal: ['Test', <<parameters.purpose >>]
+          steps:
+            # Required in the edge case where we need to run `amp visual-diff --empty` in this step. See build-system/pr-check/dist.js for details.
+            - install_chrome
       - run:
-          name: '⭐ Module Build ⭐'
-          command: node build-system/pr-check/module-build.js
-      - teardown_vm
-  nomodule_build_prod:
-    executor:
-      name: node-docker-xlarge
-    steps:
-      - setup_vm
-      - run:
-          name: '⭐ Nomodule Build ⭐'
-          command: node build-system/pr-check/bundle-size-nomodule-build.js
-      - teardown_vm
-  module_build_prod:
-    executor:
-      name: node-docker-xlarge
-    steps:
-      - setup_vm
-      - run:
-          name: '⭐ Module Build ⭐'
-          command: node build-system/pr-check/bundle-size-module-build.js
-      - teardown_vm
-  pr_deploy:
-    executor:
-      name: node-docker-medium
-    steps:
-      - setup_vm
-      - run:
-          name: '⭐ PR Deploy ⭐'
-          command: node build-system/pr-check/pr-deploy.js
-      - store_artifacts:
-          path: /tmp/artifacts/amp_nomodule_build.tar.gz
+          name: '⭐⭐⭐ << parameters.module >> 3p Build (<< parameters.purpose >>) ⭐⭐⭐'
+          command: node build-system/pr-check/dist.js --type "<< parameters.module >> 3p Build (<< parameters.purpose >>)"
       - teardown_vm
   bundle_size:
     executor:
@@ -257,19 +286,19 @@ jobs:
     steps:
       - setup_vm
       - run:
-          name: '⭐ Bundle Size ⭐'
+          name: '⭐⭐⭐ Bundle Size ⭐⭐⭐'
           command: node build-system/pr-check/bundle-size.js
       - teardown_vm
   validator_tests:
     executor:
-      name: jdk-docker-xlarge
+      name: jdk-docker-2xlarge
     steps:
       - setup_vm
       - run:
           name: 'Install Validator Dependencies'
           command: ./.circleci/install_validator_dependencies.sh
       - run:
-          name: '⭐ Validator Tests ⭐'
+          name: '⭐⭐⭐ Validator Tests ⭐⭐⭐'
           command: node build-system/pr-check/validator-tests.js
       - store_test_output
       - teardown_vm
@@ -278,8 +307,9 @@ jobs:
       name: node-docker-large
     steps:
       - setup_vm
+      - install_chrome
       - run:
-          name: '⭐ Visual Diff Tests ⭐'
+          name: '⭐⭐⭐ Visual Diff Tests ⭐⭐⭐'
           command: node build-system/pr-check/visual-diff-tests.js
       - store_test_output
       - teardown_vm
@@ -291,20 +321,24 @@ jobs:
       - setup_vm
       - install_chrome
       - run:
-          name: '⭐ Local Unit Tests ⭐'
+          name: '⭐⭐⭐ Local Unit Tests ⭐⭐⭐'
           command: node build-system/pr-check/unit-tests-local.js
       - store_test_output
       - teardown_vm
   all_unit_tests:
     executor:
-      name: node-docker-medium
+      name: node-docker-large
     parallelism: 6
     steps:
       - setup_vm
       - install_chrome
       - run:
-          name: '⭐ All Unit Tests ⭐'
+          name: '⭐⭐⭐ All Unit Tests ⭐⭐⭐'
           command: node build-system/pr-check/unit-tests.js
+      - codecov/upload:
+          disable_search: true
+          files: test/coverage/lcov-unit.info
+          flags: unit_tests
       - store_test_output
       - store_filelist
       - teardown_vm
@@ -315,8 +349,12 @@ jobs:
       - setup_vm
       - install_chrome
       - run:
-          name: '⭐ Unminified Tests ⭐'
+          name: '⭐⭐⭐ Unminified Tests ⭐⭐⭐'
           command: node build-system/pr-check/unminified-tests.js
+      - codecov/upload:
+          disable_search: true
+          files: test/coverage/lcov-integration.info
+          flags: integration_tests
       - store_test_output
       - teardown_vm
   nomodule_tests:
@@ -331,7 +369,7 @@ jobs:
       - setup_vm
       - install_chrome
       - run:
-          name: '⭐ Nomodule Tests (<< parameters.config >>) ⭐'
+          name: '⭐⭐⭐ Nomodule Tests (<< parameters.config >>) ⭐⭐⭐'
           command: node build-system/pr-check/nomodule-tests.js --config=<< parameters.config >>
       - store_test_output
       - teardown_vm
@@ -347,19 +385,19 @@ jobs:
       - setup_vm
       - install_chrome
       - run:
-          name: '⭐ Module Tests (<< parameters.config >>) ⭐'
+          name: '⭐⭐⭐ Module Tests (<< parameters.config >>) ⭐⭐⭐'
           command: node build-system/pr-check/module-tests.js --config=<< parameters.config >>
       - store_test_output
       - teardown_vm
   end_to_end_tests:
     executor:
-      name: node-docker-medium
+      name: node-docker-large
     parallelism: 6
     steps:
       - setup_vm
       - install_chrome
       - run:
-          name: '⭐ End-to-End Tests ⭐'
+          name: '⭐⭐⭐ End-to-End Tests ⭐⭐⭐'
           command: node build-system/pr-check/e2e-tests.js
       - store_test_output
       - store_filelist
@@ -367,45 +405,38 @@ jobs:
   browser_tests_safari:
     executor:
       name: macos-medium
+    <<: *test_types_job
     steps:
       - setup_vm
-      - enable_safari_automation
+      - macos/install-rosetta
+      - macos/add-safari-permissions
       - run:
-          name: '⭐ Browser Tests (Safari) ⭐'
-          command: node build-system/pr-check/browser-tests.js --browser=safari
+          name: '⭐⭐⭐ << parameters.test_type >> Tests (Safari) ⭐⭐⭐'
+          command: node build-system/pr-check/browser-tests.js --browser=safari --type=<< parameters.test_type >>
       - store_test_output
       - teardown_vm
   browser_tests_firefox:
     executor:
       name: node-docker-medium
+    <<: *test_types_job
     steps:
       - setup_vm
       - install_firefox
       - run:
-          name: '⭐ Browser Tests (Firefox) ⭐'
-          command: node build-system/pr-check/browser-tests.js --browser=firefox
+          name: '⭐⭐⭐ << parameters.test_type >> Tests (Firefox) ⭐⭐⭐'
+          command: node build-system/pr-check/browser-tests.js --browser=firefox --type=<< parameters.test_type >>
       - store_test_output
       - teardown_vm
   browser_tests_edge:
     executor:
       name: node-docker-medium
+    <<: *test_types_job
     steps:
       - setup_vm
       - install_edge
       - run:
-          name: '⭐ Browser Tests (Edge) ⭐'
-          command: node build-system/pr-check/browser-tests.js --browser=edge
-      - store_test_output
-      - teardown_vm
-  performance_tests:
-    executor:
-      name: node-docker-xlarge
-    steps:
-      - setup_vm
-      - install_chrome
-      - run:
-          name: '⭐ Performance Tests ⭐'
-          command: node build-system/pr-check/performance-tests.js
+          name: '⭐⭐⭐ << parameters.test_type >> Tests (Edge) ⭐⭐⭐'
+          command: node build-system/pr-check/browser-tests.js --browser=edge --type=<< parameters.test_type >>
       - store_test_output
       - teardown_vm
   experiment_build:
@@ -415,7 +446,7 @@ jobs:
     steps:
       - setup_vm
       - run:
-          name: '⭐ Experiment << parameters.exp >> Build ⭐'
+          name: '⭐⭐⭐ Experiment << parameters.exp >> Build ⭐⭐⭐'
           command: node build-system/pr-check/experiment-build.js --experiment=experiment<< parameters.exp >>
       - teardown_vm
   experiment_integration_tests:
@@ -426,7 +457,7 @@ jobs:
       - setup_vm
       - install_chrome
       - run:
-          name: '⭐ Experiment << parameters.exp >> Integration Tests ⭐'
+          name: '⭐⭐⭐ Experiment << parameters.exp >> Integration Tests ⭐⭐⭐'
           command: node build-system/pr-check/experiment-integration-tests.js --experiment=experiment<< parameters.exp >>
       - store_test_output
       - teardown_vm
@@ -439,7 +470,7 @@ jobs:
       - setup_vm
       - install_chrome
       - run:
-          name: '⭐ Experiment << parameters.exp >> End-to-End Tests ⭐'
+          name: '⭐⭐⭐ Experiment << parameters.exp >> End-to-End Tests ⭐⭐⭐'
           command: node build-system/pr-check/experiment-e2e-tests.js --experiment=experiment<< parameters.exp >>
       - store_test_output
       - store_filelist
@@ -457,13 +488,12 @@ jobs:
         type: enum
         enum: ['no-esm', 'esm']
     environment:
-      EXP: << parameters.flavor >>
       FLAVOR: << parameters.flavor >>
       ESM: << parameters.esm >>
     steps:
       - setup_vm
       - run:
-          name: '⭐ amp release ⭐'
+          name: '⭐⭐⭐ amp release ⭐⭐⭐'
           command: node --unhandled-rejections=strict build-system/release-workflows/build-release.js
       - teardown_vm
   upload_release:
@@ -472,11 +502,21 @@ jobs:
     steps:
       - setup_vm
       - run:
-          name: '⭐ Upload Release Artifacts ⭐'
+          name: '⭐⭐⭐ Upload Release Artifacts (to Cloudflare R2) ⭐⭐⭐'
           command: node --unhandled-rejections=strict build-system/release-workflows/upload-release.js
       - store_artifacts:
+          name: '⬆️ Upload Release Artifacts (to CircleCI)'
           path: /tmp/release.tar.gz
       - teardown_vm
+  trigger_promote:
+    executor:
+      name: base-docker-small
+    steps:
+      - setup_vm
+      - run:
+          name: '⭐⭐⭐ Trigger Promote Workflow ⭐⭐⭐'
+          command: node --unhandled-rejections=strict build-system/release-workflows/trigger-promote.js
+      - teardown_vm
 
 workflows:
   version: 2
@@ -486,6 +526,9 @@ workflows:
       - initialize_repository:
           name: 'Initialize Repository'
           <<: *push_and_pr_builds
+      - initialize_mac_os:
+          name: 'Initialize for Mac OS'
+          <<: *push_and_pr_builds
       - checks:
           name: 'Checks'
           <<: *push_and_pr_builds
@@ -496,37 +539,32 @@ workflows:
           <<: *push_and_pr_builds
           requires:
             - 'Initialize Repository'
-      - nomodule_build_test:
-          name: 'Nomodule Build (Test)'
-          <<: *push_and_pr_builds
-          requires:
-            - 'Initialize Repository'
-      - module_build_test:
-          name: 'Module Build (Test)'
-          <<: *push_and_pr_builds
-          requires:
-            - 'Initialize Repository'
-      - nomodule_build_prod:
-          name: 'Nomodule Build (Prod)'
+      - dist:
+          matrix:
+            parameters:
+              module: ['Module', 'Nomodule']
+              purpose: ['Test', 'Bundle Size']
+          name: '⛓️ << matrix.module >> Build (<< matrix.purpose >>)'
           <<: *push_and_pr_builds
           requires:
             - 'Initialize Repository'
-      - module_build_prod:
-          name: 'Module Build (Prod)'
+      - dist_3p:
+          matrix:
+            parameters:
+              module: ['Module', 'Nomodule']
+              purpose: ['Test', 'Bundle Size']
+          name: '<< matrix.module >> 3p Build (<< matrix.purpose >>)'
           <<: *push_and_pr_builds
           requires:
             - 'Initialize Repository'
-      - pr_deploy:
-          name: 'PR Deploy'
-          <<: *pr_builds_only
-          requires:
-            - 'Nomodule Build (Test)'
       - bundle_size:
           name: 'Bundle Size'
           <<: *push_and_pr_builds
           requires:
-            - 'Nomodule Build (Prod)'
-            - 'Module Build (Prod)'
+            - '⛓️ Nomodule Build (Bundle Size)'
+            - 'Nomodule 3p Build (Bundle Size)'
+            - '⛓️ Module Build (Bundle Size)'
+            - 'Module 3p Build (Bundle Size)'
       - validator_tests:
           name: 'Validator Tests'
           <<: *push_and_pr_builds
@@ -536,7 +574,10 @@ workflows:
           name: 'Visual Diff Tests'
           <<: *push_and_pr_builds
           requires:
-            - 'Nomodule Build (Test)'
+            - '⛓️ Module Build (Test)'
+            - 'Module 3p Build (Test)'
+            - '⛓️ Nomodule Build (Test)'
+            - 'Nomodule 3p Build (Test)'
       - local_unit_tests:
           name: 'Local Unit Tests'
           <<: *push_and_pr_builds
@@ -559,7 +600,8 @@ workflows:
               config: ['prod', 'canary']
           <<: *push_and_pr_builds
           requires:
-            - 'Nomodule Build (Test)'
+            - '⛓️ Nomodule Build (Test)'
+            - 'Nomodule 3p Build (Test)'
       - module_tests:
           name: 'Module Tests (<< matrix.config >>)'
           matrix:
@@ -567,28 +609,45 @@ workflows:
               config: ['prod', 'canary']
           <<: *push_and_pr_builds
           requires:
-            - 'Nomodule Build (Test)'
-            - 'Module Build (Test)'
+            - '⛓️ Module Build (Test)'
+            - 'Module 3p Build (Test)'
+            - '⛓️ Nomodule Build (Test)'
+            - 'Nomodule 3p Build (Test)'
       - end_to_end_tests:
           name: '⛓️ End-to-End Tests'
           <<: *push_and_pr_builds
           requires:
-            - 'Nomodule Build (Test)'
+            - '⛓️ Nomodule Build (Test)'
+            - 'Nomodule 3p Build (Test)'
       - browser_tests_safari:
-          name: 'Browser Tests (Safari)'
+          name: '<< matrix.test_type >> Tests (Safari)'
+          matrix:
+            parameters:
+              test_type: ['Unit', 'Integration', 'End-to-End']
           <<: *push_and_pr_builds
           requires:
-            - 'Nomodule Build (Test)'
+            - 'Initialize for Mac OS'
+            - '⛓️ Nomodule Build (Test)'
+            - 'Nomodule 3p Build (Test)'
       - browser_tests_firefox:
-          name: 'Browser Tests (Firefox)'
+          name: '<< matrix.test_type >> Tests (Firefox)'
+          matrix:
+            parameters:
+              test_type: ['Unit', 'Integration', 'End-to-End']
           <<: *push_and_pr_builds
           requires:
-            - 'Nomodule Build (Test)'
+            - '⛓️ Nomodule Build (Test)'
+            - 'Nomodule 3p Build (Test)'
       - browser_tests_edge:
-          name: 'Browser Tests (Edge)'
+          name: '<< matrix.test_type >> Tests (Edge)'
+          matrix:
+            parameters:
+              # Note: we can't run e2e tests on Edge.
+              test_type: ['Unit', 'Integration']
           <<: *push_and_pr_builds
           requires:
-            - 'Nomodule Build (Test)'
+            - '⛓️ Nomodule Build (Test)'
+            - 'Nomodule 3p Build (Test)'
       - experiment_build:
           name: 'Experiment << matrix.exp >> Build'
           matrix:
@@ -613,11 +672,6 @@ workflows:
           <<: *push_and_pr_builds
           requires:
             - 'Experiment << matrix.exp >> Build'
-      # TODO(wg-performance, #12128): This takes 30 mins and fails regularly.
-      # - performance_tests:
-      #     <<: *push_builds_only
-      #     requires:
-      #       - 'Nomodule Build (Test)'
 
   'Release':
     jobs:
@@ -640,3 +694,10 @@ workflows:
             - amp_release
           context:
             - release-build-uploader
+      - trigger_promote:
+          name: 'Trigger Promote'
+          <<: *release_builds_only
+          requires:
+            - 'Upload Release'
+          context:
+            - release-build-uploader
diff --git a/.circleci/get_pinned_chrome_version.sh b/.circleci/get_pinned_chrome_version.sh
index e83d83981001..51b6ff9b3445 100755
--- a/.circleci/get_pinned_chrome_version.sh
+++ b/.circleci/get_pinned_chrome_version.sh
@@ -46,12 +46,9 @@ echo "$(GREEN "Chrome version history URL is") $(CYAN "${CHROME_VERSION_HISTORY_
 # Determine the Chrome version
 # See https://developer.chrome.com/docs/versionhistory/guide
 echo "$(GREEN "Determining Chrome version...")"
-CHROME_VERSION="$(curl -sS ${CHROME_VERSION_HISTORY_URL} | jq -r ".versions[]|.version" | grep -m 1 "${CHROME_MAJOR_VERSION}\.")"
-if [[ -z "$CHROME_VERSION" ]]; then
-  echo "$(RED "Could not determine Chrome version")"
-  exit 1
-fi
+CHROME_VERSION="$(curl -sS --retry 3 ${CHROME_VERSION_HISTORY_URL} | jq -r ".versions[]|.version" | grep -m 1 "${CHROME_MAJOR_VERSION}\.[[:digit:]]\+.[[:digit:]]\+.[[:digit:]]\+")"
 echo "$(GREEN "Chrome version is") $(CYAN "${CHROME_VERSION}")"
 
-echo "export CHROME_VERSION=$CHROME_VERSION" >> $BASH_ENV
+# Workaround for https://github.com/CircleCI-Public/browser-tools-orb/issues/70
+echo "export ORB_PARAM_CHROME_VERSION=$CHROME_VERSION" >> $BASH_ENV
 echo $(GREEN "Successfully determined pinned version of Chrome")
diff --git a/.circleci/get_pr_number.sh b/.circleci/get_pr_number.sh
index c77f38513fbf..b9cde864da92 100755
--- a/.circleci/get_pr_number.sh
+++ b/.circleci/get_pr_number.sh
@@ -9,8 +9,8 @@ err=0
 GREEN() { echo -e "\033[0;32m$1\033[0m"; }
 YELLOW() { echo -e "\033[0;33m$1\033[0m"; }
 
-# Push builds are only run against the main branch and amp-release branches.
-if [[ "$CIRCLE_BRANCH" == "main" || "$CIRCLE_BRANCH" =~ ^amp-release-* ]]; then
+# Push builds are only run against the main, nightly, and amp-release branches.
+if [[ "$CIRCLE_BRANCH" == "main" || "$CIRCLE_BRANCH" == "nightly" || "$CIRCLE_BRANCH" =~ ^amp-release-* ]]; then
   echo $(GREEN "Nothing to do because $CIRCLE_BRANCH is not a PR branch.")
   # Warn if the build is linked to a PR on a different repo (known CircleCI bug).
   if [[ -n "$CIRCLE_PULL_REQUEST" && ! "$CIRCLE_PULL_REQUEST" =~ ^https://github.com/ampproject/amphtml* ]]; then
diff --git a/.circleci/install_microsoft_edge.sh b/.circleci/install_microsoft_edge.sh
index c7405d1fb295..99151e64a706 100755
--- a/.circleci/install_microsoft_edge.sh
+++ b/.circleci/install_microsoft_edge.sh
@@ -1,8 +1,7 @@
 #!/bin/bash
 #
-# Script used by AMP's CI builds to install Microsoft Edge Beta on CircleCI.
+# Script used by AMP's CI builds to install Microsoft Edge Stable on CircleCI.
 # Reference: https://www.microsoftedgeinsider.com/en-us/download?platform=linux-deb
-# TODO(rsimha): Switch from Beta to Stable once it's available.
 
 set -e
 
@@ -13,7 +12,7 @@ curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microso
 sudo install -o root -g root -m 644 microsoft.gpg /etc/apt/trusted.gpg.d/
 sudo sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/edge stable main" > /etc/apt/sources.list.d/microsoft-edge-dev.list'
 sudo rm microsoft.gpg
-sudo apt update && sudo apt install microsoft-edge-beta
-EDGE_BETA_BIN=`which microsoft-edge-beta`
-echo "export EDGE_BETA_BIN=${EDGE_BETA_BIN}" >> $BASH_ENV
+sudo apt update && sudo apt install microsoft-edge-stable
+EDGE_STABLE_BIN=`which microsoft-edge-stable`
+echo "export EDGE_STABLE_BIN=${EDGE_STABLE_BIN}" >> $BASH_ENV
 echo $(GREEN "Installation complete.")
diff --git a/.circleci/install_validator_dependencies.sh b/.circleci/install_validator_dependencies.sh
index 0bc77becfee2..e6e13bbcd490 100755
--- a/.circleci/install_validator_dependencies.sh
+++ b/.circleci/install_validator_dependencies.sh
@@ -13,7 +13,7 @@ sudo mv bazel.gpg /etc/apt/trusted.gpg.d/
 echo "deb [arch=amd64] https://storage.googleapis.com/bazel-apt stable jdk1.8" | sudo tee /etc/apt/sources.list.d/bazel.list
 
 echo $(GREEN "Updating and installing apt packages...")
-sudo apt update && sudo apt install bazel clang python3 python3-pip protobuf-compiler
+sudo apt update && sudo apt install bazel-5.4.0 clang python3 python3-pip protobuf-compiler
 
 echo $(GREEN "Installing protobuf python module...")
-pip3 install protobuf
+pip3 install protobuf==3.19.4
diff --git a/.circleci/maybe_gracefully_halt.sh b/.circleci/maybe_gracefully_halt.sh
index 4fe3ea84330d..656388355701 100755
--- a/.circleci/maybe_gracefully_halt.sh
+++ b/.circleci/maybe_gracefully_halt.sh
@@ -15,7 +15,7 @@ if ls /tmp/restored-workspace/.CI_GRACEFULLY_HALT_* 1>/dev/null 2>&1; then
   exit 0
 fi
 
-if [[ ${EXP} && ${EXP} != 'base' ]]; then
+if [[ ${FLAVOR} && ${FLAVOR} != 'base' ]]; then
   # Extract the commit SHA. For PR jobs, this is written to .CIRCLECI_MERGE_COMMIT.
   if [[ -f /tmp/restored-workspace/.CIRCLECI_MERGE_COMMIT ]]; then
     COMMIT_SHA="$(cat /tmp/restored-workspace/.CIRCLECI_MERGE_COMMIT)"
@@ -24,9 +24,9 @@ if [[ ${EXP} && ${EXP} != 'base' ]]; then
   fi
 
   # Do not proceed if the experiment config is missing a valid name, constant, or date.
-  EXPERIMENT_JSON=$(curl -sS "https://raw.githubusercontent.com/ampproject/amphtml/${COMMIT_SHA}/build-system/global-configs/experiments-config.json" | jq ".experiment${EXP}")
+  EXPERIMENT_JSON=$(curl -sS "https://raw.githubusercontent.com/ampproject/amphtml/${COMMIT_SHA}/build-system/global-configs/experiments-config.json" | jq ".${FLAVOR}")
   if ! echo "${EXPERIMENT_JSON}" | jq -e '.name,.define_experiment_constant,.expiration_date_utc'; then
-    echo $(YELLOW "Experiment ${EXP} is misconfigured, or does not exist.")
+    echo $(YELLOW "Flavor ${FLAVOR} is misconfigured, or does not exist.")
     echo $(GREEN "Gracefully halting this job")
     circleci-agent step halt
     exit 0
@@ -36,7 +36,7 @@ if [[ ${EXP} && ${EXP} != 'base' ]]; then
   CURRENT_TIMESTAMP=$(date --utc +'%s')
   EXPERIMENT_EXPIRATION_TIMESTAMP=$(date --utc --date $(echo "${EXPERIMENT_JSON}" | jq -er '.expiration_date_utc') +'%s')
   if [[ $CURRENT_TIMESTAMP -gt $EXPERIMENT_EXPIRATION_TIMESTAMP ]]; then
-    echo $(YELLOW "Experiment ${EXP} is expired.")
+    echo $(YELLOW "Flavor ${FLAVOR} is expired.")
     echo $(GREEN "Gracefully halting this job")
     circleci-agent step halt
     exit 0
diff --git a/.circleci/restore_build_output.sh b/.circleci/restore_build_output.sh
index e94fbc0a1793..688d989dcba4 100755
--- a/.circleci/restore_build_output.sh
+++ b/.circleci/restore_build_output.sh
@@ -25,13 +25,6 @@ if [[ -d "${WORKSPACE_DIR}/builds" ]]; then
         rsync -a "${RESTORED_DIR}/" "./${OUTPUT_DIR}"
       fi
     done
-    # Bento components are compiled inside the extension source file.
-    for RESTORED_COMPONENT_DIR in ${RESTORED_BUILD_DIR}/extensions/*/?.?/dist; do
-      OUTPUT_DIR=${RESTORED_COMPONENT_DIR##$RESTORED_BUILD_DIR/}
-      echo "*" $(GREEN "Merging") $(CYAN "${RESTORED_COMPONENT_DIR}") $(GREEN "into") $(CYAN "./${OUTPUT_DIR}")
-      mkdir -p $RESTORED_DIR
-      rsync -a "${RESTORED_COMPONENT_DIR}/" "./${OUTPUT_DIR}"
-    done
   done
 else
   echo $(YELLOW "Workspace does not contain any build outputs to restore")
diff --git a/.eslintplugin.js b/.eslint-plugin-local.js
similarity index 100%
rename from .eslintplugin.js
rename to .eslint-plugin-local.js
diff --git a/.eslintignore b/.eslintignore
index e5e331241b6b..3ff512febbea 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -19,8 +19,6 @@ validator/**
 .*cache
 .amp-dep-check
 build
-build-system/tasks/performance/cache
-build-system/tasks/performance/results.json
 dist
 dist.3p
 dist.tools
diff --git a/.eslintrc.js b/.eslintrc.js
index 5457c9ae8f8a..35cfcc7747ef 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,12 +1,12 @@
 const fs = require('fs');
 
+const {
+  getImportResolver,
+} = require('./build-system/babel-config/import-resolver');
 const {
   forbiddenTermsGlobal,
   forbiddenTermsSrcInclusive,
 } = require('./build-system/test-configs/forbidden-terms');
-const {
-  getImportResolver,
-} = require('./build-system/babel-config/import-resolver');
 
 const importAliases = getImportResolver().alias;
 
@@ -28,7 +28,7 @@ function getExperimentGlobals() {
 
 module.exports = {
   'root': true,
-  'parser': '@babel/eslint-parser',
+  'parser': '@typescript-eslint/parser',
   'plugins': [
     'chai-expect',
     'import',
@@ -39,24 +39,25 @@ module.exports = {
     'react',
     'react-hooks',
     'sort-destructure-keys',
-    'sort-requires',
+    '@typescript-eslint',
   ],
   'env': {
     'es6': true,
     'browser': true,
   },
   'parserOptions': {
-    'ecmaVersion': 6,
     'jsx': true,
     'sourceType': 'module',
   },
   'globals': {
     ...getExperimentGlobals(),
     'IS_ESM': 'readonly',
+    'IS_SSR_CSS': 'readonly',
     'IS_SXG': 'readonly',
     'IS_MINIFIED': 'readonly',
     'IS_PROD': 'readonly',
     'INTERNAL_RUNTIME_VERSION': 'readonly',
+    'AMP_STORY_SUPPORTED_LANGUAGES': 'readonly',
     'AMP': 'readonly',
     'context': 'readonly',
     'global': 'readonly',
@@ -165,7 +166,7 @@ module.exports = {
     'local/await-expect': 2,
     'local/camelcase': 2,
     'local/closure-type-primitives': 2,
-    'local/dict-string-keys': 2,
+    'local/core-dom-jsx': 2,
     'local/enums': 2,
     'local/get-mode-usage': 2,
     'local/html-template': 2,
@@ -176,7 +177,6 @@ module.exports = {
     'local/no-bigint': 2,
     'local/no-deep-destructuring': 2,
     'local/no-duplicate-import': 2,
-    'local/no-duplicate-name-typedef': 2,
     'local/no-dynamic-import': 2,
     'local/no-es2015-number-props': 2,
     'local/no-export-side-effect': 2,
@@ -197,7 +197,6 @@ module.exports = {
     'local/no-mixed-interpolation': 2,
     'local/no-mixed-operators': 2,
     'local/no-module-exports': 2,
-    'local/no-static-this': 2,
     'local/no-style-display': 2,
     'local/no-style-property-setting': 2,
     'local/no-swallow-return-from-allow-console-error': 2,
@@ -255,12 +254,39 @@ module.exports = {
     'no-native-reassign': 2,
     'no-redeclare': 2,
     'no-restricted-globals': [2, 'error', 'event', 'Animation'],
+    'no-restricted-syntax': [
+      2,
+      // Ban all TS features that don't have a direct ECMAScript equivalent.
+      {
+        'selector': 'TSEnumDeclaration',
+        'message': 'Enums are banned.',
+      },
+      {
+        'selector': 'TSModuleDeclaration',
+        'message': 'Namespaces are banned.',
+      },
+      {
+        'selector': 'TSParameterProperty',
+        'message': 'Parameter properties are banned.',
+      },
+      {
+        'selector': 'Decorator',
+        'message': 'Decorators are banned.',
+      },
+      {
+        'selector': 'PropertyDefinition[declare="false"]:not([value])',
+        'message':
+          'Class properties should be declared or initialized. ' +
+          'See https://github.com/ampproject/amphtml/pull/37387#discussion_r791232943',
+      },
+    ],
     'no-script-url': 2,
     'no-self-compare': 2,
     'no-sequences': 2,
     'no-throw-literal': 2,
     'no-unused-expressions': 0,
-    'no-unused-vars': [
+    'no-unused-vars': 'off',
+    '@typescript-eslint/no-unused-vars': [
       2,
       {
         'argsIgnorePattern': '^(var_args$|opt_|unused)',
@@ -299,9 +325,7 @@ module.exports = {
     ],
     'sort-destructure-keys/sort-destructure-keys': 2,
     'import/order': [
-      // Disabled for now, so individual folders can opt-in one PR at a time and
-      // minimize disruption/merge conflicts
-      0,
+      2,
       {
         // Split up imports groups with exactly one newline
         'newlines-between': 'always',
@@ -341,9 +365,19 @@ module.exports = {
         'ignoreDeclarationSort': true,
       },
     ],
-    'sort-requires/sort-requires': 2,
   },
   'overrides': [
+    {
+      'files': ['**/*.ts', '**/*.tsx'],
+      'rules': {
+        'require-jsdoc': 0,
+        'jsdoc/require-param': 0,
+        'jsdoc/require-param-type': 0,
+        'jsdoc/require-returns': 0,
+        'no-undef': 0,
+        'import/no-unresolved': 0,
+      },
+    },
     {
       'files': [
         'test/**/*.js',
@@ -432,7 +466,7 @@ module.exports = {
       'rules': {
         'no-var': 0,
         'no-undef': 0,
-        'no-unused-vars': 0,
+        '@typescript-eslint/no-unused-vars': 0,
         'prefer-const': 0,
         'require-jsdoc': 0,
         'jsdoc/check-tag-names': 0,
@@ -452,13 +486,18 @@ module.exports = {
       },
     },
     {
-      'files': ['3p/**/*.js', 'src/**/*.js', 'test/**/*.js', 'testing/**/*.js'],
-      'rules': {'import/order': 2},
+      'files': ['build-system/**/*.js'],
+      'rules': {'import/order': 0},
     },
     {
-      'files': ['src/preact/**', 'extensions/**/1.0/**', '**/storybook/**'],
+      'files': ['extensions/**/1.0/**', 'src/preact/**', '**/storybook/**'],
       'rules': {'local/preact-preferred-props': 2},
     },
+    {
+      // src/preact can directly import from 'preact' without issue.
+      'files': ['src/preact/**'],
+      'rules': {'local/no-import': 0},
+    },
     {
       // Files that use JSX for plain DOM nodes instead of Preact
       'files': [
@@ -469,5 +508,10 @@ module.exports = {
       ],
       'rules': {'local/preact': [2, '#core/dom/jsx']},
     },
+    {
+      // Allow sinon stub for release tagger tests
+      'files': ['build-system/release-tagger/test/**'],
+      'rules': {'local/no-forbidden-terms': 0},
+    },
   ],
 };
diff --git a/.github/ISSUE_TEMPLATE/bento-component-tracker.yml b/.github/ISSUE_TEMPLATE/bento-component-tracker.yml
deleted file mode 100644
index 2b939957e9b9..000000000000
--- a/.github/ISSUE_TEMPLATE/bento-component-tracker.yml
+++ /dev/null
@@ -1,97 +0,0 @@
----
-name: Bento Component Tracker
-description: Track a new Bento component.
-labels: 'WG: bento'
-title: "\U0001F371 [amp-component-name:version] Bento tracking issue"
-body:
-  - type: markdown
-    id: header
-    attributes:
-      value: |
-        This is a tracker meant to be used by AMP developers working on new Bento components.
-        - See AMP's [documentation](https://github.com/ampproject/amphtml/blob/main/docs/building-a-bento-amp-extension.md) to learn about how to write a Bento component.
-        - See [additional documentation](https://github.com/ampproject/amphtml/blob/main/docs/building-a-bento-video-player.md) for considerations when building a Bento video player.
-        - See past [tracking issues](https://github.com/ampproject/amphtml/issues?q=is%3Aopen+label%3A%22WG%3A+bento%22+%22bento+tracking+issue%22) for information about other Bento components.
-  - type: textarea
-    id: requirements
-    attributes:
-      label: High-Level Requirements
-      description: Matrix of considerations to be addressed.
-      value: |
-        <!-- Update each row of this table with the relevant information. -->
-        <!-- Information unknown at this time can be filled in later. -->
-
-        _To be updated as information becomes available._
-
-        | Consideration           | Ready When                                 | Status  |
-        | ----------------------- | ------------------------------------------ | ------- |
-        | Component Compatibility | Feature checklist is covered               | ✅ / ✖️ |
-        | Testing                 | Unit tests and pre-existing e2e tests pass | ✅ / ✖️ |
-        | Internationalization    | <fill this out>                            | ✅ / ✖️ |
-        | Analytics               | <fill this out>                            | ✅ / ✖️ |
-        | Accessibility           | Audit performed                            | ✅ / ✖️ |
-        | Page Experience         | Audit performed                            | ✅ / ✖️ |
-        | Documentation           | Written                                    | ✅ / ✖️ |
-        | Storybook               | Samples written in Preact and AMP          | ✅ / ✖️ |
-    validations:
-      required: true
-  - type: textarea
-    id: feature_checklist
-    attributes:
-      label: Feature Checklist
-      description: Checklist of features of the component.
-      value: |
-        _To be updated as information becomes available._
-
-        ### Existing attributes
-        - [ ] `attribute 1`
-        - [ ] `attribute 2`
-        - [ ] `attribute 3`
-
-        ### Actions
-        - [ ] `action 1`
-        - [ ] `action 2`
-        - [ ] `action 3`
-
-        ### Events
-        - [ ] `event 1`
-        - [ ] `event 2`
-        - [ ] `event 3`
-
-        ### Analytics Events
-        - [ ] `analytics event 1`
-        - [ ] `analytics event 2`
-        - [ ] `analytics event 3`
-    validations:
-      required: true
-  - type: textarea
-    id: migration_notes
-    attributes:
-      label: Migration Notes
-      description: Relevant information for document authors using the classic version of the component.
-      placeholder: Provide information about any API changes that might prevent document authors from upgrading a classic version component to the new Bento version.
-    validations:
-      required: true
-  - type: textarea
-    id: open_tasks
-    attributes:
-      label: Open Tasks
-      description: Checklist of tasks to be completed before this component can be shipped.
-      value: |
-        _To be updated as information becomes available._
-
-        - [ ] open task 1
-        - [ ] open task 2
-        - [ ] open task 3
-        - [ ] open task 4
-        - [ ] open task 5
-    validations:
-      required: true
-  - type: textarea
-    id: notifications
-    attributes:
-      label: Notifications
-      description: Add working groups or individuals you want to notify about this component.
-      value: /cc @ampproject/wg-bento
-    validations:
-      required: true
diff --git a/.github/ISSUE_TEMPLATE/cherry-pick-request.yml b/.github/ISSUE_TEMPLATE/cherry-pick-request.yml
index 905641ec05b5..feec1cd320d1 100644
--- a/.github/ISSUE_TEMPLATE/cherry-pick-request.yml
+++ b/.github/ISSUE_TEMPLATE/cherry-pick-request.yml
@@ -36,11 +36,10 @@ body:
     validations:
       required: true
   - type: input
-    id: release_tracker
+    id: amp_versions
     attributes:
-      label: Release Tracker(s)
-      description: The [tracker issue(s)](https://github.com/ampproject/amphtml/labels/Type%3A%20Release) for the release to which the cherry-pick will be applied. Remember to update the issue title with this info.
-      placeholder: 'e.g. #44444, #55555'
+      label: AMP Version(s)
+      description: The AMP version(s) to which the cherry-pick will be applied.
     validations:
       required: true
   - type: dropdown
diff --git a/.github/ISSUE_TEMPLATE/ga4-bug-report.yml b/.github/ISSUE_TEMPLATE/ga4-bug-report.yml
new file mode 100644
index 000000000000..58f6603627f0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/ga4-bug-report.yml
@@ -0,0 +1,74 @@
+---
+name: Google Analytics 4 and AMP Bug Report
+description: Report a bug in GA4 and AMP integration.
+labels: ['Type: Bug', 'Component: amp-analytics', 'Component: GA4']
+title: "\U0001F41B Google Analytics 4 Related Bug: "
+body:
+  - type: markdown
+    id: header
+    attributes:
+      value: |
+        Thanks for filling out this bug report. Bugs related to Google Analytics 4 and amp-analytics can be reported using the form below.
+        - Bugs related to the [AMP](https://amp.dev) format and cache can be reported using the form below.
+        - Bugs related to the [AMP WordPress Plugin](https://wordpress.org/plugins/amp/) can be reported at the [support forum](https://wordpress.org/support/plugin/amp/) or at the [`amp-wp`](https://github.com/ampproject/amp-wp/issues) repository.
+        - Questions about AMP uage can be asked at the [`#using-amp`](https://amphtml.slack.com/archives/C9HPA6HGB) Slack channel or at the [`amp-html`](http://stackoverflow.com/questions/tagged/amp-html) tag at Stack Overflow.
+        - Questions about Google Search can be asked at Google's [Help Community](https://goo.gl/utQ1KZ).
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: A brief description of the bug.
+      placeholder: Describe the expected vs. the current behavior, so this issue can be directed to the correct working group for investigation.
+    validations:
+      required: true
+  - type: input
+    id: example
+    attributes:
+      label: URL where we can debug and reproduce the problem
+      description: If applicable, give an example web page where we can reproduce the problem.
+      placeholder: e.g. https://amp-dev.cdn.ampproject.org/c/s/amp.dev/
+  - type: textarea
+    id: repro_steps
+    attributes:
+      label: Reproduction Steps
+      description: Step-by-step instructions for reproducing the issue.
+      placeholder: Provide a publicly accessible URL and a reduced set of steps that clearly demonstrate the issue.
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant Logs
+      description: Relevant logging output.
+      placeholder: Paste any plain-text logs here (e.g. console warnings or errors from Chrome DevTools). They will automatically be formatted as code.
+      render: shell
+  - type: dropdown
+    id: browsers
+    attributes:
+      label: Browser(s) Affected
+      description: If applicable, specify which browser(s) are affected. Select one or more options below.
+      multiple: true
+      options:
+        - Chrome
+        - Firefox
+        - Safari
+        - Edge
+        - UC Browser
+  - type: input
+    id: operating_systems
+    attributes:
+      label: OS(s) Affected
+      description: If applicable, specify which operating system(s) are affected.
+      placeholder: e.g. Android 11
+  - type: input
+    id: devices
+    attributes:
+      label: Device(s) Affected
+      description: If applicable, specify which device(s) are affected.
+      placeholder: e.g. Pixel 3
+  - type: input
+    id: version
+    attributes:
+      label: AMP Version Affected
+      description: If applicable, specify which version is affected, in the format YYMMDDHHMMXXX.
+      placeholder: e.g. 2101280515000
diff --git a/.github/ISSUE_TEMPLATE/release-tracker.yml b/.github/ISSUE_TEMPLATE/release-tracker.yml
deleted file mode 100644
index 6f4b60ad5fb0..000000000000
--- a/.github/ISSUE_TEMPLATE/release-tracker.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-name: Release Tracker
-description: Manually track a new AMP release. (This is automatically updated by the release-tagger GitHub Action).
-labels: 'Type: Release'
-title: "\U0001F684 Release VERSION"
-body:
-  - type: textarea
-    id: amp_version
-    attributes:
-      label: AMP Version
-      description: Replace VERSION with AMP version.
-      value: |
-        [VERSION](https://github.com/ampproject/amphtml/releases/tag/VERSION)
-    validations:
-      required: true
-  - type: textarea
-    id: promotions
-    attributes:
-      label: Promotions
-      description: Replace `VERSION` with AMP version and `<!-- promote-time -->` with CL submit time.
-      value: |
-        - [ ] <!-- amp-version=VERSION channel=beta-opt-in -->VERSION promoted to Experimental and Beta (opt-in) channels <!-- promote-time -->
-        - [ ] <!-- amp-version=VERSION channel=beta-percent -->VERSION promoted to Experimental and Beta (1% traffic) channels <!-- promote-time -->
-        - [ ] <!-- amp-version=VERSION channel=stable -->VERSION promoted to Stable channel <!-- promote-time -->
-        - [ ] <!-- amp-version=VERSION channel=lts -->VERSION promoted to LTS channel <!-- promote-time -->
-
-        /cc @ampproject/release-on-duty
-    validations:
-      required: true
diff --git a/.github/codeql/config.yml b/.github/codeql/config.yml
new file mode 100644
index 000000000000..9cef4632165b
--- /dev/null
+++ b/.github/codeql/config.yml
@@ -0,0 +1,2 @@
+paths-ignore:
+  - 'extensions/**/test/**'
diff --git a/.github/create_issue_on_error.md b/.github/create_issue_on_error.md
new file mode 100644
index 000000000000..2993ac83cf8f
--- /dev/null
+++ b/.github/create_issue_on_error.md
@@ -0,0 +1,8 @@
+---
+title: 'Workflow "{{ env.WORKFLOW_NAME }}" failed (run_id: {{ env.RUN_ID }})'
+---
+
+The workflow "**{{ env.WORKFLOW_NAME }}**" failed. See logs:
+https://github.com/{{ env.REPO_SLUG }}/actions/runs/{{ env.RUN_ID }}
+
+// cc: {{ env.MENTION }} — please triage and resolve this issue
diff --git a/.github/stale.yml b/.github/stale.yml
index b8ae45e3fa44..d81b2367de32 100644
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -1,4 +1,4 @@
-daysUntilStale: 540 # 1.5Y - 7d
+daysUntilStale: 358 # 1Y - 7d
 daysUntilClose: 7
 staleLabel: Stale
 markComment: >
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
new file mode 100644
index 000000000000..09160f77f7d0
--- /dev/null
+++ b/.github/workflows/codeql.yml
@@ -0,0 +1,49 @@
+name: 'CodeQL'
+
+on:
+  push:
+    branches: ['main']
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: ['main']
+  schedule:
+    - cron: '0 0 * * 1'
+
+permissions:
+  contents: read
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        # TODO: add `cpp` for Validator; don't forget to add a build step
+        language: ['go', 'javascript', 'python', 'typescript']
+
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        with:
+          egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
+
+      - name: Checkout repository
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
+        with:
+          config-file: ./.github/codeql/config.yml
+          languages: ${{ matrix.language }}
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
+        with:
+          category: '/language:${{matrix.language}}'
diff --git a/.github/workflows/cross-platform-builds.yml b/.github/workflows/cross-platform-builds.yml
index 221996e84cce..75e9836b916a 100644
--- a/.github/workflows/cross-platform-builds.yml
+++ b/.github/workflows/cross-platform-builds.yml
@@ -5,6 +5,9 @@ on:
     branches:
       - main
 
+permissions:
+  contents: read
+
 jobs:
   compile:
     if: github.repository == 'ampproject/amphtml'
@@ -12,15 +15,48 @@ jobs:
       matrix:
         platform: [ubuntu, macos, windows]
         flavor: [Build, Dist]
+      fail-fast: false
     runs-on: ${{ matrix.platform }}-latest
     steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        with:
+          egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
+
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
       - name: Set Up Node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
         with:
-          node-version: 16
+          node-version: lts/*
       - name: Install Dependencies
         run: bash ./.github/workflows/install_dependencies.sh
       - name: ${{ matrix.flavor }}
         run: node build-system/pr-check/cross-platform-builds.js --flavor=${{ matrix.flavor }}
+
+  create-issue-on-error:
+    if: failure()
+    needs: compile
+    permissions:
+      contents: read
+      issues: write
+    runs-on: ubuntu-latest
+    environment: create_issue_on_error
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        with:
+          egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
+
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+
+      - name: Create issue on error
+        uses: JasonEtco/create-an-issue@1b14a70e4d8dc185e5cc76d3bec9eab20257b2c5 # v2.9.2
+        with:
+          filename: .github/create_issue_on_error.md
+        env:
+          GITHUB_TOKEN: ${{ secrets.AMPPROJECTBOT }}
+          WORKFLOW_NAME: ${{ github.workflow }}
+          MENTION: '@ampproject/release-on-duty'
+          REPO_SLUG: ${{ github.repository }}
+          RUN_ID: ${{ github.run_id }}
diff --git a/.github/workflows/cut-nightly.yml b/.github/workflows/cut-nightly.yml
index cb3a60dd997a..f053b0cc0f40 100644
--- a/.github/workflows/cut-nightly.yml
+++ b/.github/workflows/cut-nightly.yml
@@ -6,24 +6,33 @@ on:
   schedule:
     # 1 a.m. PST / 12 a.m. PDT, Tuesdays through Saturdays.
     - cron: '0 8 * * 2-6'
+  workflow_dispatch:
+
+permissions:
+  contents: read
 
 jobs:
   cut-nightly:
-    environment: release_tagger
+    environment: cut_nightly
     if: github.repository == 'ampproject/amphtml'
     name: Cut Nightly Branch
     runs-on: ubuntu-latest
 
     steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        with:
+          egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
+
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
         with:
           fetch-depth: 100
 
       - name: Set Up Node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
         with:
-          node-version: 16
+          node-version: lts/*
 
       - name: Set Up Environment
         run: sudo chown -R $(whoami) $(npm config get prefix)/{lib/node_modules,bin,share}
@@ -35,3 +44,30 @@ jobs:
         run: node --unhandled-rejections=strict build-system/release-workflows/cut-nightly.js
         env:
           GITHUB_TOKEN: ${{ secrets.AMPPROJECTBOT }}
+
+  create-issue-on-error:
+    if: failure()
+    needs: cut-nightly
+    permissions:
+      contents: read
+      issues: write
+    runs-on: ubuntu-latest
+    environment: create_issue_on_error
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        with:
+          egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
+
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+
+      - name: Create issue on error
+        uses: JasonEtco/create-an-issue@1b14a70e4d8dc185e5cc76d3bec9eab20257b2c5 # v2.9.2
+        with:
+          filename: .github/create_issue_on_error.md
+        env:
+          GITHUB_TOKEN: ${{ secrets.AMPPROJECTBOT }}
+          WORKFLOW_NAME: ${{ github.workflow }}
+          MENTION: '@ampproject/release-on-duty'
+          REPO_SLUG: ${{ github.repository }}
+          RUN_ID: ${{ github.run_id }}
diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
new file mode 100644
index 000000000000..9ad36ee2b313
--- /dev/null
+++ b/.github/workflows/dependency-review.yml
@@ -0,0 +1,27 @@
+# Dependency Review Action
+#
+# This Action will scan dependency manifest files that change as part of a Pull Request,
+# surfacing known-vulnerable versions of the packages declared or updated in the PR.
+# Once installed, if the workflow run is marked as required,
+# PRs introducing known-vulnerable packages will be blocked from merging.
+#
+# Source repository: https://github.com/actions/dependency-review-action
+name: 'Dependency Review'
+on: [pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  dependency-review:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        with:
+          egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
+
+      - name: 'Checkout Repository'
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - name: 'Dependency Review'
+        uses: actions/dependency-review-action@5a2ce3f5b92ee19cbb1541a4984c76d921601d7c # v4.3.4
diff --git a/.github/workflows/publish-npm-packages.yml b/.github/workflows/publish-npm-packages.yml
deleted file mode 100644
index a50f8cd6a726..000000000000
--- a/.github/workflows/publish-npm-packages.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-name: Publish Bento Packages on npm
-on:
-  workflow_dispatch:
-    inputs:
-      ampversion:
-        description: 'AMP version'
-        required: true
-      tag:
-        description: 'npm package tag (latest | nightly)'
-        required: true
-env:
-  REPO: 'https://raw.githubusercontent.com/ampproject/amphtml/main'
-  DIR: 'build-system/npm-publish'
-jobs:
-  setup:
-    runs-on: ubuntu-latest
-    outputs:
-      extensions: ${{ steps.get-extensions.outputs.extensions }}
-    steps:
-      - name: Print inputs
-        run: |
-          echo "AMP version: ${{ github.event.inputs.ampversion }}"
-          echo "npm tag: ${{ github.event.inputs.tag }}"
-      - uses: actions/checkout@v2
-        with:
-          ref: ${{ github.events.inputs.ampversion }}
-      - name: Get latest scripts
-        run: wget -q "${{ env.REPO }}/${{ env.DIR }}/get-extensions.js" -O ${{ env.DIR }}/get-extensions.js
-      - name: Get extensions to publish
-        id: get-extensions
-        run: |
-          EXTENSIONS=$(node ${{ env.DIR }}/get-extensions.js)
-          echo "::set-output name=extensions::{\"include\":${EXTENSIONS}}"
-  publish:
-    if: github.repository == 'ampproject/amphtml'
-    environment: bento_publishing
-    needs: setup
-    runs-on: ubuntu-latest
-    strategy:
-      matrix: ${{ fromJson(needs.setup.outputs.extensions) }}
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          ref: ${{ github.events.inputs.ampversion }}
-      - uses: actions/setup-node@v2
-        with:
-          registry-url: https://registry.npmjs.org
-          node-version: 16
-      - name: Install dependencies
-        run: bash ./.github/workflows/install_dependencies.sh
-      - name: Get latest scripts
-        run: |
-          wget -q "${{ env.REPO }}/${{ env.DIR }}/utils.js" -O ${{ env.DIR }}/utils.js
-          wget -q "${{ env.REPO }}/${{ env.DIR }}/build-npm-binaries.js" -O ${{ env.DIR }}/build-npm-binaries.js
-          wget -q "${{ env.REPO }}/${{ env.DIR }}/write-package-files.js" -O ${{ env.DIR }}/write-package-files.js
-      - name: Build package
-        run: |
-          node ${{ env.DIR }}/build-npm-binaries.js ${{ matrix.extension }}
-          node ${{ env.DIR }}/write-package-files.js ${{ matrix.extension }} ${{ github.event.inputs.ampversion }} ${{ matrix.version }}
-      - name: Publish package for Nightly releases
-        if: github.event.inputs.tag != 'latest'
-        run: npm publish ./extensions/${{ matrix.extension }}/${{ matrix.version }} --access public --tag ${{ github.event.inputs.tag }}
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-      - name: Tag package as latest for Stable releases
-        if: github.event.inputs.tag == 'latest'
-        run: |
-          NPM_PACKAGE=$(jq -r .name ./extensions/${{ matrix.extension }}/${{ matrix.version }}/package.json)
-          NPM_VERSION=$(jq -r .version ./extensions/${{ matrix.extension }}/${{ matrix.version }}/package.json)
-          echo "Processing ${NPM_PACKAGE}@${NPM_VERSION}"
-          if [[ $(npm view ${NPM_PACKAGE}@${NPM_VERSION}) ]]; then
-            npm dist-tag add ${NPM_PACKAGE}@${NPM_VERSION} latest
-          else
-            npm publish ./extensions/${{ matrix.extension }}/${{ matrix.version }} --access public --tag latest
-          fi
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/.github/workflows/release-tagger.yml b/.github/workflows/release-tagger.yml
index 8f87865c9215..13c821d93ffe 100644
--- a/.github/workflows/release-tagger.yml
+++ b/.github/workflows/release-tagger.yml
@@ -14,21 +14,26 @@ on:
       channel:
         description: 'release channel (beta-opt-in | beta-percent | stable | lts)'
         required: true
-      time:
-        description: 'action time'
-        required: true
       sha:
         description: 'commit sha'
         required: true
+permissions:
+  contents: read
+
 jobs:
   tagger:
     environment: release_tagger
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-node@v2
+      - name: Harden Runner
+        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        with:
+          egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
+
+      - uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
         with:
-          node-version: 16
-      - uses: actions/checkout@v2
+          node-version: lts/*
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
       - run: bash ./.github/workflows/install_dependencies.sh
       - name: Run tagger
         run: |
@@ -37,7 +42,33 @@ jobs:
             --head ${{ github.event.inputs.head }} \
             --base ${{ github.event.inputs.base }} \
             --channel ${{ github.event.inputs.channel }} \
-            --time ${{ github.event.inputs.time }} \
             --sha ${{ github.event.inputs.sha }}
         env:
           GITHUB_TOKEN: ${{ secrets.AMPPROJECTBOT }}
+
+  create-issue-on-error:
+    if: failure()
+    needs: tagger
+    permissions:
+      contents: read
+      issues: write
+    runs-on: ubuntu-latest
+    environment: create_issue_on_error
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        with:
+          egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
+
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+
+      - name: Create issue on error
+        uses: JasonEtco/create-an-issue@1b14a70e4d8dc185e5cc76d3bec9eab20257b2c5 # v2.9.2
+        with:
+          filename: .github/create_issue_on_error.md
+        env:
+          GITHUB_TOKEN: ${{ secrets.AMPPROJECTBOT }}
+          WORKFLOW_NAME: ${{ github.workflow }}
+          MENTION: '@ampproject/wg-infra'
+          REPO_SLUG: ${{ github.repository }}
+          RUN_ID: ${{ github.run_id }}
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
new file mode 100644
index 000000000000..81784684028b
--- /dev/null
+++ b/.github/workflows/scorecard.yml
@@ -0,0 +1,77 @@
+# This workflow uses actions that are not certified by GitHub. They are provided
+# by a third-party and are governed by separate terms of service, privacy
+# policy, and support documentation.
+
+name: Scorecard supply-chain security
+on:
+  # For Branch-Protection check. Only the default branch is supported. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
+  branch_protection_rule:
+  # To guarantee Maintained check is occasionally updated. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
+  schedule:
+    - cron: '16 14 * * 1'
+  push:
+    branches: ['main']
+
+# Declare default permissions as read only.
+permissions: read-all
+
+jobs:
+  analysis:
+    name: Scorecard analysis
+    runs-on: ubuntu-latest
+    permissions:
+      # Needed to upload the results to code-scanning dashboard.
+      security-events: write
+      # Needed to publish results and get a badge (see publish_results below).
+      id-token: write
+      # Uncomment the permissions below if installing in a private repository.
+      # contents: read
+      # actions: read
+
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        with:
+          egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
+
+      - name: 'Checkout code'
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        with:
+          persist-credentials: false
+
+      - name: 'Run analysis'
+        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
+        with:
+          results_file: results.sarif
+          results_format: sarif
+          # (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
+          # - you want to enable the Branch-Protection check on a *public* repository, or
+          # - you are installing Scorecard on a *private* repository
+          # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action#authentication-with-pat.
+          repo_token: ${{ secrets.SCORECARD_TOKEN }}
+
+          # Public repositories:
+          #   - Publish results to OpenSSF REST API for easy access by consumers
+          #   - Allows the repository to include the Scorecard badge.
+          #   - See https://github.com/ossf/scorecard-action#publishing-results.
+          # For private repositories:
+          #   - `publish_results` will always be set to `false`, regardless
+          #     of the value entered here.
+          publish_results: true
+
+      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
+      # format to the repository Actions tab.
+      - name: 'Upload artifact'
+        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+        with:
+          name: SARIF file
+          path: results.sarif
+          retention-days: 5
+
+      # Upload the results to GitHub's code scanning dashboard.
+      - name: 'Upload to code-scanning'
+        uses: github/codeql-action/upload-sarif@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
+        with:
+          sarif_file: results.sarif
diff --git a/.github/workflows/status-page.yml b/.github/workflows/status-page.yml
index 59bf3f2f4266..1d126e19f1c0 100644
--- a/.github/workflows/status-page.yml
+++ b/.github/workflows/status-page.yml
@@ -4,16 +4,24 @@ on:
     types: [opened]
   issue_comment:
     types: [edited]
+permissions:
+  contents: read
+
 jobs:
   status-page:
     if: contains(github.event.issue.title, '🌸 Cherry-pick request')
     runs-on: ubuntu-latest
     environment: status_page
     steps:
-      - uses: actions/setup-node@v2
+      - name: Harden Runner
+        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
         with:
-          node-version: 16
-      - uses: actions/checkout@v2
+          egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
+
+      - uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
+        with:
+          node-version: lts/*
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
       - name: Add progress comment to cherry-pick issue for Stable and LTS
         if: github.event_name == 'issues' && github.event.action == 'opened'
         run: |
@@ -33,3 +41,30 @@ jobs:
           COMMENT_AFTER: ${{ github.event.comment.body }}
           STATUS_PAGE_ID: ${{ secrets.STATUS_PAGE_ID }}
           STATUS_PAGE_TOKEN: ${{ secrets.STATUS_PAGE_TOKEN }}
+
+  create-issue-on-error:
+    if: failure()
+    needs: status-page
+    permissions:
+      contents: read
+      issues: write
+    runs-on: ubuntu-latest
+    environment: create_issue_on_error
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        with:
+          egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
+
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+
+      - name: Create issue on error
+        uses: JasonEtco/create-an-issue@1b14a70e4d8dc185e5cc76d3bec9eab20257b2c5 # v2.9.2
+        with:
+          filename: .github/create_issue_on_error.md
+        env:
+          GITHUB_TOKEN: ${{ secrets.AMPPROJECTBOT }}
+          WORKFLOW_NAME: ${{ github.workflow }}
+          MENTION: '@ampproject/wg-infra'
+          REPO_SLUG: ${{ github.repository }}
+          RUN_ID: ${{ github.run_id }}
diff --git a/.github/workflows/sweep-experiments.yml b/.github/workflows/sweep-experiments.yml
deleted file mode 100644
index 4d093ff48e9e..000000000000
--- a/.github/workflows/sweep-experiments.yml
+++ /dev/null
@@ -1,79 +0,0 @@
-# Executes `amp sweep-experiments` on a schedule.
-# If experiments are swept, a PR is created.
-
-name: Sweep Experiments
-
-on:
-  schedule:
-    # First day of the month at 00:00:00
-    - cron: '0 0 1 * *'
-
-jobs:
-  sweep-experiments:
-    if: github.repository == 'ampproject/amphtml'
-    name: Sweep Experiments
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Set Up Node
-        uses: actions/setup-node@v2
-        with:
-          node-version: 16
-
-      - name: Set Up Environment
-        run: sudo chown -R $(whoami) $(npm config get prefix)/{lib/node_modules,bin,share}
-
-      - name: Install Dependencies
-        run: npm ci
-
-      - name: Sweep
-        id: sweep
-        run: |
-          git config --global user.name "${GITHUB_ACTOR}"
-          git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com"
-
-          amp sweep-experiments
-
-          title=$(git log -1 --format=%s)
-          title="${title//'%'/'%25'}"
-          title="${title//$'\n'/'%0A'}"
-          title="${title//$'\r'/'%0D'}"
-          echo "::set-output name=title::$(echo "$title")"
-
-          body=$(git log -1 --format=%b)
-          body="${body//'%'/'%25'}"
-          body="${body//$'\n'/'%0A'}"
-          body="${body//$'\r'/'%0D'}"
-          echo "::set-output name=body::$(echo "$body")"
-
-          hash=$(git log -1 --format=%h)
-          hash="${hash//'%'/'%25'}"
-          hash="${hash//$'\n'/'%0A'}"
-          hash="${hash//$'\r'/'%0D'}"
-          echo "::set-output name=branch::$(echo "sweep-experiments-${hash}")"
-
-      - name: Create Pull Request
-        id: pull-request
-        uses: peter-evans/create-pull-request@v3
-        with:
-          draft: true
-          title: ${{ steps.sweep.outputs.title }}
-          body: ${{ steps.sweep.outputs.body }}
-          branch: ${{ steps.sweep.outputs.branch }}
-
-      - name: Comment on Pull Request
-        if: ${{ steps.pull-request.outputs.pull-request-number }}
-        uses: peter-evans/create-or-update-comment@v1
-        with:
-          issue-number: ${{ steps.pull-request.outputs.pull-request-number }}
-          body: |
-            You may checkout this pull request to follow-up manually:
-
-            ```
-            git checkout -t upstream/${{ steps.sweep.outputs.branch }}
-            ```
diff --git a/.github/workflows/sync-client-side-experiments-config-to-cdn.yml b/.github/workflows/sync-client-side-experiments-config-to-cdn.yml
deleted file mode 100644
index fc7a99eb3915..000000000000
--- a/.github/workflows/sync-client-side-experiments-config-to-cdn.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: CDN config sync
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - build-system/global-configs/client-side-experiments-config.json
-
-jobs:
-  sync:
-    if: github.repository == 'ampproject/amphtml'
-    name: client-side-experiments-config.json
-    runs-on: ubuntu-latest
-    environment: wrangler
-
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 1
-
-      - name: Install Dependencies
-        run: npm i -g @cloudflare/wrangler
-
-      - name: ⭐ Sync client-side-experiments-config.json to the CDN ⭐
-        run: wrangler kv:key put AMP_EXP "$(cat build-system/global-configs/client-side-experiments-config.json)" --config .github/workflows/wrangler.toml --binding AMP_EXP
-        env:
-          CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }}
-          CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }}
diff --git a/.github/workflows/sync-versioning-to-cdn.yml b/.github/workflows/sync-versioning-to-cdn.yml
deleted file mode 100644
index ee3b965a9ab6..000000000000
--- a/.github/workflows/sync-versioning-to-cdn.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-name: CDN config sync
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - build-system/global-configs/versioning.json
-
-jobs:
-  sync:
-    if: github.repository == 'ampproject/amphtml'
-    name: versioning.json
-    runs-on: ubuntu-latest
-    environment: wrangler
-
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 1
-
-      - name: Install Dependencies
-        run: npm i -g @cloudflare/wrangler
-
-      - name: ⭐ Sync versioning.json to the CDN ⭐
-        run: |
-          for CHANNEL in $(jq 'keys[]' build-system/global-configs/versioning.json --raw-output)
-          do
-            RTV=$(jq ".[\"${CHANNEL}\"]" build-system/global-configs/versioning.json --raw-output)
-            if [[ RTV != "null" ]]
-            then
-              echo "Setting ${CHANNEL} to ${RTV}"
-              wrangler kv:key put "${CHANNEL}" "${RTV}" --config .github/workflows/wrangler.toml --binding RTV
-            else
-              echo "Unsetting ${CHANNEL}"
-              wrangler kv:key delete "${CHANNEL}" --config .github/workflows/wrangler.toml --binding RTV --force
-            fi
-          done
-        env:
-          CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }}
-          CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }}
diff --git a/.github/workflows/update-session-issues.yml b/.github/workflows/update-session-issues.yml
index 8fa2fe3fb518..2f22bca167b6 100644
--- a/.github/workflows/update-session-issues.yml
+++ b/.github/workflows/update-session-issues.yml
@@ -8,16 +8,25 @@ on:
   schedule:
     - cron: '30 16,17 * * 3' # Africa/Europe/western Asia
     - cron: '0 21,22 * * 3' # Americas
-    - cron: '0 1,2 * * 4' # Asia/Oceania
+
+permissions:
+  contents: read
 
 jobs:
   update-session-issues:
+    permissions:
+      issues: write
     if: github.repository == 'ampproject/amphtml'
     name: Update Session Issues
     runs-on: ubuntu-latest
     steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        with:
+          egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
+
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
       - name: Update Session Issues
         run: |
           node ./build-system/common/update-session-issues
diff --git a/.github/workflows/wrangler.toml b/.github/workflows/wrangler.toml
deleted file mode 100644
index 16efb1c5052c..000000000000
--- a/.github/workflows/wrangler.toml
+++ /dev/null
@@ -1,11 +0,0 @@
-name = "cdn-worker"
-type = "javascript"
-zone_id = ""
-account_id = "78e1d5140b47fc9dab18dc8b25351b7a"
-compatibility_date = "2021-10-08"
-route = ""
-workers_dev = true
-kv_namespaces = [
-  { binding = "RTV", id = "f33b97f2e1434004975c0d8553f70488", preview_id = "192df3dff1b345ce8e7c794329bb7ccd" },
-  { binding = "AMP_EXP", id = "b03e5db05f3e4d068508da267e248949", preview_id = "69318ded67c0477b85d73ec801b47543" }
-]
diff --git a/.gitignore b/.gitignore
index d78aa770a5bd..06bcedd0dd80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,8 +27,6 @@ firebase.json
 .*cache
 .amp-dep-check
 build
-build-system/tasks/performance/cache
-build-system/tasks/performance/results.json
 dist
 dist.3p
 dist.tools
diff --git a/.prettierignore b/.prettierignore
index 1afc6c879ad8..1f3a2890a373 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -10,8 +10,6 @@
 .*cache
 .amp-dep-check
 build
-build-system/tasks/performance/cache
-build-system/tasks/performance/results.json
 dist
 dist.3p
 dist.tools
diff --git a/.renovaterc.json b/.renovaterc.json
index f6f72b856aa2..1b42148a80aa 100644
--- a/.renovaterc.json
+++ b/.renovaterc.json
@@ -1,8 +1,5 @@
 {
-  "extends": ["config:base"],
-  "node": {
-    "supportPolicy": ["lts_latest"]
-  },
+  "extends": ["config:recommended"],
   "ignoreDeps": ["ubuntu-2004"],
   "commitMessagePrefix": "📦",
   "timezone": "America/Los_Angeles",
@@ -20,13 +17,13 @@
   "packageRules": [
     {
       "groupName": "subpackage devDependencies",
-      "matchPaths": ["**/*"],
+      "matchFileNames": ["**/*"],
       "rebaseWhen": "never",
       "automerge": true
     },
     {
       "groupName": "chrome and chromedriver",
-      "matchFiles": ["build-system/tasks/e2e/package.json"],
+      "matchFileNames": ["build-system/tasks/e2e/package.json"],
       "matchPackageNames": ["chromedriver"],
       "labels": ["WG: infra"],
       "rebaseWhen": "never",
@@ -34,81 +31,86 @@
     },
     {
       "groupName": "build-system devDependencies",
-      "matchPaths": ["build-system/**"],
+      "matchFileNames": ["build-system/**"],
       "labels": ["WG: infra"],
       "rebaseWhen": "never",
-      "automerge": true
+      "automerge": true,
+      "matchPackageNames": ["!chromedriver"]
     },
     {
       "groupName": "validator devDependencies",
-      "matchPaths": ["validator/**"],
+      "matchFileNames": ["validator/**"],
       "labels": ["WG: caching"],
       "rebaseWhen": "never",
       "automerge": true
     },
     {
       "groupName": "validator webui",
-      "matchPaths": ["validator/js/webui/**"],
+      "matchFileNames": ["validator/js/webui/**"],
       "enabled": false
     },
     {
       "groupName": "core devDependencies",
-      "matchFiles": ["package.json"],
+      "matchFileNames": ["package.json"],
       "labels": ["WG: infra"],
       "rebaseWhen": "never",
       "automerge": true
     },
     {
       "groupName": "linting devDependencies",
-      "matchFiles": ["package.json"],
-      "matchPackagePatterns": ["\\b(prettier|eslint)\\b"],
+      "matchFileNames": ["package.json"],
       "labels": ["WG: infra"],
       "rebaseWhen": "never",
-      "automerge": true
+      "automerge": true,
+      "matchPackageNames": ["/\\b(prettier|eslint)\\b/"]
     },
     {
       "groupName": "babel devDependencies",
-      "matchFiles": ["package.json"],
-      "matchPackagePatterns": ["\\bbabel"],
-      "major": {"automerge": false, "assignAutomerge": false},
+      "matchFileNames": ["package.json"],
+      "major": {
+        "automerge": false,
+        "assignAutomerge": false
+      },
       "labels": ["WG: infra", "WG: performance"],
       "rebaseWhen": "never",
-      "automerge": true
+      "automerge": true,
+      "matchPackageNames": ["/\\bbabel/"]
     },
     {
       "groupName": "esbuild devDependencies",
-      "matchFiles": ["package.json"],
-      "matchPackagePatterns": ["\\besbuild\\b"],
+      "matchFileNames": ["package.json"],
       "labels": ["WG: infra", "WG: performance"],
       "rebaseWhen": "never",
-      "automerge": true
+      "automerge": true,
+      "matchPackageNames": ["/\\besbuild\\b/"]
     },
     {
       "groupName": "ampproject devDependencies",
-      "matchFiles": ["package.json"],
-      "matchPackagePatterns": ["^@ampproject/"],
+      "matchFileNames": ["package.json"],
       "matchDepTypes": ["devDependencies"],
-      "labels": ["WG: bento", "WG: components", "WG: performance"],
+      "labels": ["WG: components", "WG: performance"],
       "rebaseWhen": "never",
-      "automerge": true
+      "automerge": true,
+      "matchPackageNames": ["/^@ampproject//"]
     },
     {
       "groupName": "ampproject dependencies",
-      "matchFiles": ["package.json"],
-      "matchPackagePatterns": ["^@ampproject/"],
+      "matchFileNames": ["package.json"],
       "matchDepTypes": ["dependencies"],
-      "labels": ["WG: bento", "WG: components", "WG: performance"],
+      "labels": ["WG: components", "WG: performance"],
       "rebaseWhen": "never",
-      "automerge": false
+      "automerge": false,
+      "schedule": null,
+      "matchPackageNames": ["/^@ampproject//"]
     },
     {
       "groupName": "core dependencies",
-      "matchFiles": ["package.json"],
-      "excludePackagePatterns": ["^@ampproject/"],
+      "matchFileNames": ["package.json"],
       "matchDepTypes": ["dependencies"],
-      "labels": ["WG: bento", "WG: components", "WG: performance"],
+      "labels": ["WG: components", "WG: performance"],
       "rebaseWhen": "never",
-      "automerge": false
+      "automerge": false,
+      "matchPackageNames": ["!/^@ampproject//"]
     }
   ]
 }
diff --git a/.vscode/OWNERS b/.vscode/OWNERS
index 002922bb9cc9..69a88bfe0386 100644
--- a/.vscode/OWNERS
+++ b/.vscode/OWNERS
@@ -4,7 +4,7 @@
 {
   rules: [
     {
-      owners: [{name: 'ampproject/wg-infra'}, {name: 'rsimha', notify: true}],
+      owners: [{name: 'ampproject/wg-infra'}],
     },
   ],
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
index d2299dd8882e..da066d95027f 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -7,12 +7,19 @@
 
     // Enable JSON auto-formatting for these files.
     ".prettierrc": "json",
-    ".renovaterc.json": "json"
+    ".renovaterc.json": "json",
+
+    // Allow comments in JSON schema files.
+    "*.schema.json": "jsonc"
   },
 
+  "files.insertFinalNewline": true,
+
   // Auto-fix JS files with ESLint using amphtml's custom settings. Needs
   // https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint
-  "editor.codeActionsOnSave": {"source.fixAll.eslint": true},
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": "explicit"
+  },
   "[js]": {"editor.formatOnSave": false},
 
   // Auto-fix non-JS files with Prettier using amphtml's custom settings. Needs
@@ -40,20 +47,10 @@
       "fileMatch": ["build-system/global-configs/caches.json"],
       "url": "./build-system/json-schemas/caches.json"
     },
-    {
-      "fileMatch": [
-        "build-system/global-configs/client-side-experiments-config.json"
-      ],
-      "url": "./build-system/json-schemas/client-side-experiments-config.json"
-    },
     {
       "fileMatch": ["build-system/tasks/bundle-size/filesize.json"],
       "url": "./build-system/json-schemas/filesize.json"
     },
-    {
-      "fileMatch": ["build-system/global-configs/versioning.json"],
-      "url": "./build-system/json-schemas/versioning.json"
-    },
     {
       "fileMatch": ["test/visual-diff/visual-tests.jsonc"],
       "url": "./build-system/json-schemas/visual-tests.json"
diff --git a/3p/3d-gltf/index.js b/3p/3d-gltf/index.js
index 86f0a874b0ab..001b3242ce9b 100644
--- a/3p/3d-gltf/index.js
+++ b/3p/3d-gltf/index.js
@@ -3,7 +3,6 @@
 import {loadScript} from '#3p/3p';
 import {listenParent, nonSensitiveDataPostMessage} from '#3p/messaging';
 
-import {dict} from '#core/types/object';
 import {parseJson} from '#core/types/object/json';
 
 import {user} from '#utils/log';
@@ -54,22 +53,16 @@ export function gltfViewer(global) {
         if (!e.lengthComputable) {
           return;
         }
-        nonSensitiveDataPostMessage(
-          'progress',
-          dict({
-            'total': e.total,
-            'loaded': e.loaded,
-          })
-        );
+        nonSensitiveDataPostMessage('progress', {
+          'total': e.total,
+          'loaded': e.loaded,
+        });
       },
       onerror: (err) => {
         user().error('3DGLTF', err);
-        nonSensitiveDataPostMessage(
-          'error',
-          dict({
-            'error': (err || '').toString(),
-          })
-        );
+        nonSensitiveDataPostMessage('error', {
+          'error': (err || '').toString(),
+        });
       },
     });
     listenParent(global, 'action', (msg) => {
diff --git a/3p/3p.js b/3p/3p.js
index e223027de451..9bf84f0eca66 100644
--- a/3p/3p.js
+++ b/3p/3p.js
@@ -15,7 +15,7 @@ import {devAssert, userAssert} from '#utils/log';
 let ThirdPartyFunctionDef;
 
 /**
- * @const {!Object<ThirdPartyFunctionDef>}
+ * @const {!{[key: string]: ThirdPartyFunctionDef}}
  * @visibleForTesting
  */
 let registrations;
@@ -285,7 +285,7 @@ function validateAllowedFields(data, allowedFields) {
   }
 }
 
-/** @private {!Object<string, boolean>} */
+/** @private {!{[key: string]: boolean}} */
 let experimentToggles = {};
 
 /**
@@ -299,7 +299,7 @@ export function isExperimentOn(experimentId) {
 
 /**
  * Set experiment toggles.
- * @param {!Object<string, boolean>} toggles
+ * @param {!{[key: string]: boolean}} toggles
  */
 export function setExperimentToggles(toggles) {
   experimentToggles = toggles;
diff --git a/3p/ampcontext-integration.js b/3p/ampcontext-integration.js
index aea522c64b2e..dea3e3f28e4a 100644
--- a/3p/ampcontext-integration.js
+++ b/3p/ampcontext-integration.js
@@ -1,5 +1,3 @@
-import {dict} from '#core/types/object';
-
 import {dev, user, userAssert} from '#utils/log';
 
 import {computeInMasterFrame} from './3p';
@@ -114,12 +112,9 @@ export class IntegrationAmpContext extends AbstractAmpContext {
    * @param {string} entityId See comment above for content.
    */
   reportRenderedEntityIdentifier(entityId) {
-    this.client_.sendMessage(
-      'entity-id',
-      dict({
-        'id': user().assertString(entityId),
-      })
-    );
+    this.client_.sendMessage('entity-id', {
+      'id': user().assertString(entityId),
+    });
   }
 
   /**
diff --git a/3p/ampcontext.js b/3p/ampcontext.js
index 87f922dbbd6b..55e8eb1f6d17 100644
--- a/3p/ampcontext.js
+++ b/3p/ampcontext.js
@@ -1,8 +1,8 @@
-import {MessageType} from '#core/3p-frame-messaging';
-import {AmpEvents} from '#core/constants/amp-events';
+import {MessageType_Enum} from '#core/3p-frame-messaging';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
 import {Deferred} from '#core/data-structures/promise';
 import {isObject} from '#core/types';
-import {dict, map} from '#core/types/object';
+import {map} from '#core/types/object';
 import {tryParseJson} from '#core/types/object/json';
 
 import {dev, devAssert} from '#utils/log';
@@ -51,7 +51,7 @@ export class AbstractAmpContext {
     /** @type {?Object} */
     this.consentSharedData = null;
 
-    /** @type {?Object<string, *>} */
+    /** @type {?{[key: string]: *}} */
     this.data = null;
 
     /** @type {?string} */
@@ -102,7 +102,7 @@ export class AbstractAmpContext {
     /** @type {?string} */
     this.tagName = null;
 
-    /** @type {!Object<number, Deferred>} */
+    /** @type {!{[key: number]: Deferred}} */
     this.resizeIdToDeferred_ = map();
 
     /** @type {number} */
@@ -129,8 +129,8 @@ export class AbstractAmpContext {
   /** Registers an general handler for page visibility. */
   listenForPageVisibility_() {
     this.client_.makeRequest(
-      MessageType.SEND_EMBED_STATE,
-      MessageType.EMBED_STATE,
+      MessageType_Enum.SEND_EMBED_STATE,
+      MessageType_Enum.EMBED_STATE,
       (data) => {
         this.hidden = data['pageHidden'];
         this.dispatchVisibilityChangeEvent_();
@@ -145,7 +145,7 @@ export class AbstractAmpContext {
   dispatchVisibilityChangeEvent_() {
     const event = this.win_.document.createEvent('Event');
     event.data = {hidden: this.hidden};
-    event.initEvent(AmpEvents.VISIBILITY_CHANGE, true, true);
+    event.initEvent(AmpEvents_Enum.VISIBILITY_CHANGE, true, true);
     this.win_.dispatchEvent(event);
   }
 
@@ -157,9 +157,12 @@ export class AbstractAmpContext {
    *    every time we receive a page visibility message.
    */
   onPageVisibilityChange(callback) {
-    return this.client_.registerCallback(MessageType.EMBED_STATE, (data) => {
-      callback({hidden: data['pageHidden']});
-    });
+    return this.client_.registerCallback(
+      MessageType_Enum.EMBED_STATE,
+      (data) => {
+        callback({hidden: data['pageHidden']});
+      }
+    );
   }
 
   /**
@@ -171,8 +174,8 @@ export class AbstractAmpContext {
    */
   observeIntersection(callback) {
     return this.client_.makeRequest(
-      MessageType.SEND_INTERSECTIONS,
-      MessageType.INTERSECTION,
+      MessageType_Enum.SEND_INTERSECTIONS,
+      MessageType_Enum.INTERSECTION,
       (intersection) => {
         callback(intersection['changes']);
       }
@@ -188,11 +191,11 @@ export class AbstractAmpContext {
    */
   getHtml(selector, attributes, callback) {
     this.client_.getData(
-      MessageType.GET_HTML,
-      dict({
+      MessageType_Enum.GET_HTML,
+      {
         'selector': selector,
         'attributes': attributes,
-      }),
+      },
       callback
     );
   }
@@ -203,7 +206,7 @@ export class AbstractAmpContext {
    * @param {function(*)} callback
    */
   getConsentState(callback) {
-    this.client_.getData(MessageType.GET_CONSENT_STATE, null, callback);
+    this.client_.getData(MessageType_Enum.GET_CONSENT_STATE, null, callback);
   }
 
   /**
@@ -216,15 +219,12 @@ export class AbstractAmpContext {
    */
   requestResize(width, height, hasOverflow) {
     const requestId = this.nextResizeRequestId_++;
-    this.client_.sendMessage(
-      MessageType.EMBED_SIZE,
-      dict({
-        'id': requestId,
-        'width': width,
-        'height': height,
-        'hasOverflow': hasOverflow,
-      })
-    );
+    this.client_.sendMessage(MessageType_Enum.EMBED_SIZE, {
+      'id': requestId,
+      'width': width,
+      'height': height,
+      'hasOverflow': hasOverflow,
+    });
     const deferred = new Deferred();
     this.resizeIdToDeferred_[requestId] = deferred;
     return deferred.promise;
@@ -234,21 +234,27 @@ export class AbstractAmpContext {
    *  Set up listeners to handle responses from request size.
    */
   listenToResizeResponse_() {
-    this.client_.registerCallback(MessageType.EMBED_SIZE_CHANGED, (data) => {
-      const id = data['id'];
-      if (id !== undefined) {
-        this.resizeIdToDeferred_[id].resolve();
-        delete this.resizeIdToDeferred_[id];
+    this.client_.registerCallback(
+      MessageType_Enum.EMBED_SIZE_CHANGED,
+      (data) => {
+        const id = data['id'];
+        if (id !== undefined) {
+          this.resizeIdToDeferred_[id].resolve();
+          delete this.resizeIdToDeferred_[id];
+        }
       }
-    });
+    );
 
-    this.client_.registerCallback(MessageType.EMBED_SIZE_DENIED, (data) => {
-      const id = data['id'];
-      if (id !== undefined) {
-        this.resizeIdToDeferred_[id].reject('Resizing is denied');
-        delete this.resizeIdToDeferred_[id];
+    this.client_.registerCallback(
+      MessageType_Enum.EMBED_SIZE_DENIED,
+      (data) => {
+        const id = data['id'];
+        if (id !== undefined) {
+          this.resizeIdToDeferred_[id].reject('Resizing is denied');
+          delete this.resizeIdToDeferred_[id];
+        }
       }
-    });
+    );
   }
 
   /**
@@ -256,13 +262,10 @@ export class AbstractAmpContext {
    * @private
    */
   sendDeprecationNotice_(endpoint) {
-    this.client_.sendMessage(
-      MessageType.USER_ERROR_IN_IFRAME,
-      dict({
-        'message': `${endpoint} is deprecated`,
-        'expected': true,
-      })
-    );
+    this.client_.sendMessage(MessageType_Enum.USER_ERROR_IN_IFRAME, {
+      'message': `${endpoint} is deprecated`,
+      'expected': true,
+    });
   }
 
   /**
@@ -273,9 +276,12 @@ export class AbstractAmpContext {
    *    request succeeds.
    */
   onResizeSuccess(callback) {
-    this.client_.registerCallback(MessageType.EMBED_SIZE_CHANGED, (obj) => {
-      callback(obj['requestedHeight'], obj['requestedWidth']);
-    });
+    this.client_.registerCallback(
+      MessageType_Enum.EMBED_SIZE_CHANGED,
+      (obj) => {
+        callback(obj['requestedHeight'], obj['requestedWidth']);
+      }
+    );
     this.sendDeprecationNotice_('onResizeSuccess');
   }
 
@@ -287,7 +293,7 @@ export class AbstractAmpContext {
    *    request is denied.
    */
   onResizeDenied(callback) {
-    this.client_.registerCallback(MessageType.EMBED_SIZE_DENIED, (obj) => {
+    this.client_.registerCallback(MessageType_Enum.EMBED_SIZE_DENIED, (obj) => {
       callback(obj['requestedHeight'], obj['requestedWidth']);
     });
     this.sendDeprecationNotice_('onResizeDenied');
@@ -297,7 +303,7 @@ export class AbstractAmpContext {
    *  Make the ad interactive.
    */
   signalInteractive() {
-    this.client_.sendMessage(MessageType.SIGNAL_INTERACTIVE);
+    this.client_.sendMessage(MessageType_Enum.SIGNAL_INTERACTIVE);
   }
 
   /**
@@ -314,13 +320,13 @@ export class AbstractAmpContext {
    *  Notifies the parent document of no content available inside embed.
    */
   noContentAvailable() {
-    this.client_.sendMessage(MessageType.NO_CONTENT);
+    this.client_.sendMessage(MessageType_Enum.NO_CONTENT);
   }
 
   /**
    *  Parse the metadata attributes from the name and add them to
    *  the class instance.
-   *  @param {!Object|string} data
+   *  @param {string} data
    *  @private
    */
   setupMetadata_(data) {
@@ -340,6 +346,17 @@ export class AbstractAmpContext {
       delete this.data['_context'];
     }
 
+    this.setupMetadataFromContext_(context);
+
+    this.embedType_ = dataObject.type || null;
+  }
+
+  /**
+   *  Set the metadata attributes from the "context" instance directly.
+   *  @param {!Object} context
+   *  @private
+   */
+  setupMetadataFromContext_(context) {
     this.canary = context.canary;
     this.canonicalUrl = context.canonicalUrl;
     this.clientId = context.clientId;
@@ -361,8 +378,6 @@ export class AbstractAmpContext {
     this.sourceUrl = context.sourceUrl;
     this.startTime = context.startTime;
     this.tagName = context.tagName;
-
-    this.embedType_ = dataObject.type || null;
   }
 
   /**
@@ -397,8 +412,11 @@ export class AbstractAmpContext {
     } else if (this.win_.AMP_CONTEXT_DATA) {
       if (typeof this.win_.AMP_CONTEXT_DATA == 'string') {
         this.sentinel = this.win_.AMP_CONTEXT_DATA;
+        // If AMP_CONTEXT_DATA is an Object, Assume that it is the Context Object
+        // and not inside the attributes._context which is the structure
+        // parsed from "name" on other instances.
       } else if (isObject(this.win_.AMP_CONTEXT_DATA)) {
-        this.setupMetadata_(this.win_.AMP_CONTEXT_DATA);
+        this.setupMetadataFromContext_(this.win_.AMP_CONTEXT_DATA);
       }
     } else {
       this.setupMetadata_(this.win_.name);
@@ -413,12 +431,9 @@ export class AbstractAmpContext {
     if (!e.message) {
       return;
     }
-    this.client_.sendMessage(
-      MessageType.USER_ERROR_IN_IFRAME,
-      dict({
-        'message': e.message,
-      })
-    );
+    this.client_.sendMessage(MessageType_Enum.USER_ERROR_IN_IFRAME, {
+      'message': e.message,
+    });
   }
 }
 
diff --git a/3p/bodymovinanimation.js b/3p/bodymovinanimation.js
index c60a3b2f3120..aafcadd54a5a 100644
--- a/3p/bodymovinanimation.js
+++ b/3p/bodymovinanimation.js
@@ -1,20 +1,19 @@
 import {setStyles} from '#core/dom/style';
 import {tryPlay} from '#core/dom/video';
-import {dict} from '#core/types/object';
 import {parseJson} from '#core/types/object/json';
 
 import {getData} from '#utils/event-helper';
 
 import {loadScript} from './3p';
 
-const libSourceUrl = dict({
+const libSourceUrl = {
   'canvas':
     'https://cdnjs.cloudflare.com/ajax/libs/lottie-web/5.7.6/lottie_canvas.min.js',
   'html':
     'https://cdnjs.cloudflare.com/ajax/libs/lottie-web/5.7.6/lottie_html.min.js',
   'svg':
     'https://cdnjs.cloudflare.com/ajax/libs/lottie-web/5.7.6/lottie_svg.min.js',
-});
+};
 
 /**
  * Produces the AirBnB Bodymovin Player SDK object for the passed in callback.
@@ -84,11 +83,9 @@ export function bodymovinanimation(global) {
       autoplay: dataReceived['autoplay'],
       animationData: dataReceived['animationData'],
     });
-    const message = JSON.stringify(
-      dict({
-        'action': 'ready',
-      })
-    );
+    const message = JSON.stringify({
+      'action': 'ready',
+    });
     global.addEventListener('message', parseMessage, false);
     global.parent./*OK*/ postMessage(message, '*');
   });
diff --git a/3p/environment.js b/3p/environment.js
index 63be7559461c..b67105cd7055 100644
--- a/3p/environment.js
+++ b/3p/environment.js
@@ -18,7 +18,11 @@ export function setInViewportForTesting(inV) {
 // Active intervals. Must be global, because people clear intervals
 // with clearInterval from a different window.
 const intervals = {};
-let intervalId = 1;
+
+// TODO(40235): This is so we avoid the ID range of setTimeout. We
+// should also patch setTimeout and clearTimeout to avoid having to
+// use this.
+let intervalId = 10000000;
 
 /**
  * Add instrumentation to a window and all child iframes.
diff --git a/3p/facebook.js b/3p/facebook.js
index 83fd622a2a97..6206888b860f 100644
--- a/3p/facebook.js
+++ b/3p/facebook.js
@@ -1,6 +1,5 @@
 import {setStyle} from '#core/dom/style';
 import {isEnumValue} from '#core/types/enum';
-import {dict} from '#core/types/object';
 import {dashToUnderline} from '#core/types/string';
 
 import {devAssert} from '#utils/log';
@@ -9,9 +8,6 @@ import {loadScript} from './3p';
 
 /** @const @enum {string} */
 export const FacebookEmbedType = {
-  // Embeds a single comment or reply to a comment on a post rendered by
-  // amp-facebook.
-  COMMENT: 'comment',
   // Allows users to comment on the embedded content using their Facebook
   // accounts. Correlates to amp-facebook-comments.
   COMMENTS: 'comments',
@@ -93,25 +89,6 @@ function getVideoContainer(global, data) {
   return container;
 }
 
-/**
- * Create DOM element for the Facebook embedded content plugin for comments or
- * comment replies.
- * @see https://developers.facebook.com/docs/plugins/embedded-comments
- * @param {!Window} global
- * @param {!Object} data The element data
- * @return {!Element} div
- */
-function getCommentContainer(global, data) {
-  const c = global.document.getElementById('c');
-  const container = createContainer(global, 'comment-embed', data.href);
-  container.setAttribute(
-    'data-include-parent',
-    data.includeCommentParent || 'false'
-  );
-  container.setAttribute('data-width', c./*OK*/ offsetWidth);
-  return container;
-}
-
 /**
  * Gets the default type to embed as, if not specified.
  * @param {string} href
@@ -197,8 +174,6 @@ function getEmbedContainer(global, data, embedAs) {
       return getLikeContainer(global, data);
     case FacebookEmbedType.COMMENTS:
       return getCommentsContainer(global, data);
-    case FacebookEmbedType.COMMENT:
-      return getCommentContainer(global, data);
     case FacebookEmbedType.VIDEO:
       return getVideoContainer(global, data);
     default:
@@ -232,14 +207,12 @@ export function facebook(global, data) {
         );
       });
 
-      FB.init({xfbml: true, version: 'v2.5'});
+      FB.init({xfbml: true, version: 'v17.0'});
 
       // Report to parent that the SDK has loaded and is ready to paint
-      const message = JSON.stringify(
-        dict({
-          'action': 'ready',
-        })
-      );
+      const message = JSON.stringify({
+        'action': 'ready',
+      });
       global.parent./*OK*/ postMessage(message, '*');
     },
     data.locale ? data.locale : dashToUnderline(window.navigator.language)
diff --git a/3p/frame-metadata.js b/3p/frame-metadata.js
index e7f65673e120..6bb2e21f2f24 100644
--- a/3p/frame-metadata.js
+++ b/3p/frame-metadata.js
@@ -1,5 +1,4 @@
 import {once} from '#core/types/function';
-import {dict} from '#core/types/object';
 import {parseJson} from '#core/types/object/json';
 
 import {dev} from '#utils/log';
@@ -32,11 +31,11 @@ import {parseUrlDeprecated} from '../src/url';
 export let ContextStateDef;
 
 /** @const {!JsonObject} */
-const FALLBACK = dict({
-  'attributes': dict({
-    '_context': dict(),
-  }),
-});
+const FALLBACK = {
+  'attributes': {
+    '_context': {},
+  },
+};
 
 /**
  * Gets metadata encoded in iframe name attribute.
@@ -72,8 +71,8 @@ export function getAmpConfig() {
 /**
  * @return {!JsonObject}
  */
-const getAttributeDataImpl_ = once(() => {
-  const data = Object.assign(dict({}), allMetadata()['attributes']);
+const getAttributeData = once(() => {
+  const data = Object.assign(Object.create(null), allMetadata()['attributes']);
 
   // TODO(alanorozco): don't delete _context. refactor data object structure.
   if ('_context' in data) {
@@ -83,13 +82,7 @@ const getAttributeDataImpl_ = once(() => {
   return data;
 });
 
-/**
- * @return {!JsonObject}
- */
-export function getAttributeData() {
-  // using indirect invocation to prevent no-export-side-effect issue
-  return getAttributeDataImpl_();
-}
+export {getAttributeData};
 
 /**
  * @return {!Location}
diff --git a/3p/frame.max.html b/3p/frame.max.html
index 85783273e917..c8955d4d68d2 100644
--- a/3p/frame.max.html
+++ b/3p/frame.max.html
@@ -7,7 +7,9 @@
 try {
   url = JSON.parse(window.name).bootstrap;
 } catch (e) {}
-document.write('<script src="' + url + '"><' + '/script>');
+var script = document.createElement('script');
+script.src = url;
+document.write(script.outerHTML);
 </script>
 </head>
 <body style="margin:0">
diff --git a/3p/iframe-messaging-client.js b/3p/iframe-messaging-client.js
index f4215813adea..68608bc75cbe 100644
--- a/3p/iframe-messaging-client.js
+++ b/3p/iframe-messaging-client.js
@@ -5,7 +5,7 @@ import {
   serializeMessage,
 } from '#core/3p-frame-messaging';
 import {Observable} from '#core/data-structures/observable';
-import {dict, map} from '#core/types/object';
+import {map} from '#core/types/object';
 
 import {getData} from '#utils/event-helper';
 import {dev} from '#utils/log';
@@ -55,7 +55,7 @@ export class IframeMessagingClient {
         callback(result[CONSTANTS.contentFieldName]);
       }
     });
-    const data = dict();
+    const data = {};
     data[CONSTANTS.payloadFieldName] = payload;
     data[CONSTANTS.messageIdFieldName] = messageId;
     this.sendMessage(requestType, data);
@@ -156,16 +156,12 @@ export class IframeMessagingClient {
   /**
    * @param {!Window} win
    * @param {string} msg
-   * @suppress {checkTypes} // Can be removed after closure compiler update their externs.
    */
   postMessageWithUserActivation_(win, msg) {
-    win./*OK*/ postMessage(
-      msg,
-      dict({
-        'targetOrigin': '*',
-        'includeUserActivation': true,
-      })
-    );
+    win./*OK*/ postMessage(msg, {
+      'targetOrigin': '*',
+      'includeUserActivation': true,
+    });
   }
 
   /**
@@ -223,7 +219,7 @@ export class IframeMessagingClient {
 
   /**
    * @param {string} messageType
-   * @param {Object} message
+   * @param {object} message
    */
   fireObservable_(messageType, message) {
     if (messageType in this.observableFor_) {
diff --git a/3p/iframe-transport-client.js b/3p/iframe-transport-client.js
index 58d7c26dc24c..cac728bcc7a2 100644
--- a/3p/iframe-transport-client.js
+++ b/3p/iframe-transport-client.js
@@ -1,10 +1,12 @@
-import {IframeTransportEventDef, MessageType} from '#core/3p-frame-messaging';
+import {MessageType_Enum} from '#core/3p-frame-messaging';
 import {tryParseJson} from '#core/types/object/json';
 
 import {dev, devAssert, user, userAssert} from '#utils/log';
 
 import {IframeMessagingClient} from './iframe-messaging-client';
 
+/** @typedef {import('#core/3p-frame-messaging').IframeTransportEventDef} IframeTransportDef */
+
 /** @private @const {string} */
 const TAG_ = 'iframe-transport-client';
 
@@ -18,7 +20,7 @@ export class IframeTransportClient {
     /** @private {!Window} */
     this.win_ = win;
 
-    /** @private {!Object<string, IframeTransportContext>} */
+    /** @private {!{[key: string]: IframeTransportContext}} */
     this.creativeIdToContext_ = {};
 
     const parsedFrameName = tryParseJson(this.win_.name);
@@ -46,8 +48,8 @@ export class IframeTransportClient {
       )
     );
     this.iframeMessagingClient_.makeRequest(
-      MessageType.SEND_IFRAME_TRANSPORT_EVENTS,
-      MessageType.IFRAME_TRANSPORT_EVENTS,
+      MessageType_Enum.SEND_IFRAME_TRANSPORT_EVENTS,
+      MessageType_Enum.IFRAME_TRANSPORT_EVENTS,
       (eventData) => {
         const events = /** @type {!Array<IframeTransportEventDef>} */ (
           eventData['events']
@@ -159,11 +161,11 @@ export class IframeTransportContext {
 
   /**
    * Sends a response message back to the creative.
-   * @param {!Object<string, string>} data
+   * @param {!{[key: string]: string}} data
    */
   sendResponseToCreative(data) {
     this.iframeMessagingClient_./*OK*/ sendMessage(
-      MessageType.IFRAME_TRANSPORT_RESPONSE,
+      MessageType_Enum.IFRAME_TRANSPORT_RESPONSE,
       /** @type {!JsonObject} */
       ({message: data, ...this.baseMessage_})
     );
diff --git a/3p/integration-lib.js b/3p/integration-lib.js
index 36f9a2d3f373..5076d6ed8440 100644
--- a/3p/integration-lib.js
+++ b/3p/integration-lib.js
@@ -1,5 +1,4 @@
 import * as mode from '#core/mode';
-import {dict} from '#core/types/object';
 import {parseJson} from '#core/types/object/json';
 import {endsWith} from '#core/types/string';
 
@@ -15,12 +14,12 @@ import {IntegrationAmpContext} from './ampcontext-integration';
 import {installEmbedStateListener, manageWin} from './environment';
 import {getAmpConfig, getEmbedType, getLocation} from './frame-metadata';
 
-import {urls} from '../src/config';
+import * as urls from '../src/config/urls';
 import {getSourceUrl, isProxyOrigin, parseUrlDeprecated} from '../src/url';
 
 /**
  * Whether the embed type may be used with amp-embed tag.
- * @const {!Object<string, boolean>}
+ * @const {!{[key: string]: boolean}}
  */
 const AMP_EMBED_ALLOWED = {
   _ping_: true,
@@ -49,7 +48,6 @@ const AMP_EMBED_ALLOWED = {
   myua: true,
   mywidget: true,
   nativery: true,
-  lentainform: true,
   opinary: true,
   outbrain: true,
   plista: true,
@@ -314,7 +312,7 @@ export function parseFragment(fragment) {
     if (json.startsWith('{%22')) {
       json = decodeURIComponent(json);
     }
-    return /** @type {!JsonObject} */ (json ? parseJson(json) : dict());
+    return /** @type {!JsonObject} */ (json ? parseJson(json) : {});
   } catch (err) {
     return null;
   }
diff --git a/3p/integration.js b/3p/integration.js
index c8a07dea8761..14dcc4d90bc4 100644
--- a/3p/integration.js
+++ b/3p/integration.js
@@ -33,6 +33,7 @@ import {_ping_} from '#ads/vendors/_ping_';
 // 3P Ad Networks - please keep in alphabetic order
 import {_1wo} from '#ads/vendors/1wo';
 import {_24smi} from '#ads/vendors/24smi';
+import {_4wmarketplace} from '#ads/vendors/4wmarketplace';
 import {a8} from '#ads/vendors/a8';
 import {a9} from '#ads/vendors/a9';
 import {accesstrade} from '#ads/vendors/accesstrade';
@@ -48,6 +49,7 @@ import {adincube} from '#ads/vendors/adincube';
 import {adition} from '#ads/vendors/adition';
 import {adman} from '#ads/vendors/adman';
 import {admanmedia} from '#ads/vendors/admanmedia';
+import {admatic} from '#ads/vendors/admatic';
 import {admixer} from '#ads/vendors/admixer';
 import {adnuntius} from '#ads/vendors/adnuntius';
 import {adocean} from '#ads/vendors/adocean';
@@ -57,6 +59,7 @@ import {adplugg} from '#ads/vendors/adplugg';
 import {adpon} from '#ads/vendors/adpon';
 import {adpushup} from '#ads/vendors/adpushup';
 import {adreactor} from '#ads/vendors/adreactor';
+import {ads2bid} from '#ads/vendors/ads2bid';
 import {adsensor} from '#ads/vendors/adsensor';
 import {adservsolutions} from '#ads/vendors/adservsolutions';
 import {adsloom} from '#ads/vendors/adsloom';
@@ -80,6 +83,7 @@ import {aja} from '#ads/vendors/aja';
 import {amoad} from '#ads/vendors/amoad';
 import {aniview} from '#ads/vendors/aniview';
 import {anyclip} from '#ads/vendors/anyclip';
+import {appmonsta} from '#ads/vendors/appmonsta';
 import {appnexus} from '#ads/vendors/appnexus';
 import {appvador} from '#ads/vendors/appvador';
 import {atomx} from '#ads/vendors/atomx';
@@ -155,7 +159,6 @@ import {ketshwa} from '#ads/vendors/ketshwa';
 import {kiosked} from '#ads/vendors/kiosked';
 import {kixer} from '#ads/vendors/kixer';
 import {kuadio} from '#ads/vendors/kuadio';
-import {lentainform} from '#ads/vendors/lentainform';
 import {ligatus} from '#ads/vendors/ligatus';
 import {lockerdome} from '#ads/vendors/lockerdome';
 import {logly} from '#ads/vendors/logly';
@@ -196,6 +199,7 @@ import {openadstream} from '#ads/vendors/openadstream';
 import {openx} from '#ads/vendors/openx';
 import {opinary} from '#ads/vendors/opinary';
 import {outbrain} from '#ads/vendors/outbrain';
+import {pixad} from '#ads/vendors/pixad';
 import {pixels} from '#ads/vendors/pixels';
 import {playstream} from '#ads/vendors/playstream';
 import {plista} from '#ads/vendors/plista';
@@ -233,11 +237,11 @@ import {runative} from '#ads/vendors/runative';
 import {sas} from '#ads/vendors/sas';
 import {seedingalliance} from '#ads/vendors/seedingalliance';
 import {sekindo} from '#ads/vendors/sekindo';
+import {sevio} from '#ads/vendors/sevio';
 import {sharethrough} from '#ads/vendors/sharethrough';
 import {shemedia} from '#ads/vendors/shemedia';
 import {sklik} from '#ads/vendors/sklik';
 import {slimcutmedia} from '#ads/vendors/slimcutmedia';
-import {smartadserver} from '#ads/vendors/smartadserver';
 import {smartclip} from '#ads/vendors/smartclip';
 import {smi2} from '#ads/vendors/smi2';
 import {smilewanted} from '#ads/vendors/smilewanted';
@@ -283,7 +287,6 @@ import {wisteria} from '#ads/vendors/wisteria';
 import {wpmedia} from '#ads/vendors/wpmedia';
 import {wunderkind} from '#ads/vendors/wunderkind';
 import {xlift} from '#ads/vendors/xlift';
-import {yahoo} from '#ads/vendors/yahoo';
 import {yahoofedads} from '#ads/vendors/yahoofedads';
 import {yahoojp} from '#ads/vendors/yahoojp';
 import {yahoonativeads} from '#ads/vendors/yahoonativeads';
@@ -314,6 +317,7 @@ if (getMode().test || getMode().localDev) {
 register('1wo', _1wo);
 register('24smi', _24smi);
 register('3d-gltf', gltfViewer);
+register('4wmarketplace', _4wmarketplace);
 register('a8', a8);
 register('a9', a9);
 register('accesstrade', accesstrade);
@@ -329,6 +333,7 @@ register('adincube', adincube);
 register('adition', adition);
 register('adman', adman);
 register('admanmedia', admanmedia);
+register('admatic', admatic);
 register('admixer', admixer);
 register('adnuntius', adnuntius);
 register('adocean', adocean);
@@ -339,6 +344,7 @@ register('adpon', adpon);
 register('adpushup', adpushup);
 register('adreactor', adreactor);
 register('adsensor', adsensor);
+register('ads2bid', ads2bid);
 register('adservsolutions', adservsolutions);
 register('adsloom', adsloom);
 register('adsnative', adsnative);
@@ -361,6 +367,7 @@ register('aja', aja);
 register('amoad', amoad);
 register('aniview', aniview);
 register('anyclip', anyclip);
+register('appmonsta', appmonsta);
 register('appnexus', appnexus);
 register('appvador', appvador);
 register('atomx', atomx);
@@ -441,7 +448,6 @@ register('ketshwa', ketshwa);
 register('kiosked', kiosked);
 register('kixer', kixer);
 register('kuadio', kuadio);
-register('lentainform', lentainform);
 register('ligatus', ligatus);
 register('lockerdome', lockerdome);
 register('logly', logly);
@@ -485,6 +491,7 @@ register('openadstream', openadstream);
 register('openx', openx);
 register('opinary', opinary);
 register('outbrain', outbrain);
+register('pixad', pixad);
 register('pixels', pixels);
 register('playstream', playstream);
 register('plista', plista);
@@ -523,12 +530,12 @@ register('runative', runative);
 register('sas', sas);
 register('seedingalliance', seedingalliance);
 register('sekindo', sekindo);
+register('sevio', sevio);
 register('sharethrough', sharethrough);
 register('shemedia', shemedia);
 register('sklik', sklik);
 register('ssp', ssp);
 register('slimcutmedia', slimcutmedia);
-register('smartadserver', smartadserver);
 register('smartclip', smartclip);
 register('smi2', smi2);
 register('smilewanted', smilewanted);
@@ -575,7 +582,6 @@ register('wisteria', wisteria);
 register('wunderkind', wunderkind);
 register('wpmedia', wpmedia);
 register('xlift', xlift);
-register('yahoo', yahoo);
 register('yahoofedads', yahoofedads);
 register('yahoojp', yahoojp);
 register('yahoonativeads', yahoonativeads);
diff --git a/3p/recaptcha.js b/3p/recaptcha.js
index 5af6e6cf2e6d..3797bf140907 100644
--- a/3p/recaptcha.js
+++ b/3p/recaptcha.js
@@ -1,7 +1,7 @@
 // src/polyfills.js must be the first import.
 import './polyfills';
 
-import {dict, hasOwn} from '#core/types/object';
+import {hasOwn} from '#core/types/object';
 import {parseJson} from '#core/types/object/json';
 
 import {
@@ -142,7 +142,7 @@ function initializeIframeMessagingClient(win, grecaptcha, dataObject) {
  *
  * @param {Window} win
  * @param {*} grecaptcha
- * @param {Object} data
+ * @param {object} data
  */
 function actionTypeHandler(win, grecaptcha, data) {
   doesOriginDomainMatchIframeSrc(win, data)
@@ -154,13 +154,10 @@ function actionTypeHandler(win, grecaptcha, data) {
       // .then() promise pollyfilled by recaptcha api script
       executePromise./*OK*/ then(
         function (token) {
-          iframeMessagingClient./*OK*/ sendMessage(
-            'amp-recaptcha-token',
-            dict({
-              'id': data.id,
-              'token': token,
-            })
-          );
+          iframeMessagingClient./*OK*/ sendMessage('amp-recaptcha-token', {
+            'id': data.id,
+            'token': token,
+          });
         },
         function (err) {
           let message =
@@ -170,13 +167,10 @@ function actionTypeHandler(win, grecaptcha, data) {
             message = err.toString();
           }
           user().error(TAG, '%s', message);
-          iframeMessagingClient./*OK*/ sendMessage(
-            'amp-recaptcha-error',
-            dict({
-              'id': data.id,
-              'error': message,
-            })
-          );
+          iframeMessagingClient./*OK*/ sendMessage('amp-recaptcha-error', {
+            'id': data.id,
+            'error': message,
+          });
         }
       );
     })
@@ -189,7 +183,7 @@ function actionTypeHandler(win, grecaptcha, data) {
  * Function to verify our origin domain from the
  * parent window.
  * @param {Window} win
- * @param {Object} data
+ * @param {object} data
  * @return {!Promise}
  */
 export function doesOriginDomainMatchIframeSrc(win, data) {
diff --git a/3p/vendors/4wmarketplace.js b/3p/vendors/4wmarketplace.js
new file mode 100644
index 000000000000..e1efe0efb1c3
--- /dev/null
+++ b/3p/vendors/4wmarketplace.js
@@ -0,0 +1,12 @@
+// src/polyfills.js must be the first import.
+import '#3p/polyfills';
+
+import {register} from '#3p/3p';
+import {draw3p, init} from '#3p/integration-lib';
+
+import {_4wmarketplace} from '#ads/vendors/4wmarketplace';
+
+init(window);
+register('4wmarketplace', _4wmarketplace);
+
+window.draw3p = draw3p;
diff --git a/3p/vendors/adenza.js b/3p/vendors/adenza.js
new file mode 100644
index 000000000000..df68846aca40
--- /dev/null
+++ b/3p/vendors/adenza.js
@@ -0,0 +1,12 @@
+// src/polyfills.js must be the first import.
+import '#3p/polyfills';
+
+import {register} from '#3p/3p';
+import {draw3p, init} from '#3p/integration-lib';
+
+import {adenza} from '#ads/vendors/adenza';
+
+init(window);
+register('adenza', adenza);
+
+window.draw3p = draw3p;
diff --git a/3p/vendors/admatic.js b/3p/vendors/admatic.js
new file mode 100644
index 000000000000..725738aa2a47
--- /dev/null
+++ b/3p/vendors/admatic.js
@@ -0,0 +1,12 @@
+// src/polyfills.js must be the first import.
+import '#3p/polyfills';
+
+import {register} from '#3p/3p';
+import {draw3p, init} from '#3p/integration-lib';
+
+import {admatic} from '#ads/vendors/admatic';
+
+init(window);
+register('admatic', admatic);
+
+window.draw3p = draw3p;
diff --git a/3p/vendors/ads2bid.js b/3p/vendors/ads2bid.js
new file mode 100644
index 000000000000..52fe84f21acc
--- /dev/null
+++ b/3p/vendors/ads2bid.js
@@ -0,0 +1,12 @@
+// src/polyfills.js must be the first import.
+import '#3p/polyfills';
+
+import {register} from '#3p/3p';
+import {draw3p, init} from '#3p/integration-lib';
+
+import {ads2bid} from '#ads/vendors/ads2bid';
+
+init(window);
+register('ads2bid', ads2bid);
+
+window.draw3p = draw3p;
diff --git a/3p/vendors/adsviu.js b/3p/vendors/adsviu.js
new file mode 100644
index 000000000000..2bd3e00c4bac
--- /dev/null
+++ b/3p/vendors/adsviu.js
@@ -0,0 +1,28 @@
+/**
+ * Copyright 2023 The AMP HTML Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// src/polyfills.js must be the first import.
+import '#3p/polyfills';
+
+import {register} from '#3p/3p';
+import {draw3p, init} from '#3p/integration-lib';
+
+import {adsviu} from '#ads/vendors/adsviu';
+
+init(window);
+register('adsviu', adsviu);
+
+window.draw3p = draw3p;
diff --git a/3p/vendors/affinity.js b/3p/vendors/affinity.js
new file mode 100644
index 000000000000..5730b83da6a8
--- /dev/null
+++ b/3p/vendors/affinity.js
@@ -0,0 +1,12 @@
+// src/polyfills.js must be the first import.
+import '#3p/polyfills';
+
+import {register} from '#3p/3p';
+import {draw3p, init} from '#3p/integration-lib';
+
+import {affinity} from '#ads/vendors/affinity';
+
+init(window);
+register('affinity', affinity);
+
+window.draw3p = draw3p;
diff --git a/3p/vendors/appmonsta.js b/3p/vendors/appmonsta.js
new file mode 100644
index 000000000000..642b7b4717f8
--- /dev/null
+++ b/3p/vendors/appmonsta.js
@@ -0,0 +1,12 @@
+// src/polyfills.js must be the first import.
+import '#3p/polyfills';
+
+import {register} from '#3p/3p';
+import {draw3p, init} from '#3p/integration-lib';
+
+import {appmonsta} from '#ads/vendors/appmonsta';
+
+init(window);
+register('appmonsta', appmonsta);
+
+window.draw3p = draw3p;
diff --git a/3p/vendors/bidgear.js b/3p/vendors/bidgear.js
new file mode 100644
index 000000000000..79ec95df9b1b
--- /dev/null
+++ b/3p/vendors/bidgear.js
@@ -0,0 +1,12 @@
+// src/polyfills.js must be the first import.
+import '#3p/polyfills';
+
+import {register} from '#3p/3p';
+import {draw3p, init} from '#3p/integration-lib';
+
+import {bidgear} from '#ads/vendors/bidgear';
+
+init(window);
+register('bidgear', bidgear);
+
+window.draw3p = draw3p;
diff --git a/3p/vendors/clever.js b/3p/vendors/clever.js
new file mode 100644
index 000000000000..b01e369227cb
--- /dev/null
+++ b/3p/vendors/clever.js
@@ -0,0 +1,12 @@
+// src/polyfills.js must be the first import.
+import '#3p/polyfills';
+
+import {register} from '#3p/3p';
+import {draw3p, init} from '#3p/integration-lib';
+
+import {clever} from '#ads/vendors/clever';
+
+init(window);
+register('clever', clever);
+
+window.draw3p = draw3p;
diff --git a/3p/vendors/cognativex.js b/3p/vendors/cognativex.js
new file mode 100644
index 000000000000..b34fea36016d
--- /dev/null
+++ b/3p/vendors/cognativex.js
@@ -0,0 +1,12 @@
+// src/polyfills.js must be the first import.
+import '#3p/polyfills';
+
+import {register} from '#3p/3p';
+import {draw3p, init} from '#3p/integration-lib';
+
+import {cognativex} from '#ads/vendors/cognativex';
+
+init(window);
+register('cognativex', cognativex);
+
+window.draw3p = draw3p;
diff --git a/3p/vendors/dex.js b/3p/vendors/dex.js
new file mode 100644
index 000000000000..247668faa382
--- /dev/null
+++ b/3p/vendors/dex.js
@@ -0,0 +1,11 @@
+import '#3p/polyfills';
+
+import {register} from '#3p/3p';
+import {draw3p, init} from '#3p/integration-lib';
+
+import {dex} from '#ads/vendors/dex';
+
+init(window);
+register('dex', dex);
+
+window.draw3p = draw3p;
diff --git a/3p/vendors/fairground.js b/3p/vendors/fairground.js
new file mode 100644
index 000000000000..c74b28279e49
--- /dev/null
+++ b/3p/vendors/fairground.js
@@ -0,0 +1,12 @@
+// src/polyfills.js must be the first import.
+import '#3p/polyfills';
+
+import {register} from '#3p/3p';
+import {draw3p, init} from '#3p/integration-lib';
+
+import {fairground} from '#ads/vendors/fairground';
+
+init(window);
+register('fairground', fairground);
+
+window.draw3p = draw3p;
diff --git a/3p/vendors/geozo.js b/3p/vendors/geozo.js
new file mode 100644
index 000000000000..ff832726a711
--- /dev/null
+++ b/3p/vendors/geozo.js
@@ -0,0 +1,12 @@
+// src/polyfills.js must be the first import.
+import '#3p/polyfills';
+
+import {register} from '#3p/3p';
+import {draw3p, init} from '#3p/integration-lib';
+
+import {geozo} from '#ads/vendors/geozo';
+
+init(window);
+register('geozo', geozo);
+
+window.draw3p = draw3p;
diff --git a/3p/vendors/incrementx.js b/3p/vendors/incrementx.js
new file mode 100644
index 000000000000..d9a7fde3a56e
--- /dev/null
+++ b/3p/vendors/incrementx.js
@@ -0,0 +1,12 @@
+// src/polyfills.js must be the first import.
+import '#3p/polyfills';
+
+import {register} from '#3p/3p';
+import {draw3p, init} from '#3p/integration-lib';
+
+import {incrementx} from '#ads/vendors/incrementx';
+
+init(window);
+register('incrementx', incrementx);
+
+window.draw3p = draw3p;
diff --git a/3p/vendors/insurads.js b/3p/vendors/insurads.js
new file mode 100644
index 000000000000..0ff98bc358b4
--- /dev/null
+++ b/3p/vendors/insurads.js
@@ -0,0 +1,12 @@
+// src/polyfills.js must be the first import.
+import '#3p/polyfills';
+
+import {register} from '#3p/3p';
+import {draw3p, init} from '#3p/integration-lib';
+
+import {insurads} from '#ads/vendors/insurads';
+
+init(window);
+register('insurads', insurads);
+
+window.draw3p = draw3p;
diff --git a/3p/vendors/jioads.js b/3p/vendors/jioads.js
new file mode 100644
index 000000000000..05f171aaba73
--- /dev/null
+++ b/3p/vendors/jioads.js
@@ -0,0 +1,11 @@
+import '#3p/polyfills';
+
+import {register} from '#3p/3p';
+import {draw3p, init} from '#3p/integration-lib';
+
+import {jioads} from '#ads/vendors/jioads';
+
+init(window);
+register('jioads', jioads);
+
+window.draw3p = draw3p;
diff --git a/3p/vendors/lentainform.js b/3p/vendors/lentainform.js
deleted file mode 100644
index 88b18c1081e4..000000000000
--- a/3p/vendors/lentainform.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// src/polyfills.js must be the first import.
-import '#3p/polyfills';
-
-import {register} from '#3p/3p';
-import {draw3p, init} from '#3p/integration-lib';
-
-import {lentainform} from '#ads/vendors/lentainform';
-
-init(window);
-register('lentainform', lentainform);
-
-window.draw3p = draw3p;
diff --git a/3p/vendors/momagic.js b/3p/vendors/momagic.js
new file mode 100644
index 000000000000..7b0c769c1852
--- /dev/null
+++ b/3p/vendors/momagic.js
@@ -0,0 +1,12 @@
+// src/polyfills.js must be the first import.
+import '#3p/polyfills';
+
+import {register} from '#3p/3p';
+import {draw3p, init} from '#3p/integration-lib';
+
+import {momagic} from '#ads/vendors/momagic';
+
+init(window);
+register('momagic', momagic);
+
+window.draw3p = draw3p;
diff --git a/3p/vendors/piberica.js b/3p/vendors/piberica.js
new file mode 100644
index 000000000000..4eb1888eb471
--- /dev/null
+++ b/3p/vendors/piberica.js
@@ -0,0 +1,12 @@
+// src/polyfills.js must be the first import.
+import '#3p/polyfills';
+
+import {register} from '#3p/3p';
+import {draw3p, init} from '#3p/integration-lib';
+
+import {piberica} from '#ads/vendors/piberica';
+
+init(window);
+register('piberica', piberica);
+
+window.draw3p = draw3p;
diff --git a/3p/vendors/pixad.js b/3p/vendors/pixad.js
new file mode 100644
index 000000000000..6a90617263a9
--- /dev/null
+++ b/3p/vendors/pixad.js
@@ -0,0 +1,12 @@
+// src/polyfills.js must be the first import.
+import '#3p/polyfills';
+
+import {register} from '#3p/3p';
+import {draw3p, init} from '#3p/integration-lib';
+
+import {pixad} from '#ads/vendors/pixad';
+
+init(window);
+register('pixad', pixad);
+
+window.draw3p = draw3p;
diff --git a/3p/vendors/pubfuture.js b/3p/vendors/pubfuture.js
new file mode 100644
index 000000000000..81764096b740
--- /dev/null
+++ b/3p/vendors/pubfuture.js
@@ -0,0 +1,12 @@
+// src/polyfills.js must be the first import.
+import '#3p/polyfills';
+
+import {register} from '#3p/3p';
+import {draw3p, init} from '#3p/integration-lib';
+
+import {pubfuture} from '#ads/vendors/pubfuture';
+
+init(window);
+register('pubfuture', pubfuture);
+
+window.draw3p = draw3p;
diff --git a/3p/vendors/pubscale.js b/3p/vendors/pubscale.js
new file mode 100644
index 000000000000..2e8eb9f38e16
--- /dev/null
+++ b/3p/vendors/pubscale.js
@@ -0,0 +1,12 @@
+// src/polyfills.js must be the first import.
+import '#3p/polyfills';
+
+import {register} from '#3p/3p';
+import {draw3p, init} from '#3p/integration-lib';
+
+import {pubscale} from '#ads/vendors/pubscale';
+
+init(window);
+register('pubscale', pubscale);
+
+window.draw3p = draw3p;
diff --git a/3p/vendors/r9x.js b/3p/vendors/r9x.js
new file mode 100644
index 000000000000..6a1e789678c3
--- /dev/null
+++ b/3p/vendors/r9x.js
@@ -0,0 +1,12 @@
+// src/polyfills.js must be the first import.
+import '#3p/polyfills';
+
+import {register} from '#3p/3p';
+import {draw3p, init} from '#3p/integration-lib';
+
+import {r9x} from '#ads/vendors/r9x';
+
+init(window);
+register('r9x', r9x);
+
+window.draw3p = draw3p;
diff --git a/3p/vendors/sevio.js b/3p/vendors/sevio.js
new file mode 100644
index 000000000000..3a8b56ceea1a
--- /dev/null
+++ b/3p/vendors/sevio.js
@@ -0,0 +1,12 @@
+// src/polyfills.js must be the first import.
+import '#3p/polyfills';
+
+import {register} from '#3p/3p';
+import {draw3p, init} from '#3p/integration-lib';
+
+import {sevio} from '#ads/vendors/sevio';
+
+init(window);
+register('sevio', sevio);
+
+window.draw3p = draw3p;
diff --git a/3p/vendors/skoiy.js b/3p/vendors/skoiy.js
new file mode 100644
index 000000000000..8b6dc9d55523
--- /dev/null
+++ b/3p/vendors/skoiy.js
@@ -0,0 +1,12 @@
+// src/polyfills.js must be the first import.
+import '#3p/polyfills';
+
+import {register} from '#3p/3p';
+import {draw3p, init} from '#3p/integration-lib';
+
+import {skoiy} from '#ads/vendors/skoiy';
+
+init(window);
+register('skoiy', skoiy);
+
+window.draw3p = draw3p;
diff --git a/3p/vendors/smartadserver.js b/3p/vendors/smartadserver.js
deleted file mode 100644
index b93432464cc0..000000000000
--- a/3p/vendors/smartadserver.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// src/polyfills.js must be the first import.
-import '#3p/polyfills';
-
-import {register} from '#3p/3p';
-import {draw3p, init} from '#3p/integration-lib';
-
-import {smartadserver} from '#ads/vendors/smartadserver';
-
-init(window);
-register('smartadserver', smartadserver);
-
-window.draw3p = draw3p;
diff --git a/3p/vendors/vox.js b/3p/vendors/vox.js
new file mode 100644
index 000000000000..af0dbc25dd48
--- /dev/null
+++ b/3p/vendors/vox.js
@@ -0,0 +1,11 @@
+import '#3p/polyfills';
+
+import {register} from '#3p/3p';
+import {draw3p, init} from '#3p/integration-lib';
+
+import {vox} from '#ads/vendors/vox';
+
+init(window);
+register('vox', vox);
+
+window.draw3p = draw3p;
diff --git a/3p/vendors/yahoo.js b/3p/vendors/yahoo.js
deleted file mode 100644
index 2d0f5475c193..000000000000
--- a/3p/vendors/yahoo.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// src/polyfills.js must be the first import.
-import '#3p/polyfills';
-
-import {register} from '#3p/3p';
-import {draw3p, init} from '#3p/integration-lib';
-
-import {yahoo} from '#ads/vendors/yahoo';
-
-init(window);
-register('yahoo', yahoo);
-
-window.draw3p = draw3p;
diff --git a/3p/viqeoplayer.js b/3p/viqeoplayer.js
index 803630a34024..28e6381b6959 100644
--- a/3p/viqeoplayer.js
+++ b/3p/viqeoplayer.js
@@ -7,7 +7,7 @@ import {loadScript} from './3p';
 
 /**
  * @param {Window} global
- * @param {Object} VIQEO
+ * @param {object} VIQEO
  * @private
  */
 function viqeoPlayerInitLoaded(global, VIQEO) {
diff --git a/OWNERS b/OWNERS
index a7a8022bd378..c67a35cc8f26 100644
--- a/OWNERS
+++ b/OWNERS
@@ -6,10 +6,11 @@
   rules: [
     {
       owners: [
-        {name: 'cramforce', requestReviews: false},
-        {name: 'dvoytenko', requestReviews: false},
-        {name: 'jridgewell', requestReviews: false},
-        {name: 'kristoferbaxter', requestReviews: false},
+        {name: 'erwinmombay', requestReviews: true},
+        {name: 'danielrozenberg', requestReviews: true},
+        {name: 'powerivq', requestReviews: true},
+        {name: 'ychsieh', requestReviews: true},
+        {name: 'banaag', requestReviews: true},
       ],
     },
     {
@@ -44,12 +45,31 @@
     },
     {
       pattern: '**/OWNERS',
-      owners: [{name: 'mrjoro', requestReviews: false}],
+      owners: [
+        {name: 'erwinmombay', requestReviews: false},
+        {name: 'mrjoro', requestReviews: false},
+        {name: 'newmuis', requestReviews: false},
+      ],
     },
     {
       // Locked down to minimize new import aliases being added
-      pattern: 'tsconfig.json',
+      pattern: 'tsconfig{,.base}.json',
       owners: [{name: 'ampproject/wg-performance', required: true}],
     },
+    {
+      pattern: '**/tsconfig.json',
+      owners: [{name: 'ampproject/wg-performance'}],
+    },
+    {
+      pattern: '**/*.d.ts',
+      owners: [
+        {name: 'ampproject/wg-infra'},
+        {name: 'ampproject/wg-performance'},
+      ],
+    },
+    {
+      pattern: '**/build-dom.js',
+      owners: [{name: 'erwinmombay'}],
+    },
   ],
 }
diff --git a/README.md b/README.md
index eab68c33433d..de7ac422d9f4 100644
--- a/README.md
+++ b/README.md
@@ -5,19 +5,6 @@
 [![Build Status](https://img.shields.io/circleci/build/github/ampproject/amphtml/main 'Build Status')](https://app.circleci.com/pipelines/github/ampproject/amphtml?branch=main)
 [![GitHub Release](https://img.shields.io/github/release/ampproject/amphtml.svg?logo=GitHub&style=flat-square 'GitHub Release')](https://github.com/ampproject/amphtml/releases/latest)
 [![Commits](https://img.shields.io/github/commit-activity/m/ampproject/amphtml.svg?logo=GitHub&style=flat-square 'Commits')](https://github.com/ampproject/amphtml/pulse/monthly)
-[![Badges](https://img.shields.io/badge/badges-16-brightgreen?logo=GitHub&style=flat-square)](#)
-
-<details>
-<summary>
-Metrics
-  
-</summary>
-
-[![Absolute Code Coverage](https://img.shields.io/endpoint.svg?logo=Codecov&logoColor=white&style=flat-square&url=https%3A%2F%2Famp-project-metrics.appspot.com%2Fapi%2Fbadge%2FAbsoluteCoverageMetric 'Test coverage for the repository as computed by CodeCov')](https://codecov.io/gh/ampproject/amphtml/)
-[![Cherrypick Issue Count](https://img.shields.io/endpoint.svg?logo=GitHub&logoColor=white&style=flat-square&url=https%3A%2F%2Famp-project-metrics.appspot.com%2Fapi%2Fbadge%2FCherrypickIssueCountMetric 'Number of cherry-pick issues in the last 90 days')](https://github.com/ampproject/amphtml/issues?utf8=%E2%9C%93&q=is%3Aissue+title%3A+%22Cherry-pick%22)
-[![Release Granularity](https://img.shields.io/endpoint.svg?logo=GitHub&logoColor=white&style=flat-square&url=https%3A%2F%2Famp-project-metrics.appspot.com%2Fapi%2Fbadge%2FReleaseGranularityMetric 'Average commits per release over the last 90 days')](https://github.com/ampproject/amphtml/releases)
-
-</details>
 
 <details>
 <summary>
@@ -28,7 +15,6 @@ Tooling
 [![Percy](https://img.shields.io/badge/%F0%9F%A6%94%20visual%20testing-Percy-violet.svg?style=flat-square 'Percy')](https://percy.io/ampproject/amphtml)
 [![Prettier](https://img.shields.io/badge/code_style-Prettier-ff69b4.svg?logo=Prettier&logoColor=white&style=flat-square 'Prettier')](https://github.com/prettier/prettier)
 [![Codecov](https://img.shields.io/badge/test_coverage-CodeCov-f01f7a.svg?logo=Codecov&logoColor=white&style=flat-square 'Codecov')](https://codecov.io/gh/ampproject/amphtml/)
-[![LGTM](https://img.shields.io/lgtm/alerts/github/ampproject/amphtml.svg?logo=lgtm&style=flat-square 'LGTM')](https://lgtm.com/projects/g/ampproject/amphtml/)
 [![Renovate](https://img.shields.io/badge/renovate-enabled-brightgreen.svg?logo=dependabot&style=flat-square 'Renovate')](https://renovateapp.com/)
 
 </details>
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 000000000000..821e914eb7c1
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,13 @@
+# Security Policy
+
+## Supported Versions
+
+Security updates are applied only to the latest release.
+
+## Reporting a Vulnerability
+
+If you have discovered a security vulnerability in this project, please report it privately. **Do not disclose it as a public issue.** This gives us time to work with you to fix the issue before public exposure, reducing the chance that the exploit will be used before a patch is released.
+
+Please disclose it at [security advisory](https://github.com/ampproject/amphtml/security/advisories/new).
+
+This project is maintained by a team on a best effort basis. As such, vulnerability reports will be investigated and fixed or disclosed as soon as possible.
diff --git a/ads/_a4a-config.js b/ads/_a4a-config.js
index 9611f0d01f20..9d7aab2fadea 100644
--- a/ads/_a4a-config.js
+++ b/ads/_a4a-config.js
@@ -11,13 +11,13 @@ import {map} from '#core/types/object';
  * Otherwise, it will attempt to render the ad via the existing "3p iframe"
  * pathway (delay load into a cross-domain iframe).
  *
- * @type {!Object<string, function(!Window, !Element): boolean>}
+ * @type {!{[key: string]: function(!Window, !Element): boolean}}
  */
 let a4aRegistry;
 
 /**
  * Returns the a4a registry map
- * @return {Object}
+ * @return {object}
  */
 export function getA4ARegistry() {
   if (!a4aRegistry) {
@@ -27,7 +27,11 @@ export function getA4ARegistry() {
       'dianomi': () => true,
       'doubleclick': () => true,
       'fake': () => true,
+      'mgid': (win, adTag) =>
+        !adTag.hasAttribute('data-container') &&
+        !adTag.hasAttribute('data-website'),
       'nws': () => true,
+      'smartadserver': () => true,
       'valueimpression': () => true,
       // TODO: Add new ad network implementation "is enabled" functions here.
       // Note: if you add a function here that requires a new "import", above,
@@ -42,9 +46,11 @@ export function getA4ARegistry() {
 
 /**
  * An object mapping signing server names to their corresponding URLs.
- * @type {!Object<string, string>}
+ * @type {!{[key: string]: string}}
  */
 export const signingServerURLs = {
+  /* eslint-disable local/no-forbidden-terms */
   'google': 'https://cdn.ampproject.org/amp-ad-verifying-keyset.json',
   'google-dev': 'https://cdn.ampproject.org/amp-ad-verifying-keyset-dev.json',
+  /* eslint-enable local/no-forbidden-terms */
 };
diff --git a/ads/_config.js b/ads/_config.js
index e91d7a43ab6d..560ba24f2e9f 100755
--- a/ads/_config.js
+++ b/ads/_config.js
@@ -46,7 +46,7 @@ let AdNetworkConfigDef;
  *   fullWidthHeightRatio: number
  * }
  *
- * @const {!Object<string, !JsonObject>}
+ * @const {!{[key: string]: !JsonObject}}
  */
 const adConfig = jsonConfiguration({
   '_ping_': {
@@ -62,6 +62,10 @@ const adConfig = jsonConfiguration({
     preconnect: 'https://data.24smi.net',
   },
 
+  '4wmarketplace': {
+    renderStartImplemented: true,
+  },
+
   'a8': {
     prefetch: 'https://statics.a8.net/amp/ad.js',
     renderStartImplemented: true,
@@ -97,6 +101,10 @@ const adConfig = jsonConfiguration({
     prefetch: 'https://servedbyadbutler.com/app.js',
   },
 
+  'adenza': {
+    renderStartImplemented: true,
+  },
+
   'adform': {},
 
   'adfox': {
@@ -129,6 +137,8 @@ const adConfig = jsonConfiguration({
     renderStartImplemented: true,
   },
 
+  'admatic': {},
+
   'admixer': {
     renderStartImplemented: true,
     preconnect: ['https://inv-nets.admixer.net', 'https://cdn.admixer.net'],
@@ -166,6 +176,10 @@ const adConfig = jsonConfiguration({
 
   'adreactor': {},
 
+  'ads2bid': {
+    renderStartImplemented: true,
+  },
+
   'adsensor': {
     prefetch: 'https://wfpscripts.webspectator.com/amp/adsensor-amp.js',
     clientIdScope: 'amp_ecid_adensor',
@@ -228,6 +242,11 @@ const adConfig = jsonConfiguration({
     renderStartImplemented: true,
   },
 
+  'adsviu': {
+    prefetch: 'https://widget.adsviu.com/adsviuAMP.js',
+    preconnect: ['https://api.adsviu.com'],
+  },
+
   'adunity': {
     preconnect: ['https://content.adunity.com'],
     renderStartImplemented: true,
@@ -274,6 +293,11 @@ const adConfig = jsonConfiguration({
     renderStartImplemented: true,
   },
 
+  'affinity': {
+    prefetch: 'https://securepubads.g.doubleclick.net/tag/js/gpt.js',
+    preconnect: 'https://cdn4-hbs.affinitymatrix.com',
+  },
+
   'aja': {
     prefetch: [
       'https://cdn.as.amanad.adtdp.com/sdk/asot-amp.js',
@@ -326,6 +350,10 @@ const adConfig = jsonConfiguration({
     renderStartImplemented: true,
   },
 
+  'appmonsta': {
+    preconnect: 'https://ssp.appmonsta.ai',
+  },
+
   'appnexus': {
     prefetch: 'https://acdn.adnxs.com/ast/ast.js',
     preconnect: 'https://ib.adnxs.com',
@@ -354,6 +382,11 @@ const adConfig = jsonConfiguration({
     renderStartImplemented: true,
   },
 
+  'bidgear': {
+    prefetch: 'https://platform.bidgear.com/bidgear-amp.js',
+    renderStartImplemented: true,
+  },
+
   'bidtellect': {},
 
   'blade': {
@@ -402,6 +435,8 @@ const adConfig = jsonConfiguration({
 
   'chargeads': {}, // Deprecated, to be removed on 2019-05-23
 
+  'cognativex': {},
+
   'colombia': {
     prefetch: 'https://static.clmbtech.com/ad/commons/js/colombia-amp.js',
   },
@@ -430,6 +465,10 @@ const adConfig = jsonConfiguration({
     prefetch: 'https://www.google.com/adsense/search/ads.js',
   },
 
+  'clever': {
+    renderStartImplemented: true,
+  },
+
   'dable': {
     preconnect: [
       'https://static.dable.io',
@@ -439,6 +478,10 @@ const adConfig = jsonConfiguration({
     renderStartImplemented: true,
   },
 
+  'dex': {
+    renderStartImplemented: true,
+  },
+
   'digiteka': {
     renderStartImplemented: true,
   },
@@ -508,6 +551,8 @@ const adConfig = jsonConfiguration({
     renderStartImplemented: true,
   },
 
+  'fairground': {},
+
   'fake': {},
 
   'fake-delayed': {
@@ -566,6 +611,10 @@ const adConfig = jsonConfiguration({
     prefetch: 'https://js.gsspcln.jp/l/amp.js',
   },
 
+  'geozo': {
+    renderStartImplemented: true,
+  },
+
   'giraff': {
     renderStartImplemented: true,
   },
@@ -614,6 +663,11 @@ const adConfig = jsonConfiguration({
   },
   'improvedigital': {},
 
+  'incrementx': {
+    prefetch: 'https://cdn.incrementxserv.com/ixamp.js',
+    renderStartImplemented: true,
+  },
+
   'industrybrains': {
     prefetch: 'https://web.industrybrains.com/js/ads/async/show.js',
     preconnect: [
@@ -639,6 +693,18 @@ const adConfig = jsonConfiguration({
     renderStartImplemented: true,
   },
 
+  'insurads': {
+    prefetch: 'https://securepubads.g.doubleclick.net/tag/js/gpt.js',
+    preconnect: [
+      'https://tpc.googlesyndication.com',
+      'https://cdn.insurads.com',
+      'https://services.insurads.com',
+      'https://messaging.insurads.com',
+    ],
+    renderStartImplemented: true,
+    consentHandlingOverride: true,
+  },
+
   'invibes': {
     prefetch: 'https://k.r66net.com/GetAmpLink',
     renderStartImplemented: true,
@@ -664,11 +730,13 @@ const adConfig = jsonConfiguration({
   'kiosked': {
     renderStartImplemented: true,
   },
-
+  'jioads': {
+    renderStartImplemented: true,
+  },
   'jixie': {
-    prefetch: ['https://scripts.jixie.io/jxamp.min.js'],
+    prefetch: ['https://scripts.jixie.media/jxamp.min.js'],
     clientIdScope: '__jxamp',
-    clientIdCookieName: '_jx',
+    clientIdCookieName: '_jxx',
     renderStartImplemented: true,
   },
 
@@ -679,15 +747,6 @@ const adConfig = jsonConfiguration({
 
   'kuadio': {},
 
-  'lentainform': {
-    renderStartImplemented: true,
-    preconnect: [
-      'https://jsc.lentainform.com',
-      'https://servicer.lentainform.com',
-      'https://s-img.lentainform.com',
-    ],
-  },
-
   'ligatus': {
     prefetch: 'https://ssl.ligatus.com/render/ligrend.js',
     renderStartImplemented: true,
@@ -746,7 +805,6 @@ const adConfig = jsonConfiguration({
       'https://marfeel-d.openx.net',
       'https://ice.360yield.com',
       'https://mbid.marfeelrev.com',
-      'https://adservice.google.com',
     ],
     consentHandlingOverride: true,
   },
@@ -814,6 +872,11 @@ const adConfig = jsonConfiguration({
     preconnect: ['https://player1.mixpo.com', 'https://player2.mixpo.com'],
   },
 
+  'momagic': {
+    prefetch: 'https://securepubads.g.doubleclick.net/tag/js/gpt.js',
+    preconnect: ['https://amp.truereach.co.in/'],
+  },
+
   'monetizer101': {
     renderStartImplemented: true,
   },
@@ -933,6 +996,13 @@ const adConfig = jsonConfiguration({
     consentHandlingOverride: true,
   },
 
+  'piberica': {
+    preconnect: ['https://trafico.prensaiberica.es'],
+    renderStartImplemented: true,
+  },
+
+  'pixad': {},
+
   'pixels': {
     prefetch: 'https://cdn.adsfactor.net/amp/pixels-amp.min.js',
     clientIdCookieName: '__AF',
@@ -973,6 +1043,10 @@ const adConfig = jsonConfiguration({
 
   'pubexchange': {},
 
+  'pubfuture': {
+    renderStartImplemented: true,
+  },
+
   'pubguru': {
     renderStartImplemented: true,
   },
@@ -987,6 +1061,10 @@ const adConfig = jsonConfiguration({
     renderStartImplemented: true,
   },
 
+  'pubscale': {
+    renderStartImplemented: true,
+  },
+
   'puffnetwork': {
     prefetch: 'https://static.puffnetwork.com/amp_ad.js',
     renderStartImplemented: true,
@@ -1013,6 +1091,11 @@ const adConfig = jsonConfiguration({
     renderStartImplemented: true,
   },
 
+  'r9x': {
+    prefetch: 'https://securepubads.g.doubleclick.net/tag/js/gpt.js',
+    preconnect: 'https://cdn.r9x.in',
+  },
+
   'rakutenunifiedads': {
     prefetch: 'https://s-cdn.rmp.rakuten.co.jp/js/amp.js',
     renderStartImplemented: true,
@@ -1025,6 +1108,7 @@ const adConfig = jsonConfiguration({
   'rcmwidget': {
     prefetch: 'https://rcmjs.rambler.ru/static/rcmw/rcmw-amp.js',
     renderStartImplemented: true,
+    clientIdScope: '__rcmw_amp',
   },
 
   'readmo': {
@@ -1101,7 +1185,7 @@ const adConfig = jsonConfiguration({
   'seedingalliance': {},
 
   'seedtag': {
-    prefetch: 'https://config.seedtag.com/omid/bridge/bridge.js',
+    prefetch: 'https://t.seedtag.com/c/loader.js',
     preconnect: ['https://s.seedtag.com'],
     consentHandlingOverride: true,
     renderStartImplemented: true,
@@ -1111,6 +1195,12 @@ const adConfig = jsonConfiguration({
     renderStartImplemented: true,
   },
 
+  'sevio': {
+    preconnect: ['https://request.adx.ws'],
+    prefetch: ['https://cdn.adx.ws/scripts/amp.js'],
+    renderStartImplemented: true,
+  },
+
   'sharethrough': {
     renderStartImplemented: true,
   },
@@ -1132,6 +1222,10 @@ const adConfig = jsonConfiguration({
     prefetch: 'https://c.imedia.cz/js/amp.js',
   },
 
+  'skoiy': {
+    preconnect: ['https://svas.skoiy.xyz'],
+  },
+
   'slimcutmedia': {
     preconnect: [
       'https://sb.freeskreen.com',
@@ -1220,8 +1314,20 @@ const adConfig = jsonConfiguration({
   },
 
   'sunmedia': {
-    prefetch: 'https://vod.addevweb.com/sunmedia/amp/ads/sunmedia.js',
-    preconnect: 'https://static.addevweb.com',
+    preconnect: [
+      'https://static.sunmedia.tv',
+      'https://services.sunmedia.tv',
+      'https://creative.sunmedia.tv',
+      'https://vod.sunmedia.tv',
+      'https://mx-sunmedia.videoplaza.tv',
+      'https://es-sunicontent.videoplaza.tv',
+      'https://es-sunelespanol.videoplaza.tv',
+      'https://es-suncopperland.videoplaza.tv',
+      'https://search.spotxchange.com',
+      'https://tpc.googlesyndication.com',
+    ],
+    clientIdScope: 'AMP_ECID_SUNMEDIA',
+    fullWidthHeightRatio: 1 / 1,
     renderStartImplemented: true,
   },
 
@@ -1252,10 +1358,9 @@ const adConfig = jsonConfiguration({
   },
 
   'teads': {
-    prefetch: 'https://s8t.teads.tv/media/format/v3/teads-format.min.js',
+    prefetch: 'https://a.teads.tv/media/format/v3/teads-format.min.js',
     preconnect: [
       'https://cdn2.teads.tv',
-      'https://a.teads.tv',
       'https://t.teads.tv',
       'https://r.teads.tv',
     ],
@@ -1343,6 +1448,10 @@ const adConfig = jsonConfiguration({
     renderStartImplemented: true,
   },
 
+  'vox': {
+    renderStartImplemented: true,
+  },
+
   'webediads': {
     prefetch: 'https://eu1.wbdds.com/amp.min.js',
     preconnect: ['https://goutee.top', 'https://mediaathay.org.uk'],
@@ -1375,6 +1484,7 @@ const adConfig = jsonConfiguration({
   'wunderkind': {
     preconnect: ['https://tag.wknd.ai', 'https://api.bounceexchange.com'],
     renderStartImplemented: true,
+    fullWidthHeightRatio: 4 / 3,
   },
 
   'xlift': {
@@ -1382,11 +1492,6 @@ const adConfig = jsonConfiguration({
     renderStartImplemented: true,
   },
 
-  'yahoo': {
-    prefetch: 'https://s.yimg.com/aaq/ampad/display.js',
-    preconnect: 'https://us.adserver.yahoo.com',
-  },
-
   'yahoofedads': {
     renderStartImplemented: true,
   },
diff --git a/ads/ads.extern.js b/ads/ads.extern.js
index ea11210c43c1..084ec9302f34 100644
--- a/ads/ads.extern.js
+++ b/ads/ads.extern.js
@@ -319,6 +319,23 @@ window.andbeyond.initAmp = function (
   extras
 ) {};
 
+// affinity.js
+window.affinity = {};
+window.affinity.initAMP = function (global, data) {};
+data.width;
+data.height;
+data.adtype;
+data.adslot;
+data.slot;
+data.affLayout;
+data.multiSize;
+data.jsontargeting;
+data.affSticky;
+data.affTitle;
+data.affJson;
+data.affRtcConfig;
+data.extras;
+
 // adreactor.js
 data.zid;
 data.pid;
@@ -534,6 +551,9 @@ data.local;
 data.enablemraid;
 data.jsplayer;
 
+// momagic
+window.momagicAmpInit;
+
 // nativo.js
 var PostRelease;
 PostRelease.Start;
@@ -576,6 +596,12 @@ data.dfpSlot;
 data.nc;
 data.auid;
 
+// piberica.js
+data.height;
+data.publisher;
+data.slot;
+data.width;
+
 // pixels.js
 var pixelsAd;
 var pixelsAMPAd;
@@ -616,6 +642,19 @@ data.section;
 // pulsepoint.js
 window.PulsePointHeaderTag;
 
+// r9x.js
+window.r9x = {};
+window.r9x.initAmp = function (
+  global,
+  width,
+  height,
+  siteid,
+  slotpath,
+  totalampslots,
+  jsontargeting,
+  extras
+) {};
+
 // rubicon.js
 data.method;
 data.width;
@@ -631,9 +670,6 @@ data.callback;
 
 // seedtag.js
 data.adunitId;
-data.placement;
-data.publisherId;
-data.forceCreative;
 
 // sharethrough.js
 data.pkey;
diff --git a/ads/alp/handler.js b/ads/alp/handler.js
index 524f7c6086aa..b52b6f7f70ff 100644
--- a/ads/alp/handler.js
+++ b/ads/alp/handler.js
@@ -1,15 +1,16 @@
+import {closest} from '#core/dom/query';
+import {parseQueryString} from '#core/types/string/url';
+
+import {dev} from '#utils/log';
+
+import * as urls from '../../src/config/urls';
+import {openWindowDialog} from '../../src/open-window-dialog';
 import {
   addParamToUrl,
   isLocalhostOrigin,
   isProxyOrigin,
   parseUrlDeprecated,
 } from '../../src/url';
-import {closest} from '#core/dom/query';
-import {dev} from '#utils/log';
-import {dict} from '#core/types/object';
-import {openWindowDialog} from '../../src/open-window-dialog';
-import {parseQueryString} from '#core/types/string/url';
-import {urls} from '../../src/config';
 
 /**
  * Install a click listener that transforms navigation to the AMP cache
@@ -144,11 +145,9 @@ function navigateTo(win, a, url) {
   if (a2aAncestor) {
     a2aAncestor.win./*OK*/ postMessage(
       'a2a;' +
-        JSON.stringify(
-          dict({
-            'url': url,
-          })
-        ),
+        JSON.stringify({
+          'url': url,
+        }),
       a2aAncestor.origin
     );
     return;
diff --git a/ads/alp/install-alp.js b/ads/alp/install-alp.js
index 0350b02661cd..df4bd74d860b 100644
--- a/ads/alp/install-alp.js
+++ b/ads/alp/install-alp.js
@@ -1,7 +1,9 @@
 // Utility file that generates URLs suitable for AMP's impression tracking.
 
 import {initLogConstructor, setReportError} from '#utils/log';
+
 import {installAlpClickHandler, warmupStatic} from './handler';
+
 import {reportError} from '../../src/error-reporting';
 
 initLogConstructor();
diff --git a/ads/google/a4a/cookie-utils.js b/ads/google/a4a/cookie-utils.js
new file mode 100644
index 000000000000..cab14c824f2f
--- /dev/null
+++ b/ads/google/a4a/cookie-utils.js
@@ -0,0 +1,78 @@
+import {setCookie} from 'src/cookies';
+import {isProxyOrigin} from 'src/url';
+
+/** @type {string} */
+export const AMP_GFP_SET_COOKIES_HEADER_NAME = 'amp-ff-set-cookies';
+
+/**
+ * Returns the given domain if the current origin is not the AMP proxy origin,
+ * otherwise returns the empty string.
+ *
+ * On proxy origin, we want cookies to be partitioned by subdomain to prevent
+ * sharing across unrelated publishers, in which case we want to set the domain
+ * equal to the empty string (leave it unset).
+ *
+ * @param {!Window} win
+ * @param {string} domain
+ * @return {string}
+ */
+function getProxySafeDomain(win, domain) {
+  return isProxyOrigin(win.location) ? '' : domain;
+}
+
+/**
+ * @param {!Window} win
+ * @param {!Response} fetchResponse
+ */
+export function maybeSetCookieFromAdResponse(win, fetchResponse) {
+  if (!fetchResponse.headers.has(AMP_GFP_SET_COOKIES_HEADER_NAME)) {
+    return;
+  }
+  let cookiesToSet = /** @type {!Array<!Object>} */ [];
+  try {
+    cookiesToSet = JSON.parse(
+      fetchResponse.headers.get(AMP_GFP_SET_COOKIES_HEADER_NAME)
+    );
+  } catch {}
+  for (const cookieInfo of cookiesToSet) {
+    const cookieName =
+      (cookieInfo['_version_'] ?? 1) === 2 ? '__gpi' : '__gads';
+    const value = cookieInfo['_value_'];
+    // On proxy origin, we want cookies to be partitioned by subdomain to
+    // prevent sharing across unrelated publishers, so we don't set a domain.
+    const domain = getProxySafeDomain(win, cookieInfo['_domain_']);
+    const expiration = Math.max(cookieInfo['_expiration_'], 0);
+    setCookie(win, cookieName, value, expiration, {
+      domain,
+      secure: false,
+    });
+  }
+}
+
+/**
+ * Sets up postmessage listener for cookie opt out signal.
+ * @param {!Window} win
+ * @param {!Event} event
+ */
+export function handleCookieOptOutPostMessage(win, event) {
+  try {
+    const message = JSON.parse(event.data);
+    if (message['googMsgType'] === 'gpi-uoo') {
+      const userOptOut = !!message['userOptOut'];
+      const clearAdsData = !!message['clearAdsData'];
+      const domain = getProxySafeDomain(win, win.location.hostname);
+      setCookie(
+        win,
+        '__gpi_opt_out',
+        userOptOut ? '1' : '0',
+        // Last valid date for 32-bit browsers; 2038-01-19
+        2147483646 * 1000,
+        {domain}
+      );
+      if (userOptOut || clearAdsData) {
+        setCookie(win, '__gads', 'delete', Date.now() - 1000, {domain});
+        setCookie(win, '__gpi', 'delete', Date.now() - 1000, {domain});
+      }
+    }
+  } catch {}
+}
diff --git a/ads/google/a4a/experiment-utils.js b/ads/google/a4a/experiment-utils.js
index a6144e7a1ecb..6ed550f55b13 100644
--- a/ads/google/a4a/experiment-utils.js
+++ b/ads/google/a4a/experiment-utils.js
@@ -1,10 +1,10 @@
-import {addExperimentIdToElement} from './traffic-experiments';
 import {
   forceExperimentBranch,
   getExperimentBranch,
   randomlySelectUnsetExperiments,
 } from '#experiments';
-import {ExperimentInfoDef} from '#experiments/experiments.type';
+
+import {addExperimentIdToElement} from './traffic-experiments';
 
 /**
  * Attempts to select into experiment and forces branch if selected.
diff --git a/ads/google/a4a/line-delimited-response-handler.js b/ads/google/a4a/line-delimited-response-handler.js
index 07290e24466d..ac193af2fb14 100644
--- a/ads/google/a4a/line-delimited-response-handler.js
+++ b/ads/google/a4a/line-delimited-response-handler.js
@@ -55,14 +55,14 @@ export function lineDelimitedStreamer(win, response, lineCallback) {
 /**
  * Given each line, groups such that the first is JSON parsed and second
  * html unescaped.
- * @param {function(string, !Object<string, *>, boolean)} callback
+ * @param {function(string, !{[key: string]: *}, boolean)} callback
  * @return {function(string, boolean)}
  */
 export function metaJsonCreativeGrouper(callback) {
   let first;
   return function (line, done) {
     if (first) {
-      const metadata = /** @type {!Object<string, *>} */ (
+      const metadata = /** @type {!{[key: string]: *}} */ (
         tryParseJson(first) || {}
       );
       const lowerCasedMetadata = Object.keys(metadata).reduce((newObj, key) => {
diff --git a/ads/google/a4a/shared/content-recommendation.js b/ads/google/a4a/shared/content-recommendation.js
index 04d1d27f501e..3c309dee6c01 100644
--- a/ads/google/a4a/shared/content-recommendation.js
+++ b/ads/google/a4a/shared/content-recommendation.js
@@ -63,7 +63,7 @@ const MAX_PUB_CONTROL_DIMENSION = 1500;
  * image_card_sidebyside: https://screenshot.googleplex.com/v3qOZY61tFm
  * text: https://screenshot.googleplex.com/taeRQn7DUhq
  * text_card: https://screenshot.googleplex.com/ur45m96Tv0D
- * @const {!Object<!LayoutType, number>}
+ * @const {!{[key: !LayoutType]: number}}
  */
 const LAYOUT_ASPECT_RATIO_MAP = {
   [LayoutType.IMAGE_STACKED]: 1 / 1.91,
@@ -84,7 +84,7 @@ const LAYOUT_ASPECT_RATIO_MAP = {
  * FontSize * LineHeight * NumTitle + Padding * 2 + UrlBoxHeight.
  * image_stacked: https://screenshot.googleplex.com/74S09gFO82b
  * image_card_stacked: https://screenshot.googleplex.com/vedjTonVaDT
- * @const {!Object<!LayoutType, number>}
+ * @const {!{[key: !LayoutType]: number}}
  */
 const LAYOUT_TEXT_HEIGHT_MAP = {
   [LayoutType.IMAGE_STACKED]: 80,
@@ -101,7 +101,7 @@ const LAYOUT_TEXT_HEIGHT_MAP = {
 /**
  * The layout - minimal width map for pub control UIs. We will adjust column
  * numbers according to minimal width.
- * @const {!Object<!LayoutType, number>}
+ * @const {!{[key: !LayoutType]: number}}
  */
 const LAYOUT_AD_WIDTH_MAP = {
   [LayoutType.PUB_CONTROL_IMAGE_STACKED]: 100,
diff --git a/ads/google/a4a/shared/url-builder.js b/ads/google/a4a/shared/url-builder.js
index 2cfc9663847c..983b9366432c 100644
--- a/ads/google/a4a/shared/url-builder.js
+++ b/ads/google/a4a/shared/url-builder.js
@@ -5,7 +5,7 @@ export let QueryParameterDef;
  * Builds a URL from query parameters, truncating to a maximum length if
  * necessary.
  * @param {string} baseUrl scheme, domain, and path for the URL.
- * @param {!Object<string,string|number|null>} queryParams query parameters for
+ * @param {!{[key: string]: string|number|null}} queryParams query parameters for
  *     the URL.
  * @param {number} maxLength length to truncate the URL to if necessary.
  * @param {?QueryParameterDef=} opt_truncationQueryParam query parameter to
diff --git a/ads/google/a4a/test/test-cookie-utils.js b/ads/google/a4a/test/test-cookie-utils.js
new file mode 100644
index 000000000000..f1488f570255
--- /dev/null
+++ b/ads/google/a4a/test/test-cookie-utils.js
@@ -0,0 +1,101 @@
+import {
+  AMP_GFP_SET_COOKIES_HEADER_NAME,
+  handleCookieOptOutPostMessage,
+  maybeSetCookieFromAdResponse,
+} from '#ads/google/a4a/cookie-utils';
+
+import {getCookie, setCookie} from 'src/cookies';
+
+describes.fakeWin('#maybeSetCookieFromAdResponse', {amp: true}, (env) => {
+  it('should set cookies based on ad response header', () => {
+    maybeSetCookieFromAdResponse(env.win, {
+      headers: {
+        has: (header) => {
+          return header === AMP_GFP_SET_COOKIES_HEADER_NAME;
+        },
+        get: (header) => {
+          if (header !== AMP_GFP_SET_COOKIES_HEADER_NAME) {
+            return;
+          }
+
+          return JSON.stringify([
+            {
+              '_version_': 1,
+              '_value_': 'val1',
+              '_domain_': 'foo.com',
+              '_expiration_': Date.now() + 100_000,
+            },
+            {
+              '_version_': 2,
+              '_value_': 'val2',
+              '_domain_': 'foo.com',
+              '_expiration_': Date.now() + 100_000,
+            },
+          ]);
+        },
+      },
+    });
+
+    expect(getCookie(env.win, '__gads')).to.equal('val1');
+    expect(getCookie(env.win, '__gpi')).to.equal('val2');
+  });
+});
+
+describes.fakeWin('#handleCookieOptOutPostMessage', {amp: true}, (env) => {
+  it('should clear cookies as specified in creative response, with opt out', () => {
+    setCookie(env.win, '__gads', '__gads_val', Date.now() + 100_000);
+    setCookie(env.win, '__gpi', '__gpi_val', Date.now() + 100_000);
+    expect(getCookie(env.win, '__gads')).to.equal('__gads_val');
+    expect(getCookie(env.win, '__gpi')).to.equal('__gpi_val');
+
+    handleCookieOptOutPostMessage(env.win, {
+      data: JSON.stringify({
+        googMsgType: 'gpi-uoo',
+        userOptOut: true,
+        clearAdsData: true,
+      }),
+    });
+
+    expect(getCookie(env.win, '__gpi_opt_out')).to.equal('1');
+    expect(getCookie(env.win, '__gads')).to.be.null;
+    expect(getCookie(env.win, '__gpi')).to.be.null;
+  });
+
+  it('should clear cookies as specified in creative response, without opt out', () => {
+    setCookie(env.win, '__gads', '__gads_val', Date.now() + 100_000);
+    setCookie(env.win, '__gpi', '__gpi_val', Date.now() + 100_000);
+    expect(getCookie(env.win, '__gads')).to.equal('__gads_val');
+    expect(getCookie(env.win, '__gpi')).to.equal('__gpi_val');
+
+    handleCookieOptOutPostMessage(env.win, {
+      data: JSON.stringify({
+        googMsgType: 'gpi-uoo',
+        userOptOut: false,
+        clearAdsData: true,
+      }),
+    });
+
+    expect(getCookie(env.win, '__gpi_opt_out')).to.equal('0');
+    expect(getCookie(env.win, '__gads')).to.be.null;
+    expect(getCookie(env.win, '__gpi')).to.be.null;
+  });
+
+  it('should not clear cookies as specified in creative response, without opt out or clear ads', () => {
+    setCookie(env.win, '__gads', '__gads_val', Date.now() + 100_000);
+    setCookie(env.win, '__gpi', '__gpi_val', Date.now() + 100_000);
+    expect(getCookie(env.win, '__gads')).to.equal('__gads_val');
+    expect(getCookie(env.win, '__gpi')).to.equal('__gpi_val');
+
+    handleCookieOptOutPostMessage(env.win, {
+      data: JSON.stringify({
+        googMsgType: 'gpi-uoo',
+        userOptOut: false,
+        clearAdsData: false,
+      }),
+    });
+
+    expect(getCookie(env.win, '__gpi_opt_out')).to.equal('0');
+    expect(getCookie(env.win, '__gads')).to.equal('__gads_val');
+    expect(getCookie(env.win, '__gpi')).to.equal('__gpi_val');
+  });
+});
diff --git a/ads/google/a4a/test/test-line-delimited-response-handler.js b/ads/google/a4a/test/test-line-delimited-response-handler.js
index 01db3e0d6774..582ca59fa9b3 100644
--- a/ads/google/a4a/test/test-line-delimited-response-handler.js
+++ b/ads/google/a4a/test/test-line-delimited-response-handler.js
@@ -154,38 +154,28 @@ describes.sandboxed('#line-delimited-response-handler', {}, (env) => {
       };
     });
 
-    // TODO(lannka, #15748): Fails on Safari 11.1.0.
-    it.configure().skipSafari(
-      'should handle empty streamed response properly',
-      () => {
-        slotData = [];
-        setup();
-        return executeAndVerifyResponse();
-      }
-    );
+    it('should handle empty streamed response properly', () => {
+      slotData = [];
+      setup();
+      return executeAndVerifyResponse();
+    });
 
-    // TODO(lannka, #15748): Fails on Safari 11.1.0.
-    it.configure().skipSafari('should handle no fill response properly', () => {
+    it('should handle no fill response properly', () => {
       slotData = [{headers: {}, creative: ''}];
       setup();
       return executeAndVerifyResponse();
     });
 
-    // TODO(lannka, #15748): Fails on Safari 11.1.0.
-    it.configure().skipSafari(
-      'should handle multiple no fill responses properly',
-      () => {
-        slotData = [
-          {headers: {}, creative: ''},
-          {headers: {}, creative: ''},
-        ];
-        setup();
-        return executeAndVerifyResponse();
-      }
-    );
+    it('should handle multiple no fill responses properly', () => {
+      slotData = [
+        {headers: {}, creative: ''},
+        {headers: {}, creative: ''},
+      ];
+      setup();
+      return executeAndVerifyResponse();
+    });
 
-    // TODO(lannka, #15748): Fails on Safari 11.1.0.
-    it.configure().skipSafari('should stream properly', () => {
+    it('should stream properly', () => {
       slotData = [
         {headers: {}, creative: ''},
         {
diff --git a/ads/google/a4a/test/test-traffic-experiments.js b/ads/google/a4a/test/test-traffic-experiments.js
index 09e80dd3398c..4f526b3fd21a 100644
--- a/ads/google/a4a/test/test-traffic-experiments.js
+++ b/ads/google/a4a/test/test-traffic-experiments.js
@@ -1,13 +1,13 @@
-import {
-  AMP_EXPERIMENT_ATTRIBUTE,
-  EXPERIMENT_ATTRIBUTE,
-} from '#ads/google/a4a/utils';
 import {
   addAmpExperimentIdToElement,
   addExperimentIdToElement,
   isInExperiment,
   validateExperimentIds,
 } from '#ads/google/a4a/traffic-experiments';
+import {
+  AMP_EXPERIMENT_ATTRIBUTE,
+  EXPERIMENT_ATTRIBUTE,
+} from '#ads/google/a4a/utils';
 
 describes.sandboxed('all-traffic-experiments-tests', {}, () => {
   describe('#validateExperimentIds', () => {
diff --git a/ads/google/a4a/test/test-utils.js b/ads/google/a4a/test/test-utils.js
index 56c4e09aeebd..a81d9263c3a7 100644
--- a/ads/google/a4a/test/test-utils.js
+++ b/ads/google/a4a/test/test-utils.js
@@ -1,7 +1,8 @@
 import * as fakeTimers from '@sinonjs/fake-timers';
+
 import '../../../../extensions/amp-ad/0.1/amp-ad-ui';
 import '../../../../extensions/amp-ad/0.1/amp-ad-xorigin-iframe-handler';
-import * as IniLoad from '../../../../src/ini-load';
+import {buildUrl} from '#ads/google/a4a/shared/url-builder';
 import {
   AMP_EXPERIMENT_ATTRIBUTE,
   EXPERIMENT_ATTRIBUTE,
@@ -15,28 +16,29 @@ import {
   getCorrelator,
   getCsiAmpAnalyticsVariables,
   getEnclosingContainerTypes,
-  getIdentityToken,
-  getIdentityTokenRequestUrl,
   getServeNpaPromise,
   googleAdUrl,
   groupAmpAdsByType,
   maybeAppendErrorParameter,
-  maybeInsertOriginTrialToken,
   mergeExperimentIds,
 } from '#ads/google/a4a/utils';
-import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';
-import {GEO_IN_GROUP} from '../../../../extensions/amp-geo/0.1/amp-geo-in-group';
-import {MockA4AImpl} from '../../../../extensions/amp-a4a/0.1/test/utils';
-import {Services} from '#service';
-import {buildUrl} from '#ads/google/a4a/shared/url-builder';
+
 import {createElementWithAttributes} from '#core/dom';
-import {createIframePromise} from '#testing/iframe';
+
+import {toggleExperiment} from '#experiments';
+
+import {Services} from '#service';
 import {installDocService} from '#service/ampdoc-impl';
 import {installExtensionsService} from '#service/extensions-impl';
-import {installXhrService} from '#service/xhr-impl';
-import {toggleExperiment} from '#experiments';
+
 import {user} from '#utils/log';
 
+import {createIframePromise} from '#testing/iframe';
+
+import {MockA4AImpl} from '../../../../extensions/amp-a4a/0.1/test/utils';
+import {GEO_IN_GROUP} from '../../../../extensions/amp-geo/0.1/amp-geo-in-group';
+import * as IniLoad from '../../../../src/ini-load';
+
 function setupForAdTesting(fixture) {
   installDocService(fixture.win, /* isSingleDoc */ true);
   installExtensionsService(fixture.win);
@@ -645,13 +647,15 @@ describes.sandboxed('Google A4A utils', {}, (env) => {
                 model: 'Pixel',
                 uaFullVersion: 3.14159,
                 bitness: 42,
+                fullVersionList: [{brand: 'Chrome', version: '3.14159'}],
+                wow64: true,
               }),
           },
         });
         return fixture.addElement(elem).then(() => {
           return googleAdUrl(impl, '', Date.now(), [], []).then((url) => {
             expect(url).to.match(
-              /[&?]uap=Windows&uapv=10&uaa=x86&uam=Pixel&uafv=3.14159&uab=42[&$]/
+              /[&?]uap=Windows&uapv=10&uaa=x86&uam=Pixel&uafv=3.14159&uab=42&uafvl=%5B%7B%22brand%22%3A%22Chrome%22%2C%22version%22%3A%223.14159%22%7D%5D&uaw=true[&$]/
             );
           });
         });
@@ -681,7 +685,7 @@ describes.sandboxed('Google A4A utils', {}, (env) => {
           const promise = googleAdUrl(impl, '', Date.now(), [], []).then(
             (url) => {
               expect(url).to.not.match(
-                /[&?]uap=Windows&uapv=10&uaa=x86&uam=Pixel&uafv=3.14159&uab=42[&$]/
+                /[&?]uap=Windows&uapv=10&uaa=x86&uam=Pixel&uafv=3.14159&uab=42&uafvl=%5B%7B%22brand%22%3A%22Chrome%22%2C%22version%22%3A%223.14159%22%7D%5D&uaw=true[&$]/
               );
             }
           );
@@ -774,228 +778,6 @@ describes.sandboxed('Google A4A utils', {}, (env) => {
     });
   });
 
-  describes.fakeWin('#getIdentityTokenRequestUrl', {}, (env) => {
-    let doc;
-    let fakeWin;
-    beforeEach(() => {
-      const documentInfoStub = env.sandbox.stub(Services, 'documentInfoForDoc');
-      doc = {};
-      fakeWin = {location: {}};
-      documentInfoStub
-        .withArgs(doc)
-        .returns({canonicalUrl: 'http://f.blah.com?some_site'});
-    });
-
-    it('should use google.com if at top', () => {
-      fakeWin.top = fakeWin;
-      fakeWin.location.ancestorOrigins = ['foo.google.com.eu'];
-      expect(getIdentityTokenRequestUrl(fakeWin, doc)).to.equal(
-        'https://adservice.google.com/adsid/integrator.json?' +
-          'domain=f.blah.com'
-      );
-    });
-
-    it('should use google.com if no ancestorOrigins', () => {
-      expect(getIdentityTokenRequestUrl(fakeWin, doc)).to.equal(
-        'https://adservice.google.com/adsid/integrator.json?' +
-          'domain=f.blah.com'
-      );
-    });
-
-    it('should use google.com if non-google top', () => {
-      fakeWin.location.ancestorOrigins = ['foo.google2.com'];
-      expect(getIdentityTokenRequestUrl(fakeWin, doc)).to.equal(
-        'https://adservice.google.com/adsid/integrator.json?' +
-          'domain=f.blah.com'
-      );
-    });
-
-    it('should use google ancestor origin based top domain', () => {
-      fakeWin.location.ancestorOrigins = ['foo.google.eu', 'blah.google.fr'];
-      expect(getIdentityTokenRequestUrl(fakeWin, doc)).to.equal(
-        'https://adservice.google.fr/adsid/integrator.json?' +
-          'domain=f.blah.com'
-      );
-    });
-
-    it('should use supplied domain', () => {
-      fakeWin.location.ancestorOrigins = ['foo.google.fr'];
-      expect(getIdentityTokenRequestUrl(fakeWin, doc, '.google.eu')).to.equal(
-        'https://adservice.google.eu/adsid/integrator.json?' +
-          'domain=f.blah.com'
-      );
-    });
-  });
-
-  describes.fakeWin(
-    '#getIdentityToken',
-    {amp: true, mockFetch: true},
-    (env) => {
-      beforeEach(() => {
-        installXhrService(env.win);
-        const documentInfoStub = env.sandbox.stub(
-          Services,
-          'documentInfoForDoc'
-        );
-        documentInfoStub
-          .withArgs(env.ampdoc)
-          .returns({canonicalUrl: 'http://f.blah.com?some_site'});
-      });
-
-      afterEach(() => {
-        // Verify fetch mocks are all consumed.
-        expect(env.fetchMock.done()).to.be.true;
-      });
-
-      const getUrl = (domain) => {
-        domain = domain || 'google.com';
-        return (
-          `https:\/\/adservice\.${domain}\/adsid\/integrator\.json\?` +
-          'domain=f.blah.com'
-        );
-      };
-
-      it('should ignore response if required fields are missing', () => {
-        env.expectFetch(getUrl(), JSON.stringify({newToken: 'abc'}));
-        return getIdentityToken(env.win, env.ampdoc).then((result) => {
-          expect(result.token).to.not.be.ok;
-          expect(result.jar).to.not.be.ok;
-          expect(result.pucrd).to.not.be.ok;
-          expect(result.freshLifetimeSecs).to.not.be.ok;
-          expect(result.validLifetimeSecs).to.not.be.ok;
-          expect(result.fetchTimeMs).to.be.at.least(0);
-        });
-      });
-
-      it('should fetch full token as expected', () => {
-        env.expectFetch(
-          getUrl(),
-          JSON.stringify({
-            newToken: 'abc',
-            '1p_jar': 'some_jar',
-            pucrd: 'some_pucrd',
-            freshLifetimeSecs: '1234',
-            validLifetimeSecs: '5678',
-          })
-        );
-        return getIdentityToken(env.win, env.ampdoc).then((result) => {
-          expect(result.token).to.equal('abc');
-          expect(result.jar).to.equal('some_jar');
-          expect(result.pucrd).to.equal('some_pucrd');
-          expect(result.freshLifetimeSecs).to.equal(1234);
-          expect(result.validLifetimeSecs).to.equal(5678);
-          expect(result.fetchTimeMs).to.be.at.least(0);
-        });
-      });
-
-      it('should redirect as expected', () => {
-        env.expectFetch(getUrl(), JSON.stringify({altDomain: '.google.fr'}));
-        env.expectFetch(
-          getUrl('google.fr'),
-          JSON.stringify({
-            newToken: 'abc',
-            freshLifetimeSecs: '1234',
-            validLifetimeSecs: '5678',
-          })
-        );
-        return getIdentityToken(env.win, env.ampdoc, '').then((result) => {
-          expect(result.token).to.equal('abc');
-          expect(result.jar).to.equal('');
-          expect(result.pucrd).to.equal('');
-          expect(result.freshLifetimeSecs).to.equal(1234);
-          expect(result.validLifetimeSecs).to.equal(5678);
-          expect(result.fetchTimeMs).to.be.at.least(0);
-        });
-      });
-
-      it('should stop after 1 redirect', () => {
-        env.expectFetch(getUrl(), JSON.stringify({altDomain: '.google.fr'}));
-        env.expectFetch(
-          getUrl('google.fr'),
-          JSON.stringify({altDomain: '.google.com'})
-        );
-        return getIdentityToken(env.win, env.ampdoc).then((result) => {
-          expect(result.token).to.not.be.ok;
-          expect(result.jar).to.not.be.ok;
-          expect(result.pucrd).to.not.be.ok;
-          expect(result.fetchTimeMs).to.be.at.least(0);
-        });
-      });
-
-      it('should use previous execution', () => {
-        const ident = {
-          newToken: 'foo',
-          freshLifetimeSecs: '1234',
-          validLifetimeSecs: '5678',
-        };
-        env.win['goog_identity_prom'] = Promise.resolve(ident);
-        return getIdentityToken(env.win, env.ampdoc).then((result) =>
-          expect(result).to.jsonEqual(ident)
-        );
-      });
-
-      it('should handle fetch error', () => {
-        env.sandbox
-          .stub(Services, 'xhrFor')
-          .returns({fetchJson: () => Promise.reject('some network failure')});
-        return getIdentityToken(env.win, env.ampdoc).then((result) =>
-          expect(result).to.jsonEqual({})
-        );
-      });
-
-      it('should fetch if SUFFICIENT consent', () => {
-        env.expectFetch(
-          getUrl(),
-          JSON.stringify({
-            newToken: 'abc',
-            '1p_jar': 'some_jar',
-            pucrd: 'some_pucrd',
-            freshLifetimeSecs: '1234',
-            validLifetimeSecs: '5678',
-          })
-        );
-        env.sandbox.stub(Services, 'consentPolicyServiceForDocOrNull').returns(
-          Promise.resolve({
-            whenPolicyResolved: () => CONSENT_POLICY_STATE.SUFFICIENT,
-          })
-        );
-        return getIdentityToken(env.win, env.ampdoc, 'default').then((result) =>
-          expect(result.token).to.equal('abc')
-        );
-      });
-
-      it.configure()
-        .skipFirefox()
-        .run('should not fetch if INSUFFICIENT consent', () => {
-          env.sandbox
-            .stub(Services, 'consentPolicyServiceForDocOrNull')
-            .returns(
-              Promise.resolve({
-                whenPolicyResolved: () => CONSENT_POLICY_STATE.INSUFFICIENT,
-              })
-            );
-          return expect(
-            getIdentityToken(env.win, env.ampdoc, 'default')
-          ).to.eventually.jsonEqual({});
-        });
-
-      it.configure()
-        .skipFirefox()
-        .run('should not fetch if UNKNOWN consent', () => {
-          env.sandbox
-            .stub(Services, 'consentPolicyServiceForDocOrNull')
-            .returns(
-              Promise.resolve({
-                whenPolicyResolved: () => CONSENT_POLICY_STATE.UNKNOWN,
-              })
-            );
-          return expect(
-            getIdentityToken(env.win, env.ampdoc, 'default')
-          ).to.eventually.jsonEqual({});
-        });
-    }
-  );
-
   describe('variables for amp-analytics', () => {
     let a4a;
     let ampdoc;
@@ -1285,27 +1067,3 @@ describes.realWin('#groupAmpAdsByType', {amp: true}, (env) => {
     });
   });
 });
-
-describes.realWin('maybeInsertOriginTrialToken', {}, (env) => {
-  let doc;
-  let win;
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-  });
-
-  it('should insert the token', () => {
-    expect(doc.querySelector('meta[http-equiv=origin-trial]')).to.not.exist;
-    maybeInsertOriginTrialToken(win);
-    expect(doc.querySelector('meta[http-equiv=origin-trial]')).to.exist;
-  });
-
-  it('should only insert the token once on multiple calls', () => {
-    maybeInsertOriginTrialToken(win);
-    maybeInsertOriginTrialToken(win);
-    maybeInsertOriginTrialToken(win);
-    expect(
-      doc.querySelectorAll('meta[http-equiv=origin-trial]').length
-    ).to.equal(1);
-  });
-});
diff --git a/ads/google/a4a/traffic-experiments.js b/ads/google/a4a/traffic-experiments.js
index 339a0a8dec04..9f50b69b0405 100644
--- a/ads/google/a4a/traffic-experiments.js
+++ b/ads/google/a4a/traffic-experiments.js
@@ -6,13 +6,15 @@
  * impacts on click-throughs.
  */
 
+import {parseQueryString} from '#core/types/string/url';
+
+import {Services} from '#service';
+
 import {
   AMP_EXPERIMENT_ATTRIBUTE,
   EXPERIMENT_ATTRIBUTE,
   mergeExperimentIds,
 } from './utils';
-import {Services} from '#service';
-import {parseQueryString} from '#core/types/string/url';
 
 /** @typedef {{
  *    control: string,
diff --git a/ads/google/a4a/utils.js b/ads/google/a4a/utils.js
index e7ecb80836d3..f1cbc944d0cb 100644
--- a/ads/google/a4a/utils.js
+++ b/ads/google/a4a/utils.js
@@ -1,21 +1,22 @@
-import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';
+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 import {DomFingerprint} from '#core/dom/fingerprint';
-import {GEO_IN_GROUP} from '../../../extensions/amp-geo/0.1/amp-geo-in-group';
+import {getPageLayoutBoxBlocking} from '#core/dom/layout/page-layout-box';
+import * as mode from '#core/mode';
+import {parseJson} from '#core/types/object/json';
+
+import {getBinaryType, isExperimentOn, toggleExperiment} from '#experiments';
+
 import {Services} from '#service';
-import {buildUrl} from './shared/url-builder';
+import {getTimingDataSync} from '#service/variable-source';
+
 import {dev, devAssert, user} from '#utils/log';
-import {dict} from '#core/types/object';
-import {getBinaryType, isExperimentOn, toggleExperiment} from '#experiments';
-import {getConsentPolicyState} from '../../../src/consent';
+
+import {buildUrl} from './shared/url-builder';
+
+import {GEO_IN_GROUP} from '../../../extensions/amp-geo/0.1/amp-geo-in-group';
+import {getOrCreateAdCid} from '../../../src/ad-cid';
 import {getMeasuredResources} from '../../../src/ini-load';
 import {getMode} from '../../../src/mode';
-import {getOrCreateAdCid} from '../../../src/ad-cid';
-import {getPageLayoutBoxBlocking} from '#core/dom/layout/page-layout-box';
-import {getTimingDataSync} from '#service/variable-source';
-import * as mode from '#core/mode';
-import {parseJson} from '#core/types/object/json';
-import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
-import {createElementWithAttributes} from '#core/dom';
 
 /** @type {string}  */
 const AMP_ANALYTICS_HEADER = 'X-AmpAnalytics';
@@ -39,8 +40,8 @@ export const ValidAdContainerTypes = {
 };
 
 /**
- * See `VisibilityState` enum.
- * @const {!Object<string, string>}
+ * See `VisibilityState_Enum` enum.
+ * @const {!{[key: string]: string}}
  */
 const visibilityStateCodes = {
   'visible': '1',
@@ -94,30 +95,10 @@ export let NameframeExperimentConfig;
  */
 export const TRUNCATION_PARAM = {name: 'trunc', value: '1'};
 
-/** @const {Object} */
+/** @const {object} */
 const CDN_PROXY_REGEXP =
   /^https:\/\/([a-zA-Z0-9_-]+\.)?cdn\.ampproject\.org((\/.*)|($))+/;
 
-/** @const {string} */
-export const TOKEN_VALUE =
-  'A2dINGotLJuPqM6Wgp0s4V3te749O/VZEHqN0YsG4pfY+1pcjS5UaX1Bvcyz4aiShd8ZXPcT5spJazIzrbi5AwUAAACVeyJvcmlnaW4iOiJodHRwczovL2FtcHByb2plY3Qub3JnOjQ0MyIsImZlYXR1cmUiOiJDb252ZXJzaW9uTWVhc3VyZW1lbnQiLCJleHBpcnkiOjE2MzQwODMxOTksImlzU3ViZG9tYWluIjp0cnVlLCJpc1RoaXJkUGFydHkiOnRydWUsInVzYWdlIjoic3Vic2V0In0=';
-
-/**
- * Inserts origin-trial token for `attribution-reporting` if not already
- * present in the DOM.
- * @param {!Window} win
- */
-export function maybeInsertOriginTrialToken(win) {
-  if (win.document.head.querySelector(`meta[content='${TOKEN_VALUE}']`)) {
-    return;
-  }
-  const metaEl = createElementWithAttributes(win.document, 'meta', {
-    'http-equiv': 'origin-trial',
-    content: TOKEN_VALUE,
-  });
-  win.document.head.appendChild(metaEl);
-}
-
 /**
  * Returns the value of some navigation timing parameter.
  * Feature detection is used for safety on browsers that do not support the
@@ -196,7 +177,7 @@ export function isReportingEnabled(ampElement) {
  * @param {!Array<string>=} opt_experimentIds Any experiments IDs (in addition
  *     to those specified on the ad element) that should be included in the
  *     request.
- * @return {!Object<string,null|number|string>} block level parameters
+ * @return {!{[key: string]: null|number|string}} block level parameters
  */
 export function googleBlockParameters(a4a, opt_experimentIds) {
   const {element: adElement, win} = a4a;
@@ -231,7 +212,7 @@ export function googleBlockParameters(a4a, opt_experimentIds) {
  * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
  * @param {string} type matching typing attribute.
  * @param {function(!Element):string} groupFn
- * @return {!Promise<!Object<string,!Array<!Promise<!../../../src/base-element.BaseElement>>>>}
+ * @return {!Promise<!{[key: string]: !Array<!Promise<!../../../src/base-element.BaseElement}>>>}
  */
 export function groupAmpAdsByType(ampdoc, type, groupFn) {
   // Look for amp-ad elements of correct type or those contained within
@@ -284,7 +265,7 @@ export function groupAmpAdsByType(ampdoc, type, groupFn) {
 /**
  * @param {! ../../../extensions/amp-a4a/0.1/amp-a4a.AmpA4A} a4a
  * @param {number} startTime
- * @return {!Promise<!Object<string,null|number|string>>}
+ * @return {!Promise<!{[key: string]: null|number|string}>}
  */
 export function googlePageParameters(a4a, startTime) {
   const {win} = a4a;
@@ -364,6 +345,8 @@ export function googlePageParameters(a4a, startTime) {
       'uam': uaDataValues?.model,
       'uafv': uaDataValues?.uaFullVersion,
       'uab': uaDataValues?.bitness,
+      'uafvl': JSON.stringify(uaDataValues?.fullVersionList),
+      'uaw': uaDataValues?.wow64,
     };
   });
 }
@@ -372,7 +355,7 @@ export function googlePageParameters(a4a, startTime) {
  * @param {!../../../extensions/amp-a4a/0.1/amp-a4a.AmpA4A} a4a
  * @param {string} baseUrl
  * @param {number} startTime
- * @param {!Object<string,null|number|string>} parameters
+ * @param {!{[key: string]: null|number|string}} parameters
  * @param {!Array<string>=} opt_experimentIds Any experiments IDs (in addition
  *     to those specified on the ad element) that should be included in the
  *     request.
@@ -395,7 +378,7 @@ export function googleAdUrl(
 
 /**
  * @param {string} baseUrl
- * @param {!Object<string,null|number|string>} parameters
+ * @param {!{[key: string]: null|number|string}} parameters
  * @param {number} startTime
  * @return {string}
  */
@@ -582,11 +565,11 @@ export function additionalDimensions(win, viewportSize) {
 /**
  * Returns amp-analytics config for a new CSI trigger.
  * @param {string} on The name of the analytics trigger.
- * @param {!Object<string, string>} params Params to be included on the ping.
+ * @param {!{[key: string]: string}} params Params to be included on the ping.
  * @return {!JsonObject}
  */
 function csiTrigger(on, params) {
-  return dict({
+  return {
     'on': on,
     'request': 'csi',
     'sampleSpec': {
@@ -599,7 +582,7 @@ function csiTrigger(on, params) {
     'selector': 'amp-ad',
     'selectionMethod': 'closest',
     'extraUrlParams': params,
-  });
+  };
 }
 
 /**
@@ -607,7 +590,7 @@ function csiTrigger(on, params) {
  * @return {!JsonObject}
  */
 export function getCsiAmpAnalyticsConfig() {
-  return dict({
+  return {
     'requests': {
       'csi': 'https://csi.gstatic.com/csi?',
     },
@@ -643,7 +626,7 @@ export function getCsiAmpAnalyticsConfig() {
       // evaluated when the URL is built by amp-analytics.
       'puid': '${requestCount}~${timestamp}',
     },
-  });
+  };
 }
 
 /**
@@ -708,11 +691,11 @@ export function extractAmpAnalyticsConfig(a4a, responseHeaders) {
     if (!hasActiveViewRequests && !hasBeginToRenderRequests) {
       return null;
     }
-    const config = dict({
+    const config = {
       'transport': {'beacon': false, 'xhrpost': false},
       'requests': {},
       'triggers': {},
-    });
+    };
     if (hasActiveViewRequests) {
       generateActiveViewRequest(config, acUrls);
     }
@@ -736,7 +719,7 @@ export function extractAmpAnalyticsConfig(a4a, responseHeaders) {
  * @param {!Array<string>} urls
  */
 function generateActiveViewRequest(config, urls) {
-  config['triggers']['continuousVisible'] = dict({
+  config['triggers']['continuousVisible'] = {
     'request': [],
     'on': 'visible',
     'visibilitySpec': {
@@ -745,7 +728,7 @@ function generateActiveViewRequest(config, urls) {
       'visiblePercentageMin': 50,
       'continuousTimeMin': 1000,
     },
-  });
+  };
   for (let idx = 0; idx < urls.length; idx++) {
     // TODO: Ensure url is valid and not freeform JS?
     config['requests'][`visibility${idx + 1}`] = `${urls[idx]}`;
@@ -760,12 +743,12 @@ function generateActiveViewRequest(config, urls) {
  * @param {!Array<string>} urls
  */
 function generateBeginToRenderRequest(config, urls) {
-  config['triggers']['beginToRender'] = dict({
+  config['triggers']['beginToRender'] = {
     'request': [],
     'on': 'ini-load',
     'selector': 'amp-ad',
     'selectionMethod': 'closest',
-  });
+  };
 
   for (let idx = 0; idx < urls.length; idx++) {
     // TODO: Ensure url is valid and not freeform JS?
@@ -936,130 +919,6 @@ export function getBinaryTypeNumericalCode(type) {
   );
 }
 
-/** @const {!RegExp} */
-const IDENTITY_DOMAIN_REGEXP_ = /\.google\.(?:com?\.)?[a-z]{2,3}$/;
-
-/** @typedef {{
-      token: (string|undefined),
-      jar: (string|undefined),
-      pucrd: (string|undefined),
-      freshLifetimeSecs: (number|undefined),
-      validLifetimeSecs: (number|undefined),
-      fetchTimeMs: (number|undefined)
-   }} */
-export let IdentityToken;
-
-/**
- * @param {!Window} win
- * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampDoc
- * @param {?string} consentPolicyId
- * @return {!Promise<!IdentityToken>}
- */
-export function getIdentityToken(win, ampDoc, consentPolicyId) {
-  // If configured to use amp-consent, delay request until consent state is
-  // resolved.
-  win['goog_identity_prom'] =
-    win['goog_identity_prom'] ||
-    (consentPolicyId
-      ? getConsentPolicyState(ampDoc.getHeadNode(), consentPolicyId)
-      : Promise.resolve(CONSENT_POLICY_STATE.UNKNOWN_NOT_REQUIRED)
-    ).then((consentState) =>
-      consentState == CONSENT_POLICY_STATE.INSUFFICIENT ||
-      consentState == CONSENT_POLICY_STATE.UNKNOWN
-        ? /** @type {!IdentityToken} */ ({})
-        : executeIdentityTokenFetch(win, ampDoc)
-    );
-  return /** @type {!Promise<!IdentityToken>} */ (win['goog_identity_prom']);
-}
-
-/**
- * @param {!Window} win
- * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampDoc
- * @param {number=} redirectsRemaining (default 1)
- * @param {string=} domain
- * @param {number=} startTime
- * @return {!Promise<!IdentityToken>}
- */
-function executeIdentityTokenFetch(
-  win,
-  ampDoc,
-  redirectsRemaining = 1,
-  domain = undefined,
-  startTime = Date.now()
-) {
-  const url = getIdentityTokenRequestUrl(win, ampDoc, domain);
-  return Services.xhrFor(win)
-    .fetchJson(url, {
-      mode: 'cors',
-      method: 'GET',
-      ampCors: false,
-      credentials: 'include',
-    })
-    .then((res) => res.json())
-    .then((obj) => {
-      const token = obj['newToken'];
-      const jar = obj['1p_jar'] || '';
-      const pucrd = obj['pucrd'] || '';
-      const freshLifetimeSecs = parseInt(obj['freshLifetimeSecs'] || '', 10);
-      const validLifetimeSecs = parseInt(obj['validLifetimeSecs'] || '', 10);
-      const altDomain = obj['altDomain'];
-      const fetchTimeMs = Date.now() - startTime;
-      if (IDENTITY_DOMAIN_REGEXP_.test(altDomain)) {
-        if (!redirectsRemaining--) {
-          // Max redirects, log?
-          return {fetchTimeMs};
-        }
-        return executeIdentityTokenFetch(
-          win,
-          ampDoc,
-          redirectsRemaining,
-          altDomain,
-          startTime
-        );
-      } else if (
-        freshLifetimeSecs > 0 &&
-        validLifetimeSecs > 0 &&
-        typeof token == 'string'
-      ) {
-        return {
-          token,
-          jar,
-          pucrd,
-          freshLifetimeSecs,
-          validLifetimeSecs,
-          fetchTimeMs,
-        };
-      }
-      // returning empty
-      return {fetchTimeMs};
-    })
-    .catch((unusedErr) => {
-      // TODO log?
-      return {};
-    });
-}
-
-/**
- * @param {!Window} win
- * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampDoc
- * @param {string=} domain
- * @return {string} url
- * @visibleForTesting
- */
-export function getIdentityTokenRequestUrl(win, ampDoc, domain = undefined) {
-  if (!domain && win != win.top && win.location.ancestorOrigins) {
-    const matches = IDENTITY_DOMAIN_REGEXP_.exec(
-      win.location.ancestorOrigins[win.location.ancestorOrigins.length - 1]
-    );
-    domain = (matches && matches[0]) || undefined;
-  }
-  domain = domain || '.google.com';
-  const canonical = extractHost(
-    Services.documentInfoForDoc(ampDoc).canonicalUrl
-  );
-  return `https://adservice${domain}/adsid/integrator.json?domain=${canonical}`;
-}
-
 /**
  * Returns whether we are running on the AMP CDN.
  * @param {!Window} win
@@ -1090,7 +949,7 @@ export function setNameframeExperimentConfigs(headers, nameframeConfig) {
  * than 32 capabilities to this enum.
  * @enum {number}
  */
-const Capability = {
+const Capability_Enum = {
   SVG_SUPPORTED: 1 << 0,
   SANDBOXING_ALLOW_TOP_NAVIGATION_BY_USER_ACTIVATION_SUPPORTED: 1 << 1,
   SANDBOXING_ALLOW_POPUPS_TO_ESCAPE_SANDBOX_SUPPORTED: 1 << 2,
@@ -1105,17 +964,17 @@ function getBrowserCapabilitiesBitmap(win) {
   let browserCapabilities = 0;
   const doc = win.document;
   if (win.SVGElement && doc.createElementNS) {
-    browserCapabilities |= Capability.SVG_SUPPORTED;
+    browserCapabilities |= Capability_Enum.SVG_SUPPORTED;
   }
   const iframeEl = doc.createElement('iframe');
   if (iframeEl.sandbox && iframeEl.sandbox.supports) {
     if (iframeEl.sandbox.supports('allow-top-navigation-by-user-activation')) {
       browserCapabilities |=
-        Capability.SANDBOXING_ALLOW_TOP_NAVIGATION_BY_USER_ACTIVATION_SUPPORTED;
+        Capability_Enum.SANDBOXING_ALLOW_TOP_NAVIGATION_BY_USER_ACTIVATION_SUPPORTED;
     }
     if (iframeEl.sandbox.supports('allow-popups-to-escape-sandbox')) {
       browserCapabilities |=
-        Capability.SANDBOXING_ALLOW_POPUPS_TO_ESCAPE_SANDBOX_SUPPORTED;
+        Capability_Enum.SANDBOXING_ALLOW_POPUPS_TO_ESCAPE_SANDBOX_SUPPORTED;
     }
   }
   return browserCapabilities;
diff --git a/ads/google/ima/OWNERS b/ads/google/ima/OWNERS
index cae983b4cc00..ce67a2eecfaf 100644
--- a/ads/google/ima/OWNERS
+++ b/ads/google/ima/OWNERS
@@ -5,7 +5,6 @@
   rules: [
     {
       owners: [
-        {name: 'ampproject/wg-bento'},
         {name: 'ampproject/wg-components'},
         {name: 'ampproject/wg-monetization'},
       ],
diff --git a/ads/google/ima/ima-video.js b/ads/google/ima/ima-video.js
index 030345f722a6..bbc4ab0c6f28 100644
--- a/ads/google/ima/ima-video.js
+++ b/ads/google/ima/ima-video.js
@@ -1,13 +1,22 @@
-import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';
-import {ImaPlayerData} from './ima-player-data';
-import {camelCaseToTitleCase, setStyle, toggle} from '#core/dom/style';
-import {getData} from '#utils/event-helper';
+import {loadScript} from '#3p/3p';
+
+import {
+  CONSENT_POLICY_STATE,
+  CONSENT_STRING_TYPE,
+} from '#core/constants/consent-state';
 import {htmlFor, htmlRefs, svgFor} from '#core/dom/static-template';
+import {camelCaseToTitleCase, setStyle, toggle} from '#core/dom/style';
 import {isArray, isObject} from '#core/types';
-import {loadScript} from '#3p/3p';
 import {throttle} from '#core/types/function';
 import {tryParseJson} from '#core/types/object/json';
+
+import {getData} from '#utils/event-helper';
+
 // Source for this constant is css/amp-ima-video-iframe.css
+import {addParamToUrl} from 'src/url';
+
+import {ImaPlayerData} from './ima-player-data';
+
 import {cssText} from '../../../build/amp-ima-video-iframe.css';
 
 /**
@@ -173,8 +182,8 @@ let adsRequested;
 // Flag that tracks if the user tapped and dragged on the overlay button.
 let userTappedAndDragged;
 
-// User consent state.
-let consentState;
+// global context
+let context;
 
 // Throttle for the showControls() function
 let showControlsThrottled = throttle(window, showControls, 1000);
@@ -205,7 +214,7 @@ function toggleRootDataAttribute(state, active) {
 
 /**
  * @param {Document} elementOrDoc
- * @return {!Object<string, !Element>}
+ * @return {!{[key: string]: !Element}}
  */
 function renderElements(elementOrDoc) {
   const html = htmlFor(elementOrDoc);
@@ -322,6 +331,8 @@ function maybeAppendChildren(document, parent, childrenDef) {
  * @param {!Object} data
  */
 export function imaVideo(global, data) {
+  context = global.context;
+
   insertCss(global.document.head, cssText);
 
   videoWidth = global./*OK*/ innerWidth;
@@ -430,10 +441,7 @@ export function imaVideo(global, data) {
     );
   });
 
-  consentState = global.context.initialConsentState;
-
-  if (consentState == 4) {
-    // UNKNOWN
+  if (context.initialConsentState == CONSENT_POLICY_STATE.UNKNOWN) {
     // On unknown consent state, do not load IMA. Treat this the same as if IMA
     // failed to load.
     onImaLoadFail();
@@ -549,7 +557,7 @@ function onImaLoadSuccess(global, data) {
     requestAds();
   } else {
     // Let amp-ima-video know that we are done set-up.
-    postMessage({event: VideoEvents.LOAD});
+    postMessage({event: VideoEvents_Enum.LOAD});
   }
 }
 
@@ -564,7 +572,7 @@ function onImaLoadFail() {
     showControlsThrottled
   );
   imaLoadAllowed = false;
-  postMessage({event: VideoEvents.LOAD});
+  postMessage({event: VideoEvents_Enum.LOAD});
 }
 
 /**
@@ -622,16 +630,40 @@ function onOverlayButtonTouchMove() {
 export function requestAds() {
   adsRequested = true;
   adRequestFailed = false;
-  if (consentState == CONSENT_POLICY_STATE.UNKNOWN) {
+  const {initialConsentState} = context;
+  if (initialConsentState == CONSENT_POLICY_STATE.UNKNOWN) {
     // We're unaware of the user's consent state - do not request ads.
     imaLoadAllowed = false;
     return;
-  } else if (consentState == CONSENT_POLICY_STATE.INSUFFICIENT) {
+  }
+  adsRequest.adTagUrl = addParamsToAdTagUrl(adsRequest.adTagUrl);
+  adsLoader.requestAds(adsRequest);
+}
+
+/**
+ * @param {string} url
+ * @return {string}
+ */
+function addParamsToAdTagUrl(url) {
+  const {initialConsentMetadata, initialConsentState, initialConsentValue} =
+    context;
+  if (initialConsentState == CONSENT_POLICY_STATE.INSUFFICIENT) {
     // User has provided consent state but has not consented to personalized
     // ads.
-    adsRequest.adTagUrl += '&npa=1';
+    url = addParamToUrl(url, 'npa', '1');
   }
-  adsLoader.requestAds(adsRequest);
+  const {additionalConsent, consentStringType} = initialConsentMetadata || {};
+  const isGdpr =
+    consentStringType != null &&
+    consentStringType !== CONSENT_STRING_TYPE.US_PRIVACY_STRING;
+  if (isGdpr && initialConsentValue != null) {
+    url = addParamToUrl(url, 'gdpr', '1');
+    url = addParamToUrl(url, 'gdpr_consent', initialConsentValue);
+  }
+  if (additionalConsent != null) {
+    url = addParamToUrl(url, 'addtl_consent', additionalConsent);
+  }
+  return url;
 }
 
 /**
@@ -688,8 +720,8 @@ export function onContentEnded() {
     toggle(elements['overlayButton'], true);
   }
 
-  postMessage({event: VideoEvents.PAUSE});
-  postMessage({event: VideoEvents.ENDED});
+  postMessage({event: VideoEvents_Enum.PAUSE});
+  postMessage({event: VideoEvents_Enum.ENDED});
 }
 
 /**
@@ -737,7 +769,7 @@ export function onAdsManagerLoaded(global, adsManagerLoadedEvent) {
   if (muteAdsManagerOnLoaded) {
     adsManager.setVolume(0);
   }
-  postMessage({event: VideoEvents.LOAD});
+  postMessage({event: VideoEvents_Enum.LOAD});
 }
 
 /**
@@ -750,7 +782,7 @@ export function onAdsLoaderError() {
   // Send this message to trigger auto-play for failed pre-roll requests -
   // failing to load an ad is just as good as loading one as far as starting
   // playback is concerned because our content will be ready to play.
-  postMessage({event: VideoEvents.LOAD});
+  postMessage({event: VideoEvents_Enum.LOAD});
   addHoverEventToElement(
     /** @type {!Element} */ (elements['video']),
     showControlsThrottled
@@ -766,7 +798,7 @@ export function onAdsLoaderError() {
  * @visibleForTesting
  */
 export function onAdError() {
-  postMessage({event: VideoEvents.AD_END});
+  postMessage({event: VideoEvents_Enum.AD_END});
   currentAd = null;
   if (adsManager) {
     adsManager.destroy();
@@ -824,7 +856,7 @@ export function onContentPauseRequested(global) {
   }
   adsActive = true;
   playerState = PlayerStates.PLAYING;
-  postMessage({event: VideoEvents.AD_START});
+  postMessage({event: VideoEvents_Enum.AD_START});
   toggle(elements['adContainer'], true);
   showAdControls();
 
@@ -849,7 +881,7 @@ export function onContentResumeRequested() {
     /** @type {!Element} */ (video),
     showControlsThrottled
   );
-  postMessage({event: VideoEvents.AD_END});
+  postMessage({event: VideoEvents_Enum.AD_END});
   resetControlsAfterAd();
   if (!contentComplete) {
     // CONTENT_RESUME will fire after post-rolls as well, and we don't want to
@@ -1096,7 +1128,7 @@ export function playVideo() {
     video.play();
   }
   playerState = PlayerStates.PLAYING;
-  postMessage({event: VideoEvents.PLAYING});
+  postMessage({event: VideoEvents_Enum.PLAYING});
   toggleRootDataAttribute('playing', true);
 }
 
@@ -1121,7 +1153,7 @@ export function pauseVideo(event = null) {
     }
   }
   playerState = PlayerStates.PAUSED;
-  postMessage({event: VideoEvents.PAUSE});
+  postMessage({event: VideoEvents_Enum.PAUSE});
   toggleRootDataAttribute('playing', false);
 }
 
@@ -1168,11 +1200,13 @@ export function toggleMuted(video, muted) {
     muteAdsManagerOnLoaded = muted;
   }
   toggleRootDataAttribute('muted', muted);
-  postMessage({event: muted ? VideoEvents.MUTED : VideoEvents.UNMUTED});
+  postMessage({
+    event: muted ? VideoEvents_Enum.MUTED : VideoEvents_Enum.UNMUTED,
+  });
 }
 
 /**
- * @param {Object} global
+ * @param {object} global
  */
 function exitFullscreen(global) {
   // The video is currently in fullscreen mode
@@ -1187,7 +1221,7 @@ function exitFullscreen(global) {
 }
 
 /**
- * @param {Object} global
+ * @param {object} global
  */
 function enterFullscreen(global) {
   // Try to enter fullscreen mode in the browser
@@ -1216,7 +1250,7 @@ function enterFullscreen(global) {
 }
 
 /**
- * @param {Object} global
+ * @param {object} global
  */
 function toggleFullscreen(global) {
   if (fullscreen) {
@@ -1228,7 +1262,7 @@ function toggleFullscreen(global) {
 
 /**
  * Called when the fullscreen mode of the browser or content player changes.
- * @param {Object} global
+ * @param {object} global
  */
 function onFullscreenChange(global) {
   if (fullscreen) {
@@ -1609,12 +1643,13 @@ export function setHideControlsTimeoutForTesting(newTimeout) {
 }
 
 /**
- * Sets the consent state.
- * @param {*} newConsentState
+ * @param {object} newContext
  * @visibleForTesting
  */
-export function setConsentStateForTesting(newConsentState) {
-  consentState = newConsentState;
+export function setContextForTesting(newContext) {
+  for (const k in newContext) {
+    context[k] = newContext[k];
+  }
 }
 
 /**
@@ -1622,10 +1657,10 @@ export function setConsentStateForTesting(newConsentState) {
  *
  * Copied from src/video-interface.js.
  *
- * @const {!Object<string, string>}
+ * @enum {string}
  */
 // TODO(aghassemi, #9216): Use video-interface.js
-const VideoEvents = {
+const VideoEvents_Enum = {
   /**
    * load
    *
diff --git a/ads/google/utils.js b/ads/google/utils.js
index e51735b4e594..c46c034f3cc1 100644
--- a/ads/google/utils.js
+++ b/ads/google/utils.js
@@ -1,10 +1,11 @@
+import {user} from '#utils/log';
+
 import {
   ExternalCorePubVars,
   MIN_PUB_CONTROL_WIDTH_OF_DESKTOP,
   getAutoConfig,
   getPubControlConfig,
 } from './a4a/shared/content-recommendation';
-import {user} from '#utils/log';
 
 /**
  * Approved height for AdSense full-width responsive ads.
diff --git a/ads/inabox/frame-overlay-helper.js b/ads/inabox/frame-overlay-helper.js
index 06fe2519a33b..751b3a452396 100644
--- a/ads/inabox/frame-overlay-helper.js
+++ b/ads/inabox/frame-overlay-helper.js
@@ -1,14 +1,11 @@
-import {
-  LayoutRectDef,
-  layoutRectFromDomRect,
-  layoutRectLtwh,
-} from '#core/dom/layout/rect';
+import {layoutRectFromDomRect, layoutRectLtwh} from '#core/dom/layout/rect';
+import {resetStyles, setImportantStyles} from '#core/dom/style';
+
 import {
   centerFrameUnderVsyncMutate,
   collapseFrameUnderVsyncMutate,
   expandFrameUnderVsyncMutate,
 } from './full-overlay-frame-helper';
-import {resetStyles, setImportantStyles} from '#core/dom/style';
 import {restrictedVsync, timer} from './util';
 
 const CENTER_TRANSITION_TIME_MS = 150;
diff --git a/ads/inabox/inabox-host.js b/ads/inabox/inabox-host.js
index bfe15e55f88a..93c00fa7546e 100644
--- a/ads/inabox/inabox-host.js
+++ b/ads/inabox/inabox-host.js
@@ -3,9 +3,11 @@
  * its embed AMP content (such as an ad created in AMP).
  */
 
-import {InaboxMessagingHost} from './inabox-messaging-host';
-import {dev, initLogConstructor, setReportError, user} from '#utils/log';
 import {getData} from '#utils/event-helper';
+import {dev, initLogConstructor, setReportError, user} from '#utils/log';
+
+import {InaboxMessagingHost} from './inabox-messaging-host';
+
 import {reportError} from '../../src/error-reporting';
 
 /** @const {string} */
diff --git a/ads/inabox/inabox-messaging-host.js b/ads/inabox/inabox-messaging-host.js
index 60cb766179f3..3e848bf797a9 100644
--- a/ads/inabox/inabox-messaging-host.js
+++ b/ads/inabox/inabox-messaging-host.js
@@ -1,20 +1,22 @@
 import {
-  MessageType,
+  MessageType_Enum,
   deserializeMessage,
   serializeMessage,
 } from '#core/3p-frame-messaging';
-import {canInspectWindow} from '../../src/iframe-helper';
-import {dev, devAssert} from '#utils/log';
-import {dict} from '#core/types/object';
+
 import {getData} from '#utils/event-helper';
+import {dev, devAssert} from '#utils/log';
+
 import {getFrameOverlayManager} from './frame-overlay-manager';
 import {getPositionObserver} from './position-observer';
 
+import {canInspectWindow} from '../../src/iframe-helper';
+
 /** @const */
 const TAG = 'InaboxMessagingHost';
 
 /** @const */
-const READ_ONLY_MESSAGES = [MessageType.SEND_POSITIONS];
+const READ_ONLY_MESSAGES = [MessageType_Enum.SEND_POSITIONS];
 
 /** Simple helper for named callbacks. */
 class NamedObservable {
@@ -22,7 +24,7 @@ class NamedObservable {
    * Creates an instance of NamedObservable.
    */
   constructor() {
-    /** @private {!Object<string, !Function>} */
+    /** @private {!{[key: string]: !Function}} */
     this.map_ = {};
   }
 
@@ -70,7 +72,7 @@ export class InaboxMessagingHost {
     /** @private {!Array<!HTMLIFrameElement>} */
     this.iframes_ = iframes;
 
-    /** @private {!Object<string,!AdFrameDef>} */
+    /** @private {!{[key: string]: !AdFrameDef}} */
     this.iframeMap_ = Object.create(null);
 
     /** @private {!./position-observer.PositionObserver} */
@@ -83,17 +85,17 @@ export class InaboxMessagingHost {
     this.frameOverlayManager_ = getFrameOverlayManager(hostWin);
 
     this.msgObservable_.listen(
-      MessageType.SEND_POSITIONS,
+      MessageType_Enum.SEND_POSITIONS,
       this.handleSendPositions_
     );
 
     this.msgObservable_.listen(
-      MessageType.FULL_OVERLAY_FRAME,
+      MessageType_Enum.FULL_OVERLAY_FRAME,
       this.handleEnterFullOverlay_
     );
 
     this.msgObservable_.listen(
-      MessageType.CANCEL_FULL_OVERLAY_FRAME,
+      MessageType_Enum.CANCEL_FULL_OVERLAY_FRAME,
       this.handleCancelFullOverlay_
     );
   }
@@ -156,14 +158,10 @@ export class InaboxMessagingHost {
   handleSendPositions_(iframe, request, source, unusedOrigin) {
     const viewportRect = this.positionObserver_.getViewportRect();
     const targetRect = this.positionObserver_.getTargetRect(iframe);
-    this.sendPosition_(
-      request,
-      source,
-      dict({
-        'viewportRect': viewportRect,
-        'targetRect': targetRect,
-      })
-    );
+    this.sendPosition_(request, source, {
+      'viewportRect': viewportRect,
+      'targetRect': targetRect,
+    });
 
     devAssert(this.iframeMap_[request.sentinel]);
     this.iframeMap_[request.sentinel].observeUnregisterFn =
@@ -183,7 +181,7 @@ export class InaboxMessagingHost {
   sendPosition_(request, source, data) {
     dev().fine(TAG, 'Sent position data to [%s] %s', request.sentinel, data);
     source./*OK*/ postMessage(
-      serializeMessage(MessageType.POSITION, request.sentinel, data),
+      serializeMessage(MessageType_Enum.POSITION, request.sentinel, data),
       // We don't need to restrict what origin we send the data to because (a)
       // we've already verified that this iframe is allowed to learn its position,
       // and (b) we're post messaging back directly to the requesting frame.
@@ -207,12 +205,12 @@ export class InaboxMessagingHost {
     this.frameOverlayManager_.expandFrame(iframe, (boxRect) => {
       source./*OK*/ postMessage(
         serializeMessage(
-          MessageType.FULL_OVERLAY_FRAME_RESPONSE,
+          MessageType_Enum.FULL_OVERLAY_FRAME_RESPONSE,
           request.sentinel,
-          dict({
+          {
             'success': true,
             'boxRect': boxRect,
-          })
+          }
         ),
         origin
       );
@@ -232,12 +230,12 @@ export class InaboxMessagingHost {
     this.frameOverlayManager_.collapseFrame(iframe, (boxRect) => {
       source./*OK*/ postMessage(
         serializeMessage(
-          MessageType.CANCEL_FULL_OVERLAY_FRAME_RESPONSE,
+          MessageType_Enum.CANCEL_FULL_OVERLAY_FRAME_RESPONSE,
           request.sentinel,
-          dict({
+          {
             'success': true,
             'boxRect': boxRect,
-          })
+          }
         ),
         origin
       );
diff --git a/ads/inabox/position-observer.js b/ads/inabox/position-observer.js
index 1a2d29fddf76..98a4aa0252f9 100644
--- a/ads/inabox/position-observer.js
+++ b/ads/inabox/position-observer.js
@@ -1,10 +1,9 @@
+import {Observable} from '#core/data-structures/observable';
 import {
-  LayoutRectDef,
   layoutRectFromDomRect,
   layoutRectLtwh,
   moveLayoutRect,
 } from '#core/dom/layout/rect';
-import {Observable} from '#core/data-structures/observable';
 import {throttle} from '#core/types/function';
 
 /**
@@ -15,6 +14,8 @@ import {throttle} from '#core/types/function';
  */
 let PositionEntryDef;
 
+/** @typedef {import('#core/dom/layout/rect').LayoutRectDef} LayoutRectDef */
+
 /** @const */
 const MIN_EVENT_INTERVAL_IN_MS = 100;
 
diff --git a/ads/vendors/4wmarketplace.js b/ads/vendors/4wmarketplace.js
new file mode 100644
index 000000000000..9cfb384cce90
--- /dev/null
+++ b/ads/vendors/4wmarketplace.js
@@ -0,0 +1,75 @@
+import {loadScript} from '#3p/3p';
+
+/**
+ * @param {!Window} global
+ * @param {!Object} data
+ */
+export function _4wmarketplace(global, data) {
+  const $4wm = global;
+  const containerDiv = $4wm.document.createElement('div');
+  const containerId = 'fwcontainer';
+  containerDiv.id = containerId;
+  $4wm.document.getElementById('c').appendChild(containerDiv);
+
+  if (typeof data.adtype != 'undefined' && data.adtype == 'ad-custom') {
+    $4wm.fwtag = {
+      cmd: [],
+    };
+    $4wm.fwtag.cmd.push(function () {
+      $4wm.fwtag.addSlotNative({
+        id: containerId,
+        sid: data.sid,
+        n: data.n ? data.n : null,
+        hd: data.hd ? data.hd : null,
+        r: data.r ? data.r : null,
+        imgsize: data.imgsize ? data.imgsize : null,
+        excludeMobCss: data.excludemobcss ? data.excludemobcss : null,
+        css: data.css ? data.css : null,
+        class: data.class ? data.class : null,
+        size: data.size ? data.size : null,
+        amp: 1,
+      });
+    });
+    loadScript($4wm, 'https://static-adsr.4wnetwork.com/js/fwloader.js', () => {
+      window.addEventListener('message', (e) => {
+        if (
+          e.data.message == 'RESIZE_AMP' &&
+          typeof e.data.height != 'undefined'
+        ) {
+          $4wm.context.requestResize(undefined, e.data.height);
+        }
+      });
+    });
+  } else {
+    const obj = {
+      cid: containerId,
+      ic: data.id,
+      amp: 1,
+      format: data.format ? data.format : null,
+      position: data.position ? data.position : null,
+      dim: data.dim ? data.dim : null,
+      nid: data.nid ? data.nid : null,
+    };
+    for (const key in obj) {
+      if (obj[key] == null) {
+        delete obj[key];
+      }
+    }
+
+    $4wm.objFw = [];
+    $4wm.objFw.push(obj);
+    loadScript($4wm, 'https://static.4wnetwork.com/js/sdk.min.js', () => {
+      window.addEventListener('message', (e) => {
+        if (
+          e.data.message == 'RESIZE_AMP' &&
+          typeof e.data.height != 'undefined'
+        ) {
+          $4wm.context.requestResize(undefined, e.data.height);
+        }
+        if (e.data.message == 'CLOSE_AMP_STILL') {
+          $4wm.context.noContentAvailable();
+        }
+      });
+    });
+  }
+}
diff --git a/ads/vendors/4wmarketplace.md b/ads/vendors/4wmarketplace.md
new file mode 100644
index 000000000000..7552b87a5be2
--- /dev/null
+++ b/ads/vendors/4wmarketplace.md
@@ -0,0 +1,28 @@
+# 4wMarketplace
+
+4wMarketplace support for AMP covers Passback technologies.
+
+For configuration details and to generate your tags, please refer to [your publisher account](https://publisher.4wmarketplace.com)
+
+## Example - Passback
+
+html
+<amp-ad
+width="320"
+height="50"
+type="4wmarketplace"
+data-id="76473;98469;199717;0"
+data-dim="{'width':'320px', 'height':'50px'}"
+
+> </amp-ad>
+
+## Configuration
+
+The ad size is based on the setup of your 4wMarketplace space. The `width` and `height` attributes of the `amp-ad` tag should match that.
+
+### Passback
+
+Supported parameters:
+
+-   `data-dim`: identifies the tag dimensions. Required.
+-   `data-id`: your 4wMarketplace space identifier. Required.
diff --git a/ads/vendors/_fakedelayed_.js b/ads/vendors/_fakedelayed_.js
index 5f064bc549fe..61ce8190aa22 100644
--- a/ads/vendors/_fakedelayed_.js
+++ b/ads/vendors/_fakedelayed_.js
@@ -1,6 +1,7 @@
-import {setStyles} from '#core/dom/style';
 import {validateData, writeScript} from '#3p/3p';
 
+import {setStyles} from '#core/dom/style';
+
 /**
  * @param {!Window} global
  * @param {!Object} data
diff --git a/ads/vendors/_ping_.js b/ads/vendors/_ping_.js
index fd0276167e06..a81caf9af7da 100644
--- a/ads/vendors/_ping_.js
+++ b/ads/vendors/_ping_.js
@@ -1,6 +1,7 @@
-import {dev, devAssert, userAssert} from '#utils/log';
 import {validateData} from '#3p/3p';
 
+import {dev, devAssert, userAssert} from '#utils/log';
+
 /**
  * A fake ad network integration that is mainly used for testing
  * and demo purposes. This implementation gets stripped out in compiled
diff --git a/ads/vendors/a9.js b/ads/vendors/a9.js
index 042e784abe0c..9c996b5d8ee4 100644
--- a/ads/vendors/a9.js
+++ b/ads/vendors/a9.js
@@ -1,5 +1,6 @@
-import {hasOwn} from '#core/types/object';
 import {loadScript, validateData, writeScript} from '#3p/3p';
+
+import {hasOwn} from '#core/types/object';
 import {parseJson} from '#core/types/object/json';
 
 const mandatoryParams = [],
diff --git a/ads/vendors/adenza.js b/ads/vendors/adenza.js
new file mode 100644
index 000000000000..1292d96d3fba
--- /dev/null
+++ b/ads/vendors/adenza.js
@@ -0,0 +1,65 @@
+import {validateData, writeScript} from '#3p/3p';
+
+/**
+ * @param {!Window} global
+ * @param {!Object} data
+ */
+export function adenza(global, data) {
+  validateData(data, ['blockId']);
+
+  const url =
+    'https://adenza.network/network/data/teasers/' +
+    encodeURIComponent(data['blockId']) +
+    '/script?async=1&div=c';
+
+  const mainBlock = global.document.getElementById('c');
+  const insertionBlock = global.document.createElement('div');
+  insertionBlock.setAttribute('id', 'pw-net-' + data.blockId);
+  mainBlock.append(insertionBlock);
+
+  window.context.observeIntersection(function (changes) {
+    changes.forEach(function () {
+      const findIframe = global.document
+        .getElementById('c')
+        .querySelector('iframe');
+      if (findIframe) {
+        const styleString = findIframe.getAttribute('style');
+        const height = getStyleAdenza(styleString, 'height');
+        if (height) {
+          window.context.requestResize(undefined, height);
+        }
+      }
+    });
+  });
+
+  writeScript(
+    global,
+    url,
+    () => {
+      global.context.renderStart();
+    },
+    () => {
+      global.context.noContentAvailable();
+    }
+  );
+}
+
+/**
+ * @param {string} style
+ * @param {string} prop
+ * @return {string}
+ */
+function getStyleAdenza(style, prop) {
+  const styleArr = style.split(';');
+  const res = styleArr.filter(function (value) {
+    return value.includes(prop);
+  });
+  if (res) {
+    return res
+      .join('')
+      .replace(prop + ':', '')
+      .replace(/\s+/g, '');
+  } else {
+    return '480px';
+  }
+}
diff --git a/ads/vendors/adenza.md b/ads/vendors/adenza.md
new file mode 100644
index 000000000000..c64f489d9e06
--- /dev/null
+++ b/ads/vendors/adenza.md
@@ -0,0 +1,19 @@
+# Adenza
+
+## Example
+
+```html
+<amp-ad width="768" height="480" type="adenza" layout="responsive" data-block-id="614f579bdd5b213cd8bdae26">
+```
+
+## Configuration
+
+For more information, please [see FAQ](https://adenza.network/faq).
+
+Required parameters:
+
+-   width
+-   height
+-   type
+-   layout
+-   data-block-id
diff --git a/ads/vendors/adincube.js b/ads/vendors/adincube.js
index dba5a35322b1..47d8ad6c2276 100644
--- a/ads/vendors/adincube.js
+++ b/ads/vendors/adincube.js
@@ -1,6 +1,7 @@
-import {hasOwn} from '#core/types/object';
 import {loadScript, validateData} from '#3p/3p';
 
+import {hasOwn} from '#core/types/object';
+
 /**
  * @param {!Window} global
  * @param {!Object} data
diff --git a/ads/vendors/adman.js b/ads/vendors/adman.js
index aecdb8258840..7381c211f800 100644
--- a/ads/vendors/adman.js
+++ b/ads/vendors/adman.js
@@ -5,15 +5,24 @@ import {validateData} from '#3p/3p';
  * @param {!Object} data
  */
 export function adman(global, data) {
-  validateData(data, ['ws', 'host', 's'], []);
-
+  validateData(data, ['ws', 'host'], []);
+  const {host, s, ws} = data;
   const script = global.document.createElement('script');
-  script.setAttribute('data-ws', data.ws);
-  script.setAttribute('data-h', data.host);
-  script.setAttribute('data-s', data.s);
-  script.setAttribute('data-tech', 'amp');
-
   script.src = 'https://static.adman.gr/adman.js';
-
   global.document.body.appendChild(script);
+
+  if (host.match(/grxchange/)) {
+    script.onload = function () {
+      window.Adman.adunit({
+        id: ws,
+        h: 'https://' + host,
+        elementId: 'c',
+      });
+    };
+    return;
+  }
+  script.setAttribute('data-ws', ws);
+  script.setAttribute('data-h', host);
+  script.setAttribute('data-s', s);
+  script.setAttribute('data-tech', 'amp');
 }
diff --git a/ads/vendors/admatic.js b/ads/vendors/admatic.js
new file mode 100644
index 000000000000..7b45ace6b593
--- /dev/null
+++ b/ads/vendors/admatic.js
@@ -0,0 +1,37 @@
+import {validateData, writeScript} from '#3p/3p';
+
+/**
+ * @param {!Window} global
+ * @param {!Object} data
+ */
+export function admatic(global, data) {
+  validateData(data, ['adNetwork', 'adPublisher', 'adTypeId']);
+  global._admatic = global._admatic || {
+    publisher: data['adNetwork'],
+    adNetwork: data['adPublisher'],
+    adTypeId: data['adTypeId'],
+    host: `static.cdn.pixad.com.tr`,
+    prefix: `px`,
+  };
+
+  if (global._admatic.publisher.indexOf('adm-pub') != -1) {
+    global._admatic.host = `static.cdn.admatic.com.tr`;
+    global._admatic.prefix = `adm`;
+  }
+
+  const ins = global.document.createElement('ins');
+  ins.setAttribute('data-publisher', global._admatic.publisher);
+  if (global._admatic.adTypeId == 'standard') {
+    ins.setAttribute('data-ad-size', `[[${data.width},${data.height}]]`);
+  }
+  ins.setAttribute('data-ad-network', global._admatic.adNetwork);
+  ins.setAttribute('data-ad-type-id', global._admatic.adTypeId);
+  ins.setAttribute('class', `${global._admatic.prefix}-ads-area`);
+  global.document.getElementById('c').appendChild(ins);
+  ins.parentNode.addEventListener(
+    'eventAdbladeRenderStart',
+    global.context.renderStart()
+  );
+
+  writeScript(global, `https://${global._admatic.host}/showad/showad.min.js`);
+}
diff --git a/ads/vendors/admatic.md b/ads/vendors/admatic.md
new file mode 100644
index 000000000000..2e30b894b95c
--- /dev/null
+++ b/ads/vendors/admatic.md
@@ -0,0 +1,51 @@
+# AdMatic
+
+## Example of AdMatic's model implementation
+
+### Basic
+
+```html
+  <amp-ad
+    type="admatic"
+    width="300"
+    height="250"
+    data-ad-type-id="standard"
+    data-ad-network="adm-pub-194162670389"
+    data-ad-publisher="65943e194d11b285b6173588">
+  </amp-ad>
+```
+
+### Sticky Ad
+
+```html
+<amp-sticky-ad layout="nodisplay">
+  <amp-ad
+    type="admatic"
+    width="320"
+    height="100"
+    data-ad-type-id="standard"
+    data-ad-network="adm-pub-194162670389"
+    data-ad-publisher="65943e194d11b285b6173588">
+  </amp-ad>
+</amp-sticky-ad>
+```
+
+Note that `<amp-sticky-ad />` component requires the following script to be included in the page:
+
+```html
+<script
+    async
+    custom-element="amp-sticky-ad"
+    src="https://cdn.ampproject.org/v0/amp-sticky-ad-1.0.js"
+></script>
+```
+
+## Configuration
+
+For details on the configuration semantics, see [AdMatic documentation](https://www.admatic.com.tr/).
+
+### Required parameters
+
+-   `data-ad-network`: Network ID
+-   `data-ad-publisher`: Publisher ID
+-   `data-ad-type-id`: Model ID
diff --git a/ads/vendors/admixer.js b/ads/vendors/admixer.js
index 806fa858becb..7a09b4b17605 100644
--- a/ads/vendors/admixer.js
+++ b/ads/vendors/admixer.js
@@ -1,6 +1,7 @@
-import {tryParseJson} from '#core/types/object/json';
 import {validateData, writeScript} from '#3p/3p';
 
+import {tryParseJson} from '#core/types/object/json';
+
 /**
  * @param {!Window} global
  * @param {!Object} data
@@ -8,7 +9,7 @@ import {validateData, writeScript} from '#3p/3p';
 export function admixer(global, data) {
   validateData(data, ['zone'], ['sizes']);
   /**
-   * @type {Object}
+   * @type {object}
    */
   const payload = {
     imps: [],
diff --git a/ads/vendors/adocean.js b/ads/vendors/adocean.js
index d03716cad8b8..8eae482f4183 100644
--- a/ads/vendors/adocean.js
+++ b/ads/vendors/adocean.js
@@ -1,9 +1,13 @@
-import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';
 import {computeInMasterFrame, validateData, writeScript} from '#3p/3p';
+
+import {
+  CONSENT_POLICY_STATE,
+  CONSENT_STRING_TYPE,
+} from '#core/constants/consent-state';
 import {parseJson} from '#core/types/object/json';
 
 /**
- * @const {Object<string, string>}
+ * @const {{[key: string]: string}}
  */
 const ADO_JS_PATHS = {
   'sync': '/files/js/ado.js',
@@ -21,7 +25,7 @@ function isFalseString(str) {
 /**
  * @param {string} mode
  * @param {!Window} global
- * @param {boolean} consent
+ * @param {object} consent
  */
 function setupAdoConfig(mode, global, consent) {
   if (global['ado']) {
@@ -31,7 +35,9 @@ function setupAdoConfig(mode, global, consent) {
       fif: {
         enabled: mode != 'sync',
       },
-      consent,
+      consent: consent.accepted,
+      gdprApplies: consent.gdprApplies,
+      gdprConsent: consent.consentString,
     };
 
     global['ado']['config'](config);
@@ -202,7 +208,7 @@ function requestCodes(masterId, data, global, callback) {
 class AdoBuffer {
   /**
    *
-   * @param {Object} container
+   * @param {object} container
    * @param {!Window} global
    */
   constructor(container, global) {
@@ -305,14 +311,24 @@ export function adocean(global, data) {
   const adoUrl = 'https://' + data['aoEmitter'] + ADO_JS_PATHS[mode];
   const ctx = global.context;
 
-  /*
-   * INSUFFICIENT and UNKNOWN should be treated as INSUFFICIENT
-   * not defined states should be treated as INSUFFICIENT
-   */
-  const consent =
-    ctx.initialConsentState === null /* tags without data-block-on-consent */ ||
-    ctx.initialConsentState === CONSENT_POLICY_STATE.SUFFICIENT ||
-    ctx.initialConsentState === CONSENT_POLICY_STATE.UNKNOWN_NOT_REQUIRED;
+  const consent = {
+    accepted:
+      /* INSUFFICIENT and UNKNOWN should be treated as INSUFFICIENT
+       * not defined states should be treated as INSUFFICIENT */
+      ctx.initialConsentState ===
+        null /* tags without data-block-on-consent */ ||
+      ctx.initialConsentState === CONSENT_POLICY_STATE.SUFFICIENT ||
+      ctx.initialConsentState === CONSENT_POLICY_STATE.UNKNOWN_NOT_REQUIRED,
+    gdprApplies:
+      typeof ctx.initialConsentMetadata?.gdprApplies === 'boolean'
+        ? ctx.initialConsentMetadata.gdprApplies
+        : undefined,
+    consentString:
+      ctx.initialConsentMetadata?.consentStringType ===
+      CONSENT_STRING_TYPE.TCF_V2
+        ? ctx.initialConsentValue
+        : undefined,
+  };
 
   writeScript(global, adoUrl, () => {
     setupAdoConfig(mode, global, consent);
diff --git a/ads/vendors/adplugg.js b/ads/vendors/adplugg.js
index d0fb9d2f4117..16274f28a094 100644
--- a/ads/vendors/adplugg.js
+++ b/ads/vendors/adplugg.js
@@ -1,6 +1,7 @@
-import {hasOwn} from '#core/types/object';
 import {loadScript, validateData} from '#3p/3p';
 
+import {hasOwn} from '#core/types/object';
+
 /**
  * Make an AdPlugg iframe.
  * @param {!Window} global
diff --git a/ads/vendors/adpushup.js b/ads/vendors/adpushup.js
index e2289e8660c7..2d20013efd69 100644
--- a/ads/vendors/adpushup.js
+++ b/ads/vendors/adpushup.js
@@ -8,28 +8,29 @@ export function adpushup(global, data) {
   validateData(
     data,
     ['siteid', 'slotpath', 'width', 'height'],
-    ['totalampslots', 'jsontargeting', 'extras']
+    ['totalampslots', 'jsontargeting', 'extras', 'loadalternate']
   );
   loadScript(
     global,
     'https://securepubads.g.doubleclick.net/tag/js/gpt.js',
     () => {
-      loadScript(
-        global,
-        'https://cdn.adpushup.com/' + data.siteid + '/amp.js',
-        () => {
-          window.adpushup.initAmp(
-            global,
-            data.width,
-            data.height,
-            data.siteid,
-            data.slotpath,
-            data.totalampslots,
-            data.jsontargeting,
-            data.extras
-          );
-        }
-      );
+      const domain =
+        data.loadalternate === 'true'
+          ? 'https://assets.adpushup.com/'
+          : 'https://cdn.adpushup.com/';
+      const url = domain + data.siteid + '/amp.js';
+      loadScript(global, url, () => {
+        window.adpushup.initAmp(
+          global,
+          data.width,
+          data.height,
+          data.siteid,
+          data.slotpath,
+          data.totalampslots,
+          data.jsontargeting,
+          data.extras
+        );
+      });
     }
   );
 }
diff --git a/ads/vendors/ads2bid.js b/ads/vendors/ads2bid.js
new file mode 100644
index 000000000000..f251cfccdf03
--- /dev/null
+++ b/ads/vendors/ads2bid.js
@@ -0,0 +1,22 @@
+import {loadScript, validateData} from '#3p/3p';
+
+/**
+ * @param {!Window} global
+ * @param {!Object} data
+ */
+export function ads2bid(global, data) {
+  validateData(data, ['blockId', 'siteId', 'src']);
+  const {blockId, siteId, src} = data;
+  const url = src + `/html/amp?site_id=${siteId}&blocks=${blockId}`;
+  createContainer(global);
+  loadScript(global, url);
+}
+
+/**
+ * @param {!Window} global
+ */
+function createContainer(global) {
+  const div = global.document.createElement('div');
+  div.setAttribute('data-ads2bid', 1);
+  global.document.getElementById('c').appendChild(div);
+}
diff --git a/ads/vendors/ads2bid.md b/ads/vendors/ads2bid.md
new file mode 100644
index 000000000000..11b41668516e
--- /dev/null
+++ b/ads/vendors/ads2bid.md
@@ -0,0 +1,21 @@
+# ads2.bid
+
+Provides support for [ads2.bid](https://ads2.bid/) widgets.
+
+### Required parameters
+
+-   `src`
+-   `data-block-id`
+-   `data-site-id`
+
+## Example
+
+```html
+<amp-ad width="690"
+        height="690"
+        type="ads2bid"
+        data-site-id="11620"
+        data-block-id="123602,690"
+        src="https://kdunhltakb.ru">
+</amp-ad>
+```
diff --git a/ads/vendors/adskeeper.js b/ads/vendors/adskeeper.js
index 789a68ef252b..13773f424816 100644
--- a/ads/vendors/adskeeper.js
+++ b/ads/vendors/adskeeper.js
@@ -21,41 +21,60 @@ import {loadScript, validateData} from '#3p/3p';
  * @param {!Object} data
  */
 export function adskeeper(global, data) {
-  validateData(data, ['publisher', 'widget', 'container'], ['url', 'options']);
-
-  const scriptRoot = global.document.createElement('div');
-  scriptRoot.id = data.container;
-
-  global.document.body.appendChild(scriptRoot);
-
-  /**
-   * Returns path for provided js filename
-   * @param {string} publisher js filename
-   * @return {string} Path to provided filename.
-   */
-  function getResourceFilePath(publisher) {
-    const publisherStr = publisher.replace(/[^A-z0-9]/g, '');
-    return `${publisherStr[0]}/${publisherStr[1]}`;
-  }
-
-  const url =
-    `https://jsc.adskeeper.com/${getResourceFilePath(data.publisher)}/` +
-    `${encodeURIComponent(data.publisher)}.` +
-    `${encodeURIComponent(data.widget)}.js`;
+  validateData(
+    data,
+    [['publisher', 'website'], ['container', 'website'], 'widget'],
+    ['url', 'options']
+  );
 
   global.uniqId = (
     '00000' + Math.round(Math.random() * 100000).toString(16)
   ).slice(-5);
-  global['ampOptions' + data.widget + '_' + global.uniqId] = data.options;
+  window['ampOptions' + data.widget + '_' + global.uniqId] = data.options;
 
   global.context.observeIntersection(function (changes) {
     /** @type {!Array} */ (changes).forEach(function (c) {
-      global['intersectionRect' + data.widget + '_' + global.uniqId] =
+      window['intersectionRect' + data.widget + '_' + global.uniqId] =
         c.intersectionRect;
-      global['boundingClientRect' + data.widget + '_' + global.uniqId] =
+      window['boundingClientRect' + data.widget + '_' + global.uniqId] =
         c.boundingClientRect;
     });
   });
 
-  loadScript(global, data.url || url);
+  if (data.website) {
+    const widgetContainer = document.createElement('div');
+    widgetContainer.dataset.type = '_mgwidget';
+    widgetContainer.dataset.widgetId = data.widget;
+    document.body.appendChild(widgetContainer);
+
+    const url =
+      `https://jsc.adskeeper.com/site/` +
+      `${encodeURIComponent(data.website)}.js?t=` +
+      Math.floor(Date.now() / 36e5);
+
+    loadScript(global, data.url || url);
+  } else {
+    const scriptRoot = document.createElement('div');
+    scriptRoot.id = data.container;
+
+    document.body.appendChild(scriptRoot);
+
+    /**
+     * Returns path for provided js filename
+     * @param {string} publisher js filename
+     * @return {string} Path to provided filename.
+     */
+    function getResourceFilePath(publisher) {
+      const publisherStr = publisher.replace(/[^a-zA-Z0-9]/g, '');
+      return `${publisherStr[0]}/${publisherStr[1]}`;
+    }
+
+    const url =
+      `https://jsc.adskeeper.com/${getResourceFilePath(data.publisher)}/` +
+      `${encodeURIComponent(data.publisher)}.` +
+      `${encodeURIComponent(data.widget)}.js?t=` +
+      Math.floor(Date.now() / 36e5);
+
+    loadScript(global, data.url || url);
+  }
 }
diff --git a/ads/vendors/adskeeper.md b/ads/vendors/adskeeper.md
index 4e292fc80387..a15e7f4a42f5 100644
--- a/ads/vendors/adskeeper.md
+++ b/ads/vendors/adskeeper.md
@@ -20,6 +20,19 @@ limitations under the License.
 
 ### Basic
 
+Latest version:
+```html
+<amp-embed
+  width="100"
+  height="283"
+  type="adskeeper"
+  data-website="98765"
+  data-widget="12345"
+>
+</amp-embed>
+```
+
+Legacy version:
 ```html
 <amp-embed
   width="100"
@@ -38,8 +51,13 @@ For details on the configuration semantics, please contact the ad network or ref
 
 ### Required parameters
 
--   `data-publisher`
+Latest version:
 -   `data-widget`
+-   `data-website`
+
+Legacy version:
+-   `data-widget`
+-   `data-publisher`
 -   `data-container`
 
 ### Optional parameters
diff --git a/ads/vendors/adspirit.js b/ads/vendors/adspirit.js
index f946aa47aecc..3e4aefcede7c 100644
--- a/ads/vendors/adspirit.js
+++ b/ads/vendors/adspirit.js
@@ -1,6 +1,7 @@
-import {setStyles} from '#core/dom/style';
 import {validateData} from '#3p/3p';
 
+import {setStyles} from '#core/dom/style';
+
 /**
  * @param {!Window} global
  * @param {!Object} data
diff --git a/ads/vendors/adsviu.js b/ads/vendors/adsviu.js
new file mode 100644
index 000000000000..4b9137b5e773
--- /dev/null
+++ b/ads/vendors/adsviu.js
@@ -0,0 +1,29 @@
+/**
+ * Copyright 2023 The AMP HTML Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {loadScript, validateData} from '#3p/3p';
+
+/**
+ * @param {!Window} global
+ * @param {!Object} data
+ */
+export function adsviu(global, data) {
+  global.adsviuAmp = {data};
+
+  validateData(data, ['src', 'siteId'], ['src', 'siteId']);
+
+  loadScript(global, 'https://widget.adsviu.com/adsviuAMP.js');
+}
diff --git a/ads/vendors/adsviu.md b/ads/vendors/adsviu.md
new file mode 100644
index 000000000000..3b0ccddc2d0b
--- /dev/null
+++ b/ads/vendors/adsviu.md
@@ -0,0 +1,37 @@
+<!---
+Copyright 2023 The AMP HTML Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS-IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+# Adsviu
+
+## Example
+
+```html
+<amp-ad
+  height="142"
+  type="adsviu"
+  layout="fixed-height"
+  data-site-id="XXXXXX"
+  data-src="https://domain.com/image.jpeg"
+>
+</amp-ad>
+```
+
+## Configuration
+
+Supported parameters:
+
+-   `data-src`(mandatory): url with the image to be analized
+-   `data-site-id`(mandatory): id supplied by Adsviu to identify the site where this widget is going to be used
diff --git a/ads/vendors/adventive.js b/ads/vendors/adventive.js
index 76cf4df6bc41..2f3dfe7580da 100644
--- a/ads/vendors/adventive.js
+++ b/ads/vendors/adventive.js
@@ -1,8 +1,10 @@
-import {addParamsToUrl} from '../../src/url';
-import {dict, hasOwn} from '#core/types/object';
-import {endsWith} from '#core/types/string';
 import {loadScript, validateData, writeScript} from '#3p/3p';
 
+import {hasOwn} from '#core/types/object';
+import {endsWith} from '#core/types/string';
+
+import {addParamsToUrl} from '../../src/url';
+
 /**
  * @param {!Window} global
  * @param {!Object} data
@@ -141,11 +143,11 @@ function reduceSearch(ns, placementId, click, referrer) {
 
   return !needsRequest
     ? null
-    : dict({
+    : {
         'click': click,
         'referrer': referrer,
         'isAmp': '1',
         'lib': !ns.isLibLoaded ? '1' : '', // may be prefetchable via _config
         'pid': needsRequest ? placementId : '',
-      });
+      };
 }
diff --git a/ads/vendors/adverticum.js b/ads/vendors/adverticum.js
index 0ac494ef6ace..c3c4301b14d9 100644
--- a/ads/vendors/adverticum.js
+++ b/ads/vendors/adverticum.js
@@ -1,5 +1,6 @@
-import {setStyle} from '#core/dom/style';
 import {validateData, writeScript} from '#3p/3p';
+
+import {setStyle} from '#core/dom/style';
 /**
  * @param {!Window} global
  * @param {!Object} data
diff --git a/ads/vendors/affinity.js b/ads/vendors/affinity.js
new file mode 100644
index 000000000000..28ff615d9e43
--- /dev/null
+++ b/ads/vendors/affinity.js
@@ -0,0 +1,112 @@
+import {loadScript, validateData} from '#3p/3p';
+
+/**
+ * @param {!Window} global
+ * @param {!Object} data
+ */
+export function affinity(global, data) {
+  validateData(
+    data,
+    ['width', 'height', 'adtype', ['adslot', 'slot']],
+    [
+      'affLayout',
+      'multiSize',
+      'affSticky',
+      'affTitle',
+      'affJson',
+      'affRtcConfig',
+      'jsontargeting',
+      'extras',
+    ]
+  );
+
+  const runV1 = function (g, d) {
+      if (false === g.isInitCalled) {
+        g.isInitCalled = true;
+        loadScript(g, gGPT, () => {
+          loadScript(g, affCDN + '/amp/v2022/amp.js', () => {
+            (function () {
+              window.affinity.initAMP(g, d);
+            })();
+          });
+        });
+      }
+    },
+    O2s = Object.prototype.toString,
+    isObject = function (val) {
+      return '[object Object]' == O2s.call(val);
+    },
+    chkIsvalidContext = function (mixContext) {
+      if ('string' == typeof mixContext) {
+        try {
+          mixContext = JSON.parse(mixContext);
+        } catch (e) {
+          return false;
+        }
+      }
+      if (isObject(mixContext) && mixContext.sourceUrl) {
+        return true;
+      }
+      return false;
+    },
+    getAmpContext = function () {
+      if (chkIsvalidContext(W.context)) {
+        return W.context;
+      }
+      if (chkIsvalidContext(W.AMP_CONTEXT_DATA)) {
+        return W.AMP_CONTEXT_DATA;
+      }
+
+      return undefined;
+    },
+    jsonParse = function (strJson) {
+      let ret = null;
+      try {
+        ret = JSON.parse(strJson);
+      } catch (e) {
+        try {
+          ret = JSON.parse(strJson.split("'").join('"'));
+        } catch (e2) {}
+      }
+      return ret;
+    };
+  const W = global,
+    affCDN = 'https://cdn4-hbs.affinitymatrix.com',
+    gGPT = 'https://securepubads.g.doubleclick.net/tag/js/gpt.js',
+    extras = jsonParse(String(data.extras));
+
+  global.affinity = global.affinity || {task: []};
+  global.isInitCalled = false;
+  global.affinity.initAMP = function (global, data) {
+    if (global.isInitCalled == true) {
+      return;
+    }
+    global.isInitCalled = true;
+    try {
+      const dtObj = new Date();
+      const cb = String(dtObj.getDate()) + dtObj.getMonth() + dtObj.getHours();
+      const dmn = extras.d.replace('www.', '');
+
+      const cfgData = {...data, ...extras};
+
+      const libUrl = affCDN + '/amplib/' + dmn + '/a' + cb + '/amp.php?t=' + cb;
+      loadScript(global, libUrl);
+      global.affinity.task.push(function () {
+        global.affinity.init(cfgData);
+      });
+    } catch (e) {
+      runV1(global, data);
+    }
+  };
+  try {
+    if (getAmpContext() !== undefined) {
+      if (extras && extras.ver && extras.ver == 1) {
+        // console.log('extras.ver == 1');
+        global.affinity.initAMP(global, data);
+        data.adStatus = Date.now();
+        return;
+      }
+    }
+  } catch (e) {}
+  runV1(global, data);
+}
diff --git a/ads/vendors/affinity.md b/ads/vendors/affinity.md
new file mode 100644
index 000000000000..1c060a1e0c0c
--- /dev/null
+++ b/ads/vendors/affinity.md
@@ -0,0 +1,24 @@
+# Affinity
+
+Adtype Affinity support for AMP
+
+## Example
+
+```html
+<amp-ad
+  width="300"
+  height="250"
+  type="affinity"
+  data-adtype="banner"
+  data-adslot="AFFINITY_AMP_TEST_300x250"
+>
+</amp-ad>
+```
+
+## Configuration
+
+-   `data-adtype`: (Mandatory) Type of the adformat
+-   `data-adslot`: (Mandatory) Name of of adslot
+-   `data-multi-size`: (Optional) Multi-size support
+-   `data-jsontargeting`: (Optional) Targeting related paramterers
+-   `data-extras`: (Optional) Extra data
diff --git a/ads/vendors/appmonsta.js b/ads/vendors/appmonsta.js
new file mode 100644
index 000000000000..253f389dfa20
--- /dev/null
+++ b/ads/vendors/appmonsta.js
@@ -0,0 +1,30 @@
+import {validateData, writeScript} from '#3p/3p';
+
+/**
+ * @param {!Window} global
+ * @param {!Object} data
+ */
+export function appmonsta(global, data) {
+  validateData(data, ['placementId']);
+
+  const {location} = global.context;
+  let url = 'https://ssp.appmonsta.ai?c=b&m=amp';
+
+  const params = [
+    ['placementId', encodeURIComponent(data.placementId)],
+    ['ua', encodeURIComponent(global.navigator?.userAgent)],
+    ['w', data.width],
+    ['h', data.height],
+    ['domain', location.host],
+    ['page', location.pathname],
+    ['secure', location.protocol === 'https:' ? 1 : 0],
+    ['language', global.navigator?.language],
+  ];
+
+  for (let i = 0; i < params.length; i++) {
+    const param = params[i];
+    url = `${url}&${param[0]}=${param[1] ?? ''}`;
+  }
+
+  writeScript(global, url);
+}
diff --git a/ads/vendors/appmonsta.md b/ads/vendors/appmonsta.md
new file mode 100644
index 000000000000..e22783dce9d5
--- /dev/null
+++ b/ads/vendors/appmonsta.md
@@ -0,0 +1,17 @@
+# AppMonsta
+
+## Basic example
+
+```html
+  <amp-ad
+    width="300"
+    height="250"
+    type="appmonsta"
+    data-placement-id="test"
+  >
+  </amp-ad>
+```
+
+### Required parameters
+
+-   `placement-id`: Placement Id
diff --git a/ads/vendors/appnexus.js b/ads/vendors/appnexus.js
index c7381dd2a1a7..fd109899210e 100644
--- a/ads/vendors/appnexus.js
+++ b/ads/vendors/appnexus.js
@@ -1,4 +1,5 @@
 import {loadScript, validateData, writeScript} from '#3p/3p';
+
 import {setStyles} from '#core/dom/style';
 
 const APPNEXUS_AST_URL = 'https://acdn.adnxs.com/ast/ast.js';
diff --git a/ads/vendors/bidgear.js b/ads/vendors/bidgear.js
new file mode 100644
index 000000000000..1901c7de7c67
--- /dev/null
+++ b/ads/vendors/bidgear.js
@@ -0,0 +1,35 @@
+import {loadScript, validateData} from '#3p/3p';
+
+const requiredParams = ['zoneid'];
+
+/**
+ * @param {!Window} global
+ * @param {!Object} data
+ */
+export function bidgear(global, data) {
+  validateData(data, requiredParams);
+
+  const container = document.getElementById('c');
+  const adDivId = 'bg-ssp-' + encodeURIComponent(data.zoneid);
+  const adDiv = document.createElement('div');
+  adDiv.setAttribute('id', adDivId);
+  container.appendChild(adDiv);
+
+  loadScript(
+    global,
+    'https://platform.bidgear.com/bidgear-amp.js',
+    () => {
+      // Bidgear has been loaded
+      window.pubbidgeartag = window.pubbidgeartag || [];
+      window.pubbidgeartag.push({
+        zoneid: encodeURIComponent(data.zoneid),
+        id: encodeURIComponent(adDivId),
+        wu: window.location.href,
+      });
+    },
+    () => {
+      // Cannot load bidgear-amp.js
+      global.context.noContentAvailable();
+    }
+  );
+}
diff --git a/ads/vendors/bidgear.md b/ads/vendors/bidgear.md
new file mode 100644
index 000000000000..4bfa1d37a917
--- /dev/null
+++ b/ads/vendors/bidgear.md
@@ -0,0 +1,22 @@
+# Bidgear
+
+## Examples
+
+```html
+<amp-ad
+  width="300"
+  height="250"
+  type="bidgear"
+  data-zoneid="PLACE_HOLDER">
+  </amp-ad>
+```
+
+## Configuration
+
+**Required:**
+
+`width` + `height` - Required for all `<amp-ad>` units. Specifies the ad size.
+
+`type` - Always set to "bidgear".
+
+`data-zoneid`: Zone Id.
diff --git a/ads/vendors/blade.js b/ads/vendors/blade.js
index 95d93bcde9e6..c16ec25f6dd5 100644
--- a/ads/vendors/blade.js
+++ b/ads/vendors/blade.js
@@ -1,4 +1,5 @@
 import {loadScript, validateData} from '#3p/3p';
+
 import {tryParseJson} from '#core/types/object/json';
 
 /**
diff --git a/ads/vendors/broadstreetads.js b/ads/vendors/broadstreetads.js
index 124888600355..80b5d72e44d4 100644
--- a/ads/vendors/broadstreetads.js
+++ b/ads/vendors/broadstreetads.js
@@ -8,12 +8,14 @@ export function broadstreetads(global, data) {
   validateData(
     data,
     ['network', 'zone', 'width', 'height'],
-    ['keywords', 'place']
+    ['keywords', 'place', 'initurl', 'initoptions']
   );
 
   data.place = data.place || 0;
 
   const placeholderID = 'placement_' + data.zone + '_' + data.place;
+  const initUrl =
+    data.initurl || 'https://cdn.broadstreetads.com/init-2.min.js';
 
   // placeholder div
   const d = global.document.createElement('div');
@@ -36,7 +38,8 @@ export function broadstreetads(global, data) {
       softKeywords: true,
       width: data.width,
       zoneId: data.zone,
+      options: data.initoptions,
     });
   });
-  loadScript(global, 'https://cdn.broadstreetads.com/init-2.min.js');
+  loadScript(global, initUrl);
 }
diff --git a/ads/vendors/cedato.js b/ads/vendors/cedato.js
index fe1129214390..6ee937078ecf 100644
--- a/ads/vendors/cedato.js
+++ b/ads/vendors/cedato.js
@@ -1,7 +1,9 @@
-import {parseUrlDeprecated} from '../../src/url';
-import {setStyles} from '#core/dom/style';
 import {validateData} from '#3p/3p';
 
+import {setStyles} from '#core/dom/style';
+
+import {parseUrlDeprecated} from '../../src/url';
+
 /**
  * @param {!Window} global
  * @param {!Object} data
diff --git a/ads/vendors/clever.js b/ads/vendors/clever.js
new file mode 100644
index 000000000000..684a3f838218
--- /dev/null
+++ b/ads/vendors/clever.js
@@ -0,0 +1,23 @@
+import {parseUrlDeprecated} from '../../src/url';
+
+/**
+ * @param {!Window} global
+ * @param {!Object} data
+ */
+export function clever(global, data) {
+  if (!data || !data.id || !data.hash) {
+    global.context.noContentAvailable();
+    return;
+  }
+
+  const domain = parseUrlDeprecated(global.context.sourceUrl).origin;
+  const c = document.createElement('script');
+
+  c.id = 'CleverCoreLoader' + data.id;
+  c.src = '//scripts.cleverwebserver.com/' + data.hash + '.js';
+  c.type = 'text/javascript';
+  c.setAttribute('data-target', global.window.name);
+  c.setAttribute('data-origin', domain);
+
+  global.document.getElementsByTagName('body')[0].append(c);
+}
diff --git a/ads/vendors/clever.md b/ads/vendors/clever.md
new file mode 100644
index 000000000000..3db370354a9e
--- /dev/null
+++ b/ads/vendors/clever.md
@@ -0,0 +1,23 @@
+# Clever
+
+## Example
+
+```html
+<amp-ad
+  width="1490"
+  height="250"
+  type="clever"
+  data-id="45366"
+  data-hash="f787765d347dedcbd6314064192482bd"
+>
+</amp-ad>
+```
+
+## Configuration
+
+For additional details and support contact `suport@cleveradvertising.com`.
+
+### Required parameters
+
+-   `data-id`: the id of campaign
+-   `data-hash`: MD5 hash of `data-id`
diff --git a/ads/vendors/cognativex.js b/ads/vendors/cognativex.js
new file mode 100644
index 000000000000..69178a987174
--- /dev/null
+++ b/ads/vendors/cognativex.js
@@ -0,0 +1,34 @@
+import {loadScript, validateData} from '#3p/3p';
+
+/**
+ * @param {!Window} global
+ * @param {!Object} data
+ */
+export function cognativex(global, data) {
+  validateData(data, ['appdomain', 'widgetid']);
+  global.COGNATIVEX = global.COGNATIVEX || {};
+  global.COGNATIVEX.config = {
+    appdomain: data['appdomain'],
+  };
+  (global.COGNATIVEX.widgetIDs = global.COGNATIVEX.widgetIDs || []).push({
+    id: data['widgetid'],
+    isRendered: false,
+  });
+  const d = global.document.createElement('div');
+  d.classList.add('cognativex-widget');
+  d.id = 'cognativex-widget-' + data['widgetid'];
+  global.document.getElementById('c').appendChild(d);
+  const td = new Date();
+  const forCache =
+    td.getFullYear() +
+    '-' +
+    (td.getMonth() + 1) +
+    '-' +
+    td.getDate() +
+    '--' +
+    td.getHours();
+  loadScript(
+    global,
+    'https://static.cognativex.com/scripts/cx_script_amp.js?v=' + forCache
+  );
+}
diff --git a/ads/vendors/cognativex.md b/ads/vendors/cognativex.md
new file mode 100644
index 000000000000..48e003188d43
--- /dev/null
+++ b/ads/vendors/cognativex.md
@@ -0,0 +1,23 @@
+# Cognativex
+
+Cognativex support for AMP.
+
+For configuration details, additional information or support please contact support@cognativex.com
+
+## Example
+
+```html
+<amp-embed
+  width="600"
+  height="300"
+  type="cognativex"
+  layout="responsive"
+  data-widgetid="7498370298738740"
+  data-appdomain="yourdomain.com"
+>
+</amp-embed>
+```
+
+parameters:
+
+-   `data-widgetid`: widget id. Required.
diff --git a/ads/vendors/connatix.js b/ads/vendors/connatix.js
index 0a4a2781581a..8de2f97c810c 100644
--- a/ads/vendors/connatix.js
+++ b/ads/vendors/connatix.js
@@ -1,6 +1,7 @@
+import {validateData} from '#3p/3p';
+
 import {hasOwn} from '#core/types/object';
 import {tryParseJson} from '#core/types/object/json';
-import {validateData} from '#3p/3p';
 
 /**
  * @param {!Window} global
diff --git a/ads/vendors/contentad.js b/ads/vendors/contentad.js
index 3fc3d0cbb92a..89c8edc98515 100644
--- a/ads/vendors/contentad.js
+++ b/ads/vendors/contentad.js
@@ -1,6 +1,7 @@
-import {parseUrlDeprecated} from '../../src/url';
 import {validateData, writeScript} from '#3p/3p';
 
+import {parseUrlDeprecated} from '../../src/url';
+
 /**
  * @param {!Window} global
  * @param {!Object} data
diff --git a/ads/vendors/criteo.js b/ads/vendors/criteo.js
index 4e70c654624a..13f85886737a 100644
--- a/ads/vendors/criteo.js
+++ b/ads/vendors/criteo.js
@@ -1,6 +1,7 @@
-import {dev} from '#utils/log';
 import {loadScript} from '#3p/3p';
 
+import {dev} from '#utils/log';
+
 /* global Criteo: false */
 
 /** @const {string} */
diff --git a/ads/vendors/csa.js b/ads/vendors/csa.js
index a4d2a9301ff5..67daf8794b27 100644
--- a/ads/vendors/csa.js
+++ b/ads/vendors/csa.js
@@ -1,8 +1,10 @@
-import {devAssert} from '#utils/log';
-import {getStyle, setStyle, setStyles} from '#core/dom/style';
 import {loadScript, validateData} from '#3p/3p';
+
+import {getStyle, setStyle, setStyles} from '#core/dom/style';
 import {tryParseJson} from '#core/types/object/json';
 
+import {devAssert} from '#utils/log';
+
 // Keep track of current height of AMP iframe
 let currentAmpHeight = null;
 
@@ -104,7 +106,7 @@ function orientationChangeHandler(global, containerDiv) {
   const oldHeight = getStyle(containerDiv, 'height');
   global.setTimeout(() => {
     // Force DOM reflow and repaint.
-    // eslint-disable-next-line no-unused-vars
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const ignore = global.document.body./*OK*/ offsetHeight;
     // Capture new height.
     const newHeight = getStyle(containerDiv, 'height');
diff --git a/ads/vendors/dable.js b/ads/vendors/dable.js
index dd2251142f42..61481828594a 100644
--- a/ads/vendors/dable.js
+++ b/ads/vendors/dable.js
@@ -17,7 +17,10 @@ export function dable(global, data) {
     'setService',
     data['serviceName'] || global.window.context.location.hostname
   );
-  global.dable('setURL', global.window.context.sourceUrl);
+  global.dable(
+    'setURL',
+    global.window.context.canonicalUrl || global.window.context.sourceUrl
+  );
   global.dable('setRef', global.window.context.referrer);
 
   const slot = global.document.createElement('div');
@@ -30,16 +33,43 @@ export function dable(global, data) {
   }
 
   const itemId = data['itemId'] || '';
-  const opts = {};
+  const channel = data['channel'] || '';
+  const articleSection = data['articleSection'] || '';
+  const articleSection2 = data['articleSection2'] || '';
+  const articleSection3 = data['articleSection3'] || '';
+  const orgServiceId = data['orgServiceId'] || '';
+  const widgetOpts = {};
+  const logOpts = {};
+
+  if (channel) {
+    widgetOpts.channel = channel;
+  }
+  if (articleSection) {
+    widgetOpts.category1 = articleSection;
+    logOpts.category1 = articleSection;
+  }
+  if (articleSection2) {
+    widgetOpts.category2 = articleSection2;
+    logOpts.category2 = articleSection2;
+  }
+  if (articleSection3) {
+    widgetOpts.category3 = articleSection3;
+    logOpts.category3 = articleSection3;
+  }
+  if (orgServiceId) {
+    widgetOpts.orgServiceId = orgServiceId;
+    logOpts.orgServiceId = orgServiceId;
+  }
 
   if (itemId) {
-    global.dable('sendLog', 'view', {id: itemId});
+    logOpts.id = itemId;
+    global.dable('sendLog', 'view', logOpts);
   } else {
-    opts.ignoreItems = true;
+    widgetOpts.ignoreItems = true;
   }
 
   // call render widget
-  global.dable('renderWidget', slot.id, itemId, opts, function (hasAd) {
+  global.dable('renderWidget', slot.id, itemId, widgetOpts, function (hasAd) {
     if (hasAd) {
       global.context.renderStart();
     } else {
diff --git a/ads/vendors/dable.md b/ads/vendors/dable.md
index 83216aa55f66..4c287a5db5c2 100644
--- a/ads/vendors/dable.md
+++ b/ads/vendors/dable.md
@@ -10,7 +10,11 @@
   height="200"
   type="dable"
   data-widget-id="jobgqR7W"
+  data-service-name="testservice"
   data-item-id="testitem"
+  data-article-section="politics"
+  data-article-section2="global"
+  data-org-service-id="1"
 >
 </amp-embed>
 ```
@@ -22,8 +26,13 @@ For configuration details and to generate your tags, please contact https://admi
 ### Required parameters
 
 -   `data-widget-id`
+-   `data-service-name`
 
 ### Optional parameters
 
 -   `data-item-id`
--   `data-service-name`
+-   `data-channel`
+-   `data-article-section`
+-   `data-article-section2`
+-   `data-article-section3`
+-   `data-org-service-id`
diff --git a/ads/vendors/dex.js b/ads/vendors/dex.js
new file mode 100644
index 000000000000..8a3d49f449bc
--- /dev/null
+++ b/ads/vendors/dex.js
@@ -0,0 +1,28 @@
+import {loadScript, validateData} from '#3p/3p';
+
+/**
+ * @param {!Window} global
+ * @param {!Object} data
+ */
+export function dex(global, data) {
+  validateData(data, ['zoneid']);
+  loadScript(global, buildUrl(data));
+}
+
+/**
+ * @param {!Object} data
+ * @return {string}
+ */
+function buildUrl(data) {
+  let url = `https://cdnb.4strokemedia.com/amp/amp_tag.js?zoneid=${data['zoneid']}`;
+
+  if (data['videoid']) {
+    url += `&videoid=${data['videoid']}`;
+  }
+
+  if (data['audioid']) {
+    url += `&audioid=${data['audioid']}`;
+  }
+
+  return url;
+}
diff --git a/ads/vendors/dex.md b/ads/vendors/dex.md
new file mode 100644
index 000000000000..903f498dec2c
--- /dev/null
+++ b/ads/vendors/dex.md
@@ -0,0 +1,16 @@
+# DigitalExchange
+
+## Example
+
+```html
+<amp-ad
+  type="dex"
+  data-zoneid="2"
+  data-videoid="2"
+  data-audioid="2">
+</amp-ad>
+```
+
+### Required parameters
+
+-   `data-zoneid`
diff --git a/ads/vendors/directadvert.js b/ads/vendors/directadvert.js
index bdb7d5778faf..0a6108328471 100644
--- a/ads/vendors/directadvert.js
+++ b/ads/vendors/directadvert.js
@@ -1,4 +1,5 @@
 import {loadScript, validateData} from '#3p/3p';
+
 import {serializeQueryString} from '../../src/url';
 
 /**
diff --git a/ads/vendors/fairground.js b/ads/vendors/fairground.js
new file mode 100644
index 000000000000..beb128c792b0
--- /dev/null
+++ b/ads/vendors/fairground.js
@@ -0,0 +1,20 @@
+import {validateData} from '#3p/3p';
+
+/**
+ * @param {!Window} global
+ * @param {!Object} data
+ */
+export function fairground(global, data) {
+  validateData(data, ['project', 'hash']);
+
+  const c = document.createElement('script');
+  c.src =
+    'https://amp.thefairground.com/' +
+    data.project +
+    '/' +
+    data.hash +
+    '/amp.script.js';
+  c.type = 'text/javascript';
+
+  global.document.getElementsByTagName('body')[0].append(c);
+}
diff --git a/ads/vendors/fairground.md b/ads/vendors/fairground.md
new file mode 100644
index 000000000000..a9b59ffbc93e
--- /dev/null
+++ b/ads/vendors/fairground.md
@@ -0,0 +1,16 @@
+# Fairground
+
+Provides support for Fairground ads.
+
+### Required parameters
+
+-   `project`
+-   `hash`
+
+## Example
+
+```html
+<amp-ad width="320" height="100" layout="fixed" type="fairground"
+        data-project="campaigns" data-hash="4189dd42-f853-4535-aedd-7130ea601fd8">
+</amp-ad>
+```
diff --git a/ads/vendors/feedad.js b/ads/vendors/feedad.js
index b5f5aa6ccbfa..26578fd6b519 100644
--- a/ads/vendors/feedad.js
+++ b/ads/vendors/feedad.js
@@ -15,6 +15,7 @@
  */
 
 import {loadScript, validateData} from '#3p/3p';
+
 import {setStyle} from '#core/dom/style';
 
 /**
@@ -25,7 +26,7 @@ import {setStyle} from '#core/dom/style';
  */
 
 /**
- * @typedef {Object} FeedAdAsync
+ * @typedef {object} FeedAdAsync
  * @private
  *
  * @property {FeedAd} [sdk]
@@ -33,7 +34,7 @@ import {setStyle} from '#core/dom/style';
  */
 
 /**
- * @typedef {Object} FeedAd
+ * @typedef {object} FeedAd
  * @private
  *
  * @property {function(string)} init
@@ -41,14 +42,14 @@ import {setStyle} from '#core/dom/style';
  */
 
 /**
- * @typedef {Object} FeedAdResponse
+ * @typedef {object} FeedAdResponse
  * @private
  *
  * @property {function():HTMLElement} createAdContainer()
  */
 
 /**
- * @typedef {Object} FeedAdData
+ * @typedef {object} FeedAdData
  * @private
  *
  * @property {string} clientToken
diff --git a/ads/vendors/firstimpression.js b/ads/vendors/firstimpression.js
index d67b4f4d4023..50e72616e597 100644
--- a/ads/vendors/firstimpression.js
+++ b/ads/vendors/firstimpression.js
@@ -1,6 +1,7 @@
-import {parseQueryString} from '#core/types/string/url';
 import {validateData, writeScript} from '#3p/3p';
 
+import {parseQueryString} from '#core/types/string/url';
+
 /**
  * @param {!Window} global
  * @param {!Object} data
diff --git a/ads/vendors/geozo.js b/ads/vendors/geozo.js
new file mode 100644
index 000000000000..e2cd25538004
--- /dev/null
+++ b/ads/vendors/geozo.js
@@ -0,0 +1,22 @@
+import {loadScript, validateData} from '#3p/3p';
+
+/**
+ * @param {!Window} global
+ * @param {!Object} data
+ */
+export function geozo(global, data) {
+  validateData(data, ['src', 'gzBlock']);
+  const {src} = data;
+  createContainer(global, data);
+  loadScript(global, src);
+}
+
+/**
+ * @param {!Window} global
+ * @param {!Object} data
+ */
+function createContainer(global, data) {
+  const d = global.document.createElement('div');
+  d.setAttribute('data-gz-block', data['gzBlock']);
+  global.document.getElementById('c').appendChild(d);
+}
diff --git a/ads/vendors/geozo.md b/ads/vendors/geozo.md
new file mode 100644
index 000000000000..1f79a708ef8b
--- /dev/null
+++ b/ads/vendors/geozo.md
@@ -0,0 +1,22 @@
+# Geozo
+
+Provides support for [Geozo](https://geozo.com) widgets.
+
+### Required parameters
+
+-   `src`
+-   `data-gz-block`
+
+## Example
+
+```html
+<amp-ad
+  layout="responsive"
+  width="320"
+  height="461"
+  type="geozo"
+  data-gz-block="dfb39dd6-66e0-4799-97e3-b7f3b23f5d17"
+  src="https://grvclf.com/3yi7l1/921vlip0m03y/hq8786/uqv876pkypn.go"
+>
+</amp-ad>
+```
diff --git a/ads/vendors/gumgum.js b/ads/vendors/gumgum.js
index 6a9f8518ef35..1d1d18f79f53 100644
--- a/ads/vendors/gumgum.js
+++ b/ads/vendors/gumgum.js
@@ -1,4 +1,5 @@
 import {loadScript, validateData} from '#3p/3p';
+
 import {setStyles} from '#core/dom/style';
 
 /**
diff --git a/ads/vendors/idealmedia.js b/ads/vendors/idealmedia.js
index 84250f4f553f..f24d97fcde52 100644
--- a/ads/vendors/idealmedia.js
+++ b/ads/vendors/idealmedia.js
@@ -5,28 +5,11 @@ import {loadScript, validateData} from '#3p/3p';
  * @param {!Object} data
  */
 export function idealmedia(global, data) {
-  validateData(data, ['publisher', 'widget', 'container'], ['url', 'options']);
-
-  const scriptRoot = document.createElement('div');
-  scriptRoot.id = data.container;
-
-  document.body.appendChild(scriptRoot);
-
-  /**
-   * Returns path for provided js filename
-   * @param {string} publisher The first number.
-   * @return {string} Path to provided filename.
-   */
-  function getResourceFilePath(publisher) {
-    const publisherStr = publisher.replace(/[^A-z0-9]/g, '');
-    return `${publisherStr[0]}/${publisherStr[1]}`;
-  }
-
-  const url =
-    `https://jsc.idealmedia.io/${getResourceFilePath(data.publisher)}/` +
-    `${encodeURIComponent(data.publisher)}.` +
-    `${encodeURIComponent(data.widget)}.js?t=` +
-    Math.floor(Date.now() / 36e5);
+  validateData(
+    data,
+    [['publisher', 'website'], ['container', 'website'], 'widget'],
+    ['url', 'options']
+  );
 
   global.uniqId = (
     '00000' + Math.round(Math.random() * 100000).toString(16)
@@ -42,5 +25,40 @@ export function idealmedia(global, data) {
     });
   });
 
-  loadScript(global, data.url || url);
+  if (data.website) {
+    const widgetContainer = document.createElement('div');
+    widgetContainer.dataset.type = '_mgwidget';
+    widgetContainer.dataset.widgetId = data.widget;
+    document.body.appendChild(widgetContainer);
+
+    const url =
+      `https://jsc.idealmedia.io/site/` +
+      `${encodeURIComponent(data.website)}.js?t=` +
+      Math.floor(Date.now() / 36e5);
+
+    loadScript(global, data.url || url);
+  } else {
+    const scriptRoot = document.createElement('div');
+    scriptRoot.id = data.container;
+
+    document.body.appendChild(scriptRoot);
+
+    /**
+     * Returns path for provided js filename
+     * @param {string} publisher js filename
+     * @return {string} Path to provided filename.
+     */
+    function getResourceFilePath(publisher) {
+      const publisherStr = publisher.replace(/[^a-zA-Z0-9]/g, '');
+      return `${publisherStr[0]}/${publisherStr[1]}`;
+    }
+
+    const url =
+      `https://jsc.idealmedia.io/${getResourceFilePath(data.publisher)}/` +
+      `${encodeURIComponent(data.publisher)}.` +
+      `${encodeURIComponent(data.widget)}.js?t=` +
+      Math.floor(Date.now() / 36e5);
+
+    loadScript(global, data.url || url);
+  }
 }
diff --git a/ads/vendors/idealmedia.md b/ads/vendors/idealmedia.md
index ea1a4ec1c2ce..3bcdbccf5923 100644
--- a/ads/vendors/idealmedia.md
+++ b/ads/vendors/idealmedia.md
@@ -4,6 +4,19 @@
 
 ### Basic
 
+Latest version:
+```html
+<amp-embed
+  width="100"
+  height="283"
+  type="idealmedia"
+  data-website="98765"
+  data-widget="12345"
+>
+</amp-embed>
+```
+
+Legacy version:
 ```html
 <amp-embed
   width="100"
@@ -22,8 +35,13 @@ For details on the configuration semantics, please contact the ad network or ref
 
 ### Required parameters
 
--   `data-publisher`
+Latest version:
 -   `data-widget`
+-   `data-website`
+
+Legacy version:
+-   `data-widget`
+-   `data-publisher`
 -   `data-container`
 
 ### Optional parameters
diff --git a/ads/vendors/imonomy.js b/ads/vendors/imonomy.js
index 3d0568d32284..e736aef10e7c 100644
--- a/ads/vendors/imonomy.js
+++ b/ads/vendors/imonomy.js
@@ -1,6 +1,8 @@
+import {loadScript, writeScript} from '#3p/3p';
+
 import {doubleclick} from '#ads/google/doubleclick';
+
 import {hasOwn} from '#core/types/object';
-import {loadScript, writeScript} from '#3p/3p';
 
 const DEFAULT_TIMEOUT = 500; // ms
 const EVENT_SUCCESS = 0;
diff --git a/ads/vendors/incrementx.js b/ads/vendors/incrementx.js
new file mode 100644
index 000000000000..95f9f15eb705
--- /dev/null
+++ b/ads/vendors/incrementx.js
@@ -0,0 +1,11 @@
+import {validateData, writeScript} from '#3p/3p';
+
+/**
+ * @param {!Window} global
+ * @param {!Object} data
+ */
+export function incrementx(global, data) {
+  validateData(data, ['vzid']);
+  global.ixParam = data;
+  writeScript(global, 'https://cdn.incrementxserv.com/ixamp.js');
+}
diff --git a/ads/vendors/incrementx.md b/ads/vendors/incrementx.md
new file mode 100644
index 000000000000..0c555bdc49ff
--- /dev/null
+++ b/ads/vendors/incrementx.md
@@ -0,0 +1,20 @@
+# IncrementX
+
+## Example
+
+```html
+ <amp-ad
+  width="320" 
+  height="50" 
+  type="incrementx" 
+  data-vzid="PNXW125273VB49B96">
+  </amp-ad>
+```
+
+## Configuration
+
+For configuration details and to generate your tags, please contact https://www.incrementx.com/contact-us.
+
+Supported parameters:
+
+-   `data-vzid`
diff --git a/ads/vendors/inmobi.js b/ads/vendors/inmobi.js
index 16010a5f13d6..eeb536417ecf 100644
--- a/ads/vendors/inmobi.js
+++ b/ads/vendors/inmobi.js
@@ -1,6 +1,7 @@
-import {setStyle} from '#core/dom/style';
 import {validateData, writeScript} from '#3p/3p';
 
+import {setStyle} from '#core/dom/style';
+
 /**
  * @param {!Window} global
  * @param {!Object} data
diff --git a/ads/vendors/insurads.js b/ads/vendors/insurads.js
new file mode 100644
index 000000000000..708d9acc4944
--- /dev/null
+++ b/ads/vendors/insurads.js
@@ -0,0 +1,22 @@
+import {loadScript} from '#3p/3p';
+
+/**
+ * @param {!Window} global
+ */
+export function insurads(global) {
+  /**
+   * Create and modify a Date object to return the first day of the current week.
+   * @return {Date} The altered date.
+   */
+  function getCacheBuster() {
+    const t = new Date();
+    t.setDate(t.getDate() - t.getDay());
+    t.setHours(0, 0, 0, 0) / 1000;
+    return Number(t);
+  }
+
+  // For simplicity and flexibility, all validations are performed in the
+  // InsurAds's URL based on the data received
+  const url = 'https://cdn.insurads.com/amp-init.js?_=' + getCacheBuster();
+  loadScript(global, url);
+}
diff --git a/ads/vendors/insurads.md b/ads/vendors/insurads.md
new file mode 100644
index 000000000000..52acd978dc85
--- /dev/null
+++ b/ads/vendors/insurads.md
@@ -0,0 +1,61 @@
+# InsurAds
+
+## Example
+
+### Basic sample
+
+```html
+<amp-ad
+  width="300"
+  height="250"
+  type="insurads"
+  data-public-id="4WMPI6PV"
+  data-slot="/134642692/amp-samples"
+>
+</amp-ad>
+```
+
+### Sample with multisize
+
+```html
+<amp-ad
+  width="300"
+  height="250"
+  type="insurads"
+  data-public-id="4WMPI6PV"
+  data-slot="/134642692/amp-samples"
+  data-multi-size="320x50"
+>
+</amp-ad>
+```
+
+### Sample with targeting
+
+```html
+<amp-ad
+  width="320"
+  height="50"
+  type="insurads"
+  data-public-id="4WMPI6PV"
+  data-slot="/134642692/amp-samples"
+  json='{"targeting":{"target":["sample"],"pos":["amp"]}}'
+>
+</amp-ad>
+```
+
+## Configuration
+
+For details on the configuration semantics, please contact the ad network or refer to their documentation.
+
+## Supported parameters
+
+| Parameter name  | Description                         | Required |
+| --------------- | ----------------------------------- | -------- |
+| width           | Primary size width                  | Yes      |
+| height          | Primary size height                 | Yes      |
+| data-public-id  | Application public id               | Yes      |
+| data-slot       | Ad unit code                        | Yes      |
+| data-multi-size | Comma separated list of other sizes | No       |
+| json            | Custom targeting map                | No       |
+
+Note: if any of the required parameters is not present, the ad slot will not be filled.
diff --git a/ads/vendors/iprom.js b/ads/vendors/iprom.js
index ce274f9d0a6c..2feb542aa9cb 100644
--- a/ads/vendors/iprom.js
+++ b/ads/vendors/iprom.js
@@ -1,6 +1,7 @@
-import {parseJson} from '#core/types/object/json';
 import {validateData, writeScript} from '#3p/3p';
 
+import {parseJson} from '#core/types/object/json';
+
 /**
  * @param {!Window} global
  * @param {!Object} data
diff --git a/ads/vendors/ix.js b/ads/vendors/ix.js
index 272a3dd65560..e045e3ac6f4c 100644
--- a/ads/vendors/ix.js
+++ b/ads/vendors/ix.js
@@ -1,6 +1,8 @@
+import {loadScript, writeScript} from '#3p/3p';
+
 import {doubleclick} from '#ads/google/doubleclick';
+
 import {hasOwn} from '#core/types/object';
-import {loadScript, writeScript} from '#3p/3p';
 
 const DEFAULT_TIMEOUT = 500; // ms
 const EVENT_SUCCESS = 0;
diff --git a/ads/vendors/jioads.js b/ads/vendors/jioads.js
new file mode 100644
index 000000000000..2a2b11a80e11
--- /dev/null
+++ b/ads/vendors/jioads.js
@@ -0,0 +1,82 @@
+import {loadScript, validateData, writeScript} from '#3p/3p';
+
+import {setStyle} from '#core/dom/style';
+import {hasOwn} from '#core/types/object';
+
+/**
+ * @param {!Window} global
+ * @param {!Object} data
+ */
+export function jioads(global, data) {
+  global.context.container = `uid${Math.floor(Date.now())}`;
+  global.context.initialViewAbility = false;
+  validateData(
+    data,
+    ['adspot', 'pkgName'],
+    ['adMetaData', 'refreshRate', 'videoAd']
+  );
+  if (!data) {
+    global.context.noContentAvailable();
+    return;
+  }
+  writeScript(
+    global,
+    'https://mercury.akamaized.net/jioads/websdk/amp/jioAds.js?rnd=' +
+      Math.random()
+  );
+  loadScript(
+    global,
+    'https://mercury.akamaized.net/jioads/websdk/amp/ampwrapper.js?rnd=' +
+      Math.random(),
+    () => {
+      let refresh = '';
+      let adMetaData = '';
+      let video = '';
+      let videocontainer = '';
+      if (hasOwn(data, 'refreshRate')) {
+        refresh = ` data-refresh-rate="${data['refreshRate']}"`;
+      }
+      if (hasOwn(data, 'adMetaData')) {
+        adMetaData = ` data-adMetaData="${data['adMetaData']}"`;
+      }
+      if (hasOwn(data, 'videoAd') && data['videoAd'] == '1') {
+        video = `<div id="instreamContainer" style="width:100%;"></div>`;
+        videocontainer = ` data-container-id="instreamContainer"`;
+      }
+      let html = '';
+      const container = document.createElement('div');
+      container.classList.add('jads-flex-center', 'jads-f-align-center');
+      container.setAttribute('id', 'jads_amp_ad');
+      setStyle(
+        container,
+        'width',
+        `${global.context.initialIntersection.boundingClientRect.width}px`
+      );
+      setStyle(
+        container,
+        'height',
+        `${global.context.initialIntersection.boundingClientRect.height}px`
+      );
+      html = `${video} <ins id="${global.context.container}"
+       data-adspot-key="${data['adspot']}"
+       data-source="${data['pkgName']}"
+       ${refresh} ${adMetaData} ${videocontainer}></ins>`;
+      container./*OK*/ innerHTML = html;
+      global.document.getElementById('c').appendChild(container);
+    },
+    () => {
+      global.context.noContentAvailable();
+    }
+  );
+  // addon observation on entering/leaving the view when scroll vertically and horizontally
+  window.context.observeIntersection(function (newrequest) {
+    /** @type {!Array} */
+    (newrequest).forEach(function (data) {
+      if (data.intersectionRatio >= 0.5) {
+        global.context.initialViewAbility = true;
+      } else {
+        global.context.initialViewAbility = false;
+      }
+    });
+  });
+}
diff --git a/ads/vendors/jioads.md b/ads/vendors/jioads.md
new file mode 100644
index 000000000000..b814b9137cbb
--- /dev/null
+++ b/ads/vendors/jioads.md
@@ -0,0 +1,74 @@
+# JIOADS
+
+## Example of JIOADS AD's implementation
+
+```html
+ <h4>Native Banner (Fixed Size W320 x H50)</h4>
+  <amp-ad
+  width="320"
+  height="50"
+  layout="fixed"
+  type="jioads"
+  data-adspot="t85hrz97"
+  data-pkg-name="com.jio.web"
+  data-refresh-rate="40"
+  data-ad-meta-data={}
+  >
+  </amp-ad>
+  <br>
+  <h4>Native Billboard (Fixed Size W300 x H250)</h4>
+  <amp-ad
+  width="300"
+  height="250"
+  layout="fixed"
+  type="jioads"
+  data-adspot="dh0icl54"
+  data-pkg-name="com.jio.web"
+  data-refresh-rate="35"
+  >
+  <div placeholder>Loading....</div>
+  <div fallback>Something went wrong in ad load</div>
+  </amp-ad>
+  <h4>Dynamic Display Billboard (Responsive Size Min W320 x H 300)</h4>
+  <amp-ad
+  width="360"
+  height="300"
+  layout="responsive"
+  type="jioads"
+  data-adspot="960s2apj"
+  data-pkg-name="com.jio.web"
+  data-height-auto="true"
+  >
+  <div placeholder>Loading....</div>
+  <div fallback>Something went wrong in ad load</div>
+  </amp-ad>
+  <h4>Instream /  Video (Responsive Size Min W320 x H280)</h4>
+  <amp-ad
+  width="360"
+  height="360"
+  layout="fixed"
+  type="jioads"
+  data-adspot="3vu7gqas"
+  data-pkg-name="com.jio.web"
+  data-height-auto="true"
+  data-video-ad="1"
+  >
+  <div placeholder>Loading....</div>
+  <div fallback>Something went wrong in ad load</div>
+  </amp-ad>
+```
+
+## Configuration
+
+For details on the configuration semantics, please contact JioAds
+
+### Required parameters
+
+-   `data-adspot`: ADSPOT (publisher will get from jioads campaign dashboard)
+-   `data-pkg-name`: PACKAGE NAME (publisher will get from jioads campaign dashboard as unique for each ad)
+
+### Optional parameters
+
+-   `data-video-ad`: VIDEO AD boolean, only for instream ad (publisher will get from jioads campaign dashboard and decide taht want to publish video)
+-   `data-refersh-rate`: REFRESH RATE integer seconds, defaut refresh rate is 30 seconds, manually set should be greater than 30 (publisher can set refresh rate in seconds, so ad will be refreshed according to given seconds)
+-   `data-ad-meta-data`: AD META DATA json format (publisher can set json data like category etc, full example on campaign dashboard)
diff --git a/ads/vendors/jixie.js b/ads/vendors/jixie.js
index 12511aa5479d..7c6f30fd4bfe 100644
--- a/ads/vendors/jixie.js
+++ b/ads/vendors/jixie.js
@@ -6,5 +6,5 @@ import {loadScript} from '#3p/3p';
 export function jixie(global) {
   // For flexibility, all validations are performed in the
   // Jixie side based on the data on the page for the amp-ad
-  loadScript(global, 'https://scripts.jixie.io/jxamp.min.js');
+  loadScript(global, 'https://scripts.jixie.media/jxamp.min.js');
 }
diff --git a/ads/vendors/kiosked.js b/ads/vendors/kiosked.js
index 2f1d1b67eb43..c1e0070400a3 100644
--- a/ads/vendors/kiosked.js
+++ b/ads/vendors/kiosked.js
@@ -1,6 +1,7 @@
-import {hasOwn} from '#core/types/object';
 import {validateData, writeScript} from '#3p/3p';
 
+import {hasOwn} from '#core/types/object';
+
 /**
  * @param {!Window} global
  * @param {!Object} data
diff --git a/ads/vendors/kixer.js b/ads/vendors/kixer.js
index c131d0e722c4..c46046686d9e 100644
--- a/ads/vendors/kixer.js
+++ b/ads/vendors/kixer.js
@@ -1,4 +1,5 @@
 import {loadScript, validateData} from '#3p/3p';
+
 import {parseUrlDeprecated} from '../../src/url';
 
 /* global
diff --git a/ads/vendors/lentainform.js b/ads/vendors/lentainform.js
deleted file mode 100644
index 1953bd49b7a3..000000000000
--- a/ads/vendors/lentainform.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import {loadScript, validateData} from '#3p/3p';
-
-/**
- * @param {!Window} global
- * @param {!Object} data
- */
-export function lentainform(global, data) {
-  validateData(data, ['publisher', 'widget', 'container'], ['url', 'options']);
-
-  const scriptRoot = document.createElement('div');
-  scriptRoot.id = data.container;
-
-  document.body.appendChild(scriptRoot);
-
-  const publisherStr = data.publisher.replace(/[^A-z0-9]/g, '');
-
-  const url =
-    `https://jsc.lentainform.com/${encodeURIComponent(publisherStr[0])}/` +
-    `${encodeURIComponent(publisherStr[1])}/` +
-    `${encodeURIComponent(data.publisher)}.` +
-    `${encodeURIComponent(data.widget)}.js?t=` +
-    Math.floor(Date.now() / 36e5);
-
-  global.uniqId = (
-    '00000' + Math.round(Math.random() * 100000).toString(16)
-  ).slice(-5);
-  window['ampOptions' + data.widget + '_' + global.uniqId] = data.options;
-
-  global.context.observeIntersection(function (changes) {
-    /** @type {!Array} */ (changes).forEach(function (c) {
-      window['intersectionRect' + data.widget + '_' + global.uniqId] =
-        c.intersectionRect;
-      window['boundingClientRect' + data.widget + '_' + global.uniqId] =
-        c.boundingClientRect;
-    });
-  });
-
-  loadScript(global, data.url || url);
-}
diff --git a/ads/vendors/lentainform.md b/ads/vendors/lentainform.md
deleted file mode 100644
index ef5acac84e51..000000000000
--- a/ads/vendors/lentainform.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# Lentainform
-
-## Example
-
-### Basic
-
-```html
-<amp-embed
-  width="100"
-  height="283"
-  type="lentainform"
-  data-publisher="amp-demo"
-  data-widget="12345"
-  data-container="demo-container"
->
-</amp-embed>
-```
-
-## Configuration
-
-For details on the configuration semantics, please contact the ad network or refer to their documentation.
-
-### Required parameters
-
--   `data-publisher`
--   `data-widget`
--   `data-container`
-
-### Optional parameters
-
--   `data-url`
--   `data-options`
diff --git a/ads/vendors/medianet.js b/ads/vendors/medianet.js
index 0a6ef53c8f0f..4be2102f4b9a 100644
--- a/ads/vendors/medianet.js
+++ b/ads/vendors/medianet.js
@@ -1,7 +1,9 @@
 import {computeInMasterFrame, validateData, writeScript} from '#3p/3p';
-import {getSourceUrl, parseUrlDeprecated} from '../../src/url';
+
 import {hasOwn} from '#core/types/object';
 
+import {getSourceUrl, parseUrlDeprecated} from '../../src/url';
+
 const mandatoryParams = ['tagtype', 'cid'],
   optionalParams = [
     'timeout',
diff --git a/ads/vendors/medyanet.js b/ads/vendors/medyanet.js
index 53b1b7bcb2f3..7c25f6072719 100644
--- a/ads/vendors/medyanet.js
+++ b/ads/vendors/medyanet.js
@@ -1,6 +1,7 @@
-import {setStyles} from '#core/dom/style';
 import {validateData} from '#3p/3p';
 
+import {setStyles} from '#core/dom/style';
+
 /**
  * @param {!Window} global
  * @param {!Object} data
diff --git a/ads/vendors/mgid.js b/ads/vendors/mgid.js
index 84317509af99..f0f4b643869b 100644
--- a/ads/vendors/mgid.js
+++ b/ads/vendors/mgid.js
@@ -5,28 +5,11 @@ import {loadScript, validateData} from '#3p/3p';
  * @param {!Object} data
  */
 export function mgid(global, data) {
-  validateData(data, ['publisher', 'widget', 'container'], ['url', 'options']);
-
-  const scriptRoot = document.createElement('div');
-  scriptRoot.id = data.container;
-
-  document.body.appendChild(scriptRoot);
-
-  /**
-   * Returns path for provided js filename
-   * @param {string} publisher js filename
-   * @return {string} Path to provided filename.
-   */
-  function getResourceFilePath(publisher) {
-    const publisherStr = publisher.replace(/[^A-z0-9]/g, '');
-    return `${publisherStr[0]}/${publisherStr[1]}`;
-  }
-
-  const url =
-    `https://jsc.mgid.com/${getResourceFilePath(data.publisher)}/` +
-    `${encodeURIComponent(data.publisher)}.` +
-    `${encodeURIComponent(data.widget)}.js?t=` +
-    Math.floor(Date.now() / 36e5);
+  validateData(
+    data,
+    [['publisher', 'website'], ['container', 'website'], 'widget'],
+    ['url', 'options']
+  );
 
   global.uniqId = (
     '00000' + Math.round(Math.random() * 100000).toString(16)
@@ -42,5 +25,40 @@ export function mgid(global, data) {
     });
   });
 
-  loadScript(global, data.url || url);
+  if (data.website) {
+    const widgetContainer = document.createElement('div');
+    widgetContainer.dataset.type = '_mgwidget';
+    widgetContainer.dataset.widgetId = data.widget;
+    document.body.appendChild(widgetContainer);
+
+    const url =
+      `https://jsc.mgid.com/site/` +
+      `${encodeURIComponent(data.website)}.js?t=` +
+      Math.floor(Date.now() / 36e5);
+
+    loadScript(global, data.url || url);
+  } else {
+    const scriptRoot = document.createElement('div');
+    scriptRoot.id = data.container;
+
+    document.body.appendChild(scriptRoot);
+
+    /**
+     * Returns path for provided js filename
+     * @param {string} publisher js filename
+     * @return {string} Path to provided filename.
+     */
+    function getResourceFilePath(publisher) {
+      const publisherStr = publisher.replace(/[^a-zA-Z0-9]/g, '');
+      return `${publisherStr[0]}/${publisherStr[1]}`;
+    }
+
+    const url =
+      `https://jsc.mgid.com/${getResourceFilePath(data.publisher)}/` +
+      `${encodeURIComponent(data.publisher)}.` +
+      `${encodeURIComponent(data.widget)}.js?t=` +
+      Math.floor(Date.now() / 36e5);
+
+    loadScript(global, data.url || url);
+  }
 }
diff --git a/ads/vendors/mgid.md b/ads/vendors/mgid.md
index 67f9824787c6..83f967eaa7bd 100644
--- a/ads/vendors/mgid.md
+++ b/ads/vendors/mgid.md
@@ -4,6 +4,19 @@
 
 ### Basic
 
+Latest version:
+```html
+<amp-embed
+  width="100"
+  height="283"
+  type="mgid"
+  data-website="98765"
+  data-widget="12345"
+>
+</amp-embed>
+```
+
+Legacy version:
 ```html
 <amp-embed
   width="100"
@@ -22,8 +35,13 @@ For details on the configuration semantics, please contact the ad network or ref
 
 ### Required parameters
 
--   `data-publisher`
+Latest version:
 -   `data-widget`
+-   `data-website`
+
+Legacy version:
+-   `data-widget`
+-   `data-publisher`
 -   `data-container`
 
 ### Optional parameters
diff --git a/ads/vendors/momagic.js b/ads/vendors/momagic.js
new file mode 100644
index 000000000000..7f9d3120656a
--- /dev/null
+++ b/ads/vendors/momagic.js
@@ -0,0 +1,62 @@
+import {validateData} from '#3p/3p';
+
+/**
+ * @param {!Window} global
+ * @param {!Object} data
+ */
+export function momagic(global, data) {
+  validateData(data, ['publisher', 'container'], ['format', 'url', 'extras']);
+
+  const scriptRoot = document.createElement('div');
+  scriptRoot.id = data.container;
+
+  document.body.appendChild(scriptRoot);
+
+  let url = '';
+
+  if (data.format) {
+    url =
+      `https://amp.truereach.co.in/publisher/${encodeURIComponent(data.publisher)}/${encodeURIComponent(data.format)}/` +
+      `truereachAdRender.js?t=` +
+      Math.floor(Date.now() / 36e5);
+  } else {
+    url =
+      `https://amp.truereach.co.in/publisher/${encodeURIComponent(data.publisher)}/` +
+      `truereachAdRender.js?t=` +
+      Math.floor(Date.now() / 36e5);
+  }
+
+  // Path to Script
+  const pathtoscript = data.url ? data.url : url;
+  loadScriptNew(pathtoscript, function () {
+    global.momagicAmpInit(data);
+  });
+}
+
+/**
+ * Load the script asynchronously
+ * @param {string} url
+ * @param {!Function} callback
+ */
+function loadScriptNew(url, callback) {
+  const script = document.createElement('script');
+  script.type = 'text/javascript';
+  if (script.readyState) {
+    // only required for IE <9
+    script.onreadystatechange = function () {
+      if (script.readyState === 'loaded' || script.readyState === 'complete') {
+        script.onreadystatechange = null;
+        callback();
+      }
+    };
+  } else {
+    //Others
+    script.onload = function () {
+      callback();
+    };
+  }
+  script.id = 'interactive_js_ampcode';
+  script.defer = true;
+  script.src = url;
+  document.getElementsByTagName('head')[0].appendChild(script);
+}
diff --git a/ads/vendors/momagic.md b/ads/vendors/momagic.md
new file mode 100644
index 000000000000..80c036f2c663
--- /dev/null
+++ b/ads/vendors/momagic.md
@@ -0,0 +1,31 @@
+# Momagic
+
+## Example
+
+### Basic
+
+```html
+<amp-ad
+  width="300"
+  height="600"
+  type="momagic"
+  data-container="slotId" 
+  data-publisher="publisherId"
+  >
+</amp-ad>
+```
+
+## Configuration
+
+For details on the configuration semantics, please contact the ad network or refer to their documentation.
+
+### Required parameters
+
+-   `data-publisher` 
+-   `data-container`
+
+
+### Optional parameters
+-   `data-format`
+-   `data-url`
+-   `data-extras`
\ No newline at end of file
diff --git a/ads/vendors/mytarget.js b/ads/vendors/mytarget.js
index e159e28621e2..ceaaa32827ad 100644
--- a/ads/vendors/mytarget.js
+++ b/ads/vendors/mytarget.js
@@ -1,4 +1,5 @@
 import {loadScript, validateData} from '#3p/3p';
+
 import {setStyles} from '#core/dom/style';
 
 /**
diff --git a/ads/vendors/myua.js b/ads/vendors/myua.js
index 3f41faac6dbe..9684010eee6b 100644
--- a/ads/vendors/myua.js
+++ b/ads/vendors/myua.js
@@ -5,15 +5,15 @@ import {validateData} from '#3p/3p';
  * @param {!Object} data
  */
 export function myua(global, data) {
-  validateData(data, ['sid', 'iid'], ['demo', 'options']);
+  validateData(data, ['sid', 'iid'], ['env', 'options']);
 
   const informerTag = global.document.createElement('div');
   informerTag.setAttribute('data-top-iid', data.iid);
   global.document.body.appendChild(informerTag);
 
-  const demoSuffix = data.demo ? 'dev.' : '';
+  const env = data.env ? `${data.env}.` : '';
   const scriptTag = global.document.createElement('script');
-  scriptTag.src = `https://amp.top-js-metrics.top.${demoSuffix}my.ua/script.js`;
+  scriptTag.src = `https://amp.top-js-metrics.top.${env}my.ua/script.js`;
   scriptTag.setAttribute('async', 'true');
   scriptTag.setAttribute('data-top-sid', data.sid);
 
diff --git a/ads/vendors/myua.md b/ads/vendors/myua.md
index 72eab091b360..426e87eb69e7 100644
--- a/ads/vendors/myua.md
+++ b/ads/vendors/myua.md
@@ -26,5 +26,5 @@ For details on the configuration semantics, please contact the ad network or ref
 
 ### Optional parameters
 
--   `data-demo`
+-   `data-env`
 -   `data-options`
diff --git a/ads/vendors/nativery.js b/ads/vendors/nativery.js
index 8fd27d3a90d1..d06116ba47a0 100644
--- a/ads/vendors/nativery.js
+++ b/ads/vendors/nativery.js
@@ -1,6 +1,7 @@
-import {toArray} from '#core/types/array';
 import {validateData, writeScript} from '#3p/3p';
 
+import {toArray} from '#core/types/array';
+
 /**
  * @param {!Window} global
  * @param {!Object} data
diff --git a/ads/vendors/nativo.js b/ads/vendors/nativo.js
index d8b2d9fa3fe3..d054fd321edc 100644
--- a/ads/vendors/nativo.js
+++ b/ads/vendors/nativo.js
@@ -82,10 +82,13 @@ export function nativo(global, data) {
      */
     function loadAdWhenTimedout() {
       const g = global;
-      setTimeout(function () {
-        g.PostRelease.Start();
-        delayedAdLoad = true;
-      }, parseInt(data.delayByTime, 10));
+      setTimeout(
+        function () {
+          g.PostRelease.Start();
+          delayedAdLoad = true;
+        },
+        parseInt(data.delayByTime, 10)
+      );
     }
     /**
      * @param {*} positions
diff --git a/ads/vendors/navegg.js b/ads/vendors/navegg.js
index b9ed93c79283..cdcf54d82cdb 100644
--- a/ads/vendors/navegg.js
+++ b/ads/vendors/navegg.js
@@ -1,12 +1,17 @@
-import {doubleclick} from '#ads/google/doubleclick';
 import {loadScript, validateData} from '#3p/3p';
 
+import {doubleclick} from '#ads/google/doubleclick';
+
 /**
  * @param {!Window} global
  * @param {!Object} data
  */
 export function navegg(global, data) {
-  validateData(data, ['acc']);
+  const requiredParams = ['acc', 'wst', 'wct', 'wla'];
+  const optionalParams = [];
+
+  validateData(data, requiredParams, optionalParams);
+
   const {acc} = data;
   let seg,
     nvg = function () {};
@@ -16,6 +21,9 @@ export function navegg(global, data) {
   loadScript(global, 'https://tag.navdmp.com/amp.1.0.0.min.js', () => {
     nvg = global[`nvg${acc}`] = new global['AMPNavegg']({
       acc,
+      wst: data.wst ? '1' : '0',
+      wct: data.wct ? '1' : '0',
+      wla: data.wla ? '1' : '0',
     });
     nvg.getProfile((nvgTargeting) => {
       for (seg in nvgTargeting) {
diff --git a/ads/vendors/navegg.md b/ads/vendors/navegg.md
index ab60804481de..574764a7973f 100644
--- a/ads/vendors/navegg.md
+++ b/ads/vendors/navegg.md
@@ -18,4 +18,4 @@ To get Navegg integration working you only need to specify the `rtc-config` para
 
 The Navegg adapter only supports DoubleClick for now. For the most up-to-date list of DoubleClick supported parameters and usage, refer to the [DoubleClick reference guide](https://github.com/ampproject/amphtml/blob/main/ads/google/doubleclick.md).
 
-For any help, please contact [Navegg](https://www.navegg.com/en/institutional/#contact).
+For any help, please contact [Navegg](https://www.navegg.com/en/about-us/contacts).
diff --git a/ads/vendors/netletix.js b/ads/vendors/netletix.js
index befd8bcfde8f..0ea6205c6a65 100644
--- a/ads/vendors/netletix.js
+++ b/ads/vendors/netletix.js
@@ -1,8 +1,9 @@
-import {addParamsToUrl, assertHttpsUrl} from '../../src/url';
-import {dev} from '#utils/log';
-import {dict} from '#core/types/object';
 import {loadScript, validateData, writeScript} from '#3p/3p';
 
+import {dev} from '#utils/log';
+
+import {addParamsToUrl, assertHttpsUrl} from '../../src/url';
+
 const NX_URL_HOST = 'https://call.adadapter.netzathleten-media.de';
 const NX_URL_PATHPREFIX = '/pb/';
 const NX_URL_FULL = NX_URL_HOST + NX_URL_PATHPREFIX;
@@ -36,14 +37,14 @@ export function netletix(global, data) {
   const url = assertHttpsUrl(
     addParamsToUrl(
       NX_URL_FULL + encodeURIComponent(data.nxkey || DEFAULT_NX_KEY),
-      dict({
+      {
         'unit': data.nxunit || DEFAULT_NX_UNIT,
         'width': data.nxwidth || DEFAULT_NX_WIDTH,
         'height': data.nxheight || DEFAULT_NX_HEIGHT,
         'v': data.nxv || DEFAULT_NX_V,
         'site': data.nxsite || DEFAULT_NX_SITE,
         'ord': Math.round(Math.random() * 100000000),
-      })
+      }
     ),
     data.ampSlotIndex
   );
diff --git a/ads/vendors/openx.js b/ads/vendors/openx.js
index a68661e92db6..d75b019debcf 100644
--- a/ads/vendors/openx.js
+++ b/ads/vendors/openx.js
@@ -1,6 +1,7 @@
-import {doubleclick} from '#ads/google/doubleclick';
 import {loadScript, validateData, writeScript} from '#3p/3p';
 
+import {doubleclick} from '#ads/google/doubleclick';
+
 const {hasOwnProperty} = Object.prototype;
 
 /**
diff --git a/ads/vendors/piberica.js b/ads/vendors/piberica.js
new file mode 100644
index 000000000000..9ee70f5b09fc
--- /dev/null
+++ b/ads/vendors/piberica.js
@@ -0,0 +1,25 @@
+import {loadScript, validateData} from '#3p/3p';
+
+/**
+ * @param {!Window} global
+ * @param {!Object} data
+ */
+export function piberica(global, data) {
+  /*eslint "local/camelcase": 0*/
+  global._piberica_amp = {
+    allowed_data: ['publisher', 'slot'],
+    mandatory_data: ['publisher', 'slot'],
+    data,
+  };
+
+  validateData(
+    data,
+    global._piberica_amp.mandatory_data,
+    global._piberica_amp.allowed_data
+  );
+
+  loadScript(
+    global,
+    `https://trafico.prensaiberica.es/adm/min/intext/${data.publisher}/${data.slot}.js`
+  );
+}
diff --git a/ads/vendors/piberica.md b/ads/vendors/piberica.md
new file mode 100644
index 000000000000..a2059549e176
--- /dev/null
+++ b/ads/vendors/piberica.md
@@ -0,0 +1,24 @@
+# PIberica
+
+## Example
+
+```html
+<amp-ad
+  width="300"
+  height="1"
+  type="piberica"
+  layout="responsive"
+  data-publisher="test"
+  data-slot="1"
+  data-block-on-consent="_till_responded"
+></amp-ad>
+```
+
+## Configuration
+
+For further information, please contact [PIberica](https://www.prensaiberica360.es).
+
+### Required parameters
+
+-   `data-publisher`: Publisher Integration ID provided by PIberica
+-   `data-slot`: Slot Integration ID provided by PIberica
diff --git a/ads/vendors/pixad.js b/ads/vendors/pixad.js
new file mode 100644
index 000000000000..ceb8d87a3c1c
--- /dev/null
+++ b/ads/vendors/pixad.js
@@ -0,0 +1,37 @@
+import {validateData, writeScript} from '#3p/3p';
+
+/**
+ * @param {!Window} global
+ * @param {!Object} data
+ */
+export function pixad(global, data) {
+  validateData(data, ['adNetwork', 'adPublisher', 'adTypeId']);
+  global._pixad = global._pixad || {
+    publisher: data['adNetwork'],
+    adNetwork: data['adPublisher'],
+    adTypeId: data['adTypeId'],
+    host: `static.cdn.pixad.com.tr`,
+    prefix: `px`,
+  };
+
+  if (global._pixad.publisher.indexOf('adm-pub') != -1) {
+    global._pixad.host = `static.cdn.admatic.com.tr`;
+    global._pixad.prefix = `adm`;
+  }
+
+  const ins = global.document.createElement('ins');
+  ins.setAttribute('data-publisher', global._pixad.publisher);
+  if (global._pixad.adTypeId == 'standard') {
+    ins.setAttribute('data-ad-size', `[[${data.width},${data.height}]]`);
+  }
+  ins.setAttribute('data-ad-network', global._pixad.adNetwork);
+  ins.setAttribute('data-ad-type-id', global._pixad.adTypeId);
+  ins.setAttribute('class', `${global._pixad.prefix}-ads-area`);
+  global.document.getElementById('c').appendChild(ins);
+  ins.parentNode.addEventListener(
+    'eventAdbladeRenderStart',
+    global.context.renderStart()
+  );
+
+  writeScript(global, `https://${global._pixad.host}/showad/showad.min.js`);
+}
diff --git a/ads/vendors/pixad.md b/ads/vendors/pixad.md
new file mode 100644
index 000000000000..6452c2ca07ca
--- /dev/null
+++ b/ads/vendors/pixad.md
@@ -0,0 +1,51 @@
+# Pixad
+
+## Example of Pixad's model implementation
+
+### Basic
+
+```html
+  <amp-ad
+    type="pixad"
+    width="300"
+    height="250"
+    data-ad-type-id="standard"
+    data-ad-network="px-pub-6514176248"
+    data-ad-publisher="654b7d501cd4137ca98e020d">
+  </amp-ad>
+```
+
+### Sticky Ad
+
+```html
+<amp-sticky-ad layout="nodisplay">
+  <amp-ad
+    type="pixad"
+    width="320"
+    height="100"
+    data-ad-type-id="778130932"
+    data-ad-network="px-pub-6514176248"
+    data-ad-publisher="654b7d501cd4137ca98e020d">
+  </amp-ad>
+</amp-sticky-ad>
+```
+
+Note that `<amp-sticky-ad />` component requires the following script to be included in the page:
+
+```html
+<script
+    async
+    custom-element="amp-sticky-ad"
+    src="https://cdn.ampproject.org/v0/amp-sticky-ad-1.0.js"
+></script>
+```
+
+## Configuration
+
+For details on the configuration semantics, see [Pixad documentation](https://developer.pixad.com.tr/).
+
+### Required parameters
+
+-   `data-ad-network`: Network ID
+-   `data-ad-publisher`: Publisher ID
+-   `data-ad-type-id`: Model ID
diff --git a/ads/vendors/promoteiq.js b/ads/vendors/promoteiq.js
index 943d67f27ab1..8f72d458e1ea 100644
--- a/ads/vendors/promoteiq.js
+++ b/ads/vendors/promoteiq.js
@@ -1,5 +1,7 @@
 import {loadScript, validateData} from '#3p/3p';
+
 import {parseJson} from '#core/types/object/json';
+
 import {user} from '#utils/log';
 
 const TAG = 'PROMOTEIQ';
diff --git a/ads/vendors/pubfuture.js b/ads/vendors/pubfuture.js
new file mode 100644
index 000000000000..561797076b46
--- /dev/null
+++ b/ads/vendors/pubfuture.js
@@ -0,0 +1,15 @@
+import {validateData, writeScript} from '#3p/3p';
+
+const requiredParams = ['id'];
+
+/**
+ * @param {!Window} global
+ * @param {!Object} data
+ */
+export function pubfuture(global, data) {
+  validateData(data, requiredParams);
+  writeScript(global, 'https://cdn.pubfuture-ad.com/amp/js/pt.js');
+  global.document.write(
+    '<script>pubfuturetag.display("' + data.id + '")</script>'
+  );
+}
diff --git a/ads/vendors/pubfuture.md b/ads/vendors/pubfuture.md
new file mode 100644
index 000000000000..d6b409c08ad6
--- /dev/null
+++ b/ads/vendors/pubfuture.md
@@ -0,0 +1,22 @@
+# Pubfuture
+
+## Examples
+
+```html
+<amp-ad
+  width="300"
+  height="250"
+  type="pubfuture"
+  data-id="PLACE_HOLDER">
+  </amp-ad>
+```
+
+## Configuration
+
+**Required:**
+
+`width` + `height` - Required for all `<amp-ad>` units. Specifies the ad size.
+
+`type` - Always set to "pubfuture".
+
+`data-id`: Tag Id.
diff --git a/ads/vendors/pubmine.js b/ads/vendors/pubmine.js
index 13d2f34c4d73..436aa2482191 100644
--- a/ads/vendors/pubmine.js
+++ b/ads/vendors/pubmine.js
@@ -1,6 +1,7 @@
-import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';
 import {loadScript, validateData} from '#3p/3p';
 
+import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';
+
 const pubmineOptional = [
     'section',
     'pt',
diff --git a/ads/vendors/pubscale.js b/ads/vendors/pubscale.js
new file mode 100644
index 000000000000..3f2c199620cf
--- /dev/null
+++ b/ads/vendors/pubscale.js
@@ -0,0 +1,21 @@
+import {loadScript, validateData, writeScript} from '#3p/3p';
+
+/**
+ * @param {!Window} global
+ * @param {!Object} data
+ */
+export function pubscale(global, data) {
+  // TODO: check mandatory fields
+  validateData(
+    data,
+    ['pid'],
+    ['format', 'appid', 'size', 'params', 'load-strategy', 'version']
+  );
+  global.pubscale = data;
+  const VERSION = data['version'] || 'v1';
+
+  const URL = `https://static.pubscale.com/lib/amp/${VERSION}/index.js`;
+  const load = data['load-strategy'] !== 'sync' ? writeScript : loadScript;
+
+  load(global, URL);
+}
diff --git a/ads/vendors/pubscale.md b/ads/vendors/pubscale.md
new file mode 100644
index 000000000000..fa0522600584
--- /dev/null
+++ b/ads/vendors/pubscale.md
@@ -0,0 +1,32 @@
+![pubscale logo](https://static.pubscale.com/assets/logo/pubscale-w-bg.svg)
+
+[PubScale](https://pubscale.com) is an all-in-one platform enabling fast monetization and user acquisition for apps, websites, and games while retaining positive user experiences. With PubScale, you can uplift revenue and analyze business growth all in a single place.
+
+## Example
+
+```html
+<amp-ad
+  layout="responsive"
+  width="300"
+  height="250"
+  type="pubscale"
+  data-pid="/22387492205/Banner_Test_300x250"
+  data-format="banner"
+  data-size="[[300,250]]"
+  data-strategy="async"
+  >
+</amp-ad>
+```
+
+### Required parameters
+
+-   `data-pid`
+
+### Optional parameters
+
+-   `data-format`
+-   `data-appid`
+-   `data-size`
+-   `data-params`
+-   `data-load-strategy`
+-   `data-version`
diff --git a/ads/vendors/pulsepoint.js b/ads/vendors/pulsepoint.js
index 70fec83e513c..4227caeb0a15 100644
--- a/ads/vendors/pulsepoint.js
+++ b/ads/vendors/pulsepoint.js
@@ -1,6 +1,7 @@
-import {doubleclick} from '#ads/google/doubleclick';
 import {loadScript, validateData, writeScript} from '#3p/3p';
 
+import {doubleclick} from '#ads/google/doubleclick';
+
 /**
  * @param {!Window} global
  * @param {!Object} data
diff --git a/ads/vendors/r9x.js b/ads/vendors/r9x.js
new file mode 100644
index 000000000000..b34b374e2af9
--- /dev/null
+++ b/ads/vendors/r9x.js
@@ -0,0 +1,35 @@
+import {loadScript, validateData} from '#3p/3p';
+
+/**
+ * @param {!Window} global
+ * @param {!Object} data
+ */
+export function r9x(global, data) {
+  validateData(
+    data,
+    ['siteid', 'slotpath', 'width', 'height'],
+    ['totalampslots', 'jsontargeting', 'extras']
+  );
+  loadScript(
+    global,
+    'https://securepubads.g.doubleclick.net/tag/js/gpt.js',
+    () => {
+      loadScript(
+        global,
+        'https://rtbcdn.r9x.media/prod-global-' + data.siteid + '.js',
+        () => {
+          window.r9x.initAmp(
+            global,
+            data.width,
+            data.height,
+            data.siteid,
+            data.slotpath,
+            data.totalampslots,
+            data.jsontargeting,
+            data.extras
+          );
+        }
+      );
+    }
+  );
+}
diff --git a/ads/vendors/r9x.md b/ads/vendors/r9x.md
new file mode 100644
index 000000000000..8a6c875b08df
--- /dev/null
+++ b/ads/vendors/r9x.md
@@ -0,0 +1,18 @@
+# r9x
+
+## Example
+
+```html
+<amp-ad width="300" height="250"
+    type="r9x"
+    data-siteid="40827"
+    data-slotpath="/103512698/AMP_COMPONENT_TEST_1"
+    data-totalAmpSlots="1">
+</amp-ad>
+```
+
+## Configuration
+
+-   `data-slot`: The GAM ad unit path corresponding to the ad position
+-   `siteid`: r9x Site ID
+-   `totalAmpSlots`: Total r9x amp-ad slots on the page
diff --git a/ads/vendors/rakutenunifiedads.js b/ads/vendors/rakutenunifiedads.js
index 9f3543973a62..0f1cd90216bb 100644
--- a/ads/vendors/rakutenunifiedads.js
+++ b/ads/vendors/rakutenunifiedads.js
@@ -1,6 +1,7 @@
-import {hasOwn} from '#core/types/object';
 import {validateData, writeScript} from '#3p/3p';
 
+import {hasOwn} from '#core/types/object';
+
 /**
  * @param {!Window} global
  * @param {!Object} data
diff --git a/ads/vendors/rcmwidget.js b/ads/vendors/rcmwidget.js
index dfefcea6aaaf..bf307d77ac43 100644
--- a/ads/vendors/rcmwidget.js
+++ b/ads/vendors/rcmwidget.js
@@ -1,7 +1,5 @@
 import {loadScript, validateData} from '#3p/3p';
 
-const WIDGET_DEFAULT_NODE_ID = 'rcm-widget';
-
 /**
  * @param {!Window} global
  * @param {!Object} data
@@ -9,25 +7,18 @@ const WIDGET_DEFAULT_NODE_ID = 'rcm-widget';
 export function rcmwidget(global, data) {
   validateData(
     data,
-    ['rcmId', 'nodeId', 'blockId', 'templateName', 'projectId'],
-    ['contextItemId']
+    ['rcmId', 'blockId', 'templateName', 'projectId'],
+    [
+      'contextItemId',
+      'customStyles',
+      'itemExcludedIds',
+      'itemExcludedUrls',
+      'params',
+    ]
   );
 
   global.rcmWidgetInit = data;
 
-  createContainer(global, data.nodeId);
-
   // load the rcmwidget initializer asynchronously
   loadScript(global, 'https://rcmjs.rambler.ru/static/rcmw/rcmw-amp.js');
 }
-
-/**
- * @param {!Window} global
- * @param {string} nodeId
- */
-function createContainer(global, nodeId = WIDGET_DEFAULT_NODE_ID) {
-  const container = global.document.createElement('div');
-  container.id = nodeId;
-
-  global.document.getElementById('c').appendChild(container);
-}
diff --git a/ads/vendors/rcmwidget.md b/ads/vendors/rcmwidget.md
index 1801c53a5c8e..0ddf7823ff57 100644
--- a/ads/vendors/rcmwidget.md
+++ b/ads/vendors/rcmwidget.md
@@ -3,13 +3,33 @@
 ## Example
 
 ```html
-<amp-embed width="auto" height="300" type="rcmwidget"></amp-embed>
+<amp-embed
+    width="auto"
+    height="380"
+    type="rcmwidget"
+    data-rcm-id="rcmId"
+    data-block-id="blockId"
+    data-template-name="templateName"
+    data-project-id="projectId"
+>
+</amp-embed>
 ```
 
+## Configuration
+
+For details on the configuration semantics, please contact the ad network or refer to their documentation.
+
 ### Required parameters
 
 -   `data-rcm-id`
--   `data-node-id`
 -   `data-block-id`
 -   `data-template-name`
 -   `data-project-id`
+
+### Optional parameters
+
+-   `data-context-item-id`
+-   `data-custom-styles`
+-   `data-item-excluded-ids`
+-   `data-item-excluded-urls`
+-   `data-params`
diff --git a/ads/vendors/relap.js b/ads/vendors/relap.js
index 575b8379d57e..a74c856592a8 100644
--- a/ads/vendors/relap.js
+++ b/ads/vendors/relap.js
@@ -1,5 +1,7 @@
 import {loadScript, validateData} from '#3p/3p';
 
+import {setStyle} from '#core/dom/style';
+
 /**
  * @param {!Window} global
  * @param {!Object} data
@@ -10,13 +12,6 @@ export function relap(global, data) {
   const urlParam = data['url'] || window.context.canonicalUrl;
 
   if (data['version'] === 'v7') {
-    window.onRelapAPIReady = function (relapAPI) {
-      relapAPI['init']({
-        token: data['token'],
-        url: urlParam,
-      });
-    };
-
     window.onRelapAPIInit = function (relapAPI) {
       relapAPI['addWidget']({
         cfgId: data['anchorid'],
@@ -27,13 +22,21 @@ export function relap(global, data) {
             window.context.renderStart();
           },
           onNoContent: function () {
+            relapAPI['destroy']();
             window.context.noContentAvailable();
           },
         },
       });
     };
 
-    loadScript(global, 'https://relap.io/v7/relap.js');
+    const iframeEl = document.createElement('iframe');
+    setStyle(iframeEl, 'position', 'absolute');
+    setStyle(iframeEl, 'visibility', 'hidden');
+    setStyle(iframeEl, 'left', '-9999px');
+    setStyle(iframeEl, 'top', '-9999px');
+    iframeEl.className = 'relap-runtime-iframe';
+    iframeEl.srcdoc = `<script src="https://relap.io/v7/relap.js" data-relap-token="${data['token']}" data-relap-url="${urlParam}"></script>`;
+    global.document.body.appendChild(iframeEl);
   } else {
     window.relapV6WidgetReady = function () {
       window.context.renderStart();
diff --git a/ads/vendors/relap.md b/ads/vendors/relap.md
index d7cf5bb74a5d..1ece5d4a4df2 100644
--- a/ads/vendors/relap.md
+++ b/ads/vendors/relap.md
@@ -5,12 +5,13 @@
 ```html
 <amp-ad
   width="auto"
-  height="750"
+  height="790"
   type="relap"
   layout="fixed-height"
   data-token="D3UMgQWBqleq1tPW"
-  data-url="http://bigpicture.ru"
-  data-anchorid="i0xMMY1MoliiZWVl"
+  data-url="https://relap.mail.ru/"
+  data-anchorid="-FVV_OEgYpljt7e3"
+  data-version="v7"
 >
 </amp-ad>
 ```
diff --git a/ads/vendors/revcontent.js b/ads/vendors/revcontent.js
index 68981da1610b..a5e3989be1c8 100644
--- a/ads/vendors/revcontent.js
+++ b/ads/vendors/revcontent.js
@@ -1,60 +1,250 @@
-import {loadScript, validateData, writeScript} from '#3p/3p';
+import {loadScript, validateData} from '#3p/3p';
+
+import {setStyle, setStyles} from '#core/dom/style';
+
+// Required/optional parameters for legacy/standard builds are consolidated here
+// to provide a more managable way of interacting with them. Most of the legacy
+// optional attributes are deprecated but there's still tags live that might have
+// them so they'll stay in this list to pass validation
+const options = {
+  endpoints: {
+    legacy:
+      'https://labs-cdn.revcontent.com/build/amphtml/revcontent.amp.min.js',
+    standard: 'https://assets.revcontent.com/master/delivery.js',
+    evergreen: 'https://delivery.revcontent.com/',
+  },
+  params: {
+    legacy: {
+      required: ['id', 'height'],
+      optional: [
+        'wrapper',
+        'subIds',
+        'revcontent',
+        'env',
+        'loadscript',
+        'api',
+        'key',
+        'ssl',
+        'adxw',
+        'adxh',
+        'rows',
+        'cols',
+        'domain',
+        'source',
+        'testing',
+        'endpoint',
+        'publisher',
+        'branding',
+        'font',
+        'css',
+        'sizer',
+        'debug',
+        'ampcreative',
+        'gdpr',
+        'gdprConsent',
+        'usPrivacy',
+        'gamEnabled',
+      ],
+    },
+    evergreen: {
+      required: ['widgetId', 'pubId', 'height'],
+      optional: ['endpoint'],
+    },
+  },
+};
 
 /**
- * @param {!Window} global
+ * Helper function to get endpoint string based on how tag is configured.
+ *
  * @param {!Object} data
+ * @return {string}
  */
-export function revcontent(global, data) {
-  let endpoint =
-    'https://labs-cdn.revcontent.com/build/amphtml/revcontent.amp.min.js';
-
+function getEndpoint(data) {
   if (typeof data.revcontent !== 'undefined') {
     if (typeof data.env === 'undefined') {
-      endpoint = 'https://assets.revcontent.com/master/delivery.js';
-    } else if (data.env == 'dev') {
-      endpoint = 'https://performante.revcontent.dev/delivery.js';
-    } else {
-      endpoint = 'https://assets.revcontent.com/' + data.env + '/delivery.js';
+      return options.endpoints.standard;
+    }
+    if (data.env == 'dev') {
+      return 'https://preact.revcontent.dev/delivery.js';
     }
+    return `https://assets.revcontent.com/${data.env}/delivery.js`;
   }
 
-  const required = ['id', 'height'];
-  const optional = [
-    'wrapper',
-    'subIds',
-    'revcontent',
-    'env',
-    'loadscript',
-    'api',
-    'key',
-    'ssl',
-    'adxw',
-    'adxh',
-    'rows',
-    'cols',
-    'domain',
-    'source',
-    'testing',
-    'endpoint',
-    'publisher',
-    'branding',
-    'font',
-    'css',
-    'sizer',
-    'debug',
-    'ampcreative',
-    'gdpr',
-    'gdprConsent',
-    'usPrivacy',
-  ];
+  if (
+    typeof data.placementType !== 'undefined' &&
+    data.placementType === 'evergreen'
+  ) {
+    if (typeof data.devUrl !== 'undefined') {
+      return data.devUrl;
+    }
 
-  data.endpoint = data.endpoint ? data.endpoint : 'trends.revcontent.com';
+    return `${options.endpoints.evergreen}/${data.pubId}/${data.widgetId}/widget.js`;
+  }
 
-  validateData(data, required, optional);
-  global.data = data;
-  if (data.loadscript) {
-    loadScript(window, endpoint);
+  return options.endpoints.legacy;
+}
+
+/**
+ * Internal handler for calling requestResize
+ * @param {!Window} global
+ * @param {!Element} container
+ * @param {number} height
+ */
+function handleResize(global, container, height) {
+  global.context
+    .requestResize(undefined, height, true)
+    .then(() => {
+      handleResizeSuccess(global);
+      //handleResizeDenied(global, container, height);
+    })
+    .catch(() => {
+      handleResizeDenied(global, container, height);
+    });
+}
+
+/**
+ * Helper function for handling denied resize requests. Creates an overflow element if one does not exist
+ * @param {!Window} global
+ * @param {!Element} container
+ * @param {number} height
+ */
+function handleResizeDenied(global, container, height) {
+  const overflowElement = global.document.getElementById('overflow');
+
+  if (overflowElement) {
+    setStyle(overflowElement, 'display', '');
   } else {
-    writeScript(window, endpoint);
+    createOverflowElement(global, container, height);
+  }
+}
+
+/**
+ * Helper function for handling successful resize requests
+ * @param {!Window} global
+ */
+function handleResizeSuccess(global) {
+  const overflow = global.document.getElementById('overflow');
+  if (overflow) {
+    setStyle(overflow, 'display', 'none');
   }
 }
+
+/**
+ * Helper function to create an overflow element if one doesn't exist
+ * @param {!Window} global
+ * @param {!Element} container
+ * @param {number} height
+ */
+function createOverflowElement(global, container, height) {
+  const overflow = global.document.createElement('div');
+  overflow.id = 'overflow';
+
+  overflow.addEventListener('click', () => {
+    handleResize(global, container, height);
+  });
+
+  setStyles(overflow, {
+    position: 'absolute',
+    height: `60px`,
+    bottom: '0',
+    left: '0',
+    right: '0',
+    background: 'green',
+    cursor: 'pointer',
+  });
+
+  const indicator = `<svg id="indicator" fill="#ffffff" width="60" height="60" viewBox="0 0 24.00 24.00" xmlns="http://www.w3.org/2000/svg"><path d="M16.939 7.939 12 12.879l-4.939-4.94-2.122 2.122L12 17.121l7.061-7.06z"></path></svg>`;
+
+  const chevron = global.document.createElement('div');
+  setStyles(chevron, {
+    width: '40px',
+    height: '40px',
+    margin: '0 auto',
+    display: 'block',
+  });
+
+  chevron./*OK*/ innerHTML = indicator;
+  overflow.appendChild(chevron);
+  container.appendChild(overflow);
+}
+
+/**
+ * @param {!Window} global
+ * @param {!Object} data
+ */
+export function revcontent(global, data) {
+  global.revcontent = global.revcontent || {
+    boundingClientRect: {},
+    detectedWidth: 0,
+    detectedHeight: 0,
+    widgetData: {
+      ...data,
+    },
+    requestedSize: 0,
+  };
+
+  const requiredParams = [];
+  const optionalParams = [];
+  const containerDiv = global.document.getElementById('c');
+
+  if (
+    typeof data.placementType !== 'undefined' &&
+    data.placementType === 'evergreen'
+  ) {
+    // Revcontent evergreen builds do not have an explicit group of optional parameters
+    // to support configuration flexibility. Add any present attributes that are not
+    // part of the required ones to the optional list so tag passes validation.
+    const required = options?.params?.evergreen?.required;
+    const optional = Object.keys(data).filter((entry) => {
+      if (!required.includes(entry)) {
+        return entry;
+      }
+    });
+
+    optional.push(...options?.params?.evergreen?.optional);
+    requiredParams.push(...required);
+    optionalParams.push(...optional);
+
+    global.context.observeIntersection(function (changes) {
+      /** @type {!Array} */ changes.forEach(function (c) {
+        if (c.intersectionRect.height) {
+          if (global.revcontent?.boundingClientRect !== c.boundingClientRect) {
+            Object.assign(
+              global.revcontent?.boundingClientRect,
+              c.boundingClientRect
+            );
+          }
+
+          if (c.boundingClientRect.height < global.revcontent.requestedSize) {
+            handleResize(global, containerDiv, global.revcontent.requestedSize);
+          }
+        }
+      });
+    });
+  } else {
+    const required = options?.params?.legacy?.required;
+    const optional = options?.params?.legacy?.optional;
+
+    requiredParams.push(...required);
+    optionalParams.push(...optional);
+  }
+
+  const endpoint = getEndpoint(data);
+  data.endpoint = data.endpoint ? data.endpoint : 'trends.revcontent.com';
+
+  validateData(data, requiredParams, optionalParams);
+
+  global.data = data;
+  loadScript(global, endpoint, () => {
+    window.addEventListener('message', (e) => {
+      if (
+        e.data.source == 'revcontent' &&
+        e.data.action == 'RESIZE_AMP_TAG' &&
+        typeof e.data.height != 'undefined'
+      ) {
+        global.revcontent.requestedSize = e.data.height;
+        handleResize(global, containerDiv, e.data.height);
+      }
+    });
+  });
+}
diff --git a/ads/vendors/revcontent.md b/ads/vendors/revcontent.md
index 4b313313ce6a..72b3e94f6cb8 100644
--- a/ads/vendors/revcontent.md
+++ b/ads/vendors/revcontent.md
@@ -1,49 +1,67 @@
 # Revcontent
 
-## Example
+## Examples
+
+### Standard Tag
+
+The standard AMP tag for Revcontent is the basic AMP ads integration and is used as shown here:
 
 ```html
 <amp-ad
-  width="400"
-  height="260"
+  width="{APPROPRIATE_WIDTH}"
+  height="{APPROPRIATE_HEIGHT}"
   layout="responsive"
+  data-revcontent
   type="revcontent"
-  heights="(max-width: 320px) 933px,
-      (max-width: 360px) 1087px,
-      (max-width: 375px) 1138px,
-      (max-width: 412px) 1189px,
-      (max-width: 414px) 1072px,
-      (max-width: 568px) 1151px,
-      (max-width: 640px) 1128px,
-      (max-width: 667px) 1151px,
-      (max-width: 732px) 1211px,
-      (max-width: 736px) 1151px,
-      (max-width: 768px) 633px,
-      (max-width: 1024px) 711px,
-      86vw"
-  data-wrapper="rcjsload_2ff711"
-  data-id="203"
->
-  <div placeholder="">Loading ...</div>
+  data-id="{YOUR_WIDGET_ID}">
+</amp-ad>
+```
+
+### Evergreen Tag
+
+The evergreen AMP tag leverages new and improved ad code from Revcontent and supports greater performance and customization capabilities:
+
+```html
+<amp-ad
+  data-widget-id="{YOUR_WIDGET_ID}"
+  data-pub-id="{YOUR_PUB_ID}"
+  data-placement-type="evergreen"
+  width="{APPROPRIATE_WIDTH}"
+  height="{APPROPRIATE_HEIGHT}"
+  layout="responsive"
+  type="revcontent">
 </amp-ad>
 ```
 
 ## Configuration
 
-For semantics of configuration, please see [Revcontent's documentation](https://faq.revcontent.com/).
+For help with configuration, please contact Revcontent or refer to their documentation.
 
-Supported parameters:
+### Standard Tag Options
+
+#### Required Parameters
 
 -   `data-id`
--   `data-revcontent`
--   `data-env`
--   `data-wrapper`
--   `data-endpoint`
--   `data-ssl`
--   `data-testing`
--   `data-loadscript`
+-   `width`
+-   `height`
+
+#### Optional Parameters
+
 -   `data-sub-ids`
+-   `data-gam-enabled`
+-   `data-gdpr`
+-   `data-gdpr-consent`
+-   `data-us-privacy`
+
+### Evergreen Tag Options
+
+#### Required Parameters
+
+-   `data-widget-id`
+-   `data-pub-id`
+-   `width`
+-   `height`
 
-## Auto-sizing of Ads
+#### Optional Parameters
 
-Revcontent's AMP service will be updated to support resizing of ads for improved rendering, no additional tag parameters are required at this time.
+Please contact Revcontent for more information about optional parameters for evergreen tags.
diff --git a/ads/vendors/runative.js b/ads/vendors/runative.js
index d42d182581de..4828d35f7b3a 100644
--- a/ads/vendors/runative.js
+++ b/ads/vendors/runative.js
@@ -1,4 +1,5 @@
 import {loadScript, validateData} from '#3p/3p';
+
 import {parseJson} from '#core/types/object/json';
 
 const requiredParams = ['spot'];
diff --git a/ads/vendors/sas.js b/ads/vendors/sas.js
index a2b0aa992f67..98b71432f73a 100644
--- a/ads/vendors/sas.js
+++ b/ads/vendors/sas.js
@@ -1,6 +1,8 @@
+import {validateData, writeScript} from '#3p/3p';
+
 import {getMultiSizeDimensions} from '#ads/google/utils';
+
 import {parseJson} from '#core/types/object/json';
-import {validateData, writeScript} from '#3p/3p';
 
 /**
  * @param {!Window} global
diff --git a/ads/vendors/seedtag.js b/ads/vendors/seedtag.js
index 6e988e9bf1fe..d7954767520f 100644
--- a/ads/vendors/seedtag.js
+++ b/ads/vendors/seedtag.js
@@ -24,7 +24,7 @@ export function seedtag(global, data) {
   /*eslint "local/camelcase": 0*/
   global._seedtag_amp = {
     allowed_data: ['adunitId', 'placement', 'publisherId', 'forceCreative'],
-    mandatory_data: ['adunitId', 'placement', 'publisherId'],
+    mandatory_data: ['adunitId'],
     data,
   };
 
@@ -34,5 +34,5 @@ export function seedtag(global, data) {
     global._seedtag_amp.allowed_data
   );
 
-  loadScript(global, 'https://config.seedtag.com/omid/bridge/bridge.js');
+  loadScript(global, `https://t.seedtag.com/a/${data.adunitId}.js`);
 }
diff --git a/ads/vendors/seedtag.md b/ads/vendors/seedtag.md
index 9308a30b27a7..721c1ea01958 100644
--- a/ads/vendors/seedtag.md
+++ b/ads/vendors/seedtag.md
@@ -19,15 +19,11 @@ limitations under the License.
 ## Example
 
 ```html
-<amp-ad width="320" height="250" type="seedtag" data-adunit-id="0" data-publisher-id="0000-0000-01"
-    data-placement="inArticle">
 <amp-ad
   width="300"
   height="250"
   type="seedtag"
   data-adunit-id="0"
-  data-publisher-id="0000-0000-01"
-  data-placement="inArticle"
 >
 </amp-ad>
 ```
@@ -39,41 +35,9 @@ For configuration semantics, please contact [Seedtag](https://www.seedtag.com/co
 Supported parameters:
 
 -   `data-adunit-id` mandatory
--   `data-publisher-id` mandatory
--   `data-placement` mandatory
 
-## Testing
-
-You can force a creative for test using this parameters
-
--   `data-force-creative` optional
-
-Currently you can test those format :
-| Format | value |
-| ------ | ----- |
-| display 300x250 | https://creatives.seedtag.com/vast/ssp-responses/display-OM300x250.json |
-| display 300x50 | https://creatives.seedtag.com/vast/ssp-responses/display-OM300x50.json |
-| display 320x480 | https://creatives.seedtag.com/vast/ssp-responses/display-OM320x480.json |
-| display 970x90 | https://creatives.seedtag.com/vast/ssp-responses/display-OM970x90.json |
-| display 970x250 | https://creatives.seedtag.com/vast/ssp-responses/display-OM970x250.json |
-| video outstream | https://creatives.seedtag.com/vast/ssp-responses/video-cov.json |
-
-this way :
-
-```html
-  <amp-ad
-    width="320"
-    height="250"
-    type="seedtag"
-    data-adunit-id="0"
-    data-publisher-id="0000-0000-01"
-    data-placement="inArticle"
-    data-force-creative="https://creatives.seedtag.com/vast/ssp-responses/display-OM300x250.json">
-  </amp-ad>
-```
 
 ## User Consent Integration
-
 When [user consent](https://github.com/ampproject/amphtml/blob/main/extensions/amp-consent/amp-consent.md#blocking-behaviors) is required, Seedtag ad approaches user consent in the following ways:
 
 -   `CONSENT_POLICY_STATE.SUFFICIENT`: Serve a personalized ad to the user.
diff --git a/ads/vendors/sekindo.js b/ads/vendors/sekindo.js
index 3d950ca8e803..4b453e50afe9 100644
--- a/ads/vendors/sekindo.js
+++ b/ads/vendors/sekindo.js
@@ -1,6 +1,7 @@
-import {hasOwn} from '#core/types/object';
 import {loadScript, validateData} from '#3p/3p';
 
+import {hasOwn} from '#core/types/object';
+
 /**
  * @param {!Window} global
  * @param {!Object} data
diff --git a/ads/vendors/sevio.js b/ads/vendors/sevio.js
new file mode 100644
index 000000000000..fb8bef0b6d03
--- /dev/null
+++ b/ads/vendors/sevio.js
@@ -0,0 +1,33 @@
+import {loadScript, validateData} from '#3p/3p';
+
+/**
+ * @param {!Window} global
+ * @param {!Object} data
+ */
+export function sevio(global, data) {
+  validateData(data, ['zone']);
+
+  const container = document.getElementById('c');
+  const adDivId = 'sevioads-amp-' + encodeURIComponent(data.zone);
+  const adDiv = document.createElement('div');
+  adDiv.setAttribute('id', adDivId);
+  container.appendChild(adDiv);
+
+  loadScript(
+    global,
+    'https://cdn.adx.ws/scripts/amp.js',
+    () => {
+      window.sevioAmpLoader = window.sevioAmpLoader || [];
+      window.sevioAmpLoader.push({
+        zoneId: encodeURIComponent(data.zone),
+        placeholderId: encodeURIComponent(adDivId),
+        wu: window.location.href,
+        width: data.width,
+        height: data.height,
+      });
+    },
+    () => {
+      global.context.noContentAvailable();
+    }
+  );
+}
diff --git a/ads/vendors/sevio.md b/ads/vendors/sevio.md
new file mode 100644
index 000000000000..d49a0a3df890
--- /dev/null
+++ b/ads/vendors/sevio.md
@@ -0,0 +1,19 @@
+# Sevio
+
+## Example of Sevio's model implementation
+
+### Basic
+
+```html
+  <amp-ad
+    type="sevio"
+    width="300"
+    height="250"
+    data-zone="zoneId"
+  >
+  </amp-ad>
+```
+
+### Required parameters
+
+-   `data-zone`: Zone ID
diff --git a/ads/vendors/skoiy.js b/ads/vendors/skoiy.js
new file mode 100644
index 000000000000..10c248586a4b
--- /dev/null
+++ b/ads/vendors/skoiy.js
@@ -0,0 +1,17 @@
+import {validateData, writeScript} from '#3p/3p';
+
+/**
+ * @param {!Window} global
+ * @param {!Object} data
+ */
+export function skoiy(global, data) {
+  // TODO: check mandatory fields
+  validateData(data, ['token', 'format', 'id'], ['query']);
+
+  const {format, id, query = '', token} = data;
+
+  const options = query ? '&' + query : '';
+
+  const url = `https://svas.skoiy.xyz/${format}/${token}/${id}?amp${options}`;
+  writeScript(global, url);
+}
diff --git a/ads/vendors/skoiy.md b/ads/vendors/skoiy.md
new file mode 100644
index 000000000000..b98a6afd7296
--- /dev/null
+++ b/ads/vendors/skoiy.md
@@ -0,0 +1,26 @@
+![skoiy logo](https://skoiy.com/img/logos/logo-skoiy.svg)
+
+Skoiy is an integrated suite of platforms that simplify and centralize the management, distribution, and monetization of digital media across a suite of independent platforms that fit the needs of each project.
+
+## Example
+
+```html
+<amp-ad
+  layout="fixed-height"
+  height="454"
+  type="skoiy"
+  data-token="5nff7dqpce5u4moq"
+  data-format="carousel"
+  data-id="8462514974">
+</amp-ad>
+```
+
+### Required parameters
+
+-   `data-token`
+-   `data-format`
+-   `data-id`
+
+### Optional parameters
+
+-   `data-query`
diff --git a/ads/vendors/smartadserver.js b/ads/vendors/smartadserver.js
deleted file mode 100644
index fc27c18b698f..000000000000
--- a/ads/vendors/smartadserver.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import {loadScript} from '#3p/3p';
-
-/**
- * @param {!Window} global
- * @param {!Object} data
- */
-export function smartadserver(global, data) {
-  // For more flexibility, we construct the call to SmartAdServer's URL in the
-  // external loader, based on the data received from the AMP tag.
-  loadScript(global, 'https://ec-ns.sascdn.com/diff/js/amp.v0.js', () => {
-    global.sas.callAmpAd(data);
-  });
-}
diff --git a/ads/vendors/smartclip.md b/ads/vendors/smartclip.md
index 4f63a6fffa59..e6409f0f44ef 100644
--- a/ads/vendors/smartclip.md
+++ b/ads/vendors/smartclip.md
@@ -9,6 +9,7 @@
   type="smartclip"
   data-plc="68005"
   data-sz="400x320"
+  data-block-on-consent="_till_responded"
 >
 </amp-ad>
 ```
diff --git a/ads/vendors/sona.js b/ads/vendors/sona.js
index c5d00220d628..e5caecf11407 100644
--- a/ads/vendors/sona.js
+++ b/ads/vendors/sona.js
@@ -1,4 +1,5 @@
 import {loadScript, validateData} from '#3p/3p';
+
 import {parseJson} from '#core/types/object/json';
 
 /**
diff --git a/ads/vendors/spotx.js b/ads/vendors/spotx.js
index bdb5d6a8e8b6..dadfc54122ff 100644
--- a/ads/vendors/spotx.js
+++ b/ads/vendors/spotx.js
@@ -1,6 +1,7 @@
-import {hasOwn} from '#core/types/object';
 import {validateData} from '#3p/3p';
 
+import {hasOwn} from '#core/types/object';
+
 /**
  * @param {!Window} global
  * @param {!Object} data
diff --git a/ads/vendors/springAds.js b/ads/vendors/springAds.js
index efd0115a3d35..206a954601d3 100644
--- a/ads/vendors/springAds.js
+++ b/ads/vendors/springAds.js
@@ -1,4 +1,5 @@
 import {computeInMasterFrame, loadScript} from '#3p/3p';
+
 import {parseJson} from '#core/types/object/json';
 
 /**
diff --git a/ads/vendors/ssp.js b/ads/vendors/ssp.js
index f5e110ebb443..b92d27b6f33e 100644
--- a/ads/vendors/ssp.js
+++ b/ads/vendors/ssp.js
@@ -15,8 +15,9 @@
  */
 
 import {computeInMasterFrame, loadScript, validateData} from '#3p/3p';
-import {parseJson} from '#core/types/object/json';
+
 import {setStyle, setStyles} from '#core/dom/style';
+import {parseJson} from '#core/types/object/json';
 
 /*
  * How to develop:
@@ -27,7 +28,7 @@ import {setStyle, setStyles} from '#core/dom/style';
  * @param {!Array.<!Object>} array
  * @param {!Function} iteratee
  *
- * @return {Object}
+ * @return {object}
  */
 export function keyBy(array, iteratee) {
   return array.reduce(
@@ -52,7 +53,7 @@ export function runWhenFetchingSettled(fetchingSSPs, cb) {
 /**
  * @param {!Element} element
  * @param {boolean} center
- * @param {Object} dimensions
+ * @param {object} dimensions
  */
 export function handlePosition(element, center, dimensions) {
   const styles = {
@@ -199,7 +200,6 @@ export function ssp(global, data) {
         // todo on SSP side (option to register error callback)
         // requestErrorCallback: () => {},
         AMPcallback: (ads) => {
-          /** @suppress {checkTypes} */
           const adById = keyBy(ads, (item) => item.id);
           const ad = adById[position['id']];
 
diff --git a/ads/vendors/sunmedia.js b/ads/vendors/sunmedia.js
index 62213af8b07e..3757837cf5c2 100644
--- a/ads/vendors/sunmedia.js
+++ b/ads/vendors/sunmedia.js
@@ -7,7 +7,7 @@ import {loadScript, validateData} from '#3p/3p';
 export function sunmedia(global, data) {
   /*eslint "local/camelcase": 0*/
   global._sunmedia_amp = {
-    allowed_data: ['cskp', 'crst', 'cdb', 'cid'],
+    allowed_data: ['cid'],
     mandatory_data: ['cid'],
     data,
   };
@@ -20,6 +20,6 @@ export function sunmedia(global, data) {
 
   loadScript(
     global,
-    'https://vod.addevweb.com/sunmedia/amp/ads/SMIntextAMP.js'
+    `https://static.sunmedia.tv/integrations/${data.cid}/${data.cid}.js`
   );
 }
diff --git a/ads/vendors/sunmedia.md b/ads/vendors/sunmedia.md
index cfff4ed59b01..7df310ac5026 100644
--- a/ads/vendors/sunmedia.md
+++ b/ads/vendors/sunmedia.md
@@ -4,15 +4,13 @@
 
 ```html
 <amp-ad
-  width="300"
+  width="1"
   height="1"
   type="sunmedia"
   layout="responsive"
-  data-cid="sunmedia_test"
-  data-cskp="1"
-  data-crst="1"
->
-</amp-ad>
+  data-cid="5898aec7-32f5-4e3b-bd67-41f68b58b412"
+  data-block-on-consent="_till_responded"
+></amp-ad>
 ```
 
 ## Configuration
@@ -21,9 +19,4 @@ For further information, please contact [SunMedia](http://sunmedia.tv/#contact).
 
 ### Required parameters
 
--   `data-cid`: Client ID provided by SunMedia
-
-### Optional parameters
-
--   `data-cskp`: Indicates skip button enabled
--   `data-crst`: Indicates restart option enabled
+-   `data-cid`: Integration ID provided by SunMedia
diff --git a/ads/vendors/teads.js b/ads/vendors/teads.js
index 8002eecd3cf2..358748efb646 100644
--- a/ads/vendors/teads.js
+++ b/ads/vendors/teads.js
@@ -5,34 +5,15 @@ import {loadScript, validateData} from '#3p/3p';
  * @param {!Object} data
  */
 export function teads(global, data) {
+  validateData(data, ['pid']);
+
   /*eslint "local/camelcase": 0*/
   global._teads_amp = {
-    allowed_data: ['pid', 'tag'],
-    mandatory_data: ['pid'],
-    mandatory_tag_data: ['tta', 'ttp'],
     data,
   };
 
-  validateData(
-    data,
-    global._teads_amp.mandatory_data,
-    global._teads_amp.allowed_data
+  loadScript(
+    global,
+    'https://a.teads.tv/page/' + encodeURIComponent(data.pid) + '/tag'
   );
-
-  if (data.tag) {
-    validateData(data.tag, global._teads_amp.mandatory_tag_data);
-    global._tta = data.tag.tta;
-    global._ttp = data.tag.ttp;
-
-    loadScript(
-      global,
-      'https://s8t.teads.tv/media/format/' +
-        encodeURI(data.tag.js || 'v3/teads-format.min.js')
-    );
-  } else {
-    loadScript(
-      global,
-      'https://a.teads.tv/page/' + encodeURIComponent(data.pid) + '/tag'
-    );
-  }
 }
diff --git a/ads/vendors/torimochi.js b/ads/vendors/torimochi.js
index e57f4a2a353c..837b51e42ff0 100644
--- a/ads/vendors/torimochi.js
+++ b/ads/vendors/torimochi.js
@@ -1,6 +1,7 @@
-import {parseJson} from '#core/types/object/json';
 import {validateData, writeScript} from '#3p/3p';
 
+import {parseJson} from '#core/types/object/json';
+
 /**
  * @param {!Window} global
  * @param {!Object} data
diff --git a/ads/vendors/trafficstars.js b/ads/vendors/trafficstars.js
index 1baf6886e2c3..b904e6092c17 100644
--- a/ads/vendors/trafficstars.js
+++ b/ads/vendors/trafficstars.js
@@ -1,14 +1,25 @@
 import {loadScript, validateData} from '#3p/3p';
+
 import {parseJson} from '#core/types/object/json';
 
 const requiredParams = ['spot'];
-const jsonParams = ['nativeSettings', 'wrapperStyles', 'iFrameStyles'];
+const jsonParams = [
+  'nativeSettings',
+  'wrapperStyles',
+  'iFrameStyles',
+  'queriesParams',
+];
 const params = [
   'uploadLink',
-  'queriesParams',
   'onLoadResponseHook',
   'onSpotRenderedHook',
   'onLoadErrorHook',
+  'subid',
+  'subid_1',
+  'subid_2',
+  'subid_3',
+  'subid_4',
+  'subid_5',
 ];
 const optionalParams = params.concat(jsonParams);
 const adContainerId = 'trafficstars_id';
diff --git a/ads/vendors/trafficstars.md b/ads/vendors/trafficstars.md
index bab8bdcbc8dd..6880a2b52bfc 100644
--- a/ads/vendors/trafficstars.md
+++ b/ads/vendors/trafficstars.md
@@ -18,6 +18,12 @@ Serves ads from the [TrafficStars](https://www.trafficstars.com/).
   data-on-load-response-hook="{(data: TMasterSpotData) => void}"
   data-on-spot-rendered-hook="{(element: HTMLElement) => void}"
   data-on-load-error-hook="{() => void}"
+  data-subid="{string}"
+  data-subid_1="{string}"
+  data-subid_2="{string}"
+  data-subid_3="{string}"
+  data-subid_4="{string}"
+  data-subid_5="{string}"
 >
 </amp-embed>
 ```
@@ -40,3 +46,9 @@ For details on the configuration semantics, please contact the ad network or ref
 -   `onLoadResponseHook` - hook after ad request success
 -   `onSpotRenderedHook` - hook after ad render success
 -   `onLoadErrorHook` - hook after ad request error
+-   `subid` - attribute of data
+-   `subid_1` - attribute of data
+-   `subid_2` - attribute of data
+-   `subid_3` - attribute of data
+-   `subid_4` - attribute of data
+-   `subid_5` - attribute of data
diff --git a/ads/vendors/uas.js b/ads/vendors/uas.js
index 933ef6f67f2b..9a90aa192794 100644
--- a/ads/vendors/uas.js
+++ b/ads/vendors/uas.js
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-import {hasOwn} from '#core/types/object';
 import {loadScript, validateData} from '#3p/3p';
+
 import {setStyles} from '#core/dom/style';
+import {hasOwn} from '#core/types/object';
 
 /**
  * @param {!Object} theObject
diff --git a/ads/vendors/uzou.js b/ads/vendors/uzou.js
index e7da69f3f6d5..eda5fc0d7e75 100644
--- a/ads/vendors/uzou.js
+++ b/ads/vendors/uzou.js
@@ -1,4 +1,5 @@
 import {loadScript, validateData} from '#3p/3p';
+
 import {parseJson} from '#core/types/object/json';
 
 /**
diff --git a/ads/vendors/videonow.js b/ads/vendors/videonow.js
index 74c0f770c04e..35ed7b578bb0 100644
--- a/ads/vendors/videonow.js
+++ b/ads/vendors/videonow.js
@@ -1,4 +1,5 @@
 import {loadScript, validateData} from '#3p/3p';
+
 import {parseJson} from '#core/types/object/json';
 import {tryDecodeUriComponent} from '#core/types/string/url';
 
diff --git a/ads/vendors/viralize.js b/ads/vendors/viralize.js
index e39abc1621d2..1058c2117b82 100644
--- a/ads/vendors/viralize.js
+++ b/ads/vendors/viralize.js
@@ -1,7 +1,9 @@
-import {addParamsToUrl} from '../../src/url';
 import {loadScript, validateData} from '#3p/3p';
+
 import {parseJson} from '#core/types/object/json';
 
+import {addParamsToUrl} from '../../src/url';
+
 /**
  * @param {!Window} global
  * @param {!Object} data
diff --git a/ads/vendors/vox.js b/ads/vendors/vox.js
new file mode 100644
index 000000000000..1096a2fdbd82
--- /dev/null
+++ b/ads/vendors/vox.js
@@ -0,0 +1,13 @@
+import {loadScript, validateData} from '#3p/3p';
+
+/**
+ * @param {!Window} global
+ * @param {!Object} data
+ */
+export function vox(global, data) {
+  const scriptUrl = 'https://st.hbrd.io/amp-helper.js?t=' + Date.now();
+  validateData(data, ['placementid']);
+  loadScript(global, scriptUrl);
+  global._voxParams = data['voxParams'];
+  global._voxPlacementId = data['placementid'];
+}
diff --git a/ads/vendors/vox.md b/ads/vendors/vox.md
new file mode 100644
index 000000000000..fced18ef782f
--- /dev/null
+++ b/ads/vendors/vox.md
@@ -0,0 +1,15 @@
+# VOX
+
+## Example
+
+```html
+<amp-ad
+  type="vox"
+  data-placementid="000000000000000000000000"
+  data-vox-params='{"adtype": "simple"}'>
+</amp-ad>
+```
+
+### Required parameters
+
+-   `data-placementid`
diff --git a/ads/vendors/yahoo.js b/ads/vendors/yahoo.js
deleted file mode 100644
index 3ef287d28235..000000000000
--- a/ads/vendors/yahoo.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import {validateData, writeScript} from '#3p/3p';
-
-/**
- * @param {!Window} global
- * @param {!Object} data
- */
-export function yahoo(global, data) {
-  if (data.sid) {
-    validateData(data, ['sid', 'site', 'sa']);
-    global.yadData = data;
-    writeScript(global, 'https://s.yimg.com/aaq/ampad/display.js');
-  } else if (data.config) {
-    validateData(data, ['config']);
-    global.jacData = data;
-    writeScript(global, 'https://jac.yahoosandbox.com/amp/jac.js');
-  }
-}
diff --git a/ads/vendors/yahoo.md b/ads/vendors/yahoo.md
deleted file mode 100644
index 97eea2222b91..000000000000
--- a/ads/vendors/yahoo.md
+++ /dev/null
@@ -1,64 +0,0 @@
-# yahoo
-
-## Display ad
-
-```html
-<amp-ad
-  type="yahoo"
-  width="316"
-  height="264"
-  data-sid="954014446"
-  data-site="news"
-  data-sa='{"LREC":"300x250","secure":"true","content":"no_expandable;"}'
->
-</amp-ad>
-```
-
-```html
-<amp-ad
-  type="yahoo"
-  width="300"
-  height="250"
-  data-config='{"adServer":{"1AS":{"region":"US"}},
-    "positions":{"FB":{"alias":"1111111","sizes":["300x250"]}},
-    "site":{name:{"autoblogAMP"}},"spaceId":"111111"}'
-  data-stylesheet="https://www.autoblog.com/static/styles.css"
->
-</amp-ad>
-```
-
-### Configuration
-
-For configuration details, please contact https://advertising.yahoo.com/contact.
-
-Supported parameters:
-
--   `height`
--   `width`
--   `data-sid`
--   `data-site`
--   `data-sa`
--   `data-config`
--   `data-stylesheet`
-
-### Required Parameters:
-
-`data-config` - Config for ad call JAC
-`data-sa` - Config for ad call DARLA
-
-### Optional parameters:
-
-`data-stylesheet` - stylesheet to use inside iframe
-
-### Configuration Details
-
-For JAC ads : Required
-"adServer":{"1AS":{region":"US"}},
-"positions":{"FB":{alias:"1111111"},"sizes":["300x250"]}},
-"site":{name:{"autoblogAMP"}},"spaceId":"111111"}
-
-Alias, Sizes, SiteName and spaceId should be replaced by correct values.
-NOTE: SiteName should be site name + "AMP"
-
-Optional
-"params":{"name":"value"}
diff --git a/ads/vendors/yektanet.js b/ads/vendors/yektanet.js
index ca543a6d6522..10010bd27de7 100644
--- a/ads/vendors/yektanet.js
+++ b/ads/vendors/yektanet.js
@@ -26,7 +26,7 @@ export function yektanet(global, data) {
   ].join('0');
 
   const scriptSrc = isBanner
-    ? 'https://cdn.yektanet.com/template/bnrs/yn_bnr.min.js'
+    ? 'https://cdn.yektanet.com/template/bnrs/yn_bnr.amp.js'
     : `https://cdn.yektanet.com/js/${encodeURIComponent(
         data['publisherName']
       )}/${encodeURIComponent(data['scriptName'])}`;
diff --git a/ads/vendors/yieldbot.js b/ads/vendors/yieldbot.js
index f47938bfd0e6..1689e1a04d90 100644
--- a/ads/vendors/yieldbot.js
+++ b/ads/vendors/yieldbot.js
@@ -1,6 +1,9 @@
-import {getMultiSizeDimensions} from '#ads/google/utils';
 import {loadScript, validateData} from '#3p/3p';
+
+import {getMultiSizeDimensions} from '#ads/google/utils';
+
 import {rethrowAsync} from '#core/error';
+
 import {user} from '#utils/log';
 
 /**
diff --git a/amp.js b/amp.js
index 76d16c21900c..c1549f481b99 100755
--- a/amp.js
+++ b/amp.js
@@ -36,9 +36,7 @@ createTask('check-renovate-config', 'checkRenovateConfig');
 createTask('check-sourcemaps', 'checkSourcemaps');
 createTask('check-types', 'checkTypes');
 createTask('check-video-interface-list', 'checkVideoInterfaceList');
-createTask('cherry-pick', 'cherryPick');
 createTask('clean');
-createTask('codecov-upload', 'codecovUpload');
 createTask('compile-jison', 'compileJison');
 createTask('css');
 createTask('default', 'defaultTask', 'default-task');
@@ -51,8 +49,6 @@ createTask('integration');
 createTask('lint');
 createTask('make-extension', 'makeExtension');
 createTask('markdown-toc', 'markdownToc');
-createTask('performance');
-createTask('performance-urls', 'performanceUrls');
 createTask('pr-check', 'prCheck');
 createTask('prepend-global', 'prependGlobal');
 createTask('presubmit', 'presubmit');
@@ -62,7 +58,6 @@ createTask('serve');
 createTask('server-tests', 'serverTests');
 createTask('storybook');
 createTask('sweep-experiments', 'sweepExperiments');
-createTask('test-report-upload', 'testReportUpload');
 createTask('unit');
 createTask('validate-html-fixtures', 'validateHtmlFixtures');
 createTask('validator');
diff --git a/babel.config.js b/babel.config.js
index 0f9e69f3f0a2..404d0bc9c7db 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -10,6 +10,7 @@
 'use strict';
 
 const {cyan, yellow} = require('kleur/colors');
+
 const {log} = require('./build-system/common/logging');
 
 /**
@@ -18,15 +19,18 @@ const {log} = require('./build-system/common/logging');
  */
 const babelTransforms = new Map([
   ['babel-jest', 'getEmptyConfig'],
-  ['post-closure', 'getPostClosureConfig'],
-  ['pre-closure', 'getPreClosureConfig'],
+  ['nomodule-loader', 'getNoModuleLoaderConfig'],
   ['test', 'getTestConfig'],
   ['unminified', 'getUnminifiedConfig'],
+  ['unminified-ssr-css', 'getUnminifiedSsrCssConfig'],
   ['minified', 'getMinifiedConfig'],
+  ['minified-ssr-css', 'getMinifiedSsrCssConfig'],
   ['jss', 'getJssConfig'],
   ['@babel/eslint-parser', 'getEslintConfig'],
   ['is-enum-value', 'getEmptyConfig'],
   ['import-resolver', 'getEmptyConfig'],
+  ['react-minified', 'getReactMinifiedConfig'],
+  ['react-unminified', 'getReactUnminifiedConfig'],
 ]);
 
 /**
diff --git a/build-system/babel-config/helpers.js b/build-system/babel-config/helpers.js
index 4d1a6d6a768e..8ff8f67a052a 100644
--- a/build-system/babel-config/helpers.js
+++ b/build-system/babel-config/helpers.js
@@ -27,9 +27,10 @@ function getExperimentConstant() {
 /**
  * Computes options for minify-replace and returns the plugin object.
  *
+ * @param {!Object=} opt_overrides overrides for BUILD_CONSTANTS
  * @return {Array<string|Object>}
  */
-function getReplacePlugin() {
+function getReplacePlugin(opt_overrides) {
   /**
    * @param {string} identifierName the identifier name to replace
    * @param {boolean|string} value the value to replace with
@@ -43,7 +44,8 @@ function getReplacePlugin() {
     return {identifierName, replacement};
   }
 
-  const replacements = Object.entries(BUILD_CONSTANTS).map(([ident, val]) =>
+  const constants = Object.assign({}, BUILD_CONSTANTS, opt_overrides);
+  const replacements = Object.entries(constants).map(([ident, val]) =>
     createReplacement(ident, val)
   );
 
diff --git a/build-system/babel-config/import-resolver.js b/build-system/babel-config/import-resolver.js
index 9ccd99bf4480..cf7d731cacee 100644
--- a/build-system/babel-config/import-resolver.js
+++ b/build-system/babel-config/import-resolver.js
@@ -2,8 +2,9 @@
 
 const fs = require('fs');
 const path = require('path');
+const moduleResolver = require('babel-plugin-module-resolver');
 
-const TSCONFIG_PATH = path.join(__dirname, '..', '..', 'tsconfig.json');
+const TSCONFIG_PATH = path.join(__dirname, '..', '..', 'tsconfig.base.json');
 let tsConfigPaths = null;
 
 /**
@@ -20,7 +21,7 @@ let tsConfigPaths = null;
  *   '#foo': './src/foo',
  *   '#bar': './bar',
  * }
- * @return {!Object<string, string>}
+ * @return {!{[key: string]: string}}
  */
 function readJsconfigPaths() {
   if (!tsConfigPaths) {
@@ -40,14 +41,35 @@ function readJsconfigPaths() {
   return tsConfigPaths;
 }
 
+/**
+ * Remap external modules that rely on React if building for Preact.
+ * @param {'preact' | 'react'} buildFor
+ * @return {object}
+ */
+function moduleAliases(buildFor) {
+  if (buildFor === 'react') {
+    return {};
+  }
+  return {
+    'react': './src/react',
+    'react-dom': './src/react/dom',
+  };
+}
+
 /**
  * Import map configuration.
- * @return {!Object}
+ * @param {'preact' | 'react' | null} buildFor determines whether to include preact or react aliases or neither. By default, uses preact aliases (in addition to jsconfig paths).
+ * @return {object}
  */
-function getImportResolver() {
+function getImportResolver(buildFor = 'preact') {
   return {
     root: ['.'],
-    alias: readJsconfigPaths(),
+    alias: {
+      ...readJsconfigPaths(),
+      ...(buildFor ? moduleAliases(buildFor) : {}),
+    },
+    extensions: ['.js', '.jsx', '.ts', '.tsx'],
+    stripExtensions: [],
     babelOptions: {
       caller: {
         name: 'import-resolver',
@@ -59,27 +81,47 @@ function getImportResolver() {
 /**
  * Produces an alias map with paths relative to the provided root.
  * @param {string} rootDir
- * @return {!Object<string, string>}
+ * @param {'preact' | 'react'} buildFor
+ * @return {!{[key: string]: string}}
  */
-function getRelativeAliasMap(rootDir) {
+function getRelativeAliasMap(rootDir, buildFor = 'preact') {
   return Object.fromEntries(
-    Object.entries(getImportResolver().alias).map(([alias, destPath]) => [
-      alias,
-      path.join(rootDir, destPath),
-    ])
+    Object.entries(getImportResolver(buildFor).alias).map(
+      ([alias, destPath]) => [alias, path.join(rootDir, destPath)]
+    )
   );
 }
 
 /**
  * Import resolver Babel plugin configuration.
+ * @param {'preact' | 'react'} buildFor
  * @return {!Array}
  */
-function getImportResolverPlugin() {
-  return ['module-resolver', getImportResolver()];
+function getImportResolverPlugin(buildFor = 'preact') {
+  return ['module-resolver', getImportResolver(buildFor)];
+}
+
+/**
+ * Resolves a filepath using the same logic as the rest of our build pipeline (babel module-resolver).
+ * The return value is a relative path from the amphtml folder.
+ *
+ * @param {string} filepath
+ * @param {'preact' | 'react' | null} buildFor
+ * @return {string}
+ */
+function resolvePath(filepath, buildFor = 'preact') {
+  // 2nd arg is a file from which to make a relative path.
+  // The actual file doesn't need to exist. In this case it is process.cwd()/anything
+  return moduleResolver.resolvePath(
+    filepath,
+    'anything',
+    getImportResolver(buildFor)
+  );
 }
 
 module.exports = {
   getImportResolver,
   getImportResolverPlugin,
   getRelativeAliasMap,
+  resolvePath,
 };
diff --git a/build-system/babel-config/jss-config.js b/build-system/babel-config/jss-config.js
deleted file mode 100644
index 7d996ec0297c..000000000000
--- a/build-system/babel-config/jss-config.js
+++ /dev/null
@@ -1,25 +0,0 @@
-'use strict';
-
-// Babel cannot directly return a valid css file.
-// Therefore we provide and export this options object to allow extraction
-// of the created css file via side effect from running babel.transfrorm().
-const jssOptions = {css: 'REPLACED_BY_BABEL'};
-
-/**
- * Gets the config for transforming a JSS file to CSS
- * Only used to generate CSS files for Bento components.
- *
- * @return {!Object}
- */
-function getJssConfig() {
-  return {
-    plugins: [
-      ['./build-system/babel-plugins/babel-plugin-transform-jss', jssOptions],
-    ],
-  };
-}
-
-module.exports = {
-  getJssConfig,
-  jssOptions,
-};
diff --git a/build-system/babel-config/minified-config.js b/build-system/babel-config/minified-config.js
index e75e6016ad22..e72f361a55c7 100644
--- a/build-system/babel-config/minified-config.js
+++ b/build-system/babel-config/minified-config.js
@@ -8,9 +8,12 @@ const {getReplacePlugin} = require('./helpers');
 /**
  * Gets the config for minified babel transforms run, used by 3p vendors.
  *
+ * @param {'preact' | 'react'} buildFor
+ * @param {!Object=} opt_replacePluginOverrides
  * @return {!Object}
  */
-function getMinifiedConfig() {
+function getMinifiedConfig(buildFor = 'preact', opt_replacePluginOverrides) {
+  const isEsmBuild = argv.esm || argv.sxg;
   const isProd = argv._.includes('dist') && !argv.fortesting;
 
   const reactJsxPlugin = [
@@ -21,11 +24,14 @@ function getMinifiedConfig() {
       useSpread: true,
     },
   ];
-  const replacePlugin = getReplacePlugin();
+  const replacePlugin = getReplacePlugin(opt_replacePluginOverrides);
 
   const plugins = [
     'optimize-objstr',
-    getImportResolverPlugin(),
+    './build-system/babel-plugins/babel-plugin-deep-pure',
+    './build-system/babel-plugins/babel-plugin-mangle-object-values',
+    './build-system/babel-plugins/babel-plugin-jsx-style-object',
+    getImportResolverPlugin(buildFor),
     argv.coverage ? 'babel-plugin-istanbul' : null,
     './build-system/babel-plugins/babel-plugin-imported-helpers',
     './build-system/babel-plugins/babel-plugin-transform-inline-isenumvalue',
@@ -34,7 +40,7 @@ function getMinifiedConfig() {
     './build-system/babel-plugins/babel-plugin-transform-rename-privates',
     './build-system/babel-plugins/babel-plugin-dom-jsx-svg-namespace',
     reactJsxPlugin,
-    (argv.esm || argv.sxg) &&
+    isEsmBuild &&
       './build-system/babel-plugins/babel-plugin-transform-dev-methods',
     // TODO(alanorozco): Remove `replaceCallArguments` once serving infra is up.
     [
@@ -45,6 +51,7 @@ function getMinifiedConfig() {
     './build-system/babel-plugins/babel-plugin-transform-amp-extension-call',
     './build-system/babel-plugins/babel-plugin-transform-html-template',
     './build-system/babel-plugins/babel-plugin-transform-jss',
+    './build-system/babel-plugins/babel-plugin-amp-story-supported-languages',
     replacePlugin,
     './build-system/babel-plugins/babel-plugin-transform-amp-asserts',
     // TODO(erwinm, #28698): fix this in fixit week
@@ -56,27 +63,36 @@ function getMinifiedConfig() {
       './build-system/babel-plugins/babel-plugin-amp-mode-transformer',
       BUILD_CONSTANTS,
     ],
-    ['@babel/plugin-transform-for-of', {loose: true, allowArrayLike: true}],
+    !isEsmBuild
+      ? ['@babel/plugin-transform-for-of', {loose: true, allowArrayLike: true}]
+      : null,
   ].filter(Boolean);
   const presetEnv = [
     '@babel/preset-env',
     {
       bugfixes: true,
       modules: false,
-      targets: argv.esm || argv.sxg ? {esmodules: true} : {ie: 11, chrome: 41},
+      targets: isEsmBuild ? {esmodules: true} : {ie: 11, chrome: 41},
+      shippedProposals: true,
+      exclude: isEsmBuild ? ['@babel/plugin-transform-for-of'] : [],
     },
   ];
+  const presetTypescript = [
+    '@babel/preset-typescript',
+    {jsxPragma: 'Preact', jsxPragmaFrag: 'Preact.Fragment'},
+  ];
 
   return {
     compact: false,
     plugins,
-    sourceMaps: 'inline',
-    presets: [presetEnv],
+    sourceMaps: true,
+    presets: [presetTypescript, presetEnv],
     retainLines: true,
     assumptions: {
       constantSuper: true,
       noClassCalls: true,
       setClassMethods: true,
+      setPublicClassFields: true,
     },
   };
 }
diff --git a/build-system/babel-config/minified-ssr-css-config.js b/build-system/babel-config/minified-ssr-css-config.js
new file mode 100644
index 000000000000..7874daa5c58e
--- /dev/null
+++ b/build-system/babel-config/minified-ssr-css-config.js
@@ -0,0 +1,18 @@
+'use strict';
+
+const {getMinifiedConfig} = require('./minified-config');
+
+/**
+ * Gets the config for minified babel transforms run, used by 3p vendors with
+ * IS_SSR set to true.
+ *
+ * @return {!Object}
+ */
+function getMinifiedSsrCssConfig() {
+  // We use the default `buildFor` which is preact.
+  return getMinifiedConfig('preact', {IS_SSR_CSS: true});
+}
+
+module.exports = {
+  getMinifiedSsrCssConfig,
+};
diff --git a/build-system/babel-config/nomodule-loader-config.js b/build-system/babel-config/nomodule-loader-config.js
new file mode 100644
index 000000000000..0c38ee3579f7
--- /dev/null
+++ b/build-system/babel-config/nomodule-loader-config.js
@@ -0,0 +1,10 @@
+/** @return {{[string: string]: any}} */
+function getNoModuleLoaderConfig() {
+  return {
+    plugins: ['./build-system/babel-plugins/babel-plugin-nomodule-loader'],
+  };
+}
+
+module.exports = {
+  getNoModuleLoaderConfig,
+};
diff --git a/build-system/babel-config/post-closure-config.js b/build-system/babel-config/post-closure-config.js
deleted file mode 100644
index 1b06061f828a..000000000000
--- a/build-system/babel-config/post-closure-config.js
+++ /dev/null
@@ -1,35 +0,0 @@
-'use strict';
-
-const argv = require('minimist')(process.argv.slice(2));
-
-/**
- * Gets the config for post-closure babel transforms run during `amp dist`.
- *
- * @return {!Object}
- */
-function getPostClosureConfig() {
-  const postClosurePlugins = [
-    argv.esm || argv.sxg
-      ? './build-system/babel-plugins/babel-plugin-const-transformer'
-      : null,
-    argv.esm || argv.sxg
-      ? './build-system/babel-plugins/babel-plugin-transform-remove-directives'
-      : null,
-    argv.esm || argv.sxg
-      ? './build-system/babel-plugins/babel-plugin-transform-stringish-literals'
-      : null,
-    './build-system/babel-plugins/babel-plugin-transform-minified-comments',
-  ].filter(Boolean);
-
-  return {
-    compact: false,
-    inputSourceMap: false,
-    plugins: postClosurePlugins,
-    retainLines: false,
-    sourceMaps: true,
-  };
-}
-
-module.exports = {
-  getPostClosureConfig,
-};
diff --git a/build-system/babel-config/pre-closure-config.js b/build-system/babel-config/pre-closure-config.js
deleted file mode 100644
index f37d2c46df32..000000000000
--- a/build-system/babel-config/pre-closure-config.js
+++ /dev/null
@@ -1,84 +0,0 @@
-'use strict';
-
-const argv = require('minimist')(process.argv.slice(2));
-const {BUILD_CONSTANTS} = require('../compile/build-constants');
-const {getImportResolverPlugin} = require('./import-resolver');
-const {getReplacePlugin} = require('./helpers');
-
-/**
- * Gets the config for pre-closure babel transforms run during `amp dist`.
- *
- * @return {!Object}
- */
-function getPreClosureConfig() {
-  const isCheckTypes = argv._.includes('check-types');
-  const isProd = argv._.includes('dist') && !argv.fortesting;
-
-  const reactJsxPlugin = [
-    '@babel/plugin-transform-react-jsx',
-    {
-      pragma: 'Preact.createElement',
-      pragmaFrag: 'Preact.Fragment',
-      useSpread: true,
-    },
-  ];
-  const replacePlugin = getReplacePlugin();
-  const preClosurePlugins = [
-    'optimize-objstr',
-    getImportResolverPlugin(),
-    argv.coverage ? 'babel-plugin-istanbul' : null,
-    './build-system/babel-plugins/babel-plugin-imported-helpers',
-    './build-system/babel-plugins/babel-plugin-transform-inline-isenumvalue',
-    './build-system/babel-plugins/babel-plugin-transform-fix-leading-comments',
-    './build-system/babel-plugins/babel-plugin-transform-promise-resolve',
-    './build-system/babel-plugins/babel-plugin-dom-jsx-svg-namespace',
-    reactJsxPlugin,
-    argv.esm || argv.sxg
-      ? './build-system/babel-plugins/babel-plugin-transform-dev-methods'
-      : null,
-    // TODO(alanorozco): Remove `replaceCallArguments` once serving infra is up.
-    [
-      './build-system/babel-plugins/babel-plugin-transform-log-methods',
-      {replaceCallArguments: false},
-    ],
-    './build-system/babel-plugins/babel-plugin-transform-parenthesize-expression',
-    './build-system/babel-plugins/babel-plugin-transform-json-import',
-    './build-system/babel-plugins/babel-plugin-transform-amp-extension-call',
-    './build-system/babel-plugins/babel-plugin-transform-html-template',
-    './build-system/babel-plugins/babel-plugin-transform-jss',
-    './build-system/babel-plugins/babel-plugin-transform-default-assignment',
-    replacePlugin,
-    './build-system/babel-plugins/babel-plugin-transform-amp-asserts',
-    // TODO(erwinm, #28698): fix this in fixit week
-    // argv.esm
-    //? './build-system/babel-plugins/babel-plugin-transform-function-declarations'
-    //: null,
-    !isCheckTypes &&
-      './build-system/babel-plugins/babel-plugin-transform-json-configuration',
-    isProd && [
-      './build-system/babel-plugins/babel-plugin-amp-mode-transformer',
-      BUILD_CONSTANTS,
-    ],
-  ].filter(Boolean);
-  const presetEnv = [
-    '@babel/preset-env',
-    {
-      bugfixes: true,
-      modules: false,
-      targets: {esmodules: true},
-    },
-  ];
-  const preClosurePresets = argv.esm || argv.sxg ? [presetEnv] : [];
-  const preClosureConfig = {
-    compact: false,
-    plugins: preClosurePlugins,
-    presets: preClosurePresets,
-    retainLines: true,
-    sourceMaps: true,
-  };
-  return preClosureConfig;
-}
-
-module.exports = {
-  getPreClosureConfig,
-};
diff --git a/build-system/babel-config/react-config.js b/build-system/babel-config/react-config.js
new file mode 100644
index 000000000000..c722cc2454e0
--- /dev/null
+++ b/build-system/babel-config/react-config.js
@@ -0,0 +1,43 @@
+'use strict';
+
+const path = require('path');
+const {getMinifiedConfig} = require('./minified-config');
+const {getUnminifiedConfig} = require('./unminified-config');
+
+/**
+ * @param {!Object} config
+ * @return {object}
+ */
+function mergeReactBabelConfig(config) {
+  const rootDir = path.join(__dirname, '../../');
+  return {
+    ...config,
+    plugins: [
+      path.join(
+        rootDir,
+        './build-system/babel-plugins/babel-plugin-react-style-props'
+      ),
+      ...(config.plugins || []),
+    ],
+  };
+}
+
+/**
+ * @return {!Object}
+ */
+function getReactUnminifiedConfig() {
+  return mergeReactBabelConfig(getUnminifiedConfig('react'));
+}
+
+/**
+ * @return {!Object}
+ */
+function getReactMinifiedConfig() {
+  return mergeReactBabelConfig(getMinifiedConfig('react'));
+}
+
+module.exports = {
+  getReactMinifiedConfig,
+  getReactUnminifiedConfig,
+  mergeReactBabelConfig,
+};
diff --git a/build-system/babel-config/test-config.js b/build-system/babel-config/test-config.js
index 9f42956bd5ae..439dc4921652 100644
--- a/build-system/babel-config/test-config.js
+++ b/build-system/babel-config/test-config.js
@@ -38,30 +38,43 @@ function getTestConfig() {
       modules: 'commonjs',
       loose: true,
       targets: {'browsers': ['Last 2 versions']},
+      shippedProposals: true,
     },
   ];
+  const presetTypescript = [
+    '@babel/preset-typescript',
+    {jsxPragma: 'Preact', jsxPragmaFrag: 'Preact.Fragment'},
+  ];
   const replacePlugin = getReplacePlugin();
   const replaceGlobalsPlugin = getReplaceGlobalsPlugin();
   const testPlugins = [
     getImportResolverPlugin(),
     argv.coverage ? instanbulPlugin : null,
+    './build-system/babel-plugins/babel-plugin-amp-story-supported-languages',
     replacePlugin,
     replaceGlobalsPlugin,
+    './build-system/babel-plugins/babel-plugin-jsx-style-object',
+    './build-system/babel-plugins/babel-plugin-mangle-object-values',
     './build-system/babel-plugins/babel-plugin-imported-helpers',
     './build-system/babel-plugins/babel-plugin-transform-json-import',
     './build-system/babel-plugins/babel-plugin-transform-json-configuration',
     './build-system/babel-plugins/babel-plugin-transform-jss',
     './build-system/babel-plugins/babel-plugin-transform-promise-resolve',
-    '@babel/plugin-transform-classes',
     './build-system/babel-plugins/babel-plugin-dom-jsx-svg-namespace',
     reactJsxPlugin,
   ].filter(Boolean);
-  const testPresets = [presetEnv];
+  const testPresets = [presetTypescript, presetEnv];
   return {
     compact: false,
     plugins: testPlugins,
     presets: testPresets,
     sourceMaps: 'inline',
+    assumptions: {
+      constantSuper: true,
+      noClassCalls: true,
+      setClassMethods: true,
+      setPublicClassFields: true,
+    },
   };
 }
 
diff --git a/build-system/babel-config/unminified-config.js b/build-system/babel-config/unminified-config.js
index 38bea6abcfb3..e763b5bc6ebf 100644
--- a/build-system/babel-config/unminified-config.js
+++ b/build-system/babel-config/unminified-config.js
@@ -7,9 +7,13 @@ const {getReplacePlugin} = require('./helpers');
 /**
  * Gets the config for babel transforms run during `amp build`.
  *
+ * @param {'preact' | 'react'} buildFor
+ * @param {!Object=} opt_replacePluginOverrides
  * @return {!Object}
  */
-function getUnminifiedConfig() {
+function getUnminifiedConfig(buildFor = 'preact', opt_replacePluginOverrides) {
+  const isEsmBuild = argv.esm || argv.sxg;
+
   const reactJsxPlugin = [
     '@babel/plugin-transform-react-jsx',
     {
@@ -19,21 +23,27 @@ function getUnminifiedConfig() {
     },
   ];
 
-  const targets =
-    argv.esm || argv.sxg ? {esmodules: true} : {browsers: ['Last 2 versions']};
   const presetEnv = [
     '@babel/preset-env',
     {
       bugfixes: true,
       modules: false,
       loose: true,
-      targets,
+      targets: isEsmBuild ? {esmodules: true} : {browsers: ['Last 2 versions']},
+      shippedProposals: true,
+      exclude: isEsmBuild ? ['@babel/plugin-transform-for-of'] : [],
     },
   ];
-  const replacePlugin = getReplacePlugin();
+  const presetTypescript = [
+    '@babel/preset-typescript',
+    {jsxPragma: 'Preact', jsxPragmaFrag: 'Preact.Fragment'},
+  ];
+  const replacePlugin = getReplacePlugin(opt_replacePluginOverrides);
   const unminifiedPlugins = [
-    getImportResolverPlugin(),
+    './build-system/babel-plugins/babel-plugin-jsx-style-object',
+    getImportResolverPlugin(buildFor),
     argv.coverage ? 'babel-plugin-istanbul' : null,
+    './build-system/babel-plugins/babel-plugin-amp-story-supported-languages',
     replacePlugin,
     './build-system/babel-plugins/babel-plugin-transform-json-import',
     './build-system/babel-plugins/babel-plugin-transform-json-configuration',
@@ -41,20 +51,20 @@ function getUnminifiedConfig() {
     './build-system/babel-plugins/babel-plugin-transform-fix-leading-comments',
     './build-system/babel-plugins/babel-plugin-transform-promise-resolve',
     './build-system/babel-plugins/babel-plugin-transform-amp-extension-call',
-    '@babel/plugin-transform-classes',
     './build-system/babel-plugins/babel-plugin-dom-jsx-svg-namespace',
     reactJsxPlugin,
   ].filter(Boolean);
-  const unminifiedPresets = [presetEnv];
+  const unminifiedPresets = [presetTypescript, presetEnv];
   return {
     compact: false,
     plugins: unminifiedPlugins,
     presets: unminifiedPresets,
-    sourceMaps: 'inline',
+    sourceMaps: true,
     assumptions: {
       constantSuper: true,
       noClassCalls: true,
       setClassMethods: true,
+      setPublicClassFields: true,
     },
   };
 }
diff --git a/build-system/babel-config/unminified-ssr-css-config.js b/build-system/babel-config/unminified-ssr-css-config.js
new file mode 100644
index 000000000000..f06995b2207d
--- /dev/null
+++ b/build-system/babel-config/unminified-ssr-css-config.js
@@ -0,0 +1,17 @@
+'use strict';
+
+const {getUnminifiedConfig} = require('./unminified-config');
+
+/**
+ * Gets the config for babel transforms run during `amp build` with `IS_SSR`
+ * set to true.
+ *
+ * @return {!Object}
+ */
+function getUnminifiedSsrCssConfig() {
+  return getUnminifiedConfig('preact', {IS_SSR_CSS: true});
+}
+
+module.exports = {
+  getUnminifiedSsrCssConfig,
+};
diff --git a/build-system/babel-plugins/OWNERS b/build-system/babel-plugins/OWNERS
index eeccea4248aa..8bd1335073dc 100644
--- a/build-system/babel-plugins/OWNERS
+++ b/build-system/babel-plugins/OWNERS
@@ -8,7 +8,6 @@
         {name: 'ampproject/wg-infra'},
         {name: 'ampproject/wg-performance'},
         {name: 'erwinmombay', notify: true},
-        {name: 'jridgewell', notify: true},
       ],
     },
   ],
diff --git a/build-system/babel-plugins/babel-plugin-amp-config-urls/index.js b/build-system/babel-plugins/babel-plugin-amp-config-urls/index.js
new file mode 100644
index 000000000000..52f482d6ab12
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-amp-config-urls/index.js
@@ -0,0 +1,67 @@
+/**
+ * @fileoverview
+ * Replaces imports of `src/config/urls` into references to self.AMP.config.urls
+ * This allows us to re-use the value defined by the runtime in extensions.
+ * Binaries that don't depend on the runtime should not use this transform, so
+ * that they can directly use the values from `src/config/urls`.
+ */
+const {dirname, join, posix, relative, sep} = require('path');
+
+const importSource = join(process.cwd(), 'src', 'config', 'urls');
+const reference = 'self.AMP.config.urls';
+
+/**
+ * @param {string} fromFilename
+ * @param {string} toModule
+ * @return {string}
+ */
+function relativeModule(fromFilename, toModule) {
+  const resolved = relative(dirname(fromFilename), toModule);
+  const resolvedPosix = resolved.split(sep).join(posix.sep);
+  return resolvedPosix.startsWith('.') ? resolvedPosix : `./${resolvedPosix}`;
+}
+
+/**
+ * @param {import('@babel/core')} babel
+ * @return {import('@babel/core').PluginObj}
+ */
+module.exports = function (babel) {
+  let importSourceRelative;
+  const {template, types: t} = babel;
+  const buildNamespace = template.statement(
+    `const name = /* #__PURE__ */ (() => ${reference})()`,
+    {preserveComments: true, placeholderPattern: /^name$/}
+  );
+  return {
+    name: 'amp-config-urls',
+    visitor: {
+      Program: {
+        enter(_, state) {
+          const {filename} = state;
+          if (!filename) {
+            throw new Error(
+              'babel-plugin-amp-config-urls must be called with a filename'
+            );
+          }
+          importSourceRelative = relativeModule(filename, importSource);
+        },
+      },
+      ImportDeclaration(path) {
+        const {source} = path.node;
+        if (!t.isStringLiteral(source, {value: importSourceRelative})) {
+          return;
+        }
+        for (const specifier of path.get('specifiers')) {
+          if (!specifier.isImportNamespaceSpecifier()) {
+            throw specifier.buildCodeFrameError(
+              `Unresolvable specifier. You must import \`urls\` as a namespace:\n` +
+                `\`import * as urls from '${source.value}';\``
+            );
+          }
+          const {name} = specifier.node.local;
+          path.replaceWith(buildNamespace({name}));
+        }
+      },
+    },
+  };
+};
diff --git a/build-system/babel-plugins/babel-plugin-amp-config-urls/test/fixtures/transform/error-default-import/input.mjs b/build-system/babel-plugins/babel-plugin-amp-config-urls/test/fixtures/transform/error-default-import/input.mjs
new file mode 100644
index 000000000000..a9c30acc1622
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-amp-config-urls/test/fixtures/transform/error-default-import/input.mjs
@@ -0,0 +1 @@
+import urls from '../../../../../../../src/config/urls';
diff --git a/build-system/babel-plugins/babel-plugin-amp-config-urls/test/fixtures/transform/error-default-import/options.json b/build-system/babel-plugins/babel-plugin-amp-config-urls/test/fixtures/transform/error-default-import/options.json
new file mode 100644
index 000000000000..0cdb369f01da
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-amp-config-urls/test/fixtures/transform/error-default-import/options.json
@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    "../../../.."
+  ],
+  "throws": "Unresolvable specifier. You must import `urls` as a namespace:\n`import * as urls from '../../../../../../../src/config/urls';`"
+}
diff --git a/build-system/babel-plugins/babel-plugin-amp-config-urls/test/fixtures/transform/error-named-import/input.mjs b/build-system/babel-plugins/babel-plugin-amp-config-urls/test/fixtures/transform/error-named-import/input.mjs
new file mode 100644
index 000000000000..366039f5536a
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-amp-config-urls/test/fixtures/transform/error-named-import/input.mjs
@@ -0,0 +1 @@
+import {named, foo as bar} from '../../../../../../../src/config/urls';
diff --git a/build-system/babel-plugins/babel-plugin-amp-config-urls/test/fixtures/transform/error-named-import/options.json b/build-system/babel-plugins/babel-plugin-amp-config-urls/test/fixtures/transform/error-named-import/options.json
new file mode 100644
index 000000000000..0cdb369f01da
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-amp-config-urls/test/fixtures/transform/error-named-import/options.json
@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    "../../../.."
+  ],
+  "throws": "Unresolvable specifier. You must import `urls` as a namespace:\n`import * as urls from '../../../../../../../src/config/urls';`"
+}
diff --git a/build-system/babel-plugins/babel-plugin-amp-config-urls/test/fixtures/transform/ignored-import-source/input.mjs b/build-system/babel-plugins/babel-plugin-amp-config-urls/test/fixtures/transform/ignored-import-source/input.mjs
new file mode 100644
index 000000000000..4e5dda86a5a9
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-amp-config-urls/test/fixtures/transform/ignored-import-source/input.mjs
@@ -0,0 +1 @@
+import * as urls from 'something other than src/config/urls';
diff --git a/build-system/babel-plugins/babel-plugin-amp-config-urls/test/fixtures/transform/ignored-import-source/options.json b/build-system/babel-plugins/babel-plugin-amp-config-urls/test/fixtures/transform/ignored-import-source/options.json
new file mode 100644
index 000000000000..3ebeb6374116
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-amp-config-urls/test/fixtures/transform/ignored-import-source/options.json
@@ -0,0 +1,5 @@
+{
+  "plugins": [
+    "../../../.."
+  ]
+}
diff --git a/build-system/babel-plugins/babel-plugin-amp-config-urls/test/fixtures/transform/ignored-import-source/output.mjs b/build-system/babel-plugins/babel-plugin-amp-config-urls/test/fixtures/transform/ignored-import-source/output.mjs
new file mode 100644
index 000000000000..4e5dda86a5a9
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-amp-config-urls/test/fixtures/transform/ignored-import-source/output.mjs
@@ -0,0 +1 @@
+import * as urls from 'something other than src/config/urls';
diff --git a/build-system/babel-plugins/babel-plugin-amp-config-urls/test/fixtures/transform/transform-namespace/input.mjs b/build-system/babel-plugins/babel-plugin-amp-config-urls/test/fixtures/transform/transform-namespace/input.mjs
new file mode 100644
index 000000000000..dd2a9fb445a0
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-amp-config-urls/test/fixtures/transform/transform-namespace/input.mjs
@@ -0,0 +1 @@
+import * as urls from '../../../../../../../src/config/urls';
diff --git a/build-system/babel-plugins/babel-plugin-amp-config-urls/test/fixtures/transform/transform-namespace/options.json b/build-system/babel-plugins/babel-plugin-amp-config-urls/test/fixtures/transform/transform-namespace/options.json
new file mode 100644
index 000000000000..3ebeb6374116
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-amp-config-urls/test/fixtures/transform/transform-namespace/options.json
@@ -0,0 +1,5 @@
+{
+  "plugins": [
+    "../../../.."
+  ]
+}
diff --git a/build-system/babel-plugins/babel-plugin-amp-config-urls/test/fixtures/transform/transform-namespace/output.mjs b/build-system/babel-plugins/babel-plugin-amp-config-urls/test/fixtures/transform/transform-namespace/output.mjs
new file mode 100644
index 000000000000..4310e0c1f4d1
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-amp-config-urls/test/fixtures/transform/transform-namespace/output.mjs
@@ -0,0 +1 @@
+const urls = /* #__PURE__ */(() => self.AMP.config.urls)();
diff --git a/build-system/babel-plugins/babel-plugin-amp-config-urls/test/index.js b/build-system/babel-plugins/babel-plugin-amp-config-urls/test/index.js
new file mode 100644
index 000000000000..23251129fae9
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-amp-config-urls/test/index.js
@@ -0,0 +1,3 @@
+const runner = require('@babel/helper-plugin-test-runner').default;
+
+runner(__dirname);
diff --git a/build-system/babel-plugins/babel-plugin-amp-mode-transformer/index.js b/build-system/babel-plugins/babel-plugin-amp-mode-transformer/index.js
index 021c9787928f..d2e28cab9d72 100644
--- a/build-system/babel-plugins/babel-plugin-amp-mode-transformer/index.js
+++ b/build-system/babel-plugins/babel-plugin-amp-mode-transformer/index.js
@@ -3,7 +3,7 @@
 /**
  * Changes the values of getMode().test, getMode().localDev to false
  * and getMode().localDev to true.
- * @param {Object} babelTypes
+ * @param {object} babelTypes
  */
 const {dirname, join, relative, resolve} = require('path').posix;
 
diff --git a/build-system/babel-plugins/babel-plugin-amp-story-supported-languages/index.js b/build-system/babel-plugins/babel-plugin-amp-story-supported-languages/index.js
new file mode 100644
index 000000000000..1cea6f43e135
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-amp-story-supported-languages/index.js
@@ -0,0 +1,34 @@
+const fastGlob = require('fast-glob');
+const pathMod = require('path');
+const LOCALES_DIR = 'extensions/amp-story/1.0/_locales/*.json';
+const AMP_STORY_SUPPORTED_LANGUAGES = fastGlob.sync(LOCALES_DIR).map((x) => {
+  return pathMod.basename(x, '.json');
+});
+
+/**
+ * @fileoverview
+ * We need to ensure that the language files we request from the Google AMP
+ * cache is supported on the client before making the request. To do this
+ * we embed the supported list of language codes through this symbol
+ * replacement which can be used anywhere in the codebase.
+ */
+
+/**
+ * @interface {babel.PluginPass}
+ * @param {babel} babel
+ * @return {babel.PluginObj}
+ */
+module.exports = function ({types: t}) {
+  return {
+    name: 'amp-story-supported-languages',
+    visitor: {
+      ReferencedIdentifier(path) {
+        if (path.node.name !== 'AMP_STORY_SUPPORTED_LANGUAGES') {
+          return;
+        }
+
+        path.replaceWith(t.valueToNode(AMP_STORY_SUPPORTED_LANGUAGES));
+      },
+    },
+  };
+};
diff --git a/build-system/babel-plugins/babel-plugin-amp-story-supported-languages/test/fixtures/transform/replace/input.js b/build-system/babel-plugins/babel-plugin-amp-story-supported-languages/test/fixtures/transform/replace/input.js
new file mode 100644
index 000000000000..ebe5f3a7f2eb
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-amp-story-supported-languages/test/fixtures/transform/replace/input.js
@@ -0,0 +1,8 @@
+let AMP_STORY_SUPPORTED_LANGUAGES;
+AMP_STORY_SUPPORTED_LANGUAGES = 'test';
+
+const a = AMP_STORY_SUPPORTED_LANGUAGES;
+
+if (AMP_STORY_SUPPORTED_LANGUAGES.join(' ')) {
+  console.log(AMP_STORY_SUPPORTED_LANGUAGES);
+}
diff --git a/build-system/babel-plugins/babel-plugin-amp-story-supported-languages/test/fixtures/transform/replace/options.json b/build-system/babel-plugins/babel-plugin-amp-story-supported-languages/test/fixtures/transform/replace/options.json
new file mode 100644
index 000000000000..3ebeb6374116
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-amp-story-supported-languages/test/fixtures/transform/replace/options.json
@@ -0,0 +1,5 @@
+{
+  "plugins": [
+    "../../../.."
+  ]
+}
diff --git a/build-system/babel-plugins/babel-plugin-amp-story-supported-languages/test/fixtures/transform/replace/output.js b/build-system/babel-plugins/babel-plugin-amp-story-supported-languages/test/fixtures/transform/replace/output.js
new file mode 100644
index 000000000000..8043b39db9d8
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-amp-story-supported-languages/test/fixtures/transform/replace/output.js
@@ -0,0 +1,7 @@
+let AMP_STORY_SUPPORTED_LANGUAGES;
+AMP_STORY_SUPPORTED_LANGUAGES = 'test';
+const a = ["af", "am", "ar", "bg", "bn", "bs", "ca", "cs", "da", "de", "el", "en-GB", "en", "es-419", "es", "et", "eu", "fa", "fi", "fil", "fr", "gl", "gu", "hi", "hr", "hu", "id", "is", "it", "iw", "ja", "ka", "km", "kn", "ko", "lo", "lt", "lv", "mk", "ml", "mn", "mr", "ms", "my", "ne", "nl", "no", "pa", "pl", "pt-BR", "pt-PT", "ro", "ru", "si", "sk", "sl", "sq", "sr", "sv", "sw", "ta", "te", "th", "tr", "uk", "ur", "vi", "zh-CN", "zh-TW", "zu"];
+
+if (["af", "am", "ar", "bg", "bn", "bs", "ca", "cs", "da", "de", "el", "en-GB", "en", "es-419", "es", "et", "eu", "fa", "fi", "fil", "fr", "gl", "gu", "hi", "hr", "hu", "id", "is", "it", "iw", "ja", "ka", "km", "kn", "ko", "lo", "lt", "lv", "mk", "ml", "mn", "mr", "ms", "my", "ne", "nl", "no", "pa", "pl", "pt-BR", "pt-PT", "ro", "ru", "si", "sk", "sl", "sq", "sr", "sv", "sw", "ta", "te", "th", "tr", "uk", "ur", "vi", "zh-CN", "zh-TW", "zu"].join(' ')) {
+  console.log(["af", "am", "ar", "bg", "bn", "bs", "ca", "cs", "da", "de", "el", "en-GB", "en", "es-419", "es", "et", "eu", "fa", "fi", "fil", "fr", "gl", "gu", "hi", "hr", "hu", "id", "is", "it", "iw", "ja", "ka", "km", "kn", "ko", "lo", "lt", "lv", "mk", "ml", "mn", "mr", "ms", "my", "ne", "nl", "no", "pa", "pl", "pt-BR", "pt-PT", "ro", "ru", "si", "sk", "sl", "sq", "sr", "sv", "sw", "ta", "te", "th", "tr", "uk", "ur", "vi", "zh-CN", "zh-TW", "zu"]);
+}
diff --git a/build-system/babel-plugins/babel-plugin-amp-story-supported-languages/test/index.js b/build-system/babel-plugins/babel-plugin-amp-story-supported-languages/test/index.js
new file mode 100644
index 000000000000..23251129fae9
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-amp-story-supported-languages/test/index.js
@@ -0,0 +1,3 @@
+const runner = require('@babel/helper-plugin-test-runner').default;
+
+runner(__dirname);
diff --git a/build-system/babel-plugins/babel-plugin-deep-pure/index.js b/build-system/babel-plugins/babel-plugin-deep-pure/index.js
new file mode 100644
index 000000000000..e81ea32d2d6d
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-deep-pure/index.js
@@ -0,0 +1,89 @@
+const pureFnName = 'pure';
+const pureFnImportSourceRe = new RegExp(
+  '(^#|/)core/types/pure(\\.{js,jsx,ts,tsx})?$'
+);
+
+/**
+ * Deeply adds #__PURE__ comments to an expression passed to a function named
+ * `pure()`.
+ * @param {import('@babel/core')} babel
+ * @return {import('@babel/core').PluginObj}
+ */
+module.exports = function (babel) {
+  const {types: t} = babel;
+
+  /**
+   * @param {import('@babel/core').NodePath} path
+   * @return {boolean}
+   */
+  function referencesPureFnImport(path) {
+    if (!path.isIdentifier()) {
+      return false;
+    }
+    const binding = path.scope.getBinding(path.node.name);
+    if (!binding || binding.kind !== 'module') {
+      return false;
+    }
+    const bindingPath = binding.path;
+    const parent = bindingPath.parentPath;
+    if (
+      !parent?.isImportDeclaration() ||
+      !pureFnImportSourceRe.test(parent?.node.source.value)
+    ) {
+      return false;
+    }
+    return (
+      bindingPath.isImportSpecifier() &&
+      t.isIdentifier(bindingPath.node.imported, {name: pureFnName})
+    );
+  }
+
+  /**
+   * @param {import('@babel/core').NodePath<import('@babel/types').CallExpression>} path
+   * @return {boolean}
+   */
+  function isPureFnCallExpression(path) {
+    return (
+      path.node.arguments.length === 1 &&
+      referencesPureFnImport(path.get('callee'))
+    );
+  }
+
+  /** @param {import('@babel/core').NodePath} path */
+  function addPureComment(path) {
+    path.addComment('leading', ' #__PURE__ ');
+  }
+
+  /** @param {import('@babel/core').NodePath<import('@babel/types').CallExpression>} path */
+  function replaceWithFirstArgument(path) {
+    path.replaceWith(path.node.arguments[0]);
+  }
+
+  return {
+    name: 'deep-pure',
+    visitor: {
+      CallExpression(path) {
+        if (isPureFnCallExpression(path)) {
+          path.traverse({
+            NewExpression(path) {
+              addPureComment(path);
+            },
+            CallExpression(path) {
+              if (isPureFnCallExpression(path)) {
+                replaceWithFirstArgument(path);
+              } else {
+                addPureComment(path);
+              }
+            },
+            MemberExpression(path) {
+              throw path.buildCodeFrameError(
+                `${pureFnName}() expressions cannot contain member expressions`
+              );
+            },
+          });
+          replaceWithFirstArgument(path);
+        }
+      },
+    },
+  };
+};
diff --git a/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/error-member-expression/input.mjs b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/error-member-expression/input.mjs
new file mode 100644
index 000000000000..ed635b154ed1
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/error-member-expression/input.mjs
@@ -0,0 +1,2 @@
+import {pure} from '#core/types/pure';
+pure(error.memberExpression);
diff --git a/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/error-member-expression/options.json b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/error-member-expression/options.json
new file mode 100644
index 000000000000..90cfd0869484
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/error-member-expression/options.json
@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    "../../../.."
+  ],
+  "throws": "pure() expressions cannot contain member expressions"
+}
diff --git a/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-import-source/input.mjs b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-import-source/input.mjs
new file mode 100644
index 000000000000..88ef5e8f5e4e
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-import-source/input.mjs
@@ -0,0 +1,4 @@
+import {pure} from 'something other than core/types/pure';
+const ignored = pure(
+  foo() || new Bar() || pure(pure(foo('bar', bar(), new Baz())) || 'foo')
+);
diff --git a/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-import-source/options.json b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-import-source/options.json
new file mode 100644
index 000000000000..3ebeb6374116
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-import-source/options.json
@@ -0,0 +1,5 @@
+{
+  "plugins": [
+    "../../../.."
+  ]
+}
diff --git a/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-import-source/output.mjs b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-import-source/output.mjs
new file mode 100644
index 000000000000..2f1bf185e592
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-import-source/output.mjs
@@ -0,0 +1,2 @@
+import { pure } from 'something other than core/types/pure';
+const ignored = pure(foo() || new Bar() || pure(pure(foo('bar', bar(), new Baz())) || 'foo'));
diff --git a/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-not-import/input.mjs b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-not-import/input.mjs
new file mode 100644
index 000000000000..897e0c8c815d
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-not-import/input.mjs
@@ -0,0 +1,4 @@
+const pure = (v) => v;
+const ignored = pure(
+  foo() || new Bar() || pure(pure(foo('bar', bar(), new Baz())) || 'foo')
+);
diff --git a/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-not-import/options.json b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-not-import/options.json
new file mode 100644
index 000000000000..3ebeb6374116
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-not-import/options.json
@@ -0,0 +1,5 @@
+{
+  "plugins": [
+    "../../../.."
+  ]
+}
diff --git a/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-not-import/output.mjs b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-not-import/output.mjs
new file mode 100644
index 000000000000..195af8bae9b6
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-not-import/output.mjs
@@ -0,0 +1,3 @@
+const pure = v => v;
+
+const ignored = pure(foo() || new Bar() || pure(pure(foo('bar', bar(), new Baz())) || 'foo'));
diff --git a/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-aliased-path/input.mjs b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-aliased-path/input.mjs
new file mode 100644
index 000000000000..4cfbe91c349b
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-aliased-path/input.mjs
@@ -0,0 +1,6 @@
+import {pure} from '#core/types/pure';
+const ignored = foo();
+const a = pure(
+  foo() || new Bar() || pure(pure(foo('bar', bar(), new Baz())) || 'foo')
+);
+const b = pure('foo');
diff --git a/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-aliased-path/options.json b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-aliased-path/options.json
new file mode 100644
index 000000000000..3ebeb6374116
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-aliased-path/options.json
@@ -0,0 +1,5 @@
+{
+  "plugins": [
+    "../../../.."
+  ]
+}
diff --git a/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-aliased-path/output.mjs b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-aliased-path/output.mjs
new file mode 100644
index 000000000000..8b3ef0f0ac19
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-aliased-path/output.mjs
@@ -0,0 +1,4 @@
+import { pure } from '#core/types/pure';
+const ignored = foo();
+const a = /* #__PURE__ */foo() || /* #__PURE__ */new Bar() || /* #__PURE__ */foo('bar', /* #__PURE__ */bar(), /* #__PURE__ */new Baz()) || 'foo';
+const b = 'foo';
diff --git a/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-relative-path/input.mjs b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-relative-path/input.mjs
new file mode 100644
index 000000000000..bfe5e959b860
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-relative-path/input.mjs
@@ -0,0 +1,6 @@
+import {pure} from '../../../../../../../src/core/types/pure';
+const ignored = foo();
+const a = pure(
+  foo() || new Bar() || pure(pure(foo('bar', bar(), new Baz())) || 'foo')
+);
+const b = pure('foo');
diff --git a/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-relative-path/options.json b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-relative-path/options.json
new file mode 100644
index 000000000000..3ebeb6374116
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-relative-path/options.json
@@ -0,0 +1,5 @@
+{
+  "plugins": [
+    "../../../.."
+  ]
+}
diff --git a/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-relative-path/output.mjs b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-relative-path/output.mjs
new file mode 100644
index 000000000000..7b5127c163dc
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-relative-path/output.mjs
@@ -0,0 +1,4 @@
+import { pure } from '../../../../../../../src/core/types/pure';
+const ignored = foo();
+const a = /* #__PURE__ */foo() || /* #__PURE__ */new Bar() || /* #__PURE__ */foo('bar', /* #__PURE__ */bar(), /* #__PURE__ */new Baz()) || 'foo';
+const b = 'foo';
diff --git a/build-system/babel-plugins/babel-plugin-deep-pure/test/index.js b/build-system/babel-plugins/babel-plugin-deep-pure/test/index.js
new file mode 100644
index 000000000000..23251129fae9
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-deep-pure/test/index.js
@@ -0,0 +1,3 @@
+const runner = require('@babel/helper-plugin-test-runner').default;
+
+runner(__dirname);
diff --git a/build-system/babel-plugins/babel-plugin-imported-helpers/index.js b/build-system/babel-plugins/babel-plugin-imported-helpers/index.js
index bf53e4d93e1a..4cbca20b0c05 100644
--- a/build-system/babel-plugins/babel-plugin-imported-helpers/index.js
+++ b/build-system/babel-plugins/babel-plugin-imported-helpers/index.js
@@ -19,7 +19,7 @@ const helperMap = {
  * Cache of identifiers to each helper's ImportDeclaration, per file.
  * @const {!WeakMap<
  *   import('@babel/core').BabelFileResult,
- *   Object<string, import('@babel/core').types.Identifier>
+ *   {[key: string]: import('@babel/core').types.Identifier}
  * >}
  */
 const importNamesPerFile = new WeakMap();
diff --git a/build-system/babel-plugins/babel-plugin-jsx-style-object/index.js b/build-system/babel-plugins/babel-plugin-jsx-style-object/index.js
new file mode 100644
index 000000000000..85cda949e591
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-jsx-style-object/index.js
@@ -0,0 +1,195 @@
+/**
+ * @fileoverview
+ * Converts Object Expression syntax in `style={{foo: 'bar'}}` to a concatenated
+ * string expression.
+ *
+ * This only transforms a file if it imports the `baseModule` for JSX below,
+ * which lacks runtime support for converting the Object into a string.
+ * This transform takes that responsibility instead.
+ */
+
+const {addNamed} = require('@babel/helper-module-imports');
+
+const baseModule = 'core/dom/jsx';
+const helperModule = '#core/dom/jsx/style-property-string';
+const helperFnName = 'jsxStylePropertyString';
+
+// All values from here, converted to dash-case:
+// https://github.com/facebook/react/blob/a7c5726/packages/react-dom/src/shared/CSSProperty.js
+const nonDimensional = new Set([
+  'animation-iteration-count',
+  'aspect-ratio',
+  'border-image-outset',
+  'border-image-slice',
+  'border-image-width',
+  'box-flex',
+  'box-flex-group',
+  'box-ordinal-group',
+  'column-count',
+  'columns',
+  'flex',
+  'flex-grow',
+  'flex-positive',
+  'flex-shrink',
+  'flex-negative',
+  'flex-order',
+  'grid-area',
+  'grid-row',
+  'grid-row-end',
+  'grid-row-span',
+  'grid-row-start',
+  'grid-column',
+  'grid-column-end',
+  'grid-column-span',
+  'grid-column-start',
+  'font-weight',
+  'line-clamp',
+  'line-height',
+  'opacity',
+  'order',
+  'orphans',
+  'tab-size',
+  'widows',
+  'z-index',
+  'zoom',
+
+  // SVG-related properties
+  'fill-opacity',
+  'flood-opacity',
+  'stop-opacity',
+  'stroke-dasharray',
+  'stroke-dashoffset',
+  'stroke-miterlimit',
+  'stroke-opacity',
+  'stroke-width',
+]);
+
+module.exports = function (babel) {
+  const {types: t} = babel;
+
+  const dashCase = (camelCase) =>
+    camelCase.replace(/[A-Z]/g, '-$&').toLowerCase();
+
+  let hasBaseModule = false;
+
+  /**
+   * @param {babel.NodePath<babel.types.ObjectProperty>} path
+   * @return {?babel.Node}
+   */
+  function transformProp(path) {
+    // @ts-ignore
+    const name = path.node.key.name || path.node.key.value;
+    const cssName = dashCase(name);
+    const isDimensional = !nonDimensional.has(cssName);
+    const value = path.get('value');
+    const evaluated = value.evaluate();
+
+    // If we can evaluate the value, return a composed string.
+    if (evaluated.confident) {
+      const {value} = evaluated;
+      if (value == null || value === '') {
+        return null;
+      }
+      const withUnit =
+        isDimensional && typeof value === 'number' ? `${value}px` : value;
+      return t.stringLiteral(`${cssName}:${withUnit};`);
+    }
+
+    // Otherwise call the helper function to evaluate nullish and dimensional values.
+    const helperFn = addNamed(path, helperFnName, helperModule);
+    const args = [t.stringLiteral(cssName), value.node];
+    if (isDimensional) {
+      args.push(t.booleanLiteral(true));
+    }
+    return t.callExpression(helperFn, args);
+  }
+
+  /**
+   * @param {(babel.Node|null)[]} props
+   * @return {?babel.Node}
+   */
+  function mergeBinaryConcat(props) {
+    let expr = null;
+    while (props.length) {
+      const part = props.shift();
+      if (part) {
+        if (!expr) {
+          expr = part;
+        } else {
+          expr = t.binaryExpression('+', expr, part);
+        }
+      }
+    }
+    return expr;
+  }
+
+  /** @param {babel.NodePath} path */
+  function replaceExpression(path) {
+    if (path.isLogicalExpression()) {
+      if (
+        path.node.operator === '&&' ||
+        path.node.operator === '||' ||
+        path.node.operator === '??'
+      ) {
+        replaceExpression(path.get('right'));
+      }
+      return;
+    }
+    if (path.isConditionalExpression()) {
+      replaceExpression(path.get('consequent'));
+      replaceExpression(path.get('alternate'));
+      return;
+    }
+    if (!path.isObjectExpression()) {
+      return;
+    }
+    path = /** @type {babel.NodePath<babel.types.ObjectExpression>} */ (path);
+    // @ts-ignore - expects NodePath|NodePath[] but it's always NodePath[]
+    const props = path.get('properties').map((prop) => {
+      if (prop.isSpreadElement()) {
+        throw prop.buildCodeFrameError(
+          'You should not use spread properties in style object expressions.'
+        );
+      }
+      if (prop.node.computed) {
+        throw prop
+          .get('key')
+          .buildCodeFrameError(
+            'You should not use computed props in style object expressions. Instead, use multiple properties directly. They can be "null" when unwanted.'
+          );
+      }
+      return transformProp(prop);
+    });
+    const merged = mergeBinaryConcat(props);
+    path.replaceWith(merged || t.stringLiteral(''));
+  }
+
+  return {
+    name: 'jsx-style-object',
+    visitor: {
+      Program: {
+        enter(path) {
+          hasBaseModule = false;
+          path.traverse({
+            ImportDeclaration(path) {
+              if (path.node.source.value.endsWith(baseModule)) {
+                hasBaseModule = true;
+                path.stop();
+              }
+            },
+          });
+        },
+      },
+      JSXAttribute(path) {
+        if (!hasBaseModule) {
+          return;
+        }
+        if (!t.isJSXIdentifier(path.node.name, {name: 'style'})) {
+          return;
+        }
+        const expression = path.get('value.expression');
+        replaceExpression(expression);
+      },
+    },
+  };
+};
diff --git a/build-system/babel-plugins/babel-plugin-jsx-style-object/test/fixtures/transform/dimensional/input.mjs b/build-system/babel-plugins/babel-plugin-jsx-style-object/test/fixtures/transform/dimensional/input.mjs
new file mode 100644
index 000000000000..7152cb70656b
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-jsx-style-object/test/fixtures/transform/dimensional/input.mjs
@@ -0,0 +1,94 @@
+import * as jsx from 'ANYWHERE_LEADING_TO/core/dom/jsx';
+
+const dimensional = () => <div style={{width: 100, height}} />;
+
+const nonDimensional = () => (
+  <div>
+    <div style={{animationIterationCount}} />
+    <div style={{'animation-iteration-count': 5}} />
+    <div style={{aspectRatio}} />
+    <div style={{'aspect-ratio': 1.5}} />
+    <div style={{borderImageOutset}} />
+    <div style={{'border-image-outset': 2}} />
+    <div style={{borderImageSlice}} />
+    <div style={{'border-image-slice': 8}} />
+    <div style={{borderImageWidth}} />
+    <div style={{'border-image-width': 7}} />
+    <div style={{boxFlex}} />
+    <div style={{'box-flex': 4}} />
+    <div style={{boxFlexGroup}} />
+    <div style={{'box-flex-group': 6}} />
+    <div style={{boxOrdinalGroup}} />
+    <div style={{'box-ordinal-group': 8}} />
+    <div style={{columnCount}} />
+    <div style={{'column-count': 6}} />
+    <div style={{columns}} />
+    <div style={{'columns': 7}} />
+    <div style={{flex}} />
+    <div style={{'flex': 5}} />
+    <div style={{flexGrow}} />
+    <div style={{'flex-grow': 1}} />
+    <div style={{flexPositive}} />
+    <div style={{'flex-positive': 5}} />
+    <div style={{flexShrink}} />
+    <div style={{'flex-shrink': 6}} />
+    <div style={{flexNegative}} />
+    <div style={{'flex-negative': 3}} />
+    <div style={{flexOrder}} />
+    <div style={{'flex-order': 9}} />
+    <div style={{gridArea}} />
+    <div style={{'grid-area': 3}} />
+    <div style={{gridRow}} />
+    <div style={{'grid-row': 10}} />
+    <div style={{gridRowEnd}} />
+    <div style={{'grid-row-end': 3}} />
+    <div style={{gridRowSpan}} />
+    <div style={{'grid-row-span': 5}} />
+    <div style={{gridRowStart}} />
+    <div style={{'grid-row-start': 5}} />
+    <div style={{gridColumn}} />
+    <div style={{'grid-column': 5}} />
+    <div style={{gridColumnEnd}} />
+    <div style={{'grid-column-end': 2}} />
+    <div style={{gridColumnSpan}} />
+    <div style={{'grid-column-span': 9}} />
+    <div style={{gridColumnStart}} />
+    <div style={{'grid-column-start': 4}} />
+    <div style={{fontWeight}} />
+    <div style={{'font-weight': 1}} />
+    <div style={{lineClamp}} />
+    <div style={{'line-clamp': 6}} />
+    <div style={{lineHeight}} />
+    <div style={{'line-height': 1.5}} />
+    <div style={{opacity}} />
+    <div style={{'opacity': 0.2}} />
+    <div style={{order}} />
+    <div style={{'order': 0}} />
+    <div style={{orphans}} />
+    <div style={{'orphans': 0}} />
+    <div style={{tabSize}} />
+    <div style={{'tab-size': 4}} />
+    <div style={{widows}} />
+    <div style={{'widows': 1}} />
+    <div style={{zIndex}} />
+    <div style={{'z-index': 2}} />
+    <div style={{zoom}} />
+    <div style={{'zoom': 8}} />
+    <div style={{fillOpacity}} />
+    <div style={{'fill-opacity': 3}} />
+    <div style={{floodOpacity}} />
+    <div style={{'flood-opacity': 0.5}} />
+    <div style={{stopOpacity}} />
+    <div style={{'stop-opacity': 0.75}} />
+    <div style={{strokeDasharray}} />
+    <div style={{'stroke-dasharray': 10}} />
+    <div style={{strokeDashoffset}} />
+    <div style={{'stroke-dashoffset': 10}} />
+    <div style={{strokeMiterlimit}} />
+    <div style={{'stroke-miterlimit': 8}} />
+    <div style={{strokeOpacity}} />
+    <div style={{'stroke-opacity': 0.9}} />
+    <div style={{strokeWidth}} />
+    <div style={{'stroke-width': 8}} />
+  </div>
+);
diff --git a/build-system/babel-plugins/babel-plugin-jsx-style-object/test/fixtures/transform/dimensional/options.json b/build-system/babel-plugins/babel-plugin-jsx-style-object/test/fixtures/transform/dimensional/options.json
new file mode 100644
index 000000000000..4bbe336b0476
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-jsx-style-object/test/fixtures/transform/dimensional/options.json
@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    "../../../..",
+    "@babel/plugin-syntax-jsx"
+  ]
+}
diff --git a/build-system/babel-plugins/babel-plugin-jsx-style-object/test/fixtures/transform/dimensional/output.mjs b/build-system/babel-plugins/babel-plugin-jsx-style-object/test/fixtures/transform/dimensional/output.mjs
new file mode 100644
index 000000000000..7f891887d13b
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-jsx-style-object/test/fixtures/transform/dimensional/output.mjs
@@ -0,0 +1,136 @@
+import { jsxStylePropertyString as _jsxStylePropertyString44 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString43 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString42 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString41 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString40 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString39 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString38 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString37 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString36 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString35 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString34 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString33 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString32 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString31 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString30 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString29 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString28 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString27 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString26 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString25 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString24 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString23 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString22 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString21 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString20 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString19 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString18 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString17 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString16 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString15 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString14 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString13 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString12 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString11 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString10 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString9 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString8 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString7 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString6 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString5 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString4 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString3 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString2 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString } from "#core/dom/jsx/style-property-string";
+import * as jsx from 'ANYWHERE_LEADING_TO/core/dom/jsx';
+
+const dimensional = () => <div style={"width:100px;" + _jsxStylePropertyString("height", height, true)} />;
+
+const nonDimensional = () => <div>
+    <div style={_jsxStylePropertyString2("animation-iteration-count", animationIterationCount)} />
+    <div style={"animation-iteration-count:5;"} />
+    <div style={_jsxStylePropertyString3("aspect-ratio", aspectRatio)} />
+    <div style={"aspect-ratio:1.5;"} />
+    <div style={_jsxStylePropertyString4("border-image-outset", borderImageOutset)} />
+    <div style={"border-image-outset:2;"} />
+    <div style={_jsxStylePropertyString5("border-image-slice", borderImageSlice)} />
+    <div style={"border-image-slice:8;"} />
+    <div style={_jsxStylePropertyString6("border-image-width", borderImageWidth)} />
+    <div style={"border-image-width:7;"} />
+    <div style={_jsxStylePropertyString7("box-flex", boxFlex)} />
+    <div style={"box-flex:4;"} />
+    <div style={_jsxStylePropertyString8("box-flex-group", boxFlexGroup)} />
+    <div style={"box-flex-group:6;"} />
+    <div style={_jsxStylePropertyString9("box-ordinal-group", boxOrdinalGroup)} />
+    <div style={"box-ordinal-group:8;"} />
+    <div style={_jsxStylePropertyString10("column-count", columnCount)} />
+    <div style={"column-count:6;"} />
+    <div style={_jsxStylePropertyString11("columns", columns)} />
+    <div style={"columns:7;"} />
+    <div style={_jsxStylePropertyString12("flex", flex)} />
+    <div style={"flex:5;"} />
+    <div style={_jsxStylePropertyString13("flex-grow", flexGrow)} />
+    <div style={"flex-grow:1;"} />
+    <div style={_jsxStylePropertyString14("flex-positive", flexPositive)} />
+    <div style={"flex-positive:5;"} />
+    <div style={_jsxStylePropertyString15("flex-shrink", flexShrink)} />
+    <div style={"flex-shrink:6;"} />
+    <div style={_jsxStylePropertyString16("flex-negative", flexNegative)} />
+    <div style={"flex-negative:3;"} />
+    <div style={_jsxStylePropertyString17("flex-order", flexOrder)} />
+    <div style={"flex-order:9;"} />
+    <div style={_jsxStylePropertyString18("grid-area", gridArea)} />
+    <div style={"grid-area:3;"} />
+    <div style={_jsxStylePropertyString19("grid-row", gridRow)} />
+    <div style={"grid-row:10;"} />
+    <div style={_jsxStylePropertyString20("grid-row-end", gridRowEnd)} />
+    <div style={"grid-row-end:3;"} />
+    <div style={_jsxStylePropertyString21("grid-row-span", gridRowSpan)} />
+    <div style={"grid-row-span:5;"} />
+    <div style={_jsxStylePropertyString22("grid-row-start", gridRowStart)} />
+    <div style={"grid-row-start:5;"} />
+    <div style={_jsxStylePropertyString23("grid-column", gridColumn)} />
+    <div style={"grid-column:5;"} />
+    <div style={_jsxStylePropertyString24("grid-column-end", gridColumnEnd)} />
+    <div style={"grid-column-end:2;"} />
+    <div style={_jsxStylePropertyString25("grid-column-span", gridColumnSpan)} />
+    <div style={"grid-column-span:9;"} />
+    <div style={_jsxStylePropertyString26("grid-column-start", gridColumnStart)} />
+    <div style={"grid-column-start:4;"} />
+    <div style={_jsxStylePropertyString27("font-weight", fontWeight)} />
+    <div style={"font-weight:1;"} />
+    <div style={_jsxStylePropertyString28("line-clamp", lineClamp)} />
+    <div style={"line-clamp:6;"} />
+    <div style={_jsxStylePropertyString29("line-height", lineHeight)} />
+    <div style={"line-height:1.5;"} />
+    <div style={_jsxStylePropertyString30("opacity", opacity)} />
+    <div style={"opacity:0.2;"} />
+    <div style={_jsxStylePropertyString31("order", order)} />
+    <div style={"order:0;"} />
+    <div style={_jsxStylePropertyString32("orphans", orphans)} />
+    <div style={"orphans:0;"} />
+    <div style={_jsxStylePropertyString33("tab-size", tabSize)} />
+    <div style={"tab-size:4;"} />
+    <div style={_jsxStylePropertyString34("widows", widows)} />
+    <div style={"widows:1;"} />
+    <div style={_jsxStylePropertyString35("z-index", zIndex)} />
+    <div style={"z-index:2;"} />
+    <div style={_jsxStylePropertyString36("zoom", zoom)} />
+    <div style={"zoom:8;"} />
+    <div style={_jsxStylePropertyString37("fill-opacity", fillOpacity)} />
+    <div style={"fill-opacity:3;"} />
+    <div style={_jsxStylePropertyString38("flood-opacity", floodOpacity)} />
+    <div style={"flood-opacity:0.5;"} />
+    <div style={_jsxStylePropertyString39("stop-opacity", stopOpacity)} />
+    <div style={"stop-opacity:0.75;"} />
+    <div style={_jsxStylePropertyString40("stroke-dasharray", strokeDasharray)} />
+    <div style={"stroke-dasharray:10;"} />
+    <div style={_jsxStylePropertyString41("stroke-dashoffset", strokeDashoffset)} />
+    <div style={"stroke-dashoffset:10;"} />
+    <div style={_jsxStylePropertyString42("stroke-miterlimit", strokeMiterlimit)} />
+    <div style={"stroke-miterlimit:8;"} />
+    <div style={_jsxStylePropertyString43("stroke-opacity", strokeOpacity)} />
+    <div style={"stroke-opacity:0.9;"} />
+    <div style={_jsxStylePropertyString44("stroke-width", strokeWidth)} />
+    <div style={"stroke-width:8;"} />
+  </div>;
diff --git a/build-system/babel-plugins/babel-plugin-jsx-style-object/test/fixtures/transform/ignored/input.mjs b/build-system/babel-plugins/babel-plugin-jsx-style-object/test/fixtures/transform/ignored/input.mjs
new file mode 100644
index 000000000000..0ae71b93ede0
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-jsx-style-object/test/fixtures/transform/ignored/input.mjs
@@ -0,0 +1,11 @@
+const ignoredBecauseNamespaceIsNotImported = () => (
+  <div
+    style={{
+      color: null,
+      'background-color': red,
+      backgroundImage,
+      opacity: 0,
+      width: 100,
+    }}
+  />
+);
diff --git a/build-system/babel-plugins/babel-plugin-jsx-style-object/test/fixtures/transform/ignored/options.json b/build-system/babel-plugins/babel-plugin-jsx-style-object/test/fixtures/transform/ignored/options.json
new file mode 100644
index 000000000000..4bbe336b0476
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-jsx-style-object/test/fixtures/transform/ignored/options.json
@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    "../../../..",
+    "@babel/plugin-syntax-jsx"
+  ]
+}
diff --git a/build-system/babel-plugins/babel-plugin-jsx-style-object/test/fixtures/transform/ignored/output.mjs b/build-system/babel-plugins/babel-plugin-jsx-style-object/test/fixtures/transform/ignored/output.mjs
new file mode 100644
index 000000000000..b751701b9dc3
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-jsx-style-object/test/fixtures/transform/ignored/output.mjs
@@ -0,0 +1,7 @@
+const ignoredBecauseNamespaceIsNotImported = () => <div style={{
+  color: null,
+  'background-color': red,
+  backgroundImage,
+  opacity: 0,
+  width: 100
+}} />;
diff --git a/build-system/babel-plugins/babel-plugin-jsx-style-object/test/fixtures/transform/nested/input.mjs b/build-system/babel-plugins/babel-plugin-jsx-style-object/test/fixtures/transform/nested/input.mjs
new file mode 100644
index 000000000000..c22dfc2906d2
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-jsx-style-object/test/fixtures/transform/nested/input.mjs
@@ -0,0 +1,13 @@
+import * as jsx from 'ANYWHERE_LEADING_TO/core/dom/jsx';
+
+const logicalAnd = () => <div style={x && {background: 'red'}} />;
+
+const logicalAndDeep = () => <div style={x && foo && {color: 'red'}} />;
+
+const logicalOr = () => <div style={x || {background: 'red'}} />;
+
+const ternary = () => <div style={x ? {color: 'red'} : {background: 'red'}} />;
+
+const ternaryNested = () => (
+  <div style={x ? (y ? {color: 'red'} : null) : {background: 'red'}} />
+);
diff --git a/build-system/babel-plugins/babel-plugin-jsx-style-object/test/fixtures/transform/nested/options.json b/build-system/babel-plugins/babel-plugin-jsx-style-object/test/fixtures/transform/nested/options.json
new file mode 100644
index 000000000000..4bbe336b0476
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-jsx-style-object/test/fixtures/transform/nested/options.json
@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    "../../../..",
+    "@babel/plugin-syntax-jsx"
+  ]
+}
diff --git a/build-system/babel-plugins/babel-plugin-jsx-style-object/test/fixtures/transform/nested/output.mjs b/build-system/babel-plugins/babel-plugin-jsx-style-object/test/fixtures/transform/nested/output.mjs
new file mode 100644
index 000000000000..356b533f6558
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-jsx-style-object/test/fixtures/transform/nested/output.mjs
@@ -0,0 +1,11 @@
+import * as jsx from 'ANYWHERE_LEADING_TO/core/dom/jsx';
+
+const logicalAnd = () => <div style={x && "background:red;"} />;
+
+const logicalAndDeep = () => <div style={x && foo && "color:red;"} />;
+
+const logicalOr = () => <div style={x || "background:red;"} />;
+
+const ternary = () => <div style={x ? "color:red;" : "background:red;"} />;
+
+const ternaryNested = () => <div style={x ? y ? "color:red;" : null : "background:red;"} />;
diff --git a/build-system/babel-plugins/babel-plugin-jsx-style-object/test/fixtures/transform/transformed/input.mjs b/build-system/babel-plugins/babel-plugin-jsx-style-object/test/fixtures/transform/transformed/input.mjs
new file mode 100644
index 000000000000..92d68cf6c28e
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-jsx-style-object/test/fixtures/transform/transformed/input.mjs
@@ -0,0 +1,67 @@
+import * as jsx from 'ANYWHERE_LEADING_TO/core/dom/jsx';
+
+const randomObjectExpressionsAreUnmodified = () => ({
+  background,
+  color: null,
+});
+
+const nonObjectExpressionsAreUnmodified = () => (
+  <div>
+    <div style={foo} />
+    <div style={foo ? 'foo: bar;' : null} />
+  </div>
+);
+
+const red = 'red';
+const otherAttributesAreUnmodified = () => (
+  <div
+    foo={{
+      color: null,
+      'background-color': red,
+      backgroundImage,
+      opacity: 0,
+      width: 100,
+    }}
+  />
+);
+
+const modified = () => (
+  <div
+    style={{
+      color: null,
+      'background-color': red,
+      backgroundImage,
+      opacity: 0,
+      width: 100,
+    }}
+  />
+);
+
+const emptyStringValueIsRemoved = () => <div style={{background: ''}} />;
+
+let dynamic = 0;
+function modifyDynamicValue() {
+  dynamic = 1;
+}
+
+let backgroundColor = 'blue';
+
+const constants = () => (
+  <div
+    style={{
+      backgroundColor,
+      width: 100,
+      color: 'white',
+      opacity: dynamic,
+    }}
+  />
+);
+
+const empty = () => (
+  <div
+    style={{
+      background: '',
+      color: null,
+    }}
+  />
+);
diff --git a/build-system/babel-plugins/babel-plugin-jsx-style-object/test/fixtures/transform/transformed/options.json b/build-system/babel-plugins/babel-plugin-jsx-style-object/test/fixtures/transform/transformed/options.json
new file mode 100644
index 000000000000..4bbe336b0476
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-jsx-style-object/test/fixtures/transform/transformed/options.json
@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    "../../../..",
+    "@babel/plugin-syntax-jsx"
+  ]
+}
diff --git a/build-system/babel-plugins/babel-plugin-jsx-style-object/test/fixtures/transform/transformed/output.mjs b/build-system/babel-plugins/babel-plugin-jsx-style-object/test/fixtures/transform/transformed/output.mjs
new file mode 100644
index 000000000000..0af9fc73dbce
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-jsx-style-object/test/fixtures/transform/transformed/output.mjs
@@ -0,0 +1,39 @@
+import { jsxStylePropertyString as _jsxStylePropertyString2 } from "#core/dom/jsx/style-property-string";
+import { jsxStylePropertyString as _jsxStylePropertyString } from "#core/dom/jsx/style-property-string";
+import * as jsx from 'ANYWHERE_LEADING_TO/core/dom/jsx';
+
+const randomObjectExpressionsAreUnmodified = () => ({
+  background,
+  color: null
+});
+
+const nonObjectExpressionsAreUnmodified = () => <div>
+    <div style={foo} />
+    <div style={foo ? 'foo: bar;' : null} />
+  </div>;
+
+const red = 'red';
+
+const otherAttributesAreUnmodified = () => <div foo={{
+  color: null,
+  'background-color': red,
+  backgroundImage,
+  opacity: 0,
+  width: 100
+}} />;
+
+const modified = () => <div style={"background-color:red;" + _jsxStylePropertyString("background-image", backgroundImage, true) + "opacity:0;" + "width:100px;"} />;
+
+const emptyStringValueIsRemoved = () => <div style={""} />;
+
+let dynamic = 0;
+
+function modifyDynamicValue() {
+  dynamic = 1;
+}
+
+let backgroundColor = 'blue';
+
+const constants = () => <div style={"background-color:blue;" + "width:100px;" + "color:white;" + _jsxStylePropertyString2("opacity", dynamic)} />;
+
+const empty = () => <div style={""} />;
diff --git a/build-system/babel-plugins/babel-plugin-jsx-style-object/test/index.js b/build-system/babel-plugins/babel-plugin-jsx-style-object/test/index.js
new file mode 100644
index 000000000000..23251129fae9
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-jsx-style-object/test/index.js
@@ -0,0 +1,3 @@
+const runner = require('@babel/helper-plugin-test-runner').default;
+
+runner(__dirname);
diff --git a/build-system/babel-plugins/babel-plugin-mangle-object-values/index.js b/build-system/babel-plugins/babel-plugin-mangle-object-values/index.js
new file mode 100644
index 000000000000..e2a91b357fd5
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-mangle-object-values/index.js
@@ -0,0 +1,45 @@
+/**
+ * @fileoverview Mangles the values of an object expression into their numeric
+ * indices + 1.
+ * This is useful when defining large enums, as it allows us to use descriptive
+ * values during development, but use short mangled values during production.
+ */
+
+const fnName = 'mangleObjectValues';
+
+module.exports = function (babel) {
+  const {types: t} = babel;
+
+  return {
+    name: 'mangle-object-values',
+    visitor: {
+      CallExpression(path) {
+        const callee = path.get('callee');
+        if (!callee.isIdentifier({name: fnName})) {
+          return;
+        }
+        const {name} = callee.node.name;
+        const args = path.node.arguments;
+        if (args.length !== 1 || !t.isObjectExpression(args[0])) {
+          throw path.buildCodeFrameError(
+            `${name}() should take a single argument that's an object expression.`
+          );
+        }
+        const objectExpression = args[0];
+        const seen = {};
+        for (const [i, prop] of objectExpression.properties.entries()) {
+          if (!t.isStringLiteral(prop.value)) {
+            throw path.buildCodeFrameError(
+              `${name}() should only be used on object expressions with string values.`
+            );
+          }
+          const {value} = prop.value;
+          // Skip 0 because it's falsy
+          const mangled = (seen[value] = seen[value] || i + 1);
+          prop.value = t.valueToNode(mangled);
+        }
+        path.replaceWith(objectExpression);
+      },
+    },
+  };
+};
diff --git a/build-system/babel-plugins/babel-plugin-mangle-object-values/test/fixtures/transform/mangle/input.js b/build-system/babel-plugins/babel-plugin-mangle-object-values/test/fixtures/transform/mangle/input.js
new file mode 100644
index 000000000000..0928f9ae4a5f
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-mangle-object-values/test/fixtures/transform/mangle/input.js
@@ -0,0 +1,132 @@
+// not mangled:
+const x = {
+  foo: 'bar',
+  bar: 'qux',
+  [x]: 'y',
+};
+
+// not mangled:
+const y = notMangled({
+  foo: 'bar',
+  bar: 'qux',
+  [x]: 'y',
+});
+
+// mangled:
+const z = mangleObjectValues({
+  foo: 'bar',
+  bar: 'qux',
+  [x]: 'y',
+});
+
+// dupes:
+const a = mangleObjectValues({
+  foo: 'bar',
+  baz: 'qux',
+  // should be same as foo:
+  bar: 'bar',
+});
+
+// 100 elements:
+const b = mangleObjectValues({
+  k0: 'v_0',
+  k1: 'v_1',
+  k2: 'v_2',
+  k3: 'v_3',
+  k4: 'v_4',
+  k5: 'v_5',
+  k6: 'v_6',
+  k7: 'v_7',
+  k8: 'v_8',
+  k9: 'v_9',
+  k10: 'v_10',
+  k11: 'v_11',
+  k12: 'v_12',
+  k13: 'v_13',
+  k14: 'v_14',
+  k15: 'v_15',
+  k16: 'v_16',
+  k17: 'v_17',
+  k18: 'v_18',
+  k19: 'v_19',
+  k20: 'v_20',
+  k21: 'v_21',
+  k22: 'v_22',
+  k23: 'v_23',
+  k24: 'v_24',
+  k25: 'v_25',
+  k26: 'v_26',
+  k27: 'v_27',
+  k28: 'v_28',
+  k29: 'v_29',
+  k30: 'v_30',
+  k31: 'v_31',
+  k32: 'v_32',
+  k33: 'v_33',
+  k34: 'v_34',
+  k35: 'v_35',
+  k36: 'v_36',
+  k37: 'v_37',
+  k38: 'v_38',
+  k39: 'v_39',
+  k40: 'v_40',
+  k41: 'v_41',
+  k42: 'v_42',
+  k43: 'v_43',
+  k44: 'v_44',
+  k45: 'v_45',
+  k46: 'v_46',
+  k47: 'v_47',
+  k48: 'v_48',
+  k49: 'v_49',
+  k50: 'v_50',
+  k51: 'v_51',
+  k52: 'v_52',
+  k53: 'v_53',
+  k54: 'v_54',
+  k55: 'v_55',
+  k56: 'v_56',
+  k57: 'v_57',
+  k58: 'v_58',
+  k59: 'v_59',
+  k60: 'v_60',
+  k61: 'v_61',
+  k62: 'v_62',
+  k63: 'v_63',
+  k64: 'v_64',
+  k65: 'v_65',
+  k66: 'v_66',
+  k67: 'v_67',
+  k68: 'v_68',
+  k69: 'v_69',
+  k70: 'v_70',
+  k71: 'v_71',
+  k72: 'v_72',
+  k73: 'v_73',
+  k74: 'v_74',
+  k75: 'v_75',
+  k76: 'v_76',
+  k77: 'v_77',
+  k78: 'v_78',
+  k79: 'v_79',
+  k80: 'v_80',
+  k81: 'v_81',
+  k82: 'v_82',
+  k83: 'v_83',
+  k84: 'v_84',
+  k85: 'v_85',
+  k86: 'v_86',
+  k87: 'v_87',
+  k88: 'v_88',
+  k89: 'v_89',
+  k90: 'v_90',
+  k91: 'v_91',
+  k92: 'v_92',
+  k93: 'v_93',
+  k94: 'v_94',
+  k95: 'v_95',
+  k96: 'v_96',
+  k97: 'v_97',
+  k98: 'v_98',
+  k99: 'v_99',
+});
diff --git a/build-system/babel-plugins/babel-plugin-mangle-object-values/test/fixtures/transform/mangle/output.js b/build-system/babel-plugins/babel-plugin-mangle-object-values/test/fixtures/transform/mangle/output.js
new file mode 100644
index 000000000000..deb34a065a1e
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-mangle-object-values/test/fixtures/transform/mangle/output.js
@@ -0,0 +1,128 @@
+// not mangled:
+const x = {
+  foo: 'bar',
+  bar: 'qux',
+  [x]: 'y'
+}; // not mangled:
+
+const y = notMangled({
+  foo: 'bar',
+  bar: 'qux',
+  [x]: 'y'
+}); // mangled:
+
+const z = {
+  foo: 1,
+  bar: 2,
+  [x]: 3
+}; // dupes:
+
+const a = {
+  foo: 1,
+  baz: 2,
+  // should be same as foo:
+  bar: 1
+}; // 100 elements:
+
+const b = {
+  k0: 1,
+  k1: 2,
+  k2: 3,
+  k3: 4,
+  k4: 5,
+  k5: 6,
+  k6: 7,
+  k7: 8,
+  k8: 9,
+  k9: 10,
+  k10: 11,
+  k11: 12,
+  k12: 13,
+  k13: 14,
+  k14: 15,
+  k15: 16,
+  k16: 17,
+  k17: 18,
+  k18: 19,
+  k19: 20,
+  k20: 21,
+  k21: 22,
+  k22: 23,
+  k23: 24,
+  k24: 25,
+  k25: 26,
+  k26: 27,
+  k27: 28,
+  k28: 29,
+  k29: 30,
+  k30: 31,
+  k31: 32,
+  k32: 33,
+  k33: 34,
+  k34: 35,
+  k35: 36,
+  k36: 37,
+  k37: 38,
+  k38: 39,
+  k39: 40,
+  k40: 41,
+  k41: 42,
+  k42: 43,
+  k43: 44,
+  k44: 45,
+  k45: 46,
+  k46: 47,
+  k47: 48,
+  k48: 49,
+  k49: 50,
+  k50: 51,
+  k51: 52,
+  k52: 53,
+  k53: 54,
+  k54: 55,
+  k55: 56,
+  k56: 57,
+  k57: 58,
+  k58: 59,
+  k59: 60,
+  k60: 61,
+  k61: 62,
+  k62: 63,
+  k63: 64,
+  k64: 65,
+  k65: 66,
+  k66: 67,
+  k67: 68,
+  k68: 69,
+  k69: 70,
+  k70: 71,
+  k71: 72,
+  k72: 73,
+  k73: 74,
+  k74: 75,
+  k75: 76,
+  k76: 77,
+  k77: 78,
+  k78: 79,
+  k79: 80,
+  k80: 81,
+  k81: 82,
+  k82: 83,
+  k83: 84,
+  k84: 85,
+  k85: 86,
+  k86: 87,
+  k87: 88,
+  k88: 89,
+  k89: 90,
+  k90: 91,
+  k91: 92,
+  k92: 93,
+  k93: 94,
+  k94: 95,
+  k95: 96,
+  k96: 97,
+  k97: 98,
+  k98: 99,
+  k99: 100
+};
diff --git a/build-system/babel-plugins/babel-plugin-mangle-object-values/test/fixtures/transform/options.json b/build-system/babel-plugins/babel-plugin-mangle-object-values/test/fixtures/transform/options.json
new file mode 100644
index 000000000000..dc8441ad032a
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-mangle-object-values/test/fixtures/transform/options.json
@@ -0,0 +1,5 @@
+{
+  "plugins": [
+    "../../.."
+  ]
+}
diff --git a/build-system/babel-plugins/babel-plugin-mangle-object-values/test/index.js b/build-system/babel-plugins/babel-plugin-mangle-object-values/test/index.js
new file mode 100644
index 000000000000..23251129fae9
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-mangle-object-values/test/index.js
@@ -0,0 +1,3 @@
+const runner = require('@babel/helper-plugin-test-runner').default;
+
+runner(__dirname);
diff --git a/build-system/babel-plugins/babel-plugin-nomodule-loader/define-template.js b/build-system/babel-plugins/babel-plugin-nomodule-loader/define-template.js
new file mode 100644
index 000000000000..f38132273411
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-nomodule-loader/define-template.js
@@ -0,0 +1,60 @@
+// @ts-nocheck
+/* eslint-disable no-var */
+/* eslint-disable @typescript-eslint/no-unused-vars */
+
+/* global __MODULE_NAME__ */
+/* global __HAS_EXPORTS__ */
+/* global __IMPORT_NAMES__ */
+/* global __SINGLE_IMPORT_NO_EXPORTS__ */
+/* global __ONLY_EXPORTS__ */
+
+/**
+ * An async module loader similar to define() in AMD.
+ * Our implementation varies in that it can be compiled down to a minimal form
+ * based on the module's needs, rather than bundling a full implementation.
+ * @param {object} defineCallback
+ */
+(function defineish(defineCallback) {
+  // self.BENTO maps module names to callbacks to execute with their contents.
+  //   interface ModuleCallbacks {
+  //     [name: string]: ((Object) => void)[],
+  //   }
+  var callbacks = (self.BENTO = self.BENTO || {});
+  var exec = __HAS_EXPORTS__
+    ? function (_exports) {
+        defineCallback.apply(null, arguments);
+        var name = __MODULE_NAME__;
+        var awaiting = (callbacks[name] = callbacks[name] || []);
+        while (awaiting.length) {
+          awaiting.pop()(_exports);
+        }
+        awaiting.push = function (callback) {
+          callback(_exports);
+        };
+      }
+    : defineCallback;
+  // The most common cases are ONLY_EXPORTS and SINGLE_IMPORT_NO_EXPORTS.
+  // We provide them with single-purpose implementations whose output is
+  // significantly smaller than the worst case.
+  if (__ONLY_EXPORTS__) {
+    exec({});
+  } else if (__SINGLE_IMPORT_NO_EXPORTS__) {
+    var name = __SINGLE_IMPORT_NO_EXPORTS__;
+    (callbacks[name] = callbacks[name] || []).push(exec);
+  } else {
+    // Fallback general purpose implementation.
+    Promise.all(
+      __IMPORT_NAMES__.map(function (name) {
+        // exports is identified as the number 0
+        if (__HAS_EXPORTS__ && name === 0) {
+          return {};
+        }
+        return new Promise(function (resolve) {
+          (callbacks[name] = callbacks[name] || []).push(resolve);
+        });
+      })
+    ).then(function (modules) {
+      exec.apply(null, modules);
+    });
+  }
+})(function (__CALLBACK_ARGS__) {});
diff --git a/build-system/babel-plugins/babel-plugin-nomodule-loader/index.js b/build-system/babel-plugins/babel-plugin-nomodule-loader/index.js
new file mode 100644
index 000000000000..0e6ecf379d37
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-nomodule-loader/index.js
@@ -0,0 +1,125 @@
+/**
+ * @fileoverview
+ * Transforms ESM import statements into an async loader meant for `nomodule`
+ * builds.
+ */
+
+const {
+  buildNamespaceInitStatements,
+  ensureStatementsHoisted,
+  hasExports,
+  isModule,
+  rewriteModuleStatementsAndPrepareHeader,
+} = require('@babel/helper-module-transforms');
+const {readFileSync} = require('fs');
+const {join: pathJoin, posix, relative} = require('path');
+
+let wrapperTemplate;
+
+module.exports = function (babel) {
+  const {template, types: t} = babel;
+
+  const pathToModuleName = (filename) =>
+    filename.replace(/^(\.\/)?dist\//, '').replace(/(\.max)?\.m?js$/, '');
+
+  const resolveModuleName = (filename, source) =>
+    pathToModuleName(posix.join(posix.dirname(filename), source));
+
+  /**
+   * @param {object} replacements
+   * @return {babel.types.Statement}
+   */
+  function buildWrapper(replacements) {
+    if (!wrapperTemplate) {
+      const templateSource = readFileSync(
+        pathJoin(__dirname, 'define-template.js'),
+        'utf8'
+      );
+      wrapperTemplate = template(templateSource, {
+        placeholderPattern: /^__[A-Z0-9_]+__$/,
+      });
+    }
+    return wrapperTemplate(replacements);
+  }
+
+  /**
+   * @param {babel.NodePath<import('@babel/types').Program>} path
+   * @param {babel.types.Statement} wrapper
+   */
+  function injectWrapper(path, wrapper) {
+    const {body, directives} = path.node;
+    path.node.directives = [];
+    path.node.body = [];
+    const wrapperPath = path.pushContainer('body', wrapper)[0];
+    const callback = wrapperPath
+      .get('expression.arguments')
+      // @ts-ignore
+      .filter((arg) => arg.isFunctionExpression())[0]
+      .get('body');
+    callback.pushContainer('directives', directives);
+    callback.pushContainer('body', body);
+  }
+
+  return {
+    name: 'nomodule-loader',
+    visitor: {
+      Program: {
+        enter(path, state) {
+          // We can stop since this should be the last transform step.
+          // See nomodule-loader-config.js
+          path.stop();
+
+          if (!isModule(path)) {
+            throw new Error();
+          }
+          const loose = true;
+          const noInterop = true;
+          const {headers, meta} = rewriteModuleStatementsAndPrepareHeader(
+            path,
+            {loose, noInterop}
+          );
+
+          const filename = relative(process.cwd(), state.filename);
+          const importNames = [];
+          const callbackArgs = [];
+          const metaHasExports = hasExports(meta);
+          if (metaHasExports) {
+            // exports is identified as the number 0
+            importNames.push(t.numericLiteral(0));
+            callbackArgs.push(t.identifier(meta.exportName));
+          }
+          for (const [source, metadata] of meta.source) {
+            importNames.push(
+              t.stringLiteral(resolveModuleName(filename, source))
+            );
+            callbackArgs.push(t.identifier(metadata.name));
+            headers.push(
+              ...buildNamespaceInitStatements(meta, metadata, loose)
+            );
+          }
+          if (importNames.length < 1) {
+            return;
+          }
+          ensureStatementsHoisted(headers);
+          path.unshiftContainer('body', headers);
+          injectWrapper(
+            path,
+            buildWrapper({
+              __MODULE_NAME__: t.stringLiteral(pathToModuleName(filename)),
+              __HAS_EXPORTS__: t.booleanLiteral(metaHasExports),
+              __ONLY_EXPORTS__: t.booleanLiteral(
+                metaHasExports && importNames.length === 1
+              ),
+              __IMPORT_NAMES__: t.arrayExpression(importNames),
+              __SINGLE_IMPORT_NO_EXPORTS__:
+                importNames.length === 1 && !metaHasExports
+                  ? t.cloneNode(importNames[0])
+                  : t.nullLiteral(),
+              __CALLBACK_ARGS__: callbackArgs,
+            })
+          );
+        },
+      },
+    },
+  };
+};
diff --git a/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/export-default/input.mjs b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/export-default/input.mjs
new file mode 100644
index 000000000000..9385f7349188
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/export-default/input.mjs
@@ -0,0 +1 @@
+export default function fn() {}
diff --git a/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/export-default/options.json b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/export-default/options.json
new file mode 100644
index 000000000000..3ebeb6374116
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/export-default/options.json
@@ -0,0 +1,5 @@
+{
+  "plugins": [
+    "../../../.."
+  ]
+}
diff --git a/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/export-default/output.js b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/export-default/output.js
new file mode 100644
index 000000000000..b93af0d76598
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/export-default/output.js
@@ -0,0 +1,42 @@
+(function defineish(defineCallback) {
+  var callbacks = self.BENTO = self.BENTO || {};
+  var exec = true ? function (_exports) {
+    defineCallback.apply(null, arguments);
+    var name = "build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/export-default/input";
+    var awaiting = callbacks[name] = callbacks[name] || [];
+
+    while (awaiting.length) {
+      awaiting.pop()(_exports);
+    }
+
+    awaiting.push = function (callback) {
+      callback(_exports);
+    };
+  } : defineCallback;
+
+  if (true) {
+    exec({});
+  } else if (null) {
+    var name = null;
+    (callbacks[name] = callbacks[name] || []).push(exec);
+  } else {
+    Promise.all([0].map(function (name) {
+      if (true && name === 0) {
+        return {};
+      }
+
+      return new Promise(function (resolve) {
+        (callbacks[name] = callbacks[name] || []).push(resolve);
+      });
+    })).then(function (modules) {
+      exec.apply(null, modules);
+    });
+  }
+})(function (_exports) {
+  "use strict";
+
+  _exports.__esModule = true;
+  _exports.default = fn;
+
+  function fn() {}
+});
diff --git a/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/export-from/input.mjs b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/export-from/input.mjs
new file mode 100644
index 000000000000..2f81f2527127
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/export-from/input.mjs
@@ -0,0 +1 @@
+export {x, y, z} from './abc';
diff --git a/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/export-from/options.json b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/export-from/options.json
new file mode 100644
index 000000000000..3ebeb6374116
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/export-from/options.json
@@ -0,0 +1,5 @@
+{
+  "plugins": [
+    "../../../.."
+  ]
+}
diff --git a/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/export-from/output.js b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/export-from/output.js
new file mode 100644
index 000000000000..94dc3e894dfe
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/export-from/output.js
@@ -0,0 +1,43 @@
+(function defineish(defineCallback) {
+  var callbacks = self.BENTO = self.BENTO || {};
+  var exec = true ? function (_exports) {
+    defineCallback.apply(null, arguments);
+    var name = "build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/export-from/input";
+    var awaiting = callbacks[name] = callbacks[name] || [];
+
+    while (awaiting.length) {
+      awaiting.pop()(_exports);
+    }
+
+    awaiting.push = function (callback) {
+      callback(_exports);
+    };
+  } : defineCallback;
+
+  if (false) {
+    exec({});
+  } else if (null) {
+    var name = null;
+    (callbacks[name] = callbacks[name] || []).push(exec);
+  } else {
+    Promise.all([0, "build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/export-from/abc"].map(function (name) {
+      if (true && name === 0) {
+        return {};
+      }
+
+      return new Promise(function (resolve) {
+        (callbacks[name] = callbacks[name] || []).push(resolve);
+      });
+    })).then(function (modules) {
+      exec.apply(null, modules);
+    });
+  }
+})(function (_exports, _abc) {
+  "use strict";
+
+  _exports.__esModule = true;
+  _exports.z = _exports.y = _exports.x = void 0;
+  _exports.x = _abc.x;
+  _exports.y = _abc.y;
+  _exports.z = _abc.z;
+});
diff --git a/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/import-default/input.mjs b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/import-default/input.mjs
new file mode 100644
index 000000000000..70e7fa2cda07
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/import-default/input.mjs
@@ -0,0 +1,2 @@
+import x from 'x';
+console.log(x);
diff --git a/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/import-default/options.json b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/import-default/options.json
new file mode 100644
index 000000000000..3ebeb6374116
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/import-default/options.json
@@ -0,0 +1,5 @@
+{
+  "plugins": [
+    "../../../.."
+  ]
+}
diff --git a/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/import-default/output.js b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/import-default/output.js
new file mode 100644
index 000000000000..dfbc4e1eb1ac
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/import-default/output.js
@@ -0,0 +1,39 @@
+(function defineish(defineCallback) {
+  var callbacks = self.BENTO = self.BENTO || {};
+  var exec = false ? function (_exports) {
+    defineCallback.apply(null, arguments);
+    var name = "build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/import-default/input";
+    var awaiting = callbacks[name] = callbacks[name] || [];
+
+    while (awaiting.length) {
+      awaiting.pop()(_exports);
+    }
+
+    awaiting.push = function (callback) {
+      callback(_exports);
+    };
+  } : defineCallback;
+
+  if (false) {
+    exec({});
+  } else if ("build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/import-default/x") {
+    var name = "build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/import-default/x";
+    (callbacks[name] = callbacks[name] || []).push(exec);
+  } else {
+    Promise.all(["build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/import-default/x"].map(function (name) {
+      if (false && name === 0) {
+        return {};
+      }
+
+      return new Promise(function (resolve) {
+        (callbacks[name] = callbacks[name] || []).push(resolve);
+      });
+    })).then(function (modules) {
+      exec.apply(null, modules);
+    });
+  }
+})(function (_x) {
+  "use strict";
+
+  console.log(_x.default);
+});
diff --git a/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/imports-and-exports/input.mjs b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/imports-and-exports/input.mjs
new file mode 100644
index 000000000000..76861af0119d
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/imports-and-exports/input.mjs
@@ -0,0 +1,3 @@
+import {foo, bar} from './foo';
+
+export const baz = {foo, bar, baz: 'baz'};
diff --git a/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/imports-and-exports/options.json b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/imports-and-exports/options.json
new file mode 100644
index 000000000000..3ebeb6374116
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/imports-and-exports/options.json
@@ -0,0 +1,5 @@
+{
+  "plugins": [
+    "../../../.."
+  ]
+}
diff --git a/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/imports-and-exports/output.js b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/imports-and-exports/output.js
new file mode 100644
index 000000000000..0a95557176a9
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/imports-and-exports/output.js
@@ -0,0 +1,46 @@
+(function defineish(defineCallback) {
+  var callbacks = self.BENTO = self.BENTO || {};
+  var exec = true ? function (_exports) {
+    defineCallback.apply(null, arguments);
+    var name = "build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/imports-and-exports/input";
+    var awaiting = callbacks[name] = callbacks[name] || [];
+
+    while (awaiting.length) {
+      awaiting.pop()(_exports);
+    }
+
+    awaiting.push = function (callback) {
+      callback(_exports);
+    };
+  } : defineCallback;
+
+  if (false) {
+    exec({});
+  } else if (null) {
+    var name = null;
+    (callbacks[name] = callbacks[name] || []).push(exec);
+  } else {
+    Promise.all([0, "build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/imports-and-exports/foo"].map(function (name) {
+      if (true && name === 0) {
+        return {};
+      }
+
+      return new Promise(function (resolve) {
+        (callbacks[name] = callbacks[name] || []).push(resolve);
+      });
+    })).then(function (modules) {
+      exec.apply(null, modules);
+    });
+  }
+})(function (_exports, _foo) {
+  "use strict";
+
+  _exports.__esModule = true;
+  _exports.baz = void 0;
+  const baz = {
+    foo: _foo.foo,
+    bar: _foo.bar,
+    baz: 'baz'
+  };
+  _exports.baz = baz;
+});
diff --git a/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/no-transform/input.mjs b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/no-transform/input.mjs
new file mode 100644
index 000000000000..2d847b16e7d5
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/no-transform/input.mjs
@@ -0,0 +1 @@
+function x() {}
diff --git a/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/no-transform/options.json b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/no-transform/options.json
new file mode 100644
index 000000000000..3ebeb6374116
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/no-transform/options.json
@@ -0,0 +1,5 @@
+{
+  "plugins": [
+    "../../../.."
+  ]
+}
diff --git a/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/no-transform/output.js b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/no-transform/output.js
new file mode 100644
index 000000000000..2f817152daa8
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/no-transform/output.js
@@ -0,0 +1,3 @@
+"use strict";
+
+function x() {}
diff --git a/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/only-exports/input.mjs b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/only-exports/input.mjs
new file mode 100644
index 000000000000..eee8cd5a00a7
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/only-exports/input.mjs
@@ -0,0 +1,2 @@
+export const x = 'y';
+export function y() {}
diff --git a/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/only-exports/options.json b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/only-exports/options.json
new file mode 100644
index 000000000000..3ebeb6374116
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/only-exports/options.json
@@ -0,0 +1,5 @@
+{
+  "plugins": [
+    "../../../.."
+  ]
+}
diff --git a/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/only-exports/output.js b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/only-exports/output.js
new file mode 100644
index 000000000000..05c8140a1004
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/only-exports/output.js
@@ -0,0 +1,45 @@
+(function defineish(defineCallback) {
+  var callbacks = self.BENTO = self.BENTO || {};
+  var exec = true ? function (_exports) {
+    defineCallback.apply(null, arguments);
+    var name = "build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/only-exports/input";
+    var awaiting = callbacks[name] = callbacks[name] || [];
+
+    while (awaiting.length) {
+      awaiting.pop()(_exports);
+    }
+
+    awaiting.push = function (callback) {
+      callback(_exports);
+    };
+  } : defineCallback;
+
+  if (true) {
+    exec({});
+  } else if (null) {
+    var name = null;
+    (callbacks[name] = callbacks[name] || []).push(exec);
+  } else {
+    Promise.all([0].map(function (name) {
+      if (true && name === 0) {
+        return {};
+      }
+
+      return new Promise(function (resolve) {
+        (callbacks[name] = callbacks[name] || []).push(resolve);
+      });
+    })).then(function (modules) {
+      exec.apply(null, modules);
+    });
+  }
+})(function (_exports) {
+  "use strict";
+
+  _exports.__esModule = true;
+  _exports.y = y;
+  _exports.x = void 0;
+  const x = 'y';
+  _exports.x = x;
+
+  function y() {}
+});
diff --git a/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/single-import-name/input.mjs b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/single-import-name/input.mjs
new file mode 100644
index 000000000000..be8d6e914b2c
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/single-import-name/input.mjs
@@ -0,0 +1,3 @@
+import {foo, bar} from './foo';
+
+console.log({foo, bar});
diff --git a/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/single-import-name/options.json b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/single-import-name/options.json
new file mode 100644
index 000000000000..3ebeb6374116
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/single-import-name/options.json
@@ -0,0 +1,5 @@
+{
+  "plugins": [
+    "../../../.."
+  ]
+}
diff --git a/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/single-import-name/output.js b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/single-import-name/output.js
new file mode 100644
index 000000000000..33ec139133d7
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/single-import-name/output.js
@@ -0,0 +1,42 @@
+(function defineish(defineCallback) {
+  var callbacks = self.BENTO = self.BENTO || {};
+  var exec = false ? function (_exports) {
+    defineCallback.apply(null, arguments);
+    var name = "build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/single-import-name/input";
+    var awaiting = callbacks[name] = callbacks[name] || [];
+
+    while (awaiting.length) {
+      awaiting.pop()(_exports);
+    }
+
+    awaiting.push = function (callback) {
+      callback(_exports);
+    };
+  } : defineCallback;
+
+  if (false) {
+    exec({});
+  } else if ("build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/single-import-name/foo") {
+    var name = "build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/single-import-name/foo";
+    (callbacks[name] = callbacks[name] || []).push(exec);
+  } else {
+    Promise.all(["build-system/babel-plugins/babel-plugin-nomodule-loader/test/fixtures/transform/single-import-name/foo"].map(function (name) {
+      if (false && name === 0) {
+        return {};
+      }
+
+      return new Promise(function (resolve) {
+        (callbacks[name] = callbacks[name] || []).push(resolve);
+      });
+    })).then(function (modules) {
+      exec.apply(null, modules);
+    });
+  }
+})(function (_foo) {
+  "use strict";
+
+  console.log({
+    foo: _foo.foo,
+    bar: _foo.bar
+  });
+});
diff --git a/build-system/babel-plugins/babel-plugin-nomodule-loader/test/index.js b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/index.js
new file mode 100644
index 000000000000..23251129fae9
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-nomodule-loader/test/index.js
@@ -0,0 +1,3 @@
+const runner = require('@babel/helper-plugin-test-runner').default;
+
+runner(__dirname);
diff --git a/build-system/babel-plugins/babel-plugin-react-style-props/index.js b/build-system/babel-plugins/babel-plugin-react-style-props/index.js
new file mode 100644
index 000000000000..1c9a4cfaca85
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-react-style-props/index.js
@@ -0,0 +1,40 @@
+/**
+ * @fileoverview
+ * Transforms Preact-style props ("class") into React-style ("className")
+ */
+const {ATTRIBUTES_PREACT_TO_REACT} = require('../../common/preact-prop-names');
+
+const propNameFn = 'propName';
+
+module.exports = function (babel) {
+  const {types: t} = babel;
+
+  /**
+   * @param {string} name
+   * @return {?string}
+   */
+  function getReactStyle(name) {
+    return ATTRIBUTES_PREACT_TO_REACT[name] ?? name;
+  }
+
+  return {
+    name: 'react-style-props',
+    visitor: {
+      JSXAttribute(path) {
+        const reactStyle = getReactStyle(path.node.name.name);
+        path.node.name.name = reactStyle;
+      },
+      CallExpression(path) {
+        if (!t.isIdentifier(path.node.callee, {name: propNameFn})) {
+          return;
+        }
+        const arg = path.get('arguments.0');
+        if (!arg.isStringLiteral()) {
+          throw arg.buildCodeFrameError('Should be string literal');
+        }
+        const reactStyle = getReactStyle(arg.node.value);
+        path.replaceWith(t.stringLiteral(reactStyle));
+      },
+    },
+  };
+};
diff --git a/build-system/babel-plugins/babel-plugin-react-style-props/test/fixtures/transform/class/input.js b/build-system/babel-plugins/babel-plugin-react-style-props/test/fixtures/transform/class/input.js
new file mode 100644
index 000000000000..976ffe9574a4
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-react-style-props/test/fixtures/transform/class/input.js
@@ -0,0 +1 @@
+<div id="foo" class="foo" hidden onClick={() => {}} />;
diff --git a/build-system/babel-plugins/babel-plugin-react-style-props/test/fixtures/transform/class/options.json b/build-system/babel-plugins/babel-plugin-react-style-props/test/fixtures/transform/class/options.json
new file mode 100644
index 000000000000..58d05e6c4676
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-react-style-props/test/fixtures/transform/class/options.json
@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    "../../../..",
+    "@babel/plugin-transform-react-jsx"
+  ]
+}
diff --git a/build-system/babel-plugins/babel-plugin-react-style-props/test/fixtures/transform/class/output.js b/build-system/babel-plugins/babel-plugin-react-style-props/test/fixtures/transform/class/output.js
new file mode 100644
index 000000000000..308e1d093ab8
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-react-style-props/test/fixtures/transform/class/output.js
@@ -0,0 +1,7 @@
+/*#__PURE__*/
+React.createElement("div", {
+  id: "foo",
+  className: "foo",
+  hidden: true,
+  onClick: () => {}
+});
diff --git a/build-system/babel-plugins/babel-plugin-react-style-props/test/fixtures/transform/function/input.js b/build-system/babel-plugins/babel-plugin-react-style-props/test/fixtures/transform/function/input.js
new file mode 100644
index 000000000000..217c80371fdb
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-react-style-props/test/fixtures/transform/function/input.js
@@ -0,0 +1,2 @@
+propName('class');
+propName('foobarbaz');
diff --git a/build-system/babel-plugins/babel-plugin-react-style-props/test/fixtures/transform/function/options.json b/build-system/babel-plugins/babel-plugin-react-style-props/test/fixtures/transform/function/options.json
new file mode 100644
index 000000000000..58d05e6c4676
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-react-style-props/test/fixtures/transform/function/options.json
@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    "../../../..",
+    "@babel/plugin-transform-react-jsx"
+  ]
+}
diff --git a/build-system/babel-plugins/babel-plugin-react-style-props/test/fixtures/transform/function/output.js b/build-system/babel-plugins/babel-plugin-react-style-props/test/fixtures/transform/function/output.js
new file mode 100644
index 000000000000..08ea666858eb
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-react-style-props/test/fixtures/transform/function/output.js
@@ -0,0 +1,2 @@
+"className";
+"foobarbaz";
diff --git a/build-system/babel-plugins/babel-plugin-react-style-props/test/index.js b/build-system/babel-plugins/babel-plugin-react-style-props/test/index.js
new file mode 100644
index 000000000000..23251129fae9
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-react-style-props/test/index.js
@@ -0,0 +1,3 @@
+const runner = require('@babel/helper-plugin-test-runner').default;
+
+runner(__dirname);
diff --git a/build-system/babel-plugins/babel-plugin-transform-fix-leading-comments/test/fixtures/transform/basic/input.js b/build-system/babel-plugins/babel-plugin-transform-fix-leading-comments/test/fixtures/transform/basic/input.js
index 74998b529de9..e16787f063e6 100644
--- a/build-system/babel-plugins/babel-plugin-transform-fix-leading-comments/test/fixtures/transform/basic/input.js
+++ b/build-system/babel-plugins/babel-plugin-transform-fix-leading-comments/test/fixtures/transform/basic/input.js
@@ -1,5 +1,5 @@
 /**
- * @protected {?Object<string, !ChildDef>}
+ * @protected {?{[key: string]: !ChildDef}}
  */
 foo().bar;
 
diff --git a/build-system/babel-plugins/babel-plugin-transform-fix-leading-comments/test/fixtures/transform/basic/output.js b/build-system/babel-plugins/babel-plugin-transform-fix-leading-comments/test/fixtures/transform/basic/output.js
index 74998b529de9..e16787f063e6 100644
--- a/build-system/babel-plugins/babel-plugin-transform-fix-leading-comments/test/fixtures/transform/basic/output.js
+++ b/build-system/babel-plugins/babel-plugin-transform-fix-leading-comments/test/fixtures/transform/basic/output.js
@@ -1,5 +1,5 @@
 /**
- * @protected {?Object<string, !ChildDef>}
+ * @protected {?{[key: string]: !ChildDef}}
  */
 foo().bar;
 
diff --git a/build-system/babel-plugins/babel-plugin-transform-inline-isenumvalue/index.js b/build-system/babel-plugins/babel-plugin-transform-inline-isenumvalue/index.js
index 02cdb39c1465..6fe0aa5be473 100644
--- a/build-system/babel-plugins/babel-plugin-transform-inline-isenumvalue/index.js
+++ b/build-system/babel-plugins/babel-plugin-transform-inline-isenumvalue/index.js
@@ -165,14 +165,19 @@ module.exports = function (babel) {
       isEnumValueCache.set(evaluated.value, id);
 
       // (x) => x === 1 || x === 2 || x === 3 || ...
-      const expression = Object.values(evaluated.value)
-        .map((value) =>
-          t.binaryExpression('===', t.identifier('x'), t.valueToNode(value))
-        )
-        .reduce(
-          (a, b) => t.logicalExpression('||', a, b),
-          t.booleanLiteral(false)
-        );
+      const values = Object.values(evaluated.value);
+      const expression =
+        values.length === 0
+          ? t.booleanLiteral(false)
+          : values
+              .map((value) =>
+                t.binaryExpression(
+                  '===',
+                  t.identifier('x'),
+                  t.valueToNode(value)
+                )
+              )
+              .reduce((a, b) => t.logicalExpression('||', a, b));
       pushIntoProgramScope(
         path,
         id,
diff --git a/build-system/babel-plugins/babel-plugin-transform-inline-isenumvalue/test/fixtures/transform-assertions/isenumvalue/output.mjs b/build-system/babel-plugins/babel-plugin-transform-inline-isenumvalue/test/fixtures/transform-assertions/isenumvalue/output.mjs
index 9f125886de8c..5cd7319656f6 100644
--- a/build-system/babel-plugins/babel-plugin-transform-inline-isenumvalue/test/fixtures/transform-assertions/isenumvalue/output.mjs
+++ b/build-system/babel-plugins/babel-plugin-transform-inline-isenumvalue/test/fixtures/transform-assertions/isenumvalue/output.mjs
@@ -1,7 +1,7 @@
-const _isEnumValue_exportedEnum = x => false || x === "A" || x === "B" || x === "C",
-      _isEnumValue_enumInFile = x => false || x === 1 || x === 100 || x === 2,
-      _isEnumValue_ = x => false || x === "FOO" || x === 100 || x === 2,
-      _isEnumValue_2 = x => false || x === "single-item";
+const _isEnumValue_exportedEnum = x => x === "A" || x === "B" || x === "C",
+      _isEnumValue_enumInFile = x => x === 1 || x === 100 || x === 2,
+      _isEnumValue_ = x => x === "FOO" || x === 100 || x === 2,
+      _isEnumValue_2 = x => x === "single-item";
 
 import { exportedEnum } from './exported.mjs';
 
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/index.js b/build-system/babel-plugins/babel-plugin-transform-json-import/index.js
index 9b6725678a7e..05e4302874d0 100644
--- a/build-system/babel-plugins/babel-plugin-transform-json-import/index.js
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/index.js
@@ -1,5 +1,8 @@
-const {dirname, join, relative, resolve} = require('path');
+const json5 = require('json5');
+const {ajvCompile, transformAjvCode} = require('../../compile/json-schema');
+const {basename, dirname, join, relative, resolve} = require('path');
 const {readFileSync} = require('fs');
+const {readJson} = require('../../json-locales');
 
 /**
  * Transforms JSON imports into a `JSON.parse` call:
@@ -21,29 +24,59 @@ module.exports = function (babel) {
   const {template, types: t} = babel;
 
   /**
-   * JSON reviver that converts {"string": "foo", ...} to just "foo".
-   * This minifies the format of locale files.
-   * @param {string} _
-   * @param {*} value
-   * @return {*}
+   * @type {{
+   *  [type: string]: (
+   *    path: babel.NodePath,
+   *    jsonPath: string
+   *  ) => babel.types.Expression,
+   * }}
    */
-  function minifyLocalesJsonReviver(_, value) {
-    // Always default to original `value` since this reviver is called for any
-    // property pair, including the higher-level containing object.
-    return value?.string || value;
-  }
+  const typeAssertions = {
+    'json': (path, jsonPath) => {
+      let json;
+      try {
+        json = readJson(jsonPath);
+      } catch (e) {
+        throw path.buildCodeFrameError(
+          `could not load JSON file at '${jsonPath}'`
+        );
+      }
+      return template.expression.ast`
+        JSON.parse('${JSON.stringify(json)}')
+      `;
+    },
 
-  /**
-   * @param {string} filename
-   * @return {*}
-   */
-  function readJson(filename) {
-    // Treat files under /_locales/ specially in order to minify their format.
-    const reviver = filename.includes('/_locales/')
-      ? minifyLocalesJsonReviver
-      : undefined;
-    return JSON.parse(readFileSync(filename, 'utf8'), reviver);
-  }
+    'json-schema': (path, jsonPath) => {
+      // json5 to allow comments
+      const schema = json5.parse(readFileSync(jsonPath, 'utf8'));
+      const code = ajvCompile(schema);
+
+      const taken = new Set(Object.keys(path.scope.bindings));
+      const {name, result} = transformAjvCode(code, taken, {
+        code: false,
+        ast: true,
+      });
+
+      path.insertBefore(result?.ast?.program.body || []);
+
+      const defaultSchemaName = basename(
+        basename(jsonPath, '.json'),
+        '.schema'
+      );
+      // The generated function returns a boolean, and modifies a property of
+      // itself for errors. We wrap it to instead return an array of errors,
+      // which is empty when the input is valid.
+      return template.expression.ast`
+        (data, schemaName = ${JSON.stringify(defaultSchemaName)}) =>
+          ${name}(data, schemaName) ? [] : ${name}.errors
+      `;
+    },
+  };
+
+  const supportedAssertionsMessage = () =>
+    Object.keys(typeAssertions)
+      .map((type) => `assert {"type": "${type}"}`)
+      .join(', ');
 
   return {
     manipulateOptions(_opts, parserOpts) {
@@ -62,10 +95,15 @@ module.exports = function (babel) {
             'babel plugin transform-json-import must be called with a filename'
           );
         }
-
+        const [specifier] = specifiers;
+        if (!t.isImportDefaultSpecifier(specifier)) {
+          throw path.buildCodeFrameError(
+            `must import default from JSON: \`import name from '...'\``
+          );
+        }
         if (assertions.length !== 1) {
           throw path.buildCodeFrameError(
-            'too many import assertions, we only support `assert { "type": "json" }`'
+            `too many import assertions, we only support \`${supportedAssertionsMessage()}\``
           );
         }
         const assertion = assertions[0];
@@ -74,33 +112,26 @@ module.exports = function (babel) {
           !t.isStringLiteral(assertion.key, {value: 'type'})
         ) {
           throw path.buildCodeFrameError(
-            'unknown assertion, we only support `assert { "type": "json" }`'
+            `unknown assertion, we only support \`${supportedAssertionsMessage()}\``
           );
         }
-        if (!t.isStringLiteral(assertion.value, {value: 'json'})) {
+        const type = Object.keys(typeAssertions).find((type) =>
+          t.isStringLiteral(assertion.value, {value: type})
+        );
+        if (!type) {
           throw path.buildCodeFrameError(
-            'unknown type assertion, we only support `assert { "type": "json" }`'
+            `unknown type assertion, we only support \`${supportedAssertionsMessage()}\``
           );
         }
-
-        const specifier = specifiers[0].local;
         const jsonPath = relative(
           join(__dirname, '..', '..', '..'),
           resolve(dirname(filename), source.value)
         );
-        let json;
-        try {
-          json = readJson(jsonPath);
-        } catch (e) {
-          throw path.buildCodeFrameError(
-            `could not load JSON file at '${jsonPath}'`
-          );
-        }
-
-        path.replaceWith(
-          template.statement
-            .ast`const ${specifier} = JSON.parse('${JSON.stringify(json)}');`
-        );
+        const init = typeAssertions[type](path, jsonPath);
+        const statement = template.statement.ast`
+          const ${specifier.local} = ${init};
+        `;
+        path.replaceWith(statement);
       },
     },
   };
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/error-not-type-assertion/options.json b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/error-not-type-assertion/options.json
index ec2a32dd6f06..36795b3ac6d6 100644
--- a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/error-not-type-assertion/options.json
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/error-not-type-assertion/options.json
@@ -3,5 +3,5 @@
     "../../../.."
   ],
   "sourceType": "module",
-  "throws": "unknown assertion, we only support `assert { \"type\": \"json\" }`"
+  "throws": "unknown assertion, we only support `assert {\"type\": \"json\"}, assert {\"type\": \"json-schema\"}`"
 }
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/error-not-type-json-assertion/options.json b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/error-not-type-json-assertion/options.json
index 4e7e585dda1a..f276b4454405 100644
--- a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/error-not-type-json-assertion/options.json
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/error-not-type-json-assertion/options.json
@@ -3,5 +3,5 @@
     "../../../.."
   ],
   "sourceType": "module",
-  "throws": "unknown type assertion, we only support `assert { \"type\": \"json\" }`"
+  "throws": "unknown type assertion, we only support `assert {\"type\": \"json\"}, assert {\"type\": \"json-schema\"}`"
 }
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/error-schema-format-unsupported/format-unsupported.schema.json b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/error-schema-format-unsupported/format-unsupported.schema.json
new file mode 100644
index 000000000000..d06e50408d04
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/error-schema-format-unsupported/format-unsupported.schema.json
@@ -0,0 +1,3 @@
+{
+  "format": "int64"
+}
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/error-schema-format-unsupported/input.js b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/error-schema-format-unsupported/input.js
new file mode 100644
index 000000000000..078a2a652fec
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/error-schema-format-unsupported/input.js
@@ -0,0 +1 @@
+import validate from './format-unsupported.schema.json' assert {type: 'json-schema'};
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/error-schema-format-unsupported/options.json b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/error-schema-format-unsupported/options.json
new file mode 100644
index 000000000000..ecf396369615
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/error-schema-format-unsupported/options.json
@@ -0,0 +1,7 @@
+{
+  "plugins": [
+    "../../../.."
+  ],
+  "sourceType": "module",
+  "throws": "unknown format \"int64\" ignored in schema at path \"#\""
+}
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/error-too-many-assertions/options.json b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/error-too-many-assertions/options.json
index 0dd9bb6c51ee..32f56780c08e 100644
--- a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/error-too-many-assertions/options.json
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/error-too-many-assertions/options.json
@@ -3,5 +3,5 @@
     "../../../.."
   ],
   "sourceType": "module",
-  "throws": "too many import assertions, we only support `assert { \"type\": \"json\" }`"
+  "throws": "too many import assertions, we only support `assert {\"type\": \"json\"}, assert {\"type\": \"json-schema\"}`"
 }
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-complex/complex.schema.json b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-complex/complex.schema.json
new file mode 100644
index 000000000000..8a550d3b4514
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-complex/complex.schema.json
@@ -0,0 +1,288 @@
+{
+  "$id": "my-id",
+  "type": "object",
+  "additionalProperties": false,
+  "required": [
+    "items"
+  ],
+  "properties": {
+    "recursive": {
+      "$ref": "#/"
+    },
+    "items": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "additionalProperties": false,
+        "required": [
+          "a",
+          "b",
+          "c",
+          "d",
+          "e",
+          "f",
+          "g",
+          "h",
+          "i"
+        ],
+        "properties": {
+          "recursive": {
+            "$ref": "#/properties/items"
+          },
+          "a": {
+            "oneOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "number"
+              }
+            ]
+          },
+          "b": {
+            "$ref": "#/properties/items/items/properties/a/oneOf/1"
+          },
+          "c": {
+            "type": "string"
+          },
+          "d": {
+            "type": "string"
+          },
+          "h": {
+            "type": "string"
+          },
+          "e": {
+            "type": "number",
+            "minimum": 0
+          },
+          "f": {
+            "description": "https://en.wikipedia.org/wiki/ISO_4217",
+            "enum": [
+              "AED",
+              "AFN",
+              "ALL",
+              "AMD",
+              "ANG",
+              "AOA",
+              "ARS",
+              "AUD",
+              "AWG",
+              "AZN",
+              "BAM",
+              "BBD",
+              "BDT",
+              "BGN",
+              "BHD",
+              "BIF",
+              "BMD",
+              "BND",
+              "BOB",
+              "BOV",
+              "BRL",
+              "BSD",
+              "BTN",
+              "BWP",
+              "BYN",
+              "BZD",
+              "CAD",
+              "CDF",
+              "CHE",
+              "CHF",
+              "CHW",
+              "CLF",
+              "CLP",
+              "CNY",
+              "COP",
+              "COU",
+              "CRC",
+              "CUC",
+              "CUP",
+              "CVE",
+              "CZK",
+              "DJF",
+              "DKK",
+              "DOP",
+              "DZD",
+              "EGP",
+              "ERN",
+              "ETB",
+              "EUR",
+              "FJD",
+              "FKP",
+              "GBP",
+              "GEL",
+              "GHS",
+              "GIP",
+              "GMD",
+              "GNF",
+              "GTQ",
+              "GYD",
+              "HKD",
+              "HNL",
+              "HRK",
+              "HTG",
+              "HUF",
+              "IDR",
+              "ILS",
+              "INR",
+              "IQD",
+              "IRR",
+              "ISK",
+              "JMD",
+              "JOD",
+              "JPY",
+              "KES",
+              "KGS",
+              "KHR",
+              "KMF",
+              "KPW",
+              "KRW",
+              "KWD",
+              "KYD",
+              "KZT",
+              "LAK",
+              "LBP",
+              "LKR",
+              "LRD",
+              "LSL",
+              "LYD",
+              "MAD",
+              "MDL",
+              "MGA",
+              "MKD",
+              "MMK",
+              "MNT",
+              "MOP",
+              "MRU",
+              "MUR",
+              "MVR",
+              "MWK",
+              "MXN",
+              "MXV",
+              "MYR",
+              "MZN",
+              "NAD",
+              "NGN",
+              "NIO",
+              "NOK",
+              "NPR",
+              "NZD",
+              "OMR",
+              "PAB",
+              "PEN",
+              "PGK",
+              "PHP",
+              "PKR",
+              "PLN",
+              "PYG",
+              "QAR",
+              "RON",
+              "RSD",
+              "RUB",
+              "RWF",
+              "SAR",
+              "SBD",
+              "SCR",
+              "SDG",
+              "SEK",
+              "SGD",
+              "SHP",
+              "SLL",
+              "SOS",
+              "SRD",
+              "SSP",
+              "STN",
+              "SVC",
+              "SYP",
+              "SZL",
+              "THB",
+              "TJS",
+              "TMT",
+              "TND",
+              "TOP",
+              "TRY",
+              "TTD",
+              "TWD",
+              "TZS",
+              "UAH",
+              "UGX",
+              "USD",
+              "USN",
+              "UYI",
+              "UYU",
+              "UYW",
+              "UZS",
+              "VED",
+              "VES",
+              "VND",
+              "VUV",
+              "WST",
+              "XAF",
+              "XAG",
+              "XAU",
+              "XBA",
+              "XBB",
+              "XBC",
+              "XBD",
+              "XCD",
+              "XDR",
+              "XOF",
+              "XPD",
+              "XPF",
+              "XPT",
+              "XSU",
+              "XTS",
+              "XUA",
+              "XXX",
+              "YER",
+              "ZAR",
+              "ZMW",
+              "ZWL"
+            ]
+          },
+          "g": {
+            "type": "array",
+            "items": {
+              "type": "object",
+              "additionalProperties": false,
+              "required": [
+                "url",
+                "altText"
+              ],
+              "properties": {
+                "url": {
+                  "type": "string"
+                },
+                "altText": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "i": {
+            "type": "object",
+            "additionalProperties": false,
+            "required": [
+              "ratingValue",
+              "ratingCount",
+              "ratingUrl"
+            ],
+            "properties": {
+              "ratingValue": {
+                "type": "number",
+                "minimum": 0
+              },
+              "ratingCount": {
+                "type": "number",
+                "minimum": 0
+              },
+              "ratingUrl": {
+                "type": "string"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-complex/input.js b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-complex/input.js
new file mode 100644
index 000000000000..763df625f879
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-complex/input.js
@@ -0,0 +1,3 @@
+import validate from './complex.schema.json' assert {type: 'json-schema'};
+
+console./*OK*/ log(validate({}));
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-complex/options.json b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-complex/options.json
new file mode 100644
index 000000000000..239cccc175ab
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-complex/options.json
@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    "../../../.."
+  ],
+  "sourceType": "module"
+}
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-complex/output.mjs b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-complex/output.mjs
new file mode 100644
index 000000000000..90f88492b9af
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-complex/output.mjs
@@ -0,0 +1,1235 @@
+const _schema = {
+  recursive: 0,
+  a: 0,
+  b: 0,
+  c: 0,
+  d: 0,
+  h: 0,
+  e: 0,
+  f: 0,
+  g: 0,
+  i: 0
+};
+import { isIso4217CurrencyCode } from '#core/json-schema';
+"use strict";
+
+const _validate = validate0;
+const func0 = Object.prototype.hasOwnProperty;
+const wrapper0 = {
+  validate: validate1
+};
+
+function validate2(data, instancePath = "") {
+  let vErrors = null;
+  let errors = 0;
+
+  if (!(typeof data == "number" && isFinite(data))) {
+    const err0 = (instancePath + ' ' + "must be number").trim();
+
+    if (vErrors === null) {
+      vErrors = [err0];
+    } else {
+      vErrors.push(err0);
+    }
+
+    errors++;
+  }
+
+  validate2.errors = vErrors;
+  return errors === 0;
+}
+
+function validate1(data, instancePath = "") {
+  let vErrors = null;
+  let errors = 0;
+
+  if (Array.isArray(data)) {
+    const len0 = data.length;
+
+    for (let i0 = 0; i0 < len0; i0++) {
+      let data0 = data[i0];
+
+      if (data0 && typeof data0 == "object" && !Array.isArray(data0)) {
+        if (data0.a === undefined) {
+          const err0 = (instancePath + "/" + i0 + ' ' + ("must have required property '" + "a" + "'")).trim();
+
+          if (vErrors === null) {
+            vErrors = [err0];
+          } else {
+            vErrors.push(err0);
+          }
+
+          errors++;
+        }
+
+        if (data0.b === undefined) {
+          const err1 = (instancePath + "/" + i0 + ' ' + ("must have required property '" + "b" + "'")).trim();
+
+          if (vErrors === null) {
+            vErrors = [err1];
+          } else {
+            vErrors.push(err1);
+          }
+
+          errors++;
+        }
+
+        if (data0.c === undefined) {
+          const err2 = (instancePath + "/" + i0 + ' ' + ("must have required property '" + "c" + "'")).trim();
+
+          if (vErrors === null) {
+            vErrors = [err2];
+          } else {
+            vErrors.push(err2);
+          }
+
+          errors++;
+        }
+
+        if (data0.d === undefined) {
+          const err3 = (instancePath + "/" + i0 + ' ' + ("must have required property '" + "d" + "'")).trim();
+
+          if (vErrors === null) {
+            vErrors = [err3];
+          } else {
+            vErrors.push(err3);
+          }
+
+          errors++;
+        }
+
+        if (data0.e === undefined) {
+          const err4 = (instancePath + "/" + i0 + ' ' + ("must have required property '" + "e" + "'")).trim();
+
+          if (vErrors === null) {
+            vErrors = [err4];
+          } else {
+            vErrors.push(err4);
+          }
+
+          errors++;
+        }
+
+        if (data0.f === undefined) {
+          const err5 = (instancePath + "/" + i0 + ' ' + ("must have required property '" + "f" + "'")).trim();
+
+          if (vErrors === null) {
+            vErrors = [err5];
+          } else {
+            vErrors.push(err5);
+          }
+
+          errors++;
+        }
+
+        if (data0.g === undefined) {
+          const err6 = (instancePath + "/" + i0 + ' ' + ("must have required property '" + "g" + "'")).trim();
+
+          if (vErrors === null) {
+            vErrors = [err6];
+          } else {
+            vErrors.push(err6);
+          }
+
+          errors++;
+        }
+
+        if (data0.h === undefined) {
+          const err7 = (instancePath + "/" + i0 + ' ' + ("must have required property '" + "h" + "'")).trim();
+
+          if (vErrors === null) {
+            vErrors = [err7];
+          } else {
+            vErrors.push(err7);
+          }
+
+          errors++;
+        }
+
+        if (data0.i === undefined) {
+          const err8 = (instancePath + "/" + i0 + ' ' + ("must have required property '" + "i" + "'")).trim();
+
+          if (vErrors === null) {
+            vErrors = [err8];
+          } else {
+            vErrors.push(err8);
+          }
+
+          errors++;
+        }
+
+        for (const key0 in data0) {
+          if (!func0.call(_schema, key0)) {
+            const err9 = (instancePath + "/" + i0 + ' ' + "must NOT have additional properties").trim();
+
+            if (vErrors === null) {
+              vErrors = [err9];
+            } else {
+              vErrors.push(err9);
+            }
+
+            errors++;
+          }
+        }
+
+        if (data0.recursive !== undefined) {
+          if (!wrapper0.validate(data0.recursive, instancePath + "/" + i0 + "/recursive")) {
+            vErrors = vErrors === null ? wrapper0.validate.errors : vErrors.concat(wrapper0.validate.errors);
+            errors = vErrors.length;
+          }
+        }
+
+        if (data0.a !== undefined) {
+          let data2 = data0.a;
+          const _errs6 = errors;
+          let valid3 = false;
+          let passing0 = null;
+          const _errs7 = errors;
+
+          if (typeof data2 !== "string") {
+            const err10 = (instancePath + "/" + i0 + "/a" + ' ' + "must be string").trim();
+
+            if (vErrors === null) {
+              vErrors = [err10];
+            } else {
+              vErrors.push(err10);
+            }
+
+            errors++;
+          }
+
+          var _valid0 = _errs7 === errors;
+
+          if (_valid0) {
+            valid3 = true;
+            passing0 = 0;
+          }
+
+          const _errs9 = errors;
+
+          if (!(typeof data2 == "number" && isFinite(data2))) {
+            const err11 = (instancePath + "/" + i0 + "/a" + ' ' + "must be number").trim();
+
+            if (vErrors === null) {
+              vErrors = [err11];
+            } else {
+              vErrors.push(err11);
+            }
+
+            errors++;
+          }
+
+          var _valid0 = _errs9 === errors;
+
+          if (_valid0 && valid3) {
+            valid3 = false;
+            passing0 = [passing0, 1];
+          } else {
+            if (_valid0) {
+              valid3 = true;
+              passing0 = 1;
+            }
+          }
+
+          if (!valid3) {
+            const err12 = (instancePath + "/" + i0 + "/a" + ' ' + "must match exactly one schema in oneOf").trim();
+
+            if (vErrors === null) {
+              vErrors = [err12];
+            } else {
+              vErrors.push(err12);
+            }
+
+            errors++;
+          } else {
+            errors = _errs6;
+
+            if (vErrors !== null) {
+              if (_errs6) {
+                vErrors.length = _errs6;
+              } else {
+                vErrors = null;
+              }
+            }
+          }
+        }
+
+        if (data0.b !== undefined) {
+          if (!validate2(data0.b, instancePath + "/" + i0 + "/b")) {
+            vErrors = vErrors === null ? validate2.errors : vErrors.concat(validate2.errors);
+            errors = vErrors.length;
+          }
+        }
+
+        if (data0.c !== undefined) {
+          if (typeof data0.c !== "string") {
+            const err13 = (instancePath + "/" + i0 + "/c" + ' ' + "must be string").trim();
+
+            if (vErrors === null) {
+              vErrors = [err13];
+            } else {
+              vErrors.push(err13);
+            }
+
+            errors++;
+          }
+        }
+
+        if (data0.d !== undefined) {
+          if (typeof data0.d !== "string") {
+            const err14 = (instancePath + "/" + i0 + "/d" + ' ' + "must be string").trim();
+
+            if (vErrors === null) {
+              vErrors = [err14];
+            } else {
+              vErrors.push(err14);
+            }
+
+            errors++;
+          }
+        }
+
+        if (data0.h !== undefined) {
+          if (typeof data0.h !== "string") {
+            const err15 = (instancePath + "/" + i0 + "/h" + ' ' + "must be string").trim();
+
+            if (vErrors === null) {
+              vErrors = [err15];
+            } else {
+              vErrors.push(err15);
+            }
+
+            errors++;
+          }
+        }
+
+        if (data0.e !== undefined) {
+          let data7 = data0.e;
+
+          if (typeof data7 == "number" && isFinite(data7)) {
+            if (data7 < 0 || isNaN(data7)) {
+              const err16 = (instancePath + "/" + i0 + "/e" + ' ' + "must be >= 0").trim();
+
+              if (vErrors === null) {
+                vErrors = [err16];
+              } else {
+                vErrors.push(err16);
+              }
+
+              errors++;
+            }
+          } else {
+            const err17 = (instancePath + "/" + i0 + "/e" + ' ' + "must be number").trim();
+
+            if (vErrors === null) {
+              vErrors = [err17];
+            } else {
+              vErrors.push(err17);
+            }
+
+            errors++;
+          }
+        }
+
+        if (data0.f !== undefined) {
+          if (!isIso4217CurrencyCode(data0.f)) {
+            const err18 = (instancePath + "/" + i0 + "/f" + ' ' + "must be a valid ISO 4217 currency code").trim();
+
+            if (vErrors === null) {
+              vErrors = [err18];
+            } else {
+              vErrors.push(err18);
+            }
+
+            errors++;
+          }
+        }
+
+        if (data0.g !== undefined) {
+          let data9 = data0.g;
+
+          if (Array.isArray(data9)) {
+            const len1 = data9.length;
+
+            for (let i1 = 0; i1 < len1; i1++) {
+              let data10 = data9[i1];
+
+              if (data10 && typeof data10 == "object" && !Array.isArray(data10)) {
+                if (data10.url === undefined) {
+                  const err19 = (instancePath + "/" + i0 + "/g/" + i1 + ' ' + ("must have required property '" + "url" + "'")).trim();
+
+                  if (vErrors === null) {
+                    vErrors = [err19];
+                  } else {
+                    vErrors.push(err19);
+                  }
+
+                  errors++;
+                }
+
+                if (data10.altText === undefined) {
+                  const err20 = (instancePath + "/" + i0 + "/g/" + i1 + ' ' + ("must have required property '" + "altText" + "'")).trim();
+
+                  if (vErrors === null) {
+                    vErrors = [err20];
+                  } else {
+                    vErrors.push(err20);
+                  }
+
+                  errors++;
+                }
+
+                for (const key1 in data10) {
+                  if (!(key1 === "url" || key1 === "altText")) {
+                    const err21 = (instancePath + "/" + i0 + "/g/" + i1 + ' ' + "must NOT have additional properties").trim();
+
+                    if (vErrors === null) {
+                      vErrors = [err21];
+                    } else {
+                      vErrors.push(err21);
+                    }
+
+                    errors++;
+                  }
+                }
+
+                if (data10.url !== undefined) {
+                  if (typeof data10.url !== "string") {
+                    const err22 = (instancePath + "/" + i0 + "/g/" + i1 + "/url" + ' ' + "must be string").trim();
+
+                    if (vErrors === null) {
+                      vErrors = [err22];
+                    } else {
+                      vErrors.push(err22);
+                    }
+
+                    errors++;
+                  }
+                }
+
+                if (data10.altText !== undefined) {
+                  if (typeof data10.altText !== "string") {
+                    const err23 = (instancePath + "/" + i0 + "/g/" + i1 + "/altText" + ' ' + "must be string").trim();
+
+                    if (vErrors === null) {
+                      vErrors = [err23];
+                    } else {
+                      vErrors.push(err23);
+                    }
+
+                    errors++;
+                  }
+                }
+              } else {
+                const err24 = (instancePath + "/" + i0 + "/g/" + i1 + ' ' + "must be object").trim();
+
+                if (vErrors === null) {
+                  vErrors = [err24];
+                } else {
+                  vErrors.push(err24);
+                }
+
+                errors++;
+              }
+            }
+          } else {
+            const err25 = (instancePath + "/" + i0 + "/g" + ' ' + "must be array").trim();
+
+            if (vErrors === null) {
+              vErrors = [err25];
+            } else {
+              vErrors.push(err25);
+            }
+
+            errors++;
+          }
+        }
+
+        if (data0.i !== undefined) {
+          let data13 = data0.i;
+
+          if (data13 && typeof data13 == "object" && !Array.isArray(data13)) {
+            if (data13.ratingValue === undefined) {
+              const err26 = (instancePath + "/" + i0 + "/i" + ' ' + ("must have required property '" + "ratingValue" + "'")).trim();
+
+              if (vErrors === null) {
+                vErrors = [err26];
+              } else {
+                vErrors.push(err26);
+              }
+
+              errors++;
+            }
+
+            if (data13.ratingCount === undefined) {
+              const err27 = (instancePath + "/" + i0 + "/i" + ' ' + ("must have required property '" + "ratingCount" + "'")).trim();
+
+              if (vErrors === null) {
+                vErrors = [err27];
+              } else {
+                vErrors.push(err27);
+              }
+
+              errors++;
+            }
+
+            if (data13.ratingUrl === undefined) {
+              const err28 = (instancePath + "/" + i0 + "/i" + ' ' + ("must have required property '" + "ratingUrl" + "'")).trim();
+
+              if (vErrors === null) {
+                vErrors = [err28];
+              } else {
+                vErrors.push(err28);
+              }
+
+              errors++;
+            }
+
+            for (const key2 in data13) {
+              if (!(key2 === "ratingValue" || key2 === "ratingCount" || key2 === "ratingUrl")) {
+                const err29 = (instancePath + "/" + i0 + "/i" + ' ' + "must NOT have additional properties").trim();
+
+                if (vErrors === null) {
+                  vErrors = [err29];
+                } else {
+                  vErrors.push(err29);
+                }
+
+                errors++;
+              }
+            }
+
+            if (data13.ratingValue !== undefined) {
+              let data14 = data13.ratingValue;
+
+              if (typeof data14 == "number" && isFinite(data14)) {
+                if (data14 < 0 || isNaN(data14)) {
+                  const err30 = (instancePath + "/" + i0 + "/i/ratingValue" + ' ' + "must be >= 0").trim();
+
+                  if (vErrors === null) {
+                    vErrors = [err30];
+                  } else {
+                    vErrors.push(err30);
+                  }
+
+                  errors++;
+                }
+              } else {
+                const err31 = (instancePath + "/" + i0 + "/i/ratingValue" + ' ' + "must be number").trim();
+
+                if (vErrors === null) {
+                  vErrors = [err31];
+                } else {
+                  vErrors.push(err31);
+                }
+
+                errors++;
+              }
+            }
+
+            if (data13.ratingCount !== undefined) {
+              let data15 = data13.ratingCount;
+
+              if (typeof data15 == "number" && isFinite(data15)) {
+                if (data15 < 0 || isNaN(data15)) {
+                  const err32 = (instancePath + "/" + i0 + "/i/ratingCount" + ' ' + "must be >= 0").trim();
+
+                  if (vErrors === null) {
+                    vErrors = [err32];
+                  } else {
+                    vErrors.push(err32);
+                  }
+
+                  errors++;
+                }
+              } else {
+                const err33 = (instancePath + "/" + i0 + "/i/ratingCount" + ' ' + "must be number").trim();
+
+                if (vErrors === null) {
+                  vErrors = [err33];
+                } else {
+                  vErrors.push(err33);
+                }
+
+                errors++;
+              }
+            }
+
+            if (data13.ratingUrl !== undefined) {
+              if (typeof data13.ratingUrl !== "string") {
+                const err34 = (instancePath + "/" + i0 + "/i/ratingUrl" + ' ' + "must be string").trim();
+
+                if (vErrors === null) {
+                  vErrors = [err34];
+                } else {
+                  vErrors.push(err34);
+                }
+
+                errors++;
+              }
+            }
+          } else {
+            const err35 = (instancePath + "/" + i0 + "/i" + ' ' + "must be object").trim();
+
+            if (vErrors === null) {
+              vErrors = [err35];
+            } else {
+              vErrors.push(err35);
+            }
+
+            errors++;
+          }
+        }
+      } else {
+        const err36 = (instancePath + "/" + i0 + ' ' + "must be object").trim();
+
+        if (vErrors === null) {
+          vErrors = [err36];
+        } else {
+          vErrors.push(err36);
+        }
+
+        errors++;
+      }
+    }
+  } else {
+    const err37 = (instancePath + ' ' + "must be array").trim();
+
+    if (vErrors === null) {
+      vErrors = [err37];
+    } else {
+      vErrors.push(err37);
+    }
+
+    errors++;
+  }
+
+  validate1.errors = vErrors;
+  return errors === 0;
+}
+
+function validate0(data, instancePath = "") {
+  /*# sourceURL="my-id" */
+  ;
+  let vErrors = null;
+  let errors = 0;
+
+  if (data && typeof data == "object" && !Array.isArray(data)) {
+    if (data.items === undefined) {
+      const err0 = (instancePath + ' ' + ("must have required property '" + "items" + "'")).trim();
+
+      if (vErrors === null) {
+        vErrors = [err0];
+      } else {
+        vErrors.push(err0);
+      }
+
+      errors++;
+    }
+
+    for (const key0 in data) {
+      if (!(key0 === "recursive" || key0 === "items")) {
+        const err1 = (instancePath + ' ' + "must NOT have additional properties").trim();
+
+        if (vErrors === null) {
+          vErrors = [err1];
+        } else {
+          vErrors.push(err1);
+        }
+
+        errors++;
+      }
+    }
+
+    if (data.recursive !== undefined) {
+      if (!validate0(data.recursive, instancePath + "/recursive")) {
+        vErrors = vErrors === null ? validate0.errors : vErrors.concat(validate0.errors);
+        errors = vErrors.length;
+      }
+    }
+
+    if (data.items !== undefined) {
+      let data1 = data.items;
+
+      if (Array.isArray(data1)) {
+        const len0 = data1.length;
+
+        for (let i0 = 0; i0 < len0; i0++) {
+          let data2 = data1[i0];
+
+          if (data2 && typeof data2 == "object" && !Array.isArray(data2)) {
+            if (data2.a === undefined) {
+              const err2 = (instancePath + "/items/" + i0 + ' ' + ("must have required property '" + "a" + "'")).trim();
+
+              if (vErrors === null) {
+                vErrors = [err2];
+              } else {
+                vErrors.push(err2);
+              }
+
+              errors++;
+            }
+
+            if (data2.b === undefined) {
+              const err3 = (instancePath + "/items/" + i0 + ' ' + ("must have required property '" + "b" + "'")).trim();
+
+              if (vErrors === null) {
+                vErrors = [err3];
+              } else {
+                vErrors.push(err3);
+              }
+
+              errors++;
+            }
+
+            if (data2.c === undefined) {
+              const err4 = (instancePath + "/items/" + i0 + ' ' + ("must have required property '" + "c" + "'")).trim();
+
+              if (vErrors === null) {
+                vErrors = [err4];
+              } else {
+                vErrors.push(err4);
+              }
+
+              errors++;
+            }
+
+            if (data2.d === undefined) {
+              const err5 = (instancePath + "/items/" + i0 + ' ' + ("must have required property '" + "d" + "'")).trim();
+
+              if (vErrors === null) {
+                vErrors = [err5];
+              } else {
+                vErrors.push(err5);
+              }
+
+              errors++;
+            }
+
+            if (data2.e === undefined) {
+              const err6 = (instancePath + "/items/" + i0 + ' ' + ("must have required property '" + "e" + "'")).trim();
+
+              if (vErrors === null) {
+                vErrors = [err6];
+              } else {
+                vErrors.push(err6);
+              }
+
+              errors++;
+            }
+
+            if (data2.f === undefined) {
+              const err7 = (instancePath + "/items/" + i0 + ' ' + ("must have required property '" + "f" + "'")).trim();
+
+              if (vErrors === null) {
+                vErrors = [err7];
+              } else {
+                vErrors.push(err7);
+              }
+
+              errors++;
+            }
+
+            if (data2.g === undefined) {
+              const err8 = (instancePath + "/items/" + i0 + ' ' + ("must have required property '" + "g" + "'")).trim();
+
+              if (vErrors === null) {
+                vErrors = [err8];
+              } else {
+                vErrors.push(err8);
+              }
+
+              errors++;
+            }
+
+            if (data2.h === undefined) {
+              const err9 = (instancePath + "/items/" + i0 + ' ' + ("must have required property '" + "h" + "'")).trim();
+
+              if (vErrors === null) {
+                vErrors = [err9];
+              } else {
+                vErrors.push(err9);
+              }
+
+              errors++;
+            }
+
+            if (data2.i === undefined) {
+              const err10 = (instancePath + "/items/" + i0 + ' ' + ("must have required property '" + "i" + "'")).trim();
+
+              if (vErrors === null) {
+                vErrors = [err10];
+              } else {
+                vErrors.push(err10);
+              }
+
+              errors++;
+            }
+
+            for (const key1 in data2) {
+              if (!func0.call(_schema, key1)) {
+                const err11 = (instancePath + "/items/" + i0 + ' ' + "must NOT have additional properties").trim();
+
+                if (vErrors === null) {
+                  vErrors = [err11];
+                } else {
+                  vErrors.push(err11);
+                }
+
+                errors++;
+              }
+            }
+
+            if (data2.recursive !== undefined) {
+              if (!validate1(data2.recursive, instancePath + "/items/" + i0 + "/recursive")) {
+                vErrors = vErrors === null ? validate1.errors : vErrors.concat(validate1.errors);
+                errors = vErrors.length;
+              }
+            }
+
+            if (data2.a !== undefined) {
+              let data4 = data2.a;
+              const _errs10 = errors;
+              let valid4 = false;
+              let passing0 = null;
+              const _errs11 = errors;
+
+              if (typeof data4 !== "string") {
+                const err12 = (instancePath + "/items/" + i0 + "/a" + ' ' + "must be string").trim();
+
+                if (vErrors === null) {
+                  vErrors = [err12];
+                } else {
+                  vErrors.push(err12);
+                }
+
+                errors++;
+              }
+
+              var _valid0 = _errs11 === errors;
+
+              if (_valid0) {
+                valid4 = true;
+                passing0 = 0;
+              }
+
+              const _errs13 = errors;
+
+              if (!(typeof data4 == "number" && isFinite(data4))) {
+                const err13 = (instancePath + "/items/" + i0 + "/a" + ' ' + "must be number").trim();
+
+                if (vErrors === null) {
+                  vErrors = [err13];
+                } else {
+                  vErrors.push(err13);
+                }
+
+                errors++;
+              }
+
+              var _valid0 = _errs13 === errors;
+
+              if (_valid0 && valid4) {
+                valid4 = false;
+                passing0 = [passing0, 1];
+              } else {
+                if (_valid0) {
+                  valid4 = true;
+                  passing0 = 1;
+                }
+              }
+
+              if (!valid4) {
+                const err14 = (instancePath + "/items/" + i0 + "/a" + ' ' + "must match exactly one schema in oneOf").trim();
+
+                if (vErrors === null) {
+                  vErrors = [err14];
+                } else {
+                  vErrors.push(err14);
+                }
+
+                errors++;
+              } else {
+                errors = _errs10;
+
+                if (vErrors !== null) {
+                  if (_errs10) {
+                    vErrors.length = _errs10;
+                  } else {
+                    vErrors = null;
+                  }
+                }
+              }
+            }
+
+            if (data2.b !== undefined) {
+              if (!validate2(data2.b, instancePath + "/items/" + i0 + "/b")) {
+                vErrors = vErrors === null ? validate2.errors : vErrors.concat(validate2.errors);
+                errors = vErrors.length;
+              }
+            }
+
+            if (data2.c !== undefined) {
+              if (typeof data2.c !== "string") {
+                const err15 = (instancePath + "/items/" + i0 + "/c" + ' ' + "must be string").trim();
+
+                if (vErrors === null) {
+                  vErrors = [err15];
+                } else {
+                  vErrors.push(err15);
+                }
+
+                errors++;
+              }
+            }
+
+            if (data2.d !== undefined) {
+              if (typeof data2.d !== "string") {
+                const err16 = (instancePath + "/items/" + i0 + "/d" + ' ' + "must be string").trim();
+
+                if (vErrors === null) {
+                  vErrors = [err16];
+                } else {
+                  vErrors.push(err16);
+                }
+
+                errors++;
+              }
+            }
+
+            if (data2.h !== undefined) {
+              if (typeof data2.h !== "string") {
+                const err17 = (instancePath + "/items/" + i0 + "/h" + ' ' + "must be string").trim();
+
+                if (vErrors === null) {
+                  vErrors = [err17];
+                } else {
+                  vErrors.push(err17);
+                }
+
+                errors++;
+              }
+            }
+
+            if (data2.e !== undefined) {
+              let data9 = data2.e;
+
+              if (typeof data9 == "number" && isFinite(data9)) {
+                if (data9 < 0 || isNaN(data9)) {
+                  const err18 = (instancePath + "/items/" + i0 + "/e" + ' ' + "must be >= 0").trim();
+
+                  if (vErrors === null) {
+                    vErrors = [err18];
+                  } else {
+                    vErrors.push(err18);
+                  }
+
+                  errors++;
+                }
+              } else {
+                const err19 = (instancePath + "/items/" + i0 + "/e" + ' ' + "must be number").trim();
+
+                if (vErrors === null) {
+                  vErrors = [err19];
+                } else {
+                  vErrors.push(err19);
+                }
+
+                errors++;
+              }
+            }
+
+            if (data2.f !== undefined) {
+              if (!isIso4217CurrencyCode(data2.f)) {
+                const err20 = (instancePath + "/items/" + i0 + "/f" + ' ' + "must be a valid ISO 4217 currency code").trim();
+
+                if (vErrors === null) {
+                  vErrors = [err20];
+                } else {
+                  vErrors.push(err20);
+                }
+
+                errors++;
+              }
+            }
+
+            if (data2.g !== undefined) {
+              let data11 = data2.g;
+
+              if (Array.isArray(data11)) {
+                const len1 = data11.length;
+
+                for (let i1 = 0; i1 < len1; i1++) {
+                  let data12 = data11[i1];
+
+                  if (data12 && typeof data12 == "object" && !Array.isArray(data12)) {
+                    if (data12.url === undefined) {
+                      const err21 = (instancePath + "/items/" + i0 + "/g/" + i1 + ' ' + ("must have required property '" + "url" + "'")).trim();
+
+                      if (vErrors === null) {
+                        vErrors = [err21];
+                      } else {
+                        vErrors.push(err21);
+                      }
+
+                      errors++;
+                    }
+
+                    if (data12.altText === undefined) {
+                      const err22 = (instancePath + "/items/" + i0 + "/g/" + i1 + ' ' + ("must have required property '" + "altText" + "'")).trim();
+
+                      if (vErrors === null) {
+                        vErrors = [err22];
+                      } else {
+                        vErrors.push(err22);
+                      }
+
+                      errors++;
+                    }
+
+                    for (const key2 in data12) {
+                      if (!(key2 === "url" || key2 === "altText")) {
+                        const err23 = (instancePath + "/items/" + i0 + "/g/" + i1 + ' ' + "must NOT have additional properties").trim();
+
+                        if (vErrors === null) {
+                          vErrors = [err23];
+                        } else {
+                          vErrors.push(err23);
+                        }
+
+                        errors++;
+                      }
+                    }
+
+                    if (data12.url !== undefined) {
+                      if (typeof data12.url !== "string") {
+                        const err24 = (instancePath + "/items/" + i0 + "/g/" + i1 + "/url" + ' ' + "must be string").trim();
+
+                        if (vErrors === null) {
+                          vErrors = [err24];
+                        } else {
+                          vErrors.push(err24);
+                        }
+
+                        errors++;
+                      }
+                    }
+
+                    if (data12.altText !== undefined) {
+                      if (typeof data12.altText !== "string") {
+                        const err25 = (instancePath + "/items/" + i0 + "/g/" + i1 + "/altText" + ' ' + "must be string").trim();
+
+                        if (vErrors === null) {
+                          vErrors = [err25];
+                        } else {
+                          vErrors.push(err25);
+                        }
+
+                        errors++;
+                      }
+                    }
+                  } else {
+                    const err26 = (instancePath + "/items/" + i0 + "/g/" + i1 + ' ' + "must be object").trim();
+
+                    if (vErrors === null) {
+                      vErrors = [err26];
+                    } else {
+                      vErrors.push(err26);
+                    }
+
+                    errors++;
+                  }
+                }
+              } else {
+                const err27 = (instancePath + "/items/" + i0 + "/g" + ' ' + "must be array").trim();
+
+                if (vErrors === null) {
+                  vErrors = [err27];
+                } else {
+                  vErrors.push(err27);
+                }
+
+                errors++;
+              }
+            }
+
+            if (data2.i !== undefined) {
+              let data15 = data2.i;
+
+              if (data15 && typeof data15 == "object" && !Array.isArray(data15)) {
+                if (data15.ratingValue === undefined) {
+                  const err28 = (instancePath + "/items/" + i0 + "/i" + ' ' + ("must have required property '" + "ratingValue" + "'")).trim();
+
+                  if (vErrors === null) {
+                    vErrors = [err28];
+                  } else {
+                    vErrors.push(err28);
+                  }
+
+                  errors++;
+                }
+
+                if (data15.ratingCount === undefined) {
+                  const err29 = (instancePath + "/items/" + i0 + "/i" + ' ' + ("must have required property '" + "ratingCount" + "'")).trim();
+
+                  if (vErrors === null) {
+                    vErrors = [err29];
+                  } else {
+                    vErrors.push(err29);
+                  }
+
+                  errors++;
+                }
+
+                if (data15.ratingUrl === undefined) {
+                  const err30 = (instancePath + "/items/" + i0 + "/i" + ' ' + ("must have required property '" + "ratingUrl" + "'")).trim();
+
+                  if (vErrors === null) {
+                    vErrors = [err30];
+                  } else {
+                    vErrors.push(err30);
+                  }
+
+                  errors++;
+                }
+
+                for (const key3 in data15) {
+                  if (!(key3 === "ratingValue" || key3 === "ratingCount" || key3 === "ratingUrl")) {
+                    const err31 = (instancePath + "/items/" + i0 + "/i" + ' ' + "must NOT have additional properties").trim();
+
+                    if (vErrors === null) {
+                      vErrors = [err31];
+                    } else {
+                      vErrors.push(err31);
+                    }
+
+                    errors++;
+                  }
+                }
+
+                if (data15.ratingValue !== undefined) {
+                  let data16 = data15.ratingValue;
+
+                  if (typeof data16 == "number" && isFinite(data16)) {
+                    if (data16 < 0 || isNaN(data16)) {
+                      const err32 = (instancePath + "/items/" + i0 + "/i/ratingValue" + ' ' + "must be >= 0").trim();
+
+                      if (vErrors === null) {
+                        vErrors = [err32];
+                      } else {
+                        vErrors.push(err32);
+                      }
+
+                      errors++;
+                    }
+                  } else {
+                    const err33 = (instancePath + "/items/" + i0 + "/i/ratingValue" + ' ' + "must be number").trim();
+
+                    if (vErrors === null) {
+                      vErrors = [err33];
+                    } else {
+                      vErrors.push(err33);
+                    }
+
+                    errors++;
+                  }
+                }
+
+                if (data15.ratingCount !== undefined) {
+                  let data17 = data15.ratingCount;
+
+                  if (typeof data17 == "number" && isFinite(data17)) {
+                    if (data17 < 0 || isNaN(data17)) {
+                      const err34 = (instancePath + "/items/" + i0 + "/i/ratingCount" + ' ' + "must be >= 0").trim();
+
+                      if (vErrors === null) {
+                        vErrors = [err34];
+                      } else {
+                        vErrors.push(err34);
+                      }
+
+                      errors++;
+                    }
+                  } else {
+                    const err35 = (instancePath + "/items/" + i0 + "/i/ratingCount" + ' ' + "must be number").trim();
+
+                    if (vErrors === null) {
+                      vErrors = [err35];
+                    } else {
+                      vErrors.push(err35);
+                    }
+
+                    errors++;
+                  }
+                }
+
+                if (data15.ratingUrl !== undefined) {
+                  if (typeof data15.ratingUrl !== "string") {
+                    const err36 = (instancePath + "/items/" + i0 + "/i/ratingUrl" + ' ' + "must be string").trim();
+
+                    if (vErrors === null) {
+                      vErrors = [err36];
+                    } else {
+                      vErrors.push(err36);
+                    }
+
+                    errors++;
+                  }
+                }
+              } else {
+                const err37 = (instancePath + "/items/" + i0 + "/i" + ' ' + "must be object").trim();
+
+                if (vErrors === null) {
+                  vErrors = [err37];
+                } else {
+                  vErrors.push(err37);
+                }
+
+                errors++;
+              }
+            }
+          } else {
+            const err38 = (instancePath + "/items/" + i0 + ' ' + "must be object").trim();
+
+            if (vErrors === null) {
+              vErrors = [err38];
+            } else {
+              vErrors.push(err38);
+            }
+
+            errors++;
+          }
+        }
+      } else {
+        const err39 = (instancePath + "/items" + ' ' + "must be array").trim();
+
+        if (vErrors === null) {
+          vErrors = [err39];
+        } else {
+          vErrors.push(err39);
+        }
+
+        errors++;
+      }
+    }
+  } else {
+    const err40 = (instancePath + ' ' + "must be object").trim();
+
+    if (vErrors === null) {
+      vErrors = [err40];
+    } else {
+      vErrors.push(err40);
+    }
+
+    errors++;
+  }
+
+  validate0.errors = vErrors;
+  return errors === 0;
+}
+
+const validate = (data, schemaName = "complex") => _validate(data, schemaName) ? [] : _validate.errors;
+
+console.
+/*OK*/
+log(validate({}));
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-currency-code/currency-code.schema.json b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-currency-code/currency-code.schema.json
new file mode 100644
index 000000000000..2eebad9c0c92
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-currency-code/currency-code.schema.json
@@ -0,0 +1,185 @@
+{
+  "description": "https://en.wikipedia.org/wiki/ISO_4217",
+  "enum": [
+    "AED",
+    "AFN",
+    "ALL",
+    "AMD",
+    "ANG",
+    "AOA",
+    "ARS",
+    "AUD",
+    "AWG",
+    "AZN",
+    "BAM",
+    "BBD",
+    "BDT",
+    "BGN",
+    "BHD",
+    "BIF",
+    "BMD",
+    "BND",
+    "BOB",
+    "BOV",
+    "BRL",
+    "BSD",
+    "BTN",
+    "BWP",
+    "BYN",
+    "BZD",
+    "CAD",
+    "CDF",
+    "CHE",
+    "CHF",
+    "CHW",
+    "CLF",
+    "CLP",
+    "CNY",
+    "COP",
+    "COU",
+    "CRC",
+    "CUC",
+    "CUP",
+    "CVE",
+    "CZK",
+    "DJF",
+    "DKK",
+    "DOP",
+    "DZD",
+    "EGP",
+    "ERN",
+    "ETB",
+    "EUR",
+    "FJD",
+    "FKP",
+    "GBP",
+    "GEL",
+    "GHS",
+    "GIP",
+    "GMD",
+    "GNF",
+    "GTQ",
+    "GYD",
+    "HKD",
+    "HNL",
+    "HRK",
+    "HTG",
+    "HUF",
+    "IDR",
+    "ILS",
+    "INR",
+    "IQD",
+    "IRR",
+    "ISK",
+    "JMD",
+    "JOD",
+    "JPY",
+    "KES",
+    "KGS",
+    "KHR",
+    "KMF",
+    "KPW",
+    "KRW",
+    "KWD",
+    "KYD",
+    "KZT",
+    "LAK",
+    "LBP",
+    "LKR",
+    "LRD",
+    "LSL",
+    "LYD",
+    "MAD",
+    "MDL",
+    "MGA",
+    "MKD",
+    "MMK",
+    "MNT",
+    "MOP",
+    "MRU",
+    "MUR",
+    "MVR",
+    "MWK",
+    "MXN",
+    "MXV",
+    "MYR",
+    "MZN",
+    "NAD",
+    "NGN",
+    "NIO",
+    "NOK",
+    "NPR",
+    "NZD",
+    "OMR",
+    "PAB",
+    "PEN",
+    "PGK",
+    "PHP",
+    "PKR",
+    "PLN",
+    "PYG",
+    "QAR",
+    "RON",
+    "RSD",
+    "RUB",
+    "RWF",
+    "SAR",
+    "SBD",
+    "SCR",
+    "SDG",
+    "SEK",
+    "SGD",
+    "SHP",
+    "SLL",
+    "SOS",
+    "SRD",
+    "SSP",
+    "STN",
+    "SVC",
+    "SYP",
+    "SZL",
+    "THB",
+    "TJS",
+    "TMT",
+    "TND",
+    "TOP",
+    "TRY",
+    "TTD",
+    "TWD",
+    "TZS",
+    "UAH",
+    "UGX",
+    "USD",
+    "USN",
+    "UYI",
+    "UYU",
+    "UYW",
+    "UZS",
+    "VED",
+    "VES",
+    "VND",
+    "VUV",
+    "WST",
+    "XAF",
+    "XAG",
+    "XAU",
+    "XBA",
+    "XBB",
+    "XBC",
+    "XBD",
+    "XCD",
+    "XDR",
+    "XOF",
+    "XPD",
+    "XPF",
+    "XPT",
+    "XSU",
+    "XTS",
+    "XUA",
+    "XXX",
+    "YER",
+    "ZAR",
+    "ZMW",
+    "ZWL"
+  ]
+}
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-currency-code/input.js b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-currency-code/input.js
new file mode 100644
index 000000000000..cf8348bc9e5d
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-currency-code/input.js
@@ -0,0 +1,4 @@
+import validateCurrencyCode from './currency-code.schema.json' assert {type: 'json-schema'};
+
+console./*OK*/ log(validateCurrencyCode('MXN'));
+console./*OK*/ log(validateCurrencyCode('INVALID'));
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-currency-code/options.json b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-currency-code/options.json
new file mode 100644
index 000000000000..239cccc175ab
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-currency-code/options.json
@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    "../../../.."
+  ],
+  "sourceType": "module"
+}
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-currency-code/output.mjs b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-currency-code/output.mjs
new file mode 100644
index 000000000000..2652fcf24ff6
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-currency-code/output.mjs
@@ -0,0 +1,33 @@
+import { isIso4217CurrencyCode } from '#core/json-schema';
+"use strict";
+
+const validate = validate0;
+
+function validate0(data, instancePath = "") {
+  let vErrors = null;
+  let errors = 0;
+
+  if (!isIso4217CurrencyCode(data)) {
+    const err0 = (instancePath + ' ' + "must be a valid ISO 4217 currency code").trim();
+
+    if (vErrors === null) {
+      vErrors = [err0];
+    } else {
+      vErrors.push(err0);
+    }
+
+    errors++;
+  }
+
+  validate0.errors = vErrors;
+  return errors === 0;
+}
+
+const validateCurrencyCode = (data, schemaName = "currency-code") => validate(data, schemaName) ? [] : validate.errors;
+
+console.
+/*OK*/
+log(validateCurrencyCode('MXN'));
+console.
+/*OK*/
+log(validateCurrencyCode('INVALID'));
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-format-date/format-date.schema.json b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-format-date/format-date.schema.json
new file mode 100644
index 000000000000..1a93be55f242
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-format-date/format-date.schema.json
@@ -0,0 +1,13 @@
+{
+  "properties": {
+    "my-date": {
+      "format": "date"
+    },
+    "my-date-time": {
+      "format": "date-time"
+    },
+    "my-time": {
+      "format": "time"
+    }
+  }
+}
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-format-date/input.js b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-format-date/input.js
new file mode 100644
index 000000000000..b7f5cb7fc577
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-format-date/input.js
@@ -0,0 +1,4 @@
+import validateFormatDate from './format-date.schema.json' assert {type: 'json-schema'};
+
+console./*OK*/ log(validateFormatDate('invalid'));
+console./*OK*/ log(validateFormatDate('https://example.com'));
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-format-date/options.json b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-format-date/options.json
new file mode 100644
index 000000000000..239cccc175ab
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-format-date/options.json
@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    "../../../.."
+  ],
+  "sourceType": "module"
+}
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-format-date/output.mjs b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-format-date/output.mjs
new file mode 100644
index 000000000000..bbbefc68bf71
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-format-date/output.mjs
@@ -0,0 +1,77 @@
+const validate = validate0;
+const formats0 = /^\d\d\d\d-[0-1]\d-[0-3]\d$/;
+const formats2 = /^\d\d\d\d-[0-1]\d-[0-3]\d[t\s](?:[0-2]\d:[0-5]\d:[0-5]\d|23:59:60)(?:\.\d+)?(?:z|[+-]\d\d(?::?\d\d)?)$/i;
+const formats4 = /^(?:[0-2]\d:[0-5]\d:[0-5]\d|23:59:60)(?:\.\d+)?(?:z|[+-]\d\d(?::?\d\d)?)?$/i;
+
+function validate0(data, instancePath = "") {
+  let vErrors = null;
+  let errors = 0;
+
+  if (data && typeof data == "object" && !Array.isArray(data)) {
+    if (data["my-date"] !== undefined) {
+      let data0 = data["my-date"];
+
+      if (typeof data0 === "string") {
+        if (!formats0.test(data0)) {
+          const err0 = (instancePath + "/my-date" + ' ' + ("must match format \"" + "date" + "\"")).trim();
+
+          if (vErrors === null) {
+            vErrors = [err0];
+          } else {
+            vErrors.push(err0);
+          }
+
+          errors++;
+        }
+      }
+    }
+
+    if (data["my-date-time"] !== undefined) {
+      let data1 = data["my-date-time"];
+
+      if (typeof data1 === "string") {
+        if (!formats2.test(data1)) {
+          const err1 = (instancePath + "/my-date-time" + ' ' + ("must match format \"" + "date-time" + "\"")).trim();
+
+          if (vErrors === null) {
+            vErrors = [err1];
+          } else {
+            vErrors.push(err1);
+          }
+
+          errors++;
+        }
+      }
+    }
+
+    if (data["my-time"] !== undefined) {
+      let data2 = data["my-time"];
+
+      if (typeof data2 === "string") {
+        if (!formats4.test(data2)) {
+          const err2 = (instancePath + "/my-time" + ' ' + ("must match format \"" + "time" + "\"")).trim();
+
+          if (vErrors === null) {
+            vErrors = [err2];
+          } else {
+            vErrors.push(err2);
+          }
+
+          errors++;
+        }
+      }
+    }
+  }
+
+  validate0.errors = vErrors;
+  return errors === 0;
+}
+
+const validateFormatDate = (data, schemaName = "format-date") => validate(data, schemaName) ? [] : validate.errors;
+
+console.
+/*OK*/
+log(validateFormatDate('invalid'));
+console.
+/*OK*/
+log(validateFormatDate('https://example.com'));
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-format/format.schema.json b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-format/format.schema.json
new file mode 100644
index 000000000000..1868bf4d29e8
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-format/format.schema.json
@@ -0,0 +1,10 @@
+{
+  "properties": {
+    "my-uri": {
+      "format": "uri"
+    },
+    "my-email": {
+      "format": "email"
+    }
+  }
+}
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-format/input.js b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-format/input.js
new file mode 100644
index 000000000000..b86a24137f0e
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-format/input.js
@@ -0,0 +1,4 @@
+import validateFormat from './format.schema.json' assert {type: 'json-schema'};
+
+console./*OK*/ log(validateFormat('invalid'));
+console./*OK*/ log(validateFormat('https://example.com'));
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-format/options.json b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-format/options.json
new file mode 100644
index 000000000000..239cccc175ab
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-format/options.json
@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    "../../../.."
+  ],
+  "sourceType": "module"
+}
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-format/output.mjs b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-format/output.mjs
new file mode 100644
index 000000000000..5c539bad7a7e
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-format/output.mjs
@@ -0,0 +1,58 @@
+const validate = validate0;
+const formats0 = /^(?:[a-z][a-z0-9+\-.]*:)(?:\/?\/)?[^\s]*$/i;
+const formats2 = /^[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;
+
+function validate0(data, instancePath = "") {
+  let vErrors = null;
+  let errors = 0;
+
+  if (data && typeof data == "object" && !Array.isArray(data)) {
+    if (data["my-uri"] !== undefined) {
+      let data0 = data["my-uri"];
+
+      if (typeof data0 === "string") {
+        if (!formats0.test(data0)) {
+          const err0 = (instancePath + "/my-uri" + ' ' + ("must match format \"" + "uri" + "\"")).trim();
+
+          if (vErrors === null) {
+            vErrors = [err0];
+          } else {
+            vErrors.push(err0);
+          }
+
+          errors++;
+        }
+      }
+    }
+
+    if (data["my-email"] !== undefined) {
+      let data1 = data["my-email"];
+
+      if (typeof data1 === "string") {
+        if (!formats2.test(data1)) {
+          const err1 = (instancePath + "/my-email" + ' ' + ("must match format \"" + "email" + "\"")).trim();
+
+          if (vErrors === null) {
+            vErrors = [err1];
+          } else {
+            vErrors.push(err1);
+          }
+
+          errors++;
+        }
+      }
+    }
+  }
+
+  validate0.errors = vErrors;
+  return errors === 0;
+}
+
+const validateFormat = (data, schemaName = "format") => validate(data, schemaName) ? [] : validate.errors;
+
+console.
+/*OK*/
+log(validateFormat('invalid'));
+console.
+/*OK*/
+log(validateFormat('https://example.com'));
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-name-collision/input.js b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-name-collision/input.js
new file mode 100644
index 000000000000..3c464bd143c4
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-name-collision/input.js
@@ -0,0 +1,14 @@
+const validate0 = `
+  ajv creates a "validate0" identifier in module scope.
+  ajv's should be renamed, and this assignment should be preserved.
+`;
+
+const _schema = '',
+  _schema2 = 'generated value should be _schema3';
+
+import validate from './name-collision.schema.json' assert {type: 'json-schema'};
+
+validate(`
+  "validate" is ajvCompile's default output name.
+  This should not fail transform.
+`);
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-name-collision/name-collision.schema.json b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-name-collision/name-collision.schema.json
new file mode 100644
index 000000000000..394dbaa0f54c
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-name-collision/name-collision.schema.json
@@ -0,0 +1,9 @@
+{
+  "properties": {
+    "foo": {
+      "const": {
+        "bar": 123
+      }
+    }
+  }
+}
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-name-collision/options.json b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-name-collision/options.json
new file mode 100644
index 000000000000..239cccc175ab
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-name-collision/options.json
@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    "../../../.."
+  ],
+  "sourceType": "module"
+}
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-name-collision/output.mjs b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-name-collision/output.mjs
new file mode 100644
index 000000000000..b64aad44aa10
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-name-collision/output.mjs
@@ -0,0 +1,43 @@
+const _schema3 = {
+  bar: 123
+};
+const validate0 = `
+  ajv creates a "validate0" identifier in module scope.
+  ajv's should be renamed, and this assignment should be preserved.
+`;
+const _schema = '',
+      _schema2 = 'generated value should be _schema3';
+const _validate = _validate2;
+
+const func0 = require("ajv/dist/runtime/equal").default;
+
+function _validate2(data, instancePath = "") {
+  let vErrors = null;
+  let errors = 0;
+
+  if (data && typeof data == "object" && !Array.isArray(data)) {
+    if (data.foo !== undefined) {
+      if (!func0(data.foo, _schema3)) {
+        const err0 = (instancePath + "/foo" + ' ' + "must be equal to constant").trim();
+
+        if (vErrors === null) {
+          vErrors = [err0];
+        } else {
+          vErrors.push(err0);
+        }
+
+        errors++;
+      }
+    }
+  }
+
+  _validate2.errors = vErrors;
+  return errors === 0;
+}
+
+const validate = (data, schemaName = "name-collision") => _validate(data, schemaName) ? [] : _validate.errors;
+
+validate(`
+  "validate" is ajvCompile's default output name.
+  This should not fail transform.
+`);
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-object-enum/input.js b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-object-enum/input.js
new file mode 100644
index 000000000000..8ef0cc5cd0f9
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-object-enum/input.js
@@ -0,0 +1,3 @@
+import validate from './object-enum.schema.json' assert {type: 'json-schema'};
+
+console./*OK*/ log(validate({}));
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-object-enum/object-enum.schema.json b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-object-enum/object-enum.schema.json
new file mode 100644
index 000000000000..b9951d9f5e8a
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-object-enum/object-enum.schema.json
@@ -0,0 +1,94 @@
+{
+  "description": "This description should NOT be included in the schema object",
+  "type": "array",
+  "items": {
+    "properties": {
+      "prop_a": {
+        "oneOf": [
+          {
+            "type": "boolean"
+          },
+          {
+            "description": "This description should NOT be included in the schema object",
+            "enum": [
+              123,
+              345,
+              {
+                "foo": "This object should be included in the schema object",
+                "bar": {
+                  "all keys are included": true
+                }
+              },
+              "this string should NOT be included in the schema object",
+              "this string should also NOT be included in the schema object",
+              {
+                "bar": "This object should also be included in the schema object"
+              }
+            ]
+          }
+        ]
+      },
+      "prop_b": {},
+      "prop_c": {
+        "description": "This description should NOT be included in the schema object",
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "prop_x": {},
+          "prop_y": {},
+          "prop_z": {
+            "properties": {
+              "objectWithoutAditionalPropertiesA": {
+                "additionalProperties": false,
+                "properties": {
+                  "prop_a": {},
+                  "prop_b": {},
+                  "prop_c": {},
+                  "prop_d": {},
+                  "prop_e": {},
+                  "prop_f": {},
+                  "prop_g": {},
+                  "prop_h": {},
+                  "prop_i": {}
+                }
+              },
+              "objectWithoutAditionalPropertiesB": {
+                "additionalProperties": false,
+                "properties": {
+                  "prop_z": {},
+                  "prop_y": {},
+                  "prop_x": {},
+                  "prop_w": {
+                    "properties": {
+                      "prop_xyz": {
+                        "properties": {
+                          "prop_abc": {
+                            "enum": [
+                              "this string should NOT be included in the schema object",
+                              123,
+                              {
+                                "object": true,
+                                "bar": {
+                                  "all keys are included": true
+                                }
+                              }
+                            ]
+                          }
+                        }
+                      }
+                    }
+                  },
+                  "prop_v": {},
+                  "prop_u": {},
+                  "prop_t": {},
+                  "prop_s": {},
+                  "prop_r": {}
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-object-enum/options.json b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-object-enum/options.json
new file mode 100644
index 000000000000..239cccc175ab
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-object-enum/options.json
@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    "../../../.."
+  ],
+  "sourceType": "module"
+}
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-object-enum/output.mjs b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-object-enum/output.mjs
new file mode 100644
index 000000000000..103551a872df
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-object-enum/output.mjs
@@ -0,0 +1,255 @@
+const _schema = {
+  prop_a: 0,
+  prop_b: 0,
+  prop_c: 0,
+  prop_d: 0,
+  prop_e: 0,
+  prop_f: 0,
+  prop_g: 0,
+  prop_h: 0,
+  prop_i: 0
+},
+      _schema2 = {
+  prop_z: 0,
+  prop_y: 0,
+  prop_x: 0,
+  prop_w: 0,
+  prop_v: 0,
+  prop_u: 0,
+  prop_t: 0,
+  prop_s: 0,
+  prop_r: 0
+},
+      _schema3 = {
+  foo: "This object should be included in the schema object",
+  bar: {
+    "all keys are included": true
+  }
+},
+      _schema4 = {
+  bar: "This object should also be included in the schema object"
+},
+      _schema5 = {
+  object: true,
+  bar: {
+    "all keys are included": true
+  }
+};
+const _validate = validate0;
+
+const func0 = require("ajv/dist/runtime/equal").default;
+
+const func1 = Object.prototype.hasOwnProperty;
+
+function validate0(data, instancePath = "") {
+  let vErrors = null;
+  let errors = 0;
+
+  if (Array.isArray(data)) {
+    const len0 = data.length;
+
+    for (let i0 = 0; i0 < len0; i0++) {
+      let data0 = data[i0];
+
+      if (data0 && typeof data0 == "object" && !Array.isArray(data0)) {
+        if (data0.prop_a !== undefined) {
+          let data1 = data0.prop_a;
+          const _errs3 = errors;
+          let valid3 = false;
+          let passing0 = null;
+          const _errs4 = errors;
+
+          if (typeof data1 !== "boolean") {
+            const err0 = (instancePath + "/" + i0 + "/prop_a" + ' ' + "must be boolean").trim();
+
+            if (vErrors === null) {
+              vErrors = [err0];
+            } else {
+              vErrors.push(err0);
+            }
+
+            errors++;
+          }
+
+          var _valid0 = _errs4 === errors;
+
+          if (_valid0) {
+            valid3 = true;
+            passing0 = 0;
+          }
+
+          const _errs6 = errors;
+
+          if (!(data1 === 123 || data1 === 345 || func0(data1, _schema3) || data1 === "this string should NOT be included in the schema object" || data1 === "this string should also NOT be included in the schema object" || func0(data1, _schema4))) {
+            const err1 = (instancePath + "/" + i0 + "/prop_a" + ' ' + "must be equal to one of the allowed values").trim();
+
+            if (vErrors === null) {
+              vErrors = [err1];
+            } else {
+              vErrors.push(err1);
+            }
+
+            errors++;
+          }
+
+          var _valid0 = _errs6 === errors;
+
+          if (_valid0 && valid3) {
+            valid3 = false;
+            passing0 = [passing0, 1];
+          } else {
+            if (_valid0) {
+              valid3 = true;
+              passing0 = 1;
+            }
+          }
+
+          if (!valid3) {
+            const err2 = (instancePath + "/" + i0 + "/prop_a" + ' ' + "must match exactly one schema in oneOf").trim();
+
+            if (vErrors === null) {
+              vErrors = [err2];
+            } else {
+              vErrors.push(err2);
+            }
+
+            errors++;
+          } else {
+            errors = _errs3;
+
+            if (vErrors !== null) {
+              if (_errs3) {
+                vErrors.length = _errs3;
+              } else {
+                vErrors = null;
+              }
+            }
+          }
+        }
+
+        if (data0.prop_c !== undefined) {
+          let data2 = data0.prop_c;
+
+          if (data2 && typeof data2 == "object" && !Array.isArray(data2)) {
+            for (const key0 in data2) {
+              if (!(key0 === "prop_x" || key0 === "prop_y" || key0 === "prop_z")) {
+                const err3 = (instancePath + "/" + i0 + "/prop_c" + ' ' + "must NOT have additional properties").trim();
+
+                if (vErrors === null) {
+                  vErrors = [err3];
+                } else {
+                  vErrors.push(err3);
+                }
+
+                errors++;
+              }
+            }
+
+            if (data2.prop_z !== undefined) {
+              let data3 = data2.prop_z;
+
+              if (data3 && typeof data3 == "object" && !Array.isArray(data3)) {
+                if (data3.objectWithoutAditionalPropertiesA !== undefined) {
+                  let data4 = data3.objectWithoutAditionalPropertiesA;
+
+                  if (data4 && typeof data4 == "object" && !Array.isArray(data4)) {
+                    for (const key1 in data4) {
+                      if (!func1.call(_schema, key1)) {
+                        const err4 = (instancePath + "/" + i0 + "/prop_c/prop_z/objectWithoutAditionalPropertiesA" + ' ' + "must NOT have additional properties").trim();
+
+                        if (vErrors === null) {
+                          vErrors = [err4];
+                        } else {
+                          vErrors.push(err4);
+                        }
+
+                        errors++;
+                      }
+                    }
+                  }
+                }
+
+                if (data3.objectWithoutAditionalPropertiesB !== undefined) {
+                  let data5 = data3.objectWithoutAditionalPropertiesB;
+
+                  if (data5 && typeof data5 == "object" && !Array.isArray(data5)) {
+                    for (const key2 in data5) {
+                      if (!func1.call(_schema2, key2)) {
+                        const err5 = (instancePath + "/" + i0 + "/prop_c/prop_z/objectWithoutAditionalPropertiesB" + ' ' + "must NOT have additional properties").trim();
+
+                        if (vErrors === null) {
+                          vErrors = [err5];
+                        } else {
+                          vErrors.push(err5);
+                        }
+
+                        errors++;
+                      }
+                    }
+
+                    if (data5.prop_w !== undefined) {
+                      let data6 = data5.prop_w;
+
+                      if (data6 && typeof data6 == "object" && !Array.isArray(data6)) {
+                        if (data6.prop_xyz !== undefined) {
+                          let data7 = data6.prop_xyz;
+
+                          if (data7 && typeof data7 == "object" && !Array.isArray(data7)) {
+                            if (data7.prop_abc !== undefined) {
+                              let data8 = data7.prop_abc;
+
+                              if (!(data8 === "this string should NOT be included in the schema object" || data8 === 123 || func0(data8, _schema5))) {
+                                const err6 = (instancePath + "/" + i0 + "/prop_c/prop_z/objectWithoutAditionalPropertiesB/prop_w/prop_xyz/prop_abc" + ' ' + "must be equal to one of the allowed values").trim();
+
+                                if (vErrors === null) {
+                                  vErrors = [err6];
+                                } else {
+                                  vErrors.push(err6);
+                                }
+
+                                errors++;
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          } else {
+            const err7 = (instancePath + "/" + i0 + "/prop_c" + ' ' + "must be object").trim();
+
+            if (vErrors === null) {
+              vErrors = [err7];
+            } else {
+              vErrors.push(err7);
+            }
+
+            errors++;
+          }
+        }
+      }
+    }
+  } else {
+    const err8 = (instancePath + ' ' + "must be array").trim();
+
+    if (vErrors === null) {
+      vErrors = [err8];
+    } else {
+      vErrors.push(err8);
+    }
+
+    errors++;
+  }
+
+  validate0.errors = vErrors;
+  return errors === 0;
+}
+
+const validate = (data, schemaName = "object-enum") => _validate(data, schemaName) ? [] : _validate.errors;
+
+console.
+/*OK*/
+log(validate({}));
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-one-of/input.js b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-one-of/input.js
new file mode 100644
index 000000000000..badf4b8deb9a
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-one-of/input.js
@@ -0,0 +1,6 @@
+import validateOneOf from './one-of.schema.json' assert {type: 'json-schema'};
+
+console./*OK*/ log(validateOneOf('invalid'));
+console./*OK*/ log(validateOneOf(0));
+console./*OK*/ log(validateOneOf(1));
+console./*OK*/ log(validateOneOf(true));
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-one-of/one-of.schema.json b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-one-of/one-of.schema.json
new file mode 100644
index 000000000000..8d53193e33a3
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-one-of/one-of.schema.json
@@ -0,0 +1,10 @@
+{
+  "oneOf": [
+    {
+      "const": 0
+    },
+    {
+      "type": "string"
+    }
+  ]
+}
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-one-of/options.json b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-one-of/options.json
new file mode 100644
index 000000000000..239cccc175ab
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-one-of/options.json
@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    "../../../.."
+  ],
+  "sourceType": "module"
+}
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-one-of/output.mjs b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-one-of/output.mjs
new file mode 100644
index 000000000000..518afa13b6a1
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-one-of/output.mjs
@@ -0,0 +1,95 @@
+const validate = validate0;
+
+function validate0(data, instancePath = "") {
+  let vErrors = null;
+  let errors = 0;
+  const _errs0 = errors;
+  let valid0 = false;
+  let passing0 = null;
+  const _errs1 = errors;
+
+  if (0 !== data) {
+    const err0 = (instancePath + ' ' + "must be equal to constant").trim();
+
+    if (vErrors === null) {
+      vErrors = [err0];
+    } else {
+      vErrors.push(err0);
+    }
+
+    errors++;
+  }
+
+  var _valid0 = _errs1 === errors;
+
+  if (_valid0) {
+    valid0 = true;
+    passing0 = 0;
+  }
+
+  const _errs2 = errors;
+
+  if (typeof data !== "string") {
+    const err1 = (instancePath + ' ' + "must be string").trim();
+
+    if (vErrors === null) {
+      vErrors = [err1];
+    } else {
+      vErrors.push(err1);
+    }
+
+    errors++;
+  }
+
+  var _valid0 = _errs2 === errors;
+
+  if (_valid0 && valid0) {
+    valid0 = false;
+    passing0 = [passing0, 1];
+  } else {
+    if (_valid0) {
+      valid0 = true;
+      passing0 = 1;
+    }
+  }
+
+  if (!valid0) {
+    const err2 = (instancePath + ' ' + "must match exactly one schema in oneOf").trim();
+
+    if (vErrors === null) {
+      vErrors = [err2];
+    } else {
+      vErrors.push(err2);
+    }
+
+    errors++;
+  } else {
+    errors = _errs0;
+
+    if (vErrors !== null) {
+      if (_errs0) {
+        vErrors.length = _errs0;
+      } else {
+        vErrors = null;
+      }
+    }
+  }
+
+  validate0.errors = vErrors;
+  return errors === 0;
+}
+
+const validateOneOf = (data, schemaName = "one-of") => validate(data, schemaName) ? [] : validate.errors;
+
+console.
+/*OK*/
+log(validateOneOf('invalid'));
+console.
+/*OK*/
+log(validateOneOf(0));
+console.
+/*OK*/
+log(validateOneOf(1));
+console.
+/*OK*/
+log(validateOneOf(true));
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-refs/input.js b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-refs/input.js
new file mode 100644
index 000000000000..d2908043276e
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-refs/input.js
@@ -0,0 +1,14 @@
+import validateRefs from './refs.schema.json' assert {type: 'json-schema'};
+
+console./*OK*/ log(
+  validateRefs({
+    foo: 'foo',
+    bar: 'foo',
+  })
+);
+console./*OK*/ log(
+  validateRefs({
+    foo: 'https://foo.com',
+    bar: 'https://bar.org',
+  })
+);
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-refs/options.json b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-refs/options.json
new file mode 100644
index 000000000000..239cccc175ab
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-refs/options.json
@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    "../../../.."
+  ],
+  "sourceType": "module"
+}
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-refs/output.mjs b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-refs/output.mjs
new file mode 100644
index 000000000000..90952aba3bdc
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-refs/output.mjs
@@ -0,0 +1,86 @@
+const validate = validate0;
+const formats0 = /^(?:[a-z][a-z0-9+\-.]*:)(?:\/?\/)?[^\s]*$/i;
+const pattern0 = new RegExp("^https://", "u");
+
+function validate1(data, instancePath = "") {
+  let vErrors = null;
+  let errors = 0;
+
+  if (typeof data === "string") {
+    if (!pattern0.test(data)) {
+      const err0 = (instancePath + ' ' + ("must match pattern \"" + "^https://" + "\"")).trim();
+
+      if (vErrors === null) {
+        vErrors = [err0];
+      } else {
+        vErrors.push(err0);
+      }
+
+      errors++;
+    }
+
+    if (!formats0.test(data)) {
+      const err1 = (instancePath + ' ' + ("must match format \"" + "uri" + "\"")).trim();
+
+      if (vErrors === null) {
+        vErrors = [err1];
+      } else {
+        vErrors.push(err1);
+      }
+
+      errors++;
+    }
+  } else {
+    const err2 = (instancePath + ' ' + "must be string").trim();
+
+    if (vErrors === null) {
+      vErrors = [err2];
+    } else {
+      vErrors.push(err2);
+    }
+
+    errors++;
+  }
+
+  validate1.errors = vErrors;
+  return errors === 0;
+}
+
+function validate0(data, instancePath = "") {
+  let vErrors = null;
+  let errors = 0;
+
+  if (data && typeof data == "object" && !Array.isArray(data)) {
+    if (data.foo !== undefined) {
+      if (!validate1(data.foo, instancePath + "/foo")) {
+        vErrors = vErrors === null ? validate1.errors : vErrors.concat(validate1.errors);
+        errors = vErrors.length;
+      }
+    }
+
+    if (data.bar !== undefined) {
+      if (!validate1(data.bar, instancePath + "/bar")) {
+        vErrors = vErrors === null ? validate1.errors : vErrors.concat(validate1.errors);
+        errors = vErrors.length;
+      }
+    }
+  }
+
+  validate0.errors = vErrors;
+  return errors === 0;
+}
+
+const validateRefs = (data, schemaName = "refs") => validate(data, schemaName) ? [] : validate.errors;
+
+console.
+/*OK*/
+log(validateRefs({
+  foo: 'foo',
+  bar: 'foo'
+}));
+console.
+/*OK*/
+log(validateRefs({
+  foo: 'https://foo.com',
+  bar: 'https://bar.org'
+}));
diff --git a/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-refs/refs.schema.json b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-refs/refs.schema.json
new file mode 100644
index 000000000000..93a4efc24da6
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-transform-json-import/test/fixtures/transform-assertions/schema-refs/refs.schema.json
@@ -0,0 +1,17 @@
+{
+  "$defs": {
+    "https": {
+      "type": "string",
+      "format": "uri",
+      "pattern": "^https://"
+    }
+  },
+  "properties": {
+    "foo": {
+      "$ref": "#/$defs/https"
+    },
+    "bar": {
+      "$ref": "#/$defs/https"
+    }
+  }
+}
diff --git a/build-system/babel-plugins/babel-plugin-transform-rename-privates/index.js b/build-system/babel-plugins/babel-plugin-transform-rename-privates/index.js
index 9cf6414485c1..4cf62b7b599b 100644
--- a/build-system/babel-plugins/babel-plugin-transform-rename-privates/index.js
+++ b/build-system/babel-plugins/babel-plugin-transform-rename-privates/index.js
@@ -28,15 +28,16 @@ module.exports = function (babel) {
         return;
       }
 
-      const {name} = key.node;
+      const {node} = key;
+      const {name} = node;
       if (name.endsWith('_AMP_PRIVATE_')) {
         return;
       }
 
-      if (!name.endsWith('_')) {
+      if (!name.endsWith('_') || name === '__proto__') {
         return;
       }
-      key.replaceWith(t.identifier(`${name}AMP_PRIVATE_`));
+      key.replaceWith(t.inherits(t.identifier(`${name}AMP_PRIVATE_`), node));
     };
   }
 
diff --git a/build-system/babel-plugins/log-module-metadata.js b/build-system/babel-plugins/log-module-metadata.js
index a14161e8c06f..f79cdc239c4f 100644
--- a/build-system/babel-plugins/log-module-metadata.js
+++ b/build-system/babel-plugins/log-module-metadata.js
@@ -17,7 +17,7 @@ const assertAliases = singletonFunctions.map((prefix) => `${prefix}Assert`);
 
 /**
  * Known transformable logging methods.
- * @type {!Object<string, LogMethodMetadataDef>}
+ * @type {!{[key: string]: LogMethodMetadataDef}}
  */
 const transformableMethods = {
   assert: {variadic: true, extractMessages: true, messageArgPos: 1},
diff --git a/build-system/babel-plugins/static-template-metadata.js b/build-system/babel-plugins/static-template-metadata.js
index 2182f293cc69..7a49e7b99697 100644
--- a/build-system/babel-plugins/static-template-metadata.js
+++ b/build-system/babel-plugins/static-template-metadata.js
@@ -2,7 +2,7 @@
 
 /**
  * Maps of factory functions to enforced declared tag name.
- * @type {Object<string, string>}
+ * @type {{[key: string]: string}}
  */
 exports.staticTemplateFactories = {
   'htmlFor': 'html',
diff --git a/build-system/common/OWNERS b/build-system/common/OWNERS
index 002922bb9cc9..69a88bfe0386 100644
--- a/build-system/common/OWNERS
+++ b/build-system/common/OWNERS
@@ -4,7 +4,7 @@
 {
   rules: [
     {
-      owners: [{name: 'ampproject/wg-infra'}, {name: 'rsimha', notify: true}],
+      owners: [{name: 'ampproject/wg-infra'}],
     },
   ],
 }
diff --git a/build-system/common/ci.js b/build-system/common/ci.js
index 55cd34a2fabb..0d88c17b8084 100644
--- a/build-system/common/ci.js
+++ b/build-system/common/ci.js
@@ -66,8 +66,8 @@ function isPullRequestBuild() {
   return isGithubActions
     ? env('GITHUB_EVENT_NAME') === 'pull_request'
     : isCircleci
-    ? !isCircleciPushBranch(env('CIRCLE_BRANCH'))
-    : false;
+      ? !isCircleciPushBranch(env('CIRCLE_BRANCH'))
+      : false;
 }
 
 /**
@@ -78,8 +78,8 @@ function isPushBuild() {
   return isGithubActions
     ? env('GITHUB_EVENT_NAME') === 'push'
     : isCircleci
-    ? isCircleciPushBranch(env('CIRCLE_BRANCH'))
-    : false;
+      ? isCircleciPushBranch(env('CIRCLE_BRANCH'))
+      : false;
 }
 
 /**
@@ -90,8 +90,8 @@ function ciPullRequestBranch() {
   return isGithubActions
     ? env('GITHUB_HEAD_REF')
     : isCircleci
-    ? env('CIRCLE_BRANCH')
-    : '';
+      ? env('CIRCLE_BRANCH')
+      : '';
 }
 
 /**
@@ -102,8 +102,8 @@ function ciPullRequestSha() {
   return isGithubActions
     ? require(env('GITHUB_EVENT_PATH')).pull_request.head.sha
     : isCircleci
-    ? env('CIRCLE_SHA1')
-    : '';
+      ? env('CIRCLE_SHA1')
+      : '';
 }
 
 /**
@@ -114,8 +114,8 @@ function ciPushBranch() {
   return isGithubActions
     ? env('GITHUB_REF')
     : isCircleci
-    ? env('CIRCLE_BRANCH')
-    : '';
+      ? env('CIRCLE_BRANCH')
+      : '';
 }
 
 /**
@@ -126,8 +126,8 @@ function ciCommitSha() {
   return isGithubActions
     ? env('GITHUB_SHA')
     : isCircleci
-    ? env('CIRCLE_SHA1')
-    : '';
+      ? env('CIRCLE_SHA1')
+      : '';
 }
 
 /**
@@ -138,8 +138,8 @@ function ciBuildId() {
   return isGithubActions
     ? env('GITHUB_RUN_ID')
     : isCircleci
-    ? env('CIRCLE_WORKFLOW_ID')
-    : '';
+      ? env('CIRCLE_WORKFLOW_ID')
+      : '';
 }
 
 /**
@@ -150,8 +150,8 @@ function ciBuildUrl() {
   return isGithubActions
     ? `${env('GITHUB_SERVER_URL')}/${env('GITHUB_REPOSITORY')}/actions/runs/${env('GITHUB_RUN_ID')}` // prettier-ignore
     : isCircleci
-    ? `https://app.circleci.com/pipelines/workflows/${env('CIRCLE_WORKFLOW_ID')}` // prettier-ignore
-    : '';
+      ? `https://app.circleci.com/pipelines/workflows/${env('CIRCLE_WORKFLOW_ID')}` // prettier-ignore
+      : '';
 }
 
 /**
@@ -162,21 +162,16 @@ function ciJobId() {
   return isGithubActions
     ? env('GITHUB_RUN_NUMBER')
     : isCircleci
-    ? env('CIRCLE_JOB')
-    : '';
+      ? env('CIRCLE_JOB')
+      : '';
 }
 
 /**
  * Returns the URL of the current job.
  * @return {string}
  */
-function ciJobUrl() {
-  return isGithubActions
-    ? // TODO(rsimha): Try to reverse engineer the GH Actions job URL from the build URL.
-      `${env('GITHUB_SERVER_URL')}/${env('GITHUB_REPOSITORY')}/actions/runs/${env('GITHUB_RUN_ID')}` // prettier-ignore
-    : isCircleci
-    ? env('CIRCLE_BUILD_URL')
-    : '';
+function circleciJobUrl() {
+  return isCircleci ? env('CIRCLE_BUILD_URL') : '';
 }
 
 /**
@@ -189,12 +184,34 @@ function circleciPrMergeCommit() {
 }
 
 /**
- * Returns an identifier that is unique to each CircleCI job. This is different
- * from the workflow ID, which is common across all jobs in a workflow.
+ * Returns an identifier that is unique to each CircleCI build, discerning for
+ * parallelized builds
+ *
+ * Note that this is different from the workflow ID, which is common across all,
+ * and also different from the build number, which is common across parallelized
+ * builds.
  * @return {string}
  */
-function circleciBuildNumber() {
-  return isCircleci ? env('CIRCLE_BUILD_NUM') : '';
+function circleciUniqueBuildNumber() {
+  return isCircleci
+    ? `${env('CIRCLE_BUILD_NUM')}.${env('CIRCLE_NODE_INDEX')}`
+    : '';
+}
+
+/**
+ * Returns true for parallelized CircleCI builds.
+ * @return {boolean}
+ */
+function circleciIsParallelized() {
+  return isCircleci && env('CIRCLE_NODE_TOTAL') != '1';
+}
+
+/**
+ * Returns the parallelized build's shard number.
+ * @return {number}
+ */
+function circleciNodeIndex() {
+  return isCircleci ? Number(env('CIRCLE_NODE_INDEX')) : 0;
 }
 
 /**
@@ -205,8 +222,8 @@ function ciRepoSlug() {
   return isGithubActions
     ? env('GITHUB_REPOSITORY')
     : isCircleci
-    ? `${env('CIRCLE_PROJECT_USERNAME')}/${env('CIRCLE_PROJECT_REPONAME')}`
-    : '';
+      ? `${env('CIRCLE_PROJECT_USERNAME')}/${env('CIRCLE_PROJECT_REPONAME')}`
+      : '';
 }
 
 /**
@@ -223,11 +240,13 @@ module.exports = {
   ciBuildUrl,
   ciCommitSha,
   ciJobId,
-  ciJobUrl,
+  circleciJobUrl,
   ciPullRequestBranch,
   ciPullRequestSha,
   ciPushBranch,
-  circleciBuildNumber,
+  circleciUniqueBuildNumber,
+  circleciIsParallelized,
+  circleciNodeIndex,
   circleciPrMergeCommit,
   ciRepoSlug,
   isCiBuild,
diff --git a/build-system/common/ctrlcHandler.js b/build-system/common/ctrlcHandler.js
index 2583221a7235..54aa3ab6c743 100644
--- a/build-system/common/ctrlcHandler.js
+++ b/build-system/common/ctrlcHandler.js
@@ -38,9 +38,13 @@ exports.createCtrlcHandler = function (command, pid = process.pid) {
     trap 'ctrlcHandler' INT
     read _ # Waits until the process is terminated
   `;
-  return execScriptAsync(listenerCmd, {
+  const {pid: handlerPid} = execScriptAsync(listenerCmd, {
     'stdio': [null, process.stdout, process.stderr],
-  }).pid;
+  });
+  if (!handlerPid) {
+    throw new Error(`Failed to create ctrlcHandler for ${command}`);
+  }
+  return handlerPid;
 };
 
 /**
diff --git a/build-system/common/esbuild-babel.js b/build-system/common/esbuild-babel.js
index 6ef87a44174a..c197301b7931 100644
--- a/build-system/common/esbuild-babel.js
+++ b/build-system/common/esbuild-babel.js
@@ -1,11 +1,26 @@
 const babel = require('@babel/core');
+const {createHash} = require('crypto');
 const path = require('path');
 const {debug} = require('../compile/debug-compilation-lifecycle');
+const {includeSourcesContent} = require('../tasks/sourcemaps');
 const {TransformCache, batchedRead, md5} = require('./transform-cache');
+const Remapping = require('@ampproject/remapping');
+
+/** @type {Remapping.default} */
+const remapping = /** @type {*} */ (Remapping);
+
+/**
+ * @typedef {{
+ *   filename: string,
+ *   code: string,
+ *   map: Object,
+ * }}
+ */
+let CacheMessageDef;
 
 /**
  * Used to cache babel transforms done by esbuild.
- * @const {TransformCache}
+ * @type {TransformCache<!CacheMessageDef>}
  */
 let transformCache;
 
@@ -14,27 +29,31 @@ let transformCache;
  * caching to speed up transforms.
  * @param {string} callerName
  * @param {boolean} enableCache
- * @param {function(): void} preSetup
- * @param {function(): void} postLoad
+ * @param {{
+ *   preSetup?: () => void,
+ *   postLoad?: () => void,
+ *   plugins?: null | import('@babel/core').PluginItem[],
+ * }} callbacks
  * @return {!Object}
  */
 function getEsbuildBabelPlugin(
   callerName,
   enableCache,
-  preSetup = () => {},
-  postLoad = () => {}
+  {plugins, postLoad = () => {}, preSetup = () => {}} = {}
 ) {
+  const babelMaps = new Map();
+
   /**
    * @param {string} filename
    * @param {string} contents
    * @param {string} hash
-   * @param {Object} babelOptions
-   * @return {Promise}
+   * @param {object} babelOptions
+   * @return {!Promise<!CacheMessageDef>}
    */
   async function transformContents(filename, contents, hash, babelOptions) {
     if (enableCache) {
       if (!transformCache) {
-        transformCache = new TransformCache('.babel-cache', '.js');
+        transformCache = new TransformCache('.babel-cache');
       }
       const cached = transformCache.get(hash);
       if (cached) {
@@ -42,20 +61,18 @@ function getEsbuildBabelPlugin(
       }
     }
 
-    debug('pre-babel', filename, contents);
     const promise = babel
       .transformAsync(contents, babelOptions)
       .then((result) => {
-        const {code, map} = result || {};
-        debug('post-babel', filename, code, map);
-        return code + `\n// ${filename}`;
+        const {code, map} = /** @type {!babel.BabelFileResult} */ (result);
+        return {filename, code: code || '', map};
       });
 
     if (enableCache) {
       transformCache.set(hash, promise);
     }
 
-    return promise.finally(postLoad);
+    return promise;
   }
 
   return {
@@ -64,28 +81,142 @@ function getEsbuildBabelPlugin(
     async setup(build) {
       preSetup();
 
-      const babelOptions =
-        babel.loadOptions({caller: {name: callerName}}) || {};
-      const optionsHash = md5(
-        JSON.stringify({babelOptions, argv: process.argv.slice(2)})
+      const {initialOptions} = build;
+      const {sourcemap} = initialOptions;
+      const inlineSourcemap = sourcemap === 'inline' || sourcemap === 'both';
+      if (inlineSourcemap) {
+        initialOptions.sorucemap = true;
+      }
+
+      build.onLoad(
+        {filter: /\.(cjs|mjs|js|jsx|ts|tsx)$/, namespace: ''},
+        async (file) => {
+          const filename = file.path;
+          const babelOptions = /** @type {*} */ (
+            babel.loadOptions({caller: {name: callerName}, filename}) || {}
+          );
+          babelOptions.sourceMaps = true;
+          if (plugins) {
+            babelOptions.plugins = [...babelOptions.plugins, ...plugins];
+          }
+
+          const {contents, hash} = await batchedRead(filename);
+          const rehash = md5(
+            JSON.stringify({
+              callerName,
+              filename,
+              hash,
+              babelOptions,
+              argv: process.argv.slice(2),
+            })
+          );
+
+          debug('pre-babel', filename, contents);
+          const {code, map} = await transformContents(
+            filename,
+            contents,
+            rehash,
+            getFileBabelOptions(babelOptions, filename)
+          );
+
+          debug('post-babel', filename, code, map);
+          babelMaps.set(filename, map);
+          postLoad?.();
+          return {contents: code};
+        }
       );
 
-      build.onLoad({filter: /\.[cm]?js$/, namespace: ''}, async (file) => {
-        const filename = file.path;
-        const {contents, hash} = await batchedRead(filename, optionsHash);
+      build.onEnd(async (result) => {
+        const {outputFiles} = result;
+        const code = outputFiles.find(({path}) => !path.endsWith('.map'));
+        const map = outputFiles.find(({path}) => path.endsWith('.map'));
 
-        const transformed = await transformContents(
-          filename,
-          contents,
-          hash,
-          getFileBabelOptions(babelOptions, filename)
+        if (!map) {
+          debug('post-esbuild', code?.path, code?.text);
+          return;
+        }
+
+        const root = path.dirname(map.path);
+        const nodeMods = path.normalize('/node_modules/');
+        const remapped = remapping(
+          map.text,
+          (f, ctx) => {
+            // The Babel tranformed file and the original file have the same
+            // path, which makes it difficult to distinguish during remapping's
+            // load phase. To prevent an infinite recursion, we check if the
+            // importer is ourselves (which is nonsensical) and early exit.
+            if (f === ctx.importer) {
+              return null;
+            }
+
+            const file = path.join(root, f);
+            const map = babelMaps.get(file);
+            if (!map) {
+              if (file.includes(nodeMods) || file.endsWith('.json')) {
+                // Excuse node_modules and JSON files since they may have been
+                // marked external (and so not processed by babel).
+                return null;
+              }
+              throw new Error(`failed to find sourcemap for babel file "${f}"`);
+            }
+            return map;
+          },
+          !includeSourcesContent()
         );
-        return {contents: transformed};
+
+        debug('post-esbuild', code.path, code.text, remapped);
+
+        const sourcemapJson = remapped.toString();
+        replaceOutputFile(outputFiles, map, sourcemapJson);
+        if (inlineSourcemap) {
+          const base64 = Buffer.from(sourcemapJson).toString('base64');
+          replaceOutputFile(
+            outputFiles,
+            code,
+            code.text.replace(
+              /sourceMappingURL=.*/,
+              `sourceMappingURL=data:application/json;charset=utf-8;base64,${base64}`
+            )
+          );
+        }
       });
     },
   };
 }
 
+/**
+ * @param {Array<import('esbuild').OutputFile>} outputFiles
+ * @param {import('esbuild').OutputFile} original
+ * @param {string} text
+ */
+function replaceOutputFile(outputFiles, original, text) {
+  const index = outputFiles.indexOf(original);
+  if (index === -1) {
+    throw new Error(`couldn't find outputFile ${original.path}`);
+  }
+
+  let contents;
+  const generateContents = () =>
+    // eslint-disable-next-line local/no-forbidden-terms
+    (contents ||= new TextEncoder().encode(text));
+
+  let hash;
+  const generateHash = () =>
+    (hash ||= createHash('sha1').update(text).digest('hex'));
+
+  const file = {
+    path: original.path,
+    text,
+    get contents() {
+      return generateContents();
+    },
+    get hash() {
+      return generateHash();
+    },
+  };
+  outputFiles[index] = file;
+}
+
 const CJS_TRANSFORMS = new Set([
   'transform-modules-commonjs',
   'proposal-dynamic-import',
@@ -113,10 +244,12 @@ function getFileBabelOptions(babelOptions, filename) {
 
   // The amp runner automatically sets cwd to the `amphtml` directory.
   const root = process.cwd();
+  const filenameRelative = path.relative(root, filename);
+
   return {
     ...babelOptions,
     filename,
-    filenameRelative: path.relative(root, filename),
+    filenameRelative,
   };
 }
 
diff --git a/build-system/common/fs.js b/build-system/common/fs.js
new file mode 100644
index 000000000000..28d35e3e4cd5
--- /dev/null
+++ b/build-system/common/fs.js
@@ -0,0 +1,18 @@
+const glob = require('globby');
+
+/**
+ * @param {string} nameWithoutExtension
+ * @param {?string|void} cwd
+ * @return {Promise<string|undefined>}
+ */
+async function findJsSourceFilename(nameWithoutExtension, cwd) {
+  const [filename] = await glob(
+    `${nameWithoutExtension}.{js,ts,tsx}`,
+    cwd ? {cwd} : undefined
+  );
+  return filename;
+}
+
+module.exports = {
+  findJsSourceFilename,
+};
diff --git a/build-system/common/logging.js b/build-system/common/logging.js
index 1f8e39ed2050..5614522dacd0 100644
--- a/build-system/common/logging.js
+++ b/build-system/common/logging.js
@@ -7,7 +7,7 @@ const {isCiBuild} = require('./ci');
  * Used by tests to wrap progress dots. Attempts to match the terminal width
  * during local development and defaults to 150 if it couldn't be determined.
  */
-const dotWrappingWidth = isCiBuild() ? 150 : process.stdout.columns ?? 150;
+const dotWrappingWidth = isCiBuild() ? 150 : (process.stdout.columns ?? 150);
 
 /**
  * Used by CI job scripts to print a prefix before top-level logging lines.
diff --git a/build-system/common/once.js b/build-system/common/once.js
new file mode 100644
index 000000000000..86a857df7b4b
--- /dev/null
+++ b/build-system/common/once.js
@@ -0,0 +1,20 @@
+/**
+ * @param {() => T} fn
+ * @return {() => T}
+ * @template T
+ */
+function once(fn) {
+  let evaluated = false;
+  let value;
+  return () => {
+    if (!evaluated) {
+      evaluated = true;
+      value = fn();
+    }
+    return value;
+  };
+}
+
+module.exports = {
+  once,
+};
diff --git a/build-system/common/preact-prop-names.js b/build-system/common/preact-prop-names.js
new file mode 100644
index 000000000000..f39cf9226f60
--- /dev/null
+++ b/build-system/common/preact-prop-names.js
@@ -0,0 +1,115 @@
+'use strict';
+
+/**
+ * @fileoverview This file contains the mappings between React and Preact style props. For more info,
+ * see https://preactjs.com/guide/v10/differences-to-react/#raw-html-attributeproperty-names.
+ */
+
+/**
+ * @param {object} obj
+ * @return {object}
+ */
+function objectFlip(obj) {
+  const ret = {};
+  Object.keys(obj).forEach((key) => {
+    ret[obj[key]] = key;
+  });
+  return ret;
+}
+
+const DOM_ATTRIBUTES_REACT_TO_PREACT = {
+  className: 'class',
+  tabIndex: 'tabindex',
+};
+
+/**
+ * This list derives all hyphenated attributes from
+ * https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute
+ */
+const SVG_ATTRIBUTES_REACT_TO_PREACT = {
+  accentHeight: 'accent-height',
+  alignmentBaseline: 'alignment-baseline',
+  arabicForm: 'arabic-form',
+  baselineShift: 'baseline-shift',
+  capHeight: 'cap-height',
+  clipPath: 'clip-path',
+  clipRule: 'clip-rule',
+  colorInterpolation: 'color-interpolation',
+  colorInterpolationFilters: 'color-interpolation-filters',
+  colorProfile: 'color-profile',
+  colorRendering: 'color-rendering',
+  dominantBaseline: 'dominant-baseline',
+  enableBackground: 'enable-background',
+  fillOpacity: 'fill-opacity',
+  fillRule: 'fill-rule',
+  floodColor: 'flood-color',
+  floodOpacity: 'flood-opacity',
+  fontFamily: 'font-family',
+  fontSize: 'font-size',
+  fontSizeAdjust: 'font-size-adjust',
+  fontStretch: 'font-stretch',
+  fontStyle: 'font-style',
+  fontVariant: 'font-variant',
+  fontWeight: 'font-weight',
+  glyphName: 'glyph-name',
+  glyphOrientationHorizontal: 'glyph-orientation-horizontal',
+  glyphOrientationVertical: 'glyph-orientation-vertical',
+  horizAdvX: 'horiz-adv-x',
+  horizOriginX: 'horiz-origin-x',
+  imageRendering: 'image-rendering',
+  letterSpacing: 'letter-spacing',
+  lightingColor: 'lighting-color',
+  markerEnd: 'marker-end',
+  markerMid: 'marker-mid',
+  markerStart: 'marker-start',
+  overlinePosition: 'overline-position',
+  overlineThickness: 'overline-thickness',
+  paintOrder: 'paint-order',
+  panose1: 'panose-1',
+  pointerEvents: 'pointer-events',
+  renderingIntent: 'rendering-intent',
+  shapeRendering: 'shape-rendering',
+  stopColor: 'stop-color',
+  stopOpacity: 'stop-opacity',
+  strikethroughPosition: 'strikethrough-position',
+  strikethroughThickness: 'strikethrough-thickness',
+  strokeDasharray: 'stroke-dasharray',
+  strokeDashoffset: 'stroke-dashoffset',
+  strokeLinecap: 'stroke-linecap',
+  strokeLinejoin: 'stroke-linejoin',
+  strokeMiterlimit: 'stroke-miterlimit',
+  strokeOpacity: 'stroke-opacity',
+  strokeWidth: 'stroke-width',
+  textAnchor: 'text-anchor',
+  textDecoration: 'text-decoration',
+  textRendering: 'text-rendering',
+  transformOrigin: 'transform-origin',
+  underlinePosition: 'underline-position',
+  underlineThickness: 'underline-thickness',
+  unicodeBidi: 'unicode-bidi',
+  unicodeRange: 'unicode-range',
+  unitsPerEm: 'units-per-em',
+  vAlphabetic: 'v-alphabetic',
+  vHanging: 'v-hanging',
+  vIdeographic: 'v-ideographic',
+  vMathematical: 'v-mathematical',
+  vectorEffect: 'vector-effect',
+  vertAdvY: 'vert-adv-y',
+  vertOriginX: 'vert-origin-x',
+  vertOriginY: 'vert-origin-y',
+  wordSpacing: 'word-spacing',
+  writingMode: 'writing-mode',
+  xHeight: 'x-height',
+};
+
+const ATTRIBUTES_REACT_TO_PREACT = {
+  ...DOM_ATTRIBUTES_REACT_TO_PREACT,
+  ...SVG_ATTRIBUTES_REACT_TO_PREACT,
+};
+
+const ATTRIBUTES_PREACT_TO_REACT = objectFlip(ATTRIBUTES_REACT_TO_PREACT);
+
+module.exports = {
+  ATTRIBUTES_REACT_TO_PREACT,
+  ATTRIBUTES_PREACT_TO_REACT,
+};
diff --git a/build-system/common/transform-cache.js b/build-system/common/transform-cache.js
index d8650a57c23e..4d1f6f20f1b0 100644
--- a/build-system/common/transform-cache.js
+++ b/build-system/common/transform-cache.js
@@ -2,23 +2,25 @@ const crypto = require('crypto');
 const fs = require('fs-extra');
 const path = require('path');
 
+/**
+ * Used to bust caches when the TransformCache makes a breaking change to the API.
+ */
+const API_VERSION = 2;
+
 /**
  * Cache for storing transformed files on both memory and on disk.
+ * @template T
  */
 class TransformCache {
   /**
    * @param {string} cacheName
-   * @param {string} fileExtension
    */
-  constructor(cacheName, fileExtension) {
-    /** @type {string} */
-    this.fileExtension = fileExtension;
-
+  constructor(cacheName) {
     /** @type {string} */
     this.cacheDir = path.resolve(__dirname, '..', '..', cacheName);
     fs.ensureDirSync(this.cacheDir);
 
-    /** @type {Map<string, Promise<Buffer|string>>} */
+    /** @type {Map<string, Promise<T>>} */
     this.transformMap = new Map();
 
     /** @type {Set<string>} */
@@ -27,35 +29,45 @@ class TransformCache {
 
   /**
    * @param {string} hash
-   * @return {null|Promise<Buffer|string>}
+   * @return {null|Promise<T>}
    */
   get(hash) {
     const cached = this.transformMap.get(hash);
     if (cached) {
       return cached;
     }
-    const filename = hash + this.fileExtension;
+
+    const filename = this.key_(hash);
     if (this.fsCache.has(filename)) {
-      const transformedPromise = fs.readFile(
-        path.join(this.cacheDir, filename)
-      );
-      this.transformMap.set(hash, transformedPromise);
-      return transformedPromise;
+      const persisted = fs.readJson(path.join(this.cacheDir, filename));
+      this.transformMap.set(hash, persisted);
+      return persisted;
     }
+
     return null;
   }
 
   /**
    * @param {string} hash
-   * @param {Promise<string>} transformPromise
+   * @param {Promise<T>} transformPromise
    */
   set(hash, transformPromise) {
     if (this.transformMap.has(hash)) {
-      throw new Error('Read race: Attempting to transform a file twice.');
+      throw new Error(`Read race: Attempting to transform ${hash} file twice.`);
     }
     this.transformMap.set(hash, transformPromise);
-    const filepath = path.join(this.cacheDir, hash) + this.fileExtension;
-    transformPromise.then((contents) => fs.outputFile(filepath, contents));
+
+    const filepath = path.join(this.cacheDir, this.key_(hash));
+    transformPromise.then((contents) => fs.outputJson(filepath, contents));
+  }
+
+  /**
+   * @param {string} hash
+   * @return {string}
+   * @private
+   */
+  key_(hash) {
+    return `${API_VERSION}_${hash}.json`;
   }
 }
 
@@ -91,17 +103,16 @@ const readCache = new Map();
  * completed, the result will be reused.
  *
  * @param {string} path
- * @param {string=} optionsHash
  * @return {Promise<ReadResult>}
  */
-function batchedRead(path, optionsHash) {
+function batchedRead(path) {
   let read = readCache.get(path);
   if (!read) {
     read = fs
       .readFile(path)
       .then((contents) => ({
         contents,
-        hash: md5(contents, optionsHash ?? ''),
+        hash: md5(contents),
       }))
       .finally(() => {
         readCache.delete(path);
diff --git a/build-system/common/update-packages.js b/build-system/common/update-packages.js
index 22aefe768d36..f7a1efac61e4 100644
--- a/build-system/common/update-packages.js
+++ b/build-system/common/update-packages.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const checkDependencies = require('check-dependencies');
-const del = require('del');
 const fs = require('fs-extra');
 const path = require('path');
 const {cyan, red} = require('kleur/colors');
@@ -45,16 +44,6 @@ function patchWebAnimations() {
     }
     return 'window.' + a;
   });
-  // Fix web-animations-js code that violates strict mode.
-  // See https://github.com/ampproject/amphtml/issues/18612 and
-  // https://github.com/web-animations/web-animations-js/issues/46
-  file = file.replace(/b.true=a/g, 'b?b.true=a:true');
-
-  // Fix web-animations-js code that attempts to write a read-only property.
-  // See https://github.com/ampproject/amphtml/issues/19783 and
-  // https://github.com/web-animations/web-animations-js/issues/160
-  file = file.replace(/this\._isFinished\s*=\s*\!0,/, '');
-
   // Wrap the contents inside the install function.
   file =
     'export function installWebAnimations(window) {\n' +
@@ -189,27 +178,6 @@ function patchShadowDom() {
 
   writeIfUpdated(patchedName, file);
 }
-/**
- * Adds a missing export statement to the preact module.
- */
-function patchPreact() {
-  fs.ensureDirSync('node_modules/preact/dom');
-  const file = `export { render, hydrate } from 'preact';`;
-  writeIfUpdated('node_modules/preact/dom/index.js', file);
-}
-
-/**
- * Deletes the map file for rrule, which breaks closure compiler.
- * TODO(rsimha): Remove this workaround after a fix is merged for
- * https://github.com/google/closure-compiler/issues/3720.
- */
-function removeRruleSourcemap() {
-  const rruleMapFile = 'node_modules/rrule/dist/es5/rrule.js.map';
-  if (fs.existsSync(rruleMapFile)) {
-    del.sync(rruleMapFile);
-    logLocalDev('Deleted', cyan(rruleMapFile));
-  }
-}
 
 /**
  * Checks if all packages are current, and if not, runs `npm install`.
@@ -245,8 +213,6 @@ function updatePackages() {
   patchIntersectionObserver();
   patchResizeObserver();
   patchShadowDom();
-  patchPreact();
-  removeRruleSourcemap();
   if (isCiBuild()) {
     runNpmChecks();
   }
diff --git a/build-system/common/update-session-issues/index.js b/build-system/common/update-session-issues/index.js
index dc8c7815db42..ef864d2fb01c 100644
--- a/build-system/common/update-session-issues/index.js
+++ b/build-system/common/update-session-issues/index.js
@@ -15,12 +15,12 @@
  * ⚠️ Only use standard node modules.
  * This file cannot depend on `npm install`.
  */
-const https = require('https');
 const {readdir} = require('fs').promises;
+const https = require('https');
 const {relative} = require('path');
 const {RotationItemDef, TemplateDef} = require('./types');
 
-/** @return {Promise<Object<string, TemplateDef>>} */
+/** @return {Promise<{[key: string]: TemplateDef}>} */
 async function getTemplates() {
   const dir = relative(process.cwd(), __dirname) + '/template';
   const files = (await readdir(dir)).filter((basename) =>
@@ -84,7 +84,7 @@ function parseYyyyMmDd(yyyyMmDd, hours = 0, minutes = 0) {
 
 /**
  * @param {string} url
- * @param {Object} options
+ * @param {object} options
  * @param {string=} data
  * @return {!Promise<{res: *, body: string}>}
  */
@@ -165,7 +165,7 @@ async function postGithub(token, url, data) {
 /**
  * @param {string} token
  * @param {string} repo
- * @param {Object} data
+ * @param {object} data
  * @return {Promise<Object>}
  */
 function postGithubIssue(token, repo, data) {
@@ -299,7 +299,7 @@ const timeZ = (yyyy, mm, dd, hours, minutes) =>
 
 /**
  * @param {TemplateDef} template
- * @return {Object}
+ * @return {object}
  */
 function getNextIssueData(template) {
   const {
@@ -399,7 +399,7 @@ function getSessionDateFromTitle(title) {
   }
   const [
     // @ts-ignore
-    unusedFullMatch, // eslint-disable-line no-unused-vars
+    unusedFullMatch, // eslint-disable-line @typescript-eslint/no-unused-vars
     day,
     time,
   ] = match;
diff --git a/build-system/common/update-session-issues/template/design-review.js b/build-system/common/update-session-issues/template/design-review.js
index e19a030776e6..7d2afdb082cb 100644
--- a/build-system/common/update-session-issues/template/design-review.js
+++ b/build-system/common/update-session-issues/template/design-review.js
@@ -8,10 +8,9 @@ const sessionDurationHours = 1;
 const timeRotationUtc = [
   [/* wed */ 3, '16:30', 'Africa/Europe/western Asia'],
   [/* wed */ 3, '21:00', 'Americas'],
-  [/* thu */ 4, '01:00', 'Asia/Oceania'],
 ];
 
-const timeRotationStart = new Date('2021-04-14');
+const timeRotationStart = new Date('2022-03-02');
 
 // All previous weeks have already been handled.
 const generateWeeksFromNow = 3;
@@ -36,7 +35,7 @@ If you are interested in bringing your design to design review, read the [design
 
 When attending a design review please read through the designs _before_ the design review starts. This allows us to spend more time on discussion of the design.
 
-We rotate our design review between times that work better for different parts of the world as described in our [design review documentation](https://github.com/ampproject/amphtml/blob/main/docs/design-reviews.md), but you are welcome to attend any design review. If you cannot make any of the design reviews but have a design to discuss please let mrjoro@ know on [Slack](https://github.com/ampproject/amphtml/blob/main/docs/contributing.md#discussion-channels) and we will find a time that works for you.
+We rotate our design review between times that work better for different parts of the world as described in our [design review documentation](https://github.com/ampproject/amphtml/blob/main/docs/design-reviews.md), but you are welcome to attend any design review. If you cannot make any of the design reviews but have a design to discuss please let us know in the \`#contributing\` channel on [Slack](https://github.com/ampproject/amphtml/blob/main/docs/contributing.md#discussion-channels) and we will find a time that works for you.
 `;
 
 module.exports = /** @type {import('../types').TemplateDef} */ ({
diff --git a/build-system/common/utils.js b/build-system/common/utils.js
index 549ee95a24cf..19bf8019dccf 100644
--- a/build-system/common/utils.js
+++ b/build-system/common/utils.js
@@ -36,7 +36,7 @@ function getExperimentConfig(experiment) {
     config?.name &&
     config?.define_experiment_constant &&
     config?.expiration_date_utc &&
-    new Number(new Date(config.expiration_date_utc)) >= Date.now();
+    Number(new Date(config.expiration_date_utc)) >= Date.now();
   return valid ? config : null;
 }
 
diff --git a/build-system/compile/OWNERS b/build-system/compile/OWNERS
index abf49ba53e51..74713864a778 100644
--- a/build-system/compile/OWNERS
+++ b/build-system/compile/OWNERS
@@ -16,17 +16,12 @@
     {
       pattern: 'bundles.config.*',
       owners: [
-        {name: 'ampproject/wg-bento'},
         {name: 'ampproject/wg-components'},
         {name: 'ampproject/wg-infra'},
         {name: 'ampproject/wg-performance'},
         {name: 'ampproject/wg-stories'},
       ],
     },
-    {
-      pattern: '{closure-compile,compile}.js',
-      owners: [{name: 'rsimha', notify: true}],
-    },
     {
       pattern: 'internal-version.js',
       owners: [{name: 'danielrozenberg', notify: true}],
diff --git a/build-system/compile/build-compiler.js b/build-system/compile/build-compiler.js
index c6a0e55190fb..4d4700fd1c0d 100644
--- a/build-system/compile/build-compiler.js
+++ b/build-system/compile/build-compiler.js
@@ -20,6 +20,7 @@ async function buildCompiler() {
       IS_MINIFIED: 'false',
       IS_ESM: 'false',
       IS_SXG: 'false',
+      IS_SSR_CSS: 'false',
     },
   });
   endBuildStep('Compiled', 'compiler.js', startTime);
diff --git a/build-system/compile/build-constants.js b/build-system/compile/build-constants.js
index d87e8804a048..2812563c6955 100644
--- a/build-system/compile/build-constants.js
+++ b/build-system/compile/build-constants.js
@@ -19,7 +19,7 @@ const isMinified = argv._.includes('dist') || !!argv.minified;
  * TODO: move constant replacement to bundlers once either https://github.com/google/closure-compiler/issues/1601
  *       is resolved, or we switch to using a different bundler.
  *
- * @type {Object<string, boolean|string>}
+ * @type {{[key: string]: boolean|string}}
  */
 const BUILD_CONSTANTS = {
   IS_PROD: isProd,
@@ -32,6 +32,9 @@ const BUILD_CONSTANTS = {
   // for conditions only true for SxG.
   IS_ESM: !!(argv.esm || argv.sxg),
   IS_SXG: !!argv.sxg,
+  // IS_SSR is always false by default and can only be overriden on a per
+  // output file basis in bundles.config.extensions through `options.ssr`.
+  IS_SSR_CSS: false,
 };
 
 module.exports = {BUILD_CONSTANTS};
diff --git a/build-system/compile/bundles.config.extensions.json b/build-system/compile/bundles.config.extensions.json
index 147581beb64d..16a2d961b4d4 100644
--- a/build-system/compile/bundles.config.extensions.json
+++ b/build-system/compile/bundles.config.extensions.json
@@ -17,6 +17,14 @@
       "hasCss": true
     }
   },
+  {
+    "name": "amp-access-fewcents",
+    "version": "0.1",
+    "latestVersion": "0.1",
+    "options": {
+      "hasCss": true
+    }
+  },
   {
     "name": "amp-access-laterpay",
     "version": [
@@ -54,9 +62,7 @@
     "version": "1.0",
     "latestVersion": "0.1",
     "options": {
-      "hasCss": true,
-      "npm": true,
-      "bento": true
+      "hasCss": true
     }
   },
   {
@@ -107,11 +113,21 @@
     "version": "0.1",
     "latestVersion": "0.1"
   },
+  {
+    "name": "amp-ad-network-mgid-impl",
+    "version": "0.1",
+    "latestVersion": "0.1"
+  },
   {
     "name": "amp-ad-network-nws-impl",
     "version": "0.1",
     "latestVersion": "0.1"
   },
+  {
+    "name": "amp-ad-network-smartadserver-impl",
+    "version": "0.1",
+    "latestVersion": "0.1"
+  },
   {
     "name": "amp-ad-network-valueimpression-impl",
     "version": "0.1",
@@ -161,11 +177,24 @@
       "hasCss": true
     }
   },
+  {
+    "name": "amp-app-banner",
+    "version": "1.0",
+    "options": {
+      "hasCss": true
+    }
+  },
   {
     "name": "amp-audio",
     "version": "0.1",
     "latestVersion": "0.1"
   },
+  {
+    "name": "amp-audio",
+    "version": "1.0",
+    "latestVersion": "0.1",
+    "options": {}
+  },
   {
     "name": "amp-auto-ads",
     "version": "0.1",
@@ -197,9 +226,7 @@
     "version": "1.0",
     "latestVersion": "0.1",
     "options": {
-      "hasCss": true,
-      "npm": true,
-      "bento": true
+      "hasCss": true
     }
   },
   {
@@ -232,9 +259,7 @@
     "version": "1.0",
     "latestVersion": "0.1",
     "options": {
-      "hasCss": true,
-      "npm": true,
-      "bento": true
+      "hasCss": true
     }
   },
   {
@@ -289,6 +314,14 @@
     "version": "0.1",
     "latestVersion": "0.1"
   },
+  {
+    "name": "amp-dailymotion",
+    "version": "1.0",
+    "latestVersion": "0.1",
+    "options": {
+      "hasCss": true
+    }
+  },
   {
     "name": "amp-date-countdown",
     "version": "0.1",
@@ -299,8 +332,6 @@
     "version": "1.0",
     "latestVersion": "0.1",
     "options": {
-      "npm": true,
-      "bento": true,
       "hasCss": true
     }
   },
@@ -314,8 +345,6 @@
     "version": "1.0",
     "latestVersion": "0.1",
     "options": {
-      "npm": true,
-      "bento": true,
       "hasCss": true
     }
   },
@@ -327,6 +356,14 @@
       "hasCss": true
     }
   },
+  {
+    "name": "amp-date-picker",
+    "version": "1.0",
+    "latestVersion": "0.1",
+    "options": {
+      "hasCss": true
+    }
+  },
   {
     "name": "amp-delight-player",
     "version": "0.1",
@@ -350,9 +387,7 @@
     "version": "1.0",
     "latestVersion": "0.1",
     "options": {
-      "hasCss": true,
-      "npm": true,
-      "bento": true
+      "hasCss": true
     }
   },
   {
@@ -373,9 +408,7 @@
     "version": "1.0",
     "latestVersion": "0.1",
     "options": {
-      "hasCss": true,
-      "npm": true,
-      "bento": true
+      "hasCss": true
     }
   },
   {
@@ -406,9 +439,7 @@
     "version": "1.0",
     "latestVersion": "0.1",
     "options": {
-      "hasCss": true,
-      "npm": true,
-      "bento": true
+      "hasCss": true
     }
   },
   {
@@ -452,11 +483,22 @@
     "version": "0.1",
     "latestVersion": "0.1"
   },
+  {
+    "name": "amp-gist",
+    "version": "1.0",
+    "options": {
+      "hasCss": true
+    }
+  },
   {
     "name": "amp-google-document-embed",
     "version": "0.1",
     "latestVersion": "0.1"
   },
+  {
+    "name": "amp-google-read-aloud-player",
+    "version": "0.1"
+  },
   {
     "name": "amp-gwd-animation",
     "version": "0.1",
@@ -480,9 +522,7 @@
     "version": "1.0",
     "latestVersion": "0.1",
     "options": {
-      "hasCss": true,
-      "npm": true,
-      "bento": true
+      "hasCss": true
     }
   },
   {
@@ -511,6 +551,14 @@
       "hasCss": true
     }
   },
+  {
+    "name": "amp-image-slider",
+    "version": "1.0",
+    "latestVersion": "0.1",
+    "options": {
+      "hasCss": true
+    }
+  },
   {
     "name": "amp-image-viewer",
     "version": "0.1",
@@ -529,14 +577,7 @@
     "version": "0.1",
     "latestVersion": "0.1",
     "options": {
-      "hasCss": true,
-      "cssBinaries": [
-        "amp-inline-gallery",
-        "amp-inline-gallery-captions",
-        "amp-inline-gallery-pagination",
-        "amp-inline-gallery-slide",
-        "amp-inline-gallery-thumbnails"
-      ]
+      "hasCss": true
     }
   },
   {
@@ -544,12 +585,7 @@
     "version": "1.0",
     "latestVersion": "0.1",
     "options": {
-      "hasCss": true,
-      "cssBinaries": [
-        "amp-inline-gallery-pagination"
-      ],
-      "npm": true,
-      "bento": true
+      "hasCss": true
     }
   },
   {
@@ -570,9 +606,7 @@
     "version": "1.0",
     "latestVersion": "0.1",
     "options": {
-      "hasCss": true,
-      "npm": true,
-      "bento": true
+      "hasCss": true
     }
   },
   {
@@ -600,9 +634,7 @@
     "version": "1.0",
     "latestVersion": "0.1",
     "options": {
-      "hasCss": true,
-      "bento": true,
-      "npm": true
+      "hasCss": true
     }
   },
   {
@@ -623,9 +655,7 @@
     "version": "1.0",
     "latestVersion": "0.1",
     "options": {
-      "hasCss": true,
-      "npm": true,
-      "bento": true
+      "hasCss": true
     }
   },
   {
@@ -641,9 +671,7 @@
     "version": "1.0",
     "latestVersion": "0.1",
     "options": {
-      "hasCss": true,
-      "npm": true,
-      "bento": true
+      "hasCss": true
     }
   },
   {
@@ -659,6 +687,13 @@
       "hasCss": true
     }
   },
+  {
+    "name": "amp-list",
+    "version": "1.0",
+    "options": {
+      "hasCss": false
+    }
+  },
   {
     "name": "amp-live-list",
     "version": "0.1",
@@ -688,9 +723,7 @@
     "version": "1.0",
     "latestVersion": "0.1",
     "options": {
-      "hasCss": true,
-      "bento": true,
-      "npm": true
+      "hasCss": true
     }
   },
   {
@@ -784,6 +817,13 @@
       "hasCss": true
     }
   },
+  {
+    "name": "amp-pan-zoom",
+    "version": "1.0",
+    "options": {
+      "hasCss": true
+    }
+  },
   {
     "name": "amp-pinterest",
     "version": "0.1",
@@ -823,11 +863,6 @@
       "hasCss": true
     }
   },
-  {
-    "name": "amp-redbull-player",
-    "version": "0.1",
-    "latestVersion": "0.1"
-  },
   {
     "name": "amp-reddit",
     "version": "0.1",
@@ -869,9 +904,7 @@
     "version": "1.0",
     "latestVersion": "0.1",
     "options": {
-      "hasCss": true,
-      "npm": true,
-      "bento": true
+      "hasCss": true
     }
   },
   {
@@ -898,9 +931,7 @@
     "version": "1.0",
     "latestVersion": "0.1",
     "options": {
-      "hasCss": true,
-      "npm": true,
-      "bento": true
+      "hasCss": true
     }
   },
   {
@@ -915,6 +946,11 @@
     "version": "0.1",
     "latestVersion": "0.1"
   },
+  {
+    "name": "amp-slikeplayer",
+    "version": "0.1",
+    "latestVersion": "0.1"
+  },
   {
     "name": "amp-smartlinks",
     "version": "0.1",
@@ -933,9 +969,7 @@
     "version": "1.0",
     "latestVersion": "0.1",
     "options": {
-      "hasCss": true,
-      "npm": true,
-      "bento": true
+      "hasCss": true
     }
   },
   {
@@ -948,9 +982,7 @@
     "version": "1.0",
     "latestVersion": "0.1",
     "options": {
-      "hasCss": true,
-      "npm": true,
-      "bento": true
+      "hasCss": true
     }
   },
   {
@@ -976,20 +1008,17 @@
     "version": "1.0",
     "latestVersion": "1.0",
     "options": {
-      "hasCss": true,
-      "cssBinaries": [
-        "amp-story-consent",
-        "amp-story-draggable-drawer-header",
-        "amp-story-form",
-        "amp-story-hint",
-        "amp-story-info-dialog",
-        "amp-story-open-page-attachment",
-        "amp-story-share",
-        "amp-story-share-menu",
-        "amp-story-system-layer",
-        "amp-story-tooltip",
-        "amp-story-unsupported-browser-layer"
-      ]
+      "hasCss": true
+    }
+  },
+  {
+    "name": "amp-story",
+    "version": "1.0",
+    "latestVersion": "1.0",
+    "options": {
+      "hasCss": false,
+      "additionalSuffix": "ssr-css",
+      "ssrCss": true
     }
   },
   {
@@ -1000,20 +1029,20 @@
       "hasCss": true
     }
   },
+  {
+    "name": "amp-story-audio-sticker",
+    "version": "0.1",
+    "latestVersion": "0.1",
+    "options": {
+      "hasCss": true
+    }
+  },
   {
     "name": "amp-story-auto-ads",
     "version": "0.1",
     "latestVersion": "0.1",
     "options": {
-      "hasCss": true,
-      "cssBinaries": [
-        "amp-story-auto-ads-ad-badge",
-        "amp-story-auto-ads-attribution",
-        "amp-story-auto-ads-cta-button",
-        "amp-story-auto-ads-inabox",
-        "amp-story-auto-ads-progress-bar",
-        "amp-story-auto-ads-shared"
-      ]
+      "hasCss": true
     }
   },
   {
@@ -1050,19 +1079,14 @@
     "version": "0.1",
     "latestVersion": "0.1",
     "options": {
-      "hasCss": true,
-      "cssBinaries": [
-        "amp-story-interactive-binary-poll",
-        "amp-story-interactive-img",
-        "amp-story-interactive-img-poll",
-        "amp-story-interactive-img-quiz",
-        "amp-story-interactive-poll",
-        "amp-story-interactive-quiz",
-        "amp-story-interactive-results",
-        "amp-story-interactive-results-detailed",
-        "amp-story-interactive-slider",
-        "amp-story-interactive-disclaimer"
-      ]
+      "hasCss": true
+    }
+  },
+  {
+    "name": "amp-story-page-attachment",
+    "version": "0.1",
+    "options": {
+      "hasCss": true
     }
   },
   {
@@ -1081,17 +1105,27 @@
       "hasCss": true
     }
   },
+  {
+    "name": "amp-story-share-menu",
+    "version": "0.1",
+    "latestVersion": "0.1",
+    "options": {
+      "hasCss": true
+    }
+  },
   {
     "name": "amp-story-shopping",
     "version": "0.1",
     "latestVersion": "0.1",
     "options": {
-      "hasCss": true,
-      "cssBinaries": [
-        "amp-story-shopping",
-        "amp-story-shopping-attachment",
-        "amp-story-shopping-tag"
-      ]
+      "hasCss": true
+    }
+  },
+  {
+    "name": "amp-story-subscriptions",
+    "version": "0.1",
+    "options": {
+      "hasCss": true
     }
   },
   {
@@ -1107,9 +1141,7 @@
     "version": "1.0",
     "latestVersion": "0.1",
     "options": {
-      "hasCss": true,
-      "npm": true,
-      "bento": true
+      "hasCss": true
     }
   },
   {
@@ -1146,9 +1178,7 @@
     "version": "1.0",
     "latestVersion": "0.1",
     "options": {
-      "hasCss": true,
-      "npm": true,
-      "bento": true
+      "hasCss": true
     }
   },
   {
@@ -1156,11 +1186,7 @@
     "version": "0.1",
     "latestVersion": "0.1",
     "options": {
-      "hasCss": true,
-      "cssBinaries": [
-        "amp-truncate-text",
-        "amp-truncate-text-shadow"
-      ]
+      "hasCss": true
     }
   },
   {
@@ -1173,9 +1199,7 @@
     "version": "1.0",
     "latestVersion": "0.1",
     "options": {
-      "hasCss": true,
-      "npm": true,
-      "bento": true
+      "hasCss": true
     }
   },
   {
@@ -1196,9 +1220,7 @@
     "version": "1.0",
     "latestVersion": "0.1",
     "options": {
-      "hasCss": true,
-      "npm": true,
-      "bento": true
+      "hasCss": true
     }
   },
   {
@@ -1219,9 +1241,7 @@
     "version": "1.0",
     "latestVersion": "0.1",
     "options": {
-      "hasCss": true,
-      "npm": true,
-      "bento": true
+      "hasCss": true
     }
   },
   {
@@ -1246,9 +1266,7 @@
     "version": "1.0",
     "latestVersion": "0.1",
     "options": {
-      "hasCss": true,
-      "npm": true,
-      "bento": true
+      "hasCss": true
     }
   },
   {
@@ -1284,9 +1302,7 @@
     "version": "1.0",
     "latestVersion": "1.0",
     "options": {
-      "hasCss": true,
-      "npm": true,
-      "bento": true
+      "hasCss": true
     }
   },
   {
@@ -1304,9 +1320,7 @@
     "version": "1.0",
     "latestVersion": "0.1",
     "options": {
-      "hasCss": true,
-      "npm": true,
-      "bento": true
+      "hasCss": true
     }
   }
 ]
diff --git a/build-system/compile/bundles.config.js b/build-system/compile/bundles.config.js
index c59796bdce02..a23d1f5d9e21 100644
--- a/build-system/compile/bundles.config.js
+++ b/build-system/compile/bundles.config.js
@@ -17,7 +17,7 @@ exports.jsBundles = {
     minifiedDestDir: './build/',
   },
   'bento.js': {
-    srcDir: './src/',
+    srcDir: './src/bento',
     srcFilename: 'bento.js',
     destDir: './dist',
     minifiedDestDir: './dist',
@@ -119,7 +119,6 @@ exports.jsBundles = {
       toName: 'amp-viewer-host.max.js',
       minifiedName: 'amp-viewer-host.js',
       incudePolyfills: true,
-      extraGlobs: ['extensions/amp-viewer-integration/**/*.js'],
       skipUnknownDepsCheck: true,
     },
   },
@@ -194,7 +193,6 @@ exports.jsBundles = {
       toName: 'amp-inabox.js',
       minifiedName: 'amp4ads-v0.js',
       includePolyfills: true,
-      extraGlobs: ['src/inabox/*.js', '3p/iframe-messaging-client.js'],
     },
   },
 };
@@ -256,24 +254,5 @@ exports.verifyExtensionBundles = function () {
       bundle.name,
       bundleString
     );
-    verifyBundle_(
-      'latestVersion' in bundle,
-      'latestVersion',
-      'is missing from',
-      bundle.name,
-      bundleString
-    );
-    const duplicates = exports.extensionBundles.filter(
-      (duplicate) => duplicate.name === bundle.name
-    );
-    verifyBundle_(
-      duplicates.every(
-        (duplicate) => duplicate.latestVersion === bundle.latestVersion
-      ),
-      'latestVersion',
-      'is not the same for all versions of',
-      bundle.name,
-      JSON.stringify(duplicates, null, 2)
-    );
   });
 };
diff --git a/build-system/compile/bundles.legacy-latest-versions.jsonc b/build-system/compile/bundles.legacy-latest-versions.jsonc
new file mode 100644
index 000000000000..28bb98f70d51
--- /dev/null
+++ b/build-system/compile/bundles.legacy-latest-versions.jsonc
@@ -0,0 +1,165 @@
+/**
+ * Exports an extension-version map for all of the '-latest' binaries that we
+ * should produce. This object should never be modified, as we have
+ * intentionally deprecated the concept of '-latest' binaries.
+ *
+ * See the I2D for full context: https://github.com/ampproject/amphtml/issues/36749
+ */
+{
+  "amp-3d-gltf": "0.1",
+  "amp-3q-player": "0.1",
+  "amp-access-laterpay": "0.2",
+  "amp-access-poool": "0.1",
+  "amp-access-scroll": "0.1",
+  "amp-access": "0.1",
+  "amp-accordion": "0.1",
+  "amp-action-macro": "0.1",
+  "amp-ad-custom": "0.1",
+  "amp-ad-exit": "0.1",
+  "amp-ad-network-adsense-impl": "0.1",
+  "amp-ad-network-adzerk-impl": "0.1",
+  "amp-ad-network-dianomi-impl": "0.1",
+  "amp-ad-network-doubleclick-impl": "0.1",
+  "amp-ad-network-fake-impl": "0.1",
+  "amp-ad-network-nws-impl": "0.1",
+  "amp-ad-network-valueimpression-impl": "0.1",
+  "amp-ad": "0.1",
+  "amp-addthis": "0.1",
+  "amp-analytics": "0.1",
+  "amp-anim": "0.1",
+  "amp-animation-polyfill": "0.1",
+  "amp-animation": "0.1",
+  "amp-apester-media": "0.1",
+  "amp-app-banner": "0.1",
+  "amp-audio": "0.1",
+  "amp-auto-ads": "0.1",
+  "amp-auto-lightbox": "0.1",
+  "amp-autocomplete": "0.1",
+  "amp-base-carousel": "0.1",
+  "amp-beopinion": "0.1",
+  "amp-bind": "0.1",
+  "amp-bodymovin-animation": "0.1",
+  "amp-brid-player": "0.1",
+  "amp-brightcove": "0.1",
+  "amp-byside-content": "0.1",
+  "amp-cache-url": "0.1",
+  "amp-call-tracking": "0.1",
+  "amp-carousel": "0.1",
+  "amp-connatix-player": "0.1",
+  "amp-consent": "0.1",
+  "amp-crypto-polyfill": "0.1",
+  "amp-dailymotion": "0.1",
+  "amp-date-countdown": "0.1",
+  "amp-date-display": "0.1",
+  "amp-date-picker": "0.1",
+  "amp-delight-player": "0.1",
+  "amp-dynamic-css-classes": "0.1",
+  "amp-embedly-card": "0.1",
+  "amp-experiment": "0.1",
+  "amp-facebook-comments": "0.1",
+  "amp-facebook-like": "0.1",
+  "amp-facebook-page": "0.1",
+  "amp-facebook": "0.1",
+  "amp-fit-text": "0.1",
+  "amp-font": "0.1",
+  "amp-form": "0.1",
+  "amp-fx-collection": "0.1",
+  "amp-fx-flying-carpet": "0.1",
+  "amp-geo": "0.1",
+  "amp-gfycat": "0.1",
+  "amp-gist": "0.1",
+  "amp-google-document-embed": "0.1",
+  "amp-gwd-animation": "0.1",
+  "amp-hulu": "0.1",
+  "amp-iframe": "0.1",
+  "amp-iframely": "0.1",
+  "amp-ima-video": "0.1",
+  "amp-image-lightbox": "0.1",
+  "amp-image-slider": "0.1",
+  "amp-image-viewer": "0.1",
+  "amp-imgur": "0.1",
+  "amp-inline-gallery": "0.1",
+  "amp-inputmask": "0.1",
+  "amp-instagram": "0.1",
+  "amp-install-serviceworker": "0.1",
+  "amp-intersection-observer-polyfill": "0.1",
+  "amp-izlesene": "0.1",
+  "amp-jwplayer": "0.1",
+  "amp-kaltura-player": "0.1",
+  "amp-lightbox-gallery": "0.1",
+  "amp-lightbox": "0.1",
+  "amp-link-rewriter": "0.1",
+  "amp-list": "0.1",
+  "amp-live-list": "0.1",
+  "amp-loader": "0.1",
+  "amp-mathml": "0.1",
+  "amp-mega-menu": "0.1",
+  "amp-megaphone": "0.1",
+  "amp-minute-media-player": "0.1",
+  "amp-mowplayer": "0.1",
+  "amp-mraid": "0.1",
+  "amp-mustache": "0.2",
+  "amp-nested-menu": "0.1",
+  "amp-next-page": "1.0",
+  "amp-nexxtv-player": "0.1",
+  "amp-o2-player": "0.1",
+  "amp-onetap-google": "0.1",
+  "amp-ooyala-player": "0.1",
+  "amp-orientation-observer": "0.1",
+  "amp-pan-zoom": "0.1",
+  "amp-pinterest": "0.1",
+  "amp-playbuzz": "0.1",
+  "amp-position-observer": "0.1",
+  "amp-powr-player": "0.1",
+  "amp-reach-player": "0.1",
+  "amp-recaptcha-input": "0.1",
+  "amp-reddit": "0.1",
+  "amp-render": "1.0",
+  "amp-resize-observer-polyfill": "0.1",
+  "amp-riddle-quiz": "0.1",
+  "amp-script": "0.1",
+  "amp-selector": "0.1",
+  "amp-shadow-dom-polyfill": "0.1",
+  "amp-sidebar": "0.1",
+  "amp-skimlinks": "0.1",
+  "amp-slides": "0.1",
+  "amp-slikeplayer": "0.1",
+  "amp-smartlinks": "0.1",
+  "amp-social-share": "0.1",
+  "amp-soundcloud": "0.1",
+  "amp-springboard-player": "0.1",
+  "amp-standalone": "0.1",
+  "amp-sticky-ad": "1.0",
+  "amp-story-360": "0.1",
+  "amp-story-auto-ads": "0.1",
+  "amp-story-auto-analytics": "0.1",
+  "amp-story-captions": "0.1",
+  "amp-story-dev-tools": "0.1",
+  "amp-story-education": "0.1",
+  "amp-story-interactive": "0.1",
+  "amp-story-panning-media": "0.1",
+  "amp-story-player": "0.1",
+  "amp-story-shopping": "0.1",
+  "amp-story": "1.0",
+  "amp-stream-gallery": "0.1",
+  "amp-subscriptions-google": "0.1",
+  "amp-subscriptions": "0.1",
+  "amp-tiktok": "0.1",
+  "amp-timeago": "0.1",
+  "amp-truncate-text": "0.1",
+  "amp-twitter": "0.1",
+  "amp-user-notification": "0.1",
+  "amp-video-docking": "0.1",
+  "amp-video-iframe": "0.1",
+  "amp-video": "0.1",
+  "amp-viewer-integration": "0.1",
+  "amp-vimeo": "0.1",
+  "amp-vine": "0.1",
+  "amp-viqeo-player": "0.1",
+  "amp-vk": "0.1",
+  "amp-web-push": "0.1",
+  "amp-wistia-player": "0.1",
+  "amp-wordpress-embed": "1.0",
+  "amp-yotpo": "0.1",
+  "amp-youtube": "0.1"
+}
diff --git a/build-system/compile/check-for-unknown-deps.js b/build-system/compile/check-for-unknown-deps.js
deleted file mode 100644
index ee573fd76eba..000000000000
--- a/build-system/compile/check-for-unknown-deps.js
+++ /dev/null
@@ -1,38 +0,0 @@
-'use strict';
-
-const argv = require('minimist')(process.argv.slice(2));
-const fs = require('fs-extra');
-const {cyan, red, yellow} = require('kleur/colors');
-const {log} = require('../common/logging');
-
-/**
- * Searches for the identifier "module$", which Closure uses to uniquely
- * reference module imports. If any are found, that means Closure couldn't
- * import the module correctly.
- * @param {string} file
- * @return {Promise<void>}
- */
-async function checkForUnknownDeps(file) {
-  const regex = /[\w$]*module\$[\w$]+/;
-  const contents = await fs.readFile(file, 'utf-8');
-  if (!contents.includes('module$')) {
-    // Fast check, since regexes can backtrack like crazy.
-    return;
-  }
-  const match = regex.exec(contents) || [
-    `couldn't parse the dep. Look for "module$" in the file`,
-  ];
-  log(
-    red('Error:'),
-    `Unknown dependency ${cyan(match[0])} found in ${cyan(file)}`
-  );
-  if (argv.debug) {
-    log(red('Output file contents:'));
-    log(yellow(contents));
-  }
-  throw new Error('Compilation failed due to unknown dependency');
-}
-
-module.exports = {
-  checkForUnknownDeps,
-};
diff --git a/build-system/compile/closure-compile.js b/build-system/compile/closure-compile.js
deleted file mode 100644
index f5d103c9660f..000000000000
--- a/build-system/compile/closure-compile.js
+++ /dev/null
@@ -1,95 +0,0 @@
-'use strict';
-
-const compiler = require('@ampproject/google-closure-compiler');
-const vinylFs = require('vinyl-fs');
-const {cyan, red, yellow} = require('kleur/colors');
-const {getBabelOutputDir} = require('./pre-closure-babel');
-const {log, logWithoutTimestamp} = require('../common/logging');
-
-/**
- * Logs a closure compiler error message after syntax highlighting it and then
- * formatting it into a more readable form by dropping the plugin's logging
- * prefix, normalizing paths, and emphasizing errors and warnings.
- * @param {string} message
- */
-function logClosureCompilerError(message) {
-  log(red('ERROR:'));
-  const babelOutputDir = `${getBabelOutputDir()}/`;
-  const loggingPrefix = /^.*?gulp-google-closure-compiler.*?: /;
-  const {highlight} = require('cli-highlight'); // Lazy-required to speed up task loading.
-  const highlightedMessage = highlight(message, {ignoreIllegals: true});
-  const formattedMessage = highlightedMessage
-    .replace(loggingPrefix, '')
-    .replace(new RegExp(babelOutputDir, 'g'), '')
-    .replace(/ ERROR /g, red(' ERROR '))
-    .replace(/ WARNING /g, yellow(' WARNING '));
-  logWithoutTimestamp(formattedMessage);
-}
-
-/**
- * Handles a closure error during compilation and type checking. Passes through
- * the error except in watch mode, where we want to print a failure message and
- * continue.
- * @param {!compiler.PluginError} err
- * @param {string} outputFilename
- * @param {?Object} options
- * @return {!compiler.PluginError|undefined}
- */
-function handleClosureCompilerError(err, outputFilename, options) {
-  if (options.typeCheckOnly) {
-    if (!options.logger) {
-      log(`${red('ERROR:')} Type checking failed`);
-    }
-    return err;
-  }
-  log(`${red('ERROR:')} Could not minify ${cyan(outputFilename)}`);
-  if (options.continueOnError) {
-    options.errored = true;
-    return;
-  }
-  return err;
-}
-
-/**
- * Initializes closure compiler with the given set of flags. We use the gulp
- * streaming plugin because invoking a command with a long list of --fs flags
- * on Windows exceeds the command line size limit. The stream mode is 'IN'
- * because output files and sourcemaps are written directly to disk.
- * @param {Array<string>} flags
- * @param {!Object} options
- * @return {!Object}
- */
-function initializeClosure(flags, options) {
-  const pluginOptions = {
-    streamMode: 'IN',
-    logger: options.logger || logClosureCompilerError,
-  };
-  return compiler.gulp()(flags, pluginOptions);
-}
-
-/**
- * Runs closure compiler with the given set of flags.
- * @param {string} outputFilename
- * @param {!Object} options
- * @param {Array<string>} flags
- * @param {Array<string>} srcFiles
- * @return {Promise<void>}
- */
-function runClosure(outputFilename, options, flags, srcFiles) {
-  return new Promise((resolve, reject) => {
-    vinylFs
-      .src(srcFiles, {base: getBabelOutputDir()})
-      .pipe(initializeClosure(flags, options))
-      .on('error', (err) => {
-        const reason = handleClosureCompilerError(err, outputFilename, options);
-        reason ? reject(reason) : resolve();
-      })
-      .on('end', resolve)
-      .pipe(vinylFs.dest('.'));
-  });
-}
-
-module.exports = {
-  logClosureCompilerError,
-  runClosure,
-};
diff --git a/build-system/compile/compile-wrappers.js b/build-system/compile/compile-wrappers.js
index e9d6e3c8b684..7ae8bb182903 100644
--- a/build-system/compile/compile-wrappers.js
+++ b/build-system/compile/compile-wrappers.js
@@ -1,5 +1,14 @@
+const fs = require('fs-extra');
+const json5 = require('json5');
 const {VERSION} = require('./internal-version');
 
+const latestVersions = json5.parse(
+  fs.readFileSync(
+    require.resolve('./bundles.legacy-latest-versions.jsonc'),
+    'utf8'
+  )
+);
+
 // If there is a sync JS error during initial load,
 // at least try to unhide the body.
 // If "AMP" is already an object then that means another runtime has already
@@ -26,19 +35,12 @@ let ExtensionLoadPriorityDef;
  * by the main binary
  * @param {string} name
  * @param {string} version
- * @param {boolean} latest
  * @param {boolean=} isModule
  * @param {ExtensionLoadPriorityDef=} loadPriority
  * @return {string}
  */
-function extension(name, version, latest, isModule, loadPriority) {
-  const payload = extensionPayload(
-    name,
-    version,
-    latest,
-    isModule,
-    loadPriority
-  );
+function extension(name, version, isModule, loadPriority) {
+  const payload = extensionPayload(name, version, isModule, loadPriority);
   return `(self.AMP=self.AMP||[]).push(${payload});`;
 }
 
@@ -53,12 +55,11 @@ exports.extension = extension;
  * @see {@link bento}
  * @param {string} name
  * @param {string} version
- * @param {boolean} latest
  * @param {boolean=} isModule
  * @param {ExtensionLoadPriorityDef=} loadPriority
  * @return {string}
  */
-function extensionPayload(name, version, latest, isModule, loadPriority) {
+function extensionPayload(name, version, isModule, loadPriority) {
   let priority = '';
   if (loadPriority) {
     if (loadPriority != 'high') {
@@ -68,6 +69,7 @@ function extensionPayload(name, version, latest, isModule, loadPriority) {
   }
   // Use a numeric value instead of boolean. "m" stands for "module"
   const m = isModule ? 1 : 0;
+  const latest = latestVersions[name] === version;
   return (
     '{' +
     `m:${m},` +
@@ -81,6 +83,4 @@ function extensionPayload(name, version, latest, isModule, loadPriority) {
   );
 }
 
-exports.bento = '(self.BENTO=self.BENTO||[]).push(function(){<%= contents %>})';
-
 exports.none = '<%= contents %>';
diff --git a/build-system/compile/compile.js b/build-system/compile/compile.js
deleted file mode 100644
index 56ae5cf82299..000000000000
--- a/build-system/compile/compile.js
+++ /dev/null
@@ -1,463 +0,0 @@
-'use strict';
-const argv = require('minimist')(process.argv.slice(2));
-const del = require('del');
-const fastGlob = require('fast-glob');
-const fs = require('fs-extra');
-const path = require('path');
-const {checkForUnknownDeps} = require('./check-for-unknown-deps');
-const {CLOSURE_SRC_GLOBS} = require('./sources');
-const {cpus} = require('os');
-const {cyan, green} = require('kleur/colors');
-const {getAmpConfigForFile} = require('../tasks/prepend-global');
-const {log, logLocalDev} = require('../common/logging');
-const {postClosureBabel} = require('./post-closure-babel');
-const {preClosureBabel} = require('./pre-closure-babel');
-const {runClosure} = require('./closure-compile');
-const {sanitize} = require('./sanitize');
-const {VERSION: internalRuntimeVersion} = require('./internal-version');
-const {writeSourcemaps} = require('./helpers');
-
-const queue = [];
-let inProgress = 0;
-
-const MAX_PARALLEL_CLOSURE_INVOCATIONS =
-  parseInt(argv.closure_concurrency, 10) || cpus().length;
-
-/**
- * @typedef {{
- *  esmPassCompilation?: string,
- *  wrapper?: string,
- *  extraGlobs?: string,
- *  include3pDirectories?: boolean,
- *  includePolyfills?: boolean,
- *  externs?: string[],
- *  compilationLevel?: string,
- *  verboseLogging?: boolean,
- *  typeCheckOnly?: boolean,
- *  skipUnknownDepsCheck?: boolean,
- *  warningLevel?: boolean,
- *  noAddDeps?: boolean,
- *  continueOnError?: boolean,
- *  errored?: boolean,
- * }}
- */
-let OptionsDef;
-
-/**
- * Compiles AMP with the closure compiler. This is intended only for
- * production use. During development we intend to continue using
- * babel, as it has much faster incremental compilation.
- *
- * @param {string|string[]} entryModuleFilename
- * @param {string} outputDir
- * @param {string} outputFilename
- * @param {!OptionsDef} options
- * @param {{startTime?: number}=} timeInfo
- * @return {Promise<void>}
- */
-async function closureCompile(
-  entryModuleFilename,
-  outputDir,
-  outputFilename,
-  options,
-  timeInfo = {}
-) {
-  // Rate limit closure compilation to MAX_PARALLEL_CLOSURE_INVOCATIONS
-  // concurrent processes.
-  return new Promise(function (resolve, reject) {
-    /**
-     * Kicks off the first closure invocation.
-     */
-    function start() {
-      inProgress++;
-      compile(
-        entryModuleFilename,
-        outputDir,
-        outputFilename,
-        options,
-        timeInfo
-      ).then(
-        function () {
-          inProgress--;
-          next();
-          resolve();
-        },
-        (reason) => reject(reason)
-      );
-    }
-
-    /**
-     * Keeps track of the invocation count.
-     */
-    function next() {
-      if (!queue.length) {
-        return;
-      }
-      if (inProgress < MAX_PARALLEL_CLOSURE_INVOCATIONS) {
-        queue.shift()();
-      }
-    }
-    queue.push(start);
-    next();
-  });
-}
-
-/**
- * Cleans up the placeholder directories for fake build modules.
- */
-function cleanupBuildDir() {
-  del.sync('build/fake-module');
-  del.sync('build/patched-module');
-  del.sync('build/parsers');
-  fs.mkdirsSync('build/fake-module/third_party/babel');
-  fs.mkdirsSync('build/fake-module/src/polyfills/');
-  fs.mkdirsSync('build/fake-polyfills/src/polyfills');
-}
-
-/**
- * Generates a list of source files based on various factors.
- * TODO(wg-infra, wg-performance): Clean up unnecessary files.
- *
- * @param {string[]} entryModuleFilenames
- * @param {!OptionsDef} options
- * @return {!Array<string>}
- */
-function getSrcs(entryModuleFilenames, options) {
-  const unneededFiles = [
-    'build/fake-module/third_party/babel/custom-babel-helpers.js',
-  ];
-  const srcs = [...CLOSURE_SRC_GLOBS];
-  entryModuleFilenames.forEach((filename) => {
-    // For extensions, include all JS files in the extension directory.
-    // Note: The glob added to srcs must be a posix glob on all platforms.
-    if (filename.startsWith('extensions')) {
-      srcs.push(
-        filename
-          .replace(path.basename(filename), path.join('**', '*.js'))
-          .split(path.win32.sep)
-          .join(path.posix.sep)
-      );
-    }
-  });
-  if (options.extraGlobs) {
-    srcs.push.apply(srcs, options.extraGlobs);
-  }
-  if (options.include3pDirectories) {
-    srcs.push('3p/**/*.js', 'ads/**/*.js');
-  }
-  // Many files include the polyfills, but we only want to deliver them
-  // once. Since all files automatically wait for the main binary to load
-  // this works fine.
-  if (options.includePolyfills) {
-    srcs.push(
-      '!build/fake-module/src/polyfills/index.js',
-      '!build/fake-module/src/polyfills/**/*.js',
-      '!build/fake-polyfills/**/*.js'
-    );
-  } else {
-    srcs.push('!src/polyfills/index.js', '!build/fake-polyfills/**/*.js');
-    unneededFiles.push('build/fake-module/src/polyfills/index.js');
-  }
-  // Negative globstars must come at the end.
-  srcs.push(
-    // Don't include rollup configs
-    '!**/rollup.config.js',
-    // Don't include tests.
-    '!**_test.js',
-    '!**/test-*.js',
-    '!**/test-e2e/*.js',
-    // Don't include externs.
-    '!**/*.extern.js'
-  );
-  unneededFiles.forEach(function (fake) {
-    if (!fs.existsSync(fake)) {
-      fs.writeFileSync(
-        fake,
-        '// Not needed in closure compiler\nexport function deadCode() {}'
-      );
-    }
-  });
-  return srcs;
-}
-
-/**
- * Generates the set of options with which to invoke Closure compiler.
- * TODO(wg-infra,wg-performance): Clean up unnecessary options.
- *
- * @param {string} outputFilename
- * @param {!OptionsDef} options
- * @return {!Promise<!Object>}
- */
-async function generateCompilerOptions(outputFilename, options) {
-  // Determine externs
-  let externs = options.externs || [];
-  if (!options.noAddDeps) {
-    externs = [
-      'third_party/web-animations-externs/web_animations.js',
-      'third_party/react-externs/externs.js',
-      'third_party/moment/moment.extern.js',
-      ...fastGlob.sync('src/core{,/**}/*.extern.js'),
-      ...fastGlob.sync('build-system/externs/*.extern.js'),
-      ...externs,
-    ];
-  }
-
-  const hideWarningsFor = [
-    'third_party/amp-toolbox-cache-url/',
-    'third_party/caja/',
-    'third_party/closure-library/sha384-generated.js',
-    'third_party/d3/',
-    'third_party/inputmask/',
-    'third_party/mustache/',
-    'third_party/react-dates/',
-    'third_party/resize-observer-polyfill/',
-    'third_party/set-dom/',
-    'third_party/subscriptions-project/',
-    'third_party/webcomponentsjs/',
-    'node_modules/',
-    'build/patched-module/',
-  ];
-  const define = [`VERSION=${internalRuntimeVersion}`, 'AMP_MODE=true'];
-  if (argv.pseudo_names) {
-    define.push('PSEUDO_NAMES=true');
-  }
-  const ampConfig = await getAmpConfigForFile(outputFilename, options);
-  let wrapper = options.wrapper
-    ? options.wrapper.replace('<%= contents %>', '%output%')
-    : `(function(){%output%})();`;
-  wrapper = `${ampConfig}${wrapper}\n\n//# sourceMappingURL=${outputFilename}.map`;
-
-  /**
-   * TODO(#28387) write a type for this.
-   * @type {Object}
-   */
-  /* eslint "local/camelcase": 0*/
-  const compilerOptions = {
-    compilation_level: options.compilationLevel || 'SIMPLE_OPTIMIZATIONS',
-    // Turns on more optimizations.
-    assume_function_wrapper: true,
-    language_in: 'ECMASCRIPT_2020',
-    // Do not transpile down to ES5 if running with `--esm`, since we do
-    // limited transpilation in Babel.
-    language_out: argv.esm || argv.sxg ? 'NO_TRANSPILE' : 'ECMASCRIPT5_STRICT',
-    // We do not use the polyfills provided by closure compiler.
-    // If you need a polyfill. Manually include them in the
-    // respective top level polyfills/*.js files.
-    rewrite_polyfills: false,
-    externs,
-    js_module_root: [
-      // Do _not_ include 'node_modules/' in js_module_root with 'NODE'
-      // resolution or bad things will happen (#18600).
-      'build/patched-module/',
-      'build/fake-module/',
-      'build/fake-polyfills/',
-    ],
-    module_resolution: 'NODE',
-    package_json_entry_names: 'module,main',
-    process_common_js_modules: true,
-    // PRUNE strips all files from the input set that aren't explicitly
-    // required.
-    dependency_mode: options.noAddDeps ? 'SORT_ONLY' : 'PRUNE',
-    output_wrapper: wrapper,
-    source_map_include_content: !!argv.full_sourcemaps,
-    // These arrays are filled in below.
-    jscomp_error: [],
-    jscomp_warning: [],
-    jscomp_off: [],
-    define,
-    hide_warnings_for: hideWarningsFor,
-    // TODO(amphtml): Change 'QUIET' to 'DEFAULT'.
-    warning_level: argv.warning_level ?? options.warningLevel ?? 'QUIET',
-    extra_annotation_name: ['visibleForTesting', 'restricted'],
-  };
-  if (argv.pseudo_names) {
-    // Some optimizations get turned off when pseudo_names is on.
-    // This causes some errors caused by the babel transformations
-    // that we apply like unreachable code because we turn a conditional
-    // falsey. (ex. is IS_PROD transformation which causes some conditionals
-    // to be unreachable/suspicious code since the whole expression is
-    // falsey)
-    compilerOptions.jscomp_off.push('uselessCode', 'externsValidation');
-  }
-  if (argv.pretty_print) {
-    compilerOptions.formatting = 'PRETTY_PRINT';
-  }
-
-  // See https://github.com/google/closure-compiler/wiki/Warnings#warnings-categories
-  // for a full list of closure's default error / warning levels.
-  // NOTE: We do not use jscomp_warning because they are silenced by closure
-  // unless there are accompanying errors. Pick a side and use either one of
-  // jscomp_error or jscomp_off.
-  if (options.typeCheckOnly) {
-    compilerOptions.checks_only = true;
-    // Note: compilation_level is SIMPLE_OPTIMIZATIONS during type checking.
-    // Making it WHITESPACE_ONLY will disable type-checking, so don't do that.
-    compilerOptions.define.push('TYPECHECK_ONLY=true');
-    // These aren't type-check errors by default, but should be.
-    compilerOptions.jscomp_error.push(
-      'accessControls',
-      'checkDebuggerStatement',
-      'conformanceViolations',
-      'checkTypes',
-      'const',
-      'constantProperty',
-      'globalThis',
-      'misplacedTypeAnnotation',
-      'missingProperties',
-      'strictMissingProperties',
-      'visibility'
-    );
-    // These are type-check errors / warnings by default, but cannot be.
-    compilerOptions.jscomp_off.push(
-      'moduleLoad', // Breaks type-only modules: google/closure-compiler#3041
-      'unknownDefines' // Closure complains about VERSION
-    );
-    compilerOptions.conformance_configs =
-      'build-system/test-configs/conformance-config.textproto';
-  } else {
-    // These aren't compilation errors by default, but should be.
-    compilerOptions.jscomp_error.push(
-      'missingProperties',
-      'strictMissingProperties',
-      'visibility'
-    );
-    // Thse are compilation errors / warnings by default, but cannot be.
-    compilerOptions.jscomp_off.push(
-      'accessControls', // Silences spurious JSC_BAD_PRIVATE_GLOBAL_ACCESS
-      'moduleLoad', // Breaks type-only modules: google/closure-compiler#3041
-      'unknownDefines' // Closure complains about VERSION
-    );
-  }
-
-  if (compilerOptions.define.length == 0) {
-    delete compilerOptions.define;
-  }
-  return compilerOptions;
-}
-
-/**
- * Generates the full set of flags with which to invoke closure compiler.
- *
- * @param {!OptionsDef} options
- * @param {!Object} compilerOptions
- * @param {!Array<string>} entryModuleFilenames
- * @param {string} destFile
- * @param {string} sourcemapFile
- * @return {!Array<string>}
- */
-function generateFlags(
-  options,
-  compilerOptions,
-  entryModuleFilenames,
-  destFile,
-  sourcemapFile
-) {
-  const compilerFlags = [];
-  Object.keys(compilerOptions).forEach(function (option) {
-    const value = compilerOptions[option];
-    if (Array.isArray(value)) {
-      value.forEach(function (item) {
-        compilerFlags.push('--' + option + '=' + item);
-      });
-    } else {
-      if (value != null) {
-        compilerFlags.push('--' + option + '=' + value);
-      } else {
-        compilerFlags.push('--' + option);
-      }
-    }
-  });
-  const entryPointFlags = entryModuleFilenames.map(
-    (entryPoint) => `--entry_point=${entryPoint}`
-  );
-  compilerFlags.push(...entryPointFlags);
-  if (!options.typeCheckOnly) {
-    const outputFileFlag = `--js_output_file=${destFile}`;
-    const sourcemapFlag = `--create_source_map=${sourcemapFile}`;
-    compilerFlags.push(outputFileFlag, sourcemapFlag);
-  }
-  return compilerFlags;
-}
-
-/**
- * @param {string[]|string} entryModuleFilenames
- * @param {string} outputDir
- * @param {string} outputFilename
- * @param {!OptionsDef} options
- * @param {{startTime?: number}} timeInfo
- * @return {Promise<void>}
- */
-async function compile(
-  entryModuleFilenames,
-  outputDir,
-  outputFilename,
-  options,
-  timeInfo
-) {
-  if (timeInfo) {
-    timeInfo.startTime = Date.now();
-  }
-  if (!Array.isArray(entryModuleFilenames)) {
-    entryModuleFilenames = [entryModuleFilenames];
-  }
-  const destFile = `${outputDir}/${outputFilename}`;
-  const sourcemapFile = `${destFile}.map`;
-  const compilerOptions = await generateCompilerOptions(
-    outputFilename,
-    options
-  );
-  const srcs = options.noAddDeps
-    ? entryModuleFilenames.concat(options.extraGlobs || [])
-    : getSrcs(entryModuleFilenames, options);
-  const transformedSrcFiles = await Promise.all(
-    fastGlob
-      .sync(srcs)
-      .map((src) => preClosureBabel(src, outputFilename, options))
-  );
-  if (options.errored && options.continueOnError) {
-    return; // Watch build. Bail on transform errors.
-  }
-  const flags = generateFlags(
-    options,
-    compilerOptions,
-    entryModuleFilenames,
-    destFile,
-    sourcemapFile
-  );
-  await runClosure(outputFilename, options, flags, transformedSrcFiles);
-  if (options.errored && options.continueOnError) {
-    return; // Watch build. Bail on compilation errors.
-  }
-  if (!options.typeCheckOnly) {
-    if (!argv.pseudo_names && !options.skipUnknownDepsCheck) {
-      await checkForUnknownDeps(destFile);
-    }
-    await postClosureBabel(destFile);
-    await sanitize(destFile);
-    await writeSourcemaps(sourcemapFile, options);
-  }
-}
-
-/**
- * Indicates the current closure concurrency and how to override it.
- */
-function printClosureConcurrency() {
-  log(
-    green('Using up to'),
-    cyan(MAX_PARALLEL_CLOSURE_INVOCATIONS.toString()),
-    green('concurrent invocations of closure compiler.')
-  );
-  if (!argv.closure_concurrency) {
-    logLocalDev(
-      green('⤷ Use'),
-      cyan('--closure_concurrency=N'),
-      green('to change this number.')
-    );
-  }
-}
-
-module.exports = {
-  cleanupBuildDir,
-  closureCompile,
-  printClosureConcurrency,
-};
diff --git a/build-system/compile/debug-compilation-lifecycle.js b/build-system/compile/debug-compilation-lifecycle.js
index dbc133c42759..8c87c9fb52ae 100644
--- a/build-system/compile/debug-compilation-lifecycle.js
+++ b/build-system/compile/debug-compilation-lifecycle.js
@@ -13,15 +13,6 @@ const pad = (value, length) =>
     length
   );
 
-const LIFECYCLES = {
-  'pre-babel': 'pre-babel',
-  'post-babel': 'post-babel',
-  'pre-closure': 'pre-closure',
-  'closured-pre-babel': 'closured-pre-babel',
-  'closured-pre-terser': 'closured-pre-terser',
-  'complete': 'complete',
-};
-
 /**
  * Output debugging information when developing changes in this functionality.
  *
@@ -31,7 +22,7 @@ const LIFECYCLES = {
  * @param {Object=} sourcemap
  */
 function debug(lifecycle, fullpath, content, sourcemap) {
-  if (argv.debug && Object.keys(LIFECYCLES).includes(lifecycle)) {
+  if (argv.debug) {
     if (!content) {
       content = fs.readFileSync(fullpath, 'utf-8');
     }
@@ -65,5 +56,4 @@ function displayLifecycleDebugging() {
 module.exports = {
   displayLifecycleDebugging,
   debug,
-  CompilationLifecycles: LIFECYCLES,
 };
diff --git a/build-system/compile/helpers.js b/build-system/compile/helpers.js
index 3ce08ca6db9a..99fae3070d58 100644
--- a/build-system/compile/helpers.js
+++ b/build-system/compile/helpers.js
@@ -1,16 +1,13 @@
 'use strict';
 
 const argv = require('minimist')(process.argv.slice(2));
-const fs = require('fs-extra');
-const path = require('path');
-const {getBabelOutputDir} = require('./pre-closure-babel');
 const {VERSION: internalRuntimeVersion} = require('./internal-version');
 
 /**
  * Computes the base url for sourcemaps. Custom sourcemap URLs have placeholder
  * {version} that should be replaced with the actual version. Also, ensures
  * that a trailing slash exists.
- * @param {Object} options
+ * @param {object} options
  * @return {string}
  */
 function getSourceRoot(options) {
@@ -19,47 +16,10 @@ function getSourceRoot(options) {
       .replace(/\{version\}/g, internalRuntimeVersion)
       .replace(/([^/])$/, '$1/');
   }
-  if (options.fortesting) {
+  if (options.fortesting || !argv._.includes('dist')) {
     return 'http://localhost:8000/';
   }
   return `https://raw.githubusercontent.com/ampproject/amphtml/${internalRuntimeVersion}/`;
 }
 
-/**
- * Updates all filepaths in the sourcemap output.
- * @param {Object} sourcemaps
- */
-function updatePaths(sourcemaps) {
-  const babelOutputDir = getBabelOutputDir();
-  sourcemaps.sources = sourcemaps.sources.map((source) =>
-    source.startsWith(babelOutputDir)
-      ? path.relative(babelOutputDir, source)
-      : source
-  );
-  if (sourcemaps.file) {
-    sourcemaps.file = path.basename(sourcemaps.file);
-  }
-}
-
-/**
- * Writes the sourcemap output to disk.
- * @param {string} sourcemapsFile
- * @param {Object} options
- * @return {Promise<void>}
- */
-async function writeSourcemaps(sourcemapsFile, options) {
-  const sourcemaps = await fs.readJson(sourcemapsFile);
-
-  updatePaths(sourcemaps);
-  if (!argv.full_sourcemaps) {
-    delete sourcemaps.sourcesContent;
-  }
-  sourcemaps.sourceRoot = getSourceRoot(options);
-
-  await fs.writeJSON(sourcemapsFile, sourcemaps);
-}
-
-module.exports = {
-  getSourceRoot,
-  writeSourcemaps,
-};
+module.exports = {getSourceRoot};
diff --git a/build-system/compile/json-schema/.eslintrc.js b/build-system/compile/json-schema/.eslintrc.js
new file mode 100644
index 000000000000..035b97b4cc8c
--- /dev/null
+++ b/build-system/compile/json-schema/.eslintrc.js
@@ -0,0 +1,3 @@
+module.exports = {
+  'ignorePatterns': ['test/output/**/*.js'],
+};
diff --git a/build-system/compile/json-schema/README.md b/build-system/compile/json-schema/README.md
new file mode 100644
index 000000000000..a3908b34e2ce
--- /dev/null
+++ b/build-system/compile/json-schema/README.md
@@ -0,0 +1,76 @@
+# Using JSON Schema to validate input
+
+A file may import a [JSON Schema](https://json-schema.org/) validation function by importing its schema file:
+
+### `product.schema.json`
+
+```json5
+{
+  "properties": {
+    // .schema.json files can have comments
+    "title": {"type": "string"}
+  },
+  "required": ["title"]
+}
+```
+
+### `source.js`
+
+Import a function from a JSON Schema file, using `assert { type: 'json-schema' }`:
+
+```js
+import validateProduct from './product.schema.json' assert { type: 'json-schema' };
+
+validateProduct({foo: "bar"}); // invalid, returns errrors
+```
+
+`validateProduct` can have any name since it's the default exported function. It's generated by [`babel-plugin-transform-json-import`](../../babel-plugins/babel-plugin-transform-json-import).
+
+This function has the following signature:
+
+```typescript
+function validate(data: any, schemaName? string): string[] {}
+```
+
+#### Arguments
+
+-   **`data`** is the value to validate.
+-   **`schemaName`** is optional, and represents the name of the validated object. This is added to error messages. By default, it's the basename of the imported file.
+
+#### Return value
+
+The function returns an array of strings representing validation errors. It is empty when valid:
+
+```js
+const errors = validateProduct(myProduct);
+if (errors.length) {
+  for (const error of errors) {
+    console.warn(error);
+  }
+}
+```
+
+## Extended Features
+
+We write all JSON schema exactly like the standard spec. However, some schemas can be annotated so that they can be compiled into a special function.
+
+### Currency Codes
+
+Validating a currency code in JSON Schema requires a long [`enum`](http://json-schema.org/understanding-json-schema/reference/generic.html#enumerated-values) of possible values.
+
+In JavaScript [we can instead use `Intl.NumberFormat`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat/NumberFormat#currency_formatting). This prevents us from including this long list, in order to reduce output size.
+
+By including the string `ISO 4217` (or any that matches `/iso[_- ]?4217/i`) in the `description` field, the `enum` is replaced with a `Intl.NumberFormat` call in the validation code.
+
+You should also include the full ISO 4217 list of currency codes as `enum` to ensure schema portability. If the list is not included, or incomplete, compilation will fail. You may copy this list from [`iso4217.json`](./iso4217.json)
+
+```json
+{
+  "description": "https://en.wikipedia.org/wiki/ISO_4217",
+  "enum": [
+    "AED",
+    "...",
+    "ZWL"
+  ]
+}
+```
diff --git a/build-system/compile/json-schema/index.js b/build-system/compile/json-schema/index.js
new file mode 100644
index 000000000000..a7454d85029d
--- /dev/null
+++ b/build-system/compile/json-schema/index.js
@@ -0,0 +1,445 @@
+/**
+ * @fileoverview
+ * Compiles JSON Schema to a validate() function using ajv.
+ */
+const {_: ajvCode, Name: AjvName, default: Ajv} = require('ajv');
+const {fastFormats: ajvFormats} = require('ajv-formats/dist/formats');
+const {once} = require('../../common/once');
+const {default: AjvStandalone} = require('ajv/dist/standalone');
+const babel = require('@babel/core');
+const iso4217 = require('./iso4217.json');
+
+const iso4217DescriptionRe = /iso[_\- ]*4217/i;
+
+/**
+ * Defines custom validators that we may inject into certain schemas.
+ * @const {{
+ *   fn: string,
+ *   error?: import('ajv/dist/types').KeywordErrorDefinition,
+ *   shouldUse: (import('ajv/dist/types').SchemaObject) => boolean,
+ * }[]}
+ *  - `fn` is the name of a validator function exported from `#core/json-schema`
+ *    This function must return a boolean value determining whether the data is
+ *    valid
+ *  - `error` is optional and determines a `KeywordErrorDefinition` for ajv
+ *    that's used when validation fails.
+ *  - `shouldUse` is a boolean function that tests whether `fn` should be used
+ *    for a certain schema.
+ *    This function may also modify the schema object in-place. This is
+ *    desirable in cases where the validator function should override validators
+ *    with an equivalent implementation.
+ */
+const customValidators = [
+  // A schema may include an `enum` with a list of valid currency codes.
+  // When its `description` includes the URL that links to currency codes below,
+  // we remove this enum and instead use `Intl.NumberFormat` to validate them
+  // natively. This prevents the binary from including a long list of currency
+  // codes.
+  {
+    fn: 'isIso4217CurrencyCode',
+    error: {message: 'must be a valid ISO 4217 currency code'},
+    shouldUse(schema) {
+      if (!iso4217DescriptionRe.test(schema.description)) {
+        return false;
+      }
+      if (
+        !Array.isArray(schema.enum) ||
+        JSON.stringify(schema.enum.sort()) !== JSON.stringify(iso4217.sort())
+      ) {
+        throw new Error(
+          'ISO 4217 schema must contain an `enum` keyword including all valid currency codes.'
+        );
+      }
+      delete schema.enum;
+      return true;
+    },
+  },
+];
+
+/**
+ * Creates a vocabulary keyword for each custom validator.
+ * We name keywords by prefing the validator function name with an underscore:
+ *   { "_isIso4217CurrencyCode": true }
+ * This format prevents them from clobbering the standard namespace
+ * @param {Set<string>} used
+ * @return {import('ajv').KeywordDefinition[]}
+ */
+function getCustomValidatorKeywords(used) {
+  return customValidators.map(({error, fn}) => ({
+    keyword: `_${fn}`,
+    error,
+    code(ctx) {
+      used.add(fn);
+      ctx.pass(ajvCode`${new AjvName(fn)}(${ctx.data})`);
+    },
+  }));
+}
+
+/**
+ * @param {*} schema
+ * @return {*}
+ */
+function addCustomValidatorsToSchema(schema) {
+  if (typeof schema !== 'object') {
+    return schema;
+  }
+  if (Array.isArray(schema)) {
+    return schema.map(addCustomValidatorsToSchema);
+  }
+  for (const {fn, shouldUse} of customValidators) {
+    if (shouldUse(schema)) {
+      schema[`_${fn}`] = true;
+    }
+  }
+  for (const k in schema) {
+    schema[k] = addCustomValidatorsToSchema(schema[k]);
+  }
+  return schema;
+}
+
+/**
+ * Remaps `ajv-formats` in order to only use simple formats (true, string, RegExp).
+ * Other types of formats would force bundles to contain *all* format definitions
+ * even when unused.
+ * @return {{[format: string]: import('ajv').Format}}
+ */
+const getFormats = once(() => {
+  const formats = {};
+  for (const k in ajvFormats) {
+    let format = ajvFormats[k];
+    if (typeof format === 'object' && 'validate' in format) {
+      format = format.validate;
+    }
+    if (
+      typeof format === 'string' ||
+      format instanceof RegExp ||
+      format === true
+    ) {
+      formats[k] = format;
+    }
+  }
+  return formats;
+});
+
+/**
+ * @param {any} schema
+ * @return {string}
+ */
+function ajvCompile(schema) {
+  const validatorFns = new Set();
+  const ajv = new Ajv({
+    code: {
+      esm: true,
+      source: true,
+      lines: true,
+    },
+    inlineRefs: false,
+    allErrors: true,
+    validateSchema: false,
+    formats: getFormats(),
+    keywords: getCustomValidatorKeywords(validatorFns),
+  });
+  const ajvResult = ajv.compile(addCustomValidatorsToSchema(schema));
+  const importCode = getImportCode(validatorFns);
+  const ajvCode = AjvStandalone(ajv, ajvResult);
+  return importCode + ajvCode;
+}
+
+/**
+ * @param {Set<string>} validatorFns
+ * @return {string}
+ */
+function getImportCode(validatorFns) {
+  if (!validatorFns.size) {
+    return '';
+  }
+  const specifiers = Array.from(validatorFns).join(', ');
+  return `import {${specifiers}} from '#core/json-schema';\n\n`;
+}
+
+/**
+ * Transforms ajv's generated code to make it usable in a bundle:
+ *  - Creates strings for error messages instead of an object.
+ *  - Removes exports (it expects to be included inline).
+ *  - Rescopes the current code to prevent collisions with taken names.
+ *  - Strips down included schemas so that they only contain the referenced
+ *    portions.
+ * @param {string} code
+ * @param {Set<string>} taken
+ * @param {babel.TransformOptions=} config
+ * @return {{result: babel.BabelFileResult | null, name: string}}
+ */
+function transformAjvCode(code, taken, config) {
+  const {template, types: t} = babel;
+
+  // ajvCompile's generated name
+  let name = 'validate';
+
+  const isObjectProperty = (node, name) =>
+    (t.isObjectProperty(node) && t.isIdentifier(node.key, {name})) ||
+    t.isStringLiteral(node.key, {value: name});
+
+  const findProperty = (properties, name) =>
+    properties.find((node) => isObjectProperty(node, name));
+
+  /**
+   * @param {babel.NodePath<babel.types.MemberExpression>} memberExpression
+   * @return {null | undefined | number | string}
+   */
+  function evaluatePropertyKey(memberExpression) {
+    const property = memberExpression.get('property');
+    if (property.isIdentifier()) {
+      return property.node.name;
+    }
+    if (memberExpression.node.computed) {
+      return property.evaluate().value;
+    }
+    return null;
+  }
+
+  const schemaIdRegexp = /^schema[0-9]*$/;
+
+  /**
+   * @param {babel.NodePath<any>} path
+   * @param {string[]} keys
+   * @return {boolean}
+   */
+  function isMemberExpressionLeftwards(path, keys) {
+    let i = keys.length - 1;
+    while (true) {
+      if (path.isMemberExpression()) {
+        const key = evaluatePropertyKey(path);
+        if (key !== keys[i--]) {
+          return false;
+        }
+        path = path.get('object');
+      } else if (path.isVariableDeclarator()) {
+        const init = path.get('init');
+        if (!init) {
+          break;
+        }
+        path = init;
+      } else if (path.isIdentifier()) {
+        const binding = path.scope.getBinding(path.node.name);
+        if (!binding) {
+          break;
+        }
+        path = binding.path;
+      } else {
+        break;
+      }
+    }
+    return i === 0 && path.isIdentifier({name: keys[i]});
+  }
+
+  /**
+   * @param {babel.NodePath} path
+   * @return {boolean}
+   */
+  function isReferenceToObjectKeyList(path) {
+    const {parentPath} = path;
+    if (parentPath?.isMemberExpression() && path.key === 'object') {
+      return (
+        t.isIdentifier(parentPath.node.property, {name: 'hasOwnProperty'}) &&
+        parentPath.parentPath?.isCallExpression()
+      );
+    }
+    if (
+      parentPath?.isCallExpression() &&
+      parentPath.node.arguments[0] === path.node
+    ) {
+      const callee = parentPath.get('callee');
+      return (
+        isMemberExpressionLeftwards(callee, ['Object', 'keys']) ||
+        isMemberExpressionLeftwards(callee, [
+          'Object',
+          'prototype',
+          'hasOwnProperty',
+          'call',
+        ])
+      );
+    }
+    return false;
+  }
+
+  /** @type {{[stringified: string]: string}} */
+  const valueReferences = {};
+
+  /**
+   * Resolves static references to object properties as deeply as possible,
+   * and hoists references to those values.
+   * @param {import('@babel/traverse').Binding} binding
+   */
+  function hoistProperties(binding) {
+    const {constant, identifier, path, referencePaths} = binding;
+    if (!constant || !path.isVariableDeclarator()) {
+      return;
+    }
+    const init = path.get('init');
+    if (!init.isObjectExpression()) {
+      return;
+    }
+    const original = init.evaluate().value;
+    if (original == null) {
+      // original is dynamic, deopt
+      return;
+    }
+    /** @type {Map<Object, babel.NodePath[]>} */
+    const hoisted = new Map();
+    /** @type {[any, babel.NodePath[]][]} */
+    const queue = [[original, referencePaths]];
+    for (const [startValue, referencePaths] of queue) {
+      for (let referencePath of referencePaths) {
+        let value = startValue;
+        let {parentPath} = referencePath;
+        while (parentPath?.isMemberExpression()) {
+          const key = evaluatePropertyKey(parentPath);
+          if (key == null || !value.hasOwnProperty(key)) {
+            break;
+          }
+          value = value[key];
+          referencePath = parentPath;
+          parentPath = referencePath.parentPath;
+        }
+        if (value === original) {
+          // deopt
+          return;
+        }
+        // Follow references to declared variable.
+        if (
+          parentPath?.isVariableDeclarator() &&
+          t.isIdentifier(parentPath.node.id)
+        ) {
+          const {name} = parentPath.node.id;
+          const binding = parentPath.scope.getBinding(name);
+          if (binding?.constant) {
+            const {referencePaths} = binding;
+            queue.push([value, referencePaths]);
+            parentPath.remove();
+            continue;
+          }
+        }
+        const hoistedReferences = hoisted.get(value) ?? [];
+        hoistedReferences.push(referencePath);
+        hoisted.set(value, hoistedReferences);
+      }
+    }
+    for (const [value, referencePaths] of hoisted) {
+      // Override every property value as `0` when we only need a key list.
+      if (referencePaths.every(isReferenceToObjectKeyList)) {
+        for (const k in value) {
+          value[k] = 0;
+        }
+      }
+      // Stringify to de-dupe identical objects.
+      // (This may occur as a result of some uses of $ref)
+      const stringified = JSON.stringify(value);
+      let name = valueReferences[stringified];
+      if (!name) {
+        name = rescope(path, path.scope.generateUid(identifier.name));
+        path.scope.push({
+          kind: 'const',
+          id: t.identifier(name),
+          init: t.valueToNode(value),
+        });
+        valueReferences[stringified] = name;
+      }
+      for (const referencePath of referencePaths) {
+        referencePath.replaceWith(t.identifier(name));
+      }
+    }
+    path.remove();
+  }
+
+  /**
+   * Prevents collisions with outer scope
+   * @param {babel.NodePath} path
+   * @param {string} id
+   * @return {string}
+   */
+  function rescope(path, id) {
+    let renamed = id;
+    while (taken.has(renamed)) {
+      renamed = path.scope.generateUid(id);
+    }
+    if (renamed !== id) {
+      path.scope.rename(id, renamed);
+      if (id === name) {
+        name = renamed;
+      }
+    }
+    return renamed;
+  }
+
+  /** @type {babel.PluginObj} */
+  const plugin = {
+    visitor: {
+      Program: {
+        exit(path) {
+          path.scope.crawl();
+          for (const id in path.scope.bindings) {
+            const binding = path.scope.bindings[id];
+            if (schemaIdRegexp.test(id)) {
+              hoistProperties(binding);
+            }
+            rescope(path, id);
+          }
+        },
+      },
+      ExportDefaultDeclaration(path) {
+        // Remove `export default validate`
+        path.remove();
+      },
+      ExportNamedDeclaration(path) {
+        // Unexport named exports.
+        if (path.node.declaration) {
+          path.replaceWith(path.node.declaration);
+        } else {
+          path.remove();
+        }
+      },
+      ObjectExpression(path) {
+        // Replace objects with {instancePath} with a string corresponding
+        // to the `instancePath`, or `instancePath` and `message` combined.
+        const {properties} = path.node;
+        const instancePath = findProperty(properties, 'instancePath');
+        if (!instancePath) {
+          return;
+        }
+        const message = findProperty(properties, 'message');
+        if (!message) {
+          path.replaceWith(instancePath.value);
+          return;
+        }
+        path.replaceWith(template.expression.ast`
+          (${instancePath.value} + ' ' + ${message.value}).trim()
+        `);
+      },
+      ObjectPattern(path) {
+        // Replace destructuring of arguments with {instancePath} with just
+        // the assignment or id for instancePath
+        const replacedPath = path.parentPath.isAssignmentPattern()
+          ? path.parentPath
+          : path;
+        if (!replacedPath.parentPath.isFunctionDeclaration()) {
+          return;
+        }
+        const {properties} = path.node;
+        const value = findProperty(properties, 'instancePath')?.value;
+        if (t.isIdentifier(value) || t.isAssignmentPattern(value)) {
+          replacedPath.replaceWith(value);
+        }
+      },
+    },
+  };
+  const result = babel.transformSync(code, {
+    ...config,
+    plugins: [...(config?.plugins || []), plugin],
+  });
+  return {result, name};
+}
+
+module.exports = {
+  ajvCompile,
+  transformAjvCode,
+};
diff --git a/build-system/compile/json-schema/iso4217.json b/build-system/compile/json-schema/iso4217.json
new file mode 100644
index 000000000000..520c80422a1d
--- /dev/null
+++ b/build-system/compile/json-schema/iso4217.json
@@ -0,0 +1,182 @@
+[
+  "AED",
+  "AFN",
+  "ALL",
+  "AMD",
+  "ANG",
+  "AOA",
+  "ARS",
+  "AUD",
+  "AWG",
+  "AZN",
+  "BAM",
+  "BBD",
+  "BDT",
+  "BGN",
+  "BHD",
+  "BIF",
+  "BMD",
+  "BND",
+  "BOB",
+  "BOV",
+  "BRL",
+  "BSD",
+  "BTN",
+  "BWP",
+  "BYN",
+  "BZD",
+  "CAD",
+  "CDF",
+  "CHE",
+  "CHF",
+  "CHW",
+  "CLF",
+  "CLP",
+  "CNY",
+  "COP",
+  "COU",
+  "CRC",
+  "CUC",
+  "CUP",
+  "CVE",
+  "CZK",
+  "DJF",
+  "DKK",
+  "DOP",
+  "DZD",
+  "EGP",
+  "ERN",
+  "ETB",
+  "EUR",
+  "FJD",
+  "FKP",
+  "GBP",
+  "GEL",
+  "GHS",
+  "GIP",
+  "GMD",
+  "GNF",
+  "GTQ",
+  "GYD",
+  "HKD",
+  "HNL",
+  "HRK",
+  "HTG",
+  "HUF",
+  "IDR",
+  "ILS",
+  "INR",
+  "IQD",
+  "IRR",
+  "ISK",
+  "JMD",
+  "JOD",
+  "JPY",
+  "KES",
+  "KGS",
+  "KHR",
+  "KMF",
+  "KPW",
+  "KRW",
+  "KWD",
+  "KYD",
+  "KZT",
+  "LAK",
+  "LBP",
+  "LKR",
+  "LRD",
+  "LSL",
+  "LYD",
+  "MAD",
+  "MDL",
+  "MGA",
+  "MKD",
+  "MMK",
+  "MNT",
+  "MOP",
+  "MRU",
+  "MUR",
+  "MVR",
+  "MWK",
+  "MXN",
+  "MXV",
+  "MYR",
+  "MZN",
+  "NAD",
+  "NGN",
+  "NIO",
+  "NOK",
+  "NPR",
+  "NZD",
+  "OMR",
+  "PAB",
+  "PEN",
+  "PGK",
+  "PHP",
+  "PKR",
+  "PLN",
+  "PYG",
+  "QAR",
+  "RON",
+  "RSD",
+  "RUB",
+  "RWF",
+  "SAR",
+  "SBD",
+  "SCR",
+  "SDG",
+  "SEK",
+  "SGD",
+  "SHP",
+  "SLL",
+  "SOS",
+  "SRD",
+  "SSP",
+  "STN",
+  "SVC",
+  "SYP",
+  "SZL",
+  "THB",
+  "TJS",
+  "TMT",
+  "TND",
+  "TOP",
+  "TRY",
+  "TTD",
+  "TWD",
+  "TZS",
+  "UAH",
+  "UGX",
+  "USD",
+  "USN",
+  "UYI",
+  "UYU",
+  "UYW",
+  "UZS",
+  "VED",
+  "VES",
+  "VND",
+  "VUV",
+  "WST",
+  "XAF",
+  "XAG",
+  "XAU",
+  "XBA",
+  "XBB",
+  "XBC",
+  "XBD",
+  "XCD",
+  "XDR",
+  "XOF",
+  "XPD",
+  "XPF",
+  "XPT",
+  "XSU",
+  "XTS",
+  "XUA",
+  "XXX",
+  "YER",
+  "ZAR",
+  "ZMW",
+  "ZWL"
+]
diff --git a/build-system/compile/post-closure-babel.js b/build-system/compile/post-closure-babel.js
deleted file mode 100644
index 09d2fe3016ce..000000000000
--- a/build-system/compile/post-closure-babel.js
+++ /dev/null
@@ -1,84 +0,0 @@
-'use strict';
-const argv = require('minimist')(process.argv.slice(2));
-const babel = require('@babel/core');
-const fs = require('fs-extra');
-const path = require('path');
-const Remapping = require('@ampproject/remapping');
-const terser = require('terser');
-const {CompilationLifecycles, debug} = require('./debug-compilation-lifecycle');
-
-/** @type {Remapping.default} */
-const remapping = /** @type {*} */ (Remapping);
-
-/**
- * Minify passed string.
- *
- * @param {string} code
- * @return {Promise<Object<string, terser.SourceMapOptions['content']>>}
- */
-async function terserMinify(code) {
-  const options = {
-    mangle: false,
-    compress: {
-      defaults: false,
-      unused: true,
-    },
-    output: {
-      beautify: !!argv.pretty_print,
-      comments: /\/*/,
-      // eslint-disable-next-line local/camelcase
-      keep_quoted_props: true,
-    },
-    sourceMap: true,
-  };
-  const minified = await terser.minify(code, options);
-
-  return {
-    compressed: minified.code,
-    terserMap: minified.map,
-  };
-}
-
-/**
- * Apply Babel Transforms on output from Closure Compuler, then cleanup added
- * space with Terser.
- * @param {string} file
- * @return {Promise<void>}
- */
-async function postClosureBabel(file) {
-  if (path.extname(file) === '.map') {
-    debug(CompilationLifecycles['complete'], file);
-    return;
-  }
-
-  debug(CompilationLifecycles['closured-pre-babel'], file);
-  /** @type {?babel.TransformOptions} */
-  const babelOptions = babel.loadOptions({caller: {name: 'post-closure'}});
-  const {code, map: babelMap} =
-    (await babel.transformFileAsync(file, babelOptions ?? undefined)) || {};
-  if (!code || !babelMap) {
-    throw new Error(`Error transforming contents of ${file}`);
-  }
-
-  debug(CompilationLifecycles['closured-pre-terser'], file, code, babelMap);
-  const {compressed, terserMap} = await terserMinify(code);
-  await fs.outputFile(file, compressed);
-
-  const closureMap = await fs.readJson(`${file}.map`, 'utf8');
-  const sourceMap = remapping(
-    [terserMap, babelMap, closureMap],
-    () => null,
-    !argv.full_sourcemaps
-  );
-  debug(
-    CompilationLifecycles['complete'],
-    file,
-    compressed?.toString(),
-    sourceMap
-  );
-  await fs.writeJson(`${file}.map`, sourceMap);
-}
-
-module.exports = {
-  postClosureBabel,
-};
diff --git a/build-system/compile/pre-closure-babel.js b/build-system/compile/pre-closure-babel.js
deleted file mode 100644
index 21cd5d0b6972..000000000000
--- a/build-system/compile/pre-closure-babel.js
+++ /dev/null
@@ -1,147 +0,0 @@
-'use strict';
-
-const babel = require('@babel/core');
-const fastGlob = require('fast-glob');
-const fs = require('fs-extra');
-const path = require('path');
-const tempy = require('tempy');
-const {BABEL_SRC_GLOBS} = require('./sources');
-const {CompilationLifecycles, debug} = require('./debug-compilation-lifecycle');
-const {cyan, red} = require('kleur/colors');
-const {log} = require('../common/logging');
-const {TransformCache, batchedRead, md5} = require('../common/transform-cache');
-
-/**
- * Files on which to run pre-closure babel transforms.
- *
- * @private @const {!Array<string>}
- */
-let filesToTransform;
-
-/**
- * Directory used to output babel transformed files for closure compilation.
- *
- * @private @const {string}
- */
-let outputDir;
-
-/**
- * Used to cache pre-closure babel transforms.
- *
- * @const {TransformCache}
- */
-let transformCache;
-
-/**
- * Returns the name of the babel output directory if it has been created.
- *
- * @return {string}
- */
-function getBabelOutputDir() {
-  return outputDir || '';
-}
-
-/**
- * Computes the set of files on which to run pre-closure babel transforms.
- *
- * @return {!Array<string>}
- */
-function getFilesToTransform() {
-  return fastGlob.sync([
-    ...BABEL_SRC_GLOBS,
-    '!node_modules/**',
-    '!third_party/**',
-  ]);
-}
-
-/**
- * Apply babel transforms prior to closure compiler pass, store the transformed
- * file in an output directory (used by closure compiler), and return the path
- * of the transformed file.
- *
- * When a source file is transformed for the first time, it is written to a
- * persistent transform cache from where it is retrieved every subsequent time
- * without invoking babel. A change to the file contents or to the invocation
- * arguments will invalidate the cached result and re-transform the file.
- *
- * @param {string} file
- * @param {string} outputFilename
- * @param {!Object} options
- * @return {Promise<string>}
- */
-async function preClosureBabel(file, outputFilename, options) {
-  if (!outputDir) {
-    outputDir = tempy.directory();
-  }
-  if (!transformCache) {
-    transformCache = new TransformCache('.pre-closure-cache', '.js');
-  }
-  if (!filesToTransform) {
-    filesToTransform = getFilesToTransform();
-  }
-  const transformedFile = path.join(outputDir, file);
-  if (!filesToTransform.includes(file)) {
-    if (!(await fs.pathExists(transformedFile))) {
-      await fs.copy(file, transformedFile);
-    }
-    return transformedFile;
-  }
-  try {
-    debug(CompilationLifecycles['pre-babel'], file);
-    const babelOptions =
-      babel.loadOptions({caller: {name: 'pre-closure'}}) || {};
-    const optionsHash = md5(
-      JSON.stringify({babelOptions, argv: process.argv.slice(2)})
-    );
-    const {contents, hash} = await batchedRead(file, optionsHash);
-    const cachedPromise = transformCache.get(hash);
-    if (cachedPromise) {
-      if (!(await fs.pathExists(transformedFile))) {
-        await fs.outputFile(transformedFile, await cachedPromise);
-      }
-    } else {
-      const transformPromise = babel
-        .transformAsync(contents, {
-          ...babelOptions,
-          filename: file,
-          filenameRelative: path.basename(file),
-          sourceFileName: path.relative(process.cwd(), file),
-        })
-        .then((result) => result?.code);
-      transformCache.set(hash, transformPromise);
-      await fs.outputFile(transformedFile, await transformPromise);
-      debug(CompilationLifecycles['pre-closure'], transformedFile);
-    }
-  } catch (err) {
-    const reason = handlePreClosureError(err, outputFilename, options);
-    if (reason) {
-      throw reason;
-    }
-  }
-  return transformedFile;
-}
-
-/**
- * Handles a pre-closure babel error. Returns an error when transformation fails
- * except except in watch mode, where we want to print a message and continue.
- *
- * @param {Error} err
- * @param {string} outputFilename
- * @param {?Object=} options
- * @return {Error|undefined}
- */
-function handlePreClosureError(err, outputFilename, options) {
-  log(red('ERROR:'), err.message, '\n');
-  const reasonMessage = `Could not transform ${cyan(outputFilename)}`;
-  if (options && options.continueOnError) {
-    log(red('ERROR:'), reasonMessage);
-    options.errored = true;
-    return;
-  }
-  return new Error(reasonMessage);
-}
-
-module.exports = {
-  getBabelOutputDir,
-  preClosureBabel,
-};
diff --git a/build-system/compile/sanitize.js b/build-system/compile/sanitize.js
index d34a5b1cbc82..d4dd0ed347ca 100644
--- a/build-system/compile/sanitize.js
+++ b/build-system/compile/sanitize.js
@@ -28,7 +28,7 @@ async function sanitize(file) {
       replaced[match] ||
       (replaced[match] = `___${String(count++).padStart(6, '0')}___`)
   );
-  const formatted = prettier.format(presanitize, options);
+  const formatted = await prettier.format(presanitize, options);
   const sanitized = formatted.replace(/___\d+___/g, '______');
   await fs.outputFile(file, sanitized);
 }
diff --git a/build-system/compile/sources.js b/build-system/compile/sources.js
deleted file mode 100644
index 133444030796..000000000000
--- a/build-system/compile/sources.js
+++ /dev/null
@@ -1,160 +0,0 @@
-/**
- * @fileoverview This file contains all the globs required for babel
- * transformation and for closure compilation. Try and maintain the glob
- * for both the babel and closure sources to be as close as possible.
- */
-
-const COMMON_GLOBS = [
-  'third_party/amp-toolbox-cache-url/**/*.js',
-  'third_party/caja/html-sanitizer.js',
-  'third_party/closure-library/sha384-generated.js',
-  'third_party/css-escape/css-escape.js',
-  'third_party/d3/**/*.js',
-  'third_party/fuzzysearch/index.js',
-  'third_party/inputmask/**/*.js',
-  'third_party/mustache/**/*.js',
-  'third_party/react-dates/bundle.js',
-  'third_party/resize-observer-polyfill/ResizeObserver.install.js',
-  'third_party/set-dom/set-dom.js',
-  'third_party/subscriptions-project/*.js',
-  'third_party/timeagojs/**/*.js',
-  'third_party/webcomponentsjs/ShadowCSS.js',
-  'third_party/zuho/**/*.js',
-  'node_modules/dompurify/package.json',
-  'node_modules/dompurify/dist/purify.es.js',
-  'node_modules/intersection-observer/package.json',
-  'node_modules/intersection-observer/intersection-observer.install.js',
-  'node_modules/resize-observer-polyfill/package.json',
-  'node_modules/resize-observer-polyfill/ResizeObserver.install.js',
-  'node_modules/obj-str/package.json',
-  'node_modules/obj-str/dist/obj-str.mjs',
-  'node_modules/rrule/dist/es5/rrule.js',
-  'node_modules/timeago.js/package.json',
-  'node_modules/timeago.js/**/*.js',
-  'node_modules/web-animations-js/package.json',
-  'node_modules/web-animations-js/web-animations.install.js',
-  'node_modules/web-activities/package.json',
-  'node_modules/web-activities/activity-ports.js',
-  'node_modules/@ampproject/animations/package.json',
-  'node_modules/@ampproject/animations/dist/animations.mjs',
-  'node_modules/@ampproject/bento-compiler/package.json',
-  'node_modules/@ampproject/bento-compiler/dist/index.js',
-  'node_modules/@ampproject/toolbox-cache-url/package.json',
-  'node_modules/@ampproject/toolbox-cache-url/dist/amp-toolbox-cache-url.esm.js',
-  'node_modules/@ampproject/viewer-messaging/package.json',
-  'node_modules/@ampproject/viewer-messaging/messaging.js',
-  'node_modules/@ampproject/worker-dom/package.json',
-  'node_modules/@ampproject/worker-dom/dist/amp-production/main.mjs',
-  'node_modules/preact/package.json',
-  'node_modules/preact/dist/*.js',
-  'node_modules/preact/dom/*.js',
-  'node_modules/preact/hooks/package.json',
-  'node_modules/preact/hooks/dist/*.js',
-  'node_modules/preact/compat/package.json',
-  'node_modules/preact/compat/dist/*.js',
-  'node_modules/@babel/runtime/helpers/*.js',
-];
-
-/**
- * NOTE: Keep the globs here in sync with the `CLOSURE_SRC_GLOBS`.
- */
-const BABEL_SRC_GLOBS = [
-  'src/**/*.js',
-  'builtins/**/*.js',
-  'build/**/*.js',
-  'extensions/**/*.js',
-  '3p/**/*.js',
-  'ads/**/*.js',
-].concat(COMMON_GLOBS);
-
-/**
- * NOTE: Keep the globs here in sync with the `BABEL_SRC_GLOBS`.
- */
-const CLOSURE_SRC_GLOBS = [
-  '3p/3p.js',
-  // Ads config files.
-  'ads/_*.js',
-  'ads/alp/**/*.js',
-  'ads/google/**/*.js',
-  'ads/inabox/**/*.js',
-  // Files under build/. Should be sparse.
-  'build/*.css.js',
-  'build/fake-module/**/*.js',
-  'build/patched-module/**/*.js',
-  'build/experiments/**/*.js',
-  'build/parsers/**/*.js',
-  // A4A has these cross extension deps.
-  'extensions/amp-ad-network*/**/*-config.js',
-  'extensions/amp-ad/**/*.js',
-  'extensions/amp-a4a/**/*.js',
-  // TODO(#24080) Remove this when story ads have full ad network support.
-  // Needed for amp-story-auto-ads to validate amp-ad-exit config.
-  'extensions/amp-ad-exit/**/*.js',
-  // Currently needed for crypto.js and visibility.js.
-  // Should consider refactoring.
-  'extensions/amp-analytics/**/*.js',
-  // Needed for WebAnimationService
-  'extensions/amp-animation/**/*.js',
-  // Needed for amp-carousel 0.2, amp-inline-gallery, amp-stream-gallery
-  'extensions/amp-base-carousel/**/*.js',
-  // amp-brightcove 0.1 and 1.0 share this file.
-  'extensions/amp-brightcove/brightcove-api.js',
-  // Needed for carousel autolightbox
-  'extensions/amp-lightbox-gallery/1.0/*.js',
-  // Needed for amp-lightbox-gallery using amp-lightbox
-  'extensions/amp-lightbox/1.0/*.js',
-  // For amp-bind in the web worker (ww.js).
-  'extensions/amp-bind/**/*.js',
-  // amp-dailymotion 0.1 and 1.0 share this file.
-  'extensions/amp-dailymotion/dailymotion-api.js',
-  // amp-date-display 0.1 and 1.0 share this file.
-  'extensions/amp-date-display/format.js',
-  // Needed to access to Variant interface from other extensions
-  'extensions/amp-experiment/**/*.js',
-  // Needed to access form impl from other extensions
-  'extensions/amp-form/**/*.js',
-  // Needed by amp-facebook-* for the loader logo and base implementations
-  'extensions/amp-facebook/0.1/facebook-loader.js',
-  'extensions/amp-facebook/1.0/facebook-base-element.js',
-  'extensions/amp-facebook/1.0/component.js',
-  // Needed to access inputmask impl from other extensions
-  'extensions/amp-inputmask/**/*.js',
-  // Needed for AccessService
-  'extensions/amp-access/**/*.js',
-  // Needed for AmpStoryVariableService
-  'extensions/amp-story/**/*.js',
-  // Needed for story ad inabox
-  'extensions/amp-story-auto-ads/**/*.js',
-  // Needed for SubscriptionsService
-  'extensions/amp-subscriptions/**/*.js',
-  // Needed to access UserNotificationManager from other extensions
-  'extensions/amp-user-notification/**/*.js',
-  // Needed for video components in Bento.
-  'extensions/amp-video/1.0/**/*.js',
-  // amp-video-iframe 0.1 and 1.0 share this file.
-  'extensions/amp-video-iframe/amp-video-iframe-api.js',
-  // amp-vimeo 0.1 and 1.0 share this file.
-  'extensions/amp-vimeo/vimeo-api.js',
-  // Needed to access ConsentPolicyManager from other extensions
-  'extensions/amp-consent/**/*.js',
-  // Needed to access AmpGeo type for service locator
-  'extensions/amp-geo/**/*.js',
-  // Needed for amp-smartlinks dep on amp-skimlinks
-  'extensions/amp-skimlinks/0.1/**/*.js',
-  'src/*.js',
-  'src/**/*.js',
-  '!third_party/babel/custom-babel-helpers.js',
-  // Exclude since it's not part of the runtime/extension binaries.
-  '!extensions/amp-access/0.1/amp-login-done.js',
-  'builtins/**/*.js',
-  // 'node_modules/core-js/modules/**.js',
-  // Not sure what these files are, but they seem to duplicate code
-  // one level below and confuse the compiler.
-  '!node_modules/core-js/modules/library/**.js',
-  '!extensions/**/dist/**/*.js',
-].concat(COMMON_GLOBS);
-
-module.exports = {
-  BABEL_SRC_GLOBS,
-  CLOSURE_SRC_GLOBS,
-};
diff --git a/build-system/eslint-rules/OWNERS b/build-system/eslint-rules/OWNERS
index eeccea4248aa..8bd1335073dc 100644
--- a/build-system/eslint-rules/OWNERS
+++ b/build-system/eslint-rules/OWNERS
@@ -8,7 +8,6 @@
         {name: 'ampproject/wg-infra'},
         {name: 'ampproject/wg-performance'},
         {name: 'erwinmombay', notify: true},
-        {name: 'jridgewell', notify: true},
       ],
     },
   ],
diff --git a/build-system/eslint-rules/camelcase.js b/build-system/eslint-rules/camelcase.js
index dca870357508..cddd7cae3774 100644
--- a/build-system/eslint-rules/camelcase.js
+++ b/build-system/eslint-rules/camelcase.js
@@ -22,7 +22,7 @@ module.exports = function (context) {
         name = name.slice('opt_'.length);
       }
       if (name.endsWith('_Enum')) {
-        name = name.slice(0, '_Enum'.length);
+        name = name.slice(0, -'_Enum'.length);
       }
 
       if (!name.includes('_')) {
@@ -32,7 +32,7 @@ module.exports = function (context) {
       // Excuse membership access, unless we're in the LHS of an assignment.
       // This attempts to prevent us from defining new properties with underscores,
       // while allowing access to external objects that already have them.
-      // This mirros google-camelcase's logic.
+      // This mirrors google-camelcase's logic.
       const {parent} = node;
       if (parent.type === 'MemberExpression' && parent.property === node) {
         const grandParent = parent.parent;
@@ -46,6 +46,16 @@ module.exports = function (context) {
         }
       }
 
+      // Permit object destructuring, since that is similar to membership access.
+      // Requires that the key is immediately renamed to a conforming value.
+      if (
+        parent.type === 'Property' &&
+        parent.parent.type === 'ObjectPattern' &&
+        parent.key === node
+      ) {
+        return;
+      }
+
       context.report({
         node,
         message: `"${node.name}" must use camelCaseCapitalization.`,
diff --git a/build-system/eslint-rules/core-dom-jsx.js b/build-system/eslint-rules/core-dom-jsx.js
new file mode 100644
index 000000000000..d568dcc2e553
--- /dev/null
+++ b/build-system/eslint-rules/core-dom-jsx.js
@@ -0,0 +1,174 @@
+/**
+ * @fileoverview Lints JSX features not supported by core/dom/jsx
+ */
+const astUtils = require('../../node_modules/eslint/lib/rules/utils/ast-utils');
+
+module.exports = function (context) {
+  let isCoreDomJsx = false;
+
+  /**
+   * @param {import('eslint').Node} node
+   * @param {boolean} isClass
+   * @return {boolean}
+   */
+  function isValidStyleOrClassValue(node, isClass = false) {
+    if (node?.type === 'ConditionalExpression') {
+      // Both possible outcomes of a ternary must be valid
+      return (
+        isValidStyleOrClassValue(node.consequent, isClass) &&
+        isValidStyleOrClassValue(node.alternate, isClass)
+      );
+    } else if (node?.type === 'BinaryExpression') {
+      // Concatenating anything to a string is valid
+      if (node.operator === '+') {
+        return (
+          isValidStyleOrClassValue(node.left, isClass) ||
+          isValidStyleOrClassValue(node.right, isClass)
+        );
+      }
+    } else if (node?.type === 'LogicalExpression') {
+      if (node.operator === '||' || node.operator === '??') {
+        return (
+          isValidStyleOrClassValue(node.left, isClass) &&
+          isValidStyleOrClassValue(node.right, isClass)
+        );
+      }
+      // Any left falsy is okay
+      if (node.operator === '&&') {
+        return isValidStyleOrClassValue(node.right, isClass);
+      }
+    } else if (node?.type === 'CallExpression') {
+      // Calls to functions that return a string
+      const {name} = node.callee;
+      return name === 'String' || (isClass && name?.toLowerCase() === 'objstr');
+    } else if (node?.type === 'ObjectExpression') {
+      // Style attributes can be objects
+      return !isClass;
+    }
+    return node?.type === 'Literal' || node?.type === 'TemplateLiteral';
+  }
+
+  return {
+    Program() {
+      isCoreDomJsx = false;
+    },
+    ImportNamespaceSpecifier(node) {
+      if (node.parent.source.value.endsWith('core/dom/jsx')) {
+        isCoreDomJsx = true;
+      }
+    },
+    JSXFragment(node) {
+      if (!isCoreDomJsx) {
+        return;
+      }
+      context.report({
+        node,
+        message:
+          'Fragments are not supported. Change into an array of elements, or wrap in a root element.',
+      });
+    },
+    JSXOpeningElement(node) {
+      if (!isCoreDomJsx) {
+        return;
+      }
+      const {name} = node;
+      if (name.name === 'foreignObject') {
+        context.report({
+          node: node.name,
+          message: `<${node.name.name}> is not supported.`,
+        });
+      }
+
+      if (name.type === 'JSXMemberExpression') {
+        return context.report({
+          node,
+          message: [
+            'Static JSX Templates are required to use regular DOM nodes or Imported Components',
+            'This prevents an issue with `<json.type />` accidentally creating a <script> node.',
+          ].join('\n\t'),
+        });
+      }
+
+      if (name.name && /^[a-z]/.test(name.name)) {
+        return;
+      }
+
+      const variable = astUtils.getVariableByName(
+        context.getScope(),
+        name.name
+      );
+
+      if (!variable || variable.defs.length === 0) {
+        return context.report({
+          node,
+          message: `Could not find ${name.name} in the lexcial scope`,
+        });
+      }
+
+      for (const def of variable.defs) {
+        if (def.type === 'ImportBinding' || def.type === 'FunctionName') {
+          continue;
+        }
+
+        context.report({
+          node,
+          message: [
+            'Static JSX Templates are required to use regular DOM nodes or Imported Components',
+            'This prevents an issue with `<UserProvidedType />` accidentally creating a <script> node.',
+          ].join('\n\t'),
+        });
+      }
+    },
+    JSXSpreadAttribute(node) {
+      if (!isCoreDomJsx) {
+        return;
+      }
+
+      context.report({
+        node,
+        message: [
+          'Static JSX Templates are required to use static attribute definitions',
+          'This prevents an issue with spread attributes accidentally overriding a "safe" attribute with user-provided data.',
+        ].join('\n\t'),
+      });
+    },
+    JSXAttribute(node) {
+      if (!isCoreDomJsx) {
+        return;
+      }
+      const {name} = node.name;
+      if (name === 'dangerouslySetInnerHTML') {
+        context.report({
+          node: node.name,
+          message: `\`<${name}>\` is not supported.`,
+        });
+        return;
+      }
+      const {value} = node;
+      if (!value || value.type === 'Literal') {
+        return;
+      }
+      if (name === 'class') {
+        if (!isValidStyleOrClassValue(value.expression, /* isClass */ true)) {
+          context.report({
+            node: node.value,
+            message: [
+              `The inline result of \`${name}\` must resolve to a "string", a \`template \${literal}\`, or a call to either objstr() or String().`,
+              `Take caution when wrapping boolean or nullish values in String(). Do \`String(foo || '')\``,
+            ].join('\n - '),
+          });
+        }
+      } else if (name === 'style') {
+        if (!isValidStyleOrClassValue(value.expression)) {
+          context.report({
+            node: node.value,
+            message: [
+              `The inline result of \`${name}\` must resolve to an {objectExpression: ''}, a "string", a \`template \${literal}\`, or a call to String().`,
+              `Take caution when wrapping boolean or nullish values in String(). Do \`String(foo || '')\``,
+            ].join('\n - '),
+          });
+        }
+      }
+    },
+  };
+};
diff --git a/build-system/eslint-rules/dict-string-keys.js b/build-system/eslint-rules/dict-string-keys.js
deleted file mode 100644
index 1c00f978bc09..000000000000
--- a/build-system/eslint-rules/dict-string-keys.js
+++ /dev/null
@@ -1,50 +0,0 @@
-'use strict';
-
-module.exports = function (context) {
-  return {
-    CallExpression: function (node) {
-      if (node.callee.name === 'dict') {
-        if (node.arguments[0]) {
-          const arg1 = node.arguments[0];
-          if (arg1.type !== 'ObjectExpression') {
-            context.report({
-              node,
-              message:
-                'calls to `dict` must have an Object Literal ' +
-                'Expression as the first argument',
-            });
-            return;
-          }
-          checkNode(arg1, context);
-        }
-      }
-    },
-  };
-};
-
-/**
- * @param {*} node
- * @param {*} context
- */
-function checkNode(node, context) {
-  if (node.type === 'ObjectExpression') {
-    node.properties.forEach(function (prop) {
-      if (!prop.key || (!prop.key.raw && !prop.computed)) {
-        const {name = `[${prop.type}]`} = prop.key || prop.argument || {};
-        context.report({
-          node: prop,
-          message:
-            `Found: ${name}.` +
-            'The Object Literal Expression passed into `dict` must only contain string keyed properties.',
-        });
-      }
-      if (prop.value) {
-        checkNode(prop.value, context);
-      }
-    });
-  } else if (node.type === 'ArrayExpression') {
-    node.elements.forEach(function (elem) {
-      checkNode(elem, context);
-    });
-  }
-}
diff --git a/build-system/eslint-rules/enums.js b/build-system/eslint-rules/enums.js
index c686d3d2eab5..1189f169867b 100644
--- a/build-system/eslint-rules/enums.js
+++ b/build-system/eslint-rules/enums.js
@@ -36,7 +36,9 @@
  *
  * @return {!Object}
  */
-module.exports = function (context) {
+
+module.exports = function create(context) {
+  const renames = [];
   /**
    * @param {!Node} node
    * @return {boolean}
@@ -93,6 +95,11 @@ module.exports = function (context) {
       return;
     }
 
+    // Types are fine
+    if (parent.type === 'TSTypeReference') {
+      return;
+    }
+
     if (parent.type === 'VariableDeclarator') {
       // const Enum = {}
       if (parent.id === node) {
@@ -112,6 +119,18 @@ module.exports = function (context) {
       if (parent.object === node && parent.computed === false) {
         return;
       }
+
+      // NS.Enum.key get
+      if (parent.property === node && parent.computed === false) {
+        const grand = parent.parent;
+        if (
+          grand.type === 'MemberExpression' &&
+          grand.object === parent &&
+          grand.computed === false
+        ) {
+          return;
+        }
+      }
     }
 
     if (parent.type === 'CallExpression') {
@@ -138,6 +157,36 @@ module.exports = function (context) {
     });
   }
 
+  /**
+   * @param {!Node} id
+   * @param {!Node} root
+   * @param {!Node} old
+   */
+  function rename(id, root, old) {
+    if (!renames.includes(id.name)) {
+      return;
+    }
+
+    const rename = id.name + '_Enum';
+
+    context.report({
+      node: root || id,
+      message: 'rename',
+
+      fix(fixer) {
+        const fixes = [];
+        if (root) {
+          fixes.push(fixer.replaceText(root, rename));
+        }
+        const variable = context.getScope().set.get(old.name);
+        for (const ref of variable.references) {
+          fixes.push(fixer.replaceText(ref.identifier, rename));
+        }
+        return fixes;
+      },
+    });
+  }
+
   return {
     Identifier(node) {
       if (/_E(NUM|num)$/.test(node.name)) {
@@ -155,6 +204,9 @@ module.exports = function (context) {
       if (id.type !== 'Identifier') {
         return;
       }
+
+      rename(id, null, id);
+
       if (!/_E(NUM|num)$/.test(id.name)) {
         return;
       }
@@ -184,5 +236,15 @@ module.exports = function (context) {
         });
       }
     },
+
+    ImportDeclaration(node) {
+      for (const imp of node.specifiers) {
+        if (imp.type !== 'ImportSpecifier') {
+          continue;
+        }
+
+        rename(imp.imported, imp, imp.local);
+      }
+    },
   };
 };
diff --git a/build-system/eslint-rules/forbidden-terms-config.js b/build-system/eslint-rules/forbidden-terms-config.js
index 552208539c21..f045d53bc9e5 100644
--- a/build-system/eslint-rules/forbidden-terms-config.js
+++ b/build-system/eslint-rules/forbidden-terms-config.js
@@ -36,11 +36,12 @@ module.exports = {
      */
     function* removeFromArray(fixer, node) {
       const {text} = context.getSourceCode();
-      let {start} = node;
+      let [start] = node.range;
+      const [, end] = node.range;
       while (/\s/.test(text[start - 1])) {
         start--;
       }
-      yield fixer.removeRange([start, node.end]);
+      yield fixer.removeRange([start, end]);
 
       const after = context.getTokenAfter(node);
       if (after.type === 'Punctuator' && after.value === ',') {
@@ -49,11 +50,11 @@ module.exports = {
       }
 
       const [nextComment] = context.getCommentsAfter(node);
-      if (
-        nextComment &&
-        text.substr(node.end, nextComment.start - node.end).indexOf('\n') < 0
-      ) {
-        yield fixer.remove(nextComment);
+      if (nextComment) {
+        const [nextCommentStart] = nextComment.range;
+        if (text.substr(end, nextCommentStart - end).indexOf('\n') < 0) {
+          yield fixer.remove(nextComment);
+        }
       }
     }
 
diff --git a/build-system/eslint-rules/html-template.js b/build-system/eslint-rules/html-template.js
index fd033b1f384c..df44a0557c8d 100644
--- a/build-system/eslint-rules/html-template.js
+++ b/build-system/eslint-rules/html-template.js
@@ -108,7 +108,7 @@ function create(context) {
 
     if (invalids.length) {
       const sourceCode = context.getSourceCode();
-      const {start} = template;
+      const [start] = template.range;
 
       for (const {offset, tag} of invalids) {
         const itemStart = start + offset;
diff --git a/build-system/eslint-rules/no-duplicate-import.js b/build-system/eslint-rules/no-duplicate-import.js
index 785374dc6b15..f22c1da1d773 100644
--- a/build-system/eslint-rules/no-duplicate-import.js
+++ b/build-system/eslint-rules/no-duplicate-import.js
@@ -14,46 +14,60 @@ module.exports = {
   },
 
   create(context) {
-    const imports = new Map();
+    const moduleImports = new Map();
+    const typeImports = new Map();
+    const getImportMap = (node) =>
+      node.importKind === 'type' ? typeImports : moduleImports;
 
-    return {
-      'Program:exit': function () {
-        imports.forEach((imports) => {
-          const original = imports[0];
+    /**
+     * Iterate through imports and report found duplicates.
+     * @param {Map<string, string>} imports
+     */
+    function processImportMap(imports) {
+      imports.forEach((imports) => {
+        const original = imports[0];
 
-          for (let i = 1; i < imports.length; i++) {
-            const node = imports[i];
+        for (let i = 1; i < imports.length; i++) {
+          const node = imports[i];
 
-            context.report({
-              node,
-              message: `Duplicate import from ${node.source.value}`,
-              fix(fixer) {
-                const originalSpecifiers = original.specifiers;
-                const last = originalSpecifiers[originalSpecifiers.length - 1];
+          context.report({
+            node,
+            message: `Duplicate import from ${node.source.value}`,
+            fix(fixer) {
+              const originalSpecifiers = original.specifiers;
+              const last = originalSpecifiers[originalSpecifiers.length - 1];
 
-                const {specifiers} = node;
-                let text = '';
-                for (let i = 0; i < specifiers.length; i++) {
-                  const {imported, local} = specifiers[i];
-                  const {name} = imported;
+              const {specifiers} = node;
+              let text = '';
+              for (let i = 0; i < specifiers.length; i++) {
+                const {imported, local} = specifiers[i];
+                const {name} = imported;
 
-                  if (name === local.name) {
-                    text += `, ${name}`;
-                  } else {
-                    text += `, ${name} as ${local.name}`;
-                  }
+                if (name === local.name) {
+                  text += `, ${name}`;
+                } else {
+                  text += `, ${name} as ${local.name}`;
                 }
+              }
 
-                return [
-                  fixer.removeRange([node.range[1], node.range[1] + 1]),
-                  fixer.remove(node),
-                  fixer.insertTextAfter(last, text),
-                ];
-              },
-            });
-          }
-        });
-        imports.clear();
+              return [
+                fixer.removeRange([node.range[1], node.range[1] + 1]),
+                fixer.remove(node),
+                fixer.insertTextAfter(last, text),
+              ];
+            },
+          });
+        }
+      });
+    }
+
+    return {
+      'Program:exit': function () {
+        processImportMap(moduleImports);
+        processImportMap(typeImports);
+
+        moduleImports.clear();
+        typeImports.clear();
       },
 
       ImportDeclaration(node) {
@@ -69,6 +83,7 @@ module.exports = {
           }
         }
 
+        const imports = getImportMap(node);
         let nodes = imports.get(source);
         if (!nodes) {
           nodes = [];
diff --git a/build-system/eslint-rules/no-duplicate-name-typedef.js b/build-system/eslint-rules/no-duplicate-name-typedef.js
deleted file mode 100644
index ebf2814c6f20..000000000000
--- a/build-system/eslint-rules/no-duplicate-name-typedef.js
+++ /dev/null
@@ -1,53 +0,0 @@
-'use strict';
-
-// Global cache of typedefName: typedefLocation.
-const typedefs = new Map();
-
-module.exports = function (context) {
-  return {
-    Program() {
-      // When relinting a file, remove all typedefs that it declared.
-      const filename = context.getFilename();
-      const keys = [];
-      for (const [key, file] of typedefs) {
-        if (file === filename) {
-          keys.push(key);
-        }
-      }
-
-      for (const key of keys) {
-        typedefs.delete(key);
-      }
-    },
-
-    VariableDeclaration(node) {
-      const leadingComments = context.getCommentsBefore(node);
-      const typedefComment = leadingComments.find((comment) => {
-        return comment.type === 'Block' && /@typedef/.test(comment.value);
-      });
-
-      if (!typedefComment) {
-        return;
-      }
-
-      // We can assume theres only 1 variable declaration when a typedef
-      // annotation is found. This is because Closure Compiler does not allow
-      // declaration of multiple variables with a shared type information.
-      const typedefName = node.declarations[0].id.name;
-
-      const typedefLocation = typedefs.get(typedefName);
-      if (!typedefLocation) {
-        typedefs.set(typedefName, context.getFilename());
-        return;
-      }
-
-      context.report({
-        node,
-        message:
-          `Duplicate typedef name found: ${typedefName}. Another ` +
-          `typedef with the same name is found in ${typedefLocation}. ` +
-          'Suggestion: Add an infix version indicator like MyType_0_1_Def.',
-      });
-    },
-  };
-};
diff --git a/build-system/eslint-rules/no-export-side-effect.js b/build-system/eslint-rules/no-export-side-effect.js
index 391ece7d900e..4bb00e4c67b6 100644
--- a/build-system/eslint-rules/no-export-side-effect.js
+++ b/build-system/eslint-rules/no-export-side-effect.js
@@ -11,7 +11,12 @@ module.exports = function (context) {
               return declarator.init;
             })
             .filter(function (init) {
-              return init && /(?:Call|New)Expression/.test(init.type);
+              return (
+                init &&
+                /(?:Call|New)Expression/.test(init.type) &&
+                // Allow pure()
+                init.callee?.name !== 'pure'
+              );
             })
             .forEach(function (init) {
               context.report({
diff --git a/build-system/eslint-rules/no-global.js b/build-system/eslint-rules/no-global.js
index ac9af4dd9235..bb50f3a8226d 100644
--- a/build-system/eslint-rules/no-global.js
+++ b/build-system/eslint-rules/no-global.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const astUtils = require('eslint/lib/rules/utils/ast-utils');
+const astUtils = require('../../node_modules/eslint/lib/rules/utils/ast-utils');
 
 const GLOBALS = Object.create(null);
 GLOBALS.window = 'Use `self` instead.';
diff --git a/build-system/eslint-rules/no-import-rename.js b/build-system/eslint-rules/no-import-rename.js
index dc32bb10a6e6..4165ec8f8aa2 100644
--- a/build-system/eslint-rules/no-import-rename.js
+++ b/build-system/eslint-rules/no-import-rename.js
@@ -3,26 +3,25 @@
 const path = require('path');
 
 // Forbids using these imports unless is is explicitly imported as the same
-// name. This aids in writing lint rules for these imports.
+// name. This aids in writing lint rules and transforms for these imports.
 //
 // GOOD
-// import { dict } from 'src/core/types/object';
-// dict();
+// import { setStyle } from '#core/dom/style';
+// setStyle();
 //
 // BAD
-// import * as obj from 'src/core/types/object';
-// obj.dict()
+// import * as obj from '#core/dom/style';
+// obj.setStyle()
 //
 // Bad
-// import { dict as otherName } from 'src/core/types/object';
+// import { setStyle as otherName } from '#core/dom/style';
 // otherName()
 
 const imports = {
-  'src/core/types/object': ['dict'],
-  'src/core/dom/css': ['escapeCssSelectorIdent', 'escapeCssSelectorNth'],
-  'src/core/dom/query': ['scopedQuerySelector', 'scopedQuerySelectorAll'],
-  'src/core/dom/static-template': ['htmlFor'],
-  'src/core/dom/style': [
+  '#core/dom/css-selectors': ['escapeCssSelectorIdent', 'escapeCssSelectorNth'],
+  '#core/dom/query': ['scopedQuerySelector', 'scopedQuerySelectorAll'],
+  '#core/dom/static-template': ['htmlFor'],
+  '#core/dom/style': [
     'assertDoesNotContainDisplay',
     'assertNotDisplay',
     'resetStyles',
@@ -30,8 +29,11 @@ const imports = {
     'setStyle',
     'setStyles',
   ],
-  'src/experiments': ['isExperimentOn'],
-  'src/log': ['user', 'dev'],
+  '#core/types/enum': ['mangleObjectValues'],
+  '#core/types/pure': ['pure'],
+  '#experiments': ['isExperimentOn'],
+  '#utils/log': ['user', 'dev'],
+  '#preact/utils': ['propName', 'tabindexFromProps'],
   'src/mode': ['getMode'],
 };
 
@@ -76,7 +78,9 @@ module.exports = function (context) {
 
     for (let i = 0; i < references.length; i++) {
       const ref = references[i];
-      const node = context.getNodeByRangeIndex(ref.identifier.start);
+      const [start] = ref.identifier.range;
+      const node = context.getNodeByRangeIndex(start);
+
       const {parent} = node;
 
       if (parent.type !== 'MemberExpression') {
diff --git a/build-system/eslint-rules/no-import.js b/build-system/eslint-rules/no-import.js
index b1b635ada028..21ad7090c4f9 100644
--- a/build-system/eslint-rules/no-import.js
+++ b/build-system/eslint-rules/no-import.js
@@ -5,12 +5,12 @@ const imports = [
   {
     import: 'preact',
     message:
-      "Please import preact from 'src/preact'. This gives us type safety.",
+      "Please import preact from '#preact'. This allows us to support React too.",
   },
   {
     import: 'preact/hooks',
     message:
-      "Please import preact/hooks from 'src/preact'. This gives us type safety.",
+      "Please import preact/hooks from '#preact'. This allows us to support React too.",
   },
 ];
 
@@ -23,6 +23,11 @@ module.exports = function (context) {
         return;
       }
 
+      // "import type" is always fine.
+      if (node.importKind === 'type') {
+        return;
+      }
+
       const name = node.source.value;
 
       for (const forbidden of imports) {
diff --git a/build-system/eslint-rules/no-invalid-this.js b/build-system/eslint-rules/no-invalid-this.js
index 1d21c41f346b..694ec261448c 100644
--- a/build-system/eslint-rules/no-invalid-this.js
+++ b/build-system/eslint-rules/no-invalid-this.js
@@ -2,7 +2,7 @@
 
 // Disables use of the `this` value when we suspect that it is using the
 // implicit global `this`. `this` is only valid inside class
-// methods/constructors, and nested arrow functions.
+// methods/constructors, property definitions, and nested arrow functions.
 //
 // We special case calls to `fn.bind`, `fn.call`, and `fn.apply`, since they
 // are usually forwarding the `this` context and not direclty using it. The
@@ -59,7 +59,11 @@ module.exports = {
 
         for (let i = 0; i < ancestors.length; i++) {
           const ancestor = ancestors[i];
+
           switch (ancestor.type) {
+            case 'PropertyDefinition':
+              return;
+
             case 'FunctionExpression':
               const parent = ancestors[i + 1];
               // Allow functions that are used as methods.
diff --git a/build-system/eslint-rules/no-private-props.js b/build-system/eslint-rules/no-private-props.js
index f6d312e1b7ec..5b4d02ef5304 100644
--- a/build-system/eslint-rules/no-private-props.js
+++ b/build-system/eslint-rules/no-private-props.js
@@ -23,9 +23,10 @@ module.exports = {
           message:
             'Unquoted private properties are not allowed in BaseElement. Please use quotes',
           fix(fixer) {
-            const {object} = node;
+            const [, objectEnd] = node.object.range;
+            const [, nodeEnd] = node.range;
             return fixer.replaceTextRange(
-              [object.end, node.end],
+              [objectEnd, nodeEnd],
               `['${node.property.name}']`
             );
           },
diff --git a/build-system/eslint-rules/no-static-this.js b/build-system/eslint-rules/no-static-this.js
deleted file mode 100644
index 570c5a3e4e64..000000000000
--- a/build-system/eslint-rules/no-static-this.js
+++ /dev/null
@@ -1,80 +0,0 @@
-'use strict';
-
-// Forbids use of `this` inside static class methods
-//
-// Good:
-// ```
-// class Foo {
-//   static s() {
-//     Foo.prop;
-//   }
-//
-//   i() {
-//     this.prop;
-//     Foo.prop;
-//   }
-// }
-//
-// Foo.prop = 1;
-// ```
-//
-// Bad:
-// ```
-// class Foo {
-//   static s() {
-//     this.prop;
-//   }
-// }
-//
-// Foo.prop = 1;
-// ```
-module.exports = {
-  meta: {
-    type: 'problem',
-    docs: {
-      description:
-        "Disallow using `this` within static functions, since Closure Compiler's Advanced Compilation breaks it",
-      context: 'https://github.com/google/closure-compiler/issues/2397',
-    },
-  },
-  create(context) {
-    return {
-      'MethodDefinition[static=true] ThisExpression': function (node) {
-        const ancestry = context.getAncestors().slice().reverse();
-        let i = 0;
-        for (; i < ancestry.length; i++) {
-          const ancestor = ancestry[i];
-          const {type} = ancestor;
-
-          // Arrow functions inherit `this` from their lexical scope, so we need
-          // to continue searching if it's an arrow.
-          if (
-            !type.includes('Function') ||
-            type === 'ArrowFunctionExpression'
-          ) {
-            continue;
-          }
-
-          // If the direct parent of this function is a static method definition,
-          // then we've found our root method. If it's non-static, then it's a
-          // nested class expression's instance method, which is safe.
-          if (i < ancestry.length - 2) {
-            const parent = ancestry[i + 1];
-            if (parent.type === 'MethodDefinition' && parent.static) {
-              break;
-            }
-          }
-
-          // Found a function with it's own `this`, so it's safe.
-          return;
-        }
-
-        context.report({
-          node,
-          message:
-            '`this` in static methods is broken by Advanced Closure Compiler optimizations. Please use the class name directly.',
-        });
-      },
-    };
-  },
-};
diff --git a/build-system/eslint-rules/preact-preferred-props.js b/build-system/eslint-rules/preact-preferred-props.js
index f00b870fa027..ab66f109332a 100644
--- a/build-system/eslint-rules/preact-preferred-props.js
+++ b/build-system/eslint-rules/preact-preferred-props.js
@@ -7,7 +7,7 @@
 // function foo({'class': className}) {}
 // const {'class': className} = props;
 //
-// <div tabIndex="0" />
+// <div tabindex="0" />
 // <path stroke-linecap />
 //
 // Bad
@@ -16,99 +16,27 @@
 // const {'className': className'} = props;
 // const {className} = props;
 //
-// <div tabindex="0" />
+// <div tabIndex="0" />
 // <path strokeLinecap />
 
-const DOM_ATTRIBUTES = {
-  className: 'class',
-  tabindex: 'tabIndex',
-};
+const {ATTRIBUTES_REACT_TO_PREACT} = require('../common/preact-prop-names');
 
-/**
- * This list derives all hyphenated attributes from
- * https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute
- */
-const SVG_ATTRIBUTES = {
-  accentHeight: 'accent-height',
-  alignmentBaseline: 'alignment-baseline',
-  arabicForm: 'arabic-form',
-  baselineShift: 'baseline-shift',
-  capHeight: 'cap-height',
-  clipPath: 'clip-path',
-  clipRule: 'clip-rule',
-  colorInterpolation: 'color-interpolation',
-  colorInterpolationFilters: 'color-interpolation-filters',
-  colorProfile: 'color-profile',
-  colorRendering: 'color-rendering',
-  dominantBaseline: 'dominant-baseline',
-  enableBackground: 'enable-background',
-  fillOpacity: 'fill-opacity',
-  fillRule: 'fill-rule',
-  floodColor: 'flood-color',
-  floodOpacity: 'flood-opacity',
-  fontFamily: 'font-family',
-  fontSize: 'font-size',
-  fontSizeAdjust: 'font-size-adjust',
-  fontStretch: 'font-stretch',
-  fontStyle: 'font-style',
-  fontVariant: 'font-variant',
-  fontWeight: 'font-weight',
-  glyphName: 'glyph-name',
-  glyphOrientationHorizontal: 'glyph-orientation-horizontal',
-  glyphOrientationVertical: 'glyph-orientation-vertical',
-  horizAdvX: 'horiz-adv-x',
-  horizOriginX: 'horiz-origin-x',
-  imageRendering: 'image-rendering',
-  letterSpacing: 'letter-spacing',
-  lightingColor: 'lighting-color',
-  markerEnd: 'marker-end',
-  markerMid: 'marker-mid',
-  markerStart: 'marker-start',
-  overlinePosition: 'overline-position',
-  overlineThickness: 'overline-thickness',
-  paintOrder: 'paint-order',
-  panose1: 'panose-1',
-  pointerEvents: 'pointer-events',
-  renderingIntent: 'rendering-intent',
-  shapeRendering: 'shape-rendering',
-  stopColor: 'stop-color',
-  stopOpacity: 'stop-opacity',
-  strikethroughPosition: 'strikethrough-position',
-  strikethroughThickness: 'strikethrough-thickness',
-  strokeDasharray: 'stroke-dasharray',
-  strokeDashoffset: 'stroke-dashoffset',
-  strokeLinecap: 'stroke-linecap',
-  strokeLinejoin: 'stroke-linejoin',
-  strokeMiterlimit: 'stroke-miterlimit',
-  strokeOpacity: 'stroke-opacity',
-  strokeWidth: 'stroke-width',
-  textAnchor: 'text-anchor',
-  textDecoration: 'text-decoration',
-  textRendering: 'text-rendering',
-  transformOrigin: 'transform-origin',
-  underlinePosition: 'underline-position',
-  underlineThickness: 'underline-thickness',
-  unicodeBidi: 'unicode-bidi',
-  unicodeRange: 'unicode-range',
-  unitsPerEm: 'units-per-em',
-  vAlphabetic: 'v-alphabetic',
-  vHanging: 'v-hanging',
-  vIdeographic: 'v-ideographic',
-  vMathematical: 'v-mathematical',
-  vectorEffect: 'vector-effect',
-  vertAdvY: 'vert-adv-y',
-  vertOriginX: 'vert-origin-x',
-  vertOriginY: 'vert-origin-y',
-  wordSpacing: 'word-spacing',
-  writingMode: 'writing-mode',
-  xHeight: 'x-height',
-};
+const propNameFn = 'propName';
+const propNameFnModule = '#preact/utils';
 
 module.exports = {
   meta: {
     fixable: 'code',
   },
   create(context) {
+    const preactNames = new Set(Object.values(ATTRIBUTES_REACT_TO_PREACT));
+
+    let lastImportDecl = null;
+    let addedImportDecl = false;
+    let program = null;
+
+    const importDecl = `import {${propNameFn}} from '${propNameFnModule}';\n`;
+
     /** @param {*} node */
     function checkProps(node) {
       if (!node.properties) {
@@ -118,42 +46,159 @@ module.exports = {
         if (!prop.key) {
           return;
         }
-        const property = prop.value.name || prop.value.left.name;
-        const preferred = DOM_ATTRIBUTES[property] || SVG_ATTRIBUTES[property];
-        if (!preferred || prop.key.value === preferred) {
+        if (prop.computed) {
           return;
         }
+        const property = prop.key.name || prop.key.value;
 
-        context.report({
-          node,
-          message: `Prefer \`${preferred}\` property access to \`${property}\`.`,
+        if (property?.toLowerCase?.() === 'tabindex') {
+          context.report({
+            node: prop,
+            message:
+              '`tabindex` and `tabIndex` should be supported equally.' +
+              ' Instead of destructuring, use:' +
+              `\n\timport {tabindexFromProps} from '#preact/utils';` +
+              `\n\t<... tabindex={tabindexFromProps(rest)}>`,
+          });
+          return;
+        }
 
-          fix(fixer) {
-            if (!prop.key.value) {
-              return fixer.insertTextBefore(prop, `'${preferred}': `);
-            }
-            if (prop.key.value !== preferred) {
-              return fixer.replaceText(prop.key, `'${preferred}'`);
-            }
-          },
-        });
+        let preferred = ATTRIBUTES_REACT_TO_PREACT[property];
+        let message = `Prefer \`${preferred}\` property access to \`${property}\`.`;
+
+        if (preactNames.has(property)) {
+          preferred = property;
+          message = `Preact-style prop names \`${preferred}\` should be wrapped with \`${propNameFn}()\``;
+        }
+
+        if (preferred) {
+          context.report({
+            node: prop,
+            message,
+            fix(fixer) {
+              const fixes = [];
+              if (!addedImportDecl) {
+                addedImportDecl = true;
+                fixes.push(
+                  lastImportDecl
+                    ? fixer.insertTextAfter(lastImportDecl, importDecl)
+                    : fixer.insertTextBefore(program.body[0], importDecl)
+                );
+              }
+              const computed = `[${propNameFn}('${preferred}')]`;
+              fixes.push(
+                !prop.key.value
+                  ? fixer.insertTextBefore(prop, `${computed}: `)
+                  : fixer.replaceText(prop.key, computed)
+              );
+              return fixes;
+            },
+          });
+        }
       });
     }
+
     return {
+      Program(node) {
+        program = node;
+        lastImportDecl = null;
+        addedImportDecl = false;
+      },
+
+      ImportDeclaration(node) {
+        lastImportDecl = node;
+      },
+
+      ImportSpecifier(node) {
+        if (node.local.name === propNameFn) {
+          addedImportDecl = true;
+        }
+      },
+
+      MemberExpression(node) {
+        const property = node.property.name || node.property.value;
+
+        if (property?.toLowerCase?.() === 'tabindex') {
+          context.report({
+            node: node.property,
+            message:
+              '`tabindex` and `tabIndex` should be supported equally.' +
+              ' Instead of property access, use:' +
+              `\n\timport {tabindexFromProps} from '#preact/utils';` +
+              `\n\t<... tabindex={tabindexFromProps(rest)}>`,
+          });
+        }
+      },
+
+      [`CallExpression[callee.name="${propNameFn}"]`]: function (node) {
+        if (
+          node.arguments.length !== 1 ||
+          node.arguments[0].type !== 'Literal' ||
+          typeof node.arguments[0].value !== 'string'
+        ) {
+          context.report({
+            node,
+            message: `${node.callee.name} can only have a single string attribute.`,
+          });
+          return;
+        }
+        const name = node.arguments[0].value;
+        if (name.toLowerCase() === 'tabindex') {
+          context.report({
+            node,
+            message:
+              '`tabindex` and `tabIndex` should be supported equally.' +
+              ` Instead of ${propNameFn}('tabindex'), use:` +
+              `\n\timport {tabindexFromProps} from '#preact/utils';` +
+              `\n\t<... tabindex={tabindexFromProps(rest)}>`,
+          });
+          return;
+        }
+        if (ATTRIBUTES_REACT_TO_PREACT[name]) {
+          context.report({
+            node,
+            message: `${node.callee.name} requires Preact-style name \`${ATTRIBUTES_REACT_TO_PREACT[name]}\`.`,
+            fix(fixer) {
+              return fixer.replaceText(
+                node.arguments[0],
+                `'${ATTRIBUTES_REACT_TO_PREACT[name]}'`
+              );
+            },
+          });
+        }
+        if (!preactNames.has(name)) {
+          context.report({
+            node,
+            message: `${node.callee.name} is not required.`,
+            fix(fixer) {
+              const replacement = `'${name}'`;
+              if (node.parent.type === 'Property') {
+                // Remove brackets around ['computed'] prop keys
+                const [start, end] = node.parent.key.range;
+                return fixer.replaceTextRange(
+                  [start - 1, end + 1],
+                  replacement
+                );
+              }
+              return fixer.replaceText(node, replacement);
+            },
+          });
+        }
+      },
+
       FunctionDeclaration(node) {
         node.params.forEach(checkProps);
       },
 
       VariableDeclarator(node) {
-        if (!node.init || node.init?.name !== 'props' || !node.id) {
+        if (!node.init || node.init.name !== 'props' || !node.id) {
           return;
         }
         checkProps(node.id);
       },
 
       JSXAttribute(node) {
-        const alternative =
-          DOM_ATTRIBUTES[node.name.name] || SVG_ATTRIBUTES[node.name.name];
+        const alternative = ATTRIBUTES_REACT_TO_PREACT[node.name.name];
         if (!alternative) {
           return;
         }
diff --git a/build-system/eslint-rules/preact.js b/build-system/eslint-rules/preact.js
index 92d4c5ee3759..18a0ff2106f7 100644
--- a/build-system/eslint-rules/preact.js
+++ b/build-system/eslint-rules/preact.js
@@ -1,7 +1,5 @@
 'use strict';
 
-const astUtils = require('eslint/lib/rules/utils/ast-utils');
-
 // Enforces importing a Preact namespace specifier if using JSX
 //
 // Good
@@ -61,19 +59,16 @@ module.exports = {
 
     let imported = false;
     let warned = false;
-    let staticTemplate = false;
 
     return {
       Program() {
         imported = false;
         warned = false;
-        staticTemplate = false;
       },
 
       ImportNamespaceSpecifier(node) {
         if (node.local.name === 'Preact') {
           imported = true;
-          staticTemplate = node.parent.source.value !== '#preact';
         }
       },
 
@@ -84,67 +79,6 @@ module.exports = {
       JSXFragment(node) {
         requirePreact(node);
       },
-
-      JSXSpreadAttribute(node) {
-        if (!staticTemplate) {
-          return;
-        }
-
-        context.report({
-          node,
-          message: [
-            'Static JSX Templates are required to use static attribute definitions',
-            'This prevents an issue with spread attributes accidentally overriding a "safe" attribute with user-provided data.',
-          ].join('\n\t'),
-        });
-      },
-
-      JSXOpeningElement(node) {
-        if (!staticTemplate) {
-          return;
-        }
-
-        const {name} = node;
-        if (name.type === 'JSXMemberExpression') {
-          return context.report({
-            node,
-            message: [
-              'Static JSX Templates are required to use regular DOM nodes or Imported Components',
-              'This prevents an issue with `<json.type />` accidentally creating a <script> node.',
-            ].join('\n\t'),
-          });
-        }
-
-        if (name.name && /^[a-z]/.test(name.name)) {
-          return;
-        }
-
-        const variable = astUtils.getVariableByName(
-          context.getScope(),
-          name.name
-        );
-
-        if (!variable || variable.defs.length === 0) {
-          return context.report({
-            node,
-            message: `Could not find ${name.name} in the lexcial scope`,
-          });
-        }
-
-        for (const def of variable.defs) {
-          if (def.type === 'ImportBinding' || def.type === 'FunctionName') {
-            continue;
-          }
-
-          context.report({
-            node,
-            message: [
-              'Static JSX Templates are required to use regular DOM nodes or Imported Components',
-              'This prevents an issue with `<UserProvidedType />` accidentally creating a <script> node.',
-            ].join('\n\t'),
-          });
-        }
-      },
     };
   },
 };
diff --git a/build-system/eslint-rules/restrict-this-access.js b/build-system/eslint-rules/restrict-this-access.js
index d9a7862c7032..aefa4f3c2249 100644
--- a/build-system/eslint-rules/restrict-this-access.js
+++ b/build-system/eslint-rules/restrict-this-access.js
@@ -98,8 +98,8 @@ module.exports = function (context) {
         property.type === 'Identifier'
           ? property.name
           : property.type === 'Literal'
-          ? property.value
-          : null;
+            ? property.value
+            : null;
 
       if (!name) {
         context.report({
diff --git a/build-system/eslint-rules/service-getters.js b/build-system/eslint-rules/service-getters.js
new file mode 100644
index 000000000000..f851ef327732
--- /dev/null
+++ b/build-system/eslint-rules/service-getters.js
@@ -0,0 +1,17 @@
+module.exports = function (context) {
+  return {
+    'VariableDeclarator[id.name="Services"][init.type="ObjectExpression"]':
+      function (node) {
+        for (const property of node.init.properties) {
+          if (property.value.type !== 'ArrowFunctionExpression') {
+            context.report({
+              node: property,
+              message:
+                'Service getter properties must be arrow function expressions.' +
+                '\nThis allows unused getters to be stripped out from the bundle.',
+            });
+          }
+        }
+      },
+  };
+};
diff --git a/build-system/externs/amp.extern.js b/build-system/externs/amp.extern.js
index d93bcf2829b4..7fced99bd850 100644
--- a/build-system/externs/amp.extern.js
+++ b/build-system/externs/amp.extern.js
@@ -241,6 +241,8 @@ window.AMP_DEV_MODE;
 
 window.AMP;
 window.AMP._ = {};
+window.AMP.addGlobalConsentListener;
+window.AMP.addGranularConsentListener;
 window.AMP.push;
 window.AMP.title;
 window.AMP.canonicalUrl;
@@ -261,7 +263,6 @@ window.AMP.viewport;
 window.AMP.viewport.getScrollLeft;
 window.AMP.viewport.getScrollWidth;
 window.AMP.viewport.getWidth;
-
 /**
  * This symbol is exposed by bundles transformed by `scoped-require.js` to avoid
  * polluting the global namespace with `require`.
@@ -884,7 +885,7 @@ let BindExpressionResultDef;
 
 /**
  * Structured cloneable return value for 'bind.evaluateBindings' API.
- * @typedef {{results: !Object<string, BindExpressionResultDef>, errors: !Object<string, !BindEvaluatorErrorDef>}}
+ * @typedef {{results: !{[key: string]: BindExpressionResultDef}, errors: !{[key: string]: !BindEvaluatorErrorDef}}}
  */
 let BindEvaluateBindingsResultDef;
 
@@ -968,7 +969,7 @@ let WebCompAnimationDef;
 let WebKeyframeAnimationDef;
 
 /**
- * @typedef {!Object<string, *>|!Array<!Object<string, *>>}
+ * @typedef {!{[key: string]: *}|!Array<!{[key: string]: *}>}
  */
 let WebKeyframesDef;
 
@@ -994,7 +995,7 @@ let WebAnimationTimingDef;
  * specified as properties with the name in the format of `--varName`.
  *
  * @mixin
- * @typedef {Object}
+ * @typedef {object}
  */
 let WebAnimationVarsDef;
 
diff --git a/build-system/externs/preact.extern.js b/build-system/externs/preact.extern.js
deleted file mode 100644
index 35d1bf8cf85f..000000000000
--- a/build-system/externs/preact.extern.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/** @externs */
-
-/** @const */
-var PreactDef = {};
-
-/**
- * @typedef {function(?):PreactDef.Renderable}
- */
-PreactDef.FunctionalComponent;
-
-/**
- * @interface
- */
-PreactDef.VNode = function () {};
-
-/**
- * @interface
- * @template T
- */
-PreactDef.Context = function () {};
-
-/**
- * @param {{value: T, children: (?PreactDef.Renderable|undefined)}} props
- * @return {PreactDef.Renderable}
- */
-PreactDef.Context.prototype.Provider = function (props) {};
-
-/**
- * @interface
- */
-PreactDef.Context.prototype.Consumer = function () {};
-
-/**
- * @typedef {string|number|boolean|null|undefined}
- */
-PreactDef.SimpleRenderable;
-
-/**
- * @typedef {PreactDef.SimpleRenderable|!PreactDef.VNode|!Array<PreactDef.SimpleRenderable|!PreactDef.VNode|!Array<PreactDef.SimpleRenderable|!PreactDef.VNode>>}
- */
-PreactDef.Renderable;
-
-/**
- * @typedef {{__html: ?string}}
- */
-PreactDef.InnerHTML;
diff --git a/build-system/global-configs/OWNERS b/build-system/global-configs/OWNERS
index 42a909d3b0e9..6b03caed4d23 100644
--- a/build-system/global-configs/OWNERS
+++ b/build-system/global-configs/OWNERS
@@ -11,10 +11,6 @@
         },
       ],
     },
-    {
-      pattern: 'client-side-experiments-config.json',
-      owners: [{name: 'danielrozenberg'}, {name: 'jridgewell'}],
-    },
     {
       pattern: '*-config.json',
       owners: [{name: 'alanorozco', requestReviews: false}],
diff --git a/build-system/global-configs/README.md b/build-system/global-configs/README.md
index b2d396eff4b8..1c5bb5110667 100644
--- a/build-system/global-configs/README.md
+++ b/build-system/global-configs/README.md
@@ -83,38 +83,6 @@ amp release --flavor="custom-prod"
 -   Flag `--version_override` is not supported.
 -   `AMP_CONFIG` can be customized with [`custom-config.json`](#custom-configjson) to further tailor the build.
 
-# client-side-experiments-config.json
+# Looking for client-side-experiments-config.json?
 
-This config is used to run client side diverted experiments, adding runtime support for deploying AMP experiment configuration updates faster via the CDN and cache pages. It is complimentary to `{canary,prod,custom}-config.json` and takes precedence over them. (See I2I issue: [#34013](https://github.com/ampproject/amphtml/issues/34013))
-
-The JSON object must contain exactly one field `experiments` which is an array of experiment definition objects with the following fields:
-
--   `name`: experiment name
--   `percentage`: percentage of AMP page views that will activate this experiment (between 0 and 1)
--   `rtvPrefix`: (optional) array of RTV prefixes that will cause this experiment to be active, with period (`.`) acting as a wildcard. e.g., `["00", "0.2106"]` will cause this experiment to activate on the Experimental channel, and on every channel for the month of June, 2021 (see [Versioning section in amp-framework-hosting.md](../../docs/spec/amp-framework-hosting.md#versioning) for an explanation of AMP versions and RTV numbers).
-
-Example:
-
-```json
-{
-  "experiments": [
-    {
-      "name": "chunked-amp",
-      "percentage": 0.5,
-    },
-    {
-      "name": "version-locking",
-      "percentage": 1,
-      "rtvPrefix": ["01", "02", "03", "04", "05"]
-    }
-  ]
-}
-```
-
-Once merged onto the `main` branch, this file is automatically picked up by the AMP CDN (usually within 1-2 hours from PR merge) and its content is injected into `v0.[m]js`. AMP caches can also inject the contents of this file verbatim into pages inside a `<script language=text/json id=__AMP_EXP>{...}</script>` element.
-
-# versioning.json
-
-Defines the routing between channels and RTVs (see [Versioning section in amp-framework-hosting.md](../../docs/spec/amp-framework-hosting.md#versioning) for an explanation of AMP versions and RTV numbers).
-
-Currently in testing in preparation for [#36152](https://github.com/ampproject/amphtml/issues/36152).
+This file now resides in the [ampproject/cdn-configuration](https://github.com/ampproject/cdn-configuration/blob/main/configs/client-side-experiments.json) repository.
diff --git a/build-system/global-configs/canary-config.json b/build-system/global-configs/canary-config.json
index 6b15fb82c7b5..17d2cb877b9e 100644
--- a/build-system/global-configs/canary-config.json
+++ b/build-system/global-configs/canary-config.json
@@ -11,14 +11,12 @@
   "flexAdSlots": 0.05,
   "ios-fixed-no-transfer": 1,
   "ads-initialIntersection": 1,
-  "amp-cid-backup": 1,
   "flexible-bitrate": 0.1,
-  "disable-a4a-non-sd": 1,
-  "story-ad-auto-advance": 1,
   "story-ad-placements": 1,
-  "story-load-first-page-only": 1,
   "story-load-inactive-outside-viewport": 1,
-  "story-disable-animations-first-page": 0,
-  "amp-story-page-attachment-ui-v2": 1,
-  "amp-sticky-ad-to-amp-ad-v4": 0
-}
+  "story-disable-animations-first-page": 1,
+  "amp-sticky-ad-to-amp-ad-v4": 0,
+  "story-video-cache-apply-audio": 0,
+  "amp-story-subscriptions": 1,
+  "interaction-to-next-paint": 1
+}
\ No newline at end of file
diff --git a/build-system/global-configs/client-side-experiments-config.json b/build-system/global-configs/client-side-experiments-config.json
deleted file mode 100644
index 34e8174bed9e..000000000000
--- a/build-system/global-configs/client-side-experiments-config.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "experiments": [
-    {
-      "name": "flexible-bitrate",
-      "percentage": 0.1
-    },
-    {
-      "name": "amp-story-desktop-one-panel",
-      "percentage": 1
-    },
-    {
-      "name": "amp-story-first-page-max-bitrate",
-      "percentage": 0.3
-    },
-    {
-      "name": "story-disable-animations-first-page",
-      "percentage": 0
-    },
-    {
-      "name": "story-load-first-page-only",
-      "percentage": 1
-    },
-    {
-      "name": "story-load-inactive-outside-viewport",
-      "percentage": 1
-    },
-    {
-      "name": "story-ad-page-outlink",
-      "percentage": 0.02
-    },
-    {
-      "name": "amp-sticky-ad-to-amp-ad-v4",
-      "percentage": 0.05
-    }
-  ]
-}
diff --git a/build-system/global-configs/experiments-config.json b/build-system/global-configs/experiments-config.json
index d89000db8921..f061431de029 100644
--- a/build-system/global-configs/experiments-config.json
+++ b/build-system/global-configs/experiments-config.json
@@ -1,17 +1,5 @@
 {
   "experimentA": {},
-  "experimentB": {
-    "name": "amp-img in the deferred mount mode",
-    "environment": "AMP",
-    "issue": "https://github.com/ampproject/amphtml/issues/31915",
-    "expiration_date_utc": "2021-06-30",
-    "define_experiment_constant": "R1_IMG_DEFERRED_BUILD"
-  },
-  "experimentC": {
-    "name": "EsbuildCompilation",
-    "environment": "AMP",
-    "issue": "https://github.com/ampproject/amphtml/issues/35264",
-    "expiration_date_utc": "2021-10-30",
-    "define_experiment_constant": "ESBUILD_COMPILATION"
-  }
+  "experimentB": {},
+  "experimentC": {}
 }
diff --git a/build-system/global-configs/experiments-const.json b/build-system/global-configs/experiments-const.json
index 2fba023b6f0b..332a29fe9a9f 100644
--- a/build-system/global-configs/experiments-const.json
+++ b/build-system/global-configs/experiments-const.json
@@ -2,6 +2,5 @@
   "INI_LOAD_INOB": true,
   "NO_SIGNING_RTV": true,
   "R1_IMG_DEFERRED_BUILD": false,
-  "WITHIN_VIEWPORT_INOB": false,
-  "ESBUILD_COMPILATION": false
+  "WITHIN_VIEWPORT_INOB": false
 }
diff --git a/build-system/global-configs/prod-config.json b/build-system/global-configs/prod-config.json
index 7d7bfca24a64..4130d9ce1fb3 100644
--- a/build-system/global-configs/prod-config.json
+++ b/build-system/global-configs/prod-config.json
@@ -10,12 +10,11 @@
   "flexAdSlots": 0.05,
   "flexible-bitrate": 0.1,
   "ios-fixed-no-transfer": 0,
-  "disable-a4a-non-sd": 1,
-  "amp-cid-backup": 1,
   "story-ad-placements": 0.01,
-  "story-disable-animations-first-page": 0,
-  "story-load-first-page-only": 1,
+  "story-disable-animations-first-page": 1,
   "story-load-inactive-outside-viewport": 1,
-  "amp-story-page-attachment-ui-v2": 1,
-  "amp-sticky-ad-to-amp-ad-v4": 0
-}
+  "amp-sticky-ad-to-amp-ad-v4": 0,
+  "story-video-cache-apply-audio": 0,
+  "amp-story-subscriptions": 1,
+  "interaction-to-next-paint": 1
+}
\ No newline at end of file
diff --git a/build-system/global-configs/versioning.json b/build-system/global-configs/versioning.json
deleted file mode 100644
index defed6a696af..000000000000
--- a/build-system/global-configs/versioning.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "beta-opt-in": "030000000000000",
-  "beta-traffic": "030000000000000",
-  "control": "020000000000000",
-  "experimental-opt-in": "000000000000000",
-  "experimental-traffic": "000000000000000",
-  "experimentA": null,
-  "experimentB": null,
-  "experimentC": null,
-  "lts": "010000000000000",
-  "nightly": "040000000000000",
-  "nightly-control": "050000000000000",
-  "stable": "010000000000000"
-}
diff --git a/build-system/global.d.ts b/build-system/global.d.ts
index 7a430e9e86d3..4f5a9ec5c5b3 100644
--- a/build-system/global.d.ts
+++ b/build-system/global.d.ts
@@ -56,4 +56,4 @@ declare global {
   }
 }
 
-export { }
+export {};
diff --git a/build-system/json-locales/index.js b/build-system/json-locales/index.js
new file mode 100644
index 000000000000..ba281aec26c0
--- /dev/null
+++ b/build-system/json-locales/index.js
@@ -0,0 +1,27 @@
+const {readFileSync} = require('fs');
+/**
+ * JSON reviver that converts {"string": "foo", ...} to just "foo".
+ * This minifies the format of locale files.
+ * @param {string} _
+ * @param {*} value
+ * @return {*}
+ */
+function minifyLocalesJsonReviver(_, value) {
+  // Always default to original `value` since this reviver is called for any
+  // property pair, including the higher-level containing object.
+  return value?.string || value;
+}
+
+/**
+ * @param {string} filename
+ * @return {*}
+ */
+function readJson(filename) {
+  // Treat files under /_locales/ specially in order to minify their format.
+  const reviver = filename.includes('/_locales/')
+    ? minifyLocalesJsonReviver
+    : undefined;
+  return JSON.parse(readFileSync(filename, 'utf8'), reviver);
+}
+
+module.exports = {readJson, minifyLocalesJsonReviver};
diff --git a/build-system/json-schemas/client-side-experiments-config.json b/build-system/json-schemas/client-side-experiments-config.json
deleted file mode 100644
index 6be488e656f8..000000000000
--- a/build-system/json-schemas/client-side-experiments-config.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "description": "Client-side (AMP_EXP) experiment definitions",
-  "type": "object",
-  "required": [
-    "experiments"
-  ],
-  "properties": {
-    "experiments": {
-      "type": "array",
-      "items": {
-        "type": "object",
-        "required": [
-          "name",
-          "percentage"
-        ],
-        "properties": {
-          "name": {
-            "type": "string",
-            "pattern": "^[A-Za-z][\\w-]*$"
-          },
-          "percentage": {
-            "type": "number",
-            "minimum": 0,
-            "maximum": 1
-          },
-          "rtvPrefixes": {
-            "type": "array",
-            "items": {
-              "type": "string",
-              "pattern": "^[\\d\\.]+$"
-            }
-          }
-        }
-      }
-    }
-  },
-  "additionalProperties": false
-}
diff --git a/build-system/json-schemas/versioning.json b/build-system/json-schemas/versioning.json
deleted file mode 100644
index bfd601dc264b..000000000000
--- a/build-system/json-schemas/versioning.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "description": "Versioning (RTV) information",
-  "type": "object",
-  "required": [
-    "beta-opt-in",
-    "beta-traffic",
-    "control",
-    "experimental-opt-in",
-    "experimental-traffic",
-    "experimentA",
-    "experimentB",
-    "experimentC",
-    "lts",
-    "nightly",
-    "nightly-control",
-    "stable"
-  ],
-  "properties": {
-    "control": {
-      "type": "string",
-      "pattern": "02\\d{13}"
-    },
-    "experimentA": {
-      "type": [
-        "string",
-        "null"
-      ],
-      "pattern": "10\\d{13}"
-    },
-    "experimentB": {
-      "type": [
-        "string",
-        "null"
-      ],
-      "pattern": "11\\d{13}"
-    },
-    "experimentC": {
-      "type": [
-        "string",
-        "null"
-      ],
-      "pattern": "12\\d{13}"
-    },
-    "nightly": {
-      "type": "string",
-      "pattern": "04\\d{13}"
-    },
-    "nightly-control": {
-      "type": "string",
-      "pattern": "05\\d{13}"
-    }
-  },
-  "patternProperties": {
-    "beta-(opt-in|traffic)": {
-      "type": "string",
-      "pattern": "03\\d{13}"
-    },
-    "experimental-(opt-in|traffic)": {
-      "type": "string",
-      "pattern": "00\\d{13}"
-    },
-    "(stable|lts)": {
-      "type": "string",
-      "pattern": "01\\d{13}"
-    }
-  },
-  "additionalProperties": false
-}
diff --git a/build-system/npm-publish/build-npm-binaries.js b/build-system/npm-publish/build-npm-binaries.js
deleted file mode 100644
index 66fc56dec898..000000000000
--- a/build-system/npm-publish/build-npm-binaries.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * @fileoverview
- * Builds npm binaries for specified Bento components.
- */
-
-const [extension] = process.argv.slice(2);
-const {timedExecOrDie} = require('../pr-check/utils');
-const {updatePackages} = require('../common/update-packages');
-
-updatePackages();
-timedExecOrDie(`amp build --extensions=${extension} --core_runtime_only`);
-timedExecOrDie(`amp build --extensions=${extension} --core_runtime_only --esm`);
-timedExecOrDie(`amp dist --extensions=${extension} --core_runtime_only`);
-timedExecOrDie(`amp dist --extensions=${extension} --core_runtime_only --esm`);
diff --git a/build-system/npm-publish/get-extensions.js b/build-system/npm-publish/get-extensions.js
deleted file mode 100644
index 0ed317bc7ab4..000000000000
--- a/build-system/npm-publish/get-extensions.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * @fileoverview
- * Logs Bento components to publish.
- */
-
-const {getExtensions} = require('./utils');
-console /*OK*/
-  .log(JSON.stringify(getExtensions()));
diff --git a/build-system/npm-publish/utils.js b/build-system/npm-publish/utils.js
deleted file mode 100644
index 7b622c9318d9..000000000000
--- a/build-system/npm-publish/utils.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Get extensions to be published on npm
- * @return {Array<any>}
- */
-function getExtensions() {
-  const bundles = require('../compile/bundles.config.extensions.json');
-  const extensions = bundles
-    .filter((bundle) => bundle.options?.npm)
-    .map((bundle) => ({
-      'extension': bundle.name,
-      'version': bundle.version,
-    }));
-  return extensions;
-}
-
-/**
- * Get semver from extension version and amp version
- * See build-system/compile/internal-version.js for versioning description
- * @param {string} extensionVersion
- * @param {string} ampVersion
- * @return {string}
- */
-function getSemver(extensionVersion, ampVersion) {
-  const major = extensionVersion.split('.', 2)[0];
-  const minor = ampVersion.slice(0, 10);
-  const patch = Number(ampVersion.slice(-3)); // npm trims leading zeroes in patch number, so mimic this in package.json
-  return `${major}.${minor}.${patch}`;
-}
-
-module.exports = {
-  getExtensions,
-  getSemver,
-};
diff --git a/build-system/npm-publish/write-package-files.js b/build-system/npm-publish/write-package-files.js
deleted file mode 100644
index 01a8631d3ed0..000000000000
--- a/build-system/npm-publish/write-package-files.js
+++ /dev/null
@@ -1,212 +0,0 @@
-/**
- * @fileoverview
- * Creates npm package files for a given component and AMP version.
- */
-
-const [extension, ampVersion, extensionVersion] = process.argv.slice(2);
-const fastGlob = require('fast-glob');
-const marked = require('marked');
-const path = require('path');
-const posthtml = require('posthtml');
-const {getNameWithoutComponentPrefix} = require('../tasks/bento-helpers');
-const {getSemver} = require('./utils');
-const {log} = require('../common/logging');
-const {readFile} = require('fs-extra');
-const {stat, writeFile} = require('fs/promises');
-const {valid} = require('semver');
-
-const packageName = getNameWithoutComponentPrefix(extension);
-const dir = `extensions/${extension}/${extensionVersion}`;
-
-/**
- * Determines whether to skip
- * @return {Promise<boolean>}
- */
-async function shouldSkip() {
-  try {
-    await stat(dir);
-    return false;
-  } catch {
-    log(`${extension} ${extensionVersion} : skipping, does not exist`);
-    return true;
-  }
-}
-
-/**
- * Returns relative paths to all the extension's CSS file
- *
- * @return {Promise<string[]>}
- */
-async function getStylesheets() {
-  const extDir = `${dir}/dist`.split('/').join(path.sep);
-  const files = await fastGlob(path.join(extDir, '**', '*.css'));
-  return files.map((file) => path.relative(extDir, file));
-}
-
-/**
- * @param {string} html
- * @return {Promise<string>}
- */
-async function getHtmlTextContent(html) {
-  const getTextContent = (node, out = []) => {
-    if (typeof node === 'string') {
-      out.push(node);
-    } else if (Array.isArray(node)) {
-      for (const child of node) {
-        getTextContent(child, out);
-      }
-    } else if (node?.content) {
-      getTextContent(node.content, out);
-    }
-    return out;
-  };
-  const result = await posthtml([
-    (node) => getTextContent(node).join(''),
-  ]).process(html);
-  return result.html.trim();
-}
-
-/**
- * @param {string} markdown
- * @param {number} maxLengthChars
- * @return {Promise<?string>}
- */
-async function getFirstParagraphOrSentence(markdown, maxLengthChars) {
-  const token = marked.lexer(markdown).find(({type}) => type === 'paragraph');
-  if (!token) {
-    return null;
-  }
-  const html = marked.parser([token]);
-  const paragraph = await getHtmlTextContent(html);
-  if (paragraph.length <= maxLengthChars) {
-    return paragraph;
-  }
-  const [sentence] = paragraph.split('.', 1);
-  if (sentence.length < maxLengthChars) {
-    return `${sentence}.`;
-  }
-  return null;
-}
-
-/**
- * Get package description from its README.md file, or a generic description
- * if the file does not exist.
- * @return {Promise<string>}
- */
-async function getDescription() {
-  let description;
-  try {
-    const markdown = await readFile(`${dir}/README.md`, 'utf8');
-    description = await getFirstParagraphOrSentence(markdown, 200);
-  } catch {}
-  return description || `Bento ${packageName} Component`;
-}
-
-/**
- * Write package.json
- * @return {Promise<void>}
- */
-async function writePackageJson() {
-  const version = getSemver(extensionVersion, ampVersion);
-  if (!valid(version) || ampVersion.length != 13) {
-    log(
-      'Invalid semver version',
-      version,
-      'or AMP version',
-      ampVersion,
-      'or extension version',
-      extensionVersion
-    );
-    process.exitCode = 1;
-    return;
-  }
-
-  const exports = {
-    '.': {
-      import: './dist/web-component.module.js',
-      require: './dist/web-component.js',
-    },
-    './web-component': {
-      import: './dist/web-component.module.js',
-      require: './dist/web-component.js',
-    },
-    './preact': {
-      import: './dist/component-preact.module.js',
-      require: './dist/component-preact.js',
-    },
-    './react': {
-      import: './dist/component-react.module.js',
-      require: './dist/component-react.js',
-    },
-  };
-
-  for (const stylesheet of await getStylesheets()) {
-    exports[`./${stylesheet}`] = `./dist/${stylesheet}`;
-  }
-
-  const json = {
-    name: `@bentoproject/${packageName}`,
-    version,
-    description: await getDescription(),
-    author: 'Bento Authors',
-    license: 'Apache-2.0',
-    main: './dist/web-component.js',
-    module: './dist/web-component.module.js',
-    exports,
-    files: ['dist/*', 'react.js'],
-    repository: {
-      type: 'git',
-      url: 'https://github.com/ampproject/amphtml.git',
-      directory: `extensions/${extension}/${extensionVersion}`,
-    },
-    homepage: `https://github.com/ampproject/amphtml/tree/main/extensions/${extension}/${extensionVersion}`,
-    peerDependencies: {
-      preact: '^10.2.1',
-      react: '^17.0.0',
-    },
-  };
-
-  try {
-    await writeFile(`${dir}/package.json`, JSON.stringify(json, null, 2));
-    log(
-      json.name,
-      extensionVersion,
-      ': created package.json for',
-      json.version
-    );
-  } catch (e) {
-    log(e);
-    process.exitCode = 1;
-    return;
-  }
-}
-
-/**
- * Write react.js
- * @return {Promise<void>}
- */
-async function writeReactJs() {
-  const content = "module.exports = require('./dist/component-react');";
-  try {
-    await writeFile(`${dir}/react.js`, content);
-    log(packageName, extensionVersion, ': created react.js');
-  } catch (e) {
-    log(e);
-    process.exitCode = 1;
-    return;
-  }
-}
-
-/**
- * Main
- * @return {Promise<void>}
- */
-async function main() {
-  if (await shouldSkip()) {
-    return;
-  }
-  writePackageJson();
-  writeReactJs();
-}
-
-main();
diff --git a/build-system/pr-check/OWNERS b/build-system/pr-check/OWNERS
index 002922bb9cc9..69a88bfe0386 100644
--- a/build-system/pr-check/OWNERS
+++ b/build-system/pr-check/OWNERS
@@ -4,7 +4,7 @@
 {
   rules: [
     {
-      owners: [{name: 'ampproject/wg-infra'}, {name: 'rsimha', notify: true}],
+      owners: [{name: 'ampproject/wg-infra'}],
     },
   ],
 }
diff --git a/build-system/pr-check/browser-tests.js b/build-system/pr-check/browser-tests.js
index 99c455ddc875..3a910741b637 100644
--- a/build-system/pr-check/browser-tests.js
+++ b/build-system/pr-check/browser-tests.js
@@ -4,37 +4,38 @@
  * @fileoverview Script that runs tests on Safari / Firefox / Edge during CI.
  */
 
-const {
-  skipDependentJobs,
-  timedExecOrDie,
-  timedExecOrThrow,
-} = require('./utils');
-const {browser} = require('minimist')(process.argv.slice(2));
+const {skipDependentJobs, timedExecOrThrow} = require('./utils');
 const {runCiJob} = require('./ci-job');
 const {Targets, buildTargetsInclude} = require('./build-targets');
 
+const argv = require('minimist')(process.argv.slice(2));
+const {type} = argv;
+const browser = argv.browser.toLowerCase();
+
 const jobName = 'browser-tests.js';
 
+const COMMANDS = {
+  'Unit': `amp unit --${browser}`,
+  'Integration': `amp integration --nobuild --minified --${browser}`,
+  'End-to-End': `amp e2e --nobuild --minified --browsers=${browser}`,
+};
+
+const INDIVIDUAL_TARGET = {
+  'Unit': Targets.UNIT_TEST,
+  'Integration': Targets.INTEGRATION_TEST,
+  'End-to-End': Targets.E2E_TEST,
+};
+
 /**
  * Steps to run during push builds.
  */
 function pushBuildWorkflow() {
   try {
-    timedExecOrThrow(`amp unit --report --${browser}`, 'Unit tests failed!');
-    timedExecOrThrow(
-      `amp integration --report --nobuild --minified --${browser}`,
-      'Integration tests failed!'
-    );
-    timedExecOrThrow(
-      `amp e2e --report --nobuild --minified --browsers=${browser}`,
-      'End-to-end tests failed!'
-    );
+    timedExecOrThrow(COMMANDS[type], `${type} tests failed!`);
   } catch (e) {
     if (e.status) {
       process.exitCode = e.status;
     }
-  } finally {
-    timedExecOrDie('amp test-report-upload');
   }
 }
 
@@ -42,32 +43,15 @@ function pushBuildWorkflow() {
  * Steps to run during PR builds.
  */
 function prBuildWorkflow() {
-  if (
-    !buildTargetsInclude(
-      Targets.RUNTIME,
-      Targets.UNIT_TEST,
-      Targets.E2E_TEST,
-      Targets.INTEGRATION_TEST
-    )
-  ) {
+  if (!buildTargetsInclude(Targets.RUNTIME, INDIVIDUAL_TARGET[type])) {
     skipDependentJobs(
       jobName,
-      'this PR does not affect the runtime, unit tests, integration tests, or end-to-end tests'
+      `this PR does not affect the runtime or ${type} tests`
     );
     return;
   }
-  if (buildTargetsInclude(Targets.RUNTIME, Targets.UNIT_TEST)) {
-    timedExecOrDie(`amp unit --${browser}`);
-  }
-  if (buildTargetsInclude(Targets.RUNTIME, Targets.INTEGRATION_TEST)) {
-    timedExecOrDie(`amp integration --nobuild --minified --${browser}`);
-  }
-  if (
-    buildTargetsInclude(Targets.RUNTIME, Targets.E2E_TEST) &&
-    ['safari', 'firefox'].includes(browser) // E2E tests can't be run on Edge.
-  ) {
-    timedExecOrDie(`amp e2e --nobuild --minified --browsers=${browser}`);
-  }
+
+  pushBuildWorkflow();
 }
 
 runCiJob(jobName, pushBuildWorkflow, prBuildWorkflow);
diff --git a/build-system/pr-check/build-targets.js b/build-system/pr-check/build-targets.js
index 7cbb32726f5e..860ee5bdd011 100644
--- a/build-system/pr-check/build-targets.js
+++ b/build-system/pr-check/build-targets.js
@@ -9,7 +9,7 @@ const config = require('../test-configs/config');
 const fastGlob = require('fast-glob');
 const fs = require('fs');
 const json5 = require('json5');
-const minimatch = require('minimatch');
+const {minimatch} = require('minimatch');
 const path = require('path');
 const {cyan} = require('kleur/colors');
 const {getLoggingPrefix, logWithoutTimestamp} = require('../common/logging');
diff --git a/build-system/pr-check/bundle-size-module-build.js b/build-system/pr-check/bundle-size-module-build.js
deleted file mode 100644
index 541a8ac57453..000000000000
--- a/build-system/pr-check/bundle-size-module-build.js
+++ /dev/null
@@ -1,40 +0,0 @@
-'use strict';
-
-/**
- * @fileoverview Script that builds the module AMP runtime for bundle-size during CI.
- */
-
-const {
-  skipDependentJobs,
-  storeModuleBuildToWorkspace,
-  timedExecOrDie,
-} = require('./utils');
-const {runCiJob} = require('./ci-job');
-const {Targets, buildTargetsInclude} = require('./build-targets');
-
-const jobName = 'bundle-size-module-build.js';
-
-/**
- * Steps to run during push builds.
- */
-function pushBuildWorkflow() {
-  timedExecOrDie('amp dist --noconfig --esm');
-  storeModuleBuildToWorkspace();
-}
-
-/**
- * Steps to run during PR builds.
- */
-function prBuildWorkflow() {
-  if (buildTargetsInclude(Targets.RUNTIME)) {
-    pushBuildWorkflow();
-  } else {
-    skipDependentJobs(
-      jobName,
-      'this PR does not affect the runtime',
-      /* gracefullyHaltNextJobs= */ false
-    );
-  }
-}
-
-runCiJob(jobName, pushBuildWorkflow, prBuildWorkflow);
diff --git a/build-system/pr-check/bundle-size-nomodule-build.js b/build-system/pr-check/bundle-size-nomodule-build.js
deleted file mode 100644
index 0aec6e19c46c..000000000000
--- a/build-system/pr-check/bundle-size-nomodule-build.js
+++ /dev/null
@@ -1,40 +0,0 @@
-'use strict';
-
-/**
- * @fileoverview Script that builds the nomodule AMP runtime for bundle-size during CI.
- */
-
-const {
-  skipDependentJobs,
-  storeNomoduleBuildToWorkspace,
-  timedExecOrDie,
-} = require('./utils');
-const {runCiJob} = require('./ci-job');
-const {Targets, buildTargetsInclude} = require('./build-targets');
-
-const jobName = 'bundle-size-nomodule-build.js';
-
-/**
- * Steps to run during push builds.
- */
-function pushBuildWorkflow() {
-  timedExecOrDie('amp dist --noconfig');
-  storeNomoduleBuildToWorkspace();
-}
-
-/**
- * Steps to run during PR builds.
- */
-function prBuildWorkflow() {
-  if (buildTargetsInclude(Targets.RUNTIME)) {
-    pushBuildWorkflow();
-  } else {
-    skipDependentJobs(
-      jobName,
-      'this PR does not affect the runtime',
-      /* gracefullyHaltNextJobs= */ false
-    );
-  }
-}
-
-runCiJob(jobName, pushBuildWorkflow, prBuildWorkflow);
diff --git a/build-system/pr-check/checks.js b/build-system/pr-check/checks.js
index d8c168927c29..4d6f5bfcb167 100644
--- a/build-system/pr-check/checks.js
+++ b/build-system/pr-check/checks.js
@@ -16,23 +16,21 @@ const jobName = 'checks.js';
 function pushBuildWorkflow() {
   timedExecOrDie('amp presubmit');
   timedExecOrDie('amp check-invalid-whitespaces');
-  timedExecOrDie('amp validate-html-fixtures');
   timedExecOrDie('amp lint');
   timedExecOrDie('amp prettify');
   timedExecOrDie('amp check-json-schemas');
   timedExecOrDie('amp ava');
   timedExecOrDie('amp check-build-system');
   timedExecOrDie('amp check-ignore-lists');
+  timedExecOrDie('amp check-links');
   timedExecOrDie('amp babel-plugin-tests');
   timedExecOrDie('amp check-exact-versions');
   timedExecOrDie('amp check-renovate-config');
   timedExecOrDie('amp server-tests');
   timedExecOrDie('amp make-extension --name=t --test --cleanup');
-  timedExecOrDie('amp make-extension --name=t --test --cleanup --bento');
   timedExecOrDie('amp dep-check');
   timedExecOrDie('amp check-types');
   timedExecOrDie('amp check-sourcemaps');
-  timedExecOrDie('amp performance-urls');
   timedExecOrDie('amp check-analytics-vendors-list');
   timedExecOrDie('amp check-video-interface-list');
   timedExecOrDie('amp get-zindex');
@@ -55,10 +53,6 @@ function prBuildWorkflow() {
     timedExecOrDie(`amp check-ignore-lists`);
   }
 
-  if (buildTargetsInclude(Targets.HTML_FIXTURES)) {
-    timedExecOrDie('amp validate-html-fixtures');
-  }
-
   if (buildTargetsInclude(Targets.LINT_RULES)) {
     timedExecOrDie('amp lint');
   } else if (buildTargetsInclude(Targets.LINT)) {
@@ -108,14 +102,12 @@ function prBuildWorkflow() {
 
   if (buildTargetsInclude(Targets.AVA, Targets.RUNTIME)) {
     timedExecOrDie('amp make-extension --name=t --test --cleanup');
-    timedExecOrDie('amp make-extension --name=t --test --cleanup --bento');
   }
 
   if (buildTargetsInclude(Targets.RUNTIME)) {
     timedExecOrDie('amp dep-check');
     timedExecOrDie('amp check-types');
     timedExecOrDie('amp check-sourcemaps');
-    timedExecOrDie('amp performance-urls');
     timedExecOrDie('amp check-analytics-vendors-list');
     timedExecOrDie('amp check-video-interface-list');
     timedExecOrDie('amp get-zindex');
diff --git a/build-system/pr-check/dist.js b/build-system/pr-check/dist.js
new file mode 100644
index 000000000000..b865df7f227e
--- /dev/null
+++ b/build-system/pr-check/dist.js
@@ -0,0 +1,111 @@
+'use strict';
+
+/**
+ * @fileoverview Script that builds the module AMP runtime for bundle-size during CI.
+ */
+
+const {
+  skipDependentJobs,
+  storeBuildOutputToWorkspace,
+  timedExecOrDie,
+} = require('./utils');
+const {runCiJob} = require('./ci-job');
+const {Targets, buildTargetsInclude} = require('./build-targets');
+const {maybeParallelizeCommand} = require('./parallelization');
+
+const {type} = require('minimist')(process.argv.slice(2));
+
+const jobName = 'dist.js';
+
+// Mapping from build type name to the command to execute.
+const COMMANDS = {
+  'Module Build (Test)': 'amp dist --esm --fortesting',
+  'Module 3p Build (Test)':
+    'amp dist --esm --fortesting --core_runtime_only --vendor_configs',
+  'Nomodule Build (Test)': 'amp dist --fortesting',
+  'Nomodule 3p Build (Test)':
+    'amp dist --fortesting --core_runtime_only --vendor_configs',
+  'Module Build (Bundle Size)':
+    'amp dist --noconfig --esm --version_override 0000000000000 --nomanglecache',
+  'Module 3p Build (Bundle Size)':
+    'amp dist --noconfig --esm --core_runtime_only --vendor_configs --version_override 0000000000000 --nomanglecache',
+  'Nomodule Build (Bundle Size)':
+    'amp dist --noconfig --version_override 0000000000000 --nomanglecache',
+  'Nomodule 3p Build (Bundle Size)':
+    'amp dist --noconfig --core_runtime_only --vendor_configs --version_override 0000000000000 --nomanglecache',
+};
+
+// Mapping from Build type name to which build targets should trigger this build in pull requests.
+const PR_TARGETS = {
+  'Module Build (Test)': [
+    Targets.RUNTIME,
+    Targets.INTEGRATION_TEST,
+    Targets.VISUAL_DIFF,
+  ],
+  'Module 3p Build (Test)': [
+    Targets.RUNTIME,
+    Targets.INTEGRATION_TEST,
+    Targets.VISUAL_DIFF,
+  ],
+  'Nomodule Build (Test)': [
+    Targets.RUNTIME,
+    Targets.INTEGRATION_TEST,
+    Targets.E2E_TEST,
+    Targets.VISUAL_DIFF,
+  ],
+  'Nomodule 3p Build (Test)': [
+    Targets.RUNTIME,
+    Targets.INTEGRATION_TEST,
+    Targets.E2E_TEST,
+    Targets.VISUAL_DIFF,
+  ],
+  'Module Build (Bundle Size)': [Targets.RUNTIME],
+  'Module 3p Build (Bundle Size)': [Targets.RUNTIME],
+  'Nomodule Build (Bundle Size)': [Targets.RUNTIME],
+  'Nomodule 3p Build (Bundle Size)': [Targets.RUNTIME],
+};
+
+// We require a special exception for running an empty visual diff build when skipping module test builds.
+// Run this on the 3p Build since that one is not parallelized!
+const RUN_ON_SKIP = {
+  'Module 3p Build (Test)': () => {
+    timedExecOrDie('amp visual-diff --empty');
+  },
+};
+
+// We gracefully halt uneffected tests, but want to run the Bundle Size step regardless.
+const gracefullyHaltNextJobs = type.endsWith('(Test)');
+
+/**
+ * Steps to run during push builds.
+ */
+function pushBuildWorkflow() {
+  const command = maybeParallelizeCommand(
+    COMMANDS[type],
+    'extensions/amp-*',
+    (results) =>
+      `--extensions=${results.replaceAll(/\bextensions\//g, '').replaceAll(' ', ',')}`
+  );
+
+  timedExecOrDie(command);
+  storeBuildOutputToWorkspace();
+}
+
+/**
+ * Steps to run during PR builds.
+ */
+function prBuildWorkflow() {
+  if (buildTargetsInclude(...PR_TARGETS[type])) {
+    pushBuildWorkflow();
+    return;
+  }
+
+  RUN_ON_SKIP[type]?.();
+  skipDependentJobs(
+    jobName,
+    'this PR does not affect relevant files for this build',
+    gracefullyHaltNextJobs
+  );
+}
+
+runCiJob(jobName, pushBuildWorkflow, prBuildWorkflow);
diff --git a/build-system/pr-check/e2e-tests.js b/build-system/pr-check/e2e-tests.js
index c232d400d033..e8cf58232837 100644
--- a/build-system/pr-check/e2e-tests.js
+++ b/build-system/pr-check/e2e-tests.js
@@ -24,15 +24,13 @@ function pushBuildWorkflow() {
   try {
     generateCircleCiShardTestFileList(e2eTestPaths);
     timedExecOrThrow(
-      `amp e2e --nobuild --headless --minified --report --filelist ${FILELIST_PATH}`,
+      `amp e2e --nobuild --headless --minified --filelist ${FILELIST_PATH}`,
       'End-to-end tests failed!'
     );
   } catch (e) {
     if (e.status) {
       process.exitCode = e.status;
     }
-  } finally {
-    timedExecOrDie('amp test-report-upload');
   }
 }
 
diff --git a/build-system/pr-check/experiment-build.js b/build-system/pr-check/experiment-build.js
index 1b0f1c8d34ad..90baa9399d5a 100644
--- a/build-system/pr-check/experiment-build.js
+++ b/build-system/pr-check/experiment-build.js
@@ -5,8 +5,8 @@
  */
 
 const {
-  skipDependentJobs: skipDependentJobs,
-  storeExperimentBuildToWorkspace,
+  skipDependentJobs,
+  storeBuildOutputToWorkspace,
   timedExecOrDie,
 } = require('./utils');
 const {experiment} = require('minimist')(process.argv.slice(2));
@@ -24,7 +24,7 @@ function pushBuildWorkflow() {
   const config = getExperimentConfig(experiment);
   const defineFlag = `--define_experiment_constant ${config.define_experiment_constant}`;
   timedExecOrDie(`amp dist --fortesting ${defineFlag}`);
-  storeExperimentBuildToWorkspace(experiment);
+  storeBuildOutputToWorkspace();
 }
 
 /**
diff --git a/build-system/pr-check/experiment-e2e-tests.js b/build-system/pr-check/experiment-e2e-tests.js
index 92b6a2b7c584..267efb8701f0 100644
--- a/build-system/pr-check/experiment-e2e-tests.js
+++ b/build-system/pr-check/experiment-e2e-tests.js
@@ -8,13 +8,11 @@ const {
   FILELIST_PATH,
   generateCircleCiShardTestFileList,
   skipDependentJobs,
-  timedExecOrDie,
   timedExecOrThrow,
 } = require('./utils');
 const {e2eTestPaths} = require('../test-configs/config');
 const {experiment} = require('minimist')(process.argv.slice(2));
 const {getExperimentConfig} = require('../common/utils');
-const {isPushBuild} = require('../common/ci');
 const {runCiJob} = require('./ci-job');
 const {Targets, buildTargetsInclude} = require('./build-targets');
 
@@ -28,19 +26,14 @@ function runExperimentTests(config) {
   try {
     const defineFlag = `--define_experiment_constant ${config.define_experiment_constant}`;
     const experimentFlag = `--experiment ${experiment}`;
-    const reportFlag = isPushBuild() ? '--report' : '';
     generateCircleCiShardTestFileList(e2eTestPaths);
     timedExecOrThrow(
-      `amp e2e --nobuild --minified --headless ${experimentFlag} ${defineFlag} ${reportFlag} --filelist ${FILELIST_PATH}`
+      `amp e2e --nobuild --minified --headless ${experimentFlag} ${defineFlag} --filelist ${FILELIST_PATH}`
     );
   } catch (e) {
     if (e.status) {
       process.exitCode = e.status;
     }
-  } finally {
-    if (isPushBuild()) {
-      timedExecOrDie('amp test-report-upload');
-    }
   }
 }
 
diff --git a/build-system/pr-check/experiment-integration-tests.js b/build-system/pr-check/experiment-integration-tests.js
index 5ddc62cc26a4..65d95a6e318d 100644
--- a/build-system/pr-check/experiment-integration-tests.js
+++ b/build-system/pr-check/experiment-integration-tests.js
@@ -4,14 +4,9 @@
  * @fileoverview Script that runs the experiment A/B/C integration tests during CI.
  */
 
-const {
-  skipDependentJobs,
-  timedExecOrDie,
-  timedExecOrThrow,
-} = require('./utils');
+const {skipDependentJobs, timedExecOrThrow} = require('./utils');
 const {experiment} = require('minimist')(process.argv.slice(2));
 const {getExperimentConfig} = require('../common/utils');
-const {isPushBuild} = require('../common/ci');
 const {runCiJob} = require('./ci-job');
 const {Targets, buildTargetsInclude} = require('./build-targets');
 
@@ -25,18 +20,13 @@ function runExperimentTests(config) {
   try {
     const defineFlag = `--define_experiment_constant ${config.define_experiment_constant}`;
     const experimentFlag = `--experiment ${experiment}`;
-    const reportFlag = isPushBuild() ? '--report' : '';
     timedExecOrThrow(
-      `amp integration --nobuild --minified --headless ${experimentFlag} ${defineFlag} ${reportFlag}`
+      `amp integration --nobuild --minified --headless ${experimentFlag} ${defineFlag}`
     );
   } catch (e) {
     if (e.status) {
       process.exitCode = e.status;
     }
-  } finally {
-    if (isPushBuild()) {
-      timedExecOrDie('amp test-report-upload');
-    }
   }
 }
 
diff --git a/build-system/pr-check/module-build.js b/build-system/pr-check/module-build.js
deleted file mode 100644
index a2147be6f4fc..000000000000
--- a/build-system/pr-check/module-build.js
+++ /dev/null
@@ -1,43 +0,0 @@
-'use strict';
-
-/**
- * @fileoverview Script that builds the module AMP runtime during CI.
- */
-
-const {
-  skipDependentJobs,
-  storeModuleBuildToWorkspace,
-  timedExecOrDie,
-} = require('./utils');
-const {runCiJob} = require('./ci-job');
-const {Targets, buildTargetsInclude} = require('./build-targets');
-
-const jobName = 'module-build.js';
-
-/**
- * Steps to run during push builds.
- */
-function pushBuildWorkflow() {
-  timedExecOrDie('amp dist --esm --fortesting');
-  storeModuleBuildToWorkspace();
-}
-
-/**
- * Steps to run during PR builds.
- */
-function prBuildWorkflow() {
-  // TODO(#31102): This list must eventually match the same buildTargets check
-  // found in pr-check/nomodule-build.js as we turn on the systems that
-  // run against the module build. (ex. visual diffs, e2e, etc.)
-  if (buildTargetsInclude(Targets.RUNTIME, Targets.INTEGRATION_TEST)) {
-    timedExecOrDie('amp dist --esm --fortesting');
-    storeModuleBuildToWorkspace();
-  } else {
-    skipDependentJobs(
-      jobName,
-      'this PR does not affect the runtime or integration tests'
-    );
-  }
-}
-
-runCiJob(jobName, pushBuildWorkflow, prBuildWorkflow);
diff --git a/build-system/pr-check/nomodule-build.js b/build-system/pr-check/nomodule-build.js
deleted file mode 100644
index e3a9437f6441..000000000000
--- a/build-system/pr-check/nomodule-build.js
+++ /dev/null
@@ -1,65 +0,0 @@
-'use strict';
-
-/**
- * @fileoverview Script that builds the nomodule AMP runtime during CI.
- */
-
-const {
-  abortTimedJob,
-  skipDependentJobs,
-  startTimer,
-  storeNomoduleBuildToWorkspace,
-  timedExecOrDie,
-  timedExecWithError,
-} = require('./utils');
-const {log} = require('../common/logging');
-const {red, yellow} = require('kleur/colors');
-const {runCiJob} = require('./ci-job');
-const {signalPrDeployUpload} = require('../tasks/pr-deploy-bot-utils');
-const {Targets, buildTargetsInclude} = require('./build-targets');
-
-const jobName = 'nomodule-build.js';
-
-/**
- * Steps to run during push builds.
- */
-function pushBuildWorkflow() {
-  timedExecOrDie('amp dist --fortesting');
-  storeNomoduleBuildToWorkspace();
-}
-
-/**
- * Steps to run during PR builds.
- * @return {Promise<void>}
- */
-async function prBuildWorkflow() {
-  const startTime = startTimer(jobName);
-  if (
-    buildTargetsInclude(
-      Targets.RUNTIME,
-      Targets.INTEGRATION_TEST,
-      Targets.E2E_TEST,
-      Targets.VISUAL_DIFF
-    )
-  ) {
-    const process = timedExecWithError('amp dist --fortesting');
-    if (process.status !== 0) {
-      const message = process?.error
-        ? process.error.message
-        : 'Unknown error, check logs';
-      log(red('ERROR'), yellow(message));
-      await signalPrDeployUpload('errored');
-      return abortTimedJob(jobName, startTime);
-    }
-    storeNomoduleBuildToWorkspace();
-  } else {
-    await signalPrDeployUpload('skipped');
-    timedExecOrDie('amp visual-diff --empty');
-    skipDependentJobs(
-      jobName,
-      'this PR does not affect the runtime, integration tests, end-to-end tests, or visual diff tests'
-    );
-  }
-}
-
-runCiJob(jobName, pushBuildWorkflow, prBuildWorkflow);
diff --git a/build-system/pr-check/nomodule-tests.js b/build-system/pr-check/nomodule-tests.js
index e54ea23f5d58..d4e7c486677f 100644
--- a/build-system/pr-check/nomodule-tests.js
+++ b/build-system/pr-check/nomodule-tests.js
@@ -35,15 +35,13 @@ function pushBuildWorkflow() {
   prependConfig();
   try {
     timedExecOrThrow(
-      `amp integration --nobuild --headless --minified --report --config=${argv.config}`,
+      `amp integration --nobuild --headless --minified --config=${argv.config}`,
       'Integration tests failed!'
     );
   } catch (e) {
     if (e.status) {
       process.exitCode = e.status;
     }
-  } finally {
-    timedExecOrDie('amp test-report-upload');
   }
 }
 
diff --git a/build-system/pr-check/parallelization.js b/build-system/pr-check/parallelization.js
new file mode 100644
index 000000000000..be12f461f616
--- /dev/null
+++ b/build-system/pr-check/parallelization.js
@@ -0,0 +1,44 @@
+/**
+ * @fileoverview helpper functions for parallelizations.
+ */
+
+const fs = require('node:fs');
+const tempy = require('tempy');
+const {circleciIsParallelized} = require('../common/ci');
+const {timedExecOrDie} = require('./utils');
+
+/**
+ * Splits command execution using a glob string on parallelized CircleCI builds.
+ *
+ * If no parallelization is detected, simply returns the command as-is.
+ * If parallelization is detected, uses the glob to add an argument to the
+ * command by passing it through an optional callback function.
+ *
+ * Optional callback: A function that receives a space-delimited list as
+ *     determines by CircleCI, and returns the new argument to add as a string.
+ *     e.g., `(items) => '--files=' + item.replaceAll(' ', ',')` will add
+ *     '--files=x,y,z' to the command.
+ *
+ * Note: the glob returns results with spaces in them this cab get messy.
+ *
+ * @param {string} command a CLI command. e.g., `amp dist --fortesting`
+ * @param {string} glob e.g., `extensions/amp-*`
+ * @param {(results: string) => string} callback optional callback. See
+ *    function description.
+ * @return {string} the CLI command that should be executed.
+ */
+function maybeParallelizeCommand(command, glob, callback = (s) => s) {
+  if (!circleciIsParallelized()) {
+    return command;
+  }
+
+  const tempFileName = tempy.file();
+  timedExecOrDie(
+    `circleci tests glob ${glob} | circleci tests run --command=">${tempFileName} xargs echo -n"`
+  );
+  const globAndRunResults = fs.readFileSync(tempFileName, {encoding: 'utf-8'});
+
+  return `${command} ${callback(globAndRunResults)}`;
+}
+
+module.exports = {maybeParallelizeCommand};
diff --git a/build-system/pr-check/pr-deploy.js b/build-system/pr-check/pr-deploy.js
deleted file mode 100644
index 00b151a449eb..000000000000
--- a/build-system/pr-check/pr-deploy.js
+++ /dev/null
@@ -1,43 +0,0 @@
-'use strict';
-
-/**
- * @fileoverview Script that deploys a PR's nomodule and storybook output during CI.
- */
-
-const {
-  processAndStoreBuildToArtifacts,
-  skipDependentJobs,
-  timedExecOrDie,
-} = require('./utils');
-const {runCiJob} = require('./ci-job');
-const {signalPrDeployUpload} = require('../tasks/pr-deploy-bot-utils');
-const {Targets, buildTargetsInclude} = require('./build-targets');
-
-const jobName = 'pr-deploy.js';
-
-/**
- * Steps to run during PR builds.
- * @return {Promise<void>}
- */
-async function prBuildWorkflow() {
-  if (
-    buildTargetsInclude(
-      Targets.RUNTIME,
-      Targets.INTEGRATION_TEST,
-      Targets.E2E_TEST,
-      Targets.VISUAL_DIFF
-    )
-  ) {
-    timedExecOrDie('amp storybook --build');
-    await processAndStoreBuildToArtifacts();
-    await signalPrDeployUpload('success');
-  } else {
-    await signalPrDeployUpload('skipped');
-    skipDependentJobs(
-      jobName,
-      'this PR does not affect the runtime, integration tests, end-to-end tests, or visual diff tests'
-    );
-  }
-}
-
-runCiJob(jobName, () => {}, prBuildWorkflow);
diff --git a/build-system/pr-check/unit-tests.js b/build-system/pr-check/unit-tests.js
index e1bf2495b9d8..3cc8726380ba 100644
--- a/build-system/pr-check/unit-tests.js
+++ b/build-system/pr-check/unit-tests.js
@@ -24,19 +24,13 @@ function pushBuildWorkflow() {
   try {
     generateCircleCiShardTestFileList(unitTestPaths);
     timedExecOrThrow(
-      `amp unit --headless --coverage --report --filelist ${FILELIST_PATH}`,
+      `amp unit --headless --coverage --filelist ${FILELIST_PATH}`,
       'Unit tests failed!'
     );
-    timedExecOrThrow(
-      'amp codecov-upload',
-      'Failed to upload code coverage to Codecov!'
-    );
   } catch (e) {
     if (e.status) {
       process.exitCode = e.status;
     }
-  } finally {
-    timedExecOrDie('amp test-report-upload');
   }
 }
 
@@ -49,7 +43,6 @@ function prBuildWorkflow() {
     timedExecOrDie(
       `amp unit --headless --coverage --filelist ${FILELIST_PATH}`
     );
-    timedExecOrDie('amp codecov-upload');
   } else {
     skipDependentJobs(
       jobName,
diff --git a/build-system/pr-check/unminified-build.js b/build-system/pr-check/unminified-build.js
index dc3c49292e91..fa5198f2cb6a 100644
--- a/build-system/pr-check/unminified-build.js
+++ b/build-system/pr-check/unminified-build.js
@@ -6,7 +6,7 @@
 
 const {
   skipDependentJobs,
-  storeUnminifiedBuildToWorkspace,
+  storeBuildOutputToWorkspace,
   timedExecOrDie,
 } = require('./utils');
 const {runCiJob} = require('./ci-job');
@@ -19,7 +19,7 @@ const jobName = 'unminified-build.js';
  */
 function pushBuildWorkflow() {
   timedExecOrDie('amp build --fortesting');
-  storeUnminifiedBuildToWorkspace();
+  storeBuildOutputToWorkspace();
 }
 
 /**
@@ -28,7 +28,7 @@ function pushBuildWorkflow() {
 function prBuildWorkflow() {
   if (buildTargetsInclude(Targets.RUNTIME, Targets.INTEGRATION_TEST)) {
     timedExecOrDie('amp build --fortesting');
-    storeUnminifiedBuildToWorkspace();
+    storeBuildOutputToWorkspace();
   } else {
     skipDependentJobs(
       jobName,
diff --git a/build-system/pr-check/unminified-tests.js b/build-system/pr-check/unminified-tests.js
index 20aac2604ad2..73e63d817f7b 100644
--- a/build-system/pr-check/unminified-tests.js
+++ b/build-system/pr-check/unminified-tests.js
@@ -20,19 +20,13 @@ const jobName = 'unminified-tests.js';
 function pushBuildWorkflow() {
   try {
     timedExecOrThrow(
-      'amp integration --nobuild --headless --coverage --report',
+      'amp integration --nobuild --headless --coverage',
       'Integration tests failed!'
     );
-    timedExecOrThrow(
-      'amp codecov-upload',
-      'Failed to upload code coverage to Codecov!'
-    );
   } catch (e) {
     if (e.status) {
       process.exitCode = e.status;
     }
-  } finally {
-    timedExecOrDie('amp test-report-upload');
   }
 }
 
@@ -42,7 +36,6 @@ function pushBuildWorkflow() {
 function prBuildWorkflow() {
   if (buildTargetsInclude(Targets.RUNTIME, Targets.INTEGRATION_TEST)) {
     timedExecOrDie('amp integration --nobuild --headless --coverage');
-    timedExecOrDie('amp codecov-upload');
   } else {
     skipDependentJobs(
       jobName,
diff --git a/build-system/pr-check/utils.js b/build-system/pr-check/utils.js
index 27791aab760f..878451fed4ee 100644
--- a/build-system/pr-check/utils.js
+++ b/build-system/pr-check/utils.js
@@ -1,11 +1,9 @@
 'use strict';
 
-const fastGlob = require('fast-glob');
 const fs = require('fs-extra');
-const path = require('path');
 const {
   ciPullRequestSha,
-  circleciBuildNumber,
+  circleciUniqueBuildNumber,
   isCiBuild,
   isCircleciBuild,
 } = require('../common/ci');
@@ -22,23 +20,10 @@ const {cyan, green, yellow} = require('kleur/colors');
 const {exec, execOrDie, execOrThrow, execWithError} = require('../common/exec');
 const {getLoggingPrefix, logWithoutTimestamp} = require('../common/logging');
 const {getStdout} = require('../common/process');
-const {replaceUrls} = require('../tasks/pr-deploy-bot-utils');
 
-const UNMINIFIED_CONTAINER_DIRECTORY = 'unminified';
-const NOMODULE_CONTAINER_DIRECTORY = 'nomodule';
-const MODULE_CONTAINER_DIRECTORY = 'module';
-
-const ARTIFACT_DIRECTORY = '/tmp/artifacts/';
-const ARTIFACT_FILE_NAME = `${ARTIFACT_DIRECTORY}/amp_nomodule_build.tar.gz`;
 const FILELIST_PATH = '/tmp/filelist.txt';
 
 const BUILD_OUTPUT_DIRS = ['build', 'dist', 'dist.3p', 'dist.tools'];
-const APP_SERVING_DIRS = [
-  ...BUILD_OUTPUT_DIRS,
-  'examples',
-  'test/manual',
-  'test/fixtures/e2e',
-];
 
 const GIT_BRANCH_URL =
   'https://github.com/ampproject/amphtml/blob/main/docs/getting-started-e2e.md#create-a-git-branch';
@@ -110,7 +95,7 @@ function printChangeSummary() {
 function signalGracefulHalt() {
   if (isCircleciBuild()) {
     const loggingPrefix = getLoggingPrefix();
-    const sentinelFile = `/tmp/workspace/.CI_GRACEFULLY_HALT_${circleciBuildNumber()}`;
+    const sentinelFile = `/tmp/workspace/.CI_GRACEFULLY_HALT_${circleciUniqueBuildNumber()}`;
     fs.closeSync(fs.openSync(sentinelFile, 'w'));
     logWithoutTimestamp(
       `${loggingPrefix} Created ${cyan(sentinelFile)} to signal graceful halt.`
@@ -229,10 +214,9 @@ const timedExecOrThrow = timedExecFn(execOrThrow);
 
 /**
  * Stores build files to the CI workspace.
- * @param {string} containerDirectory
- * @private
  */
-function storeBuildToWorkspace_(containerDirectory) {
+function storeBuildOutputToWorkspace() {
+  const containerDirectory = circleciUniqueBuildNumber();
   if (isCircleciBuild()) {
     fs.ensureDirSync(`/tmp/workspace/builds/${containerDirectory}`);
     for (const outputDir of BUILD_OUTPUT_DIRS) {
@@ -244,76 +228,9 @@ function storeBuildToWorkspace_(containerDirectory) {
         );
       }
     }
-    // Bento components are compiled inside the extension source file.
-    for (const componentFile of fastGlob.sync('extensions/*/?.?/dist/*.js')) {
-      fs.ensureDirSync(
-        `/tmp/workspace/builds/${containerDirectory}/${path.dirname(
-          componentFile
-        )}`
-      );
-      fs.moveSync(
-        componentFile,
-        `/tmp/workspace/builds/${containerDirectory}/${componentFile}`
-      );
-    }
   }
 }
 
-/**
- * Stores unminified build files to the CI workspace.
- */
-function storeUnminifiedBuildToWorkspace() {
-  storeBuildToWorkspace_(UNMINIFIED_CONTAINER_DIRECTORY);
-}
-
-/**
- * Stores nomodule build files to the CI workspace.
- */
-function storeNomoduleBuildToWorkspace() {
-  storeBuildToWorkspace_(NOMODULE_CONTAINER_DIRECTORY);
-}
-
-/**
- * Stores module build files to the CI workspace.
- */
-function storeModuleBuildToWorkspace() {
-  storeBuildToWorkspace_(MODULE_CONTAINER_DIRECTORY);
-}
-
-/**
- * Stores an experiment's build files to the CI workspace.
- * @param {string} exp one of 'experimentA', 'experimentB', or 'experimentC'.
- */
-function storeExperimentBuildToWorkspace(exp) {
-  storeBuildToWorkspace_(exp);
-}
-
-/**
- * Replaces URLS in HTML files, compresses and stores nomodule build in CI artifacts.
- * @return {Promise<void>}
- */
-async function processAndStoreBuildToArtifacts() {
-  if (!isCircleciBuild()) {
-    return;
-  }
-
-  await replaceUrls('test/manual');
-  await replaceUrls('examples');
-
-  const loggingPrefix = getLoggingPrefix();
-
-  logWithoutTimestamp(
-    `\n${loggingPrefix} Compressing ` +
-      cyan(APP_SERVING_DIRS.join(', ')) +
-      ' into ' +
-      cyan(ARTIFACT_FILE_NAME) +
-      '...'
-  );
-  await fs.ensureDir(ARTIFACT_DIRECTORY);
-  execOrDie(`tar -czf ${ARTIFACT_FILE_NAME} ${APP_SERVING_DIRS.join('/ ')}/`);
-  execOrDie(`du -sh ${ARTIFACT_FILE_NAME}`);
-}
-
 /**
  * Generates a file with a comma-separated list of test file paths that CircleCI
  * should execute in a parallelized job shard.
@@ -347,10 +264,6 @@ module.exports = {
   timedExecOrDie,
   timedExecWithError,
   timedExecOrThrow,
-  storeUnminifiedBuildToWorkspace,
-  storeNomoduleBuildToWorkspace,
-  storeModuleBuildToWorkspace,
-  storeExperimentBuildToWorkspace,
-  processAndStoreBuildToArtifacts,
+  storeBuildOutputToWorkspace,
   generateCircleCiShardTestFileList,
 };
diff --git a/build-system/pr-check/validator-tests.js b/build-system/pr-check/validator-tests.js
index a627bf446db8..dc1964ebdacd 100644
--- a/build-system/pr-check/validator-tests.js
+++ b/build-system/pr-check/validator-tests.js
@@ -14,9 +14,12 @@ const jobName = 'validator-tests.js';
  * Steps to run during push builds.
  */
 function pushBuildWorkflow() {
-  timedExecOrDie('amp validator-webui');
-  timedExecOrDie('amp validator');
+  // NOTE: We've removed the amp validator calls as the JS validator and its
+  // tests are no longer needed since we now create a WASM build off of the
+  // the C++ code.
+  // TODO(#38610): fix for bazel 6.0 or use older version
   timedExecOrDie('amp validator-cpp');
+  timedExecOrDie('amp validate-html-fixtures');
 }
 
 /**
@@ -25,6 +28,7 @@ function pushBuildWorkflow() {
 function prBuildWorkflow() {
   if (
     !buildTargetsInclude(
+      Targets.HTML_FIXTURES,
       Targets.RUNTIME,
       Targets.VALIDATOR,
       Targets.VALIDATOR_WEBUI
@@ -32,17 +36,13 @@ function prBuildWorkflow() {
   ) {
     skipDependentJobs(
       jobName,
-      'this PR does not affect the runtime, validator, or validator web UI'
+      'this PR does not affect the runtime, HTML fixtures, validator, or validator web UI'
     );
     return;
   }
 
-  if (buildTargetsInclude(Targets.VALIDATOR_WEBUI)) {
-    timedExecOrDie('amp validator-webui');
-  }
-
-  if (buildTargetsInclude(Targets.RUNTIME, Targets.VALIDATOR)) {
-    timedExecOrDie('amp validator');
+  if (buildTargetsInclude(Targets.HTML_FIXTURES)) {
+    timedExecOrDie('amp validate-html-fixtures');
   }
 
   if (buildTargetsInclude(Targets.VALIDATOR)) {
diff --git a/build-system/pr-check/visual-diff-tests.js b/build-system/pr-check/visual-diff-tests.js
index 5b433ade878c..a17780812cf9 100644
--- a/build-system/pr-check/visual-diff-tests.js
+++ b/build-system/pr-check/visual-diff-tests.js
@@ -14,7 +14,7 @@ const jobName = 'visual-diff-tests.js';
  * Steps to run during push builds.
  */
 function pushBuildWorkflow() {
-  timedExecOrDie('amp visual-diff --main');
+  timedExecOrDie('amp visual-diff --esm --minified --main');
 }
 
 /**
@@ -22,9 +22,9 @@ function pushBuildWorkflow() {
  */
 function prBuildWorkflow() {
   if (buildTargetsInclude(Targets.RUNTIME, Targets.VISUAL_DIFF)) {
-    timedExecOrDie('amp visual-diff');
+    timedExecOrDie('amp visual-diff --esm --minified');
   } else {
-    timedExecOrDie('amp visual-diff --empty');
+    timedExecOrDie('amp visual-diff --empty --esm --minified');
     skipDependentJobs(
       jobName,
       'this PR does not affect the runtime or visual diff tests'
diff --git a/build-system/release-tagger/index.js b/build-system/release-tagger/index.js
index 223f92cb1671..451daa49bcfe 100644
--- a/build-system/release-tagger/index.js
+++ b/build-system/release-tagger/index.js
@@ -6,22 +6,19 @@
  * 2. head (AMP version)
  * 3. base (AMP version)
  * 4. channel (beta-percent|stable|lts)
- * 5. time (in UTC, Y-%m-%d %H:%M:%S)
  */
 
-const dedent = require('dedent');
-const {action, base, channel, head, sha, timeParam} = require('minimist')(
+const {default: dedent} = require('dedent');
+const {action, base, channel, head, sha} = require('minimist')(
   process.argv.slice(2),
   {
     string: ['head', 'base'],
   }
 );
 const {addLabels, removeLabels} = require('./label-pull-requests');
-const {createOrUpdateTracker} = require('./update-issue-tracker');
 const {cyan, magenta} = require('kleur/colors');
-const {getRelease} = require('./utils');
 const {log} = require('../common/logging');
-const {makeRelease} = require('./make-release');
+const {getRelease, makeRelease} = require('./make-release');
 const {publishRelease, rollbackRelease} = require('./update-release');
 
 /**
@@ -29,14 +26,12 @@ const {publishRelease, rollbackRelease} = require('./update-release');
  * @return {Promise<void>}
  */
 async function _promote() {
-  const time = decodeURIComponent(timeParam);
   log(
     cyan(dedent`Release tagger triggered with inputs:
     action: ${magenta(action)}
     head: ${magenta(head)}
     base: ${magenta(base)}
     channel: ${magenta(channel)}
-    time: ${magenta(time)}
     sha: ${magenta(sha)}`)
   );
 
@@ -54,7 +49,8 @@ async function _promote() {
   }
 
   if (['stable', 'lts'].includes(channel)) {
-    const {'html_url': url} = await publishRelease(head);
+    const latest = channel == 'stable';
+    const {'html_url': url} = await publishRelease(head, latest);
     log('Published release', magenta(head), 'at', cyan(url));
   }
 
@@ -67,14 +63,6 @@ async function _promote() {
       magenta(channel)
     );
   }
-
-  await createOrUpdateTracker(head, base, channel, time);
-  log(
-    'Updated issue tracker for release',
-    magenta(head),
-    'and channel',
-    magenta(channel)
-  );
 }
 
 /**
@@ -112,8 +100,6 @@ async function main() {
     log('Action: rollback');
     return await _rollback();
   }
-
-  // TODO(estherkim): add release tracker comment on prs
 }
 
 main();
diff --git a/build-system/release-tagger/label-pull-requests.js b/build-system/release-tagger/label-pull-requests.js
index 3016117122c1..2b06306ab5db 100644
--- a/build-system/release-tagger/label-pull-requests.js
+++ b/build-system/release-tagger/label-pull-requests.js
@@ -3,13 +3,7 @@
  * Update labels on pull requests for the release tagger.
  */
 
-const {
-  getLabel,
-  getPullRequestsBetweenCommits,
-  getRelease,
-  labelPullRequests,
-  unlabelPullRequests,
-} = require('./utils');
+const {GitHubApi} = require('./utils');
 
 const labelConfig = {
   'beta-percent': 'PR Use: In Beta / Experimental',
@@ -22,15 +16,16 @@ const labelConfig = {
  * @param {string} head
  * @param {string} base
  * @param {string} channel
+ * @param {object} api
  * @return {Promise<Object>}
  */
-async function _setup(head, base, channel) {
+async function _setup(head, base, channel, api) {
   const [label, headRelease, baseRelease] = await Promise.all([
-    await getLabel(labelConfig[channel]),
-    await getRelease(head),
-    await getRelease(base),
+    await api.getLabel(labelConfig[channel]),
+    await api.getRelease(head),
+    await api.getRelease(base),
   ]);
-  const prs = await getPullRequestsBetweenCommits(
+  const prs = await api.getPullRequestsBetweenCommits(
     headRelease['target_commitish'],
     baseRelease['target_commitish']
   );
@@ -42,11 +37,20 @@ async function _setup(head, base, channel) {
  * @param {string} head
  * @param {string} base
  * @param {string} channel
+ * @param {Object|undefined} octokitRest
+ * @param {Object|undefined} octokitGraphQl
  * @return {Promise<void>}
  */
-async function addLabels(head, base, channel) {
-  const {labelId, prs} = await _setup(head, base, channel);
-  await labelPullRequests(prs, labelId);
+async function addLabels(
+  head,
+  base,
+  channel,
+  octokitRest = undefined,
+  octokitGraphQl = undefined
+) {
+  const api = new GitHubApi(octokitRest, octokitGraphQl);
+  const {labelId, prs} = await _setup(head, base, channel, api);
+  await api.labelPullRequests(prs, labelId);
 }
 
 /**
@@ -54,11 +58,20 @@ async function addLabels(head, base, channel) {
  * @param {string} head
  * @param {string} base
  * @param {string} channel
+ * @param {Object|undefined} octokitRest
+ * @param {Object|undefined} octokitGraphQl
  * @return {Promise<void>}
  */
-async function removeLabels(head, base, channel) {
-  const {labelId, prs} = await _setup(head, base, channel);
-  await unlabelPullRequests(prs, labelId);
+async function removeLabels(
+  head,
+  base,
+  channel,
+  octokitRest = undefined,
+  octokitGraphQl = undefined
+) {
+  const api = new GitHubApi(octokitRest, octokitGraphQl);
+  const {labelId, prs} = await _setup(head, base, channel, api);
+  await api.unlabelPullRequests(prs, labelId);
 }
 
 module.exports = {addLabels, removeLabels};
diff --git a/build-system/release-tagger/make-release.js b/build-system/release-tagger/make-release.js
index e5bea5a869cc..7f69953e821a 100644
--- a/build-system/release-tagger/make-release.js
+++ b/build-system/release-tagger/make-release.js
@@ -3,15 +3,10 @@
  * Make release for the release tagger.
  */
 
-const dedent = require('dedent');
-const {
-  createRelease,
-  createTag,
-  getPullRequestsBetweenCommits,
-  getRef,
-} = require('./utils');
-const {getExtensions, getSemver} = require('../npm-publish/utils');
-const {GraphQlQueryResponseData} = require('@octokit/graphql'); //eslint-disable-line no-unused-vars
+const {default: dedent} = require('dedent');
+const {GitHubApi} = require('./utils');
+
+/** @typedef {import('@octokit/graphql').GraphQlQueryResponseData} GraphQlQueryResponseData */
 
 const prereleaseConfig = {
   'beta-opt-in': true,
@@ -42,45 +37,6 @@ function _formatPullRequestLine(pr) {
    <a href="${commitUrl}"><code>${abbreviatedOid}</code></a> - ${title}`;
 }
 
-/**
- * Organize bento changes into sections
- * @param {Array<GraphQlQueryResponseData>} prs
- * @return {PackageMetadata}
- */
-function _createPackageSections(prs) {
-  const bundles = getExtensions();
-  const majors = [...new Set(bundles.map((b) => b.version))];
-  /** @type PackageMetadata */
-  const metadata = {};
-  for (const major of majors) {
-    metadata[major] = {
-      packages: {},
-      unchanged: new Set(),
-    };
-    bundles
-      .filter((b) => b.version == major)
-      .map((b) => metadata[major].unchanged.add(b.extension));
-  }
-
-  for (const pr of prs) {
-    for (const node of pr.files.nodes) {
-      for (const {extension, version} of bundles) {
-        if (node.path.startsWith(`extensions/${extension}/${version}`)) {
-          if (!Object.keys(metadata[version].packages).includes(extension)) {
-            metadata[version].packages[extension] = new Set();
-            metadata[version].unchanged.delete(extension);
-          }
-          metadata[version].packages[extension].add(
-            `<li>${_formatPullRequestLine(pr)}</li>`
-          );
-        }
-      }
-    }
-  }
-
-  return metadata;
-}
-
 /**
  * Organize pull requests into sections
  * @param {Array<GraphQlQueryResponseData>} prs
@@ -112,12 +68,12 @@ function _createComponentSections(prs) {
 
     // components
     for (const node of pr.files.nodes) {
-      if (node.path.startsWith('extensions/')) {
-        const component = node.path.split('/')[1];
-        if (!Object.keys(sections).includes(component)) {
-          sections[component] = new Set();
+      const componentName = getComponentNameFromPath(node.path);
+      if (componentName) {
+        if (!sections[componentName]) {
+          sections[componentName] = new Set();
         }
-        sections[component].add(_formatPullRequestLine(pr));
+        sections[componentName].add(_formatPullRequestLine(pr));
       }
     }
   }
@@ -138,6 +94,22 @@ function _createComponentSections(prs) {
   return sectionsMarkdown;
 }
 
+/**
+ * Gets the name of a component from its directory path.
+ * Returns undefined if the path is not a component directory.
+ * @param {string} path
+ * @return {string|undefined}
+ */
+function getComponentNameFromPath(path) {
+  if (path.startsWith('extensions/')) {
+    return path.split('/')[1];
+  }
+
+  if (path.startsWith('src/bento/components/')) {
+    return path.split('/')[3];
+  }
+}
+
 /**
  * Create body for GitHub release
  * @param {string} head
@@ -146,7 +118,6 @@ function _createComponentSections(prs) {
  * @return {string}
  */
 function _createBody(head, base, prs) {
-  const bento = _createPackageSections(prs);
   const components = _createComponentSections(prs);
   const template = dedent`\
      <h2>Changelog</h2>
@@ -156,25 +127,6 @@ function _createBody(head, base, prs) {
      </a>
      </p>
  
-     ${Object.entries(bento)
-       .map(
-         // eslint-disable-next-line local/no-deep-destructuring
-         ([major, {packages, unchanged}]) => dedent`\
-         <h2>npm packages @ ${getSemver(major, head)}</h2>
-         ${Object.entries(packages)
-           .sort()
-           .map(
-             ([extension, prs]) =>
-               `<b>${extension}</b>\n<ul>${[...prs].join('\n')}</ul>`
-           )
-           .join('\n')}
-   
-         <b>Packages not changed:</b> <i>${[...unchanged]
-           .sort()
-           .join(', ')}</i>`
-       )
-       .join('\n')}
- 
      <h2>Changes by component</h2>
      ${components.sort().join('')}\
    `;
@@ -197,20 +149,46 @@ function _createBody(head, base, prs) {
  * @param {string} base
  * @param {string} channel
  * @param {string} sha
+ * @param {Object|undefined} octokitRest
+ * @param {Object|undefined} octokitGraphQl
  * @return {Promise<Object>}
  */
-async function makeRelease(head, base, channel, sha) {
+async function makeRelease(
+  head,
+  base,
+  channel,
+  sha,
+  octokitRest = undefined,
+  octokitGraphQl = undefined
+) {
+  const api = new GitHubApi(octokitRest, octokitGraphQl);
   let headRef;
   try {
-    headRef = (await getRef(head)).object;
+    headRef = (await api.getRef(head)).object;
   } catch (_) {
-    headRef = (await createTag(head, sha)).object;
+    headRef = (await api.createTag(head, sha)).object;
   }
-  const {object: baseRef} = await getRef(base);
-  const prs = await getPullRequestsBetweenCommits(headRef.sha, baseRef.sha);
+  const {object: baseRef} = await api.getRef(base);
+  const prs = await api.getPullRequestsBetweenCommits(headRef.sha, baseRef.sha);
   const body = _createBody(head, base, prs);
   const prerelease = prereleaseConfig[channel];
-  return await createRelease(head, headRef.sha, body, prerelease);
+  return await api.createRelease(head, headRef.sha, body, prerelease);
+}
+
+/**
+ * Get a release
+ * @param {string} head
+ * @param {Object|undefined} octokitRest
+ * @param {Object|undefined} octokitGraphQl
+ * @return {Promise<Object>}
+ */
+async function getRelease(
+  head,
+  octokitRest = undefined,
+  octokitGraphQl = undefined
+) {
+  const api = new GitHubApi(octokitRest, octokitGraphQl);
+  return await api.getRelease(head);
 }
 
-module.exports = {makeRelease};
+module.exports = {getRelease, makeRelease};
diff --git a/build-system/release-tagger/test/label-pull-requests.test.js b/build-system/release-tagger/test/label-pull-requests.test.js
index 65f334351bb9..282b8ec5625c 100644
--- a/build-system/release-tagger/test/label-pull-requests.test.js
+++ b/build-system/release-tagger/test/label-pull-requests.test.js
@@ -1,245 +1,218 @@
-const nock = require('nock');
 const test = require('ava');
+const sinon = require('sinon');
 const {addLabels, removeLabels} = require('../label-pull-requests');
 
-test.before(() => nock.disableNetConnect());
-test.after(() => {
-  nock.cleanAll();
-  nock.enableNetConnect();
+test.beforeEach((t) => {
+  t.context.octokitRest = {
+    rest: {
+      issues: {
+        getLabel: sinon.stub(),
+      },
+      repos: {
+        compareCommits: sinon.stub(),
+        getReleaseByTag: sinon.stub(),
+      },
+    },
+    hook: {
+      error: sinon.stub(),
+    },
+  };
+
+  t.context.octokitGraphQl = sinon.stub();
 });
 
 test('label', async (t) => {
-  const rest = nock('https://api.github.com')
-    // https://docs.github.com/en/rest/reference/issues#get-a-label
-    .get('/repos/ampproject/amphtml/labels/PR%20Use%3A%20In%20Stable')
-    .reply(200, {
+  t.context.octokitRest.rest.issues.getLabel.resolves({
+    data: {
       'node_id': 1,
+    },
+  });
+  t.context.octokitRest.rest.repos.getReleaseByTag
+    .onFirstCall()
+    .resolves({
+      data: {
+        id: 2,
+        'target_commitish': '3abcdef',
+      },
     })
-    // https://docs.github.com/en/rest/reference/repos#get-a-release-by-tag-name
-    .get('/repos/ampproject/amphtml/releases/tags/2107280123000')
-    .reply(200, {
-      id: 2,
-      'target_commitish': '3abcdef',
-    })
-    // https://docs.github.com/en/rest/reference/repos#get-a-release-by-tag-name
-    .get('/repos/ampproject/amphtml/releases/tags/2107210123000')
-    .reply(200, {
-      id: 1,
-      'target_commitish': '1abcdef',
-    })
-    // https://docs.github.com/en/rest/reference/repos#compare-two-commits
-    .get('/repos/ampproject/amphtml/compare/1abcdef...3abcdef')
-    .reply(200, {
-      commits: [{sha: '1abcdef'}, {sha: '2abcdef'}, {sha: '3abcdef'}],
+    .onSecondCall()
+    .resolves({
+      data: {
+        id: 1,
+        'target_commitish': '1abcdef',
+      },
     });
+  t.context.octokitRest.rest.repos.compareCommits.resolves({
+    data: {commits: [{sha: '1abcdef'}, {sha: '2abcdef'}, {sha: '3abcdef'}]},
+  });
 
-  const graphql = nock('https://api.github.com/graphql')
-    .post(
-      '',
-      '{"query":"query {' +
-        'pr0: search(query:\\"repo:ampproject/amphtml sha:1abcdef\\", ' +
-        'type:ISSUE first:100){nodes { ... on PullRequest { id title number ' +
-        'url author { login } files(first:100) { nodes { path }} mergeCommit ' +
-        '{ commitUrl oid abbreviatedOid }}}} ' +
-        'pr1: search(query:\\"repo:ampproject/amphtml sha:2abcdef\\", ' +
-        'type:ISSUE first:100){nodes { ... on PullRequest { id title number ' +
-        'url author { login } files(first:100) { nodes { path }} mergeCommit ' +
-        '{ commitUrl oid abbreviatedOid }}}} ' +
-        'pr2: search(query:\\"repo:ampproject/amphtml sha:3abcdef\\", ' +
-        'type:ISSUE first:100){nodes { ... on PullRequest { id title number ' +
-        'url author { login } files(first:100) { nodes { path }} mergeCommit ' +
-        '{ commitUrl oid abbreviatedOid }}}}}"}'
-    )
-    .reply(200, {
-      data: {
-        pr0: {
-          nodes: [
-            {
-              id: 'MDEx01',
-              title: 'Bunch of changes',
-              number: 1,
-              url: 'https://github.com/ampproject/amphtml/pull/1',
-              author: {login: 'testauthor'},
-              mergeCommit: {
-                commitUrl:
-                  'https://github.com/ampproject/amphtml/commit/1abcdef',
-                oid: '1abcdef',
-                abbreviatedOid: '1abc',
-              },
-            },
-          ],
+  t.context.octokitGraphQl.resolves({
+    pr0: {
+      nodes: [
+        {
+          id: 'MDEx01',
+          title: 'Bunch of changes',
+          number: 1,
+          url: 'https://github.com/ampproject/amphtml/pull/1',
+          author: {login: 'testauthor'},
+          mergeCommit: {
+            commitUrl: 'https://github.com/ampproject/amphtml/commit/1abcdef',
+            oid: '1abcdef',
+            abbreviatedOid: '1abc',
+          },
         },
-        pr1: {
-          nodes: [
-            {
-              id: 'MDEx02',
-              title: '`README` updates',
-              number: 2,
-              url: 'https://github.com/ampproject/amphtml/pull/2',
-              author: {login: 'testauthor'},
-              mergeCommit: {
-                commitUrl:
-                  'https://github.com/ampproject/amphtml/commit/2abcdef',
-                oid: '2abcdef',
-                abbreviatedOid: '2abc',
-              },
-            },
-          ],
+      ],
+    },
+    pr1: {
+      nodes: [
+        {
+          id: 'MDEx02',
+          title: '`README` updates',
+          number: 2,
+          url: 'https://github.com/ampproject/amphtml/pull/2',
+          author: {login: 'testauthor'},
+          mergeCommit: {
+            commitUrl: 'https://github.com/ampproject/amphtml/commit/2abcdef',
+            oid: '2abcdef',
+            abbreviatedOid: '2abc',
+          },
         },
-        pr2: {
-          nodes: [
-            {
-              id: 'MDEx03',
-              title: 'Update packages',
-              number: 3,
-              url: 'https://github.com/ampproject/amphtml/pull/3',
-              author: {login: 'renovate-bot'},
-              mergeCommit: {
-                commitUrl:
-                  'https://github.com/ampproject/amphtml/commit/3abcdef',
-                oid: '3abcdef',
-                abbreviatedOid: '3abc',
-              },
-            },
-          ],
+      ],
+    },
+    pr2: {
+      nodes: [
+        {
+          id: 'MDEx03',
+          title: 'Update packages',
+          number: 3,
+          url: 'https://github.com/ampproject/amphtml/pull/3',
+          author: {login: 'renovate-bot'},
+          mergeCommit: {
+            commitUrl: 'https://github.com/ampproject/amphtml/commit/3abcdef',
+            oid: '3abcdef',
+            abbreviatedOid: '3abc',
+          },
         },
-      },
-    })
-    .post(
-      '',
-      '{"query":"mutation {' +
-        'pr0: addLabelsToLabelable(input:{labelIds:\\"1\\", ' +
-        'labelableId:\\"MDEx01\\", clientMutationId:\\"MDEx01\\"})' +
-        '{clientMutationId} ' +
-        'pr1: addLabelsToLabelable(input:{labelIds:\\"1\\", ' +
-        'labelableId:\\"MDEx02\\", clientMutationId:\\"MDEx02\\"})' +
-        '{clientMutationId} ' +
-        'pr2: addLabelsToLabelable(input:{labelIds:\\"1\\", ' +
-        'labelableId:\\"MDEx03\\", clientMutationId:\\"MDEx03\\"})' +
-        '{clientMutationId}}"}'
-    )
-    .reply(200, {data: {}});
+      ],
+    },
+  });
+
+  await addLabels(
+    '2107280123000',
+    '2107210123000',
+    'stable',
+    t.context.octokitRest,
+    t.context.octokitGraphQl
+  );
 
-  await addLabels('2107280123000', '2107210123000', 'stable');
-  t.true(rest.isDone());
-  t.true(graphql.isDone());
+  t.true(
+    t.context.octokitGraphQl.calledWith({
+      query:
+        'query {pr0: search(query:"repo:ampproject/amphtml sha:1abcdef", type:ISSUE first:100){nodes { ... on PullRequest { id title number url author { login } files(first:100) { nodes { path }} mergeCommit { commitUrl oid abbreviatedOid }}}} pr1: search(query:"repo:ampproject/amphtml sha:2abcdef", type:ISSUE first:100){nodes { ... on PullRequest { id title number url author { login } files(first:100) { nodes { path }} mergeCommit { commitUrl oid abbreviatedOid }}}} pr2: search(query:"repo:ampproject/amphtml sha:3abcdef", type:ISSUE first:100){nodes { ... on PullRequest { id title number url author { login } files(first:100) { nodes { path }} mergeCommit { commitUrl oid abbreviatedOid }}}}}',
+    })
+  );
+  t.true(
+    t.context.octokitGraphQl.calledWith({
+      query:
+        'mutation {pr0: addLabelsToLabelable(input:{labelIds:"1", labelableId:"MDEx01", clientMutationId:"MDEx01"}){clientMutationId} pr1: addLabelsToLabelable(input:{labelIds:"1", labelableId:"MDEx02", clientMutationId:"MDEx02"}){clientMutationId} pr2: addLabelsToLabelable(input:{labelIds:"1", labelableId:"MDEx03", clientMutationId:"MDEx03"}){clientMutationId}}',
+    })
+  );
 });
 
 test('unlabel', async (t) => {
-  const rest = nock('https://api.github.com')
-    // https://docs.github.com/en/rest/reference/issues#get-a-label
-    .get(
-      '/repos/ampproject/amphtml/labels/PR%20Use%3A%20In%20Beta%20%2F%20Experimental'
-    )
-    .reply(200, {
+  t.context.octokitRest.rest.issues.getLabel.resolves({
+    data: {
       'node_id': 1,
+    },
+  });
+  t.context.octokitRest.rest.repos.getReleaseByTag
+    .onFirstCall()
+    .resolves({
+      data: {
+        id: 2,
+        'target_commitish': '3abcdef',
+      },
     })
-    // https://docs.github.com/en/rest/reference/repos#get-a-release-by-tag-name
-    .get('/repos/ampproject/amphtml/releases/tags/2107280123000')
-    .reply(200, {
-      id: 2,
-      'target_commitish': '3abcdef',
-    })
-    // https://docs.github.com/en/rest/reference/repos#get-a-release-by-tag-name
-    .get('/repos/ampproject/amphtml/releases/tags/2107210123000')
-    .reply(200, {
-      id: 1,
-      'target_commitish': '1abcdef',
-    })
-    // https://docs.github.com/en/rest/reference/repos#compare-two-commits
-    .get('/repos/ampproject/amphtml/compare/1abcdef...3abcdef')
-    .reply(200, {
-      commits: [{sha: '1abcdef'}, {sha: '2abcdef'}, {sha: '3abcdef'}],
+    .onSecondCall()
+    .resolves({
+      data: {
+        id: 1,
+        'target_commitish': '1abcdef',
+      },
     });
+  t.context.octokitRest.rest.repos.compareCommits.resolves({
+    data: {commits: [{sha: '1abcdef'}, {sha: '2abcdef'}, {sha: '3abcdef'}]},
+  });
 
-  const graphql = nock('https://api.github.com/graphql')
-    .post(
-      '',
-      '{"query":"query {' +
-        'pr0: search(query:\\"repo:ampproject/amphtml sha:1abcdef\\", ' +
-        'type:ISSUE first:100){nodes { ... on PullRequest { id title number ' +
-        'url author { login } files(first:100) { nodes { path }} mergeCommit ' +
-        '{ commitUrl oid abbreviatedOid }}}} ' +
-        'pr1: search(query:\\"repo:ampproject/amphtml sha:2abcdef\\", ' +
-        'type:ISSUE first:100){nodes { ... on PullRequest { id title number ' +
-        'url author { login } files(first:100) { nodes { path }} mergeCommit ' +
-        '{ commitUrl oid abbreviatedOid }}}} ' +
-        'pr2: search(query:\\"repo:ampproject/amphtml sha:3abcdef\\", ' +
-        'type:ISSUE first:100){nodes { ... on PullRequest { id title number ' +
-        'url author { login } files(first:100) { nodes { path }} mergeCommit ' +
-        '{ commitUrl oid abbreviatedOid }}}}}"}'
-    )
-    .reply(200, {
-      data: {
-        pr0: {
-          nodes: [
-            {
-              id: 'MDEx01',
-              title: 'Bunch of changes',
-              number: 1,
-              url: 'https://github.com/ampproject/amphtml/pull/1',
-              author: {login: 'testauthor'},
-              mergeCommit: {
-                commitUrl:
-                  'https://github.com/ampproject/amphtml/commit/1abcdef',
-                oid: '1abcdef',
-                abbreviatedOid: '1abc',
-              },
-            },
-          ],
+  t.context.octokitGraphQl.resolves({
+    pr0: {
+      nodes: [
+        {
+          id: 'MDEx01',
+          title: 'Bunch of changes',
+          number: 1,
+          url: 'https://github.com/ampproject/amphtml/pull/1',
+          author: {login: 'testauthor'},
+          mergeCommit: {
+            commitUrl: 'https://github.com/ampproject/amphtml/commit/1abcdef',
+            oid: '1abcdef',
+            abbreviatedOid: '1abc',
+          },
         },
-        pr1: {
-          nodes: [
-            {
-              id: 'MDEx02',
-              title: '`README` updates',
-              number: 2,
-              url: 'https://github.com/ampproject/amphtml/pull/2',
-              author: {login: 'testauthor'},
-              mergeCommit: {
-                commitUrl:
-                  'https://github.com/ampproject/amphtml/commit/2abcdef',
-                oid: '2abcdef',
-                abbreviatedOid: '2abc',
-              },
-            },
-          ],
+      ],
+    },
+    pr1: {
+      nodes: [
+        {
+          id: 'MDEx02',
+          title: '`README` updates',
+          number: 2,
+          url: 'https://github.com/ampproject/amphtml/pull/2',
+          author: {login: 'testauthor'},
+          mergeCommit: {
+            commitUrl: 'https://github.com/ampproject/amphtml/commit/2abcdef',
+            oid: '2abcdef',
+            abbreviatedOid: '2abc',
+          },
         },
-        pr2: {
-          nodes: [
-            {
-              id: 'MDEx03',
-              title: 'Update packages',
-              number: 3,
-              url: 'https://github.com/ampproject/amphtml/pull/3',
-              author: {login: 'renovate-bot'},
-              mergeCommit: {
-                commitUrl:
-                  'https://github.com/ampproject/amphtml/commit/3abcdef',
-                oid: '3abcdef',
-                abbreviatedOid: '3abc',
-              },
-            },
-          ],
+      ],
+    },
+    pr2: {
+      nodes: [
+        {
+          id: 'MDEx03',
+          title: 'Update packages',
+          number: 3,
+          url: 'https://github.com/ampproject/amphtml/pull/3',
+          author: {login: 'renovate-bot'},
+          mergeCommit: {
+            commitUrl: 'https://github.com/ampproject/amphtml/commit/3abcdef',
+            oid: '3abcdef',
+            abbreviatedOid: '3abc',
+          },
         },
-      },
-    })
-    .post(
-      '',
-      '{"query":"mutation {' +
-        'pr0: removeLabelsFromLabelable(input:{labelIds:\\"1\\", ' +
-        'labelableId:\\"MDEx01\\", clientMutationId:\\"MDEx01\\"})' +
-        '{clientMutationId} ' +
-        'pr1: removeLabelsFromLabelable(input:{labelIds:\\"1\\", ' +
-        'labelableId:\\"MDEx02\\", clientMutationId:\\"MDEx02\\"})' +
-        '{clientMutationId} ' +
-        'pr2: removeLabelsFromLabelable(input:{labelIds:\\"1\\", ' +
-        'labelableId:\\"MDEx03\\", clientMutationId:\\"MDEx03\\"})' +
-        '{clientMutationId}}"}'
-    )
-    .reply(200, {data: {}});
+      ],
+    },
+  });
 
-  await removeLabels('2107280123000', '2107210123000', 'beta-percent');
-  t.true(rest.isDone());
-  t.true(graphql.isDone());
+  await removeLabels(
+    '2107280123000',
+    '2107210123000',
+    'beta-percent',
+    t.context.octokitRest,
+    t.context.octokitGraphQl
+  );
+
+  t.true(
+    t.context.octokitGraphQl.calledWith({
+      query:
+        'query {pr0: search(query:"repo:ampproject/amphtml sha:1abcdef", type:ISSUE first:100){nodes { ... on PullRequest { id title number url author { login } files(first:100) { nodes { path }} mergeCommit { commitUrl oid abbreviatedOid }}}} pr1: search(query:"repo:ampproject/amphtml sha:2abcdef", type:ISSUE first:100){nodes { ... on PullRequest { id title number url author { login } files(first:100) { nodes { path }} mergeCommit { commitUrl oid abbreviatedOid }}}} pr2: search(query:"repo:ampproject/amphtml sha:3abcdef", type:ISSUE first:100){nodes { ... on PullRequest { id title number url author { login } files(first:100) { nodes { path }} mergeCommit { commitUrl oid abbreviatedOid }}}}}',
+    })
+  );
+  t.true(
+    t.context.octokitGraphQl.calledWith({
+      query:
+        'mutation {pr0: removeLabelsFromLabelable(input:{labelIds:"1", labelableId:"MDEx01", clientMutationId:"MDEx01"}){clientMutationId} pr1: removeLabelsFromLabelable(input:{labelIds:"1", labelableId:"MDEx02", clientMutationId:"MDEx02"}){clientMutationId} pr2: removeLabelsFromLabelable(input:{labelIds:"1", labelableId:"MDEx03", clientMutationId:"MDEx03"}){clientMutationId}}',
+    })
+  );
 });
diff --git a/build-system/release-tagger/test/make-release.test.js b/build-system/release-tagger/test/make-release.test.js
index 716623a4236a..ae7e93e3eda9 100644
--- a/build-system/release-tagger/test/make-release.test.js
+++ b/build-system/release-tagger/test/make-release.test.js
@@ -1,15 +1,140 @@
-const nock = require('nock');
 const test = require('ava');
-const {getExtensions} = require('../../npm-publish/utils');
+const sinon = require('sinon');
 const {makeRelease} = require('../make-release');
 
-test.before(() => nock.disableNetConnect());
-test.after(() => {
-  nock.cleanAll();
-  nock.enableNetConnect();
+test.beforeEach((t) => {
+  t.context.octokitRest = {
+    rest: {
+      git: {
+        createRef: sinon.stub(),
+        createTag: sinon.stub(),
+        getRef: sinon.stub(),
+      },
+      repos: {
+        createRelease: sinon.stub(),
+        compareCommits: sinon.stub(),
+      },
+    },
+    hook: {
+      error: sinon.stub(),
+    },
+  };
+  t.context.octokitGraphQl = sinon.stub();
 });
 
 test('create', async (t) => {
+  t.context.octokitRest.rest.git.getRef
+    .onFirstCall()
+    .resolves({
+      data: {
+        id: 2,
+        object: {sha: '3abcdef'},
+      },
+    })
+    .onSecondCall()
+    .resolves({
+      data: {
+        id: 1,
+        object: {sha: '1abcdef'},
+      },
+    });
+  t.context.octokitRest.rest.repos.createRelease.resolves({data: {}});
+  t.context.octokitRest.rest.repos.compareCommits.resolves({
+    data: {
+      commits: [{sha: '1abcdef'}, {sha: '2abcdef'}, {sha: '3abcdef'}],
+    },
+  });
+
+  t.context.octokitGraphQl.resolves({
+    pr0: {
+      nodes: [
+        {
+          id: 'MDExOlB1bGxSZXF1ZXN0Mjk4OTg2MDI4',
+          title: 'Bunch of changes',
+          number: 1,
+          url: 'https://github.com/ampproject/amphtml/pull/1',
+          author: {login: 'testauthor'},
+          files: {
+            nodes: [
+              {
+                'path': 'ads/readme.md',
+              },
+              {
+                'path': 'extensions/amp-test1/readme.md',
+              },
+              {
+                'path': 'src/readme.md',
+              },
+              {
+                'path': 'third_party/tasks/e2e/readme.md',
+              },
+              {
+                'path': 'validator/readme.md',
+              },
+            ],
+          },
+          mergeCommit: {
+            commitUrl: 'https://github.com/ampproject/amphtml/commit/1abcdef',
+            oid: '1abcdef',
+            abbreviatedOid: '1abc',
+          },
+        },
+      ],
+    },
+    pr1: {
+      nodes: [
+        {
+          id: 'MDExOlB1bGxSZXF1ZXN0MzAyMTU2MjIy',
+          title: '`README` updates',
+          number: 2,
+          url: 'https://github.com/ampproject/amphtml/pull/2',
+          author: {login: 'testauthor'},
+          files: {
+            nodes: [
+              {
+                'path': 'build-system/tasks/e2e/readme.md',
+              },
+              {
+                'path': 'third_party/tasks/e2e/readme.md',
+              },
+            ],
+          },
+          mergeCommit: {
+            commitUrl: 'https://github.com/ampproject/amphtml/commit/2abcdef',
+            oid: '2abcdef',
+            abbreviatedOid: '2abc',
+          },
+        },
+      ],
+    },
+    pr2: {
+      nodes: [
+        {
+          id: 'MDExOlB1bGxSZXF1ZXN0MzAyMTU4NDIw',
+          title: 'Update packages',
+          number: 3,
+          url: 'https://github.com/ampproject/amphtml/pull/3',
+          author: {login: 'renovate-bot'},
+          files: {
+            nodes: [
+              {
+                'path': 'extensions/amp-test1/readme.md',
+              },
+              {
+                'path': 'extensions/amp-test2/readme.md',
+              },
+            ],
+          },
+          mergeCommit: {
+            commitUrl: 'https://github.com/ampproject/amphtml/commit/3abcdef',
+            oid: '3abcdef',
+            abbreviatedOid: '3abc',
+          },
+        },
+      ],
+    },
+  });
+
   const pr1 =
     '<a href="https://github.com/ampproject/amphtml/commit/1abcdef">' +
     '<code>1abc</code></a> - Bunch of changes';
@@ -20,28 +145,19 @@ test('create', async (t) => {
     '<a href="https://github.com/ampproject/amphtml/commit/3abcdef">' +
     '<code>3abc</code></a> - Update packages';
 
-  const packages = getExtensions().map((e) => e.extension);
+  await makeRelease(
+    '2107280123000',
+    '2107210123000',
+    'beta-percent',
+    '1abcdef',
+    t.context.octokitRest,
+    t.context.octokitGraphQl
+  );
 
-  const rest = nock('https://api.github.com')
-    // https://docs.github.com/en/rest/reference/git#get-a-reference
-    .get('/repos/ampproject/amphtml/git/ref/tags%2F2107280123000')
-    .reply(200, {
-      id: 2,
-      object: {sha: '3abcdef'},
-    })
-    // https://docs.github.com/en/rest/reference/git#get-a-reference
-    .get('/repos/ampproject/amphtml/git/ref/tags%2F2107210123000')
-    .reply(200, {
-      id: 1,
-      object: {sha: '1abcdef'},
-    })
-    // https://docs.github.com/en/rest/reference/repos#compare-two-commits
-    .get('/repos/ampproject/amphtml/compare/1abcdef...3abcdef')
-    .reply(200, {
-      commits: [{sha: '1abcdef'}, {sha: '2abcdef'}, {sha: '3abcdef'}],
-    })
-    // https://docs.github.com/en/rest/reference/repos#create-a-release
-    .post('/repos/ampproject/amphtml/releases', {
+  t.true(
+    t.context.octokitRest.rest.repos.createRelease.calledWith({
+      owner: 'ampproject',
+      repo: 'amphtml',
       name: '2107280123000',
       'tag_name': '2107280123000',
       'target_commitish': '3abcdef',
@@ -51,8 +167,6 @@ test('create', async (t) => {
         '<a href="https://github.com/ampproject/amphtml/compare/' +
         '2107210123000...2107280123000">\n' +
         '<code>2107210123000...2107280123000</code>\n</a>\n</p>\n\n' +
-        '<h2>npm packages @ 1.2107280123.0</h2>\n\n\n' +
-        `<b>Packages not changed:</b> <i>${packages.join(', ')}</i>\n\n` +
         '<h2>Changes by component</h2>\n' +
         `<details><summary>ads (1)</summary>${pr1}</details>` +
         `<details><summary>amp-test1 (1)</summary>${pr1}</details>` +
@@ -62,152 +176,75 @@ test('create', async (t) => {
         `<details><summary>third_party (2)</summary>${pr1}<br />${pr2}</details>` +
         `<details><summary>validator (1)</summary>${pr1}</details>`,
     })
-    .reply(200, {});
+  );
+});
 
-  const graphql = nock('https://api.github.com/graphql')
-    .post(
-      '',
-      '{"query":"query {' +
-        'pr0: search(query:\\"repo:ampproject/amphtml sha:1abcdef\\", ' +
-        'type:ISSUE first:100){nodes { ... on PullRequest { id title number ' +
-        'url author { login } files(first:100) { nodes { path }} mergeCommit ' +
-        '{ commitUrl oid abbreviatedOid }}}} ' +
-        'pr1: search(query:\\"repo:ampproject/amphtml sha:2abcdef\\", ' +
-        'type:ISSUE first:100){nodes { ... on PullRequest { id title number ' +
-        'url author { login } files(first:100) { nodes { path }} mergeCommit ' +
-        '{ commitUrl oid abbreviatedOid }}}} ' +
-        'pr2: search(query:\\"repo:ampproject/amphtml sha:3abcdef\\", ' +
-        'type:ISSUE first:100){nodes { ... on PullRequest { id title number ' +
-        'url author { login } files(first:100) { nodes { path }} mergeCommit ' +
-        '{ commitUrl oid abbreviatedOid }}}}}"}'
-    )
-    .reply(200, {
+test('cherry-pick', async (t) => {
+  t.context.octokitRest.rest.git.getRef
+    .onFirstCall()
+    .resolves({
       data: {
-        pr0: {
-          nodes: [
-            {
-              id: 'MDExOlB1bGxSZXF1ZXN0Mjk4OTg2MDI4',
-              title: 'Bunch of changes',
-              number: 1,
-              url: 'https://github.com/ampproject/amphtml/pull/1',
-              author: {login: 'testauthor'},
-              files: {
-                nodes: [
-                  {
-                    'path': 'ads/readme.md',
-                  },
-                  {
-                    'path': 'extensions/amp-test1/readme.md',
-                  },
-                  {
-                    'path': 'src/readme.md',
-                  },
-                  {
-                    'path': 'third_party/tasks/e2e/readme.md',
-                  },
-                  {
-                    'path': 'validator/readme.md',
-                  },
-                ],
-              },
-              mergeCommit: {
-                commitUrl:
-                  'https://github.com/ampproject/amphtml/commit/1abcdef',
-                oid: '1abcdef',
-                abbreviatedOid: '1abc',
-              },
-            },
-          ],
-        },
-        pr1: {
-          nodes: [
-            {
-              id: 'MDExOlB1bGxSZXF1ZXN0MzAyMTU2MjIy',
-              title: '`README` updates',
-              number: 2,
-              url: 'https://github.com/ampproject/amphtml/pull/2',
-              author: {login: 'testauthor'},
-              files: {
-                nodes: [
-                  {
-                    'path': 'build-system/tasks/e2e/readme.md',
-                  },
-                  {
-                    'path': 'third_party/tasks/e2e/readme.md',
-                  },
-                ],
-              },
-              mergeCommit: {
-                commitUrl:
-                  'https://github.com/ampproject/amphtml/commit/2abcdef',
-                oid: '2abcdef',
-                abbreviatedOid: '2abc',
-              },
-            },
-          ],
-        },
-        pr2: {
-          nodes: [
-            {
-              id: 'MDExOlB1bGxSZXF1ZXN0MzAyMTU4NDIw',
-              title: 'Update packages',
-              number: 3,
-              url: 'https://github.com/ampproject/amphtml/pull/3',
-              author: {login: 'renovate-bot'},
-              files: {
-                nodes: [
-                  {
-                    'path': 'extensions/amp-test1/readme.md',
-                  },
-                  {
-                    'path': 'extensions/amp-test2/readme.md',
-                  },
-                ],
-              },
-              mergeCommit: {
-                commitUrl:
-                  'https://github.com/ampproject/amphtml/commit/3abcdef',
-                oid: '3abcdef',
-                abbreviatedOid: '3abc',
-              },
-            },
-          ],
-        },
+        id: 2,
+        object: {sha: '2abcdef'},
+      },
+    })
+    .onSecondCall()
+    .resolves({
+      data: {
+        id: 1,
+        object: {sha: '1abcdef'},
       },
     });
+  t.context.octokitRest.rest.repos.createRelease.resolves({data: {}});
+  t.context.octokitRest.rest.repos.compareCommits.resolves({
+    data: {
+      commits: [{sha: '2abcdef'}],
+    },
+  });
 
-  await makeRelease('2107280123000', '2107210123000', 'beta-percent');
-  t.true(rest.isDone());
-  t.true(graphql.isDone());
-});
+  t.context.octokitGraphQl.resolves({
+    pr0: {
+      nodes: [
+        {
+          id: 'MDExOlB1bGxSZXF1ZXN0Mjk4OTg2MDI4',
+          title: 'Cherry pick fix',
+          number: 2,
+          url: 'https://github.com/ampproject/amphtml/pull/2',
+          author: {login: 'testauthor'},
+          files: {
+            nodes: [
+              {
+                'path': 'src/readme.md',
+              },
+            ],
+          },
+          mergeCommit: {
+            commitUrl: 'https://github.com/ampproject/amphtml/commit/2abcdef',
+            oid: '2abcdef',
+            abbreviatedOid: '2abc',
+          },
+        },
+      ],
+    },
+  });
 
-test('cherry-pick', async (t) => {
   const pr1 =
     '<a href="https://github.com/ampproject/amphtml/commit/2abcdef">' +
     '<code>2abc</code></a> - Cherry pick fix';
 
-  const packages = getExtensions().map((e) => e.extension);
+  await makeRelease(
+    '2107280123001',
+    '2107210123000',
+    'stable',
+    '',
+    t.context.octokitRest,
+    t.context.octokitGraphQl
+  );
 
-  const rest = nock('https://api.github.com')
-    // https://docs.github.com/en/rest/reference/git#get-a-reference
-    .get('/repos/ampproject/amphtml/git/ref/tags%2F2107280123001')
-    .reply(200, {
-      id: 2,
-      object: {sha: '2abcdef'},
-    })
-    // https://docs.github.com/en/rest/reference/git#get-a-reference
-    .get('/repos/ampproject/amphtml/git/ref/tags%2F2107210123000')
-    .reply(200, {
-      id: 1,
-      object: {sha: '1abcdef'},
-    })
-    // https://docs.github.com/en/rest/reference/repos#compare-two-commits
-    .get('/repos/ampproject/amphtml/compare/1abcdef...2abcdef')
-    .reply(200, {
-      commits: [{sha: '2abcdef'}],
-    })
-    // https://docs.github.com/en/rest/reference/repos#create-a-release
-    .post('/repos/ampproject/amphtml/releases', {
+  t.true(
+    t.context.octokitRest.rest.repos.createRelease.calledWith({
+      owner: 'ampproject',
+      repo: 'amphtml',
       name: '2107280123001',
       'tag_name': '2107280123001',
       'target_commitish': '2abcdef',
@@ -222,8 +259,6 @@ test('cherry-pick', async (t) => {
         '<a href="https://github.com/ampproject/amphtml/compare/' +
         '2107210123000...2107280123001">\n' +
         '<code>2107210123000...2107280123001</code>\n</a>\n</p>\n\n' +
-        '<h2>npm packages @ 1.2107280123.1</h2>\n\n\n' +
-        `<b>Packages not changed:</b> <i>${packages.join(', ')}</i>\n\n` +
         '<h2>Changes by component</h2>\n' +
         '<details><summary>ads (0)</summary></details>' +
         '<details><summary>build-system (0)</summary></details>' +
@@ -232,47 +267,5 @@ test('cherry-pick', async (t) => {
         '<details><summary>third_party (0)</summary></details>' +
         '<details><summary>validator (0)</summary></details>',
     })
-    .reply(200, {});
-
-  const graphql = nock('https://api.github.com/graphql')
-    .post(
-      '',
-      '{"query":"query {' +
-        'pr0: search(query:\\"repo:ampproject/amphtml sha:2abcdef\\", ' +
-        'type:ISSUE first:100){nodes { ... on PullRequest { id title number ' +
-        'url author { login } files(first:100) { nodes { path }} mergeCommit ' +
-        '{ commitUrl oid abbreviatedOid }}}}}"}'
-    )
-    .reply(200, {
-      data: {
-        pr0: {
-          nodes: [
-            {
-              id: 'MDExOlB1bGxSZXF1ZXN0Mjk4OTg2MDI4',
-              title: 'Cherry pick fix',
-              number: 2,
-              url: 'https://github.com/ampproject/amphtml/pull/2',
-              author: {login: 'testauthor'},
-              files: {
-                nodes: [
-                  {
-                    'path': 'src/readme.md',
-                  },
-                ],
-              },
-              mergeCommit: {
-                commitUrl:
-                  'https://github.com/ampproject/amphtml/commit/2abcdef',
-                oid: '2abcdef',
-                abbreviatedOid: '2abc',
-              },
-            },
-          ],
-        },
-      },
-    });
-
-  await makeRelease('2107280123001', '2107210123000', 'stable');
-  t.true(rest.isDone());
-  t.true(graphql.isDone());
+  );
 });
diff --git a/build-system/release-tagger/test/update-issue-tracker.test.js b/build-system/release-tagger/test/update-issue-tracker.test.js
deleted file mode 100644
index b433e217b773..000000000000
--- a/build-system/release-tagger/test/update-issue-tracker.test.js
+++ /dev/null
@@ -1,229 +0,0 @@
-const nock = require('nock');
-const test = require('ava');
-const {createOrUpdateTracker} = require('../update-issue-tracker');
-
-test.before(() => nock.disableNetConnect());
-test.after(() => {
-  nock.cleanAll();
-  nock.enableNetConnect();
-});
-
-test('create', async (t) => {
-  const graphql = nock('https://api.github.com/graphql')
-    .post(
-      '',
-      '{"query":"query {' +
-        'search(query:\\"repo:ampproject/amphtml ' +
-        'in:title Release 2109080123000\\", type: ISSUE, first: 1) ' +
-        '{ nodes { ... on Issue { number title body url }}}}"}'
-    )
-    .reply(200, {data: {search: {}}});
-
-  const rest = nock('https://api.github.com')
-    // https://docs.github.com/en/rest/reference/issues#create-an-issue
-    .post('/repos/ampproject/amphtml/issues', {
-      title: '🚄 Release 2109080123000',
-      labels: ['Type: Release'],
-      body:
-        '### AMP Version\n\n[2109080123000]' +
-        '(https://github.com/ampproject/amphtml/releases/tag/2109080123000)\n\n' +
-        '### Promotions\n\n' +
-        '- [x] <!-- amp-version=2109080123000 channel=beta-opt-in -->' +
-        '2109080123000 promoted to Experimental and Beta (opt-in) channels (9/15/2021, 12:34:56 AM PT)\n' +
-        '- [ ] <!-- amp-version=2109080123000 channel=beta-percent -->' +
-        '2109080123000 promoted to Experimental and Beta (1% traffic) channels <!-- promote-time -->\n' +
-        '- [ ] <!-- amp-version=2109080123000 channel=stable -->' +
-        '2109080123000 promoted to Stable channel <!-- promote-time -->\n' +
-        '- [ ] <!-- amp-version=2109080123000 channel=lts -->' +
-        '2109080123000 promoted to LTS channel <!-- promote-time -->\n\n' +
-        '/cc @ampproject/release-on-duty',
-    })
-    .reply(201);
-
-  await createOrUpdateTracker(
-    '2109080123000',
-    '2109010123000',
-    'beta-opt-in',
-    '9/15/2021, 12:34:56 AM PT'
-  );
-  t.true(graphql.isDone());
-  t.true(rest.isDone());
-});
-
-test('mark task complete', async (t) => {
-  const graphql = nock('https://api.github.com/graphql')
-    .post(
-      '',
-      '{"query":"query {' +
-        'search(query:\\"repo:ampproject/amphtml ' +
-        'in:title Release 2109080123000\\", type: ISSUE, first: 1) ' +
-        '{ nodes { ... on Issue { number title body url }}}}"}'
-    )
-    .reply(200, {
-      data: {
-        search: {
-          nodes: [
-            {
-              number: 1,
-              title: '🚄 Release 2109080123000',
-              body:
-                '### AMP Version\n\n[2109080123000]' +
-                '(https://github.com/ampproject/amphtml/releases/tag/2109080123000)\n\n' +
-                '### Promotions\n\n' +
-                '- [x] <!-- amp-version=2109080123000 channel=beta-opt-in -->' +
-                '2109080123000 promoted to Experimental and Beta (opt-in) channels (optintime)\n' +
-                '- [x] <!-- amp-version=2109080123000 channel=beta-percent -->' +
-                '2109080123000 promoted to Experimental and Beta (1% traffic) channels (percenttime)\n' +
-                '- [ ] <!-- amp-version=2109080123000 channel=stable -->' +
-                '2109080123000 promoted to Stable channel <!-- promote-time -->\n' +
-                '- [ ] <!-- amp-version=2109080123000 channel=lts -->' +
-                '2109080123000 promoted to LTS channel <!-- promote-time -->\n\n' +
-                '/cc @ampproject/release-on-duty',
-            },
-          ],
-        },
-      },
-    })
-    .post(
-      '',
-      '{"query":"query {' +
-        'search(query:\\"repo:ampproject/amphtml ' +
-        'in:title Release 2109010123000\\", type: ISSUE, first: 1) ' +
-        '{ nodes { ... on Issue { number title body url }}}}"}'
-    )
-    .reply(200, {
-      data: {
-        search: {
-          nodes: [
-            {
-              number: 2,
-              title: '🚄 Release 2109010123000',
-              body: 'base body',
-            },
-          ],
-        },
-      },
-    });
-
-  const rest = nock('https://api.github.com')
-    // https://docs.github.com/en/rest/reference/issues#update-an-issue
-    .patch('/repos/ampproject/amphtml/issues/1', {
-      title: '🚄 Release 2109080123000',
-      body:
-        '### AMP Version\n\n[2109080123000]' +
-        '(https://github.com/ampproject/amphtml/releases/tag/2109080123000)\n\n' +
-        '### Promotions\n\n' +
-        '- [x] <!-- amp-version=2109080123000 channel=beta-opt-in -->' +
-        '2109080123000 promoted to Experimental and Beta (opt-in) channels (optintime)\n' +
-        '- [x] <!-- amp-version=2109080123000 channel=beta-percent -->' +
-        '2109080123000 promoted to Experimental and Beta (1% traffic) channels (percenttime)\n' +
-        '- [x] <!-- amp-version=2109080123000 channel=stable -->' +
-        '2109080123000 promoted to Stable channel (9/15/2021, 12:34:56 AM PT)\n' +
-        '- [ ] <!-- amp-version=2109080123000 channel=lts -->' +
-        '2109080123000 promoted to LTS channel <!-- promote-time -->\n\n' +
-        '/cc @ampproject/release-on-duty',
-      state: 'open',
-    })
-    .reply(200)
-    // https://docs.github.com/en/rest/reference/issues#update-an-issue
-    .patch('/repos/ampproject/amphtml/issues/2', {
-      title: '🚄 Release 2109010123000',
-      body: 'base body',
-      state: 'closed',
-    })
-    .reply(200);
-
-  await createOrUpdateTracker(
-    '2109080123000',
-    '2109010123000',
-    'stable',
-    '9/15/2021, 12:34:56 AM PT'
-  );
-  t.true(graphql.isDone());
-  t.true(rest.isDone());
-});
-
-test('add cherrypick tasks', async (t) => {
-  const graphql = nock('https://api.github.com/graphql')
-    .post(
-      '',
-      '{"query":"query {' +
-        'search(query:\\"repo:ampproject/amphtml ' +
-        'in:title Release 2109080123002\\", type: ISSUE, first: 1) ' +
-        '{ nodes { ... on Issue { number title body url }}}}"}'
-    )
-    .reply(200, {data: {search: {}}})
-    .post(
-      '',
-      '{"query":"query {' +
-        'search(query:\\"repo:ampproject/amphtml ' +
-        'in:title Release 2109080123001\\", type: ISSUE, first: 1) ' +
-        '{ nodes { ... on Issue { number title body url }}}}"}'
-    )
-    .reply(200, {data: {search: {}}})
-    .post(
-      '',
-      '{"query":"query {' +
-        'search(query:\\"repo:ampproject/amphtml ' +
-        'in:title Release 2109080123000\\", type: ISSUE, first: 1) ' +
-        '{ nodes { ... on Issue { number title body url }}}}"}'
-    )
-    .reply(200, {
-      data: {
-        search: {
-          nodes: [
-            {
-              number: 1,
-              title: '🚄 Release 2109080123000',
-              body:
-                '### AMP Version\n\n[2109080123000]' +
-                '(https://github.com/ampproject/amphtml/releases/tag/2109080123000)\n\n' +
-                '### Promotions\n\n' +
-                '- [x] <!-- amp-version=2109080123000 channel=beta-opt-in -->' +
-                '2109080123000 promoted to Experimental and Beta (opt-in) channels (optintime)\n' +
-                '- [x] <!-- amp-version=2109080123000 channel=beta-percent -->' +
-                '2109080123000 promoted to Experimental and Beta (1% traffic) channels (percenttime)\n' +
-                '- [x] <!-- amp-version=2109080123000 channel=stable -->' +
-                '2109080123000 promoted to Stable channel (stabletime)\n' +
-                '- [ ] <!-- amp-version=2109080123000 channel=lts -->' +
-                '2109080123000 promoted to LTS channel <!-- promote-time -->\n\n' +
-                '/cc @ampproject/release-on-duty',
-            },
-          ],
-        },
-      },
-    });
-
-  const rest = nock('https://api.github.com')
-    // https://docs.github.com/en/rest/reference/issues#update-an-issue
-    .patch('/repos/ampproject/amphtml/issues/1', {
-      title: '🚄 Release 2109080123002',
-      body:
-        '### AMP Version\n\n[2109080123002]' +
-        '(https://github.com/ampproject/amphtml/releases/tag/2109080123002)\n\n' +
-        '### Promotions\n\n' +
-        '- [x] <!-- amp-version=2109080123000 channel=beta-opt-in -->' +
-        '2109080123000 promoted to Experimental and Beta (opt-in) channels (optintime)\n' +
-        '- [x] <!-- amp-version=2109080123000 channel=beta-percent -->' +
-        '2109080123000 promoted to Experimental and Beta (1% traffic) channels (percenttime)\n' +
-        '- [x] <!-- amp-version=2109080123000 channel=stable -->' +
-        '2109080123000 promoted to Stable channel (stabletime)\n' +
-        '🌸 2109080123000 was cherry-picked to create 2109080123002\n' +
-        '- [x] <!-- amp-version=2109080123002 channel=stable -->' +
-        '2109080123002 promoted to Stable channel (9/15/2021, 12:34:56 AM PT)\n' +
-        '- [ ] <!-- amp-version=2109080123002 channel=lts -->' +
-        '2109080123002 promoted to LTS channel <!-- promote-time -->\n\n' +
-        '/cc @ampproject/release-on-duty',
-      state: 'open',
-    })
-    .reply(200);
-
-  await createOrUpdateTracker(
-    '2109080123002',
-    '2109080123000',
-    'stable',
-    '9/15/2021, 12:34:56 AM PT'
-  );
-  t.true(graphql.isDone());
-  t.true(rest.isDone());
-});
diff --git a/build-system/release-tagger/test/update-release.test.js b/build-system/release-tagger/test/update-release.test.js
index 78a1bdc0e1c7..e9f7cad2ffb0 100644
--- a/build-system/release-tagger/test/update-release.test.js
+++ b/build-system/release-tagger/test/update-release.test.js
@@ -1,43 +1,65 @@
-const nock = require('nock');
 const test = require('ava');
+const sinon = require('sinon');
 const {publishRelease, rollbackRelease} = require('../update-release');
 
-test.before(() => nock.disableNetConnect());
-test.after(() => {
-  nock.cleanAll();
-  nock.enableNetConnect();
+test.beforeEach((t) => {
+  t.context.octokitRest = {
+    rest: {
+      repos: {
+        getReleaseByTag: sinon.stub(),
+        updateRelease: sinon.stub(),
+      },
+    },
+    hook: {
+      error: sinon.stub(),
+    },
+  };
+
+  t.context.octokitGraphQl = sinon.stub();
 });
 
 test('publish', async (t) => {
-  const scope = nock('https://api.github.com')
-    // https://docs.github.com/en/rest/reference/repos#get-a-release-by-tag-name
-    .get('/repos/ampproject/amphtml/releases/tags/2107210123000')
-    .reply(200, {id: 1})
-
-    // https://docs.github.com/en/rest/reference/repos#update-a-release
-    .patch('/repos/ampproject/amphtml/releases/1', {prerelease: false})
-    .reply(200, {id: 1});
+  t.context.octokitRest.rest.repos.getReleaseByTag.resolves({data: {id: 1}});
+  t.context.octokitRest.rest.repos.updateRelease.resolves({data: {id: 1}});
 
-  await publishRelease('2107210123000');
-  t.true(scope.isDone());
+  await publishRelease(
+    '2107210123000',
+    true,
+    t.context.octokitRest,
+    t.context.octokitGraphQl
+  );
+  t.true(
+    t.context.octokitRest.rest.repos.updateRelease.calledWith({
+      owner: 'ampproject',
+      repo: 'amphtml',
+      'release_id': 1,
+      prerelease: false,
+      'make_latest': true,
+    })
+  );
 });
 
 test('rollback', async (t) => {
-  const scope = nock('https://api.github.com')
-    // https://docs.github.com/en/rest/reference/repos#get-a-release-by-tag-name
-    .get('/repos/ampproject/amphtml/releases/tags/2107210123000')
-    .reply(200, {
+  t.context.octokitRest.rest.repos.getReleaseByTag.resolves({
+    data: {
       id: 1,
       body: 'This is a test release body',
-    })
+    },
+  });
+  t.context.octokitRest.rest.repos.updateRelease.resolves({data: {id: 1}});
 
-    // https://docs.github.com/en/rest/reference/repos#update-a-release
-    .patch('/repos/ampproject/amphtml/releases/1', {
+  await rollbackRelease(
+    '2107210123000',
+    t.context.octokitRest,
+    t.context.octokitGraphQl
+  );
+  t.true(
+    t.context.octokitRest.rest.repos.updateRelease.calledOnceWith({
+      owner: 'ampproject',
+      repo: 'amphtml',
+      'release_id': 1,
       prerelease: true,
       body: '#### :back: This release was rolled back.\nThis is a test release body',
     })
-    .reply(200, {id: 1});
-
-  await rollbackRelease('2107210123000');
-  t.true(scope.isDone());
+  );
 });
diff --git a/build-system/release-tagger/update-issue-tracker.js b/build-system/release-tagger/update-issue-tracker.js
deleted file mode 100644
index ade0fbf5e635..000000000000
--- a/build-system/release-tagger/update-issue-tracker.js
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * @fileoverview
- * Create or update release issue tracker
- */
-
-const dedent = require('dedent');
-const {createIssue, getIssue, updateIssue} = require('./utils');
-const {cyan, magenta} = require('kleur/colors');
-const {log} = require('../common/logging');
-
-const CHANNEL_NAMES = {
-  'beta-opt-in': 'Experimental and Beta (opt-in) channels',
-  'beta-percent': 'Experimental and Beta (1% traffic) channels',
-  'stable': 'Stable channel',
-  'lts': 'LTS channel',
-};
-
-class IssueTracker {
-  footer = '/cc @ampproject/release-on-duty';
-  label = 'Type: Release';
-  /**
-   * @param {string} head
-   * @param {string} base
-   * @param {string?} body
-   * @param {string?} number
-   */
-  constructor(head, base, body = '', number = '') {
-    this.head = head;
-    this.base = base;
-    this.number = number ? Number(number) : -1;
-    this.title = `🚄 Release ${this.head}`;
-    this.header = `### AMP Version\n\n\[${this.head}](https://github.com/ampproject/amphtml/releases/tag/${this.head})`;
-    if (!body) {
-      // create task list
-      this.main = dedent`### Promotions\n\n\
-      ${Object.keys(CHANNEL_NAMES)
-        .map((channel) => this._createTask(channel, this.head))
-        .join('\n')}`;
-    } else {
-      // get existing task list
-      this.main = body.substring(
-        body.indexOf('### Promotions'),
-        body.indexOf('\n\n/cc')
-      );
-    }
-  }
-
-  /**
-   * @param {string} channel
-   * @param {string} tag
-   * @return {string}
-   */
-  _createTask(channel, tag) {
-    return `- [ ] <!-- amp-version=${tag} channel=${channel} -->${tag} promoted to ${CHANNEL_NAMES[channel]} <!-- promote-time -->`;
-  }
-
-  /** @param {string} channel */
-  addCherrypickTasks(channel) {
-    // keep completed tasks
-    const lines = this.main.split(/Promotions/)[1].split('\n');
-    const keep = [];
-    for (const line of lines) {
-      if (line.startsWith('- [x]') || line.startsWith('🌸')) {
-        keep.push(line);
-      }
-    }
-
-    // add tasks for new release starting with given channel
-    const keys = Object.keys(CHANNEL_NAMES);
-    const add = [];
-    let index = keys.indexOf(channel);
-    while (index < keys.length) {
-      add.push(this._createTask(keys[index], this.head));
-      index++;
-    }
-
-    // regenerate main section
-    this.main = dedent`### Promotions\n\n\
-    ${keep.join('\n')}
-    🌸 ${this.base} was cherry-picked to create ${this.head}
-    ${add.join('\n')}`;
-  }
-
-  /**
-   * @param {string} channel
-   * @param {string} time
-   */
-  checkTask(channel, time) {
-    const task = this._createTask(channel, this.head);
-    const [before, after] = this.main.split(task);
-    const checked = task
-      .replace('[ ]', '[x]')
-      .replace('<!-- promote-time -->', `(${time})`);
-    this.main = `${before}${checked}${after}`;
-  }
-}
-
-/**
- * Get issue if it exists and whether it's a cherrypick
- * @param {string} head
- * @return {!Promise}
- */
-async function setup(head) {
-  let issue = await getIssue(`Release ${head}`);
-  if (issue || head.endsWith('000')) {
-    return {isCherrypick: false, issue};
-  }
-
-  // is cherrypick, so find base issue tracker
-  let version = Number(head);
-  while (version % 1000 !== 0) {
-    version--;
-    issue = await getIssue(`Release ${version}`);
-    if (issue) {
-      break;
-    }
-  }
-  return {isCherrypick: true, issue};
-}
-
-/**
- * Create or update issue tracker
- * @param {string} head
- * @param {string} base
- * @param {string} channel
- * @param {string} time
- * @return {Promise<void>}
- */
-async function createOrUpdateTracker(head, base, channel, time) {
-  const {isCherrypick, issue} = await setup(head);
-
-  // create new tracker
-  if (!issue) {
-    const tracker = new IssueTracker(head, base);
-    tracker.checkTask(channel, time);
-    const {footer, header, label, main, title} = tracker;
-    const body = `${header}\n\n${main}\n\n${footer}`;
-    const newIssue = await createIssue(body, label, title);
-    log(
-      'Created issue tracker',
-      magenta(newIssue.title),
-      'at',
-      cyan(newIssue['html_url'])
-    );
-    return;
-  }
-
-  // check task
-  log('Found issue tracker', magenta(issue.title), 'at', cyan(issue.url));
-  const tracker = new IssueTracker(head, base, issue.body, issue.number);
-  if (isCherrypick) {
-    tracker.addCherrypickTasks(channel);
-  }
-  tracker.checkTask(channel, time);
-  const {footer, header, main, number, title} = tracker;
-  const body = `${header}\n\n${main}\n\n${footer}`;
-  await updateIssue(body, number, title);
-
-  // if stable, close last stable's tracker
-  if (channel == 'stable' && !isCherrypick) {
-    const old = await getIssue(`Release ${base}`);
-    if (old) {
-      await updateIssue(old.body, old.number, old.title, 'closed');
-    }
-  }
-}
-
-module.exports = {createOrUpdateTracker};
diff --git a/build-system/release-tagger/update-release.js b/build-system/release-tagger/update-release.js
index 51e3f678876a..32920e228c5c 100644
--- a/build-system/release-tagger/update-release.js
+++ b/build-system/release-tagger/update-release.js
@@ -3,29 +3,45 @@
  * Update release for the release tagger.
  */
 
-const {getRelease, updateRelease} = require('./utils');
+const {GitHubApi} = require('./utils');
 
 /**
  * Publish a GitHub release
  * @param {string} tag
+ * @param {boolean} latest
+ * @param {Object|undefined} octokitRest
+ * @param {Object|undefined} octokitGraphQl
  * @return {Promise<Object>}
  */
-async function publishRelease(tag) {
-  const release = await getRelease(tag);
-  const changes = {prerelease: false};
-  return await updateRelease(release.id, changes);
+async function publishRelease(
+  tag,
+  latest,
+  octokitRest = undefined,
+  octokitGraphQl = undefined
+) {
+  const api = new GitHubApi(octokitRest, octokitGraphQl);
+  const release = await api.getRelease(tag);
+  const changes = {prerelease: false, 'make_latest': latest};
+  return await api.updateRelease(release.id, changes);
 }
 
 /**
  * Roll back a GitHub release
  * @param {string} tag
+ * @param {Object|undefined} octokitRest
+ * @param {Object|undefined} octokitGraphQl
  * @return {Promise<Object>}
  */
-async function rollbackRelease(tag) {
-  const release = await getRelease(tag);
+async function rollbackRelease(
+  tag,
+  octokitRest = undefined,
+  octokitGraphQl = undefined
+) {
+  const api = new GitHubApi(octokitRest, octokitGraphQl);
+  const release = await api.getRelease(tag);
   const body = '#### :back: This release was rolled back.\n' + release.body;
   const changes = {prerelease: true, body};
-  return await updateRelease(release.id, changes);
+  return await api.updateRelease(release.id, changes);
 }
 
 module.exports = {publishRelease, rollbackRelease};
diff --git a/build-system/release-tagger/utils.js b/build-system/release-tagger/utils.js
index 681e0d3f18c0..c5c86c94bcd9 100644
--- a/build-system/release-tagger/utils.js
+++ b/build-system/release-tagger/utils.js
@@ -3,316 +3,317 @@
  * GitHub API util functions.
  */
 
-const dedent = require('dedent');
-const {GraphQlQueryResponseData, graphql} = require('@octokit/graphql'); //eslint-disable-line no-unused-vars
+const {default: dedent} = require('dedent');
+const {graphql} = require('@octokit/graphql');
 const {Octokit} = require('@octokit/rest');
 
-// setup
-const octokit = new Octokit({
-  auth: process.env.GITHUB_TOKEN,
-  userAgent: 'amp release tagger',
-  timeZone: 'America/Los_Angeles',
-});
-octokit.hook.error('request', (error) => {
-  // don't throw an error if resource is not found
-  if (error.status === 404) {
-    return;
-  }
-});
-
-const graphqlWithAuth = graphql.defaults({
-  headers: {
-    authorization: `token ${process.env.GITHUB_TOKEN}`,
-  },
-});
-const owner = 'ampproject';
-const repo = 'amphtml';
-
-const config = {
-  singleNodeQueryLimit: 100,
-  totalNodeQueryLimit: 500000,
-  batchSize: 20,
-};
+/** @typedef {import('@octokit/graphql').GraphQlQueryResponseData} GraphQlQueryResponseData */
 
 /**
- * Queries the GitHub GraphQL API in batches.
- * @param {string} queryType
- * @param {Array<string>} queries
- * @return {Promise<Array<GraphQlQueryResponseData>>}
+ * GitHub API util functions
  */
-async function _runQueryInBatches(queryType, queries) {
-  const responses = [];
-  for (let i = 0; i < queries.length; i += config.batchSize) {
-    const join = queries
-      .slice(i, i + Math.min(queries.length, config.batchSize))
-      .join(' ');
-    const query = `${queryType} {${join}}`;
-    const data = await graphqlWithAuth({query});
-    responses.push(...Object.values(data));
+class GitHubApi {
+  /**
+   * @param {object} octokitRest
+   * @param {object} octokitGraphQl
+   */
+  constructor(octokitRest, octokitGraphQl) {
+    this.octokit = octokitRest
+      ? octokitRest
+      : new Octokit({
+          auth: process.env.GITHUB_TOKEN,
+          userAgent: 'amp release tagger',
+          timeZone: 'America/Los_Angeles',
+        });
+    this.octokit.hook.error('request', (error) => {
+      // don't throw an error if resource is not found
+      if (error.status === 404) {
+        return;
+      }
+    });
+
+    this.graphqlWithAuth = octokitGraphQl
+      ? octokitGraphQl
+      : graphql.defaults({
+          headers: {
+            authorization: `token ${process.env.GITHUB_TOKEN}`,
+          },
+        });
+
+    this.info = {owner: 'ampproject', repo: 'amphtml'};
+    this.config = {
+      singleNodeQueryLimit: 100,
+      totalNodeQueryLimit: 500000,
+      batchSize: 5,
+    };
   }
-  return responses;
-}
 
-/**
- * Create a GitHub issue
- * @param {string} body
- * @param {string} label
- * @param {string} title
- * @return {Promise<Object>}
- */
-async function createIssue(body, label, title) {
-  const {data} = await octokit.rest.issues.create({
-    owner,
-    repo,
-    title,
-    body,
-    labels: [label],
-  });
-  return data;
-}
+  /**
+   * Queries the GitHub GraphQL API in batches.
+   * @param {string} queryType
+   * @param {Array<string>} queries
+   * @return {Promise<Array<GraphQlQueryResponseData>>}
+   */
+  async runQueryInBatches(queryType, queries) {
+    const responses = [];
+    for (let i = 0; i < queries.length; i += this.config.batchSize) {
+      const join = queries
+        .slice(i, i + Math.min(queries.length, this.config.batchSize))
+        .join(' ');
+      const query = `${queryType} {${join}}`;
+      const data = await this.graphqlWithAuth({query});
+      responses.push(...Object.values(data));
+    }
+    return responses;
+  }
 
-/**
- * Create a GitHub release
- * @param {string} tag
- * @param {string} commit
- * @param {string} body
- * @param {boolean} prerelease
- * @return {Promise<Object>}
- */
-async function createRelease(tag, commit, body, prerelease) {
-  const {data} = await octokit.rest.repos.createRelease({
-    owner,
-    repo,
-    name: tag,
-    'tag_name': tag,
-    'target_commitish': commit,
-    body,
-    prerelease,
-  });
-  return data;
-}
+  /**
+   * Create a GitHub issue
+   * @param {string} body
+   * @param {string} label
+   * @param {string} title
+   * @return {Promise<Object>}
+   */
+  async createIssue(body, label, title) {
+    const {data} = await this.octokit.rest.issues.create({
+      ...this.info,
+      title,
+      body,
+      labels: [label],
+    });
+    return data;
+  }
 
-/**
- * Get a GitHub issue by title
- * @param {string} title
- * @return {Promise<GraphQlQueryResponseData|undefined>}
- */
-async function getIssue(title) {
-  const search = dedent`\
-    search(query:"repo:${owner}/${repo} in:title ${title}", \
-    type: ISSUE, first: 1) { nodes { ... on Issue \
-    { number title body url }}}`;
-  const query = `query {${search}}`;
-  const response = await graphqlWithAuth({query});
-  if (response.search?.nodes) {
-    return response.search.nodes[0];
+  /**
+   * Create a GitHub release
+   * @param {string} tag
+   * @param {string} commit
+   * @param {string} body
+   * @param {boolean} prerelease
+   * @return {Promise<Object>}
+   */
+  async createRelease(tag, commit, body, prerelease) {
+    const {data} = await this.octokit.rest.repos.createRelease({
+      ...this.info,
+      name: tag,
+      'tag_name': tag,
+      'target_commitish': commit,
+      body,
+      prerelease,
+    });
+    return data;
   }
-}
 
-/**
- * Get a GitHub release by tag name
- * @param {string} tag
- * @return {Promise<Object|undefined>}
- */
-async function getRelease(tag) {
-  const response = await octokit.rest.repos.getReleaseByTag({owner, repo, tag});
-  return response?.data;
-}
+  /**
+   * Get a GitHub issue by title
+   * @param {string} title
+   * @return {Promise<GraphQlQueryResponseData|undefined>}
+   */
+  async getIssue(title) {
+    const search = dedent`\
+      search(query:"repo:${this.info.owner}/${this.info.repo} in:title ${title}", \
+      type: ISSUE, first: 1) { nodes { ... on Issue \
+      { number title body url }}}`;
+    const query = `query {${search}}`;
+    const response = await this.graphqlWithAuth({query});
+    if (response.search?.nodes) {
+      return response.search.nodes[0];
+    }
+  }
 
-/**
- * Update a GitHub issue
- * @param {string} body
- * @param {number} number
- * @param {string} title
- * @param {'open' | 'closed'} state
- * @return {Promise<Object>}
- */
-async function updateIssue(body, number, title, state = 'open') {
-  const {data} = await octokit.rest.issues.update({
-    owner,
-    repo,
-    'issue_number': number,
-    title,
-    body,
-    state,
-  });
-  return data;
-}
+  /**
+   * Get a GitHub release by tag name
+   * @param {string} tag
+   * @return {Promise<Object|undefined>}
+   */
+  async getRelease(tag) {
+    const response = await this.octokit.rest.repos.getReleaseByTag({
+      ...this.info,
+      tag,
+    });
+    return response?.data;
+  }
 
-/**
- * Update a GitHub release
- * @param {string} id
- * @param {Object} changes
- * @return {Promise<Object>}
- */
-async function updateRelease(id, changes) {
-  const {data} = await octokit.rest.repos.updateRelease({
-    owner,
-    repo,
-    'release_id': id,
-    ...changes,
-  });
-  return data;
-}
+  /**
+   * Update a GitHub issue
+   * @param {string} body
+   * @param {number} number
+   * @param {string} title
+   * @param {'open' | 'closed'} state
+   * @return {Promise<Object>}
+   */
+  async updateIssue(body, number, title, state = 'open') {
+    const {data} = await this.octokit.rest.issues.update({
+      ...this.info,
+      'issue_number': number,
+      title,
+      body,
+      state,
+    });
+    return data;
+  }
 
-/**
- * Get a list of commits between two commits
- * @param {string} head
- * @param {string} base
- * @return {Promise<Object|undefined>}
- */
-async function compareCommits(head, base) {
-  const response = await octokit.rest.repos.compareCommits({
-    owner,
-    repo,
-    base,
-    head,
-  });
-  return response?.data;
-}
+  /**
+   * Update a GitHub release
+   * @param {string} id
+   * @param {object} changes
+   * @return {Promise<Object>}
+   */
+  async updateRelease(id, changes) {
+    const {data} = await this.octokit.rest.repos.updateRelease({
+      ...this.info,
+      'release_id': id,
+      ...changes,
+    });
+    return data;
+  }
 
-/**
- * Get pull requests associated with a list of commits
- * @param {Array<string>} shas
- * @return {Promise<Array<GraphQlQueryResponseData>>}
- */
-async function getPullRequests(shas) {
-  const queries = [];
-  for (const [i, sha] of shas.entries()) {
-    queries.push(
-      dedent`\
-      pr${i}: search(query:"repo:${owner}/${repo} sha:${sha}", type:ISSUE \
-      first:${config.singleNodeQueryLimit}){\
-      nodes { ... on PullRequest { id title number url author { login } \
-      files(first:${config.singleNodeQueryLimit}) { nodes { path }} \
-      mergeCommit { commitUrl oid abbreviatedOid }}}}`
-    );
+  /**
+   * Get a list of commits between two commits
+   * @param {string} head
+   * @param {string} base
+   * @return {Promise<Object>}
+   */
+  async compareCommits(head, base) {
+    const {data} = await this.octokit.rest.repos.compareCommits({
+      ...this.info,
+      base,
+      head,
+    });
+    return data;
   }
-  const nodesLists = await _runQueryInBatches('query', queries);
 
-  // Only return pull requests with the merge commit shas
-  const prs = [];
-  for (const nodesList of nodesLists) {
-    for (const node of nodesList.nodes) {
-      if (node.mergeCommit && shas.includes(node.mergeCommit.oid)) {
-        prs.push(node);
+  /**
+   * Get pull requests associated with a list of commits
+   * @param {Array<string>} shas
+   * @return {Promise<Array<GraphQlQueryResponseData>>}
+   */
+  async getPullRequests(shas) {
+    const queries = [];
+    for (const [i, sha] of shas.entries()) {
+      queries.push(
+        dedent`\
+        pr${i}: search(query:"repo:${this.info.owner}/${this.info.repo} sha:${sha}", type:ISSUE \
+        first:${this.config.singleNodeQueryLimit}){\
+        nodes { ... on PullRequest { id title number url author { login } \
+        files(first:${this.config.singleNodeQueryLimit}) { nodes { path }} \
+        mergeCommit { commitUrl oid abbreviatedOid }}}}`
+      );
+    }
+    const nodesLists = await this.runQueryInBatches('query', queries);
+
+    // Only return pull requests with the merge commit shas
+    const prs = [];
+    for (const nodesList of nodesLists) {
+      for (const node of nodesList.nodes) {
+        if (node.mergeCommit && shas.includes(node.mergeCommit.oid)) {
+          prs.push(node);
+        }
       }
     }
+    return prs;
   }
-  return prs;
-}
 
-/**
- * Get pull requests between two commits
- * @param {string} head
- * @param {string} base
- * @return {Promise<Array<GraphQlQueryResponseData>>}
- */
-async function getPullRequestsBetweenCommits(head, base) {
-  const {commits} = await compareCommits(head, base);
-  const shas = commits.map((commit) => commit.sha);
-  return await getPullRequests(shas);
-}
+  /**
+   * Get pull requests between two commits
+   * @param {string} head
+   * @param {string} base
+   * @return {Promise<Array<GraphQlQueryResponseData>>}
+   */
+  async getPullRequestsBetweenCommits(head, base) {
+    const {commits} = await this.compareCommits(head, base);
+    const shas = commits.map((commit) => commit.sha);
+    return this.getPullRequests(shas);
+  }
 
-/**
- * Get label
- * @param {string} name
- * @return {Promise<Object|undefined>}
- */
-async function getLabel(name) {
-  const response = await octokit.rest.issues.getLabel({owner, repo, name});
-  return response?.data;
-}
+  /**
+   * Get label
+   * @param {string} name
+   * @return {Promise<Object|undefined>}
+   */
+  async getLabel(name) {
+    const response = await this.octokit.rest.issues.getLabel({
+      ...this.info,
+      name,
+    });
+    return response?.data;
+  }
 
-/**
- * Label pull requests
- * @param {Array<Object>} prs
- * @param {string} labelId
- * @return {Promise<Array<GraphQlQueryResponseData>>}
- */
-async function labelPullRequests(prs, labelId) {
-  const mutations = [];
-  for (const [i, pr] of prs.entries()) {
-    mutations.push(
-      dedent`\
-      pr${i}: addLabelsToLabelable(input:{labelIds:"${labelId}", \
-      labelableId:"${pr.id}", clientMutationId:"${pr.id}"})\
-      {clientMutationId}`
-    );
+  /**
+   * Label pull requests
+   * @param {Array<Object>} prs
+   * @param {string} labelId
+   * @return {Promise<Array<GraphQlQueryResponseData>>}
+   */
+  async labelPullRequests(prs, labelId) {
+    const mutations = [];
+    for (const [i, pr] of prs.entries()) {
+      mutations.push(
+        dedent`\
+        pr${i}: addLabelsToLabelable(input:{labelIds:"${labelId}", \
+        labelableId:"${pr.id}", clientMutationId:"${pr.id}"})\
+        {clientMutationId}`
+      );
+    }
+    return await this.runQueryInBatches('mutation', mutations);
   }
-  return await _runQueryInBatches('mutation', mutations);
-}
 
-/**
- * Unlabel pull requests
- * @param {Array<Object>} prs
- * @param {string} labelId
- * @return {Promise<Array<GraphQlQueryResponseData>>}
- */
-async function unlabelPullRequests(prs, labelId) {
-  const mutations = [];
-  for (const [i, pr] of prs.entries()) {
-    mutations.push(
-      dedent`\
-      pr${i}: removeLabelsFromLabelable(input:{labelIds:"${labelId}", \
-      labelableId:"${pr.id}", clientMutationId:"${pr.id}"})\
-      {clientMutationId}`
-    );
+  /**
+   * Unlabel pull requests
+   * @param {Array<Object>} prs
+   * @param {string} labelId
+   * @return {Promise<Array<GraphQlQueryResponseData>>}
+   */
+  async unlabelPullRequests(prs, labelId) {
+    const mutations = [];
+    for (const [i, pr] of prs.entries()) {
+      mutations.push(
+        dedent`\
+        pr${i}: removeLabelsFromLabelable(input:{labelIds:"${labelId}", \
+        labelableId:"${pr.id}", clientMutationId:"${pr.id}"})\
+        {clientMutationId}`
+      );
+    }
+    return await this.runQueryInBatches('mutation', mutations);
   }
-  return await _runQueryInBatches('mutation', mutations);
-}
 
-/**
- * Get a git ref
- * @param {string} tag
- * @return {Promise<Object|undefined>}
- */
-async function getRef(tag) {
-  const response = await octokit.rest.git.getRef({
-    owner,
-    repo,
-    ref: `tags/${tag}`,
-  });
-  return response?.data;
-}
+  /**
+   * Get a git ref
+   * @param {string} tag
+   * @return {Promise<Object|undefined>}
+   */
+  async getRef(tag) {
+    const response = await this.octokit.rest.git.getRef({
+      ...this.info,
+      ref: `tags/${tag}`,
+    });
 
-/**
- * Create git tag and ref
- * @param {string} tag
- * @param {string} sha
- * @return {Promise<Object|undefined>}
- */
-async function createTag(tag, sha) {
-  await octokit.rest.git.createTag({
-    owner,
-    repo,
-    tag,
-    message: tag,
-    object: sha,
-    type: 'commit',
-  });
+    return response?.data;
+  }
 
-  // once a tag object is created, create a reference
-  const response = await octokit.rest.git.createRef({
-    owner,
-    repo,
-    ref: `refs/tags/${tag}`,
-    sha,
-  });
-  return response?.data;
+  /**
+   * Create git tag and ref
+   * @param {string} tag
+   * @param {string} sha
+   * @return {Promise<Object>}
+   */
+  async createTag(tag, sha) {
+    await this.octokit.rest.git.createTag({
+      ...this.info,
+      tag,
+      message: tag,
+      object: sha,
+      type: 'commit',
+    });
+
+    // once a tag object is created, create a reference
+    const {data} = await this.octokit.rest.git.createRef({
+      ...this.info,
+      ref: `refs/tags/${tag}`,
+      sha,
+    });
+    return data;
+  }
 }
 
-module.exports = {
-  createIssue,
-  createRelease,
-  createTag,
-  getLabel,
-  getIssue,
-  getPullRequestsBetweenCommits,
-  getRelease,
-  labelPullRequests,
-  unlabelPullRequests,
-  updateIssue,
-  updateRelease,
-  getRef,
-};
+module.exports = {GitHubApi};
diff --git a/build-system/release-workflows/build-release.js b/build-system/release-workflows/build-release.js
index d18b00176a2d..c948cfab93e0 100644
--- a/build-system/release-workflows/build-release.js
+++ b/build-system/release-workflows/build-release.js
@@ -12,6 +12,14 @@ const jobName = 'build-release.js';
 
 runReleaseJob(jobName, async () => {
   const {ESM, FLAVOR} = process.env;
+
+  // TODO(danielrozenberg): remove temporary custom-config when ampjs.org
+  // becomes the default runtime CDN.
+  fs.writeJsonSync('build-system/global-configs/custom-config.json', {
+    'cdnUrl': 'https://ampjs.org',
+    'cdnProxyRegex': '^https:\\/\\/ampjs\\.org$',
+  });
+
   timedExecOrThrow(`amp release --flavor=${FLAVOR} --${ESM} --dedup_v0`);
   fs.ensureDirSync(`/tmp/workspace/releases/${FLAVOR}/${ESM}`);
   fs.copySync('release/', `/tmp/workspace/releases/${FLAVOR}/${ESM}`);
diff --git a/build-system/release-workflows/cut-nightly.js b/build-system/release-workflows/cut-nightly.js
index ef1bc57d0adc..ab83d421ce31 100644
--- a/build-system/release-workflows/cut-nightly.js
+++ b/build-system/release-workflows/cut-nightly.js
@@ -4,19 +4,43 @@
  * @fileoverview Script that cuts a nightly branch.
  */
 
-const {cyan, green, red} = require('kleur/colors');
+const {cyan, green, red, yellow} = require('kleur/colors');
 const {getVersion} = require('../compile/internal-version');
 const {log} = require('../common/logging');
 const {Octokit} = require('@octokit/rest');
+const {RequestError} = require('@octokit/request-error');
+
 const params = {owner: 'ampproject', repo: 'amphtml'};
 
 // Permanent external ID as assigned by the GitHub Actions runner.
 const GITHUB_EXTERNAL_ID = 'be30aa50-41df-5bf3-2e88-b5215679ea95';
 
+const CHECKS_TO_SKIP = [
+  'Cut Nightly Branch',
+  'create-issue-on-error',
+  'status-page',
+];
+
+/**
+ * Get the current nightly branch's commit SHA.
+ *
+ * @param {Octokit} octokit
+ * @return {Promise<string>}
+ */
+async function getCurrentNightly(octokit) {
+  const {data} = await octokit.rest.git.getRef({
+    ...params,
+    ref: 'heads/nightly',
+  });
+  return data.object.sha;
+}
+
 /**
- * Get last green commit
+ * Get the SHA of the last green commit from the main branch.
+ *
  * @param {Octokit} octokit
- * @return {Promise<string|undefined>}
+ * @return {Promise<string>}
+ * @throws {Error} if a green commit was not found in the last 100 main commits.
  */
 async function getCommit(octokit) {
   const commits = await octokit.rest.repos.listCommits({
@@ -32,17 +56,18 @@ async function getCommit(octokit) {
   );
 
   for (const {sha} of commits.data) {
-    const {'check_runs': checkRuns} = (
-      await octokit.rest.checks.listForRef({
+    const checkRuns = (
+      await octokit.paginate(octokit.rest.checks.listForRef, {
         ...params,
         ref: sha,
+        'per_page': 100,
       })
-    ).data;
-    if (
-      checkRuns
-        .filter(({'external_id': id}) => id !== GITHUB_EXTERNAL_ID)
-        .some(({status}) => status != 'completed')
-    ) {
+    ).filter(
+      ({'external_id': id, name}) =>
+        id !== GITHUB_EXTERNAL_ID && !CHECKS_TO_SKIP.includes(name)
+    );
+
+    if (checkRuns.some(({status}) => status != 'completed')) {
       log(
         'Not all check runs for commit',
         cyan(sha),
@@ -72,99 +97,84 @@ async function getCommit(octokit) {
 
     return sha;
   }
+
+  throw new Error(
+    'Failed to cut nightly. Could not find a green commit in the last 100 commits'
+  );
 }
 
 /**
- * Fast forward nightly branch to given sha
+ * Fast forward nightly branch to given SHA.
+ *
  * @param {Octokit} octokit
  * @param {string} sha
  * @return {Promise<void>}
  */
 async function updateBranch(octokit, sha) {
-  const response = await octokit.rest.git.updateRef({
-    ...params,
-    ref: 'heads/nightly',
-    sha,
-  });
-
-  // Casting to Number because the return type in Octokit is incorrectly
-  // annotated to only ever return 200.
-  switch (Number(response.status)) {
-    case 201:
-      log(
-        'A new',
-        cyan('nightly'),
-        'branch was successfully cut at commit',
-        cyan(sha)
-      );
-      break;
-    case 200:
-      log(
-        'The',
-        cyan('nightly'),
-        'branch is already at the latest',
-        green('green'),
-        'commit',
-        cyan(sha)
-      );
-      break;
-    default:
-      log(
-        red(
-          'An uncaught status was returned while attempting to fast-forward the'
-        ),
-        cyan('nightly'),
-        red('branch to commit'),
-        cyan(sha)
-      );
-      log('See full response:', response);
+  try {
+    await octokit.rest.git.updateRef({
+      ...params,
+      ref: 'heads/nightly',
+      sha,
+    });
+    log(
+      'A new',
+      cyan('nightly'),
+      'branch was successfully cut at commit',
+      cyan(sha)
+    );
+  } catch (e) {
+    log(
+      red(
+        'An uncaught status was returned while attempting to fast-forward the'
+      ),
+      cyan('nightly'),
+      red('branch to commit'),
+      cyan(sha)
+    );
+    log('See full error:', e);
   }
 }
 
 /**
- * Create GitHub tag
+ * Create GitHub tag.
+ *
  * @param {Octokit} octokit
  * @param {string} sha
+ * @param {string} ampVersion
  * @return {Promise<void>}
  */
-async function createTag(octokit, sha) {
-  const ampVersion = getVersion(sha);
-
-  await octokit.rest.git.createTag({
-    ...params,
-    tag: ampVersion,
-    message: ampVersion,
-    object: sha,
-    type: 'commit',
-  });
-
-  // once a tag object is created, create a reference
-  const response = await octokit.rest.git.createRef({
-    ...params,
-    ref: `refs/tags/${ampVersion}`,
-    sha,
-  });
+async function createTag(octokit, sha, ampVersion) {
+  try {
+    await octokit.rest.git.createTag({
+      ...params,
+      tag: ampVersion,
+      message: ampVersion,
+      object: sha,
+      type: 'commit',
+    });
+
+    // once a tag object is created, create a reference.
+    await octokit.rest.git.createRef({
+      ...params,
+      ref: `refs/tags/${ampVersion}`,
+      sha,
+    });
 
-  switch (Number(response.status)) {
-    case 201:
-      log(
-        'A new tag',
-        cyan(ampVersion),
-        'was successfully created at commit',
-        cyan(sha)
-      );
-      break;
-    case 422:
+    log(
+      'A new tag',
+      cyan(ampVersion),
+      'was successfully created at commit',
+      cyan(sha)
+    );
+  } catch (e) {
+    if (e instanceof RequestError && e.status === 422) {
       log('The tag', cyan(ampVersion), 'already exists at', cyan(sha));
-      break;
-    default:
-      log(
-        red('An uncaught status was returned while attempting to create a tag'),
-        cyan(ampVersion),
-        red('for commit'),
-        cyan(sha)
+    } else {
+      throw new Error(
+        `An unaught status returned while attempting to create a tag\n${e}`
       );
-      log('See full response:', response);
+    }
   }
 }
 
@@ -184,19 +194,27 @@ async function cutNightlyBranch() {
     throw error;
   });
 
-  const sha = await getCommit(octokit);
-  if (!sha) {
-    throw new Error(
-      'Failed to cut nightly. Could not find a green commit in the last 100 commits'
+  const currentSha = await getCurrentNightly(octokit);
+  const newSha = await getCommit(octokit);
+  if (newSha === currentSha) {
+    log(
+      yellow('There are no new'),
+      green('green'),
+      yellow('commits in the'),
+      cyan('main'),
+      yellow('branch to be cut into'),
+      cyan('nightly')
     );
+    return;
   }
 
-  await Promise.all([
-    await updateBranch(octokit, sha),
-    await createTag(octokit, sha),
-  ]);
+  const ampVersion = getVersion(newSha);
+
+  await updateBranch(octokit, newSha);
+  await createTag(octokit, newSha, ampVersion);
 
-  log('Successfully cut nightly');
+  log(green('Successfully cut the'), cyan('nightly'), green('branch'));
+  log('It was fast-forwarded from', cyan(currentSha), 'to', cyan(newSha));
 }
 
 cutNightlyBranch();
diff --git a/build-system/release-workflows/trigger-promote.js b/build-system/release-workflows/trigger-promote.js
new file mode 100644
index 000000000000..79ed1d31967f
--- /dev/null
+++ b/build-system/release-workflows/trigger-promote.js
@@ -0,0 +1,46 @@
+'use strict';
+
+/**
+ * @fileoverview
+ * Triggers the promote workflow on ampproject/cdn-configuration
+ */
+
+const {readFileSync} = require('fs');
+const {Octokit} = require('@octokit/rest');
+const {runReleaseJob} = require('./release-job');
+
+const jobName = 'trigger-promote.js';
+
+const cdnConfigurationParams = {
+  owner: 'ampproject',
+  repo: 'cdn-configuration',
+  'workflow_id':
+    process.env.CIRCLE_BRANCH == 'nightly'
+      ? 'promote-nightly.yml'
+      : 'promote-cherry-picks.yml',
+  ref: 'main',
+};
+
+/**
+ * Trigger promote workflow
+ * @return {Promise}
+ */
+async function trigger_() {
+  const ampVersion = readFileSync('/tmp/restored-workspace/AMP_VERSION', 'utf8')
+    .toString()
+    .trim();
+
+  const octokit = new Octokit({auth: process.env.GITHUB_TOKEN});
+  const inputs = {
+    'amp-version': ampVersion,
+    'auto-merge': 'true',
+  };
+  await octokit.rest.actions.createWorkflowDispatch({
+    ...cdnConfigurationParams,
+    inputs,
+  });
+}
+
+runReleaseJob(jobName, async () => {
+  await trigger_();
+});
diff --git a/build-system/release-workflows/upload-release.js b/build-system/release-workflows/upload-release.js
index 56bca0d59a65..555f6a263ffa 100644
--- a/build-system/release-workflows/upload-release.js
+++ b/build-system/release-workflows/upload-release.js
@@ -4,11 +4,12 @@ const fastGlob = require('fast-glob');
 const fs = require('fs-extra');
 const klaw = require('klaw');
 const path = require('path');
-const {bgWhite, cyan} = require('kleur/colors');
+const {cyan} = require('kleur/colors');
 const {log} = require('../common/logging');
 const {runReleaseJob} = require('./release-job');
-const {Storage} = require('@google-cloud/storage');
+const {S3} = require('@aws-sdk/client-s3');
 const {timedExecOrDie} = require('../pr-check/utils');
+const zlib = require('zlib');
 
 /**
  * @fileoverview Script that uploads a release build.
@@ -75,20 +76,20 @@ function mergeFilesTxt_(flavor) {
 let printProgressReady = true;
 
 /**
- * Logs file upload progress every 1 second.
+ * Logs file processing progress every 1 second.
  *
  * @param {number} totalFiles
- * @param {number} uploadedFiles
+ * @param {number} processedFiles
  */
-function logProgress_(totalFiles, uploadedFiles) {
-  const percentage = Math.round((uploadedFiles / totalFiles) * PROGRESS_WIDTH);
-  if (printProgressReady || uploadedFiles === totalFiles) {
+function logProgress_(totalFiles, processedFiles) {
+  const percentage = Math.round((processedFiles / totalFiles) * PROGRESS_WIDTH);
+  if (printProgressReady || processedFiles === totalFiles) {
     log(
       '[' +
-        bgWhite(' '.repeat(percentage)) +
+        '#'.repeat(percentage) +
         '.'.repeat(PROGRESS_WIDTH - percentage) +
         ']',
-      cyan(uploadedFiles),
+      cyan(processedFiles),
       '/',
       cyan(totalFiles)
     );
@@ -101,30 +102,98 @@ function logProgress_(totalFiles, uploadedFiles) {
 }
 
 /**
- * Uploads release files to Google Cloud Storage.
+ * Compresses a single file with Brotli and writes it to ${path}.br.
+ * @param {string} path
+ * @param {number} sizeHint
  * @return {Promise<void>}
  */
-async function uploadFiles_() {
-  const {GCLOUD_SERVICE_KEY} = process.env;
-  if (!GCLOUD_SERVICE_KEY) {
-    throw new Error(
-      'CircleCI job is missing the GCLOUD_SERVICE_KEY env variable'
-    );
+async function brotliCompressFile_(path, sizeHint) {
+  const readStream = fs.createReadStream(path);
+  const writeStream = fs.createWriteStream(`${path}.br`);
+  const brotli = zlib.createBrotliCompress({
+    params: {
+      [zlib.constants.BROTLI_PARAM_QUALITY]: zlib.constants.BROTLI_MAX_QUALITY,
+      [zlib.constants.BROTLI_PARAM_SIZE_HINT]: sizeHint,
+    },
+  });
+
+  return new Promise((resolve, reject) => {
+    readStream
+      .pipe(brotli)
+      .pipe(writeStream)
+      .on('finish', resolve)
+      .on('error', reject);
+  });
+}
+
+/**
+ * Compresses all files with Brotli.
+ * @return {Promise<void>}
+ */
+async function brotliCompressAll_() {
+  let totalFiles = 0;
+  for await (const {stats} of klaw(DEST_DIR)) {
+    if (stats.isFile()) {
+      totalFiles++;
+    }
   }
 
-  const credentials = JSON.parse(GCLOUD_SERVICE_KEY);
-  if (
-    !credentials.client_email ||
-    !credentials.private_key ||
-    !credentials.project_id
-  ) {
-    throw new Error(
-      'GCLOUD_SERVICE_KEY is not a Google Cloud JSON service key'
+  log('Brotli compression of', cyan(totalFiles), 'files:');
+  const compressPromises = [];
+  let compressedFiles = 0;
+  for await (const {path, stats} of klaw(DEST_DIR)) {
+    if (!stats.isFile()) {
+      continue;
+    }
+
+    compressPromises.push(
+      brotliCompressFile_(path, stats.size).then(() => {
+        logProgress_(totalFiles, ++compressedFiles);
+      })
     );
   }
 
-  const storage = new Storage({credentials, projectId: credentials.project_id});
-  const bucket = storage.bucket('org-cdn');
+  await Promise.all(compressPromises);
+  log('Finished Brotli compression of all files.');
+}
+
+/**
+ * Ensures the presence of env variables or throws an error.
+ * @param  {...string} vars
+ * @return {string[]}
+ */
+function ensureEnvVariable_(...vars) {
+  const ret = [];
+  for (const v of vars) {
+    const value = process.env[v];
+    if (!value) {
+      throw new Error(`CircleCI job is missing the ${v} env variable`);
+    }
+    ret.push(value);
+  }
+  return ret;
+}
+
+/**
+ * Uploads release files to Cloudflare R2.
+ * @return {Promise<void>}
+ */
+async function uploadFiles_() {
+  const [accountId, accessKeyId, secretAccessKey] = ensureEnvVariable_(
+    'R2_ACCOUNT_ID',
+    'R2_ACCESS_KEY_ID',
+    'R2_SECRET_ACCESS_KEY'
+  );
+
+  const s3 = new S3({
+    region: 'auto',
+    endpoint: `https://${accountId}.r2.cloudflarestorage.com`,
+    credentials: {
+      accessKeyId,
+      secretAccessKey,
+    },
+    maxAttempts: 7,
+  });
 
   let totalFiles = 0;
   for await (const {stats} of klaw(DEST_DIR)) {
@@ -133,18 +202,22 @@ async function uploadFiles_() {
     }
   }
 
-  log('Uploading', cyan(totalFiles), 'files to storage:');
+  log('Uploading', cyan(totalFiles), 'files to R2:');
   const uploadsPromises = [];
   let uploadedFiles = 0;
   for await (const {path, stats} of klaw(DEST_DIR)) {
-    if (stats.isFile()) {
-      const destination = path.slice(DEST_DIR.length + 1);
-      uploadsPromises.push(
-        bucket.upload(path, {destination, resumable: false}).then(() => {
+    if (!stats.isFile()) {
+      continue;
+    }
+
+    const key = path.slice(DEST_DIR.length + 1);
+    uploadsPromises.push(
+      s3
+        .putObject({Bucket: 'ampjs', Key: key, Body: fs.createReadStream(path)})
+        .then(() => {
           logProgress_(totalFiles, ++uploadedFiles);
         })
-      );
-    }
+    );
   }
 
   await Promise.all(uploadsPromises);
@@ -159,8 +232,15 @@ runReleaseJob(jobName, async () => {
     mergeFilesTxt_(flavor);
   }
 
+  await brotliCompressAll_();
   await uploadFiles_();
 
   log('Archiving releases to', cyan(ARTIFACT_FILE_NAME));
   timedExecOrDie(`cd ${DEST_DIR} && tar -czf ${ARTIFACT_FILE_NAME} *`);
+
+  log('Persisting AMP version number to workspace');
+  const [versionsFile] = fastGlob.sync(
+    path.join(DEST_DIR, 'org-cdn/rtv/01*/version.txt')
+  );
+  fs.copySync(versionsFile, '/tmp/workspace/AMP_VERSION');
 });
diff --git a/build-system/server/OWNERS b/build-system/server/OWNERS
index 1cebb95e96e9..69a88bfe0386 100644
--- a/build-system/server/OWNERS
+++ b/build-system/server/OWNERS
@@ -6,9 +6,5 @@
     {
       owners: [{name: 'ampproject/wg-infra'}],
     },
-    {
-      pattern: 'lazy-build.js',
-      owners: [{name: 'rsimha', notify: true}],
-    },
   ],
 }
diff --git a/build-system/server/app-index/amphtml-helpers.js b/build-system/server/app-index/amphtml-helpers.js
index b077099466c3..2da24f848334 100644
--- a/build-system/server/app-index/amphtml-helpers.js
+++ b/build-system/server/app-index/amphtml-helpers.js
@@ -16,14 +16,13 @@ const containsByRegex = (str, re) => str.search(re) > -1;
 // TODO(alanorozco): Expand
 const formTypes = ['input', 'select', 'form'];
 
-const ExtensionScript = ({isTemplate, name, version}) =>
-  html`
-    <script
-      async
-      ${isTemplate ? 'custom-template' : 'custom-element'}="${name}"
-      src="https://cdn.ampproject.org/v0/${name}-${version || '0.1'}.js"
-    ></script>
-  `;
+const ExtensionScript = ({isTemplate, name, version}) => html`
+  <script
+    async
+    ${isTemplate ? 'custom-template' : 'custom-element'}="${name}"
+    src="https://cdn.ampproject.org/v0/${name}-${version || '0.1'}.js"
+  ></script>
+`;
 
 const AmpState = (id, state) => html`
   <amp-state id="${id}">
@@ -48,7 +47,7 @@ const ampStateKey = (...keys) => keys.join('.');
 const AmpDoc = ({body, canonical, css, head}) => {
   assert(canonical);
   return html`
-    <!DOCTYPE html>
+    <!doctype html>
     <html ⚡ lang="en">
       <head>
         <title>AMP Dev Server</title>
diff --git a/build-system/server/app-index/file-list.js b/build-system/server/app-index/file-list.js
index fb47d5f73af3..d81b03914550 100644
--- a/build-system/server/app-index/file-list.js
+++ b/build-system/server/app-index/file-list.js
@@ -14,18 +14,17 @@ const linksToExample = (shouldContainBasepath, opt_name) =>
  * @param {{ name: string, href: string, boundHref?: string|undefined }} config
  * @return {string}
  */
-const FileListItem = ({boundHref, href, name}) =>
-  html`
-    <div class="file-link-container" role="listitem">
-      <a
-        class="file-link"
-        ${boundHref ? `[href]="${boundHref}" ` : ''}
-        ${href ? `href="${href}" ` : ''}
-      >
-        ${name}
-      </a>
-    </div>
-  `;
+const FileListItem = ({boundHref, href, name}) => html`
+  <div class="file-link-container" role="listitem">
+    <a
+      class="file-link"
+      ${boundHref ? `[href]="${boundHref}" ` : ''}
+      ${href ? `href="${href}" ` : ''}
+    >
+      ${name}
+    </a>
+  </div>
+`;
 
 const FileListItemBound = ({href, htmlEnvelopePrefix, name}) =>
   linksToExample(href)
@@ -53,21 +52,20 @@ const FileListHeading = ({basepath}) => html`
   </div>
 `;
 
-const FileList = ({basepath, fileSet, htmlEnvelopePrefix}) =>
-  html`
-    <div class="file-list">
-      ${FileListHeading({basepath})}
-      <div role="list">
-        ${joinFragments(fileSet, (name) =>
-          FileListItemBound({
-            name,
-            href: maybePrefixExampleDocHref(basepath, name, htmlEnvelopePrefix),
-            htmlEnvelopePrefix,
-          })
-        )}
-      </div>
+const FileList = ({basepath, fileSet, htmlEnvelopePrefix}) => html`
+  <div class="file-list">
+    ${FileListHeading({basepath})}
+    <div role="list">
+      ${joinFragments(fileSet, (name) =>
+        FileListItemBound({
+          name,
+          href: maybePrefixExampleDocHref(basepath, name, htmlEnvelopePrefix),
+          htmlEnvelopePrefix,
+        })
+      )}
     </div>
-  `;
+  </div>
+`;
 
 module.exports = {
   FileList,
diff --git a/build-system/server/app-index/settings.js b/build-system/server/app-index/settings.js
index 49bd33dae212..efd94f356e14 100644
--- a/build-system/server/app-index/settings.js
+++ b/build-system/server/app-index/settings.js
@@ -32,22 +32,21 @@ const panelStateKey = 'panel';
 const htmlEnvelopePrefixKey = ampStateKey(stateId, htmlEnvelopePrefixStateKey);
 const panelKey = ampStateKey(stateId, panelStateKey);
 
-const PanelSelectorButton = ({expression, type, value}) =>
-  html`
-    <button
-      class="settings-panel-button"
-      [class]="'settings-panel-button' + (${panelKey} != '${type}' ? '' : ' open')"
-      data-type="${type}"
-      tabindex="0"
-      on="tap: AMP.setState({
+const PanelSelectorButton = ({expression, type, value}) => html`
+  <button
+    class="settings-panel-button"
+    [class]="'settings-panel-button' + (${panelKey} != '${type}' ? '' : ' open')"
+    data-type="${type}"
+    tabindex="0"
+    on="tap: AMP.setState({
         ${stateId}: {
           ${panelStateKey}: (${panelKey} != '${type}' ? '${type}' : null),
         }
       })"
-    >
-      <span>${type}</span> <strong [text]="${expression}">${value}</strong>
-    </button>
-  `;
+  >
+    <span>${type}</span> <strong [text]="${expression}">${value}</strong>
+  </button>
+`;
 
 /**
  * @param {{
diff --git a/build-system/server/app-index/template.js b/build-system/server/app-index/template.js
index 35c88550d759..3d3d74f5aa29 100644
--- a/build-system/server/app-index/template.js
+++ b/build-system/server/app-index/template.js
@@ -27,12 +27,11 @@ const ampLogoSvg = html`<svg
   </g>
 </svg>`;
 
-const TopLevelWrap = (content) =>
-  html`
-    <div style="border-bottom: 1px solid #ddd">
-      <div class="wrap">${content}</div>
-    </div>
-  `;
+const TopLevelWrap = (content) => html`
+  <div style="border-bottom: 1px solid #ddd">
+    <div class="wrap">${content}</div>
+  </div>
+`;
 
 const Header = ({htmlEnvelopePrefix, jsMode, links}) => html`
   <header>
@@ -68,8 +67,8 @@ function renderTemplate(opt_params = {}) {
     basepath = '/',
     css,
     fileSet = [],
-    serveMode = 'default',
     htmlEnvelopePrefix = '/',
+    serveMode = 'default',
   } = opt_params;
 
   const body = joinFragments([
@@ -82,7 +81,7 @@ function renderTemplate(opt_params = {}) {
     html`
       <div class="center">
         Built with 💙 by
-        <a href="https://ampproject.org" class="underlined">the AMP Project</a>.
+        <a href="https://amp.dev" class="underlined">the AMP Project</a>.
       </div>
     `,
   ]);
diff --git a/build-system/server/app-utils.js b/build-system/server/app-utils.js
index ac011eae4d6a..65582bb541fa 100644
--- a/build-system/server/app-utils.js
+++ b/build-system/server/app-utils.js
@@ -72,7 +72,7 @@ const isRtvMode = (serveMode) => {
  */
 const getCdnUrlRegExp = (pathPattern = '[^\'">]+') =>
   new RegExp(
-    `(https://cdn\\.ampproject\\.org)/${pathPattern}(\\.m?js|\\.css)`,
+    `(https://cdn\\.ampproject\\.org)/${pathPattern}(\\.json|\\.m?js|\\.css)`,
     'g'
   );
 
@@ -116,8 +116,9 @@ function replaceCdnJsUrls(mode, html, hostName, useMaxNames) {
     if (isRtv) {
       return CDNURLToRTVURL(url, mode, pathnames, extension).href;
     }
-    // CSS files are never output as .max.css
-    const useMaxNamesForFile = useMaxNames && extension !== '.css';
+    // Only JS files have "max" files. Even mjs files don't have an equivalent
+    // max file during "amp build".
+    const useMaxNamesForFile = useMaxNames && extension === '.js';
     const href = getHrefWithoutHost(
       replaceCDNURLPath(url, pathnames, extension, useMaxNamesForFile)
     );
diff --git a/build-system/server/app.js b/build-system/server/app.js
index 8beb1228152f..6435459ea8de 100644
--- a/build-system/server/app.js
+++ b/build-system/server/app.js
@@ -10,7 +10,6 @@ const bodyParser = require('body-parser');
 const cors = require('./amp-cors');
 const devDashboard = require('./app-index');
 const express = require('express');
-const fetch = require('node-fetch');
 const formidable = require('formidable');
 const fs = require('fs');
 const jsdom = require('jsdom');
@@ -73,10 +72,7 @@ app.use(bodyParser.text());
 // Middleware is executed in order, so this must be at the top.
 // TODO(#24333): Migrate all server URL handlers to new-server/router and
 // deprecate app.js.
-// TODO(erwinmombay, #32865): Make visual diff tests use the new server
-if (!argv._.includes('visual-diff')) {
-  app.use(require('./new-server/router'));
-}
+app.use(require('./new-server/router'));
 
 app.use(require('./routes/a4a-envelopes'));
 app.use('/amp4test', require('./amp4test').app);
@@ -96,7 +92,7 @@ app.use((req, res, next) => {
   if (req.query.csp) {
     res.set({
       'content-security-policy':
-        "default-src * blob: data:; script-src https://cdn.ampproject.org/rtv/ https://cdn.ampproject.org/v0.js https://cdn.ampproject.org/v0/ https://cdn.ampproject.org/viewer/ http://localhost:8000 https://localhost:8000; object-src 'none'; style-src 'unsafe-inline' https://cdn.ampproject.org/rtv/ https://cdn.materialdesignicons.com https://cloud.typography.com https://fast.fonts.net https://fonts.googleapis.com https://maxcdn.bootstrapcdn.com https://p.typekit.net https://use.fontawesome.com https://use.typekit.net; report-uri https://csp-collector.appspot.com/csp/amp",
+        "default-src * blob: data:; script-src https://cdn.ampproject.org/rtv/ https://cdn.ampproject.org/v0.js https://cdn.ampproject.org/v0/ https://cdn.ampproject.org/viewer/ http://localhost:8000 https://localhost:8000; object-src 'none'; style-src 'unsafe-inline' https://cdn.ampproject.org/rtv/ https://cdn.materialdesignicons.com https://cloud.typography.com https://fast.fonts.net https://fonts.googleapis.com https://maxcdn.bootstrapcdn.com https://p.typekit.net https://use.fontawesome.com https://use.typekit.net https://cdnjs.cloudflare.com/ajax/libs/font-awesome/; report-uri https://csp-collector.appspot.com/csp/amp",
     });
   }
   next();
@@ -653,7 +649,7 @@ function liveListInsert(liveList, node) {
      */
     const child = /** @type {*} */ (node.cloneNode(true));
     child.setAttribute('id', `list-item-${itemCtr++}`);
-    child.setAttribute('data-sort-time', Date.now());
+    child.setAttribute('data-sort-time', Date.now().toString());
     liveList.querySelector('[items]')?.appendChild(child);
   }
 }
@@ -1403,6 +1399,19 @@ app.get(
   }
 );
 
+/**
+ * Handle amp-story translation file requests with an rtv path.
+ * We need to make sure we only handle the amp-story requests since this
+ * can affect other tests with json requests.
+ */
+app.get('/dist/rtv/*/v0/amp-story*.json', async (req, _res, next) => {
+  const fileName = path.basename(req.path);
+  let filePath = 'https://cdn.ampproject.org/v0/' + fileName;
+  filePath = replaceUrls(SERVE_MODE, filePath);
+  req.url = filePath;
+  next();
+});
+
 if (argv.coverage === 'live') {
   app.get('/dist/amp.js', async (req, res) => {
     const ampJs = await fs.promises.readFile(`${pc.cwd()}${req.path}`);
diff --git a/build-system/server/lazy-build.js b/build-system/server/lazy-build.js
index bad47df25f5b..04eb8706bee6 100644
--- a/build-system/server/lazy-build.js
+++ b/build-system/server/lazy-build.js
@@ -15,20 +15,18 @@ const {jsBundles} = require('../compile/bundles.config');
 const {VERSION} = require('../compile/internal-version');
 
 const extensionBundles = {};
-maybeInitializeExtensions(extensionBundles, /* includeLatest */ true);
+maybeInitializeExtensions(extensionBundles);
 
 const vendorBundles = generateBundles();
 
 /**
- * Normalizes bento extension names and gets the unminified name of the bundle
- * if it can be lazily built.
+ * Gets the unminified name of the bundle if it can be lazily built.
  *
  * @param {!Object} bundles
  * @param {string} name
  * @return {string}
  */
 function maybeGetUnminifiedName(bundles, name) {
-  name = name.replace('bento-', 'amp-');
   if (argv.minified) {
     for (const key of Object.keys(bundles)) {
       if (
diff --git a/build-system/server/new-server/router.js b/build-system/server/new-server/router.js
index cf8dfa58c9e7..9ae691b1bf5a 100644
--- a/build-system/server/new-server/router.js
+++ b/build-system/server/new-server/router.js
@@ -2,8 +2,18 @@ const router = require('express').Router();
 // @ts-ignore
 const {transform} = require('./transforms/dist/transform');
 
-router.get('/examples/*.html', async (req, res) => {
+router.get('/examples/*.html', async (req, res, next) => {
   let transformedHTML;
+
+  // ?transform=0 or ?transform=false will force an opt-out of the
+  // transformation. This can be useful if we want to explicitly test the
+  // nomodule version of the code.
+  const skipTransform =
+    'transform' in req.query &&
+    (req.query.transform === '0' || req.query.transform === 'false');
+  if (skipTransform) {
+    return next();
+  }
   const filePath = `${process.cwd()}${req.path}`;
   try {
     transformedHTML = await transform(filePath);
diff --git a/build-system/server/new-server/transforms/cdn/cdn-transform.ts b/build-system/server/new-server/transforms/cdn/cdn-transform.ts
index 315512c3114c..8dde6cf7bc09 100644
--- a/build-system/server/new-server/transforms/cdn/cdn-transform.ts
+++ b/build-system/server/new-server/transforms/cdn/cdn-transform.ts
@@ -1,17 +1,19 @@
-
-
+import {parse} from 'path';
 import posthtml from 'posthtml';
+
+import {CDNURLToLocalHostRelativeAbsoluteDist} from '../utilities/cdn';
 import {
   getCdnUrlAttr,
   isJsonScript,
   isValidOrigin,
   tryGetUrl,
 } from '../utilities/cdn-tag';
-import {CDNURLToLocalHostRelativeAbsoluteDist} from '../utilities/cdn';
 import {OptionSet} from '../utilities/option-set';
-import {parse} from 'path';
 
-function maybeModifyCdnUrl(node: posthtml.Node, options: OptionSet): posthtml.Node {
+function maybeModifyCdnUrl(
+  node: posthtml.Node,
+  options: OptionSet
+): posthtml.Node {
   // Make sure to call `isJsonScript` before `tryGetUrl`. We bail out early if
   // the node is of type="application/json" since it wouldn't have a URL.
   if (isJsonScript(node)) {
@@ -50,11 +52,9 @@ export default function (
   options: OptionSet = {}
 ): (tree: posthtml.Node) => void {
   return function (tree: posthtml.Node) {
-    tree.match([
-      {tag: 'script'},
-      {tag: 'link', attrs: {rel: 'stylesheet'}},
-    ], (node) => {
-      return maybeModifyCdnUrl(node, options);
-    });
+    tree.match(
+      [{tag: 'script'}, {tag: 'link', attrs: {rel: 'stylesheet'}}],
+      (node) => maybeModifyCdnUrl(node, options)
+    );
   };
 }
diff --git a/build-system/server/new-server/transforms/css/css-transform.ts b/build-system/server/new-server/transforms/css/css-transform.ts
index d76d0b1b5d62..62e40a45f6db 100644
--- a/build-system/server/new-server/transforms/css/css-transform.ts
+++ b/build-system/server/new-server/transforms/css/css-transform.ts
@@ -1,9 +1,8 @@
-
-
+import {readFileSync} from 'fs';
 import minimist from 'minimist';
 import posthtml from 'posthtml';
-import {readFileSync} from 'fs';
-import {OptionSet} from '../utilities/option-set';
+
+import {Lazy} from '../utilities/lazy';
 
 const argv = minimist(process.argv.slice(2));
 const isTestMode: boolean = argv._.includes('server-tests');
@@ -14,24 +13,29 @@ const cwd = process.cwd();
 const cssPath = isTestMode
   ? `${cwd}/${testDir}/css.txt`
   : `${cwd}/build/css/v0.css`;
-const versionPath = `${cwd}/${testDir}/version.txt`
+const versionPath = `${cwd}/${testDir}/version.txt`;
 
-const css = readFileSync(cssPath, 'utf8').toString().trim();
-const version = readFileSync(versionPath, 'utf8').toString().trim();
+const css = new Lazy(() => readFileSync(cssPath, 'utf8').toString().trim());
+const version = new Lazy(() =>
+  readFileSync(versionPath, 'utf8').toString().trim()
+);
 
 interface StyleNode extends posthtml.Node {
-  tag: 'style',
+  tag: 'style';
   attrs: {
-    [key: string]: string | undefined
-    'amp-runtime': string,
-    'i-amphtml-version': string,
-  },
-  content: string[]
+    [key: string]: string | undefined;
+    'amp-runtime': string;
+    'i-amphtml-version': string;
+  };
+  content: string[];
 }
 
 function isStyleNode(node: posthtml.Node | string): node is StyleNode {
-  return node !== undefined && typeof node !== 'string' &&
-    (node as StyleNode).tag === 'style';
+  return (
+    node !== undefined &&
+    typeof node !== 'string' &&
+    (node as StyleNode).tag === 'style'
+  );
 }
 
 function prependAmpStyles(head: posthtml.Node): posthtml.Node {
@@ -51,9 +55,9 @@ function prependAmpStyles(head: posthtml.Node): posthtml.Node {
     attrs: {
       'amp-runtime': '',
       // Prefix 01 to simulate stable/prod version RTV prefix.
-      'i-amphtml-version': `01${version}`,
+      'i-amphtml-version': `01${version.value()}`,
     },
-    content: [css]
+    content: [css.value()],
   };
   content.unshift(styleNode);
   return {...head, content};
@@ -62,8 +66,17 @@ function prependAmpStyles(head: posthtml.Node): posthtml.Node {
 /**
  * Replace the src for every stories script tag.
  */
-export default function (_options: OptionSet = {}): (tree: posthtml.Node) => void {
+export default function (): (tree: posthtml.Node) => void {
   return function (tree: posthtml.Node) {
-    tree.match({tag: 'head'}, prependAmpStyles);
-  }
+    let isAmp = false;
+    tree.match({tag: 'html'}, function (html: posthtml.Node): posthtml.Node {
+      if (html.attrs && ('amp' in html.attrs || '⚡' in html.attrs)) {
+        isAmp = true;
+      }
+      return html;
+    });
+    if (isAmp) {
+      tree.match({tag: 'head'}, prependAmpStyles);
+    }
+  };
 }
diff --git a/build-system/server/new-server/transforms/css/test/esm-env/input.html b/build-system/server/new-server/transforms/css/test/esm-env/input.html
index 5ebf21c53537..9f20cca42bea 100644
--- a/build-system/server/new-server/transforms/css/test/esm-env/input.html
+++ b/build-system/server/new-server/transforms/css/test/esm-env/input.html
@@ -1,3 +1,5 @@
+<html ⚡ lang="en">
 <head>
 <style amp-custom>.my-personal-style {}</style>
 </head>
+</html>
diff --git a/build-system/server/new-server/transforms/css/test/esm-env/output.html b/build-system/server/new-server/transforms/css/test/esm-env/output.html
index 81f40c67eaeb..b33b151c7929 100644
--- a/build-system/server/new-server/transforms/css/test/esm-env/output.html
+++ b/build-system/server/new-server/transforms/css/test/esm-env/output.html
@@ -1,3 +1,5 @@
+<html ⚡="" lang="en">
 <head><style amp-runtime="" i-amphtml-version="011234567890">.i-amp-internal{background-color:red}</style>
 <style amp-custom="">.my-personal-style {}</style>
 </head>
+</html>
diff --git a/build-system/server/new-server/transforms/css/test/no-insert/input.html b/build-system/server/new-server/transforms/css/test/no-insert/input.html
index cf1c30befa6d..131f45f7d4c9 100644
--- a/build-system/server/new-server/transforms/css/test/no-insert/input.html
+++ b/build-system/server/new-server/transforms/css/test/no-insert/input.html
@@ -1,4 +1,6 @@
+<html ⚡ lang="en">
 <head>
 <style amp-runtime>.amp-runtime{}</style>
 <style amp-custom>.my-personal-style {}</style>
 </head>
+</html>
diff --git a/build-system/server/new-server/transforms/css/test/no-insert/output.html b/build-system/server/new-server/transforms/css/test/no-insert/output.html
index a91d5793addc..256902d93006 100644
--- a/build-system/server/new-server/transforms/css/test/no-insert/output.html
+++ b/build-system/server/new-server/transforms/css/test/no-insert/output.html
@@ -1,4 +1,6 @@
+<html ⚡="" lang="en">
 <head>
 <style amp-runtime="">.amp-runtime{}</style>
 <style amp-custom="">.my-personal-style {}</style>
 </head>
+</html>
diff --git a/build-system/server/new-server/transforms/css/test/non-amp/input.html b/build-system/server/new-server/transforms/css/test/non-amp/input.html
new file mode 100644
index 000000000000..7df3b89e3870
--- /dev/null
+++ b/build-system/server/new-server/transforms/css/test/non-amp/input.html
@@ -0,0 +1,5 @@
+<html lang="en">
+<head>
+<style amp-custom>.my-personal-style {}</style>
+</head>
+</html>
diff --git a/build-system/server/new-server/transforms/css/test/non-amp/output.html b/build-system/server/new-server/transforms/css/test/non-amp/output.html
new file mode 100644
index 000000000000..ec49bbf037de
--- /dev/null
+++ b/build-system/server/new-server/transforms/css/test/non-amp/output.html
@@ -0,0 +1,5 @@
+<html lang="en">
+<head>
+<style amp-custom="">.my-personal-style {}</style>
+</head>
+</html>
diff --git a/build-system/server/new-server/transforms/modules/modules-transform.ts b/build-system/server/new-server/transforms/modules/modules-transform.ts
index 1db4471e63ee..be9dc9b1696e 100644
--- a/build-system/server/new-server/transforms/modules/modules-transform.ts
+++ b/build-system/server/new-server/transforms/modules/modules-transform.ts
@@ -1,16 +1,24 @@
-
-
 import posthtml from 'posthtml';
-import {isJsonScript, isValidScript, toExtension, ScriptNode, tryGetUrl} from '../utilities/cdn-tag';
+
+import {
+  ScriptNode,
+  isJsonScript,
+  isValidScript,
+  toExtension,
+  tryGetUrl,
+} from '../utilities/cdn-tag';
 import {OptionSet} from '../utilities/option-set';
 
-/**
- * @param head
- * @param script
- */
-function appendModuleScript(head: posthtml.Node, nomoduleScript: ScriptNode, options: OptionSet): void {
-  const modulePath = toExtension(tryGetUrl(nomoduleScript.attrs.src), '.mjs').toString();
-  const moduleScript : ScriptNode = {
+function appendModuleScript(
+  head: posthtml.Node,
+  nomoduleScript: ScriptNode,
+  options: OptionSet
+): void {
+  const modulePath = toExtension(
+    tryGetUrl(nomoduleScript.attrs.src),
+    '.mjs'
+  ).toString();
+  const moduleScript: ScriptNode = {
     ...nomoduleScript,
     attrs: {
       ...nomoduleScript.attrs,
@@ -37,11 +45,13 @@ function appendModuleScript(head: posthtml.Node, nomoduleScript: ScriptNode, opt
  * Returns a function that will transform script node sources into module/nomodule pair.
  * @param options
  */
-export default function(options: OptionSet = {}): (tree: posthtml.Node) => void {
-  return function(tree: posthtml.Node): void {
+export default function (
+  options: OptionSet = {}
+): (tree: posthtml.Node) => void {
+  return function (tree: posthtml.Node): void {
     let head: posthtml.Node | undefined = undefined;
     const scripts: Array<ScriptNode> = [];
-    tree.walk(node => {
+    tree.walk((node) => {
       if (node.tag === 'head') {
         head = node;
       }
@@ -64,6 +74,7 @@ export default function(options: OptionSet = {}): (tree: posthtml.Node) => void
     });
 
     if (head === undefined) {
+      // eslint-disable-next-line local/no-forbidden-terms
       console.log('Could not find a head element in the document');
       return;
     }
@@ -71,5 +82,5 @@ export default function(options: OptionSet = {}): (tree: posthtml.Node) => void
     for (const script of scripts) {
       appendModuleScript(head, script, options);
     }
-  }
+  };
 }
diff --git a/build-system/server/new-server/transforms/sxg/sxg-transform.ts b/build-system/server/new-server/transforms/sxg/sxg-transform.ts
index 75be878a2dff..1558c169b803 100644
--- a/build-system/server/new-server/transforms/sxg/sxg-transform.ts
+++ b/build-system/server/new-server/transforms/sxg/sxg-transform.ts
@@ -1,11 +1,13 @@
-
-
 import posthtml from 'posthtml';
 import {URL} from 'url';
+
 import {isJsonScript, isValidScript} from '../utilities/cdn-tag';
 import {OptionSet} from '../utilities/option-set';
 
-function sxgTransform(node: posthtml.Node, options: OptionSet = {}): posthtml.Node {
+function sxgTransform(
+  node: posthtml.Node,
+  options: OptionSet = {}
+): posthtml.Node {
   // Make sure that isJsonScript is used before `isValidScript`. We bail out
   // early if the ScriptNode is of type="application/json" since it wouldn't
   // have any src url to modify.
@@ -18,7 +20,7 @@ function sxgTransform(node: posthtml.Node, options: OptionSet = {}): posthtml.No
   }
 
   if (options.minified) {
-    const src = node.attrs.src;
+    const {src} = node.attrs;
     node.attrs.src = src.replace('.js', '.sxg.js');
   } else {
     const url = new URL(node.attrs.src);
@@ -33,10 +35,12 @@ function sxgTransform(node: posthtml.Node, options: OptionSet = {}): posthtml.No
  * Returns a function that will transform script node sources into their sxg counterparts.
  * @param options
  */
-export default function(options: OptionSet = {}): (tree: posthtml.Node) => void {
-  return function(tree: posthtml.Node) {
+export default function (
+  options: OptionSet = {}
+): (tree: posthtml.Node) => void {
+  return function (tree: posthtml.Node) {
     tree.match({tag: 'script'}, (script) => {
       return sxgTransform(script, options);
     });
-  }
+  };
 }
diff --git a/build-system/server/new-server/transforms/transform.ts b/build-system/server/new-server/transforms/transform.ts
index 360ab893508e..a8a903205940 100644
--- a/build-system/server/new-server/transforms/transform.ts
+++ b/build-system/server/new-server/transforms/transform.ts
@@ -1,11 +1,10 @@
-
-
 import fs from 'fs';
 import minimist from 'minimist';
 import posthtml from 'posthtml';
-import transformModules from './modules/modules-transform';
+
 import transformCdnSrcs from './cdn/cdn-transform';
 import transformCss from './css/css-transform';
+import transformModules from './modules/modules-transform';
 
 const argv = minimist(process.argv.slice(2));
 const FOR_TESTING = argv._.includes('integration');
@@ -20,15 +19,10 @@ const defaultTransformConfig = {
   useMaxNames: !argv.minified,
 };
 
-const transforms = [
-  transformCdnSrcs(defaultTransformConfig),
-];
+const transforms = [transformCdnSrcs(defaultTransformConfig)];
 
 if (ESM) {
-  transforms.unshift(
-    transformCss(),
-    transformModules(defaultTransformConfig),
-  );
+  transforms.unshift(transformCss(), transformModules(defaultTransformConfig));
 }
 
 export async function transform(fileLocation: string): Promise<string> {
diff --git a/build-system/server/new-server/transforms/tsconfig.json b/build-system/server/new-server/transforms/tsconfig.json
index 2185fda0e0b1..fe231cb4f1d9 100644
--- a/build-system/server/new-server/transforms/tsconfig.json
+++ b/build-system/server/new-server/transforms/tsconfig.json
@@ -8,7 +8,6 @@
     "outDir": "dist",
     "sourceMap": true,
     "moduleResolution": "node",
-    "target": "ES2019",
     "module": "CommonJS",
     "allowJs": false,
     "noUnusedLocals": true,
diff --git a/build-system/server/new-server/transforms/utilities/cdn-tag.ts b/build-system/server/new-server/transforms/utilities/cdn-tag.ts
index 11224203624f..51d2533a29d4 100644
--- a/build-system/server/new-server/transforms/utilities/cdn-tag.ts
+++ b/build-system/server/new-server/transforms/utilities/cdn-tag.ts
@@ -1,10 +1,8 @@
-
-
+import {extname, format, parse} from 'path';
 import posthtml from 'posthtml';
 import {URL} from 'url';
-import {extname} from 'path';
+
 import {VALID_CDN_ORIGIN} from './cdn';
-import {parse, format} from 'path';
 
 export interface ScriptNode extends posthtml.Node {
   tag: 'script';
@@ -20,7 +18,10 @@ function isValidScriptExtension(url: URL): boolean {
   return VALID_SCRIPT_EXTENSIONS.includes(extname(url.pathname));
 }
 
-export function isValidOrigin(url: URL,  looseOriginUrlCheck?: boolean): boolean {
+export function isValidOrigin(
+  url: URL,
+  looseOriginUrlCheck?: boolean
+): boolean {
   return looseOriginUrlCheck || url.origin === VALID_CDN_ORIGIN;
 }
 
@@ -29,7 +30,7 @@ export function getCdnUrlAttr(node: posthtml.Node): string | null {
     return 'src';
   }
   if (node.tag === 'link') {
-    return 'href'
+    return 'href';
   }
   return null;
 }
@@ -38,7 +39,10 @@ export function getCdnUrlAttr(node: posthtml.Node): string | null {
  * Determines if a Node is really a ScriptNode.
  * @param node
  */
-export function isValidScript(node: posthtml.Node, looseOriginUrlCheck?: boolean): node is ScriptNode {
+export function isValidScript(
+  node: posthtml.Node,
+  looseOriginUrlCheck?: boolean
+): node is ScriptNode {
   if (node.tag !== 'script') {
     return false;
   }
@@ -73,6 +77,10 @@ export function toExtension(url: URL, extension: string): URL {
  * This is a temporary measure to allow for a relaxed parsing of our
  * fixture files' src urls before they are all fixed accordingly.
  */
-export function tryGetUrl(src: string, host: string = '0.0.0.0', port: number = 8000): URL {
+export function tryGetUrl(
+  src: string,
+  host: string = '0.0.0.0',
+  port: number = 8000
+): URL {
   return new URL(src, `http://${host}:${port}`);
 }
diff --git a/build-system/server/new-server/transforms/utilities/cdn.ts b/build-system/server/new-server/transforms/utilities/cdn.ts
index 60a20a94eb29..4670c714d410 100644
--- a/build-system/server/new-server/transforms/utilities/cdn.ts
+++ b/build-system/server/new-server/transforms/utilities/cdn.ts
@@ -1,8 +1,7 @@
-
-
+import {basename, format, parse} from 'path';
 import {URL} from 'url';
-import {parse, format, basename} from 'path';
 
+// eslint-disable-next-line local/no-forbidden-terms
 export const VALID_CDN_ORIGIN = 'https://cdn.ampproject.org';
 
 export const AMP_MAIN_BINARIES_RENAMES = new Map([
@@ -19,7 +18,8 @@ export const AMP_MAIN_BINARIES_RENAMES = new Map([
 ]);
 
 /**
- * @param minifiedBasename should be without extension
+ * @param {string} minifiedBasename should be without extension
+ * @return {string}
  */
 function getMinifiedName(minifiedBasename: string): string {
   const renamedBasename = AMP_MAIN_BINARIES_RENAMES.get(minifiedBasename);
@@ -90,6 +90,10 @@ export function CDNURLToLocalHostRelativeAbsoluteDist(
 
 /**
  * Convert an existing URL to one from a specific RTV.
+ * @param url
+ * @param mode
+ * @param pathnames
+ * @param extension
  */
 export function CDNURLToRTVURL(
   url: URL,
diff --git a/build-system/server/new-server/transforms/utilities/lazy.ts b/build-system/server/new-server/transforms/utilities/lazy.ts
new file mode 100644
index 000000000000..899088dbaf81
--- /dev/null
+++ b/build-system/server/new-server/transforms/utilities/lazy.ts
@@ -0,0 +1,15 @@
+export class Lazy<T> {
+  private declare initializer_: () => T;
+  private declare value_: T | undefined;
+
+  constructor(initializer: () => T) {
+    this.initializer_ = initializer;
+  }
+
+  public value(): T {
+    if (this.value_ == undefined) {
+      this.value_ = this.initializer_();
+    }
+    return this.value_;
+  }
+}
diff --git a/build-system/server/new-server/transforms/utilities/option-set.ts b/build-system/server/new-server/transforms/utilities/option-set.ts
index c30fc4dd08db..d866d40cf1cc 100644
--- a/build-system/server/new-server/transforms/utilities/option-set.ts
+++ b/build-system/server/new-server/transforms/utilities/option-set.ts
@@ -1,6 +1,4 @@
-
-
- /**
+/**
  * A list of options to correspond with options.json for testing purposes.
  * To add an option, add the corresponding key-value pair into the
  * options.json, then add the field to this interface.
diff --git a/build-system/server/routes/a4a-envelopes.js b/build-system/server/routes/a4a-envelopes.js
index 5cf3227ddcae..9770d9afc209 100644
--- a/build-system/server/routes/a4a-envelopes.js
+++ b/build-system/server/routes/a4a-envelopes.js
@@ -1,5 +1,4 @@
 const express = require('express');
-const fetch = require('node-fetch');
 const fs = require('fs');
 const {getServeMode, replaceUrls} = require('../app-utils');
 const {log} = require('../../common/logging');
@@ -122,14 +121,14 @@ function getInaboxUrl(req, extraExperiment) {
  * If the URL does not return text, returns null.
  * @param {string} template
  * @param {string} url
- * @param {Object} query
+ * @param {object} query
  * @return {!Promise<?string>}
  */
 async function requestFromUrl(template, url, query) {
   const response = await fetch(url);
   if (
     !response.headers.has('Content-Type') ||
-    response.headers.get('Content-Type').startsWith('text/html')
+    response.headers.get('Content-Type')?.startsWith('text/html')
   ) {
     return fillTemplate(template, url, query, await response.text());
   }
@@ -140,7 +139,7 @@ async function requestFromUrl(template, url, query) {
  * Fill out a template with some common variables.
  * @param {string} template
  * @param {string} url
- * @param {Object} query
+ * @param {object} query
  * @param {string=} body
  * @return {string}
  */
diff --git a/build-system/server/shadow-viewer.js b/build-system/server/shadow-viewer.js
index 4cd64d48e446..ebab6a242a03 100644
--- a/build-system/server/shadow-viewer.js
+++ b/build-system/server/shadow-viewer.js
@@ -128,21 +128,20 @@ const SCRIPT = `
 };
 `;
 
-const renderShadowViewer = ({baseHref, src}) =>
-  html`
-    <!DOCTYPE html>
-    <html>
-      <head>
-        <base href="${baseHref}" />
-        <title>Shadow Viewer</title>
-        <script>
-          ${SCRIPT};
-        </script>
-      </head>
-      <body style="padding: 0; margin: 0">
-        <amp-viewer src="${src}"></amp-viewer>
-      </body>
-    </html>
-  `;
+const renderShadowViewer = ({baseHref, src}) => html`
+  <!doctype html>
+  <html>
+    <head>
+      <base href="${baseHref}" />
+      <title>Shadow Viewer</title>
+      <script>
+        ${SCRIPT};
+      </script>
+    </head>
+    <body style="padding: 0; margin: 0">
+      <amp-viewer src="${src}"></amp-viewer>
+    </body>
+  </html>
+`;
 
 module.exports = {renderShadowViewer};
diff --git a/build-system/server/typescript-compile.js b/build-system/server/typescript-compile.js
index 5d1a67922eb0..a594914e19d7 100644
--- a/build-system/server/typescript-compile.js
+++ b/build-system/server/typescript-compile.js
@@ -4,7 +4,6 @@ const path = require('path');
 const {accessSync} = require('fs-extra');
 const {cyan, green} = require('kleur/colors');
 const {endBuildStep} = require('../tasks/helpers');
-const {exec} = require('../common/exec');
 const {log} = require('../common/logging');
 
 const SERVER_TRANSFORM_PATH = 'build-system/server/new-server/transforms';
@@ -40,18 +39,6 @@ async function buildNewServer() {
   endBuildStep('Built', 'AMP Server', startTime);
 }
 
-/**
- * Checks all types in the generated output after running server transforms.
- */
-function typecheckNewServer() {
-  const cmd = `npx -p typescript tsc --noEmit -p ${CONFIG_PATH}`;
-  const result = exec(cmd, {'stdio': ['inherit', 'inherit', 'pipe']});
-
-  if (result.status != 0) {
-    throw new Error(`Typechecking AMP Server failed.`);
-  }
-}
-
 /**
  * Requires a module output from `./new-server/transforms`.
  * If all of `new-server` was built, this simply imports an existing module.
@@ -79,7 +66,6 @@ function requireNewServerModule(modulePath) {
 
 module.exports = {
   buildNewServer,
-  typecheckNewServer,
   requireNewServerModule,
   SERVER_TRANSFORM_PATH,
 };
diff --git a/build-system/status-page/comment.js b/build-system/status-page/comment.js
index 97c74f52fc96..7b9a557f16da 100644
--- a/build-system/status-page/comment.js
+++ b/build-system/status-page/comment.js
@@ -3,7 +3,6 @@
  * Add progress comment for Stable and LTS cherry-picks
  */
 
-const fetch = require('node-fetch');
 const {getChannels, steps} = require('./common');
 const {log} = require('../common/logging');
 
diff --git a/build-system/status-page/incident.js b/build-system/status-page/incident.js
index a94968ea54d1..ad1b743958f0 100644
--- a/build-system/status-page/incident.js
+++ b/build-system/status-page/incident.js
@@ -3,7 +3,6 @@
  * Sync status.amp.dev with cherry-pick progress
  */
 
-const fetch = require('node-fetch');
 const {getChannels, getFormats, steps} = require('./common');
 const {log} = require('../common/logging');
 
diff --git a/build-system/task-runner/OWNERS b/build-system/task-runner/OWNERS
index 002922bb9cc9..69a88bfe0386 100644
--- a/build-system/task-runner/OWNERS
+++ b/build-system/task-runner/OWNERS
@@ -4,7 +4,7 @@
 {
   rules: [
     {
-      owners: [{name: 'ampproject/wg-infra'}, {name: 'rsimha', notify: true}],
+      owners: [{name: 'ampproject/wg-infra'}],
     },
   ],
 }
diff --git a/build-system/task-runner/amp-task-runner.js b/build-system/task-runner/amp-task-runner.js
index e2be437b17cc..db342c1aa31f 100644
--- a/build-system/task-runner/amp-task-runner.js
+++ b/build-system/task-runner/amp-task-runner.js
@@ -4,7 +4,7 @@
  */
 
 const argv = require('minimist')(process.argv.slice(2));
-const commander = require('commander');
+const {program} = require('commander');
 const esprima = require('esprima');
 const fs = require('fs-extra');
 const os = require('os');
@@ -16,6 +16,7 @@ const {
 const {cyan, green, magenta, red} = require('kleur/colors');
 const {isCiBuild} = require('../common/ci');
 const {log} = require('../common/logging');
+const {isCircleciBuild} = require('../common/ci');
 
 /**
  * @typedef {Function & {
@@ -44,8 +45,8 @@ function getTime(start) {
   return mins !== 0
     ? `${mins}m ${secs}s`
     : secs != 0
-    ? `${secs}s`
-    : `${msecs}ms`;
+      ? `${secs}s`
+      : `${msecs}ms`;
 }
 
 /**
@@ -93,6 +94,13 @@ async function runTask(taskName, taskFunc) {
     log(`Starting '${cyan(taskName)}'...`);
     await taskFunc();
     log('Finished', `'${cyan(taskName)}'`, 'after', magenta(getTime(start)));
+    // For some reason, the `e2e` and `unit` tasks get stuck on CircleCI after
+    // testing is finishing, despite reaching this point in the code. This is a
+    // temporary workaround until we understand exactly why and fix the root
+    // cause. TODO(@ampproject/wg-infra): fix this.
+    if (isCircleciBuild() && ['e2e', 'unit'].includes(taskName)) {
+      process.exit(); // process.exitCode is set in ../tasks/e2e/index.js:171
+    }
   } catch (err) {
     log(`'${cyan(taskName)}'`, red('errored after'), magenta(getTime(start)));
     log(err);
@@ -210,7 +218,7 @@ function createTask(
     argv._.length === 0 && taskName == 'default' && !isHelpTask; // `amp`
 
   if (isHelpTask) {
-    const task = commander.command(cyan(taskName));
+    const task = program.command(cyan(taskName));
     const description = getTaskDescription(taskSourceFileName, taskFuncName);
     task.description(description);
   }
@@ -218,7 +226,7 @@ function createTask(
     startAtRepoRoot();
     ensureUpdatedPackages(taskSourceFileName);
     const taskFunc = getTaskFunc(taskSourceFileName, taskFuncName);
-    const task = commander.command(taskName, {isDefault: isDefaultTask});
+    const task = program.command(taskName, {isDefault: isDefaultTask});
     task.description(green(taskFunc.description));
     task.allowUnknownOption(); // Fall through to validateUsage()
     task.helpOption('--help', 'Print this list of flags');
@@ -235,7 +243,7 @@ function createTask(
 
 /**
  * Validates usage by examining task and flag invocation.
- * @param {Object} task
+ * @param {object} task
  * @param {string} taskName
  * @param {TaskFuncDef} taskFunc
  */
@@ -259,18 +267,18 @@ function validateUsage(task, taskName, taskFunc) {
  * was called.
  */
 function finalizeRunner() {
-  commander.addHelpCommand(false); // We already have `amp --help` and `amp <task> --help`
+  program.addHelpCommand(false); // We already have `amp --help` and `amp <task> --help`
   if (isHelpTask) {
-    commander.helpOption('--help', 'Print this list of tasks');
-    commander.usage('<task> <flags>');
+    program.helpOption('--help', 'Print this list of tasks');
+    program.usage('<task> <flags>');
   }
-  commander.on('command:*', (args) => {
+  program.on('command:*', (args) => {
     log(red('ERROR:'), 'Unknown task', cyan(args.join(' ')));
     log('⤷ Run', cyan('amp --help'), 'for a full list of tasks.');
     log('⤷ Run', cyan('amp <task> --help'), 'for help with a specific task.');
     process.exitCode = 1;
   });
-  commander.parse();
+  program.parse();
 }
 
 module.exports = {
diff --git a/build-system/task-runner/install-amp-task-runner.js b/build-system/task-runner/install-amp-task-runner.js
index dbb5c7c52f0f..d61447ecfabd 100644
--- a/build-system/task-runner/install-amp-task-runner.js
+++ b/build-system/task-runner/install-amp-task-runner.js
@@ -20,8 +20,8 @@ const ampCliRunner = 'build-system/task-runner/amp-cli-runner.js';
  * @return {Promise<void>}
  */
 async function installAmpTaskRunner() {
-  const npmBinDir = getStdout('npm bin --global').trim();
-  const ampBinary = path.join(npmBinDir, 'amp');
+  const npmBinDir = getStdout('npm prefix --global').trim();
+  const ampBinary = path.join(npmBinDir, 'bin', 'amp');
   const ampBinaryExists = await fs.pathExists(ampBinary);
   if (ampBinaryExists) {
     const ampBinaryIsAScript = !(await fs.lstat(ampBinary)).isSymbolicLink();
diff --git a/build-system/tasks/3p-vendor-helpers.js b/build-system/tasks/3p-vendor-helpers.js
index 6d2f867a357a..695ee56296b3 100644
--- a/build-system/tasks/3p-vendor-helpers.js
+++ b/build-system/tasks/3p-vendor-helpers.js
@@ -7,8 +7,21 @@ const {VERSION} = require('../compile/internal-version');
 const {watchDebounceDelay} = require('./helpers');
 const {watch} = require('chokidar');
 
+const argv = require('minimist')(process.argv.slice(2));
+
 const SRCPATH = ['3p/vendors/*.js'];
 
+/**
+ * Returns true when the CLI flags indicate that vendor configs should be built.
+ * @return {boolean}
+ */
+function shouldBuildVendorConfigs() {
+  return (
+    argv.vendor_configs ||
+    (!argv.core_runtime_only && !argv.extensions && !argv.extensions_from)
+  );
+}
+
 /**
  * Entry point for 'amp ad-vendor-configs'
  * Compile all the vendor configs and drop in the dist folder
@@ -77,7 +90,7 @@ async function doBuild3pVendor(jsBundles, name, options) {
 
 /**
  * Generate bundles for all 3p vendors to be built.
- * @return {Object}
+ * @return {object}
  */
 function generateBundles() {
   const bundles = {};
@@ -123,6 +136,7 @@ function listVendors() {
 }
 
 module.exports = {
+  shouldBuildVendorConfigs,
   buildVendorConfigs,
   doBuild3pVendor,
   generateBundles,
diff --git a/build-system/tasks/OWNERS b/build-system/tasks/OWNERS
index ac5da24d6dfe..d249c3009d96 100644
--- a/build-system/tasks/OWNERS
+++ b/build-system/tasks/OWNERS
@@ -8,10 +8,7 @@
     },
     {
       pattern: 'check-types.js',
-      owners: [
-        {name: 'ampproject/wg-performance'},
-        {name: 'rcebulko', required: true},
-      ],
+      owners: [{name: 'ampproject/wg-performance'}, {name: 'rcebulko'}],
     },
   ],
 }
diff --git a/build-system/tasks/ava.js b/build-system/tasks/ava.js
index eec6178a4bf2..cb1663761376 100644
--- a/build-system/tasks/ava.js
+++ b/build-system/tasks/ava.js
@@ -6,14 +6,15 @@ const {execOrDie} = require('../common/exec');
 const {sync: globbySync} = require('globby');
 
 const testFiles = [
+  'build-system/compile/generate/test/*.test.js',
   'build-system/release-tagger/test/*test*.js',
   'build-system/server/app-index/test/*test*.js',
   'build-system/server/test/app-utils.test.js',
-  'build-system/tasks/css/test/bento-css.test.js',
   'build-system/tasks/get-zindex/get-zindex.test.js',
   'build-system/tasks/make-extension/test/test.js',
   'build-system/tasks/markdown-toc/test/test.js',
   'build-system/tasks/prepend-global/prepend-global.test.js',
+  'build-system/tasks/remap-dependencies-plugin/test-remap-dependencies.js',
 ];
 
 let targetFiles;
diff --git a/build-system/tasks/bento-helpers.js b/build-system/tasks/bento-helpers.js
deleted file mode 100644
index 91af23be6f91..000000000000
--- a/build-system/tasks/bento-helpers.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * @param {string} name
- * @return {string}
- */
-function getBentoName(name) {
-  return name.replace(/^amp-/, 'bento-');
-}
-
-/**
- * @param {string} name
- * @return {string} name without `amp-` or `bento-` prefix
- */
-function getNameWithoutComponentPrefix(name) {
-  return name.replace(/^(amp|bento)-/, '');
-}
-
-module.exports = {getBentoName, getNameWithoutComponentPrefix};
diff --git a/build-system/tasks/build-story-localization.js b/build-system/tasks/build-story-localization.js
new file mode 100755
index 000000000000..e6dfcd39a4ba
--- /dev/null
+++ b/build-system/tasks/build-story-localization.js
@@ -0,0 +1,107 @@
+const fs = require('fs-extra');
+const fastGlob = require('fast-glob');
+const pathMod = require('path');
+const debounce = require('../common/debounce');
+const {endBuildStep, watchDebounceDelay} = require('./helpers');
+const {watch} = require('chokidar');
+const {readJson} = require('../json-locales');
+
+const dest = 'dist/v0';
+
+const LOCALES_DIR = 'extensions/amp-story/1.0/_locales/*.json';
+
+const FALLBACK_LANGUAGE_CODE = 'en';
+
+const LANGUAGE_CODE_CHUNK_REGEX = /\w+/gi;
+
+/**
+ * Finds fallback language codes for the current language code.
+ * @param {string} languageCode the language code to get fallbacks for
+ * @return {string[]}
+ */
+function getLanguageCodeFallbacks(languageCode) {
+  if (!languageCode) {
+    return [FALLBACK_LANGUAGE_CODE];
+  }
+
+  /** @type {string[]} */
+  const matches = languageCode.match(LANGUAGE_CODE_CHUNK_REGEX) || [];
+  return matches.reduce(
+    (fallbackLanguageCodeList, _, index) => {
+      const fallbackLanguageCode = matches
+        .slice(0, index + 1)
+        .join('-')
+        .toLowerCase();
+      fallbackLanguageCodeList.push(fallbackLanguageCode);
+      return fallbackLanguageCodeList;
+    },
+    [FALLBACK_LANGUAGE_CODE]
+  );
+}
+
+/**
+ * Reads the language files found in amp-story and stores it in a
+ * Object.
+ * @return {Promise<Object>}
+ */
+async function getLanguageStrings() {
+  const langs = Object.create(null);
+  const jsonFiles = await fastGlob(LOCALES_DIR);
+  for (const jsonFile of jsonFiles) {
+    const langKey = pathMod.basename(jsonFile, '.json');
+    langs[langKey] = readJson(jsonFile);
+  }
+  return langs;
+}
+
+/**
+ * Retrieves the fallback language codes for each current locale
+ * and merges any strings from the fallback language.
+ * @param {object} languages
+ */
+function mergeFallbacks(languages) {
+  for (const langKey in languages) {
+    languages[langKey] = getLanguageCodeFallbacks(langKey)
+      .map((x) => languages[x])
+      .reduce((prev, cur) => Object.assign(prev, cur), Object.create(null));
+  }
+}
+
+/**
+ * Write the localization files to dist/v0/
+ * @return {Promise<void>}
+ */
+async function writeStoryLocalizationFiles() {
+  const startTime = Date.now();
+  await fs.ensureDir(dest);
+  const languages = await getLanguageStrings();
+  mergeFallbacks(languages);
+  // Write out each individual lang file.
+  for (const langKey in languages) {
+    await fs.writeJson(`${dest}/amp-story.${langKey}.json`, languages[langKey]);
+  }
+  // Write out all the languages into one file.
+  await fs.writeJson(`${dest}/amp-story.all-lang.json`, languages);
+  endBuildStep('Generated Story JSON Localization files into', dest, startTime);
+}
+
+/**
+ * Flattens the structure of the json locale strings and writes them out to the
+ * dist directory.
+ * @param {Object=} options
+ * @return {Promise<void>}
+ */
+async function buildStoryLocalization(options = {}) {
+  if (options.watch) {
+    watch(LOCALES_DIR).on(
+      'change',
+      debounce(writeStoryLocalizationFiles, watchDebounceDelay)
+    );
+  }
+  await writeStoryLocalizationFiles();
+}
+
+module.exports = {buildStoryLocalization};
+
+buildStoryLocalization.description =
+  'Flattens the structure of the json locale strings and writes them out to the dist directory';
diff --git a/build-system/tasks/build.js b/build-system/tasks/build.js
index 364b94cdc2b0..43a4609d7e58 100644
--- a/build-system/tasks/build.js
+++ b/build-system/tasks/build.js
@@ -10,9 +10,13 @@ const {
   exitCtrlcHandler,
 } = require('../common/ctrlcHandler');
 const {buildExtensions} = require('./extension-helpers');
-const {buildVendorConfigs} = require('./3p-vendor-helpers');
+const {
+  buildVendorConfigs,
+  shouldBuildVendorConfigs,
+} = require('./3p-vendor-helpers');
 const {compileCss} = require('./css');
 const {parseExtensionFlags} = require('./extension-helpers');
+const {buildStoryLocalization} = require('./build-story-localization');
 
 const argv = require('minimist')(process.argv.slice(2));
 
@@ -24,7 +28,11 @@ const argv = require('minimist')(process.argv.slice(2));
  * @return {Promise}
  */
 async function runPreBuildSteps(options) {
-  return Promise.all([compileCss(options), bootstrapThirdPartyFrames(options)]);
+  return Promise.all([
+    buildStoryLocalization(options),
+    compileCss(options),
+    bootstrapThirdPartyFrames(options),
+  ]);
 }
 
 /**
@@ -51,7 +59,8 @@ async function build() {
   }
   await buildExtensions(options);
 
-  if (!argv.core_runtime_only) {
+  // This step is to be run only during a full `amp build`.
+  if (shouldBuildVendorConfigs()) {
     await buildVendorConfigs(options);
   }
   if (!argv.watch) {
@@ -74,6 +83,8 @@ build.flags = {
   extensions_from: 'Build only the extensions from the listed AMP(s)',
   noextensions: 'Build with no extensions',
   core_runtime_only: 'Build only the core runtime',
+  vendor_configs:
+    'Build 3p party vendor configuration files (defaults to true unless one of --core_runtime_only, --extensions, or --extensions_from is set)',
   coverage: 'Add code coverage instrumentation to JS files using istanbul',
   version_override: 'Override the version written to AMP_CONFIG',
   watch: 'Watch for changes in files, re-builds when detected',
diff --git a/build-system/tasks/bundle-size/index.js b/build-system/tasks/bundle-size/index.js
index 000dcedcde2b..ea23ef144474 100644
--- a/build-system/tasks/bundle-size/index.js
+++ b/build-system/tasks/bundle-size/index.js
@@ -2,7 +2,6 @@
 
 const argv = require('minimist')(process.argv.slice(2));
 const fastGlob = require('fast-glob');
-const fetch = require('node-fetch');
 const path = require('path');
 const url = require('url');
 const {
@@ -35,11 +34,11 @@ const replacementExpression = new RegExp(internalRuntimeVersion, 'g');
 /**
  * Get the brotli bundle sizes of the current build after normalizing the RTV number.
  *
- * @return {Promise<Object<string, number>>} the bundle size in KB rounded to 2 decimal
+ * @return {Promise<{[key: string]: number}>} the bundle size in KB rounded to 2 decimal
  *   points.
  */
 async function getBrotliBundleSizes() {
-  /** @type {Object<string, number>} */
+  /** @type {{[key: string]: number}} */
   const bundleSizes = {};
   const sizes = await report(
     filesizeConfigPath,
diff --git a/build-system/tasks/check-analytics-vendors-list.js b/build-system/tasks/check-analytics-vendors-list.js
index 3b7484d57e5a..15a06b35a5c5 100644
--- a/build-system/tasks/check-analytics-vendors-list.js
+++ b/build-system/tasks/check-analytics-vendors-list.js
@@ -71,7 +71,10 @@ async function checkAnalyticsVendorsList() {
     const name = nameMatch
       .split(/[,\s]+/)
       .shift()
-      .replace(/[`"']/g, '');
+      ?.replace(/[`"']/g, '');
+    if (!name) {
+      throw new Error(`Could not locate vendor name in: "${nameMatch}"`);
+    }
     if (!vendors.includes(name)) {
       tentative = tentative.replace(fullMatch, '');
     }
diff --git a/build-system/tasks/check-links.js b/build-system/tasks/check-links.js
index 3c51d188d9a5..917ee205ba10 100644
--- a/build-system/tasks/check-links.js
+++ b/build-system/tasks/check-links.js
@@ -12,6 +12,10 @@ const {log, logLocalDev} = require('../common/logging');
 const LARGE_REFACTOR_THRESHOLD = 20;
 const GITHUB_BASE_PATH = 'https://github.com/ampproject/amphtml/blob/main/';
 
+// Certain sites do not like the default user agent string.
+const USER_AGENT =
+  'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36';
+
 let filesIntroducedByPr;
 
 /**
@@ -109,12 +113,24 @@ function checkLinksInFile(file) {
       {pattern: /localhost/},
       // codepen returns a 503 for these link checks
       {pattern: /https:\/\/codepen.*/},
+      // developers.google.com links are assumed to exist
+      {pattern: /https:\/\/developers.google.com\/.*/},
+      // anchor links should be ignored
+      {pattern: /^#/},
       // GitHub PRs and Issues can be assumed to exist
       {pattern: /https:\/\/github.com\/ampproject\/amphtml\/(pull|issue)\/.*/},
       // Templated links are merely used to generate other markdown files.
       {pattern: /\$\{[a-z]*\}/},
       {pattern: /https:.*?__component_name\w*__/},
     ],
+    httpHeaders: [
+      {
+        urls: ['https://'],
+        headers: {
+          'User-Agent': USER_AGENT,
+        },
+      },
+    ],
   };
 
   return new Promise((resolve, reject) => {
diff --git a/build-system/tasks/check-owners.js b/build-system/tasks/check-owners.js
index 003baf0630d6..0a83aadd6253 100644
--- a/build-system/tasks/check-owners.js
+++ b/build-system/tasks/check-owners.js
@@ -6,7 +6,6 @@
 
 'use strict';
 
-const fetch = require('node-fetch');
 const fs = require('fs-extra');
 const JSON5 = require('json5');
 const {cyan, green, red} = require('kleur/colors');
diff --git a/build-system/tasks/check-sourcemaps.js b/build-system/tasks/check-sourcemaps.js
index 33789f0291f4..cd3ef7b93a08 100644
--- a/build-system/tasks/check-sourcemaps.js
+++ b/build-system/tasks/check-sourcemaps.js
@@ -3,17 +3,15 @@
 const argv = require('minimist')(process.argv.slice(2));
 const fs = require('fs');
 const {cyan, green, red} = require('kleur/colors');
-const {decode} = require('sourcemap-codec');
+const {decode} = require('@jridgewell/sourcemap-codec');
 const {execOrDie} = require('../common/exec');
 const {log} = require('../common/logging');
-const {shouldUseClosure} = require('./helpers');
 
 // Compile related constants
-const distWithSourcemapsCmd = 'amp dist --core_runtime_only --full_sourcemaps';
-const v0JsMap = 'dist/v0.js.map';
+const distWithSourcemapsCmd =
+  'amp dist --core_runtime_only --extensions=amp-audio --full_sourcemaps';
 const distEsmWithSourcemapsCmd =
-  'amp dist --core_runtime_only --full_sourcemaps --esm';
-const v0MjsMap = 'dist/v0.mjs.map';
+  'amp dist --core_runtime_only --extensions=amp-audio --full_sourcemaps --esm';
 
 // Sourcemap URL related constants
 const sourcemapUrlMatcher =
@@ -113,15 +111,8 @@ function checkSourcemapMappings(sourcemapJson, map) {
     throw new Error('Could not find mappings array');
   }
 
-  // In closure builds there is a newline immediately after the AMP_CONFIG.
-  // This whole segment has no mapping to the original source.
-  // Therefore we must skip the zeroth sub-array, indicated by a ';'.
-  // In  esbuild builds there is no newline after the config, so the
-  // first line is fair game.
-  const firstLineIndex = shouldUseClosure() ? 1 : 0;
-
   // See https://www.npmjs.com/package/sourcemap-codec#usage.
-  const firstLineMapping = decode(sourcemapJson.mappings)[firstLineIndex][0];
+  const firstLineMapping = decode(sourcemapJson.mappings)[1][0];
   const [, sourceIndex = 0, sourceCodeLine = 0, sourceCodeColumn] =
     firstLineMapping;
 
@@ -134,7 +125,7 @@ function checkSourcemapMappings(sourcemapJson, map) {
     '.';
 
   // Mapping related constants
-  let expectedFirstLine = map.includes('mjs')
+  const expectedFirstLine = map.includes('mjs')
     ? {
         file: 'src/polyfills/abort-controller.js',
         code: 'class AbortController {',
@@ -144,13 +135,6 @@ function checkSourcemapMappings(sourcemapJson, map) {
         code: 'function _defineProperties(target, props) {',
       };
 
-  // TODO(samouri): remove branching once we decide for or against closure
-  if (shouldUseClosure()) {
-    expectedFirstLine = map.includes('mjs')
-      ? {file: 'src/core/mode/version.js', code: 'function version() {'}
-      : {file: 'src/core/mode/prod.js', code: 'export function isProd() {'};
-  }
-
   if (firstLineFile != expectedFirstLine.file) {
     log(red('ERROR:'), 'Found mapping for incorrect file.');
     log('Actual:', cyan(firstLineFile));
@@ -169,12 +153,15 @@ function checkSourcemapMappings(sourcemapJson, map) {
 
 /**
  * @param {string} map The map filepath to check
+ * @param {boolean} checkMappings Whether to test a mapping points to a correct source.
  */
-function checkSourceMap(map) {
+function checkSourceMap(map, checkMappings) {
   const sourcemapJson = getSourcemapJson(map);
   checkSourcemapUrl(sourcemapJson, map);
   checkSourcemapSources(sourcemapJson, map);
-  checkSourcemapMappings(sourcemapJson, map);
+  if (checkMappings) {
+    checkSourcemapMappings(sourcemapJson, map);
+  }
 }
 
 /**
@@ -184,8 +171,12 @@ function checkSourceMap(map) {
  */
 async function checkSourcemaps() {
   maybeBuild();
-  checkSourceMap(v0JsMap);
-  checkSourceMap(v0MjsMap);
+  checkSourceMap('dist/v0.js.map', true);
+  checkSourceMap('dist/v0.mjs.map', true);
+
+  checkSourceMap('dist/v0/amp-audio-0.1.js.map', false);
+  checkSourceMap('dist/v0/amp-audio-0.1.mjs.map', false);
+
   log(green('SUCCESS:'), 'All sourcemaps checks passed.');
 }
 
diff --git a/build-system/tasks/check-types.js b/build-system/tasks/check-types.js
index 9fb9c49d688a..2c08658e85a0 100644
--- a/build-system/tasks/check-types.js
+++ b/build-system/tasks/check-types.js
@@ -1,203 +1,34 @@
 const argv = require('minimist')(process.argv.slice(2));
-const fastGlob = require('fast-glob');
 const {
   createCtrlcHandler,
   exitCtrlcHandler,
 } = require('../common/ctrlcHandler');
-const {
-  displayLifecycleDebugging,
-} = require('../compile/debug-compilation-lifecycle');
-const {cleanupBuildDir, closureCompile} = require('../compile/compile');
 const {compileCss} = require('./css');
 const {compileJison} = require('./compile-jison');
-const {cyan, green, red, yellow} = require('kleur/colors');
+const {cyan, green} = require('kleur/colors');
 const {execOrThrow} = require('../common/exec');
-const {extensions, maybeInitializeExtensions} = require('./extension-helpers');
-const {logClosureCompilerError} = require('../compile/closure-compile');
 const {log} = require('../common/logging');
-const {typecheckNewServer} = require('../server/typescript-compile');
-
-// We provide glob lists for core src/externs since any other targets are
-// allowed to depend on core.
-const CORE_SRCS_GLOBS = [
-  'src/core/**/*.js',
-
-  // Needed for CSS escape polyfill
-  'third_party/css-escape/css-escape.js',
-];
-
-/**
- * Generates a list of source file paths for extensions to type-check
- * Must be run after `maybeInitializeExtensions`
- * @function
- * @return {!Array<string>}
- */
-const getExtensionSrcPaths = () =>
-  Object.values(extensions)
-    .filter((ext) => !ext.noTypeCheck)
-    .map(({name, version}) => `extensions/${name}/${version}/${name}.js`)
-    .sort();
 
 /**
  * Object of targets to check with TypeScript.
  *
- * @type {Object<string, string>}
+ * @type {{[key: string]: string}}
  */
 const TSC_TYPECHECK_TARGETS = {
-  'compiler': 'src/compiler',
   'carousel': 'extensions/amp-carousel/0.1',
+  'compiler': 'src/compiler',
+  'core': 'src/core',
+  'experiments': 'src/experiments',
+  'preact': 'src/preact',
+  'new-server': 'build-system/server/new-server/transforms',
 };
 
-/**
- * The main configuration location to add/edit targets for type checking.
- * Properties besides `entryPoints` are passed on to `closureCompile` as
- * options. * Values may be objects or functions, as some require initialization
- * or filesystem access and shouldn't be run until needed.
- *
- * When updating type-check targets, `srcGlobs` is the primary value you care
- * about. This is a list of source files to include in type-checking. For any
- * glob pattern ending in *.js, externs are picked up following the same pattern
- * but ending in *.extern.js. Note this only applies to *.js globs, and not
- * specific filenames. If just an array of strings is provided instead of an
- * object, it is treated as srcGlobs.
- *
- * @type {Object<string, Array<string>|Object|function():Object>}
- */
-const CLOSURE_TYPE_CHECK_TARGETS = {
-  // Below are targets containing individual directories which are fully passing
-  // type-checking. Do not remove or disable anything on this list.
-  // Goal: Remove 'QUIET' from all of them.
-  // To test a target locally:
-  //   `amp check-types --target=src-foo-bar --warning_level=verbose`
-  'src-amp-story-player': {
-    srcGlobs: ['src/amp-story-player/**/*.js'],
-    warningLevel: 'QUIET',
-  },
-  'src-core': CORE_SRCS_GLOBS,
-  'src-experiments': ['src/experiments/**/*.js', ...CORE_SRCS_GLOBS],
-  'src-inabox': {
-    srcGlobs: ['src/inabox/**/*.js'],
-    warningLevel: 'QUIET',
-  },
-  'src-polyfills': [
-    'src/polyfills/**/*.js',
-    // Exclude fetch its dependencies are cleaned up/extracted to core.
-    '!src/polyfills/fetch.js',
-    ...CORE_SRCS_GLOBS,
-  ],
-  'src-preact': {
-    srcGlobs: ['src/preact/**/*.js', ...CORE_SRCS_GLOBS],
-    warningLevel: 'QUIET',
-  },
-  'src-purifier': {
-    srcGlobs: ['src/purifier/**/*.js'],
-    warningLevel: 'QUIET',
-  },
-  'src-service': {
-    srcGlobs: ['src/service/**/*.js'],
-    warningLevel: 'QUIET',
-  },
-  'src-utils': {
-    srcGlobs: ['src/utils/**/*.js'],
-    warningLevel: 'QUIET',
-  },
-  'src-web-worker': {
-    srcGlobs: ['src/web-worker/**/*.js'],
-    warningLevel: 'QUIET',
-  },
-
-  // Ensures that all files in src and extensions pass the specified set of
-  // errors.
-  'low-bar': {
-    entryPoints: ['src/amp.js'],
-    extraGlobs: ['{src,extensions}/**/*.js', ...getLowBarExclusions()],
-    onError(msg) {
-      const lowBarErrors = [
-        'JSC_BAD_JSDOC_ANNOTATION',
-        'JSC_INVALID_PARAM',
-        'JSC_TYPE_PARSE_ERROR',
-      ];
-      const lowBarRegex = new RegExp(lowBarErrors.join('|'));
-
-      const targetErrors = msg
-        .split('\n')
-        .filter((s) => lowBarRegex.test(s))
-        .join('\n')
-        .trim();
-
-      if (targetErrors.length) {
-        logClosureCompilerError(targetErrors);
-        throw new Error(`Type-checking failed for target ${cyan('low-bar')}`);
-      }
-    },
-  },
-
-  // TODO(#33631): Targets below this point are not expected to pass.
-  // They can possibly be removed?
-  'src': {
-    entryPoints: [
-      'src/amp.js',
-      'src/amp-shadow.js',
-      'src/inabox/amp-inabox.js',
-      'ads/alp/install-alp.js',
-      'ads/inabox/inabox-host.js',
-      'src/web-worker/web-worker.js',
-    ],
-    extraGlobs: ['src/inabox/*.js', '!node_modules/preact/**'],
-    warningLevel: 'QUIET',
-  },
-  'extensions': () => ({
-    entryPoints: getExtensionSrcPaths(),
-    extraGlobs: ['src/inabox/*.js', '!node_modules/preact/**'],
-    warningLevel: 'QUIET',
-  }),
-  'integration': {
-    entryPoints: '3p/integration.js',
-    externs: ['ads/ads.extern.js'],
-    warningLevel: 'QUIET',
-  },
-  'ampcontext': {
-    entryPoints: '3p/ampcontext-lib.js',
-    externs: ['ads/ads.extern.js'],
-    warningLevel: 'QUIET',
-  },
-  'iframe-transport-client': {
-    entryPoints: '3p/iframe-transport-client-lib.js',
-    externs: ['ads/ads.extern.js'],
-    warningLevel: 'QUIET',
-  },
-};
-
-/**
- * Produces a list of extern glob patterns from a list of source glob patterns.
- * ex. ['src/core/** /*.js'] => ['src/core/** /*.extern.js']
- * @param {!Array<string>} srcGlobs
- * @return {!Array<string>}
- */
-function externGlobsFromSrcGlobs(srcGlobs) {
-  return srcGlobs
-    .filter((glob) => glob.endsWith('*.js'))
-    .map((glob) => glob.replace(/\*\.js$/, '*.extern.js'));
-}
-
-/**
- * Typecheck the given target using either tsc or closure.
- *
- * @param {string} targetName
- * @return {Promise<void>}
- */
-async function typeCheck(targetName) {
-  return TSC_TYPECHECK_TARGETS[targetName]
-    ? tscTypeCheck(targetName)
-    : closureTypeCheck(targetName);
-}
-
 /**
  * Performs tsc type-checking on the target provided.
  * @param {string} targetName key in TSC_TYPECHECK_TARGETS
  * @return {!Promise<void>}
  */
-async function tscTypeCheck(targetName) {
+async function typeCheck(targetName) {
   execOrThrow(
     `npx -p typescript tsc --project ${TSC_TYPECHECK_TARGETS[targetName]}/tsconfig.json`,
     `Type checking ${targetName} failed`
@@ -206,96 +37,7 @@ async function tscTypeCheck(targetName) {
 }
 
 /**
- * Returns the exclusion glob for telling closure to ignore all paths
- * being checked via TS.
- *
- * @return {string[]}
- */
-function getLowBarExclusions() {
-  return Object.values(TSC_TYPECHECK_TARGETS).map((dir) => `!${dir}`);
-}
-
-/**
- * Performs closure type-checking on the target provided.
- * @param {string} targetName key in CLOSURE_TYPE_CHECK_TARGETS
- * @return {!Promise<void>}
- */
-async function closureTypeCheck(targetName) {
-  let target = CLOSURE_TYPE_CHECK_TARGETS[targetName];
-  // Allow targets to be dynamically evaluated
-  if (typeof target == 'function') {
-    target = target();
-  }
-  // Allow targets to be specified as just an array of source globs
-  if (Array.isArray(target)) {
-    target = {srcGlobs: target};
-  }
-
-  if (!target) {
-    log(
-      red('ERROR:'),
-      'No type-check configuration defined for target',
-      cyan(targetName)
-    );
-    throw new Error(
-      `No type-check configuration defined for target ${targetName}`
-    );
-  }
-
-  const {entryPoints = [], srcGlobs = [], externGlobs = [], ...opts} = target;
-  externGlobs.push(...externGlobsFromSrcGlobs(srcGlobs));
-
-  // If srcGlobs and externGlobs are defined, determine the externs/extraGlobs
-  if (srcGlobs.length || externGlobs.length) {
-    opts.externs = externGlobs.flatMap(fastGlob.sync);
-
-    // Included globs should explicitly exclude any externs
-    const excludedExterns = externGlobs.map((glob) => `!${glob}`);
-    opts.extraGlobs = srcGlobs.concat(excludedExterns);
-  }
-
-  // If no entry point is defined, we want to scan the globs provided without
-  // injecting extra dependencies.
-  const noAddDeps = !entryPoints.length;
-  // If the --warning_level flag is passed explicitly, it takes precedence.
-  opts.warningLevel = argv.warning_level || opts.warningLevel || 'VERBOSE';
-
-  // For type-checking, QUIET suppresses all warnings and can't affect the
-  // resulting status, so there's no point in doing it.
-  if (opts.warningLevel == 'QUIET') {
-    log(
-      yellow('WARNING:'),
-      'Warning level for target',
-      cyan(targetName),
-      `is set to ${cyan('QUIET')}; skipping`
-    );
-    return;
-  }
-
-  let errorMsg;
-  if (target.onError) {
-    // If an onError handler is defined, steal the output and let onError handle
-    // logging
-    opts.logger = (m) => (errorMsg = m);
-  }
-
-  await closureCompile(entryPoints, './dist', `${targetName}-check-types.js`, {
-    noAddDeps,
-    include3pDirectories: !noAddDeps,
-    includePolyfills: !noAddDeps,
-    typeCheckOnly: true,
-    ...opts,
-  }).catch((error) => {
-    if (!target.onError) {
-      throw error;
-    }
-    target.onError(errorMsg);
-  });
-  log(green('SUCCESS:'), 'Type-checking passed for target', cyan(targetName));
-}
-
-/**
- * Runs closure compiler's type checker against all AMP code.
+ * Runs TypeScript Compiler's type checker.
  * @return {!Promise<void>}
  */
 async function checkTypes() {
@@ -303,18 +45,14 @@ async function checkTypes() {
 
   // Prepare build environment
   process.env.NODE_ENV = 'production';
-  cleanupBuildDir();
-  maybeInitializeExtensions();
-  typecheckNewServer();
   await Promise.all([compileCss(), compileJison()]);
 
   // Use the list of targets if provided, otherwise check all targets
   const targets = argv.targets
     ? argv.targets.split(/,/)
-    : Object.keys({...TSC_TYPECHECK_TARGETS, ...CLOSURE_TYPE_CHECK_TARGETS});
+    : Object.keys(TSC_TYPECHECK_TARGETS);
 
   log(`Checking types for targets: ${targets.map(cyan).join(', ')}`);
-  displayLifecycleDebugging();
 
   await Promise.all(targets.map(typeCheck));
   exitCtrlcHandler(handlerProcess);
@@ -327,9 +65,5 @@ module.exports = {
 /* eslint "local/camelcase": 0 */
 checkTypes.description = 'Check source code for JS type errors';
 checkTypes.flags = {
-  closure_concurrency: 'Set the number of concurrent invocations of closure',
-  debug: 'Output the file contents during compilation lifecycles',
   targets: 'Comma-delimited list of targets to type-check',
-  warning_level:
-    "Optionally set closure's warning level to one of [quiet, default, verbose]",
 };
diff --git a/build-system/tasks/cherry-pick.js b/build-system/tasks/cherry-pick.js
deleted file mode 100644
index 656ce2b86a85..000000000000
--- a/build-system/tasks/cherry-pick.js
+++ /dev/null
@@ -1,130 +0,0 @@
-'use strict';
-
-const argv = require('minimist')(process.argv.slice(2));
-const {cyan, green, red, yellow} = require('kleur/colors');
-const {execOrThrow} = require('../common/exec');
-const {getOutput} = require('../common/process');
-const {log} = require('../common/logging');
-
-/**
- * Determines the name of the cherry-pick branch.
- *
- * @param {string} version
- * @param {number} numCommits
- * @return {string}
- */
-function cherryPickBranchName(version, numCommits) {
-  const timestamp = version.slice(0, -3);
-  const suffixNumber = Number(version.slice(-3)) + numCommits;
-  const suffix = String(suffixNumber).padStart(3, '0');
-  return `amp-release-${timestamp}${suffix}`;
-}
-
-/**
- * Updates tags from the remote and creates a branch at the release commit.
- *
- * @param {string} ref
- * @param {string} branch
- * @param {string} remote
- */
-function prepareBranch(ref, branch, remote) {
-  log(green('INFO:'), 'Pulling latest from', cyan(remote));
-  execOrThrow(
-    `git pull ${remote}`,
-    `Failed to pull latest from remote ${cyan(remote)}`
-  );
-
-  execOrThrow(
-    `git checkout -b ${branch} ${ref}`,
-    `Failed to checkout new branch at ref ${cyan(ref)}`
-  );
-}
-
-/**
- * Cherry-picks a commit into a new branch. When the cherry-pick succeeds,
- * returns `true`. In the event of a merge conflict, the cherry-pick is aborted
- * and an error is thrown.
- *
- * @param {string} sha
- */
-function performCherryPick(sha) {
-  try {
-    log(green('INFO:'), 'Cherry-picking commit', cyan(sha));
-    execOrThrow(
-      `git cherry-pick -x ${sha}`,
-      `Failed to cherry-pick commit ${cyan(sha)}; aborting`
-    );
-  } catch (e) {
-    log(green('INFO:'), 'Aborting cherry-pick of commit', cyan(sha));
-    getOutput(`git cherry-pick --abort`);
-    throw e;
-  }
-}
-
-/**
- * @return {Promise<void>}
- */
-async function cherryPick() {
-  const {push, remote = 'origin'} = argv;
-  const commits = (argv.commits || '').split(',').filter(Boolean);
-  let onto = String(argv.onto || '');
-
-  if (!commits.length) {
-    throw new Error('Must provide commit list with --commits');
-  }
-  if (!onto) {
-    throw new Error('Must provide 13-digit AMP version with --onto');
-  }
-  if (onto.length === 15) {
-    log(
-      yellow('WARNING:'),
-      'Expected a 13-digit AMP version but got a 15-digit RTV;',
-      'ignoring channel prefix'
-    );
-    // Be forgiving if someone provides a version instead of a full RTV.
-    onto = onto.substr(2);
-  }
-  if (onto.length !== 13) {
-    throw new Error('Expected 13-digit AMP version');
-  }
-
-  const branch = cherryPickBranchName(onto, commits.length);
-  try {
-    prepareBranch(onto, branch, remote);
-    commits.forEach(performCherryPick);
-
-    if (push) {
-      log(
-        green('INFO:'),
-        'Pushing branch',
-        cyan(branch),
-        'to remote',
-        cyan(remote)
-      );
-      execOrThrow(
-        `git push --set-upstream ${remote} ${branch}`,
-        `Failed to push branch ${cyan(branch)} to remote ${cyan(remote)}`
-      );
-    }
-
-    log(
-      green('SUCCESS:'),
-      `Cherry-picked ${commits.length} commits onto release ${onto}`
-    );
-  } catch (e) {
-    log(red('ERROR:'), e.message);
-    log('Deleting branch', cyan(branch));
-    getOutput(`git checkout main && git branch -d ${branch}`);
-    throw e;
-  }
-}
-
-module.exports = {cherryPick};
-
-cherryPick.description = 'Cherry-pick one or more commits onto a new branch';
-cherryPick.flags = {
-  'commits': 'Comma-delimited list of commit SHAs to cherry-pick',
-  'push': 'If set, push the created branch to the remote',
-  'remote': 'Remote ref to refresh tags from (default: origin)',
-  'onto': '13-digit AMP version to cherry-pick onto',
-};
diff --git a/build-system/tasks/codecov-upload.js b/build-system/tasks/codecov-upload.js
deleted file mode 100644
index 54ff8245663c..000000000000
--- a/build-system/tasks/codecov-upload.js
+++ /dev/null
@@ -1,69 +0,0 @@
-'use strict';
-
-const colors = require('kleur/colors');
-const fs = require('fs-extra');
-const {ciBuildSha, isCiBuild} = require('../common/ci');
-const {getStdout} = require('../common/process');
-const {log} = require('../common/logging');
-const {shortSha} = require('../common/git');
-
-const {cyan, green, yellow} = colors;
-const CODECOV_EXEC = './node_modules/.bin/codecov';
-const COVERAGE_REPORTS = {
-  'unit_tests': 'test/coverage/lcov-unit.info',
-  'integration_tests': 'test/coverage/lcov-integration.info',
-  'e2e_tests': 'test/coverage-e2e/lcov.info',
-};
-
-/**
- * Uploads a single report
- * @param {string} file
- * @param {string} flags
- */
-function uploadReport(file, flags) {
-  const codecovCmd = `${CODECOV_EXEC} --file=${file} --flags=${flags}`;
-  const output = getStdout(codecovCmd);
-  const viewReportPrefix = 'View report at: ';
-  const viewReport = output.match(`${viewReportPrefix}.*`);
-  if (viewReport && viewReport.length > 0) {
-    log(green('INFO:'), 'Uploaded', cyan(file));
-  } else {
-    log(
-      yellow('WARNING:'),
-      'Code coverage report upload may have failed:\n',
-      yellow(output)
-    );
-  }
-}
-
-/**
- * Uploads code coverage reports for unit / integration tests during CI builds.
- * @return {Promise<void>}
- */
-async function codecovUpload() {
-  if (!isCiBuild()) {
-    log(
-      yellow('WARNING:'),
-      'Code coverage reports can only be uploaded by CI builds.'
-    );
-    return;
-  }
-
-  const commitSha = shortSha(ciBuildSha());
-  log(
-    green('INFO:'),
-    'Uploading coverage reports to',
-    cyan(`https://codecov.io/gh/ampproject/amphtml/commit/${commitSha}`)
-  );
-
-  Object.entries(COVERAGE_REPORTS)
-    .filter(([, reportFile]) => fs.existsSync(reportFile))
-    .forEach(([testType, reportFile]) => uploadReport(reportFile, testType));
-}
-
-module.exports = {
-  codecovUpload,
-};
-
-codecovUpload.description =
-  'Upload code coverage reports to codecov.io during CI';
diff --git a/build-system/tasks/create-golden-css/css/main.css b/build-system/tasks/create-golden-css/css/main.css
index 9f8f73f14fb7..c8e612173c76 100644
--- a/build-system/tasks/create-golden-css/css/main.css
+++ b/build-system/tasks/create-golden-css/css/main.css
@@ -535,7 +535,7 @@ amp-pixel {
 
 /**
  * Instagram wraps the standard image into a fixed size container.
- * With these offsets, users can simply specify the the size of the
+ * With these offsets, users can simply specify the size of the
  * instagram images and things have the right size.
  * In particular the effect of adding padding to this container is
  * that with responsive layouts the responsiveness is based on the
diff --git a/build-system/tasks/css/bento-css.js b/build-system/tasks/css/bento-css.js
deleted file mode 100644
index 2090990326ca..000000000000
--- a/build-system/tasks/css/bento-css.js
+++ /dev/null
@@ -1,50 +0,0 @@
-const CssSelectorTokenizer = require('css-selector-tokenizer');
-const postcss = require('postcss');
-const {getBentoName} = require('../bento-helpers');
-
-/**
- * @param {string} selector
- * @return {string}
- */
-function renameTagNamesInSelector(selector) {
-  const tree = CssSelectorTokenizer.parse(selector);
-  const nodes = [tree];
-  while (nodes.length > 0) {
-    const node = nodes.pop();
-    if (!node) {
-      continue;
-    }
-    if (node.type === 'element') {
-      node.name = getBentoName(node.name);
-    }
-    if (Array.isArray(node.nodes)) {
-      nodes.push(...node.nodes);
-    }
-  }
-  return CssSelectorTokenizer.stringify(tree);
-}
-
-/**
- * @param {postcss.Root} root
- */
-function renameTagNamesInSelectorPostCssPlugin(root) {
-  root.walkRules((rule) => {
-    if (rule.selector) {
-      rule.selector = renameTagNamesInSelector(rule.selector);
-    }
-  });
-}
-
-/**
- * Renames element selectors in a CSS file from amp-* to bento-*
- * @param {string} css
- * @return {!Promise<string>} The transformed CSS source
- */
-async function renameSelectorsToBentoTagNames(css) {
-  const result = await postcss
-    .default([renameTagNamesInSelectorPostCssPlugin])
-    .process(css);
-  return result.css;
-}
-
-module.exports = {renameSelectorsToBentoTagNames};
diff --git a/build-system/tasks/css/index.js b/build-system/tasks/css/index.js
index 1074eb28848f..86a51299d780 100644
--- a/build-system/tasks/css/index.js
+++ b/build-system/tasks/css/index.js
@@ -77,7 +77,7 @@ async function copyCss() {
   for (const {outCss} of cssEntryPoints) {
     await fs.copy(`build/css/${outCss}`, `dist/${outCss}`);
   }
-  const cssFiles = await fastGlob('build/css/amp-*.css');
+  const cssFiles = await fastGlob('build/css/*.css');
   await Promise.all(
     cssFiles.map((cssFile) => {
       return fs.copy(cssFile, `dist/v0/${path.basename(cssFile)}`);
@@ -137,7 +137,8 @@ async function compileCss(options = {}) {
   for (const {append, outCss, outJs, path} of cssEntryPoints) {
     await writeCssEntryPoint(path, outJs, outCss, append);
   }
-  await buildExtensions({compileOnlyCss: true});
+  const buildOptions = {compileOnlyCss: true};
+  await buildExtensions(buildOptions);
   endBuildStep('Recompiled all CSS files into', 'build/', startTime);
 }
 
diff --git a/build-system/tasks/css/jsify-css-sync.js b/build-system/tasks/css/jsify-css-sync.js
index bca0cb065c38..7e69ade387a2 100644
--- a/build-system/tasks/css/jsify-css-sync.js
+++ b/build-system/tasks/css/jsify-css-sync.js
@@ -11,7 +11,7 @@ let syncTransformer;
  * @param {string} cssStr the css text to transform
  * @param {!Object=} opt_cssnano cssnano options
  * @param {!Object=} opt_filename the filename of the file being transformed. Used for sourcemaps generation.
- * @return {Object} The transformation result
+ * @return {object} The transformation result
  */
 function transformCssSync(cssStr, opt_cssnano, opt_filename) {
   if (!syncTransformer) {
diff --git a/build-system/tasks/css/jsify-css.js b/build-system/tasks/css/jsify-css.js
index 7a9eeb22cab5..e1a912511111 100644
--- a/build-system/tasks/css/jsify-css.js
+++ b/build-system/tasks/css/jsify-css.js
@@ -41,7 +41,7 @@ const cssNanoDefaultOptions = {
   reduceInitial: false,
   zindex: false,
   svgo: {
-    encode: true,
+    encode: false,
   },
 };
 
@@ -66,15 +66,15 @@ function getEnvironmentHash() {
 }
 
 /**
- * Used to cache css transforms done by postcss.
- * @const {TransformCache}
+ * @typedef {{css: string, warnings: string[]}}:
  */
-let transformCache;
+let CssTransformResultDef;
 
 /**
- * @typedef {{css: string, warnings: string[]}}:
+ * Used to cache css transforms done by postcss.
+ * @type {TransformCache<CssTransformResultDef>}
  */
-let CssTransformResultDef;
+let transformCache;
 
 /**
  * Transform a css string using postcss.
@@ -139,18 +139,15 @@ async function getCssImports(cssFile) {
  */
 async function transformCss(contents, hash, opt_filename) {
   if (!transformCache) {
-    transformCache = new TransformCache('.css-cache', '.css');
+    transformCache = new TransformCache('.css-cache');
   }
   const cached = transformCache.get(hash);
   if (cached) {
-    return JSON.parse((await cached).toString());
+    return cached;
   }
 
   const transformed = transform(contents, opt_filename);
-  transformCache.set(
-    hash,
-    transformed.then((r) => JSON.stringify(r))
-  );
+  transformCache.set(hash, transformed);
   return transformed;
 }
 
diff --git a/build-system/tasks/css/test/bento-css.test.js b/build-system/tasks/css/test/bento-css.test.js
deleted file mode 100644
index 4a9e160e0410..000000000000
--- a/build-system/tasks/css/test/bento-css.test.js
+++ /dev/null
@@ -1,101 +0,0 @@
-const test = require('ava');
-const {renameSelectorsToBentoTagNames} = require('../bento-css');
-
-async function renameSelectorsToBentoTagNamesExpected(t, input, expected) {
-  const output = await renameSelectorsToBentoTagNames(input);
-  t.is(output, expected);
-}
-
-test(
-  'renames amp-* selectors to bento-* (simple)',
-  renameSelectorsToBentoTagNamesExpected,
-  `amp-foo {
-    background: red;
-  }`,
-  `bento-foo {
-    background: red;
-  }`
-);
-
-test(
-  'renames amp-* selectors to bento-* (nested)',
-  renameSelectorsToBentoTagNamesExpected,
-  `@media screen {
-    amp-foo {
-      background: red;
-    }
-  }`,
-  `@media screen {
-    bento-foo {
-      background: red;
-    }
-  }`
-);
-
-test(
-  'renames amp-* selectors to bento-* (multiple)',
-  renameSelectorsToBentoTagNamesExpected,
-  `amp-foo {
-    background: red;
-  }
-  amp-bar {
-    color: blue;
-  }
-  div {
-    transform: translate(100%, 0);
-  }
-  has-amp-but-does-not-start-with-amp- {
-    background: yellow;
-  }`,
-  `bento-foo {
-    background: red;
-  }
-  bento-bar {
-    color: blue;
-  }
-  div {
-    transform: translate(100%, 0);
-  }
-  has-amp-but-does-not-start-with-amp- {
-    background: yellow;
-  }`
-);
-
-test(
-  'renames amp-* selectors to bento-* (mixed selector)',
-  renameSelectorsToBentoTagNamesExpected,
-  `amp-foo > div .amp-bar:not(amp-whatever) {
-    background: red;
-  }`,
-  `bento-foo > div .amp-bar:not(bento-whatever) {
-    background: red;
-  }`
-);
-
-test(
-  'renames amp-* selectors to bento-* (ignores @rule names)',
-  renameSelectorsToBentoTagNamesExpected,
-  `@keyframes amp-x {
-    from {
-      opacity: 0;
-    }
-    to {
-      opacity: 1;
-    }
-  }`,
-  `@keyframes amp-x {
-    from {
-      opacity: 0;
-    }
-    to {
-      opacity: 1;
-    }
-  }`
-);
-
-test(
-  'renames amp-* selectors to bento-* (preserves minification)',
-  renameSelectorsToBentoTagNamesExpected,
-  `amp-foo>div:not(.amp-classname){background:red}amp-whatever{color:blue}`,
-  `bento-foo>div:not(.amp-classname){background:red}bento-whatever{color:blue}`
-);
diff --git a/build-system/tasks/default-task.js b/build-system/tasks/default-task.js
index ad07454578c5..c74fe4c2ae47 100644
--- a/build-system/tasks/default-task.js
+++ b/build-system/tasks/default-task.js
@@ -61,7 +61,6 @@ defaultTask.flags = {
   fortesting: 'Compile production binaries for local testing',
   noconfig: 'Compile production binaries without applying AMP_CONFIG',
   config: 'Set the runtime\'s AMP_CONFIG to one of "prod" or "canary"',
-  closure_concurrency: 'Set the number of concurrent invocations of closure',
   extensions: 'Pre-build the given extensions, lazily builds the rest.',
   extensions_from:
     'Pre-build the extensions used by the provided example page.',
diff --git a/build-system/tasks/dep-check.js b/build-system/tasks/dep-check.js
index 2648abbcea68..ce662c5a6b81 100644
--- a/build-system/tasks/dep-check.js
+++ b/build-system/tasks/dep-check.js
@@ -3,7 +3,7 @@
 const depCheckConfig = require('../test-configs/dep-check-config');
 const esbuild = require('esbuild');
 const fs = require('fs-extra');
-const minimatch = require('minimatch');
+const {minimatch} = require('minimatch');
 const path = require('path');
 const {
   createCtrlcHandler,
diff --git a/build-system/tasks/dist.js b/build-system/tasks/dist.js
index f1600b97ce79..f276e3db3c67 100644
--- a/build-system/tasks/dist.js
+++ b/build-system/tasks/dist.js
@@ -12,10 +12,6 @@ const {
   printConfigHelp,
   printNobuildHelp,
 } = require('./helpers');
-const {
-  cleanupBuildDir,
-  printClosureConcurrency,
-} = require('../compile/compile');
 const {
   createCtrlcHandler,
   exitCtrlcHandler,
@@ -28,12 +24,16 @@ const {
 } = require('../compile/internal-version');
 const {buildCompiler} = require('../compile/build-compiler');
 const {buildExtensions, parseExtensionFlags} = require('./extension-helpers');
-const {buildVendorConfigs} = require('./3p-vendor-helpers');
+const {
+  buildVendorConfigs,
+  shouldBuildVendorConfigs,
+} = require('./3p-vendor-helpers');
 const {compileCss, copyCss} = require('./css');
 const {compileJison} = require('./compile-jison');
 const {formatExtractedMessages} = require('../compile/log-messages');
 const {log} = require('../common/logging');
 const {VERSION} = require('../compile/internal-version');
+const {buildStoryLocalization} = require('./build-story-localization');
 
 const {cyan, green} = colors;
 const argv = require('minimist')(process.argv.slice(2));
@@ -89,13 +89,13 @@ function printDistHelp(options) {
  * @return {Promise<void>}
  */
 async function runPreDistSteps(options) {
-  cleanupBuildDir();
   await prebuild();
   await compileCss(options);
   await copyCss();
   await compileJison();
   await copyParsers();
   await bootstrapThirdPartyFrames(options);
+  await buildStoryLocalization(options);
   displayLifecycleDebugging();
 }
 
@@ -111,7 +111,6 @@ async function dist() {
     minify: true,
     watch: argv.watch,
   };
-  printClosureConcurrency();
   printNobuildHelp();
   printDistHelp(options);
   await runPreDistSteps(options);
@@ -134,12 +133,7 @@ async function dist() {
   await buildExtensions(options);
 
   // This step is to be run only during a full `amp dist`.
-  if (
-    !argv.core_runtime_only &&
-    !argv.extensions &&
-    !argv.extensions_from &&
-    !argv.noextensions
-  ) {
+  if (shouldBuildVendorConfigs()) {
     await buildVendorConfigs(options);
   }
 
@@ -206,10 +200,6 @@ function buildLoginDone(version) {
     minify: true,
     minifiedName,
     aliasName,
-    extraGlobs: [
-      `${buildDir}/amp-login-done-0.1.max.js`,
-      `${buildDir}/amp-login-done-dialog.js`,
-    ],
   });
 }
 
@@ -229,7 +219,6 @@ async function buildWebPushPublisherFiles() {
         includePolyfills: true,
         minify: true,
         minifiedName,
-        extraGlobs: [`${tempBuildDir}/*.js`],
       });
     }
   }
@@ -398,25 +387,26 @@ dist.flags = {
     'Output code with whitespace (useful while profiling / debugging production code)',
   fortesting: 'Compile production binaries for local testing',
   noconfig: 'Compile production binaries without applying AMP_CONFIG',
+  nomanglecache:
+    'Do not share the mangle cache between binaries, useful only in estimating size impacts of code changes.',
   config: 'Set the runtime\'s AMP_CONFIG to one of "prod" or "canary"',
   coverage: 'Instrument code for collecting coverage information',
   extensions: 'Build only the listed extensions',
   extensions_from: 'Build only the extensions from the listed AMP(s)',
   noextensions: 'Build with no extensions',
   core_runtime_only: 'Build only the core runtime',
+  vendor_configs:
+    'Build 3p party vendor configuration files (defaults to true unless one of --core_runtime_only, --extensions, or --extensions_from is set)',
   full_sourcemaps: 'Include source code content in sourcemaps',
   sourcemap_url: 'Set a custom sourcemap URL with placeholder {version}',
   type: 'Point sourcemap to fetch files from the correct GitHub tag',
   esm: 'Do not transpile down to ES5',
   version_override: 'Override the version written to AMP_CONFIG',
   watch: 'Watch for changes in files, re-compiles when detected',
-  closure_concurrency: 'Set the number of concurrent invocations of closure',
   debug: 'Output the file contents during compilation lifecycles',
   define_experiment_constant:
     'Build runtime with the EXPERIMENT constant set to true',
   sanitize_vars_for_diff:
     'Sanitize the output to diff build results (requires --pseudo_names)',
   sxg: 'Output the minified code for the SxG build',
-  warning_level:
-    "Optionally set closure's warning level to one of [quiet, default, verbose]",
 };
diff --git a/build-system/tasks/e2e/.npmrc b/build-system/tasks/e2e/.npmrc
new file mode 100644
index 000000000000..dc7716326768
--- /dev/null
+++ b/build-system/tasks/e2e/.npmrc
@@ -0,0 +1 @@
+chromedriver_skip_download=true
diff --git a/build-system/tasks/e2e/OWNERS b/build-system/tasks/e2e/OWNERS
index d7634080ca7f..7e8e78b7cd46 100644
--- a/build-system/tasks/e2e/OWNERS
+++ b/build-system/tasks/e2e/OWNERS
@@ -6,7 +6,6 @@
     {
       owners: [
         {name: 'ampproject/wg-infra'},
-        {name: 'estherkim', notify: true},
       ],
     },
   ],
diff --git a/build-system/tasks/e2e/amp-driver.js b/build-system/tasks/e2e/amp-driver.js
index 4ddf1dc2954a..c393b28fafee 100644
--- a/build-system/tasks/e2e/amp-driver.js
+++ b/build-system/tasks/e2e/amp-driver.js
@@ -119,7 +119,7 @@ const EnvironmentBehaviorMap = {
 
 /**
  * @param {string} url
- * @param {{isEmail: boolean}=} opts
+ * @param {{isEmail: boolean}} opts
  * @return {string}
  */
 function getViewerUrl(url, {isEmail} = {isEmail: false}) {
diff --git a/build-system/tasks/e2e/controller-promise.js b/build-system/tasks/e2e/controller-promise.js
index 2b695579d42b..8632ff8226cd 100644
--- a/build-system/tasks/e2e/controller-promise.js
+++ b/build-system/tasks/e2e/controller-promise.js
@@ -27,8 +27,7 @@ class ControllerPromise extends Promise {
     /**
      * Returns a Promise that resolves when the given expected value fulfills
      * the given condition.
-     * @param {function(TYPE): ?TYPE} condition
-     * @return {!Promise<?TYPE>}
+     * @type {undefined|function(TYPE,function(TYPE): ?TYPE): Promise<TYPE>}
      */
     this.waitForValue = opt_waitForValue;
   }
diff --git a/build-system/tasks/e2e/describes-e2e.js b/build-system/tasks/e2e/describes-e2e.js
index f67ecd984073..ce72cfb194d3 100644
--- a/build-system/tasks/e2e/describes-e2e.js
+++ b/build-system/tasks/e2e/describes-e2e.js
@@ -4,9 +4,8 @@ require('geckodriver');
 
 const argv = require('minimist')(process.argv.slice(2));
 const chrome = require('selenium-webdriver/chrome');
-const fetch = require('node-fetch');
 const firefox = require('selenium-webdriver/firefox');
-const selenium = require('selenium-webdriver');
+const {Builder, logging} = require('selenium-webdriver');
 const {
   clearLastExpectError,
   getLastExpectError,
@@ -20,7 +19,6 @@ const {configureHelpers} = require('../../../testing/helpers');
 const {HOST, PORT} = require('../serve');
 const {installRepl, uninstallRepl} = require('./repl');
 const {isCiBuild} = require('../../common/ci');
-const {Builder, Capabilities, logging} = selenium;
 
 /** Should have something in the name, otherwise nothing is shown. */
 const SUB = ' ';
@@ -41,6 +39,9 @@ if (argv.coverage) {
   istanbulMiddleware = require('istanbul-middleware/lib/core');
 }
 
+/** @typedef {import('selenium-webdriver').WebDriver} WebDriver */
+/** @typedef {"chrome" | "firefox" | "safari"} BrowserNameDef */
+
 /**
  * @typedef {{
  *  browsers: string,
@@ -88,10 +89,10 @@ function getConfig() {
 
 /**
  * Configure and launch a Selenium instance
- * @param {string} browserName
+ * @param {BrowserNameDef} browserName
  * @param {!SeleniumConfigDef=} args
  * @param {string=} deviceName
- * @return {!selenium.WebDriver}
+ * @return {!WebDriver}
  */
 function createSelenium(browserName, args = {}, deviceName) {
   switch (browserName) {
@@ -101,24 +102,18 @@ function createSelenium(browserName, args = {}, deviceName) {
     case 'firefox':
       return createDriver(browserName, getFirefoxArgs(args), deviceName);
     case 'chrome':
-    default:
       return createDriver(browserName, getChromeArgs(args), deviceName);
   }
 }
 
 /**
  *
- * @param {string} browserName
+ * @param {BrowserNameDef} browserName
  * @param {!string[]} args
  * @param {string=} deviceName
- * @return {!selenium.WebDriver}
+ * @return {!WebDriver}
  */
 function createDriver(browserName, args, deviceName) {
-  const capabilities = Capabilities[browserName]();
-
-  const prefs = new logging.Preferences();
-  prefs.setLevel(logging.Type.PERFORMANCE, logging.Level.ALL);
-  capabilities.setLoggingPrefs(prefs);
   switch (browserName) {
     case 'firefox':
       const firefoxOptions = new firefox.Options();
@@ -131,19 +126,27 @@ function createDriver(browserName, args, deviceName) {
         .forBrowser('firefox')
         .setFirefoxOptions(firefoxOptions)
         .build();
+
     case 'chrome':
-      const chromeOptions = new chrome.Options(capabilities);
-      chromeOptions.addArguments(args);
+      const loggingPrefs = new logging.Preferences();
+      loggingPrefs.setLevel(logging.Type.PERFORMANCE, logging.Level.ALL);
+
+      const chromeOptions = new chrome.Options();
+      chromeOptions.setLoggingPrefs(loggingPrefs);
+      chromeOptions.addArguments(...args);
+      if (process.env.CHROME_BIN) {
+        chromeOptions.setChromeBinaryPath(process.env.CHROME_BIN);
+      }
       if (deviceName) {
         chromeOptions.setMobileEmulation({deviceName});
       }
-      const driver = chrome.Driver.createSession(chromeOptions);
-      //TODO(estherkim): workaround. `onQuit()` was added in selenium-webdriver v4.0.0-alpha.5
-      //which is also when `Server terminated early with status 1` began appearing. Coincidence? Maybe.
-      driver.onQuit = null;
-      return driver;
+      return new Builder()
+        .forBrowser('chrome')
+        .setChromeOptions(chromeOptions)
+        .build();
+
     case 'safari':
-      return new Builder().forBrowser(browserName).build();
+      return new Builder().forBrowser('safari').build();
   }
 }
 
@@ -279,7 +282,7 @@ envPresets['ampdoc-amp4ads-preset'] = envPresets['ampdoc-preset'].concat(
 class ItConfig {
   /**
    * @param {function} it
-   * @param {Object} env
+   * @param {object} env
    */
   constructor(it, env) {
     this.it = /** @type {Mocha.it} */ (it);
@@ -428,7 +431,7 @@ function describeEnv(factory) {
     }
 
     /**
-     * @param {string} browserName
+     * @param {BrowserNameDef} browserName
      */
     function createVariantDescribe(browserName) {
       for (const name in variants) {
@@ -450,8 +453,8 @@ function describeEnv(factory) {
     /**
      *
      * @param {string} _name
-     * @param {Object} variant
-     * @param {string} browserName
+     * @param {object} variant
+     * @param {BrowserNameDef} browserName
      */
     function doTemplate(_name, variant, browserName) {
       const env = Object.create(variant);
@@ -565,7 +568,7 @@ class EndToEndFixture {
 
   /**
    * @param {!Object} env
-   * @param {string} browserName
+   * @param {BrowserNameDef} browserName
    * @param {number} retries
    * @return {Promise<void>}
    */
@@ -633,9 +636,9 @@ class EndToEndFixture {
 /**
  * Get the driver for the configured engine.
  * @param {!DescribesConfigDef} describesConfig
- * @param {string} browserName
+ * @param {BrowserNameDef} browserName
  * @param {string|undefined} deviceName
- * @return {!selenium.WebDriver}
+ * @return {!WebDriver}
  */
 function getDriver({headless = false}, browserName, deviceName) {
   return createSelenium(browserName, {headless}, deviceName);
@@ -652,7 +655,7 @@ function getDriver({headless = false}, browserName, deviceName) {
  */
 async function setUpTest(
   {ampDriver, controller, environment},
-  {testUrl = '', version, experiments = [], initialRect}
+  {experiments = [], initialRect, testUrl = '', version}
 ) {
   const url = new URL(testUrl);
 
diff --git a/build-system/tasks/e2e/index.js b/build-system/tasks/e2e/index.js
index 0e6a1b258824..9a937d922d41 100644
--- a/build-system/tasks/e2e/index.js
+++ b/build-system/tasks/e2e/index.js
@@ -1,9 +1,8 @@
 'use strict';
 
 const argv = require('minimist')(process.argv.slice(2));
-const ciReporter = require('./mocha-ci-reporter');
+const CiReporter = require('./mocha-ci-reporter');
 const config = require('../../test-configs/config');
-const dotsReporter = require('./mocha-dots-reporter');
 const fs = require('fs');
 const glob = require('glob');
 const http = require('http');
@@ -26,8 +25,8 @@ const {log} = require('../../common/logging');
 const {maybePrintCoverageMessage} = require('../helpers');
 const {watch} = require('chokidar');
 
-const SLOW_TEST_THRESHOLD_MS = 2500;
-const TEST_RETRIES = isCiBuild() ? 2 : 0;
+const SLOW_TEST_THRESHOLD_MS = isCiBuild() ? 5000 : 2500;
+const TEST_RETRIES = isCiBuild() ? 3 : 0;
 
 const COV_DOWNLOAD_PATH = '/coverage/download';
 const COV_OUTPUT_DIR = './test/coverage-e2e';
@@ -63,15 +62,7 @@ async function setUpTesting_() {
  * @return {!Mocha}
  */
 function createMocha_() {
-  let reporter;
-  if (argv.testnames || argv.watch) {
-    reporter = '';
-  } else if (argv.report || isCircleciBuild()) {
-    // TODO(#28387) clean up this typing.
-    reporter = /** @type {*} */ (ciReporter);
-  } else {
-    reporter = dotsReporter;
-  }
+  const reporter = isCircleciBuild() ? CiReporter : undefined;
 
   return new Mocha({
     // e2e tests have a different standard for when a test is too slow,
@@ -79,7 +70,7 @@ function createMocha_() {
     slow: SLOW_TEST_THRESHOLD_MS,
     reporter,
     retries: TEST_RETRIES,
-    fullStackTrace: true,
+    fullTrace: true,
     reporterOptions: isCiBuild()
       ? {
           mochaFile: 'result-reports/e2e.xml',
@@ -110,7 +101,7 @@ async function fetchCoverage_(outDir) {
   // it can be accessed separately.
 
   // Clear out previous coverage data.
-  fs.rmdirSync(outDir, {recursive: true});
+  fs.rmSync(outDir, {recursive: true});
   fs.mkdirSync(outDir);
 
   const zipFilename = path.join(outDir, 'coverage.zip');
@@ -229,7 +220,6 @@ e2e.flags = {
   'watch': 'Watch for changes in files, runs corresponding test(s)',
   'headless': 'Run the browser in headless mode',
   'debug': 'Print debugging information while running tests',
-  'report': 'Write test result report to a local file',
   'coverage': 'Collect coverage data from instrumented code',
   'filelist': 'Run tests specified in this comma-separated list of test files',
 };
diff --git a/build-system/tasks/e2e/mocha-ci-reporter.js b/build-system/tasks/e2e/mocha-ci-reporter.js
index 726dc2b3e557..65e22248c6cf 100644
--- a/build-system/tasks/e2e/mocha-ci-reporter.js
+++ b/build-system/tasks/e2e/mocha-ci-reporter.js
@@ -1,22 +1,18 @@
+const {reporters} = require('mocha');
 const JsonReporter = require('./mocha-custom-json-reporter');
-const mocha = require('mocha');
-const MochaDotsReporter = require('./mocha-dots-reporter');
 const MochaJUnitReporter = require('mocha-junit-reporter');
-const {Base} = mocha.reporters;
 
-/**
- * @param {*} runner
- * @param {*} options
- * @return {MochaDotsReporter}
- */
-function ciReporter(runner, options) {
-  Base.call(this, runner, options);
-  this._mochaDotsReporter = new MochaDotsReporter(runner);
-  this._jsonReporter = new JsonReporter(runner);
-  this._mochaJunitReporter = new MochaJUnitReporter(runner, options);
-  // TODO(#28387) clean up this typing.
-  return /** @type {*} */ (this);
+class CiReporter extends reporters.Base {
+  /**
+   * @param {import('mocha').Runner} runner
+   * @param {import('mocha').MochaOptions} options
+   */
+  constructor(runner, options) {
+    super(runner, options);
+    this._mochaSpecReporter = new reporters.Spec(runner);
+    this._jsonReporter = new JsonReporter(runner);
+    this._mochaJunitReporter = new MochaJUnitReporter(runner, options);
+  }
 }
-ciReporter.prototype.__proto__ = Base.prototype;
 
-module.exports = ciReporter;
+module.exports = CiReporter;
diff --git a/build-system/tasks/e2e/mocha-custom-json-reporter.js b/build-system/tasks/e2e/mocha-custom-json-reporter.js
index a52ff1750cfc..8649fac96f46 100644
--- a/build-system/tasks/e2e/mocha-custom-json-reporter.js
+++ b/build-system/tasks/e2e/mocha-custom-json-reporter.js
@@ -14,7 +14,7 @@ const {
   EVENT_TEST_PENDING,
 } = mocha.Runner.constants;
 /**
- * @param {Object} output
+ * @param {object} output
  * @param {string} filename
  * @return {Promise<void>}
  */
diff --git a/build-system/tasks/e2e/mocha-dots-reporter.js b/build-system/tasks/e2e/mocha-dots-reporter.js
deleted file mode 100644
index b1c6af7be02e..000000000000
--- a/build-system/tasks/e2e/mocha-dots-reporter.js
+++ /dev/null
@@ -1,63 +0,0 @@
-'use strict';
-
-const Mocha = require('mocha');
-const {log, logWithoutTimestamp} = require('../../common/logging');
-const {
-  EVENT_RUN_BEGIN,
-  EVENT_RUN_END,
-  EVENT_TEST_FAIL,
-  EVENT_TEST_PASS,
-  EVENT_TEST_PENDING,
-} = Mocha.Runner.constants;
-const {Base} = Mocha.reporters;
-const {green, red, yellow} = require('kleur/colors');
-const {icon, nbDotsPerLine} =
-  require('../../test-configs/karma.conf').superDotsReporter;
-
-/**
- * Custom Mocha reporter for CI builds.
- * Mimics the style of the Karma super-dots reporter.
- * @param {*} runner
- */
-class MochaDotsReporter extends Base {
-  /**
-   * @param {*} runner
-   */
-  constructor(runner) {
-    super(runner);
-
-    let wrapCounter = 0;
-    const printDot = (dot) => {
-      process.stdout.write(dot);
-      if (++wrapCounter >= nbDotsPerLine) {
-        wrapCounter = 0;
-        process.stdout.write('\n');
-      }
-    };
-
-    runner
-      .once(EVENT_RUN_BEGIN, () => {
-        log('Running tests...');
-      })
-      .on(EVENT_TEST_PASS, () => {
-        printDot(green(icon.success));
-      })
-      .on(EVENT_TEST_FAIL, () => {
-        printDot(red(icon.failure));
-      })
-      .on(EVENT_TEST_PENDING, () => {
-        printDot(yellow(icon.ignore));
-      })
-      .once(EVENT_RUN_END, () => {
-        Base.list(this.failures);
-        const {failures, passes, pending, tests} = runner.stats;
-        logWithoutTimestamp(
-          `Executed ${failures + passes} of ${tests}`,
-          `(Skipped ${pending})`,
-          failures == 0 ? green('SUCCESS') : red(`${failures} FAILED`)
-        );
-      });
-  }
-}
-
-module.exports = MochaDotsReporter;
diff --git a/build-system/tasks/e2e/network-logger.js b/build-system/tasks/e2e/network-logger.js
index 7f044563a88a..2c618c36af21 100644
--- a/build-system/tasks/e2e/network-logger.js
+++ b/build-system/tasks/e2e/network-logger.js
@@ -32,8 +32,8 @@ export class NetworkLogger {
 
     return entries.filter((entry) => {
       const json = JSON.parse(entry.message);
-      entry.message = json.message;
-      return entry.message.method == networkMethod;
+      entry.message = json?.message;
+      return json.message?.method == networkMethod;
     });
   }
 
diff --git a/build-system/tasks/e2e/package-lock.json b/build-system/tasks/e2e/package-lock.json
index 8cd059b37172..66179e497494 100644
--- a/build-system/tasks/e2e/package-lock.json
+++ b/build-system/tasks/e2e/package-lock.json
@@ -8,21 +8,23 @@
       "name": "amp-e2e",
       "version": "0.1.0",
       "devDependencies": {
-        "@babel/register": "7.15.3",
+        "@babel/register": "7.25.9",
+        "@types/selenium-webdriver": "4.1.28",
         "babel-regenerator-runtime": "6.5.0",
-        "chromedriver": "95.0.0",
-        "geckodriver": "2.0.4",
-        "selenium-webdriver": "4.0.0"
+        "chromedriver": "131.0.5",
+        "geckodriver": "5.0.0",
+        "selenium-webdriver": "4.27.0"
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.15.8",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz",
-      "integrity": "sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz",
+      "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "@babel/highlight": "^7.14.5"
+        "@babel/highlight": "^7.23.4",
+        "chalk": "^2.4.2"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -70,15 +72,16 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.15.8",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.8.tgz",
-      "integrity": "sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz",
+      "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "@babel/types": "^7.15.6",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
+        "@babel/types": "^7.23.6",
+        "@jridgewell/gen-mapping": "^0.3.2",
+        "@jridgewell/trace-mapping": "^0.3.17",
+        "jsesc": "^2.5.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -103,42 +106,38 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz",
-      "integrity": "sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==",
+    "node_modules/@babel/helper-environment-visitor": {
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
       "dev": true,
       "peer": true,
-      "dependencies": {
-        "@babel/helper-get-function-arity": "^7.15.4",
-        "@babel/template": "^7.15.4",
-        "@babel/types": "^7.15.4"
-      },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-get-function-arity": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz",
-      "integrity": "sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA==",
+    "node_modules/@babel/helper-function-name": {
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "@babel/types": "^7.15.4"
+        "@babel/template": "^7.22.15",
+        "@babel/types": "^7.23.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz",
-      "integrity": "sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "@babel/types": "^7.15.4"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -233,22 +232,32 @@
       }
     },
     "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz",
-      "integrity": "sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "@babel/types": "^7.15.4"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
+      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.15.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz",
-      "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
       "dev": true,
       "peer": true,
       "engines": {
@@ -281,14 +290,14 @@
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
-      "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
+      "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.14.5",
-        "chalk": "^2.0.0",
+        "@babel/helper-validator-identifier": "^7.22.20",
+        "chalk": "^2.4.2",
         "js-tokens": "^4.0.0"
       },
       "engines": {
@@ -296,9 +305,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.15.8",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.8.tgz",
-      "integrity": "sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz",
+      "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==",
       "dev": true,
       "peer": true,
       "bin": {
@@ -309,15 +318,15 @@
       }
     },
     "node_modules/@babel/register": {
-      "version": "7.15.3",
-      "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.15.3.tgz",
-      "integrity": "sha512-mj4IY1ZJkorClxKTImccn4T81+UKTo4Ux0+OFSV9hME1ooqS9UV+pJ6BjD0qXPK4T3XW/KNa79XByjeEMZz+fw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.25.9.tgz",
+      "integrity": "sha512-8D43jXtGsYmEeDvm4MWHYUpWf8iiXgWYx3fW7E7Wb7Oe6FWqJPl5K6TuFW0dOwNZzEE5rjlaSJYH9JjrUKJszA==",
       "dev": true,
       "dependencies": {
         "clone-deep": "^4.0.1",
         "find-cache-dir": "^2.0.0",
         "make-dir": "^2.1.0",
-        "pirates": "^4.0.0",
+        "pirates": "^4.0.6",
         "source-map-support": "^0.5.16"
       },
       "engines": {
@@ -328,35 +337,36 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.15.4.tgz",
-      "integrity": "sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/parser": "^7.15.4",
-        "@babel/types": "^7.15.4"
+        "@babel/code-frame": "^7.22.13",
+        "@babel/parser": "^7.22.15",
+        "@babel/types": "^7.22.15"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.4.tgz",
-      "integrity": "sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==",
+      "version": "7.23.7",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.7.tgz",
+      "integrity": "sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/generator": "^7.15.4",
-        "@babel/helper-function-name": "^7.15.4",
-        "@babel/helper-hoist-variables": "^7.15.4",
-        "@babel/helper-split-export-declaration": "^7.15.4",
-        "@babel/parser": "^7.15.4",
-        "@babel/types": "^7.15.4",
-        "debug": "^4.1.0",
+        "@babel/code-frame": "^7.23.5",
+        "@babel/generator": "^7.23.6",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-function-name": "^7.23.0",
+        "@babel/helper-hoist-variables": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/parser": "^7.23.6",
+        "@babel/types": "^7.23.6",
+        "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
       "engines": {
@@ -364,121 +374,111 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.15.6",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.6.tgz",
-      "integrity": "sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz",
+      "integrity": "sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.14.9",
+        "@babel/helper-string-parser": "^7.23.4",
+        "@babel/helper-validator-identifier": "^7.22.20",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+    "node_modules/@bazel/runfiles": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/@bazel/runfiles/-/runfiles-6.3.1.tgz",
+      "integrity": "sha512-1uLNT5NZsUVIGS4syuHwTzZ8HycMPyr6POA3FCE4GbMtc4rhoJk8aZKtNIRthJYfL+iioppi+rTfH3olMPr9nA==",
+      "dev": true
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
+      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
+      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
       "dev": true,
+      "peer": true,
       "engines": {
-        "node": ">= 8"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
       "dev": true,
-      "dependencies": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
-      },
+      "peer": true,
       "engines": {
-        "node": ">= 8"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/@sindresorhus/is": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.2.0.tgz",
-      "integrity": "sha512-VkE3KLBmJwcCaVARtQpfuKcKv8gcBmUubrfHGF84dXuuW6jgsRYxPtzcIhPyK9WAPpRt2/xY6zkD9MnRaJzSyw==",
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
       "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/is?sponsor=1"
-      }
+      "peer": true
     },
-    "node_modules/@szmarczak/http-timer": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
-      "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.21",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.21.tgz",
+      "integrity": "sha512-SRfKmRe1KvYnxjEMtxEr+J4HIeMX5YBg/qhRHpxEIGjhX1rshcHlnFUE9K0GazhVKWM7B+nARSkV8LuvJdJ5/g==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "defer-to-connect": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
     "node_modules/@testim/chrome-version": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@testim/chrome-version/-/chrome-version-1.0.7.tgz",
-      "integrity": "sha512-8UT/J+xqCYfn3fKtOznAibsHpiuDshCb0fwgWxRazTT19Igp9ovoXMPhXyLD6m3CKQGTMHgqoxaFfMWaL40Rnw==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@testim/chrome-version/-/chrome-version-1.1.4.tgz",
+      "integrity": "sha512-kIhULpw9TrGYnHp/8VfdcneIcxKnLixmADtukQRtJUmsVlMg0niMkwV0xZmi8hqa57xqilIHjWFA0GKvEjVU5g==",
       "dev": true
     },
-    "node_modules/@types/cacheable-request": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.2.tgz",
-      "integrity": "sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA==",
-      "dev": true,
-      "dependencies": {
-        "@types/http-cache-semantics": "*",
-        "@types/keyv": "*",
-        "@types/node": "*",
-        "@types/responselike": "*"
-      }
-    },
-    "node_modules/@types/http-cache-semantics": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
-      "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==",
+    "node_modules/@tootallnate/quickjs-emscripten": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz",
+      "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==",
       "dev": true
     },
-    "node_modules/@types/keyv": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.3.tgz",
-      "integrity": "sha512-FXCJgyyN3ivVgRoml4h94G/p3kY+u/B86La+QptcqJaWtBWtmc6TtkNfS40n9bIvyLteHh7zXOtgbobORKPbDg==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
     "node_modules/@types/node": {
       "version": "16.11.6",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.6.tgz",
       "integrity": "sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w==",
       "dev": true
     },
-    "node_modules/@types/responselike": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
-      "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==",
+    "node_modules/@types/selenium-webdriver": {
+      "version": "4.1.28",
+      "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-4.1.28.tgz",
+      "integrity": "sha512-Au7CXegiS7oapbB16zxPToY4Cjzi9UQQMf3W2ZZM8PigMLTGR3iUAHjPUTddyE5g1SBjT/qpmvlsAQLBfNAdKg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "@types/ws": "*"
+      }
+    },
+    "node_modules/@types/ws": {
+      "version": "8.5.6",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.6.tgz",
+      "integrity": "sha512-8B5EO9jLVCy+B58PLHvLDuOD8DRVMgQzq8d55SjLCOn9kqGyqOvy27exVaTio1q1nX5zLu8/6N0n2ThSxOM6tg==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
@@ -494,38 +494,63 @@
         "@types/node": "*"
       }
     },
-    "node_modules/adm-zip": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.5.tgz",
-      "integrity": "sha512-IWwXKnCbirdbyXSfUDvCCrmYrOHANRZcc8NcRrvTlIApdl7PwE9oGcsYvNeJPAVY1M+70b4PxXGKIf8AEuiQ6w==",
+    "node_modules/@wdio/logger": {
+      "version": "9.4.4",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-9.4.4.tgz",
+      "integrity": "sha512-BXx8RXFUW2M4dcO6t5Le95Hi2ZkTQBRsvBQqLekT2rZ6Xmw8ZKZBPf0FptnoftFGg6dYmwnDidYv/0+4PiHjpQ==",
       "dev": true,
+      "dependencies": {
+        "chalk": "^5.1.2",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^7.1.0"
+      },
       "engines": {
-        "node": ">=6.0"
+        "node": ">=18.20.0"
       }
     },
-    "node_modules/agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+    "node_modules/@wdio/logger/node_modules/chalk": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.2.0.tgz",
+      "integrity": "sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==",
       "dev": true,
-      "dependencies": {
-        "debug": "4"
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
       },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@zip.js/zip.js": {
+      "version": "2.7.54",
+      "resolved": "https://registry.npmjs.org/@zip.js/zip.js/-/zip.js-2.7.54.tgz",
+      "integrity": "sha512-qMrJVg2hoEsZJjMJez9yI2+nZlBUxgYzGV3mqcb2B/6T1ihXp0fWBDYlVHlHquuorgNUQP5a8qSmX6HF5rFJNg==",
+      "dev": true,
+      "engines": {
+        "bun": ">=0.7.0",
+        "deno": ">=1.0.0",
+        "node": ">=16.5.0"
+      }
+    },
+    "node_modules/agent-base": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
+      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
+      "dev": true,
       "engines": {
-        "node": ">= 6.0.0"
+        "node": ">= 14"
       }
     },
-    "node_modules/aggregate-error": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+    "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==",
       "dev": true,
-      "dependencies": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
       }
     },
     "node_modules/ansi-styles": {
@@ -541,62 +566,91 @@
         "node": ">=4"
       }
     },
-    "node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+    "node_modules/ast-types": {
+      "version": "0.13.4",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
+      "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==",
       "dev": true,
+      "dependencies": {
+        "tslib": "^2.0.1"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "dev": true
+    },
     "node_modules/axios": {
-      "version": "0.21.4",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
-      "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
+      "version": "1.7.9",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz",
+      "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==",
       "dev": true,
       "dependencies": {
-        "follow-redirects": "^1.14.0"
+        "follow-redirects": "^1.15.6",
+        "form-data": "^4.0.0",
+        "proxy-from-env": "^1.1.0"
       }
     },
+    "node_modules/b4a": {
+      "version": "1.6.4",
+      "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.4.tgz",
+      "integrity": "sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw==",
+      "dev": true
+    },
     "node_modules/babel-regenerator-runtime": {
       "version": "6.5.0",
       "resolved": "https://registry.npmjs.org/babel-regenerator-runtime/-/babel-regenerator-runtime-6.5.0.tgz",
       "integrity": "sha1-DkHNHJ+ARCRm8BXHSf/4upj44RA=",
       "dev": true
     },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
-    },
-    "node_modules/bluebird": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-      "dev": true
+    "node_modules/bare-events": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.2.0.tgz",
+      "integrity": "sha512-Yyyqff4PIFfSuthCZqLlPISTWHmnQxoPuAvkmgzsJEmG3CesdIv6Xweayl0JkCZJSB2yYIdJyEz97tpxNhgjbg==",
+      "dev": true,
+      "optional": true
     },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+    "node_modules/bare-fs": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.1.5.tgz",
+      "integrity": "sha512-5t0nlecX+N2uJqdxe9d18A98cp2u9BETelbjKpiVgQqzzmVNFYWEAjQHqS+2Khgto1vcwhik9cXucaj5ve2WWA==",
       "dev": true,
+      "optional": true,
       "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+        "bare-events": "^2.0.0",
+        "bare-os": "^2.0.0",
+        "bare-path": "^2.0.0",
+        "streamx": "^2.13.0"
       }
     },
-    "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+    "node_modules/bare-os": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.2.0.tgz",
+      "integrity": "sha512-hD0rOPfYWOMpVirTACt4/nK8mC55La12K5fY1ij8HAdfQakD62M+H4o4tpfKzVGLgRDTuk3vjA4GqGXXCeFbag==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/bare-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-2.1.0.tgz",
+      "integrity": "sha512-DIIg7ts8bdRKwJRJrUMy/PICEaQZaPGZ26lsSx9MJSwIhSrcdHn7/C8W+XmnG/rKi6BaRcz+JO00CjZteybDtw==",
       "dev": true,
+      "optional": true,
       "dependencies": {
-        "fill-range": "^7.0.1"
-      },
+        "bare-os": "^2.1.0"
+      }
+    },
+    "node_modules/basic-ftp": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.5.tgz",
+      "integrity": "sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==",
+      "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=10.0.0"
       }
     },
     "node_modules/browserslist": {
@@ -638,33 +692,6 @@
       "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
       "dev": true
     },
-    "node_modules/cacheable-lookup": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
-      "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.6.0"
-      }
-    },
-    "node_modules/cacheable-request": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz",
-      "integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==",
-      "dev": true,
-      "dependencies": {
-        "clone-response": "^1.0.2",
-        "get-stream": "^5.1.0",
-        "http-cache-semantics": "^4.0.0",
-        "keyv": "^4.0.0",
-        "lowercase-keys": "^2.0.0",
-        "normalize-url": "^6.0.1",
-        "responselike": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/caniuse-lite": {
       "version": "1.0.30001271",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001271.tgz",
@@ -691,44 +718,26 @@
         "node": ">=4"
       }
     },
-    "node_modules/chownr": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/chromedriver": {
-      "version": "95.0.0",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-95.0.0.tgz",
-      "integrity": "sha512-HwSg7S0ZZYsHTjULwxFHrrUqEpz1+ljDudJM3eOquvqD5QKnR5pSe/GlBTY9UU2tVFRYz8bEHYC4Y8qxciQiLQ==",
+      "version": "131.0.5",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-131.0.5.tgz",
+      "integrity": "sha512-OQY4BHUe9JedxH4aAsPZJcf8Y0lMlE7y+3tiCvQSCQ6qDz2b99R0qsqyqzUUSW2DFx0bg4YxmK8CDVMKb9u5kg==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
-        "@testim/chrome-version": "^1.0.7",
-        "axios": "^0.21.2",
-        "del": "^6.0.0",
+        "@testim/chrome-version": "^1.1.4",
+        "axios": "^1.7.4",
+        "compare-versions": "^6.1.0",
         "extract-zip": "^2.0.1",
-        "https-proxy-agent": "^5.0.0",
+        "proxy-agent": "^6.4.0",
         "proxy-from-env": "^1.1.0",
-        "tcp-port-used": "^1.0.1"
+        "tcp-port-used": "^1.0.2"
       },
       "bin": {
         "chromedriver": "bin/chromedriver"
       },
       "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/clean-stack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
+        "node": ">=18"
       }
     },
     "node_modules/clone-deep": {
@@ -745,15 +754,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/clone-response": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
-      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
-      "dev": true,
-      "dependencies": {
-        "mimic-response": "^1.0.0"
-      }
-    },
     "node_modules/color-convert": {
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
@@ -767,20 +767,32 @@
     "node_modules/color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
       "dev": true,
       "peer": true
     },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/commondir": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
       "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
       "dev": true
     },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+    "node_modules/compare-versions": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-6.1.0.tgz",
+      "integrity": "sha512-LNZQXhqUvqUTotpZ00qLSaify3b4VFD588aRr8MKFw4CMUr98ytzCW5wDH5qx/DEY5kCDXcbcRuCqL0szEf2tg==",
       "dev": true
     },
     "node_modules/convert-source-map": {
@@ -799,10 +811,19 @@
       "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
       "dev": true
     },
+    "node_modules/data-uri-to-buffer": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
+      "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 12"
+      }
+    },
     "node_modules/debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "dependencies": {
         "ms": "2.1.2"
@@ -816,28 +837,13 @@
         }
       }
     },
-    "node_modules/decompress-response": {
+    "node_modules/decamelize": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
-      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
-      "dev": true,
-      "dependencies": {
-        "mimic-response": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/decompress-response/node_modules/mimic-response": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
-      "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-6.0.0.tgz",
+      "integrity": "sha512-Fv96DCsdOgB6mdGl67MT5JaTNKRzrzill5OH5s8bjYJXVlcXyPYGyPsUkWyGV5p1TXI5esYIYMMeDJL0hEIwaA==",
       "dev": true,
       "engines": {
-        "node": ">=10"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -849,47 +855,27 @@
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
       "dev": true
     },
-    "node_modules/defer-to-connect": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
-      "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/del": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/del/-/del-6.0.0.tgz",
-      "integrity": "sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==",
+    "node_modules/degenerator": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz",
+      "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==",
       "dev": true,
       "dependencies": {
-        "globby": "^11.0.1",
-        "graceful-fs": "^4.2.4",
-        "is-glob": "^4.0.1",
-        "is-path-cwd": "^2.2.0",
-        "is-path-inside": "^3.0.2",
-        "p-map": "^4.0.0",
-        "rimraf": "^3.0.2",
-        "slash": "^3.0.0"
+        "ast-types": "^0.13.4",
+        "escodegen": "^2.1.0",
+        "esprima": "^4.0.1"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">= 14"
       }
     },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
       "dev": true,
-      "dependencies": {
-        "path-type": "^4.0.0"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.4.0"
       }
     },
     "node_modules/electron-to-chromium": {
@@ -921,13 +907,75 @@
     "node_modules/escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
       "dev": true,
       "peer": true,
       "engines": {
         "node": ">=0.8.0"
       }
     },
+    "node_modules/escodegen": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
+      "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
+      "dev": true,
+      "dependencies": {
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
+        "esutils": "^2.0.2"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/escodegen/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "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/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/extract-zip": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
@@ -948,30 +996,11 @@
         "@types/yauzl": "^2.9.1"
       }
     },
-    "node_modules/fast-glob": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
-      "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
-      "dev": true,
-      "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"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/fastq": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
-      "dev": true,
-      "dependencies": {
-        "reusify": "^1.0.4"
-      }
+    "node_modules/fast-fifo": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.0.tgz",
+      "integrity": "sha512-IgfweLvEpwyA4WgiQe9Nx6VV2QkML2NkvZnk1oKnIzXgXdWxuhF7zw4DvLTPZJn6PIUneiAXPF24QmoEqHTjyw==",
+      "dev": true
     },
     "node_modules/fd-slicer": {
       "version": "1.1.0",
@@ -982,16 +1011,27 @@
         "pend": "~1.2.0"
       }
     },
-    "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+    "node_modules/fetch-blob": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz",
+      "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==",
       "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/jimmywarting"
+        },
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/jimmywarting"
+        }
+      ],
       "dependencies": {
-        "to-regex-range": "^5.0.1"
+        "node-domexception": "^1.0.0",
+        "web-streams-polyfill": "^3.0.3"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^12.20 || >= 14.13"
       }
     },
     "node_modules/find-cache-dir": {
@@ -1021,9 +1061,9 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.14.4",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz",
-      "integrity": "sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==",
+      "version": "1.15.6",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
       "dev": true,
       "funding": [
         {
@@ -1031,6 +1071,7 @@
           "url": "https://github.com/sponsors/RubenVerborgh"
         }
       ],
+      "license": "MIT",
       "engines": {
         "node": ">=4.0"
       },
@@ -1040,42 +1081,53 @@
         }
       }
     },
-    "node_modules/fs-minipass": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+    "node_modules/form-data": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
       "dev": true,
       "dependencies": {
-        "minipass": "^3.0.0"
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">= 6"
+      }
+    },
+    "node_modules/formdata-polyfill": {
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
+      "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
+      "dev": true,
+      "dependencies": {
+        "fetch-blob": "^3.1.2"
+      },
+      "engines": {
+        "node": ">=12.20.0"
       }
     },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-    },
     "node_modules/geckodriver": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/geckodriver/-/geckodriver-2.0.4.tgz",
-      "integrity": "sha512-3Fu75v6Ov8h5Vt25+djJU56MJA2gRctgjhvG5xGzLFTQjltPz7nojQdBHbmgWznUt3CHl8VaiDn8MaepY7B0dA==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/geckodriver/-/geckodriver-5.0.0.tgz",
+      "integrity": "sha512-vn7TtQ3b9VMJtVXsyWtQQl1fyBVFhQy7UvJF96kPuuJ0or5THH496AD3eUyaDD11+EqCxH9t6V+EP9soZQk4YQ==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
-        "adm-zip": "0.5.5",
-        "bluebird": "3.7.2",
-        "got": "11.8.2",
-        "https-proxy-agent": "5.0.0",
-        "tar": "6.1.9"
+        "@wdio/logger": "^9.1.3",
+        "@zip.js/zip.js": "^2.7.53",
+        "decamelize": "^6.0.0",
+        "http-proxy-agent": "^7.0.2",
+        "https-proxy-agent": "^7.0.5",
+        "node-fetch": "^3.3.2",
+        "tar-fs": "^3.0.6",
+        "which": "^5.0.0"
       },
       "bin": {
-        "geckodriver": "bin/geckodriver"
+        "geckodriver": "bin/geckodriver.js"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/gensync": {
@@ -1103,36 +1155,27 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+    "node_modules/get-uri": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.4.tgz",
+      "integrity": "sha512-E1b1lFFLvLgak2whF2xDBcOy6NLVGZBqqjJjsIhvopKfWWEi64pLVTWWehV8KlLerZkfNTA95sTe2OdJKm1OzQ==",
       "dev": true,
       "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"
+        "basic-ftp": "^5.0.2",
+        "data-uri-to-buffer": "^6.0.2",
+        "debug": "^4.3.4"
       },
       "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "node": ">= 14"
       }
     },
-    "node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+    "node_modules/get-uri/node_modules/data-uri-to-buffer": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz",
+      "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==",
       "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
       "engines": {
-        "node": ">= 6"
+        "node": ">= 14"
       }
     },
     "node_modules/globals": {
@@ -1145,106 +1188,40 @@
         "node": ">=4"
       }
     },
-    "node_modules/globby": {
-      "version": "11.0.4",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
-      "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
-      "dev": true,
-      "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"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/got": {
-      "version": "11.8.2",
-      "resolved": "https://registry.npmjs.org/got/-/got-11.8.2.tgz",
-      "integrity": "sha512-D0QywKgIe30ODs+fm8wMZiAcZjypcCodPNuMz5H9Mny7RJ+IjJ10BdmGW7OM7fHXP+O7r6ZwapQ/YQmMSvB0UQ==",
-      "dev": true,
-      "dependencies": {
-        "@sindresorhus/is": "^4.0.0",
-        "@szmarczak/http-timer": "^4.0.5",
-        "@types/cacheable-request": "^6.0.1",
-        "@types/responselike": "^1.0.0",
-        "cacheable-lookup": "^5.0.3",
-        "cacheable-request": "^7.0.1",
-        "decompress-response": "^6.0.0",
-        "http2-wrapper": "^1.0.0-beta.5.2",
-        "lowercase-keys": "^2.0.0",
-        "p-cancelable": "^2.0.0",
-        "responselike": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10.19.0"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/got?sponsor=1"
-      }
-    },
-    "node_modules/graceful-fs": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
-      "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==",
-      "dev": true
-    },
     "node_modules/has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
       "dev": true,
       "peer": true,
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/http-cache-semantics": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
-      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==",
-      "dev": true
-    },
-    "node_modules/http2-wrapper": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
-      "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
+    "node_modules/http-proxy-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
       "dev": true,
       "dependencies": {
-        "quick-lru": "^5.1.1",
-        "resolve-alpn": "^1.0.0"
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
       },
       "engines": {
-        "node": ">=10.19.0"
+        "node": ">= 14"
       }
     },
     "node_modules/https-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
       "dev": true,
       "dependencies": {
-        "agent-base": "6",
+        "agent-base": "^7.1.2",
         "debug": "4"
       },
       "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/ignore": {
-      "version": "5.1.8",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-      "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
+        "node": ">= 14"
       }
     },
     "node_modules/immediate": {
@@ -1253,83 +1230,29 @@
       "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=",
       "dev": true
     },
-    "node_modules/indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
     "node_modules/inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "dev": true
     },
-    "node_modules/ip-regex": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz",
-      "integrity": "sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+    "node_modules/ip-address": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
+      "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
       "dev": true,
       "dependencies": {
-        "is-extglob": "^2.1.1"
+        "jsbn": "1.1.0",
+        "sprintf-js": "^1.1.3"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/is-path-cwd": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
-      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
+        "node": ">= 12"
       }
     },
-    "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==",
+    "node_modules/ip-regex": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz",
+      "integrity": "sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==",
       "dev": true,
       "engines": {
         "node": ">=8"
@@ -1373,6 +1296,15 @@
       "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
       "dev": true
     },
+    "node_modules/isexe": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
+      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=16"
+      }
+    },
     "node_modules/isobject": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
@@ -1389,6 +1321,12 @@
       "dev": true,
       "peer": true
     },
+    "node_modules/jsbn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
+      "dev": true
+    },
     "node_modules/jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -1402,21 +1340,12 @@
         "node": ">=4"
       }
     },
-    "node_modules/json-buffer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-      "dev": true
-    },
     "node_modules/json5": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
       "dev": true,
       "peer": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
       "bin": {
         "json5": "lib/cli.js"
       },
@@ -1425,24 +1354,15 @@
       }
     },
     "node_modules/jszip": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.1.tgz",
-      "integrity": "sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==",
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz",
+      "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==",
       "dev": true,
       "dependencies": {
         "lie": "~3.3.0",
         "pako": "~1.0.2",
         "readable-stream": "~2.3.6",
-        "set-immediate-shim": "~1.0.1"
-      }
-    },
-    "node_modules/keyv": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.0.3.tgz",
-      "integrity": "sha512-zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA==",
-      "dev": true,
-      "dependencies": {
-        "json-buffer": "3.0.1"
+        "setimmediate": "^1.0.5"
       }
     },
     "node_modules/kind-of": {
@@ -1476,13 +1396,32 @@
         "node": ">=6"
       }
     },
-    "node_modules/lowercase-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+    "node_modules/loglevel": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.8.1.tgz",
+      "integrity": "sha512-tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg==",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.6.0"
+      },
+      "funding": {
+        "type": "tidelift",
+        "url": "https://tidelift.com/funding/github/npm/loglevel"
+      }
+    },
+    "node_modules/loglevel-plugin-prefix": {
+      "version": "0.8.4",
+      "resolved": "https://registry.npmjs.org/loglevel-plugin-prefix/-/loglevel-plugin-prefix-0.8.4.tgz",
+      "integrity": "sha512-WpG9CcFAOjz/FtNht+QJeGpvVl/cdR6P0z6OcXSkr8wFJOsV2GRj2j10JLfjuA4aYkcKCNIEqRGCyTife9R8/g==",
+      "dev": true
+    },
+    "node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/make-dir": {
@@ -1499,114 +1438,85 @@
       }
     },
     "node_modules/make-dir/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
       "dev": true,
       "bin": {
         "semver": "bin/semver"
       }
     },
-    "node_modules/merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
       "dev": true,
       "engines": {
-        "node": ">= 8"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/micromatch": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dev": true,
       "dependencies": {
-        "braces": "^3.0.1",
-        "picomatch": "^2.2.3"
+        "mime-db": "1.52.0"
       },
       "engines": {
-        "node": ">=8.6"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/mimic-response": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
     },
-    "node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+    "node_modules/netmask": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
+      "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==",
       "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
       "engines": {
-        "node": "*"
+        "node": ">= 0.4.0"
       }
     },
-    "node_modules/minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/minipass": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz",
-      "integrity": "sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==",
+    "node_modules/node-domexception": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
+      "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==",
       "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/jimmywarting"
+        },
+        {
+          "type": "github",
+          "url": "https://paypal.me/jimmywarting"
+        }
+      ],
       "engines": {
-        "node": ">=8"
+        "node": ">=10.5.0"
       }
     },
-    "node_modules/minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+    "node_modules/node-fetch": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz",
+      "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==",
       "dev": true,
       "dependencies": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
+        "data-uri-to-buffer": "^4.0.0",
+        "fetch-blob": "^3.1.4",
+        "formdata-polyfill": "^4.0.10"
       },
       "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "dev": true,
-      "bin": {
-        "mkdirp": "bin/cmd.js"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/node-modules-regexp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
-      "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/node-fetch"
       }
     },
     "node_modules/node-releases": {
@@ -1616,18 +1526,6 @@
       "dev": true,
       "peer": true
     },
-    "node_modules/normalize-url": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -1637,15 +1535,6 @@
         "wrappy": "1"
       }
     },
-    "node_modules/p-cancelable": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
-      "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/p-limit": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
@@ -1673,28 +1562,45 @@
         "node": ">=6"
       }
     },
-    "node_modules/p-map": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pac-proxy-agent": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.1.0.tgz",
+      "integrity": "sha512-Z5FnLVVZSnX7WjBg0mhDtydeRZ1xMcATZThjySQUHqr+0ksP8kqaw23fNKkaaN/Z8gwLUs/W7xdl0I75eP2Xyw==",
       "dev": true,
       "dependencies": {
-        "aggregate-error": "^3.0.0"
+        "@tootallnate/quickjs-emscripten": "^0.23.0",
+        "agent-base": "^7.1.2",
+        "debug": "^4.3.4",
+        "get-uri": "^6.0.1",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.6",
+        "pac-resolver": "^7.0.1",
+        "socks-proxy-agent": "^8.0.5"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">= 14"
       }
     },
-    "node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+    "node_modules/pac-resolver": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz",
+      "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==",
       "dev": true,
+      "dependencies": {
+        "degenerator": "^5.0.0",
+        "netmask": "^2.0.2"
+      },
       "engines": {
-        "node": ">=6"
+        "node": ">= 14"
       }
     },
     "node_modules/pako": {
@@ -1712,24 +1618,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
@@ -1743,18 +1631,6 @@
       "dev": true,
       "peer": true
     },
-    "node_modules/picomatch": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
     "node_modules/pify": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
@@ -1765,13 +1641,10 @@
       }
     },
     "node_modules/pirates": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
-      "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
+      "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
       "dev": true,
-      "dependencies": {
-        "node-modules-regexp": "^1.0.0"
-      },
       "engines": {
         "node": ">= 6"
       }
@@ -1794,6 +1667,25 @@
       "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
       "dev": true
     },
+    "node_modules/proxy-agent": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.5.0.tgz",
+      "integrity": "sha512-TmatMXdr2KlRiA2CyDu8GqR8EjahTG3aY3nXjdzFyoZbmB8hrBsTyMezhULIXKnC0jpfjlmiZ3+EaCzoInSu/A==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^7.1.2",
+        "debug": "^4.3.4",
+        "http-proxy-agent": "^7.0.1",
+        "https-proxy-agent": "^7.0.6",
+        "lru-cache": "^7.14.1",
+        "pac-proxy-agent": "^7.1.0",
+        "proxy-from-env": "^1.1.0",
+        "socks-proxy-agent": "^8.0.5"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/proxy-from-env": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
@@ -1810,37 +1702,11 @@
         "once": "^1.3.1"
       }
     },
-    "node_modules/queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "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"
-        }
-      ]
-    },
-    "node_modules/quick-lru": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
-      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
+    "node_modules/queue-tick": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
+      "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==",
+      "dev": true
     },
     "node_modules/readable-stream": {
       "version": "2.3.7",
@@ -1857,108 +1723,52 @@
         "util-deprecate": "~1.0.1"
       }
     },
-    "node_modules/resolve-alpn": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
-      "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==",
+    "node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
       "dev": true
     },
-    "node_modules/responselike": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz",
-      "integrity": "sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw==",
-      "dev": true,
-      "dependencies": {
-        "lowercase-keys": "^2.0.0"
-      }
-    },
-    "node_modules/reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "dev": true,
-      "engines": {
-        "iojs": ">=1.0.0",
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+    "node_modules/selenium-webdriver": {
+      "version": "4.27.0",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.27.0.tgz",
+      "integrity": "sha512-LkTJrNz5socxpPnWPODQ2bQ65eYx9JK+DQMYNihpTjMCqHwgWGYQnQTCAAche2W3ZP87alA+1zYPvgS8tHNzMQ==",
       "dev": true,
       "funding": [
         {
           "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
+          "url": "https://github.com/sponsors/SeleniumHQ"
         },
         {
-          "type": "consulting",
-          "url": "https://feross.org/support"
+          "type": "opencollective",
+          "url": "https://opencollective.com/selenium"
         }
       ],
       "dependencies": {
-        "queue-microtask": "^1.2.2"
-      }
-    },
-    "node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
-    },
-    "node_modules/selenium-webdriver": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.0.0.tgz",
-      "integrity": "sha512-tOlu6FnTjPq2FKpd153pl8o2cB7H40Rvl/ogiD2sapMv4IDjQqpIxbd+swDJe9UDLdszeh5CDis6lgy4e9UG1w==",
-      "dev": true,
-      "dependencies": {
-        "jszip": "^3.6.0",
-        "rimraf": "^3.0.2",
-        "tmp": "^0.2.1",
-        "ws": ">=7.4.6"
+        "@bazel/runfiles": "^6.3.1",
+        "jszip": "^3.10.1",
+        "tmp": "^0.2.3",
+        "ws": "^8.18.0"
       },
       "engines": {
-        "node": ">= 10.15.0"
+        "node": ">= 14.21.0"
       }
     },
     "node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
       "peer": true,
       "bin": {
         "semver": "bin/semver.js"
       }
     },
-    "node_modules/set-immediate-shim": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
-      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+    "node_modules/setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
+      "dev": true
     },
     "node_modules/shallow-clone": {
       "version": "3.0.1",
@@ -1972,13 +1782,42 @@
         "node": ">=8"
       }
     },
-    "node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+    "node_modules/smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">= 6.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
+      "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
+      "dev": true,
+      "dependencies": {
+        "ip-address": "^9.0.5",
+        "smart-buffer": "^4.2.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks-proxy-agent": {
+      "version": "8.0.5",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz",
+      "integrity": "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^7.1.2",
+        "debug": "^4.3.4",
+        "socks": "^2.8.3"
+      },
+      "engines": {
+        "node": ">= 14"
       }
     },
     "node_modules/source-map": {
@@ -2010,6 +1849,22 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/sprintf-js": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
+      "dev": true
+    },
+    "node_modules/streamx": {
+      "version": "2.15.0",
+      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.15.0.tgz",
+      "integrity": "sha512-HcxY6ncGjjklGs1xsP1aR71INYcsXFJet5CU1CHqihQ2J5nOsbd4OjgjHO42w/4QNv9gZb3BueV+Vxok5pLEXg==",
+      "dev": true,
+      "dependencies": {
+        "fast-fifo": "^1.1.0",
+        "queue-tick": "^1.0.1"
+      }
+    },
     "node_modules/string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -2019,6 +1874,21 @@
         "safe-buffer": "~5.1.0"
       }
     },
+    "node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
     "node_modules/supports-color": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -2032,21 +1902,29 @@
         "node": ">=4"
       }
     },
-    "node_modules/tar": {
-      "version": "6.1.9",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.9.tgz",
-      "integrity": "sha512-XjLaMNl76o07zqZC/aW4lwegdY07baOH1T8w3AEfrHAdyg/oYO4ctjzEBq9Gy9fEP9oHqLIgvx6zuGDGe+bc8Q==",
+    "node_modules/tar-fs": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz",
+      "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==",
       "dev": true,
       "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"
+        "pump": "^3.0.0",
+        "tar-stream": "^3.1.5"
       },
-      "engines": {
-        "node": ">= 10"
+      "optionalDependencies": {
+        "bare-fs": "^2.1.1",
+        "bare-path": "^2.1.0"
+      }
+    },
+    "node_modules/tar-stream": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.6.tgz",
+      "integrity": "sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==",
+      "dev": true,
+      "dependencies": {
+        "b4a": "^1.6.4",
+        "fast-fifo": "^1.2.0",
+        "streamx": "^2.15.0"
       }
     },
     "node_modules/tcp-port-used": {
@@ -2077,15 +1955,12 @@
       }
     },
     "node_modules/tmp": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
-      "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
+      "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==",
       "dev": true,
-      "dependencies": {
-        "rimraf": "^3.0.0"
-      },
       "engines": {
-        "node": ">=8.17.0"
+        "node": ">=14.14"
       }
     },
     "node_modules/to-fast-properties": {
@@ -2098,17 +1973,11 @@
         "node": ">=4"
       }
     },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
+    "node_modules/tslib": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+      "dev": true
     },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
@@ -2116,6 +1985,30 @@
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
       "dev": true
     },
+    "node_modules/web-streams-polyfill": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz",
+      "integrity": "sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/which": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz",
+      "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^3.1.1"
+      },
+      "bin": {
+        "node-which": "bin/which.js"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -2123,16 +2016,16 @@
       "dev": true
     },
     "node_modules/ws": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
-      "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "dev": true,
       "engines": {
         "node": ">=10.0.0"
       },
       "peerDependencies": {
         "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
+        "utf-8-validate": ">=5.0.2"
       },
       "peerDependenciesMeta": {
         "bufferutil": {
@@ -2143,12 +2036,6 @@
         }
       }
     },
-    "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
     "node_modules/yauzl": {
       "version": "2.10.0",
       "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
@@ -2162,13 +2049,14 @@
   },
   "dependencies": {
     "@babel/code-frame": {
-      "version": "7.15.8",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz",
-      "integrity": "sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz",
+      "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==",
       "dev": true,
       "peer": true,
       "requires": {
-        "@babel/highlight": "^7.14.5"
+        "@babel/highlight": "^7.23.4",
+        "chalk": "^2.4.2"
       }
     },
     "@babel/compat-data": {
@@ -2203,15 +2091,16 @@
       }
     },
     "@babel/generator": {
-      "version": "7.15.8",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.8.tgz",
-      "integrity": "sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz",
+      "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==",
       "dev": true,
       "peer": true,
       "requires": {
-        "@babel/types": "^7.15.6",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
+        "@babel/types": "^7.23.6",
+        "@jridgewell/gen-mapping": "^0.3.2",
+        "@jridgewell/trace-mapping": "^0.3.17",
+        "jsesc": "^2.5.1"
       }
     },
     "@babel/helper-compilation-targets": {
@@ -2227,36 +2116,32 @@
         "semver": "^6.3.0"
       }
     },
-    "@babel/helper-function-name": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz",
-      "integrity": "sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==",
+    "@babel/helper-environment-visitor": {
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
       "dev": true,
-      "peer": true,
-      "requires": {
-        "@babel/helper-get-function-arity": "^7.15.4",
-        "@babel/template": "^7.15.4",
-        "@babel/types": "^7.15.4"
-      }
+      "peer": true
     },
-    "@babel/helper-get-function-arity": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz",
-      "integrity": "sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA==",
+    "@babel/helper-function-name": {
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
       "dev": true,
       "peer": true,
       "requires": {
-        "@babel/types": "^7.15.4"
+        "@babel/template": "^7.22.15",
+        "@babel/types": "^7.23.0"
       }
     },
     "@babel/helper-hoist-variables": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz",
-      "integrity": "sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
       "dev": true,
       "peer": true,
       "requires": {
-        "@babel/types": "^7.15.4"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-member-expression-to-functions": {
@@ -2330,19 +2215,26 @@
       }
     },
     "@babel/helper-split-export-declaration": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz",
-      "integrity": "sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
       "dev": true,
       "peer": true,
       "requires": {
-        "@babel/types": "^7.15.4"
+        "@babel/types": "^7.22.5"
       }
     },
+    "@babel/helper-string-parser": {
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
+      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
+      "dev": true,
+      "peer": true
+    },
     "@babel/helper-validator-identifier": {
-      "version": "7.15.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz",
-      "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
       "dev": true,
       "peer": true
     },
@@ -2366,151 +2258,141 @@
       }
     },
     "@babel/highlight": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
-      "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
+      "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
       "dev": true,
       "peer": true,
       "requires": {
-        "@babel/helper-validator-identifier": "^7.14.5",
-        "chalk": "^2.0.0",
+        "@babel/helper-validator-identifier": "^7.22.20",
+        "chalk": "^2.4.2",
         "js-tokens": "^4.0.0"
       }
     },
     "@babel/parser": {
-      "version": "7.15.8",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.8.tgz",
-      "integrity": "sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz",
+      "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==",
       "dev": true,
       "peer": true
     },
     "@babel/register": {
-      "version": "7.15.3",
-      "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.15.3.tgz",
-      "integrity": "sha512-mj4IY1ZJkorClxKTImccn4T81+UKTo4Ux0+OFSV9hME1ooqS9UV+pJ6BjD0qXPK4T3XW/KNa79XByjeEMZz+fw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.25.9.tgz",
+      "integrity": "sha512-8D43jXtGsYmEeDvm4MWHYUpWf8iiXgWYx3fW7E7Wb7Oe6FWqJPl5K6TuFW0dOwNZzEE5rjlaSJYH9JjrUKJszA==",
       "dev": true,
       "requires": {
         "clone-deep": "^4.0.1",
         "find-cache-dir": "^2.0.0",
         "make-dir": "^2.1.0",
-        "pirates": "^4.0.0",
+        "pirates": "^4.0.6",
         "source-map-support": "^0.5.16"
       }
     },
     "@babel/template": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.15.4.tgz",
-      "integrity": "sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
       "dev": true,
       "peer": true,
       "requires": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/parser": "^7.15.4",
-        "@babel/types": "^7.15.4"
+        "@babel/code-frame": "^7.22.13",
+        "@babel/parser": "^7.22.15",
+        "@babel/types": "^7.22.15"
       }
     },
     "@babel/traverse": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.4.tgz",
-      "integrity": "sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==",
+      "version": "7.23.7",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.7.tgz",
+      "integrity": "sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg==",
       "dev": true,
       "peer": true,
       "requires": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/generator": "^7.15.4",
-        "@babel/helper-function-name": "^7.15.4",
-        "@babel/helper-hoist-variables": "^7.15.4",
-        "@babel/helper-split-export-declaration": "^7.15.4",
-        "@babel/parser": "^7.15.4",
-        "@babel/types": "^7.15.4",
-        "debug": "^4.1.0",
+        "@babel/code-frame": "^7.23.5",
+        "@babel/generator": "^7.23.6",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-function-name": "^7.23.0",
+        "@babel/helper-hoist-variables": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/parser": "^7.23.6",
+        "@babel/types": "^7.23.6",
+        "debug": "^4.3.1",
         "globals": "^11.1.0"
       }
     },
     "@babel/types": {
-      "version": "7.15.6",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.6.tgz",
-      "integrity": "sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz",
+      "integrity": "sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==",
       "dev": true,
       "peer": true,
       "requires": {
-        "@babel/helper-validator-identifier": "^7.14.9",
+        "@babel/helper-string-parser": "^7.23.4",
+        "@babel/helper-validator-identifier": "^7.22.20",
         "to-fast-properties": "^2.0.0"
       }
     },
-    "@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "dev": true,
-      "requires": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      }
-    },
-    "@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+    "@bazel/runfiles": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/@bazel/runfiles/-/runfiles-6.3.1.tgz",
+      "integrity": "sha512-1uLNT5NZsUVIGS4syuHwTzZ8HycMPyr6POA3FCE4GbMtc4rhoJk8aZKtNIRthJYfL+iioppi+rTfH3olMPr9nA==",
       "dev": true
     },
-    "@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+    "@jridgewell/gen-mapping": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
+      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
       "dev": true,
+      "peer": true,
       "requires": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
       }
     },
-    "@sindresorhus/is": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.2.0.tgz",
-      "integrity": "sha512-VkE3KLBmJwcCaVARtQpfuKcKv8gcBmUubrfHGF84dXuuW6jgsRYxPtzcIhPyK9WAPpRt2/xY6zkD9MnRaJzSyw==",
-      "dev": true
+    "@jridgewell/resolve-uri": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
+      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
+      "dev": true,
+      "peer": true
     },
-    "@szmarczak/http-timer": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
-      "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
+    "@jridgewell/set-array": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
       "dev": true,
-      "requires": {
-        "defer-to-connect": "^2.0.0"
-      }
+      "peer": true
     },
-    "@testim/chrome-version": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@testim/chrome-version/-/chrome-version-1.0.7.tgz",
-      "integrity": "sha512-8UT/J+xqCYfn3fKtOznAibsHpiuDshCb0fwgWxRazTT19Igp9ovoXMPhXyLD6m3CKQGTMHgqoxaFfMWaL40Rnw==",
-      "dev": true
+    "@jridgewell/sourcemap-codec": {
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
+      "dev": true,
+      "peer": true
     },
-    "@types/cacheable-request": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.2.tgz",
-      "integrity": "sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA==",
+    "@jridgewell/trace-mapping": {
+      "version": "0.3.21",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.21.tgz",
+      "integrity": "sha512-SRfKmRe1KvYnxjEMtxEr+J4HIeMX5YBg/qhRHpxEIGjhX1rshcHlnFUE9K0GazhVKWM7B+nARSkV8LuvJdJ5/g==",
       "dev": true,
+      "peer": true,
       "requires": {
-        "@types/http-cache-semantics": "*",
-        "@types/keyv": "*",
-        "@types/node": "*",
-        "@types/responselike": "*"
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
-    "@types/http-cache-semantics": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
-      "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==",
+    "@testim/chrome-version": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@testim/chrome-version/-/chrome-version-1.1.4.tgz",
+      "integrity": "sha512-kIhULpw9TrGYnHp/8VfdcneIcxKnLixmADtukQRtJUmsVlMg0niMkwV0xZmi8hqa57xqilIHjWFA0GKvEjVU5g==",
       "dev": true
     },
-    "@types/keyv": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.3.tgz",
-      "integrity": "sha512-FXCJgyyN3ivVgRoml4h94G/p3kY+u/B86La+QptcqJaWtBWtmc6TtkNfS40n9bIvyLteHh7zXOtgbobORKPbDg==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
+    "@tootallnate/quickjs-emscripten": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz",
+      "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==",
+      "dev": true
     },
     "@types/node": {
       "version": "16.11.6",
@@ -2518,10 +2400,20 @@
       "integrity": "sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w==",
       "dev": true
     },
-    "@types/responselike": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
-      "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==",
+    "@types/selenium-webdriver": {
+      "version": "4.1.28",
+      "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-4.1.28.tgz",
+      "integrity": "sha512-Au7CXegiS7oapbB16zxPToY4Cjzi9UQQMf3W2ZZM8PigMLTGR3iUAHjPUTddyE5g1SBjT/qpmvlsAQLBfNAdKg==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*",
+        "@types/ws": "*"
+      }
+    },
+    "@types/ws": {
+      "version": "8.5.6",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.6.tgz",
+      "integrity": "sha512-8B5EO9jLVCy+B58PLHvLDuOD8DRVMgQzq8d55SjLCOn9kqGyqOvy27exVaTio1q1nX5zLu8/6N0n2ThSxOM6tg==",
       "dev": true,
       "requires": {
         "@types/node": "*"
@@ -2537,30 +2429,43 @@
         "@types/node": "*"
       }
     },
-    "adm-zip": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.5.tgz",
-      "integrity": "sha512-IWwXKnCbirdbyXSfUDvCCrmYrOHANRZcc8NcRrvTlIApdl7PwE9oGcsYvNeJPAVY1M+70b4PxXGKIf8AEuiQ6w==",
-      "dev": true
-    },
-    "agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+    "@wdio/logger": {
+      "version": "9.4.4",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-9.4.4.tgz",
+      "integrity": "sha512-BXx8RXFUW2M4dcO6t5Le95Hi2ZkTQBRsvBQqLekT2rZ6Xmw8ZKZBPf0FptnoftFGg6dYmwnDidYv/0+4PiHjpQ==",
       "dev": true,
       "requires": {
-        "debug": "4"
+        "chalk": "^5.1.2",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^7.1.0"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.2.0.tgz",
+          "integrity": "sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==",
+          "dev": true
+        }
       }
     },
-    "aggregate-error": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-      "dev": true,
-      "requires": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
-      }
+    "@zip.js/zip.js": {
+      "version": "2.7.54",
+      "resolved": "https://registry.npmjs.org/@zip.js/zip.js/-/zip.js-2.7.54.tgz",
+      "integrity": "sha512-qMrJVg2hoEsZJjMJez9yI2+nZlBUxgYzGV3mqcb2B/6T1ihXp0fWBDYlVHlHquuorgNUQP5a8qSmX6HF5rFJNg==",
+      "dev": true
+    },
+    "agent-base": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
+      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
+      "dev": true
+    },
+    "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
     },
     "ansi-styles": {
       "version": "3.2.1",
@@ -2572,58 +2477,87 @@
         "color-convert": "^1.9.0"
       }
     },
-    "array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+    "ast-types": {
+      "version": "0.13.4",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
+      "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==",
+      "dev": true,
+      "requires": {
+        "tslib": "^2.0.1"
+      }
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
       "dev": true
     },
     "axios": {
-      "version": "0.21.4",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
-      "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
+      "version": "1.7.9",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz",
+      "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==",
       "dev": true,
       "requires": {
-        "follow-redirects": "^1.14.0"
+        "follow-redirects": "^1.15.6",
+        "form-data": "^4.0.0",
+        "proxy-from-env": "^1.1.0"
       }
     },
+    "b4a": {
+      "version": "1.6.4",
+      "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.4.tgz",
+      "integrity": "sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw==",
+      "dev": true
+    },
     "babel-regenerator-runtime": {
       "version": "6.5.0",
       "resolved": "https://registry.npmjs.org/babel-regenerator-runtime/-/babel-regenerator-runtime-6.5.0.tgz",
       "integrity": "sha1-DkHNHJ+ARCRm8BXHSf/4upj44RA=",
       "dev": true
     },
-    "balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
-    },
-    "bluebird": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-      "dev": true
+    "bare-events": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.2.0.tgz",
+      "integrity": "sha512-Yyyqff4PIFfSuthCZqLlPISTWHmnQxoPuAvkmgzsJEmG3CesdIv6Xweayl0JkCZJSB2yYIdJyEz97tpxNhgjbg==",
+      "dev": true,
+      "optional": true
     },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+    "bare-fs": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.1.5.tgz",
+      "integrity": "sha512-5t0nlecX+N2uJqdxe9d18A98cp2u9BETelbjKpiVgQqzzmVNFYWEAjQHqS+2Khgto1vcwhik9cXucaj5ve2WWA==",
       "dev": true,
+      "optional": true,
       "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+        "bare-events": "^2.0.0",
+        "bare-os": "^2.0.0",
+        "bare-path": "^2.0.0",
+        "streamx": "^2.13.0"
       }
     },
-    "braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+    "bare-os": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.2.0.tgz",
+      "integrity": "sha512-hD0rOPfYWOMpVirTACt4/nK8mC55La12K5fY1ij8HAdfQakD62M+H4o4tpfKzVGLgRDTuk3vjA4GqGXXCeFbag==",
+      "dev": true,
+      "optional": true
+    },
+    "bare-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-2.1.0.tgz",
+      "integrity": "sha512-DIIg7ts8bdRKwJRJrUMy/PICEaQZaPGZ26lsSx9MJSwIhSrcdHn7/C8W+XmnG/rKi6BaRcz+JO00CjZteybDtw==",
       "dev": true,
+      "optional": true,
       "requires": {
-        "fill-range": "^7.0.1"
+        "bare-os": "^2.1.0"
       }
     },
+    "basic-ftp": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.5.tgz",
+      "integrity": "sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==",
+      "dev": true
+    },
     "browserslist": {
       "version": "4.17.5",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.5.tgz",
@@ -2650,27 +2584,6 @@
       "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
       "dev": true
     },
-    "cacheable-lookup": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
-      "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",
-      "dev": true
-    },
-    "cacheable-request": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz",
-      "integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==",
-      "dev": true,
-      "requires": {
-        "clone-response": "^1.0.2",
-        "get-stream": "^5.1.0",
-        "http-cache-semantics": "^4.0.0",
-        "keyv": "^4.0.0",
-        "lowercase-keys": "^2.0.0",
-        "normalize-url": "^6.0.1",
-        "responselike": "^2.0.0"
-      }
-    },
     "caniuse-lite": {
       "version": "1.0.30001271",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001271.tgz",
@@ -2690,33 +2603,21 @@
         "supports-color": "^5.3.0"
       }
     },
-    "chownr": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
-      "dev": true
-    },
     "chromedriver": {
-      "version": "95.0.0",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-95.0.0.tgz",
-      "integrity": "sha512-HwSg7S0ZZYsHTjULwxFHrrUqEpz1+ljDudJM3eOquvqD5QKnR5pSe/GlBTY9UU2tVFRYz8bEHYC4Y8qxciQiLQ==",
+      "version": "131.0.5",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-131.0.5.tgz",
+      "integrity": "sha512-OQY4BHUe9JedxH4aAsPZJcf8Y0lMlE7y+3tiCvQSCQ6qDz2b99R0qsqyqzUUSW2DFx0bg4YxmK8CDVMKb9u5kg==",
       "dev": true,
       "requires": {
-        "@testim/chrome-version": "^1.0.7",
-        "axios": "^0.21.2",
-        "del": "^6.0.0",
+        "@testim/chrome-version": "^1.1.4",
+        "axios": "^1.7.4",
+        "compare-versions": "^6.1.0",
         "extract-zip": "^2.0.1",
-        "https-proxy-agent": "^5.0.0",
+        "proxy-agent": "^6.4.0",
         "proxy-from-env": "^1.1.0",
-        "tcp-port-used": "^1.0.1"
+        "tcp-port-used": "^1.0.2"
       }
     },
-    "clean-stack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-      "dev": true
-    },
     "clone-deep": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
@@ -2728,15 +2629,6 @@
         "shallow-clone": "^3.0.0"
       }
     },
-    "clone-response": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
-      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
-      "dev": true,
-      "requires": {
-        "mimic-response": "^1.0.0"
-      }
-    },
     "color-convert": {
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
@@ -2750,20 +2642,29 @@
     "color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
       "dev": true,
       "peer": true
     },
+    "combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
     "commondir": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
       "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
       "dev": true
     },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+    "compare-versions": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-6.1.0.tgz",
+      "integrity": "sha512-LNZQXhqUvqUTotpZ00qLSaify3b4VFD588aRr8MKFw4CMUr98ytzCW5wDH5qx/DEY5kCDXcbcRuCqL0szEf2tg==",
       "dev": true
     },
     "convert-source-map": {
@@ -2782,69 +2683,50 @@
       "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
       "dev": true
     },
+    "data-uri-to-buffer": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
+      "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==",
+      "dev": true
+    },
     "debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "requires": {
         "ms": "2.1.2"
       }
     },
-    "decompress-response": {
+    "decamelize": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
-      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
-      "dev": true,
-      "requires": {
-        "mimic-response": "^3.1.0"
-      },
-      "dependencies": {
-        "mimic-response": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
-          "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
-          "dev": true
-        }
-      }
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-6.0.0.tgz",
+      "integrity": "sha512-Fv96DCsdOgB6mdGl67MT5JaTNKRzrzill5OH5s8bjYJXVlcXyPYGyPsUkWyGV5p1TXI5esYIYMMeDJL0hEIwaA==",
+      "dev": true
     },
     "deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
-    },
-    "defer-to-connect": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
-      "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
-      "dev": true
-    },
-    "del": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/del/-/del-6.0.0.tgz",
-      "integrity": "sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==",
-      "dev": true,
-      "requires": {
-        "globby": "^11.0.1",
-        "graceful-fs": "^4.2.4",
-        "is-glob": "^4.0.1",
-        "is-path-cwd": "^2.2.0",
-        "is-path-inside": "^3.0.2",
-        "p-map": "^4.0.0",
-        "rimraf": "^3.0.2",
-        "slash": "^3.0.0"
-      }
+      "dev": true
     },
-    "dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+    "degenerator": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz",
+      "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==",
       "dev": true,
       "requires": {
-        "path-type": "^4.0.0"
+        "ast-types": "^0.13.4",
+        "escodegen": "^2.1.0",
+        "esprima": "^4.0.1"
       }
     },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "dev": true
+    },
     "electron-to-chromium": {
       "version": "1.3.879",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.879.tgz",
@@ -2871,10 +2753,49 @@
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
       "dev": true,
       "peer": true
     },
+    "escodegen": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
+      "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
+      "dev": true,
+      "requires": {
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
+        "esutils": "^2.0.2",
+        "source-map": "~0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true
+    },
+    "estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true
+    },
+    "esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true
+    },
     "extract-zip": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
@@ -2887,27 +2808,11 @@
         "yauzl": "^2.10.0"
       }
     },
-    "fast-glob": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
-      "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
-      "dev": true,
-      "requires": {
-        "@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"
-      }
-    },
-    "fastq": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
-      "dev": true,
-      "requires": {
-        "reusify": "^1.0.4"
-      }
+    "fast-fifo": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.0.tgz",
+      "integrity": "sha512-IgfweLvEpwyA4WgiQe9Nx6VV2QkML2NkvZnk1oKnIzXgXdWxuhF7zw4DvLTPZJn6PIUneiAXPF24QmoEqHTjyw==",
+      "dev": true
     },
     "fd-slicer": {
       "version": "1.1.0",
@@ -2918,13 +2823,14 @@
         "pend": "~1.2.0"
       }
     },
-    "fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+    "fetch-blob": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz",
+      "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==",
       "dev": true,
       "requires": {
-        "to-regex-range": "^5.0.1"
+        "node-domexception": "^1.0.0",
+        "web-streams-polyfill": "^3.0.3"
       }
     },
     "find-cache-dir": {
@@ -2948,37 +2854,45 @@
       }
     },
     "follow-redirects": {
-      "version": "1.14.4",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz",
-      "integrity": "sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==",
+      "version": "1.15.6",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
       "dev": true
     },
-    "fs-minipass": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+    "form-data": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
       "dev": true,
       "requires": {
-        "minipass": "^3.0.0"
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
       }
     },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
+    "formdata-polyfill": {
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
+      "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
+      "dev": true,
+      "requires": {
+        "fetch-blob": "^3.1.2"
+      }
     },
     "geckodriver": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/geckodriver/-/geckodriver-2.0.4.tgz",
-      "integrity": "sha512-3Fu75v6Ov8h5Vt25+djJU56MJA2gRctgjhvG5xGzLFTQjltPz7nojQdBHbmgWznUt3CHl8VaiDn8MaepY7B0dA==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/geckodriver/-/geckodriver-5.0.0.tgz",
+      "integrity": "sha512-vn7TtQ3b9VMJtVXsyWtQQl1fyBVFhQy7UvJF96kPuuJ0or5THH496AD3eUyaDD11+EqCxH9t6V+EP9soZQk4YQ==",
       "dev": true,
       "requires": {
-        "adm-zip": "0.5.5",
-        "bluebird": "3.7.2",
-        "got": "11.8.2",
-        "https-proxy-agent": "5.0.0",
-        "tar": "6.1.9"
+        "@wdio/logger": "^9.1.3",
+        "@zip.js/zip.js": "^2.7.53",
+        "decamelize": "^6.0.0",
+        "http-proxy-agent": "^7.0.2",
+        "https-proxy-agent": "^7.0.5",
+        "node-fetch": "^3.3.2",
+        "tar-fs": "^3.0.6",
+        "which": "^5.0.0"
       }
     },
     "gensync": {
@@ -2997,27 +2911,23 @@
         "pump": "^3.0.0"
       }
     },
-    "glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-      "dev": true,
-      "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+    "get-uri": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.4.tgz",
+      "integrity": "sha512-E1b1lFFLvLgak2whF2xDBcOy6NLVGZBqqjJjsIhvopKfWWEi64pLVTWWehV8KlLerZkfNTA95sTe2OdJKm1OzQ==",
       "dev": true,
       "requires": {
-        "is-glob": "^4.0.1"
+        "basic-ftp": "^5.0.2",
+        "data-uri-to-buffer": "^6.0.2",
+        "debug": "^4.3.4"
+      },
+      "dependencies": {
+        "data-uri-to-buffer": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz",
+          "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==",
+          "dev": true
+        }
       }
     },
     "globals": {
@@ -3027,149 +2937,59 @@
       "dev": true,
       "peer": true
     },
-    "globby": {
-      "version": "11.0.4",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
-      "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"
-      }
-    },
-    "got": {
-      "version": "11.8.2",
-      "resolved": "https://registry.npmjs.org/got/-/got-11.8.2.tgz",
-      "integrity": "sha512-D0QywKgIe30ODs+fm8wMZiAcZjypcCodPNuMz5H9Mny7RJ+IjJ10BdmGW7OM7fHXP+O7r6ZwapQ/YQmMSvB0UQ==",
-      "dev": true,
-      "requires": {
-        "@sindresorhus/is": "^4.0.0",
-        "@szmarczak/http-timer": "^4.0.5",
-        "@types/cacheable-request": "^6.0.1",
-        "@types/responselike": "^1.0.0",
-        "cacheable-lookup": "^5.0.3",
-        "cacheable-request": "^7.0.1",
-        "decompress-response": "^6.0.0",
-        "http2-wrapper": "^1.0.0-beta.5.2",
-        "lowercase-keys": "^2.0.0",
-        "p-cancelable": "^2.0.0",
-        "responselike": "^2.0.0"
-      }
-    },
-    "graceful-fs": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
-      "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==",
-      "dev": true
-    },
     "has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
       "dev": true,
       "peer": true
     },
-    "http-cache-semantics": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
-      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==",
-      "dev": true
-    },
-    "http2-wrapper": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
-      "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
+    "http-proxy-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
       "dev": true,
       "requires": {
-        "quick-lru": "^5.1.1",
-        "resolve-alpn": "^1.0.0"
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
       }
     },
     "https-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
       "dev": true,
       "requires": {
-        "agent-base": "6",
+        "agent-base": "^7.1.2",
         "debug": "4"
       }
     },
-    "ignore": {
-      "version": "5.1.8",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-      "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
-      "dev": true
-    },
     "immediate": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
       "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=",
       "dev": true
     },
-    "indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "dev": true
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
     "inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "dev": true
     },
-    "ip-regex": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz",
-      "integrity": "sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==",
-      "dev": true
-    },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true
-    },
-    "is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+    "ip-address": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
+      "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
       "dev": true,
       "requires": {
-        "is-extglob": "^2.1.1"
+        "jsbn": "1.1.0",
+        "sprintf-js": "^1.1.3"
       }
     },
-    "is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true
-    },
-    "is-path-cwd": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
-      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
-      "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==",
+    "ip-regex": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz",
+      "integrity": "sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==",
       "dev": true
     },
     "is-plain-object": {
@@ -3204,6 +3024,12 @@
       "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
       "dev": true
     },
+    "isexe": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
+      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
+      "dev": true
+    },
     "isobject": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
@@ -3217,6 +3043,12 @@
       "dev": true,
       "peer": true
     },
+    "jsbn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
+      "dev": true
+    },
     "jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -3224,41 +3056,23 @@
       "dev": true,
       "peer": true
     },
-    "json-buffer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-      "dev": true
-    },
     "json5": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
       "dev": true,
-      "peer": true,
-      "requires": {
-        "minimist": "^1.2.5"
-      }
+      "peer": true
     },
     "jszip": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.1.tgz",
-      "integrity": "sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==",
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz",
+      "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==",
       "dev": true,
       "requires": {
         "lie": "~3.3.0",
         "pako": "~1.0.2",
         "readable-stream": "~2.3.6",
-        "set-immediate-shim": "~1.0.1"
-      }
-    },
-    "keyv": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.0.3.tgz",
-      "integrity": "sha512-zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA==",
-      "dev": true,
-      "requires": {
-        "json-buffer": "3.0.1"
+        "setimmediate": "^1.0.5"
       }
     },
     "kind-of": {
@@ -3286,10 +3100,22 @@
         "path-exists": "^3.0.0"
       }
     },
-    "lowercase-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+    "loglevel": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.8.1.tgz",
+      "integrity": "sha512-tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg==",
+      "dev": true
+    },
+    "loglevel-plugin-prefix": {
+      "version": "0.8.4",
+      "resolved": "https://registry.npmjs.org/loglevel-plugin-prefix/-/loglevel-plugin-prefix-0.8.4.tgz",
+      "integrity": "sha512-WpG9CcFAOjz/FtNht+QJeGpvVl/cdR6P0z6OcXSkr8wFJOsV2GRj2j10JLfjuA4aYkcKCNIEqRGCyTife9R8/g==",
+      "dev": true
+    },
+    "lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
       "dev": true
     },
     "make-dir": {
@@ -3303,88 +3129,57 @@
       },
       "dependencies": {
         "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "version": "5.7.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+          "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
           "dev": true
         }
       }
     },
-    "merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "dev": true
-    },
-    "micromatch": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
-      "dev": true,
-      "requires": {
-        "braces": "^3.0.1",
-        "picomatch": "^2.2.3"
-      }
-    },
-    "mimic-response": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+    "mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
       "dev": true
     },
-    "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-      "dev": true,
-      "peer": true
-    },
-    "minipass": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz",
-      "integrity": "sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==",
-      "dev": true,
-      "requires": {
-        "yallist": "^4.0.0"
-      }
-    },
-    "minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+    "mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dev": true,
       "requires": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
+        "mime-db": "1.52.0"
       }
     },
-    "mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "dev": true
-    },
     "ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "dev": true
     },
-    "node-modules-regexp": {
+    "netmask": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
+      "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==",
+      "dev": true
+    },
+    "node-domexception": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
-      "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
+      "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
+      "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==",
       "dev": true
     },
+    "node-fetch": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz",
+      "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==",
+      "dev": true,
+      "requires": {
+        "data-uri-to-buffer": "^4.0.0",
+        "fetch-blob": "^3.1.4",
+        "formdata-polyfill": "^4.0.10"
+      }
+    },
     "node-releases": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz",
@@ -3392,12 +3187,6 @@
       "dev": true,
       "peer": true
     },
-    "normalize-url": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
-      "dev": true
-    },
     "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -3407,12 +3196,6 @@
         "wrappy": "1"
       }
     },
-    "p-cancelable": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
-      "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
-      "dev": true
-    },
     "p-limit": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
@@ -3431,21 +3214,38 @@
         "p-limit": "^2.0.0"
       }
     },
-    "p-map": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
-      "dev": true,
-      "requires": {
-        "aggregate-error": "^3.0.0"
-      }
-    },
     "p-try": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
       "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
       "dev": true
     },
+    "pac-proxy-agent": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.1.0.tgz",
+      "integrity": "sha512-Z5FnLVVZSnX7WjBg0mhDtydeRZ1xMcATZThjySQUHqr+0ksP8kqaw23fNKkaaN/Z8gwLUs/W7xdl0I75eP2Xyw==",
+      "dev": true,
+      "requires": {
+        "@tootallnate/quickjs-emscripten": "^0.23.0",
+        "agent-base": "^7.1.2",
+        "debug": "^4.3.4",
+        "get-uri": "^6.0.1",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.6",
+        "pac-resolver": "^7.0.1",
+        "socks-proxy-agent": "^8.0.5"
+      }
+    },
+    "pac-resolver": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz",
+      "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==",
+      "dev": true,
+      "requires": {
+        "degenerator": "^5.0.0",
+        "netmask": "^2.0.2"
+      }
+    },
     "pako": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
@@ -3458,18 +3258,6 @@
       "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
       "dev": true
     },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true
-    },
-    "path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true
-    },
     "pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
@@ -3483,12 +3271,6 @@
       "dev": true,
       "peer": true
     },
-    "picomatch": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
-      "dev": true
-    },
     "pify": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
@@ -3496,13 +3278,10 @@
       "dev": true
     },
     "pirates": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
-      "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
-      "dev": true,
-      "requires": {
-        "node-modules-regexp": "^1.0.0"
-      }
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
+      "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
+      "dev": true
     },
     "pkg-dir": {
       "version": "3.0.0",
@@ -3519,6 +3298,22 @@
       "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
       "dev": true
     },
+    "proxy-agent": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.5.0.tgz",
+      "integrity": "sha512-TmatMXdr2KlRiA2CyDu8GqR8EjahTG3aY3nXjdzFyoZbmB8hrBsTyMezhULIXKnC0jpfjlmiZ3+EaCzoInSu/A==",
+      "dev": true,
+      "requires": {
+        "agent-base": "^7.1.2",
+        "debug": "^4.3.4",
+        "http-proxy-agent": "^7.0.1",
+        "https-proxy-agent": "^7.0.6",
+        "lru-cache": "^7.14.1",
+        "pac-proxy-agent": "^7.1.0",
+        "proxy-from-env": "^1.1.0",
+        "socks-proxy-agent": "^8.0.5"
+      }
+    },
     "proxy-from-env": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
@@ -3535,16 +3330,10 @@
         "once": "^1.3.1"
       }
     },
-    "queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true
-    },
-    "quick-lru": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
-      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
+    "queue-tick": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
+      "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==",
       "dev": true
     },
     "readable-stream": {
@@ -3562,45 +3351,6 @@
         "util-deprecate": "~1.0.1"
       }
     },
-    "resolve-alpn": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
-      "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==",
-      "dev": true
-    },
-    "responselike": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz",
-      "integrity": "sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw==",
-      "dev": true,
-      "requires": {
-        "lowercase-keys": "^2.0.0"
-      }
-    },
-    "reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "dev": true
-    },
-    "rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.1.3"
-      }
-    },
-    "run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "dev": true,
-      "requires": {
-        "queue-microtask": "^1.2.2"
-      }
-    },
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
@@ -3608,28 +3358,28 @@
       "dev": true
     },
     "selenium-webdriver": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.0.0.tgz",
-      "integrity": "sha512-tOlu6FnTjPq2FKpd153pl8o2cB7H40Rvl/ogiD2sapMv4IDjQqpIxbd+swDJe9UDLdszeh5CDis6lgy4e9UG1w==",
+      "version": "4.27.0",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.27.0.tgz",
+      "integrity": "sha512-LkTJrNz5socxpPnWPODQ2bQ65eYx9JK+DQMYNihpTjMCqHwgWGYQnQTCAAche2W3ZP87alA+1zYPvgS8tHNzMQ==",
       "dev": true,
       "requires": {
-        "jszip": "^3.6.0",
-        "rimraf": "^3.0.2",
-        "tmp": "^0.2.1",
-        "ws": ">=7.4.6"
+        "@bazel/runfiles": "^6.3.1",
+        "jszip": "^3.10.1",
+        "tmp": "^0.2.3",
+        "ws": "^8.18.0"
       }
     },
     "semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
       "peer": true
     },
-    "set-immediate-shim": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
-      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
+    "setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
       "dev": true
     },
     "shallow-clone": {
@@ -3641,12 +3391,33 @@
         "kind-of": "^6.0.2"
       }
     },
-    "slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+    "smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
       "dev": true
     },
+    "socks": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
+      "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
+      "dev": true,
+      "requires": {
+        "ip-address": "^9.0.5",
+        "smart-buffer": "^4.2.0"
+      }
+    },
+    "socks-proxy-agent": {
+      "version": "8.0.5",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz",
+      "integrity": "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==",
+      "dev": true,
+      "requires": {
+        "agent-base": "^7.1.2",
+        "debug": "^4.3.4",
+        "socks": "^2.8.3"
+      }
+    },
     "source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -3672,6 +3443,22 @@
         }
       }
     },
+    "sprintf-js": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
+      "dev": true
+    },
+    "streamx": {
+      "version": "2.15.0",
+      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.15.0.tgz",
+      "integrity": "sha512-HcxY6ncGjjklGs1xsP1aR71INYcsXFJet5CU1CHqihQ2J5nOsbd4OjgjHO42w/4QNv9gZb3BueV+Vxok5pLEXg==",
+      "dev": true,
+      "requires": {
+        "fast-fifo": "^1.1.0",
+        "queue-tick": "^1.0.1"
+      }
+    },
     "string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -3681,6 +3468,15 @@
         "safe-buffer": "~5.1.0"
       }
     },
+    "strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^6.0.1"
+      }
+    },
     "supports-color": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -3691,18 +3487,27 @@
         "has-flag": "^3.0.0"
       }
     },
-    "tar": {
-      "version": "6.1.9",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.9.tgz",
-      "integrity": "sha512-XjLaMNl76o07zqZC/aW4lwegdY07baOH1T8w3AEfrHAdyg/oYO4ctjzEBq9Gy9fEP9oHqLIgvx6zuGDGe+bc8Q==",
+    "tar-fs": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz",
+      "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==",
+      "dev": true,
+      "requires": {
+        "bare-fs": "^2.1.1",
+        "bare-path": "^2.1.0",
+        "pump": "^3.0.0",
+        "tar-stream": "^3.1.5"
+      }
+    },
+    "tar-stream": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.6.tgz",
+      "integrity": "sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==",
       "dev": true,
       "requires": {
-        "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"
+        "b4a": "^1.6.4",
+        "fast-fifo": "^1.2.0",
+        "streamx": "^2.15.0"
       }
     },
     "tcp-port-used": {
@@ -3727,13 +3532,10 @@
       }
     },
     "tmp": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
-      "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
-      "dev": true,
-      "requires": {
-        "rimraf": "^3.0.0"
-      }
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
+      "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==",
+      "dev": true
     },
     "to-fast-properties": {
       "version": "2.0.0",
@@ -3742,14 +3544,11 @@
       "dev": true,
       "peer": true
     },
-    "to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "requires": {
-        "is-number": "^7.0.0"
-      }
+    "tslib": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+      "dev": true
     },
     "util-deprecate": {
       "version": "1.0.2",
@@ -3757,6 +3556,21 @@
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
       "dev": true
     },
+    "web-streams-polyfill": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz",
+      "integrity": "sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==",
+      "dev": true
+    },
+    "which": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz",
+      "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==",
+      "dev": true,
+      "requires": {
+        "isexe": "^3.1.1"
+      }
+    },
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -3764,18 +3578,12 @@
       "dev": true
     },
     "ws": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
-      "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "dev": true,
       "requires": {}
     },
-    "yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
     "yauzl": {
       "version": "2.10.0",
       "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
diff --git a/build-system/tasks/e2e/package.json b/build-system/tasks/e2e/package.json
index de70ba7fce64..2db1f4b1f424 100644
--- a/build-system/tasks/e2e/package.json
+++ b/build-system/tasks/e2e/package.json
@@ -4,10 +4,11 @@
   "version": "0.1.0",
   "description": "amp e2e",
   "devDependencies": {
-    "@babel/register": "7.15.3",
+    "@babel/register": "7.25.9",
+    "@types/selenium-webdriver": "4.1.28",
     "babel-regenerator-runtime": "6.5.0",
-    "chromedriver": "95.0.0",
-    "geckodriver": "2.0.4",
-    "selenium-webdriver": "4.0.0"
+    "chromedriver": "131.0.5",
+    "geckodriver": "5.0.0",
+    "selenium-webdriver": "4.27.0"
   }
 }
diff --git a/build-system/tasks/e2e/selenium-webdriver-controller.js b/build-system/tasks/e2e/selenium-webdriver-controller.js
index 0e884a86c8bc..e6ca1a5aaa62 100644
--- a/build-system/tasks/e2e/selenium-webdriver-controller.js
+++ b/build-system/tasks/e2e/selenium-webdriver-controller.js
@@ -1,5 +1,5 @@
 const fs = require('fs');
-const selenium = require('selenium-webdriver');
+const {By, Condition, Key: SeleniumKey, error} = require('selenium-webdriver');
 const {
   DOMRectDef,
   ElementHandle,
@@ -10,12 +10,14 @@ const {ControllerPromise} = require('./controller-promise');
 const {expect} = require('chai');
 const {NetworkLogger} = require('./network-logger');
 
-const {By, Condition, Key: SeleniumKey, error} = selenium;
-
 const {NoSuchElementError} = error;
 
 const ELEMENT_WAIT_TIMEOUT = 5000;
 
+/** @typedef {import('selenium-webdriver').ISize} ISize */
+/** @typedef {import('selenium-webdriver').WebDriver} WebDriver */
+/** @typedef {import('selenium-webdriver').WebElement} WebElement */
+
 /** @enum {string} */
 const KeyToSeleniumMap = {
   [Key.ArrowDown]: SeleniumKey.ARROW_DOWN,
@@ -48,7 +50,7 @@ function expectCondition(valueFn, condition, opt_mutate) {
 /**
  * Make the test runner wait until the value returned by the valueFn matches
  * the given condition.
- * @param {!selenium.WebDriver} driver
+ * @param {!WebDriver} driver
  * @param {function(): !Promise<T1>} valueFn
  * @param {function(T2): ?T1} condition
  * @param {function(T1): T2} opt_mutate
@@ -63,30 +65,31 @@ async function waitFor(driver, valueFn, condition, opt_mutate) {
     return Boolean(condition(value));
   };
 
+  /* TODO: fix incorrect typing. */
+  /** @type {any} */
   const result = await driver.wait(
     expectCondition(valueFn, conditionValue, opt_mutate)
   );
 
-  return result.value; // Unbox the value.
+  return result;
 }
 
 class SeleniumWebDriverController {
   /**
-   * @param {!selenium.WebDriver} driver
+   * @param {!WebDriver} driver
    */
   constructor(driver) {
     this.driver = driver;
 
     this.networkLogger = new NetworkLogger(driver);
 
-    /** @private {?selenium.WebElement} */
+    /** @private {?WebElement} */
     this.shadowRoot_ = null;
 
     /** @private {boolean} */
     this.isXpathInstalled_ = false;
   }
 
-  // * @return {function(T1,T1): !Promise<?T1>}
   /**
    * Return a wait function. When called, the function will cause the test
    * runner to wait until the given value matches the expected value.
@@ -107,7 +110,7 @@ class SeleniumWebDriverController {
    * {@link https://github.com/SeleniumHQ/selenium/blob/6a717f20/javascript/node/selenium-webdriver/lib/until.js#L237}
    * @param {string} selector
    * @param {number=} timeout
-   * @return {!Promise<!ElementHandle<!selenium.WebElement>>}
+   * @return {!Promise<!ElementHandle<!WebElement>>}
    */
   async findElement(selector, timeout = ELEMENT_WAIT_TIMEOUT) {
     const bySelector = By.css(selector);
@@ -137,7 +140,7 @@ class SeleniumWebDriverController {
    * until.js#elementsLocated
    * {@link https://github.com/SeleniumHQ/selenium/blob/6a717f20/javascript/node/selenium-webdriver/lib/until.js#L258}   *
    * @param {string} selector
-   * @return {!Promise<!Array<!ElementHandle<!selenium.WebElement>>>}
+   * @return {!Promise<!Array<!ElementHandle<!WebElement>>>}
    */
   async findElements(selector) {
     const bySelector = By.css(selector);
@@ -155,13 +158,17 @@ class SeleniumWebDriverController {
         throw e;
       }
     });
-    const webElements = await this.driver.wait(condition, ELEMENT_WAIT_TIMEOUT);
+    /* TODO: fix incorrect typing. */
+    /** @type {WebElement[]} */
+    const webElements = /** @type {?} */ (
+      await this.driver.wait(condition, ELEMENT_WAIT_TIMEOUT)
+    );
     return webElements.map((webElement) => new ElementHandle(webElement));
   }
 
   /**
    * @param {string} xpath
-   * @return {!Promise<!ElementHandle<!selenium.WebElement>>}
+   * @return {!Promise<!ElementHandle<!WebElement>>}
    */
   async findElementXPath(xpath) {
     await this.maybeInstallXpath_();
@@ -186,24 +193,28 @@ class SeleniumWebDriverController {
 
   /**
    * @param {string} xpath
-   * @return {!Promise<!Array<!ElementHandle<!selenium.WebElement>>>}
+   * @return {!Promise<!Array<!ElementHandle<!WebElement>>>}
    */
   async findElementsXPath(xpath) {
     await this.maybeInstallXpath_();
     const label = 'for at least one element to be located ' + xpath;
-    const webElements = await this.driver.wait(
-      new Condition(label, async () => {
-        const root = await this.getRoot_();
-        const results = await this.evaluate(
-          (xpath, root) => {
-            return window.queryXpath(xpath, root);
-          },
-          xpath,
-          root
-        );
-        return results;
-      }),
-      ELEMENT_WAIT_TIMEOUT
+    /* TODO: fix incorrect typing. */
+    /** @type {WebElement[]} */
+    const webElements = /** @type {?} */ (
+      await this.driver.wait(
+        new Condition(label, async () => {
+          const root = await this.getRoot_();
+          const results = await this.evaluate(
+            (xpath, root) => {
+              return window.queryXpath(xpath, root);
+            },
+            xpath,
+            root
+          );
+          return results;
+        }),
+        ELEMENT_WAIT_TIMEOUT
+      )
     );
     return webElements.map((webElement) => new ElementHandle(webElement));
   }
@@ -229,7 +240,7 @@ class SeleniumWebDriverController {
   }
 
   /**
-   * @return {!Promise<!ElementHandle<!selenium.WebElement>>}
+   * @return {!Promise<!ElementHandle<!WebElement>>}
    */
   async getActiveElement() {
     const root = await this.getRoot_();
@@ -240,7 +251,7 @@ class SeleniumWebDriverController {
   }
 
   /**
-   * @return {!Promise<!ElementHandle<!selenium.WebElement>>}
+   * @return {!Promise<!ElementHandle<!WebElement>>}
    */
   async getDocumentElement() {
     const root = await this.getRoot_();
@@ -253,10 +264,8 @@ class SeleniumWebDriverController {
    * @return {!ControllerPromise<string|null|function>}
    */
   getCurrentUrl() {
-    return new ControllerPromise(
-      this.driver.getCurrentUrl(),
-      this.getWaitFn_(() => this.driver.getCurrentUrl())
-    );
+    const waitForFn = this.getWaitFn_(() => this.driver.getCurrentUrl());
+    return new ControllerPromise(this.driver.getCurrentUrl(), waitForFn);
   }
 
   /**
@@ -268,7 +277,7 @@ class SeleniumWebDriverController {
   }
 
   /**
-   * @param {!ElementHandle<!selenium.WebElement>} handle
+   * @param {!ElementHandle<!WebElement>} handle
    * @param {string|Key} keys
    * @return {!Promise}
    */
@@ -296,7 +305,7 @@ class SeleniumWebDriverController {
    */
   pasteFromClipboard() {
     return this.driver
-      .actions()
+      .actions({async: false, bridge: undefined})
       .keyDown(SeleniumKey.SHIFT)
       .keyDown(SeleniumKey.INSERT)
       .keyUp(SeleniumKey.SHIFT)
@@ -305,19 +314,17 @@ class SeleniumWebDriverController {
   }
 
   /**
-   * @param {!ElementHandle<!selenium.WebElement>} handle
+   * @param {!ElementHandle<!WebElement>} handle
    * @return {!Promise<string>}
    */
   getElementText(handle) {
     const webElement = handle.getElement();
-    return new ControllerPromise(
-      webElement.getText(),
-      this.getWaitFn_(() => webElement.getText())
-    );
+    const waitForFn = this.getWaitFn_(() => webElement.getText());
+    return new ControllerPromise(webElement.getText(), waitForFn);
   }
 
   /**
-   * @param {!ElementHandle<!selenium.WebElement>} handle
+   * @param {!ElementHandle<!WebElement>} handle
    * @return {!Promise<string>}
    */
   getElementTagName(handle) {
@@ -326,7 +333,7 @@ class SeleniumWebDriverController {
   }
 
   /**
-   * @param {!ElementHandle<!selenium.WebElement>} handle
+   * @param {!ElementHandle<!WebElement>} handle
    * @param {string} attribute
    * @return {!Promise<string>}
    */
@@ -342,7 +349,7 @@ class SeleniumWebDriverController {
   /**
    * Gets the element property. Note that this is different
    * than getElementAttribute()
-   * @param {!ElementHandle<!selenium.WebElement>} handle
+   * @param {!ElementHandle<!WebElement>} handle
    * @param {string} property
    * @return {!Promise<string>}
    */
@@ -359,7 +366,7 @@ class SeleniumWebDriverController {
   }
 
   /**
-   * @param {!ElementHandle<!selenium.WebElement>} handle
+   * @param {!ElementHandle<!WebElement>} handle
    * @return {!Promise<!DOMRectDef>}
    */
   getElementRect(handle) {
@@ -442,9 +449,21 @@ class SeleniumWebDriverController {
     );
   }
 
+  /**
+   * Get width/height of the browser area.
+   * @return {!Promise<[number, number]>}
+   */
+  async getWindowRect() {
+    const htmlElement = this.driver.findElement(By.css('html'));
+    return await Promise.all([
+      htmlElement.getAttribute('clientWidth').then(Number),
+      htmlElement.getAttribute('clientHeight').then(Number),
+    ]);
+  }
+
   /**
    * Sets width/height of the browser area.
-   * @param {!selenium.WindowRectDef} rect
+   * @param {!ISize} rect
    * @return {!Promise}
    */
   async setWindowRect(rect) {
@@ -524,7 +543,7 @@ class SeleniumWebDriverController {
 
   /**
    *
-   * @param {!ElementHandle<!selenium.WebElement>} handle
+   * @param {!ElementHandle<!WebElement>} handle
    * @return {!Promise}
    */
   async click(handle) {
@@ -532,7 +551,7 @@ class SeleniumWebDriverController {
   }
 
   /**
-   * @param {!ElementHandle<!selenium.WebElement>} handle
+   * @param {!ElementHandle<!WebElement>} handle
    * @param {!ScrollToOptionsDef=} opt_scrollToOptions
    * @return {!Promise}
    */
@@ -546,7 +565,7 @@ class SeleniumWebDriverController {
   }
 
   /**
-   * @param {!ElementHandle<!selenium.WebElement>} handle
+   * @param {!ElementHandle<!WebElement>} handle
    * @param {!ScrollToOptionsDef=} opt_scrollToOptions
    * @return {!Promise}
    */
@@ -600,7 +619,7 @@ class SeleniumWebDriverController {
   }
 
   /**
-   * @param {!ElementHandle<!selenium.WebElement>} handle
+   * @param {!ElementHandle<!WebElement>} handle
    * @return {!Promise}
    */
   async switchToFrame(handle) {
@@ -623,7 +642,7 @@ class SeleniumWebDriverController {
 
   /**
    * Switch controller to shadowRoot body hosted by given element.
-   * @param {!ElementHandle<!selenium.WebElement>} handle
+   * @param {!ElementHandle<!WebElement>} handle
    * @return {!Promise<void>}
    */
   async switchToShadow(handle) {
@@ -633,7 +652,7 @@ class SeleniumWebDriverController {
 
   /**
    * Switch controller to shadowRoot hosted by given element.
-   * @param {!ElementHandle<!selenium.WebElement>} handle
+   * @param {!ElementHandle<!WebElement>} handle
    * @return {!Promise<void>}
    */
   async switchToShadowRoot(handle) {
@@ -642,7 +661,7 @@ class SeleniumWebDriverController {
   }
 
   /**.
-   * @param {!ElementHandle<!selenium.WebElement>} handle
+   * @param {!ElementHandle<!WebElement>} handle
    * @param {function(): any} getter
    * @return {!Promise<void>}
    */
@@ -661,7 +680,7 @@ class SeleniumWebDriverController {
 
   /**
    * Get the current root
-   * @return {!Promise<!selenium.WebElement>}
+   * @return {!Promise<!WebElement>}
    */
   getRoot_() {
     if (this.shadowRoot_) {
@@ -673,9 +692,9 @@ class SeleniumWebDriverController {
 
   /**
    * Shutdown the driver.
-   * @return {void}
+   * @return {Promise<void>}
    */
-  dispose() {
+  async dispose() {
     return this.driver.quit();
   }
 }
diff --git a/build-system/tasks/extension-helpers.js b/build-system/tasks/extension-helpers.js
index 88f5581dfd83..f30310687270 100644
--- a/build-system/tasks/extension-helpers.js
+++ b/build-system/tasks/extension-helpers.js
@@ -1,9 +1,8 @@
 const argv = require('minimist')(process.argv.slice(2));
-const babel = require('@babel/core');
 const debounce = require('../common/debounce');
-const dedent = require('dedent');
 const fastGlob = require('fast-glob');
 const fs = require('fs-extra');
+const json5 = require('json5');
 const path = require('path');
 const wrappers = require('../compile/compile-wrappers');
 const {
@@ -12,8 +11,6 @@ const {
   endBuildStep,
   esbuildCompile,
   maybeToEsmName,
-  maybeToNpmEsmName,
-  mkdirSync,
   watchDebounceDelay,
 } = require('./helpers');
 const {
@@ -28,15 +25,19 @@ const {
 const {analyticsVendorConfigs} = require('./analytics-vendor-configs');
 const {compileJison} = require('./compile-jison');
 const {cyan, green, red} = require('kleur/colors');
-const {getBentoName} = require('./bento-helpers');
 const {isCiBuild} = require('../common/ci');
 const {jsifyCssAsync} = require('./css/jsify-css');
-const {jssOptions} = require('../babel-config/jss-config');
 const {log} = require('../common/logging');
 const {parse: pathParse} = require('path');
-const {renameSelectorsToBentoTagNames} = require('./css/bento-css');
-const {TransformCache, batchedRead} = require('../common/transform-cache');
 const {watch} = require('chokidar');
+const {findJsSourceFilename} = require('../common/fs');
+
+const legacyLatestVersions = json5.parse(
+  fs.readFileSync(
+    require.resolve('../compile/bundles.legacy-latest-versions.jsonc'),
+    'utf8'
+  )
+);
 
 /**
  * Extensions to build when `--extensions=inabox`.
@@ -80,11 +81,10 @@ const DEFAULT_EXTENSION_SET = ['amp-loader', 'amp-auto-lightbox'];
  *   version?: string,
  *   hasCss?: boolean,
  *   loadPriority?: string,
- *   cssBinaries?: Array<string>,
- *   extraGlobs?: Array<string>,
  *   binaries?: Array<ExtensionBinaryDef>,
- *   npm?: boolean,
  *   wrapper?: string,
+ *   ssrCss?: boolean,
+ *   additionalSuffix?: string
  * }}
  */
 const ExtensionOptionDef = {};
@@ -96,12 +96,13 @@ const ExtensionOptionDef = {};
  *   external?: Array<string>
  *   remap?: Record<string, string>
  *   wrapper?: string,
+ *   babelCaller?: string,
  * }}
  */
 const ExtensionBinaryDef = {};
 
 // All declared extensions.
-const extensions = {};
+const EXTENSIONS = {};
 
 // All extensions to build
 let extensionsToBuild = null;
@@ -112,32 +113,25 @@ const adVendors = [];
 /**
  * @param {string} name
  * @param {string|!Array<string>} version E.g. 0.1 or [0.1, 0.2]
- * @param {string} latestVersion E.g. 0.1
  * @param {!ExtensionOptionDef|undefined} options extension options object.
  * @param {!Object} extensionsObject
- * @param {boolean} includeLatest
  */
-function declareExtension(
-  name,
-  version,
-  latestVersion,
-  options,
-  extensionsObject,
-  includeLatest
-) {
-  const defaultOptions = {hasCss: false, npm: undefined};
+function declareExtension(name, version, options, extensionsObject) {
+  const defaultOptions = {hasCss: false};
   const versions = Array.isArray(version) ? version : [version];
+  const suffix = options?.additionalSuffix ?? '';
   versions.forEach((v) => {
-    extensionsObject[`${name}-${v}`] = {
+    // If `additionalSuffix` is given, make it as a part of the key as it is
+    // most likely needed to make the entry unique for instances where
+    // multiple entries share the same "entryPoint/name"  but have different
+    // destination name. This allows for a 1 to many relationship between
+    // entryPoint and output (1 -> *).
+    extensionsObject[`${name}-${v}${suffix}`] = {
       name,
       version: v,
-      latestVersion,
       ...defaultOptions,
       ...options,
     };
-    if (includeLatest && v == latestVersion) {
-      extensionsObject[`${name}-latest`] = extensionsObject[`${name}-${v}`];
-    }
   });
   if (name.startsWith('amp-ad-network-')) {
     // Get the ad network name. All ad network extensions are named
@@ -150,24 +144,13 @@ function declareExtension(
 /**
  * Initializes all extensions from build-system/compile/bundles.config.extensions.json
  * if not already done and populates the given extensions object.
- * @param {?Object} extensionsObject
- * @param {boolean=} includeLatest
+ * @param {object} extensionsObject
  */
-function maybeInitializeExtensions(
-  extensionsObject = extensions,
-  includeLatest = false
-) {
+function maybeInitializeExtensions(extensionsObject) {
   if (Object.keys(extensionsObject).length === 0) {
     verifyExtensionBundles();
     extensionBundles.forEach((c) => {
-      declareExtension(
-        c.name,
-        c.version,
-        c.latestVersion,
-        c.options,
-        extensionsObject,
-        includeLatest
-      );
+      declareExtension(c.name, c.version, c.options, extensionsObject);
     });
   }
 }
@@ -216,8 +199,8 @@ function getExtensionsToBuild(preBuild = false) {
     !argv.core_runtime_only
   ) {
     const allExtensions = [];
-    for (const extension in extensions) {
-      allExtensions.push(extensions[extension].name);
+    for (const extension in EXTENSIONS) {
+      allExtensions.push(EXTENSIONS[extension].name);
     }
     extensionsToBuild = dedupe(extensionsToBuild.concat(allExtensions));
   }
@@ -346,15 +329,15 @@ function dedupe(arr) {
  */
 async function buildExtensions(options) {
   const startTime = Date.now();
-  maybeInitializeExtensions(extensions, /* includeLatest */ false);
+  maybeInitializeExtensions(EXTENSIONS);
   const extensionsToBuild = getExtensionsToBuild();
   const results = [];
-  for (const extension in extensions) {
+  for (const extension in EXTENSIONS) {
     if (
       options.compileOnlyCss ||
-      extensionsToBuild.includes(extensions[extension].name)
+      extensionsToBuild.includes(EXTENSIONS[extension].name)
     ) {
-      results.push(doBuildExtension(extensions, extension, options));
+      results.push(doBuildExtension(EXTENSIONS, extension, options));
     }
   }
   await Promise.all(results);
@@ -378,14 +361,7 @@ async function doBuildExtension(extensions, extension, options) {
   const e = extensions[extension];
   let o = {...options};
   o = Object.assign(o, e);
-  await buildExtension(
-    e.name,
-    e.version,
-    e.latestVersion,
-    e.hasCss,
-    o,
-    e.extraGlobs
-  );
+  await buildExtension(e.name, e.version, e.hasCss, o);
 }
 
 /**
@@ -395,24 +371,16 @@ async function doBuildExtension(extensions, extension, options) {
  * @param {string} extDir
  * @param {string} name
  * @param {string} version
- * @param {string} latestVersion
  * @param {boolean} hasCss
  * @param {?Object} options
  * @return {Promise<void>}
  */
-async function watchExtension(
-  extDir,
-  name,
-  version,
-  latestVersion,
-  hasCss,
-  options
-) {
+async function watchExtension(extDir, name, version, hasCss, options) {
   /**
    * Steps to run when a watched file is modified.
    */
   function watchFunc() {
-    buildExtension(name, version, latestVersion, hasCss, {
+    buildExtension(name, version, hasCss, {
       ...options,
       continueOnError: true,
       isRebuild: true,
@@ -443,22 +411,12 @@ async function watchExtension(
  *     the extensions directory and the name of the JS and optional CSS file.
  * @param {string} version Version of the extension. Must be identical to
  *     the sub directory inside the extension directory
- * @param {string} latestVersion Latest version of the extension.
  * @param {boolean} hasCss Whether there is a CSS file for this extension.
  * @param {?Object} options
- * @param {!Array=} extraGlobs
  * @return {!Promise<void>}
  */
-async function buildExtension(
-  name,
-  version,
-  latestVersion,
-  hasCss,
-  options,
-  extraGlobs
-) {
+async function buildExtension(name, version, hasCss, options) {
   options = options || {};
-  options.extraGlobs = extraGlobs;
   if (options.compileOnlyCss && !hasCss) {
     return;
   }
@@ -467,13 +425,11 @@ async function buildExtension(
   // Use a separate watcher for css and jison compilation.
   // The watcher within compileJs recompiles the JS.
   if (options.watch) {
-    await watchExtension(extDir, name, version, latestVersion, hasCss, options);
+    await watchExtension(extDir, name, version, hasCss, options);
   }
 
   if (hasCss) {
-    mkdirSync('build');
-    mkdirSync('build/css');
-    await buildExtensionCss(extDir, name, version, options);
+    await buildExtensionCss(extDir, name, version);
     if (options.compileOnlyCss) {
       return;
     }
@@ -483,10 +439,6 @@ async function buildExtension(
   if (name === 'amp-bind') {
     await doBuildJs(jsBundles, 'ww.max.js', options);
   }
-  if (options.npm) {
-    await buildNpmBinaries(extDir, name, options);
-    await buildNpmCss(extDir, options);
-  }
   if (options.binaries) {
     await buildBinaries(extDir, options.binaries, options);
   }
@@ -498,183 +450,57 @@ async function buildExtension(
     return;
   }
 
-  if (options.bento) {
-    await buildBentoExtensionJs(extDir, name, options);
-  }
-  await buildExtensionJs(extDir, name, options);
-}
-
-/**
- * Writes an extensions's CSS to its npm dist folder.
- *
- * @param {string} extDir
- * @param {Object} options
- * @return {Promise<void>}
- */
-async function buildNpmCss(extDir, options) {
-  const startCssTime = Date.now();
-  const filenames = await fastGlob(path.join(extDir, '**', '*.jss.js'));
-  if (!filenames.length) {
-    return;
-  }
-
-  const css = (await Promise.all(filenames.map(getCssForJssFile))).join('');
-  const outfile = path.join(extDir, 'dist', 'styles.css');
-  await fs.writeFile(outfile, css);
-  endBuildStep('Wrote CSS', `${options.name} → styles.css`, startCssTime);
-}
-
-/** @type {TransformCache} */
-let jssCache;
-
-/**
- * Returns the minified CSS for a .jss.js file.
- *
- * @param {string} jssFile
- * @return {Promise<string|Buffer>}
- */
-async function getCssForJssFile(jssFile) {
-  // Lazily instantiate the TransformCache
-  if (!jssCache) {
-    jssCache = new TransformCache('.jss-cache', '.css');
-  }
-
-  const {contents, hash} = await batchedRead(jssFile);
-  const fileCss = await jssCache.get(hash);
-  if (fileCss) {
-    return fileCss;
-  }
-
-  const babelOptions = babel.loadOptions({caller: {name: 'jss'}});
-  if (!babelOptions) {
-    throw new Error('Could not find babel config for jss');
-  }
-  babelOptions['filename'] = jssFile;
-
-  await babel.transform(contents, babelOptions);
-  jssCache.set(hash, Promise.resolve(jssOptions.css));
-  return jssOptions.css;
+  await buildExtensionJs(extDir, name, {...options, bento: false});
 }
 
 /**
  * @param {string} extDir
  * @param {string} name
  * @param {string} version
- * @param {!Object} options
  * @return {!Promise}
  */
-async function buildExtensionCss(extDir, name, version, options) {
-  /**
-   * Writes CSS binaries
-   *
-   * @param {string} name
-   * @param {string} css
-   */
-  function writeCssBinaries(name, css) {
-    const jsCss = 'export const CSS = ' + JSON.stringify(css) + ';\n';
-    const jsName = `build/${name}.js`;
-    const cssName = `build/css/${name}`;
-    fs.writeFileSync(jsName, jsCss, 'utf-8');
-    fs.writeFileSync(cssName, css, 'utf-8');
-  }
-
+async function buildExtensionCss(extDir, name, version) {
   const aliasBundle = extensionAliasBundles[name];
-  const isAliased = aliasBundle && aliasBundle.version == version;
-
-  const mainCssPromise = jsifyCssAsync(`${extDir}/${name}.css`);
-
-  const mainCssBinaryPromise = mainCssPromise.then((mainCss) => {
-    writeCssBinaries(`${name}-${version}.css`, mainCss);
-    if (isAliased) {
-      writeCssBinaries(`${name}-${aliasBundle.aliasedVersion}.css`, mainCss);
-    }
-  });
+  const aliasedVersion =
+    aliasBundle?.version == version ? aliasBundle.aliasedVersion : null;
 
-  const parallel = [mainCssBinaryPromise];
+  const versions = [version, aliasedVersion].filter(Boolean);
 
-  if (options.bento) {
-    const bentoCssPromise = mainCssPromise.then((mainCss) =>
-      buildBentoCss(name, version, mainCss)
-    );
-    parallel.push(bentoCssPromise);
-  }
+  const bundles = await fastGlob(`${extDir}/*.css`);
 
-  if (Array.isArray(options.cssBinaries)) {
-    parallel.push(
-      ...options.cssBinaries.map((name) => {
-        return jsifyCssAsync(`${extDir}/${name}.css`).then((css) => {
-          writeCssBinaries(`${name}-${version}.css`, css);
-          if (isAliased) {
-            writeCssBinaries(`${name}-${aliasBundle.aliasedVersion}.css`, css);
-          }
-        });
-      })
-    );
-  }
-
-  await Promise.all(parallel);
+  await Promise.all(
+    bundles.map(async (filename) => {
+      const name = path.basename(filename, '.css');
+      const css = await jsifyCssAsync(filename);
+      await writeCssBinaries(name, versions, css);
+    })
+  );
 }
 
 /**
- * Build bento-*.css using the compiled amp-* result as source.
- * It replaces all selectors for elements <amp-*> with <bento-*>.
- * As a result of taking already minified code as source, this function is
- * fairly fast and not cached.
  * @param {string} name
- * @param {string} version
- * @param {string} minifiedAmpCss
+ * @param {string[]} versions
+ * @param {string} css
  * @return {!Promise}
  */
-async function buildBentoCss(name, version, minifiedAmpCss) {
-  const bentoName = getBentoName(name);
-  const renamedCss = await renameSelectorsToBentoTagNames(minifiedAmpCss);
-  await fs.outputFile(`build/${bentoName}-${version}.css`, renamedCss);
-  await fs.outputFile(`dist/v0/${bentoName}-${version}.css`, renamedCss);
+async function writeCssBinaries(name, versions, css) {
+  const jsCss = 'export const CSS = ' + JSON.stringify(css) + ';\n';
+  await writeVersions(`build/${name}`, 'css.js', versions, jsCss);
+  await writeVersions(`build/css/${name}`, 'css', versions, css);
 }
 
 /**
- * @param {string} extDir
- * @param {string} name
- * @param {!Object} options
- * @return {!Promise}
+ * @param {string} prefix
+ * @param {string} fileExtension
+ * @param {string[]} versions
+ * @param {string} content
+ * @return {!Promise<void>}
  */
-async function buildNpmBinaries(extDir, name, options) {
-  let {npm} = options;
-  if (npm === true) {
-    npm = {
-      preact: {
-        entryPoint: 'component.js',
-        outfile: 'component-preact.js',
-        external: ['preact', 'preact/dom', 'preact/compat', 'preact/hooks'],
-        remap: {'preact/dom': 'preact'},
-        wrapper: '',
-      },
-      react: {
-        entryPoint: 'component.js',
-        outfile: 'component-react.js',
-        external: ['react', 'react-dom'],
-        remap: {
-          'preact': 'react',
-          'preact/compat': 'react',
-          'preact/hooks': 'react',
-          'preact/dom': 'react-dom',
-        },
-        wrapper: '',
-      },
-      bento: {
-        entryPoint: await getBentoBuildFilename(
-          extDir,
-          getBentoName(name),
-          'web-component',
-          options
-        ),
-        outfile: 'web-component.js',
-        wrapper: '',
-      },
-    };
+async function writeVersions(prefix, fileExtension, versions, content) {
+  for (const version of versions) {
+    const outfile = `${prefix}-${version}.${fileExtension}`;
+    await fs.outputFile(outfile, content);
   }
-  const binaries = Object.values(npm);
-  return buildBinaries(extDir, binaries, options);
 }
 
 /**
@@ -684,122 +510,32 @@ async function buildNpmBinaries(extDir, name, options) {
  * @return {!Promise}
  */
 function buildBinaries(extDir, binaries, options) {
-  mkdirSync(`${extDir}/dist`);
+  // If outputPath is not defined, then use extDir
+  const {outputPath = extDir} = options;
 
   const promises = binaries.map((binary) => {
-    const {entryPoint, external, outfile, remap, wrapper} = binary;
+    const {babelCaller, entryPoint, external, outfile, remap, wrapper} = binary;
     const {name} = pathParse(outfile);
     const esm = argv.esm || argv.sxg || false;
-    return esbuildCompile(extDir + '/', entryPoint, `${extDir}/dist`, {
+    return esbuildCompile(extDir + '/', entryPoint, `${outputPath}/dist`, {
       ...options,
-      toName: maybeToNpmEsmName(`${name}.max.js`),
-      minifiedName: maybeToNpmEsmName(`${name}.js`),
+      toName: maybeToEsmName(`${name}.max.js`),
+      minifiedName: maybeToEsmName(`${name}.js`),
       aliasName: '',
       outputFormat: esm ? 'esm' : 'cjs',
       externalDependencies: external,
       remapDependencies: remap,
       wrapper: wrapper ?? options.wrapper,
+      babelCaller: babelCaller ?? options.babelCaller,
     });
   });
   return Promise.all(promises);
 }
 
-/**
- * @param {string} dir
- * @param {string} name
- * @param {!Object} options
- * @return {!Promise}
- */
-async function buildBentoExtensionJs(dir, name, options) {
-  const bentoName = getBentoName(name);
-  return buildExtensionJs(dir, bentoName, {
-    ...options,
-    wrapper: 'bento',
-    filename: await getBentoBuildFilename(
-      dir,
-      bentoName,
-      'standalone',
-      options
-    ),
-    // Include extension directory since our entrypoint may be elsewhere.
-    extraGlobs: [...(options.extraGlobs || []), `${dir}/**/*.js`],
-  });
-}
-
-/**
- * Bento extensions may specify their own bento-*.js file to specify custom
- * install logic. Otherwise, we generate an install script with the default
- * configuration.
- * @param {string} dir
- * @param {string} name
- * @param {string} mode
- * @param {Object} options
- * @return {Promise<string>}
- */
-async function getBentoBuildFilename(dir, name, mode, options) {
-  const modes = {
-    'standalone': {
-      filename: `${name}.js`,
-      toExport: false,
-    },
-    'web-component': {
-      filename: 'web-component.js',
-      toExport: true,
-    },
-  };
-  const {filename, toExport} = modes[mode];
-  if (!filename) {
-    throw new Error(
-      `Unknown bento mode "${mode}" (${name}:${options.version})\n` +
-        `Expected one of: ${Object.keys(modes).join(', ')}`
-    );
-  }
-
-  if (await fs.pathExists(`${dir}/${filename}`)) {
-    return filename;
-  }
-  const generatedSource = await generateBentoEntryPointSource(
-    name,
-    toExport,
-    options
-  );
-  const generatedFilename = `build/${filename}`;
-  await fs.outputFile(`${dir}/${generatedFilename}`, generatedSource);
-  return generatedFilename;
-}
-
-/**
- * @param {string} name
- * @param {string} toExport
- * @param {Object} options
- * @return {Promise<string>}
- */
-async function generateBentoEntryPointSource(name, toExport, options) {
-  const css = options.hasCss
-    ? await fs.readFile(`build/${name}-${options.version}.css`, 'utf8')
-    : null;
-
-  return dedent(`
-    import {BaseElement} from '../base-element';
-    
-    function defineElement() {
-      const css = __css__;
-      if (css) {
-        const style = document.createElement('style');
-        style.textContent = css;
-        document.head.appendChild(style);
-      }
-      customElements.define(
-        __name__,
-        BaseElement.CustomElement(BaseElement)
-      );
-    }
-
-    ${toExport ? 'export {defineElement};' : 'defineElement();'}
-  `)
-    .replace('__css__', JSON.stringify(css))
-    .replace('__name__', JSON.stringify(name));
-}
+/** @type {import('@babel/core').PluginItem[]} */
+const extensionBabelPlugins = [
+  './build-system/babel-plugins/babel-plugin-amp-config-urls',
+];
 
 /**
  * Build the JavaScript for the extension specified
@@ -811,15 +547,13 @@ async function generateBentoEntryPointSource(name, toExport, options) {
  * @return {!Promise}
  */
 async function buildExtensionJs(dir, name, options) {
+  const isLatest = legacyLatestVersions[options.name] === options.version;
   const {
-    latestVersion,
+    filename = await findJsSourceFilename(name, dir),
     version,
-    filename = `${name}.js`,
     wrapper = 'extension',
   } = options;
 
-  const isLatest = version === latestVersion;
-
   const wrapperOrFn = wrappers[wrapper];
   if (!wrapperOrFn) {
     throw new Error(
@@ -829,15 +563,19 @@ async function buildExtensionJs(dir, name, options) {
   }
   const resolvedWrapper =
     typeof wrapperOrFn === 'function'
-      ? wrapperOrFn(name, version, isLatest, argv.esm, options.loadPriority)
+      ? wrapperOrFn(name, version, argv.esm, options.loadPriority)
       : wrapperOrFn;
 
+  const additionalSuffix = options.additionalSuffix
+    ? `.${options.additionalSuffix}`
+    : '';
   await compileJs(`${dir}/`, filename, './dist/v0', {
     ...options,
-    toName: `${name}-${version}.max.js`,
-    minifiedName: `${name}-${version}.js`,
-    aliasName: isLatest ? `${name}-latest.js` : '',
+    toName: `${name}-${version}.max${additionalSuffix}.js`,
+    minifiedName: `${name}-${version}${additionalSuffix}.js`,
+    aliasName: isLatest ? `${name}-latest${additionalSuffix}.js` : '',
     wrapper: resolvedWrapper,
+    babelPlugins: wrapper === 'extension' ? extensionBabelPlugins : null,
   });
 
   // If an incremental watch build fails, simply return.
@@ -851,10 +589,12 @@ async function buildExtensionJs(dir, name, options) {
   if (isAliased) {
     const {aliasedVersion} = aliasBundle;
     const src = maybeToEsmName(
-      `${name}-${version}${options.minify ? '' : '.max'}.js`
+      `${name}-${version}${options.minify ? '' : '.max'}${additionalSuffix}.js`
     );
     const dest = maybeToEsmName(
-      `${name}-${aliasedVersion}${options.minify ? '' : '.max'}.js`
+      `${name}-${aliasedVersion}${
+        options.minify ? '' : '.max'
+      }${additionalSuffix}.js`
     );
     fs.copySync(`dist/v0/${src}`, `dist/v0/${dest}`);
     fs.copySync(`dist/v0/${src}.map`, `dist/v0/${dest}.map`);
@@ -961,11 +701,18 @@ async function copyWorkerDomResources(version) {
 }
 
 module.exports = {
+  buildBinaries,
+  buildExtensionCss,
+  buildExtensionJs,
   buildExtensions,
+  declareExtension,
+  dedupe,
   doBuildExtension,
-  extensions,
+  EXTENSIONS,
+  getExtensionsFromArg,
   getExtensionsToBuild,
   maybeInitializeExtensions,
   parseExtensionFlags,
   setExtensionsToBuildFromDocuments,
+  INABOX_EXTENSION_SET,
 };
diff --git a/build-system/tasks/get-zindex/index.js b/build-system/tasks/get-zindex/index.js
index 4382349d29ea..a3814ba29577 100644
--- a/build-system/tasks/get-zindex/index.js
+++ b/build-system/tasks/get-zindex/index.js
@@ -5,12 +5,7 @@ const fs = require('fs');
 const path = require('path');
 const Postcss = require('postcss');
 const prettier = require('prettier');
-const textTable = require('text-table');
-const {
-  getJscodeshiftReport,
-  jscodeshiftAsync,
-} = require('../../test-configs/jscodeshift');
-const {getStdout} = require('../../common/process');
+const {getZindexJs} = require('./js');
 const {gray, magenta} = require('kleur/colors');
 const {logLocalDev, logOnSameLineLocalDev} = require('../../common/logging');
 const {writeDiffOrFail} = require('../../common/diff');
@@ -18,15 +13,7 @@ const {writeDiffOrFail} = require('../../common/diff');
 /** @type {Postcss.default} */
 const postcss = /** @type {*} */ (Postcss);
 
-const tableHeaders = [
-  ['context', 'z-index', 'file'],
-  ['---', '---', '---'],
-];
-
-const tableOptions = {
-  align: ['l', 'l', 'l'],
-  hsep: '   |   ',
-};
+const tableHeaders = ['context', 'z-index', 'file'];
 
 const preamble = `
 **Run \`amp get-zindex --fix\` to generate this file.**
@@ -40,7 +27,7 @@ const logChecking = (filename) =>
 const sortedByEntryKey = (a, b) => a[0].localeCompare(b[0]);
 
 /**
- * @param {!Object<string, string>} acc accumulator object for selectors
+ * @param {!{[key: string]: string}} acc accumulator object for selectors
  * @param {!Postcss.Rule} css post css rules object
  */
 function zIndexCollector(acc, css) {
@@ -62,7 +49,7 @@ function zIndexCollector(acc, css) {
 }
 
 /**
- * @param {!Object<string, !Object<string, !Array<number>>>} filesData
+ * @param {!{[key: string]: !{[key: string]: !Array<number>}}} filesData
  *    accumulation of files and the rules and z index values.
  * @return {!Array<!Array<string>>}
  */
@@ -129,65 +116,25 @@ async function getZindexSelectors(glob, cwd = '.') {
  * @param {string=} cwd
  * @return {!Promise<Object>}
  */
-function getZindexChainsInJs(glob, cwd = '.') {
-  return new Promise((resolve) => {
-    const files = fastGlob
-      .sync(glob, {cwd})
-      .map((file) => path.join(cwd, file));
-
-    const filesIncludingString = getStdout(
-      ['grep -irl "z-*index"', ...files].join(' ')
-    )
-      .trim()
-      .split('\n');
-
-    const result = {};
-
-    let resultCountInverse = filesIncludingString.length;
-
-    if (resultCountInverse === 0) {
-      // We don't expect this fileset to be empty since it's unlikely that we
-      // never change the z-index from JS, but we add this just in case to
-      // prevent hanging infinitely.
-      resolve(result);
-      return;
-    }
-
-    const process = jscodeshiftAsync([
-      '--dry',
-      '--no-babel',
-      `--transform=${__dirname}/jscodeshift/collect-zindex.js`,
-      ...filesIncludingString,
-    ]);
-    const {stderr, stdout} = process;
-
-    stderr.on('data', (data) => {
-      throw new Error(data.toString());
-    });
-
-    stdout.on('data', (data) => {
-      const reportLine = getJscodeshiftReport(data.toString());
-
-      if (!reportLine) {
-        return;
-      }
-
-      const [filename, report] = reportLine;
-      const relative = path.relative(cwd, filename);
+async function getZindexChainsInJs(glob, cwd = '.') {
+  const files = (await fastGlob(glob, {cwd})).map((file) =>
+    path.join(cwd, file)
+  );
 
+  const resultEntries = await Promise.all(
+    files.map(async (filename) => {
       logChecking(filename);
+      const relative = path.relative(cwd, filename);
+      const found = await getZindexJs(filename);
+      return [relative, found];
+    })
+  );
 
-      try {
-        const reportParsed = JSON.parse(report);
-        if (reportParsed.length) {
-          result[relative] = reportParsed.sort(sortedByEntryKey);
-        }
-        if (--resultCountInverse === 0) {
-          resolve(result);
-        }
-      } catch (_) {}
-    });
-  });
+  return Object.fromEntries(
+    resultEntries
+      // eslint-disable-next-line local/no-deep-destructuring
+      .filter(([, {length}]) => length)
+  );
 }
 
 /**
@@ -219,8 +166,12 @@ async function getZindex() {
   );
 
   const filename = 'css/Z_INDEX.md';
-  const rows = [...tableHeaders, ...createTable(filesData)];
-  const table = textTable(rows, tableOptions);
+  const rows = [
+    tableHeaders,
+    tableHeaders.map(() => '-'),
+    ...createTable(filesData),
+  ];
+  const table = rows.map((row) => row.join(' | ')).join('\n');
   const output = await prettierFormat(filename, `${preamble}\n\n${table}`);
 
   await writeDiffOrFail(
diff --git a/build-system/tasks/get-zindex/js.js b/build-system/tasks/get-zindex/js.js
new file mode 100644
index 000000000000..a5fc418c21f3
--- /dev/null
+++ b/build-system/tasks/get-zindex/js.js
@@ -0,0 +1,146 @@
+const types = require('@babel/types');
+const {parse} = require('@babel/parser');
+const {readFile} = require('fs-extra');
+
+const zIndexRegExp = /^z-?index$/i;
+
+/**
+ * @param {types.CallExpression} node
+ * @return {string|number|undefined}
+ */
+function getCallExpressionZIndexValue(node) {
+  for (let i = 1; i < node.arguments.length; i++) {
+    const argument = node.arguments[i];
+    const previous = node.arguments[i - 1];
+    if (
+      (types.isStringLiteral(argument) || types.isNumericLiteral(argument)) &&
+      argument.value !== '' &&
+      types.isStringLiteral(previous) &&
+      zIndexRegExp.test(previous.value)
+    ) {
+      return argument.value;
+    }
+  }
+}
+
+/**
+ * @param {string} source
+ * @param {types.Node} node
+ * @return {string}
+ */
+function getNodeSource(source, node) {
+  const {end, start} = node;
+  if (end == null || start == null) {
+    return '';
+  }
+  return source.substr(start, end - start);
+}
+
+/**
+ * @param {string} source
+ * @param {types.TraversalAncestors} ancestors
+ * @return {string}
+ */
+function getPropertyChain(source, ancestors) {
+  let propertyChain = '';
+
+  const path = ancestors.map(({node}) => node);
+  let at = path.pop();
+
+  while (at && types.isObjectProperty(at)) {
+    const part = getNodeSource(source, at.key);
+    if (types.isIdentifier(at.key)) {
+      propertyChain = `.${part}` + propertyChain;
+    } else {
+      propertyChain = `[${part}]` + propertyChain;
+    }
+    at = path.pop();
+  }
+
+  while (
+    at &&
+    !types.isCallExpression(at) &&
+    !types.isVariableDeclarator(at) &&
+    !types.isAssignmentExpression(at) &&
+    !types.isJSXAttribute(at) &&
+    !types.isProgram(at)
+  ) {
+    at = path.pop();
+  }
+
+  if (types.isCallExpression(at)) {
+    return getNodeSource(source, at.callee);
+  }
+
+  if (types.isJSXAttribute(at)) {
+    const parent = path.pop();
+    if (types.isJSXOpeningElement(parent)) {
+      const name = getNodeSource(source, parent.name);
+      return `<${name} />`;
+    }
+  }
+
+  if (types.isAssignmentExpression(at)) {
+    return getNodeSource(source, at.left) + propertyChain;
+  }
+
+  if (types.isVariableDeclarator(at)) {
+    return getNodeSource(source, at.id) + propertyChain;
+  }
+
+  return '(unknown)';
+}
+
+/**
+ * @param {string} filename
+ * @return {Promise<[string, string][]>}
+ */
+async function getZindexJs(filename) {
+  const report = [];
+  const source = await readFile(filename, 'utf8');
+
+  // Prevent parsing if there's no chance of encountering string
+  if (!/z-*index/i.test(source)) {
+    return report;
+  }
+
+  const tree = parse(source, {
+    sourceType: 'module',
+    plugins: ['jsx'],
+  });
+
+  types.traverse(tree, (node, ancestors) => {
+    if (types.isObjectProperty(node)) {
+      const {value} = node;
+      if (!types.isStringLiteral(value) && !types.isNumericLiteral(value)) {
+        return;
+      }
+
+      const {key} = node;
+      const name = types.isStringLiteral(key)
+        ? key.value
+        : types.isIdentifier(key)
+          ? key.name
+          : null;
+      if (!name) {
+        return;
+      }
+
+      if (zIndexRegExp.test(name) && value.value !== '') {
+        ancestors.pop();
+        if (ancestors.length) {
+          report.push([getPropertyChain(source, ancestors), value.value]);
+        }
+      }
+    } else if (types.isCallExpression(node)) {
+      const value = getCallExpressionZIndexValue(node);
+      if (value != null) {
+        report.push([getNodeSource(source, node.callee), value]);
+      }
+    }
+  });
+
+  return report.sort(([a], [b]) => a.localeCompare(b));
+}
+
+module.exports = {getZindexJs};
diff --git a/build-system/tasks/get-zindex/jscodeshift/collect-zindex.js b/build-system/tasks/get-zindex/jscodeshift/collect-zindex.js
deleted file mode 100644
index df47fcb0b4f1..000000000000
--- a/build-system/tasks/get-zindex/jscodeshift/collect-zindex.js
+++ /dev/null
@@ -1,115 +0,0 @@
-const zIndexRegExp = /^z-?index$/i;
-
-/**
- * @param {*} node
- * @return {string|undefined}
- */
-function getCallExpressionZIndexValue(node) {
-  for (let i = 1; i < node.arguments.length; i++) {
-    const argument = node.arguments[i];
-    const previous = node.arguments[i - 1];
-    if (
-      argument.type.endsWith('Literal') &&
-      argument.value !== '' &&
-      zIndexRegExp.test(previous.value)
-    ) {
-      return argument.value;
-    }
-  }
-}
-
-/**
- * @param {*} file
- * @param {*} node
- * @return {string}
- */
-function source(file, node) {
-  const {end, start} = node;
-  return file.source.substr(start, end - start);
-}
-
-/**
- * @param {*} file
- * @param {*} path
- * @return {string}
- */
-function chainId(file, path) {
-  let propertyChain = '';
-  let at = path;
-
-  while (at && at.value && at.value.type.endsWith('Property')) {
-    const part = source(file, at.value.key);
-    if (at.value.key.type === 'Identifier') {
-      propertyChain = `.${part}` + propertyChain;
-    } else {
-      propertyChain = `[${part}]` + propertyChain;
-    }
-    at = at.parent && at.parent.parent;
-  }
-
-  while (
-    at &&
-    at.parent &&
-    at.value.type !== 'CallExpression' &&
-    at.value.type !== 'VariableDeclarator' &&
-    at.value.type !== 'AssignmentExpression' &&
-    at.value.type !== 'JSXAttribute' &&
-    at.value.type !== 'Program'
-  ) {
-    at = at.parent;
-  }
-
-  if (at.value.type === 'JSXAttribute') {
-    const openingElement = source(file, at.parent.value.name);
-    return `<${openingElement} />`;
-  }
-
-  if (at.value.type === 'CallExpression') {
-    return source(file, at.value.callee);
-  }
-
-  if (at.value.type === 'AssignmentExpression') {
-    return source(file, at.value.left) + propertyChain;
-  }
-
-  if (at.value.type === 'VariableDeclarator') {
-    return source(file, at.value.id) + propertyChain;
-  }
-
-  return '(unknown)';
-}
-
-module.exports = function (file, api) {
-  const j = api.jscodeshift;
-
-  const report = [];
-
-  j(file.source)
-    .find(
-      j.ObjectProperty,
-      (node) =>
-        node.key &&
-        node.value.type.endsWith('Literal') &&
-        node.value.value !== '' &&
-        zIndexRegExp.test(node.key.value || node.key.name)
-    )
-    .forEach((path) => {
-      report.push([chainId(file, path.parent.parent), path.value.value.value]);
-    });
-
-  j(file.source)
-    .find(
-      j.CallExpression,
-      (node) => getCallExpressionZIndexValue(node) != null
-    )
-    .forEach((path) => {
-      report.push([
-        chainId(file, path),
-        getCallExpressionZIndexValue(path.value),
-      ]);
-    });
-
-  api.report(JSON.stringify(report));
-
-  return file.source;
-};
diff --git a/build-system/tasks/helpers.js b/build-system/tasks/helpers.js
index 91a180afae1c..38b583a86691 100644
--- a/build-system/tasks/helpers.js
+++ b/build-system/tasks/helpers.js
@@ -1,34 +1,31 @@
 const argv = require('minimist')(process.argv.slice(2));
 const debounce = require('../common/debounce');
 const esbuild = require('esbuild');
-/** @type {Object} */
-const experimentDefines = require('../global-configs/experiments-const.json');
+/** @type {object} */
+const experimentDefinesJson = require('../global-configs/experiments-const.json');
 const fs = require('fs-extra');
-const magicstring = require('magic-string');
 const open = require('open');
 const path = require('path');
-const Remapping = require('@ampproject/remapping');
 const terser = require('terser');
 const wrappers = require('../compile/compile-wrappers');
 const {
   VERSION: internalRuntimeVersion,
 } = require('../compile/internal-version');
-const {closureCompile} = require('../compile/compile');
 const {cyan, green, red} = require('kleur/colors');
 const {getAmpConfigForFile} = require('./prepend-global');
 const {getEsbuildBabelPlugin} = require('../common/esbuild-babel');
-const {getSourceRoot} = require('../compile/helpers');
+const {includeSourcesContent, massageSourcemaps} = require('./sourcemaps');
 const {isCiBuild} = require('../common/ci');
 const {jsBundles} = require('../compile/bundles.config');
 const {log, logLocalDev} = require('../common/logging');
 const {thirdPartyFrames} = require('../test-configs/config');
 const {watch} = require('chokidar');
-
-/** @type {Remapping.default} */
-const remapping = /** @type {*} */ (Remapping);
-
-/** @type {magicstring.default} */
-const MagicString = /** @type {*} */ (magicstring);
+const {debug} = require('../compile/debug-compilation-lifecycle');
+const babel = require('@babel/core');
+const {
+  ampResolve,
+  remapDependenciesPlugin,
+} = require('./remap-dependencies-plugin/remap-dependencies');
 
 /**
  * Tasks that should print the `--nobuild` help text.
@@ -36,11 +33,6 @@ const MagicString = /** @type {*} */ (magicstring);
  */
 const NOBUILD_HELP_TASKS = new Set(['e2e', 'integration', 'visual-diff']);
 
-/**
- * Used during minification to concatenate modules
- */
-const MODULE_SEPARATOR = ';';
-
 /**
  * Used during minification to concatenate extension bundles
  */
@@ -68,10 +60,21 @@ const watchDebounceDelay = 1000;
  */
 const watchedTargets = new Map();
 
+/**
+ * Converts defines to their JSON representation.
+ * See https://esbuild.github.io/api/#define.
+ */
+const experimentDefines = Object.fromEntries(
+  Object.entries(experimentDefinesJson).map(([key, value]) => [
+    key,
+    JSON.stringify(value),
+  ])
+);
+
 /**
  * @param {!Object} jsBundles
  * @param {string} name
- * @param {?Object} extraOptions
+ * @param {!Object} extraOptions
  * @return {!Promise}
  */
 function doBuildJs(jsBundles, name, extraOptions) {
@@ -140,15 +143,11 @@ async function compileCoreRuntime(options) {
  */
 async function compileAllJs(options) {
   const {minify} = options;
-  if (minify) {
-    log('Minifying multi-pass JS with', cyan('closure-compiler') + '...');
-  } else {
-    log('Compiling JS with', cyan('esbuild'), 'and', cyan('babel') + '...');
-  }
+  log(`Compiling ${cyan(minify ? 'minified' : 'unminified')} JS...`);
+
   const startTime = Date.now();
   await Promise.all([
     minify ? Promise.resolve() : doBuildJs(jsBundles, 'polyfills.js', options),
-    doBuildJs(jsBundles, 'bento.js', options),
     doBuildJs(jsBundles, 'alp.max.js', options),
     doBuildJs(jsBundles, 'integration.js', options),
     doBuildJs(jsBundles, 'ampcontext-lib.js', options),
@@ -187,82 +186,6 @@ async function getCompiledFile(srcFilename) {
   return filesContents.join('\n');
 }
 
-/**
- * Allows pending inside the compile wrapper to the already minified JS file.
- * @param {string} srcFilename Name of the JS source file
- * @param {string} destFilePath File path to the minified JS file
- * @param {?Object} options
- */
-function combineWithCompiledFile(srcFilename, destFilePath, options) {
-  const bundleFiles = EXTENSION_BUNDLE_MAP[srcFilename];
-  if (!bundleFiles) {
-    return;
-  }
-  const bundle = new MagicString.Bundle({
-    separator: '\n',
-  });
-  // We need to inject the code _inside_ the extension wrapper
-  const destFileName = path.basename(destFilePath);
-  /**
-   * TODO (rileyajones) This should be import('magic-string').MagicStringOptions but
-   * is invalid until https://github.com/Rich-Harris/magic-string/pull/183
-   * is merged.
-   * @type {Object}
-   */
-  const mapMagicStringOptions = {filename: destFileName};
-  const contents = new MagicString(
-    fs.readFileSync(destFilePath, 'utf8'),
-    mapMagicStringOptions
-  );
-  const map = JSON.parse(fs.readFileSync(`${destFilePath}.map`, 'utf8'));
-  const {sourceRoot} = map;
-  map.sourceRoot = undefined;
-
-  // The wrapper may have been minified further. Search backwards from the
-  // expected <%=contents%> location to find the start of the `{` in the
-  // wrapping function.
-  const wrapperIndex = options.wrapper.indexOf('<%= contents %>');
-  const index = contents.original.lastIndexOf('{', wrapperIndex) + 1;
-
-  const wrapperOpen = contents.snip(0, index);
-  const remainingContents = contents.snip(index, contents.length());
-
-  bundle.addSource(wrapperOpen);
-  for (const bundleFile of bundleFiles) {
-    const contents = fs.readFileSync(bundleFile, 'utf8');
-    /**
-     * TODO (rileyajones) This should be import('magic-string').MagicStringOptions but
-     * is invalid until https://github.com/Rich-Harris/magic-string/pull/183
-     * is merged.
-     * @type {Object}
-     */
-    const bundleMagicStringOptions = {filename: bundleFile};
-    bundle.addSource(new MagicString(contents, bundleMagicStringOptions));
-    bundle.append(MODULE_SEPARATOR);
-  }
-  bundle.addSource(remainingContents);
-
-  const bundledMap = bundle.generateDecodedMap({
-    file: destFileName,
-    hires: true,
-  });
-
-  const remapped = remapping(
-    bundledMap,
-    (file) => {
-      if (file === destFileName) {
-        return map;
-      }
-      return null;
-    },
-    !argv.full_sourcemaps
-  );
-  remapped.sourceRoot = sourceRoot;
-
-  fs.writeFileSync(destFilePath, bundle.toString(), 'utf8');
-  fs.writeFileSync(`${destFilePath}.map`, remapped.toString(), 'utf8');
-}
-
 /**
  * @param {string} name
  * @return {string}
@@ -276,57 +199,9 @@ function toEsmName(name) {
  * @return {string}
  */
 function maybeToEsmName(name) {
-  // Npm esm names occur at an earlier stage.
-  if (name.includes('.module')) {
-    return name;
-  }
   return argv.esm ? toEsmName(name) : name;
 }
 
-/**
- * @param {string} name
- * @return {string}
- */
-function maybeToNpmEsmName(name) {
-  return argv.esm ? name.replace(/\.js$/, '.module.js') : name;
-}
-
-/**
- * Minifies a given JavaScript file entry point.
- * @param {string} srcDir
- * @param {string} srcFilename
- * @param {string} destDir
- * @param {?Object} options
- * @return {!Promise}
- */
-async function compileMinifiedJs(srcDir, srcFilename, destDir, options) {
-  const timeInfo = {};
-  const entryPoint = path.join(srcDir, srcFilename);
-  const minifiedName = maybeToEsmName(options.minifiedName);
-
-  options.errored = false;
-  await closureCompile(entryPoint, destDir, minifiedName, options, timeInfo);
-  // If an incremental watch build fails, simply return.
-  if (options.watch && options.errored) {
-    return;
-  }
-
-  const destPath = path.join(destDir, minifiedName);
-  combineWithCompiledFile(srcFilename, destPath, options);
-  if (options.aliasName) {
-    fs.copySync(
-      destPath,
-      path.join(destDir, maybeToEsmName(options.aliasName))
-    );
-  }
-
-  let name = minifiedName;
-  if (options.aliasName) {
-    name += ` → ${maybeToEsmName(options.aliasName)}`;
-  }
-  endBuildStep('Minified', name, timeInfo.startTime);
-}
-
 /**
  * Handles a bundling error
  * @param {Error} err
@@ -334,11 +209,7 @@ async function compileMinifiedJs(srcDir, srcFilename, destDir, options) {
  * @param {string} destFilename
  */
 function handleBundleError(err, continueOnError, destFilename) {
-  let message = err.toString();
-  if (err.stack) {
-    // Drop the node_modules call stack, which begins with '    at'.
-    message = err.stack.replace(/    at[^]*/, '').trim();
-  }
+  const message = err.stack || err.toString();
   log(red('ERROR:'), message, '\n');
   const reasonMessage = `Could not compile ${cyan(destFilename)}`;
   if (continueOnError) {
@@ -371,11 +242,7 @@ async function finishBundle(destDir, destFilename, options, startTime) {
     );
     endBuildStep(logPrefix, `${destFilename} → ${aliasName}`, startTime);
   } else {
-    const loggingName =
-      options.npm && !destFilename.startsWith('amp-')
-        ? `${options.name} → ${destFilename}`
-        : destFilename;
-    endBuildStep(logPrefix, loggingName, startTime);
+    endBuildStep(logPrefix, destFilename, startTime);
   }
 }
 
@@ -386,7 +253,7 @@ async function finishBundle(destDir, destFilename, options, startTime) {
  * @param {string} srcDir
  * @param {string} srcFilename
  * @param {string} destDir
- * @param {?Object} options
+ * @param {!Object} options
  * @return {!Promise}
  */
 async function esbuildCompile(srcDir, srcFilename, destDir, options) {
@@ -394,7 +261,11 @@ async function esbuildCompile(srcDir, srcFilename, destDir, options) {
   const entryPoint = path.join(srcDir, srcFilename);
   const filename = options.minify
     ? options.minifiedName
-    : options.toName ?? srcFilename;
+    : (options.toName ?? srcFilename);
+  // This guards against someone passing `minify: true` but no `minifiedName`.
+  if (!filename) {
+    throw new Error('No minifiedName provided for ' + srcFilename);
+  }
   const destFilename = maybeToEsmName(filename);
   const destFile = path.join(destDir, destFilename);
 
@@ -404,7 +275,7 @@ async function esbuildCompile(srcDir, srcFilename, destDir, options) {
 
   /**
    * Splits up the wrapper to compute the banner and footer
-   * @return {Object}
+   * @return {object}
    */
   function splitWrapper() {
     const wrapper = options.wrapper ?? wrappers.none;
@@ -420,100 +291,151 @@ async function esbuildCompile(srcDir, srcFilename, destDir, options) {
   const compiledFile = await getCompiledFile(srcFilename);
   banner.js = config + banner.js + compiledFile;
 
+  let babelCaller =
+    options.babelCaller ?? (options.minify ? 'minified' : 'unminified');
+
+  // We read from the current binary configuration options if it is an
+  // no css binary output. (removes CSS installation)
+  if (options.ssrCss) {
+    babelCaller += '-ssr-css';
+  }
+
   const babelPlugin = getEsbuildBabelPlugin(
-    options.minify ? 'minified' : 'unminified',
-    /* enableCache */ true
+    babelCaller,
+    /* enableCache */ true,
+    {plugins: options.babelPlugins}
   );
   const plugins = [babelPlugin];
 
   if (options.remapDependencies) {
-    plugins.unshift(remapDependenciesPlugin());
+    const {externalDependencies: externals, remapDependencies: remaps} =
+      options;
+
+    plugins.unshift(
+      remapDependenciesPlugin({externals, remaps, resolve: ampResolve})
+    );
   }
 
-  let result = null;
+  /** @type {?esbuild.BuildContext} */
+  let esbuildContext = null;
 
   /**
    * @param {number} startTime
    * @return {Promise<void>}
    */
   async function build(startTime) {
-    if (!result) {
-      result = await esbuild.build({
+    if (!esbuildContext) {
+      esbuildContext = await esbuild.context({
         entryPoints: [entryPoint],
         bundle: true,
-        sourcemap: true,
+        sourcemap: 'external',
+        sourcesContent: includeSourcesContent(),
         outfile: destFile,
         define: experimentDefines,
         plugins,
-        format: options.outputFormat,
+        // When using `nomodule-loader` we build as ESM in order to preserve
+        // import statements. These are transformed in a post-build Babel step.
+        format:
+          options.outputFormat === 'nomodule-loader'
+            ? 'esm'
+            : options.outputFormat,
         banner,
         footer,
         // For es5 builds, ensure esbuild-injected code is transpiled.
         target: argv.esm ? 'es6' : 'es5',
-        incremental: !!options.watch,
         logLevel: 'silent',
         external: options.externalDependencies,
+        mainFields: ['module', 'browser', 'main'],
         write: false,
       });
-    } else {
-      result = await result.rebuild();
     }
-    let code = result.outputFiles.find(({path}) => !path.endsWith('.map')).text;
-    let map = result.outputFiles.find(({path}) => path.endsWith('.map')).text;
+
+    const {outputFiles} = await esbuildContext.rebuild();
+    if (outputFiles === undefined) {
+      throw new Error(`No output files for ${destFilename}`);
+    }
+
+    const codeFile = outputFiles.find(({path}) => !path.endsWith('.map'));
+    const mapFile = outputFiles.find(({path}) => path.endsWith('.map'));
+
+    if (!codeFile || !mapFile) {
+      throw new Error(
+        `Expected code and map file for ${destFilename}; got ${outputFiles.map(
+          ({path}) => path
+        )}`
+      );
+    }
+
+    let {text: code} = codeFile;
+    const mapChain = [JSON.parse(mapFile.text)];
+
+    if (options.outputFormat === 'nomodule-loader') {
+      const result = await babel.transformAsync(code, {
+        caller: {name: 'nomodule-loader'},
+        filename: destFile,
+        sourceRoot: path.dirname(destFile),
+        sourceMaps: true,
+      });
+      if (!result?.code) {
+        throw new Error('failed to babel');
+      }
+      code = result.code;
+      mapChain.unshift(result.map);
+    }
 
     if (options.minify) {
-      ({code, map} = await minify(code, map));
-      map = await massageSourcemaps(map, options);
+      const result = await minify(code, {
+        // toplevel clobbers the global namespace when with nomodule-loader
+        toplevel: options.outputFormat !== 'nomodule-loader',
+      });
+      code = result.code;
+      mapChain.unshift(result.map);
+      debug(
+        'post-terser',
+        path.join(process.cwd(), destFile),
+        code,
+        result.map
+      );
     }
 
     await Promise.all([
-      fs.outputFile(destFile, code),
-      fs.outputFile(`${destFile}.map`, map),
+      fs.outputFile(
+        destFile,
+        `${code}\n//# sourceMappingURL=${destFilename}.map`
+      ),
+      fs.outputJson(
+        `${destFile}.map`,
+        massageSourcemaps(mapChain, destFile, options)
+      ),
     ]);
 
     await finishBundle(destDir, destFilename, options, startTime);
-  }
 
-  /**
-   * Generates a plugin to remap the dependencies of a JS bundle.
-   * @return {Object}
-   */
-  function remapDependenciesPlugin() {
-    const remapDependencies = {__proto__: null, ...options.remapDependencies};
-    const external = options.externalDependencies;
-    return {
-      name: 'remap-dependencies',
-      setup(build) {
-        build.onResolve({filter: /.*/}, (args) => {
-          const dep = args.path;
-          const remap = remapDependencies[dep];
-          if (remap) {
-            const isExternal = external.includes(remap);
-            return {
-              path: isExternal ? remap : require.resolve(remap),
-              external: isExternal,
-            };
-          }
-        });
-      },
-    };
+    if (!options.watch) {
+      await esbuildContext.dispose();
+      esbuildContext = null;
+    }
   }
 
-  await build(startTime).catch((err) =>
-    handleBundleError(err, !!options.watch, destFilename)
-  );
+  try {
+    await build(startTime);
+  } catch (err) {
+    handleBundleError(err, !!options.watch, destFilename);
+  }
 
   if (options.watch) {
     watchedTargets.set(entryPoint, {
       rebuild: async () => {
         const startTime = Date.now();
-        const buildPromise = build(startTime).catch((err) =>
-          handleBundleError(err, !!options.watch, destFilename)
-        );
-        if (options.onWatchBuild) {
-          options.onWatchBuild(buildPromise);
+        try {
+          const buildPromise = build(startTime);
+          if (options.onWatchBuild) {
+            options.onWatchBuild(buildPromise);
+          }
+          await buildPromise;
+        } catch (err) {
+          handleBundleError(err, !!options.watch, destFilename);
         }
-        await buildPromise;
       },
     });
   }
@@ -524,20 +446,42 @@ async function esbuildCompile(srcDir, srcFilename, destDir, options) {
  */
 const nameCache = {};
 
+/**
+ * Implements a stable identifier mangler, based only on the input order.
+ *
+ * Terser uses a char-frequency mangler by default, which isn't stable and
+ * causes wild fluctuations in bundle size.
+ */
+const mangleIdentifier = {
+  get(num) {
+    const charset =
+      'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_0123456789';
+    let base = 54;
+    let id = '';
+    do {
+      id = charset[num % base] + id;
+      num = Math.floor(num / base);
+      base = 64;
+    } while (num > 0);
+    return id;
+  },
+};
+
 /**
  * Minify the code with Terser. Only used by the ESBuild.
  *
  * @param {string} code
- * @param {string} map
+ * @param {terser.MinifyOptions} options
  * @return {!Promise<{code: string, map: *, error?: Error}>}
  */
-async function minify(code, map) {
+async function minify(code, options = {}) {
+  /* eslint-disable local/camelcase */
+  /** @type {terser.MinifyOptions} */
   const terserOptions = {
     mangle: {
       properties: {
         regex: '_AMP_PRIVATE_$',
-        // eslint-disable-next-line local/camelcase
-        keep_quoted: /** @type {'strict'} */ ('strict'),
+        keep_quoted: 'strict',
       },
     },
     compress: {
@@ -547,17 +491,24 @@ async function minify(code, map) {
     },
     output: {
       beautify: !!argv.pretty_print,
-      // eslint-disable-next-line local/camelcase
       keep_quoted_props: true,
+      // The AMP Cache will prepend content on the first line during serving
+      // (for AMP_CONFIG and AMP_EXP). In order for these to not affect
+      // the sourcemap, we must ensure there is no other content on the first
+      // line. If you remove this you will annoy Justin. Don't do it.
+      preamble: ';',
     },
-    sourceMap: {content: map},
+    sourceMap: true,
     toplevel: true,
     module: !!argv.esm,
-    nameCache,
+    nameCache: argv.nomanglecache ? undefined : nameCache,
+    ...options,
   };
+  /* eslint-enable local/camelcase */
+
   // Remove the local variable name cache which should not be reused between binaries.
   // See https://github.com/ampproject/amphtml/issues/36476
-  /** @type {any}*/ (nameCache).vars = {};
+  nameCache.vars = undefined;
 
   const minified = await terser.minify(code, terserOptions);
   return {code: minified.code ?? '', map: minified.map};
@@ -596,14 +547,11 @@ async function compileJs(srcDir, srcFilename, destDir, options) {
 
   /**
    * Actually performs the steps to compile the entry point.
-   * @param {Object} options
+   * @param {object} options
    * @return {Promise<void>}
    */
   async function doCompileJs(options) {
-    const buildResult =
-      options.minify && shouldUseClosure()
-        ? compileMinifiedJs(srcDir, srcFilename, destDir, options)
-        : esbuildCompile(srcDir, srcFilename, destDir, options);
+    const buildResult = esbuildCompile(srcDir, srcFilename, destDir, options);
     if (options.onWatchBuild) {
       options.onWatchBuild(buildResult);
     }
@@ -729,21 +677,6 @@ async function thirdPartyBootstrap(input, outputName, options) {
   fs.symlinkSync('./' + internalRuntimeVersion, aliasToLatestBuild, 'dir');
 }
 
-/**
- *Creates directory in sync manner
- *
- * @param {string} path
- */
-function mkdirSync(path) {
-  try {
-    fs.mkdirSync(path);
-  } catch (e) {
-    if (e.code != 'EEXIST') {
-      throw e;
-    }
-  }
-}
-
 /**
  * Returns the list of dependencies for a given JS entrypoint by having esbuild
  * generate a metafile for it. Uses the set of babel plugins that would've been
@@ -754,7 +687,12 @@ function mkdirSync(path) {
  * @return {Promise<Array<string>>}
  */
 async function getDependencies(entryPoint, options) {
-  const caller = options.minify ? 'minified' : 'unminified';
+  let caller = options.minify ? 'minified' : 'unminified';
+  // We read from the current binary configuration options if it is an
+  // no css binary output. (removes CSS installation)
+  if (options.ssrCss) {
+    caller += '-ssr-css';
+  }
   const babelPlugin = getEsbuildBabelPlugin(caller, /* enableCache */ true);
   const result = await esbuild.build({
     entryPoints: [entryPoint],
@@ -766,42 +704,6 @@ async function getDependencies(entryPoint, options) {
   return Object.keys(result.metafile?.inputs ?? {});
 }
 
-/**
- * @param {*} sourcemapsFile
- * @param {*} options
- * @return {*}
- */
-function massageSourcemaps(sourcemapsFile, options) {
-  const sourcemaps = JSON.parse(sourcemapsFile);
-  sourcemaps.sources = sourcemaps.sources.map((source) => {
-    if (source.startsWith('../')) {
-      return source.slice('../'.length);
-    }
-    return source;
-  });
-  sourcemaps.sourceRoot = getSourceRoot(options);
-  if (sourcemaps.file) {
-    sourcemaps.file = path.basename(sourcemaps.file);
-  }
-  if (!argv.full_sourcemaps) {
-    delete sourcemaps.sourcesContent;
-  }
-
-  return JSON.stringify(sourcemaps);
-}
-
-/**
- * Returns whether or not we should compile with Closure Compiler.
- * @return {boolean}
- */
-function shouldUseClosure() {
-  // Normally setting this server-side experiment flag would be handled by
-  // the release process automatically. Since this experiment is actually on the build system
-  // itself instead of runtime, it is never run through babel (where the replacements usually happen).
-  // Therefore we must compute this one by hand.
-  return argv.define_experiment_constant !== 'ESBUILD_COMPILATION';
-}
-
 module.exports = {
   bootstrapThirdPartyFrames,
   compileAllJs,
@@ -812,10 +714,8 @@ module.exports = {
   endBuildStep,
   maybePrintCoverageMessage,
   maybeToEsmName,
-  maybeToNpmEsmName,
-  mkdirSync,
   printConfigHelp,
   printNobuildHelp,
   watchDebounceDelay,
-  shouldUseClosure,
+  mangleIdentifier,
 };
diff --git a/build-system/tasks/integration.js b/build-system/tasks/integration.js
index cbe9358be651..a6ca17f154a5 100644
--- a/build-system/tasks/integration.js
+++ b/build-system/tasks/integration.js
@@ -64,7 +64,6 @@ integration.flags = {
   'headless': 'Run tests in a headless Chrome window',
   'nobuild': 'Skip build step',
   'nohelp': 'Silence help messages that are printed prior to test run',
-  'report': 'Write test result report to a local file',
   'safari': 'Run tests on Safari',
   'testnames': 'List the name of each test being run',
   'verbose': 'With logging enabled',
diff --git a/build-system/tasks/lint.js b/build-system/tasks/lint.js
index 49c6c247fc14..e45f099272ad 100644
--- a/build-system/tasks/lint.js
+++ b/build-system/tasks/lint.js
@@ -42,8 +42,7 @@ async function runLinter(filesToLint) {
     results.errorCount += result.errorCount;
     results.warningCount += result.warningCount;
     const formatter = await eslint.loadFormatter('stylish');
-    const resultText = formatter
-      .format(lintResult)
+    const resultText = (await formatter.format(lintResult))
       .replace(`${process.cwd()}/`, '')
       .trim();
     if (resultText.length) {
@@ -65,8 +64,8 @@ async function runLinter(filesToLint) {
 
 /**
  * Summarize the results of linting all files.
- * @param {Object} results
- * @param {Object} fixedFiles
+ * @param {object} results
+ * @param {object} fixedFiles
  */
 function summarizeResults(results, fixedFiles) {
   const {errorCount, warningCount} = results;
diff --git a/build-system/tasks/make-extension/OWNERS b/build-system/tasks/make-extension/OWNERS
index 5b93a992998a..a26af6946677 100644
--- a/build-system/tasks/make-extension/OWNERS
+++ b/build-system/tasks/make-extension/OWNERS
@@ -8,10 +8,9 @@
         // Outreach group maintains extension boilerplate/template.
         {name: 'ampproject/wg-outreach'},
 
-        // Most new extensions are reviewed by these groups. It's in their
+        // Most new extensions are reviewed by this group. It's in their
         // interest to maintain the extension generator.
         {name: 'ampproject/wg-components'},
-        {name: 'ampproject/wg-bento'},
       ],
     },
   ],
diff --git a/build-system/tasks/make-extension/format.js b/build-system/tasks/make-extension/format.js
index e001b5b5329b..419ede1286d4 100644
--- a/build-system/tasks/make-extension/format.js
+++ b/build-system/tasks/make-extension/format.js
@@ -2,7 +2,7 @@ const {getOutput} = require('../../common/process');
 
 /**
  * @param {Array<string>} files
- * @return {Object}
+ * @return {object}
  */
 function format(files) {
   return getOutput(`npx prettier --ignore-unknown --write ${files.join(' ')}`);
diff --git a/build-system/tasks/make-extension/index.js b/build-system/tasks/make-extension/index.js
index 0901f4f521af..3b2d4acc3959 100644
--- a/build-system/tasks/make-extension/index.js
+++ b/build-system/tasks/make-extension/index.js
@@ -27,7 +27,6 @@ let MakeExtensionResultDef;
 /**
  * @typedef {{
  *   version?: (string|undefined),
- *   bento?: (boolean|undefined),
  *   name?: (string|undefined),
  *   nocss?: (string|undefined),
  *   nojss?: (string|undefined),
@@ -39,7 +38,6 @@ let ArgsDef;
  * @typedef {{
  *   name: string,
  *   version: string,
- *   latestVersion?: (string|undefined)
  *   options?: ({hasCss?: boolean, wrapper?: string}|undefined)
  * }}
  */
@@ -57,7 +55,7 @@ function dashToPascalCase(name) {
 /**
  * Replaces from a map of keys/values.
  * @param {string} inputText
- * @param {Object<string, string>} replacements
+ * @param {{[key: string]: string}} replacements
  * @return {string}
  */
 const replace = (inputText, replacements) =>
@@ -89,7 +87,7 @@ const getTemplateDir = (template) =>
 
 /**
  * @param {string} templateDir
- * @param {Object<string, string>} replacements
+ * @param {{[key: string]: string}} replacements
  * @param {string=} destinationDir
  * @return {Promise<Array<string>>}
  */
@@ -145,18 +143,11 @@ async function insertExtensionBundlesConfig(
   destination = extensionBundlesJson
 ) {
   const extensionBundles = fs.readJsonSync(destination, {throws: false}) ?? [];
-  const existingOrNull = extensionBundles.find(
-    ({name}) => name === bundle.name
-  );
 
-  const {latestVersion, name, version, ...rest} = bundle;
+  const {name, version, ...rest} = bundle;
   extensionBundles.push({
     name,
     version,
-    latestVersion:
-      (existingOrNull && existingOrNull.latestVersion) ||
-      latestVersion ||
-      version,
     ...rest,
   });
 
@@ -194,9 +185,7 @@ async function makeExtensionFromTemplates(
   destinationDir = '.',
   options = argv
 ) {
-  const version = (
-    options.version || (options.bento ? '1.0' : '0.1')
-  ).toString();
+  const version = (options.version || '0.1').toString();
   const name = (options.name || '').replace(/^amp-/, '');
   if (!name) {
     log(red('ERROR:'), 'Must specify component name with', cyan('--name'));
@@ -211,13 +200,6 @@ async function makeExtensionFromTemplates(
     '__component_name_hyphenated__': name,
     '__component_name_hyphenated_capitalized__': name.toUpperCase(),
     '__component_name_pascalcase__': namePascalCase,
-    // TODO(alanorozco): Remove __storybook_experiments...__ once we stop
-    // requiring the bento experiment.
-    '__storybook_experiments_do_not_add_trailing_comma__':
-      // Don't add a trailing comma in the template, instead we add it here.
-      // This is because the property added is optional, and a double comma would
-      // cause a syntax error.
-      options.bento ? "experiments: ['bento']," : '',
     ...(!options.nocss
       ? {
           '__css_import__': `import {CSS} from '../../../build/amp-${name}-${version}.css'`,
@@ -237,6 +219,7 @@ async function makeExtensionFromTemplates(
           '__jss_styles_use_styles__': 'const styles = useStyles()',
           '__jss_styles_example_or_placeholder__':
             '`${styles.exampleContentHidden}`',
+          '__jss_import_storybook__': `import '../component.jss'`,
         }
       : {
           '__jss_import_component_css_': '',
@@ -244,6 +227,7 @@ async function makeExtensionFromTemplates(
           '__jss_import_use_styles__': '',
           '__jss_styles_use_styles__': '',
           '__jss_styles_example_or_placeholder__': `'my-classname'`,
+          '__jss_import_storybook__': '',
         }),
     // eslint-disable-next-line local/no-forbidden-terms
     // This allows generated code to contain "DO NOT SUBMIT", which will cause
@@ -278,9 +262,6 @@ async function makeExtensionFromTemplates(
   if (!options.nocss) {
     bundleConfig.options = {...bundleConfig.options, hasCss: true};
   }
-  if (options.bento) {
-    bundleConfig.options = {...bundleConfig.options, bento: true};
-  }
 
   await insertExtensionBundlesConfig(
     bundleConfig,
@@ -372,15 +353,14 @@ async function runExtensionTests(name) {
 async function makeExtension() {
   let testError;
 
-  const {bento, nocss, nojss} = argv;
+  const {nocss, nojss} = argv;
 
   // @ts-ignore
   const templateDirs = objstr({
     shared: true,
-    bento,
-    classic: !bento,
+    classic: true,
     css: !nocss,
-    jss: bento && !nojss,
+    jss: !nojss,
   })
     .split(/\s+/)
     .map((name) => getTemplateDir(name));
@@ -428,12 +408,10 @@ makeExtension.description = 'Create the skeleton for a new extension';
 makeExtension.flags = {
   name: 'Name of the extension (the amp-* prefix is added if necessary)',
   cleanup: 'Undo file changes before exiting (useful with --test)',
-  bento: 'Generate a Bento component',
-  nocss:
-    'Exclude extension-specific CSS (JSS is generated for --bento unless combined with --nojss)',
-  nojss: 'Exclude extension-specific JSS (used with --bento)',
+  nocss: 'Exclude extension-specific CSS',
+  nojss: 'Exclude extension-specific JSS',
   test: 'Build and test the generated extension',
-  version: 'Set the version number (default: 0.1; or 1.0 with --bento)',
+  version: 'Set the version number (default: 0.1)',
   overwrite:
     'Overwrite existing files at the destination if present, otherwise skip',
 };
diff --git a/build-system/tasks/make-extension/template/bento/extensions/amp-__component_name_hyphenated__/OWNERS b/build-system/tasks/make-extension/template/bento/extensions/amp-__component_name_hyphenated__/OWNERS
deleted file mode 100644
index ddba9cfadb4b..000000000000
--- a/build-system/tasks/make-extension/template/bento/extensions/amp-__component_name_hyphenated__/OWNERS
+++ /dev/null
@@ -1,10 +0,0 @@
-// For an explanation of the OWNERS rules and syntax, see:
-// https://github.com/ampproject/amp-github-apps/blob/main/owners/OWNERS.example
-
-{
-  rules: [
-    {
-      owners: [{name: 'ampproject/wg-bento'}],
-    },
-  ],
-}
diff --git a/build-system/tasks/make-extension/template/bento/extensions/amp-__component_name_hyphenated__/__component_version__/amp-__component_name_hyphenated__.js b/build-system/tasks/make-extension/template/bento/extensions/amp-__component_name_hyphenated__/__component_version__/amp-__component_name_hyphenated__.js
deleted file mode 100644
index 7030827c03ac..000000000000
--- a/build-system/tasks/make-extension/template/bento/extensions/amp-__component_name_hyphenated__/__component_version__/amp-__component_name_hyphenated__.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import {BaseElement} from './base-element';
-__css_import__;
-import {dict} from '#core/types/object';
-import {isExperimentOn} from '#experiments';
-import {userAssert} from '#utils/log';
-
-/** @const {string} */
-const TAG = 'amp-__component_name_hyphenated__';
-
-class Amp__component_name_pascalcase__ extends BaseElement {
-  /** @override */
-  init() {
-    // __do_not_submit__: This is example code only.
-    this.registerApiAction('exampleToggle', (api) => api./*OK*/exampleToggle());
-
-    return dict({
-      // Extra props passed by wrapper AMP component
-      'exampleTagNameProp': this.element.tagName,
-    });
-  }
-
-  /** @override */
-  isLayoutSupported(layout) {
-    userAssert(
-      isExperimentOn(this.win, 'bento') ||
-        isExperimentOn(this.win, 'bento-__component_name_hyphenated__'),
-      'expected global "bento" or specific "bento-__component_name_hyphenated__" experiment to be enabled'
-    );
-    return super.isLayoutSupported(layout);
-  }
-}
-
-AMP.extension(TAG, '__component_version__', (AMP) => {
-  AMP.registerElement(__register_element_args__);
-});
diff --git a/build-system/tasks/make-extension/template/bento/extensions/amp-__component_name_hyphenated__/__component_version__/base-element.js b/build-system/tasks/make-extension/template/bento/extensions/amp-__component_name_hyphenated__/__component_version__/base-element.js
deleted file mode 100644
index 5318c1fd1a4e..000000000000
--- a/build-system/tasks/make-extension/template/bento/extensions/amp-__component_name_hyphenated__/__component_version__/base-element.js
+++ /dev/null
@@ -1,28 +0,0 @@
-__jss_import_component_css__;
-import {Bento__component_name_pascalcase__} from './component';
-import {PreactBaseElement} from '#preact/base-element';
-
-export class BaseElement extends PreactBaseElement {}
-
-/** @override */
-BaseElement['Component'] = Bento__component_name_pascalcase__;
-
-/** @override */
-BaseElement['props'] = {
-  'children': {passthrough: true},
-  // 'children': {passthroughNonEmpty: true},
-  // 'children': {selector: '...'},
-};
-
-/** @override */
-BaseElement['layoutSizeDefined'] = true;
-
-/** @override */
-BaseElement['usesShadowDom'] = true;
-
-// __do_not_submit__: If BaseElement['shadowCss']  is set to `null`, remove the
-// following declaration.
-// Otherwise, keep it when defined to an actual value like `COMPONENT_CSS`.
-// Once addressed, remove this set of comments.
-/** @override */
-BaseElement['shadowCss'] = __jss_component_css__;
diff --git a/build-system/tasks/make-extension/template/bento/extensions/amp-__component_name_hyphenated__/__component_version__/component.js b/build-system/tasks/make-extension/template/bento/extensions/amp-__component_name_hyphenated__/__component_version__/component.js
deleted file mode 100644
index 5334e37df5e0..000000000000
--- a/build-system/tasks/make-extension/template/bento/extensions/amp-__component_name_hyphenated__/__component_version__/component.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import * as Preact from '#preact';
-import {ContainWrapper} from '#preact/component';
-import {
-  useCallback,
-  useEffect,
-  useLayoutEffect,
-  useMemo,
-  useRef,
-  useState,
-} from '#preact';
-__jss_import_use_styles__;
-
-/**
- * @param {!Bento__component_name_pascalcase__.Props} props
- * @return {PreactDef.Renderable}
- */
-export function Bento__component_name_pascalcase__({exampleTagNameProp, ...rest}) {
-  // Examples of state and hooks
-  // __do_not_submit__: This is example code only.
-  const [exampleValue, setExampleValue] = useState(0);
-  const exampleRef = useRef(null);
-  __jss_styles_use_styles__;
-
-  useCallback(() => {/* Do things */}, [])
-  useEffect(() => {/* Do things */}, [])
-  useLayoutEffect(() => {/* Do things */}, [])
-  useMemo(() => {/* Do things */}, [])
-
-  return (
-    <ContainWrapper layout size paint {...rest} >
-      {exampleTagNameProp}
-      <div className={__jss_styles_example_or_placeholder__}>
-        This is hidden
-      </div>
-    </ContainWrapper>
-  );
-}
diff --git a/build-system/tasks/make-extension/template/bento/extensions/amp-__component_name_hyphenated__/__component_version__/component.type.js b/build-system/tasks/make-extension/template/bento/extensions/amp-__component_name_hyphenated__/__component_version__/component.type.js
deleted file mode 100644
index 1274bcc47119..000000000000
--- a/build-system/tasks/make-extension/template/bento/extensions/amp-__component_name_hyphenated__/__component_version__/component.type.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/** @externs */
-
-/** @const */
-var Bento__component_name_pascalcase__Def = {};
-
-/**
- * @typedef {{
- *   exampleProperty: (string|undefined), (__do_not_submit__)
- * }}
- */
-Bento__component_name_pascalcase__Def.Props;
-
-/** @interface */
-Bento__component_name_pascalcase__Def.Bento__component_name_pascalcase__Api = class {
-  /** Example: API method to toggle the component */
-  exampleToggle() {} // __do_not_submit__
-};
diff --git a/build-system/tasks/make-extension/template/bento/extensions/amp-__component_name_hyphenated__/__component_version__/storybook/Basic.js b/build-system/tasks/make-extension/template/bento/extensions/amp-__component_name_hyphenated__/__component_version__/storybook/Basic.js
deleted file mode 100644
index e0a39bea9db4..000000000000
--- a/build-system/tasks/make-extension/template/bento/extensions/amp-__component_name_hyphenated__/__component_version__/storybook/Basic.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import * as Preact from '#preact';
-import {Bento__component_name_pascalcase__} from '../component'
-
-export default {
-  title: '__component_name_pascalcase__',
-  component: Bento__component_name_pascalcase__,
-  args: {
-    'exampleProperty': 'example string property argument'
-  }
-};
-
-// __do_not_submit__: This is example code only.
-export const _default = (args) => {
-  return (
-    <Bento__component_name_pascalcase__
-      style={{width: 300, height: 200}}
-      {...args}
-    >
-      This text is inside.
-    </Bento__component_name_pascalcase__>
-  );
-};
diff --git a/build-system/tasks/make-extension/template/bento/extensions/amp-__component_name_hyphenated__/__component_version__/test/test-amp-__component_name_hyphenated__.js b/build-system/tasks/make-extension/template/bento/extensions/amp-__component_name_hyphenated__/__component_version__/test/test-amp-__component_name_hyphenated__.js
deleted file mode 100644
index b233d6b03704..000000000000
--- a/build-system/tasks/make-extension/template/bento/extensions/amp-__component_name_hyphenated__/__component_version__/test/test-amp-__component_name_hyphenated__.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import '../amp-__component_name_hyphenated__';
-import {htmlFor} from '#core/dom/static-template';
-import {toggleExperiment} from '#experiments';
-import {waitFor} from '#testing/helpers/service';
-
-describes.realWin(
-  'amp-__component_name_hyphenated__-v__component_version__',
-  {
-    amp: {
-      extensions: ['amp-__component_name_hyphenated__:__component_version__'],
-    },
-  },
-  (env) => {
-    let win;
-    let doc;
-    let html;
-
-    beforeEach(async () => {
-      win = env.win;
-      doc = win.document;
-      html = htmlFor(doc);
-      toggleExperiment(win, 'bento-__component_name_hyphenated__', true, true);
-    });
-
-    // __do_not_submit__: This is example code only.
-    it('example test renders', async () => {
-      const element = html`
-        <amp-__component_name_hyphenated__></amp-__component_name_hyphenated__>
-      `;
-      doc.body.appendChild(element);
-      await waitFor(() => element.isConnected, 'element connected');
-      expect(element.parentNode).to.equal(doc.body);
-    });
-  }
-);
diff --git a/build-system/tasks/make-extension/template/bento/extensions/amp-__component_name_hyphenated__/__component_version__/test/test-component.js b/build-system/tasks/make-extension/template/bento/extensions/amp-__component_name_hyphenated__/__component_version__/test/test-component.js
deleted file mode 100644
index 5020c9597f3e..000000000000
--- a/build-system/tasks/make-extension/template/bento/extensions/amp-__component_name_hyphenated__/__component_version__/test/test-component.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import * as Preact from '#preact';
-import {Bento__component_name_pascalcase__} from '../component';
-import {mount} from 'enzyme';
-
-describes.sandboxed('Bento__component_name_pascalcase__ preact component v1.0', {}, (env) => {
-  // __do_not_submit__: This is example code only.
-  it('should render', () => {
-    const wrapper = mount(
-      <Bento__component_name_pascalcase__ testProp={true}/>
-    );
-
-    const component = wrapper.find(Bento__component_name_pascalcase__.name);
-    expect(component).to.have.lengthOf(1);
-    expect(component.prop('testProp')).to.be.true;
-  });
-});
diff --git a/build-system/tasks/make-extension/template/classic/extensions/amp-__component_name_hyphenated__/__component_version__/amp-__component_name_hyphenated__.js b/build-system/tasks/make-extension/template/classic/extensions/amp-__component_name_hyphenated__/__component_version__/amp-__component_name_hyphenated__.js
index b6be9402608a..e27a6b126415 100644
--- a/build-system/tasks/make-extension/template/classic/extensions/amp-__component_name_hyphenated__/__component_version__/amp-__component_name_hyphenated__.js
+++ b/build-system/tasks/make-extension/template/classic/extensions/amp-__component_name_hyphenated__/__component_version__/amp-__component_name_hyphenated__.js
@@ -1,5 +1,5 @@
 __css_import__;
-import {Layout, applyFillContent} from '#core/dom/layout';
+import {Layout_Enum, applyFillContent} from '#core/dom/layout';
 
 const TAG = 'amp-__component_name_hyphenated__';
 
@@ -26,7 +26,7 @@ export class Amp__component_name_pascalcase__ extends AMP.BaseElement {
 
   /** @override */
   isLayoutSupported(layout) {
-    return layout == Layout.RESPONSIVE;
+    return layout == Layout_Enum.RESPONSIVE;
   }
 }
 
diff --git a/build-system/tasks/make-extension/template/shared/extensions/amp-__component_name_hyphenated__/amp-__component_name_hyphenated__.md b/build-system/tasks/make-extension/template/shared/extensions/amp-__component_name_hyphenated__/amp-__component_name_hyphenated__.md
index 09fe8d9d9d52..0ddf31b00d5a 100644
--- a/build-system/tasks/make-extension/template/shared/extensions/amp-__component_name_hyphenated__/amp-__component_name_hyphenated__.md
+++ b/build-system/tasks/make-extension/template/shared/extensions/amp-__component_name_hyphenated__/amp-__component_name_hyphenated__.md
@@ -59,12 +59,6 @@ Below is an example for ads.
 
 [/example][/filter]
 
-### Standalone use outside valid AMP documents (optional)
-
-<!-- TODO: Remove backticks from link when guide is live -->
-
-Bento AMP allows you to use AMP components in non-AMP pages without needing to commit to fully valid AMP. You can take these components and place them in implementations with frameworks and CMSs that don't support AMP. Read more in our guide [Use AMP components in non-AMP pages](https://amp.dev/documentation/guides-and-tutorials/start/bento_guide/).
-
 #### Example
 
 The example below demonstrates `amp-__component_name_hyphenated__` component in standalone use.
@@ -92,8 +86,6 @@ The example below demonstrates `amp-__component_name_hyphenated__` component in
 
 #### Interactivity and API usage
 
-Bento enabled components in standalone use are highly interactive through their API. In Bento standalone use, the element's API replaces AMP Actions and events and [`amp-bind`](https://amp.dev/documentation/components/amp-bind/?format=websites).
-
 The `amp-__component_name_hyphenated__` component API is accessible by including the following script tag in your document:
 
 ```
@@ -126,13 +118,7 @@ example
 
 #### Layout and style
 
-Each Bento component has a small CSS library you must include to guarantee proper loading without [content shifts](https://web.dev/cls/). Because of order-based specificity, you must manually ensure that stylesheets are included before any custom styles.
-
-```
-<link rel="stylesheet" type="text/css" href="https://cdn.ampproject.org/v0/amp-__component_name_hyphenated__-__component_version__.css">
-```
-
-Fully valid AMP pages use the AMP layout system to infer sizing of elements to create a page structure before downloading any remote resources. However, Bento use imports components into less controlled environments and AMP's layout system is inaccessible. 
+Fully valid AMP pages use the AMP layout system to infer sizing of elements to create a page structure before downloading any remote resources.
 
 **Container type**
 
@@ -218,14 +204,6 @@ Syntax and argument details for use in fully valid AMP pages.
 
 [/example]
 
-#### Bento mode
-
-Syntax and argument details for use in Bento mode.
-
-```
-Bento example
-```
-
 ## Styling (optional)
 
 Explain how to style the element.
diff --git a/build-system/tasks/make-extension/test/test.js b/build-system/tasks/make-extension/test/test.js
index 06b670021ccf..4ef26b107976 100644
--- a/build-system/tasks/make-extension/test/test.js
+++ b/build-system/tasks/make-extension/test/test.js
@@ -114,21 +114,6 @@ test('makeExtensionFromTemplates does not print unit test blurb if a test file i
     );
   }));
 
-test('makeExtensionFromTemplates prints unit test blurb if a test file is created', (t) =>
-  tempy.directory.task(async (dir) => {
-    const {makeExtensionFromTemplates} = require('..');
-    await makeExtensionFromTemplates(
-      [path.join(__dirname, '../template/bento')],
-      dir,
-      {name: 'my-extension-name'}
-    );
-    t.true(
-      !!stubbedCalls.logLocalDev.find((args) =>
-        args.find((arg) => arg.includes('amp unit --files'))
-      )
-    );
-  }));
-
 test('makeExtensionFromTemplates does not print Storybook blurb if a Storybook file is not created', (t) =>
   tempy.directory.task(async (dir) => {
     const {makeExtensionFromTemplates} = require('..');
@@ -144,21 +129,6 @@ test('makeExtensionFromTemplates does not print Storybook blurb if a Storybook f
     );
   }));
 
-test('makeExtensionFromTemplates prints Storybook blurb if a Storybook file is created', (t) =>
-  tempy.directory.task(async (dir) => {
-    const {makeExtensionFromTemplates} = require('..');
-    await makeExtensionFromTemplates(
-      [path.join(__dirname, '../template/bento')],
-      dir,
-      {name: 'my-extension-name'}
-    );
-    t.true(
-      !!stubbedCalls.logLocalDev.find((args) =>
-        args.find((arg) => arg.includes('amp storybook'))
-      )
-    );
-  }));
-
 test('makeExtensionFromTemplates does not print validator blurb if a validator-*.html file is not created', (t) =>
   tempy.directory.task(async (dir) => {
     const {makeExtensionFromTemplates} = require('..');
@@ -220,7 +190,6 @@ test('insertExtensionBundlesConfig inserts new entry', (t) =>
         {
           name: 'a',
           version: 'x',
-          latestVersion: 'x',
           options: {hasCss: true},
         },
         {
@@ -229,117 +198,7 @@ test('insertExtensionBundlesConfig inserts new entry', (t) =>
       ]);
 
       // expected order of keys
-      t.deepEqual(Object.keys(items[1]), [
-        'name',
-        'version',
-        'latestVersion',
-        'options',
-      ]);
-    },
-    {extension: 'json'}
-  ));
-
-test('insertExtensionBundlesConfig uses existing latestVersion', (t) =>
-  tempy.file.task(
-    async (destination) => {
-      const {insertExtensionBundlesConfig} = require('..');
-      await writeJson(destination, [
-        {
-          name: 'foo',
-          version: 'existing version',
-          latestVersion: 'existing version',
-        },
-      ]);
-
-      await insertExtensionBundlesConfig(
-        {
-          name: 'foo',
-          version: 'new version',
-        },
-        destination
-      );
-
-      t.deepEqual(await readJson(destination), [
-        {
-          name: 'foo',
-          version: 'existing version',
-          latestVersion: 'existing version',
-        },
-        {
-          name: 'foo',
-          version: 'new version',
-          latestVersion: 'existing version',
-        },
-      ]);
-    },
-    {extension: 'json'}
-  ));
-
-test('insertExtensionBundlesConfig uses passed latestVersion', (t) =>
-  tempy.file.task(
-    async (destination) => {
-      const {insertExtensionBundlesConfig} = require('..');
-      await writeJson(destination, [
-        {
-          name: 'foo',
-          version: '_',
-        },
-      ]);
-
-      await insertExtensionBundlesConfig(
-        {
-          name: 'foo',
-          version: 'new version',
-          latestVersion: 'new version',
-        },
-        destination
-      );
-
-      t.deepEqual(await readJson(destination), [
-        {
-          name: 'foo',
-          version: '_',
-        },
-        {
-          name: 'foo',
-          version: 'new version',
-          latestVersion: 'new version',
-        },
-      ]);
-    },
-    {extension: 'json'}
-  ));
-
-test('insertExtensionBundlesConfig uses version as latestVersion', (t) =>
-  tempy.file.task(
-    async (destination) => {
-      const {insertExtensionBundlesConfig} = require('..');
-      await writeJson(destination, [
-        {
-          name: 'foo',
-          version: '_',
-        },
-      ]);
-
-      await insertExtensionBundlesConfig(
-        {
-          name: 'foo',
-          version: 'new version',
-        },
-        destination
-      );
-
-      t.deepEqual(await readJson(destination), [
-        {
-          name: 'foo',
-          version: '_',
-        },
-        {
-          name: 'foo',
-          version: 'new version',
-          latestVersion: 'new version',
-        },
-      ]);
+      t.deepEqual(Object.keys(items[1]), ['name', 'version', 'options']);
     },
     {extension: 'json'}
   ));
diff --git a/build-system/tasks/markdown-toc/index.js b/build-system/tasks/markdown-toc/index.js
index 5579eebff9d4..e5a9ec5b5544 100644
--- a/build-system/tasks/markdown-toc/index.js
+++ b/build-system/tasks/markdown-toc/index.js
@@ -118,7 +118,7 @@ async function overrideToc(content) {
 
 /**
  * @param {string} cwd
- * @return {Promise<Object<string, ?string>>}
+ * @return {Promise<{[key: string]: ?string}>}
  */
 async function overrideTocGlob(cwd) {
   const glob = [
@@ -134,7 +134,7 @@ async function overrideTocGlob(cwd) {
     .trim()
     .split('\n');
 
-  /** @type {Object<string, ?string>} */
+  /** @type {{[key: string]: ?string}} */
   const result = {};
 
   for (const filename of filesIncludingString) {
diff --git a/build-system/tasks/performance-urls.js b/build-system/tasks/performance-urls.js
deleted file mode 100644
index 82e9bf1a6b3c..000000000000
--- a/build-system/tasks/performance-urls.js
+++ /dev/null
@@ -1,45 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-const {cyan, green, red} = require('kleur/colors');
-const {log} = require('../common/logging');
-
-const CONFIG_PATH = './performance/config.json';
-const LOCAL_HOST_URL = 'http://localhost:8000/';
-
-/**
- * Entry point for 'amp performance-urls'
- * Check if all localhost urls in performance/config.json exist
- * @return {Promise<void>}
- */
-async function performanceUrls() {
-  let jsonContent;
-  try {
-    jsonContent = require(CONFIG_PATH);
-  } catch (e) {
-    log(red('ERROR:'), 'Could not parse', cyan(CONFIG_PATH));
-    process.exitCode = 1;
-    return;
-  }
-  /** @type {string[]} */
-  const filepaths = jsonContent.handlers.flatMap((handler) =>
-    handler.urls
-      .filter((url) => url.startsWith(LOCAL_HOST_URL))
-      .map((url) =>
-        path.join(__dirname, '../../', url.split(LOCAL_HOST_URL)[1])
-      )
-  );
-  for (const filepath of filepaths) {
-    if (!fs.existsSync(filepath)) {
-      log(red('ERROR:'), cyan(filepath), 'does not exist');
-      process.exitCode = 1;
-      return;
-    }
-  }
-  log(green('SUCCESS:'), 'All local performance task urls are valid.');
-}
-
-module.exports = {
-  performanceUrls,
-};
-
-performanceUrls.description = 'Validite config urls for the performance task';
diff --git a/build-system/tasks/performance/README.md b/build-system/tasks/performance/README.md
deleted file mode 100644
index 35dac7674114..000000000000
--- a/build-system/tasks/performance/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Performance test
-
-Use `amp performance` to run this test. It measures performance for the current branch compared to the current release. By default, the command first needs to compile minified runtime and components from the current branch by executing the `amp dist` task. To skip this step, use the `--nobuild` flag, but the task will throw an error if the dist files are missing. Only the runtime and components used by documents from the configured URLs are compiled.
-
-The `config.json` file contains settings. The default value for `runs` is 50, which takes ~10 minutes to run, and generates results with ~5% margin of error. Differences larger than this should be investigated. The `defaultHandler` within the `handlers` list measures the basic pageview metrics. The other handlers within the list can track different metrics (analytics request time, amount of analytics requests failed, etc...). Each handler within the handlers list must have a `handlerName` as well as a `urls` array (can be empty).
-
-This test measures the Core Web Vitals metrics: `largest contentful paint`, `max first input delay`, and `cumulative layout shift`. For ads, the test also measures `analytics request delay` and `failed percentage of analytics requests`.
diff --git a/build-system/tasks/performance/ads-handler.js b/build-system/tasks/performance/ads-handler.js
deleted file mode 100644
index 85b6ddd0d914..000000000000
--- a/build-system/tasks/performance/ads-handler.js
+++ /dev/null
@@ -1,34 +0,0 @@
-const fs = require('fs');
-const {urlToCachePath} = require('./helpers');
-
-const AD_SERVER_DOMAIN = 'securepubads.g.doubleclick.net';
-const EXAMPLE_AD_URL =
-  'http://localhost:8000/test/fixtures/performance/amp-ad/amphtml-ad.html';
-
-/**
- * Handler that will intercept ads requests and return a locally cached ad
- * instead.
- * @param {!Array<function>} handlersList
- * @param {string} version
- */
-function setupAdRequestHandler(handlersList, version) {
-  handlersList.push((interceptedRequest) => {
-    const url = interceptedRequest.url();
-    // TODO(ccordry): allow dynamic ad response.
-    if (url.includes(AD_SERVER_DOMAIN)) {
-      const path = urlToCachePath(EXAMPLE_AD_URL, version);
-      const body = fs.readFileSync(path);
-      interceptedRequest.respond({
-        status: 200,
-        contentType: 'text/html; charset=UTF-8',
-        body,
-      });
-      return true;
-    }
-    return false;
-  });
-}
-
-module.exports = {
-  setupAdRequestHandler,
-};
diff --git a/build-system/tasks/performance/analytics-handler.js b/build-system/tasks/performance/analytics-handler.js
deleted file mode 100644
index 479b31ac7aa1..000000000000
--- a/build-system/tasks/performance/analytics-handler.js
+++ /dev/null
@@ -1,127 +0,0 @@
-const puppeteer = require('puppeteer'); // eslint-disable-line no-unused-vars
-
-/**
- *
- * @param {!Array<function>} handlersList
- * @param {?Object} handlerOptions
- * @param {!function} resolve
- */
-function setupAnalyticsHandler(handlersList, handlerOptions, resolve) {
-  const {extraUrlParam} = handlerOptions;
-  const analyticsParam = Object.keys(extraUrlParam)
-    .map((key) => `${key}=${extraUrlParam[key]}`)
-    .join('&');
-
-  handlerOptions['startTime'] = Date.now();
-  handlerOptions['requests'] = [];
-  let requestsSeen = 0;
-
-  handlersList.push((interceptedRequest) =>
-    maybeHandleAnalyticsRequest(
-      interceptedRequest,
-      analyticsParam,
-      // This cb function is called iff the intercepted request has the magic
-      // analytics param. Optionally analytics requests can contain a
-      // `requestName` and `totalRequests` param if we want to measure more
-      // than one request per page.
-      (time, optRequestName, optExpectedRequests) => {
-        requestsSeen++;
-
-        // Store the first request delay. May be the only metric we have on
-        // live pages.
-        if (!handlerOptions['firstRequestTime']) {
-          handlerOptions['firstRequestTime'] = time;
-        }
-
-        // Sample pages can indicate the total number of expected requests.
-        // Will not be on real pages.
-        if (
-          optExpectedRequests &&
-          !isNaN(parseInt(optExpectedRequests, 10)) &&
-          !handlerOptions['expectedRequests']
-        ) {
-          handlerOptions['expectedRequests'] = parseInt(
-            optExpectedRequests,
-            10
-          );
-        }
-
-        // Named request in sample page. Will not be named on real pages.
-        const requestName = optRequestName || `request${requestsSeen}`;
-        handlerOptions.requests.push({requestName, time});
-
-        if (
-          !handlerOptions['expectedRequests'] ||
-          requestsSeen >= handlerOptions['expectedRequests']
-        ) {
-          // Resolve and short circuit setTimeout
-          resolve();
-        }
-      }
-    )
-  );
-}
-
-/**
- * Matches intercepted request with special analytics parameter
- * and records first outgoing analytics request, using callback.
- * Abort all requests, to not ping real servers.
- * @param {puppeteer.HTTPRequest} interceptedRequest
- * @param {string} analyticsParam
- * @param {!Function} requestCallback
- * @return {!Promise<boolean>}
- */
-async function maybeHandleAnalyticsRequest(
-  interceptedRequest,
-  analyticsParam,
-  requestCallback
-) {
-  const interceptedUrl = interceptedRequest.url();
-  if (interceptedUrl.includes(analyticsParam)) {
-    const {searchParams} = new URL(interceptedUrl);
-    // Magic parameter name to name request.
-    const requestName = searchParams.get('requestName');
-    // Magic parameter name to indicate total requests expected.
-    const expectedRequests = searchParams.get('expectedRequests');
-
-    requestCallback(Date.now(), requestName, expectedRequests);
-
-    interceptedRequest.abort();
-    return true;
-  }
-  return false;
-}
-
-/**
- * If request didn't fire, don't include any value for
- * analyticsRequest.
- *
- * @param {?Object} analyticsHandlerOptions
- * @return {!Object}
- */
-function getAnalyticsMetrics(analyticsHandlerOptions) {
-  const {expectedRequests, firstRequestTime, requests, startTime} =
-    analyticsHandlerOptions;
-  const analyticsMetrics = {};
-  // If there is no firstRequestTime, that means that request didn't fire.
-  // `percentRequestsFailed` because we take the mean rather than sum
-  analyticsMetrics['percentRequestsFailed'] = firstRequestTime ? 0 : 1;
-
-  // We only optionally track more than one request.
-  if (!expectedRequests) {
-    analyticsMetrics['firstRequestTime'] = firstRequestTime - startTime;
-    return analyticsMetrics;
-  }
-
-  // Page has opted into tracking more than 1 request.
-  requests.forEach(
-    ({requestName, time}) => (analyticsMetrics[requestName] = time - startTime)
-  );
-
-  return analyticsMetrics;
-}
-
-module.exports = {
-  getAnalyticsMetrics,
-  setupAnalyticsHandler,
-};
diff --git a/build-system/tasks/performance/cache-documents.js b/build-system/tasks/performance/cache-documents.js
deleted file mode 100644
index fbda35a049c4..000000000000
--- a/build-system/tasks/performance/cache-documents.js
+++ /dev/null
@@ -1,27 +0,0 @@
-const {CONTROL, EXPERIMENT, downloadToDisk} = require('./helpers');
-const {startServer, stopServer} = require('../serve');
-const HOST = 'localhost';
-const PORT = 8000;
-
-/**
- * Download sites specified in config in order to serve them
- * from the file system (to avoid measuring inconsistent
- * node server performance)
- *
- * @return {!Promise}
- * @param {!Array<string>} urls
- */
-async function cacheDocuments(urls) {
-  await startServer({host: HOST, port: PORT}, {quiet: true}, {minified: true});
-
-  await Promise.all(
-    urls.flatMap((url) => [
-      downloadToDisk(url, CONTROL),
-      downloadToDisk(url, EXPERIMENT),
-    ])
-  );
-
-  await stopServer();
-}
-
-module.exports = cacheDocuments;
diff --git a/build-system/tasks/performance/compile-scripts.js b/build-system/tasks/performance/compile-scripts.js
deleted file mode 100644
index 716e2fa5730b..000000000000
--- a/build-system/tasks/performance/compile-scripts.js
+++ /dev/null
@@ -1,20 +0,0 @@
-const argv = require('minimist')(process.argv.slice(2));
-const {buildRuntime} = require('../../common/utils');
-const {EXPERIMENT, urlToCachePath} = require('./helpers');
-const {setExtensionsToBuildFromDocuments} = require('../extension-helpers');
-
-/**
- * Compiles and minifies AMP runtime and components required by the urls
- * argument, unless the --nobuild flag is passed.
- * @param {Array<string>} urls
- * @return {Promise<void>}
- */
-async function compileScripts(urls) {
-  if (!argv.nobuild) {
-    const examples = urls.map((url) => urlToCachePath(url, EXPERIMENT));
-    setExtensionsToBuildFromDocuments(examples);
-    await buildRuntime(/* opt_compiled */ true);
-  }
-}
-
-module.exports = compileScripts;
diff --git a/build-system/tasks/performance/config.json b/build-system/tasks/performance/config.json
deleted file mode 100644
index 011e5730cfc8..000000000000
--- a/build-system/tasks/performance/config.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "runs": 50,
-  "handlers": [
-    {
-      "handlerName": "defaultHandler",
-      "urls": [
-        "http://localhost:8000/examples/bind/basic.amp.html"
-      ]
-    },
-    {
-      "handlerName": "analyticsHandler",
-      "urls": [
-        "http://localhost:8000/test/manual/amp-analytics/performance-test-pages/visible-basic.html",
-        "http://localhost:8000/test/manual/amp-analytics/performance-test-pages/visible-multiple.html"
-      ],
-      "timeout": 2000,
-      "extraUrlParam": {
-        "analytics": "amp-analytics-performance-param"
-      }
-    },
-    {
-      "handlerName": "adsHandler",
-      "urls": [
-        "http://localhost:8000/test/fixtures/performance/amp-ad/hostile-inabox-env.html"
-      ],
-      "adsUrls": [
-        "http://localhost:8000/test/fixtures/performance/amp-ad/amphtml-ad.html"
-      ],
-      "timeout": 5000,
-      "extraUrlParam": {
-        "intercept": true
-      }
-    },
-    {
-      "handlerName": "runtimeHandler",
-      "urls": [
-        "http://localhost:8000/examples/runtime/article.html",
-        "http://localhost:8000/examples/runtime/images.html",
-        "http://localhost:8000/examples/runtime/list-always.html"
-      ]
-    }
-  ]
-}
diff --git a/build-system/tasks/performance/copy-images.js b/build-system/tasks/performance/copy-images.js
deleted file mode 100644
index aaeb75059f74..000000000000
--- a/build-system/tasks/performance/copy-images.js
+++ /dev/null
@@ -1,73 +0,0 @@
-const fs = require('fs');
-const {CONTROL, maybeCopyImageToCache, urlToCachePath} = require('./helpers');
-const {JSDOM} = require('jsdom');
-
-/**
- * Lookup URL from cache. Inspect tags that could use images.
- *
- * @param {string} url
- * @return {Promise<void>}
- */
-async function copyImagesFromTags(url) {
-  const cachePath = urlToCachePath(url, CONTROL);
-  const document = fs.readFileSync(cachePath);
-  const dom = new JSDOM(document);
-
-  copyImagesFromAmpImg(url, dom);
-  copyImagesFromAmpVideo(url, dom);
-}
-
-/**
- * Copy locally stored images found in the amp-img tags
- * from src and srcset to cache.
- *
- * @param {string} url
- * @param {JSDOM} dom
- */
-function copyImagesFromAmpImg(url, dom) {
-  const imageTags = Array.from(dom.window.document.querySelectorAll('amp-img'));
-
-  for (const imageTag of imageTags) {
-    const src = imageTag.getAttribute('src');
-    const srcset = imageTag.getAttribute('srcset');
-    if (src) {
-      maybeCopyImageToCache(url, src);
-    }
-    if (srcset) {
-      // Get each source path, strip out responsive (1x, 2x..) found at the end
-      const sources = srcset.split(',').map((s) => s.trim().split(' ')[0]);
-      sources.forEach((srcPath) => maybeCopyImageToCache(url, srcPath));
-    }
-  }
-}
-
-/**
- * Copy locally stored images found in the amp-video tags
- * from artwork to cache.
- *
- * @param {string} url
- * @param {JSDOM} dom
- */
-function copyImagesFromAmpVideo(url, dom) {
-  const videoTags = Array.from(
-    dom.window.document.querySelectorAll('amp-video')
-  );
-  for (const videoTag of videoTags) {
-    const artwork = videoTag.getAttribute('artwork');
-    if (artwork) {
-      maybeCopyImageToCache(url, artwork);
-    }
-  }
-}
-
-/**
- * Copy locally stored images found in the markup to cache.
- *
- * @param {!Array<string>} urls
- * @return {Promise<void>}
- */
-async function copyLocalImages(urls) {
-  await Promise.all(urls.map(copyImagesFromTags));
-}
-
-module.exports = copyLocalImages;
diff --git a/build-system/tasks/performance/helpers.js b/build-system/tasks/performance/helpers.js
deleted file mode 100644
index fe8971989f79..000000000000
--- a/build-system/tasks/performance/helpers.js
+++ /dev/null
@@ -1,205 +0,0 @@
-const fetch = require('node-fetch');
-const fs = require('fs');
-const path = require('path');
-
-const CDN_URL = 'https://cdn.ampproject.org/';
-const V0_PATH = '/dist/v0.js';
-const INABOX_PATH = '/dist/amp4ads-v0.js';
-const LOCAL_PATH_REGEXP = /dist\/(v0\/amp-[A-Za-z\-0-9\.]+.js)/;
-const ANALYTICS_VENDORS_PATH = '../../../dist/v0/analytics-vendors/';
-const CONTROL = 'control';
-const EXPERIMENT = 'experiment';
-const CACHE_PATH = path.join(__dirname, './cache');
-const CONTROL_CACHE_PATH = path.join(CACHE_PATH, `./${CONTROL}`);
-const EXPERIMENT_CACHE_PATH = path.join(CACHE_PATH, `./${EXPERIMENT}`);
-const IMG_CACHE_PATH = path.join(CACHE_PATH, './img');
-const RESULTS_PATH = path.join(__dirname, './results.json');
-const DEFAULT_EXTENSIONS = ['amp-auto-lightbox-0.1.js', 'amp-loader-0.1.js'];
-
-/**
- * Makes cache directories if they do not exist
- */
-function touchDirs() {
-  [
-    CACHE_PATH,
-    IMG_CACHE_PATH,
-    CONTROL_CACHE_PATH,
-    path.join(CONTROL_CACHE_PATH, 'v0'),
-    EXPERIMENT_CACHE_PATH,
-    path.join(EXPERIMENT_CACHE_PATH, 'v0'),
-  ].forEach((dirPath) => {
-    if (!fs.existsSync(dirPath)) {
-      fs.mkdirSync(dirPath);
-    }
-  });
-}
-
-/**
- * Takes a URL string and sanitizes it for use as a filename.
- * Appends `.html` if no extension is present because otherwise
- * Chrome will not open the file as a webpage.
- *
- * @param {string} url
- * @param {string} version Experiment or Control
- * @return {string}
- */
-function urlToCachePath(url, version = CONTROL) {
-  const directory =
-    version === CONTROL ? CONTROL_CACHE_PATH : EXPERIMENT_CACHE_PATH;
-  let sanitized = url.replace(/:/g, '').replace(/\//g, '_');
-  sanitized = /\.js|\.html/.test(sanitized) ? sanitized : `${sanitized}.html`;
-  return path.join(directory, sanitized);
-}
-
-/**
- * @param {string} file
- * @param {string} version Experiment or Control
- * @return {string}
- */
-function localFileToCachePath(file, version = EXPERIMENT) {
-  const directory =
-    version === CONTROL ? CONTROL_CACHE_PATH : EXPERIMENT_CACHE_PATH;
-  return path.join(directory, file);
-}
-
-/**
- * @param {string} extension
- * @return {string}
- */
-function getLocalPathFromExtension(extension) {
-  return `v0/` + extension;
-}
-
-/**
- * Download a file to cache by url
- *
- * @param {string} url
- * @param {string} version
- * @return {!Promise<string>} Resolves with relative path to file
- */
-async function downloadToDisk(url, version = CONTROL) {
-  touchDirs();
-
-  const response = await fetch(url);
-  const document = await response.text();
-  const filepath = urlToCachePath(url, version);
-  fs.writeFileSync(filepath, document);
-
-  return filepath.split(`performance/cache/${version}/`)[1];
-}
-
-/**
- * Copy a script file from /dist to cache from filePath
- *
- * @param {string} filePath
- * @param {string} version
- * @return {!Promise<string>} Resolves with relative path to file
- */
-async function copyToCache(filePath, version = EXPERIMENT) {
-  touchDirs();
-
-  const fromPath = path.join(__dirname, '../../../dist/', filePath);
-  const destDir =
-    version === CONTROL ? CONTROL_CACHE_PATH : EXPERIMENT_CACHE_PATH;
-  const destPath = path.join(destDir, filePath);
-
-  fs.copyFileSync(fromPath, destPath);
-
-  return filePath;
-}
-
-/**
- * Copy an image from absoluteImgPath to cache/img if not present.
- * To be used by both control and experiment
- *
- * @param {string} configUrl
- * @param {string} src
- */
-function maybeCopyImageToCache(configUrl, src) {
-  // Remove `?...` that may be used at the end of the src for uniqueness
-  src = src.split('?')[0];
-  const absoluteFromImgPath = getAbsolutePathFromRelativePath(configUrl, src);
-
-  if (src.startsWith('http') || !fs.existsSync(absoluteFromImgPath)) {
-    return;
-  }
-
-  touchDirs();
-
-  const filename = src.split('/').pop() ?? '';
-  const destPath = path.join(IMG_CACHE_PATH, filename);
-
-  if (!fs.existsSync(destPath)) {
-    fs.copyFileSync(absoluteFromImgPath, destPath);
-  }
-}
-
-/**
- * Returns absolute path to vendor config.
- *
- * @param {string} vendor
- * @return {!Promise<string>} Resolves with relative path to file
- */
-function getLocalVendorConfig(vendor) {
-  const filepath = path.join(
-    __dirname,
-    ANALYTICS_VENDORS_PATH,
-    vendor + '.json'
-  );
-  return getFileFromAbsolutePath(filepath);
-}
-
-/**
- * Return file contents from absolute filepath.
- *
- * @param {string} filePath
- * @return {!Promise<string>} Resolves with relative path to file
- */
-async function getFileFromAbsolutePath(filePath) {
-  return fs.readFileSync(filePath, 'utf-8');
-}
-
-/**
- * Strip localhost:8000 from url and remove the filename
- *
- * @param {string} testPageUrl
- * @return {string}
- */
-function getFolderLocation(testPageUrl) {
-  const removedLocalHost = testPageUrl
-    .split('http://localhost:8000')[1]
-    .split('/');
-  removedLocalHost.pop();
-  return removedLocalHost.join('/');
-}
-
-/**
- * Get the absolute path of the relative src
- *
- * @param {string} testPageUrl
- * @param {string} src
- * @return {string}
- */
-function getAbsolutePathFromRelativePath(testPageUrl, src) {
-  return path.join(__dirname, '../../..', getFolderLocation(testPageUrl), src);
-}
-
-module.exports = {
-  CDN_URL,
-  CONTROL,
-  DEFAULT_EXTENSIONS,
-  EXPERIMENT,
-  INABOX_PATH,
-  LOCAL_PATH_REGEXP,
-  RESULTS_PATH,
-  V0_PATH,
-  copyToCache,
-  maybeCopyImageToCache,
-  downloadToDisk,
-  getFileFromAbsolutePath,
-  getLocalPathFromExtension,
-  getLocalVendorConfig,
-  getAbsolutePathFromRelativePath,
-  localFileToCachePath,
-  urlToCachePath,
-};
diff --git a/build-system/tasks/performance/index.js b/build-system/tasks/performance/index.js
deleted file mode 100644
index c0af2d1d4b9f..000000000000
--- a/build-system/tasks/performance/index.js
+++ /dev/null
@@ -1,50 +0,0 @@
-const cacheDocuments = require('./cache-documents');
-const compileScripts = require('./compile-scripts');
-const copyLocalImages = require('./copy-images');
-const getMetrics = require('./measure-documents');
-const loadConfig = require('./load-config');
-const rewriteAnalyticsTags = require('./rewrite-analytics-tags');
-const rewriteScriptTags = require('./rewrite-script-tags');
-const runTests = require('./run-tests');
-const {css} = require('../css');
-const {printReport} = require('./print-report');
-
-/**
- * @return {!Promise<void>}
- */
-async function performance() {
-  let resolver = (..._) => {}; // eslint-disable-line no-unused-vars
-  const deferred = new Promise((resolverIn) => {
-    resolver = resolverIn;
-  });
-
-  const config = loadConfig();
-  const urls = Object.keys(config.urlToHandlers);
-  const urlsAndAdsUrls = urls.concat(config.adsUrls || []);
-  await css();
-  await cacheDocuments(urlsAndAdsUrls);
-  await compileScripts(urlsAndAdsUrls);
-  await copyLocalImages(urlsAndAdsUrls);
-  await rewriteScriptTags(urlsAndAdsUrls);
-  await rewriteAnalyticsTags(config.handlers);
-  await getMetrics(urls, config);
-  printReport(urls);
-  await runTests(resolver);
-  return deferred;
-}
-
-performance.description = 'Run web performance tests';
-
-performance.flags = {
-  'devtools': 'Run with devtools open',
-  'headless': 'Run on chromium headless',
-  'nobuild': 'Do not compile minified runtime before running tests',
-  'threshold':
-    'Fraction by which metrics are allowed to increase (number between 0.0 and 1.0)',
-  'quiet': 'Do not log progress per page',
-  'url': 'Page to test (overrides urls set in config.json)',
-};
-
-module.exports = {
-  performance,
-};
diff --git a/build-system/tasks/performance/load-config.js b/build-system/tasks/performance/load-config.js
deleted file mode 100644
index d1ddd26748b9..000000000000
--- a/build-system/tasks/performance/load-config.js
+++ /dev/null
@@ -1,60 +0,0 @@
-const argv = require('minimist')(process.argv.slice(2));
-const fs = require('fs');
-const path = require('path');
-
-const PATH = './config.json';
-
-/**
- * Loads test config from ./config.json
- * @return {{
- *  concurrency:number,
- *  headless:boolean,
- *  runs:number,
- *  handlers:Array<Object>,
- *  urlToHandlers:Object,
- *  adsUrls?:Array<string>
- * }}
- */
-function loadConfig() {
-  const file = fs.readFileSync(path.join(__dirname, PATH));
-  const config = JSON.parse(file.toString());
-  // Create mapping of url to handlers for ease of use later
-  config.urlToHandlers = config.handlers.reduce((mapping, handlerOptions) => {
-    if (argv.url && handlerOptions.handlerName === 'defaultHandler') {
-      handlerOptions.urls = [argv.url];
-    }
-    handlerOptions.urls.forEach((url) => {
-      if (mapping[url]) {
-        throw new Error(`All urls must be unique: ${url}.`);
-      }
-      mapping[url] = handlerOptions;
-    });
-    return mapping;
-  }, {});
-  if (Object.keys(config.urlToHandlers).length < 1) {
-    throw new Error('No URLs found in config.');
-  }
-  config.headless = !!argv.headless;
-  config.devtools = !!argv.devtools;
-
-  maybeExtractAdsUrls(config);
-  return config;
-}
-
-/**
- * If adsHandler is in use, add the array as top level key to be used for
- * easy access to files for caching.
- * @param {!Object} config
- */
-function maybeExtractAdsUrls(config) {
-  if (!config || !config.handlers) {
-    return;
-  }
-  for (const handler of config.handlers) {
-    if (handler.handlerName === 'adsHandler' && handler.adsUrls) {
-      config['adsUrls'] = handler.adsUrls;
-    }
-  }
-}
-
-module.exports = loadConfig;
diff --git a/build-system/tasks/performance/measure-documents.js b/build-system/tasks/performance/measure-documents.js
deleted file mode 100644
index 25bf235d685c..000000000000
--- a/build-system/tasks/performance/measure-documents.js
+++ /dev/null
@@ -1,371 +0,0 @@
-const argv = require('minimist')(process.argv.slice(2));
-const fs = require('fs-extra');
-const puppeteer = require('puppeteer');
-const {
-  CDN_URL,
-  CONTROL,
-  DEFAULT_EXTENSIONS,
-  EXPERIMENT,
-  RESULTS_PATH,
-  getFileFromAbsolutePath,
-  getLocalPathFromExtension,
-  localFileToCachePath,
-  urlToCachePath,
-} = require('./helpers');
-const {
-  getAnalyticsMetrics,
-  setupAnalyticsHandler,
-} = require('./analytics-handler');
-const {cyan, green} = require('kleur/colors');
-const {log} = require('../../common/logging');
-const {setupAdRequestHandler} = require('./ads-handler');
-
-/**
- * Setup measurement on page before navigating to the URL. Performance
- * observers need to be initialized before content begins to load to take
- * measurements.
- *
- * @param {puppeteer.Page} page
- * @return {Promise<void>} Resolves when script is evaluated
- */
-const setupMeasurement = (page) =>
-  page.evaluateOnNewDocument(() => {
-    window.longTasks = [];
-    window.cumulativeLayoutShift = 0;
-    window.measureStarted = Date.now();
-    window.largestContentfulPaint = 0;
-
-    const longTaskObserver = new PerformanceObserver((list) =>
-      list.getEntries().forEach((entry) => window.longTasks.push(entry))
-    );
-
-    longTaskObserver.observe({entryTypes: ['longtask']});
-
-    const layoutShiftObserver = new PerformanceObserver((list) =>
-      list
-        .getEntries()
-        .forEach((entry) => (window.cumulativeLayoutShift += entry.value))
-    );
-
-    layoutShiftObserver.observe({entryTypes: ['layout-shift']});
-
-    const largestContentfulPaintObserver = new PerformanceObserver((list) => {
-      const entries = list.getEntries();
-      const entry = entries[entries.length - 1];
-      window.largestContentfulPaint = entry.renderTime || entry.loadTime;
-    });
-
-    largestContentfulPaintObserver.observe({
-      entryTypes: ['largest-contentful-paint'],
-    });
-  });
-
-/**
- * Intecepts requests for default extensions made by runtime and returns a
- * cached version.
- * @param {puppeteer.HTTPRequest} interceptedRequest
- * @param {string} version
- * @return {!Promise<boolean>}
- */
-const defaultExtensionsHandler = async (interceptedRequest, version) => {
-  const interceptedUrl = interceptedRequest.url();
-  for (let i = 0; i < DEFAULT_EXTENSIONS.length; i++) {
-    const extension = DEFAULT_EXTENSIONS[i];
-    if (interceptedUrl.endsWith(extension)) {
-      const localPath = getLocalPathFromExtension(extension);
-      const jsonString = await getFileFromAbsolutePath(
-        version === CONTROL
-          ? urlToCachePath(CDN_URL + localPath)
-          : localFileToCachePath(localPath)
-      );
-      interceptedRequest.respond({
-        status: 200,
-        contentType: 'script; charset=utf-8',
-        body: jsonString,
-      });
-      return true;
-    }
-  }
-  return false;
-};
-
-/**
- * Create a promise that will resolve after a setTimeout,
- * unless it has been resolved before then.
- * @param {?Object} handlerOptions
- * @return {!Object}
- */
-function setupDelayBasedOnHandlerOptions(handlerOptions) {
-  let resolve;
-  const timeoutPromise = new Promise((r) => {
-    resolve = r;
-    setTimeout(
-      resolve,
-      handlerOptions && handlerOptions.timeout ? handlerOptions.timeout : 0
-    );
-  });
-  return {
-    timeoutPromise,
-    resolve,
-  };
-}
-
-/**
- * Evaluate script on the page to collect and calculate metrics
- *
- * @param {puppeteer.Page} page
- * @return {Promise<object>} Resolves with page load metrics
- */
-const readMetrics = (page) =>
-  page.evaluate(() => {
-    const entries = performance.getEntries();
-
-    /**
-     *
-     * @param {string} name
-     * @return {number}
-     */
-    function getMetric(name) {
-      const entry = entries.find((entry) => entry.name === name);
-      return entry ? entry.startTime : 0;
-    }
-
-    const firstContentfulPaint = getMetric('first-contentful-paint');
-
-    /**
-     * @return {number}
-     */
-    function getMaxFirstInputDelay() {
-      let longest = 0;
-
-      window.longTasks.forEach((longTask) => {
-        if (
-          longTask.startTime > firstContentfulPaint &&
-          longTask.duration > longest
-        ) {
-          longest = longTask.duration;
-        }
-      });
-
-      return longest;
-    }
-
-    return {
-      largestContentfulPaint: window.largestContentfulPaint,
-      maxFirstInputDelay: getMaxFirstInputDelay(),
-      cumulativeLayoutShift: window.cumulativeLayoutShift * 100,
-    };
-  });
-
-/**
- * Set up defaults handlers for docs that will be requested
- * that are not explicted stated as script tags and not
- * handled by the 'additionalHandlers'.
- *
- * @param {!Array<function>} handlersList
- * @param {string} version
- */
-function setupDefaultHandlers(handlersList, version) {
-  // Handle requests made by runtime for default extensions
-  handlersList.push((interceptedRequest) =>
-    defaultExtensionsHandler(interceptedRequest, version)
-  );
-}
-
-/**
- * Set up appropriate handlers based upon handlerOptions
- *
- * @param {!Array<function>} handlersList
- * @param {?Object} handlerOptions
- * @param {!puppeteer.Page} page
- * @param {!function} resolve
- * @param {string} version
- * @return {Promise<void>}
- */
-async function setupAdditionalHandlers(
-  handlersList,
-  handlerOptions,
-  page,
-  resolve,
-  version
-) {
-  switch (handlerOptions.handlerName) {
-    case 'adsHandler':
-      setupAdRequestHandler(handlersList, version);
-      setupAnalyticsHandler(handlersList, handlerOptions, resolve);
-      break;
-    case 'analyticsHandler':
-      setupAnalyticsHandler(handlersList, handlerOptions, resolve);
-      break;
-    case 'defaultHandler':
-    default:
-      await setupMeasurement(page);
-      break;
-  }
-}
-
-/**
- * Send each intercepted request to all handlers in list.
- * Takes care of continuing the request, if none of the
- * handlers respond/abort the request.
- *
- * @param {!Array<function>} handlersList
- * @param {puppeteer.Page} page
- */
-function startRequestListener(handlersList, page) {
-  page.on('request', async (interceptedRequest) => {
-    let requestHandled = false;
-    for (let i = 0; i < handlersList.length; i++) {
-      const curr = await handlersList[i](interceptedRequest);
-      requestHandled = requestHandled || curr;
-    }
-    if (!requestHandled) {
-      interceptedRequest.continue();
-    }
-  });
-}
-
-/**
- * Return metrics based on handler
- *
- * @param {?Object} handlerOptions
- * @param {puppeteer.Page} page
- * @return {!Promise<!Object>}
- */
-async function addHandlerMetric(handlerOptions, page) {
-  switch (handlerOptions.handlerName) {
-    case 'adsHandler':
-    case 'analyticsHandler':
-      return getAnalyticsMetrics(handlerOptions);
-    case 'defaultHandler':
-    default:
-      return readMetrics(page);
-  }
-}
-
-/**
- * Writes measurements to ./results.json
- *
- * @param {string} url
- * @param {string} version
- * @param {*} metrics
- */
-function writeMetrics(url, version, metrics) {
-  let results = {};
-
-  if (fs.existsSync(RESULTS_PATH)) {
-    results = fs.readJson(RESULTS_PATH);
-  }
-
-  if (!results[url]) {
-    results[url] = {[CONTROL]: [], [EXPERIMENT]: []};
-  }
-
-  results[url][version].push(metrics);
-
-  fs.writeFileSync(RESULTS_PATH, JSON.stringify(results));
-}
-
-/**
- * Opens Chrome, loads the URL from local file cache, and collects
- * metrics for the specified URL and version
- *
- * @param {string} url
- * @param {string} version "control" or "experiment"
- * @param {!Object} config
- * @return {Promise<void>}
- */
-async function measureDocument(url, version, config) {
-  const browser = await puppeteer.launch({
-    headless: config.headless,
-    devtools: config.devtools,
-    args: [
-      '--allow-file-access-from-files',
-      '--enable-blink-features=LayoutInstabilityAPI',
-      '--disable-web-security',
-    ],
-  });
-
-  const page = await browser.newPage();
-  const handlerOptionsForUrl = {...config.urlToHandlers[url]};
-  const handlersList = [];
-  const {resolve, timeoutPromise} =
-    setupDelayBasedOnHandlerOptions(handlerOptionsForUrl);
-  await page.setCacheEnabled(false);
-  await page.setRequestInterception(true);
-  setupDefaultHandlers(handlersList, version);
-  await setupAdditionalHandlers(
-    handlersList,
-    handlerOptionsForUrl,
-    page,
-    resolve,
-    version
-  );
-  startRequestListener(handlersList, page);
-  try {
-    await page.goto(`file:${urlToCachePath(url, version)}`, {
-      waitUntil: 'networkidle0',
-    });
-  } catch {
-    // site did not load
-    await browser.close();
-    return;
-  }
-
-  await timeoutPromise;
-  const metrics = await addHandlerMetric(handlerOptionsForUrl, page);
-  writeMetrics(url, version, metrics);
-  await browser.close();
-}
-
-/**
- * Loads cached local copies of the URLs in Chrome with Puppeteer and
- * runs a script on the page to collect performance metrics. Saves
- * performance metrics to results.json in this directory.
- *
- * @param {!Array<string>} urls
- * @param {!Object} config
- * @return {Promise<void>} Fulfills when all URLs have been measured
- */
-async function measureDocuments(urls, config) {
-  try {
-    fs.unlinkSync(RESULTS_PATH);
-  } catch {} // file does not exist (first run)
-
-  // Make an array of tasks to be executed
-  const tasks = urls.flatMap((url) =>
-    Array.from({length: config.runs}).flatMap(() => [
-      measureDocument.bind(null, url, CONTROL, config),
-      measureDocument.bind(null, url, EXPERIMENT, config),
-    ])
-  );
-
-  const startTime = Date.now();
-  /**
-   * @return {number}
-   */
-  function timeLeft() {
-    const elapsed = (Date.now() - startTime) / 1000;
-    const secondsPerTask = elapsed / i;
-    return Math.floor(secondsPerTask * (tasks.length - i));
-  }
-
-  log(
-    green('Taking performance measurements'),
-    cyan(tasks.length),
-    green('times...')
-  );
-
-  // Excecute the tasks serially
-  let i = 0;
-  for (const task of tasks) {
-    if (!argv.quiet) {
-      log(`Progress: ${i++}/${tasks.length}. ${timeLeft()} seconds left.`);
-    } else {
-      process.stdout.write('.');
-    }
-    await task();
-  }
-}
-
-module.exports = measureDocuments;
diff --git a/build-system/tasks/performance/package-lock.json b/build-system/tasks/performance/package-lock.json
deleted file mode 100644
index 7ea361ce87af..000000000000
--- a/build-system/tasks/performance/package-lock.json
+++ /dev/null
@@ -1,2534 +0,0 @@
-{
-  "name": "amp-performance",
-  "version": "0.1.0",
-  "lockfileVersion": 2,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "amp-performance",
-      "version": "0.1.0",
-      "devDependencies": {
-        "chai": "4.3.4",
-        "mocha": "9.1.3",
-        "puppeteer": "11.0.0"
-      }
-    },
-    "node_modules/@types/node": {
-      "version": "16.11.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.6.tgz",
-      "integrity": "sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/@types/yauzl": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.2.tgz",
-      "integrity": "sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@ungap/promise-all-settled": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
-      "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
-      "dev": true
-    },
-    "node_modules/agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "dev": true,
-      "dependencies": {
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
-    "node_modules/ansi-colors": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/anymatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-      "dev": true,
-      "dependencies": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      },
-      "engines": {
-        "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/assertion-error": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
-      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
-    },
-    "node_modules/base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "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"
-        }
-      ]
-    },
-    "node_modules/binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/bl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "dev": true,
-      "dependencies": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
-      }
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/browser-stdout": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
-      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
-      "dev": true
-    },
-    "node_modules/buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "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"
-        }
-      ],
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
-    "node_modules/buffer-crc32": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/camelcase": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
-      "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/chai": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.4.tgz",
-      "integrity": "sha512-yS5H68VYOCtN1cjfwumDSuzn/9c+yza4f3reKXlE5rUg7SFcCEy90gJvydNgOYtblyf4Zi6jIWRnXOgErta0KA==",
-      "dev": true,
-      "dependencies": {
-        "assertion-error": "^1.1.0",
-        "check-error": "^1.0.2",
-        "deep-eql": "^3.0.1",
-        "get-func-name": "^2.0.0",
-        "pathval": "^1.1.1",
-        "type-detect": "^4.0.5"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/chalk/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/check-error": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
-      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/chokidar": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
-      "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
-      "dev": true,
-      "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.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"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/chownr": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-      "dev": true
-    },
-    "node_modules/cliui": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^7.0.0"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
-    },
-    "node_modules/debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/debug/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/decamelize": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
-      "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/deep-eql": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
-      "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
-      "dev": true,
-      "dependencies": {
-        "type-detect": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=0.12"
-      }
-    },
-    "node_modules/devtools-protocol": {
-      "version": "0.0.901419",
-      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.901419.tgz",
-      "integrity": "sha512-4INMPwNm9XRpBukhNbF7OB6fNTTCaI8pzy/fXg0xQzAy5h3zL1P8xT3QazgKqBrb/hAYwIBizqDBZ7GtJE74QQ==",
-      "dev": true
-    },
-    "node_modules/diff": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
-      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.3.1"
-      }
-    },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.4.0"
-      }
-    },
-    "node_modules/escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "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==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/extract-zip": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
-      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.1.1",
-        "get-stream": "^5.1.0",
-        "yauzl": "^2.10.0"
-      },
-      "bin": {
-        "extract-zip": "cli.js"
-      },
-      "engines": {
-        "node": ">= 10.17.0"
-      },
-      "optionalDependencies": {
-        "@types/yauzl": "^2.9.1"
-      }
-    },
-    "node_modules/fd-slicer": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
-      "dev": true,
-      "dependencies": {
-        "pend": "~1.2.0"
-      }
-    },
-    "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "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==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "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/fs-constants": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-      "dev": true
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-    },
-    "node_modules/get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true,
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
-    },
-    "node_modules/get-func-name": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
-      "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/get-stream": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-      "dev": true,
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "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": {
-        "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"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/growl": {
-      "version": "1.10.5",
-      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
-      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.x"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/he": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-      "dev": true,
-      "bin": {
-        "he": "bin/he"
-      }
-    },
-    "node_modules/https-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
-      "dev": true,
-      "dependencies": {
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "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"
-        }
-      ]
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dev": true,
-      "dependencies": {
-        "binary-extensions": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/is-plain-obj": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
-      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-unicode-supported": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "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/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/log-symbols": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/mkdirp-classic": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
-      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
-      "dev": true
-    },
-    "node_modules/mocha": {
-      "version": "9.1.3",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.1.3.tgz",
-      "integrity": "sha512-Xcpl9FqXOAYqI3j79pEtHBBnQgVXIhpULjGQa7DVb0Po+VzmSIK9kanAiWLHoRR/dbZ2qpdPshuXr8l1VaHCzw==",
-      "dev": true,
-      "dependencies": {
-        "@ungap/promise-all-settled": "1.1.2",
-        "ansi-colors": "4.1.1",
-        "browser-stdout": "1.3.1",
-        "chokidar": "3.5.2",
-        "debug": "4.3.2",
-        "diff": "5.0.0",
-        "escape-string-regexp": "4.0.0",
-        "find-up": "5.0.0",
-        "glob": "7.1.7",
-        "growl": "1.10.5",
-        "he": "1.2.0",
-        "js-yaml": "4.1.0",
-        "log-symbols": "4.1.0",
-        "minimatch": "3.0.4",
-        "ms": "2.1.3",
-        "nanoid": "3.1.25",
-        "serialize-javascript": "6.0.0",
-        "strip-json-comments": "3.1.1",
-        "supports-color": "8.1.1",
-        "which": "2.0.2",
-        "workerpool": "6.1.5",
-        "yargs": "16.2.0",
-        "yargs-parser": "20.2.4",
-        "yargs-unparser": "2.0.0"
-      },
-      "bin": {
-        "_mocha": "bin/_mocha",
-        "mocha": "bin/mocha"
-      },
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mochajs"
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true
-    },
-    "node_modules/nanoid": {
-      "version": "3.1.25",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz",
-      "integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==",
-      "dev": true,
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
-    "node_modules/node-fetch": {
-      "version": "2.6.5",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.5.tgz",
-      "integrity": "sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ==",
-      "dev": true,
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      }
-    },
-    "node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "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,
-      "dependencies": {
-        "yocto-queue": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "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==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "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"
-      }
-    },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pathval": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
-      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/pend": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
-      "dev": true
-    },
-    "node_modules/picomatch": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/progress": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/proxy-from-env": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-      "dev": true
-    },
-    "node_modules/pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "node_modules/puppeteer": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-11.0.0.tgz",
-      "integrity": "sha512-6rPFqN1ABjn4shgOICGDBITTRV09EjXVqhDERBDKwCLz0UyBxeeBH6Ay0vQUJ84VACmlxwzOIzVEJXThcF3aNg==",
-      "dev": true,
-      "hasInstallScript": true,
-      "dependencies": {
-        "debug": "4.3.2",
-        "devtools-protocol": "0.0.901419",
-        "extract-zip": "2.0.1",
-        "https-proxy-agent": "5.0.0",
-        "node-fetch": "2.6.5",
-        "pkg-dir": "4.2.0",
-        "progress": "2.0.3",
-        "proxy-from-env": "1.1.0",
-        "rimraf": "3.0.2",
-        "tar-fs": "2.1.1",
-        "unbzip2-stream": "1.4.3",
-        "ws": "8.2.3"
-      },
-      "engines": {
-        "node": ">=10.18.1"
-      }
-    },
-    "node_modules/randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dev": true,
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "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"
-        }
-      ]
-    },
-    "node_modules/serialize-javascript": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
-      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
-      "dev": true,
-      "dependencies": {
-        "randombytes": "^2.1.0"
-      }
-    },
-    "node_modules/string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
-    "node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "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": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
-    "node_modules/tar-fs": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
-      "dev": true,
-      "dependencies": {
-        "chownr": "^1.1.1",
-        "mkdirp-classic": "^0.5.2",
-        "pump": "^3.0.0",
-        "tar-stream": "^2.1.4"
-      }
-    },
-    "node_modules/tar-stream": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
-      "dev": true,
-      "dependencies": {
-        "bl": "^4.0.3",
-        "end-of-stream": "^1.4.1",
-        "fs-constants": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^3.1.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-      "dev": true
-    },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=",
-      "dev": true
-    },
-    "node_modules/type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unbzip2-stream": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
-      "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
-      "dev": true,
-      "dependencies": {
-        "buffer": "^5.2.1",
-        "through": "^2.3.8"
-      }
-    },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
-    },
-    "node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=",
-      "dev": true
-    },
-    "node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
-      "dev": true,
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
-    "node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/workerpool": {
-      "version": "6.1.5",
-      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz",
-      "integrity": "sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==",
-      "dev": true
-    },
-    "node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
-    },
-    "node_modules/ws": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
-      "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
-    "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/yargs": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^7.0.2",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/yargs-parser": {
-      "version": "20.2.4",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
-      "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/yargs-unparser": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
-      "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^6.0.0",
-        "decamelize": "^4.0.0",
-        "flat": "^5.0.2",
-        "is-plain-obj": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/yauzl": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
-      "dev": true,
-      "dependencies": {
-        "buffer-crc32": "~0.2.3",
-        "fd-slicer": "~1.1.0"
-      }
-    },
-    "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,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    }
-  },
-  "dependencies": {
-    "@types/node": {
-      "version": "16.11.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.6.tgz",
-      "integrity": "sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w==",
-      "dev": true,
-      "optional": true
-    },
-    "@types/yauzl": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.2.tgz",
-      "integrity": "sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@ungap/promise-all-settled": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
-      "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
-      "dev": true
-    },
-    "agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "dev": true,
-      "requires": {
-        "debug": "4"
-      }
-    },
-    "ansi-colors": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-      "dev": true
-    },
-    "ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true
-    },
-    "ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "requires": {
-        "color-convert": "^2.0.1"
-      }
-    },
-    "anymatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-      "dev": true,
-      "requires": {
-        "normalize-path": "^3.0.0",
-        "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
-    },
-    "assertion-error": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
-      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
-      "dev": true
-    },
-    "balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
-    },
-    "base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "dev": true
-    },
-    "binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-      "dev": true
-    },
-    "bl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "dev": true,
-      "requires": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
-      }
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
-      "requires": {
-        "fill-range": "^7.0.1"
-      }
-    },
-    "browser-stdout": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
-      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
-      "dev": true
-    },
-    "buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "dev": true,
-      "requires": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
-    "buffer-crc32": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-      "dev": true
-    },
-    "camelcase": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
-      "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
-      "dev": true
-    },
-    "chai": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.4.tgz",
-      "integrity": "sha512-yS5H68VYOCtN1cjfwumDSuzn/9c+yza4f3reKXlE5rUg7SFcCEy90gJvydNgOYtblyf4Zi6jIWRnXOgErta0KA==",
-      "dev": true,
-      "requires": {
-        "assertion-error": "^1.1.0",
-        "check-error": "^1.0.2",
-        "deep-eql": "^3.0.1",
-        "get-func-name": "^2.0.0",
-        "pathval": "^1.1.1",
-        "type-detect": "^4.0.5"
-      }
-    },
-    "chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "dependencies": {
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "check-error": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
-      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
-      "dev": true
-    },
-    "chokidar": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
-      "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
-      "dev": true,
-      "requires": {
-        "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"
-      }
-    },
-    "chownr": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-      "dev": true
-    },
-    "cliui": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-      "dev": true,
-      "requires": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^7.0.0"
-      }
-    },
-    "color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "requires": {
-        "color-name": "~1.1.4"
-      }
-    },
-    "color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
-    },
-    "debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
-      "dev": true,
-      "requires": {
-        "ms": "2.1.2"
-      },
-      "dependencies": {
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
-      }
-    },
-    "decamelize": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
-      "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
-      "dev": true
-    },
-    "deep-eql": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
-      "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
-      "dev": true,
-      "requires": {
-        "type-detect": "^4.0.0"
-      }
-    },
-    "devtools-protocol": {
-      "version": "0.0.901419",
-      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.901419.tgz",
-      "integrity": "sha512-4INMPwNm9XRpBukhNbF7OB6fNTTCaI8pzy/fXg0xQzAy5h3zL1P8xT3QazgKqBrb/hAYwIBizqDBZ7GtJE74QQ==",
-      "dev": true
-    },
-    "diff": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
-      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
-      "dev": true
-    },
-    "emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
-      "requires": {
-        "once": "^1.4.0"
-      }
-    },
-    "escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-      "dev": true
-    },
-    "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
-    },
-    "extract-zip": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
-      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
-      "dev": true,
-      "requires": {
-        "@types/yauzl": "^2.9.1",
-        "debug": "^4.1.1",
-        "get-stream": "^5.1.0",
-        "yauzl": "^2.10.0"
-      }
-    },
-    "fd-slicer": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
-      "dev": true,
-      "requires": {
-        "pend": "~1.2.0"
-      }
-    },
-    "fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
-      "requires": {
-        "to-regex-range": "^5.0.1"
-      }
-    },
-    "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==",
-      "dev": true,
-      "requires": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.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
-    },
-    "fs-constants": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-      "dev": true
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-    },
-    "get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true
-    },
-    "get-func-name": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
-      "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
-      "dev": true
-    },
-    "get-stream": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-      "dev": true,
-      "requires": {
-        "pump": "^3.0.0"
-      }
-    },
-    "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"
-      }
-    },
-    "glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "requires": {
-        "is-glob": "^4.0.1"
-      }
-    },
-    "growl": {
-      "version": "1.10.5",
-      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
-      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
-      "dev": true
-    },
-    "has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true
-    },
-    "he": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-      "dev": true
-    },
-    "https-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
-      "dev": true,
-      "requires": {
-        "agent-base": "6",
-        "debug": "4"
-      }
-    },
-    "ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "dev": true
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dev": true,
-      "requires": {
-        "binary-extensions": "^2.0.0"
-      }
-    },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true
-    },
-    "is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true
-    },
-    "is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "requires": {
-        "is-extglob": "^2.1.1"
-      }
-    },
-    "is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true
-    },
-    "is-plain-obj": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
-      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
-      "dev": true
-    },
-    "is-unicode-supported": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-      "dev": true
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "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"
-      }
-    },
-    "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"
-      }
-    },
-    "log-symbols": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-      "dev": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
-      }
-    },
-    "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "mkdirp-classic": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
-      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
-      "dev": true
-    },
-    "mocha": {
-      "version": "9.1.3",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.1.3.tgz",
-      "integrity": "sha512-Xcpl9FqXOAYqI3j79pEtHBBnQgVXIhpULjGQa7DVb0Po+VzmSIK9kanAiWLHoRR/dbZ2qpdPshuXr8l1VaHCzw==",
-      "dev": true,
-      "requires": {
-        "@ungap/promise-all-settled": "1.1.2",
-        "ansi-colors": "4.1.1",
-        "browser-stdout": "1.3.1",
-        "chokidar": "3.5.2",
-        "debug": "4.3.2",
-        "diff": "5.0.0",
-        "escape-string-regexp": "4.0.0",
-        "find-up": "5.0.0",
-        "glob": "7.1.7",
-        "growl": "1.10.5",
-        "he": "1.2.0",
-        "js-yaml": "4.1.0",
-        "log-symbols": "4.1.0",
-        "minimatch": "3.0.4",
-        "ms": "2.1.3",
-        "nanoid": "3.1.25",
-        "serialize-javascript": "6.0.0",
-        "strip-json-comments": "3.1.1",
-        "supports-color": "8.1.1",
-        "which": "2.0.2",
-        "workerpool": "6.1.5",
-        "yargs": "16.2.0",
-        "yargs-parser": "20.2.4",
-        "yargs-unparser": "2.0.0"
-      }
-    },
-    "ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true
-    },
-    "nanoid": {
-      "version": "3.1.25",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz",
-      "integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==",
-      "dev": true
-    },
-    "node-fetch": {
-      "version": "2.6.5",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.5.tgz",
-      "integrity": "sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ==",
-      "dev": true,
-      "requires": {
-        "whatwg-url": "^5.0.0"
-      }
-    },
-    "normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "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,
-      "requires": {
-        "yocto-queue": "^0.1.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==",
-      "dev": true,
-      "requires": {
-        "p-limit": "^3.0.2"
-      }
-    },
-    "p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true
-    },
-    "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
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true
-    },
-    "pathval": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
-      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
-      "dev": true
-    },
-    "pend": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
-      "dev": true
-    },
-    "picomatch": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
-      "dev": true
-    },
-    "pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dev": true,
-      "requires": {
-        "find-up": "^4.0.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^4.1.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.2.0"
-          }
-        }
-      }
-    },
-    "progress": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-      "dev": true
-    },
-    "proxy-from-env": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-      "dev": true
-    },
-    "pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "puppeteer": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-11.0.0.tgz",
-      "integrity": "sha512-6rPFqN1ABjn4shgOICGDBITTRV09EjXVqhDERBDKwCLz0UyBxeeBH6Ay0vQUJ84VACmlxwzOIzVEJXThcF3aNg==",
-      "dev": true,
-      "requires": {
-        "debug": "4.3.2",
-        "devtools-protocol": "0.0.901419",
-        "extract-zip": "2.0.1",
-        "https-proxy-agent": "5.0.0",
-        "node-fetch": "2.6.5",
-        "pkg-dir": "4.2.0",
-        "progress": "2.0.3",
-        "proxy-from-env": "1.1.0",
-        "rimraf": "3.0.2",
-        "tar-fs": "2.1.1",
-        "unbzip2-stream": "1.4.3",
-        "ws": "8.2.3"
-      }
-    },
-    "randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      }
-    },
-    "readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dev": true,
-      "requires": {
-        "picomatch": "^2.2.1"
-      }
-    },
-    "require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-      "dev": true
-    },
-    "rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.1.3"
-      }
-    },
-    "safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true
-    },
-    "serialize-javascript": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
-      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
-      "dev": true,
-      "requires": {
-        "randombytes": "^2.1.0"
-      }
-    },
-    "string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
-    "string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "requires": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      }
-    },
-    "strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^5.0.1"
-      }
-    },
-    "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
-    },
-    "supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dev": true,
-      "requires": {
-        "has-flag": "^4.0.0"
-      }
-    },
-    "tar-fs": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
-      "dev": true,
-      "requires": {
-        "chownr": "^1.1.1",
-        "mkdirp-classic": "^0.5.2",
-        "pump": "^3.0.0",
-        "tar-stream": "^2.1.4"
-      }
-    },
-    "tar-stream": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
-      "dev": true,
-      "requires": {
-        "bl": "^4.0.3",
-        "end-of-stream": "^1.4.1",
-        "fs-constants": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^3.1.1"
-      }
-    },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-      "dev": true
-    },
-    "to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "requires": {
-        "is-number": "^7.0.0"
-      }
-    },
-    "tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=",
-      "dev": true
-    },
-    "type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-      "dev": true
-    },
-    "unbzip2-stream": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
-      "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
-      "dev": true,
-      "requires": {
-        "buffer": "^5.2.1",
-        "through": "^2.3.8"
-      }
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
-    },
-    "webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=",
-      "dev": true
-    },
-    "whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
-      "dev": true,
-      "requires": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
-    "which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "requires": {
-        "isexe": "^2.0.0"
-      }
-    },
-    "workerpool": {
-      "version": "6.1.5",
-      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz",
-      "integrity": "sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==",
-      "dev": true
-    },
-    "wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      }
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
-    },
-    "ws": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
-      "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
-      "dev": true,
-      "requires": {}
-    },
-    "y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "dev": true
-    },
-    "yargs": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-      "dev": true,
-      "requires": {
-        "cliui": "^7.0.2",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
-      }
-    },
-    "yargs-parser": {
-      "version": "20.2.4",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
-      "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
-      "dev": true
-    },
-    "yargs-unparser": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
-      "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
-      "dev": true,
-      "requires": {
-        "camelcase": "^6.0.0",
-        "decamelize": "^4.0.0",
-        "flat": "^5.0.2",
-        "is-plain-obj": "^2.1.0"
-      }
-    },
-    "yauzl": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
-      "dev": true,
-      "requires": {
-        "buffer-crc32": "~0.2.3",
-        "fd-slicer": "~1.1.0"
-      }
-    },
-    "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
-    }
-  }
-}
diff --git a/build-system/tasks/performance/package.json b/build-system/tasks/performance/package.json
deleted file mode 100644
index 95bea1951ffb..000000000000
--- a/build-system/tasks/performance/package.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "private": true,
-  "name": "amp-performance",
-  "version": "0.1.0",
-  "description": "Dev dependencies used by `amp performance`",
-  "devDependencies": {
-    "chai": "4.3.4",
-    "mocha": "9.1.3",
-    "puppeteer": "11.0.0"
-  }
-}
diff --git a/build-system/tasks/performance/print-report.js b/build-system/tasks/performance/print-report.js
deleted file mode 100644
index 115cfb3c98be..000000000000
--- a/build-system/tasks/performance/print-report.js
+++ /dev/null
@@ -1,117 +0,0 @@
-const fs = require('fs');
-const {CONTROL, EXPERIMENT, RESULTS_PATH} = require('./helpers');
-const {cyan} = require('kleur/colors');
-const {percent, trimmedMean} = require('./stats');
-
-const HEADER_COLUMN = 26;
-const BODY_COLUMN = 12;
-const FULL_TABLE = 68;
-
-/**
- * Generates header lines to be printed to the console for url
- *
- * @param {string} url
- * @return {Array<string>} lines
- */
-const headerLines = (url) => [
-  '\nPAGE LOAD METRICS\n',
-  `${cyan(url)}\n\n`,
-  [
-    'METRIC'.padEnd(HEADER_COLUMN),
-    'BRANCH'.padEnd(BODY_COLUMN),
-    'PRODUCTION'.padEnd(BODY_COLUMN),
-    'CHANGE'.padEnd(BODY_COLUMN),
-  ].join(' | '),
-  `\n${''.padEnd(FULL_TABLE, '-')}\n`,
-];
-
-/**
- * Generates row to be printed to the console for the metric
- *
- * @param {string} metric
- * @param {Array<*>} results
- * @return {Array<string>} lines
- */
-function linesForMetric(metric, results) {
-  const control = trimmedMean(results[CONTROL], metric);
-  const experiment = trimmedMean(results[EXPERIMENT], metric);
-  const percentage = percent(control, experiment);
-
-  return [
-    [
-      metric.padEnd(HEADER_COLUMN),
-      experiment.toString().padEnd(BODY_COLUMN),
-      control.toString().padEnd(BODY_COLUMN),
-      percentage == null ? 'n/a' : `${percentage}%`,
-    ].join(' | '),
-    `\n${''.padEnd(FULL_TABLE, '-')}\n`,
-  ];
-}
-
-/**
- *
- * @param {string[]} urls
- */
-function printReport(urls) {
-  const results = JSON.parse(fs.readFileSync(RESULTS_PATH, 'utf-8'));
-
-  urls.forEach((url) => {
-    const keys = Object.keys(results[url][CONTROL][0]);
-    let lines = [];
-    lines = [...lines, ...headerLines(url)];
-    lines = [...lines, ...keys.flatMap((m) => linesForMetric(m, results[url]))];
-    console /* OK */
-      .log(...lines);
-  });
-}
-
-/**
- * Organizes a page's metrics for getReport()
- */
-class PageMetrics {
-  url;
-  metrics;
-
-  /**
-   * @param {string} url
-   */
-  constructor(url) {
-    this.url = url;
-    this.metrics = new Map();
-  }
-
-  /**
-   *
-   * @param {string} metric
-   * @param {number} experiment
-   * @param {number} control
-   */
-  set(metric, experiment, control) {
-    this.metrics.set(metric, {experiment, control});
-  }
-}
-
-/**
- * Gets report in the form of metrics per page
- * @param {Array<string>} urls
- * @return {Array<PageMetrics>} report
- */
-function getReport(urls) {
-  const raw = JSON.parse(fs.readFileSync(RESULTS_PATH, 'utf-8'));
-  const report = [];
-  urls.forEach((url) => {
-    const results = raw[url];
-    const pageMetrics = new PageMetrics(url);
-    const metrics = Object.keys(results[CONTROL][0]);
-    metrics.forEach((metric) => {
-      const control = trimmedMean(results[CONTROL], metric);
-      const experiment = trimmedMean(results[EXPERIMENT], metric);
-      pageMetrics.set(metric, experiment, control);
-    });
-    report.push(pageMetrics);
-  });
-
-  return report;
-}
-
-module.exports = {getReport, printReport};
diff --git a/build-system/tasks/performance/rewrite-analytics-tags.js b/build-system/tasks/performance/rewrite-analytics-tags.js
deleted file mode 100644
index 85b922906246..000000000000
--- a/build-system/tasks/performance/rewrite-analytics-tags.js
+++ /dev/null
@@ -1,106 +0,0 @@
-const fs = require('fs');
-const {
-  CONTROL,
-  EXPERIMENT,
-  getLocalVendorConfig,
-  urlToCachePath,
-} = require('./helpers');
-
-/**
- * Return local vendor config.
- *
- * @param {string} vendor
- * @return {Promise<Object>}
- */
-async function getVendorConfig(vendor) {
-  return JSON.parse(await getLocalVendorConfig(vendor));
-}
-
-/**
- * Fetch the vendor config and merge it with inline config.
- * Work around for fetching real vendor config that gets blocked
- * by AMP-analytics. Order of merging matters. Uses local config
- * for both CONTROL and EXPERIMENT.
- *
- * @param {Element} tag
- * @param {Object} script
- * @return {Promise<Object>}
- */
-async function maybeMergeAndRemoveVendorConfig(tag, script) {
-  const vendor = tag.getAttribute('type');
-  if (vendor) {
-    tag.removeAttribute('type');
-    const vendorConfig = await getVendorConfig(vendor);
-    // TODO (micajuineho) replace with analytics/config.js merge objects
-    return Object.assign(vendorConfig, script);
-  }
-  return script;
-}
-
-/**
- * Adds extraUrlParam in analytics inline config and
- * fetches and merges local vendor config.
- *
- * @param {string} url
- * @param {string} version
- * @param {?object} extraUrlParams
- * @return {Promise<void>}
- */
-async function alterAnalyticsTags(url, version, extraUrlParams) {
-  const cachePath = urlToCachePath(url, version);
-  const document = fs.readFileSync(cachePath);
-  const {JSDOM} = await import('jsdom'); // Lazy-imported to speed up task loading.
-  const dom = new JSDOM(document);
-
-  const analyticsTags = Array.from(
-    dom.window.document.querySelectorAll('amp-analytics')
-  );
-  for (const tag of analyticsTags) {
-    const scriptTag = tag.querySelector('script');
-    let script = {};
-    if (scriptTag) {
-      tag.removeChild(scriptTag);
-      script = JSON.parse(scriptTag./*OK*/ innerHTML);
-    }
-    script.extraUrlParams = script.extraUrlParams || {};
-    Object.assign(script.extraUrlParams, extraUrlParams);
-    script = await maybeMergeAndRemoveVendorConfig(tag, script);
-    const newScriptTag = dom.window.document.createElement('script');
-    newScriptTag.textContent = JSON.stringify(script);
-    newScriptTag.setAttribute('type', 'application/json');
-    tag.appendChild(newScriptTag);
-  }
-
-  fs.writeFileSync(cachePath, dom.serialize());
-}
-
-/**
- * Rewrite analytics configs for each document
- * downloaded from the analytics or ads handler urls
- * @param {?Object} handlers
- * @return {Promise<void[]>}
- */
-async function rewriteAnalyticsConfig(handlers) {
-  const handlerPromises = [];
-  handlers.forEach((handler) => {
-    const {adsUrls, extraUrlParam, handlerName, urls} = handler;
-    if (handlerName !== 'analyticsHandler' && handlerName !== 'adsHandler') {
-      return;
-    }
-
-    if (adsUrls) {
-      urls.push(...adsUrls);
-    }
-
-    const handlerPromise = urls.flatMap((url) => [
-      alterAnalyticsTags(url, CONTROL, extraUrlParam),
-      alterAnalyticsTags(url, EXPERIMENT, extraUrlParam),
-    ]);
-
-    handlerPromises.push(handlerPromise);
-  });
-
-  return Promise.all(handlerPromises);
-}
-
-module.exports = rewriteAnalyticsConfig;
diff --git a/build-system/tasks/performance/rewrite-script-tags.js b/build-system/tasks/performance/rewrite-script-tags.js
deleted file mode 100644
index 412c7c864fb0..000000000000
--- a/build-system/tasks/performance/rewrite-script-tags.js
+++ /dev/null
@@ -1,106 +0,0 @@
-const fs = require('fs');
-const {
-  CDN_URL,
-  CONTROL,
-  DEFAULT_EXTENSIONS,
-  EXPERIMENT,
-  INABOX_PATH,
-  LOCAL_PATH_REGEXP,
-  V0_PATH,
-  copyToCache,
-  downloadToDisk,
-  getLocalPathFromExtension,
-  urlToCachePath,
-} = require('./helpers');
-
-/**
- * Lookup URL from cache and rewrite URLs to build from working branch
- *
- * @param {string} url
- * @return {Promise<void>}
- */
-async function useLocalScripts(url) {
-  const cachePath = urlToCachePath(url, EXPERIMENT);
-  const document = fs.readFileSync(cachePath);
-  const {JSDOM} = await import('jsdom'); // Lazy-imported to speed up task loading.
-  const dom = new JSDOM(document);
-
-  const scripts = Array.from(dom.window.document.querySelectorAll('script'));
-  for (const script of scripts) {
-    const matchArray = script.src.match(LOCAL_PATH_REGEXP);
-    // These cases handle real world websites and locally hosted websites
-    if (script.src.startsWith(CDN_URL)) {
-      const split = script.src.split(CDN_URL)[1];
-      script.src = await copyToCache(split);
-    } else if (matchArray) {
-      script.src = await copyToCache(matchArray[1]);
-    } else if (script.src === V0_PATH) {
-      script.src = await copyToCache('v0.js');
-    } else if (script.src === INABOX_PATH) {
-      script.src = await copyToCache('amp4ads-v0.js');
-    }
-  }
-
-  fs.writeFileSync(cachePath, dom.serialize());
-}
-
-/**
- * Lookup URL from cache and download scripts to cache and rewrite URLs to local
- * copy
- *
- * @param {string} url
- * @return {Promise<void>}
- */
-async function useRemoteScripts(url) {
-  const cachePath = urlToCachePath(url, CONTROL);
-  const document = fs.readFileSync(cachePath);
-  const {JSDOM} = await import('jsdom'); // Lazy-imported to speed up task loading.
-  const dom = new JSDOM(document);
-
-  const scripts = Array.from(dom.window.document.querySelectorAll('script'));
-  for (const script of scripts) {
-    const matchArray = script.src.match(LOCAL_PATH_REGEXP);
-    // These cases handle real world websites and locally hosted websites
-    if (script.src.startsWith(CDN_URL)) {
-      script.src = await downloadToDisk(script.src);
-    } else if (matchArray) {
-      script.src = await downloadToDisk(CDN_URL + matchArray[1]);
-    } else if (script.src === V0_PATH) {
-      script.src = await downloadToDisk(CDN_URL + 'v0.js');
-    } else if (script.src === INABOX_PATH) {
-      script.src = await downloadToDisk(CDN_URL + 'amp4ads-v0.js');
-    }
-  }
-
-  fs.writeFileSync(cachePath, dom.serialize());
-}
-
-/**
- * Download default extensions that are not explicility stated by script tags in
- * the HTML.
- * @return {Promise<string[]>}
- */
-async function downloadDefaultExtensions() {
-  return Promise.all(
-    DEFAULT_EXTENSIONS.flatMap((extension) => {
-      const localPath = getLocalPathFromExtension(extension);
-      const cdnUrl = CDN_URL + localPath;
-      return [downloadToDisk(cdnUrl), copyToCache(localPath)];
-    })
-  );
-}
-
-/**
- * Rewrite script tags for each document downloaded from the urls
- *
- * @param {!Array<string>} urls
- * @return {Promise<void[]>}
- */
-async function rewriteScriptTags(urls) {
-  await downloadDefaultExtensions();
-  return Promise.all(
-    urls.flatMap((url) => [useLocalScripts(url), useRemoteScripts(url)])
-  );
-}
-
-module.exports = rewriteScriptTags;
diff --git a/build-system/tasks/performance/run-tests.js b/build-system/tasks/performance/run-tests.js
deleted file mode 100644
index 96d0a98929d3..000000000000
--- a/build-system/tasks/performance/run-tests.js
+++ /dev/null
@@ -1,17 +0,0 @@
-const Mocha = require('mocha');
-const path = require('path');
-const TEST_SUITE_PATH = 'build-system/tasks/performance/test-suite.js';
-
-/**
- * @param {function} resolver
- */
-function runTests(resolver) {
-  const mocha = new Mocha();
-  mocha.addFile(path.join('./', TEST_SUITE_PATH));
-  mocha.run(async (failures) => {
-    process.exitCode = failures ? 1 : 0;
-    await resolver();
-  });
-}
-
-module.exports = runTests;
diff --git a/build-system/tasks/performance/stats.js b/build-system/tasks/performance/stats.js
deleted file mode 100644
index 542f6a0ff741..000000000000
--- a/build-system/tasks/performance/stats.js
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * Get the average of an array
- *
- * @param {Array<number>} array
- * @return {number} average
- */
-const average = (array) => {
-  if (!array || array.length == 0) {
-    return 0;
-  }
-  return array.reduce((a, b) => a + b) / array.length;
-};
-
-/**
- * Sort an array from low to high
- *
- * @param {Array<number>} array
- * @return {Array<number>} array
- */
-const sort = (array) => {
-  return array.sort((a, b) => a - b);
-};
-
-/**
- * Get the median of a sorted array
- *
- * @param {Array<number>} array
- * @return {number} median
- */
-const median = (array) => {
-  sort(array);
-  const {length} = array;
-  const mid = Math.floor(length / 2);
-  const isEven = length % 2 == 0;
-  if (isEven) {
-    return average([array[mid], array[mid - 1]]);
-  }
-  return array[mid];
-};
-
-/**
- * Get the median of the lower half of a sorted array
- *
- * @param {Array<number>} array
- * @return {number} q1
- */
-const q1 = (array) => {
-  sort(array);
-  const mid = Math.ceil(array.length / 2);
-  const half = array.slice(0, mid);
-  return median(half);
-};
-
-/**
- * Get the median of the upper half of a sorted array
- *
- * @param {Array<number>} array
- * @return {number} q3
- */
-const q3 = (array) => {
-  sort(array);
-  const mid = Math.floor(array.length / 2);
-  const half = array.slice(mid);
-  return median(half);
-};
-
-/**
- * Get the percentage change between two numbers,
- * or returns null if invalid
- *
- * @param {number} a
- * @param {number} b
- * @return {?number} percentage change or null
- */
-function percent(a, b) {
-  if (a === 0) {
-    return b === 0 ? null : Math.round((a / b) * 100) - 100;
-  } else {
-    return 100 - Math.round((b / a) * 100);
-  }
-}
-
-/**
- * Given an array, identify outliers using the Tukey method,
- * and return the average after removing them, which is
- * also known as the interquartile mean.
- *
- * @param {Array<*>} results
- * @param {string} metric
- * @return {number}
- */
-function trimmedMean(results, metric) {
-  const array = results.map((a) => a[metric]);
-  const stats = {
-    q1: q1(array),
-    q3: q3(array),
-  };
-  const lowerFence = stats.q1 - 1.5 * (stats.q3 - stats.q1);
-  const upperFence = stats.q3 + 1.5 * (stats.q3 - stats.q1);
-  const trimmedArray = array.filter((a) => a >= lowerFence && a <= upperFence);
-
-  return Math.round(average(trimmedArray));
-}
-
-module.exports = {
-  percent,
-  trimmedMean,
-};
diff --git a/build-system/tasks/performance/test-suite.js b/build-system/tasks/performance/test-suite.js
deleted file mode 100644
index 4d884ae4cb82..000000000000
--- a/build-system/tasks/performance/test-suite.js
+++ /dev/null
@@ -1,20 +0,0 @@
-const argv = require('minimist')(process.argv.slice(2));
-const loadConfig = require('./load-config');
-const {expect} = require('chai');
-const {getReport} = require('./print-report');
-// Set threshold to 1.05 by default
-const DEFAULT_THRESHOLD = 1.05;
-const THRESHOLD = argv.threshold ? argv.threshold + 1 : DEFAULT_THRESHOLD;
-
-const {urlToHandlers} = loadConfig();
-const reports = getReport(Object.keys(urlToHandlers));
-
-reports.forEach((report) => {
-  describe(`${report.url}`, () => {
-    report.metrics.forEach(({control, experiment}, name) => {
-      it(`${name}`, () => {
-        expect(experiment).to.be.at.most(control * THRESHOLD);
-      });
-    });
-  });
-});
diff --git a/build-system/tasks/pr-deploy-bot-utils.js b/build-system/tasks/pr-deploy-bot-utils.js
deleted file mode 100644
index 9a037d85b3e1..000000000000
--- a/build-system/tasks/pr-deploy-bot-utils.js
+++ /dev/null
@@ -1,86 +0,0 @@
-'use strict';
-
-const fetch = require('node-fetch');
-const fs = require('fs-extra');
-const path = require('path');
-const {ciBuildSha, circleciBuildNumber} = require('../common/ci');
-const {cyan} = require('kleur/colors');
-const {getLoggingPrefix, logWithoutTimestamp} = require('../common/logging');
-const {replaceUrls: replaceUrlsAppUtil} = require('../server/app-utils');
-
-const hostNamePrefix = 'https://storage.googleapis.com/amp-test-website-1';
-const prDeployBotBaseUrl =
-  'https://amp-pr-deploy-bot.appspot.com/v0/pr-deploy/';
-
-/**
- * @param {string} dest
- * @return {Promise<string[]>}
- */
-async function walk(dest) {
-  const filelist = [];
-  const files = await fs.readdir(dest);
-
-  for (let i = 0; i < files.length; i++) {
-    const file = `${dest}/${files[i]}`;
-
-    fs.statSync(file).isDirectory()
-      ? Array.prototype.push.apply(filelist, await walk(file))
-      : filelist.push(file);
-  }
-
-  return filelist;
-}
-
-/**
- * @return {string}
- */
-function getBaseUrl() {
-  return `${hostNamePrefix}/amp_nomodule_${ciBuildSha()}`;
-}
-
-/**
- * @param {string} filePath
- * @return {Promise<void>}
- */
-async function replace(filePath) {
-  const data = await fs.readFile(filePath, 'utf8');
-  const hostName = getBaseUrl();
-  const result = replaceUrlsAppUtil('minified', data, hostName);
-
-  await fs.writeFile(filePath, result, 'utf8');
-}
-
-/**
- * @param {string} dir
- * @return {Promise<void>}
- */
-async function replaceUrls(dir) {
-  const files = await walk(dir);
-  const promises = files
-    .filter((fileName) => path.extname(fileName) == '.html')
-    .map((file) => replace(file));
-  await Promise.all(promises);
-}
-
-/**
- * @param {string} result
- * @return {Promise<void>}
- */
-async function signalPrDeployUpload(result) {
-  const loggingPrefix = getLoggingPrefix();
-  logWithoutTimestamp(
-    `${loggingPrefix} Reporting`,
-    cyan(result),
-    'to the pr-deploy GitHub App...'
-  );
-  const sha = ciBuildSha();
-  const maybeJobId = result == 'success' ? `/${circleciBuildNumber()}` : '';
-  const url = `${prDeployBotBaseUrl}headshas/${sha}/${result}${maybeJobId}`;
-  await fetch(url, {method: 'POST'});
-}
-
-module.exports = {
-  getBaseUrl,
-  replaceUrls,
-  signalPrDeployUpload,
-};
diff --git a/build-system/tasks/prepend-global/index.js b/build-system/tasks/prepend-global/index.js
index 71cafca407cb..c9ba5a7a5d6c 100644
--- a/build-system/tasks/prepend-global/index.js
+++ b/build-system/tasks/prepend-global/index.js
@@ -198,7 +198,7 @@ async function getConfig(
  * Returns an empty string if no AMP_CONFIG is necessary.
  *
  * @param {string} filename the file being operated on.
- * @param {Object} options
+ * @param {object} options
  * @return {!Promise<string>}
  */
 async function getAmpConfigForFile(filename, options) {
diff --git a/build-system/tasks/prettify.js b/build-system/tasks/prettify.js
index 877555ccf6f1..65f246fdb6bf 100644
--- a/build-system/tasks/prettify.js
+++ b/build-system/tasks/prettify.js
@@ -65,7 +65,7 @@ async function printErrorWithSuggestedFixes(file) {
   log(`Suggested fixes for ${cyan(file)}:`);
   const options = await getOptions(file);
   const original = fs.readFileSync(file).toString();
-  const fixed = prettier.format(original, options);
+  const fixed = await prettier.format(original, options);
   const fixedFile = `${tempDir}/${file}`;
   fs.ensureDirSync(path.dirname(fixedFile));
   fs.writeFileSync(fixedFile, fixed);
@@ -114,7 +114,7 @@ async function runPrettify(filesToCheck) {
     const options = await getOptions(file);
     const original = fs.readFileSync(file).toString();
     if (argv.fix) {
-      const fixed = prettier.format(original, options);
+      const fixed = await prettier.format(original, options);
       if (fixed != original) {
         fs.writeFileSync(file, fixed);
       }
diff --git a/build-system/tasks/release/index.js b/build-system/tasks/release/index.js
index c173ec7a057a..c5c79680dc2e 100644
--- a/build-system/tasks/release/index.js
+++ b/build-system/tasks/release/index.js
@@ -32,7 +32,6 @@ let DistFlavorDef;
 const argv = require('minimist')(process.argv.slice(2));
 /** @type {ExperimentsConfigDef} */
 const experimentsConfig = require('../../global-configs/experiments-config.json');
-const fetch = require('node-fetch');
 const fs = require('fs-extra');
 const klaw = require('klaw');
 const path = require('path');
@@ -248,6 +247,9 @@ async function compileDistFlavors_(flavorType, command, tempDir) {
   if (argv.esm) {
     command += ' --esm';
   }
+  if (argv.full_sourcemaps) {
+    command += ' --full_sourcemaps';
+  }
   log('Compiling flavor', green(flavorType), 'using', cyan(command));
 
   execOrDie('amp clean --exclude release');
@@ -316,10 +318,19 @@ async function fetchAmpSw_(flavorType, tempDir) {
     filter: (path) => path.startsWith('package/dist'),
     strip: 2, // to strip "package/dist/".
   });
-  (await fetch(ampSwTarballUrl)).body.pipe(tarWritableStream);
-  await new Promise((resolve) => {
-    tarWritableStream.on('end', resolve);
-  });
+  const tarballResponse = await fetch(ampSwTarballUrl);
+  if (!tarballResponse.body) {
+    throw new Error(`Failed to fetch ${ampSwTarballUrl}`);
+  }
+  const reader = tarballResponse.body.getReader();
+  while (true) {
+    const {done, value} = await reader.read();
+    if (done) {
+      break;
+    }
+    tarWritableStream.write(value);
+  }
+  tarWritableStream.end();
 
   await fs.copy(ampSwTempDir, path.join(tempDir, flavorType, 'dist/sw'));
 
@@ -464,7 +475,9 @@ async function prependConfig_(outputDir) {
     const channelPartialConfig = {
       v: rtvNumber,
       type: channelConfig.type,
-      ...require(`../../global-configs/${channelConfig.configBase}-config.json`),
+      ...require(
+        `../../global-configs/${channelConfig.configBase}-config.json`
+      ),
       ...overlayConfig,
     };
 
@@ -483,7 +496,8 @@ async function prependConfig_(outputDir) {
           ...target.config,
         });
 
-        const contents = await fs.readFile(targetPath, 'utf-8');
+        const contents = await fs.readFile(targetPath, 'utf8');
+
         return fs.writeFile(
           targetPath,
           `self.AMP_CONFIG=${channelConfig};/*AMP_CONFIG*/${contents}`
@@ -518,7 +532,7 @@ async function populateNetWildcard_(tempDir, outputDir) {
  * @return {Promise<void>}
  */
 async function cleanup_(tempDir) {
-  await fs.rmdir(tempDir, {recursive: true});
+  await fs.rm(tempDir, {recursive: true});
 
   logSeparator_();
 }
@@ -590,6 +604,7 @@ release.flags = {
   'flavor':
     'Limit this release build to a single flavor (can be used to split the release work across multiple build machines)',
   'esm': 'Compile with --esm if true, without --esm if false or unspecified',
+  'full_sourcemaps': 'Include source code content in sourcemaps',
   'dedup_v0':
     'Removes duplicate copies of the v0/ subdirectory when they are the same files as those in the Stable (01-prefixed) channel',
 };
diff --git a/build-system/tasks/remap-dependencies-plugin/remap-dependencies.js b/build-system/tasks/remap-dependencies-plugin/remap-dependencies.js
new file mode 100644
index 000000000000..613344b56fc9
--- /dev/null
+++ b/build-system/tasks/remap-dependencies-plugin/remap-dependencies.js
@@ -0,0 +1,110 @@
+const path = require('path');
+const {resolvePath} = require('../../babel-config/import-resolver');
+
+/**
+ * Generates a plugin to remap the dependencies of a JS bundle.
+ *
+ * `remaps` is an object where each entry indicates that the module identified by the key should be remapped to the module identified by the value.
+ *  Modules (in key or value) can be local modules (js/jsx/ts/tsx files in the repo) or npm modules (in the node_modules at the root of the repo).
+ *  Local modules must be declared as a relative-path, relative to repo root, with a leading './' (e.g './mod1.js'). They don't need a file extension.
+ *  Keys can use regex syntax.
+ *
+ * `externals` is a list of strings representing import paths that should be external-ized
+ *
+ * `resolve` is function that will return the absolute path of a module given the import path, directory of the importer, and repo root
+ * @param {{remaps: Object, externals: Array<string>, resolve: AmpResolve}} remapDependenciesPluginConfig
+ * @return {object}
+ */
+function remapDependenciesPlugin({externals, remaps, resolve}) {
+  const remapArr = Object.entries(remaps).map(([path, value]) => ({
+    regex: new RegExp(`^${path}(\\.[jt]sx?)?$`),
+    value,
+  }));
+  const rootDir = process.cwd();
+
+  return {
+    name: 'remap-dependencies',
+    setup(build) {
+      build.onResolve({filter: /.*/}, (args) =>
+        onResolveRemapDeps(
+          {
+            externals,
+            remapArr,
+            resolve,
+            rootDir,
+          },
+          args
+        )
+      );
+    },
+  };
+}
+
+/**
+ * Checks if the path that's being imported matches a declared remap.
+ * If import path matches, returns correct path with info on if it's an external.
+ * If not, returns undefined
+ * @param {{externals: string[], remapArr: Array<*>, resolve: AmpResolve, rootDir: string}} remapConfig
+ * @param {{resolveDir: string, path: string}} args
+ * @return {*}
+ */
+function onResolveRemapDeps({externals, remapArr, resolve, rootDir}, args) {
+  const {path: importPath, resolveDir} = args;
+
+  // Construct candidate for remapping
+  // If importing local module, must resolve module relative to repo-root and prefix with `./`
+  // because local modules listed in `remap` keys use relative paths from the repo-root
+  let dep;
+  if (importPath.startsWith('.')) {
+    const absPath = resolve(importPath, resolveDir, rootDir);
+    dep = `.${path.posix.sep}${path.posix.relative(rootDir, absPath)}`;
+  } else {
+    dep = importPath;
+  }
+
+  for (const {regex, value} of remapArr) {
+    if (!regex.test(dep)) {
+      continue;
+    }
+
+    const isExternal = externals.includes(value);
+    return {
+      // resolve value from rootDir in case value is a local module (local module routes are relative to repo root)
+      path: isExternal ? value : resolve(value, rootDir, rootDir),
+      external: isExternal,
+    };
+  }
+}
+
+/**
+ * @typedef {typeof ampResolve} AmpResolve
+ */
+
+/**
+ * Resolves mostly arbitrary import paths to (node or local) modules.
+ * Similar to require.resolve() but handles aliased paths and paths to non-js modules (jsx/ts/tsx).
+ *
+ * @param {string} importPath path to the import relative to importer
+ * @param {string} absResolveDir absolute path to directory of the importer
+ * @param {string} absRootDir absolute path to repo's root
+ * @return {string} absolute path to import
+ */
+function ampResolve(importPath, absResolveDir, absRootDir) {
+  const absImportPath = path.posix.join(absResolveDir, importPath);
+  const rootRelImportPath = path.posix.relative(absRootDir, absImportPath);
+  const babelResolvePath = resolvePath(rootRelImportPath, null);
+  if (babelResolvePath) {
+    return path.posix.join(absRootDir, babelResolvePath);
+  } else {
+    try {
+      return require.resolve(importPath);
+    } catch (e) {
+      return path.posix.resolve(importPath);
+    }
+  }
+}
+
+module.exports = {
+  remapDependenciesPlugin,
+  ampResolve,
+};
diff --git a/build-system/tasks/remap-dependencies-plugin/test-remap-dependencies.js b/build-system/tasks/remap-dependencies-plugin/test-remap-dependencies.js
new file mode 100644
index 000000000000..fd23bdd51d00
--- /dev/null
+++ b/build-system/tasks/remap-dependencies-plugin/test-remap-dependencies.js
@@ -0,0 +1,254 @@
+'use strict';
+
+const test = require('ava');
+const sinon = require('sinon');
+const path = require('path');
+const {remapDependenciesPlugin} = require('./remap-dependencies');
+
+/**
+ * slightly complex but mocks ampResolve() which is itself complex
+ * handles resolving node modules by returning input
+ * handles resolving local paths by
+ *  ensuring it's prefixed with './'
+ *  ensuring it resolves barrel files (ie. directory imports) by
+ *    suffixing filepath with '/index' and appropriate file extension
+ */
+const resolveMock = sinon.fake((s, resolveDir, unusedAbsRootDir) => {
+  if (s.startsWith('#')) {
+    // do nothing
+    // technically ampResolve handles aliased paths, but I'm not mocking it since this functionality isn't actually used in the remap-dependencies plugin
+    // esbuild should have already resolved path aliases because it adheres to tsconfig.compilerOptions.paths config (https://esbuild.github.io/content-types/#tsconfig-json)
+  } else if (s.startsWith('node-mod-')) {
+    // return input if it's a node module (use special "node-mod-" prefix in tests to indicate node module)
+    // later we will assert that we resolved to the node-mod-
+    return s;
+  } else {
+    // handle directory imports with barrel file and appropriate file extension to emulate behavior of resolvePath
+    s = path.posix.join(resolveDir, s);
+    if (s.match(/((js|jsx|ts|tsx)-)?dir\d?\/?(index)?$/)) {
+      // return barrel file if importing a directory (use special "dir" in tests to indicate path to directory)
+      const [, , fileType, indexStr] = s.match(
+        /((js|jsx|ts|tsx)-)?dir\d?\/?(index)?$/
+      );
+      if (!indexStr) {
+        s = path.posix.join(s, '/index');
+      }
+      s += `.${fileType || 'js'}`;
+    }
+    // handle file imports with appropriate file extension to emulate behavior of resolvePath
+    if (s.match(/\/((js|jsx|ts|tsx)-)?mod\d?$/)) {
+      const fileType = s.match(/\/((js|jsx|ts|tsx)-)?mod\d?$/)[2];
+      s += `.${fileType || 'js'}`;
+    }
+    return s;
+  }
+});
+
+/**
+ * @param {Array<string>} externals
+ * @param {object} remaps
+ * @return {*}
+ */
+function setup(externals, remaps) {
+  // indicates that a particular path was resolved relative to the root of the directory
+  const plugin = remapDependenciesPlugin({
+    externals,
+    remaps,
+    resolve: resolveMock,
+  });
+  const onResolveSpy = sinon.spy();
+  plugin.setup({onResolve: onResolveSpy});
+  const onResolve = onResolveSpy.getCall(0).args[1];
+  return onResolve;
+}
+
+test.afterEach(() => {
+  // Restore the default sandbox here
+  sinon.restore();
+});
+
+const rootDir = path.join(__dirname, '../../..');
+
+test('remap node modules to other node modules', (t) => {
+  const onResolve = setup(['node-mod-A', 'node-mod-C'], {
+    // multiple mods to same external mod
+    'node-mod-1': 'node-mod-A',
+    'node-mod-2': 'node-mod-A',
+
+    // multiple mods to same bundled mod
+    'node-mod-3': 'node-mod-B',
+    'node-mod-4': 'node-mod-B',
+
+    // single mod to external mod
+    'node-mod-5': 'node-mod-C',
+
+    // single mod to bundled mod
+    'node-mod-6': 'node-mod-D',
+  });
+
+  const res1 = onResolve({path: 'node-mod-1'});
+  t.is(res1?.path, 'node-mod-A');
+  t.is(res1?.external, true);
+
+  const res2 = onResolve({path: 'node-mod-2'});
+  t.is(res2?.path, 'node-mod-A');
+  t.is(res2?.external, true);
+
+  const res3 = onResolve({path: 'node-mod-3'});
+  t.is(res3?.path, 'node-mod-B');
+  t.is(res3?.external, false);
+
+  const res4 = onResolve({path: 'node-mod-4'});
+  t.is(res4?.path, 'node-mod-B');
+  t.is(res4?.external, false);
+
+  const res5 = onResolve({path: 'node-mod-5'});
+  t.is(res5?.path, 'node-mod-C');
+  t.is(res5?.external, true);
+
+  const res6 = onResolve({path: 'node-mod-6'});
+  t.is(res6?.path, 'node-mod-D');
+  t.is(res6?.external, false);
+
+  // remapping module with no remaps should return undefined
+  t.is(onResolve({path: 'node-mod-0'}), undefined);
+});
+
+test('remap local modules to node modules', (t) => {
+  const onResolve = setup(['node-mod-A', 'node-mod-C'], {
+    // multiple mods => same external mod
+    './mod1': 'node-mod-A',
+    './mod2.js': 'node-mod-A',
+
+    // multiple mods => same bundled mod
+    './mod3.js': 'node-mod-B',
+    './mod4.js': 'node-mod-B',
+
+    // single mod => external mod
+    './mod5.js': 'node-mod-C',
+
+    // single mod => bundled mod
+    './mod6.js': 'node-mod-D',
+
+    // handle directory imports (with various types of barrel files) => external mod
+    './src/1/dir/index.js': 'node-mod-A',
+    './src/1/js-dir/index.js': 'node-mod-A',
+    './src/1/jsx-dir/index.jsx': 'node-mod-A',
+    './src/1/ts-dir/index.ts': 'node-mod-A',
+    './src/1/tsx-dir/index.tsx': 'node-mod-A',
+
+    // handle directory imports (with various types of barrel files) => bundled mod
+    './src/2/dir/index.js': 'node-mod-B',
+    './src/2/js-dir/index.js': 'node-mod-B',
+    './src/2/jsx-dir/index.jsx': 'node-mod-B',
+    './src/2/ts-dir/index.ts': 'node-mod-B',
+    './src/2/tsx-dir/index.tsx': 'node-mod-B',
+
+    './src/3/dir/index': 'node-mod-A',
+    './src/4/dir/index': 'node-mod-B',
+  });
+
+  // test various types of file imports
+  const res1 = onResolve({resolveDir: rootDir, path: './mod1'});
+  t.is(res1.path, 'node-mod-A');
+  t.is(res1.external, true);
+  const res2 = onResolve({resolveDir: rootDir, path: './mod2'});
+  t.is(res2.path, 'node-mod-A');
+  t.is(res2.external, true);
+  const res3 = onResolve({resolveDir: rootDir, path: './mod3'});
+  t.is(res3.path, 'node-mod-B');
+  t.is(res3.external, false);
+  const res4 = onResolve({resolveDir: rootDir, path: './mod4'});
+  t.is(res4.path, 'node-mod-B');
+  t.is(res4.external, false);
+  const res5 = onResolve({resolveDir: rootDir, path: './mod5'});
+  t.is(res5.path, 'node-mod-C');
+  t.is(res5.external, true);
+  const res6 = onResolve({resolveDir: rootDir, path: './mod6'});
+  t.is(res6.path, 'node-mod-D');
+  t.is(res6.external, false);
+  t.is(onResolve({resolveDir: rootDir, path: './mod0'}), undefined);
+
+  t.is(
+    onResolve({resolveDir: path.join(rootDir, './src/1/dir'), path: './'}).path,
+    'node-mod-A'
+  );
+
+  // test import local directory => external module
+  const dirRes1a = onResolve({resolveDir: rootDir, path: './src/1/dir/'});
+  t.is(dirRes1a.path, 'node-mod-A');
+  t.is(dirRes1a.external, true);
+  const dirRes1b = onResolve({resolveDir: rootDir, path: './src/1/js-dir/'});
+  t.is(dirRes1b.path, 'node-mod-A');
+  t.is(dirRes1b.external, true);
+  const dirRes1c = onResolve({resolveDir: rootDir, path: './src/1/jsx-dir/'});
+  t.is(dirRes1c.path, 'node-mod-A');
+  t.is(dirRes1c.external, true);
+  const dirRes1d = onResolve({resolveDir: rootDir, path: './src/1/ts-dir/'});
+  t.is(dirRes1d.path, 'node-mod-A');
+  t.is(dirRes1d.external, true);
+  const dirRes1e = onResolve({resolveDir: rootDir, path: './src/1/tsx-dir/'});
+  t.is(dirRes1e.path, 'node-mod-A');
+  t.is(dirRes1e.external, true);
+
+  const dirRes2a = onResolve({resolveDir: rootDir, path: './src/2/dir/'});
+  t.is(dirRes2a.path, 'node-mod-B');
+  t.is(dirRes2a.external, false);
+  const dirRes2b = onResolve({resolveDir: rootDir, path: './src/2/js-dir/'});
+  t.is(dirRes2b.path, 'node-mod-B');
+  t.is(dirRes2b.external, false);
+  const dirRes2c = onResolve({resolveDir: rootDir, path: './src/2/jsx-dir/'});
+  t.is(dirRes2c.path, 'node-mod-B');
+  t.is(dirRes2c.external, false);
+  const dirRes2d = onResolve({resolveDir: rootDir, path: './src/2/ts-dir/'});
+  t.is(dirRes2d.path, 'node-mod-B');
+  t.is(dirRes2d.external, false);
+  const dirRes2e = onResolve({resolveDir: rootDir, path: './src/2/tsx-dir/'});
+  t.is(dirRes2e.path, 'node-mod-B');
+  t.is(dirRes2e.external, false);
+
+  // test remaps with no file extensions
+  const resNoExtensionExternal = onResolve({
+    resolveDir: rootDir,
+    path: './src/3/dir/',
+  });
+  t.is(resNoExtensionExternal.path, 'node-mod-A');
+  t.is(resNoExtensionExternal.external, true);
+
+  const resNoExtensionBundled = onResolve({
+    resolveDir: rootDir,
+    path: './src/4/dir/',
+  });
+  t.is(resNoExtensionBundled.path, 'node-mod-B');
+  t.is(resNoExtensionBundled.external, false);
+});
+
+test('remap local modules to local modules', (t) => {
+  const onResolve = setup([], {
+    // multiple mods => same external mod
+    './mod1': './mod2',
+    './js-dir/mod1.js': './mod2.js',
+    './jsx-dir/mod1.jsx': './mod2.jsx',
+    './ts-dir/mod1.ts': './mod2.ts',
+    './tsx-dir/mod1.tsx': './mod2.tsx',
+  });
+
+  const expectations = {
+    'mod1': 'mod2.js',
+    'js-dir/mod1.js': 'mod2.js',
+    'jsx-dir/mod1.jsx': 'mod2.jsx',
+    'ts-dir/mod1.ts': 'mod2.ts',
+    'tsx-dir/mod1.tsx': 'mod2.tsx',
+  };
+
+  for (const imp in expectations) {
+    const val = expectations[imp];
+    t.is(
+      `.${path.posix.sep}${path.posix.relative(
+        rootDir,
+        onResolve({path: `.${path.posix.sep}${imp}`, resolveDir: rootDir}).path
+      )}`,
+      `.${path.posix.sep}${val}`
+    );
+  }
+});
diff --git a/build-system/tasks/runtime-test/custom-launchers.js b/build-system/tasks/runtime-test/custom-launchers.js
index 4ed58fd32838..bd96683d0aa1 100644
--- a/build-system/tasks/runtime-test/custom-launchers.js
+++ b/build-system/tasks/runtime-test/custom-launchers.js
@@ -29,8 +29,8 @@ const customLaunchers = {
     base: argv.headless
       ? 'ChromeHeadless'
       : argv.chrome_canary
-      ? 'ChromeCanary'
-      : 'Chrome',
+        ? 'ChromeCanary'
+        : 'Chrome',
     flags: argv.chrome_flags
       ? argv.chrome_flags.split(',').map((flag) => `--${flag}`)
       : DEFAULT_CHROME_FLAGS,
@@ -43,8 +43,7 @@ const customLaunchers = {
     flags: argv.headless ? ['-headless'] : [],
   },
   EdgeCustom: {
-    // TODO(rsimha): Switch from Beta to Stable once it's available.
-    base: argv.headless ? 'EdgeBetaHeadless' : 'EdgeBeta',
+    base: argv.headless ? 'EdgeHeadless' : 'Edge',
     flags: ['--no-sandbox', '--disable-gpu', '--disable-dev-shm-usage'],
   },
 };
diff --git a/build-system/tasks/runtime-test/helpers-unit.js b/build-system/tasks/runtime-test/helpers-unit.js
index ef90c941dcf7..67b7f26299e0 100644
--- a/build-system/tasks/runtime-test/helpers-unit.js
+++ b/build-system/tasks/runtime-test/helpers-unit.js
@@ -1,14 +1,15 @@
 'use strict';
 
+const config = require('../../../tsconfig.base.json');
 const fastGlob = require('fast-glob');
 const fs = require('fs');
 const listImportsExports = require('list-imports-exports');
-const minimatch = require('minimatch');
+const {minimatch} = require('minimatch');
 const path = require('path');
 const testConfig = require('../../test-configs/config');
 const {cyan, green} = require('kleur/colors');
 const {execOrDie} = require('../../common/exec');
-const {extensions, maybeInitializeExtensions} = require('../extension-helpers');
+const {EXTENSIONS, maybeInitializeExtensions} = require('../extension-helpers');
 const {gitDiffNameOnlyMain} = require('../../common/git');
 const {isCiBuild} = require('../../common/ci');
 const {log, logLocalDev} = require('../../common/logging');
@@ -32,20 +33,20 @@ function isLargeRefactor() {
  * Extracts extension info and creates a mapping from CSS files in different
  * source directories to their equivalent JS files in the 'build/' directory.
  *
- * @return {!Object<string, string>}
+ * @return {!{[key: string]: string}}
  */
 function extractCssJsFileMap() {
   execOrDie('amp css', {'stdio': 'ignore'});
-  maybeInitializeExtensions(extensions);
-  /** @type {Object<string, string>} */
+  maybeInitializeExtensions(EXTENSIONS);
+  /** @type {{[key: string]: string}} */
   const cssJsFileMap = {};
 
   /**
    * Adds an entry that maps a CSS file to a JS file
    *
-   * @param {Object} cssData
+   * @param {object} cssData
    * @param {string} cssBinaryName
-   * @param {Object} cssJsFileMap
+   * @param {object} cssJsFileMap
    */
   function addCssJsEntry(cssData, cssBinaryName, cssJsFileMap) {
     const cssFilePath =
@@ -55,8 +56,8 @@ function extractCssJsFileMap() {
     cssJsFileMap[cssFilePath] = jsFilePath;
   }
 
-  Object.keys(extensions).forEach((extension) => {
-    const cssData = extensions[extension];
+  Object.keys(EXTENSIONS).forEach((extension) => {
+    const cssData = EXTENSIONS[extension];
     if (cssData['hasCss']) {
       addCssJsEntry(cssData, cssData['name'], cssJsFileMap);
       if (cssData.hasOwnProperty('cssBinaries')) {
@@ -70,6 +71,27 @@ function extractCssJsFileMap() {
   return cssJsFileMap;
 }
 
+/**
+ * Returns the full path of an import after resolving aliases if necessary.
+ * During prefix matching, wildcard characters if any are dropped.
+ * @param {string} jsFile
+ * @param {string} file
+ * @return {string}
+ */
+function resolveImportAliases(jsFile, file) {
+  const {paths} = config.compilerOptions;
+  const importAliases = Object.keys(paths);
+  for (const alias of importAliases) {
+    const aliasPrefix = alias.replace('*', '');
+    const actualPrefix = paths[alias][0].replace('*', '');
+    if (file.startsWith(aliasPrefix)) {
+      return file.replace(aliasPrefix, actualPrefix).replace('./', '');
+    }
+  }
+  const jsFileDir = path.dirname(jsFile);
+  return path.resolve(jsFileDir, file);
+}
+
 /**
  * Returns the list of files imported by a JS file
  *
@@ -78,17 +100,13 @@ function extractCssJsFileMap() {
  */
 function getImports(jsFile) {
   const jsFileContents = fs.readFileSync(jsFile, 'utf8');
-  const {imports} = listImportsExports.parse(jsFileContents, [
-    'importAssertions',
-  ]);
+  const parsePlugins = ['importAssertions'];
+  const {imports} = listImportsExports.parse(jsFileContents, parsePlugins);
   const files = [];
-  const jsFileDir = path.dirname(jsFile);
   imports.forEach(function (file) {
-    const fullPath = path.resolve(jsFileDir, `${file}.js`);
-    if (fs.existsSync(fullPath)) {
-      const relativePath = path.relative(ROOT_DIR, fullPath);
-      files.push(relativePath);
-    }
+    const fullPath = resolveImportAliases(jsFile, file);
+    const relativePath = path.relative(ROOT_DIR, fullPath);
+    files.push(relativePath);
   });
   return files;
 }
@@ -97,7 +115,7 @@ function getImports(jsFile) {
  * Retrieves the set of JS source files that import the given CSS file.
  *
  * @param {string} cssFile
- * @param {!Object<string, string>} cssJsFileMap
+ * @param {!{[key: string]: string}} cssJsFileMap
  * @return {!Array<string>}
  */
 function getJsFilesFor(cssFile, cssJsFileMap) {
@@ -109,7 +127,10 @@ function getJsFilesFor(cssFile, cssJsFileMap) {
     });
     jsFilesInDir.forEach((jsFile) => {
       const jsFilePath = `${cssFileDir}/${jsFile}`;
-      if (getImports(jsFilePath).includes(cssJsFileMap[cssFile])) {
+      const jsImports = getImports(jsFilePath);
+      if (
+        jsImports.some((jsImport) => jsImport.includes(cssJsFileMap[cssFile]))
+      ) {
         jsFiles.push(jsFilePath);
       }
     });
@@ -191,7 +212,7 @@ function unitTestsToRun() {
     const filesImported = getImports(testFile);
     return (
       filesImported.filter(function (file) {
-        return srcFiles.includes(file);
+        return srcFiles.some((srcFile) => srcFile.includes(file));
       }).length > 0
     );
   }
diff --git a/build-system/tasks/runtime-test/helpers.js b/build-system/tasks/runtime-test/helpers.js
index f65e4fc9c934..8b73816f243e 100644
--- a/build-system/tasks/runtime-test/helpers.js
+++ b/build-system/tasks/runtime-test/helpers.js
@@ -135,7 +135,7 @@ function maybePrintArgvMessages() {
 }
 
 /**
- * @param {Object} browser
+ * @param {object} browser
  * @return {Promise<void>}
  * @private
  */
diff --git a/build-system/tasks/runtime-test/runtime-test-base.js b/build-system/tasks/runtime-test/runtime-test-base.js
index 880e3be687d3..212caba7c417 100644
--- a/build-system/tasks/runtime-test/runtime-test-base.js
+++ b/build-system/tasks/runtime-test/runtime-test-base.js
@@ -4,7 +4,7 @@ const argv = require('minimist')(process.argv.slice(2));
 const karmaConfig = require('../../test-configs/karma.conf');
 const {
   commonIntegrationTestPaths,
-  commonUnitTestPaths,
+  getCommonUnitTestPaths,
   integrationTestPaths,
   karmaHtmlFixturesPath,
   karmaJsPaths,
@@ -102,17 +102,17 @@ class RuntimeTestConfig {
   }
 
   /**
-   * Picks a browser config based on the the test type and command line flags.
+   * Picks a browser config based on the test type and command line flags.
    * Defaults to Chrome.
    */
   updateBrowsers() {
     const browser = argv.edge
       ? 'EdgeCustom'
       : argv.firefox
-      ? 'FirefoxCustom'
-      : argv.safari
-      ? 'SafariCustom'
-      : 'ChromeCustom';
+        ? 'FirefoxCustom'
+        : argv.safari
+          ? 'SafariCustom'
+          : 'ChromeCustom';
     Object.assign(this, {browsers: [browser], customLaunchers});
   }
 
@@ -133,19 +133,21 @@ class RuntimeTestConfig {
       this.junitReporter = {
         outputFile: `result-reports/${this.testType}.xml`,
         useBrowserName: false,
+        nameFormatter(_, result) {
+          return result.description.trim();
+        },
+        classNameFormatter(_, result) {
+          return result.suite
+            .map((s) => s.trim())
+            .filter(Boolean)
+            .join(' » ');
+        },
       };
     }
 
     if (argv.coverage) {
       this.reporters.push('coverage-istanbul');
     }
-
-    if (argv.report) {
-      this.reporters.push('json-result');
-      this.jsonResultReporter = {
-        outputFile: `result-reports/${this.testType}.json`,
-      };
-    }
   }
 
   /**
@@ -155,6 +157,7 @@ class RuntimeTestConfig {
   updateFiles() {
     switch (this.testType) {
       case 'unit':
+        const commonUnitTestPaths = getCommonUnitTestPaths();
         if (argv.files || argv.filelist) {
           this.files = commonUnitTestPaths
             .concat(getFilesFromArgv())
@@ -226,16 +229,19 @@ class RuntimeTestConfig {
     const babelPlugin = getEsbuildBabelPlugin(
       /* callerName */ 'test',
       /* enableCache */ true,
-      /* preSetup */ this.logBabelStart,
-      /* postLoad */ this.printBabelDot
+      {
+        preSetup: this.logBabelStart,
+        postLoad: this.printBabelDot,
+      }
     );
     this.esbuild = {
-      target: 'es5',
+      target: 'esnext', // We use babel for transpilation.
       define: {
         'process.env.NODE_DEBUG': 'false',
         'process.env.NODE_ENV': '"test"',
       },
       plugins: [importPathPlugin, babelPlugin],
+      mainFields: ['module', 'browser', 'main'],
       sourcemap: 'inline',
     };
   }
diff --git a/build-system/tasks/sourcemaps.js b/build-system/tasks/sourcemaps.js
new file mode 100644
index 000000000000..8898573634e5
--- /dev/null
+++ b/build-system/tasks/sourcemaps.js
@@ -0,0 +1,67 @@
+const argv = require('minimist')(process.argv.slice(2));
+const {
+  VERSION: internalRuntimeVersion,
+} = require('../compile/internal-version');
+const {posix: path} = require('path');
+const Remapping = require('@ampproject/remapping');
+const ResolveUri = require('@jridgewell/resolve-uri');
+
+/** @type {Remapping.default} */
+const remapping = /** @type {*} */ (Remapping);
+
+/** @type {ResolveUri.default} */
+const resolveUri = /** @type {*} */ (ResolveUri);
+
+/**
+ * @return {boolean}
+ */
+function includeSourcesContent() {
+  if (argv._.includes('dist')) {
+    return !!argv.full_sourcemaps;
+  }
+  return true;
+}
+
+/**
+ * @param {Array<Object|string>} mapChain
+ * @param {string} destFile
+ * @param {*} options
+ * @return {object}
+ */
+function massageSourcemaps(mapChain, destFile, options) {
+  const map = remapping(mapChain, () => null, !includeSourcesContent());
+  map.file = path.basename(destFile);
+  map.sourceRoot = getSourceRoot(options);
+  map.sources = map.sources.map((s) => {
+    // By default, sources are relative to the map. But we just added an
+    // absolute sourceRoot, and we do not want the file to be relative to that
+    // root.
+    return resolveUri(s || '', destFile);
+  });
+
+  return map;
+}
+
+/**
+ * Computes the base url for sourcemaps. Custom sourcemap URLs have placeholder
+ * {version} that should be replaced with the actual version. Also, ensures
+ * that a trailing slash exists.
+ * @param {object} options
+ * @return {string}
+ */
+function getSourceRoot(options) {
+  if (argv.sourcemap_url) {
+    return String(argv.sourcemap_url)
+      .replace(/\{version\}/g, internalRuntimeVersion)
+      .replace(/([^/])$/, '$1/');
+  }
+  if (options.fortesting || !argv._.includes('dist')) {
+    return 'http://localhost:8000/';
+  }
+  return `https://raw.githubusercontent.com/ampproject/amphtml/${internalRuntimeVersion}/`;
+}
+
+module.exports = {
+  massageSourcemaps,
+  includeSourcesContent,
+};
diff --git a/build-system/tasks/storybook/OWNERS b/build-system/tasks/storybook/OWNERS
index 865f2a015273..c32e50897786 100644
--- a/build-system/tasks/storybook/OWNERS
+++ b/build-system/tasks/storybook/OWNERS
@@ -6,7 +6,6 @@
     {
       owners: [
         {name: 'ampproject/wg-infra'},
-        {name: 'ampproject/wg-bento'},
         {name: 'ampproject/wg-components'},
         {name: 'ampproject/wg-performance'},
         {name: 'alanorozco', notify: true},
diff --git a/build-system/tasks/storybook/README.md b/build-system/tasks/storybook/README.md
index 89d6d1b3dc77..da0ebef90f31 100644
--- a/build-system/tasks/storybook/README.md
+++ b/build-system/tasks/storybook/README.md
@@ -12,28 +12,6 @@ Run `amp storybook -h` or see [testing.md](../../../docs/testing.md) for more la
 
 Follow these recommendations when [writing stories.](https://storybook.js.org/docs/guides/guide-preact/#step-4-write-your-stories)
 
-### Do not include `Bento` in Story titles
-
-Even though a component's name may include `Bento`, it should be excluded from the title for consistency with existing stories.
-
-✅ Do:
-
-```jsx
-export default {
-  title: 'Accordion',
-  component: BentoAccordion,
-};
-```
-
-🚫 Don't:
-
-```jsx
-export default {
-  title: 'BentoAccordion',
-  component: BentoAccordion,
-};
-```
-
 ### Identify `args` and `argTypes` exactly like their component properties
 
 Passing a value from a Control specified through `args` or `argTypes` without modification is implicit when spreading `{...args}`.
@@ -50,7 +28,7 @@ const MyStory = (args) => {
 MyStory.args = {
   width: 500,
   height: 200,
-  layout: 'responsive'
+  layout: 'responsive',
   'data-foo': 'bar',
 };
 ```
diff --git a/build-system/tasks/storybook/amp-env/main.js b/build-system/tasks/storybook/amp-env/main.js
deleted file mode 100644
index 6826dcd801ee..000000000000
--- a/build-system/tasks/storybook/amp-env/main.js
+++ /dev/null
@@ -1,29 +0,0 @@
-const {webpackConfigNoChunkTilde} = require('../env-utils');
-
-module.exports = {
-  stories: [
-    '../../../../src/builtins/storybook/*.amp.js',
-    '../../../../extensions/**/*.*/storybook/*.amp.js',
-  ],
-  addons: [
-    // TODO(alanorozco): AMP previews are loaded inside an iframe, so the a11y
-    // addon is not able to inspect the tree inside it. Its results are incorrect,
-    // since it only checks the structure of the outer iframe element.
-    // Enable this once we find a way to inspect the iframe document's tree.
-    // '@storybook/addon-a11y',
-    '@storybook/addon-viewport/register',
-    '@storybook/addon-controls/register',
-    // TODO(#35923): Remove addon-knobs once all stories are migrated to
-    // addon-controls (args/argTypes).
-    '@storybook/addon-knobs',
-    '@ampproject/storybook-addon',
-  ],
-  managerWebpack: (config) => {
-    return webpackConfigNoChunkTilde(config);
-  },
-  webpackFinal: (config) => {
-    // Disable entry point size warnings.
-    config.performance.hints = false;
-    return config;
-  },
-};
diff --git a/build-system/tasks/storybook/amp-env/register.js b/build-system/tasks/storybook/amp-env/register.js
deleted file mode 100644
index 4910119f7d60..000000000000
--- a/build-system/tasks/storybook/amp-env/register.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import {addons} from '@storybook/addons';
-
-/**
- * Register the AMP Storybook decorator addon
- */
-export function register() {
-  addons.register('amp/storybook', () => {});
-}
diff --git a/build-system/tasks/storybook/amp-env/webpack.config.js b/build-system/tasks/storybook/amp-env/webpack.config.js
deleted file mode 100644
index 01b8afda9ce9..000000000000
--- a/build-system/tasks/storybook/amp-env/webpack.config.js
+++ /dev/null
@@ -1,51 +0,0 @@
-const path = require('path');
-const {getRelativeAliasMap} = require('../../../babel-config/import-resolver');
-const {webpackConfigNoChunkTilde} = require('../env-utils');
-
-const rootDir = path.join(__dirname, '../../../..');
-
-module.exports = ({config}) => {
-  config.resolveLoader = {
-    modules: [
-      path.join(__dirname, '../node_modules'),
-      path.join(rootDir, 'node_modules'),
-    ],
-  };
-  config.resolve = {
-    modules: [
-      path.join(__dirname, '../node_modules'),
-      path.join(rootDir, 'node_modules'),
-    ],
-    alias: getRelativeAliasMap(rootDir),
-  };
-  config.module = {
-    rules: [
-      {
-        test: /\.jsx?$/,
-        loader: 'babel-loader',
-        exclude: /node_modules/,
-        query: {
-          presets: [
-            [
-              '@babel/preset-env',
-              {
-                bugfixes: true,
-                targets: {'browsers': ['Last 2 versions']},
-              },
-            ],
-            [
-              '@babel/preset-react',
-              {
-                pragma: 'Preact.createElement',
-                pragmaFrag: 'Preact.Fragment',
-                useSpread: true,
-              },
-            ],
-          ],
-        },
-      },
-    ],
-  };
-
-  return webpackConfigNoChunkTilde(config);
-};
diff --git a/build-system/tasks/storybook/env-utils.js b/build-system/tasks/storybook/env-utils.js
deleted file mode 100644
index e80c11f46591..000000000000
--- a/build-system/tasks/storybook/env-utils.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Change a Webpack config object so that filenames resulting from chunk
- * splitting do not include a tilde (~) character.
- * We do this since serving infrastructure does not play well with tildes.
- * See https://go.amp.dev/issue/30954#issuecomment-868679665
- * @param {Object} config
- * @return {Object}
- */
-function webpackConfigNoChunkTilde(config) {
-  // Change runtime filenames (like runtime~main.*)
-  if (config.optimization.runtimeChunk) {
-    config.optimization.runtimeChunk = {
-      name: ({name}) => `runtime-${name}`,
-    };
-  }
-  // Change all other chunked filenames (like vendors~main.*)
-  if (config.optimization.splitChunks) {
-    config.optimization.splitChunks.automaticNameDelimiter = '-';
-  }
-  return config;
-}
-
-module.exports = {
-  webpackConfigNoChunkTilde,
-};
diff --git a/build-system/tasks/storybook/env/amp/main.js b/build-system/tasks/storybook/env/amp/main.js
new file mode 100644
index 000000000000..25d84aed4b14
--- /dev/null
+++ b/build-system/tasks/storybook/env/amp/main.js
@@ -0,0 +1,26 @@
+const {getStaticDirs} = require('../static-dirs');
+
+const rootDir = '../../../../..';
+
+module.exports = {
+  staticDirs: getStaticDirs(rootDir),
+  stories: [
+    `${rootDir}/src/builtins/storybook/*.amp.js`,
+    `${rootDir}/extensions/**/*.*/storybook/*.amp.js`,
+  ],
+  addons: [
+    // TODO(alanorozco): AMP previews are loaded inside an iframe, so the a11y
+    // addon is not able to inspect the tree inside it. Its results are incorrect,
+    // since it only checks the structure of the outer iframe element.
+    // Enable this once we find a way to inspect the iframe document's tree.
+    // '@storybook/addon-a11y',
+    '@storybook/addon-viewport/register',
+    '@storybook/addon-controls/register',
+    '@ampproject/storybook-addon',
+  ],
+  webpackFinal: (config) => {
+    // Disable entry point size warnings.
+    config.performance.hints = false;
+    return config;
+  },
+};
diff --git a/build-system/tasks/storybook/env/amp/package-lock.json b/build-system/tasks/storybook/env/amp/package-lock.json
new file mode 100644
index 000000000000..ac4622f89778
--- /dev/null
+++ b/build-system/tasks/storybook/env/amp/package-lock.json
@@ -0,0 +1,1885 @@
+{
+  "name": "amp-storybook-amp",
+  "version": "0.1.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "amp-storybook-amp",
+      "version": "0.1.0",
+      "devDependencies": {
+        "@ampproject/storybook-addon": "1.1.10",
+        "preact": "10.25.4"
+      }
+    },
+    "node_modules/@ampproject/storybook-addon": {
+      "version": "1.1.10",
+      "resolved": "https://registry.npmjs.org/@ampproject/storybook-addon/-/storybook-addon-1.1.10.tgz",
+      "integrity": "sha512-0JYv7FYNcLSCpbHd+W/IwHkOBk7s6phnboNCbv0SS0hcylXuX5gD53/5661/pMQ8m3UZU7xaPFK9OiG0m8KTYA==",
+      "dev": true,
+      "dependencies": {
+        "@storybook/client-api": "6.4.19",
+        "preact": "10.6.5",
+        "preact-render-to-string": "5.1.19",
+        "react-dom": "17.0.2"
+      },
+      "peerDependencies": {
+        "@storybook/addons": "^6.4.18",
+        "@storybook/components": "^6.4.18",
+        "@storybook/theming": "^6.4.18",
+        "react": "^17.0.2"
+      }
+    },
+    "node_modules/@ampproject/storybook-addon/node_modules/preact": {
+      "version": "10.6.5",
+      "resolved": "https://registry.npmjs.org/preact/-/preact-10.6.5.tgz",
+      "integrity": "sha512-i+LXM6JiVjQXSt2jG2vZZFapGpCuk1fl8o6ii3G84MA3xgj686FKjs4JFDkmUVhtxyq21+4ay74zqPykz9hU6w==",
+      "dev": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/preact"
+      }
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz",
+      "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/highlight": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-imports": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz",
+      "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
+      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
+      "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz",
+      "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.22.5",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/runtime": {
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.6.tgz",
+      "integrity": "sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==",
+      "dev": true,
+      "dependencies": {
+        "regenerator-runtime": "^0.13.11"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/types": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz",
+      "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-string-parser": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.5",
+        "to-fast-properties": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@emotion/cache": {
+      "version": "10.0.29",
+      "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-10.0.29.tgz",
+      "integrity": "sha512-fU2VtSVlHiF27empSbxi1O2JFdNWZO+2NFHfwO0pxgTep6Xa3uGb+3pVKfLww2l/IBGLNEZl5Xf/++A4wAYDYQ==",
+      "dev": true,
+      "dependencies": {
+        "@emotion/sheet": "0.9.4",
+        "@emotion/stylis": "0.8.5",
+        "@emotion/utils": "0.11.3",
+        "@emotion/weak-memoize": "0.2.5"
+      }
+    },
+    "node_modules/@emotion/core": {
+      "version": "10.3.1",
+      "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.3.1.tgz",
+      "integrity": "sha512-447aUEjPIm0MnE6QYIaFz9VQOHSXf4Iu6EWOIqq11EAPqinkSZmfymPTmlOE3QjLv846lH4JVZBUOtwGbuQoww==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.5.5",
+        "@emotion/cache": "^10.0.27",
+        "@emotion/css": "^10.0.27",
+        "@emotion/serialize": "^0.11.15",
+        "@emotion/sheet": "0.9.4",
+        "@emotion/utils": "0.11.3"
+      },
+      "peerDependencies": {
+        "react": ">=16.3.0"
+      }
+    },
+    "node_modules/@emotion/css": {
+      "version": "10.0.27",
+      "resolved": "https://registry.npmjs.org/@emotion/css/-/css-10.0.27.tgz",
+      "integrity": "sha512-6wZjsvYeBhyZQYNrGoR5yPMYbMBNEnanDrqmsqS1mzDm1cOTu12shvl2j4QHNS36UaTE0USIJawCH9C8oW34Zw==",
+      "dev": true,
+      "dependencies": {
+        "@emotion/serialize": "^0.11.15",
+        "@emotion/utils": "0.11.3",
+        "babel-plugin-emotion": "^10.0.27"
+      }
+    },
+    "node_modules/@emotion/hash": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz",
+      "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==",
+      "dev": true
+    },
+    "node_modules/@emotion/is-prop-valid": {
+      "version": "0.8.8",
+      "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz",
+      "integrity": "sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==",
+      "dev": true,
+      "dependencies": {
+        "@emotion/memoize": "0.7.4"
+      }
+    },
+    "node_modules/@emotion/memoize": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz",
+      "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==",
+      "dev": true
+    },
+    "node_modules/@emotion/serialize": {
+      "version": "0.11.16",
+      "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-0.11.16.tgz",
+      "integrity": "sha512-G3J4o8by0VRrO+PFeSc3js2myYNOXVJ3Ya+RGVxnshRYgsvErfAOglKAiy1Eo1vhzxqtUvjCyS5gtewzkmvSSg==",
+      "dev": true,
+      "dependencies": {
+        "@emotion/hash": "0.8.0",
+        "@emotion/memoize": "0.7.4",
+        "@emotion/unitless": "0.7.5",
+        "@emotion/utils": "0.11.3",
+        "csstype": "^2.5.7"
+      }
+    },
+    "node_modules/@emotion/sheet": {
+      "version": "0.9.4",
+      "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-0.9.4.tgz",
+      "integrity": "sha512-zM9PFmgVSqBw4zL101Q0HrBVTGmpAxFZH/pYx/cjJT5advXguvcgjHFTCaIO3enL/xr89vK2bh0Mfyj9aa0ANA==",
+      "dev": true
+    },
+    "node_modules/@emotion/styled": {
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-10.3.0.tgz",
+      "integrity": "sha512-GgcUpXBBEU5ido+/p/mCT2/Xx+Oqmp9JzQRuC+a4lYM4i4LBBn/dWvc0rQ19N9ObA8/T4NWMrPNe79kMBDJqoQ==",
+      "dev": true,
+      "dependencies": {
+        "@emotion/styled-base": "^10.3.0",
+        "babel-plugin-emotion": "^10.0.27"
+      },
+      "peerDependencies": {
+        "@emotion/core": "^10.0.27",
+        "react": ">=16.3.0"
+      }
+    },
+    "node_modules/@emotion/styled-base": {
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/@emotion/styled-base/-/styled-base-10.3.0.tgz",
+      "integrity": "sha512-PBRqsVKR7QRNkmfH78hTSSwHWcwDpecH9W6heujWAcyp2wdz/64PP73s7fWS1dIPm8/Exc8JAzYS8dEWXjv60w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.5.5",
+        "@emotion/is-prop-valid": "0.8.8",
+        "@emotion/serialize": "^0.11.15",
+        "@emotion/utils": "0.11.3"
+      },
+      "peerDependencies": {
+        "@emotion/core": "^10.0.28",
+        "react": ">=16.3.0"
+      }
+    },
+    "node_modules/@emotion/stylis": {
+      "version": "0.8.5",
+      "resolved": "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.5.tgz",
+      "integrity": "sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ==",
+      "dev": true
+    },
+    "node_modules/@emotion/unitless": {
+      "version": "0.7.5",
+      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",
+      "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==",
+      "dev": true
+    },
+    "node_modules/@emotion/utils": {
+      "version": "0.11.3",
+      "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-0.11.3.tgz",
+      "integrity": "sha512-0o4l6pZC+hI88+bzuaX/6BgOvQVhbt2PfmxauVaYOGgbsAw14wdKyvMCZXnsnsHys94iadcF+RG/wZyx6+ZZBw==",
+      "dev": true
+    },
+    "node_modules/@emotion/weak-memoize": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz",
+      "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==",
+      "dev": true
+    },
+    "node_modules/@remix-run/router": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.7.1.tgz",
+      "integrity": "sha512-bgVQM4ZJ2u2CM8k1ey70o1ePFXsEzYVZoWghh6WjM8p59jQ7HxzbHW4SbnWFG7V9ig9chLawQxDTZ3xzOF8MkQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@storybook/addons": {
+      "version": "6.5.16",
+      "resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.5.16.tgz",
+      "integrity": "sha512-p3DqQi+8QRL5k7jXhXmJZLsE/GqHqyY6PcoA1oNTJr0try48uhTGUOYkgzmqtDaa/qPFO5LP+xCPzZXckGtquQ==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@storybook/api": "6.5.16",
+        "@storybook/channels": "6.5.16",
+        "@storybook/client-logger": "6.5.16",
+        "@storybook/core-events": "6.5.16",
+        "@storybook/csf": "0.0.2--canary.4566f4d.1",
+        "@storybook/router": "6.5.16",
+        "@storybook/theming": "6.5.16",
+        "@types/webpack-env": "^1.16.0",
+        "core-js": "^3.8.2",
+        "global": "^4.4.0",
+        "regenerator-runtime": "^0.13.7"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/@storybook/api": {
+      "version": "6.5.16",
+      "resolved": "https://registry.npmjs.org/@storybook/api/-/api-6.5.16.tgz",
+      "integrity": "sha512-HOsuT8iomqeTMQJrRx5U8nsC7lJTwRr1DhdD0SzlqL4c80S/7uuCy4IZvOt4sYQjOzW5fOo/kamcoBXyLproTA==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@storybook/channels": "6.5.16",
+        "@storybook/client-logger": "6.5.16",
+        "@storybook/core-events": "6.5.16",
+        "@storybook/csf": "0.0.2--canary.4566f4d.1",
+        "@storybook/router": "6.5.16",
+        "@storybook/semver": "^7.3.2",
+        "@storybook/theming": "6.5.16",
+        "core-js": "^3.8.2",
+        "fast-deep-equal": "^3.1.3",
+        "global": "^4.4.0",
+        "lodash": "^4.17.21",
+        "memoizerific": "^1.11.3",
+        "regenerator-runtime": "^0.13.7",
+        "store2": "^2.12.0",
+        "telejson": "^6.0.8",
+        "ts-dedent": "^2.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/@storybook/channel-postmessage": {
+      "version": "6.4.19",
+      "resolved": "https://registry.npmjs.org/@storybook/channel-postmessage/-/channel-postmessage-6.4.19.tgz",
+      "integrity": "sha512-E5h/itFzQ/6M08LR4kqlgqqmeO3tmavI+nUAlZrkCrotpJFNMHE2i0PQHg0TkFJrRDpYcrwD+AjUW4IwdqrisQ==",
+      "dev": true,
+      "dependencies": {
+        "@storybook/channels": "6.4.19",
+        "@storybook/client-logger": "6.4.19",
+        "@storybook/core-events": "6.4.19",
+        "core-js": "^3.8.2",
+        "global": "^4.4.0",
+        "qs": "^6.10.0",
+        "telejson": "^5.3.2"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      }
+    },
+    "node_modules/@storybook/channel-postmessage/node_modules/@storybook/channels": {
+      "version": "6.4.19",
+      "resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-6.4.19.tgz",
+      "integrity": "sha512-EwyoncFvTfmIlfsy8jTfayCxo2XchPkZk/9txipugWSmc057HdklMKPLOHWP0z5hLH0IbVIKXzdNISABm36jwQ==",
+      "dev": true,
+      "dependencies": {
+        "core-js": "^3.8.2",
+        "ts-dedent": "^2.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      }
+    },
+    "node_modules/@storybook/channel-postmessage/node_modules/@storybook/client-logger": {
+      "version": "6.4.19",
+      "resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-6.4.19.tgz",
+      "integrity": "sha512-zmg/2wyc9W3uZrvxaW4BfHcr40J0v7AGslqYXk9H+ERLVwIvrR4NhxQFaS6uITjBENyRDxwzfU3Va634WcmdDQ==",
+      "dev": true,
+      "dependencies": {
+        "core-js": "^3.8.2",
+        "global": "^4.4.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      }
+    },
+    "node_modules/@storybook/channel-postmessage/node_modules/@storybook/core-events": {
+      "version": "6.4.19",
+      "resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-6.4.19.tgz",
+      "integrity": "sha512-KICzUw6XVQUJzFSCXfvhfHAuyhn4Q5J4IZEfuZkcGJS4ODkrO6tmpdYE5Cfr+so95Nfp0ErWiLUuodBsW9/rtA==",
+      "dev": true,
+      "dependencies": {
+        "core-js": "^3.8.2"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      }
+    },
+    "node_modules/@storybook/channel-postmessage/node_modules/telejson": {
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/telejson/-/telejson-5.3.3.tgz",
+      "integrity": "sha512-PjqkJZpzEggA9TBpVtJi1LVptP7tYtXB6rEubwlHap76AMjzvOdKX41CxyaW7ahhzDU1aftXnMCx5kAPDZTQBA==",
+      "dev": true,
+      "dependencies": {
+        "@types/is-function": "^1.0.0",
+        "global": "^4.4.0",
+        "is-function": "^1.0.2",
+        "is-regex": "^1.1.2",
+        "is-symbol": "^1.0.3",
+        "isobject": "^4.0.0",
+        "lodash": "^4.17.21",
+        "memoizerific": "^1.11.3"
+      }
+    },
+    "node_modules/@storybook/channels": {
+      "version": "6.5.16",
+      "resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-6.5.16.tgz",
+      "integrity": "sha512-VylzaWQZaMozEwZPJdyJoz+0jpDa8GRyaqu9TGG6QGv+KU5POoZaGLDkRE7TzWkyyP0KQLo80K99MssZCpgSeg==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "core-js": "^3.8.2",
+        "ts-dedent": "^2.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      }
+    },
+    "node_modules/@storybook/client-api": {
+      "version": "6.4.19",
+      "resolved": "https://registry.npmjs.org/@storybook/client-api/-/client-api-6.4.19.tgz",
+      "integrity": "sha512-OCrT5Um3FDvZnimQKwWtwsaI+5agPwq2i8YiqlofrI/NPMKp0I7DEkCGwE5IRD1Q8BIKqHcMo5tTmfYi0AxyOg==",
+      "dev": true,
+      "dependencies": {
+        "@storybook/addons": "6.4.19",
+        "@storybook/channel-postmessage": "6.4.19",
+        "@storybook/channels": "6.4.19",
+        "@storybook/client-logger": "6.4.19",
+        "@storybook/core-events": "6.4.19",
+        "@storybook/csf": "0.0.2--canary.87bc651.0",
+        "@storybook/store": "6.4.19",
+        "@types/qs": "^6.9.5",
+        "@types/webpack-env": "^1.16.0",
+        "core-js": "^3.8.2",
+        "fast-deep-equal": "^3.1.3",
+        "global": "^4.4.0",
+        "lodash": "^4.17.21",
+        "memoizerific": "^1.11.3",
+        "qs": "^6.10.0",
+        "regenerator-runtime": "^0.13.7",
+        "store2": "^2.12.0",
+        "synchronous-promise": "^2.0.15",
+        "ts-dedent": "^2.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0"
+      }
+    },
+    "node_modules/@storybook/client-api/node_modules/@storybook/addons": {
+      "version": "6.4.19",
+      "resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.4.19.tgz",
+      "integrity": "sha512-QNyRYhpqmHV8oJxxTBdkRlLSbDFhpBvfvMfIrIT1UXb/eemdBZTaCGVvXZ9UixoEEI7f8VwAQ44IvkU5B1509w==",
+      "dev": true,
+      "dependencies": {
+        "@storybook/api": "6.4.19",
+        "@storybook/channels": "6.4.19",
+        "@storybook/client-logger": "6.4.19",
+        "@storybook/core-events": "6.4.19",
+        "@storybook/csf": "0.0.2--canary.87bc651.0",
+        "@storybook/router": "6.4.19",
+        "@storybook/theming": "6.4.19",
+        "@types/webpack-env": "^1.16.0",
+        "core-js": "^3.8.2",
+        "global": "^4.4.0",
+        "regenerator-runtime": "^0.13.7"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0"
+      }
+    },
+    "node_modules/@storybook/client-api/node_modules/@storybook/api": {
+      "version": "6.4.19",
+      "resolved": "https://registry.npmjs.org/@storybook/api/-/api-6.4.19.tgz",
+      "integrity": "sha512-aDvea+NpQCBjpNp9YidO1Pr7fzzCp15FSdkG+2ihGQfv5raxrN+IIJnGUXecpe71nvlYiB+29UXBVK7AL0j51Q==",
+      "dev": true,
+      "dependencies": {
+        "@storybook/channels": "6.4.19",
+        "@storybook/client-logger": "6.4.19",
+        "@storybook/core-events": "6.4.19",
+        "@storybook/csf": "0.0.2--canary.87bc651.0",
+        "@storybook/router": "6.4.19",
+        "@storybook/semver": "^7.3.2",
+        "@storybook/theming": "6.4.19",
+        "core-js": "^3.8.2",
+        "fast-deep-equal": "^3.1.3",
+        "global": "^4.4.0",
+        "lodash": "^4.17.21",
+        "memoizerific": "^1.11.3",
+        "regenerator-runtime": "^0.13.7",
+        "store2": "^2.12.0",
+        "telejson": "^5.3.2",
+        "ts-dedent": "^2.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0"
+      }
+    },
+    "node_modules/@storybook/client-api/node_modules/@storybook/channels": {
+      "version": "6.4.19",
+      "resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-6.4.19.tgz",
+      "integrity": "sha512-EwyoncFvTfmIlfsy8jTfayCxo2XchPkZk/9txipugWSmc057HdklMKPLOHWP0z5hLH0IbVIKXzdNISABm36jwQ==",
+      "dev": true,
+      "dependencies": {
+        "core-js": "^3.8.2",
+        "ts-dedent": "^2.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      }
+    },
+    "node_modules/@storybook/client-api/node_modules/@storybook/client-logger": {
+      "version": "6.4.19",
+      "resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-6.4.19.tgz",
+      "integrity": "sha512-zmg/2wyc9W3uZrvxaW4BfHcr40J0v7AGslqYXk9H+ERLVwIvrR4NhxQFaS6uITjBENyRDxwzfU3Va634WcmdDQ==",
+      "dev": true,
+      "dependencies": {
+        "core-js": "^3.8.2",
+        "global": "^4.4.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      }
+    },
+    "node_modules/@storybook/client-api/node_modules/@storybook/core-events": {
+      "version": "6.4.19",
+      "resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-6.4.19.tgz",
+      "integrity": "sha512-KICzUw6XVQUJzFSCXfvhfHAuyhn4Q5J4IZEfuZkcGJS4ODkrO6tmpdYE5Cfr+so95Nfp0ErWiLUuodBsW9/rtA==",
+      "dev": true,
+      "dependencies": {
+        "core-js": "^3.8.2"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      }
+    },
+    "node_modules/@storybook/client-api/node_modules/@storybook/csf": {
+      "version": "0.0.2--canary.87bc651.0",
+      "resolved": "https://registry.npmjs.org/@storybook/csf/-/csf-0.0.2--canary.87bc651.0.tgz",
+      "integrity": "sha512-ajk1Uxa+rBpFQHKrCcTmJyQBXZ5slfwHVEaKlkuFaW77it8RgbPJp/ccna3sgoi8oZ7FkkOyvv1Ve4SmwFqRqw==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.17.15"
+      }
+    },
+    "node_modules/@storybook/client-api/node_modules/@storybook/router": {
+      "version": "6.4.19",
+      "resolved": "https://registry.npmjs.org/@storybook/router/-/router-6.4.19.tgz",
+      "integrity": "sha512-KWWwIzuyeEIWVezkCihwY2A76Il9tUNg0I410g9qT7NrEsKyqXGRYOijWub7c1GGyNjLqz0jtrrehtixMcJkuA==",
+      "dev": true,
+      "dependencies": {
+        "@storybook/client-logger": "6.4.19",
+        "core-js": "^3.8.2",
+        "fast-deep-equal": "^3.1.3",
+        "global": "^4.4.0",
+        "history": "5.0.0",
+        "lodash": "^4.17.21",
+        "memoizerific": "^1.11.3",
+        "qs": "^6.10.0",
+        "react-router": "^6.0.0",
+        "react-router-dom": "^6.0.0",
+        "ts-dedent": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0"
+      }
+    },
+    "node_modules/@storybook/client-api/node_modules/@storybook/theming": {
+      "version": "6.4.19",
+      "resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-6.4.19.tgz",
+      "integrity": "sha512-V4pWmTvAxmbHR6B3jA4hPkaxZPyExHvCToy7b76DpUTpuHihijNDMAn85KhOQYIeL9q14zP/aiz899tOHsOidg==",
+      "dev": true,
+      "dependencies": {
+        "@emotion/core": "^10.1.1",
+        "@emotion/is-prop-valid": "^0.8.6",
+        "@emotion/styled": "^10.0.27",
+        "@storybook/client-logger": "6.4.19",
+        "core-js": "^3.8.2",
+        "deep-object-diff": "^1.1.0",
+        "emotion-theming": "^10.0.27",
+        "global": "^4.4.0",
+        "memoizerific": "^1.11.3",
+        "polished": "^4.0.5",
+        "resolve-from": "^5.0.0",
+        "ts-dedent": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0"
+      }
+    },
+    "node_modules/@storybook/client-api/node_modules/telejson": {
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/telejson/-/telejson-5.3.3.tgz",
+      "integrity": "sha512-PjqkJZpzEggA9TBpVtJi1LVptP7tYtXB6rEubwlHap76AMjzvOdKX41CxyaW7ahhzDU1aftXnMCx5kAPDZTQBA==",
+      "dev": true,
+      "dependencies": {
+        "@types/is-function": "^1.0.0",
+        "global": "^4.4.0",
+        "is-function": "^1.0.2",
+        "is-regex": "^1.1.2",
+        "is-symbol": "^1.0.3",
+        "isobject": "^4.0.0",
+        "lodash": "^4.17.21",
+        "memoizerific": "^1.11.3"
+      }
+    },
+    "node_modules/@storybook/client-logger": {
+      "version": "6.5.16",
+      "resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-6.5.16.tgz",
+      "integrity": "sha512-pxcNaCj3ItDdicPTXTtmYJE3YC1SjxFrBmHcyrN+nffeNyiMuViJdOOZzzzucTUG0wcOOX8jaSyak+nnHg5H1Q==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "core-js": "^3.8.2",
+        "global": "^4.4.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      }
+    },
+    "node_modules/@storybook/components": {
+      "version": "6.5.16",
+      "resolved": "https://registry.npmjs.org/@storybook/components/-/components-6.5.16.tgz",
+      "integrity": "sha512-LzBOFJKITLtDcbW9jXl0/PaG+4xAz25PK8JxPZpIALbmOpYWOAPcO6V9C2heX6e6NgWFMUxjplkULEk9RCQMNA==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@storybook/client-logger": "6.5.16",
+        "@storybook/csf": "0.0.2--canary.4566f4d.1",
+        "@storybook/theming": "6.5.16",
+        "core-js": "^3.8.2",
+        "memoizerific": "^1.11.3",
+        "qs": "^6.10.0",
+        "regenerator-runtime": "^0.13.7",
+        "util-deprecate": "^1.0.2"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/@storybook/core-events": {
+      "version": "6.5.16",
+      "resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-6.5.16.tgz",
+      "integrity": "sha512-qMZQwmvzpH5F2uwNUllTPg6eZXr2OaYZQRRN8VZJiuorZzDNdAFmiVWMWdkThwmyLEJuQKXxqCL8lMj/7PPM+g==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "core-js": "^3.8.2"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      }
+    },
+    "node_modules/@storybook/csf": {
+      "version": "0.0.2--canary.4566f4d.1",
+      "resolved": "https://registry.npmjs.org/@storybook/csf/-/csf-0.0.2--canary.4566f4d.1.tgz",
+      "integrity": "sha512-9OVvMVh3t9znYZwb0Svf/YQoxX2gVOeQTGe2bses2yj+a3+OJnCrUF3/hGv6Em7KujtOdL2LL+JnG49oMVGFgQ==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "lodash": "^4.17.15"
+      }
+    },
+    "node_modules/@storybook/router": {
+      "version": "6.5.16",
+      "resolved": "https://registry.npmjs.org/@storybook/router/-/router-6.5.16.tgz",
+      "integrity": "sha512-ZgeP8a5YV/iuKbv31V8DjPxlV4AzorRiR8OuSt/KqaiYXNXlOoQDz/qMmiNcrshrfLpmkzoq7fSo4T8lWo2UwQ==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@storybook/client-logger": "6.5.16",
+        "core-js": "^3.8.2",
+        "memoizerific": "^1.11.3",
+        "qs": "^6.10.0",
+        "regenerator-runtime": "^0.13.7"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/@storybook/semver": {
+      "version": "7.3.2",
+      "resolved": "https://registry.npmjs.org/@storybook/semver/-/semver-7.3.2.tgz",
+      "integrity": "sha512-SWeszlsiPsMI0Ps0jVNtH64cI5c0UF3f7KgjVKJoNP30crQ6wUSddY2hsdeczZXEKVJGEn50Q60flcGsQGIcrg==",
+      "dev": true,
+      "dependencies": {
+        "core-js": "^3.6.5",
+        "find-up": "^4.1.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@storybook/store": {
+      "version": "6.4.19",
+      "resolved": "https://registry.npmjs.org/@storybook/store/-/store-6.4.19.tgz",
+      "integrity": "sha512-N9/ZjemRHGfT3InPIbqQqc6snkcfnf3Qh9oOr0smbfaVGJol//KOX65kzzobtzFcid0WxtTDZ3HmgFVH+GvuhQ==",
+      "dev": true,
+      "dependencies": {
+        "@storybook/addons": "6.4.19",
+        "@storybook/client-logger": "6.4.19",
+        "@storybook/core-events": "6.4.19",
+        "@storybook/csf": "0.0.2--canary.87bc651.0",
+        "core-js": "^3.8.2",
+        "fast-deep-equal": "^3.1.3",
+        "global": "^4.4.0",
+        "lodash": "^4.17.21",
+        "memoizerific": "^1.11.3",
+        "regenerator-runtime": "^0.13.7",
+        "slash": "^3.0.0",
+        "stable": "^0.1.8",
+        "synchronous-promise": "^2.0.15",
+        "ts-dedent": "^2.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0"
+      }
+    },
+    "node_modules/@storybook/store/node_modules/@storybook/addons": {
+      "version": "6.4.19",
+      "resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.4.19.tgz",
+      "integrity": "sha512-QNyRYhpqmHV8oJxxTBdkRlLSbDFhpBvfvMfIrIT1UXb/eemdBZTaCGVvXZ9UixoEEI7f8VwAQ44IvkU5B1509w==",
+      "dev": true,
+      "dependencies": {
+        "@storybook/api": "6.4.19",
+        "@storybook/channels": "6.4.19",
+        "@storybook/client-logger": "6.4.19",
+        "@storybook/core-events": "6.4.19",
+        "@storybook/csf": "0.0.2--canary.87bc651.0",
+        "@storybook/router": "6.4.19",
+        "@storybook/theming": "6.4.19",
+        "@types/webpack-env": "^1.16.0",
+        "core-js": "^3.8.2",
+        "global": "^4.4.0",
+        "regenerator-runtime": "^0.13.7"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0"
+      }
+    },
+    "node_modules/@storybook/store/node_modules/@storybook/api": {
+      "version": "6.4.19",
+      "resolved": "https://registry.npmjs.org/@storybook/api/-/api-6.4.19.tgz",
+      "integrity": "sha512-aDvea+NpQCBjpNp9YidO1Pr7fzzCp15FSdkG+2ihGQfv5raxrN+IIJnGUXecpe71nvlYiB+29UXBVK7AL0j51Q==",
+      "dev": true,
+      "dependencies": {
+        "@storybook/channels": "6.4.19",
+        "@storybook/client-logger": "6.4.19",
+        "@storybook/core-events": "6.4.19",
+        "@storybook/csf": "0.0.2--canary.87bc651.0",
+        "@storybook/router": "6.4.19",
+        "@storybook/semver": "^7.3.2",
+        "@storybook/theming": "6.4.19",
+        "core-js": "^3.8.2",
+        "fast-deep-equal": "^3.1.3",
+        "global": "^4.4.0",
+        "lodash": "^4.17.21",
+        "memoizerific": "^1.11.3",
+        "regenerator-runtime": "^0.13.7",
+        "store2": "^2.12.0",
+        "telejson": "^5.3.2",
+        "ts-dedent": "^2.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0"
+      }
+    },
+    "node_modules/@storybook/store/node_modules/@storybook/channels": {
+      "version": "6.4.19",
+      "resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-6.4.19.tgz",
+      "integrity": "sha512-EwyoncFvTfmIlfsy8jTfayCxo2XchPkZk/9txipugWSmc057HdklMKPLOHWP0z5hLH0IbVIKXzdNISABm36jwQ==",
+      "dev": true,
+      "dependencies": {
+        "core-js": "^3.8.2",
+        "ts-dedent": "^2.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      }
+    },
+    "node_modules/@storybook/store/node_modules/@storybook/client-logger": {
+      "version": "6.4.19",
+      "resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-6.4.19.tgz",
+      "integrity": "sha512-zmg/2wyc9W3uZrvxaW4BfHcr40J0v7AGslqYXk9H+ERLVwIvrR4NhxQFaS6uITjBENyRDxwzfU3Va634WcmdDQ==",
+      "dev": true,
+      "dependencies": {
+        "core-js": "^3.8.2",
+        "global": "^4.4.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      }
+    },
+    "node_modules/@storybook/store/node_modules/@storybook/core-events": {
+      "version": "6.4.19",
+      "resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-6.4.19.tgz",
+      "integrity": "sha512-KICzUw6XVQUJzFSCXfvhfHAuyhn4Q5J4IZEfuZkcGJS4ODkrO6tmpdYE5Cfr+so95Nfp0ErWiLUuodBsW9/rtA==",
+      "dev": true,
+      "dependencies": {
+        "core-js": "^3.8.2"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      }
+    },
+    "node_modules/@storybook/store/node_modules/@storybook/csf": {
+      "version": "0.0.2--canary.87bc651.0",
+      "resolved": "https://registry.npmjs.org/@storybook/csf/-/csf-0.0.2--canary.87bc651.0.tgz",
+      "integrity": "sha512-ajk1Uxa+rBpFQHKrCcTmJyQBXZ5slfwHVEaKlkuFaW77it8RgbPJp/ccna3sgoi8oZ7FkkOyvv1Ve4SmwFqRqw==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.17.15"
+      }
+    },
+    "node_modules/@storybook/store/node_modules/@storybook/router": {
+      "version": "6.4.19",
+      "resolved": "https://registry.npmjs.org/@storybook/router/-/router-6.4.19.tgz",
+      "integrity": "sha512-KWWwIzuyeEIWVezkCihwY2A76Il9tUNg0I410g9qT7NrEsKyqXGRYOijWub7c1GGyNjLqz0jtrrehtixMcJkuA==",
+      "dev": true,
+      "dependencies": {
+        "@storybook/client-logger": "6.4.19",
+        "core-js": "^3.8.2",
+        "fast-deep-equal": "^3.1.3",
+        "global": "^4.4.0",
+        "history": "5.0.0",
+        "lodash": "^4.17.21",
+        "memoizerific": "^1.11.3",
+        "qs": "^6.10.0",
+        "react-router": "^6.0.0",
+        "react-router-dom": "^6.0.0",
+        "ts-dedent": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0"
+      }
+    },
+    "node_modules/@storybook/store/node_modules/@storybook/theming": {
+      "version": "6.4.19",
+      "resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-6.4.19.tgz",
+      "integrity": "sha512-V4pWmTvAxmbHR6B3jA4hPkaxZPyExHvCToy7b76DpUTpuHihijNDMAn85KhOQYIeL9q14zP/aiz899tOHsOidg==",
+      "dev": true,
+      "dependencies": {
+        "@emotion/core": "^10.1.1",
+        "@emotion/is-prop-valid": "^0.8.6",
+        "@emotion/styled": "^10.0.27",
+        "@storybook/client-logger": "6.4.19",
+        "core-js": "^3.8.2",
+        "deep-object-diff": "^1.1.0",
+        "emotion-theming": "^10.0.27",
+        "global": "^4.4.0",
+        "memoizerific": "^1.11.3",
+        "polished": "^4.0.5",
+        "resolve-from": "^5.0.0",
+        "ts-dedent": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0"
+      }
+    },
+    "node_modules/@storybook/store/node_modules/telejson": {
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/telejson/-/telejson-5.3.3.tgz",
+      "integrity": "sha512-PjqkJZpzEggA9TBpVtJi1LVptP7tYtXB6rEubwlHap76AMjzvOdKX41CxyaW7ahhzDU1aftXnMCx5kAPDZTQBA==",
+      "dev": true,
+      "dependencies": {
+        "@types/is-function": "^1.0.0",
+        "global": "^4.4.0",
+        "is-function": "^1.0.2",
+        "is-regex": "^1.1.2",
+        "is-symbol": "^1.0.3",
+        "isobject": "^4.0.0",
+        "lodash": "^4.17.21",
+        "memoizerific": "^1.11.3"
+      }
+    },
+    "node_modules/@storybook/theming": {
+      "version": "6.5.16",
+      "resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-6.5.16.tgz",
+      "integrity": "sha512-hNLctkjaYLRdk1+xYTkC1mg4dYz2wSv6SqbLpcKMbkPHTE0ElhddGPHQqB362md/w9emYXNkt1LSMD8Xk9JzVQ==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@storybook/client-logger": "6.5.16",
+        "core-js": "^3.8.2",
+        "memoizerific": "^1.11.3",
+        "regenerator-runtime": "^0.13.7"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/@types/is-function": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@types/is-function/-/is-function-1.0.1.tgz",
+      "integrity": "sha512-A79HEEiwXTFtfY+Bcbo58M2GRYzCr9itHWzbzHVFNEYCcoU/MMGwYYf721gBrnhpj1s6RGVVha/IgNFnR0Iw/Q==",
+      "dev": true
+    },
+    "node_modules/@types/parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
+      "dev": true
+    },
+    "node_modules/@types/qs": {
+      "version": "6.9.7",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
+      "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
+      "dev": true
+    },
+    "node_modules/@types/webpack-env": {
+      "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.18.1.tgz",
+      "integrity": "sha512-D0HJET2/UY6k9L6y3f5BL+IDxZmPkYmPT4+qBrRdmRLYRuV0qNKizMgTvYxXZYn+36zjPeoDZAEYBCM6XB+gww==",
+      "dev": true
+    },
+    "node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/babel-plugin-emotion": {
+      "version": "10.2.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-emotion/-/babel-plugin-emotion-10.2.2.tgz",
+      "integrity": "sha512-SMSkGoqTbTyUTDeuVuPIWifPdUGkTk1Kf9BWRiXIOIcuyMfsdp2EjeiiFvOzX8NOBvEh/ypKYvUh2rkgAJMCLA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.0.0",
+        "@emotion/hash": "0.8.0",
+        "@emotion/memoize": "0.7.4",
+        "@emotion/serialize": "^0.11.16",
+        "babel-plugin-macros": "^2.0.0",
+        "babel-plugin-syntax-jsx": "^6.18.0",
+        "convert-source-map": "^1.5.0",
+        "escape-string-regexp": "^1.0.5",
+        "find-root": "^1.1.0",
+        "source-map": "^0.5.7"
+      }
+    },
+    "node_modules/babel-plugin-macros": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz",
+      "integrity": "sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.7.2",
+        "cosmiconfig": "^6.0.0",
+        "resolve": "^1.12.0"
+      }
+    },
+    "node_modules/babel-plugin-syntax-jsx": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
+      "integrity": "sha512-qrPaCSo9c8RHNRHIotaufGbuOBN8rtdC4QrrFFc43vyWCCz7Kl7GL1PGaXtMGQZUXrkCjNEgxDfmAuAabr/rlw==",
+      "dev": true
+    },
+    "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": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true
+    },
+    "node_modules/convert-source-map": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+      "dev": true
+    },
+    "node_modules/core-js": {
+      "version": "3.31.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.31.1.tgz",
+      "integrity": "sha512-2sKLtfq1eFST7l7v62zaqXacPc7uG8ZAya8ogijLhTtaKNcpzpB4TMoTw2Si+8GYKRwFPMMtUT0263QFWFfqyQ==",
+      "dev": true,
+      "hasInstallScript": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/cosmiconfig": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
+      "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
+      "dev": true,
+      "dependencies": {
+        "@types/parse-json": "^4.0.0",
+        "import-fresh": "^3.1.0",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0",
+        "yaml": "^1.7.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/csstype": {
+      "version": "2.6.21",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz",
+      "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==",
+      "dev": true
+    },
+    "node_modules/deep-object-diff": {
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/deep-object-diff/-/deep-object-diff-1.1.9.tgz",
+      "integrity": "sha512-Rn+RuwkmkDwCi2/oXOFS9Gsr5lJZu/yTGpK7wAaAIE75CC+LCGEZHpY6VQJa/RoJcrmaA/docWJZvYohlNkWPA==",
+      "dev": true
+    },
+    "node_modules/dom-walk": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz",
+      "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==",
+      "dev": true
+    },
+    "node_modules/emotion-theming": {
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/emotion-theming/-/emotion-theming-10.3.0.tgz",
+      "integrity": "sha512-mXiD2Oj7N9b6+h/dC6oLf9hwxbtKHQjoIqtodEyL8CpkN4F3V4IK/BT4D0C7zSs4BBFOu4UlPJbvvBLa88SGEA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.5.5",
+        "@emotion/weak-memoize": "0.2.5",
+        "hoist-non-react-statics": "^3.3.0"
+      },
+      "peerDependencies": {
+        "@emotion/core": "^10.0.27",
+        "react": ">=16.3.0"
+      }
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "node_modules/find-root": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
+      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==",
+      "dev": true
+    },
+    "node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
+      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/global": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz",
+      "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==",
+      "dev": true,
+      "dependencies": {
+        "min-document": "^2.19.0",
+        "process": "^0.11.10"
+      }
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "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"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "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": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/history": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/history/-/history-5.0.0.tgz",
+      "integrity": "sha512-3NyRMKIiFSJmIPdq7FxkNMJkQ7ZEtVblOQ38VtKaA0zZMW1Eo6Q6W8oDKEflr1kNNTItSnk4JMCO1deeSgbLLg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.7.6"
+      }
+    },
+    "node_modules/hoist-non-react-statics": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
+      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
+      "dev": true,
+      "dependencies": {
+        "react-is": "^16.7.0"
+      }
+    },
+    "node_modules/import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dev": true,
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/import-fresh/node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "dev": true
+    },
+    "node_modules/is-core-module": {
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
+      "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
+      "dev": true,
+      "dependencies": {
+        "has": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-function": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-function/-/is-function-1.0.2.tgz",
+      "integrity": "sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==",
+      "dev": true
+    },
+    "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": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "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": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/isobject": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-4.0.0.tgz",
+      "integrity": "sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
+    },
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "dev": true
+    },
+    "node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
+    "node_modules/loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dev": true,
+      "dependencies": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      },
+      "bin": {
+        "loose-envify": "cli.js"
+      }
+    },
+    "node_modules/map-or-similar": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/map-or-similar/-/map-or-similar-1.5.0.tgz",
+      "integrity": "sha512-0aF7ZmVon1igznGI4VS30yugpduQW3y3GkcgGJOp7d8x8QrizhigUxjI/m2UojsXXto+jLAH3KSz+xOJTiORjg==",
+      "dev": true
+    },
+    "node_modules/memoizerific": {
+      "version": "1.11.3",
+      "resolved": "https://registry.npmjs.org/memoizerific/-/memoizerific-1.11.3.tgz",
+      "integrity": "sha512-/EuHYwAPdLtXwAwSZkh/Gutery6pD2KYd44oQLhAvQp/50mpyduZh8Q7PYHXTCJ+wuXxt7oij2LXyIJOOYFPog==",
+      "dev": true,
+      "dependencies": {
+        "map-or-similar": "^1.5.0"
+      }
+    },
+    "node_modules/min-document": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
+      "integrity": "sha512-9Wy1B3m3f66bPPmU5hdA4DR4PB2OfDU/+GS3yAB7IQozE3tqXaVv2zOjgla7MEGSRv95+ILmOuvhLkOK6wJtCQ==",
+      "dev": true,
+      "dependencies": {
+        "dom-walk": "^0.1.0"
+      }
+    },
+    "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==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "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==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dev": true,
+      "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"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "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"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "node_modules/path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/polished": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/polished/-/polished-4.2.2.tgz",
+      "integrity": "sha512-Sz2Lkdxz6F2Pgnpi9U5Ng/WdWAUZxmHrNPoVlm3aAemxoy2Qy7LGjQg4uf8qKelDAUW94F4np3iH2YPf2qefcQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.17.8"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/preact": {
+      "version": "10.25.4",
+      "resolved": "https://registry.npmjs.org/preact/-/preact-10.25.4.tgz",
+      "integrity": "sha512-jLdZDb+Q+odkHJ+MpW/9U5cODzqnB+fy2EiHSZES7ldV5LK7yjlVzTp7R8Xy6W6y75kfK8iWYtFVH7lvjwrCMA==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/preact"
+      }
+    },
+    "node_modules/preact-render-to-string": {
+      "version": "5.1.19",
+      "resolved": "https://registry.npmjs.org/preact-render-to-string/-/preact-render-to-string-5.1.19.tgz",
+      "integrity": "sha512-bj8sn/oytIKO6RtOGSS/1+5CrQyRSC99eLUnEVbqUa6MzJX5dYh7wu9bmT0d6lm/Vea21k9KhCQwvr2sYN3rrQ==",
+      "dev": true,
+      "dependencies": {
+        "pretty-format": "^3.8.0"
+      },
+      "peerDependencies": {
+        "preact": ">=10"
+      }
+    },
+    "node_modules/pretty-format": {
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-3.8.0.tgz",
+      "integrity": "sha512-WuxUnVtlWL1OfZFQFuqvnvs6MiAGk9UNsBostyBOB0Is9wb5uRESevA6rnl/rkksXaGX3GzZhPup5d6Vp1nFew==",
+      "dev": true
+    },
+    "node_modules/process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/qs": {
+      "version": "6.11.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz",
+      "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==",
+      "dev": true,
+      "dependencies": {
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/react": {
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz",
+      "integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/react-dom": {
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz",
+      "integrity": "sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==",
+      "dev": true,
+      "dependencies": {
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1",
+        "scheduler": "^0.20.2"
+      },
+      "peerDependencies": {
+        "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-router": {
+      "version": "6.14.1",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.14.1.tgz",
+      "integrity": "sha512-U4PfgvG55LdvbQjg5Y9QRWyVxIdO1LlpYT7x+tMAxd9/vmiPuJhIwdxZuIQLN/9e3O4KFDHYfR9gzGeYMasW8g==",
+      "dev": true,
+      "dependencies": {
+        "@remix-run/router": "1.7.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "react": ">=16.8"
+      }
+    },
+    "node_modules/react-router-dom": {
+      "version": "6.14.1",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.14.1.tgz",
+      "integrity": "sha512-ssF6M5UkQjHK70fgukCJyjlda0Dgono2QGwqGvuk7D+EDGHdacEN3Yke2LTMjkrpHuFwBfDFsEjGVXBDmL+bWw==",
+      "dev": true,
+      "dependencies": {
+        "@remix-run/router": "1.7.1",
+        "react-router": "6.14.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "react": ">=16.8",
+        "react-dom": ">=16.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==",
+      "dev": true
+    },
+    "node_modules/resolve": {
+      "version": "1.22.2",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
+      "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
+      "dev": true,
+      "dependencies": {
+        "is-core-module": "^2.11.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/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/scheduler": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz",
+      "integrity": "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==",
+      "dev": true,
+      "dependencies": {
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1"
+      }
+    },
+    "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": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/stable": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
+      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
+      "deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility",
+      "dev": true
+    },
+    "node_modules/store2": {
+      "version": "2.14.2",
+      "resolved": "https://registry.npmjs.org/store2/-/store2-2.14.2.tgz",
+      "integrity": "sha512-siT1RiqlfQnGqgT/YzXVUNsom9S0H1OX+dpdGN1xkyYATo4I6sep5NmsRD/40s3IIOvlCq6akxkqG82urIZW1w==",
+      "dev": true
+    },
+    "node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "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/synchronous-promise": {
+      "version": "2.0.17",
+      "resolved": "https://registry.npmjs.org/synchronous-promise/-/synchronous-promise-2.0.17.tgz",
+      "integrity": "sha512-AsS729u2RHUfEra9xJrE39peJcc2stq2+poBXX8bcM08Y6g9j/i/PUzwNQqkaJde7Ntg1TO7bSREbR5sdosQ+g==",
+      "dev": true
+    },
+    "node_modules/telejson": {
+      "version": "6.0.8",
+      "resolved": "https://registry.npmjs.org/telejson/-/telejson-6.0.8.tgz",
+      "integrity": "sha512-nerNXi+j8NK1QEfBHtZUN/aLdDcyupA//9kAboYLrtzZlPLpUfqbVGWb9zz91f/mIjRbAYhbgtnJHY8I1b5MBg==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@types/is-function": "^1.0.0",
+        "global": "^4.4.0",
+        "is-function": "^1.0.2",
+        "is-regex": "^1.1.2",
+        "is-symbol": "^1.0.3",
+        "isobject": "^4.0.0",
+        "lodash": "^4.17.21",
+        "memoizerific": "^1.11.3"
+      }
+    },
+    "node_modules/to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ts-dedent": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgz",
+      "integrity": "sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.10"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "dev": true
+    },
+    "node_modules/yaml": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    }
+  }
+}
diff --git a/build-system/tasks/storybook/env/amp/package.json b/build-system/tasks/storybook/env/amp/package.json
new file mode 100644
index 000000000000..d4c1619cc185
--- /dev/null
+++ b/build-system/tasks/storybook/env/amp/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "amp-storybook-amp",
+  "version": "0.1.0",
+  "description": "packages specific to the amp storybook env",
+  "devDependencies": {
+    "@ampproject/storybook-addon": "1.1.10",
+    "preact": "10.25.4"
+  }
+}
diff --git a/build-system/tasks/storybook/env/amp/webpack.config.js b/build-system/tasks/storybook/env/amp/webpack.config.js
new file mode 100644
index 000000000000..ee8be023f167
--- /dev/null
+++ b/build-system/tasks/storybook/env/amp/webpack.config.js
@@ -0,0 +1,57 @@
+const path = require('path');
+const {
+  getRelativeAliasMap,
+} = require('../../../../babel-config/import-resolver');
+
+const rootDir = path.join(__dirname, '../../../../..');
+
+const modules = [
+  path.join(__dirname, 'node_modules'),
+  path.join(__dirname, '../../node_modules'),
+  path.join(rootDir, 'node_modules'),
+];
+
+module.exports = ({config}) => {
+  config.resolveLoader = {
+    modules,
+  };
+  config.resolve = {
+    modules,
+    alias: getRelativeAliasMap(rootDir),
+    extensions: ['.ts', '.tsx', '.js', '.jsx', '.json'],
+  };
+  config.module = {
+    rules: [
+      {
+        test: /\.jsx?|tsx?$/,
+        loader: 'babel-loader',
+        exclude: /node_modules/,
+        query: {
+          presets: [
+            [
+              '@babel/preset-typescript',
+              {jsxPragma: 'Preact', jsxPragmaFrag: 'Preact.Fragment'},
+            ],
+            [
+              '@babel/preset-env',
+              {
+                bugfixes: true,
+                targets: {'browsers': ['Last 2 versions']},
+              },
+            ],
+            [
+              '@babel/preset-react',
+              {
+                pragma: 'Preact.createElement',
+                pragmaFrag: 'Preact.Fragment',
+                useSpread: true,
+              },
+            ],
+          ],
+        },
+      },
+    ],
+  };
+
+  return config;
+};
diff --git a/build-system/tasks/storybook/env/preact/main.js b/build-system/tasks/storybook/env/preact/main.js
new file mode 100644
index 000000000000..47dcbab48bd2
--- /dev/null
+++ b/build-system/tasks/storybook/env/preact/main.js
@@ -0,0 +1,21 @@
+const {getStaticDirs} = require('../static-dirs');
+
+const rootDir = '../../../../..';
+
+module.exports = {
+  staticDirs: getStaticDirs(rootDir),
+  stories: [
+    `${rootDir}/src/**/storybook/!(*.amp).js`,
+    `${rootDir}/extensions/**/*.*/storybook/!(*.amp).js`,
+  ],
+  addons: [
+    '@storybook/addon-a11y',
+    '@storybook/addon-viewport/register',
+    '@storybook/addon-controls/register',
+  ],
+  webpackFinal: async (config) => {
+    // Disable entry point size warnings.
+    config.performance.hints = false;
+    return config;
+  },
+};
diff --git a/build-system/tasks/storybook/env/preact/package-lock.json b/build-system/tasks/storybook/env/preact/package-lock.json
new file mode 100644
index 000000000000..1421a5e18655
--- /dev/null
+++ b/build-system/tasks/storybook/env/preact/package-lock.json
@@ -0,0 +1,33 @@
+{
+  "name": "amp-storybook-preact",
+  "version": "0.1.0",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "amp-storybook-preact",
+      "version": "0.1.0",
+      "devDependencies": {
+        "preact": "10.25.4"
+      }
+    },
+    "node_modules/preact": {
+      "version": "10.25.4",
+      "resolved": "https://registry.npmjs.org/preact/-/preact-10.25.4.tgz",
+      "integrity": "sha512-jLdZDb+Q+odkHJ+MpW/9U5cODzqnB+fy2EiHSZES7ldV5LK7yjlVzTp7R8Xy6W6y75kfK8iWYtFVH7lvjwrCMA==",
+      "dev": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/preact"
+      }
+    }
+  },
+  "dependencies": {
+    "preact": {
+      "version": "10.25.4",
+      "resolved": "https://registry.npmjs.org/preact/-/preact-10.25.4.tgz",
+      "integrity": "sha512-jLdZDb+Q+odkHJ+MpW/9U5cODzqnB+fy2EiHSZES7ldV5LK7yjlVzTp7R8Xy6W6y75kfK8iWYtFVH7lvjwrCMA==",
+      "dev": true
+    }
+  }
+}
diff --git a/build-system/tasks/storybook/env/preact/package.json b/build-system/tasks/storybook/env/preact/package.json
new file mode 100644
index 000000000000..51be5cc60363
--- /dev/null
+++ b/build-system/tasks/storybook/env/preact/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "amp-storybook-preact",
+  "version": "0.1.0",
+  "description": "packages specific to the preact storybook env",
+  "devDependencies": {
+    "preact": "10.25.4"
+  }
+}
diff --git a/build-system/tasks/storybook/env/preact/webpack.config.js b/build-system/tasks/storybook/env/preact/webpack.config.js
new file mode 100644
index 000000000000..1bd457d59697
--- /dev/null
+++ b/build-system/tasks/storybook/env/preact/webpack.config.js
@@ -0,0 +1,70 @@
+const path = require('path');
+const {BUILD_CONSTANTS} = require('../../../../compile/build-constants');
+const {DefinePlugin} = require('webpack');
+const {
+  getRelativeAliasMap,
+} = require('../../../../babel-config/import-resolver');
+
+const rootDir = path.join(__dirname, '../../../../..');
+
+const modules = [
+  path.join(__dirname, 'node_modules'),
+  path.join(__dirname, '../../node_modules'),
+  path.join(rootDir, 'node_modules'),
+];
+
+module.exports = ({config}) => {
+  config.resolveLoader = {
+    modules,
+  };
+  config.resolve = {
+    modules,
+    extensions: ['.ts', '.tsx', '.js', '.jsx', '.json'],
+    alias: {
+      ...getRelativeAliasMap(rootDir),
+      'react': 'preact/compat',
+      'react-dom': 'preact/compat',
+    },
+  };
+  config.module = {
+    rules: [
+      {
+        test: /\.jsx?|tsx?$/,
+        loader: 'babel-loader',
+        exclude: /node_modules/,
+        query: {
+          presets: [
+            [
+              '@babel/preset-typescript',
+              {jsxPragma: 'Preact', jsxPragmaFrag: 'Preact.Fragment'},
+            ],
+            [
+              '@babel/preset-env',
+              {
+                bugfixes: true,
+                targets: {'browsers': ['Last 2 versions']},
+              },
+            ],
+            [
+              '@babel/preset-react',
+              {
+                pragma: 'Preact.createElement',
+                pragmaFrag: 'Preact.Fragment',
+                useSpread: true,
+              },
+            ],
+          ],
+        },
+      },
+      {
+        test: /\.css$/i,
+        use: ['style-loader', 'css-loader'],
+      },
+    ],
+  };
+  // Replaced by minify-replace (babel) in the usual build pipeline
+  // build-system/babel-config/helpers.js#getReplacePlugin
+  config.plugins.push(new DefinePlugin(BUILD_CONSTANTS));
+
+  return config;
+};
diff --git a/build-system/tasks/storybook/env/react/main.js b/build-system/tasks/storybook/env/react/main.js
new file mode 100644
index 000000000000..2ff449e897db
--- /dev/null
+++ b/build-system/tasks/storybook/env/react/main.js
@@ -0,0 +1,21 @@
+const {getStaticDirs} = require('../static-dirs');
+
+const rootDir = '../../../../..';
+
+module.exports = {
+  staticDirs: getStaticDirs(rootDir),
+  // Unlike the `amp` and `preact` environments, we search Storybook files only
+  // under component paths. This is because only components have React build
+  // output, but directories in src/ outside src/bento/components/ do not.
+  stories: [`${rootDir}/extensions/**/*.*/storybook/!(*.amp).js`],
+  addons: [
+    '@storybook/addon-a11y',
+    '@storybook/addon-viewport/register',
+    '@storybook/addon-controls/register',
+  ],
+  webpackFinal: (config) => {
+    // Disable entry point size warnings.
+    config.performance.hints = false;
+    return config;
+  },
+};
diff --git a/build-system/tasks/storybook/env/react/package-lock.json b/build-system/tasks/storybook/env/react/package-lock.json
new file mode 100644
index 000000000000..4e20cfacaf1f
--- /dev/null
+++ b/build-system/tasks/storybook/env/react/package-lock.json
@@ -0,0 +1,12 @@
+{
+  "name": "amp-storybook-react",
+  "version": "0.1.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "amp-storybook-react",
+      "version": "0.1.0"
+    }
+  }
+}
diff --git a/build-system/tasks/storybook/env/react/package.json b/build-system/tasks/storybook/env/react/package.json
new file mode 100644
index 000000000000..c70615b2e6ea
--- /dev/null
+++ b/build-system/tasks/storybook/env/react/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "amp-storybook-react",
+  "version": "0.1.0",
+  "description": "packages specific to the react storybook env"
+}
diff --git a/build-system/tasks/storybook/env/react/webpack.config.js b/build-system/tasks/storybook/env/react/webpack.config.js
new file mode 100644
index 000000000000..a0ae852c467a
--- /dev/null
+++ b/build-system/tasks/storybook/env/react/webpack.config.js
@@ -0,0 +1,113 @@
+const path = require('path');
+const {BUILD_CONSTANTS} = require('../../../../compile/build-constants');
+const {DefinePlugin} = require('webpack');
+const {
+  getRelativeAliasMap,
+} = require('../../../../babel-config/import-resolver');
+const {existsSync} = require('fs-extra');
+const {
+  mergeReactBabelConfig,
+} = require('../../../../babel-config/react-config');
+
+const rootDir = path.join(__dirname, '../../../../..');
+
+/**
+ * @param {string} requestPath
+ * @return {string}
+ */
+function mapToReactBuild(requestPath) {
+  // Only handle extension paths because they have React build output.
+  if (!requestPath.includes('extensions/')) {
+    return requestPath;
+  }
+  return requestPath
+    .replace(/\/component\.jss$/, '/dist/styles.css')
+    .replace(/\/component\.js$/, '/dist/component-react.max.js');
+}
+
+/**
+ * Webpack ResolverPlugin that maps relative imports in source to their React
+ * bundle.
+ * import '../component.js' to import '../dist/component-react.max.js'
+ */
+class ReactBuildImportResolver {
+  /**
+   * @param {*} resolver
+   */
+  apply(resolver) {
+    resolver.hooks.file.tapAsync(
+      'ReactBuildImportResolverPlugin',
+      (request, _, callback) => {
+        const mappedRequestPath = mapToReactBuild(request.path);
+        if (mappedRequestPath === request.path) {
+          callback();
+          return;
+        }
+        if (!existsSync(mappedRequestPath)) {
+          callback();
+          return;
+        }
+        callback(null, {
+          ...request,
+          path: mappedRequestPath,
+          request: mappedRequestPath,
+        });
+      }
+    );
+  }
+}
+
+const modules = [
+  path.join(__dirname, 'node_modules'),
+  path.join(__dirname, '../../node_modules'),
+  path.join(rootDir, 'node_modules'),
+];
+
+module.exports = ({config}) => {
+  config.resolveLoader = {
+    modules,
+  };
+  config.resolve = {
+    modules,
+    plugins: [new ReactBuildImportResolver()],
+    extensions: ['.ts', '.tsx', '.js', '.jsx', '.json'],
+    alias: {
+      ...getRelativeAliasMap(rootDir, 'react'),
+      // Alias preact to react
+      'preact/dom': 'react-dom',
+      'preact/hooks': 'react',
+      'preact/compat': 'react',
+      'preact': 'react',
+    },
+  };
+  config.module = {
+    rules: [
+      {
+        test: /\.jsx?|tsx?$/,
+        loader: 'babel-loader',
+        exclude: /node_modules/,
+        query: mergeReactBabelConfig({
+          presets: [
+            [
+              '@babel/preset-env',
+              {
+                bugfixes: true,
+                targets: {'browsers': ['Last 2 versions']},
+              },
+            ],
+            ['@babel/preset-react', {'runtime': 'automatic'}],
+          ],
+        }),
+      },
+      {
+        test: /\.css$/i,
+        use: ['style-loader', 'css-loader'],
+      },
+    ],
+  };
+  // Replaced by minify-replace (babel) in the usual build pipeline
+  // build-system/babel-config/helpers.js#getReplacePlugin
+  config.plugins.push(new DefinePlugin(BUILD_CONSTANTS));
+
+  return config;
+};
diff --git a/build-system/tasks/storybook/env/static-dirs.js b/build-system/tasks/storybook/env/static-dirs.js
new file mode 100644
index 000000000000..df9c7580f260
--- /dev/null
+++ b/build-system/tasks/storybook/env/static-dirs.js
@@ -0,0 +1,17 @@
+/**
+ * @param {string} rootDir
+ * @return {string[]|undefined}
+ */
+function getStaticDirs(rootDir) {
+  // We only need to point to the rootDir when we're in the local dev server.
+  // When building, the output directory should be served along the rootDir.
+  const isBuild = process.argv?.[1]?.endsWith('build-storybook');
+  if (isBuild) {
+    return undefined;
+  }
+  return [rootDir];
+}
+
+module.exports = {
+  getStaticDirs,
+};
diff --git a/build-system/tasks/storybook/index.js b/build-system/tasks/storybook/index.js
index f1f0bff487a1..890a2ccbf329 100644
--- a/build-system/tasks/storybook/index.js
+++ b/build-system/tasks/storybook/index.js
@@ -6,110 +6,107 @@ const {createCtrlcHandler} = require('../../common/ctrlcHandler');
 const {cyan} = require('kleur/colors');
 const {defaultTask: runAmpDevBuildServer} = require('../default-task');
 const {exec, execScriptAsync} = require('../../common/exec');
-const {getBaseUrl} = require('../pr-deploy-bot-utils');
 const {isCiBuild} = require('../../common/ci');
-const {isPullRequestBuild} = require('../../common/ci');
 const {log} = require('../../common/logging');
-const {writeFileSync} = require('fs-extra');
-const {yellow} = require('kleur/colors');
+const {updateSubpackages} = require('../../common/update-packages');
+const {bootstrapThirdPartyFrames} = require('../helpers');
+
+/** @typedef {'amp'|'preact'|'react'} StorybookEnv */
 
 const ENV_PORTS = {
   amp: 9001,
   preact: 9002,
+  react: 9003,
 };
 
 const repoDir = path.join(__dirname, '../../..');
 
 /**
- * @param {string} env 'amp' or 'preact'
+ * @param {StorybookEnv} env
  * @return {string}
  */
-const envConfigDir = (env) => path.join(__dirname, `${env}-env`);
+const envDir = (env) => path.join(__dirname, 'env', env);
 
 /**
- * @param {string} env 'amp' or 'preact'
+ * @param {StorybookEnv} env
  */
-function launchEnv(env) {
-  if (env === 'amp') {
-    log(
-      yellow('AMP environment for storybook is temporarily disabled.\n') +
-        'See https://github.com/ampproject/storybook-addon-amp/issues/57'
-    );
-    return;
-  }
-  log(`Launching storybook for the ${cyan(env)} environment...`);
+function startStorybook(env) {
   const {'storybook_port': port = ENV_PORTS[env]} = argv;
+  log(`Launching storybook for the ${cyan(env)} environment...`);
   execScriptAsync(
     [
-      './node_modules/.bin/start-storybook',
-      `--config-dir ${envConfigDir(env)}`,
-      `--static-dir ${repoDir}/`,
+      'npx',
+      'start-storybook',
+      `--config-dir .`,
       `--port ${port}`,
       '--quiet',
       isCiBuild() ? '--ci' : '',
     ].join(' '),
-    {cwd: __dirname, stdio: 'inherit'}
+    {cwd: envDir(env), stdio: 'inherit'}
   ).on('error', () => {
     throw new Error('Launch failed');
   });
 }
 
 /**
- * @param {string} env 'amp' or 'preact'
+ * @param {StorybookEnv} env
  */
-function buildEnv(env) {
-  if (env === 'amp') {
-    log(
-      yellow('AMP environment for storybook is temporarily disabled.\n') +
-        'See https://github.com/ampproject/storybook-addon-amp/issues/57'
-    );
-    return;
-  }
-
-  const configDir = envConfigDir(env);
-
-  if (env === 'amp' && isPullRequestBuild()) {
-    // Allows PR deploys to reference built binaries.
-    writeFileSync(
-      `${configDir}/preview.js`,
-      // If you change this JS template, make sure to JSON.stringify every
-      // dynamic value. This prevents XSS and other types of garbling.
-      `// DO NOT${' '}SUBMIT.
-       // This preview.js file was generated for a specific PR build.
-       export const parameters = (${JSON.stringify({
-         ampBaseUrlOptions: [`${getBaseUrl()}/dist`],
-       })});`
-    );
-  }
+function buildStorybook(env) {
   log(`Building storybook for the ${cyan(env)} environment...`);
+
   const result = exec(
     [
-      './node_modules/.bin/build-storybook',
-      `--config-dir ${configDir}`,
+      'npx',
+      'build-storybook',
+      `--config-dir .`,
       `--output-dir ${repoDir}/examples/storybook/${env}`,
       '--quiet',
       `--loglevel ${isCiBuild() ? 'warn' : 'info'}`,
     ].join(' '),
-    {cwd: __dirname, stdio: 'inherit'}
+    {cwd: envDir(env), stdio: 'inherit'}
   );
   if (result.status != 0) {
     throw new Error('Build failed');
   }
 }
 
+/**
+ * @param {string} env
+ * @return {StorybookEnv[]}
+ */
+function parseEnvs(env) {
+  return /** @type {StorybookEnv[]} */ (
+    env.split(',').filter((env) => {
+      return env === 'amp' || env === 'preact' || env === 'react';
+    })
+  );
+}
+
 /**
  * @return {Promise<void>}
  */
 async function storybook() {
-  const {build = false, 'storybook_env': env = 'amp,preact'} = argv;
-  const envs = env.split(',');
-  if (!build && envs.includes('amp')) {
-    await runAmpDevBuildServer();
-  }
+  const {build = false, 'storybook_env': storybookEnv = 'preact'} = argv;
+  const envs = parseEnvs(storybookEnv);
   if (!build) {
     createCtrlcHandler('storybook');
+    if (envs.includes('amp')) {
+      await runAmpDevBuildServer();
+    } else {
+      // Proxy frames require an .html file output from the function below.
+      // runAmpDevBuildServer() does this implicitly, so it's not required to
+      // call directly in that case.
+      await bootstrapThirdPartyFrames({});
+    }
+  }
+  for (const env of envs) {
+    updateSubpackages(envDir(env));
+    if (build) {
+      buildStorybook(env);
+    } else {
+      startStorybook(env);
+    }
   }
-  envs.map(build ? buildEnv : launchEnv);
 }
 
 module.exports = {
@@ -122,6 +119,6 @@ storybook.description =
 storybook.flags = {
   'build': 'Build a static web application (see https://storybook.js.org/docs)',
   'storybook_env':
-    "Environment(s) to run Storybook (either 'amp', 'preact' or a list as 'amp,preact')",
+    "Environment(s) to run Storybook. Either 'amp', 'preact' or 'react', or a list as 'amp,preact'. Defaults to 'preact'",
   'storybook_port': 'Port from which to run the Storybook dashboard',
 };
diff --git a/build-system/tasks/storybook/package-lock.json b/build-system/tasks/storybook/package-lock.json
index 315771530f99..61d5fafb61fc 100644
--- a/build-system/tasks/storybook/package-lock.json
+++ b/build-system/tasks/storybook/package-lock.json
@@ -1,71 +1,81 @@
 {
   "name": "amp-storybook",
   "version": "0.1.0",
-  "lockfileVersion": 2,
+  "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "amp-storybook",
       "version": "0.1.0",
       "devDependencies": {
-        "@babel/core": "7.15.8",
-        "@babel/preset-react": "7.14.5",
-        "@babel/runtime-corejs3": "7.15.4",
-        "@storybook/addon-a11y": "6.3.12",
-        "@storybook/addon-controls": "6.3.12",
-        "@storybook/addon-knobs": "6.3.1",
-        "@storybook/addon-viewport": "6.3.12",
-        "@storybook/client-api": "6.3.12",
-        "@storybook/preact": "6.3.12",
-        "babel-loader": "8.2.3",
-        "core-js": "3.19.0",
-        "preact": "10.5.15",
-        "preact-render-to-string": "5.1.19",
-        "styled-jsx": "4.0.1"
+        "@babel/core": "7.26.0",
+        "@babel/preset-react": "7.26.3",
+        "@storybook/addon-a11y": "8.4.7",
+        "@storybook/addon-controls": "8.4.7",
+        "@storybook/addon-viewport": "8.4.7",
+        "babel-loader": "9.2.1"
+      }
+    },
+    "node_modules/@ampproject/remapping": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
+      "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.15.8",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz",
-      "integrity": "sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==",
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
+      "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/highlight": "^7.14.5"
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.0.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz",
-      "integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==",
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.5.tgz",
+      "integrity": "sha512-XvcZi1KWf88RVbF9wn8MN6tYFloU5qX8KjuF3E1PVBmJ9eypXfs4GRiJwLuTZL0iSnJUKn1BFPa5BPZZJyFzPg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.15.8",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.8.tgz",
-      "integrity": "sha512-3UG9dsxvYBMYwRv+gS41WKHno4K60/9GPy1CJaH6xy3Elq8CTtvtjT5R5jmNhXfCYLX2mTw+7/aq5ak/gOE0og==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.15.8",
-        "@babel/generator": "^7.15.8",
-        "@babel/helper-compilation-targets": "^7.15.4",
-        "@babel/helper-module-transforms": "^7.15.8",
-        "@babel/helpers": "^7.15.4",
-        "@babel/parser": "^7.15.8",
-        "@babel/template": "^7.15.4",
-        "@babel/traverse": "^7.15.4",
-        "@babel/types": "^7.15.6",
-        "convert-source-map": "^1.7.0",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.0.tgz",
+      "integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@ampproject/remapping": "^2.2.0",
+        "@babel/code-frame": "^7.26.0",
+        "@babel/generator": "^7.26.0",
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-module-transforms": "^7.26.0",
+        "@babel/helpers": "^7.26.0",
+        "@babel/parser": "^7.26.0",
+        "@babel/template": "^7.25.9",
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.26.0",
+        "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
-        "json5": "^2.1.2",
-        "semver": "^6.3.0",
-        "source-map": "^0.5.0"
+        "json5": "^2.2.3",
+        "semver": "^6.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -76,74 +86,76 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.15.8",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.8.tgz",
-      "integrity": "sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g==",
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.5.tgz",
+      "integrity": "sha512-2caSP6fN9I7HOe6nqhtft7V4g7/V/gfDsC3Ag4W7kEzzvRGKqiv0pu0HogPiZ3KaVSoNDhUws6IJjDjpfmYIXw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.15.6",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
+        "@babel/parser": "^7.26.5",
+        "@babel/types": "^7.26.5",
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "jsesc": "^3.0.2"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.15.4.tgz",
-      "integrity": "sha512-QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz",
+      "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.15.4"
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.15.4.tgz",
-      "integrity": "sha512-P8o7JP2Mzi0SdC6eWr1zF+AEYvrsZa7GSY1lTayjF5XJhVH0kjLYUZPvTMflP7tBgZoe9gIhTa60QwFpqh/E0Q==",
+    "node_modules/@babel/helper-compilation-targets": {
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.26.5.tgz",
+      "integrity": "sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-explode-assignable-expression": "^7.15.4",
-        "@babel/types": "^7.15.4"
+        "@babel/compat-data": "^7.26.5",
+        "@babel/helper-validator-option": "^7.25.9",
+        "browserslist": "^4.24.0",
+        "lru-cache": "^5.1.1",
+        "semver": "^6.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz",
-      "integrity": "sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==",
+    "node_modules/@babel/helper-module-imports": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
+      "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.15.0",
-        "@babel/helper-validator-option": "^7.14.5",
-        "browserslist": "^4.16.6",
-        "semver": "^6.3.0"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.4.tgz",
-      "integrity": "sha512-7ZmzFi+DwJx6A7mHRwbuucEYpyBwmh2Ca0RvI6z2+WLZYCqV0JOaLb+u0zbtmDicebgKBZgqbYfLaKNqSgv5Pw==",
+    "node_modules/@babel/helper-module-transforms": {
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz",
+      "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.15.4",
-        "@babel/helper-function-name": "^7.15.4",
-        "@babel/helper-member-expression-to-functions": "^7.15.4",
-        "@babel/helper-optimise-call-expression": "^7.15.4",
-        "@babel/helper-replace-supers": "^7.15.4",
-        "@babel/helper-split-export-declaration": "^7.15.4"
+        "@babel/helper-module-imports": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -152,28956 +164,2888 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz",
-      "integrity": "sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A==",
+    "node_modules/@babel/helper-plugin-utils": {
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz",
+      "integrity": "sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==",
       "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "regexpu-core": "^4.7.1"
-      },
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz",
-      "integrity": "sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew==",
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+      "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
       "dev": true,
-      "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"
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-explode-assignable-expression": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.15.4.tgz",
-      "integrity": "sha512-J14f/vq8+hdC2KoWLIQSsGrC9EFBKE4NFts8pfMpymfApds+fPqR30AOUWc4tyr56h9l/GA1Sxv2q3dLZWbQ/g==",
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+      "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
       "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.15.4"
-      },
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz",
-      "integrity": "sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==",
+    "node_modules/@babel/helper-validator-option": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
+      "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==",
       "dev": true,
-      "dependencies": {
-        "@babel/helper-get-function-arity": "^7.15.4",
-        "@babel/template": "^7.15.4",
-        "@babel/types": "^7.15.4"
-      },
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-get-function-arity": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz",
-      "integrity": "sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA==",
+    "node_modules/@babel/helpers": {
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.0.tgz",
+      "integrity": "sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.15.4"
+        "@babel/template": "^7.25.9",
+        "@babel/types": "^7.26.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz",
-      "integrity": "sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA==",
+    "node_modules/@babel/parser": {
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.5.tgz",
+      "integrity": "sha512-SRJ4jYmXRqV1/Xc+TIVG84WjHBXKlxO9sHQnA2Pf12QQEAp1LOh6kDzNHXcUnbH1QI0FDoPPVOt+vyUDucxpaw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.15.4"
+        "@babel/types": "^7.26.5"
+      },
+      "bin": {
+        "parser": "bin/babel-parser.js"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz",
-      "integrity": "sha512-cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA==",
+    "node_modules/@babel/plugin-syntax-jsx": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz",
+      "integrity": "sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.15.4"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-module-imports": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz",
-      "integrity": "sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA==",
+    "node_modules/@babel/plugin-transform-react-display-name": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.25.9.tgz",
+      "integrity": "sha512-KJfMlYIUxQB1CJfO3e0+h0ZHWOTLCPP115Awhaz8U0Zpq36Gl/cXlpoyMRnUWlhNUBAzldnCiAZNvCDj7CrKxQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.15.4"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-module-transforms": {
-      "version": "7.15.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.8.tgz",
-      "integrity": "sha512-DfAfA6PfpG8t4S6npwzLvTUpp0sS7JrcuaMiy1Y5645laRJIp/LiLGIBbQKaXSInK8tiGNI7FL7L8UvB8gdUZg==",
+    "node_modules/@babel/plugin-transform-react-jsx": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.25.9.tgz",
+      "integrity": "sha512-s5XwpQYCqGerXl+Pu6VDL3x0j2d82eiV77UJ8a2mDHAW7j9SWRqQ2y1fNo1Z74CdcYipl5Z41zvjj4Nfzq36rw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.15.4",
-        "@babel/helper-replace-supers": "^7.15.4",
-        "@babel/helper-simple-access": "^7.15.4",
-        "@babel/helper-split-export-declaration": "^7.15.4",
-        "@babel/helper-validator-identifier": "^7.15.7",
-        "@babel/template": "^7.15.4",
-        "@babel/traverse": "^7.15.4",
-        "@babel/types": "^7.15.6"
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-module-imports": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/plugin-syntax-jsx": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz",
-      "integrity": "sha512-E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw==",
+    "node_modules/@babel/plugin-transform-react-jsx-development": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.25.9.tgz",
+      "integrity": "sha512-9mj6rm7XVYs4mdLIpbZnHOYdpW42uoiBCTVowg7sP1thUOiANgMb4UtpRivR0pp5iL+ocvUv7X4mZgFRpJEzGw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.15.4"
+        "@babel/plugin-transform-react-jsx": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz",
-      "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==",
+    "node_modules/@babel/plugin-transform-react-pure-annotations": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.25.9.tgz",
+      "integrity": "sha512-KQ/Takk3T8Qzj5TppkS1be588lkbTp5uj7w6a0LeQaTMSckU/wK0oJ/pih+T690tkgI5jfmg2TqDJvd41Sj1Cg==",
       "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.15.4.tgz",
-      "integrity": "sha512-v53MxgvMK/HCwckJ1bZrq6dNKlmwlyRNYM6ypaRTdXWGOE2c1/SCa6dL/HimhPulGhZKw9W0QhREM583F/t0vQ==",
+    "node_modules/@babel/preset-react": {
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.26.3.tgz",
+      "integrity": "sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.15.4",
-        "@babel/helper-wrap-function": "^7.15.4",
-        "@babel/types": "^7.15.4"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-validator-option": "^7.25.9",
+        "@babel/plugin-transform-react-display-name": "^7.25.9",
+        "@babel/plugin-transform-react-jsx": "^7.25.9",
+        "@babel/plugin-transform-react-jsx-development": "^7.25.9",
+        "@babel/plugin-transform-react-pure-annotations": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-replace-supers": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz",
-      "integrity": "sha512-/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw==",
+    "node_modules/@babel/template": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz",
+      "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-member-expression-to-functions": "^7.15.4",
-        "@babel/helper-optimise-call-expression": "^7.15.4",
-        "@babel/traverse": "^7.15.4",
-        "@babel/types": "^7.15.4"
+        "@babel/code-frame": "^7.25.9",
+        "@babel/parser": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz",
-      "integrity": "sha512-UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.15.4"
+    "node_modules/@babel/traverse": {
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.5.tgz",
+      "integrity": "sha512-rkOSPOw+AXbgtwUga3U4u8RpoK9FEFWBNAlTpcnkLFjL5CT+oyHNuUUC/xx6XefEJ16r38r8Bc/lfp6rYuHeJQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.26.2",
+        "@babel/generator": "^7.26.5",
+        "@babel/parser": "^7.26.5",
+        "@babel/template": "^7.25.9",
+        "@babel/types": "^7.26.5",
+        "debug": "^4.3.1",
+        "globals": "^11.1.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.15.4.tgz",
-      "integrity": "sha512-BMRLsdh+D1/aap19TycS4eD1qELGrCBJwzaY9IE8LrpJtJb+H7rQkPIdsfgnMtLBA6DJls7X9z93Z4U8h7xw0A==",
+    "node_modules/@babel/types": {
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.5.tgz",
+      "integrity": "sha512-L6mZmwFDK6Cjh1nRCLXpa6no13ZIioJDz7mdkzHv399pThrTa/k0nUlNaenOeh2kWu/iaOQYElEpKPUswUa9Vg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.15.4"
+        "@babel/helper-string-parser": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz",
-      "integrity": "sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw==",
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.2.tgz",
+      "integrity": "sha512-thpVCb/rhxE/BnMLQ7GReQLLN8q9qbHmI55F4489/ByVg2aQaQ6kbcLb6FHkocZzQhxc4gx0sCk0tJkKBFzDhA==",
+      "cpu": [
+        "ppc64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.15.4"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "peer": true,
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.15.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz",
-      "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==",
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.24.2.tgz",
+      "integrity": "sha512-tmwl4hJkCfNHwFB3nBa8z1Uy3ypZpxqxfTQOcHX+xRByyYgunVbZ9MzUUfb0RxaHIMnbHagwAxuTL+tnNM+1/Q==",
+      "cpu": [
+        "arm"
+      ],
       "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "peer": true,
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@babel/helper-validator-option": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz",
-      "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==",
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.24.2.tgz",
+      "integrity": "sha512-cNLgeqCqV8WxfcTIOeL4OAtSmL8JjcN6m09XIgro1Wi7cF4t/THaWEa7eL5CMoMBdjoHOTh/vwTO/o2TRXIyzg==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "peer": true,
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@babel/helper-wrap-function": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.15.4.tgz",
-      "integrity": "sha512-Y2o+H/hRV5W8QhIfTpRIBwl57y8PrZt6JM3V8FOo5qarjshHItyH5lXlpMfBfmBefOqSCpKZs/6Dxqp0E/U+uw==",
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.24.2.tgz",
+      "integrity": "sha512-B6Q0YQDqMx9D7rvIcsXfmJfvUYLoP722bgfBlO5cGvNVb5V/+Y7nhBE3mHV9OpxBf4eAS2S68KZztiPaWq4XYw==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@babel/helper-function-name": "^7.15.4",
-        "@babel/template": "^7.15.4",
-        "@babel/traverse": "^7.15.4",
-        "@babel/types": "^7.15.4"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "peer": true,
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@babel/helpers": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.4.tgz",
-      "integrity": "sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==",
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.24.2.tgz",
+      "integrity": "sha512-kj3AnYWc+CekmZnS5IPu9D+HWtUI49hbnyqk0FLEJDbzCIQt7hg7ucF1SQAilhtYpIujfaHr6O0UHlzzSPdOeA==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.15.4",
-        "@babel/traverse": "^7.15.4",
-        "@babel/types": "^7.15.4"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "peer": true,
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@babel/highlight": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
-      "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.24.2.tgz",
+      "integrity": "sha512-WeSrmwwHaPkNR5H3yYfowhZcbriGqooyu3zI/3GGpF8AyUdsrrP0X6KumITGA9WOyiJavnGZUwPGvxvwfWPHIA==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.14.5",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "peer": true,
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@babel/parser": {
-      "version": "7.15.8",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.8.tgz",
-      "integrity": "sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==",
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.2.tgz",
+      "integrity": "sha512-UN8HXjtJ0k/Mj6a9+5u6+2eZ2ERD7Edt1Q9IZiB5UZAIdPnVKDoG7mdTVGhHJIeEml60JteamR3qhsr1r8gXvg==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "peer": true,
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4.tgz",
-      "integrity": "sha512-eBnpsl9tlhPhpI10kU06JHnrYXwg3+V6CaP2idsCXNef0aeslpqyITXQ74Vfk5uHgY7IG7XP0yIH8b42KSzHog==",
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.24.2.tgz",
+      "integrity": "sha512-TvW7wE/89PYW+IevEJXZ5sF6gJRDY/14hyIGFXdIucxCsbRmLUcjseQu1SyTko+2idmCw94TgyaEZi9HUSOe3Q==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.15.4",
-        "@babel/plugin-proposal-optional-chaining": "^7.14.5"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "peer": true,
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.13.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.15.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.15.8.tgz",
-      "integrity": "sha512-2Z5F2R2ibINTc63mY7FLqGfEbmofrHU9FitJW1Q7aPaKFhiPvSq6QEt/BoWN5oME3GVyjcRuNNSRbb9LC0CSWA==",
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.24.2.tgz",
+      "integrity": "sha512-n0WRM/gWIdU29J57hJyUdIsk0WarGd6To0s+Y+LwvlC55wt+GT/OgkwoXCXvIue1i1sSNWblHEig00GBWiJgfA==",
+      "cpu": [
+        "arm"
+      ],
       "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-remap-async-to-generator": "^7.15.4",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true,
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=18"
       }
     },
-    "node_modules/@babel/plugin-proposal-class-properties": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz",
-      "integrity": "sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg==",
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.2.tgz",
+      "integrity": "sha512-7HnAD6074BW43YvvUmE/35Id9/NB7BeX5EoNkK9obndmZBUk8xmJJeU7DwmUeN7tkysslb2eSl6CTrYz6oEMQg==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true,
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=18"
       }
     },
-    "node_modules/@babel/plugin-proposal-class-static-block": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.15.4.tgz",
-      "integrity": "sha512-M682XWrrLNk3chXCjoPUQWOyYsB93B9z3mRyjtqqYJWDf2mfCdIYgDrA11cgNVhAQieaq6F2fn2f3wI0U4aTjA==",
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.24.2.tgz",
+      "integrity": "sha512-sfv0tGPQhcZOgTKO3oBE9xpHuUqguHvSo4jl+wjnKwFpapx+vUDcawbwPNuBIAYdRAvIDBfZVvXprIj3HA+Ugw==",
+      "cpu": [
+        "ia32"
+      ],
       "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.15.4",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true,
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.12.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@babel/plugin-proposal-decorators": {
-      "version": "7.15.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.15.8.tgz",
-      "integrity": "sha512-5n8+xGK7YDrXF+WAORg3P7LlCCdiaAyKLZi22eP2BwTy4kJ0kFUMMDCj4nQ8YrKyNZgjhU/9eRVqONnjB3us8g==",
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.24.2.tgz",
+      "integrity": "sha512-CN9AZr8kEndGooS35ntToZLTQLHEjtVB5n7dl8ZcTZMonJ7CCfStrYhrzF97eAecqVbVJ7APOEe18RPI4KLhwQ==",
+      "cpu": [
+        "loong64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.15.4",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-decorators": "^7.14.5"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true,
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=18"
       }
     },
-    "node_modules/@babel/plugin-proposal-dynamic-import": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz",
-      "integrity": "sha512-ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g==",
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.24.2.tgz",
+      "integrity": "sha512-iMkk7qr/wl3exJATwkISxI7kTcmHKE+BlymIAbHO8xanq/TjHaaVThFF6ipWzPHryoFsesNQJPE/3wFJw4+huw==",
+      "cpu": [
+        "mips64el"
+      ],
       "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true,
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=18"
       }
     },
-    "node_modules/@babel/plugin-proposal-export-default-from": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.14.5.tgz",
-      "integrity": "sha512-T8KZ5abXvKMjF6JcoXjgac3ElmXf0AWzJwi2O/42Jk+HmCky3D9+i1B7NPP1FblyceqTevKeV/9szeikFoaMDg==",
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.24.2.tgz",
+      "integrity": "sha512-shsVrgCZ57Vr2L8mm39kO5PPIb+843FStGt7sGGoqiiWYconSxwTiuswC1VJZLCjNiMLAMh34jg4VSEQb+iEbw==",
+      "cpu": [
+        "ppc64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-export-default-from": "^7.14.5"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true,
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=18"
       }
     },
-    "node_modules/@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz",
-      "integrity": "sha512-g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA==",
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.24.2.tgz",
+      "integrity": "sha512-4eSFWnU9Hhd68fW16GD0TINewo1L6dRrB+oLNNbYyMUAeOD2yCK5KXGK1GH4qD/kT+bTEXjsyTCiJGHPZ3eM9Q==",
+      "cpu": [
+        "riscv64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true,
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=18"
       }
     },
-    "node_modules/@babel/plugin-proposal-json-strings": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz",
-      "integrity": "sha512-NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ==",
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.24.2.tgz",
+      "integrity": "sha512-S0Bh0A53b0YHL2XEXC20bHLuGMOhFDO6GN4b3YjRLK//Ep3ql3erpNcPlEFed93hsQAjAQDNsvcK+hV90FubSw==",
+      "cpu": [
+        "s390x"
+      ],
       "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true,
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=18"
       }
     },
-    "node_modules/@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz",
-      "integrity": "sha512-YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw==",
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.24.2.tgz",
+      "integrity": "sha512-8Qi4nQcCTbLnK9WoMjdC9NiTG6/E38RNICU6sUNqK0QFxCYgoARqVqxdFmWkdonVsvGqWhmm7MO0jyTqLqwj0Q==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true,
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=18"
       }
     },
-    "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz",
-      "integrity": "sha512-gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg==",
+    "node_modules/@esbuild/netbsd-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.24.2.tgz",
+      "integrity": "sha512-wuLK/VztRRpMt9zyHSazyCVdCXlpHkKm34WUyinD2lzK07FAHTq0KQvZZlXikNWkDGoT6x3TD51jKQ7gMVpopw==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "peer": true,
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=18"
       }
     },
-    "node_modules/@babel/plugin-proposal-numeric-separator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz",
-      "integrity": "sha512-yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg==",
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.24.2.tgz",
+      "integrity": "sha512-VefFaQUc4FMmJuAxmIHgUmfNiLXY438XrL4GDNV1Y1H/RW3qow68xTwjZKfj/+Plp9NANmzbH5R40Meudu8mmw==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "peer": true,
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=18"
       }
     },
-    "node_modules/@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.15.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.15.6.tgz",
-      "integrity": "sha512-qtOHo7A1Vt+O23qEAX+GdBpqaIuD3i9VRrWgCJeq7WO6H2d14EK3q11urj5Te2MAeK97nMiIdRpwd/ST4JFbNg==",
+    "node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.2.tgz",
+      "integrity": "sha512-YQbi46SBct6iKnszhSvdluqDmxCJA+Pu280Av9WICNwQmMxV7nLRHZfjQzwbPs3jeWnuAhE9Jy0NrnJ12Oz+0A==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.15.0",
-        "@babel/helper-compilation-targets": "^7.15.4",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.15.4"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "peer": true,
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=18"
       }
     },
-    "node_modules/@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz",
-      "integrity": "sha512-3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ==",
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.24.2.tgz",
+      "integrity": "sha512-+iDS6zpNM6EnJyWv0bMGLWSWeXGN/HTaF/LXHXHwejGsVi+ooqDfMCCTerNFxEkM3wYVcExkeGXNqshc9iMaOA==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "peer": true,
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=18"
       }
     },
-    "node_modules/@babel/plugin-proposal-optional-chaining": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz",
-      "integrity": "sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ==",
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.24.2.tgz",
+      "integrity": "sha512-hTdsW27jcktEvpwNHJU4ZwWFGkz2zRJUz8pvddmXPtXDzVKTTINmlmga3ZzwcuMpUvLw7JkLy9QLKyGpD2Yxig==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "peer": true,
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=18"
       }
     },
-    "node_modules/@babel/plugin-proposal-private-methods": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz",
-      "integrity": "sha512-838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g==",
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.24.2.tgz",
+      "integrity": "sha512-LihEQ2BBKVFLOC9ZItT9iFprsE9tqjDjnbulhHoFxYQtQfai7qfluVODIYxt1PgdoyQkz23+01rzwNwYfutxUQ==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "peer": true,
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=18"
       }
     },
-    "node_modules/@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.15.4.tgz",
-      "integrity": "sha512-X0UTixkLf0PCCffxgu5/1RQyGGbgZuKoI+vXP4iSbJSYwPb7hu06omsFGBvQ9lJEvwgrxHdS8B5nbfcd8GyUNA==",
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.24.2.tgz",
+      "integrity": "sha512-q+iGUwfs8tncmFC9pcnD5IvRHAzmbwQ3GPS5/ceCyHdjXubwQWI12MKWSNSMYLJMq23/IUCvJMS76PDqXe1fxA==",
+      "cpu": [
+        "ia32"
+      ],
       "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.15.4",
-        "@babel/helper-create-class-features-plugin": "^7.15.4",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "peer": true,
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=18"
       }
     },
-    "node_modules/@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz",
-      "integrity": "sha512-6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q==",
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.24.2.tgz",
+      "integrity": "sha512-7VTgWzgMGvup6aSqDPLiW5zHaxYJGTO4OokMjIlrCtf+VpEL+cXKtCvg723iguPYI5oaUNdS+/V7OU2gvXVWEg==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "peer": true,
       "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=18"
       }
     },
-    "node_modules/@babel/plugin-syntax-async-generators": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+        "@jridgewell/set-array": "^1.2.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.24"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "engines": {
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/@babel/plugin-syntax-class-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
+      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
       "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "engines": {
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/@babel/plugin-syntax-class-static-block": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
-      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
       "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/@babel/plugin-syntax-decorators": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.14.5.tgz",
-      "integrity": "sha512-c4sZMRWL4GSvP1EXy0woIP7m4jkVcEuG8R1TOZxPBPtp4FSM/kiPZub9UIs/Jrb5ZAOzvTUSGYrWsrSu1JvoPw==",
+    "node_modules/@jridgewell/source-map": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz",
+      "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@jridgewell/gen-mapping": "^0.3.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
       }
     },
-    "node_modules/@babel/plugin-syntax-dynamic-import": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
+      "dev": true
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
-    "node_modules/@babel/plugin-syntax-export-default-from": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.14.5.tgz",
-      "integrity": "sha512-snWDxjuaPEobRBnhpqEfZ8RMxDbHt8+87fiEioGuE+Uc0xAKgSD8QiuL3lF93hPVQfZFAcYwrrf+H5qUhike3Q==",
+    "node_modules/@storybook/addon-a11y": {
+      "version": "8.4.7",
+      "resolved": "https://registry.npmjs.org/@storybook/addon-a11y/-/addon-a11y-8.4.7.tgz",
+      "integrity": "sha512-GpUvXp6n25U1ZSv+hmDC+05BEqxWdlWjQTb/GaboRXZQeMBlze6zckpVb66spjmmtQAIISo0eZxX1+mGcVR7lA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@storybook/addon-highlight": "8.4.7",
+        "axe-core": "^4.2.0"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "storybook": "^8.4.7"
       }
     },
-    "node_modules/@babel/plugin-syntax-export-namespace-from": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
+    "node_modules/@storybook/addon-controls": {
+      "version": "8.4.7",
+      "resolved": "https://registry.npmjs.org/@storybook/addon-controls/-/addon-controls-8.4.7.tgz",
+      "integrity": "sha512-377uo5IsJgXLnQLJixa47+11V+7Wn9KcDEw+96aGCBCfLbWNH8S08tJHHnSu+jXg9zoqCAC23MetntVp6LetHA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
+        "@storybook/global": "^5.0.0",
+        "dequal": "^2.0.2",
+        "ts-dedent": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "storybook": "^8.4.7"
       }
     },
-    "node_modules/@babel/plugin-syntax-json-strings": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+    "node_modules/@storybook/addon-highlight": {
+      "version": "8.4.7",
+      "resolved": "https://registry.npmjs.org/@storybook/addon-highlight/-/addon-highlight-8.4.7.tgz",
+      "integrity": "sha512-whQIDBd3PfVwcUCrRXvCUHWClXe9mQ7XkTPCdPo4B/tZ6Z9c6zD8JUHT76ddyHivixFLowMnA8PxMU6kCMAiNw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+        "@storybook/global": "^5.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "storybook": "^8.4.7"
       }
     },
-    "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.14.5.tgz",
-      "integrity": "sha512-ohuFIsOMXJnbOMRfX7/w7LocdR6R7whhuRD4ax8IipLcLPlZGJKkBxgHp++U4N/vKyU16/YDQr2f5seajD3jIw==",
+    "node_modules/@storybook/addon-viewport": {
+      "version": "8.4.7",
+      "resolved": "https://registry.npmjs.org/@storybook/addon-viewport/-/addon-viewport-8.4.7.tgz",
+      "integrity": "sha512-hvczh/jjuXXcOogih09a663sRDDSATXwbE866al1DXgbDFraYD/LxX/QDb38W9hdjU9+Qhx8VFIcNWoMQns5HQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "memoizerific": "^1.11.3"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "storybook": "^8.4.7"
       }
     },
-    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+    "node_modules/@storybook/core": {
+      "version": "8.4.7",
+      "resolved": "https://registry.npmjs.org/@storybook/core/-/core-8.4.7.tgz",
+      "integrity": "sha512-7Z8Z0A+1YnhrrSXoKKwFFI4gnsLbWzr8fnDCU6+6HlDukFYh8GHRcZ9zKfqmy6U3hw2h8H5DrHsxWfyaYUUOoA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@storybook/csf": "^0.1.11",
+        "better-opn": "^3.0.2",
+        "browser-assert": "^1.2.1",
+        "esbuild": "^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0",
+        "esbuild-register": "^3.5.0",
+        "jsdoc-type-pratt-parser": "^4.0.0",
+        "process": "^0.11.10",
+        "recast": "^0.23.5",
+        "semver": "^7.6.2",
+        "util": "^0.12.5",
+        "ws": "^8.2.3"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "prettier": "^2 || ^3"
+      },
+      "peerDependenciesMeta": {
+        "prettier": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+    "node_modules/@storybook/core/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
       "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+      "license": "ISC",
+      "peer": true,
+      "bin": {
+        "semver": "bin/semver.js"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "engines": {
+        "node": ">=10"
       }
     },
-    "node_modules/@babel/plugin-syntax-numeric-separator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+    "node_modules/@storybook/csf": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/@storybook/csf/-/csf-0.1.13.tgz",
+      "integrity": "sha512-7xOOwCLGB3ebM87eemep89MYRFTko+D8qE7EdAAq74lgdqRR5cOUtYWJLjO2dLtP94nqoOdHJo6MdLLKzg412Q==",
       "dev": true,
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "type-fest": "^2.19.0"
       }
     },
-    "node_modules/@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+    "node_modules/@storybook/global": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@storybook/global/-/global-5.0.0.tgz",
+      "integrity": "sha512-FcOqPAXACP0I3oJ/ws6/rrPT9WGhu915Cg8D02a9YxLo0DE9zI+a9A5gRGvmQ09fiWPukqI8ZAEoQEdWUKMQdQ==",
+      "dev": true
+    },
+    "node_modules/@types/eslint": {
+      "version": "8.4.1",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.1.tgz",
+      "integrity": "sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@types/estree": "*",
+        "@types/json-schema": "*"
       }
     },
-    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+    "node_modules/@types/eslint-scope": {
+      "version": "3.7.3",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz",
+      "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@types/eslint": "*",
+        "@types/estree": "*"
       }
     },
-    "node_modules/@babel/plugin-syntax-optional-chaining": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+    "node_modules/@types/estree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz",
+      "integrity": "sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/@types/json-schema": {
+      "version": "7.0.9",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
+      "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
+      "dev": true
+    },
+    "node_modules/@types/node": {
+      "version": "18.18.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.5.tgz",
+      "integrity": "sha512-4slmbtwV59ZxitY4ixUZdy1uRLf9eSIvBWPQxNjhHYWEtn0FryfKpyS2cvADYXTayWdKEIsJengncrVvkI4I6A==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/@webassemblyjs/ast": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
+      "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@webassemblyjs/helper-numbers": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
       }
     },
-    "node_modules/@babel/plugin-syntax-private-property-in-object": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
-      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
+    "node_modules/@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
+      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/@webassemblyjs/helper-api-error": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
+      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/@webassemblyjs/helper-buffer": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz",
+      "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==",
       "dev": true,
+      "peer": true
+    },
+    "node_modules/@webassemblyjs/helper-numbers": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
+      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
+      "dev": true,
+      "peer": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
+        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@xtuc/long": "4.2.2"
       }
     },
-    "node_modules/@babel/plugin-syntax-top-level-await": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
+      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/@webassemblyjs/helper-wasm-section": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz",
+      "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6"
       }
     },
-    "node_modules/@babel/plugin-syntax-typescript": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz",
-      "integrity": "sha512-u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q==",
+    "node_modules/@webassemblyjs/ieee754": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
+      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@xtuc/ieee754": "^1.2.0"
       }
     },
-    "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz",
-      "integrity": "sha512-KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A==",
+    "node_modules/@webassemblyjs/leb128": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
+      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@xtuc/long": "4.2.2"
       }
     },
-    "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz",
-      "integrity": "sha512-szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA==",
+    "node_modules/@webassemblyjs/utf8": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
+      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/@webassemblyjs/wasm-edit": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz",
+      "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "@babel/helper-module-imports": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-remap-async-to-generator": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/helper-wasm-section": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6",
+        "@webassemblyjs/wasm-opt": "1.11.6",
+        "@webassemblyjs/wasm-parser": "1.11.6",
+        "@webassemblyjs/wast-printer": "1.11.6"
       }
     },
-    "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz",
-      "integrity": "sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ==",
+    "node_modules/@webassemblyjs/wasm-gen": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz",
+      "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
       }
     },
-    "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.15.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz",
-      "integrity": "sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q==",
+    "node_modules/@webassemblyjs/wasm-opt": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz",
+      "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6",
+        "@webassemblyjs/wasm-parser": "1.11.6"
       }
     },
-    "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.15.4.tgz",
-      "integrity": "sha512-Yjvhex8GzBmmPQUvpXRPWQ9WnxXgAFuZSrqOK/eJlOGIXwvv8H3UEdUigl1gb/bnjTrln+e8bkZUYCBt/xYlBg==",
+    "node_modules/@webassemblyjs/wasm-parser": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz",
+      "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.15.4",
-        "@babel/helper-function-name": "^7.15.4",
-        "@babel/helper-optimise-call-expression": "^7.15.4",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.15.4",
-        "@babel/helper-split-export-declaration": "^7.15.4",
-        "globals": "^11.1.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
       }
     },
-    "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz",
-      "integrity": "sha512-pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg==",
+    "node_modules/@webassemblyjs/wast-printer": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz",
+      "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@webassemblyjs/ast": "1.11.6",
+        "@xtuc/long": "4.2.2"
       }
     },
-    "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.14.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz",
-      "integrity": "sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw==",
+    "node_modules/@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
       "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+      "peer": true
+    },
+    "node_modules/@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/acorn": {
+      "version": "8.12.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
+      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "bin": {
+        "acorn": "bin/acorn"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-import-assertions": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
+      "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
+      "dev": true,
+      "peer": true,
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "acorn": "^8"
       }
     },
-    "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz",
-      "integrity": "sha512-loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw==",
+    "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,
+      "peer": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz",
-      "integrity": "sha512-iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A==",
+    "node_modules/ajv-formats": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "ajv": "^8.0.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "ajv": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz",
-      "integrity": "sha512-jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA==",
+    "node_modules/ajv-formats/node_modules/ajv": {
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.15.4.tgz",
-      "integrity": "sha512-DRTY9fA751AFBDh2oxydvVm4SYevs5ILTWLs6xKXps4Re/KG5nfUkr+TdHCrRWB8C69TlzVgA9b3RmGWmgN9LA==",
+    "node_modules/ajv-formats/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
+    "node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
       "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
+      "peer": true,
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "ajv": "^6.9.1"
       }
     },
-    "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz",
-      "integrity": "sha512-vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ==",
+    "node_modules/ast-types": {
+      "version": "0.16.1",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.16.1.tgz",
+      "integrity": "sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg==",
       "dev": true,
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "tslib": "^2.0.1"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=4"
       }
     },
-    "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz",
-      "integrity": "sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A==",
+    "node_modules/available-typed-arrays": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
+      "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
       "dev": true,
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "possible-typed-array-names": "^1.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 0.4"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz",
-      "integrity": "sha512-WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q==",
+    "node_modules/axe-core": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.4.1.tgz",
+      "integrity": "sha512-gd1kmb21kwNuWr6BQz8fv6GNECPBnUasepcoLbekws23NVBLODdsClRZ+bQ8+9Uomf3Sm3+Vwn0oYG9NvwnJCw==",
       "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=4"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz",
-      "integrity": "sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g==",
+    "node_modules/babel-loader": {
+      "version": "9.2.1",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.2.1.tgz",
+      "integrity": "sha512-fqe8naHt46e0yIdkjUZYqddSXfej3AHajX+CSO5X7oy0EmPc6o5Xh+RClNoHjnieWz9AW4kZxW9yyFMhVB1QLA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
+        "find-cache-dir": "^4.0.0",
+        "schema-utils": "^4.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 14.15.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.12.0",
+        "webpack": ">=5"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.4.tgz",
-      "integrity": "sha512-qg4DPhwG8hKp4BbVDvX1s8cohM8a6Bvptu4l6Iingq5rW+yRUAhe/YRup/YcW2zCOlrysEWVhftIcKzrEZv3sA==",
+    "node_modules/better-opn": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/better-opn/-/better-opn-3.0.2.tgz",
+      "integrity": "sha512-aVNobHnJqLiUelTaHat9DZ1qM2w0C0Eym4LPI/3JxOnSokGVdsl1T1kN7TFvsEAD8G47A6VKQ0TVHqbBnYMJlQ==",
       "dev": true,
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.15.4",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-simple-access": "^7.15.4",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
+        "open": "^8.0.4"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=12.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.15.4.tgz",
-      "integrity": "sha512-fJUnlQrl/mezMneR72CKCgtOoahqGJNVKpompKwzv3BrEXdlPspTcyxrZ1XmDTIr9PpULrgEQo3qNKp6dW7ssw==",
+    "node_modules/browser-assert": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/browser-assert/-/browser-assert-1.2.1.tgz",
+      "integrity": "sha512-nfulgvOR6S4gt9UKCeGJOuSGBPGiFT6oQ/2UBnvTY/5aQ1PnksW72fhZkM30DzoRRv2WpwZf1vHHEr3mtuXIWQ==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/browserslist": {
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.0.tgz",
+      "integrity": "sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==",
       "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-hoist-variables": "^7.15.4",
-        "@babel/helper-module-transforms": "^7.15.4",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-validator-identifier": "^7.14.9",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
+        "caniuse-lite": "^1.0.30001663",
+        "electron-to-chromium": "^1.5.28",
+        "node-releases": "^2.0.18",
+        "update-browserslist-db": "^1.1.0"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "bin": {
+        "browserslist": "cli.js"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz",
-      "integrity": "sha512-RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA==",
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
+      "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
       "dev": true,
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "call-bind-apply-helpers": "^1.0.0",
+        "es-define-property": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 0.4"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz",
-      "integrity": "sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA==",
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz",
+      "integrity": "sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==",
       "dev": true,
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5"
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz",
-      "integrity": "sha512-Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ==",
+    "node_modules/call-bound": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz",
+      "integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==",
       "dev": true,
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "call-bind-apply-helpers": "^1.0.1",
+        "get-intrinsic": "^1.2.6"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 0.4"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz",
-      "integrity": "sha512-MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg==",
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001666",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001666.tgz",
+      "integrity": "sha512-gD14ICmoV5ZZM1OdzPWmpx+q4GyefaK06zi8hmfHV5xe4/2nOQX3+Dw5o+fSqOws2xVwL9j+anOPFwHzdEdV4g==",
       "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.14.5"
-      },
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "CC-BY-4.0"
+    },
+    "node_modules/chrome-trace-event": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
+      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
+      "dev": true,
+      "peer": true,
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=6.0"
       }
     },
-    "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.15.4.tgz",
-      "integrity": "sha512-9WB/GUTO6lvJU3XQsSr6J/WKvBC2hcs4Pew8YxZagi6GkTdniyqp8On5kqdK8MN0LMeu0mGbhPN+O049NV/9FQ==",
+    "node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/common-path-prefix": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz",
+      "integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==",
+      "dev": true
+    },
+    "node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true
+    },
+    "node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "ms": "2.1.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=6.0"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz",
-      "integrity": "sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw==",
+    "node_modules/define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
       "dev": true,
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 0.4"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@babel/plugin-transform-react-display-name": {
-      "version": "7.15.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.15.1.tgz",
-      "integrity": "sha512-yQZ/i/pUCJAHI/LbtZr413S3VT26qNrEm0M5RRxQJA947/YNYwbZbBaXGDrq6CG5QsZycI1VIP6d7pQaBfP+8Q==",
+    "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,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
+      "license": "MIT",
+      "peer": true,
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=8"
       }
     },
-    "node_modules/@babel/plugin-transform-react-jsx": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.9.tgz",
-      "integrity": "sha512-30PeETvS+AeD1f58i1OVyoDlVYQhap/K20ZrMjLmmzmC2AYR/G43D4sdJAaDAqCD3MYpSWbmrz3kES158QSLjw==",
+    "node_modules/dequal": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
+      "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
       "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-module-imports": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-jsx": "^7.14.5",
-        "@babel/types": "^7.14.9"
-      },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=6"
       }
     },
-    "node_modules/@babel/plugin-transform-react-jsx-development": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.14.5.tgz",
-      "integrity": "sha512-rdwG/9jC6QybWxVe2UVOa7q6cnTpw8JRRHOxntG/h6g/guAOe6AhtQHJuJh5FwmnXIT1bdm5vC2/5huV8ZOorQ==",
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
       "dev": true,
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@babel/plugin-transform-react-jsx": "^7.14.5"
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/@babel/plugin-transform-react-pure-annotations": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.14.5.tgz",
-      "integrity": "sha512-3X4HpBJimNxW4rhUy/SONPyNQHp5YRr0HhJdT2OH1BRp0of7u3Dkirc7x9FRJMKMqTBI079VZ1hzv7Ouuz///g==",
+    "node_modules/electron-to-chromium": {
+      "version": "1.5.31",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.31.tgz",
+      "integrity": "sha512-QcDoBbQeYt0+3CWcK/rEbuHvwpbT/8SV9T3OSgs6cX1FlcUAkgrkqbg9zLnDrMM/rLamzQwal4LYFCiWk861Tg==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/enhanced-resolve": {
+      "version": "5.15.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
+      "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.2.0"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=10.13.0"
       }
     },
-    "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz",
-      "integrity": "sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg==",
+    "node_modules/es-define-property": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
       "dev": true,
-      "dependencies": {
-        "regenerator-transform": "^0.14.2"
-      },
+      "license": "MIT",
+      "peer": true,
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz",
-      "integrity": "sha512-cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg==",
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
       "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
+      "license": "MIT",
+      "peer": true,
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz",
-      "integrity": "sha512-xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g==",
+    "node_modules/es-module-lexer": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.0.tgz",
+      "integrity": "sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/es-object-atoms": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
+      "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
       "dev": true,
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "es-errors": "^1.3.0"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.15.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.15.8.tgz",
-      "integrity": "sha512-/daZ8s2tNaRekl9YJa9X4bzjpeRZLt122cpgFnQPLGUe61PH8zMEBmYqKkW5xF5JUEh5buEGXJoQpqBmIbpmEQ==",
+    "node_modules/esbuild": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.24.2.tgz",
+      "integrity": "sha512-+9egpBW8I3CD5XPe0n6BfT5fxLzxrlDzqydF3aviG+9ni1lDC/OvMHcxqEFV0+LANZG5R1bFMWfUrjVsdwxJvA==",
       "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.15.4"
+      "hasInstallScript": true,
+      "license": "MIT",
+      "peer": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=18"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz",
-      "integrity": "sha512-Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A==",
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.24.2",
+        "@esbuild/android-arm": "0.24.2",
+        "@esbuild/android-arm64": "0.24.2",
+        "@esbuild/android-x64": "0.24.2",
+        "@esbuild/darwin-arm64": "0.24.2",
+        "@esbuild/darwin-x64": "0.24.2",
+        "@esbuild/freebsd-arm64": "0.24.2",
+        "@esbuild/freebsd-x64": "0.24.2",
+        "@esbuild/linux-arm": "0.24.2",
+        "@esbuild/linux-arm64": "0.24.2",
+        "@esbuild/linux-ia32": "0.24.2",
+        "@esbuild/linux-loong64": "0.24.2",
+        "@esbuild/linux-mips64el": "0.24.2",
+        "@esbuild/linux-ppc64": "0.24.2",
+        "@esbuild/linux-riscv64": "0.24.2",
+        "@esbuild/linux-s390x": "0.24.2",
+        "@esbuild/linux-x64": "0.24.2",
+        "@esbuild/netbsd-arm64": "0.24.2",
+        "@esbuild/netbsd-x64": "0.24.2",
+        "@esbuild/openbsd-arm64": "0.24.2",
+        "@esbuild/openbsd-x64": "0.24.2",
+        "@esbuild/sunos-x64": "0.24.2",
+        "@esbuild/win32-arm64": "0.24.2",
+        "@esbuild/win32-ia32": "0.24.2",
+        "@esbuild/win32-x64": "0.24.2"
+      }
+    },
+    "node_modules/esbuild-register": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/esbuild-register/-/esbuild-register-3.6.0.tgz",
+      "integrity": "sha512-H2/S7Pm8a9CL1uhp9OvjwrBh5Pvx0H8qVOxNu8Wed9Y7qv56MPtq+GGM8RJpq6glYJn9Wspr8uw7l55uyinNeg==",
       "dev": true,
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "debug": "^4.3.4"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "esbuild": ">=0.12 <1"
       }
     },
-    "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz",
-      "integrity": "sha512-22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg==",
+    "node_modules/escalade": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
+      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
       "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=6"
       }
     },
-    "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz",
-      "integrity": "sha512-lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw==",
+    "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,
+      "peer": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=8.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-typescript": {
-      "version": "7.15.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.15.8.tgz",
-      "integrity": "sha512-ZXIkJpbaf6/EsmjeTbiJN/yMxWPFWvlr7sEG1P95Xb4S4IBcrf2n7s/fItIhsAmOf8oSh3VJPDppO6ExfAfKRQ==",
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
       "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.15.4",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-typescript": "^7.14.5"
+      "license": "BSD-2-Clause",
+      "peer": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=4"
       }
     },
-    "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz",
-      "integrity": "sha512-crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA==",
+    "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,
+      "peer": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "estraverse": "^5.2.0"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=4.0"
       }
     },
-    "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz",
-      "integrity": "sha512-UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw==",
+    "node_modules/esrecurse/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,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
+      "peer": true,
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=4.0"
       }
     },
-    "node_modules/@babel/preset-env": {
-      "version": "7.15.8",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.8.tgz",
-      "integrity": "sha512-rCC0wH8husJgY4FPbHsiYyiLxSY8oMDJH7Rl6RQMknbN9oDDHhM9RDFvnGM2MgkbUJzSQB4gtuwygY5mCqGSsA==",
+    "node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
       "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.15.0",
-        "@babel/helper-compilation-targets": "^7.15.4",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-validator-option": "^7.14.5",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.15.4",
-        "@babel/plugin-proposal-async-generator-functions": "^7.15.8",
-        "@babel/plugin-proposal-class-properties": "^7.14.5",
-        "@babel/plugin-proposal-class-static-block": "^7.15.4",
-        "@babel/plugin-proposal-dynamic-import": "^7.14.5",
-        "@babel/plugin-proposal-export-namespace-from": "^7.14.5",
-        "@babel/plugin-proposal-json-strings": "^7.14.5",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.14.5",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5",
-        "@babel/plugin-proposal-numeric-separator": "^7.14.5",
-        "@babel/plugin-proposal-object-rest-spread": "^7.15.6",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.14.5",
-        "@babel/plugin-proposal-optional-chaining": "^7.14.5",
-        "@babel/plugin-proposal-private-methods": "^7.14.5",
-        "@babel/plugin-proposal-private-property-in-object": "^7.15.4",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.14.5",
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-class-properties": "^7.12.13",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@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.14.5",
-        "@babel/plugin-transform-async-to-generator": "^7.14.5",
-        "@babel/plugin-transform-block-scoped-functions": "^7.14.5",
-        "@babel/plugin-transform-block-scoping": "^7.15.3",
-        "@babel/plugin-transform-classes": "^7.15.4",
-        "@babel/plugin-transform-computed-properties": "^7.14.5",
-        "@babel/plugin-transform-destructuring": "^7.14.7",
-        "@babel/plugin-transform-dotall-regex": "^7.14.5",
-        "@babel/plugin-transform-duplicate-keys": "^7.14.5",
-        "@babel/plugin-transform-exponentiation-operator": "^7.14.5",
-        "@babel/plugin-transform-for-of": "^7.15.4",
-        "@babel/plugin-transform-function-name": "^7.14.5",
-        "@babel/plugin-transform-literals": "^7.14.5",
-        "@babel/plugin-transform-member-expression-literals": "^7.14.5",
-        "@babel/plugin-transform-modules-amd": "^7.14.5",
-        "@babel/plugin-transform-modules-commonjs": "^7.15.4",
-        "@babel/plugin-transform-modules-systemjs": "^7.15.4",
-        "@babel/plugin-transform-modules-umd": "^7.14.5",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.14.9",
-        "@babel/plugin-transform-new-target": "^7.14.5",
-        "@babel/plugin-transform-object-super": "^7.14.5",
-        "@babel/plugin-transform-parameters": "^7.15.4",
-        "@babel/plugin-transform-property-literals": "^7.14.5",
-        "@babel/plugin-transform-regenerator": "^7.14.5",
-        "@babel/plugin-transform-reserved-words": "^7.14.5",
-        "@babel/plugin-transform-shorthand-properties": "^7.14.5",
-        "@babel/plugin-transform-spread": "^7.15.8",
-        "@babel/plugin-transform-sticky-regex": "^7.14.5",
-        "@babel/plugin-transform-template-literals": "^7.14.5",
-        "@babel/plugin-transform-typeof-symbol": "^7.14.5",
-        "@babel/plugin-transform-unicode-escapes": "^7.14.5",
-        "@babel/plugin-transform-unicode-regex": "^7.14.5",
-        "@babel/preset-modules": "^0.1.4",
-        "@babel/types": "^7.15.6",
-        "babel-plugin-polyfill-corejs2": "^0.2.2",
-        "babel-plugin-polyfill-corejs3": "^0.2.5",
-        "babel-plugin-polyfill-regenerator": "^0.2.2",
-        "core-js-compat": "^3.16.0",
-        "semver": "^6.3.0"
-      },
+      "peer": true,
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=4.0"
       }
     },
-    "node_modules/@babel/preset-env/node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.5.tgz",
-      "integrity": "sha512-ninF5MQNwAX9Z7c9ED+H2pGt1mXdP4TqzlHKyPIYmJIYz0N+++uwdM7RnJukklhzJ54Q84vA4ZJkgs7lu5vqcw==",
+    "node_modules/events": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
       "dev": true,
-      "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.2.2",
-        "core-js-compat": "^3.16.2"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "peer": true,
+      "engines": {
+        "node": ">=0.8.x"
       }
     },
-    "node_modules/@babel/preset-modules": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
-      "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
       "dev": true,
-      "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"
-      }
+      "peer": true
     },
-    "node_modules/@babel/preset-react": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.14.5.tgz",
-      "integrity": "sha512-XFxBkjyObLvBaAvkx1Ie95Iaq4S/GUEIrejyrntQ/VCMKUYvKLoyKxOBzJ2kjA3b6rC9/KL6KXfDC2GqvLiNqQ==",
+    "node_modules/find-cache-dir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-4.0.0.tgz",
+      "integrity": "sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-validator-option": "^7.14.5",
-        "@babel/plugin-transform-react-display-name": "^7.14.5",
-        "@babel/plugin-transform-react-jsx": "^7.14.5",
-        "@babel/plugin-transform-react-jsx-development": "^7.14.5",
-        "@babel/plugin-transform-react-pure-annotations": "^7.14.5"
+        "common-path-prefix": "^3.0.0",
+        "pkg-dir": "^7.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=14.16"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@babel/preset-typescript": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.15.0.tgz",
-      "integrity": "sha512-lt0Y/8V3y06Wq/8H/u0WakrqciZ7Fz7mwPDHWUJAXlABL5hiUG42BNlRXiELNjeWjO5rWmnNKlx+yzJvxezHow==",
+    "node_modules/find-cache-dir/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==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-validator-option": "^7.14.5",
-        "@babel/plugin-transform-typescript": "^7.15.0"
+        "locate-path": "^7.1.0",
+        "path-exists": "^5.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@babel/register": {
-      "version": "7.15.3",
-      "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.15.3.tgz",
-      "integrity": "sha512-mj4IY1ZJkorClxKTImccn4T81+UKTo4Ux0+OFSV9hME1ooqS9UV+pJ6BjD0qXPK4T3XW/KNa79XByjeEMZz+fw==",
+    "node_modules/find-cache-dir/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==",
       "dev": true,
       "dependencies": {
-        "clone-deep": "^4.0.1",
-        "find-cache-dir": "^2.0.0",
-        "make-dir": "^2.1.0",
-        "pirates": "^4.0.0",
-        "source-map-support": "^0.5.16"
+        "p-locate": "^6.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@babel/runtime": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
-      "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+    "node_modules/find-cache-dir/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==",
       "dev": true,
       "dependencies": {
-        "regenerator-runtime": "^0.13.4"
+        "yocto-queue": "^1.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@babel/runtime-corejs3": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.15.4.tgz",
-      "integrity": "sha512-lWcAqKeB624/twtTc3w6w/2o9RqJPaNBhPGK6DKLSiwuVWC7WFkypWyNg+CpZoyJH0jVzv1uMtXZ/5/lQOLtCg==",
+    "node_modules/find-cache-dir/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==",
       "dev": true,
       "dependencies": {
-        "core-js-pure": "^3.16.0",
-        "regenerator-runtime": "^0.13.4"
+        "p-limit": "^4.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@babel/template": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.15.4.tgz",
-      "integrity": "sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==",
+    "node_modules/find-cache-dir/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==",
       "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/parser": "^7.15.4",
-        "@babel/types": "^7.15.4"
-      },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       }
     },
-    "node_modules/@babel/traverse": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.4.tgz",
-      "integrity": "sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==",
+    "node_modules/find-cache-dir/node_modules/pkg-dir": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-7.0.0.tgz",
+      "integrity": "sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/generator": "^7.15.4",
-        "@babel/helper-function-name": "^7.15.4",
-        "@babel/helper-hoist-variables": "^7.15.4",
-        "@babel/helper-split-export-declaration": "^7.15.4",
-        "@babel/parser": "^7.15.4",
-        "@babel/types": "^7.15.4",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
+        "find-up": "^6.3.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@babel/types": {
-      "version": "7.15.6",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.6.tgz",
-      "integrity": "sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==",
+    "node_modules/find-cache-dir/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,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.14.9",
-        "to-fast-properties": "^2.0.0"
-      },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@discoveryjs/json-ext": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz",
-      "integrity": "sha512-6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA==",
+    "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==",
       "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "is-callable": "^1.1.3"
       }
     },
-    "node_modules/@emotion/cache": {
-      "version": "10.0.29",
-      "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-10.0.29.tgz",
-      "integrity": "sha512-fU2VtSVlHiF27empSbxi1O2JFdNWZO+2NFHfwO0pxgTep6Xa3uGb+3pVKfLww2l/IBGLNEZl5Xf/++A4wAYDYQ==",
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
       "dev": true,
-      "dependencies": {
-        "@emotion/sheet": "0.9.4",
-        "@emotion/stylis": "0.8.5",
-        "@emotion/utils": "0.11.3",
-        "@emotion/weak-memoize": "0.2.5"
+      "license": "MIT",
+      "peer": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@emotion/core": {
-      "version": "10.1.1",
-      "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
-      "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
       "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.5.5",
-        "@emotion/cache": "^10.0.27",
-        "@emotion/css": "^10.0.27",
-        "@emotion/serialize": "^0.11.15",
-        "@emotion/sheet": "0.9.4",
-        "@emotion/utils": "0.11.3"
-      },
-      "peerDependencies": {
-        "react": ">=16.3.0"
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@emotion/css": {
-      "version": "10.0.27",
-      "resolved": "https://registry.npmjs.org/@emotion/css/-/css-10.0.27.tgz",
-      "integrity": "sha512-6wZjsvYeBhyZQYNrGoR5yPMYbMBNEnanDrqmsqS1mzDm1cOTu12shvl2j4QHNS36UaTE0USIJawCH9C8oW34Zw==",
+    "node_modules/get-intrinsic": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.7.tgz",
+      "integrity": "sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==",
       "dev": true,
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@emotion/serialize": "^0.11.15",
-        "@emotion/utils": "0.11.3",
-        "babel-plugin-emotion": "^10.0.27"
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "function-bind": "^1.1.2",
+        "get-proto": "^1.0.0",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@emotion/hash": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz",
-      "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==",
-      "dev": true
-    },
-    "node_modules/@emotion/is-prop-valid": {
-      "version": "0.8.8",
-      "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz",
-      "integrity": "sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==",
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
       "dev": true,
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@emotion/memoize": "0.7.4"
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
-    "node_modules/@emotion/memoize": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz",
-      "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==",
-      "dev": true
+    "node_modules/glob-to-regexp": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+      "dev": true,
+      "peer": true
     },
-    "node_modules/@emotion/serialize": {
-      "version": "0.11.16",
-      "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-0.11.16.tgz",
-      "integrity": "sha512-G3J4o8by0VRrO+PFeSc3js2myYNOXVJ3Ya+RGVxnshRYgsvErfAOglKAiy1Eo1vhzxqtUvjCyS5gtewzkmvSSg==",
+    "node_modules/globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
       "dev": true,
-      "dependencies": {
-        "@emotion/hash": "0.8.0",
-        "@emotion/memoize": "0.7.4",
-        "@emotion/unitless": "0.7.5",
-        "@emotion/utils": "0.11.3",
-        "csstype": "^2.5.7"
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/@emotion/sheet": {
-      "version": "0.9.4",
-      "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-0.9.4.tgz",
-      "integrity": "sha512-zM9PFmgVSqBw4zL101Q0HrBVTGmpAxFZH/pYx/cjJT5advXguvcgjHFTCaIO3enL/xr89vK2bh0Mfyj9aa0ANA==",
-      "dev": true
-    },
-    "node_modules/@emotion/styled": {
-      "version": "10.0.27",
-      "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-10.0.27.tgz",
-      "integrity": "sha512-iK/8Sh7+NLJzyp9a5+vIQIXTYxfT4yB/OJbjzQanB2RZpvmzBQOHZWhpAMZWYEKRNNbsD6WfBw5sVWkb6WzS/Q==",
+    "node_modules/gopd": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
       "dev": true,
-      "dependencies": {
-        "@emotion/styled-base": "^10.0.27",
-        "babel-plugin-emotion": "^10.0.27"
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">= 0.4"
       },
-      "peerDependencies": {
-        "@emotion/core": "^10.0.27",
-        "react": ">=16.3.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@emotion/styled-base": {
-      "version": "10.0.31",
-      "resolved": "https://registry.npmjs.org/@emotion/styled-base/-/styled-base-10.0.31.tgz",
-      "integrity": "sha512-wTOE1NcXmqMWlyrtwdkqg87Mu6Rj1MaukEoEmEkHirO5IoHDJ8LgCQL4MjJODgxWxXibGR3opGp1p7YvkNEdXQ==",
+    "node_modules/graceful-fs": {
+      "version": "4.2.9",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz",
+      "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
       "dev": true,
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@babel/runtime": "^7.5.5",
-        "@emotion/is-prop-valid": "0.8.8",
-        "@emotion/serialize": "^0.11.15",
-        "@emotion/utils": "0.11.3"
+        "es-define-property": "^1.0.0"
       },
-      "peerDependencies": {
-        "@emotion/core": "^10.0.28",
-        "react": ">=16.3.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@emotion/stylis": {
-      "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.5.tgz",
-      "integrity": "sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ==",
-      "dev": true
-    },
-    "node_modules/@emotion/unitless": {
-      "version": "0.7.5",
-      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",
-      "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==",
-      "dev": true
-    },
-    "node_modules/@emotion/utils": {
-      "version": "0.11.3",
-      "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-0.11.3.tgz",
-      "integrity": "sha512-0o4l6pZC+hI88+bzuaX/6BgOvQVhbt2PfmxauVaYOGgbsAw14wdKyvMCZXnsnsHys94iadcF+RG/wZyx6+ZZBw==",
-      "dev": true
-    },
-    "node_modules/@emotion/weak-memoize": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz",
-      "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==",
-      "dev": true
-    },
-    "node_modules/@gar/promisify": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.2.tgz",
-      "integrity": "sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw==",
-      "dev": true
-    },
-    "node_modules/@mdx-js/mdx": {
-      "version": "1.6.22",
-      "resolved": "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-1.6.22.tgz",
-      "integrity": "sha512-AMxuLxPz2j5/6TpF/XSdKpQP1NlG0z11dFOlq+2IP/lSgl11GY8ji6S/rgsViN/L0BDvHvUMruRb7ub+24LUYA==",
+    "node_modules/has-symbols": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
       "dev": true,
-      "dependencies": {
-        "@babel/core": "7.12.9",
-        "@babel/plugin-syntax-jsx": "7.12.1",
-        "@babel/plugin-syntax-object-rest-spread": "7.8.3",
-        "@mdx-js/util": "1.6.22",
-        "babel-plugin-apply-mdx-type-prop": "1.6.22",
-        "babel-plugin-extract-import-names": "1.6.22",
-        "camelcase-css": "2.0.1",
-        "detab": "2.0.4",
-        "hast-util-raw": "6.0.1",
-        "lodash.uniq": "4.5.0",
-        "mdast-util-to-hast": "10.0.1",
-        "remark-footnotes": "2.0.0",
-        "remark-mdx": "1.6.22",
-        "remark-parse": "8.0.3",
-        "remark-squeeze-paragraphs": "4.0.0",
-        "style-to-object": "0.3.0",
-        "unified": "9.2.0",
-        "unist-builder": "2.0.3",
-        "unist-util-visit": "2.0.3"
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@mdx-js/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==",
+    "node_modules/has-tostringtag": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
       "dev": true,
+      "license": "MIT",
+      "peer": 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"
+        "has-symbols": "^1.0.3"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 0.4"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@mdx-js/mdx/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==",
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
       "dev": true,
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "function-bind": "^1.1.2"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "engines": {
+        "node": ">= 0.4"
       }
     },
-    "node_modules/@mdx-js/mdx/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "dev": true,
-      "bin": {
-        "semver": "bin/semver"
+      "license": "ISC",
+      "peer": true
+    },
+    "node_modules/is-arguments": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.2.0.tgz",
+      "integrity": "sha512-7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "has-tostringtag": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "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/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==",
       "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@mrmlnc/readdir-enhanced": {
+    "node_modules/is-docker": {
       "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
-      "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
       "dev": true,
-      "dependencies": {
-        "call-me-maybe": "^1.0.1",
-        "glob-to-regexp": "^0.3.0"
+      "license": "MIT",
+      "peer": true,
+      "bin": {
+        "is-docker": "cli.js"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+    "node_modules/is-generator-function": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz",
+      "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==",
       "dev": true,
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
+        "call-bound": "^1.0.3",
+        "get-proto": "^1.0.0",
+        "has-tostringtag": "^1.0.2",
+        "safe-regex-test": "^1.1.0"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+    "node_modules/is-regex": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
+      "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
       "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "gopd": "^1.2.0",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
+      },
       "engines": {
-        "node": ">= 8"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+    "node_modules/is-typed-array": {
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz",
+      "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==",
       "dev": true,
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
+        "which-typed-array": "^1.1.16"
       },
       "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@npmcli/fs": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.0.0.tgz",
-      "integrity": "sha512-8ltnOpRR/oJbOp8vaGUnipOi3bqkcW+sLHFlyXIr08OGHmVJLB1Hn7QtGXbYcpVtH1gAYZTlmDXtE4YV0+AMMQ==",
-      "dev": true,
-      "dependencies": {
-        "@gar/promisify": "^1.0.1",
-        "semver": "^7.3.5"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@npmcli/fs/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+    "node_modules/is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
       "dev": true,
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
+        "is-docker": "^2.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=8"
       }
     },
-    "node_modules/@npmcli/move-file": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz",
-      "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
+    "node_modules/jest-worker": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
+      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "mkdirp": "^1.0.4",
-        "rimraf": "^3.0.2"
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">= 10.13.0"
       }
     },
-    "node_modules/@popperjs/core": {
-      "version": "2.10.2",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.10.2.tgz",
-      "integrity": "sha512-IXf3XA7+XyN7CP9gGh/XB0UxVMlvARGEgGXLubFICsUMGz6Q+DU+i4gGlpOxTjKvXjkJDJC8YdqdKkDj9qZHEQ==",
+    "node_modules/jest-worker/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/popperjs"
+      "peer": true,
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@reach/router": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/@reach/router/-/router-1.3.4.tgz",
-      "integrity": "sha512-+mtn9wjlB9NN2CNnnC/BRYtwdKBfSyyasPYraNAyvaV1occr/5NnB4CVzjEZipNHwYebQwcndGUmpFzxAUoqSA==",
+    "node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "create-react-context": "0.3.0",
-        "invariant": "^2.2.3",
-        "prop-types": "^15.6.1",
-        "react-lifecycles-compat": "^3.0.4"
+        "has-flag": "^4.0.0"
       },
-      "peerDependencies": {
-        "react": "15.x || 16.x || 16.4.0-alpha.0911da3",
-        "react-dom": "15.x || 16.x || 16.4.0-alpha.0911da3"
-      }
-    },
-    "node_modules/@storybook/addon-a11y": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-a11y/-/addon-a11y-6.3.12.tgz",
-      "integrity": "sha512-q1NdRHFJV6sLEEJw0hatCc5ZIthELqM/AWdrEWDyhcJNyiq7Tq4nKqQBMTQSYwHiUAmxVgw7i4oa1vM2M51/3g==",
-      "dev": true,
-      "dependencies": {
-        "@storybook/addons": "6.3.12",
-        "@storybook/api": "6.3.12",
-        "@storybook/channels": "6.3.12",
-        "@storybook/client-api": "6.3.12",
-        "@storybook/client-logger": "6.3.12",
-        "@storybook/components": "6.3.12",
-        "@storybook/core-events": "6.3.12",
-        "@storybook/theming": "6.3.12",
-        "axe-core": "^4.2.0",
-        "core-js": "^3.8.2",
-        "global": "^4.4.0",
-        "lodash": "^4.17.20",
-        "react-sizeme": "^3.0.1",
-        "regenerator-runtime": "^0.13.7",
-        "ts-dedent": "^2.0.0",
-        "util-deprecate": "^1.0.2"
+      "engines": {
+        "node": ">=10"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0"
-      },
-      "peerDependenciesMeta": {
-        "react": {
-          "optional": true
-        },
-        "react-dom": {
-          "optional": true
-        }
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
-    "node_modules/@storybook/addon-controls": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-controls/-/addon-controls-6.3.12.tgz",
-      "integrity": "sha512-WO/PbygE4sDg3BbstJ49q0uM3Xu5Nw4lnHR5N4hXSvRAulZt1d1nhphRTHjfX+CW+uBcfzkq9bksm6nKuwmOyw==",
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
       "dev": true,
-      "dependencies": {
-        "@storybook/addons": "6.3.12",
-        "@storybook/api": "6.3.12",
-        "@storybook/client-api": "6.3.12",
-        "@storybook/components": "6.3.12",
-        "@storybook/node-logger": "6.3.12",
-        "@storybook/theming": "6.3.12",
-        "core-js": "^3.8.2",
-        "ts-dedent": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0"
-      },
-      "peerDependenciesMeta": {
-        "react": {
-          "optional": true
-        },
-        "react-dom": {
-          "optional": true
-        }
-      }
+      "license": "MIT"
     },
-    "node_modules/@storybook/addon-knobs": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-knobs/-/addon-knobs-6.3.1.tgz",
-      "integrity": "sha512-2GGGnQSPXXUhHHYv4IW6pkyQlCPYXKYiyGzfhV7Zhs95M2Ban08OA6KLmliMptWCt7U9tqTO8dB5u0C2cWmCTw==",
+    "node_modules/jsdoc-type-pratt-parser": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.1.0.tgz",
+      "integrity": "sha512-Hicd6JK5Njt2QB6XYFS7ok9e37O8AYk3jTcppG4YVQnYjOemymvTcmc7OWsmq/Qqj5TdRFO5/x/tIPmBeRtGHg==",
       "dev": true,
-      "dependencies": {
-        "copy-to-clipboard": "^3.3.1",
-        "core-js": "^3.8.2",
-        "escape-html": "^1.0.3",
-        "fast-deep-equal": "^3.1.3",
-        "global": "^4.4.0",
-        "lodash": "^4.17.20",
-        "prop-types": "^15.7.2",
-        "qs": "^6.10.0",
-        "react-colorful": "^5.1.2",
-        "react-lifecycles-compat": "^3.0.4",
-        "react-select": "^3.2.0"
-      },
-      "peerDependencies": {
-        "@storybook/addons": "^6.3.0",
-        "@storybook/api": "^6.3.0",
-        "@storybook/components": "^6.3.0",
-        "@storybook/core-events": "^6.3.0",
-        "@storybook/theming": "^6.3.0",
-        "react": "^16.8.0 || ^17.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0"
-      },
-      "peerDependenciesMeta": {
-        "react": {
-          "optional": true
-        },
-        "react-dom": {
-          "optional": true
-        }
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=12.0.0"
       }
     },
-    "node_modules/@storybook/addon-viewport": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-viewport/-/addon-viewport-6.3.12.tgz",
-      "integrity": "sha512-TRjyfm85xouOPmXxeLdEIzXLfJZZ1ePQ7p/5yphDGBHdxMU4m4qiZr8wYpUaxHsRu/UB3dKfaOyGT+ivogbnbw==",
+    "node_modules/jsesc": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
+      "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
       "dev": true,
-      "dependencies": {
-        "@storybook/addons": "6.3.12",
-        "@storybook/api": "6.3.12",
-        "@storybook/client-logger": "6.3.12",
-        "@storybook/components": "6.3.12",
-        "@storybook/core-events": "6.3.12",
-        "@storybook/theming": "6.3.12",
-        "core-js": "^3.8.2",
-        "global": "^4.4.0",
-        "memoizerific": "^1.11.3",
-        "prop-types": "^15.7.2",
-        "regenerator-runtime": "^0.13.7"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0"
+      "license": "MIT",
+      "bin": {
+        "jsesc": "bin/jsesc"
       },
-      "peerDependenciesMeta": {
-        "react": {
-          "optional": true
-        },
-        "react-dom": {
-          "optional": true
-        }
+      "engines": {
+        "node": ">=6"
       }
     },
-    "node_modules/@storybook/addons": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.3.12.tgz",
-      "integrity": "sha512-UgoMyr7Qr0FS3ezt8u6hMEcHgyynQS9ucr5mAwZky3wpXRPFyUTmMto9r4BBUdqyUvTUj/LRKIcmLBfj+/l0Fg==",
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
       "dev": true,
-      "dependencies": {
-        "@storybook/api": "6.3.12",
-        "@storybook/channels": "6.3.12",
-        "@storybook/client-logger": "6.3.12",
-        "@storybook/core-events": "6.3.12",
-        "@storybook/router": "6.3.12",
-        "@storybook/theming": "6.3.12",
-        "core-js": "^3.8.2",
-        "global": "^4.4.0",
-        "regenerator-runtime": "^0.13.7"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0"
-      }
+      "peer": true
     },
-    "node_modules/@storybook/api": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/api/-/api-6.3.12.tgz",
-      "integrity": "sha512-LScRXUeCWEW/OP+jiooNMQICVdusv7azTmULxtm72fhkXFRiQs2CdRNTiqNg46JLLC9z95f1W+pGK66X6HiiQA==",
+    "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,
-      "dependencies": {
-        "@reach/router": "^1.3.4",
-        "@storybook/channels": "6.3.12",
-        "@storybook/client-logger": "6.3.12",
-        "@storybook/core-events": "6.3.12",
-        "@storybook/csf": "0.0.1",
-        "@storybook/router": "6.3.12",
-        "@storybook/semver": "^7.3.2",
-        "@storybook/theming": "6.3.12",
-        "@types/reach__router": "^1.3.7",
-        "core-js": "^3.8.2",
-        "fast-deep-equal": "^3.1.3",
-        "global": "^4.4.0",
-        "lodash": "^4.17.20",
-        "memoizerific": "^1.11.3",
-        "qs": "^6.10.0",
-        "regenerator-runtime": "^0.13.7",
-        "store2": "^2.12.0",
-        "telejson": "^5.3.2",
-        "ts-dedent": "^2.0.0",
-        "util-deprecate": "^1.0.2"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0"
-      }
+      "peer": true
     },
-    "node_modules/@storybook/builder-webpack4": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/builder-webpack4/-/builder-webpack4-6.3.12.tgz",
-      "integrity": "sha512-Dlm5Fc1svqpFDnVPZdAaEBiM/IDZHMV3RfEGbUTY/ZC0q8b/Ug1czzp/w0aTIjOFRuBDcG6IcplikaqHL8CJLg==",
+    "node_modules/json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
       "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.12.10",
-        "@babel/plugin-proposal-class-properties": "^7.12.1",
-        "@babel/plugin-proposal-decorators": "^7.12.12",
-        "@babel/plugin-proposal-export-default-from": "^7.12.1",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
-        "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
-        "@babel/plugin-proposal-optional-chaining": "^7.12.7",
-        "@babel/plugin-proposal-private-methods": "^7.12.1",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-transform-arrow-functions": "^7.12.1",
-        "@babel/plugin-transform-block-scoping": "^7.12.12",
-        "@babel/plugin-transform-classes": "^7.12.1",
-        "@babel/plugin-transform-destructuring": "^7.12.1",
-        "@babel/plugin-transform-for-of": "^7.12.1",
-        "@babel/plugin-transform-parameters": "^7.12.1",
-        "@babel/plugin-transform-shorthand-properties": "^7.12.1",
-        "@babel/plugin-transform-spread": "^7.12.1",
-        "@babel/plugin-transform-template-literals": "^7.12.1",
-        "@babel/preset-env": "^7.12.11",
-        "@babel/preset-react": "^7.12.10",
-        "@babel/preset-typescript": "^7.12.7",
-        "@storybook/addons": "6.3.12",
-        "@storybook/api": "6.3.12",
-        "@storybook/channel-postmessage": "6.3.12",
-        "@storybook/channels": "6.3.12",
-        "@storybook/client-api": "6.3.12",
-        "@storybook/client-logger": "6.3.12",
-        "@storybook/components": "6.3.12",
-        "@storybook/core-common": "6.3.12",
-        "@storybook/core-events": "6.3.12",
-        "@storybook/node-logger": "6.3.12",
-        "@storybook/router": "6.3.12",
-        "@storybook/semver": "^7.3.2",
-        "@storybook/theming": "6.3.12",
-        "@storybook/ui": "6.3.12",
-        "@types/node": "^14.0.10",
-        "@types/webpack": "^4.41.26",
-        "autoprefixer": "^9.8.6",
-        "babel-loader": "^8.2.2",
-        "babel-plugin-macros": "^2.8.0",
-        "babel-plugin-polyfill-corejs3": "^0.1.0",
-        "case-sensitive-paths-webpack-plugin": "^2.3.0",
-        "core-js": "^3.8.2",
-        "css-loader": "^3.6.0",
-        "dotenv-webpack": "^1.8.0",
-        "file-loader": "^6.2.0",
-        "find-up": "^5.0.0",
-        "fork-ts-checker-webpack-plugin": "^4.1.6",
-        "fs-extra": "^9.0.1",
-        "glob": "^7.1.6",
-        "glob-promise": "^3.4.0",
-        "global": "^4.4.0",
-        "html-webpack-plugin": "^4.0.0",
-        "pnp-webpack-plugin": "1.6.4",
-        "postcss": "^7.0.36",
-        "postcss-flexbugs-fixes": "^4.2.1",
-        "postcss-loader": "^4.2.0",
-        "raw-loader": "^4.0.2",
-        "react-dev-utils": "^11.0.3",
-        "stable": "^0.1.8",
-        "style-loader": "^1.3.0",
-        "terser-webpack-plugin": "^4.2.3",
-        "ts-dedent": "^2.0.0",
-        "url-loader": "^4.1.1",
-        "util-deprecate": "^1.0.2",
-        "webpack": "4",
-        "webpack-dev-middleware": "^3.7.3",
-        "webpack-filter-warnings-plugin": "^1.2.1",
-        "webpack-hot-middleware": "^2.25.0",
-        "webpack-virtual-modules": "^0.2.2"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0"
+      "bin": {
+        "json5": "lib/cli.js"
       },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+      "engines": {
+        "node": ">=6"
       }
     },
-    "node_modules/@storybook/builder-webpack4/node_modules/babel-plugin-macros": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz",
-      "integrity": "sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==",
+    "node_modules/loader-runner": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
+      "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==",
       "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.7.2",
-        "cosmiconfig": "^6.0.0",
-        "resolve": "^1.12.0"
+      "peer": true,
+      "engines": {
+        "node": ">=6.11.5"
       }
     },
-    "node_modules/@storybook/builder-webpack4/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+    "node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
       "dev": true,
+      "license": "ISC",
       "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"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "yallist": "^3.0.2"
       }
     },
-    "node_modules/@storybook/builder-webpack4/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+    "node_modules/map-or-similar": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/map-or-similar/-/map-or-similar-1.5.0.tgz",
+      "integrity": "sha1-beJlMXSt+12e3DPGnT6Sobdvrwg=",
+      "dev": true
+    },
+    "node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
       "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
+      "license": "MIT",
+      "peer": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/@storybook/builder-webpack4/node_modules/cosmiconfig": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
-      "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
+    "node_modules/memoizerific": {
+      "version": "1.11.3",
+      "resolved": "https://registry.npmjs.org/memoizerific/-/memoizerific-1.11.3.tgz",
+      "integrity": "sha1-fIekZGREwy11Q4VwkF8tvRsagFo=",
       "dev": true,
       "dependencies": {
-        "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.1.0",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0",
-        "yaml": "^1.7.2"
-      },
-      "engines": {
-        "node": ">=8"
+        "map-or-similar": "^1.5.0"
       }
     },
-    "node_modules/@storybook/builder-webpack4/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
       "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "peer": true
     },
-    "node_modules/@storybook/builder-webpack4/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+    "node_modules/mime-db": {
+      "version": "1.51.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
+      "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
       "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
+      "peer": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/@storybook/builder-webpack4/node_modules/fork-ts-checker-webpack-plugin": {
-      "version": "4.1.6",
-      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-4.1.6.tgz",
-      "integrity": "sha512-DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw==",
+    "node_modules/mime-types": {
+      "version": "2.1.34",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz",
+      "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "@babel/code-frame": "^7.5.5",
-        "chalk": "^2.4.1",
-        "micromatch": "^3.1.10",
-        "minimatch": "^3.0.4",
-        "semver": "^5.6.0",
-        "tapable": "^1.0.0",
-        "worker-rpc": "^0.1.0"
+        "mime-db": "1.51.0"
       },
       "engines": {
-        "node": ">=6.11.5",
-        "yarn": ">=1.0.0"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/@storybook/builder-webpack4/node_modules/is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "dev": true
     },
-    "node_modules/@storybook/builder-webpack4/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+    "node_modules/neo-async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
       "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "peer": true
     },
-    "node_modules/@storybook/builder-webpack4/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+    "node_modules/node-releases": {
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
+      "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
       "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "license": "MIT"
     },
-    "node_modules/@storybook/builder-webpack4/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+    "node_modules/open": {
+      "version": "8.4.2",
+      "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
+      "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
       "dev": true,
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "is-buffer": "^1.1.5"
+        "define-lazy-prop": "^2.0.0",
+        "is-docker": "^2.1.1",
+        "is-wsl": "^2.2.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@storybook/builder-webpack4/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+    "node_modules/picocolors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
+      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
       "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "license": "ISC"
     },
-    "node_modules/@storybook/builder-webpack4/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+    "node_modules/possible-typed-array-names": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
+      "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
       "dev": 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"
-      },
+      "license": "MIT",
+      "peer": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/@storybook/builder-webpack4/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+    "node_modules/process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
       "dev": true,
-      "bin": {
-        "semver": "bin/semver"
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">= 0.6.0"
       }
     },
-    "node_modules/@storybook/builder-webpack4/node_modules/to-regex-range": {
+    "node_modules/punycode": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
       "dev": true,
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6"
       }
     },
-    "node_modules/@storybook/channel-postmessage": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/channel-postmessage/-/channel-postmessage-6.3.12.tgz",
-      "integrity": "sha512-Ou/2Ga3JRTZ/4sSv7ikMgUgLTeZMsXXWLXuscz4oaYhmOqAU9CrJw0G1NitwBgK/+qC83lEFSLujHkWcoQDOKg==",
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "@storybook/channels": "6.3.12",
-        "@storybook/client-logger": "6.3.12",
-        "@storybook/core-events": "6.3.12",
-        "core-js": "^3.8.2",
-        "global": "^4.4.0",
-        "qs": "^6.10.0",
-        "telejson": "^5.3.2"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
+        "safe-buffer": "^5.1.0"
       }
     },
-    "node_modules/@storybook/channels": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-6.3.12.tgz",
-      "integrity": "sha512-l4sA+g1PdUV8YCbgs47fIKREdEQAKNdQIZw0b7BfTvY9t0x5yfBywgQhYON/lIeiNGz2OlIuD+VUtqYfCtNSyw==",
+    "node_modules/recast": {
+      "version": "0.23.9",
+      "resolved": "https://registry.npmjs.org/recast/-/recast-0.23.9.tgz",
+      "integrity": "sha512-Hx/BGIbwj+Des3+xy5uAtAbdCyqK9y9wbBcDFDYanLS9JnMqf7OeF87HQwUimE87OEc72mr6tkKUKMBBL+hF9Q==",
       "dev": true,
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "core-js": "^3.8.2",
-        "ts-dedent": "^2.0.0",
-        "util-deprecate": "^1.0.2"
+        "ast-types": "^0.16.1",
+        "esprima": "~4.0.0",
+        "source-map": "~0.6.1",
+        "tiny-invariant": "^1.3.3",
+        "tslib": "^2.0.1"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
+      "engines": {
+        "node": ">= 4"
       }
     },
-    "node_modules/@storybook/client-api": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/client-api/-/client-api-6.3.12.tgz",
-      "integrity": "sha512-xnW+lKKK2T774z+rOr9Wopt1aYTStfb86PSs9p3Fpnc2Btcftln+C3NtiHZl8Ccqft8Mz/chLGgewRui6tNI8g==",
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
       "dev": true,
-      "dependencies": {
-        "@storybook/addons": "6.3.12",
-        "@storybook/channel-postmessage": "6.3.12",
-        "@storybook/channels": "6.3.12",
-        "@storybook/client-logger": "6.3.12",
-        "@storybook/core-events": "6.3.12",
-        "@storybook/csf": "0.0.1",
-        "@types/qs": "^6.9.5",
-        "@types/webpack-env": "^1.16.0",
-        "core-js": "^3.8.2",
-        "global": "^4.4.0",
-        "lodash": "^4.17.20",
-        "memoizerific": "^1.11.3",
-        "qs": "^6.10.0",
-        "regenerator-runtime": "^0.13.7",
-        "stable": "^0.1.8",
-        "store2": "^2.12.0",
-        "ts-dedent": "^2.0.0",
-        "util-deprecate": "^1.0.2"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/@storybook/client-logger": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-6.3.12.tgz",
-      "integrity": "sha512-zNDsamZvHnuqLznDdP9dUeGgQ9TyFh4ray3t1VGO7ZqWVZ2xtVCCXjDvMnOXI2ifMpX5UsrOvshIPeE9fMBmiQ==",
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "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"
+        }
+      ],
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/safe-regex-test": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
+      "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==",
       "dev": true,
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "core-js": "^3.8.2",
-        "global": "^4.4.0"
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "is-regex": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@storybook/components": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/components/-/components-6.3.12.tgz",
-      "integrity": "sha512-kdQt8toUjynYAxDLrJzuG7YSNL6as1wJoyzNUaCfG06YPhvIAlKo7le9tS2mThVFN5e9nbKrW3N1V1sp6ypZXQ==",
+    "node_modules/schema-utils": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.1.tgz",
+      "integrity": "sha512-lELhBAAly9NowEsX0yZBlw9ahZG+sK/1RJ21EpzdYHKEs13Vku3LJ+MIPhh4sMs0oCCeufZQEQbMekiA4vuVIQ==",
       "dev": true,
       "dependencies": {
-        "@popperjs/core": "^2.6.0",
-        "@storybook/client-logger": "6.3.12",
-        "@storybook/csf": "0.0.1",
-        "@storybook/theming": "6.3.12",
-        "@types/color-convert": "^2.0.0",
-        "@types/overlayscrollbars": "^1.12.0",
-        "@types/react-syntax-highlighter": "11.0.5",
-        "color-convert": "^2.0.1",
-        "core-js": "^3.8.2",
-        "fast-deep-equal": "^3.1.3",
-        "global": "^4.4.0",
-        "lodash": "^4.17.20",
-        "markdown-to-jsx": "^7.1.3",
-        "memoizerific": "^1.11.3",
-        "overlayscrollbars": "^1.13.1",
-        "polished": "^4.0.5",
-        "prop-types": "^15.7.2",
-        "react-colorful": "^5.1.2",
-        "react-popper-tooltip": "^3.1.1",
-        "react-syntax-highlighter": "^13.5.3",
-        "react-textarea-autosize": "^8.3.0",
-        "regenerator-runtime": "^0.13.7",
-        "ts-dedent": "^2.0.0",
-        "util-deprecate": "^1.0.2"
+        "@types/json-schema": "^7.0.9",
+        "ajv": "^8.9.0",
+        "ajv-formats": "^2.1.1",
+        "ajv-keywords": "^5.1.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
       },
       "funding": {
         "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0"
+        "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/@storybook/core": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/core/-/core-6.3.12.tgz",
-      "integrity": "sha512-FJm2ns8wk85hXWKslLWiUWRWwS9KWRq7jlkN6M9p57ghFseSGr4W71Orcoab4P3M7jI97l5yqBfppbscinE74g==",
+    "node_modules/schema-utils/node_modules/ajv": {
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
       "dev": true,
       "dependencies": {
-        "@storybook/core-client": "6.3.12",
-        "@storybook/core-server": "6.3.12"
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
-      },
-      "peerDependencies": {
-        "@storybook/builder-webpack5": "6.3.12",
-        "react": "^16.8.0 || ^17.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@storybook/builder-webpack5": {
-          "optional": true
-        },
-        "typescript": {
-          "optional": true
-        }
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/@storybook/core-client": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/core-client/-/core-client-6.3.12.tgz",
-      "integrity": "sha512-8Smd9BgZHJpAdevLKQYinwtjSyCZAuBMoetP4P5hnn53mWl0NFbrHFaAdT+yNchDLZQUbf7Y18VmIqEH+RCR5w==",
+    "node_modules/schema-utils/node_modules/ajv-keywords": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
       "dev": true,
       "dependencies": {
-        "@storybook/addons": "6.3.12",
-        "@storybook/channel-postmessage": "6.3.12",
-        "@storybook/client-api": "6.3.12",
-        "@storybook/client-logger": "6.3.12",
-        "@storybook/core-events": "6.3.12",
-        "@storybook/csf": "0.0.1",
-        "@storybook/ui": "6.3.12",
-        "airbnb-js-shims": "^2.2.1",
-        "ansi-to-html": "^0.6.11",
-        "core-js": "^3.8.2",
-        "global": "^4.4.0",
-        "lodash": "^4.17.20",
-        "qs": "^6.10.0",
-        "regenerator-runtime": "^0.13.7",
-        "ts-dedent": "^2.0.0",
-        "unfetch": "^4.2.0",
-        "util-deprecate": "^1.0.2"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
+        "fast-deep-equal": "^3.1.3"
       },
       "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0",
-        "webpack": "*"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "ajv": "^8.8.2"
       }
     },
-    "node_modules/@storybook/core-common": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/core-common/-/core-common-6.3.12.tgz",
-      "integrity": "sha512-xlHs2QXELq/moB4MuXjYOczaxU64BIseHsnFBLyboJYN6Yso3qihW5RB7cuJlGohkjb4JwY74dvfT4Ww66rkBA==",
+    "node_modules/schema-utils/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
+    "node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.12.10",
-        "@babel/plugin-proposal-class-properties": "^7.12.1",
-        "@babel/plugin-proposal-decorators": "^7.12.12",
-        "@babel/plugin-proposal-export-default-from": "^7.12.1",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
-        "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
-        "@babel/plugin-proposal-optional-chaining": "^7.12.7",
-        "@babel/plugin-proposal-private-methods": "^7.12.1",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-transform-arrow-functions": "^7.12.1",
-        "@babel/plugin-transform-block-scoping": "^7.12.12",
-        "@babel/plugin-transform-classes": "^7.12.1",
-        "@babel/plugin-transform-destructuring": "^7.12.1",
-        "@babel/plugin-transform-for-of": "^7.12.1",
-        "@babel/plugin-transform-parameters": "^7.12.1",
-        "@babel/plugin-transform-shorthand-properties": "^7.12.1",
-        "@babel/plugin-transform-spread": "^7.12.1",
-        "@babel/preset-env": "^7.12.11",
-        "@babel/preset-react": "^7.12.10",
-        "@babel/preset-typescript": "^7.12.7",
-        "@babel/register": "^7.12.1",
-        "@storybook/node-logger": "6.3.12",
-        "@storybook/semver": "^7.3.2",
-        "@types/glob-base": "^0.3.0",
-        "@types/micromatch": "^4.0.1",
-        "@types/node": "^14.0.10",
-        "@types/pretty-hrtime": "^1.0.0",
-        "babel-loader": "^8.2.2",
-        "babel-plugin-macros": "^3.0.1",
-        "babel-plugin-polyfill-corejs3": "^0.1.0",
-        "chalk": "^4.1.0",
-        "core-js": "^3.8.2",
-        "express": "^4.17.1",
-        "file-system-cache": "^1.0.5",
-        "find-up": "^5.0.0",
-        "fork-ts-checker-webpack-plugin": "^6.0.4",
-        "glob": "^7.1.6",
-        "glob-base": "^0.3.0",
-        "interpret": "^2.2.0",
-        "json5": "^2.1.3",
-        "lazy-universal-dotenv": "^3.0.1",
-        "micromatch": "^4.0.2",
-        "pkg-dir": "^5.0.0",
-        "pretty-hrtime": "^1.0.3",
-        "resolve-from": "^5.0.0",
-        "ts-dedent": "^2.0.0",
-        "util-deprecate": "^1.0.2",
-        "webpack": "4"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+      "bin": {
+        "semver": "bin/semver.js"
       }
     },
-    "node_modules/@storybook/core-common/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/serialize-javascript": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
+      "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "randombytes": "^2.1.0"
       }
     },
-    "node_modules/@storybook/core-common/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/set-function-length": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
       "dev": true,
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/@storybook/core-common/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
+      "peer": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/@storybook/core-common/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
       }
     },
-    "node_modules/@storybook/core-events": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-6.3.12.tgz",
-      "integrity": "sha512-SXfD7xUUMazaeFkB92qOTUV8Y/RghE4SkEYe5slAdjeocSaH7Nz2WV0rqNEgChg0AQc+JUI66no8L9g0+lw4Gw==",
+    "node_modules/storybook": {
+      "version": "8.4.7",
+      "resolved": "https://registry.npmjs.org/storybook/-/storybook-8.4.7.tgz",
+      "integrity": "sha512-RP/nMJxiWyFc8EVMH5gp20ID032Wvk+Yr3lmKidoegto5Iy+2dVQnUoElZb2zpbVXNHWakGuAkfI0dY1Hfp/vw==",
       "dev": true,
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "core-js": "^3.8.2"
+        "@storybook/core": "8.4.7"
+      },
+      "bin": {
+        "getstorybook": "bin/index.cjs",
+        "sb": "bin/index.cjs",
+        "storybook": "bin/index.cjs"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "prettier": "^2 || ^3"
+      },
+      "peerDependenciesMeta": {
+        "prettier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/tapable": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/terser": {
+      "version": "5.19.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.19.0.tgz",
+      "integrity": "sha512-JpcpGOQLOXm2jsomozdMDpd5f8ZHh1rR48OFgWUH3QsyZcfPgv2qDCYbcDEAYNd4OZRj2bWYKpwdll/udZCk/Q==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@jridgewell/source-map": "^0.3.3",
+        "acorn": "^8.8.2",
+        "commander": "^2.20.0",
+        "source-map-support": "~0.5.20"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
-    "node_modules/@storybook/core-server": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/core-server/-/core-server-6.3.12.tgz",
-      "integrity": "sha512-T/Mdyi1FVkUycdyOnhXvoo3d9nYXLQFkmaJkltxBFLzAePAJUSgAsPL9odNC3+p8Nr2/UDsDzvu/Ow0IF0mzLQ==",
+    "node_modules/terser-webpack-plugin": {
+      "version": "5.3.9",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz",
+      "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "@discoveryjs/json-ext": "^0.5.3",
-        "@storybook/builder-webpack4": "6.3.12",
-        "@storybook/core-client": "6.3.12",
-        "@storybook/core-common": "6.3.12",
-        "@storybook/csf-tools": "6.3.12",
-        "@storybook/manager-webpack4": "6.3.12",
-        "@storybook/node-logger": "6.3.12",
-        "@storybook/semver": "^7.3.2",
-        "@types/node": "^14.0.10",
-        "@types/node-fetch": "^2.5.7",
-        "@types/pretty-hrtime": "^1.0.0",
-        "@types/webpack": "^4.41.26",
-        "better-opn": "^2.1.1",
-        "boxen": "^4.2.0",
-        "chalk": "^4.1.0",
-        "cli-table3": "0.6.0",
-        "commander": "^6.2.1",
-        "compression": "^1.7.4",
-        "core-js": "^3.8.2",
-        "cpy": "^8.1.1",
-        "detect-port": "^1.3.0",
-        "express": "^4.17.1",
-        "file-system-cache": "^1.0.5",
-        "fs-extra": "^9.0.1",
-        "globby": "^11.0.2",
-        "ip": "^1.1.5",
-        "node-fetch": "^2.6.1",
-        "pretty-hrtime": "^1.0.3",
-        "prompts": "^2.4.0",
-        "regenerator-runtime": "^0.13.7",
-        "serve-favicon": "^2.5.0",
-        "ts-dedent": "^2.0.0",
-        "util-deprecate": "^1.0.2",
-        "webpack": "4"
+        "@jridgewell/trace-mapping": "^0.3.17",
+        "jest-worker": "^27.4.5",
+        "schema-utils": "^3.1.1",
+        "serialize-javascript": "^6.0.1",
+        "terser": "^5.16.8"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
       },
       "funding": {
         "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
+        "url": "https://opencollective.com/webpack"
       },
       "peerDependencies": {
-        "@storybook/builder-webpack5": "6.3.12",
-        "@storybook/manager-webpack5": "6.3.12",
-        "react": "^16.8.0 || ^17.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0"
+        "webpack": "^5.1.0"
       },
       "peerDependenciesMeta": {
-        "@storybook/builder-webpack5": {
+        "@swc/core": {
           "optional": true
         },
-        "@storybook/manager-webpack5": {
+        "esbuild": {
           "optional": true
         },
-        "typescript": {
+        "uglify-js": {
           "optional": true
         }
       }
     },
-    "node_modules/@storybook/core-server/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 10.13.0"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/@storybook/core-server/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/tiny-invariant": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz",
+      "integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==",
       "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/ts-dedent": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgz",
+      "integrity": "sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "node": ">=6.10"
       }
     },
-    "node_modules/@storybook/core-server/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/tslib": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+      "dev": true,
+      "license": "0BSD",
+      "peer": true
+    },
+    "node_modules/type-fest": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+      "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
       "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "peer": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@storybook/core-server/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/update-browserslist-db": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
+      "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
       "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "escalade": "^3.1.2",
+        "picocolors": "^1.0.1"
       },
-      "engines": {
-        "node": ">=8"
+      "bin": {
+        "update-browserslist-db": "cli.js"
+      },
+      "peerDependencies": {
+        "browserslist": ">= 4.21.0"
       }
     },
-    "node_modules/@storybook/csf": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/@storybook/csf/-/csf-0.0.1.tgz",
-      "integrity": "sha512-USTLkZze5gkel8MYCujSRBVIrUQ3YPBrLOx7GNk/0wttvVtlzWXAq9eLbQ4p/NicGxP+3T7KPEMVV//g+yubpw==",
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
       "dev": true,
       "dependencies": {
-        "lodash": "^4.17.15"
+        "punycode": "^2.1.0"
       }
     },
-    "node_modules/@storybook/csf-tools": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/csf-tools/-/csf-tools-6.3.12.tgz",
-      "integrity": "sha512-wNrX+99ajAXxLo0iRwrqw65MLvCV6SFC0XoPLYrtBvyKr+hXOOnzIhO2f5BNEii8velpC2gl2gcLKeacpVYLqA==",
+    "node_modules/util": {
+      "version": "0.12.5",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
+      "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
       "dev": true,
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@babel/generator": "^7.12.11",
-        "@babel/parser": "^7.12.11",
-        "@babel/plugin-transform-react-jsx": "^7.12.12",
-        "@babel/preset-env": "^7.12.11",
-        "@babel/traverse": "^7.12.11",
-        "@babel/types": "^7.12.11",
-        "@mdx-js/mdx": "^1.6.22",
-        "@storybook/csf": "^0.0.1",
-        "core-js": "^3.8.2",
-        "fs-extra": "^9.0.1",
-        "js-string-escape": "^1.0.1",
-        "lodash": "^4.17.20",
-        "prettier": "~2.2.1",
-        "regenerator-runtime": "^0.13.7"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
+        "inherits": "^2.0.3",
+        "is-arguments": "^1.0.4",
+        "is-generator-function": "^1.0.7",
+        "is-typed-array": "^1.1.3",
+        "which-typed-array": "^1.1.2"
       }
     },
-    "node_modules/@storybook/manager-webpack4": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/manager-webpack4/-/manager-webpack4-6.3.12.tgz",
-      "integrity": "sha512-OkPYNrHXg2yZfKmEfTokP6iKx4OLTr0gdI5yehi/bLEuQCSHeruxBc70Dxm1GBk1Mrf821wD9WqMXNDjY5Qtug==",
+    "node_modules/watchpack": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
+      "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "@babel/core": "^7.12.10",
-        "@babel/plugin-transform-template-literals": "^7.12.1",
-        "@babel/preset-react": "^7.12.10",
-        "@storybook/addons": "6.3.12",
-        "@storybook/core-client": "6.3.12",
-        "@storybook/core-common": "6.3.12",
-        "@storybook/node-logger": "6.3.12",
-        "@storybook/theming": "6.3.12",
-        "@storybook/ui": "6.3.12",
-        "@types/node": "^14.0.10",
-        "@types/webpack": "^4.41.26",
-        "babel-loader": "^8.2.2",
-        "case-sensitive-paths-webpack-plugin": "^2.3.0",
-        "chalk": "^4.1.0",
-        "core-js": "^3.8.2",
-        "css-loader": "^3.6.0",
-        "dotenv-webpack": "^1.8.0",
-        "express": "^4.17.1",
-        "file-loader": "^6.2.0",
-        "file-system-cache": "^1.0.5",
-        "find-up": "^5.0.0",
-        "fs-extra": "^9.0.1",
-        "html-webpack-plugin": "^4.0.0",
-        "node-fetch": "^2.6.1",
-        "pnp-webpack-plugin": "1.6.4",
-        "read-pkg-up": "^7.0.1",
-        "regenerator-runtime": "^0.13.7",
-        "resolve-from": "^5.0.0",
-        "style-loader": "^1.3.0",
-        "telejson": "^5.3.2",
-        "terser-webpack-plugin": "^4.2.3",
-        "ts-dedent": "^2.0.0",
-        "url-loader": "^4.1.1",
-        "util-deprecate": "^1.0.2",
-        "webpack": "4",
-        "webpack-dev-middleware": "^3.7.3",
-        "webpack-virtual-modules": "^0.2.2"
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.1.2"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/webpack": {
+      "version": "5.88.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.1.tgz",
+      "integrity": "sha512-FROX3TxQnC/ox4N+3xQoWZzvGXSuscxR32rbzjpXgEzWudJFEJBpdlkkob2ylrv5yzzufD1zph1OoFsLtm6stQ==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@types/eslint-scope": "^3.7.3",
+        "@types/estree": "^1.0.0",
+        "@webassemblyjs/ast": "^1.11.5",
+        "@webassemblyjs/wasm-edit": "^1.11.5",
+        "@webassemblyjs/wasm-parser": "^1.11.5",
+        "acorn": "^8.7.1",
+        "acorn-import-assertions": "^1.9.0",
+        "browserslist": "^4.14.5",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^5.15.0",
+        "es-module-lexer": "^1.2.1",
+        "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.2.0",
+        "tapable": "^2.1.1",
+        "terser-webpack-plugin": "^5.3.7",
+        "watchpack": "^2.4.0",
+        "webpack-sources": "^3.2.3"
+      },
+      "bin": {
+        "webpack": "bin/webpack.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
       },
       "funding": {
         "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0"
+        "url": "https://opencollective.com/webpack"
       },
       "peerDependenciesMeta": {
-        "typescript": {
+        "webpack-cli": {
           "optional": true
         }
       }
     },
-    "node_modules/@storybook/manager-webpack4/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/webpack-sources": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/webpack/node_modules/schema-utils": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 10.13.0"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/@storybook/manager-webpack4/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/which-typed-array": {
+      "version": "1.1.18",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.18.tgz",
+      "integrity": "sha512-qEcY+KJYlWyLH9vNbsr6/5j59AXk5ni5aakf8ldzBvGde6Iz4sxZGkJyWSAueTG7QhOvNRYb1lDdFmL5Td0QKA==",
       "dev": true,
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "for-each": "^0.3.3",
+        "gopd": "^1.2.0",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@storybook/manager-webpack4/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@storybook/manager-webpack4/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@storybook/node-logger": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/node-logger/-/node-logger-6.3.12.tgz",
-      "integrity": "sha512-iktOem/Ls2+dsZY9PhPeC6T1QhX/y7OInP88neLsqEPEbB2UXca3Ydv7OZBhBVbvN25W45b05MRzbtNUxYLNRw==",
-      "dev": true,
-      "dependencies": {
-        "@types/npmlog": "^4.1.2",
-        "chalk": "^4.1.0",
-        "core-js": "^3.8.2",
-        "npmlog": "^4.1.2",
-        "pretty-hrtime": "^1.0.3"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
-      }
-    },
-    "node_modules/@storybook/node-logger/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@storybook/node-logger/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@storybook/node-logger/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@storybook/node-logger/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@storybook/preact": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/preact/-/preact-6.3.12.tgz",
-      "integrity": "sha512-okP4Y1Zf26AdjK/5sFJGoF1Ce2WPK/3w+x0WgMdEOs7K7/pnKNQ1Ck8KLXmPyjTN+6bVoIMP8NcS8ZqHJu25lw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/plugin-transform-react-jsx": "^7.12.12",
-        "@storybook/addons": "6.3.12",
-        "@storybook/core": "6.3.12",
-        "@storybook/core-common": "6.3.12",
-        "@types/webpack-env": "^1.16.0",
-        "core-js": "^3.8.2",
-        "global": "^4.4.0",
-        "react": "16.14.0",
-        "react-dom": "16.14.0",
-        "read-pkg-up": "^7.0.1",
-        "regenerator-runtime": "^0.13.7",
-        "ts-dedent": "^2.0.0"
-      },
-      "bin": {
-        "build-storybook": "bin/build.js",
-        "start-storybook": "bin/index.js",
-        "storybook-server": "bin/index.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
-      },
-      "peerDependencies": {
-        "@babel/core": "*",
-        "preact": "^8.0.0||^10.0.0",
-        "webpack": "*"
-      }
-    },
-    "node_modules/@storybook/router": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/router/-/router-6.3.12.tgz",
-      "integrity": "sha512-G/pNGCnrJRetCwyEZulHPT+YOcqEj/vkPVDTUfii2qgqukup6K0cjwgd7IukAURnAnnzTi1gmgFuEKUi8GE/KA==",
-      "dev": true,
-      "dependencies": {
-        "@reach/router": "^1.3.4",
-        "@storybook/client-logger": "6.3.12",
-        "@types/reach__router": "^1.3.7",
-        "core-js": "^3.8.2",
-        "fast-deep-equal": "^3.1.3",
-        "global": "^4.4.0",
-        "lodash": "^4.17.20",
-        "memoizerific": "^1.11.3",
-        "qs": "^6.10.0",
-        "ts-dedent": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0"
-      }
-    },
-    "node_modules/@storybook/semver": {
-      "version": "7.3.2",
-      "resolved": "https://registry.npmjs.org/@storybook/semver/-/semver-7.3.2.tgz",
-      "integrity": "sha512-SWeszlsiPsMI0Ps0jVNtH64cI5c0UF3f7KgjVKJoNP30crQ6wUSddY2hsdeczZXEKVJGEn50Q60flcGsQGIcrg==",
-      "dev": true,
-      "dependencies": {
-        "core-js": "^3.6.5",
-        "find-up": "^4.1.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@storybook/semver/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@storybook/semver/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@storybook/semver/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@storybook/semver/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@storybook/theming": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-6.3.12.tgz",
-      "integrity": "sha512-wOJdTEa/VFyFB2UyoqyYGaZdym6EN7RALuQOAMT6zHA282FBmKw8nL5DETHEbctpnHdcrMC/391teK4nNSrdOA==",
-      "dev": true,
-      "dependencies": {
-        "@emotion/core": "^10.1.1",
-        "@emotion/is-prop-valid": "^0.8.6",
-        "@emotion/styled": "^10.0.27",
-        "@storybook/client-logger": "6.3.12",
-        "core-js": "^3.8.2",
-        "deep-object-diff": "^1.1.0",
-        "emotion-theming": "^10.0.27",
-        "global": "^4.4.0",
-        "memoizerific": "^1.11.3",
-        "polished": "^4.0.5",
-        "resolve-from": "^5.0.0",
-        "ts-dedent": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0"
-      }
-    },
-    "node_modules/@storybook/ui": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/ui/-/ui-6.3.12.tgz",
-      "integrity": "sha512-PC2yEz4JMfarq7rUFbeA3hCA+31p5es7YPEtxLRvRwIZhtL0P4zQUfHpotb3KgWdoAIfZesAuoIQwMPQmEFYrw==",
-      "dev": true,
-      "dependencies": {
-        "@emotion/core": "^10.1.1",
-        "@storybook/addons": "6.3.12",
-        "@storybook/api": "6.3.12",
-        "@storybook/channels": "6.3.12",
-        "@storybook/client-logger": "6.3.12",
-        "@storybook/components": "6.3.12",
-        "@storybook/core-events": "6.3.12",
-        "@storybook/router": "6.3.12",
-        "@storybook/semver": "^7.3.2",
-        "@storybook/theming": "6.3.12",
-        "@types/markdown-to-jsx": "^6.11.3",
-        "copy-to-clipboard": "^3.3.1",
-        "core-js": "^3.8.2",
-        "core-js-pure": "^3.8.2",
-        "downshift": "^6.0.15",
-        "emotion-theming": "^10.0.27",
-        "fuse.js": "^3.6.1",
-        "global": "^4.4.0",
-        "lodash": "^4.17.20",
-        "markdown-to-jsx": "^6.11.4",
-        "memoizerific": "^1.11.3",
-        "polished": "^4.0.5",
-        "qs": "^6.10.0",
-        "react-draggable": "^4.4.3",
-        "react-helmet-async": "^1.0.7",
-        "react-sizeme": "^3.0.1",
-        "regenerator-runtime": "^0.13.7",
-        "resolve-from": "^5.0.0",
-        "store2": "^2.12.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0"
-      }
-    },
-    "node_modules/@storybook/ui/node_modules/markdown-to-jsx": {
-      "version": "6.11.4",
-      "resolved": "https://registry.npmjs.org/markdown-to-jsx/-/markdown-to-jsx-6.11.4.tgz",
-      "integrity": "sha512-3lRCD5Sh+tfA52iGgfs/XZiw33f7fFX9Bn55aNnVNUd2GzLDkOWyKYYD8Yju2B1Vn+feiEdgJs8T6Tg0xNokPw==",
-      "dev": true,
-      "dependencies": {
-        "prop-types": "^15.6.2",
-        "unquote": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      },
-      "peerDependencies": {
-        "react": ">= 0.14.0"
-      }
-    },
-    "node_modules/@types/braces": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/braces/-/braces-3.0.1.tgz",
-      "integrity": "sha512-+euflG6ygo4bn0JHtn4pYqcXwRtLvElQ7/nnjDu7iYG56H0+OhCd7d6Ug0IE3WcFpZozBKW2+80FUbv5QGk5AQ==",
-      "dev": true
-    },
-    "node_modules/@types/color-convert": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@types/color-convert/-/color-convert-2.0.0.tgz",
-      "integrity": "sha512-m7GG7IKKGuJUXvkZ1qqG3ChccdIM/qBBo913z+Xft0nKCX4hAU/IxKwZBU4cpRZ7GS5kV4vOblUkILtSShCPXQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/color-name": "*"
-      }
-    },
-    "node_modules/@types/color-name": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
-      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
-      "dev": true
-    },
-    "node_modules/@types/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
-      "dev": true,
-      "dependencies": {
-        "@types/minimatch": "*",
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/glob-base": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@types/glob-base/-/glob-base-0.3.0.tgz",
-      "integrity": "sha1-pYHWiDR+EOUN18F9byiAoQNUMZ0=",
-      "dev": true
-    },
-    "node_modules/@types/hast": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.4.tgz",
-      "integrity": "sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "*"
-      }
-    },
-    "node_modules/@types/html-minifier-terser": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz",
-      "integrity": "sha512-h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w==",
-      "dev": true
-    },
-    "node_modules/@types/is-function": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@types/is-function/-/is-function-1.0.1.tgz",
-      "integrity": "sha512-A79HEEiwXTFtfY+Bcbo58M2GRYzCr9itHWzbzHVFNEYCcoU/MMGwYYf721gBrnhpj1s6RGVVha/IgNFnR0Iw/Q==",
-      "dev": true
-    },
-    "node_modules/@types/json-schema": {
-      "version": "7.0.9",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
-      "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
-      "dev": true
-    },
-    "node_modules/@types/markdown-to-jsx": {
-      "version": "6.11.3",
-      "resolved": "https://registry.npmjs.org/@types/markdown-to-jsx/-/markdown-to-jsx-6.11.3.tgz",
-      "integrity": "sha512-30nFYpceM/ZEvhGiqWjm5quLUxNeld0HCzJEXMZZDpq53FPkS85mTwkWtCXzCqq8s5JYLgM5W392a02xn8Bdaw==",
-      "dev": true,
-      "dependencies": {
-        "@types/react": "*"
-      }
-    },
-    "node_modules/@types/mdast": {
-      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.10.tgz",
-      "integrity": "sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "*"
-      }
-    },
-    "node_modules/@types/micromatch": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@types/micromatch/-/micromatch-4.0.2.tgz",
-      "integrity": "sha512-oqXqVb0ci19GtH0vOA/U2TmHTcRY9kuZl4mqUxe0QmJAlIW13kzhuK5pi1i9+ngav8FjpSb9FVS/GE00GLX1VA==",
-      "dev": true,
-      "dependencies": {
-        "@types/braces": "*"
-      }
-    },
-    "node_modules/@types/minimatch": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
-      "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
-      "dev": true
-    },
-    "node_modules/@types/node": {
-      "version": "14.17.32",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.32.tgz",
-      "integrity": "sha512-JcII3D5/OapPGx+eJ+Ik1SQGyt6WvuqdRfh9jUwL6/iHGjmyOriBDciBUu7lEIBTL2ijxwrR70WUnw5AEDmFvQ==",
-      "dev": true
-    },
-    "node_modules/@types/node-fetch": {
-      "version": "2.5.12",
-      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.12.tgz",
-      "integrity": "sha512-MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "form-data": "^3.0.0"
-      }
-    },
-    "node_modules/@types/normalize-package-data": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
-      "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
-      "dev": true
-    },
-    "node_modules/@types/npmlog": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@types/npmlog/-/npmlog-4.1.3.tgz",
-      "integrity": "sha512-1TcL7YDYCtnHmLhTWbum+IIwLlvpaHoEKS2KNIngEwLzwgDeHaebaEHHbQp8IqzNQ9IYiboLKUjAf7MZqG63+w==",
-      "dev": true
-    },
-    "node_modules/@types/overlayscrollbars": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@types/overlayscrollbars/-/overlayscrollbars-1.12.1.tgz",
-      "integrity": "sha512-V25YHbSoKQN35UasHf0EKD9U2vcmexRSp78qa8UglxFH8H3D+adEa9zGZwrqpH4TdvqeMrgMqVqsLB4woAryrQ==",
-      "dev": true
-    },
-    "node_modules/@types/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
-      "dev": true
-    },
-    "node_modules/@types/parse5": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/@types/parse5/-/parse5-5.0.3.tgz",
-      "integrity": "sha512-kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw==",
-      "dev": true
-    },
-    "node_modules/@types/pretty-hrtime": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@types/pretty-hrtime/-/pretty-hrtime-1.0.1.tgz",
-      "integrity": "sha512-VjID5MJb1eGKthz2qUerWT8+R4b9N+CHvGCzg9fn4kWZgaF9AhdYikQio3R7wV8YY1NsQKPaCwKz1Yff+aHNUQ==",
-      "dev": true
-    },
-    "node_modules/@types/prop-types": {
-      "version": "15.7.4",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.4.tgz",
-      "integrity": "sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==",
-      "dev": true
-    },
-    "node_modules/@types/qs": {
-      "version": "6.9.7",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
-      "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
-      "dev": true
-    },
-    "node_modules/@types/reach__router": {
-      "version": "1.3.9",
-      "resolved": "https://registry.npmjs.org/@types/reach__router/-/reach__router-1.3.9.tgz",
-      "integrity": "sha512-N6rqQqTTAV/zKLfK3iq9Ww3wqCEhTZvsilhl0zI09zETdVq1QGmJH6+/xnj8AFUWIrle2Cqo+PGM/Ltr1vBb9w==",
-      "dev": true,
-      "dependencies": {
-        "@types/react": "*"
-      }
-    },
-    "node_modules/@types/react": {
-      "version": "17.0.33",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.33.tgz",
-      "integrity": "sha512-pLWntxXpDPaU+RTAuSGWGSEL2FRTNyRQOjSWDke/rxRg14ncsZvx8AKWMWZqvc1UOaJIAoObdZhAWvRaHFi5rw==",
-      "dev": true,
-      "dependencies": {
-        "@types/prop-types": "*",
-        "@types/scheduler": "*",
-        "csstype": "^3.0.2"
-      }
-    },
-    "node_modules/@types/react-syntax-highlighter": {
-      "version": "11.0.5",
-      "resolved": "https://registry.npmjs.org/@types/react-syntax-highlighter/-/react-syntax-highlighter-11.0.5.tgz",
-      "integrity": "sha512-VIOi9i2Oj5XsmWWoB72p3KlZoEbdRAcechJa8Ztebw7bDl2YmR+odxIqhtJGp1q2EozHs02US+gzxJ9nuf56qg==",
-      "dev": true,
-      "dependencies": {
-        "@types/react": "*"
-      }
-    },
-    "node_modules/@types/react/node_modules/csstype": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.9.tgz",
-      "integrity": "sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw==",
-      "dev": true
-    },
-    "node_modules/@types/scheduler": {
-      "version": "0.16.2",
-      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
-      "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==",
-      "dev": true
-    },
-    "node_modules/@types/source-list-map": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
-      "integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==",
-      "dev": true
-    },
-    "node_modules/@types/tapable": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.8.tgz",
-      "integrity": "sha512-ipixuVrh2OdNmauvtT51o3d8z12p6LtFW9in7U79der/kwejjdNchQC5UMn5u/KxNoM7VHHOs/l8KS8uHxhODQ==",
-      "dev": true
-    },
-    "node_modules/@types/uglify-js": {
-      "version": "3.13.1",
-      "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.13.1.tgz",
-      "integrity": "sha512-O3MmRAk6ZuAKa9CHgg0Pr0+lUOqoMLpc9AS4R8ano2auvsg7IE8syF3Xh/NPr26TWklxYcqoEEFdzLLs1fV9PQ==",
-      "dev": true,
-      "dependencies": {
-        "source-map": "^0.6.1"
-      }
-    },
-    "node_modules/@types/uglify-js/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@types/unist": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz",
-      "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==",
-      "dev": true
-    },
-    "node_modules/@types/webpack": {
-      "version": "4.41.31",
-      "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.31.tgz",
-      "integrity": "sha512-/i0J7sepXFIp1ZT7FjUGi1eXMCg8HCCzLJEQkKsOtbJFontsJLolBcDC+3qxn5pPwiCt1G0ZdRmYRzNBtvpuGQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "@types/tapable": "^1",
-        "@types/uglify-js": "*",
-        "@types/webpack-sources": "*",
-        "anymatch": "^3.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
-    "node_modules/@types/webpack-env": {
-      "version": "1.16.3",
-      "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.16.3.tgz",
-      "integrity": "sha512-9gtOPPkfyNoEqCQgx4qJKkuNm/x0R2hKR7fdl7zvTJyHnIisuE/LfvXOsYWL0o3qq6uiBnKZNNNzi3l0y/X+xw==",
-      "dev": true
-    },
-    "node_modules/@types/webpack-sources": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-3.2.0.tgz",
-      "integrity": "sha512-Ft7YH3lEVRQ6ls8k4Ff1oB4jN6oy/XmU6tQISKdhfh+1mR+viZFphS6WL0IrtDOzvefmJg5a0s7ZQoRXwqTEFg==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "@types/source-list-map": "*",
-        "source-map": "^0.7.3"
-      }
-    },
-    "node_modules/@types/webpack-sources/node_modules/source-map": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@types/webpack/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@webassemblyjs/ast": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",
-      "integrity": "sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/helper-module-context": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/wast-parser": "1.9.0"
-      }
-    },
-    "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz",
-      "integrity": "sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz",
-      "integrity": "sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz",
-      "integrity": "sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-code-frame": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz",
-      "integrity": "sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/wast-printer": "1.9.0"
-      }
-    },
-    "node_modules/@webassemblyjs/helper-fsm": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz",
-      "integrity": "sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-module-context": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz",
-      "integrity": "sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.9.0"
-      }
-    },
-    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz",
-      "integrity": "sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz",
-      "integrity": "sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==",
-      "dev": 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",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz",
-      "integrity": "sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==",
-      "dev": true,
-      "dependencies": {
-        "@xtuc/ieee754": "^1.2.0"
-      }
-    },
-    "node_modules/@webassemblyjs/leb128": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz",
-      "integrity": "sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==",
-      "dev": true,
-      "dependencies": {
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webassemblyjs/utf8": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz",
-      "integrity": "sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz",
-      "integrity": "sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==",
-      "dev": 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",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz",
-      "integrity": "sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==",
-      "dev": 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",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz",
-      "integrity": "sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==",
-      "dev": 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",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz",
-      "integrity": "sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==",
-      "dev": 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",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz",
-      "integrity": "sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==",
-      "dev": 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",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz",
-      "integrity": "sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==",
-      "dev": 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",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "dev": true
-    },
-    "node_modules/@xtuc/long": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "dev": true
-    },
-    "node_modules/accepts": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
-      "dev": true,
-      "dependencies": {
-        "mime-types": "~2.1.24",
-        "negotiator": "0.6.2"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/acorn": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
-      "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/address": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/address/-/address-1.1.2.tgz",
-      "integrity": "sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.12.0"
-      }
-    },
-    "node_modules/aggregate-error": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-      "dev": true,
-      "dependencies": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/airbnb-js-shims": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/airbnb-js-shims/-/airbnb-js-shims-2.2.1.tgz",
-      "integrity": "sha512-wJNXPH66U2xjgo1Zwyjf9EydvJ2Si94+vSdk6EERcBfB2VZkeltpqIats0cqIZMLCXP3zcyaUKGYQeIBT6XjsQ==",
-      "dev": true,
-      "dependencies": {
-        "array-includes": "^3.0.3",
-        "array.prototype.flat": "^1.2.1",
-        "array.prototype.flatmap": "^1.2.1",
-        "es5-shim": "^4.5.13",
-        "es6-shim": "^0.35.5",
-        "function.prototype.name": "^1.1.0",
-        "globalthis": "^1.0.0",
-        "object.entries": "^1.1.0",
-        "object.fromentries": "^2.0.0 || ^1.0.0",
-        "object.getownpropertydescriptors": "^2.0.3",
-        "object.values": "^1.1.0",
-        "promise.allsettled": "^1.0.0",
-        "promise.prototype.finally": "^3.1.0",
-        "string.prototype.matchall": "^4.0.0 || ^3.0.1",
-        "string.prototype.padend": "^3.0.0",
-        "string.prototype.padstart": "^3.0.0",
-        "symbol.prototype.description": "^1.0.0"
-      }
-    },
-    "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": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/ajv-errors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
-      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": ">=5.0.0"
-      }
-    },
-    "node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
-    "node_modules/ansi-align": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz",
-      "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^4.1.0"
-      }
-    },
-    "node_modules/ansi-colors": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
-      "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/ansi-html-community": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
-      "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
-      "dev": true,
-      "engines": [
-        "node >= 0.8.0"
-      ],
-      "bin": {
-        "ansi-html": "bin/ansi-html"
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/ansi-styles/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/ansi-styles/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/ansi-to-html": {
-      "version": "0.6.15",
-      "resolved": "https://registry.npmjs.org/ansi-to-html/-/ansi-to-html-0.6.15.tgz",
-      "integrity": "sha512-28ijx2aHJGdzbs+O5SNQF65r6rrKYnkuwTYm8lZlChuoJ9P1vVzIpWO20sQTqTPDXYp6NFwk326vApTtLVFXpQ==",
-      "dev": true,
-      "dependencies": {
-        "entities": "^2.0.0"
-      },
-      "bin": {
-        "ansi-to-html": "bin/ansi-to-html"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/anymatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-      "dev": true,
-      "dependencies": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/app-root-dir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/app-root-dir/-/app-root-dir-1.0.2.tgz",
-      "integrity": "sha1-OBh+wt6nV3//Az/8sSFyaS/24Rg=",
-      "dev": true
-    },
-    "node_modules/aproba": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-      "dev": true
-    },
-    "node_modules/are-we-there-yet": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz",
-      "integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==",
-      "dev": true,
-      "dependencies": {
-        "delegates": "^1.0.0",
-        "readable-stream": "^2.0.6"
-      }
-    },
-    "node_modules/arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/arr-flatten": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/arr-union": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-flatten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
-      "dev": true
-    },
-    "node_modules/array-includes": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.4.tgz",
-      "integrity": "sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1",
-        "get-intrinsic": "^1.1.1",
-        "is-string": "^1.0.7"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/array-uniq": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array.prototype.flat": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz",
-      "integrity": "sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flatmap": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.2.5.tgz",
-      "integrity": "sha512-08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.map": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/array.prototype.map/-/array.prototype.map-1.0.4.tgz",
-      "integrity": "sha512-Qds9QnX7A0qISY7JT5WuJO0NJPE9CMlC6JzHQfhpqAAQQzufVRoeH7EzUY5GcPTx72voG8LV/5eo+b8Qi8hmhA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "es-array-method-boxes-properly": "^1.0.0",
-        "is-string": "^1.0.7"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/arrify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
-      "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/asn1.js": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
-      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
-      "dev": 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",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/assert": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
-      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
-      "dev": true,
-      "dependencies": {
-        "object-assign": "^4.1.1",
-        "util": "0.10.3"
-      }
-    },
-    "node_modules/assert/node_modules/inherits": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-      "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
-      "dev": true
-    },
-    "node_modules/assert/node_modules/util": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
-      "dev": true,
-      "dependencies": {
-        "inherits": "2.0.1"
-      }
-    },
-    "node_modules/assign-symbols": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/async-each": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
-      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-      "dev": true
-    },
-    "node_modules/at-least-node": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
-      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/atob": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "dev": true,
-      "bin": {
-        "atob": "bin/atob.js"
-      },
-      "engines": {
-        "node": ">= 4.5.0"
-      }
-    },
-    "node_modules/autoprefixer": {
-      "version": "9.8.8",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.8.tgz",
-      "integrity": "sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.12.0",
-        "caniuse-lite": "^1.0.30001109",
-        "normalize-range": "^0.1.2",
-        "num2fraction": "^1.2.2",
-        "picocolors": "^0.2.1",
-        "postcss": "^7.0.32",
-        "postcss-value-parser": "^4.1.0"
-      },
-      "bin": {
-        "autoprefixer": "bin/autoprefixer"
-      },
-      "funding": {
-        "type": "tidelift",
-        "url": "https://tidelift.com/funding/github/npm/autoprefixer"
-      }
-    },
-    "node_modules/axe-core": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.3.4.tgz",
-      "integrity": "sha512-4Hk6iSA/H90rtiPoCpSkeJxNWCPBf7szwVvaUqrPdxo0j2Y04suHK9jPKXaE3WI7OET6wBSwsWw7FDc1DBq7iQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/babel-loader": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.3.tgz",
-      "integrity": "sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw==",
-      "dev": true,
-      "dependencies": {
-        "find-cache-dir": "^3.3.1",
-        "loader-utils": "^1.4.0",
-        "make-dir": "^3.1.0",
-        "schema-utils": "^2.6.5"
-      },
-      "engines": {
-        "node": ">= 8.9"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0",
-        "webpack": ">=2"
-      }
-    },
-    "node_modules/babel-loader/node_modules/find-cache-dir": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
-      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
-      "dev": 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/babel-loader/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/babel-loader/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/babel-loader/node_modules/make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "dev": true,
-      "dependencies": {
-        "semver": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/babel-loader/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/babel-loader/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/babel-loader/node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/babel-plugin-apply-mdx-type-prop": {
-      "version": "1.6.22",
-      "resolved": "https://registry.npmjs.org/babel-plugin-apply-mdx-type-prop/-/babel-plugin-apply-mdx-type-prop-1.6.22.tgz",
-      "integrity": "sha512-VefL+8o+F/DfK24lPZMtJctrCVOfgbqLAGZSkxwhazQv4VxPg3Za/i40fu22KR2m8eEda+IfSOlPLUSIiLcnCQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "7.10.4",
-        "@mdx-js/util": "1.6.22"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.11.6"
-      }
-    },
-    "node_modules/babel-plugin-apply-mdx-type-prop/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/babel-plugin-dynamic-import-node": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
-      "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
-      "dev": true,
-      "dependencies": {
-        "object.assign": "^4.1.0"
-      }
-    },
-    "node_modules/babel-plugin-emotion": {
-      "version": "10.2.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-emotion/-/babel-plugin-emotion-10.2.2.tgz",
-      "integrity": "sha512-SMSkGoqTbTyUTDeuVuPIWifPdUGkTk1Kf9BWRiXIOIcuyMfsdp2EjeiiFvOzX8NOBvEh/ypKYvUh2rkgAJMCLA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.0.0",
-        "@emotion/hash": "0.8.0",
-        "@emotion/memoize": "0.7.4",
-        "@emotion/serialize": "^0.11.16",
-        "babel-plugin-macros": "^2.0.0",
-        "babel-plugin-syntax-jsx": "^6.18.0",
-        "convert-source-map": "^1.5.0",
-        "escape-string-regexp": "^1.0.5",
-        "find-root": "^1.1.0",
-        "source-map": "^0.5.7"
-      }
-    },
-    "node_modules/babel-plugin-emotion/node_modules/babel-plugin-macros": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz",
-      "integrity": "sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.7.2",
-        "cosmiconfig": "^6.0.0",
-        "resolve": "^1.12.0"
-      }
-    },
-    "node_modules/babel-plugin-emotion/node_modules/cosmiconfig": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
-      "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
-      "dev": true,
-      "dependencies": {
-        "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.1.0",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0",
-        "yaml": "^1.7.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/babel-plugin-extract-import-names": {
-      "version": "1.6.22",
-      "resolved": "https://registry.npmjs.org/babel-plugin-extract-import-names/-/babel-plugin-extract-import-names-1.6.22.tgz",
-      "integrity": "sha512-yJ9BsJaISua7d8zNT7oRG1ZLBJCIdZ4PZqmH8qa9N5AK01ifk3fnkc98AXhtzE7UkfCsEumvoQWgoYLhOnJ7jQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "7.10.4"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/babel-plugin-extract-import-names/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/babel-plugin-macros": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
-      "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.12.5",
-        "cosmiconfig": "^7.0.0",
-        "resolve": "^1.19.0"
-      },
-      "engines": {
-        "node": ">=10",
-        "npm": ">=6"
-      }
-    },
-    "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz",
-      "integrity": "sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.13.11",
-        "@babel/helper-define-polyfill-provider": "^0.2.2",
-        "semver": "^6.1.1"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.1.7.tgz",
-      "integrity": "sha512-u+gbS9bbPhZWEeyy1oR/YaaSpod/KDT07arZHb80aTpl8H5ZBq+uN1nN9/xtX7jQyfLdPfoqI4Rue/MQSWJquw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.1.5",
-        "core-js-compat": "^3.8.1"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/babel-plugin-polyfill-corejs3/node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.5.tgz",
-      "integrity": "sha512-nXuzCSwlJ/WKr8qxzW816gwyT6VZgiJG17zR40fou70yfAcqjoNyTLl/DQ+FExw5Hx5KNqshmN8Ldl/r2N7cTg==",
-      "dev": true,
-      "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"
-      }
-    },
-    "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz",
-      "integrity": "sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.2.2"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/babel-plugin-syntax-jsx": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
-      "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=",
-      "dev": true
-    },
-    "node_modules/bail": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz",
-      "integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
-    },
-    "node_modules/base": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-      "dev": true,
-      "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"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/base/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/base/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "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"
-        }
-      ]
-    },
-    "node_modules/batch-processor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
-      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg=",
-      "dev": true
-    },
-    "node_modules/better-opn": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/better-opn/-/better-opn-2.1.1.tgz",
-      "integrity": "sha512-kIPXZS5qwyKiX/HcRvDYfmBQUa8XP17I0mYZZ0y4UhpYOSvtsLHDYqmomS+Mj20aDvD3knEiQ0ecQy2nhio3yA==",
-      "dev": true,
-      "dependencies": {
-        "open": "^7.0.3"
-      },
-      "engines": {
-        "node": ">8.0.0"
-      }
-    },
-    "node_modules/big.js": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/bluebird": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-      "dev": true
-    },
-    "node_modules/bn.js": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
-      "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==",
-      "dev": true
-    },
-    "node_modules/body-parser": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
-      "dev": true,
-      "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"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/body-parser/node_modules/bytes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/body-parser/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/body-parser/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/body-parser/node_modules/qs": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/boolbase": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
-      "dev": true
-    },
-    "node_modules/boxen": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz",
-      "integrity": "sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-align": "^3.0.0",
-        "camelcase": "^5.3.1",
-        "chalk": "^3.0.0",
-        "cli-boxes": "^2.2.0",
-        "string-width": "^4.1.0",
-        "term-size": "^2.1.0",
-        "type-fest": "^0.8.1",
-        "widest-line": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/boxen/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/boxen/node_modules/chalk": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/boxen/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/boxen/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/brorand": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
-      "dev": true
-    },
-    "node_modules/browserify-aes": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-      "dev": true,
-      "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"
-      }
-    },
-    "node_modules/browserify-cipher": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
-      "dev": true,
-      "dependencies": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
-      }
-    },
-    "node_modules/browserify-des": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
-      "dev": true,
-      "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",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
-      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^5.0.0",
-        "randombytes": "^2.0.1"
-      }
-    },
-    "node_modules/browserify-sign": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
-      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
-      "dev": 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/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/browserify-sign/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "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"
-        }
-      ]
-    },
-    "node_modules/browserify-zlib": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
-      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
-      "dev": true,
-      "dependencies": {
-        "pako": "~1.0.5"
-      }
-    },
-    "node_modules/browserslist": {
-      "version": "4.17.5",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.5.tgz",
-      "integrity": "sha512-I3ekeB92mmpctWBoLXe0d5wPS2cBuRvvW0JyyJHMrk9/HmP2ZjrTboNAZ8iuGqaEIlKguljbQY32OkOJIRrgoA==",
-      "dev": true,
-      "dependencies": {
-        "caniuse-lite": "^1.0.30001271",
-        "electron-to-chromium": "^1.3.878",
-        "escalade": "^3.1.1",
-        "node-releases": "^2.0.1",
-        "picocolors": "^1.0.0"
-      },
-      "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/browserslist/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/buffer": {
-      "version": "4.9.2",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
-      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
-      "dev": true,
-      "dependencies": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
-      }
-    },
-    "node_modules/buffer-from": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true
-    },
-    "node_modules/buffer-xor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
-      "dev": true
-    },
-    "node_modules/buffer/node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-      "dev": true
-    },
-    "node_modules/builtin-status-codes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
-      "dev": true
-    },
-    "node_modules/bytes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/cacache": {
-      "version": "15.3.0",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz",
-      "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==",
-      "dev": true,
-      "dependencies": {
-        "@npmcli/fs": "^1.0.0",
-        "@npmcli/move-file": "^1.0.1",
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "glob": "^7.1.4",
-        "infer-owner": "^1.0.4",
-        "lru-cache": "^6.0.0",
-        "minipass": "^3.1.1",
-        "minipass-collect": "^1.0.2",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.2",
-        "mkdirp": "^1.0.3",
-        "p-map": "^4.0.0",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^3.0.2",
-        "ssri": "^8.0.1",
-        "tar": "^6.0.2",
-        "unique-filename": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/cacache/node_modules/p-map": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
-      "dev": true,
-      "dependencies": {
-        "aggregate-error": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cache-base": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
-      "dev": true,
-      "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"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cache-base/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "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": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/call-me-maybe": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
-      "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=",
-      "dev": true
-    },
-    "node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/camel-case": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
-      "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
-      "dev": true,
-      "dependencies": {
-        "pascal-case": "^3.1.2",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/camelcase-css": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz",
-      "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/caniuse-lite": {
-      "version": "1.0.30001271",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001271.tgz",
-      "integrity": "sha512-BBruZFWmt3HFdVPS8kceTBIguKxu4f99n5JNp06OlPD/luoAMIaIK5ieV5YjnBLH3Nysai9sxj9rpJj4ZisXOA==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/browserslist"
-      }
-    },
-    "node_modules/case-sensitive-paths-webpack-plugin": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz",
-      "integrity": "sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "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": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/character-entities": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz",
-      "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/character-entities-legacy": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz",
-      "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/character-reference-invalid": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz",
-      "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/chokidar": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
-      "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
-      "dev": true,
-      "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.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"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/chownr": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/chrome-trace-event": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
-    "node_modules/cipher-base": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/class-utils": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
-      "dev": true,
-      "dependencies": {
-        "arr-union": "^3.1.0",
-        "define-property": "^0.2.5",
-        "isobject": "^3.0.0",
-        "static-extend": "^0.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
-    "node_modules/class-utils/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/clean-css": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz",
-      "integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==",
-      "dev": true,
-      "dependencies": {
-        "source-map": "~0.6.0"
-      },
-      "engines": {
-        "node": ">= 4.0"
-      }
-    },
-    "node_modules/clean-css/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/clean-stack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/cli-boxes": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz",
-      "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cli-table3": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.0.tgz",
-      "integrity": "sha512-gnB85c3MGC7Nm9I/FkiasNBOKjOiO1RNuXXarQms37q4QMpWdlbBgD/VnOStA2faG1dpXMv31RFApjX1/QdgWQ==",
-      "dev": true,
-      "dependencies": {
-        "object-assign": "^4.1.0",
-        "string-width": "^4.2.0"
-      },
-      "engines": {
-        "node": "10.* || >= 12.*"
-      },
-      "optionalDependencies": {
-        "colors": "^1.1.2"
-      }
-    },
-    "node_modules/clone-deep": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
-      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
-      "dev": true,
-      "dependencies": {
-        "is-plain-object": "^2.0.4",
-        "kind-of": "^6.0.2",
-        "shallow-clone": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/clone-deep/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/clone-deep/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/clsx": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.1.1.tgz",
-      "integrity": "sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.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/collection-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
-      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
-      "dev": true,
-      "dependencies": {
-        "map-visit": "^1.0.0",
-        "object-visit": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/colors": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
-      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.1.90"
-      }
-    },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
-      "dependencies": {
-        "delayed-stream": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/comma-separated-tokens": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz",
-      "integrity": "sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/commander": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
-      "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/commondir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
-      "dev": true
-    },
-    "node_modules/component-emitter": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
-      "dev": true
-    },
-    "node_modules/compressible": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
-      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
-      "dev": true,
-      "dependencies": {
-        "mime-db": ">= 1.43.0 < 2"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/compression": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
-      "dev": true,
-      "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"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/compression/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/compression/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/compute-scroll-into-view": {
-      "version": "1.0.17",
-      "resolved": "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-1.0.17.tgz",
-      "integrity": "sha512-j4dx+Fb0URmzbwwMUrhqWM2BEWHdFGx+qZ9qqASHRPqvTYdqvWnHg0H1hIbcyLnvgnoNAVMlwkepyqM3DaIFUg==",
-      "dev": true
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
-    },
-    "node_modules/concat-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-      "dev": true,
-      "engines": [
-        "node >= 0.8"
-      ],
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
-      }
-    },
-    "node_modules/console-browserify": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
-      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
-      "dev": true
-    },
-    "node_modules/console-control-strings": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-      "dev": true
-    },
-    "node_modules/constants-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
-      "dev": true
-    },
-    "node_modules/content-disposition": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "5.1.2"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/convert-source-map": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
-      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.1.1"
-      }
-    },
-    "node_modules/cookie": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
-      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
-      "dev": true
-    },
-    "node_modules/copy-concurrently": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
-      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
-      "dev": true,
-      "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/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/copy-concurrently/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/copy-descriptor": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/copy-to-clipboard": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz",
-      "integrity": "sha512-i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw==",
-      "dev": true,
-      "dependencies": {
-        "toggle-selection": "^1.0.6"
-      }
-    },
-    "node_modules/core-js": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.19.0.tgz",
-      "integrity": "sha512-L1TpFRWXZ76vH1yLM+z6KssLZrP8Z6GxxW4auoCj+XiViOzNPJCAuTIkn03BGdFe6Z5clX5t64wRIRypsZQrUg==",
-      "dev": true,
-      "hasInstallScript": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
-    "node_modules/core-js-compat": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.19.0.tgz",
-      "integrity": "sha512-R09rKZ56ccGBebjTLZHvzDxhz93YPT37gBm6qUhnwj3Kt7aCjjZWD1injyNbyeFHxNKfeZBSyds6O9n3MKq1sw==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.17.5",
-        "semver": "7.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
-    "node_modules/core-js-compat/node_modules/semver": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-      "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/core-js-pure": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.19.0.tgz",
-      "integrity": "sha512-UEQk8AxyCYvNAs6baNoPqDADv7BX0AmBLGxVsrAifPPx/C8EAzV4Q+2ZUJqVzfI2TQQEZITnwUkWcHpgc/IubQ==",
-      "dev": true,
-      "hasInstallScript": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
-    "node_modules/core-util-is": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
-      "dev": true
-    },
-    "node_modules/cosmiconfig": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
-      "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
-      "dev": true,
-      "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"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/cp-file": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/cp-file/-/cp-file-7.0.0.tgz",
-      "integrity": "sha512-0Cbj7gyvFVApzpK/uhCtQ/9kE9UnYpxMzaq5nQQC/Dh4iaj5fxp7iEFIullrYwzj8nf0qnsI1Qsx34hAeAebvw==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "make-dir": "^3.0.0",
-        "nested-error-stacks": "^2.0.0",
-        "p-event": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cp-file/node_modules/make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "dev": true,
-      "dependencies": {
-        "semver": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cpy": {
-      "version": "8.1.2",
-      "resolved": "https://registry.npmjs.org/cpy/-/cpy-8.1.2.tgz",
-      "integrity": "sha512-dmC4mUesv0OYH2kNFEidtf/skUwv4zePmGeepjyyJ0qTo5+8KhA1o99oIAwVVLzQMAeDJml74d6wPPKb6EZUTg==",
-      "dev": true,
-      "dependencies": {
-        "arrify": "^2.0.1",
-        "cp-file": "^7.0.0",
-        "globby": "^9.2.0",
-        "has-glob": "^1.0.0",
-        "junk": "^3.1.0",
-        "nested-error-stacks": "^2.1.0",
-        "p-all": "^2.1.0",
-        "p-filter": "^2.1.0",
-        "p-map": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cpy/node_modules/@nodelib/fs.stat": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
-      "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/cpy/node_modules/array-union": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-      "dev": true,
-      "dependencies": {
-        "array-uniq": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cpy/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "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"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cpy/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cpy/node_modules/dir-glob": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
-      "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==",
-      "dev": true,
-      "dependencies": {
-        "path-type": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/cpy/node_modules/fast-glob": {
-      "version": "2.2.7",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz",
-      "integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==",
-      "dev": true,
-      "dependencies": {
-        "@mrmlnc/readdir-enhanced": "^2.2.1",
-        "@nodelib/fs.stat": "^1.1.2",
-        "glob-parent": "^3.1.0",
-        "is-glob": "^4.0.0",
-        "merge2": "^1.2.3",
-        "micromatch": "^3.1.10"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/cpy/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cpy/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cpy/node_modules/glob-parent": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
-      }
-    },
-    "node_modules/cpy/node_modules/glob-parent/node_modules/is-glob": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cpy/node_modules/globby": {
-      "version": "9.2.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-9.2.0.tgz",
-      "integrity": "sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==",
-      "dev": true,
-      "dependencies": {
-        "@types/glob": "^7.1.1",
-        "array-union": "^1.0.2",
-        "dir-glob": "^2.2.2",
-        "fast-glob": "^2.2.6",
-        "glob": "^7.1.3",
-        "ignore": "^4.0.3",
-        "pify": "^4.0.1",
-        "slash": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/cpy/node_modules/ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/cpy/node_modules/is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
-    "node_modules/cpy/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cpy/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cpy/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cpy/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cpy/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": 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"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cpy/node_modules/path-type": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-      "dev": true,
-      "dependencies": {
-        "pify": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/cpy/node_modules/path-type/node_modules/pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/cpy/node_modules/slash": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-      "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/cpy/node_modules/to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/create-ecdh": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
-      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "elliptic": "^6.5.3"
-      }
-    },
-    "node_modules/create-ecdh/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/create-hash": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-      "dev": true,
-      "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",
-      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-      "dev": 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/create-react-context": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/create-react-context/-/create-react-context-0.3.0.tgz",
-      "integrity": "sha512-dNldIoSuNSvlTJ7slIKC/ZFGKexBMBrrcc+TTe1NdmROnaASuLPvqpwj9v4XS4uXZ8+YPu0sNmShX2rXI5LNsw==",
-      "dev": true,
-      "dependencies": {
-        "gud": "^1.0.0",
-        "warning": "^4.0.3"
-      },
-      "peerDependencies": {
-        "prop-types": "^15.0.0",
-        "react": "^0.14.0 || ^15.0.0 || ^16.0.0"
-      }
-    },
-    "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dev": true,
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/crypto-browserify": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-      "dev": true,
-      "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-loader": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.6.0.tgz",
-      "integrity": "sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^5.3.1",
-        "cssesc": "^3.0.0",
-        "icss-utils": "^4.1.1",
-        "loader-utils": "^1.2.3",
-        "normalize-path": "^3.0.0",
-        "postcss": "^7.0.32",
-        "postcss-modules-extract-imports": "^2.0.0",
-        "postcss-modules-local-by-default": "^3.0.2",
-        "postcss-modules-scope": "^2.2.0",
-        "postcss-modules-values": "^3.0.0",
-        "postcss-value-parser": "^4.1.0",
-        "schema-utils": "^2.7.0",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">= 8.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/css-select": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz",
-      "integrity": "sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==",
-      "dev": true,
-      "dependencies": {
-        "boolbase": "^1.0.0",
-        "css-what": "^5.0.0",
-        "domhandler": "^4.2.0",
-        "domutils": "^2.6.0",
-        "nth-check": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
-    },
-    "node_modules/css-what": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz",
-      "integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
-    },
-    "node_modules/cssesc": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-      "dev": true,
-      "bin": {
-        "cssesc": "bin/cssesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/csstype": {
-      "version": "2.6.18",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.18.tgz",
-      "integrity": "sha512-RSU6Hyeg14am3Ah4VZEmeX8H7kLwEEirXe6aU2IPfKNvhXwTflK5HQRDNI0ypQXoqmm+QPyG2IaPuQE5zMwSIQ==",
-      "dev": true
-    },
-    "node_modules/cyclist": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
-      "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
-      "dev": true
-    },
-    "node_modules/debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/deep-object-diff": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/deep-object-diff/-/deep-object-diff-1.1.0.tgz",
-      "integrity": "sha512-b+QLs5vHgS+IoSNcUE4n9HP2NwcHj7aqnJWsjPtuG75Rh5TOaGt0OjAYInh77d5T16V5cRDC+Pw/6ZZZiETBGw==",
-      "dev": true
-    },
-    "node_modules/deepmerge": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-      "dev": true,
-      "dependencies": {
-        "object-keys": "^1.0.12"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/define-property": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.2",
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/define-property/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/delegates": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-      "dev": true
-    },
-    "node_modules/depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/des.js": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
-      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "node_modules/destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
-      "dev": true
-    },
-    "node_modules/detab": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/detab/-/detab-2.0.4.tgz",
-      "integrity": "sha512-8zdsQA5bIkoRECvCrNKPla84lyoR7DSAyf7p0YgXzBO9PDJx8KntPUay7NS6yp+KdxdVtiE5SpHKtbp2ZQyA9g==",
-      "dev": true,
-      "dependencies": {
-        "repeat-string": "^1.5.4"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/detect-port": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/detect-port/-/detect-port-1.3.0.tgz",
-      "integrity": "sha512-E+B1gzkl2gqxt1IhUzwjrxBKRqx1UzC3WLONHinn8S3T6lwV/agVCyitiFOsGJ/eYuEUBvD71MZHy3Pv1G9doQ==",
-      "dev": true,
-      "dependencies": {
-        "address": "^1.0.1",
-        "debug": "^2.6.0"
-      },
-      "bin": {
-        "detect": "bin/detect-port",
-        "detect-port": "bin/detect-port"
-      },
-      "engines": {
-        "node": ">= 4.2.1"
-      }
-    },
-    "node_modules/detect-port-alt": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.6.tgz",
-      "integrity": "sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q==",
-      "dev": true,
-      "dependencies": {
-        "address": "^1.0.1",
-        "debug": "^2.6.0"
-      },
-      "bin": {
-        "detect": "bin/detect-port",
-        "detect-port": "bin/detect-port"
-      },
-      "engines": {
-        "node": ">= 4.2.1"
-      }
-    },
-    "node_modules/detect-port-alt/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/detect-port-alt/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/detect-port/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/detect-port/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/diffie-hellman": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-      "dev": true,
-      "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",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "dependencies": {
-        "path-type": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/dom-converter": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
-      "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
-      "dev": true,
-      "dependencies": {
-        "utila": "~0.4"
-      }
-    },
-    "node_modules/dom-helpers": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
-      "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.8.7",
-        "csstype": "^3.0.2"
-      }
-    },
-    "node_modules/dom-helpers/node_modules/csstype": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.9.tgz",
-      "integrity": "sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw==",
-      "dev": true
-    },
-    "node_modules/dom-serializer": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz",
-      "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.0",
-        "entities": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
-      }
-    },
-    "node_modules/dom-walk": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz",
-      "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==",
-      "dev": true
-    },
-    "node_modules/domain-browser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4",
-        "npm": ">=1.2"
-      }
-    },
-    "node_modules/domelementtype": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
-      "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ]
-    },
-    "node_modules/domhandler": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.2.tgz",
-      "integrity": "sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^2.2.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domhandler?sponsor=1"
-      }
-    },
-    "node_modules/domutils": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-      "dev": true,
-      "dependencies": {
-        "dom-serializer": "^1.0.1",
-        "domelementtype": "^2.2.0",
-        "domhandler": "^4.2.0"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domutils?sponsor=1"
-      }
-    },
-    "node_modules/dot-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
-      "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
-      "dev": true,
-      "dependencies": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/dotenv": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz",
-      "integrity": "sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/dotenv-defaults": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/dotenv-defaults/-/dotenv-defaults-1.1.1.tgz",
-      "integrity": "sha512-6fPRo9o/3MxKvmRZBD3oNFdxODdhJtIy1zcJeUSCs6HCy4tarUpd+G67UTU9tF6OWXeSPqsm4fPAB+2eY9Rt9Q==",
-      "dev": true,
-      "dependencies": {
-        "dotenv": "^6.2.0"
-      }
-    },
-    "node_modules/dotenv-expand": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz",
-      "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==",
-      "dev": true
-    },
-    "node_modules/dotenv-webpack": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/dotenv-webpack/-/dotenv-webpack-1.8.0.tgz",
-      "integrity": "sha512-o8pq6NLBehtrqA8Jv8jFQNtG9nhRtVqmoD4yWbgUyoU3+9WBlPe+c2EAiaJok9RB28QvrWvdWLZGeTT5aATDMg==",
-      "dev": true,
-      "dependencies": {
-        "dotenv-defaults": "^1.0.2"
-      },
-      "peerDependencies": {
-        "webpack": "^1 || ^2 || ^3 || ^4"
-      }
-    },
-    "node_modules/downshift": {
-      "version": "6.1.7",
-      "resolved": "https://registry.npmjs.org/downshift/-/downshift-6.1.7.tgz",
-      "integrity": "sha512-cVprZg/9Lvj/uhYRxELzlu1aezRcgPWBjTvspiGTVEU64gF5pRdSRKFVLcxqsZC637cLAGMbL40JavEfWnqgNg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.14.8",
-        "compute-scroll-into-view": "^1.0.17",
-        "prop-types": "^15.7.2",
-        "react-is": "^17.0.2",
-        "tslib": "^2.3.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.12.0"
-      }
-    },
-    "node_modules/duplexer": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
-      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
-      "dev": true
-    },
-    "node_modules/duplexify": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
-      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
-      "dev": true,
-      "dependencies": {
-        "end-of-stream": "^1.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0",
-        "stream-shift": "^1.0.0"
-      }
-    },
-    "node_modules/ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
-      "dev": true
-    },
-    "node_modules/electron-to-chromium": {
-      "version": "1.3.879",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.879.tgz",
-      "integrity": "sha512-zJo+D9GwbJvM31IdFmwcGvychhk4KKbKYo2GWlsn+C/dxz2NwmbhGJjWwTfFSF2+eFH7VvfA8MCZ8SOqTrlnpw==",
-      "dev": true
-    },
-    "node_modules/element-resize-detector": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
-      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
-      "dev": true,
-      "dependencies": {
-        "batch-processor": "1.0.0"
-      }
-    },
-    "node_modules/elliptic": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
-      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
-      "dev": 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",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/emojis-list": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/emotion-theming": {
-      "version": "10.0.27",
-      "resolved": "https://registry.npmjs.org/emotion-theming/-/emotion-theming-10.0.27.tgz",
-      "integrity": "sha512-MlF1yu/gYh8u+sLUqA0YuA9JX0P4Hb69WlKc/9OLo+WCXuX6sy/KoIa+qJimgmr2dWqnypYKYPX37esjDBbhdw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.5.5",
-        "@emotion/weak-memoize": "0.2.5",
-        "hoist-non-react-statics": "^3.3.0"
-      },
-      "peerDependencies": {
-        "@emotion/core": "^10.0.27",
-        "react": ">=16.3.0"
-      }
-    },
-    "node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.4.0"
-      }
-    },
-    "node_modules/enhanced-resolve": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz",
-      "integrity": "sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "memory-fs": "^0.5.0",
-        "tapable": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/enhanced-resolve/node_modules/memory-fs": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
-      "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
-      "dev": true,
-      "dependencies": {
-        "errno": "^0.1.3",
-        "readable-stream": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=4.3.0 <5.0.0 || >=5.10"
-      }
-    },
-    "node_modules/entities": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/errno": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
-      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
-      "dev": true,
-      "dependencies": {
-        "prr": "~1.0.1"
-      },
-      "bin": {
-        "errno": "cli.js"
-      }
-    },
-    "node_modules/error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
-      "dependencies": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "node_modules/es-abstract": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
-      "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
-      "dev": true,
-      "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"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/es-array-method-boxes-properly": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
-      "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==",
-      "dev": true
-    },
-    "node_modules/es-get-iterator": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.2.tgz",
-      "integrity": "sha512-+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.0",
-        "has-symbols": "^1.0.1",
-        "is-arguments": "^1.1.0",
-        "is-map": "^2.0.2",
-        "is-set": "^2.0.2",
-        "is-string": "^1.0.5",
-        "isarray": "^2.0.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/es5-shim": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/es5-shim/-/es5-shim-4.6.2.tgz",
-      "integrity": "sha512-n0XTVMGps+Deyr38jtqKPR5F5hb9owYeRQcKJW39eFvzUk/u/9Ww315werRzbiNMnHCUw/YHDPBphTlEnzdi+A==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/es6-shim": {
-      "version": "0.35.6",
-      "resolved": "https://registry.npmjs.org/es6-shim/-/es6-shim-0.35.6.tgz",
-      "integrity": "sha512-EmTr31wppcaIAgblChZiuN/l9Y7DPyw8Xtbg7fIVngn6zMW+IEBJDJngeKC3x6wr0V/vcA2wqeFnaw1bFJbDdA==",
-      "dev": true
-    },
-    "node_modules/escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
-      "dev": true
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/eslint-scope": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
-      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "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": {
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esrecurse/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/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/events": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.x"
-      }
-    },
-    "node_modules/evp_bytestokey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-      "dev": true,
-      "dependencies": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "node_modules/expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-      "dev": true,
-      "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"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
-    "node_modules/expand-brackets/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/express": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
-      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
-      "dev": true,
-      "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"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/express/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/express/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/express/node_modules/qs": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "dev": true
-    },
-    "node_modules/extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "dev": true,
-      "dependencies": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-      "dev": true,
-      "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"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
-    "node_modules/fast-glob": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
-      "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
-      "dev": true,
-      "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"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "node_modules/fastq": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
-      "dev": true,
-      "dependencies": {
-        "reusify": "^1.0.4"
-      }
-    },
-    "node_modules/fault": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/fault/-/fault-1.0.4.tgz",
-      "integrity": "sha512-CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==",
-      "dev": true,
-      "dependencies": {
-        "format": "^0.2.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/figgy-pudding": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
-      "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==",
-      "dev": true
-    },
-    "node_modules/file-loader": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
-      "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
-      "dev": true,
-      "dependencies": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/file-loader/node_modules/loader-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-      "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      },
-      "engines": {
-        "node": ">=8.9.0"
-      }
-    },
-    "node_modules/file-loader/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/file-system-cache": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/file-system-cache/-/file-system-cache-1.0.5.tgz",
-      "integrity": "sha1-hCWbNqK7uNPW6xAh0xMv/mTP/08=",
-      "dev": true,
-      "dependencies": {
-        "bluebird": "^3.3.5",
-        "fs-extra": "^0.30.0",
-        "ramda": "^0.21.0"
-      }
-    },
-    "node_modules/file-system-cache/node_modules/fs-extra": {
-      "version": "0.30.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
-      "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "jsonfile": "^2.1.0",
-        "klaw": "^1.0.0",
-        "path-is-absolute": "^1.0.0",
-        "rimraf": "^2.2.8"
-      }
-    },
-    "node_modules/file-system-cache/node_modules/jsonfile": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
-      "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
-      "dev": true,
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/file-system-cache/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/filesize": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/filesize/-/filesize-6.1.0.tgz",
-      "integrity": "sha512-LpCHtPQ3sFx67z+uh2HnSyWSLLu5Jxo21795uRDuar/EOuYWXib5EmPaGIBuSnRqH2IODiKA2k5re/K9OnN/Yg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
-      "dev": true,
-      "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"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/finalhandler/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/finalhandler/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/find-cache-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
-      "dev": true,
-      "dependencies": {
-        "commondir": "^1.0.1",
-        "make-dir": "^2.0.0",
-        "pkg-dir": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/find-cache-dir/node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/find-cache-dir/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/find-cache-dir/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": 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": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/find-cache-dir/node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/find-cache-dir/node_modules/pkg-dir": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/find-root": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
-      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==",
-      "dev": true
-    },
-    "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==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/flush-write-stream": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
-      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.3.6"
-      }
-    },
-    "node_modules/for-in": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.4.0.tgz",
-      "integrity": "sha512-3I3wFkc4DbzaUDPWEi96wdYGu4EKtxBafhZYm0o4mX51d9bphAY4P3mBl8K5mFXFJqVzHfmdbm9kLGnm7vwwBg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.8.3",
-        "@types/json-schema": "^7.0.5",
-        "chalk": "^4.1.0",
-        "chokidar": "^3.4.2",
-        "cosmiconfig": "^6.0.0",
-        "deepmerge": "^4.2.2",
-        "fs-extra": "^9.0.0",
-        "glob": "^7.1.6",
-        "memfs": "^3.1.2",
-        "minimatch": "^3.0.4",
-        "schema-utils": "2.7.0",
-        "semver": "^7.3.2",
-        "tapable": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=10",
-        "yarn": ">=1.0.0"
-      },
-      "peerDependencies": {
-        "eslint": ">= 6",
-        "typescript": ">= 2.7",
-        "vue-template-compiler": "*",
-        "webpack": ">= 4"
-      },
-      "peerDependenciesMeta": {
-        "eslint": {
-          "optional": true
-        },
-        "vue-template-compiler": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/cosmiconfig": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
-      "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
-      "dev": true,
-      "dependencies": {
-        "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.1.0",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0",
-        "yaml": "^1.7.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/schema-utils": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
-      "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.4",
-        "ajv": "^6.12.2",
-        "ajv-keywords": "^3.4.1"
-      },
-      "engines": {
-        "node": ">= 8.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/form-data": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
-      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
-      "dev": true,
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/format": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz",
-      "integrity": "sha1-1hcBB+nv3E7TDJ3DkBbflCtctYs=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
-    "node_modules/forwarded": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/fragment-cache": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
-      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
-      "dev": true,
-      "dependencies": {
-        "map-cache": "^0.2.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/from2": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
-      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0"
-      }
-    },
-    "node_modules/fs-extra": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
-      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
-      "dev": true,
-      "dependencies": {
-        "at-least-node": "^1.0.0",
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/fs-minipass": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/fs-monkey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz",
-      "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==",
-      "dev": true
-    },
-    "node_modules/fs-write-stream-atomic": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
-      "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "iferr": "^0.1.5",
-        "imurmurhash": "^0.1.4",
-        "readable-stream": "1 || 2"
-      }
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "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.2",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.2.tgz",
-      "integrity": "sha512-bLgc3asbWdwPbx2mNk2S49kmJCuQeu0nfmaOgbs8WIyzzkw3r4htszdIi9Q9EMezDPTYuJx2wvjZ/EwgAthpnA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/fuse.js": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-3.6.1.tgz",
-      "integrity": "sha512-hT9yh/tiinkmirKrlv4KWOjztdoZo1mx9Qh4KvWqC7isoXwdUY3PNWUxceF4/qO9R6riA2C29jdTOeQOIROjgw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/gauge": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-      "dev": true,
-      "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"
-      }
-    },
-    "node_modules/gauge/node_modules/is-fullwidth-code-point": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-      "dev": true,
-      "dependencies": {
-        "number-is-nan": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gauge/node_modules/string-width": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-      "dev": true,
-      "dependencies": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
-        "strip-ansi": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/get-intrinsic": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
-      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/get-value": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-      "dev": true,
-      "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"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/glob-base": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
-      "dev": true,
-      "dependencies": {
-        "glob-parent": "^2.0.0",
-        "is-glob": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-base/node_modules/glob-parent": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-      "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^2.0.0"
-      }
-    },
-    "node_modules/glob-base/node_modules/is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-base/node_modules/is-glob": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-      "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/glob-promise": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/glob-promise/-/glob-promise-3.4.0.tgz",
-      "integrity": "sha512-q08RJ6O+eJn+dVanerAndJwIcumgbDdYiUT7zFQl3Wm1xD6fBKtah7H8ZJChj4wP+8C+QfeVy8xautR7rdmKEw==",
-      "dev": true,
-      "dependencies": {
-        "@types/glob": "*"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "glob": "*"
-      }
-    },
-    "node_modules/glob-to-regexp": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
-      "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=",
-      "dev": true
-    },
-    "node_modules/global": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz",
-      "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==",
-      "dev": true,
-      "dependencies": {
-        "min-document": "^2.19.0",
-        "process": "^0.11.10"
-      }
-    },
-    "node_modules/global-modules": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
-      "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
-      "dev": true,
-      "dependencies": {
-        "global-prefix": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/global-prefix": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
-      "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
-      "dev": true,
-      "dependencies": {
-        "ini": "^1.3.5",
-        "kind-of": "^6.0.2",
-        "which": "^1.3.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/global-prefix/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
-    "node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/globalthis": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.2.tgz",
-      "integrity": "sha512-ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/globby": {
-      "version": "11.0.4",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
-      "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
-      "dev": true,
-      "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"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/graceful-fs": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
-      "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==",
-      "dev": true
-    },
-    "node_modules/gud": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/gud/-/gud-1.0.0.tgz",
-      "integrity": "sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw==",
-      "dev": true
-    },
-    "node_modules/gzip-size": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
-      "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==",
-      "dev": true,
-      "dependencies": {
-        "duplexer": "^0.1.1",
-        "pify": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/has-bigints": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
-      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/has-glob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-glob/-/has-glob-1.0.0.tgz",
-      "integrity": "sha1-mqqe7b/7G6OZCnsAEPtnjuAIEgc=",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-glob/node_modules/is-glob": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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": {
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-unicode": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
-      "dev": true
-    },
-    "node_modules/has-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
-      "dev": true,
-      "dependencies": {
-        "get-value": "^2.0.6",
-        "has-values": "^1.0.0",
-        "isobject": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-value/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-values": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-values/node_modules/is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
-    "node_modules/has-values/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-values/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-values/node_modules/kind-of": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-      "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hash-base": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
-      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
-      "dev": 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/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/hash-base/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "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"
-        }
-      ]
-    },
-    "node_modules/hash.js": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.1"
-      }
-    },
-    "node_modules/hast-to-hyperscript": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/hast-to-hyperscript/-/hast-to-hyperscript-9.0.1.tgz",
-      "integrity": "sha512-zQgLKqF+O2F72S1aa4y2ivxzSlko3MAvxkwG8ehGmNiqd98BIN3JM1rAJPmplEyLmGLO2QZYJtIneOSZ2YbJuA==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.3",
-        "comma-separated-tokens": "^1.0.0",
-        "property-information": "^5.3.0",
-        "space-separated-tokens": "^1.0.0",
-        "style-to-object": "^0.3.0",
-        "unist-util-is": "^4.0.0",
-        "web-namespaces": "^1.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/hast-util-from-parse5": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-6.0.1.tgz",
-      "integrity": "sha512-jeJUWiN5pSxW12Rh01smtVkZgZr33wBokLzKLwinYOUfSzm1Nl/c3GUGebDyOKjdsRgMvoVbV0VpAcpjF4NrJA==",
-      "dev": true,
-      "dependencies": {
-        "@types/parse5": "^5.0.0",
-        "hastscript": "^6.0.0",
-        "property-information": "^5.0.0",
-        "vfile": "^4.0.0",
-        "vfile-location": "^3.2.0",
-        "web-namespaces": "^1.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/hast-util-parse-selector": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-2.2.5.tgz",
-      "integrity": "sha512-7j6mrk/qqkSehsM92wQjdIgWM2/BW61u/53G6xmC8i1OmEdKLHbk419QKQUjz6LglWsfqoiHmyMRkP1BGjecNQ==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/hast-util-raw": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/hast-util-raw/-/hast-util-raw-6.0.1.tgz",
-      "integrity": "sha512-ZMuiYA+UF7BXBtsTBNcLBF5HzXzkyE6MLzJnL605LKE8GJylNjGc4jjxazAHUtcwT5/CEt6afRKViYB4X66dig==",
-      "dev": true,
-      "dependencies": {
-        "@types/hast": "^2.0.0",
-        "hast-util-from-parse5": "^6.0.0",
-        "hast-util-to-parse5": "^6.0.0",
-        "html-void-elements": "^1.0.0",
-        "parse5": "^6.0.0",
-        "unist-util-position": "^3.0.0",
-        "vfile": "^4.0.0",
-        "web-namespaces": "^1.0.0",
-        "xtend": "^4.0.0",
-        "zwitch": "^1.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/hast-util-to-parse5": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/hast-util-to-parse5/-/hast-util-to-parse5-6.0.0.tgz",
-      "integrity": "sha512-Lu5m6Lgm/fWuz8eWnrKezHtVY83JeRGaNQ2kn9aJgqaxvVkFCZQBEhgodZUDUvoodgyROHDb3r5IxAEdl6suJQ==",
-      "dev": true,
-      "dependencies": {
-        "hast-to-hyperscript": "^9.0.0",
-        "property-information": "^5.0.0",
-        "web-namespaces": "^1.0.0",
-        "xtend": "^4.0.0",
-        "zwitch": "^1.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/hastscript": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/hastscript/-/hastscript-6.0.0.tgz",
-      "integrity": "sha512-nDM6bvd7lIqDUiYEiu5Sl/+6ReP0BMk/2f4U/Rooccxkj0P5nm+acM5PrGJ/t5I8qPGiqZSE6hVAwZEdZIvP4w==",
-      "dev": true,
-      "dependencies": {
-        "@types/hast": "^2.0.0",
-        "comma-separated-tokens": "^1.0.0",
-        "hast-util-parse-selector": "^2.0.0",
-        "property-information": "^5.0.0",
-        "space-separated-tokens": "^1.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/he": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-      "dev": true,
-      "bin": {
-        "he": "bin/he"
-      }
-    },
-    "node_modules/highlight.js": {
-      "version": "10.7.3",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz",
-      "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/hmac-drbg": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-      "dev": true,
-      "dependencies": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "node_modules/hoist-non-react-statics": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
-      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
-      "dev": true,
-      "dependencies": {
-        "react-is": "^16.7.0"
-      }
-    },
-    "node_modules/hoist-non-react-statics/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/hosted-git-info": {
-      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-      "dev": true
-    },
-    "node_modules/html-entities": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.2.tgz",
-      "integrity": "sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ==",
-      "dev": true
-    },
-    "node_modules/html-minifier-terser": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz",
-      "integrity": "sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg==",
-      "dev": true,
-      "dependencies": {
-        "camel-case": "^4.1.1",
-        "clean-css": "^4.2.3",
-        "commander": "^4.1.1",
-        "he": "^1.2.0",
-        "param-case": "^3.0.3",
-        "relateurl": "^0.2.7",
-        "terser": "^4.6.3"
-      },
-      "bin": {
-        "html-minifier-terser": "cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/html-minifier-terser/node_modules/commander": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
-      "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/html-void-elements": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-1.0.5.tgz",
-      "integrity": "sha512-uE/TxKuyNIcx44cIWnjr/rfIATDH7ZaOMmstu0CwhFG1Dunhlp4OC6/NMbhiwoq5BpW0ubi303qnEk/PZj614w==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/html-webpack-plugin": {
-      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.5.2.tgz",
-      "integrity": "sha512-q5oYdzjKUIPQVjOosjgvCHQOv9Ett9CYYHlgvJeXG0qQvdSojnBq4vAdQBwn1+yGveAwHCoe/rMR86ozX3+c2A==",
-      "dev": true,
-      "dependencies": {
-        "@types/html-minifier-terser": "^5.0.0",
-        "@types/tapable": "^1.0.5",
-        "@types/webpack": "^4.41.8",
-        "html-minifier-terser": "^5.0.1",
-        "loader-utils": "^1.2.3",
-        "lodash": "^4.17.20",
-        "pretty-error": "^2.1.1",
-        "tapable": "^1.1.3",
-        "util.promisify": "1.0.0"
-      },
-      "engines": {
-        "node": ">=6.9"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/htmlparser2": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
-      "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
-      "dev": true,
-      "funding": [
-        "https://github.com/fb55/htmlparser2?sponsor=1",
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ],
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.0.0",
-        "domutils": "^2.5.2",
-        "entities": "^2.0.0"
-      }
-    },
-    "node_modules/http-errors": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
-      "dev": true,
-      "dependencies": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.1",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/http-errors/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "dev": true
-    },
-    "node_modules/https-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
-      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
-      "dev": true
-    },
-    "node_modules/iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dev": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/icss-utils": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz",
-      "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.14"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "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"
-        }
-      ]
-    },
-    "node_modules/iferr": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
-      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
-      "dev": true
-    },
-    "node_modules/ignore": {
-      "version": "5.1.8",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-      "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/immer": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/immer/-/immer-8.0.1.tgz",
-      "integrity": "sha512-aqXhGP7//Gui2+UrEtvxZxSquQVXTpZ7KDxfCcKAF3Vysvw0CViVaW9RZ1j1xlIYqaaaipBoqdqeibkc18PNvA==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/immer"
-      }
-    },
-    "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
-      "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/import-fresh/node_modules/resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.19"
-      }
-    },
-    "node_modules/indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/infer-owner": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
-      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
-      "dev": true
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "node_modules/ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "dev": true
-    },
-    "node_modules/inline-style-parser": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.1.1.tgz",
-      "integrity": "sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==",
-      "dev": true
-    },
-    "node_modules/internal-slot": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.0",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/interpret": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz",
-      "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/invariant": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
-      "dev": true,
-      "dependencies": {
-        "loose-envify": "^1.0.0"
-      }
-    },
-    "node_modules/ip": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
-      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
-      "dev": true
-    },
-    "node_modules/ipaddr.js": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/is-accessor-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-alphabetical": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz",
-      "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/is-alphanumerical": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz",
-      "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==",
-      "dev": true,
-      "dependencies": {
-        "is-alphabetical": "^1.0.0",
-        "is-decimal": "^1.0.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "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,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-      "dev": true
-    },
-    "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": {
-        "has-bigints": "^1.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dev": 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": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-buffer": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
-      "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
-      "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"
-        }
-      ],
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-core-module": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz",
-      "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==",
-      "dev": true,
-      "dependencies": {
-        "has": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-data-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "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": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-decimal": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz",
-      "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/is-descriptor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-docker": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
-      "dev": true,
-      "bin": {
-        "is-docker": "cli.js"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dev": true,
-      "dependencies": {
-        "is-plain-object": "^2.0.4"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-extendable/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-extendable/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-function": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-function/-/is-function-1.0.2.tgz",
-      "integrity": "sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==",
-      "dev": true
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-hexadecimal": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz",
-      "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "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==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-negative-zero": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
-      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/is-number-object": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz",
-      "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-plain-obj": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
-      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "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": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-root": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-root/-/is-root-2.1.0.tgz",
-      "integrity": "sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "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.1",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz",
-      "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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": {
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-weakref": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.1.tgz",
-      "integrity": "sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==",
-      "dev": true,
-      "dependencies": {
-        "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",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-      "dev": true,
-      "engines": {
-        "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",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-      "dev": true,
-      "dependencies": {
-        "is-docker": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "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/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
-    },
-    "node_modules/isobject": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-4.0.0.tgz",
-      "integrity": "sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/iterate-iterator": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/iterate-iterator/-/iterate-iterator-1.0.2.tgz",
-      "integrity": "sha512-t91HubM4ZDQ70M9wqp+pcNpu8OyJ9UAtXntT/Bcsvp5tZMnz9vRa+IunKXeI8AnfZMTv0jNuVEmGeLSMjVvfPw==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/iterate-value": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/iterate-value/-/iterate-value-1.0.2.tgz",
-      "integrity": "sha512-A6fMAio4D2ot2r/TYzr4yUWrmwNdsN5xL7+HUiyACE4DXm+q8HtPcnFTp+NnW3k4N05tZ7FVYFFb2CR13NxyHQ==",
-      "dev": true,
-      "dependencies": {
-        "es-get-iterator": "^1.0.2",
-        "iterate-iterator": "^1.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/jest-worker": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
-      "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^7.0.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      }
-    },
-    "node_modules/jest-worker/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-worker/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/js-string-escape": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/js-string-escape/-/js-string-escape-1.0.1.tgz",
-      "integrity": "sha1-4mJbrbwNZ8dTPp7cEGjFh65BN+8=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
-    "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-      "dev": true
-    },
-    "node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true
-    },
-    "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/json5": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "dev": true,
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/junk": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/junk/-/junk-3.1.0.tgz",
-      "integrity": "sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/klaw": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
-      "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
-      "dev": true,
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.9"
-      }
-    },
-    "node_modules/kleur": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/klona": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz",
-      "integrity": "sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/lazy-universal-dotenv": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lazy-universal-dotenv/-/lazy-universal-dotenv-3.0.1.tgz",
-      "integrity": "sha512-prXSYk799h3GY3iOWnC6ZigYzMPjxN2svgjJ9shk7oMadSNX3wXy0B6F32PMJv7qtMnrIbUxoEHzbutvxR2LBQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.5.0",
-        "app-root-dir": "^1.0.2",
-        "core-js": "^3.0.4",
-        "dotenv": "^8.0.0",
-        "dotenv-expand": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=6.0.0",
-        "npm": ">=6.0.0",
-        "yarn": ">=1.0.0"
-      }
-    },
-    "node_modules/lazy-universal-dotenv/node_modules/dotenv": {
-      "version": "8.6.0",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz",
-      "integrity": "sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/lines-and-columns": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
-      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
-      "dev": true
-    },
-    "node_modules/loader-runner": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
-      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.3.0 <5.0.0 || >=5.10"
-      }
-    },
-    "node_modules/loader-utils": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-      "dev": 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",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "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/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
-    },
-    "node_modules/lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
-      "dev": true
-    },
-    "node_modules/lodash.uniq": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
-      "dev": true
-    },
-    "node_modules/loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dev": true,
-      "dependencies": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      },
-      "bin": {
-        "loose-envify": "cli.js"
-      }
-    },
-    "node_modules/lower-case": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
-      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/lowlight": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/lowlight/-/lowlight-1.20.0.tgz",
-      "integrity": "sha512-8Ktj+prEb1RoCPkEOrPMYUN/nCggB7qAWe3a7OpMjWQkh3l2RD5wKRQ+o8Q8YuI9RG/xs95waaI/E6ym/7NsTw==",
-      "dev": true,
-      "dependencies": {
-        "fault": "^1.0.0",
-        "highlight.js": "~10.7.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/make-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-      "dev": true,
-      "dependencies": {
-        "pify": "^4.0.1",
-        "semver": "^5.6.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/make-dir/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/map-cache": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/map-or-similar": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/map-or-similar/-/map-or-similar-1.5.0.tgz",
-      "integrity": "sha1-beJlMXSt+12e3DPGnT6Sobdvrwg=",
-      "dev": true
-    },
-    "node_modules/map-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
-      "dev": true,
-      "dependencies": {
-        "object-visit": "^1.0.0"
-      },
-      "engines": {
-        "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-to-jsx": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/markdown-to-jsx/-/markdown-to-jsx-7.1.3.tgz",
-      "integrity": "sha512-jtQ6VyT7rMT5tPV0g2EJakEnXLiPksnvlYtwQsVVZ611JsWGN8bQ1tVSDX4s6JllfEH6wmsYxNjTUAMrPmNA8w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      },
-      "peerDependencies": {
-        "react": ">= 0.14.0"
-      }
-    },
-    "node_modules/md5.js": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-      "dev": true,
-      "dependencies": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/mdast-squeeze-paragraphs": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/mdast-squeeze-paragraphs/-/mdast-squeeze-paragraphs-4.0.0.tgz",
-      "integrity": "sha512-zxdPn69hkQ1rm4J+2Cs2j6wDEv7O17TfXTJ33tl/+JPIoEmtV9t2ZzBM5LPHE8QlHsmVD8t3vPKCyY3oH+H8MQ==",
-      "dev": true,
-      "dependencies": {
-        "unist-util-remove": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/mdast-util-definitions": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-4.0.0.tgz",
-      "integrity": "sha512-k8AJ6aNnUkB7IE+5azR9h81O5EQ/cTDXtWdMq9Kk5KcEW/8ritU5CeLg/9HhOC++nALHBlaogJ5jz0Ybk3kPMQ==",
-      "dev": true,
-      "dependencies": {
-        "unist-util-visit": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/mdast-util-to-hast": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-10.0.1.tgz",
-      "integrity": "sha512-BW3LM9SEMnjf4HXXVApZMt8gLQWVNXc3jryK0nJu/rOXPOnlkUjmdkDlmxMirpbU9ILncGFIwLH/ubnWBbcdgA==",
-      "dev": true,
-      "dependencies": {
-        "@types/mdast": "^3.0.0",
-        "@types/unist": "^2.0.0",
-        "mdast-util-definitions": "^4.0.0",
-        "mdurl": "^1.0.0",
-        "unist-builder": "^2.0.0",
-        "unist-util-generated": "^1.0.0",
-        "unist-util-position": "^3.0.0",
-        "unist-util-visit": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/mdurl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
-      "dev": true
-    },
-    "node_modules/media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/memfs": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.3.0.tgz",
-      "integrity": "sha512-BEE62uMfKOavX3iG7GYX43QJ+hAeeWnwIAuJ/R6q96jaMtiLzhsxHJC8B1L7fK7Pt/vXDRwb3SG/yBpNGDPqzg==",
-      "dev": true,
-      "dependencies": {
-        "fs-monkey": "1.0.3"
-      },
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/memoize-one": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz",
-      "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==",
-      "dev": true
-    },
-    "node_modules/memoizerific": {
-      "version": "1.11.3",
-      "resolved": "https://registry.npmjs.org/memoizerific/-/memoizerific-1.11.3.tgz",
-      "integrity": "sha1-fIekZGREwy11Q4VwkF8tvRsagFo=",
-      "dev": true,
-      "dependencies": {
-        "map-or-similar": "^1.5.0"
-      }
-    },
-    "node_modules/memory-fs": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
-      "dev": true,
-      "dependencies": {
-        "errno": "^0.1.3",
-        "readable-stream": "^2.0.1"
-      }
-    },
-    "node_modules/merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
-      "dev": true
-    },
-    "node_modules/merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
-    },
-    "node_modules/merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/microevent.ts": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/microevent.ts/-/microevent.ts-0.1.1.tgz",
-      "integrity": "sha512-jo1OfR4TaEwd5HOrt5+tAZ9mqT4jmpNAusXtyfNzqVm9uiSYFZlKM1wYL4oU7azZW/PxQW53wM0S6OR1JHNa2g==",
-      "dev": true
-    },
-    "node_modules/micromatch": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
-      "dev": true,
-      "dependencies": {
-        "braces": "^3.0.1",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/miller-rabin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-      "dev": true,
-      "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",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "dev": true,
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/mime-db": {
-      "version": "1.50.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz",
-      "integrity": "sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mime-types": {
-      "version": "2.1.33",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.33.tgz",
-      "integrity": "sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==",
-      "dev": true,
-      "dependencies": {
-        "mime-db": "1.50.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/min-document": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
-      "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=",
-      "dev": true,
-      "dependencies": {
-        "dom-walk": "^0.1.0"
-      }
-    },
-    "node_modules/minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-      "dev": true
-    },
-    "node_modules/minimalistic-crypto-utils": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
-      "dev": true
-    },
-    "node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-      "dev": true
-    },
-    "node_modules/minipass": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz",
-      "integrity": "sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minipass-collect": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
-      "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/minipass-flush": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
-      "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/minipass-pipeline": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
-      "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/mississippi": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-      "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-      "dev": 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",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
-      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
-      "dev": true,
-      "dependencies": {
-        "for-in": "^1.0.2",
-        "is-extendable": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "dev": true,
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/move-concurrently": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
-      "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
-      "dev": 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/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/move-concurrently/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/nanomatch": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
-      "dev": true,
-      "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"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/negotiator": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
-      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/neo-async": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-      "dev": true
-    },
-    "node_modules/nested-error-stacks": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-2.1.0.tgz",
-      "integrity": "sha512-AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug==",
-      "dev": true
-    },
-    "node_modules/no-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
-      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
-      "dev": true,
-      "dependencies": {
-        "lower-case": "^2.0.2",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/node-fetch": {
-      "version": "2.6.5",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.5.tgz",
-      "integrity": "sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ==",
-      "dev": true,
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      }
-    },
-    "node_modules/node-libs-browser": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
-      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
-      "dev": 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/punycode": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-      "dev": true
-    },
-    "node_modules/node-modules-regexp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
-      "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/node-releases": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz",
-      "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==",
-      "dev": true
-    },
-    "node_modules/normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "dev": true,
-      "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",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/normalize-range": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/npmlog": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-      "dev": true,
-      "dependencies": {
-        "are-we-there-yet": "~1.1.2",
-        "console-control-strings": "~1.1.0",
-        "gauge": "~2.7.3",
-        "set-blocking": "~2.0.0"
-      }
-    },
-    "node_modules/nth-check": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",
-      "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
-      "dev": true,
-      "dependencies": {
-        "boolbase": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/nth-check?sponsor=1"
-      }
-    },
-    "node_modules/num2fraction": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
-      "dev": true
-    },
-    "node_modules/number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
-      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
-      "dev": true,
-      "dependencies": {
-        "copy-descriptor": "^0.1.0",
-        "define-property": "^0.2.5",
-        "kind-of": "^3.0.3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
-    "node_modules/object-copy/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/is-descriptor/node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-inspect": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
-      "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object-visit": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
-      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-visit/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.assign": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "has-symbols": "^1.0.1",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
-      "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.fromentries": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.5.tgz",
-      "integrity": "sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.getownpropertydescriptors": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz",
-      "integrity": "sha512-VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.pick": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.pick/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.values": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
-      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-      "dev": true,
-      "dependencies": {
-        "ee-first": "1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/on-headers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/open": {
-      "version": "7.4.2",
-      "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
-      "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
-      "dev": true,
-      "dependencies": {
-        "is-docker": "^2.0.0",
-        "is-wsl": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/os-browserify": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
-      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
-      "dev": true
-    },
-    "node_modules/overlayscrollbars": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/overlayscrollbars/-/overlayscrollbars-1.13.1.tgz",
-      "integrity": "sha512-gIQfzgGgu1wy80EB4/6DaJGHMEGmizq27xHIESrzXq0Y/J0Ay1P3DWk6tuVmEPIZH15zaBlxeEJOqdJKmowHCQ==",
-      "dev": true
-    },
-    "node_modules/p-all": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-all/-/p-all-2.1.0.tgz",
-      "integrity": "sha512-HbZxz5FONzz/z2gJfk6bFca0BCiSRF8jU3yCsWOen/vR6lZjfPOu/e7L3uFzTW1i0H8TlC3vqQstEJPQL4/uLA==",
-      "dev": true,
-      "dependencies": {
-        "p-map": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/p-all/node_modules/p-map": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
-      "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/p-event": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/p-event/-/p-event-4.2.0.tgz",
-      "integrity": "sha512-KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ==",
-      "dev": true,
-      "dependencies": {
-        "p-timeout": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-filter": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-filter/-/p-filter-2.1.0.tgz",
-      "integrity": "sha512-ZBxxZ5sL2HghephhpGAQdoskxplTwr7ICaehZwLIlfL6acuVgZPm8yBNuRAFBGEqtD/hmUeq9eqLg2ys9Xr/yw==",
-      "dev": true,
-      "dependencies": {
-        "p-map": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/p-filter/node_modules/p-map": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
-      "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/p-finally": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "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,
-      "dependencies": {
-        "yocto-queue": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "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==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-map": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
-      "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==",
-      "dev": true,
-      "dependencies": {
-        "aggregate-error": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/p-timeout": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz",
-      "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==",
-      "dev": true,
-      "dependencies": {
-        "p-finally": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pako": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
-      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
-      "dev": true
-    },
-    "node_modules/parallel-transform": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
-      "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
-      "dev": true,
-      "dependencies": {
-        "cyclist": "^1.0.1",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.1.5"
-      }
-    },
-    "node_modules/param-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
-      "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
-      "dev": true,
-      "dependencies": {
-        "dot-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "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",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
-      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
-      "dev": 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",
-      "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz",
-      "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==",
-      "dev": true,
-      "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"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/parse-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-      "dev": true,
-      "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"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/parse5": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
-      "dev": true
-    },
-    "node_modules/parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/pascal-case": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
-      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
-      "dev": true,
-      "dependencies": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/pascalcase": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-browserify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
-      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
-      "dev": true
-    },
-    "node_modules/path-dirname": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
-      "dev": true
-    },
-    "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"
-      }
-    },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
-    },
-    "node_modules/path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
-      "dev": true
-    },
-    "node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pbkdf2": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
-      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
-      "dev": 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",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-      "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-      "dev": true
-    },
-    "node_modules/picomatch": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pirates": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
-      "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
-      "dev": true,
-      "dependencies": {
-        "node-modules-regexp": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/pkg-dir": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-5.0.0.tgz",
-      "integrity": "sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/pkg-up": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
-      "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-up/node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-up/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-up/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/pkg-up/node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-up/node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pnp-webpack-plugin": {
-      "version": "1.6.4",
-      "resolved": "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz",
-      "integrity": "sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg==",
-      "dev": true,
-      "dependencies": {
-        "ts-pnp": "^1.1.6"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/polished": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/polished/-/polished-4.1.3.tgz",
-      "integrity": "sha512-ocPAcVBUOryJEKe0z2KLd1l9EBa1r5mSwlKpExmrLzsnIzJo4axsoU9O2BjOTkDGDT4mZ0WFE5XKTlR3nLnZOA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.14.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/posix-character-classes": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss": {
-      "version": "7.0.39",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-      "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-      "dev": true,
-      "dependencies": {
-        "picocolors": "^0.2.1",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      }
-    },
-    "node_modules/postcss-flexbugs-fixes": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-4.2.1.tgz",
-      "integrity": "sha512-9SiofaZ9CWpQWxOwRh1b/r85KD5y7GgvsNt1056k6OYLvWUun0czCvogfJgylC22uJTwW1KzY3Gz65NZRlvoiQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.26"
-      }
-    },
-    "node_modules/postcss-loader": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-4.3.0.tgz",
-      "integrity": "sha512-M/dSoIiNDOo8Rk0mUqoj4kpGq91gcxCfb9PoyZVdZ76/AuhxylHDYZblNE8o+EQ9AMSASeMFEKxZf5aU6wlx1Q==",
-      "dev": true,
-      "dependencies": {
-        "cosmiconfig": "^7.0.0",
-        "klona": "^2.0.4",
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0",
-        "semver": "^7.3.4"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "postcss": "^7.0.0 || ^8.0.1",
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/postcss-loader/node_modules/loader-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-      "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      },
-      "engines": {
-        "node": ">=8.9.0"
-      }
-    },
-    "node_modules/postcss-loader/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/postcss-loader/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/postcss-modules-extract-imports": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz",
-      "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.5"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/postcss-modules-local-by-default": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz",
-      "integrity": "sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==",
-      "dev": true,
-      "dependencies": {
-        "icss-utils": "^4.1.1",
-        "postcss": "^7.0.32",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.1.0"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/postcss-modules-scope": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz",
-      "integrity": "sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.6",
-        "postcss-selector-parser": "^6.0.0"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/postcss-modules-values": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz",
-      "integrity": "sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==",
-      "dev": true,
-      "dependencies": {
-        "icss-utils": "^4.0.0",
-        "postcss": "^7.0.6"
-      }
-    },
-    "node_modules/postcss-selector-parser": {
-      "version": "6.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz",
-      "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==",
-      "dev": true,
-      "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss-value-parser": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
-      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
-      "dev": true
-    },
-    "node_modules/postcss/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/preact": {
-      "version": "10.5.15",
-      "resolved": "https://registry.npmjs.org/preact/-/preact-10.5.15.tgz",
-      "integrity": "sha512-5chK29n6QcJc3m1lVrKQSQ+V7K1Gb8HeQY6FViQ5AxCAEGu3DaHffWNDkC9+miZgsLvbvU9rxbV1qinGHMHzqA==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/preact"
-      }
-    },
-    "node_modules/preact-render-to-string": {
-      "version": "5.1.19",
-      "resolved": "https://registry.npmjs.org/preact-render-to-string/-/preact-render-to-string-5.1.19.tgz",
-      "integrity": "sha512-bj8sn/oytIKO6RtOGSS/1+5CrQyRSC99eLUnEVbqUa6MzJX5dYh7wu9bmT0d6lm/Vea21k9KhCQwvr2sYN3rrQ==",
-      "dev": true,
-      "dependencies": {
-        "pretty-format": "^3.8.0"
-      },
-      "peerDependencies": {
-        "preact": ">=10"
-      }
-    },
-    "node_modules/prettier": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz",
-      "integrity": "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==",
-      "dev": true,
-      "bin": {
-        "prettier": "bin-prettier.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/pretty-error": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.2.tgz",
-      "integrity": "sha512-EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw==",
-      "dev": true,
-      "dependencies": {
-        "lodash": "^4.17.20",
-        "renderkid": "^2.0.4"
-      }
-    },
-    "node_modules/pretty-format": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-3.8.0.tgz",
-      "integrity": "sha1-v77VbV6ad2ZF9LH/eqGjrE+jw4U=",
-      "dev": true
-    },
-    "node_modules/pretty-hrtime": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
-      "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/prismjs": {
-      "version": "1.25.0",
-      "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.25.0.tgz",
-      "integrity": "sha512-WCjJHl1KEWbnkQom1+SzftbtXMKQoezOCYs5rECqMN+jP+apI7ftoflyqigqzopSO3hMhTEb0mFClA8lkolgEg==",
-      "dev": true
-    },
-    "node_modules/process": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6.0"
-      }
-    },
-    "node_modules/process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true
-    },
-    "node_modules/promise-inflight": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
-      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
-      "dev": true
-    },
-    "node_modules/promise.allsettled": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/promise.allsettled/-/promise.allsettled-1.0.5.tgz",
-      "integrity": "sha512-tVDqeZPoBC0SlzJHzWGZ2NKAguVq2oiYj7gbggbiTvH2itHohijTp7njOUA0aQ/nl+0lr/r6egmhoYu63UZ/pQ==",
-      "dev": true,
-      "dependencies": {
-        "array.prototype.map": "^1.0.4",
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1",
-        "get-intrinsic": "^1.1.1",
-        "iterate-value": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/promise.prototype.finally": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.3.tgz",
-      "integrity": "sha512-EXRF3fC9/0gz4qkt/f5EP5iW4kj9oFpBICNpCNOb/52+8nlHIX07FPLbi/q4qYBQ1xZqivMzTpNQSnArVASolQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/prompts": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
-      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
-      "dev": true,
-      "dependencies": {
-        "kleur": "^3.0.3",
-        "sisteransi": "^1.0.5"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/prop-types": {
-      "version": "15.7.2",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
-      "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
-      "dev": true,
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.8.1"
-      }
-    },
-    "node_modules/prop-types/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/property-information": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/property-information/-/property-information-5.6.0.tgz",
-      "integrity": "sha512-YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA==",
-      "dev": true,
-      "dependencies": {
-        "xtend": "^4.0.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/proxy-addr": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
-      "dev": true,
-      "dependencies": {
-        "forwarded": "0.2.0",
-        "ipaddr.js": "1.9.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/prr": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
-      "dev": true
-    },
-    "node_modules/public-encrypt": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
-      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
-      "dev": 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",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "node_modules/pumpify": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
-      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
-      "dev": true,
-      "dependencies": {
-        "duplexify": "^3.6.0",
-        "inherits": "^2.0.3",
-        "pump": "^2.0.0"
-      }
-    },
-    "node_modules/pumpify/node_modules/pump": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-      "dev": true,
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "node_modules/punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/qs": {
-      "version": "6.10.1",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz",
-      "integrity": "sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==",
-      "dev": true,
-      "dependencies": {
-        "side-channel": "^1.0.4"
-      },
-      "engines": {
-        "node": ">=0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/querystring": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
-      "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
-    "node_modules/querystring-es3": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
-    "node_modules/queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "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"
-        }
-      ]
-    },
-    "node_modules/ramda": {
-      "version": "0.21.0",
-      "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.21.0.tgz",
-      "integrity": "sha1-oAGr7bP/YQd9T/HVd9RN536NCjU=",
-      "dev": true
-    },
-    "node_modules/randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/randomfill": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-      "dev": true,
-      "dependencies": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/raw-body": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
-      "dev": true,
-      "dependencies": {
-        "bytes": "3.1.0",
-        "http-errors": "1.7.2",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/raw-body/node_modules/bytes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/raw-loader": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.2.tgz",
-      "integrity": "sha512-ZnScIV3ag9A4wPX/ZayxL/jZH+euYb6FcUinPcgiQW0+UBtEv0O6Q3lGd3cqJ+GHH+rksEv3Pj99oxJ3u3VIKA==",
-      "dev": true,
-      "dependencies": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/raw-loader/node_modules/loader-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-      "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      },
-      "engines": {
-        "node": ">=8.9.0"
-      }
-    },
-    "node_modules/raw-loader/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/react": {
-      "version": "16.14.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-16.14.0.tgz",
-      "integrity": "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==",
-      "dev": true,
-      "dependencies": {
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1",
-        "prop-types": "^15.6.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/react-colorful": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/react-colorful/-/react-colorful-5.5.0.tgz",
-      "integrity": "sha512-BuzrlrM0ylg7coPkXOrRqlf2BgHLw5L44sybbr9Lg4xy7w9e5N7fGYbojOO0s8J0nvrM3PERN2rVFkvSa24lnQ==",
-      "dev": true,
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
-      }
-    },
-    "node_modules/react-dev-utils": {
-      "version": "11.0.4",
-      "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.4.tgz",
-      "integrity": "sha512-dx0LvIGHcOPtKbeiSUM4jqpBl3TcY7CDjZdfOIcKeznE7BWr9dg0iPG90G5yfVQ+p/rGNMXdbfStvzQZEVEi4A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "7.10.4",
-        "address": "1.1.2",
-        "browserslist": "4.14.2",
-        "chalk": "2.4.2",
-        "cross-spawn": "7.0.3",
-        "detect-port-alt": "1.1.6",
-        "escape-string-regexp": "2.0.0",
-        "filesize": "6.1.0",
-        "find-up": "4.1.0",
-        "fork-ts-checker-webpack-plugin": "4.1.6",
-        "global-modules": "2.0.0",
-        "globby": "11.0.1",
-        "gzip-size": "5.1.1",
-        "immer": "8.0.1",
-        "is-root": "2.1.0",
-        "loader-utils": "2.0.0",
-        "open": "^7.0.2",
-        "pkg-up": "3.1.0",
-        "prompts": "2.4.0",
-        "react-error-overlay": "^6.0.9",
-        "recursive-readdir": "2.2.2",
-        "shell-quote": "1.7.2",
-        "strip-ansi": "6.0.0",
-        "text-table": "0.2.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/@babel/code-frame": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-      "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.10.4"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "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"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/browserslist": {
-      "version": "4.14.2",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.2.tgz",
-      "integrity": "sha512-HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw==",
-      "dev": true,
-      "dependencies": {
-        "caniuse-lite": "^1.0.30001125",
-        "electron-to-chromium": "^1.3.564",
-        "escalade": "^3.0.2",
-        "node-releases": "^1.1.61"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      },
-      "funding": {
-        "type": "tidelift",
-        "url": "https://tidelift.com/funding/github/npm/browserslist"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/escape-string-regexp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/fork-ts-checker-webpack-plugin": {
-      "version": "4.1.6",
-      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-4.1.6.tgz",
-      "integrity": "sha512-DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.5.5",
-        "chalk": "^2.4.1",
-        "micromatch": "^3.1.10",
-        "minimatch": "^3.0.4",
-        "semver": "^5.6.0",
-        "tapable": "^1.0.0",
-        "worker-rpc": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=6.11.5",
-        "yarn": ">=1.0.0"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/globby": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz",
-      "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==",
-      "dev": true,
-      "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"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
-    "node_modules/react-dev-utils/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/loader-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-      "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      },
-      "engines": {
-        "node": ">=8.9.0"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": 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"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/node-releases": {
-      "version": "1.1.77",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.77.tgz",
-      "integrity": "sha512-rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ==",
-      "dev": true
-    },
-    "node_modules/react-dev-utils/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/prompts": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.0.tgz",
-      "integrity": "sha512-awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ==",
-      "dev": true,
-      "dependencies": {
-        "kleur": "^3.0.3",
-        "sisteransi": "^1.0.5"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/react-dev-utils/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/react-dev-utils/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/react-dom": {
-      "version": "16.14.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz",
-      "integrity": "sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==",
-      "dev": true,
-      "dependencies": {
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1",
-        "prop-types": "^15.6.2",
-        "scheduler": "^0.19.1"
-      },
-      "peerDependencies": {
-        "react": "^16.14.0"
-      }
-    },
-    "node_modules/react-draggable": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/react-draggable/-/react-draggable-4.4.4.tgz",
-      "integrity": "sha512-6e0WdcNLwpBx/YIDpoyd2Xb04PB0elrDrulKUgdrIlwuYvxh5Ok9M+F8cljm8kPXXs43PmMzek9RrB1b7mLMqA==",
-      "dev": true,
-      "dependencies": {
-        "clsx": "^1.1.1",
-        "prop-types": "^15.6.0"
-      },
-      "peerDependencies": {
-        "react": ">= 16.3.0",
-        "react-dom": ">= 16.3.0"
-      }
-    },
-    "node_modules/react-error-overlay": {
-      "version": "6.0.9",
-      "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.9.tgz",
-      "integrity": "sha512-nQTTcUu+ATDbrSD1BZHr5kgSD4oF8OFjxun8uAaL8RwPBacGBNPf/yAuVVdx17N8XNzRDMrZ9XcKZHCjPW+9ew==",
-      "dev": true
-    },
-    "node_modules/react-fast-compare": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.0.tgz",
-      "integrity": "sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA==",
-      "dev": true
-    },
-    "node_modules/react-helmet-async": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/react-helmet-async/-/react-helmet-async-1.1.2.tgz",
-      "integrity": "sha512-LTTzDDkyIleT/JJ6T/uqx7Y8qi1EuPPSiJawQY/nHHz0h7SPDT6HxP1YDDQx/fzcVxCqpWEEMS3QdrSrNkJYhg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.12.5",
-        "invariant": "^2.2.4",
-        "prop-types": "^15.7.2",
-        "react-fast-compare": "^3.2.0",
-        "shallowequal": "^1.1.0"
-      },
-      "peerDependencies": {
-        "react": "^16.6.0 || ^17.0.0",
-        "react-dom": "^16.6.0 || ^17.0.0"
-      }
-    },
-    "node_modules/react-input-autosize": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-3.0.0.tgz",
-      "integrity": "sha512-nL9uS7jEs/zu8sqwFE5MAPx6pPkNAriACQ2rGLlqmKr2sPGtN7TXTyDdQt4lbNXVx7Uzadb40x8qotIuru6Rhg==",
-      "dev": true,
-      "dependencies": {
-        "prop-types": "^15.5.8"
-      },
-      "peerDependencies": {
-        "react": "^16.3.0 || ^17.0.0"
-      }
-    },
-    "node_modules/react-is": {
-      "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
-      "dev": true
-    },
-    "node_modules/react-lifecycles-compat": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
-      "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==",
-      "dev": true
-    },
-    "node_modules/react-popper": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.2.5.tgz",
-      "integrity": "sha512-kxGkS80eQGtLl18+uig1UIf9MKixFSyPxglsgLBxlYnyDf65BiY9B3nZSc6C9XUNDgStROB0fMQlTEz1KxGddw==",
-      "dev": true,
-      "dependencies": {
-        "react-fast-compare": "^3.0.1",
-        "warning": "^4.0.2"
-      },
-      "peerDependencies": {
-        "@popperjs/core": "^2.0.0",
-        "react": "^16.8.0 || ^17"
-      }
-    },
-    "node_modules/react-popper-tooltip": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/react-popper-tooltip/-/react-popper-tooltip-3.1.1.tgz",
-      "integrity": "sha512-EnERAnnKRptQBJyaee5GJScWNUKQPDD2ywvzZyUjst/wj5U64C8/CnSYLNEmP2hG0IJ3ZhtDxE8oDN+KOyavXQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.12.5",
-        "@popperjs/core": "^2.5.4",
-        "react-popper": "^2.2.4"
-      },
-      "peerDependencies": {
-        "react": "^16.6.0 || ^17.0.0",
-        "react-dom": "^16.6.0 || ^17.0.0"
-      }
-    },
-    "node_modules/react-select": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/react-select/-/react-select-3.2.0.tgz",
-      "integrity": "sha512-B/q3TnCZXEKItO0fFN/I0tWOX3WJvi/X2wtdffmwSQVRwg5BpValScTO1vdic9AxlUgmeSzib2hAZAwIUQUZGQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.4.4",
-        "@emotion/cache": "^10.0.9",
-        "@emotion/core": "^10.0.9",
-        "@emotion/css": "^10.0.9",
-        "memoize-one": "^5.0.0",
-        "prop-types": "^15.6.0",
-        "react-input-autosize": "^3.0.0",
-        "react-transition-group": "^4.3.0"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0"
-      }
-    },
-    "node_modules/react-sizeme": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/react-sizeme/-/react-sizeme-3.0.2.tgz",
-      "integrity": "sha512-xOIAOqqSSmKlKFJLO3inBQBdymzDuXx4iuwkNcJmC96jeiOg5ojByvL+g3MW9LPEsojLbC6pf68zOfobK8IPlw==",
-      "dev": true,
-      "dependencies": {
-        "element-resize-detector": "^1.2.2",
-        "invariant": "^2.2.4",
-        "shallowequal": "^1.1.0",
-        "throttle-debounce": "^3.0.1"
-      }
-    },
-    "node_modules/react-syntax-highlighter": {
-      "version": "13.5.3",
-      "resolved": "https://registry.npmjs.org/react-syntax-highlighter/-/react-syntax-highlighter-13.5.3.tgz",
-      "integrity": "sha512-crPaF+QGPeHNIblxxCdf2Lg936NAHKhNhuMzRL3F9ct6aYXL3NcZtCL0Rms9+qVo6Y1EQLdXGypBNSbPL/r+qg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.3.1",
-        "highlight.js": "^10.1.1",
-        "lowlight": "^1.14.0",
-        "prismjs": "^1.21.0",
-        "refractor": "^3.1.0"
-      },
-      "peerDependencies": {
-        "react": ">= 0.14.0"
-      }
-    },
-    "node_modules/react-textarea-autosize": {
-      "version": "8.3.3",
-      "resolved": "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-8.3.3.tgz",
-      "integrity": "sha512-2XlHXK2TDxS6vbQaoPbMOfQ8GK7+irc2fVK6QFIcC8GOnH3zI/v481n+j1L0WaPVvKxwesnY93fEfH++sus2rQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.10.2",
-        "use-composed-ref": "^1.0.0",
-        "use-latest": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0"
-      }
-    },
-    "node_modules/react-transition-group": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.2.tgz",
-      "integrity": "sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.5.5",
-        "dom-helpers": "^5.0.1",
-        "loose-envify": "^1.4.0",
-        "prop-types": "^15.6.2"
-      },
-      "peerDependencies": {
-        "react": ">=16.6.0",
-        "react-dom": ">=16.6.0"
-      }
-    },
-    "node_modules/read-pkg": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
-      "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
-      "dev": true,
-      "dependencies": {
-        "@types/normalize-package-data": "^2.4.0",
-        "normalize-package-data": "^2.5.0",
-        "parse-json": "^5.0.0",
-        "type-fest": "^0.6.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
-      "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^4.1.0",
-        "read-pkg": "^5.2.0",
-        "type-fest": "^0.8.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg/node_modules/type-fest": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-      "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "dev": 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/readable-stream/node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-      "dev": true
-    },
-    "node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dev": true,
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/recursive-readdir": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz",
-      "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==",
-      "dev": true,
-      "dependencies": {
-        "minimatch": "3.0.4"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/refractor": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/refractor/-/refractor-3.5.0.tgz",
-      "integrity": "sha512-QwPJd3ferTZ4cSPPjdP5bsYHMytwWYnAN5EEnLtGvkqp/FCCnGsBgxrm9EuIDnjUC3Uc/kETtvVi7fSIVC74Dg==",
-      "dev": true,
-      "dependencies": {
-        "hastscript": "^6.0.0",
-        "parse-entities": "^2.0.0",
-        "prismjs": "~1.25.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/regenerate": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
-      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
-      "dev": true
-    },
-    "node_modules/regenerate-unicode-properties": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz",
-      "integrity": "sha512-3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA==",
-      "dev": true,
-      "dependencies": {
-        "regenerate": "^1.4.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/regenerator-runtime": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
-      "dev": true
-    },
-    "node_modules/regenerator-transform": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz",
-      "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.8.4"
-      }
-    },
-    "node_modules/regex-not": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^3.0.2",
-        "safe-regex": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/regexp.prototype.flags": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz",
-      "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/regexpu-core": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.8.0.tgz",
-      "integrity": "sha512-1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg==",
-      "dev": true,
-      "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"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/regjsgen": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz",
-      "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==",
-      "dev": true
-    },
-    "node_modules/regjsparser": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.7.0.tgz",
-      "integrity": "sha512-A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ==",
-      "dev": true,
-      "dependencies": {
-        "jsesc": "~0.5.0"
-      },
-      "bin": {
-        "regjsparser": "bin/parser"
-      }
-    },
-    "node_modules/regjsparser/node_modules/jsesc": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-      "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
-      "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
-      }
-    },
-    "node_modules/relateurl": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
-      "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/remark-footnotes": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/remark-footnotes/-/remark-footnotes-2.0.0.tgz",
-      "integrity": "sha512-3Clt8ZMH75Ayjp9q4CorNeyjwIxHFcTkaektplKGl2A1jNGEUey8cKL0ZC5vJwfcD5GFGsNLImLG/NGzWIzoMQ==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "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==",
-      "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/@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/remark-mdx/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/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-squeeze-paragraphs": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/remark-squeeze-paragraphs/-/remark-squeeze-paragraphs-4.0.0.tgz",
-      "integrity": "sha512-8qRqmL9F4nuLPIgl92XUuxI3pFxize+F1H0e/W3llTk0UsjJaj01+RrirkMw7P21RKe4X6goQhYRSvNWX+70Rw==",
-      "dev": true,
-      "dependencies": {
-        "mdast-squeeze-paragraphs": "^4.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/remove-trailing-separator": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/renderkid": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.7.tgz",
-      "integrity": "sha512-oCcFyxaMrKsKcTY59qnCAtmDVSLfPbrv6A3tVbPdFMMrv5jaK10V6m40cKsoPNhAqN6rmHW9sswW4o3ruSrwUQ==",
-      "dev": true,
-      "dependencies": {
-        "css-select": "^4.1.3",
-        "dom-converter": "^0.2.0",
-        "htmlparser2": "^6.1.0",
-        "lodash": "^4.17.21",
-        "strip-ansi": "^3.0.1"
-      }
-    },
-    "node_modules/repeat-element": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
-      "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/repeat-string": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/resolve": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
-      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
-      "dev": true,
-      "dependencies": {
-        "is-core-module": "^2.2.0",
-        "path-parse": "^1.0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/resolve-url": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
-      "deprecated": "https://github.com/lydell/resolve-url#deprecated",
-      "dev": true
-    },
-    "node_modules/ret": {
-      "version": "0.1.15",
-      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12"
-      }
-    },
-    "node_modules/reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "dev": true,
-      "engines": {
-        "iojs": ">=1.0.0",
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/ripemd160": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-      "dev": true,
-      "dependencies": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
-      }
-    },
-    "node_modules/run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "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"
-        }
-      ],
-      "dependencies": {
-        "queue-microtask": "^1.2.2"
-      }
-    },
-    "node_modules/run-queue": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
-      "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
-      "dev": true,
-      "dependencies": {
-        "aproba": "^1.1.1"
-      }
-    },
-    "node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
-    },
-    "node_modules/safe-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
-      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
-      "dev": true,
-      "dependencies": {
-        "ret": "~0.1.10"
-      }
-    },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
-    },
-    "node_modules/scheduler": {
-      "version": "0.19.1",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz",
-      "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==",
-      "dev": true,
-      "dependencies": {
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1"
-      }
-    },
-    "node_modules/schema-utils": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
-      "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.5",
-        "ajv": "^6.12.4",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 8.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "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/send": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
-      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
-      "dev": true,
-      "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"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/send/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/send/node_modules/debug/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/send/node_modules/ms": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-      "dev": true
-    },
-    "node_modules/serialize-javascript": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
-      "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
-      "dev": true,
-      "dependencies": {
-        "randombytes": "^2.1.0"
-      }
-    },
-    "node_modules/serve-favicon": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.5.0.tgz",
-      "integrity": "sha1-k10kDN/g9YBTB/3+ln2IlCosvPA=",
-      "dev": true,
-      "dependencies": {
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "ms": "2.1.1",
-        "parseurl": "~1.3.2",
-        "safe-buffer": "5.1.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/serve-favicon/node_modules/ms": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-      "dev": true
-    },
-    "node_modules/serve-favicon/node_modules/safe-buffer": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-      "dev": true
-    },
-    "node_modules/serve-static": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
-      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
-      "dev": true,
-      "dependencies": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.3",
-        "send": "0.17.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-      "dev": true
-    },
-    "node_modules/set-value": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
-      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-extendable": "^0.1.1",
-        "is-plain-object": "^2.0.3",
-        "split-string": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/set-value/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/set-value/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/set-value/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/set-value/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/setimmediate": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
-      "dev": true
-    },
-    "node_modules/setprototypeof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
-      "dev": true
-    },
-    "node_modules/sha.js": {
-      "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      },
-      "bin": {
-        "sha.js": "bin.js"
-      }
-    },
-    "node_modules/shallow-clone": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
-      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shallowequal": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz",
-      "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==",
-      "dev": true
-    },
-    "node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shell-quote": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz",
-      "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==",
-      "dev": true
-    },
-    "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": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/signal-exit": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz",
-      "integrity": "sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ==",
-      "dev": true
-    },
-    "node_modules/sisteransi": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
-      "dev": true
-    },
-    "node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/snapdragon": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-      "dev": true,
-      "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"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-node": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
-      "dev": true,
-      "dependencies": {
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.0",
-        "snapdragon-util": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-node/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-node/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-util": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-util/node_modules/is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
-    "node_modules/snapdragon-util/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
-    "node_modules/snapdragon/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/source-list-map": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
-      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
-      "dev": true
-    },
-    "node_modules/source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-resolve": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
-      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
-      "dev": true,
-      "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"
-      }
-    },
-    "node_modules/source-map-support": {
-      "version": "0.5.20",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz",
-      "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==",
-      "dev": true,
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
-    "node_modules/source-map-support/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-url": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
-      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
-      "dev": true
-    },
-    "node_modules/space-separated-tokens": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz",
-      "integrity": "sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/spdx-correct": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
-      "dev": true,
-      "dependencies": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-exceptions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
-      "dev": true
-    },
-    "node_modules/spdx-expression-parse": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
-      "dev": true,
-      "dependencies": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-license-ids": {
-      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz",
-      "integrity": "sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA==",
-      "dev": true
-    },
-    "node_modules/split-string": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ssri": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
-      "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^3.1.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/stable": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
-      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
-      "dev": true
-    },
-    "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==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/static-extend": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
-      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
-      "dev": true,
-      "dependencies": {
-        "define-property": "^0.2.5",
-        "object-copy": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
-    "node_modules/static-extend/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/store2": {
-      "version": "2.12.0",
-      "resolved": "https://registry.npmjs.org/store2/-/store2-2.12.0.tgz",
-      "integrity": "sha512-7t+/wpKLanLzSnQPX8WAcuLCCeuSHoWdQuh9SB3xD0kNOM38DNf+0Oa+wmvxmYueRzkmh6IcdKFtvTa+ecgPDw==",
-      "dev": true
-    },
-    "node_modules/stream-browserify": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
-      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "~2.0.1",
-        "readable-stream": "^2.0.2"
-      }
-    },
-    "node_modules/stream-each": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
-      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
-      "dev": true,
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "stream-shift": "^1.0.0"
-      }
-    },
-    "node_modules/stream-http": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
-      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
-      "dev": true,
-      "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/stream-shift": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
-      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
-      "dev": true
-    },
-    "node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "node_modules/string-hash": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/string-hash/-/string-hash-1.1.3.tgz",
-      "integrity": "sha1-6Kr8CsGFW0Zmkp7X3RJ1311sgRs=",
-      "dev": true
-    },
-    "node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/string-width/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/string-width/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/string.prototype.matchall": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.6.tgz",
-      "integrity": "sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg==",
-      "dev": true,
-      "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"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.padend": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.3.tgz",
-      "integrity": "sha512-jNIIeokznm8SD/TZISQsZKYu7RJyheFNt84DUPrh482GC8RVp2MKqm2O5oBRdGxbDQoXrhhWtPIWQOiy20svUg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.padstart": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/string.prototype.padstart/-/string.prototype.padstart-3.1.3.tgz",
-      "integrity": "sha512-NZydyOMtYxpTjGqp0VN5PYUF/tsU15yDMZnUdj16qRUIUiMJkHHSDElYyQFrMu+/WloTpA7MQSiADhBicDfaoA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimend": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
-      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimstart": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
-      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/style-loader": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.3.0.tgz",
-      "integrity": "sha512-V7TCORko8rs9rIqkSrlMfkqA63DfoGBBJmK1kKGCcSi+BWb4cqz0SRsnp4l6rU5iwOEd0/2ePv68SV22VXon4Q==",
-      "dev": true,
-      "dependencies": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^2.7.0"
-      },
-      "engines": {
-        "node": ">= 8.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/style-loader/node_modules/loader-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-      "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      },
-      "engines": {
-        "node": ">=8.9.0"
-      }
-    },
-    "node_modules/style-to-object": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-0.3.0.tgz",
-      "integrity": "sha512-CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA==",
-      "dev": true,
-      "dependencies": {
-        "inline-style-parser": "0.1.1"
-      }
-    },
-    "node_modules/styled-jsx": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/styled-jsx/-/styled-jsx-4.0.1.tgz",
-      "integrity": "sha512-Gcb49/dRB1k8B4hdK8vhW27Rlb2zujCk1fISrizCcToIs+55B4vmUM0N9Gi4nnVfFZWe55jRdWpAqH1ldAKWvQ==",
-      "dev": 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.x.x"
-      },
-      "peerDependenciesMeta": {
-        "@babel/core": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/styled-jsx/node_modules/@babel/types": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz",
-      "integrity": "sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==",
-      "dev": 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",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
-      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.1.1"
-      }
-    },
-    "node_modules/styled-jsx/node_modules/emojis-list": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/styled-jsx/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/styled-jsx/node_modules/loader-utils": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
-      "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
-      "dev": 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",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/stylis": {
-      "version": "3.5.4",
-      "resolved": "https://registry.npmjs.org/stylis/-/stylis-3.5.4.tgz",
-      "integrity": "sha512-8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q==",
-      "dev": true
-    },
-    "node_modules/stylis-rule-sheet": {
-      "version": "0.0.10",
-      "resolved": "https://registry.npmjs.org/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz",
-      "integrity": "sha512-nTbZoaqoBnmK+ptANthb10ZRZOGC+EmTLLUxeYIuHNkEKcmKgXX1XWKkUBT2Ac4es3NybooPe0SmvKdhKJZAuw==",
-      "dev": true,
-      "peerDependencies": {
-        "stylis": "^3.5.0"
-      }
-    },
-    "node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/symbol.prototype.description": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/symbol.prototype.description/-/symbol.prototype.description-1.0.5.tgz",
-      "integrity": "sha512-x738iXRYsrAt9WBhRCVG5BtIC3B7CUkFwbHW2zOvGtwM33s7JjrCDyq8V0zgMYVb5ymsL8+qkzzpANH63CPQaQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-symbol-description": "^1.0.0",
-        "has-symbols": "^1.0.2",
-        "object.getownpropertydescriptors": "^2.1.2"
-      },
-      "engines": {
-        "node": ">= 0.11.15"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/tapable": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
-      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/tar": {
-      "version": "6.1.11",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
-      "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
-      "dev": true,
-      "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"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/telejson": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/telejson/-/telejson-5.3.3.tgz",
-      "integrity": "sha512-PjqkJZpzEggA9TBpVtJi1LVptP7tYtXB6rEubwlHap76AMjzvOdKX41CxyaW7ahhzDU1aftXnMCx5kAPDZTQBA==",
-      "dev": true,
-      "dependencies": {
-        "@types/is-function": "^1.0.0",
-        "global": "^4.4.0",
-        "is-function": "^1.0.2",
-        "is-regex": "^1.1.2",
-        "is-symbol": "^1.0.3",
-        "isobject": "^4.0.0",
-        "lodash": "^4.17.21",
-        "memoizerific": "^1.11.3"
-      }
-    },
-    "node_modules/term-size": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz",
-      "integrity": "sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/terser": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
-      "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
-      "dev": true,
-      "dependencies": {
-        "commander": "^2.20.0",
-        "source-map": "~0.6.1",
-        "source-map-support": "~0.5.12"
-      },
-      "bin": {
-        "terser": "bin/terser"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/terser-webpack-plugin": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz",
-      "integrity": "sha512-jTgXh40RnvOrLQNgIkwEKnQ8rmHjHK4u+6UBEi+W+FPmvb+uo+chJXntKe7/3lW5mNysgSWD60KyesnhW8D6MQ==",
-      "dev": true,
-      "dependencies": {
-        "cacache": "^15.0.5",
-        "find-cache-dir": "^3.3.1",
-        "jest-worker": "^26.5.0",
-        "p-limit": "^3.0.2",
-        "schema-utils": "^3.0.0",
-        "serialize-javascript": "^5.0.1",
-        "source-map": "^0.6.1",
-        "terser": "^5.3.4",
-        "webpack-sources": "^1.4.3"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
-    },
-    "node_modules/terser-webpack-plugin/node_modules/find-cache-dir": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
-      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
-      "dev": 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/terser-webpack-plugin/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "dev": true,
-      "dependencies": {
-        "semver": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/p-locate/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/terser": {
-      "version": "5.9.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz",
-      "integrity": "sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==",
-      "dev": true,
-      "dependencies": {
-        "commander": "^2.20.0",
-        "source-map": "~0.7.2",
-        "source-map-support": "~0.5.20"
-      },
-      "bin": {
-        "terser": "bin/terser"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/terser/node_modules/source-map": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/terser/node_modules/commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
-    },
-    "node_modules/terser/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "dev": true
-    },
-    "node_modules/throttle-debounce": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-3.0.1.tgz",
-      "integrity": "sha512-dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
-      }
-    },
-    "node_modules/timers-browserify": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
-      "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
-      "dev": true,
-      "dependencies": {
-        "setimmediate": "^1.0.4"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
-    "node_modules/to-arraybuffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
-      "dev": true
-    },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/to-object-path": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-object-path/node_modules/is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
-    "node_modules/to-object-path/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-regex": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-      "dev": true,
-      "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",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/toggle-selection": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/toggle-selection/-/toggle-selection-1.0.6.tgz",
-      "integrity": "sha1-bkWxJj8gF/oKzH2J14sVuL932jI=",
-      "dev": true
-    },
-    "node_modules/toidentifier": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=",
-      "dev": true
-    },
-    "node_modules/trim": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz",
-      "integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0=",
-      "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",
-      "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz",
-      "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/ts-dedent": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgz",
-      "integrity": "sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.10"
-      }
-    },
-    "node_modules/ts-essentials": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/ts-essentials/-/ts-essentials-2.0.12.tgz",
-      "integrity": "sha512-3IVX4nI6B5cc31/GFFE+i8ey/N2eA0CZDbo6n0yrz0zDX8ZJ8djmU1p+XRz7G3is0F3bB3pu2pAroFdAWQKU3w==",
-      "dev": true
-    },
-    "node_modules/ts-pnp": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz",
-      "integrity": "sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/tslib": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-      "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
-      "dev": true
-    },
-    "node_modules/tty-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
-      "dev": true
-    },
-    "node_modules/type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "dev": true,
-      "dependencies": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-      "dev": true
-    },
-    "node_modules/unbox-primitive": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
-      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
-      "dev": true,
-      "dependencies": {
-        "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/unfetch": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/unfetch/-/unfetch-4.2.0.tgz",
-      "integrity": "sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA==",
-      "dev": true
-    },
-    "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/unicode-canonical-property-names-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unicode-match-property-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
-      "dev": true,
-      "dependencies": {
-        "unicode-canonical-property-names-ecmascript": "^2.0.0",
-        "unicode-property-aliases-ecmascript": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unicode-match-property-value-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unicode-property-aliases-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unified": {
-      "version": "9.2.0",
-      "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.0.tgz",
-      "integrity": "sha512-vx2Z0vY+a3YoTj8+pttM3tiJHCwY5UFbYdiWrwBEbHmK8pvsPj2rtAX2BFfgXen8T39CJWblWRDT4L5WGXtDdg==",
-      "dev": true,
-      "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"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/union-value": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
-      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
-      "dev": true,
-      "dependencies": {
-        "arr-union": "^3.1.0",
-        "get-value": "^2.0.6",
-        "is-extendable": "^0.1.1",
-        "set-value": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/union-value/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unique-filename": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
-      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
-      "dev": true,
-      "dependencies": {
-        "unique-slug": "^2.0.0"
-      }
-    },
-    "node_modules/unique-slug": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
-      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
-      "dev": true,
-      "dependencies": {
-        "imurmurhash": "^0.1.4"
-      }
-    },
-    "node_modules/unist-builder": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/unist-builder/-/unist-builder-2.0.3.tgz",
-      "integrity": "sha512-f98yt5pnlMWlzP539tPc4grGMsFaQQlP/vM396b00jngsiINumNmsY8rkXjfoi1c6QaM8nQ3vaGDuoKWbe/1Uw==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/unist-util-generated": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-1.1.6.tgz",
-      "integrity": "sha512-cln2Mm1/CZzN5ttGK7vkoGw+RZ8VcUH6BtGbq98DDtRGquAAOXig1mrBQYelOwMXYS8rK+vZDyyojSjp7JX+Lg==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/unist-util-is": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz",
-      "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/unist-util-position": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.1.0.tgz",
-      "integrity": "sha512-w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/unist-util-remove": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/unist-util-remove/-/unist-util-remove-2.1.0.tgz",
-      "integrity": "sha512-J8NYPyBm4baYLdCbjmf1bhPu45Cr1MWTm77qd9istEkzWpnN6O9tMsEbB2JhNnBCqGENRqEWomQ+He6au0B27Q==",
-      "dev": true,
-      "dependencies": {
-        "unist-util-is": "^4.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "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==",
-      "dev": true,
-      "dependencies": {
-        "unist-util-visit": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/unist-util-stringify-position": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz",
-      "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.2"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "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/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,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "unist-util-is": "^4.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/universalify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "node_modules/unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/unquote": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
-      "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
-      "dev": true
-    },
-    "node_modules/unset-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
-      "dev": true,
-      "dependencies": {
-        "has-value": "^0.3.1",
-        "isobject": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-value": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-      "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
-      "dev": true,
-      "dependencies": {
-        "get-value": "^2.0.3",
-        "has-values": "^0.1.4",
-        "isobject": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-      "dev": true,
-      "dependencies": {
-        "isarray": "1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-values": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-      "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-      "dev": true
-    },
-    "node_modules/unset-value/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/upath": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=4",
-        "yarn": "*"
-      }
-    },
-    "node_modules/uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "node_modules/urix": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-      "deprecated": "Please see https://github.com/lydell/urix#deprecated",
-      "dev": true
-    },
-    "node_modules/url": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-      "dev": true,
-      "dependencies": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
-      }
-    },
-    "node_modules/url-loader": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz",
-      "integrity": "sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==",
-      "dev": true,
-      "dependencies": {
-        "loader-utils": "^2.0.0",
-        "mime-types": "^2.1.27",
-        "schema-utils": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "file-loader": "*",
-        "webpack": "^4.0.0 || ^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "file-loader": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/url-loader/node_modules/loader-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-      "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      },
-      "engines": {
-        "node": ">=8.9.0"
-      }
-    },
-    "node_modules/url-loader/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/url/node_modules/punycode": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-      "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
-      "dev": true
-    },
-    "node_modules/use": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/use-composed-ref": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/use-composed-ref/-/use-composed-ref-1.1.0.tgz",
-      "integrity": "sha512-my1lNHGWsSDAhhVAT4MKs6IjBUtG6ZG11uUqexPH9PptiIZDQOzaF4f5tEbJ2+7qvNbtXNBbU3SfmN+fXlWDhg==",
-      "dev": true,
-      "dependencies": {
-        "ts-essentials": "^2.0.3"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0"
-      }
-    },
-    "node_modules/use-isomorphic-layout-effect": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.1.tgz",
-      "integrity": "sha512-L7Evj8FGcwo/wpbv/qvSfrkHFtOpCzvM5yl2KVyDJoylVuSvzphiiasmjgQPttIGBAy2WKiBNR98q8w7PiNgKQ==",
-      "dev": true,
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/use-latest": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/use-latest/-/use-latest-1.2.0.tgz",
-      "integrity": "sha512-d2TEuG6nSLKQLAfW3By8mKr8HurOlTkul0sOpxbClIv4SQ4iOd7BYr7VIzdbktUCnv7dua/60xzd8igMU6jmyw==",
-      "dev": true,
-      "dependencies": {
-        "use-isomorphic-layout-effect": "^1.0.0"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/util": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
-      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "2.0.3"
-      }
-    },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
-    },
-    "node_modules/util.promisify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
-      "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.2",
-        "object.getownpropertydescriptors": "^2.0.3"
-      }
-    },
-    "node_modules/util/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "dev": true
-    },
-    "node_modules/utila": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
-      "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=",
-      "dev": true
-    },
-    "node_modules/utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
-      "dev": true,
-      "bin": {
-        "uuid": "bin/uuid"
-      }
-    },
-    "node_modules/validate-npm-package-license": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "dev": true,
-      "dependencies": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "node_modules/vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/vfile": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz",
-      "integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "is-buffer": "^2.0.0",
-        "unist-util-stringify-position": "^2.0.0",
-        "vfile-message": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "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==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/vfile-message": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz",
-      "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/vm-browserify": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
-      "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
-      "dev": true
-    },
-    "node_modules/warning": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
-      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
-      "dev": true,
-      "dependencies": {
-        "loose-envify": "^1.0.0"
-      }
-    },
-    "node_modules/watchpack": {
-      "version": "1.7.5",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
-      "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "neo-async": "^2.5.0"
-      },
-      "optionalDependencies": {
-        "chokidar": "^3.4.1",
-        "watchpack-chokidar2": "^2.0.1"
-      }
-    },
-    "node_modules/watchpack-chokidar2": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz",
-      "integrity": "sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "chokidar": "^2.1.8"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/anymatch": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "micromatch": "^3.1.4",
-        "normalize-path": "^2.1.1"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/anymatch/node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/binary-extensions": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "optional": true,
-      "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"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/chokidar": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-      "deprecated": "Chokidar 2 will break on node v14+. Upgrade to chokidar 3 with 15x less dependencies.",
-      "dev": true,
-      "optional": true,
-      "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"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/glob-parent": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-      "dev": true,
-      "optional": 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",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-extglob": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/is-binary-path": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "binary-extensions": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/watchpack-chokidar2/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "optional": 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"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/readdirp": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.11",
-        "micromatch": "^3.1.10",
-        "readable-stream": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/web-namespaces": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/web-namespaces/-/web-namespaces-1.1.4.tgz",
-      "integrity": "sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=",
-      "dev": true
-    },
-    "node_modules/webpack": {
-      "version": "4.46.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz",
-      "integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==",
-      "dev": true,
-      "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"
-      },
-      "bin": {
-        "webpack": "bin/webpack.js"
-      },
-      "engines": {
-        "node": ">=6.11.5"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependenciesMeta": {
-        "webpack-cli": {
-          "optional": true
-        },
-        "webpack-command": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack-dev-middleware": {
-      "version": "3.7.3",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz",
-      "integrity": "sha512-djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ==",
-      "dev": true,
-      "dependencies": {
-        "memory-fs": "^0.4.1",
-        "mime": "^2.4.4",
-        "mkdirp": "^0.5.1",
-        "range-parser": "^1.2.1",
-        "webpack-log": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 6"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/webpack-dev-middleware/node_modules/mime": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
-      "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
-      "dev": true,
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/webpack-dev-middleware/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/webpack-filter-warnings-plugin": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/webpack-filter-warnings-plugin/-/webpack-filter-warnings-plugin-1.2.1.tgz",
-      "integrity": "sha512-Ez6ytc9IseDMLPo0qCuNNYzgtUl8NovOqjIq4uAU8LTD4uoa1w1KpZyyzFtLTEMZpkkOkLfL9eN+KGYdk1Qtwg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4.3 < 5.0.0 || >= 5.10"
-      },
-      "peerDependencies": {
-        "webpack": "^2.0.0 || ^3.0.0 || ^4.0.0"
-      }
-    },
-    "node_modules/webpack-hot-middleware": {
-      "version": "2.25.1",
-      "resolved": "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.25.1.tgz",
-      "integrity": "sha512-Koh0KyU/RPYwel/khxbsDz9ibDivmUbrRuKSSQvW42KSDdO4w23WI3SkHpSUKHE76LrFnnM/L7JCrpBwu8AXYw==",
-      "dev": true,
-      "dependencies": {
-        "ansi-html-community": "0.0.8",
-        "html-entities": "^2.1.0",
-        "querystring": "^0.2.0",
-        "strip-ansi": "^6.0.0"
-      }
-    },
-    "node_modules/webpack-hot-middleware/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/webpack-hot-middleware/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/webpack-log": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
-      "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-colors": "^3.0.0",
-        "uuid": "^3.3.2"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/webpack-sources": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-      "dev": true,
-      "dependencies": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
-      }
-    },
-    "node_modules/webpack-sources/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack-virtual-modules": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.2.2.tgz",
-      "integrity": "sha512-kDUmfm3BZrei0y+1NTHJInejzxfhtU8eDj2M7OKb2IWrPFAeO1SOH2KuQ68MSZu9IGEHcxbkKKR1v18FrUSOmA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^3.0.0"
-      }
-    },
-    "node_modules/webpack-virtual-modules/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": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/webpack/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "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"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/cacache": {
-      "version": "12.0.4",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
-      "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
-      "dev": 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/webpack/node_modules/chownr": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-      "dev": true
-    },
-    "node_modules/webpack/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
-    "node_modules/webpack/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/is-wsl": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/webpack/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "node_modules/webpack/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": 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"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/webpack/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/webpack/node_modules/schema-utils": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.1.0",
-        "ajv-errors": "^1.0.0",
-        "ajv-keywords": "^3.1.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/webpack/node_modules/serialize-javascript": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
-      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
-      "dev": true,
-      "dependencies": {
-        "randombytes": "^2.1.0"
-      }
-    },
-    "node_modules/webpack/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/ssri": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz",
-      "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
-      "dev": true,
-      "dependencies": {
-        "figgy-pudding": "^3.5.1"
-      }
-    },
-    "node_modules/webpack/node_modules/terser-webpack-plugin": {
-      "version": "1.4.5",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz",
-      "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==",
-      "dev": true,
-      "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"
-      },
-      "engines": {
-        "node": ">= 6.9.0"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0"
-      }
-    },
-    "node_modules/webpack/node_modules/to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true
-    },
-    "node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
-      "dev": true,
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
-    "node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "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": {
-        "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"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/wide-align": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
-      "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^1.0.2 || 2 || 3 || 4"
-      }
-    },
-    "node_modules/widest-line": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
-      "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/worker-farm": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
-      "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
-      "dev": true,
-      "dependencies": {
-        "errno": "~0.1.7"
-      }
-    },
-    "node_modules/worker-rpc": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/worker-rpc/-/worker-rpc-0.1.1.tgz",
-      "integrity": "sha512-P1WjMrUB3qgJNI9jfmpZ/htmBEjFh//6l/5y8SD9hg1Ef5zTTVVoRjTrTEzPrNBQvmhMxkoTsjOXN10GWU7aCg==",
-      "dev": true,
-      "dependencies": {
-        "microevent.ts": "~0.1.1"
-      }
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
-    },
-    "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,
-      "engines": {
-        "node": ">=0.4"
-      }
-    },
-    "node_modules/y18n": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
-      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-      "dev": true
-    },
-    "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "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,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/zwitch": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz",
-      "integrity": "sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    }
-  },
-  "dependencies": {
-    "@babel/code-frame": {
-      "version": "7.15.8",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz",
-      "integrity": "sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==",
-      "dev": true,
-      "requires": {
-        "@babel/highlight": "^7.14.5"
-      }
-    },
-    "@babel/compat-data": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz",
-      "integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==",
-      "dev": true
-    },
-    "@babel/core": {
-      "version": "7.15.8",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.8.tgz",
-      "integrity": "sha512-3UG9dsxvYBMYwRv+gS41WKHno4K60/9GPy1CJaH6xy3Elq8CTtvtjT5R5jmNhXfCYLX2mTw+7/aq5ak/gOE0og==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.15.8",
-        "@babel/generator": "^7.15.8",
-        "@babel/helper-compilation-targets": "^7.15.4",
-        "@babel/helper-module-transforms": "^7.15.8",
-        "@babel/helpers": "^7.15.4",
-        "@babel/parser": "^7.15.8",
-        "@babel/template": "^7.15.4",
-        "@babel/traverse": "^7.15.4",
-        "@babel/types": "^7.15.6",
-        "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/generator": {
-      "version": "7.15.8",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.8.tgz",
-      "integrity": "sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.15.6",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
-      }
-    },
-    "@babel/helper-annotate-as-pure": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.15.4.tgz",
-      "integrity": "sha512-QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.15.4"
-      }
-    },
-    "@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.15.4.tgz",
-      "integrity": "sha512-P8o7JP2Mzi0SdC6eWr1zF+AEYvrsZa7GSY1lTayjF5XJhVH0kjLYUZPvTMflP7tBgZoe9gIhTa60QwFpqh/E0Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-explode-assignable-expression": "^7.15.4",
-        "@babel/types": "^7.15.4"
-      }
-    },
-    "@babel/helper-compilation-targets": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz",
-      "integrity": "sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.15.0",
-        "@babel/helper-validator-option": "^7.14.5",
-        "browserslist": "^4.16.6",
-        "semver": "^6.3.0"
-      }
-    },
-    "@babel/helper-create-class-features-plugin": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.4.tgz",
-      "integrity": "sha512-7ZmzFi+DwJx6A7mHRwbuucEYpyBwmh2Ca0RvI6z2+WLZYCqV0JOaLb+u0zbtmDicebgKBZgqbYfLaKNqSgv5Pw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.15.4",
-        "@babel/helper-function-name": "^7.15.4",
-        "@babel/helper-member-expression-to-functions": "^7.15.4",
-        "@babel/helper-optimise-call-expression": "^7.15.4",
-        "@babel/helper-replace-supers": "^7.15.4",
-        "@babel/helper-split-export-declaration": "^7.15.4"
-      }
-    },
-    "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz",
-      "integrity": "sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "regexpu-core": "^4.7.1"
-      }
-    },
-    "@babel/helper-define-polyfill-provider": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz",
-      "integrity": "sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew==",
-      "dev": true,
-      "requires": {
-        "@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-explode-assignable-expression": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.15.4.tgz",
-      "integrity": "sha512-J14f/vq8+hdC2KoWLIQSsGrC9EFBKE4NFts8pfMpymfApds+fPqR30AOUWc4tyr56h9l/GA1Sxv2q3dLZWbQ/g==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.15.4"
-      }
-    },
-    "@babel/helper-function-name": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz",
-      "integrity": "sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-get-function-arity": "^7.15.4",
-        "@babel/template": "^7.15.4",
-        "@babel/types": "^7.15.4"
-      }
-    },
-    "@babel/helper-get-function-arity": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz",
-      "integrity": "sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.15.4"
-      }
-    },
-    "@babel/helper-hoist-variables": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz",
-      "integrity": "sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.15.4"
-      }
-    },
-    "@babel/helper-member-expression-to-functions": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz",
-      "integrity": "sha512-cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.15.4"
-      }
-    },
-    "@babel/helper-module-imports": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz",
-      "integrity": "sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.15.4"
-      }
-    },
-    "@babel/helper-module-transforms": {
-      "version": "7.15.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.8.tgz",
-      "integrity": "sha512-DfAfA6PfpG8t4S6npwzLvTUpp0sS7JrcuaMiy1Y5645laRJIp/LiLGIBbQKaXSInK8tiGNI7FL7L8UvB8gdUZg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-imports": "^7.15.4",
-        "@babel/helper-replace-supers": "^7.15.4",
-        "@babel/helper-simple-access": "^7.15.4",
-        "@babel/helper-split-export-declaration": "^7.15.4",
-        "@babel/helper-validator-identifier": "^7.15.7",
-        "@babel/template": "^7.15.4",
-        "@babel/traverse": "^7.15.4",
-        "@babel/types": "^7.15.6"
-      }
-    },
-    "@babel/helper-optimise-call-expression": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz",
-      "integrity": "sha512-E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.15.4"
-      }
-    },
-    "@babel/helper-plugin-utils": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz",
-      "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==",
-      "dev": true
-    },
-    "@babel/helper-remap-async-to-generator": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.15.4.tgz",
-      "integrity": "sha512-v53MxgvMK/HCwckJ1bZrq6dNKlmwlyRNYM6ypaRTdXWGOE2c1/SCa6dL/HimhPulGhZKw9W0QhREM583F/t0vQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.15.4",
-        "@babel/helper-wrap-function": "^7.15.4",
-        "@babel/types": "^7.15.4"
-      }
-    },
-    "@babel/helper-replace-supers": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz",
-      "integrity": "sha512-/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-member-expression-to-functions": "^7.15.4",
-        "@babel/helper-optimise-call-expression": "^7.15.4",
-        "@babel/traverse": "^7.15.4",
-        "@babel/types": "^7.15.4"
-      }
-    },
-    "@babel/helper-simple-access": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz",
-      "integrity": "sha512-UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.15.4"
-      }
-    },
-    "@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.15.4.tgz",
-      "integrity": "sha512-BMRLsdh+D1/aap19TycS4eD1qELGrCBJwzaY9IE8LrpJtJb+H7rQkPIdsfgnMtLBA6DJls7X9z93Z4U8h7xw0A==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.15.4"
-      }
-    },
-    "@babel/helper-split-export-declaration": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz",
-      "integrity": "sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.15.4"
-      }
-    },
-    "@babel/helper-validator-identifier": {
-      "version": "7.15.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz",
-      "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==",
-      "dev": true
-    },
-    "@babel/helper-validator-option": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz",
-      "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==",
-      "dev": true
-    },
-    "@babel/helper-wrap-function": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.15.4.tgz",
-      "integrity": "sha512-Y2o+H/hRV5W8QhIfTpRIBwl57y8PrZt6JM3V8FOo5qarjshHItyH5lXlpMfBfmBefOqSCpKZs/6Dxqp0E/U+uw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-function-name": "^7.15.4",
-        "@babel/template": "^7.15.4",
-        "@babel/traverse": "^7.15.4",
-        "@babel/types": "^7.15.4"
-      }
-    },
-    "@babel/helpers": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.4.tgz",
-      "integrity": "sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==",
-      "dev": true,
-      "requires": {
-        "@babel/template": "^7.15.4",
-        "@babel/traverse": "^7.15.4",
-        "@babel/types": "^7.15.4"
-      }
-    },
-    "@babel/highlight": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
-      "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-validator-identifier": "^7.14.5",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "@babel/parser": {
-      "version": "7.15.8",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.8.tgz",
-      "integrity": "sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==",
-      "dev": true
-    },
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4.tgz",
-      "integrity": "sha512-eBnpsl9tlhPhpI10kU06JHnrYXwg3+V6CaP2idsCXNef0aeslpqyITXQ74Vfk5uHgY7IG7XP0yIH8b42KSzHog==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.15.4",
-        "@babel/plugin-proposal-optional-chaining": "^7.14.5"
-      }
-    },
-    "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.15.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.15.8.tgz",
-      "integrity": "sha512-2Z5F2R2ibINTc63mY7FLqGfEbmofrHU9FitJW1Q7aPaKFhiPvSq6QEt/BoWN5oME3GVyjcRuNNSRbb9LC0CSWA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-remap-async-to-generator": "^7.15.4",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
-      }
-    },
-    "@babel/plugin-proposal-class-properties": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz",
-      "integrity": "sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-proposal-class-static-block": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.15.4.tgz",
-      "integrity": "sha512-M682XWrrLNk3chXCjoPUQWOyYsB93B9z3mRyjtqqYJWDf2mfCdIYgDrA11cgNVhAQieaq6F2fn2f3wI0U4aTjA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.15.4",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
-      }
-    },
-    "@babel/plugin-proposal-decorators": {
-      "version": "7.15.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.15.8.tgz",
-      "integrity": "sha512-5n8+xGK7YDrXF+WAORg3P7LlCCdiaAyKLZi22eP2BwTy4kJ0kFUMMDCj4nQ8YrKyNZgjhU/9eRVqONnjB3us8g==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.15.4",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-decorators": "^7.14.5"
-      }
-    },
-    "@babel/plugin-proposal-dynamic-import": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz",
-      "integrity": "sha512-ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-export-default-from": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.14.5.tgz",
-      "integrity": "sha512-T8KZ5abXvKMjF6JcoXjgac3ElmXf0AWzJwi2O/42Jk+HmCky3D9+i1B7NPP1FblyceqTevKeV/9szeikFoaMDg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-export-default-from": "^7.14.5"
-      }
-    },
-    "@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz",
-      "integrity": "sha512-g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-json-strings": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz",
-      "integrity": "sha512-NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz",
-      "integrity": "sha512-YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
-      }
-    },
-    "@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz",
-      "integrity": "sha512-gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-numeric-separator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz",
-      "integrity": "sha512-yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
-      }
-    },
-    "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.15.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.15.6.tgz",
-      "integrity": "sha512-qtOHo7A1Vt+O23qEAX+GdBpqaIuD3i9VRrWgCJeq7WO6H2d14EK3q11urj5Te2MAeK97nMiIdRpwd/ST4JFbNg==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.15.0",
-        "@babel/helper-compilation-targets": "^7.15.4",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.15.4"
-      }
-    },
-    "@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz",
-      "integrity": "sha512-3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-optional-chaining": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz",
-      "integrity": "sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-private-methods": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz",
-      "integrity": "sha512-838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.15.4.tgz",
-      "integrity": "sha512-X0UTixkLf0PCCffxgu5/1RQyGGbgZuKoI+vXP4iSbJSYwPb7hu06omsFGBvQ9lJEvwgrxHdS8B5nbfcd8GyUNA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.15.4",
-        "@babel/helper-create-class-features-plugin": "^7.15.4",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
-      }
-    },
-    "@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz",
-      "integrity": "sha512-6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-syntax-async-generators": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-class-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      }
-    },
-    "@babel/plugin-syntax-class-static-block": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
-      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-syntax-decorators": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.14.5.tgz",
-      "integrity": "sha512-c4sZMRWL4GSvP1EXy0woIP7m4jkVcEuG8R1TOZxPBPtp4FSM/kiPZub9UIs/Jrb5ZAOzvTUSGYrWsrSu1JvoPw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-syntax-dynamic-import": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-export-default-from": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.14.5.tgz",
-      "integrity": "sha512-snWDxjuaPEobRBnhpqEfZ8RMxDbHt8+87fiEioGuE+Uc0xAKgSD8QiuL3lF93hPVQfZFAcYwrrf+H5qUhike3Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-syntax-export-namespace-from": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      }
-    },
-    "@babel/plugin-syntax-json-strings": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-jsx": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.14.5.tgz",
-      "integrity": "sha512-ohuFIsOMXJnbOMRfX7/w7LocdR6R7whhuRD4ax8IipLcLPlZGJKkBxgHp++U4N/vKyU16/YDQr2f5seajD3jIw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-syntax-logical-assignment-operators": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
-    "@babel/plugin-syntax-nullish-coalescing-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-numeric-separator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
-    "@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-optional-catch-binding": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-optional-chaining": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-private-property-in-object": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
-      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-syntax-top-level-await": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-syntax-typescript": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz",
-      "integrity": "sha512-u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-transform-arrow-functions": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz",
-      "integrity": "sha512-KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-transform-async-to-generator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz",
-      "integrity": "sha512-szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-imports": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-remap-async-to-generator": "^7.14.5"
-      }
-    },
-    "@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz",
-      "integrity": "sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-transform-block-scoping": {
-      "version": "7.15.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz",
-      "integrity": "sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-transform-classes": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.15.4.tgz",
-      "integrity": "sha512-Yjvhex8GzBmmPQUvpXRPWQ9WnxXgAFuZSrqOK/eJlOGIXwvv8H3UEdUigl1gb/bnjTrln+e8bkZUYCBt/xYlBg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.15.4",
-        "@babel/helper-function-name": "^7.15.4",
-        "@babel/helper-optimise-call-expression": "^7.15.4",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.15.4",
-        "@babel/helper-split-export-declaration": "^7.15.4",
-        "globals": "^11.1.0"
-      }
-    },
-    "@babel/plugin-transform-computed-properties": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz",
-      "integrity": "sha512-pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-transform-destructuring": {
-      "version": "7.14.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz",
-      "integrity": "sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-transform-dotall-regex": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz",
-      "integrity": "sha512-loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-transform-duplicate-keys": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz",
-      "integrity": "sha512-iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz",
-      "integrity": "sha512-jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-transform-for-of": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.15.4.tgz",
-      "integrity": "sha512-DRTY9fA751AFBDh2oxydvVm4SYevs5ILTWLs6xKXps4Re/KG5nfUkr+TdHCrRWB8C69TlzVgA9b3RmGWmgN9LA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-transform-function-name": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz",
-      "integrity": "sha512-vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-transform-literals": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz",
-      "integrity": "sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-transform-member-expression-literals": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz",
-      "integrity": "sha512-WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-transform-modules-amd": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz",
-      "integrity": "sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-transforms": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
-      }
-    },
-    "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.4.tgz",
-      "integrity": "sha512-qg4DPhwG8hKp4BbVDvX1s8cohM8a6Bvptu4l6Iingq5rW+yRUAhe/YRup/YcW2zCOlrysEWVhftIcKzrEZv3sA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-transforms": "^7.15.4",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-simple-access": "^7.15.4",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
-      }
-    },
-    "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.15.4.tgz",
-      "integrity": "sha512-fJUnlQrl/mezMneR72CKCgtOoahqGJNVKpompKwzv3BrEXdlPspTcyxrZ1XmDTIr9PpULrgEQo3qNKp6dW7ssw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-hoist-variables": "^7.15.4",
-        "@babel/helper-module-transforms": "^7.15.4",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-validator-identifier": "^7.14.9",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
-      }
-    },
-    "@babel/plugin-transform-modules-umd": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz",
-      "integrity": "sha512-RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-transforms": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz",
-      "integrity": "sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5"
-      }
-    },
-    "@babel/plugin-transform-new-target": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz",
-      "integrity": "sha512-Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-transform-object-super": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz",
-      "integrity": "sha512-MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.14.5"
-      }
-    },
-    "@babel/plugin-transform-parameters": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.15.4.tgz",
-      "integrity": "sha512-9WB/GUTO6lvJU3XQsSr6J/WKvBC2hcs4Pew8YxZagi6GkTdniyqp8On5kqdK8MN0LMeu0mGbhPN+O049NV/9FQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-transform-property-literals": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz",
-      "integrity": "sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-transform-react-display-name": {
-      "version": "7.15.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.15.1.tgz",
-      "integrity": "sha512-yQZ/i/pUCJAHI/LbtZr413S3VT26qNrEm0M5RRxQJA947/YNYwbZbBaXGDrq6CG5QsZycI1VIP6d7pQaBfP+8Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-transform-react-jsx": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.9.tgz",
-      "integrity": "sha512-30PeETvS+AeD1f58i1OVyoDlVYQhap/K20ZrMjLmmzmC2AYR/G43D4sdJAaDAqCD3MYpSWbmrz3kES158QSLjw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-module-imports": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-jsx": "^7.14.5",
-        "@babel/types": "^7.14.9"
-      }
-    },
-    "@babel/plugin-transform-react-jsx-development": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.14.5.tgz",
-      "integrity": "sha512-rdwG/9jC6QybWxVe2UVOa7q6cnTpw8JRRHOxntG/h6g/guAOe6AhtQHJuJh5FwmnXIT1bdm5vC2/5huV8ZOorQ==",
-      "dev": true,
-      "requires": {
-        "@babel/plugin-transform-react-jsx": "^7.14.5"
-      }
-    },
-    "@babel/plugin-transform-react-pure-annotations": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.14.5.tgz",
-      "integrity": "sha512-3X4HpBJimNxW4rhUy/SONPyNQHp5YRr0HhJdT2OH1BRp0of7u3Dkirc7x9FRJMKMqTBI079VZ1hzv7Ouuz///g==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-transform-regenerator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz",
-      "integrity": "sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg==",
-      "dev": true,
-      "requires": {
-        "regenerator-transform": "^0.14.2"
-      }
-    },
-    "@babel/plugin-transform-reserved-words": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz",
-      "integrity": "sha512-cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz",
-      "integrity": "sha512-xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-transform-spread": {
-      "version": "7.15.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.15.8.tgz",
-      "integrity": "sha512-/daZ8s2tNaRekl9YJa9X4bzjpeRZLt122cpgFnQPLGUe61PH8zMEBmYqKkW5xF5JUEh5buEGXJoQpqBmIbpmEQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.15.4"
-      }
-    },
-    "@babel/plugin-transform-sticky-regex": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz",
-      "integrity": "sha512-Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-transform-template-literals": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz",
-      "integrity": "sha512-22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-transform-typeof-symbol": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz",
-      "integrity": "sha512-lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-transform-typescript": {
-      "version": "7.15.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.15.8.tgz",
-      "integrity": "sha512-ZXIkJpbaf6/EsmjeTbiJN/yMxWPFWvlr7sEG1P95Xb4S4IBcrf2n7s/fItIhsAmOf8oSh3VJPDppO6ExfAfKRQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.15.4",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-typescript": "^7.14.5"
-      }
-    },
-    "@babel/plugin-transform-unicode-escapes": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz",
-      "integrity": "sha512-crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-transform-unicode-regex": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz",
-      "integrity": "sha512-UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/preset-env": {
-      "version": "7.15.8",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.8.tgz",
-      "integrity": "sha512-rCC0wH8husJgY4FPbHsiYyiLxSY8oMDJH7Rl6RQMknbN9oDDHhM9RDFvnGM2MgkbUJzSQB4gtuwygY5mCqGSsA==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.15.0",
-        "@babel/helper-compilation-targets": "^7.15.4",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-validator-option": "^7.14.5",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.15.4",
-        "@babel/plugin-proposal-async-generator-functions": "^7.15.8",
-        "@babel/plugin-proposal-class-properties": "^7.14.5",
-        "@babel/plugin-proposal-class-static-block": "^7.15.4",
-        "@babel/plugin-proposal-dynamic-import": "^7.14.5",
-        "@babel/plugin-proposal-export-namespace-from": "^7.14.5",
-        "@babel/plugin-proposal-json-strings": "^7.14.5",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.14.5",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5",
-        "@babel/plugin-proposal-numeric-separator": "^7.14.5",
-        "@babel/plugin-proposal-object-rest-spread": "^7.15.6",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.14.5",
-        "@babel/plugin-proposal-optional-chaining": "^7.14.5",
-        "@babel/plugin-proposal-private-methods": "^7.14.5",
-        "@babel/plugin-proposal-private-property-in-object": "^7.15.4",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.14.5",
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-class-properties": "^7.12.13",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@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.14.5",
-        "@babel/plugin-transform-async-to-generator": "^7.14.5",
-        "@babel/plugin-transform-block-scoped-functions": "^7.14.5",
-        "@babel/plugin-transform-block-scoping": "^7.15.3",
-        "@babel/plugin-transform-classes": "^7.15.4",
-        "@babel/plugin-transform-computed-properties": "^7.14.5",
-        "@babel/plugin-transform-destructuring": "^7.14.7",
-        "@babel/plugin-transform-dotall-regex": "^7.14.5",
-        "@babel/plugin-transform-duplicate-keys": "^7.14.5",
-        "@babel/plugin-transform-exponentiation-operator": "^7.14.5",
-        "@babel/plugin-transform-for-of": "^7.15.4",
-        "@babel/plugin-transform-function-name": "^7.14.5",
-        "@babel/plugin-transform-literals": "^7.14.5",
-        "@babel/plugin-transform-member-expression-literals": "^7.14.5",
-        "@babel/plugin-transform-modules-amd": "^7.14.5",
-        "@babel/plugin-transform-modules-commonjs": "^7.15.4",
-        "@babel/plugin-transform-modules-systemjs": "^7.15.4",
-        "@babel/plugin-transform-modules-umd": "^7.14.5",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.14.9",
-        "@babel/plugin-transform-new-target": "^7.14.5",
-        "@babel/plugin-transform-object-super": "^7.14.5",
-        "@babel/plugin-transform-parameters": "^7.15.4",
-        "@babel/plugin-transform-property-literals": "^7.14.5",
-        "@babel/plugin-transform-regenerator": "^7.14.5",
-        "@babel/plugin-transform-reserved-words": "^7.14.5",
-        "@babel/plugin-transform-shorthand-properties": "^7.14.5",
-        "@babel/plugin-transform-spread": "^7.15.8",
-        "@babel/plugin-transform-sticky-regex": "^7.14.5",
-        "@babel/plugin-transform-template-literals": "^7.14.5",
-        "@babel/plugin-transform-typeof-symbol": "^7.14.5",
-        "@babel/plugin-transform-unicode-escapes": "^7.14.5",
-        "@babel/plugin-transform-unicode-regex": "^7.14.5",
-        "@babel/preset-modules": "^0.1.4",
-        "@babel/types": "^7.15.6",
-        "babel-plugin-polyfill-corejs2": "^0.2.2",
-        "babel-plugin-polyfill-corejs3": "^0.2.5",
-        "babel-plugin-polyfill-regenerator": "^0.2.2",
-        "core-js-compat": "^3.16.0",
-        "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "babel-plugin-polyfill-corejs3": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.5.tgz",
-          "integrity": "sha512-ninF5MQNwAX9Z7c9ED+H2pGt1mXdP4TqzlHKyPIYmJIYz0N+++uwdM7RnJukklhzJ54Q84vA4ZJkgs7lu5vqcw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-define-polyfill-provider": "^0.2.2",
-            "core-js-compat": "^3.16.2"
-          }
-        }
-      }
-    },
-    "@babel/preset-modules": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
-      "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
-      "dev": true,
-      "requires": {
-        "@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/preset-react": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.14.5.tgz",
-      "integrity": "sha512-XFxBkjyObLvBaAvkx1Ie95Iaq4S/GUEIrejyrntQ/VCMKUYvKLoyKxOBzJ2kjA3b6rC9/KL6KXfDC2GqvLiNqQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-validator-option": "^7.14.5",
-        "@babel/plugin-transform-react-display-name": "^7.14.5",
-        "@babel/plugin-transform-react-jsx": "^7.14.5",
-        "@babel/plugin-transform-react-jsx-development": "^7.14.5",
-        "@babel/plugin-transform-react-pure-annotations": "^7.14.5"
-      }
-    },
-    "@babel/preset-typescript": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.15.0.tgz",
-      "integrity": "sha512-lt0Y/8V3y06Wq/8H/u0WakrqciZ7Fz7mwPDHWUJAXlABL5hiUG42BNlRXiELNjeWjO5rWmnNKlx+yzJvxezHow==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-validator-option": "^7.14.5",
-        "@babel/plugin-transform-typescript": "^7.15.0"
-      }
-    },
-    "@babel/register": {
-      "version": "7.15.3",
-      "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.15.3.tgz",
-      "integrity": "sha512-mj4IY1ZJkorClxKTImccn4T81+UKTo4Ux0+OFSV9hME1ooqS9UV+pJ6BjD0qXPK4T3XW/KNa79XByjeEMZz+fw==",
-      "dev": true,
-      "requires": {
-        "clone-deep": "^4.0.1",
-        "find-cache-dir": "^2.0.0",
-        "make-dir": "^2.1.0",
-        "pirates": "^4.0.0",
-        "source-map-support": "^0.5.16"
-      }
-    },
-    "@babel/runtime": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
-      "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
-      "dev": true,
-      "requires": {
-        "regenerator-runtime": "^0.13.4"
-      }
-    },
-    "@babel/runtime-corejs3": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.15.4.tgz",
-      "integrity": "sha512-lWcAqKeB624/twtTc3w6w/2o9RqJPaNBhPGK6DKLSiwuVWC7WFkypWyNg+CpZoyJH0jVzv1uMtXZ/5/lQOLtCg==",
-      "dev": true,
-      "requires": {
-        "core-js-pure": "^3.16.0",
-        "regenerator-runtime": "^0.13.4"
-      }
-    },
-    "@babel/template": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.15.4.tgz",
-      "integrity": "sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/parser": "^7.15.4",
-        "@babel/types": "^7.15.4"
-      }
-    },
-    "@babel/traverse": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.4.tgz",
-      "integrity": "sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/generator": "^7.15.4",
-        "@babel/helper-function-name": "^7.15.4",
-        "@babel/helper-hoist-variables": "^7.15.4",
-        "@babel/helper-split-export-declaration": "^7.15.4",
-        "@babel/parser": "^7.15.4",
-        "@babel/types": "^7.15.4",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
-      }
-    },
-    "@babel/types": {
-      "version": "7.15.6",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.6.tgz",
-      "integrity": "sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-validator-identifier": "^7.14.9",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "@discoveryjs/json-ext": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz",
-      "integrity": "sha512-6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA==",
-      "dev": true
-    },
-    "@emotion/cache": {
-      "version": "10.0.29",
-      "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-10.0.29.tgz",
-      "integrity": "sha512-fU2VtSVlHiF27empSbxi1O2JFdNWZO+2NFHfwO0pxgTep6Xa3uGb+3pVKfLww2l/IBGLNEZl5Xf/++A4wAYDYQ==",
-      "dev": true,
-      "requires": {
-        "@emotion/sheet": "0.9.4",
-        "@emotion/stylis": "0.8.5",
-        "@emotion/utils": "0.11.3",
-        "@emotion/weak-memoize": "0.2.5"
-      }
-    },
-    "@emotion/core": {
-      "version": "10.1.1",
-      "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
-      "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.5.5",
-        "@emotion/cache": "^10.0.27",
-        "@emotion/css": "^10.0.27",
-        "@emotion/serialize": "^0.11.15",
-        "@emotion/sheet": "0.9.4",
-        "@emotion/utils": "0.11.3"
-      }
-    },
-    "@emotion/css": {
-      "version": "10.0.27",
-      "resolved": "https://registry.npmjs.org/@emotion/css/-/css-10.0.27.tgz",
-      "integrity": "sha512-6wZjsvYeBhyZQYNrGoR5yPMYbMBNEnanDrqmsqS1mzDm1cOTu12shvl2j4QHNS36UaTE0USIJawCH9C8oW34Zw==",
-      "dev": true,
-      "requires": {
-        "@emotion/serialize": "^0.11.15",
-        "@emotion/utils": "0.11.3",
-        "babel-plugin-emotion": "^10.0.27"
-      }
-    },
-    "@emotion/hash": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz",
-      "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==",
-      "dev": true
-    },
-    "@emotion/is-prop-valid": {
-      "version": "0.8.8",
-      "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz",
-      "integrity": "sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==",
-      "dev": true,
-      "requires": {
-        "@emotion/memoize": "0.7.4"
-      }
-    },
-    "@emotion/memoize": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz",
-      "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==",
-      "dev": true
-    },
-    "@emotion/serialize": {
-      "version": "0.11.16",
-      "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-0.11.16.tgz",
-      "integrity": "sha512-G3J4o8by0VRrO+PFeSc3js2myYNOXVJ3Ya+RGVxnshRYgsvErfAOglKAiy1Eo1vhzxqtUvjCyS5gtewzkmvSSg==",
-      "dev": true,
-      "requires": {
-        "@emotion/hash": "0.8.0",
-        "@emotion/memoize": "0.7.4",
-        "@emotion/unitless": "0.7.5",
-        "@emotion/utils": "0.11.3",
-        "csstype": "^2.5.7"
-      }
-    },
-    "@emotion/sheet": {
-      "version": "0.9.4",
-      "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-0.9.4.tgz",
-      "integrity": "sha512-zM9PFmgVSqBw4zL101Q0HrBVTGmpAxFZH/pYx/cjJT5advXguvcgjHFTCaIO3enL/xr89vK2bh0Mfyj9aa0ANA==",
-      "dev": true
-    },
-    "@emotion/styled": {
-      "version": "10.0.27",
-      "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-10.0.27.tgz",
-      "integrity": "sha512-iK/8Sh7+NLJzyp9a5+vIQIXTYxfT4yB/OJbjzQanB2RZpvmzBQOHZWhpAMZWYEKRNNbsD6WfBw5sVWkb6WzS/Q==",
-      "dev": true,
-      "requires": {
-        "@emotion/styled-base": "^10.0.27",
-        "babel-plugin-emotion": "^10.0.27"
-      }
-    },
-    "@emotion/styled-base": {
-      "version": "10.0.31",
-      "resolved": "https://registry.npmjs.org/@emotion/styled-base/-/styled-base-10.0.31.tgz",
-      "integrity": "sha512-wTOE1NcXmqMWlyrtwdkqg87Mu6Rj1MaukEoEmEkHirO5IoHDJ8LgCQL4MjJODgxWxXibGR3opGp1p7YvkNEdXQ==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.5.5",
-        "@emotion/is-prop-valid": "0.8.8",
-        "@emotion/serialize": "^0.11.15",
-        "@emotion/utils": "0.11.3"
-      }
-    },
-    "@emotion/stylis": {
-      "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.5.tgz",
-      "integrity": "sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ==",
-      "dev": true
-    },
-    "@emotion/unitless": {
-      "version": "0.7.5",
-      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",
-      "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==",
-      "dev": true
-    },
-    "@emotion/utils": {
-      "version": "0.11.3",
-      "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-0.11.3.tgz",
-      "integrity": "sha512-0o4l6pZC+hI88+bzuaX/6BgOvQVhbt2PfmxauVaYOGgbsAw14wdKyvMCZXnsnsHys94iadcF+RG/wZyx6+ZZBw==",
-      "dev": true
-    },
-    "@emotion/weak-memoize": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz",
-      "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==",
-      "dev": true
-    },
-    "@gar/promisify": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.2.tgz",
-      "integrity": "sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw==",
-      "dev": true
-    },
-    "@mdx-js/mdx": {
-      "version": "1.6.22",
-      "resolved": "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-1.6.22.tgz",
-      "integrity": "sha512-AMxuLxPz2j5/6TpF/XSdKpQP1NlG0z11dFOlq+2IP/lSgl11GY8ji6S/rgsViN/L0BDvHvUMruRb7ub+24LUYA==",
-      "dev": true,
-      "requires": {
-        "@babel/core": "7.12.9",
-        "@babel/plugin-syntax-jsx": "7.12.1",
-        "@babel/plugin-syntax-object-rest-spread": "7.8.3",
-        "@mdx-js/util": "1.6.22",
-        "babel-plugin-apply-mdx-type-prop": "1.6.22",
-        "babel-plugin-extract-import-names": "1.6.22",
-        "camelcase-css": "2.0.1",
-        "detab": "2.0.4",
-        "hast-util-raw": "6.0.1",
-        "lodash.uniq": "4.5.0",
-        "mdast-util-to-hast": "10.0.1",
-        "remark-footnotes": "2.0.0",
-        "remark-mdx": "1.6.22",
-        "remark-parse": "8.0.3",
-        "remark-squeeze-paragraphs": "4.0.0",
-        "style-to-object": "0.3.0",
-        "unified": "9.2.0",
-        "unist-builder": "2.0.3",
-        "unist-util-visit": "2.0.3"
-      },
-      "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/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"
-          }
-        },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
-        }
-      }
-    },
-    "@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
-    },
-    "@mrmlnc/readdir-enhanced": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
-      "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
-      "dev": true,
-      "requires": {
-        "call-me-maybe": "^1.0.1",
-        "glob-to-regexp": "^0.3.0"
-      }
-    },
-    "@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "dev": true,
-      "requires": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      }
-    },
-    "@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-      "dev": true
-    },
-    "@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-      "dev": true,
-      "requires": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
-      }
-    },
-    "@npmcli/fs": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.0.0.tgz",
-      "integrity": "sha512-8ltnOpRR/oJbOp8vaGUnipOi3bqkcW+sLHFlyXIr08OGHmVJLB1Hn7QtGXbYcpVtH1gAYZTlmDXtE4YV0+AMMQ==",
-      "dev": true,
-      "requires": {
-        "@gar/promisify": "^1.0.1",
-        "semver": "^7.3.5"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
-      }
-    },
-    "@npmcli/move-file": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz",
-      "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
-      "dev": true,
-      "requires": {
-        "mkdirp": "^1.0.4",
-        "rimraf": "^3.0.2"
-      }
-    },
-    "@popperjs/core": {
-      "version": "2.10.2",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.10.2.tgz",
-      "integrity": "sha512-IXf3XA7+XyN7CP9gGh/XB0UxVMlvARGEgGXLubFICsUMGz6Q+DU+i4gGlpOxTjKvXjkJDJC8YdqdKkDj9qZHEQ==",
-      "dev": true
-    },
-    "@reach/router": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/@reach/router/-/router-1.3.4.tgz",
-      "integrity": "sha512-+mtn9wjlB9NN2CNnnC/BRYtwdKBfSyyasPYraNAyvaV1occr/5NnB4CVzjEZipNHwYebQwcndGUmpFzxAUoqSA==",
-      "dev": true,
-      "requires": {
-        "create-react-context": "0.3.0",
-        "invariant": "^2.2.3",
-        "prop-types": "^15.6.1",
-        "react-lifecycles-compat": "^3.0.4"
-      }
-    },
-    "@storybook/addon-a11y": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-a11y/-/addon-a11y-6.3.12.tgz",
-      "integrity": "sha512-q1NdRHFJV6sLEEJw0hatCc5ZIthELqM/AWdrEWDyhcJNyiq7Tq4nKqQBMTQSYwHiUAmxVgw7i4oa1vM2M51/3g==",
-      "dev": true,
-      "requires": {
-        "@storybook/addons": "6.3.12",
-        "@storybook/api": "6.3.12",
-        "@storybook/channels": "6.3.12",
-        "@storybook/client-api": "6.3.12",
-        "@storybook/client-logger": "6.3.12",
-        "@storybook/components": "6.3.12",
-        "@storybook/core-events": "6.3.12",
-        "@storybook/theming": "6.3.12",
-        "axe-core": "^4.2.0",
-        "core-js": "^3.8.2",
-        "global": "^4.4.0",
-        "lodash": "^4.17.20",
-        "react-sizeme": "^3.0.1",
-        "regenerator-runtime": "^0.13.7",
-        "ts-dedent": "^2.0.0",
-        "util-deprecate": "^1.0.2"
-      }
-    },
-    "@storybook/addon-controls": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-controls/-/addon-controls-6.3.12.tgz",
-      "integrity": "sha512-WO/PbygE4sDg3BbstJ49q0uM3Xu5Nw4lnHR5N4hXSvRAulZt1d1nhphRTHjfX+CW+uBcfzkq9bksm6nKuwmOyw==",
-      "dev": true,
-      "requires": {
-        "@storybook/addons": "6.3.12",
-        "@storybook/api": "6.3.12",
-        "@storybook/client-api": "6.3.12",
-        "@storybook/components": "6.3.12",
-        "@storybook/node-logger": "6.3.12",
-        "@storybook/theming": "6.3.12",
-        "core-js": "^3.8.2",
-        "ts-dedent": "^2.0.0"
-      }
-    },
-    "@storybook/addon-knobs": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-knobs/-/addon-knobs-6.3.1.tgz",
-      "integrity": "sha512-2GGGnQSPXXUhHHYv4IW6pkyQlCPYXKYiyGzfhV7Zhs95M2Ban08OA6KLmliMptWCt7U9tqTO8dB5u0C2cWmCTw==",
-      "dev": true,
-      "requires": {
-        "copy-to-clipboard": "^3.3.1",
-        "core-js": "^3.8.2",
-        "escape-html": "^1.0.3",
-        "fast-deep-equal": "^3.1.3",
-        "global": "^4.4.0",
-        "lodash": "^4.17.20",
-        "prop-types": "^15.7.2",
-        "qs": "^6.10.0",
-        "react-colorful": "^5.1.2",
-        "react-lifecycles-compat": "^3.0.4",
-        "react-select": "^3.2.0"
-      }
-    },
-    "@storybook/addon-viewport": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-viewport/-/addon-viewport-6.3.12.tgz",
-      "integrity": "sha512-TRjyfm85xouOPmXxeLdEIzXLfJZZ1ePQ7p/5yphDGBHdxMU4m4qiZr8wYpUaxHsRu/UB3dKfaOyGT+ivogbnbw==",
-      "dev": true,
-      "requires": {
-        "@storybook/addons": "6.3.12",
-        "@storybook/api": "6.3.12",
-        "@storybook/client-logger": "6.3.12",
-        "@storybook/components": "6.3.12",
-        "@storybook/core-events": "6.3.12",
-        "@storybook/theming": "6.3.12",
-        "core-js": "^3.8.2",
-        "global": "^4.4.0",
-        "memoizerific": "^1.11.3",
-        "prop-types": "^15.7.2",
-        "regenerator-runtime": "^0.13.7"
-      }
-    },
-    "@storybook/addons": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.3.12.tgz",
-      "integrity": "sha512-UgoMyr7Qr0FS3ezt8u6hMEcHgyynQS9ucr5mAwZky3wpXRPFyUTmMto9r4BBUdqyUvTUj/LRKIcmLBfj+/l0Fg==",
-      "dev": true,
-      "requires": {
-        "@storybook/api": "6.3.12",
-        "@storybook/channels": "6.3.12",
-        "@storybook/client-logger": "6.3.12",
-        "@storybook/core-events": "6.3.12",
-        "@storybook/router": "6.3.12",
-        "@storybook/theming": "6.3.12",
-        "core-js": "^3.8.2",
-        "global": "^4.4.0",
-        "regenerator-runtime": "^0.13.7"
-      }
-    },
-    "@storybook/api": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/api/-/api-6.3.12.tgz",
-      "integrity": "sha512-LScRXUeCWEW/OP+jiooNMQICVdusv7azTmULxtm72fhkXFRiQs2CdRNTiqNg46JLLC9z95f1W+pGK66X6HiiQA==",
-      "dev": true,
-      "requires": {
-        "@reach/router": "^1.3.4",
-        "@storybook/channels": "6.3.12",
-        "@storybook/client-logger": "6.3.12",
-        "@storybook/core-events": "6.3.12",
-        "@storybook/csf": "0.0.1",
-        "@storybook/router": "6.3.12",
-        "@storybook/semver": "^7.3.2",
-        "@storybook/theming": "6.3.12",
-        "@types/reach__router": "^1.3.7",
-        "core-js": "^3.8.2",
-        "fast-deep-equal": "^3.1.3",
-        "global": "^4.4.0",
-        "lodash": "^4.17.20",
-        "memoizerific": "^1.11.3",
-        "qs": "^6.10.0",
-        "regenerator-runtime": "^0.13.7",
-        "store2": "^2.12.0",
-        "telejson": "^5.3.2",
-        "ts-dedent": "^2.0.0",
-        "util-deprecate": "^1.0.2"
-      }
-    },
-    "@storybook/builder-webpack4": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/builder-webpack4/-/builder-webpack4-6.3.12.tgz",
-      "integrity": "sha512-Dlm5Fc1svqpFDnVPZdAaEBiM/IDZHMV3RfEGbUTY/ZC0q8b/Ug1czzp/w0aTIjOFRuBDcG6IcplikaqHL8CJLg==",
-      "dev": true,
-      "requires": {
-        "@babel/core": "^7.12.10",
-        "@babel/plugin-proposal-class-properties": "^7.12.1",
-        "@babel/plugin-proposal-decorators": "^7.12.12",
-        "@babel/plugin-proposal-export-default-from": "^7.12.1",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
-        "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
-        "@babel/plugin-proposal-optional-chaining": "^7.12.7",
-        "@babel/plugin-proposal-private-methods": "^7.12.1",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-transform-arrow-functions": "^7.12.1",
-        "@babel/plugin-transform-block-scoping": "^7.12.12",
-        "@babel/plugin-transform-classes": "^7.12.1",
-        "@babel/plugin-transform-destructuring": "^7.12.1",
-        "@babel/plugin-transform-for-of": "^7.12.1",
-        "@babel/plugin-transform-parameters": "^7.12.1",
-        "@babel/plugin-transform-shorthand-properties": "^7.12.1",
-        "@babel/plugin-transform-spread": "^7.12.1",
-        "@babel/plugin-transform-template-literals": "^7.12.1",
-        "@babel/preset-env": "^7.12.11",
-        "@babel/preset-react": "^7.12.10",
-        "@babel/preset-typescript": "^7.12.7",
-        "@storybook/addons": "6.3.12",
-        "@storybook/api": "6.3.12",
-        "@storybook/channel-postmessage": "6.3.12",
-        "@storybook/channels": "6.3.12",
-        "@storybook/client-api": "6.3.12",
-        "@storybook/client-logger": "6.3.12",
-        "@storybook/components": "6.3.12",
-        "@storybook/core-common": "6.3.12",
-        "@storybook/core-events": "6.3.12",
-        "@storybook/node-logger": "6.3.12",
-        "@storybook/router": "6.3.12",
-        "@storybook/semver": "^7.3.2",
-        "@storybook/theming": "6.3.12",
-        "@storybook/ui": "6.3.12",
-        "@types/node": "^14.0.10",
-        "@types/webpack": "^4.41.26",
-        "autoprefixer": "^9.8.6",
-        "babel-loader": "^8.2.2",
-        "babel-plugin-macros": "^2.8.0",
-        "babel-plugin-polyfill-corejs3": "^0.1.0",
-        "case-sensitive-paths-webpack-plugin": "^2.3.0",
-        "core-js": "^3.8.2",
-        "css-loader": "^3.6.0",
-        "dotenv-webpack": "^1.8.0",
-        "file-loader": "^6.2.0",
-        "find-up": "^5.0.0",
-        "fork-ts-checker-webpack-plugin": "^4.1.6",
-        "fs-extra": "^9.0.1",
-        "glob": "^7.1.6",
-        "glob-promise": "^3.4.0",
-        "global": "^4.4.0",
-        "html-webpack-plugin": "^4.0.0",
-        "pnp-webpack-plugin": "1.6.4",
-        "postcss": "^7.0.36",
-        "postcss-flexbugs-fixes": "^4.2.1",
-        "postcss-loader": "^4.2.0",
-        "raw-loader": "^4.0.2",
-        "react-dev-utils": "^11.0.3",
-        "stable": "^0.1.8",
-        "style-loader": "^1.3.0",
-        "terser-webpack-plugin": "^4.2.3",
-        "ts-dedent": "^2.0.0",
-        "url-loader": "^4.1.1",
-        "util-deprecate": "^1.0.2",
-        "webpack": "4",
-        "webpack-dev-middleware": "^3.7.3",
-        "webpack-filter-warnings-plugin": "^1.2.1",
-        "webpack-hot-middleware": "^2.25.0",
-        "webpack-virtual-modules": "^0.2.2"
-      },
-      "dependencies": {
-        "babel-plugin-macros": {
-          "version": "2.8.0",
-          "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz",
-          "integrity": "sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==",
-          "dev": true,
-          "requires": {
-            "@babel/runtime": "^7.7.2",
-            "cosmiconfig": "^6.0.0",
-            "resolve": "^1.12.0"
-          }
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "cosmiconfig": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
-          "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
-          "dev": true,
-          "requires": {
-            "@types/parse-json": "^4.0.0",
-            "import-fresh": "^3.1.0",
-            "parse-json": "^5.0.0",
-            "path-type": "^4.0.0",
-            "yaml": "^1.7.2"
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fork-ts-checker-webpack-plugin": {
-          "version": "4.1.6",
-          "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-4.1.6.tgz",
-          "integrity": "sha512-DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.5.5",
-            "chalk": "^2.4.1",
-            "micromatch": "^3.1.10",
-            "minimatch": "^3.0.4",
-            "semver": "^5.6.0",
-            "tapable": "^1.0.0",
-            "worker-rpc": "^0.1.0"
-          }
-        },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
-        },
-        "to-regex-range": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-          "dev": true,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
-        }
-      }
-    },
-    "@storybook/channel-postmessage": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/channel-postmessage/-/channel-postmessage-6.3.12.tgz",
-      "integrity": "sha512-Ou/2Ga3JRTZ/4sSv7ikMgUgLTeZMsXXWLXuscz4oaYhmOqAU9CrJw0G1NitwBgK/+qC83lEFSLujHkWcoQDOKg==",
-      "dev": true,
-      "requires": {
-        "@storybook/channels": "6.3.12",
-        "@storybook/client-logger": "6.3.12",
-        "@storybook/core-events": "6.3.12",
-        "core-js": "^3.8.2",
-        "global": "^4.4.0",
-        "qs": "^6.10.0",
-        "telejson": "^5.3.2"
-      }
-    },
-    "@storybook/channels": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-6.3.12.tgz",
-      "integrity": "sha512-l4sA+g1PdUV8YCbgs47fIKREdEQAKNdQIZw0b7BfTvY9t0x5yfBywgQhYON/lIeiNGz2OlIuD+VUtqYfCtNSyw==",
-      "dev": true,
-      "requires": {
-        "core-js": "^3.8.2",
-        "ts-dedent": "^2.0.0",
-        "util-deprecate": "^1.0.2"
-      }
-    },
-    "@storybook/client-api": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/client-api/-/client-api-6.3.12.tgz",
-      "integrity": "sha512-xnW+lKKK2T774z+rOr9Wopt1aYTStfb86PSs9p3Fpnc2Btcftln+C3NtiHZl8Ccqft8Mz/chLGgewRui6tNI8g==",
-      "dev": true,
-      "requires": {
-        "@storybook/addons": "6.3.12",
-        "@storybook/channel-postmessage": "6.3.12",
-        "@storybook/channels": "6.3.12",
-        "@storybook/client-logger": "6.3.12",
-        "@storybook/core-events": "6.3.12",
-        "@storybook/csf": "0.0.1",
-        "@types/qs": "^6.9.5",
-        "@types/webpack-env": "^1.16.0",
-        "core-js": "^3.8.2",
-        "global": "^4.4.0",
-        "lodash": "^4.17.20",
-        "memoizerific": "^1.11.3",
-        "qs": "^6.10.0",
-        "regenerator-runtime": "^0.13.7",
-        "stable": "^0.1.8",
-        "store2": "^2.12.0",
-        "ts-dedent": "^2.0.0",
-        "util-deprecate": "^1.0.2"
-      }
-    },
-    "@storybook/client-logger": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-6.3.12.tgz",
-      "integrity": "sha512-zNDsamZvHnuqLznDdP9dUeGgQ9TyFh4ray3t1VGO7ZqWVZ2xtVCCXjDvMnOXI2ifMpX5UsrOvshIPeE9fMBmiQ==",
-      "dev": true,
-      "requires": {
-        "core-js": "^3.8.2",
-        "global": "^4.4.0"
-      }
-    },
-    "@storybook/components": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/components/-/components-6.3.12.tgz",
-      "integrity": "sha512-kdQt8toUjynYAxDLrJzuG7YSNL6as1wJoyzNUaCfG06YPhvIAlKo7le9tS2mThVFN5e9nbKrW3N1V1sp6ypZXQ==",
-      "dev": true,
-      "requires": {
-        "@popperjs/core": "^2.6.0",
-        "@storybook/client-logger": "6.3.12",
-        "@storybook/csf": "0.0.1",
-        "@storybook/theming": "6.3.12",
-        "@types/color-convert": "^2.0.0",
-        "@types/overlayscrollbars": "^1.12.0",
-        "@types/react-syntax-highlighter": "11.0.5",
-        "color-convert": "^2.0.1",
-        "core-js": "^3.8.2",
-        "fast-deep-equal": "^3.1.3",
-        "global": "^4.4.0",
-        "lodash": "^4.17.20",
-        "markdown-to-jsx": "^7.1.3",
-        "memoizerific": "^1.11.3",
-        "overlayscrollbars": "^1.13.1",
-        "polished": "^4.0.5",
-        "prop-types": "^15.7.2",
-        "react-colorful": "^5.1.2",
-        "react-popper-tooltip": "^3.1.1",
-        "react-syntax-highlighter": "^13.5.3",
-        "react-textarea-autosize": "^8.3.0",
-        "regenerator-runtime": "^0.13.7",
-        "ts-dedent": "^2.0.0",
-        "util-deprecate": "^1.0.2"
-      }
-    },
-    "@storybook/core": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/core/-/core-6.3.12.tgz",
-      "integrity": "sha512-FJm2ns8wk85hXWKslLWiUWRWwS9KWRq7jlkN6M9p57ghFseSGr4W71Orcoab4P3M7jI97l5yqBfppbscinE74g==",
-      "dev": true,
-      "requires": {
-        "@storybook/core-client": "6.3.12",
-        "@storybook/core-server": "6.3.12"
-      }
-    },
-    "@storybook/core-client": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/core-client/-/core-client-6.3.12.tgz",
-      "integrity": "sha512-8Smd9BgZHJpAdevLKQYinwtjSyCZAuBMoetP4P5hnn53mWl0NFbrHFaAdT+yNchDLZQUbf7Y18VmIqEH+RCR5w==",
-      "dev": true,
-      "requires": {
-        "@storybook/addons": "6.3.12",
-        "@storybook/channel-postmessage": "6.3.12",
-        "@storybook/client-api": "6.3.12",
-        "@storybook/client-logger": "6.3.12",
-        "@storybook/core-events": "6.3.12",
-        "@storybook/csf": "0.0.1",
-        "@storybook/ui": "6.3.12",
-        "airbnb-js-shims": "^2.2.1",
-        "ansi-to-html": "^0.6.11",
-        "core-js": "^3.8.2",
-        "global": "^4.4.0",
-        "lodash": "^4.17.20",
-        "qs": "^6.10.0",
-        "regenerator-runtime": "^0.13.7",
-        "ts-dedent": "^2.0.0",
-        "unfetch": "^4.2.0",
-        "util-deprecate": "^1.0.2"
-      }
-    },
-    "@storybook/core-common": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/core-common/-/core-common-6.3.12.tgz",
-      "integrity": "sha512-xlHs2QXELq/moB4MuXjYOczaxU64BIseHsnFBLyboJYN6Yso3qihW5RB7cuJlGohkjb4JwY74dvfT4Ww66rkBA==",
-      "dev": true,
-      "requires": {
-        "@babel/core": "^7.12.10",
-        "@babel/plugin-proposal-class-properties": "^7.12.1",
-        "@babel/plugin-proposal-decorators": "^7.12.12",
-        "@babel/plugin-proposal-export-default-from": "^7.12.1",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
-        "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
-        "@babel/plugin-proposal-optional-chaining": "^7.12.7",
-        "@babel/plugin-proposal-private-methods": "^7.12.1",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-transform-arrow-functions": "^7.12.1",
-        "@babel/plugin-transform-block-scoping": "^7.12.12",
-        "@babel/plugin-transform-classes": "^7.12.1",
-        "@babel/plugin-transform-destructuring": "^7.12.1",
-        "@babel/plugin-transform-for-of": "^7.12.1",
-        "@babel/plugin-transform-parameters": "^7.12.1",
-        "@babel/plugin-transform-shorthand-properties": "^7.12.1",
-        "@babel/plugin-transform-spread": "^7.12.1",
-        "@babel/preset-env": "^7.12.11",
-        "@babel/preset-react": "^7.12.10",
-        "@babel/preset-typescript": "^7.12.7",
-        "@babel/register": "^7.12.1",
-        "@storybook/node-logger": "6.3.12",
-        "@storybook/semver": "^7.3.2",
-        "@types/glob-base": "^0.3.0",
-        "@types/micromatch": "^4.0.1",
-        "@types/node": "^14.0.10",
-        "@types/pretty-hrtime": "^1.0.0",
-        "babel-loader": "^8.2.2",
-        "babel-plugin-macros": "^3.0.1",
-        "babel-plugin-polyfill-corejs3": "^0.1.0",
-        "chalk": "^4.1.0",
-        "core-js": "^3.8.2",
-        "express": "^4.17.1",
-        "file-system-cache": "^1.0.5",
-        "find-up": "^5.0.0",
-        "fork-ts-checker-webpack-plugin": "^6.0.4",
-        "glob": "^7.1.6",
-        "glob-base": "^0.3.0",
-        "interpret": "^2.2.0",
-        "json5": "^2.1.3",
-        "lazy-universal-dotenv": "^3.0.1",
-        "micromatch": "^4.0.2",
-        "pkg-dir": "^5.0.0",
-        "pretty-hrtime": "^1.0.3",
-        "resolve-from": "^5.0.0",
-        "ts-dedent": "^2.0.0",
-        "util-deprecate": "^1.0.2",
-        "webpack": "4"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "@storybook/core-events": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-6.3.12.tgz",
-      "integrity": "sha512-SXfD7xUUMazaeFkB92qOTUV8Y/RghE4SkEYe5slAdjeocSaH7Nz2WV0rqNEgChg0AQc+JUI66no8L9g0+lw4Gw==",
-      "dev": true,
-      "requires": {
-        "core-js": "^3.8.2"
-      }
-    },
-    "@storybook/core-server": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/core-server/-/core-server-6.3.12.tgz",
-      "integrity": "sha512-T/Mdyi1FVkUycdyOnhXvoo3d9nYXLQFkmaJkltxBFLzAePAJUSgAsPL9odNC3+p8Nr2/UDsDzvu/Ow0IF0mzLQ==",
-      "dev": true,
-      "requires": {
-        "@discoveryjs/json-ext": "^0.5.3",
-        "@storybook/builder-webpack4": "6.3.12",
-        "@storybook/core-client": "6.3.12",
-        "@storybook/core-common": "6.3.12",
-        "@storybook/csf-tools": "6.3.12",
-        "@storybook/manager-webpack4": "6.3.12",
-        "@storybook/node-logger": "6.3.12",
-        "@storybook/semver": "^7.3.2",
-        "@types/node": "^14.0.10",
-        "@types/node-fetch": "^2.5.7",
-        "@types/pretty-hrtime": "^1.0.0",
-        "@types/webpack": "^4.41.26",
-        "better-opn": "^2.1.1",
-        "boxen": "^4.2.0",
-        "chalk": "^4.1.0",
-        "cli-table3": "0.6.0",
-        "commander": "^6.2.1",
-        "compression": "^1.7.4",
-        "core-js": "^3.8.2",
-        "cpy": "^8.1.1",
-        "detect-port": "^1.3.0",
-        "express": "^4.17.1",
-        "file-system-cache": "^1.0.5",
-        "fs-extra": "^9.0.1",
-        "globby": "^11.0.2",
-        "ip": "^1.1.5",
-        "node-fetch": "^2.6.1",
-        "pretty-hrtime": "^1.0.3",
-        "prompts": "^2.4.0",
-        "regenerator-runtime": "^0.13.7",
-        "serve-favicon": "^2.5.0",
-        "ts-dedent": "^2.0.0",
-        "util-deprecate": "^1.0.2",
-        "webpack": "4"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "@storybook/csf": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/@storybook/csf/-/csf-0.0.1.tgz",
-      "integrity": "sha512-USTLkZze5gkel8MYCujSRBVIrUQ3YPBrLOx7GNk/0wttvVtlzWXAq9eLbQ4p/NicGxP+3T7KPEMVV//g+yubpw==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.15"
-      }
-    },
-    "@storybook/csf-tools": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/csf-tools/-/csf-tools-6.3.12.tgz",
-      "integrity": "sha512-wNrX+99ajAXxLo0iRwrqw65MLvCV6SFC0XoPLYrtBvyKr+hXOOnzIhO2f5BNEii8velpC2gl2gcLKeacpVYLqA==",
-      "dev": true,
-      "requires": {
-        "@babel/generator": "^7.12.11",
-        "@babel/parser": "^7.12.11",
-        "@babel/plugin-transform-react-jsx": "^7.12.12",
-        "@babel/preset-env": "^7.12.11",
-        "@babel/traverse": "^7.12.11",
-        "@babel/types": "^7.12.11",
-        "@mdx-js/mdx": "^1.6.22",
-        "@storybook/csf": "^0.0.1",
-        "core-js": "^3.8.2",
-        "fs-extra": "^9.0.1",
-        "js-string-escape": "^1.0.1",
-        "lodash": "^4.17.20",
-        "prettier": "~2.2.1",
-        "regenerator-runtime": "^0.13.7"
-      }
-    },
-    "@storybook/manager-webpack4": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/manager-webpack4/-/manager-webpack4-6.3.12.tgz",
-      "integrity": "sha512-OkPYNrHXg2yZfKmEfTokP6iKx4OLTr0gdI5yehi/bLEuQCSHeruxBc70Dxm1GBk1Mrf821wD9WqMXNDjY5Qtug==",
-      "dev": true,
-      "requires": {
-        "@babel/core": "^7.12.10",
-        "@babel/plugin-transform-template-literals": "^7.12.1",
-        "@babel/preset-react": "^7.12.10",
-        "@storybook/addons": "6.3.12",
-        "@storybook/core-client": "6.3.12",
-        "@storybook/core-common": "6.3.12",
-        "@storybook/node-logger": "6.3.12",
-        "@storybook/theming": "6.3.12",
-        "@storybook/ui": "6.3.12",
-        "@types/node": "^14.0.10",
-        "@types/webpack": "^4.41.26",
-        "babel-loader": "^8.2.2",
-        "case-sensitive-paths-webpack-plugin": "^2.3.0",
-        "chalk": "^4.1.0",
-        "core-js": "^3.8.2",
-        "css-loader": "^3.6.0",
-        "dotenv-webpack": "^1.8.0",
-        "express": "^4.17.1",
-        "file-loader": "^6.2.0",
-        "file-system-cache": "^1.0.5",
-        "find-up": "^5.0.0",
-        "fs-extra": "^9.0.1",
-        "html-webpack-plugin": "^4.0.0",
-        "node-fetch": "^2.6.1",
-        "pnp-webpack-plugin": "1.6.4",
-        "read-pkg-up": "^7.0.1",
-        "regenerator-runtime": "^0.13.7",
-        "resolve-from": "^5.0.0",
-        "style-loader": "^1.3.0",
-        "telejson": "^5.3.2",
-        "terser-webpack-plugin": "^4.2.3",
-        "ts-dedent": "^2.0.0",
-        "url-loader": "^4.1.1",
-        "util-deprecate": "^1.0.2",
-        "webpack": "4",
-        "webpack-dev-middleware": "^3.7.3",
-        "webpack-virtual-modules": "^0.2.2"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "@storybook/node-logger": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/node-logger/-/node-logger-6.3.12.tgz",
-      "integrity": "sha512-iktOem/Ls2+dsZY9PhPeC6T1QhX/y7OInP88neLsqEPEbB2UXca3Ydv7OZBhBVbvN25W45b05MRzbtNUxYLNRw==",
-      "dev": true,
-      "requires": {
-        "@types/npmlog": "^4.1.2",
-        "chalk": "^4.1.0",
-        "core-js": "^3.8.2",
-        "npmlog": "^4.1.2",
-        "pretty-hrtime": "^1.0.3"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "@storybook/preact": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/preact/-/preact-6.3.12.tgz",
-      "integrity": "sha512-okP4Y1Zf26AdjK/5sFJGoF1Ce2WPK/3w+x0WgMdEOs7K7/pnKNQ1Ck8KLXmPyjTN+6bVoIMP8NcS8ZqHJu25lw==",
-      "dev": true,
-      "requires": {
-        "@babel/plugin-transform-react-jsx": "^7.12.12",
-        "@storybook/addons": "6.3.12",
-        "@storybook/core": "6.3.12",
-        "@storybook/core-common": "6.3.12",
-        "@types/webpack-env": "^1.16.0",
-        "core-js": "^3.8.2",
-        "global": "^4.4.0",
-        "react": "16.14.0",
-        "react-dom": "16.14.0",
-        "read-pkg-up": "^7.0.1",
-        "regenerator-runtime": "^0.13.7",
-        "ts-dedent": "^2.0.0"
-      }
-    },
-    "@storybook/router": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/router/-/router-6.3.12.tgz",
-      "integrity": "sha512-G/pNGCnrJRetCwyEZulHPT+YOcqEj/vkPVDTUfii2qgqukup6K0cjwgd7IukAURnAnnzTi1gmgFuEKUi8GE/KA==",
-      "dev": true,
-      "requires": {
-        "@reach/router": "^1.3.4",
-        "@storybook/client-logger": "6.3.12",
-        "@types/reach__router": "^1.3.7",
-        "core-js": "^3.8.2",
-        "fast-deep-equal": "^3.1.3",
-        "global": "^4.4.0",
-        "lodash": "^4.17.20",
-        "memoizerific": "^1.11.3",
-        "qs": "^6.10.0",
-        "ts-dedent": "^2.0.0"
-      }
-    },
-    "@storybook/semver": {
-      "version": "7.3.2",
-      "resolved": "https://registry.npmjs.org/@storybook/semver/-/semver-7.3.2.tgz",
-      "integrity": "sha512-SWeszlsiPsMI0Ps0jVNtH64cI5c0UF3f7KgjVKJoNP30crQ6wUSddY2hsdeczZXEKVJGEn50Q60flcGsQGIcrg==",
-      "dev": true,
-      "requires": {
-        "core-js": "^3.6.5",
-        "find-up": "^4.1.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^4.1.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.2.0"
-          }
-        }
-      }
-    },
-    "@storybook/theming": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-6.3.12.tgz",
-      "integrity": "sha512-wOJdTEa/VFyFB2UyoqyYGaZdym6EN7RALuQOAMT6zHA282FBmKw8nL5DETHEbctpnHdcrMC/391teK4nNSrdOA==",
-      "dev": true,
-      "requires": {
-        "@emotion/core": "^10.1.1",
-        "@emotion/is-prop-valid": "^0.8.6",
-        "@emotion/styled": "^10.0.27",
-        "@storybook/client-logger": "6.3.12",
-        "core-js": "^3.8.2",
-        "deep-object-diff": "^1.1.0",
-        "emotion-theming": "^10.0.27",
-        "global": "^4.4.0",
-        "memoizerific": "^1.11.3",
-        "polished": "^4.0.5",
-        "resolve-from": "^5.0.0",
-        "ts-dedent": "^2.0.0"
-      }
-    },
-    "@storybook/ui": {
-      "version": "6.3.12",
-      "resolved": "https://registry.npmjs.org/@storybook/ui/-/ui-6.3.12.tgz",
-      "integrity": "sha512-PC2yEz4JMfarq7rUFbeA3hCA+31p5es7YPEtxLRvRwIZhtL0P4zQUfHpotb3KgWdoAIfZesAuoIQwMPQmEFYrw==",
-      "dev": true,
-      "requires": {
-        "@emotion/core": "^10.1.1",
-        "@storybook/addons": "6.3.12",
-        "@storybook/api": "6.3.12",
-        "@storybook/channels": "6.3.12",
-        "@storybook/client-logger": "6.3.12",
-        "@storybook/components": "6.3.12",
-        "@storybook/core-events": "6.3.12",
-        "@storybook/router": "6.3.12",
-        "@storybook/semver": "^7.3.2",
-        "@storybook/theming": "6.3.12",
-        "@types/markdown-to-jsx": "^6.11.3",
-        "copy-to-clipboard": "^3.3.1",
-        "core-js": "^3.8.2",
-        "core-js-pure": "^3.8.2",
-        "downshift": "^6.0.15",
-        "emotion-theming": "^10.0.27",
-        "fuse.js": "^3.6.1",
-        "global": "^4.4.0",
-        "lodash": "^4.17.20",
-        "markdown-to-jsx": "^6.11.4",
-        "memoizerific": "^1.11.3",
-        "polished": "^4.0.5",
-        "qs": "^6.10.0",
-        "react-draggable": "^4.4.3",
-        "react-helmet-async": "^1.0.7",
-        "react-sizeme": "^3.0.1",
-        "regenerator-runtime": "^0.13.7",
-        "resolve-from": "^5.0.0",
-        "store2": "^2.12.0"
-      },
-      "dependencies": {
-        "markdown-to-jsx": {
-          "version": "6.11.4",
-          "resolved": "https://registry.npmjs.org/markdown-to-jsx/-/markdown-to-jsx-6.11.4.tgz",
-          "integrity": "sha512-3lRCD5Sh+tfA52iGgfs/XZiw33f7fFX9Bn55aNnVNUd2GzLDkOWyKYYD8Yju2B1Vn+feiEdgJs8T6Tg0xNokPw==",
-          "dev": true,
-          "requires": {
-            "prop-types": "^15.6.2",
-            "unquote": "^1.1.0"
-          }
-        }
-      }
-    },
-    "@types/braces": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/braces/-/braces-3.0.1.tgz",
-      "integrity": "sha512-+euflG6ygo4bn0JHtn4pYqcXwRtLvElQ7/nnjDu7iYG56H0+OhCd7d6Ug0IE3WcFpZozBKW2+80FUbv5QGk5AQ==",
-      "dev": true
-    },
-    "@types/color-convert": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@types/color-convert/-/color-convert-2.0.0.tgz",
-      "integrity": "sha512-m7GG7IKKGuJUXvkZ1qqG3ChccdIM/qBBo913z+Xft0nKCX4hAU/IxKwZBU4cpRZ7GS5kV4vOblUkILtSShCPXQ==",
-      "dev": true,
-      "requires": {
-        "@types/color-name": "*"
-      }
-    },
-    "@types/color-name": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
-      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
-      "dev": true
-    },
-    "@types/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
-      "dev": true,
-      "requires": {
-        "@types/minimatch": "*",
-        "@types/node": "*"
-      }
-    },
-    "@types/glob-base": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@types/glob-base/-/glob-base-0.3.0.tgz",
-      "integrity": "sha1-pYHWiDR+EOUN18F9byiAoQNUMZ0=",
-      "dev": true
-    },
-    "@types/hast": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.4.tgz",
-      "integrity": "sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g==",
-      "dev": true,
-      "requires": {
-        "@types/unist": "*"
-      }
-    },
-    "@types/html-minifier-terser": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz",
-      "integrity": "sha512-h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w==",
-      "dev": true
-    },
-    "@types/is-function": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@types/is-function/-/is-function-1.0.1.tgz",
-      "integrity": "sha512-A79HEEiwXTFtfY+Bcbo58M2GRYzCr9itHWzbzHVFNEYCcoU/MMGwYYf721gBrnhpj1s6RGVVha/IgNFnR0Iw/Q==",
-      "dev": true
-    },
-    "@types/json-schema": {
-      "version": "7.0.9",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
-      "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
-      "dev": true
-    },
-    "@types/markdown-to-jsx": {
-      "version": "6.11.3",
-      "resolved": "https://registry.npmjs.org/@types/markdown-to-jsx/-/markdown-to-jsx-6.11.3.tgz",
-      "integrity": "sha512-30nFYpceM/ZEvhGiqWjm5quLUxNeld0HCzJEXMZZDpq53FPkS85mTwkWtCXzCqq8s5JYLgM5W392a02xn8Bdaw==",
-      "dev": true,
-      "requires": {
-        "@types/react": "*"
-      }
-    },
-    "@types/mdast": {
-      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.10.tgz",
-      "integrity": "sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==",
-      "dev": true,
-      "requires": {
-        "@types/unist": "*"
-      }
-    },
-    "@types/micromatch": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@types/micromatch/-/micromatch-4.0.2.tgz",
-      "integrity": "sha512-oqXqVb0ci19GtH0vOA/U2TmHTcRY9kuZl4mqUxe0QmJAlIW13kzhuK5pi1i9+ngav8FjpSb9FVS/GE00GLX1VA==",
-      "dev": true,
-      "requires": {
-        "@types/braces": "*"
-      }
-    },
-    "@types/minimatch": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
-      "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
-      "dev": true
-    },
-    "@types/node": {
-      "version": "14.17.32",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.32.tgz",
-      "integrity": "sha512-JcII3D5/OapPGx+eJ+Ik1SQGyt6WvuqdRfh9jUwL6/iHGjmyOriBDciBUu7lEIBTL2ijxwrR70WUnw5AEDmFvQ==",
-      "dev": true
-    },
-    "@types/node-fetch": {
-      "version": "2.5.12",
-      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.12.tgz",
-      "integrity": "sha512-MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*",
-        "form-data": "^3.0.0"
-      }
-    },
-    "@types/normalize-package-data": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
-      "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
-      "dev": true
-    },
-    "@types/npmlog": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@types/npmlog/-/npmlog-4.1.3.tgz",
-      "integrity": "sha512-1TcL7YDYCtnHmLhTWbum+IIwLlvpaHoEKS2KNIngEwLzwgDeHaebaEHHbQp8IqzNQ9IYiboLKUjAf7MZqG63+w==",
-      "dev": true
-    },
-    "@types/overlayscrollbars": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@types/overlayscrollbars/-/overlayscrollbars-1.12.1.tgz",
-      "integrity": "sha512-V25YHbSoKQN35UasHf0EKD9U2vcmexRSp78qa8UglxFH8H3D+adEa9zGZwrqpH4TdvqeMrgMqVqsLB4woAryrQ==",
-      "dev": true
-    },
-    "@types/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
-      "dev": true
-    },
-    "@types/parse5": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/@types/parse5/-/parse5-5.0.3.tgz",
-      "integrity": "sha512-kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw==",
-      "dev": true
-    },
-    "@types/pretty-hrtime": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@types/pretty-hrtime/-/pretty-hrtime-1.0.1.tgz",
-      "integrity": "sha512-VjID5MJb1eGKthz2qUerWT8+R4b9N+CHvGCzg9fn4kWZgaF9AhdYikQio3R7wV8YY1NsQKPaCwKz1Yff+aHNUQ==",
-      "dev": true
-    },
-    "@types/prop-types": {
-      "version": "15.7.4",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.4.tgz",
-      "integrity": "sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==",
-      "dev": true
-    },
-    "@types/qs": {
-      "version": "6.9.7",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
-      "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
-      "dev": true
-    },
-    "@types/reach__router": {
-      "version": "1.3.9",
-      "resolved": "https://registry.npmjs.org/@types/reach__router/-/reach__router-1.3.9.tgz",
-      "integrity": "sha512-N6rqQqTTAV/zKLfK3iq9Ww3wqCEhTZvsilhl0zI09zETdVq1QGmJH6+/xnj8AFUWIrle2Cqo+PGM/Ltr1vBb9w==",
-      "dev": true,
-      "requires": {
-        "@types/react": "*"
-      }
-    },
-    "@types/react": {
-      "version": "17.0.33",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.33.tgz",
-      "integrity": "sha512-pLWntxXpDPaU+RTAuSGWGSEL2FRTNyRQOjSWDke/rxRg14ncsZvx8AKWMWZqvc1UOaJIAoObdZhAWvRaHFi5rw==",
-      "dev": true,
-      "requires": {
-        "@types/prop-types": "*",
-        "@types/scheduler": "*",
-        "csstype": "^3.0.2"
-      },
-      "dependencies": {
-        "csstype": {
-          "version": "3.0.9",
-          "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.9.tgz",
-          "integrity": "sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw==",
-          "dev": true
-        }
-      }
-    },
-    "@types/react-syntax-highlighter": {
-      "version": "11.0.5",
-      "resolved": "https://registry.npmjs.org/@types/react-syntax-highlighter/-/react-syntax-highlighter-11.0.5.tgz",
-      "integrity": "sha512-VIOi9i2Oj5XsmWWoB72p3KlZoEbdRAcechJa8Ztebw7bDl2YmR+odxIqhtJGp1q2EozHs02US+gzxJ9nuf56qg==",
-      "dev": true,
-      "requires": {
-        "@types/react": "*"
-      }
-    },
-    "@types/scheduler": {
-      "version": "0.16.2",
-      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
-      "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==",
-      "dev": true
-    },
-    "@types/source-list-map": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
-      "integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==",
-      "dev": true
-    },
-    "@types/tapable": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.8.tgz",
-      "integrity": "sha512-ipixuVrh2OdNmauvtT51o3d8z12p6LtFW9in7U79der/kwejjdNchQC5UMn5u/KxNoM7VHHOs/l8KS8uHxhODQ==",
-      "dev": true
-    },
-    "@types/uglify-js": {
-      "version": "3.13.1",
-      "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.13.1.tgz",
-      "integrity": "sha512-O3MmRAk6ZuAKa9CHgg0Pr0+lUOqoMLpc9AS4R8ano2auvsg7IE8syF3Xh/NPr26TWklxYcqoEEFdzLLs1fV9PQ==",
-      "dev": true,
-      "requires": {
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "@types/unist": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz",
-      "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==",
-      "dev": true
-    },
-    "@types/webpack": {
-      "version": "4.41.31",
-      "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.31.tgz",
-      "integrity": "sha512-/i0J7sepXFIp1ZT7FjUGi1eXMCg8HCCzLJEQkKsOtbJFontsJLolBcDC+3qxn5pPwiCt1G0ZdRmYRzNBtvpuGQ==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*",
-        "@types/tapable": "^1",
-        "@types/uglify-js": "*",
-        "@types/webpack-sources": "*",
-        "anymatch": "^3.0.0",
-        "source-map": "^0.6.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "@types/webpack-env": {
-      "version": "1.16.3",
-      "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.16.3.tgz",
-      "integrity": "sha512-9gtOPPkfyNoEqCQgx4qJKkuNm/x0R2hKR7fdl7zvTJyHnIisuE/LfvXOsYWL0o3qq6uiBnKZNNNzi3l0y/X+xw==",
-      "dev": true
-    },
-    "@types/webpack-sources": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-3.2.0.tgz",
-      "integrity": "sha512-Ft7YH3lEVRQ6ls8k4Ff1oB4jN6oy/XmU6tQISKdhfh+1mR+viZFphS6WL0IrtDOzvefmJg5a0s7ZQoRXwqTEFg==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*",
-        "@types/source-list-map": "*",
-        "source-map": "^0.7.3"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-          "dev": true
-        }
-      }
-    },
-    "@webassemblyjs/ast": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",
-      "integrity": "sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==",
-      "dev": 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",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz",
-      "integrity": "sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-api-error": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz",
-      "integrity": "sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-buffer": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz",
-      "integrity": "sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-code-frame": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz",
-      "integrity": "sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/wast-printer": "1.9.0"
-      }
-    },
-    "@webassemblyjs/helper-fsm": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz",
-      "integrity": "sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-module-context": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz",
-      "integrity": "sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.9.0"
-      }
-    },
-    "@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz",
-      "integrity": "sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-wasm-section": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz",
-      "integrity": "sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==",
-      "dev": 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",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz",
-      "integrity": "sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==",
-      "dev": true,
-      "requires": {
-        "@xtuc/ieee754": "^1.2.0"
-      }
-    },
-    "@webassemblyjs/leb128": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz",
-      "integrity": "sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==",
-      "dev": true,
-      "requires": {
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "@webassemblyjs/utf8": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz",
-      "integrity": "sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==",
-      "dev": true
-    },
-    "@webassemblyjs/wasm-edit": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz",
-      "integrity": "sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==",
-      "dev": 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",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz",
-      "integrity": "sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==",
-      "dev": 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",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz",
-      "integrity": "sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==",
-      "dev": 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",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz",
-      "integrity": "sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==",
-      "dev": 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",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz",
-      "integrity": "sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==",
-      "dev": 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",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz",
-      "integrity": "sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/wast-parser": "1.9.0",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "@xtuc/ieee754": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "dev": true
-    },
-    "@xtuc/long": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "dev": true
-    },
-    "accepts": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
-      "dev": true,
-      "requires": {
-        "mime-types": "~2.1.24",
-        "negotiator": "0.6.2"
-      }
-    },
-    "acorn": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
-      "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
-      "dev": true
-    },
-    "address": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/address/-/address-1.1.2.tgz",
-      "integrity": "sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA==",
-      "dev": true
-    },
-    "aggregate-error": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-      "dev": true,
-      "requires": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
-      }
-    },
-    "airbnb-js-shims": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/airbnb-js-shims/-/airbnb-js-shims-2.2.1.tgz",
-      "integrity": "sha512-wJNXPH66U2xjgo1Zwyjf9EydvJ2Si94+vSdk6EERcBfB2VZkeltpqIats0cqIZMLCXP3zcyaUKGYQeIBT6XjsQ==",
-      "dev": true,
-      "requires": {
-        "array-includes": "^3.0.3",
-        "array.prototype.flat": "^1.2.1",
-        "array.prototype.flatmap": "^1.2.1",
-        "es5-shim": "^4.5.13",
-        "es6-shim": "^0.35.5",
-        "function.prototype.name": "^1.1.0",
-        "globalthis": "^1.0.0",
-        "object.entries": "^1.1.0",
-        "object.fromentries": "^2.0.0 || ^1.0.0",
-        "object.getownpropertydescriptors": "^2.0.3",
-        "object.values": "^1.1.0",
-        "promise.allsettled": "^1.0.0",
-        "promise.prototype.finally": "^3.1.0",
-        "string.prototype.matchall": "^4.0.0 || ^3.0.1",
-        "string.prototype.padend": "^3.0.0",
-        "string.prototype.padstart": "^3.0.0",
-        "symbol.prototype.description": "^1.0.0"
-      }
-    },
-    "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": {
-        "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-errors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
-      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
-      "dev": true,
-      "requires": {}
-    },
-    "ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "requires": {}
-    },
-    "ansi-align": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz",
-      "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==",
-      "dev": true,
-      "requires": {
-        "string-width": "^4.1.0"
-      }
-    },
-    "ansi-colors": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
-      "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
-      "dev": true
-    },
-    "ansi-html-community": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
-      "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
-      "dev": true
-    },
-    "ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true
-    },
-    "ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "requires": {
-        "color-convert": "^1.9.0"
-      },
-      "dependencies": {
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "dev": true,
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-          "dev": true
-        }
-      }
-    },
-    "ansi-to-html": {
-      "version": "0.6.15",
-      "resolved": "https://registry.npmjs.org/ansi-to-html/-/ansi-to-html-0.6.15.tgz",
-      "integrity": "sha512-28ijx2aHJGdzbs+O5SNQF65r6rrKYnkuwTYm8lZlChuoJ9P1vVzIpWO20sQTqTPDXYp6NFwk326vApTtLVFXpQ==",
-      "dev": true,
-      "requires": {
-        "entities": "^2.0.0"
-      }
-    },
-    "anymatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-      "dev": true,
-      "requires": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      }
-    },
-    "app-root-dir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/app-root-dir/-/app-root-dir-1.0.2.tgz",
-      "integrity": "sha1-OBh+wt6nV3//Az/8sSFyaS/24Rg=",
-      "dev": true
-    },
-    "aproba": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-      "dev": true
-    },
-    "are-we-there-yet": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz",
-      "integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==",
-      "dev": true,
-      "requires": {
-        "delegates": "^1.0.0",
-        "readable-stream": "^2.0.6"
-      }
-    },
-    "arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-      "dev": true
-    },
-    "arr-flatten": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-      "dev": true
-    },
-    "arr-union": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-      "dev": true
-    },
-    "array-flatten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
-      "dev": true
-    },
-    "array-includes": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.4.tgz",
-      "integrity": "sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1",
-        "get-intrinsic": "^1.1.1",
-        "is-string": "^1.0.7"
-      }
-    },
-    "array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true
-    },
-    "array-uniq": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-      "dev": true
-    },
-    "array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-      "dev": true
-    },
-    "array.prototype.flat": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz",
-      "integrity": "sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0"
-      }
-    },
-    "array.prototype.flatmap": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.2.5.tgz",
-      "integrity": "sha512-08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0"
-      }
-    },
-    "array.prototype.map": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/array.prototype.map/-/array.prototype.map-1.0.4.tgz",
-      "integrity": "sha512-Qds9QnX7A0qISY7JT5WuJO0NJPE9CMlC6JzHQfhpqAAQQzufVRoeH7EzUY5GcPTx72voG8LV/5eo+b8Qi8hmhA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "es-array-method-boxes-properly": "^1.0.0",
-        "is-string": "^1.0.7"
-      }
-    },
-    "arrify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
-      "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
-      "dev": true
-    },
-    "asn1.js": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
-      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
-      "dev": 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",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-          "dev": true
-        }
-      }
-    },
-    "assert": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
-      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
-      "dev": true,
-      "requires": {
-        "object-assign": "^4.1.1",
-        "util": "0.10.3"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
-          "dev": true
-        },
-        "util": {
-          "version": "0.10.3",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
-          "dev": true,
-          "requires": {
-            "inherits": "2.0.1"
-          }
-        }
-      }
-    },
-    "assign-symbols": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
-      "dev": true
-    },
-    "async-each": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
-      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
-      "dev": true,
-      "optional": true
-    },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-      "dev": true
-    },
-    "at-least-node": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
-      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
-      "dev": true
-    },
-    "atob": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "dev": true
-    },
-    "autoprefixer": {
-      "version": "9.8.8",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.8.tgz",
-      "integrity": "sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.12.0",
-        "caniuse-lite": "^1.0.30001109",
-        "normalize-range": "^0.1.2",
-        "num2fraction": "^1.2.2",
-        "picocolors": "^0.2.1",
-        "postcss": "^7.0.32",
-        "postcss-value-parser": "^4.1.0"
-      }
-    },
-    "axe-core": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.3.4.tgz",
-      "integrity": "sha512-4Hk6iSA/H90rtiPoCpSkeJxNWCPBf7szwVvaUqrPdxo0j2Y04suHK9jPKXaE3WI7OET6wBSwsWw7FDc1DBq7iQ==",
-      "dev": true
-    },
-    "babel-loader": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.3.tgz",
-      "integrity": "sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw==",
-      "dev": true,
-      "requires": {
-        "find-cache-dir": "^3.3.1",
-        "loader-utils": "^1.4.0",
-        "make-dir": "^3.1.0",
-        "schema-utils": "^2.6.5"
-      },
-      "dependencies": {
-        "find-cache-dir": {
-          "version": "3.3.2",
-          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
-          "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
-          "dev": true,
-          "requires": {
-            "commondir": "^1.0.1",
-            "make-dir": "^3.0.2",
-            "pkg-dir": "^4.1.0"
-          }
-        },
-        "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^4.1.0"
-          }
-        },
-        "make-dir": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-          "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-          "dev": true,
-          "requires": {
-            "semver": "^6.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.2.0"
-          }
-        },
-        "pkg-dir": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-          "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-          "dev": true,
-          "requires": {
-            "find-up": "^4.0.0"
-          }
-        }
-      }
-    },
-    "babel-plugin-apply-mdx-type-prop": {
-      "version": "1.6.22",
-      "resolved": "https://registry.npmjs.org/babel-plugin-apply-mdx-type-prop/-/babel-plugin-apply-mdx-type-prop-1.6.22.tgz",
-      "integrity": "sha512-VefL+8o+F/DfK24lPZMtJctrCVOfgbqLAGZSkxwhazQv4VxPg3Za/i40fu22KR2m8eEda+IfSOlPLUSIiLcnCQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "7.10.4",
-        "@mdx-js/util": "1.6.22"
-      },
-      "dependencies": {
-        "@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
-        }
-      }
-    },
-    "babel-plugin-dynamic-import-node": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
-      "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
-      "dev": true,
-      "requires": {
-        "object.assign": "^4.1.0"
-      }
-    },
-    "babel-plugin-emotion": {
-      "version": "10.2.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-emotion/-/babel-plugin-emotion-10.2.2.tgz",
-      "integrity": "sha512-SMSkGoqTbTyUTDeuVuPIWifPdUGkTk1Kf9BWRiXIOIcuyMfsdp2EjeiiFvOzX8NOBvEh/ypKYvUh2rkgAJMCLA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-imports": "^7.0.0",
-        "@emotion/hash": "0.8.0",
-        "@emotion/memoize": "0.7.4",
-        "@emotion/serialize": "^0.11.16",
-        "babel-plugin-macros": "^2.0.0",
-        "babel-plugin-syntax-jsx": "^6.18.0",
-        "convert-source-map": "^1.5.0",
-        "escape-string-regexp": "^1.0.5",
-        "find-root": "^1.1.0",
-        "source-map": "^0.5.7"
-      },
-      "dependencies": {
-        "babel-plugin-macros": {
-          "version": "2.8.0",
-          "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz",
-          "integrity": "sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==",
-          "dev": true,
-          "requires": {
-            "@babel/runtime": "^7.7.2",
-            "cosmiconfig": "^6.0.0",
-            "resolve": "^1.12.0"
-          }
-        },
-        "cosmiconfig": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
-          "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
-          "dev": true,
-          "requires": {
-            "@types/parse-json": "^4.0.0",
-            "import-fresh": "^3.1.0",
-            "parse-json": "^5.0.0",
-            "path-type": "^4.0.0",
-            "yaml": "^1.7.2"
-          }
-        }
-      }
-    },
-    "babel-plugin-extract-import-names": {
-      "version": "1.6.22",
-      "resolved": "https://registry.npmjs.org/babel-plugin-extract-import-names/-/babel-plugin-extract-import-names-1.6.22.tgz",
-      "integrity": "sha512-yJ9BsJaISua7d8zNT7oRG1ZLBJCIdZ4PZqmH8qa9N5AK01ifk3fnkc98AXhtzE7UkfCsEumvoQWgoYLhOnJ7jQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "7.10.4"
-      },
-      "dependencies": {
-        "@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
-        }
-      }
-    },
-    "babel-plugin-macros": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
-      "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.12.5",
-        "cosmiconfig": "^7.0.0",
-        "resolve": "^1.19.0"
-      }
-    },
-    "babel-plugin-polyfill-corejs2": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz",
-      "integrity": "sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.13.11",
-        "@babel/helper-define-polyfill-provider": "^0.2.2",
-        "semver": "^6.1.1"
-      }
-    },
-    "babel-plugin-polyfill-corejs3": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.1.7.tgz",
-      "integrity": "sha512-u+gbS9bbPhZWEeyy1oR/YaaSpod/KDT07arZHb80aTpl8H5ZBq+uN1nN9/xtX7jQyfLdPfoqI4Rue/MQSWJquw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.1.5",
-        "core-js-compat": "^3.8.1"
-      },
-      "dependencies": {
-        "@babel/helper-define-polyfill-provider": {
-          "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.5.tgz",
-          "integrity": "sha512-nXuzCSwlJ/WKr8qxzW816gwyT6VZgiJG17zR40fou70yfAcqjoNyTLl/DQ+FExw5Hx5KNqshmN8Ldl/r2N7cTg==",
-          "dev": true,
-          "requires": {
-            "@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-plugin-polyfill-regenerator": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz",
-      "integrity": "sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.2.2"
-      }
-    },
-    "babel-plugin-syntax-jsx": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
-      "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=",
-      "dev": true
-    },
-    "bail": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz",
-      "integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==",
-      "dev": true
-    },
-    "balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
-    },
-    "base": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-      "dev": true,
-      "requires": {
-        "cache-base": "^1.0.1",
-        "class-utils": "^0.3.5",
-        "component-emitter": "^1.2.1",
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.1",
-        "mixin-deep": "^1.2.0",
-        "pascalcase": "^0.1.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        }
-      }
-    },
-    "base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "dev": true
-    },
-    "batch-processor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
-      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg=",
-      "dev": true
-    },
-    "better-opn": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/better-opn/-/better-opn-2.1.1.tgz",
-      "integrity": "sha512-kIPXZS5qwyKiX/HcRvDYfmBQUa8XP17I0mYZZ0y4UhpYOSvtsLHDYqmomS+Mj20aDvD3knEiQ0ecQy2nhio3yA==",
-      "dev": true,
-      "requires": {
-        "open": "^7.0.3"
-      }
-    },
-    "big.js": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-      "dev": true
-    },
-    "binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-      "dev": true
-    },
-    "bluebird": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-      "dev": true
-    },
-    "bn.js": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
-      "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==",
-      "dev": true
-    },
-    "body-parser": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
-      "dev": true,
-      "requires": {
-        "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"
-      },
-      "dependencies": {
-        "bytes": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-          "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
-          "dev": true
-        },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        },
-        "qs": {
-          "version": "6.7.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
-          "dev": true
-        }
-      }
-    },
-    "boolbase": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
-      "dev": true
-    },
-    "boxen": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz",
-      "integrity": "sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==",
-      "dev": true,
-      "requires": {
-        "ansi-align": "^3.0.0",
-        "camelcase": "^5.3.1",
-        "chalk": "^3.0.0",
-        "cli-boxes": "^2.2.0",
-        "string-width": "^4.1.0",
-        "term-size": "^2.1.0",
-        "type-fest": "^0.8.1",
-        "widest-line": "^3.1.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
-      "requires": {
-        "fill-range": "^7.0.1"
-      }
-    },
-    "brorand": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
-      "dev": true
-    },
-    "browserify-aes": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-      "dev": true,
-      "requires": {
-        "buffer-xor": "^1.0.3",
-        "cipher-base": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.3",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "browserify-cipher": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
-      "dev": true,
-      "requires": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
-      }
-    },
-    "browserify-des": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
-      "dev": true,
-      "requires": {
-        "cipher-base": "^1.0.1",
-        "des.js": "^1.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "browserify-rsa": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
-      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^5.0.0",
-        "randombytes": "^2.0.1"
-      }
-    },
-    "browserify-sign": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
-      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
-      "dev": 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": {
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-          "dev": true
-        }
-      }
-    },
-    "browserify-zlib": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
-      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
-      "dev": true,
-      "requires": {
-        "pako": "~1.0.5"
-      }
-    },
-    "browserslist": {
-      "version": "4.17.5",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.5.tgz",
-      "integrity": "sha512-I3ekeB92mmpctWBoLXe0d5wPS2cBuRvvW0JyyJHMrk9/HmP2ZjrTboNAZ8iuGqaEIlKguljbQY32OkOJIRrgoA==",
-      "dev": true,
-      "requires": {
-        "caniuse-lite": "^1.0.30001271",
-        "electron-to-chromium": "^1.3.878",
-        "escalade": "^3.1.1",
-        "node-releases": "^2.0.1",
-        "picocolors": "^1.0.0"
-      },
-      "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
-        }
-      }
-    },
-    "buffer": {
-      "version": "4.9.2",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
-      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
-      "dev": true,
-      "requires": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        }
-      }
-    },
-    "buffer-from": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true
-    },
-    "buffer-xor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
-      "dev": true
-    },
-    "builtin-status-codes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
-      "dev": true
-    },
-    "bytes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
-      "dev": true
-    },
-    "cacache": {
-      "version": "15.3.0",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz",
-      "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==",
-      "dev": true,
-      "requires": {
-        "@npmcli/fs": "^1.0.0",
-        "@npmcli/move-file": "^1.0.1",
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "glob": "^7.1.4",
-        "infer-owner": "^1.0.4",
-        "lru-cache": "^6.0.0",
-        "minipass": "^3.1.1",
-        "minipass-collect": "^1.0.2",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.2",
-        "mkdirp": "^1.0.3",
-        "p-map": "^4.0.0",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^3.0.2",
-        "ssri": "^8.0.1",
-        "tar": "^6.0.2",
-        "unique-filename": "^1.1.1"
-      },
-      "dependencies": {
-        "p-map": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-          "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
-          "dev": true,
-          "requires": {
-            "aggregate-error": "^3.0.0"
-          }
-        }
-      }
-    },
-    "cache-base": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
-      "dev": true,
-      "requires": {
-        "collection-visit": "^1.0.0",
-        "component-emitter": "^1.2.1",
-        "get-value": "^2.0.6",
-        "has-value": "^1.0.0",
-        "isobject": "^3.0.1",
-        "set-value": "^2.0.0",
-        "to-object-path": "^0.3.0",
-        "union-value": "^1.0.0",
-        "unset-value": "^1.0.0"
-      },
-      "dependencies": {
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        }
-      }
-    },
-    "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": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
-      }
-    },
-    "call-me-maybe": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
-      "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=",
-      "dev": true
-    },
-    "callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true
-    },
-    "camel-case": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
-      "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
-      "dev": true,
-      "requires": {
-        "pascal-case": "^3.1.2",
-        "tslib": "^2.0.3"
-      }
-    },
-    "camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true
-    },
-    "camelcase-css": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz",
-      "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==",
-      "dev": true
-    },
-    "caniuse-lite": {
-      "version": "1.0.30001271",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001271.tgz",
-      "integrity": "sha512-BBruZFWmt3HFdVPS8kceTBIguKxu4f99n5JNp06OlPD/luoAMIaIK5ieV5YjnBLH3Nysai9sxj9rpJj4ZisXOA==",
-      "dev": true
-    },
-    "case-sensitive-paths-webpack-plugin": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz",
-      "integrity": "sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw==",
-      "dev": true
-    },
-    "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": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      }
-    },
-    "character-entities": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz",
-      "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==",
-      "dev": true
-    },
-    "character-entities-legacy": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz",
-      "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==",
-      "dev": true
-    },
-    "character-reference-invalid": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz",
-      "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==",
-      "dev": true
-    },
-    "chokidar": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
-      "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
-      "dev": true,
-      "requires": {
-        "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"
-      }
-    },
-    "chownr": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
-      "dev": true
-    },
-    "chrome-trace-event": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
-      "dev": true
-    },
-    "cipher-base": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "class-utils": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
-      "dev": true,
-      "requires": {
-        "arr-union": "^3.1.0",
-        "define-property": "^0.2.5",
-        "isobject": "^3.0.0",
-        "static-extend": "^0.1.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
-        "is-data-descriptor": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "dev": true
-        }
-      }
-    },
-    "clean-css": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz",
-      "integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==",
-      "dev": true,
-      "requires": {
-        "source-map": "~0.6.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "clean-stack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-      "dev": true
-    },
-    "cli-boxes": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz",
-      "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==",
-      "dev": true
-    },
-    "cli-table3": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.0.tgz",
-      "integrity": "sha512-gnB85c3MGC7Nm9I/FkiasNBOKjOiO1RNuXXarQms37q4QMpWdlbBgD/VnOStA2faG1dpXMv31RFApjX1/QdgWQ==",
-      "dev": true,
-      "requires": {
-        "colors": "^1.1.2",
-        "object-assign": "^4.1.0",
-        "string-width": "^4.2.0"
-      }
-    },
-    "clone-deep": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
-      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
-      "dev": true,
-      "requires": {
-        "is-plain-object": "^2.0.4",
-        "kind-of": "^6.0.2",
-        "shallow-clone": "^3.0.0"
-      },
-      "dependencies": {
-        "is-plain-object": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-          "dev": true,
-          "requires": {
-            "isobject": "^3.0.1"
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        }
-      }
-    },
-    "clsx": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.1.1.tgz",
-      "integrity": "sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==",
-      "dev": true
-    },
-    "code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-      "dev": true
-    },
-    "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
-    },
-    "collection-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
-      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
-      "dev": true,
-      "requires": {
-        "map-visit": "^1.0.0",
-        "object-visit": "^1.0.0"
-      }
-    },
-    "color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "requires": {
-        "color-name": "~1.1.4"
-      }
-    },
-    "color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "colors": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
-      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
-      "dev": true,
-      "optional": true
-    },
-    "combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
-      "requires": {
-        "delayed-stream": "~1.0.0"
-      }
-    },
-    "comma-separated-tokens": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz",
-      "integrity": "sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==",
-      "dev": true
-    },
-    "commander": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
-      "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
-      "dev": true
-    },
-    "commondir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
-      "dev": true
-    },
-    "component-emitter": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
-      "dev": true
-    },
-    "compressible": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
-      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
-      "dev": true,
-      "requires": {
-        "mime-db": ">= 1.43.0 < 2"
-      }
-    },
-    "compression": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
-      "dev": true,
-      "requires": {
-        "accepts": "~1.3.5",
-        "bytes": "3.0.0",
-        "compressible": "~2.0.16",
-        "debug": "2.6.9",
-        "on-headers": "~1.0.2",
-        "safe-buffer": "5.1.2",
-        "vary": "~1.1.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
-      }
-    },
-    "compute-scroll-into-view": {
-      "version": "1.0.17",
-      "resolved": "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-1.0.17.tgz",
-      "integrity": "sha512-j4dx+Fb0URmzbwwMUrhqWM2BEWHdFGx+qZ9qqASHRPqvTYdqvWnHg0H1hIbcyLnvgnoNAVMlwkepyqM3DaIFUg==",
-      "dev": true
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
-    },
-    "concat-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-      "dev": true,
-      "requires": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
-      }
-    },
-    "console-browserify": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
-      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
-      "dev": true
-    },
-    "console-control-strings": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-      "dev": true
-    },
-    "constants-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
-      "dev": true
-    },
-    "content-disposition": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "5.1.2"
-      }
-    },
-    "content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
-      "dev": true
-    },
-    "convert-source-map": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
-      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.1.1"
-      }
-    },
-    "cookie": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
-      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
-      "dev": true
-    },
-    "cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
-      "dev": true
-    },
-    "copy-concurrently": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
-      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
-      "dev": true,
-      "requires": {
-        "aproba": "^1.1.1",
-        "fs-write-stream-atomic": "^1.0.8",
-        "iferr": "^0.1.5",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.0"
-      },
-      "dependencies": {
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        },
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
-      }
-    },
-    "copy-descriptor": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
-      "dev": true
-    },
-    "copy-to-clipboard": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz",
-      "integrity": "sha512-i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw==",
-      "dev": true,
-      "requires": {
-        "toggle-selection": "^1.0.6"
-      }
-    },
-    "core-js": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.19.0.tgz",
-      "integrity": "sha512-L1TpFRWXZ76vH1yLM+z6KssLZrP8Z6GxxW4auoCj+XiViOzNPJCAuTIkn03BGdFe6Z5clX5t64wRIRypsZQrUg==",
-      "dev": true
-    },
-    "core-js-compat": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.19.0.tgz",
-      "integrity": "sha512-R09rKZ56ccGBebjTLZHvzDxhz93YPT37gBm6qUhnwj3Kt7aCjjZWD1injyNbyeFHxNKfeZBSyds6O9n3MKq1sw==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.17.5",
-        "semver": "7.0.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-          "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
-          "dev": true
-        }
-      }
-    },
-    "core-js-pure": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.19.0.tgz",
-      "integrity": "sha512-UEQk8AxyCYvNAs6baNoPqDADv7BX0AmBLGxVsrAifPPx/C8EAzV4Q+2ZUJqVzfI2TQQEZITnwUkWcHpgc/IubQ==",
-      "dev": true
-    },
-    "core-util-is": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
-      "dev": true
-    },
-    "cosmiconfig": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
-      "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
-      "dev": true,
-      "requires": {
-        "@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"
-      }
-    },
-    "cp-file": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/cp-file/-/cp-file-7.0.0.tgz",
-      "integrity": "sha512-0Cbj7gyvFVApzpK/uhCtQ/9kE9UnYpxMzaq5nQQC/Dh4iaj5fxp7iEFIullrYwzj8nf0qnsI1Qsx34hAeAebvw==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "make-dir": "^3.0.0",
-        "nested-error-stacks": "^2.0.0",
-        "p-event": "^4.1.0"
-      },
-      "dependencies": {
-        "make-dir": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-          "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-          "dev": true,
-          "requires": {
-            "semver": "^6.0.0"
-          }
-        }
-      }
-    },
-    "cpy": {
-      "version": "8.1.2",
-      "resolved": "https://registry.npmjs.org/cpy/-/cpy-8.1.2.tgz",
-      "integrity": "sha512-dmC4mUesv0OYH2kNFEidtf/skUwv4zePmGeepjyyJ0qTo5+8KhA1o99oIAwVVLzQMAeDJml74d6wPPKb6EZUTg==",
-      "dev": true,
-      "requires": {
-        "arrify": "^2.0.1",
-        "cp-file": "^7.0.0",
-        "globby": "^9.2.0",
-        "has-glob": "^1.0.0",
-        "junk": "^3.1.0",
-        "nested-error-stacks": "^2.1.0",
-        "p-all": "^2.1.0",
-        "p-filter": "^2.1.0",
-        "p-map": "^3.0.0"
-      },
-      "dependencies": {
-        "@nodelib/fs.stat": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
-          "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
-          "dev": true
-        },
-        "array-union": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-          "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-          "dev": true,
-          "requires": {
-            "array-uniq": "^1.0.1"
-          }
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "dir-glob": {
-          "version": "2.2.2",
-          "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
-          "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==",
-          "dev": true,
-          "requires": {
-            "path-type": "^3.0.0"
-          }
-        },
-        "fast-glob": {
-          "version": "2.2.7",
-          "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz",
-          "integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==",
-          "dev": true,
-          "requires": {
-            "@mrmlnc/readdir-enhanced": "^2.2.1",
-            "@nodelib/fs.stat": "^1.1.2",
-            "glob-parent": "^3.1.0",
-            "is-glob": "^4.0.0",
-            "merge2": "^1.2.3",
-            "micromatch": "^3.1.10"
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-          "dev": true,
-          "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
-          },
-          "dependencies": {
-            "is-glob": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-              "dev": true,
-              "requires": {
-                "is-extglob": "^2.1.0"
-              }
-            }
-          }
-        },
-        "globby": {
-          "version": "9.2.0",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-9.2.0.tgz",
-          "integrity": "sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==",
-          "dev": true,
-          "requires": {
-            "@types/glob": "^7.1.1",
-            "array-union": "^1.0.2",
-            "dir-glob": "^2.2.2",
-            "fast-glob": "^2.2.6",
-            "glob": "^7.1.3",
-            "ignore": "^4.0.3",
-            "pify": "^4.0.1",
-            "slash": "^2.0.0"
-          }
-        },
-        "ignore": {
-          "version": "4.0.6",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-          "dev": true
-        },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        },
-        "path-type": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-          "dev": true,
-          "requires": {
-            "pify": "^3.0.0"
-          },
-          "dependencies": {
-            "pify": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-              "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-              "dev": true
-            }
-          }
-        },
-        "slash": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-          "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
-          "dev": true
-        },
-        "to-regex-range": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-          "dev": true,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
-        }
-      }
-    },
-    "create-ecdh": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
-      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.0",
-        "elliptic": "^6.5.3"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-          "dev": true
-        }
-      }
-    },
-    "create-hash": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-      "dev": true,
-      "requires": {
-        "cipher-base": "^1.0.1",
-        "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
-      }
-    },
-    "create-hmac": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-      "dev": true,
-      "requires": {
-        "cipher-base": "^1.0.3",
-        "create-hash": "^1.1.0",
-        "inherits": "^2.0.1",
-        "ripemd160": "^2.0.0",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
-    "create-react-context": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/create-react-context/-/create-react-context-0.3.0.tgz",
-      "integrity": "sha512-dNldIoSuNSvlTJ7slIKC/ZFGKexBMBrrcc+TTe1NdmROnaASuLPvqpwj9v4XS4uXZ8+YPu0sNmShX2rXI5LNsw==",
-      "dev": true,
-      "requires": {
-        "gud": "^1.0.0",
-        "warning": "^4.0.3"
-      }
-    },
-    "cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dev": true,
-      "requires": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      }
-    },
-    "crypto-browserify": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-      "dev": true,
-      "requires": {
-        "browserify-cipher": "^1.0.0",
-        "browserify-sign": "^4.0.0",
-        "create-ecdh": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.0",
-        "diffie-hellman": "^5.0.0",
-        "inherits": "^2.0.1",
-        "pbkdf2": "^3.0.3",
-        "public-encrypt": "^4.0.0",
-        "randombytes": "^2.0.0",
-        "randomfill": "^1.0.3"
-      }
-    },
-    "css-loader": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.6.0.tgz",
-      "integrity": "sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ==",
-      "dev": true,
-      "requires": {
-        "camelcase": "^5.3.1",
-        "cssesc": "^3.0.0",
-        "icss-utils": "^4.1.1",
-        "loader-utils": "^1.2.3",
-        "normalize-path": "^3.0.0",
-        "postcss": "^7.0.32",
-        "postcss-modules-extract-imports": "^2.0.0",
-        "postcss-modules-local-by-default": "^3.0.2",
-        "postcss-modules-scope": "^2.2.0",
-        "postcss-modules-values": "^3.0.0",
-        "postcss-value-parser": "^4.1.0",
-        "schema-utils": "^2.7.0",
-        "semver": "^6.3.0"
-      }
-    },
-    "css-select": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz",
-      "integrity": "sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==",
-      "dev": true,
-      "requires": {
-        "boolbase": "^1.0.0",
-        "css-what": "^5.0.0",
-        "domhandler": "^4.2.0",
-        "domutils": "^2.6.0",
-        "nth-check": "^2.0.0"
-      }
-    },
-    "css-what": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz",
-      "integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==",
-      "dev": true
-    },
-    "cssesc": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-      "dev": true
-    },
-    "csstype": {
-      "version": "2.6.18",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.18.tgz",
-      "integrity": "sha512-RSU6Hyeg14am3Ah4VZEmeX8H7kLwEEirXe6aU2IPfKNvhXwTflK5HQRDNI0ypQXoqmm+QPyG2IaPuQE5zMwSIQ==",
-      "dev": true
-    },
-    "cyclist": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
-      "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
-      "dev": true
-    },
-    "debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
-      "dev": true,
-      "requires": {
-        "ms": "2.1.2"
-      }
-    },
-    "decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
-      "dev": true
-    },
-    "deep-object-diff": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/deep-object-diff/-/deep-object-diff-1.1.0.tgz",
-      "integrity": "sha512-b+QLs5vHgS+IoSNcUE4n9HP2NwcHj7aqnJWsjPtuG75Rh5TOaGt0OjAYInh77d5T16V5cRDC+Pw/6ZZZiETBGw==",
-      "dev": true
-    },
-    "deepmerge": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
-      "dev": true
-    },
-    "define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-      "dev": true,
-      "requires": {
-        "object-keys": "^1.0.12"
-      }
-    },
-    "define-property": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
-      "dev": true,
-      "requires": {
-        "is-descriptor": "^1.0.2",
-        "isobject": "^3.0.1"
-      },
-      "dependencies": {
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        }
-      }
-    },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-      "dev": true
-    },
-    "delegates": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-      "dev": true
-    },
-    "depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
-      "dev": true
-    },
-    "des.js": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
-      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
-      "dev": true
-    },
-    "detab": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/detab/-/detab-2.0.4.tgz",
-      "integrity": "sha512-8zdsQA5bIkoRECvCrNKPla84lyoR7DSAyf7p0YgXzBO9PDJx8KntPUay7NS6yp+KdxdVtiE5SpHKtbp2ZQyA9g==",
-      "dev": true,
-      "requires": {
-        "repeat-string": "^1.5.4"
-      }
-    },
-    "detect-port": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/detect-port/-/detect-port-1.3.0.tgz",
-      "integrity": "sha512-E+B1gzkl2gqxt1IhUzwjrxBKRqx1UzC3WLONHinn8S3T6lwV/agVCyitiFOsGJ/eYuEUBvD71MZHy3Pv1G9doQ==",
-      "dev": true,
-      "requires": {
-        "address": "^1.0.1",
-        "debug": "^2.6.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
-      }
-    },
-    "detect-port-alt": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.6.tgz",
-      "integrity": "sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q==",
-      "dev": true,
-      "requires": {
-        "address": "^1.0.1",
-        "debug": "^2.6.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
-      }
-    },
-    "diffie-hellman": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.0",
-        "miller-rabin": "^4.0.0",
-        "randombytes": "^2.0.0"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-          "dev": true
-        }
-      }
-    },
-    "dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "requires": {
-        "path-type": "^4.0.0"
-      }
-    },
-    "dom-converter": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
-      "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
-      "dev": true,
-      "requires": {
-        "utila": "~0.4"
-      }
-    },
-    "dom-helpers": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
-      "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.8.7",
-        "csstype": "^3.0.2"
-      },
-      "dependencies": {
-        "csstype": {
-          "version": "3.0.9",
-          "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.9.tgz",
-          "integrity": "sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw==",
-          "dev": true
-        }
-      }
-    },
-    "dom-serializer": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz",
-      "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==",
-      "dev": true,
-      "requires": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.0",
-        "entities": "^2.0.0"
-      }
-    },
-    "dom-walk": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz",
-      "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==",
-      "dev": true
-    },
-    "domain-browser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
-      "dev": true
-    },
-    "domelementtype": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
-      "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
-      "dev": true
-    },
-    "domhandler": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.2.tgz",
-      "integrity": "sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w==",
-      "dev": true,
-      "requires": {
-        "domelementtype": "^2.2.0"
-      }
-    },
-    "domutils": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-      "dev": true,
-      "requires": {
-        "dom-serializer": "^1.0.1",
-        "domelementtype": "^2.2.0",
-        "domhandler": "^4.2.0"
-      }
-    },
-    "dot-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
-      "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
-      "dev": true,
-      "requires": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
-    "dotenv": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz",
-      "integrity": "sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==",
-      "dev": true
-    },
-    "dotenv-defaults": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/dotenv-defaults/-/dotenv-defaults-1.1.1.tgz",
-      "integrity": "sha512-6fPRo9o/3MxKvmRZBD3oNFdxODdhJtIy1zcJeUSCs6HCy4tarUpd+G67UTU9tF6OWXeSPqsm4fPAB+2eY9Rt9Q==",
-      "dev": true,
-      "requires": {
-        "dotenv": "^6.2.0"
-      }
-    },
-    "dotenv-expand": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz",
-      "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==",
-      "dev": true
-    },
-    "dotenv-webpack": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/dotenv-webpack/-/dotenv-webpack-1.8.0.tgz",
-      "integrity": "sha512-o8pq6NLBehtrqA8Jv8jFQNtG9nhRtVqmoD4yWbgUyoU3+9WBlPe+c2EAiaJok9RB28QvrWvdWLZGeTT5aATDMg==",
-      "dev": true,
-      "requires": {
-        "dotenv-defaults": "^1.0.2"
-      }
-    },
-    "downshift": {
-      "version": "6.1.7",
-      "resolved": "https://registry.npmjs.org/downshift/-/downshift-6.1.7.tgz",
-      "integrity": "sha512-cVprZg/9Lvj/uhYRxELzlu1aezRcgPWBjTvspiGTVEU64gF5pRdSRKFVLcxqsZC637cLAGMbL40JavEfWnqgNg==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.14.8",
-        "compute-scroll-into-view": "^1.0.17",
-        "prop-types": "^15.7.2",
-        "react-is": "^17.0.2",
-        "tslib": "^2.3.0"
-      }
-    },
-    "duplexer": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
-      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
-      "dev": true
-    },
-    "duplexify": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
-      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0",
-        "stream-shift": "^1.0.0"
-      }
-    },
-    "ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
-      "dev": true
-    },
-    "electron-to-chromium": {
-      "version": "1.3.879",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.879.tgz",
-      "integrity": "sha512-zJo+D9GwbJvM31IdFmwcGvychhk4KKbKYo2GWlsn+C/dxz2NwmbhGJjWwTfFSF2+eFH7VvfA8MCZ8SOqTrlnpw==",
-      "dev": true
-    },
-    "element-resize-detector": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
-      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
-      "dev": true,
-      "requires": {
-        "batch-processor": "1.0.0"
-      }
-    },
-    "elliptic": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
-      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
-      "dev": 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",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-          "dev": true
-        }
-      }
-    },
-    "emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "emojis-list": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-      "dev": true
-    },
-    "emotion-theming": {
-      "version": "10.0.27",
-      "resolved": "https://registry.npmjs.org/emotion-theming/-/emotion-theming-10.0.27.tgz",
-      "integrity": "sha512-MlF1yu/gYh8u+sLUqA0YuA9JX0P4Hb69WlKc/9OLo+WCXuX6sy/KoIa+qJimgmr2dWqnypYKYPX37esjDBbhdw==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.5.5",
-        "@emotion/weak-memoize": "0.2.5",
-        "hoist-non-react-statics": "^3.3.0"
-      }
-    },
-    "encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
-      "dev": true
-    },
-    "end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
-      "requires": {
-        "once": "^1.4.0"
-      }
-    },
-    "enhanced-resolve": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz",
-      "integrity": "sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "memory-fs": "^0.5.0",
-        "tapable": "^1.0.0"
-      },
-      "dependencies": {
-        "memory-fs": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
-          "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
-          "dev": true,
-          "requires": {
-            "errno": "^0.1.3",
-            "readable-stream": "^2.0.1"
-          }
-        }
-      }
-    },
-    "entities": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-      "dev": true
-    },
-    "errno": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
-      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
-      "dev": true,
-      "requires": {
-        "prr": "~1.0.1"
-      }
-    },
-    "error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
-      "requires": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "es-abstract": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
-      "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
-      "dev": true,
-      "requires": {
-        "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-array-method-boxes-properly": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
-      "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==",
-      "dev": true
-    },
-    "es-get-iterator": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.2.tgz",
-      "integrity": "sha512-+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.0",
-        "has-symbols": "^1.0.1",
-        "is-arguments": "^1.1.0",
-        "is-map": "^2.0.2",
-        "is-set": "^2.0.2",
-        "is-string": "^1.0.5",
-        "isarray": "^2.0.5"
-      }
-    },
-    "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": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      }
-    },
-    "es5-shim": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/es5-shim/-/es5-shim-4.6.2.tgz",
-      "integrity": "sha512-n0XTVMGps+Deyr38jtqKPR5F5hb9owYeRQcKJW39eFvzUk/u/9Ww315werRzbiNMnHCUw/YHDPBphTlEnzdi+A==",
-      "dev": true
-    },
-    "es6-shim": {
-      "version": "0.35.6",
-      "resolved": "https://registry.npmjs.org/es6-shim/-/es6-shim-0.35.6.tgz",
-      "integrity": "sha512-EmTr31wppcaIAgblChZiuN/l9Y7DPyw8Xtbg7fIVngn6zMW+IEBJDJngeKC3x6wr0V/vcA2wqeFnaw1bFJbDdA==",
-      "dev": true
-    },
-    "escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-      "dev": true
-    },
-    "escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
-      "dev": true
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true
-    },
-    "eslint-scope": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
-      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
-      "dev": true,
-      "requires": {
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
-      }
-    },
-    "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": {
-        "estraverse": "^5.2.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-          "dev": true
-        }
-      }
-    },
-    "estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true
-    },
-    "esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true
-    },
-    "etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
-      "dev": true
-    },
-    "events": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-      "dev": true
-    },
-    "evp_bytestokey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-      "dev": true,
-      "requires": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-      "dev": true,
-      "requires": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
-        "is-data-descriptor": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
-          }
-        },
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
-      }
-    },
-    "express": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
-      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
-      "dev": true,
-      "requires": {
-        "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"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        },
-        "qs": {
-          "version": "6.7.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
-          "dev": true
-        }
-      }
-    },
-    "extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "dev": true
-    },
-    "extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "dev": true,
-      "requires": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      }
-    },
-    "extglob": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-      "dev": true,
-      "requires": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
-        }
-      }
-    },
-    "fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
-    "fast-glob": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
-      "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
-      "dev": true,
-      "requires": {
-        "@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": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "fastq": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
-      "dev": true,
-      "requires": {
-        "reusify": "^1.0.4"
-      }
-    },
-    "fault": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/fault/-/fault-1.0.4.tgz",
-      "integrity": "sha512-CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==",
-      "dev": true,
-      "requires": {
-        "format": "^0.2.0"
-      }
-    },
-    "figgy-pudding": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
-      "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==",
-      "dev": true
-    },
-    "file-loader": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
-      "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
-      "dev": true,
-      "requires": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0"
-      },
-      "dependencies": {
-        "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-          "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
-        "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.8",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
-          }
-        }
-      }
-    },
-    "file-system-cache": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/file-system-cache/-/file-system-cache-1.0.5.tgz",
-      "integrity": "sha1-hCWbNqK7uNPW6xAh0xMv/mTP/08=",
-      "dev": true,
-      "requires": {
-        "bluebird": "^3.3.5",
-        "fs-extra": "^0.30.0",
-        "ramda": "^0.21.0"
-      },
-      "dependencies": {
-        "fs-extra": {
-          "version": "0.30.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
-          "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^2.1.0",
-            "klaw": "^1.0.0",
-            "path-is-absolute": "^1.0.0",
-            "rimraf": "^2.2.8"
-          }
-        },
-        "jsonfile": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
-          "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.6"
-          }
-        },
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
-      }
-    },
-    "filesize": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/filesize/-/filesize-6.1.0.tgz",
-      "integrity": "sha512-LpCHtPQ3sFx67z+uh2HnSyWSLLu5Jxo21795uRDuar/EOuYWXib5EmPaGIBuSnRqH2IODiKA2k5re/K9OnN/Yg==",
-      "dev": true
-    },
-    "fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
-      "requires": {
-        "to-regex-range": "^5.0.1"
-      }
-    },
-    "finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
-      "dev": true,
-      "requires": {
-        "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"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
-      }
-    },
-    "find-cache-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
-      "dev": true,
-      "requires": {
-        "commondir": "^1.0.1",
-        "make-dir": "^2.0.0",
-        "pkg-dir": "^3.0.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-          "dev": true
-        },
-        "pkg-dir": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-          "dev": true,
-          "requires": {
-            "find-up": "^3.0.0"
-          }
-        }
-      }
-    },
-    "find-root": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
-      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==",
-      "dev": true
-    },
-    "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==",
-      "dev": true,
-      "requires": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
-      }
-    },
-    "flush-write-stream": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
-      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.3.6"
-      }
-    },
-    "for-in": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-      "dev": true
-    },
-    "fork-ts-checker-webpack-plugin": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.4.0.tgz",
-      "integrity": "sha512-3I3wFkc4DbzaUDPWEi96wdYGu4EKtxBafhZYm0o4mX51d9bphAY4P3mBl8K5mFXFJqVzHfmdbm9kLGnm7vwwBg==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.8.3",
-        "@types/json-schema": "^7.0.5",
-        "chalk": "^4.1.0",
-        "chokidar": "^3.4.2",
-        "cosmiconfig": "^6.0.0",
-        "deepmerge": "^4.2.2",
-        "fs-extra": "^9.0.0",
-        "glob": "^7.1.6",
-        "memfs": "^3.1.2",
-        "minimatch": "^3.0.4",
-        "schema-utils": "2.7.0",
-        "semver": "^7.3.2",
-        "tapable": "^1.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "cosmiconfig": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
-          "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
-          "dev": true,
-          "requires": {
-            "@types/parse-json": "^4.0.0",
-            "import-fresh": "^3.1.0",
-            "parse-json": "^5.0.0",
-            "path-type": "^4.0.0",
-            "yaml": "^1.7.2"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "schema-utils": {
-          "version": "2.7.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
-          "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.4",
-            "ajv": "^6.12.2",
-            "ajv-keywords": "^3.4.1"
-          }
-        },
-        "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "form-data": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
-      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
-      "dev": true,
-      "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      }
-    },
-    "format": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz",
-      "integrity": "sha1-1hcBB+nv3E7TDJ3DkBbflCtctYs=",
-      "dev": true
-    },
-    "forwarded": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
-      "dev": true
-    },
-    "fragment-cache": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
-      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
-      "dev": true,
-      "requires": {
-        "map-cache": "^0.2.2"
-      }
-    },
-    "fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
-      "dev": true
-    },
-    "from2": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
-      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0"
-      }
-    },
-    "fs-extra": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
-      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
-      "dev": true,
-      "requires": {
-        "at-least-node": "^1.0.0",
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      }
-    },
-    "fs-minipass": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-      "dev": true,
-      "requires": {
-        "minipass": "^3.0.0"
-      }
-    },
-    "fs-monkey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz",
-      "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==",
-      "dev": true
-    },
-    "fs-write-stream-atomic": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
-      "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "iferr": "^0.1.5",
-        "imurmurhash": "^0.1.4",
-        "readable-stream": "1 || 2"
-      }
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-    },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "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.2",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.2.tgz",
-      "integrity": "sha512-bLgc3asbWdwPbx2mNk2S49kmJCuQeu0nfmaOgbs8WIyzzkw3r4htszdIi9Q9EMezDPTYuJx2wvjZ/EwgAthpnA==",
-      "dev": true
-    },
-    "fuse.js": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-3.6.1.tgz",
-      "integrity": "sha512-hT9yh/tiinkmirKrlv4KWOjztdoZo1mx9Qh4KvWqC7isoXwdUY3PNWUxceF4/qO9R6riA2C29jdTOeQOIROjgw==",
-      "dev": true
-    },
-    "gauge": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-      "dev": true,
-      "requires": {
-        "aproba": "^1.0.3",
-        "console-control-strings": "^1.0.0",
-        "has-unicode": "^2.0.0",
-        "object-assign": "^4.1.0",
-        "signal-exit": "^3.0.0",
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wide-align": "^1.1.0"
-      },
-      "dependencies": {
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "dev": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "dev": true,
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        }
-      }
-    },
-    "gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "dev": true
-    },
-    "get-intrinsic": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
-      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1"
-      }
-    },
-    "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": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
-      }
-    },
-    "get-value": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
-      "dev": true
-    },
-    "glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-      "dev": true,
-      "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "glob-base": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
-      "dev": true,
-      "requires": {
-        "glob-parent": "^2.0.0",
-        "is-glob": "^2.0.0"
-      },
-      "dependencies": {
-        "glob-parent": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-          "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
-          "dev": true,
-          "requires": {
-            "is-glob": "^2.0.0"
-          }
-        },
-        "is-extglob": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^1.0.0"
-          }
-        }
-      }
-    },
-    "glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "requires": {
-        "is-glob": "^4.0.1"
-      }
-    },
-    "glob-promise": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/glob-promise/-/glob-promise-3.4.0.tgz",
-      "integrity": "sha512-q08RJ6O+eJn+dVanerAndJwIcumgbDdYiUT7zFQl3Wm1xD6fBKtah7H8ZJChj4wP+8C+QfeVy8xautR7rdmKEw==",
-      "dev": true,
-      "requires": {
-        "@types/glob": "*"
-      }
-    },
-    "glob-to-regexp": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
-      "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=",
-      "dev": true
-    },
-    "global": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz",
-      "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==",
-      "dev": true,
-      "requires": {
-        "min-document": "^2.19.0",
-        "process": "^0.11.10"
-      }
-    },
-    "global-modules": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
-      "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
-      "dev": true,
-      "requires": {
-        "global-prefix": "^3.0.0"
-      }
-    },
-    "global-prefix": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
-      "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
-      "dev": true,
-      "requires": {
-        "ini": "^1.3.5",
-        "kind-of": "^6.0.2",
-        "which": "^1.3.1"
-      },
-      "dependencies": {
-        "which": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-          "dev": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        }
-      }
-    },
-    "globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true
-    },
-    "globalthis": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.2.tgz",
-      "integrity": "sha512-ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3"
-      }
-    },
-    "globby": {
-      "version": "11.0.4",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
-      "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"
-      }
-    },
-    "graceful-fs": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
-      "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==",
-      "dev": true
-    },
-    "gud": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/gud/-/gud-1.0.0.tgz",
-      "integrity": "sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw==",
-      "dev": true
-    },
-    "gzip-size": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
-      "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==",
-      "dev": true,
-      "requires": {
-        "duplexer": "^0.1.1",
-        "pify": "^4.0.1"
-      }
-    },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
-    "has-bigints": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
-      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
-      "dev": true
-    },
-    "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true
-    },
-    "has-glob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-glob/-/has-glob-1.0.0.tgz",
-      "integrity": "sha1-mqqe7b/7G6OZCnsAEPtnjuAIEgc=",
-      "dev": true,
-      "requires": {
-        "is-glob": "^3.0.0"
-      },
-      "dependencies": {
-        "is-glob": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^2.1.0"
-          }
-        }
-      }
-    },
-    "has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "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": {
-        "has-symbols": "^1.0.2"
-      }
-    },
-    "has-unicode": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
-      "dev": true
-    },
-    "has-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
-      "dev": true,
-      "requires": {
-        "get-value": "^2.0.6",
-        "has-values": "^1.0.0",
-        "isobject": "^3.0.0"
-      },
-      "dependencies": {
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        }
-      }
-    },
-    "has-values": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
-      "dev": true,
-      "requires": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
-      },
-      "dependencies": {
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "kind-of": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "hash-base": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
-      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-          "dev": true
-        }
-      }
-    },
-    "hash.js": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.1"
-      }
-    },
-    "hast-to-hyperscript": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/hast-to-hyperscript/-/hast-to-hyperscript-9.0.1.tgz",
-      "integrity": "sha512-zQgLKqF+O2F72S1aa4y2ivxzSlko3MAvxkwG8ehGmNiqd98BIN3JM1rAJPmplEyLmGLO2QZYJtIneOSZ2YbJuA==",
-      "dev": true,
-      "requires": {
-        "@types/unist": "^2.0.3",
-        "comma-separated-tokens": "^1.0.0",
-        "property-information": "^5.3.0",
-        "space-separated-tokens": "^1.0.0",
-        "style-to-object": "^0.3.0",
-        "unist-util-is": "^4.0.0",
-        "web-namespaces": "^1.0.0"
-      }
-    },
-    "hast-util-from-parse5": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-6.0.1.tgz",
-      "integrity": "sha512-jeJUWiN5pSxW12Rh01smtVkZgZr33wBokLzKLwinYOUfSzm1Nl/c3GUGebDyOKjdsRgMvoVbV0VpAcpjF4NrJA==",
-      "dev": true,
-      "requires": {
-        "@types/parse5": "^5.0.0",
-        "hastscript": "^6.0.0",
-        "property-information": "^5.0.0",
-        "vfile": "^4.0.0",
-        "vfile-location": "^3.2.0",
-        "web-namespaces": "^1.0.0"
-      }
-    },
-    "hast-util-parse-selector": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-2.2.5.tgz",
-      "integrity": "sha512-7j6mrk/qqkSehsM92wQjdIgWM2/BW61u/53G6xmC8i1OmEdKLHbk419QKQUjz6LglWsfqoiHmyMRkP1BGjecNQ==",
-      "dev": true
-    },
-    "hast-util-raw": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/hast-util-raw/-/hast-util-raw-6.0.1.tgz",
-      "integrity": "sha512-ZMuiYA+UF7BXBtsTBNcLBF5HzXzkyE6MLzJnL605LKE8GJylNjGc4jjxazAHUtcwT5/CEt6afRKViYB4X66dig==",
-      "dev": true,
-      "requires": {
-        "@types/hast": "^2.0.0",
-        "hast-util-from-parse5": "^6.0.0",
-        "hast-util-to-parse5": "^6.0.0",
-        "html-void-elements": "^1.0.0",
-        "parse5": "^6.0.0",
-        "unist-util-position": "^3.0.0",
-        "vfile": "^4.0.0",
-        "web-namespaces": "^1.0.0",
-        "xtend": "^4.0.0",
-        "zwitch": "^1.0.0"
-      }
-    },
-    "hast-util-to-parse5": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/hast-util-to-parse5/-/hast-util-to-parse5-6.0.0.tgz",
-      "integrity": "sha512-Lu5m6Lgm/fWuz8eWnrKezHtVY83JeRGaNQ2kn9aJgqaxvVkFCZQBEhgodZUDUvoodgyROHDb3r5IxAEdl6suJQ==",
-      "dev": true,
-      "requires": {
-        "hast-to-hyperscript": "^9.0.0",
-        "property-information": "^5.0.0",
-        "web-namespaces": "^1.0.0",
-        "xtend": "^4.0.0",
-        "zwitch": "^1.0.0"
-      }
-    },
-    "hastscript": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/hastscript/-/hastscript-6.0.0.tgz",
-      "integrity": "sha512-nDM6bvd7lIqDUiYEiu5Sl/+6ReP0BMk/2f4U/Rooccxkj0P5nm+acM5PrGJ/t5I8qPGiqZSE6hVAwZEdZIvP4w==",
-      "dev": true,
-      "requires": {
-        "@types/hast": "^2.0.0",
-        "comma-separated-tokens": "^1.0.0",
-        "hast-util-parse-selector": "^2.0.0",
-        "property-information": "^5.0.0",
-        "space-separated-tokens": "^1.0.0"
-      }
-    },
-    "he": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-      "dev": true
-    },
-    "highlight.js": {
-      "version": "10.7.3",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz",
-      "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==",
-      "dev": true
-    },
-    "hmac-drbg": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-      "dev": true,
-      "requires": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "hoist-non-react-statics": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
-      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
-      "dev": true,
-      "requires": {
-        "react-is": "^16.7.0"
-      },
-      "dependencies": {
-        "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
-        }
-      }
-    },
-    "hosted-git-info": {
-      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-      "dev": true
-    },
-    "html-entities": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.2.tgz",
-      "integrity": "sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ==",
-      "dev": true
-    },
-    "html-minifier-terser": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz",
-      "integrity": "sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg==",
-      "dev": true,
-      "requires": {
-        "camel-case": "^4.1.1",
-        "clean-css": "^4.2.3",
-        "commander": "^4.1.1",
-        "he": "^1.2.0",
-        "param-case": "^3.0.3",
-        "relateurl": "^0.2.7",
-        "terser": "^4.6.3"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
-          "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
-          "dev": true
-        }
-      }
-    },
-    "html-void-elements": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-1.0.5.tgz",
-      "integrity": "sha512-uE/TxKuyNIcx44cIWnjr/rfIATDH7ZaOMmstu0CwhFG1Dunhlp4OC6/NMbhiwoq5BpW0ubi303qnEk/PZj614w==",
-      "dev": true
-    },
-    "html-webpack-plugin": {
-      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.5.2.tgz",
-      "integrity": "sha512-q5oYdzjKUIPQVjOosjgvCHQOv9Ett9CYYHlgvJeXG0qQvdSojnBq4vAdQBwn1+yGveAwHCoe/rMR86ozX3+c2A==",
-      "dev": true,
-      "requires": {
-        "@types/html-minifier-terser": "^5.0.0",
-        "@types/tapable": "^1.0.5",
-        "@types/webpack": "^4.41.8",
-        "html-minifier-terser": "^5.0.1",
-        "loader-utils": "^1.2.3",
-        "lodash": "^4.17.20",
-        "pretty-error": "^2.1.1",
-        "tapable": "^1.1.3",
-        "util.promisify": "1.0.0"
-      }
-    },
-    "htmlparser2": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
-      "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
-      "dev": true,
-      "requires": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.0.0",
-        "domutils": "^2.5.2",
-        "entities": "^2.0.0"
-      }
-    },
-    "http-errors": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
-      "dev": true,
-      "requires": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.1",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true
-        }
-      }
-    },
-    "https-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
-      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
-      "dev": true
-    },
-    "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dev": true,
-      "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      }
-    },
-    "icss-utils": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz",
-      "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.14"
-      }
-    },
-    "ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "dev": true
-    },
-    "iferr": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
-      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
-      "dev": true
-    },
-    "ignore": {
-      "version": "5.1.8",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-      "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
-      "dev": true
-    },
-    "immer": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/immer/-/immer-8.0.1.tgz",
-      "integrity": "sha512-aqXhGP7//Gui2+UrEtvxZxSquQVXTpZ7KDxfCcKAF3Vysvw0CViVaW9RZ1j1xlIYqaaaipBoqdqeibkc18PNvA==",
-      "dev": true
-    },
-    "import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
-      "requires": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "dependencies": {
-        "resolve-from": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-          "dev": true
-        }
-      }
-    },
-    "imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "dev": true
-    },
-    "indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "dev": true
-    },
-    "infer-owner": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
-      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
-      "dev": true
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "dev": true
-    },
-    "inline-style-parser": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.1.1.tgz",
-      "integrity": "sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==",
-      "dev": true
-    },
-    "internal-slot": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
-      "dev": true,
-      "requires": {
-        "get-intrinsic": "^1.1.0",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
-      }
-    },
-    "interpret": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz",
-      "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==",
-      "dev": true
-    },
-    "invariant": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
-      "dev": true,
-      "requires": {
-        "loose-envify": "^1.0.0"
-      }
-    },
-    "ip": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
-      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
-      "dev": true
-    },
-    "ipaddr.js": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-      "dev": true
-    },
-    "is-accessor-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-      "dev": true,
-      "requires": {
-        "kind-of": "^6.0.0"
-      }
-    },
-    "is-alphabetical": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz",
-      "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==",
-      "dev": true
-    },
-    "is-alphanumerical": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz",
-      "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==",
-      "dev": true,
-      "requires": {
-        "is-alphabetical": "^1.0.0",
-        "is-decimal": "^1.0.0"
-      }
-    },
-    "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,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-      "dev": true
-    },
-    "is-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",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dev": 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": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-buffer": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
-      "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
-      "dev": true
-    },
-    "is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-      "dev": true
-    },
-    "is-core-module": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz",
-      "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==",
-      "dev": true,
-      "requires": {
-        "has": "^1.0.3"
-      }
-    },
-    "is-data-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-      "dev": true,
-      "requires": {
-        "kind-of": "^6.0.0"
-      }
-    },
-    "is-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": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-decimal": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz",
-      "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==",
-      "dev": true
-    },
-    "is-descriptor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-      "dev": true,
-      "requires": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
-      }
-    },
-    "is-docker": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
-      "dev": true
-    },
-    "is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dev": true,
-      "requires": {
-        "is-plain-object": "^2.0.4"
-      },
-      "dependencies": {
-        "is-plain-object": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-          "dev": true,
-          "requires": {
-            "isobject": "^3.0.1"
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        }
-      }
-    },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true
-    },
-    "is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true
-    },
-    "is-function": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-function/-/is-function-1.0.2.tgz",
-      "integrity": "sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==",
-      "dev": true
-    },
-    "is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "requires": {
-        "is-extglob": "^2.1.1"
-      }
-    },
-    "is-hexadecimal": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz",
-      "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-negative-zero": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
-      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
-      "dev": true
-    },
-    "is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true
-    },
-    "is-number-object": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz",
-      "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==",
-      "dev": true,
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-plain-obj": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
-      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
-      "dev": true
-    },
-    "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": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-root": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-root/-/is-root-2.1.0.tgz",
-      "integrity": "sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg==",
-      "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.1",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz",
-      "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==",
-      "dev": true
-    },
-    "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": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "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": {
-        "has-symbols": "^1.0.2"
-      }
-    },
-    "is-weakref": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.1.tgz",
-      "integrity": "sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==",
-      "dev": true,
-      "requires": {
-        "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",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-      "dev": 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",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-      "dev": true,
-      "requires": {
-        "is-docker": "^2.0.0"
-      }
-    },
-    "isarray": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "dev": true
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
-    },
-    "isobject": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-4.0.0.tgz",
-      "integrity": "sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA==",
-      "dev": true
-    },
-    "iterate-iterator": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/iterate-iterator/-/iterate-iterator-1.0.2.tgz",
-      "integrity": "sha512-t91HubM4ZDQ70M9wqp+pcNpu8OyJ9UAtXntT/Bcsvp5tZMnz9vRa+IunKXeI8AnfZMTv0jNuVEmGeLSMjVvfPw==",
-      "dev": true
-    },
-    "iterate-value": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/iterate-value/-/iterate-value-1.0.2.tgz",
-      "integrity": "sha512-A6fMAio4D2ot2r/TYzr4yUWrmwNdsN5xL7+HUiyACE4DXm+q8HtPcnFTp+NnW3k4N05tZ7FVYFFb2CR13NxyHQ==",
-      "dev": true,
-      "requires": {
-        "es-get-iterator": "^1.0.2",
-        "iterate-iterator": "^1.0.1"
-      }
-    },
-    "jest-worker": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
-      "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^7.0.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "js-string-escape": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/js-string-escape/-/js-string-escape-1.0.1.tgz",
-      "integrity": "sha1-4mJbrbwNZ8dTPp7cEGjFh65BN+8=",
-      "dev": true
-    },
-    "js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
-    "jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true
-    },
-    "json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-      "dev": true
-    },
-    "json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true
-    },
-    "json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "json5": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.2.5"
-      }
-    },
-    "jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.6",
-        "universalify": "^2.0.0"
-      }
-    },
-    "junk": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/junk/-/junk-3.1.0.tgz",
-      "integrity": "sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==",
-      "dev": true
-    },
-    "kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true
-    },
-    "klaw": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
-      "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.9"
-      }
-    },
-    "kleur": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
-      "dev": true
-    },
-    "klona": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz",
-      "integrity": "sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==",
-      "dev": true
-    },
-    "lazy-universal-dotenv": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lazy-universal-dotenv/-/lazy-universal-dotenv-3.0.1.tgz",
-      "integrity": "sha512-prXSYk799h3GY3iOWnC6ZigYzMPjxN2svgjJ9shk7oMadSNX3wXy0B6F32PMJv7qtMnrIbUxoEHzbutvxR2LBQ==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.5.0",
-        "app-root-dir": "^1.0.2",
-        "core-js": "^3.0.4",
-        "dotenv": "^8.0.0",
-        "dotenv-expand": "^5.1.0"
-      },
-      "dependencies": {
-        "dotenv": {
-          "version": "8.6.0",
-          "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz",
-          "integrity": "sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==",
-          "dev": true
-        }
-      }
-    },
-    "lines-and-columns": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
-      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
-      "dev": true
-    },
-    "loader-runner": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
-      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
-      "dev": true
-    },
-    "loader-utils": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-      "dev": true,
-      "requires": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^1.0.1"
-      },
-      "dependencies": {
-        "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        }
-      }
-    },
-    "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"
-      }
-    },
-    "lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
-    },
-    "lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
-      "dev": true
-    },
-    "lodash.uniq": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
-      "dev": true
-    },
-    "loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dev": true,
-      "requires": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      }
-    },
-    "lower-case": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
-      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
-      "dev": true,
-      "requires": {
-        "tslib": "^2.0.3"
-      }
-    },
-    "lowlight": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/lowlight/-/lowlight-1.20.0.tgz",
-      "integrity": "sha512-8Ktj+prEb1RoCPkEOrPMYUN/nCggB7qAWe3a7OpMjWQkh3l2RD5wKRQ+o8Q8YuI9RG/xs95waaI/E6ym/7NsTw==",
-      "dev": true,
-      "requires": {
-        "fault": "^1.0.0",
-        "highlight.js": "~10.7.0"
-      }
-    },
-    "lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "requires": {
-        "yallist": "^4.0.0"
-      }
-    },
-    "make-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-      "dev": true,
-      "requires": {
-        "pify": "^4.0.1",
-        "semver": "^5.6.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
-        }
-      }
-    },
-    "map-cache": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
-      "dev": true
-    },
-    "map-or-similar": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/map-or-similar/-/map-or-similar-1.5.0.tgz",
-      "integrity": "sha1-beJlMXSt+12e3DPGnT6Sobdvrwg=",
-      "dev": true
-    },
-    "map-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
-      "dev": true,
-      "requires": {
-        "object-visit": "^1.0.0"
-      }
-    },
-    "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-to-jsx": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/markdown-to-jsx/-/markdown-to-jsx-7.1.3.tgz",
-      "integrity": "sha512-jtQ6VyT7rMT5tPV0g2EJakEnXLiPksnvlYtwQsVVZ611JsWGN8bQ1tVSDX4s6JllfEH6wmsYxNjTUAMrPmNA8w==",
-      "dev": true,
-      "requires": {}
-    },
-    "md5.js": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-      "dev": true,
-      "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "mdast-squeeze-paragraphs": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/mdast-squeeze-paragraphs/-/mdast-squeeze-paragraphs-4.0.0.tgz",
-      "integrity": "sha512-zxdPn69hkQ1rm4J+2Cs2j6wDEv7O17TfXTJ33tl/+JPIoEmtV9t2ZzBM5LPHE8QlHsmVD8t3vPKCyY3oH+H8MQ==",
-      "dev": true,
-      "requires": {
-        "unist-util-remove": "^2.0.0"
-      }
-    },
-    "mdast-util-definitions": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-4.0.0.tgz",
-      "integrity": "sha512-k8AJ6aNnUkB7IE+5azR9h81O5EQ/cTDXtWdMq9Kk5KcEW/8ritU5CeLg/9HhOC++nALHBlaogJ5jz0Ybk3kPMQ==",
-      "dev": true,
-      "requires": {
-        "unist-util-visit": "^2.0.0"
-      }
-    },
-    "mdast-util-to-hast": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-10.0.1.tgz",
-      "integrity": "sha512-BW3LM9SEMnjf4HXXVApZMt8gLQWVNXc3jryK0nJu/rOXPOnlkUjmdkDlmxMirpbU9ILncGFIwLH/ubnWBbcdgA==",
-      "dev": true,
-      "requires": {
-        "@types/mdast": "^3.0.0",
-        "@types/unist": "^2.0.0",
-        "mdast-util-definitions": "^4.0.0",
-        "mdurl": "^1.0.0",
-        "unist-builder": "^2.0.0",
-        "unist-util-generated": "^1.0.0",
-        "unist-util-position": "^3.0.0",
-        "unist-util-visit": "^2.0.0"
-      }
-    },
-    "mdurl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
-      "dev": true
-    },
-    "media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
-      "dev": true
-    },
-    "memfs": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.3.0.tgz",
-      "integrity": "sha512-BEE62uMfKOavX3iG7GYX43QJ+hAeeWnwIAuJ/R6q96jaMtiLzhsxHJC8B1L7fK7Pt/vXDRwb3SG/yBpNGDPqzg==",
-      "dev": true,
-      "requires": {
-        "fs-monkey": "1.0.3"
-      }
-    },
-    "memoize-one": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz",
-      "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==",
-      "dev": true
-    },
-    "memoizerific": {
-      "version": "1.11.3",
-      "resolved": "https://registry.npmjs.org/memoizerific/-/memoizerific-1.11.3.tgz",
-      "integrity": "sha1-fIekZGREwy11Q4VwkF8tvRsagFo=",
-      "dev": true,
-      "requires": {
-        "map-or-similar": "^1.5.0"
-      }
-    },
-    "memory-fs": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
-      "dev": true,
-      "requires": {
-        "errno": "^0.1.3",
-        "readable-stream": "^2.0.1"
-      }
-    },
-    "merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
-      "dev": true
-    },
-    "merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
-    },
-    "merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "dev": true
-    },
-    "methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
-      "dev": true
-    },
-    "microevent.ts": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/microevent.ts/-/microevent.ts-0.1.1.tgz",
-      "integrity": "sha512-jo1OfR4TaEwd5HOrt5+tAZ9mqT4jmpNAusXtyfNzqVm9uiSYFZlKM1wYL4oU7azZW/PxQW53wM0S6OR1JHNa2g==",
-      "dev": true
-    },
-    "micromatch": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
-      "dev": true,
-      "requires": {
-        "braces": "^3.0.1",
-        "picomatch": "^2.2.3"
-      }
-    },
-    "miller-rabin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-          "dev": true
-        }
-      }
-    },
-    "mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "dev": true
-    },
-    "mime-db": {
-      "version": "1.50.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz",
-      "integrity": "sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==",
-      "dev": true
-    },
-    "mime-types": {
-      "version": "2.1.33",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.33.tgz",
-      "integrity": "sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==",
-      "dev": true,
-      "requires": {
-        "mime-db": "1.50.0"
-      }
-    },
-    "min-document": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
-      "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=",
-      "dev": true,
-      "requires": {
-        "dom-walk": "^0.1.0"
-      }
-    },
-    "minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-      "dev": true
-    },
-    "minimalistic-crypto-utils": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
-      "dev": true
-    },
-    "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-      "dev": true
-    },
-    "minipass": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz",
-      "integrity": "sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==",
-      "dev": true,
-      "requires": {
-        "yallist": "^4.0.0"
-      }
-    },
-    "minipass-collect": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
-      "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
-      "dev": true,
-      "requires": {
-        "minipass": "^3.0.0"
-      }
-    },
-    "minipass-flush": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
-      "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
-      "dev": true,
-      "requires": {
-        "minipass": "^3.0.0"
-      }
-    },
-    "minipass-pipeline": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
-      "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
-      "dev": true,
-      "requires": {
-        "minipass": "^3.0.0"
-      }
-    },
-    "minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-      "dev": true,
-      "requires": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
-      }
-    },
-    "mississippi": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-      "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-      "dev": true,
-      "requires": {
-        "concat-stream": "^1.5.0",
-        "duplexify": "^3.4.2",
-        "end-of-stream": "^1.1.0",
-        "flush-write-stream": "^1.0.0",
-        "from2": "^2.1.0",
-        "parallel-transform": "^1.1.0",
-        "pump": "^3.0.0",
-        "pumpify": "^1.3.3",
-        "stream-each": "^1.1.0",
-        "through2": "^2.0.0"
-      }
-    },
-    "mixin-deep": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
-      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
-      "dev": true,
-      "requires": {
-        "for-in": "^1.0.2",
-        "is-extendable": "^1.0.1"
-      }
-    },
-    "mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "dev": true
-    },
-    "move-concurrently": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
-      "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
-      "dev": true,
-      "requires": {
-        "aproba": "^1.1.1",
-        "copy-concurrently": "^1.0.0",
-        "fs-write-stream-atomic": "^1.0.8",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.3"
-      },
-      "dependencies": {
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        },
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
-      }
-    },
-    "ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "nanomatch": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
-      "dev": true,
-      "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "fragment-cache": "^0.2.1",
-        "is-windows": "^1.0.2",
-        "kind-of": "^6.0.2",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      }
-    },
-    "negotiator": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
-      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
-      "dev": true
-    },
-    "neo-async": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-      "dev": true
-    },
-    "nested-error-stacks": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-2.1.0.tgz",
-      "integrity": "sha512-AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug==",
-      "dev": true
-    },
-    "no-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
-      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
-      "dev": true,
-      "requires": {
-        "lower-case": "^2.0.2",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node-fetch": {
-      "version": "2.6.5",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.5.tgz",
-      "integrity": "sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ==",
-      "dev": true,
-      "requires": {
-        "whatwg-url": "^5.0.0"
-      }
-    },
-    "node-libs-browser": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
-      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
-      "dev": true,
-      "requires": {
-        "assert": "^1.1.1",
-        "browserify-zlib": "^0.2.0",
-        "buffer": "^4.3.0",
-        "console-browserify": "^1.1.0",
-        "constants-browserify": "^1.0.0",
-        "crypto-browserify": "^3.11.0",
-        "domain-browser": "^1.1.1",
-        "events": "^3.0.0",
-        "https-browserify": "^1.0.0",
-        "os-browserify": "^0.3.0",
-        "path-browserify": "0.0.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": {
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-          "dev": true
-        }
-      }
-    },
-    "node-modules-regexp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
-      "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
-      "dev": true
-    },
-    "node-releases": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz",
-      "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==",
-      "dev": true
-    },
-    "normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "dev": true,
-      "requires": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
-        }
-      }
-    },
-    "normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true
-    },
-    "normalize-range": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
-      "dev": true
-    },
-    "npmlog": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-      "dev": true,
-      "requires": {
-        "are-we-there-yet": "~1.1.2",
-        "console-control-strings": "~1.1.0",
-        "gauge": "~2.7.3",
-        "set-blocking": "~2.0.0"
-      }
-    },
-    "nth-check": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",
-      "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
-      "dev": true,
-      "requires": {
-        "boolbase": "^1.0.0"
-      }
-    },
-    "num2fraction": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
-      "dev": true
-    },
-    "number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "dev": true
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "dev": true
-    },
-    "object-copy": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
-      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
-      "dev": true,
-      "requires": {
-        "copy-descriptor": "^0.1.0",
-        "define-property": "^0.2.5",
-        "kind-of": "^3.0.3"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          }
-        },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
-        "is-data-descriptor": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          }
-        },
-        "is-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "5.1.0",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-              "dev": true
-            }
-          }
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "object-inspect": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
-      "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==",
-      "dev": true
-    },
-    "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
-    },
-    "object-visit": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
-      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
-      "dev": true,
-      "requires": {
-        "isobject": "^3.0.0"
-      },
-      "dependencies": {
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        }
-      }
-    },
-    "object.assign": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
-      "dev": true,
-      "requires": {
-        "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.5",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
-      "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      }
-    },
-    "object.fromentries": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.5.tgz",
-      "integrity": "sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      }
-    },
-    "object.getownpropertydescriptors": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz",
-      "integrity": "sha512-VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      }
-    },
-    "object.pick": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
-      "dev": true,
-      "requires": {
-        "isobject": "^3.0.1"
-      },
-      "dependencies": {
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        }
-      }
-    },
-    "object.values": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
-      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      }
-    },
-    "on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-      "dev": true,
-      "requires": {
-        "ee-first": "1.1.1"
-      }
-    },
-    "on-headers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
-      "dev": true
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "open": {
-      "version": "7.4.2",
-      "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
-      "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
-      "dev": true,
-      "requires": {
-        "is-docker": "^2.0.0",
-        "is-wsl": "^2.1.1"
-      }
-    },
-    "os-browserify": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
-      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
-      "dev": true
-    },
-    "overlayscrollbars": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/overlayscrollbars/-/overlayscrollbars-1.13.1.tgz",
-      "integrity": "sha512-gIQfzgGgu1wy80EB4/6DaJGHMEGmizq27xHIESrzXq0Y/J0Ay1P3DWk6tuVmEPIZH15zaBlxeEJOqdJKmowHCQ==",
-      "dev": true
-    },
-    "p-all": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-all/-/p-all-2.1.0.tgz",
-      "integrity": "sha512-HbZxz5FONzz/z2gJfk6bFca0BCiSRF8jU3yCsWOen/vR6lZjfPOu/e7L3uFzTW1i0H8TlC3vqQstEJPQL4/uLA==",
-      "dev": true,
-      "requires": {
-        "p-map": "^2.0.0"
-      },
-      "dependencies": {
-        "p-map": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
-          "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
-          "dev": true
-        }
-      }
-    },
-    "p-event": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/p-event/-/p-event-4.2.0.tgz",
-      "integrity": "sha512-KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ==",
-      "dev": true,
-      "requires": {
-        "p-timeout": "^3.1.0"
-      }
-    },
-    "p-filter": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-filter/-/p-filter-2.1.0.tgz",
-      "integrity": "sha512-ZBxxZ5sL2HghephhpGAQdoskxplTwr7ICaehZwLIlfL6acuVgZPm8yBNuRAFBGEqtD/hmUeq9eqLg2ys9Xr/yw==",
-      "dev": true,
-      "requires": {
-        "p-map": "^2.0.0"
-      },
-      "dependencies": {
-        "p-map": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
-          "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
-          "dev": true
-        }
-      }
-    },
-    "p-finally": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-      "dev": true
-    },
-    "p-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,
-      "requires": {
-        "yocto-queue": "^0.1.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==",
-      "dev": true,
-      "requires": {
-        "p-limit": "^3.0.2"
-      }
-    },
-    "p-map": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
-      "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==",
-      "dev": true,
-      "requires": {
-        "aggregate-error": "^3.0.0"
-      }
-    },
-    "p-timeout": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz",
-      "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==",
-      "dev": true,
-      "requires": {
-        "p-finally": "^1.0.0"
-      }
-    },
-    "p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true
-    },
-    "pako": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
-      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
-      "dev": true
-    },
-    "parallel-transform": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
-      "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
-      "dev": true,
-      "requires": {
-        "cyclist": "^1.0.1",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.1.5"
-      }
-    },
-    "param-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
-      "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
-      "dev": true,
-      "requires": {
-        "dot-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
-    "parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "requires": {
-        "callsites": "^3.0.0"
-      }
-    },
-    "parse-asn1": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
-      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
-      "dev": 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",
-      "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz",
-      "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==",
-      "dev": true,
-      "requires": {
-        "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": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-      "dev": true,
-      "requires": {
-        "@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"
-      }
-    },
-    "parse5": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
-      "dev": true
-    },
-    "parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-      "dev": true
-    },
-    "pascal-case": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
-      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
-      "dev": true,
-      "requires": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
-    "pascalcase": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
-      "dev": true
-    },
-    "path-browserify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
-      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
-      "dev": true
-    },
-    "path-dirname": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
-      "dev": true
-    },
-    "path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true
-    },
-    "path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true
-    },
-    "path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
-    },
-    "path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
-      "dev": true
-    },
-    "path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true
-    },
-    "pbkdf2": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
-      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
-      "dev": true,
-      "requires": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
-    "picocolors": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-      "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-      "dev": true
-    },
-    "picomatch": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
-      "dev": true
-    },
-    "pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-      "dev": true
-    },
-    "pirates": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
-      "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
-      "dev": true,
-      "requires": {
-        "node-modules-regexp": "^1.0.0"
-      }
-    },
-    "pkg-dir": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-5.0.0.tgz",
-      "integrity": "sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==",
-      "dev": true,
-      "requires": {
-        "find-up": "^5.0.0"
-      }
-    },
-    "pkg-up": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
-      "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
-      "dev": true,
-      "requires": {
-        "find-up": "^3.0.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-          "dev": true
-        }
-      }
-    },
-    "pnp-webpack-plugin": {
-      "version": "1.6.4",
-      "resolved": "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz",
-      "integrity": "sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg==",
-      "dev": true,
-      "requires": {
-        "ts-pnp": "^1.1.6"
-      }
-    },
-    "polished": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/polished/-/polished-4.1.3.tgz",
-      "integrity": "sha512-ocPAcVBUOryJEKe0z2KLd1l9EBa1r5mSwlKpExmrLzsnIzJo4axsoU9O2BjOTkDGDT4mZ0WFE5XKTlR3nLnZOA==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.14.0"
-      }
-    },
-    "posix-character-classes": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
-      "dev": true
-    },
-    "postcss": {
-      "version": "7.0.39",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-      "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-      "dev": true,
-      "requires": {
-        "picocolors": "^0.2.1",
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-flexbugs-fixes": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-4.2.1.tgz",
-      "integrity": "sha512-9SiofaZ9CWpQWxOwRh1b/r85KD5y7GgvsNt1056k6OYLvWUun0czCvogfJgylC22uJTwW1KzY3Gz65NZRlvoiQ==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.26"
-      }
-    },
-    "postcss-loader": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-4.3.0.tgz",
-      "integrity": "sha512-M/dSoIiNDOo8Rk0mUqoj4kpGq91gcxCfb9PoyZVdZ76/AuhxylHDYZblNE8o+EQ9AMSASeMFEKxZf5aU6wlx1Q==",
-      "dev": true,
-      "requires": {
-        "cosmiconfig": "^7.0.0",
-        "klona": "^2.0.4",
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0",
-        "semver": "^7.3.4"
-      },
-      "dependencies": {
-        "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-          "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
-        "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.8",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
-          }
-        },
-        "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
-      }
-    },
-    "postcss-modules-extract-imports": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz",
-      "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.5"
-      }
-    },
-    "postcss-modules-local-by-default": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz",
-      "integrity": "sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==",
-      "dev": true,
-      "requires": {
-        "icss-utils": "^4.1.1",
-        "postcss": "^7.0.32",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.1.0"
-      }
-    },
-    "postcss-modules-scope": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz",
-      "integrity": "sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.6",
-        "postcss-selector-parser": "^6.0.0"
-      }
-    },
-    "postcss-modules-values": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz",
-      "integrity": "sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==",
-      "dev": true,
-      "requires": {
-        "icss-utils": "^4.0.0",
-        "postcss": "^7.0.6"
-      }
-    },
-    "postcss-selector-parser": {
-      "version": "6.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz",
-      "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==",
-      "dev": true,
-      "requires": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      }
-    },
-    "postcss-value-parser": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
-      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
-      "dev": true
-    },
-    "preact": {
-      "version": "10.5.15",
-      "resolved": "https://registry.npmjs.org/preact/-/preact-10.5.15.tgz",
-      "integrity": "sha512-5chK29n6QcJc3m1lVrKQSQ+V7K1Gb8HeQY6FViQ5AxCAEGu3DaHffWNDkC9+miZgsLvbvU9rxbV1qinGHMHzqA==",
-      "dev": true
-    },
-    "preact-render-to-string": {
-      "version": "5.1.19",
-      "resolved": "https://registry.npmjs.org/preact-render-to-string/-/preact-render-to-string-5.1.19.tgz",
-      "integrity": "sha512-bj8sn/oytIKO6RtOGSS/1+5CrQyRSC99eLUnEVbqUa6MzJX5dYh7wu9bmT0d6lm/Vea21k9KhCQwvr2sYN3rrQ==",
-      "dev": true,
-      "requires": {
-        "pretty-format": "^3.8.0"
-      }
-    },
-    "prettier": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz",
-      "integrity": "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==",
-      "dev": true
-    },
-    "pretty-error": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.2.tgz",
-      "integrity": "sha512-EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.20",
-        "renderkid": "^2.0.4"
-      }
-    },
-    "pretty-format": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-3.8.0.tgz",
-      "integrity": "sha1-v77VbV6ad2ZF9LH/eqGjrE+jw4U=",
-      "dev": true
-    },
-    "pretty-hrtime": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
-      "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
-      "dev": true
-    },
-    "prismjs": {
-      "version": "1.25.0",
-      "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.25.0.tgz",
-      "integrity": "sha512-WCjJHl1KEWbnkQom1+SzftbtXMKQoezOCYs5rECqMN+jP+apI7ftoflyqigqzopSO3hMhTEb0mFClA8lkolgEg==",
-      "dev": true
-    },
-    "process": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-      "dev": true
-    },
-    "process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true
-    },
-    "promise-inflight": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
-      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
-      "dev": true
-    },
-    "promise.allsettled": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/promise.allsettled/-/promise.allsettled-1.0.5.tgz",
-      "integrity": "sha512-tVDqeZPoBC0SlzJHzWGZ2NKAguVq2oiYj7gbggbiTvH2itHohijTp7njOUA0aQ/nl+0lr/r6egmhoYu63UZ/pQ==",
-      "dev": true,
-      "requires": {
-        "array.prototype.map": "^1.0.4",
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1",
-        "get-intrinsic": "^1.1.1",
-        "iterate-value": "^1.0.2"
-      }
-    },
-    "promise.prototype.finally": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.3.tgz",
-      "integrity": "sha512-EXRF3fC9/0gz4qkt/f5EP5iW4kj9oFpBICNpCNOb/52+8nlHIX07FPLbi/q4qYBQ1xZqivMzTpNQSnArVASolQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      }
-    },
-    "prompts": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
-      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
-      "dev": true,
-      "requires": {
-        "kleur": "^3.0.3",
-        "sisteransi": "^1.0.5"
-      }
-    },
-    "prop-types": {
-      "version": "15.7.2",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
-      "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
-      "dev": true,
-      "requires": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.8.1"
-      },
-      "dependencies": {
-        "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
-        }
-      }
-    },
-    "property-information": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/property-information/-/property-information-5.6.0.tgz",
-      "integrity": "sha512-YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA==",
-      "dev": true,
-      "requires": {
-        "xtend": "^4.0.0"
-      }
-    },
-    "proxy-addr": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
-      "dev": true,
-      "requires": {
-        "forwarded": "0.2.0",
-        "ipaddr.js": "1.9.1"
-      }
-    },
-    "prr": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
-      "dev": true
-    },
-    "public-encrypt": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
-      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.0",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "parse-asn1": "^5.0.0",
-        "randombytes": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-          "dev": true
-        }
-      }
-    },
-    "pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "pumpify": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
-      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
-      "dev": true,
-      "requires": {
-        "duplexify": "^3.6.0",
-        "inherits": "^2.0.3",
-        "pump": "^2.0.0"
-      },
-      "dependencies": {
-        "pump": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-          "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-          "dev": true,
-          "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
-          }
-        }
-      }
-    },
-    "punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "dev": true
-    },
-    "qs": {
-      "version": "6.10.1",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz",
-      "integrity": "sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==",
-      "dev": true,
-      "requires": {
-        "side-channel": "^1.0.4"
-      }
-    },
-    "querystring": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
-      "dev": true
-    },
-    "querystring-es3": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
-      "dev": true
-    },
-    "queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true
-    },
-    "ramda": {
-      "version": "0.21.0",
-      "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.21.0.tgz",
-      "integrity": "sha1-oAGr7bP/YQd9T/HVd9RN536NCjU=",
-      "dev": true
-    },
-    "randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "randomfill": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-      "dev": true,
-      "requires": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-      "dev": true
-    },
-    "raw-body": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
-      "dev": true,
-      "requires": {
-        "bytes": "3.1.0",
-        "http-errors": "1.7.2",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      },
-      "dependencies": {
-        "bytes": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-          "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
-          "dev": true
-        }
-      }
-    },
-    "raw-loader": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.2.tgz",
-      "integrity": "sha512-ZnScIV3ag9A4wPX/ZayxL/jZH+euYb6FcUinPcgiQW0+UBtEv0O6Q3lGd3cqJ+GHH+rksEv3Pj99oxJ3u3VIKA==",
-      "dev": true,
-      "requires": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0"
-      },
-      "dependencies": {
-        "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-          "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
-        "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.8",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
-          }
-        }
-      }
-    },
-    "react": {
-      "version": "16.14.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-16.14.0.tgz",
-      "integrity": "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==",
-      "dev": true,
-      "requires": {
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1",
-        "prop-types": "^15.6.2"
-      }
-    },
-    "react-colorful": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/react-colorful/-/react-colorful-5.5.0.tgz",
-      "integrity": "sha512-BuzrlrM0ylg7coPkXOrRqlf2BgHLw5L44sybbr9Lg4xy7w9e5N7fGYbojOO0s8J0nvrM3PERN2rVFkvSa24lnQ==",
-      "dev": true,
-      "requires": {}
-    },
-    "react-dev-utils": {
-      "version": "11.0.4",
-      "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.4.tgz",
-      "integrity": "sha512-dx0LvIGHcOPtKbeiSUM4jqpBl3TcY7CDjZdfOIcKeznE7BWr9dg0iPG90G5yfVQ+p/rGNMXdbfStvzQZEVEi4A==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "7.10.4",
-        "address": "1.1.2",
-        "browserslist": "4.14.2",
-        "chalk": "2.4.2",
-        "cross-spawn": "7.0.3",
-        "detect-port-alt": "1.1.6",
-        "escape-string-regexp": "2.0.0",
-        "filesize": "6.1.0",
-        "find-up": "4.1.0",
-        "fork-ts-checker-webpack-plugin": "4.1.6",
-        "global-modules": "2.0.0",
-        "globby": "11.0.1",
-        "gzip-size": "5.1.1",
-        "immer": "8.0.1",
-        "is-root": "2.1.0",
-        "loader-utils": "2.0.0",
-        "open": "^7.0.2",
-        "pkg-up": "3.1.0",
-        "prompts": "2.4.0",
-        "react-error-overlay": "^6.0.9",
-        "recursive-readdir": "2.2.2",
-        "shell-quote": "1.7.2",
-        "strip-ansi": "6.0.0",
-        "text-table": "0.2.0"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.10.4"
-          }
-        },
-        "ansi-regex": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-          "dev": true
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "browserslist": {
-          "version": "4.14.2",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.2.tgz",
-          "integrity": "sha512-HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw==",
-          "dev": true,
-          "requires": {
-            "caniuse-lite": "^1.0.30001125",
-            "electron-to-chromium": "^1.3.564",
-            "escalade": "^3.0.2",
-            "node-releases": "^1.1.61"
-          }
-        },
-        "escape-string-regexp": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-          "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-          "dev": true
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "fork-ts-checker-webpack-plugin": {
-          "version": "4.1.6",
-          "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-4.1.6.tgz",
-          "integrity": "sha512-DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.5.5",
-            "chalk": "^2.4.1",
-            "micromatch": "^3.1.10",
-            "minimatch": "^3.0.4",
-            "semver": "^5.6.0",
-            "tapable": "^1.0.0",
-            "worker-rpc": "^0.1.0"
-          }
-        },
-        "globby": {
-          "version": "11.0.1",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz",
-          "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==",
-          "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"
-          }
-        },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        },
-        "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-          "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^4.1.0"
-          }
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        },
-        "node-releases": {
-          "version": "1.1.77",
-          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.77.tgz",
-          "integrity": "sha512-rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ==",
-          "dev": true
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.2.0"
-          }
-        },
-        "prompts": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.0.tgz",
-          "integrity": "sha512-awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ==",
-          "dev": true,
-          "requires": {
-            "kleur": "^3.0.3",
-            "sisteransi": "^1.0.5"
-          }
-        },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        },
-        "to-regex-range": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-          "dev": true,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
-        }
-      }
-    },
-    "react-dom": {
-      "version": "16.14.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz",
-      "integrity": "sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==",
-      "dev": true,
-      "requires": {
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1",
-        "prop-types": "^15.6.2",
-        "scheduler": "^0.19.1"
-      }
-    },
-    "react-draggable": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/react-draggable/-/react-draggable-4.4.4.tgz",
-      "integrity": "sha512-6e0WdcNLwpBx/YIDpoyd2Xb04PB0elrDrulKUgdrIlwuYvxh5Ok9M+F8cljm8kPXXs43PmMzek9RrB1b7mLMqA==",
-      "dev": true,
-      "requires": {
-        "clsx": "^1.1.1",
-        "prop-types": "^15.6.0"
-      }
-    },
-    "react-error-overlay": {
-      "version": "6.0.9",
-      "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.9.tgz",
-      "integrity": "sha512-nQTTcUu+ATDbrSD1BZHr5kgSD4oF8OFjxun8uAaL8RwPBacGBNPf/yAuVVdx17N8XNzRDMrZ9XcKZHCjPW+9ew==",
-      "dev": true
-    },
-    "react-fast-compare": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.0.tgz",
-      "integrity": "sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA==",
-      "dev": true
-    },
-    "react-helmet-async": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/react-helmet-async/-/react-helmet-async-1.1.2.tgz",
-      "integrity": "sha512-LTTzDDkyIleT/JJ6T/uqx7Y8qi1EuPPSiJawQY/nHHz0h7SPDT6HxP1YDDQx/fzcVxCqpWEEMS3QdrSrNkJYhg==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.12.5",
-        "invariant": "^2.2.4",
-        "prop-types": "^15.7.2",
-        "react-fast-compare": "^3.2.0",
-        "shallowequal": "^1.1.0"
-      }
-    },
-    "react-input-autosize": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-3.0.0.tgz",
-      "integrity": "sha512-nL9uS7jEs/zu8sqwFE5MAPx6pPkNAriACQ2rGLlqmKr2sPGtN7TXTyDdQt4lbNXVx7Uzadb40x8qotIuru6Rhg==",
-      "dev": true,
-      "requires": {
-        "prop-types": "^15.5.8"
-      }
-    },
-    "react-is": {
-      "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
-      "dev": true
-    },
-    "react-lifecycles-compat": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
-      "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==",
-      "dev": true
-    },
-    "react-popper": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.2.5.tgz",
-      "integrity": "sha512-kxGkS80eQGtLl18+uig1UIf9MKixFSyPxglsgLBxlYnyDf65BiY9B3nZSc6C9XUNDgStROB0fMQlTEz1KxGddw==",
-      "dev": true,
-      "requires": {
-        "react-fast-compare": "^3.0.1",
-        "warning": "^4.0.2"
-      }
-    },
-    "react-popper-tooltip": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/react-popper-tooltip/-/react-popper-tooltip-3.1.1.tgz",
-      "integrity": "sha512-EnERAnnKRptQBJyaee5GJScWNUKQPDD2ywvzZyUjst/wj5U64C8/CnSYLNEmP2hG0IJ3ZhtDxE8oDN+KOyavXQ==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.12.5",
-        "@popperjs/core": "^2.5.4",
-        "react-popper": "^2.2.4"
-      }
-    },
-    "react-select": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/react-select/-/react-select-3.2.0.tgz",
-      "integrity": "sha512-B/q3TnCZXEKItO0fFN/I0tWOX3WJvi/X2wtdffmwSQVRwg5BpValScTO1vdic9AxlUgmeSzib2hAZAwIUQUZGQ==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.4.4",
-        "@emotion/cache": "^10.0.9",
-        "@emotion/core": "^10.0.9",
-        "@emotion/css": "^10.0.9",
-        "memoize-one": "^5.0.0",
-        "prop-types": "^15.6.0",
-        "react-input-autosize": "^3.0.0",
-        "react-transition-group": "^4.3.0"
-      }
-    },
-    "react-sizeme": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/react-sizeme/-/react-sizeme-3.0.2.tgz",
-      "integrity": "sha512-xOIAOqqSSmKlKFJLO3inBQBdymzDuXx4iuwkNcJmC96jeiOg5ojByvL+g3MW9LPEsojLbC6pf68zOfobK8IPlw==",
-      "dev": true,
-      "requires": {
-        "element-resize-detector": "^1.2.2",
-        "invariant": "^2.2.4",
-        "shallowequal": "^1.1.0",
-        "throttle-debounce": "^3.0.1"
-      }
-    },
-    "react-syntax-highlighter": {
-      "version": "13.5.3",
-      "resolved": "https://registry.npmjs.org/react-syntax-highlighter/-/react-syntax-highlighter-13.5.3.tgz",
-      "integrity": "sha512-crPaF+QGPeHNIblxxCdf2Lg936NAHKhNhuMzRL3F9ct6aYXL3NcZtCL0Rms9+qVo6Y1EQLdXGypBNSbPL/r+qg==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.3.1",
-        "highlight.js": "^10.1.1",
-        "lowlight": "^1.14.0",
-        "prismjs": "^1.21.0",
-        "refractor": "^3.1.0"
-      }
-    },
-    "react-textarea-autosize": {
-      "version": "8.3.3",
-      "resolved": "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-8.3.3.tgz",
-      "integrity": "sha512-2XlHXK2TDxS6vbQaoPbMOfQ8GK7+irc2fVK6QFIcC8GOnH3zI/v481n+j1L0WaPVvKxwesnY93fEfH++sus2rQ==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.10.2",
-        "use-composed-ref": "^1.0.0",
-        "use-latest": "^1.0.0"
-      }
-    },
-    "react-transition-group": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.2.tgz",
-      "integrity": "sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.5.5",
-        "dom-helpers": "^5.0.1",
-        "loose-envify": "^1.4.0",
-        "prop-types": "^15.6.2"
-      }
-    },
-    "read-pkg": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
-      "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
-      "dev": true,
-      "requires": {
-        "@types/normalize-package-data": "^2.4.0",
-        "normalize-package-data": "^2.5.0",
-        "parse-json": "^5.0.0",
-        "type-fest": "^0.6.0"
-      },
-      "dependencies": {
-        "type-fest": {
-          "version": "0.6.0",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-          "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-          "dev": true
-        }
-      }
-    },
-    "read-pkg-up": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
-      "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
-      "dev": true,
-      "requires": {
-        "find-up": "^4.1.0",
-        "read-pkg": "^5.2.0",
-        "type-fest": "^0.8.1"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^4.1.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.2.0"
-          }
-        }
-      }
-    },
-    "readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "dev": true,
-      "requires": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        }
-      }
-    },
-    "readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dev": true,
-      "requires": {
-        "picomatch": "^2.2.1"
-      }
-    },
-    "recursive-readdir": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz",
-      "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==",
-      "dev": true,
-      "requires": {
-        "minimatch": "3.0.4"
-      }
-    },
-    "refractor": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/refractor/-/refractor-3.5.0.tgz",
-      "integrity": "sha512-QwPJd3ferTZ4cSPPjdP5bsYHMytwWYnAN5EEnLtGvkqp/FCCnGsBgxrm9EuIDnjUC3Uc/kETtvVi7fSIVC74Dg==",
-      "dev": true,
-      "requires": {
-        "hastscript": "^6.0.0",
-        "parse-entities": "^2.0.0",
-        "prismjs": "~1.25.0"
-      }
-    },
-    "regenerate": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
-      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
-      "dev": true
-    },
-    "regenerate-unicode-properties": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz",
-      "integrity": "sha512-3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA==",
-      "dev": true,
-      "requires": {
-        "regenerate": "^1.4.2"
-      }
-    },
-    "regenerator-runtime": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
-      "dev": true
-    },
-    "regenerator-transform": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz",
-      "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.8.4"
-      }
-    },
-    "regex-not": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^3.0.2",
-        "safe-regex": "^1.1.0"
-      }
-    },
-    "regexp.prototype.flags": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz",
-      "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      }
-    },
-    "regexpu-core": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.8.0.tgz",
-      "integrity": "sha512-1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg==",
-      "dev": true,
-      "requires": {
-        "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"
-      }
-    },
-    "regjsgen": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz",
-      "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==",
-      "dev": true
-    },
-    "regjsparser": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.7.0.tgz",
-      "integrity": "sha512-A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ==",
-      "dev": true,
-      "requires": {
-        "jsesc": "~0.5.0"
-      },
-      "dependencies": {
-        "jsesc": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
-          "dev": true
-        }
-      }
-    },
-    "relateurl": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
-      "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
-      "dev": true
-    },
-    "remark-footnotes": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/remark-footnotes/-/remark-footnotes-2.0.0.tgz",
-      "integrity": "sha512-3Clt8ZMH75Ayjp9q4CorNeyjwIxHFcTkaektplKGl2A1jNGEUey8cKL0ZC5vJwfcD5GFGsNLImLG/NGzWIzoMQ==",
-      "dev": true
-    },
-    "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
-        },
-        "@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-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"
-          }
-        },
-        "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-squeeze-paragraphs": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/remark-squeeze-paragraphs/-/remark-squeeze-paragraphs-4.0.0.tgz",
-      "integrity": "sha512-8qRqmL9F4nuLPIgl92XUuxI3pFxize+F1H0e/W3llTk0UsjJaj01+RrirkMw7P21RKe4X6goQhYRSvNWX+70Rw==",
-      "dev": true,
-      "requires": {
-        "mdast-squeeze-paragraphs": "^4.0.0"
-      }
-    },
-    "remove-trailing-separator": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
-      "dev": true,
-      "optional": true
-    },
-    "renderkid": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.7.tgz",
-      "integrity": "sha512-oCcFyxaMrKsKcTY59qnCAtmDVSLfPbrv6A3tVbPdFMMrv5jaK10V6m40cKsoPNhAqN6rmHW9sswW4o3ruSrwUQ==",
-      "dev": true,
-      "requires": {
-        "css-select": "^4.1.3",
-        "dom-converter": "^0.2.0",
-        "htmlparser2": "^6.1.0",
-        "lodash": "^4.17.21",
-        "strip-ansi": "^3.0.1"
-      }
-    },
-    "repeat-element": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
-      "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
-      "dev": true
-    },
-    "repeat-string": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-      "dev": true
-    },
-    "resolve": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
-      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
-      "dev": true,
-      "requires": {
-        "is-core-module": "^2.2.0",
-        "path-parse": "^1.0.6"
-      }
-    },
-    "resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "dev": true
-    },
-    "resolve-url": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
-      "dev": true
-    },
-    "ret": {
-      "version": "0.1.15",
-      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-      "dev": true
-    },
-    "reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "dev": true
-    },
-    "rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.1.3"
-      }
-    },
-    "ripemd160": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-      "dev": true,
-      "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
-      }
-    },
-    "run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "dev": true,
-      "requires": {
-        "queue-microtask": "^1.2.2"
-      }
-    },
-    "run-queue": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
-      "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
-      "dev": true,
-      "requires": {
-        "aproba": "^1.1.1"
-      }
-    },
-    "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
-    },
-    "safe-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
-      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
-      "dev": true,
-      "requires": {
-        "ret": "~0.1.10"
-      }
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
-    },
-    "scheduler": {
-      "version": "0.19.1",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz",
-      "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==",
-      "dev": true,
-      "requires": {
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1"
-      }
-    },
-    "schema-utils": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
-      "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
-      "dev": true,
-      "requires": {
-        "@types/json-schema": "^7.0.5",
-        "ajv": "^6.12.4",
-        "ajv-keywords": "^3.5.2"
-      }
-    },
-    "semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true
-    },
-    "send": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
-      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
-      "dev": true,
-      "requires": {
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "~1.7.2",
-        "mime": "1.6.0",
-        "ms": "2.1.1",
-        "on-finished": "~2.3.0",
-        "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          },
-          "dependencies": {
-            "ms": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-              "dev": true
-            }
-          }
-        },
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-          "dev": true
-        }
-      }
-    },
-    "serialize-javascript": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
-      "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
-      "dev": true,
-      "requires": {
-        "randombytes": "^2.1.0"
-      }
-    },
-    "serve-favicon": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.5.0.tgz",
-      "integrity": "sha1-k10kDN/g9YBTB/3+ln2IlCosvPA=",
-      "dev": true,
-      "requires": {
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "ms": "2.1.1",
-        "parseurl": "~1.3.2",
-        "safe-buffer": "5.1.1"
-      },
-      "dependencies": {
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-          "dev": true
-        },
-        "safe-buffer": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-          "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-          "dev": true
-        }
-      }
-    },
-    "serve-static": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
-      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
-      "dev": true,
-      "requires": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.3",
-        "send": "0.17.1"
-      }
-    },
-    "set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-      "dev": true
-    },
-    "set-value": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
-      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-extendable": "^0.1.1",
-        "is-plain-object": "^2.0.3",
-        "split-string": "^3.0.1"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
-        },
-        "is-plain-object": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-          "dev": true,
-          "requires": {
-            "isobject": "^3.0.1"
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        }
-      }
-    },
-    "setimmediate": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
-      "dev": true
-    },
-    "setprototypeof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
-      "dev": true
-    },
-    "sha.js": {
-      "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "shallow-clone": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
-      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
-      "dev": true,
-      "requires": {
-        "kind-of": "^6.0.2"
-      }
-    },
-    "shallowequal": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz",
-      "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==",
-      "dev": true
-    },
-    "shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
-      "requires": {
-        "shebang-regex": "^3.0.0"
-      }
-    },
-    "shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true
-    },
-    "shell-quote": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz",
-      "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==",
-      "dev": true
-    },
-    "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": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
-      }
-    },
-    "signal-exit": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz",
-      "integrity": "sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ==",
-      "dev": true
-    },
-    "sisteransi": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
-      "dev": true
-    },
-    "slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "dev": true
-    },
-    "snapdragon": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-      "dev": true,
-      "requires": {
-        "base": "^0.11.1",
-        "debug": "^2.2.0",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "map-cache": "^0.2.2",
-        "source-map": "^0.5.6",
-        "source-map-resolve": "^0.5.0",
-        "use": "^3.1.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
-        "is-data-descriptor": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
-          }
-        },
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
-      }
-    },
-    "snapdragon-node": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
-      "dev": true,
-      "requires": {
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.0",
-        "snapdragon-util": "^3.0.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        }
-      }
-    },
-    "snapdragon-util": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.2.0"
-      },
-      "dependencies": {
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "source-list-map": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
-      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
-      "dev": true
-    },
-    "source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "dev": true
-    },
-    "source-map-resolve": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
-      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
-      "dev": true,
-      "requires": {
-        "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": {
-      "version": "0.5.20",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz",
-      "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==",
-      "dev": true,
-      "requires": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "source-map-url": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
-      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
-      "dev": true
-    },
-    "space-separated-tokens": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz",
-      "integrity": "sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA==",
-      "dev": true
-    },
-    "spdx-correct": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
-      "dev": true,
-      "requires": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "spdx-exceptions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
-      "dev": true
-    },
-    "spdx-expression-parse": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
-      "dev": true,
-      "requires": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "spdx-license-ids": {
-      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz",
-      "integrity": "sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA==",
-      "dev": true
-    },
-    "split-string": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^3.0.0"
-      }
-    },
-    "ssri": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
-      "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
-      "dev": true,
-      "requires": {
-        "minipass": "^3.1.1"
-      }
-    },
-    "stable": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
-      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
-      "dev": true
-    },
-    "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
-    },
-    "static-extend": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
-      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
-      "dev": true,
-      "requires": {
-        "define-property": "^0.2.5",
-        "object-copy": "^0.1.0"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
-        "is-data-descriptor": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
-          }
-        },
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "dev": true
-        }
-      }
-    },
-    "statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
-      "dev": true
-    },
-    "store2": {
-      "version": "2.12.0",
-      "resolved": "https://registry.npmjs.org/store2/-/store2-2.12.0.tgz",
-      "integrity": "sha512-7t+/wpKLanLzSnQPX8WAcuLCCeuSHoWdQuh9SB3xD0kNOM38DNf+0Oa+wmvxmYueRzkmh6IcdKFtvTa+ecgPDw==",
-      "dev": true
-    },
-    "stream-browserify": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
-      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
-      "dev": true,
-      "requires": {
-        "inherits": "~2.0.1",
-        "readable-stream": "^2.0.2"
-      }
-    },
-    "stream-each": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
-      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "stream-shift": "^1.0.0"
-      }
-    },
-    "stream-http": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
-      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
-      "dev": true,
-      "requires": {
-        "builtin-status-codes": "^3.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.3.6",
-        "to-arraybuffer": "^1.0.0",
-        "xtend": "^4.0.0"
-      }
-    },
-    "stream-shift": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
-      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
-      "dev": true
-    },
-    "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "string-hash": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/string-hash/-/string-hash-1.1.3.tgz",
-      "integrity": "sha1-6Kr8CsGFW0Zmkp7X3RJ1311sgRs=",
-      "dev": true
-    },
-    "string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "requires": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.1"
-          }
-        }
-      }
-    },
-    "string.prototype.matchall": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.6.tgz",
-      "integrity": "sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg==",
-      "dev": true,
-      "requires": {
-        "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": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.3.tgz",
-      "integrity": "sha512-jNIIeokznm8SD/TZISQsZKYu7RJyheFNt84DUPrh482GC8RVp2MKqm2O5oBRdGxbDQoXrhhWtPIWQOiy20svUg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      }
-    },
-    "string.prototype.padstart": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/string.prototype.padstart/-/string.prototype.padstart-3.1.3.tgz",
-      "integrity": "sha512-NZydyOMtYxpTjGqp0VN5PYUF/tsU15yDMZnUdj16qRUIUiMJkHHSDElYyQFrMu+/WloTpA7MQSiADhBicDfaoA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      }
-    },
-    "string.prototype.trimend": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
-      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      }
-    },
-    "string.prototype.trimstart": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
-      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      }
-    },
-    "strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^2.0.0"
-      }
-    },
-    "style-loader": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.3.0.tgz",
-      "integrity": "sha512-V7TCORko8rs9rIqkSrlMfkqA63DfoGBBJmK1kKGCcSi+BWb4cqz0SRsnp4l6rU5iwOEd0/2ePv68SV22VXon4Q==",
-      "dev": true,
-      "requires": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^2.7.0"
-      },
-      "dependencies": {
-        "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-          "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        }
-      }
-    },
-    "style-to-object": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-0.3.0.tgz",
-      "integrity": "sha512-CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA==",
-      "dev": true,
-      "requires": {
-        "inline-style-parser": "0.1.1"
-      }
-    },
-    "styled-jsx": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/styled-jsx/-/styled-jsx-4.0.1.tgz",
-      "integrity": "sha512-Gcb49/dRB1k8B4hdK8vhW27Rlb2zujCk1fISrizCcToIs+55B4vmUM0N9Gi4nnVfFZWe55jRdWpAqH1ldAKWvQ==",
-      "dev": 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/types": {
-          "version": "7.15.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz",
-          "integrity": "sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.14.9",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "convert-source-map": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
-          "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.1"
-          }
-        },
-        "emojis-list": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-          "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
-          "dev": true
-        },
-        "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        },
-        "loader-utils": {
-          "version": "1.2.3",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
-          "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
-          "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^2.0.0",
-            "json5": "^1.0.1"
-          }
-        },
-        "source-map": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-          "dev": true
-        }
-      }
-    },
-    "stylis": {
-      "version": "3.5.4",
-      "resolved": "https://registry.npmjs.org/stylis/-/stylis-3.5.4.tgz",
-      "integrity": "sha512-8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q==",
-      "dev": true
-    },
-    "stylis-rule-sheet": {
-      "version": "0.0.10",
-      "resolved": "https://registry.npmjs.org/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz",
-      "integrity": "sha512-nTbZoaqoBnmK+ptANthb10ZRZOGC+EmTLLUxeYIuHNkEKcmKgXX1XWKkUBT2Ac4es3NybooPe0SmvKdhKJZAuw==",
-      "dev": true,
-      "requires": {}
-    },
-    "supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "requires": {
-        "has-flag": "^3.0.0"
-      }
-    },
-    "symbol.prototype.description": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/symbol.prototype.description/-/symbol.prototype.description-1.0.5.tgz",
-      "integrity": "sha512-x738iXRYsrAt9WBhRCVG5BtIC3B7CUkFwbHW2zOvGtwM33s7JjrCDyq8V0zgMYVb5ymsL8+qkzzpANH63CPQaQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-symbol-description": "^1.0.0",
-        "has-symbols": "^1.0.2",
-        "object.getownpropertydescriptors": "^2.1.2"
-      }
-    },
-    "tapable": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
-      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
-      "dev": true
-    },
-    "tar": {
-      "version": "6.1.11",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
-      "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
-      "dev": true,
-      "requires": {
-        "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"
-      }
-    },
-    "telejson": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/telejson/-/telejson-5.3.3.tgz",
-      "integrity": "sha512-PjqkJZpzEggA9TBpVtJi1LVptP7tYtXB6rEubwlHap76AMjzvOdKX41CxyaW7ahhzDU1aftXnMCx5kAPDZTQBA==",
-      "dev": true,
-      "requires": {
-        "@types/is-function": "^1.0.0",
-        "global": "^4.4.0",
-        "is-function": "^1.0.2",
-        "is-regex": "^1.1.2",
-        "is-symbol": "^1.0.3",
-        "isobject": "^4.0.0",
-        "lodash": "^4.17.21",
-        "memoizerific": "^1.11.3"
-      }
-    },
-    "term-size": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz",
-      "integrity": "sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==",
-      "dev": true
-    },
-    "terser": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
-      "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
-      "dev": true,
-      "requires": {
-        "commander": "^2.20.0",
-        "source-map": "~0.6.1",
-        "source-map-support": "~0.5.12"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.20.3",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "terser-webpack-plugin": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz",
-      "integrity": "sha512-jTgXh40RnvOrLQNgIkwEKnQ8rmHjHK4u+6UBEi+W+FPmvb+uo+chJXntKe7/3lW5mNysgSWD60KyesnhW8D6MQ==",
-      "dev": true,
-      "requires": {
-        "cacache": "^15.0.5",
-        "find-cache-dir": "^3.3.1",
-        "jest-worker": "^26.5.0",
-        "p-limit": "^3.0.2",
-        "schema-utils": "^3.0.0",
-        "serialize-javascript": "^5.0.1",
-        "source-map": "^0.6.1",
-        "terser": "^5.3.4",
-        "webpack-sources": "^1.4.3"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.20.3",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-          "dev": true
-        },
-        "find-cache-dir": {
-          "version": "3.3.2",
-          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
-          "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
-          "dev": true,
-          "requires": {
-            "commondir": "^1.0.1",
-            "make-dir": "^3.0.2",
-            "pkg-dir": "^4.1.0"
-          }
-        },
-        "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^4.1.0"
-          }
-        },
-        "make-dir": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-          "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-          "dev": true,
-          "requires": {
-            "semver": "^6.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.2.0"
-          },
-          "dependencies": {
-            "p-limit": {
-              "version": "2.3.0",
-              "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-              "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-              "dev": true,
-              "requires": {
-                "p-try": "^2.0.0"
-              }
-            }
-          }
-        },
-        "pkg-dir": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-          "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-          "dev": true,
-          "requires": {
-            "find-up": "^4.0.0"
-          }
-        },
-        "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.8",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "terser": {
-          "version": "5.9.0",
-          "resolved": "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz",
-          "integrity": "sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==",
-          "dev": true,
-          "requires": {
-            "commander": "^2.20.0",
-            "source-map": "~0.7.2",
-            "source-map-support": "~0.5.20"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.7.3",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-              "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-              "dev": true
-            }
-          }
-        }
-      }
-    },
-    "text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "dev": true
-    },
-    "throttle-debounce": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-3.0.1.tgz",
-      "integrity": "sha512-dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg==",
-      "dev": true
-    },
-    "through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "dev": true,
-      "requires": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
-      }
-    },
-    "timers-browserify": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
-      "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
-      "dev": true,
-      "requires": {
-        "setimmediate": "^1.0.4"
-      }
-    },
-    "to-arraybuffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
-      "dev": true
-    },
-    "to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-      "dev": true
-    },
-    "to-object-path": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "to-regex": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-      "dev": true,
-      "requires": {
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "regex-not": "^1.0.2",
-        "safe-regex": "^1.1.0"
-      }
-    },
-    "to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "requires": {
-        "is-number": "^7.0.0"
-      }
-    },
-    "toggle-selection": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/toggle-selection/-/toggle-selection-1.0.6.tgz",
-      "integrity": "sha1-bkWxJj8gF/oKzH2J14sVuL932jI=",
-      "dev": true
-    },
-    "toidentifier": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
-      "dev": true
-    },
-    "tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=",
-      "dev": true
-    },
-    "trim": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz",
-      "integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0=",
-      "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",
-      "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz",
-      "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==",
-      "dev": true
-    },
-    "ts-dedent": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgz",
-      "integrity": "sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==",
-      "dev": true
-    },
-    "ts-essentials": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/ts-essentials/-/ts-essentials-2.0.12.tgz",
-      "integrity": "sha512-3IVX4nI6B5cc31/GFFE+i8ey/N2eA0CZDbo6n0yrz0zDX8ZJ8djmU1p+XRz7G3is0F3bB3pu2pAroFdAWQKU3w==",
-      "dev": true
-    },
-    "ts-pnp": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz",
-      "integrity": "sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==",
-      "dev": true
-    },
-    "tslib": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-      "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
-      "dev": true
-    },
-    "tty-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
-      "dev": true
-    },
-    "type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-      "dev": true
-    },
-    "type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "dev": true,
-      "requires": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      }
-    },
-    "typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-      "dev": true
-    },
-    "unbox-primitive": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
-      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1",
-        "has-bigints": "^1.0.1",
-        "has-symbols": "^1.0.2",
-        "which-boxed-primitive": "^1.0.2"
-      }
-    },
-    "unfetch": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/unfetch/-/unfetch-4.2.0.tgz",
-      "integrity": "sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA==",
-      "dev": true
-    },
-    "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"
-      }
-    },
-    "unicode-canonical-property-names-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
-      "dev": true
-    },
-    "unicode-match-property-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
-      "dev": true,
-      "requires": {
-        "unicode-canonical-property-names-ecmascript": "^2.0.0",
-        "unicode-property-aliases-ecmascript": "^2.0.0"
-      }
-    },
-    "unicode-match-property-value-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==",
-      "dev": true
-    },
-    "unicode-property-aliases-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==",
-      "dev": true
-    },
-    "unified": {
-      "version": "9.2.0",
-      "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.0.tgz",
-      "integrity": "sha512-vx2Z0vY+a3YoTj8+pttM3tiJHCwY5UFbYdiWrwBEbHmK8pvsPj2rtAX2BFfgXen8T39CJWblWRDT4L5WGXtDdg==",
-      "dev": true,
-      "requires": {
-        "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": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
-      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
-      "dev": true,
-      "requires": {
-        "arr-union": "^3.1.0",
-        "get-value": "^2.0.6",
-        "is-extendable": "^0.1.1",
-        "set-value": "^2.0.1"
-      },
-      "dependencies": {
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
-        }
-      }
-    },
-    "unique-filename": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
-      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
-      "dev": true,
-      "requires": {
-        "unique-slug": "^2.0.0"
-      }
-    },
-    "unique-slug": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
-      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
-      "dev": true,
-      "requires": {
-        "imurmurhash": "^0.1.4"
-      }
-    },
-    "unist-builder": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/unist-builder/-/unist-builder-2.0.3.tgz",
-      "integrity": "sha512-f98yt5pnlMWlzP539tPc4grGMsFaQQlP/vM396b00jngsiINumNmsY8rkXjfoi1c6QaM8nQ3vaGDuoKWbe/1Uw==",
-      "dev": true
-    },
-    "unist-util-generated": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-1.1.6.tgz",
-      "integrity": "sha512-cln2Mm1/CZzN5ttGK7vkoGw+RZ8VcUH6BtGbq98DDtRGquAAOXig1mrBQYelOwMXYS8rK+vZDyyojSjp7JX+Lg==",
-      "dev": true
-    },
-    "unist-util-is": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz",
-      "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==",
-      "dev": true
-    },
-    "unist-util-position": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.1.0.tgz",
-      "integrity": "sha512-w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA==",
-      "dev": true
-    },
-    "unist-util-remove": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/unist-util-remove/-/unist-util-remove-2.1.0.tgz",
-      "integrity": "sha512-J8NYPyBm4baYLdCbjmf1bhPu45Cr1MWTm77qd9istEkzWpnN6O9tMsEbB2JhNnBCqGENRqEWomQ+He6au0B27Q==",
-      "dev": true,
-      "requires": {
-        "unist-util-is": "^4.0.0"
-      }
-    },
-    "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"
-      }
-    },
-    "unist-util-stringify-position": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz",
-      "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==",
-      "dev": true,
-      "requires": {
-        "@types/unist": "^2.0.2"
-      }
-    },
-    "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"
-      }
-    },
-    "universalify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-      "dev": true
-    },
-    "unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
-      "dev": true
-    },
-    "unquote": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
-      "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
-      "dev": true
-    },
-    "unset-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
-      "dev": true,
-      "requires": {
-        "has-value": "^0.3.1",
-        "isobject": "^3.0.0"
-      },
-      "dependencies": {
-        "has-value": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
-          "dev": true,
-          "requires": {
-            "get-value": "^2.0.3",
-            "has-values": "^0.1.4",
-            "isobject": "^2.0.0"
-          },
-          "dependencies": {
-            "isobject": {
-              "version": "2.1.0",
-              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-              "dev": true,
-              "requires": {
-                "isarray": "1.0.0"
-              }
-            }
-          }
-        },
-        "has-values": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
-          "dev": true
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        }
-      }
-    },
-    "upath": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-      "dev": true,
-      "optional": true
-    },
-    "uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
-      "requires": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "urix": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-      "dev": true
-    },
-    "url": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-      "dev": true,
-      "requires": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
-          "dev": true
-        }
-      }
-    },
-    "url-loader": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz",
-      "integrity": "sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==",
-      "dev": true,
-      "requires": {
-        "loader-utils": "^2.0.0",
-        "mime-types": "^2.1.27",
-        "schema-utils": "^3.0.0"
-      },
-      "dependencies": {
-        "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-          "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
-        "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.8",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
-          }
-        }
-      }
-    },
-    "use": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-      "dev": true
-    },
-    "use-composed-ref": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/use-composed-ref/-/use-composed-ref-1.1.0.tgz",
-      "integrity": "sha512-my1lNHGWsSDAhhVAT4MKs6IjBUtG6ZG11uUqexPH9PptiIZDQOzaF4f5tEbJ2+7qvNbtXNBbU3SfmN+fXlWDhg==",
-      "dev": true,
-      "requires": {
-        "ts-essentials": "^2.0.3"
-      }
-    },
-    "use-isomorphic-layout-effect": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.1.tgz",
-      "integrity": "sha512-L7Evj8FGcwo/wpbv/qvSfrkHFtOpCzvM5yl2KVyDJoylVuSvzphiiasmjgQPttIGBAy2WKiBNR98q8w7PiNgKQ==",
-      "dev": true,
-      "requires": {}
-    },
-    "use-latest": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/use-latest/-/use-latest-1.2.0.tgz",
-      "integrity": "sha512-d2TEuG6nSLKQLAfW3By8mKr8HurOlTkul0sOpxbClIv4SQ4iOd7BYr7VIzdbktUCnv7dua/60xzd8igMU6jmyw==",
-      "dev": true,
-      "requires": {
-        "use-isomorphic-layout-effect": "^1.0.0"
-      }
-    },
-    "util": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
-      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+    "node_modules/ws": {
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "dev": true,
-      "requires": {
-        "inherits": "2.0.3"
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=10.0.0"
       },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true
-        }
-      }
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
-    },
-    "util.promisify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
-      "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.2",
-        "object.getownpropertydescriptors": "^2.0.3"
-      }
-    },
-    "utila": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
-      "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=",
-      "dev": true
-    },
-    "utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
-      "dev": true
-    },
-    "uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "dev": true
-    },
-    "validate-npm-package-license": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "dev": true,
-      "requires": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
-      "dev": true
-    },
-    "vfile": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz",
-      "integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==",
-      "dev": true,
-      "requires": {
-        "@types/unist": "^2.0.0",
-        "is-buffer": "^2.0.0",
-        "unist-util-stringify-position": "^2.0.0",
-        "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",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz",
-      "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==",
-      "dev": true,
-      "requires": {
-        "@types/unist": "^2.0.0",
-        "unist-util-stringify-position": "^2.0.0"
-      }
-    },
-    "vm-browserify": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
-      "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
-      "dev": true
-    },
-    "warning": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
-      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
-      "dev": true,
-      "requires": {
-        "loose-envify": "^1.0.0"
-      }
-    },
-    "watchpack": {
-      "version": "1.7.5",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
-      "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==",
-      "dev": true,
-      "requires": {
-        "chokidar": "^3.4.1",
-        "graceful-fs": "^4.1.2",
-        "neo-async": "^2.5.0",
-        "watchpack-chokidar2": "^2.0.1"
-      }
-    },
-    "watchpack-chokidar2": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz",
-      "integrity": "sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "chokidar": "^2.1.8"
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
       },
-      "dependencies": {
-        "anymatch": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "micromatch": "^3.1.4",
-            "normalize-path": "^2.1.1"
-          },
-          "dependencies": {
-            "normalize-path": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-              "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "remove-trailing-separator": "^1.0.1"
-              }
-            }
-          }
-        },
-        "binary-extensions": {
-          "version": "1.13.1",
-          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-          "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-          "dev": true,
-          "optional": true
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "chokidar": {
-          "version": "2.1.8",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-          "dev": true,
-          "optional": 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",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
-          },
-          "dependencies": {
-            "is-glob": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "is-extglob": "^2.1.0"
-              }
-            }
-          }
-        },
-        "is-binary-path": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-          "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "binary-extensions": "^1.0.0"
-          }
-        },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true,
-          "optional": true
-        },
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true,
+      "peerDependenciesMeta": {
+        "bufferutil": {
           "optional": true
         },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true,
+        "utf-8-validate": {
           "optional": true
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "optional": 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"
-          }
-        },
-        "readdirp": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "graceful-fs": "^4.1.11",
-            "micromatch": "^3.1.10",
-            "readable-stream": "^2.0.2"
-          }
-        },
-        "to-regex-range": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
-        }
-      }
-    },
-    "web-namespaces": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/web-namespaces/-/web-namespaces-1.1.4.tgz",
-      "integrity": "sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw==",
-      "dev": true
-    },
-    "webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=",
-      "dev": true
-    },
-    "webpack": {
-      "version": "4.46.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz",
-      "integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==",
-      "dev": true,
-      "requires": {
-        "@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": {
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "cacache": {
-          "version": "12.0.4",
-          "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
-          "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
-          "dev": 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"
-          }
-        },
-        "chownr": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-          "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-          "dev": true
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-wsl": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-          "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
-          "dev": true
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        },
-        "lru-cache": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-          "dev": true,
-          "requires": {
-            "yallist": "^3.0.2"
-          }
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        },
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        },
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
-        "schema-utils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
-          }
-        },
-        "serialize-javascript": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
-          "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
-          "dev": true,
-          "requires": {
-            "randombytes": "^2.1.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "ssri": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz",
-          "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
-          "dev": true,
-          "requires": {
-            "figgy-pudding": "^3.5.1"
-          }
-        },
-        "terser-webpack-plugin": {
-          "version": "1.4.5",
-          "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz",
-          "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==",
-          "dev": true,
-          "requires": {
-            "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"
-          }
-        },
-        "to-regex-range": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-          "dev": true,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
-        },
-        "yallist": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-          "dev": true
-        }
-      }
-    },
-    "webpack-dev-middleware": {
-      "version": "3.7.3",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz",
-      "integrity": "sha512-djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ==",
-      "dev": true,
-      "requires": {
-        "memory-fs": "^0.4.1",
-        "mime": "^2.4.4",
-        "mkdirp": "^0.5.1",
-        "range-parser": "^1.2.1",
-        "webpack-log": "^2.0.0"
-      },
-      "dependencies": {
-        "mime": {
-          "version": "2.5.2",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
-          "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
-          "dev": true
-        },
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        }
-      }
-    },
-    "webpack-filter-warnings-plugin": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/webpack-filter-warnings-plugin/-/webpack-filter-warnings-plugin-1.2.1.tgz",
-      "integrity": "sha512-Ez6ytc9IseDMLPo0qCuNNYzgtUl8NovOqjIq4uAU8LTD4uoa1w1KpZyyzFtLTEMZpkkOkLfL9eN+KGYdk1Qtwg==",
-      "dev": true,
-      "requires": {}
-    },
-    "webpack-hot-middleware": {
-      "version": "2.25.1",
-      "resolved": "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.25.1.tgz",
-      "integrity": "sha512-Koh0KyU/RPYwel/khxbsDz9ibDivmUbrRuKSSQvW42KSDdO4w23WI3SkHpSUKHE76LrFnnM/L7JCrpBwu8AXYw==",
-      "dev": true,
-      "requires": {
-        "ansi-html-community": "0.0.8",
-        "html-entities": "^2.1.0",
-        "querystring": "^0.2.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.1"
-          }
-        }
-      }
-    },
-    "webpack-log": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
-      "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
-      "dev": true,
-      "requires": {
-        "ansi-colors": "^3.0.0",
-        "uuid": "^3.3.2"
-      }
-    },
-    "webpack-sources": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-      "dev": true,
-      "requires": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "webpack-virtual-modules": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.2.2.tgz",
-      "integrity": "sha512-kDUmfm3BZrei0y+1NTHJInejzxfhtU8eDj2M7OKb2IWrPFAeO1SOH2KuQ68MSZu9IGEHcxbkKKR1v18FrUSOmA==",
-      "dev": true,
-      "requires": {
-        "debug": "^3.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": {
-            "ms": "^2.1.1"
-          }
         }
       }
     },
-    "whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
-      "dev": true,
-      "requires": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
-    "which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "requires": {
-        "isexe": "^2.0.0"
-      }
-    },
-    "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": {
-        "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"
-      }
-    },
-    "wide-align": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
-      "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
-      "dev": true,
-      "requires": {
-        "string-width": "^1.0.2 || 2 || 3 || 4"
-      }
-    },
-    "widest-line": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
-      "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==",
-      "dev": true,
-      "requires": {
-        "string-width": "^4.0.0"
-      }
-    },
-    "worker-farm": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
-      "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
-      "dev": true,
-      "requires": {
-        "errno": "~0.1.7"
-      }
-    },
-    "worker-rpc": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/worker-rpc/-/worker-rpc-0.1.1.tgz",
-      "integrity": "sha512-P1WjMrUB3qgJNI9jfmpZ/htmBEjFh//6l/5y8SD9hg1Ef5zTTVVoRjTrTEzPrNBQvmhMxkoTsjOXN10GWU7aCg==",
+    "node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
       "dev": true,
-      "requires": {
-        "microevent.ts": "~0.1.1"
-      }
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
-    },
-    "xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "dev": true
-    },
-    "y18n": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
-      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-      "dev": true
-    },
-    "yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-      "dev": true
-    },
-    "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
-    },
-    "zwitch": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz",
-      "integrity": "sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==",
-      "dev": true
+      "license": "ISC"
     }
   }
 }
diff --git a/build-system/tasks/storybook/package.json b/build-system/tasks/storybook/package.json
index 8844930cf6f8..e562546be6d3 100644
--- a/build-system/tasks/storybook/package.json
+++ b/build-system/tasks/storybook/package.json
@@ -1,22 +1,13 @@
 {
   "name": "amp-storybook",
   "version": "0.1.0",
-  "description": "amp storybook tasks",
-  "main": "index.js",
+  "description": "amp storybook task",
   "devDependencies": {
-    "@babel/core": "7.15.8",
-    "@babel/preset-react": "7.14.5",
-    "@babel/runtime-corejs3": "7.15.4",
-    "@storybook/addon-a11y": "6.3.12",
-    "@storybook/addon-controls": "6.3.12",
-    "@storybook/addon-knobs": "6.3.1",
-    "@storybook/addon-viewport": "6.3.12",
-    "@storybook/client-api": "6.3.12",
-    "@storybook/preact": "6.3.12",
-    "babel-loader": "8.2.3",
-    "core-js": "3.19.0",
-    "preact": "10.5.15",
-    "preact-render-to-string": "5.1.19",
-    "styled-jsx": "4.0.1"
+    "@babel/core": "7.26.0",
+    "@babel/preset-react": "7.26.3",
+    "@storybook/addon-a11y": "8.4.7",
+    "@storybook/addon-controls": "8.4.7",
+    "@storybook/addon-viewport": "8.4.7",
+    "babel-loader": "9.2.1"
   }
 }
diff --git a/build-system/tasks/storybook/preact-env/main.js b/build-system/tasks/storybook/preact-env/main.js
deleted file mode 100644
index e5b8bf004b9d..000000000000
--- a/build-system/tasks/storybook/preact-env/main.js
+++ /dev/null
@@ -1,24 +0,0 @@
-const {webpackConfigNoChunkTilde} = require('../env-utils');
-
-module.exports = {
-  stories: [
-    '../../../../src/**/storybook/!(*.amp).js',
-    '../../../../extensions/**/*.*/storybook/!(*.amp).js',
-  ],
-  addons: [
-    '@storybook/addon-a11y',
-    '@storybook/addon-viewport/register',
-    '@storybook/addon-controls/register',
-    // TODO(#35923): Remove addon-knobs once all stories are migrated to
-    // addon-controls (args/argTypes).
-    '@storybook/addon-knobs',
-  ],
-  managerWebpack: (config) => {
-    return webpackConfigNoChunkTilde(config);
-  },
-  webpackFinal: async (config) => {
-    // Disable entry point size warnings.
-    config.performance.hints = false;
-    return config;
-  },
-};
diff --git a/build-system/tasks/storybook/preact-env/webpack.config.js b/build-system/tasks/storybook/preact-env/webpack.config.js
deleted file mode 100644
index 9119ae6b6f1b..000000000000
--- a/build-system/tasks/storybook/preact-env/webpack.config.js
+++ /dev/null
@@ -1,64 +0,0 @@
-const path = require('path');
-const {BUILD_CONSTANTS} = require('../../../compile/build-constants');
-const {DefinePlugin} = require('webpack');
-const {getRelativeAliasMap} = require('../../../babel-config/import-resolver');
-const {webpackConfigNoChunkTilde} = require('../env-utils');
-
-const rootDir = path.join(__dirname, '../../../..');
-
-module.exports = ({config}) => {
-  config.resolveLoader = {
-    modules: [
-      path.join(__dirname, '../node_modules'),
-      path.join(rootDir, 'node_modules'),
-    ],
-  };
-  config.resolve = {
-    modules: [
-      path.join(__dirname, '../node_modules'),
-      path.join(rootDir, 'node_modules'),
-    ],
-    alias: {
-      'react': 'preact/compat',
-      'react-dom': 'preact/compat',
-      ...getRelativeAliasMap(rootDir),
-    },
-  };
-  config.module = {
-    rules: [
-      {
-        test: /\.jsx?$/,
-        loader: 'babel-loader',
-        exclude: /node_modules/,
-        query: {
-          presets: [
-            [
-              '@babel/preset-env',
-              {
-                bugfixes: true,
-                targets: {'browsers': ['Last 2 versions']},
-              },
-            ],
-            [
-              '@babel/preset-react',
-              {
-                pragma: 'Preact.createElement',
-                pragmaFrag: 'Preact.Fragment',
-                useSpread: true,
-              },
-            ],
-          ],
-        },
-      },
-      {
-        test: /\.css$/i,
-        use: ['style-loader', 'css-loader'],
-      },
-    ],
-  };
-  // Replaced by minify-replace (babel) in the usual build pipeline
-  // build-system/babel-config/helpers.js#getReplacePlugin
-  config.plugins.push(new DefinePlugin(BUILD_CONSTANTS));
-
-  return webpackConfigNoChunkTilde(config);
-};
diff --git a/build-system/tasks/sweep-experiments/README.md b/build-system/tasks/sweep-experiments/README.md
index 092a420a8b05..28e574f4b238 100644
--- a/build-system/tasks/sweep-experiments/README.md
+++ b/build-system/tasks/sweep-experiments/README.md
@@ -179,7 +179,7 @@ If a toggle flip matches the experiment launch value, the call has already been
 - })
 ```
 
-Otherwise the the test is likely obsolete and will fail, since it requires a state not possible with the current launch value:
+Otherwise the test is likely obsolete and will fail, since it requires a state not possible with the current launch value:
 
 ```diff
 - it('should fail if experiment is off', () => {
diff --git a/build-system/tasks/sweep-experiments/cleanup-branches.js b/build-system/tasks/sweep-experiments/cleanup-branches.js
new file mode 100644
index 000000000000..47dbcac19719
--- /dev/null
+++ b/build-system/tasks/sweep-experiments/cleanup-branches.js
@@ -0,0 +1,135 @@
+const argv = require('minimist')(process.argv.slice(2));
+const {cyan, red, yellow} = require('kleur/colors');
+const {exec} = require('../../common/exec');
+const {log} = require('../../common/logging');
+
+const org = 'ampproject';
+const repo = 'amphtml';
+
+// Must match .github/workflows/sweep-experiments.yml
+const prefix = 'sweep-experiments-';
+
+/**
+ * @param {string} key
+ * @return {string}
+ */
+function env(key) {
+  if (!(key in process.env)) {
+    throw new Error(`Missing env variable: ${key}`);
+  }
+  return /** @type {string} */ (process.env[key]);
+}
+
+/**
+ * @param {string} path
+ * @param {{[string: string]: string|Object}=} options
+ * @return {!Promise<Object[]|Object>}
+ */
+async function githubFetch(path, options) {
+  const url = `https://api.github.com/repos/${org}/${repo}/${path}`;
+  const response = await fetch(url, {
+    method: 'GET',
+    headers: {
+      'Content-Type': 'application/json',
+      'User-Agent': 'amphtml',
+      'Accept': 'application/vnd.github.v3+json',
+      'Authorization': `token ${env('GITHUB_TOKEN')}`,
+    },
+    ...options,
+  });
+  if (!response.ok) {
+    const text = await response.text();
+    throw new Error(`${url}\n${text}`);
+  }
+  return response.json();
+}
+
+/**
+ * @param {(number) => string} getPagePath
+ * @return {Promise<Object[]>}
+ */
+async function getAllPaginated(getPagePath) {
+  const result = [];
+  let page = 1;
+  let lastResult;
+  do {
+    lastResult = await githubFetch(getPagePath(++page));
+    result.push(...lastResult);
+  } while (lastResult.length);
+  return result;
+}
+
+/**
+ * @return {Promise<string[]>}
+ */
+async function getOldBranches() {
+  return (await getAllPaginated((page) => `branches?per_page=100&page=${page}`))
+    .map(({name}) => name)
+    .filter((name) => name.startsWith(prefix));
+}
+
+/**
+ * @param {string} state
+ * @param {string} orgOrUser
+ * @param {string} branch
+ * @return {Promise<Object|undefined>}
+ */
+async function getBranchPull(state, orgOrUser, branch) {
+  const [pull] = await githubFetch(
+    `pulls?per_page=1&head=${orgOrUser}:${branch}&state=${state}`
+  );
+  return pull;
+}
+
+/**
+ * @param {number|string} number
+ * @return {Promise}
+ */
+async function closePullRequest(number) {
+  const path = `pulls/${number}`;
+  const method = 'PATCH';
+  const body = JSON.stringify({state: 'closed'});
+  log(`${method} ${path} ${body}`);
+  if (!argv.dry_run) {
+    await githubFetch(path, {method, body});
+  }
+}
+
+/**
+ * @param {string} branch
+ */
+function deleteBranch(branch) {
+  const command = `git push upstream --delete "${branch}"`;
+  log(command);
+  if (!argv.dry_run) {
+    exec(command, {stdio: 'inherit'});
+  }
+}
+
+/**
+ * @return {Promise}
+ */
+async function cleanupBranches() {
+  const {except} = argv;
+  if (except) {
+    log(yellow('Excluding branch:'), except);
+  }
+  const branches = (await getOldBranches()).filter((name) => name !== except);
+  log(cyan(`Cleaning up ${branches.length} branches...`));
+  for (const branch of branches) {
+    log(cyan(branch));
+    const pull = await getBranchPull('open', org, branch);
+    if (pull) {
+      try {
+        await closePullRequest(pull.number);
+      } catch (e) {
+        log(red(e.message));
+        log(yellow('Error closing pull request, will not delete branch.'));
+        continue;
+      }
+    }
+    deleteBranch(branch);
+  }
+}
+
+cleanupBranches();
diff --git a/build-system/tasks/sweep-experiments/index.js b/build-system/tasks/sweep-experiments/index.js
index a9640c3e601f..c627782b5f19 100644
--- a/build-system/tasks/sweep-experiments/index.js
+++ b/build-system/tasks/sweep-experiments/index.js
@@ -97,7 +97,7 @@ function removeFromExperimentsConfig(id, removedFromConfig) {
     const reportLine = getJscodeshiftReport(line);
     if (reportLine) {
       const [
-        // eslint-disable-next-line no-unused-vars
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
         _,
         report,
       ] = reportLine;
@@ -111,7 +111,7 @@ function removeFromExperimentsConfig(id, removedFromConfig) {
 }
 
 /**
- * @param {!Object<string, *>} config
+ * @param {!{[key: string]: *}} config
  * @param {string} path
  * @param {string} id
  * @return {Array<string>} modified files
@@ -347,13 +347,13 @@ function summaryCommitMessage({
 }
 
 /**
- * @param {!Object<string, *>} prodConfig
- * @param {!Object<string, *>} canaryConfig
+ * @param {!{[key: string]: *}} prodConfig
+ * @param {!{[key: string]: *}} canaryConfig
  * @param {string} cutoffDateFormatted
  * @param {string=} removeExperiment
  * @return {{
- *   include?: Object<string, {percentage: number, previousHistory: Array}>,
- *   exclude?: Object<string, {percentage: number, previousHistory: Array}>
+ *   include?: {[key: string]: {percentage: number, previousHistory: Array}},
+ *   exclude?: {[key: string]: {percentage: number, previousHistory: Array}}
  * }}
  */
 function collectWork(
@@ -373,16 +373,16 @@ function collectWork(
       removeExperiment,
       percentage
     );
-    /** @type {Object<string, {percentage: number, previousHistory: Array}>} */
+    /** @type {{[key: string]: {percentage: number, previousHistory: Array}}} */
     const entries = {[removeExperiment]: {percentage, previousHistory}};
     return isSpecialCannotBeRemoved(removeExperiment)
       ? {exclude: entries}
       : {include: entries};
   }
 
-  /** @type {Object<string, {percentage: number, previousHistory: Array}>} */
+  /** @type {{[key: string]: {percentage: number, previousHistory: Array}}} */
   const include = {};
-  /** @type {Object<string, {percentage: number, previousHistory: Array}>} */
+  /** @type {{[key: string]: {percentage: number, previousHistory: Array}}} */
   const exclude = {};
   for (const [experiment, percentage] of Object.entries(prodConfig)) {
     if (
diff --git a/build-system/tasks/test-report-upload.js b/build-system/tasks/test-report-upload.js
deleted file mode 100644
index 1ae0cd9988ac..000000000000
--- a/build-system/tasks/test-report-upload.js
+++ /dev/null
@@ -1,129 +0,0 @@
-/**
- * @fileoverview This file implements the `amp test-report-upload` task, which POSTs test result reports
- * to an API endpoint that stores them in the database.
- */
-
-'use strict';
-
-const fetch = require('node-fetch');
-const fs = require('fs').promises;
-const path = require('path');
-const {
-  ciBuildId,
-  ciBuildUrl,
-  ciCommitSha,
-  ciJobId,
-  ciJobUrl,
-  ciRepoSlug,
-} = require('../common/ci');
-const {log} = require('../common/logging');
-
-const {cyan, green, red, yellow} = require('kleur/colors');
-
-const REPORTING_API_URL = 'https://amp-test-cases.appspot.com/report';
-
-/**
- * Parses a test report file and adds build & job info to it.
- * @param {('unit' | 'integration' | 'e2e')} testType The type of the tests whose result we want to report.
- * @return {Promise<Object.<string,Object>|null>} Object containing the build, job, and test results.
- */
-async function getReport(testType) {
-  try {
-    const report = JSON.parse(
-      await fs.readFile(`result-reports/${testType}.json`, 'utf-8')
-    );
-
-    return addJobAndBuildInfo(testType, report);
-  } catch (e) {
-    log(red('ERROR:'), 'Error getting test result report.\n', e.toString());
-
-    return null;
-  }
-}
-
-/**
- * Adds job and build info to a report.
- * @param {('unit' | 'integration' | 'e2e')} testType The type of the tests whose result we want to report.
- * @param {Object} reportJson The Json report generated by Karma.
- * @return {Object.<string,Object>} Object containing the build, job, and test results.
- */
-function addJobAndBuildInfo(testType, reportJson) {
-  const buildId = ciBuildId();
-  const commitSha = ciCommitSha();
-  const jobId = ciJobId();
-
-  if (!buildId || !commitSha || !jobId) {
-    throw new ReferenceError('CI fields are not defined.');
-  }
-
-  // (TODO ampproject/amp-github-apps/pull:1194) Update field names in database.
-  return {
-    repository: ciRepoSlug(),
-    results: reportJson,
-    build: {
-      buildId,
-      commitSha,
-      url: ciBuildUrl(),
-    },
-    job: {
-      jobId,
-      testSuiteType: testType,
-      url: ciJobUrl(),
-    },
-  };
-}
-
-/**
- * Sends a single report to the API endpoint for storage.
- * @param {('unit' | 'integration' | 'e2e')} testType The type of the tests whose result we want to report.
- * @return {Promise<void>}
- */
-async function sendCiKarmaReport(testType) {
-  const body = await getReport(testType);
-
-  if (!body) {
-    return;
-  }
-
-  const response = await fetch(REPORTING_API_URL, {
-    method: 'post',
-    body: JSON.stringify(body),
-    headers: {'Content-Type': 'application/json'},
-  });
-
-  if (response.ok) {
-    log(
-      green('INFO:'),
-      `Test results of type`,
-      cyan(testType),
-      'reported to',
-      cyan(REPORTING_API_URL)
-    );
-  } else {
-    log(
-      yellow('WARNING:'),
-      'failed to report results of type',
-      cyan(testType),
-      ': \n',
-      yellow(/** @type {string} */ (await response.text()))
-    );
-  }
-}
-
-/**
- * Uploads every report to the API endpoint for storage.
- * @return {Promise<void>}
- */
-async function testReportUpload() {
-  const filenames = await fs.readdir('result-reports/');
-  const testTypes = filenames.map((filename) => path.parse(filename).name);
-
-  await Promise.all(testTypes.map(sendCiKarmaReport));
-}
-
-module.exports = {
-  testReportUpload,
-};
-
-testReportUpload.description =
-  'Send results from a test run to the AMP test result database';
diff --git a/build-system/tasks/unit.js b/build-system/tasks/unit.js
index 715ec38728d9..6c34c6bab914 100644
--- a/build-system/tasks/unit.js
+++ b/build-system/tasks/unit.js
@@ -62,7 +62,6 @@ unit.flags = {
   'local_changes':
     'Run unit tests directly affected by the files changed in the local branch',
   'nohelp': 'Silence help messages that are printed prior to test run',
-  'report': 'Write test result report to a local file',
   'safari': 'Run tests on Safari',
   'testnames': 'List the name of each test being run',
   'verbose': 'Enable logging',
diff --git a/build-system/tasks/validate-html-fixtures.js b/build-system/tasks/validate-html-fixtures.js
index ec1b9ce29a11..d61a2f6249a6 100644
--- a/build-system/tasks/validate-html-fixtures.js
+++ b/build-system/tasks/validate-html-fixtures.js
@@ -12,7 +12,7 @@ const {cyan, green, red} = require('kleur/colors');
 const {getFilesToCheck} = require('../common/utils');
 const {getOutput} = require('../common/process');
 const {htmlFixtureGlobs} = require('../test-configs/config');
-const {readFile} = require('fs-extra');
+const {pathExists, readFile} = require('fs-extra');
 
 const defaultFormat = 'AMP';
 
@@ -72,6 +72,32 @@ async function getFileGroups(filesToCheck) {
   return fileGroups;
 }
 
+/**
+ * Checks for the existence of a local wasm / js validator binary and returns
+ * its location. Defaults to the wasm binary on the CDN.
+ * @return {Promise<string>}
+ */
+async function getValidatorJs() {
+  const localWasmValidatorPath =
+    'validator/bazel-bin/cpp/engine/wasm/validator_js_bin.js';
+  const localJsValidatorPath = 'validator/dist/validator_minified.js';
+  if (await pathExists(localWasmValidatorPath)) {
+    log('Using the', cyan('locally built wasm validator') + '...');
+    return localWasmValidatorPath;
+  }
+  if (await pathExists(localJsValidatorPath)) {
+    log('Using the', cyan('locally built js validator') + '...');
+    return localJsValidatorPath;
+  }
+  log('Using the', cyan('wasm validator from the CDN') + '...');
+  logLocalDev(
+    '⤷ To use a locally built wasm or js validator,',
+    'run the build command from',
+    cyan('validator/README.md') + '.'
+  );
+  return 'https://cdn.ampproject.org/v0/validator_wasm.js'; // eslint-disable-line local/no-forbidden-terms
+}
+
 /**
  * Runs amphtml-validator on the given list of files and prints results.
  *
@@ -79,6 +105,7 @@ async function getFileGroups(filesToCheck) {
  * @return {Promise<void>}
  */
 async function runCheck(filesToCheck) {
+  const validatorJs = await getValidatorJs();
   const fileGroups = await getFileGroups(filesToCheck);
   const formats = Object.keys(fileGroups);
   let foundValidationErrors = false;
@@ -88,7 +115,10 @@ async function runCheck(filesToCheck) {
     }
     const files = fileGroups[format].sort().join(' ');
     logLocalDev(green('Validating'), cyan(format), green('fixtures...'));
-    const validateFixturesCmd = `FORCE_COLOR=1 npx amphtml-validator --html_format ${format} ${files}`;
+    const validatorCmd = 'FORCE_COLOR=1 npx amphtml-validator';
+    const validatorJsArg = `--validator_js ${validatorJs}`;
+    const htmlFormatArg = `--html_format ${format}`;
+    const validateFixturesCmd = `${validatorCmd} ${validatorJsArg} ${htmlFormatArg} ${files}`;
     const result = getOutput(validateFixturesCmd);
     logWithoutTimestampLocalDev(result.stdout);
     if (result.stderr) {
@@ -99,18 +129,6 @@ async function runCheck(filesToCheck) {
   }
   if (foundValidationErrors) {
     log('Please address the errors listed above.');
-    log(
-      '⤷ If a failing fixture is a',
-      cyan('Bento'),
-      'document, it is not meant to be valid AMP.'
-    );
-    log(
-      '⤷ Place it under any directory named',
-      cyan('bento'),
-      'like',
-      cyan('examples/bento/'),
-      'so that it is not validated.'
-    );
     throw new Error('Validation failed.');
   }
   log(green('SUCCESS:'), 'All HTML fixtures are valid.');
diff --git a/build-system/tasks/validator.js b/build-system/tasks/validator.js
index 63e95700d4e1..405d18c0939f 100644
--- a/build-system/tasks/validator.js
+++ b/build-system/tasks/validator.js
@@ -25,19 +25,22 @@ async function validator() {
  */
 async function validatorCpp() {
   const bazelCmd = [
-    'bazel test',
+    'bazel-5.4.0 test',
     '--repo_env=CC=clang',
     "--cxxopt='-std=c++17'",
+    '--discard_analysis_cache',
+    '--notrack_incremental_state',
+    '--nokeep_state_after_build',
     '--test_output=errors',
     '--ui_event_filters=INFO',
     '--noshow_progress',
     '--noshow_loading_progress',
     '--test_summary=detailed',
     '--verbose_failures',
-    'validator_test',
+    'cpp/engine:validator_test',
   ].join(' ');
   execOrDie(bazelCmd, {
-    cwd: 'validator/cpp/engine',
+    cwd: 'validator',
     stdio: 'inherit',
   });
 }
diff --git a/build-system/tasks/visual-diff/.npmrc b/build-system/tasks/visual-diff/.npmrc
index 5c6ff9df9dd2..bb47df101475 100644
--- a/build-system/tasks/visual-diff/.npmrc
+++ b/build-system/tasks/visual-diff/.npmrc
@@ -1 +1,2 @@
+puppeteer_skip_chrome_download=true
 puppeteer_skip_chromium_download=true
diff --git a/build-system/tasks/visual-diff/browser.js b/build-system/tasks/visual-diff/browser.js
index f7fd722fc524..da543a8e6776 100644
--- a/build-system/tasks/visual-diff/browser.js
+++ b/build-system/tasks/visual-diff/browser.js
@@ -3,40 +3,48 @@
 const argv = require('minimist')(process.argv.slice(2));
 const fs = require('fs');
 const path = require('path');
-const puppeteer = require('puppeteer');
-const PuppeteerExtraPluginUserPreferences = require('puppeteer-extra-plugin-user-preferences');
-const {addExtra} = require('puppeteer-extra');
 const {cyan, yellow} = require('kleur/colors');
 const {HOST} = require('./consts');
 const {log} = require('./log');
+const puppeteer = require('puppeteer-core');
+const {getStdout} = require('../../common/process');
 
-// REPEATING TODO(@ampproject/wg-infra): Update this whenever the Percy backend
-// starts using a new version of Chrome to render DOM snapshots.
-//
-// Steps:
-// 1. Open a recent Percy build, and click the “ⓘ” icon
-// 2. Note the Chrome major version at the bottom
-// 3. Look up the full version at https://en.wikipedia.org/wiki/Google_Chrome_version_history
-// 4. Open https://omahaproxy.appspot.com in a browser
-// 5. Go to "Tools" -> "Version information"
-// 6. Paste the full version (add ".0" at the end) in the "Version" field and click "Lookup"
-// 7. Copy the value next to "Branch Base Position" and update the line below
-const PUPPETEER_CHROMIUM_REVISION = '870763'; // 91.0.4472.0
+const CHROME_BASENAMES = [
+  'chrome',
+  'google-chrome',
+  'google-chrome-stable',
+  'chromium',
+];
 
 const VIEWPORT_WIDTH = 1400;
 const VIEWPORT_HEIGHT = 100000;
 
+/**
+ * Attempts to locale the full executable path for Chrome/Chromium.
+ * @return {string}
+ */
+function locateChromeExecutablePath() {
+  if (argv.executablePath) {
+    return argv.executablePath;
+  }
+  for (const executableBaseName of CHROME_BASENAMES) {
+    const executablePath = getStdout(`which ${executableBaseName}`).trim();
+    if (executablePath) {
+      return executablePath;
+    }
+  }
+  throw new Error(
+    `Could not locate Chrome/Chromium executable. Make sure it is on your $PATH (looking for any of {${CHROME_BASENAMES.join(', ')}}) or pass --executablePath to amp visual-diff`
+  );
+}
+
 /**
  * Launches a Puppeteer controlled browser.
  *
- * Waits until the browser is up and reachable, and ties its lifecycle to this
- * process's lifecycle.
- *
- * @param {!puppeteer.BrowserFetcher} browserFetcher Puppeteer browser binaries
- *     manager.
- * @return {Promise<!puppeteer.Browser>} a Puppeteer controlled browser.
+ * @return {!Promise<!puppeteer.Browser>} a Puppeteer controlled browser.
  */
-async function launchBrowser(browserFetcher) {
+async function launchBrowser() {
+  /** @type {import('puppeteer-core').LaunchOptions} */
   const browserOptions = {
     args: [
       '--disable-background-media-suspend',
@@ -50,25 +58,10 @@ async function launchBrowser(browserFetcher) {
     ],
     dumpio: argv.chrome_debug,
     headless: !argv.dev,
-    executablePath: browserFetcher.revisionInfo(PUPPETEER_CHROMIUM_REVISION)
-      .executablePath,
+    executablePath: locateChromeExecutablePath(),
     waitForInitialPage: false,
   };
-
-  // @ts-ignore type mismatch in puppeteer-extra.
-  const puppeteerExtra = addExtra(puppeteer);
-  puppeteerExtra.use(
-    PuppeteerExtraPluginUserPreferences({
-      userPrefs: {
-        devtools: {
-          preferences: {
-            currentDockState: '"undocked"',
-          },
-        },
-      },
-    })
-  );
-  return await puppeteerExtra.launch(browserOptions);
+  return puppeteer.launch(browserOptions);
 }
 
 /**
@@ -82,7 +75,7 @@ async function launchBrowser(browserFetcher) {
 async function newPage(browser, viewport = null) {
   log('verbose', 'Creating new tab');
 
-  const context = await browser.createIncognitoBrowserContext();
+  const context = await browser.createBrowserContext();
   const page = await context.newPage();
   page.setDefaultNavigationTimeout(0);
   await page.setJavaScriptEnabled(true);
@@ -114,7 +107,7 @@ async function newPage(browser, viewport = null) {
       );
       return interceptedRequest.respond({
         status: 200,
-        body: fs.readFileSync(mockedFilepath),
+        body: new Uint8Array(fs.readFileSync(mockedFilepath)),
       });
     } else {
       log(
@@ -153,44 +146,9 @@ async function resetPage(page, viewport = null) {
   await page.setViewport({width, height});
 }
 
-/**
- * Loads task-specific dependencies are returns an instance of BrowserFetcher.
- *
- * @return {Promise<!puppeteer.BrowserFetcher>}
- */
-async function loadBrowserFetcher() {
-  // @ts-ignore Valid method in Puppeteer's nodejs interface.
-  // https://github.com/puppeteer/puppeteer/blob/main/src/node/Puppeteer.ts
-  const browserFetcher = puppeteer.createBrowserFetcher();
-  const chromiumRevisions = await browserFetcher.localRevisions();
-  if (chromiumRevisions.includes(PUPPETEER_CHROMIUM_REVISION)) {
-    log(
-      'info',
-      'Using Percy-compatible version of Chromium',
-      cyan(PUPPETEER_CHROMIUM_REVISION)
-    );
-  } else {
-    log(
-      'info',
-      'Percy-compatible version of Chromium',
-      cyan(PUPPETEER_CHROMIUM_REVISION),
-      'was not found. Downloading...'
-    );
-    await browserFetcher.download(
-      PUPPETEER_CHROMIUM_REVISION,
-      (/* downloadedBytes, totalBytes */) => {
-        // TODO(@ampproject/wg-infra): display download progress.
-        // Logging every call is too verbose.
-      }
-    );
-  }
-  return browserFetcher;
-}
-
 module.exports = {
-  PUPPETEER_CHROMIUM_REVISION,
+  locateChromeExecutablePath,
   launchBrowser,
-  loadBrowserFetcher,
   newPage,
   resetPage,
 };
diff --git a/build-system/tasks/visual-diff/dev-mode.js b/build-system/tasks/visual-diff/dev-mode.js
index 3a5abce84d4f..540b106f213e 100644
--- a/build-system/tasks/visual-diff/dev-mode.js
+++ b/build-system/tasks/visual-diff/dev-mode.js
@@ -1,14 +1,15 @@
 'use strict';
 
-const inquirer = require('inquirer');
 const path = require('path');
-const puppeteer = require('puppeteer'); // eslint-disable-line no-unused-vars
+
+const {cyan, yellow} = require('kleur/colors');
+const inquirer = require('@inquirer/prompts');
+
 const {
   verifySelectorsInvisible,
   verifySelectorsVisible,
   waitForPageLoad,
 } = require('./verifiers');
-const {cyan, yellow} = require('kleur/colors');
 const {HOST, PORT} = require('./consts');
 const {log} = require('./log');
 const {newPage} = require('./browser');
@@ -17,6 +18,9 @@ const {WebpageDef} = require('./types');
 
 const ROOT_DIR = path.resolve(__dirname, '../../../');
 
+/** @typedef {import('puppeteer-core')} puppeteer */
+/** @typedef {import('puppeteer-core').Browser} puppeteer.Browser */
+
 /**
  * Runs a development mode.
  *
@@ -72,16 +76,7 @@ async function devMode(browser, webpages) {
     log('info', '- Press enter on', cyan('empty prompt'), 'to reload the page');
     log('info', '-', cyan('Ctrl + C'), 'to quit.');
     while (true) {
-      /** @type {string} */
-      let cssSelector = (
-        await inquirer.prompt({
-          type: 'input',
-          name: 'cssSelector',
-          message: '>',
-          prefix: '',
-        })
-      ).cssSelector.trim();
-
+      let cssSelector = (await inquirer.input({message: '>'})).trim();
       if (!cssSelector) {
         break;
       }
@@ -132,26 +127,20 @@ async function devMode(browser, webpages) {
  */
 async function inquireForWebpage_(webpages) {
   if (webpages.length > 1) {
-    return (
-      await inquirer.prompt([
-        {
-          type: 'list',
-          name: 'webpage',
-          message:
-            'Select test name from ' +
-            cyan('visual-diff.jsonc') +
-            ' (use ' +
-            cyan('--grep') +
-            ' to filter this list):',
-          choices: webpages
-            .map((webpage) => ({
-              name: webpage.name,
-              value: webpage,
-            }))
-            .sort((a, b) => a.name.localeCompare(b.name)),
-        },
-      ])
-    ).webpage;
+    return await inquirer.select({
+      message:
+        'Select test name from ' +
+        cyan('visual-diff.jsonc') +
+        ' (use ' +
+        cyan('--grep') +
+        ' to filter this list):',
+      choices: webpages
+        .map((webpage) => ({
+          name: webpage.name,
+          value: webpage,
+        }))
+        .sort((a, b) => a.name.localeCompare(b.name)),
+    });
   } else {
     const webpage = webpages[0];
     log(
@@ -175,22 +164,16 @@ async function inquireForWebpage_(webpages) {
  */
 async function inquireForTestFunction_(webpage) {
   if (Object.keys(webpage.tests_).length > 1) {
-    return (
-      await inquirer.prompt([
-        {
-          type: 'list',
-          name: 'testName',
-          message:
-            'Select which interactive test from ' +
-            cyan(webpage.interactive_tests) +
-            ' to run:',
-          choices: Object.keys(webpage.tests_).map((testName) => ({
-            name: testName || '(base test)',
-            value: testName,
-          })),
-        },
-      ])
-    ).testName;
+    return await inquirer.select({
+      message:
+        'Select which interactive test from ' +
+        cyan(webpage.interactive_tests) +
+        ' to run:',
+      choices: Object.keys(webpage.tests_).map((testName) => ({
+        name: testName || '(base test)',
+        value: testName,
+      })),
+    });
   }
   return '';
 }
diff --git a/build-system/tasks/visual-diff/index.js b/build-system/tasks/visual-diff/index.js
index 95ce26be5b79..9a26c3d67f21 100644
--- a/build-system/tasks/visual-diff/index.js
+++ b/build-system/tasks/visual-diff/index.js
@@ -6,9 +6,8 @@ const fs = require('fs');
 const JSON5 = require('json5');
 const os = require('os');
 const path = require('path');
-const Percy = require('@percy/core');
+const PercyModulePromise = import('@percy/core');
 const percySnapshot = require('@percy/puppeteer');
-const puppeteer = require('puppeteer'); // eslint-disable-line no-unused-vars
 const {
   createCtrlcHandler,
   exitCtrlcHandler,
@@ -20,9 +19,8 @@ const {
   shortSha,
 } = require('../../common/git');
 const {
-  PUPPETEER_CHROMIUM_REVISION,
   launchBrowser,
-  loadBrowserFetcher,
+  locateChromeExecutablePath,
   newPage,
   resetPage,
 } = require('./browser');
@@ -41,6 +39,11 @@ const {isPercyEnabled} = require('@percy/sdk-utils');
 const {startServer, stopServer} = require('../serve');
 const {TestErrorDef, WebpageDef} = require('./types');
 
+/** @typedef {import('@percy/core').default} Percy */
+/** @typedef {import('puppeteer-core')} puppeteer */
+/** @typedef {import('puppeteer-core').Browser} puppeteer.Browser */
+/** @typedef {import('puppeteer-core').ConsoleMessage} puppeteer.ConsoleMessage */
+
 // CSS injected in every page tested.
 // Normally, as in https://docs.percy.io/docs/percy-specific-css
 // Otherwise, as a <style> in an iframe, see snippets/iframe-wrapper.js
@@ -103,6 +106,9 @@ function maybeOverridePercyEnvironmentVariables() {
       process.env[variable.toUpperCase()] = argv[variable];
     }
   });
+  if (argv.empty) {
+    process.env['PERCY_PARTIAL_BUILD'] = '1';
+  }
 }
 
 /**
@@ -135,27 +141,24 @@ function setPercyTargetCommit() {
 }
 
 /**
- * Launches a @percy/cli instance.
+ * Launches a Percy agent instance.
  *
- * @param {!puppeteer.BrowserFetcher} browserFetcher Puppeteer browser binaries
- *     manager.
- * @return {Promise<Percy|undefined>} percy agent instance.
+ * @return {!Promise<Percy|undefined>} percy agent instance.
  */
-async function launchPercyAgent(browserFetcher) {
+async function launchPercyAgent() {
   if (argv.percy_disabled) {
     return;
   }
 
-  // @ts-ignore Type mismatch in library
-  const percy = await Percy.start({
+  const {default: PercyModule} = await PercyModulePromise;
+  const percy = await PercyModule.start({
     token: process.env.PERCY_TOKEN,
     loglevel: argv.percy_agent_debug ? 'debug' : 'info',
     port: PERCY_AGENT_PORT,
     config: path.join(__dirname, '.percy.yaml'),
     discovery: {
       launchOptions: {
-        executable: browserFetcher.revisionInfo(PUPPETEER_CHROMIUM_REVISION)
-          .executablePath,
+        executable: locateChromeExecutablePath(),
       },
     },
   });
@@ -570,7 +573,7 @@ function setDebuggingLevel() {
  * @return {Promise<void>}
  */
 async function createEmptyBuild(browser) {
-  log('info', 'Skipping visual diff tests and generating a blank Percy build');
+  log('info', 'Generating the blank page snapshot');
 
   const page = await newPage(browser);
 
@@ -593,7 +596,6 @@ async function createEmptyBuild(browser) {
 async function visualDiff() {
   const handlerProcess = createCtrlcHandler('visual-diff');
   await ensureOrBuildAmpRuntimeInTestMode_();
-  const browserFetcher = await loadBrowserFetcher();
   decodePercyTokenForCi();
   maybeOverridePercyEnvironmentVariables();
   setPercyBranch();
@@ -611,11 +613,10 @@ async function visualDiff() {
     log('fatal', 'Could not find', cyan('PERCY_TOKEN'), 'environment variable');
   }
 
-  const percy = await launchPercyAgent(browserFetcher);
+  const percy = await launchPercyAgent();
   try {
-    await performVisualTests(browserFetcher);
+    await performVisualTests();
   } finally {
-    // @ts-ignore Type mismatch in library
     await percy?.stop();
   }
   exitCtrlcHandler(handlerProcess);
@@ -624,14 +625,12 @@ async function visualDiff() {
 /**
  * Runs the AMP visual diff tests.
  *
- * @param {!puppeteer.BrowserFetcher} browserFetcher Puppeteer browser binaries
- *     manager.
  * @return {Promise<void>}
  */
-async function performVisualTests(browserFetcher) {
+async function performVisualTests() {
   setDebuggingLevel();
 
-  const browser = await launchBrowser(browserFetcher);
+  const browser = await launchBrowser();
   const handlerProcess = createCtrlcHandler(
     'visual-diff:browser',
     browser.process()?.pid
@@ -643,9 +642,7 @@ async function performVisualTests(browserFetcher) {
   );
 
   try {
-    if (argv.empty) {
-      await createEmptyBuild(browser);
-    } else {
+    if (!argv.empty) {
       // Load and parse the config. Use JSON5 due to JSON comments in file.
       const visualTestsConfig = JSON5.parse(
         fs.readFileSync(
@@ -658,6 +655,7 @@ async function performVisualTests(browserFetcher) {
       );
       await runVisualTests(browser, visualTestsConfig.webpages);
     }
+    await createEmptyBuild(browser);
   } finally {
     await browser.close();
     exitCtrlcHandler(handlerProcess);
@@ -696,12 +694,16 @@ visualDiff.description = 'Run the AMP visual diff tests';
 visualDiff.flags = {
   'main': 'Include a blank snapshot (baseline for skipped builds)',
   'empty': 'Create a dummy Percy build with only a blank snapshot',
+  'esm': 'uses the typescript server transforms which will serve the mjs files',
   'chrome_debug': 'Print debug info from Chrome',
   'webserver_debug': 'Print debug info from the local amp webserver',
   'percy_agent_debug': 'Print debug info from the @percy/agent instance',
   'debug': 'Set all debugging flags',
   'verbose': 'Print verbose log statements',
+  'executablePath':
+    'Full path to the Chrome/Chromium executable (optional if Chrome is on $PATH)',
   'grep': 'Run tests that match the pattern',
+  'minified': 'Serve minified JS',
   'percy_token': 'Override the PERCY_TOKEN environment variable',
   'percy_branch': 'Override the PERCY_BRANCH environment variable',
   'percy_disabled':
diff --git a/build-system/tasks/visual-diff/log.js b/build-system/tasks/visual-diff/log.js
index 0f842fe53a1b..b115e9f8fe83 100644
--- a/build-system/tasks/visual-diff/log.js
+++ b/build-system/tasks/visual-diff/log.js
@@ -1,10 +1,12 @@
 'use strict';
 
 const argv = require('minimist')(process.argv.slice(2));
-const puppeteer = require('puppeteer'); // eslint-disable-line no-unused-vars
 const {green, red, yellow} = require('kleur/colors');
 const {log: logBase} = require('../../common/logging');
 
+/** @typedef {import('puppeteer-core')} puppeteer */
+/** @typedef {import('puppeteer-core').Page} puppeteer.Page */
+
 /**
  * Logs a message to the console.
  *
diff --git a/build-system/tasks/visual-diff/package-lock.json b/build-system/tasks/visual-diff/package-lock.json
index b1ec1de1f61d..9ccd241fd779 100644
--- a/build-system/tasks/visual-diff/package-lock.json
+++ b/build-system/tasks/visual-diff/package-lock.json
@@ -8,45 +8,42 @@
       "name": "amp-visual-diff",
       "version": "0.1.0",
       "devDependencies": {
-        "@percy/core": "1.0.0-beta.70",
-        "@percy/puppeteer": "2.0.0",
-        "@percy/sdk-utils": "1.0.0-beta.70",
-        "@types/inquirer": "8.1.3",
-        "@types/puppeteer": "5.4.4",
-        "inquirer": "8.2.0",
-        "puppeteer": "11.0.0",
-        "puppeteer-extra": "3.2.3",
-        "puppeteer-extra-plugin-user-preferences": "2.3.1"
+        "@inquirer/prompts": "7.2.1",
+        "@percy/core": "1.30.6",
+        "@percy/puppeteer": "2.0.2",
+        "@percy/sdk-utils": "1.30.6",
+        "@puppeteer/browsers": "2.7.0",
+        "puppeteer-core": "24.0.0"
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.15.8",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz",
-      "integrity": "sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
+      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
       "dev": true,
       "dependencies": {
-        "@babel/highlight": "^7.14.5"
+        "@babel/highlight": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.15.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz",
-      "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
+      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
-      "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.12.tgz",
+      "integrity": "sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.14.5",
+        "@babel/helper-validator-identifier": "^7.16.7",
         "chalk": "^2.0.0",
         "js-tokens": "^4.0.0"
       },
@@ -54,157 +51,434 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@inquirer/checkbox": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-4.0.4.tgz",
+      "integrity": "sha512-fYAKCAcGNMdfjL6hZTRUwkIByQ8EIZCXKrIQZH7XjADnN/xvRUhj8UdBbpC4zoUzvChhkSC/zRKaP/tDs3dZpg==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^10.1.2",
+        "@inquirer/figures": "^1.0.9",
+        "@inquirer/type": "^3.0.2",
+        "ansi-escapes": "^4.3.2",
+        "yoctocolors-cjs": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/confirm": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-5.1.1.tgz",
+      "integrity": "sha512-vVLSbGci+IKQvDOtzpPTCOiEJCNidHcAq9JYVoWTW0svb5FiwSLotkM+JXNXejfjnzVYV9n0DTBythl9+XgTxg==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^10.1.2",
+        "@inquirer/type": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/core": {
+      "version": "10.1.2",
+      "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-10.1.2.tgz",
+      "integrity": "sha512-bHd96F3ezHg1mf/J0Rb4CV8ndCN0v28kUlrHqP7+ECm1C/A+paB7Xh2lbMk6x+kweQC+rZOxM/YeKikzxco8bQ==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/figures": "^1.0.9",
+        "@inquirer/type": "^3.0.2",
+        "ansi-escapes": "^4.3.2",
+        "cli-width": "^4.1.0",
+        "mute-stream": "^2.0.0",
+        "signal-exit": "^4.1.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^6.2.0",
+        "yoctocolors-cjs": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/editor": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-4.2.1.tgz",
+      "integrity": "sha512-xn9aDaiP6nFa432i68JCaL302FyL6y/6EG97nAtfIPnWZ+mWPgCMLGc4XZ2QQMsZtu9q3Jd5AzBPjXh10aX9kA==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^10.1.2",
+        "@inquirer/type": "^3.0.2",
+        "external-editor": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/expand": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-4.0.4.tgz",
+      "integrity": "sha512-GYocr+BPyxKPxQ4UZyNMqZFSGKScSUc0Vk17II3J+0bDcgGsQm0KYQNooN1Q5iBfXsy3x/VWmHGh20QnzsaHwg==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^10.1.2",
+        "@inquirer/type": "^3.0.2",
+        "yoctocolors-cjs": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/figures": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.9.tgz",
+      "integrity": "sha512-BXvGj0ehzrngHTPTDqUoDT3NXL8U0RxUk2zJm2A66RhCEIWdtU1v6GuUqNAgArW4PQ9CinqIWyHdQgdwOj06zQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/input": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-4.1.1.tgz",
+      "integrity": "sha512-nAXAHQndZcXB+7CyjIW3XuQZZHbQQ0q8LX6miY6bqAWwDzNa9JUioDBYrFmOUNIsuF08o1WT/m2gbBXvBhYVxg==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^10.1.2",
+        "@inquirer/type": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/number": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-3.0.4.tgz",
+      "integrity": "sha512-DX7a6IXRPU0j8kr2ovf+QaaDiIf+zEKaZVzCWdLOTk7XigqSXvoh4cul7x68xp54WTQrgSnW7P1WBJDbyY3GhA==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^10.1.2",
+        "@inquirer/type": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/password": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-4.0.4.tgz",
+      "integrity": "sha512-wiliQOWdjM8FnBmdIHtQV2Ca3S1+tMBUerhyjkRCv1g+4jSvEweGu9GCcvVEgKDhTBT15nrxvk5/bVrGUqSs1w==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^10.1.2",
+        "@inquirer/type": "^3.0.2",
+        "ansi-escapes": "^4.3.2"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/prompts": {
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-7.2.1.tgz",
+      "integrity": "sha512-v2JSGri6/HXSfoGIwuKEn8sNCQK6nsB2BNpy2lSX6QH9bsECrMv93QHnj5+f+1ZWpF/VNioIV2B/PDox8EvGuQ==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/checkbox": "^4.0.4",
+        "@inquirer/confirm": "^5.1.1",
+        "@inquirer/editor": "^4.2.1",
+        "@inquirer/expand": "^4.0.4",
+        "@inquirer/input": "^4.1.1",
+        "@inquirer/number": "^3.0.4",
+        "@inquirer/password": "^4.0.4",
+        "@inquirer/rawlist": "^4.0.4",
+        "@inquirer/search": "^3.0.4",
+        "@inquirer/select": "^4.0.4"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/rawlist": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-4.0.4.tgz",
+      "integrity": "sha512-IsVN2EZdNHsmFdKWx9HaXb8T/s3FlR/U1QPt9dwbSyPtjFbMTlW9CRFvnn0bm/QIsrMRD2oMZqrQpSWPQVbXXg==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^10.1.2",
+        "@inquirer/type": "^3.0.2",
+        "yoctocolors-cjs": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/search": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-3.0.4.tgz",
+      "integrity": "sha512-tSkJk2SDmC2MEdTIjknXWmCnmPr5owTs9/xjfa14ol1Oh95n6xW7SYn5fiPk4/vrJPys0ggSWiISdPze4LTa7A==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^10.1.2",
+        "@inquirer/figures": "^1.0.9",
+        "@inquirer/type": "^3.0.2",
+        "yoctocolors-cjs": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/select": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-4.0.4.tgz",
+      "integrity": "sha512-ZzYLuLoUzTIW9EJm++jBpRiTshGqS3Q1o5qOEQqgzaBlmdsjQr6pA4TUNkwu6OBYgM2mIRbCz6mUhFDfl/GF+w==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^10.1.2",
+        "@inquirer/figures": "^1.0.9",
+        "@inquirer/type": "^3.0.2",
+        "ansi-escapes": "^4.3.2",
+        "yoctocolors-cjs": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/type": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-3.0.2.tgz",
+      "integrity": "sha512-ZhQ4TvhwHZF+lGhQ2O/rsjo80XoZR5/5qhOY3t6FJuX5XBg5Be8YzYTvaUGJnc12AUGI2nr4QSUE4PhKSigx7g==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      }
+    },
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/@percy/client": {
-      "version": "1.0.0-beta.70",
-      "resolved": "https://registry.npmjs.org/@percy/client/-/client-1.0.0-beta.70.tgz",
-      "integrity": "sha512-OKGkUnjEtnFH0jske1rdvjSZYZfqL1fTbr0ik0pFQ3i3RmLsGMdDOu5lyt6N6gnn/X1+btn+QI1Z0N2rO8vbNw==",
+      "version": "1.30.6",
+      "resolved": "https://registry.npmjs.org/@percy/client/-/client-1.30.6.tgz",
+      "integrity": "sha512-iHcYK4djy/WA3ZqIVcgOmuOtDeMiGDmJZ0DlDG38HMmAPgXHSThNXNz9bnXb2OSJFxXVRdlAE8DoqFK5FnwNsg==",
       "dev": true,
       "dependencies": {
-        "@percy/env": "1.0.0-beta.70",
-        "@percy/logger": "1.0.0-beta.70"
+        "@percy/env": "1.30.6",
+        "@percy/logger": "1.30.6",
+        "pako": "^2.1.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=14"
       }
     },
     "node_modules/@percy/config": {
-      "version": "1.0.0-beta.70",
-      "resolved": "https://registry.npmjs.org/@percy/config/-/config-1.0.0-beta.70.tgz",
-      "integrity": "sha512-SjH0X+pgzR2Ne004kRdlEai1BV0jnhBHPFPKCATNEAPGnW+IvJpG+H2cjGfBF/qmAryXHshLDX6MRbk44bM7MQ==",
+      "version": "1.30.6",
+      "resolved": "https://registry.npmjs.org/@percy/config/-/config-1.30.6.tgz",
+      "integrity": "sha512-qYUu4TVLJgtG/RIwa/AM+d3f1xH4D3uSvCoWUhX4y5rK5QDZ0UqWEvDOD6CJDn8i1xXi4ZY/JB7HKYKUTHeppQ==",
       "dev": true,
       "dependencies": {
-        "@percy/logger": "1.0.0-beta.70",
+        "@percy/logger": "1.30.6",
         "ajv": "^8.6.2",
-        "cosmiconfig": "^7.0.0",
-        "yaml": "^1.10.0"
+        "cosmiconfig": "^8.0.0",
+        "yaml": "^2.0.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=14"
       }
     },
     "node_modules/@percy/core": {
-      "version": "1.0.0-beta.70",
-      "resolved": "https://registry.npmjs.org/@percy/core/-/core-1.0.0-beta.70.tgz",
-      "integrity": "sha512-5Vy87hFs9wuUbxC3teGaCngejwBCJAl0BmZy9QdREtc8rdCTMfBR4z7vdWNp7mrt7dxAi4F8p4HY9DaRM45axQ==",
+      "version": "1.30.6",
+      "resolved": "https://registry.npmjs.org/@percy/core/-/core-1.30.6.tgz",
+      "integrity": "sha512-G0ULd3pHz8s4RajxUGTWGx8Ngl+jhOjIPNxOBtKh0ywgAnbvUWNWLKYvs9QinZcoPGfWgwc5+1btbeJxTAVGQg==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
-        "@percy/client": "1.0.0-beta.70",
-        "@percy/config": "1.0.0-beta.70",
-        "@percy/dom": "1.0.0-beta.70",
-        "@percy/logger": "1.0.0-beta.70",
+        "@percy/client": "1.30.6",
+        "@percy/config": "1.30.6",
+        "@percy/dom": "1.30.6",
+        "@percy/logger": "1.30.6",
+        "@percy/webdriver-utils": "1.30.6",
+        "content-disposition": "^0.5.4",
         "cross-spawn": "^7.0.3",
         "extract-zip": "^2.0.1",
+        "fast-glob": "^3.2.11",
+        "micromatch": "^4.0.8",
+        "mime-types": "^2.1.34",
+        "pako": "^2.1.0",
+        "path-to-regexp": "^6.3.0",
         "rimraf": "^3.0.2",
-        "ws": "^8.0.0"
+        "ws": "^8.17.1",
+        "yaml": "^2.4.1"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=14"
       }
     },
     "node_modules/@percy/dom": {
-      "version": "1.0.0-beta.70",
-      "resolved": "https://registry.npmjs.org/@percy/dom/-/dom-1.0.0-beta.70.tgz",
-      "integrity": "sha512-ltbInkpXwy6p4ojEcNHulCt8idazSVNyvaMybmx9ytxHTibVLZsLF9+k08UZmYboWDzy16DDb6QYEmlMg/8Fng==",
+      "version": "1.30.6",
+      "resolved": "https://registry.npmjs.org/@percy/dom/-/dom-1.30.6.tgz",
+      "integrity": "sha512-pMlzYYJfgVdNYbw1iJIQZxXzszL3EmIrbGvvpkred3RciJ4T3/pFlqiLiPS7TTUovMFFgRjTR1gLOH1eeWyM5A==",
       "dev": true
     },
     "node_modules/@percy/env": {
-      "version": "1.0.0-beta.70",
-      "resolved": "https://registry.npmjs.org/@percy/env/-/env-1.0.0-beta.70.tgz",
-      "integrity": "sha512-npP/OxbJnCnPbf2oXUd6nxhjKfJmHaPeTwdDWBFgz3O29rD4DstVCC7kKeF4/VzNpQj+FILPKJkczlv0titP5w==",
+      "version": "1.30.6",
+      "resolved": "https://registry.npmjs.org/@percy/env/-/env-1.30.6.tgz",
+      "integrity": "sha512-GU3ZcyiCUM3KiRmcpa5fpOIkuHBUonvBhNeg1jErZFEZFQDNm238SFnKQFEJIYCX96W5Q9qqXMwjApj7qBpiWg==",
       "dev": true,
+      "dependencies": {
+        "@percy/logger": "1.30.6"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=14"
       }
     },
     "node_modules/@percy/logger": {
-      "version": "1.0.0-beta.70",
-      "resolved": "https://registry.npmjs.org/@percy/logger/-/logger-1.0.0-beta.70.tgz",
-      "integrity": "sha512-QUVdp/FEsoHYftakuxe67/e/OVeVX6d2Fgur+thhqgHZ5GD87TwFsB+PH8kP6b5/ZZ+bOysT6bbxbiDvGEqWwg==",
+      "version": "1.30.6",
+      "resolved": "https://registry.npmjs.org/@percy/logger/-/logger-1.30.6.tgz",
+      "integrity": "sha512-HDhAIjjqOlpAIqClu+fvuWSA2cvxh3aMHtKN3gRdRMppHCvyyfmVbKd1PoLPV7Z0SQzZkyaBMAjiRXWMPksLig==",
       "dev": true,
       "engines": {
-        "node": ">=12"
+        "node": ">=14"
       }
     },
     "node_modules/@percy/puppeteer": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@percy/puppeteer/-/puppeteer-2.0.0.tgz",
-      "integrity": "sha512-AAErUA1NEELBmOIscHBJB064+6x7N2ZIA9EisBfB6ff1HJK58t2x7VGRNQjGsXvq/RP0wrLzmUY3uSSb2gQhVQ==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@percy/puppeteer/-/puppeteer-2.0.2.tgz",
+      "integrity": "sha512-DPyh5UyttPPXMNl3o6Owox7bnV54aQ7sIWfcsXUBZ6q1wLVmBjc5KP4x51dpPiuTDn3SMzFExMrXBFugfDJHPA==",
       "dev": true,
       "dependencies": {
-        "@percy/sdk-utils": "^1.0.0-beta.32"
+        "@percy/sdk-utils": "^1.0.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=14"
       },
       "peerDependencies": {
         "puppeteer": ">=1"
       }
     },
     "node_modules/@percy/sdk-utils": {
-      "version": "1.0.0-beta.70",
-      "resolved": "https://registry.npmjs.org/@percy/sdk-utils/-/sdk-utils-1.0.0-beta.70.tgz",
-      "integrity": "sha512-kxdMpvVnj4GUUhEYQ9j+qWUm1SJXkeqhcpbxrrfmE9wFpw2TgKWUTOwLS6im68cY6A03P9F4UAGSNWnE0ZHneA==",
+      "version": "1.30.6",
+      "resolved": "https://registry.npmjs.org/@percy/sdk-utils/-/sdk-utils-1.30.6.tgz",
+      "integrity": "sha512-LSayDfxAaXJaSv5SIDKMf7EjDl+k4kufYO88YQwc9+9Yr58qqrPFon11x0PvJdA2IDGBo1G6QbvpLUO0Vem2FQ==",
       "dev": true,
-      "dependencies": {
-        "@percy/logger": "1.0.0-beta.70"
-      },
       "engines": {
-        "node": ">=12"
+        "node": ">=14"
       }
     },
-    "node_modules/@types/debug": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.7.tgz",
-      "integrity": "sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==",
+    "node_modules/@percy/webdriver-utils": {
+      "version": "1.30.6",
+      "resolved": "https://registry.npmjs.org/@percy/webdriver-utils/-/webdriver-utils-1.30.6.tgz",
+      "integrity": "sha512-B1M9HWP3ZEM5CuDSMUx+68mrrKm9/JjJ0KO/OLztRh+v7TOsgOWpHMHalurwEIfoNf/olduQ4/Vv9TPrTSj72Q==",
       "dev": true,
       "dependencies": {
-        "@types/ms": "*"
+        "@percy/config": "1.30.6",
+        "@percy/sdk-utils": "1.30.6"
+      },
+      "engines": {
+        "node": ">=14"
       }
     },
-    "node_modules/@types/inquirer": {
-      "version": "8.1.3",
-      "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-8.1.3.tgz",
-      "integrity": "sha512-AayK4ZL5ssPzR1OtnOLGAwpT0Dda3Xi/h1G0l1oJDNrowp7T1423q4Zb8/emr7tzRlCy4ssEri0LWVexAqHyKQ==",
+    "node_modules/@puppeteer/browsers": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.7.0.tgz",
+      "integrity": "sha512-bO61XnTuopsz9kvtfqhVbH6LTM1koxK0IlBR+yuVrM2LB7mk8+5o1w18l5zqd5cs8xlf+ntgambqRqGifMDjog==",
       "dev": true,
       "dependencies": {
-        "@types/through": "*",
-        "rxjs": "^7.2.0"
+        "debug": "^4.4.0",
+        "extract-zip": "^2.0.1",
+        "progress": "^2.0.3",
+        "proxy-agent": "^6.5.0",
+        "semver": "^7.6.3",
+        "tar-fs": "^3.0.6",
+        "unbzip2-stream": "^1.4.3",
+        "yargs": "^17.7.2"
+      },
+      "bin": {
+        "browsers": "lib/cjs/main-cli.js"
+      },
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/@types/ms": {
-      "version": "0.7.31",
-      "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.31.tgz",
-      "integrity": "sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==",
+    "node_modules/@tootallnate/quickjs-emscripten": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz",
+      "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==",
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "14.11.8",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
-      "dev": true
-    },
-    "node_modules/@types/puppeteer": {
-      "version": "5.4.4",
-      "resolved": "https://registry.npmjs.org/@types/puppeteer/-/puppeteer-5.4.4.tgz",
-      "integrity": "sha512-3Nau+qi69CN55VwZb0ATtdUAlYlqOOQ3OfQfq0Hqgc4JMFXiQT/XInlwQ9g6LbicDslE6loIFsXFklGh5XmI6Q==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/through": {
-      "version": "0.0.30",
-      "resolved": "https://registry.npmjs.org/@types/through/-/through-0.0.30.tgz",
-      "integrity": "sha512-FvnCJljyxhPM3gkRgWmxmDZyAQSiBQQWLI0A0VFL0K7W1oRUrPJSqNO0NvTnLkBcotdlp3lKvaT0JrnyRDkzOg==",
+      "version": "22.5.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.5.tgz",
+      "integrity": "sha512-Xjs4y5UPO/CLdzpgR6GirZJx36yScjh73+2NlLlkFRSoQN8B0DpfXPdZGnvVmLRLOsqDpOfTNv7D9trgGhmOIA==",
       "dev": true,
       "dependencies": {
-        "@types/node": "*"
+        "undici-types": "~6.19.2"
       }
     },
     "node_modules/@types/yauzl": {
@@ -217,21 +491,18 @@
       }
     },
     "node_modules/agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
+      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
       "dev": true,
-      "dependencies": {
-        "debug": "4"
-      },
       "engines": {
-        "node": ">= 6.0.0"
+        "node": ">= 14"
       }
     },
     "node_modules/ajv": {
-      "version": "8.6.3",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz",
-      "integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==",
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
       "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
@@ -244,6 +515,21 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
+    "node_modules/ansi-escapes": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.21.3"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/ansi-regex": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
@@ -265,20 +551,81 @@
         "node": ">=4"
       }
     },
-    "node_modules/arr-union": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+    "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/ast-types": {
+      "version": "0.13.4",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
+      "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==",
       "dev": true,
+      "dependencies": {
+        "tslib": "^2.0.1"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=4"
       }
     },
+    "node_modules/b4a": {
+      "version": "1.6.6",
+      "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.6.tgz",
+      "integrity": "sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg==",
+      "dev": true
+    },
     "node_modules/balanced-match": {
       "version": "1.0.0",
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/bare-events": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.4.2.tgz",
+      "integrity": "sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/bare-fs": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.3.1.tgz",
+      "integrity": "sha512-W/Hfxc/6VehXlsgFtbB5B4xFcsCl+pAh30cYhoFyXErf6oGrwjh8SwiPAdHgpmWonKuYpZgGywN0SXt7dgsADA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "bare-events": "^2.0.0",
+        "bare-path": "^2.0.0",
+        "bare-stream": "^2.0.0"
+      }
+    },
+    "node_modules/bare-os": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.4.0.tgz",
+      "integrity": "sha512-v8DTT08AS/G0F9xrhyLtepoo9EJBJ85FRSMbu1pQUlAf6A8T0tEEQGMVObWeqpjhSPXsE0VGlluFBJu2fdoTNg==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/bare-path": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-2.1.3.tgz",
+      "integrity": "sha512-lh/eITfU8hrj9Ru5quUp0Io1kJWIk1bTjzo7JH1P5dWmQ2EL4hFUlfI8FonAhSlgIfhn63p84CDY/x+PisgcXA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "bare-os": "^2.1.0"
+      }
+    },
+    "node_modules/bare-stream": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.1.3.tgz",
+      "integrity": "sha512-tiDAH9H/kP+tvNO5sczyn9ZAA7utrSMobyDchsnyyXBuUe2FSQWbxhtuHB8jwpHYYevVo2UJpcmvvjrbHboUUQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "streamx": "^2.18.0"
+      }
+    },
     "node_modules/base64-js": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
@@ -299,15 +646,13 @@
         }
       ]
     },
-    "node_modules/bl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+    "node_modules/basic-ftp": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.5.tgz",
+      "integrity": "sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==",
       "dev": true,
-      "dependencies": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
+      "engines": {
+        "node": ">=10.0.0"
       }
     },
     "node_modules/brace-expansion": {
@@ -319,6 +664,18 @@
         "concat-map": "0.0.1"
       }
     },
+    "node_modules/braces": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "dev": true,
+      "dependencies": {
+        "fill-range": "^7.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/buffer": {
       "version": "5.7.1",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
@@ -380,71 +737,95 @@
       "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
       "dev": true
     },
-    "node_modules/chownr": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-      "dev": true
-    },
-    "node_modules/cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+    "node_modules/chromium-bidi": {
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.6.4.tgz",
+      "integrity": "sha512-8zoq6ogmhQQkAKZVKO2ObFTl4uOkqoX1PlKQX3hZQ5E9cbUotcAb7h4pTNVAGGv8Z36PF3CtdOriEp/Rz82JqQ==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "restore-cursor": "^3.1.0"
+        "mitt": "3.0.1",
+        "urlpattern-polyfill": "10.0.0",
+        "zod": "3.23.8"
       },
-      "engines": {
-        "node": ">=8"
+      "peerDependencies": {
+        "devtools-protocol": "*"
       }
     },
-    "node_modules/cli-spinners": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz",
-      "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==",
+    "node_modules/cli-width": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.1.0.tgz",
+      "integrity": "sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==",
       "dev": true,
       "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">= 12"
       }
     },
-    "node_modules/cli-width": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
-      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
+    "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==",
       "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      },
       "engines": {
-        "node": ">= 10"
+        "node": ">=12"
       }
     },
-    "node_modules/clone": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
+    "node_modules/cliui/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
       "engines": {
-        "node": ">=0.8"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/clone-deep": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.2.4.tgz",
-      "integrity": "sha1-TnPdCen7lxzDhnDF3O2cGJZIHMY=",
+    "node_modules/cliui/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
-        "for-own": "^0.1.3",
-        "is-plain-object": "^2.0.1",
-        "kind-of": "^3.0.2",
-        "lazy-cache": "^1.0.3",
-        "shallow-clone": "^0.1.2"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/color-convert": {
+    "node_modules/cliui/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/cliui/node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/color-convert": {
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
@@ -456,7 +837,7 @@
     "node_modules/color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
       "dev": true
     },
     "node_modules/concat-map": {
@@ -464,20 +845,34 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/content-disposition": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "5.2.1"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/cosmiconfig": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
-      "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
+      "version": "8.1.3",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.1.3.tgz",
+      "integrity": "sha512-/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw==",
       "dev": true,
       "dependencies": {
-        "@types/parse-json": "^4.0.0",
         "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
         "parse-json": "^5.0.0",
-        "path-type": "^4.0.0",
-        "yaml": "^1.10.0"
+        "path-type": "^4.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/d-fischer"
       }
     },
     "node_modules/cross-spawn": {
@@ -520,13 +915,22 @@
         "node": ">=8"
       }
     },
+    "node_modules/data-uri-to-buffer": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz",
+      "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
       "dev": true,
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -537,29 +941,26 @@
         }
       }
     },
-    "node_modules/deepmerge": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/defaults": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
-      "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
+    "node_modules/degenerator": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz",
+      "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==",
       "dev": true,
       "dependencies": {
-        "clone": "^1.0.2"
+        "ast-types": "^0.13.4",
+        "escodegen": "^2.1.0",
+        "esprima": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 14"
       }
     },
     "node_modules/devtools-protocol": {
-      "version": "0.0.901419",
-      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.901419.tgz",
-      "integrity": "sha512-4INMPwNm9XRpBukhNbF7OB6fNTTCaI8pzy/fXg0xQzAy5h3zL1P8xT3QazgKqBrb/hAYwIBizqDBZ7GtJE74QQ==",
-      "dev": true
+      "version": "0.0.1312386",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1312386.tgz",
+      "integrity": "sha512-DPnhUXvmvKT2dFA/j7B+riVLUt9Q6RKJlcppojL5CoRywJJKLDYnRlw0gTFKfgDPHP5E04UoB71SxoJlVZy8FA==",
+      "dev": true,
+      "peer": true
     },
     "node_modules/emoji-regex": {
       "version": "8.0.0",
@@ -575,6 +976,17 @@
         "once": "^1.4.0"
       }
     },
+    "node_modules/env-paths": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
+      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/error-ex": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -584,6 +996,15 @@
         "is-arrayish": "^0.2.1"
       }
     },
+    "node_modules/escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@@ -593,6 +1014,58 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/escodegen": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
+      "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
+      "dev": true,
+      "dependencies": {
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
+        "esutils": "^2.0.2"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "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/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/external-editor": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
@@ -632,81 +1105,55 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
       "dev": true
     },
-    "node_modules/fd-slicer": {
-      "version": "1.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "pend": "~1.2.0"
-      }
+    "node_modules/fast-fifo": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
+      "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==",
+      "dev": true
     },
-    "node_modules/figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+    "node_modules/fast-glob": {
+      "version": "3.2.11",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
+      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
       "dev": true,
       "dependencies": {
-        "escape-string-regexp": "^1.0.5"
+        "@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"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=8.6.0"
       }
     },
-    "node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+    "node_modules/fastq": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
+      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
       "dev": true,
       "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "reusify": "^1.0.4"
       }
     },
-    "node_modules/for-in": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/for-own": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
+    "node_modules/fd-slicer": {
+      "version": "1.1.0",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "for-in": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "pend": "~1.2.0"
       }
     },
-    "node_modules/fs-constants": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-      "dev": true
-    },
-    "node_modules/fs-extra": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
-      "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
+    "node_modules/fill-range": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
       "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
+        "to-regex-range": "^5.0.1"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=8"
       }
     },
     "node_modules/fs.realpath": {
@@ -714,6 +1161,15 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
     "node_modules/get-stream": {
       "version": "5.2.0",
       "dev": true,
@@ -728,6 +1184,20 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/get-uri": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.4.tgz",
+      "integrity": "sha512-E1b1lFFLvLgak2whF2xDBcOy6NLVGZBqqjJjsIhvopKfWWEi64pLVTWWehV8KlLerZkfNTA95sTe2OdJKm1OzQ==",
+      "dev": true,
+      "dependencies": {
+        "basic-ftp": "^5.0.2",
+        "data-uri-to-buffer": "^6.0.2",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/glob": {
       "version": "7.1.6",
       "dev": true,
@@ -747,32 +1217,51 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/graceful-fs": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
-      "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==",
-      "dev": true
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
     },
     "node_modules/has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
       "dev": true,
       "engines": {
         "node": ">=4"
       }
     },
+    "node_modules/http-proxy-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/https-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
       "dev": true,
       "dependencies": {
-        "agent-base": "6",
+        "agent-base": "^7.1.2",
         "debug": "4"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">= 14"
       }
     },
     "node_modules/iconv-lite": {
@@ -838,132 +1327,29 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "dev": true
     },
-    "node_modules/inquirer": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.0.tgz",
-      "integrity": "sha512-0crLweprevJ02tTuA6ThpoAERAGyVILC4sS74uib58Xf/zSr1/ZWtmm7D5CI+bSQEaA04f0K7idaHpQbSWgiVQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.1.1",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^3.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.21",
-        "mute-stream": "0.0.8",
-        "ora": "^5.4.1",
-        "run-async": "^2.4.0",
-        "rxjs": "^7.2.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/inquirer/node_modules/ansi-escapes": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.21.3"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/inquirer/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/inquirer/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/inquirer/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/inquirer/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/inquirer/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/inquirer/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/ip-address": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
+      "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "jsbn": "1.1.0",
+        "sprintf-js": "^1.1.3"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 12"
       }
     },
     "node_modules/is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-      "dev": true
-    },
-    "node_modules/is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
       "dev": true
     },
-    "node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -973,464 +1359,227 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-interactive": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
-      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-unicode-supported": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
-    "node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true
-    },
-    "node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
-    },
-    "node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "dev": true,
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/lazy-cache": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/lines-and-columns": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
-      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
-      "dev": true
-    },
-    "node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
-    },
-    "node_modules/log-symbols": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/log-symbols/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/log-symbols/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/log-symbols/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/log-symbols/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/log-symbols/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/log-symbols/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/merge-deep": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/merge-deep/-/merge-deep-3.0.3.tgz",
-      "integrity": "sha512-qtmzAS6t6grwEkNrunqTBdn0qKwFgNWvlxUbAV8es9M7Ot1EbyApytCnvE0jALPa46ZpKDUo527kKiaWplmlFA==",
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "dev": true,
       "dependencies": {
-        "arr-union": "^3.1.0",
-        "clone-deep": "^0.2.4",
-        "kind-of": "^3.0.2"
+        "is-extglob": "^2.1.1"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true,
       "engines": {
-        "node": ">=6"
+        "node": ">=0.12.0"
       }
     },
-    "node_modules/minimatch": {
-      "version": "3.0.4",
+    "node_modules/isexe": {
+      "version": "2.0.0",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
+      "license": "ISC"
     },
-    "node_modules/mixin-object": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz",
-      "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=",
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "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": {
-        "for-in": "^0.1.3",
-        "is-extendable": "^0.1.1"
+        "argparse": "^2.0.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/mixin-object/node_modules/for-in": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz",
-      "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+    "node_modules/jsbn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
+      "dev": true
     },
-    "node_modules/mkdirp-classic": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
-      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
       "dev": true
     },
-    "node_modules/ms": {
-      "version": "2.1.2",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
     },
-    "node_modules/mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
       "dev": true
     },
-    "node_modules/node-fetch": {
-      "version": "2.6.5",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.5.tgz",
-      "integrity": "sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ==",
+    "node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
       "dev": true,
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
       "engines": {
-        "node": "4.x || >=6.0.0"
+        "node": ">=12"
       }
     },
-    "node_modules/once": {
-      "version": "1.4.0",
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "wrappy": "1"
+      "engines": {
+        "node": ">= 8"
       }
     },
-    "node_modules/onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+    "node_modules/micromatch": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dev": true,
       "dependencies": {
-        "mimic-fn": "^2.1.0"
+        "braces": "^3.0.3",
+        "picomatch": "^2.3.1"
       },
       "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=8.6"
       }
     },
-    "node_modules/ora": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
-      "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
       "dev": true,
-      "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"
-      },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/ora/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "mime-db": "1.52.0"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/ora/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "brace-expansion": "^1.1.7"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "node": "*"
       }
     },
-    "node_modules/ora/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/mitt": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
+      "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==",
+      "dev": true
+    },
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true
+    },
+    "node_modules/mute-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-2.0.0.tgz",
+      "integrity": "sha512-WWdIxpyjEn+FhQJQQv9aQAYlHoNVdzIzUySNV1gHUPDSdZJ3yZn7pAAbQcV7B56Mvu881q9FZV+0Vx2xC44VWA==",
       "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
       "engines": {
-        "node": ">=7.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
-    "node_modules/ora/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/ora/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/netmask": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
+      "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.4.0"
       }
     },
-    "node_modules/ora/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/once": {
+      "version": "1.4.0",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "wrappy": "1"
       }
     },
     "node_modules/os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+    "node_modules/pac-proxy-agent": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.1.0.tgz",
+      "integrity": "sha512-Z5FnLVVZSnX7WjBg0mhDtydeRZ1xMcATZThjySQUHqr+0ksP8kqaw23fNKkaaN/Z8gwLUs/W7xdl0I75eP2Xyw==",
       "dev": true,
       "dependencies": {
-        "p-try": "^2.0.0"
+        "@tootallnate/quickjs-emscripten": "^0.23.0",
+        "agent-base": "^7.1.2",
+        "debug": "^4.3.4",
+        "get-uri": "^6.0.1",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.6",
+        "pac-resolver": "^7.0.1",
+        "socks-proxy-agent": "^8.0.5"
       },
       "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">= 14"
       }
     },
-    "node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+    "node_modules/pac-resolver": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz",
+      "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==",
       "dev": true,
       "dependencies": {
-        "p-limit": "^2.2.0"
+        "degenerator": "^5.0.0",
+        "netmask": "^2.0.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 14"
       }
     },
-    "node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
+    "node_modules/pako": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-2.1.0.tgz",
+      "integrity": "sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==",
+      "dev": true
     },
     "node_modules/parent-module": {
       "version": "1.0.1",
@@ -1462,15 +1611,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "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"
-      }
-    },
     "node_modules/path-is-absolute": {
       "version": "1.0.1",
       "dev": true,
@@ -1479,6 +1619,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/path-to-regexp": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz",
+      "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==",
+      "dev": true
+    },
     "node_modules/path-type": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
@@ -1493,16 +1639,16 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true,
-      "dependencies": {
-        "find-up": "^4.0.0"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
     "node_modules/progress": {
@@ -1514,6 +1660,25 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/proxy-agent": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.5.0.tgz",
+      "integrity": "sha512-TmatMXdr2KlRiA2CyDu8GqR8EjahTG3aY3nXjdzFyoZbmB8hrBsTyMezhULIXKnC0jpfjlmiZ3+EaCzoInSu/A==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^7.1.2",
+        "debug": "^4.3.4",
+        "http-proxy-agent": "^7.0.1",
+        "https-proxy-agent": "^7.0.6",
+        "lru-cache": "^7.14.1",
+        "pac-proxy-agent": "^7.1.0",
+        "proxy-from-env": "^1.1.0",
+        "socks-proxy-agent": "^8.0.5"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/proxy-from-env": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
@@ -1530,114 +1695,173 @@
       }
     },
     "node_modules/punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
+      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
       "dev": true,
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/puppeteer": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-11.0.0.tgz",
-      "integrity": "sha512-6rPFqN1ABjn4shgOICGDBITTRV09EjXVqhDERBDKwCLz0UyBxeeBH6Ay0vQUJ84VACmlxwzOIzVEJXThcF3aNg==",
+      "version": "23.0.2",
+      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-23.0.2.tgz",
+      "integrity": "sha512-I/l1P8s8brcLG+oW9AwF8hUaOSGGJcGKMflXRgULUH0S3ABptlLI9ZKjqWDo8ipY6v789ZKd+bNKtcCwpTh5Ww==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
-        "debug": "4.3.2",
-        "devtools-protocol": "0.0.901419",
-        "extract-zip": "2.0.1",
-        "https-proxy-agent": "5.0.0",
-        "node-fetch": "2.6.5",
-        "pkg-dir": "4.2.0",
-        "progress": "2.0.3",
-        "proxy-from-env": "1.1.0",
-        "rimraf": "3.0.2",
-        "tar-fs": "2.1.1",
-        "unbzip2-stream": "1.4.3",
-        "ws": "8.2.3"
+        "@puppeteer/browsers": "2.3.0",
+        "chromium-bidi": "0.6.4",
+        "cosmiconfig": "^9.0.0",
+        "devtools-protocol": "0.0.1312386",
+        "puppeteer-core": "23.0.2"
+      },
+      "bin": {
+        "puppeteer": "lib/cjs/puppeteer/node/cli.js"
       },
       "engines": {
-        "node": ">=10.18.1"
+        "node": ">=18"
       }
     },
-    "node_modules/puppeteer-extra": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/puppeteer-extra/-/puppeteer-extra-3.2.3.tgz",
-      "integrity": "sha512-CnSN9yIedbAbS8WmRybaDHJLf6goRk+VYM/kbH6i/+EMadCaAeh2O+1/mFUMN2LbkbDNAp2Vd/UwrTVCHjTxyg==",
+    "node_modules/puppeteer-core": {
+      "version": "24.0.0",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-24.0.0.tgz",
+      "integrity": "sha512-bHVXmnkYnMVSbsD+pJGt8fmGZLaVYOAieVnJcDxtLIVTMq0s5RfYdzN4xVlFoBQ3T06/sPkXxca3VLVfaqLxzg==",
       "dev": true,
       "dependencies": {
-        "@types/debug": "^4.1.0",
-        "@types/puppeteer": "*",
-        "debug": "^4.1.1",
-        "deepmerge": "^4.2.2"
+        "@puppeteer/browsers": "2.7.0",
+        "chromium-bidi": "0.11.0",
+        "debug": "^4.4.0",
+        "devtools-protocol": "0.0.1367902",
+        "typed-query-selector": "^2.12.0",
+        "ws": "^8.18.0"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "peerDependencies": {
-        "puppeteer": "*"
+        "node": ">=18"
       }
     },
-    "node_modules/puppeteer-extra-plugin": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/puppeteer-extra-plugin/-/puppeteer-extra-plugin-3.2.0.tgz",
-      "integrity": "sha512-wbiw12USE3b+maMk/IMaroYsz7rusVI9G+ml6pCFCnFFh91Z9BAEiVzhCpOHuquVXEiCCsDTWhDUgvdNxQHOyw==",
+    "node_modules/puppeteer-core/node_modules/chromium-bidi": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.11.0.tgz",
+      "integrity": "sha512-6CJWHkNRoyZyjV9Rwv2lYONZf1Xm0IuDyNq97nwSsxxP3wf5Bwy15K5rOvVKMtJ127jJBmxFUanSAOjgFRxgrA==",
       "dev": true,
       "dependencies": {
-        "@types/debug": "^4.1.0",
-        "debug": "^4.1.1",
-        "merge-deep": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=9.11.2"
+        "mitt": "3.0.1",
+        "zod": "3.23.8"
       },
       "peerDependencies": {
-        "puppeteer-extra": "*"
+        "devtools-protocol": "*"
       }
     },
-    "node_modules/puppeteer-extra-plugin-user-data-dir": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/puppeteer-extra-plugin-user-data-dir/-/puppeteer-extra-plugin-user-data-dir-2.3.1.tgz",
-      "integrity": "sha512-yhaYMaNFdfQ1LbA94ZElW1zU8rh+MFmO+GZA0gtQ8BXc+UZ6aRrWS9flIZvlXDzk+ZsXhCbTEohEwZ8lEDLRVA==",
+    "node_modules/puppeteer-core/node_modules/devtools-protocol": {
+      "version": "0.0.1367902",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1367902.tgz",
+      "integrity": "sha512-XxtPuC3PGakY6PD7dG66/o8KwJ/LkH2/EKe19Dcw58w53dv4/vSQEkn/SzuyhHE2q4zPgCkxQBxus3VV4ql+Pg==",
+      "dev": true
+    },
+    "node_modules/puppeteer/node_modules/@puppeteer/browsers": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.3.0.tgz",
+      "integrity": "sha512-ioXoq9gPxkss4MYhD+SFaU9p1IHFUX0ILAWFPyjGaBdjLsYAlZw6j1iLA0N/m12uVHLFDfSYNF7EQccjinIMDA==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "debug": "^4.1.1",
-        "fs-extra": "^10.0.0",
-        "puppeteer-extra-plugin": "^3.2.0"
+        "debug": "^4.3.5",
+        "extract-zip": "^2.0.1",
+        "progress": "^2.0.3",
+        "proxy-agent": "^6.4.0",
+        "semver": "^7.6.3",
+        "tar-fs": "^3.0.6",
+        "unbzip2-stream": "^1.4.3",
+        "yargs": "^17.7.2"
+      },
+      "bin": {
+        "browsers": "lib/cjs/main-cli.js"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
       }
     },
-    "node_modules/puppeteer-extra-plugin-user-preferences": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/puppeteer-extra-plugin-user-preferences/-/puppeteer-extra-plugin-user-preferences-2.3.1.tgz",
-      "integrity": "sha512-t/FyGQj2aqtHOROqL02z+k2kNQe0cjT0Hd9pG5FJ7x0JXx1722PhOuK7FeJLQMJ+BLl2YvCUgaWSC8Zohjts5A==",
+    "node_modules/puppeteer/node_modules/cosmiconfig": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",
+      "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
       "dev": true,
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "debug": "^4.1.1",
-        "deepmerge": "^4.2.2",
-        "puppeteer-extra-plugin": "^3.2.0",
-        "puppeteer-extra-plugin-user-data-dir": "^2.3.1"
+        "env-paths": "^2.2.1",
+        "import-fresh": "^3.3.0",
+        "js-yaml": "^4.1.0",
+        "parse-json": "^5.2.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/d-fischer"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.9.5"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+    "node_modules/puppeteer/node_modules/puppeteer-core": {
+      "version": "23.0.2",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-23.0.2.tgz",
+      "integrity": "sha512-MvOHn+g1TYkAR2oVd/bf/YWXKqFTJmkhyyurYgxkrjh8rBOL1ZH5VyOsLJi0bLO7/yoipAmk1gFZEx9HUJnaoA==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
+        "@puppeteer/browsers": "2.3.0",
+        "chromium-bidi": "0.6.4",
+        "debug": "^4.3.6",
+        "devtools-protocol": "0.0.1312386",
+        "ws": "^8.18.0"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">=18"
+      }
+    },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "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"
+        }
+      ]
+    },
+    "node_modules/queue-tick": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
+      "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==",
+      "dev": true
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
     "node_modules/require-from-string": {
@@ -1658,17 +1882,14 @@
         "node": ">=4"
       }
     },
-    "node_modules/restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+    "node_modules/reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
       "dev": true,
-      "dependencies": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      },
       "engines": {
-        "node": ">=8"
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
       }
     },
     "node_modules/rimraf": {
@@ -1685,22 +1906,27 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/run-async": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
-      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/rxjs": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz",
-      "integrity": "sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==",
+    "node_modules/run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
       "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"
+        }
+      ],
       "dependencies": {
-        "tslib": "~2.1.0"
+        "queue-microtask": "^1.2.2"
       }
     },
     "node_modules/safe-buffer": {
@@ -1723,61 +1949,102 @@
         }
       ]
     },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
+    "node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6.0.0",
+        "npm": ">= 3.0.0"
+      }
     },
-    "node_modules/shallow-clone": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz",
-      "integrity": "sha1-WQnodLp3EG1zrEFM/sH/yofZcGA=",
+    "node_modules/socks": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
+      "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
       "dev": true,
       "dependencies": {
-        "is-extendable": "^0.1.1",
-        "kind-of": "^2.0.1",
-        "lazy-cache": "^0.2.3",
-        "mixin-object": "^2.0.1"
+        "ip-address": "^9.0.5",
+        "smart-buffer": "^4.2.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 10.0.0",
+        "npm": ">= 3.0.0"
       }
     },
-    "node_modules/shallow-clone/node_modules/kind-of": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
-      "integrity": "sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=",
+    "node_modules/socks-proxy-agent": {
+      "version": "8.0.5",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz",
+      "integrity": "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==",
       "dev": true,
       "dependencies": {
-        "is-buffer": "^1.0.2"
+        "agent-base": "^7.1.2",
+        "debug": "^4.3.4",
+        "socks": "^2.8.3"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 14"
       }
     },
-    "node_modules/shallow-clone/node_modules/lazy-cache": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz",
-      "integrity": "sha1-f+3fLctu23fRHvHRF6tf/fCrG2U=",
+    "node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
+      "optional": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/signal-exit": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz",
-      "integrity": "sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ==",
+    "node_modules/sprintf-js": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
       "dev": true
     },
-    "node_modules/string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+    "node_modules/streamx": {
+      "version": "2.18.0",
+      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.18.0.tgz",
+      "integrity": "sha512-LLUC1TWdjVdn1weXGcSxyTR3T4+acB6tVGXT95y0nGbca4t4o/ng1wKAGTljm9VicuCVLvRlqFYXYy5GwgM7sQ==",
       "dev": true,
       "dependencies": {
-        "safe-buffer": "~5.2.0"
+        "fast-fifo": "^1.3.2",
+        "queue-tick": "^1.0.1",
+        "text-decoder": "^1.1.0"
+      },
+      "optionalDependencies": {
+        "bare-events": "^2.2.0"
       }
     },
     "node_modules/string-width": {
@@ -1819,31 +2086,37 @@
       }
     },
     "node_modules/tar-fs": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz",
+      "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==",
       "dev": true,
       "dependencies": {
-        "chownr": "^1.1.1",
-        "mkdirp-classic": "^0.5.2",
         "pump": "^3.0.0",
-        "tar-stream": "^2.1.4"
+        "tar-stream": "^3.1.5"
+      },
+      "optionalDependencies": {
+        "bare-fs": "^2.1.1",
+        "bare-path": "^2.1.0"
       }
     },
     "node_modules/tar-stream": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",
+      "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
       "dev": true,
       "dependencies": {
-        "bl": "^4.0.3",
-        "end-of-stream": "^1.4.1",
-        "fs-constants": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^3.1.1"
-      },
-      "engines": {
-        "node": ">=6"
+        "b4a": "^1.6.4",
+        "fast-fifo": "^1.2.0",
+        "streamx": "^2.15.0"
+      }
+    },
+    "node_modules/text-decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.1.1.tgz",
+      "integrity": "sha512-8zll7REEv4GDD3x4/0pW+ppIxSNs7H1J10IKFZsuOMscumCdM2a+toDGLPA3T+1+fLBql4zbt5z83GEQGGV5VA==",
+      "dev": true,
+      "dependencies": {
+        "b4a": "^1.6.4"
       }
     },
     "node_modules/through": {
@@ -1864,16 +2137,22 @@
         "node": ">=0.6.0"
       }
     },
-    "node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=",
-      "dev": true
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
     },
     "node_modules/tslib": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz",
-      "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
       "dev": true
     },
     "node_modules/type-fest": {
@@ -1888,6 +2167,12 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/typed-query-selector": {
+      "version": "2.12.0",
+      "resolved": "https://registry.npmjs.org/typed-query-selector/-/typed-query-selector-2.12.0.tgz",
+      "integrity": "sha512-SbklCd1F0EiZOyPiW192rrHZzZ5sBijB6xM+cpmrwDqObvdtunOHHIk9fCGsoK5JVIYXoyEp4iEdE3upFH3PAg==",
+      "dev": true
+    },
     "node_modules/unbzip2-stream": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
@@ -1898,14 +2183,11 @@
         "through": "^2.3.8"
       }
     },
-    "node_modules/universalify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10.0.0"
-      }
+    "node_modules/undici-types": {
+      "version": "6.19.8",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
+      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
+      "dev": true
     },
     "node_modules/uri-js": {
       "version": "4.4.1",
@@ -1916,36 +2198,12 @@
         "punycode": "^2.1.0"
       }
     },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
-    },
-    "node_modules/wcwidth": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
-      "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
-      "dev": true,
-      "dependencies": {
-        "defaults": "^1.0.3"
-      }
-    },
-    "node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=",
-      "dev": true
-    },
-    "node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+    "node_modules/urlpattern-polyfill": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz",
+      "integrity": "sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==",
       "dev": true,
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
+      "peer": true
     },
     "node_modules/which": {
       "version": "2.0.2",
@@ -1961,22 +2219,69 @@
         "node": ">= 8"
       }
     },
+    "node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/ws": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
-      "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "dev": true,
       "engines": {
         "node": ">=10.0.0"
       },
       "peerDependencies": {
         "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
+        "utf-8-validate": ">=5.0.2"
       },
       "peerDependenciesMeta": {
         "bufferutil": {
@@ -1987,13 +2292,52 @@
         }
       }
     },
+    "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/yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.1.tgz",
+      "integrity": "sha512-pIXzoImaqmfOrL7teGUBt/T7ZDnyeGBWyXQBvOVhLkWLN37GXv8NMLK406UY6dS51JfcQHsmcW5cJ441bHg6Lg==",
       "dev": true,
+      "bin": {
+        "yaml": "bin.mjs"
+      },
       "engines": {
-        "node": ">= 6"
+        "node": ">= 14"
+      }
+    },
+    "node_modules/yargs": {
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "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/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/yauzl": {
@@ -2004,160 +2348,364 @@
         "buffer-crc32": "~0.2.3",
         "fd-slicer": "~1.1.0"
       }
+    },
+    "node_modules/yoctocolors-cjs": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yoctocolors-cjs/-/yoctocolors-cjs-2.1.2.tgz",
+      "integrity": "sha512-cYVsTjKl8b+FrnidjibDWskAv7UKOfcwaVZdp/it9n1s9fU3IkgDbhdIRKCW4JDsAlECJY0ytoVPT3sK6kideA==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/zod": {
+      "version": "3.23.8",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz",
+      "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
     }
   },
   "dependencies": {
     "@babel/code-frame": {
-      "version": "7.15.8",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz",
-      "integrity": "sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
+      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
       "dev": true,
       "requires": {
-        "@babel/highlight": "^7.14.5"
+        "@babel/highlight": "^7.16.7"
       }
     },
     "@babel/helper-validator-identifier": {
-      "version": "7.15.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz",
-      "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
+      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
       "dev": true
     },
     "@babel/highlight": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
-      "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.12.tgz",
+      "integrity": "sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==",
       "dev": true,
       "requires": {
-        "@babel/helper-validator-identifier": "^7.14.5",
+        "@babel/helper-validator-identifier": "^7.16.7",
         "chalk": "^2.0.0",
         "js-tokens": "^4.0.0"
       }
     },
+    "@inquirer/checkbox": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-4.0.4.tgz",
+      "integrity": "sha512-fYAKCAcGNMdfjL6hZTRUwkIByQ8EIZCXKrIQZH7XjADnN/xvRUhj8UdBbpC4zoUzvChhkSC/zRKaP/tDs3dZpg==",
+      "dev": true,
+      "requires": {
+        "@inquirer/core": "^10.1.2",
+        "@inquirer/figures": "^1.0.9",
+        "@inquirer/type": "^3.0.2",
+        "ansi-escapes": "^4.3.2",
+        "yoctocolors-cjs": "^2.1.2"
+      }
+    },
+    "@inquirer/confirm": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-5.1.1.tgz",
+      "integrity": "sha512-vVLSbGci+IKQvDOtzpPTCOiEJCNidHcAq9JYVoWTW0svb5FiwSLotkM+JXNXejfjnzVYV9n0DTBythl9+XgTxg==",
+      "dev": true,
+      "requires": {
+        "@inquirer/core": "^10.1.2",
+        "@inquirer/type": "^3.0.2"
+      }
+    },
+    "@inquirer/core": {
+      "version": "10.1.2",
+      "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-10.1.2.tgz",
+      "integrity": "sha512-bHd96F3ezHg1mf/J0Rb4CV8ndCN0v28kUlrHqP7+ECm1C/A+paB7Xh2lbMk6x+kweQC+rZOxM/YeKikzxco8bQ==",
+      "dev": true,
+      "requires": {
+        "@inquirer/figures": "^1.0.9",
+        "@inquirer/type": "^3.0.2",
+        "ansi-escapes": "^4.3.2",
+        "cli-width": "^4.1.0",
+        "mute-stream": "^2.0.0",
+        "signal-exit": "^4.1.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^6.2.0",
+        "yoctocolors-cjs": "^2.1.2"
+      }
+    },
+    "@inquirer/editor": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-4.2.1.tgz",
+      "integrity": "sha512-xn9aDaiP6nFa432i68JCaL302FyL6y/6EG97nAtfIPnWZ+mWPgCMLGc4XZ2QQMsZtu9q3Jd5AzBPjXh10aX9kA==",
+      "dev": true,
+      "requires": {
+        "@inquirer/core": "^10.1.2",
+        "@inquirer/type": "^3.0.2",
+        "external-editor": "^3.1.0"
+      }
+    },
+    "@inquirer/expand": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-4.0.4.tgz",
+      "integrity": "sha512-GYocr+BPyxKPxQ4UZyNMqZFSGKScSUc0Vk17II3J+0bDcgGsQm0KYQNooN1Q5iBfXsy3x/VWmHGh20QnzsaHwg==",
+      "dev": true,
+      "requires": {
+        "@inquirer/core": "^10.1.2",
+        "@inquirer/type": "^3.0.2",
+        "yoctocolors-cjs": "^2.1.2"
+      }
+    },
+    "@inquirer/figures": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.9.tgz",
+      "integrity": "sha512-BXvGj0ehzrngHTPTDqUoDT3NXL8U0RxUk2zJm2A66RhCEIWdtU1v6GuUqNAgArW4PQ9CinqIWyHdQgdwOj06zQ==",
+      "dev": true
+    },
+    "@inquirer/input": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-4.1.1.tgz",
+      "integrity": "sha512-nAXAHQndZcXB+7CyjIW3XuQZZHbQQ0q8LX6miY6bqAWwDzNa9JUioDBYrFmOUNIsuF08o1WT/m2gbBXvBhYVxg==",
+      "dev": true,
+      "requires": {
+        "@inquirer/core": "^10.1.2",
+        "@inquirer/type": "^3.0.2"
+      }
+    },
+    "@inquirer/number": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-3.0.4.tgz",
+      "integrity": "sha512-DX7a6IXRPU0j8kr2ovf+QaaDiIf+zEKaZVzCWdLOTk7XigqSXvoh4cul7x68xp54WTQrgSnW7P1WBJDbyY3GhA==",
+      "dev": true,
+      "requires": {
+        "@inquirer/core": "^10.1.2",
+        "@inquirer/type": "^3.0.2"
+      }
+    },
+    "@inquirer/password": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-4.0.4.tgz",
+      "integrity": "sha512-wiliQOWdjM8FnBmdIHtQV2Ca3S1+tMBUerhyjkRCv1g+4jSvEweGu9GCcvVEgKDhTBT15nrxvk5/bVrGUqSs1w==",
+      "dev": true,
+      "requires": {
+        "@inquirer/core": "^10.1.2",
+        "@inquirer/type": "^3.0.2",
+        "ansi-escapes": "^4.3.2"
+      }
+    },
+    "@inquirer/prompts": {
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-7.2.1.tgz",
+      "integrity": "sha512-v2JSGri6/HXSfoGIwuKEn8sNCQK6nsB2BNpy2lSX6QH9bsECrMv93QHnj5+f+1ZWpF/VNioIV2B/PDox8EvGuQ==",
+      "dev": true,
+      "requires": {
+        "@inquirer/checkbox": "^4.0.4",
+        "@inquirer/confirm": "^5.1.1",
+        "@inquirer/editor": "^4.2.1",
+        "@inquirer/expand": "^4.0.4",
+        "@inquirer/input": "^4.1.1",
+        "@inquirer/number": "^3.0.4",
+        "@inquirer/password": "^4.0.4",
+        "@inquirer/rawlist": "^4.0.4",
+        "@inquirer/search": "^3.0.4",
+        "@inquirer/select": "^4.0.4"
+      }
+    },
+    "@inquirer/rawlist": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-4.0.4.tgz",
+      "integrity": "sha512-IsVN2EZdNHsmFdKWx9HaXb8T/s3FlR/U1QPt9dwbSyPtjFbMTlW9CRFvnn0bm/QIsrMRD2oMZqrQpSWPQVbXXg==",
+      "dev": true,
+      "requires": {
+        "@inquirer/core": "^10.1.2",
+        "@inquirer/type": "^3.0.2",
+        "yoctocolors-cjs": "^2.1.2"
+      }
+    },
+    "@inquirer/search": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-3.0.4.tgz",
+      "integrity": "sha512-tSkJk2SDmC2MEdTIjknXWmCnmPr5owTs9/xjfa14ol1Oh95n6xW7SYn5fiPk4/vrJPys0ggSWiISdPze4LTa7A==",
+      "dev": true,
+      "requires": {
+        "@inquirer/core": "^10.1.2",
+        "@inquirer/figures": "^1.0.9",
+        "@inquirer/type": "^3.0.2",
+        "yoctocolors-cjs": "^2.1.2"
+      }
+    },
+    "@inquirer/select": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-4.0.4.tgz",
+      "integrity": "sha512-ZzYLuLoUzTIW9EJm++jBpRiTshGqS3Q1o5qOEQqgzaBlmdsjQr6pA4TUNkwu6OBYgM2mIRbCz6mUhFDfl/GF+w==",
+      "dev": true,
+      "requires": {
+        "@inquirer/core": "^10.1.2",
+        "@inquirer/figures": "^1.0.9",
+        "@inquirer/type": "^3.0.2",
+        "ansi-escapes": "^4.3.2",
+        "yoctocolors-cjs": "^2.1.2"
+      }
+    },
+    "@inquirer/type": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-3.0.2.tgz",
+      "integrity": "sha512-ZhQ4TvhwHZF+lGhQ2O/rsjo80XoZR5/5qhOY3t6FJuX5XBg5Be8YzYTvaUGJnc12AUGI2nr4QSUE4PhKSigx7g==",
+      "dev": true,
+      "requires": {}
+    },
+    "@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      }
+    },
+    "@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true
+    },
+    "@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      }
+    },
     "@percy/client": {
-      "version": "1.0.0-beta.70",
-      "resolved": "https://registry.npmjs.org/@percy/client/-/client-1.0.0-beta.70.tgz",
-      "integrity": "sha512-OKGkUnjEtnFH0jske1rdvjSZYZfqL1fTbr0ik0pFQ3i3RmLsGMdDOu5lyt6N6gnn/X1+btn+QI1Z0N2rO8vbNw==",
+      "version": "1.30.6",
+      "resolved": "https://registry.npmjs.org/@percy/client/-/client-1.30.6.tgz",
+      "integrity": "sha512-iHcYK4djy/WA3ZqIVcgOmuOtDeMiGDmJZ0DlDG38HMmAPgXHSThNXNz9bnXb2OSJFxXVRdlAE8DoqFK5FnwNsg==",
       "dev": true,
       "requires": {
-        "@percy/env": "1.0.0-beta.70",
-        "@percy/logger": "1.0.0-beta.70"
+        "@percy/env": "1.30.6",
+        "@percy/logger": "1.30.6",
+        "pako": "^2.1.0"
       }
     },
     "@percy/config": {
-      "version": "1.0.0-beta.70",
-      "resolved": "https://registry.npmjs.org/@percy/config/-/config-1.0.0-beta.70.tgz",
-      "integrity": "sha512-SjH0X+pgzR2Ne004kRdlEai1BV0jnhBHPFPKCATNEAPGnW+IvJpG+H2cjGfBF/qmAryXHshLDX6MRbk44bM7MQ==",
+      "version": "1.30.6",
+      "resolved": "https://registry.npmjs.org/@percy/config/-/config-1.30.6.tgz",
+      "integrity": "sha512-qYUu4TVLJgtG/RIwa/AM+d3f1xH4D3uSvCoWUhX4y5rK5QDZ0UqWEvDOD6CJDn8i1xXi4ZY/JB7HKYKUTHeppQ==",
       "dev": true,
       "requires": {
-        "@percy/logger": "1.0.0-beta.70",
+        "@percy/logger": "1.30.6",
         "ajv": "^8.6.2",
-        "cosmiconfig": "^7.0.0",
-        "yaml": "^1.10.0"
+        "cosmiconfig": "^8.0.0",
+        "yaml": "^2.0.0"
       }
     },
     "@percy/core": {
-      "version": "1.0.0-beta.70",
-      "resolved": "https://registry.npmjs.org/@percy/core/-/core-1.0.0-beta.70.tgz",
-      "integrity": "sha512-5Vy87hFs9wuUbxC3teGaCngejwBCJAl0BmZy9QdREtc8rdCTMfBR4z7vdWNp7mrt7dxAi4F8p4HY9DaRM45axQ==",
+      "version": "1.30.6",
+      "resolved": "https://registry.npmjs.org/@percy/core/-/core-1.30.6.tgz",
+      "integrity": "sha512-G0ULd3pHz8s4RajxUGTWGx8Ngl+jhOjIPNxOBtKh0ywgAnbvUWNWLKYvs9QinZcoPGfWgwc5+1btbeJxTAVGQg==",
       "dev": true,
       "requires": {
-        "@percy/client": "1.0.0-beta.70",
-        "@percy/config": "1.0.0-beta.70",
-        "@percy/dom": "1.0.0-beta.70",
-        "@percy/logger": "1.0.0-beta.70",
+        "@percy/client": "1.30.6",
+        "@percy/config": "1.30.6",
+        "@percy/dom": "1.30.6",
+        "@percy/logger": "1.30.6",
+        "@percy/webdriver-utils": "1.30.6",
+        "content-disposition": "^0.5.4",
         "cross-spawn": "^7.0.3",
         "extract-zip": "^2.0.1",
+        "fast-glob": "^3.2.11",
+        "micromatch": "^4.0.8",
+        "mime-types": "^2.1.34",
+        "pako": "^2.1.0",
+        "path-to-regexp": "^6.3.0",
         "rimraf": "^3.0.2",
-        "ws": "^8.0.0"
+        "ws": "^8.17.1",
+        "yaml": "^2.4.1"
       }
     },
     "@percy/dom": {
-      "version": "1.0.0-beta.70",
-      "resolved": "https://registry.npmjs.org/@percy/dom/-/dom-1.0.0-beta.70.tgz",
-      "integrity": "sha512-ltbInkpXwy6p4ojEcNHulCt8idazSVNyvaMybmx9ytxHTibVLZsLF9+k08UZmYboWDzy16DDb6QYEmlMg/8Fng==",
+      "version": "1.30.6",
+      "resolved": "https://registry.npmjs.org/@percy/dom/-/dom-1.30.6.tgz",
+      "integrity": "sha512-pMlzYYJfgVdNYbw1iJIQZxXzszL3EmIrbGvvpkred3RciJ4T3/pFlqiLiPS7TTUovMFFgRjTR1gLOH1eeWyM5A==",
       "dev": true
     },
     "@percy/env": {
-      "version": "1.0.0-beta.70",
-      "resolved": "https://registry.npmjs.org/@percy/env/-/env-1.0.0-beta.70.tgz",
-      "integrity": "sha512-npP/OxbJnCnPbf2oXUd6nxhjKfJmHaPeTwdDWBFgz3O29rD4DstVCC7kKeF4/VzNpQj+FILPKJkczlv0titP5w==",
-      "dev": true
+      "version": "1.30.6",
+      "resolved": "https://registry.npmjs.org/@percy/env/-/env-1.30.6.tgz",
+      "integrity": "sha512-GU3ZcyiCUM3KiRmcpa5fpOIkuHBUonvBhNeg1jErZFEZFQDNm238SFnKQFEJIYCX96W5Q9qqXMwjApj7qBpiWg==",
+      "dev": true,
+      "requires": {
+        "@percy/logger": "1.30.6"
+      }
     },
     "@percy/logger": {
-      "version": "1.0.0-beta.70",
-      "resolved": "https://registry.npmjs.org/@percy/logger/-/logger-1.0.0-beta.70.tgz",
-      "integrity": "sha512-QUVdp/FEsoHYftakuxe67/e/OVeVX6d2Fgur+thhqgHZ5GD87TwFsB+PH8kP6b5/ZZ+bOysT6bbxbiDvGEqWwg==",
+      "version": "1.30.6",
+      "resolved": "https://registry.npmjs.org/@percy/logger/-/logger-1.30.6.tgz",
+      "integrity": "sha512-HDhAIjjqOlpAIqClu+fvuWSA2cvxh3aMHtKN3gRdRMppHCvyyfmVbKd1PoLPV7Z0SQzZkyaBMAjiRXWMPksLig==",
       "dev": true
     },
     "@percy/puppeteer": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@percy/puppeteer/-/puppeteer-2.0.0.tgz",
-      "integrity": "sha512-AAErUA1NEELBmOIscHBJB064+6x7N2ZIA9EisBfB6ff1HJK58t2x7VGRNQjGsXvq/RP0wrLzmUY3uSSb2gQhVQ==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@percy/puppeteer/-/puppeteer-2.0.2.tgz",
+      "integrity": "sha512-DPyh5UyttPPXMNl3o6Owox7bnV54aQ7sIWfcsXUBZ6q1wLVmBjc5KP4x51dpPiuTDn3SMzFExMrXBFugfDJHPA==",
       "dev": true,
       "requires": {
-        "@percy/sdk-utils": "^1.0.0-beta.32"
+        "@percy/sdk-utils": "^1.0.0"
       }
     },
     "@percy/sdk-utils": {
-      "version": "1.0.0-beta.70",
-      "resolved": "https://registry.npmjs.org/@percy/sdk-utils/-/sdk-utils-1.0.0-beta.70.tgz",
-      "integrity": "sha512-kxdMpvVnj4GUUhEYQ9j+qWUm1SJXkeqhcpbxrrfmE9wFpw2TgKWUTOwLS6im68cY6A03P9F4UAGSNWnE0ZHneA==",
-      "dev": true,
-      "requires": {
-        "@percy/logger": "1.0.0-beta.70"
-      }
+      "version": "1.30.6",
+      "resolved": "https://registry.npmjs.org/@percy/sdk-utils/-/sdk-utils-1.30.6.tgz",
+      "integrity": "sha512-LSayDfxAaXJaSv5SIDKMf7EjDl+k4kufYO88YQwc9+9Yr58qqrPFon11x0PvJdA2IDGBo1G6QbvpLUO0Vem2FQ==",
+      "dev": true
     },
-    "@types/debug": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.7.tgz",
-      "integrity": "sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==",
+    "@percy/webdriver-utils": {
+      "version": "1.30.6",
+      "resolved": "https://registry.npmjs.org/@percy/webdriver-utils/-/webdriver-utils-1.30.6.tgz",
+      "integrity": "sha512-B1M9HWP3ZEM5CuDSMUx+68mrrKm9/JjJ0KO/OLztRh+v7TOsgOWpHMHalurwEIfoNf/olduQ4/Vv9TPrTSj72Q==",
       "dev": true,
       "requires": {
-        "@types/ms": "*"
+        "@percy/config": "1.30.6",
+        "@percy/sdk-utils": "1.30.6"
       }
     },
-    "@types/inquirer": {
-      "version": "8.1.3",
-      "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-8.1.3.tgz",
-      "integrity": "sha512-AayK4ZL5ssPzR1OtnOLGAwpT0Dda3Xi/h1G0l1oJDNrowp7T1423q4Zb8/emr7tzRlCy4ssEri0LWVexAqHyKQ==",
+    "@puppeteer/browsers": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.7.0.tgz",
+      "integrity": "sha512-bO61XnTuopsz9kvtfqhVbH6LTM1koxK0IlBR+yuVrM2LB7mk8+5o1w18l5zqd5cs8xlf+ntgambqRqGifMDjog==",
       "dev": true,
       "requires": {
-        "@types/through": "*",
-        "rxjs": "^7.2.0"
+        "debug": "^4.4.0",
+        "extract-zip": "^2.0.1",
+        "progress": "^2.0.3",
+        "proxy-agent": "^6.5.0",
+        "semver": "^7.6.3",
+        "tar-fs": "^3.0.6",
+        "unbzip2-stream": "^1.4.3",
+        "yargs": "^17.7.2"
       }
     },
-    "@types/ms": {
-      "version": "0.7.31",
-      "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.31.tgz",
-      "integrity": "sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==",
+    "@tootallnate/quickjs-emscripten": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz",
+      "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==",
       "dev": true
     },
     "@types/node": {
-      "version": "14.11.8",
-      "dev": true
-    },
-    "@types/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
-      "dev": true
-    },
-    "@types/puppeteer": {
-      "version": "5.4.4",
-      "resolved": "https://registry.npmjs.org/@types/puppeteer/-/puppeteer-5.4.4.tgz",
-      "integrity": "sha512-3Nau+qi69CN55VwZb0ATtdUAlYlqOOQ3OfQfq0Hqgc4JMFXiQT/XInlwQ9g6LbicDslE6loIFsXFklGh5XmI6Q==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/through": {
-      "version": "0.0.30",
-      "resolved": "https://registry.npmjs.org/@types/through/-/through-0.0.30.tgz",
-      "integrity": "sha512-FvnCJljyxhPM3gkRgWmxmDZyAQSiBQQWLI0A0VFL0K7W1oRUrPJSqNO0NvTnLkBcotdlp3lKvaT0JrnyRDkzOg==",
+      "version": "22.5.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.5.tgz",
+      "integrity": "sha512-Xjs4y5UPO/CLdzpgR6GirZJx36yScjh73+2NlLlkFRSoQN8B0DpfXPdZGnvVmLRLOsqDpOfTNv7D9trgGhmOIA==",
       "dev": true,
       "requires": {
-        "@types/node": "*"
+        "undici-types": "~6.19.2"
       }
     },
     "@types/yauzl": {
@@ -2169,18 +2717,15 @@
       }
     },
     "agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "dev": true,
-      "requires": {
-        "debug": "4"
-      }
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
+      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
+      "dev": true
     },
     "ajv": {
-      "version": "8.6.3",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz",
-      "integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==",
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
       "dev": true,
       "requires": {
         "fast-deep-equal": "^3.1.1",
@@ -2189,6 +2734,15 @@
         "uri-js": "^4.2.2"
       }
     },
+    "ansi-escapes": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "dev": true,
+      "requires": {
+        "type-fest": "^0.21.3"
+      }
+    },
     "ansi-regex": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
@@ -2201,18 +2755,79 @@
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dev": true,
       "requires": {
-        "color-convert": "^1.9.0"
+        "color-convert": "^1.9.0"
+      }
+    },
+    "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
+    },
+    "ast-types": {
+      "version": "0.13.4",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
+      "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==",
+      "dev": true,
+      "requires": {
+        "tslib": "^2.0.1"
+      }
+    },
+    "b4a": {
+      "version": "1.6.6",
+      "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.6.tgz",
+      "integrity": "sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg==",
+      "dev": true
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "dev": true
+    },
+    "bare-events": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.4.2.tgz",
+      "integrity": "sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==",
+      "dev": true,
+      "optional": true
+    },
+    "bare-fs": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.3.1.tgz",
+      "integrity": "sha512-W/Hfxc/6VehXlsgFtbB5B4xFcsCl+pAh30cYhoFyXErf6oGrwjh8SwiPAdHgpmWonKuYpZgGywN0SXt7dgsADA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "bare-events": "^2.0.0",
+        "bare-path": "^2.0.0",
+        "bare-stream": "^2.0.0"
+      }
+    },
+    "bare-os": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.4.0.tgz",
+      "integrity": "sha512-v8DTT08AS/G0F9xrhyLtepoo9EJBJ85FRSMbu1pQUlAf6A8T0tEEQGMVObWeqpjhSPXsE0VGlluFBJu2fdoTNg==",
+      "dev": true,
+      "optional": true
+    },
+    "bare-path": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-2.1.3.tgz",
+      "integrity": "sha512-lh/eITfU8hrj9Ru5quUp0Io1kJWIk1bTjzo7JH1P5dWmQ2EL4hFUlfI8FonAhSlgIfhn63p84CDY/x+PisgcXA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "bare-os": "^2.1.0"
       }
     },
-    "arr-union": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-      "dev": true
-    },
-    "balanced-match": {
-      "version": "1.0.0",
-      "dev": true
+    "bare-stream": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.1.3.tgz",
+      "integrity": "sha512-tiDAH9H/kP+tvNO5sczyn9ZAA7utrSMobyDchsnyyXBuUe2FSQWbxhtuHB8jwpHYYevVo2UJpcmvvjrbHboUUQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "streamx": "^2.18.0"
+      }
     },
     "base64-js": {
       "version": "1.5.1",
@@ -2220,16 +2835,11 @@
       "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
       "dev": true
     },
-    "bl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "dev": true,
-      "requires": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
-      }
+    "basic-ftp": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.5.tgz",
+      "integrity": "sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==",
+      "dev": true
     },
     "brace-expansion": {
       "version": "1.1.11",
@@ -2239,6 +2849,15 @@
         "concat-map": "0.0.1"
       }
     },
+    "braces": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "dev": true,
+      "requires": {
+        "fill-range": "^7.1.1"
+      }
+    },
     "buffer": {
       "version": "5.7.1",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
@@ -2276,50 +2895,70 @@
       "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
       "dev": true
     },
-    "chownr": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-      "dev": true
-    },
-    "cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+    "chromium-bidi": {
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.6.4.tgz",
+      "integrity": "sha512-8zoq6ogmhQQkAKZVKO2ObFTl4uOkqoX1PlKQX3hZQ5E9cbUotcAb7h4pTNVAGGv8Z36PF3CtdOriEp/Rz82JqQ==",
       "dev": true,
+      "peer": true,
       "requires": {
-        "restore-cursor": "^3.1.0"
+        "mitt": "3.0.1",
+        "urlpattern-polyfill": "10.0.0",
+        "zod": "3.23.8"
       }
     },
-    "cli-spinners": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz",
-      "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==",
-      "dev": true
-    },
     "cli-width": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
-      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
-      "dev": true
-    },
-    "clone": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.1.0.tgz",
+      "integrity": "sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==",
       "dev": true
     },
-    "clone-deep": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.2.4.tgz",
-      "integrity": "sha1-TnPdCen7lxzDhnDF3O2cGJZIHMY=",
+    "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": {
-        "for-own": "^0.1.3",
-        "is-plain-object": "^2.0.1",
-        "kind-of": "^3.0.2",
-        "lazy-cache": "^1.0.3",
-        "shallow-clone": "^0.1.2"
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "wrap-ansi": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+          "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
+          }
+        }
       }
     },
     "color-convert": {
@@ -2334,24 +2973,32 @@
     "color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
       "dev": true
     },
     "concat-map": {
       "version": "0.0.1",
       "dev": true
     },
+    "content-disposition": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.2.1"
+      }
+    },
     "cosmiconfig": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
-      "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
+      "version": "8.1.3",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.1.3.tgz",
+      "integrity": "sha512-/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw==",
       "dev": true,
       "requires": {
-        "@types/parse-json": "^4.0.0",
         "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
         "parse-json": "^5.0.0",
-        "path-type": "^4.0.0",
-        "yaml": "^1.10.0"
+        "path-type": "^4.0.0"
       }
     },
     "cross-spawn": {
@@ -2380,35 +3027,38 @@
         }
       }
     },
+    "data-uri-to-buffer": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz",
+      "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==",
+      "dev": true
+    },
     "debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
       "dev": true,
       "requires": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       }
     },
-    "deepmerge": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
-      "dev": true
-    },
-    "defaults": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
-      "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
+    "degenerator": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz",
+      "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==",
       "dev": true,
       "requires": {
-        "clone": "^1.0.2"
+        "ast-types": "^0.13.4",
+        "escodegen": "^2.1.0",
+        "esprima": "^4.0.1"
       }
     },
     "devtools-protocol": {
-      "version": "0.0.901419",
-      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.901419.tgz",
-      "integrity": "sha512-4INMPwNm9XRpBukhNbF7OB6fNTTCaI8pzy/fXg0xQzAy5h3zL1P8xT3QazgKqBrb/hAYwIBizqDBZ7GtJE74QQ==",
-      "dev": true
+      "version": "0.0.1312386",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1312386.tgz",
+      "integrity": "sha512-DPnhUXvmvKT2dFA/j7B+riVLUt9Q6RKJlcppojL5CoRywJJKLDYnRlw0gTFKfgDPHP5E04UoB71SxoJlVZy8FA==",
+      "dev": true,
+      "peer": true
     },
     "emoji-regex": {
       "version": "8.0.0",
@@ -2423,6 +3073,13 @@
         "once": "^1.4.0"
       }
     },
+    "env-paths": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
+      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
+      "dev": true,
+      "peer": true
+    },
     "error-ex": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -2432,12 +3089,48 @@
         "is-arrayish": "^0.2.1"
       }
     },
+    "escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true
+    },
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
       "dev": true
     },
+    "escodegen": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
+      "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
+      "dev": true,
+      "requires": {
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
+        "esutils": "^2.0.2",
+        "source-map": "~0.6.1"
+      }
+    },
+    "esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true
+    },
+    "estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true
+    },
+    "esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true
+    },
     "external-editor": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
@@ -2465,68 +3158,60 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
       "dev": true
     },
-    "fd-slicer": {
-      "version": "1.1.0",
-      "dev": true,
-      "requires": {
-        "pend": "~1.2.0"
-      }
+    "fast-fifo": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
+      "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==",
+      "dev": true
     },
-    "figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+    "fast-glob": {
+      "version": "3.2.11",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
+      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
       "dev": true,
       "requires": {
-        "escape-string-regexp": "^1.0.5"
+        "@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"
       }
     },
-    "find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+    "fastq": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
+      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
       "dev": true,
       "requires": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
+        "reusify": "^1.0.4"
       }
     },
-    "for-in": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-      "dev": true
-    },
-    "for-own": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
+    "fd-slicer": {
+      "version": "1.1.0",
       "dev": true,
       "requires": {
-        "for-in": "^1.0.1"
+        "pend": "~1.2.0"
       }
     },
-    "fs-constants": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-      "dev": true
-    },
-    "fs-extra": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
-      "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
+    "fill-range": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
+        "to-regex-range": "^5.0.1"
       }
     },
     "fs.realpath": {
       "version": "1.0.0",
       "dev": true
     },
+    "get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true
+    },
     "get-stream": {
       "version": "5.2.0",
       "dev": true,
@@ -2534,6 +3219,17 @@
         "pump": "^3.0.0"
       }
     },
+    "get-uri": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.4.tgz",
+      "integrity": "sha512-E1b1lFFLvLgak2whF2xDBcOy6NLVGZBqqjJjsIhvopKfWWEi64pLVTWWehV8KlLerZkfNTA95sTe2OdJKm1OzQ==",
+      "dev": true,
+      "requires": {
+        "basic-ftp": "^5.0.2",
+        "data-uri-to-buffer": "^6.0.2",
+        "debug": "^4.3.4"
+      }
+    },
     "glob": {
       "version": "7.1.6",
       "dev": true,
@@ -2546,25 +3242,38 @@
         "path-is-absolute": "^1.0.0"
       }
     },
-    "graceful-fs": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
-      "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==",
-      "dev": true
+    "glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "requires": {
+        "is-glob": "^4.0.1"
+      }
     },
     "has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
       "dev": true
     },
+    "http-proxy-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
+      "dev": true,
+      "requires": {
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
+      }
+    },
     "https-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
       "dev": true,
       "requires": {
-        "agent-base": "6",
+        "agent-base": "^7.1.2",
         "debug": "4"
       }
     },
@@ -2607,104 +3316,26 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "dev": true
     },
-    "inquirer": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.0.tgz",
-      "integrity": "sha512-0crLweprevJ02tTuA6ThpoAERAGyVILC4sS74uib58Xf/zSr1/ZWtmm7D5CI+bSQEaA04f0K7idaHpQbSWgiVQ==",
+    "ip-address": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
+      "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
       "dev": true,
       "requires": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.1.1",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^3.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.21",
-        "mute-stream": "0.0.8",
-        "ora": "^5.4.1",
-        "run-async": "^2.4.0",
-        "rxjs": "^7.2.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6"
-      },
-      "dependencies": {
-        "ansi-escapes": {
-          "version": "4.3.2",
-          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-          "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-          "dev": true,
-          "requires": {
-            "type-fest": "^0.21.3"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
+        "jsbn": "1.1.0",
+        "sprintf-js": "^1.1.3"
       }
     },
     "is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-      "dev": true
-    },
-    "is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
       "dev": true
     },
-    "is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "dev": true
     },
     "is-fullwidth-code-point": {
@@ -2713,228 +3344,133 @@
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
       "dev": true
     },
-    "is-interactive": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
-      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
-      "dev": true
-    },
-    "is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+    "is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "dev": true,
       "requires": {
-        "isobject": "^3.0.1"
+        "is-extglob": "^2.1.1"
       }
     },
-    "is-unicode-supported": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+    "is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true
     },
     "isexe": {
       "version": "2.0.0",
       "dev": true
     },
-    "isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true
-    },
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
       "dev": true
     },
-    "json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true
-    },
-    "json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
-    },
-    "jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.6",
-        "universalify": "^2.0.0"
-      }
-    },
-    "kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "requires": {
-        "is-buffer": "^1.1.5"
-      }
-    },
-    "lazy-cache": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
-      "dev": true
-    },
-    "lines-and-columns": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
-      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
-      "dev": true
-    },
-    "locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+    "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": {
-        "p-locate": "^4.1.0"
+        "argparse": "^2.0.1"
       }
     },
-    "lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+    "jsbn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
       "dev": true
     },
-    "log-symbols": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-      "dev": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
+    "json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
     },
-    "merge-deep": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/merge-deep/-/merge-deep-3.0.3.tgz",
-      "integrity": "sha512-qtmzAS6t6grwEkNrunqTBdn0qKwFgNWvlxUbAV8es9M7Ot1EbyApytCnvE0jALPa46ZpKDUo527kKiaWplmlFA==",
+    "json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
+    "lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "dev": true
+    },
+    "lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "dev": true
+    },
+    "merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true
+    },
+    "micromatch": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dev": true,
       "requires": {
-        "arr-union": "^3.1.0",
-        "clone-deep": "^0.2.4",
-        "kind-of": "^3.0.2"
+        "braces": "^3.0.3",
+        "picomatch": "^2.3.1"
       }
     },
-    "mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+    "mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
       "dev": true
     },
-    "minimatch": {
-      "version": "3.0.4",
+    "mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dev": true,
       "requires": {
-        "brace-expansion": "^1.1.7"
+        "mime-db": "1.52.0"
       }
     },
-    "mixin-object": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz",
-      "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=",
+    "minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
       "requires": {
-        "for-in": "^0.1.3",
-        "is-extendable": "^0.1.1"
-      },
-      "dependencies": {
-        "for-in": {
-          "version": "0.1.8",
-          "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz",
-          "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=",
-          "dev": true
-        }
+        "brace-expansion": "^1.1.7"
       }
     },
-    "mkdirp-classic": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
-      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+    "mitt": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
+      "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==",
       "dev": true
     },
     "ms": {
-      "version": "2.1.2",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "dev": true
     },
     "mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-2.0.0.tgz",
+      "integrity": "sha512-WWdIxpyjEn+FhQJQQv9aQAYlHoNVdzIzUySNV1gHUPDSdZJ3yZn7pAAbQcV7B56Mvu881q9FZV+0Vx2xC44VWA==",
       "dev": true
     },
-    "node-fetch": {
-      "version": "2.6.5",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.5.tgz",
-      "integrity": "sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ==",
-      "dev": true,
-      "requires": {
-        "whatwg-url": "^5.0.0"
-      }
+    "netmask": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
+      "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==",
+      "dev": true
     },
     "once": {
       "version": "1.4.0",
@@ -2943,111 +3479,42 @@
         "wrappy": "1"
       }
     },
-    "onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dev": true,
-      "requires": {
-        "mimic-fn": "^2.1.0"
-      }
-    },
-    "ora": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
-      "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
-      "dev": true,
-      "requires": {
-        "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"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
       "dev": true
     },
-    "p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+    "pac-proxy-agent": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.1.0.tgz",
+      "integrity": "sha512-Z5FnLVVZSnX7WjBg0mhDtydeRZ1xMcATZThjySQUHqr+0ksP8kqaw23fNKkaaN/Z8gwLUs/W7xdl0I75eP2Xyw==",
       "dev": true,
       "requires": {
-        "p-try": "^2.0.0"
+        "@tootallnate/quickjs-emscripten": "^0.23.0",
+        "agent-base": "^7.1.2",
+        "debug": "^4.3.4",
+        "get-uri": "^6.0.1",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.6",
+        "pac-resolver": "^7.0.1",
+        "socks-proxy-agent": "^8.0.5"
       }
     },
-    "p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+    "pac-resolver": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz",
+      "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==",
       "dev": true,
       "requires": {
-        "p-limit": "^2.2.0"
+        "degenerator": "^5.0.0",
+        "netmask": "^2.0.2"
       }
     },
-    "p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+    "pako": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-2.1.0.tgz",
+      "integrity": "sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==",
       "dev": true
     },
     "parent-module": {
@@ -3071,16 +3538,16 @@
         "lines-and-columns": "^1.1.6"
       }
     },
-    "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
-    },
     "path-is-absolute": {
       "version": "1.0.1",
       "dev": true
     },
+    "path-to-regexp": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz",
+      "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==",
+      "dev": true
+    },
     "path-type": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
@@ -3091,14 +3558,11 @@
       "version": "1.2.0",
       "dev": true
     },
-    "pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dev": true,
-      "requires": {
-        "find-up": "^4.0.0"
-      }
+    "picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true
     },
     "progress": {
       "version": "2.0.3",
@@ -3106,6 +3570,22 @@
       "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
       "dev": true
     },
+    "proxy-agent": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.5.0.tgz",
+      "integrity": "sha512-TmatMXdr2KlRiA2CyDu8GqR8EjahTG3aY3nXjdzFyoZbmB8hrBsTyMezhULIXKnC0jpfjlmiZ3+EaCzoInSu/A==",
+      "dev": true,
+      "requires": {
+        "agent-base": "^7.1.2",
+        "debug": "^4.3.4",
+        "http-proxy-agent": "^7.0.1",
+        "https-proxy-agent": "^7.0.6",
+        "lru-cache": "^7.14.1",
+        "pac-proxy-agent": "^7.1.0",
+        "proxy-from-env": "^1.1.0",
+        "socks-proxy-agent": "^8.0.5"
+      }
+    },
     "proxy-from-env": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
@@ -3121,87 +3601,120 @@
       }
     },
     "punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
+      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
       "dev": true
     },
     "puppeteer": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-11.0.0.tgz",
-      "integrity": "sha512-6rPFqN1ABjn4shgOICGDBITTRV09EjXVqhDERBDKwCLz0UyBxeeBH6Ay0vQUJ84VACmlxwzOIzVEJXThcF3aNg==",
-      "dev": true,
-      "requires": {
-        "debug": "4.3.2",
-        "devtools-protocol": "0.0.901419",
-        "extract-zip": "2.0.1",
-        "https-proxy-agent": "5.0.0",
-        "node-fetch": "2.6.5",
-        "pkg-dir": "4.2.0",
-        "progress": "2.0.3",
-        "proxy-from-env": "1.1.0",
-        "rimraf": "3.0.2",
-        "tar-fs": "2.1.1",
-        "unbzip2-stream": "1.4.3",
-        "ws": "8.2.3"
-      }
-    },
-    "puppeteer-extra": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/puppeteer-extra/-/puppeteer-extra-3.2.3.tgz",
-      "integrity": "sha512-CnSN9yIedbAbS8WmRybaDHJLf6goRk+VYM/kbH6i/+EMadCaAeh2O+1/mFUMN2LbkbDNAp2Vd/UwrTVCHjTxyg==",
+      "version": "23.0.2",
+      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-23.0.2.tgz",
+      "integrity": "sha512-I/l1P8s8brcLG+oW9AwF8hUaOSGGJcGKMflXRgULUH0S3ABptlLI9ZKjqWDo8ipY6v789ZKd+bNKtcCwpTh5Ww==",
       "dev": true,
+      "peer": true,
       "requires": {
-        "@types/debug": "^4.1.0",
-        "@types/puppeteer": "*",
-        "debug": "^4.1.1",
-        "deepmerge": "^4.2.2"
+        "@puppeteer/browsers": "2.3.0",
+        "chromium-bidi": "0.6.4",
+        "cosmiconfig": "^9.0.0",
+        "devtools-protocol": "0.0.1312386",
+        "puppeteer-core": "23.0.2"
+      },
+      "dependencies": {
+        "@puppeteer/browsers": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.3.0.tgz",
+          "integrity": "sha512-ioXoq9gPxkss4MYhD+SFaU9p1IHFUX0ILAWFPyjGaBdjLsYAlZw6j1iLA0N/m12uVHLFDfSYNF7EQccjinIMDA==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "debug": "^4.3.5",
+            "extract-zip": "^2.0.1",
+            "progress": "^2.0.3",
+            "proxy-agent": "^6.4.0",
+            "semver": "^7.6.3",
+            "tar-fs": "^3.0.6",
+            "unbzip2-stream": "^1.4.3",
+            "yargs": "^17.7.2"
+          }
+        },
+        "cosmiconfig": {
+          "version": "9.0.0",
+          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",
+          "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "env-paths": "^2.2.1",
+            "import-fresh": "^3.3.0",
+            "js-yaml": "^4.1.0",
+            "parse-json": "^5.2.0"
+          }
+        },
+        "puppeteer-core": {
+          "version": "23.0.2",
+          "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-23.0.2.tgz",
+          "integrity": "sha512-MvOHn+g1TYkAR2oVd/bf/YWXKqFTJmkhyyurYgxkrjh8rBOL1ZH5VyOsLJi0bLO7/yoipAmk1gFZEx9HUJnaoA==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "@puppeteer/browsers": "2.3.0",
+            "chromium-bidi": "0.6.4",
+            "debug": "^4.3.6",
+            "devtools-protocol": "0.0.1312386",
+            "ws": "^8.18.0"
+          }
+        }
       }
     },
-    "puppeteer-extra-plugin": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/puppeteer-extra-plugin/-/puppeteer-extra-plugin-3.2.0.tgz",
-      "integrity": "sha512-wbiw12USE3b+maMk/IMaroYsz7rusVI9G+ml6pCFCnFFh91Z9BAEiVzhCpOHuquVXEiCCsDTWhDUgvdNxQHOyw==",
+    "puppeteer-core": {
+      "version": "24.0.0",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-24.0.0.tgz",
+      "integrity": "sha512-bHVXmnkYnMVSbsD+pJGt8fmGZLaVYOAieVnJcDxtLIVTMq0s5RfYdzN4xVlFoBQ3T06/sPkXxca3VLVfaqLxzg==",
       "dev": true,
       "requires": {
-        "@types/debug": "^4.1.0",
-        "debug": "^4.1.1",
-        "merge-deep": "^3.0.1"
+        "@puppeteer/browsers": "2.7.0",
+        "chromium-bidi": "0.11.0",
+        "debug": "^4.4.0",
+        "devtools-protocol": "0.0.1367902",
+        "typed-query-selector": "^2.12.0",
+        "ws": "^8.18.0"
+      },
+      "dependencies": {
+        "chromium-bidi": {
+          "version": "0.11.0",
+          "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.11.0.tgz",
+          "integrity": "sha512-6CJWHkNRoyZyjV9Rwv2lYONZf1Xm0IuDyNq97nwSsxxP3wf5Bwy15K5rOvVKMtJ127jJBmxFUanSAOjgFRxgrA==",
+          "dev": true,
+          "requires": {
+            "mitt": "3.0.1",
+            "zod": "3.23.8"
+          }
+        },
+        "devtools-protocol": {
+          "version": "0.0.1367902",
+          "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1367902.tgz",
+          "integrity": "sha512-XxtPuC3PGakY6PD7dG66/o8KwJ/LkH2/EKe19Dcw58w53dv4/vSQEkn/SzuyhHE2q4zPgCkxQBxus3VV4ql+Pg==",
+          "dev": true
+        }
       }
     },
-    "puppeteer-extra-plugin-user-data-dir": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/puppeteer-extra-plugin-user-data-dir/-/puppeteer-extra-plugin-user-data-dir-2.3.1.tgz",
-      "integrity": "sha512-yhaYMaNFdfQ1LbA94ZElW1zU8rh+MFmO+GZA0gtQ8BXc+UZ6aRrWS9flIZvlXDzk+ZsXhCbTEohEwZ8lEDLRVA==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.1.1",
-        "fs-extra": "^10.0.0",
-        "puppeteer-extra-plugin": "^3.2.0"
-      }
+    "queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true
     },
-    "puppeteer-extra-plugin-user-preferences": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/puppeteer-extra-plugin-user-preferences/-/puppeteer-extra-plugin-user-preferences-2.3.1.tgz",
-      "integrity": "sha512-t/FyGQj2aqtHOROqL02z+k2kNQe0cjT0Hd9pG5FJ7x0JXx1722PhOuK7FeJLQMJ+BLl2YvCUgaWSC8Zohjts5A==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.1.1",
-        "deepmerge": "^4.2.2",
-        "puppeteer-extra-plugin": "^3.2.0",
-        "puppeteer-extra-plugin-user-data-dir": "^2.3.1"
-      }
+    "queue-tick": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
+      "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==",
+      "dev": true
     },
-    "readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      }
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "dev": true
     },
     "require-from-string": {
       "version": "2.0.2",
@@ -3215,15 +3728,11 @@
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true
     },
-    "restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "dev": true,
-      "requires": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      }
+    "reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true
     },
     "rimraf": {
       "version": "3.0.2",
@@ -3232,19 +3741,13 @@
         "glob": "^7.1.3"
       }
     },
-    "run-async": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
-      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
-      "dev": true
-    },
-    "rxjs": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz",
-      "integrity": "sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==",
+    "run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
       "dev": true,
       "requires": {
-        "tslib": "~2.1.0"
+        "queue-microtask": "^1.2.2"
       }
     },
     "safe-buffer": {
@@ -3259,48 +3762,68 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
       "dev": true
     },
-    "shallow-clone": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz",
-      "integrity": "sha1-WQnodLp3EG1zrEFM/sH/yofZcGA=",
+    "semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "dev": true
+    },
+    "signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true
+    },
+    "smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+      "dev": true
+    },
+    "socks": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
+      "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
       "dev": true,
       "requires": {
-        "is-extendable": "^0.1.1",
-        "kind-of": "^2.0.1",
-        "lazy-cache": "^0.2.3",
-        "mixin-object": "^2.0.1"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
-          "integrity": "sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.0.2"
-          }
-        },
-        "lazy-cache": {
-          "version": "0.2.7",
-          "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz",
-          "integrity": "sha1-f+3fLctu23fRHvHRF6tf/fCrG2U=",
-          "dev": true
-        }
+        "ip-address": "^9.0.5",
+        "smart-buffer": "^4.2.0"
       }
     },
-    "signal-exit": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz",
-      "integrity": "sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ==",
+    "socks-proxy-agent": {
+      "version": "8.0.5",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz",
+      "integrity": "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==",
+      "dev": true,
+      "requires": {
+        "agent-base": "^7.1.2",
+        "debug": "^4.3.4",
+        "socks": "^2.8.3"
+      }
+    },
+    "source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "optional": true
+    },
+    "sprintf-js": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
       "dev": true
     },
-    "string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+    "streamx": {
+      "version": "2.18.0",
+      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.18.0.tgz",
+      "integrity": "sha512-LLUC1TWdjVdn1weXGcSxyTR3T4+acB6tVGXT95y0nGbca4t4o/ng1wKAGTljm9VicuCVLvRlqFYXYy5GwgM7sQ==",
       "dev": true,
       "requires": {
-        "safe-buffer": "~5.2.0"
+        "bare-events": "^2.2.0",
+        "fast-fifo": "^1.3.2",
+        "queue-tick": "^1.0.1",
+        "text-decoder": "^1.1.0"
       }
     },
     "string-width": {
@@ -3333,28 +3856,35 @@
       }
     },
     "tar-fs": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz",
+      "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==",
       "dev": true,
       "requires": {
-        "chownr": "^1.1.1",
-        "mkdirp-classic": "^0.5.2",
+        "bare-fs": "^2.1.1",
+        "bare-path": "^2.1.0",
         "pump": "^3.0.0",
-        "tar-stream": "^2.1.4"
+        "tar-stream": "^3.1.5"
       }
     },
     "tar-stream": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",
+      "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
+      "dev": true,
+      "requires": {
+        "b4a": "^1.6.4",
+        "fast-fifo": "^1.2.0",
+        "streamx": "^2.15.0"
+      }
+    },
+    "text-decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.1.1.tgz",
+      "integrity": "sha512-8zll7REEv4GDD3x4/0pW+ppIxSNs7H1J10IKFZsuOMscumCdM2a+toDGLPA3T+1+fLBql4zbt5z83GEQGGV5VA==",
       "dev": true,
       "requires": {
-        "bl": "^4.0.3",
-        "end-of-stream": "^1.4.1",
-        "fs-constants": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^3.1.1"
+        "b4a": "^1.6.4"
       }
     },
     "through": {
@@ -3372,16 +3902,19 @@
         "os-tmpdir": "~1.0.2"
       }
     },
-    "tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=",
-      "dev": true
+    "to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "requires": {
+        "is-number": "^7.0.0"
+      }
     },
     "tslib": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz",
-      "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
       "dev": true
     },
     "type-fest": {
@@ -3390,6 +3923,12 @@
       "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
       "dev": true
     },
+    "typed-query-selector": {
+      "version": "2.12.0",
+      "resolved": "https://registry.npmjs.org/typed-query-selector/-/typed-query-selector-2.12.0.tgz",
+      "integrity": "sha512-SbklCd1F0EiZOyPiW192rrHZzZ5sBijB6xM+cpmrwDqObvdtunOHHIk9fCGsoK5JVIYXoyEp4iEdE3upFH3PAg==",
+      "dev": true
+    },
     "unbzip2-stream": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
@@ -3400,10 +3939,10 @@
         "through": "^2.3.8"
       }
     },
-    "universalify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+    "undici-types": {
+      "version": "6.19.8",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
+      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
       "dev": true
     },
     "uri-js": {
@@ -3415,42 +3954,55 @@
         "punycode": "^2.1.0"
       }
     },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
-    },
-    "wcwidth": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
-      "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
+    "urlpattern-polyfill": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz",
+      "integrity": "sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==",
       "dev": true,
-      "requires": {
-        "defaults": "^1.0.3"
-      }
-    },
-    "webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=",
-      "dev": true
+      "peer": true
     },
-    "whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+    "which": {
+      "version": "2.0.2",
       "dev": true,
       "requires": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
+        "isexe": "^2.0.0"
       }
     },
-    "which": {
-      "version": "2.0.2",
+    "wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
       "dev": true,
       "requires": {
-        "isexe": "^2.0.0"
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        }
       }
     },
     "wrappy": {
@@ -3458,16 +4010,43 @@
       "dev": true
     },
     "ws": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
-      "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "dev": true,
       "requires": {}
     },
+    "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": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.1.tgz",
+      "integrity": "sha512-pIXzoImaqmfOrL7teGUBt/T7ZDnyeGBWyXQBvOVhLkWLN37GXv8NMLK406UY6dS51JfcQHsmcW5cJ441bHg6Lg==",
+      "dev": true
+    },
+    "yargs": {
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "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
     },
     "yauzl": {
@@ -3477,6 +4056,18 @@
         "buffer-crc32": "~0.2.3",
         "fd-slicer": "~1.1.0"
       }
+    },
+    "yoctocolors-cjs": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yoctocolors-cjs/-/yoctocolors-cjs-2.1.2.tgz",
+      "integrity": "sha512-cYVsTjKl8b+FrnidjibDWskAv7UKOfcwaVZdp/it9n1s9fU3IkgDbhdIRKCW4JDsAlECJY0ytoVPT3sK6kideA==",
+      "dev": true
+    },
+    "zod": {
+      "version": "3.23.8",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz",
+      "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==",
+      "dev": true
     }
   }
 }
diff --git a/build-system/tasks/visual-diff/package.json b/build-system/tasks/visual-diff/package.json
index 5ee21e56435c..5c464df0dc41 100644
--- a/build-system/tasks/visual-diff/package.json
+++ b/build-system/tasks/visual-diff/package.json
@@ -4,14 +4,11 @@
   "version": "0.1.0",
   "description": "amp visual diff",
   "devDependencies": {
-    "@percy/core": "1.0.0-beta.70",
-    "@percy/puppeteer": "2.0.0",
-    "@percy/sdk-utils": "1.0.0-beta.70",
-    "@types/inquirer": "8.1.3",
-    "@types/puppeteer": "5.4.4",
-    "inquirer": "8.2.0",
-    "puppeteer": "11.0.0",
-    "puppeteer-extra": "3.2.3",
-    "puppeteer-extra-plugin-user-preferences": "2.3.1"
+    "@inquirer/prompts": "7.2.1",
+    "@percy/core": "1.30.6",
+    "@percy/puppeteer": "2.0.2",
+    "@percy/sdk-utils": "1.30.6",
+    "@puppeteer/browsers": "2.7.0",
+    "puppeteer-core": "24.0.0"
   }
 }
diff --git a/build-system/tasks/visual-diff/types.js b/build-system/tasks/visual-diff/types.js
index 66fcf777d1aa..8bbce7c7a037 100644
--- a/build-system/tasks/visual-diff/types.js
+++ b/build-system/tasks/visual-diff/types.js
@@ -1,4 +1,5 @@
-const {ConsoleMessage} = require('puppeteer'); // eslint-disable-line no-unused-vars
+/** @typedef {import('puppeteer-core')} puppeteer */
+/** @typedef {import('puppeteer-core').ConsoleMessage} puppeteer.ConsoleMessage */
 
 /**
  * @typedef {{
@@ -25,7 +26,7 @@ let WebpageDef;
  *   name: string;
  *   message: string;
  *   error: Error;
- *   consoleMessages: ConsoleMessage[];
+ *   consoleMessages: puppeteer.ConsoleMessage[];
  * }}
  */
 let TestErrorDef;
diff --git a/build-system/tasks/visual-diff/verifiers.js b/build-system/tasks/visual-diff/verifiers.js
index edf5d43595fa..f8a097156f20 100644
--- a/build-system/tasks/visual-diff/verifiers.js
+++ b/build-system/tasks/visual-diff/verifiers.js
@@ -1,6 +1,5 @@
 'use strict';
 
-const puppeteer = require('puppeteer'); // eslint-disable-line no-unused-vars
 const {cyan} = require('kleur/colors');
 const {log} = require('./log');
 const {sleep} = require('./helpers');
@@ -9,6 +8,9 @@ const {VisibilityDef} = require('./types');
 const CSS_SELECTOR_RETRY_MS = 200;
 const CSS_SELECTOR_TIMEOUT_MS = 10000;
 
+/** @typedef {import('puppeteer-core')} puppeteer */
+/** @typedef {import('puppeteer-core').Page} puppeteer.Page */
+
 /**
  * Verifies that all CSS elements are as expected before taking a snapshot.
  *
diff --git a/build-system/test-configs/OWNERS b/build-system/test-configs/OWNERS
index 03bd6fe0ab70..4fff4072386e 100644
--- a/build-system/test-configs/OWNERS
+++ b/build-system/test-configs/OWNERS
@@ -13,5 +13,9 @@
       pattern: 'dep-check-config.js',
       owners: [{name: '*'}],
     },
+    {
+      pattern: 'forbidden-terms.js',
+      owners: [{name: 'ampproject/wg-components'}],
+    },
   ],
 }
diff --git a/build-system/test-configs/config.js b/build-system/test-configs/config.js
index 246f314d083f..75b30e58018d 100644
--- a/build-system/test-configs/config.js
+++ b/build-system/test-configs/config.js
@@ -69,7 +69,12 @@ const karmaJsPaths = [
   'testing/**/*.js',
 ];
 
-const commonUnitTestPaths = initTestsPath.concat(fixturesExamplesPaths);
+/**
+ * @return {Array<*>}
+ */
+function getCommonUnitTestPaths() {
+  return initTestsPath.concat(fixturesExamplesPaths);
+}
 
 const commonIntegrationTestPaths = initTestsPath.concat(
   fixturesExamplesPaths,
@@ -101,14 +106,16 @@ const integrationTestPaths = [
   'extensions/**/test/integration/**/*.js',
 ];
 
-const e2eTestPaths = ['test/e2e/*.js', 'extensions/**/test-e2e/*.js'];
+const e2eTestPaths = ['test/e2e/*.js', 'extensions/**/test-e2e/test-*.js'];
 
 const devDashboardTestPaths = ['build-system/server/app-index/test/**/*.js'];
 
 const jisonPath = 'extensions/**/*.jison';
 
 const lintGlobs = [
-  '**/*.js',
+  '**/*.{js,jsx}',
+  '**/*.{ts,tsx}',
+  '!**/*.d.ts',
   // To ignore a file / directory, add it to .eslintignore.
 ];
 
@@ -124,7 +131,6 @@ const presubmitGlobs = [
   '!validator/validator.pb.go',
   '!validator/dist/**/*.*',
   '!validator/htmlparser/**/*.*',
-  '!build-system/tasks/performance/cache/**/*.*',
   '!build-system/runner/build/**/*.*',
   '!third_party/**/*.*',
   '!**/node_modules/**/*.*',
@@ -160,6 +166,7 @@ const linkCheckGlobs = [
   '.github/ISSUE_TEMPLATE/*.yml',
   '**/*.md',
   '!**/{examples,node_modules,build,dist,dist.3p,dist.tools}/**',
+  '!.github/*.md',
 ];
 
 /**
@@ -185,7 +192,6 @@ const htmlFixtureGlobs = [
   'test/fixtures/e2e/**/*.html',
 
   // The following are not AMP documents and are not meant to validate.
-  '!**/bento/**/*.html',
   '!examples/amp-video-iframe/frame*.html',
   '!examples/viewer-iframe-poll.html',
   '!examples/viewer-webview.html',
@@ -197,6 +203,9 @@ const htmlFixtureGlobs = [
   '!examples/visual-tests/amp-story-player/!(*.amp.html)',
   '!test/fixtures/e2e/amp-story-player/!(*.amp.html)',
 
+  // Remove this from the list after TODO(#37467) gets closed.
+  '!examples/amp-access-fewcents.html',
+
   // TODO(#25149): Fix these invalid files and remove them from this list.
   '!examples/accordion.amp.html',
   '!examples/ad-lightbox.amp.html',
@@ -245,13 +254,14 @@ const htmlFixtureGlobs = [
   '!examples/amp-orientation-observer-scroll.amp.html',
   '!examples/amp-orientation-observer.amp.html',
   '!examples/amp-position-observer.amp.html',
-  '!examples/amp-redbull-player.amp.html',
   '!examples/amp-script/example.amp.html',
   '!examples/amp-script/example.sandboxed.amp.html',
   '!examples/amp-script/todomvc.amp.html',
   '!examples/amp-script/vue-todomvc.amp.html',
   '!examples/amp-skimlinks.html',
   '!examples/amp-smartlinks.html',
+  // TODO(#37285): remove after the new validator rules are pushed with the new npm.
+  '!examples/amp-story-subscriptions/amp-story-subscriptions.html',
   '!examples/amp-subscriptions-google/amp-subscriptions-iframe.provider.html',
   '!examples/amp-subscriptions-google/amp-subscriptions-metering-laa.amp.html',
   '!examples/amp-subscriptions-google/amp-subscriptions-metering-registration-widget.html',
@@ -259,6 +269,7 @@ const htmlFixtureGlobs = [
   '!examples/amp-subscriptions-google/amp-subscriptions.amp.html',
   '!examples/amp-subscriptions-rtp.amp.html',
   '!examples/amp-tiktok.amp.html',
+  '!examples/amp-toggle-theme.html',
   '!examples/ampcontext-creative-json.html',
   '!examples/ampcontext-creative.html',
   '!examples/amphtml-ads/adchoices-1.a4a.html',
@@ -411,6 +422,9 @@ const htmlFixtureGlobs = [
   '!test/fixtures/e2e/amphtml-ads/image.html',
   '!test/fixtures/e2e/amphtml-ads/lightbox-ad.a4a.html',
   '!test/fixtures/e2e/amphtml-ads/text.html',
+
+  // The following is a server-rendered file which is technically invalid.
+  '!examples/compiler-hydration.html',
 ];
 
 /**
@@ -447,7 +461,7 @@ const changelogIgnoreFileTypes = /\.md|\.json|\.yaml|LICENSE|CONTRIBUTORS$/;
 module.exports = {
   changelogIgnoreFileTypes,
   commonIntegrationTestPaths,
-  commonUnitTestPaths,
+  getCommonUnitTestPaths,
   devDashboardTestPaths,
   e2eTestPaths,
   htmlFixtureGlobs,
diff --git a/build-system/test-configs/dep-check-config.js b/build-system/test-configs/dep-check-config.js
index dfe9f497386d..af714477913b 100644
--- a/build-system/test-configs/dep-check-config.js
+++ b/build-system/test-configs/dep-check-config.js
@@ -79,7 +79,7 @@ exports.rules = [
     allowlist: [
       '3p/**->src/utils/log.js',
       '3p/**->src/url.js',
-      '3p/**->src/config.js',
+      '3p/**->src/config/urls.js',
       '3p/**->src/mode.js',
       '3p/polyfills.js->src/polyfills/math-sign.js',
       '3p/polyfills.js->src/polyfills/object-assign.js',
@@ -106,9 +106,9 @@ exports.rules = [
       // ads/google/a4a doesn't contain 3P ad code and should probably move
       // somewhere else at some point
       'ads/google/a4a/**->src/ad-cid.js',
-      'ads/google/a4a/**->src/consent.js',
       'ads/google/a4a/**->src/experiments/index.js',
       'ads/google/a4a/**->src/service/index.js',
+      'ads/google/a4a/cookie-utils.js->src/cookies.js',
       'ads/google/a4a/utils.js->src/service/variable-source.js',
       'ads/google/a4a/utils.js->src/ini-load.js',
       // IMA, similar to other non-Ad 3Ps above, needs access to event-helper
@@ -133,9 +133,6 @@ exports.rules = [
   },
 
   // Rules for extensions.
-  // Note: For the multipass build to correctly include depended on code, you
-  // need to add the depended on code to `CLOSURE_SRC_GLOBS` in
-  // build-system/compile/sources.js.
   {
     // Extensions can't depend on other extensions.
     filesMatching: 'extensions/**/*.js',
@@ -152,12 +149,14 @@ exports.rules = [
       'extensions/amp-ad-network-oblivki-impl/0.1/amp-ad-network-oblivki-impl.js->extensions/amp-a4a/0.1/amp-a4a.js',
       'extensions/amp-ad-network-valueimpression-impl/0.1/amp-ad-network-valueimpression-impl.js->extensions/amp-a4a/0.1/amp-a4a.js',
       'extensions/amp-ad-network-dianomi-impl/0.1/amp-ad-network-dianomi-impl.js->extensions/amp-a4a/0.1/amp-a4a.js',
+      'extensions/amp-ad-network-smartadserver-impl/0.1/amp-ad-network-smartadserver-impl.js->extensions/amp-a4a/0.1/amp-a4a.js',
+      'extensions/amp-ad-network-mgid-impl/0.1/amp-ad-network-mgid-impl.js->extensions/amp-a4a/0.1/amp-a4a.js',
 
       // A4A impls importing amp fast fetch header name
       'extensions/amp-ad-network-adsense-impl/0.1/amp-ad-network-adsense-impl.js->extensions/amp-a4a/0.1/signature-verifier.js',
       'extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js->extensions/amp-a4a/0.1/signature-verifier.js',
 
-      // And a few mrore things depend on a4a.
+      // And a few more things depend on a4a.
       'extensions/amp-ad-custom/0.1/amp-ad-custom.js->extensions/amp-a4a/0.1/amp-ad-network-base.js',
       'extensions/amp-ad-custom/0.1/amp-ad-custom.js->extensions/amp-a4a/0.1/amp-ad-type-defs.js',
       'extensions/amp-ad-custom/0.1/amp-ad-custom.js->extensions/amp-a4a/0.1/name-frame-renderer.js',
@@ -180,9 +179,6 @@ exports.rules = [
       // Ads needs iframe transports
       'extensions/amp-ad-exit/0.1/config.js->extensions/amp-analytics/0.1/iframe-transport-vendors.js',
 
-      // <amp-brightcove> versions share this message API definition.
-      'extensions/amp-brightcove/**->extensions/amp-brightcove/brightcove-api.js',
-
       // Amp carousel (and friends) depending on base carousel
       'extensions/amp-carousel/0.2/amp-carousel.js->extensions/amp-base-carousel/0.1/action-source.js',
       'extensions/amp-carousel/0.2/amp-carousel.js->extensions/amp-base-carousel/0.1/carousel.js',
@@ -190,51 +186,24 @@ exports.rules = [
       'extensions/amp-carousel/0.2/amp-carousel.js->extensions/amp-base-carousel/0.1/child-layout-manager.js',
       'extensions/amp-inline-gallery/0.1/amp-inline-gallery.js->extensions/amp-base-carousel/0.1/carousel-events.js',
       'extensions/amp-inline-gallery/0.1/amp-inline-gallery-thumbnails.js->extensions/amp-base-carousel/0.1/carousel-events.js',
-      'extensions/amp-inline-gallery/1.0/base-element.js->extensions/amp-base-carousel/1.0/carousel-props.js',
-      'extensions/amp-inline-gallery/1.0/pagination-base-element.js->extensions/amp-base-carousel/1.0/carousel-props.js',
-
-      'extensions/amp-inline-gallery/1.0/component.js->extensions/amp-base-carousel/1.0/carousel-context.js',
-      'extensions/amp-inline-gallery/1.0/pagination.js->extensions/amp-base-carousel/1.0/carousel-context.js',
-      'extensions/amp-inline-gallery/1.0/thumbnails-base-element.js->extensions/amp-base-carousel/1.0/component.jss.js',
-      'extensions/amp-inline-gallery/1.0/thumbnails-base-element.js->extensions/amp-base-carousel/1.0/carousel-props.js',
-      'extensions/amp-inline-gallery/1.0/thumbnails.js->extensions/amp-base-carousel/1.0/component.js',
-      'extensions/amp-inline-gallery/1.0/thumbnails.js->extensions/amp-base-carousel/1.0/carousel-context.js',
+
       'extensions/amp-stream-gallery/0.1/amp-stream-gallery.js->extensions/amp-base-carousel/0.1/action-source.js',
       'extensions/amp-stream-gallery/0.1/amp-stream-gallery.js->extensions/amp-base-carousel/0.1/carousel.js',
       'extensions/amp-stream-gallery/0.1/amp-stream-gallery.js->extensions/amp-base-carousel/0.1/carousel-events.js',
       'extensions/amp-stream-gallery/0.1/amp-stream-gallery.js->extensions/amp-base-carousel/0.1/child-layout-manager.js',
       'extensions/amp-stream-gallery/0.1/amp-stream-gallery.js->extensions/amp-base-carousel/0.1/responsive-attributes.js',
-      'extensions/amp-stream-gallery/1.0/base-element.js->extensions/amp-base-carousel/1.0/component.jss.js',
-      'extensions/amp-stream-gallery/1.0/component.js->extensions/amp-base-carousel/1.0/component.js',
-
-      // <amp-dailymotion> versions share this message API definition.
-      'extensions/amp-dailymotion/**->extensions/amp-dailymotion/dailymotion-api.js',
-
-      // Autolightboxing dependencies
-      'extensions/amp-base-carousel/1.0/scroller.js->extensions/amp-lightbox-gallery/1.0/component.js',
-      'extensions/amp-lightbox-gallery/1.0/provider.js->extensions/amp-lightbox/1.0/component.js',
-      'extensions/amp-lightbox-gallery/1.0/provider.js->extensions/amp-base-carousel/1.0/component.js',
-      'extensions/amp-lightbox-gallery/1.0/base-element.js->extensions/amp-lightbox/1.0/component.jss.js',
-      'extensions/amp-lightbox-gallery/1.0/base-element.js->extensions/amp-base-carousel/1.0/component.jss.js',
 
       // <amp-date-display> versions share these date format helpers
       'extensions/amp-date-display/**->extensions/amp-date-display/format.js',
 
+      // <amp-list> and <amp-render> share some logic
+      'extensions/amp-list/1.0/amp-list.js**->extensions/amp-render/1.0/shared/amp-fetch-utils.js',
+
       // Facebook components
       'extensions/amp-facebook/1.0/amp-facebook.js->extensions/amp-facebook/0.1/facebook-loader.js',
       'extensions/amp-facebook-page/0.1/amp-facebook-page.js->extensions/amp-facebook/0.1/facebook-loader.js',
       'extensions/amp-facebook-comments/0.1/amp-facebook-comments.js->extensions/amp-facebook/0.1/facebook-loader.js',
 
-      // VideoBaseElement, VideoIframe and VideoWrapper are meant to be shared.
-      'extensions/**->extensions/amp-video/1.0/video-base-element.js',
-      'extensions/**->extensions/amp-video/1.0/video-iframe.js',
-
-      // <amp-video-iframe> versions share this message API definition.
-      'extensions/amp-video-iframe/**->extensions/amp-video-iframe/amp-video-iframe-api.js',
-
-      // <amp-vimeo> versions share this message API definition.
-      'extensions/amp-vimeo/**->extensions/amp-vimeo/vimeo-api.js',
-
       // Amp geo in group enum
       'extensions/amp-a4a/0.1/amp-a4a.js->extensions/amp-geo/0.1/amp-geo-in-group.js',
       'extensions/amp-consent/0.1/consent-config.js->extensions/amp-geo/0.1/amp-geo-in-group.js',
@@ -259,24 +228,68 @@ exports.rules = [
       // TODO(ccordry): remove this after createShadowRootWithStyle is moved to src
       'extensions/amp-story-auto-ads/0.1/amp-story-auto-ads.js->extensions/amp-story/1.0/utils.js',
       'extensions/amp-story-auto-ads/0.1/story-ad-ui.js->extensions/amp-story/1.0/utils.js',
+
+      // Story captions
+      'extensions/amp-story-captions/0.1/amp-story-captions.js->extensions/amp-story/1.0/utils.js',
+
       // Story education
       'extensions/amp-story-education/0.1/amp-story-education.js->extensions/amp-story/1.0/amp-story-store-service.js',
       'extensions/amp-story-education/0.1/amp-story-education.js->extensions/amp-story/1.0/utils.js',
       'extensions/amp-story-education/0.1/amp-story-education.js->extensions/amp-story/1.0/amp-story-localization-service.js',
 
+      // Story share menu
+      'extensions/amp-story-share-menu/0.1/amp-story-share-menu.js->extensions/amp-social-share/0.1/amp-social-share.js',
+      'extensions/amp-story-share-menu/0.1/amp-story-share-menu.js->extensions/amp-story/1.0/amp-story-store-service.js',
+      'extensions/amp-story-share-menu/0.1/amp-story-share-menu.js->extensions/amp-story/1.0/utils.js',
+      'extensions/amp-story-share-menu/0.1/amp-story-share-menu.js->extensions/amp-story/1.0/request-utils.js',
+      'extensions/amp-story-share-menu/0.1/amp-story-share-menu.js->extensions/amp-story/1.0/toast.js',
+      'extensions/amp-story-share-menu/0.1/amp-story-share-menu.js->extensions/amp-story/1.0/amp-story-viewer-messaging-handler.js',
+
       // Story Shopping
-      'extensions/amp-story-shopping/0.1/amp-story-shopping-attachment.js->extensions/amp-story/1.0/amp-story-page-attachment.js',
+      'extensions/amp-story-shopping/0.1/amp-story-shopping.js->extensions/amp-story/1.0/utils.js',
+      'extensions/amp-story-shopping/0.1/amp-story-shopping-config.js->extensions/amp-story/1.0/amp-story-store-service.js',
+      'extensions/amp-story-shopping/0.1/amp-story-shopping-config.js->extensions/amp-story/1.0/request-utils.js',
+      'extensions/amp-story-shopping/0.1/amp-story-shopping-tag.js->extensions/amp-story/1.0/amp-story-store-service.js',
+      'extensions/amp-story-shopping/0.1/amp-story-shopping-tag.js->extensions/amp-story/1.0/utils.js',
+      'extensions/amp-story-shopping/0.1/amp-story-shopping-attachment.js->extensions/amp-story/1.0/amp-story-store-service.js',
+      'extensions/amp-story-shopping/0.1/amp-story-shopping-attachment.js->extensions/amp-story/1.0/variable-service.js',
+      'extensions/amp-story-shopping/0.1/amp-story-shopping-attachment.js->extensions/amp-story/1.0/story-analytics.js',
+      'extensions/amp-story-shopping/0.1/amp-story-shopping-attachment.js->extensions/amp-story/1.0/history.js',
+      'extensions/amp-story-shopping/0.1/amp-story-shopping-tag.js->extensions/amp-story/1.0/variable-service.js',
+      'extensions/amp-story-shopping/0.1/amp-story-shopping-tag.js->extensions/amp-story/1.0/story-analytics.js',
+      'extensions/amp-story-shopping/0.1/amp-story-shopping-tag.js->extensions/amp-story/1.0/history.js',
 
       // Interactive components that depend on story functionality.
       'extensions/amp-story-interactive/0.1/amp-story-interactive-abstract.js->extensions/amp-story/1.0/amp-story-store-service.js',
       'extensions/amp-story-interactive/0.1/amp-story-interactive-abstract.js->extensions/amp-story/1.0/story-analytics.js',
       'extensions/amp-story-interactive/0.1/amp-story-interactive-abstract.js->extensions/amp-story/1.0/utils.js',
+      'extensions/amp-story-interactive/0.1/amp-story-interactive-abstract.js->extensions/amp-story/1.0/request-utils.js',
       'extensions/amp-story-interactive/0.1/amp-story-interactive-abstract.js->extensions/amp-story/1.0/variable-service.js',
       'extensions/amp-story-interactive/0.1/amp-story-interactive-img-quiz.js->extensions/amp-story/1.0/utils.js',
       'extensions/amp-story-interactive/0.1/amp-story-interactive-results.js->extensions/amp-story/1.0/amp-story-store-service.js',
       'extensions/amp-story-interactive/0.1/interactive-disclaimer.js->extensions/amp-story/1.0/utils.js',
       'extensions/amp-story-interactive/0.1/amp-story-interactive-slider.js->extensions/amp-story/1.0/amp-story-store-service.js',
 
+      // AMP Story Subscriptions.
+      'extensions/amp-story-subscriptions/0.1/amp-story-subscriptions.js->extensions/amp-story/1.0/amp-story-store-service.js',
+      'extensions/amp-story-subscriptions/0.1/amp-story-subscriptions.js->extensions/amp-story/1.0/utils.js',
+      'extensions/amp-story-subscriptions/0.1/amp-story-subscriptions.js->extensions/amp-story/1.0/amp-story-viewer-messaging-handler.js',
+      'extensions/amp-story-subscriptions/0.1/amp-story-subscriptions.js->extensions/amp-story/1.0/story-analytics.js',
+
+      // AMP Story audio sticker.
+      'extensions/amp-story-audio-sticker/0.1/amp-story-audio-sticker.js->extensions/amp-story/1.0/amp-story-store-service.js',
+
+      // Story localization.
+      'extensions/amp-story-360/0.1/amp-story-360.js->extensions/amp-story/1.0/amp-story-localization-service.js',
+      'extensions/amp-story-interactive/0.1/amp-story-interactive-img-quiz.js->extensions/amp-story/1.0/amp-story-localization-service.js',
+      'extensions/amp-story-interactive/0.1/amp-story-interactive-quiz.js->extensions/amp-story/1.0/amp-story-localization-service.js',
+      'extensions/amp-story-share-menu/0.1/amp-story-share-menu.js->extensions/amp-story/1.0/amp-story-localization-service.js',
+      'extensions/amp-story-page-attachment/0.1/amp-story-draggable-drawer.js->extensions/amp-story/1.0/amp-story-localization-service.js',
+      'extensions/amp-story-page-attachment/0.1/amp-story-form.js->extensions/amp-story/1.0/amp-story-localization-service.js',
+      'extensions/amp-story-page-attachment/0.1/amp-story-page-attachment.js->extensions/amp-story/1.0/amp-story-localization-service.js',
+      'extensions/amp-story-shopping/0.1/amp-story-shopping-attachment.js->extensions/amp-story/1.0/amp-story-localization-service.js',
+      'extensions/amp-story-subscriptions/0.1/amp-story-subscriptions.js->extensions/amp-story/1.0/amp-story-localization-service.js',
+
       // Subscriptions.
       'extensions/amp-subscriptions/0.1/expr.js->extensions/amp-access/0.1/access-expr.js',
       'extensions/amp-subscriptions/0.1/local-subscription-platform-iframe.js->extensions/amp-access/0.1/iframe-api/messenger.js',
@@ -291,6 +304,16 @@ exports.rules = [
       // amp-smartlinks depends on amp-skimlinks/link-rewriter
       'extensions/amp-smartlinks/0.1/amp-smartlinks.js->extensions/amp-skimlinks/0.1/link-rewriter/link-rewriter-manager.js',
       'extensions/amp-smartlinks/0.1/linkmate.js->extensions/amp-skimlinks/0.1/link-rewriter/two-steps-response.js',
+
+      'extensions/amp-story-page-attachment/0.1/amp-story-draggable-drawer.js->extensions/amp-story/1.0/amp-story-store-service.js',
+      'extensions/amp-story-page-attachment/0.1/amp-story-draggable-drawer.js->extensions/amp-story/1.0/utils.js',
+      'extensions/amp-story-page-attachment/0.1/amp-story-form.js->extensions/amp-story/1.0/amp-story-store-service.js',
+      'extensions/amp-story-page-attachment/0.1/amp-story-form.js->extensions/amp-story/1.0/loading-spinner.js',
+      'extensions/amp-story-page-attachment/0.1/amp-story-open-page-attachment.js->extensions/amp-story/1.0/utils.js',
+      'extensions/amp-story-page-attachment/0.1/amp-story-page-attachment.js->extensions/amp-story/1.0/amp-story-store-service.js',
+      'extensions/amp-story-page-attachment/0.1/amp-story-page-attachment.js->extensions/amp-story/1.0/history.js',
+      'extensions/amp-story-page-attachment/0.1/amp-story-page-attachment.js->extensions/amp-story/1.0/story-analytics.js',
+      'extensions/amp-story-page-attachment/0.1/amp-story-page-attachment.js->extensions/amp-story/1.0/utils.js',
     ],
   },
   {
@@ -312,6 +335,8 @@ exports.rules = [
         'src/service/extension-script.js',
       'extensions/amp-live-list/0.1/live-list-manager.js->' +
         'src/service/extension-script.js',
+      'extensions/amp-jwplayer/0.1/amp-jwplayer.js->' +
+        'src/service/video-manager-impl.js',
       'extensions/amp-video/0.1/amp-video.js->' +
         'src/service/video-manager-impl.js',
       'extensions/amp-video-iframe/0.1/amp-video-iframe.js->' +
@@ -330,10 +355,10 @@ exports.rules = [
         'src/service/video-manager-impl.js',
       'extensions/amp-brid-player/0.1/amp-brid-player.js->' +
         'src/service/video-manager-impl.js',
-      'extensions/amp-jwplayer/0.1/amp-jwplayer.js->' +
-        'src/service/video-manager-impl.js',
       'extensions/amp-gfycat/0.1/amp-gfycat.js->' +
         'src/service/video-manager-impl.js',
+      'extensions/amp-connatix-player/0.1/amp-connatix-player.js->' +
+        'src/service/video-manager-impl.js',
       'extensions/amp-a4a/0.1/friendly-frame-util.js->' +
         'src/service/url-replacements-impl.js',
       'extensions/amp-nexxtv-player/0.1/amp-nexxtv-player.js->' +
@@ -344,14 +369,14 @@ exports.rules = [
         'src/service/video-manager-impl.js',
       'extensions/amp-minute-media-player/0.1/amp-minute-media-player.js->' +
         'src/service/video-manager-impl.js',
-      'extensions/amp-redbull-player/0.1/amp-redbull-player.js->' +
-        'src/service/video-manager-impl.js',
       'extensions/amp-vimeo/0.1/amp-vimeo.js->' +
         'src/service/video-manager-impl.js',
       'extensions/amp-wistia-player/0.1/amp-wistia-player.js->' +
         'src/service/video-manager-impl.js',
       'extensions/amp-delight-player/0.1/amp-delight-player.js->' +
         'src/service/video-manager-impl.js',
+      'extensions/amp-slikeplayer/0.1/amp-slikeplayer.js->' +
+        'src/service/video-manager-impl.js',
       'extensions/amp-position-observer/0.1/amp-position-observer.js->' +
         'src/service/position-observer/position-observer-impl.js',
       'extensions/amp-position-observer/0.1/amp-position-observer.js->' +
@@ -378,6 +403,8 @@ exports.rules = [
         'src/service/notification-ui-manager.js',
       'extensions/amp-consent/0.1/amp-consent.js->' +
         'src/service/notification-ui-manager.js',
+      'extensions/amp-google-read-aloud-player/0.1/amp-google-read-aloud-player.js->' +
+        'src/service/video-manager-impl.js',
       // Accessing USER_INTERACTED constant:
       'extensions/amp-story/1.0/page-advancement.js->' +
         'src/service/action-impl.js',
@@ -404,6 +431,7 @@ exports.rules = [
       'extensions/amp-story/1.0/amp-story-localization-service.js->src/service/localization/index.js',
       'extensions/amp-story*/**/*.js->src/service/localization/strings.js',
       'extensions/amp-story-auto-ads/0.1/story-ad-localization.js->src/service/localization/index.js',
+      'extensions/amp-story/1.0/amp-story.js->src/service/extension-script.js',
 
       // Accessing calculateScriptBaseUrl() for vendor config URLs
       'extensions/amp-analytics/0.1/config.js->' +
@@ -415,6 +443,9 @@ exports.rules = [
       'extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js->src/service/real-time-config/callout-vendors.js',
       'extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js->src/service/real-time-config/real-time-config-impl.js',
       'extensions/amp-ad-network-valueimpression-impl/0.1/amp-ad-network-valueimpression-impl.js->src/service/real-time-config/real-time-config-impl.js',
+
+      // For amp-image-slider_1.0: Required for `Gestures.get`
+      'extensions/amp-image-slider/1.0/component.js->src/service/timer-impl.js',
     ],
   },
   {
@@ -475,6 +506,9 @@ exports.rules = [
   {
     filesMatching: 'src/**/*.js',
     mustNotDependOn: 'extensions/**/*.js',
+    allowlist: [
+      // Do not add to this allowlist.
+    ],
   },
   {
     filesMatching: 'src/**/*.js',
diff --git a/build-system/test-configs/forbidden-terms.js b/build-system/test-configs/forbidden-terms.js
index dabe9b632511..9528db0d7b7d 100644
--- a/build-system/test-configs/forbidden-terms.js
+++ b/build-system/test-configs/forbidden-terms.js
@@ -39,7 +39,7 @@ let ForbiddenTermDef;
 
 /**
  * Terms that must not appear in our source files.
- * @const {Object<string, string|!ForbiddenTermDef>}
+ * @const {{[key: string]: string|!ForbiddenTermDef}}
  */
 const forbiddenTermsGlobal = {
   'DO NOT SUBMIT': {
@@ -67,7 +67,7 @@ const forbiddenTermsGlobal = {
       'extensions/amp-pinterest/0.1/follow-button.js',
       'extensions/amp-pinterest/0.1/pin-widget.js',
       'extensions/amp-pinterest/0.1/save-button.js',
-      'validator/js/engine/validator_test.js',
+      //'validator/js/engine/validator_test.js',
     ],
   },
   '(^i-amp-|\\Wi-amp-)': {
@@ -96,6 +96,9 @@ const forbiddenTermsGlobal = {
   'sinon\\.(spy|stub|mock)\\(': {
     message: 'Use a sandbox instead to avoid repeated `#restore` calls',
     checkInTestFolder: true,
+    allowlist: [
+      'build-system/tasks/remap-dependencies-plugin/test-remap-dependencies.js',
+    ],
   },
   '(\\w*([sS]py|[sS]tub|[mM]ock|clock).restore)': {
     message: 'Use a sandbox instead to avoid repeated `#restore` calls',
@@ -127,8 +130,8 @@ const forbiddenTermsGlobal = {
       'build-system/common/logging.js',
       'build-system/task-runner/amp-cli-runner.js',
       'src/purifier/noop.js',
-      'validator/js/engine/validator-in-browser.js',
-      'validator/js/engine/validator.js',
+      //'validator/js/engine/validator-in-browser.js',
+      //'validator/js/engine/validator.js',
     ],
     checkInTestFolder: true,
   },
@@ -144,6 +147,7 @@ const forbiddenTermsGlobal = {
       'build-system/compile/build-compiler.js',
       'build-system/compile/build-constants.js',
       'src/core/mode/esm.js',
+      'src/core/mode/globals.d.ts',
       'src/core/mode/minified.js',
       'src/core/mode/prod.js',
       'src/core/mode/version.js',
@@ -217,7 +221,7 @@ const forbiddenTermsGlobal = {
       'src/amp-shadow.js',
       'src/inabox/amp-inabox.js',
       'src/service/ampdoc-impl.js',
-      'testing/init-tests.js',
+      'testing/init-tests-helpers.js',
       'testing/describes.js',
       'testing/iframe.js',
     ],
@@ -426,6 +430,7 @@ const forbiddenTermsGlobal = {
       'build-system/externs/amp.extern.js',
       'extensions/amp-subscriptions-google/0.1/amp-subscriptions-google.js',
       'extensions/amp-video/0.1/video-cache.js',
+      'extensions/amp-story/1.0/amp-story.js',
       'src/utils/xhr-utils.js',
     ],
   },
@@ -461,9 +466,11 @@ const forbiddenTermsGlobal = {
       'extensions/amp-web-push/0.1/amp-web-push-helper-frame.js',
       'extensions/amp-web-push/0.1/amp-web-push-permission-dialog.js',
       'src/experiments/index.js',
+      'src/preact/hooks/useLocalStorage.ts',
       'src/service/cid-impl.js',
+      'src/service/standard-actions-impl.js',
       'src/service/storage-impl.js',
-      'testing/init-tests.js',
+      'testing/init-tests-helpers.js',
       'testing/fake-dom.js',
     ],
   },
@@ -587,8 +594,6 @@ const forbiddenTermsGlobal = {
   '/\\*\\* @type \\{\\!Element\\} \\*/': {
     message: 'Use assertElement instead of casting to !Element.',
     allowlist: [
-      'src/core/assert/base.js', // Has actual implementation of assertElement.
-      'src/core/assert/dev.js', // Has actual implementation of assertElement.
       'src/polyfills/custom-elements.js',
       'ads/google/ima/ima-video.js', // Required until #22277 is fixed.
       '3p/twitter.js', // Runs in a 3p window context, so cannot import log.js.
@@ -608,10 +613,7 @@ const forbiddenTermsGlobal = {
   '\\b(__)?AMP_EXP\\b': {
     message:
       'Do not access AMP_EXP directly. Use isExperimentOn() to access config',
-    allowlist: [
-      'src/experiments/index.js',
-      'src/experiments/experiments.extern.js',
-    ],
+    allowlist: ['src/experiments/index.js', 'src/experiments/amp-globals.d.ts'],
   },
   'AMP_CONFIG': {
     message:
@@ -631,15 +633,13 @@ const forbiddenTermsGlobal = {
       'build-system/tasks/build.js',
       'build-system/tasks/default-task.js',
       'build-system/tasks/dist.js',
-      'src/config.js',
-      'src/core/window/window.extern.js',
+      'src/config/urls.js',
       'src/experiments/index.js',
-      'src/experiments/shame.extern.js',
       'src/mode.js',
       'src/core/mode/test.js',
       'src/core/mode/local-dev.js',
       'src/web-worker/web-worker.js', // Web worker custom error reporter.
-      'testing/init-tests.js',
+      'testing/init-tests-helpers.js',
       'tools/experiments/experiments.js',
     ],
   },
@@ -674,7 +674,7 @@ const forbiddenTermsGlobal = {
       'Use of `this.skip()` is forbidden in test files. Use ' +
       '`this.skipTest()` from within a `before()` block instead. See #17245.',
     checkInTestFolder: true,
-    allowlist: ['testing/init-tests.js'],
+    allowlist: ['testing/init-tests-helpers.js'],
   },
   '[^\\.]makeBodyVisible\\(': {
     message:
@@ -708,65 +708,19 @@ const forbiddenTermsGlobal = {
       // Non test files. These can remain.
       'test/e2e/test-controller-promise.js',
       'test/e2e/test-expect.js',
-      'validator/js/engine/amp4ads-parse-css_test.js',
-      'validator/js/engine/htmlparser_test.js',
-      'validator/js/engine/keyframes-parse-css_test.js',
-      'validator/js/engine/parse-css_test.js',
-      'validator/js/engine/parse-srcset_test.js',
-      'validator/js/engine/parse-url_test.js',
-      'validator/js/engine/validator_test.js',
+      //'validator/js/engine/amp4ads-parse-css_test.js',
+      //'validator/js/engine/htmlparser_test.js',
+      //'validator/js/engine/keyframes-parse-css_test.js',
+      //'validator/js/engine/parse-css_test.js',
+      //'validator/js/engine/parse-srcset_test.js',
+      //'validator/js/engine/parse-url_test.js',
+      //'validator/js/engine/validator_test.js',
       'validator/js/gulpjs/test/validate.js',
     ],
     checkInTestFolder: true,
   },
   'withA11y':
     'The Storybook decorator "withA11y" has been deprecated. You may simply remove it, since the a11y addon is now globally configured.',
-  '@storybook/addon-knobs': {
-    message:
-      'The @storybook/addon-knobs package has been deprecated. Use Controls instead (`args` and `argTypes`). https://storybook.js.org/docs/react/essentials/controls',
-    allowlist: [
-      // TODO(#35923): Update existing files to use Controls instead.
-      'build-system/tasks/storybook/amp-env/main.js',
-      'build-system/tasks/storybook/preact-env/main.js',
-      'extensions/amp-animation/0.1/storybook/template.js',
-      'extensions/amp-date-display/1.0/storybook/Basic.amp.js',
-      'extensions/amp-date-display/1.0/storybook/Basic.js',
-      'extensions/amp-iframe/0.1/storybook/Basic.amp.js',
-      'extensions/amp-iframe/1.0/storybook/Basic.amp.js',
-      'extensions/amp-image-slider/0.1/storybook/Basic.amp.js',
-      'extensions/amp-inline-gallery/1.0/storybook/Basic.js',
-      'extensions/amp-lightbox/1.0/storybook/Basic.amp.js',
-      'extensions/amp-lightbox/1.0/storybook/Basic.js',
-      'extensions/amp-lightbox-gallery/1.0/storybook/Basic.amp.js',
-      'extensions/amp-lightbox-gallery/1.0/storybook/Basic.js',
-      'extensions/amp-render/1.0/storybook/Basic.js',
-      'extensions/amp-selector/1.0/storybook/Basic.amp.js',
-      'extensions/amp-selector/1.0/storybook/Basic.js',
-      'extensions/amp-sidebar/0.1/storybook/Basic.amp.js',
-      'extensions/amp-sidebar/1.0/storybook/Basic.amp.js',
-      'extensions/amp-sidebar/1.0/storybook/Basic.js',
-      'extensions/amp-soundcloud/1.0/storybook/Basic.amp.js',
-      'extensions/amp-soundcloud/1.0/storybook/Basic.js',
-      'extensions/amp-stream-gallery/1.0/storybook/Basic.amp.js',
-      'extensions/amp-stream-gallery/1.0/storybook/Basic.js',
-      'extensions/amp-timeago/1.0/storybook/Basic.js',
-      'extensions/amp-twitter/0.1/storybook/Basic.amp.js',
-      'extensions/amp-twitter/1.0/storybook/Basic.amp.js',
-      'extensions/amp-twitter/1.0/storybook/Basic.js',
-      'extensions/amp-video/1.0/storybook/Basic.amp.js',
-      'extensions/amp-video/1.0/storybook/Basic.js',
-      'extensions/amp-video-iframe/1.0/storybook/Basic.amp.js',
-      'extensions/amp-vimeo/1.0/storybook/Basic.amp.js',
-      'extensions/amp-vimeo/1.0/storybook/Basic.js',
-      'extensions/amp-wordpress-embed/1.0/storybook/Basic.amp.js',
-      'extensions/amp-youtube/0.1/storybook/Basic.amp.js',
-      'extensions/amp-youtube/1.0/storybook/Basic.amp.js',
-      'extensions/amp-youtube/1.0/storybook/Basic.js',
-      'src/builtins/storybook/amp-layout.amp.js',
-      'src/preact/storybook/Context.js',
-      'src/preact/storybook/Wrappers.js',
-    ],
-  },
 };
 
 const bannedTermsHelpString =
@@ -789,7 +743,7 @@ const measurementApiDeprecated =
   ' @ampproject/wg-performance for questions.';
 
 /**
- * @const {Object<string, string|!ForbiddenTermDef>}
+ * @const {{[key: string]: string|!ForbiddenTermDef}}
  */
 const forbiddenTermsSrcInclusive = {
   '\\.innerHTML(?!_)': bannedTermsHelpString,
@@ -815,6 +769,7 @@ const forbiddenTermsSrcInclusive = {
   '\\.pageXOffset(?!_)': bannedTermsHelpString,
   '\\.pageYOffset(?!_)': bannedTermsHelpString,
   '\\.innerWidth(?!_)': bannedTermsHelpString,
+  '\\.toggleAttribute(?!_)': 'please use `toggleAttribute()` from core/dom',
   '\\.innerHeight(?!_)': bannedTermsHelpString,
   '\\.scrollingElement(?!_)': bannedTermsHelpString,
   '\\.computeCTM(?!_)': bannedTermsHelpString,
@@ -853,11 +808,10 @@ const forbiddenTermsSrcInclusive = {
       'use tryDecodeUriComponent from src/url.js',
     allowlist: [
       '3p/integration-lib.js',
-      'build-system/release-tagger/index.js',
       'examples/pwa/pwa.js',
-      'validator/js/engine/parse-url.js',
-      'validator/js/engine/validator.js',
-      'validator/js/webui/webui.js',
+      //'validator/js/engine/parse-url.js',
+      //'validator/js/engine/validator.js',
+      //'validator/js/webui/webui.js',
       'src/url.js',
       'src/core/types/string/url.js',
       'src/core/types/string/bytes.js',
@@ -965,12 +919,15 @@ const forbiddenTermsSrcInclusive = {
       'extensions/amp-consent/0.1/consent-state-manager.js',
     ],
   },
-  '(cdn|3p)\\.ampproject\\.': {
+  'ampproject\\.': {
     message:
       'The CDN domain should typically not be hardcoded in source ' +
-      'code. Use a property of urls from src/config.js instead.',
+      'code. Use urls from src/config/urls.js instead.',
     allowlist: [
-      'ads/_a4a-config.js',
+      // NOTE: Do not allow source code to be allowlisted for this rule.
+      // explicitly allow individual lines through eslint. The only
+      // exception is `src/config/urls.js` as it contains the variables
+      // that need to be referenced by other modules.
       'build-system/server/amp4test.js',
       'build-system/server/app-index/amphtml-helpers.js',
       'build-system/server/app-video-testbench.js',
@@ -979,15 +936,12 @@ const forbiddenTermsSrcInclusive = {
       'build-system/server/variable-substitution.js',
       'build-system/tasks/dist.js',
       'build-system/tasks/helpers.js',
-      'build-system/tasks/performance/helpers.js',
-      'src/3p-frame.js',
-      'src/amp-story-player/amp-story-player-impl.js',
-      'src/config.js',
+      'src/config/urls.js',
       'testing/local-amp-chrome-extension/background.js',
       'tools/experiments/experiments.js',
       'validator/js/engine/htmlparser-interface.js',
-      'validator/js/engine/validator-in-browser.js',
-      'validator/js/engine/validator.js',
+      //'validator/js/engine/validator-in-browser.js',
+      //'validator/js/engine/validator.js',
       'validator/js/nodejs/index.js',
       'validator/js/webui/serve-standalone.go',
     ],
@@ -1006,7 +960,7 @@ const forbiddenTermsSrcInclusive = {
     'use endsWith helper in src/core/types/string',
   '\\.trim(Left|Right)\\(\\)': {
     message: 'Unsupported on IE; use trim() or a helper instead.',
-    allowlist: ['validator/js/engine/validator.js'],
+    //allowlist: ['validator/js/engine/validator.js'],
   },
   "process\\.env(\\.|\\[\\')(GITHUB_ACTIONS|CIRCLECI)": {
     message:
@@ -1139,7 +1093,7 @@ function stripComments(contents) {
  *
  * @param {string} srcFile
  * @param {string} contents
- * @param {!Object<string, string|!ForbiddenTermDef>} terms
+ * @param {!{[key: string]: string|!ForbiddenTermDef}} terms
  * @return {Array<!ForbiddenTermMatchDef>}
  */
 function matchForbiddenTerms(srcFile, contents, terms) {
diff --git a/build-system/test-configs/karma.conf.js b/build-system/test-configs/karma.conf.js
index 30fee58aa14c..02bc69ee70f8 100644
--- a/build-system/test-configs/karma.conf.js
+++ b/build-system/test-configs/karma.conf.js
@@ -1,6 +1,5 @@
 'use strict';
 
-const {dotWrappingWidth} = require('../common/logging');
 const {isCiBuild} = require('../common/ci');
 
 const TEST_SERVER_PORT = 8081;
@@ -12,43 +11,15 @@ module.exports = {
 
   hostname: 'localhost',
 
-  reporters: ['super-dots', 'spec'],
-
-  superDotsReporter: {
-    nbDotsPerLine: dotWrappingWidth,
-    color: {
-      success: 'green',
-      failure: 'red',
-      ignore: 'yellow',
-    },
-    icon: {
-      success: '●',
-      failure: '●',
-      ignore: '○',
-    },
-  },
+  reporters: ['spec'],
 
   specReporter: {
-    suppressPassed: true,
-    suppressSkipped: true,
-    suppressFailed: false,
-    suppressErrorSummary: true,
     maxLogLines: 20,
   },
 
   mochaReporter: {
     output: 'full',
     divider: false,
-    colors: {
-      success: 'green',
-      error: 'red',
-      info: 'yellow',
-    },
-    symbols: {
-      success: '●',
-      error: '●',
-      info: '○',
-    },
   },
 
   port: 9876,
@@ -103,7 +74,7 @@ module.exports = {
   plugins: [
     '@chiragrupani/karma-chromium-edge-launcher',
     'karma-chrome-launcher',
-    'karma-esbuild',
+    'karma-esbuild-up',
     'karma-firefox-launcher',
     'karma-fixture',
     'karma-html2js-preprocessor',
@@ -114,6 +85,5 @@ module.exports = {
     'karma-safarinative-launcher',
     'karma-source-map-support',
     'karma-spec-reporter',
-    'karma-super-dots-reporter',
   ],
 };
diff --git a/build-system/tsconfig.json b/build-system/tsconfig.json
index 21364b0c4b23..78bf756c7508 100644
--- a/build-system/tsconfig.json
+++ b/build-system/tsconfig.json
@@ -36,7 +36,6 @@
     "./babel-plugins/**/(input|output).js",
     "./eslint-rules/**/*.js",
     "./externs/**/*.js",
-    "./tasks/make-extension/template/**/*.js",
-    "./tasks/performance/cache/**/*.js"
+    "./tasks/make-extension/template/**/*.js"
   ]
 }
diff --git a/.codecov.yml b/codecov.yml
similarity index 100%
rename from .codecov.yml
rename to codecov.yml
diff --git a/css/OWNERS b/css/OWNERS
index c2edd96d0e74..24cf4b7b0a85 100644
--- a/css/OWNERS
+++ b/css/OWNERS
@@ -6,7 +6,6 @@
     {
       owners: [
         {name: 'ampproject/wg-components'},
-        {name: 'ampproject/wg-bento'},
         {name: 'ampproject/wg-performance'},
         {name: 'aghassemi', requestReviews: false},
         {name: 'camelburrito', requestReviews: false},
diff --git a/css/Z_INDEX.md b/css/Z_INDEX.md
index da0a3ae633b9..4bc6145e90ea 100644
--- a/css/Z_INDEX.md
+++ b/css/Z_INDEX.md
@@ -2,169 +2,174 @@
 
 <!-- markdown-link-check-disable -->
 
-| context                                                                                          | z-index    | file                                                                                                                                                                    |
-| ------------------------------------------------------------------------------------------------ | ---------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `amp-img[i-amphtml-ssr]:not(.i-amphtml-element) > [placeholder]`                                 | auto       | [css/ampshared.css](/css/ampshared.css)                                                                                                                                 |
-| `.i-amphtml-expanded-mode amp-story-grid-layer`                                                  | auto       | [extensions/amp-story/1.0/amp-story.css](/extensions/amp-story/1.0/amp-story.css)                                                                                       |
-| `.i-amphtml-expanded-mode amp-story-grid-layer *`                                                | auto       | [extensions/amp-story/1.0/amp-story.css](/extensions/amp-story/1.0/amp-story.css)                                                                                       |
-| `amp-sidebar::part(c)`                                                                           | inherit    | [extensions/amp-sidebar/1.0/amp-sidebar.css](/extensions/amp-sidebar/1.0/amp-sidebar.css)                                                                               |
-| `amp-sidebar::part(sidebar)`                                                                     | inherit    | [extensions/amp-sidebar/1.0/amp-sidebar.css](/extensions/amp-sidebar/1.0/amp-sidebar.css)                                                                               |
-| `amp-sidebar::part(wrapper)`                                                                     | inherit    | [extensions/amp-sidebar/1.0/amp-sidebar.css](/extensions/amp-sidebar/1.0/amp-sidebar.css)                                                                               |
-| `amp-story amp-consent`                                                                          | initial    | [extensions/amp-story/1.0/amp-story.css](/extensions/amp-story/1.0/amp-story.css)                                                                                       |
-| `.amp-access-scroll-bar`                                                                         | 2147483647 | [extensions/amp-access-scroll/0.1/amp-access-scroll.css](/extensions/amp-access-scroll/0.1/amp-access-scroll.css)                                                       |
-| `.amp-access-scroll-sheet`                                                                       | 2147483647 | [extensions/amp-access-scroll/0.1/amp-access-scroll.css](/extensions/amp-access-scroll/0.1/amp-access-scroll.css)                                                       |
-| `.i-amphtml-onetap-google-iframe`                                                                | 2147483647 | [extensions/amp-onetap-google/0.1/amp-onetap-google.css](/extensions/amp-onetap-google/0.1/amp-onetap-google.css)                                                       |
-| `amp-sidebar`                                                                                    | 2147483647 | [extensions/amp-sidebar/0.1/amp-sidebar.css](/extensions/amp-sidebar/0.1/amp-sidebar.css)                                                                               |
-| `amp-sidebar`                                                                                    | 2147483647 | [extensions/amp-sidebar/0.2/amp-sidebar.css](/extensions/amp-sidebar/0.2/amp-sidebar.css)                                                                               |
-| `amp-sidebar`                                                                                    | 2147483647 | [extensions/amp-sidebar/1.0/amp-sidebar.css](/extensions/amp-sidebar/1.0/amp-sidebar.css)                                                                               |
-| `defaultSidebarStyles`                                                                           | 2147483647 | [extensions/amp-sidebar/1.0/component.jss.js](/extensions/amp-sidebar/1.0/component.jss.js)                                                                             |
-| `.amp-apester-fullscreen`                                                                        | 2147483646 | [extensions/amp-apester-media/0.1/amp-apester-media.css](/extensions/amp-apester-media/0.1/amp-apester-media.css)                                                       |
-| `.i-amphtml-sidebar-mask`                                                                        | 2147483646 | [extensions/amp-sidebar/0.1/amp-sidebar.css](/extensions/amp-sidebar/0.1/amp-sidebar.css)                                                                               |
-| `.i-amphtml-sidebar-mask`                                                                        | 2147483646 | [extensions/amp-sidebar/0.2/amp-sidebar.css](/extensions/amp-sidebar/0.2/amp-sidebar.css)                                                                               |
-| `defaultBackdropStyles`                                                                          | 2147483646 | [extensions/amp-sidebar/1.0/component.jss.js](/extensions/amp-sidebar/1.0/component.jss.js)                                                                             |
-| `.amp-video-docked-controls`                                                                     | 2147483646 | [extensions/amp-video-docking/0.1/amp-video-docking.css](/extensions/amp-video-docking/0.1/amp-video-docking.css)                                                       |
-| `amp-consent`                                                                                    | 2147483645 | [extensions/amp-consent/0.1/amp-consent.css](/extensions/amp-consent/0.1/amp-consent.css)                                                                               |
-| `.i-amphtml-video-docked-overlay`                                                                | 2147483645 | [extensions/amp-video-docking/0.1/amp-video-docking.css](/extensions/amp-video-docking/0.1/amp-video-docking.css)                                                       |
-| `.i-amphtml-consent-ui-mask`                                                                     | 2147483644 | [extensions/amp-consent/0.1/amp-consent.css](/extensions/amp-consent/0.1/amp-consent.css)                                                                               |
-| `.i-amphtml-video-docked`                                                                        | 2147483644 | [extensions/amp-video-docking/0.1/amp-video-docking.css](/extensions/amp-video-docking/0.1/amp-video-docking.css)                                                       |
-| `.amp-video-docked-shadow`                                                                       | 2147483643 | [extensions/amp-video-docking/0.1/amp-video-docking.css](/extensions/amp-video-docking/0.1/amp-video-docking.css)                                                       |
-| `.i-amphtml-lbg`                                                                                 | 2147483642 | [extensions/amp-lightbox-gallery/0.1/amp-lightbox-gallery.css](/extensions/amp-lightbox-gallery/0.1/amp-lightbox-gallery.css)                                           |
-| `amp-lightbox-gallery[i-amphtml-lbg-fade]`                                                       | 2147483642 | [extensions/amp-lightbox-gallery/0.1/amp-lightbox-gallery.css](/extensions/amp-lightbox-gallery/0.1/amp-lightbox-gallery.css)                                           |
-| `prepareImageAnimation`                                                                          | 2147483642 | [extensions/amp-lightbox-gallery/0.1/amp-lightbox-gallery.js](/extensions/amp-lightbox-gallery/0.1/amp-lightbox-gallery.js)                                             |
-| `amp-subscriptions-dialog`                                                                       | 2147483641 | [extensions/amp-subscriptions/0.1/amp-subscriptions.css](/extensions/amp-subscriptions/0.1/amp-subscriptions.css)                                                       |
-| `.i-amphtml-story-unsupported-browser-overlay`                                                   | 20000001   | [extensions/amp-story/1.0/amp-story-unsupported-browser-layer.css](/extensions/amp-story/1.0/amp-story-unsupported-browser-layer.css)                                   |
-| `amp-story-education`                                                                            | 9999999    | [extensions/amp-story-education/0.1/amp-story-education.css](/extensions/amp-story-education/0.1/amp-story-education.css)                                               |
-| `[i-amphtml-vertical] .i-amphtml-story-page-description`                                         | 9999999    | [extensions/amp-story/1.0/amp-story-vertical.css](/extensions/amp-story/1.0/amp-story-vertical.css)                                                                     |
-| `.i-amphtml-story-consent`                                                                       | 100005     | [extensions/amp-story/1.0/amp-story-consent.css](/extensions/amp-story/1.0/amp-story-consent.css)                                                                       |
-| `amp-story-access[type=blocking]`                                                                | 100004     | [extensions/amp-story/1.0/amp-story-access.css](/extensions/amp-story/1.0/amp-story-access.css)                                                                         |
-| `.i-amphtml-story-toast`                                                                         | 100004     | [extensions/amp-story/1.0/amp-story.css](/extensions/amp-story/1.0/amp-story.css)                                                                                       |
-| `amp-story-access`                                                                               | 100003     | [extensions/amp-story/1.0/amp-story-access.css](/extensions/amp-story/1.0/amp-story-access.css)                                                                         |
-| `.i-amphtml-story-share-menu`                                                                    | 100003     | [extensions/amp-story/1.0/amp-story-share-menu.css](/extensions/amp-story/1.0/amp-story-share-menu.css)                                                                 |
-| `.i-amphtml-story-has-new-page-notification-container`                                           | 100002     | [extensions/amp-story/1.0/amp-story-system-layer.css](/extensions/amp-story/1.0/amp-story-system-layer.css)                                                             |
-| `amp-story[standalone] .i-amphtml-story-developer-log`                                           | 100002     | [extensions/amp-story/1.0/amp-story.css](/extensions/amp-story/1.0/amp-story.css)                                                                                       |
-| `.i-amphtml-story-button-container`                                                              | 100002     | [extensions/amp-story/1.0/pagination-buttons.css](/extensions/amp-story/1.0/pagination-buttons.css)                                                                     |
-| `.i-amphtml-ad-overlay-container`                                                                | 100001     | [extensions/amp-story-auto-ads/0.1/amp-story-auto-ads-ad-badge.css](/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads-ad-badge.css)                                 |
-| `.i-amphtml-story-ad-progress-background`                                                        | 100001     | [extensions/amp-story-auto-ads/0.1/amp-story-auto-ads-progress-bar.css](/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads-progress-bar.css)                         |
-| `.i-amphtml-story-info-dialog`                                                                   | 100001     | [extensions/amp-story/1.0/amp-story-info-dialog.css](/extensions/amp-story/1.0/amp-story-info-dialog.css)                                                               |
-| `.i-amphtml-story-progress-bar`                                                                  | 100001     | [extensions/amp-story/1.0/amp-story-system-layer.css](/extensions/amp-story/1.0/amp-story-system-layer.css)                                                             |
-| `.i-amphtml-story-focused-state-layer`                                                           | 100001     | [extensions/amp-story/1.0/amp-story-tooltip.css](/extensions/amp-story/1.0/amp-story-tooltip.css)                                                                       |
-| `.i-amphtml-story-360-activate-button`                                                           | 100000     | [extensions/amp-story-360/0.1/amp-story-360.css](/extensions/amp-story-360/0.1/amp-story-360.css)                                                                       |
-| `.i-amphtml-story-360-discovery`                                                                 | 100000     | [extensions/amp-story-360/0.1/amp-story-360.css](/extensions/amp-story-360/0.1/amp-story-360.css)                                                                       |
-| `.i-amphtml-story-page-attachment-expand`                                                        | 100000     | [extensions/amp-story/1.0/amp-story-page-attachment.css](/extensions/amp-story/1.0/amp-story-page-attachment.css)                                                       |
-| `.i-amphtml-story-system-layer`                                                                  | 100000     | [extensions/amp-story/1.0/amp-story-system-layer.css](/extensions/amp-story/1.0/amp-story-system-layer.css)                                                             |
-| `.i-amphtml-story-page-error`                                                                    | 10000      | [extensions/amp-story/1.0/amp-story.css](/extensions/amp-story/1.0/amp-story.css)                                                                                       |
-| `.i-amphtml-story-page-play-button`                                                              | 10000      | [extensions/amp-story/1.0/amp-story.css](/extensions/amp-story/1.0/amp-story.css)                                                                                       |
-| `.i-amphtml-image-lightbox-trans`                                                                | 1001       | [extensions/amp-image-lightbox/0.1/amp-image-lightbox.css](/extensions/amp-image-lightbox/0.1/amp-image-lightbox.css)                                                   |
-| `amp-image-lightbox`                                                                             | 1000       | [extensions/amp-image-lightbox/0.1/amp-image-lightbox.css](/extensions/amp-image-lightbox/0.1/amp-image-lightbox.css)                                                   |
-| `amp-lightbox`                                                                                   | 1000       | [extensions/amp-lightbox/0.1/amp-lightbox.css](/extensions/amp-lightbox/0.1/amp-lightbox.css)                                                                           |
-| `amp-lightbox i-amphtml-ad-close-header`                                                         | 1000       | [extensions/amp-lightbox/0.1/amp-lightbox.css](/extensions/amp-lightbox/0.1/amp-lightbox.css)                                                                           |
-| `wrapper`                                                                                        | 1000       | [extensions/amp-lightbox/1.0/component.jss.js](/extensions/amp-lightbox/1.0/component.jss.js)                                                                           |
-| `amp-live-list > [update]`                                                                       | 1000       | [extensions/amp-live-list/0.1/amp-live-list.css](/extensions/amp-live-list/0.1/amp-live-list.css)                                                                       |
-| `.i-amphtml-mega-menu-mask-parent`                                                               | 1000       | [extensions/amp-mega-menu/0.1/amp-mega-menu.css](/extensions/amp-mega-menu/0.1/amp-mega-menu.css)                                                                       |
-| `amp-mega-menu`                                                                                  | 1000       | [extensions/amp-mega-menu/0.1/amp-mega-menu.css](/extensions/amp-mega-menu/0.1/amp-mega-menu.css)                                                                       |
-| `amp-user-notification`                                                                          | 1000       | [extensions/amp-user-notification/0.1/amp-user-notification.css](/extensions/amp-user-notification/0.1/amp-user-notification.css)                                       |
-| `i-amphtml-app-banner-top-padding`                                                               | 15         | [extensions/amp-app-banner/0.1/amp-app-banner.css](/extensions/amp-app-banner/0.1/amp-app-banner.css)                                                                   |
-| `.amp-app-banner-dismiss-button`                                                                 | 14         | [extensions/amp-app-banner/0.1/amp-app-banner.css](/extensions/amp-app-banner/0.1/amp-app-banner.css)                                                                   |
-| `amp-app-banner`                                                                                 | 13         | [extensions/amp-app-banner/0.1/amp-app-banner.css](/extensions/amp-app-banner/0.1/amp-app-banner.css)                                                                   |
-| `amp-sticky-ad-top-padding`                                                                      | 12         | [extensions/amp-sticky-ad/1.0/amp-sticky-ad.css](/extensions/amp-sticky-ad/1.0/amp-sticky-ad.css)                                                                       |
-| `style`                                                                                          | 11         | [extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js](/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js) |
-| `amp-ad[sticky]`                                                                                 | 11         | [extensions/amp-ad/0.1/amp-ad.css](/extensions/amp-ad/0.1/amp-ad.css)                                                                                                   |
-| `amp-sticky-ad`                                                                                  | 11         | [extensions/amp-sticky-ad/1.0/amp-sticky-ad.css](/extensions/amp-sticky-ad/1.0/amp-sticky-ad.css)                                                                       |
-| `.i-amphtml-autocomplete-results`                                                                | 10         | [extensions/amp-autocomplete/0.1/amp-autocomplete.css](/extensions/amp-autocomplete/0.1/amp-autocomplete.css)                                                           |
-| `.amp-carousel-button`                                                                           | 10         | [extensions/amp-carousel/0.1/amp-carousel.css](/extensions/amp-carousel/0.1/amp-carousel.css)                                                                           |
-| `.amp-carousel-button`                                                                           | 10         | [extensions/amp-carousel/0.2/amp-carousel.css](/extensions/amp-carousel/0.2/amp-carousel.css)                                                                           |
-| `amp-date-picker[mode="overlay"] .i-amphtml-date-picker-container`                               | 10         | [extensions/amp-date-picker/0.1/amp-date-picker.css](/extensions/amp-date-picker/0.1/amp-date-picker.css)                                                               |
-| `.i-amphtml-story-spinner`                                                                       | 10         | [extensions/amp-story/1.0/amp-story.css](/extensions/amp-story/1.0/amp-story.css)                                                                                       |
-| `.i-amphtml-byside-content-loading-container .i-amphtml-byside-content-loading-animation:before` | 9          | [extensions/amp-byside-content/0.1/amp-byside-content.css](/extensions/amp-byside-content/0.1/amp-byside-content.css)                                                   |
-| `100%`                                                                                           | 9          | [extensions/amp-byside-content/0.1/amp-byside-content.css](/extensions/amp-byside-content/0.1/amp-byside-content.css)                                                   |
-| `.i-amphtml-story-ad-attribution`                                                                | 4          | [extensions/amp-story-auto-ads/0.1/amp-story-auto-ads-attribution.css](/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads-attribution.css)                           |
-| `.amp-story-draggable-drawer-root`                                                               | 4          | [extensions/amp-story/1.0/amp-story-draggable-drawer.css](/extensions/amp-story/1.0/amp-story-draggable-drawer.css)                                                     |
-| `.i-amphtml-image-slider-bar`                                                                    | 3          | [extensions/amp-image-slider/0.1/amp-image-slider.css](/extensions/amp-image-slider/0.1/amp-image-slider.css)                                                           |
-| `amp-story-cta-layer`                                                                            | 3          | [extensions/amp-story-auto-ads/0.1/amp-story-auto-ads-inabox.css](/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads-inabox.css)                                     |
-| `styles`                                                                                         | 3          | [extensions/amp-story-interactive/0.1/amp-story-interactive-abstract.js](/extensions/amp-story-interactive/0.1/amp-story-interactive-abstract.js)                       |
-| `.i-amphtml-story-page-open-attachment[active]`                                                  | 3          | [extensions/amp-story/1.0/amp-story-open-page-attachment.css](/extensions/amp-story/1.0/amp-story-open-page-attachment.css)                                             |
-| `.i-amphtml-story-page-attachment-active::after`                                                 | 3          | [extensions/amp-story/1.0/amp-story.css](/extensions/amp-story/1.0/amp-story.css)                                                                                       |
-| `amp-story-cta-layer`                                                                            | 3          | [extensions/amp-story/1.0/amp-story.css](/extensions/amp-story/1.0/amp-story.css)                                                                                       |
-| `.i-amphtml-element > [overflow]`                                                                | 2          | [css/ampshared.css](/css/ampshared.css)                                                                                                                                 |
-| `body noscript > *`                                                                              | 2          | [css/ampshared.css](/css/ampshared.css)                                                                                                                                 |
-| `.i-amphtml-fit-text-content`                                                                    | 2          | [extensions/amp-fit-text/0.1/amp-fit-text.css](/extensions/amp-fit-text/0.1/amp-fit-text.css)                                                                           |
-| `.i-amphtml-image-lightbox-caption`                                                              | 2          | [extensions/amp-image-lightbox/0.1/amp-image-lightbox.css](/extensions/amp-image-lightbox/0.1/amp-image-lightbox.css)                                                   |
-| `.i-amphtml-image-slider-hint`                                                                   | 2          | [extensions/amp-image-slider/0.1/amp-image-slider.css](/extensions/amp-image-slider/0.1/amp-image-slider.css)                                                           |
-| `control`                                                                                        | 2          | [extensions/amp-lightbox-gallery/1.0/component.jss.js](/extensions/amp-lightbox-gallery/1.0/component.jss.js)                                                           |
-| `.i-amphtml-story-interactive-post-selection .i-amphtml-story-interactive-slider-bubble`         | 2          | [extensions/amp-story-interactive/0.1/amp-story-interactive-slider.css](/extensions/amp-story-interactive/0.1/amp-story-interactive-slider.css)                         |
-| `.i-amphtml-story-interactive-post-selection .i-amphtml-story-interactive-slider-bubble-wrapper` | 2          | [extensions/amp-story-interactive/0.1/amp-story-interactive-slider.css](/extensions/amp-story-interactive/0.1/amp-story-interactive-slider.css)                         |
-| `.i-amphtml-story-interactive-disclaimer-icon`                                                   | 2          | [extensions/amp-story-interactive/0.1/amp-story-interactive.css](/extensions/amp-story-interactive/0.1/amp-story-interactive.css)                                       |
-| `.i-amphtml-story-access-header`                                                                 | 2          | [extensions/amp-story/1.0/amp-story-access.css](/extensions/amp-story/1.0/amp-story-access.css)                                                                         |
-| `.i-amphtml-story-consent-header`                                                                | 2          | [extensions/amp-story/1.0/amp-story-consent.css](/extensions/amp-story/1.0/amp-story-consent.css)                                                                       |
-| `.i-amphtml-story-hint-container`                                                                | 2          | [extensions/amp-story/1.0/amp-story-hint.css](/extensions/amp-story/1.0/amp-story-hint.css)                                                                             |
-| `amp-story-grid-layer`                                                                           | 2          | [extensions/amp-story/1.0/amp-story.css](/extensions/amp-story/1.0/amp-story.css)                                                                                       |
-| `.controls`                                                                                      | 1          | [css/amp-ima-video-iframe.css](/css/amp-ima-video-iframe.css)                                                                                                           |
-| `.amp-story-player-exit-control-button`                                                          | 1          | [css/amp-story-player-shadow.css](/css/amp-story-player-shadow.css)                                                                                                     |
-| `.i-amphtml-story-player-panel-next`                                                             | 1          | [css/amp-story-player-shadow.css](/css/amp-story-player-shadow.css)                                                                                                     |
-| `.i-amphtml-story-player-panel-prev`                                                             | 1          | [css/amp-story-player-shadow.css](/css/amp-story-player-shadow.css)                                                                                                     |
-| `.i-amphtml-layout-size-defined > [fallback]`                                                    | 1          | [css/ampshared.css](/css/ampshared.css)                                                                                                                                 |
-| `.i-amphtml-layout-size-defined > [placeholder]`                                                 | 1          | [css/ampshared.css](/css/ampshared.css)                                                                                                                                 |
-| `.i-amphtml-loading-container`                                                                   | 1          | [css/ampshared.css](/css/ampshared.css)                                                                                                                                 |
-| `.amp-video-eq`                                                                                  | 1          | [css/video-autoplay.css](/css/video-autoplay.css)                                                                                                                       |
-| `.i-amphtml-video-mask`                                                                          | 1          | [css/video-autoplay.css](/css/video-autoplay.css)                                                                                                                       |
-| `amp-addthis .i-amphtml-addthis-close`                                                           | 1          | [extensions/amp-addthis/0.1/amp-addthis.css](/extensions/amp-addthis/0.1/amp-addthis.css)                                                                               |
-| `.i-amphtml-base-carousel-arrow-icon`                                                            | 1          | [extensions/amp-base-carousel/0.1/amp-base-carousel.css](/extensions/amp-base-carousel/0.1/amp-base-carousel.css)                                                       |
-| `.i-amphtml-base-carousel-arrow-next-slot`                                                       | 1          | [extensions/amp-base-carousel/0.1/amp-base-carousel.css](/extensions/amp-base-carousel/0.1/amp-base-carousel.css)                                                       |
-| `.i-amphtml-base-carousel-arrow-prev-slot`                                                       | 1          | [extensions/amp-base-carousel/0.1/amp-base-carousel.css](/extensions/amp-base-carousel/0.1/amp-base-carousel.css)                                                       |
-| `.i-amphtml-base-carousel-arrows`                                                                | 1          | [extensions/amp-base-carousel/0.1/amp-base-carousel.css](/extensions/amp-base-carousel/0.1/amp-base-carousel.css)                                                       |
-| `arrow`                                                                                          | 1          | [extensions/amp-base-carousel/1.0/component.jss.js](/extensions/amp-base-carousel/1.0/component.jss.js)                                                                 |
-| `.i-amphtml-carousel-arrows`                                                                     | 1          | [extensions/amp-carousel/0.2/amp-carousel.css](/extensions/amp-carousel/0.2/amp-carousel.css)                                                                           |
-| `.i-amphtml-fit-text-measurer`                                                                   | 1          | [extensions/amp-fit-text/0.1/amp-fit-text.css](/extensions/amp-fit-text/0.1/amp-fit-text.css)                                                                           |
-| `.i-amphtml-image-lightbox-viewer`                                                               | 1          | [extensions/amp-image-lightbox/0.1/amp-image-lightbox.css](/extensions/amp-image-lightbox/0.1/amp-image-lightbox.css)                                                   |
-| `.i-amphtml-image-lightbox-viewer-image`                                                         | 1          | [extensions/amp-image-lightbox/0.1/amp-image-lightbox.css](/extensions/amp-image-lightbox/0.1/amp-image-lightbox.css)                                                   |
-| `.i-amphtml-image-slider-label-wrapper`                                                          | 1          | [extensions/amp-image-slider/0.1/amp-image-slider.css](/extensions/amp-image-slider/0.1/amp-image-slider.css)                                                           |
-| `.i-amphtml-image-slider-right-mask`                                                             | 1          | [extensions/amp-image-slider/0.1/amp-image-slider.css](/extensions/amp-image-slider/0.1/amp-image-slider.css)                                                           |
-| `.i-amphtml-inline-gallery-pagination-count`                                                     | 1          | [extensions/amp-inline-gallery/0.1/amp-inline-gallery-pagination.css](/extensions/amp-inline-gallery/0.1/amp-inline-gallery-pagination.css)                             |
-| `.i-amphtml-inline-gallery-pagination-dot-container`                                             | 1          | [extensions/amp-inline-gallery/0.1/amp-inline-gallery-pagination.css](/extensions/amp-inline-gallery/0.1/amp-inline-gallery-pagination.css)                             |
-| `container['&$inset']`                                                                           | 1          | [extensions/amp-inline-gallery/1.0/pagination.jss.js](/extensions/amp-inline-gallery/1.0/pagination.jss.js)                                                             |
-| `dotWrapper['&$inset']`                                                                          | 1          | [extensions/amp-inline-gallery/1.0/pagination.jss.js](/extensions/amp-inline-gallery/1.0/pagination.jss.js)                                                             |
-| `numbersWrapper['&$inset']`                                                                      | 1          | [extensions/amp-inline-gallery/1.0/pagination.jss.js](/extensions/amp-inline-gallery/1.0/pagination.jss.js)                                                             |
-| `.i-amphtml-lbg-caption-scroll`                                                                  | 1          | [extensions/amp-lightbox-gallery/0.1/lightbox-caption.css](/extensions/amp-lightbox-gallery/0.1/lightbox-caption.css)                                                   |
-| `[i-amphtml-lbg-caption-state="clip"] + .i-amphtml-lbg-caption-mask`                             | 1          | [extensions/amp-lightbox-gallery/0.1/lightbox-caption.css](/extensions/amp-lightbox-gallery/0.1/lightbox-caption.css)                                                   |
-| `.i-amphtml-lbg-top-bar`                                                                         | 1          | [extensions/amp-lightbox-gallery/0.1/lightbox-controls.css](/extensions/amp-lightbox-gallery/0.1/lightbox-controls.css)                                                 |
-| `controlsPanel`                                                                                  | 1          | [extensions/amp-lightbox-gallery/1.0/component.jss.js](/extensions/amp-lightbox-gallery/1.0/component.jss.js)                                                           |
-| `.i-amphtml-glass-pane`                                                                          | 1          | [extensions/amp-story-auto-ads/0.1/amp-story-auto-ads.css](/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads.css)                                                   |
-| `setStyles`                                                                                      | 1          | [extensions/amp-story-auto-ads/0.1/story-ad-button-text-fitter.js](/extensions/amp-story-auto-ads/0.1/story-ad-button-text-fitter.js)                                   |
-| `.i-amphtml-story-dev-tools-device-dialog-bg`                                                    | 1          | [extensions/amp-story-dev-tools/0.1/amp-story-dev-tools-tab-preview.css](/extensions/amp-story-dev-tools/0.1/amp-story-dev-tools-tab-preview.css)                       |
-| `.i-amphtml-story-interactive-img-quiz-answer-choice`                                            | 1          | [extensions/amp-story-interactive/0.1/amp-story-interactive-img-quiz.css](/extensions/amp-story-interactive/0.1/amp-story-interactive-img-quiz.css)                     |
-| `.i-amphtml-story-interactive-img-option-img`                                                    | 1          | [extensions/amp-story-interactive/0.1/amp-story-interactive-img.css](/extensions/amp-story-interactive/0.1/amp-story-interactive-img.css)                               |
-| `.i-amphtml-story-interactive-option-text`                                                       | 1          | [extensions/amp-story-interactive/0.1/amp-story-interactive-poll.css](/extensions/amp-story-interactive/0.1/amp-story-interactive-poll.css)                             |
-| `.i-amphtml-story-interactive-slider-average-text`                                               | 1          | [extensions/amp-story-interactive/0.1/amp-story-interactive-slider.css](/extensions/amp-story-interactive/0.1/amp-story-interactive-slider.css)                         |
-| `.i-amphtml-story-interactive-slider-input`                                                      | 1          | [extensions/amp-story-interactive/0.1/amp-story-interactive-slider.css](/extensions/amp-story-interactive/0.1/amp-story-interactive-slider.css)                         |
-| `.i-amphtml-story-interactive-slider-input::-webkit-slider-thumb`                                | 1          | [extensions/amp-story-interactive/0.1/amp-story-interactive-slider.css](/extensions/amp-story-interactive/0.1/amp-story-interactive-slider.css)                         |
-| `.i-amphtml-story-interactive-confetti-wrapper`                                                  | 1          | [extensions/amp-story-interactive/0.1/amp-story-interactive.css](/extensions/amp-story-interactive/0.1/amp-story-interactive.css)                                       |
-| `.i-amphtml-story-consent-actions`                                                               | 1          | [extensions/amp-story/1.0/amp-story-consent.css](/extensions/amp-story/1.0/amp-story-consent.css)                                                                       |
-| `.i-amphtml-story-draggable-drawer-header`                                                       | 1          | [extensions/amp-story/1.0/amp-story-draggable-drawer-header.css](/extensions/amp-story/1.0/amp-story-draggable-drawer-header.css)                                       |
-| `.i-amphtml-story-hint-container .i-amphtml-story-hint-tap-button-icon`                          | 1          | [extensions/amp-story/1.0/amp-story-hint.css](/extensions/amp-story/1.0/amp-story-hint.css)                                                                             |
-| `.i-amphtml-expanded-mode .i-amphtml-embedded-component.i-amphtml-expanded-component`            | 1          | [extensions/amp-story/1.0/amp-story.css](/extensions/amp-story/1.0/amp-story.css)                                                                                       |
-| `amp-story-page[active]`                                                                         | 1          | [extensions/amp-story/1.0/amp-story.css](/extensions/amp-story/1.0/amp-story.css)                                                                                       |
-| `.i-amphtml-stream-gallery-next`                                                                 | 1          | [extensions/amp-stream-gallery/0.1/arrows.css](/extensions/amp-stream-gallery/0.1/arrows.css)                                                                           |
-| `.i-amphtml-stream-gallery-prev`                                                                 | 1          | [extensions/amp-stream-gallery/0.1/arrows.css](/extensions/amp-stream-gallery/0.1/arrows.css)                                                                           |
-| `arrow`                                                                                          | 1          | [extensions/amp-stream-gallery/1.0/component.jss.js](/extensions/amp-stream-gallery/1.0/component.jss.js)                                                               |
-| `eq`                                                                                             | 1          | [extensions/amp-video/1.0/autoplay.jss.js](/extensions/amp-video/1.0/autoplay.jss.js)                                                                                   |
-| `.i-amphtml-byside-content-loading-container .i-amphtml-byside-content-loading-animation:after`  | 0          | [extensions/amp-byside-content/0.1/amp-byside-content.css](/extensions/amp-byside-content/0.1/amp-byside-content.css)                                                   |
-| `0%`                                                                                             | 0          | [extensions/amp-byside-content/0.1/amp-byside-content.css](/extensions/amp-byside-content/0.1/amp-byside-content.css)                                                   |
-| `setStyle`                                                                                       | 0          | [extensions/amp-iframe/0.1/amp-iframe.js](/extensions/amp-iframe/0.1/amp-iframe.js)                                                                                     |
-| `.i-amphtml-image-lightbox-container`                                                            | 0          | [extensions/amp-image-lightbox/0.1/amp-image-lightbox.css](/extensions/amp-image-lightbox/0.1/amp-image-lightbox.css)                                                   |
-| `.i-amphtml-inline-gallery-pagination-dots`                                                      | 0          | [extensions/amp-inline-gallery/0.1/amp-inline-gallery-pagination.css](/extensions/amp-inline-gallery/0.1/amp-inline-gallery-pagination.css)                             |
-| `.i-amphtml-inline-gallery-pagination-numbers`                                                   | 0          | [extensions/amp-inline-gallery/0.1/amp-inline-gallery-pagination.css](/extensions/amp-inline-gallery/0.1/amp-inline-gallery-pagination.css)                             |
-| `dots['&$inset']`                                                                                | 0          | [extensions/amp-inline-gallery/1.0/pagination.jss.js](/extensions/amp-inline-gallery/1.0/pagination.jss.js)                                                             |
-| `numbers['&$inset']`                                                                             | 0          | [extensions/amp-inline-gallery/1.0/pagination.jss.js](/extensions/amp-inline-gallery/1.0/pagination.jss.js)                                                             |
-| `[i-amphtml-lbg-caption-state="expand"] + .i-amphtml-lbg-caption-mask`                           | 0          | [extensions/amp-lightbox-gallery/0.1/lightbox-caption.css](/extensions/amp-lightbox-gallery/0.1/lightbox-caption.css)                                                   |
-| `.i-amphtml-story-interactive-quiz-option`                                                       | 0          | [extensions/amp-story-interactive/0.1/amp-story-interactive-quiz.css](/extensions/amp-story-interactive/0.1/amp-story-interactive-quiz.css)                             |
-| `.i-amphtml-story-interactive-slider-input-size::after`                                          | 0          | [extensions/amp-story-interactive/0.1/amp-story-interactive-slider.css](/extensions/amp-story-interactive/0.1/amp-story-interactive-slider.css)                         |
-| `.i-amphtml-story-access-content`                                                                | 0          | [extensions/amp-story/1.0/amp-story-access.css](/extensions/amp-story/1.0/amp-story-access.css)                                                                         |
-| `.i-amphtml-story-consent-content`                                                               | 0          | [extensions/amp-story/1.0/amp-story-consent.css](/extensions/amp-story/1.0/amp-story-consent.css)                                                                       |
-| `amp-story-page`                                                                                 | 0          | [extensions/amp-story/1.0/amp-story.css](/extensions/amp-story/1.0/amp-story.css)                                                                                       |
-| `.amp-video-docked-placeholder-background`                                                       | 0          | [extensions/amp-video-docking/0.1/amp-video-docking.css](/extensions/amp-video-docking/0.1/amp-video-docking.css)                                                       |
-| `.i-amphtml-carousel-spacer`                                                                     | -1         | [extensions/amp-base-carousel/0.1/carousel.css](/extensions/amp-base-carousel/0.1/carousel.css)                                                                         |
-| `.i-amphtml-mega-menu-mask`                                                                      | -1         | [extensions/amp-mega-menu/0.1/amp-mega-menu.css](/extensions/amp-mega-menu/0.1/amp-mega-menu.css)                                                                       |
-| `.i-amphtml-story-interactive-slider-bubble::after`                                              | -1         | [extensions/amp-story-interactive/0.1/amp-story-interactive-slider.css](/extensions/amp-story-interactive/0.1/amp-story-interactive-slider.css)                         |
-| `.i-amphtml-story-access-logo::before`                                                           | -1         | [extensions/amp-story/1.0/amp-story-access.css](/extensions/amp-story/1.0/amp-story-access.css)                                                                         |
-| `.i-amphtml-story-consent-logo::before`                                                          | -1         | [extensions/amp-story/1.0/amp-story-consent.css](/extensions/amp-story/1.0/amp-story-consent.css)                                                                       |
-| `.i-amphtml-story-page-open-attachment-icon::after`                                              | -1         | [extensions/amp-story/1.0/amp-story-open-page-attachment.css](/extensions/amp-story/1.0/amp-story-open-page-attachment.css)                                             |
+| context                                                                                          | z-index      | file                                                                                                                                                                    |
+| ------------------------------------------------------------------------------------------------ | ------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `amp-img[i-amphtml-ssr]:not(.i-amphtml-element) > [placeholder]`                                 | auto         | [css/ampshared.css](/css/ampshared.css)                                                                                                                                 |
+| `amp-sidebar::part(c)`                                                                           | inherit      | [extensions/amp-sidebar/1.0/amp-sidebar.css](/extensions/amp-sidebar/1.0/amp-sidebar.css)                                                                               |
+| `amp-sidebar::part(sidebar)`                                                                     | inherit      | [extensions/amp-sidebar/1.0/amp-sidebar.css](/extensions/amp-sidebar/1.0/amp-sidebar.css)                                                                               |
+| `amp-sidebar::part(wrapper)`                                                                     | inherit      | [extensions/amp-sidebar/1.0/amp-sidebar.css](/extensions/amp-sidebar/1.0/amp-sidebar.css)                                                                               |
+| `amp-story amp-consent`                                                                          | initial      | [extensions/amp-story/1.0/amp-story.css](/extensions/amp-story/1.0/amp-story.css)                                                                                       |
+| `.amp-access-scroll-bar`                                                                         | 2147483647   | [extensions/amp-access-scroll/0.1/amp-access-scroll.css](/extensions/amp-access-scroll/0.1/amp-access-scroll.css)                                                       |
+| `.amp-access-scroll-sheet`                                                                       | 2147483647   | [extensions/amp-access-scroll/0.1/amp-access-scroll.css](/extensions/amp-access-scroll/0.1/amp-access-scroll.css)                                                       |
+| `amp-ad[sticky]`                                                                                 | 2147483647   | [extensions/amp-ad/0.1/amp-ad.css](/extensions/amp-ad/0.1/amp-ad.css)                                                                                                   |
+| `.i-amphtml-onetap-google-iframe`                                                                | 2147483647   | [extensions/amp-onetap-google/0.1/amp-onetap-google.css](/extensions/amp-onetap-google/0.1/amp-onetap-google.css)                                                       |
+| `amp-sidebar`                                                                                    | 2147483647   | [extensions/amp-sidebar/0.1/amp-sidebar.css](/extensions/amp-sidebar/0.1/amp-sidebar.css)                                                                               |
+| `amp-sidebar`                                                                                    | 2147483647   | [extensions/amp-sidebar/0.2/amp-sidebar.css](/extensions/amp-sidebar/0.2/amp-sidebar.css)                                                                               |
+| `amp-sidebar`                                                                                    | 2147483647   | [extensions/amp-sidebar/1.0/amp-sidebar.css](/extensions/amp-sidebar/1.0/amp-sidebar.css)                                                                               |
+| `defaultSidebarStyles`                                                                           | 2147483647   | [extensions/amp-sidebar/1.0/component.jss.js](/extensions/amp-sidebar/1.0/component.jss.js)                                                                             |
+| `.amp-apester-fullscreen`                                                                        | 2147483646   | [extensions/amp-apester-media/0.1/amp-apester-media.css](/extensions/amp-apester-media/0.1/amp-apester-media.css)                                                       |
+| `.i-amphtml-sidebar-mask`                                                                        | 2147483646   | [extensions/amp-sidebar/0.1/amp-sidebar.css](/extensions/amp-sidebar/0.1/amp-sidebar.css)                                                                               |
+| `.i-amphtml-sidebar-mask`                                                                        | 2147483646   | [extensions/amp-sidebar/0.2/amp-sidebar.css](/extensions/amp-sidebar/0.2/amp-sidebar.css)                                                                               |
+| `defaultBackdropStyles`                                                                          | 2147483646   | [extensions/amp-sidebar/1.0/component.jss.js](/extensions/amp-sidebar/1.0/component.jss.js)                                                                             |
+| `.amp-video-docked-controls`                                                                     | 2147483646   | [extensions/amp-video-docking/0.1/amp-video-docking.css](/extensions/amp-video-docking/0.1/amp-video-docking.css)                                                       |
+| `amp-consent`                                                                                    | 2147483645   | [extensions/amp-consent/0.1/amp-consent.css](/extensions/amp-consent/0.1/amp-consent.css)                                                                               |
+| `.i-amphtml-video-docked-overlay`                                                                | 2147483645   | [extensions/amp-video-docking/0.1/amp-video-docking.css](/extensions/amp-video-docking/0.1/amp-video-docking.css)                                                       |
+| `.i-amphtml-consent-ui-mask`                                                                     | 2147483644   | [extensions/amp-consent/0.1/amp-consent.css](/extensions/amp-consent/0.1/amp-consent.css)                                                                               |
+| `.i-amphtml-video-docked`                                                                        | 2147483644   | [extensions/amp-video-docking/0.1/amp-video-docking.css](/extensions/amp-video-docking/0.1/amp-video-docking.css)                                                       |
+| `.amp-video-docked-shadow`                                                                       | 2147483643   | [extensions/amp-video-docking/0.1/amp-video-docking.css](/extensions/amp-video-docking/0.1/amp-video-docking.css)                                                       |
+| `.i-amphtml-lbg`                                                                                 | 2147483642   | [extensions/amp-lightbox-gallery/0.1/amp-lightbox-gallery.css](/extensions/amp-lightbox-gallery/0.1/amp-lightbox-gallery.css)                                           |
+| `amp-lightbox-gallery[i-amphtml-lbg-fade]`                                                       | 2147483642   | [extensions/amp-lightbox-gallery/0.1/amp-lightbox-gallery.css](/extensions/amp-lightbox-gallery/0.1/amp-lightbox-gallery.css)                                           |
+| `prepareImageAnimation`                                                                          | 2147483642   | [extensions/amp-lightbox-gallery/0.1/amp-lightbox-gallery.js](/extensions/amp-lightbox-gallery/0.1/amp-lightbox-gallery.js)                                             |
+| `amp-story-cta-layer`                                                                            | 2147483642   | [extensions/amp-story-auto-ads/0.1/amp-story-auto-ads-inabox.css](/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads-inabox.css)                                     |
+| `amp-subscriptions-dialog`                                                                       | 2147483641   | [extensions/amp-subscriptions/0.1/amp-subscriptions.css](/extensions/amp-subscriptions/0.1/amp-subscriptions.css)                                                       |
+| `.i-amphtml-story-unsupported-browser-overlay`                                                   | 20000001     | [extensions/amp-story/1.0/amp-story-unsupported-browser-layer.css](/extensions/amp-story/1.0/amp-story-unsupported-browser-layer.css)                                   |
+| `amp-story-education`                                                                            | 9999999      | [extensions/amp-story-education/0.1/amp-story-education.css](/extensions/amp-story-education/0.1/amp-story-education.css)                                               |
+| `[i-amphtml-vertical] .i-amphtml-story-page-description`                                         | 9999999      | [extensions/amp-story/1.0/amp-story-vertical.css](/extensions/amp-story/1.0/amp-story-vertical.css)                                                                     |
+| `.i-amphtml-story-consent`                                                                       | 100005       | [extensions/amp-story/1.0/amp-story-consent.css](/extensions/amp-story/1.0/amp-story-consent.css)                                                                       |
+| `.i-amphtml-story-toast`                                                                         | 100004       | [extensions/amp-story/1.0/amp-story.css](/extensions/amp-story/1.0/amp-story.css)                                                                                       |
+| `.i-amphtml-story-share-menu`                                                                    | 100003       | [extensions/amp-story-share-menu/0.1/amp-story-share-menu.css](/extensions/amp-story-share-menu/0.1/amp-story-share-menu.css)                                           |
+| `.i-amphtml-story-has-new-page-notification-container`                                           | 100002       | [extensions/amp-story/1.0/amp-story-system-layer.css](/extensions/amp-story/1.0/amp-story-system-layer.css)                                                             |
+| `.i-amphtml-story-button-container`                                                              | 100002       | [extensions/amp-story/1.0/pagination-buttons.css](/extensions/amp-story/1.0/pagination-buttons.css)                                                                     |
+| `.i-amphtml-ad-overlay-container`                                                                | 100001       | [extensions/amp-story-auto-ads/0.1/amp-story-auto-ads-ad-badge.css](/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads-ad-badge.css)                                 |
+| `.i-amphtml-story-info-dialog`                                                                   | 100001       | [extensions/amp-story/1.0/amp-story-info-dialog.css](/extensions/amp-story/1.0/amp-story-info-dialog.css)                                                               |
+| `.i-amphtml-story-progress-bar`                                                                  | 100001       | [extensions/amp-story/1.0/amp-story-system-layer.css](/extensions/amp-story/1.0/amp-story-system-layer.css)                                                             |
+| `.i-amphtml-story-focused-state-layer`                                                           | 100001       | [extensions/amp-story/1.0/amp-story-tooltip.css](/extensions/amp-story/1.0/amp-story-tooltip.css)                                                                       |
+| `.i-amphtml-story-360-activate-button`                                                           | 100000       | [extensions/amp-story-360/0.1/amp-story-360.css](/extensions/amp-story-360/0.1/amp-story-360.css)                                                                       |
+| `.i-amphtml-story-360-discovery`                                                                 | 100000       | [extensions/amp-story-360/0.1/amp-story-360.css](/extensions/amp-story-360/0.1/amp-story-360.css)                                                                       |
+| `.i-amphtml-story-page-attachment-expand`                                                        | 100000       | [extensions/amp-story-page-attachment/0.1/amp-story-page-attachment.css](/extensions/amp-story-page-attachment/0.1/amp-story-page-attachment.css)                       |
+| `.i-amphtml-story-system-layer`                                                                  | 100000       | [extensions/amp-story/1.0/amp-story-system-layer.css](/extensions/amp-story/1.0/amp-story-system-layer.css)                                                             |
+| `.i-amphtml-story-page-error`                                                                    | 10000        | [extensions/amp-story/1.0/amp-story.css](/extensions/amp-story/1.0/amp-story.css)                                                                                       |
+| `.i-amphtml-story-page-play-button`                                                              | 10000        | [extensions/amp-story/1.0/amp-story.css](/extensions/amp-story/1.0/amp-story.css)                                                                                       |
+| `.i-amphtml-image-lightbox-trans`                                                                | 1001         | [extensions/amp-image-lightbox/0.1/amp-image-lightbox.css](/extensions/amp-image-lightbox/0.1/amp-image-lightbox.css)                                                   |
+| `amp-image-lightbox`                                                                             | 1000         | [extensions/amp-image-lightbox/0.1/amp-image-lightbox.css](/extensions/amp-image-lightbox/0.1/amp-image-lightbox.css)                                                   |
+| `amp-lightbox`                                                                                   | 1000         | [extensions/amp-lightbox/0.1/amp-lightbox.css](/extensions/amp-lightbox/0.1/amp-lightbox.css)                                                                           |
+| `amp-lightbox i-amphtml-ad-close-header`                                                         | 1000         | [extensions/amp-lightbox/0.1/amp-lightbox.css](/extensions/amp-lightbox/0.1/amp-lightbox.css)                                                                           |
+| `amp-live-list > [update]`                                                                       | 1000         | [extensions/amp-live-list/0.1/amp-live-list.css](/extensions/amp-live-list/0.1/amp-live-list.css)                                                                       |
+| `.i-amphtml-mega-menu-mask-parent`                                                               | 1000         | [extensions/amp-mega-menu/0.1/amp-mega-menu.css](/extensions/amp-mega-menu/0.1/amp-mega-menu.css)                                                                       |
+| `amp-mega-menu`                                                                                  | 1000         | [extensions/amp-mega-menu/0.1/amp-mega-menu.css](/extensions/amp-mega-menu/0.1/amp-mega-menu.css)                                                                       |
+| `amp-user-notification`                                                                          | 1000         | [extensions/amp-user-notification/0.1/amp-user-notification.css](/extensions/amp-user-notification/0.1/amp-user-notification.css)                                       |
+| `wrapper`                                                                                        | 1000         | [src/bento/components/bento-lightbox/1.0/component.jss.js](/src/bento/components/bento-lightbox/1.0/component.jss.js)                                                   |
+| `bento-mega-menu`                                                                                | 1000         | [src/bento/components/bento-mega-menu/1.0/bento-mega-menu.css](/src/bento/components/bento-mega-menu/1.0/bento-mega-menu.css)                                           |
+| `mainNav`                                                                                        | 1000         | [src/bento/components/bento-mega-menu/1.0/component.jss.js](/src/bento/components/bento-mega-menu/1.0/component.jss.js)                                                 |
+| `mask`                                                                                           | 999          | [src/bento/components/bento-mega-menu/1.0/component.jss.js](/src/bento/components/bento-mega-menu/1.0/component.jss.js)                                                 |
+| `i-amphtml-app-banner-top-padding`                                                               | 15           | [extensions/amp-app-banner/0.1/amp-app-banner.css](/extensions/amp-app-banner/0.1/amp-app-banner.css)                                                                   |
+| `bannerPadding`                                                                                  | 15           | [extensions/amp-app-banner/1.0/component.jss.js](/extensions/amp-app-banner/1.0/component.jss.js)                                                                       |
+| `.amp-app-banner-dismiss-button`                                                                 | 14           | [extensions/amp-app-banner/0.1/amp-app-banner.css](/extensions/amp-app-banner/0.1/amp-app-banner.css)                                                                   |
+| `dismiss`                                                                                        | 14           | [extensions/amp-app-banner/1.0/component.jss.js](/extensions/amp-app-banner/1.0/component.jss.js)                                                                       |
+| `amp-app-banner`                                                                                 | 13           | [extensions/amp-app-banner/0.1/amp-app-banner.css](/extensions/amp-app-banner/0.1/amp-app-banner.css)                                                                   |
+| `amp-app-banner`                                                                                 | 13           | [extensions/amp-app-banner/1.0/amp-app-banner.css](/extensions/amp-app-banner/1.0/amp-app-banner.css)                                                                   |
+| `banner`                                                                                         | 13           | [extensions/amp-app-banner/1.0/component.jss.js](/extensions/amp-app-banner/1.0/component.jss.js)                                                                       |
+| `amp-sticky-ad-top-padding`                                                                      | 12           | [extensions/amp-sticky-ad/1.0/amp-sticky-ad.css](/extensions/amp-sticky-ad/1.0/amp-sticky-ad.css)                                                                       |
+| `style`                                                                                          | 11           | [extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js](/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js) |
+| `amp-sticky-ad`                                                                                  | 11           | [extensions/amp-sticky-ad/1.0/amp-sticky-ad.css](/extensions/amp-sticky-ad/1.0/amp-sticky-ad.css)                                                                       |
+| `.i-amphtml-autocomplete-results`                                                                | 10           | [extensions/amp-autocomplete/0.1/amp-autocomplete.css](/extensions/amp-autocomplete/0.1/amp-autocomplete.css)                                                           |
+| `.amp-carousel-button`                                                                           | 10           | [extensions/amp-carousel/0.1/amp-carousel.css](/extensions/amp-carousel/0.1/amp-carousel.css)                                                                           |
+| `.amp-carousel-button`                                                                           | 10           | [extensions/amp-carousel/0.2/amp-carousel.css](/extensions/amp-carousel/0.2/amp-carousel.css)                                                                           |
+| `amp-date-picker[mode="overlay"] .i-amphtml-date-picker-container`                               | 10           | [extensions/amp-date-picker/0.1/amp-date-picker.css](/extensions/amp-date-picker/0.1/amp-date-picker.css)                                                               |
+| `overlay['& .rdp']`                                                                              | 10           | [extensions/amp-date-picker/1.0/component.jss.js](/extensions/amp-date-picker/1.0/component.jss.js)                                                                     |
+| `.i-amphtml-story-spinner`                                                                       | 10           | [extensions/amp-story/1.0/amp-story.css](/extensions/amp-story/1.0/amp-story.css)                                                                                       |
+| `autocompleteResults`                                                                            | 10           | [src/bento/components/bento-autocomplete/1.0/component.jss.js](/src/bento/components/bento-autocomplete/1.0/component.jss.js)                                           |
+| `.i-amphtml-byside-content-loading-container .i-amphtml-byside-content-loading-animation:before` | 9            | [extensions/amp-byside-content/0.1/amp-byside-content.css](/extensions/amp-byside-content/0.1/amp-byside-content.css)                                                   |
+| `100%`                                                                                           | 9            | [extensions/amp-byside-content/0.1/amp-byside-content.css](/extensions/amp-byside-content/0.1/amp-byside-content.css)                                                   |
+| `.i-amphtml-story-ad-attribution`                                                                | 4            | [extensions/amp-story-auto-ads/0.1/amp-story-auto-ads-attribution.css](/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads-attribution.css)                           |
+| `.amp-story-draggable-drawer-root`                                                               | 4            | [extensions/amp-story-page-attachment/0.1/amp-story-draggable-drawer.css](/extensions/amp-story-page-attachment/0.1/amp-story-draggable-drawer.css)                     |
+| `.i-amphtml-image-slider-bar`                                                                    | 3            | [extensions/amp-image-slider/0.1/amp-image-slider.css](/extensions/amp-image-slider/0.1/amp-image-slider.css)                                                           |
+| `imageSliderBar`                                                                                 | 3 !important | [extensions/amp-image-slider/1.0/component.jss.js](/extensions/amp-image-slider/1.0/component.jss.js)                                                                   |
+| `styles`                                                                                         | 3            | [extensions/amp-story-interactive/0.1/amp-story-interactive-abstract.js](/extensions/amp-story-interactive/0.1/amp-story-interactive-abstract.js)                       |
+| `.i-amphtml-story-page-open-attachment`                                                          | 3            | [extensions/amp-story-page-attachment/0.1/amp-story-open-page-attachment.css](/extensions/amp-story-page-attachment/0.1/amp-story-open-page-attachment.css)             |
+| `.i-amphtml-story-page-attachment-active::after`                                                 | 3            | [extensions/amp-story-page-attachment/0.1/amp-story-page-attachment.css](/extensions/amp-story-page-attachment/0.1/amp-story-page-attachment.css)                       |
+| `amp-story-cta-layer`                                                                            | 3            | [extensions/amp-story/1.0/amp-story.css](/extensions/amp-story/1.0/amp-story.css)                                                                                       |
+| `.i-amphtml-element > [overflow]`                                                                | 2            | [css/ampshared.css](/css/ampshared.css)                                                                                                                                 |
+| `body noscript > *`                                                                              | 2            | [css/ampshared.css](/css/ampshared.css)                                                                                                                                 |
+| `.i-amphtml-fit-text-content`                                                                    | 2            | [extensions/amp-fit-text/0.1/amp-fit-text.css](/extensions/amp-fit-text/0.1/amp-fit-text.css)                                                                           |
+| `.i-amphtml-image-lightbox-caption`                                                              | 2            | [extensions/amp-image-lightbox/0.1/amp-image-lightbox.css](/extensions/amp-image-lightbox/0.1/amp-image-lightbox.css)                                                   |
+| `.i-amphtml-image-slider-hint`                                                                   | 2            | [extensions/amp-image-slider/0.1/amp-image-slider.css](/extensions/amp-image-slider/0.1/amp-image-slider.css)                                                           |
+| `imageSliderHint`                                                                                | 2            | [extensions/amp-image-slider/1.0/component.jss.js](/extensions/amp-image-slider/1.0/component.jss.js)                                                                   |
+| `.i-amphtml-story-interactive-disclaimer-icon`                                                   | 2            | [extensions/amp-story-interactive/0.1/amp-story-interactive-shadow.css](/extensions/amp-story-interactive/0.1/amp-story-interactive-shadow.css)                         |
+| `.i-amphtml-story-interactive-post-selection .i-amphtml-story-interactive-slider-bubble`         | 2            | [extensions/amp-story-interactive/0.1/amp-story-interactive-slider.css](/extensions/amp-story-interactive/0.1/amp-story-interactive-slider.css)                         |
+| `.i-amphtml-story-interactive-post-selection .i-amphtml-story-interactive-slider-bubble-wrapper` | 2            | [extensions/amp-story-interactive/0.1/amp-story-interactive-slider.css](/extensions/amp-story-interactive/0.1/amp-story-interactive-slider.css)                         |
+| `.i-amphtml-story-consent-header`                                                                | 2            | [extensions/amp-story/1.0/amp-story-consent.css](/extensions/amp-story/1.0/amp-story-consent.css)                                                                       |
+| `.i-amphtml-story-hint-container`                                                                | 2            | [extensions/amp-story/1.0/amp-story-hint.css](/extensions/amp-story/1.0/amp-story-hint.css)                                                                             |
+| `amp-story-grid-layer`                                                                           | 2            | [extensions/amp-story/1.0/amp-story.css](/extensions/amp-story/1.0/amp-story.css)                                                                                       |
+| `control`                                                                                        | 2            | [src/bento/components/bento-lightbox-gallery/1.0/component.jss.js](/src/bento/components/bento-lightbox-gallery/1.0/component.jss.js)                                   |
+| `.controls`                                                                                      | 1            | [css/amp-ima-video-iframe.css](/css/amp-ima-video-iframe.css)                                                                                                           |
+| `.amp-story-player-exit-control-button`                                                          | 1            | [css/amp-story-player-shadow.css](/css/amp-story-player-shadow.css)                                                                                                     |
+| `.i-amphtml-story-player-panel-next`                                                             | 1            | [css/amp-story-player-shadow.css](/css/amp-story-player-shadow.css)                                                                                                     |
+| `.i-amphtml-story-player-panel-prev`                                                             | 1            | [css/amp-story-player-shadow.css](/css/amp-story-player-shadow.css)                                                                                                     |
+| `.i-amphtml-layout-size-defined > [fallback]`                                                    | 1            | [css/ampshared.css](/css/ampshared.css)                                                                                                                                 |
+| `.i-amphtml-layout-size-defined > [placeholder]`                                                 | 1            | [css/ampshared.css](/css/ampshared.css)                                                                                                                                 |
+| `.i-amphtml-loading-container`                                                                   | 1            | [css/ampshared.css](/css/ampshared.css)                                                                                                                                 |
+| `.amp-video-eq`                                                                                  | 1            | [css/video-autoplay.css](/css/video-autoplay.css)                                                                                                                       |
+| `.i-amphtml-video-mask`                                                                          | 1            | [css/video-autoplay.css](/css/video-autoplay.css)                                                                                                                       |
+| `amp-addthis .i-amphtml-addthis-close`                                                           | 1            | [extensions/amp-addthis/0.1/amp-addthis.css](/extensions/amp-addthis/0.1/amp-addthis.css)                                                                               |
+| `.i-amphtml-base-carousel-arrow-icon`                                                            | 1            | [extensions/amp-base-carousel/0.1/amp-base-carousel.css](/extensions/amp-base-carousel/0.1/amp-base-carousel.css)                                                       |
+| `.i-amphtml-base-carousel-arrow-next-slot`                                                       | 1            | [extensions/amp-base-carousel/0.1/amp-base-carousel.css](/extensions/amp-base-carousel/0.1/amp-base-carousel.css)                                                       |
+| `.i-amphtml-base-carousel-arrow-prev-slot`                                                       | 1            | [extensions/amp-base-carousel/0.1/amp-base-carousel.css](/extensions/amp-base-carousel/0.1/amp-base-carousel.css)                                                       |
+| `.i-amphtml-base-carousel-arrows`                                                                | 1            | [extensions/amp-base-carousel/0.1/amp-base-carousel.css](/extensions/amp-base-carousel/0.1/amp-base-carousel.css)                                                       |
+| `.i-amphtml-carousel-arrows`                                                                     | 1            | [extensions/amp-carousel/0.2/amp-carousel.css](/extensions/amp-carousel/0.2/amp-carousel.css)                                                                           |
+| `dayPicker['& .rdp-caption_label']`                                                              | 1            | [extensions/amp-date-picker/1.0/component.jss.js](/extensions/amp-date-picker/1.0/component.jss.js)                                                                     |
+| `.i-amphtml-fit-text-measurer`                                                                   | 1            | [extensions/amp-fit-text/0.1/amp-fit-text.css](/extensions/amp-fit-text/0.1/amp-fit-text.css)                                                                           |
+| `.i-amphtml-image-lightbox-viewer`                                                               | 1            | [extensions/amp-image-lightbox/0.1/amp-image-lightbox.css](/extensions/amp-image-lightbox/0.1/amp-image-lightbox.css)                                                   |
+| `.i-amphtml-image-lightbox-viewer-image`                                                         | 1            | [extensions/amp-image-lightbox/0.1/amp-image-lightbox.css](/extensions/amp-image-lightbox/0.1/amp-image-lightbox.css)                                                   |
+| `.i-amphtml-image-slider-label-wrapper`                                                          | 1            | [extensions/amp-image-slider/0.1/amp-image-slider.css](/extensions/amp-image-slider/0.1/amp-image-slider.css)                                                           |
+| `.i-amphtml-image-slider-right-mask`                                                             | 1            | [extensions/amp-image-slider/0.1/amp-image-slider.css](/extensions/amp-image-slider/0.1/amp-image-slider.css)                                                           |
+| `imageSliderLabelWrapper`                                                                        | 1 !important | [extensions/amp-image-slider/1.0/component.jss.js](/extensions/amp-image-slider/1.0/component.jss.js)                                                                   |
+| `imageSliderRightMask`                                                                           | 1 !important | [extensions/amp-image-slider/1.0/component.jss.js](/extensions/amp-image-slider/1.0/component.jss.js)                                                                   |
+| `.i-amphtml-inline-gallery-pagination-count`                                                     | 1            | [extensions/amp-inline-gallery/0.1/amp-inline-gallery-pagination.css](/extensions/amp-inline-gallery/0.1/amp-inline-gallery-pagination.css)                             |
+| `.i-amphtml-inline-gallery-pagination-dot-container`                                             | 1            | [extensions/amp-inline-gallery/0.1/amp-inline-gallery-pagination.css](/extensions/amp-inline-gallery/0.1/amp-inline-gallery-pagination.css)                             |
+| `.i-amphtml-lbg-caption-scroll`                                                                  | 1            | [extensions/amp-lightbox-gallery/0.1/lightbox-caption.css](/extensions/amp-lightbox-gallery/0.1/lightbox-caption.css)                                                   |
+| `[i-amphtml-lbg-caption-state="clip"] + .i-amphtml-lbg-caption-mask`                             | 1            | [extensions/amp-lightbox-gallery/0.1/lightbox-caption.css](/extensions/amp-lightbox-gallery/0.1/lightbox-caption.css)                                                   |
+| `.i-amphtml-lbg-top-bar`                                                                         | 1            | [extensions/amp-lightbox-gallery/0.1/lightbox-controls.css](/extensions/amp-lightbox-gallery/0.1/lightbox-controls.css)                                                 |
+| `.i-amphtml-glass-pane`                                                                          | 1            | [extensions/amp-story-auto-ads/0.1/amp-story-auto-ads.css](/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads.css)                                                   |
+| `setStyles`                                                                                      | 1            | [extensions/amp-story-auto-ads/0.1/story-ad-button-text-fitter.js](/extensions/amp-story-auto-ads/0.1/story-ad-button-text-fitter.js)                                   |
+| `.i-amphtml-amp-story-captions-auto-append`                                                      | 1            | [extensions/amp-story-captions/0.1/amp-story-captions-presets.css](/extensions/amp-story-captions/0.1/amp-story-captions-presets.css)                                   |
+| `.i-amphtml-story-dev-tools-device-dialog-bg`                                                    | 1            | [extensions/amp-story-dev-tools/0.1/amp-story-dev-tools-tab-preview.css](/extensions/amp-story-dev-tools/0.1/amp-story-dev-tools-tab-preview.css)                       |
+| `.i-amphtml-story-interactive-img-quiz-answer-choice`                                            | 1            | [extensions/amp-story-interactive/0.1/amp-story-interactive-img-quiz.css](/extensions/amp-story-interactive/0.1/amp-story-interactive-img-quiz.css)                     |
+| `.i-amphtml-story-interactive-img-option-img`                                                    | 1            | [extensions/amp-story-interactive/0.1/amp-story-interactive-img.css](/extensions/amp-story-interactive/0.1/amp-story-interactive-img.css)                               |
+| `.i-amphtml-story-interactive-option-text`                                                       | 1            | [extensions/amp-story-interactive/0.1/amp-story-interactive-poll.css](/extensions/amp-story-interactive/0.1/amp-story-interactive-poll.css)                             |
+| `.i-amphtml-story-interactive-confetti-wrapper`                                                  | 1            | [extensions/amp-story-interactive/0.1/amp-story-interactive-shadow.css](/extensions/amp-story-interactive/0.1/amp-story-interactive-shadow.css)                         |
+| `.i-amphtml-story-interactive-slider-average-text`                                               | 1            | [extensions/amp-story-interactive/0.1/amp-story-interactive-slider.css](/extensions/amp-story-interactive/0.1/amp-story-interactive-slider.css)                         |
+| `.i-amphtml-story-interactive-slider-input`                                                      | 1            | [extensions/amp-story-interactive/0.1/amp-story-interactive-slider.css](/extensions/amp-story-interactive/0.1/amp-story-interactive-slider.css)                         |
+| `.i-amphtml-story-interactive-slider-input::-webkit-slider-thumb`                                | 1            | [extensions/amp-story-interactive/0.1/amp-story-interactive-slider.css](/extensions/amp-story-interactive/0.1/amp-story-interactive-slider.css)                         |
+| `.i-amphtml-story-draggable-drawer-header`                                                       | 1            | [extensions/amp-story-page-attachment/0.1/amp-story-draggable-drawer-header.css](/extensions/amp-story-page-attachment/0.1/amp-story-draggable-drawer-header.css)       |
+| `amp-story-subscriptions`                                                                        | 1            | [extensions/amp-story-subscriptions/0.1/amp-story-subscriptions.css](/extensions/amp-story-subscriptions/0.1/amp-story-subscriptions.css)                               |
+| `.i-amphtml-story-consent-actions`                                                               | 1            | [extensions/amp-story/1.0/amp-story-consent.css](/extensions/amp-story/1.0/amp-story-consent.css)                                                                       |
+| `.i-amphtml-story-hint-container .i-amphtml-story-hint-tap-button-icon`                          | 1            | [extensions/amp-story/1.0/amp-story-hint.css](/extensions/amp-story/1.0/amp-story-hint.css)                                                                             |
+| `amp-story-page[active]`                                                                         | 1            | [extensions/amp-story/1.0/amp-story.css](/extensions/amp-story/1.0/amp-story.css)                                                                                       |
+| `.i-amphtml-stream-gallery-next`                                                                 | 1            | [extensions/amp-stream-gallery/0.1/arrows.css](/extensions/amp-stream-gallery/0.1/arrows.css)                                                                           |
+| `.i-amphtml-stream-gallery-prev`                                                                 | 1            | [extensions/amp-stream-gallery/0.1/arrows.css](/extensions/amp-stream-gallery/0.1/arrows.css)                                                                           |
+| `arrow`                                                                                          | 1            | [extensions/amp-stream-gallery/1.0/component.jss.js](/extensions/amp-stream-gallery/1.0/component.jss.js)                                                               |
+| `arrow`                                                                                          | 1            | [src/bento/components/bento-base-carousel/1.0/component.jss.js](/src/bento/components/bento-base-carousel/1.0/component.jss.js)                                         |
+| `container['&$inset']`                                                                           | 1            | [src/bento/components/bento-inline-gallery/1.0/pagination.jss.js](/src/bento/components/bento-inline-gallery/1.0/pagination.jss.js)                                     |
+| `dotWrapper['&$inset']`                                                                          | 1            | [src/bento/components/bento-inline-gallery/1.0/pagination.jss.js](/src/bento/components/bento-inline-gallery/1.0/pagination.jss.js)                                     |
+| `numbersWrapper['&$inset']`                                                                      | 1            | [src/bento/components/bento-inline-gallery/1.0/pagination.jss.js](/src/bento/components/bento-inline-gallery/1.0/pagination.jss.js)                                     |
+| `controlsPanel`                                                                                  | 1            | [src/bento/components/bento-lightbox-gallery/1.0/component.jss.js](/src/bento/components/bento-lightbox-gallery/1.0/component.jss.js)                                   |
+| `eq`                                                                                             | 1            | [src/bento/components/bento-video/1.0/autoplay.jss.js](/src/bento/components/bento-video/1.0/autoplay.jss.js)                                                           |
+| `.i-amphtml-byside-content-loading-container .i-amphtml-byside-content-loading-animation:after`  | 0            | [extensions/amp-byside-content/0.1/amp-byside-content.css](/extensions/amp-byside-content/0.1/amp-byside-content.css)                                                   |
+| `0%`                                                                                             | 0            | [extensions/amp-byside-content/0.1/amp-byside-content.css](/extensions/amp-byside-content/0.1/amp-byside-content.css)                                                   |
+| `setStyle`                                                                                       | 0            | [extensions/amp-iframe/0.1/amp-iframe.js](/extensions/amp-iframe/0.1/amp-iframe.js)                                                                                     |
+| `.i-amphtml-image-lightbox-container`                                                            | 0            | [extensions/amp-image-lightbox/0.1/amp-image-lightbox.css](/extensions/amp-image-lightbox/0.1/amp-image-lightbox.css)                                                   |
+| `.i-amphtml-inline-gallery-pagination-dots`                                                      | 0            | [extensions/amp-inline-gallery/0.1/amp-inline-gallery-pagination.css](/extensions/amp-inline-gallery/0.1/amp-inline-gallery-pagination.css)                             |
+| `.i-amphtml-inline-gallery-pagination-numbers`                                                   | 0            | [extensions/amp-inline-gallery/0.1/amp-inline-gallery-pagination.css](/extensions/amp-inline-gallery/0.1/amp-inline-gallery-pagination.css)                             |
+| `[i-amphtml-lbg-caption-state="expand"] + .i-amphtml-lbg-caption-mask`                           | 0            | [extensions/amp-lightbox-gallery/0.1/lightbox-caption.css](/extensions/amp-lightbox-gallery/0.1/lightbox-caption.css)                                                   |
+| `.i-amphtml-story-interactive-quiz-option`                                                       | 0            | [extensions/amp-story-interactive/0.1/amp-story-interactive-quiz.css](/extensions/amp-story-interactive/0.1/amp-story-interactive-quiz.css)                             |
+| `.i-amphtml-story-interactive-slider-input-size::after`                                          | 0            | [extensions/amp-story-interactive/0.1/amp-story-interactive-slider.css](/extensions/amp-story-interactive/0.1/amp-story-interactive-slider.css)                         |
+| `.i-amphtml-story-consent-content`                                                               | 0            | [extensions/amp-story/1.0/amp-story-consent.css](/extensions/amp-story/1.0/amp-story-consent.css)                                                                       |
+| `amp-story-page`                                                                                 | 0            | [extensions/amp-story/1.0/amp-story.css](/extensions/amp-story/1.0/amp-story.css)                                                                                       |
+| `.amp-video-docked-placeholder-background`                                                       | 0            | [extensions/amp-video-docking/0.1/amp-video-docking.css](/extensions/amp-video-docking/0.1/amp-video-docking.css)                                                       |
+| `dots['&$inset']`                                                                                | 0            | [src/bento/components/bento-inline-gallery/1.0/pagination.jss.js](/src/bento/components/bento-inline-gallery/1.0/pagination.jss.js)                                     |
+| `numbers['&$inset']`                                                                             | 0            | [src/bento/components/bento-inline-gallery/1.0/pagination.jss.js](/src/bento/components/bento-inline-gallery/1.0/pagination.jss.js)                                     |
+| `.i-amphtml-carousel-spacer`                                                                     | -1           | [extensions/amp-base-carousel/0.1/carousel.css](/extensions/amp-base-carousel/0.1/carousel.css)                                                                         |
+| `.i-amphtml-mega-menu-mask`                                                                      | -1           | [extensions/amp-mega-menu/0.1/amp-mega-menu.css](/extensions/amp-mega-menu/0.1/amp-mega-menu.css)                                                                       |
+| `.i-amphtml-story-interactive-slider-bubble::after`                                              | -1           | [extensions/amp-story-interactive/0.1/amp-story-interactive-slider.css](/extensions/amp-story-interactive/0.1/amp-story-interactive-slider.css)                         |
+| `.i-amphtml-story-consent-logo::before`                                                          | -1           | [extensions/amp-story/1.0/amp-story-consent.css](/extensions/amp-story/1.0/amp-story-consent.css)                                                                       |
diff --git a/css/amp-story-player-shadow.css b/css/amp-story-player-shadow.css
index b132085a8f54..847628622b00 100644
--- a/css/amp-story-player-shadow.css
+++ b/css/amp-story-player-shadow.css
@@ -1,7 +1,5 @@
-
-
- /** See #23876 and #31363. */
- :host {
+/** See #23876 and #31363. */
+:host {
   all: initial;
   color: initial;
 }
@@ -43,7 +41,7 @@
   transform: translate3d(100%, 0, 0);
 }
 
-.i-amphtml-story-player-main-container .story-player-iframe[i-amphtml-iframe-position="-1"] {
+.i-amphtml-story-player-main-container .story-player-iframe[i-amphtml-iframe-position="-1"]{
   transform: translate3d(-100%, 0, 0);
 }
 
@@ -95,63 +93,66 @@
 }
 
 /* Override if iframe height is less than 756px. */
- .i-amphtml-story-player-panel.i-amphtml-story-player-panel-medium {
-    --i-amphtml-story-player-panel-responsive-margin: 0px;
-    --i-amphtml-story-player-panel-width: calc(var(--i-amphtml-story-player-height) * var(--i-amphtml-story-player-panel-ratio));
-  }
-
-  /* Override if iframe height is less than 538px. */
- .i-amphtml-story-player-panel.i-amphtml-story-player-panel-small  {
-    /** If changing this, also change amp-story-desktop-one-panel.css **/
-    --i-amphtml-story-player-panel-ratio: 36 / 53;
-  }
-
-  .i-amphtml-story-player-panel-prev,
-  .i-amphtml-story-player-panel-next {
-    position: absolute;
-    top: 50%;
-    transform: translateY(-50%);
-    width: 48px;
-    height: 48px;
-    z-index: 1;
-    background-color: transparent;
-    border: none;
-    background-position: center;
-    background-repeat: no-repeat;
-    cursor: pointer;
-    transition: 150ms opacity;
-  }
-
-  .i-amphtml-story-player-panel-prev[disabled],
-  .i-amphtml-story-player-panel-next[disabled] {
-    opacity: .1;
-    cursor: initial;
-  }
-
-  .i-amphtml-story-player-full-bleed-story .i-amphtml-story-player-panel-prev,
-  .i-amphtml-story-player-full-bleed-story .i-amphtml-story-player-panel-next,
-  :not(.i-amphtml-story-player-panel) .i-amphtml-story-player-panel-prev,
-  :not(.i-amphtml-story-player-panel) .i-amphtml-story-player-panel-next {
-    opacity: 0;
-    pointer-events: none;
-  }
-
-  .i-amphtml-story-player-panel-prev {
-    margin-inline-start: calc(var(--i-amphtml-story-player-panel-button-margin));
-    background-image: url('data:image/svg+xml;charset=utf-8,<svg width="16" height="16" viewBox="0 0 16 16" fill="white" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M4.66667 8L16 16V0L4.66667 8ZM0 16H2.66667V0H0V16Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M4.66667 8L16 16V0L4.66667 8ZM0 16H2.66667V0H0V16Z"/></svg>')!important;
-  }
-
-  .i-amphtml-story-player-panel-next {
-    margin-inline-end: var(--i-amphtml-story-player-panel-button-margin);
-    background-image: url('data:image/svg+xml;charset=utf-8,<svg width="16" height="16" viewBox="0 0 16 16" fill="white" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M11.3333 8L0 16V0L11.3333 8ZM16 16H13.3333V0H16V16Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M11.3333 8L0 16V0L11.3333 8ZM16 16H13.3333V0H16V16Z"/></svg>')!important;
-    right: 0;
-  }
-
-  [dir="rtl"].i-amphtml-story-player-panel-prev {
-    right: 0;
-  }
-
-  [dir="rtl"].i-amphtml-story-player-panel-next {
-    background-image: url('data:image/svg+xml;charset=utf-8,<svg width="16" height="16" viewBox="0 0 16 16" fill="white" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M4.66667 8L16 16V0L4.66667 8ZM0 16H2.66667V0H0V16Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M4.66667 8L16 16V0L4.66667 8ZM0 16H2.66667V0H0V16Z"/></svg>')!important;
-    left: 0;
-  }
+.i-amphtml-story-player-panel.i-amphtml-story-player-panel-medium {
+  --i-amphtml-story-player-panel-responsive-margin: 0px;
+  --i-amphtml-story-player-panel-width: calc(var(--i-amphtml-story-player-height) * var(--i-amphtml-story-player-panel-ratio));
+}
+
+/* Override if iframe height is less than 538px. */
+.i-amphtml-story-player-panel.i-amphtml-story-player-panel-small {
+  /** If changing this, also change amp-story-desktop-one-panel.css **/
+  --i-amphtml-story-player-panel-ratio: 36 / 53;
+}
+
+.i-amphtml-story-player-panel-prev,
+.i-amphtml-story-player-panel-next {
+  position: absolute;
+  top: 50%;
+  transform: translateY(-50%);
+  width: 48px;
+  height: 48px;
+  z-index: 1;
+  background-color: transparent;
+  border: none;
+  background-position: center;
+  background-repeat: no-repeat;
+  cursor: pointer;
+  transition: 150ms opacity;
+}
+
+.i-amphtml-story-player-panel-prev[disabled],
+.i-amphtml-story-player-panel-next[disabled] {
+  opacity: .1;
+  cursor: initial;
+}
+
+.i-amphtml-story-player-full-bleed-story .i-amphtml-story-player-panel-prev,
+.i-amphtml-story-player-full-bleed-story .i-amphtml-story-player-panel-next,
+:not(.i-amphtml-story-player-panel) > .i-amphtml-story-player-panel-prev,
+:not(.i-amphtml-story-player-panel) > .i-amphtml-story-player-panel-next {
+  opacity: 0;
+  pointer-events: none;
+}
+
+.i-amphtml-story-player-panel-prev, .i-amphtml-story-player-panel-next {
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" fill="none"><path stroke="#fff" stroke-linecap="round" stroke-width="1.9" d="M17 29.2V18.8c0-1.2 1.4-2 2.5-1.3l7.5 5.2c1 .6 1 2 0 2.6l-7.5 5.2c-1 .7-2.5 0-2.5-1.3Z"/><rect width="1.8" height="15.6" x="30.2" y="16.2" fill="#fff" rx=".9"/></svg>') !important;
+}
+
+.i-amphtml-story-player-panel-prev {
+  margin-inline-start: calc(var(--i-amphtml-story-player-panel-button-margin));
+  transform: translateY(-50%) rotate(180deg);
+}
+
+.i-amphtml-story-player-panel-next {
+  margin-inline-end: var(--i-amphtml-story-player-panel-button-margin);
+  right: 0;
+}
+
+[dir="rtl"].i-amphtml-story-player-panel-prev {
+  right: 0;
+}
+
+[dir="rtl"].i-amphtml-story-player-panel-next {
+  left: 0;
+  transform: translateY(-50%) rotate(180deg);
+}
diff --git a/css/ampshared.css b/css/ampshared.css
index 572aca7f9b28..e2c711a0d352 100644
--- a/css/ampshared.css
+++ b/css/ampshared.css
@@ -493,6 +493,11 @@ amp-analytics, amp-story-auto-ads, amp-auto-ads {
   visibility: hidden;
 }
 
+/* Blocked rendering until amp-story.css is installed. Info on #37990. */
+amp-story {
+  visibility: hidden !important;
+}
+
 html.i-amphtml-fie > amp-analytics {
   /* Remove position fixed if it's in iframe.
   * So runtime can measure layoutBox correctly
diff --git a/docs/build-on-duty.md b/docs/build-on-duty.md
index 4ca35d8fbfbb..ce2eecd0cc69 100644
--- a/docs/build-on-duty.md
+++ b/docs/build-on-duty.md
@@ -20,7 +20,9 @@ Make sure you are a member of the [#contributing](https://amphtml.slack.com/mess
                 - For an integration test failing on a specific browser, add the corresponding `skip` function (e.g. `skipEdge()`). See the `skipXXX` functions in [testing/test-config.js](https://github.com/ampproject/amphtml/blob/main/testing/test-config.js) for details.
             - Restart the failing parts of the build build on CircleCI by clicking the `Rerun workflow from failed` button on the build page (you must be signed into GitHub).
         - If the issue is due to a real breakage, work with the appropriate owner to rollback the offending PR. Rollbacks are preferable to fixes because fixes can often cause their own breakages.
-2. Keep an eye on incoming [Renovate PRs](https://github.com/ampproject/amphtml/pulls/renovate-bot), which result from an automated process to update our dependencies.
+2. [Triage new issues](https://github.com/ampproject/amphtml/issues), especially [unassigned ones](https://github.com/ampproject/amphtml/issues?q=is%3Aissue+is%3Aopen+no%3Aassignee)
+    - You are not expected to fix all of these issues, just make sure they are assigned to an individual or a relevant working group.
+3. Keep an eye on incoming [Renovate PRs](https://github.com/ampproject/amphtml/pulls/renovate-bot), which result from an automated process to update our dependencies.
     1. Make sure that the PR updates both package.json and package-lock.json
     2. Check the CircleCI logs for the PR for any new failures or unexpected results
         - If there’s a failure due to a flaky test, try restarting the job that failed
diff --git a/docs/building-a-bento-amp-extension.md b/docs/building-a-bento-amp-extension.md
deleted file mode 100644
index 9909c8f0822c..000000000000
--- a/docs/building-a-bento-amp-extension.md
+++ /dev/null
@@ -1,814 +0,0 @@
-# Building a Bento AMP Component
-
-AMP is extendable, allowing the creation of custom elements and functionality in form of AMP components. For example, AMP provides `amp-accordion`, `amp-base-carousel` and `amp-sidebar` as components, extending AMP.
-
-Bento AMP is a project that allows you to take AMP components and use them in otherwise non-AMP pages. The only requirement of a Bento component is that is be fully functional on non-AMP pages.
-
-Read this document to learn how to create a new Bento AMP component.
-
-<!--
-  (Do not remove or edit this comment.)
-
-  This table-of-contents is automatically generated. To generate it, run:
-    amp markdown-toc --fix
--->
-
-<!-- {"maxdepth": 2} -->
-
--   [Getting started](#getting-started)
-    -   [Naming](#naming)
-    -   [Directory structure](#directory-structure)
-    -   [Versioning](#versioning)
-    -   [Updating build configs](#updating-build-configs)
--   [Extend AMP.PreactBaseElement](#extend-amppreactbaseelement)
-    -   [AMP/Preact Bridge](#amppreact-bridge)
-    -   [Actions and events](#actions-and-events)
-    -   [PreactBaseElement callbacks](#preactbaseelement-callbacks)
-    -   [Element and Component classes](#element-and-component-classes)
-    -   [Loading state](#loading-state)
-    -   [Element styling](#element-styling)
-    -   [Layouts supported in your element](#layouts-supported-in-your-element)
-    -   [Register element with AMP](#register-element-with-amp)
--   [Validation, Testing and Experiment](#validation-testing-and-experiment)
-    -   [Allowing proper validation](#allowing-proper-validation)
-    -   [Performance considerations](#performance-considerations)
-    -   [Unit tests](#unit-tests)
-    -   [Type checking](#type-checking)
-    -   [Experiments](#experiments)
--   [Documentation and Examples](#documentation-and-examples)
-    -   [Documenting your extended Bento component](#documenting-your-extended-bento-component)
-    -   [Build an example](#build-an-example)
--   [Checklist for PR](#checklist-for-pr)
-    -   [Linting and formatting](#linting-and-formatting)
-    -   [Update YAML Metadata](#update-yaml-metadata)
-    -   [Code Ownership](#code-ownership)
--   [Example PRs](#example-prs)
-
-## Getting started
-
-The first step to creating a new Bento AMP component is familiarizing yourself with [AMP's contributor guidelines](https://go.amp.dev/contribute/code). Adding new components follow the [process for making a significant change](https://go.amp.dev/contribute/code#process-for-significant-changes). This process includes filing an ["Intent to Implement" issue](https://go.amp.dev/i2i) and working with an assigned AMP developer guide before starting significant work.
-
-If the contribution of a Bento component involves porting an existing component to a new version, and is expected to span multiple PRs, it is recommended to track progress with a [Bento tracking issue](https://github.com/ampproject/amphtml/issues/new?assignees=&labels=WG%3A+bento&template=bento-component-tracker.yml&title=%F0%9F%8D%B1+%5Bamp-component-name%3Aversion%5D+Bento+tracking+issue).
-
-### Naming
-
-All Bento AMP component extensions have their tag names prefixed with `amp-`.
-Make sure to choose an accurate and clear name for your extension.
-
-Extensions that embed a third-party service must follow the [guidelines for naming a third-party component](../docs/spec/amp-3p-naming.md).
-
-To bootstrap the creation of a new component (or the Bento version of an existing component), the following command will create the directory structure and boilerplate code for you:
-
-```shell
-$ amp make-extension --bento --name=amp-my-element
-```
-
-This generates CSS used by the AMP element `<amp-my-element>`, and JSS used by the Preact component `<MyElement>`. To exclude either, you may additionally specify `--nocss` and/or `--nojss`.
-
-### Directory structure
-
-Create your extension's files inside the `extensions/` directory.
-The directory structure is below:
-
-```sh
-/extensions/amp-my-element/
-├── 1.0/
-|   ├── storybook/                       # Element's manual sample playground (req'd)
-|   |   ├── Basic.js                     # Preact usage examples
-|   |   ├── Basic.amp.js                 # AMP usage examples
-|   ├── test/                            # Element's unit test suite (req'd)
-|   |   ├── test-amp-my-element.js
-|   |   └── More test JS files (optional)
-|   ├── base-element.js                  # Preact base element (req'd)
-|   ├── component.js                     # Preact implementation (req'd)
-|   ├── component.type.js                # Preact type definitions (req'd)
-|   ├── amp-my-element.js                # Element's implementation (req'd)
-|   ├── amp-my-element.css               # Custom CSS (optional)
-|   ├── component.jss.js                 # Preact JSS (optional)
-|   └── More JS files (optional)
-├── validator-amp-my-element.protoascii  # Validator rules (req'd)
-├── amp-my-element.md                    # Element's main documentation (req'd)
-└── More documentation in .md files (optional)
-└── OWNERS                               # Owners file. Primary contact(s) for the extension. (req'd)
-```
-
-In most cases you'll only create the required (req'd) files. If your element does not need custom CSS or JSS, you don't need to create those files.
-
-### Versioning
-
-AMP runtime is currently in v0 major version. Extensions versions are maintained separately. If your changes to your non-experimental
-extension makes breaking changes that are not backward compatible you should release a new version of your extension. This would usually be by creating a [0.2 or 1.0](./spec/amp-versioning-policy.md#amp-extensions) directory next to your 0.1.
-
-When version 0.2 is under development, make sure that `latestVersion` is set to 0.1 for both the 0.1 and 0.2 entries in `extensionBundles`. Once 0.2 is ready to be released, `latestVersion` can be changed to 0.2.
-
-If your extension is still in experiments breaking changes usually are fine so you can just update the same version.
-
-Note that Bento upgrades to existing AMP components should go by one major version, meaning it should create a 1.0 directory next to an existing 0.1 or 0.2.
-
-### Updating build configs
-
-You must make changes to [`build-system/compile/bundles.config.extensions.json`](../build-system/compile/bundles.config.extensions.json) for your Bento component to successfully build. You will need to add an entry in the top-level array.
-
-```javascript
-exports.extensionBundles = [
-...
-  {
-    "name": "amp-carousel",
-    "version": "0.1",
-    "latestVersion": "0.1",
-    "options": {
-      "hasCss": true
-    }
-  },
-  {
-    "name": "amp-kaltura-player",
-    "version": "0.1",
-    "latestVersion": "0.1",
-  },
-...
-];
-```
-
-The entry for your component must have `options.wrapper = "bento"`. It may optionally include `options.npm = true` to publish the Preact component portion on npm automatically, following AMP's [release schedule](./release-schedule.md).
-
-```diff
-exports.extensionBundles = [
-...
-  {
-    "name": "amp-my-element",
-    "version": "1.0",
-    "latestVersion": "1.0",
-    "options": {
-+     "npm": true,
-+     "wrapper": "bento"
-    }
-  },
-...
-];
-```
-
-Note, if you are providing a version upgrade (pre-existing 0.1 to Bento 1.0, for example), it is important to note that the latest version is the 0.1 until the 1.0 version is no longer experimental and fully launched. The following is an example of two version entries for one component:
-
-```diff
-exports.extensionBundles = [
-...
-  {
-    "name": "amp-my-element",
-    "version": "0.1",
-    "latestVersion": "0.1",
-    "options": {
-      "hasCss": true
-    }
-  },
-  {
-    "name": "amp-my-element",
-    "version": "1.0",
-+   "latestVersion": "0.1",
-    "options": {
-      "npm": true,
-      "wrapper": "bento"
-    }
-  },
-...
-];
-```
-
-## Extend AMP.PreactBaseElement
-
-All Preact-based Bento AMP extensions extend `AMP.PreactBaseElement`. Bento AMP extensions differ from classic AMP extensions because they are self-managing and independent, and therefore usable in a wider range of contexts beyond AMP pages, while still being fully integrated with the AMP environment when used in a fully AMP document.
-
-Important: Bento-enabled AMP components built upon a Preact component must also be usable in insolation in React development contexts.
-
-The configurations which bridge the Preact implementation of the component and its custom element counterpart in an HTML or AMP document are explained in the [AMP/Preact Bridge](#amppreact-bridge) section, and the callbacks which handle AMP- and DOM- specific mutability traits are explained in the [PreactBaseElement Callbacks](#preactbaseelement-callbacks) section. All of these are also explained inline in the [PreactBaseElement](https://github.com/ampproject/amphtml/blob/main/src/preact/base-element.js) class.
-
-### AMP/Preact Bridge
-
-#### PreactBaseElement['Component']
-
--   **Default**: Required.
--   **Override**: Always.
--   **Usage**: Define the corresponding Preact functional component.
--   **Example Usage**: `amp-fit-text`, `amp-timeago`
-
-#### PreactBaseElement['props']
-
--   **Default**: Optional.
--   **Override**: Almost always.
--   **Usage**: Define the mapping of Preact prop to AmpElement DOM attributes and children. These will update and re-render the component on DOM mutation.
--   **Example Usage**: `amp-base-carousel`, `amp-lightbox`
-
-#### PreactBaseElement['staticProps']
-
--   **Default**: Optional.
--   **Override**: Almost always.
--   **Usage**: Define the mapping of Preact prop to AmpElement DOM attributes. These will not update or re-render the component on DOM mutation. Can be used in lieu of init().
--   **Example Usage**: n/a
-
-#### PreactBaseElement['layoutSizeDefined']
-
--   **Default**: Optional.
--   **Override**: Sometimes.
--   **Usage**: Specify that the component requires `layoutSizeDefined`, meaning it can have a layout of any of the following: `fixed`, `fixed-height`, `responsive`, `fill`, `flex-item`, `fluid`, or `intrinsic`. Learn more about how to use this in [Layouts supported in your element](#layouts-supported-in-your-element) or generally with [layouts in AMP](https://amp.dev/documentation/guides-and-tutorials/learn/amp-html-layout).
--   **Example Usage**: n/a
-
-#### PreactBaseElement['loadable']
-
--   **Default**: Optional.
--   **Override**: Required for any component that makes network requests (directly or via other DOM elements). Optional otherwise.
--   **Usage**: Indicates a resource intensive component to allow granular control of when it should load and unload.
--   **Example Usage**: `amp-instagram`, `amp-video`
-
-#### PreactBaseElement['shadowCss']
-
--   **Default**: Optional.
--   **Override**: Required CSS when using shadow DOM.
--   **Usage**: Define the CSS for shadow stylesheets.
--   **Example Usage**: `amp-lightbox`, `amp-sidebar`
-
-#### PreactBaseElement['usesShadowDom']
-
--   **Default**: Optional.
--   **Override**: Rarely.
--   **Usage**: Notify when the element uses the Shadow DOM.
--   **Example Usage**: `amp-social-share`, `amp-youtube`
-
-#### PreactBaseElement['usesTemplate']
-
--   **Default**: Optional.
--   **Override**: Rarely.
--   **Usage**: Notify when the element uses the template system.
--   **Example Usage**: `amp-date-countdown`, `amp-date-display`
-
-#### Ways to process children (mutually exclusive)
-
-##### PreactBaseElement['lightDomTag']
-
--   **Default**: Optional.
--   **Override**: Sometimes.
--   **Usage**: The tag name used when rendering into the light DOM. Used when children contents are overwritten.
--   **Example Usage**: `amp-date-countdown`, `amp-date-display`
-
-##### PreactBaseElement['detached']
-
--   **Default**: Optional.
--   **Override**: Sometimes.
--   **Usage**: Define if user-supplied children must be referenced and coordinated with the internal state of the Preact component, but the component itself should not be visible (in favor of viewing the light DOM children).
--   **Example Usage**: `amp-accordion`, `amp-selector`
-
-### Actions and events
-
-AMP provides a framework for [elements to fire their own events](https://github.com/ampproject/amphtml/blob/main/docs/spec/amp-actions-and-events.md) to allow users of that element to listen and react to the events. For example, the `amp-base-carousel` extension fires a `slideChange` event. This allow publishers to listen to that event and react to it, for example, by updating an `amp-selector` state to match the current slide shown.
-
-The other part of the event-system in AMP is actions. When listening to an event on an element usually you'd like to trigger an action (possibly on other elements). For example, in the example above, the publisher is executing the `toggle` action on `amp-selector`.
-
-The syntax for using this on elements is as follow:
-
-```html
-<amp-base-carousel
-  on="slideChange:my-selector.toggle(index=e.index, value=true)"
-></amp-base-carousel>
-```
-
-To fire events on your element use AMP's action service and the
-`.trigger` method.
-
-```javascript
-actionServiceForDoc(doc.documentElement).trigger(
-  this.element_,
-  'slideChange',
-  createCustomEvent(
-    win,
-    `amp-base-carousel.${name}`,
-    dict({'index': index})
-  ),
-  ActionTrust.DEFAULT
-);
-```
-
-And to expose actions use `registerApiAction` method that your element inherits from `PreactBaseElement`. Note, this should correspond directly with the API exposed in the corresponding Preact compnent via [`useImperativeHandle`](https://reactjs.org/docs/hooks-reference.html#useimperativehandle), and the component should be defined using a [`forwardRef`](https://preactjs.com/guide/v10/switching-to-preact/#forwardref) accordingly.
-
-```javascript
-this.registerApiAction('close', (api) => api.close());
-```
-
-Your element can choose to override the default `activate` method inherited from BaseElement. For example `amp-lightbox` overrides `activate` to define the `open` default case.
-
-You must document your element's actions and events in its own reference documentation and in [`AMP Actions and Events`](https://github.com/ampproject/amphtml/blob/main/docs/spec/amp-actions-and-events.md).
-
-### PreactBaseElement callbacks
-
-#### checkPropsPostMutations
-
--   **Default**: Optional.
--   **Override**: Rarely.
--   **Usage**: The callback called immediately after a component's defined props mutate. This can verify if any additional properties need mutations via `mutateProps()` API.
--   **Example Usage**: `amp-date-display`
-
-#### isReady
-
--   **Default**: Optional.
--   **Override**: Rarely.
--   **Usage**: States whether the element is ready for rendering. Used if there are additional processing requirements needed before rendering the component. This includes providing rendering templates or defining critical asynchronous props.
--   **Example Usage**: `amp-date-countdown`, `amp-date-display`
-
-#### init
-
--   **Default**: Optional.
--   **Override**: Sometimes, if additional processing is needed in the DOM.
--   **Usage**: If your extension 'props' definition is not sufficient, or when registering AMP actions and events.
--   **Example Usage**: `amp-base-carousel`, `amp-lightbox`
-
-#### handleOnLoading
-
--   **Default**: Optional.
--   **Override**: Sometimes
--   **Usage**: Method to override to customize the display of the Placeholder/Fallback/Loader
--   **Example Usage**: `amp-render`
-
-#### handleOnLoad
-
--   **Default**: Optional.
--   **Override**: Sometimes
--   **Usage**: Method to override to customize the display of the Placeholder/Fallback/Loader
--   **Example Usage**: `amp-render`, `amp-iframe`
-
-#### handleOnError
-
--   **Default**: Optional.
--   **Override**: Sometimes
--   **Usage**: Method to override to customize the display of the Placeholder/Fallback/Loader
--   **Example Usage**: `amp-render`
-
-#### mutationObserverCallback
-
--   **Default**: Optional.
--   **Override**: Sometimes, if additional processing is needed to make the DOM mutable.
--   **Usage**: A callback called immediately after mutations have been observed on a component. This differs from `checkPropsPostMutations` in that it is called in all cases of mutation, not just the subset of attributes configured in the extension 'props' definition.
--   **Example Usage**: `amp-base-carousel`, `amp-sidebar`
-
-#### updatePropsForRendering
-
--   **Default**: Optional.
--   **Override**: Sometimes, if additional processing is needed in the DOM.
--   **Usage**: A callback called to compute props before rendering. The properties computed here are ephemeral and thus should not persist via a `mutateProps()` method.
--   **Example Usage**: `amp-timeago`
-
-### Element and Component classes
-
-The following shows the overall structure of your element implementation file (`extensions/amp-my-element/1.0/amp-my-element.js`). See [Experiments](#experiments) to make sure your component is experimentally gated if necessary.
-
-```js
-import {func1, func2} from '../../../src/module';
-import {BaseElement} from './base-element'; // Preact base element.
-import {CSS} from '../../../build/amp-my-element-1.0.css';
-// more ES2015-style import statements.
-
-/** @const */
-const EXPERIMENT = 'amp-my-element';
-
-/** @const */
-const TAG = 'amp-my-element';
-
-class AmpMyElement extends BaseElement {
-  /** @override */
-  init() {
-    // Perform any additional processing of prop values that are not
-    // straightforward attribute passthroughs, as well as AMP-specific
-    // work such as registering actions and events.
-    this.registerApiAction('close', (api) => api.close());
-
-    const processedProp = parseInt(element.getAttribute('data-binary'), 2);
-    return dict({
-      'processedProp': processedProp,
-      'onClose': (event) => fireAmpEvent(event)}
-    );
-  }
-
-  /** @override */
-  isLayoutSupported(layout) {
-    return layout == LAYOUT.FIXED;
-  }
-}
-
-AMP.extension('amp-my-element', '1.0', (AMP) => {
-  AMP.registerElement('amp-my-element', AmpMyElement, CSS);
-});
-```
-
-The following shows the corresponding overall structure of your Preact base element implementation file (`extensions/amp-my-element/1.0/base-element.js`).
-
-```js
-import {MyElement} from './component'; // Preact component.
-import {PreactBaseElement} from '#preact/base-element'; // Custom element bridge to Preact.
-
-export class BaseElement extends PreactBaseElement {}
-
-BaseElement['Component'] = MyElement;            // Component definition.
-
-BaseElement['props'] = {                         // Map DOM attributes and children to Preact Component props.
-  'button': {selector: 'button', clone: true}    // All <button> children.
-  'children': {passthrough: true}                // All remaining children excluding <button>s, which have already been distributed.
-  'propName1': {attr: 'attr-name-1'},
-  'propName2': {attr: 'attr-name-2', type: 'number'},
-};
-```
-
-Note: AMP Layout attributes like ‘layout’, ‘height’, ‘heights’, ‘width’, ‘media’, etc are not needed to be mapped as they will be intrinsically passed to the Preact component.
-
-The following shows the corresponding overall structure of your Preact functional component implementation file (`extensions/amp-my-element/1.0/component.js`).
-
-```js
-import * as Preact from '#preact';
-import {func1, func2} from '../../../src/module';
-// more ES2015-style import statements.
-
-export function MyElement({propName1, propName2, ...rest}) {
-  // Assign state variables or other behaviors using Preact
-  // lifecycle hooks such as useRef, useState, useEffect, etc.
-  const [foo, useFoo] = useState(null);
-
-  // Render component via JSX syntax.
-  return (
-    <div>Hello world</div>
-  );
-}
-```
-
-### Loading state
-
-For components that may load asynchronously, be sure to support `onLoading`, `onLoad`, and `onError` callbacks as props on your Preact component to allow components to fail gracefully.
-
-By default, `PreactBaseElement` provides callbacks which do the following from the AMP layer:
-
--   `onLoading` toggles on a loader
--   `onLoad` toggles off any loaders, placeholders, or fallbacks
--   `onError` toggles on the fallpack (or, if unavailable, the placeholder)
-
-Your Preact component **must** invoke the `onLoad()` callback once your component has loaded. This is especially important for components that display content dynamically, for example through an iframe or after fetching remote data, because they may take time to load which would affect perceived performance.
-
-Your Preact component _should_ invoke the `onLoading()` and `onError()` callbacks so document authors in any environment can implement graceful behavior when appropriate.
-
-Your AMP extension may customize this behavior by overriding the `handleOnLoading()` / `handleOnLoad()` / `handleOnError()` methods in your AMP extension's class.
-
-### Element styling
-
-You can write a stylesheet to style your element to provide a minimal visual appeal. Your element structure should account for whether you want users (publishers and developers using your element) to customize the default styling you're providing and allow for easy CSS classes and/or well-structure DOM elements.
-
-Element styles load with the element script inside an AMP document. You tell AMP which CSS or JSS belongs to this element when [registering the element](#register-element-with-AMP).
-
-#### Pre-upgrade CSS
-
-Bento components must specify certain layout properties in order to prevent [Cumulative Layout Shift (CLS)](https://web.dev/cls) when in use on non-AMP pages. The following are a standard set of pre-upgrade styles to be used when no AMP runtime or boilerplate--which typically provides this measure of stability for the document author--are not in use:
-
-```css
-/* amp-my-element.css */
-
-/*
- * Pre-upgrade:
- * - display:block element
- * - size-defined element
- */
-amp-my-element {
-  display: block;
-  overflow: hidden;
-  position: relative;
-}
-
-/* Pre-upgrade: size-defining element - hide text. */
-amp-my-element:not(.i-amphtml-built) {
-  color: transparent !important;
-}
-
-/* Pre-upgrade: size-defining element - hide children. */
-amp-my-element:not(.i-amphtml-built)
-  > :not([placeholder]):not([slot='i-amphtml-svc']) {
-  display: none;
-  content-visibility: hidden;
-}
-```
-
-### Layouts supported in your element
-
-AMP defines different layouts that elements can choose whether or not to support. Your element needs to announce which layouts it supports through overriding the `isLayoutSupported(layout)` callback and returning true if the element supports that layout. [Read more about AMP Layout System](https://github.com/ampproject/amphtml/blob/main/docs/spec/amp-html-layout.md) and [Layout Types](https://github.com/ampproject/amphtml/blob/main/docs/spec/amp-html-layout.md#layout).
-
-#### What layout should your element support?
-
-After understanding each layout type, if it makes sense, support all of them. Otherwise choose what makes sense to your element. A popular support choice is to support size-defined layouts (Fixed, Fixed Height, Responsive and Fill) through using the utility `isLayoutSizeDefined` in `layout.js`.
-
-For example, `amp-inline-gallery-thumbnails` only supports fixed-height layout.
-
-```javascript
-class AmpPixel extends BaseElement {
-  /** @override */
-  isLayoutSupported(layout) {
-    return layout == Layout.FIXED_HEIGHT;
-  }
-}
-```
-
-While `amp-base-carousel` supports all size-defined layouts.
-
-```javascript
-class AmpBaseCarousel extends AMP.BaseElement {
-  /** @override */
-  isLayoutSupported(layout) {
-    return isLayoutSizeDefined(layout);
-  }
-}
-```
-
-Please note that for components that support all size-defined layouts, they also need to override the `layoutSizeDefined` property as follows:
-
-```javascript
-/** @override */
-AmpBaseCarousel['layoutSizeDefined'] = true;
-```
-
-### Register element with AMP
-
-Once you have implemented your AMP element, you need to register it with AMP; all AMP component extensions include the `amp-` prefix.
-
-One way to specify the appropriate styles is to tell AMP which class to use for this tag name and which CSS to load.
-
-```javascript
-import {CSS} from '../../../build/amp-my-element-1.0.css';
-
-AMP.extension('amp-my-element', '1.0', (AMP) => {
-  AMP.registerElement('amp-my-element', AmpMyElement, CSS);
-});
-```
-
-Alternatively, you may have defined styles via JSS that compile into CSS and attached via the shadow stylesheet. To tell AMP which class to use, override the `shadowCss` property:
-
-```javascript
-import {CSS} from './my-element.jss';
-
-/** @override */
-AmpMyElement['shadowCss'] = CSS;
-```
-
-## Validation, Testing and Experiment
-
-### Allowing proper validation
-
-One of AMP's features is static validation on AMP document markup. When you implement your element, you must update the [AMP Validator](https://github.com/ampproject/amphtml/blob/main/validator/README.md) to include rules for your element. Otherwise documents using your extended component become invalid. Create your own rules by following the directions at [Contributing Component Validator Rules](https://github.com/ampproject/amphtml/blob/main/docs/component-validator-rules.md).
-
-When converting an existing component to Bento with a version bump, it suffices to copy existing validator tests if applicable for APIs that stay stable between versions. When copying test files, be sure to change the version of the extension being imported.
-
-In simple terms:
-
-1. Modify the spec in the `.protoascii` file, using satisfies and excludes to differentiate restrictiveness between `0.1` and `1.0` versions
-2. Copy the existing `validator-amp-my-element.html` and `validator-amp-my-element.out` files from the `0.1/test` directory to the `1.0/test` directory
-3. Manually update the script imported from the copied test files to `1.0`
-
-In some cases, the validator rules for a `0.1` counterpart may allow for less strict usage of the component, such as with `requires_usage: EXEMPTED` or `deprecated_allow_duplicates: true`. The `1.0` version should reintroduce these restrictions by differentiating the versions via `satisfies` and `excludes`. [The validation PR for `amp-social-share`](https://github.com/ampproject/amphtml/pull/33478) serves as a useful reference and example for how to execute this change.
-
-For example, changes to the Bento `amp-soundcloud` .protoascii should look as follows:
-
-```diff
-+ tags: {  # amp-soundcloud 1.0
-+   html_format: AMP
-+   tag_name: "SCRIPT"
-+   satisfies: "amp-soundcloud 1.0"
-+   excludes: "amp-soundcloud 0.1"
-+   extension_spec: {
-+     name: "amp-soundcloud"
-+     version_name: "v1.0"
-+     version: "1.0"
-+   }
-+   attr_lists: "common-extension-attrs"
-+ }
-tags: {  # amp-soundcloud 0.1 and latest
-  html_format: AMP
-  tag_name: "SCRIPT"
-+   satisfies: "amp-soundcloud 0.1"
-+   excludes: "amp-soundcloud 1.0"
-  extension_spec: {
-    name: "amp-soundcloud"
-+     version_name: "v0.1"
-    version: "0.1"
-    version: "latest"
-    requires_usage: EXEMPTED
-    deprecated_allow_duplicates: true
-  }
-  attr_lists: "common-extension-attrs"
-}
-```
-
-### Performance considerations
-
-#### Loading external resources
-
-You may need to add third party integration for extended components that need to load external resources, such as an SDK. Loading resources is only allowed inside a third party iframe. AMP serves this on a different domain for security and performance reasons. Take a look at adding [`amp-facebook`](https://github.com/ampproject/amphtml/pull/1479/) extension PR for examples of third party integration, and pair it with the [Bento contribution for `amp-facebook`](https://github.com/ampproject/amphtml/pull/34585/) to see how their impementations may differ.
-
-Read about [Inclusion of third party software, embeds and services into AMP](https://github.com/ampproject/amphtml/blob/main/3p/README.md).
-
-For contrast, take a look at `amp-instagram` which does NOT require an SDK to embed a post. Instead, it provides an iframe-based embedding that allows `amp-instagram` to use a normal iframe with no third party integrations. `amp-youtube` and others work similarly.
-
-### Unit tests
-
-Make sure you write good coverage for your code. We require unit tests for all checked in code. We use the following frameworks for testing:
-
--   [Mocha](https://mochajs.org/), our test framework
--   [Karma](https://karma-runner.github.io/), our tests runner
--   [Sinon](http://sinonjs.org/), spies, stubs and mocks.
--   [Enzyme](https://enzymejs.github.io/enzyme/), our Preact test utility.
-
-For faster testing during development, consider using --files argument to only run your extensions' tests.
-
-```shell
-$ amp unit --files=extensions/amp-my-element/1.0/test/test-amp-my-element.js --watch
-```
-
-Please also reference [Testing in AMP HTML](https://github.com/ampproject/amphtml/blob/main/docs/testing.md) for the full range of testing commands available.
-
-### Type checking
-
-We use Closure Compiler to perform type checking. Please see [Annotating JavaScript for the Closure Compiler](https://github.com/google/closure-compiler/wiki/Annotating-JavaScript-for-the-Closure-Compiler) and existing AMP code for examples of how to add type annotations to your code.
-
-The following shows the overall structure of your type definition file (extensions/amp-my-element/1.0/my-element.type.js). This will allow support of inline prop destructuring in Preact components.
-
-```javascript
-/** @externs */
-
-/**
- * @typedef {{
- *   propName1: (string|undefined),
- *   propName2: (number|undefined),
- *   children: (?PreactDef.Renderable|undefined),
- * }}
- */
-var MyElementProps;
-```
-
-Run the following command to ensure no type violations are introduced by your extension.
-
-```shell
-$ amp check-types
-```
-
-### Experiments
-
-Most newly created elements are initially launched as [experiments](https://github.com/ampproject/amphtml/blob/main/tools/experiments/README.md). This allows people to experiment with using the new element and provide the author(s) with feedback. It also provides the AMP Team with the opportunity to monitor for any potential errors. This is especially required if the validator isn't updated with your extended component rules. Without your rules in the validator, documents using the component in production are invalid.
-
-Add your extension as an experiment in the `amphtml/tools/experiments` file by adding a record for your extension in EXPERIMENTS variable.
-
-```javascript
-/** @const {!Array<!ExperimentDef>} */
-const EXPERIMENTS = [
-  // ...
-  {
-    id: 'bento-my-element',
-    name: 'AMP My Element',
-    spec:
-      'https://github.com/ampproject/amphtml/blob/main/extensions/' +
-      'amp-my-element/amp-my-element.md',
-    cleanupIssue: 'https://github.com/ampproject/amphtml/issues/XXXYYY',
-  },
-  // ...
-];
-```
-
-Then protect your code with a check for the component-specific flag `isExperimentOn(win, 'bento-my-element')`, or the global flag which enables all Bento components `isExperimentOn(win, 'bento')`, and only execute your code when it is on.
-
-```javascript
-import {CSS} from '../../../build/amp-my-element-1.0.css';
-import {isExperimentOn} from '#experiments';
-import {userAssert} from '../../../src/log';
-
-/** @const */
-const TAG = 'amp-my-element';
-
-class AmpMyElement extends AMP.PreactBaseElement {
-  /** @override */
-  isLayoutSupported(layout) {
-    userAssert(
-      isExperimentOn(this.win, 'bento') ||
-        isExperimentOn(this.win, 'bento-my-element'),
-      'expected global "bento" or specific "bento-my-element" experiment to be enabled'
-    );
-    return layout == LAYOUT.FIXED;
-  }
-}
-
-AMP.extension('amp-my-element', '1.0', AMP => {
-  AMP.registerElement('amp-my-element', AmpMyElement, CSS);
-});
-```
-
-#### Enabling and removing your experiment
-
-Users wanting to experiment with your element can then go to the [experiments page](https://cdn.ampproject.org/experiments.html) and enable your experiment.
-
-If you are testing on your localhost, use the command `AMP.toggleExperiment(id, true/false)` to enable the experiment. One option is to use `AMP.toggleExperiment('bento', true)` to enable all Bento components at once.
-
-File a GitHub issue to cleanup your experiment. Assign it to yourself as a reminder to remove your experiment and code checks. Removal of your experiment happens after the extension has been thoroughly tested and all issues have been addressed.
-
-## Documentation and Examples
-
-### Documenting your extended Bento component
-
-Create a `.md` file that serves as the main documentation for your element. This document should include:
-
--   Summary table
--   Overview
--   How to use it including code snippets and images
--   Examples
--   Attributes to specify (optional and required)
--   Validation
-
-For samples of element documentation, see: [`amp-accordion`](https://github.com/ampproject/amphtml/blob/main/extensions/amp-accordion/amp-accordion.md), [`amp-instagram`](https://github.com/ampproject/amphtml/blob/main/extensions/amp-instagram/amp-instagram.md), [`amp-stream-gallery`](https://github.com/ampproject/amphtml/blob/main/extensions/amp-stream-gallery/amp-stream-gallery.md)
-
-You must add a migration notes section for upgrades of existing AMP extended component. It should detail any differences between the new Bento and prior versions. For an example, reference the issue filed for [`amp-fit-text`](https://github.com/ampproject/amphtml/issues/28281).
-
-### Build an example
-
-Providing an example of your extended Bento component helps users understand how it works. It provides an easy starting point for developers to begin experimenting. This is where you actually build AMP HTML and non-AMP HTML documents and demonstrate element use. Create the file in the local `storybook/` directory, usually with the `Basic.amp.js` filename. There should also be a file which uses the component in a Preact environment with the Basic.js file name if applicable. Browse `storybook/` directories in other extended component directories to see examples. See how to view these samples on a local server in [Using Storybook](#using-storybook).
-
-Also consider contributing an example to
-[amp.dev](https://amp.dev/) on
-[GitHub](https://github.com/ampproject/amp.dev).
-
-#### Using Storybook
-
-To speed up development and testing of components, we recommend using the Storybook dashboard and develop "stories" (testing scenarios) for components. [Storybook](https://storybook.js.org/) has many features that assist with the isolated development and manual testing of components including easy manual interaction with component parameters, integrated accessibility auditing, and responsiveness testing.
-
-Two storybook enviroments are available in your component directory `amp-my-element/1.0/storybook` :
-
-|            | AMP Storybook             | Preact Storybook      |
-| ---------- | ------------------------- | --------------------- |
-| File       | `\storybook\Basic.amp.js` | `\storybook\Basic.js` |
-| Accessible | `localhost:9001`          | `localhost:9002`      |
-
-To interact with the storybook component, [Knobs](https://github.com/storybookjs/addon-knobs) are available. [Color](https://github.com/storybookjs/addon-knobs#color), [text](https://github.com/storybookjs/addon-knobs#text), [number](https://github.com/storybookjs/addon-knobs#number), [select](https://github.com/storybookjs/addon-knobs#select), [boolean](https://github.com/storybookjs/addon-knobs#boolean) are commonly used knobs.
-
-To run these environments and explore existing components, run:
-
-```
-amp storybook
-```
-
-## Checklist for PR
-
-### Linting and formatting
-
-It is recommended to check for errors with lint and prettify code. Run following commands to see and resolve any errors reported by them otherwise CircleCI check will not be passed.
-
-Run the following command to validates JS files against the ESLint linter.
-
-```shell
-$ amp lint --local_changes
-```
-
-Run the following command to validate non-JS files using Prettier.
-
-```shell
-$ amp prettify --local_changes
-```
-
-Use `--fix` with above commands to automatially fix common warning and error.
-
-### Update YAML Metadata
-
-Currently, Bento is in the experiment stage. So it is advised to include the following YAML metadata in the markdown:
-
-```
-bento: true
-experimental: true
-```
-
-For example, Bento `amp-youtube` markdown should have YAML metadata as:
-
-```diff
----
-$category@: media
-+ bento: true
-+ experimental: true
-formats:
-  - websites
-teaser:
-  text: Displays a YouTube video.
----
-```
-
-### Code Ownership
-
-Developers are requested to provide code ownership for newly created components. Please read [Code Ownership and AMP](https://github.com/ampproject/amphtml/blob/main/docs/code-ownership.md) for detailed information. Refer discussion related to code ownership on PR [#34948-discussion_r656779590](https://github.com/ampproject/amphtml/pull/34948#discussion_r656779590).
-
-## Example PRs
-
--   Adding general UI components
-    -   [amp-accordion](https://github.com/ampproject/amphtml/pull/30446)
-    -   [amp-sidebar](https://github.com/ampproject/amphtml/pull/31593)
-    -   [amp-timeago](https://github.com/ampproject/amphtml/pull/26507)
-    -   [amp-base-carousel](https://github.com/ampproject/amphtml/pull/29303)
-    -   [amp-stream-gallery](https://github.com/ampproject/amphtml/pull/30597)
--   Adding video components which use `VideoWrapper`. [You may also follow the guide to Building a Bento Video Component.](./building-a-bento-video-player.md)
-    -   [amp-video](https://github.com/ampproject/amphtml/pull/30280)
-    -   [amp-vimeo](https://github.com/ampproject/amphtml/pull/33971)
-    -   [amp-youtube](https://github.com/ampproject/amphtml/pull/30444)
--   Adding iframe based embeds [You may also follow the guide to Building a Bento Video Component.](./building-a-bento-iframe-component.md)
-    -   [amp-instagram](https://github.com/ampproject/amphtml/pull/30230)
--   Adding third party iframe based embeds
-    -   [amp-facebook](https://github.com/ampproject/amphtml/pull/34585)
-    -   [amp-twitter](https://github.com/ampproject/amphtml/pull/33335)
diff --git a/docs/building-a-bento-iframe-component.md b/docs/building-a-bento-iframe-component.md
deleted file mode 100644
index 8a58d577b969..000000000000
--- a/docs/building-a-bento-iframe-component.md
+++ /dev/null
@@ -1,330 +0,0 @@
-# Building a Bento Iframe Component
-
-> **You should first read through the [guide to Building a Bento AMP Extension](./building-a-bento-amp-extension.md).** Do not follow the steps to generate an extension, since they're specified here. Once you're familiar with the concepts related to AMP extensions and Bento components, follow this guide instead.
-
-<!--
-  (Do not remove or edit this comment.)
-
-  This table-of-contents is automatically generated. To generate it, run:
-    amp markdown-toc --fix
--->
-
-<!-- {"maxdepth": 3} -->
-
--   [How Iframe Components Work](#how-iframe-components-work)
--   [Getting Started](#getting-started)
--   [Directory Structure](#directory-structure)
--   [Define a Preact component](#define-a-preact-component)
-    -   [Loading an iframe with `IframeEmbed`](#loading-an-iframe-with-iframeembed)
-        -   [`src`](#src)
-        -   [Handling events with `messageHandler`](#handling-events-with-messagehandler)
-    -   [Use `ProxyIframeEmbed` directly](#use-proxyiframeembed-directly)
-        -   [Resizing components in AMP](#resizing-components-in-amp)
-        -   [Passing or overriding props](#passing-or-overriding-props)
-    -   [Placeholders](#placeholders)
--   [Completing your extension](#completing-your-extension)
--   [Example Pull Requests](#example-pull-requests)
-
-## How Iframe Components Work
-
-A number of AMP components use iframes to load external resources while staying compliant to AMP's performance considerations, such as enforcing stable layouts whenever possible and pausing resources based on document state. For this reason, Bento provides a generic iframe component to handle many of these resource considerations so that component implementation can focus on the feature set being provided.
-
-**Preact components** can get this behavior by using an **`IframeEmbed`** that renders an iframe and propagates props accordingly:
-
-```js
-return <IframeEmbed frameborder="no" scrolling="no" title="My iframe" {...props} />
-```
-
-Some components may additionally [load external resources](./building-a-bento-amp-extension.md#loading-external-resources), such as an SDK, to enable a third party integration. AMP serves this on a different domain for security and performance reasons, and Bento provides `ProxyIframeEmbed` to additionally wrap `IframeEmbed` with an intermediary bootstrapping iframe.
-
-**Preact components** can get this behavior by using an **`ProxyIframeEmbed`** that renders an iframe and propagates props accordingly:
-
-```js
-return <ProxyIframeEmbed frameborder="no" scrolling="no" title="My third party iframe" {...props} />
-```
-
-One important consideration is that direct iframes, such as those provided by `IframeEmbed` and [`VideoIframe`](./building-a-bento-video-player.md#loading-an-iframe-with-VideoIframe), are not the same as a **proxy iframe**, which provides an additional layer of communication between an iframe and the document. If it is not clear which is the appropriate helper for your component, [your guide](./contributing-code.md#find-a-guide) can help identify the best one to use.
-
-## Getting Started
-
-Start by generating an extension specifying `--bento` and `--nojss`. We name our extension **`amp-fantastic-embed`**, according to our [guidelines for naming a third-party component](./spec/amp-3p-naming.md).
-
-```console
-amp make-extension --bento --nojss --name=amp-fantastic-embed
-```
-
-## Directory Structure
-
-A [full directory for a Bento component](./building-a-bento-amp-extension.md#directory-structure) is generated, but this guide will cover the following file in particular:
-
-```
-/extensions/amp-fantastic-embed/1.0/
- ├── amp-my-fantastic-player.js    # Element's implementation
- └── component.js                  # Preact implementation
-```
-
-## Define a Preact component
-
-If you need to directly insert nodes to the document, like a `<iframe>` element, you need to use an `<IframeEmbed>`. If you need to load a third-party iframe, you should use a `<ProxyIframeEmbed>` as opposed to an `<IframeEmbed>`.
-
-### Loading an iframe with `IframeEmbed`
-
-Your `FantasticEmbed` component should return an `IframeEmbed` that's configured to a corresponding `postMessage` API. To start, we update the implementation in **`component.js`**:
-
-```diff
-- import {ContainWrapper} from '#preact/component';
-+ import {IframeEmbed} from '#preact/iframe';
-
-  function FantasticEmbedWithRef({...rest}, ref) {
--   ...
-+   const src = 'https://example.com/fantastic';
-+   const messageHandler = useCallback((e) => {
-+     console.log(e);
-+   }, []);
-    return (
--     <ContainWrapper layout size paint {...rest} >
--       ...
--     </ContainWrapper>
-+     <IframeEmbed
-+       ref={ref}
-+       {...rest}
-+       src={src}
-+       messageHandler={messageHandler}
-+     />
-    );
-  }
-```
-
-So that our component returns an `<IframeEmbed>`:
-
-```js
-// component.js
-// ...
-import {IframeEmbed} from '#preact/component/iframe';
-// ...
-function FantasticPlayerWithRef({...rest}, ref) {
-  const src = 'https://example.com/fantastic';
-  const onMessage = useCallback((e) => {
-    console.log(e);
-  }, []);
-  return (
-    <IframeEmbed
-      ref={ref}
-      {...rest}
-      src={src}
-      messageHandler={messageHandler}
-    />
-  );
-}
-```
-
-We're rendering an iframe that always loads `https://example.com/fantastic`, but we'll specify a dynamic URL later. Likewise, we'll need to define implementations for the communication function `messageHandler`.
-
-#### `src`
-
-You may use props to construct the `src`, like using a `appId` to load `https://example.com/fantastic/${appId}/`.
-
-We employ the `useMemo()` hook so that the `src` is generated only when the `appId` changes:
-
-```js
-// component.js
-// ...
-function FantasticEmbedWithRef(
-  {appId, ...rest},
-  ref
-) {
-  // ...
-  const src = useMemo(
-    () =>
-      `https://example.com/fantastic/${encodeURIComponent(appId)}/`,
-    [appId]
-  );
-  // ...
-  return (
-    <IframeEmbed
-      {...rest}
-      src={src}
-      ...
-    />
-  );
-}
-```
-
-#### Handling events with `messageHandler`
-
-Upstream events originated by the iframe are received as messages. You should define a function that interprets these messages and responds accordingly.
-
-Here we listen for measure events for an iframe that posts them as the following message structure:
-
-```
-{"event": {
-   "data" : {
-     "type": "MEASURE",
-     "details": {
-       "height": ___
-      }
-    }
-  }
-}
-```
-
-The component, which may be instantiated with a static height, can then resize once it receives the message with a fresh `height` value.
-
-```js
-// component.js
-// ...
-function messageHandler(event) {
-  const {data} = event;
-  if (data['type'] == 'MEASURE' && data['details']) {
-    const height = data['details']['height'];
-    // use the height to resize.
-  }
-}
-
-function FantasticEmbedWithRef(
-  {appId, ...rest},
-  ref
-) {
-  // ...
-  return (
-    <IframeEmbed
-      {...rest}
-      messageHandler={messageHandler}
-      ...
-    />
-  );
-}
-```
-
-Your iframe's interface to post messages is likely different, but your component should always handle these events via the `messageHandler`.
-
-### Use `ProxyIframeEmbed` directly
-
-If you `FantasticEmbed` component uses third party resources such as an SDK, then it should return a `ProxyIframeEmbed` that's configured to a corresponding `postMessage` API. To start, we update the implementation in **`component.js`**.
-
-```diff
-- import {ContainWrapper} from '#preact/component';
-+ import {ProxyIframeEmbed} from '#preact/component/3p-frame';
-
-  function FantasticEmbedWithRef({...rest}, ref) {
--   ...
-    return (
--     <ContainWrapper layout size paint {...rest} >
--       ...
--     </ContainWrapper>
-+     <ProxyIframeEmbed ref={ref} {...rest} />
-    );
-  }
-```
-
-So that our component returns a `<ProxyIframeEmbed>`:
-
-```js
-// component.js
-// ...
-+ import {ProxyIframeEmbed} from '#preact/component/3p-frame';
-
-// ...
-function FantasticEmbedWithRef({...rest}, ref) {
-  return <ProxyIframeEmbed ref={ref} {...rest}/>;
-}
-```
-
-#### Resizing components in AMP
-
-AMP documents additionally guarantee layout stability to the degree that it manages when components may or may not resize on the page. Because of this, the `IframeEmbed` component takes a `requestResize` prop where a different flow of logic may be passed in by the publisher to respond to measure events.
-
-In your AMP element implementation, you will use `requestResize` to pass in the `attemptChangeHeight` method that is extended from the `PreactBaseElement` class:
-
-```javascript
-// amp-fantastic-embed.js
-// ...
-class AmpFantasticEmbed extends BaseElement {
-  /** @override */
-  init() {
-    return dict({
-      'requestResize': (height) => this.attemptChangeHeight(height),
-    });
-  }
-}
-```
-
-For components that request a resize that is denied by the AMP runtime, publishers are recommended to use an `overflow` element to solicit user interaction in order to resize as a layout stability best-practice.
-
-This information can be provided in the component documentation with an exemplary code sample:
-
-```html
-<amp-fantastic-embed layout="fixed" width="400" height="200">
-  <button overflow>Click me to load the full iframed content!</button>
-</amp-fantastic-embed>
-<p>Content below the component.</p>
-```
-
-#### Passing or overriding props
-
-In the previous example, props received from the `ProxyIframeEmbed` are implicitly set through `...rest`. If we set each explicitly, we see the `HTMLIframeElement` attributes handled.
-
-```js
-// component.js
-// ...
-function FantasticEmbedInternalWithRef(
-  {
-    allow,
-    allowFullScreen,
-    frameborder,
-    loading,
-    name,
-    sandbox,
-    scrolling,
-    src,
-    title,
-  },
-  ref
-) {
-  return (
-    <div ref={ref} style={style}>
-      <iframe
-        allow={allow}
-        allowFullScreen={allowFullScreen}
-        frameborder="0"
-        loading={loading}
-        name={name}
-        part="iframe"
-        ref={iframeRef}
-        sandbox={sandbox}
-        scrolling="no"
-        src={src}
-        title={title}
-      />
-    </div>
-  );
-}
-```
-
-> **If you need to pass `style` or `ref` to the underlying iframe, these are exceptional in that they are propagated to the outer `ContainWrapper` which parents the `iframe` element. You should use `iframeStyle` or `iframeRef` accordingly to pass inline styles and refs.**
-
-You may similarly choose to pass or override properties at the higher level, passed from `FantasticEmbed` into the `ProxyIframeEmbed` we instantiate. For a list of these properties [see `component.type.js`](../src/preact/component/component.type.js)
-
-### Placeholders
-
-All Bento components implemented using iframes should utilize placeholders to mitigate the risk of poor perceived performance. Placeholders, Fallbacks, and Loaders can be toggled on/off using the hooks provided to the Preact Component. See [here](https://github.com/ampproject/amphtml/blob/main/docs/building-a-bento-amp-extension.md#placeholders) for detailed instructions on how to toggle placeholders/fallbacks/loaders.
-
-It is encouraged to create a Storybook story that specifically demonstrates utilization of placeholders and fallbacks.
-
-## Completing your extension
-
-Follow the [guide to Building a Bento AMP Component](./building-a-bento-amp-extension.md) for other instructions that you should complete, including:
-
--   **Documentation** that describes the component.
--   **Tests** that verify the component's functionality.
--   **Validator rules** to embed the component in an AMP document.
--   **An example** to our Storybook or to be published on [amp.dev](https://amp.dev/)
-
-## Example Pull Requests
-
--   Iframe embed:
-    -   [amp-instagram](https://github.com/ampproject/amphtml/pull/30230)
-    -   [amp-soundcloud](https://github.com/ampproject/amphtml/pull/34828)
--   Third party iframe:
-    -   [amp-facebook](https://github.com/ampproject/amphtml/pull/34585)
-    -   [amp-twitter](https://github.com/ampproject/amphtml/pull/33335)
diff --git a/docs/building-a-bento-video-player.md b/docs/building-a-bento-video-player.md
deleted file mode 100644
index d632632a10e1..000000000000
--- a/docs/building-a-bento-video-player.md
+++ /dev/null
@@ -1,597 +0,0 @@
-# Building a Bento Video Player
-
-> **You should first read through the [guide to Building a Bento AMP Component](./building-a-bento-amp-extension.md).** Do not follow the steps to generate an extension, since they're specified here. Once you're familiar with the concepts related to AMP extensions and Bento components, follow this guide instead.
-
-<!--
-  (Do not remove or edit this comment.)
-
-  This table-of-contents is automatically generated. To generate it, run:
-    amp markdown-toc --fix
--->
-
-<!-- {"maxdepth": 3} -->
-
--   [How Video Player Components Work](#how-video-player-components-work)
--   [Getting Started](#getting-started)
--   [Directory Structure](#directory-structure)
--   [Extend `VideoBaseElement` for AMP](#extend-videobaseelement-for-amp)
-    -   [`props`](#props)
--   [Define a Preact component](#define-a-preact-component)
-    -   [Forwarding `ref`](#forwarding-ref)
-    -   [Loading an iframe with `VideoIframe`](#loading-an-iframe-with-videoiframe)
-        -   [`src`](#src)
-        -   [`origin`](#origin)
-        -   [Playback methods with `makeMethodMessage`](#playback-methods-with-makemethodmessage)
-        -   [Handling events with `onMessage`](#handling-events-with-onmessage)
-        -   [Placeholders](#placeholders)
-    -   [Use `VideoWrapper` directly](#use-videowrapper-directly)
-        -   [Specifying `component`](#specifying-component)
-        -   [Passing or overriding props](#passing-or-overriding-props)
-        -   [Imperative handle](#imperative-handle)
--   [Completing your extension](#completing-your-extension)
--   [Example Pull Requests](#example-pull-requests)
-
-## How Video Player Components Work
-
-AMP and Bento provide [default video player capabilities](https://amp.dev/documentation/guides-and-tutorials/learn/spec/amp-video-interface/) in order to create a uniform experience. For example, videos only autoplay while they're visible and muted, and they consistently unmute when clicked. They send the same event signals to [`amp-analytics`](https://go.amp.dev/c/amp-analytics), or may be pinned to a corner in the same way in combination with [`amp-video-docking`](https://go.amp.dev/c/amp-video-docking).
-
-On a host document, player components must dispatch the same events and implement the same methods so that playback and user interface can be coordinated successfully.
-
-**Preact components** can support this behavior by using a **`VideoWrapper`** that renders a specified `component`:
-
-```js
-return <VideoWrapper component="video" {...props} />
-```
-
-The `component` prop can be a string to specify a `<video>` element or an id reference to a component whose interface is similar to [`HTMLMediaElement`](https://developer.mozilla.org/en-US/docs/Web/API/HTMLMediaElement).
-
-However, most video players are embedded through an iframe so they should use **`VideoIframe`** instead. This is a specialized `VideoWrapper` that doesn't require an underlying `component`:
-
-```js
-return <VideoIframe {...props}>
-```
-
-To enable component support for **AMP documents**, our video player element must extend from a base class `VideoBaseElement`. This enables [actions](https://amp.dev/documentation/guides-and-tutorials/learn/amp-actions-and-events/#amp-video-and-other-video-elements_1) and [analytics](https://github.com/ampproject/amphtml/blob/main/extensions/amp-analytics/amp-video-analytics.md), and allows us to define further behavior specific to the AMP layer, like parsing element attributes into Preact props.
-
-This guide covers how to implement video player components that are internally implemented using these Preact and AMP components.
-
-## Getting Started
-
-Start by generating an extension specifying `--bento` and `--nojss`. We name our extension **`amp-fantastic-player`**, ending with `-player` according to our [guidelines for naming a third-party component](./spec/amp-3p-naming.md).
-
-```console
-amp make-extension --bento --nojss --name=amp-fantastic-player
-```
-
-## Directory Structure
-
-A [full directory for a Bento component](./building-a-bento-amp-extension.md#directory-structure) is generated, but this guide will cover the following files in particular:
-
-```
-/extensions/amp-fantastic-player/1.0/
- ├── base-element.js               # Preact base element
- ├── component.js                  # Preact implementation
- ├── amp-my-fantastic-player.js    # Element's implementation
- └── amp-my-fantastic-player.css   # Custom CSS
-```
-
-## Extend `VideoBaseElement` for AMP
-
-Our `BaseElement` should be a superclass of `VideoBaseElement`. In **`base-element.js`**, we change:
-
-```diff
-  import {MyFantasticPlayer} from './component';
-- import {PreactBaseElement} from '#preact/base-element';
-+ import {VideoBaseElement} from '../../amp-video/1.0/video-base-element';
-
-- export class BaseElement extends PreactBaseElement {}
-+ export class BaseElement extends VideoBaseElement {}
-```
-
-into:
-
-```js
-// base-element.js
-// ...
-import {MyFantasticPlayer} from './component';
-import {VideoBaseElement} from '../../amp-video/1.0/base-element';
-
-export class BaseElement extends VideoBaseElement {}
-```
-
-This enables support for AMP actions and analytics, once we map attributes to their prop counterparts in `BaseElement['props']`, and we implement the Preact component.
-
-### `props`
-
-[**`props`**](https://github.com/ampproject/amphtml/blob/main/docs/building-a-bento-amp-extension.md#preactbaseelementprops) map the AMP element's attributes to the Preact component props. Take a look at [`VideoBaseElement`](../extensions/amp-video/1.0/base-element.js) for how most video properties are mapped. On your own `base-element.js`, you should specify any of them you support.
-
-```js
-// base-element.js
-// ...
-/** @override */
-BaseElement['props'] = {
-  'autoplay': {attr: 'autoplay', type: 'boolean'},
-};
-```
-
-## Define a Preact component
-
-If you need to directly insert nodes to the document, like a `<video>` element, you need to use a `<VideoWrapper>`.
-
-However, it's more likely that you load a third-party iframe and you communicate with the host via `postMessage`. In this case you should use a `<VideoIframe>` as opposed to a `<VideoWrapper>`.
-
-> ⚠️ Components may **not** embed scripts from a third-party location into host documents. If a third-party script is absolutely required, like on `<amp-ima-video>`, it must be inserted in an intermediate iframe, which we call a [**proxy frame**](./building-a-bento-iframe-component.md).
->
-> Proxy frames on Bento have not yet been tested as video player components, so they're not covered in this guide. If you wish to use one, please get in touch with `@alanorozco` via a Github issue or on on [Slack](https://bit.ly/amp-slack-signup) in the [`#contributing` channel](https://amphtml.slack.com/messages/C9HRJ1GPN/).
-
-### Forwarding `ref`
-
-To enable AMP actions (`my-element.play`) and the Preact component's imperative handle (`myPlayerRef.current.play()`), you'll have to [`forwardRef`](https://reactjs.org/docs/forwarding-refs.html). Rename `FantasticPlayer` to `FantasticPlayerWithRef`, and export a `FantasticPlayer` that forwards a `ref` into the former.
-
-```diff
-+ import {forwardRef} from '#preact/compat';
-
-- export function FantasticPlayer({...rest}) {
-+ function FantasticPlayerWithRef({...rest}, ref) {
-    ...
-  }
-
-+ const FantasticPlayer = forwardRef(FantasticPlayerWithRef);
-+ FantasticPlayer.displayName = 'FantasticPlayer'; // Make findable for tests.
-+ export {FantasticPlayer};
-```
-
-So the outer structure looks like:
-
-```js
-// component.js
-// ...
-import {forwardRef} from '#preact/compat';
-// ...
-function FantasticPlayerWithRef({...rest}, ref) {
-  // ...
-}
-//...
-const FantasticPlayer = forwardRef(FantasticPlayerWithRef);
-FantasticPlayer.displayName = 'FantasticPlayer'; // Make findable for tests.
-export {FantasticPlayer};
-```
-
-### Loading an iframe with `VideoIframe`
-
-Your `FantasticPlayer` component should return a `VideoIframe` that's configured to a corresponding `postMessage` API. To start, we update the implementation in **`component.js`**:
-
-```diff
-- import {ContainWrapper} from '#preact/component';
-+ import {VideoIframe} from '../../amp-video/1.0/video-iframe';
-
-  function FantasticPlayerWithRef({...rest}, ref) {
--   ...
-+   const src = 'https://example.com/fantastic';
-+   const makeMethodMessage = useCallback(() => '{}', []);
-+   const onMessage = useCallback((e) => {
-+     console.log(e);
-+   }, []);
-    return (
--     <ContainWrapper layout size paint {...rest} >
--       ...
--     </ContainWrapper>
-+     <VideoIframe
-+       ref={ref}
-+       {...rest}
-+       src={src}
-+       makeMethodMessage={makeMethodMessage}
-+       onMessage={onMessage}
-+     />
-    );
-  }
-```
-
-So that our component returns a `<VideoIframe>`:
-
-```js
-// component.js
-// ...
-import {VideoIframe} from '../../amp-video/1.0/video-iframe';
-// ...
-function FantasticPlayerWithRef({...rest}, ref) {
-  const src = 'https://example.com/fantastic';
-  const makeMethodMessage = useCallback(() => '{}', []);
-  const onMessage = useCallback((e) => {
-    console.log(e);
-  }, []);
-  return (
-    <VideoIframe
-      ref={ref}
-      {...rest}
-      src={src}
-      makeMethodMessage={makeMethodMessage}
-      onMessage={onMessage}
-    />
-  );
-}
-```
-
-We're rendering an iframe that always loads `https://example.com/fantastic`, but we'll specify a dynamic URL later. Likewise, we'll need to define implementations for the communication functions `makeMethodMessage` and `onMessage`.
-
-#### `src`
-
-You may use props to construct the `src`, like using a `videoId` to load `https://example.com/fantastic/${videoId}/`.
-
-We employ the `useMemo()` hook so that the `src` is generated only when the `videoId` changes:
-
-```js
-// component.js
-// ...
-function FantasticPlayerWithRef(
-  {videoId, ...rest},
-  ref
-) {
-  // ...
-  const src = useMemo(
-    () =>
-      `https://example.com/fantastic/${encodeURIComponent(videoId)}/`,
-    [videoId]
-  );
-  // ...
-  return (
-    <VideoIframe
-      {...rest}
-      src={src}
-      ...
-    />
-  );
-}
-```
-
-#### `origin`
-
-By default, messages from the iframe are only verified by comparing their `contentWindow`. You should define a regular expression that verifies their [origin](https://developer.mozilla.org/en-US/docs/Web/API/Window/postMessage#the_dispatched_event):
-
-```js
-// component.js
-// ...
-return (
-  <VideoIframe
-    {...rest}
-    origin={new RegExp('^https://((player|www)\.)?example\.com/?$')}
-    ...
-  />
-);
-```
-
-#### Playback methods with `makeMethodMessage`
-
-We need the ability to tell the iframe to execute certain actions, for example `play`, `mute` or `hideControls`. When using an iframe to load a player, this is done by sending a `postMessage` downstream.
-
-`makeMethodMessage` takes an action to execute as a `string`, and returns another `string` corresponding to a message to send.
-
-```ts
-type MakeMethodMessageFunction = (method: string) => string;
-```
-
-We implement this function with `useCallback()` so that it's created only when required as specified by hook dependencies. It's recommended that you also create a higher-level `makeMessage` function that creates and serializes messages as your iframe's interface needs it. In this case, we `JSON.stringify` a `videoId` and a `method`:
-
-```js
-// component.js
-// ...
-function makeMessage(videoId, method) {
-  return JSON.stringify({
-    'videoId': videoId,
-    'method': method,
-  });
-}
-
-function FantasticPlayerWithRef(
-  {videoId, ...rest},
-  ref
-) {
-  // ...
-  const makeMethodMessage = useCallback(
-    (method) => makeMessage(videoId, method),
-    [videoId]
-  );
-
-  // ...
-  return (
-    <VideoIframe
-      {...rest}
-      makeMethodMessage={makeMethodMessage}
-      ...
-    />
-  );
-}
-```
-
-#### Handling events with `onMessage`
-
-Upstream events originated by the iframe are received as messages. You should define a function that interprets these messages and dispatches [`HTMLMediaElement` events](https://developer.mozilla.org/en-US/docs/Web/API/HTMLMediaElement#events).
-
-```ts
-type OnMessageFunction = (event: MessageEvent) => void;
-```
-
-> ⚠️ **This is an incomplete [`MessageEvent`](https://developer.mozilla.org/en-US/docs/Web/API/MessageEvent).** It's a copy that contains `currentTarget` (the originating `<iframe>`), `target` (same as `currentTarget`) and `data` (the data sent by the iframe with `postMessage`). If you need to copy other properties, add them to the appropriate place in [`video-iframe.js`](../extensions/amp-video/1.0/video-iframe.js) and add `@alanorozco` as a reviewer on your pull request.
-
-Here we implement the `canplay`, `play` and `pause` events for an iframe that posts them as the message `{"event": "play"}`.
-
-```js
-// component.js
-// ...
-function onMessage(event) {
-  const {data, currentTarget} = event;
-  switch (data?.event) {
-    case 'canplay':
-    case 'play':
-    case 'pause':
-      dispatchCustomEvent(currentTarget, data.event, null, {
-        bubbles: true,
-        cancelable: false,
-      });
-      break;
-  }
-}
-
-function FantasticPlayerWithRef(
-  {videoId, ...rest},
-  ref
-) {
-  // ...
-  return (
-    <VideoIframe
-      {...rest}
-      onMessage={onMessage}
-      ...
-    />
-  );
-}
-```
-
-Your iframe's interface to post messages is likely different, but your component should always dispatch [`HTMLMediaElement` events](https://developer.mozilla.org/en-US/docs/Web/API/HTMLMediaElement#events) upstream.
-
-#### Placeholders
-
-All Bento components implemented using iframes should utilize placeholders to mitigate the risk of poor perceived performance. Placeholders, Fallbacks, and Loaders can be toggled on/off using the hooks provided to the Preact Component. See [here](https://github.com/ampproject/amphtml/blob/main/docs/building-a-bento-amp-extension.md#placeholders) for detailed instructions on how to toggle placeholders/fallbacks/loaders.
-
-It is encouraged to create a Storybook story that specifically demonstrates utilization of placeholders and fallbacks.
-
-### Use `VideoWrapper` directly
-
-> **If you need an iframe, you should ignore this section and use `VideoIframe` instead.** It requires less work and likely provides all you need. Read on if you're sure that you need to write to a host document directly to create `<video>` elements, or otherwise manage frames manually (like creating proxy frames).
-
-Your `FantasticPlayer` component should return a `VideoWrapper` that's configured to a corresponding `postMessage` API. To start, we update the implementation in **`component.js`**.
-
-```diff
-- import {ContainWrapper} from '#preact/component';
-+ import {VideoWrapper} from '../../amp-video/1.0/component';
-
-  function FantasticPlayerWithRef({...rest}, ref) {
--   ...
-    return (
--     <ContainWrapper layout size paint {...rest} >
--       ...
--     </ContainWrapper>
-+     <VideoWrapper ref={ref} {...rest} component="video" />
-    );
-  }
-```
-
-So that our component returns a `<VideoWrapper>`:
-
-```js
-// component.js
-// ...
-import {VideoWrapper} from '../../amp-video/1.0/component';
-
-// ...
-function FantasticPlayerWithRef({...rest}, ref) {
-  return <VideoWrapper ref={ref} {...rest} component="video" />;
-}
-```
-
-We're specifying `"video"` as the element to render, which is also the default. We'll later change this into our own component implementation.
-
-#### Specifying `component`
-
-The `VideoWrapper` must interact with an element that implements the `HTMLMediaInterface` like `<video>`, or a Preact component that emulates the same interface.
-
-For example, we may set a `component={FantasticPlayerInternal}`, where the specified function controls how we render and interact with the `<video>` element.
-
-By passing the `ref` through, we're able to call methods like `play()` from `FantasticPlayer` on the `<video>` element itself. By passing the `...rest` of the props we make sure that `src` is set, in addition to listening to playback events through props like `onPlay`.
-
-```js
-// component.js
-// ...
-function FantasticPlayerInternalWithRef({sources, ...rest}, ref) {
-  return (
-    <div>
-      <video ref={ref} {...rest}>
-        {sources}
-      </video>
-    </div>
-  );
-}
-
-const FantasticPlayerInternal = forwardRef(FantasticPlayerInternalWithRef);
-
-// ...
-function FantasticPlayerWithRef({...rest}, ref) {
-  return (
-    <VideoWrapper
-      ref={ref}
-      {...rest}
-      component={FantasticPlayerInternal}
-    />
-  );
-}
-```
-
-#### Passing or overriding props
-
-In the previous example, props received from the `VideoWrapper` are implicitly set through `...rest`. If we set each explicitly, we see the `HTMLMediaInterface` attributes and events handled.
-
-```js
-// component.js
-// ...
-function FantasticPlayerInternalWithRef(
-  {
-    muted,
-    loop,
-    controls,
-    onCanPlay,
-    onLoadedMetadata,
-    onPlaying,
-    onPause,
-    onEnded,
-    onError,
-    src,
-    poster,
-    style,
-    sources,
-  },
-  ref
-) {
-  return (
-    <div>
-      <video
-        ref={ref}
-        muted={muted}
-        loop={loop}
-        controls={controls}
-        onCanPlay={onCanPlay}
-        onLoadedMetadata={onLoadedMetadata}
-        onPlaying={onPlaying}
-        onPause={onPause}
-        onEnded={onEnded}
-        onError={onError}
-        src={src}
-        poster={poster}
-        style={style}
-      >
-        {sources}
-      </video>
-    </div>
-  );
-}
-```
-
-We can wrap playback events set on these props to dispatch them. For example, by wrapping `onCanPlay` we may mediate the `canplay` event by delaying it by 500 milliseconds:
-
-```js
-const onVideoCanPlay = useCallback((e) => {
-  setTimeout(() => {
-    onCanPlay(e);
-  }, 500);
-}, [onCanPlay]);
-```
-
-We set the wrapped method as the `<video>`'s actual event handler:
-
-```diff
-  <video
-    ref={ref}
--   onCanPlay={onCanPlay}
-+   onCanPlay={onVideoCanPlay}
-```
-
-You may similarly choose to pass or override properties at the higher level, passed from `FantasticPlayer` into the `VideoWrapper` we instantiate. For a list of these properties [see `amp-video/1.0/component.type.js`](../extensions/amp-video/1.0/component.type.js)
-
-#### Imperative handle
-
-AMP actions execute methods on the Preact component because they `forwardRef` to an element that defines them, or because they define them with [`useImperativeHandle`](https://reactjs.org/docs/hooks-reference.html#useimperativehandle). Methods executed down the Preact component chain cascade the same way.
-
-When we click the following button on an AMP document:
-
-```html
-<button on="tap: my-fantastic-player.play">
-  Play
-</button>
-```
-
-We call the corresponding function `play`:
-
-> The AMP action `my-element.play` is declared to be forwarded to the Preact component's method. See the [`init()` method on `VideoBaseElement`](../extensions/amp-video/1.0/base-element.js) for a list of the supported actions.
-
-```
--> FantasticPlayer.play()
-```
-
-Since we don't call `useImperativeHandle` at this layer, its `ref` forwards to `VideoWrapper`:
-
-```
--> FantasticPlayer.play()
--> (forwardRef) VideoWrapper.play()
-```
-
-`VideoWrapper` sets an imperative handle that explicitly calls `component.play()`:
-
-```
--> FantasticPlayer.play()
--> (forwardRef) VideoWrapper.play()
-  -> (imperativeHandle) component.play()
-```
-
-If `component` is a `<video>`, then the method is called direclty. If it's our `FantasticPlayerInternal` as we defined earlier, it may either `forwardRef` to a `<video>` or implement its own imperative handle.
-
-```
--> FantasticPlayer.play()
--> (forwardRef) VideoWrapper.play()
-  -> (imperativeHandle) component.play()
-  -> (forwardRef) <video>.play()
-```
-
-Methods can be defined with `useImperativeHandle` at the `component` implementation. We no longer forward our `ref` to the `<video>`, we use it to define the imperative handle instead. Downstream methods on the `<video>` element are executed explicitly through a local `videoRef`.
-
-> The methods and getters listed are the current requirements from `VideoWrapper`. Note that video players on Bento are in active development, so this list might expand in the future.
-
-```js
-// component.js
-// ...
-function FantasticPlayerInternalWithRef({sources, ...rest}, ref) {
-  const videoRef = useRef(null);
-
-  useImperativeHandle(() => {
-    return {
-      play() {
-        videoRef.current.play();
-      },
-      pause() {
-        videoRef.current.pause();
-      },
-      requestFullscreen() {
-        videoRef.current.requestFullscreen();
-      },
-      get readyState() {
-        return videoRef.current.readyState;
-      },
-      get currentTime() {
-        return videoRef.current.currentTime;
-      },
-      get duration() {
-        return videoRef.current.duration;
-      },
-    }
-  }, []);
-
-  return (
-    <video ref={videoRef} {...rest}>
-      {sources}
-    </video>
-  );
-}
-```
-
-## Completing your extension
-
-Follow the [guide to Building a Bento AMP Component](./building-a-bento-amp-extension.md) for other instructions that you should complete, including:
-
--   **Documentation** that describes the component.
--   **Tests** that verify the component's functionality.
--   **Validator rules** to embed the component in an AMP document.
--   **An example** to our Storybook or to be published on [amp.dev](https://amp.dev/)
-
-## Example Pull Requests
-
--   [amp-video](https://github.com/ampproject/amphtml/pull/30280)
--   [amp-vimeo](https://github.com/ampproject/amphtml/pull/33971)
--   [amp-youtube](https://github.com/ampproject/amphtml/pull/30444)
diff --git a/docs/building-an-amp-extension.md b/docs/building-an-amp-extension.md
index 6a70282b0f51..3ec2c97c869b 100644
--- a/docs/building-an-amp-extension.md
+++ b/docs/building-an-amp-extension.md
@@ -516,13 +516,13 @@ Consider showing a loading indicator if your element is expected to take
 a long time to load (for example, loading a GIF, video or iframe). AMP
 has a built-in mechanism to show a loading indicator simply by
 listing your element so it's allowed to show it. You can do that inside the `layout.js`
-file in the `LOADING_ELEMENTS_ENABLED` object.
+file in the `LOADING_ELEMENTS_ENUM` object.
 
 ```javascript
-export const LOADING_ELEMENTS_ENABLED = {
+export const LOADING_ELEMENTS_ENUM = {
   ...
-  'AMP-YOUTUBE': true,
-  'AMP-MY-ELEMENT': true,
+  AMP_YOUTUBE: 'AMP-YOUTUBE',
+  AMP_MY_ELEMENT: 'AMP-MY-ELEMENT',
 }
 ```
 
@@ -757,8 +757,8 @@ extension, its files and its examples. You will need to add an entry in the top-
 ```javascript
 exports.extensionBundles = [
 ...
-  {name: 'amp-kaltura-player', version: '0.1', latestVersion: '0.1'},
-  {name: 'amp-carousel', version: '0.1', latestVersion: '0.1', options: {hasCss: true}},
+  {name: 'amp-kaltura-player', version: '0.1'},
+  {name: 'amp-carousel', version: '0.1', options: {hasCss: true}},
 ...
 ];
 ```
@@ -771,10 +771,6 @@ extension makes breaking changes that are not backward compatible you
 should version your extension. This would usually be by creating a 0.2
 directory next to your 0.1.
 
-When version 0.2 is under development, make sure that `latestVersion` is
-set to 0.1 for both the 0.1 and 0.2 entries in `extensionBundles`. Once 0.2
-is ready to be released, `latestVersion` can be changed to 0.2.
-
 If your extension is still in experiments breaking changes usually are
 fine so you can just update the same version.
 
diff --git a/docs/component-validator-rules.md b/docs/component-validator-rules.md
index c058b4e440a9..ed7b60d4f848 100644
--- a/docs/component-validator-rules.md
+++ b/docs/component-validator-rules.md
@@ -76,7 +76,6 @@ tags: {  # amp-cat
   extension_spec: {
     name: "amp-cat"
     version: "0.1"
-    version: "latest"
   }
   attr_lists: "common-extension-attrs"
 }
@@ -153,12 +152,11 @@ as well as a link to documentation on ampproject.org for all error messages.
 
 ```js
     version: "0.1"
-    version: "latest"
   }
 ```
 
 These fields define a list of all allowed version numbers. Currently, almost all
-extended components are at version `0.1`, and we also allow `latest` to be specified.
+extended components are at version `0.1`.
 
 The combination of the `version` and `name` fields of the
 `extension_spec` define the allowed values of the `src` attribute in the
diff --git a/docs/contributing-code.md b/docs/contributing-code.md
index ace5b47d4d90..b24f6a8bfa86 100644
--- a/docs/contributing-code.md
+++ b/docs/contributing-code.md
@@ -20,7 +20,7 @@ We want to make it as easy as possible to get in small fixes. A fix for a small
         -   choose a [Reviewer](https://github.com/orgs/ampproject/teams/reviewers-amphtml); it's possible that the Owners that were automatically added by the bot are also Reviewers
     -   If the Owner that was automatically added is not a Reviewer, or you want to have someone else review and approve your code add them as reviewers on your PR if you are able to do so, otherwise cc them by adding the line "/cc @username" in your PR description/comment.
 
-If your run into any issues finding a Reviewer/Owner or have any other questions, ping the [#contributing channel](https://amphtml.slack.com/messages/C9HRJ1GPN/) on [Slack](https://bit.ly/amp-slack-signup). You can also reach out to mrjoro on Slack or cc him on your GitHub issue/PR.
+If your run into any issues finding a Reviewer/Owner or have any other questions, ping the [#contributing channel](https://amphtml.slack.com/messages/C9HRJ1GPN/) on [Slack](https://bit.ly/amp-slack-signup).
 
 ### Process for significant changes
 
diff --git a/docs/contributing.md b/docs/contributing.md
index 73afb158ac05..33e31952ac36 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -49,7 +49,7 @@ The [Getting Started End-to-End Guide](./getting-started-e2e.md) provides step-b
 
 The community has created a list of [Good First Issues](https://github.com/ampproject/amphtml/labels/good%20first%20issue) specifically for new contributors to the project. Feel free to find one of the [unclaimed Good First Issues](https://github.com/ampproject/amphtml/issues?utf8=%E2%9C%93&q=is%3Aopen%20label%3A%22good%20first%20issue%22%20-label%3A%22GFI%20Claimed!%22) that interests you, claim it by adding a comment to it and jump in!
 
-If you're interested in helping out but can't find a Good First Issue that matches your skills/interests, [sign up for our Slack](https://bit.ly/amp-slack-signup) and then reach out in the [#welcome-contributors channel](https://amphtml.slack.com/messages/welcome-contributors/) or send a Direct Message to [mrjoro](https://amphtml.slack.com/team/mrjoro/).
+If you're interested in helping out but can't find a Good First Issue that matches your skills/interests, [sign up for our Slack](https://bit.ly/amp-slack-signup) and then reach out in the [#welcome-contributors channel](https://amphtml.slack.com/messages/welcome-contributors/).
 
 If you run into any problems we have plenty of people who are willing to help; see the [How to get help](./getting-started-e2e.md#how-to-get-help) section of the Getting Started guide.
 
diff --git a/docs/design-reviews.md b/docs/design-reviews.md
index 7a6dbf7a31f2..bd734991f931 100644
--- a/docs/design-reviews.md
+++ b/docs/design-reviews.md
@@ -19,7 +19,7 @@ You can optionally join the [design review Google Group](https://groups.google.c
 
 Because AMP contributors are located all over the world we rotate the design review times to accommodate people in different time zones. The time and date for a design review will be specified in that design review's issue.
 
-If none of the design review times are convenient for you and you have a design you would like to discuss please reach out to mrjoro on [Slack](https://github.com/ampproject/amphtml/blob/main/docs/contributing.md#discussion-channels).
+If none of the design review times are convenient for you and you have a design you would like to discuss please reach out on the [#contributing](https://amphtml.slack.com/messages/C9HRJ1GPN/) channel in Slack.
 
 ## Bringing your design to a design review
 
@@ -58,7 +58,7 @@ For larger design topics (e.g. new features, or a significant change), the use o
     -   You create an explainer as a Pull Request, and comments/updates can be made using the normal PR review process.
     -   Explainers should be added to the appropriate Working Group repository. Explainers for work that span multiple working groups may be placed in any of the appropriate WG repos. Explainers for work that does not align with a WG may use the [ampproject design-doc](https://github.com/ampproject/design-docs) repository.
     -   You _may_ use a public Google document (with public comments enabled) instead of an md file for your explainer, but this has significant disadvantages. If you use a Google document, you _must_ submit a PDF version in the same repository you would have used for an explainer md file.
-    -   The [W3C TAG Explainer document](https://w3ctag.github.io/explainers) describes what an explainer should contain and a recommended template. [Design docs at Google](https://www.industrialempathy.com/posts/design-docs-at-google/) also has tips on documenting a design.
+    -   The [W3C TAG Explainer document](https://tag.w3.org/explainers/) describes what an explainer should contain and a recommended template. [Design docs at Google](https://www.industrialempathy.com/posts/design-docs-at-google/) also has tips on documenting a design.
     -   An explainer does not need to be "final" before being merged in. You may merge in a draft copy and handle updates through issues/PRs as needed.
     -   Explainers (whether as an md file or in a Google document) should be visible to the public, and any member of the community should be able to comment on it. The explainer should not link to non-public information except in extraordinary circumstances, and the non-public nature of the link and the reason for it not being public should be detailed.
 -   See the ["Using React/Preact to implement AMP elements" explainer](https://github.com/ampproject/wg-bento/blob/main/react/explainer.md) for an example.
diff --git a/docs/spec/amp-3p-video.md b/docs/spec/amp-3p-video.md
index 0ae6691963c8..f8355733ad64 100644
--- a/docs/spec/amp-3p-video.md
+++ b/docs/spec/amp-3p-video.md
@@ -9,7 +9,7 @@ Internally these players load an iframe whose page communicates with the outer d
 
 ## I want to contribute my vendor-specific player
 
-You probaby do **_not_** need to build your own player.
+You probably do **_not_** need to build your own player.
 
 The `amp-video-iframe` playback interface supports the following methods, which we believe cover the vast majority of cases AMP documents necessitate:
 
diff --git a/docs/spec/amp-actions-and-events.md b/docs/spec/amp-actions-and-events.md
index 21bc521023f6..3fecd6e88e49 100644
--- a/docs/spec/amp-actions-and-events.md
+++ b/docs/spec/amp-actions-and-events.md
@@ -100,6 +100,14 @@ For example, the following is possible in AMP:
     <td><code>tap</code></td>
     <td>Fired when the element is clicked/tapped.</td>
   </tr>
+  <tr>
+    <td><code>copy-success</code></td>
+    <td>Fired when the content/text is successfully copied into the clipboard.</td>
+  </tr>
+  <tr>
+    <td><code>copy-error</code></td>
+    <td>Fired when there's an error while copying the content. If there's an error while copying the content, the <code>event.data.type</code> will be set to the <code>error</code> value. If the browser is not supporting the copy method, the <code>event.data.type</code> will be set to the <code>browser</code> value.</td>
+  </tr>
 </table>
 
 ### Input elements <a name="input-elements"></a>
@@ -534,7 +542,7 @@ event.response</pre></td>
   </tr>
   <tr>
     <td><code>changeToLayoutContainer</code></td>
-    <td>Update's <code>amp-list</code>'s layout to <code>layout="CONTAINTER"</code> to allow <a href="../extensions/amp-list/amp-list.md#dynamic-resizing">dynamic resizing</a>.</td>
+    <td>Update's <code>amp-list</code>'s layout to <code>layout="CONTAINER"</code> to allow <a href="../../extensions/amp-list/amp-list.md#dynamic-resizing">dynamic resizing</a>.</td>
   </tr>
   <tr>
     <td><code>refresh</code></td>
@@ -700,7 +708,7 @@ actions that apply to the whole document.
   <tr>
     <td><code>navigateTo(url=STRING, target=STRING, opener=BOOLEAN)</code></td>
     <td>
-      <p>Navigates current window to given URL, to the optional specified target if given (currenly only supporting <code>_top</code> and <code>_blank </code>). The optional <code>opener</code> parameter can be specified when using a target of <code>_blank</code> to allow the newly opened page to access <a href="https://developer.mozilla.org/en-US/docs/Web/API/Window/opener"><code>window.opener</code></a>.</p>
+      <p>Navigates current window to given URL, to the optional specified target if given (currently only supporting <code>_top</code> and <code>_blank </code>). The optional <code>opener</code> parameter can be specified when using a target of <code>_blank</code> to allow the newly opened page to access <a href="https://developer.mozilla.org/en-US/docs/Web/API/Window/opener"><code>window.opener</code></a>.</p>
       <p><strong>Caveat:</strong> Using normal <code>&lt;a&gt;</code> links is recommended wherever possible since <code>AMP.navigateTo</code> is not recognized by web crawlers.</p>
     </td>
   </tr>
@@ -741,6 +749,14 @@ actions that apply to the whole document.
       <p>Requires <a href="https://amp.dev/documentation/components/amp-bind.html#modifying-history-with-amppushstate">amp-bind</a>.</p>
       <p>Merges an object literal into the bindable state and pushes a new entry onto browser history stack. Popping the entry will restore the previous values of variables (in this example, <code>foo</code>).    </td>
   </tr>
+  <tr>
+    <td><code>copy(text='content')</code></td>
+    <td>
+      <p>Copy any content to the clipboard. <code>text</code> is optional, and if is set it will copy those content/value into the clipboard.</p>
+    </td>
+    <td><code>toggleTheme()</code></td>
+    <td>Toggles the amp-dark-mode class on the body element when called and sets users preference to the localStorage. The amp-dark-mode class is added by default to body based on the <code>prefers-color-scheme</code> value. Use <code>data-prefers-dark-mode-class</code> attribute on body tag to override the class to be used for dark mode.</td>
+  </tr>
 </table>
 
 <sup>1</sup>When used with <a href="#multiple-actions-for-one-event">multiple actions</a>, subsequent actions will wait for <code>setState()</code> or <code>pushState()</code> to complete before invocation. Only a single <code>setState()</code> or <code>pushState()</code> is allowed per event.
diff --git a/docs/spec/amp-cache-transform.md b/docs/spec/amp-cache-transform.md
index 9c64c4e45ac4..b1c9b5f4b65e 100644
--- a/docs/spec/amp-cache-transform.md
+++ b/docs/spec/amp-cache-transform.md
@@ -5,7 +5,7 @@
 The [Signed Exchanges](https://wicg.github.io/webpackage/draft-yasskin-http-origin-signed-responses.html)
 (**SXG**) spec introduces a [new format](https://wicg.github.io/webpackage/draft-yasskin-http-origin-signed-responses.html#application-signed-exchange)
 for delivery of web content. AMP's [use of SXG](https://amphtml.wordpress.com/2018/01/09/improving-urls-for-amp-pages/)
-requires additional information to enable proper content negotation on a URL.
+requires additional information to enable proper content negotiation on a URL.
 
 ### "Understands" vs "Prefers"
 
@@ -25,15 +25,14 @@ indicates the latter.
 
 ### Target-specific constraints
 
-AMP SXG are intended for [privacy-preserving
-prefetch](https://wicg.github.io/webpackage/draft-yasskin-webpackage-use-cases.html#private-prefetch)
+AMP SXG are intended for privacy-preserving prefetch
 from a referring page (such as a Google Search results page) to a coordinating
 AMP cache (such as the Google AMP Cache). If the referrer wishes to prefetch
 subresources as well, they must also be served from a coordinating AMP cache, in
 order to preserve privacy. In order for those subresources to be _useful_, they
 must be referenced by the signed HTML page.
 
-Therefore, the requestor of an SXG may require the origin to produce an SXG
+Therefore, the requester of an SXG may require the origin to produce an SXG
 tailored to the AMP Cache that is requesting it, by rewriting its subresource
 URLs appropriately.
 
@@ -53,13 +52,13 @@ of those transforms. This allows the AMP cache to:
 
 ## Solution
 
-The presence of the `AMP-Cache-Transform` header indicates that the requestor
+The presence of the `AMP-Cache-Transform` header indicates that the requester
 would prefer an `application/signed-exchange` variant of the resource at the
-given URL, but would accept a non-SXG variant. If a requestor sends this, it
+given URL, but would accept a non-SXG variant. If a requester sends this, it
 should also explicitly include the relevant
 `application/signed-exchange;v=something` in its `Accept` header, so that the
 responder knows which versions of the SXG standard are supported by the
-requestor.
+requester.
 
 The value of the header indicates target-specific constraints on the transformed
 AMP within the SXG. If a server is unable to meet those constraints, it should
@@ -88,7 +87,7 @@ For each identifier:
 
 1.  If the identifier contains a `v` parameter, then its value represents a set
     of AMP transform versions. The server should respond with an SXG only if it
-    can produce one of the versions in that set (see [Version negotation](#version-negotiation)).
+    can produce one of the versions in that set (see [Version negotiation](#version-negotiation)).
 2.  If the identifier contains any parameters besides those mentioned above,
     then this identifier cannot be satisfied. The server should attempt to match
     the next one. (This reserves the parameter space for future additional
@@ -97,7 +96,7 @@ For each identifier:
     prefetching intermediary, and therefore its subresource URLs needn't be (but
     may be) rewritten.
 4.  Otherwise, if the identifier is an `id` from the list in
-    [caches.json](../build-system/global-configs/caches.json), then the SXG should have its subresource URLs
+    [caches.json](../../build-system/global-configs/caches.json), then the SXG should have its subresource URLs
     rewritten. That `id`'s corresponding `cacheDomain` indicates the
     fully-qualified domain name that forms the basis for the URL rewrites.
 5.  Otherwise, the identifier is invalid and cannot be satisfied. The server
@@ -106,7 +105,7 @@ For each identifier:
 The server should ensure its copy of `caches.json` is no more than 60 days
 out-of-date with the canonical linked above.
 
-#### Version negotation
+#### Version negotiation
 
 This section uses the ABNF rules of
 [RFCF5234](https://tools.ietf.org/html/rfc5234), augmented with the list
@@ -175,7 +174,7 @@ lower-entropy forms, e.g. by performing the content negotiation (using
 hard-coded knowledge about what variants are available at a given URL) and
 including only the negotiated media-type, without q-values. The publisher may
 also specify
-[Variants](https://httpwg.org/http-extensions/draft-ietf-httpbis-variants.html)
+[Variants](https://datatracker.ietf.org/doc/draft-ietf-httpbis-variants/00/)
 to aid caching proxies that understand that header.
 
 ### URL rewrites
@@ -196,13 +195,13 @@ publisher additional assurance that the JS is not an arbitrary payload. It would
 nice to get rid of this dependency; something like [signature-based
 SRI](https://github.com/mikewest/signature-based-sri) might be feasible.
 
-## Interaction with content negotation
+## Interaction with content negotiation
 
 If the URL serves multiple variants, and is thus subject to [HTTP proactive
-negotation](https://tools.ietf.org/html/rfc7231#section-3.4.1), then
+negotiation](https://tools.ietf.org/html/rfc7231#section-3.4.1), then
 `AMP-Cache-Transform` should only take effect after proactive negotiation has
 selected a resource of content type `application/signed-exchange`. In theory,
-there may be an interaction with content negotation. For instance, assume the
+there may be an interaction with content negotiation. For instance, assume the
 request is:
 
 ```http
@@ -220,7 +219,7 @@ to serve SXGs on all variants of an AMP URL.
 ## Caching proxy behavior
 
 An intermediary proxy may choose to cache these SXG responses and serve them to
-future requestors. Strict adherence to
+future requesters. Strict adherence to
 [Vary](https://tools.ietf.org/html/rfc7234#section-4.1) would mean that, e.g. a
 response to a request containing `AMP-Cache-Transform: any` would not match a
 response to a request containing `AMP-Cache-Transform: google, any`, since the
@@ -272,7 +271,7 @@ feel free to get involved.
 
 ## Example
 
-A requestor wishing to receive an SXG, without any constraints on its
+A requester wishing to receive an SXG, without any constraints on its
 subresource URLs, would send:
 
 ```http
@@ -282,7 +281,7 @@ AMP-Cache-Transform: any
 The responder may send an SXG with subresource URLs rewritten for a
 particular cache or with the original subresource URLs, or a non-SXG response.
 
-A requestor wishing to receive an SXG to be served from and prefetched from the
+A requester wishing to receive an SXG to be served from and prefetched from the
 Google AMP Cache (e.g. [Googlebot](https://support.google.com/webmasters/answer/182072))
 would send:
 
@@ -293,7 +292,7 @@ AMP-Cache-Transform: google
 The responder must either send an SXG with subresource URLs rewritten for the
 Google AMP Cache, or a non-SXG response.
 
-A requestor wishing to receive transformed AMP of a specific version may send a
+A requester wishing to receive transformed AMP of a specific version may send a
 request like:
 
 ```http
diff --git a/docs/spec/amp-cors-requests.md b/docs/spec/amp-cors-requests.md
index 9cefb14442e4..8598fdbabd20 100644
--- a/docs/spec/amp-cors-requests.md
+++ b/docs/spec/amp-cors-requests.md
@@ -422,7 +422,7 @@ You can use the `curl` command to verify that your server is sending the correct
 
 In a same-origin request, the AMP system adds the custom `AMP-Same-Origin:true` header.
 
-Here's our curl command for testing a request from `https://ampbyexample.com` to the `examples.json` file (on the same domain):
+Here's our curl command for testing a request from `https://amp.dev` to the `examples.json` file (on the same domain):
 
 ```shell
 curl 'https://amp.dev/static/samples/json/examples.json' -H 'AMP-Same-Origin: true' -I
@@ -434,7 +434,7 @@ The results from the command show the correct response headers (note: extra info
 HTTP/2 200
 access-control-allow-headers: Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token
 access-control-allow-credentials: true
-access-control-allow-origin: https://ampbyexample.com
+access-control-allow-origin: https://amp.dev
 access-control-allow-methods: POST, GET, OPTIONS
 ```
 
diff --git a/docs/spec/amp-email-actions-and-events.md b/docs/spec/amp-email-actions-and-events.md
index 128c1c4b4581..3e92bd680f21 100644
--- a/docs/spec/amp-email-actions-and-events.md
+++ b/docs/spec/amp-email-actions-and-events.md
@@ -431,7 +431,7 @@ event.response</pre></td>
   </tr>
   <tr>
     <td><code>changeToLayoutContainer</code></td>
-    <td>Update's <code>amp-list</code>'s layout to <code>layout="CONTAINTER"</code> to allow <a href="../extensions/amp-list/amp-list.md#dynamic-resizing">dynamic resizing</a>.</td>
+    <td>Update's <code>amp-list</code>'s layout to <code>layout="CONTAINER"</code> to allow <a href="../../extensions/amp-list/amp-list.md#dynamic-resizing">dynamic resizing</a>.</td>
   </tr>
   <tr>
     <td><code>refresh</code></td>
diff --git a/docs/spec/amp-errors.md b/docs/spec/amp-errors.md
index 44933badc708..e0cfdab033c0 100644
--- a/docs/spec/amp-errors.md
+++ b/docs/spec/amp-errors.md
@@ -10,23 +10,37 @@ the `betaErrorReportingUrl` config. E.g. for `cdn.ampproject.org`
 The following fields are reported:
 
 -   `v=string` - AMP version
+-   `noamp={0,1}` - whether the document contains non-AMP JavaScript
 -   `m=string` - the error message
--   `a=1` - whether the error is labeled as "user" error (as opposed to a "dev" error).
--   `ex=1` - whether the error is labeled as "expected".
--   `3p=1` - whether the error occured in the 3p context.
--   `ca=1` - whether this is a canary version of AMP.
--   `or=string` - the ancestor origin if available.
--   `iem=1` - whether this document is iframed.
--   `rvu=string` - the viewer URL, provided by the viewer.
--   `mso=string` - the messaging origin for viewer communication.
--   `el=string` - the identifier/information on the associated DOM element.
--   `s=string` - the error stack.
--   `f=string` - the error's file name.
--   `l=number` - the error's line number.
--   `c=number` - the error's column number.
+-   `a={0,1}` - whether the error is labeled as "user" error (as opposed to a "dev" error).
+-   `ex={0,1}` - whether the error is labeled as "expected".
+-   `dw={0,1}` - whether the document is presented in a detached window (e.g., inside an iframe)
+-   `3p={0,1}` - whether the error occurred in the 3p context.
+-   At most one of the following:
+    -   `sxg=1` - the runtime was build with the `--sxg` (Signed Exchanges) flag.
+    -   `esm=1` - the runtime was build with the `--esm` (JavaScript Modules) flag.
+    -   `3p=1` - the runtime is served from a third party.
+-   `rt=string` - the runtime type.
+-   `cdn=string` - the value of `cdnUrl` in the runtime configuration, or the value of the `runtime-host` meta tag if the former is undefined.
+-   `adid=string` - _(`rt=inabox` only)_ the A4A ID.
+-   `ca=1` - _(deprecated)_ whether this is a canary version of AMP.
+-   `bt=string` - runtime release channel type.
+-   `or=string` - _(optional)_ the ancestor origin if available.
+-   `vs=string` - _(optional)_ the viewer's state.
+-   `iem=1` - _(optional)_ whether this document is iframed.
+-   `rvu=string` - _(optional)_ the viewer URL, provided by the viewer.
+-   `mso=string` - _(optional)_ the messaging origin for viewer communication.
+-   `exps=string` - _(optional)_ the defined experiments and whether they are turned on, in the format `expname=1,expname=0,expname=1`...
+-   `el=string` - _(optional)_ the identifier/information on the associated DOM element.
+-   `args=string` - _(optional)_ JSON.Stringified arguments associated with the error object.
+-   `s=string` - _(optional)_ the error stack.
+-   `f=string` - _(optional)_ the error's file name.
+-   `l=number` - _(optional)_ the error's line number.
+-   `c=number` - _(optional)_ the error's column number.
 -   `r=string` - the document's referrer.
 -   `ae=string` - accumulated/correlated error messages.
 -   `fr=string` - the document's location fragment.
+-   `pt=1` - _(optional)_ _internal implementation detail_
 
 ## "Expected" errors
 
diff --git a/docs/spec/amp-html-format.md b/docs/spec/amp-html-format.md
index 67ebb452d3be..6e4778374c70 100644
--- a/docs/spec/amp-html-format.md
+++ b/docs/spec/amp-html-format.md
@@ -159,7 +159,7 @@ AMP HTML documents MUST
 -   <a name="canon"></a>contain a `<link rel="canonical" href="$SOME_URL">` tag inside their head that points to the regular HTML version of the AMP HTML document or to itself if no such HTML version exists. [🔗](#canon)
 -   <a name="chrs"></a>contain a `<meta charset="utf-8">` tag as the first child of their head tag. [🔗](#chrs)
 -   <a name="vprt"></a>contain a `<meta name="viewport" content="width=device-width">` tag inside their head tag. It's also recommended to include `minimum-scale=1` and `initial-scale=1`. [🔗](#vprt)
--   <a name="scrpt"></a>contain a `<script async src="https://cdn.ampproject.org/v0.js"></script>` tag inside their head tag. [🔗](#scrpt)
+-   <a name="script"></a>contain a `<script async src="https://cdn.ampproject.org/v0.js"></script>` tag inside their head tag. [🔗](#script)
 -   <a name="boilerplate"></a>contain the [AMP boilerplate code](amp-boilerplate.md) (`head > style[amp-boilerplate]` and `noscript > style[amp-boilerplate]`) in their head tag. [🔗](#boilerplate)
 
 ### Metadata
@@ -564,7 +564,7 @@ Currently, the following SVG elements are allowed:
 -   [descriptive elements](https://svgwg.org/svg2-draft/struct.html#TermDescriptiveElement): "desc", "metadata", and "title".
 -   [filter primitive elements](https://drafts.fxtf.org/filter-effects/#filter-primitive): "feColorMatrix", "feComposite", "feGaussianBlur", "feMerge", "feMergeNode", and "feOffset".
 -   uncategorized elements: "view", and "filter".
--   deprecated elements: ["glyph"](https://developer.mozilla.org/en-US/docs/Web/SVG/Element/glyph), ["glyphRef"](https://developer.mozilla.org/en-US/docs/Web/SVG/Element/glyphRef), ["hkern"](https://developer.mozilla.org/en-US/docs/Web/SVG/Element/hkern), ["solidcolor"](https://developer.mozilla.org/en-US/docs/Web/SVG/Element/solidcolor), ["tref"](https://developer.mozilla.org/en-US/docs/Web/SVG/Element/tref), and ["vkern"](https://developer.mozilla.org/en-US/docs/Web/SVG/Element/vkern).
+-   deprecated elements: ["glyph"](https://developer.mozilla.org/en-US/docs/Web/SVG/Element/glyph), ["glyphRef"](https://developer.mozilla.org/en-US/docs/Web/SVG/Element/glyphRef), ["hkern"](https://developer.mozilla.org/en-US/docs/Web/SVG/Element/hkern), ["tref"](https://developer.mozilla.org/en-US/docs/Web/SVG/Element/tref), and ["vkern"](https://developer.mozilla.org/en-US/docs/Web/SVG/Element/vkern).
 
 As well as these attributes:
 
diff --git a/docs/spec/amp-localstorage.md b/docs/spec/amp-localstorage.md
index 82f233cc8653..3b83102c855f 100644
--- a/docs/spec/amp-localstorage.md
+++ b/docs/spec/amp-localstorage.md
@@ -48,7 +48,7 @@ The following AMP components and service are using the localStorage.
 
 The localStorage can be used by future AMP components or services with valid reasons to store info client side.
 
-There are a few guidlines to follow due to localStorage implementation in AMP and AMP Viewer.
+There are a few guidelines to follow due to localStorage implementation in AMP and AMP Viewer.
 
 ### Privacy Policy
 
@@ -56,7 +56,7 @@ Entries can be sent to the AMP Viewer and stored in the top level window. No per
 
 ### Storage Policy
 
-All entires will be stored in the top level window domain, which has limited localStorage space. AMP may enforce some size restrictions based on individual usage.
+All entries will be stored in the top level window domain, which has limited localStorage space. AMP may enforce some size restrictions based on individual usage.
 
 Please also note that AMP Viewers may have their own size limitation and implementation to expire or clear localStorage entry. The localStorage value will be handled at best effort.
 
diff --git a/docs/spec/amp-shadow-doc.md b/docs/spec/amp-shadow-doc.md
index ce5a280e2dfb..0efb537d9331 100644
--- a/docs/spec/amp-shadow-doc.md
+++ b/docs/spec/amp-shadow-doc.md
@@ -65,11 +65,11 @@ Notice, that XHR and Fetch API are only some of the sources of documents. Other
 
 #### Visibility state (`visibilityState`)
 
-The `options` argument is optional and can provide configuration parameters for AMP document. The most relevant of these options is `visibilityState`. By default it takes the value of "visible", but can be configured to "prerender" mode instead. Prerender mode can be used for minimal prerendering of the element. In this mode most of features are disabled, including analytics and ads. The mode can be later changed to "visibile" via `shadowDoc.setVisibilityState()` function.
+The `options` argument is optional and can provide configuration parameters for AMP document. The most relevant of these options is `visibilityState`. By default it takes the value of "visible", but can be configured to "prerender" mode instead. Prerender mode can be used for minimal prerendering of the element. In this mode most of features are disabled, including analytics and ads. The mode can be later changed to "visible" via `shadowDoc.setVisibilityState()` function.
 
 ### Shadow-doc API
 
-Both `AMP.attachShadowDoc` and `AMP.attachShadowDocAsStream` return a `ShadowDoc` object that provides numerous ways for interracting with attached AMP documents. This object exposes the following methods and properties:
+Both `AMP.attachShadowDoc` and `AMP.attachShadowDocAsStream` return a `ShadowDoc` object that provides numerous ways for interacting with attached AMP documents. This object exposes the following methods and properties:
 
 -   `shadowDoc.writer` - the writer that can be used to stream the AMP document. Only available for `attachShadowDocAsStream`.
 -   `shadowDoc.url` - the URL used in the `attachShadowDoc` or `attachShadowDocAsStream`.
@@ -127,6 +127,6 @@ We tested with [WebComponents.js polyfill](https://github.com/webcomponents/webc
 
 ## Examples and references
 
-See [pwa.js](../examples/pwa/pwa.js) for examples of uses of boths APIs.
+See [pwa.js](../../examples/pwa/pwa.js) for examples of uses of both APIs.
 
 See [Combine AMP with PWA](https://amp.dev/documentation/guides-and-tutorials/learn/combine-amp-pwa) and [Embed & use AMP as a data source](https://amp.dev/documentation/guides-and-tutorials/integrate/amp-in-pwa) guides.
diff --git a/docs/spec/amp-story-player.md b/docs/spec/amp-story-player.md
index 410f05268d39..0592480c9802 100644
--- a/docs/spec/amp-story-player.md
+++ b/docs/spec/amp-story-player.md
@@ -119,7 +119,7 @@ The data will come from the `<amp-story>`'s metadata attributes in the story's d
 -   For the string of text: the `entity` attribute (if provided), otherwise the `publisher` attribute.
 -   When the attribution is clicked, it will navigate the user to a URL. This will come from `entity-url` attribute if provided, otherwise it will use the story's canonical domain.
 
-Read more about these attibutes on the [Metadata Guidelines of `amp-story`.](https://github.com/ampproject/amphtml/blob/main/extensions/amp-story/amp-story.md#metadata-guidelines)
+Read more about these attributes on the [Metadata Guidelines of `amp-story`.](https://github.com/ampproject/amphtml/blob/main/extensions/amp-story/amp-story.md#metadata-guidelines)
 
 ### JSON Configuration
 
diff --git a/docs/spec/amp-var-substitutions.md b/docs/spec/amp-var-substitutions.md
index 0c61390b80f2..05f0614f7a7c 100644
--- a/docs/spec/amp-var-substitutions.md
+++ b/docs/spec/amp-var-substitutions.md
@@ -177,6 +177,7 @@ The tables below list the available URL variables grouped by type of usage. Furt
 | [DOM Interactive Time](#dom-interactive-time)           | `DOM_INTERACTIVE_TIME` | `${domInteractiveTime}`     |
 | [First Contentful Paint](#first-contentful-paint)       | N/A                    | `${firstContentfulPaint}`   |
 | [First Input Delay](#first-input-delay)                 | N/A                    | `${firstInputDelay}`        |
+| [Interaction To Next Paint](#interaction-to-next-paint) | N/A                    | `${interactionToNextPaint}` |
 | [Largest Contentful Paint](#largest-contentful-paint)   | N/A                    | `${largestContentfulPaint}` |
 | [Navigation Redirect Count](#navigation-redirect-count) | `NAV_REDIRECT_COUNT`   | `${navRedirectCount}`       |
 | [Navigation Timing ](#navigation-timing)                | `NAV_TIMING`           | `${navTiming}`              |
@@ -195,7 +196,7 @@ The tables below list the available URL variables grouped by type of usage. Furt
 | [Available Screen Width](#available-screen-width)   | `AVAILABLE_SCREEN_WIDTH`  | `${availableScreenWidth}`  |
 | [Browser Language](#browser-language)               | `BROWSER_LANGUAGE`        | `${browserLanguage}`       |
 | [Screen Color Depth](#screen-color-depth)           | `SCREEN_COLOR_DEPTH`      | `${screenColorDepth}`      |
-| [Screen Height](#screen-heigth)                     | `SCREEN_HEIGHT`           | `${screenHeight}`          |
+| [Screen Height](#screen-height)                     | `SCREEN_HEIGHT`           | `${screenHeight}`          |
 | [Screen Width](#screen-width)                       | `SCREEN_WIDTH`            | `${screenWidth}`           |
 | [Scroll Height](#scroll-height)                     | `SCROLL_HEIGHT`           | `${scrollHeight}`          |
 | [Scroll Width](#scroll-width)                       | `SCROLL_WIDTH`            | `${scrollWidth}`           |
@@ -1219,7 +1220,7 @@ Provides the total time from the time page has become visible to the time a ping
 
 #### Total Visible Time
 
-Provides the total time for which the element has met the `visiblitySpec`conditions at time this ping is sent.
+Provides the total time for which the element has met the `visibilitySpec`conditions at time this ping is sent.
 
 -   **platform variable**: N/A
 -   **amp-analytics variable**: `${totalVisibleTime}`
diff --git a/docs/spec/amp-video-interface.md b/docs/spec/amp-video-interface.md
index 5c6c80045966..699b39cbc575 100644
--- a/docs/spec/amp-video-interface.md
+++ b/docs/spec/amp-video-interface.md
@@ -39,7 +39,6 @@ these players implement.
 -   [amp-nexxtv-player](https://amp.dev/documentation/components/amp-nexxtv-player)
 -   [amp-ooyala-player](https://amp.dev/documentation/components/amp-ooyala-player)
 -   [amp-powr-player](https://amp.dev/documentation/components/amp-powr-player)
--   [amp-redbull-player](https://amp.dev/documentation/components/amp-redbull-player)
 -   [amp-vimeo](https://amp.dev/documentation/components/amp-vimeo)
 -   [amp-viqeo-player](https://amp.dev/documentation/components/amp-viqeo-player)
 -   [amp-wistia-player](https://amp.dev/documentation/components/amp-wistia-player)
diff --git a/docs/spec/auto-lightbox.md b/docs/spec/auto-lightbox.md
index 79c8e548f742..b4fcf5fbb86e 100644
--- a/docs/spec/auto-lightbox.md
+++ b/docs/spec/auto-lightbox.md
@@ -53,7 +53,7 @@ To disable it on a particular document section:
 </section>
 ```
 
-Or to disable it for your entire document altogether:
+To disable it for your entire document altogether:
 
 ```html
 <body data-amp-auto-lightbox-disable>
@@ -61,6 +61,14 @@ Or to disable it for your entire document altogether:
 </body>
 ```
 
+Or to prevent automatically loading of `amp-auto-lightbox` script on page load:
+
+```html
+<html ⚡ lang="en" data-amp-auto-lightbox-disable>
+  <!-- Prevent automatically loading of `amp-auto-lightbox` script on page-load -->
+</html>
+```
+
 If you'd like manual tuning of disabled/enabled images and/or grouping, please use
 [`amp-lightbox-gallery`](https://amp.dev/documentation/components/amp-lightbox-gallery)
 directly.
diff --git a/docs/spec/bento-common-props.md b/docs/spec/bento-common-props.md
deleted file mode 100644
index 6488333a2018..000000000000
--- a/docs/spec/bento-common-props.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# Common Props in Preact/React Bento Components
-
-The following are common props that should be be supported in al Bento Preact/React Bento Components when possible.
-
-## `as`
-
-Allows consumer to customize the html tag that is used to implement a component.
-
-## `class` (Preact only)
-
-Allows consumer to add class(es) to the given component.
-
-## `className` (React only)
-
-Allows consumer to add class(es) to the given component.
-
-## `id`
-
-Allows consumer to set the `id` attribute on the given component.
-
-## `role`
-
-Allows consumer to set the `role` attribute on the given component to control accessibility characteristics.
-
-## `tabIndex`
-
-Allows consumer to set the `tabIndex` attribute on the given component to control tab order.
diff --git a/docs/spec/email/amp-email-format.md b/docs/spec/email/amp-email-format.md
index 075be4d0f786..c1938f65478a 100644
--- a/docs/spec/email/amp-email-format.md
+++ b/docs/spec/email/amp-email-format.md
@@ -32,7 +32,7 @@ An AMP email message MUST
 -   <a name="ampd"></a>contain a top-level `<html ⚡4email>` tag (`<html amp4email>` is accepted as well). [🔗](#ampd)
 -   <a name="crps"></a>contain `<head>` and `<body>` tags (They are optional in HTML). [🔗](#crps)
 -   <a name="chrs"></a>contain a `<meta charset="utf-8">` tag as the first child of their head tag. [🔗](#chrs)
--   <a name="scrpt"></a>contain a `<script async src="https://cdn.ampproject.org/v0.js"></script>` tag inside their head tag. [🔗](#scrpt)
+-   <a name="script"></a>contain a `<script async src="https://cdn.ampproject.org/v0.js"></script>` tag inside their head tag. [🔗](#script)
 -   <a name="boilerplate"></a>contain amp4email boilerplate (`<style amp4email-boilerplate>body{visibility:hidden}</style>`) inside their head tag to initially hide the content until AMP JS is loaded. [🔗](#boilerplate)
 
 The entire AMPHTML markup must not exceed 200,000 bytes.
diff --git a/docs/testing.md b/docs/testing.md
index 6be4df44ed5d..0cef52308f81 100644
--- a/docs/testing.md
+++ b/docs/testing.md
@@ -276,35 +276,49 @@ Stories can show configuration controls for manual testing of component paramete
 
 > 📖 Storybook documentation: [What's a Story?](https://storybook.js.org/docs/react/get-started/whats-a-story)
 
-This repository has two separate Storybooks for different evironments: **`amp`** and **`preact`**. They list either AMP elements or Preact components respectively.
-
 ### Launching Storybook
 
-You may launch Storybooks for both environments by running:
+You may launch the `preact` Storybook by running:
 
 ```sh
 amp storybook
 ```
 
-This command launches a separate browser tab for each Storybook, on `localhost:9001` and `:9002`.
+You may launch a specific environment by providing `--storybook_env`:
 
-You may launch a single environment by specifying `--storybook_env`:
+-   **`preact`**
 
-```sh
-amp storybook --storybook_env=preact
-```
+    ```sh
+    amp storybook --storybook_env=preact
+    ```
+
+-   **`react`**
+
+    ```sh
+    amp storybook --storybook_env=react
+    ```
 
-> Launching the `amp` environment also initiates the build-and-serve task that's normally launched using the [`amp` command](#testing-commands). This provides an additional server on `localhost:8000`.
+    > Launching the **`react`** environment requires component bundles. You should ensure that they're present in `extensions/**/dist` directories beforehand, by running `amp build --extensions=...` for all Bento components.
+
+-   **`amp`**
+
+    ```sh
+    amp storybook --storybook_env=amp
+    ```
+
+    > Launching the **`amp`** environment also initiates the build-and-serve task that's normally launched using the [`amp` command](#testing-commands). This provides an additional server on `localhost:8000`.
 
 ### Writing test scenarios
 
-Test scenarios (stories) are located inside a component's directory. Their filename suffix determines whether they run on an `amp` or `preact` environment:
+Test scenarios (stories) are located inside a component's directory. Their filename suffix determines whether they run on the `amp` environment, or on the `preact` and `react` environments:
 
--   **Preact** Stories end with `.js`:
+-   **`preact`** Stories end with `.js`:
 
     `extensions/amp-example/0.1/storybook/Basic.js`
 
--   **AMP** Stories end with `.amp.js`:
+-   **`react`** Stories use the same files as **`preact`**.
+
+-   **`amp`** Stories end with `.amp.js`:
 
     `extensions/amp-example/0.1/storybook/Basic.amp.js`
 
@@ -355,13 +369,13 @@ firebase deploy
 
 If you are only testing a single file, you can use `amp firebase --file=path/to/my/file.amp.html` to avoid copying over all of `test/manual` and `examples`. It will copy over the specified file to `firebase/index.html`, which simplifies debugging.
 
-After deploying, you can access your project publically at its hosting URL `https://your-project-name.firebaseapp.com`.
+After deploying, you can access your project publicly at its hosting URL `https://your-project-name.firebaseapp.com`.
 
 Additionally, you can create multiple projects and switch between them in the CLI using `firebase use your-project-name`.
 
 #### Testing Ads
 
-Testing ads in deployed demos requires allowlisting of 3p urls. You can do this by adding your intended deployment hostname as an environemnt variable `AMP_TESTING_HOST` and using the `fortesting` flag. For example:
+Testing ads in deployed demos requires allowlisting of 3p urls. You can do this by adding your intended deployment hostname as an environment variable `AMP_TESTING_HOST` and using the `fortesting` flag. For example:
 
 ```sh
 export AMP_TESTING_HOST="my-project.firebaseapp.com"
@@ -387,12 +401,12 @@ The task will kick off `amp build` and then `amp serve` before running the tests
 
 ## Performance Testing Node Build Tools
 
-You can create flamecharts for any node process used by the build system by leveraging `0x` which is included as a `devDepenendency`.
+You can create flamecharts for any node process used by the build system by leveraging `0x`.
 
-Here's an example for `amp dist --closure_concurrency=1`:
+Here's an example for `amp dist`:
 
 ```sh
-npx 0x -o node_modules/.bin/amp dist --closure_concurrency=1
+npx 0x -o node_modules/.bin/amp dist
 ```
 
 Important to note is `0x` will automatically create a flamechart and a serving folder locally within the repository, please don't add them to PRs!
diff --git a/docs/web-standards-related-to-amp.md b/docs/web-standards-related-to-amp.md
index b3be001b8a20..021c3dc766c3 100644
--- a/docs/web-standards-related-to-amp.md
+++ b/docs/web-standards-related-to-amp.md
@@ -4,7 +4,7 @@ Date: 2018-08-26
 
 | Standard/feature                                                                                                                                  |                                                                   Relation                                                                    |                                                                                                                                                                               Status |
 | ------------------------------------------------------------------------------------------------------------------------------------------------- | :-------------------------------------------------------------------------------------------------------------------------------------------: | -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |
-| [Web Packaging](https://github.com/WICG/webpackage)                                                                                               |                                         Privacy-preserving preloading from cache under publisher URL                                          | Initial version of spec final. [Shipping in Chrome M73](https://groups.google.com/a/chromium.org/forum/#!msg/blink-dev/gPH_BcOBEtc/Z41GR0mwEQAJ), IETF concensus seeking in progress |
+| [Web Packaging](https://github.com/WICG/webpackage)                                                                                               |                                         Privacy-preserving preloading from cache under publisher URL                                          | Initial version of spec final. [Shipping in Chrome M73](https://groups.google.com/a/chromium.org/forum/#!msg/blink-dev/gPH_BcOBEtc/Z41GR0mwEQAJ), IETF consensus seeking in progress |
 | [Portals](https://github.com/WICG/portals/blob/main/README.md)                                                                                    |                              AMP Carousel like UI with navigation to publisher (alternative to iframe promotion)                              |                                                                                                                              Iterating on spec. Prototype implementation in Chromium |
 | [Performance Timeline](https://w3c.github.io/performance-timeline/)                                                                               |                                Real world metric collection. This is the framework. New metrics may be needed.                                |                                                                                                                                                           Shipping in first browsers |
 | [Paint Timing 1](https://w3c.github.io/paint-timing/)                                                                                             |                                             Initial paint related metrics (performance assessment                                             |                                                                                                                                                           Shipping in first browsers |
diff --git a/docs/writing-css.md b/docs/writing-css.md
index 724f911f358e..ce392dbf1ac7 100644
--- a/docs/writing-css.md
+++ b/docs/writing-css.md
@@ -50,10 +50,10 @@ html > body div#pagewrap ul#summer-drinks > li.favorite
 #summer-drinks::after
 ```
 
-A selector can contain a class, id, pseudo elements, psuedo classes , :not(), and a combination
+A selector can contain a class, id, pseudo elements, pseudo classes, :not(), and a combination
 of any of these and many more. For a comprehensive list of all CSS selectors, see https://developer.mozilla.org/en-US/docs/Web/CSS/Reference#Selectors.
 
-In general, the order of the CSS selectors do not affect which rules get applied to your CSS,
+In general, the order of the CSS selectors does not affect which rules get applied to your CSS,
 unless the selectors have the same specificity and apply to at least one element in common.
 Well-written CSS will work perfectly fine even when the selectors are re-ordered (for example, when reordering imports in a css file). In the real world, it's hard to achieve this, especially
 when we import third-party CSS (which can change at any time).
@@ -81,7 +81,7 @@ To compute specificity, use this online calculator: https://specificity.keegan.s
 
 ### Modifying an existing Selector
 
-This is a bit more tricky than creating a new selector (with completely new properties).
+This is a bit trickier than creating a new selector (with completely new properties).
 
 AMP is a versioned library that a lot of websites use. You might ask yourself, "But I am only changing CSS, how can
 this break AMP?". Well, you can! All it takes to break backwards compatibility is replacing a selector with another
diff --git a/examples/.eslintrc.js b/examples/.eslintrc.js
index cc72fc4955f5..84711faddde7 100644
--- a/examples/.eslintrc.js
+++ b/examples/.eslintrc.js
@@ -26,7 +26,6 @@ module.exports = {
     'local/no-log-array': 0,
     'local/no-mixed-operators': 0,
     'local/no-module-exports': 0,
-    'local/no-static-this': 0,
     'local/no-style-display': 0,
     'local/no-style-property-setting': 0,
     'local/no-unload-listener': 0,
diff --git a/examples/ac-creative.js b/examples/ac-creative.js
index e0241f414054..46b2fad7b227 100644
--- a/examples/ac-creative.js
+++ b/examples/ac-creative.js
@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
+
 if (!window.context) {
   // window.context doesn't exist yet, must perform steps to create it
   // before using it
diff --git a/examples/adman.amp.html b/examples/adman.amp.html
new file mode 100644
index 000000000000..75507de9fa92
--- /dev/null
+++ b/examples/adman.amp.html
@@ -0,0 +1,107 @@
+<!doctype html>
+<html ⚡ lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <title>Sample document</title>
+    <link rel="canonical" href="./regular-html-version.html" />
+    <meta
+      name="viewport"
+      content="width=device-width,minimum-scale=1,initial-scale=1"
+    />
+    <style amp-custom>
+      h1 {
+        color: red;
+      }
+    </style>
+    <script type="application/ld+json">
+      {
+        "@context": "http://schema.org",
+        "@type": "NewsArticle",
+        "headline": "Article headline",
+        "image": ["thumbnail1.jpg"],
+        "datePublished": "2015-02-05T08:00:00+08:00"
+      }
+    </script>
+    <script
+      async
+      custom-element="amp-carousel"
+      src="https://cdn.ampproject.org/v0/amp-carousel-0.1.js"
+    ></script>
+    <script
+      async
+      custom-element="amp-ad"
+      src="https://cdn.ampproject.org/v0/amp-ad-0.1.js"
+    ></script>
+    <style amp-boilerplate>
+      body {
+        -webkit-animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+        -moz-animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+        -ms-animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+        animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+      }
+      @-webkit-keyframes -amp-start {
+        from {
+          visibility: hidden;
+        }
+        to {
+          visibility: visible;
+        }
+      }
+      @-moz-keyframes -amp-start {
+        from {
+          visibility: hidden;
+        }
+        to {
+          visibility: visible;
+        }
+      }
+      @-ms-keyframes -amp-start {
+        from {
+          visibility: hidden;
+        }
+        to {
+          visibility: visible;
+        }
+      }
+      @-o-keyframes -amp-start {
+        from {
+          visibility: hidden;
+        }
+        to {
+          visibility: visible;
+        }
+      }
+      @keyframes -amp-start {
+        from {
+          visibility: hidden;
+        }
+        to {
+          visibility: visible;
+        }
+      }
+    </style>
+    <noscript
+      ><style amp-boilerplate>
+        body {
+          -webkit-animation: none;
+          -moz-animation: none;
+          -ms-animation: none;
+          animation: none;
+        }
+      </style></noscript
+    >
+    <script async src="https://cdn.ampproject.org/v0.js"></script>
+  </head>
+  <body>
+    <h1>Sample document</h1>
+    <p>Some text</p>
+    <amp-ad
+      width="300"
+      height="250"
+      type="adman"
+      data-ws="802"
+      data-host="staging.grxchange.gr"
+    >
+    </amp-ad>
+  </body>
+</html>
diff --git a/examples/amp-access-fewcents.html b/examples/amp-access-fewcents.html
new file mode 100644
index 000000000000..545b99a7c53b
--- /dev/null
+++ b/examples/amp-access-fewcents.html
@@ -0,0 +1,328 @@
+<!--
+  Copyright 2022 The AMP HTML Authors. All Rights Reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS-IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the license.
+-->
+<!DOCTYPE html>
+<html ⚡ lang="en">
+  <!-- prettier-ignore -->
+  <head>
+    <meta charset="utf-8">
+    <title>amp-access-fewcents</title>
+    <script id="amp-access" type="application/json">
+      {
+        "vendor": "fewcents",
+        "noPingback": true,
+        "fewcents": {
+          "environment": "development",
+          "publisherLogoUrl" : "https://www.jagranimages.com/images/jagran-logo-2021.png",
+          "contentSelector" : "amp-access-fewcents-dialog",
+          "primaryColor" : "#FF6363",
+          "accessKey" : "localhost",
+          "category": "paywall",
+          "articleIdentifier": "mockArticleIdentifier"
+        }
+      }
+    </script>
+    <link rel="canonical" href="/examples/amp-access-fewcents.html">
+    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+    <style amp-custom>
+      .main-container {
+        height: auto;
+      }
+
+      .title {display: flex;align-items: center;justify-content: center;}
+
+      .title h1{
+        margin-bottom: 0px;
+      }
+
+      .navbar{
+        background-color: bisque;
+        border: black;
+        border-radius: 25px;
+        margin: 10px 10px;
+      }
+
+      .navbar-ul{
+        display: flex;
+        list-style-type: none;
+        margin-left: 10px;
+      }
+
+      .navbar-ul li{
+        background: burlywood;
+        padding: 10px;
+        margin-right: 10px;
+        font-size: 18px;
+        font-family: "Verdana, Geneva, Tahoma, sans-serif";
+      }
+
+      .content{
+        display: flex;
+        justify-content: center;
+        flex-direction: column;
+      }
+
+      .content p{
+        padding: 0px 160px;
+        font-size: 1.1875rem;
+        font-family: 'Noticia Text', serif;
+        line-height: 1.6;
+        margin-bottom: 30px;
+      }
+
+      .entry-thumbnail {
+        display: flex;
+        justify-content: center;
+      }
+
+      .premium-content{
+        display: flex;
+        justify-content: center;
+        flex-direction: column;
+      }
+
+      .premium-content p{
+        padding: 0px 160px;
+        font-size: 1.1875rem;
+        font-family: 'Noticia Text', serif;
+        line-height: 1.6;
+        margin-bottom: 30px;
+      }
+
+      .footer{
+        padding: 0px 20px;
+        display: flex;
+        align-items: center;
+        justify-content: space-evenly;
+        margin-top: 100px;
+        height: 30vh;
+        background: black;
+      }
+
+      .footer ul li {
+        color: blanchedalmond;
+      }
+
+      .footer ul h3 {
+        color: blanchedalmond;
+      }
+    </style>
+    <script async custom-element="amp-access" src="https://cdn.ampproject.org/v0/amp-access-0.1.js"></script>
+    <script async custom-element="amp-access-fewcents" src="https://cdn.ampproject.org/v0/amp-access-fewcents-0.1.js"></script>
+    <script async custom-element="amp-analytics" src="https://cdn.ampproject.org/v0/amp-analytics-0.1.js"></script>
+    <script async src="https://cdn.ampproject.org/v0.js"></script>
+  </head>
+  <body>
+    <amp-analytics type="segment">
+      <script type="application/json">
+        {
+          "vars": {
+            "writeKey": "gNo9b6N79CFIFJqFyOCELKS6Ex0JcfBY",
+            "name": "fewcents-paywall"
+          },
+          "triggers": {
+            "click": {
+              "on": "click",
+              "selector": ".aaf-purchase-button",
+              "request": "track",
+              "vars": {
+                "event": "Unlock button clicked"
+              }
+            },
+            "accessauthorizationReceived": {
+              "on": "access-authorization-received",
+              "request": "track",
+              "vars": {
+                "event": "access-authorization-received"
+              },
+              "extraUrlParams": {
+                "properties.access": "AUTHDATA(access)",
+                "properties.data": "AUTHDATA(data)"
+              }
+            },
+            "accessAuthorizationFailed": {
+              "on": "access-authorization-failed",
+              "request": "track",
+              "vars": {
+                "event": "access-authorization-failed"
+              },
+              "extraUrlParams": {
+                "properties.access": "AUTHDATA(access)",
+                "properties.data": "AUTHDATA(data)"
+              }
+            },
+            "accessLoginStarted": {
+              "on": "access-login-started",
+              "request": "track",
+              "vars": {
+                "event": "access-login-started"
+              },
+              "extraUrlParams": {
+                "properties.access": "AUTHDATA(access)",
+                "properties.data": "AUTHDATA(data)"
+              }
+            },
+            "accessLoginSuccess": {
+              "on": "access-login-success",
+              "request": "track",
+              "vars": {
+                "event": "access-login-success"
+              },
+              "extraUrlParams": {
+                "properties.access": "AUTHDATA(access)",
+                "properties.data": "AUTHDATA(data)"
+              }
+            },
+            "accessLoginRejected": {
+              "on": "access-login-rejected",
+              "request": "track",
+              "vars": {
+                "event": "access-login-rejected"
+              },
+              "extraUrlParams": {
+                "properties.access": "AUTHDATA(access)",
+                "properties.data": "AUTHDATA(data)"
+              }
+            },
+            "accessLoginFailed": {
+              "on": "access-login-failed",
+              "request": "track",
+              "vars": {
+                "event": "access-login-failed"
+              },
+              "extraUrlParams": {
+                "properties.access": "AUTHDATA(access)",
+                "properties.data": "AUTHDATA(data)"
+              }
+            }
+          }
+        }
+      </script>
+    </amp-analytics>
+    <div class="main-container">
+      <div class="title">
+        <h1>Weekly Digest: Kyiv Post Closure, Anti-Oligarch Law in Ukraine</h1>
+      </div>
+      <div class="navbar">
+        <ul class="navbar-ul">
+          <li>Industry News</li>
+          <li>Business Model</li>
+          <li>About Us</li>
+        </ul>
+      </div>
+      <div class="content">
+        <div class="entry-thumbnail">
+          <img
+            width="518"
+            height="291"
+            src="./Weekly Digest_ Kyiv Post Closure, Anti-Oligarch Law in Ukraine - The Fix_files/the-fix-digest-16.png"
+            class="attachment-post-thumbnail size-post-thumbnail wp-post-image"
+            alt=""
+            loading="lazy"
+            srcset="
+              http://wordpress.dev.fewcents.co/wp-content/uploads/2021/11/the-fix-digest-16.png           5184w,
+              http://wordpress.dev.fewcents.co/wp-content/uploads/2021/11/the-fix-digest-16-300x169.png    300w,
+              http://wordpress.dev.fewcents.co/wp-content/uploads/2021/11/the-fix-digest-16-1024x576.png  1024w,
+              http://wordpress.dev.fewcents.co/wp-content/uploads/2021/11/the-fix-digest-16-768x432.png    768w,
+              http://wordpress.dev.fewcents.co/wp-content/uploads/2021/11/the-fix-digest-16-1536x864.png  1536w,
+              http://wordpress.dev.fewcents.co/wp-content/uploads/2021/11/the-fix-digest-16-2048x1152.png 2048w,
+              http://wordpress.dev.fewcents.co/wp-content/uploads/2021/11/the-fix-digest-16-1200x675.png  1200w,
+              http://wordpress.dev.fewcents.co/wp-content/uploads/2021/11/the-fix-digest-16-1260x709.png  1260w,
+              http://wordpress.dev.fewcents.co/wp-content/uploads/2021/11/the-fix-digest-16-800x450.png    800w,
+              http://wordpress.dev.fewcents.co/wp-content/uploads/2021/11/the-fix-digest-16-588x331.png    588w,
+              http://wordpress.dev.fewcents.co/wp-content/uploads/2021/11/the-fix-digest-16-107x60.png     107w,
+              http://wordpress.dev.fewcents.co/wp-content/uploads/2021/11/the-fix-digest-16-160x90.png     160w
+            "
+            sizes="(max-width: 5184px) 100vw, 5184px"
+          />
+        </div>
+        <p>
+          Welcome to The Fix’s weekly news digest! Every week, we bring you
+          important news stories from the world of media – and try to put them
+          in a wider context.
+        </p>
+        <p>
+          This week, we have two detailed stories on the recent media shakeup in
+          Ukraine and a roundup of other noteworthy media news.
+        </p>
+        <p>
+          The closure appears to be a continuation of the conflict between the
+          publisher and the editorial team, particularly over the plans to
+          launch a Ukrainian-language outlet under the paper’s brand. Analysts
+          also say the move might be the owner’s attempt to avoid angering the
+          authorities – whom Kivan’s construction business depends on – over
+          Kyiv Post’s coverage.
+        </p>
+      </div>
+      <section amp-access="NOT access" amp-access-hide>
+        <div id="amp-access-fewcents-dialog"></div>
+      </section>
+
+      <section amp-access="error" amp-access-hide class="error-section">
+        Oops... Something broke.
+      </section>
+
+      <div amp-access="access" amp-access-hide class="premium-content">
+        <p>
+          Perhaps the most notable media news story in the CEE region came from
+          Ukraine this week with the closure of Kyiv Post, the country’s leading
+          English-language publication.
+        </p>
+
+        <p>
+          Over the past several decades, it has been a trusted source of news
+          and a lodestar of independent journalism. However, on Monday the
+          paper’s owner, construction tycoon Adnan Kivan, announced the outlet
+          will close “for a short time,” saying he hopes to reopen it “bigger
+          and better” in the future.
+        </p>
+        <p>
+          Kyiv Post’s editorial team then released a statement clarifying that
+          all journalists were fired effective immediately. The journalists
+          called the actions “an act of vengeance” by the owner and an attempt
+          to “[get] rid of inconvenient, fair and honest journalists.”
+        </p>
+        <p>
+          The closure has attracted multiple concerned comments from Kyiv Post
+          readers, which include high-level foreign diplomats, expats, and
+          business leaders. In an interview with Columbia Journalism Review, the
+          paper’s now-former chief editor Brian Bonner said he is “talking to
+          deeply concerned ambassadors.”
+        </p>
+      </div>
+
+      <div class="footer">
+        <ul>
+          <h3 class="footer-widget-title">Follow Us</h3>
+          <li>Twitter</li>
+          <li>Facebook</li>
+          <li>Linkedin</li>
+          <li>Telegram</li>
+          <li>Deutsch</li>
+        </ul>
+        <ul>
+          <h3 class="footer-widget-title">Menu</h3>
+          <li>Industry News</li>
+          <li>Business models</li>
+          <li>Organization building</li>
+          <li>Research</li>
+          <li>Advertise on The Fix</li>
+          <li>About us</li>
+        </ul>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/examples/amp-ad-exit-conversion.html b/examples/amp-ad-exit-conversion.html
index 6a7f23ee7f34..fb9811a850e1 100644
--- a/examples/amp-ad-exit-conversion.html
+++ b/examples/amp-ad-exit-conversion.html
@@ -26,12 +26,10 @@ <h1 on="tap:exit-api.exit(target='landingPage')" role="button" tabindex="1">CLIC
       {
         "targets": {
           "landingPage": {
-            "finalUrl": "https://example.com?nis=ATTRIBUTION_REPORTING_STATUS",
+            "finalUrl": "https://landingpage.example",
             "behaviors": {
               "browserAdConversion" : {
-                "attributiondestination": "https://example.com",
-                "attributionsourceeventid": "EFnZ8GunL1xrwNTIHbXrvQ==",
-                "attributionreportto": "https://google.com"
+                "attributionsrc": "https://tracker.example?nis=ATTRIBUTION_REPORTING_STATUS"
               }
             }
           }
diff --git a/examples/amp-ad/ads.amp.esm.html b/examples/amp-ad/ads.amp.esm.html
index 84a19eef7be1..25fb31ea8e42 100644
--- a/examples/amp-ad/ads.amp.esm.html
+++ b/examples/amp-ad/ads.amp.esm.html
@@ -85,6 +85,7 @@
         <option>adition</option>
         <option>adman</option>
         <option>admanmedia</option>
+        <option>admatic</option>
         <option>admixer</option>
         <option>adnuntius</option>
         <option>adocean</option>
@@ -115,6 +116,7 @@
         <option>aja</option>
         <option>amoad</option>
         <option>aniview</option>
+        <option>appmonsta</option>
         <option>appnexus</option>
         <option>appvador</option>
         <option>atomx</option>
@@ -169,6 +171,7 @@
         <option>imedia</option>
         <option>imobile</option>
         <option>imonomy</option>
+        <option>incrementx</option>
         <option>industrybrains</option>
         <option>inmobi</option>
         <option>innity</option>
@@ -180,7 +183,6 @@
         <option>kiosked</option>
         <option>kixer</option>
         <option>kuadio</option>
-        <option>lentainform</option>
         <option>ligatus</option>
         <option>lockerdome</option>
         <option>logly</option>
@@ -213,6 +215,8 @@
         <option>openx</option>
         <option>opinary</option>
         <option>outbrain</option>
+        <option>piberica</option>
+        <option>pixad</option>
         <option>pixels</option>
         <option>plista</option>
         <option>polymorphicads</option>
@@ -240,6 +244,7 @@
         <option>sas</option>
         <option>seedingalliance</option>
         <option>sekindo</option>
+        <option>sevio</option>
         <option>sharethrough</option>
         <option>shemedia</option>
         <option>sklik</option>
@@ -286,7 +291,6 @@
         <option>whopainfeed</option>
         <option>wpmedia</option>
         <option>xlift</option>
-        <option>yahoo</option>
         <option>yahoojp</option>
         <option>yahoonativeads</option>
         <option>yandex</option>
@@ -510,6 +514,16 @@ <h2>AdmanMedia</h2>
       data-id="8e916419">
   </amp-ad>
 
+  <h2>AdMatic</h2>
+  <amp-ad
+    type="admatic"
+    width="300"
+    height="250"
+    data-ad-type-id="standard"
+    data-ad-network="adm-pub-194162670389"
+    data-ad-publisher="65943e194d11b285b6173588">
+  </amp-ad>
+
   <h2>Admixer</h2>
   <amp-ad width="300" height="250"
       type="admixer"
@@ -820,6 +834,15 @@ <h2>Aniview</h2>
           data-channelId="5a5f17a728a06102d14c2718">
   </amp-ad>
 
+  <h2>AppMonsta</h2>
+  <amp-ad
+    width="300"
+    height="250"
+    type="appmonsta"
+    data-placement-id="test"
+  >
+  </amp-ad>
+
   <h2>AppNexus with JSON based configuration multi ad</h2>
   <amp-ad width="728" height="90" type="appnexus" data-target="apn_ad_2"
       json='{"pageOpts":{"member": 958}, "adUnits": [{"disablePsa": true, "tagId": 6063968,"sizes": [300,250],"targetId": "apn_ad_1"}, {"tagId": 6063968,"sizes": [728,90],"targetId":"apn_ad_2"}]}'>
@@ -1301,9 +1324,8 @@ <h2>iBillboard 300x250 banner</h2>
   <h2>Idealmedia</h2>
   <amp-ad width="600" height="320"
           type="idealmedia"
-          data-publisher="test_20190314_vt-24403_appr1.com"
-          data-widget="689384"
-          data-container="M416878ScriptRootC689384">
+          data-website="473218"
+          data-widget="1629484">
   </amp-ad>
 
   <h2>I-Mobile 320x50 banner</h2>
@@ -1335,6 +1357,12 @@ <h2>Imedia</h2>
       data-positions='[{"id":"p1", "zoneId":"seznam.novinky.ikona2"}, {"id":"p2", "zoneId":"seznam.novinky.ikona"}]'>
   </amp-ad>
 
+  <h2>IncrementX</h2>
+  <amp-ad width="320" height="50"
+  type="incrementx"
+  data-vzid="PNXW125273VB49B96">
+ </amp-ad>
+
   <h2>Index Exchange Header Tag</h2>
   <amp-ad width="300" height="250"
       type="ix"
@@ -1424,14 +1452,6 @@ <h2>Kuadio</h2>
     data-widget-id="78a32765-30f1-4ac1-a3e7-b42ebc6df88a">
   </amp-embed>
 
-  <h2>Lentainform</h2>
-  <amp-ad width="600" height="320"
-          type="lentainform"
-          data-publisher="test.exhange.noidpartners.com"
-          data-widget="689383"
-          data-container="M246626ScriptRootC689383">
-  </amp-ad>
-
   <h2>Ligatus</h2>
   <amp-ad width="300" height="250"
       type="ligatus"
@@ -1518,9 +1538,8 @@ <h2>Meg</h2>
   <h2>Mgid</h2>
   <amp-ad width="600" height="320"
           type="mgid"
-          data-publisher="barada.com"
-          data-widget="353317"
-          data-container="M207275ScriptRootC353317">
+          data-website="579198"
+          data-widget="996801">
   </amp-ad>
 
   <h2>MicroAd 320x50 banner</h2>
@@ -1698,6 +1717,24 @@ <h2>Outbrain widget</h2>
       data-testMode="true">
   </amp-embed>
 
+  <h2>PIberica</h2>
+  <amp-ad width="300" height="1"
+      type="piberica"
+      layout="responsive"
+      data-publisher="test"
+      data-slot="1">
+  </amp-ad>
+
+  <h2>Pixad</h2>
+  <amp-ad
+    type="pixad"
+    width="300"
+    height="250"
+    data-ad-type-id="standard"
+    data-ad-network="px-pub-6514176248"
+    data-ad-publisher="654b7d501cd4137ca98e020d">
+  </amp-ad>
+
   <h2>Pixels Examples</h2>
   <amp-ad width="300" height="250"
       type="pixels"
@@ -1883,12 +1920,13 @@ <h2>recomAD</h2>
   </amp-ad>
 
   <h2>Relap</h2>
-  <amp-ad width="auto" height="750"
+  <amp-ad width="auto" height="790"
       type="relap"
       layout="fixed-height"
       data-token="D3UMgQWBqleq1tPW"
-      data-url="http://bigpicture.ru"
-      data-anchorid="i0xMMY1MoliiZWVl">
+      data-url="https://relap.mail.ru/"
+      data-anchorid="-FVV_OEgYpljt7e3"
+      data-version="v7">
   </amp-ad>
 
   <h2>Remixd</h2>
@@ -1984,6 +2022,12 @@ <h2>Sekindo</h2>
           data-spaceId="14071">
   </amp-ad>
 
+  <h2>Sevio</h2>
+  <amp-ad width="300" height="250"
+          type="sevio"
+          data-zone="38da4be8-5d6e-4767-9d7c-0694c28343fc">
+  </amp-ad>
+
   <h2>Sharethrough</h2>
   <amp-ad width="300" height="150"
       type="sharethrough"
@@ -2317,14 +2361,6 @@ <h2>Xlift native ad</h2>
       data-mediaid="mamastar">
   </amp-ad>
 
-  <h2>Yahoo Display</h2>
-  <amp-ad width="316" height="264"
-      type="yahoo"
-      data-sid="954014446"
-      data-site="news"
-      data-sa='{"LREC":"300x250","secure":"true","content":"no_expandable;"}'>
-  </amp-ad>
-
   <h2>Yahoo Native Ads</h2>
   <amp-embed width="320" height="320"
     type="yahoonativeads"
diff --git a/examples/amp-ad/ads.amp.html b/examples/amp-ad/ads.amp.html
index 6733aad21d80..0c9d76bfd481 100644
--- a/examples/amp-ad/ads.amp.html
+++ b/examples/amp-ad/ads.amp.html
@@ -1,5 +1,6 @@
 <!doctype html>
 <html ⚡ lang="en">
+
 <head>
   <meta charset="utf-8">
   <title>Ad examples</title>
@@ -51,12 +52,19 @@
       height: 100px;
     }
 
+    amp-ad[type="adenza"] {
+      max-width: unset;
+      padding: 0;
+      border: none;
+    }
+
     amp-ad[type="adsloom"] {
       width: 100%;
       max-width: 980px;
       margin: 18px auto;
       padding: 0;
     }
+
     amp-ad[type="digiteka"] {
       width: 300px;
       height: 250px;
@@ -64,6 +72,12 @@
       margin: 18px auto;
       padding: 0;
     }
+
+    amp-ad[type="clever"] {
+      max-width: unset;
+      padding: 0;
+      border: none;
+    }
   </style>
   <script async custom-element="amp-ad" src="https://cdn.ampproject.org/v0/amp-ad-0.1.js"></script>
   <script async custom-element="amp-analytics" src="https://cdn.ampproject.org/v0/amp-analytics-0.1.js"></script>
@@ -151,681 +165,548 @@
        run a local server.
       2) keep the list in alphabetic order
     -->
-    <option>1wo</option>
-    <option>24smi</option>
-    <option>a8</option>
-    <option>a9</option>
-    <option>accesstrade</option>
-    <option>adagio</option>
-    <option>adblade</option>
-    <option>adbutler</option>
-    <option>adfox</option>
-    <option>adgeneration</option>
-    <option>adglare</option>
-    <option>adhese</option>
-    <option>adincube</option>
-    <option>adition</option>
-    <option>adman</option>
-    <option>admanmedia</option>
-    <option>admixer</option>
-    <option>adnuntius</option>
-    <option>adocean</option>
-    <option>adop</option>
-    <option>adpicker</option>
-    <option>adplugg</option>
-    <option>adpon</option>
-    <option>adpushup</option>
-    <option>adreactor</option>
-    <option>adsense</option>
-    <option>adsensor</option>
-    <option>adservsolutions</option>
-    <option>adskeeper</option>
-    <option>adsloom</option>
-    <option>adsnative</option>
-    <option>adspeed</option>
-    <option>adspirit</option>
-    <option>adstir</option>
-    <option>adstyle</option>
-    <option>adtech</option>
-    <option>adtelligent</option>
-    <option>adthrive</option>
-    <option>adunity</option>
-    <option>aduptech</option>
-    <option>adventive</option>
-    <option>adverline</option>
-    <option>adverticum</option>
-    <option>advertserve</option>
-    <option>adyoulike</option>
-    <option>affiliateb</option>
-    <option>aja</option>
-    <option>amoad</option>
-    <option>amplified</option>
-    <option>andbeyond</option>
-    <option>aniview</option>
-    <option>anyclip</option>
-    <option>appnexus</option>
-    <option>appvador</option>
-    <option>atomx</option>
-    <option>avantisvideo</option>
-    <option>baidu</option>
-    <option>beaverads</option>
-    <option>beopinion</option>
-    <option>bidtellect</option>
-    <option>blade</option>
-    <option>brainy</option>
-    <option>bringhub</option>
-    <option>broadbandy</option>
-    <option>byplay</option>
-    <option>caajainfeed</option>
-    <option>capirs</option>
-    <option>caprofitx</option>
-    <option>cedato</option>
-    <option>conative</option>
-    <option>connatix</option>
-    <option>contentad</option>
-    <option>criteo</option>
-    <option>csa</option>
-    <option>custom</option>
-    <option>dable</option>
-    <option>digiteka</option>
-    <option>directadvert</option>
-    <option>distroscale</option>
-    <option>dotandads</option>
-    <option>doubleclick</option>
-    <option>dynad</option>
-    <option>eadv</option>
-    <option>empower</option>
-    <option>Engageya</option>
-    <option>epeex</option>
-    <option>eplanning</option>
-    <option>exco</option>
-    <option>ezoic</option>
-    <option>f1e</option>
-    <option>f1h</option>
-    <option>feedad</option>
-    <option>felmat</option>
-    <option>finative</option>
-    <option>flite</option>
-    <option>fluct</option>
-    <option>forkmedia</option>
-    <option>freestar</option>
-    <option>freewheel</option>
-    <option>fusion</option>
-    <option>genieessp</option>
-    <option>giraff</option>
-    <option>glomex</option>
-    <option>gmossp</option>
-    <option>gumgum</option>
-    <option>holder</option>
-    <option>ibillboard</option>
-    <option>idealmedia</option>
-    <option>imedia</option>
-    <option>imobile</option>
-    <option>imonomy</option>
-    <option>industrybrains</option>
-    <option>inmobi</option>
-    <option>innity</option>
-    <option>insticator</option>
-    <option>invibes</option>
-    <option>ix</option>
-    <option>jixie</option>
-    <option>jubna</option>
-    <option>kargo</option>
-    <option>ketshwa</option>
-    <option>kiosked</option>
-    <option>kixer</option>
-    <option>kuadio</option>
-    <option>lentainform</option>
-    <option>ligatus</option>
-    <option>lockerdome</option>
-    <option>logly</option>
-    <option>loka</option>
-    <option>luckyads</option>
-    <option>macaw</option>
-    <option>mads</option>
-    <option>mantis-display</option>
-    <option>mediaad</option>
-    <option>marfeel</option>
-    <option>medianet</option>
-    <option>mediavine</option>
-    <option>meg</option>
-    <option>mgid</option>
-    <option>microad</option>
-    <option>miximedia</option>
-    <option>mixpo</option>
-    <option>monetizer101</option>
-    <option>mox</option>
-    <option>my6sense</option>
-    <option>myfinance</option>
-    <option>myoffrz</option>
-    <option>mytarget</option>
-    <option>myua</option>
-    <option>mywidget</option>
-    <option>nativeroll</option>
-    <option>nativery</option>
-    <option>nativo</option>
-    <option>navegg</option>
-    <option>nend</option>
-    <option>netletix</option>
-    <option>noddus</option>
-    <option>nokta</option>
-    <option>nws</option>
-    <option>oblivki</option>
-    <option>onead</option>
-    <option>onnetwork</option>
-    <option>openadstream</option>
-    <option>openx</option>
-    <option>opinary</option>
-    <option>outbrain</option>
-    <option>pixels</option>
-    <option>playstream</option>
-    <option>plista</option>
-    <option>polymorphicads</option>
-    <option>popin</option>
-    <option>ppstudio</option>
-    <option>pressboard</option>
-    <option>promoteiq</option>
-    <option>pubexchange</option>
-    <option>pubmine</option>
-    <option>pulse</option>
-    <option>pulsepoint</option>
-    <option>puffnetwork</option>
-    <option>purch</option>
-    <option>rakutenunifiedads</option>
-    <option>rbinfox</option>
-    <option>rcmwidget</option>
-    <option>readmo</option>
-    <option>realclick</option>
-    <option>recomad</option>
-    <option>recreativ</option>
-    <option>relap</option>
-    <option>remixd</option>
-    <option>revcontent</option>
-    <option>revjet</option>
-    <option>rfp</option>
-    <option>rnetplus</option>
-    <option>rubicon</option>
-    <option>runative</option>
-    <option>sabavision</option>
-    <option>sas</option>
-    <option>seedingalliance</option>
-    <option>seedtag</option>
-    <option>sekindo</option>
-    <option>sharethrough</option>
-    <option>shemedia</option>
-    <option>sklik</option>
-    <option>slimcutmedia</option>
-    <option>smartadserver</option>
-    <option>smartclip</option>
-    <option>smi2</option>
-    <option>smilewanted</option>
-    <option>sogouad</option>
-    <option>sortable</option>
-    <option>sona</option>
-    <option>sovrn</option>
-    <option>speakol</option>
-    <option>spotx</option>
-    <option>springAds</option>
-    <option>ssp</option>
-    <option>strossle</option>
-    <option>sulvo</option>
-    <option>sunmedia</option>
-    <option>svknative</option>
-    <option>swoop</option>
-    <option>taboola</option>
-    <option>tagon</option>
-    <option>tail</option>
-    <option>tcsemotion</option>
-    <option>teads</option>
-    <option>temedya</option>
-    <option>torimochi</option>
-    <option>tracdelight</option>
-    <option>trafficstars</option>
-    <option>triplelift</option>
-    <option>trugaze</option>
-    <option>uas</option>
-    <option>ucfunnel</option>
-    <option>unruly</option>
-    <option>uzou</option>
-    <option>valuecommerce</option>
-    <option>vdo.ai</option>
-    <option>videointelligence</option>
-    <option>videonow</option>
-    <option>viralize</option>
-    <option>vlyby</option>
-    <option>vmfive</option>
-    <option>webediads</option>
-    <option>weborama</option>
-    <option>widespace</option>
-    <option>wisteria</option>
-    <option>whopainfeed</option>
-    <option>wpmedia</option>
-    <option>xlift</option>
-    <option>yahoo</option>
-    <option>yahoofedads</option>
-    <option>yahoojp</option>
-    <option>yahoonativeads</option>
-    <option>yandex</option>
-    <option>yektanet</option>
-    <option>yengo</option>
-    <option>yieldbot</option>
-    <option>yieldmo</option>
-    <option>yieldpro</option>
-    <option>zedo</option>
-    <option>zen</option>
-    <option>zergnet</option>
-    <option>zucks</option>
-    </select>
-    <input type="submit" value="Go">
-  </form>
+        <option>1wo</option>
+        <option>24smi</option>
+        <option>4wmarketplace</option>
+        <option>a8</option>
+        <option>a9</option>
+        <option>accesstrade</option>
+        <option>adagio</option>
+        <option>adblade</option>
+        <option>adbutler</option>
+        <option>Adenza</option>
+        <option>adfox</option>
+        <option>adgeneration</option>
+        <option>adglare</option>
+        <option>adhese</option>
+        <option>adincube</option>
+        <option>adition</option>
+        <option>adman</option>
+        <option>admanmedia</option>
+        <option>admatic</option>
+        <option>admixer</option>
+        <option>adnuntius</option>
+        <option>adocean</option>
+        <option>adop</option>
+        <option>adpicker</option>
+        <option>adplugg</option>
+        <option>adpon</option>
+        <option>adpushup</option>
+        <option>adreactor</option>
+        <option>ads2bid</option>
+        <option>adsense</option>
+        <option>adsensor</option>
+        <option>adservsolutions</option>
+        <option>adskeeper</option>
+        <option>adsloom</option>
+        <option>adsnative</option>
+        <option>adspeed</option>
+        <option>adspirit</option>
+        <option>adstir</option>
+        <option>adstyle</option>
+        <option>adtech</option>
+        <option>adtelligent</option>
+        <option>adthrive</option>
+        <option>adunity</option>
+        <option>aduptech</option>
+        <option>adventive</option>
+        <option>adverline</option>
+        <option>adverticum</option>
+        <option>advertserve</option>
+        <option>adyoulike</option>
+        <option>affiliateb</option>
+        <option>affinity</option>
+        <option>aja</option>
+        <option>amoad</option>
+        <option>amplified</option>
+        <option>andbeyond</option>
+        <option>aniview</option>
+        <option>anyclip</option>
+        <option>appmonsta</option>
+        <option>appnexus</option>
+        <option>appvador</option>
+        <option>atomx</option>
+        <option>avantisvideo</option>
+        <option>baidu</option>
+        <option>beaverads</option>
+        <option>beopinion</option>
+        <option>bidgear</option>
+        <option>bidtellect</option>
+        <option>blade</option>
+        <option>brainy</option>
+        <option>bringhub</option>
+        <option>broadbandy</option>
+        <option>byplay</option>
+        <option>caajainfeed</option>
+        <option>capirs</option>
+        <option>caprofitx</option>
+        <option>cedato</option>
+        <option>clever</option>
+        <option>cognativex</option>
+        <option>conative</option>
+        <option>connatix</option>
+        <option>contentad</option>
+        <option>criteo</option>
+        <option>csa</option>
+        <option>custom</option>
+        <option>dable</option>
+        <option>dex</option>
+        <option>digiteka</option>
+        <option>directadvert</option>
+        <option>distroscale</option>
+        <option>dotandads</option>
+        <option>doubleclick</option>
+        <option>dynad</option>
+        <option>eadv</option>
+        <option>empower</option>
+        <option>Engageya</option>
+        <option>epeex</option>
+        <option>eplanning</option>
+        <option>exco</option>
+        <option>ezoic</option>
+        <option>f1e</option>
+        <option>f1h</option>
+        <option>fairground</option>
+        <option>feedad</option>
+        <option>felmat</option>
+        <option>finative</option>
+        <option>flite</option>
+        <option>fluct</option>
+        <option>forkmedia</option>
+        <option>freestar</option>
+        <option>freewheel</option>
+        <option>fusion</option>
+        <option>genieessp</option>
+        <option>geozo</option>
+        <option>giraff</option>
+        <option>glomex</option>
+        <option>gmossp</option>
+        <option>gumgum</option>
+        <option>holder</option>
+        <option>ibillboard</option>
+        <option>idealmedia</option>
+        <option>imedia</option>
+        <option>imobile</option>
+        <option>imonomy</option>
+        <option>incrementx</option>
+        <option>industrybrains</option>
+        <option>inmobi</option>
+        <option>innity</option>
+        <option>insticator</option>
+        <option>insurads</option>
+        <option>invibes</option>
+        <option>ix</option>
+        <option>jioads</option>
+        <option>jixie</option>
+        <option>jubna</option>
+        <option>kargo</option>
+        <option>ketshwa</option>
+        <option>kiosked</option>
+        <option>kixer</option>
+        <option>kuadio</option>
+        <option>ligatus</option>
+        <option>lockerdome</option>
+        <option>logly</option>
+        <option>loka</option>
+        <option>luckyads</option>
+        <option>macaw</option>
+        <option>mads</option>
+        <option>mantis-display</option>
+        <option>mediaad</option>
+        <option>marfeel</option>
+        <option>medianet</option>
+        <option>mediavine</option>
+        <option>meg</option>
+        <option>mgid</option>
+        <option>microad</option>
+        <option>miximedia</option>
+        <option>mixpo</option>
+        <option>momagic</option>
+        <option>monetizer101</option>
+        <option>mox</option>
+        <option>my6sense</option>
+        <option>myfinance</option>
+        <option>myoffrz</option>
+        <option>mytarget</option>
+        <option>myua</option>
+        <option>mywidget</option>
+        <option>nativeroll</option>
+        <option>nativery</option>
+        <option>nativo</option>
+        <option>navegg</option>
+        <option>nend</option>
+        <option>netletix</option>
+        <option>noddus</option>
+        <option>nokta</option>
+        <option>nws</option>
+        <option>oblivki</option>
+        <option>onead</option>
+        <option>onnetwork</option>
+        <option>openadstream</option>
+        <option>openx</option>
+        <option>opinary</option>
+        <option>outbrain</option>
+        <option>piberica</option>
+        <option>pixad</option>
+        <option>pixels</option>
+        <option>playstream</option>
+        <option>plista</option>
+        <option>polymorphicads</option>
+        <option>popin</option>
+        <option>ppstudio</option>
+        <option>pressboard</option>
+        <option>promoteiq</option>
+        <option>pubexchange</option>
+        <option>pubfuture</option>
+        <option>pubmine</option>
+        <option>pubscale</option>
+        <option>pulse</option>
+        <option>pulsepoint</option>
+        <option>puffnetwork</option>
+        <option>purch</option>
+        <option>r9x</option>
+        <option>rakutenunifiedads</option>
+        <option>rbinfox</option>
+        <option>rcmwidget</option>
+        <option>readmo</option>
+        <option>realclick</option>
+        <option>recomad</option>
+        <option>recreativ</option>
+        <option>relap</option>
+        <option>remixd</option>
+        <option>revcontent</option>
+        <option>revjet</option>
+        <option>rfp</option>
+        <option>rnetplus</option>
+        <option>rubicon</option>
+        <option>runative</option>
+        <option>sabavision</option>
+        <option>sas</option>
+        <option>seedingalliance</option>
+        <option>seedtag</option>
+        <option>sekindo</option>
+        <option>sevio</option>
+        <option>sharethrough</option>
+        <option>shemedia</option>
+        <option>sklik</option>
+        <option>skoiy</option>
+        <option>slimcutmedia</option>
+        <option>smartadserver</option>
+        <option>smartclip</option>
+        <option>smi2</option>
+        <option>smilewanted</option>
+        <option>sogouad</option>
+        <option>sortable</option>
+        <option>sona</option>
+        <option>sovrn</option>
+        <option>speakol</option>
+        <option>spotx</option>
+        <option>springAds</option>
+        <option>ssp</option>
+        <option>strossle</option>
+        <option>sulvo</option>
+        <option>sunmedia</option>
+        <option>svknative</option>
+        <option>swoop</option>
+        <option>taboola</option>
+        <option>tagon</option>
+        <option>tail</option>
+        <option>tcsemotion</option>
+        <option>teads</option>
+        <option>temedya</option>
+        <option>torimochi</option>
+        <option>tracdelight</option>
+        <option>trafficstars</option>
+        <option>triplelift</option>
+        <option>trugaze</option>
+        <option>uas</option>
+        <option>ucfunnel</option>
+        <option>unruly</option>
+        <option>uzou</option>
+        <option>valuecommerce</option>
+        <option>vdo.ai</option>
+        <option>videointelligence</option>
+        <option>videonow</option>
+        <option>viralize</option>
+        <option>vlyby</option>
+        <option>vmfive</option>
+        <option>vox</option>
+        <option>webediads</option>
+        <option>weborama</option>
+        <option>widespace</option>
+        <option>wisteria</option>
+        <option>whopainfeed</option>
+        <option>wpmedia</option>
+        <option>xlift</option>
+        <option>yahoofedads</option>
+        <option>yahoojp</option>
+        <option>yahoonativeads</option>
+        <option>yandex</option>
+        <option>yektanet</option>
+        <option>yengo</option>
+        <option>yieldbot</option>
+        <option>yieldmo</option>
+        <option>yieldpro</option>
+        <option>zedo</option>
+        <option>zen</option>
+        <option>zergnet</option>
+        <option>zucks</option>
+      </select>
+      <input type="submit" value="Go">
+    </form>
   </div>
 
   <h2>1WO</h2>
-  <amp-embed
-    width="400"
-    height="700"
-    type="1wo"
-    data-owo-code="c67805ef-2cc3-482c-9067-70f534016259"
-    data-owo-type="widget"
-    data-owo-mode="smart3"
-    src="https://frontend-qa.1worldonline.biz/poller-constructor.js">
+  <amp-embed width="400" height="700" type="1wo" data-owo-code="c67805ef-2cc3-482c-9067-70f534016259"
+    data-owo-type="widget" data-owo-mode="smart3" src="https://frontend-qa.1worldonline.biz/poller-constructor.js">
   </amp-embed>
 
   <h2>24smi</h2>
-  <amp-embed width="250" height="250"
-    type="24smi"
-    src="https://jsn.24smi.net/c/2/11232.js">
+  <amp-embed width="250" height="250" type="24smi" src="https://jsn.24smi.net/c/2/11232.js">
   </amp-embed>
 
-  <amp-embed width="250" height="250"
-    type="24smi"
-    data-blockid="11232">
+  <amp-embed width="250" height="250" type="24smi" data-blockid="11232">
+  </amp-embed>
+
+  <h2>4wmarketplace</h2>
+  <amp-embed width="320" height="50" type="4wmarketplace" data-id="76473;98469;199717;0"
+    data-dim="{'width':'320px', 'height':'50px'}">
   </amp-embed>
 
   <h2>A8</h2>
-  <amp-ad width="300" height="250"
-    type="a8"
-    data-aid="170223075073"
-    data-wid="001"
-    data-eno="01"
-    data-mid="s00000016751001031000"
-    data-mat="2TCGYR-17GNXU-3L92-64Z8X"
-    data-type="static">
+  <amp-ad width="300" height="250" type="a8" data-aid="170223075073" data-wid="001" data-eno="01"
+    data-mid="s00000016751001031000" data-mat="2TCGYR-17GNXU-3L92-64Z8X" data-type="static">
   </amp-ad>
 
   <h2>A9 Search Ads</h2>
-  <amp-ad width="400" height="300"
-    type = "a9"
-    data-amzn_assoc_placement = "adunit0"
-    data-amzn_assoc_search_bar = "true"
-    data-amzn_assoc_tracking_id = "deepak2015-20"
-    data-amzn_assoc_search_bar_position = "bottom"
-    data-amzn_assoc_ad_mode = "search"
-    data-amzn_assoc_ad_type = "smart"
-    data-amzn_assoc_marketplace = "amazon"
-    data-amzn_assoc_region = "US"
-    data-amzn_assoc_title = "Shop Related Products"
-    data-amzn_assoc_default_search_phrase = "apple watches"
-    data-amzn_assoc_default_category = "All"
-    data-amzn_assoc_linkid = "b01186f9b305e15fc51214bb45187875"
-    data-regionurl = "https://z-na.amazon-adsystem.com/widgets/onejs?MarketPlace=US">
+  <amp-ad width="400" height="300" type="a9" data-amzn_assoc_placement="adunit0" data-amzn_assoc_search_bar="true"
+    data-amzn_assoc_tracking_id="deepak2015-20" data-amzn_assoc_search_bar_position="bottom"
+    data-amzn_assoc_ad_mode="search" data-amzn_assoc_ad_type="smart" data-amzn_assoc_marketplace="amazon"
+    data-amzn_assoc_region="US" data-amzn_assoc_title="Shop Related Products"
+    data-amzn_assoc_default_search_phrase="apple watches" data-amzn_assoc_default_category="All"
+    data-amzn_assoc_linkid="b01186f9b305e15fc51214bb45187875"
+    data-regionurl="https://z-na.amazon-adsystem.com/widgets/onejs?MarketPlace=US">
   </amp-ad>
 
   <h2>A9 Recom Unsaved</h2>
-  <amp-ad width="400" height="300"
-   type = "a9"
-   data-amzn_assoc_placement = "adunit0"
-   data-amzn_assoc_search_bar = "true"
-   data-amzn_assoc_tracking_id = "subhojitus-20"
-   data-amzn_assoc_search_bar_position = "bottom"
-   data-amzn_assoc_ad_mode = "auto"
-   data-amzn_assoc_ad_type = "smart"
-   data-amzn_assoc_marketplace = "amazon"
-   data-amzn_assoc_region = "US"
-   data-amzn_assoc_title = "Related Products"
-   data-amzn_assoc_linkid = "619af83d37b0fb680e58989de71cd121"
-   data-amzn_assoc_debug = "true"
-   data-amzn_assoc_rows = "1"
-   data-amzn_assoc_overrides = "false"
-   data-amzn_assoc_ead = 8
-   data-amzn_assoc_fallback_mode = '"type": "search", "value": "steve jobs"'
-   data-amzn_assoc_url = "https://techcrunch.com/2018/02/05/visa-and-mastercard-make-it-harder-to-buy-bitcoin-and-other-cryptocurrencies"
-   data-amzn_assoc_aax_src_id = "330"
-   data-amzn_assoc_force_win_bid = "true">
+  <amp-ad width="400" height="300" type="a9" data-amzn_assoc_placement="adunit0" data-amzn_assoc_search_bar="true"
+    data-amzn_assoc_tracking_id="subhojitus-20" data-amzn_assoc_search_bar_position="bottom"
+    data-amzn_assoc_ad_mode="auto" data-amzn_assoc_ad_type="smart" data-amzn_assoc_marketplace="amazon"
+    data-amzn_assoc_region="US" data-amzn_assoc_title="Related Products"
+    data-amzn_assoc_linkid="619af83d37b0fb680e58989de71cd121" data-amzn_assoc_debug="true" data-amzn_assoc_rows="1"
+    data-amzn_assoc_overrides="false" data-amzn_assoc_ead=8
+    data-amzn_assoc_fallback_mode='"type": "search", "value": "steve jobs"'
+    data-amzn_assoc_url="https://techcrunch.com/2018/02/05/visa-and-mastercard-make-it-harder-to-buy-bitcoin-and-other-cryptocurrencies"
+    data-amzn_assoc_aax_src_id="330" data-amzn_assoc_force_win_bid="true">
   </amp-ad>
 
   <h2>A9 Custom Ads</h2>
-  <amp-ad width="600" height="250"
-    type = "a9"
-    data-amzn_assoc_placement = "adunit0"
-    data-amzn_assoc_search_bar = "true"
-    data-amzn_assoc_tracking_id = "deepak0004-20"
-    data-amzn_assoc_ad_mode = "manual"
-    data-amzn_assoc_ad_type = "smart"
-    data-amzn_assoc_marketplace = "amazon"
-    data-amzn_assoc_region = "US"
-    data-amzn_assoc_title = "My Amazon Picks"
-    data-amzn_assoc_linkid = "c5772783a7d25620cd6226c5cc5885c8"
-    data-amzn_assoc_asins = "B001AWZDA4,B07BFTFYZC,B06XD8XQWK,B018HTGSN8">
+  <amp-ad width="600" height="250" type="a9" data-amzn_assoc_placement="adunit0" data-amzn_assoc_search_bar="true"
+    data-amzn_assoc_tracking_id="deepak0004-20" data-amzn_assoc_ad_mode="manual" data-amzn_assoc_ad_type="smart"
+    data-amzn_assoc_marketplace="amazon" data-amzn_assoc_region="US" data-amzn_assoc_title="My Amazon Picks"
+    data-amzn_assoc_linkid="c5772783a7d25620cd6226c5cc5885c8"
+    data-amzn_assoc_asins="B001AWZDA4,B07BFTFYZC,B06XD8XQWK,B018HTGSN8">
   </amp-ad>
 
   <h2>A9 Recom Ads Sync</h2>
-  <amp-ad width="300" height="250"
-   type = "a9"
-   data-amzn_assoc_ad_mode = "auto"
-   data-recomtype = "sync"
-   data-adinstanceid = "fe746097-f142-4f8d-8dfb-45ec747632e5"
-   data-regionurl = "https://z-na.amazon-adsystem.com/widgets/onejs?MarketPlace=US">
+  <amp-ad width="300" height="250" type="a9" data-amzn_assoc_ad_mode="auto" data-recomtype="sync"
+    data-adinstanceid="fe746097-f142-4f8d-8dfb-45ec747632e5"
+    data-regionurl="https://z-na.amazon-adsystem.com/widgets/onejs?MarketPlace=US">
   </amp-ad>
 
   <h2>A9 Recom Ads Async</h2>
-  <amp-ad width="300" height="250"
-   type = "a9"
-   data-amzn_assoc_ad_mode = "auto"
-   data-divid = "amzn-assoc-ad-fe746097-f142-4f8d-8dfb-45ec747632e5"
-   data-recomtype = "async"
-   data-adinstanceid = "fe746097-f142-4f8d-8dfb-45ec747632e5">
+  <amp-ad width="300" height="250" type="a9" data-amzn_assoc_ad_mode="auto"
+    data-divid="amzn-assoc-ad-fe746097-f142-4f8d-8dfb-45ec747632e5" data-recomtype="async"
+    data-adinstanceid="fe746097-f142-4f8d-8dfb-45ec747632e5">
   </amp-ad>
 
 
   <h2>AccessTrade</h2>
-  <amp-ad width="300" height="250"
-    type="accesstrade"
-    data-atops="r"
-    data-atrotid="00000000000008c06y">
+  <amp-ad width="300" height="250" type="accesstrade" data-atops="r" data-atrotid="00000000000008c06y">
   </amp-ad>
 
   <h2>Ad.Agio</h2>
-  <amp-ad width=300 height=250
-    type="adagio"
-    data-sid="39"
-    data-loc="amp_ampw_amps_ampp_300x250"
-    data-keywords=""
+  <amp-ad width=300 height=250 type="adagio" data-sid="39" data-loc="amp_ampw_amps_ampp_300x250" data-keywords=""
     data-uservars="">
   </amp-ad>
 
   <h2>Adblade</h2>
-  <amp-ad width="300" height="250"
-    type="adblade"
-    data-width="300"
-    data-height="250"
-    data-cid="19626-3798936394">
+  <amp-ad width="300" height="250" type="adblade" data-width="300" data-height="250" data-cid="19626-3798936394">
   </amp-ad>
 
   <h2>AdButler</h2>
-  <amp-ad width="300" height="250"
-    type="adbutler"
-    data-account="167283"
-    data-zone="212491">
+  <amp-ad width="300" height="250" type="adbutler" data-account="167283" data-zone="212491">
+  </amp-ad>
+
+  <h2>Adenza</h2>
+  <amp-ad width="768" height="480" type="adenza" layout="responsive" data-block-id="614f579bdd5b213cd8bdae26">
   </amp-ad>
 
   <h2>adincube</h2>
-  <amp-ad width="300" height="250"
-    type="adincube"
-    data-ad-type="in_content"
-    data-site-key="TEST_WEBSITE_KEY">
+  <amp-ad width="300" height="250" type="adincube" data-ad-type="in_content" data-site-key="TEST_WEBSITE_KEY">
   </amp-ad>
 
   <h2>ADITION</h2>
-  <amp-ad width="300" height="250"
-    type="adition"
-    data-version="1"
-    data-wp_id="3470234">
+  <amp-ad width="300" height="250" type="adition" data-version="1" data-wp_id="3470234">
   </amp-ad>
 
   <h2>Ad Generation</h2>
-  <amp-ad width="320" height="50"
-    type="adgeneration"
-    data-id="10722">
+  <amp-ad width="320" height="50" type="adgeneration" data-id="10722">
   </amp-ad>
 
   <h2>AdGlare</h2>
-  <amp-ad width="300" height="250" layout="responsive"
-    type="adglare"
-    data-host="try"
-    data-zid="810958668"
+  <amp-ad width="300" height="250" layout="responsive" type="adglare" data-host="try" data-zid="810958668"
     data-keywords="blue,car">
   </amp-ad>
 
   <h2>Adhese</h2>
-  <amp-ad width=300 height=250
-    type="adhese"
-    data-location="_sdk_amp_"
-    data-position=""
-    data-format="amprectangle"
-    data-account="demo"
-    data-request-type="ad">
-  <div placeholder></div>
-  <div fallback></div>
-  </amp-ad>
-
-  <amp-ad width=300 height=250
-    type="adhese"
-    data-location="_sdk_amp_"
-    data-position=""
-    data-format="amprectangle"
-    data-account="demo"
-    data-request-type="ad"
-    json='{"targeting":{"br": ["sport", "info"],"dt": ["desktop"]}}'>
-  <div placeholder></div>
-  <div fallback></div>
+  <amp-ad width=300 height=250 type="adhese" data-location="_sdk_amp_" data-position="" data-format="amprectangle"
+    data-account="demo" data-request-type="ad">
+    <div placeholder></div>
+    <div fallback></div>
+  </amp-ad>
+
+  <amp-ad width=300 height=250 type="adhese" data-location="_sdk_amp_" data-position="" data-format="amprectangle"
+    data-account="demo" data-request-type="ad" json='{"targeting":{"br": ["sport", "info"],"dt": ["desktop"]}}'>
+    <div placeholder></div>
+    <div fallback></div>
   </amp-ad>
 
   <h2 id="adfox">AdFox</h2>
-  <amp-ad width="248" height="408"
-    type="adfox"
-    data-owner-id="208087"
+  <amp-ad width="248" height="408" type="adfox" data-owner-id="208087"
     data-adfox-params='{"pt": "b","p1": "bsoji","p2": "feil","pct": "a","pfc": "bbhfo","pfb": "cwrtv"}'>
   </amp-ad>
 
   <h2>Adman</h2>
-  <amp-ad width="300" height="250"
-    type="adman"
-    data-ws="17342"
-    data-s="300x250"
-    data-host="talos.adman.gr">
+  <amp-ad width="300" height="250" type="adman" data-ws="17342" data-s="300x250" data-host="talos.adman.gr">
   </amp-ad>
 
   <h2>AdmanMedia</h2>
-  <amp-ad width="300" height="250"
-    type="admanmedia"
-    data-id="8e916419">
+  <amp-ad width="300" height="250" type="admanmedia" data-id="8e916419">
+  </amp-ad>
+
+  <h2>AdMatic</h2>
+  <amp-ad
+    type="admatic"
+    width="300"
+    height="250"
+    data-ad-type-id="standard"
+    data-ad-network="adm-pub-194162670389"
+    data-ad-publisher="65943e194d11b285b6173588">
   </amp-ad>
 
   <h2>Admixer</h2>
-  <amp-ad width="300" height="250"
-    type="admixer"
-    data-sizes="[[300,250]]"
+  <amp-ad width="300" height="250" type="admixer" data-sizes="[[300,250]]"
     data-zone="2eb6bd58-865c-47ce-af7f-a918108c3fd2">
   </amp-ad>
-  <amp-ad type="admixer" width="300" height="300" layout="responsive"
-    data-sizes="[[300,250],[300,300]]"
+  <amp-ad type="admixer" width="300" height="300" layout="responsive" data-sizes="[[300,250],[300,300]]"
     data-zone="2eb6bd58-865c-47ce-af7f-a918108c3fd2">
-  <div fallback>asd</div>
+    <div fallback>asd</div>
   </amp-ad>
 
   <h2>Adnuntius</h2>
-  <amp-ad width="300" height="250"
-      type="adnuntius"
-      data-au-id="00000000000dbf78"
-      data-user-id="12341234"
-      data-site-id="56785678"
-      data-floor-price='{"amount":1.213,"currency": "AUD"}'
-      data-kv='[{"colors": ["red", "blue"]}]'
-      data-c='["sport/golf", "news"]'
-      data-latitude="123.4567"
-      data-longitude="234.5678"
-      data-segments='["1234", "5678"]'>
+  <amp-ad width="300" height="250" type="adnuntius" data-au-id="00000000000dbf78" data-user-id="12341234"
+    data-site-id="56785678" data-floor-price='{"amount":1.213,"currency": "AUD"}'
+    data-kv='[{"colors": ["red", "blue"]}]' data-c='["sport/golf", "news"]' data-latitude="123.4567"
+    data-longitude="234.5678" data-segments='["1234", "5678"]'>
   </amp-ad>
 
   <h2>AdOcean</h2>
-  <amp-ad width="300" height="250"
-      type="adocean"
-      data-ao-mode="sync"
-      data-ao-emitter="myao.adocean.pl"
-      data-ao-id="ado-vf2X22YCNzPRUVYmLg.jQb53Xb1BcMbzJlwIv7SLH_f.97"
-      data-ao-preview="true"
-      data-ao-keys="key1,key2,key3"
-      data-ao-vars='{"a":"b","c":"d"}'
-      data-ao-clusters='{"clusterA":[-1,2,-3,63], "clusterB":[1,-63]}'
-      >
+  <amp-ad width="300" height="250" type="adocean" data-ao-mode="sync" data-ao-emitter="myao.adocean.pl"
+    data-ao-id="ado-vf2X22YCNzPRUVYmLg.jQb53Xb1BcMbzJlwIv7SLH_f.97" data-ao-preview="true" data-ao-keys="key1,key2,key3"
+    data-ao-vars='{"a":"b","c":"d"}' data-ao-clusters='{"clusterA":[-1,2,-3,63], "clusterB":[1,-63]}'>
   </amp-ad>
 
-  <amp-ad width="300" height="250"
-      type="adocean"
-      data-ao-mode="buffered"
-      data-ao-emitter="myao.adocean.pl"
-      data-ao-id="ado-vf2X22YCNzPRUVYmLg.jQb53Xb1BcMbzJlwIv7SLH_f.97"
-      data-ao-preview="true"
-      data-ao-keys="key1,key2,key3"
-      data-ao-vars='{"a":"b","c":"d"}'
-      data-ao-clusters='{"clusterA":[-1,2,-3,63], "clusterB":[1,-63]}'
-      >
+  <amp-ad width="300" height="250" type="adocean" data-ao-mode="buffered" data-ao-emitter="myao.adocean.pl"
+    data-ao-id="ado-vf2X22YCNzPRUVYmLg.jQb53Xb1BcMbzJlwIv7SLH_f.97" data-ao-preview="true" data-ao-keys="key1,key2,key3"
+    data-ao-vars='{"a":"b","c":"d"}' data-ao-clusters='{"clusterA":[-1,2,-3,63], "clusterB":[1,-63]}'>
   </amp-ad>
 
   <h2>AdOcean master-slave</h2>
-  <amp-ad width="300" height="250"
-      type="adocean"
-      data-ao-emitter="myao.adocean.pl"
-      data-ao-master="FDyQKk0qN2a9SxwCMal6Eove..r_lvBE3pPfr_Ier9..f7"
-      data-ao-id="adoceanmyaonhqnqukjtt"
-      data-ao-mode="buffered"
-      data-ao-preview="true"
-      data-ao-keys="key1,key2,key3"
-      data-ao-vars='{"a":"b","c":"d"}'
-      data-ao-clusters='{"clusterA":[-1,2,-3,63], "clusterB":[1,-63]}'
-      >
+  <amp-ad width="300" height="250" type="adocean" data-ao-emitter="myao.adocean.pl"
+    data-ao-master="FDyQKk0qN2a9SxwCMal6Eove..r_lvBE3pPfr_Ier9..f7" data-ao-id="adoceanmyaonhqnqukjtt"
+    data-ao-mode="buffered" data-ao-preview="true" data-ao-keys="key1,key2,key3" data-ao-vars='{"a":"b","c":"d"}'
+    data-ao-clusters='{"clusterA":[-1,2,-3,63], "clusterB":[1,-63]}'>
   </amp-ad>
 
-  <amp-ad width="300" height="250"
-      type="adocean"
-      data-ao-emitter="myao.adocean.pl"
-      data-ao-master="FDyQKk0qN2a9SxwCMal6Eove..r_lvBE3pPfr_Ier9..f7"
-      data-ao-id="adoceanmyaokiheeseoko"
-      data-ao-mode="buffered"
-      data-ao-preview="true"
-      data-ao-keys="key1,key2,key3"
-      data-ao-vars='{"a":"b","c":"d"}'
-      data-ao-clusters='{"clusterA":[-1,2,-3,63], "clusterB":[1,-63]}'
-      >
+  <amp-ad width="300" height="250" type="adocean" data-ao-emitter="myao.adocean.pl"
+    data-ao-master="FDyQKk0qN2a9SxwCMal6Eove..r_lvBE3pPfr_Ier9..f7" data-ao-id="adoceanmyaokiheeseoko"
+    data-ao-mode="buffered" data-ao-preview="true" data-ao-keys="key1,key2,key3" data-ao-vars='{"a":"b","c":"d"}'
+    data-ao-clusters='{"clusterA":[-1,2,-3,63], "clusterB":[1,-63]}'>
   </amp-ad>
 
   <h2>Adop</h2>
-  <amp-ad width="300" height="250"
-      type="adop"
-      data-z="a3a8014f-0b5f-46dd-a0db-a2ae686541ef"></amp-ad>
+  <amp-ad width="300" height="250" type="adop" data-z="a3a8014f-0b5f-46dd-a0db-a2ae686541ef"></amp-ad>
 
   <h2>AdPicker</h2>
-  <amp-ad width="300" height="250"
-    type="adpicker"
-    data-ph="4p7hhqa73u">
+  <amp-ad width="300" height="250" type="adpicker" data-ph="4p7hhqa73u">
   </amp-ad>
 
   <h2>AdPlugg</h2>
-  <amp-ad width="300" height="250"
-    type="adplugg"
-    data-access-code="A48214096"
-    data-zone="my_amp_zone_300x250">
+  <amp-ad width="300" height="250" type="adplugg" data-access-code="A48214096" data-zone="my_amp_zone_300x250">
   </amp-ad>
 
   <h2>Adpon</h2>
-  <amp-ad width="300" height="250"
-      type="adpon"
-      data-fid="363">
+  <amp-ad width="300" height="250" type="adpon" data-fid="363">
   </amp-ad>
 
   <h2>Adpushup</h2>
-  <amp-ad width="300" height="250"
-      type="adpushup"
-      data-siteid="40827"
-      data-slotpath="/103512698/AMP_COMPONENT_TEST_1"
-      data-totalAmpSlots="1">
+  <amp-ad width="300" height="250" type="adpushup" data-siteid="40827" data-slotpath="/103512698/AMP_COMPONENT_TEST_1"
+    data-totalAmpSlots="1">
   </amp-ad>
 
   <h2>AdReactor</h2>
-  <amp-ad width="728" height="90"
-    type="adreactor"
-    data-pid=790
-    data-zid=9
-    data-custom3="No Type">
+  <amp-ad width="728" height="90" type="adreactor" data-pid=790 data-zid=9 data-custom3="No Type">
+  </amp-ad>
+
+  <h2>Ads2bid</h2>
+  <amp-ad width="690" height="690" type="ads2bid" data-site-id="11620" data-block-id="123602,690"
+    src="https://kdunhltakb.ru">
   </amp-ad>
 
   <h2>AdSense</h2>
-  <amp-ad width="300" height="250"
-    type="adsense"
-    data-ad-client="ca-pub-2005682797531342"
-    data-ad-slot="7046626912">
+  <amp-ad width="300" height="250" type="adsense" data-ad-client="ca-pub-2005682797531342" data-ad-slot="7046626912">
   </amp-ad>
 
   <h2>AdSensor</h2>
-  <amp-ad width="300" height="250"
-    type="adsensor"
-    data-application-id="2697"
-    data-adunit-id="1226710">
+  <amp-ad width="300" height="250" type="adsensor" data-application-id="2697" data-adunit-id="1226710">
   </amp-ad>
-  <amp-ad width="728" height="90"
-    type="adsensor"
-    data-application-id="2697"
-    data-adunit-id="1226707">
+  <amp-ad width="728" height="90" type="adsensor" data-application-id="2697" data-adunit-id="1226707">
   </amp-ad>
 
   <h2>AdServSolutions</h2>
-  <amp-ad width="300" height="250"
-    type="adservsolutions"
-    data-client="adservsolutions.com"
-    data-zid="1953913050">
+  <amp-ad width="300" height="250" type="adservsolutions" data-client="adservsolutions.com" data-zid="1953913050">
   </amp-ad>
 
   <h2>AdsKeeper</h2>
-  <amp-embed width="600" height="320" type="adskeeper" data-publisher="example.adskeeper.com" data-widget="1126814"
-          data-container="M707443ScriptRootC1126814">
+  <amp-embed width="600" height="320" type="adskeeper" data-website="107894" data-widget="1629491">
   </amp-embed>
 
   <h2>AdsLoom</h2>
-  <amp-ad width="800" height="600"
-       type="adsloom"
-       layout="responsive"
-       data-widget-id="1079">
+  <amp-ad width="800" height="600" type="adsloom" layout="responsive" data-widget-id="1079">
   </amp-ad>
 
   <h2>AdsNative</h2>
-  <amp-ad width="300" height="250"
-    type="adsnative"
-    data-anapiid="t8AjW-y8rudFGzKft_YQcBZG1-aGZ5otj5QdsKaP"
-    data-ancat="IAB1,IAB2"
-    data-antid="abc"
-    data-ankv="key:val,key:val2">
+  <amp-ad width="300" height="250" type="adsnative" data-anapiid="t8AjW-y8rudFGzKft_YQcBZG1-aGZ5otj5QdsKaP"
+    data-ancat="IAB1,IAB2" data-antid="abc" data-ankv="key:val,key:val2">
   </amp-ad>
 
   <h2>AdSpeed</h2>
-  <amp-ad width="300" height="250"
-    type="adspeed"
-    data-zone="82441"
-    data-client="3">
-  <div placeholder></div>
-  <div fallback></div>
+  <amp-ad width="300" height="250" type="adspeed" data-zone="82441" data-client="3">
+    <div placeholder></div>
+    <div fallback></div>
   </amp-ad>
 
   <h2>AdSpirit</h2>
-  <amp-ad width="300" height="250"
-    type="adspirit"
-    data-asm-params="&amp;pid=4"
-    data-asm-host="help.adspirit.de">
+  <amp-ad width="300" height="250" type="adspirit" data-asm-params="&amp;pid=4" data-asm-host="help.adspirit.de">
   </amp-ad>
 
   <h2>AdStir 320x50 banner</h2>
-  <amp-ad width="320" height="50"
-    type="adstir"
-    data-app-id="MEDIA-343ded3e"
-    data-ad-spot="1">
+  <amp-ad width="320" height="50" type="adstir" data-app-id="MEDIA-343ded3e" data-ad-spot="1">
   </amp-ad>
 
   <h2>AdStyle responsive widget</h2>
-  <amp-embed width="400" height="260"
-      type="adstyle"
-      layout="responsive"
-      data-widget="1"
-      heights="(max-width: 320px) 933px,
+  <amp-embed width="400" height="260" type="adstyle" layout="responsive" data-widget="1" heights="(max-width: 320px) 933px,
     (max-width: 360px) 1087px,
     (max-width: 375px) 1138px,
     (max-width: 412px) 1189px,
@@ -894,6 +775,10 @@ <h2>Affiliate-B</h2>
   <amp-ad width="300" height="250" type="affiliateb" data-afb_a="l44x-y174897c" data-afb_p="g2m" data-afb_t="i">
   </amp-ad>
 
+  <h2>Affinity</h2>
+  <amp-ad width="300" height="250" type="affinity" data-adtype="banner" data-adslot="AFFINITY_AMP_TEST_300x250">
+  </amp-ad>
+
   <h2>AJA</h2>
   <amp-ad width="300" height="250" type="aja" layout="responsive" data-asi="xWc2iVRZR">
   </amp-ad>
@@ -909,22 +794,14 @@ <h2>AMoAd native</h2>
   </amp-ad>
 
   <h2>Amplified Banner</h2>
-  <amp-ad
-      width="300"
-      height="250"
-      type="amplified"
-      data-amplified_id="39380744"
-      data-amplified_params='{"song":"Are you Ready for It?"}'
-    >
-    </amp-ad>
-
-    <h2>Andbeyond</h2>
-    <amp-ad width="300" height="250"
-        type="andbeyond"
-        data-siteid="40827"
-        data-slotpath="/103512698/AMP_COMPONENT_TEST_1"
-        data-totalAmpSlots="1">
-    </amp-ad>
+  <amp-ad width="300" height="250" type="amplified" data-amplified_id="39380744"
+    data-amplified_params='{"song":"Are you Ready for It?"}'>
+  </amp-ad>
+
+  <h2>Andbeyond</h2>
+  <amp-ad width="300" height="250" type="andbeyond" data-siteid="40827" data-slotpath="/103512698/AMP_COMPONENT_TEST_1"
+    data-totalAmpSlots="1">
+  </amp-ad>
 
   <h2>Aniview</h2>
   <amp-ad width="640" height="360" type="aniview" data-publisherId="55b88d4a181f465b3e8b4567"
@@ -936,6 +813,10 @@ <h2>AnyClip</h2>
     data-widgetname="amp_test_autoplay" data-ac-embed-mode="plain" data-ourl="https://anyclip.com/">
   </amp-ad>
 
+  <h2>AppMonsta</h2>
+  <amp-ad width="300" height="250" type="appmonsta" data-placement-id="test">
+  </amp-ad>
+
   <h2>AppNexus with JSON based configuration multi ad</h2>
   <amp-ad width="728" height="90" type="appnexus" data-target="apn_ad_2"
     json='{"pageOpts":{"member": 958}, "adUnits": [{"disablePsa": true, "tagId": 6063968,"sizes": [300,250],"targetId": "apn_ad_1"}, {"tagId": 6063968,"sizes": [728,90],"targetId":"apn_ad_2"}]}'>
@@ -958,7 +839,8 @@ <h2>Atomx</h2>
   </amp-ad>
 
   <h2>Avantis Video</h2>
-  <amp-ad type="avantisvideo" width="16" height="9" layout="responsive" data-id="883e5fba-d002-4a29-8b5d-f5a13737fd0d" data-tagId="1">
+  <amp-ad type="avantisvideo" width="16" height="9" layout="responsive" data-id="883e5fba-d002-4a29-8b5d-f5a13737fd0d"
+    data-tagId="1">
   </amp-ad>
 
   <h2>Baidu</h2>
@@ -973,6 +855,10 @@ <h2>BeaverAds</h2>
     data-account="556f2afc6ebef601004fb60f">
   </amp-ad>
 
+  <h2 id="bidgear">Bidgear</h2>
+  <amp-ad width="300" height="250" type="bidgear" data-zoneid="7795">
+  </amp-ad>
+
   <h2 id="bidtellect">Bidtellect</h2>
   <amp-ad width=320 height=200 type="bidtellect" data-t="20bc0442-8bec-43f8-9992-08be6e6a3591" data-pid="925847381"
     data-sid="216072">
@@ -1004,8 +890,7 @@ <h2>Bringhub Mini-Storefront</h2>
   </amp-embed>
 
   <h2>ByPlay</h2>
-  <amp-ad width="400" height="225" type="byplay"
-    data-vast-url="https://h.f1.impact-ad.jp/adv?section_id=7693&env=dev">
+  <amp-ad width="400" height="225" type="byplay" data-vast-url="https://h.f1.impact-ad.jp/adv?section_id=7693&env=dev">
   </amp-ad>
 
   <h2>CA A.J.A. Infeed</h2>
@@ -1026,6 +911,16 @@ <h2>Cedato</h2>
   <amp-ad width="640" height="360" type="cedato" data-id="303084288">
   </amp-ad>
 
+  <h2>Clever</h2>
+  <amp-ad width="1490" height="250" type="clever" data-id="45366" data-hash="f787765d347dedcbd6314064192482bd">
+  </amp-ad>
+
+  <h2>Cognativex</h2>
+
+  <amp-ad width="1200" height="2000" type="cognativex" layout="responsive" data-widgetid="5716116445855744"
+    data-appdomain="cognativex.com">
+  </amp-ad>
+
   <h2>Conative</h2>
 
   <amp-ad type="conative" height="250" width="300" layout="responsive" sizes="(min-width: 320px) 320px, 100vw"
@@ -1109,6 +1004,10 @@ <h2>Digiteka</h2>
   <amp-ad width="300" height="250" type="digiteka" layout="responsive" data-zone="1" data-mdtk="01540779">
   </amp-ad>
 
+  <h2>Digital Exchange</h2>
+  <amp-ad width="300" height="250" type="dex" layout="responsive" data-zoneid="15887">
+  </amp-ad>
+
   <h2>Directadvert</h2>
   <amp-ad width="320" height="250" type="directadvert" data-block-id="1953045">
   </amp-ad>
@@ -1164,8 +1063,8 @@ <h2>Empower</h2>
   </amp-ad>
 
   <h2>Engageya widget</h2>
-  <amp-embed width="200" height="200" type="engageya" layout="responsive" data-widgetIds="72154"
-    data-websiteId="111292" data-publisherId="155235">
+  <amp-embed width="200" height="200" type="engageya" layout="responsive" data-widgetIds="72154" data-websiteId="111292"
+    data-publisherId="155235">
   </amp-embed>
 
   <h2>Epeex</h2>
@@ -1189,6 +1088,11 @@ <h2>Ezoic</h2>
     json='{"targeting": {"iid15":"1479509","t":"134","d":"1317","t1":"134","pvc":"0","ap":"1144","sap":"1144","a":"|0|","as":"revenue","plat":"1","bra":"mod1","ic":"1","at":"mbf","adr":"400","reft":"tf","ga":"2497208","rid":"99998","pt":"0","al":"2022","compid":"1","tap":"28607874-1479509","br1":"0","br2":"0"}}'>
   </amp-ad>
 
+  <h2>Fairground</h2>
+  <amp-ad width="320" height="100" layout="fixed" type="fairground"
+          data-project="campaigns" data-hash="4189dd42-f853-4535-aedd-7130ea601fd8">
+  </amp-ad>
+
   <h2>FlexOneELEPHANT</h2>
   <amp-ad width="300" height="250" type="f1e" data-url="https://demo.impact-ad.jp"
     data-target="/SITE=AMPSITE/AREA=AMPAREA/AAMSZ=300X250/OENCJP=UTF8">
@@ -1221,11 +1125,7 @@ <h2>fluct</h2>
   <amp-ad width="300" height="250" type="fluct" data-g="1000067784" data-u="1000101409">
   </amp-ad>
 
-  <amp-ad width="300" height="250"
-          type="fluct"
-          data-g="1000128429"
-          data-u="1000220560"
-          data-tagtype="api">
+  <amp-ad width="300" height="250" type="fluct" data-g="1000128429" data-u="1000220560" data-tagtype="api">
   </amp-ad>
 
   <h2>Fork Media</h2>
@@ -1253,14 +1153,19 @@ <h2>FreeWheel</h2>
   </amp-ad>
 
   <h2>Gecko widget</h2>
-  <amp-embed width="200" height="200" type="gecko" layout="responsive" data-widgetIds="96451"
-    data-websiteId="139705" data-publisherId="170734">
+  <amp-embed width="200" height="200" type="gecko" layout="responsive" data-widgetIds="96451" data-websiteId="139705"
+    data-publisherId="170734">
   </amp-embed>
 
   <h2>Geniee SSP</h2>
   <amp-ad width="300" height="250" type="genieessp" data-vid="3" data-zid="1077330">
   </amp-ad>
 
+  <h2>Geozo</h2>
+  <amp-ad layout="responsive" width="320" height="461" type="geozo" data-gz-block="dfb39dd6-66e0-4799-97e3-b7f3b23f5d17"
+    src="https://grvclf.com/3yi7l1/921vlip0m03y/hq8786/uqv876pkypn.go">
+  </amp-ad>
+
   <h2>Giraff</h2>
   <amp-ad width="300" height="480" type="giraff" data-block-name="novotekaru">
   </amp-ad>
@@ -1288,8 +1193,7 @@ <h2>iBillboard 300x250 banner</h2>
   </amp-ad>
 
   <h2>Idealmedia</h2>
-  <amp-ad width="600" height="320" type="idealmedia" data-publisher="testsok150917-d1.com" data-widget="167018"
-    data-container="M278974ScriptRootC167018">
+  <amp-ad width="600" height="320" type="idealmedia" data-website="473218" data-widget="1629484">
   </amp-ad>
 
   <h2>I-Mobile 320x50 banner</h2>
@@ -1310,13 +1214,16 @@ <h2>Imedia</h2>
     data-positions='[{"id":"p1", "zoneId":"seznam.novinky.ikona2"}, {"id":"p2", "zoneId":"seznam.novinky.ikona"}]'>
   </amp-ad>
 
+  <h2>IncrementX</h2>
+  <amp-ad width="300" height="250" type="incrementx" data-vzid="PNXW125273VB49B96">
+  </amp-ad>
+
   <h2>Index Exchange Header Tag</h2>
   <amp-ad width="300" height="250" type="ix" data-ix-id="1" data-slot="/62650033/AMP_Example_Ad_Unit">
   </amp-ad>
 
   <h2>Industrybrains</h2>
-  <amp-ad width="300" height="250" type="industrybrains" data-width="300" data-height="250"
-    data-cid="19626-3798936394">
+  <amp-ad width="300" height="250" type="industrybrains" data-width="300" data-height="250" data-cid="19626-3798936394">
   </amp-ad>
 
   <h2>InMobi</h2>
@@ -1336,18 +1243,27 @@ <h2>Insticator</h2>
     data-embed-id="77ee0296-8ac4-4bca-91c8-51256b9830f1">
   </amp-embed>
 
+  <h2>InsurAds</h2>
+  <amp-ad width="300" height="250" type="insurads" data-public-id="4WMPI6PV" data-slot="/134642692/amp-samples"
+    data-multi-size="320x50" json='{"targeting":{"target":["sample"],"pos":["amp"]}}'>
+  </amp-ad>
+
   <h2>Invibes</h2>
   <amp-ad width="300" height="250" type="invibes" data-pid="1234" data-ad-categ="infeed"
     data-custom-endpoint="https://k.r66net.com/GetAmpLink">
   </amp-ad>
 
   <h2>Jixie</h2>
-  <amp-ad width="300" height="250" type="jixie" layout="responsive"
-  data-unit="jixietestunit"
-  data-cid="800"
-  data-options='{"miscParams":{"reserve1":"test1","reserve2":"test2"}}'>
+  <amp-ad width="300" height="250" type="jixie" layout="responsive" data-unit="jixietestunit" data-cid="800"
+    data-options='{"miscParams":{"reserve1":"test1","reserve2":"test2"}}'>
   </amp-ad>
 
+  <h2>JioAds</h2>
+  <amp-ad width="320" height="50" layout="fixed" type="jioads" data-adspot="s1o2i3rv" data-pkg-name="com.jio.web"
+    data-refresh-rate="40">
+    <div placeholder>Loading....</div>
+    <div fallback>Something went wrong in ad load</div>
+  </amp-ad>
   <h2>Jubna widget</h2>
   <amp-embed width="200" height="200" type="jubna" layout="responsive" data-wid="1078" data-pid="792">
   </amp-embed>
@@ -1375,11 +1291,6 @@ <h2>Kuadio</h2>
     data-widget-id="78a32765-30f1-4ac1-a3e7-b42ebc6df88a">
   </amp-embed>
 
-  <h2>Lentainform</h2>
-  <amp-ad width="600" height="320" type="lentainform" data-publisher="test.exhange.noidpartners.com"
-    data-widget="689383" data-container="M246626ScriptRootC689383">
-  </amp-ad>
-
   <h2>Ligatus</h2>
   <amp-ad width="300" height="250" type="ligatus" src="https://a-ssl.ligatus.com/?ids=88443&t=js&s=1&bc=2">
   </amp-ad>
@@ -1451,8 +1362,7 @@ <h2>Meg</h2>
   </amp-ad>
 
   <h2>Mgid</h2>
-  <amp-ad width="600" height="320" type="mgid" data-publisher="barada.com" data-widget="353317"
-    data-container="M207275ScriptRootC353317">
+  <amp-ad width="600" height="320" type="mgid" data-website="579198" data-widget="996801">
   </amp-ad>
 
   <h2>MicroAd 320x50 banner</h2>
@@ -1469,6 +1379,15 @@ <h2>Mixpo</h2>
   <amp-ad width="300" height="250" type="mixpo" data-guid="b0caf856-fd92-4adb-aaec-e91948c9ffc8" data-subdomain="www">
   </amp-ad>
 
+  <h2>Momagic</h2>
+  <amp-ad
+  width="480"
+  height="600"
+  type="momagic"
+  data-container="adSlot1"
+  data-publisher="01023642-aca4-b601-6a54-0006df0000dc">
+  </amp-ad>
+
   <h2>Monetizer101</h2>
   <amp-ad width="auto" height="176" layout="fixed-height" type="monetizer101" data-widget="price-comparison"
     data-config='{"shopId": 1, "priceMin": 500, "nameKeywords": "iphone"}'>
@@ -1515,7 +1434,7 @@ <h2>myTarget</h2>
   </amp-ad>
 
   <h2>myua</h2>
-  <amp-ad width="300" height="400" type="myua" data-sid="3" data-iid="3" data-demo="true">
+  <amp-ad width="300" height="400" type="myua" data-sid="3" data-iid="3" data-env="dev">
   </amp-ad>
 
   <h2>myWidget</h2>
@@ -1603,6 +1522,24 @@ <h2>Outbrain widget</h2>
     data-styleFile="http://localhost/style.css" data-testMode="true">
   </amp-embed>
 
+  <h2>PIberica</h2>
+  <amp-ad width="300" height="1"
+      type="piberica"
+      layout="responsive"
+      data-publisher="test"
+      data-slot="1">
+  </amp-ad>
+
+  <h2>Pixad</h2>
+  <amp-ad
+    type="pixad"
+    width="300"
+    height="250"
+    data-ad-type-id="standard"
+    data-ad-network="px-pub-6514176248"
+    data-ad-publisher="654b7d501cd4137ca98e020d">
+  </amp-ad>
+
   <h2>Pixels Examples</h2>
   <amp-ad width="300" height="250" type="pixels" data-origin="af" data-sid="2847717911664" data-tag="sync"
     data-click-tracker="false" data-viewability="true">
@@ -1615,8 +1552,8 @@ <h2>PlayStream</h2>
 
   <h2>Plista responsive widget</h2>
   <amp-embed width="300" height="300" type="plista" layout=responsive data-countrycode="de"
-    data-publickey="e6a75b42216ffc96b7ea7ad0c94d64946aedaac4" data-widgetname="iAMP_2" data-geo="de"
-    data-urlprefix="" data-categories="politik">
+    data-publickey="e6a75b42216ffc96b7ea7ad0c94d64946aedaac4" data-widgetname="iAMP_2" data-geo="de" data-urlprefix=""
+    data-categories="politik">
   </amp-embed>
 
   <h2>polymorphicAds</h2>
@@ -1651,22 +1588,47 @@ <h2>PromoteIQ</h2>
   </amp-ad>
 
   <h2>PubExchange</h2>
-  <amp-embed width="640" height="320" heights="(max-width:480px) 400%, (max-width:650px) 100%, 75%"
-    layout="responsive" type="pubexchange" data-publication="test_publication" data-module-id="below_content"
-    data-module-num="2626" data-test="true">
+  <amp-embed width="640" height="320" heights="(max-width:480px) 400%, (max-width:650px) 100%, 75%" layout="responsive"
+    type="pubexchange" data-publication="test_publication" data-module-id="below_content" data-module-num="2626"
+    data-test="true">
   </amp-embed>
 
+  <h2>Pubfuture</h2>
+  <amp-ad width="300" height="250" type="pubfuture" data-id="PLACE_HOLDER">
+  </amp-ad>
+
   <h2>PubGuru</h2>
   <amp-ad width=300 height=250 type="pubguru" data-publisher="your-publisher-name"
     data-slot="/23081961/monetizemore.com_test_300x250">
   </amp-ad>
 
+  <h2>PubWise</h2>
+  <amp-ad width="320" height="50" data-block-on-consent type="doubleclick" data-slot="/test/test"
+    json='{"targeting":{"hb_format": "banner"}}' rtc-config='{
+      "vendors": {
+        "pubwise": {"TAG_ID": "test"}
+        },
+        "sendRegardlessOfConsentState": true,
+      "timeoutMillis": 2500}'>
+  </amp-ad>
+
   <h2>Pubmine 300x250</h2>
   <amp-ad width="300" height="265" type="pubmine" data-section="1" data-siteid="37790885">
   </amp-ad>
 
   <amp-ad width="300" height="265" type="pubmine" data-section="2" data-siteid="37790885">
   </amp-ad>
+  <h2>PubScale 300x250</h2>
+  <amp-ad
+    width="300"
+    height="250"
+    type="pubscale"
+    data-pid="/22387492205/Banner_Test_300x250"
+    data-format="banner"
+    data-size="[[300,250]]"
+    data-appid="99442080"
+  >
+  </amp-ad>
 
   <h2>Pulse Horizontal</h2>
   <amp-embed width="300" height="300" type="pulse" data-sid="artners_widget_example_horizontalamp">
@@ -1697,6 +1659,11 @@ <h2>Quora</h2>
   <amp-ad width="450" height="220" type="quoraad" data-adid="fake">
   </amp-ad>
 
+  <h2>R9x</h2>
+  <amp-ad width="300" height="250" type="r9x" data-siteid="40827" data-slotpath="/103512698/AMP_COMPONENT_TEST_1"
+    data-totalAmpSlots="1">
+  </amp-ad>
+
   <h2>Rakuten Unified Ads</h2>
   <amp-ad width="300" height="250" type="rakutenunifiedads" data-env="dev" data-id="63">
   </amp-ad>
@@ -1717,11 +1684,7 @@ <h2>RbInfox</h2>
   </amp-embed>
 
   <h2>RcmWidget</h2>
-  <amp-embed
-    width="auto"
-    height="500"
-    type="rcmwidget"
-  >
+  <amp-embed width="auto" height="500" type="rcmwidget">
   </amp-embed>
 
   <h2>ReadMo</h2>
@@ -1735,8 +1698,8 @@ <h2>Realclick</h2>
   </amp-ad>
 
   <h2>recomAD</h2>
-  <amp-ad width="320" height="145" type="recomad" data-app-id="53811c33" data-widget-id="275"
-    data-search-term="sneaker" data-puid="amp-ad-recomad-example-page">
+  <amp-ad width="320" height="145" type="recomad" data-app-id="53811c33" data-widget-id="275" data-search-term="sneaker"
+    data-puid="amp-ad-recomad-example-page">
   </amp-ad>
 
   <h2>Recreativ fixed height</h2>
@@ -1748,8 +1711,8 @@ <h2>Recreativ fixed</h2>
   </amp-ad>
 
   <h2>Relap</h2>
-  <amp-ad width="auto" height="750" type="relap" layout="fixed-height" data-token="D3UMgQWBqleq1tPW"
-    data-url="http://bigpicture.ru" data-anchorid="i0xMMY1MoliiZWVl">
+  <amp-ad width="auto" height="790" type="relap" layout="fixed-height" data-token="D3UMgQWBqleq1tPW"
+    data-url="https://relap.mail.ru/" data-anchorid="-FVV_OEgYpljt7e3" data-version="v7">
   </amp-ad>
 
   <h2>RelapPro</h2>
@@ -1762,19 +1725,8 @@ <h2>Remixd</h2>
   </amp-ad>
 
   <h2>Revcontent Responsive Tag</h2>
-  <amp-ad width="320" height="240" type="revcontent" layout="responsive" heights="(max-width: 320px) 933px,
-    (max-width: 360px) 1087px,
-    (max-width: 375px) 1138px,
-    (max-width: 412px) 1189px,
-    (max-width: 414px) 1072px,
-    (max-width: 568px) 1151px,
-    (max-width: 640px) 1128px,
-    (max-width: 667px) 1151px,
-    (max-width: 732px) 1211px,
-    (max-width: 736px) 1151px,
-    (max-width: 768px) 633px,
-    (max-width: 1024px) 711px,
-    86vw" data-wrapper="rcjsload_2ff711" data-id="203">
+  <p>Note: Seeing no widget can be common in non HTTPS or localhost environments.</p>
+  <amp-ad width="100" height="300" type="revcontent" layout="responsive" data-revcontent data-id="1233">
   </amp-ad>
 
   <h2>RevJet Tag</h2>
@@ -1793,20 +1745,17 @@ <h2>Rubicon Project Smart Tag</h2>
   </amp-ad>
 
   <h2>RUNative</h2>
-  <amp-embed width="640" height="320" heights="(max-width:480px) 400%, (max-width:650px) 100%, 65%"
-    layout="responsive" type="runative" data-spot="ac8c2f9a835f4147a81bfd4a48601f2b" data-ad-type="label-over"
-    data-cols="3" data-rows="2" data-title="From the Web">
+  <amp-embed width="640" height="320" heights="(max-width:480px) 400%, (max-width:650px) 100%, 65%" layout="responsive"
+    type="runative" data-spot="ac8c2f9a835f4147a81bfd4a48601f2b" data-ad-type="label-over" data-cols="3" data-rows="2"
+    data-title="From the Web">
   </amp-embed>
 
   <h2>Sabavision</h2>
   <amp-ad width="400" height="120" type="sabavision" data-zone-id="6904-Z159"
-  data-website-id="edf0f4c1-788f-44d3-bca7-b1da21f66a75">
+    data-website-id="edf0f4c1-788f-44d3-bca7-b1da21f66a75">
   </amp-ad>
-  <amp-ad width="500" height="350"
-      type="sabavision"
-      data-zone-id="7805-Z468"
-      data-website-id="edf0f4c1-788f-44d3-bca7-b1da21f66a75"
-      >
+  <amp-ad width="500" height="350" type="sabavision" data-zone-id="7805-Z468"
+    data-website-id="edf0f4c1-788f-44d3-bca7-b1da21f66a75">
   </amp-ad>
   <h2>SAS CI 360 Match</h2>
   <amp-ad width="468" height="60" type="sas" layout="fixed" data-customer-name="canary" data-size="468x60"
@@ -1827,14 +1776,17 @@ <h2>Seeding Alliance</h2>
   </amp-ad>
 
   <h2>Seedtag</h2>
-  <amp-ad width="320" height="250" type="seedtag" data-adunit-id="0" data-publisher-id="0000-0000-01"
-    data-placement="inArticle" data-force-creative="https://creatives.seedtag.com/vast/ssp-responses/video-cov.json?2">
+  <amp-ad width="320" height="250" type="seedtag" data-adunit-id="12345">
   </amp-ad>
 
   <h2>Sekindo</h2>
   <amp-ad width="300" height="250" type="sekindo" data-spaceId="14071">
   </amp-ad>
 
+  <h2>Sevio</h2>
+  <amp-ad width="300" height="250" type="sevio" data-zone="38da4be8-5d6e-4767-9d7c-0694c28343fc">
+  </amp-ad>
+
   <h2>Sharethrough</h2>
   <amp-ad width="300" height="150" type="sharethrough" layout="responsive" data-pkey="c0fa8367">
   </amp-ad>
@@ -1850,6 +1802,11 @@ <h2>Sklik</h2>
   <amp-ad width="970" height="310" type="sklik" json='{"zoneId":0, "w": 970, "h": 310}'>
   </amp-ad>
 
+  <h2>Skoiy</h2>
+  <amp-ad layout="fixed-height" height="454" type="skoiy" data-token="5nff7dqpce5u4moq" data-format="carousel"
+    data-id="8462514974">
+  </amp-ad>
+
   <h2>SlimCut Media</h2>
   <amp-ad width="400" height="225" type="slimcutmedia" data-pid="amp-3" data-ffc="SCMPROMO">
   </amp-ad>
@@ -1943,8 +1900,7 @@ <h2>Sulvo</h2>
   </amp-ad>
 
   <h2>SunMedia</h2>
-  <amp-ad width="300" height="1" type="sunmedia" layout="responsive" data-cskp="1" data-cid="sunmedia_test"
-    data-crst="1">
+  <amp-ad width="1" height="1" type="sunmedia" layout="responsive" data-cid="5898aec7-32f5-4e3b-bd67-41f68b58b412">
   </amp-ad>
 
   <h2>SVK Native widget</h2>
@@ -1968,10 +1924,8 @@ <h2>Tagon</h2>
 
   <h2>Tail</h2>
   <div>It is common to see a no-fill ad in this example.</div>
-  <amp-ad width="300" height="250"
-  type="doubleclick"
-  data-slot="/1234567/medium-rectangle"
-  rtc-config="{"vendors": {"tail": {"TAIL_ACCOUNT": "TT-0000-0"}}}">
+  <amp-ad width="300" height="250" type="doubleclick" data-slot="/1234567/medium-rectangle" rtc-config="{" vendors":
+    {"tail": {"TAIL_ACCOUNT": "TT-0000-0" }}}">
   </amp-ad>
 
   <h2>TcsEmotion AMP tag</h2>
@@ -2036,13 +1990,11 @@ <h2>Weborama</h2>
   </amp-ad>
 
   <h2>Widespace Panorama Ad</h2>
-  <amp-ad width="300" height="50" type="widespace" data-sid="93f1a996-52f5-46b4-8dc8-ccd8886a8fbf"
-    layout="responsive">
+  <amp-ad width="300" height="50" type="widespace" data-sid="93f1a996-52f5-46b4-8dc8-ccd8886a8fbf" layout="responsive">
   </amp-ad>
 
   <h2>Widespace Takeover Ad</h2>
-  <amp-ad width="300" height="300" type="widespace" data-sid="fc5a6f59-d45e-4cf1-acac-67bf5ab4862a"
-    layout="responsive">
+  <amp-ad width="300" height="300" type="widespace" data-sid="fc5a6f59-d45e-4cf1-acac-67bf5ab4862a" layout="responsive">
   </amp-ad>
 
   <h2>Wisteria Ad</h2>
@@ -2053,11 +2005,6 @@ <h2>Xlift native ad</h2>
   <amp-ad width="300" height="300" type="xlift" data-mediaid="mamastar">
   </amp-ad>
 
-  <h2>Yahoo Display</h2>
-  <amp-ad width="316" height="264" type="yahoo" data-sid="954014446" data-site="news"
-    data-sa='{"LREC":"300x250","secure":"true","content":"no_expandable;"}'>
-  </amp-ad>
-
   <h2>Yahoo Native-Display Ads Federation</h2>
   <amp-embed width="320" height="320" type="yahoofedads" layout="responsive" data-site="finance" data-region="US"
     data-lang="en-US" data-ad-unit="pencil"
@@ -2100,154 +2047,93 @@ <h2>Yieldbot</h2>
       "YB_SLOT": "medrec"
       }
     }
-    }'
-    data-slot="/2476204/medium-rectangle"
-    data-multi-size="300x220,300x200"
+    }' data-slot="/2476204/medium-rectangle" data-multi-size="300x220,300x200"
     json='{"targeting":{"category":["food","lifestyle"]},"categoryExclusions":["health"]}'>
   </amp-ad>
 
   <h2>YIELD ONE</h2>
-  <amp-ad width="320" height="50"
-    type="yieldone"
-    data-pubid="0001"
-    data-pid="032478_4">
+  <amp-ad width="320" height="50" type="yieldone" data-pubid="0001" data-pid="032478_4">
   </amp-ad>
 
   <h2>Yieldmo</h2>
-  <amp-ad width=300 height=250
-    type="yieldmo"
-    data-ymid="1465861990777519642">
+  <amp-ad width=300 height=250 type="yieldmo" data-ymid="1465861990777519642">
   </amp-ad>
 
   <h2>Yieldpro</h2>
-  <amp-ad width="300" height="250"
-    type="yieldpro"
-    data-pubnetwork="12c6fc06"
-    data-section-id="1299"
-    data-slot="960">
+  <amp-ad width="300" height="250" type="yieldpro" data-pubnetwork="12c6fc06" data-section-id="1299" data-slot="960">
   </amp-ad>
 
   <h2>ValueCommerce</h2>
-  <amp-ad width="300" height="250"
-    type="valuecommerce"
-    data-sid="3008"
-    data-pid="884466614">
+  <amp-ad width="300" height="250" type="valuecommerce" data-sid="3008" data-pid="884466614">
   </amp-ad>
 
   <h2>VDO.AI</h2>
-  <amp-ad width="375"
-    height="0"
-    id="_vdo_ads_player_ai_"
-    type="vdoai"
-    data-unitid="_vdo_ads_player_ai_"
-    data-tagname="publisher"
-    layout="responsive"
-    >
+  <amp-ad width="375" height="0" id="_vdo_ads_player_ai_" type="vdoai" data-unitid="_vdo_ads_player_ai_"
+    data-tagname="publisher" layout="responsive">
   </amp-ad>
 
   <h2>Video intelligence</h2>
-  <amp-ad width="500" height="400"
-      type="videointelligence"
-      layout="responsive"
-      data-publisher-id="test_publisher"
-      data-channel-id="59674276073ef41e33501409">
+  <amp-ad width="500" height="400" type="videointelligence" layout="responsive" data-publisher-id="test_publisher"
+    data-channel-id="59674276073ef41e33501409">
   </amp-ad>
 
   <h2>Videonow</h2>
-  <amp-ad width="300" height="200"
-      type="videonow"
-      data-pid="55555"
-      layout="responsive">
+  <amp-ad width="300" height="200" type="videonow" data-pid="55555" layout="responsive">
   </amp-ad>
 
   <h2>Viralize</h2>
-  <amp-ad width="300" height="169"
-    type="viralize"
-    layout="responsive"
-    data-zid="AACX6WjIMkl-yoGV"
+  <amp-ad width="300" height="169" type="viralize" layout="responsive" data-zid="AACX6WjIMkl-yoGV"
     data-extra='{"lid":"22486","cid":"22572","preview":"1","f":"gallery"}'>
   </amp-ad>
 
   <h2>vlyby</h2>
-  <amp-embed width="300" height="250"
-    type="vlyby"
-    layout="responsive"
-    heights="250px"
-    data-publisherid="f363eb2b75459b34592cc4"
-    data-placementid="default"
-    data-pubref="test.amp.com">
+  <amp-embed width="300" height="250" type="vlyby" layout="responsive" heights="250px"
+    data-publisherid="f363eb2b75459b34592cc4" data-placementid="default" data-pubref="test.amp.com">
   </amp-embed>
 
   <h2>VMFive</h2>
-  <amp-ad width="300" height="169"
-  type="vmfive"
-  data-app-key="580db14a4a801a2674a56f81"
-  data-placement-id="demo-placement-id"
-  data-ad-type="video-native">
+  <amp-ad width="300" height="169" type="vmfive" data-app-key="580db14a4a801a2674a56f81"
+    data-placement-id="demo-placement-id" data-ad-type="video-native">
+  </amp-ad>
+
+  <h2>VOX</h2>
+  <amp-ad width="300" height="600" type="vox" data-placementid="000000000000000000000000"
+    data-vox-params='{"adtype": "simple"}'>
   </amp-ad>
 
   <h2>Webediads</h2>
   <div>It's a private ad network with strict ad targeting, hence very common to see a no-fill.</div>
-  <amp-ad width="300" height="250"
-    type="webediads"
-    data-site="site_test"
-    data-page="amp"
-    data-position="middle"
+  <amp-ad width="300" height="250" type="webediads" data-site="site_test" data-page="amp" data-position="middle"
     data-query="amptest=1">
   </amp-ad>
 
   <h2>Whopa InFeed</h2>
-  <amp-embed width="100" height="300"
-  type="whopainfeed"
-  layout="responsive"
-  heights="(min-width:1907px) 39%, (min-width:1200px) 46%, (min-width:780px) 64%, (min-width:480px) 98%, (min-width:460px) 167%, 196%"
-  data-siteId="d09aa95befe76773c32f581f00b267bc"
-  data-template="default"
-  data-testMode="true"></amp-embed>
+  <amp-embed width="100" height="300" type="whopainfeed" layout="responsive"
+    heights="(min-width:1907px) 39%, (min-width:1200px) 46%, (min-width:780px) 64%, (min-width:480px) 98%, (min-width:460px) 167%, 196%"
+    data-siteId="d09aa95befe76773c32f581f00b267bc" data-template="default" data-testMode="true"></amp-embed>
 
   <h2>WP Media</h2>
-  <amp-ad width="300" height="250"
-    type="wpmedia"
-    data-slot="12"
-    data-bunch="7757"
-    data-sn="sg"></amp-ad>
+  <amp-ad width="300" height="250" type="wpmedia" data-slot="12" data-bunch="7757" data-sn="sg"></amp-ad>
 
   <h2>ZEDO</h2>
-  <amp-ad width="300" height="250"
-    type="zedo"
-    data-super-id="364489"
-    data-network="2500"
-    data-placement-id="364489_1"
-    data-channel="727"
-    data-publisher="0"
-    data-dim="9">
+  <amp-ad width="300" height="250" type="zedo" data-super-id="364489" data-network="2500" data-placement-id="364489_1"
+    data-channel="727" data-publisher="0" data-dim="9">
   </amp-ad>
 
   <h2>Zen</h2>
-  <amp-embed width="500" height="354"
-    type="zen"
-    data-clid="[123, 456]">
+  <amp-embed width="500" height="354" type="zen" data-clid="[123, 456]">
   </amp-embed>
 
   <h2>ZergNet</h2>
-  <amp-embed width="780" height="100"
-    type="zergnet"
-    heights="(max-width:645px) 100%, (max-width:845px) 31%, 23%"
-    layout="responsive"
-    data-zergid="42658">
+  <amp-embed width="780" height="100" type="zergnet" heights="(max-width:645px) 100%, (max-width:845px) 31%, 23%"
+    layout="responsive" data-zergid="42658">
   </amp-embed>
 
   <h2>Zucks</h2>
-  <amp-ad width="320" height="50"
-    type="zucks"
-    data-frame-id="_bda46cf5ac">
+  <amp-ad width="320" height="50" type="zucks" data-frame-id="_bda46cf5ac">
   </amp-ad>
 
-  <amp-ad width="320" height="400"
-      type="zucks"
-      data-adtype="zoe"
-      data-frame-id="_29845b2931"
-      data-zoe-multi-ad="true">
+  <amp-ad width="320" height="400" type="zucks" data-adtype="zoe" data-frame-id="_29845b2931" data-zoe-multi-ad="true">
   </amp-ad>
 </body>
 
diff --git a/examples/amp-ad/adsviu.amp.html b/examples/amp-ad/adsviu.amp.html
new file mode 100644
index 000000000000..12bfb543a07a
--- /dev/null
+++ b/examples/amp-ad/adsviu.amp.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html ⚡>
+<head>
+  <meta charset="utf-8" />
+  <title>My AMP Page</title>
+  <link rel="canonical" href="self.html" />
+  <meta name="viewport" content="width=device-width" />
+  <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+  <script async src="https://cdn.ampproject.org/v0.js"></script>
+  <script async custom-element="amp-ad" src="https://cdn.ampproject.org/v0/amp-ad-0.1.js"></script>
+  <style amp-custom>
+    h1 {
+      margin: 1rem;
+    }
+  </style>
+</head>
+<body>
+<h1>ADSVIU</h1>
+<amp-ad height="142"
+        layout="fixed-height"
+        type="adsviu"
+        data-site-id="ADV-1234AMP"
+        data-src="https://hips.hearstapps.com/hmg-prod.s3.amazonaws.com/images/gettyimages-145020300-1610550890.jpg"
+></amp-ad>
+</body>
+</html>
diff --git a/examples/amp-ad/smartadserver.amp.html b/examples/amp-ad/smartadserver.amp.html
new file mode 100644
index 000000000000..bb79981eb724
--- /dev/null
+++ b/examples/amp-ad/smartadserver.amp.html
@@ -0,0 +1,27 @@
+<!doctype html>
+<html ⚡ lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Smartadserver Examples</title>
+    <link rel="canonical" href="http://nonblocking.io/">
+    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+    <script async src="https://cdn.ampproject.org/v0.js"></script>
+    <script async custom-element="amp-ad" src="https://cdn.ampproject.org/v0/amp-ad-0.1.js"></script>
+</head>
+<body>
+    <amp-ad width="300" height="250" type="smartadserver" data-domain="https://www4.smartadserver.com"
+        data-site="95802" data-page="633338" data-format="35679" data-target="foo=bar">
+    </amp-ad>
+
+    <amp-ad width="300" height="250" type="smartadserver" data-domain="https://www4.smartadserver.com"
+        data-site="95802" data-page="633338" data-format="35679" data-target="test=rtc&foo=bar"
+        rtc-config='{
+            "vendors": {
+                "fakeVendor": { "SLOT_ID": "1", "PAGE_ID": "2" },
+                "fakeVendor2": { "SLOT_ID": "1" }
+            },
+            "timeoutMillis": 400}'>
+    </amp-ad>
+</body>
+</html>
diff --git a/examples/amp-consent/diy-consent.html b/examples/amp-consent/diy-consent.html
index 423ebed63589..452f3c0576fc 100644
--- a/examples/amp-consent/diy-consent.html
+++ b/examples/amp-consent/diy-consent.html
@@ -260,6 +260,7 @@ <h1>Thank you!</h1>
             additionalConsent: getAdditionalConsentString(),
             gdprApplies: true,
             purposeOne: true,
+            gppSectionId: undefined,
           },
           purposeConsents: {
             "purpose-foo": true,
diff --git a/examples/amp-copy-action.amp.html b/examples/amp-copy-action.amp.html
new file mode 100644
index 000000000000..47f8ae2acf8a
--- /dev/null
+++ b/examples/amp-copy-action.amp.html
@@ -0,0 +1,293 @@
+<!DOCTYPE html>
+<html ⚡ lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <script async src="https://cdn.ampproject.org/v0.js"></script>
+    <!-- ## Setup -->
+    <link
+      rel="canonical"
+      href="https://amp.dev/documentation/examples/components/amp-copy-action/"
+    />
+    <meta
+      name="viewport"
+      content="width=device-width,minimum-scale=1,initial-scale=1"
+    />
+    <script
+      async
+      custom-element="amp-bind"
+      src="https://cdn.ampproject.org/v0/amp-bind-0.1.js"
+    ></script>
+    <style amp-custom>
+      .row {
+        background-color: #eee;
+        border-radius: 5px;
+        border: 1px black solid;
+        margin: 10px auto;
+        padding: 5px;
+        width: 50%;
+      }
+
+      .code {
+        border-radius: 5px;
+        border: 1px lightgray solid;
+        margin: 5px;
+        padding: 10px;
+      }
+
+      .sample {
+        background-color: #fff;
+        margin: 5px;
+        padding: 10px;
+      }
+
+      h1 {
+        font-size: medium;
+      }
+
+      .copy-success {
+        background-color: greenyellow;
+        border-radius: 5px;
+        border: 1px green solid;
+        color: green;
+        padding: 0 5px;
+      }
+
+      .copy-error {
+        background-color: red;
+        border-radius: 5px;
+        border: 1px darkred solid;
+        color: darkred;
+        padding: 0 5px;
+      }
+
+      .sticky-paste-here {
+        background-color: gray;
+        border-radius: 0 0 5px 5px;
+        border: 10px gray solid;
+        left: 0;
+        margin: auto;
+        padding: 5px;
+        position: sticky;
+        top: 0;
+        width: 50%;
+      }
+    </style>
+    <style amp-boilerplate>
+      body {
+        -webkit-animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+        -moz-animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+        -ms-animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+        animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+      }
+      @-webkit-keyframes -amp-start {
+        from {
+          visibility: hidden;
+        }
+        to {
+          visibility: visible;
+        }
+      }
+      @-moz-keyframes -amp-start {
+        from {
+          visibility: hidden;
+        }
+        to {
+          visibility: visible;
+        }
+      }
+      @-ms-keyframes -amp-start {
+        from {
+          visibility: hidden;
+        }
+        to {
+          visibility: visible;
+        }
+      }
+      @-o-keyframes -amp-start {
+        from {
+          visibility: hidden;
+        }
+        to {
+          visibility: visible;
+        }
+      }
+      @keyframes -amp-start {
+        from {
+          visibility: hidden;
+        }
+        to {
+          visibility: visible;
+        }
+      }
+    </style>
+    <noscript
+      ><style amp-boilerplate>
+        body {
+          -webkit-animation: none;
+          -moz-animation: none;
+          -ms-animation: none;
+          animation: none;
+        }
+      </style></noscript
+    >
+  </head>
+
+  <body>
+    <div class="sticky-paste-here">
+      <textarea placeholder="Paste here!" cols="50"></textarea>
+    </div>
+    <div class="row">
+      <h1>Copy DIV Content</h1>
+      <pre class="code">
+        <code>
+          &#60;!-- 'divTarget' to Copy --&#62;
+          &#60;div id="divTarget"&#62;
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+          &#60;/div&#62;
+
+          &#60;!-- Copy Action Button --&#62;
+          &#60;button on="tap:divTarget.copy();
+                      copy-success:divCopySuccess.show();
+                      copy-error:divCopyError.show()"&#62;
+            Copy DIV Content
+          &#60;/button&#62;
+
+          &#60;!-- Target to show on 'copy-success' --&#62;
+          &#60;span id="divCopySuccess" hidden class="copy-success"&#62;Content copied!&#60;/span&#62;
+          &#60;!-- Target to show on 'copy-error' --&#62;
+          &#60;span id="divCopyError" hidden class="copy-error"&#62; Error while copying! &#60;/span&#62;
+        </code>
+      </pre>
+      <div class="sample">
+        <!-- 'divTarget' to Copy -->
+        <div id="divTarget">
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+        </div>
+
+        <!-- Copy Action Button -->
+        <button
+          on="tap:divTarget.copy();copy-success:divCopySuccess.show();copy-error:divCopyError.show()"
+        >
+          Copy DIV Content
+        </button>
+
+        <!-- Target to show on 'copy-success' -->
+        <span id="divCopySuccess" hidden class="copy-success">
+          Content copied!
+        </span>
+
+        <!-- Target to show on 'copy-error' -->
+        <span id="divCopyError" hidden class="copy-error">
+          Error while copying!
+        </span>
+      </div>
+    </div>
+    <div class="row">
+      <h1>Copy INPUT Value</h1>
+      <pre class="code">
+        <code>
+          &#60;!-- 'inputTarget' to Copy --&#62;
+          &#60;input id="inputTarget" value="Sample Input Value" /&#62;
+
+          &#60;!-- Copy Action Button --&#62;
+          &#60;button on="tap:inputTarget.copy();
+                      copy-success:inputCopySuccess.show();
+                      copy-error:inputCopyError.show()"&#62;
+            Copy Input Value
+          &#60;/button&#62;
+
+          &#60;!-- Target to show on 'copy-success' --&#62;
+          &#60;span id="inputCopySuccess" hidden class="copy-success"&#62;Value copied successfully!&#60;/span&#62;
+          &#60;!-- Target to show on 'copy-error' --&#62;
+          &#60;span id="inputCopyError" hidden class="copy-error"&#62;Error while copying!&#60;/span&#62;
+        </code>
+      </pre>
+      <div class="sample">
+        <!-- 'inputTarget' to Copy -->
+        <input id="inputTarget" value="Sample Input Value" />
+
+        <!-- Copy Action Button -->
+        <button
+          on="tap:inputTarget.copy();copy-success:inputCopySuccess.show();copy-error:inputCopyError.show()"
+        >
+          Copy Input Value
+        </button>
+
+        <!-- Target to show on 'copy-success' -->
+        <span id="inputCopySuccess" hidden class="copy-success">
+          Value copied successfully!
+        </span>
+
+        <!-- Target to show on 'copy-error' -->
+        <span id="inputCopyError" hidden class="copy-error">
+          Error while copying!
+        </span>
+      </div>
+    </div>
+    <div class="row">
+      <h1>Copy Static Text</h1>
+      <pre class="code">
+        <code>
+          &#60;!-- Copy Action Button --&#62;
+          &#60;button on="tap:AMP.copy(text='Hello AMP!');
+                          copy-success:staticTextCopySuccess.show()"&#62;
+            Copy Static Text
+          &#60;/button&#62;
+
+          &#60;!-- Target to show on 'copy-success' --&#62;
+          &#60;span id="staticTextCopySuccess" hidden class="copy-success"&#62;
+            StaticText copied successfully!
+          &#60;/span&#62;
+        </code>
+      </pre>
+      <div class="sample">
+        <!-- Copy Action Button -->
+        <button
+          on="tap:AMP.copy(text='Hello AMP!');copy-success:staticTextCopySuccess.show()"
+        >
+          Copy Static Text
+        </button>
+
+        <!-- Target to show on 'copy-success' -->
+        <span id="staticTextCopySuccess" hidden class="copy-success">
+          StaticText copied successfully!
+        </span>
+      </div>
+    </div>
+    <div class="row">
+      <h1>Dynamically modifying class & text based on 'eventResult'</h1>
+      <pre>
+        <code>
+          &#60;!-- Copy Action Button --&#62;
+          &#60;button on="tap:AMP.copy(text='Copy static text');
+                          copy-error:AMP.setState({eventResult: event.data.type});
+                          copy-success:AMP.setState({eventResult: event.data.type})"&#62;
+            Copy Action
+          &#60;/button&#62;
+
+          &#60;!-- Dynamically checking copy 'eventResult' --&#62;
+          &#60;p hidden [hidden]="false"
+                 [class]="(eventResult != 'error')?'copy-success':'copy-error'"
+                 [text]="(eventResult != 'error')?'Copied!':'Error while copying!'"
+          /&#62;
+        </code>
+      </pre>
+      <div class="sample">
+        <!-- Copy Action Button -->
+        <button
+          on="tap:AMP.copy(text='Copy static text');copy-error:AMP.setState({eventResult: event.data.type});copy-success:AMP.setState({eventResult: event.data.type})"
+        >
+          Copy Action
+        </button>
+
+        <!-- Dynamically checking copy 'eventResult' -->
+        <p
+          hidden
+          [hidden]="false"
+          [class]="(eventResult != 'error')?'copy-success':'copy-error'"
+          [text]="(eventResult != 'error')?'Copied!':'Error while copying!'"
+        />
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/examples/amp-geo.amp.html b/examples/amp-geo.amp.html
index 9097f95bdba4..d61dae3fa786 100644
--- a/examples/amp-geo.amp.html
+++ b/examples/amp-geo.amp.html
@@ -35,7 +35,8 @@
         "ISOCountryGroups": {
           "nafta": [ "ca", "mx", "us", "unknown" ],
           "waldo": [ "unknown" ],
-          "anz": [ "au", "nz" ]
+          "anz": [ "au", "nz" ],
+          "usSubdivisions": [ "us-ca", "us-ny" ]
         }
       }
     </script>
@@ -52,7 +53,8 @@ <h1>My article title</h1>
           &quot;ISOCountryGroups&quot;: {
             &quot;nafta&quot;: [ &quot;ca&quot;, &quot;mx&quot;, &quot;us&quot;, &quot;unknown&quot; ],
             &quot;waldo&quot;: [ &quot;unknown&quot; ],
-            &quot;anz&quot;: [ &quot;au&quot;, &quot;nz&quot; ]
+            &quot;anz&quot;: [ &quot;au&quot;, &quot;nz&quot; ],
+            &quot;usSubdivisions&quot;: [ &quot;us-ca&quot;, &quot;us-ny&quot; ]
           }
         }
       &lt;/script&gt;
@@ -63,12 +65,13 @@ <h1>My article title</h1>
       This means that if your country is "unknown" you will appear in the
       "nafta" and "unknown" groups.  To change the country for testing
       append #amp-geo=&lt;code&gt; to the url and reload the page
-      (eg #amp-geo=nz)
+      (eg #amp-geo=nz, #amp-geo=us us-ny)
   </p>
 
 
-  <button on="tap:AMP.setState({myCountry: ampGeo.ISOCountry})">Where am I?</button>
+  <button on="tap:AMP.setState({myCountry: ampGeo.ISOCountry, mySubdivision: ampGeo.ISOSubdivision})">Where am I?</button>
   <p [text]="'The country code is: ' + myCountry "></p>
+  <p [text]="'The subdivision code is: ' + mySubdivision "></p>
   <p [text]="'Matched country groups: ' + ampGeo.ISOCountryGroups.join(', ') "></p>
 
   <p>There is an amp-pixel variable substitution example here</p>
diff --git a/examples/amp-google-read-aloud-player/amp-google-read-aloud-player.amp.html b/examples/amp-google-read-aloud-player/amp-google-read-aloud-player.amp.html
new file mode 100644
index 000000000000..d09d4e5458c0
--- /dev/null
+++ b/examples/amp-google-read-aloud-player/amp-google-read-aloud-player.amp.html
@@ -0,0 +1,167 @@
+<!doctype html>
+<html ⚡>
+
+<head>
+  <meta charset="utf-8">
+  <title>Examples: amp-google-read-aloud-player</title>
+  <link rel="canonical"
+    href="https://blog.google/products/assistant/easier-access-web-pages-let-assistant-read-it-aloud/">
+  <meta name="title" content="Examples: amp-google-read-aloud-player">
+  <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+  <meta name="amp-experiments-opt-in" content="amp-google-read-aloud-player">
+  <meta name="amp-experiment-token"
+    content="AAAAAFd7Im9yaWdpbiI6Imh0dHA6Ly9sb2NhbGhvc3Q6ODAwMCIsImV4cGVyaW1lbnQiOiJhbXAtc2NyaXB0IiwiZXhwaXJhdGlvbiI6MTg5NjEzNDQwMDAwMH08Wb1WA4ZcsTLNK1pxwXdmfYUlv4ybtfIMw3yS66dZhsJl11JYrTanag4ZlAr4sfBRTVmQfKLsiJq/JJHdrpRzT9M6EQD/JYos1SlohtQiK2YfhvXgN7zot3WBuFkqoxSiyvX/l23UYKSo2ebNTnMDFhI+yrX8uc9BblbYniRtQGXBPktjJUIgavEBS5t45bgbPNutNvAreYGlz7na4lImrpnNa8K28Ow4hqOxcqqdFoHD9hlwtKlpydJQpEmtM+S+jdDLKWq6JtC+HoUSovuitrqkioJ4cfuVkFqtoaKWPLXSOwoc5UJl3zNjlTjvQ/Gnk33NdWs6/FtZbxCq+lWe">
+  <style amp-boilerplate>
+    body {
+      -webkit-animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+      -moz-animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+      -ms-animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+      animation: -amp-start 8s steps(1, end) 0s 1 normal both
+    }
+
+    @-webkit-keyframes -amp-start {
+      from {
+        visibility: hidden
+      }
+
+      to {
+        visibility: visible
+      }
+    }
+
+    @-moz-keyframes -amp-start {
+      from {
+        visibility: hidden
+      }
+
+      to {
+        visibility: visible
+      }
+    }
+
+    @-ms-keyframes -amp-start {
+      from {
+        visibility: hidden
+      }
+
+      to {
+        visibility: visible
+      }
+    }
+
+    @-o-keyframes -amp-start {
+      from {
+        visibility: hidden
+      }
+
+      to {
+        visibility: visible
+      }
+    }
+
+    @keyframes -amp-start {
+      from {
+        visibility: hidden
+      }
+
+      to {
+        visibility: visible
+      }
+    }
+  </style><noscript>
+    <style amp-boilerplate>
+      body {
+        -webkit-animation: none;
+        -moz-animation: none;
+        -ms-animation: none;
+        animation: none
+      }
+    </style>
+  </noscript>
+  <script async custom-element="amp-google-read-aloud-player" src="https://cdn.ampproject.org/v0/amp-google-read-aloud-player-0.1.js"></script>
+  <script async src="https://cdn.ampproject.org/v0.js"></script>
+</head>
+
+<body>
+  <h1>Examples: amp-google-read-aloud-player</h1>
+
+  <h2>Simple Player</h2>
+  <div>
+    <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-tracking-ids="UA-000000-2"
+      data-voice="YOUR_VOICE"
+      data-url="https://blog.google/products/assistant/easier-access-web-pages-let-assistant-read-it-aloud/" />
+  </div>
+
+  <h2>Layouts</h2>
+
+  <h3>fixed</h3>
+  <div>
+    <amp-google-read-aloud-player layout="fixed" height="66" width="500" data-api-key="YOUR_API_KEY"
+      data-tracking-ids="UA-000000-2" data-voice="YOUR_VOICE"
+      data-url="https://blog.google/products/assistant/easier-access-web-pages-let-assistant-read-it-aloud/" />
+  </div>
+
+  <h3>fixed-height</h3>
+  <div>
+    <amp-google-read-aloud-player layout="fixed-height" height="66" data-api-key="YOUR_API_KEY"
+      data-tracking-ids="UA-000000-2" data-voice="YOUR_VOICE"
+      data-url="https://blog.google/products/assistant/easier-access-web-pages-let-assistant-read-it-aloud/" />
+  </div>
+
+  <h2>With Actions</h2>
+  <div>
+    <amp-google-read-aloud-player id="my-read-aloud" layout="fixed-height" height="66"
+      data-api-key="YOUR_API_KEY" data-tracking-ids="UA-000000-2"
+      data-voice="YOUR_VOICE"
+      data-url="https://blog.google/products/assistant/easier-access-web-pages-let-assistant-read-it-aloud/" />
+  </div>
+  <div>
+    <button on="tap:my-read-aloud.play">Play</button>
+    <button on="tap:my-read-aloud.pause">Pause</button>
+    <button on="tap:my-read-aloud.mute">Mute</button>
+    <button on="tap:my-read-aloud.unmute">Unmute</button>
+    <button on="tap:my-read-aloud.toggleVisibility">Visibility</button>
+  </div>
+
+  <h2>Attributes</h2>
+
+  <h3>data-url</h3>
+  <div>
+    <amp-google-read-aloud-player layout="fixed-height" height="66" data-api-key="YOUR_API_KEY"
+      data-tracking-ids="UA-000000-2" data-voice="YOUR_VOICE"
+      data-url="https://www.foxnews.com/tech/remove-google-search-results-you-dont-want-people-to-find" />
+  </div>
+
+  <h3>data-speakable</h3>
+  <div>
+    <amp-google-read-aloud-player layout="fixed-height" height="66" data-api-key="YOUR_API_KEY"
+      data-tracking-ids="UA-000000-2" data-voice="YOUR_VOICE" data-speakable
+      data-url="https://www.foxnews.com/tech/remove-google-search-results-you-dont-want-people-to-find" />
+  </div>
+
+  <h3>data-call-to-action-label</h3>
+  <div>
+    <amp-google-read-aloud-player layout="fixed-height" height="66" data-api-key="YOUR_API_KEY"
+      data-tracking-ids="UA-000000-2" data-voice="YOUR_VOICE" data-call-to-action-label="Listen now!"
+      data-url="https://blog.google/products/assistant/easier-access-web-pages-let-assistant-read-it-aloud/" />
+  </div>
+
+  <h3>data-intro</h3>
+  <div>
+    <amp-google-read-aloud-player layout="fixed-height" height="66" data-api-key="YOUR_API_KEY"
+      data-tracking-ids="UA-000000-2" data-voice="YOUR_VOICE"
+      data-intro="https://d1490khl9dq1ow.cloudfront.net/music/mp3preview/quick-thinking_G1ECM8S_.mp3"
+      data-url="https://blog.google/products/assistant/easier-access-web-pages-let-assistant-read-it-aloud/" />
+  </div>
+
+  <h3>data-outro</h3>
+  <div>
+    <amp-google-read-aloud-player layout="fixed-height" height="66" data-api-key="YOUR_API_KEY"
+      data-tracking-ids="UA-000000-2" data-voice="YOUR_VOICE"
+      data-outro="https://d1490khl9dq1ow.cloudfront.net/music/mp3preview/quick-thinking_G1ECM8S_.mp3"
+      data-url="https://blog.google/products/assistant/easier-access-web-pages-let-assistant-read-it-aloud/" />
+  </div>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/examples/amp-redbull-player.amp.html b/examples/amp-redbull-player.amp.html
deleted file mode 100644
index 3281ec7103b1..000000000000
--- a/examples/amp-redbull-player.amp.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!doctype html>
-<html amp lang="en">
-  <head>
-    <meta charset="utf-8">
-    <link rel="canonical" href="amps.html">
-    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
-      <style amp-custom>
-    </style>
-    <script async src="https://cdn.ampproject.org/v0.js"></script>
-    <script async custom-element="amp-redbull-player" src="https://cdn.ampproject.org/v0/amp-redbull-player-0.1.js"></script>
-    <script async custom-element="amp-analytics" src="https://cdn.ampproject.org/v0/amp-analytics-0.1.js"></script>
-  </head>
-  <body>
-    <h1>amp-redbull-player</h1>
-    <amp-redbull-player
-      id="rbvideo_1"
-      data-param-videoid="rrn:content:videos:3965a26c-052e-575f-a28b-ded6bee23ee1:en-INT"
-      data-param-locale="us"
-      height="169"
-      width="300"
-      layout="fixed">
-    </amp-redbull-player><br/>
-
-    <amp-redbull-player
-      id="rbvideo_2"
-      data-param-videoid="rrn:content:videos:3e27acc3-2fd2-44f4-9d6f-c1ec0ff587f1:en-INT"
-      data-param-locale="at"
-      data-param-skinid="stv"
-      height=169
-      width=300
-      layout="fixed">
-    </amp-redbull-player>
-    <amp-analytics>
-      <!-- Docs: https://amp.dev/documentation/components/amp-video-iframe/ -> postAnalyticsEvent(eventType[, vars]) -->
-      <!--
-        https://amp.dev/documentation/components/amp-analytics/#transport
-        "transport": {"xhrpost": false, "beacon": false, "image": true},
-      -->
-      <script type="application/json">
-        {
-          "requests": {
-            "base": "https://www.google-analytics.com/collect?",
-            "event": {
-              "baseUrl": "${base}${custom_request}"
-            }
-          },
-          "triggers": {
-            "rbvideo_1": {
-              "on": "video-custom-tracking-rbvideo_1",
-              "request": "event",
-              "selector": "#rbvideo_1"
-            },
-             "rbvideo_2": {
-              "on": "video-custom-tracking-rbvideo_2",
-              "request": "event",
-              "selector": "#rbvideo_2"
-            }
-          }
-        }
-      </script>
-    </amp-analytics>
-  </body>
-</html>
diff --git a/examples/amp-story/access.html b/examples/amp-story/access.html
deleted file mode 100644
index 23d574d32aa6..000000000000
--- a/examples/amp-story/access.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<!doctype html>
-<html amp lang="en">
-  <head>
-    <meta charset="utf-8">
-    <script async src="https://cdn.ampproject.org/v0.js"></script>
-    <script async custom-element="amp-story"
-        src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
-    <script async custom-element="amp-access"
-        src="https://cdn.ampproject.org/v0/amp-access-0.1.js"></script>
-    <title>My Story with access</title>
-    <meta name="viewport"
-          content="width=device-width,minimum-scale=1,initial-scale=1">
-    <link rel="canonical" href="access.html">
-    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
-    <style amp-custom>
-      body {
-        font-family: 'Roboto', sans-serif;
-      }
-      amp-story {
-        --primary-color: #0379c4;
-      }
-      amp-story-page {
-        background-color: white;
-      }
-    </style>
-    <script type="application/ld+json">
-      {
-        "@context": "http://schema.org",
-        "@type": "NewsArticle",
-        "mainEntityOfPage": {
-          "@type": "WebPage",
-          "@id": "./access.html"
-        },
-        "headline": "My Story",
-        "image":["http://placehold.it/420x740"],
-        "datePublished": "2018-01-01T00:00:00+00:00",
-        "dateModified": "2018-01-01T00:00:00+00:00",
-        "author": {
-          "@type": "Organization",
-          "name": "AMP Project"
-        },
-        "publisher": {
-          "@type": "Organization",
-          "name": "AMP Project",
-          "logo": {
-            "@type": "ImageObject",
-            "url": "http://placehold.it/128x128"
-          }
-        },
-        "description": "My Story"
-      }
-    </script>
-    <script id="amp-access" type="application/json">
-      {
-        "authorization": "https://ampbyexample.com/components/amp-access/authorization?rid=READER_ID&url=CANONICAL_URL&ref=DOCUMENT_REFERRER&_=RANDOM",
-        "pingback": "https://ampbyexample.com/components/amp-access/authorization?rid=READER_ID&url=CANONICAL_URL&ref=DOCUMENT_REFERRER&_=RANDOM",
-        "login": "https://ampbyexample.com/components/amp-access/login?rid=READER_ID&url=CANONICAL_URL",
-        "authorizationFallbackResponse": {"error": true}
-      }
-    </script>
-  </head>
-
-  <body>
-    <amp-story standalone publisher-logo-src="https://placekitten.com/g/64/64">
-      <amp-story-access type="blocking">
-        <button on="tap:amp-access.login">Login to read more!</button>
-      </amp-story-access>
-
-      <amp-story-access amp-access="NOT loggedIn" type="notification">
-        <button on="tap:amp-access.login">Please subscribe or log in!</button>
-      </amp-story-access>
-
-      <amp-story-page id="cover">
-        <amp-story-grid-layer template="vertical">
-          <h1>Free page!</h1>
-        </amp-story-grid-layer>
-      </amp-story-page>
-
-      <amp-story-page id="page1" amp-access="loggedIn">
-        <amp-story-grid-layer template="fill">
-          <amp-img height="800" width="450" src="https://placekitten.com/g/450/800"></amp-img>
-        </amp-story-grid-layer>
-        <amp-story-grid-layer template="vertical">
-          <h1>You're reading premium content!</h1>
-        </amp-story-grid-layer>
-      </amp-story-page>
-    </amp-story>
-  </body>
-</html>
diff --git a/examples/amp-story/affiliate-link.html b/examples/amp-story/affiliate-link.html
deleted file mode 100644
index 1e1407348fa8..000000000000
--- a/examples/amp-story/affiliate-link.html
+++ /dev/null
@@ -1,118 +0,0 @@
-<!doctype html>
-<html amp lang="en">
-  <head>
-    <meta charset="utf-8">
-    <script async src="https://cdn.ampproject.org/v0.js"></script>
-    <script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
-    <script async custom-element="amp-analytics" src="https://cdn.ampproject.org/v0/amp-analytics-0.1.js"></script>
-    <title>My Story</title>
-    <meta name="viewport"
-          content="width=device-width,minimum-scale=1,initial-scale=1">
-    <link rel="canonical" href="blink-link.html">
-    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
-    <style amp-custom>
-      body {
-        font-family: 'Roboto', sans-serif;
-      }
-      amp-story-page {
-        background: black;
-      }
-      h1 {
-        color: white;
-        font-size: 2.875em;
-        font-weight: normal;
-        line-height: 1.174;
-        text-transform: uppercase;
-      }
-      p {
-        color: white;
-      }
-    </style>
-  </head>
-
-  <body>
-    <amp-story standalone>
-
-      <amp-story-page id="cover">
-        <amp-story-grid-layer template="vertical">
-          <h1>Hello World</h1>
-          <p>This is the cover page of this story.</p>
-        </amp-story-grid-layer>
-      </amp-story-page>
-
-      <amp-story-page id="page-1">
-        <amp-story-grid-layer template="vertical">
-          <h1>First Page</h1>
-          <p>This is the first page of this story.</p>
-        </amp-story-grid-layer>
-      </amp-story-page>
-
-      <amp-story-page id="page-2">
-          <amp-story-grid-layer template="vertical">
-              <h1>Second Page</h1>
-              <p>This is the second page of this story.</p>
-            </amp-story-grid-layer>
-            <amp-story-grid-layer template="horizontal" style="padding-top: 260px">
-              <amp-img
-                src="./img/merch1.jpg"
-                width="120"
-                height="160"
-                max-width="210"
-                layout="fixed">
-              </amp-img>
-              <a id="blink-1" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="shopping-cart">
-                amp.devamp.devamp.devamp.devamp.devamp.dev
-              </a>
-            </amp-story-grid-layer>
-            <amp-story-grid-layer template="horizontal" style="padding-top: 450px">
-              <a id="blink-2" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="flight">
-                amp.devamp.devamp.devamp.devamp.devamp.dev
-              </a>
-            </amp-story-grid-layer>
-        </amp-story-page>
-
-        <amp-story-page id="page-3">
-          <amp-story-grid-layer template="vertical">
-            <h1>Third Page</h1>
-            <a id="blink-3" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="shopping-cart">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-            <a id="blink-4" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="offer">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-            <a id="blink-5" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="flight">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-            <a id="blink-6" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="hotel">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-            <a id="blink-7" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="movie">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-            <a id="blink-8" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="activity">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-            <a id="blink-9" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="more-to-read">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-          </amp-story-grid-layer>
-        </amp-story-page>
-    </amp-story>
-    <amp-analytics>
-      <script type="application/json">
-      {
-        "requests": {
-          "click": "?eventId=123"
-        },
-        "triggers": {
-          "trackLinkClicks": {
-            "on": "click",
-            "selector": "[affiliate-link-icon]",
-            "request": "click"
-          }
-        }
-      }
-      </script>
-    </amp-analytics>
-  </body>
-</html>
diff --git a/examples/amp-story/amp-story-1.0.css b/examples/amp-story/amp-story-1.0.css
new file mode 100644
index 000000000000..d29bda66aa43
--- /dev/null
+++ b/examples/amp-story/amp-story-1.0.css
@@ -0,0 +1 @@
+amp-story {}
diff --git a/examples/amp-story/amp-story-animation.html b/examples/amp-story/amp-story-animation.html
index 0745cfa0f4ba..7e51958308fd 100644
--- a/examples/amp-story/amp-story-animation.html
+++ b/examples/amp-story/amp-story-animation.html
@@ -4,27 +4,13 @@
     <meta charset="utf-8" />
     <title>amp-animation inside amp-story</title>
     <link rel="canonical" href="." />
-    <meta
-      name="viewport"
-      content="width=device-width,minimum-scale=1,initial-scale=1"
-    />
+    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1"/>
     <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
     <script async src="https://cdn.ampproject.org/v0.js"></script>
-    <script
-      async
-      custom-element="amp-story"
-      src="https://cdn.ampproject.org/v0/amp-story-1.0.js"
-    ></script>
-    <script
-      async
-      custom-element="amp-video"
-      src="https://cdn.ampproject.org/v0/amp-video-0.1.js"
-    ></script>
-    <script
-      async
-      custom-element="amp-animation"
-      src="https://cdn.ampproject.org/v0/amp-animation-0.1.js"
-    ></script>
+    <script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
+    <script async custom-element="amp-video" src="https://cdn.ampproject.org/v0/amp-video-0.1.js"></script>
+    <script async custom-element="amp-animation" src="https://cdn.ampproject.org/v0/amp-animation-0.1.js"></script>
+    <script async custom-element="amp-bodymovin-animation" src="https://cdn.ampproject.org/v0/amp-bodymovin-animation-0.1.js"></script>
     <style amp-custom>
       body {
         font-family: sans-serif;
@@ -160,6 +146,12 @@
           </div>
         </amp-story-grid-layer>
       </amp-story-page>
+      <amp-story-page id="bodymovin">
+        <amp-story-grid-layer template="vertical">
+          <amp-bodymovin-animation layout="responsive" width="200" height="200" src="https://nainar.github.io/loader.json" loop>
+          </amp-bodymovin-animation>
+        </amp-story-grid-layer>
+      </amp-story-page>
     </amp-story>
   </body>
 </html>
diff --git a/examples/amp-story/amp-story-audio-sticker.html b/examples/amp-story/amp-story-audio-sticker.html
new file mode 100644
index 000000000000..a4ed391b9a87
--- /dev/null
+++ b/examples/amp-story/amp-story-audio-sticker.html
@@ -0,0 +1,249 @@
+<!doctype html>
+<html ⚡ lang="en">
+<head>
+  <meta charset="utf-8">
+  <link rel="canonical" href="ampconf.html">
+  <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+  <script async src="https://cdn.ampproject.org/v0.js"></script>
+  <title>Key Highlights of AMP Conf 2018</title>
+
+  <script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
+  <script async custom-element="amp-video" src="https://cdn.ampproject.org/v0/amp-video-0.1.js"></script>
+  <script async custom-element="amp-story-audio-sticker" src="https://cdn.ampproject.org/v0/amp-story-audio-sticker-0.1.js"></script>
+
+  <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+  <style amp-custom>
+    * {
+      box-sizing: border-box;
+    }
+    amp-story * {
+      font-family: 'Helvetica Neue', sans-serif;
+      color: white;
+    }
+    amp-story-page {
+      background: white;
+    }
+    amp-story h1 {
+      font-size: 2.875rem;
+    }
+    amp-story h2 {
+      font-size: 2.25rem;
+    }
+    amp-story p {
+      line-height: 1.5;
+    }
+    .bold {
+      font-weight: bold;
+    }
+    .bottom {
+      align-content: end;
+    }
+    .medium {
+      font-weight: 600;
+    }
+    .first {
+      padding-top: 8.83vh;
+    }
+    .last {
+      padding-bottom: 8.83vh;
+    }
+    .blue {
+      color: #4285F4;
+    }
+    .twenty-px {
+      font-size: 1.25rem;
+    }
+    .center {
+      text-align: center;
+    }
+    .icon {
+      background-image: url('./img/AMP-Brand-White-Icon.svg');
+      background-repeat: no-repeat;
+      background-size: 4.25rem 4.25rem;
+      height: 4.25rem;
+      object-fit: contain;
+      width: 4.25rem;
+    }
+    .byline {
+      letter-spacing: 1.28px;
+      padding-bottom: 7.88vh;
+    }
+    .introducing p {
+      line-height: 2.625em;
+    }
+    .introducing h2 {
+      line-height: 1.17em;
+    }
+    .subtitle-page {
+      padding-top: 10.87vh;
+    }
+    .button {
+      align-items: center;
+      border: 4px solid #FFFFFF;
+      color: #FFFFFF;
+      display: flex;
+      margin: 0 auto;
+      max-width: 240px;
+      text-decoration:none;
+    }
+    .button p {
+      width: 100%;
+    }
+    amp-ad[template="image-template"] img {
+      object-fit: cover;
+    }
+    ::cue {
+      background-color: rgba(0, 0, 0, 0.75);
+      font-size: 24px;
+      line-height: 1.5;
+    }
+    amp-story-audio-sticker {
+      height: 10rem;
+      width: 10rem;
+      --story-audio-sticker-outline-color: rgb(150, 51, 0);
+      --story-audio-sticker-dropshadow-color: rgb(150, 51, 0);
+    }
+  </style>
+</head>
+  <body>
+    <amp-story standalone id="cats"
+        title="Key Highlights of AMP Conf 2018" publisher="The AMP team"
+        publisher-logo-src="./img/amplogo.png"
+        poster-portrait-src="./img/overview.jpg">
+
+      <amp-story-page id="page-1" title="Lorem ipsum dolor sit amet">
+        <amp-story-grid-layer template="fill">
+          <amp-video autoplay loop
+            width="400"
+            height="750"
+            poster="./img/poster0.png"
+            layout="fill">
+            <source src="./video/p1.mp4" type="video/mp4">
+          </amp-video>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical" class="bottom">
+          <div class="icon"></div>
+          <h1 class="bold">Key Highlights of AMP Conf 2018</h1>
+          <p class="byline">By The AMP team</p>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <amp-story-audio-sticker sticker="audio-cloud"></amp-story-audio-sticker>
+        </amp-story-grid-layer>>
+      </amp-story-page>
+
+      <amp-story-page id="page-2" title="Lorem ipsum dolor sit amet">
+        <amp-story-grid-layer template="fill">
+          <amp-video autoplay loop
+            width="400"
+            height="750"
+            poster="./img/poster0.png"
+            layout="fill">
+            <source src="./video/p1.mp4" type="video/mp4">
+          </amp-video>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical" class="bottom">
+          <div class="icon"></div>
+          <h1 class="bold">Key Highlights of AMP Conf 2018</h1>
+          <p class="byline">By The AMP team</p>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <amp-story-audio-sticker size="large" sticker="headphone-cat"></amp-story-audio-sticker>
+        </amp-story-grid-layer>>
+      </amp-story-page>
+
+      <amp-story-page id="page-3" title="Lorem ipsum dolor sit amet">
+        <amp-story-grid-layer template="fill">
+          <amp-video autoplay loop
+            width="400"
+            height="750"
+            poster="./img/poster0.png"
+            layout="fill">
+            <source src="./video/p1.mp4" type="video/mp4">
+          </amp-video>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical" class="bottom">
+          <div class="icon"></div>
+          <h1 class="bold">Key Highlights of AMP Conf 2018</h1>
+          <p class="byline">By The AMP team</p>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <amp-story-audio-sticker sticker="loud-speaker"></amp-story-audio-sticker>
+        </amp-story-grid-layer>
+      </amp-story-page>
+
+      <amp-story-page id="page-4" title="Lorem ipsum dolor sit amet">
+        <amp-story-grid-layer template="fill">
+          <amp-video autoplay loop
+            width="400"
+            height="750"
+            poster="./img/poster0.png"
+            layout="fill">
+            <source src="./video/p1.mp4" type="video/mp4">
+          </amp-video>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical" class="bottom">
+          <div class="icon"></div>
+          <h1 class="bold">Key Highlights of AMP Conf 2018</h1>
+          <p class="byline">By The AMP team</p>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <amp-story-audio-sticker size="large" sticker="tape-player"></amp-story-audio-sticker>
+        </amp-story-grid-layer>
+      </amp-story-page>
+
+      <amp-story-page id="page-5" title="Lorem ipsum dolor sit amet">
+        <amp-story-grid-layer template="fill">
+          <amp-video autoplay loop
+            width="400"
+            height="750"
+            poster="./img/poster0.png"
+            layout="fill">
+            <source src="./video/p1.mp4" type="video/mp4">
+          </amp-video>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical" class="bottom">
+          <div class="icon"></div>
+          <h1 class="bold">Key Highlights of AMP Conf 2018</h1>
+          <p class="byline">By The AMP team</p>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <amp-story-audio-sticker sticker-style="outline">
+            <amp-story-audio-sticker-pretap>
+              <amp-img width="100" height="100" layout="responsive" src="https://d1k5j68ob7clqb.cloudfront.net/thumb/480/processed/thumb/5zK5d91jK0gLkv1AMa.png"></amp-img>
+            </amp-story-audio-sticker-pretap>
+            <amp-story-audio-sticker-posttap>
+              <amp-img width="100" height="100" layout="responsive" src="https://d1k5j68ob7clqb.cloudfront.net/thumb/480/processed/thumb/5zK5d91jK0gLkv1AMa.png"></amp-img>
+            </amp-story-audio-sticker-posttap>
+          </amp-story-audio-sticker>
+        </amp-story-grid-layer>
+      </amp-story-page>
+
+      <amp-story-page id="page-6" title="Lorem ipsum dolor sit amet">
+        <amp-story-grid-layer template="fill">
+          <amp-video autoplay loop
+            width="400"
+            height="750"
+            poster="./img/poster0.png"
+            layout="fill">
+            <source src="./video/p1.mp4" type="video/mp4">
+          </amp-video>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical" class="bottom">
+          <div class="icon"></div>
+          <h1 class="bold">Key Highlights of AMP Conf 2018</h1>
+          <p class="byline">By The AMP team</p>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <amp-story-audio-sticker size="large" sticker-style="dropshadow">
+            <amp-story-audio-sticker-pretap>
+              <amp-img width="100" height="100" layout="responsive" src="https://d1k5j68ob7clqb.cloudfront.net/thumb/480/processed/thumb/5zK5d91jK0gLkv1AMa.png"></amp-img>
+            </amp-story-audio-sticker-pretap>
+            <amp-story-audio-sticker-posttap>
+              <amp-img width="100" height="100" layout="responsive" src="https://d1k5j68ob7clqb.cloudfront.net/thumb/480/processed/thumb/5zK5d91jK0gLkv1AMa.png"></amp-img>
+            </amp-story-audio-sticker-posttap>
+          </amp-story-audio-sticker>
+        </amp-story-grid-layer>
+      </amp-story-page>
+    </amp-story>
+  </body>
+</html>
diff --git a/examples/amp-story/amp-story-captions.html b/examples/amp-story/amp-story-captions.html
index 40ccbd266252..1ebe3e9e3389 100644
--- a/examples/amp-story/amp-story-captions.html
+++ b/examples/amp-story/amp-story-captions.html
@@ -11,6 +11,7 @@
   <script async custom-element="amp-audio" src="https://cdn.ampproject.org/v0/amp-audio-0.1.js"></script>
   <script async custom-element="amp-story-captions" src="https://cdn.ampproject.org/v0/amp-story-captions-0.1.js"></script>
   <script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
+  <link href="https://fonts.googleapis.com/css2?family=Shadows+Into+Light&display=swap" rel="stylesheet">
   <style amp-custom>
     .bottom {
       align-content: end;
@@ -31,6 +32,10 @@
     .page2 {
       background-color: #fff;
     }
+
+    amp-story-captions {
+      /* font-size: 2px !important; */
+    }
   </style>
 </head>
 <body>
@@ -50,12 +55,83 @@
       </amp-story-grid-layer>
       <amp-story-grid-layer template="vertical" class="bottom">
         <div class="scrim">
+          <div class="static-text">This element is always above captions.</div>
           <amp-story-captions id="captions" layout="fixed-height" height="100"></amp-story-captions>
           <div class="static-text">This element is always below captions and never overlaps.</div>
         </div>
       </amp-story-grid-layer>
     </amp-story-page>
+
+    <amp-story-page id="page-container" auto-advance-after="video-container">
+      <amp-story-grid-layer template="fill">
+        <amp-video id="video-container"
+            src="https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4"
+            width="1280" height="720" layout="responsive" autoplay captions-id="captions-container">
+          <track kind="subtitles" src="captions-for-container-layout.vtt" srclang="en" default>
+        </amp-video>
+      </amp-story-grid-layer>
+      <amp-story-grid-layer template="vertical" class="bottom">
+        <div class="scrim">
+          <div class="static-text">This element is always above captions and never overlaps.</div>
+          <amp-story-captions id="captions-container" layout="container"></amp-story-captions>
+          <div class="static-text">This element is always below captions and never overlaps.</div>
+        </div>
+      </amp-story-grid-layer>
+    </amp-story-page>
+
+    <amp-story-page id="page-captions-preset-default" auto-advance-after="video-container">
+      <amp-story-grid-layer template="fill">
+        <amp-video id="video-container"
+            src="https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4"
+            width="1280" height="720" layout="responsive" autoplay captions-id="captions-preset-default">
+          <track kind="subtitles" src="captions-for-container-layout.vtt" srclang="en" default>
+        </amp-video>
+      </amp-story-grid-layer>
+      <amp-story-grid-layer template="vertical" class="bottom">
+        <div class="scrim">
+          <div class="static-text">Default preset example.</div>
+          <div class="static-text">This element is always above captions and never overlaps.</div>
+          <amp-story-captions style-preset="default" id="captions-preset-default" layout="container"></amp-story-captions>
+          <div class="static-text">This element is always below captions and never overlaps.</div>
+        </div>
+      </amp-story-grid-layer>
+    </amp-story-page>
+
+    <amp-story-page id="page-captions-preset-appear" auto-advance-after="video-container">
+      <amp-story-grid-layer template="fill">
+        <amp-video id="video-container"
+            src="https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4"
+            width="1280" height="720" layout="responsive" autoplay captions-id="captions-preset-appear">
+          <track kind="subtitles" src="captions-for-container-layout.vtt" srclang="en" default>
+        </amp-video>
+      </amp-story-grid-layer>
+      <amp-story-grid-layer template="vertical" class="bottom">
+        <div class="scrim">
+          <div class="static-text">Appear preset example.</div>
+          <div class="static-text">This element is always above captions and never overlaps.</div>
+          <amp-story-captions style-preset="appear" style="--story-captions-font-size: .8em; --story-captions-font-family: 'Shadows Into Light'" id="captions-preset-appear" layout="container"></amp-story-captions>
+          <div class="static-text">This element is always below captions and never overlaps.</div>
+        </div>
+      </amp-story-grid-layer>
+    </amp-story-page>
+
+    <amp-story-page id="page-fill" auto-advance-after="video-fill">
+      <amp-story-grid-layer template="fill">
+        <amp-video id="video-fill"
+            src="https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4"
+            width="1280" height="720" layout="responsive" autoplay captions-id="captions-fill">
+          <track kind="subtitles" src="captions-for-container-layout.vtt" srclang="en" default>
+        </amp-video>
+      </amp-story-grid-layer>
+      <amp-story-grid-layer template="vertical" class="bottom">
+        <div class="scrim">
+          <div class="static-text">This element is always above captions and never overlaps.</div>
+          <amp-story-captions id="captions-fill" layout="fill"></amp-story-captions>
+          <div class="static-text">This element is always below captions and never overlaps.</div>
+        </div>
+      </amp-story-grid-layer>
+    </amp-story-page>
   </amp-story>
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/examples/amp-story/amp-story-desktop-custom-aspect-ratio.html b/examples/amp-story/amp-story-desktop-custom-aspect-ratio.html
new file mode 100644
index 000000000000..376f24dc0389
--- /dev/null
+++ b/examples/amp-story/amp-story-desktop-custom-aspect-ratio.html
@@ -0,0 +1,112 @@
+<!doctype html>
+<html ⚡ lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>amp-story-desktop-one-panel example</title>
+    <link rel="canonical" href="example.html">
+    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+    <script async src="https://cdn.ampproject.org/v0.js"></script>
+    <script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
+    <script async="" custom-element="amp-animation" src="/dist/v0/amp-animation-0.1.max.js"></script>
+    <script async custom-element="amp-story-panning-media" src="https://cdn.ampproject.org/v0/amp-story-panning-media-0.1.js"></script>
+    <link href="https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,400;0,500;0,700;1,500&amp;display=swap" rel="stylesheet">
+    <style amp-custom>
+      amp-story {
+        font-family: 'Poppins', sans-serif;
+        color: white;
+        text-align: center;
+      }
+      amp-story-grid-layer h1 {
+        font-size: 2em;
+      }
+      amp-story-grid-layer h1, amp-story-grid-layer h2 {
+        font-weight: 700;
+        text-shadow: 0px 4px 4px #00000055;
+      }
+    </style>
+  </head>
+  <body>
+    <amp-story
+      standalone
+      title="Demo Story"
+      publisher="AMP Story"
+      publisher-logo-src="example.com/logo.png"
+      poster-portrait-src="example.com/poster.jpg"
+      desktop-aspect-ratio="1:1"
+    >
+      <amp-story-page id="page-1">
+        <amp-story-grid-layer template="fill">
+          <amp-story-panning-media layout="fill" data-x="50%" data-y="0%" lock-bounds>
+            <amp-img
+              layout="fill"
+              width="1600"
+              height="900"
+              src="/examples/visual-tests/picsum.photos/image980_1600x900.jpg"
+            ></amp-img>
+          </amp-story-panning-media>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="thirds">
+          <span>
+            <span><h1 animate-in="scale-fade-up">Page 1</h1></span>
+            <span><h2 animate-in="scale-fade-up" animate-in-delay=".1s">Animate in example</h2></span>
+          </span>
+        </amp-story-grid-layer>
+        <amp-story-page-attachment data-title="lorem ipsum" layout="nodisplay">
+          <h2>Lorem ipsum</h2>
+          <p>
+            Lorem ipsum dolor sit amet consectetur adipisicing elit. Voluptate enim fuga maxime, laborum nobis porro quos officiis voluptates magnam distinctio blanditiis quae odit doloribus dolorem cum debitis temporibus molestias facere.
+          </p>
+          <p>
+            Lorem ipsum dolor sit amet consectetur adipisicing elit. Voluptate enim fuga maxime, laborum nobis porro quos officiis voluptates magnam distinctio blanditiis quae odit doloribus dolorem cum debitis temporibus molestias facere.
+          </p>
+          <p>
+            Lorem ipsum dolor sit amet consectetur adipisicing elit. Voluptate enim fuga maxime, laborum nobis porro quos officiis voluptates magnam distinctio blanditiis quae odit doloribus dolorem cum debitis temporibus molestias facere.
+          </p>
+          <p>
+            Lorem ipsum dolor sit amet consectetur adipisicing elit. Voluptate enim fuga maxime, laborum nobis porro quos officiis voluptates magnam distinctio blanditiis quae odit doloribus dolorem cum debitis temporibus molestias facere.
+          </p>
+        </amp-story-page-attachment>
+      </amp-story-page>
+
+      <amp-story-page id="page-2">
+        <amp-story-grid-layer template="fill">
+          <amp-story-panning-media layout="fill" data-x="-20%" data-y="0%" lock-bounds>
+            <amp-img
+            layout="fill"
+            width="1600"
+            height="900"
+            src="/examples/visual-tests/picsum.photos/image980_1600x900.jpg"
+            ></amp-img>
+          </amp-story-panning-media>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="thirds">
+          <span>
+            <span><h1 animate-in="scale-fade-up">Page 2</h1></span>
+            <span><h2 animate-in="scale-fade-up" animate-in-delay=".1s">Animate in example</h2></span>
+          </span>
+        </amp-story-grid-layer>
+      </amp-story-page>
+
+      <amp-story-page id="page-3">
+        <amp-story-grid-layer template="fill">
+          <amp-story-panning-media layout="fill" data-x="-20%" data-y="10%" zoom='1.5' lock-bounds>
+            <amp-img
+            layout="fill"
+            width="1600"
+            height="900"
+            src="/examples/visual-tests/picsum.photos/image980_1600x900.jpg"
+            ></amp-img>
+          </amp-story-panning-media>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="thirds">
+          <span>
+            <span><h1 animate-in="scale-fade-up">Page 3</h1></span>
+            <span><h2 animate-in="scale-fade-up" animate-in-delay=".1s">Animate in example</h2></span>
+          </span>
+        </amp-story-grid-layer>
+      </amp-story-page>
+
+    </amp-story>
+  </body>
+</html>
diff --git a/examples/amp-story/amp-story-shopping.html b/examples/amp-story/amp-story-shopping.html
index 20171cd246be..cecd148f4160 100644
--- a/examples/amp-story/amp-story-shopping.html
+++ b/examples/amp-story/amp-story-shopping.html
@@ -1,36 +1,264 @@
 <!doctype html>
-<html ⚡>
+<html amp lang="en">
   <head>
     <meta charset="utf-8">
     <title>Shopping</title>
-    <link rel="canonical" href="amp-story-codelab.html">
+    <link rel="canonical" href="amps.html">
     <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
     <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
     <script async src="https://cdn.ampproject.org/v0.js"></script>
     <script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
+    <script async custom-element="amp-story-auto-analytics" src="https://cdn.ampproject.org/v0/amp-story-auto-analytics-0.1.js"></script>
     <script async custom-element="amp-story-shopping" src="https://cdn.ampproject.org/v0/amp-story-shopping-0.1.js"></script>
+    <script async custom-element="amp-story-page-attachment" src="https://cdn.ampproject.org/v0/amp-story-page-attachment-0.1.js"></script>
+    <style amp-custom>
+      [data-product-id="lamp"] {
+        top: 31%;
+        left: 1%;
+      }
+      [data-product-id="art"] {
+        top: 15%;
+        left: 40%;
+      }
+      [data-product-id="chair"] {
+        top: 53%;
+        left: 30%;
+      }
+      [data-product-id="flowers"] {
+        top: 46%;
+        left: 83%;
+      }
+    </style>
   </head>
   <body>
+    <amp-story-auto-analytics gtag-id="UA-174115079-1"></amp-story-auto-analytics>
     <amp-story
         standalone
-        title="New Story Shopping Component"
+        title="Story Shopping Component"
         publisher="AMP Story Shopping"
         publisher-logo-src="example.com/logo.png"
         poster-portrait-src="example.com/poster.jpg">
-      <amp-story-page id="default">
-        <amp-story-shopping-config layout='nodisplay'></amp-story-shopping-config>
+      <amp-story-page id="inline-light-theme">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="https://source.unsplash.com/_HqHX3LBN18/1000x2000"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <amp-story-shopping-tag data-product-id="lamp" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="art" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="chair" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="flowers" ></amp-story-shopping-tag>
+        </amp-story-grid-layer>
+        <!--
+          Example of Inline config. Multiple product tags with icon defined.
+        -->
+        <amp-story-shopping-attachment cta-text="Shop Now!">
+          <script type="application/json">
+            {
+                "items" : [
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "lamp",
+                    "productTitle": "Brass Lamp",
+                    "productBrand": "Lamp Co",
+                    "productPrice": 799.00,
+                    "productPriceCurrency": "USD",
+                    "productImages": [
+                      {"url": "https://source.unsplash.com/Ry9WBo3qmoc/500x500", "alt": "lamp 1"},
+                      {"url": "https://source.unsplash.com/KP7p0-DRGbg", "alt": "lamp 2"},
+                      {"url": "https://source.unsplash.com/mFnbFaCIu1I", "alt": "lamp 3"},
+                      {"url": "https://source.unsplash.com/py9sH2rThWs", "alt": "lamp 4"},
+                      {"url": "https://source.unsplash.com/VDPauwJ_sHo", "alt": "lamp 5"},
+                      {"url": "https://source.unsplash.com/3LTht2nxd34", "alt": "lamp 6"}
+                    ],
+                    "aggregateRating": {
+                      "ratingValue": 4.2,
+                      "reviewCount": 120,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "One newline after this. \n Two newlines after this. \n\n  Five consecutive newlines after this, should become 2 newlines. \n\n\n\n\n Many consecutive newlines with different spacing and tabs after this, should become 2 newlines. \n          \n\n   \n  \n \n  \n \n I hope it works!"
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "art",
+                    "productTitle": "Abstract Art",
+                    "productBrand": "V. Artsy",
+                    "productPrice": 1200.00,
+                    "productPriceCurrency": "INR",
+                    "productImages": [{"url": "/examples/visual-tests/unsplash.photos/BdVQU-NDtA8_500x500.jpg", "alt": "art"}],
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "chair",
+                    "productTitle": "Yellow chair",
+                    "productPrice": 1000.00,
+                    "productPriceCurrency": "BRL",
+                    "productTagText": "The perfectly imperfect yellow chair",
+                    "productImages": [{"url": "https://source.unsplash.com/DgQGKKLaVhY/500x500", "alt": "chair"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "flowers",
+                    "productTitle": "Flowers",
+                    "productBrand": "Very Long Flower Company Name",
+                    "productPrice": 10.00,
+                    "productPriceCurrency": "USD",
+                    "productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
+                    "productImages": [{"url": "https://source.unsplash.com/SavQfLRm4Do/500x500", "alt": "flowers"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. \n Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   }
+                ]
+              }
+          </script>
+        </amp-story-shopping-attachment>
+      </amp-story-page>
+      <amp-story-page id="inline-dark-theme">
+        <!--
+          Dark theme example of Inline config. Multiple product tags with icon defined.
+        -->
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="https://source.unsplash.com/_HqHX3LBN18/1000x2000"></amp-img>
+        </amp-story-grid-layer>
         <amp-story-grid-layer template="vertical">
-          <amp-story-shopping-tag></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="lamp" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="art" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="chair" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="flowers" ></amp-story-shopping-tag>
         </amp-story-grid-layer>
-        <amp-story-shopping-attachment layout='nodisplay'></amp-story-shopping-attachment>
+        <amp-story-shopping-attachment theme="dark">
+          <script type="application/json">
+            {
+                "items" : [
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "lamp",
+                    "productTitle": "Brass Lamp",
+                    "productBrand": "Lamp Co",
+                    "productPrice": 799.00,
+                    "productPriceCurrency": "USD",
+                    "productImages": [
+                      {"url": "https://source.unsplash.com/Ry9WBo3qmoc/500x500", "alt": "lamp 1"},
+                      {"url": "https://source.unsplash.com/KP7p0-DRGbg", "alt": "lamp 2"},
+                      {"url": "https://source.unsplash.com/mFnbFaCIu1I", "alt": "lamp 3"},
+                      {"url": "https://source.unsplash.com/py9sH2rThWs", "alt": "lamp 4"},
+                      {"url": "https://source.unsplash.com/VDPauwJ_sHo", "alt": "lamp 5"},
+                      {"url": "https://source.unsplash.com/3LTht2nxd34", "alt": "lamp 6"}
+                    ],
+                    "aggregateRating": {
+                      "ratingValue": 4.2,
+                      "reviewCount": 120,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. \n Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "art",
+                    "productTitle": "Abstract Art",
+                    "productBrand": "V. Artsy",
+                    "productPrice": 1200.00,
+                    "productPriceCurrency": "INR",
+                    "productImages": [{"url": "/examples/visual-tests/unsplash.photos/BdVQU-NDtA8_500x500.jpg", "alt": "art"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.6,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. \n Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "chair",
+                    "productTitle": "Yellow chair",
+                    "productPrice": 1000.00,
+                    "productPriceCurrency": "BRL",
+                    "productTagText": "The perfectly imperfect yellow chair",
+                    "productImages": [{"url": "https://source.unsplash.com/DgQGKKLaVhY/500x500", "alt": "chair"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. \n Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "flowers",
+                    "productTitle": "Flowers",
+                    "productBrand": "Very Long Flower Company Name",
+                    "productPrice": 10.00,
+                    "productPriceCurrency": "USD",
+                    "productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
+                    "productImages": [{"url": "https://source.unsplash.com/SavQfLRm4Do/500x500", "alt": "flowers"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. \n Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   }
+                ]
+              }
+          </script>
+        </amp-story-shopping-attachment>
       </amp-story-page>
-
-      <amp-story-page id="dark-theme">
-        <amp-story-shopping-config layout='nodisplay'></amp-story-shopping-config>
+      <amp-story-page id="remote-with-product">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="https://source.unsplash.com/_HqHX3LBN18/1000x2000"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <amp-story-shopping-tag data-product-id="art" ></amp-story-shopping-tag>
+        </amp-story-grid-layer>
+        <!--
+          Example of:
+          CTA Button rendering due to remote product tag existing, but no inline.
+        -->
+        <amp-story-shopping-attachment theme="dark" src="/examples/amp-story/shopping/remote.json">
+          <script type="application/json">
+            {
+              "items" : []
+            }
+          </script>
+        </amp-story-shopping-attachment>
+      </amp-story-page>
+      <amp-story-page id="inline-no-product">
+      <amp-story-grid-layer template="fill">
+        <amp-img layout="fill" src="https://source.unsplash.com/_HqHX3LBN18/1000x2000"></amp-img>
+      </amp-story-grid-layer>
+        <!--
+          Example of:
+          CTA Button not rendering due to no product tags.
+        -->
+      <amp-story-shopping-attachment>
+        <script type="application/json">
+          {
+            "items" : []
+          }
+        </script>
+      </amp-story-shopping-attachment>
+      </amp-story-page>
+       <!--
+          Example of:
+          CTA Button not rendering due to no shopping attachment.
+        -->
+      <amp-story-page id="remote-dark-theme">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="https://source.unsplash.com/_HqHX3LBN18/1000x2000"></amp-img>
+        </amp-story-grid-layer>
         <amp-story-grid-layer template="vertical">
-          <amp-story-shopping-tag></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="art" ></amp-story-shopping-tag>
         </amp-story-grid-layer>
-        <amp-story-shopping-attachment layout='nodisplay' theme="dark"></amp-story-shopping-attachment>
       </amp-story-page>
     </amp-story>
   </body>
diff --git a/examples/amp-story/amp-story-social-share.html b/examples/amp-story/amp-story-social-share.html
new file mode 100644
index 000000000000..a67f7807ebc2
--- /dev/null
+++ b/examples/amp-story/amp-story-social-share.html
@@ -0,0 +1,176 @@
+<!doctype html>
+
+<!-- TODO(#40094): Develop "amp-story-social-share" extension with default CTA UX similar to page-attachment and encapsulate amp-social-share functionalities. -->
+
+<html ⚡ lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>My Story with social share</title>
+  <script async src="https://cdn.ampproject.org/v0.js"></script>
+  <script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
+  <script async custom-element="amp-social-share" src="https://cdn.ampproject.org/v0/amp-social-share-0.1.js"></script>
+  <link rel="canonical" href="amp-story-social-share.html">
+  <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+  <style amp-boilerplate>
+    body {
+      -webkit-animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+      -moz-animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+      -ms-animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+      animation: -amp-start 8s steps(1, end) 0s 1 normal both
+    }
+
+    @-webkit-keyframes -amp-start {
+      from {
+        visibility: hidden
+      }
+
+      to {
+        visibility: visible
+      }
+    }
+
+    @-moz-keyframes -amp-start {
+      from {
+        visibility: hidden
+      }
+
+      to {
+        visibility: visible
+      }
+    }
+
+    @-ms-keyframes -amp-start {
+      from {
+        visibility: hidden
+      }
+
+      to {
+        visibility: visible
+      }
+    }
+
+    @-o-keyframes -amp-start {
+      from {
+        visibility: hidden
+      }
+
+      to {
+        visibility: visible
+      }
+    }
+
+    @keyframes -amp-start {
+      from {
+        visibility: hidden
+      }
+
+      to {
+        visibility: visible
+      }
+    }
+  </style>
+  <style amp-custom>
+    :root {
+      --color-primary: #161616;
+      --color-text-light: #fff;
+    }
+
+    amp-social-share:before {
+      content: '';
+      display: inline-block;
+      width: 24px;
+      height: 24px;
+      margin-right: 5px;
+      background-size: contain;
+    }
+
+    amp-social-share.whatsapp:before {
+      background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="46" height="46"><path fill="%23FFF" d="M35.4 10.4a18.27 18.27 0 0 0-31.2 13c0 3.2.9 6.3 2.4 9.1L4 42l9.7-2.5c2.7 1.5 5.7 2.2 8.7 2.2a18.4 18.4 0 0 0 13-31.3M22.5 38.6c-2.7 0-5.4-.7-7.7-2.1l-.6-.3-5.8 1.5L9.9 32l-.4-.6c-4.4-7.1-2.3-16.5 4.9-20.9s16.5-2.3 20.9 4.9 2.3 16.5-4.9 20.9c-2.3 1.5-5.1 2.3-7.9 2.3m8.8-11.1-1.1-.5s-1.6-.7-2.6-1.2c-.1 0-.2-.1-.3-.1-.3 0-.5.1-.7.2l-1.5 1.7c-.1.2-.3.3-.5.3h-.1c-.1 0-.3-.1-.4-.2l-.5-.2c-1.1-.5-2.1-1.1-2.9-1.9-.2-.2-.5-.4-.7-.6-.7-.7-1.4-1.5-1.9-2.4l-.1-.2c-.1-.1-.1-.2-.2-.4 0-.2 0-.4.1-.5 0 0 .4-.5.7-.8.2-.2.3-.5.5-.7.2-.3.3-.7.2-1-.1-.5-1.3-3.2-1.6-3.8-.2-.3-.4-.4-.7-.5h-1.1c-.2 0-.4.1-.6.1l-.1.1c-.2.1-.4.3-.6.4-.2.2-.3.4-.5.6a5.1 5.1 0 0 0-.6 5.4l.1.3c.9 1.9 2.1 3.6 3.7 5.1l.4.4c.3.3.6.5.8.8 2.1 1.8 4.5 3.1 7.2 3.8.3.1.7.1 1 .2h1c.5 0 1.1-.2 1.5-.4.3-.2.5-.2.7-.4l.2-.2c.2-.2.4-.3.6-.5s.4-.4.5-.6c.2-.4.3-.9.4-1.4v-.7s-.1-.1-.3-.2"/></svg>');
+    }
+
+    amp-social-share.facebook:before {
+      background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="%23fff" d="M212 197h-37v60h37v176h70V257h50l5-60h-55v-33c0-14 3-20 17-20h38V83h-49c-52 0-76 23-76 67z"/></svg>')
+    }
+
+    amp-social-share.email:before {
+      background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="%23fff" d="M101 142v229h310V142zm275 26-120 91-120-91zm-248 26 64 49-64 64zm0 150 85-85 43 33 43-33 85 85zm256-36-64-65 64-49z"/></svg>');
+    }
+
+    amp-social-share.system:before {
+      background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="%23fff"><path fill="none" d="M0 0h24v24H0z"/><path d="M18 16.08c-.76 0-1.44.3-1.96.77L8.91 12.7c.05-.23.09-.46.09-.7s-.04-.47-.09-.7l7.05-4.11A2.99 2.99 0 0 0 21 5a3 3 0 1 0-5.91.7L8.04 9.81A2.99 2.99 0 0 0 3 12a3 3 0 0 0 5.04 2.19l7.12 4.16A2.92 2.92 0 1 0 18 16.08"/></svg>');
+    }
+
+    amp-social-share.flex {
+      z-index: 3;
+      padding: 5px 15px;
+      align-items: center;
+      display: flex;
+      width: max-content;
+      position: absolute;
+      bottom: 15px;
+      right: 50%;
+      transform: translateX(50%);
+      font-family: system-ui;
+      text-align: center;
+    }
+
+    /* icons with rounded corners  */
+    amp-social-share.rounded {
+      border-radius: 50px;
+      background-size: 60%;
+      color: var(--color-text-light);
+      background: var(--color-primary);
+    }
+  </style>
+</head>
+
+<body>
+  <amp-story standalone>
+    <amp-story-page id="fill-template-title">
+      <amp-social-share class="rounded flex whatsapp i-amphtml-built i-amphtml-layout i-amphtml-element"
+        aria-label="Share" type="whatsapp" i-amphtml-layout="fixed" role="button" tabindex="0">Share on
+        WhatsApp</amp-social-share>
+      <amp-story-grid-layer template="vertical">
+        <amp-img layout="fill" src="/examples/amp-story/img/poster.jpg"></amp-img>
+      </amp-story-grid-layer>
+      <amp-story-grid-layer template="vertical">
+        <p>Share on WhatsApp Example</p>
+      </amp-story-grid-layer>
+    </amp-story-page>
+    <amp-story-page id="fill-template-title">
+      <amp-social-share class="rounded flex facebook i-amphtml-built i-amphtml-layout i-amphtml-element"
+        aria-label="Share" type="facebook" i-amphtml-layout="fixed" role="button" tabindex="0">Share on
+        Facebook</amp-social-share>
+      <amp-story-grid-layer template="vertical">
+        <amp-img layout="fill" src="/examples/amp-story/img/poster.jpg"></amp-img>
+      </amp-story-grid-layer>
+      <amp-story-grid-layer template="vertical">
+        <p>Share on Facebook Example</p>
+      </amp-story-grid-layer>
+    </amp-story-page>
+    <amp-story-page id="fill-template-title">
+      <amp-social-share class="rounded flex email i-amphtml-built i-amphtml-layout i-amphtml-element" aria-label="Share"
+        type="email" i-amphtml-layout="fixed" role="button" tabindex="0">Share by email</amp-social-share>
+      <amp-story-grid-layer template="vertical">
+        <amp-img layout="fill" src="/examples/amp-story/img/poster.jpg"></amp-img>
+      </amp-story-grid-layer>
+      <amp-story-grid-layer template="vertical">
+        <p>Share by email Example</p>
+      </amp-story-grid-layer>
+    </amp-story-page>
+    <amp-story-page id="fill-template-title">
+      <amp-social-share class="rounded flex system i-amphtml-built i-amphtml-layout i-amphtml-element"
+        aria-label="Share" type="system" i-amphtml-layout="fixed" role="button" tabindex="0">Share with my
+        friends</amp-social-share>
+      <amp-story-grid-layer template="vertical">
+        <amp-img layout="fill" src="/examples/amp-story/img/poster.jpg"></amp-img>
+      </amp-story-grid-layer>
+      <amp-story-grid-layer template="vertical">
+        <p>System share Example <i>(btn displays if navigator.share is available)</i></p>
+      </amp-story-grid-layer>
+    </amp-story-page>
+  </amp-story>
+
+</body>
+
+</html>
diff --git a/examples/amp-story/amp-story-subscriptions-player.html b/examples/amp-story/amp-story-subscriptions-player.html
new file mode 100644
index 000000000000..cb4969cd122f
--- /dev/null
+++ b/examples/amp-story/amp-story-subscriptions-player.html
@@ -0,0 +1,123 @@
+<!doctype html>
+<html lang="en">
+  <!-- prettier-ignore -->
+  <head>
+    <title>amp-story-subscriptions player</title>
+    <script async src="../../dist/amp-story-player.js"></script>
+    <style page>
+      body {
+        font-family: sans-serif;
+      }
+    </style>
+    <style injected>
+      amp-story-player{position:relative;display:block}.i-amphtml-story-player-shadow-root-intermediary{width:100%;height:100%}amp-story-player a:first-of-type{width:100%;height:100%;background:var(--story-player-poster,#d3d3d3);background-size:100% 100%;display:block}amp-story-player.i-amphtml-story-player-loaded a{display:none}amp-story-player:after{content:" ";position:absolute;box-sizing:border-box;top:calc(50% - 32px);left:calc(50% - 32px);width:64px;height:64px;border-radius:50%;border-color:#fff transparent;border-style:solid;border-width:6px;filter:drop-shadow(0px 1px 3px rgba(0,0,0,0.25));animation-name:i-amphtml-story-player-spinner;animation-duration:4400ms;animation-timing-function:cubic-bezier(0.4,0,0.2,1);animation-iteration-count:infinite}@keyframes i-amphtml-story-player-spinner{12.5%{transform:rotate(135deg)}25%{transform:rotate(270deg)}37.5%{transform:rotate(405deg)}50%{transform:rotate(540deg)}62.5%{transform:rotate(675deg)}75%{transform:rotate(810deg)}87.5%{transform:rotate(945deg)}to{transform:rotate(1080deg)}}.i-amphtml-story-player-loaded:after{visibility:hidden}
+
+      .story-player-iframe {
+        background-size: cover;
+        display: block;
+        position: relative;
+        height: 100%;
+        width: 100%;
+        flex: 0 0 100%;
+      }
+
+      .title {
+        background: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 1));
+        display: block;
+        position: absolute;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        color: #fff;
+        font-size: 40px;
+        padding: 88px 32px 32px 32px;
+        line-height: 1.25;
+        text-shadow: 3px 3px #000;
+      }
+      .actions .circle {
+        width: 65px;
+        height: 65px;
+        background-size: cover;
+        overflow: hidden;
+        border-radius: 50%;
+        display: inline-block;
+        margin: 10px;
+        box-shadow:
+          0 0 0 3px white,
+          0 0 0 7px hsl(20, 79%, 60%);
+        color: white;
+        text-align: center;
+        padding-top: 20px;
+        box-sizing: border-box;
+        text-shadow: 0px 2px 4px #000000;
+        cursor: pointer;
+      }
+
+      .actions .circle.active {
+        box-shadow:
+          0 0 0 3px white,
+          0 0 0 7px hsl(257, 79%, 60%);
+      }
+    </style>
+    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+    <script>
+      window.onload = () => {
+        const player = document.querySelector('amp-story-player');
+        document.querySelector('.actions').addEventListener('click', (e) => {
+          if (e.target.hasAttribute('data-story')) {
+            player.show(e.target.getAttribute('data-story'), null, {animate: false});
+          }
+        })
+        player.addEventListener('navigation', (e) => {
+          document.querySelectorAll('.actions .circle').forEach((circle, index) => {
+            circle.classList.toggle('active', index === e.detail.index)
+          })
+        });
+      };
+    </script>
+  </head>
+  <body>
+    <h1>This is a NON-AMP page that embeds a story below:</h1>
+    <div>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras viverra neque ex, sit amet varius sem maximus sed. Suspendisse potenti. Donec erat purus, sagittis sit amet tincidunt ut, maximus sit amet massa. Maecenas venenatis fringilla dui vitae vestibulum. Fusce imperdiet euismod lobortis. Nullam sagittis nunc at tristique mattis. In sodales consectetur mollis. Maecenas sollicitudin, ex vel tempor rutrum, turpis eros interdum enim, sit amet volutpat tortor dolor at ipsum. Nam posuere velit vel urna vulputate interdum. Aenean eu vulputate lorem. Praesent nec nunc sodales, egestas orci sed, hendrerit mauris. Ut blandit turpis non erat sagittis, quis fermentum odio feugiat.</div>
+    <div>
+      <amp-story-player style="width: 360px; height: 694px;">
+        <a href="https://www-washingtonpost-com.cdn.ampproject.org/v/s/www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-new-york-city/"
+            class="story">
+          <img data-amp-story-player-poster-img src="https://www-washingtonpost-com.cdn.ampproject.org/i/s/www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-new-york-city/img/promo3x4.jpg" width="360" height="600" loading="lazy">
+          <span class="title">A local’s guide to what to eat and do in New York City</span>
+        </a>
+        <a href="./amp-story-subscriptions.html">
+          <span class="title">Testing paywall story</span>
+        </a>
+        <a href="https://www-washingtonpost-com.cdn.ampproject.org/v/s/www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-miami/">
+          <img data-amp-story-player-poster-img src="https://www-washingtonpost-com.cdn.ampproject.org/i/s/www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-miami/img/promo3x4.jpg" width="360" height="600" loading="lazy">
+          <span class="title">A local’s guide to what to eat and do in Miami</span>
+        </a>
+        <a href="https://www-washingtonpost-com.cdn.ampproject.org/v/s/www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-mexico-city/">
+          <img data-amp-story-player-poster-img src="https://www-washingtonpost-com.cdn.ampproject.org/i/s/www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-mexico-city/img/promo3x4.jpg" width="360" height="600" loading="lazy">
+          <span class="title">A local’s guide to what to eat and do in Mexico City</span>
+        </a>
+        <a href="https://www-washingtonpost-com.cdn.ampproject.org/v/s/www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-rome/">
+          <img data-amp-story-player-poster-img src="https://www-washingtonpost-com.cdn.ampproject.org/i/s/www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-rome/img/promo3x4.jpg" width="360" height="600" loading="lazy">
+          <span class="title">A local’s guide to what to eat and do in Rome</span>
+        </a>
+      </amp-story-player>
+
+      <div class="actions">
+        <div class="circle active"
+            data-story="https://www-washingtonpost-com.cdn.ampproject.org/v/s/www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-new-york-city/"
+            style="background-image: url('https://www-washingtonpost-com.cdn.ampproject.org/i/s/www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-new-york-city/img/42a59562-834d-11e9-b585-e36b16a531aa.jpg')">New York</div>
+        <div class="circle"
+            data-story="https://www-washingtonpost-com.cdn.ampproject.org/v/s/www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-miami/"
+            style="background-image: url('https://www-washingtonpost-com.cdn.ampproject.org/i/s/www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-miami/img/9f1d2656-6b7a-11e9-bbe7-1c798fb80536.jpg')">Miami</div>
+        <div class="circle"
+            data-story="https://www-washingtonpost-com.cdn.ampproject.org/v/s/www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-mexico-city/"
+            style="background-image: url('https://www-washingtonpost-com.cdn.ampproject.org/i/s/www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-mexico-city/img/2e0f5178-746c-11e9-9331-30bc5836f48e.jpg')">Mexico City</div>
+        <div class="circle"
+            data-story="https://www-washingtonpost-com.cdn.ampproject.org/v/s/www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-rome/"
+            style="background-image: url('https://www-washingtonpost-com.cdn.ampproject.org/i/s/www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-rome/img/f5903e2e-86fa-11e9-9d73-e2ba6bbf1b9b.jpg')">Rome</div>
+      </div>
+    </div>
+    <div>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras viverra neque ex, sit amet varius sem maximus sed. Suspendisse potenti. Donec erat purus, sagittis sit amet tincidunt ut, maximus sit amet massa. Maecenas venenatis fringilla dui vitae vestibulum. Fusce imperdiet euismod lobortis. Nullam sagittis nunc at tristique mattis. In sodales consectetur mollis. Maecenas sollicitudin, ex vel tempor rutrum, turpis eros interdum enim, sit amet volutpat tortor dolor at ipsum. Nam posuere velit vel urna vulputate interdum. Aenean eu vulputate lorem. Praesent nec nunc sodales, egestas orci sed, hendrerit mauris. Ut blandit turpis non erat sagittis, quis fermentum odio feugiat.</div>
+  </body>
+</html>
diff --git a/examples/amp-story/amp-story-subscriptions.html b/examples/amp-story/amp-story-subscriptions.html
new file mode 100644
index 000000000000..3136037565fd
--- /dev/null
+++ b/examples/amp-story/amp-story-subscriptions.html
@@ -0,0 +1,252 @@
+<!DOCTYPE html>
+<html ⚡ lang="en">
+  <!-- prettier-ignore -->
+  <head>
+    <meta charset="utf-8">
+    <title>amp-story-subscriptions example</title>
+    <link rel="canonical" href="/examples/amp-story-subscriptions.html">
+    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+    <style amp-custom>
+      /* TODO: refactor and clean up */
+      body {
+        font-family: 'Roboto', sans-serif;
+      }
+      amp-story-page {
+        background: white;
+      }
+      h1 {
+        font-size: 2.875em;
+        font-weight: normal;
+        line-height: 1.174;
+        text-transform: uppercase;
+        color: #FFFFFF;
+      }
+      p {
+        font-family: Poppins;
+        color: #FFFFFF;
+      }
+      .cover-title {
+        position: absolute;
+        width: 80%;
+        height: 117px;
+        left: 10%;
+        right: 10%;
+        top: 450px;
+        align-items: center;
+        text-align: center;
+        letter-spacing: 0.5px;
+        color: #FFFFFF;
+      }
+      .cover-title p {
+        display: block;
+        font-family: Playfair Display;
+        font-style: normal;
+        font-weight: bold;
+        font-size: 50px;
+        line-height: 54px;
+      }
+      .cover-subtitle {
+        position: absolute;
+        width: 80%;
+        left: 10%;
+        right: 10%;
+        height: 44px;
+        top: 565px;
+      }
+      .cover-subtitle p {
+        font-family: Poppins;
+        font-style: normal;
+        font-weight: normal;
+        font-size: 14px;
+        line-height: 20px;
+        display: flex;
+        align-items: center;
+        text-align: center;
+        letter-spacing: 1px;
+        color: #FFFFFF;
+      }
+      #page-1 .text-section {
+        background: linear-gradient(0deg, #483614, #483614);
+        height: 384px;
+      }
+      #page-2 .text-section {
+        background: #8B2B30;
+        height: 292px;
+      }
+      #page-3 .text-section {
+        background: #324B3C;
+        height: 332px;
+      }
+      .text-section {
+        position: absolute;
+        width: 90%;
+        left: 5%;
+        right: 5%;
+        bottom: 5%;
+        margin: auto;
+      }
+      .text-section h3 {
+        margin-top: 28px;
+        margin-left: 28px;
+        margin-right: 28px;
+        font-family: Poppins;
+        font-style: normal;
+        font-weight: normal;
+        font-size: 12px;
+        line-height: 16px;
+        align-items: center;
+        text-align: center;
+        letter-spacing: 4px;
+        text-transform: uppercase;
+        color: #FFFFFF;
+      }
+      .text-section p {
+        margin-top: 14px;
+        margin-left: 14px;
+        margin-right: 14px;
+        font-family: Poppins;
+        font-style: normal;
+        font-weight: normal;
+        font-size: 12px;
+        line-height: 20px;
+        letter-spacing: 0.5px;
+        color: #FFFFFF;
+      }
+      .text {
+        font-size: 1em;
+      }
+    </style>
+
+    <script async src="https://cdn.ampproject.org/v0.js"></script>
+    <script async custom-element="amp-subscriptions" src="https://cdn.ampproject.org/v0/amp-subscriptions-0.1.js"></script>
+    <script
+      async
+      custom-element="amp-subscriptions-google"
+      src="https://cdn.ampproject.org/v0/amp-subscriptions-google-0.1.js"
+    ></script>
+    <script type="application/ld+json">
+      {
+        "@context": "http://schema.org",
+        "@type": "NewsArticle",
+        "isAccessibleForFree": "False",
+        "isPartOf": {
+          "@type": ["CreativeWork", "Product"],
+          "name" : "Product A",
+          "productID": "scenic-2017.appspot.com:news"
+        }
+      }
+    </script>
+    <script type="application/json" id="amp-subscriptions">
+      {
+        "services": [
+          {
+            "authorizationUrl": "https://scenic-2017.appspot.com/amp-entitlements?pubid=scenic-2017.appspot.com&meter=1&rid=READER_ID",
+            "pingbackUrl": "https://scenic-2017.appspot.com/amp-pingback?pubid=scenic-2017.appspot.com",
+            "actions":{
+              "login": "https://scenic-2017.appspot.com/signin?rid=READER_ID",
+              "subscribe": "https://scenic-2017.appspot.com/subscribe"
+            }
+          },
+          {
+            "serviceId": "subscribe.google.com"
+          }
+        ]
+      }
+    </script>
+
+    <script async custom-element="amp-story"
+        src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
+    <script async custom-element="amp-story-subscriptions" src="https://cdn.ampproject.org/v0/amp-story-subscriptions-0.1.js"></script>
+  </head>
+  <body>
+    <amp-story standalone title="My story" publisher="Monocle" publisher-logo-src="https://res.cloudinary.com/crunchbase-production/image/upload/c_lpad,h_170,w_170,f_auto,b_white,q_auto:eco,dpr_1/tbvbvipimh2camf5nb2q" poster-portrait-src="POSTER-IMAGE-URL">
+      <amp-story-page id="cover" auto-advance-after="5s">
+        <amp-story-grid-layer template="fill">
+          <amp-img src="https://images.unsplash.com/photo-1552650904-54d0c54b278f?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=987&q=80"
+              width="720" height="1280"
+              layout="responsive"
+              alt="">
+          </amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer class="box" aspect-ratio="9:16">
+          <div class="cover-title"><p>Amazing</p><p>Kyoto</p></div>
+          <div class="cover-subtitle"><p>Modern culture meets ancient traditions and beauty</p></div>
+        </amp-story-grid-layer>
+      </amp-story-page>
+
+      <amp-story-page id="page-1" auto-advance-after="5s">
+        <amp-story-grid-layer template="fill">
+          <amp-img src="https://images.unsplash.com/photo-1544965563-bb8d8bce9791?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1011&q=80"
+              width="720" height="1280"
+              layout="responsive"
+              alt="">
+          </amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer aspect-ratio="9:16">
+          <div class="text-section">
+            <h3>Amazing Kyoto</h3>
+            <p>Kyoto is a true embodiment of Old Japan awash with beautiful vestiges of its past glory. Beyond the futuristic Kyoto Station, modern shopping complexes, and sleek luxury hotels, lies a city with celebrated centuries-old wonders, breathtaking temples, serene Zen gardens, narrow cobbled alleyways, bustling markets and a vibrant nightlife.</p>
+            <p>By effortlessly blending the past and present, Kyoto is poised to be an alluring destination for history buffs and art lovers, gourmands, and outdoor enthusiasts. —Nano Betts</p>
+          </div>
+        </amp-story-grid-layer>
+      </amp-story-page>
+
+      <amp-story-page id="page-2" auto-advance-after="5s">
+        <amp-story-grid-layer template="fill">
+          <amp-img src="https://images.unsplash.com/photo-1599849913403-f45ef2181b49?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=3024&q=80"
+              width="720" height="1280"
+              layout="responsive"
+              alt="">
+          </amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer aspect-ratio="9:16">
+          <div class="text-section">
+            <h3>arashiyama</h3>
+            <p>The rolling foothills of Arashiyama are home to the iconic Sagano Bamboo Forest. The verdant grove is accessed via the 14th-century Buddhist temple Tenryu-ji. A unique serenity is experienced from the wind rustling through the soaring trees making a zawa zawa sound and the filtered sunlight filling the space with a tranquil green glow.</p>
+          </div>
+        </amp-story-grid-layer>
+      </amp-story-page>
+
+      <amp-story-page id="page-3" auto-advance-after="5s">
+        <amp-story-grid-layer template="fill">
+          <amp-img src="https://images.unsplash.com/photo-1599849913403-f45ef2181b49?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=3024&q=80"
+              width="720" height="1280"
+              layout="responsive"
+              alt="">
+          </amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer aspect-ratio="9:16">
+          <div class="text-section">
+            <h3>arashiyama</h3>
+            <p>The rolling foothills of Arashiyama are home to the iconic Sagano Bamboo Forest. The verdant grove is accessed via the 14th-century Buddhist temple Tenryu-ji. A unique serenity is experienced from the wind rustling through the soaring trees making a zawa zawa sound and the filtered sunlight filling the space with a tranquil green glow.</p>
+          </div>
+        </amp-story-grid-layer>
+      </amp-story-page>
+
+      <amp-story-page id="page-4">
+        <amp-story-grid-layer template="fill">
+          <amp-img src="https://images.unsplash.com/photo-1574236170880-fbbca132d83d?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=926&q=80"
+              width="720" height="1280"
+              layout="responsive"
+              alt="">
+          </amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer aspect-ratio="9:16">
+          <div class="text-section">
+            <h3>Cultral Experiences</h3>
+            <p>As a birthplace of Sado, or Japanese tea ceremony, the historic neighborhoods of Gion and Higashiyama are perfect places to visit machiyas and learn about the ancient art of tea-making. During the ritual performed on a tatami floor by a professional tea master, you'll have a chance to learn about the philosophy and etiquette of drinking tea, as well as master the basics of making matcha.</p>
+          </div>
+        </amp-story-grid-layer>
+      </amp-story-page>
+
+      <amp-story-subscriptions layout='container'
+        subscriptions-page-index='3'
+        price='$0.50/week'
+        headline='Information at your fingertips'
+        description='Subscribe for unlimited access.'
+        additional-description='Cancel anytime.'>
+      </amp-story-subscriptions>
+    </amp-story>
+  </body>
+</html>
diff --git a/examples/amp-story/ampconf.html b/examples/amp-story/ampconf.html
index 000cf1348607..2537d6596f0d 100644
--- a/examples/amp-story/ampconf.html
+++ b/examples/amp-story/ampconf.html
@@ -112,7 +112,7 @@
           {
             "ad-attributes": {
               "type": "custom",
-              "data-url": "https://ampbyexample.com/json/amp-story-auto-ads/"
+              "data-url": "https://amp.dev/static/samples/json/amp-story-auto-ads-0.json"
             }
           }
         </script>
@@ -164,7 +164,7 @@ <h2 class="bold">Overview</h2>
 
       <amp-story-page id="page-3">
         <amp-story-grid-layer template="fill">
-          <amp-video autoplay loop
+          <amp-video autoplay loop noaudio
             width="400"
             height="750"
             poster="./img/poster.jpg"
@@ -208,7 +208,7 @@ <h1 class="bold">A visual storytelling format for the open web</h1>
 
       <amp-story-page id="page-6">
         <amp-story-grid-layer template="fill">
-          <amp-video autoplay loop
+          <amp-video autoplay loop noaudio
             width="400"
             height="750"
             poster="./img/poster3.jpg"
@@ -292,11 +292,11 @@ <h1 class="bold">Improve conversions with fast, user-friendly experiences</h1>
         <amp-story-grid-layer template="thirds" class="bottom">
           <h1 grid-area="middle-third" class="bold">Join the worldwide AMP Roadshow</h1>
         </amp-story-grid-layer>
-        <amp-story-cta-layer>
+        <amp-story-page-outlink layout="nodisplay">
           <a href="https://www.ampproject.org/amp-roadshow/" class="button medium center">
             <p class="twenty-px">Sign up Now</p>
           </a>
-        </amp-story-cta-layer>
+        </amp-story-page-outlink>
       </amp-story-page>
     </amp-story>
   </body>
diff --git a/examples/amp-story/analytics.html b/examples/amp-story/analytics.html
index f4597626d4aa..50db3b629557 100644
--- a/examples/amp-story/analytics.html
+++ b/examples/amp-story/analytics.html
@@ -88,6 +88,11 @@
               "trackAudioDisable": {
                 "on": "story-audio-unmuted",
                 "request": "pageView"
+              },
+              "trackShare": {
+                "on": "story-open",
+                "tagName": "amp-story-share-menu",
+                "request": "base"
               }
             },
             "linkers": {
@@ -129,40 +134,10 @@ <h1>Page Two</h1>
           <h1>Page Three</h1>
           <a href="https://google.com">tooltip link</a>
         </amp-story-grid-layer>
-        <amp-story-cta-layer>
-          <a href="https://google.com">CTA link</a>
-        </amp-story-cta-layer>
-        <amp-story-page-attachment layout="nodisplay" href="https://google.com"></amp-story-page-attachment>
+        <amp-story-page-outlink layout="nodisplay" href="https://google.com"></amp-story-page-outlink>
       </amp-story-page>
 
-      <amp-story-page id="p4" style="background-color: grey">
-          <amp-story-grid-layer template="vertical">
-            <h1>Page Four</h1>
-            <a id="blink-3" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="shopping-cart">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-            <a id="blink-4" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="offer">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-            <a id="blink-5" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="flight">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-            <a id="blink-6" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="hotel">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-            <a id="blink-7" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="movie">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-            <a id="blink-8" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="activity">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-            <a id="blink-9" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="more-to-read">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-          </amp-story-grid-layer>
-        </amp-story-page>
-
-      <amp-story-page id="p5">
+      <amp-story-page id="p4">
         <amp-story-grid-layer template="vertical">
           <h1>Page Five</h1>
           <amp-video
diff --git a/examples/amp-story/animations-presets.html b/examples/amp-story/animations-presets.html
index 4e6142ba32d8..3f76601d31c3 100644
--- a/examples/amp-story/animations-presets.html
+++ b/examples/amp-story/animations-presets.html
@@ -105,6 +105,10 @@ <h1 animate-in="fly-in-left">fly-in-left</h1>
           <h1 animate-in="fly-in-right">fly-in-right</h1>
         </div>
       </amp-story-grid-layer>
+      <amp-story-page-outlink
+          layout="nodisplay">
+          <a href="http://localhost:8000/examples/amp-story/animations-presets.html#page=fly-in-left-page" title="Link Description"></a>
+        </amp-story-page-outlink>
     </amp-story-page>
 
     <amp-story-page id="fly-in-top-page">
@@ -121,6 +125,14 @@ <h1 animate-in="fly-in-top">fly-in-top</h1>
           <h1 animate-in="fly-in-bottom">fly-in-bottom</h1>
         </div>
       </amp-story-grid-layer>
+      <amp-story-page-attachment
+          title="Link Description"
+          data-title="Data-Title"
+          href="http://localhost:8000/examples/amp-story/animations-presets.html#page=fly-in-top-page"
+          cta-text="Shop at Forbes"
+          data-cta-text="Data-CTA-Text"
+          layout="nodisplay">
+        </amp-story-page-attachment>
     </amp-story-page>
 
     <amp-story-page id="rotate-in-left-page">
@@ -190,8 +202,8 @@ <h1>zoom-out</h1>
     <!-- ## Pan-Left -->
     <amp-story-page id="pan-left">
       <amp-story-grid-layer template="fill">
-        <amp-img animate-in="pan-left" id="img-pan-left" translate-x="600px" animate-in-duration="4s" layout="fixed" src="https://picsum.photos/720/320?image=1026"
-          width="720" height="320">
+        <amp-img animate-in="pan-left" id="img-pan-left" translate-x="200px" animate-in-duration="4s" layout="fixed"  src="https://images.unsplash.com/photo-1648098470019-c103e39aa32b?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1287&q=80"
+        width="192" height="288">
         </amp-img>
       </amp-story-grid-layer>
       <amp-story-grid-layer template="fill">
@@ -202,8 +214,8 @@ <h1>pan-left</h1>
     <!-- ## Pan-Right -->
     <amp-story-page id="pan-right">
       <amp-story-grid-layer template="fill">
-        <amp-img animate-in="pan-right" animate-in-duration="4s" translate-x="200px" layout="fixed" src="https://picsum.photos/720/320?image=1026" width="720"
-          height="320">
+        <amp-img animate-in="pan-right" animate-in-duration="4s" translate-x="200px" layout="fixed" src="https://images.unsplash.com/photo-1644308251427-cd809dc65e4c?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=2670&q=80"
+        width="1920" height="1280">
         </amp-img>
       </amp-story-grid-layer>
       <amp-story-grid-layer template="fill">
@@ -214,8 +226,8 @@ <h1>pan-right</h1>
     <!-- ## Pan-Up -->
     <amp-story-page id="pan-up">
       <amp-story-grid-layer template="fill">
-        <amp-img animate-in="pan-up" animate-in-duration="4s" translate-y="100px" layout="fixed" src="https://picsum.photos/720/320?image=1026" width="720"
-          height="320">
+        <amp-img animate-in="pan-up" animate-in-duration="4s" translate-y="100px" layout="fixed" src="https://images.unsplash.com/photo-1648098470019-c103e39aa32b?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1287&q=80"
+        width="192" height="288">
         </amp-img>
       </amp-story-grid-layer>
       <amp-story-grid-layer template="fill">
@@ -226,14 +238,48 @@ <h1>pan-up</h1>
     <!-- ## Pan-Down -->
     <amp-story-page id="pan-down">
       <amp-story-grid-layer template="fill">
-        <amp-img animate-in="pan-down" animate-in-duration="4s" translate-y="100px" layout="fixed" src="https://picsum.photos/720/320?image=1026" width="720"
-          height="320">
+        <amp-img animate-in="pan-down" animate-in-duration="4s" translate-y="100px" layout="fixed" src="https://images.unsplash.com/photo-1644308251427-cd809dc65e4c?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=2670&q=80"
+        width="1920" height="1280">
         </amp-img>
       </amp-story-grid-layer>
       <amp-story-grid-layer template="fill">
         <h1>pan-down</h1>
       </amp-story-grid-layer>
     </amp-story-page>
+
+    <!-- ## Pan-Right with pan-scaling-factor attr -->
+    <amp-story-page id="pan-right-with-static-scale">
+      <amp-story-grid-layer template="vertical">
+        <h1>pan-right</h1>
+        <p>with pan-scaling-factor attr</p>
+        <div class="img-container" style="width: 120%">
+          <amp-img
+            animate-in="pan-right" animate-in-timing-function="ease-out"
+            pan-scaling-factor=".9"
+            translate-x="35px" animate-in-duration="3.5s"
+            id="img-pan-right" layout="responsive" src="https://images.unsplash.com/photo-1644308251427-cd809dc65e4c?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=2670&q=80"
+            width="1920" height="1280">
+          </amp-img>
+        </div>
+      </amp-story-grid-layer>
+    </amp-story-page>
+
+    <!-- ## Pan-Down with pan-scaling-factor attr -->
+    <amp-story-page id="pan-down-with-static-scale">
+      <amp-story-grid-layer template="vertical">
+        <h1>pan-down</h1>
+        <p>with pan-scaling-factor attr</p>
+        <div class="img-container" style="height: 120%">
+          <amp-img
+            animate-in="pan-down" animate-in-timing-function="ease-out"
+            pan-scaling-factor="0.9"
+            translate-y="35px" animate-in-duration="3.5s"
+            id="img-pan-down" layout="responsive" src="https://images.unsplash.com/photo-1644308251427-cd809dc65e4c?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=2670&q=80"
+            width="1920" height="1280">
+          </amp-img>
+        </div>
+      </amp-story-grid-layer>
+    </amp-story-page>
   </amp-story>
 </body>
 
diff --git a/examples/amp-story/attachment-supports-landscape.html b/examples/amp-story/attachment-supports-landscape.html
new file mode 100644
index 000000000000..25003a02ff7a
--- /dev/null
+++ b/examples/amp-story/attachment-supports-landscape.html
@@ -0,0 +1,417 @@
+<!doctype html>
+<html amp lang="en">
+  <head>
+    <meta charset="utf-8">
+    <script async src="https://cdn.ampproject.org/v0.js"></script>
+    <script async custom-element="amp-form" src="https://cdn.ampproject.org/v0/amp-form-0.1.js"></script>
+    <script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
+    <script async custom-element="amp-social-share" src="https://cdn.ampproject.org/v0/amp-social-share-0.1.js"></script>
+    <link href='https://fonts.googleapis.com/css?family=Georgia|Open+Sans|Roboto' rel='stylesheet' type='text/css'>
+    <link href="https://fonts.googleapis.com/css?family=Roboto+Condensed" rel="stylesheet">
+    <title>Attachments</title>
+    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+    <link rel="canonical" href="index.html">
+    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+    <style amp-custom>
+      body {
+        font-family: 'Roboto', sans-serif;
+        color: #fff;
+      }
+
+      amp-story-page {
+        background-color: #000;
+      }
+
+      p span {
+        padding: 0 96px 0 20px;
+        align-items: center;
+        font-size: 18px;
+        line-height: 1.5em;
+        margin-bottom: 10px;
+      }
+
+      amp-story-page-attachment {
+        color: rgba(0, 0, 0, 0.93);
+      }
+
+      .attachment-content {
+        background-color: #F8EDD5;
+        box-sizing: border-box;
+        padding: 20px;
+      }
+
+      .attachment-content p {
+        font-size: 18px;
+        margin-top: 0;
+        margin-bottom: 16px;
+      }
+
+      form input {
+        display: block;
+        height: 60px;
+        margin-bottom: 30px;
+        width: 100%;
+      }
+
+      form input[type="submit"] {
+        background-color: black;
+        color: white;
+        margin-bottom: 0px;
+      }
+    </style>
+  </head>
+
+  <body>
+    <amp-story
+        standalone
+        publisher="The AMP team"
+        publisher-logo-src="/examples/visual-tests/amp-story/img/AMP-Brand-White-Icon.svg"
+        poster-portrait-src="/examples/visual-tests/amp-story/img/overview.jpg"
+        title="Attachment Story with supports-landscape"
+        supports-landscape>
+      <amp-story-page id="inline-default">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat1.jpg"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <p>
+            <span data-text-background-color="#00A3DB">Default amp-story-page-attachment.</span></br></br>
+          </p>
+        </amp-story-grid-layer>
+        <amp-story-page-attachment title="Lorem ipsum" layout="nodisplay">
+          <a href="https://google.com">Left link</a>
+          <div style="text-align: center;"><a href="https://google.com">Center link</a></div>
+          <div style="text-align: right;"><a href="https://google.com">Right link</a></div>
+          <p>Lots of content. Opens to max of 80% then scrolls.</p>
+
+          <p>In nisl nisi scelerisque eu ultrices vitae auctor eu. Tristique magna sit amet purus gravida. Tincidunt id aliquet risus feugiat in ante metus dictum. Mattis nunc sed blandit libero volutpat sed. Imperdiet massa tincidunt nunc pulvinar sapien et ligula ullamcorper malesuada. Sit amet mattis vulputate enim nulla aliquet porttitor lacus luctus. Proin sagittis nisl rhoncus mattis rhoncus. Pulvinar neque laoreet suspendisse interdum consectetur libero. Nibh tellus molestie nunc non blandit massa enim nec dui. Sagittis eu volutpat odio facilisis. Tristique senectus et netus et malesuada fames ac. Molestie a iaculis at erat. Sit amet cursus sit amet. Suscipit tellus mauris a diam maecenas sed enim ut. Gravida quis blandit turpis cursus in. Tincidunt vitae semper quis lectus nulla at volutpat diam ut. Morbi tempus iaculis urna id. Faucibus et molestie ac feugiat sed lectus vestibulum. Mauris augue neque gravida in. Ac turpis egestas sed tempus.</p>
+
+          <p>In nisl nisi scelerisque eu ultrices vitae auctor eu. Tristique magna sit amet purus gravida. Tincidunt id aliquet risus feugiat in ante metus dictum. Mattis nunc sed blandit libero volutpat sed. Imperdiet massa tincidunt nunc pulvinar sapien et ligula ullamcorper malesuada. Sit amet mattis vulputate enim nulla aliquet porttitor lacus luctus. Proin sagittis nisl rhoncus mattis rhoncus. Pulvinar neque laoreet suspendisse interdum consectetur libero. Nibh tellus molestie nunc non blandit massa enim nec dui. Sagittis eu volutpat odio facilisis. Tristique senectus et netus et malesuada fames ac. Molestie a iaculis at erat. Sit amet cursus sit amet. Suscipit tellus mauris a diam maecenas sed enim ut. Gravida quis blandit turpis cursus in. Tincidunt vitae semper quis lectus nulla at volutpat diam ut. Morbi tempus iaculis urna id. Faucibus et molestie ac feugiat sed lectus vestibulum. Mauris augue neque gravida in. Ac turpis egestas sed tempus.</p>
+
+          <p>Ut tristique et egestas quis ipsum. Aliquam malesuada bibendum arcu vitae elementum curabitur vitae nunc sed. Elementum curabitur vitae nunc sed velit dignissim. Tristique et egestas quis ipsum suspendisse ultrices gravida dictum fusce. At elementum eu facilisis sed odio morbi. Imperdiet proin fermentum leo vel orci porta non. Quam lacus suspendisse faucibus interdum. Eu non diam phasellus vestibulum lorem sed risus. Commodo viverra maecenas accumsan lacus vel facilisis volutpat est velit. Sagittis aliquam malesuada bibendum arcu vitae elementum. Ut sem viverra aliquet eget sit amet. Nulla facilisi morbi tempus iaculis. Sed odio morbi quis commodo odio aenean sed adipiscing diam. Donec ultrices tincidunt arcu non sodales. Amet venenatis urna cursus eget. Sapien et ligula ullamcorper malesuada proin. Tristique sollicitudin nibh sit amet commodo nulla facilisi. Venenatis tellus in metus vulputate eu scelerisque felis.</p>
+          <a href="https://linkinattachment.com">Link in page attachment</a>
+        </amp-story-page-attachment>
+      </amp-story-page>
+      <amp-story-page id="inline-default-dark-theme">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat1.jpg"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <p>
+            <span data-text-background-color="#00A3DB">amp-story-page-attachment: dark theme.</span></br></br>
+          </p>
+        </amp-story-grid-layer>
+        <amp-story-page-attachment
+          title="Lorem ipsum"
+          layout="nodisplay"
+          theme="dark"
+        >
+          <p> A little content. Opens to max of content.</p>
+        </amp-story-page-attachment>
+      </amp-story-page>
+
+      <amp-story-page id="inline-one-image">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat1.jpg"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <p>
+            <span data-text-background-color="#00A3DB">amp-story-page-attachment: one image.</span></br></br>
+          </p>
+        </amp-story-grid-layer>
+        <amp-story-page-attachment
+          title="Lorem ipsum"
+          layout="nodisplay"
+          cta-text="Buy a Sweater"
+          cta-image="img/sweater.jpg"
+          >
+          <div class="attachment-content">
+            <p> Lots of content. Opens to max of 80% then scrolls.</p>
+
+            <p>In nisl nisi scelerisque eu ultrices vitae auctor eu. Tristique magna sit amet purus gravida. Tincidunt id aliquet risus feugiat in ante metus dictum. Mattis nunc sed blandit libero volutpat sed. Imperdiet massa tincidunt nunc pulvinar sapien et ligula ullamcorper malesuada. Sit amet mattis vulputate enim nulla aliquet porttitor lacus luctus. Proin sagittis nisl rhoncus mattis rhoncus. Pulvinar neque laoreet suspendisse interdum consectetur libero. Nibh tellus molestie nunc non blandit massa enim nec dui. Sagittis eu volutpat odio facilisis. Tristique senectus et netus et malesuada fames ac. Molestie a iaculis at erat. Sit amet cursus sit amet. Suscipit tellus mauris a diam maecenas sed enim ut. Gravida quis blandit turpis cursus in. Tincidunt vitae semper quis lectus nulla at volutpat diam ut. Morbi tempus iaculis urna id. Faucibus et molestie ac feugiat sed lectus vestibulum. Mauris augue neque gravida in. Ac turpis egestas sed tempus.</p>
+
+            <p>In nisl nisi scelerisque eu ultrices vitae auctor eu. Tristique magna sit amet purus gravida. Tincidunt id aliquet risus feugiat in ante metus dictum. Mattis nunc sed blandit libero volutpat sed. Imperdiet massa tincidunt nunc pulvinar sapien et ligula ullamcorper malesuada. Sit amet mattis vulputate enim nulla aliquet porttitor lacus luctus. Proin sagittis nisl rhoncus mattis rhoncus. Pulvinar neque laoreet suspendisse interdum consectetur libero. Nibh tellus molestie nunc non blandit massa enim nec dui. Sagittis eu volutpat odio facilisis. Tristique senectus et netus et malesuada fames ac. Molestie a iaculis at erat. Sit amet cursus sit amet. Suscipit tellus mauris a diam maecenas sed enim ut. Gravida quis blandit turpis cursus in. Tincidunt vitae semper quis lectus nulla at volutpat diam ut. Morbi tempus iaculis urna id. Faucibus et molestie ac feugiat sed lectus vestibulum. Mauris augue neque gravida in. Ac turpis egestas sed tempus.</p>
+
+            <p>Ut tristique et egestas quis ipsum. Aliquam malesuada bibendum arcu vitae elementum curabitur vitae nunc sed. Elementum curabitur vitae nunc sed velit dignissim. Tristique et egestas quis ipsum suspendisse ultrices gravida dictum fusce. At elementum eu facilisis sed odio morbi. Imperdiet proin fermentum leo vel orci porta non. Quam lacus suspendisse faucibus interdum. Eu non diam phasellus vestibulum lorem sed risus. Commodo viverra maecenas accumsan lacus vel facilisis volutpat est velit. Sagittis aliquam malesuada bibendum arcu vitae elementum. Ut sem viverra aliquet eget sit amet. Nulla facilisi morbi tempus iaculis. Sed odio morbi quis commodo odio aenean sed adipiscing diam. Donec ultrices tincidunt arcu non sodales. Amet venenatis urna cursus eget. Sapien et ligula ullamcorper malesuada proin. Tristique sollicitudin nibh sit amet commodo nulla facilisi. Venenatis tellus in metus vulputate eu scelerisque felis.</p>
+            <a href="https://linkinattachment.com">Link in page attachment</a>
+          </div>
+        </amp-story-page-attachment>
+      </amp-story-page>
+
+      <amp-story-page id="inline-two-images-dark-theme">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat1.jpg"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <p>
+            <span data-text-background-color="#00A3DB">amp-story-page-attachment: two images & dark theme.</span></br></br>
+          </p>
+        </amp-story-grid-layer>
+        <amp-story-page-attachment
+          title="Lorem ipsum"
+          layout="nodisplay"
+          cta-text="Buy a Sweater"
+          cta-image="img/sweater.jpg"
+          cta-image-2="img/boot.jpg"
+          theme="dark"
+          >
+          <p> Lots of content. Opens to max of 80% then scrolls.</p>
+
+          <p>In nisl nisi scelerisque eu ultrices vitae auctor eu. Tristique magna sit amet purus gravida. Tincidunt id aliquet risus feugiat in ante metus dictum. Mattis nunc sed blandit libero volutpat sed. Imperdiet massa tincidunt nunc pulvinar sapien et ligula ullamcorper malesuada. Sit amet mattis vulputate enim nulla aliquet porttitor lacus luctus. Proin sagittis nisl rhoncus mattis rhoncus. Pulvinar neque laoreet suspendisse interdum consectetur libero. Nibh tellus molestie nunc non blandit massa enim nec dui. Sagittis eu volutpat odio facilisis. Tristique senectus et netus et malesuada fames ac. Molestie a iaculis at erat. Sit amet cursus sit amet. Suscipit tellus mauris a diam maecenas sed enim ut. Gravida quis blandit turpis cursus in. Tincidunt vitae semper quis lectus nulla at volutpat diam ut. Morbi tempus iaculis urna id. Faucibus et molestie ac feugiat sed lectus vestibulum. Mauris augue neque gravida in. Ac turpis egestas sed tempus.</p>
+
+          <p>In nisl nisi scelerisque eu ultrices vitae auctor eu. Tristique magna sit amet purus gravida. Tincidunt id aliquet risus feugiat in ante metus dictum. Mattis nunc sed blandit libero volutpat sed. Imperdiet massa tincidunt nunc pulvinar sapien et ligula ullamcorper malesuada. Sit amet mattis vulputate enim nulla aliquet porttitor lacus luctus. Proin sagittis nisl rhoncus mattis rhoncus. Pulvinar neque laoreet suspendisse interdum consectetur libero. Nibh tellus molestie nunc non blandit massa enim nec dui. Sagittis eu volutpat odio facilisis. Tristique senectus et netus et malesuada fames ac. Molestie a iaculis at erat. Sit amet cursus sit amet. Suscipit tellus mauris a diam maecenas sed enim ut. Gravida quis blandit turpis cursus in. Tincidunt vitae semper quis lectus nulla at volutpat diam ut. Morbi tempus iaculis urna id. Faucibus et molestie ac feugiat sed lectus vestibulum. Mauris augue neque gravida in. Ac turpis egestas sed tempus.</p>
+
+          <p>Ut tristique et egestas quis ipsum. Aliquam malesuada bibendum arcu vitae elementum curabitur vitae nunc sed. Elementum curabitur vitae nunc sed velit dignissim. Tristique et egestas quis ipsum suspendisse ultrices gravida dictum fusce. At elementum eu facilisis sed odio morbi. Imperdiet proin fermentum leo vel orci porta non. Quam lacus suspendisse faucibus interdum. Eu non diam phasellus vestibulum lorem sed risus. Commodo viverra maecenas accumsan lacus vel facilisis volutpat est velit. Sagittis aliquam malesuada bibendum arcu vitae elementum. Ut sem viverra aliquet eget sit amet. Nulla facilisi morbi tempus iaculis. Sed odio morbi quis commodo odio aenean sed adipiscing diam. Donec ultrices tincidunt arcu non sodales. Amet venenatis urna cursus eget. Sapien et ligula ullamcorper malesuada proin. Tristique sollicitudin nibh sit amet commodo nulla facilisi. Venenatis tellus in metus vulputate eu scelerisque felis.</p>
+          <a href="https://linkinattachment.com">Link in page attachment</a>
+        </amp-story-page-attachment>
+      </amp-story-page>
+
+      <amp-story-page id="short-inline-containing-form">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat1.jpg"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <p>
+            <span data-text-background-color="#00A3DB">amp-story-page-attachment: one form within small attachment.</span></br></br>
+          </p>
+        </amp-story-grid-layer>
+        <amp-story-page-attachment
+          title="Subscribe"
+          layout="nodisplay"
+          cta-text="Subscribe">
+          <div class="attachment-content">
+            <p>Form within a small attachment:</p>
+            <form
+              method="POST"
+              action-xhr="https://www.example.com"
+              target="_top"
+              >
+              <input type="tel" name="phone" placeholder="Phone" required>
+              <input type="email" name="email" placeholder="Email" required>
+              <input type="text" name="name" placeholder="Your name" required>
+              <input type="submit" value="Subscribe">
+            </form>
+          </div>
+        </amp-story-page-attachment>
+      </amp-story-page>
+
+      <amp-story-page id="long-inline-containing-forms">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat1.jpg"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <p>
+            <span data-text-background-color="#00A3DB">amp-story-page-attachment: two forms within large attachment.</span></br></br>
+          </p>
+        </amp-story-grid-layer>
+        <amp-story-page-attachment
+          title="Subscribe"
+          layout="nodisplay"
+          cta-text="Subscribe">
+          <div class="attachment-content">
+            <p>Forms within a large attachment:</p>
+            <form
+              method="POST"
+              action-xhr="https://www.example.com"
+              target="_top"
+              >
+              <input type="email" name="email" placeholder="Email" required>
+              <input type="submit" value="Subscribe">
+            </form>
+            <p>In nisl nisi scelerisque eu ultrices vitae auctor eu. Tristique magna sit amet purus gravida. Tincidunt id aliquet risus feugiat in ante metus dictum. Mattis nunc sed blandit libero volutpat sed. Imperdiet massa tincidunt nunc pulvinar sapien et ligula ullamcorper malesuada. Sit amet mattis vulputate enim nulla aliquet porttitor lacus luctus. Proin sagittis nisl rhoncus mattis rhoncus. Pulvinar neque laoreet suspendisse interdum consectetur libero. Nibh tellus molestie nunc non blandit massa enim nec dui. Sagittis eu volutpat odio facilisis. Tristique senectus et netus et malesuada fames ac. Molestie a iaculis at erat. Sit amet cursus sit amet. Suscipit tellus mauris a diam maecenas sed enim ut. Gravida quis blandit turpis cursus in. Tincidunt vitae semper quis lectus nulla at volutpat diam ut. Morbi tempus iaculis urna id. Faucibus et molestie ac feugiat sed lectus vestibulum. Mauris augue neque gravida in. Ac turpis egestas sed tempus.</p>
+            <p>In nisl nisi scelerisque eu ultrices vitae auctor eu. Tristique magna sit amet purus gravida. Tincidunt id aliquet risus feugiat in ante metus dictum. Mattis nunc sed blandit libero volutpat sed. Imperdiet massa tincidunt nunc pulvinar sapien et ligula ullamcorper malesuada. Sit amet mattis vulputate enim nulla aliquet porttitor lacus luctus. Proin sagittis nisl rhoncus mattis rhoncus. Pulvinar neque laoreet suspendisse interdum consectetur libero. Nibh tellus molestie nunc non blandit massa enim nec dui. Sagittis eu volutpat odio facilisis. Tristique senectus et netus et malesuada fames ac. Molestie a iaculis at erat. Sit amet cursus sit amet. Suscipit tellus mauris a diam maecenas sed enim ut. Gravida quis blandit turpis cursus in. Tincidunt vitae semper quis lectus nulla at volutpat diam ut. Morbi tempus iaculis urna id. Faucibus et molestie ac feugiat sed lectus vestibulum. Mauris augue neque gravida in. Ac turpis egestas sed tempus.</p>
+            <p>Ut tristique et egestas quis ipsum. Aliquam malesuada bibendum arcu vitae elementum curabitur vitae nunc sed. Elementum curabitur vitae nunc sed velit dignissim. Tristique et egestas quis ipsum suspendisse ultrices gravida dictum fusce. At elementum eu facilisis sed odio morbi. Imperdiet proin fermentum leo vel orci porta non. Quam lacus suspendisse faucibus interdum. Eu non diam phasellus vestibulum lorem sed risus. Commodo viverra maecenas accumsan lacus vel facilisis volutpat est velit. Sagittis aliquam malesuada bibendum arcu vitae elementum. Ut sem viverra aliquet eget sit amet. Nulla facilisi morbi tempus iaculis. Sed odio morbi quis commodo odio aenean sed adipiscing diam. Donec ultrices tincidunt arcu non sodales. Amet venenatis urna cursus eget. Sapien et ligula ullamcorper malesuada proin. Tristique sollicitudin nibh sit amet commodo nulla facilisi. Venenatis tellus in metus vulputate eu scelerisque felis.</p>
+            <form
+              method="POST"
+              action-xhr="https://www.example.com"
+              target="_top"
+              >
+              <input type="text" name="feedback" placeholder="Feedback">
+              <input type="submit" value="Submit">
+            </form>
+          </div>
+        </amp-story-page-attachment>
+      </amp-story-page>
+
+      <amp-story-page id="outlink-default">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat2.jpg"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="center">
+          <p>
+            <span data-text-background-color="crimson">Default amp-story-page-outlink.</span></br></br>
+          </p>
+        </amp-story-grid-layer>
+        <amp-story-page-outlink
+          layout="nodisplay">
+          <a href="https://www.google.com" title="Link Description"></a>
+        </amp-story-page-outlink>
+      </amp-story-page>
+
+      <amp-story-page id="outlink-custom-icon-custom-text">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat2.jpg"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="center">
+          <p>
+            <span data-text-background-color="crimson">amp-story-page-outlink: logo & custom text.</span></br></br>
+          </p>
+        </amp-story-grid-layer>
+        <amp-story-page-outlink
+          layout="nodisplay"
+          cta-image="img/logo.jpg">
+          <a href="https://www.google.com" title="Link Description">Shop at Forbes</a>
+        </amp-story-page-outlink>
+      </amp-story-page>
+
+      <amp-story-page id="outlink-no-image">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat2.jpg"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="center">
+          <p>
+            <span data-text-background-color="crimson">amp-story-page-outlink: no image.</span></br></br>
+          </p>
+        </amp-story-grid-layer>
+        <amp-story-page-outlink
+          layout="nodisplay"
+          cta-image="none">
+          <a href="https://www.google.com" title="Link Description"></a>
+        </amp-story-page-outlink>
+      </amp-story-page>
+
+      <amp-story-page id="outlink-dark-theme">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat2.jpg"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="center">
+          <p>
+            <span data-text-background-color="crimson">amp-story-page-outlink: dark theme.</span></br></br>
+          </p>
+        </amp-story-grid-layer>
+        <amp-story-page-outlink
+          layout="nodisplay"
+          theme="dark">
+          <a href="https://www.google.com" title="Link Description"></a>
+        </amp-story-page-outlink>
+      </amp-story-page>
+
+      <amp-story-page id="outlink-custom-background-color-pink">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat2.jpg"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="center">
+          <p>
+            <span data-text-background-color="crimson">amp-story-page-outlink: custom pink background.</span></br></br>
+          </p>
+        </amp-story-grid-layer>
+        <amp-story-page-outlink
+          layout="nodisplay"
+          theme="custom"
+          cta-accent-color="pink"
+          cta-accent-element="background">
+          <a href="https://www.google.com" title="Link Description"></a>
+        </amp-story-page-outlink>
+      </amp-story-page>
+
+      <amp-story-page id="outlink-custom-text-color-pink">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat2.jpg"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="center">
+          <p>
+            <span data-text-background-color="crimson">amp-story-page-outlink: custom pink text.</span></br></br>
+          </p>
+        </amp-story-grid-layer>
+        <amp-story-page-outlink
+          layout="nodisplay"
+          theme="custom"
+          cta-accent-color="pink"
+          cta-accent-element="text">
+          <a href="https://www.google.com" title="Link Description"></a>
+        </amp-story-page-outlink>
+      </amp-story-page>
+
+      <amp-story-page id="outlink-custom-background-color-navy">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat2.jpg"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="center">
+          <p>
+            <span data-text-background-color="crimson">amp-story-page-outlink: custom navy background.</span></br></br>
+          </p>
+        </amp-story-grid-layer>
+        <amp-story-page-outlink
+          layout="nodisplay"
+          theme="custom"
+          cta-accent-color="navy"
+          cta-accent-element="background">
+            <a href="https://www.google.com" title="Link Description"></a>
+        </amp-story-page-outlink>
+      </amp-story-page>
+
+      <amp-story-page id="outlink-custom-text-color-navy">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat2.jpg"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="center">
+          <p>
+            <span data-text-background-color="crimson">amp-story-page-outlink: custom navy text.</span></br></br>
+          </p>
+        </amp-story-grid-layer>
+        <amp-story-page-outlink
+          layout="nodisplay"
+          theme="custom"
+          cta-accent-color="navy"
+          cta-accent-element="text">
+          <a href="https://www.google.com/search?q=why+do+cats+purr+so+loud" title="Link Description"></a>
+        </amp-story-page-outlink>
+      </amp-story-page>
+
+      <amp-story-page id="legacy-attachment">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat2.jpg"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="center">
+          <p>
+            <span data-text-background-color="crimson">Legacy outlink (amp-story-page-attachment with an href) using title, data-title, cta-text, and data-cta-text attributes.</span></br></br>
+          </p>
+        </amp-story-grid-layer>
+        <amp-story-page-attachment
+          title="Link Description"
+          data-title="Data-Title"
+          href="https://www.google.com"
+          cta-text="Shop at Forbes"
+          data-cta-text="Data-CTA-Text"
+          layout="nodisplay">
+        </amp-story-page-attachment>
+      </amp-story-page>
+
+      <amp-story-page id="last-page-no-cta">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat1.jpg"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <p>
+            <span data-text-background-color="#00A3DB">No CTA page.</span>
+          </p>
+        </amp-story-grid-layer>
+      </amp-story-page>
+
+      <amp-story-social-share layout="nodisplay">
+        <script type="application/json">
+          {
+            "shareProviders": [
+              "email",
+              {"provider": "facebook", "app_id": "254325784911610"},
+              {"provider": "twitter", "text": "This is custom share text that I would like for the Twitter platform"},
+              "whatsapp",
+              "pinterest",
+              "line"
+            ]
+          }
+        </script>
+      </amp-story-social-share>
+    </amp-story>
+  </body>
+</html>
diff --git a/examples/amp-story/attachment.html b/examples/amp-story/attachment.html
index a2e054bfda40..a39804139482 100644
--- a/examples/amp-story/attachment.html
+++ b/examples/amp-story/attachment.html
@@ -5,7 +5,9 @@
     <script async src="https://cdn.ampproject.org/v0.js"></script>
     <script async custom-element="amp-form" src="https://cdn.ampproject.org/v0/amp-form-0.1.js"></script>
     <script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
-    <script async custom-element="amp-social-share" src="https://cdn.ampproject.org/v0/amp-social-share-0.1.js"></script>
+    <script async custom-element="amp-story-page-attachment" src="https://cdn.ampproject.org/v0/amp-story-page-attachment-0.1.js"></script>
+    <script async custom-element="amp-list" src="https://cdn.ampproject.org/v0/amp-list-0.1.js"></script>
+    <script async custom-template="amp-mustache" src="https://cdn.ampproject.org/v0/amp-mustache-latest.js"></script>
     <link href='https://fonts.googleapis.com/css?family=Georgia|Open+Sans|Roboto' rel='stylesheet' type='text/css'>
     <link href="https://fonts.googleapis.com/css?family=Roboto+Condensed" rel="stylesheet">
     <title>Attachments</title>
@@ -67,8 +69,7 @@
         publisher="The AMP team"
         publisher-logo-src="/examples/visual-tests/amp-story/img/AMP-Brand-White-Icon.svg"
         poster-portrait-src="/examples/visual-tests/amp-story/img/overview.jpg"
-        title="Landscape story"
-        supports-landscape>
+        title="Attachment Story">
       <amp-story-page id="inline-default">
         <amp-story-grid-layer template="fill">
           <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat1.jpg"></amp-img>
@@ -233,6 +234,27 @@
         </amp-story-page-attachment>
       </amp-story-page>
 
+      <amp-story-page id="amp-list-of-amp-img">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat1.jpg"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <p>
+            <span data-text-background-color="#00A3DB">amp-story-page-attachment: amp-list of amp-img.</span></br></br>
+          </p>
+        </amp-story-grid-layer>
+        <amp-story-page-attachment
+          title="Lorem ipsum"
+          layout="nodisplay"
+        >
+          <amp-list src="https://afdsi.com/164189302300000061/data.json" width="auto" height="100" layout="fixed-height">
+            <template type="amp-mustache">
+              <amp-img src="{{imageUrl}}" width="160" height="160"></amp-img>
+            </template>
+          </amp-list>
+        </amp-story-page-attachment>
+      </amp-story-page>
+
       <amp-story-page id="outlink-default">
         <amp-story-grid-layer template="fill">
           <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat2.jpg"></amp-img>
@@ -248,6 +270,21 @@
         </amp-story-page-outlink>
       </amp-story-page>
 
+      <amp-story-page id="outlink-default-hash-navigation">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat2.jpg"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="center">
+          <p>
+            <span data-text-background-color="crimson">Outlink linking to another page in the same story.</span></br></br>
+          </p>
+        </amp-story-grid-layer>
+        <amp-story-page-outlink
+          layout="nodisplay">
+          <a href="http://localhost:8000/examples/amp-story/attachment.html#page=outlink-default" title="Link Description"></a>
+        </amp-story-page-outlink>
+      </amp-story-page>
+
       <amp-story-page id="outlink-custom-icon-custom-text">
         <amp-story-grid-layer template="fill">
           <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat2.jpg"></amp-img>
@@ -387,6 +424,25 @@
         </amp-story-page-attachment>
       </amp-story-page>
 
+      <amp-story-page id="legacy-attachment-hash-navigation">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat2.jpg"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="center">
+          <p>
+            <span data-text-background-color="crimson">Page attachment linking to another page in the same story.</span></br></br>
+          </p>
+        </amp-story-grid-layer>
+        <amp-story-page-attachment
+          title="Link Description"
+          data-title="Data-Title"
+          href="http://localhost:8000/examples/amp-story/attachment.html#page=legacy-attachment"
+          cta-text="Shop at Forbes"
+          data-cta-text="Data-CTA-Text"
+          layout="nodisplay">
+        </amp-story-page-attachment>
+      </amp-story-page>
+
       <amp-story-page id="last-page-no-cta">
         <amp-story-grid-layer template="fill">
           <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat1.jpg"></amp-img>
diff --git a/examples/amp-story/auto-analytics.html b/examples/amp-story/auto-analytics.html
index f366be2a4678..f67ce698eb8b 100644
--- a/examples/amp-story/auto-analytics.html
+++ b/examples/amp-story/auto-analytics.html
@@ -64,39 +64,10 @@ <h1>Page Two</h1>
           <h1>Page Three</h1>
           <a href="https://google.com">click me</a>
         </amp-story-grid-layer>
-        <amp-story-cta-layer>
-          <a>click me</a>
-        </amp-story-cta-layer>
+        <amp-story-page-outlink layout="nodisplay" href="https://google.com"></amp-story-page-outlink>
       </amp-story-page>
 
-      <amp-story-page id="p4" style="background-color: grey">
-          <amp-story-grid-layer template="vertical">
-            <h1>Page Four</h1>
-            <a id="blink-3" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="shopping-cart">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-            <a id="blink-4" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="offer">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-            <a id="blink-5" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="flight">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-            <a id="blink-6" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="hotel">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-            <a id="blink-7" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="movie">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-            <a id="blink-8" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="activity">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-            <a id="blink-9" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="more-to-read">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-          </amp-story-grid-layer>
-        </amp-story-page>
-
-      <amp-story-page id="p5">
+      <amp-story-page id="p4">
         <amp-story-grid-layer template="vertical">
           <h1>Page Five</h1>
           <amp-video
diff --git a/examples/amp-story/captions-for-container-layout.vtt b/examples/amp-story/captions-for-container-layout.vtt
new file mode 100644
index 000000000000..90a0ea961bb5
--- /dev/null
+++ b/examples/amp-story/captions-for-container-layout.vtt
@@ -0,0 +1,9 @@
+WEBVTT
+
+00:00:00.000 --> 01:00:00.000 align:start position:0%
+at<00:00:00.290><c> the</c><00:00:00.470><c> left</c><00:00:00.710><c> we</c><00:00:00.889><c> can</c><00:00:01.190><c> see</c><00:00:01.250><c> though</c><00:00:02.210><c> we</c><00:00:02.450><c> can</c><00:00:02.660><c> see</c>
+the<00:00:03.080><c> at</c><00:00:03.800><c> the</c><00:00:04.040><c> right</c><00:00:04.250><c> we</c><00:00:04.610><c> can</c><00:00:04.790><c> see</c><00:00:04.850><c> the</c><00:00:05.150><c> hats</c>
+knowledge<00:00:06.830><c> and</c><00:00:07.130><c> everything</c><00:00:07.880><c> is</c><00:00:08.060><c> safe</c>
+perfectly<00:00:08.170><c> safe</c><00:00:08.500><c> emo</c><00:00:09.779><c> emo</c>
+
+
diff --git a/examples/amp-story/cta-layer-outlink.html b/examples/amp-story/cta-layer-outlink.html
deleted file mode 100644
index 84b9eb66a76f..000000000000
--- a/examples/amp-story/cta-layer-outlink.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<!doctype html>
-<html ⚡ lang="en">
-
-<head>
-  <meta charset="utf-8">
-  <script async src="https://cdn.ampproject.org/v0.js"></script>
-  <script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
-  <title>My Story</title>
-  <meta name="description" content="Get started with amp-story">
-  <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
-  <link rel="canonical" href="grid-layer-templates.html">
-  <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
-  <style amp-custom>
-    body {
-      font-family: 'Roboto', sans-serif;
-    }
-
-    amp-story-page {
-      background: white;
-    }
-
-    .content {
-      background: #f2f2f2;
-      border: solid #ccc;
-      width: 100%;
-      height: 100%;
-      padding: 8px;
-    }
-
-    amp-story-cta-layer .button {
-      font: bold 20px Arial;
-      text-decoration: none;
-      background-color: rgba(0, 240, 248, 0.63);
-      color: #333333;
-      padding: 2px 6px 2px 6px;
-      border-top: 1px solid #CCCCCC;
-      border-right: 1px solid #333333;
-      border-bottom: 1px solid #333333;
-      border-left: 1px solid #CCCCCC;
-      width: 100%;
-      height: 100%;
-      position: absolute;
-    }
-  </style>
-</head>
-
-<body>
-  <amp-story standalone>
-
-    <amp-story-page id="fill-template-title">
-      <amp-story-grid-layer template="vertical">
-        <h1>no amp-story-cta-layer allowed on first page</h1>
-      </amp-story-grid-layer>
-    </amp-story-page>
-
-    <amp-story-page id="fill-template-example">
-      <amp-story-grid-layer template="fill">
-        <amp-img src="https://unsplash.it/800/400/" width="800" height="400"></amp-img>
-      </amp-story-grid-layer>
-      <amp-story-cta-layer>
-        <a href="http://www.google.com" class="button"> Call to action! </a>
-      </amp-story-cta-layer>
-    </amp-story-page>
-
-    <amp-story-page id="vertical-template-title">
-      <amp-story-grid-layer template="vertical">
-        <h1>vertical</h1>
-      </amp-story-grid-layer>
-      <amp-story-cta-layer>
-        <a href="http://www.google.com" class="button"> Call to action! </a>
-      </amp-story-cta-layer>
-    </amp-story-page>
-
-    <amp-story-page id="vertical-template-example-1">
-      <amp-story-grid-layer template="vertical">
-        <div class="content">A paragraph</div>
-        <div class="content">A longer paragraph</div>
-        <div class="content">A much longer paragraph</div>
-        <div class="content">The looooongest Paragraph. By far. So very very much longer.</div>
-      </amp-story-grid-layer>
-      <amp-story-cta-layer>
-        <a href="http://www.google.com" class="button"> Call to action! </a>
-      </amp-story-cta-layer>
-    </amp-story-page>
-
-    <amp-story-page id="vertical-template-example-2">
-      <amp-story-grid-layer template="vertical">
-        <div class="content">Paragraph 1</div>
-      </amp-story-grid-layer>
-      <amp-story-cta-layer>
-        <a href="http://www.google.com" class="button"> Call to action! </a>
-      </amp-story-cta-layer>
-    </amp-story-page>
-
-    <amp-story-page id="vertical-template-example-3">
-      <amp-story-grid-layer template="vertical">
-        <div class="content">Paragraph 1</div>
-        <div class="content">Paragraph 2</div>
-        <div class="content">Paragraph 3</div>
-        <div class="content">Paragraph 4</div>
-        <div class="content">Paragraph 5</div>
-        <div class="content">Paragraph 6</div>
-        <div class="content">Paragraph 7</div>
-        <div class="content">Paragraph 8</div>
-      </amp-story-grid-layer>
-      <amp-story-cta-layer>
-        <a href="http://www.google.com" class="button"> Call to action! </a>
-      </amp-story-cta-layer>
-    </amp-story-page>
-
-    <amp-story-page id="vertical-template-thirds">
-      <amp-story-grid-layer template="thirds">
-        <div class="content" grid-area="upper-third">Paragraph 1</div>
-        <div class="content" grid-area="middle-third">Paragraph 2</div>
-        <div class="content" grid-area="lower-third">Paragraph 3</div>
-      </amp-story-grid-layer>
-      <amp-story-cta-layer>
-        <a href="http://www.google.com" class="button"> Call to action! </a>
-      </amp-story-cta-layer>
-    </amp-story-page>
-
-    <amp-story-page id="horizontal-template-title">
-      <amp-story-grid-layer template="vertical">
-        <h1>horizontal</h1>
-      </amp-story-grid-layer>
-      <amp-story-cta-layer>
-        <a href="http://www.google.com" class="button"> Call to action! </a>
-      </amp-story-cta-layer>
-    </amp-story-page>
-
-    <amp-story-page id="horizontal-template-example-1">
-      <amp-story-grid-layer template="horizontal">
-        <div class="content">Paragraph 1</div>
-        <div class="content">Paragraph 2</div>
-      </amp-story-grid-layer>
-      <amp-story-cta-layer>
-        <a href="http://www.google.com" class="button"> Call to action! </a>
-      </amp-story-cta-layer>
-    </amp-story-page>
-
-    <amp-story-page id="horizontal-template-example-2">
-      <amp-story-grid-layer template="horizontal">
-        <div class="content">Paragraph 1</div>
-        <div class="content">Paragraph 2</div>
-        <div class="content">Paragraph 3</div>
-        <div class="content">Paragraph 4</div>
-        <div class="content">Paragraph 5</div>
-        <div class="content">Paragraph 6</div>
-      </amp-story-grid-layer>
-      <amp-story-cta-layer>
-        <a href="http://www.google.com" class="button"> Call to action! </a>
-      </amp-story-cta-layer>
-    </amp-story-page>
-
-  </amp-story>
-</body>
-
-</html>
diff --git a/examples/amp-story/doubleclick.html b/examples/amp-story/doubleclick.html
index a3558801d3e3..5359136e88b0 100644
--- a/examples/amp-story/doubleclick.html
+++ b/examples/amp-story/doubleclick.html
@@ -1,201 +1,169 @@
 <!doctype html>
 <html amp lang="en">
-  <head>
-    <meta charset="utf-8">
-    <script async src="https://cdn.ampproject.org/v0.js"></script>
-    <script async custom-element="amp-video" src="https://cdn.ampproject.org/v0/amp-video-0.1.js"></script>
-    <script async custom-element="amp-audio" src="https://cdn.ampproject.org/v0/amp-audio-0.1.js"></script>
-    <script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
-    <script async custom-element="amp-story-auto-ads" src="https://cdn.ampproject.org/v0/amp-story-auto-ads-0.1.js"></script>
-    <title>My Story</title>
-    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
-    <link rel="canonical" href="helloworld.html">
-    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
-    <style amp-custom>
-      body {
-        font-family: 'Roboto', sans-serif;
-      }
-      amp-story-page {
-        background: white;
-      }
-      h1 {
-        font-size: 2.875em;
-        font-weight: normal;
-        line-height: 1.174;
-        text-transform: uppercase;
-      }
-    </style>
+
+<head>
+  <meta charset="utf-8">
+  <script async src="https://cdn.ampproject.org/v0.js"></script>
+  <script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
+  <script async custom-element="amp-story-auto-ads" src="https://cdn.ampproject.org/v0/amp-story-auto-ads-0.1.js"></script>
+  <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+  <link rel="canonical" href="amp-story.amp.html">
+  <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+  <link href="https://fonts.googleapis.com/css?family=Lilita+One&display=swap" rel="stylesheet">
+  <style amp-custom>
+    amp-story-page {
+      background: slateblue;
+    }
+
+    .container {
+      justify-content: center;
+      align-content: center;
+    }
+
+    .num {
+      text-align: center;
+      color: white;
+      font-size: 300px;
+      font-family: 'Lilita One', cursive;
+    }
+  </style>
   </head>
 
   <body>
-    <amp-story
-      title="Amp-story-doubleclick"
-      publisher="The AMP Team"
-      publisher-logo-src="https://example.com/logo/1x1.png"
-      poster-portrait-src="https://example.com/my-story/poster/3x4.jpg"
-      poster-square-src="https://example.com/my-story/poster/1x1.jpg"
-      poster-landscape-src="https://example.com/my-story/poster/4x3.jpg"
-      standalone>
-
-        <amp-story-auto-ads>
-            <script type="application/json">
-              {
-                "ad-attributes": {
-                  "type": "doubleclick",
-                  "data-slot": "/30497360/a4a/amp_story_dfp_example"
+    <amp-story standalone supports-landscape>
+      <amp-story-auto-ads>
+        <script type="application/json">
+                {
+                  "ad-attributes": {
+                    "type": "doubleclick",
+                    "data-slot": "/30497360/a4a/amp_story_dfp_example"
+                  }
                 }
-              }
-            </script>
-          </amp-story-auto-ads>
+          </script>
+
+      </amp-story-auto-ads>
 
-      <amp-story-page id="cover">
-        <amp-story-grid-layer template="vertical">
-          <h1>Ads served from doubleclick</h1>
-          <p>This is the cover page.</p>
+      <amp-story-page id="page-1">
+        <amp-story-grid-layer class="container" template="vertical">
+          <p class="num">1</p>
         </amp-story-grid-layer>
       </amp-story-page>
 
-      <amp-story-page id="page-2" auto-advance-after="4s">
-        <amp-story-grid-layer template="vertical">
-          <h1>Auto advance page</h1>
-          <p>This page has auto-advance enabled</p>
+      <amp-story-page id="page-2">
+        <amp-story-grid-layer class="container" template="vertical">
+          <p class="num">2</p>
         </amp-story-grid-layer>
       </amp-story-page>
 
-      <amp-story-page id="page-3" auto-advance-after="vid1">
-        <amp-story-grid-layer template="vertical">
-          <h1>Short version of video</h1>
-          <amp-video
-            id="vid1"
-            src="../../examples/av/ForBiggerJoyrides-short.mp4"
-            width="720"
-            height="405"
-            layout="responsive"
-            controls>
-          </amp-video>
+      <amp-story-page id="page-3">
+        <amp-story-grid-layer class="container" template="vertical">
+          <p class="num">3</p>
         </amp-story-grid-layer>
       </amp-story-page>
 
-      <amp-story-page id="page-4" auto-advance-after="vid2">
-        <amp-story-grid-layer template="vertical">
-          <h1>Full length video</h1>
-          <amp-video
-            id="vid2"
-            src="../../examples/av/ForBiggerJoyrides.mp4"
-            width="720"
-            height="405"
-            layout="responsive"
-            controls>
-          </amp-video>
+      <amp-story-page id="page-4">
+        <amp-story-grid-layer class="container" template="vertical">
+          <p class="num">4</p>
         </amp-story-grid-layer>
       </amp-story-page>
 
-      <amp-story-page id="page-5" auto-advance-after="aud1">
-        <amp-story-grid-layer template="vertical">
-          <h1>Audio</h1>
-          <amp-audio
-            id="aud1"
-            src="https://storage.googleapis.com/media-session/sintel/snow-fight.mp3"
-            artwork="https://storage.googleapis.com/media-session/sintel/artwork-512.png"
-            title="Snow Fight"
-            album="Jan Morgenstern"
-            artist="Sintel"
-            height="50"
-            width="auto"
-            controls>
-          </amp-audio>
+      <amp-story-page id="page-5">
+        <amp-story-grid-layer class="container" template="vertical">
+          <p class="num">5</p>
         </amp-story-grid-layer>
       </amp-story-page>
 
-      <amp-story-page id="six">
-        <amp-story-grid-layer template="vertical">
-          <h1>six Page</h1>
+      <amp-story-page id="page-6">
+        <amp-story-grid-layer class="container" template="vertical">
+          <p class="num">6</p>
         </amp-story-grid-layer>
       </amp-story-page>
 
-      <amp-story-page id="seven">
-        <amp-story-grid-layer template="vertical">
-          <h1>seven Page</h1>
+      <amp-story-page id="page-7">
+        <amp-story-grid-layer class="container" template="vertical">
+          <p class="num">7</p>
         </amp-story-grid-layer>
       </amp-story-page>
 
-      <amp-story-page id="eight">
-        <amp-story-grid-layer template="vertical">
-          <h1>eight Page</h1>
+      <amp-story-page id="page-8">
+        <amp-story-grid-layer class="container" template="vertical">
+          <p class="num">8</p>
         </amp-story-grid-layer>
       </amp-story-page>
 
-      <amp-story-page id="nine">
-        <amp-story-grid-layer template="vertical">
-          <h1>nine Page</h1>
+      <amp-story-page id="page-9">
+        <amp-story-grid-layer class="container" template="vertical">
+          <p class="num">9</p>
         </amp-story-grid-layer>
       </amp-story-page>
 
-      <amp-story-page id="ten">
-        <amp-story-grid-layer template="vertical">
-          <h1>ten Page</h1>
+      <amp-story-page id="page-10">
+        <amp-story-grid-layer class="container" template="vertical">
+          <p class="num">10</p>
         </amp-story-grid-layer>
       </amp-story-page>
 
-      <amp-story-page id="eleven">
-        <amp-story-grid-layer template="vertical">
-          <h1>eleven Page</h1>
+      <amp-story-page id="page-11">
+        <amp-story-grid-layer class="container" template="vertical">
+          <p class="num">11</p>
         </amp-story-grid-layer>
       </amp-story-page>
 
-      <amp-story-page id="twelve">
-        <amp-story-grid-layer template="vertical">
-          <h1>twelve Page</h1>
+      <amp-story-page id="page-12">
+        <amp-story-grid-layer class="container" template="vertical">
+          <p class="num">12</p>
         </amp-story-grid-layer>
       </amp-story-page>
 
-      <amp-story-page id="thirteen">
-        <amp-story-grid-layer template="vertical">
-          <h1>thirteen Page</h1>
+      <amp-story-page id="page-13">
+        <amp-story-grid-layer class="container" template="vertical">
+          <p class="num">13</p>
         </amp-story-grid-layer>
       </amp-story-page>
 
-      <amp-story-page id="fourteen">
-        <amp-story-grid-layer template="vertical">
-          <h1>fourteen Page</h1>
+      <amp-story-page id="page-14">
+        <amp-story-grid-layer class="container" template="vertical">
+          <p class="num">14</p>
         </amp-story-grid-layer>
       </amp-story-page>
 
-      <amp-story-page id="fifteen">
-        <amp-story-grid-layer template="vertical">
-          <h1>fifteen Page</h1>
+      <amp-story-page id="page-15">
+        <amp-story-grid-layer class="container" template="vertical">
+          <p class="num">15</p>
         </amp-story-grid-layer>
       </amp-story-page>
 
-      <amp-story-page id="sixteen">
-        <amp-story-grid-layer template="vertical">
-          <h1>sixteen Page</h1>
+      <amp-story-page id="page-16">
+        <amp-story-grid-layer class="container" template="vertical">
+          <p class="num">16</p>
         </amp-story-grid-layer>
       </amp-story-page>
 
-      <amp-story-page id="seventeen">
-        <amp-story-grid-layer template="vertical">
-          <h1>seventeen Page</h1>
+      <amp-story-page id="page-17">
+        <amp-story-grid-layer class="container" template="vertical">
+          <p class="num">17</p>
         </amp-story-grid-layer>
       </amp-story-page>
 
-      <amp-story-page id="eighteen">
-        <amp-story-grid-layer template="vertical">
-          <h1>eighteen Page</h1>
+      <amp-story-page id="page-18">
+        <amp-story-grid-layer class="container" template="vertical">
+          <p class="num">18</p>
         </amp-story-grid-layer>
       </amp-story-page>
 
-      <amp-story-page id="nineteen">
-        <amp-story-grid-layer template="vertical">
-          <h1>nineteen Page</h1>
+      <amp-story-page id="page-19">
+        <amp-story-grid-layer class="container" template="vertical">
+          <p class="num">19</p>
         </amp-story-grid-layer>
       </amp-story-page>
 
-      <amp-story-page id="twenty">
-        <amp-story-grid-layer template="vertical">
-          <h1>twenty Page</h1>
+      <amp-story-page id="page-20">
+        <amp-story-grid-layer class="container" template="vertical">
+          <p class="num">20</p>
         </amp-story-grid-layer>
       </amp-story-page>
+
     </amp-story>
   </body>
-</html>
+
+  </html>
\ No newline at end of file
diff --git a/examples/amp-story/fake-ad.html b/examples/amp-story/fake-ad.html
index c1a45e5377bf..f85decef9b57 100644
--- a/examples/amp-story/fake-ad.html
+++ b/examples/amp-story/fake-ad.html
@@ -6,6 +6,7 @@
     <script async custom-element="amp-video" src="https://cdn.ampproject.org/v0/amp-video-0.1.js"></script>
     <script async custom-element="amp-audio" src="https://cdn.ampproject.org/v0/amp-audio-0.1.js"></script>
     <script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
+    <script async custom-element="amp-analytics" src="https://cdn.ampproject.org/v0/amp-analytics-0.1.js"></script>
     <script async custom-element="amp-story-auto-ads" src="https://cdn.ampproject.org/v0/amp-story-auto-ads-0.1.js"></script>
     <title>My Story</title>
     <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
@@ -28,6 +29,48 @@
   </head>
 
   <body>
+    <amp-analytics>
+      <script type="application/json">
+        {
+          "transport": {
+            "beacon": false,
+            "xhrpost": false,
+            "image": true
+          },
+          "requests": {
+            "endpoint": "https://www.cool.example",
+            "base": "${endpoint}?id=${adId}&zx=${timestamp}"
+          },
+          "triggers": {
+            "storyAdView": {
+              "on": "story-ad-view",
+              "request": "base",
+              "extraUrlParams": {"amp_stads": "view", "type": "${STORY_AD_META_amp-cta-type}"}
+            },
+            "storyAdSwipe": {
+              "on": "story-ad-swipe",
+              "request": "base",
+              "extraUrlParams": {"amp_stads": "swipe"}
+            },
+            "storyAdClick": {
+              "on": "story-ad-click",
+              "request": "base",
+              "extraUrlParams": {"amp_stads": "click"}
+            },
+            "storyAdExit": {
+              "on": "story-ad-exit",
+              "request": "base",
+              "extraUrlParams": {"amp_stads": "exit"}
+            },
+            "storyAdDestroy": {
+              "on": "story-ad-discard",
+              "request": "base",
+              "extraUrlParams": {"amp_stads": "discard"}
+            }
+          }
+        }
+      </script>
+    </amp-analytics>
     <amp-story
       title="Amp-story-doubleclick"
       publisher="The AMP Team"
diff --git a/examples/amp-story/inline_strings.html b/examples/amp-story/inline_strings.html
new file mode 100644
index 000000000000..d3b435aefde0
--- /dev/null
+++ b/examples/amp-story/inline_strings.html
@@ -0,0 +1,70 @@
+<!doctype html>
+<html ⚡ lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Interactive Story</title>
+    <link rel="canonical" href="interactives.html">
+    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+    <style amp-custom>
+      body {
+        font-family: 'Rubik', sans-serif;
+        color: white;
+      }
+
+      h1 {
+        font-size: 1rem;
+        text-align: center;
+        margin-bottom: 2rem;
+        text-shadow: 0px 2px 5px black;
+      }
+      pre {
+        text-align: center;
+      }
+      .center {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
+    </style>
+    <script>
+      window.AMP_CONFIG = {
+        v: '123',
+        test: true
+      };
+    </script>
+    <script async src="https://cdn.ampproject.org/v0.js"></script>
+    <script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
+    <script async custom-element="amp-story-page-attachment" src="https://cdn.ampproject.org/v0/amp-story-page-attachment-0.1.js"></script>
+    <link href="https://fonts.googleapis.com/css2?family=Rubik:wght@400;700&display=swap" rel="stylesheet">
+    <script amp-localization="amp-story" type=application/json i-amphtml-version="123">{"35":"INLINED-STRING"}</script>
+  </head>
+  <body>
+    <amp-story
+        standalone
+        title="Inline strings Story"
+        publisher="AMP Story testing"
+        publisher-logo-src="example.com/logo.png"
+        poster-portrait-src="example.com/poster.jpg">
+        <amp-story-page id="quiz-intl">
+          <amp-story-grid-layer template="fill">
+            <amp-img
+                src="https://images.unsplash.com/photo-1585206031773-d902d07d7480?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=925&q=80"
+                layout="responsive"
+                height="1600"
+                width="900">
+            </amp-img>
+          </amp-story-grid-layer>
+          <amp-story-grid-layer class="center">
+            <div>
+              <h1 class="title">The attachment should say "INLINED-STRING"</h1>
+              <pre><b>inlined strings:</b><br>{"35": "INLINED-STRING"}</pre>
+            </div>
+          </amp-story-grid-layer>
+          <amp-story-page-attachment title="Lorem ipsum" layout="nodisplay">
+            <p>This is a page attachment</p>
+          </amp-story-page-attachment>
+        </amp-story-page>
+    </amp-story>
+  </body>
+</html>
diff --git a/examples/amp-story/interactives.html b/examples/amp-story/interactives.html
index ff1656fa3e8e..4df91bd9f69b 100644
--- a/examples/amp-story/interactives.html
+++ b/examples/amp-story/interactives.html
@@ -84,7 +84,6 @@ <h2>What is the best story ever?</h2>
             </amp-img>
           </amp-story-grid-layer>
           <amp-story-grid-layer template="center">
-
             <amp-story-interactive-quiz
                 id="first-cup-dark"
                 endpoint="https://webstoriesinteractivity-beta.web.app/api/v1"
@@ -98,6 +97,10 @@ <h2>What is the best story ever?</h2>
                 option-4-text="Brazil">
             </amp-story-interactive-quiz>
           </amp-story-grid-layer>
+          <amp-story-grid-layer template="center">
+            <!-- Add div in front, should not be clickable (but the quiz behind should) -->
+            <div style="display: flex; align-items: center; justify-content: center"><p>🇺🇾</p></div>
+          </amp-story-grid-layer>
         </amp-story-page>
         <amp-story-page id="quiz-1b">
           <amp-story-grid-layer template="fill">
diff --git a/examples/amp-story/mgid.html b/examples/amp-story/mgid.html
new file mode 100644
index 000000000000..6d0054c52b16
--- /dev/null
+++ b/examples/amp-story/mgid.html
@@ -0,0 +1,167 @@
+<!doctype html>
+<html amp lang="en">
+<head>
+  <meta charset="utf-8">
+  <script async src="https://cdn.ampproject.org/v0.js"></script>
+  <script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
+  <script async custom-element="amp-story-auto-ads" src="https://cdn.ampproject.org/v0/amp-story-auto-ads-0.1.js"></script>
+  <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+  <link rel="canonical" href="mgid.html">
+  <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+  <link href="https://fonts.googleapis.com/css?family=Lilita+One&display=swap" rel="stylesheet">
+  <style amp-custom>
+    amp-story-page {
+      background: CadetBlue;
+    }
+
+    .container {
+      justify-content: center;
+      align-content: center;
+    }
+
+    .num {
+      text-align: center;
+      color: white;
+      font-size: 300px;
+    }
+  </style>
+</head>
+
+<body>
+<amp-story standalone supports-landscape>
+  <amp-story-auto-ads>
+    <script type="application/json">
+      {
+        "ad-attributes": {
+          "type": "mgid",
+          "data-widget": 1392080
+        }
+      }
+    </script>
+
+  </amp-story-auto-ads>
+
+  <amp-story-page id="page-1">
+    <amp-story-grid-layer class="container" template="vertical">
+      <p class="num">1</p>
+    </amp-story-grid-layer>
+  </amp-story-page>
+
+  <amp-story-page id="page-2">
+    <amp-story-grid-layer class="container" template="vertical">
+      <p class="num">2</p>
+    </amp-story-grid-layer>
+  </amp-story-page>
+
+  <amp-story-page id="page-3">
+    <amp-story-grid-layer class="container" template="vertical">
+      <p class="num">3</p>
+    </amp-story-grid-layer>
+  </amp-story-page>
+
+  <amp-story-page id="page-4">
+    <amp-story-grid-layer class="container" template="vertical">
+      <p class="num">4</p>
+    </amp-story-grid-layer>
+  </amp-story-page>
+
+  <amp-story-page id="page-5">
+    <amp-story-grid-layer class="container" template="vertical">
+      <p class="num">5</p>
+    </amp-story-grid-layer>
+  </amp-story-page>
+
+  <amp-story-page id="page-6">
+    <amp-story-grid-layer class="container" template="vertical">
+      <p class="num">6</p>
+    </amp-story-grid-layer>
+  </amp-story-page>
+
+  <amp-story-page id="page-7">
+    <amp-story-grid-layer class="container" template="vertical">
+      <p class="num">7</p>
+    </amp-story-grid-layer>
+  </amp-story-page>
+
+  <amp-story-page id="page-8">
+    <amp-story-grid-layer class="container" template="vertical">
+      <p class="num">8</p>
+    </amp-story-grid-layer>
+  </amp-story-page>
+
+  <amp-story-page id="page-9">
+    <amp-story-grid-layer class="container" template="vertical">
+      <p class="num">9</p>
+    </amp-story-grid-layer>
+  </amp-story-page>
+
+  <amp-story-page id="page-10">
+    <amp-story-grid-layer class="container" template="vertical">
+      <p class="num">10</p>
+    </amp-story-grid-layer>
+  </amp-story-page>
+
+  <amp-story-page id="page-11">
+    <amp-story-grid-layer class="container" template="vertical">
+      <p class="num">11</p>
+    </amp-story-grid-layer>
+  </amp-story-page>
+
+  <amp-story-page id="page-12">
+    <amp-story-grid-layer class="container" template="vertical">
+      <p class="num">12</p>
+    </amp-story-grid-layer>
+  </amp-story-page>
+
+  <amp-story-page id="page-13">
+    <amp-story-grid-layer class="container" template="vertical">
+      <p class="num">13</p>
+    </amp-story-grid-layer>
+  </amp-story-page>
+
+  <amp-story-page id="page-14">
+    <amp-story-grid-layer class="container" template="vertical">
+      <p class="num">14</p>
+    </amp-story-grid-layer>
+  </amp-story-page>
+
+  <amp-story-page id="page-15">
+    <amp-story-grid-layer class="container" template="vertical">
+      <p class="num">15</p>
+    </amp-story-grid-layer>
+  </amp-story-page>
+
+  <amp-story-page id="page-16">
+    <amp-story-grid-layer class="container" template="vertical">
+      <p class="num">16</p>
+    </amp-story-grid-layer>
+  </amp-story-page>
+
+  <amp-story-page id="page-17">
+    <amp-story-grid-layer class="container" template="vertical">
+      <p class="num">17</p>
+    </amp-story-grid-layer>
+  </amp-story-page>
+
+  <amp-story-page id="page-18">
+    <amp-story-grid-layer class="container" template="vertical">
+      <p class="num">18</p>
+    </amp-story-grid-layer>
+  </amp-story-page>
+
+  <amp-story-page id="page-19">
+    <amp-story-grid-layer class="container" template="vertical">
+      <p class="num">19</p>
+    </amp-story-grid-layer>
+  </amp-story-page>
+
+  <amp-story-page id="page-20">
+    <amp-story-grid-layer class="container" template="vertical">
+      <p class="num">20</p>
+    </amp-story-grid-layer>
+  </amp-story-page>
+
+</amp-story>
+</body>
+
+</html>
diff --git a/examples/amp-story/performance/lcp-compressed.html b/examples/amp-story/performance/lcp-compressed.html
index 17a539a2e4b5..940ba9d5e6c9 100644
--- a/examples/amp-story/performance/lcp-compressed.html
+++ b/examples/amp-story/performance/lcp-compressed.html
@@ -50,12 +50,6 @@
   </style>
 </head>
   <body>
-    <script>
-      const loadFirst = location.hash.includes('load=first');
-      (self.AMP = self.AMP || []).push(function(AMP) {
-        AMP.toggleExperiment('story-load-first-page-only', loadFirst);
-      });
-    </script>
     <amp-story standalone id="cats"
         title="LCP test" publisher="The AMP team"
         publisher-logo-src="./img/amplogo.png"
diff --git a/examples/amp-story/performance/lcp.html b/examples/amp-story/performance/lcp.html
index c5a4d9ef30a4..78fe6fc363fa 100644
--- a/examples/amp-story/performance/lcp.html
+++ b/examples/amp-story/performance/lcp.html
@@ -50,12 +50,6 @@
   </style>
 </head>
   <body>
-    <script>
-      const loadFirst = location.hash.includes('load=first');
-      (self.AMP = self.AMP || []).push(function(AMP) {
-        AMP.toggleExperiment('story-load-first-page-only', loadFirst);
-      });
-    </script>
     <amp-story standalone id="cats"
         title="LCP test" publisher="The AMP team"
         publisher-logo-src="./img/amplogo.png"
diff --git a/examples/amp-story/player-cross-origin-copy-link.html b/examples/amp-story/player-cross-origin-copy-link.html
new file mode 100644
index 000000000000..95460fc612de
--- /dev/null
+++ b/examples/amp-story/player-cross-origin-copy-link.html
@@ -0,0 +1,21 @@
+<!doctype html>
+<html ⚡>
+<head>
+  <meta charset="utf-8">
+  <title>Integrate stories in AMP pages - Example 1</title>
+  <meta name="viewport" content="width=device-width">
+  <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+
+  <script async src="https://cdn.ampproject.org/v0.js"></script>
+  <script
+    async
+    custom-element="amp-story-player"
+    src="https://cdn.ampproject.org/v0/amp-story-player-0.1.js"
+  ></script>
+</head>
+<body>
+  <amp-story-player layout="fixed" width="360" height="600">
+    <a href="http://localhost:8000/examples/amp-story/share.html"></a>
+  </amp-story-player>
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/amp-story/player-local-stories.html b/examples/amp-story/player-local-stories.html
index 6f20dcf2e961..d24530c2eb4d 100644
--- a/examples/amp-story/player-local-stories.html
+++ b/examples/amp-story/player-local-stories.html
@@ -36,8 +36,10 @@
     <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
   </head>
   <body>
-    <h1>This is a NON-AMP page that embeds a story below:</h1>
+    <h1>This is a NON-AMP page that embeds story players!</h1>
     <div>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras viverra neque ex, sit amet varius sem maximus sed. Suspendisse potenti. Donec erat purus, sagittis sit amet tincidunt ut, maximus sit amet massa. Maecenas venenatis fringilla dui vitae vestibulum. Fusce imperdiet euismod lobortis. Nullam sagittis nunc at tristique mattis. In sodales consectetur mollis. Maecenas sollicitudin, ex vel tempor rutrum, turpis eros interdum enim, sit amet volutpat tortor dolor at ipsum. Nam posuere velit vel urna vulputate interdum. Aenean eu vulputate lorem. Praesent nec nunc sodales, egestas orci sed, hendrerit mauris. Ut blandit turpis non erat sagittis, quis fermentum odio feugiat.</div>
+
+    <h1>Below demonstrates a fixed width(full screen mode) embedded player: </h1>
     <amp-story-player style="width: 360px; height: 600px;">
         <a href="./ampconf.html">
           <img src="./img/overview.jpg" loading="lazy" data-amp-story-player-poster-img width="360" height="600"></img>
@@ -54,5 +56,26 @@ <h1>This is a NON-AMP page that embeds a story below:</h1>
         </a>
     </amp-story-player>
     <div>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras viverra neque ex, sit amet varius sem maximus sed. Suspendisse potenti. Donec erat purus, sagittis sit amet tincidunt ut, maximus sit amet massa. Maecenas venenatis fringilla dui vitae vestibulum. Fusce imperdiet euismod lobortis. Nullam sagittis nunc at tristique mattis. In sodales consectetur mollis. Maecenas sollicitudin, ex vel tempor rutrum, turpis eros interdum enim, sit amet volutpat tortor dolor at ipsum. Nam posuere velit vel urna vulputate interdum. Aenean eu vulputate lorem. Praesent nec nunc sodales, egestas orci sed, hendrerit mauris. Ut blandit turpis non erat sagittis, quis fermentum odio feugiat.</div>
+
+    <h1>Below demonstrates a dynamic width(full screen or panel mode) embedded player: </h1>
+    <amp-story-player style="width: 100%; height: 600px;">
+      <a href="./amp-story-desktop-custom-aspect-ratio.html">
+        <img src="./img/overview.jpg" loading="lazy" data-amp-story-player-poster-img width="360" height="600"></img>
+        <span class="title">A local’s guide to what to eat and do in New York City</span>
+      </a>
+      <a href="./ampconf.html">
+        <img src="./img/overview.jpg" loading="lazy" data-amp-story-player-poster-img width="360" height="600"></img>
+        <span class="title">A local’s guide to what to eat and do in New York City</span>
+      </a>
+      <a href="./attachment.html">
+        <span class="title">A local’s guide to what to eat and do in Miami</span>
+      </a>
+      <a href="./videos.html">
+        <span class="title">A local’s guide to what to eat and do in Mexico City</span>
+      </a>
+      <a href="./amp-story-animation.html">
+        <span class="title">A local’s guide to what to eat and do in Rome</span>
+      </a>
+  </amp-story-player>
   </body>
 </html>
diff --git a/examples/amp-story/player.html b/examples/amp-story/player.html
index 9fe854eea839..ab3cd0167b75 100644
--- a/examples/amp-story/player.html
+++ b/examples/amp-story/player.html
@@ -81,36 +81,28 @@ <h1>This is a NON-AMP page that embeds a story below:</h1>
       <amp-story-player style="width: 360px; height: 600px;">
         <a href="https://www-washingtonpost-com.cdn.ampproject.org/v/s/www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-new-york-city/"
             class="story">
-          <img data-amp-story-player-poster-img src="https://www-washingtonpost-com.cdn.ampproject.org/i/s/www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-new-york-city/img/promo3x4.jpg" width="360" height="600" loading="lazy">
-          <span class="title">A local’s guide to what to eat and do in New York City</span>
+          <span class="title">New York City local guide</span>
         </a>
-        <a href="https://www-washingtonpost-com.cdn.ampproject.org/v/s/www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-miami/">
-          <img data-amp-story-player-poster-img src="https://www-washingtonpost-com.cdn.ampproject.org/i/s/www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-miami/img/promo3x4.jpg" width="360" height="600" loading="lazy">
-          <span class="title">A local’s guide to what to eat and do in Miami</span>
+        <a href="https://wp.stories.google/stories/a-taste-of-new-york-pizza-history/">
+          <span class="title">Pizza Pizza Pizza</span>
         </a>
-        <a href="https://www-washingtonpost-com.cdn.ampproject.org/v/s/www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-mexico-city/">
-          <img data-amp-story-player-poster-img src="https://www-washingtonpost-com.cdn.ampproject.org/i/s/www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-mexico-city/img/promo3x4.jpg" width="360" height="600" loading="lazy">
-          <span class="title">A local’s guide to what to eat and do in Mexico City</span>
+        <a href="https://www-washingtonpost-com.cdn.ampproject.org/v/s/www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-miami/">
+          <span class="title">Miami local guide</span>
         </a>
         <a href="https://www-washingtonpost-com.cdn.ampproject.org/v/s/www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-rome/">
-          <img data-amp-story-player-poster-img src="https://www-washingtonpost-com.cdn.ampproject.org/i/s/www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-rome/img/promo3x4.jpg" width="360" height="600" loading="lazy">
-          <span class="title">A local’s guide to what to eat and do in Rome</span>
+          <span class="title">Rome local guide</span>
         </a>
       </amp-story-player>
 
       <div class="actions">
         <div class="circle active"
-            data-story="https://www-washingtonpost-com.cdn.ampproject.org/v/s/www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-new-york-city/"
-            style="background-image: url('https://www-washingtonpost-com.cdn.ampproject.org/i/s/www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-new-york-city/img/42a59562-834d-11e9-b585-e36b16a531aa.jpg')">New York</div>
+            data-story="https://www-washingtonpost-com.cdn.ampproject.org/v/s/www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-new-york-city/">New York</div>
         <div class="circle"
-            data-story="https://www-washingtonpost-com.cdn.ampproject.org/v/s/www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-miami/"
-            style="background-image: url('https://www-washingtonpost-com.cdn.ampproject.org/i/s/www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-miami/img/9f1d2656-6b7a-11e9-bbe7-1c798fb80536.jpg')">Miami</div>
+            data-story="https://wp.stories.google/stories/a-taste-of-new-york-pizza-history/">Pizza</div>
         <div class="circle"
-            data-story="https://www-washingtonpost-com.cdn.ampproject.org/v/s/www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-mexico-city/"
-            style="background-image: url('https://www-washingtonpost-com.cdn.ampproject.org/i/s/www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-mexico-city/img/2e0f5178-746c-11e9-9331-30bc5836f48e.jpg')">Mexico City</div>
+            data-story="https://www-washingtonpost-com.cdn.ampproject.org/v/s/www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-miami/">Miami</div>
         <div class="circle"
-            data-story="https://www-washingtonpost-com.cdn.ampproject.org/v/s/www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-rome/"
-            style="background-image: url('https://www-washingtonpost-com.cdn.ampproject.org/i/s/www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-rome/img/f5903e2e-86fa-11e9-9d73-e2ba6bbf1b9b.jpg')">Rome</div>
+            data-story="https://www-washingtonpost-com.cdn.ampproject.org/v/s/www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-rome/">Rome</div>
       </div>
     </div>
     <div>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras viverra neque ex, sit amet varius sem maximus sed. Suspendisse potenti. Donec erat purus, sagittis sit amet tincidunt ut, maximus sit amet massa. Maecenas venenatis fringilla dui vitae vestibulum. Fusce imperdiet euismod lobortis. Nullam sagittis nunc at tristique mattis. In sodales consectetur mollis. Maecenas sollicitudin, ex vel tempor rutrum, turpis eros interdum enim, sit amet volutpat tortor dolor at ipsum. Nam posuere velit vel urna vulputate interdum. Aenean eu vulputate lorem. Praesent nec nunc sodales, egestas orci sed, hendrerit mauris. Ut blandit turpis non erat sagittis, quis fermentum odio feugiat.</div>
diff --git a/examples/amp-story/rtl.html b/examples/amp-story/rtl.html
index e8ac47dda8fc..8c148e26bad1 100644
--- a/examples/amp-story/rtl.html
+++ b/examples/amp-story/rtl.html
@@ -112,7 +112,7 @@
           {
             "ad-attributes": {
               "type": "custom",
-              "data-url": "https://ampbyexample.com/json/amp-story-auto-ads/"
+              "data-url": "https://amp.dev/static/samples/json/amp-story-auto-ads-0.json"
             }
           }
         </script>
@@ -292,11 +292,11 @@ <h1 class="bold">Improve conversions with fast, user-friendly experiences</h1>
         <amp-story-grid-layer template="thirds" class="bottom">
           <h1 grid-area="middle-third" class="bold">Join the worldwide AMP Roadshow</h1>
         </amp-story-grid-layer>
-        <amp-story-cta-layer>
+        <amp-story-page-outlink layout="nodisplay">
           <a href="https://www.ampproject.org/amp-roadshow/" class="button medium center">
             <p class="twenty-px">Sign up Now</p>
           </a>
-        </amp-story-cta-layer>
+        </amp-story-page-outlink>
       </amp-story-page>
     </amp-story>
   </body>
diff --git a/examples/amp-story/share.html b/examples/amp-story/share.html
index 8879898b5212..100538ed1ad4 100644
--- a/examples/amp-story/share.html
+++ b/examples/amp-story/share.html
@@ -5,6 +5,10 @@
     <script async src="https://cdn.ampproject.org/v0.js"></script>
     <script async custom-element="amp-story"
         src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
+    <script async custom-element="amp-story-share-menu"
+        src="https://cdn.ampproject.org/v0/amp-story-share-menu-0.1.js"></script>
+    <script async custom-element="amp-analytics"
+        src="https://cdn.ampproject.org/v0/amp-analytics-0.1.js"></script>
     <title>My Story</title>
     <meta name="viewport"
           content="width=device-width,minimum-scale=1,initial-scale=1">
@@ -30,10 +34,42 @@
       poster-landscape-src="https://example.com/my-story/poster/4x3.jpg"
       standalone>
 
+      <amp-analytics id="analytics1">
+        <script type="application/json">
+          {
+            "requests": {
+              "endpoint": "https://raw.githubusercontent.com/ampproject/amphtml/main/examples/img/ampicon.png",
+              "base": "${endpoint}?${type|default:foo}&path=${canonicalPath}",
+              "share": "${base}?&index=${storyPageIndex}&id=${storyPageId}",
+              "pageView": "${base}?&index=${storyPageIndex}&count=${storyPageCount}&id=${storyPageId}&muted=${storyIsMuted}&progress=${storyProgress}"
+            },
+            "triggers": {
+              "trackShare": {
+                "on": "story-open",
+                "tagName": "amp-story-share-menu",
+                "request": "share"
+              }
+            }
+          }
+        </script>
+      </amp-analytics>
+
       <amp-story-page id="cover">
         <amp-story-grid-layer template="vertical">
           <h1>Check the share providers</h1>
-          <h2>Should show Facebook and Whatsapp</h2>
+          <h2>Should show:</h2>
+          <ol>
+            <li>Copy link</li>
+            <li>Twitter</li>
+            <li>Facebook</li>
+            <li>Pinterest</li>
+            <li>Linkedin</li>
+            <li>Tumblr</li>
+            <li>Email</li>
+            <li>Whataspp</li>
+            <li>Line</li>
+            <li>SMS</li>
+          </ol>
         </amp-story-grid-layer>
       </amp-story-page>
 
@@ -41,8 +77,16 @@ <h2>Should show Facebook and Whatsapp</h2>
         <script type="application/json">
           {
             "shareProviders": [
+              "twitter",
               "facebook",
-              "whatsapp"
+              "pinterest",
+              "linkedin",
+              "tumblr",
+              "gplus",
+              "email",
+              "whatsapp",
+              "line",
+              "sms"
             ]
           }
         </script>
diff --git a/examples/amp-story/shopping/product.schema.json b/examples/amp-story/shopping/product.schema.json
new file mode 100644
index 000000000000..a3414ff68ec1
--- /dev/null
+++ b/examples/amp-story/shopping/product.schema.json
@@ -0,0 +1,283 @@
+{
+  "title": "Product",
+  "description": "A product from an amp-story-shopping configuration.",
+  "type": "object",
+  "additionalProperties": false,
+  "properties": {
+    "productId": {
+      "description": "Keys for amp-story-shopping-tag nodes, sent out in analytics events.",
+      "type": "string"
+    },
+    "productUrl": {
+      "description": "Links to the product's website, when the buy now button is clicked.",
+      "type": "string",
+      "$ref": "#/$defs/https"
+    },
+    "productTitle": {
+      "description": "The name of the product, displayed on the tag.",
+      "type": "string"
+    },
+    "productPrice": {
+      "description": "The price of the product, displayed on the tag.",
+      "type": "number"
+    },
+    "productPriceCurrency": {
+      "description": "The ISO 4217 currency code of the product price.",
+      "type": "string",
+      "enum": [
+        "AED",
+        "AFN",
+        "ALL",
+        "AMD",
+        "ANG",
+        "AOA",
+        "ARS",
+        "AUD",
+        "AWG",
+        "AZN",
+        "BAM",
+        "BBD",
+        "BDT",
+        "BGN",
+        "BHD",
+        "BIF",
+        "BMD",
+        "BND",
+        "BOB",
+        "BOV",
+        "BRL",
+        "BSD",
+        "BTN",
+        "BWP",
+        "BYN",
+        "BZD",
+        "CAD",
+        "CDF",
+        "CHE",
+        "CHF",
+        "CHW",
+        "CLF",
+        "CLP",
+        "CNY",
+        "COP",
+        "COU",
+        "CRC",
+        "CUC",
+        "CUP",
+        "CVE",
+        "CZK",
+        "DJF",
+        "DKK",
+        "DOP",
+        "DZD",
+        "EGP",
+        "ERN",
+        "ETB",
+        "EUR",
+        "FJD",
+        "FKP",
+        "GBP",
+        "GEL",
+        "GHS",
+        "GIP",
+        "GMD",
+        "GNF",
+        "GTQ",
+        "GYD",
+        "HKD",
+        "HNL",
+        "HRK",
+        "HTG",
+        "HUF",
+        "IDR",
+        "ILS",
+        "INR",
+        "IQD",
+        "IRR",
+        "ISK",
+        "JMD",
+        "JOD",
+        "JPY",
+        "KES",
+        "KGS",
+        "KHR",
+        "KMF",
+        "KPW",
+        "KRW",
+        "KWD",
+        "KYD",
+        "KZT",
+        "LAK",
+        "LBP",
+        "LKR",
+        "LRD",
+        "LSL",
+        "LYD",
+        "MAD",
+        "MDL",
+        "MGA",
+        "MKD",
+        "MMK",
+        "MNT",
+        "MOP",
+        "MRU",
+        "MUR",
+        "MVR",
+        "MWK",
+        "MXN",
+        "MXV",
+        "MYR",
+        "MZN",
+        "NAD",
+        "NGN",
+        "NIO",
+        "NOK",
+        "NPR",
+        "NZD",
+        "OMR",
+        "PAB",
+        "PEN",
+        "PGK",
+        "PHP",
+        "PKR",
+        "PLN",
+        "PYG",
+        "QAR",
+        "RON",
+        "RSD",
+        "RUB",
+        "RWF",
+        "SAR",
+        "SBD",
+        "SCR",
+        "SDG",
+        "SEK",
+        "SGD",
+        "SHP",
+        "SLL",
+        "SOS",
+        "SRD",
+        "SSP",
+        "STN",
+        "SVC",
+        "SYP",
+        "SZL",
+        "THB",
+        "TJS",
+        "TMT",
+        "TND",
+        "TOP",
+        "TRY",
+        "TTD",
+        "TWD",
+        "TZS",
+        "UAH",
+        "UGX",
+        "USD",
+        "USN",
+        "UYI",
+        "UYU",
+        "UYW",
+        "UZS",
+        "VED",
+        "VES",
+        "VND",
+        "VUV",
+        "WST",
+        "XAF",
+        "XAG",
+        "XAU",
+        "XBA",
+        "XBB",
+        "XBC",
+        "XBD",
+        "XCD",
+        "XDR",
+        "XOF",
+        "XPD",
+        "XPF",
+        "XPT",
+        "XSU",
+        "XTS",
+        "XUA",
+        "XXX",
+        "YER",
+        "ZAR",
+        "ZMW",
+        "ZWL"
+      ]
+    },
+    "productImages": {
+      "description": "A list of images for the product used in the carousel of the product page.",
+      "type": "array",
+      "minItems": 1,
+      "items": {
+        "required": ["url", "alt"],
+        "additionalProperties": false,
+        "type": "object",
+        "properties": {
+          "url": {
+            "type": "string",
+            "$ref": "#/$defs/https"
+          },
+          "alt": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "productDetails": {
+      "description": "Details about the product used in the product details page.",
+      "type": "string"
+    },
+    "productBrand": {
+      "description": "Brand name of the product used in the tag.",
+      "type": "string"
+    },
+    "productIcon": {
+      "description": "Links the icon image for the product in the tag. Defaults to a shopping bag icon.",
+      "type": "string"
+    },
+    "productTagText": {
+      "description": "Text for the Product tag. Supersedes productPrice.",
+      "type": "string"
+    },
+    "aggregateRating": {
+      "description": "Ratings and review data for the product displayed on the product page.",
+      "type": "object",
+      "required": ["ratingValue", "reviewCount", "reviewUrl"],
+      "additionalProperties": false,
+      "properties": {
+        "ratingValue": {
+          "description": "The aggregate rating value of the product.",
+          "type": "number"
+        },
+        "reviewCount": {
+          "description": "The number of reviews for the product.",
+          "type": "number"
+        },
+        "reviewUrl": {
+          "description": "The Url for the product reviews.",
+          "type": "string",
+          "$ref": "#/$defs/https"
+        }
+      }
+    }
+  },
+  "required": [
+    "productId",
+    "productUrl",
+    "productTitle",
+    "productPrice",
+    "productPriceCurrency",
+    "productImages",
+    "productDetails"
+  ],
+  "$defs": {
+    "https": {
+      "type": "string",
+      "format": "uri-reference",
+      "pattern": "^(/|https://|https?://(127.0.0.1|([^/]+\\.)?localhost)(:[0-9]+)?/)"
+    }
+  }
+}
diff --git a/examples/amp-story/shopping/remote.json b/examples/amp-story/shopping/remote.json
new file mode 100644
index 000000000000..e93e1098c4c3
--- /dev/null
+++ b/examples/amp-story/shopping/remote.json
@@ -0,0 +1,24 @@
+{
+  "items": [
+    {
+      "productUrl": "https://www.google.com",
+      "productId": "art",
+      "productTitle": "Abstract Art",
+      "productBrand": "V. Artsy",
+      "productPrice": 1200.0,
+      "productPriceCurrency": "JPY",
+      "productImages": [
+        {
+          "url": "/examples/visual-tests/unsplash.photos/BdVQU-NDtA8_500x500.jpg",
+          "alt": "art"
+        }
+      ],
+      "aggregateRating": {
+        "ratingValue": 4.4,
+        "reviewCount": 89,
+        "reviewUrl": "https://www.google.com"
+      },
+      "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto exped. Laborum ea molestias veritatis sint laudantium iusto exped."
+    }
+  ]
+}
diff --git a/examples/amp-story/text-background-color.html b/examples/amp-story/text-background-color.html
index cf4878790942..022eefc97322 100644
--- a/examples/amp-story/text-background-color.html
+++ b/examples/amp-story/text-background-color.html
@@ -61,7 +61,7 @@ <h2 grid-area="lower-third">
             <h1 data-text-background-color="plum">Full block background color</h1>
             <h2><span data-text-background-color="mediumvioletred">Text only background color because I'm in a &lt;span&gt;</span></h5>
       </amp-story-grid-layer>
-      <amp-story-cta-layer>
+      <amp-story-page-outlink layout="nodisplay">
         <a href="https://amp.dev" class="button" data-text-background-color="plum">
           <p>
             Call to action example
@@ -72,7 +72,7 @@ <h2><span data-text-background-color="mediumvioletred">Text only background colo
             </span>
           </p>
         </a>
-      </amp-story-cta-layer>
+      </amp-story-page-outlink>
     </amp-story-page>
 
     <amp-story-page id="page-attachment-example">
diff --git a/examples/amp-story/video/ecommerce.vtt b/examples/amp-story/video/ecommerce.vtt
index 62a45a19b50d..bad4b6a1fe91 100644
--- a/examples/amp-story/video/ecommerce.vtt
+++ b/examples/amp-story/video/ecommerce.vtt
@@ -1,20 +1,20 @@
 WEBVTT
 
 00:00.000 --> 00:00.500
-<v Lisa Wang>(Lisa Wang)
-<v Lisa Wang>I'm Lisa.
+<v Lisa Wang>(Lisa Wang)</v>
+<v Lisa Wang>I'm Lisa.</v>
 
 00:00.500 --> 00:02.000
-<v Lisa Wang>I'm a product manager at Google.
+<v Lisa Wang>I'm a product manager at Google.</v>
 
 00:02.000 --> 00:04.500
-<v Lisa Wang>And I lead our e-commerce initiatives.
+<v Lisa Wang>And I lead our e-commerce initiatives.</v>
 
 00:04.500 --> 00:05.500
-<v Lisa Wang>And today I'm just going to walk
+<v Lisa Wang>And today I'm just going to walk</v>
 
 00:05.500 --> 00:07.500
-<v Lisa Wang>through some of our best practices
+<v Lisa Wang>through some of our best practices</v>
 
 00:07.500 --> 00:10.000
-<v Lisa Wang>for building e-commerce experiences in AMP.
+<v Lisa Wang>for building e-commerce experiences in AMP.</v>
diff --git a/examples/amp-story/video/gmail.vtt b/examples/amp-story/video/gmail.vtt
index a3d658f8dfee..8fab2f583db8 100644
--- a/examples/amp-story/video/gmail.vtt
+++ b/examples/amp-story/video/gmail.vtt
@@ -1,23 +1,23 @@
 WEBVTT
 
 00:00.000 --> 00:01.500
-<v Aakash Sahney>(Aakash Sahney)
-<v Aakash Sahney>and I'm really excited to share more
+<v Aakash Sahney>(Aakash Sahney)</v>
+<v Aakash Sahney>and I'm really excited to share more</v>
 
 00:01.500 --> 00:03.500
-<v Aakash Sahney>about the announcement we made earlier today,
+<v Aakash Sahney>about the announcement we made earlier today,</v>
 
 00:03.500 --> 00:06.000
-<v Aakash Sahney>which is like a whole new way to use AMP.
+<v Aakash Sahney>which is like a whole new way to use AMP.</v>
 
 00:06.000 --> 00:08.500
-<v Aakash Sahney>We're going to talk about what's possible with AMP for email,
+<v Aakash Sahney>We're going to talk about what's possible with AMP for email,</v>
 
 00:08.500 --> 00:11.000
-<v Aakash Sahney>show off some super slick demos from the three partners
+<v Aakash Sahney>show off some super slick demos from the three partners</v>
 
 00:11.000 --> 00:13.500
-<v Aakash Sahney>that Paul just mentioned, and tell you a bit about how
+<v Aakash Sahney>that Paul just mentioned, and tell you a bit about how</v>
 
 00:13.500 --> 00:15.000
-<v Aakash Sahney>you can get started.
\ No newline at end of file
+<v Aakash Sahney>you can get started.</v>
\ No newline at end of file
diff --git a/examples/amp-story/video/p1.vtt b/examples/amp-story/video/p1.vtt
index 71ae951c12eb..a9acfc67004c 100644
--- a/examples/amp-story/video/p1.vtt
+++ b/examples/amp-story/video/p1.vtt
@@ -3,33 +3,33 @@ WEBVTT
 NOTE Malte Ubl on AMP stories
 
 00:00.000 --> 00:02.500
-<v Malte Ubl>(Malte Ubl)
-<v Malte Ubl>...and there's going to be surfacing of these stories
+<v Malte Ubl>(Malte Ubl)</v>
+<v Malte Ubl>...and there's going to be surfacing of these stories</v>
 
 00:02.500 --> 00:04.000
-<v Malte Ubl>(Malte Ubl)
-<v Malte Ubl>in Google Search.
+<v Malte Ubl>(Malte Ubl)</v>
+<v Malte Ubl>in Google Search.</v>
 
 NOTE Lisa Wang on AMP Toolbox Optimizer
 
 00:04.500 --> 00:06.000
-<v Lisa Wang>(Lisa Wang)
-<v Lisa Wang>So I'm also really excited to announce today
+<v Lisa Wang>(Lisa Wang)</v>
+<v Lisa Wang>So I'm also really excited to announce today</v>
 
 00:06.000 --> 00:09.000
-<v Lisa Wang>(Lisa Wang)
-<v Lisa Wang>that we're releasing the AMP Toolbox Optimizer, which
+<v Lisa Wang>(Lisa Wang)</v>
+<v Lisa Wang>that we're releasing the AMP Toolbox Optimizer, which</v>
 
 00:09.000 --> 00:12.000
-<v Lisa Wang>(Lisa Wang)
-<v Lisa Wang>is basically a toolkit that developers can use to optimize...
+<v Lisa Wang>(Lisa Wang)</v>
+<v Lisa Wang>is basically a toolkit that developers can use to optimize...</v>
 
 NOTE Aakash Sahney on AMP for email
 
 00:06.000 --> 00:08.500
-<v Aakash Sahney>(Aakash Sahney)
-<v Aakash Sahney>So with AMP for email, users can quickly take actions on things
+<v Aakash Sahney>(Aakash Sahney)</v>
+<v Aakash Sahney>So with AMP for email, users can quickly take actions on things</v>
 
 00:08.500 --> 00:11.000
-<v Aakash Sahney>(Aakash Sahney)
-<v Aakash Sahney>like RSVP'ing to an event.
+<v Aakash Sahney>(Aakash Sahney)</v>
+<v Aakash Sahney>like RSVP'ing to an event.</v>
diff --git a/examples/amp-story/video/stamp.vtt b/examples/amp-story/video/stamp.vtt
index 2befa4794337..f4302f823ffc 100644
--- a/examples/amp-story/video/stamp.vtt
+++ b/examples/amp-story/video/stamp.vtt
@@ -1,26 +1,26 @@
 WEBVTT
 
 00:00.000 --> 00:02.000
-<v Jon Newmuis>(Jon Newmuis)
-<v Jon Newmuis>So today, we're excited to announce the developer
+<v Jon Newmuis>(Jon Newmuis)</v>
+<v Jon Newmuis>So today, we're excited to announce the developer</v>
 
 00:02.000 --> 00:06.000
-<v Jon Newmuis>preview of AMP stories, an open format for visual storytelling
+<v Jon Newmuis>preview of AMP stories, an open format for visual storytelling</v>
 
 00:06.000 --> 00:09.000
-<v Jon Newmuis>on mobile.
+<v Jon Newmuis>on mobile.</v>
 
 00:09.000 --> 00:12.500
-<v Jon Newmuis>To demonstrate, here's a story by CNN using the format.
+<v Jon Newmuis>To demonstrate, here's a story by CNN using the format.</v>
 
 00:12.500 --> 00:16.500
-<v Jon Newmuis>As you can see, it's very visual with these full bleed images.
+<v Jon Newmuis>As you can see, it's very visual with these full bleed images.</v>
 
 00:16.500 --> 00:19.000
-<v Jon Newmuis>And you can also include video assets as well.
+<v Jon Newmuis>And you can also include video assets as well.</v>
 
 00:19.000 --> 00:22.000
-<v Jon Newmuis>The short-form bite-sized text is more easily
+<v Jon Newmuis>The short-form bite-sized text is more easily</v>
 
 00:22.000 --> 00:24.000
-<v Jon Newmuis>consumable on mobile.
\ No newline at end of file
+<v Jon Newmuis>consumable on mobile.</v>
\ No newline at end of file
diff --git a/examples/amp-story/videos-google-cache.html b/examples/amp-story/videos-google-cache.html
index 36a6c477e829..bbcc384d082c 100644
--- a/examples/amp-story/videos-google-cache.html
+++ b/examples/amp-story/videos-google-cache.html
@@ -61,7 +61,7 @@
       <amp-story-page id="page-3">
         <amp-story-grid-layer template="fill">
 					<amp-video autoplay loop cache="google"
-					id="video2"
+					id="video3"
             width="400"
             height="750"
             poster="img-city1.jpeg#2"
@@ -69,7 +69,34 @@
             <source src="https://gregable.com/re2ae3Ei/sample-mp4-file.mp4?amp_video_host_url=gregable.com" type="video/mp4">
           </amp-video>
 				</amp-story-grid-layer>
-				<amp-story-grid-layer><span class="page-num">2</span></amp-story-grid-layer>
+				<amp-story-grid-layer><span class="page-num">3</span></amp-story-grid-layer>
+			</amp-story-page>
+
+      <amp-story-page id="page-4">
+        <amp-story-grid-layer template="fill">
+					<amp-video autoplay loop cache="google"
+					id="video4"
+            width="400"
+            height="750"
+            poster="img-city1.jpeg#2"
+            layout="fill">
+            <source src="https://gregable.com/re2ae3Ei/sample-mp4-file.mp4?amp_video_host_url=gregable.com" type="video/mp4">
+          </amp-video>
+				</amp-story-grid-layer>
+				<amp-story-grid-layer><span class="page-num">4</span></amp-story-grid-layer>
+			</amp-story-page>
+      <amp-story-page id="page-5">
+        <amp-story-grid-layer template="fill">
+					<amp-video autoplay loop cache="google"
+					id="video5"
+            width="400"
+            height="750"
+            poster="img-city1.jpeg#2"
+            layout="fill">
+            <source src="https://gregable.com/re2ae3Ei/sample-mp4-file.mp4?amp_video_host_url=gregable.com" type="video/mp4">
+          </amp-video>
+				</amp-story-grid-layer>
+				<amp-story-grid-layer><span class="page-num">5</span></amp-story-grid-layer>
 			</amp-story-page>
     </amp-story>
   </body>
diff --git a/examples/amp-toggle-theme.html b/examples/amp-toggle-theme.html
new file mode 100644
index 000000000000..dc845b87e39f
--- /dev/null
+++ b/examples/amp-toggle-theme.html
@@ -0,0 +1,76 @@
+<!doctype html>
+<html ⚡ lang="en">
+	<head>
+	<meta charset="utf-8">
+	<script async src="https://cdn.ampproject.org/v0.js"></script>
+	<style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+	<!-- ## Setup -->
+	<link rel="canonical" href="https://amp.dev/documentation/examples/components/amp-toggle-theme/">
+	<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+	</head>
+
+	<style amp-custom>
+		.is-dark-mode {
+			background-color: #20202A;
+			color: #FFF;
+		}
+	</style>
+
+	<body data-prefers-dark-mode-class="is-dark-mode">
+		<main>
+			<button on="tap:AMP.toggleTheme()">Toggle Mode</button>
+			<p>
+				Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
+				tempor incididunt ut labore et dolore magna aliqua. Eget arcu dictum
+				varius duis at. Volutpat consequat mauris nunc congue. Ultrices sagittis
+				orci a scelerisque purus. Feugiat pretium nibh ipsum consequat nisl vel
+				pretium lectus quam. Id aliquet lectus proin nibh nisl condimentum id.
+				Facilisis sed odio morbi quis commodo odio aenean sed adipiscing. Non
+				curabitur gravida arcu ac. In egestas erat imperdiet sed euismod. Eu
+				lobortis elementum nibh tellus. In nisl nisi scelerisque eu ultrices.
+				Leo in vitae turpis massa sed elementum tempus egestas sed. Id neque
+				aliquam vestibulum morbi blandit cursus risus at. Dui accumsan sit amet
+				nulla facilisi morbi tempus. Integer eget aliquet nibh praesent
+				tristique magna sit amet. Nibh ipsum consequat nisl vel pretium lectus
+				quam id. Vel turpis nunc eget lorem dolor. Dignissim sodales ut eu sem
+				integer vitae justo. Amet est placerat in egestas erat imperdiet sed.
+				Vulputate dignissim suspendisse in est ante. Eleifend donec pretium
+				vulputate sapien. Magna sit amet purus gravida quis blandit turpis.
+				Morbi tristique senectus et netus et malesuada fames. Nec feugiat nisl
+				pretium fusce. In fermentum et sollicitudin ac orci phasellus egestas
+				tellus. Eget nunc lobortis mattis aliquam faucibus. Arcu cursus vitae
+				congue mauris rhoncus aenean vel elit. Turpis egestas sed tempus urna
+				et. Nulla facilisi morbi tempus iaculis urna id volutpat lacus laoreet.
+				Ullamcorper eget nulla facilisi etiam. Cras sed felis eget velit aliquet
+				sagittis id consectetur purus. Diam volutpat commodo sed egestas egestas
+				fringilla phasellus faucibus scelerisque. Odio facilisis mauris sit amet
+				massa vitae tortor. Interdum consectetur libero id faucibus nisl. Ipsum
+				nunc aliquet bibendum enim facilisis gravida neque convallis a. In
+				fermentum et sollicitudin ac orci phasellus egestas. Eu mi bibendum
+				neque egestas congue quisque. Et netus et malesuada fames ac. Nam libero
+				justo laoreet sit amet cursus sit amet. Magna fringilla urna porttitor
+				rhoncus dolor purus. Cursus turpis massa tincidunt dui ut ornare. Mauris
+				sit amet massa vitae tortor. Nisi est sit amet facilisis. Lobortis
+				feugiat vivamus at augue eget. Sit amet consectetur adipiscing elit
+				pellentesque. Dignissim sodales ut eu sem integer vitae. Libero justo
+				laoreet sit amet cursus sit amet dictum sit. Nulla pellentesque
+				dignissim enim sit amet. Tincidunt dui ut ornare lectus sit. Volutpat ac
+				tincidunt vitae semper quis lectus nulla at. Diam volutpat commodo sed
+				egestas egestas fringilla phasellus faucibus. Duis at tellus at urna
+				condimentum mattis pellentesque. Fringilla est ullamcorper eget nulla
+				facilisi etiam dignissim diam. Suspendisse potenti nullam ac tortor
+				vitae purus faucibus ornare. Eget magna fermentum iaculis eu non. Enim
+				nec dui nunc mattis enim ut tellus. Quam viverra orci sagittis eu
+				volutpat odio facilisis mauris sit. Orci a scelerisque purus semper eget
+				duis. Sit amet nisl suscipit adipiscing bibendum est ultricies. In
+				iaculis nunc sed augue. Amet nulla facilisi morbi tempus iaculis urna id
+				volutpat lacus. Eros in cursus turpis massa tincidunt dui ut ornare.
+				Pharetra et ultrices neque ornare aenean. Enim sed faucibus turpis in eu
+				mi bibendum neque. Sit amet commodo nulla facilisi nullam vehicula ipsum
+				a arcu. Eget felis eget nunc lobortis mattis aliquam faucibus purus in.
+				Massa massa ultricies mi quis. Aenean vel elit scelerisque mauris.
+				Tristique risus nec feugiat in fermentum posuere.
+			  </p>
+		</main>
+	</body>
+</html>
diff --git a/examples/analytics-vendors.amp.html b/examples/analytics-vendors.amp.html
index ea6b787dbdd9..b80eaaf2bb1b 100644
--- a/examples/analytics-vendors.amp.html
+++ b/examples/analytics-vendors.amp.html
@@ -67,7 +67,6 @@
       <option>comscore</option>
       <option>cxense</option>
       <option>deepbi</option>
-      <option>dynatrace</option>
       <option>epica</option>
       <option>euleriananalytics</option>
       <option>facebook-pixel</option>
@@ -94,6 +93,7 @@
       <option>moengage</option>
       <option>mparticle</option>
       <option>mpulse</option>
+      <option>neodata</option>
       <option>newrelic</option>
       <option>nielsen</option>
       <option>nielsen-marketing-cloud</option>
@@ -102,6 +102,7 @@
       <option>oracleInfinityAnalytics</option>
       <option>parsely</option>
       <option>permutive</option>
+      <option>permutive-ampscript</option>
       <option>piano</option>
       <option>pinpoll</option>
       <option>piStats</option>
@@ -124,6 +125,7 @@
       <option>top100</option>
       <option>topmailru</option>
       <option>treasuredata</option>
+      <option>tribooanalytics</option>
       <option>umenganalytics</option>
       <option>upscore</option>
       <option>vponanalytics</option>
@@ -648,20 +650,6 @@
 </amp-analytics>
 <!-- End Deep.BI example -->
 
-
-<!-- dynatrace tracking -->
-<amp-analytics type="dynatrace" id="dynatrace">
-<script type="application/json">
-{
-  "vars": {
-    "app": "appid",
-    "tenant": "1"
-  }
-}
-</script>
-</amp-analytics>
-<!-- End dynatrace example -->
-
 <!-- EPICA analytics tracking -->
 <amp-analytics type="epica" id="epica">
 <script type="application/json">
@@ -1160,7 +1148,7 @@
             "a": {
               "title": "${title}"
             },
-            "e": "amp example button click"
+            "e": "AMP example button click"
           }
         }
       }
@@ -1217,6 +1205,20 @@
 </amp-analytics>
 <!-- End mParticle example -->
 
+<!-- Neodata example -->
+<amp-analytics type="neodata" id="neodata">
+  <script type="application/json">
+    {
+      "vars": {
+        "sysId": "999",
+        "tagId": "12321",
+        "advId": "56785"
+      }
+    }
+  </script>
+</amp-analytics>
+<!-- End Neodata example -->
+
 <!-- New Relic example -->
 <amp-analytics type="newrelic" id="newrelic">
 <script type="application/json">
@@ -1373,6 +1375,16 @@
 </amp-analytics>
 <!-- End Permutive example -->
 
+<!-- Permutive-amp-script example -->
+<amp-analytics type="permutive-ampscript" id="permutive-ampscript">
+  {
+    "extraUrlParams": {
+      "customProperty1": "customValue1"
+    }
+  }
+</amp-analytics>
+<!-- End Permutive-amp-script example -->
+
 <!-- Start Piano example -->
 <amp-analytics type="piano" id="piano">
 <script type="application/json">
@@ -1656,7 +1668,7 @@
   {
     "vars": {
       "collectorHost": "collector.snplow.net",
-      "appId": "amp-examples-v2.0.3",
+      "appId": "amp-examples-v2.1.0",
       "userId": "someUserId",
       "nameTracker": "testName",
       "customContexts":  "{\"schema\":\"iglu:com.snowplowanalytics.snowplow/gdpr/jsonschema/1-0-0\",\"data\":{\"basisForProcessing\":\"legitimate_interests\"}}"
@@ -1941,6 +1953,19 @@
 </amp-analytics>
 <!-- End Treasure Data example -->
 
+<!-- tribooanalytics example -->
+<amp-analytics type="tribooanalytics" id="tribooanalytics">
+<script type="application/json">
+  {
+    "vars": {
+      "account": "amptest",
+      "page": "Home page"
+    }
+  }
+</script>
+</amp-analytics>
+<!-- End tribooanalytics Example -->
+
 <!-- Webtrekk tracking -->
 <amp-analytics type="webtrekk" id="webtrekk">
 <script type="application/json">
@@ -2021,7 +2046,9 @@
     "id":"123456",
     "sec":"news",
     "tgs":"modi,parliament",
-    "pc":"loggedin"
+    "pc":"loggedin",
+    "vct":"1",
+    "xcld":"1001"
   }
 }
 </script>
diff --git a/examples/article-access-multiple.amp.html b/examples/article-access-multiple.amp.html
index 0f6955b600c6..340090de8672 100644
--- a/examples/article-access-multiple.amp.html
+++ b/examples/article-access-multiple.amp.html
@@ -9,9 +9,9 @@
   <script id="amp-access" type="application/json">
     [
       {
-        "authorization": "https://ampbyexample.com/components/amp-access/authorization?rid=READER_ID&url=CANONICAL_URL&ref=DOCUMENT_REFERRER&_=RANDOM",
-        "pingback": "https://ampbyexample.com/components/amp-access/authorization?rid=READER_ID&url=CANONICAL_URL&ref=DOCUMENT_REFERRER&_=RANDOM",
-        "login": "https://ampbyexample.com/components/amp-access/login?rid=READER_ID&url=CANONICAL_URL",
+        "authorization": "https://amp.dev/documentation/examples/api/authorization?rid=READER_ID&url=CANONICAL_URL&ref=DOCUMENT_REFERRER&_=RANDOM",
+        "pingback": "https://amp.dev/documentation/examples/api/authorization?rid=READER_ID&url=CANONICAL_URL&ref=DOCUMENT_REFERRER&_=RANDOM",
+        "login": "https://amp.dev/documentation/examples/api/login?rid=READER_ID&url=CANONICAL_URL",
         "authorizationFallbackResponse": {"error": true},
         "namespace": "default"
       },
diff --git a/examples/article-access.amp.html b/examples/article-access.amp.html
index d548e81ec655..eb73e2c4f9a1 100644
--- a/examples/article-access.amp.html
+++ b/examples/article-access.amp.html
@@ -8,9 +8,9 @@
   <!-- See https://github.com/ampproject/amp-publisher-sample -->
   <script id="amp-access" type="application/json">
     {
-      "authorization": "https://ampbyexample.com/components/amp-access/authorization?rid=READER_ID&url=CANONICAL_URL&ref=DOCUMENT_REFERRER&_=RANDOM",
-      "pingback": "https://ampbyexample.com/components/amp-access/authorization?rid=READER_ID&url=CANONICAL_URL&ref=DOCUMENT_REFERRER&_=RANDOM",
-      "login": "https://ampbyexample.com/components/amp-access/login?rid=READER_ID&url=CANONICAL_URL",
+      "authorization": "https://amp.dev/documentation/examples/api/authorization?rid=READER_ID&url=CANONICAL_URL&ref=DOCUMENT_REFERRER&_=RANDOM",
+      "pingback": "https://amp.dev/documentation/examples/api/authorization?rid=READER_ID&url=CANONICAL_URL&ref=DOCUMENT_REFERRER&_=RANDOM",
+      "login": "https://amp.dev/documentation/examples/api/login?rid=READER_ID&url=CANONICAL_URL",
       "authorizationFallbackResponse": {"error": true}
     }
   </script>
diff --git a/examples/auto-ads.amp.html b/examples/auto-ads.amp.html
index c0612303553a..789d1dccb69e 100644
--- a/examples/auto-ads.amp.html
+++ b/examples/auto-ads.amp.html
@@ -7,9 +7,9 @@
     <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
     <script id="amp-access" type="application/json">
       {
-        "authorization": "https://ampbyexample.com/components/amp-access/authorization?rid=READER_ID&url=CANONICAL_URL&ref=DOCUMENT_REFERRER&_=RANDOM",
-        "pingback": "https://ampbyexample.com/components/amp-access/authorization?rid=READER_ID&url=CANONICAL_URL&ref=DOCUMENT_REFERRER&_=RANDOM",
-        "login": "https://ampbyexample.com/components/amp-access/login?rid=READER_ID&url=CANONICAL_URL",
+        "authorization": "https://amp.dev/documentation/examples/api/authorization?rid=READER_ID&url=CANONICAL_URL&ref=DOCUMENT_REFERRER&_=RANDOM",
+        "pingback": "https://amp.dev/documentation/examples/api/authorization?rid=READER_ID&url=CANONICAL_URL&ref=DOCUMENT_REFERRER&_=RANDOM",
+        "login": "https://amp.dev/documentation/examples/api/login?rid=READER_ID&url=CANONICAL_URL",
         "authorizationFallbackResponse": {"error": true}
       }
     </script>
diff --git a/examples/bento/amp-iframe-resizing-example.html b/examples/bento/amp-iframe-resizing-example.html
deleted file mode 100644
index 932761a5a888..000000000000
--- a/examples/bento/amp-iframe-resizing-example.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width">
-  </head>
-  <body>
-    <p>This iframe is initially sized 100x100px.</p>
-    <script>
-      function postSize(size) {
-        // post new height after re-layout
-        window.requestAnimationFrame(() => {
-          var message = {
-            sentinel: 'amp',
-            type: 'embed-size',
-            height: size,
-            width: size,
-          };
-          console.log('post new embed-height', message);
-          window.parent.postMessage(message, '*');
-        })
-      }
-
-      postSize(300);
-    </script>
-  </body>
-</html>
diff --git a/examples/bento/amp-iframe-send-intersections-example.html b/examples/bento/amp-iframe-send-intersections-example.html
deleted file mode 100644
index aacad871e29d..000000000000
--- a/examples/bento/amp-iframe-send-intersections-example.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width">
-  </head>
-  <body>
-    <h3>Intersection Ratios:</h3>
-    <p id="intersections"></p>
-    <script>
-      window.parent.postMessage(
-        {
-          sentinel: 'amp',
-          type: 'send-intersections',
-        },
-        '*'
-      );
-      window.addEventListener('message', (event) => {
-        if (event.data.sentinel !== 'amp' && event.data.type !== 'intersection') {
-          return;
-        }
-        const node = document.getElementById('intersections');
-        event.data.changes.forEach((change) => {
-          node.innerHTML += '<p>' + change.intersectionRatio + '</p>';
-        });
-      });
-    </script>
-  </body>
-</html>
diff --git a/examples/bento/api.html b/examples/bento/api.html
deleted file mode 100644
index dce31b4e148f..000000000000
--- a/examples/bento/api.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8" />
-    <title>Bento component method API</title>
-    <meta
-      name="viewport"
-      content="width=device-width,minimum-scale=1,initial-scale=1"
-    />
-    <script src="https://cdn.ampproject.org/bento.js"></script>
-    <script
-      async
-      src="https://cdn.ampproject.org/v0/bento-video-1.0.js"
-    ></script>
-  </head>
-  <body>
-    <bento-video
-      style="display: block; position: relative; width: 160px; height: 90px"
-      src="http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ForBiggerMeltdowns.mp4"
-    >
-    </bento-video>
-
-    <button data-method="play" disabled>Play</button>
-    <button data-method="pause" disabled>Pause</button>
-
-    <script>
-      (async () => {
-        // Wait for our element to be defined, then we can get its API.
-        const element = document.querySelector('bento-video');
-
-        await window.customElements.whenDefined(element.tagName.toLowerCase());
-
-        // We follow the `data-method` attribute in this example, but that's not
-        // necessary. Otherwise, we would call a method like api.play() directly.
-        async function onDataMethodButtonClick({target}) {
-          const api = await element.getApi();
-          api[target.dataset.method]();
-        }
-
-        const buttons = document.querySelectorAll('button[data-method]');
-        for (const button of buttons) {
-          button.removeAttribute('disabled');
-          button.addEventListener('click', onDataMethodButtonClick);
-        }
-      })();
-    </script>
-  </body>
-</html>
diff --git a/examples/bento/lazy-v0.html b/examples/bento/lazy-v0.html
deleted file mode 100644
index 3dc3d8cfae01..000000000000
--- a/examples/bento/lazy-v0.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<!doctype html>
-<html ⚡ lang="en">
-<head>
-  <meta charset="utf-8">
-  <title>Basic Bento example</title>
-  <link rel="canonical" href="amps.html" >
-  <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
-  <link rel="stylesheet" type="text/css" href="/build/css/amp-base-carousel-1.0.css">
-  <link rel="stylesheet" type="text/css" href="/build/css/amp-social-share-1.0.css">
-  <link rel="stylesheet" type="text/css" href="/build/css/amp-accordion-1.0.css">
-  <script async custom-element="amp-base-carousel" src="https://cdn.ampproject.org/v0/amp-base-carousel-1.0.js"></script>
-  <script async custom-element="amp-accordion" src="https://cdn.ampproject.org/v0/amp-accordion-1.0.js"></script>
-  <script async custom-element="amp-social-share" src="https://cdn.ampproject.org/v0/amp-social-share-1.0.js"></script>
-  <style amp-custom>
-    body {
-      margin: 0;
-    }
-
-    amp-base-carousel img {
-      object-fit: cover;
-    }
-
-    amp-base-carousel {
-      width: 100%;
-      aspect-ratio: 4/3;
-      border: 1px dotted;
-    }
-
-    img {
-      display: block;
-      width: 100%;
-      height: auto;
-    }
-  </style>
-</head>
-<body>
-
-  <nav>
-    <button onclick="runAmp()">Run</button>
-    <input>
-  </nav>
-
-  <div>
-    <amp-social-share
-      type=twitter
-    ></amp-social-share>
-  </div>
-
-  <amp-base-carousel id="carousel-1" width="400" height="300" layout="responsive" loop>
-    <img src="img/hero@1x.jpg">
-    <img src="img/sea@1x.jpg">
-  </amp-base-carousel>
-
-  <amp-accordion>
-    <section id="section1" expanded>
-      <h2>Hero</h2>
-      <div>
-        <img src="img/hero@1x.jpg">
-      </div>
-    </section>
-    <section>
-      <h2>Sea</h2>
-      <div>
-        <img src="img/sea@1x.jpg">
-      </div>
-    </section>
-  </amp-accordion>
-
-  <script>
-    function runAmp() {
-      var s = document.createElement('script');
-      s.src = '/dist/amp.js';
-      document.head.appendChild(s);
-    }
-  </script>
-
-</body>
-</html>
diff --git a/examples/bento/no-v0.html b/examples/bento/no-v0.html
deleted file mode 100644
index 42521414b544..000000000000
--- a/examples/bento/no-v0.html
+++ /dev/null
@@ -1,314 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8" />
-    <title>bento-timeago</title>
-    <link rel="canonical" href="amps.html" />
-    <meta
-      name="viewport"
-      content="width=device-width,minimum-scale=1,initial-scale=1"
-    />
-    <style data-bento-boilerplate>
-      bento-timeago {
-        display: inline-block;
-        position: relative;
-        overflow: hidden;
-      }
-    </style>
-    <style>
-      body {
-        font-family: sans-serif;
-        max-width: 400px;
-        font-size: 16px;
-        line-height: 20px;
-      }
-      .scroll {
-        height: 40px;
-        overflow: scroll;
-        border: 1px solid black;
-      }
-    </style>
-    <script src="https://cdn.ampproject.org/bento.js"></script>
-    <script
-      async
-      src="https://cdn.ampproject.org/v0/bento-timeago-1.0.js"
-    ></script>
-  </head>
-  <body>
-    <h1>bento-timeago</h1>
-    <h2>Basic example</h2>
-    <div class="scroll">
-      <p>Scroll up and down for updated times</p>
-      <bento-timeago
-        class="time"
-        style="width: 160px; height: 20px"
-        datetime="2020-01-28T20:52:41+00:00"
-        locale="en"
-      >
-        Saturday 11 April 2018 00.37
-      </bento-timeago>
-    </div>
-    <h2>Locale examples</h2>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="be"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="bg"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="ca"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="da"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="de"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="el"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="en"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="enShort"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="es"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="eu"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="fi"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="fr"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="he"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="hu"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="inBG"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="inHI"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="inID"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="it"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="ja"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="ko"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="ml"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="nbNO"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="nl"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="nnNO"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="pl"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="ptBR"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="ro"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="ru"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="sv"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="ta"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="th"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="tr"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="uk"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="vi"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="zhCN"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="zhTW"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-    <h2>Cutoff example (100 days)</h2>
-    <bento-timeago
-      style="width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-      locale="en"
-      cutoff="8640000"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-  </body>
-</html>
diff --git a/examples/compiler-hydration.html b/examples/compiler-hydration.html
new file mode 100644
index 000000000000..85b97ec6dc06
--- /dev/null
+++ b/examples/compiler-hydration.html
@@ -0,0 +1,119 @@
+<!doctype html>
+<html ⚡ lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>Hydration Test</title>
+  <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+  <script async custom-element="amp-fit-text" src="https://cdn.ampproject.org/v0/amp-fit-text-0.1.js"></script>
+  <!-- TODO: make lazy server work with .css files. -->
+  <link rel="stylesheet" href="/extensions/amp-carousel/0.1/amp-carousel.css" />
+  <link rel="stylesheet" href="/dist/v0.css" />
+  <script async custom-element="amp-carousel" src="https://cdn.ampproject.org/v0/amp-carousel-0.1.js"></script>
+  <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+  <script async src="https://cdn.ampproject.org/v0.js"></script>
+  <style amp-custom>
+      h1 {
+          text-align: center;
+      }
+      amp-fit-text {
+          left: 50%;
+          transform: translateX(-50%);
+      }
+
+      amp-carousel {
+          left: 50%;
+          transform: translateX(-50%);
+      }
+  </style>
+</head>
+<body>
+    <!--
+        Manual test file for hydration of server-rendered components.
+        Unlike most AMPHTML pages, this file's components should all be rendered.
+    -->
+
+    <h1><code>client render: amp-layout</code> with a 4:1 responsive ratio </h1>
+    <amp-layout layout="responsive" width="4" height="1">
+        <svg viewBox="0 0 100 25">
+            <circle cx="50%" cy="50%" r="15%" stroke="black" stroke-width="3"></circle>
+            Sorry, your browser does not support inline SVG.
+        </svg>
+    </amp-layout>
+
+    <h1><code>server render: amp-layout</code> with a 4:1 responsive ratio </h1>
+    <amp-layout class="i-amphtml-layout-responsive i-amphtml-layout-size-defined i-amphtml-element" height=1 i-amphtml-layout=responsive i-amphtml-ssr layout=responsive width=4>
+        <i-amphtml-sizer slot="i-amphtml-svc" style="padding-top: 25%;"></i-amphtml-sizer>
+        <div class="i-amphtml-fill-content">
+            <svg viewBox="0 0 100 25">
+                <circle cx="50%" cy="50%" r="15%" stroke=black stroke-width=3></circle>
+                Sorry, your browser does not support inline SVG.
+            </svg>
+        </div>
+    </amp-layout>
+
+    <h1><code>amp-fit-text</code> with large text</h1>
+    <amp-fit-text width="111px" height="222px" class="i-amphtml-layout-fixed i-amphtml-layout-size-defined" i-amphtml-layout="fixed" i-amphtml-ssr="" style="width: 111px; height: 222px;">
+        <div class="i-amphtml-fill-content i-amphtml-fit-text-content">
+            <div class="i-amphtml-fit-text-content-wrapper">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer sed ultrices massa. Fusce lacus magna, blandit sed suscipit at, congue mollis sem. Vestibulum molestie tortor eu dui dictum, eget pharetra orci ultricies. Donec venenatis pellentesque massa sit amet mollis. Praesent nisl metus, egestas eu turpis a, tincidunt imperdiet purus. Nulla tincidunt vulputate porta. Sed vitae lacinia ligula, in ultricies ante. Nunc ornare lacus in bibendum mattis. Cras ultricies vel eros pulvinar laoreet. Curabitur sed magna a est interdum mattis eu eget magna. Nam sit amet massa volutpat, pellentesque urna id, pretium magna. Praesent et enim ante. Vestibulum ultricies, urna ac ullamcorper scelerisque, augue est scelerisque massa, nec rhoncus orci sapien at ipsum. Fusce egestas sem non finibus euismod</div>
+        </div>
+        <div class="i-amphtml-fit-text-measurer">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer sed ultrices massa. Fusce lacus magna, blandit sed suscipit at, congue mollis sem. Vestibulum molestie tortor eu dui dictum, eget pharetra orci ultricies. Donec venenatis pellentesque massa sit amet mollis. Praesent nisl metus, egestas eu turpis a, tincidunt imperdiet purus. Nulla tincidunt vulputate porta. Sed vitae lacinia ligula, in ultricies ante. Nunc ornare lacus in bibendum mattis. Cras ultricies vel eros pulvinar laoreet. Curabitur sed magna a est interdum mattis eu eget magna. Nam sit amet massa volutpat, pellentesque urna id, pretium magna. Praesent et enim ante. Vestibulum ultricies, urna ac ullamcorper scelerisque, augue est scelerisque massa, nec rhoncus orci sapien at ipsum. Fusce egestas sem non finibus euismod</div>
+    </amp-fit-text>
+
+    <h1><code>amp-fit-text</code> with short text</h1>
+    <amp-fit-text width="111px" height="222px" class="i-amphtml-layout-fixed i-amphtml-layout-size-defined" i-amphtml-layout="fixed" i-amphtml-ssr="" style="width: 111px; height: 222px;">
+        <div class="i-amphtml-fill-content i-amphtml-fit-text-content">
+            <div class="i-amphtml-fit-text-content-wrapper">Hello, world</div>
+        </div>
+        <div class="i-amphtml-fit-text-measurer">Hello, world</div>
+    </amp-fit-text>
+
+    <h1><code>client render: carousel-0.1 type=slides</code></h1>
+    <amp-carousel type="slides" width="400" height="300" controls loop>
+        <img src="https://picsum.photos/400/300?img=1" width="400" height="300"></img>
+        <img src="https://picsum.photos/400/200?img=2" width="400" height="300"></img>
+        <img src="https://picsum.photos/400/200?img=3" width="400" height="300"></img>
+        <img src="https://picsum.photos/400/200?img=4" width="400" height="300"></img>
+        <img src="https://picsum.photos/400/200?img=5" width="400" height="300"></img>
+    </amp-carousel>
+
+    <h1><code>server render: carousel-0.1 type=slides</code></h1>
+    <amp-carousel class="i-amphtml-layout-fixed i-amphtml-layout-size-defined i-amphtml-slidescroll i-amphtml-carousel-has-controls i-amphtml-element" controls height="300" i-amphtml-layout="fixed" i-amphtml-ssr loop style="width: 400px; height: 300px" type="slides" width="400">
+        <div aria-live="polite" class="i-amphtml-slides-container i-amphtml-slidescroll-no-snap" tabindex="-1">
+            <div class="i-amphtml-slide-item i-amphtml-slide-item-show">
+                <img class="amp-carousel-slide" height="300" src="https://picsum.photos/400/300?img=1" width="400" />
+            </div>
+            <div class="i-amphtml-slide-item"><img class="amp-carousel-slide" height="300" src="https://picsum.photos/400/200?img=2" width="400"></div>
+            <div class="i-amphtml-slide-item"><img class="amp-carousel-slide" height="300" src="https://picsum.photos/400/200?img=3" width="400"></div>
+            <div class="i-amphtml-slide-item"><img class="amp-carousel-slide" height="300" src="https://picsum.photos/400/200?img=4" width="400"></div>
+            <div class="i-amphtml-slide-item"><img class="amp-carousel-slide" height="300" src="https://picsum.photos/400/200?img=5" width="400"></div>
+        </div>
+        <div aria-disabled="false" class="amp-carousel-button amp-carousel-button-prev" role="button" tabindex="0" title="Previous item in carousel (5 of 5)"></div>
+        <div aria-disabled="false" class="amp-carousel-button amp-carousel-button-next" role="button" tabindex="0" title="Next item in carousel (2 of 5)"></div>
+    </amp-carousel>
+
+    <h1><code>client render: carousel-0.1 type=scrollable</code></h1>
+    <amp-carousel width="300" height="100">
+        <img src="https://picsum.photos/300/400?img=1" width="120" height="100">
+        <img src="https://picsum.photos/300/400?img=2" width="120" height="100">
+        <img src="https://picsum.photos/300/400?img=3" width="120" height="100">
+        <img src="https://picsum.photos/300/400?img=4" width="120" height="100">
+        <img src="https://picsum.photos/300/400?img=5" width="120" height="100">
+        <img src="https://picsum.photos/300/400?img=6" width="120" height="100">
+        <img src="https://picsum.photos/300/400?img=7" width="120" height="100">
+    </amp-carousel>
+
+    <h1><code>server render: carousel-0.1 type=scrollable</code></h1>
+    <amp-carousel class="i-amphtml-layout-fixed i-amphtml-layout-size-defined i-amphtml-element" height="100" i-amphtml-layout="fixed" i-amphtml-ssr style="width: 300px; height: 100px" width="300">
+        <div class="i-amphtml-scrollable-carousel-container" tabindex="-1">
+          <img class="amp-carousel-slide amp-scrollable-carousel-slide" height="100" src="https://picsum.photos/300/400?img=1" width="120" />
+          <img class="amp-carousel-slide amp-scrollable-carousel-slide" height="100" src="https://picsum.photos/300/400?img=2" width="120" />
+          <img class="amp-carousel-slide amp-scrollable-carousel-slide" height="100" src="https://picsum.photos/300/400?img=3" width="120" />
+          <img class="amp-carousel-slide amp-scrollable-carousel-slide" height="100" src="https://picsum.photos/300/400?img=4" width="120" />
+          <img class="amp-carousel-slide amp-scrollable-carousel-slide" height="100" src="https://picsum.photos/300/400?img=5" width="120" />
+          <img class="amp-carousel-slide amp-scrollable-carousel-slide" height="100" src="https://picsum.photos/300/400?img=6" width="120" />
+          <img class="amp-carousel-slide amp-scrollable-carousel-slide" height="100" src="https://picsum.photos/300/400?img=7" width="120" />
+        </div>
+        <div aria-disabled="true" class="amp-carousel-button amp-carousel-button-prev amp-disabled" role="presentation" tabindex="-1" title="Previous item in carousel"></div>
+        <div aria-disabled="false" class="amp-carousel-button amp-carousel-button-next" role="presentation" tabindex="0" title="Next item in carousel"></div>
+    </amp-carousel>
+</html>
diff --git a/examples/connatix-player.amp.html b/examples/connatix-player.amp.html
index a39c26499787..1dff92c06516 100644
--- a/examples/connatix-player.amp.html
+++ b/examples/connatix-player.amp.html
@@ -12,6 +12,7 @@
         padding: 12px;
       }
     </style>
+  <script async custom-element="amp-video-docking" src="https://cdn.ampproject.org/v0/amp-video-docking-0.1.js"></script>
   <script async custom-element="amp-connatix-player" src="https://cdn.ampproject.org/v0/amp-connatix-player-0.1.js"></script>
   <script async src="https://cdn.ampproject.org/v0.js"></script>
 </head>
@@ -39,6 +40,13 @@ <h3>Connatix Player Responsive - With Media Id</h3>
     width="480"
     height="270">
   </amp-connatix-player>
-
+  <h3>Connatix Player With Docking</h3>
+  <amp-connatix-player
+    dock
+    data-player-id="f721b0d8-7a79-42b6-b637-fa4e86138ed9"
+    layout="fixed"
+    width="640"
+    height="360">
+  </amp-connatix-player>
 </body>
 </html>
diff --git a/examples/csp.amp.html b/examples/csp.amp.html
index 8a41b5f9d0f1..5dcc4369e54c 100644
--- a/examples/csp.amp.html
+++ b/examples/csp.amp.html
@@ -6,7 +6,7 @@
   <link rel="canonical" href="analytics.amp.html" >
   <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
 
-  <meta http-equiv="Content-Security-Policy" content="default-src * data: blob:; script-src blob: https://cdn.ampproject.org/v0.js https://cdn.ampproject.org/v0/ https://cdn.ampproject.org/viewer/ https://cdn.ampproject.org/rtv/; object-src 'none'; style-src 'unsafe-inline' https://cdn.ampproject.org/rtv/ https://cdn.materialdesignicons.com https://cloud.typography.com https://fast.fonts.net https://fonts.googleapis.com https://maxcdn.bootstrapcdn.com https://p.typekit.net https://use.fontawesome.com https://use.typekit.net; report-uri https://csp-collector.appspot.com/csp/amp">
+  <meta http-equiv="Content-Security-Policy" content="default-src * data: blob:; script-src blob: https://cdn.ampproject.org/v0.js https://cdn.ampproject.org/v0/ https://cdn.ampproject.org/viewer/ https://cdn.ampproject.org/rtv/; object-src 'none'; style-src 'unsafe-inline' https://cdn.ampproject.org/rtv/ https://cdn.materialdesignicons.com https://cloud.typography.com https://fast.fonts.net https://fonts.googleapis.com https://maxcdn.bootstrapcdn.com https://p.typekit.net https://use.fontawesome.com https://use.typekit.net https://cdnjs.cloudflare.com/ajax/libs/font-awesome/; report-uri https://csp-collector.appspot.com/csp/amp">
   <link href='https://fonts.googleapis.com/css?family=Questrial' rel='stylesheet' type='text/css'>
   <link rel="stylesheet" href="https://use.typekit.net/oeg4hgb.css">
   <script async custom-element="amp-ad" src="https://cdn.ampproject.org/v0/amp-ad-0.1.js"></script>
diff --git a/examples/gfk-sensic-analytics.amp.html b/examples/gfk-sensic-analytics.amp.html
index b210b49d56d7..d00631a64a4c 100644
--- a/examples/gfk-sensic-analytics.amp.html
+++ b/examples/gfk-sensic-analytics.amp.html
@@ -1,77 +1,140 @@
 <!doctype html>
 <html ⚡ lang="en">
 <head>
-    <meta charset="utf-8">
-    <title>GfK (Sensic) Media Analytics</title>
-    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
-    <link rel="canonical" href="gfk-analytics.amp.html" >
-    <script async src="https://cdn.ampproject.org/v0.js"></script>
-    <script async custom-element="amp-audio" src="https://cdn.ampproject.org/v0/amp-audio-0.1.js"></script>
-    <script async custom-element="amp-video" src="https://cdn.ampproject.org/v0/amp-video-0.1.js"></script>
-    <script async custom-element="amp-analytics" src="https://cdn.ampproject.org/v0/amp-analytics-0.1.js"></script>
-    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+  <meta charset="utf-8">
+  <title>GfK (Sensic) Media Analytics</title>
+  <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+  <link rel="canonical" href="gfk-analytics.amp.html">
+  <script async src="https://cdn.ampproject.org/v0.js"></script>
+  <script async custom-element="amp-audio" src="https://cdn.ampproject.org/v0/amp-audio-0.1.js"></script>
+  <script async custom-element="amp-video" src="https://cdn.ampproject.org/v0/amp-video-0.1.js"></script>
+  <script async custom-element="amp-analytics" src="https://cdn.ampproject.org/v0/amp-analytics-0.1.js"></script>
+  <style amp-boilerplate>body {
+    -webkit-animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+    -moz-animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+    -ms-animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+    animation: -amp-start 8s steps(1, end) 0s 1 normal both
+  }
 
-    <style amp-custom>
-    </style>
+  @-webkit-keyframes -amp-start {
+    from {
+      visibility: hidden
+    }
+    to {
+      visibility: visible
+    }
+  }
+
+  @-moz-keyframes -amp-start {
+    from {
+      visibility: hidden
+    }
+    to {
+      visibility: visible
+    }
+  }
+
+  @-ms-keyframes -amp-start {
+    from {
+      visibility: hidden
+    }
+    to {
+      visibility: visible
+    }
+  }
+
+  @-o-keyframes -amp-start {
+    from {
+      visibility: hidden
+    }
+    to {
+      visibility: visible
+    }
+  }
+  @keyframes -amp-start {
+    from {
+      visibility: hidden
+    }
+    to {
+      visibility: visible
+    }
+  }</style>
+  <noscript>
+    <style amp-boilerplate>body {
+      -webkit-animation: none;
+      -moz-animation: none;
+      -ms-animation: none;
+      animation: none
+    }</style>
+  </noscript>
+
+  <style amp-custom>
+  </style>
 </head>
 
 <body>
-    <h1>Audio player</h1>
-    <p>Play/Pause to send event</p>
-    <amp-audio id="my-player" layout="" src="av/audio.mp3"> </amp-audio>
+<h1>Audio player</h1>
+<p>Play/Pause to send event</p>
+<amp-audio id="my-player" layout="" src="av/audio.mp3"></amp-audio>
 
-    <p>Play/Pause to send event</p>
-    <amp-audio id="my-player2" layout="" src="av/audio.mp3"> </amp-audio>
+<p>Play/Pause to send event</p>
+<amp-audio id="my-player2" layout="" src="av/audio.mp3"></amp-audio>
 
-    <amp-analytics type="gfksensic">
-        <script type="application/json">
-            {
-                "vars": {
-                    "regionID": "demo",
-                    "mediaID": "demomedia"
-                },
-                "triggers": {
-                    "audioPlay": {
-                        "on": "audio-play",
-                        "request": "audio-play",
-                        "selector": "#my-player",
-                        "vars": {
-                            "contentID": "myCategory",
-                            "streamID": "my-player"
-                        }
-                    },
-                    "audioPause": {
-                        "on": "audio-pause",
-                        "request": "audio-stop",
-                        "selector": "#my-player",
-                        "vars": {
-                            "contentID": "myCategory",
-                            "streamID": "my-player"
-                        }
-                    },
-                    "audioPlay2": {
-                        "on": "audio-play",
-                        "request": "audio-play",
-                        "selector": "#my-player2",
-                        "vars": {
-                            "contentID": "myCategory",
-                            "streamID": "my-player2"
-                        }
-                    },
-                    "audioPause2": {
-                        "on": "audio-pause",
-                        "request": "audio-stop",
-                        "selector": "#my-player2",
-                        "vars": {
-                            "contentID": "myCategory",
-                            "streamID": "my-player2"
-                        }
-                    }
-                }
-            }
-        </script>
-    </amp-analytics>
-      <a href="another.html">Change page</a>
+<amp-analytics type="gfksensic">
+  <script type="application/json">
+  {
+    "vars": {
+      "environment": "-preproduction",
+      "regionID": "demo",
+      "mediaID": "demomedia",
+      "custom_params": "cp_cp1=example1&cp_cp2=example2"
+    },
+    "triggers": {
+      "trackConsent": {
+        "on": "visible",
+        "request": "impression"
+      },
+      "audioPlay": {
+        "on": "audio-play",
+        "request": "audio-play",
+        "selector": "#my-player",
+        "vars": {
+          "contentID": "myCategory",
+          "streamID": "my-player"
+        }
+      },
+      "audioPause": {
+        "on": "audio-pause",
+        "request": "audio-stop",
+        "selector": "#my-player",
+        "vars": {
+          "contentID": "myCategory",
+          "streamID": "my-player"
+        }
+      },
+      "audioPlay2": {
+        "on": "audio-play",
+        "request": "audio-play",
+        "selector": "#my-player2",
+        "vars": {
+          "contentID": "myCategory",
+          "streamID": "my-player2"
+        }
+      },
+      "audioPause2": {
+        "on": "audio-pause",
+        "request": "audio-stop",
+        "selector": "#my-player2",
+        "vars": {
+          "contentID": "myCategory",
+          "streamID": "my-player2"
+        }
+      }
+    }
+  }
+  </script>
+</amp-analytics>
+<a href="another.html">Change page</a>
 </body>
 
 </html>
diff --git a/examples/pwa/pwa-sw.js b/examples/pwa/pwa-sw.js
index f76f1aaac016..0139c350a5dc 100644
--- a/examples/pwa/pwa-sw.js
+++ b/examples/pwa/pwa-sw.js
@@ -1,6 +1,6 @@
 'use strict';
 
-self.addEventListener('install', (event) => {});
+self.addEventListener('install', () => {});
 
 self.addEventListener('fetch', (event) => {
   // TODO(dvoytenko): use cache, implement one-behind.
diff --git a/examples/pwa/pwa.js b/examples/pwa/pwa.js
index 228b22be36de..32b569bb8a08 100644
--- a/examples/pwa/pwa.js
+++ b/examples/pwa/pwa.js
@@ -1,6 +1,6 @@
 'use strict';
 
-function log(args) {
+function log() {
   var var_args = Array.prototype.slice.call(arguments, 0);
   var_args.unshift('[SHELL]');
   console /*OK*/.log
@@ -206,7 +206,7 @@ class AmpViewer {
 
     const isShadowDomSupported =
       Element.prototype.attachShadow || Element.prototype.createShadowRoot;
-    const shadowDomReadyPromise = new Promise((resolve, reject) => {
+    const shadowDomReadyPromise = new Promise((resolve) => {
       if (isShadowDomSupported) {
         resolve();
       } else if (
@@ -355,7 +355,7 @@ class AmpViewer {
     return new URL(relativeUrlString, this.baseUrl_).origin;
   }
 
-  onMessage_(type, data, rsvp) {}
+  onMessage_() {}
 }
 
 /**
@@ -506,4 +506,4 @@ function parseQueryString(queryString) {
   return params;
 }
 
-var shell = new Shell(window, /* useStreaming */ true);
+var shell = new Shell(window, /* useStreaming */ true); // eslint-disable-line @typescript-eslint/no-unused-vars
diff --git a/examples/visual-tests/amp-form/amp-form-server-error.amp.html b/examples/visual-tests/amp-form/amp-form-server-error.amp.html
new file mode 100644
index 000000000000..64b6fa7759e4
--- /dev/null
+++ b/examples/visual-tests/amp-form/amp-form-server-error.amp.html
@@ -0,0 +1,57 @@
+<!doctype html>
+<html ⚡ lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>AMP Form</title>
+  <link rel="canonical" href="amp-form.amp.html" >
+  <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+  <script async custom-element="amp-form" src="https://cdn.ampproject.org/v0/amp-form-0.1.js"></script>
+  <script async custom-template="amp-mustache" src="https://cdn.ampproject.org/v0/amp-mustache-0.2.js"></script>
+  <style amp-custom>
+  </style>
+  <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+  <script async src="https://cdn.ampproject.org/v0.js"></script>
+</head>
+<body>
+<form
+  id="form"
+  method="get"
+  action="/404"
+  action-xhr="/404"
+  target="_blank"
+  custom-validation-reporting="show-all-on-submit">
+  <div>
+    <input type="text"
+      id="name"
+      name="name"
+      placeholder="Name..."
+      required
+      pattern="\p{L}+\s\p{L}+">
+    <span visible-when-invalid="valueMissing" validation-for="name"></span>
+    <span visible-when-invalid="patternMismatch" validation-for="name">
+      Please enter your first and last name separated by a space (e.g. Jane Miller)
+    </span>
+  </div>
+  <div>
+    <input type="email"
+      id="email"
+      name="email"
+      placeholder="Email..."
+      required>
+    <span visible-when-invalid="valueMissing" validation-for="email"></span>
+    <span visible-when-invalid="typeMismatch" validation-for="email"></span>
+  </div>
+  <input id="submit" type="submit" value="Submit">
+  <div submit-success>
+    <template type="amp-mustache">
+      Success! Thanks for trying the <code>amp-form</code> demo!
+    </template>
+  </div>
+  <div submit-error>
+    <template type="amp-mustache">
+      Error!
+    </template>
+  </div>
+</form>
+</body>
+</html>
diff --git a/examples/visual-tests/amp-form/amp-form-server-error.js b/examples/visual-tests/amp-form/amp-form-server-error.js
new file mode 100644
index 000000000000..32258a547941
--- /dev/null
+++ b/examples/visual-tests/amp-form/amp-form-server-error.js
@@ -0,0 +1,19 @@
+'use strict';
+
+const {
+  verifySelectorsVisible,
+} = require('../../../build-system/tasks/visual-diff/verifiers');
+
+module.exports = {
+  'try to submit to a dead server': async (page, name) => {
+    await page.tap('#name');
+    await page.keyboard.type('Jane Miller');
+    await page.tap('#email');
+    await page.keyboard.type('jane.miller@ampproject.org');
+    await page.tap('#submit');
+    await verifySelectorsVisible(page, name, [
+      '#form.user-valid',
+      'div[submit-error] div[id^="rendered-message-amp-form-"]',
+    ]);
+  },
+};
diff --git a/examples/visual-tests/amp-form/amp-form.js b/examples/visual-tests/amp-form/amp-form.js
index 3bb76668024f..c04b10939cc2 100644
--- a/examples/visual-tests/amp-form/amp-form.js
+++ b/examples/visual-tests/amp-form/amp-form.js
@@ -38,21 +38,4 @@ module.exports = {
       'div[submit-success] div[id^="rendered-message-amp-form-"]',
     ]);
   },
-
-  // TODO(danielrozenberg): fix and restore this test
-  /*
-  'try to submit to a dead server': async (page, name) => {
-    page.on('request', interceptedRequest => interceptedRequest.abort());
-
-    await page.tap('#name');
-    await page.keyboard.type('Jane Miller');
-    await page.tap('#email');
-    await page.keyboard.type('jane.miller@ampproject.org');
-    await page.tap('#submit');
-    await verifySelectorsVisible(page, name, [
-      '#form.user-valid',
-      'div[submit-error] div[id^="rendered-message-amp-form-"]',
-    ]);
-  }
-  */
 };
diff --git a/examples/visual-tests/amp-mega-menu/amp-mega-menu.js b/examples/visual-tests/amp-mega-menu/amp-mega-menu.js
index e204d81f9af5..dc89472386c6 100644
--- a/examples/visual-tests/amp-mega-menu/amp-mega-menu.js
+++ b/examples/visual-tests/amp-mega-menu/amp-mega-menu.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const {sleep} = require('../../../build-system/tasks/visual-diff/helpers');
 const {
   verifySelectorsVisible,
 } = require('../../../build-system/tasks/visual-diff/verifiers');
@@ -12,7 +13,7 @@ module.exports = {
     await page.tap(
       'amp-mega-menu .i-amphtml-mega-menu-item:first-child .i-amphtml-mega-menu-heading'
     );
-    await page.waitForTimeout(400);
+    await sleep(400);
     await verifySelectorsVisible(page, name, [
       'amp-mega-menu[open] .i-amphtml-mega-menu-item:first-child[open] .i-amphtml-mega-menu-content',
       'amp-mega-menu[open] .i-amphtml-mega-menu-item:first-child[open] amp-img img',
diff --git a/examples/visual-tests/amp-selector.js b/examples/visual-tests/amp-selector.js
index 7582a2abac1c..01507f4bc487 100644
--- a/examples/visual-tests/amp-selector.js
+++ b/examples/visual-tests/amp-selector.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const {sleep} = require('../../build-system/tasks/visual-diff/helpers');
 const {
   verifySelectorsInvisible,
   verifySelectorsVisible,
@@ -26,7 +27,7 @@ module.exports = {
     await page.tap('#multi_selector span[option="2"]');
     await page.tap('#disabled_selector span[option="2"]');
     await page.tap('#disabled_selector span[option="3"]');
-    await page.waitForTimeout(100);
+    await sleep(100);
   },
 
   'change mutli select': async (page, name) => {
diff --git a/examples/visual-tests/amp-story-player/back-button.html b/examples/visual-tests/amp-story-player/back-button.html
index 41912d9607bc..9dbe799c8b67 100644
--- a/examples/visual-tests/amp-story-player/back-button.html
+++ b/examples/visual-tests/amp-story-player/back-button.html
@@ -5,7 +5,7 @@
       // TODO(#17108): Remove this when getMode().test is set.
       __AMP_TEST = true;
     </script>
-    <script src="../../../dist/amp-story-player-v0.js"></script>
+    <script type="module" src="../../../dist/amp-story-player-v0.mjs"></script>
     <link href="../../../build/css/amp-story-player-v0.css" rel='stylesheet' type='text/css'>
     <style page>
       body {
diff --git a/examples/visual-tests/amp-story-player/close-button.html b/examples/visual-tests/amp-story-player/close-button.html
index d74c419b94fd..b186025edcd4 100644
--- a/examples/visual-tests/amp-story-player/close-button.html
+++ b/examples/visual-tests/amp-story-player/close-button.html
@@ -5,7 +5,7 @@
       // TODO(#17108): Remove this when getMode().test is set.
       __AMP_TEST = true;
     </script>
-    <script src="../../../dist/amp-story-player-v0.js"></script>
+    <script type="module" src="../../../dist/amp-story-player-v0.mjs"></script>
     <link href="../../../build/css/amp-story-player-v0.css" rel='stylesheet' type='text/css'>
     <style page>
       body {
diff --git a/examples/visual-tests/amp-story-player/placeholder.js b/examples/visual-tests/amp-story-player/placeholder.js
index 07a6cb2fcef5..cce095a8b44b 100644
--- a/examples/visual-tests/amp-story-player/placeholder.js
+++ b/examples/visual-tests/amp-story-player/placeholder.js
@@ -1,8 +1,10 @@
 'use strict';
 
+const {sleep} = require('../../../build-system/tasks/visual-diff/helpers');
+
 module.exports = {
   'player ready': async (page) => {
-    await page.waitForTimeout(1000);
+    await sleep(1000);
     await page.$eval('iframe', (iframe) => {
       iframe.src = '';
       iframe.srcdoc =
diff --git a/examples/visual-tests/amp-story-player/player-amp-version.html b/examples/visual-tests/amp-story-player/player-amp-version.html
index 9f9e56933223..7a730c30e80b 100644
--- a/examples/visual-tests/amp-story-player/player-amp-version.html
+++ b/examples/visual-tests/amp-story-player/player-amp-version.html
@@ -3,9 +3,9 @@
   <head>
     <meta charset="utf-8">
     <title>Story Player (AMP version)</title>
-    <script async src="https://cdn.ampproject.org/v0.js"></script>
+    <script async src="https://cdn.ampproject.org/v0.mjs"></script>
     <link rel="canonical" href="player-amp.html">
-    <script async custom-element="amp-story-player" src="https://cdn.ampproject.org/v0/amp-story-player-0.1.js"></script>
+    <script type="module" async custom-element="amp-story-player" src="https://cdn.ampproject.org/v0/amp-story-player-0.1.mjs"></script>
     <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
     <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
     <script>
diff --git a/examples/visual-tests/amp-story-player/player-amp-version.js b/examples/visual-tests/amp-story-player/player-amp-version.js
index 416b0cc64eff..2948203bf4b9 100644
--- a/examples/visual-tests/amp-story-player/player-amp-version.js
+++ b/examples/visual-tests/amp-story-player/player-amp-version.js
@@ -1,14 +1,16 @@
 'use strict';
 
+const {sleep} = require('../../../build-system/tasks/visual-diff/helpers');
+
 module.exports = {
   'AMP version of the player loading a story': async (page) => {
-    await page.waitForTimeout(5000);
+    await sleep(5000);
     await page.$eval('iframe', (iframe) => {
       const contents = iframe.contentDocument.documentElement.outerHTML;
       iframe.src = '';
       iframe.srcdoc = contents;
     });
 
-    await page.waitForTimeout(2000);
+    await sleep(2000);
   },
 };
diff --git a/examples/visual-tests/amp-story-player/player-local-story-custom-desktop-aspect-ratio.html b/examples/visual-tests/amp-story-player/player-local-story-custom-desktop-aspect-ratio.html
new file mode 100644
index 000000000000..3c3e3d62b5fe
--- /dev/null
+++ b/examples/visual-tests/amp-story-player/player-local-story-custom-desktop-aspect-ratio.html
@@ -0,0 +1,58 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <title>Story Player (Non-AMP)</title>
+    <script>
+      // TODO(#17108): Remove this when getMode().test is set.
+      __AMP_TEST = true;
+    </script>
+    <script type="module" async src="../../../dist/amp-story-player-v0.mjs"></script>
+    <link href="../../../build/css/amp-story-player-v0.css" rel='stylesheet' type='text/css'>
+    <style page>
+      body {
+        font-family: sans-serif;
+      }
+    </style>
+    <style injected>
+      .story-player-iframe {
+        background-size: cover;
+        display: block;
+        position: relative;
+        height: 100%;
+        width: 100%;
+        flex: 0 0 100%;
+      }
+
+      .title {
+        background: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 1));
+        display: block;
+        position: absolute;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        color: #fff;
+        font-size: 40px;
+        padding: 88px 32px 32px 32px;
+        line-height: 1.25;
+        text-shadow: 3px 3px #000;
+      }
+
+      /* TODO: Remove this when poster image is no longer displayed. */
+      amp-story-player a:first-of-type {
+        display: none;
+      }
+    </style>
+    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+  </head>
+  <body>
+    <h1>This is a NON-AMP page that embeds a story below:</h1>
+    <div>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras viverra neque ex, sit amet varius sem maximus sed. Suspendisse potenti. Donec erat purus, sagittis sit amet tincidunt ut, maximus sit amet massa. Maecenas venenatis fringilla dui vitae vestibulum. Fusce imperdiet euismod lobortis. Nullam sagittis nunc at tristique mattis. In sodales consectetur mollis. Maecenas sollicitudin, ex vel tempor rutrum, turpis eros interdum enim, sit amet volutpat tortor dolor at ipsum. Nam posuere velit vel urna vulputate interdum. Aenean eu vulputate lorem. Praesent nec nunc sodales, egestas orci sed, hendrerit mauris. Ut blandit turpis non erat sagittis, quis fermentum odio feugiat.</div>
+    <amp-story-player style="width: 100%; height: 600px;">
+      <a href="/examples/visual-tests/amp-story/amp-story-custom-desktop-aspect-ratio.html"
+          class="story">
+        <span class="title">Test one</span>
+      </a>
+    </amp-story-player>
+    <div>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras viverra neque ex, sit amet varius sem maximus sed. Suspendisse potenti. Donec erat purus, sagittis sit amet tincidunt ut, maximus sit amet massa. Maecenas venenatis fringilla dui vitae vestibulum. Fusce imperdiet euismod lobortis. Nullam sagittis nunc at tristique mattis. In sodales consectetur mollis. Maecenas sollicitudin, ex vel tempor rutrum, turpis eros interdum enim, sit amet volutpat tortor dolor at ipsum. Nam posuere velit vel urna vulputate interdum. Aenean eu vulputate lorem. Praesent nec nunc sodales, egestas orci sed, hendrerit mauris. Ut blandit turpis non erat sagittis, quis fermentum odio feugiat.</div>
+  </body>
+</html>
diff --git a/examples/visual-tests/amp-story-player/player-local-story.html b/examples/visual-tests/amp-story-player/player-local-story.html
index 425c9f08acbd..ce31b0294e65 100644
--- a/examples/visual-tests/amp-story-player/player-local-story.html
+++ b/examples/visual-tests/amp-story-player/player-local-story.html
@@ -6,7 +6,7 @@
       // TODO(#17108): Remove this when getMode().test is set.
       __AMP_TEST = true;
     </script>
-    <script async src="../../../dist/amp-story-player-v0.js"></script>
+    <script type="module" async src="../../../dist/amp-story-player-v0.mjs"></script>
     <link href="../../../build/css/amp-story-player-v0.css" rel='stylesheet' type='text/css'>
     <style page>
       body {
diff --git a/examples/visual-tests/amp-story-player/story-attribution.html b/examples/visual-tests/amp-story-player/story-attribution.html
index 52826d9fa8e3..f8c23c93fb96 100644
--- a/examples/visual-tests/amp-story-player/story-attribution.html
+++ b/examples/visual-tests/amp-story-player/story-attribution.html
@@ -6,7 +6,7 @@
       // TODO(#17108): Remove this when getMode().test is set.
       __AMP_TEST = true;
     </script>
-    <script async src="../../../dist/amp-story-player-v0.js"></script>
+    <script type="module" async src="../../../dist/amp-story-player-v0.mjs"></script>
     <link href="../../../build/css/amp-story-player-v0.css" rel='stylesheet' type='text/css'>
     <style page>
       body {
diff --git a/examples/visual-tests/amp-story-player/story-loaded.js b/examples/visual-tests/amp-story-player/story-loaded.js
index af26d0a23941..664d7cd6dbc6 100644
--- a/examples/visual-tests/amp-story-player/story-loaded.js
+++ b/examples/visual-tests/amp-story-player/story-loaded.js
@@ -1,13 +1,15 @@
 'use strict';
 
+const {sleep} = require('../../../build-system/tasks/visual-diff/helpers');
+
 module.exports = {
   'story loaded and player ready': async (page) => {
-    await page.waitForTimeout(5000);
+    await sleep(5000);
     await page.$eval('iframe', (iframe) => {
       const contents = iframe.contentDocument.documentElement.outerHTML;
       iframe.src = '';
       iframe.srcdoc = contents;
     });
-    await page.waitForTimeout(2000);
+    await sleep(2000);
   },
 };
diff --git a/examples/visual-tests/amp-story/amp-story-custom-desktop-aspect-ratio.html b/examples/visual-tests/amp-story/amp-story-custom-desktop-aspect-ratio.html
new file mode 100644
index 000000000000..95f664f782d0
--- /dev/null
+++ b/examples/visual-tests/amp-story/amp-story-custom-desktop-aspect-ratio.html
@@ -0,0 +1,42 @@
+<!doctype html>
+<html amp lang="en">
+  <head>
+    <meta charset="utf-8">
+    <script async src="https://cdn.ampproject.org/v0.js"></script>
+    <script async custom-element="amp-story"
+        src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
+    <title>amp-story-grid-layer[template="fill"] visual diff</title>
+    <meta name="viewport"
+          content="width=device-width,minimum-scale=1,initial-scale=1">
+    <link rel="canonical" href="./template-vertical.html">
+    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+    <style amp-custom>
+      amp-story-page {
+        background: yellow;
+      }
+    </style>
+    <script>
+      // TODO(#17108): Remove this when getMode().test is set.
+      __AMP_TEST = true;
+    </script>
+  </head>
+
+  <body>
+    <amp-story standalone publisher="AMP Team" title="Visual Diff Test"
+        publisher-logo-src="/examples/visual-tests/photos/120.png"
+        poster-portrait-src="/examples/visual-tests/picsum.photos/image981_900x1600.jpg"
+        poster-landscape-src="/examples/visual-tests/picsum.photos/image981_1600x900.jpg"
+        poster-square-src="/examples/visual-tests/picsum.photos/image981_1600x1600.jpg"
+        desktop-aspect-ratio="1:1">
+
+      <amp-story-page id="cover">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/picsum.photos/image981_1600x900.jpg">
+          </amp-img>
+        </amp-story-grid-layer>
+      </amp-story-page>
+
+    </amp-story>
+  </body>
+
+</html>
diff --git a/examples/visual-tests/amp-story/amp-story-dev-tools.html b/examples/visual-tests/amp-story/amp-story-dev-tools.html
index 7a05f71eee14..542a8645a54c 100644
--- a/examples/visual-tests/amp-story/amp-story-dev-tools.html
+++ b/examples/visual-tests/amp-story/amp-story-dev-tools.html
@@ -18,7 +18,7 @@
     poster-portrait-src="./img/overview.jpg">
     <amp-story-page id="cover">
       <amp-story-grid-layer template="fill">
-          <amp-img src="https://images.unsplash.com/photo-1562907550-096d3bf9b25c"
+          <amp-img src="./img/laptop.jpg"
           width="720" height="1280"
           layout="responsive">
       </amp-story-grid-layer>
diff --git a/examples/visual-tests/amp-story/amp-story-grid-layer-presets.html b/examples/visual-tests/amp-story/amp-story-grid-layer-presets.html
index e81cc4f2dde3..5a5b9cbb2b0b 100644
--- a/examples/visual-tests/amp-story/amp-story-grid-layer-presets.html
+++ b/examples/visual-tests/amp-story/amp-story-grid-layer-presets.html
@@ -36,7 +36,7 @@
         poster-square-src="/examples/visual-tests/picsum.photos/image981_1600x1600.jpg">
         <amp-story-page id="anchors">
           <amp-story-grid-layer template="fill" preset="2021-background">
-            <amp-img src="https://images.unsplash.com/photo-1522072629756-c9274e34ef5e?w=1000&q=80"
+            <amp-img src="./lake.jpg"
               layout="responsive" width="69" height="116">
             </amp-img>
           </amp-story-grid-layer>
diff --git a/examples/visual-tests/amp-story/amp-story-interactive-img-poll.html b/examples/visual-tests/amp-story/amp-story-interactive-img-poll.html
index c49dcea79add..0570daedcd6b 100644
--- a/examples/visual-tests/amp-story/amp-story-interactive-img-poll.html
+++ b/examples/visual-tests/amp-story/amp-story-interactive-img-poll.html
@@ -32,16 +32,16 @@
 						id="4-options-poll"
 						prompt-text="Which of these places would you travel to first?"
 						endpoint="https://webstoriesinteractivity-beta.web.app/api/v1"
-						option-1-image="https://images.unsplash.com/photo-1577416026704-0fe2d48a0f20?ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&ixlib=rb-1.2.1&auto=format&fit=crop&w=1500&q=80"
+						option-1-image="./img/lake-tahoe.jpg"
 						option-1-image-alt="Lake Tahoe"
 						option-1-confetti="🌲"
-						option-2-image="https://images.unsplash.com/photo-1506970845246-18f21d533b20?ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&ixlib=rb-1.2.1&auto=format&fit=crop&w=1500&q=80"
+						option-2-image="./img/hong-kong.jpg"
 						option-2-image-alt="Hong Kong"
 						option-2-confetti="🏙️"
-						option-3-image="https://images.unsplash.com/photo-1559494007-9f5847c49d94?ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&ixlib=rb-1.2.1&auto=format&fit=crop&w=668&q=80"
+						option-3-image="./img/hawaii.jpg"
 						option-3-image-alt="Hawaii"
 						option-3-confetti="🏝️"
-						option-4-image="https://images.unsplash.com/photo-1516302350523-4c29d47b89e0?ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&ixlib=rb-1.2.1&auto=format&fit=crop&w=1500&q=80"
+						option-4-image="./img/grand-canyon.jpg"
 						option-4-image-alt="Grand Canyon"
 						option-4-confetti="🏞️">
 					</amp-story-interactive-img-poll>
diff --git a/examples/visual-tests/amp-story/amp-story-interactive-img-quiz.html b/examples/visual-tests/amp-story/amp-story-interactive-img-quiz.html
index 3342e8cf6514..429fccc07115 100644
--- a/examples/visual-tests/amp-story/amp-story-interactive-img-quiz.html
+++ b/examples/visual-tests/amp-story/amp-story-interactive-img-quiz.html
@@ -32,15 +32,15 @@
             id="4-options-quiz"
             prompt-text="Which of these structures is oldest?"
             endpoint="https://webstoriesinteractivity-beta.web.app/api/v1"
-            option-1-image="https://images.unsplash.com/photo-1565475783696-96001eff1b45?ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&ixlib=rb-1.2.1&auto=format&fit=crop&w=1500&q=80"
+            option-1-image="./img/statue-of-liberty.jpg"
             option-1-image-alt="Statue of Liberty"
             option-1-correct
             option-1-confetti="🎉"
-            option-2-image="https://images.unsplash.com/photo-1610312278520-bcc893a3ff1d?ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&ixlib=rb-1.2.1&auto=format&fit=crop&w=1460&q=80"
+            option-2-image="./img/golden-gate-bridge.jpg"
             option-2-image-alt="Golden Gate Bridge"
-            option-3-image="https://images.unsplash.com/photo-1585436588477-340db86fc852?ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&ixlib=rb-1.2.1&auto=format&fit=crop&w=2804&q=80"
+            option-3-image="./img/cristo-redentor.jpg"
             option-3-image-alt="Christ the Redeemer"
-            option-4-image="https://images.unsplash.com/photo-1543349689-9a4d426bee8e?ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&ixlib=rb-1.2.1&auto=format&fit=crop&w=1382&q=80"
+            option-4-image="./img/eiffel-tower.jpg"
             option-4-image-alt="Eiffel Tower">
           </amp-story-interactive-img-quiz>
         </amp-story-grid-layer>
diff --git a/examples/visual-tests/amp-story/amp-story-landscape-templates.js b/examples/visual-tests/amp-story/amp-story-landscape-templates.js
index 11832dd7e9cd..c30cf0876039 100644
--- a/examples/visual-tests/amp-story/amp-story-landscape-templates.js
+++ b/examples/visual-tests/amp-story/amp-story-landscape-templates.js
@@ -1,11 +1,13 @@
 'use strict';
 
+const {sleep} = require('../../../build-system/tasks/visual-diff/helpers');
+
 module.exports = {
   'shows half-half template with image on the left': async (
-    page,
+    unusedPage,
     unusedName
   ) => {
-    await page.waitForTimeout(1600);
+    await sleep(1600);
   },
   'shows half-half template with image on the right': async (
     page,
diff --git a/examples/visual-tests/amp-story/amp-story-live-story.js b/examples/visual-tests/amp-story/amp-story-live-story.js
index 4c8933b6ba86..ac01afaeb6d9 100644
--- a/examples/visual-tests/amp-story/amp-story-live-story.js
+++ b/examples/visual-tests/amp-story/amp-story-live-story.js
@@ -1,12 +1,14 @@
 'use strict';
 
+const {sleep} = require('../../../build-system/tasks/visual-diff/helpers');
+
 module.exports = {
   'should show the notification.': async (page) => {
     await page.waitForSelector('amp-story-page#cover[active]');
     await page.$eval('.i-amphtml-story-system-layer', (e) =>
       e.setAttribute('i-amphtml-story-has-new-page', 'show')
     );
-    await page.waitForTimeout(2000); // For animations to finish.
+    await sleep(2000); // For animations to finish.
     await page.waitForSelector(
       '.i-amphtml-story-has-new-page-notification-container',
       {opacity: 1}
@@ -18,7 +20,7 @@ module.exports = {
     await page.$eval('.i-amphtml-story-system-layer', (e) =>
       e.setAttribute('i-amphtml-story-has-new-page', 'show')
     );
-    await page.waitForTimeout(2000); // For animations to finish.
+    await sleep(2000); // For animations to finish.
     await page.waitForSelector(
       '.i-amphtml-story-has-new-page-notification-container',
       {opacity: 1}
diff --git a/examples/visual-tests/amp-story/amp-story-page-attachment.js b/examples/visual-tests/amp-story/amp-story-page-attachment.js
index 1dc863f8a92b..dcb954cfd884 100644
--- a/examples/visual-tests/amp-story/amp-story-page-attachment.js
+++ b/examples/visual-tests/amp-story/amp-story-page-attachment.js
@@ -207,50 +207,51 @@ module.exports = {
     ]);
   },
 
-  'form presence - the input field should blur on close': async (
-    page,
-    name
-  ) => {
-    const url = await page.url();
-    const pageID = 'attachment-with-form';
-    await page.goto(`${url}#page=${pageID}`);
-    await page.waitForSelector(
-      `amp-story-page#${pageID}[active][distance="0"]`
-    );
+  // TODO(gmajoulet): fix flaky test.
+  // 'form presence - the input field should blur on close': async (
+  //   page,
+  //   name
+  // ) => {
+  //   const url = await page.url();
+  //   const pageID = 'attachment-with-form';
+  //   await page.goto(`${url}#page=${pageID}`);
+  //   await page.waitForSelector(
+  //     `amp-story-page#${pageID}[active][distance="0"]`
+  //   );
 
-    // Set the publisher domain text instead of using the actual domain, to
-    // avoid flaky test failures due to inconsistent port values.
-    await page.$eval('.i-amphtml-story-page-attachment-domain-label', (el) => {
-      el.textContent = 'www.publisherdomain.com';
-    });
+  //   // Set the publisher domain text instead of using the actual domain, to
+  //   // avoid flaky test failures due to inconsistent port values.
+  //   await page.$eval('.i-amphtml-story-page-attachment-domain-label', (el) => {
+  //     el.textContent = 'www.publisherdomain.com';
+  //   });
 
-    // Open the page attachment.
-    await page.waitForSelector(
-      `amp-story-page#${pageID} .i-amphtml-story-inline-page-attachment-chip`
-    );
-    await page.tap(
-      `amp-story-page#${pageID} .i-amphtml-story-inline-page-attachment-chip`
-    );
+  //   // Open the page attachment.
+  //   await page.waitForSelector(
+  //     `amp-story-page#${pageID} .i-amphtml-story-inline-page-attachment-chip`
+  //   );
+  //   await page.tap(
+  //     `amp-story-page#${pageID} .i-amphtml-story-inline-page-attachment-chip`
+  //   );
 
-    // Tap the input element. This causes the soft keyboard to appear on
-    // mobile.
-    await page.waitForSelector(`amp-story-page#${pageID} input`);
-    await page.tap(`amp-story-page#${pageID} input`);
-    await page.waitForSelector(`amp-story-page#${pageID} input:focus`);
+  //   // Tap the input element. This causes the soft keyboard to appear on
+  //   // mobile.
+  //   await page.waitForSelector(`amp-story-page#${pageID} input`);
+  //   await page.tap(`amp-story-page#${pageID} input`);
+  //   await page.waitForSelector(`amp-story-page#${pageID} input:focus`);
 
-    // Dismiss the attachment by tapping an element on the story page, which
-    // should blur the input field. This ensures that the soft keyboard is
-    // dismissed.
-    await page.waitForSelector(
-      `amp-story-page#${pageID} .i-amphtml-story-page-attachment-close-button`
-    );
-    await page.tap(
-      `amp-story-page#${pageID} .i-amphtml-story-page-attachment-close-button`
-    );
-    await verifySelectorsInvisible(page, name, [
-      `amp-story-page#${pageID} input:focus`,
-    ]);
-  },
+  //   // Dismiss the attachment by tapping an element on the story page, which
+  //   // should blur the input field. This ensures that the soft keyboard is
+  //   // dismissed.
+  //   await page.waitForSelector(
+  //     `amp-story-page#${pageID} .i-amphtml-story-page-attachment-close-button`
+  //   );
+  //   await page.tap(
+  //     `amp-story-page#${pageID} .i-amphtml-story-page-attachment-close-button`
+  //   );
+  //   await verifySelectorsInvisible(page, name, [
+  //     `amp-story-page#${pageID} input:focus`,
+  //   ]);
+  // },
 
   'form absence - the domain label should not display': async (page, name) => {
     const url = await page.url();
diff --git a/examples/visual-tests/amp-story/amp-story-pagination-buttons.js b/examples/visual-tests/amp-story/amp-story-pagination-buttons.js
index 7576f7822cf0..9a4d6852783b 100644
--- a/examples/visual-tests/amp-story/amp-story-pagination-buttons.js
+++ b/examples/visual-tests/amp-story/amp-story-pagination-buttons.js
@@ -22,14 +22,4 @@ module.exports = {
       '.prev-container > button.i-amphtml-story-button-move',
     ]);
   },
-  'shows corresponding buttons for last page': async (page, name) => {
-    await page.tap('.next-container > button.i-amphtml-story-button-move');
-    await page.waitForSelector('amp-story-page#page-2[active]');
-    await page.tap('.next-container > button.i-amphtml-story-button-move');
-    await page.waitForSelector('amp-story-page#page-3[active]');
-    await verifySelectorsVisible(page, name, [
-      '.i-amphtml-story-fwd-more',
-      '.prev-container > button.i-amphtml-story-button-move',
-    ]);
-  },
 };
diff --git a/examples/visual-tests/amp-story/amp-story-shopping-landscape.html b/examples/visual-tests/amp-story/amp-story-shopping-landscape.html
new file mode 100644
index 000000000000..2a82932e95fc
--- /dev/null
+++ b/examples/visual-tests/amp-story/amp-story-shopping-landscape.html
@@ -0,0 +1,274 @@
+<!doctype html>
+<html amp lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Shopping</title>
+    <link rel="canonical" href="amps.html">
+    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+    <script async src="https://cdn.ampproject.org/v0.js"></script>
+    <script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
+    <script async custom-element="amp-story-auto-analytics" src="https://cdn.ampproject.org/v0/amp-story-auto-analytics-0.1.js"></script>
+    <script async custom-element="amp-story-shopping" src="https://cdn.ampproject.org/v0/amp-story-shopping-0.1.js"></script>
+    <style amp-custom>
+      [data-product-id="lamp"] {
+        top: 31%;
+        left: 1%;
+      }
+      [data-product-id="art"] {
+        top: 15%;
+        left: 40%;
+      }
+      [data-product-id="chair"] {
+        top: 53%;
+        left: 30%;
+      }
+      [data-product-id="flowers"] {
+        top: 46%;
+        left: 83%;
+      }
+      /* Prevents CSS animations from running. */
+      * {
+        animation-duration: 0s !important
+      }
+    </style>
+  </head>
+  <body>
+    <amp-story-auto-analytics gtag-id="UA-174115079-1"></amp-story-auto-analytics>
+    <amp-story
+        standalone
+        title="Story Shopping Component"
+        publisher="AMP Story Shopping"
+        publisher-logo-src="example.com/logo.png"
+        poster-portrait-src="example.com/poster.jpg"
+        supports-landscape>
+      <amp-story-page id="inline-light-theme">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat1.jpg"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <amp-story-shopping-tag data-product-id="lamp" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="art" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="chair" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="flowers" ></amp-story-shopping-tag>
+        </amp-story-grid-layer>
+        <!--
+          Example of Inline config. Multiple product tags with icon defined.
+        -->
+        <amp-story-shopping-attachment>
+          <script type="application/json">
+            {
+                "items" : [
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "lamp",
+                    "productTitle": "Brass Lamp",
+                    "productBrand": "Lamp Co",
+                    "productPrice": 799.00,
+                    "productPriceCurrency": "USD",
+                    "productImages": [
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 1"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 2"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 3"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 4"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 5"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 6"}
+                    ],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "One newline after this. \n Two newlines after this. \n\n  Five consecutive newlines after this, should become 2 newlines. \n\n\n\n\n Many consecutive newlines with different spacing and tabs after this, should become 2 newlines. \n          \n\n   \n  \n \n  \n \n I hope it works!"
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "art",
+                    "productTitle": "Abstract Art",
+                    "productBrand": "V. Artsy",
+                    "productPrice": 1200.00,
+                    "productPriceCurrency": "INR",
+                    "productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "art"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. \n Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "chair",
+                    "productTitle": "Yellow chair",
+                    "productPrice": 1000.00,
+                    "productPriceCurrency": "BRL",
+                    "productTagText": "The perfectly imperfect yellow chair",
+                    "productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "chair"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "flowers",
+                    "productTitle": "Flowers",
+                    "productBrand": "Very Long Flower Company Name",
+                    "productPrice": 10.00,
+                    "productPriceCurrency": "USD",
+                    "productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
+                    "productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "flowers"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   }
+                ]
+              }
+          </script>
+        </amp-story-shopping-attachment>
+      </amp-story-page>
+      <amp-story-page id="inline-dark-theme">
+        <!--
+          Dark theme example of Inline config. Multiple product tags with icon defined.
+        -->
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat1.jpg"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <amp-story-shopping-tag data-product-id="lamp" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="art" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="chair" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="flowers" ></amp-story-shopping-tag>
+        </amp-story-grid-layer>
+        <amp-story-shopping-attachment theme="dark">
+          <script type="application/json">
+            {
+                "items" : [
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "lamp",
+                    "productTitle": "Brass Lamp",
+                    "productBrand": "Lamp Co",
+                    "productPrice": 799.00,
+                    "productPriceCurrency": "USD",
+                    "productImages": [
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 1"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 2"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 3"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 4"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 5"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 6"}
+                    ],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. \n Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "art",
+                    "productTitle": "Abstract Art",
+                    "productBrand": "V. Artsy",
+                    "productPrice": 1200.00,
+                    "productPriceCurrency": "INR",
+                    "productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "art"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. \n Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "chair",
+                    "productTitle": "Yellow chair",
+                    "productPrice": 1000.00,
+                    "productPriceCurrency": "BRL",
+                    "productTagText": "The perfectly imperfect yellow chair",
+                    "productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "chair"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. \n Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "flowers",
+                    "productTitle": "Flowers",
+                    "productBrand": "Very Long Flower Company Name",
+                    "productPrice": 10.00,
+                    "productPriceCurrency": "USD",
+                    "productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
+                    "productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "flowers"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. \n Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   }
+                ]
+              }
+          </script>
+        </amp-story-shopping-attachment>
+      </amp-story-page>
+      <amp-story-page id="remote-with-product">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat1.jpg"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <amp-story-shopping-tag data-product-id="art" ></amp-story-shopping-tag>
+        </amp-story-grid-layer>
+        <!--
+          Example of:
+          CTA Button rendering due to remote product tag existing, but no inline.
+        -->
+        <amp-story-shopping-attachment theme="dark" src="/examples/amp-story/shopping/remote.json">
+          <script type="application/json">
+            {
+              "items" : []
+            }
+          </script>
+        </amp-story-shopping-attachment>
+      </amp-story-page>
+      <amp-story-page id="inline-no-product">
+      <amp-story-grid-layer template="fill">
+        <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat1.jpg"></amp-img>
+      </amp-story-grid-layer>
+        <!--
+          Example of:
+          CTA Button not rendering due to no product tags.
+        -->
+      <amp-story-shopping-attachment>
+        <script type="application/json">
+          {
+            "items" : []
+          }
+        </script>
+      </amp-story-shopping-attachment>
+      </amp-story-page>
+       <!--
+          Example of:
+          CTA Button not rendering due to no shopping attachment.
+        -->
+      <amp-story-page id="remote-dark-theme">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat1.jpg"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <amp-story-shopping-tag data-product-id="art" ></amp-story-shopping-tag>
+        </amp-story-grid-layer>
+      </amp-story-page>
+    </amp-story>
+  </body>
+</html>
diff --git a/examples/visual-tests/amp-story/amp-story-shopping-lang-de.html b/examples/visual-tests/amp-story/amp-story-shopping-lang-de.html
new file mode 100644
index 000000000000..727ba847c827
--- /dev/null
+++ b/examples/visual-tests/amp-story/amp-story-shopping-lang-de.html
@@ -0,0 +1,273 @@
+<!doctype html>
+<html amp lang="de">
+  <head>
+    <meta charset="utf-8">
+    <title>Shopping</title>
+    <link rel="canonical" href="amps.html">
+    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+    <script async src="https://cdn.ampproject.org/v0.js"></script>
+    <script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
+    <script async custom-element="amp-story-auto-analytics" src="https://cdn.ampproject.org/v0/amp-story-auto-analytics-0.1.js"></script>
+    <script async custom-element="amp-story-shopping" src="https://cdn.ampproject.org/v0/amp-story-shopping-0.1.js"></script>
+    <style amp-custom>
+      [data-product-id="lamp"] {
+        top: 31%;
+        left: 1%;
+      }
+      [data-product-id="art"] {
+        top: 15%;
+        left: 40%;
+      }
+      [data-product-id="chair"] {
+        top: 53%;
+        left: 30%;
+      }
+      [data-product-id="flowers"] {
+        top: 46%;
+        left: 83%;
+      }
+      /* Prevents CSS animations from running. */
+      * {
+        animation-duration: 0s !important
+      }
+    </style>
+  </head>
+  <body>
+    <amp-story-auto-analytics gtag-id="UA-174115079-1"></amp-story-auto-analytics>
+    <amp-story
+        standalone
+        title="Story Shopping Component"
+        publisher="AMP Story Shopping"
+        publisher-logo-src="example.com/logo.png"
+        poster-portrait-src="example.com/poster.jpg">
+      <amp-story-page id="inline-light-theme">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat1.jpg"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <amp-story-shopping-tag data-product-id="lamp" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="art" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="chair" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="flowers" ></amp-story-shopping-tag>
+        </amp-story-grid-layer>
+        <!--
+          Example of Inline config. Multiple product tags with icon defined.
+        -->
+        <amp-story-shopping-attachment>
+          <script type="application/json">
+            {
+                "items" : [
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "lamp",
+                    "productTitle": "Brass Lamp",
+                    "productBrand": "Lamp Co",
+                    "productPrice": 799.00,
+                    "productPriceCurrency": "USD",
+                    "productImages": [
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 1"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 2"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 3"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 4"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 5"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 6"}
+                    ],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "One newline after this. \n Two newlines after this. \n\n  Five consecutive newlines after this, should become 2 newlines. \n\n\n\n\n Many consecutive newlines with different spacing and tabs after this, should become 2 newlines. \n          \n\n   \n  \n \n  \n \n I hope it works!"
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "art",
+                    "productTitle": "Abstract Art",
+                    "productBrand": "V. Artsy",
+                    "productPrice": 1200.00,
+                    "productPriceCurrency": "INR",
+                    "productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "art"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "chair",
+                    "productTitle": "Yellow chair",
+                    "productPrice": 1000.00,
+                    "productPriceCurrency": "BRL",
+                    "productTagText": "The perfectly imperfect yellow chair",
+                    "productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "chair"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "flowers",
+                    "productTitle": "Flowers",
+                    "productBrand": "Very Long Flower Company Name",
+                    "productPrice": 10.00,
+                    "productPriceCurrency": "USD",
+                    "productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
+                    "productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "flowers"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. \n Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   }
+                ]
+              }
+          </script>
+        </amp-story-shopping-attachment>
+      </amp-story-page>
+      <amp-story-page id="inline-dark-theme">
+        <!--
+          Dark theme example of Inline config. Multiple product tags with icon defined.
+        -->
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat1.jpg"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <amp-story-shopping-tag data-product-id="lamp" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="art" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="chair" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="flowers" ></amp-story-shopping-tag>
+        </amp-story-grid-layer>
+        <amp-story-shopping-attachment theme="dark">
+          <script type="application/json">
+            {
+                "items" : [
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "lamp",
+                    "productTitle": "Brass Lamp",
+                    "productBrand": "Lamp Co",
+                    "productPrice": 799.00,
+                    "productPriceCurrency": "USD",
+                    "productImages": [
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 1"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 2"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 3"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 4"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 5"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 6"}
+                    ],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. \n Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "art",
+                    "productTitle": "Abstract Art",
+                    "productBrand": "V. Artsy",
+                    "productPrice": 1200.00,
+                    "productPriceCurrency": "INR",
+                    "productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "art"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. \n Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "chair",
+                    "productTitle": "Yellow chair",
+                    "productPrice": 1000.00,
+                    "productPriceCurrency": "BRL",
+                    "productTagText": "The perfectly imperfect yellow chair",
+                    "productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "chair"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. \n Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "flowers",
+                    "productTitle": "Flowers",
+                    "productBrand": "Very Long Flower Company Name",
+                    "productPrice": 10.00,
+                    "productPriceCurrency": "USD",
+                    "productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
+                    "productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "flowers"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. \n Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   }
+                ]
+              }
+          </script>
+        </amp-story-shopping-attachment>
+      </amp-story-page>
+      <amp-story-page id="remote-with-product">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat1.jpg"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <amp-story-shopping-tag data-product-id="art" ></amp-story-shopping-tag>
+        </amp-story-grid-layer>
+        <!--
+          Example of:
+          CTA Button rendering due to remote product tag existing, but no inline.
+        -->
+        <amp-story-shopping-attachment theme="dark" src="/examples/amp-story/shopping/remote.json">
+          <script type="application/json">
+            {
+              "items" : []
+            }
+          </script>
+        </amp-story-shopping-attachment>
+      </amp-story-page>
+      <amp-story-page id="inline-no-product">
+      <amp-story-grid-layer template="fill">
+        <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat1.jpg"></amp-img>
+      </amp-story-grid-layer>
+        <!--
+          Example of:
+          CTA Button not rendering due to no product tags.
+        -->
+      <amp-story-shopping-attachment>
+        <script type="application/json">
+          {
+            "items" : []
+          }
+        </script>
+      </amp-story-shopping-attachment>
+      </amp-story-page>
+       <!--
+          Example of:
+          CTA Button not rendering due to no shopping attachment.
+        -->
+      <amp-story-page id="remote-dark-theme">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat1.jpg"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <amp-story-shopping-tag data-product-id="art" ></amp-story-shopping-tag>
+        </amp-story-grid-layer>
+      </amp-story-page>
+    </amp-story>
+  </body>
+</html>
diff --git a/examples/visual-tests/amp-story/amp-story-shopping-rtl.html b/examples/visual-tests/amp-story/amp-story-shopping-rtl.html
new file mode 100644
index 000000000000..cc48f71f363d
--- /dev/null
+++ b/examples/visual-tests/amp-story/amp-story-shopping-rtl.html
@@ -0,0 +1,273 @@
+<!doctype html>
+<html amp lang="en" dir="rtl">
+  <head>
+    <meta charset="utf-8">
+    <title>Shopping</title>
+    <link rel="canonical" href="amps.html">
+    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+    <script async src="https://cdn.ampproject.org/v0.js"></script>
+    <script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
+    <script async custom-element="amp-story-auto-analytics" src="https://cdn.ampproject.org/v0/amp-story-auto-analytics-0.1.js"></script>
+    <script async custom-element="amp-story-shopping" src="https://cdn.ampproject.org/v0/amp-story-shopping-0.1.js"></script>
+    <style amp-custom>
+      [data-product-id="lamp"] {
+        top: 31%;
+        left: 1%;
+      }
+      [data-product-id="art"] {
+        top: 15%;
+        left: 40%;
+      }
+      [data-product-id="chair"] {
+        top: 53%;
+        left: 30%;
+      }
+      [data-product-id="flowers"] {
+        top: 46%;
+        left: 83%;
+      }
+      /* Prevents CSS animations from running. */
+      * {
+        animation-duration: 0s !important
+      }
+    </style>
+  </head>
+  <body>
+    <amp-story-auto-analytics gtag-id="UA-174115079-1"></amp-story-auto-analytics>
+    <amp-story
+        standalone
+        title="Story Shopping Component"
+        publisher="AMP Story Shopping"
+        publisher-logo-src="example.com/logo.png"
+        poster-portrait-src="example.com/poster.jpg">
+      <amp-story-page id="inline-light-theme">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat1.jpg"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <amp-story-shopping-tag data-product-id="lamp" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="art" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="chair" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="flowers" ></amp-story-shopping-tag>
+        </amp-story-grid-layer>
+        <!--
+          Example of Inline config. Multiple product tags with icon defined.
+        -->
+        <amp-story-shopping-attachment>
+          <script type="application/json">
+            {
+                "items" : [
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "lamp",
+                    "productTitle": "Brass Lamp",
+                    "productBrand": "Lamp Co",
+                    "productPrice": 799.00,
+                    "productPriceCurrency": "USD",
+                    "productImages": [
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 1"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 2"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 3"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 4"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 5"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 6"}
+                    ],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "art",
+                    "productTitle": "Abstract Art",
+                    "productBrand": "V. Artsy",
+                    "productPrice": 1200.00,
+                    "productPriceCurrency": "INR",
+                    "productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "art"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "chair",
+                    "productTitle": "Yellow chair",
+                    "productPrice": 1000.00,
+                    "productPriceCurrency": "BRL",
+                    "productTagText": "The perfectly imperfect yellow chair",
+                    "productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "chair"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "flowers",
+                    "productTitle": "Flowers",
+                    "productBrand": "Very Long Flower Company Name",
+                    "productPrice": 10.00,
+                    "productPriceCurrency": "USD",
+                    "productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
+                    "productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "flowers"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. \n Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   }
+                ]
+              }
+          </script>
+        </amp-story-shopping-attachment>
+      </amp-story-page>
+      <amp-story-page id="inline-dark-theme">
+        <!--
+          Dark theme example of Inline config. Multiple product tags with icon defined.
+        -->
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat1.jpg"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <amp-story-shopping-tag data-product-id="lamp" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="art" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="chair" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="flowers" ></amp-story-shopping-tag>
+        </amp-story-grid-layer>
+        <amp-story-shopping-attachment theme="dark">
+          <script type="application/json">
+            {
+                "items" : [
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "lamp",
+                    "productTitle": "Brass Lamp",
+                    "productBrand": "Lamp Co",
+                    "productPrice": 799.00,
+                    "productPriceCurrency": "USD",
+                    "productImages": [
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 1"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 2"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 3"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 4"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 5"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 6"}
+                    ],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. \n Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "art",
+                    "productTitle": "Abstract Art",
+                    "productBrand": "V. Artsy",
+                    "productPrice": 1200.00,
+                    "productPriceCurrency": "INR",
+                    "productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "art"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. \n Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "chair",
+                    "productTitle": "Yellow chair",
+                    "productPrice": 1000.00,
+                    "productPriceCurrency": "BRL",
+                    "productTagText": "The perfectly imperfect yellow chair",
+                    "productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "chair"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. \n Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "flowers",
+                    "productTitle": "Flowers",
+                    "productBrand": "Very Long Flower Company Name",
+                    "productPrice": 10.00,
+                    "productPriceCurrency": "USD",
+                    "productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
+                    "productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "flowers"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. \n Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   }
+                ]
+              }
+          </script>
+        </amp-story-shopping-attachment>
+      </amp-story-page>
+      <amp-story-page id="remote-with-product">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat1.jpg"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <amp-story-shopping-tag data-product-id="art" ></amp-story-shopping-tag>
+        </amp-story-grid-layer>
+        <!--
+          Example of:
+          CTA Button rendering due to remote product tag existing, but no inline.
+        -->
+        <amp-story-shopping-attachment theme="dark" src="/examples/amp-story/shopping/remote.json">
+          <script type="application/json">
+            {
+              "items" : []
+            }
+          </script>
+        </amp-story-shopping-attachment>
+      </amp-story-page>
+      <amp-story-page id="inline-no-product">
+      <amp-story-grid-layer template="fill">
+        <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat1.jpg"></amp-img>
+      </amp-story-grid-layer>
+        <!--
+          Example of:
+          CTA Button not rendering due to no product tags.
+        -->
+      <amp-story-shopping-attachment>
+        <script type="application/json">
+          {
+            "items" : []
+          }
+        </script>
+      </amp-story-shopping-attachment>
+      </amp-story-page>
+       <!--
+          Example of:
+          CTA Button not rendering due to no shopping attachment.
+        -->
+      <amp-story-page id="remote-dark-theme">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat1.jpg"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <amp-story-shopping-tag data-product-id="art" ></amp-story-shopping-tag>
+        </amp-story-grid-layer>
+      </amp-story-page>
+    </amp-story>
+  </body>
+</html>
diff --git a/examples/visual-tests/amp-story/amp-story-shopping.html b/examples/visual-tests/amp-story/amp-story-shopping.html
index 5708c281d86e..fea9fa399629 100644
--- a/examples/visual-tests/amp-story/amp-story-shopping.html
+++ b/examples/visual-tests/amp-story/amp-story-shopping.html
@@ -2,42 +2,268 @@
 <html amp lang="en">
   <head>
     <meta charset="utf-8">
+    <title>Shopping</title>
+    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
     <script async src="https://cdn.ampproject.org/v0.js"></script>
     <script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
     <script async custom-element="amp-story-shopping" src="https://cdn.ampproject.org/v0/amp-story-shopping-0.1.js"></script>
-    <title>AMP Story Shopping</title>
-    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
-    <link rel="canonical" href="index.html">
-    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
     <style amp-custom>
-      .i-amphtml-story-spinner-container {
-        /* Hide the spinner for loading pages, since this causes flakes */
-        display: none;
+      [data-product-id="lamp"] {
+        top: 31%;
+        left: 1%;
+      }
+      [data-product-id="art"] {
+        top: 15%;
+        left: 40%;
+      }
+      [data-product-id="chair"] {
+        top: 53%;
+        left: 30%;
+      }
+      [data-product-id="flowers"] {
+        top: 46%;
+        left: 83%;
+      }
+      /* Prevents CSS animations from running. */
+      * {
+        animation-duration: 0s !important
       }
     </style>
   </head>
-
   <body>
-    <amp-story standalone publisher="AMP Team" title="Visual Diff Test"
-        publisher-logo-src="/examples/visual-tests/photos/120.png"
-        poster-portrait-src="/examples/visual-tests/picsum.photos/image981_900x1600.jpg"
-        poster-landscape-src="/examples/visual-tests/picsum.photos/image981_1600x900.jpg"
-        poster-square-src="/examples/visual-tests/picsum.photos/image981_1600x1600.jpg"
-        supports-landscape>
-      <amp-story-page id="default">
-        <amp-story-shopping-config layout='nodisplay'></amp-story-shopping-config>
+    <amp-story
+        standalone
+        title="Story Shopping Component"
+        publisher="AMP Story Shopping"
+        publisher-logo-src="example.com/logo.png"
+        poster-portrait-src="example.com/poster.jpg">
+      <amp-story-page id="inline-light-theme">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat1.jpg"></amp-img>
+        </amp-story-grid-layer>
         <amp-story-grid-layer template="vertical">
-          <amp-story-shopping-tag></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="lamp" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="art" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="chair" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="flowers" ></amp-story-shopping-tag>
         </amp-story-grid-layer>
-        <amp-story-shopping-attachment layout='nodisplay'></amp-story-shopping-attachment>
+        <!--
+          Example of Inline config. Multiple product tags with icon defined.
+        -->
+        <amp-story-shopping-attachment>
+          <script type="application/json">
+            {
+                "items" : [
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "lamp",
+                    "productTitle": "Brass Lamp",
+                    "productBrand": "Lamp Co",
+                    "productPrice": 799.00,
+                    "productPriceCurrency": "USD",
+                    "productImages": [
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 1"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 2"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 3"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 4"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 5"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 6"}
+                    ],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "One newline after this. \n Two newlines after this. \n\n  Five consecutive newlines after this, should become 2 newlines. \n\n\n\n\n Many consecutive newlines with different spacing and tabs after this, should become 2 newlines. \n          \n\n   \n  \n \n  \n \n I hope it works!"
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "art",
+                    "productTitle": "Abstract Art",
+                    "productBrand": "V. Artsy",
+                    "productPrice": 1200.00,
+                    "productPriceCurrency": "INR",
+                    "productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "art"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. \n Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "chair",
+                    "productTitle": "Yellow chair",
+                    "productPrice": 1000.00,
+                    "productPriceCurrency": "BRL",
+                    "productTagText": "The perfectly imperfect yellow chair",
+                    "productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "chair"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "flowers",
+                    "productTitle": "Flowers",
+                    "productBrand": "Very Long Flower Company Name",
+                    "productPrice": 10.00,
+                    "productPriceCurrency": "USD",
+                    "productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
+                    "productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "flowers"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   }
+                ]
+              }
+          </script>
+        </amp-story-shopping-attachment>
       </amp-story-page>
-
-      <amp-story-page id="dark-theme">
-        <amp-story-shopping-config layout='nodisplay'></amp-story-shopping-config>
+      <amp-story-page id="inline-dark-theme">
+        <!--
+          Dark theme example of Inline config. Multiple product tags with icon defined.
+        -->
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat1.jpg"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <amp-story-shopping-tag data-product-id="lamp" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="art" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="chair" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="flowers" ></amp-story-shopping-tag>
+        </amp-story-grid-layer>
+        <amp-story-shopping-attachment theme="dark">
+          <script type="application/json">
+            {
+                "items" : [
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "lamp",
+                    "productTitle": "Brass Lamp",
+                    "productBrand": "Lamp Co",
+                    "productPrice": 799.00,
+                    "productPriceCurrency": "USD",
+                    "productImages": [
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 1"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 2"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 3"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 4"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 5"},
+                       {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 6"}
+                    ],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. \n Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "art",
+                    "productTitle": "Abstract Art",
+                    "productBrand": "V. Artsy",
+                    "productPrice": 1200.00,
+                    "productPriceCurrency": "INR",
+                    "productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "art"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. \n Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "chair",
+                    "productTitle": "Yellow chair",
+                    "productPrice": 1000.00,
+                    "productPriceCurrency": "BRL",
+                    "productTagText": "The perfectly imperfect yellow chair",
+                    "productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "chair"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. \n Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "flowers",
+                    "productTitle": "Flowers",
+                    "productBrand": "Very Long Flower Company Name",
+                    "productPrice": 10.00,
+                    "productPriceCurrency": "USD",
+                    "productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
+                    "productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "flowers"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. \n Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   }
+                ]
+              }
+          </script>
+        </amp-story-shopping-attachment>
+      </amp-story-page>
+      <amp-story-page id="remote-with-product">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat1.jpg"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <amp-story-shopping-tag data-product-id="art" ></amp-story-shopping-tag>
+        </amp-story-grid-layer>
+        <!--
+          Example of:
+          CTA Button rendering due to remote product tag existing, but no inline.
+        -->
+        <amp-story-shopping-attachment theme="dark" src="/examples/amp-story/shopping/remote.json">
+          <script type="application/json">
+            {
+              "items" : []
+            }
+          </script>
+        </amp-story-shopping-attachment>
+      </amp-story-page>
+      <amp-story-page id="inline-no-product">
+      <amp-story-grid-layer template="fill">
+        <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat1.jpg"></amp-img>
+      </amp-story-grid-layer>
+        <!--
+          Example of:
+          CTA Button not rendering due to no product tags.
+        -->
+      <amp-story-shopping-attachment>
+        <script type="application/json">
+          {
+            "items" : []
+          }
+        </script>
+      </amp-story-shopping-attachment>
+      </amp-story-page>
+       <!--
+          Example of:
+          CTA Button not rendering due to no shopping attachment.
+        -->
+      <amp-story-page id="remote-dark-theme">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/amp-story/img/cat1.jpg"></amp-img>
+        </amp-story-grid-layer>
         <amp-story-grid-layer template="vertical">
-          <amp-story-shopping-tag></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="art" ></amp-story-shopping-tag>
         </amp-story-grid-layer>
-        <amp-story-shopping-attachment layout='nodisplay' theme="dark"></amp-story-shopping-attachment>
       </amp-story-page>
     </amp-story>
   </body>
diff --git a/examples/visual-tests/amp-story/amp-story-shopping.js b/examples/visual-tests/amp-story/amp-story-shopping.js
index 72a57350f9f2..fc7d0538bd59 100644
--- a/examples/visual-tests/amp-story/amp-story-shopping.js
+++ b/examples/visual-tests/amp-story/amp-story-shopping.js
@@ -6,7 +6,7 @@ const {
 
 module.exports = {
   'dark theme - shopping CTA UI should display': async (page, name) => {
-    const pageID = 'dark-theme';
+    const pageID = 'inline-dark-theme';
     const url = await page.url();
     await page.goto(`${url}#page=${pageID}`);
     await page.waitForSelector(
@@ -16,4 +16,101 @@ module.exports = {
       '.i-amphtml-story-page-open-attachment[active]',
     ]);
   },
+  'displays shopping PLP (product list page)': async (page, name) => {
+    const pageID = 'inline-light-theme';
+    const url = await page.url();
+    await page.goto(`${url}#page=${pageID}`);
+    await page.waitForSelector(
+      `amp-story-page#${pageID}[active][distance="0"]`
+    );
+    await page.tap(
+      `amp-story-page#${pageID} .i-amphtml-story-inline-page-attachment-chip`
+    );
+    await page.waitForSelector('.i-amphtml-story-draggable-drawer-open');
+    await verifySelectorsVisible(page, name, [
+      '.i-amphtml-story-draggable-drawer-open',
+    ]);
+  },
+  'dark theme - displays shopping PLP (product list page)': async (
+    page,
+    name
+  ) => {
+    const pageID = 'inline-dark-theme';
+    const url = await page.url();
+    await page.goto(`${url}#page=${pageID}`);
+    await page.waitForSelector(
+      `amp-story-page#${pageID}[active][distance="0"]`
+    );
+    await page.tap(
+      `amp-story-page#${pageID} .i-amphtml-story-inline-page-attachment-chip`
+    );
+    await page.waitForSelector('.i-amphtml-story-draggable-drawer-open');
+    await verifySelectorsVisible(page, name, [
+      '.i-amphtml-story-draggable-drawer-open',
+    ]);
+  },
+  'displays shopping PDP (product description page) with carousel': async (
+    page,
+    name
+  ) => {
+    const pageID = 'inline-light-theme';
+    const url = await page.url();
+    await page.goto(`${url}#page=${pageID}`);
+    await page.waitForSelector(
+      `amp-story-page#${pageID}[active][distance="0"]`
+    );
+    await page.tap(
+      `amp-story-page#${pageID} .i-amphtml-story-inline-page-attachment-chip`
+    );
+    await verifySelectorsVisible(page, name, [
+      '.i-amphtml-story-draggable-drawer-open',
+    ]);
+    await page.tap(
+      `amp-story-page#${pageID} .i-amphtml-amp-story-shopping-plp-card`
+    );
+    await page.waitForSelector('.i-amphtml-amp-story-shopping-pdp', {
+      visible: true,
+    });
+  },
+  'displays shopping PDP (product description page) without carousel': async (
+    page,
+    name
+  ) => {
+    const pageID = 'inline-light-theme';
+    const url = await page.url();
+    await page.goto(`${url}#page=${pageID}`);
+    await page.waitForSelector(
+      `amp-story-page#${pageID}[active][distance="0"]`
+    );
+    await page.tap(
+      `amp-story-page#${pageID} .i-amphtml-story-inline-page-attachment-chip`
+    );
+    await verifySelectorsVisible(page, name, [
+      '.i-amphtml-story-draggable-drawer-open',
+    ]);
+    await page.tap(
+      `amp-story-page#${pageID} .i-amphtml-amp-story-shopping-plp-card:nth-child(2)`
+    );
+    await page.waitForSelector('.i-amphtml-amp-story-shopping-pdp', {
+      visible: true,
+    });
+  },
+  'displays shopping PDP (product description page) by default when one product is on the page':
+    async (page, name) => {
+      const pageID = 'remote-with-product';
+      const url = await page.url();
+      await page.goto(`${url}#page=${pageID}`);
+      await page.waitForSelector(
+        `amp-story-page#${pageID}[active][distance="0"]`
+      );
+      await page.tap(
+        `amp-story-page#${pageID} .i-amphtml-story-inline-page-attachment-chip`
+      );
+      await verifySelectorsVisible(page, name, [
+        '.i-amphtml-story-draggable-drawer-open',
+      ]);
+      await page.waitForSelector('.i-amphtml-amp-story-shopping-pdp', {
+        visible: true,
+      });
+    },
 };
diff --git a/examples/visual-tests/amp-story/amp-story-subscriptions.html b/examples/visual-tests/amp-story/amp-story-subscriptions.html
new file mode 100644
index 000000000000..3d02c0965588
--- /dev/null
+++ b/examples/visual-tests/amp-story/amp-story-subscriptions.html
@@ -0,0 +1,228 @@
+<!DOCTYPE html>
+<html ⚡ lang="en">
+  <!-- prettier-ignore -->
+  <head>
+    <meta charset="utf-8">
+    <title>amp-story-subscriptions visual test</title>
+    <link rel="canonical" href="/examples/visual-tests/amp-story/amp-story-subscriptions.html">
+    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+    <style amp-custom>
+      body {
+        font-family: 'Roboto', sans-serif;
+      }
+      amp-story-page {
+        background: white;
+      }
+      h1 {
+        font-size: 2.875em;
+        font-weight: normal;
+        line-height: 1.174;
+        text-transform: uppercase;
+        color: #FFFFFF;
+      }
+      p {
+        font-family: Poppins;
+        color: #FFFFFF;
+      }
+      .top {
+        position: absolute;
+        left: 0;
+        top: 0;
+        width: 20px;
+        height: 20px;
+        background: green;
+      }
+      .cover-title {
+        position: absolute;
+        width: 80%;
+        height: 117px;
+        left: 10%;
+        right: 10%;
+        top: 450px;
+
+        /* display: flex; */
+        align-items: center;
+        text-align: center;
+        letter-spacing: 0.5px;
+
+        color: #FFFFFF;
+      }
+      .cover-title p {
+        display: block;
+        font-family: Playfair Display;
+        font-style: normal;
+        font-weight: bold;
+        font-size: 50px;
+        line-height: 54px;
+      }
+      .cover-subtitle {
+        position: absolute;
+        width: 80%;
+        left: 10%;
+        right: 10%;
+        height: 44px;
+        top: 565px;
+      }
+      .cover-subtitle p {
+        font-family: Poppins;
+        font-style: normal;
+        font-weight: normal;
+        font-size: 14px;
+        line-height: 20px;
+        /* or 143% */
+
+        display: flex;
+        align-items: center;
+        text-align: center;
+        letter-spacing: 1px;
+
+        color: #FFFFFF;
+      }
+      #page-1 .text-section {
+        background: linear-gradient(0deg, #483614, #483614);
+        height: 384px;
+      }
+      #page-2 .text-section {
+        background: #8B2B30;
+        height: 292px;
+      }
+      #page-3 .text-section {
+        background: #324B3C;
+        height: 332px;
+      }
+      .text-section {
+        position: absolute;
+        width: 90%;
+        /* height: 30%; */
+        left: 5%;
+        right: 5%;
+        bottom: 5%;
+        margin: auto;
+      }
+      .text-section h3 {
+        margin-top: 28px;
+        margin-left: 28px;
+        margin-right: 28px;
+
+        font-family: Poppins;
+        font-style: normal;
+        font-weight: normal;
+        font-size: 12px;
+        line-height: 16px;
+
+        align-items: center;
+        text-align: center;
+        letter-spacing: 4px;
+        text-transform: uppercase;
+
+        color: #FFFFFF;
+      }
+      .text-section p {
+        margin-top: 14px;
+        margin-left: 14px;
+        margin-right: 14px;
+
+        font-family: Poppins;
+        font-style: normal;
+        font-weight: normal;
+        font-size: 12px;
+        line-height: 20px;
+        /* or 167% */
+
+        letter-spacing: 0.5px;
+
+        color: #FFFFFF;
+      }
+      .text {
+        font-size: 1em;
+      }
+    </style>
+
+    <script async src="https://cdn.ampproject.org/v0.js"></script>
+    <script async custom-element="amp-subscriptions" src="https://cdn.ampproject.org/v0/amp-subscriptions-0.1.js"></script>
+    <script
+      async
+      custom-element="amp-subscriptions-google"
+      src="https://cdn.ampproject.org/v0/amp-subscriptions-google-0.1.js"
+    ></script>
+    <script type="application/ld+json">
+      {
+        "@context": "http://schema.org",
+        "@type": "NewsArticle",
+        "isAccessibleForFree": "False",
+        "isPartOf": {
+          "@type": ["CreativeWork", "Product"],
+          "name" : "Product A",
+          "productID": "scenic-2017.appspot.com:news"
+        }
+      }
+    </script>
+    <script type="application/json" id="amp-subscriptions">
+      {
+        "services": [
+          {
+            "authorizationUrl": "https://scenic-2017.appspot.com/amp-entitlements?pubid=scenic-2017.appspot.com&meter=1&rid=READER_ID",
+            "pingbackUrl": "https://scenic-2017.appspot.com/amp-pingback?pubid=scenic-2017.appspot.com",
+            "actions":{
+              "login": "https://scenic-2017.appspot.com/signin?rid=READER_ID",
+              "subscribe": "https://scenic-2017.appspot.com/subscribe"
+            }
+          },
+          {
+            "serviceId": "subscribe.google.com"
+          }
+        ]
+      }
+    </script>
+
+    <script async custom-element="amp-story"
+        src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
+    <script async custom-element="amp-story-subscriptions" src="https://cdn.ampproject.org/v0/amp-story-subscriptions-0.1.js"></script>
+  </head>
+  <body>
+    <amp-story standalone title="My story" publisher="Monocle" publisher-logo-src="https://res.cloudinary.com/crunchbase-production/image/upload/c_lpad,h_170,w_170,f_auto,b_white,q_auto:eco,dpr_1/tbvbvipimh2camf5nb2q" poster-portrait-src="POSTER-IMAGE-URL">
+      <amp-story-page id="cover" auto-advance-after="5s">
+        <amp-story-grid-layer template="vertical" class="box" aspect-ratio="9:16">
+          <div class="cover-title"><p>Amazing</p><p>Kyoto</p></div>
+          <div class="cover-subtitle"><p>Modern culture meets ancient traditions and beauty</p></div>
+        </amp-story-grid-layer>
+      </amp-story-page>
+
+      <amp-story-page id="page-1" auto-advance-after="5s">
+        <amp-story-grid-layer template="vertical" aspect-ratio="9:16">
+          <div class="text-section">
+            <h3>Amazing Kyoto</h3>
+            <p>Kyoto is a true embodiment of Old Japan awash with beautiful vestiges of its past glory. Beyond the futuristic Kyoto Station, modern shopping complexes, and sleek luxury hotels, lies a city with celebrated centuries-old wonders, breathtaking temples, serene Zen gardens, narrow cobbled alleyways, bustling markets and a vibrant nightlife.</p>
+            <p>By effortlessly blending the past and present, Kyoto is poised to be an alluring destination for history buffs and art lovers, gourmands, and outdoor enthusiasts. —Nano Betts</p>
+          </div>
+        </amp-story-grid-layer>
+      </amp-story-page>
+
+      <amp-story-page id="page-2">
+        <amp-story-grid-layer template="vertical" aspect-ratio="9:16">
+          <div class="text-section">
+            <h3>arashiyama</h3>
+            <p>The rolling foothills of Arashiyama are home to the iconic Sagano Bamboo Forest. The verdant grove is accessed via the 14th-century Buddhist temple Tenryu-ji. A unique serenity is experienced from the wind rustling through the soaring trees making a zawa zawa sound and the filtered sunlight filling the space with a tranquil green glow.</p>
+          </div>
+        </amp-story-grid-layer>
+      </amp-story-page>
+
+      <amp-story-page id="page-3" auto-advance-after="5s">
+        <amp-story-grid-layer template="vertical" aspect-ratio="9:16">
+          <div class="text-section">
+            <h3>Cultral Experiences</h3>
+            <p>As a birthplace of Sado, or Japanese tea ceremony, the historic neighborhoods of Gion and Higashiyama are perfect places to visit machiyas and learn about the ancient art of tea-making. During the ritual performed on a tatami floor by a professional tea master, you'll have a chance to learn about the philosophy and etiquette of drinking tea, as well as master the basics of making matcha.</p>
+          </div>
+        </amp-story-grid-layer>
+      </amp-story-page>
+
+      <amp-story-subscriptions layout='container'
+        price='$0.50/week'
+        headline='Information at your fingertips'
+        description='Subscribe for unlimited access.'
+        additional-description='Cancel anytime.'>
+      </amp-story-subscriptions>
+    </amp-story>>
+  </body>
+</html>
diff --git a/examples/visual-tests/amp-story/amp-story-subscriptions.js b/examples/visual-tests/amp-story/amp-story-subscriptions.js
new file mode 100644
index 000000000000..604bec3e4907
--- /dev/null
+++ b/examples/visual-tests/amp-story/amp-story-subscriptions.js
@@ -0,0 +1,30 @@
+'use strict';
+
+const {
+  verifySelectorsVisible,
+} = require('../../../build-system/tasks/visual-diff/verifiers');
+
+module.exports = {
+  'paywall UI should display after navigating to the paywall page': async (
+    page,
+    name
+  ) => {
+    const pageID = 'page-2';
+    const url = await page.url();
+    await page.goto(`${url}#page=${pageID}`);
+    await page.waitForSelector(`amp-subscriptions-dialog:not([hidden])`);
+    await verifySelectorsVisible(page, name, [
+      '.i-amphtml-story-subscriptions-visible',
+    ]);
+  },
+  'paywall UI should display after deep linking to the locked page after paywall page':
+    async (page, name) => {
+      const pageID = 'page-3';
+      const url = await page.url();
+      await page.goto(`${url}#page=${pageID}`);
+      await page.waitForSelector(`amp-subscriptions-dialog:not([hidden])`);
+      await verifySelectorsVisible(page, name, [
+        '.i-amphtml-story-subscriptions-visible',
+      ]);
+    },
+};
diff --git a/examples/visual-tests/amp-story/amp-story-tooltip-desktop.js b/examples/visual-tests/amp-story/amp-story-tooltip-desktop.js
index 5f13b899021b..415f926075b1 100644
--- a/examples/visual-tests/amp-story/amp-story-tooltip-desktop.js
+++ b/examples/visual-tests/amp-story/amp-story-tooltip-desktop.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const {sleep} = require('../../../build-system/tasks/visual-diff/helpers');
 const {
   verifySelectorsInvisible,
   verifySelectorsVisible,
@@ -12,20 +13,20 @@ module.exports = {
   ) => {
     await page.tap('.next-container > button.i-amphtml-story-button-move');
     await page.waitForSelector('amp-story-page#page-2[active]');
-    await page.waitForTimeout(300); // For animations to finish.
+    await sleep(300); // For animations to finish.
     await page.tap('a.title-small.center');
-    await page.waitForTimeout(800); // For animations to finish.
+    await sleep(800); // For animations to finish.
     await verifySelectorsVisible(page, name, ['a.i-amphtml-story-tooltip']);
   },
   'tapping outside tooltip should hide it': async (page, name) => {
     await page.tap('.next-container > button.i-amphtml-story-button-move');
     await page.waitForSelector('amp-story-page#page-2[active]');
-    await page.waitForTimeout(300); // For animations to finish.
+    await sleep(300); // For animations to finish.
     await page.tap('a.title-small.center');
     await page.waitForSelector('a.i-amphtml-story-tooltip');
-    await page.waitForTimeout(300); // For animations to finish.
+    await sleep(300); // For animations to finish.
     await page.tap('.i-amphtml-story-focused-state-layer');
-    await page.waitForTimeout(800); // For animations to finish.
+    await sleep(800); // For animations to finish.
     await verifySelectorsVisible(page, name, [
       '.i-amphtml-story-focused-state-layer.i-amphtml-hidden',
     ]);
@@ -33,67 +34,38 @@ module.exports = {
   'tapping on anchor tooltip should keep it open': async (page, name) => {
     await page.tap('.next-container > button.i-amphtml-story-button-move');
     await page.waitForSelector('amp-story-page#page-2[active]');
-    await page.waitForTimeout(300); // For animations to finish.
+    await sleep(300); // For animations to finish.
     await page.tap('a.title-small.center');
     await page.waitForSelector('a.i-amphtml-story-tooltip');
-    await page.waitForTimeout(300); // For animations to finish.
+    await sleep(300); // For animations to finish.
     await page.tap('a.i-amphtml-story-tooltip');
-    await page.waitForTimeout(800); // For animations to finish.
+    await sleep(800); // For animations to finish.
     await verifySelectorsVisible(page, name, ['a.i-amphtml-story-tooltip']);
   },
   'tapping arrow when tooltip is open should navigate': async (page, name) => {
     await page.tap('.next-container > button.i-amphtml-story-button-move');
     await page.waitForSelector('amp-story-page#page-2[active]');
-    await page.waitForTimeout(300); // For animations to finish.
+    await sleep(300); // For animations to finish.
     await page.tap('a.title-small.center');
     await page.waitForSelector('a.i-amphtml-story-tooltip');
-    await page.waitForTimeout(300); // For animations to finish.
+    await sleep(300); // For animations to finish.
     await page.tap('.next-container > button.i-amphtml-story-button-move');
-    await page.waitForTimeout(800); // For animations to finish.
+    await sleep(800); // For animations to finish.
     await verifySelectorsVisible(page, name, ['amp-story-page#page-3[active]']);
   },
-  'tapping on embed tooltip should expand the component': async (
-    page,
-    name
-  ) => {
-    await page.tap('.next-container > button.i-amphtml-story-button-move');
-    await page.waitForSelector('amp-story-page#page-2[active]');
-    await page.waitForTimeout(300); // For animations to finish.
-    await page.tap('amp-twitter.interactive-embed');
-    await page.waitForTimeout(300); // For animations to finish.
-    await page.tap('a.i-amphtml-story-tooltip');
-    await page.waitForTimeout(800); // For animations to finish.
-    await verifySelectorsVisible(page, name, [
-      'amp-story-page.i-amphtml-expanded-mode',
-    ]);
-  },
   'tapping on non-interactive embed should not show tooltip or block navigation':
     async (page, name) => {
       await page.tap('.next-container > button.i-amphtml-story-button-move');
       await page.waitForSelector('amp-story-page#page-2[active]');
-      await page.waitForTimeout(300); // For animations to finish.
+      await sleep(300); // For animations to finish.
       await page.tap('.next-container > button.i-amphtml-story-button-move');
       await page.waitForSelector('amp-story-page#page-3[active]');
-      await page.waitForTimeout(300); // For animations to finish.
+      await sleep(300); // For animations to finish.
       await page.tap('amp-twitter.non-interactive-embed');
-      await page.waitForTimeout(800); // For animations to finish.
+      await sleep(800); // For animations to finish.
       await verifySelectorsInvisible(page, name, ['a.i-amphtml-story-tooltip']);
       await verifySelectorsVisible(page, name, [
         'amp-story-page#page-4[active]',
       ]);
     },
-  'tapping on closing button should exit expanded view': async (page, name) => {
-    await page.tap('.next-container > button.i-amphtml-story-button-move');
-    await page.waitForSelector('amp-story-page#page-2[active]');
-    await page.waitForTimeout(300); // For animations to finish.
-    await page.tap('amp-twitter.interactive-embed');
-    await page.waitForTimeout(300); // For animations to finish.
-    await page.tap('a.i-amphtml-story-tooltip');
-    await page.waitForSelector('amp-story-page.i-amphtml-expanded-mode');
-    await page.waitForTimeout(800); // For animations to finish.
-    await page.tap('span.i-amphtml-expanded-view-close-button');
-    await verifySelectorsInvisible(page, name, [
-      'amp-story-page.i-amphtml-expanded-mode',
-    ]);
-  },
 };
diff --git a/examples/visual-tests/amp-story/amp-story-tooltip.js b/examples/visual-tests/amp-story/amp-story-tooltip.js
index e6fa5af30245..25956b25b2fe 100644
--- a/examples/visual-tests/amp-story/amp-story-tooltip.js
+++ b/examples/visual-tests/amp-story/amp-story-tooltip.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const {sleep} = require('../../../build-system/tasks/visual-diff/helpers');
 const {
   verifySelectorsInvisible,
   verifySelectorsVisible,
@@ -13,21 +14,21 @@ module.exports = {
     const screen = page.touchscreen;
     await screen.tap(200, 240);
     await page.waitForSelector('amp-story-page#page-2[active]');
-    await page.waitForTimeout(500); // For animations to finish.
+    await sleep(500); // For animations to finish.
     await page.tap('a.title-small.center');
-    await page.waitForTimeout(300); // For animations to finish.
+    await sleep(300); // For animations to finish.
     await verifySelectorsVisible(page, name, ['a.i-amphtml-story-tooltip']);
   },
   'tapping outside tooltip should hide it': async (page, name) => {
     const screen = page.touchscreen;
     await screen.tap(200, 240);
     await page.waitForSelector('amp-story-page#page-2[active]');
-    await page.waitForTimeout(150); // For animations to finish.
+    await sleep(150); // For animations to finish.
     await page.tap('a.title-small.center');
     await page.waitForSelector('a.i-amphtml-story-tooltip');
-    await page.waitForTimeout(300); // For animations to finish.
+    await sleep(300); // For animations to finish.
     await page.tap('.i-amphtml-story-focused-state-layer');
-    await page.waitForTimeout(150); // For animations to finish.
+    await sleep(150); // For animations to finish.
     await verifySelectorsVisible(page, name, [
       '.i-amphtml-story-focused-state-layer.i-amphtml-hidden',
     ]);
@@ -36,62 +37,28 @@ module.exports = {
     const screen = page.touchscreen;
     await screen.tap(200, 240);
     await page.waitForSelector('amp-story-page#page-2[active]');
-    await page.waitForTimeout(150); // For animations to finish.
+    await sleep(150); // For animations to finish.
     await page.tap('a.title-small.center');
     await page.waitForSelector('a.i-amphtml-story-tooltip');
-    await page.waitForTimeout(300); // For animations to finish.
+    await sleep(300); // For animations to finish.
     await page.tap('button.i-amphtml-story-tooltip-nav-button-left');
-    await page.waitForTimeout(150); // For animations to finish.
+    await sleep(150); // For animations to finish.
     await verifySelectorsVisible(page, name, ['amp-story-page#cover[active]']);
   },
-  'tapping on embed tooltip should expand the component': async (
-    page,
-    name
-  ) => {
-    const screen = page.touchscreen;
-    await screen.tap(200, 240);
-    await page.waitForSelector('amp-story-page#page-2[active]');
-    await page.waitForTimeout(800); // For animations to finish.
-    await page.tap('amp-twitter.interactive-embed');
-    await page.waitForSelector('a.i-amphtml-story-tooltip');
-    await page.waitForTimeout(500); // For animations to finish.
-    await page.tap('a.i-amphtml-story-tooltip');
-    await page.waitForTimeout(1000); // For animations to finish.
-    await verifySelectorsVisible(page, name, [
-      'amp-story-page.i-amphtml-expanded-mode',
-    ]);
-  },
   'tapping on non-interactive embed should not show tooltip or block navigation':
     async (page, name) => {
       const screen = page.touchscreen;
       await screen.tap(200, 240);
       await page.waitForSelector('amp-story-page#page-2[active]');
-      await page.waitForTimeout(150); // For animations to finish.
+      await sleep(150); // For animations to finish.
       await screen.tap(300, 400);
       await page.waitForSelector('amp-story-page#page-3[active]');
-      await page.waitForTimeout(150); // For animations to finish.
+      await sleep(150); // For animations to finish.
       await page.tap('amp-twitter.non-interactive-embed');
-      await page.waitForTimeout(150); // For animations to finish.
+      await sleep(150); // For animations to finish.
       await verifySelectorsInvisible(page, name, ['a.i-amphtml-story-tooltip']);
       await verifySelectorsVisible(page, name, [
         'amp-story-page#page-2[active]',
       ]);
     },
-  'tapping on closing button should exit expanded view': async (page, name) => {
-    const screen = page.touchscreen;
-    await screen.tap(200, 240);
-    await page.waitForSelector('amp-story-page#page-2[active]');
-    await page.waitForTimeout(800); // For animations to finish.
-    await page.tap('amp-twitter.interactive-embed');
-    await page.waitForSelector('a.i-amphtml-story-tooltip');
-    await page.waitForTimeout(500); // For animations to finish.
-    await page.tap('a.i-amphtml-story-tooltip');
-    await page.waitForSelector('amp-story-page.i-amphtml-expanded-mode');
-    await page.waitForTimeout(1000); // For animations to finish.
-    await page.tap('button.i-amphtml-expanded-view-close-button');
-    await page.waitForTimeout(300); // For animations to finish.
-    await verifySelectorsInvisible(page, name, [
-      'amp-story-page.i-amphtml-expanded-mode',
-    ]);
-  },
 };
diff --git a/examples/visual-tests/amp-story/img/cristo-redentor.jpg b/examples/visual-tests/amp-story/img/cristo-redentor.jpg
new file mode 100644
index 000000000000..95a7f3a5ca47
Binary files /dev/null and b/examples/visual-tests/amp-story/img/cristo-redentor.jpg differ
diff --git a/examples/visual-tests/amp-story/img/eiffel-tower.jpg b/examples/visual-tests/amp-story/img/eiffel-tower.jpg
new file mode 100644
index 000000000000..c5345ed776d3
Binary files /dev/null and b/examples/visual-tests/amp-story/img/eiffel-tower.jpg differ
diff --git a/examples/visual-tests/amp-story/img/golden-gate-bridge.jpg b/examples/visual-tests/amp-story/img/golden-gate-bridge.jpg
new file mode 100644
index 000000000000..7562dd446607
Binary files /dev/null and b/examples/visual-tests/amp-story/img/golden-gate-bridge.jpg differ
diff --git a/examples/visual-tests/amp-story/img/grand-canyon.jpg b/examples/visual-tests/amp-story/img/grand-canyon.jpg
new file mode 100644
index 000000000000..ddebc2a8aaf5
Binary files /dev/null and b/examples/visual-tests/amp-story/img/grand-canyon.jpg differ
diff --git a/examples/visual-tests/amp-story/img/hawaii.jpg b/examples/visual-tests/amp-story/img/hawaii.jpg
new file mode 100644
index 000000000000..b4e5dc6e5f94
Binary files /dev/null and b/examples/visual-tests/amp-story/img/hawaii.jpg differ
diff --git a/examples/visual-tests/amp-story/img/hong-kong.jpg b/examples/visual-tests/amp-story/img/hong-kong.jpg
new file mode 100644
index 000000000000..619d7f03681e
Binary files /dev/null and b/examples/visual-tests/amp-story/img/hong-kong.jpg differ
diff --git a/examples/visual-tests/amp-story/img/lake-tahoe.jpg b/examples/visual-tests/amp-story/img/lake-tahoe.jpg
new file mode 100644
index 000000000000..afb33a628f99
Binary files /dev/null and b/examples/visual-tests/amp-story/img/lake-tahoe.jpg differ
diff --git a/examples/visual-tests/amp-story/img/lake.jpg b/examples/visual-tests/amp-story/img/lake.jpg
new file mode 100644
index 000000000000..1e53fc618397
Binary files /dev/null and b/examples/visual-tests/amp-story/img/lake.jpg differ
diff --git a/examples/visual-tests/amp-story/img/laptop.jpg b/examples/visual-tests/amp-story/img/laptop.jpg
new file mode 100644
index 000000000000..4993f9ef248b
Binary files /dev/null and b/examples/visual-tests/amp-story/img/laptop.jpg differ
diff --git a/examples/visual-tests/amp-story/img/shopping/icon.png b/examples/visual-tests/amp-story/img/shopping/icon.png
new file mode 100644
index 000000000000..109bd42cd862
Binary files /dev/null and b/examples/visual-tests/amp-story/img/shopping/icon.png differ
diff --git a/examples/visual-tests/amp-story/img/shopping/shopping-product.jpg b/examples/visual-tests/amp-story/img/shopping/shopping-product.jpg
new file mode 100644
index 000000000000..54a220042400
Binary files /dev/null and b/examples/visual-tests/amp-story/img/shopping/shopping-product.jpg differ
diff --git a/examples/visual-tests/amp-story/img/statue-of-liberty.jpg b/examples/visual-tests/amp-story/img/statue-of-liberty.jpg
new file mode 100644
index 000000000000..0e18ac5c0775
Binary files /dev/null and b/examples/visual-tests/amp-story/img/statue-of-liberty.jpg differ
diff --git a/examples/visual-tests/amp-story/info-dialog.html b/examples/visual-tests/amp-story/info-dialog.html
index ec20ecc17e81..301aaaa8eb67 100644
--- a/examples/visual-tests/amp-story/info-dialog.html
+++ b/examples/visual-tests/amp-story/info-dialog.html
@@ -38,23 +38,6 @@
       // be displayed; adding the webview parameter tricks the document into
       // believing that it is in a viewer.
       location.hash = "webview=1";
-
-      /**
-       * On load, open the info dialog.
-       */
-      document.addEventListener('ampstory:load', () => {
-        const storyEl = document.querySelector('amp-story');
-
-        // Automatically open the info dialog.
-        const openInfoDialogEvent = new CustomEvent('ampstory:dispatchaction', {
-          detail: {
-            action: 'toggleInfoDialog',
-            data: true,
-          }
-        });
-
-        storyEl.dispatchEvent(openInfoDialogEvent);
-      });
     </script>
   </head>
 
diff --git a/examples/visual-tests/amp-story/info-dialog.js b/examples/visual-tests/amp-story/info-dialog.js
new file mode 100644
index 000000000000..029a67f34c3b
--- /dev/null
+++ b/examples/visual-tests/amp-story/info-dialog.js
@@ -0,0 +1,9 @@
+'use strict';
+
+module.exports = {
+  'show after button click': async (page) => {
+    await page.waitForSelector('.i-amphtml-story-loaded');
+    await page.tap('.i-amphtml-story-info-control');
+    await page.waitForSelector('.i-amphtml-story-info-dialog');
+  },
+};
diff --git a/examples/visual-tests/amp-story/info-dialog.rtl.html b/examples/visual-tests/amp-story/info-dialog.rtl.html
index 91f782c4eb74..d184e8998e43 100644
--- a/examples/visual-tests/amp-story/info-dialog.rtl.html
+++ b/examples/visual-tests/amp-story/info-dialog.rtl.html
@@ -35,23 +35,6 @@
       // be displayed; adding the webview parameter tricks the document into
       // believing that it is in a viewer.
       location.hash = "webview=1";
-
-      /**
-       * On load, open the info dialog.
-       */
-      document.addEventListener('ampstory:load', () => {
-        const storyEl = document.querySelector('amp-story');
-
-        // Automatically open the info dialog.
-        const openInfoDialogEvent = new CustomEvent('ampstory:dispatchaction', {
-          detail: {
-            action: 'toggleInfoDialog',
-            data: true,
-          }
-        });
-
-        storyEl.dispatchEvent(openInfoDialogEvent);
-      });
     </script>
   </head>
 
diff --git a/examples/visual-tests/amp-story/share-menu.html b/examples/visual-tests/amp-story/share-menu.html
index 7eb588edad2f..685f208fb86d 100644
--- a/examples/visual-tests/amp-story/share-menu.html
+++ b/examples/visual-tests/amp-story/share-menu.html
@@ -5,12 +5,10 @@
     <script async src="https://cdn.ampproject.org/v0.js"></script>
     <script async custom-element="amp-story"
         src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
-    <script async custom-element="amp-video"
-        src="https://cdn.ampproject.org/v0/amp-video-0.1.js"></script>
     <title>amp-story share menu visual diff</title>
     <meta name="viewport"
           content="width=device-width,minimum-scale=1,initial-scale=1">
-    <link rel="canonical" href="./template-vertical.html">
+    <link rel="canonical" href="./share-menu.html">
     <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
     <style amp-custom>
       amp-story-page {
@@ -28,28 +26,15 @@
         text-align: center;
         text-shadow: 3px 3px rgba(0, 0, 0, 0.5);
       }
+      /* Since it doesn't have shadow root, we need to enforce the height */
+      amp-story-share-menu {
+        height: 100%;
+      }
     </style>
-    <script>
-      // TODO(#17108): Remove this when getMode().test is set.
-      __AMP_TEST = true;
-
-      /**
-       * On load, open the share menu.
-       */
-      document.addEventListener('ampstory:load', () => {
-        const storyEl = document.querySelector('amp-story');
-
-        // Automatically open the share menu.
-        const openShareMenuEvent = new CustomEvent('ampstory:dispatchaction', {
-          detail: {
-            action: 'toggleShareMenu',
-            data: true,
-          }
-        });
-
-        storyEl.dispatchEvent(openShareMenuEvent);
-      });
-    </script>
+      <script>
+        // TODO(#17108): Remove this when getMode().test is set.
+        __AMP_TEST = true;
+      </script>
   </head>
 
   <body>
@@ -61,8 +46,8 @@
 
       <amp-story-page id="cover">
         <amp-story-grid-layer template="fill">
-          <amp-video autoplay layout="fill" poster="/examples/visual-tests/picsum.photos/image981_1600x900.jpg">
-          </amp-video>
+          <amp-img layout="fill" src="/examples/visual-tests/picsum.photos/image981_1600x900.jpg" width="3" height="5">
+          </amp-img>
         </amp-story-grid-layer>
         <amp-story-grid-layer template="vertical">
           <h1 id="hello-world">Hello world!</h1>
diff --git a/examples/visual-tests/amp-story/share-menu.js b/examples/visual-tests/amp-story/share-menu.js
new file mode 100644
index 000000000000..009832630358
--- /dev/null
+++ b/examples/visual-tests/amp-story/share-menu.js
@@ -0,0 +1,9 @@
+'use strict';
+
+module.exports = {
+  'show after button click': async (page) => {
+    await page.waitForSelector('.i-amphtml-story-loaded');
+    await page.tap('.i-amphtml-story-share-control');
+    await page.waitForSelector('.i-amphtml-story-share-menu');
+  },
+};
diff --git a/examples/visual-tests/amp-story/share-menu.rtl.html b/examples/visual-tests/amp-story/share-menu.rtl.html
index 5a97520b4114..1bf10916d8d0 100644
--- a/examples/visual-tests/amp-story/share-menu.rtl.html
+++ b/examples/visual-tests/amp-story/share-menu.rtl.html
@@ -5,12 +5,10 @@
     <script async src="https://cdn.ampproject.org/v0.js"></script>
     <script async custom-element="amp-story"
         src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
-    <script async custom-element="amp-video"
-        src="https://cdn.ampproject.org/v0/amp-video-0.1.js"></script>
     <title>amp-story share menu visual diff</title>
     <meta name="viewport"
           content="width=device-width,minimum-scale=1,initial-scale=1">
-    <link rel="canonical" href="./template-vertical.html">
+    <link rel="canonical" href="./share-menu.html">
     <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
     <style amp-custom>
       amp-story-page {
@@ -28,27 +26,14 @@
         text-align: center;
         text-shadow: 3px 3px rgba(0, 0, 0, 0.5);
       }
+      /* Since it doesn't have shadow root, we need to enforce the height */
+      amp-story-share-menu {
+        height: 100%;
+      }
     </style>
     <script>
       // TODO(#17108): Remove this when getMode().test is set.
       __AMP_TEST = true;
-
-      /**
-       * On load, open the share menu.
-       */
-      document.addEventListener('ampstory:load', () => {
-        const storyEl = document.querySelector('amp-story');
-
-        // Automatically open the share menu.
-        const openShareMenuEvent = new CustomEvent('ampstory:dispatchaction', {
-          detail: {
-            action: 'toggleShareMenu',
-            data: true,
-          }
-        });
-
-        storyEl.dispatchEvent(openShareMenuEvent);
-      });
     </script>
   </head>
 
@@ -61,14 +46,13 @@
 
       <amp-story-page id="cover">
         <amp-story-grid-layer template="fill">
-          <amp-video autoplay layout="fill" poster="/examples/visual-tests/picsum.photos/image981_1600x900.jpg">
-          </amp-video>
+          <amp-img layout="fill" src="/examples/visual-tests/picsum.photos/image981_1600x900.jpg" width="3" height="5">
+          </amp-img>
         </amp-story-grid-layer>
         <amp-story-grid-layer template="vertical">
           <h1 id="hello-world">مرحبا بالعالم</h1>
         </amp-story-grid-layer>
       </amp-story-page>
-
       <amp-story-social-share layout="nodisplay">
         <script type="application/json">
           {
@@ -86,7 +70,6 @@ <h1 id="hello-world">مرحبا بالعالم</h1>
           }
         </script>
       </amp-story-social-share>
-
     </amp-story>
   </body>
 
diff --git a/examples/visual-tests/amp-user-notification/amp-user-notification.js b/examples/visual-tests/amp-user-notification/amp-user-notification.js
index 5e8acf265a03..bc2904c51761 100644
--- a/examples/visual-tests/amp-user-notification/amp-user-notification.js
+++ b/examples/visual-tests/amp-user-notification/amp-user-notification.js
@@ -1,8 +1,14 @@
 'use strict';
 
+const {sleep} = require('../../../build-system/tasks/visual-diff/helpers');
+const {
+  verifySelectorsVisible,
+} = require('../../../build-system/tasks/visual-diff/verifiers');
+
 module.exports = {
-  'dismiss user notification': async (page, unusedName) => {
+  'dismiss user notification': async (page, name) => {
     await page.tap('amp-user-notification>button');
-    await page.waitForTimeout(500);
+    await sleep(500);
+    await verifySelectorsVisible(page, name, ['.i-amphtml-ad-default-holder']);
   },
 };
diff --git a/examples/visual-tests/amp-video-docking/amp-video-docking.js b/examples/visual-tests/amp-video-docking/amp-video-docking.js
index 18556acda5f4..a588f16e0463 100644
--- a/examples/visual-tests/amp-video-docking/amp-video-docking.js
+++ b/examples/visual-tests/amp-video-docking/amp-video-docking.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const {sleep} = require('../../../build-system/tasks/visual-diff/helpers');
 const {
   verifySelectorsVisible,
 } = require('../../../build-system/tasks/visual-diff/verifiers');
@@ -20,7 +21,7 @@ async function scroll(page, _, target = 'bottom') {
   await page.tap(`#scroll-${target}-button`);
 
   // Scrolling takes 500ms as defined by the runtime, and leeway.
-  await page.waitForTimeout(700);
+  await sleep(700);
 
   // Ensures that scrollbar is hidden before capture.
   await toggleScrollable(page, false);
@@ -28,7 +29,7 @@ async function scroll(page, _, target = 'bottom') {
 
 async function dock(page, name) {
   await page.tap('#play-button');
-  await page.waitForTimeout(200); // active playback
+  await sleep(200); // active playback
   await scroll(page);
   await verifySelectorsVisible(page, name, ['.amp-video-docked-shadow']);
 }
diff --git a/examples/visual-tests/article.amp/article.amp.html b/examples/visual-tests/article.amp/article.amp.html
index c6b9ed664e8e..67afb790977c 100644
--- a/examples/visual-tests/article.amp/article.amp.html
+++ b/examples/visual-tests/article.amp/article.amp.html
@@ -220,7 +220,7 @@
   <script async custom-element="amp-app-banner" src="https://cdn.ampproject.org/v0/amp-app-banner-0.1.js" data-amp-report-test="amp-app-banner.js"></script>
   <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
   <meta name="apple-itunes-app" content="app-id=828256236, app-argument=medium://p/cb7f223fad86">
-  <link rel="manifest" href="medium-manifest.json">
+  <link rel="manifest" href="../../medium-manifest.json">
 </head>
 <body>
   <amp-sidebar id="sidebar" layout="nodisplay">
diff --git a/examples/visual-tests/unsplash.photos/BdVQU-NDtA8_500x500.jpg b/examples/visual-tests/unsplash.photos/BdVQU-NDtA8_500x500.jpg
new file mode 100644
index 000000000000..ae4cd57f63fe
Binary files /dev/null and b/examples/visual-tests/unsplash.photos/BdVQU-NDtA8_500x500.jpg differ
diff --git a/extensions/.eslintrc.js b/extensions/.eslintrc.js
deleted file mode 100644
index 317bbed007a9..000000000000
--- a/extensions/.eslintrc.js
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-// These extensions have been modified in the last 2 weeks, so we're not
-// including them yet to minimize disruption to devs actively working on them.
-const EXCLUDED_EXTENSIONS = require('./import-order-excluded.json');
-
-module.exports = {
-  'rules': {'import/order': 2},
-  'overrides': [
-    {
-      'files': EXCLUDED_EXTENSIONS.map((ext) => `./${ext}/**/*.js`),
-      'rules': {'import/order': 0},
-    },
-  ],
-};
diff --git a/extensions/OWNERS b/extensions/OWNERS
index 94c130236604..c1042e330d1e 100644
--- a/extensions/OWNERS
+++ b/extensions/OWNERS
@@ -6,7 +6,6 @@
     {
       owners: [
         {name: 'ampproject/wg-components'},
-        {name: 'ampproject/wg-bento'},
         {name: 'aghassemi', requestReviews: false},
         {name: 'gmajoulet', requestReviews: false},
         {name: 'newmuis', requestReviews: false},
diff --git a/extensions/amp-3d-gltf/0.1/amp-3d-gltf.js b/extensions/amp-3d-gltf/0.1/amp-3d-gltf.js
index 610b63675369..df88cabb32f2 100644
--- a/extensions/amp-3d-gltf/0.1/amp-3d-gltf.js
+++ b/extensions/amp-3d-gltf/0.1/amp-3d-gltf.js
@@ -1,4 +1,4 @@
-import {ActionTrust} from '#core/constants/action-constants';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
 import {Deferred} from '#core/data-structures/promise';
 import {removeElement} from '#core/dom';
 import {applyFillContent, isLayoutSizeDefined} from '#core/dom/layout';
@@ -7,7 +7,6 @@ import {
   unobserveContentSize,
 } from '#core/dom/layout/size-observer';
 import {observeIntersections} from '#core/dom/layout/viewport-observer';
-import {dict} from '#core/types/object';
 
 import {Services} from '#service';
 
@@ -42,7 +41,7 @@ export class Amp3dGltf extends AMP.BaseElement {
     this.willBeLoaded_ = new Deferred();
 
     /** @private {!JsonObject} */
-    this.context_ = dict();
+    this.context_ = {};
 
     /** @private {?Function} */
     this.unlistenMessage_ = null;
@@ -112,7 +111,7 @@ export class Amp3dGltf extends AMP.BaseElement {
 
     const useAlpha = getOption('alpha', bool, false);
 
-    this.context_ = dict({
+    this.context_ = {
       'src': resolveRelativeUrl(src, this.getAmpDoc().getUrl()),
       'renderer': {
         'alpha': useAlpha,
@@ -131,7 +130,7 @@ export class Amp3dGltf extends AMP.BaseElement {
         'enableZoom': getOption('enableZoom', bool, true),
         'autoRotate': getOption('autoRotate', bool, false),
       },
-    });
+    };
     this.registerAction(
       'setModelRotation',
       (invocation) => {
@@ -139,7 +138,7 @@ export class Amp3dGltf extends AMP.BaseElement {
           (e) => dev().error('AMP-3D-GLTF', 'setModelRotation failed: %s', e)
         );
       },
-      ActionTrust.LOW
+      ActionTrust_Enum.LOW
     );
   }
 
@@ -199,10 +198,10 @@ export class Amp3dGltf extends AMP.BaseElement {
    */
   sendCommandWhenReady_(action, args) {
     return this.willBeReady_.promise.then(() => {
-      const message = dict({
+      const message = {
         'action': action,
         'args': args,
-      });
+      };
 
       this.postMessage_('action', message);
     });
@@ -243,10 +242,7 @@ export class Amp3dGltf extends AMP.BaseElement {
    * @private
    */
   onResized_({height, width}) {
-    this.sendCommandWhenReady_(
-      'setSize',
-      dict({'width': width, 'height': height})
-    );
+    this.sendCommandWhenReady_('setSize', {'width': width, 'height': height});
   }
 
   /** @override */
diff --git a/extensions/amp-3d-gltf/0.1/test/test-amp-3d-gltf.js b/extensions/amp-3d-gltf/0.1/test/test-amp-3d-gltf.js
index e28464650bf4..4c082dcebc44 100644
--- a/extensions/amp-3d-gltf/0.1/test/test-amp-3d-gltf.js
+++ b/extensions/amp-3d-gltf/0.1/test/test-amp-3d-gltf.js
@@ -57,9 +57,7 @@ describes.realWin(
       return amp3dGltf;
     };
 
-    // TODO (#16080): this test keeps timing out for some reason.
-    // Unskip when we figure out root cause.
-    it.skip('renders iframe', async () => {
+    it('renders iframe', async () => {
       await createElement();
       expect(!!doc.body.querySelector('amp-3d-gltf > iframe')).to.be.true;
     });
diff --git a/extensions/amp-3q-player/0.1/amp-3q-player.js b/extensions/amp-3q-player/0.1/amp-3q-player.js
index 8737a1d61c1f..f1f2b84e1129 100644
--- a/extensions/amp-3q-player/0.1/amp-3q-player.js
+++ b/extensions/amp-3q-player/0.1/amp-3q-player.js
@@ -20,7 +20,7 @@ import {
   redispatch,
 } from '../../../src/iframe-video';
 import {addParamToUrl} from '../../../src/url';
-import {VideoEvents} from '../../../src/video-interface';
+import {VideoEvents_Enum} from '../../../src/video-interface';
 
 const TAG = 'amp-3q-player';
 
@@ -191,12 +191,12 @@ class Amp3QPlayer extends AMP.BaseElement {
     }
 
     redispatch(this.element, eventType, {
-      'ready': VideoEvents.LOAD,
-      'playing': VideoEvents.PLAYING,
-      'paused': VideoEvents.PAUSE,
-      'complete': VideoEvents.ENDED,
-      'muted': VideoEvents.MUTED,
-      'unmuted': VideoEvents.UNMUTED,
+      'ready': VideoEvents_Enum.LOAD,
+      'playing': VideoEvents_Enum.PLAYING,
+      'paused': VideoEvents_Enum.PAUSE,
+      'complete': VideoEvents_Enum.ENDED,
+      'muted': VideoEvents_Enum.MUTED,
+      'unmuted': VideoEvents_Enum.UNMUTED,
     });
   }
 
diff --git a/extensions/amp-3q-player/0.1/test/test-amp-3q-player.js b/extensions/amp-3q-player/0.1/test/test-amp-3q-player.js
index bdf1bec51c04..7aa6c6f22d84 100644
--- a/extensions/amp-3q-player/0.1/test/test-amp-3q-player.js
+++ b/extensions/amp-3q-player/0.1/test/test-amp-3q-player.js
@@ -8,7 +8,7 @@ import {listenOncePromise} from '#utils/event-helper';
 
 import {installResizeObserverStub} from '#testing/resize-observer-stub';
 
-import {VideoEvents} from '../../../../src/video-interface';
+import {VideoEvents_Enum} from '../../../../src/video-interface';
 
 describes.realWin(
   'amp-3q-player',
@@ -116,16 +116,16 @@ describes.realWin(
         const impl = await player.getImpl();
         const iframe = player.querySelector('iframe');
         await Promise.resolve();
-        const p1 = listenOncePromise(player, VideoEvents.MUTED);
+        const p1 = listenOncePromise(player, VideoEvents_Enum.MUTED);
         sendFakeMessage(impl, iframe, 'muted');
         await p1;
-        const p2 = listenOncePromise(player, VideoEvents.PLAYING);
+        const p2 = listenOncePromise(player, VideoEvents_Enum.PLAYING);
         sendFakeMessage(impl, iframe, 'playing');
         await p2;
-        const p3 = listenOncePromise(player, VideoEvents.PAUSE);
+        const p3 = listenOncePromise(player, VideoEvents_Enum.PAUSE);
         sendFakeMessage(impl, iframe, 'paused');
         await p3;
-        const p4 = listenOncePromise(player, VideoEvents.UNMUTED);
+        const p4 = listenOncePromise(player, VideoEvents_Enum.UNMUTED);
         sendFakeMessage(impl, iframe, 'unmuted');
         const successTimeout = timer.promise(10);
         return Promise.race([p4, successTimeout]);
diff --git a/extensions/amp-a4a/0.1/amp-a4a.js b/extensions/amp-a4a/0.1/amp-a4a.js
index 3c953a7e30fa..87302bb0bee5 100644
--- a/extensions/amp-a4a/0.1/amp-a4a.js
+++ b/extensions/amp-a4a/0.1/amp-a4a.js
@@ -4,8 +4,8 @@ import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';
 import {Deferred, tryResolve} from '#core/data-structures/promise';
 import {createElementWithAttributes} from '#core/dom';
 import {
-  Layout,
-  LayoutPriority,
+  LayoutPriority_Enum,
+  Layout_Enum,
   applyFillContent,
   isLayoutSizeDefined,
 } from '#core/dom/layout';
@@ -15,31 +15,27 @@ import {DetachedDomStream, streamResponseToWriter} from '#core/dom/stream';
 import {setStyle} from '#core/dom/style';
 import {duplicateErrorIfNecessary} from '#core/error';
 import {isArray, isEnumValue, isObject} from '#core/types';
-import {dict} from '#core/types/object';
 import {parseJson} from '#core/types/object/json';
 import {padStart} from '#core/types/string';
 import {utf8Decode} from '#core/types/string/bytes';
 import {tryDecodeUriComponent} from '#core/types/string/url';
 
-import {isExperimentOn} from '#experiments';
-
 import {Services} from '#service';
 import {installRealTimeConfigServiceForDoc} from '#service/real-time-config/real-time-config-impl';
 import {installUrlReplacementsForEmbed} from '#service/url-replacements-impl';
 
 import {triggerAnalyticsEvent} from '#utils/analytics';
-import {DomTransformStream} from '#utils/dom-tranform-stream';
+import {DomTransformStream} from '#utils/dom-transform-stream';
 import {listenOnce} from '#utils/event-helper';
 import {dev, devAssert, logHashParam, user, userAssert} from '#utils/log';
+import {isAttributionReportingAllowed} from '#utils/privacy-sandbox-utils';
+
+import {canSetCookie, getCookie} from 'src/cookies';
 
 import {A4AVariableSource} from './a4a-variable-source';
 import {getExtensionsFromMetadata} from './amp-ad-utils';
 import {processHead} from './head-validation';
-import {
-  createSecureDocSkeleton,
-  createSecureFrame,
-  isAttributionReportingSupported,
-} from './secure-frame';
+import {createSecureDocSkeleton, createSecureFrame} from './secure-frame';
 import {SignatureVerifier, VerificationStatus} from './signature-verifier';
 import {whenWithinViewport} from './within-viewport';
 
@@ -49,9 +45,11 @@ import {
   getDefaultBootstrapBaseUrl,
 } from '../../../src/3p-frame';
 import {isAdPositionAllowed} from '../../../src/ad-helper';
+import {ChunkPriority_Enum, chunk} from '../../../src/chunk';
 import {
   getConsentMetadata,
   getConsentPolicyInfo,
+  getConsentPolicySharedData,
   getConsentPolicyState,
 } from '../../../src/consent';
 import {cancellation, isCancellation} from '../../../src/error-reporting';
@@ -120,14 +118,14 @@ export const XORIGIN_MODE = {
 };
 
 /** @type {!Object} @private */
-const SHARED_IFRAME_PROPERTIES = dict({
+const SHARED_IFRAME_PROPERTIES = {
   'frameborder': '0',
   'allowfullscreen': '',
   'allowtransparency': '',
   'scrolling': 'no',
   'marginwidth': '0',
   'marginheight': '0',
-});
+};
 
 /** @typedef {{width: number, height: number}} */
 export let SizeInfoDef;
@@ -148,6 +146,8 @@ export let CreativeMetaDataDef;
       consentStringType: (?CONSENT_STRING_TYPE|boolean),
       gdprApplies: (?boolean|undefined),
       additionalConsent: (?string|undefined),
+      consentSharedData: (?Object|undefined),
+      gppSectionId: (?string|undefined),
     }} */
 export let ConsentTupleDef;
 
@@ -168,7 +168,7 @@ export const AnalyticsTrigger = {
 
 /**
  * Maps the names of lifecycle events to analytics triggers.
- * @const {!Object<string, !AnalyticsTrigger>}
+ * @const {!{[key: string]: !AnalyticsTrigger}}
  */
 const LIFECYCLE_STAGE_TO_ANALYTICS_TRIGGER = {
   'adRequestStart': AnalyticsTrigger.AD_REQUEST_START,
@@ -334,7 +334,7 @@ export class AmpA4A extends AMP.BaseElement {
     /**
      * Mapping of feature name to value extracted from ad response header
      * amp-ff-exps with comma separated pairs of '=' separated key/value.
-     * @type {!Object<string,string>}
+     * @type {!{[key: string]: string}}
      */
     this.postAdResponseExperimentFeatures = {};
 
@@ -379,7 +379,7 @@ export class AmpA4A extends AMP.BaseElement {
     // therefore we want this to match the 3p priority.
     const isPWA = !this.element.getAmpDoc().isSingleDoc();
     // give the ad higher priority if it is inside a PWA
-    return isPWA ? LayoutPriority.METADATA : LayoutPriority.ADS;
+    return isPWA ? LayoutPriority_Enum.METADATA : LayoutPriority_Enum.ADS;
   }
 
   /** @override */
@@ -409,6 +409,14 @@ export class AmpA4A extends AMP.BaseElement {
     this.uiHandler = new AMP.AmpAdUIHandler(this);
     this.uiHandler.validateStickyAd();
 
+    this.uiHandler
+      .getScrollPromiseForStickyAd()
+      .then(() => this.uiHandler.maybeInitStickyAd());
+
+    if (this.uiHandler.isStickyAd()) {
+      chunk(this.element, () => this.layoutCallback(), ChunkPriority_Enum.LOW);
+    }
+
     // Disable crypto key fetching if we are not going to use it in no-signing path.
     // TODO(ccordry): clean up with no-signing launch.
     if (!this.isInNoSigningExp()) {
@@ -594,7 +602,7 @@ export class AmpA4A extends AMP.BaseElement {
   shouldInitializePromiseChain_() {
     const slotRect = this.getIntersectionElementLayoutBox();
     const fixedSizeZeroHeightOrWidth =
-      this.getLayout() != Layout.FLUID &&
+      this.getLayout() != Layout_Enum.FLUID &&
       (slotRect.height == 0 || slotRect.width == 0);
     if (
       fixedSizeZeroHeightOrWidth ||
@@ -746,14 +754,23 @@ export class AmpA4A extends AMP.BaseElement {
             return null;
           });
 
+          const consentSharedDataPromise = getConsentPolicySharedData(
+            this.element,
+            consentPolicyId
+          ).catch((err) => {
+            user().error(TAG, 'Error determining consent shared data', err);
+            return null;
+          });
+
           return Promise.all([
             consentStatePromise,
             consentStringPromise,
             consentMetadataPromise,
+            consentSharedDataPromise,
           ]);
         }
 
-        return Promise.resolve([null, null, null]);
+        return Promise.resolve([null, null, null, null]);
       })
       // This block returns the ad URL, if one is available.
       /** @return {!Promise<?string>} */
@@ -763,6 +780,7 @@ export class AmpA4A extends AMP.BaseElement {
         const consentState = consentResponse[0];
         const consentString = consentResponse[1];
         const consentMetadata = consentResponse[2];
+        const consentSharedData = consentResponse[3];
         const gdprApplies = consentMetadata
           ? consentMetadata['gdprApplies']
           : consentMetadata;
@@ -772,6 +790,12 @@ export class AmpA4A extends AMP.BaseElement {
         const consentStringType = consentMetadata
           ? consentMetadata['consentStringType']
           : consentMetadata;
+        const purposeOne = consentMetadata
+          ? consentMetadata['purposeOne']
+          : consentMetadata;
+        const gppSectionId = consentMetadata
+          ? consentMetadata['gppSectionId']
+          : consentMetadata;
 
         return /** @type {!Promise<?string>} */ (
           this.getServeNpaSignal().then((npaSignal) =>
@@ -782,11 +806,14 @@ export class AmpA4A extends AMP.BaseElement {
                 consentStringType,
                 gdprApplies,
                 additionalConsent,
+                consentSharedData,
+                purposeOne,
+                gppSectionId,
               },
               this.tryExecuteRealTimeConfig_(
                 consentState,
                 consentString,
-                /** @type {?Object<string, string|number|boolean|undefined>} */ (
+                /** @type {?{[key: string]: string|number|boolean|undefined}} */ (
                   consentMetadata
                 )
               ),
@@ -815,6 +842,15 @@ export class AmpA4A extends AMP.BaseElement {
       // response is empty.
       /** @return {!Promise<!Response>} */
       .then((fetchResponse) => {
+        protectFunctionWrapper(this.onAdResponse, this, (err) => {
+          dev().error(
+            TAG,
+            this.element.getAttribute('type'),
+            'Error executing onAdResponse',
+            err
+          );
+        })(fetchResponse);
+
         checkStillCurrent();
         this.maybeTriggerAnalyticsEvent_('adRequestEnd');
         // If the response is null (can occur for non-200 responses)  or
@@ -993,7 +1029,7 @@ export class AmpA4A extends AMP.BaseElement {
         if (!sanitizedHeadElement) {
           return this.handleFallback_(fallbackHttpResponse, checkStillCurrent);
         }
-        this.updateLayoutPriority(LayoutPriority.CONTENT);
+        this.updateLayoutPriority(LayoutPriority_Enum.CONTENT);
         this.isVerifiedAmpCreative_ = true;
         return sanitizedHeadElement;
       });
@@ -1011,7 +1047,7 @@ export class AmpA4A extends AMP.BaseElement {
     // Experiment to give non-AMP creatives same benefits as AMP so
     // update priority.
     if (this.inNonAmpPreferenceExp()) {
-      this.updateLayoutPriority(LayoutPriority.CONTENT);
+      this.updateLayoutPriority(LayoutPriority_Enum.CONTENT);
     }
     return fallbackHttpResponse.arrayBuffer().then((domTextContent) => {
       checkStillCurrent();
@@ -1111,13 +1147,13 @@ export class AmpA4A extends AMP.BaseElement {
             if (this.inNonAmpPreferenceExp()) {
               // Experiment to give non-AMP creatives same benefits as AMP so
               // update priority.
-              this.updateLayoutPriority(LayoutPriority.CONTENT);
+              this.updateLayoutPriority(LayoutPriority_Enum.CONTENT);
             }
             return null;
           }
 
           // Update priority.
-          this.updateLayoutPriority(LayoutPriority.CONTENT);
+          this.updateLayoutPriority(LayoutPriority_Enum.CONTENT);
 
           // Load any extensions; do not wait on their promises as this
           // is just to prefetch.
@@ -1341,15 +1377,10 @@ export class AmpA4A extends AMP.BaseElement {
     const checkStillCurrent = this.verifyStillCurrent();
     // Promise chain will have determined if creative is valid AMP.
 
-    return Promise.all([
-      this.adPromise_,
-      this.uiHandler.getScrollPromiseForStickyAd(),
-    ])
-      .then((values) => {
+    return this.adPromise_
+      .then((creativeMetaData) => {
         checkStillCurrent();
 
-        this.uiHandler.maybeInitStickyAd();
-        const creativeMetaData = values[0];
         if (this.isCollapsed_) {
           return Promise.resolve();
         }
@@ -1470,6 +1501,16 @@ export class AmpA4A extends AMP.BaseElement {
     this.destroyFrame(true);
   }
 
+  /**
+   * Remove the iframe and clean it up.
+   */
+  maybeDestroyIframe_() {
+    if (this.iframe && this.iframe.parentElement) {
+      this.iframe.parentElement.removeChild(this.iframe);
+      this.iframe = null;
+    }
+  }
+
   /**
    * Attempts to remove the current frame and free any associated resources.
    * This function will no-op if this ad slot is currently in the process of
@@ -1488,10 +1529,7 @@ export class AmpA4A extends AMP.BaseElement {
       this.friendlyIframeEmbed_.destroy();
       this.friendlyIframeEmbed_ = null;
     }
-    if (this.iframe && this.iframe.parentElement) {
-      this.iframe.parentElement.removeChild(this.iframe);
-      this.iframe = null;
-    }
+    this.maybeDestroyIframe_();
     if (this.xOriginIframeHandler_) {
       this.xOriginIframeHandler_.freeXOriginIframe();
       this.xOriginIframeHandler_ = null;
@@ -1645,6 +1683,12 @@ export class AmpA4A extends AMP.BaseElement {
     );
   }
 
+  /**
+   * To be overridden by implementing subclasses.
+   * @param {!Response} unusedFetchResponse
+   */
+  onAdResponse(unusedFetchResponse) {}
+
   /**
    * @param {!Element} iframe that was just created.  To be overridden for
    * testing.
@@ -1794,6 +1838,7 @@ export class AmpA4A extends AMP.BaseElement {
 
     const {height, width} = this.creativeSize_;
     const {extensions, fonts, head} = headData;
+    this.maybeDestroyIframe_();
     this.iframe = createSecureFrame(
       this.win,
       this.getIframeTitle(),
@@ -1874,11 +1919,12 @@ export class AmpA4A extends AMP.BaseElement {
     devAssert(!!this.element.ownerDocument, 'missing owner document?!');
     this.maybeTriggerAnalyticsEvent_('renderFriendlyStart');
     // Create and setup friendly iframe.
+    this.maybeDestroyIframe_();
     this.iframe = /** @type {!HTMLIFrameElement} */ (
       createElementWithAttributes(
         /** @type {!Document} */ (this.element.ownerDocument),
         'iframe',
-        dict({
+        {
           // NOTE: It is possible for either width or height to be 'auto',
           // a non-numeric value.
           'height': this.creativeSize_.height,
@@ -1891,7 +1937,7 @@ export class AmpA4A extends AMP.BaseElement {
           'role': 'region',
           'aria-label': 'Advertisement',
           'tabindex': '0',
-        })
+        }
       )
     );
     if (!this.uiHandler.isStickyAd()) {
@@ -2010,17 +2056,14 @@ export class AmpA4A extends AMP.BaseElement {
    * @private
    */
   iframeRenderHelper_(attributes) {
-    const mergedAttributes = Object.assign(
-      attributes,
-      dict({
-        'height': this.creativeSize_.height,
-        'width': this.creativeSize_.width,
-        'title': this.getIframeTitle(),
-        'role': 'region',
-        'aria-label': 'Advertisement',
-        'tabindex': '0',
-      })
-    );
+    const mergedAttributes = Object.assign(attributes, {
+      'height': this.creativeSize_.height,
+      'width': this.creativeSize_.width,
+      'title': this.getIframeTitle(),
+      'role': 'region',
+      'aria-label': 'Advertisement',
+      'tabindex': '0',
+    });
 
     if (this.sentinel) {
       mergedAttributes['data-amp-3p-sentinel'] = this.sentinel;
@@ -2030,12 +2073,13 @@ export class AmpA4A extends AMP.BaseElement {
     // request completes.
     let featurePolicies = "sync-xhr 'none';";
 
-    if (isAttributionReportingSupported(this.win.document)) {
+    if (isAttributionReportingAllowed(this.win.document)) {
       featurePolicies += "attribution-reporting 'src';";
     }
 
     mergedAttributes['allow'] = featurePolicies;
 
+    this.maybeDestroyIframe_();
     this.iframe = /** @type {!HTMLIFrameElement} */ (
       createElementWithAttributes(
         /** @type {!Document} */ (this.element.ownerDocument),
@@ -2100,12 +2144,10 @@ export class AmpA4A extends AMP.BaseElement {
     const intersection = this.element.getIntersectionChangeEntry();
     contextMetadata['_context']['initialIntersection'] =
       intersectionEntryToJson(intersection);
-    return this.iframeRenderHelper_(
-      dict({
-        'src': Services.xhrFor(this.win).getCorsUrl(this.win, adUrl),
-        'name': JSON.stringify(contextMetadata),
-      })
-    );
+    return this.iframeRenderHelper_({
+      'src': Services.xhrFor(this.win).getCorsUrl(this.win, adUrl),
+      'name': JSON.stringify(contextMetadata),
+    });
   }
 
   /**
@@ -2185,7 +2227,7 @@ export class AmpA4A extends AMP.BaseElement {
           `${contextMetadata}`;
       }
 
-      return this.iframeRenderHelper_(dict({'src': srcPath, 'name': name}));
+      return this.iframeRenderHelper_({'src': srcPath, 'name': name});
     });
   }
 
@@ -2342,12 +2384,10 @@ export class AmpA4A extends AMP.BaseElement {
     const analyticsEvent = devAssert(
       LIFECYCLE_STAGE_TO_ANALYTICS_TRIGGER[lifecycleStage]
     );
-    const analyticsVars = /** @type {!JsonObject} */ (
-      Object.assign(
-        dict({'time': Math.round(this.getNow_())}),
-        this.getA4aAnalyticsVars(analyticsEvent)
-      )
-    );
+    const analyticsVars = /** @type {!JsonObject} */ ({
+      'time': Math.round(this.getNow_()),
+      ...this.getA4aAnalyticsVars(analyticsEvent),
+    });
     triggerAnalyticsEvent(this.element, analyticsEvent, analyticsVars);
   }
 
@@ -2360,7 +2400,7 @@ export class AmpA4A extends AMP.BaseElement {
    * @return {!JsonObject}
    */
   getA4aAnalyticsVars(unusedAnalyticsEvent) {
-    return dict({});
+    return {};
   }
 
   /**
@@ -2381,10 +2421,17 @@ export class AmpA4A extends AMP.BaseElement {
    * if the publisher has included a valid `block-rtc` attribute, don't send.
    * @param {?CONSENT_POLICY_STATE} consentState
    * @param {?string} consentString
-   * @param {?Object<string, string|number|boolean|undefined>} consentMetadata
+   * @param {?{[key: string]: string|number|boolean|undefined}} consentMetadata
    * @return {Promise<!Array<!rtcResponseDef>>|undefined}
    */
   tryExecuteRealTimeConfig_(consentState, consentString, consentMetadata) {
+    const hasStorageConsent =
+      consentState != CONSENT_POLICY_STATE.UNKNOWN &&
+      consentState != CONSENT_POLICY_STATE.INSUFFICIENT &&
+      ((consentMetadata?.gdprApplies &&
+        consentString &&
+        consentMetadata?.purposeOne) ||
+        !consentMetadata?.gdprApplies);
     if (this.element.getAttribute('rtc-config')) {
       installRealTimeConfigServiceForDoc(this.getAmpDoc());
       return this.getBlockRtc_().then((shouldBlock) =>
@@ -2394,7 +2441,7 @@ export class AmpA4A extends AMP.BaseElement {
               (realTimeConfig) =>
                 realTimeConfig.maybeExecuteRealTimeConfig(
                   this.element,
-                  this.getCustomRealTimeConfigMacros_(),
+                  this.getCustomRealTimeConfigMacros_(hasStorageConsent),
                   consentState,
                   consentString,
                   consentMetadata,
@@ -2408,10 +2455,11 @@ export class AmpA4A extends AMP.BaseElement {
   /**
    * To be overriden by network impl. Should return a mapping of macro keys
    * to values for substitution in publisher-specified URLs for RTC.
+   * @param {?boolean} unusedHasStorageConsent
    * @return {!Object<string,
    *   !../../../src/service/variable-source.AsyncResolverDef>}
    */
-  getCustomRealTimeConfigMacros_() {
+  getCustomRealTimeConfigMacros_(unusedHasStorageConsent) {
     return {};
   }
 
@@ -2550,13 +2598,7 @@ export function signatureVerifierFor(win) {
  */
 export function isPlatformSupported(win) {
   // Require Shadow DOM support for a4a.
-  if (
-    !isNative(win.Element.prototype.attachShadow) &&
-    isExperimentOn(win, 'disable-a4a-non-sd')
-  ) {
-    return false;
-  }
-  return true;
+  return isNative(win.Element.prototype.attachShadow);
 }
 
 /**
@@ -2567,3 +2609,46 @@ export function isPlatformSupported(win) {
 function isNative(func) {
   return !!func && func.toString().indexOf('[native code]') != -1;
 }
+
+/**
+ * @param {?ConsentTupleDef} consentTuple
+ * @return {boolean}
+ */
+export function hasStorageConsent(consentTuple) {
+  if (!consentTuple) {
+    return false;
+  }
+
+  if (
+    [CONSENT_POLICY_STATE.UNKNOWN, CONSENT_POLICY_STATE.INSUFFICIENT].includes(
+      consentTuple.consentState
+    )
+  ) {
+    return false;
+  }
+
+  const {consentString, gdprApplies, purposeOne} = consentTuple;
+
+  if (!gdprApplies) {
+    return true;
+  }
+
+  return consentString && purposeOne;
+}
+
+/**
+ * @param {?ConsentTupleDef} consentTuple
+ * @param {!Window} win
+ * @param {!{[key: string]: string|boolean|number}} params
+ */
+export function tryAddingCookieParams(consentTuple, win, params) {
+  if (!hasStorageConsent(consentTuple)) {
+    return;
+  }
+  const cookie = getCookie(win, '__gads');
+  params['cookie'] = cookie;
+  params['gpic'] = getCookie(win, '__gpi');
+  if (!cookie && canSetCookie(win)) {
+    params['cookie_enabled'] = '1';
+  }
+}
diff --git a/extensions/amp-a4a/0.1/amp-ad-network-base.js b/extensions/amp-a4a/0.1/amp-ad-network-base.js
index 8c80b253f556..e4949afd2631 100644
--- a/extensions/amp-a4a/0.1/amp-ad-network-base.js
+++ b/extensions/amp-a4a/0.1/amp-ad-network-base.js
@@ -22,13 +22,13 @@ export class AmpAdNetworkBase extends AMP.BaseElement {
     /** @private {?Promise<!Response>} */
     this.adResponsePromise_ = null;
 
-    /** @private {Object<string, !./amp-ad-type-defs.Validator>} */
+    /** @private {{[key: string]: !./amp-ad-type-defs.Validator}} */
     this.validators_ = map();
 
-    /** @private {Object<string, !./amp-ad-type-defs.Renderer>} */
+    /** @private {{[key: string]: !./amp-ad-type-defs.Renderer}} */
     this.renderers_ = map();
 
-    /** @private {Object<string, string>} */
+    /** @private {{[key: string]: string}} */
     this.recoveryModes_ = map();
 
     /** @const @private {!Object} */
diff --git a/extensions/amp-a4a/0.1/amp-ad-template-helper.js b/extensions/amp-a4a/0.1/amp-ad-template-helper.js
index 9fa3be393625..7ae89c01258e 100644
--- a/extensions/amp-a4a/0.1/amp-ad-template-helper.js
+++ b/extensions/amp-a4a/0.1/amp-ad-template-helper.js
@@ -1,13 +1,12 @@
 import {LruCache} from '#core/data-structures/lru-cache';
 import {createElementWithAttributes} from '#core/dom';
 import {isArray} from '#core/types';
-import {dict} from '#core/types/object';
 
 import {Services} from '#service';
 
 import {devAssert} from '#utils/log';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {getMode} from '../../../src/mode';
 import {
   getServiceForDoc,
@@ -15,7 +14,7 @@ import {
 } from '../../../src/service-helpers';
 import {parseUrlDeprecated} from '../../../src/url';
 
-/** @private {!Object<string, string|boolean>} */
+/** @private {!{[key: string]: string|boolean}} */
 const TEMPLATE_CORS_CONFIG = {
   mode: 'cors',
   method: 'GET',
@@ -96,9 +95,9 @@ export class AmpAdTemplateHelper {
         const scriptElem = createElementWithAttributes(
           element.ownerDocument,
           'script',
-          dict({
+          {
             'type': 'application/json',
-          })
+          }
         );
         scriptElem.textContent = JSON.stringify(config['inline']);
         analyticsEle.appendChild(scriptElem);
diff --git a/extensions/amp-a4a/0.1/amp-ad-utils.js b/extensions/amp-a4a/0.1/amp-ad-utils.js
index 970f408546f2..8ef16fb1853f 100644
--- a/extensions/amp-a4a/0.1/amp-ad-utils.js
+++ b/extensions/amp-a4a/0.1/amp-ad-utils.js
@@ -6,7 +6,7 @@ import {parseExtensionUrl} from '#service/extension-script';
 
 import {dev} from '#utils/log';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {isSecureUrlDeprecated} from '../../../src/url';
 
 const TAG = 'amp-ad-util';
diff --git a/extensions/amp-a4a/0.1/friendly-frame-util.js b/extensions/amp-a4a/0.1/friendly-frame-util.js
index e06ca4d837bf..25fa34f7a954 100644
--- a/extensions/amp-a4a/0.1/friendly-frame-util.js
+++ b/extensions/amp-a4a/0.1/friendly-frame-util.js
@@ -1,6 +1,5 @@
 import {createElementWithAttributes} from '#core/dom';
 import {setStyle} from '#core/dom/style';
-import {dict} from '#core/types/object';
 
 import {installUrlReplacementsForEmbed} from '#service/url-replacements-impl';
 
@@ -32,7 +31,7 @@ export function renderCreativeIntoFriendlyFrame(
     createElementWithAttributes(
       /** @type {!Document} */ (element.ownerDocument),
       'iframe',
-      dict({
+      {
         // NOTE: It is possible for either width or height to be 'auto',
         // a non-numeric value.
         'height': size.height,
@@ -44,7 +43,7 @@ export function renderCreativeIntoFriendlyFrame(
         'role': 'region',
         'aria-label': 'Advertisement',
         'tabindex': '0',
-      })
+      }
     )
   );
   iframe.classList.add('i-amphtml-fill-content');
diff --git a/extensions/amp-a4a/0.1/head-validation.js b/extensions/amp-a4a/0.1/head-validation.js
index 1e60cc0e22ce..3f0e86304602 100644
--- a/extensions/amp-a4a/0.1/head-validation.js
+++ b/extensions/amp-a4a/0.1/head-validation.js
@@ -5,7 +5,7 @@ import {includes} from '#core/types/string';
 import {Services} from '#service';
 import {parseExtensionUrl} from '#service/extension-script';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {preloadFriendlyIframeEmbedExtensions} from '../../../src/friendly-iframe-embed';
 import {getMode} from '../../../src/mode';
 
diff --git a/extensions/amp-a4a/0.1/name-frame-renderer.js b/extensions/amp-a4a/0.1/name-frame-renderer.js
index dd07d2e30e6d..eb33a6b67568 100644
--- a/extensions/amp-a4a/0.1/name-frame-renderer.js
+++ b/extensions/amp-a4a/0.1/name-frame-renderer.js
@@ -1,6 +1,5 @@
 import {createElementWithAttributes} from '#core/dom';
 import {intersectionEntryToJson} from '#core/dom/layout/intersection';
-import {dict} from '#core/types/object';
 import {utf8Decode} from '#core/types/string/bytes';
 
 import {Renderer} from './amp-ad-type-defs';
@@ -43,7 +42,7 @@ export class NameFrameRenderer extends Renderer {
     const intersection = element.getIntersectionChangeEntry();
     contextMetadata['_context']['initialIntersection'] =
       intersectionEntryToJson(intersection);
-    const attributes = dict({
+    const attributes = {
       'src': srcPath,
       'name': JSON.stringify(contextMetadata),
       'height': context.size.height,
@@ -54,7 +53,7 @@ export class NameFrameRenderer extends Renderer {
       'scrolling': 'no',
       'marginwidth': '0',
       'marginheight': '0',
-    });
+    };
     if (crossDomainData.sentinel) {
       attributes['data-amp-3p-sentinel'] = crossDomainData.sentinel;
     }
diff --git a/extensions/amp-a4a/0.1/refresh-manager.js b/extensions/amp-a4a/0.1/refresh-manager.js
index 10af7a087dd9..956c5db90ddb 100644
--- a/extensions/amp-a4a/0.1/refresh-manager.js
+++ b/extensions/amp-a4a/0.1/refresh-manager.js
@@ -1,5 +1,3 @@
-import {dict} from '#core/types/object';
-
 import {Services} from '#service';
 
 import {devAssert, user, userAssert} from '#utils/log';
@@ -120,7 +118,7 @@ const RefreshLifecycleState = {
  * Each IO is configured to a different threshold, and all elements that
  * share the same visiblePercentageMin will be monitored by the same IO.
  *
- * @const {!Object<string, (!IntersectionObserver)>}
+ * @const {!{[key: string]: (!IntersectionObserver)}}
  */
 const observers = {};
 
@@ -129,7 +127,7 @@ const observers = {};
  * the IntersectionOberserver callback function to find the appropriate element
  * target.
  *
- * @const {!Object<string, !RefreshManager>}
+ * @const {!{[key: string]: !RefreshManager}}
  */
 const managers = {};
 
@@ -158,10 +156,10 @@ export function getRefreshManager(a4a, opt_predicate) {
   }
   return new RefreshManager(
     a4a,
-    dict({
+    {
       'visiblePercentageMin': 50,
       'continuousTimeMin': 1,
-    }),
+    },
     refreshInterval
   );
 }
diff --git a/extensions/amp-a4a/0.1/secure-frame.js b/extensions/amp-a4a/0.1/secure-frame.js
index 2ce6b41bbebc..4e119bcf4edc 100644
--- a/extensions/amp-a4a/0.1/secure-frame.js
+++ b/extensions/amp-a4a/0.1/secure-frame.js
@@ -1,5 +1,6 @@
 import {createElementWithAttributes, escapeHtml} from '#core/dom';
-import {dict} from '#core/types/object';
+
+import {isAttributionReportingAllowed} from '#utils/privacy-sandbox-utils';
 
 import {getFieSafeScriptSrcs} from '../../../src/friendly-iframe-embed';
 
@@ -26,9 +27,6 @@ const sandboxVals =
   'allow-scripts ' +
   'allow-top-navigation';
 
-const TOKEN_VALUE_1P =
-  'AzKSXqpxJ3GJ4xUcmPM97hZVJG1MQdsBvJDfIuF7mkjVveoiTyt11U3+HIw4U2VdqQ3CNKMUoohEGtHUnS3h8wAAAACBeyJvcmlnaW4iOiJodHRwczovL2FtcHByb2plY3Qub3JnOjQ0MyIsImZlYXR1cmUiOiJDb252ZXJzaW9uTWVhc3VyZW1lbnQiLCJleHBpcnkiOjE2MzQwODMxOTksImlzU3ViZG9tYWluIjp0cnVlLCJ1c2FnZSI6InN1YnNldCJ9';
-
 /**
  * Create the starting html for all FIE ads. If streaming is supported body will be
  * piped in later.
@@ -54,7 +52,6 @@ export const createSecureDocSkeleton = (url, sanitizedHeadElements, body) =>
       default-src 'none';
       style-src ${fontProviderAllowList} 'unsafe-inline';
     ">
-    <meta http-equiv="origin-trial" content=${TOKEN_VALUE_1P}>    
     ${sanitizedHeadElements}
   </head>
   <body>${body}</body>
@@ -71,39 +68,26 @@ export const createSecureDocSkeleton = (url, sanitizedHeadElements, body) =>
 export function createSecureFrame(win, title, height, width) {
   const {document} = win;
   const iframe = /** @type {!HTMLIFrameElement} */ (
-    createElementWithAttributes(
-      document,
-      'iframe',
-      dict({
-        // NOTE: It is possible for either width or height to be 'auto',
-        // a non-numeric value.
-        'height': height,
-        'width': width,
-        'title': title,
-        'frameborder': '0',
-        'allowfullscreen': '',
-        'allowtransparency': '',
-        'scrolling': 'no',
-        'sandbox': sandboxVals,
-        'role': 'region',
-        'aria-label': 'Advertisement',
-        'tabindex': '0',
-      })
-    )
+    createElementWithAttributes(document, 'iframe', {
+      // NOTE: It is possible for either width or height to be 'auto',
+      // a non-numeric value.
+      'height': height,
+      'width': width,
+      'title': title,
+      'frameborder': '0',
+      'allowfullscreen': '',
+      'allowtransparency': '',
+      'scrolling': 'no',
+      'sandbox': sandboxVals,
+      'role': 'region',
+      'aria-label': 'Advertisement',
+      'tabindex': '0',
+    })
   );
 
-  if (isAttributionReportingSupported(document)) {
+  if (isAttributionReportingAllowed(document)) {
     iframe.setAttribute('allow', `attribution-reporting 'src'`);
   }
 
   return iframe;
 }
-
-/**
- * Determine if `attribution-reporting` API is available in browser.
- * @param {!Document} doc
- * @return {boolean}
- */
-export function isAttributionReportingSupported(doc) {
-  return doc.featurePolicy?.features().includes('attribution-reporting');
-}
diff --git a/extensions/amp-a4a/0.1/signature-verifier.js b/extensions/amp-a4a/0.1/signature-verifier.js
index e392fcece1ca..27bda681cb87 100644
--- a/extensions/amp-a4a/0.1/signature-verifier.js
+++ b/extensions/amp-a4a/0.1/signature-verifier.js
@@ -61,14 +61,14 @@ export const VerificationStatus = {
 export class SignatureVerifier {
   /**
    * @param {!Window} win
-   * @param {!Object<string, string>} signingServerURLs a map from the name of
+   * @param {!{[key: string]: string}} signingServerURLs a map from the name of
    *    each trusted signing service to the URL of its public key endpoint
    */
   constructor(win, signingServerURLs) {
     /** @private @const {!Window} */
     this.win_ = win;
 
-    /** @private @const {!Object<string, string>} */
+    /** @private @const {!{[key: string]: string}} */
     this.signingServerURLs_ = signingServerURLs;
 
     /**
@@ -105,7 +105,7 @@ export class SignatureVerifier {
      *    successfully; this most likely indicates signing service misbehavior.
      *    The success case is a `Promise` that resolves to a `CryptoKey`.
      *
-     * @private @const {?Object<string, {promise: !Promise<boolean>, keys: !Object<string, ?Promise<?webCrypto.CryptoKey>>}>}
+     * @private @const {?{[key: string]: {promise: !Promise<boolean>, keys: !{[key: string]: ?Promise<?webCrypto.CryptoKey>}}}}
      */
     this.signers_ = Services.cryptoFor(win).isPkcsAvailable() ? {} : null;
 
@@ -278,7 +278,7 @@ export class SignatureVerifier {
    * Try to download the keyset for the named signing service and add a promise
    * for each key to the `keys` object.
    *
-   * @param {!Object<string, ?Promise<?webCrypto.CryptoKey>>} keys the object to
+   * @param {!{[key: string]: ?Promise<?webCrypto.CryptoKey>}} keys the object to
    *     add each key promise to. This is mutated while the returned promise is
    *     pending.
    * @param {string} signingServiceName
diff --git a/extensions/amp-a4a/0.1/template-validator.js b/extensions/amp-a4a/0.1/template-validator.js
index 2595f32548c3..a6c27c315296 100644
--- a/extensions/amp-a4a/0.1/template-validator.js
+++ b/extensions/amp-a4a/0.1/template-validator.js
@@ -10,7 +10,7 @@ import {
   mergeExtensionsMetadata,
 } from './amp-ad-utils';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {preloadFriendlyIframeEmbedExtensions} from '../../../src/friendly-iframe-embed';
 
 /** @const {string} */
diff --git a/extensions/amp-a4a/0.1/test/fetch-mock.js b/extensions/amp-a4a/0.1/test/fetch-mock.js
index b7b8e1dfed1a..109bf9f6ae8f 100644
--- a/extensions/amp-a4a/0.1/test/fetch-mock.js
+++ b/extensions/amp-a4a/0.1/test/fetch-mock.js
@@ -9,7 +9,7 @@
  * @typedef {(?string|{
  *     body: ?string,
  *     status: (number|undefined),
- *     headers: (!Object<string, string>|undefined),
+ *     headers: (!{[key: string]: string}|undefined),
  * })}
  */
 export let MockResponseData;
@@ -31,9 +31,9 @@ export class FetchMock {
     this.win_ = win;
     /** @private {function(!RequestInfo, !RequestInit=): !Promise<!Response>} */
     this.realFetch_ = win.fetch;
-    /** @private {!Object<string, {response: !MockResponse, called: boolean}>} */
+    /** @private {!{[key: string]: {response: !MockResponse, called: boolean}}} */
     this.routes_ = {};
-    /** @private {!Object<string, {response: !MockResponse, called: boolean}>} */
+    /** @private {!{[key: string]: {response: !MockResponse, called: boolean}}} */
     this.names_ = {};
 
     win.fetch = (input, init = undefined) => this.fetch_(input, init);
diff --git a/extensions/amp-a4a/0.1/test/test-amp-a4a-cookies.js b/extensions/amp-a4a/0.1/test/test-amp-a4a-cookies.js
new file mode 100644
index 000000000000..7e188bbd7c13
--- /dev/null
+++ b/extensions/amp-a4a/0.1/test/test-amp-a4a-cookies.js
@@ -0,0 +1,168 @@
+import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';
+
+import {setCookie} from 'src/cookies';
+
+import {tryAddingCookieParams} from '../amp-a4a';
+
+describes.fakeWin('amp-a4a: cookies', {amp: true}, (env) => {
+  let win;
+
+  beforeEach(() => {
+    win = env.win;
+  });
+
+  function setCookies() {
+    setCookie(win, '__gads', '_gads_value', Date.now() + 100_000);
+    setCookie(win, '__gpi', '_gpi_value', Date.now() + 100_000);
+  }
+
+  it('does not add cookies without consent tuple', () => {
+    setCookies();
+    const params = {};
+
+    tryAddingCookieParams(null, win, params);
+
+    expect(params.cookie).to.be.undefined;
+    expect(params.gpic).to.be.undefined;
+    expect(params.cookie_enabled).to.be.undefined;
+  });
+
+  it('does not add cookies with unknown consent policy state', () => {
+    setCookies();
+    const params = {};
+
+    tryAddingCookieParams(
+      {
+        consentState: CONSENT_POLICY_STATE.UNKNOWN,
+        gdprApplies: true,
+        consentString: 'consent',
+        purposeOne: true,
+      },
+      win,
+      params
+    );
+
+    expect(params.cookie).to.be.undefined;
+    expect(params.gpic).to.be.undefined;
+    expect(params.cookie_enabled).to.be.undefined;
+  });
+
+  it('does not add cookies with insufficient consent policy state', () => {
+    setCookies();
+    const params = {};
+
+    tryAddingCookieParams(
+      {
+        consentState: CONSENT_POLICY_STATE.INSUFFICIENT,
+        gdprApplies: true,
+        consentString: 'consent',
+        purposeOne: true,
+      },
+      win,
+      params
+    );
+
+    expect(params.cookie).to.be.undefined;
+    expect(params.gpic).to.be.undefined;
+    expect(params.cookie_enabled).to.be.undefined;
+  });
+
+  it('does not add cookies when when GDPR applies and no consent string', () => {
+    setCookies();
+    const params = {};
+
+    tryAddingCookieParams(
+      {
+        consentState: CONSENT_POLICY_STATE.SUFFICIENT,
+        gdprApplies: true,
+        consentString: '',
+        purposeOne: true,
+      },
+      win,
+      params
+    );
+
+    expect(params.cookie).to.be.undefined;
+    expect(params.gpic).to.be.undefined;
+    expect(params.cookie_enabled).to.be.undefined;
+  });
+
+  it('does not add cookie params when GDPR applies and not purposeOne', () => {
+    setCookies();
+    const params = {};
+
+    tryAddingCookieParams(
+      {
+        consentState: CONSENT_POLICY_STATE.SUFFICIENT,
+        gdprApplies: true,
+        consentString: 'consent',
+        purposeOne: false,
+      },
+      win,
+      params
+    );
+
+    expect(params.cookie).to.be.undefined;
+    expect(params.gpic).to.be.undefined;
+    expect(params.cookie_enabled).to.be.undefined;
+  });
+
+  it('adds cookie params when GDPR applies and consentString present with purposeOne', () => {
+    setCookies();
+    const params = {};
+
+    tryAddingCookieParams(
+      {
+        consentState: CONSENT_POLICY_STATE.SUFFICIENT,
+        gdprApplies: true,
+        consentString: 'consent',
+        purposeOne: true,
+      },
+      win,
+      params
+    );
+
+    expect(params.cookie).to.equal('_gads_value');
+    expect(params.gpic).to.equal('_gpi_value');
+    expect(params.cookie_enabled).to.be.undefined;
+  });
+
+  it('adds cookie params when GDPR does not apply regardless of other properties', () => {
+    setCookies();
+    const params = {};
+
+    tryAddingCookieParams(
+      {
+        consentState: CONSENT_POLICY_STATE.SUFFICIENT,
+        gdprApplies: false,
+        consentString: '',
+        purposeOne: false,
+      },
+      win,
+      params
+    );
+
+    expect(params.cookie).to.equal('_gads_value');
+    expect(params.gpic).to.equal('_gpi_value');
+    expect(params.cookie_enabled).to.be.undefined;
+  });
+
+  it('adds cookie_enabled when consent allows and no current cookie exists', () => {
+    const params = {};
+
+    tryAddingCookieParams(
+      {
+        consentState: CONSENT_POLICY_STATE.SUFFICIENT,
+        gdprApplies: false,
+        consentString: '',
+        purposeOne: false,
+      },
+      win,
+      params
+    );
+
+    expect(params.cookie).to.be.null;
+    expect(params.gpic).to.be.null;
+    expect(params.cookie_enabled).to.equal('1');
+  });
+});
diff --git a/extensions/amp-a4a/0.1/test/test-amp-a4a.js b/extensions/amp-a4a/0.1/test/test-amp-a4a.js
index f292fde3e94b..9eaeba96a064 100644
--- a/extensions/amp-a4a/0.1/test/test-amp-a4a.js
+++ b/extensions/amp-a4a/0.1/test/test-amp-a4a.js
@@ -9,11 +9,9 @@ import '../../../amp-ad/0.1/amp-ad';
 import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';
 import {Signals} from '#core/data-structures/signals';
 import {createElementWithAttributes} from '#core/dom';
-import {LayoutPriority} from '#core/dom/layout';
+import {LayoutPriority_Enum} from '#core/dom/layout';
 import {layoutRectLtwh, layoutSizeFromRect} from '#core/dom/layout/rect';
 
-import {toggleExperiment} from '#experiments';
-
 import {Services} from '#service';
 import {AmpDoc, installDocService} from '#service/ampdoc-impl';
 import {resetScheduledElementForTesting} from '#service/custom-element-registry';
@@ -22,6 +20,7 @@ import {installRealTimeConfigServiceForDoc} from '#service/real-time-config/real
 
 import * as analytics from '#utils/analytics';
 import {dev, user} from '#utils/log';
+import * as privacySandboxUtils from '#utils/privacy-sandbox-utils';
 
 import {macroTask} from '#testing/helpers';
 import {createIframePromise} from '#testing/iframe';
@@ -52,7 +51,6 @@ import {
   assignAdUrlToError,
   protectFunctionWrapper,
 } from '../amp-a4a';
-import * as secureFrame from '../secure-frame';
 import {AMP_SIGNATURE_HEADER, VerificationStatus} from '../signature-verifier';
 
 describes.realWin('amp-a4a: no signing', {amp: true}, (env) => {
@@ -163,7 +161,7 @@ describes.realWin('amp-a4a: no signing', {amp: true}, (env) => {
     expect(fie.contentDocument.body.textContent).to.contain.string(
       'Hello, world.'
     );
-    expect(prioritySpy).to.be.calledWith(LayoutPriority.CONTENT);
+    expect(prioritySpy).to.be.calledWith(LayoutPriority_Enum.CONTENT);
   });
 
   it('should not throw on polyfill scripts', async () => {
@@ -245,7 +243,6 @@ describes.realWin('amp-a4a: no signing', {amp: true}, (env) => {
   });
 
   it('should fallback when shadow DOM is not supported', async () => {
-    toggleExperiment(env.win, 'disable-a4a-non-sd', true, true);
     attachShadowStub.value(undefined);
     const fallbackSpy = env.sandbox.spy(a4a, 'handleFallback_');
     env.sandbox.stub(a4a, 'skipClientSideValidation').returns(false);
@@ -256,7 +253,6 @@ describes.realWin('amp-a4a: no signing', {amp: true}, (env) => {
   });
 
   it('should fallback when shadow DOM is polyfilled', async () => {
-    toggleExperiment(env.win, 'disable-a4a-non-sd', true, true);
     attachShadowStub.value(function () {
       // A non-native function.
       return null;
@@ -268,17 +264,6 @@ describes.realWin('amp-a4a: no signing', {amp: true}, (env) => {
     await a4a.adPromise_;
     expect(fallbackSpy).to.be.called;
   });
-
-  it('should ignore shadow DOM requirement without an experiment', async () => {
-    toggleExperiment(env.win, 'disable-a4a-non-sd', false, true);
-    attachShadowStub.value(undefined);
-    const fallbackSpy = env.sandbox.spy(a4a, 'handleFallback_');
-    env.sandbox.stub(a4a, 'skipClientSideValidation').returns(false);
-    await a4a.buildCallback();
-    a4a.onLayoutMeasure();
-    await a4a.adPromise_;
-    expect(fallbackSpy).to.not.be.called;
-  });
 });
 
 describes.realWin('amp-a4a', {amp: true}, (env) => {
@@ -933,31 +918,35 @@ describes.realWin('amp-a4a', {amp: true}, (env) => {
         a4a.onLayoutMeasure();
         await a4a.layoutCallback();
         verifyCachedContentIframeRender(a4aElement, TEST_URL, true);
-        expect(a4a.iframe.getAttribute('allow')).to.equal("sync-xhr 'none';");
+        expect(a4a.iframe.getAttribute('allow')).to.include("sync-xhr 'none';");
       });
 
       it('should set feature policy for attribution-reporting when supported', async () => {
         env.sandbox
-          .stub(secureFrame, 'isAttributionReportingSupported')
+          .stub(privacySandboxUtils, 'isAttributionReportingAllowed')
           .returns(true);
         a4a.sandboxHTMLCreativeFrame = () => true;
         a4a.onLayoutMeasure();
         await a4a.layoutCallback();
         verifyCachedContentIframeRender(a4aElement, TEST_URL, true);
-        expect(a4a.iframe.getAttribute('allow')).to.equal(
-          "sync-xhr 'none';attribution-reporting 'src';"
+        expect(a4a.iframe.getAttribute('allow')).to.include("sync-xhr 'none';");
+        expect(a4a.iframe.getAttribute('allow')).to.include(
+          "attribution-reporting 'src';"
         );
       });
 
       it('should not set feature policy for attribution-reporting when not supported', async () => {
         env.sandbox
-          .stub(secureFrame, 'isAttributionReportingSupported')
+          .stub(privacySandboxUtils, 'isAttributionReportingAllowed')
           .returns(false);
         a4a.sandboxHTMLCreativeFrame = () => true;
         a4a.onLayoutMeasure();
         await a4a.layoutCallback();
         verifyCachedContentIframeRender(a4aElement, TEST_URL, true);
-        expect(a4a.iframe.getAttribute('allow')).to.equal("sync-xhr 'none';");
+        expect(a4a.iframe.getAttribute('allow')).to.include("sync-xhr 'none';");
+        expect(a4a.iframe.getAttribute('allow')).to.not.include(
+          "attribution-reporting 'src';"
+        );
       });
     });
 
@@ -1050,7 +1039,7 @@ describes.realWin('amp-a4a', {amp: true}, (env) => {
 
       it('should set feature policy for attribution-reporting when supported', async () => {
         env.sandbox
-          .stub(secureFrame, 'isAttributionReportingSupported')
+          .stub(privacySandboxUtils, 'isAttributionReportingAllowed')
           .returns(true);
         a4a.sandboxHTMLCreativeFrame = () => false;
         a4a.onLayoutMeasure();
@@ -1063,7 +1052,7 @@ describes.realWin('amp-a4a', {amp: true}, (env) => {
 
       it('should not set feature policy for attribution-reporting when not supported', async () => {
         env.sandbox
-          .stub(secureFrame, 'isAttributionReportingSupported')
+          .stub(privacySandboxUtils, 'isAttributionReportingAllowed')
           .returns(false);
         a4a.sandboxHTMLCreativeFrame = () => false;
         a4a.onLayoutMeasure();
@@ -1074,8 +1063,7 @@ describes.realWin('amp-a4a', {amp: true}, (env) => {
 
       ['', 'client_cache', 'safeframe', 'some_random_thing'].forEach(
         (headerVal) => {
-          // TODO(wg-monetization, #25690): Fails on CI.
-          it.skip(`should not attach a NameFrame when header is ${headerVal}`, async () => {
+          it(`should not attach a NameFrame when header is ${headerVal}`, async () => {
             const devStub = env.sandbox.stub(dev(), 'error');
             // Make sure there's no signature, so that we go down the 3p
             // iframe path.
@@ -1184,7 +1172,7 @@ describes.realWin('amp-a4a', {amp: true}, (env) => {
 
       it('should set feature policy for attribution-reporting when supported', async () => {
         env.sandbox
-          .stub(secureFrame, 'isAttributionReportingSupported')
+          .stub(privacySandboxUtils, 'isAttributionReportingAllowed')
           .returns(true);
         a4a.sandboxHTMLCreativeFrame = () => false;
         a4a.onLayoutMeasure();
@@ -1201,7 +1189,7 @@ describes.realWin('amp-a4a', {amp: true}, (env) => {
 
       it('should not set feature policy for attribution-reporting when not supported', async () => {
         env.sandbox
-          .stub(secureFrame, 'isAttributionReportingSupported')
+          .stub(privacySandboxUtils, 'isAttributionReportingAllowed')
           .returns(false);
         a4a.sandboxHTMLCreativeFrame = () => false;
         a4a.onLayoutMeasure();
@@ -1600,6 +1588,7 @@ describes.realWin('amp-a4a', {amp: true}, (env) => {
             gdprApplies: null,
             consentStringType: null,
             additionalConsent: null,
+            consentSharedData: null,
           },
           rtcResponse
         )
@@ -1652,7 +1641,7 @@ describes.realWin('amp-a4a', {amp: true}, (env) => {
         .calledOnce;
       expect(updateLayoutPriorityStub).to.be.calledOnce;
       expect(updateLayoutPriorityStub.args[0][0]).to.equal(
-        LayoutPriority.CONTENT
+        LayoutPriority_Enum.CONTENT
       );
     });
 
@@ -1662,7 +1651,6 @@ describes.realWin('amp-a4a', {amp: true}, (env) => {
 
       // Remove attachShadow.
       attachShadowStub.value(undefined);
-      toggleExperiment(fixture.win, 'disable-a4a-non-sd', true, true);
 
       fetchMock.getOnce(
         TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
@@ -1709,7 +1697,6 @@ describes.realWin('amp-a4a', {amp: true}, (env) => {
       attachShadowStub.value(function () {
         return null;
       });
-      toggleExperiment(fixture.win, 'disable-a4a-non-sd', true, true);
 
       fetchMock.getOnce(
         TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
@@ -1789,7 +1776,7 @@ describes.realWin('amp-a4a', {amp: true}, (env) => {
         'renderNonAmpCreative_ called exactly once'
       ).to.be.true;
       expect(updateLayoutPriorityStub.args[0][0]).to.equal(
-        LayoutPriority.CONTENT
+        LayoutPriority_Enum.CONTENT
       );
       expect(is3pThrottled(a4a.win)).to.be.false;
     });
@@ -1994,7 +1981,7 @@ describes.realWin('amp-a4a', {amp: true}, (env) => {
           .calledOnce;
         expect(updateLayoutPriorityStub).to.be.calledOnce;
         expect(updateLayoutPriorityStub.args[0][0]).to.equal(
-          LayoutPriority.CONTENT
+          LayoutPriority_Enum.CONTENT
         );
       } else {
         expect(iframe.getAttribute('srcdoc')).to.be.null;
@@ -2702,7 +2689,9 @@ describes.realWin('amp-a4a', {amp: true}, (env) => {
           const body = env.ampdoc.getBody();
           const a4aElement = createA4aElement(env.win.document, null, body);
           const a4a = new MockA4AImpl(a4aElement);
-          expect(a4a.getLayoutPriority()).to.equal(LayoutPriority.METADATA);
+          expect(a4a.getLayoutPriority()).to.equal(
+            LayoutPriority_Enum.METADATA
+          );
         });
       }
     );
@@ -2719,7 +2708,7 @@ describes.realWin('amp-a4a', {amp: true}, (env) => {
           const body = env.ampdoc.getBody();
           const a4aElement = createA4aElement(env.win.document, null, body);
           const a4a = new MockA4AImpl(a4aElement);
-          expect(a4a.getLayoutPriority()).to.equal(LayoutPriority.ADS);
+          expect(a4a.getLayoutPriority()).to.equal(LayoutPriority_Enum.ADS);
         });
       }
     );
@@ -2803,7 +2792,13 @@ describes.realWin('amp-a4a', {amp: true}, (env) => {
     });
 
     describe('consent integration', () => {
-      let fixture, a4aElement, a4a, consentString, consentMetadata, gdprApplies;
+      let fixture,
+        a4aElement,
+        a4a,
+        consentString,
+        consentMetadata,
+        gdprApplies,
+        consentSharedData;
       beforeEach(async () => {
         fixture = await createIframePromise();
         setupForAdTesting(fixture);
@@ -2820,6 +2815,12 @@ describes.realWin('amp-a4a', {amp: true}, (env) => {
           gdprApplies,
           'consentStringType': 1,
           'additionalConsent': 'abc123',
+          purposeOne: true,
+          'gppSectionId': '1,2',
+        };
+        consentSharedData = {
+          'doubleclick-tfcd': 1,
+          'doubleclick-tfua': 1,
         };
         return fixture;
       });
@@ -2837,6 +2838,7 @@ describes.realWin('amp-a4a', {amp: true}, (env) => {
             whenPolicyResolved: () => policyPromise,
             getConsentStringInfo: () => consentString,
             getConsentMetadataInfo: () => consentMetadata,
+            getMergedSharedData: () => consentSharedData,
           })
         );
 
@@ -2860,6 +2862,9 @@ describes.realWin('amp-a4a', {amp: true}, (env) => {
             gdprApplies,
             consentStringType: consentMetadata['consentStringType'],
             additionalConsent: consentMetadata['additionalConsent'],
+            consentSharedData,
+            purposeOne: consentMetadata['purposeOne'],
+            gppSectionId: consentMetadata['gppSectionId'],
           })
         ).calledOnce;
         expect(
@@ -2895,6 +2900,7 @@ describes.realWin('amp-a4a', {amp: true}, (env) => {
               Promise.resolve(CONSENT_POLICY_STATE.SUFFICIENT),
             getConsentStringInfo: () => consentString,
             getConsentMetadataInfo: () => consentMetadata,
+            getMergedSharedData: () => consentSharedData,
           })
         );
 
@@ -2914,6 +2920,9 @@ describes.realWin('amp-a4a', {amp: true}, (env) => {
             gdprApplies,
             consentStringType: consentMetadata['consentStringType'],
             additionalConsent: consentMetadata['additionalConsent'],
+            consentSharedData,
+            purposeOne: consentMetadata['purposeOne'],
+            gppSectionId: consentMetadata['gppSectionId'],
           })
         ).calledOnce;
         expect(
@@ -2941,6 +2950,9 @@ describes.realWin('amp-a4a', {amp: true}, (env) => {
             getConsentMetadata: () => {
               throw new Error('consent err!');
             },
+            getMergedSharedData: () => {
+              throw new Error('consent err!');
+            },
           })
         );
 
@@ -2960,6 +2972,9 @@ describes.realWin('amp-a4a', {amp: true}, (env) => {
             consentStringType: null,
             gdprApplies: null,
             additionalConsent: null,
+            consentSharedData: null,
+            purposeOne: null,
+            gppSectionId: null,
           })
         ).calledOnce;
         expect(
@@ -3530,9 +3545,96 @@ describes.realWin('AmpA4a-RTC', {amp: true}, (env) => {
     });
   });
 
+  describe('#tryExecuteRealTimeConfig storage consent test', () => {
+    let getCustomRealTimeConfigMacrosSpy;
+
+    beforeEach(() => {
+      element.setAttribute('rtc-config', true);
+      getCustomRealTimeConfigMacrosSpy = env.sandbox.spy(
+        a4a,
+        'getCustomRealTimeConfigMacros_'
+      );
+    });
+
+    for (const {
+      consentState,
+      consentString,
+      gdprApplies,
+      hasStorageConsent,
+      purposeOne,
+    } of [
+      // Unknown consent
+      {
+        consentState: CONSENT_POLICY_STATE.UNKNOWN,
+        gdprApplies: true,
+        consentString: 'string',
+        purposeOne: true,
+        hasStorageConsent: false,
+      },
+      // Insufficient consent
+      {
+        consentState: CONSENT_POLICY_STATE.INSUFFICIENT,
+        gdprApplies: true,
+        consentString: 'string',
+        purposeOne: true,
+        hasStorageConsent: false,
+      },
+      // GDPR doesn't apply
+      {
+        consentState: CONSENT_POLICY_STATE.SUFFICIENT,
+        gdprApplies: false,
+        consentString: '',
+        purposeOne: false,
+        hasStorageConsent: true,
+      },
+      // No consent string
+      {
+        consentState: CONSENT_POLICY_STATE.SUFFICIENT,
+        gdprApplies: true,
+        consentString: '',
+        purposeOne: true,
+        hasStorageConsent: false,
+      },
+      // no purpose one consent
+      {
+        consentState: CONSENT_POLICY_STATE.SUFFICIENT,
+        gdprApplies: true,
+        consentString: 'string',
+        purposeOne: false,
+        hasStorageConsent: false,
+      },
+      // GDPR applies and all prerequisite satisfied
+      {
+        consentState: CONSENT_POLICY_STATE.SUFFICIENT,
+        gdprApplies: true,
+        consentString: 'string',
+        purposeOne: true,
+        hasStorageConsent: true,
+      },
+    ]) {
+      it(
+        `storageConsent test - consentState=${consentState}, ` +
+          `consentString=${consentString}, gdprApplies=${gdprApplies},` +
+          `purposeOne=${purposeOne} -> hasStorageConsent=${hasStorageConsent}`,
+        () => {
+          return a4a
+            .tryExecuteRealTimeConfig_(consentState, consentString, {
+              gdprApplies,
+              purposeOne,
+            })
+            .then(() => {
+              expect(getCustomRealTimeConfigMacrosSpy).to.be.calledWith(
+                hasStorageConsent
+              );
+            });
+        }
+      );
+    }
+  });
+
   describe('#getCustomRealTimeConfigMacros_', () => {
     it('should return empty object', () => {
-      expect(a4a.getCustomRealTimeConfigMacros_()).to.deep.equal({});
+      expect(a4a.getCustomRealTimeConfigMacros_(true)).to.deep.equal({});
     });
   });
 
diff --git a/extensions/amp-a4a/0.1/test/utils.js b/extensions/amp-a4a/0.1/test/utils.js
index ce8d1ae3751b..28c6b4ec1bf5 100644
--- a/extensions/amp-a4a/0.1/test/utils.js
+++ b/extensions/amp-a4a/0.1/test/utils.js
@@ -1,5 +1,3 @@
-import {dict} from '#core/types/object';
-
 import {AmpA4A} from '../amp-a4a';
 
 /** @type {string} @private */
@@ -36,6 +34,6 @@ export class MockA4AImpl extends AmpA4A {
 
   /** @override */
   getA4aAnalyticsConfig() {
-    return dict();
+    return {};
   }
 }
diff --git a/extensions/amp-a4a/rtc-documentation.md b/extensions/amp-a4a/rtc-documentation.md
index a87d7dad550c..a2d5ef751272 100644
--- a/extensions/amp-a4a/rtc-documentation.md
+++ b/extensions/amp-a4a/rtc-documentation.md
@@ -125,31 +125,37 @@ The `errorReportingUrl` property is optional. The only available macros are ERRO
 
 -   Admax
 -   Adpushup
--   AppNexus
 -   AppNexus PSP
 -   APS
 -   Automatad
 -   Andbeyond
 -   Browsi
 -   Criteo
+-   Denakop
 -   FLUX
 -   Freestar
 -   Future Plc
 -   Galaxie Media
 -   Highfivve
+-   Hubvisor
+-   [Improve Digital](https://www.improvedigital.com)
 -   IndexExchange
 -   Kargo
--   NewsPassID
 -   Lotame
 -   Media.net
 -   Mediasquare
+-   Navegg
+-   NewsPassID
 -   Nexx360.io
 -   OpenX
 -   PubMatic OpenWrap
+-   [PubWise](https://www.pubwise.io)
 -   Purch
+-   RichAudience
 -   Rubicon
 -   Salesforce
 -   [Snigel](https://www.snigel.com)
+-   Sonobi
 -   T13
 -   Tail
 -   The Ozone Project
@@ -611,9 +617,9 @@ This is not allowed:
 
 <table>
   <tr>
-   <td>Callout 1: <a href="`https://www.vendor1.com/foo?slot_id=1234"`>`https://www.vendor1.com/foo?slot_id=1234`</a>
+   <td>Callout 1: `https://www.vendor1.com/foo?slot_id=1234`
 <p>
-Callout 2: <a href="`https://www.vendor1.com/foo?slot_id=1234`">`https://www.vendor1.com/foo?slot_id=1234`</a>
+Callout 2: `https://www.vendor1.com/foo?slot_id=1234`
    </td>
   </tr>
   <tr>
@@ -626,9 +632,9 @@ This is allowed:
 
 <table>
   <tr>
-   <td>Callout 1: <a href="`https://www.vendor1.com/foo?slot_id=1234`">`https://www.vendor1.com/foo?slot_id=1234`</a>
+   <td>Callout 1: `https://www.vendor1.com/foo?slot_id=1234`
 <p>
-Callout 2: <a href="`https://www.vendor1.com/foo?slot_id=1234`">`https://www.vendor1.com/foo?slot_id=5678`</a>
+Callout 2: `https://www.vendor1.com/foo?slot_id=5678`
    </td>
   </tr>
   <tr>
diff --git a/extensions/amp-a4a/rtc-publisher-implementation-guide.md b/extensions/amp-a4a/rtc-publisher-implementation-guide.md
index 3398c0783a78..bc379b061ec8 100644
--- a/extensions/amp-a4a/rtc-publisher-implementation-guide.md
+++ b/extensions/amp-a4a/rtc-publisher-implementation-guide.md
@@ -17,11 +17,12 @@ To use RTC, you must meet the following requirements:
 -   Use an ad network that supports Fast Fetch and AMP RTC
 -   Set the `rtc-config` attribute on each amp-ad element for which RTC is to be used, as specified below.
 
+<!-- markdown-link-check-disable -->
+
 ### Supported Vendors
 
 -   Admax
 -   Adpushup
--   AppNexus
 -   AppNexus PSP
 -   APS
 -   Automatad
@@ -32,6 +33,7 @@ To use RTC, you must meet the following requirements:
 -   [Freestar](https://freestar.com)
 -   Future Plc
 -   [Highfivve](https://highfivve.com)
+-   [Improve Digital](https://www.improvedigital.com)
 -   IndexExchange
 -   Kargo
 -   Newspassid
@@ -40,7 +42,9 @@ To use RTC, you must meet the following requirements:
 -   Mediasquare
 -   OpenX
 -   PubMatic OpenWrap
+-   [PubWise](https://pubwise.io)
 -   Purch
+-   RichAudience
 -   Rubicon
 -   Salesforce
 -   [Snigel](https://www.snigel.com)
@@ -50,6 +54,8 @@ To use RTC, you must meet the following requirements:
 -   Yieldbot
 -   Yieldlab
 
+<!-- markdown-link-check-enable -->
+
 ### Overview
 
 To use RTC, specify the `rtc-config` attribute on each `amp-ad` element for which RTC should be performed. The `rtc-config` specifies a list of third-party vendors and/or publisher-defined URLs, which should be called to retrieve targeting information. The default timeout for these callouts is 1 second, but the publisher may optionally specify a shorter timeout.
diff --git a/extensions/amp-access-fewcents/0.1/amp-access-fewcents.css b/extensions/amp-access-fewcents/0.1/amp-access-fewcents.css
new file mode 100644
index 000000000000..7bfde49308b2
--- /dev/null
+++ b/extensions/amp-access-fewcents/0.1/amp-access-fewcents.css
@@ -0,0 +1,143 @@
+#amp-access-fewcents-dialog {
+  margin: 0px;
+  padding: 16px;
+  display: flex;
+  -webkit-box-pack: center;
+  justify-content: center;
+  line-height: 1.2;
+  transition: opacity 300ms ease 0s;
+}
+.aaf-container {
+  -ms-flex-align: center;
+  align-items: center;
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  position: relative;
+  height: auto;
+  border: 0px;
+  background: rgb(255, 255, 255);
+  font-family: Georgia, Times, 'Times New Roman', serif;
+  font-weight: normal;
+  margin: 0px;
+  border-radius: 5px;
+  box-shadow: rgb(0 0 0 / 20%) 0px 4px 10px 0px, rgb(0 0 0 / 19%) 0px 4px 20px 0px;
+  transition: all 0.5s ease 0s;
+  width: 300px;
+  padding: 8px;
+}
+.aaf-headerText {
+  font-size: 17px;
+  text-align: center;
+  overflow-wrap: normal;
+  overflow: hidden;
+  margin-top: 8px;
+  color: rgba(0, 0, 0, 0.87);
+}
+.aaf-purchase-button {
+  -ms-flex-align: center;
+  -ms-flex-pack: center;
+  -webkit-box-align: center;
+  align-items: center;
+  font-family: Georgia, Times, 'Times New Roman', serif;
+  width: 100%;
+  outline: none;
+  cursor: pointer;
+  color: white;
+  background: #08289a;
+  margin: 8px auto 0px;
+  max-width: 200px;
+  border-radius: 5px;
+  border: 0px;
+  height: 40px;
+  display: flex;
+  -webkit-box-pack: center;
+  justify-content: center;
+  line-height: 40px;
+  font-size: 16px;
+  padding: 0px 5px;
+}
+.aaf-imageTag {
+  max-height: 25px;
+  margin-top: 6px;
+}
+.aaf-already-bought {
+  font-size: 13px;
+  font-weight: 500;
+  text-align: center;
+  margin-top: 8px;
+  margin-bottom: 0px;
+  color: #08289a;
+}
+.aaf-price-btn-div {
+  display: -ms-flexbox;
+  -ms-flex-align: center;
+  text-align: center;
+  display: flex;
+  -webkit-box-pack: center;
+  justify-content: center;
+  width: 100%;
+  flex-direction: column;
+}
+.aaf-article-price {
+  font-size: 24px;
+  font-weight: 400;
+  text-align: center;
+  -webkit-box-pack: center;
+  justify-content: center;
+  color: rgba(0, 0, 0, 0.87);
+  width: 100%;
+  margin-top: 8px;
+}
+.aaf-btn-div {
+  line-height: 1.2;
+  text-align: center;
+  display: flex;
+  -webkit-box-pack: center;
+  justify-content: center;
+  width: 100%;
+  flex-direction: column;
+}
+.aaf-bottom-div {
+  display: -ms-flexbox;
+  -ms-flex-align: center;
+  margin-top: 12px;
+  font-size: 9px;
+  text-align: center;
+  color: rgba(0, 0, 0, 0.87);
+  display: flex;
+  -webkit-box-pack: center;
+  justify-content: center;
+  -webkit-box-align: center;
+  align-items: center;
+  opacity: 0.6;
+}
+.aaf-fewcents-image-tag {
+  max-height: 25px;
+}
+.aaf-refRow {
+  word-break: break-word;
+}
+.aaf-refElements,
+.aaf-refRow {
+  text-align: center;
+  color: #a8a3a3;
+}
+.aaf-refElements {
+   padding:2px;
+   font-size: 9px;
+   text-decoration: none;
+}
+.aaf-refElements:hover{
+  text-decoration: underline;
+}
+.aaf-partition-bar {
+  font-size: 11px;
+  margin: 0px 4px;
+}
+@media (max-width: 786px) {
+  #amp-access-fewcents-dialog {
+    width: 350px;
+  }
+}
diff --git a/extensions/amp-access-fewcents/0.1/amp-access-fewcents.js b/extensions/amp-access-fewcents/0.1/amp-access-fewcents.js
new file mode 100644
index 000000000000..ce1b653e6d81
--- /dev/null
+++ b/extensions/amp-access-fewcents/0.1/amp-access-fewcents.js
@@ -0,0 +1,42 @@
+/**
+ * Copyright 2022 The AMP HTML Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {Services} from '#service';
+
+import {TAG} from './fewcents-constants';
+import {AmpAccessFewcents} from './fewcents-impl';
+
+AMP.extension(TAG, '0.1', function (AMP) {
+  AMP.registerServiceForDoc(
+    'fewcents',
+    /**
+     * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
+     * @return {../../amp-access/0.1/access-vendor.AccessVendor}
+     */
+    function (ampdoc) {
+      const element = ampdoc.getHeadNode();
+      return Services.accessServiceForDoc(element).then((accessService) => {
+        const source = accessService.getVendorSource('fewcents');
+        const vendor = new AmpAccessFewcents(accessService, source);
+        const adapter = /** @type {
+              !../../amp-access/0.1/amp-access-vendor.AccessVendorAdapter
+            } */ (source.getAdapter());
+        adapter.registerVendor(vendor);
+        return vendor;
+      });
+    }
+  );
+});
diff --git a/extensions/amp-access-fewcents/0.1/fewcents-constants.js b/extensions/amp-access-fewcents/0.1/fewcents-constants.js
new file mode 100644
index 000000000000..ee82a624b98a
--- /dev/null
+++ b/extensions/amp-access-fewcents/0.1/fewcents-constants.js
@@ -0,0 +1,31 @@
+/** @const {string} Extension name*/
+export const TAG = 'amp-access-fewcents';
+
+/** @const {string} Extension shorthand name used for CSS classes */
+export const TAG_SHORTHAND = 'aaf';
+
+/** @const {json} */
+export const CONFIG_BASE_PATH = {
+  development: 'https://api.hounds.fewcents.co/',
+  demo: 'https://api.demo.fewcents.co/',
+  production: 'https://api.fewcents.co/',
+};
+
+/** @const {string} Path params for authorize url */
+export const CONFIG_PATH_PARAMS =
+  'v1/amp/authorizeBid?articleUrl=SOURCE_URL&ampReaderId=READER_ID&returnUrl=RETURN_URL';
+
+/** @const {number} */
+export const AUTHORIZATION_TIMEOUT = 10000;
+
+/** @const {JsonObject} */
+export const DEFAULT_MESSAGES = {
+  /* fc denotes fewcents */
+  fcTitleText: 'Instant Access With Fewcents.',
+  fcPromptText: 'I already bought this',
+  fcButtonText: 'Unlock',
+  fcPoweredImageRef: 'https://images.fewcents.co/paywall/powered-fewcents.png',
+  fcTermsRef: 'https://www.fewcents.co/terms',
+  fcPrivacyRef: 'https://www.fewcents.co/privacy',
+  fcContactUsRef: 'mailto:support@fewcents.co',
+};
diff --git a/extensions/amp-access-fewcents/0.1/fewcents-impl.js b/extensions/amp-access-fewcents/0.1/fewcents-impl.js
new file mode 100644
index 000000000000..53f9d49019d1
--- /dev/null
+++ b/extensions/amp-access-fewcents/0.1/fewcents-impl.js
@@ -0,0 +1,506 @@
+/**
+ * Copyright 2022 The AMP HTML Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {createElementWithAttributes, removeChildren} from '#core/dom';
+
+import {Services} from '#service';
+
+import {listen} from '#utils/event-helper';
+import {user} from '#utils/log';
+
+import {parseUrlDeprecated} from 'src/url';
+
+import {
+  AUTHORIZATION_TIMEOUT,
+  CONFIG_BASE_PATH,
+  CONFIG_PATH_PARAMS,
+  DEFAULT_MESSAGES,
+  TAG,
+  TAG_SHORTHAND,
+} from './fewcents-constants';
+
+import {CSS} from '../../../build/amp-access-fewcents-0.1.css';
+import {installStylesForDoc} from '../../../src/style-installer';
+
+/**
+ * @implements {../../amp-access/0.1/access-vendor.AccessVendor}
+ */
+export class AmpAccessFewcents {
+  /**
+   * @constructor
+   * @param {!../../amp-access/0.1/amp-access.AccessService} accessService
+   * @param {!../../amp-access/0.1/amp-access-source.AccessSource} accessSource
+   */
+  constructor(accessService, accessSource) {
+    /** @const */
+    this.ampdoc = accessService.ampdoc;
+
+    /** @const @private {!../../amp-access/0.1/amp-access-source.AccessSource} */
+    this.accessSource_ = accessSource;
+
+    /** @private {?Node} */
+    this.innerContainer_ = null;
+
+    /** @private {?Node} Main container where paywall will be rendered */
+    this.dialogContainer_ = null;
+
+    /** @const @private {JsonObject}  Stores the config passed by the publisher */
+    this.fewcentsConfig_ = this.accessSource_.getAdapterConfig();
+
+    /** @private {string} Authorize endpoint to get paywall data*/
+    this.authorizeUrl_ = this.prepareAuthorizeUrl_();
+
+    /** @private {!JsonObject} */
+    this.i18n_ = {...DEFAULT_MESSAGES};
+
+    /** @private {string} */
+    this.fewCentsBidId_ = null;
+
+    /** @const @private {!../../../src/service/xhr-impl.Xhr} */
+    this.xhr_ = Services.xhrFor(this.ampdoc.win);
+
+    /** @const @private {!../../../src/service/timer-impl.Timer} */
+    this.timer_ = Services.timerFor(this.ampdoc.win);
+
+    /** @const @private {!../../../src/service/vsync-impl.Vsync} */
+    this.vsync_ = Services.vsyncFor(this.ampdoc.win);
+
+    /** @private {JsonObject} */
+    this.purchaseOptions_ = null;
+
+    /** @private {string} */
+    this.loginDialogUrl_ = null;
+
+    installStylesForDoc(this.ampdoc, CSS, () => {}, false, TAG);
+  }
+
+  /**
+   * Decides whether to show the paywall or not
+   * @return {!Promise<!JsonObject>}
+   */
+  authorize() {
+    return this.getPaywallData_()
+      .then(
+        (response) => {
+          // removing the paywall if shown and showing the content
+          this.emptyContainer_();
+          return {
+            access: response.data.access,
+            data: JSON.stringify(response),
+          };
+        },
+        (err) => {
+          // showing the paywall
+          if (!err || !err.response) {
+            throw err;
+          }
+
+          const {response} = err;
+          // showing paywall when error code is 402 i.e payment required
+          if (response.status !== 402) {
+            throw err;
+          }
+
+          // rendering the paywall
+          return response
+            .json()
+            .catch(() => {
+              throw err;
+            })
+            .then((responseJson) => {
+              this.parseAuthorizeResponse_(responseJson);
+              this.emptyContainer_().then(
+                this.renderPurchaseOverlay_.bind(this)
+              );
+              return {access: false, data: JSON.stringify(responseJson)};
+            });
+        }
+      )
+      .catch(() => {
+        // showing the content when authorize endpoint fails
+        this.emptyContainer_();
+        return {access: true};
+      });
+  }
+
+  /**
+   * Add request parameters for the authorize endpoint
+   * @return {string}
+   * @private
+   */
+  prepareAuthorizeUrl_() {
+    const accessKey = this.fewcentsConfig_['accessKey'];
+    const articleIdentifier = this.fewcentsConfig_['articleIdentifier'];
+    const category = this.fewcentsConfig_['category'];
+
+    const {hostname} = parseUrlDeprecated();
+    const basePath = this.getConfigBasePath_() + CONFIG_PATH_PARAMS;
+
+    const url =
+      basePath +
+      '&accessKey=' +
+      encodeURIComponent(accessKey) +
+      '&category=' +
+      encodeURIComponent(category) +
+      '&articleIdentifier=' +
+      encodeURIComponent(articleIdentifier) +
+      '&domain=' +
+      encodeURIComponent(hostname);
+
+    return url;
+  }
+
+  /**
+   * Returns the base path for authorize endpoint
+   * @private
+   * @return {string}
+   */
+  getConfigBasePath_() {
+    const env = this.fewcentsConfig_['environment'];
+    if (env === 'development') {
+      return CONFIG_BASE_PATH.development;
+    } else if (env === 'demo') {
+      return CONFIG_BASE_PATH.demo;
+    } else {
+      return CONFIG_BASE_PATH.production;
+    }
+  }
+
+  /**
+   * Parse the response from authorize endpoint
+   * @param {json} response
+   * @private
+   */
+  parseAuthorizeResponse_(response) {
+    const purchaseOptionsList = response?.data?.purchaseOptions;
+    this.purchaseOptions_ = purchaseOptionsList?.[0];
+    this.loginDialogUrl_ = response?.data?.loginUrl;
+    const fewCentsBidId = response?.data?.bidId;
+
+    // Setting the fewcentsBidId for re-authorize
+    if (fewCentsBidId) {
+      this.fewCentsBidId_ = fewCentsBidId;
+    }
+  }
+
+  /**
+   * Get paywall data by calling authorize endpoint
+   * @return {!Promise<Object>}
+   * @private
+   */
+  getPaywallData_() {
+    let authorizeUrl = this.authorizeUrl_;
+
+    // appending bidId in the authorize url during re-authorize
+    if (this.fewCentsBidId_) {
+      authorizeUrl = authorizeUrl + '&bidId=' + this.fewCentsBidId_;
+    }
+
+    // replacing variable READER_Id, CANONICAL_URL in the authorize url
+    const urlPromise = this.accessSource_.buildUrl(
+      authorizeUrl,
+      /* useAuthData */ false
+    );
+
+    return urlPromise
+      .then((url) => {
+        // replacing variable RETURN_URL in the authorize url
+        return this.accessSource_.getLoginUrl(url);
+      })
+      .then((url) => {
+        return this.timer_
+          .timeoutPromise(AUTHORIZATION_TIMEOUT, this.xhr_.fetchJson(url, {}))
+          .then((res) => {
+            return res.json();
+          });
+      });
+  }
+
+  /**
+   * Removes the paywall from the element on publisher's page where paywall is displayed
+   * @private
+   * @return {!Promise}
+   */
+  emptyContainer_() {
+    if (this.containerEmpty_) {
+      return Promise.resolve();
+    }
+
+    if (this.unlockButtonListener_) {
+      this.unlockButtonListener_ = null;
+    }
+
+    if (this.alreadyPurchasedListener_) {
+      this.alreadyPurchasedListener_ = null;
+    }
+
+    return this.vsync_.mutatePromise(() => {
+      this.containerEmpty_ = true;
+      this.innerContainer_ = null;
+      removeChildren(this.getPaywallContainer_());
+    });
+  }
+
+  /**
+   * Return element on publisher's page where paywall will be displayed
+   * @return {!Element}
+   * @private
+   */
+  getPaywallContainer_() {
+    const containerId = this.fewcentsConfig_['contentSelector'];
+    const dialogContainer = this.ampdoc.getElementById(containerId);
+    return user().assertElement(
+      dialogContainer,
+      'No element found with given id',
+      containerId
+    );
+  }
+
+  /**
+   * Creates the paywall component and append it to dialog container
+   * @private
+   */
+  renderPurchaseOverlay_() {
+    this.dialogContainer_ = this.getPaywallContainer_();
+    this.innerContainer_ = createElementWithAttributes(
+      this.ampdoc.win.document,
+      'div',
+      {
+        class: TAG_SHORTHAND + '-container',
+      }
+    );
+
+    this.createLogoAndHeader_();
+
+    this.createAlreadyBoughtElement_();
+
+    this.createPriceAndButton_();
+
+    // 'div' element for reference row and fewcents logo
+    const bottomDiv = createElementWithAttributes(
+      this.ampdoc.win.document,
+      'div',
+      {
+        class: TAG_SHORTHAND + '-bottom-div',
+      }
+    );
+
+    // Reference row for terms and conditions
+    const refRow = this.createRefRowElement_();
+    bottomDiv.appendChild(refRow);
+
+    // Creating fewcents logo for the paywall
+    const fewcentsLogo = createElementWithAttributes(
+      this.ampdoc.win.document,
+      'img',
+      {
+        class: TAG_SHORTHAND + '-fewcents-image-tag',
+        src: this.i18n_['fcPoweredImageRef'],
+      }
+    );
+    bottomDiv.appendChild(fewcentsLogo);
+    this.innerContainer_.appendChild(bottomDiv);
+
+    this.dialogContainer_.appendChild(this.innerContainer_);
+    this.containerEmpty_ = false;
+  }
+
+  /**
+   * Creates publisher logo and header text for the paywall
+   * @private
+   */
+  createLogoAndHeader_() {
+    const publisherLogo = createElementWithAttributes(
+      this.ampdoc.win.document,
+      'img',
+      {
+        class: TAG_SHORTHAND + '-imageTag',
+        src: this.fewcentsConfig_['publisherLogoUrl'],
+      }
+    );
+    this.innerContainer_.appendChild(publisherLogo);
+
+    const headerText = createElementWithAttributes(
+      this.ampdoc.win.document,
+      'div',
+      {
+        class: TAG_SHORTHAND + '-headerText',
+      }
+    );
+
+    headerText.textContent = this.i18n_['fcTitleText'];
+    this.innerContainer_.appendChild(headerText);
+  }
+
+  /**
+   * Creates already bought link
+   * @private
+   */
+  createAlreadyBoughtElement_() {
+    const alreadyBought = createElementWithAttributes(
+      this.ampdoc.win.document,
+      'a',
+      {
+        class: TAG_SHORTHAND + '-already-bought',
+        href: this.loginDialogUrl_,
+        target: '_blank',
+        rel: 'noopener noreferrer',
+      }
+    );
+
+    alreadyBought.textContent = this.i18n_['fcPromptText'];
+    this.alreadyPurchasedListener_ = listen(alreadyBought, 'click', (ev) => {
+      this.handlePurchase_(ev);
+    });
+    this.innerContainer_.appendChild(alreadyBought);
+  }
+
+  /**
+   * Create elements for article price and unlock button
+   * @private
+   */
+  createPriceAndButton_() {
+    const priceAndButtonDiv = createElementWithAttributes(
+      this.ampdoc.win.document,
+      'div',
+      {
+        class: TAG_SHORTHAND + '-price-btn-div',
+      }
+    );
+    this.innerContainer_.appendChild(priceAndButtonDiv);
+
+    // Article price element
+    const articlePrice = createElementWithAttributes(
+      this.ampdoc.win.document,
+      'div',
+      {
+        class: TAG_SHORTHAND + '-article-price',
+      }
+    );
+
+    articlePrice.textContent = this.purchaseOptions_?.price?.price;
+    priceAndButtonDiv.appendChild(articlePrice);
+
+    // Unlock button div element
+    const unlockButtonDiv = createElementWithAttributes(
+      this.ampdoc.win.document,
+      'div',
+      {
+        class: TAG_SHORTHAND + '-btn-div',
+      }
+    );
+
+    // Creating unlock button on paywall
+    const unlockButton = createElementWithAttributes(
+      this.ampdoc.win.document,
+      'button',
+      {
+        class: TAG_SHORTHAND + '-purchase-button',
+        style: 'background:'.concat(this.fewcentsConfig_['primaryColor']),
+      }
+    );
+
+    unlockButton.textContent = this.i18n_['fcButtonText'];
+    this.unlockButtonListener_ = listen(unlockButton, 'click', (ev) => {
+      this.handlePurchase_(ev);
+    });
+    unlockButtonDiv.appendChild(unlockButton);
+    priceAndButtonDiv.appendChild(unlockButtonDiv);
+  }
+
+  /**
+   * Create reference elements on paywall
+   * @private
+   */
+  createRefRowElement_() {
+    const refRow = createElementWithAttributes(
+      this.ampdoc.win.document,
+      'div',
+      {
+        class: TAG_SHORTHAND + '-refRow',
+      }
+    );
+
+    const terms = createElementWithAttributes(this.ampdoc.win.document, 'a', {
+      class: TAG_SHORTHAND + '-refElements',
+      href: this.i18n_['fcTermsRef'],
+      target: '_blank',
+      rel: 'noopener noreferrer',
+    });
+    terms.textContent = 'Terms';
+    refRow.appendChild(terms);
+    this.createPartitionbar_(refRow);
+
+    const privacy = createElementWithAttributes(this.ampdoc.win.document, 'a', {
+      class: TAG_SHORTHAND + '-refElements',
+      href: this.i18n_['fcPrivacyRef'],
+      target: '_blank',
+      rel: 'noopener noreferrer',
+    });
+    privacy.textContent = 'Privacy';
+    refRow.appendChild(privacy);
+    this.createPartitionbar_(refRow);
+
+    const contactUs = createElementWithAttributes(
+      this.ampdoc.win.document,
+      'a',
+      {
+        class: TAG_SHORTHAND + '-refElements',
+        href: this.i18n_['fcContactUsRef'],
+        target: '_blank',
+        rel: 'noopener noreferrer',
+      }
+    );
+    contactUs.textContent = 'Contact Us';
+    refRow.appendChild(contactUs);
+    this.createPartitionbar_(refRow);
+
+    return refRow;
+  }
+
+  /**
+   * Create partition bar for the reference elements
+   * @private
+   */
+  createPartitionbar_(refRow) {
+    const partitionBar = createElementWithAttributes(
+      this.ampdoc.win.document,
+      'span',
+      {
+        class: TAG_SHORTHAND + '-partition-bar',
+      }
+    );
+    partitionBar.textContent = '|';
+    refRow.appendChild(partitionBar);
+  }
+
+  /**
+   * Open login dialog when click on unlock button
+   * @param {!Event} ev
+   * @private
+   */
+  handlePurchase_(ev) {
+    ev.preventDefault();
+    const urlPromise = this.accessSource_.buildUrl(
+      this.loginDialogUrl_,
+      /* useAuthData */ false
+    );
+
+    return urlPromise.then((url) => {
+      this.accessSource_.loginWithUrl(url);
+    });
+  }
+}
diff --git a/extensions/amp-access-fewcents/0.1/test/test-amp-access-fewcents.js b/extensions/amp-access-fewcents/0.1/test/test-amp-access-fewcents.js
new file mode 100644
index 000000000000..0ee71f2642aa
--- /dev/null
+++ b/extensions/amp-access-fewcents/0.1/test/test-amp-access-fewcents.js
@@ -0,0 +1,440 @@
+/**
+ * Copyright 2022 The AMP HTML Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {sleep} from '#testing/helpers';
+
+import {AmpAccessFewcents} from '../fewcents-impl';
+
+const TAG = 'amp-access-fewcents';
+
+const TAG_SHORTHAND = 'aaf';
+
+const fewcentsConfigValue = {
+  publisherLogoUrl: 'https://www.jagranimages.com/images/jagran-logo-2021.png',
+  contentSelector: 'amp-access-fewcents-dialog',
+  primaryColor: '',
+  accessKey: 'localhost',
+  category: 'paywall',
+  articleIdentifier: 'mockArticleIdentifier',
+};
+
+const paywallResponse = {
+  success: true,
+  message: 'Amp article price returned with unlock url.',
+  data: {
+    loginUrl:
+      'https://wallet.hounds.fewcents.co/?login_source=amp_paywall&login_publisher_id=47&login_publisher_bid_id=90531&bid_mode=paywall&bid_price=622.38&login_redirect_url=http%3A%2F%2Flocalhost%3A8000%2Fexamples%2Famp-access-fewcents.html&login_publisher_logo_url=https%3A%2F%2Fi1.wp.com%2Fthefix.media%2Fwp-content%2Fuploads%2F2021%2F04%2Flogo-no-margins.png&amp_reader_id=amp-yfpD7ewsxdSdbH4xCboNIw',
+    purchaseOptions: [
+      {
+        price: {
+          currency: 'INR',
+          price: 622.38,
+        },
+        unlockUrl:
+          'https://wallet.hounds.fewcents.co/?login_source=amp_paywall&login_publisher_id=47&login_publisher_bid_id=90531&bid_mode=paywall&bid_price=622.38&login_redirect_url=http%3A%2F%2Flocalhost%3A8000%2Fexamples%2Famp-access-fewcents.html&login_publisher_logo_url=https%3A%2F%2Fi1.wp.com%2Fthefix.media%2Fwp-content%2Fuploads%2F2021%2F04%2Flogo-no-margins.png&amp_reader_id=amp-yfpD7ewsxdSdbH4xCboNIw',
+      },
+    ],
+    bidId: 90531,
+    access: false,
+  },
+  statusCode: 402,
+};
+
+describes.realWin(
+  'amp-access-fewcents-v0.1',
+  {
+    amp: {
+      runtimeOn: true,
+      extensions: ['amp-access-fewcents:0.1'],
+    },
+  },
+  (env) => {
+    let win;
+    let document;
+    let ampdoc;
+    let accessSource;
+    let accessService;
+    let accessSourceMock;
+    let xhrMock;
+    let fewcentsConfig;
+    let vendor;
+
+    beforeEach(() => {
+      win = env.win;
+      ampdoc = env.ampdoc;
+      document = win.document;
+
+      fewcentsConfig = fewcentsConfigValue;
+      fewcentsConfig['environment'] = 'development';
+
+      accessSource = {
+        getAdapterConfig: () => {
+          return fewcentsConfig;
+        },
+        buildUrl: () => {},
+        loginWithUrl: () => {},
+        getLoginUrl: () => {},
+      };
+
+      accessService = {
+        ampdoc,
+        getSource: () => accessSource,
+      };
+
+      accessSourceMock = env.sandbox.mock(accessSource);
+      vendor = new AmpAccessFewcents(accessService, accessSource);
+      xhrMock = env.sandbox.mock(vendor.xhr_);
+    });
+
+    afterEach(() => {
+      accessSourceMock.verify();
+      xhrMock.verify();
+    });
+
+    describe('authorize on development environment', () => {
+      let emptyContainerStub;
+      beforeEach(() => {
+        emptyContainerStub = env.sandbox.stub(vendor, 'emptyContainer_');
+        env.sandbox.stub(vendor, 'renderPurchaseOverlay_');
+      });
+
+      afterEach(() => {
+        vendor.fewCentsBidId_ = null;
+      });
+
+      it('should show the premium content', () => {
+        accessSourceMock
+          .expects('buildUrl')
+          .returns(Promise.resolve(''))
+          .once();
+
+        xhrMock
+          .expects('fetchJson')
+          .returns(
+            Promise.resolve({
+              json() {
+                return Promise.resolve({access: true});
+              },
+            })
+          )
+          .once();
+
+        return vendor.authorize().then((resp) => {
+          expect(resp.access).to.be.true;
+          expect(emptyContainerStub.called).to.be.true;
+        });
+      });
+
+      it('should show the premium content along with passing bidId', () => {
+        vendor.fewCentsBidId_ = 92602;
+        accessSourceMock
+          .expects('buildUrl')
+          .returns(Promise.resolve(''))
+          .once();
+
+        xhrMock
+          .expects('fetchJson')
+          .returns(
+            Promise.resolve({
+              json() {
+                return Promise.resolve({access: true});
+              },
+            })
+          )
+          .once();
+
+        return vendor.authorize().then((resp) => {
+          expect(resp.access).to.be.true;
+          expect(emptyContainerStub.called).to.be.true;
+        });
+      });
+
+      it('should show the paywall : authorization response fails - 402 error', () => {
+        accessSourceMock
+          .expects('buildUrl')
+          .returns(Promise.resolve('https://builturl'))
+          .once();
+
+        xhrMock
+          .expects('fetchJson')
+          .returns(
+            Promise.reject({
+              response: {
+                status: 402,
+                json() {
+                  return Promise.resolve(paywallResponse);
+                },
+              },
+            })
+          )
+          .once();
+
+        emptyContainerStub.returns(Promise.resolve());
+        return vendor.authorize().then((res) => {
+          expect(res.access).to.be.false;
+        });
+      });
+
+      it('should show the premium : authorization response fails - 500 error', () => {
+        accessSourceMock
+          .expects('buildUrl')
+          .returns(Promise.resolve('https://builturl'))
+          .once();
+
+        xhrMock
+          .expects('fetchJson')
+          .returns(
+            Promise.reject({
+              response: {
+                status: 500,
+              },
+            })
+          )
+          .once();
+
+        return vendor.authorize().then((res) => {
+          expect(res.access).to.be.true;
+        });
+      });
+
+      it('should show the paywall : when authorize response does not have the response key', () => {
+        accessSourceMock
+          .expects('buildUrl')
+          .returns(Promise.resolve('https://builturl'))
+          .once();
+
+        xhrMock
+          .expects('fetchJson')
+          .returns(
+            Promise.reject({
+              newResponse: {
+                status: 402,
+                json() {
+                  return Promise.resolve(paywallResponse);
+                },
+              },
+            })
+          )
+          .once();
+
+        emptyContainerStub.returns(Promise.resolve());
+        return vendor.authorize().then((res) => {
+          expect(res.access).to.be.true;
+        });
+      });
+    });
+
+    describe('authorize on demo environment', () => {
+      let emptyContainerStub;
+
+      beforeEach(() => {
+        fewcentsConfig = fewcentsConfigValue;
+        fewcentsConfig['environment'] = 'demo';
+        vendor = new AmpAccessFewcents(accessService, accessSource);
+        emptyContainerStub = env.sandbox.stub(vendor, 'emptyContainer_');
+        env.sandbox.stub(vendor, 'renderPurchaseOverlay_');
+      });
+
+      afterEach(() => {
+        vendor.fewCentsBidId_ = null;
+      });
+
+      it('should show the paywall on demo : authorization response fails - 402 error', () => {
+        accessSourceMock
+          .expects('buildUrl')
+          .returns(Promise.resolve('https://builturl'))
+          .once();
+
+        xhrMock
+          .expects('fetchJson')
+          .returns(
+            Promise.reject({
+              response: {
+                status: 402,
+                json() {
+                  return Promise.resolve(paywallResponse);
+                },
+              },
+            })
+          )
+          .once();
+
+        emptyContainerStub.returns(Promise.resolve());
+        return vendor.authorize().then((res) => {
+          expect(res.access).to.be.false;
+        });
+      });
+    });
+
+    describe('authorize on default environment', () => {
+      let emptyContainerStub;
+
+      beforeEach(() => {
+        fewcentsConfig = fewcentsConfigValue;
+        fewcentsConfig['environment'] = 'production';
+        vendor = new AmpAccessFewcents(accessService, accessSource);
+        emptyContainerStub = env.sandbox.stub(vendor, 'emptyContainer_');
+        env.sandbox.stub(vendor, 'renderPurchaseOverlay_');
+      });
+
+      afterEach(() => {
+        vendor.fewCentsBidId_ = null;
+      });
+
+      it('should show the paywall on demo : authorization response fails - 402 error', () => {
+        accessSourceMock
+          .expects('buildUrl')
+          .returns(Promise.resolve('https://builturl'))
+          .once();
+
+        xhrMock
+          .expects('fetchJson')
+          .returns(
+            Promise.reject({
+              response: {
+                status: 402,
+                json() {
+                  return Promise.resolve(paywallResponse);
+                },
+              },
+            })
+          )
+          .once();
+
+        emptyContainerStub.returns(Promise.resolve());
+        return vendor.authorize().then((res) => {
+          expect(res.access).to.be.false;
+        });
+      });
+    });
+
+    describe('Unlocking an article', () => {
+      let container;
+
+      beforeEach(() => {
+        container = document.createElement('div');
+        container.id = TAG + '-dialog';
+        document.body.appendChild(container);
+        vendor.i18n_ = {};
+        vendor.renderPurchaseOverlay_();
+      });
+
+      afterEach(() => {
+        container.parentNode.removeChild(container);
+        accessSourceMock.verify();
+        xhrMock.verify();
+      });
+
+      it('should check clicking on unlock button', async () => {
+        accessSourceMock
+          .expects('buildUrl')
+          .returns(Promise.resolve('https://apllink'))
+          .once();
+
+        accessSourceMock.expects('loginWithUrl').once();
+
+        const clickEv = new Event('click');
+        container.querySelector('button').dispatchEvent(clickEv);
+        await sleep(500);
+      });
+    });
+
+    describe('Create paywall overlay', () => {
+      let container;
+
+      beforeEach(() => {
+        container = document.createElement('div');
+        container.id = TAG + '-dialog';
+        document.body.appendChild(container);
+        vendor.i18n_ = {
+          fcTitleText: 'Instant Access With Fewcents.',
+          fcPromptText: 'Prompted Message',
+          fcButtonText: 'Unlock',
+          fcFewcentsImageRef:
+            'https://dev.fewcents.co/static/media/powered-fewcents.5c8ee304.png',
+          fcTermsRef: 'https://www.fewcents.co/terms',
+        };
+
+        vendor.purchaseOptions_ = {
+          price: {currency: 'INR', price: '881'},
+          unlockUrl:
+            'https://wallet.hounds.fewcents.co/?login_source=amp…53A8000%252Fexamples%252Famp-access-fewcents.html',
+        };
+        vendor.renderPurchaseOverlay_();
+      });
+
+      afterEach(() => {
+        container.parentNode.removeChild(container);
+      });
+
+      it('renders price', () => {
+        const priceDiv = container.querySelector(
+          '.' + TAG_SHORTHAND + '-article-price'
+        );
+
+        expect(priceDiv).to.not.be.null;
+        expect(parseInt(priceDiv.textContent, 10)).to.equal(881);
+      });
+
+      it('renders unlock button', () => {
+        const unlockButton = container.querySelector(
+          '.' + TAG_SHORTHAND + '-purchase-button'
+        );
+
+        expect(unlockButton).to.not.be.null;
+        expect(unlockButton.textContent).to.equal('Unlock');
+      });
+
+      it('renders title div', () => {
+        const headerDiv = container.querySelector(
+          '.' + TAG_SHORTHAND + '-headerText'
+        );
+
+        expect(headerDiv).to.not.be.null;
+        expect(headerDiv.textContent).to.equal('Instant Access With Fewcents.');
+      });
+    });
+
+    describe('Checks empty container function', () => {
+      let container;
+
+      beforeEach(() => {
+        vendor.vsync_ = {
+          mutate: (callback) => {
+            callback();
+          },
+          mutatePromise: (callback) => {
+            callback();
+            return Promise.resolve();
+          },
+        };
+        container = document.createElement('div');
+        container.id = TAG + '-dialog';
+        document.body.appendChild(container);
+        vendor.renderPurchaseOverlay_();
+        vendor.emptyContainer_();
+      });
+
+      it('should check price element is not present', () => {
+        const priceDiv = container.querySelector(
+          '.' + TAG_SHORTHAND + '-article-price'
+        );
+
+        expect(priceDiv).to.be.null;
+      });
+    });
+  }
+);
diff --git a/extensions/amp-access-fewcents/0.1/test/validator-amp-access-fewcents.html b/extensions/amp-access-fewcents/0.1/test/validator-amp-access-fewcents.html
new file mode 100644
index 000000000000..ef7f80d0c00e
--- /dev/null
+++ b/extensions/amp-access-fewcents/0.1/test/validator-amp-access-fewcents.html
@@ -0,0 +1,313 @@
+<!DOCTYPE html>
+<html ⚡ lang="en">
+  <!-- prettier-ignore -->
+  <head>
+    <meta charset="utf-8">
+    <title>amp-access-fewcents</title>
+    <script id="amp-access" type="application/json">
+      {
+        "vendor": "fewcents",
+        "noPingback": true,
+        "fewcents": {
+          "environment": "development",
+          "publisherLogoUrl" : "https://www.jagranimages.com/images/jagran-logo-2021.png",
+          "contentSelector" : "amp-access-fewcents-dialog",
+          "primaryColor" : "#FF6363",
+          "accessKey" : "localhost",
+          "category": "paywall",
+          "articleIdentifier": "mockArticleIdentifier"
+        }
+      }
+    </script>
+    <link rel="canonical" href="/examples/amp-access-fewcents.html">
+    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+    <style amp-custom>
+      .main-container {
+        height: auto;
+      }
+
+      .title {display: flex;align-items: center;justify-content: center;}
+
+      .title h1{
+        margin-bottom: 0px;
+      }
+
+      .navbar{
+        background-color: bisque;
+        border: black;
+        border-radius: 25px;
+        margin: 10px 10px;
+      }
+
+      .navbar-ul{
+        display: flex;
+        list-style-type: none;
+        margin-left: 10px;
+      }
+
+      .navbar-ul li{
+        background: burlywood;
+        padding: 10px;
+        margin-right: 10px;
+        font-size: 18px;
+        font-family: "Verdana, Geneva, Tahoma, sans-serif";
+      }
+
+      .content{
+        display: flex;
+        justify-content: center;
+        flex-direction: column;
+      }
+
+      .content p{
+        padding: 0px 160px;
+        font-size: 1.1875rem;
+        font-family: 'Noticia Text', serif;
+        line-height: 1.6;
+        margin-bottom: 30px;
+      }
+
+      .entry-thumbnail {
+        display: flex;
+        justify-content: center;
+      }
+
+      .premium-content{
+        display: flex;
+        justify-content: center;
+        flex-direction: column;
+      }
+
+      .premium-content p{
+        padding: 0px 160px;
+        font-size: 1.1875rem;
+        font-family: 'Noticia Text', serif;
+        line-height: 1.6;
+        margin-bottom: 30px;
+      }
+
+      .footer{
+        padding: 0px 20px;
+        display: flex;
+        align-items: center;
+        justify-content: space-evenly;
+        margin-top: 100px;
+        height: 30vh;
+        background: black;
+      }
+
+      .footer ul li {
+        color: blanchedalmond;
+      }
+
+      .footer ul h3 {
+        color: blanchedalmond;
+      }
+    </style>
+    <script async custom-element="amp-access" src="https://cdn.ampproject.org/v0/amp-access-0.1.js"></script>
+    <script async custom-element="amp-access-fewcents" src="https://cdn.ampproject.org/v0/amp-access-fewcents-0.1.js"></script>
+    <script async custom-element="amp-analytics" src="https://cdn.ampproject.org/v0/amp-analytics-0.1.js"></script>
+    <script async src="https://cdn.ampproject.org/v0.js"></script>
+  </head>
+  <body>
+    <amp-analytics type="segment">
+      <script type="application/json">
+        {
+          "vars": {
+            "writeKey": "gNo9b6N79CFIFJqFyOCELKS6Ex0JcfBY",
+            "name": "fewcents-paywall"
+          },
+          "triggers": {
+            "click": {
+              "on": "click",
+              "selector": ".aaf-purchase-button",
+              "request": "track",
+              "vars": {
+                "event": "Unlock button clicked"
+              }
+            },
+            "accessauthorizationReceived": {
+              "on": "access-authorization-received",
+              "request": "track",
+              "vars": {
+                "event": "access-authorization-received"
+              },
+              "extraUrlParams": {
+                "properties.access": "AUTHDATA(access)",
+                "properties.data": "AUTHDATA(data)"
+              }
+            },
+            "accessAuthorizationFailed": {
+              "on": "access-authorization-failed",
+              "request": "track",
+              "vars": {
+                "event": "access-authorization-failed"
+              },
+              "extraUrlParams": {
+                "properties.access": "AUTHDATA(access)",
+                "properties.data": "AUTHDATA(data)"
+              }
+            },
+            "accessLoginStarted": {
+              "on": "access-login-started",
+              "request": "track",
+              "vars": {
+                "event": "access-login-started"
+              },
+              "extraUrlParams": {
+                "properties.access": "AUTHDATA(access)",
+                "properties.data": "AUTHDATA(data)"
+              }
+            },
+            "accessLoginSuccess": {
+              "on": "access-login-success",
+              "request": "track",
+              "vars": {
+                "event": "access-login-success"
+              },
+              "extraUrlParams": {
+                "properties.access": "AUTHDATA(access)",
+                "properties.data": "AUTHDATA(data)"
+              }
+            },
+            "accessLoginRejected": {
+              "on": "access-login-rejected",
+              "request": "track",
+              "vars": {
+                "event": "access-login-rejected"
+              },
+              "extraUrlParams": {
+                "properties.access": "AUTHDATA(access)",
+                "properties.data": "AUTHDATA(data)"
+              }
+            },
+            "accessLoginFailed": {
+              "on": "access-login-failed",
+              "request": "track",
+              "vars": {
+                "event": "access-login-failed"
+              },
+              "extraUrlParams": {
+                "properties.access": "AUTHDATA(access)",
+                "properties.data": "AUTHDATA(data)"
+              }
+            }
+          }
+        }
+      </script>
+    </amp-analytics>
+    <div class="main-container">
+      <div class="title">
+        <h1>Weekly Digest: Kyiv Post Closure, Anti-Oligarch Law in Ukraine</h1>
+      </div>
+      <div class="navbar">
+        <ul class="navbar-ul">
+          <li>Industry News</li>
+          <li>Business Model</li>
+          <li>About Us</li>
+        </ul>
+      </div>
+      <div class="content">
+        <div class="entry-thumbnail">
+          <img
+            width="518"
+            height="291"
+            src="./Weekly Digest_ Kyiv Post Closure, Anti-Oligarch Law in Ukraine - The Fix_files/the-fix-digest-16.png"
+            class="attachment-post-thumbnail size-post-thumbnail wp-post-image"
+            alt=""
+            loading="lazy"
+            srcset="
+              http://wordpress.dev.fewcents.co/wp-content/uploads/2021/11/the-fix-digest-16.png           5184w,
+              http://wordpress.dev.fewcents.co/wp-content/uploads/2021/11/the-fix-digest-16-300x169.png    300w,
+              http://wordpress.dev.fewcents.co/wp-content/uploads/2021/11/the-fix-digest-16-1024x576.png  1024w,
+              http://wordpress.dev.fewcents.co/wp-content/uploads/2021/11/the-fix-digest-16-768x432.png    768w,
+              http://wordpress.dev.fewcents.co/wp-content/uploads/2021/11/the-fix-digest-16-1536x864.png  1536w,
+              http://wordpress.dev.fewcents.co/wp-content/uploads/2021/11/the-fix-digest-16-2048x1152.png 2048w,
+              http://wordpress.dev.fewcents.co/wp-content/uploads/2021/11/the-fix-digest-16-1200x675.png  1200w,
+              http://wordpress.dev.fewcents.co/wp-content/uploads/2021/11/the-fix-digest-16-1260x709.png  1260w,
+              http://wordpress.dev.fewcents.co/wp-content/uploads/2021/11/the-fix-digest-16-800x450.png    800w,
+              http://wordpress.dev.fewcents.co/wp-content/uploads/2021/11/the-fix-digest-16-588x331.png    588w,
+              http://wordpress.dev.fewcents.co/wp-content/uploads/2021/11/the-fix-digest-16-107x60.png     107w,
+              http://wordpress.dev.fewcents.co/wp-content/uploads/2021/11/the-fix-digest-16-160x90.png     160w
+            "
+            sizes="(max-width: 5184px) 100vw, 5184px"
+          />
+        </div>
+        <p>
+          Welcome to The Fix’s weekly news digest! Every week, we bring you
+          important news stories from the world of media – and try to put them
+          in a wider context.
+        </p>
+        <p>
+          This week, we have two detailed stories on the recent media shakeup in
+          Ukraine and a roundup of other noteworthy media news.
+        </p>
+        <p>
+          The closure appears to be a continuation of the conflict between the
+          publisher and the editorial team, particularly over the plans to
+          launch a Ukrainian-language outlet under the paper’s brand. Analysts
+          also say the move might be the owner’s attempt to avoid angering the
+          authorities – whom Kivan’s construction business depends on – over
+          Kyiv Post’s coverage.
+        </p>
+      </div>
+      <section amp-access="NOT access OR flash" amp-access-hide>
+        <div id="amp-access-fewcents-dialog"></div>
+      </section>
+
+      <section amp-access="error" amp-access-hide class="error-section">
+        Oops... Something broke.
+      </section>
+
+      <div amp-access="access" amp-access-hide class="premium-content">
+        <p>
+          Perhaps the most notable media news story in the CEE region came from
+          Ukraine this week with the closure of Kyiv Post, the country’s leading
+          English-language publication.
+        </p>
+
+        <p>
+          Over the past several decades, it has been a trusted source of news
+          and a lodestar of independent journalism. However, on Monday the
+          paper’s owner, construction tycoon Adnan Kivan, announced the outlet
+          will close “for a short time,” saying he hopes to reopen it “bigger
+          and better” in the future.
+        </p>
+        <p>
+          Kyiv Post’s editorial team then released a statement clarifying that
+          all journalists were fired effective immediately. The journalists
+          called the actions “an act of vengeance” by the owner and an attempt
+          to “[get] rid of inconvenient, fair and honest journalists.”
+        </p>
+        <p>
+          The closure has attracted multiple concerned comments from Kyiv Post
+          readers, which include high-level foreign diplomats, expats, and
+          business leaders. In an interview with Columbia Journalism Review, the
+          paper’s now-former chief editor Brian Bonner said he is “talking to
+          deeply concerned ambassadors.”
+        </p>
+      </div>
+
+      <div class="footer">
+        <ul>
+          <h3 class="footer-widget-title">Follow Us</h3>
+          <li>Twitter</li>
+          <li>Facebook</li>
+          <li>Linkedin</li>
+          <li>Telegram</li>
+          <li>Deutsch</li>
+        </ul>
+        <ul>
+          <h3 class="footer-widget-title">Menu</h3>
+          <li>Industry News</li>
+          <li>Business models</li>
+          <li>Organization building</li>
+          <li>Research</li>
+          <li>Advertise on The Fix</li>
+          <li>About us</li>
+        </ul>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/extensions/amp-access-fewcents/0.1/test/validator-amp-access-fewcents.out b/extensions/amp-access-fewcents/0.1/test/validator-amp-access-fewcents.out
new file mode 100644
index 000000000000..3b874b9b9248
--- /dev/null
+++ b/extensions/amp-access-fewcents/0.1/test/validator-amp-access-fewcents.out
@@ -0,0 +1,314 @@
+PASS
+|  <!DOCTYPE html>
+|  <html ⚡ lang="en">
+|    <!-- prettier-ignore -->
+|    <head>
+|      <meta charset="utf-8">
+|      <title>amp-access-fewcents</title>
+|      <script id="amp-access" type="application/json">
+|        {
+|          "vendor": "fewcents",
+|          "noPingback": true,
+|          "fewcents": {
+|            "environment": "development",
+|            "publisherLogoUrl" : "https://www.jagranimages.com/images/jagran-logo-2021.png",
+|            "contentSelector" : "amp-access-fewcents-dialog",
+|            "primaryColor" : "#FF6363",
+|            "accessKey" : "localhost",
+|            "category": "paywall",
+|            "articleIdentifier": "mockArticleIdentifier"
+|          }
+|        }
+|      </script>
+|      <link rel="canonical" href="/examples/amp-access-fewcents.html">
+|      <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+|      <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+|      <style amp-custom>
+|        .main-container {
+|          height: auto;
+|        }
+|
+|        .title {display: flex;align-items: center;justify-content: center;}
+|
+|        .title h1{
+|          margin-bottom: 0px;
+|        }
+|
+|        .navbar{
+|          background-color: bisque;
+|          border: black;
+|          border-radius: 25px;
+|          margin: 10px 10px;
+|        }
+|
+|        .navbar-ul{
+|          display: flex;
+|          list-style-type: none;
+|          margin-left: 10px;
+|        }
+|
+|        .navbar-ul li{
+|          background: burlywood;
+|          padding: 10px;
+|          margin-right: 10px;
+|          font-size: 18px;
+|          font-family: "Verdana, Geneva, Tahoma, sans-serif";
+|        }
+|
+|        .content{
+|          display: flex;
+|          justify-content: center;
+|          flex-direction: column;
+|        }
+|
+|        .content p{
+|          padding: 0px 160px;
+|          font-size: 1.1875rem;
+|          font-family: 'Noticia Text', serif;
+|          line-height: 1.6;
+|          margin-bottom: 30px;
+|        }
+|
+|        .entry-thumbnail {
+|          display: flex;
+|          justify-content: center;
+|        }
+|
+|        .premium-content{
+|          display: flex;
+|          justify-content: center;
+|          flex-direction: column;
+|        }
+|
+|        .premium-content p{
+|          padding: 0px 160px;
+|          font-size: 1.1875rem;
+|          font-family: 'Noticia Text', serif;
+|          line-height: 1.6;
+|          margin-bottom: 30px;
+|        }
+|
+|        .footer{
+|          padding: 0px 20px;
+|          display: flex;
+|          align-items: center;
+|          justify-content: space-evenly;
+|          margin-top: 100px;
+|          height: 30vh;
+|          background: black;
+|        }
+|
+|        .footer ul li {
+|          color: blanchedalmond;
+|        }
+|
+|        .footer ul h3 {
+|          color: blanchedalmond;
+|        }
+|      </style>
+|      <script async custom-element="amp-access" src="https://cdn.ampproject.org/v0/amp-access-0.1.js"></script>
+|      <script async custom-element="amp-access-fewcents" src="https://cdn.ampproject.org/v0/amp-access-fewcents-0.1.js"></script>
+|      <script async custom-element="amp-analytics" src="https://cdn.ampproject.org/v0/amp-analytics-0.1.js"></script>
+|      <script async src="https://cdn.ampproject.org/v0.js"></script>
+|    </head>
+|    <body>
+|      <amp-analytics type="segment">
+|        <script type="application/json">
+|          {
+|            "vars": {
+|              "writeKey": "gNo9b6N79CFIFJqFyOCELKS6Ex0JcfBY",
+|              "name": "fewcents-paywall"
+|            },
+|            "triggers": {
+|              "click": {
+|                "on": "click",
+|                "selector": ".aaf-purchase-button",
+|                "request": "track",
+|                "vars": {
+|                  "event": "Unlock button clicked"
+|                }
+|              },
+|              "accessauthorizationReceived": {
+|                "on": "access-authorization-received",
+|                "request": "track",
+|                "vars": {
+|                  "event": "access-authorization-received"
+|                },
+|                "extraUrlParams": {
+|                  "properties.access": "AUTHDATA(access)",
+|                  "properties.data": "AUTHDATA(data)"
+|                }
+|              },
+|              "accessAuthorizationFailed": {
+|                "on": "access-authorization-failed",
+|                "request": "track",
+|                "vars": {
+|                  "event": "access-authorization-failed"
+|                },
+|                "extraUrlParams": {
+|                  "properties.access": "AUTHDATA(access)",
+|                  "properties.data": "AUTHDATA(data)"
+|                }
+|              },
+|              "accessLoginStarted": {
+|                "on": "access-login-started",
+|                "request": "track",
+|                "vars": {
+|                  "event": "access-login-started"
+|                },
+|                "extraUrlParams": {
+|                  "properties.access": "AUTHDATA(access)",
+|                  "properties.data": "AUTHDATA(data)"
+|                }
+|              },
+|              "accessLoginSuccess": {
+|                "on": "access-login-success",
+|                "request": "track",
+|                "vars": {
+|                  "event": "access-login-success"
+|                },
+|                "extraUrlParams": {
+|                  "properties.access": "AUTHDATA(access)",
+|                  "properties.data": "AUTHDATA(data)"
+|                }
+|              },
+|              "accessLoginRejected": {
+|                "on": "access-login-rejected",
+|                "request": "track",
+|                "vars": {
+|                  "event": "access-login-rejected"
+|                },
+|                "extraUrlParams": {
+|                  "properties.access": "AUTHDATA(access)",
+|                  "properties.data": "AUTHDATA(data)"
+|                }
+|              },
+|              "accessLoginFailed": {
+|                "on": "access-login-failed",
+|                "request": "track",
+|                "vars": {
+|                  "event": "access-login-failed"
+|                },
+|                "extraUrlParams": {
+|                  "properties.access": "AUTHDATA(access)",
+|                  "properties.data": "AUTHDATA(data)"
+|                }
+|              }
+|            }
+|          }
+|        </script>
+|      </amp-analytics>
+|      <div class="main-container">
+|        <div class="title">
+|          <h1>Weekly Digest: Kyiv Post Closure, Anti-Oligarch Law in Ukraine</h1>
+|        </div>
+|        <div class="navbar">
+|          <ul class="navbar-ul">
+|            <li>Industry News</li>
+|            <li>Business Model</li>
+|            <li>About Us</li>
+|          </ul>
+|        </div>
+|        <div class="content">
+|          <div class="entry-thumbnail">
+|            <img
+|              width="518"
+|              height="291"
+|              src="./Weekly Digest_ Kyiv Post Closure, Anti-Oligarch Law in Ukraine - The Fix_files/the-fix-digest-16.png"
+|              class="attachment-post-thumbnail size-post-thumbnail wp-post-image"
+|              alt=""
+|              loading="lazy"
+|              srcset="
+|                http://wordpress.dev.fewcents.co/wp-content/uploads/2021/11/the-fix-digest-16.png           5184w,
+|                http://wordpress.dev.fewcents.co/wp-content/uploads/2021/11/the-fix-digest-16-300x169.png    300w,
+|                http://wordpress.dev.fewcents.co/wp-content/uploads/2021/11/the-fix-digest-16-1024x576.png  1024w,
+|                http://wordpress.dev.fewcents.co/wp-content/uploads/2021/11/the-fix-digest-16-768x432.png    768w,
+|                http://wordpress.dev.fewcents.co/wp-content/uploads/2021/11/the-fix-digest-16-1536x864.png  1536w,
+|                http://wordpress.dev.fewcents.co/wp-content/uploads/2021/11/the-fix-digest-16-2048x1152.png 2048w,
+|                http://wordpress.dev.fewcents.co/wp-content/uploads/2021/11/the-fix-digest-16-1200x675.png  1200w,
+|                http://wordpress.dev.fewcents.co/wp-content/uploads/2021/11/the-fix-digest-16-1260x709.png  1260w,
+|                http://wordpress.dev.fewcents.co/wp-content/uploads/2021/11/the-fix-digest-16-800x450.png    800w,
+|                http://wordpress.dev.fewcents.co/wp-content/uploads/2021/11/the-fix-digest-16-588x331.png    588w,
+|                http://wordpress.dev.fewcents.co/wp-content/uploads/2021/11/the-fix-digest-16-107x60.png     107w,
+|                http://wordpress.dev.fewcents.co/wp-content/uploads/2021/11/the-fix-digest-16-160x90.png     160w
+|              "
+|              sizes="(max-width: 5184px) 100vw, 5184px"
+|            />
+|          </div>
+|          <p>
+|            Welcome to The Fix’s weekly news digest! Every week, we bring you
+|            important news stories from the world of media – and try to put them
+|            in a wider context.
+|          </p>
+|          <p>
+|            This week, we have two detailed stories on the recent media shakeup in
+|            Ukraine and a roundup of other noteworthy media news.
+|          </p>
+|          <p>
+|            The closure appears to be a continuation of the conflict between the
+|            publisher and the editorial team, particularly over the plans to
+|            launch a Ukrainian-language outlet under the paper’s brand. Analysts
+|            also say the move might be the owner’s attempt to avoid angering the
+|            authorities – whom Kivan’s construction business depends on – over
+|            Kyiv Post’s coverage.
+|          </p>
+|        </div>
+|        <section amp-access="NOT access OR flash" amp-access-hide>
+|          <div id="amp-access-fewcents-dialog"></div>
+|        </section>
+|
+|        <section amp-access="error" amp-access-hide class="error-section">
+|          Oops... Something broke.
+|        </section>
+|
+|        <div amp-access="access" amp-access-hide class="premium-content">
+|          <p>
+|            Perhaps the most notable media news story in the CEE region came from
+|            Ukraine this week with the closure of Kyiv Post, the country’s leading
+|            English-language publication.
+|          </p>
+|
+|          <p>
+|            Over the past several decades, it has been a trusted source of news
+|            and a lodestar of independent journalism. However, on Monday the
+|            paper’s owner, construction tycoon Adnan Kivan, announced the outlet
+|            will close “for a short time,” saying he hopes to reopen it “bigger
+|            and better” in the future.
+|          </p>
+|          <p>
+|            Kyiv Post’s editorial team then released a statement clarifying that
+|            all journalists were fired effective immediately. The journalists
+|            called the actions “an act of vengeance” by the owner and an attempt
+|            to “[get] rid of inconvenient, fair and honest journalists.”
+|          </p>
+|          <p>
+|            The closure has attracted multiple concerned comments from Kyiv Post
+|            readers, which include high-level foreign diplomats, expats, and
+|            business leaders. In an interview with Columbia Journalism Review, the
+|            paper’s now-former chief editor Brian Bonner said he is “talking to
+|            deeply concerned ambassadors.”
+|          </p>
+|        </div>
+|
+|        <div class="footer">
+|          <ul>
+|            <h3 class="footer-widget-title">Follow Us</h3>
+|            <li>Twitter</li>
+|            <li>Facebook</li>
+|            <li>Linkedin</li>
+|            <li>Telegram</li>
+|            <li>Deutsch</li>
+|          </ul>
+|          <ul>
+|            <h3 class="footer-widget-title">Menu</h3>
+|            <li>Industry News</li>
+|            <li>Business models</li>
+|            <li>Organization building</li>
+|            <li>Research</li>
+|            <li>Advertise on The Fix</li>
+|            <li>About us</li>
+|          </ul>
+|        </div>
+|      </div>
+|    </body>
+|  </html>
\ No newline at end of file
diff --git a/extensions/amp-access-fewcents/OWNERS b/extensions/amp-access-fewcents/OWNERS
new file mode 100644
index 000000000000..460715a4e16e
--- /dev/null
+++ b/extensions/amp-access-fewcents/OWNERS
@@ -0,0 +1,10 @@
+// For an explanation of the OWNERS rules and syntax, see:
+// https://github.com/ampproject/amp-github-apps/blob/main/owners/OWNERS.example
+
+{
+  rules: [
+    {
+      owners: [{name: 'ampproject/wg-monetization'}, {name: 'mayank-s-dev'}],
+    },
+  ],
+}
diff --git a/extensions/amp-access-fewcents/amp-access-fewcents.md b/extensions/amp-access-fewcents/amp-access-fewcents.md
new file mode 100644
index 000000000000..152d48ef81f5
--- /dev/null
+++ b/extensions/amp-access-fewcents/amp-access-fewcents.md
@@ -0,0 +1,106 @@
+---
+$category@: presentation
+formats:
+  - websites
+teaser:
+  text: Allows publishers to integrate with the Fewcents micropayments platform.
+---
+
+# amp-access-fewcents
+
+-   The `amp-access-fewcents` component is based on, and requires [`amp-access`](../amp-access/amp-access.md)
+-   amp-access-fewcents is built to be used with amp pages which internally uses amp-access to provide a behavior similar to amp-access, but built in such a way that it can be used with Fewcents.
+-   amp-access-fewcents component does not require an authorization, pingback or login configuration, because it is pre-configured to work with the Fewcents. You just need to pass or configure the extension according to your need like primary color for button, Publisher's can have their logo on the paywall.
+-   This component also relies on Access Content Markup to show and hide content.
+
+## Usage
+
+### The configuration on the pulisher end will look like this
+
+```html
+  <script id="amp-access" type="application/json">
+    {
+      "vendor": "fewcents",
+      "fewcents": {
+        "publisherLogoUrl" : "logoUrl",
+        "contentSelector" : "amp-access-fewcents-dialog",
+        "primaryColor" : "#0000FF",
+        "accessKey" : "samplehost",
+        "category": "paywall",
+        "articleIdentifier": "sampleidentifier"
+      }
+    }
+  </script>
+```
+
+### Where as the content access markup could end up looking like this:
+
+The example below demonstrates `amp-access-fewcents` component in standalone use.
+
+```html
+  <section amp-access="NOT access" amp-access-hide>
+    <div id="amp-access-fewcents-dialog"></div>
+  </section>
+
+  <section amp-access="error" amp-access-hide class="error-section">
+    Oops... Something broke.
+  </section>
+
+  <div amp-access="access" amp-access-hide>
+    <p>
+      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur
+      ullamcorper turpis vel commodo scelerisque. Phasellus luctus nunc ut
+      elit cursus, et imperdiet diam vehicula. Duis et nisi sed urna blandit
+      bibendum et sit amet erat. Suspendisse potenti.
+    </p>
+  </div>
+```
+
+Element div with id `amp-access-fewcents-dialog` is where the paywall will going to show up when user don't have the access to the article.
+
+### The following resources provide further documentation on using Fewcents with AMP:
+
+-   [`amp-access`](https://amp.dev/documentation/components/amp-access)
+-   [Fewcents](https://www.fewcents.co/)
+
+## Configuration
+
+Configuration is similar to `amp-access`, but no authorization, pingback and login links are required.
+
+```html
+  <script id="amp-access" type="application/json">
+    {
+      "vendor": "fewcents",
+      "fewcents": {
+        "publisherLogoUrl" : "logoUrl",
+        "contentSelector" : "amp-access-fewcents-dialog",
+        "primaryColor" : "#0000FF",
+        "accessKey" : "samplehost",
+        "category": "paywall",
+        "articleIdentifier": "sampleidentifier"
+      }
+    }
+  </script>
+```
+
+### Keys summary:
+
+-   `vendor` : This is mandatory to pass and its value is "fewcents"
+-   `publisherLogoUrl` : Url of image of the publisher logo in the format of png.
+-   `contentSelector` : Id of div element where paywall will be rendered
+-   `primaryColor` : Background colour of the unlock button, else default colour will be used
+-   `accessKey` : This will be provided by fewcents to the publisher
+-   `categoty` : Represent catetory of paywall and will be provided by fewcents
+-   `articleIdentifier` : This lets fewcents to uniquely identify each article, and publisher should share this data with fewcents
+
+## Analytics
+
+Given that `amp-access-fewcents` is based on `amp-access` it supports all the [analytics events](../amp-access/amp-access.md) sent by `amp-access`.
+
+Several analytics reports are sent to fewcents on user actions on the paywall.
+
+## Layout and style
+
+```
+<link rel="stylesheet" type="text/css" href="https://cdn.ampproject.org/v0/amp-access-fewcents-0.1.css">
+```
diff --git a/extensions/amp-access-fewcents/validator-amp-access-fewcents.protoascii b/extensions/amp-access-fewcents/validator-amp-access-fewcents.protoascii
new file mode 100644
index 000000000000..34cbfcc3bb3c
--- /dev/null
+++ b/extensions/amp-access-fewcents/validator-amp-access-fewcents.protoascii
@@ -0,0 +1,11 @@
+tags: {  # amp-access-fewcents
+  html_format: AMP
+  tag_name: "SCRIPT"
+  requires_extension: "amp-access"
+  extension_spec: {
+    name: "amp-access-fewcents"
+    version: "0.1"
+    requires_usage: NONE
+  }
+  attr_lists: "common-extension-attrs"
+}
diff --git a/extensions/amp-access-laterpay/0.1/laterpay-impl.js b/extensions/amp-access-laterpay/0.1/laterpay-impl.js
index 1a536846e8c0..a74d9f5db18a 100644
--- a/extensions/amp-access-laterpay/0.1/laterpay-impl.js
+++ b/extensions/amp-access-laterpay/0.1/laterpay-impl.js
@@ -1,5 +1,4 @@
 import {removeChildren} from '#core/dom';
-import {dict} from '#core/types/object';
 
 import {Services} from '#service';
 
@@ -58,7 +57,7 @@ let LaterpayConfig_0_1_Def; // eslint-disable-line local/camelcase
 /**
  * @typedef {{
  *   description: string,
- *   price: !Object<string, number>,
+ *   price: !{[key: string]: number},
  *   purchase_type: string,
  *   purchase_url: string,
  *   title: string,
@@ -128,13 +127,10 @@ export class LaterpayVendor {
     this.currentLocale_ = this.laterpayConfig_['locale'] || 'en';
 
     /** @private {!JsonObject} */
-    this.i18n_ = /** @type {!JsonObject} */ (
-      Object.assign(
-        dict(),
-        DEFAULT_MESSAGES,
-        this.laterpayConfig_['localeMessages'] || dict()
-      )
-    );
+    this.i18n_ = /** @type {!JsonObject} */ ({
+      ...DEFAULT_MESSAGES,
+      ...(this.laterpayConfig_['localeMessages'] || {}),
+    });
 
     /** @private {string} */
     this.purchaseConfigBaseUrl_ = this.getConfigUrl_() + CONFIG_BASE_PATH;
@@ -452,7 +448,7 @@ export class LaterpayVendor {
   }
 
   /**
-   * @param {!Object<string, number>} price
+   * @param {!{[key: string]: number}} price
    * @return {!Element}
    * @private
    */
diff --git a/extensions/amp-access-laterpay/0.1/test/test-amp-access-laterpay.js b/extensions/amp-access-laterpay/0.1/test/test-amp-access-laterpay.js
index c2a429e1f519..ecaaed2d871f 100644
--- a/extensions/amp-access-laterpay/0.1/test/test-amp-access-laterpay.js
+++ b/extensions/amp-access-laterpay/0.1/test/test-amp-access-laterpay.js
@@ -1,3 +1,5 @@
+import {sleep} from '#testing/helpers';
+
 import {LaterpayVendor} from '../laterpay-impl';
 
 const TAG = 'amp-access-laterpay';
@@ -257,7 +259,7 @@ describes.fakeWin(
         container.parentNode.removeChild(container);
       });
 
-      it('sends request for purchase', (done) => {
+      it('sends request for purchase', async () => {
         const changeEv = new Event('change');
         container.querySelector('input').dispatchEvent(changeEv);
         accessSourceMock
@@ -267,12 +269,10 @@ describes.fakeWin(
         accessSourceMock.expects('loginWithUrl').once();
         const clickEv = new Event('click');
         container.querySelector('button').dispatchEvent(clickEv);
-        setTimeout(() => {
-          done();
-        }, 500);
+        await sleep(500);
       });
 
-      it('sends request for already purchased', (done) => {
+      it('sends request for already purchased', async () => {
         accessSourceMock
           .expects('buildUrl')
           .returns(Promise.resolve('https://apllink'))
@@ -282,9 +282,7 @@ describes.fakeWin(
         container
           .querySelector('.' + TAG + '-already-purchased-link-container > a')
           .dispatchEvent(clickEv);
-        setTimeout(() => {
-          done();
-        }, 500);
+        await sleep(500);
       });
     });
   }
diff --git a/extensions/amp-access-laterpay/0.2/laterpay-impl.js b/extensions/amp-access-laterpay/0.2/laterpay-impl.js
index 519d7c6d7c16..0cf178971ce0 100644
--- a/extensions/amp-access-laterpay/0.2/laterpay-impl.js
+++ b/extensions/amp-access-laterpay/0.2/laterpay-impl.js
@@ -1,5 +1,4 @@
 import {removeChildren} from '#core/dom';
-import {dict} from '#core/types/object';
 
 import {Services} from '#service';
 
@@ -157,13 +156,10 @@ export class LaterpayVendor {
     this.currentLocale_ = this.laterpayConfig_['locale'] || 'en';
 
     /** @private {!JsonObject} */
-    this.i18n_ = /** @type {!JsonObject} */ (
-      Object.assign(
-        dict(),
-        DEFAULT_MESSAGES,
-        this.laterpayConfig_['localeMessages'] || dict()
-      )
-    );
+    this.i18n_ = /** @type {!JsonObject} */ ({
+      ...DEFAULT_MESSAGES,
+      ...(this.laterpayConfig_['localeMessages'] || {}),
+    });
 
     /** @private {string} */
     this.purchaseConfigBaseUrl_ = this.getConfigUrl_() + CONFIG_BASE_PATH;
@@ -514,7 +510,7 @@ export class LaterpayVendor {
   }
 
   /**
-   * @param {!Object<string, number>} price
+   * @param {!{[key: string]: number}} price
    * @return {!Element}
    * @private
    */
diff --git a/extensions/amp-access-laterpay/0.2/test/test-amp-access-laterpay.js b/extensions/amp-access-laterpay/0.2/test/test-amp-access-laterpay.js
index fabaf03adcbf..9b68000bc589 100644
--- a/extensions/amp-access-laterpay/0.2/test/test-amp-access-laterpay.js
+++ b/extensions/amp-access-laterpay/0.2/test/test-amp-access-laterpay.js
@@ -1,3 +1,5 @@
+import {sleep} from '#testing/helpers';
+
 import {LaterpayVendor} from '../laterpay-impl';
 
 const TAG = 'amp-access-laterpay';
@@ -318,7 +320,7 @@ describes.fakeWin(
         container.parentNode.removeChild(container);
       });
 
-      it('sends request for purchase', (done) => {
+      it('sends request for purchase', async () => {
         const changeEv = new Event('change');
         container.querySelector('input').dispatchEvent(changeEv);
         accessSourceMock
@@ -328,12 +330,10 @@ describes.fakeWin(
         accessSourceMock.expects('loginWithUrl').once();
         const clickEv = new Event('click');
         container.querySelector('button').dispatchEvent(clickEv);
-        setTimeout(() => {
-          done();
-        }, 500);
+        await sleep(500);
       });
 
-      it('sends request for already purchased', (done) => {
+      it('sends request for already purchased', async () => {
         accessSourceMock
           .expects('buildUrl')
           .returns(Promise.resolve('https://apllink'))
@@ -343,9 +343,7 @@ describes.fakeWin(
         container
           .querySelector('.' + TAG + '-already-purchased-link-container > a')
           .dispatchEvent(clickEv);
-        setTimeout(() => {
-          done();
-        }, 500);
+        await sleep(500);
       });
     });
   }
diff --git a/extensions/amp-access-poool/0.1/poool-impl.js b/extensions/amp-access-poool/0.1/poool-impl.js
index 936b54a53d1a..64151a15e779 100644
--- a/extensions/amp-access-poool/0.1/poool-impl.js
+++ b/extensions/amp-access-poool/0.1/poool-impl.js
@@ -1,5 +1,4 @@
 import {resetStyles, setStyle, setStyles} from '#core/dom/style';
-import {dict} from '#core/types/object';
 
 import {Services} from '#service';
 
@@ -182,23 +181,20 @@ export class PooolVendor {
   renderPoool_() {
     const pooolContainer = this.getContainer_();
     const urlPromise = this.accessSource_.buildUrl(
-      addParamsToUrl(
-        this.iframeUrl_,
-        dict({
-          'bi': this.pooolConfig_['bundleID'],
-          'iid': this.pooolConfig_['itemID'],
-          'ce': this.pooolConfig_['cookiesEnabled'],
-          'd':
-            typeof this.pooolConfig_['debug'] !== 'undefined' &&
-            this.pooolConfig_['debug'] !== null
-              ? this.pooolConfig_['debug']
-              : getMode().development || getMode().localDev,
-          'fw': this.pooolConfig_['forceWidget'],
-          'cs': this.pooolConfig_['customSegment'],
-          'lo': this.pooolConfig_['locale'],
-          'co': this.pooolConfig_['context'],
-        })
-      ),
+      addParamsToUrl(this.iframeUrl_, {
+        'bi': this.pooolConfig_['bundleID'],
+        'iid': this.pooolConfig_['itemID'],
+        'ce': this.pooolConfig_['cookiesEnabled'],
+        'd':
+          typeof this.pooolConfig_['debug'] !== 'undefined' &&
+          this.pooolConfig_['debug'] !== null
+            ? this.pooolConfig_['debug']
+            : getMode().development || getMode().localDev,
+        'fw': this.pooolConfig_['forceWidget'],
+        'cs': this.pooolConfig_['customSegment'],
+        'lo': this.pooolConfig_['locale'],
+        'co': this.pooolConfig_['context'],
+      }),
       false
     );
 
diff --git a/extensions/amp-access-scroll/0.1/scroll-bar.js b/extensions/amp-access-scroll/0.1/scroll-bar.js
index d951321c0153..394a5097efc2 100644
--- a/extensions/amp-access-scroll/0.1/scroll-bar.js
+++ b/extensions/amp-access-scroll/0.1/scroll-bar.js
@@ -1,5 +1,3 @@
-import {dict} from '#core/types/object';
-
 import {ScrollComponent} from './scroll-component';
 import {buildUrl, connectHostname} from './scroll-url';
 
@@ -38,28 +36,25 @@ export class ScrollBar extends ScrollComponent {
    * */
   makeIframe_() {
     this.frame_ = /** @type {!HTMLIFrameElement} */ (
-      this.el(
-        'iframe',
-        dict({
-          'scrolling': 'no',
-          'frameborder': '0',
-          'allowtransparency': 'true',
-          'title': 'Twitter Blue bar',
-          'width': '100%',
-          'height': '100%',
-          'sandbox':
-            'allow-scripts allow-same-origin ' +
-            'allow-top-navigation allow-popups ' +
-            'allow-popups-to-escape-sandbox',
-        })
-      )
+      this.el('iframe', {
+        'scrolling': 'no',
+        'frameborder': '0',
+        'allowtransparency': 'true',
+        'title': 'Twitter Blue bar',
+        'width': '100%',
+        'height': '100%',
+        'sandbox':
+          'allow-scripts allow-same-origin ' +
+          'allow-top-navigation allow-popups ' +
+          'allow-popups-to-escape-sandbox',
+      })
     );
 
     this.root_ = this.el(
       'div',
-      dict({
+      {
         'class': 'amp-access-scroll-bar',
-      }),
+      },
       [this.frame_]
     );
 
diff --git a/extensions/amp-access-scroll/0.1/scroll-component.js b/extensions/amp-access-scroll/0.1/scroll-component.js
index 09b7a10f0a42..762c06cb4941 100644
--- a/extensions/amp-access-scroll/0.1/scroll-component.js
+++ b/extensions/amp-access-scroll/0.1/scroll-component.js
@@ -107,7 +107,7 @@ export class ScrollComponent {
   }
 
   /**
-   * @param {Object} updates
+   * @param {object} updates
    * @return {boolean} true if changed
    * @protected
    */
diff --git a/extensions/amp-access-scroll/0.1/scroll-impl.js b/extensions/amp-access-scroll/0.1/scroll-impl.js
index c9cdbdca5352..e3d60ac11b8b 100644
--- a/extensions/amp-access-scroll/0.1/scroll-impl.js
+++ b/extensions/amp-access-scroll/0.1/scroll-impl.js
@@ -1,5 +1,4 @@
 import {createElementWithAttributes} from '#core/dom';
-import {dict} from '#core/types/object';
 import {parseQueryString} from '#core/types/string/url';
 
 import {Services} from '#service';
@@ -272,7 +271,7 @@ function addAnalytics(ampdoc, vendorConfig) {
 
   // Create analytics element
   const doc = /** @type {!Document} */ (ampdoc.win.document);
-  const attributes = dict({'trigger': 'immediate'});
+  const attributes = {'trigger': 'immediate'};
   if (vendorConfig['dataConsentId']) {
     attributes['data-block-on-consent'] = '';
   }
@@ -281,13 +280,9 @@ function addAnalytics(ampdoc, vendorConfig) {
     'amp-analytics',
     attributes
   );
-  const scriptElem = createElementWithAttributes(
-    doc,
-    'script',
-    dict({
-      'type': 'application/json',
-    })
-  );
+  const scriptElem = createElementWithAttributes(doc, 'script', {
+    'type': 'application/json',
+  });
   const ANALYTICS_CONFIG = analyticsConfig(connectHostname(vendorConfig));
   scriptElem.textContent = JSON.stringify(ANALYTICS_CONFIG);
   analyticsElem.appendChild(scriptElem);
diff --git a/extensions/amp-access-scroll/0.1/scroll-sheet.js b/extensions/amp-access-scroll/0.1/scroll-sheet.js
index 789c4709a665..efc452b85c1e 100644
--- a/extensions/amp-access-scroll/0.1/scroll-sheet.js
+++ b/extensions/amp-access-scroll/0.1/scroll-sheet.js
@@ -1,5 +1,5 @@
 import {toggle} from '#core/dom/style';
-import {dict, hasOwn} from '#core/types/object';
+import {hasOwn} from '#core/types/object';
 
 import {ScrollComponent} from './scroll-component';
 
@@ -79,20 +79,17 @@ export class Sheet extends ScrollComponent {
    * */
   makeIframe_() {
     this.frame_ = /** @type {!HTMLIFrameElement} */ (
-      this.el(
-        'iframe',
-        dict({
-          'class': 'amp-access-scroll-sheet',
-          'scrolling': 'no',
-          'frameborder': '0',
-          'allowtransparency': 'true',
-          'title': this.DEFAULT_TITLE_,
-          'sandbox':
-            'allow-scripts allow-same-origin ' +
-            'allow-top-navigation allow-popups ' +
-            'allow-popups-to-escape-sandbox',
-        })
-      )
+      this.el('iframe', {
+        'class': 'amp-access-scroll-sheet',
+        'scrolling': 'no',
+        'frameborder': '0',
+        'allowtransparency': 'true',
+        'title': this.DEFAULT_TITLE_,
+        'sandbox':
+          'allow-scripts allow-same-origin ' +
+          'allow-top-navigation allow-popups ' +
+          'allow-popups-to-escape-sandbox',
+      })
     );
     this.root_ = this.frame_;
     this.mount();
diff --git a/extensions/amp-access/0.1/access-expr.js b/extensions/amp-access/0.1/access-expr.js
index 93ad09936124..8ee31dfbf2f2 100644
--- a/extensions/amp-access/0.1/access-expr.js
+++ b/extensions/amp-access/0.1/access-expr.js
@@ -38,7 +38,7 @@ export function evaluateAccessExpr(expr, data) {
 export class AmpAccessEvaluator {
   /** */
   constructor() {
-    /** @type {Object<string, boolean>} */
+    /** @type {{[key: string]: boolean}} */
     this.cache = null;
 
     /** @private @type {JsonObject} */
diff --git a/extensions/amp-access/0.1/amp-access-client.js b/extensions/amp-access/0.1/amp-access-client.js
index 37232d1a35cc..99099f85cdf3 100644
--- a/extensions/amp-access/0.1/amp-access-client.js
+++ b/extensions/amp-access/0.1/amp-access-client.js
@@ -1,5 +1,3 @@
-import {dict} from '#core/types/object';
-
 import {Services} from '#service';
 
 import {dev, devAssert, userAssert} from '#utils/log';
@@ -140,9 +138,9 @@ export class AccessClientAdapter {
       return this.xhr_.sendSignal(url, {
         method: 'POST',
         credentials: 'include',
-        headers: dict({
+        headers: {
           'Content-Type': 'application/x-www-form-urlencoded',
-        }),
+        },
         body: '',
       });
     });
diff --git a/extensions/amp-access/0.1/amp-access-iframe.js b/extensions/amp-access/0.1/amp-access-iframe.js
index a466c5b30575..5174049615c0 100644
--- a/extensions/amp-access/0.1/amp-access-iframe.js
+++ b/extensions/amp-access/0.1/amp-access-iframe.js
@@ -1,7 +1,6 @@
 import {Deferred} from '#core/data-structures/promise';
 import {toggle} from '#core/dom/style';
 import {isArray} from '#core/types';
-import {dict} from '#core/types/object';
 import {parseJson} from '#core/types/object/json';
 
 import {Services} from '#service';
@@ -245,12 +244,10 @@ export class AccessIframeAdapter {
       if (data) {
         storage.setItem(
           TAG,
-          JSON.stringify(
-            dict({
-              't': this.ampdoc.win.Date.now(),
-              'd': data,
-            })
-          )
+          JSON.stringify({
+            't': this.ampdoc.win.Date.now(),
+            'd': data,
+          })
         );
       } else {
         storage.removeItem(TAG);
diff --git a/extensions/amp-access/0.1/amp-access-server-jwt.js b/extensions/amp-access/0.1/amp-access-server-jwt.js
index 116871395768..4e6b8605182a 100644
--- a/extensions/amp-access/0.1/amp-access-server-jwt.js
+++ b/extensions/amp-access/0.1/amp-access-server-jwt.js
@@ -1,6 +1,5 @@
 import {escapeCssSelectorIdent} from '#core/dom/css-selectors';
 import {isArray} from '#core/types';
-import {dict} from '#core/types/object';
 
 import {isExperimentOn} from '#experiments';
 
@@ -26,8 +25,10 @@ const TAG = 'amp-access-server-jwt';
 /** @const {number} */
 const AUTHORIZATION_TIMEOUT = 3000;
 
+/* eslint-disable local/no-forbidden-terms */
 /** @const {string} */
 const AMP_AUD = 'ampproject.org';
+/* eslint-enable local/no-forbidden-terms */
 
 /**
  * This class implements server-side authorization protocol with JWT. In this
@@ -304,13 +305,11 @@ export class AccessServerJwtAdapter {
     return this.fetchJwt_().then((resp) => {
       const {encoded, jwt} = resp;
       const accessData = jwt['amp_authdata'];
-      const request = serializeQueryString(
-        dict({
-          'url': removeFragment(this.ampdoc.win.location.href),
-          'state': this.serverState_,
-          'jwt': encoded,
-        })
-      );
+      const request = serializeQueryString({
+        'url': removeFragment(this.ampdoc.win.location.href),
+        'state': this.serverState_,
+        'jwt': encoded,
+      });
       dev().fine(TAG, 'Authorization request: ', this.serviceUrl_, request);
       dev().fine(TAG, '- access data: ', accessData);
       // Note that `application/x-www-form-urlencoded` is used to avoid
@@ -321,9 +320,9 @@ export class AccessServerJwtAdapter {
           fetchDocument(this.ampdoc.win, this.serviceUrl_, {
             method: 'POST',
             body: request,
-            headers: dict({
+            headers: {
               'Content-Type': 'application/x-www-form-urlencoded',
-            }),
+            },
           })
         )
         .then((response) => {
diff --git a/extensions/amp-access/0.1/amp-access-server.js b/extensions/amp-access/0.1/amp-access-server.js
index 6d1f81505ebc..c11ff42a3974 100644
--- a/extensions/amp-access/0.1/amp-access-server.js
+++ b/extensions/amp-access/0.1/amp-access-server.js
@@ -1,5 +1,4 @@
 import {escapeCssSelectorIdent} from '#core/dom/css-selectors';
-import {dict} from '#core/types/object';
 import {parseJson} from '#core/types/object/json';
 
 import {isExperimentOn} from '#experiments';
@@ -129,11 +128,11 @@ export class AccessServerAdapter {
             requestVars[k] = String(vars[k]);
           }
         }
-        const request = dict({
+        const request = {
           'url': removeFragment(this.ampdoc.win.location.href),
           'state': this.serverState_,
           'vars': requestVars,
-        });
+        };
         dev().fine(TAG, 'Authorization request: ', this.serviceUrl_, request);
         // Note that `application/x-www-form-urlencoded` is used to avoid
         // CORS preflight request.
@@ -142,9 +141,9 @@ export class AccessServerAdapter {
           fetchDocument(this.ampdoc.win, this.serviceUrl_, {
             method: 'POST',
             body: 'request=' + encodeURIComponent(JSON.stringify(request)),
-            headers: dict({
+            headers: {
               'Content-Type': 'application/x-www-form-urlencoded',
-            }),
+            },
           })
         );
       })
diff --git a/extensions/amp-access/0.1/amp-access-source.js b/extensions/amp-access/0.1/amp-access-source.js
index c28af250f88b..8e478d3a7586 100644
--- a/extensions/amp-access/0.1/amp-access-source.js
+++ b/extensions/amp-access/0.1/amp-access-source.js
@@ -1,6 +1,6 @@
 import {Deferred} from '#core/data-structures/promise';
 import {isEnumValue, isObject} from '#core/types';
-import {dict, getValueForExpr} from '#core/types/object';
+import {getValueForExpr} from '#core/types/object';
 import {parseQueryString} from '#core/types/string/url';
 
 import {isExperimentOn} from '#experiments';
@@ -115,7 +115,7 @@ export class AccessSource {
     /** @private {?Function} */
     this.firstAuthorizationResolver_ = deferred.resolve;
 
-    /** @private {!Object<string, string>} */
+    /** @private {!{[key: string]: string}} */
     this.loginUrlMap_ = {};
 
     /** @private {?Promise} */
@@ -228,7 +228,7 @@ export class AccessSource {
    */
   buildConfigLoginMap_(configJson) {
     const loginConfig = configJson['login'];
-    const loginMap = dict();
+    const loginMap = {};
     if (!loginConfig) {
       // Ignore: in some cases login config is not necessary.
     } else if (typeof loginConfig == 'string') {
@@ -300,7 +300,7 @@ export class AccessSource {
   /**
    * @param {string} url
    * @param {boolean} useAuthData Allows `AUTH(field)` URL var substitutions.
-   * @return {!Promise<!Object<string, *>>}
+   * @return {!Promise<!{[key: string]: *}>}
    */
   collectUrlVars(url, useAuthData) {
     return this.prepareUrlVars_(useAuthData).then((vars) => {
@@ -310,7 +310,7 @@ export class AccessSource {
 
   /**
    * @param {boolean} useAuthData Allows `AUTH(field)` URL var substitutions.
-   * @return {!Promise<!Object<string, *>>}
+   * @return {!Promise<!{[key: string]: *}>}
    * @private
    */
   prepareUrlVars_(useAuthData) {
@@ -546,7 +546,7 @@ export class AccessSource {
  * @typedef {{
  *   buildUrl: function(string, boolean):!Promise<string>,
  *   collectUrlVars: function(string, boolean):
- *       !Promise<!Object<string, *>>
+ *       !Promise<!{[key: string]: *}>
  * }}
  */
 export let AccessTypeAdapterContextDef;
diff --git a/extensions/amp-access/0.1/amp-access.js b/extensions/amp-access/0.1/amp-access.js
index ec137dfa6f3c..1203230e4403 100644
--- a/extensions/amp-access/0.1/amp-access.js
+++ b/extensions/amp-access/0.1/amp-access.js
@@ -1,10 +1,10 @@
-import {ActionTrust} from '#core/constants/action-constants';
-import {AmpEvents} from '#core/constants/amp-events';
-import {TickLabel} from '#core/constants/enums';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
+import {TickLabel_Enum} from '#core/constants/enums';
 import {Observable} from '#core/data-structures/observable';
 import {isJsonScriptTag} from '#core/dom';
 import {isArray} from '#core/types';
-import {dict, getValueForExpr} from '#core/types/object';
+import {getValueForExpr} from '#core/types/object';
 import {tryParseJson} from '#core/types/object/json';
 
 import {Services} from '#service';
@@ -122,9 +122,9 @@ export class AccessService {
       this.firstAuthorizationsCompleted_ = true;
       this.analyticsEvent_('access-authorization-received');
       if (this.performance_) {
-        this.performance_.tick(TickLabel.ACCESS_AUTHORIZATION);
+        this.performance_.tick(TickLabel_Enum.ACCESS_AUTHORIZATION);
         this.performance_.tickSinceVisible(
-          TickLabel.ACCESS_AUTHORIZATION_VISIBLE
+          TickLabel_Enum.ACCESS_AUTHORIZATION_VISIBLE
         );
         this.performance_.flush();
       }
@@ -133,7 +133,10 @@ export class AccessService {
     // Re-authorize newly added sections.
     ampdoc
       .getRootNode()
-      .addEventListener(AmpEvents.DOM_UPDATE, this.onDomUpdate_.bind(this));
+      .addEventListener(
+        AmpEvents_Enum.DOM_UPDATE,
+        this.onDomUpdate_.bind(this)
+      );
   }
 
   /** @override from AccessVars */
@@ -367,12 +370,10 @@ export class AccessService {
 
   /** @private */
   broadcastReauthorize_() {
-    this.viewer_.broadcast(
-      dict({
-        'type': 'amp-access-reauthorize',
-        'origin': this.pubOrigin_,
-      })
-    );
+    this.viewer_.broadcast({
+      'type': 'amp-access-reauthorize',
+      'origin': this.pubOrigin_,
+    });
   }
 
   /**
@@ -693,7 +694,7 @@ export class AccessService {
    * @private
    */
   handleAction_(invocation) {
-    if (!invocation.satisfiesTrust(ActionTrust.DEFAULT)) {
+    if (!invocation.satisfiesTrust(ActionTrust_Enum.DEFAULT)) {
       return null;
     }
     if (invocation.method == 'login') {
diff --git a/extensions/amp-access/0.1/iframe-api/access-controller.js b/extensions/amp-access/0.1/iframe-api/access-controller.js
index ea5e6cbaaf86..2fb25b1f587b 100644
--- a/extensions/amp-access/0.1/iframe-api/access-controller.js
+++ b/extensions/amp-access/0.1/iframe-api/access-controller.js
@@ -9,12 +9,12 @@
 export class AccessController {
   /**
    * Check origin, protocol and configuration and initialize controller.
-   * @param {string} origin
-   * @param {string} protocol
-   * @param {!JsonObject} config
+   * @param {string} unusedOrigin
+   * @param {string} unusedProtocl
+   * @param {!JsonObject} unusedConfig
    * @return {!Promise|undefined}
    */
-  connect(origin, protocol, config) {}
+  connect(unusedOrigin, unusedProtocl, unusedConfig) {}
 
   /**
    * Authorize document.
diff --git a/extensions/amp-access/0.1/iframe-api/messenger.js b/extensions/amp-access/0.1/iframe-api/messenger.js
index 567c53947bee..c8a7af2953a0 100644
--- a/extensions/amp-access/0.1/iframe-api/messenger.js
+++ b/extensions/amp-access/0.1/iframe-api/messenger.js
@@ -40,7 +40,7 @@ export class Messenger {
 
     /**
      * @private
-     * {!Object<string, {resolve: function(*), promise: !Promise<*>}>}
+     * {!{[key: string]: {resolve: function(*), promise: !Promise<*}}>}
      */
     this.waiting_ = {};
   }
diff --git a/extensions/amp-access/0.1/iframe-api/package.json b/extensions/amp-access/0.1/iframe-api/package.json
index 9195ac819ac8..1dfefac8e1ac 100644
--- a/extensions/amp-access/0.1/iframe-api/package.json
+++ b/extensions/amp-access/0.1/iframe-api/package.json
@@ -16,8 +16,8 @@
   "devDependencies": {
     "babel-plugin-external-helpers": "6.22.0",
     "babel-preset-env": "1.7.0",
-    "rollup": "2.58.3",
-    "rollup-plugin-babel": "4.4.0",
+    "rollup": "4.24.0",
+    "@rollup/plugin-babel": "6.0.4",
     "rollup-plugin-cleanup": "3.2.1"
   }
 }
diff --git a/extensions/amp-access/0.1/login-dialog.js b/extensions/amp-access/0.1/login-dialog.js
index 5f4c6042975b..9289f5a2d995 100644
--- a/extensions/amp-access/0.1/login-dialog.js
+++ b/extensions/amp-access/0.1/login-dialog.js
@@ -1,11 +1,9 @@
-import {dict} from '#core/types/object';
-
 import {Services} from '#service';
 
 import {getData, listen} from '#utils/event-helper';
 import {dev, userAssert} from '#utils/log';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {getMode} from '../../../src/mode';
 import {openWindowDialog} from '../../../src/open-window-dialog';
 import {parseUrlDeprecated} from '../../../src/url';
@@ -92,12 +90,9 @@ class ViewerLoginDialog {
   open() {
     return this.getLoginUrl().then((loginUrl) => {
       dev().fine(TAG, 'Open viewer dialog: ', loginUrl);
-      return this.viewer.sendMessageAwaitResponse(
-        'openDialog',
-        dict({
-          'url': loginUrl,
-        })
-      );
+      return this.viewer.sendMessageAwaitResponse('openDialog', {
+        'url': loginUrl,
+      });
     });
   }
 }
@@ -286,10 +281,10 @@ export class WebLoginDialog {
       if (getData(e)['type'] == 'result') {
         if (this.dialog_) {
           this.dialog_./*OK*/ postMessage(
-            dict({
+            {
               'sentinel': 'amp',
               'type': 'result-ack',
-            }),
+            },
             returnOrigin
           );
         }
diff --git a/extensions/amp-access/0.1/test/test-amp-access-server-jwt.js b/extensions/amp-access/0.1/test/test-amp-access-server-jwt.js
index 3eb7c6e04e19..bde0fe61a75a 100644
--- a/extensions/amp-access/0.1/test/test-amp-access-server-jwt.js
+++ b/extensions/amp-access/0.1/test/test-amp-access-server-jwt.js
@@ -2,6 +2,8 @@ import * as fakeTimers from '@sinonjs/fake-timers';
 
 import {isUserErrorMessage} from '#utils/log';
 
+import {getMode} from 'src/mode';
+
 import * as DocumentFetcher from '../../../../src/document-fetcher';
 import {removeFragment, serializeQueryString} from '../../../../src/url';
 import {AccessServerJwtAdapter} from '../amp-access-server-jwt';
@@ -352,17 +354,16 @@ describes.realWin('AccessServerJwtAdapter', {amp: true}, (env) => {
         });
       });
 
-      // TODO - Restore this test, setting the development mode is not allowed.
-      // it.skip('should disable validation by default', () => {
-      //   const savedDevFlag = getMode().development;
-      //   getMode().development = false;
-      //   const shouldBeValidatedInProdMode = adapter.shouldBeValidated_();
-      //   getMode().development = true;
-      //   const shouldBeValidatedInDevMode = adapter.shouldBeValidated_();
-      //   getMode().development = savedDevFlag;
-      //   expect(shouldBeValidatedInProdMode).to.be.false;
-      //   expect(shouldBeValidatedInDevMode).to.be.true;
-      // });
+      it('should disable validation by default', () => {
+        const savedDevFlag = getMode().development;
+        getMode().development = false;
+        const shouldBeValidatedInProdMode = adapter.shouldBeValidated_();
+        getMode().development = true;
+        const shouldBeValidatedInDevMode = adapter.shouldBeValidated_();
+        getMode().development = savedDevFlag;
+        expect(shouldBeValidatedInProdMode).to.be.false;
+        expect(shouldBeValidatedInDevMode).to.be.true;
+      });
 
       it('should fetch JWT', () => {
         const authdata = {};
diff --git a/extensions/amp-access/0.1/test/test-amp-access.js b/extensions/amp-access/0.1/test/test-amp-access.js
index 27c4b646a381..1c90e2c67246 100644
--- a/extensions/amp-access/0.1/test/test-amp-access.js
+++ b/extensions/amp-access/0.1/test/test-amp-access.js
@@ -1,4 +1,4 @@
-import {AmpEvents} from '#core/constants/amp-events';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
 import {Observable} from '#core/data-structures/observable';
 
 import {toggleExperiment} from '#experiments';
@@ -458,7 +458,7 @@ describes.fakeWin(
       }
       function dispatchUpdateEvent(target) {
         const event = win.document.createEvent('Event');
-        event.initEvent(AmpEvents.DOM_UPDATE, true, true);
+        event.initEvent(AmpEvents_Enum.DOM_UPDATE, true, true);
         target.dispatchEvent(event);
       }
       expectGetReaderId('reader1');
diff --git a/extensions/amp-access/0.1/test/test-jwt.js b/extensions/amp-access/0.1/test/test-jwt.js
index d1db372450c6..de7487b4a0f7 100644
--- a/extensions/amp-access/0.1/test/test-jwt.js
+++ b/extensions/amp-access/0.1/test/test-jwt.js
@@ -87,45 +87,38 @@ describes.sandboxed('JwtHelper', {}, (env) => {
       'o2kQ+X5xK9cipRgEKwIDAQAB\n' +
       '-----END PUBLIC KEY-----';
 
-    // TODO(aghassemi, 6292): Unskip for Safari after #6292
-    it.configure()
-      .skipSafari()
-      .run('should decode and verify token correctly', () => {
-        // Skip on non-subtle browser.
-        if (!helper.isVerificationSupported()) {
-          return;
-        }
-        return helper
-          .decodeAndVerify(TOKEN, Promise.resolve(PEM))
-          .then((tok) => {
-            expect(tok['name']).to.equal('John Do');
-          });
+    it.configure().run('should decode and verify token correctly', () => {
+      // Skip on non-subtle browser.
+      if (!helper.isVerificationSupported()) {
+        return;
+      }
+      return helper.decodeAndVerify(TOKEN, Promise.resolve(PEM)).then((tok) => {
+        expect(tok['name']).to.equal('John Do');
       });
+    });
 
-    it.configure()
-      .skipSafari()
-      .run('should fail invalid signature', () => {
-        // Skip on non-subtle browser.
-        if (!helper.isVerificationSupported()) {
-          return;
-        }
+    it.configure().run('should fail invalid signature', () => {
+      // Skip on non-subtle browser.
+      if (!helper.isVerificationSupported()) {
+        return;
+      }
 
-        const token =
-          'eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9' +
-          '.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG8iLCJhZG1pbiI6MH0' +
-          '.' +
-          SIG;
+      const token =
+        'eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9' +
+        '.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG8iLCJhZG1pbiI6MH0' +
+        '.' +
+        SIG;
 
-        return helper.decodeAndVerify(token, Promise.resolve(PEM)).then(
-          () => {
-            throw new Error('must have failed');
-          },
-          (error) => {
-            // Expected.
-            expect(error.message).to.match(/Signature verification failed/);
-          }
-        );
-      });
+      return helper.decodeAndVerify(token, Promise.resolve(PEM)).then(
+        () => {
+          throw new Error('must have failed');
+        },
+        (error) => {
+          // Expected.
+          expect(error.message).to.match(/Signature verification failed/);
+        }
+      );
+    });
   });
 
   describe('decodeAndVerify with mock subtle', () => {
@@ -233,78 +226,74 @@ describes.sandboxed('JwtHelper', {}, (env) => {
   });
 });
 
-// TODO(amphtml, #25621): Cannot find atob / btoa on Safari.
-describes.sandboxed
-  .configure()
-  .skipSafari()
-  .run('pemToBytes', {}, () => {
-    const PLAIN_TEXT =
-      'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDdlatRjRjogo3WojgGHFHYLugd' +
-      'UWAY9iR3fy4arWNA1KoS8kVw33cJibXr8bvwUAUparCwlvdbH6dvEOfou0/gCFQs' +
-      'HUfQrSDv+MuSUMAe8jzKE4qW+jK+xQU9a03GUnKHkkle+Q0pX/g6jXZ7r1/xAK5D' +
-      'o2kQ+X5xK9cipRgEKwIDAQAB';
-    const PEM =
-      '-----BEGIN PUBLIC KEY-----\n' +
-      'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDdlatRjRjogo3WojgGHFHYLugd\n' +
-      'UWAY9iR3fy4arWNA1KoS8kVw33cJibXr8bvwUAUparCwlvdbH6dvEOfou0/gCFQs\n' +
-      'HUfQrSDv+MuSUMAe8jzKE4qW+jK+xQU9a03GUnKHkkle+Q0pX/g6jXZ7r1/xAK5D\n' +
-      'o2kQ+X5xK9cipRgEKwIDAQAB\n' +
-      '-----END PUBLIC KEY-----';
+describes.sandboxed.configure().run('pemToBytes', {}, () => {
+  const PLAIN_TEXT =
+    'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDdlatRjRjogo3WojgGHFHYLugd' +
+    'UWAY9iR3fy4arWNA1KoS8kVw33cJibXr8bvwUAUparCwlvdbH6dvEOfou0/gCFQs' +
+    'HUfQrSDv+MuSUMAe8jzKE4qW+jK+xQU9a03GUnKHkkle+Q0pX/g6jXZ7r1/xAK5D' +
+    'o2kQ+X5xK9cipRgEKwIDAQAB';
+  const PEM =
+    '-----BEGIN PUBLIC KEY-----\n' +
+    'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDdlatRjRjogo3WojgGHFHYLugd\n' +
+    'UWAY9iR3fy4arWNA1KoS8kVw33cJibXr8bvwUAUparCwlvdbH6dvEOfou0/gCFQs\n' +
+    'HUfQrSDv+MuSUMAe8jzKE4qW+jK+xQU9a03GUnKHkkle+Q0pX/g6jXZ7r1/xAK5D\n' +
+    'o2kQ+X5xK9cipRgEKwIDAQAB\n' +
+    '-----END PUBLIC KEY-----';
 
-    it('should convert a valid key', () => {
-      const binary = pemToBytes(PEM);
-      const plain = atob(PLAIN_TEXT);
-      const len = plain.length;
-      expect(binary.byteLength).to.equal(len);
-      expect(binary[0]).to.equal(plain.charCodeAt(0));
-      expect(binary[1]).to.equal(plain.charCodeAt(1));
-      expect(binary[len - 1]).to.equal(plain.charCodeAt(len - 1));
-      expect(binary[len - 2]).to.equal(plain.charCodeAt(len - 2));
-    });
+  it('should convert a valid key', () => {
+    const binary = pemToBytes(PEM);
+    const plain = atob(PLAIN_TEXT);
+    const len = plain.length;
+    expect(binary.byteLength).to.equal(len);
+    expect(binary[0]).to.equal(plain.charCodeAt(0));
+    expect(binary[1]).to.equal(plain.charCodeAt(1));
+    expect(binary[len - 1]).to.equal(plain.charCodeAt(len - 1));
+    expect(binary[len - 2]).to.equal(plain.charCodeAt(len - 2));
+  });
 
-    it('should convert without headers, footers, line breaks', () => {
-      const binary = pemToBytes(PLAIN_TEXT);
-      const plain = atob(PLAIN_TEXT);
-      const len = plain.length;
-      expect(binary.byteLength).to.equal(len);
-      expect(binary[0]).to.equal(plain.charCodeAt(0));
-      expect(binary[1]).to.equal(plain.charCodeAt(1));
-      expect(binary[len - 1]).to.equal(plain.charCodeAt(len - 1));
-      expect(binary[len - 2]).to.equal(plain.charCodeAt(len - 2));
-    });
+  it('should convert without headers, footers, line breaks', () => {
+    const binary = pemToBytes(PLAIN_TEXT);
+    const plain = atob(PLAIN_TEXT);
+    const len = plain.length;
+    expect(binary.byteLength).to.equal(len);
+    expect(binary[0]).to.equal(plain.charCodeAt(0));
+    expect(binary[1]).to.equal(plain.charCodeAt(1));
+    expect(binary[len - 1]).to.equal(plain.charCodeAt(len - 1));
+    expect(binary[len - 2]).to.equal(plain.charCodeAt(len - 2));
+  });
 
-    it('should convert without line breaks', () => {
-      const binary = pemToBytes(
-        '-----BEGIN PUBLIC KEY-----' + PLAIN_TEXT + '-----END PUBLIC KEY-----'
-      );
-      const plain = atob(PLAIN_TEXT);
-      const len = plain.length;
-      expect(binary.byteLength).to.equal(len);
-      expect(binary[0]).to.equal(plain.charCodeAt(0));
-      expect(binary[1]).to.equal(plain.charCodeAt(1));
-      expect(binary[len - 1]).to.equal(plain.charCodeAt(len - 1));
-      expect(binary[len - 2]).to.equal(plain.charCodeAt(len - 2));
-    });
+  it('should convert without line breaks', () => {
+    const binary = pemToBytes(
+      '-----BEGIN PUBLIC KEY-----' + PLAIN_TEXT + '-----END PUBLIC KEY-----'
+    );
+    const plain = atob(PLAIN_TEXT);
+    const len = plain.length;
+    expect(binary.byteLength).to.equal(len);
+    expect(binary[0]).to.equal(plain.charCodeAt(0));
+    expect(binary[1]).to.equal(plain.charCodeAt(1));
+    expect(binary[len - 1]).to.equal(plain.charCodeAt(len - 1));
+    expect(binary[len - 2]).to.equal(plain.charCodeAt(len - 2));
+  });
 
-    it('should convert without header', () => {
-      const binary = pemToBytes(PLAIN_TEXT + '-----END PUBLIC KEY-----');
-      const plain = atob(PLAIN_TEXT);
-      const len = plain.length;
-      expect(binary.byteLength).to.equal(len);
-      expect(binary[0]).to.equal(plain.charCodeAt(0));
-      expect(binary[1]).to.equal(plain.charCodeAt(1));
-      expect(binary[len - 1]).to.equal(plain.charCodeAt(len - 1));
-      expect(binary[len - 2]).to.equal(plain.charCodeAt(len - 2));
-    });
+  it('should convert without header', () => {
+    const binary = pemToBytes(PLAIN_TEXT + '-----END PUBLIC KEY-----');
+    const plain = atob(PLAIN_TEXT);
+    const len = plain.length;
+    expect(binary.byteLength).to.equal(len);
+    expect(binary[0]).to.equal(plain.charCodeAt(0));
+    expect(binary[1]).to.equal(plain.charCodeAt(1));
+    expect(binary[len - 1]).to.equal(plain.charCodeAt(len - 1));
+    expect(binary[len - 2]).to.equal(plain.charCodeAt(len - 2));
+  });
 
-    it('should convert without footer', () => {
-      const binary = pemToBytes('-----BEGIN PUBLIC KEY-----' + PLAIN_TEXT);
-      const plain = atob(PLAIN_TEXT);
-      const len = plain.length;
-      expect(binary.byteLength).to.equal(len);
-      expect(binary[0]).to.equal(plain.charCodeAt(0));
-      expect(binary[1]).to.equal(plain.charCodeAt(1));
-      expect(binary[len - 1]).to.equal(plain.charCodeAt(len - 1));
-      expect(binary[len - 2]).to.equal(plain.charCodeAt(len - 2));
-    });
+  it('should convert without footer', () => {
+    const binary = pemToBytes('-----BEGIN PUBLIC KEY-----' + PLAIN_TEXT);
+    const plain = atob(PLAIN_TEXT);
+    const len = plain.length;
+    expect(binary.byteLength).to.equal(len);
+    expect(binary[0]).to.equal(plain.charCodeAt(0));
+    expect(binary[1]).to.equal(plain.charCodeAt(1));
+    expect(binary[len - 1]).to.equal(plain.charCodeAt(len - 1));
+    expect(binary[len - 2]).to.equal(plain.charCodeAt(len - 2));
   });
+});
diff --git a/extensions/amp-access/0.1/test/test-login-dialog.js b/extensions/amp-access/0.1/test/test-login-dialog.js
index 8842d06d4c28..78990a9cc99e 100644
--- a/extensions/amp-access/0.1/test/test-login-dialog.js
+++ b/extensions/amp-access/0.1/test/test-login-dialog.js
@@ -1,6 +1,8 @@
 import {Services} from '#service';
 import {installDocService} from '#service/ampdoc-impl';
 
+import {FakePerformance} from '#testing/fake-dom';
+
 import {WebLoginDialog, openLoginDialog} from '../login-dialog';
 
 const RETURN_URL_ESC = encodeURIComponent(
@@ -40,6 +42,7 @@ describes.sandboxed('ViewerLoginDialog', {}, (env) => {
       setInterval: () => {
         throw new Error('Not allowed');
       },
+      performance: new FakePerformance(window),
     };
     windowApi.document.defaultView = windowApi;
     installDocService(windowApi, /* isSingleDoc */ true);
@@ -178,6 +181,7 @@ describes.sandboxed('WebLoginDialog', {}, (env) => {
       setTimeout: (callback, t) => window.setTimeout(callback, t),
       setInterval: (callback, t) => window.setInterval(callback, t),
       clearInterval: (intervalId) => window.clearInterval(intervalId),
+      performance: new FakePerformance(window),
     };
     windowApi = windowObj;
     windowApi.document.defaultView = windowApi;
diff --git a/extensions/amp-accordion/0.1/amp-accordion.js b/extensions/amp-accordion/0.1/amp-accordion.js
index 4f2f586d8a9e..4b2e978c41be 100644
--- a/extensions/amp-accordion/0.1/amp-accordion.js
+++ b/extensions/amp-accordion/0.1/amp-accordion.js
@@ -1,8 +1,8 @@
-import {ActionTrust} from '#core/constants/action-constants';
-import {Keys} from '#core/constants/key-codes';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
+import {Keys_Enum} from '#core/constants/key-codes';
 import {bezierCurve} from '#core/data-structures/curve';
 import {dispatchCustomEvent, tryFocus} from '#core/dom';
-import {Layout} from '#core/dom/layout';
+import {Layout_Enum} from '#core/dom/layout';
 import {closest, realChildElements} from '#core/dom/query';
 import {getStyle, setImportantStyles, setStyles} from '#core/dom/style';
 import {
@@ -11,7 +11,6 @@ import {
   setStyles as setStylesTransition,
 } from '#core/dom/transition';
 import {clamp} from '#core/math';
-import {dict} from '#core/types/object';
 import {parseJson} from '#core/types/object/json';
 
 import {Services} from '#service';
@@ -30,7 +29,7 @@ const EXPAND_CURVE_ = bezierCurve(0.47, 0, 0.745, 0.715);
 const COLLAPSE_CURVE_ = bezierCurve(0.39, 0.575, 0.565, 1);
 
 class AmpAccordion extends AMP.BaseElement {
-  /** @override @nocollapse */
+  /** @override  */
   static prerenderAllowed() {
     return true;
   }
@@ -63,7 +62,7 @@ class AmpAccordion extends AMP.BaseElement {
 
   /** @override */
   isLayoutSupported(layout) {
-    return layout == Layout.CONTAINER;
+    return layout == Layout_Enum.CONTAINER;
   }
 
   /** @override */
@@ -123,7 +122,7 @@ class AmpAccordion extends AMP.BaseElement {
       const expandObserver = new this.win.MutationObserver((mutations) => {
         // [data-expand] mutations can only be triggered by AMP.setState which
         // requires "default" trust.
-        this.toggleExpandMutations_(mutations, ActionTrust.DEFAULT);
+        this.toggleExpandMutations_(mutations, ActionTrust_Enum.DEFAULT);
       });
       expandObserver.observe(section, {
         attributes: true,
@@ -223,7 +222,7 @@ class AmpAccordion extends AMP.BaseElement {
    */
   getSessionState_() {
     if (this.sessionOptOut_) {
-      return dict();
+      return {};
     }
     try {
       const sessionStr = this.win./*OK*/ sessionStorage.getItem(
@@ -233,7 +232,7 @@ class AmpAccordion extends AMP.BaseElement {
         ? /** @type {!JsonObject} */ (
             devAssert(parseJson(dev().assertString(sessionStr)))
           )
-        : dict();
+        : {};
     } catch (e) {
       dev().fine(
         'AMP-ACCORDION',
@@ -241,7 +240,7 @@ class AmpAccordion extends AMP.BaseElement {
         e.message,
         e.stack
       );
-      return dict();
+      return {};
     }
   }
 
@@ -273,14 +272,10 @@ class AmpAccordion extends AMP.BaseElement {
    * Triggers event given name
    * @param {string} name
    * @param {!Element} section
-   * @param {!ActionTrust} trust
+   * @param {!ActionTrust_Enum} trust
    */
   triggerEvent_(name, section, trust) {
-    const event = createCustomEvent(
-      this.win,
-      `accordionSection.${name}`,
-      dict({})
-    );
+    const event = createCustomEvent(this.win, `accordionSection.${name}`, {});
     this.action_.trigger(section, name, event, trust);
 
     dispatchCustomEvent(this.element, name);
@@ -289,7 +284,7 @@ class AmpAccordion extends AMP.BaseElement {
   /**
    * Toggles section between expanded or collapsed.
    * @param {!Element} section
-   * @param {!ActionTrust} trust
+   * @param {!ActionTrust_Enum} trust
    * @param {(boolean|undefined)=} opt_forceExpand
    * @private
    */
@@ -364,7 +359,7 @@ class AmpAccordion extends AMP.BaseElement {
 
   /**
    * @param {!Element} section
-   * @param {!ActionTrust} trust
+   * @param {!ActionTrust_Enum} trust
    * @return {!Promise}
    * @private
    */
@@ -456,7 +451,7 @@ class AmpAccordion extends AMP.BaseElement {
 
   /**
    * @param {!Element} section
-   * @param {!ActionTrust} trust
+   * @param {!ActionTrust_Enum} trust
    * @return {!Promise}
    * @private
    */
@@ -533,7 +528,7 @@ class AmpAccordion extends AMP.BaseElement {
     const header = dev().assertElement(event.currentTarget);
     const section = dev().assertElement(header.parentElement);
     // Click or keypress gestures are high trust.
-    this.toggle_(section, ActionTrust.HIGH);
+    this.toggle_(section, ActionTrust_Enum.HIGH);
   }
 
   /**
@@ -574,12 +569,12 @@ class AmpAccordion extends AMP.BaseElement {
     }
     const {key} = event;
     switch (key) {
-      case Keys.UP_ARROW: /* fallthrough */
-      case Keys.DOWN_ARROW:
+      case Keys_Enum.UP_ARROW: /* fallthrough */
+      case Keys_Enum.DOWN_ARROW:
         this.navigationKeyDownHandler_(event);
         return;
-      case Keys.ENTER: /* fallthrough */
-      case Keys.SPACE:
+      case Keys_Enum.ENTER: /* fallthrough */
+      case Keys_Enum.SPACE:
         if (event.target == event.currentTarget) {
           // Only activate if header element was activated directly.
           // Do not respond to key presses on its children.
@@ -601,7 +596,7 @@ class AmpAccordion extends AMP.BaseElement {
     if (index !== -1) {
       event.preventDefault();
       // Up and down are the same regardless of locale direction.
-      const diff = event.key == Keys.UP_ARROW ? -1 : 1;
+      const diff = event.key == Keys_Enum.UP_ARROW ? -1 : 1;
       // If user navigates one past the beginning or end, wrap around.
       let newFocusIndex = (index + diff) % this.headers_.length;
       if (newFocusIndex < 0) {
@@ -615,7 +610,7 @@ class AmpAccordion extends AMP.BaseElement {
   /**
    * Callback function to execute when mutations are observed on "data-expand".
    * @param {!Array<!MutationRecord>} mutations
-   * @param {!ActionTrust} trust
+   * @param {!ActionTrust_Enum} trust
    */
   toggleExpandMutations_(mutations, trust) {
     mutations.forEach((mutation) => {
diff --git a/extensions/amp-accordion/0.1/test/integration/test-amp-accordion.js b/extensions/amp-accordion/0.1/test/integration/test-amp-accordion.js
index 960569e786a5..8d90b2c69e35 100644
--- a/extensions/amp-accordion/0.1/test/integration/test-amp-accordion.js
+++ b/extensions/amp-accordion/0.1/test/integration/test-amp-accordion.js
@@ -1,10 +1,7 @@
-describes.sandboxed
-  .configure()
-  .skipEdge()
-  .run('amp-accordion', {}, function () {
-    this.timeout(10000);
-    const extensions = ['amp-accordion'];
-    const body = `
+describes.sandboxed('amp-accordion', {}, function () {
+  this.timeout(10000);
+  const extensions = ['amp-accordion'];
+  const body = `
   <amp-accordion media="(min-width: 500px)" id="media-accordion">
     <section>
       <h1>
@@ -14,38 +11,36 @@ describes.sandboxed
     </section>
   </amp-accordion>
   `;
-    describes.integration(
-      'amp-accordion',
-      {
-        body,
-        extensions,
-      },
-      (env) => {
-        let win, iframe, doc;
-        beforeEach(() => {
-          win = env.win;
-          iframe = env.iframe;
-          doc = win.document;
-          iframe.width = 300;
-        });
+  describes.integration(
+    'amp-accordion',
+    {
+      body,
+      extensions,
+    },
+    (env) => {
+      let win, iframe, doc;
+      beforeEach(() => {
+        win = env.win;
+        iframe = env.iframe;
+        doc = win.document;
+        iframe.width = 300;
+      });
 
-        it('should respect the media attribute', () => {
-          const accordion = doc.getElementById('media-accordion');
-          expect(iframe.clientWidth).to.equal(300);
-          expect(accordion.className).to.match(
+      it('should respect the media attribute', () => {
+        const accordion = doc.getElementById('media-accordion');
+        expect(iframe.clientWidth).to.equal(300);
+        expect(accordion.className).to.match(/i-amphtml-hidden-by-media-query/);
+        iframe.width = 600;
+        expect(iframe.clientWidth).to.equal(600);
+        return timeout(200).then(() => {
+          expect(accordion.className).to.not.match(
             /i-amphtml-hidden-by-media-query/
           );
-          iframe.width = 600;
-          expect(iframe.clientWidth).to.equal(600);
-          return timeout(200).then(() => {
-            expect(accordion.className).to.not.match(
-              /i-amphtml-hidden-by-media-query/
-            );
-          });
         });
-      }
-    );
-  });
+      });
+    }
+  );
+});
 
 /**
  * @param {number} ms
diff --git a/extensions/amp-accordion/0.1/test/test-amp-accordion.js b/extensions/amp-accordion/0.1/test/test-amp-accordion.js
index 41b9f092021f..9426608c9ba7 100644
--- a/extensions/amp-accordion/0.1/test/test-amp-accordion.js
+++ b/extensions/amp-accordion/0.1/test/test-amp-accordion.js
@@ -1,6 +1,6 @@
 import '../amp-accordion';
-import {ActionTrust} from '#core/constants/action-constants';
-import {Keys} from '#core/constants/key-codes';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
+import {Keys_Enum} from '#core/constants/key-codes';
 import {createElementWithAttributes, tryFocus} from '#core/dom';
 import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 import {htmlFor} from '#core/dom/static-template';
@@ -71,7 +71,12 @@ describes.realWin(
     }
 
     /** Helper for invoking expand/collapse actions on amp-accordion. */
-    function execute(impl, method, trust = ActionTrust.HIGH, opt_sectionId) {
+    function execute(
+      impl,
+      method,
+      trust = ActionTrust_Enum.HIGH,
+      opt_sectionId
+    ) {
       const invocation = {
         method,
         trust,
@@ -89,7 +94,7 @@ describes.realWin(
       const headerElements = doc.querySelectorAll('section > *:first-child');
       expect(headerElements[0].parentNode.hasAttribute('expanded')).to.be.false;
       expect(headerElements[0].getAttribute('aria-expanded')).to.equal('false');
-      impl.toggle_(headerElements[0].parentNode, ActionTrust.HIGH);
+      impl.toggle_(headerElements[0].parentNode, ActionTrust_Enum.HIGH);
       expect(headerElements[0].parentNode.hasAttribute('expanded')).to.be.true;
       expect(headerElements[0].getAttribute('aria-expanded')).to.equal('true');
     });
@@ -111,7 +116,7 @@ describes.realWin(
       expect(headerElements[1].parentNode.hasAttribute('expanded')).to.be.true;
       expect(headerElements[1].getAttribute('aria-expanded')).to.equal('true');
 
-      impl.toggle_(headerElements[1].parentNode, ActionTrust.HIGH);
+      impl.toggle_(headerElements[1].parentNode, ActionTrust_Enum.HIGH);
 
       expect(headerElements[1].parentNode.hasAttribute('expanded')).to.be.false;
       expect(headerElements[1].getAttribute('aria-expanded')).to.equal('false');
@@ -123,7 +128,7 @@ describes.realWin(
       const headerElements = doc.querySelectorAll('section > *:first-child');
       expect(headerElements[0].parentNode.hasAttribute('expanded')).to.be.false;
       expect(headerElements[0].getAttribute('aria-expanded')).to.equal('false');
-      impl.toggle_(headerElements[0].parentNode, ActionTrust.HIGH, true);
+      impl.toggle_(headerElements[0].parentNode, ActionTrust_Enum.HIGH, true);
       expect(headerElements[0].parentNode.hasAttribute('expanded')).to.be.true;
       expect(headerElements[0].getAttribute('aria-expanded')).to.equal('true');
     });
@@ -144,7 +149,7 @@ describes.realWin(
           'true'
         );
         // expand the first section
-        impl.toggle_(headerElements[0].parentNode, ActionTrust.HIGH, true);
+        impl.toggle_(headerElements[0].parentNode, ActionTrust_Enum.HIGH, true);
         // we expect the first section to be expanded
         expect(headerElements[0].parentNode.hasAttribute('expanded')).to.be
           .true;
@@ -166,7 +171,7 @@ describes.realWin(
       const headerElements = doc.querySelectorAll('section > *:first-child');
       expect(headerElements[0].parentNode.hasAttribute('expanded')).to.be.false;
       expect(headerElements[0].getAttribute('aria-expanded')).to.equal('false');
-      impl.toggle_(headerElements[0].parentNode, ActionTrust.LOW);
+      impl.toggle_(headerElements[0].parentNode, ActionTrust_Enum.LOW);
       expect(headerElements[0].parentNode.hasAttribute('expanded')).to.be.true;
       expect(headerElements[0].getAttribute('aria-expanded')).to.equal('true');
     });
@@ -178,7 +183,7 @@ describes.realWin(
       expect(headerElements[1].parentNode.hasAttribute('expanded')).to.be.true;
       expect(headerElements[1].getAttribute('aria-expanded')).to.equal('true');
 
-      impl.toggle_(headerElements[1].parentNode, ActionTrust.LOW);
+      impl.toggle_(headerElements[1].parentNode, ActionTrust_Enum.LOW);
 
       expect(headerElements[1].parentNode.hasAttribute('expanded')).to.be.false;
       expect(headerElements[1].getAttribute('aria-expanded')).to.equal('false');
@@ -196,7 +201,7 @@ describes.realWin(
           `expand:acc${counter}.expand(section='acc${counter}sec${2}')`
         );
         expect(impl.sections_[2].hasAttribute('expanded')).to.be.false;
-        impl.toggle_(impl.sections_[0], ActionTrust.HIGH, true);
+        impl.toggle_(impl.sections_[0], ActionTrust_Enum.HIGH, true);
 
         await poll('wait for first section to expand', () =>
           impl.sections_[0].hasAttribute('expanded')
@@ -217,7 +222,7 @@ describes.realWin(
           `collapse:acc${counter}.expand(section='acc${counter}sec${2}')`
         );
         expect(impl.sections_[2].hasAttribute('expanded')).to.be.false;
-        impl.toggle_(impl.sections_[1], ActionTrust.HIGH, false);
+        impl.toggle_(impl.sections_[1], ActionTrust_Enum.HIGH, false);
 
         await poll(
           'wait for first section to expand',
@@ -240,7 +245,7 @@ describes.realWin(
           `expand:acc${counter}.expand(section='acc${counter}sec${2}')`
         );
         expect(impl.sections_[2].hasAttribute('expanded')).to.be.false;
-        impl.toggle_(impl.sections_[0], ActionTrust.HIGH, true);
+        impl.toggle_(impl.sections_[0], ActionTrust_Enum.HIGH, true);
 
         await poll('wait for first section to expand', () =>
           impl.sections_[0].hasAttribute('expanded')
@@ -264,7 +269,7 @@ describes.realWin(
           `collapse:acc${counter}.expand(section='acc${counter}sec${2}')`
         );
         expect(impl.sections_[2].hasAttribute('expanded')).to.be.false;
-        impl.toggle_(impl.sections_[1], ActionTrust.HIGH, false);
+        impl.toggle_(impl.sections_[1], ActionTrust_Enum.HIGH, false);
 
         await poll(
           'wait for first section to expand',
@@ -290,7 +295,7 @@ describes.realWin(
 
       ampAccordion.setAttribute('animate', '');
       ampAccordion.style.width = '300px';
-      impl.toggle_(firstSection, ActionTrust.HIGH, true);
+      impl.toggle_(firstSection, ActionTrust_Enum.HIGH, true);
       await poll('wait for first section to finish animating', () => {
         return (
           firstSection.hasAttribute('expanded') &&
@@ -318,7 +323,7 @@ describes.realWin(
 
       ampAccordion.setAttribute('animate', '');
       ampAccordion.style.width = '400px';
-      impl.toggle_(firstSection, ActionTrust.HIGH, true);
+      impl.toggle_(firstSection, ActionTrust_Enum.HIGH, true);
       await poll('wait for first section to finish animating', () => {
         return (
           firstSection.hasAttribute('expanded') &&
@@ -338,7 +343,7 @@ describes.realWin(
       const headerElements = doc.querySelectorAll('section > *:first-child');
       expect(headerElements[1].parentNode.hasAttribute('expanded')).to.be.true;
       expect(headerElements[1].getAttribute('aria-expanded')).to.equal('true');
-      impl.toggle_(headerElements[1].parentNode, ActionTrust.HIGH, true);
+      impl.toggle_(headerElements[1].parentNode, ActionTrust_Enum.HIGH, true);
       expect(headerElements[1].parentNode.hasAttribute('expanded')).to.be.true;
       expect(headerElements[1].getAttribute('aria-expanded')).to.equal('true');
     });
@@ -349,7 +354,7 @@ describes.realWin(
       const headerElements = doc.querySelectorAll('section > *:first-child');
       expect(headerElements[1].parentNode.hasAttribute('expanded')).to.be.true;
       expect(headerElements[1].getAttribute('aria-expanded')).to.equal('true');
-      impl.toggle_(headerElements[1].parentNode, ActionTrust.HIGH, false);
+      impl.toggle_(headerElements[1].parentNode, ActionTrust_Enum.HIGH, false);
       expect(headerElements[1].parentNode.hasAttribute('expanded')).to.be.false;
       expect(headerElements[1].getAttribute('aria-expanded')).to.equal('false');
     });
@@ -360,7 +365,7 @@ describes.realWin(
       const headerElements = doc.querySelectorAll('section > *:first-child');
       expect(headerElements[0].parentNode.hasAttribute('expanded')).to.be.false;
       expect(headerElements[0].getAttribute('aria-expanded')).to.equal('false');
-      impl.toggle_(headerElements[0].parentNode, ActionTrust.HIGH, false);
+      impl.toggle_(headerElements[0].parentNode, ActionTrust_Enum.HIGH, false);
       expect(headerElements[0].parentNode.hasAttribute('expanded')).to.be.false;
       expect(headerElements[0].getAttribute('aria-expanded')).to.equal('false');
     });
@@ -442,7 +447,7 @@ describes.realWin(
         const impl = await ampAccordion.getImpl();
         const headerElements = doc.querySelectorAll('section > *:first-child');
         const keyDownEvent = {
-          key: Keys.SPACE,
+          key: Keys_Enum.SPACE,
           target: headerElements[0],
           currentTarget: headerElements[0],
           preventDefault: env.sandbox.spy(),
@@ -472,7 +477,7 @@ describes.realWin(
         const child = doc.createElement('div');
         headerElements[0].appendChild(child);
         const keyDownEvent = {
-          key: Keys.ENTER,
+          key: Keys_Enum.ENTER,
           target: child,
           currentTarget: headerElements[0],
           preventDefault: env.sandbox.spy(),
@@ -500,7 +505,7 @@ describes.realWin(
         const impl = await ampAccordion.getImpl();
         const headerElements = doc.querySelectorAll('section > *:first-child');
         const keyDownEvent = {
-          key: Keys.ENTER,
+          key: Keys_Enum.ENTER,
           target: headerElements[1],
           currentTarget: headerElements[1],
           preventDefault: env.sandbox.spy(),
@@ -531,7 +536,7 @@ describes.realWin(
         tryFocus(headerElements[0]);
         expect(doc.activeElement).to.equal(headerElements[0]);
         const upArrowEvent = {
-          key: Keys.UP_ARROW,
+          key: Keys_Enum.UP_ARROW,
           target: headerElements[0],
           currentTarget: headerElements[0],
           preventDefault: env.sandbox.spy(),
@@ -541,7 +546,7 @@ describes.realWin(
           headerElements[headerElements.length - 1]
         );
         const downArrowEvent = {
-          key: Keys.DOWN_ARROW,
+          key: Keys_Enum.DOWN_ARROW,
           target: headerElements[headerElements.length - 1],
           currentTarget: headerElements[headerElements.length - 1],
           preventDefault: env.sandbox.spy(),
@@ -896,7 +901,7 @@ describes.realWin(
           'source',
           'caller',
           'event',
-          ActionTrust.HIGH
+          ActionTrust_Enum.HIGH
         );
         expect(element.enqueAction).to.be.calledWith(
           env.sandbox.match({
@@ -907,7 +912,7 @@ describes.realWin(
             method,
             node: element,
             source: 'source',
-            trust: ActionTrust.HIGH,
+            trust: ActionTrust_Enum.HIGH,
           })
         );
       });
diff --git a/extensions/amp-accordion/1.0/README.md b/extensions/amp-accordion/1.0/README.md
index 0bf622a682e7..7aeae0b917b6 100644
--- a/extensions/amp-accordion/1.0/README.md
+++ b/extensions/amp-accordion/1.0/README.md
@@ -2,25 +2,19 @@
 
 Displays content sections that can be collapsed and expanded. This component provides a way for viewers to glance at the content outline and jump to any section. Effective use reduces scrolling needs on mobile devices.
 
--   A Bento Accordion accepts one or more `<section>` elements as its direct
-    children.
+-   A Bento Accordion accepts one or more `<section>` elements as its direct children.
 -   Each `<section>` must contain exactly two direct children.
--   The first child in a `<section>` is the heading for that section of the
-    Bento Accordion. It must be a heading element such as `<h1>-<h6>` or
-    `<header>`.
+-   The first child in a `<section>` is the heading for that section of the Bento Accordion. It must be a heading element such as `<h1>-<h6>` or `<header>`.
 -   The second child in a `<section>` is the expandable/collapsible content.
     -   It can be any tag allowed in [AMP HTML](https://github.com/ampproject/amphtml/blob/main/docs/spec/amp-html-format.md).
 -   A click or tap on a `<section>` heading expands or collapses the section.
--   A Bento Accordion with a defined `id` preserves the collapsed or expanded
-    state of each section while the user remains on your domain.
+-   A Bento Accordion with a defined `id` preserves the collapsed or expanded state of each section while the user remains on your domain.
 
 ## Web Component
 
 You must include each Bento component's required CSS library to guarantee proper loading and before adding custom styles. Or use the light-weight pre-upgrade styles available inline. See [Layout and style](#layout-and-style).
 
-The examples below demonstrate use of the `<bento-accordion>` web component.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/accordion
@@ -31,77 +25,148 @@ import {defineElement as defineBentoAccordion} from '@bentoproject/accordion';
 defineBentoAccordion();
 ```
 
-### Example: Include via `<script>`
+### Include via `<script>`
+
+```html
+<script type="module" src="https://cdn.ampproject.org/bento.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/bento.js" crossorigin="anonymous"></script>
+<script type="module" src="https://cdn.ampproject.org/v0/bento-accordion-1.0.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/v0/bento-accordion-1.0.js" crossorigin="anonymous"></script>
+<link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-accordion-1.0.css" crossorigin="anonymous">
+```
+
+### Example
 
-The example below contains an `bento-accordion` with three sections. The
-`expanded` attribute on the third section expands it on page load.
+<!--% example %-->
 
 ```html
-<head>
-  <script src="https://cdn.ampproject.org/bento.js"></script>
-  <script
-    async
-    src="https://cdn.ampproject.org/v0/bento-accordion-1.0.js"
-  ></script>
-  <link
-    rel="stylesheet"
-    type="text/css"
-    href="https://cdn.ampproject.org/v0/bento-accordion-1.0.css"
-  />
-</head>
-<body>
-  <bento-accordion id="my-accordion">
-    <section>
-      <h2>Section 1</h2>
-      <p>Content in section 1.</p>
-    </section>
-    <section>
-      <h2>Section 2</h2>
-      <div>Content in section 2.</div>
-    </section>
-    <section expanded>
-      <h2>Section 3</h2>
-      <div>Content in section 3.</div>
-    </section>
-  </bento-accordion>
-  <script>
-    (async () => {
-      const accordion = document.querySelector('#my-accordion');
-      await customElements.whenDefined('bento-accordion');
-      const api = await accordion.getApi();
-
-      // programatically expand all sections
-      api.expand();
-      // programatically collapse all sections
-      api.collapse();
-    })();
-  </script>
-</body>
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-accordion-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-accordion-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-accordion-1.0.css"
+    />
+  </head>
+  <body>
+    <bento-accordion id="my-accordion">
+      <section>
+        <h2>Section 1</h2>
+        <div>Content in section 1.</div>
+      </section>
+      <section>
+        <h2>Section 2</h2>
+        <div>Content in section 2.</div>
+      </section>
+       <!-- Expanded on page load due to attribute: -->
+      <section expanded>
+        <h2>Section 3</h2>
+        <div>Content in section 3.</div>
+      </section>
+    </bento-accordion>
+  </body>
+</html>
 ```
 
 ### Interactivity and API usage
 
-Bento enabled components in standalone use are highly interactive through their API. The `bento-accordion` component API is accessible by including the following script tag in your document:
+Bento components are highly interactive through their API. The `bento-accordion` component API is accessible by including the following script tag in your document:
 
 ```javascript
 await customElements.whenDefined('bento-accordion');
 const api = await accordion.getApi();
 ```
 
+#### API Example
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-accordion-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-accordion-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-accordion-1.0.css"
+    />
+  </head>
+  <body>
+    <bento-accordion id="my-accordion">
+      <section>
+        <h2>Section 1</h2>
+        <div>Content in section 1.</div>
+      </section>
+      <section>
+        <h2>Section 2</h2>
+        <div>Content in section 2.</div>
+      </section>
+       <!-- Expanded on page load due to attribute: -->
+      <section expanded>
+        <h2>Section 3</h2>
+        <div>Content in section 3.</div>
+      </section>
+    </bento-accordion>
+    <script>
+      (async () => {
+        const accordion = document.querySelector('#my-accordion');
+        await customElements.whenDefined('bento-accordion');
+        const api = await accordion.getApi();
+
+        // programatically expand all sections
+        api.expand();
+        // programatically collapse all sections
+        api.collapse();
+      })();
+    </script>
+  </body>
+</html>
+```
+
 #### Actions
 
 ##### toggle()
 
-The `toggle` action switches the `expanded` and `collapsed` states of
-`bento-accordion` sections. When called with no arguments, it toggles all sections
-of the accordion. To specify a specific section, add the `section` argument and
-use its corresponding `id` as the value.
+The `toggle` action switches the `expanded` and `collapsed` states of `bento-accordion` sections. When called with no arguments, it toggles all sections of the accordion. To specify a specific section, add the `section` argument and use its corresponding `id` as the value.
 
 ```html
 <bento-accordion id="myAccordion">
   <section id="section1">
     <h2>Section 1</h2>
-    <p>Bunch of awesome content</p>
+    <div>Bunch of awesome content</div>
   </section>
   <section>
     <h2>Section 2</h2>
@@ -133,11 +198,23 @@ use its corresponding `id` as the value.
 
 ##### expand()
 
-The `expand` action expands the sections of the `bento-accordion`. If a section
-is already expanded, it stays expanded. When called with no arguments, it
-expands all sections of the accordion. To specify a section, add the `section` argument, and use its corresponding `id` as the value.
+The `expand` action expands the sections of the `bento-accordion`. If a section is already expanded, it stays expanded. When called with no arguments, it expands all sections of the accordion. To specify a section, add the `section` argument, and use its corresponding `id` as the value.
 
 ```html
+<bento-accordion id="myAccordion">
+  <section id="section1">
+    <h2>Section 1</h2>
+    <div>Bunch of awesome content</div>
+  </section>
+  <section>
+    <h2>Section 2</h2>
+    <div>Bunch of awesome content</div>
+  </section>
+  <section>
+    <h2>Section 3</h2>
+    <div>Bunch of awesome content</div>
+  </section>
+</bento-accordion>
 <button id="button1">Expand All Sections</button>
 <button id="button2">Expand Section 1</button>
 <script>
@@ -159,12 +236,23 @@ expands all sections of the accordion. To specify a section, add the `section` a
 
 ##### collapse()
 
-The `collapse` action collapses the sections of the `bento-accordion`. If a
-section is already collapsed, it stays collapsed. When called with no arguments,
-it collapses all sections of the accordion. To specify a section, add the
-`section` argument, and use its corresponding `id` as the value.
+The `collapse` action collapses the sections of the `bento-accordion`. If a section is already collapsed, it stays collapsed. When called with no arguments, it collapses all sections of the accordion. To specify a section, add the `section` argument, and use its corresponding `id` as the value.
 
 ```html
+<bento-accordion id="myAccordion">
+  <section id="section1">
+    <h2>Section 1</h2>
+    <div>Bunch of awesome content</div>
+  </section>
+  <section>
+    <h2>Section 2</h2>
+    <div>Bunch of awesome content</div>
+  </section>
+  <section>
+    <h2>Section 3</h2>
+    <div>Bunch of awesome content</div>
+  </section>
+</bento-accordion>
 <button id="button1">Collapse All Sections</button>
 <button id="button2">Collapse Section 1</button>
 <script>
@@ -202,6 +290,8 @@ In the example below, `section 1` listens for the `expand` event and expands `se
 
 See below for example.
 
+##### Events Example
+
 ```html
 <bento-accordion id="eventsAccordion" animate>
   <section id="section1">
@@ -300,8 +390,7 @@ Alternatively, you may also make the light-weight pre-upgrade styles available i
 
 #### animate
 
-Include the `animate` attribute in `<bento-accordion>` to add a "roll down"
-animation when the content is expanded and "roll up" animation when collapsed.
+Include the `animate` attribute in `<bento-accordion>` to add a "roll down" animation when the content is expanded and "roll up" animation when collapsed.
 
 This attribute can be configured to based on a [media query](./../../../docs/spec/amp-html-responsive-attributes.md).
 
@@ -309,7 +398,7 @@ This attribute can be configured to based on a [media query](./../../../docs/spe
 <bento-accordion animate>
   <section>
     <h2>Section 1</h2>
-    <p>Content in section 1.</p>
+    <div>Content in section 1.</div>
   </section>
   <section>
     <h2>Section 2</h2>
@@ -330,7 +419,7 @@ Apply the `expanded` attribute to a nested `<section>` to expand that section wh
 <bento-accordion>
   <section id="section1">
     <h2>Section 1</h2>
-    <p>Bunch of awesome content</p>
+    <div>Bunch of awesome content</div>
   </section>
   <section id="section2">
     <h2>Section 2</h2>
@@ -351,7 +440,7 @@ Allow only one section to expand at a time by applying the `expand-single-sectio
 <bento-accordion expand-single-section>
   <section>
     <h2>Section 1</h2>
-    <p>Content in section 1.</p>
+    <div>Content in section 1.</div>
   </section>
   <section>
     <h2>Section 2</h2>
@@ -370,36 +459,39 @@ Allow only one section to expand at a time by applying the `expand-single-sectio
 
 ### Styling
 
-You may use the `bento-accordion` element selector to style the accordion
-freely.
+You may use the `bento-accordion` element selector to style the accordion freely.
 
 Keep the following points in mind when you style an amp-accordion:
 
 -   `bento-accordion` elements are always `display: block`.
 -   `float` cannot style a `<section>`, heading, nor content elements.
--   An expanded section applies the `expanded` attribute to the `<section>`
-    element.
--   The content element is clear-fixed with `overflow: hidden` and hence cannot
-    have scrollbars.
--   Margins of the `<bento-accordion>`, `<section>`, heading, and content elements
-    are set to `0`, but can be overridden in custom styles.
+-   An expanded section applies the `expanded` attribute to the `<section>` element.
+-   The content element is clear-fixed with `overflow: hidden` and hence cannot have scrollbars.
+-   Margins of the `<bento-accordion>`, `<section>`, heading, and content elements are set to `0`, but can be overridden in custom styles.
 -   Both the header and content elements are `position: relative`.
 
 ---
 
 ## Preact/React Component
 
-The examples below demonstrates use of the `<BentoAccordion>` as a functional component usable with the Preact or React libraries.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/accordion
 ```
 
-```javascript
+### Example
+
+<!--% example %-->
+
+```jsx
 import React from 'react';
-import {BentoAccordion} from '@bentoproject/accordion/react';
+import {
+  BentoAccordion,
+  BentoAccordionSection,
+  BentoAccordionHeader,
+  BentoAccordionContent
+} from '@bentoproject/accordion/react';
 import '@bentoproject/accordion/styles.css';
 
 function App() {
@@ -434,7 +526,7 @@ function App() {
 
 Bento components are highly interactive through their API. The `BentoAccordion` component API is accessible by passing a `ref`:
 
-```javascript
+```jsx
 import React, {createRef} from 'react';
 const ref = createRef();
 
@@ -472,10 +564,7 @@ The `BentoAccordion` API allows you to perform the following actions:
 
 ##### toggle()
 
-The `toggle` action switches the `expanded` and `collapsed` states of
-`bento-accordion` sections. When called with no arguments, it toggles all sections
-of the accordion. To specify a specific section, add the `section` argument and
-use its corresponding `id` as the value.
+The `toggle` action switches the `expanded` and `collapsed` states of `bento-accordion` sections. When called with no arguments, it toggles all sections of the accordion. To specify a specific section, add the `section` argument and use its corresponding `id` as the value.
 
 ```javascript
 ref.current.toggle();
@@ -484,9 +573,7 @@ ref.current.toggle('section1');
 
 ##### expand()
 
-The `expand` action expands the sections of the `bento-accordion`. If a section
-is already expanded, it stays expanded. When called with no arguments, it
-expands all sections of the accordion. To specify a section, add the `section` argument, and use its corresponding `id` as the value.
+The `expand` action expands the sections of the `bento-accordion`. If a section is already expanded, it stays expanded. When called with no arguments, it expands all sections of the accordion. To specify a section, add the `section` argument, and use its corresponding `id` as the value.
 
 ```javascript
 ref.current.expand();
@@ -495,10 +582,7 @@ ref.current.expand('section1');
 
 ##### collapse()
 
-The `collapse` action collapses the sections of the `bento-accordion`. If a
-section is already collapsed, it stays collapsed. When called with no arguments,
-it collapses all sections of the accordion. To specify a section, add the
-`section` argument, and use its corresponding `id` as the value.
+The `collapse` action collapses the sections of the `bento-accordion`. If a section is already collapsed, it stays collapsed. When called with no arguments, it collapses all sections of the accordion. To specify a section, add the `section` argument, and use its corresponding `id` as the value.
 
 ```javascript
 ref.current.collapse();
@@ -513,7 +597,7 @@ The Bento Accordion API allows you to respond to the following events:
 
 This event is triggered on a section when an accordion section is expanded or collpased and is dispatched from the expanded section.
 
-See below for example.
+See [example](#events-example) below for example.
 
 ##### onCollapse
 
@@ -521,49 +605,68 @@ This event is triggered on a section when an accordion section is collapsed and
 
 In the example below, `section 1` listens for the `expand` event and expands `section 2` when it is expanded. `section 2` listens for the `collapse` event and collapses `section 1` when it is collapsed.
 
-See below for example.
+See [example](#events-example) below for example.
+
+##### Events Example
+
+<!--% example %-->
 
 ```jsx
-<BentoAccordion ref={ref}>
-  <BentoAccordionSection
-    id="section1"
-    key={1}
-    onExpandStateChange={(expanded) => {
-      alert(expanded ?  'section1 expanded' : 'section1 collapsed');
-    }}
-  >
-    <BentoAccordionHeader>
-      <h1>Section 1</h1>
-    </BentoAccordionHeader>
-    <BentoAccordionContent>Content 1</BentoAccordionContent>
-  </BentoAccordionSection>
-
-  <BentoAccordionSection
-    id="section2"
-    key={2}
-    onExpandStateChange={(expanded) => {
-      alert(expanded ?  'section2 expanded' : 'section2 collapsed');
-    }}
-  >
-    <BentoAccordionHeader>
-      <h1>Section 2</h1>
-    </BentoAccordionHeader>
-    <BentoAccordionContent>Content 2</BentoAccordionContent>
-  </BentoAccordionSection>
-
-  <BentoAccordionSection
-    id="section3"
-    key={3}
-    onExpandStateChange={(expanded) => {
-      alert(expanded ?  'section3 expanded' : 'section3 collapsed');
-    }}
-  >
-    <BentoAccordionHeader>
-      <h1>Section 3</h1>
-    </BentoAccordionHeader>
-    <BentoAccordionContent>Content 3</BentoAccordionContent>
-  </BentoAccordionSection>
-</BentoAccordion>
+import React, {createRef} from 'react';
+import {
+  BentoAccordion,
+  BentoAccordionSection,
+  BentoAccordionHeader,
+  BentoAccordionContent
+} from '@bentoproject/accordion/react';
+import '@bentoproject/accordion/styles.css';
+
+
+function App() {
+  const ref = createRef();
+  return (
+    <BentoAccordion ref={ref}>
+      <BentoAccordionSection
+        id="section1"
+        key={1}
+        onExpandStateChange={(expanded) => {
+          alert(expanded ?  'section1 expanded' : 'section1 collapsed');
+        }}
+      >
+        <BentoAccordionHeader>
+          <h1>Section 1</h1>
+        </BentoAccordionHeader>
+        <BentoAccordionContent>Content 1</BentoAccordionContent>
+      </BentoAccordionSection>
+
+      <BentoAccordionSection
+        id="section2"
+        key={2}
+        onExpandStateChange={(expanded) => {
+          alert(expanded ?  'section2 expanded' : 'section2 collapsed');
+        }}
+      >
+        <BentoAccordionHeader>
+          <h1>Section 2</h1>
+        </BentoAccordionHeader>
+        <BentoAccordionContent>Content 2</BentoAccordionContent>
+      </BentoAccordionSection>
+
+      <BentoAccordionSection
+        id="section3"
+        key={3}
+        onExpandStateChange={(expanded) => {
+          alert(expanded ?  'section3 expanded' : 'section3 collapsed');
+        }}
+      >
+        <BentoAccordionHeader>
+          <h1>Section 3</h1>
+        </BentoAccordionHeader>
+        <BentoAccordionContent>Content 3</BentoAccordionContent>
+      </BentoAccordionSection>
+    </BentoAccordion>
+  )
+}
 ```
 
 ### Layout and style
@@ -594,24 +697,28 @@ Or via `className`:
 
 ##### animate
 
-If true, then uses "roll-down" / "roll-up" animation during the expansion and collapse of each section
+If true, then uses "roll-down" / "roll-up" animation during the expansion and collapse of each section.
+
 Default: `false`
 
 ##### expandSingleSection
 
-If true, then expanding 1 section will automatically collapse all other sections:
+If true, then expanding 1 section will automatically collapse all other sections.
+
 Default: `false`
 
 #### BentoAccordionSection
 
 ##### animate
 
-If true, then uses "roll-down" / "roll-up" animation during the expansion and collapse the section
+If true, then uses "roll-down" / "roll-up" animation during the expansion and collapse the section.
+
 Default: `false`
 
 ##### expanded
 
 If true, expands the section.
+
 Default: `false`
 
 ##### onExpandStateChange
diff --git a/extensions/amp-accordion/1.0/amp-accordion.js b/extensions/amp-accordion/1.0/amp-accordion.js
index 9a8a3c1c5bc6..15f5363173c3 100644
--- a/extensions/amp-accordion/1.0/amp-accordion.js
+++ b/extensions/amp-accordion/1.0/amp-accordion.js
@@ -1,22 +1,24 @@
-import {ActionTrust} from '#core/constants/action-constants';
+import {BaseElement} from '#bento/components/bento-accordion/1.0/base-element';
+
+import {ActionTrust_Enum} from '#core/constants/action-constants';
 import {getWin} from '#core/window';
 
 import {isExperimentOn} from '#experiments';
 
+import {AmpPreactBaseElement, setSuperClass} from '#preact/amp-base-element';
+
 import {Services} from '#service';
 
 import {createCustomEvent} from '#utils/event-helper';
 import {userAssert} from '#utils/log';
 
-import {BaseElement} from './base-element';
-
 import {CSS} from '../../../build/amp-accordion-1.0.css';
 
 /** @const {string} */
 const TAG = 'amp-accordion';
 
 /** @extends {PreactBaseElement<BentoAccordionDef.AccordionApi>} */
-class AmpAccordion extends BaseElement {
+class AmpAccordion extends setSuperClass(BaseElement, AmpPreactBaseElement) {
   /** @override */
   init() {
     this.registerApiAction('toggle', (api, invocation) =>
@@ -43,7 +45,7 @@ class AmpAccordion extends BaseElement {
       section,
       eventName,
       event,
-      ActionTrust.HIGH
+      ActionTrust_Enum.HIGH
     );
 
     super.triggerEvent(section, eventName, detail);
diff --git a/extensions/amp-accordion/1.0/base-element.js b/extensions/amp-accordion/1.0/base-element.js
deleted file mode 100644
index b1663ed1ee33..000000000000
--- a/extensions/amp-accordion/1.0/base-element.js
+++ /dev/null
@@ -1,221 +0,0 @@
-import {devAssert} from '#core/assert';
-import {toggleAttribute} from '#core/dom';
-import {childElementsByTag} from '#core/dom/query';
-import {toArray} from '#core/types/array';
-import {dict, memo} from '#core/types/object';
-
-import * as Preact from '#preact';
-import {useLayoutEffect, useRef} from '#preact';
-import {PreactBaseElement} from '#preact/base-element';
-import {forwardRef} from '#preact/compat';
-import {useDOMHandle} from '#preact/component';
-import {useSlotContext} from '#preact/slot';
-
-import {
-  BentoAccordion,
-  BentoAccordionContent,
-  BentoAccordionHeader,
-  BentoAccordionSection,
-} from './component';
-
-const HEADER_SHIM_PROP = '__AMP_H_SHIM';
-const CONTENT_SHIM_PROP = '__AMP_C_SHIM';
-const SECTION_POST_RENDER = '__AMP_PR';
-const EXPAND_STATE_SHIM_PROP = '__AMP_EXPAND_STATE_SHIM';
-
-/** @extends {PreactBaseElement<BentoAccordionDef.AccordionApi>} */
-export class BaseElement extends PreactBaseElement {
-  /** @override */
-  init() {
-    const getExpandStateTrigger = (section) => (expanded) => {
-      toggleAttribute(section, 'expanded', expanded);
-      section[SECTION_POST_RENDER]?.();
-      this.triggerEvent(section, expanded ? 'expand' : 'collapse');
-    };
-
-    const {element} = this;
-    const mu = new MutationObserver(() => {
-      this.mutateProps(getState(element, mu, getExpandStateTrigger));
-    });
-    mu.observe(element, {
-      attributeFilter: ['expanded', 'id'],
-      subtree: true,
-      childList: true,
-    });
-
-    const {'children': children} = getState(element, mu, getExpandStateTrigger);
-    return dict({
-      'children': children,
-    });
-  }
-}
-
-/**
- * @param {!Element} element
- * @param {MutationObserver} mu
- * @param {!Function} getExpandStateTrigger
- * @return {!JsonObject}
- */
-function getState(element, mu, getExpandStateTrigger) {
-  const sections = toArray(childElementsByTag(element, 'section'));
-
-  const children = sections.map((section) => {
-    // TODO(wg-bento): This implementation causes infinite loops on DOM mutation.
-    // See https://github.com/ampproject/amp-react-prototype/issues/40.
-    if (!section[SECTION_POST_RENDER]) {
-      section[SECTION_POST_RENDER] = () => mu.takeRecords();
-    }
-
-    const headerShim = memo(section, HEADER_SHIM_PROP, bindHeaderShimToElement);
-    const contentShim = memo(
-      section,
-      CONTENT_SHIM_PROP,
-      bindContentShimToElement
-    );
-    const expandStateShim = memo(
-      section,
-      EXPAND_STATE_SHIM_PROP,
-      getExpandStateTrigger
-    );
-    const sectionProps = dict({
-      'key': section,
-      'expanded': section.hasAttribute('expanded'),
-      'id': section.getAttribute('id'),
-      'onExpandStateChange': expandStateShim,
-    });
-    // For headerProps and contentProps:
-    // || undefined needed for the `role` attribute since an element w/o
-    // role results in `null`.  When `null` is passed into Preact, the
-    // default prop value is not used.  `undefined` triggers default prop
-    // value.  This is not needed for `id` since this is handled with
-    // explicit logic (not default prop value) and all falsy values are
-    // handled the same.
-    const headerProps = dict({
-      'as': headerShim,
-      'id': section.firstElementChild.getAttribute('id'),
-      'role': section.firstElementChild.getAttribute('role') || undefined,
-    });
-    const contentProps = dict({
-      'as': contentShim,
-      'id': section.lastElementChild.getAttribute('id'),
-      'role': section.lastElementChild.getAttribute('role') || undefined,
-    });
-    return (
-      <BentoAccordionSection {...sectionProps}>
-        <BentoAccordionHeader {...headerProps}></BentoAccordionHeader>
-        <BentoAccordionContent {...contentProps}></BentoAccordionContent>
-      </BentoAccordionSection>
-    );
-  });
-  return dict({'children': children});
-}
-
-/**
- * @param {!Element} sectionElement
- * @param {!BentoAccordionDef.HeaderShimProps} props
- * @return {PreactDef.Renderable}
- */
-function HeaderShim(
-  sectionElement,
-  {
-    'aria-controls': ariaControls,
-    'aria-expanded': ariaExpanded,
-    id,
-    onClick,
-    role,
-  }
-) {
-  const headerElement = sectionElement.firstElementChild;
-  useLayoutEffect(() => {
-    if (!headerElement || !onClick) {
-      return;
-    }
-    headerElement.setAttribute('id', id);
-    headerElement.classList.add('i-amphtml-accordion-header');
-    headerElement.addEventListener('click', onClick);
-    if (!headerElement.hasAttribute('tabindex')) {
-      headerElement.setAttribute('tabindex', 0);
-    }
-    headerElement.setAttribute('aria-expanded', ariaExpanded);
-    headerElement.setAttribute('aria-controls', ariaControls);
-    headerElement.setAttribute('role', role);
-    if (sectionElement[SECTION_POST_RENDER]) {
-      sectionElement[SECTION_POST_RENDER]();
-    }
-    return () => {
-      headerElement.removeEventListener('click', devAssert(onClick));
-    };
-  }, [
-    sectionElement,
-    headerElement,
-    id,
-    role,
-    onClick,
-    ariaControls,
-    ariaExpanded,
-  ]);
-  return <header />;
-}
-
-/**
- * @param {!Element} element
- * @return {function(!BentoAccordionDef.HeaderProps):PreactDef.Renderable}
- */
-const bindHeaderShimToElement = (element) => HeaderShim.bind(null, element);
-
-/**
- * @param {!Element} sectionElement
- * @param {!BentoAccordionDef.ContentShimProps} props
- * @param {{current: ?}} ref
- * @return {PreactDef.Renderable}
- */
-function ContentShimWithRef(
-  sectionElement,
-  {'aria-labelledby': ariaLabelledBy, id, role},
-  ref
-) {
-  const contentElement = sectionElement.lastElementChild;
-  const contentRef = useRef();
-  contentRef.current = contentElement;
-  useSlotContext(contentRef);
-  useDOMHandle(ref, contentElement);
-  useLayoutEffect(() => {
-    if (!contentElement) {
-      return;
-    }
-    contentElement.classList.add('i-amphtml-accordion-content');
-    contentElement.setAttribute('id', id);
-    contentElement.setAttribute('role', role);
-    contentElement.setAttribute('aria-labelledby', ariaLabelledBy);
-    if (sectionElement[SECTION_POST_RENDER]) {
-      sectionElement[SECTION_POST_RENDER]();
-    }
-  }, [sectionElement, contentElement, id, role, ariaLabelledBy]);
-  return <div />;
-}
-
-/**
- * @param {!Element} element
- * @return {function(!BentoAccordionDef.ContentProps):PreactDef.Renderable}
- */
-const bindContentShimToElement = (element) =>
-  forwardRef(
-    /** @type {function(?, {current:?}):PreactDef.Renderable} */ (
-      ContentShimWithRef.bind(null, element)
-    )
-  );
-
-/** @override */
-BaseElement['Component'] = BentoAccordion;
-
-/** @override */
-BaseElement['detached'] = true;
-
-/** @override */
-BaseElement['props'] = {
-  'animate': {attr: 'animate', type: 'boolean', media: true},
-  'expandSingleSection': {
-    attr: 'expand-single-section',
-    type: 'boolean',
-  },
-};
diff --git a/extensions/amp-accordion/1.0/component.js b/extensions/amp-accordion/1.0/component.js
deleted file mode 100644
index 50f5d2dfc6b1..000000000000
--- a/extensions/amp-accordion/1.0/component.js
+++ /dev/null
@@ -1,430 +0,0 @@
-import objstr from 'obj-str';
-
-import {
-  randomIdGenerator,
-  sequentialIdGenerator,
-} from '#core/data-structures/id-generator';
-import {omit} from '#core/types/object';
-
-import * as Preact from '#preact';
-import {
-  useCallback,
-  useContext,
-  useEffect,
-  useImperativeHandle,
-  useLayoutEffect,
-  useMemo,
-  useRef,
-  useState,
-} from '#preact';
-import {forwardRef} from '#preact/compat';
-import {WithAmpContext} from '#preact/context';
-
-import {animateCollapse, animateExpand} from './animations';
-import {useStyles} from './component.jss';
-
-const AccordionContext = Preact.createContext(
-  /** @type {BentoAccordionDef.AccordionContext} */ ({})
-);
-
-const SectionContext = Preact.createContext(
-  /** @type {BentoAccordionDef.SectionContext} */ ({})
-);
-
-/** @type {!Object<string, boolean>} */
-const EMPTY_EXPANDED_MAP = {};
-
-/** @type {!Object<string, function(boolean):undefined|undefined>} */
-const EMPTY_EVENT_MAP = {};
-
-const generateSectionId = sequentialIdGenerator();
-const generateRandomId = randomIdGenerator(100000);
-
-/**
- * @param {!BentoAccordionDef.BentoAccordionProps} props
- * @param {{current: ?BentoAccordionDef.AccordionApi}} ref
- * @return {PreactDef.Renderable}
- */
-function BentoAccordionWithRef(
-  {
-    animate = false,
-    as: Comp = 'section',
-    children,
-    expandSingleSection = false,
-    id,
-    ...rest
-  },
-  ref
-) {
-  const [expandedMap, setExpandedMap] = useState(EMPTY_EXPANDED_MAP);
-  const eventMapRef = useRef(EMPTY_EVENT_MAP);
-  const [randomPrefix] = useState(generateRandomId);
-  const prefix = id || `a${randomPrefix}`;
-
-  useEffect(() => {
-    if (!expandSingleSection) {
-      return;
-    }
-    setExpandedMap((expandedMap) => {
-      const newExpandedMap = {};
-      let expanded = 0;
-      for (const k in expandedMap) {
-        newExpandedMap[k] = expandedMap[k] && expanded++ == 0;
-      }
-      return newExpandedMap;
-    });
-  }, [expandSingleSection]);
-
-  const registerSection = useCallback(
-    (id, defaultExpanded, {current: onExpandStateChange}) => {
-      setExpandedMap((expandedMap) => {
-        return setExpanded(
-          id,
-          defaultExpanded,
-          expandedMap,
-          expandSingleSection
-        );
-      });
-      eventMapRef.current = {...eventMapRef.current, [id]: onExpandStateChange};
-      return () => {
-        setExpandedMap((expandedMap) => omit(expandedMap, id));
-        eventMapRef.current = omit(
-          /** @type {!Object} */ (eventMapRef.current),
-          id
-        );
-      };
-    },
-    [expandSingleSection]
-  );
-
-  const toggleExpanded = useCallback(
-    (id, opt_expand) => {
-      setExpandedMap((expandedMap) => {
-        const newExpanded = opt_expand ?? !expandedMap[id];
-        const newExpandedMap = setExpanded(
-          id,
-          newExpanded,
-          expandedMap,
-          expandSingleSection
-        );
-
-        // Schedule a single microtask to fire events for
-        // all changed sections (order not defined)
-        Promise.resolve().then(() => {
-          for (const k in expandedMap) {
-            const onExpandStateChange = eventMapRef.current[k];
-            if (onExpandStateChange && expandedMap[k] != newExpandedMap[k]) {
-              onExpandStateChange(newExpandedMap[k]);
-            }
-          }
-        });
-        return newExpandedMap;
-      });
-    },
-    [expandSingleSection]
-  );
-
-  const isExpanded = useCallback(
-    (id, defaultExpanded) => expandedMap[id] ?? defaultExpanded,
-    [expandedMap]
-  );
-
-  const toggle = useCallback(
-    (id) => {
-      if (id) {
-        if (id in expandedMap) {
-          toggleExpanded(id);
-        }
-      } else {
-        // Toggle all should do nothing when expandSingleSection is true
-        if (!expandSingleSection) {
-          for (const k in expandedMap) {
-            toggleExpanded(k);
-          }
-        }
-      }
-    },
-    [expandedMap, toggleExpanded, expandSingleSection]
-  );
-
-  const expand = useCallback(
-    (id) => {
-      if (id) {
-        if (!isExpanded(id, true)) {
-          toggleExpanded(id);
-        }
-      } else {
-        // Expand all should do nothing when expandSingleSection is true
-        if (!expandSingleSection) {
-          for (const k in expandedMap) {
-            if (!isExpanded(k, true)) {
-              toggleExpanded(k);
-            }
-          }
-        }
-      }
-    },
-    [expandedMap, toggleExpanded, isExpanded, expandSingleSection]
-  );
-
-  const collapse = useCallback(
-    (id) => {
-      if (id) {
-        if (isExpanded(id, false)) {
-          toggleExpanded(id);
-        }
-      } else {
-        for (const k in expandedMap) {
-          if (isExpanded(k, false)) {
-            toggleExpanded(k);
-          }
-        }
-      }
-    },
-    [expandedMap, toggleExpanded, isExpanded]
-  );
-
-  useImperativeHandle(
-    ref,
-    () =>
-      /** @type {!BentoAccordionDef.AccordionApi} */ ({
-        toggle,
-        expand,
-        collapse,
-      }),
-    [toggle, collapse, expand]
-  );
-
-  const context = useMemo(
-    () =>
-      /** @type {!BentoAccordionDef.AccordionContext} */ ({
-        registerSection,
-        toggleExpanded,
-        isExpanded,
-        animate,
-        prefix,
-      }),
-    [registerSection, toggleExpanded, isExpanded, animate, prefix]
-  );
-
-  return (
-    <Comp id={id} {...rest}>
-      <AccordionContext.Provider value={context}>
-        {children}
-      </AccordionContext.Provider>
-    </Comp>
-  );
-}
-
-const BentoAccordion = forwardRef(BentoAccordionWithRef);
-BentoAccordion.displayName = 'Accordion'; // Make findable for tests.
-export {BentoAccordion};
-
-/**
- * @param {string} id
- * @param {boolean} value
- * @param {!Object<string, boolean>} expandedMap
- * @param {boolean} expandSingleSection
- * @return {!Object<string, boolean>}
- */
-function setExpanded(id, value, expandedMap, expandSingleSection) {
-  let newExpandedMap;
-  if (expandSingleSection && value) {
-    newExpandedMap = {[id]: value};
-    for (const k in expandedMap) {
-      if (k != id) {
-        newExpandedMap[k] = false;
-      }
-    }
-  } else {
-    newExpandedMap = {...expandedMap, [id]: value};
-  }
-  return newExpandedMap;
-}
-
-/**
- * @param {!BentoAccordionDef.BentoAccordionSectionProps} props
- * @return {PreactDef.Renderable}
- */
-export function BentoAccordionSection({
-  animate: defaultAnimate = false,
-  as: Comp = 'section',
-  children,
-  expanded: defaultExpanded = false,
-  id: propId,
-  onExpandStateChange,
-  ...rest
-}) {
-  const [genId] = useState(generateSectionId);
-  const id = propId || genId;
-  const [suffix] = useState(generateRandomId);
-  const [expandedState, setExpandedState] = useState(defaultExpanded);
-  const [contentIdState, setContentIdState] = useState(null);
-  const [headerIdState, setHeaderIdState] = useState(null);
-
-  const {
-    animate: contextAnimate,
-    isExpanded,
-    prefix,
-    registerSection,
-    toggleExpanded,
-  } = useContext(AccordionContext);
-
-  const expanded = isExpanded ? isExpanded(id, defaultExpanded) : expandedState;
-  const animate = contextAnimate ?? defaultAnimate;
-  const contentId =
-    contentIdState || `${prefix || 'a'}-content-${id}-${suffix}`;
-  const headerId = headerIdState || `${prefix || 'a'}-header-${id}-${suffix}`;
-
-  // Storing this state change callback in a ref because this may change
-  // frequently and we do not want to trigger a re-register of the section
-  // each time  the callback is updated
-  const onExpandStateChangeRef = useRef(
-    /** @type {?function(boolean):undefined|undefined} */ (null)
-  );
-  onExpandStateChangeRef.current = onExpandStateChange;
-  useLayoutEffect(() => {
-    if (registerSection) {
-      return registerSection(id, defaultExpanded, onExpandStateChangeRef);
-    }
-  }, [registerSection, id, defaultExpanded]);
-
-  const toggleHandler = useCallback(
-    (opt_expand) => {
-      if (toggleExpanded) {
-        toggleExpanded(id, opt_expand);
-      } else {
-        setExpandedState((prev) => {
-          const newValue = opt_expand ?? !prev;
-          Promise.resolve().then(() => {
-            const onExpandStateChange = onExpandStateChangeRef.current;
-            if (onExpandStateChange) {
-              onExpandStateChange(newValue);
-            }
-          });
-          return newValue;
-        });
-      }
-    },
-    [id, toggleExpanded]
-  );
-
-  const context = useMemo(
-    () =>
-      /** @type {BentoAccordionDef.SectionContext} */ ({
-        animate,
-        contentId,
-        headerId,
-        expanded,
-        toggleHandler,
-        setContentId: setContentIdState,
-        setHeaderId: setHeaderIdState,
-      }),
-    [animate, contentId, headerId, expanded, toggleHandler]
-  );
-
-  return (
-    <Comp {...rest}>
-      <SectionContext.Provider value={context}>
-        {children}
-      </SectionContext.Provider>
-    </Comp>
-  );
-}
-
-/**
- * @param {!BentoAccordionDef.BentoAccordionHeaderProps} props
- * @return {PreactDef.Renderable}
- */
-export function BentoAccordionHeader({
-  as: Comp = 'div',
-  children,
-  'class': className = '',
-  id,
-  role = 'button',
-  tabIndex = 0,
-  ...rest
-}) {
-  const {contentId, expanded, headerId, setHeaderId, toggleHandler} =
-    useContext(SectionContext);
-  const classes = useStyles();
-
-  useLayoutEffect(() => {
-    if (setHeaderId) {
-      setHeaderId(id);
-    }
-  }, [setHeaderId, id]);
-
-  return (
-    <Comp
-      {...rest}
-      id={headerId}
-      role={role}
-      class={`${className} ${classes.sectionChild} ${classes.header}`}
-      tabIndex={tabIndex}
-      aria-controls={contentId}
-      onClick={() => toggleHandler()}
-      aria-expanded={String(expanded)}
-    >
-      {children}
-    </Comp>
-  );
-}
-
-/**
- * @param {!BentoAccordionDef.BentoAccordionContentProps} props
- * @return {PreactDef.Renderable}
- */
-export function BentoAccordionContent({
-  as: Comp = 'div',
-  children,
-  'class': className = '',
-  id,
-  role = 'region',
-  ...rest
-}) {
-  const ref = useRef(null);
-  const hasMountedRef = useRef(false);
-  const {animate, contentId, expanded, headerId, setContentId} =
-    useContext(SectionContext);
-  const classes = useStyles();
-
-  useEffect(() => {
-    hasMountedRef.current = true;
-    return () => (hasMountedRef.current = false);
-  }, []);
-
-  useLayoutEffect(() => {
-    if (setContentId) {
-      setContentId(id);
-    }
-  }, [setContentId, id]);
-
-  useLayoutEffect(() => {
-    const hasMounted = hasMountedRef.current;
-    const content = ref.current;
-    if (!animate || !hasMounted || !content || !content.animate) {
-      return;
-    }
-    return expanded ? animateExpand(content) : animateCollapse(content);
-  }, [expanded, animate]);
-
-  return (
-    <WithAmpContext renderable={expanded}>
-      <Comp
-        {...rest}
-        ref={ref}
-        class={objstr({
-          [className]: true,
-          [classes.sectionChild]: true,
-          [classes.contentHidden]: !expanded,
-        })}
-        id={contentId}
-        aria-labelledby={headerId}
-        role={role}
-      >
-        {children}
-      </Comp>
-    </WithAmpContext>
-  );
-}
diff --git a/extensions/amp-accordion/1.0/component.type.js b/extensions/amp-accordion/1.0/component.type.js
deleted file mode 100644
index 0e583f10a5dc..000000000000
--- a/extensions/amp-accordion/1.0/component.type.js
+++ /dev/null
@@ -1,118 +0,0 @@
-/** @externs */
-
-/** @const */
-var BentoAccordionDef = {};
-
-/**
- * @typedef {{
- *   as: (string|PreactDef.FunctionalComponent|undefined),
- *   expandSingleSection: (boolean|undefined),
- *   animate: (boolean|undefined),
- *   id: (string|undefined),
- *   children: (?PreactDef.Renderable|undefined),
- * }}
- */
-BentoAccordionDef.BentoAccordionProps;
-
-/**
- * @typedef {{
- *   as: (string|PreactDef.FunctionalComponent|undefined),
- *   expanded: (boolean|undefined),
- *   animate: (boolean|undefined),
- *   id: (string|undefined),
- *   children: (?PreactDef.Renderable|undefined),
- *   onExpandStateChange: (function(boolean):undefined|undefined),
- * }}
- */
-BentoAccordionDef.BentoAccordionSectionProps;
-
-/**
- * @typedef {{
- *   as: (string|PreactDef.FunctionalComponent|undefined),
- *   role: (string|undefined),
- *   class: (string|undefined),
- *   tabIndex: (number|string|undefined),
- *   id: (string|undefined),
- *   children: (?PreactDef.Renderable|undefined),
- * }}
- */
-BentoAccordionDef.BentoAccordionHeaderProps;
-
-/**
- * @typedef {{
- *   as: (string|PreactDef.FunctionalComponent|undefined),
- *   role: (string|undefined),
- *   class: (string|undefined),
- *   id: (string|undefined),
- *   children: (?PreactDef.Renderable|undefined),
- * }}
- */
-BentoAccordionDef.BentoAccordionContentProps;
-
-/**
- * This is not a public API, it exists to define properties for reference
- * that are used in the HeaderShim defined in amp-accordion
- * @typedef {{
- *   id: (string),
- *   role: (string),
- *   onClick: (function()|undefined),
- *   aria-controls: (string),
- *   aria-expanded: (string),
- *   children: (?PreactDef.Renderable|undefined),
- * }}
- */
-BentoAccordionDef.HeaderShimProps;
-
-/**
- * This is not a public API, it exists to define properties for reference
- * that are used in the ContentShim defined in amp-accordion
- * @typedef {{
- *   id: (string),
- *   role: (string),
- *   aria-labelledby: (string),
- *   children: (?PreactDef.Renderable|undefined),
- * }}
- */
-BentoAccordionDef.ContentShimProps;
-
-/**
- * @typedef {{
- *   registerSection: (function(string)|undefined),
- *   isExpanded: (function(string, boolean):boolean),
- *   toggleExpanded: (function(string)|undefined),
- *   animate: (boolean|undefined),
- *   prefix: (string),
- * }}
- */
-BentoAccordionDef.AccordionContext;
-
-/**
- * @typedef {{
- *   animate: (boolean),
- *   contentId: (string),
- *   headerId: (string),
- *   expanded: (boolean),
- *   expandHandler: (function()),
- *   setContentId: (function(string)),
- *   setHeaderId: (function(string)),
- * }}
- */
-BentoAccordionDef.SectionContext;
-
-/** @interface */
-BentoAccordionDef.BentoAccordionApi = class {
-  /**
-   * @param {string|undefined} section
-   */
-  toggle(section) {}
-
-  /**
-   * @param {string|undefined} section
-   */
-  expand(section) {}
-
-  /**
-   * @param {string|undefined} section
-   */
-  collapse(section) {}
-};
diff --git a/extensions/amp-accordion/1.0/example/index.html b/extensions/amp-accordion/1.0/example/index.html
new file mode 100644
index 000000000000..eb01f123d799
--- /dev/null
+++ b/extensions/amp-accordion/1.0/example/index.html
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width" />
+    <script src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      async
+      src="https://cdn.ampproject.org/v0/bento-accordion-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-accordion-1.0.css"
+    />
+    <style>
+      body {
+        font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
+          Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
+          'Segoe UI Symbol';
+        background: #ecf1f3;
+      }
+      .my-accordion > section {
+        border-radius: 0.5rem;
+        margin: 1rem;
+        background: white;
+        background-repeat: no-repeat;
+        background-position: right 1rem top 1rem;
+      }
+      .my-accordion h2 {
+        background: white;
+        padding: 2rem;
+        border: none;
+        background: none;
+      }
+      .my-accordion div {
+        padding: 2rem;
+        padding-top: 0;
+      }
+      .my-accordion section[expanded] {
+        background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' height='48px' viewBox='0 0 24 24' width='48px' fill='%23000000'%3E%3Cpath d='M0 0h24v24H0V0z' fill='none'/%3E%3Cpath d='M12 8l-6 6 1.41 1.41L12 10.83l4.59 4.58L18 14l-6-6z'/%3E%3C/svg%3E%0A");
+      }
+
+      .my-accordion section:not([expanded]) {
+        background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' height='48px' viewBox='0 0 24 24' width='48px' fill='%23000000'%3E%3Cpath d='M24 24H0V0h24v24z' fill='none' opacity='.87'/%3E%3Cpath d='M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6-1.41-1.41z'/%3E%3C/svg%3E%0A");
+      }
+    </style>
+  </head>
+  <body>
+    <bento-accordion id="my-accordion" class="my-accordion">
+      <section>
+        <h2>Section 1</h2>
+        <div>Content in section 1.</div>
+      </section>
+      <section>
+        <h2>Section 2</h2>
+        <div>Content in section 2.</div>
+      </section>
+      <section expanded>
+        <h2>Section 3</h2>
+        <div>Content in section 3.</div>
+      </section>
+    </bento-accordion>
+  </body>
+</html>
diff --git a/extensions/amp-accordion/1.0/storybook/Basic.js b/extensions/amp-accordion/1.0/storybook/Basic.js
index fac6b796839f..527a44d41124 100644
--- a/extensions/amp-accordion/1.0/storybook/Basic.js
+++ b/extensions/amp-accordion/1.0/storybook/Basic.js
@@ -1,11 +1,13 @@
-import * as Preact from '#preact';
-
 import {
   BentoAccordion,
   BentoAccordionContent,
   BentoAccordionHeader,
   BentoAccordionSection,
-} from '../component';
+} from '#bento/components/bento-accordion/1.0/component';
+
+import * as Preact from '#preact';
+
+import '#bento/components/bento-accordion/1.0/component.jss';
 
 export default {
   title: 'Accordion',
diff --git a/extensions/amp-accordion/1.0/test-e2e/e2e-fixture.js b/extensions/amp-accordion/1.0/test-e2e/e2e-fixture.js
new file mode 100644
index 000000000000..0d9011cb3bd1
--- /dev/null
+++ b/extensions/amp-accordion/1.0/test-e2e/e2e-fixture.js
@@ -0,0 +1,11 @@
+import {getDefaultArgs} from '#bento/util/e2e-helpers';
+
+import * as Preact from '#preact';
+import {render} from '#preact';
+
+import config, {_default as App} from '../storybook/Basic';
+
+render(
+  <App {...getDefaultArgs(config, App)} />,
+  document.querySelector('#bento')
+);
diff --git a/extensions/amp-accordion/1.0/test/test-amp-accordion.js b/extensions/amp-accordion/1.0/test/test-amp-accordion.js
index 85555dd7f61f..efe74656ab77 100644
--- a/extensions/amp-accordion/1.0/test/test-amp-accordion.js
+++ b/extensions/amp-accordion/1.0/test/test-amp-accordion.js
@@ -1,12 +1,9 @@
 import '../amp-accordion';
-import {ActionTrust} from '#core/constants/action-constants';
-import {subscribe, unsubscribe} from '#core/context';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
 import {htmlFor} from '#core/dom/static-template';
 
 import {toggleExperiment} from '#experiments';
 
-import {CanRender} from '#preact/contextprops';
-
 import {ActionInvocation} from '#service/action-impl';
 
 import {waitFor} from '#testing/helpers/service';
@@ -30,16 +27,6 @@ describes.realWin(
       await waitFor(isExpandedOrNot, 'element expanded updated');
     }
 
-    function readContextProp(element, prop) {
-      return new Promise((resolve) => {
-        const handler = (value) => {
-          resolve(value);
-          unsubscribe(element, [prop], handler);
-        };
-        subscribe(element, [prop], handler);
-      });
-    }
-
     beforeEach(async () => {
       win = env.win;
       html = htmlFor(win.document);
@@ -64,327 +51,6 @@ describes.realWin(
       await element.buildInternal();
     });
 
-    it('should render expanded and collapsed sections', () => {
-      const sections = element.children;
-      expect(sections[0]).to.have.attribute('expanded');
-      expect(
-        sections[0].firstElementChild.getAttribute('aria-expanded')
-      ).to.equal('true');
-      expect(sections[0].lastElementChild).to.have.display('block');
-
-      expect(sections[1]).to.not.have.attribute('expanded');
-      expect(
-        sections[1].firstElementChild.getAttribute('aria-expanded')
-      ).to.equal('false');
-      expect(sections[1].lastElementChild).to.have.display('none');
-
-      expect(sections[2]).to.not.have.attribute('expanded');
-      expect(
-        sections[2].firstElementChild.getAttribute('aria-expanded')
-      ).to.equal('false');
-      expect(sections[2].lastElementChild).to.have.display('none');
-    });
-
-    it('should propagate renderable context', async () => {
-      const sections = element.children;
-      const renderables = await Promise.all([
-        readContextProp(sections[0].lastElementChild, CanRender),
-        readContextProp(sections[1].lastElementChild, CanRender),
-        readContextProp(sections[2].lastElementChild, CanRender),
-      ]);
-      expect(renderables[0]).to.be.true;
-      expect(renderables[1]).to.be.false;
-      expect(renderables[2]).to.be.false;
-    });
-
-    it('should have amp specific classes for CSS', () => {
-      const sections = element.children;
-      const {firstElementChild: header0, lastElementChild: content0} =
-        sections[0];
-      const {firstElementChild: header1, lastElementChild: content1} =
-        sections[1];
-      const {firstElementChild: header2, lastElementChild: content2} =
-        sections[2];
-
-      // Check classes
-      expect(header0.className).to.include('i-amphtml-accordion-header');
-      expect(header1.className).to.include('i-amphtml-accordion-header');
-      expect(header2.className).to.include('i-amphtml-accordion-header');
-      expect(content0.className).to.include('i-amphtml-accordion-content');
-      expect(content1.className).to.include('i-amphtml-accordion-content');
-      expect(content2.className).to.include('i-amphtml-accordion-content');
-
-      // Check computed styles
-      expect(win.getComputedStyle(header0).margin).to.equal('0px');
-      expect(win.getComputedStyle(header0).cursor).to.equal('pointer');
-      expect(win.getComputedStyle(header0).backgroundColor).to.equal(
-        'rgb(239, 239, 239)'
-      );
-      expect(win.getComputedStyle(header0).paddingRight).to.equal('20px');
-      expect(win.getComputedStyle(header0).border).to.equal(
-        '1px solid rgb(223, 223, 223)'
-      );
-
-      expect(win.getComputedStyle(header1).margin).to.equal('0px');
-      expect(win.getComputedStyle(header1).cursor).to.equal('pointer');
-      expect(win.getComputedStyle(header1).backgroundColor).to.equal(
-        'rgb(239, 239, 239)'
-      );
-      expect(win.getComputedStyle(header1).paddingRight).to.equal('20px');
-      expect(win.getComputedStyle(header1).border).to.equal(
-        '1px solid rgb(223, 223, 223)'
-      );
-
-      expect(win.getComputedStyle(header2).margin).to.equal('0px');
-      expect(win.getComputedStyle(header2).cursor).to.equal('pointer');
-      expect(win.getComputedStyle(header2).backgroundColor).to.equal(
-        'rgb(239, 239, 239)'
-      );
-      expect(win.getComputedStyle(header2).paddingRight).to.equal('20px');
-      expect(win.getComputedStyle(header2).border).to.equal(
-        '1px solid rgb(223, 223, 223)'
-      );
-
-      expect(win.getComputedStyle(content0).margin).to.equal('0px');
-      expect(win.getComputedStyle(content1).margin).to.equal('0px');
-      expect(win.getComputedStyle(content2).margin).to.equal('0px');
-    });
-
-    it('should expand and collapse on click', async () => {
-      const sections = element.children;
-
-      sections[1].firstElementChild.click();
-      await waitForExpanded(sections[1], true);
-
-      expect(sections[0]).to.have.attribute('expanded');
-      expect(sections[0].lastElementChild).to.have.display('block');
-
-      expect(sections[1]).to.have.attribute('expanded');
-      expect(sections[1].lastElementChild).to.have.display('block');
-
-      expect(sections[2]).to.not.have.attribute('expanded');
-      expect(sections[2].lastElementChild).to.have.display('none');
-
-      sections[0].firstElementChild.click();
-      await waitForExpanded(sections[0], false);
-
-      expect(sections[0]).to.not.have.attribute('expanded');
-      expect(sections[0].lastElementChild).to.have.display('none');
-
-      expect(sections[1]).to.have.attribute('expanded');
-      expect(sections[1].lastElementChild).to.have.display('block');
-
-      expect(sections[2]).to.not.have.attribute('expanded');
-      expect(sections[2].lastElementChild).to.have.display('none');
-    });
-
-    it('should switch expand-single-section value', async () => {
-      const sections = element.children;
-      sections[1].firstElementChild.click();
-      await waitForExpanded(sections[1], true);
-
-      const getExpandedCount = () =>
-        element.querySelectorAll('[aria-expanded="true"]').length;
-      expect(getExpandedCount()).to.equal(2);
-
-      element.setAttribute('expand-single-section', '');
-      await waitFor(
-        () => getExpandedCount() == 1,
-        'only one element stays expanded'
-      );
-    });
-
-    it('should expand and collapse on attribute change', async () => {
-      const sections = element.children;
-
-      sections[1].setAttribute('expanded', '');
-      await waitForExpanded(sections[1], true);
-
-      expect(sections[0]).to.have.attribute('expanded');
-      expect(sections[0].lastElementChild).to.have.display('block');
-
-      expect(sections[1]).to.have.attribute('expanded');
-      expect(sections[1].lastElementChild).to.have.display('block');
-
-      expect(sections[2]).to.not.have.attribute('expanded');
-      expect(sections[2].lastElementChild).to.have.display('none');
-
-      sections[0].removeAttribute('expanded');
-      await waitForExpanded(sections[0], false);
-
-      expect(sections[0]).to.not.have.attribute('expanded');
-      expect(sections[0].lastElementChild).to.have.display('none');
-
-      expect(sections[1]).to.have.attribute('expanded');
-      expect(sections[1].lastElementChild).to.have.display('block');
-
-      expect(sections[2]).to.not.have.attribute('expanded');
-      expect(sections[2].lastElementChild).to.have.display('none');
-    });
-
-    it('should include a11y related attributes', async () => {
-      const sections = element.children;
-
-      const {firstElementChild: header0, lastElementChild: content0} =
-        sections[0];
-      const {firstElementChild: header1, lastElementChild: content1} =
-        sections[1];
-      const {firstElementChild: header2, lastElementChild: content2} =
-        sections[2];
-
-      expect(header0).to.have.attribute('tabindex');
-      expect(header0).to.have.attribute('aria-controls');
-      expect(header0).to.have.attribute('role');
-      expect(header0).to.have.attribute('aria-expanded');
-      expect(header0).to.have.attribute('id');
-      expect(header0.getAttribute('aria-expanded')).to.equal('true');
-      expect(content0).to.have.attribute('id');
-      expect(content0).to.have.attribute('aria-labelledby');
-      expect(content0).to.have.attribute('role');
-      expect(header0.getAttribute('aria-controls')).to.equal(
-        content0.getAttribute('id')
-      );
-      expect(header0.getAttribute('id')).to.equal(
-        content0.getAttribute('aria-labelledby')
-      );
-
-      expect(header1).to.have.attribute('tabindex');
-      expect(header1).to.have.attribute('aria-controls');
-      expect(header1).to.have.attribute('role');
-      expect(header1).to.have.attribute('aria-expanded');
-      expect(header1).to.have.attribute('id');
-      expect(header1.getAttribute('aria-expanded')).to.equal('false');
-      expect(content1).to.have.attribute('id');
-      expect(content1).to.have.attribute('aria-labelledby');
-      expect(content1).to.have.attribute('role');
-      expect(header1.getAttribute('aria-controls')).to.equal(
-        content1.getAttribute('id')
-      );
-      expect(header1.getAttribute('id')).to.equal(
-        content1.getAttribute('aria-labelledby')
-      );
-
-      expect(header2).to.have.attribute('tabindex');
-      expect(header2).to.have.attribute('aria-controls');
-      expect(header2).to.have.attribute('role');
-      expect(header2).to.have.attribute('aria-expanded');
-      expect(header2).to.have.attribute('id');
-      expect(header2.getAttribute('aria-expanded')).to.equal('false');
-      expect(content2).to.have.attribute('id');
-      expect(content2).to.have.attribute('aria-labelledby');
-      expect(content2).to.have.attribute('role');
-      expect(header2.getAttribute('aria-controls')).to.equal(
-        content2.getAttribute('id')
-      );
-      expect(header2.getAttribute('id')).to.equal(
-        content2.getAttribute('aria-labelledby')
-      );
-    });
-
-    it('should not overwrite existing header and content ids', async () => {
-      element = html`
-        <amp-accordion layout="fixed" width="300" height="200">
-          <section expanded id="section1">
-            <h1 id="h1">header1</h1>
-            <div id="c1">content1</div>
-          </section>
-          <section>
-            <h1 id="h2">header2</h1>
-            <div>content2</div>
-          </section>
-          <section>
-            <h1>header3</h1>
-            <div id="c3">content3</div>
-          </section>
-        </amp-accordion>
-      `;
-      win.document.body.appendChild(element);
-      await element.buildInternal();
-
-      const sections = element.children;
-      const {firstElementChild: header0, lastElementChild: content0} =
-        sections[0];
-      const {firstElementChild: header1, lastElementChild: content1} =
-        sections[1];
-      const {firstElementChild: header2, lastElementChild: content2} =
-        sections[2];
-
-      expect(header0.getAttribute('id')).to.equal('h1');
-      expect(content0.getAttribute('id')).to.equal('c1');
-      expect(header0.getAttribute('aria-controls')).to.equal(
-        content0.getAttribute('id')
-      );
-      expect(header0.getAttribute('id')).to.equal(
-        content0.getAttribute('aria-labelledby')
-      );
-
-      expect(header1.getAttribute('id')).to.equal('h2');
-      expect(header1.getAttribute('aria-controls')).to.equal(
-        content1.getAttribute('id')
-      );
-      expect(header1.getAttribute('id')).to.equal(
-        content1.getAttribute('aria-labelledby')
-      );
-
-      expect(content2.getAttribute('id')).to.equal('c3');
-      expect(header2.getAttribute('aria-controls')).to.equal(
-        content2.getAttribute('id')
-      );
-      expect(header2.getAttribute('id')).to.equal(
-        content2.getAttribute('aria-labelledby')
-      );
-    });
-
-    it('should not overwrite existing role attributes', async () => {
-      element = html`
-        <amp-accordion layout="fixed" width="300" height="200">
-          <section expanded id="section1">
-            <h1 role="cat">header1</h1>
-            <div role="dog">content1</div>
-          </section>
-          <section>
-            <h1 id="h2">header2</h1>
-            <div>content2</div>
-          </section>
-        </amp-accordion>
-      `;
-      win.document.body.appendChild(element);
-      await element.buildInternal();
-
-      const sections = element.children;
-      const {firstElementChild: header0, lastElementChild: content0} =
-        sections[0];
-      const {firstElementChild: header1, lastElementChild: content1} =
-        sections[1];
-
-      expect(header0).to.have.attribute('role');
-      expect(header0.getAttribute('role')).to.equal('cat');
-      expect(content0).to.have.attribute('role');
-      expect(content0.getAttribute('role')).to.equal('dog');
-
-      expect(header1).to.have.attribute('role');
-      expect(header1.getAttribute('role')).to.equal('button');
-      expect(content1).to.have.attribute('role');
-      expect(content1.getAttribute('role')).to.equal('region');
-    });
-
-    it('should pick up new children', async () => {
-      const newSection = document.createElement('section');
-      newSection.setAttribute('expanded', '');
-      newSection.appendChild(document.createElement('h2'));
-      newSection.appendChild(document.createElement('div'));
-      element.appendChild(newSection);
-
-      await waitForExpanded(newSection, true);
-
-      expect(newSection.firstElementChild.className).to.include(
-        'i-amphtml-accordion-header'
-      );
-      expect(newSection.lastElementChild.className).to.include(
-        'i-amphtml-accordion-content'
-      );
-    });
-
     describe('fire events on expand and collapse', () => {
       beforeEach(async () => {
         element = html`
@@ -417,7 +83,7 @@ describes.realWin(
         const source = null;
         const caller = null;
         const event = null;
-        const trust = ActionTrust.DEFAULT;
+        const trust = ActionTrust_Enum.DEFAULT;
         return new ActionInvocation(
           element,
           method,
@@ -498,125 +164,6 @@ describes.realWin(
         expect(section2).to.not.have.attribute('expanded');
         expect(section3).to.have.attribute('expanded');
       });
-
-      it('should capture events in bento mode (w/o "on" attribute)', async () => {
-        const section1 = element.children[0];
-        const section3 = element.children[2];
-
-        // Set up section 1 to trigger expand of section 3 on expand
-        // and collapse of section 3 on collapse
-        const api = await element.getApi();
-        section1.addEventListener('expand', () => api.expand('section3'));
-        section1.addEventListener('collapse', () => api.collapse('section3'));
-
-        // initally both section 1 and 3 are collapsed
-        expect(section1).to.not.have.attribute('expanded');
-        expect(section3).to.not.have.attribute('expanded');
-
-        // expand section 1
-        section1.firstElementChild.click();
-        await waitForExpanded(section1, true);
-
-        // both section 1 and 3 are expanded
-        expect(section1).to.have.attribute('expanded');
-        expect(section3).to.have.attribute('expanded');
-
-        // collapse section 1
-        section1.firstElementChild.click();
-        await waitForExpanded(section1, false);
-
-        // both section 1 and 3 are collapsed
-        expect(section1).to.not.have.attribute('expanded');
-        expect(section3).to.not.have.attribute('expanded');
-      });
-
-      it('should fire and listen for "expand" and "collapse" events', async () => {
-        const section1 = element.children[0];
-
-        // Add spy functions for expand and collapse
-        const spyE = env.sandbox.spy();
-        const spyC = env.sandbox.spy();
-        section1.addEventListener('expand', spyE);
-        section1.addEventListener('collapse', spyC);
-
-        expect(spyE).to.not.be.called;
-        expect(spyC).to.not.be.called;
-
-        // expand section 1
-        section1.firstElementChild.click();
-        await waitForExpanded(section1, true);
-
-        expect(spyE).to.be.calledOnce;
-        expect(spyC).to.not.be.called;
-
-        // collapse section 1
-        section1.firstElementChild.click();
-        await waitForExpanded(section1, false);
-
-        expect(spyE).to.be.calledOnce;
-        expect(spyC).to.be.calledOnce;
-      });
-    });
-
-    describe('animate', () => {
-      let animateStub;
-
-      beforeEach(async () => {
-        animateStub = env.sandbox.stub(win.Element.prototype, 'animate');
-        element = html`
-          <amp-accordion animate layout="fixed" width="300" height="200">
-            <section expanded>
-              <h1>header1</h1>
-              <div>content1</div>
-            </section>
-            <section>
-              <h1>header2</h1>
-              <div>content2</div>
-            </section>
-          </amp-accordion>
-        `;
-        win.document.body.appendChild(element);
-        await element.buildInternal();
-      });
-
-      it('should not animate on build', () => {
-        expect(animateStub).to.not.be.called;
-      });
-
-      it('should animate expand', async () => {
-        const animation = {};
-        animateStub.returns(animation);
-        const sections = element.children;
-        const section = sections[1];
-
-        section.setAttribute('expanded', '');
-        await waitForExpanded(sections[1], true);
-
-        expect(animateStub).to.be.calledOnce;
-        animation.onfinish();
-
-        expect(section).to.have.attribute('expanded');
-        expect(section.lastElementChild).to.have.display('block');
-      });
-
-      it('should animate collapse', async () => {
-        const animation = {};
-        animateStub.returns(animation);
-        const sections = element.children;
-        const section = sections[0];
-
-        section.removeAttribute('expanded');
-        await waitFor(() => animateStub.callCount > 0, 'animation started');
-
-        expect(animateStub).to.be.calledOnce;
-        expect(section).to.not.have.attribute('expanded');
-        // Still displayed while animating.
-        expect(section.lastElementChild).to.have.display('block');
-
-        animation.onfinish();
-        await waitForExpanded(sections[0], false);
-        expect(section.lastElementChild).to.have.display('none');
-      });
     });
 
     describe('imperative api', () => {
@@ -634,7 +181,7 @@ describes.realWin(
         const source = null;
         const caller = null;
         const event = null;
-        const trust = ActionTrust.DEFAULT;
+        const trust = ActionTrust_Enum.DEFAULT;
         return new ActionInvocation(
           element,
           method,
diff --git a/extensions/amp-accordion/1.0/test/test-component.js b/extensions/amp-accordion/1.0/test/test-component.js
deleted file mode 100644
index 27a47299b6f1..000000000000
--- a/extensions/amp-accordion/1.0/test/test-component.js
+++ /dev/null
@@ -1,965 +0,0 @@
-import {mount} from 'enzyme';
-
-import * as Preact from '#preact';
-import {useAmpContext} from '#preact/context';
-
-import {waitFor} from '#testing/helpers/service';
-
-import {
-  BentoAccordion,
-  BentoAccordionContent,
-  BentoAccordionHeader,
-  BentoAccordionSection,
-} from '../component';
-
-const ContextReader = (props) => {
-  const {renderable} = useAmpContext();
-  return <div data-renderable={String(renderable)} {...props} />;
-};
-
-describes.sandboxed('Accordion preact component', {}, (env) => {
-  describe('standalone accordion section', () => {
-    it('should render a default section', () => {
-      const wrapper = mount(
-        <BentoAccordionSection>
-          <BentoAccordionHeader>
-            <h1>header1</h1>
-          </BentoAccordionHeader>
-          <BentoAccordionContent>content1</BentoAccordionContent>
-        </BentoAccordionSection>
-      );
-
-      const dom = wrapper.getDOMNode();
-      expect(dom.localName).to.equal('section');
-      expect(dom.children).to.have.lengthOf(2);
-
-      const header = dom.children[0];
-      expect(header.localName).to.equal('div');
-      expect(header.innerHTML).to.equal('<h1>header1</h1>');
-      expect(header.getAttribute('aria-expanded')).to.equal('false');
-
-      const content = dom.children[1];
-      expect(content.localName).to.equal('div');
-      expect(content.innerHTML).to.equal('content1');
-      expect(content.className.includes('content-hidden')).to.be.true;
-    });
-
-    it('should render an expanded section', () => {
-      const wrapper = mount(
-        <BentoAccordionSection expanded>
-          <BentoAccordionHeader>
-            <h1>header1</h1>
-          </BentoAccordionHeader>
-          <BentoAccordionContent>content1</BentoAccordionContent>
-        </BentoAccordionSection>
-      );
-
-      const dom = wrapper.getDOMNode();
-
-      const header = dom.children[0];
-      expect(header.localName).to.equal('div');
-      expect(header.innerHTML).to.equal('<h1>header1</h1>');
-      expect(header.getAttribute('aria-expanded')).to.equal('true');
-
-      const content = dom.children[1];
-      expect(content.localName).to.equal('div');
-      expect(content.innerHTML).to.equal('content1');
-      expect(content.className.includes('content-hidden')).to.be.false;
-    });
-
-    it('should toggle expanded state', () => {
-      const wrapper = mount(
-        <BentoAccordionSection>
-          <BentoAccordionHeader>
-            <h1>header1</h1>
-          </BentoAccordionHeader>
-          <BentoAccordionContent>content1</BentoAccordionContent>
-        </BentoAccordionSection>
-      );
-      const dom = wrapper.getDOMNode();
-      const header = dom.children[0];
-      const content = dom.children[1];
-
-      // Start unexpanded.
-      expect(header.getAttribute('aria-expanded')).to.equal('false');
-      expect(content.className.includes('content-hidden')).to.be.true;
-
-      // Click on header to expand.
-      wrapper.find('div').at(0).simulate('click');
-      expect(header.getAttribute('aria-expanded')).to.equal('true');
-      expect(content.className.includes('content-hidden')).to.be.false;
-
-      // Click on header again to collapse.
-      wrapper.find('div').at(0).simulate('click');
-      expect(header.getAttribute('aria-expanded')).to.equal('false');
-      expect(content.className.includes('content-hidden')).to.be.true;
-    });
-
-    it('should propagate renderable/playable context when expanded', () => {
-      const wrapper = mount(
-        <BentoAccordionSection expanded>
-          <BentoAccordionHeader>
-            <h1>header1</h1>
-          </BentoAccordionHeader>
-          <BentoAccordionContent>
-            <ContextReader id="content" />
-          </BentoAccordionContent>
-        </BentoAccordionSection>
-      );
-      const dom = wrapper.getDOMNode();
-      expect(
-        dom.querySelector('#content').getAttribute('data-renderable')
-      ).to.equal('true');
-    });
-
-    it('should propagate renderable/playable context when collapsed', () => {
-      const wrapper = mount(
-        <BentoAccordionSection>
-          <BentoAccordionHeader>
-            <h1>header1</h1>
-          </BentoAccordionHeader>
-          <BentoAccordionContent>
-            <ContextReader id="content" />
-          </BentoAccordionContent>
-        </BentoAccordionSection>
-      );
-      const dom = wrapper.getDOMNode();
-      expect(
-        dom.querySelector('#content').getAttribute('data-renderable')
-      ).to.equal('false');
-    });
-  });
-
-  describe('multi-expand accordion', () => {
-    let wrapper;
-
-    beforeEach(() => {
-      wrapper = mount(
-        <BentoAccordion>
-          <BentoAccordionSection key={1} expanded>
-            <BentoAccordionHeader>header1</BentoAccordionHeader>
-            <BentoAccordionContent>content1</BentoAccordionContent>
-          </BentoAccordionSection>
-          <BentoAccordionSection key={2}>
-            <BentoAccordionHeader>header2</BentoAccordionHeader>
-            <BentoAccordionContent>content2</BentoAccordionContent>
-          </BentoAccordionSection>
-          <BentoAccordionSection key={3}>
-            <BentoAccordionHeader>header3</BentoAccordionHeader>
-            <BentoAccordionContent>content3</BentoAccordionContent>
-          </BentoAccordionSection>
-        </BentoAccordion>
-      );
-    });
-
-    it('should render all sections', () => {
-      const dom = wrapper.getDOMNode();
-      expect(dom.localName).to.equal('section');
-
-      const sections = wrapper.find(BentoAccordionSection);
-      expect(sections).to.have.lengthOf(3);
-
-      // Expanded state.
-      const header0 = sections.at(0).find('div').at(0).getDOMNode();
-      expect(header0.getAttribute('aria-expanded')).to.equal('true');
-      const header1 = sections.at(1).find('div').at(0).getDOMNode();
-      expect(header1.getAttribute('aria-expanded')).to.equal('false');
-      const header2 = sections.at(2).find('div').at(0).getDOMNode();
-      expect(header2.getAttribute('aria-expanded')).to.equal('false');
-      const content0 = sections.at(0).find('div').at(1).getDOMNode();
-      const content1 = sections.at(1).find('div').at(1).getDOMNode();
-      const content2 = sections.at(2).find('div').at(1).getDOMNode();
-
-      // Headers.
-      expect(header0.textContent).to.equal('header1');
-      expect(header1.textContent).to.equal('header2');
-      expect(header2.textContent).to.equal('header3');
-
-      // Contents.
-      expect(content0.textContent).to.equal('content1');
-      expect(content1.textContent).to.equal('content2');
-      expect(content2.textContent).to.equal('content3');
-      expect(content0.className.includes('content-hidden')).to.be.false;
-      expect(content1.className.includes('content-hidden')).to.be.true;
-      expect(content2.className.includes('content-hidden')).to.be.true;
-
-      // Styling.
-      expect(header0.className.includes('section-child')).to.be.true;
-      expect(header0.className.includes('header')).to.be.true;
-      expect(header1.className.includes('section-child')).to.be.true;
-      expect(header1.className.includes('header')).to.be.true;
-      expect(header2.className.includes('section-child')).to.be.true;
-      expect(header2.className.includes('header')).to.be.true;
-      expect(content0.className.includes('section-child')).to.be.true;
-      expect(content1.className.includes('section-child')).to.be.true;
-      expect(content2.className.includes('section-child')).to.be.true;
-    });
-
-    it('should include a11y related attributes', () => {
-      const dom = wrapper.getDOMNode();
-      expect(dom.localName).to.equal('section');
-
-      const sections = wrapper.find(BentoAccordionSection);
-      expect(sections).to.have.lengthOf(3);
-
-      const header0 = sections.at(0).find('div').at(0).getDOMNode();
-      const header1 = sections.at(1).find('div').at(0).getDOMNode();
-      const header2 = sections.at(2).find('div').at(0).getDOMNode();
-      const content0 = sections.at(0).find('div').at(1).getDOMNode();
-      const content1 = sections.at(1).find('div').at(1).getDOMNode();
-      const content2 = sections.at(2).find('div').at(1).getDOMNode();
-
-      expect(header0).to.have.attribute('tabindex');
-      expect(header0).to.have.attribute('aria-controls');
-      expect(header0).to.have.attribute('role');
-      expect(header0).to.have.attribute('aria-expanded');
-      expect(header0).to.have.attribute('id');
-      expect(header0.getAttribute('aria-expanded')).to.equal('true');
-      expect(content0).to.have.attribute('id');
-      expect(content0).to.have.attribute('aria-labelledby');
-      expect(content0).to.have.attribute('role');
-      expect(header0.getAttribute('aria-controls')).to.equal(
-        content0.getAttribute('id')
-      );
-      expect(header0.getAttribute('id')).to.equal(
-        content0.getAttribute('aria-labelledby')
-      );
-
-      expect(header1).to.have.attribute('tabindex');
-      expect(header1).to.have.attribute('aria-controls');
-      expect(header1).to.have.attribute('role');
-      expect(header1).to.have.attribute('aria-expanded');
-      expect(header1).to.have.attribute('id');
-      expect(header1.getAttribute('aria-expanded')).to.equal('false');
-      expect(content1).to.have.attribute('id');
-      expect(content1).to.have.attribute('aria-labelledby');
-      expect(content1).to.have.attribute('role');
-      expect(header1.getAttribute('aria-controls')).to.equal(
-        content1.getAttribute('id')
-      );
-      expect(header1.getAttribute('id')).to.equal(
-        content1.getAttribute('aria-labelledby')
-      );
-
-      expect(header2).to.have.attribute('tabindex');
-      expect(header2).to.have.attribute('aria-controls');
-      expect(header2).to.have.attribute('role');
-      expect(header2).to.have.attribute('aria-expanded');
-      expect(header2).to.have.attribute('id');
-      expect(header2.getAttribute('aria-expanded')).to.equal('false');
-      expect(content2).to.have.attribute('id');
-      expect(content2).to.have.attribute('aria-labelledby');
-      expect(content2).to.have.attribute('role');
-      expect(header2.getAttribute('aria-controls')).to.equal(
-        content2.getAttribute('id')
-      );
-      expect(header2.getAttribute('id')).to.equal(
-        content2.getAttribute('aria-labelledby')
-      );
-    });
-
-    it('should not overwrite existing header and content ids', () => {
-      wrapper = mount(
-        <BentoAccordion>
-          <BentoAccordionSection key={1} expanded>
-            <BentoAccordionHeader id="h1">header1</BentoAccordionHeader>
-            <BentoAccordionContent id="c1">content1</BentoAccordionContent>
-          </BentoAccordionSection>
-          <BentoAccordionSection key={2}>
-            <BentoAccordionHeader id="h2">header2</BentoAccordionHeader>
-            <BentoAccordionContent>content2</BentoAccordionContent>
-          </BentoAccordionSection>
-          <BentoAccordionSection key={3}>
-            <BentoAccordionHeader>header3</BentoAccordionHeader>
-            <BentoAccordionContent id="c3">content3</BentoAccordionContent>
-          </BentoAccordionSection>
-        </BentoAccordion>
-      );
-
-      const dom = wrapper.getDOMNode();
-      expect(dom.localName).to.equal('section');
-
-      const sections = wrapper.find(BentoAccordionSection);
-      expect(sections).to.have.lengthOf(3);
-
-      const header0 = sections.at(0).find('div').at(0).getDOMNode();
-      const header1 = sections.at(1).find('div').at(0).getDOMNode();
-      const header2 = sections.at(2).find('div').at(0).getDOMNode();
-      const content0 = sections.at(0).find('div').at(1).getDOMNode();
-      const content1 = sections.at(1).find('div').at(1).getDOMNode();
-      const content2 = sections.at(2).find('div').at(1).getDOMNode();
-
-      expect(header0.getAttribute('id')).to.equal('h1');
-      expect(content0.getAttribute('id')).to.equal('c1');
-      expect(header0.getAttribute('aria-controls')).to.equal(
-        content0.getAttribute('id')
-      );
-      expect(header0.getAttribute('id')).to.equal(
-        content0.getAttribute('aria-labelledby')
-      );
-
-      expect(header1.getAttribute('id')).to.equal('h2');
-      expect(header1.getAttribute('aria-controls')).to.equal(
-        content1.getAttribute('id')
-      );
-      expect(header1.getAttribute('id')).to.equal(
-        content1.getAttribute('aria-labelledby')
-      );
-
-      expect(content2.getAttribute('id')).to.equal('c3');
-      expect(header2.getAttribute('aria-controls')).to.equal(
-        content2.getAttribute('id')
-      );
-      expect(header2.getAttribute('id')).to.equal(
-        content2.getAttribute('aria-labelledby')
-      );
-    });
-
-    it('should default role attribute unless role prop provided', () => {
-      wrapper = mount(
-        <BentoAccordion>
-          <BentoAccordionSection key={1} expanded>
-            <BentoAccordionHeader role="cat">header1</BentoAccordionHeader>
-            <BentoAccordionContent role="dog">content1</BentoAccordionContent>
-          </BentoAccordionSection>
-          <BentoAccordionSection key={2}>
-            <BentoAccordionHeader>header2</BentoAccordionHeader>
-            <BentoAccordionContent>content2</BentoAccordionContent>
-          </BentoAccordionSection>
-        </BentoAccordion>
-      );
-
-      const dom = wrapper.getDOMNode();
-      expect(dom.localName).to.equal('section');
-
-      const sections = wrapper.find(BentoAccordionSection);
-      expect(sections).to.have.lengthOf(2);
-
-      const header0 = sections.at(0).find('div').at(0).getDOMNode();
-      const header1 = sections.at(1).find('div').at(0).getDOMNode();
-      const content0 = sections.at(0).find('div').at(1).getDOMNode();
-      const content1 = sections.at(1).find('div').at(1).getDOMNode();
-
-      expect(header0).to.have.attribute('role');
-      expect(header0.getAttribute('role')).to.equal('cat');
-      expect(content0).to.have.attribute('role');
-      expect(content0.getAttribute('role')).to.equal('dog');
-
-      expect(header1).to.have.attribute('role');
-      expect(header1.getAttribute('role')).to.equal('button');
-      expect(content1).to.have.attribute('role');
-      expect(content1.getAttribute('role')).to.equal('region');
-    });
-
-    it('should expand a section on click', () => {
-      const dom = wrapper.getDOMNode();
-      expect(dom.localName).to.equal('section');
-
-      const sections = wrapper.find(BentoAccordionSection);
-      expect(sections).to.have.lengthOf(3);
-
-      // Click to expand.
-      sections.at(1).find('div').at(0).simulate('click');
-
-      // Expanded state.
-      const header0 = sections.at(0).find('div').at(0).getDOMNode();
-      expect(header0.getAttribute('aria-expanded')).to.equal('true');
-      const header1 = sections.at(1).find('div').at(0).getDOMNode();
-      expect(header1.getAttribute('aria-expanded')).to.equal('true');
-
-      // Contents.
-      expect(sections.at(0).find('div').at(1).getDOMNode().hidden).to.be.false;
-      expect(sections.at(1).find('div').at(1).getDOMNode().hidden).to.be.false;
-    });
-
-    it('should collapse a section on click', () => {
-      const dom = wrapper.getDOMNode();
-      expect(dom.localName).to.equal('section');
-
-      const sections = wrapper.find(BentoAccordionSection);
-      expect(sections).to.have.lengthOf(3);
-
-      // Click to expand.
-      sections.at(0).find('div').at(0).simulate('click');
-
-      // Expanded state.
-      expect(sections.at(0).getDOMNode()).to.not.have.attribute('expanded');
-
-      // Contents.
-      expect(
-        sections
-          .at(0)
-          .find('div')
-          .at(1)
-          .getDOMNode()
-          .className.includes('content-hidden')
-      ).to.be.true;
-    });
-
-    it('should adjust state when expandSingleSection changes', async () => {
-      const dom = wrapper.getDOMNode();
-      expect(dom.localName).to.equal('section');
-
-      const sections = wrapper.find(BentoAccordionSection);
-
-      function countExpanded() {
-        const headers = [
-          sections.at(0).find('div').first().getDOMNode(),
-          sections.at(1).find('div').first().getDOMNode(),
-          sections.at(2).find('div').first().getDOMNode(),
-        ];
-        return headers
-          .map((header) => header.getAttribute('aria-expanded') === 'true')
-          .reduce((sum, v) => sum + (v ? 1 : 0), 0);
-      }
-
-      expect(countExpanded()).to.equal(1);
-
-      sections.at(1).find('div').at(0).simulate('click');
-      expect(countExpanded()).to.equal(2);
-
-      await new Promise((resolve) => {
-        wrapper.setProps({expandSingleSection: true}, resolve);
-      });
-
-      // One of the expanded sections should be collapsed.
-      expect(countExpanded()).to.equal(1);
-    });
-  });
-
-  describe('single-expand accordion', () => {
-    let wrapper;
-
-    beforeEach(() => {
-      wrapper = mount(
-        <BentoAccordion expandSingleSection>
-          <BentoAccordionSection key={1} expanded>
-            <BentoAccordionHeader>header1</BentoAccordionHeader>
-            <BentoAccordionContent>content1</BentoAccordionContent>
-          </BentoAccordionSection>
-          <BentoAccordionSection key={2}>
-            <BentoAccordionHeader>header2</BentoAccordionHeader>
-            <BentoAccordionContent>content2</BentoAccordionContent>
-          </BentoAccordionSection>
-          <BentoAccordionSection key={3}>
-            <BentoAccordionHeader>header3</BentoAccordionHeader>
-            <BentoAccordionContent>content3</BentoAccordionContent>
-          </BentoAccordionSection>
-        </BentoAccordion>
-      );
-    });
-
-    afterEach(() => {
-      wrapper.unmount();
-    });
-
-    it('should expand a section on click', () => {
-      const dom = wrapper.getDOMNode();
-      expect(dom.localName).to.equal('section');
-
-      const sections = wrapper.find(BentoAccordionSection);
-      expect(sections).to.have.lengthOf(3);
-      const header0 = sections.at(0).find('div').first().getDOMNode();
-      expect(header0.getAttribute('aria-expanded')).to.equal('true');
-
-      // Click to expand.
-      sections.at(1).find('div').at(0).simulate('click');
-
-      // Expanded state.
-      expect(header0.getAttribute('aria-expanded')).to.equal('false');
-      const header1 = sections.at(1).find('div').first().getDOMNode();
-      expect(header1.getAttribute('aria-expanded')).to.equal('true');
-
-      // Contents.
-      expect(
-        sections
-          .at(0)
-          .find('div')
-          .at(1)
-          .getDOMNode()
-          .className.includes('content-hidden')
-      ).to.be.true;
-      expect(
-        sections
-          .at(1)
-          .find('div')
-          .at(1)
-          .getDOMNode()
-          .className.includes('content-hidden')
-      ).to.be.false;
-    });
-
-    it('should collapse a section on click', () => {
-      const dom = wrapper.getDOMNode();
-      expect(dom.localName).to.equal('section');
-
-      const sections = wrapper.find(BentoAccordionSection);
-      expect(sections).to.have.lengthOf(3);
-
-      // Click to expand.
-      sections.at(0).find('div').at(0).simulate('click');
-
-      // Expanded state.
-      const header0 = sections.at(0).find('div').first().getDOMNode();
-      expect(header0.getAttribute('aria-expanded')).to.equal('false');
-
-      // Contents.
-      expect(
-        sections
-          .at(0)
-          .find('div')
-          .at(1)
-          .getDOMNode()
-          .className.includes('content-hidden')
-      ).to.be.true;
-    });
-  });
-
-  describe('animate', () => {
-    let wrapper;
-    let animateStub;
-
-    beforeEach(() => {
-      animateStub = env.sandbox.stub(Element.prototype, 'animate');
-      wrapper = mount(
-        <BentoAccordion animate>
-          <BentoAccordionSection key={1} expanded>
-            <BentoAccordionHeader>header1</BentoAccordionHeader>
-            <BentoAccordionContent>content1</BentoAccordionContent>
-          </BentoAccordionSection>
-          <BentoAccordionSection key={2}>
-            <BentoAccordionHeader>header2</BentoAccordionHeader>
-            <BentoAccordionContent>content2</BentoAccordionContent>
-          </BentoAccordionSection>
-        </BentoAccordion>
-      );
-      document.body.appendChild(wrapper.getDOMNode());
-    });
-
-    it('should not animate on mount', () => {
-      expect(animateStub).to.not.be.called;
-    });
-
-    it('should animate expand on change', () => {
-      const animation = {};
-      animateStub.returns(animation);
-      const sections = wrapper.find(BentoAccordionSection);
-      const section = sections.at(1);
-      const content = section.find('div').at(1).getDOMNode();
-
-      // Click to expand.
-      section.find('div').at(0).simulate('click');
-
-      // The state is immediately reflected.
-      const header0 = section.find('div').first().getDOMNode();
-      expect(header0.getAttribute('aria-expanded')).to.equal('true');
-      expect(content.hidden).to.be.false;
-      expect(content).to.have.display('block');
-
-      // Animation has been started.
-      expect(animateStub).to.be.calledOnce;
-
-      const keyframes = animateStub.firstCall.firstArg;
-      const lastFrame = keyframes[keyframes.length - 1];
-      const options = animateStub.firstCall.args[1];
-
-      expect(parseFloat(lastFrame.height)).to.be.greaterThan(1);
-      expect(parseFloat(lastFrame.opacity)).to.equal(1);
-      expect(lastFrame.overflowY).to.equal('hidden');
-
-      expect(options.duration).to.be.greaterThan(100);
-      expect(options.easing).to.be.ok;
-    });
-
-    it('should animate collapse on change', () => {
-      const animation = {};
-      animateStub.returns(animation);
-      const sections = wrapper.find(BentoAccordionSection);
-      const section = sections.at(0);
-      const content = section.find('div').at(1).getDOMNode();
-
-      // Click to expand.
-      section.find('div').at(0).simulate('click');
-
-      // The state is NOT immediately reflected: `aria-expanded` is updated, but
-      // `content[hidden]` is deferred until animation is complete.
-      const header0 = section.find('div').at(0).getDOMNode();
-      expect(header0.getAttribute('aria-expanded')).to.equal('false');
-      expect(content.className.includes('i-amphtml-animating')).to.be.true;
-      expect(content).to.have.display('block');
-
-      // Animation has been started.
-      expect(animateStub).to.be.calledOnce;
-
-      const keyframes = animateStub.firstCall.firstArg;
-      const lastFrame = keyframes[keyframes.length - 1];
-      const options = animateStub.firstCall.args[1];
-
-      expect(parseFloat(lastFrame.height)).to.be.equal(0);
-      expect(parseFloat(lastFrame.opacity)).to.equal(0);
-      expect(lastFrame.overflowY).to.equal('hidden');
-
-      expect(options.duration).to.be.greaterThan(100);
-      expect(options.easing).to.be.ok;
-
-      // Cleanup the animation.
-      animation.onfinish();
-      expect(content.className.includes('i-amphtml-animating')).to.be.false;
-      expect(content.className.includes('content-hidden')).to.be.true;
-    });
-
-    it('should make animations cancelable', () => {
-      const animation = {
-        cancel: env.sandbox.spy(),
-      };
-      animateStub.onFirstCall().returns(animation).onSecondCall().returns({});
-      const sections = wrapper.find(BentoAccordionSection);
-      const section = sections.at(0);
-      const content = section.find('div').at(1).getDOMNode();
-
-      // Click to expand.
-      section.find('div').at(0).simulate('click');
-      expect(animateStub).to.be.calledOnce;
-
-      // Currently animating
-      expect(content.className.includes('i-amphtml-animating')).to.be.true;
-
-      // Unclick. This should cancel the previous animation.
-      section.find('div').at(0).simulate('click');
-      expect(animateStub).to.be.calledTwice;
-
-      expect(animation.cancel).to.be.calledOnce;
-      animation.oncancel();
-      expect(content.className.includes('i-amphtml-animating')).to.be.false;
-    });
-
-    it('should ignore animations if not available on the platform', () => {
-      animateStub./*OK*/ restore();
-      const sections = wrapper.find(BentoAccordionSection);
-      const section = sections.at(0);
-      const content = section.find('div').at(1).getDOMNode();
-      env.sandbox.stub(content, 'animate').value(null);
-
-      // Collapse a section.
-      section.find('div').at(0).simulate('click');
-
-      // Immediately hidden, which means animation has not been even tried.
-      expect(content.className.includes('content-hidden')).to.be.true;
-    });
-  });
-
-  describe('fire events on expand and collapse', () => {
-    let wrapper;
-    let ref;
-    let onExpandStateChange;
-
-    beforeEach(() => {
-      onExpandStateChange = env.sandbox.spy();
-      ref = Preact.createRef();
-
-      wrapper = mount(
-        <BentoAccordion ref={ref}>
-          <BentoAccordionSection key={1} expanded>
-            <BentoAccordionHeader>header1</BentoAccordionHeader>
-            <BentoAccordionContent>content1</BentoAccordionContent>
-          </BentoAccordionSection>
-          <BentoAccordionSection
-            key={2}
-            id="section2"
-            onExpandStateChange={onExpandStateChange}
-          >
-            <BentoAccordionHeader>header2</BentoAccordionHeader>
-            <BentoAccordionContent>content2</BentoAccordionContent>
-          </BentoAccordionSection>
-          <BentoAccordionSection key={3}>
-            <BentoAccordionHeader>header3</BentoAccordionHeader>
-            <BentoAccordionContent>content3</BentoAccordionContent>
-          </BentoAccordionSection>
-        </BentoAccordion>
-      );
-      document.body.appendChild(wrapper.getDOMNode());
-    });
-
-    it('should fire events on click', async () => {
-      const sections = wrapper.find(BentoAccordionSection);
-
-      // Expand
-      sections.at(1).find('div').at(0).simulate('click');
-      await waitFor(
-        () => onExpandStateChange.callCount == 1,
-        'event callback called'
-      );
-      expect(onExpandStateChange.callCount).to.equal(1);
-      expect(onExpandStateChange.args[0][0]).to.be.true;
-
-      // Collapse
-      sections.at(1).find('div').at(0).simulate('click');
-      await waitFor(
-        () => onExpandStateChange.callCount == 2,
-        'event callback called'
-      );
-      expect(onExpandStateChange.callCount).to.equal(2);
-      expect(onExpandStateChange.args[1][0]).to.be.false;
-
-      // Expand
-      sections.at(1).find('div').at(0).simulate('click');
-      await waitFor(
-        () => onExpandStateChange.callCount == 3,
-        'event callback called'
-      );
-      expect(onExpandStateChange.callCount).to.equal(3);
-      expect(onExpandStateChange.args[2][0]).to.be.true;
-
-      // Collapse
-      sections.at(1).find('div').at(0).simulate('click');
-      await waitFor(
-        () => onExpandStateChange.callCount == 4,
-        'event callback called'
-      );
-      expect(onExpandStateChange.callCount).to.equal(4);
-      expect(onExpandStateChange.args[3][0]).to.be.false;
-    });
-
-    it('should fire events on API toggle', async () => {
-      // Expand All
-      ref.current.toggle();
-      wrapper.update();
-      await waitFor(
-        () => onExpandStateChange.callCount == 1,
-        'event callback called'
-      );
-      expect(onExpandStateChange.callCount).to.equal(1);
-      expect(onExpandStateChange.args[0][0]).to.be.true;
-
-      // Collapse All
-      ref.current.collapse();
-      wrapper.update();
-      await waitFor(
-        () => onExpandStateChange.callCount == 2,
-        'event callback called'
-      );
-      expect(onExpandStateChange.callCount).to.equal(2);
-      expect(onExpandStateChange.args[1][0]).to.be.false;
-
-      // Collapsing an already collapsed section should do nothing
-      ref.current.collapse('section2');
-      wrapper.update();
-      await waitFor(
-        () => onExpandStateChange.callCount == 2,
-        'event callback called'
-      );
-      expect(onExpandStateChange.callCount).to.equal(2);
-      expect(onExpandStateChange.args[1][0]).to.be.false;
-
-      // Expand All
-      ref.current.expand();
-      wrapper.update();
-      await waitFor(
-        () => onExpandStateChange.callCount == 3,
-        'event callback called'
-      );
-      expect(onExpandStateChange.callCount).to.equal(3);
-      expect(onExpandStateChange.args[2][0]).to.be.true;
-    });
-  });
-
-  describe('imperative api', () => {
-    let wrapper;
-    let ref;
-
-    let header0;
-    let header1;
-    let header2;
-
-    describe('multi-expand accordion', () => {
-      beforeEach(() => {
-        ref = Preact.createRef();
-        wrapper = mount(
-          <BentoAccordion ref={ref}>
-            <BentoAccordionSection key={1} expanded id="section1">
-              <BentoAccordionHeader>header1</BentoAccordionHeader>
-              <BentoAccordionContent>content1</BentoAccordionContent>
-            </BentoAccordionSection>
-            <BentoAccordionSection key={2} id="section2">
-              <BentoAccordionHeader>header2</BentoAccordionHeader>
-              <BentoAccordionContent>content2</BentoAccordionContent>
-            </BentoAccordionSection>
-            <BentoAccordionSection key={3}>
-              <BentoAccordionHeader>header3</BentoAccordionHeader>
-              <BentoAccordionContent>content3</BentoAccordionContent>
-            </BentoAccordionSection>
-          </BentoAccordion>
-        );
-
-        const sections = wrapper.find(BentoAccordionSection);
-        header0 = sections.at(0).find('div').first().getDOMNode();
-        header1 = sections.at(1).find('div').first().getDOMNode();
-        header2 = sections.at(2).find('div').first().getDOMNode();
-      });
-
-      it('toggle all', () => {
-        ref.current.toggle();
-        wrapper.update();
-
-        // All sections are toggled
-        expect(header0.getAttribute('aria-expanded')).to.equal('false');
-        expect(header1.getAttribute('aria-expanded')).to.equal('true');
-        expect(header2.getAttribute('aria-expanded')).to.equal('true');
-      });
-
-      it('toggle one section', async () => {
-        ref.current.toggle('section1');
-        wrapper.update();
-
-        // Only section 1 is toggled
-        expect(header0.getAttribute('aria-expanded')).to.equal('false');
-        expect(header1.getAttribute('aria-expanded')).to.equal('false');
-        expect(header2.getAttribute('aria-expanded')).to.equal('false');
-      });
-
-      it('expand all', async () => {
-        ref.current.expand();
-        wrapper.update();
-
-        // All sections are expanded
-        expect(header0.getAttribute('aria-expanded')).to.equal('true');
-        expect(header1.getAttribute('aria-expanded')).to.equal('true');
-        expect(header2.getAttribute('aria-expanded')).to.equal('true');
-      });
-
-      it('expand one section', async () => {
-        // Collapse first section to setup the test
-        ref.current.collapse();
-        wrapper.update();
-
-        // Expand the first section
-        ref.current.expand('section1');
-        wrapper.update();
-
-        // Only the first section is expanded
-        expect(header0.getAttribute('aria-expanded')).to.equal('true');
-        expect(header1.getAttribute('aria-expanded')).to.equal('false');
-        expect(header2.getAttribute('aria-expanded')).to.equal('false');
-      });
-
-      it('collapse all', async () => {
-        ref.current.collapse();
-        wrapper.update();
-
-        // All sections are collapsed
-        expect(header0.getAttribute('aria-expanded')).to.equal('false');
-        expect(header1.getAttribute('aria-expanded')).to.equal('false');
-        expect(header2.getAttribute('aria-expanded')).to.equal('false');
-      });
-
-      it('collapse one section', async () => {
-        ref.current.collapse('section1');
-        wrapper.update();
-
-        // Only the first section is collapsed
-        expect(header0.getAttribute('aria-expanded')).to.equal('false');
-        expect(header1.getAttribute('aria-expanded')).to.equal('false');
-        expect(header2.getAttribute('aria-expanded')).to.equal('false');
-      });
-    });
-
-    describe('single-expand accordion', () => {
-      beforeEach(() => {
-        ref = Preact.createRef();
-        wrapper = mount(
-          <BentoAccordion ref={ref} expandSingleSection>
-            <BentoAccordionSection key={1} expanded id="section1">
-              <BentoAccordionHeader>header1</BentoAccordionHeader>
-              <BentoAccordionContent>content1</BentoAccordionContent>
-            </BentoAccordionSection>
-            <BentoAccordionSection key={2} id="section2">
-              <BentoAccordionHeader>header2</BentoAccordionHeader>
-              <BentoAccordionContent>content2</BentoAccordionContent>
-            </BentoAccordionSection>
-            <BentoAccordionSection key={3}>
-              <BentoAccordionHeader>header3</BentoAccordionHeader>
-              <BentoAccordionContent>content3</BentoAccordionContent>
-            </BentoAccordionSection>
-          </BentoAccordion>
-        );
-
-        const sections = wrapper.find(BentoAccordionSection);
-        header0 = sections.at(0).find('div').first().getDOMNode();
-        header1 = sections.at(1).find('div').first().getDOMNode();
-        header2 = sections.at(2).find('div').first().getDOMNode();
-      });
-
-      it('toggle all', async () => {
-        ref.current.toggle();
-        wrapper.update();
-
-        // Accordion is unchanged (toggle does nothing for single-expand
-        // accordion)
-        expect(header0.getAttribute('aria-expanded')).to.equal('true');
-        expect(header1.getAttribute('aria-expanded')).to.equal('false');
-        expect(header2.getAttribute('aria-expanded')).to.equal('false');
-      });
-
-      it('toggle one section', async () => {
-        ref.current.toggle('section2');
-        wrapper.update();
-
-        // Verify that the second section is expanded and the first
-        // section is un-expanded
-        expect(header0.getAttribute('aria-expanded')).to.equal('false');
-        expect(header1.getAttribute('aria-expanded')).to.equal('true');
-        expect(header2.getAttribute('aria-expanded')).to.equal('false');
-
-        ref.current.toggle('section2');
-        wrapper.update();
-
-        // Verify that the second section is collapsed
-        expect(header0.getAttribute('aria-expanded')).to.equal('false');
-        expect(header1.getAttribute('aria-expanded')).to.equal('false');
-        expect(header2.getAttribute('aria-expanded')).to.equal('false');
-      });
-
-      it('expand all', async () => {
-        ref.current.expand();
-        wrapper.update();
-
-        // Accordion is unchanged (expand does nothing for single-expand
-        // accordion)
-        expect(header0.getAttribute('aria-expanded')).to.equal('true');
-        expect(header1.getAttribute('aria-expanded')).to.equal('false');
-        expect(header2.getAttribute('aria-expanded')).to.equal('false');
-      });
-
-      it('expand one section', async () => {
-        ref.current.expand('section2');
-        wrapper.update();
-
-        // Verify that the second section is expanded and the first
-        // section is un-expanded
-        expect(header0.getAttribute('aria-expanded')).to.equal('false');
-        expect(header1.getAttribute('aria-expanded')).to.equal('true');
-        expect(header2.getAttribute('aria-expanded')).to.equal('false');
-      });
-
-      it('collapse all', async () => {
-        ref.current.collapse();
-        wrapper.update();
-
-        // All sections are collapsed
-        expect(header0.getAttribute('aria-expanded')).to.equal('false');
-        expect(header1.getAttribute('aria-expanded')).to.equal('false');
-        expect(header2.getAttribute('aria-expanded')).to.equal('false');
-      });
-
-      it('collapse one section', async () => {
-        ref.current.collapse('section1');
-        wrapper.update();
-
-        // Section 1 is collapsed
-        expect(header0.getAttribute('aria-expanded')).to.equal('false');
-        expect(header1.getAttribute('aria-expanded')).to.equal('false');
-        expect(header2.getAttribute('aria-expanded')).to.equal('false');
-      });
-    });
-  });
-});
diff --git a/extensions/amp-accordion/validator-amp-accordion.protoascii b/extensions/amp-accordion/validator-amp-accordion.protoascii
index e0b5a9739e73..c65a7f8e8f44 100644
--- a/extensions/amp-accordion/validator-amp-accordion.protoascii
+++ b/extensions/amp-accordion/validator-amp-accordion.protoascii
@@ -1,8 +1,8 @@
 tags: {  # amp-accordion for websites
   html_format: AMP
   tag_name: "SCRIPT"
-  satisfies: "amp-accordion 1.0"
-  excludes: "amp-accordion 0.1"
+  satisfies_condition: "amp-accordion 1.0"
+  excludes_condition: "amp-accordion 0.1"
   extension_spec: {
     name: "amp-accordion"
     version_name: "v1.0"
@@ -15,8 +15,8 @@ tags: {  # amp-accordion for ads
   html_format: AMP
   html_format: AMP4ADS
   tag_name: "SCRIPT"
-  satisfies: "amp-accordion 0.1"
-  excludes: "amp-accordion 1.0"
+  satisfies_condition: "amp-accordion 0.1"
+  excludes_condition: "amp-accordion 1.0"
   extension_spec: {
     name: "amp-accordion"
     version_name: "v0.1"
diff --git a/extensions/amp-action-macro/0.1/amp-action-macro.js b/extensions/amp-action-macro/0.1/amp-action-macro.js
index dd2d74c102e6..0ac274ce0f09 100644
--- a/extensions/amp-action-macro/0.1/amp-action-macro.js
+++ b/extensions/amp-action-macro/0.1/amp-action-macro.js
@@ -1,4 +1,4 @@
-import {LayoutPriority} from '#core/dom/layout';
+import {LayoutPriority_Enum} from '#core/dom/layout';
 
 import {Services} from '#service';
 
@@ -39,7 +39,7 @@ export class AmpActionMacro extends AMP.BaseElement {
   /** @override */
   getLayoutPriority() {
     // Loads after other content.
-    return LayoutPriority.METADATA;
+    return LayoutPriority_Enum.METADATA;
   }
 
   /**
diff --git a/extensions/amp-action-macro/0.1/test/test-amp-action-macro.js b/extensions/amp-action-macro/0.1/test/test-amp-action-macro.js
index 904cdb5fc793..4edd60054d16 100644
--- a/extensions/amp-action-macro/0.1/test/test-amp-action-macro.js
+++ b/extensions/amp-action-macro/0.1/test/test-amp-action-macro.js
@@ -1,4 +1,4 @@
-import {ActionTrust} from '#core/constants/action-constants';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
 
 import {Services} from '#service';
 import {ActionInvocation} from '#service/action-impl';
@@ -95,7 +95,7 @@ describes.realWin(
           button,
           button,
           {},
-          ActionTrust.HIGH,
+          ActionTrust_Enum.HIGH,
           'tap',
           'AMP-ACTION-MACRO'
         );
@@ -118,7 +118,7 @@ describes.realWin(
           button,
           button,
           {},
-          ActionTrust.HIGH,
+          ActionTrust_Enum.HIGH,
           'tap',
           'AMP-ACTION-MACRO'
         );
@@ -138,7 +138,7 @@ describes.realWin(
           callingMacroElement,
           callingMacroElement,
           {},
-          ActionTrust.HIGH,
+          ActionTrust_Enum.HIGH,
           'tap',
           'AMP-ACTION-MACRO'
         );
@@ -160,7 +160,7 @@ describes.realWin(
           referrableMacroElement,
           callingMacroElement,
           {},
-          ActionTrust.HIGH,
+          ActionTrust_Enum.HIGH,
           'tap',
           'AMP-ACTION-MACRO'
         );
@@ -181,7 +181,7 @@ describes.realWin(
           unreferrableMacroElement,
           callingMacroElement,
           {},
-          ActionTrust.HIGH,
+          ActionTrust_Enum.HIGH,
           'tap',
           'AMP-ACTION-MACRO'
         );
diff --git a/extensions/amp-ad-custom/0.1/amp-ad-custom.js b/extensions/amp-ad-custom/0.1/amp-ad-custom.js
index 67064c7daedb..6aa7731681b9 100644
--- a/extensions/amp-ad-custom/0.1/amp-ad-custom.js
+++ b/extensions/amp-ad-custom/0.1/amp-ad-custom.js
@@ -41,6 +41,11 @@ export class AmpAdTemplate extends AmpAdNetworkBase {
 
   /** @override */
   buildCallback() {
+    this.user().error(
+      TAG,
+      'amp-ad-custom is deprecated, see https://github.com/ampproject/amphtml/issues/39443'
+    );
+
     this.getContext().size = {
       // TODO(levitzky) handle non-numeric values.
       width: this.element.getAttribute('width'),
diff --git a/extensions/amp-ad-exit/0.1/amp-ad-exit.js b/extensions/amp-ad-exit/0.1/amp-ad-exit.js
index 3b18073842f7..ed96c1f59160 100644
--- a/extensions/amp-ad-exit/0.1/amp-ad-exit.js
+++ b/extensions/amp-ad-exit/0.1/amp-ad-exit.js
@@ -1,9 +1,9 @@
 import {
-  MessageType,
+  MessageType_Enum,
   deserializeMessage,
   listen,
 } from '#core/3p-frame-messaging';
-import {ActionTrust} from '#core/constants/action-constants';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
 import {isJsonScriptTag} from '#core/dom';
 import {isObject} from '#core/types';
 import {parseJson} from '#core/types/object/json';
@@ -14,6 +14,10 @@ import {Services} from '#service';
 
 import {getData} from '#utils/event-helper';
 import {dev, devAssert, user, userAssert} from '#utils/log';
+import {
+  AttributionReportingStatus,
+  isAttributionReportingAllowed,
+} from '#utils/privacy-sandbox-utils';
 
 import {TransportMode, assertConfig, assertVendor} from './config';
 import {makeClickDelaySpec} from './filters/click-delay';
@@ -39,29 +43,19 @@ const TAG = 'amp-ad-exit';
  */
 let NavigationTargetDef;
 
-/**
- * Indicates the status of the `attribution-reporting` API.
- * @enum
- */
-const AttributionReportingStatus = {
-  ATTRIBUTION_MACRO_PRESENT: 1,
-  ATTRIBUTION_DATA_PRESENT: 2,
-  ATTRIBUTION_DATA_PRESENT_AND_POLICY_ENABLED: 3,
-};
-
 export class AmpAdExit extends AMP.BaseElement {
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
 
     /**
-     * @private @const {!Object<string, !NavigationTargetDef>}
+     * @private @const {!{[key: string]: !NavigationTargetDef}}
      */
     this.targets_ = {};
 
     /**
      * Maps variable target name to an actual target name.
-     * @private @const {!Object<string, string>}
+     * @private @const {!{[key: string]: string}}
      */
     this.variableTargets_ = {};
 
@@ -83,10 +77,10 @@ export class AmpAdExit extends AMP.BaseElement {
     this.registerAction(
       'setVariable',
       this.setVariable.bind(this),
-      ActionTrust.LOW
+      ActionTrust_Enum.LOW
     );
 
-    /** @private @const {!Object<string, !Object<string, string>>} */
+    /** @private @const {!{[key: string]: !{[key: string]: string}}} */
     this.vendorResponses_ = {};
 
     /** @private {?function()} */
@@ -95,7 +89,7 @@ export class AmpAdExit extends AMP.BaseElement {
     /** @private {?string} */
     this.ampAdResourceId_ = null;
 
-    /** @private @const {!Object<string,string>} */
+    /** @private @const {!{[key: string]: string}} */
     this.expectedOriginToVendor_ = {};
 
     /** @private @const {boolean} */
@@ -170,7 +164,11 @@ export class AmpAdExit extends AMP.BaseElement {
         target.behaviors.clickTarget == '_top'
           ? '_top'
           : '_blank';
-      openWindowDialog(this.win, finalUrl, clickTarget, target.windowFeatures);
+
+      const substitutedFeatures = substituteVariables(
+        target.windowFeatures || ''
+      );
+      openWindowDialog(this.win, finalUrl, clickTarget, substitutedFeatures);
     }
   }
 
@@ -185,7 +183,7 @@ export class AmpAdExit extends AMP.BaseElement {
   }
 
   /**
-   * @param {!Object<string, string|number|boolean>} args
+   * @param {!{[key: string]: string|number|boolean}} args
    * @param {!../../../src/service/action-impl.ActionEventDef} event
    * @param {!NavigationTargetDef} target
    * @return {function(string): string}
@@ -206,6 +204,7 @@ export class AmpAdExit extends AMP.BaseElement {
       'CLICK_X': true,
       'CLICK_Y': true,
       'RANDOM': true,
+      'UACH': true,
     };
     if (target['vars']) {
       for (const customVarName in target['vars']) {
@@ -384,19 +383,22 @@ export class AmpAdExit extends AMP.BaseElement {
         const /** !JsonObject */ target = config['targets'][name];
         this.targets_[name] = {
           finalUrl: target['finalUrl'],
-          trackingUrls: target['trackingUrls'] || [],
           vars: target['vars'] || {},
           filters: (target['filters'] || [])
             .map((f) => this.userFilters_[f])
             .filter(Boolean),
           behaviors: target['behaviors'] || {},
         };
-
-        if (this.isAttributionReportingSupported_) {
+        if (
+          this.isAttributionReportingSupported_ &&
+          target?.behaviors?.browserAdConversion
+        ) {
           this.targets_[name]['windowFeatures'] =
             this.getAttributionReportingValues_(
               target?.behaviors?.browserAdConversion
             );
+        } else {
+          this.targets_[name]['trackingUrls'] = target['trackingUrls'] || [];
         }
 
         // Build a map of {vendor, origin} for 3p custom variables in the config
@@ -435,9 +437,7 @@ export class AmpAdExit extends AMP.BaseElement {
    * @return {boolean}
    */
   detectAttributionReportingSupport() {
-    return this.win.document.featurePolicy?.allowsFeature(
-      'attribution-reporting'
-    );
+    return isAttributionReportingAllowed(this.win.document);
   }
 
   /**
@@ -455,7 +455,8 @@ export class AmpAdExit extends AMP.BaseElement {
     // https://groups.google.com/a/chromium.org/g/blink-dev/c/FFX6VkvladY/m/QgaWHK6ZBAAJ
     const parts = ['noopener'];
     for (const key of Object.keys(adConversionData)) {
-      parts.push(`${key.toLowerCase()}=${adConversionData[key]}`);
+      const encoded = encodeURIComponent(adConversionData[key]);
+      parts.push(`${key.toLowerCase()}=${encoded}`);
     }
     return parts.join(',');
   }
@@ -519,7 +520,7 @@ export class AmpAdExit extends AMP.BaseElement {
       const responseMsg = deserializeMessage(getData(event));
       if (
         !responseMsg ||
-        responseMsg['type'] != MessageType.IFRAME_TRANSPORT_RESPONSE
+        responseMsg['type'] != MessageType_Enum.IFRAME_TRANSPORT_RESPONSE
       ) {
         return;
       }
@@ -597,7 +598,7 @@ export function getAttributionReportingStatus(
     isAttributionReportingSupported
   ) {
     return AttributionReportingStatus.ATTRIBUTION_DATA_PRESENT_AND_POLICY_ENABLED;
-  } else if (target?.behaviors?.browserAdConversion) {
+  } else if (target?.behaviors?.browserAdConversion?.attributionsrc) {
     return AttributionReportingStatus.ATTRIBUTION_DATA_PRESENT;
   }
   return AttributionReportingStatus.ATTRIBUTION_MACRO_PRESENT;
diff --git a/extensions/amp-ad-exit/0.1/config.js b/extensions/amp-ad-exit/0.1/config.js
index 7803f12af2eb..d505e9f3d21e 100644
--- a/extensions/amp-ad-exit/0.1/config.js
+++ b/extensions/amp-ad-exit/0.1/config.js
@@ -13,9 +13,9 @@ export let AmpAdExitConfigOptions;
 
 /**
  * @typedef {{
- *   targets: !Object<string, !NavigationTargetConfig>,
- *   filters: (!Object<string, !FilterConfig>|undefined),
- *   transport: (!Object<TransportMode, boolean>|undefined),
+ *   targets: !{[key: string]: !NavigationTargetConfig},
+ *   filters: (!{[key: string]: !FilterConfig}|undefined),
+ *   transport: (!{[key: TransportMode]: boolean}|undefined),
  *   options: (!AmpAdExitConfigOptions|undefined)
  * }}
  */
@@ -41,7 +41,7 @@ export let NavigationTargetConfig;
 export let VariableDef;
 
 /**
- * @typedef {!Object<string, !VariableDef>}
+ * @typedef {!{[key: string]: !VariableDef}}
  */
 export let VariablesDef;
 
diff --git a/extensions/amp-ad-exit/0.1/test-e2e/test-amp-ad-exit.js b/extensions/amp-ad-exit/0.1/test-e2e/test-amp-ad-exit.js
index 4fe5f25e2d8a..a0d4cec8cf90 100644
--- a/extensions/amp-ad-exit/0.1/test-e2e/test-amp-ad-exit.js
+++ b/extensions/amp-ad-exit/0.1/test-e2e/test-amp-ad-exit.js
@@ -75,9 +75,11 @@ describes.endtoend(
         /^http:\/\/localhost:8000\/\?product2&r=0\.\d+$/
       );
 
-      await expect(
-        'http://localhost:8000/amp4test/request-bank/e2e/deposit/tracking'
-      ).to.have.sentCount(1);
+      const response = await fetch(
+        'http://localhost:8000/amp4test/request-bank/e2e/withdraw/tracking',
+        {signal: AbortSignal.timeout(500)}
+      );
+      await response.json();
     });
 
     it('variable target "current" should point to product1 by default', async () => {
@@ -108,9 +110,11 @@ describes.endtoend(
       await expect(await controller.getCurrentUrl()).to.match(
         /^http:\/\/localhost:8000\/\?product2&r=0\.\d+$/
       );
-      await expect(
-        'http://localhost:8000/amp4test/request-bank/e2e/deposit/tracking'
-      ).to.have.sentCount(1);
+      const response = await fetch(
+        'http://localhost:8000/amp4test/request-bank/e2e/withdraw/tracking',
+        {signal: AbortSignal.timeout(500)}
+      );
+      await response.json();
     });
   }
 );
diff --git a/extensions/amp-ad-exit/0.1/test/test-amp-ad-exit.js b/extensions/amp-ad-exit/0.1/test/test-amp-ad-exit.js
index 952dddfb15e4..03c390178661 100644
--- a/extensions/amp-ad-exit/0.1/test/test-amp-ad-exit.js
+++ b/extensions/amp-ad-exit/0.1/test/test-amp-ad-exit.js
@@ -1,5 +1,6 @@
 import {toggleExperiment} from '#experiments';
 
+import {Services} from '#service';
 import {installPlatformService} from '#service/platform-impl';
 import {installTimerService} from '#service/timer-impl';
 
@@ -36,9 +37,9 @@ const EXIT_CONFIG = {
     },
     variables: {
       'finalUrl':
-        'http://localhost:8000/vars?foo=bar&ampdoc=AMPDOC_HOST&r=RANDOM&x=CLICK_X&y=CLICK_Y',
+        'http://localhost:8000/vars?foo=bar&ampdoc=AMPDOC_HOST&r=RANDOM&x=CLICK_X&y=CLICK_Y&uap=UACH(platform)',
       'trackingUrls': [
-        'http://localhost:8000/tracking?r=RANDOM&x=CLICK_X&y=CLICK_Y',
+        'http://localhost:8000/tracking?r=RANDOM&x=CLICK_X&y=CLICK_Y&uap=UACH(platform)',
       ],
     },
     customVars: {
@@ -356,12 +357,10 @@ describes.realWin(
       const config = {
         targets: {
           landingPage: {
-            finalUrl: 'https://example.com',
+            finalUrl: 'https://advertiser.example',
             behaviors: {
               browserAdConversion: {
-                attributiondestination: 'https://example.com',
-                attributionsourceeventid: 'EFnZ8GunL1xrwNTIHbXrvQ==',
-                attributionreportto: 'https://google.com',
+                attributionsrc: 'https://adtech.example',
               },
             },
           },
@@ -378,9 +377,185 @@ describes.realWin(
       });
 
       expect(openStub).calledWithExactly(
-        'https://example.com',
+        'https://advertiser.example',
         '_blank',
-        'noopener,attributiondestination=https://example.com,attributionsourceeventid=EFnZ8GunL1xrwNTIHbXrvQ==,attributionreportto=https://google.com'
+        'noopener,attributionsrc=https%3A%2F%2Fadtech.example'
+      );
+    });
+
+    it('should handle empty attributionsrc when given `browserAdConversion`', async () => {
+      env.sandbox
+        .stub(AmpAdExit.prototype, 'detectAttributionReportingSupport')
+        .returns(true);
+      const openStub = env.sandbox.stub(win, 'open').returns(win);
+      const config = {
+        targets: {
+          landingPage: {
+            finalUrl: 'https://adtech.example',
+            behaviors: {
+              browserAdConversion: {
+                attributionsrc: '',
+              },
+            },
+          },
+        },
+      };
+      const el = await makeElementWithConfig(config);
+      const impl = await el.getImpl();
+
+      impl.executeAction({
+        method: 'exit',
+        args: {target: 'landingPage'},
+        event: makeClickEvent(1001),
+        satisfiesTrust: () => true,
+      });
+
+      expect(openStub).calledWithExactly(
+        'https://adtech.example',
+        '_blank',
+        'noopener,attributionsrc='
+      );
+    });
+
+    it('should ignore trackingUrls when attribution tracking enabled', async () => {
+      env.sandbox
+        .stub(AmpAdExit.prototype, 'detectAttributionReportingSupport')
+        .returns(true);
+      const openStub = env.sandbox.stub(win, 'open').returns(win);
+      const config = {
+        targets: {
+          landingPage: {
+            finalUrl: 'https://advertiser.example',
+            behaviors: {
+              browserAdConversion: {
+                attributionsrc: 'https://adtech.example',
+              },
+            },
+            'trackingUrls': [
+              'http://localhost:8000/tracking?1',
+              'http://localhost:8000/tracking?2',
+              'http://localhost:8000/tracking?3',
+            ],
+          },
+        },
+      };
+      const el = await makeElementWithConfig(config);
+      const impl = await el.getImpl();
+
+      impl.executeAction({
+        method: 'exit',
+        args: {target: 'landingPage'},
+        event: makeClickEvent(1001),
+        satisfiesTrust: () => true,
+      });
+
+      expect(openStub).calledWithExactly(
+        'https://advertiser.example',
+        '_blank',
+        'noopener,attributionsrc=https%3A%2F%2Fadtech.example'
+      );
+    });
+
+    it('should fallback to tracking URLS when reporting API disabled', async () => {
+      env.sandbox
+        .stub(AmpAdExit.prototype, 'detectAttributionReportingSupport')
+        .returns(false);
+      const config = {
+        targets: {
+          landingPage: {
+            finalUrl: 'https://adtech.example',
+            behaviors: {
+              browserAdConversion: {
+                attributionsrc: 'https://adtech.example',
+              },
+            },
+            'trackingUrls': [
+              'http://localhost:8000/tracking?1',
+              'http://localhost:8000/tracking?2',
+              'http://localhost:8000/tracking?3',
+            ],
+          },
+        },
+      };
+
+      const open = env.sandbox.stub(win, 'open').callsFake(() => {
+        return {name: 'fakeWin'};
+      });
+      const sendBeacon = env.sandbox
+        .stub(win.navigator, 'sendBeacon')
+        .callsFake(() => true);
+      const el = await makeElementWithConfig(config);
+      const impl = await el.getImpl();
+
+      impl.executeAction({
+        method: 'exit',
+        args: {target: 'landingPage'},
+        event: makeClickEvent(1001),
+        satisfiesTrust: () => true,
+      });
+
+      expect(open).to.have.been.calledOnce;
+      expect(sendBeacon).to.have.been.calledThrice;
+      expect(sendBeacon).to.have.been.calledWith(
+        'http://localhost:8000/tracking?1',
+        ''
+      );
+      expect(sendBeacon).to.have.been.calledWith(
+        'http://localhost:8000/tracking?2',
+        ''
+      );
+      expect(sendBeacon).to.have.been.calledWith(
+        'http://localhost:8000/tracking?3',
+        ''
+      );
+    });
+
+    it('should fallback to tracking URLS when no `browserAdConversion` data', async () => {
+      env.sandbox
+        .stub(AmpAdExit.prototype, 'detectAttributionReportingSupport')
+        .returns(true);
+      const config = {
+        targets: {
+          landingPage: {
+            finalUrl: 'https://adtech.example',
+            'trackingUrls': [
+              'http://localhost:8000/tracking?1',
+              'http://localhost:8000/tracking?2',
+              'http://localhost:8000/tracking?3',
+            ],
+          },
+        },
+      };
+
+      const open = env.sandbox.stub(win, 'open').callsFake(() => {
+        return {name: 'fakeWin'};
+      });
+      const sendBeacon = env.sandbox
+        .stub(win.navigator, 'sendBeacon')
+        .callsFake(() => true);
+      const el = await makeElementWithConfig(config);
+      const impl = await el.getImpl();
+
+      impl.executeAction({
+        method: 'exit',
+        args: {target: 'landingPage'},
+        event: makeClickEvent(1001),
+        satisfiesTrust: () => true,
+      });
+
+      expect(open).to.have.been.calledOnce;
+      expect(sendBeacon).to.have.been.calledThrice;
+      expect(sendBeacon).to.have.been.calledWith(
+        'http://localhost:8000/tracking?1',
+        ''
+      );
+      expect(sendBeacon).to.have.been.calledWith(
+        'http://localhost:8000/tracking?2',
+        ''
+      );
+      expect(sendBeacon).to.have.been.calledWith(
+        'http://localhost:8000/tracking?3',
+        ''
       );
     });
 
@@ -527,6 +702,11 @@ describes.realWin(
         .stub(win.navigator, 'sendBeacon')
         .callsFake(() => true);
 
+      // Mock UACH on URL replacement service directly since amp-ad-exit is sync
+      // only.
+      const replacements = Services.urlReplacementsForDoc(element);
+      replacements.variableSource_.cachedUach_['platform'] = 'TEST_PLATFORM';
+
       impl.executeAction({
         method: 'exit',
         args: {target: 'variables'},
@@ -537,13 +717,13 @@ describes.realWin(
       const urlMatcher = env.sandbox.match(
         new RegExp(
           'http:\\/\\/localhost:8000\\/vars\\?' +
-            'foo=bar&ampdoc=AMPDOC_HOST&r=[0-9\\.]+&x=101&y=102'
+            'foo=bar&ampdoc=AMPDOC_HOST&r=[0-9\\.]+&x=101&y=102&uap=TEST_PLATFORM'
         )
       );
       expect(open).to.have.been.calledWith(urlMatcher, '_blank');
 
       const trackingMatcher = env.sandbox.match(
-        /http:\/\/localhost:8000\/tracking\?r=[0-9\.]+&x=101&y=102/
+        /http:\/\/localhost:8000\/tracking\?r=[0-9\.]+&x=101&y=102&uap=TEST_PLATFORM/
       );
       expect(sendBeacon).to.have.been.calledWith(trackingMatcher, '');
     });
@@ -973,9 +1153,7 @@ describes.realWin(
         const target = {
           behaviors: {
             browserAdConversion: {
-              attributiondestination: 'https://example.com',
-              attributionsourceeventid: 'EFnZ8GunL1xrwNTIHbXrvQ==',
-              attributionreportto: 'https://google.com',
+              attributionsrc: 'https://adtech.example',
             },
           },
         };
@@ -984,16 +1162,14 @@ describes.realWin(
             true /* isAttributionReportingSupported*/,
             target
           )
-        ).to.equal(3);
+        ).to.equal(6);
       });
 
       it('should return ATTRIBUTION_DATA_PRESENT if browserAdConfig is present and no browser support', () => {
         const target = {
           behaviors: {
             browserAdConversion: {
-              attributiondestination: 'https://example.com',
-              attributionsourceeventid: 'EFnZ8GunL1xrwNTIHbXrvQ==',
-              attributionreportto: 'https://google.com',
+              attributionsrc: 'https://adtech.example',
             },
           },
         };
@@ -1002,7 +1178,7 @@ describes.realWin(
             false /* isAttributionReportingSupported*/,
             target
           )
-        ).to.equal(2);
+        ).to.equal(5);
       });
 
       it('should return ATTRIBUTION_MACRO_PRESENT if browserAdConfig not present', () => {
@@ -1014,7 +1190,7 @@ describes.realWin(
             false /* isAttributionReportingSupported*/,
             target
           )
-        ).to.equal(1);
+        ).to.equal(4);
       });
     });
   }
diff --git a/extensions/amp-ad-exit/amp-ad-exit.md b/extensions/amp-ad-exit/amp-ad-exit.md
index 70d89f1a8523..f4a7bcf7a36f 100644
--- a/extensions/amp-ad-exit/amp-ad-exit.md
+++ b/extensions/amp-ad-exit/amp-ad-exit.md
@@ -266,6 +266,13 @@ with custom variables and a limited set of platform variables.
     <td><code>CLICK_Y</code></td>
     <td>The <code>y</code> coordinate of the click in the viewport.</td>
   </tr>
+  <tr>
+    <td><code>UACH</code></td>
+    <td>Provides [user agent client hint](https://github.com/WICG/ua-client-hints) information.
+    <b>WARNING<b>: Because the UACH API is asynchronous and amp-ad-exit is synchronous
+    only, to retrieve UACH signals the values must be retrieved and cached beforehand by
+    another AMP component that also uses variables substitution, otherwise they will be empty.</td>
+  </tr>
 </table>
 
 ### Custom variables
diff --git a/extensions/amp-ad-exit/validator-amp-ad-exit.protoascii b/extensions/amp-ad-exit/validator-amp-ad-exit.protoascii
index 3e8ea5d6a9f6..259f6b3700f9 100644
--- a/extensions/amp-ad-exit/validator-amp-ad-exit.protoascii
+++ b/extensions/amp-ad-exit/validator-amp-ad-exit.protoascii
@@ -12,7 +12,7 @@ tags: {  # <amp-ad-exit>
   html_format: AMP4ADS
   tag_name: "AMP-AD-EXIT"
   requires_extension: "amp-ad-exit"
-  requires: "amp-ad-exit configuration JSON"
+  requires_condition: "amp-ad-exit configuration JSON"
   attr_lists: "extended-amp-global"
   attr_lists: "mandatory-id-attr"
   child_tags: {
@@ -29,7 +29,7 @@ tags: {  # amp-ad-exit config JSON
   html_format: AMP4ADS
   tag_name: "SCRIPT"
   spec_name: "amp-ad-exit configuration JSON"
-  satisfies: "amp-ad-exit configuration JSON"
+  satisfies_condition: "amp-ad-exit configuration JSON"
   requires_extension: "amp-ad-exit"
   mandatory_parent: "AMP-AD-EXIT"
   attrs: {
diff --git a/extensions/amp-ad-network-adsense-impl/0.1/amp-ad-network-adsense-impl.js b/extensions/amp-ad-network-adsense-impl/0.1/amp-ad-network-adsense-impl.js
index e77b0d663ce4..bc6034171044 100644
--- a/extensions/amp-ad-network-adsense-impl/0.1/amp-ad-network-adsense-impl.js
+++ b/extensions/amp-ad-network-adsense-impl/0.1/amp-ad-network-adsense-impl.js
@@ -4,6 +4,10 @@
 // Most other ad networks will want to put their A4A code entirely in the
 // extensions/amp-ad-network-${NETWORK_NAME}-impl directory.
 
+import {
+  handleCookieOptOutPostMessage,
+  maybeSetCookieFromAdResponse,
+} from '#ads/google/a4a/cookie-utils';
 import {
   addAmpExperimentIdToElement,
   addExperimentIdToElement,
@@ -19,13 +23,11 @@ import {
   getCsiAmpAnalyticsConfig,
   getCsiAmpAnalyticsVariables,
   getEnclosingContainerTypes,
-  getIdentityToken,
   getServeNpaPromise,
   googleAdUrl,
   isCdnProxy,
   isReportingEnabled,
   maybeAppendErrorParameter,
-  maybeInsertOriginTrialToken,
 } from '#ads/google/a4a/utils';
 
 import {
@@ -42,7 +44,7 @@ import {
   getExperimentBranch,
   randomlySelectUnsetExperiments,
 } from '#experiments';
-import {StoryAdAutoAdvance} from '#experiments/story-ad-auto-advance';
+import {AttributionReporting} from '#experiments/attribution-reporting';
 import {StoryAdPlacements} from '#experiments/story-ad-placements';
 import {StoryAdSegmentExp} from '#experiments/story-ad-progress-segment';
 
@@ -51,6 +53,7 @@ import {Navigation} from '#service/navigation';
 
 import {getData} from '#utils/event-helper';
 import {dev, devAssert, user} from '#utils/log';
+import {isAttributionReportingAllowed} from '#utils/privacy-sandbox-utils';
 
 import {AdsenseSharedState} from './adsense-shared-state';
 import {ResponsiveState} from './responsive-state';
@@ -122,9 +125,6 @@ export class AmpAdNetworkAdsenseImpl extends AmpA4A {
     /** @private {?ResponsiveState}.  */
     this.responsiveState_ = ResponsiveState.createIfResponsive(element);
 
-    /** @private {?Promise<!../../../ads/google/a4a/utils.IdentityToken>} */
-    this.identityTokenPromise_ = null;
-
     /**
      * @private {?boolean} whether preferential rendered AMP creative, null
      * indicates no creative render.
@@ -173,12 +173,6 @@ export class AmpAdNetworkAdsenseImpl extends AmpA4A {
   */
   buildCallback() {
     super.buildCallback();
-    maybeInsertOriginTrialToken(this.win);
-    this.identityTokenPromise_ = this.getAmpDoc()
-      .whenFirstVisible()
-      .then(() =>
-        getIdentityToken(this.win, this.getAmpDoc(), super.getConsentPolicy())
-      );
 
     // Convert the full-width tag to container width for desktop users.
     if (
@@ -224,7 +218,19 @@ export class AmpAdNetworkAdsenseImpl extends AmpA4A {
    */
   divertExperiments() {
     const experimentInfoList =
-      /** @type {!Array<!../../../src/experiments.ExperimentInfo>} */ ([]);
+      /** @type {!Array<!../../../src/experiments.ExperimentInfo>} */ ([
+        {
+          experimentId: AttributionReporting.ID,
+          isTrafficEligible: () =>
+            isAttributionReportingAllowed(this.win.document),
+          branches: [
+            AttributionReporting.ENABLE,
+            AttributionReporting.DISABLE,
+            AttributionReporting.ENABLE_NO_ASYNC,
+            AttributionReporting.DISABLE_NO_ASYNC,
+          ],
+        },
+      ]);
     const setExps = randomlySelectUnsetExperiments(
       this.win,
       experimentInfoList
@@ -246,14 +252,6 @@ export class AmpAdNetworkAdsenseImpl extends AmpA4A {
       addExperimentIdToElement(storyAdPlacementsExpId, this.element);
     }
 
-    const autoAdvanceExpBranch = getExperimentBranch(
-      this.win,
-      StoryAdAutoAdvance.ID
-    );
-    if (autoAdvanceExpBranch) {
-      addExperimentIdToElement(autoAdvanceExpBranch, this.element);
-    }
-
     const storyAdSegmentBranch = getExperimentBranch(
       this.win,
       StoryAdSegmentExp.ID
@@ -284,12 +282,16 @@ export class AmpAdNetworkAdsenseImpl extends AmpA4A {
     let gdprApplies = undefined;
     let additionalConsent = undefined;
     let consentStringType = undefined;
+    let consentSharedData = undefined;
+    let gppSectionId = undefined;
     if (consentTuple) {
       consentState = consentTuple.consentState;
       consentString = consentTuple.consentString;
       gdprApplies = consentTuple.gdprApplies;
       additionalConsent = consentTuple.additionalConsent;
       consentStringType = consentTuple.consentStringType;
+      consentSharedData = consentTuple.consentSharedData;
+      gppSectionId = consentTuple.gppSectionId;
     }
     if (
       consentState == CONSENT_POLICY_STATE.UNKNOWN &&
@@ -384,10 +386,13 @@ export class AmpAdNetworkAdsenseImpl extends AmpA4A {
           ? this.responsiveState_.getRafmtParam()
           : null,
       'gdpr': gdprApplies === true ? '1' : gdprApplies === false ? '0' : null,
-      'gdpr_consent':
-        consentStringType != CONSENT_STRING_TYPE.US_PRIVACY_STRING
-          ? consentString
-          : null,
+      'gdpr_consent': [
+        undefined,
+        CONSENT_STRING_TYPE.TCF_V1,
+        CONSENT_STRING_TYPE.TCF_V2,
+      ].includes(consentStringType)
+        ? consentString
+        : null,
       'addtl_consent': additionalConsent,
       'us_privacy':
         consentStringType == CONSENT_STRING_TYPE.US_PRIVACY_STRING
@@ -407,29 +412,28 @@ export class AmpAdNetworkAdsenseImpl extends AmpA4A {
       'spsa': this.isSinglePageStoryAd
         ? `${this.size_.width}x${this.size_.height}`
         : null,
+      'tfcd': consentSharedData?.['adsense-tfcd'] ?? null,
+      'tfua': consentSharedData?.['adsense-tfua'] ?? null,
+      'gpp':
+        consentStringType == CONSENT_STRING_TYPE.GLOBAL_PRIVACY_PLATFORM
+          ? consentString
+          : null,
+      'gpp_sid':
+        consentStringType == CONSENT_STRING_TYPE.GLOBAL_PRIVACY_PLATFORM
+          ? gppSectionId
+          : null,
     };
 
     const experimentIds = [];
-    const identityPromise = Services.timerFor(this.win)
-      .timeoutPromise(1000, this.identityTokenPromise_)
-      .catch((unusedErr) => {
-        // On error/timeout, proceed.
-        return /**@type {!../../../ads/google/a4a/utils.IdentityToken}*/ ({});
-      });
-    return identityPromise.then((identity) => {
-      return googleAdUrl(
-        this,
-        ADSENSE_BASE_URL,
-        startTime,
-        {
-          'adsid': identity.token || null,
-          'jar': identity.jar || null,
-          'pucrd': identity.pucrd || null,
-          ...parameters,
-        },
-        experimentIds
-      );
-    });
+    return googleAdUrl(
+      this,
+      ADSENSE_BASE_URL,
+      startTime,
+      {
+        ...parameters,
+      },
+      experimentIds
+    );
   }
 
   /** @override */
@@ -567,6 +571,25 @@ export class AmpAdNetworkAdsenseImpl extends AmpA4A {
       this.element.setAttribute('data-google-query-id', this.qqid_);
     }
     dev().assertElement(this.iframe).id = `google_ads_iframe_${this.ifi_}`;
+
+    // Add listener for GPID cookie optout.
+    this.win.addEventListener('message', (event) => {
+      if (this.checkIfClearCookiePostMessageHasValidSource_(event)) {
+        handleCookieOptOutPostMessage(this.win, event);
+      }
+    });
+  }
+
+  /**
+   * Checks whether the postMessage event's source corresponds to the ad
+   * iframe. Exposed as own function to ease unit testing. (It's near
+   * impossible to simulate the postmessage coming from the creative iframe in
+   * unit test environments).
+   * @param {!Event} event
+   * @return {boolean} True if the source of the message matches the ad iframe.
+   */
+  checkIfClearCookiePostMessageHasValidSource_(event) {
+    return event.source == devAssert(this.iframe.contentWindow);
   }
 
   /** @override */
@@ -641,6 +664,11 @@ export class AmpAdNetworkAdsenseImpl extends AmpA4A {
     }
     return false;
   }
+
+  /** @param {!Response} fetchResponse */
+  onAdResponse(fetchResponse) {
+    maybeSetCookieFromAdResponse(this.win, fetchResponse);
+  }
 }
 
 AMP.extension(TAG, '0.1', (AMP) => {
diff --git a/extensions/amp-ad-network-adsense-impl/0.1/responsive-state.js b/extensions/amp-ad-network-adsense-impl/0.1/responsive-state.js
index 7fcd2738352e..2496b03d5e27 100644
--- a/extensions/amp-ad-network-adsense-impl/0.1/responsive-state.js
+++ b/extensions/amp-ad-network-adsense-impl/0.1/responsive-state.js
@@ -23,7 +23,7 @@ const TAG = 'amp-ad-network-adsense-impl';
 
 /**
  * Value of &rafmt= URL parameter depending on data-auto-format.
- * @const {!Object<string, number>}
+ * @const {!{[key: string]: number}}
  */
 const RAFMT_PARAMS = {
   [ADSENSE_RSPV_TAG]: 13,
diff --git a/extensions/amp-ad-network-adsense-impl/0.1/test/test-amp-ad-network-adsense-impl.js b/extensions/amp-ad-network-adsense-impl/0.1/test/test-amp-ad-network-adsense-impl.js
index 6def32c030b2..e5784f6fa88b 100644
--- a/extensions/amp-ad-network-adsense-impl/0.1/test/test-amp-ad-network-adsense-impl.js
+++ b/extensions/amp-ad-network-adsense-impl/0.1/test/test-amp-ad-network-adsense-impl.js
@@ -3,11 +3,14 @@
 // always available for them. However, when we test an impl in isolation,
 // AmpAd is not loaded already, so we need to load it separately.
 import '../../../amp-ad/0.1/amp-ad';
+import {AMP_GFP_SET_COOKIES_HEADER_NAME} from '#ads/google/a4a/cookie-utils';
+
 import {
   CONSENT_POLICY_STATE,
   CONSENT_STRING_TYPE,
 } from '#core/constants/consent-state';
 import {addAttributesToElement, createElementWithAttributes} from '#core/dom';
+import {camelCaseToHyphenCase} from '#core/dom/style';
 import {utf8Decode, utf8Encode} from '#core/types/string/bytes';
 import {toWin} from '#core/window';
 
@@ -16,10 +19,12 @@ import * as experiments from '#experiments';
 
 import {Services} from '#service';
 
+import {getCookie, setCookie} from 'src/cookies';
+
 import {AmpA4A} from '../../../amp-a4a/0.1/amp-a4a';
 import {AmpAd} from '../../../amp-ad/0.1/amp-ad';
 import {
-  AmpAdXOriginIframeHandler, // eslint-disable-line no-unused-vars
+  AmpAdXOriginIframeHandler, // eslint-disable-line @typescript-eslint/no-unused-vars
 } from '../../../amp-ad/0.1/amp-ad-xorigin-iframe-handler';
 import {
   AmpAdNetworkAdsenseImpl,
@@ -72,7 +77,6 @@ describes.realWin(
       env.sandbox.stub(element, 'tryUpgrade_').callsFake(() => {});
       doc.body.appendChild(element);
       impl = new AmpAdNetworkAdsenseImpl(element);
-      impl.win['goog_identity_prom'] = Promise.resolve({});
       env.sandbox.stub(Services, 'timerFor').returns({
         timeoutPromise: (unused, promise) => {
           if (promise) {
@@ -458,7 +462,7 @@ describes.realWin(
         impl.iframe = {
           contentWindow: window,
           nodeType: 1,
-          style: {},
+          style: {setProperty: () => {}},
         };
         impl.element.setAttribute('data-ad-client', 'ca-adsense');
 
@@ -478,6 +482,90 @@ describes.realWin(
 
         expect(storageContent).to.deep.equal({'aas-ca-adsense': true});
       });
+
+      it('should clear cookies as specified in creative response, with opt out', () => {
+        setCookie(env.win, '__gads', '__gads_val', Date.now() + 100_000);
+        setCookie(env.win, '__gpi', '__gpi_val', Date.now() + 100_000);
+        expect(getCookie(env.win, '__gads')).to.equal('__gads_val');
+        expect(getCookie(env.win, '__gpi')).to.equal('__gpi_val');
+
+        impl.size_ = {width: 123, height: 456};
+        impl.iframe = {
+          contentWindow: window,
+          nodeType: 1,
+          style: {setProperty: () => {}},
+        };
+        impl.onCreativeRender(false);
+        impl.checkIfClearCookiePostMessageHasValidSource_ = () => true;
+        env.win.postMessage(
+          JSON.stringify({
+            googMsgType: 'gpi-uoo',
+            userOptOut: true,
+            clearAdsData: true,
+          }),
+          '*'
+        );
+
+        expect(getCookie(env.win, '__gpi_opt_out')).to.equal('1');
+        expect(getCookie(env.win, '__gads')).to.be.null;
+        expect(getCookie(env.win, '__gpi')).to.be.null;
+      });
+
+      it('should clear cookies as specified in creative response, without opt out', () => {
+        setCookie(env.win, '__gads', '__gads_val', Date.now() + 100_000);
+        setCookie(env.win, '__gpi', '__gpi_val', Date.now() + 100_000);
+        expect(getCookie(env.win, '__gads')).to.equal('__gads_val');
+        expect(getCookie(env.win, '__gpi')).to.equal('__gpi_val');
+
+        impl.size_ = {width: 123, height: 456};
+        impl.iframe = {
+          contentWindow: window,
+          nodeType: 1,
+          style: {setProperty: () => {}},
+        };
+        impl.onCreativeRender(false);
+        impl.checkIfClearCookiePostMessageHasValidSource_ = () => true;
+        env.win.postMessage(
+          JSON.stringify({
+            googMsgType: 'gpi-uoo',
+            userOptOut: false,
+            clearAdsData: true,
+          }),
+          '*'
+        );
+
+        expect(getCookie(env.win, '__gpi_opt_out')).to.equal('0');
+        expect(getCookie(env.win, '__gads')).to.be.null;
+        expect(getCookie(env.win, '__gpi')).to.be.null;
+      });
+
+      it('should not clear cookies as specified in creative response, without opt out or clear ads', () => {
+        setCookie(env.win, '__gads', '__gads_val', Date.now() + 100_000);
+        setCookie(env.win, '__gpi', '__gpi_val', Date.now() + 100_000);
+        expect(getCookie(env.win, '__gads')).to.equal('__gads_val');
+        expect(getCookie(env.win, '__gpi')).to.equal('__gpi_val');
+
+        impl.size_ = {width: 123, height: 456};
+        impl.iframe = {
+          contentWindow: window,
+          nodeType: 1,
+          style: {setProperty: () => {}},
+        };
+        impl.onCreativeRender(false);
+        impl.checkIfClearCookiePostMessageHasValidSource_ = () => true;
+        env.win.postMessage(
+          JSON.stringify({
+            googMsgType: 'gpi-uoo',
+            userOptOut: false,
+            clearAdsData: false,
+          }),
+          '*'
+        );
+
+        expect(getCookie(env.win, '__gpi_opt_out')).to.equal('0');
+        expect(getCookie(env.win, '__gads')).to.equal('__gads_val');
+        expect(getCookie(env.win, '__gpi')).to.equal('__gpi_val');
+      });
     });
 
     describe('centering', () => {
@@ -798,25 +886,6 @@ describes.realWin(
         });
       });
 
-      it('should include identity', () => {
-        // Force get identity result by overloading window variable.
-        const token =
-          /**@type {!../../../ads/google/a4a/utils.IdentityToken}*/ ({
-            token: 'abcdef',
-            jar: 'some_jar',
-            pucrd: 'some_pucrd',
-          });
-        impl.win['goog_identity_prom'] = Promise.resolve(token);
-        impl.buildCallback();
-        return impl.getAdUrl().then((url) => {
-          [
-            /(\?|&)adsid=abcdef(&|$)/,
-            /(\?|&)jar=some_jar(&|$)/,
-            /(\?|&)pucrd=some_pucrd(&|$)/,
-          ].forEach((regexp) => expect(url).to.match(regexp));
-        });
-      });
-
       it('includes adsense package code when present', () => {
         element.setAttribute('data-package', 'package_code');
         return expect(impl.getAdUrl()).to.eventually.match(
@@ -957,6 +1026,45 @@ describes.realWin(
         });
       });
 
+      it('should set tfcd parameter if set in shared data', () => {
+        impl.uiHandler = {isStickyAd: () => false};
+        const consentSharedData = {
+          'adsense-tfua': 0,
+          'adsense-tfcd': 1,
+        };
+        return impl.getAdUrl({consentSharedData}).then((url) => {
+          expect(url).to.match(/(\?|&)tfua=0(&|$)/);
+          expect(url).to.match(/(\?|&)tfcd=1(&|$)/);
+        });
+      });
+
+      it('should set tfua parameter if set in shared data', () => {
+        impl.uiHandler = {isStickyAd: () => false};
+        const consentSharedData = {
+          'adsense-tfua': 1,
+          'adsense-tfcd': 0,
+        };
+        return impl.getAdUrl({consentSharedData}).then((url) => {
+          expect(url).to.match(/(\?|&)tfua=1(&|$)/);
+          expect(url).to.match(/(\?|&)tfcd=0(&|$)/);
+        });
+      });
+
+      it('should include gpp, if consentStringType is GLOBAL_PRIVACY_PLATFORM', () => {
+        impl.uiHandler = {isStickyAd: () => false};
+        return impl
+          .getAdUrl({
+            consentStringType: CONSENT_STRING_TYPE.GLOBAL_PRIVACY_PLATFORM,
+            consentString: 'gppString',
+            gppSectionId: '1,2',
+          })
+          .then((url) => {
+            expect(url).to.match(/(\?|&)gpp=gppString(&|$)/);
+            expect(url).to.match(/(\?|&)gpp_sid=1%2C2(&|$)/);
+            expect(url).to.not.match(/(\?|&)us_privacy=/);
+          });
+      });
+
       describe('SSR experiments', () => {
         it('should include SSR experiments', () => {
           env.sandbox
@@ -1536,7 +1644,12 @@ describes.realWin(
         };
         impl.iframe = {
           contentWindow: window,
-          style: {'visibility': 'hidden'},
+          style: {
+            'visibility': 'hidden',
+            setProperty: (name, value) => {
+              impl.iframe.style[camelCaseToHyphenCase(name)] = value;
+            },
+          },
         };
         win.postMessage('fill_sticky', '*');
         return renderPromise.then(() => {
@@ -1581,3 +1694,56 @@ describes.realWin(
     });
   }
 );
+
+// Separate from main describe function because of difficulty testing cookie setting with real window.
+describes.fakeWin(
+  'amp-ad-network-adsense-impl#onAdResponse',
+  {amp: true},
+  (env) => {
+    let element;
+    let impl;
+    beforeEach(() => {
+      element = env.win.document.createElement('amp-ad');
+      element.setAttribute('type', 'adsense');
+      env.win.document.body.appendChild(element);
+      impl = new AmpAdNetworkAdsenseImpl(element);
+    });
+
+    afterEach(() => {
+      env.win.document.body.removeChild(element);
+    });
+
+    it('sets cookies as specified on the ad response', () => {
+      impl.onAdResponse({
+        headers: {
+          has: (header) => {
+            return header === AMP_GFP_SET_COOKIES_HEADER_NAME;
+          },
+          get: (header) => {
+            if (header !== AMP_GFP_SET_COOKIES_HEADER_NAME) {
+              return;
+            }
+
+            return JSON.stringify([
+              {
+                '_version_': 1,
+                '_value_': 'val1',
+                '_domain_': 'foo.com',
+                '_expiration_': Date.now() + 100_000,
+              },
+              {
+                '_version_': 2,
+                '_value_': 'val2',
+                '_domain_': 'foo.com',
+                '_expiration_': Date.now() + 100_000,
+              },
+            ]);
+          },
+        },
+      });
+
+      expect(getCookie(env.win, '__gads')).to.equal('val1');
+      expect(getCookie(env.win, '__gpi')).to.equal('val2');
+    });
+  }
+);
diff --git a/extensions/amp-ad-network-adsense-impl/OWNERS b/extensions/amp-ad-network-adsense-impl/OWNERS
index 659f86464530..c032b7db4795 100644
--- a/extensions/amp-ad-network-adsense-impl/OWNERS
+++ b/extensions/amp-ad-network-adsense-impl/OWNERS
@@ -4,11 +4,7 @@
 {
   rules: [
     {
-      owners: [
-        {name: 'ampproject/wg-ads-reviewers'},
-        {name: 'Jiaming-X', notify: true},
-        {name: 'jeffkaufman', notify: true},
-      ],
+      owners: [{name: 'ampproject/wg-ads-reviewers'}, {name: 'zombifier'}],
     },
   ],
 }
diff --git a/extensions/amp-ad-network-adsense-impl/amp-ad-network-adsense-impl-internal.md b/extensions/amp-ad-network-adsense-impl/amp-ad-network-adsense-impl-internal.md
index 576ab9d6e01c..8b64dfd76c6c 100644
--- a/extensions/amp-ad-network-adsense-impl/amp-ad-network-adsense-impl-internal.md
+++ b/extensions/amp-ad-network-adsense-impl/amp-ad-network-adsense-impl-internal.md
@@ -30,7 +30,27 @@ If the user has responded negatively to the amp-consent component (user rejects
 If the user’s response to the amp-consent is unknown (user dismisses the consent prompt), by default, no ad requests are sent.  
 If `data-npa-on-unknown-consent` is set to true, non-personalized ads will be requested.
 
-See [AdSense Help Center article](https://support.google.com/dfp_premium/answer/7678538) for more information.
+The `amp-consent` response may set the following fields in the `sharedData` object for additional controls:
+
+<table>
+  <tr>
+    <td><strong>Key</strong></td>
+    <td><strong>Description</strong></td>
+    <td><strong>Possible Values</strong></td>
+  </tr>
+  <tr>
+    <td><code>"adsense-tfua"</code></td>
+    <td>Whether the slot should be treated as under-age of consent.</td>
+    <td><code>0</code> or <code>1</code></td>
+  </tr>
+  <tr>
+    <td><code>"adsense-tfcd"</code></td>
+    <td>Whether the slot should be treated as child-directed.</td>
+    <td><code>0</code> or <code>1</code></td>
+  </tr>
+</table>
+
+See [AdSense Help Center article](https://support.google.com/dfp_premium/answer/7678538) and [Restricted Data Processing article](https://support.google.com/adsense/answer/9009582?hl=en) for more information.
 
 #### Examples
 
diff --git a/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js b/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js
index f0389fe63b4e..42eb0b1f8257 100644
--- a/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js
+++ b/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js
@@ -5,6 +5,10 @@
 // extensions/amp-ad-network-${NETWORK_NAME}-impl directory.
 
 import '#service/real-time-config/real-time-config-impl';
+import {
+  handleCookieOptOutPostMessage,
+  maybeSetCookieFromAdResponse,
+} from '#ads/google/a4a/cookie-utils';
 import {
   lineDelimitedStreamer,
   metaJsonCreativeGrouper,
@@ -25,7 +29,6 @@ import {
   getCsiAmpAnalyticsConfig,
   getCsiAmpAnalyticsVariables,
   getEnclosingContainerTypes,
-  getIdentityToken,
   getServeNpaPromise,
   googleAdUrl,
   googleBlockParameters,
@@ -34,7 +37,6 @@ import {
   isCdnProxy,
   isReportingEnabled,
   maybeAppendErrorParameter,
-  maybeInsertOriginTrialToken,
   truncAndTimeUrl,
 } from '#ads/google/a4a/utils';
 import {getMultiSizeDimensions} from '#ads/google/utils';
@@ -47,7 +49,7 @@ import {Deferred} from '#core/data-structures/promise';
 import {createElementWithAttributes, isRTL, removeElement} from '#core/dom';
 import {escapeCssSelectorIdent} from '#core/dom/css-selectors';
 import {domFingerprintPlain} from '#core/dom/fingerprint';
-import {Layout, isLayoutSizeDefined} from '#core/dom/layout';
+import {Layout_Enum, isLayoutSizeDefined} from '#core/dom/layout';
 import {getPageLayoutBoxBlocking} from '#core/dom/layout/page-layout-box';
 import {
   assertDoesNotContainDisplay,
@@ -55,7 +57,7 @@ import {
   setStyles,
 } from '#core/dom/style';
 import {isArray} from '#core/types';
-import {deepMerge, dict} from '#core/types/object';
+import {deepMerge} from '#core/types/object';
 import {tryParseJson} from '#core/types/object/json';
 import {stringHash32} from '#core/types/string';
 import {getCryptoRandomBytesArray, utf8Decode} from '#core/types/string/bytes';
@@ -67,7 +69,7 @@ import {
   isExperimentOn,
   randomlySelectUnsetExperiments,
 } from '#experiments';
-import {StoryAdAutoAdvance} from '#experiments/story-ad-auto-advance';
+import {AttributionReporting} from '#experiments/attribution-reporting';
 import {StoryAdPlacements} from '#experiments/story-ad-placements';
 import {StoryAdSegmentExp} from '#experiments/story-ad-progress-segment';
 
@@ -76,6 +78,7 @@ import {Navigation} from '#service/navigation';
 import {RTC_VENDORS} from '#service/real-time-config/callout-vendors';
 
 import {dev, devAssert, user} from '#utils/log';
+import {isAttributionReportingAllowed} from '#utils/privacy-sandbox-utils';
 
 import {
   FlexibleAdSlotDataTypeDef,
@@ -84,6 +87,7 @@ import {
 import {SafeframeHostApi} from './safeframe-host';
 import {
   TFCD,
+  TFUA,
   constructSRABlockParameters,
   serializeTargeting,
   sraBlockCallbackHandler,
@@ -99,9 +103,10 @@ import {
   DEFAULT_SAFEFRAME_VERSION,
   XORIGIN_MODE,
   assignAdUrlToError,
+  tryAddingCookieParams,
 } from '../../amp-a4a/0.1/amp-a4a';
 import {
-  RefreshManager, // eslint-disable-line no-unused-vars
+  RefreshManager, // eslint-disable-line @typescript-eslint/no-unused-vars
   getRefreshManager,
 } from '../../amp-a4a/0.1/refresh-manager';
 import {AMP_SIGNATURE_HEADER} from '../../amp-a4a/0.1/signature-verifier';
@@ -168,7 +173,7 @@ const TARGETING_MACRO_ALLOWLIST = {
 
 /**
  * Map of pageview tokens to the instances they belong to.
- * @private {!Object<string, !AmpAdNetworkDoubleclickImpl>}
+ * @private {!{[key: string]: !AmpAdNetworkDoubleclickImpl}}
  */
 let tokensToInstances = {};
 
@@ -276,12 +281,6 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
     /** @private {?string} */
     this.fluidImpressionUrl_ = null;
 
-    /** @private {?Promise<!../../../ads/google/a4a/utils.IdentityToken>} */
-    this.identityTokenPromise_ = null;
-
-    /** @type {?../../../ads/google/a4a/utils.IdentityToken} */
-    this.identityToken = null;
-
     /** @private {!TroubleshootDataDef} */
     this.troubleshootData_ = /** @type {!TroubleshootDataDef} */ ({});
 
@@ -417,7 +416,7 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
 
   /** @override */
   isLayoutSupported(layout) {
-    this.isFluidPrimaryRequest_ = layout == Layout.FLUID;
+    this.isFluidPrimaryRequest_ = layout == Layout_Enum.FLUID;
     this.isFluidRequest_ = this.isFluidRequest_ || this.isFluidPrimaryRequest_;
     return this.isFluidPrimaryRequest_ || isLayoutSizeDefined(layout);
   }
@@ -476,6 +475,17 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
           },
           branches: Object.values(IDLE_CWV_EXP_BRANCHES),
         },
+        {
+          experimentId: AttributionReporting.ID,
+          isTrafficEligible: () =>
+            isAttributionReportingAllowed(this.win.document),
+          branches: [
+            AttributionReporting.ENABLE,
+            AttributionReporting.DISABLE,
+            AttributionReporting.ENABLE_NO_ASYNC,
+            AttributionReporting.DISABLE_NO_ASYNC,
+          ],
+        },
       ]);
     const setExps = this.randomlySelectUnsetExperiments_(experimentInfoList);
     Object.keys(setExps).forEach(
@@ -498,14 +508,6 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
       addExperimentIdToElement(storyAdPlacementsExpId, this.element);
     }
 
-    const autoAdvanceExpBranch = getExperimentBranch(
-      this.win,
-      StoryAdAutoAdvance.ID
-    );
-    if (autoAdvanceExpBranch) {
-      addExperimentIdToElement(autoAdvanceExpBranch, this.element);
-    }
-
     const storyAdSegmentBranch = getExperimentBranch(
       this.win,
       StoryAdSegmentExp.ID
@@ -518,7 +520,7 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
   /**
    * For easier unit testing.
    * @param {!Array<!../../../src/experiments.ExperimentInfo>} experimentInfoList
-   * @return {!Object<string, string>}
+   * @return {!{[key: string]: string}}
    */
   randomlySelectUnsetExperiments_(experimentInfoList) {
     return randomlySelectUnsetExperiments(this.win, experimentInfoList);
@@ -568,7 +570,6 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
   buildCallback() {
     super.buildCallback();
     this.maybeDeprecationWarn_();
-    maybeInsertOriginTrialToken(this.win);
     this.setPageLevelExperiments(this.extractUrlExperimentId_());
     const pubEnabledSra = !!this.win.document.querySelector(
       'meta[name=amp-ad-doubleclick-sra]'
@@ -593,11 +594,6 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
           DOUBLECLICK_SRA_EXP_BRANCHES.SRA,
           DOUBLECLICK_SRA_EXP_BRANCHES.SRA_NO_RECOVER,
         ].some((eid) => this.experimentIds.indexOf(eid) >= 0));
-    this.identityTokenPromise_ = this.getAmpDoc()
-      .whenFirstVisible()
-      .then(() =>
-        getIdentityToken(this.win, this.getAmpDoc(), super.getConsentPolicy())
-      );
     this.troubleshootData_.slotId = this.element.getAttribute('data-slot');
     this.troubleshootData_.slotIndex = this.element.getAttribute(
       'data-amp-slot-index'
@@ -618,16 +614,27 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
   /**
    * @param {?ConsentTupleDef} consentTuple
    * @param {!Array<!AmpAdNetworkDoubleclickImpl>=} instances
-   * @return {!Object<string,string|boolean|number>}
+   * @return {!{[key: string]: string|boolean|number}}
    * @visibleForTesting
    */
   getPageParameters(consentTuple, instances) {
     instances = instances || [this];
     const tokens = getPageviewStateTokensForAdRequest(instances);
-    const {additionalConsent, consentString, consentStringType, gdprApplies} =
-      consentTuple;
-
-    return {
+    const {
+      additionalConsent,
+      consentSharedData,
+      consentString,
+      consentStringType,
+      gdprApplies,
+      gppSectionId,
+    } = consentTuple;
+
+    const tfcdFromSharedData = consentSharedData?.['doubleclick-tfcd'];
+    const tfuaFromSharedData = consentSharedData?.['doubleclick-tfua'];
+    const tfcdFromJson = this.jsonTargeting && this.jsonTargeting[TFCD];
+    const tfuaFromJson = this.jsonTargeting && this.jsonTargeting[TFUA];
+
+    const params = {
       'ptt': 13,
       'npa':
         consentTuple.consentState == CONSENT_POLICY_STATE.INSUFFICIENT ||
@@ -641,16 +648,31 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
       'gct': this.getLocationQueryParameterValue('google_preview') || null,
       'psts': tokens.length ? tokens : null,
       'gdpr': gdprApplies === true ? '1' : gdprApplies === false ? '0' : null,
-      'gdpr_consent':
-        consentStringType != CONSENT_STRING_TYPE.US_PRIVACY_STRING
-          ? consentString
-          : null,
+      'gdpr_consent': [
+        undefined,
+        CONSENT_STRING_TYPE.TCF_V1,
+        CONSENT_STRING_TYPE.TCF_V2,
+      ].includes(consentStringType)
+        ? consentString
+        : null,
       'addtl_consent': additionalConsent,
       'us_privacy':
         consentStringType == CONSENT_STRING_TYPE.US_PRIVACY_STRING
           ? consentString
           : null,
+      'tfcd': combineConsentParams(tfcdFromSharedData, tfcdFromJson),
+      'tfua': combineConsentParams(tfuaFromSharedData, tfuaFromJson),
+      'gpp':
+        consentStringType == CONSENT_STRING_TYPE.GLOBAL_PRIVACY_PLATFORM
+          ? consentString
+          : null,
+      'gpp_sid':
+        consentStringType == CONSENT_STRING_TYPE.GLOBAL_PRIVACY_PLATFORM
+          ? gppSectionId
+          : null,
     };
+    tryAddingCookieParams(consentTuple, this.win, params);
+    return params;
   }
 
   /**
@@ -662,12 +684,10 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
 
   /**
    * Constructs block-level url parameters.
-   * @return {!Object<string,string|boolean|number>}
+   * @return {!{[key: string]: string|boolean|number}}
    */
   getBlockParameters_() {
     devAssert(this.initialSize_);
-    devAssert(this.jsonTargeting);
-    const tfcd = this.jsonTargeting && this.jsonTargeting[TFCD];
     this.win['ampAdGoogleIfiCounter'] = this.win['ampAdGoogleIfiCounter'] || 1;
     this.ifi_ =
       (this.isRefreshing && this.ifi_) || this.win['ampAdGoogleIfiCounter']++;
@@ -702,7 +722,6 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
       'sz': this.isSinglePageStoryAd ? '1x1' : this.parameterSize,
       'output': 'html',
       'impl': 'ifr',
-      'tfcd': tfcd == undefined ? null : tfcd,
       'adtest': isInManualExperiment(this.element) ? 'on' : null,
       'ifi': this.ifi_,
       'rc': this.refreshCount_ || null,
@@ -743,9 +762,9 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
     this.initialSize_ = this.isFluidPrimaryRequest_
       ? {width: 0, height: 0}
       : width && height
-      ? // width/height could be 'auto' in which case we fallback to measured.
-        {width, height}
-      : this.getIntersectionElementLayoutBox();
+        ? // width/height could be 'auto' in which case we fallback to measured.
+          {width, height}
+        : this.getIntersectionElementLayoutBox();
     this.jsonTargeting = tryParseJson(this.element.getAttribute('json')) || {};
     this.adKey = this.generateAdKey_(
       `${this.initialSize_.width}x${this.initialSize_.height}`
@@ -790,13 +809,6 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
     const startTime = Date.now();
     const timerService = Services.timerFor(this.win);
 
-    const identityPromise = timerService
-      .timeoutPromise(1000, this.identityTokenPromise_)
-      .catch(() => {
-        // On error/timeout, proceed.
-        return /**@type {!../../../ads/google/a4a/utils.IdentityToken}*/ ({});
-      });
-
     const checkStillCurrent = this.verifyStillCurrent();
 
     const rtcParamsPromise = opt_rtcResponsesPromise.then((results) => {
@@ -810,27 +822,23 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
         dev().warn(TAG, 'JSON Targeting expansion failed/timed out.');
       });
 
-    Promise.all([
-      rtcParamsPromise,
-      identityPromise,
-      targetingExpansionPromise,
-    ]).then((results) => {
-      checkStillCurrent();
-      const rtcParams = results[0];
-      this.identityToken = results[1];
-      googleAdUrl(
-        this,
-        DOUBLECLICK_BASE_URL,
-        startTime,
-        Object.assign(
-          this.getBlockParameters_(),
-          this.buildIdentityParams(),
-          this.getPageParameters(consentTuple, /* instances= */ undefined),
-          rtcParams
-        ),
-        this.experimentIds
-      ).then((adUrl) => this.getAdUrlDeferred.resolve(adUrl));
-    });
+    Promise.all([rtcParamsPromise, targetingExpansionPromise]).then(
+      (results) => {
+        checkStillCurrent();
+        const rtcParams = results[0];
+        googleAdUrl(
+          this,
+          DOUBLECLICK_BASE_URL,
+          startTime,
+          Object.assign(
+            this.getBlockParameters_(),
+            this.getPageParameters(consentTuple, /* instances= */ undefined),
+            rtcParams
+          ),
+          this.experimentIds
+        ).then((adUrl) => this.getAdUrlDeferred.resolve(adUrl));
+      }
+    );
     this.troubleshootData_.adUrl = this.getAdUrlDeferred.promise;
     return this.getAdUrlDeferred.promise;
   }
@@ -893,20 +901,6 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
     );
   }
 
-  /**
-   * Converts identity token response to ad request parameters.
-   * @return {!Object<string,string>}
-   */
-  buildIdentityParams() {
-    return this.identityToken
-      ? {
-          adsid: this.identityToken.token || null,
-          jar: this.identityToken.jar || null,
-          pucrd: this.identityToken.pucrd || null,
-        }
-      : {};
-  }
-
   /**
    * Merges all of the rtcResponses into the JSON targeting and
    * category exclusions.
@@ -968,7 +962,7 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
   }
 
   /** @override */
-  getCustomRealTimeConfigMacros_() {
+  getCustomRealTimeConfigMacros_(hasStorageConsent) {
     /**
      * This lists allowed attributes on the amp-ad element to be used as
      * macros for constructing the RTC URL. Add attributes here, in lowercase,
@@ -996,12 +990,14 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
           (tryParseJson(this.element.getAttribute('json')) || {})['targeting']
         ),
       ADCID: (opt_timeout) =>
-        getOrCreateAdCid(
-          this.getAmpDoc(),
-          'AMP_ECID_GOOGLE',
-          '_ga',
-          parseInt(opt_timeout, 10)
-        ),
+        hasStorageConsent
+          ? getOrCreateAdCid(
+              this.getAmpDoc(),
+              'AMP_ECID_GOOGLE',
+              '_ga',
+              parseInt(opt_timeout, 10)
+            )
+          : Promise.resolve(undefined),
       ATTR: (name) => {
         if (!allowlist[name.toLowerCase()]) {
           dev().warn(TAG, `Invalid attribute ${name}`);
@@ -1044,9 +1040,9 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
   /**
    * Appends the callout value to the keys of response to prevent a collision
    * case caused by multiple vendors returning the same keys.
-   * @param {!Object<string, string>} response
+   * @param {!{[key: string]: string}} response
    * @param {string} callout
-   * @return {!Object<string, string>}
+   * @return {!{[key: string]: string}}
    * @private
    */
   rewriteRtcKeys_(response, callout) {
@@ -1404,9 +1400,28 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
         return true;
       });
 
+    // Add listener for GPID cookie optout.
+    this.win.addEventListener('message', (event) => {
+      if (this.checkIfClearCookiePostMessageHasValidSource_(event)) {
+        handleCookieOptOutPostMessage(this.win, event);
+      }
+    });
+
     this.postTroubleshootMessage();
   }
 
+  /**
+   * Checks whether the postMessage event's source corresponds to the ad
+   * iframe. Exposed as own function to ease unit testing. (It's near
+   * impossible to simulate the postmessage coming from the creative iframe in
+   * unit test environments).
+   * @param {!Event} event
+   * @return {boolean} True if the source of the message matches the ad iframe.
+   */
+  checkIfClearCookiePostMessageHasValidSource_(event) {
+    return event.source == devAssert(this.iframe.contentWindow);
+  }
+
   /**
    * Attempts to expand a fluid creative. If the attempt fails, we will
    * re-attempt whenever the slot is out of the viewport until we succeed,
@@ -1548,7 +1563,7 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
     const {parentStyle, parentWidth} = this.flexibleAdSlotData_;
     const isRtl = isRTL(this.win.document);
     const dirStr = isRtl ? 'Right' : 'Left';
-    const /** !Object<string, string> */ style = this.inZIndexHoldBack_
+    const /** !{[key: string]: string} */ style = this.inZIndexHoldBack_
         ? {'z-index': '11'}
         : {};
     // Compute offset margins if the slot is not centered by default.
@@ -1601,15 +1616,11 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
           this.getAmpDoc()
             .getBody()
             .appendChild(
-              createElementWithAttributes(
-                this.win.document,
-                'amp-pixel',
-                dict({
-                  'src':
-                    'https://pagead2.googlesyndication.com/pagead/gen_204?' +
-                    `id=${encodeURIComponent('a4a::sra')}&ifi=${this.ifi_}`,
-                })
-              )
+              createElementWithAttributes(this.win.document, 'amp-pixel', {
+                'src':
+                  'https://pagead2.googlesyndication.com/pagead/gen_204?' +
+                  `id=${encodeURIComponent('a4a::sra')}&ifi=${this.ifi_}`,
+              })
             );
         }
       }
@@ -1643,14 +1654,10 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
         this.getAmpDoc()
           .getBody()
           .appendChild(
-            createElementWithAttributes(
-              this.win.document,
-              'amp-pixel',
-              dict({
-                'src': url,
-                'referrerpolicy': scrubReferer ? 'no-referrer' : '',
-              })
-            )
+            createElementWithAttributes(this.win.document, 'amp-pixel', {
+              'src': url,
+              'referrerpolicy': scrubReferer ? 'no-referrer' : '',
+            })
           );
       } catch (unusedError) {}
     });
@@ -1669,7 +1676,7 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
   /**
    * Groups slots by type and networkId from data-slot parameter.  Exposed for
    * ease of testing.
-   * @return {!Promise<!Object<string,!Array<!Promise<!../../../src/base-element.BaseElement>>>>}
+   * @return {!Promise<!{[key: string]: !Array<!Promise<!../../../src/base-element.BaseElement}>>>}
    * @visibleForTesting
    */
   groupSlotsForSra() {
@@ -1942,32 +1949,30 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
     return this.troubleshootData_.adUrl.then((adUrl) => {
       const slotId =
         this.troubleshootData_.slotId + '_' + this.troubleshootData_.slotIndex;
-      const payload = dict({
-        'gutData': JSON.stringify(
-          dict({
-            'events': [
-              {
-                'timestamp': Date.now(),
-                'slotid': slotId,
-                'messageId': 4,
-              },
-            ],
-            'slots': [
-              {
-                'contentUrl': adUrl || '',
-                'id': slotId,
-                'leafAdUnitName': this.troubleshootData_.slotId,
-                'domId': slotId,
-                'lineItemId': this.troubleshootData_.lineItemId,
-                'creativeId': this.troubleshootData_.creativeId,
-              },
-            ],
-          })
-        ),
+      const payload = {
+        'gutData': JSON.stringify({
+          'events': [
+            {
+              'timestamp': Date.now(),
+              'slotid': slotId,
+              'messageId': 4,
+            },
+          ],
+          'slots': [
+            {
+              'contentUrl': adUrl || '',
+              'id': slotId,
+              'leafAdUnitName': this.troubleshootData_.slotId,
+              'domId': slotId,
+              'lineItemId': this.troubleshootData_.lineItemId,
+              'creativeId': this.troubleshootData_.creativeId,
+            },
+          ],
+        }),
         'userAgent': navigator.userAgent,
         'referrer': this.win.location.href,
         'messageType': 'LOAD',
-      });
+      };
       this.win.opener./*OK*/ postMessage(payload, '*');
     });
   }
@@ -2011,6 +2016,11 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
   isFluidRequest() {
     return this.isFluidRequest_;
   }
+
+  /** @param {!Response} fetchResponse */
+  onAdResponse(fetchResponse) {
+    maybeSetCookieFromAdResponse(this.win, fetchResponse);
+  }
 }
 
 AMP.extension(TAG, '0.1', (AMP) => {
@@ -2091,3 +2101,21 @@ export function getPageviewStateTokensForAdRequest(instancesInAdRequest) {
 export function resetTokensToInstancesMap() {
   tokensToInstances = {};
 }
+
+/**
+ * Function to handle the three-state boolean logic of tfcd/tfua params.
+ * - If any params are 1, return 1.
+ * - Else if any of them are 0, return 0.
+ * - Else return null
+ * @param {?number} param1
+ * @param {?number} param2
+ * @return {?string}
+ */
+function combineConsentParams(param1, param2) {
+  if (String(param1) === '1' || String(param2) === '1') {
+    return '1';
+  } else if (String(param1) === '0' || String(param2) === '0') {
+    return '0';
+  }
+  return null;
+}
diff --git a/extensions/amp-ad-network-doubleclick-impl/0.1/flexible-ad-slot-utils.js b/extensions/amp-ad-network-doubleclick-impl/0.1/flexible-ad-slot-utils.js
index 61f5f6ba927e..636211e37ab8 100644
--- a/extensions/amp-ad-network-doubleclick-impl/0.1/flexible-ad-slot-utils.js
+++ b/extensions/amp-ad-network-doubleclick-impl/0.1/flexible-ad-slot-utils.js
@@ -1,4 +1,4 @@
-import {Layout} from '#core/dom/layout';
+import {Layout_Enum} from '#core/dom/layout';
 
 import {Services} from '#service';
 
@@ -25,13 +25,13 @@ function getElementWidthVisitor(setWidth) {
   return (element, style) => {
     const layout = element.getAttribute('layout');
     switch (layout) {
-      case Layout.FIXED:
+      case Layout_Enum.FIXED:
         setWidth(parseInt(element.getAttribute('width'), 10) || 0);
         return true;
-      case Layout.RESPONSIVE:
-      case Layout.FILL:
-      case Layout.FIXED_HEIGHT:
-      case Layout.FLUID:
+      case Layout_Enum.RESPONSIVE:
+      case Layout_Enum.FILL:
+      case Layout_Enum.FIXED_HEIGHT:
+      case Layout_Enum.FLUID:
         // The above layouts determine the width of the element by the
         // containing element, or by CSS max-width property.
         const maxWidth = parseInt(style.maxWidth, 10);
@@ -40,15 +40,15 @@ function getElementWidthVisitor(setWidth) {
           return true;
         }
         break;
-      case Layout.CONTAINER:
+      case Layout_Enum.CONTAINER:
         // Container layout allows the container's size to be determined by
         // the children within it, so in principle we can grow as large as the
         // viewport.
         const viewport = Services.viewportForDoc(dev().assertElement(element));
         setWidth(viewport.getSize().width);
         return true;
-      case Layout.NODISPLAY:
-      case Layout.FLEX_ITEM:
+      case Layout_Enum.NODISPLAY:
+      case Layout_Enum.FLEX_ITEM:
         setWidth(0);
         return true;
       default:
@@ -91,7 +91,7 @@ function getFullWidthSignalVisitor(setSignal) {
  *    fwSignal: number,
  *    slotWidth: number,
  *    parentWidth: number,
- *    parentStyle: ?Object<string, string>,
+ *    parentStyle: ?{[key: string]: string},
  * }}
  */
 export let FlexibleAdSlotDataTypeDef;
diff --git a/extensions/amp-ad-network-doubleclick-impl/0.1/safeframe-host.js b/extensions/amp-ad-network-doubleclick-impl/0.1/safeframe-host.js
index ebb9e1dbf82c..d6aae97210f4 100644
--- a/extensions/amp-ad-network-doubleclick-impl/0.1/safeframe-host.js
+++ b/extensions/amp-ad-network-doubleclick-impl/0.1/safeframe-host.js
@@ -1,7 +1,7 @@
 import {getPageLayoutBoxBlocking} from '#core/dom/layout/page-layout-box';
 import {getStyle, setStyles} from '#core/dom/style';
 import {throttle} from '#core/types/function';
-import {dict, hasOwn} from '#core/types/object';
+import {hasOwn} from '#core/types/object';
 import {tryParseJson} from '#core/types/object/json';
 
 import {Services} from '#service';
@@ -16,7 +16,7 @@ import {parseUrlDeprecated} from '../../../src/url';
  *
  * Maps a sentinel value to an instance of the SafeframeHostApi to which that
  * sentinel value belongs.
- * @type {!Object<string, !SafeframeHostApi>}
+ * @type {!{[key: string]: !SafeframeHostApi}}
  */
 export const safeframeHosts = {};
 
@@ -206,33 +206,29 @@ export class SafeframeHostApi {
    * @return {!JsonObject}
    */
   getSafeframeNameAttr() {
-    const attributes = dict({});
+    const attributes = {};
     attributes['uid'] = this.uid_;
     attributes['hostPeerName'] = this.win_.location.origin;
     attributes['initialGeometry'] = this.getInitialGeometry();
-    attributes['permissions'] = JSON.stringify(
-      dict({
-        'expandByOverlay': this.expandByOverlay_,
-        'expandByPush': this.expandByPush_,
-        'readCookie': false,
-        'writeCookie': false,
-      })
-    );
-    attributes['metadata'] = JSON.stringify(
-      dict({
-        'shared': {
-          'sf_ver': this.baseInstance_.safeframeVersion,
-          'ck_on': 1,
-          'flash_ver': '26.0.0',
-          // Once GPT Safeframe is updated to look in amp object,
-          // remove this canonical_url here.
+    attributes['permissions'] = JSON.stringify({
+      'expandByOverlay': this.expandByOverlay_,
+      'expandByPush': this.expandByPush_,
+      'readCookie': false,
+      'writeCookie': false,
+    });
+    attributes['metadata'] = JSON.stringify({
+      'shared': {
+        'sf_ver': this.baseInstance_.safeframeVersion,
+        'ck_on': 1,
+        'flash_ver': '26.0.0',
+        // Once GPT Safeframe is updated to look in amp object,
+        // remove this canonical_url here.
+        'canonical_url': this.maybeGetCanonicalUrl(),
+        'amp': {
           'canonical_url': this.maybeGetCanonicalUrl(),
-          'amp': {
-            'canonical_url': this.maybeGetCanonicalUrl(),
-          },
         },
-      })
-    );
+      },
+    });
     attributes['reportCreativeGeometry'] = this.isFluid_;
     attributes['isDifferentSourceWindow'] = false;
     attributes['sentinel'] = this.sentinel_;
@@ -449,7 +445,7 @@ export class SafeframeHostApi {
       dev().expectedError(TAG, 'Frame contentWindow unavailable.');
       return;
     }
-    const message = dict();
+    const message = {};
     message[MESSAGE_FIELDS.CHANNEL] = this.channel;
     message[MESSAGE_FIELDS.PAYLOAD] = JSON.stringify(
       /** @type {!JsonObject} */ (payload)
@@ -763,7 +759,7 @@ export class SafeframeHostApi {
       return;
     }
     this.iframe_.contentWindow./*OK*/ postMessage(
-      JSON.stringify(dict({'message': 'resize-complete', 'c': this.channel})),
+      JSON.stringify({'message': 'resize-complete', 'c': this.channel}),
       '*'
     );
   }
diff --git a/extensions/amp-ad-network-doubleclick-impl/0.1/sra-utils.js b/extensions/amp-ad-network-doubleclick-impl/0.1/sra-utils.js
index b0c801dad44b..6cbc5088aac9 100644
--- a/extensions/amp-ad-network-doubleclick-impl/0.1/sra-utils.js
+++ b/extensions/amp-ad-network-doubleclick-impl/0.1/sra-utils.js
@@ -19,7 +19,13 @@ const TAG = 'amp-ad-network-doubleclick-impl';
  */
 export const TFCD = 'tagForChildDirectedTreatment';
 
-/** @private {!Array<function(!Array<!./amp-ad-network-doubleclick-impl.AmpAdNetworkDoubleclickImpl>):?Object<string,string>>} */
+/**
+ * @const {string}
+ * @visibleForTesting
+ */
+export const TFUA = 'tagForUnderAgeTreatment';
+
+/** @private {!Array<function(!Array<!./amp-ad-network-doubleclick-impl.AmpAdNetworkDoubleclickImpl>):?{[key: string]: string}>} */
 const SRA_JOINERS = [
   combineInventoryUnits,
   getCookieOptOut,
@@ -29,7 +35,6 @@ const SRA_JOINERS = [
   isAdTest,
   getTargetingAndExclusions,
   getExperimentIds,
-  getIdentity,
   getForceSafeframe,
   getPageOffsets,
   getContainers,
@@ -38,7 +43,7 @@ const SRA_JOINERS = [
 
 /**
  * @param {!Array<!./amp-ad-network-doubleclick-impl.AmpAdNetworkDoubleclickImpl>} impls
- * @return {!Object<string, *>}
+ * @return {!{[key: string]: *}}
  */
 export function constructSRABlockParameters(impls) {
   const parameters = {'output': 'ldjh', 'impl': 'fifs'};
@@ -73,7 +78,7 @@ function getFirstInstanceValue_(impls, extractFn) {
  * Example: /123/foo/bar and /blah/foo/bar/123 =>
  *    iu_parts=123,foo,bar,blah & enc_prev_ius=/0/1/2,/3/1/2/0
  * @param {!Array<!./amp-ad-network-doubleclick-impl.AmpAdNetworkDoubleclickImpl>} impls
- * @return {?Object<string,string>}
+ * @return {?{[key: string]: string}}
  * @visibleForTesting
  */
 export function combineInventoryUnits(impls) {
@@ -110,7 +115,7 @@ export function combineInventoryUnits(impls) {
  * Indicates SRA request is cookie opt out if any of the blocks includes
  * cookie opt out in targeting.
  * @param {!Array<!./amp-ad-network-doubleclick-impl.AmpAdNetworkDoubleclickImpl>} impls
- * @return {?Object<string,string>}
+ * @return {?{[key: string]: string}}
  * @visibleForTesting
  */
 export function getCookieOptOut(impls) {
@@ -124,7 +129,7 @@ export function getCookieOptOut(impls) {
 /**
  * Combine ad unit key of each block via comma separated values.
  * @param {!Array<!./amp-ad-network-doubleclick-impl.AmpAdNetworkDoubleclickImpl>} impls
- * @return {?Object<string,string>}
+ * @return {?{[key: string]: string}}
  * @visibleForTesting
  */
 export function getAdks(impls) {
@@ -134,7 +139,7 @@ export function getAdks(impls) {
 /**
  * Combine block sizes via comma separated values.
  * @param {!Array<!./amp-ad-network-doubleclick-impl.AmpAdNetworkDoubleclickImpl>} impls
- * @return {?Object<string,string>}
+ * @return {?{[key: string]: string}}
  * @visibleForTesting
  */
 export function getSizes(impls) {
@@ -147,7 +152,7 @@ export function getSizes(impls) {
  * Indicate SRA request is tagForChildDirectedTreatment if any blocks includes
  * in targeting.
  * @param {!Array<!./amp-ad-network-doubleclick-impl.AmpAdNetworkDoubleclickImpl>} impls
- * @return {?Object<string,string>}
+ * @return {?{[key: string]: string}}
  * @visibleForTesting
  */
 export function getTfcd(impls) {
@@ -162,7 +167,7 @@ export function getTfcd(impls) {
  * Indicate SRA request should include adtest=on if any block includes the
  * manual experiment id.
  * @param {!Array<!./amp-ad-network-doubleclick-impl.AmpAdNetworkDoubleclickImpl>} impls
- * @return {?Object<string,string>}
+ * @return {?{[key: string]: string}}
  * @visibleForTesting
  */
 export function isAdTest(impls) {
@@ -176,7 +181,7 @@ export function isAdTest(impls) {
  * a given block is separated by =) and exclusions are given special excl_cat
  * key (list of categories are comma separated).
  * @param {!Array<!./amp-ad-network-doubleclick-impl.AmpAdNetworkDoubleclickImpl>} impls
- * @return {?Object<string,string>}
+ * @return {?{[key: string]: string}}
  * @visibleForTesting
  */
 export function getTargetingAndExclusions(impls) {
@@ -239,7 +244,7 @@ export function getTargetingAndExclusions(impls) {
  * the unique set of experiment ids which are comma separated (order does not
  * matter).
  * @param {!Array<!./amp-ad-network-doubleclick-impl.AmpAdNetworkDoubleclickImpl>} impls
- * @return {?Object<string,string>}
+ * @return {?{[key: string]: string}}
  * @visibleForTesting
  */
 export function getExperimentIds(impls) {
@@ -256,23 +261,12 @@ export function getExperimentIds(impls) {
   return eidKeys ? {'eid': eidKeys} : null;
 }
 
-/**
- * Identity token is page level therefore SRA uses the value of the first
- * block.
- * @param {!Array<!./amp-ad-network-doubleclick-impl.AmpAdNetworkDoubleclickImpl>} impls
- * @return {?Object<string,string>}
- * @visibleForTesting
- */
-export function getIdentity(impls) {
-  return getFirstInstanceValue_(impls, (impl) => impl.buildIdentityParams());
-}
-
 /**
  * Combine force safeframe values for each block via comma separated numeric
  * values based on boolean value (e.g. false = 0, true = 1).  If none of the
  * blocks has force safeframe, parameter is not included in SRA request.
  * @param {!Array<!./amp-ad-network-doubleclick-impl.AmpAdNetworkDoubleclickImpl>} impls
- * @return {?Object<string,string>}
+ * @return {?{[key: string]: string}}
  * @visibleForTesting
  */
 export function getForceSafeframe(impls) {
@@ -289,7 +283,7 @@ export function getForceSafeframe(impls) {
  * Combine page offset info for each block by constructing separate parameter
  * for left (adxs) and top (adyx) via comma separated.
  * @param {!Array<!./amp-ad-network-doubleclick-impl.AmpAdNetworkDoubleclickImpl>} impls
- * @return {?Object<string,string>}
+ * @return {?{[key: string]: string}}
  * @visibleForTesting
  */
 export function getPageOffsets(impls) {
@@ -308,7 +302,7 @@ export function getPageOffsets(impls) {
  * separator (as block can have multiple values that are comma separated).  If
  * none of the blocks have a container, then parameter is not sent.
  * @param {!Array<!./amp-ad-network-doubleclick-impl.AmpAdNetworkDoubleclickImpl>} impls
- * @return {?Object<string,string>}
+ * @return {?{[key: string]: string}}
  * @visibleForTesting
  */
 export function getContainers(impls) {
@@ -325,7 +319,7 @@ export function getContainers(impls) {
 /**
  * Combine fluid settings for each block via comma separator.
  * @param {!Array<!./amp-ad-network-doubleclick-impl.AmpAdNetworkDoubleclickImpl>} impls
- * @return {?Object<string,string>}
+ * @return {?{[key: string]: string}}
  * @visibleForTesting
  */
 export function getIsFluid(impls) {
@@ -343,9 +337,9 @@ export function getIsFluid(impls) {
 }
 
 /**
- * @param {?Object<string, (!Array<string>|string)>} targeting
+ * @param {?{[key: string]: (!Array<string>|string)}} targeting
  * @param {?(!Array<string>|string)} categoryExclusions
- * @param {?Object<string, (!Array<string>|string)>} commonTargeting
+ * @param {?{[key: string]: (!Array<string>|string)}} commonTargeting
  * @return {?string}
  */
 export function serializeTargeting(
@@ -385,7 +379,7 @@ function serializeItem_(key, value) {
  * such that sendXhrRequest is resolved from standard A4A flow.  Done boolean
  * used to verify array of resolvers is empty once all results are returned.
  * @param {string} creative
- * @param {!Object<string,string>} headersObj
+ * @param {!{[key: string]: string}} headersObj
  * @param {boolean} done
  * @param {!Array<function(?Response)>} sraRequestAdUrlResolvers
  * @param {string} sraUrl url of SRA request for error reporting
@@ -463,7 +457,7 @@ export function sraBlockCallbackHandler(
  * converts them back to the orginal stringified version.
  * TODO above indicates this might get fixed upstream at some point.
  * @param {!Object} headersObj
- * @return {!Object<string, string>}
+ * @return {!{[key: string]: string}}
  */
 function stringifyHeaderValues(headersObj) {
   return Object.keys(headersObj).reduce((stringifiedHeaders, headerName) => {
diff --git a/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-amp-ad-network-doubleclick-impl.js b/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-amp-ad-network-doubleclick-impl.js
index d0671064a60b..08b84048978c 100644
--- a/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-amp-ad-network-doubleclick-impl.js
+++ b/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-amp-ad-network-doubleclick-impl.js
@@ -3,6 +3,7 @@
 // always available for them. However, when we test an impl in isolation,
 // AmpAd is not loaded already, so we need to load it separately.
 import '../../../amp-ad/0.1/amp-ad';
+import {AMP_GFP_SET_COOKIES_HEADER_NAME} from '#ads/google/a4a/cookie-utils';
 import {AMP_EXPERIMENT_ATTRIBUTE, QQID_HEADER} from '#ads/google/a4a/utils';
 
 import {
@@ -11,13 +12,15 @@ import {
 } from '#core/constants/consent-state';
 import {Deferred} from '#core/data-structures/promise';
 import {createElementWithAttributes} from '#core/dom';
-import {Layout} from '#core/dom/layout';
+import {Layout_Enum} from '#core/dom/layout';
 import * as bytesUtils from '#core/types/string/bytes';
 
 import {toggleExperiment} from '#experiments';
 
 import {Services} from '#service';
 
+import {getCookie, setCookie} from 'src/cookies';
+
 import {FriendlyIframeEmbed} from '../../../../src/friendly-iframe-embed';
 import {
   AmpA4A,
@@ -87,7 +90,6 @@ function createImplTag(config, element, impl, env) {
   env.win.document.body.appendChild(element);
   impl = new AmpAdNetworkDoubleclickImpl(element);
   impl.iframe = iframe;
-  impl.win['goog_identity_prom'] = Promise.resolve({});
   return [element, impl, env];
 }
 
@@ -556,6 +558,72 @@ for (const {config, name} of [
           );
         });
 
+        it('should clear cookies as specified in creative response, with opt out', () => {
+          setCookie(env.win, '__gads', '__gads_val', Date.now() + 100_000);
+          setCookie(env.win, '__gpi', '__gpi_val', Date.now() + 100_000);
+          expect(getCookie(env.win, '__gads')).to.equal('__gads_val');
+          expect(getCookie(env.win, '__gpi')).to.equal('__gpi_val');
+
+          impl.onCreativeRender(false);
+          impl.checkIfClearCookiePostMessageHasValidSource_ = () => true;
+          env.win.postMessage(
+            JSON.stringify({
+              googMsgType: 'gpi-uoo',
+              userOptOut: true,
+              clearAdsData: true,
+            }),
+            '*'
+          );
+
+          expect(getCookie(env.win, '__gpi_opt_out')).to.equal('1');
+          expect(getCookie(env.win, '__gads')).to.be.null;
+          expect(getCookie(env.win, '__gpi')).to.be.null;
+        });
+
+        it('should clear cookies as specified in creative response, without opt out', () => {
+          setCookie(env.win, '__gads', '__gads_val', Date.now() + 100_000);
+          setCookie(env.win, '__gpi', '__gpi_val', Date.now() + 100_000);
+          expect(getCookie(env.win, '__gads')).to.equal('__gads_val');
+          expect(getCookie(env.win, '__gpi')).to.equal('__gpi_val');
+
+          impl.onCreativeRender(false);
+          impl.checkIfClearCookiePostMessageHasValidSource_ = () => true;
+          env.win.postMessage(
+            JSON.stringify({
+              googMsgType: 'gpi-uoo',
+              userOptOut: false,
+              clearAdsData: true,
+            }),
+            '*'
+          );
+
+          expect(getCookie(env.win, '__gpi_opt_out')).to.equal('0');
+          expect(getCookie(env.win, '__gads')).to.be.null;
+          expect(getCookie(env.win, '__gpi')).to.be.null;
+        });
+
+        it('should not clear cookies as specified in creative response, without opt out or clear ads', () => {
+          setCookie(env.win, '__gads', '__gads_val', Date.now() + 100_000);
+          setCookie(env.win, '__gpi', '__gpi_val', Date.now() + 100_000);
+          expect(getCookie(env.win, '__gads')).to.equal('__gads_val');
+          expect(getCookie(env.win, '__gpi')).to.equal('__gpi_val');
+
+          impl.onCreativeRender(false);
+          impl.checkIfClearCookiePostMessageHasValidSource_ = () => true;
+          env.win.postMessage(
+            JSON.stringify({
+              googMsgType: 'gpi-uoo',
+              userOptOut: false,
+              clearAdsData: false,
+            }),
+            '*'
+          );
+
+          expect(getCookie(env.win, '__gpi_opt_out')).to.equal('0');
+          expect(getCookie(env.win, '__gads')).to.equal('__gads_val');
+          expect(getCookie(env.win, '__gpi')).to.equal('__gpi_val');
+        });
+
         it('should register click listener', () => {
           impl.iframe = impl.win.document.createElement('iframe');
           impl.win.document.body.appendChild(impl.iframe);
@@ -771,6 +839,15 @@ for (const {config, name} of [
           });
         });
 
+        it('handles tagForUnderAgeTreatment', () => {
+          element.setAttribute('json', '{"tagForUnderAgeTreatment": 1}');
+          new AmpAd(element).upgradeCallback();
+          impl.uiHandler = {isStickyAd: () => false};
+          return impl.getAdUrl().then((url) => {
+            expect(url).to.match(/&tfua=1&/);
+          });
+        });
+
         describe('data-force-safeframe', () => {
           const fsfRegexp = /(\?|&)fsf=1(&|$)/;
           it('handles default', () => {
@@ -825,7 +902,8 @@ for (const {config, name} of [
           });
         });
 
-        it('expands CLIENT_ID in targeting', () => {
+        // TODO(#38720): fix flaky test.
+        it.skip('expands CLIENT_ID in targeting', () => {
           element.setAttribute(
             'json',
             `{
@@ -841,7 +919,8 @@ for (const {config, name} of [
           });
         });
 
-        it('expands CLIENT_ID in targeting inside array', () => {
+        // TODO(#38720): fix flaky test.
+        it.skip('expands CLIENT_ID in targeting inside array', () => {
           element.setAttribute(
             'json',
             `{
@@ -1003,24 +1082,6 @@ for (const {config, name} of [
               });
           });
         });
-        it('should include identity', () => {
-          // Force get identity result by overloading window variable.
-          const token =
-            /**@type {!../../../ads/google/a4a/utils.IdentityToken}*/ ({
-              token: 'abcdef',
-              jar: 'some_jar',
-              pucrd: 'some_pucrd',
-            });
-          impl.win['goog_identity_prom'] = Promise.resolve(token);
-          impl.buildCallback();
-          return impl.getAdUrl().then((url) => {
-            [
-              /(\?|&)adsid=abcdef(&|$)/,
-              /(\?|&)jar=some_jar(&|$)/,
-              /(\?|&)pucrd=some_pucrd(&|$)/,
-            ].forEach((regexp) => expect(url).to.match(regexp));
-          });
-        });
 
         it('should return empty string if unknown consentState', () =>
           impl
@@ -1227,6 +1288,61 @@ for (const {config, name} of [
             /(\?|&)ppid=testId(&|$)/
           );
         });
+
+        it('should set tfcd parameter if set in shared data', () => {
+          impl.uiHandler = {isStickyAd: () => false};
+          const consentSharedData = {
+            'doubleclick-tfua': 0,
+            'doubleclick-tfcd': 1,
+          };
+          return impl.getAdUrl({consentSharedData}).then((url) => {
+            expect(url).to.match(/(\?|&)tfua=0(&|$)/);
+            expect(url).to.match(/(\?|&)tfcd=1(&|$)/);
+          });
+        });
+
+        it('should set tfua parameter if set in shared data', () => {
+          impl.uiHandler = {isStickyAd: () => false};
+          const consentSharedData = {
+            'doubleclick-tfua': 1,
+            'doubleclick-tfcd': 0,
+          };
+          return impl.getAdUrl({consentSharedData}).then((url) => {
+            expect(url).to.match(/(\?|&)tfua=1(&|$)/);
+            expect(url).to.match(/(\?|&)tfcd=0(&|$)/);
+          });
+        });
+
+        it('default tfcd/tfua to 1 if conflicting data detected', () => {
+          element.setAttribute(
+            'json',
+            '{"tagForChildDirectedTreatment": 0,"tagForUnderAgeTreatment": 1}'
+          );
+          impl.uiHandler = {isStickyAd: () => false};
+          const consentSharedData = {
+            'doubleclick-tfua': 0,
+            'doubleclick-tfcd': 1,
+          };
+          return impl.getAdUrl({consentSharedData}).then((url) => {
+            expect(url).to.match(/(\?|&)tfua=1(&|$)/);
+            expect(url).to.match(/(\?|&)tfcd=1(&|$)/);
+          });
+        });
+
+        it('should include gpp, if consentStringType is GLOBAL_PRIVACY_PLATFORM', () => {
+          impl.uiHandler = {isStickyAd: () => false};
+          return impl
+            .getAdUrl({
+              consentStringType: CONSENT_STRING_TYPE.GLOBAL_PRIVACY_PLATFORM,
+              consentString: 'gppString',
+              gppSectionId: '1,2',
+            })
+            .then((url) => {
+              expect(url).to.match(/(\?|&)gpp=gppString(&|$)/);
+              expect(url).to.match(/(\?|&)gpp_sid=1%2C2(&|$)/);
+              expect(url).to.not.match(/(\?|&)us_privacy=/);
+            });
+        });
       });
 
       describe('#getPageParameters', () => {
@@ -1721,7 +1837,7 @@ for (const {config, name} of [
         });
 
         it('should return safeframe if fluid', () => {
-          impl.isLayoutSupported(Layout.FLUID);
+          impl.isLayoutSupported(Layout_Enum.FLUID);
           expect(impl.getNonAmpCreativeRenderingMethod()).to.equal(
             XORIGIN_MODE.SAFEFRAME
           );
@@ -1777,6 +1893,54 @@ for (const {config, name} of [
           expect(impl.getSafeframePath()).to.match(new RegExp(expectedPath));
         });
       });
+
+      describes.fakeWin('#onAdResponse', {amp: true}, (env) => {
+        let element;
+
+        beforeEach(() => {
+          element = env.win.document.createElement('amp-ad');
+          element.setAttribute('type', 'doubleclick');
+          env.win.document.body.appendChild(element);
+          impl = new AmpAdNetworkDoubleclickImpl(element);
+        });
+
+        afterEach(() => {
+          env.win.document.body.removeChild(element);
+        });
+
+        it('sets cookies as specified on the ad response', () => {
+          impl.onAdResponse({
+            headers: {
+              has: (header) => {
+                return header === AMP_GFP_SET_COOKIES_HEADER_NAME;
+              },
+              get: (header) => {
+                if (header !== AMP_GFP_SET_COOKIES_HEADER_NAME) {
+                  return;
+                }
+
+                return JSON.stringify([
+                  {
+                    '_version_': 1,
+                    '_value_': 'val1',
+                    '_domain_': 'foo.com',
+                    '_expiration_': Date.now() + 100_000,
+                  },
+                  {
+                    '_version_': 2,
+                    '_value_': 'val2',
+                    '_domain_': 'foo.com',
+                    '_expiration_': Date.now() + 100_000,
+                  },
+                ]);
+              },
+            },
+          });
+
+          expect(getCookie(env.win, '__gads')).to.equal('val1');
+          expect(getCookie(env.win, '__gpi')).to.equal('val2');
+        });
+      });
     }
   );
 
diff --git a/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-doubleclick-rtc.js b/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-doubleclick-rtc.js
index 0ecbd59fae08..3f1f370d2a10 100644
--- a/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-doubleclick-rtc.js
+++ b/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-doubleclick-rtc.js
@@ -392,8 +392,7 @@ describes.realWin('DoubleClick Fast Fetch RTC', {amp: true}, (env) => {
   });
 
   describe('getCustomRealTimeConfigMacros', () => {
-    // TODO(bradfrizzell, #18574): Fix failing referrer check and re-enable.
-    it.skip('should return correct macros', () => {
+    it('should return correct macros', () => {
       const macros = {
         'data-slot': '5678',
         'height': '50',
@@ -419,18 +418,21 @@ describes.realWin('DoubleClick Fast Fetch RTC', {amp: true}, (env) => {
         'json': JSON.stringify(json),
       });
       env.win.document.body.appendChild(element);
-      env.sandbox.defineProperty(env.win.document, 'referrer', {
-        value: 'https://www.google.com/',
-      });
+      // TODO(bradfrizzell, #18574): Fix failing referrer check and re-enable.
+      //env.sandbox.defineProperty(env.win.document, 'referrer', {
+      //  value: 'https://www.google.com/',
+      //});
       const docInfo = Services.documentInfoForDoc(element);
       impl = new AmpAdNetworkDoubleclickImpl(
         element,
         env.win.document,
         env.win
       );
-      const docViewport = Services.viewportForDoc(this.getAmpDoc());
+      const docViewport = Services.viewportForDoc(impl.getAmpDoc());
       impl.populateAdUrlState();
-      const customMacros = impl.getCustomRealTimeConfigMacros_();
+      const customMacros = impl.getCustomRealTimeConfigMacros_(
+        /*hasStorageConsent=*/ true
+      );
       expect(customMacros.PAGEVIEWID()).to.equal(docInfo.pageViewId);
       expect(customMacros.PAGEVIEWID_64()).to.equal(docInfo.pageViewId64);
       expect(customMacros.HREF()).to.equal(env.win.location.href);
@@ -443,7 +445,7 @@ describes.realWin('DoubleClick Fast Fetch RTC', {amp: true}, (env) => {
         docViewport.getScrollHeight()
       );
       expect(customMacros.BKG_STATE()).to.equal(
-        this.getAmpDoc().isVisible() ? 'visible' : 'hidden'
+        impl.getAmpDoc().isVisible() ? 'visible' : 'hidden'
       );
       Object.keys(macros).forEach((macro) => {
         expect(customMacros.ATTR(macro)).to.equal(macros[macro]);
@@ -469,7 +471,9 @@ describes.realWin('DoubleClick Fast Fetch RTC', {amp: true}, (env) => {
         env.win
       );
       impl.populateAdUrlState();
-      const customMacros = impl.getCustomRealTimeConfigMacros_();
+      const customMacros = impl.getCustomRealTimeConfigMacros_(
+        /*hasStorageConsent=*/ true
+      );
       let adcid;
       return customMacros.ADCID().then((adcid1) => {
         adcid = adcid1;
@@ -480,6 +484,25 @@ describes.realWin('DoubleClick Fast Fetch RTC', {amp: true}, (env) => {
       });
     });
 
+    it('should not set adcid if no storage consent', () => {
+      element = createElementWithAttributes(env.win.document, 'amp-ad', {
+        type: 'doubleclick',
+      });
+      env.win.document.body.appendChild(element);
+      impl = new AmpAdNetworkDoubleclickImpl(
+        element,
+        env.win.document,
+        env.win
+      );
+      impl.populateAdUrlState();
+      const customMacros = impl.getCustomRealTimeConfigMacros_(
+        /*hasStorageConsent=*/ false
+      );
+      return customMacros.ADCID().then((adcid) => {
+        expect(adcid).to.be.undefined;
+      });
+    });
+
     it('should respect timeout for adcid', () => {
       element = createElementWithAttributes(env.win.document, 'amp-ad', {
         type: 'doubleclick',
@@ -491,7 +514,9 @@ describes.realWin('DoubleClick Fast Fetch RTC', {amp: true}, (env) => {
         env.win
       );
       impl.populateAdUrlState();
-      const customMacros = impl.getCustomRealTimeConfigMacros_();
+      const customMacros = impl.getCustomRealTimeConfigMacros_(
+        /*hasStorageConsent=*/ true
+      );
       return customMacros.ADCID(0).then((adcid) => {
         expect(adcid).to.be.undefined;
       });
@@ -510,7 +535,9 @@ describes.realWin('DoubleClick Fast Fetch RTC', {amp: true}, (env) => {
       impl.populateAdUrlState();
       const viewer = Services.viewerForDoc(impl.getAmpDoc());
       env.sandbox.stub(viewer, 'getReferrerUrl').returns(new Promise(() => {}));
-      const customMacros = impl.getCustomRealTimeConfigMacros_();
+      const customMacros = impl.getCustomRealTimeConfigMacros_(
+        /*hasStorageConsent=*/ true
+      );
       return expect(customMacros.REFERRER(0)).to.eventually.be.undefined;
     });
 
@@ -528,7 +555,9 @@ describes.realWin('DoubleClick Fast Fetch RTC', {amp: true}, (env) => {
         env.win
       );
       impl.populateAdUrlState();
-      const customMacros = impl.getCustomRealTimeConfigMacros_();
+      const customMacros = impl.getCustomRealTimeConfigMacros_(
+        /*hasStorageConsent=*/ true
+      );
       expect(customMacros.TGT()).to.equal(JSON.stringify(json['targeting']));
     });
   });
diff --git a/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-doubleclick-sra.js b/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-doubleclick-sra.js
index 5e511f0a685a..748f0c8229d6 100644
--- a/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-doubleclick-sra.js
+++ b/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-doubleclick-sra.js
@@ -33,7 +33,6 @@ import {
   getCookieOptOut,
   getExperimentIds,
   getForceSafeframe,
-  getIdentity,
   getIsFluid,
   getPageOffsets,
   getSizes,
@@ -255,18 +254,6 @@ describes.realWin('Doubleclick SRA', config, (env) => {
         'eid': '7,123,456,901,902,903',
       });
     });
-    it('should determine identity', () => {
-      impls[0] = new AmpAdNetworkDoubleclickImpl(
-        env.win.document.createElement('span')
-      );
-      impls[0].identityToken = {token: 'foo', jar: 'bar', pucrd: 'oof'};
-      impls[1] = {};
-      expect(getIdentity(impls)).to.jsonEqual({
-        adsid: 'foo',
-        jar: 'bar',
-        pucrd: 'oof',
-      });
-    });
     it('should combine force safeframe', () => {
       expect(getForceSafeframe(impls)).to.be.null;
       impls[0] = {forceSafeframe: false};
@@ -373,12 +360,6 @@ describes.realWin('Doubleclick SRA', config, (env) => {
           .withArgs('50x320')
           .returns('13579');
         impl1.populateAdUrlState();
-        impl1.identityToken =
-          /**@type {!../../../ads/google/a4a/utils.IdentityToken}*/ ({
-            token: 'abcdef',
-            jar: 'some_jar',
-            pucrd: 'some_pucrd',
-          });
         const targeting2 = {
           cookieOptOut: 1,
           categoryExclusions: 'food',
@@ -418,9 +399,6 @@ describes.realWin('Doubleclick SRA', config, (env) => {
           eid: MANUAL_EXPERIMENT_ID,
           output: 'ldjh',
           impl: 'fifs',
-          adsid: 'abcdef',
-          jar: 'some_jar',
-          pucrd: 'some_pucrd',
         };
         if (forceSafeFrame) {
           exp['fsfs'] = '1,0';
diff --git a/extensions/amp-ad-network-doubleclick-impl/OWNERS b/extensions/amp-ad-network-doubleclick-impl/OWNERS
index add75ed6646e..c032b7db4795 100644
--- a/extensions/amp-ad-network-doubleclick-impl/OWNERS
+++ b/extensions/amp-ad-network-doubleclick-impl/OWNERS
@@ -4,10 +4,7 @@
 {
   rules: [
     {
-      owners: [
-        {name: 'ampproject/wg-ads-reviewers'},
-        {name: 'jeffkaufman', notify: true},
-      ],
+      owners: [{name: 'ampproject/wg-ads-reviewers'}, {name: 'zombifier'}],
     },
   ],
 }
diff --git a/extensions/amp-ad-network-doubleclick-impl/amp-ad-network-doubleclick-impl-internal.md b/extensions/amp-ad-network-doubleclick-impl/amp-ad-network-doubleclick-impl-internal.md
index 6d02e9903ae6..cad361a6d8fb 100644
--- a/extensions/amp-ad-network-doubleclick-impl/amp-ad-network-doubleclick-impl-internal.md
+++ b/extensions/amp-ad-network-doubleclick-impl/amp-ad-network-doubleclick-impl-internal.md
@@ -5,8 +5,8 @@
 <table>
   <tr>
     <td width="40%"><strong>Description</strong></td>
-    <td>Google Ad Manager implementation of the AMP Ad tag.  Click <a href="/ads/google/a4a/docs/Network-Impl-Guide.md">here</a>
-    for Fast Fetch details, and <a href="/extensions/amp-a4a/amp-a4a-format.md">here</a>
+    <td>Google Ad Manager implementation of the AMP Ad tag.  Click <a href="https://github.com/ampproject/amphtml/blob/main/ads/google/a4a/docs/Network-Impl-Guide.md">here</a>
+    for Fast Fetch details, and <a href="https://github.com/ampproject/amphtml/blob/main/extensions/amp-a4a/amp-a4a-format.md">here</a>
     for AMPHTML ad format details. This tag should
     not be directly referenced by pages and instead is dynamically loaded
     via the amp-ad tag.  However, in order to remove an async script load
@@ -137,6 +137,8 @@ Supported via `json` attribute:
     -   1: Ignores DFP cookies on subsequent ad requests and prevents cookies from being created on the page.
 -   `tagForChildDirectedTreatment`: Configures whether the slot should be treated as child-directed.
     See the TFCD article for <a href="https://support.google.com/dfp_sb/answer/3721907">Small Business</a> or <a href="https://support.google.com/dfp_premium/answer/3671211">Premium</a> for more details and allowed values.
+-   `tagForUnderAgeTreatment`: Configures whether the slot should be treated as under-age of consent.
+    See <a href="https://support.google.com/dfp_sb/answer/9004919">This article</a> for more details on this and the TFCD signal.
 -   `targeting`: Sets a custom targeting parameter for this slot. Values must of the form:
     -   `"<key_string>":"<value_string>"` or
     -   `"<key_string>":["<value1>", "<value2>", ...]`. See below for example.
diff --git a/extensions/amp-ad-network-doubleclick-impl/amp-consent.md b/extensions/amp-ad-network-doubleclick-impl/amp-consent.md
index ec9acb269bb7..7e50f0102ac1 100644
--- a/extensions/amp-ad-network-doubleclick-impl/amp-consent.md
+++ b/extensions/amp-ad-network-doubleclick-impl/amp-consent.md
@@ -6,4 +6,26 @@ If the user has responded negatively to the amp-consent component (user rejects
 If the user’s response to the amp-consent is unknown (user dismisses the consent prompt), by default, no ad requests or RTC call-outs are sent.  
 If `data-npa-on-unknown-consent` is set to true, non-personalized ads will be requested but RTC call-outs are not sent.
 
-See [Google Ad Manager Help Center article](https://support.google.com/dfp_premium/answer/7678538) for more information.
+See [Google Ad Manager Help Center article](https://support.google.com/dfp_premium/answer/7678538) and [restricted Data Processing article](https://support.google.com/admanager/answer/9004919) for more information.
+
+## Supported `sharedData` key-values
+
+The `amp-consent` response may set the following fields in the `sharedData` object for additional controls:
+
+<table>
+  <tr>
+    <td><strong>Key</strong></td>
+    <td><strong>Description</strong></td>
+    <td><strong>Possible Values</strong></td>
+  </tr>
+  <tr>
+    <td><code>"doubleclick-tfua"</code></td>
+    <td>Whether the slot should be treated as under-age of consent.</td>
+    <td><code>0</code> or <code>1</code></td>
+  </tr>
+  <tr>
+    <td><code>"doubleclick-tfcd"</code></td>
+    <td>Whether the slot should be treated as child-directed.</td>
+    <td><code>0</code> or <code>1</code></td>
+  </tr>
+</table>
diff --git a/extensions/amp-ad-network-doubleclick-impl/single-page-ad.md b/extensions/amp-ad-network-doubleclick-impl/single-page-ad.md
index 8f6f183c31ef..8d8d1d31b8c5 100644
--- a/extensions/amp-ad-network-doubleclick-impl/single-page-ad.md
+++ b/extensions/amp-ad-network-doubleclick-impl/single-page-ad.md
@@ -40,7 +40,7 @@ See the above link for allowed call-to-action buttons. By design, these will be
 
 ## Example
 
-You can find a fully working example hosted on [ampbyexample.com](https://amp.dev/documentation/examples/advertising-analytics/doubleclick_amp_story_ads/).
+You can find a fully working example hosted on [amp.dev](https://amp.dev/documentation/examples/advertising-analytics/doubleclick_amp_story_ads/).
 
 Google Ad Manager trafficking instructions can be found in the [DFP Help Center](https://support.google.com/dfp_premium/answer/9038178).
 
diff --git a/extensions/amp-ad-network-fake-impl/0.1/amp-ad-metadata-transformer.js b/extensions/amp-ad-network-fake-impl/0.1/amp-ad-metadata-transformer.js
index 7a62641e199d..d2d2d67a6866 100644
--- a/extensions/amp-ad-network-fake-impl/0.1/amp-ad-metadata-transformer.js
+++ b/extensions/amp-ad-network-fake-impl/0.1/amp-ad-metadata-transformer.js
@@ -1,4 +1,3 @@
-import {dict} from '#core/types/object';
 import {parseJson} from '#core/types/object/json';
 
 import {user} from '#utils/log';
@@ -7,7 +6,7 @@ export class AmpAdMetadataTransformer {
   /** constructor */
   constructor() {
     /** @public {JsonObject} */
-    this.metadata = dict({});
+    this.metadata = {};
     /** @private {!Array<Object>} */
     this.styles_ = [];
     /** @private {!Array<Object>} */
diff --git a/extensions/amp-ad-network-fake-impl/0.1/data/fake_amp.html b/extensions/amp-ad-network-fake-impl/0.1/data/fake_amp.html
index 10852f34cffd..c80a6fd0b425 100644
--- a/extensions/amp-ad-network-fake-impl/0.1/data/fake_amp.html
+++ b/extensions/amp-ad-network-fake-impl/0.1/data/fake_amp.html
@@ -1,7 +1,7 @@
 <!doctype html><html amp4ads><head><meta charset=utf-8><meta content=width=device-width,minimum-scale=1,initial-scale=1 name=viewport><script async src=https://cdn.ampproject.org/amp4ads-v0.js></script><script async custom-element=amp-accordion src=https://cdn.ampproject.org/v0/amp-accordion-0.1.js></script><script async custom-element=amp-analytics src=https://cdn.ampproject.org/v0/amp-analytics-0.1.js></script><script async custom-element=amp-anim src=https://cdn.ampproject.org/v0/amp-anim-0.1.js></script><script async custom-element=amp-audio src=https://cdn.ampproject.org/v0/amp-audio-0.1.js></script><script async custom-element=amp-carousel src=https://cdn.ampproject.org/v0/amp-carousel-0.1.js></script><script async custom-element=amp-fit-text src=https://cdn.ampproject.org/v0/amp-fit-text-0.1.js></script><script async custom-element=amp-font src=https://cdn.ampproject.org/v0/amp-font-0.1.js></script><script async custom-element=amp-form src=https://cdn.ampproject.org/v0/amp-form-0.1.js></script><script async custom-element=amp-social-share src=https://cdn.ampproject.org/v0/amp-social-share-0.1.js></script><style amp-custom>body {
   background-color: #f4f4f4;
 }
-</style><style amp4ads-boilerplate>body{visibility:hidden}</style></head><body><amp-pixel src=https://securepubads.g.doubleclick.net/pcs/view?xai=AKAOjsvtqtYa0EsJ4Nx-reUVvVUxE47T2168NOpjITbBGSW6gTk6nH-_YUv6KuCJr7GDn741JGyjvPDbOctdo9TXC-7sr0ZVGxo2Tw159UTGvpOgdbB_RPx2hGetike7URzDfC6KJRLYvlolR9yGsBUc1BzHZkNCW2WytE-wSVBN1ZsjZDRH9oZekBYKKoaYuvTxmOeHz9Jg0VG3rm1rFvA2hcn-X3s3tnnTU7Wytj8vbSFi0VLRmwSUgfm7RqYCbYPLGdA&amp;sai=AMfl-YTipoc1Uj8AysSEfd1QxlnQ8oXFbtcHLZKo6D5gA4sQaYnSe89UvAfW0aU1O9E0OlQaN7pamrnB6hIBWQ3DVzUOv212COaKzCHprJRrnGwc&amp;sig=Cg0ArKJSzETQCdrEz0AMEAE&amp;urlfix=1&amp;adurl=></amp-pixel><a href=https://ampbyexample.com target=_blank>
+</style><style amp4ads-boilerplate>body{visibility:hidden}</style></head><body><amp-pixel src=https://securepubads.g.doubleclick.net/pcs/view?xai=AKAOjsvtqtYa0EsJ4Nx-reUVvVUxE47T2168NOpjITbBGSW6gTk6nH-_YUv6KuCJr7GDn741JGyjvPDbOctdo9TXC-7sr0ZVGxo2Tw159UTGvpOgdbB_RPx2hGetike7URzDfC6KJRLYvlolR9yGsBUc1BzHZkNCW2WytE-wSVBN1ZsjZDRH9oZekBYKKoaYuvTxmOeHz9Jg0VG3rm1rFvA2hcn-X3s3tnnTU7Wytj8vbSFi0VLRmwSUgfm7RqYCbYPLGdA&amp;sai=AMfl-YTipoc1Uj8AysSEfd1QxlnQ8oXFbtcHLZKo6D5gA4sQaYnSe89UvAfW0aU1O9E0OlQaN7pamrnB6hIBWQ3DVzUOv212COaKzCHprJRrnGwc&amp;sig=Cg0ArKJSzETQCdrEz0AMEAE&amp;urlfix=1&amp;adurl=></amp-pixel><a href=https://amp.dev target=_blank>
 <amp-img alt="AMP Ad" height=250 src=https://amp.dev/static/samples/img/amp-300x250.jpg width=300></amp-img>
 </a>
 <amp-pixel src="https://www.google.com/?cid=CLIENT_ID(a)"></amp-pixel>
diff --git a/extensions/amp-ad-network-fake-impl/0.1/data/fake_amp_visibilityspec.html b/extensions/amp-ad-network-fake-impl/0.1/data/fake_amp_visibilityspec.html
index be137aa38051..a4e282894405 100644
--- a/extensions/amp-ad-network-fake-impl/0.1/data/fake_amp_visibilityspec.html
+++ b/extensions/amp-ad-network-fake-impl/0.1/data/fake_amp_visibilityspec.html
@@ -30,7 +30,7 @@
 
   <body>
     <amp-layout id="layout1" class="i-amphtml-element">
-      <a href=https://ampbyexample.com target=_blank>
+      <a href=https://amp.dev target=_blank>
         <amp-img alt="AMP Ad" height=250 width=300 src=https://amp.dev/static/samples/img/amp-300x250.jpg></amp-img>
       </a>
       <amp-analytics id="analytics1">
diff --git a/extensions/amp-ad-network-fake-impl/0.1/external-reorder-head-transformer.js b/extensions/amp-ad-network-fake-impl/0.1/external-reorder-head-transformer.js
index 1d1abdf353b8..a162f53cd9de 100644
--- a/extensions/amp-ad-network-fake-impl/0.1/external-reorder-head-transformer.js
+++ b/extensions/amp-ad-network-fake-impl/0.1/external-reorder-head-transformer.js
@@ -1,6 +1,6 @@
 import {endsWith} from '#core/types/string';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 
 export class ExternalReorderHeadTransformer {
   /** constructor */
diff --git a/extensions/amp-ad-network-fake-impl/0.1/test/test-amp-ad-network-fake-impl.js b/extensions/amp-ad-network-fake-impl/0.1/test/test-amp-ad-network-fake-impl.js
index 0f5eaee2dd5d..af4ca16e4277 100644
--- a/extensions/amp-ad-network-fake-impl/0.1/test/test-amp-ad-network-fake-impl.js
+++ b/extensions/amp-ad-network-fake-impl/0.1/test/test-amp-ad-network-fake-impl.js
@@ -1,4 +1,4 @@
-import {AmpAd} from '../../../amp-ad/0.1/amp-ad'; // eslint-disable-line no-unused-vars
+import {AmpAd} from '../../../amp-ad/0.1/amp-ad'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import {AmpAdNetworkFakeImpl} from '../amp-ad-network-fake-impl';
 
 describes.realWin(
diff --git a/extensions/amp-ad-network-mgid-impl/0.1/amp-ad-network-mgid-impl.js b/extensions/amp-ad-network-mgid-impl/0.1/amp-ad-network-mgid-impl.js
new file mode 100644
index 000000000000..6831c85312c0
--- /dev/null
+++ b/extensions/amp-ad-network-mgid-impl/0.1/amp-ad-network-mgid-impl.js
@@ -0,0 +1,278 @@
+import {
+  CONSENT_POLICY_STATE,
+  CONSENT_STRING_TYPE,
+} from '#core/constants/consent-state';
+import {removeElement} from '#core/dom';
+
+import {Services} from '#service';
+
+import {user} from '#utils/log';
+
+import {AmpA4A} from '../../amp-a4a/0.1/amp-a4a';
+
+/** @const {string} */
+const TAG = 'amp-ad-network-mgid-impl';
+
+const BASE_URL_ = 'https://servicer.mgid.com/';
+
+export class AmpAdNetworkMgidImpl extends AmpA4A {
+  /**
+   * @param {!Element} element
+   */
+  constructor(element) {
+    super(element);
+
+    /** @private {?Element} */
+    this.ampAnalyticsElement_ = null;
+  }
+
+  /** @override */
+  tearDownSlot() {
+    super.tearDownSlot();
+    if (this.ampAnalyticsElement_) {
+      removeElement(this.ampAnalyticsElement_);
+      this.ampAnalyticsElement_ = null;
+    }
+  }
+
+  /** @override */
+  isValidElement() {
+    const id = this.element.getAttribute('data-widget');
+    if (!id || parseInt(id, 10) != id) {
+      user().warn(TAG, 'Undefined or non-numeric data-widget param!');
+      return false;
+    }
+    return true;
+  }
+
+  /** @override */
+  getAdUrl(consentTuple, opt_rtcResponsesPromise) {
+    let adUrlParams = [];
+
+    const consentParams = this.getConsents_(consentTuple);
+    if (consentParams.length !== 0) {
+      adUrlParams = adUrlParams.concat(consentParams);
+    }
+
+    const widget = this.element.getAttribute('data-widget');
+
+    let servicerUrl = BASE_URL_ + widget + '/' + this.getPageParam_();
+
+    adUrlParams = adUrlParams.concat(this.getNetworkInfoParams_());
+    adUrlParams.push(this.getCacheBusterParam_());
+    adUrlParams.push(this.getDevicePixelRatioParam_());
+    adUrlParams.push(this.getCxurlParam_());
+    adUrlParams.push(this.getPrParam_());
+    adUrlParams.push(this.getPvidParam_());
+    adUrlParams.push(this.getMuidParam_());
+    adUrlParams.push('implVersion=15');
+
+    return Promise.allSettled(adUrlParams).then((params) => {
+      const data = [];
+      params.forEach((result) => data.push(result.value));
+      const joinedParams = '?' + data.join('&');
+      servicerUrl += joinedParams;
+      return servicerUrl;
+    });
+  }
+
+  /**
+   * @param {!ConsentTupleDef=} consentTuple
+   * @return {string[]} Consents parameters.
+   * @private
+   */
+  getConsents_(consentTuple) {
+    const result = [];
+
+    let consentState = undefined;
+    let consentString = undefined;
+    let gdprApplies = undefined;
+    let consentStringType = undefined;
+    if (consentTuple) {
+      consentState = consentTuple.consentState;
+      consentString = consentTuple.consentString;
+      gdprApplies = consentTuple.gdprApplies;
+      consentStringType = consentTuple.consentStringType;
+    }
+    if (
+      consentState === CONSENT_POLICY_STATE.UNKNOWN &&
+      this.element.getAttribute('data-npa-on-unknown-consent') !== 'true'
+    ) {
+      return result;
+    }
+
+    if (gdprApplies) {
+      result.push(
+        'gdprApplies=' +
+          (gdprApplies === true ? '1' : gdprApplies === false ? '0' : null)
+      );
+    }
+
+    if (
+      consentString &&
+      consentStringType != CONSENT_STRING_TYPE.US_PRIVACY_STRING
+    ) {
+      result.push('consentData=' + consentString);
+    }
+
+    if (
+      consentString &&
+      consentStringType == CONSENT_STRING_TYPE.US_PRIVACY_STRING
+    ) {
+      result.push('uspString=' + consentString);
+    }
+
+    return result;
+  }
+
+  /**
+   * @return {string} Page data for ad request
+   * @private
+   */
+  getPageParam_() {
+    const counter = Services.urlReplacementsForDoc(
+      this.element
+    )./*OK*/ expandStringSync('COUNTER', undefined, {
+      'COUNTER': true,
+    });
+    return parseInt(counter, 10) % 20;
+  }
+
+  /**
+   * @return {string} Cachebuster for ad request
+   * @private
+   */
+  getCacheBusterParam_() {
+    return (
+      'cbuster=' +
+      Date.now().toString() +
+      Math.floor(Math.random() * 1000000000 + 1)
+    );
+  }
+
+  /**
+   * @return {string} Network information data for ad request
+   * @private
+   */
+  getNetworkInfoParams_() {
+    const params = [];
+    try {
+      const networkInformation =
+        navigator.connection ||
+        navigator.mozConnection ||
+        navigator.webkitConnection;
+
+      if (typeof networkInformation.type != 'undefined') {
+        params.push('nit=' + networkInformation.type);
+      }
+      if (typeof networkInformation.effectiveType != 'undefined') {
+        params.push('niet=' + networkInformation.effectiveType);
+      }
+      if (typeof networkInformation.saveData != 'undefined') {
+        params.push('nisd=' + (networkInformation.saveData ? 1 : 0));
+      }
+    } catch (e) {}
+
+    return params;
+  }
+
+  /**
+   * @return {string} Device pixel ratio info for ad request
+   * @private
+   */
+  getDevicePixelRatioParam_() {
+    let ratio = 1;
+
+    if (typeof window.devicePixelRatio !== 'undefined') {
+      ratio = window.devicePixelRatio;
+    } else if (
+      typeof window.screen.systemXDPI !== 'undefined' &&
+      typeof window.screen.logicalXDPI !== 'undefined' &&
+      window.screen.systemXDPI > window.screen.logicalXDPI
+    ) {
+      ratio = window.screen.systemXDPI / window.screen.logicalXDPI;
+    }
+
+    const isInt = ratio % 1 === 0;
+
+    if (!isInt) {
+      ratio = ratio.toFixed(3);
+    }
+
+    return 'dpr=' + ratio;
+  }
+
+  /**
+   * @return {string} Referrer info for ad request
+   * @private
+   */
+  getPrParam_() {
+    return this.getReferrer_(10).then((referrer) => {
+      const matchDomain = referrer.match(/:\/\/([^\/:]+)/i);
+      return (
+        'pr=' +
+        encodeURIComponent(matchDomain && matchDomain[1] ? matchDomain[1] : '')
+      );
+    });
+  }
+
+  /**
+   * @return {string} Current page url for ad request
+   * @private
+   */
+  getCxurlParam_() {
+    const url = Services.documentInfoForDoc(this.element).canonicalUrl;
+    return 'cxurl=' + encodeURIComponent(url);
+  }
+
+  /**
+   * @return {string} Pageview info for ad request
+   * @private
+   */
+  getPvidParam_() {
+    return Services.documentInfoForDoc(this.element).pageViewId64.then(
+      (pvid) => {
+        return 'pvid=' + pvid;
+      }
+    );
+  }
+
+  /**
+   * @return {string} Muidn info for ad request
+   * @private
+   */
+  getMuidParam_() {
+    return Services.urlReplacementsForDoc(this.element)
+      ./*OK*/ expandStringAsync('CLIENT_ID(muidn)', undefined, {
+        'CLIENT_ID': true,
+      })
+      .then((r) => {
+        return 'muid=' + r;
+      });
+  }
+
+  /**
+   * Returns the referrer or undefined if the referrer is not resolved
+   * before the given timeout
+   * @param {number=} opt_timeout
+   * @return {!(Promise<string>|Promise<undefined>)} A promise with a referrer or undefined
+   * if timed out
+   * @private
+   */
+  getReferrer_(opt_timeout) {
+    const timeoutInt = parseInt(opt_timeout, 10);
+    const referrerPromise = Services.viewerForDoc(
+      this.getAmpDoc()
+    ).getReferrerUrl();
+    if (isNaN(timeoutInt) || timeoutInt < 0) {
+      return referrerPromise;
+    }
+    return Services.timerFor(this.win)
+      .timeoutPromise(timeoutInt, referrerPromise)
+      .catch(() => undefined);
+  }
+}
+
+AMP.extension('amp-ad-network-mgid-impl', '0.1', (AMP) => {
+  AMP.registerElement('amp-ad-network-mgid-impl', AmpAdNetworkMgidImpl);
+});
diff --git a/extensions/amp-ad-network-mgid-impl/0.1/test/test-amp-ad-network-mgid-impl.js b/extensions/amp-ad-network-mgid-impl/0.1/test/test-amp-ad-network-mgid-impl.js
new file mode 100644
index 000000000000..47761addca14
--- /dev/null
+++ b/extensions/amp-ad-network-mgid-impl/0.1/test/test-amp-ad-network-mgid-impl.js
@@ -0,0 +1,69 @@
+import {Services} from '#service';
+
+import {AmpAd} from '../../../amp-ad/0.1/amp-ad'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import {AmpAdNetworkMgidImpl} from '../amp-ad-network-mgid-impl';
+
+describes.realWin(
+  'amp-ad-network-mgid-impl',
+  {
+    amp: {
+      extensions: ['amp-ad', 'amp-ad-network-mgid-impl'],
+    },
+  },
+  (env) => {
+    let doc;
+    let win;
+    let mgidImplElem;
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      mgidImplElem = doc.createElement('amp-ad');
+      mgidImplElem.setAttribute('type', 'mgid');
+      mgidImplElem.setAttribute('layout', 'fixed');
+      mgidImplElem.setAttribute('width', '300');
+      mgidImplElem.setAttribute('height', '250');
+
+      env.win.document.body.appendChild(mgidImplElem);
+    });
+
+    it('should check for data-widget attribute', () => {
+      const mgidImpl = new AmpAdNetworkMgidImpl(mgidImplElem);
+      expect(mgidImpl.isValidElement()).to.be.false;
+
+      mgidImplElem.setAttribute('data-widget', '100');
+      const mgidImpl2 = new AmpAdNetworkMgidImpl(mgidImplElem);
+      expect(mgidImpl2.isValidElement()).to.be.true;
+    });
+
+    it('generates correct adUrl', () => {
+      mgidImplElem.setAttribute('data-widget', '100');
+
+      const viewer = Services.viewerForDoc(mgidImplElem);
+      env.sandbox
+        .stub(viewer, 'getReferrerUrl')
+        .returns(Promise.resolve('http://fake.example/?foo=bar'));
+
+      const documentInfo = Services.documentInfoForDoc(mgidImplElem);
+      documentInfo.canonicalUrl = 'http://canonical.example/?abc=xyz';
+
+      const mgidImpl = new AmpAdNetworkMgidImpl(mgidImplElem);
+
+      return mgidImpl.getAdUrl().then((url) => {
+        [
+          /^https:\/\/servicer\.mgid\.com\/100\/1/,
+          /(\?|&)niet=(slow-2g|2g|3g|4g)(&|$)/,
+          /(\?|&)nisd=(0|1)(&|$)/,
+          /(\?|&)cbuster=\d+(&|$)/,
+          /(\?|&)dpr=\d+(&|$)/,
+          /(\?|&)cxurl=http%3A%2F%2Fcanonical.example%2F%3Fabc%3Dxyz(&|$)/,
+          /(\?|&)pr=fake.example(&|$)/,
+          /(\?|&)pvid=[a-zA-Z0-9\-_]+(&|$)/,
+          /(\?|&)muid=amp-[a-zA-Z0-9\-_]+(&|$)/,
+          /(\?|&)implVersion=15(&|$)/,
+        ].forEach((regexp) => {
+          expect(url).to.match(regexp);
+        });
+      });
+    });
+  }
+);
diff --git a/extensions/amp-ad-network-mgid-impl/OWNERS b/extensions/amp-ad-network-mgid-impl/OWNERS
new file mode 100644
index 000000000000..1b8c3b93f6d9
--- /dev/null
+++ b/extensions/amp-ad-network-mgid-impl/OWNERS
@@ -0,0 +1,10 @@
+// For an explanation of the OWNERS rules and syntax, see:
+// https://github.com/ampproject/amp-github-apps/blob/main/owners/OWNERS.example
+
+{
+  rules: [
+    {
+      owners: [{name: 'ampproject/wg-ads-reviewers'}],
+    },
+  ],
+}
diff --git a/extensions/amp-ad-network-mgid-impl/amp-ad-network-mgid-impl-internal.md b/extensions/amp-ad-network-mgid-impl/amp-ad-network-mgid-impl-internal.md
new file mode 100644
index 000000000000..85faf1aeb517
--- /dev/null
+++ b/extensions/amp-ad-network-mgid-impl/amp-ad-network-mgid-impl-internal.md
@@ -0,0 +1,33 @@
+# amp-ad-network-mgid-impl
+
+Mgid implementation of AMP Ad, which is only used for amp-stories.
+3p iframe implementation is used for all other cases.
+
+<table>
+  <tr>
+    <td class="col-fourty" width="50%"><strong>Availability</strong></td>
+    <td>In Development</td>
+  </tr>
+  <tr>
+    <td class="col-fourty"><strong>Required Script</strong></td>
+    <td><code>&lt;script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-1.0.js"&gt;&lt;/script&gt;&lt;script async custom-element="amp-story-auto-ads" src="https://cdn.ampproject.org/v0/amp-story-auto-ads-0.1.js"&gt;&lt;/script></code></td>
+  </tr>
+</table>
+
+## Example
+
+```html
+<amp-story standalone supports-landscape>
+  <amp-story-auto-ads>
+    <script type="application/json">
+      {
+        "ad-attributes": {
+          "type": "mgid",
+          "data-widget": 123456
+        }
+      }
+    </script>
+  </amp-story-auto-ads>
+  ...
+</amp-story>
+```
diff --git a/extensions/amp-ad-network-oblivki-impl/0.1/test/test-amp-ad-network-oblivki-impl.js b/extensions/amp-ad-network-oblivki-impl/0.1/test/test-amp-ad-network-oblivki-impl.js
index 260d5dc3e584..032d2bdac789 100644
--- a/extensions/amp-ad-network-oblivki-impl/0.1/test/test-amp-ad-network-oblivki-impl.js
+++ b/extensions/amp-ad-network-oblivki-impl/0.1/test/test-amp-ad-network-oblivki-impl.js
@@ -1,10 +1,10 @@
 import {createElementWithAttributes} from '#core/dom';
 
 import {
-  AmpAdUIHandler, // eslint-disable-line no-unused-vars
+  AmpAdUIHandler, // eslint-disable-line @typescript-eslint/no-unused-vars
 } from '../../../amp-ad/0.1/amp-ad-ui';
 import {
-  AmpAdXOriginIframeHandler, // eslint-disable-line no-unused-vars
+  AmpAdXOriginIframeHandler, // eslint-disable-line @typescript-eslint/no-unused-vars
 } from '../../../amp-ad/0.1/amp-ad-xorigin-iframe-handler';
 import {AmpAdNetworkOblivkiImpl} from '../amp-ad-network-oblivki-impl';
 import {oblivkiIsA4AEnabled} from '../oblivki-a4a-config';
diff --git a/extensions/amp-ad-network-smartads-impl/0.1/test/test-amp-ad-network-smartads-impl.js b/extensions/amp-ad-network-smartads-impl/0.1/test/test-amp-ad-network-smartads-impl.js
index 1f7b9a9304a4..6b6be779d69a 100644
--- a/extensions/amp-ad-network-smartads-impl/0.1/test/test-amp-ad-network-smartads-impl.js
+++ b/extensions/amp-ad-network-smartads-impl/0.1/test/test-amp-ad-network-smartads-impl.js
@@ -1,10 +1,10 @@
 import {createElementWithAttributes} from '#core/dom';
 
 import {
-  AmpAdUIHandler, // eslint-disable-line no-unused-vars
+  AmpAdUIHandler, // eslint-disable-line @typescript-eslint/no-unused-vars
 } from '../../../amp-ad/0.1/amp-ad-ui';
 import {
-  AmpAdXOriginIframeHandler, // eslint-disable-line no-unused-vars
+  AmpAdXOriginIframeHandler, // eslint-disable-line @typescript-eslint/no-unused-vars
 } from '../../../amp-ad/0.1/amp-ad-xorigin-iframe-handler';
 import {AmpAdNetworkSmartAdsImpl} from '../amp-ad-network-smartads-impl';
 import {smartAdsIsA4AEnabled} from '../smartads-a4a-config';
diff --git a/extensions/amp-ad-network-smartadserver-impl/0.1/amp-ad-network-smartadserver-impl.js b/extensions/amp-ad-network-smartadserver-impl/0.1/amp-ad-network-smartadserver-impl.js
new file mode 100644
index 000000000000..74b2079dcd51
--- /dev/null
+++ b/extensions/amp-ad-network-smartadserver-impl/0.1/amp-ad-network-smartadserver-impl.js
@@ -0,0 +1,307 @@
+/**
+ * Copyright 2021 The AMP HTML Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {buildUrl} from '#ads/google/a4a/shared/url-builder';
+
+import {intersectionEntryToJson} from '#core/dom/layout/intersection';
+import {getPageLayoutBoxBlocking} from '#core/dom/layout/page-layout-box';
+import {hasOwn} from '#core/types/object';
+import {tryParseJson} from '#core/types/object/json';
+
+import {Services} from '#service';
+
+import {dev} from '#utils/log';
+
+import {getOrCreateAdCid} from '../../../src/ad-cid';
+import {
+  getConsentDataToForward,
+  getConsentPolicyInfo,
+} from '../../../src/consent';
+import {getContextMetadata} from '../../../src/iframe-attributes';
+import {AmpA4A, XORIGIN_MODE} from '../../amp-a4a/0.1/amp-a4a';
+
+/** @type {string} */
+const TAG = 'amp-ad-network-smartadserver-impl';
+
+/** @const {number} */
+const MAX_URL_LENGTH = 15360;
+
+/**
+ * @const {!./shared/url-builder.QueryParameterDef}
+ * @visibleForTesting
+ */
+const TRUNCATION_PARAM = {
+  name: 'trunc',
+  value: 1,
+};
+
+/** @final */
+export class AmpAdNetworkSmartadserverImpl extends AmpA4A {
+  /**
+   * @param {!Element} element
+   */
+  constructor(element) {
+    super(element);
+
+    /**
+     * @private {string}
+     * Additional key-value target appended by extension
+     */
+    this.exTgt_ = '';
+
+    this.addListener();
+  }
+
+  /** @override */
+  renderViaIframeGet_(adUrl) {
+    this.maybeTriggerAnalyticsEvent_('renderCrossDomainStart');
+    return getConsentDataToForward(this.element, this.getConsentPolicy()).then(
+      (consentData) => {
+        const contextMetadata = getContextMetadata(
+          this.win,
+          this.element,
+          this.sentinel,
+          {'consentSharedData': consentData}
+        );
+
+        const intersection = this.element.getIntersectionChangeEntry();
+        contextMetadata['_context']['initialIntersection'] =
+          intersectionEntryToJson(intersection);
+        return this.iframeRenderHelper_({
+          'src': Services.xhrFor(this.win).getCorsUrl(this.win, adUrl),
+          'name': JSON.stringify(contextMetadata),
+        });
+      }
+    );
+  }
+
+  /** @override */
+  getAdUrl(opt_consentTuple, opt_rtcResponsesPromise) {
+    return Promise.any([
+      getConsentPolicyInfo(this.element, this.getConsentPolicy() || 'default'),
+      new Promise((resolve) => setTimeout(() => resolve(), 10)),
+    ]).then((consentString) => {
+      opt_rtcResponsesPromise = opt_rtcResponsesPromise || Promise.resolve();
+      const checkStillCurrent = this.verifyStillCurrent();
+
+      return opt_rtcResponsesPromise.then((result) => {
+        checkStillCurrent();
+        if (result) {
+          result = this.modifyVendorResponse(result);
+        }
+
+        const rtc = this.getBestRtcCallout_(result);
+        const urlParams = {};
+
+        if (rtc && Object.keys(rtc).length) {
+          urlParams['hb_bid'] = rtc.hb_bidder || '';
+          urlParams['hb_cpm'] = rtc.hb_pb;
+          urlParams['hb_ccy'] = 'USD';
+          if (hasOwn(rtc, 'hb_cache_url')) {
+            urlParams['hb_cache_url'] = rtc.hb_cache_url;
+          } else {
+            urlParams['hb_cache_id'] = rtc.hb_cache_id || '';
+            urlParams['hb_cache_host'] = rtc.hb_cache_host || '';
+            urlParams['hb_cache_path'] = rtc.hb_cache_path || '';
+          }
+          urlParams['hb_width'] = this.element.getAttribute('width');
+          urlParams['hb_height'] = this.element.getAttribute('height');
+          urlParams['hb_cache_content_type'] = rtc.hb_cache_content_type;
+        }
+
+        const schain = this.element.getAttribute('data-schain');
+        if (schain) {
+          urlParams['schain'] = schain;
+        }
+        urlParams['isasync'] =
+          this.element.getAttribute('data-isasync') === 'false' ? 0 : 1;
+        const formatId = this.element.getAttribute('data-format');
+
+        return buildUrl(
+          (this.element.getAttribute('data-domain') ||
+            'https://www.smartadserver.com') + '/ac',
+          {
+            'siteid': this.element.getAttribute('data-site'),
+            'pgid': this.element.getAttribute('data-page'),
+            'fmtid': formatId,
+            'tgt':
+              this.exTgt_ + (this.element.getAttribute('data-target') || ''),
+            'tag': 'sas_' + formatId,
+            'out': 'amp-hb',
+            ...urlParams,
+            'gdpr_consent': consentString,
+            'pgDomain': Services.documentInfoForDoc(this.element).canonicalUrl,
+            'tmstp': this.sentinel,
+          },
+          MAX_URL_LENGTH,
+          TRUNCATION_PARAM
+        );
+      });
+    });
+  }
+
+  /** @override */
+  getNonAmpCreativeRenderingMethod(headerValue) {
+    return Services.platformFor(this.win).isIos()
+      ? XORIGIN_MODE.IFRAME_GET
+      : super.getNonAmpCreativeRenderingMethod(headerValue);
+  }
+
+  /** @override */
+  getCustomRealTimeConfigMacros_(hasStorageConsent) {
+    const allowed = {
+      'width': true,
+      'height': true,
+      'json': true,
+      'data-override-width': true,
+      'data-override-height': true,
+      'data-multi-size': true,
+      'data-slot': true,
+    };
+
+    return {
+      PAGEVIEWID: () => Services.documentInfoForDoc(this.element).pageViewId,
+      PAGEVIEWID_64: () =>
+        Services.documentInfoForDoc(this.element).pageViewId64,
+      HREF: () => this.win.location.href,
+      CANONICAL_URL: () =>
+        Services.documentInfoForDoc(this.element).canonicalUrl,
+      TGT: () =>
+        JSON.stringify(
+          (tryParseJson(this.element.getAttribute('json')) || {})['targeting']
+        ),
+      ADCID: (opt_timeout) =>
+        hasStorageConsent
+          ? getOrCreateAdCid(
+              this.getAmpDoc(),
+              'AMP_ECID_GOOGLE',
+              '_ga',
+              parseInt(opt_timeout, 10)
+            )
+          : Promise.resolve(undefined),
+      ATTR: (name) => {
+        if (!allowed[name]) {
+          dev().warn(TAG, `Invalid attribute ${name}`);
+          return '';
+        } else {
+          return this.element.getAttribute(name);
+        }
+      },
+      ELEMENT_POS: () => getPageLayoutBoxBlocking(this.element).top,
+      SCROLL_TOP: () =>
+        Services.viewportForDoc(this.getAmpDoc()).getScrollTop(),
+      PAGE_HEIGHT: () =>
+        Services.viewportForDoc(this.getAmpDoc()).getScrollHeight(),
+      BKG_STATE: () => (this.getAmpDoc().isVisible() ? 'visible' : 'hidden'),
+    };
+  }
+
+  /** @override */
+  isValidElement() {
+    return this.isAmpAdElement();
+  }
+
+  /** @override */
+  isXhrAllowed() {
+    return false;
+  }
+
+  /**
+   * Adds message event listener and triggers collapsing
+   */
+  addListener() {
+    const messageListener = (event) => {
+      if (
+        event.data.sentinel === this.sentinel &&
+        event.data.type === 'collapse'
+      ) {
+        this.attemptCollapse().catch(() => {});
+        this.win.removeEventListener('message', messageListener);
+      }
+    };
+    this.win.addEventListener('message', messageListener);
+  }
+
+  /**
+   * Chooses RTC callout with highest bid price
+   * @param {Array<Object>} rtcResponseArray
+   * @return {object}
+   */
+  getBestRtcCallout_(rtcResponseArray) {
+    if (!rtcResponseArray) {
+      return {};
+    }
+
+    let highestOffer = {};
+    rtcResponseArray.forEach((item) => {
+      if (!item || !item.response || !item.response.targeting) {
+        return null;
+      } else if (
+        (highestOffer.hb_pb &&
+          item.response.targeting.hb_pb > highestOffer.hb_pb) ||
+        (!highestOffer.hb_pb && item.response.targeting.hb_pb > 0.0)
+      ) {
+        highestOffer = item.response.targeting;
+      }
+    });
+
+    return highestOffer;
+  }
+
+  /**
+   *
+   * Modify the response from vendors to have one standard response
+   * @param {object} vendorsResponses
+   * @return {*}
+   * @memberof AmpAdNetworkSmartadserverImpl
+   */
+  modifyVendorResponse(vendorsResponses) {
+    vendorsResponses.forEach((item) => {
+      if (item.response && item.response.targeting) {
+        switch (item.callout) {
+          case 'aps':
+            const tgt = item.response.targeting;
+            if (Object.keys(tgt).length) {
+              const bid = tgt.amznbid.replace('amp_', '');
+              this.exTgt_ += `amzniid=${tgt.amzniid};amznp=${tgt.amznp};amznbid=${bid};`;
+            }
+            break;
+
+          case 'criteo':
+            if (item.response.targeting.crt_display_url === undefined) {
+              return;
+            }
+            item.response.targeting['hb_bidder'] = item.callout;
+            item.response.targeting['hb_pb'] =
+              item.response.targeting.crt_amp_rtc_pb;
+            item.response.targeting['hb_cache_url'] =
+              item.response.targeting.crt_display_url;
+            item.response.targeting['hb_cache_content_type'] =
+              'application/javascript';
+            break;
+
+          default:
+            return item;
+        }
+      }
+    });
+    return vendorsResponses;
+  }
+}
+
+AMP.extension(TAG, '0.1', (AMP) =>
+  AMP.registerElement(TAG, AmpAdNetworkSmartadserverImpl)
+);
diff --git a/extensions/amp-ad-network-smartadserver-impl/0.1/test/test-amp-ad-network-smartadserver-impl.js b/extensions/amp-ad-network-smartadserver-impl/0.1/test/test-amp-ad-network-smartadserver-impl.js
new file mode 100644
index 000000000000..55e3709eb913
--- /dev/null
+++ b/extensions/amp-ad-network-smartadserver-impl/0.1/test/test-amp-ad-network-smartadserver-impl.js
@@ -0,0 +1,868 @@
+/**
+ * Copyright 2021 The AMP HTML Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import '../../../amp-ad/0.1/amp-ad';
+import {expect} from 'chai';
+
+import {createElementWithAttributes} from '#core/dom';
+
+import {Services} from '#service';
+
+import {createIframeWithMessageStub} from '#testing/iframe';
+
+import * as consent from '../../../../src/consent';
+import * as iframe from '../../../../src/iframe-attributes';
+import {XORIGIN_MODE} from '../../../amp-a4a/0.1/amp-a4a';
+import {AmpAdNetworkSmartadserverImpl} from '../amp-ad-network-smartadserver-impl';
+
+const realWinConfig = {
+  amp: {
+    extensions: ['amp-ad-network-smartadserver-impl'],
+  },
+  ampAdCss: true,
+  allowExternalResources: false,
+};
+
+describes.realWin('amp-ad-network-smartadserver-impl', realWinConfig, (env) => {
+  const rtcConfig = {
+    vendors: {
+      prebidappnexuspsp: {
+        PLACEMENT_ID: 13133382,
+        ACCOUNT_ID: 101010,
+      },
+      indexexchange: {SITE_ID: 123456},
+    },
+    timeoutMillis: 500,
+  };
+
+  let element, impl, win, doc;
+
+  beforeEach(() => {
+    win = env.win;
+    doc = win.document;
+  });
+
+  describe('isValidElement', () => {
+    it('should be valid', async () => {
+      element = createElementWithAttributes(doc, 'amp-ad', {
+        width: '300',
+        height: '250',
+        type: 'smartadserver',
+      });
+      impl = new AmpAdNetworkSmartadserverImpl(element);
+
+      expect(impl.isValidElement()).to.be.true;
+    });
+  });
+
+  describe('isXhrAllowed', () => {
+    it('should be not allowed', async () => {
+      impl = new AmpAdNetworkSmartadserverImpl(
+        createElementWithAttributes(doc, 'amp-ad', {})
+      );
+
+      expect(impl.isXhrAllowed()).to.be.false;
+    });
+  });
+
+  describe('getCustomRealTimeConfigMacros', () => {
+    it('should return correct macros', () => {
+      const macros = {
+        'data-slot': '5678',
+        'height': '50',
+        'width': '200',
+        'data-override-width': '310',
+        'data-override-height': '260',
+      };
+      const json = {
+        targeting: {a: 123},
+      };
+
+      element = createElementWithAttributes(doc, 'amp-ad', {
+        'width': macros['width'],
+        'height': macros['height'],
+        'type': 'smartadserver',
+        'data-slot': 5678,
+        'data-override-width': 310,
+        'data-override-height': 260,
+        'layout': 'fixed',
+        'json': JSON.stringify(json),
+        'rtc-config': JSON.stringify(rtcConfig),
+      });
+      env.win.document.body.appendChild(element);
+
+      const scrollTopValue = 100;
+      const scrollHeightValue = 700;
+      env.sandbox.stub(Services, 'viewportForDoc').callsFake(() => {
+        return {
+          getScrollTop: () => scrollTopValue,
+          getScrollHeight: () => scrollHeightValue,
+        };
+      });
+
+      impl = new AmpAdNetworkSmartadserverImpl(element, env.win.doc, win);
+      const docInfo = Services.documentInfoForDoc(element);
+      const customMacros = impl.getCustomRealTimeConfigMacros_(
+        /*hasStorageConsent=*/ false
+      );
+
+      expect(customMacros.PAGEVIEWID()).to.equal(docInfo.pageViewId);
+      expect(customMacros.PAGEVIEWID_64()).to.equal(docInfo.pageViewId64);
+      expect(customMacros.HREF()).to.equal(win.location.href);
+      expect(customMacros.CANONICAL_URL()).to.equal(docInfo.canonicalUrl);
+      expect(customMacros.TGT()).to.equal(JSON.stringify(json['targeting']));
+      expect(customMacros.ELEMENT_POS()).to.equal(
+        element.getBoundingClientRect().top + scrollY
+      );
+      expect(customMacros.SCROLL_TOP()).to.equal(scrollTopValue);
+      expect(customMacros.PAGE_HEIGHT()).to.equal(scrollHeightValue);
+      expect(customMacros.BKG_STATE()).to.equal(
+        impl.getAmpDoc().isVisible() ? 'visible' : 'hidden'
+      );
+      Object.keys(macros).forEach((macro) => {
+        expect(customMacros.ATTR(macro)).to.equal(macros[macro]);
+      });
+      return Promise.all([
+        customMacros.ADCID().then((adcid) => {
+          expect(adcid).to.not.be.null;
+        }),
+      ]);
+    });
+
+    it('should skip not allowed macros', () => {
+      const macros = {
+        'width': '300',
+        'height': '250',
+        'json': '',
+        'not-allowed': 'blabla',
+      };
+      element = createElementWithAttributes(doc, 'amp-ad', macros);
+      impl = new AmpAdNetworkSmartadserverImpl(element);
+      const customMacros = impl.getCustomRealTimeConfigMacros_();
+
+      expect(customMacros.TGT()).to.equal(undefined);
+      expect(customMacros.ATTR('width')).to.equal(macros['width']);
+      expect(customMacros.ATTR('height')).to.equal(macros['height']);
+      expect(customMacros.ATTR('not-allowed')).to.not.be.equal(
+        macros['not-allowed']
+      );
+      expect(customMacros.ATTR('not-allowed')).to.equal('');
+    });
+
+    it('should not set adcid if no storage consent', () => {
+      element = createElementWithAttributes(doc, 'amp-ad');
+      impl = new AmpAdNetworkSmartadserverImpl(element);
+      const customMacros = impl.getCustomRealTimeConfigMacros_(
+        /*hasStorageConsent=*/ false
+      );
+
+      return customMacros.ADCID().then((adcid) => {
+        expect(adcid).to.be.undefined;
+      });
+    });
+  });
+
+  describe('renderViaIframeGet_', () => {
+    let getContextMetadataStub;
+    beforeEach(() => {
+      getContextMetadataStub = env.sandbox
+        .stub(iframe, 'getContextMetadata')
+        .returns({
+          _context: {},
+        });
+      env.sandbox
+        .stub(consent, 'getConsentDataToForward')
+        .resolves({consentString: 'constent', gdprApplies: true});
+      element = createElementWithAttributes(doc, 'amp-ad', {
+        width: '300',
+        height: '250',
+        type: 'smartadserver',
+      });
+      element.getIntersectionChangeEntry = () => ({
+        rootBounds: {},
+        intersectionRect: {},
+        boundingClientRect: {},
+      });
+      impl = new AmpAdNetworkSmartadserverImpl(element);
+      env.sandbox.stub(impl, 'iframeRenderHelper_');
+    });
+    afterEach(() => {
+      env.sandbox.restore();
+    });
+    it('should call maybeTriggerAnalyticsEvent_', async () => {
+      const spy = env.sandbox.spy(impl, 'maybeTriggerAnalyticsEvent_');
+      expect(spy.called).to.be.false;
+      impl.renderViaIframeGet_('fakeURL').then(() => {
+        expect(spy.called).to.be.true;
+      });
+    });
+    it('should call getContextMetadata with a consent data', async () => {
+      expect(getContextMetadataStub.called).to.be.false;
+      impl.renderViaIframeGet_('fakeURL').then(() => {
+        expect(getContextMetadataStub.called).to.be.true;
+        expect(getContextMetadataStub.getCall(0).args[3]).to.be.deep.equal({
+          'consentSharedData': {consentString: 'constent', gdprApplies: true},
+        });
+      });
+    });
+  });
+
+  describe('getAdUrl', () => {
+    it('should return proper url with vendor(default) data', async () => {
+      element = createElementWithAttributes(doc, 'amp-ad', {
+        'width': 300,
+        'height': 250,
+        'data-site': 111,
+        'data-page': 121,
+        'data-format': 222,
+        'type': 'smartadserver',
+        'rtc-config': JSON.stringify(rtcConfig),
+      });
+      doc.body.appendChild(element);
+
+      const viewer = Services.viewerForDoc(element);
+      env.sandbox.stub(viewer, 'getReferrerUrl');
+
+      const rtcResponseArray = [
+        {
+          response: {
+            targeting: {
+              'hb_bidder': 'appnexus',
+              'hb_cache_host': 'prebid.ams1.adnxs-simple.com',
+              'hb_cache_id': '0cb22b3e-aa2d-4936-9039-0ec93ff67de5',
+              'hb_cache_path': '/pbc/v1/cache',
+              'hb_pb': '1.7',
+              'hb_size': '300x250',
+            },
+          },
+          rtcTime: 210,
+        },
+      ];
+
+      return new AmpAdNetworkSmartadserverImpl(element)
+        .getAdUrl({}, Promise.resolve(rtcResponseArray))
+        .then((url) => {
+          expect(url).to.match(
+            /^https:\/\/www\.smartadserver\.com\/ac\?siteid=111&pgid=121&fmtid=222&tag=sas_222&out=amp-hb&hb_bid=appnexus&hb_cpm=1.7&hb_ccy=USD&hb_cache_id=0cb22b3e-aa2d-4936-9039-0ec93ff67de5&hb_cache_host=prebid.ams1.adnxs-simple.com&hb_cache_path=%2Fpbc%2Fv1%2Fcache&hb_width=300&hb_height=250&isasync=1&pgDomain=[a-zA-Z0-9.%]+&tmstp=1\-[0-9]+$/
+          );
+        });
+    });
+
+    it('should return proper url with Criteo vendor data', async () => {
+      element = createElementWithAttributes(doc, 'amp-ad', {
+        'width': 728,
+        'height': 90,
+        'data-site': 111,
+        'data-page': 121,
+        'data-format': 222,
+        'type': 'smartadserver',
+        'rtc-config': JSON.stringify(rtcConfig),
+      });
+      doc.body.appendChild(element);
+
+      const viewer = Services.viewerForDoc(element);
+      env.sandbox.stub(viewer, 'getReferrerUrl');
+
+      const rtcResponseArray = [
+        {
+          response: {
+            targeting: {
+              'hb_bidder': 'appnexus',
+              'hb_cache_host': 'prebid.ams1.adnxs-simple.com',
+              'hb_cache_id': '0cb22b3e-aa2d-4936-9039-0ec93ff67de5',
+              'hb_cache_path': '/pbc/v1/cache',
+              'hb_pb': '1.7',
+              'hb_size': '300x250',
+            },
+          },
+          rtcTime: 210,
+        },
+        {
+          response: {
+            targeting: {
+              'crt_display_url': 'http://test.test',
+              'crt_amp_rtc_pb': '2.6',
+              'crt_amp_rtc_format': '728x90',
+            },
+          },
+          rtcTime: 97,
+          callout: 'criteo',
+        },
+      ];
+
+      return new AmpAdNetworkSmartadserverImpl(element)
+        .getAdUrl({}, Promise.resolve(rtcResponseArray))
+        .then((url) => {
+          expect(url).to.match(
+            /^https:\/\/www\.smartadserver\.com\/ac\?siteid=111&pgid=121&fmtid=222&tag=sas_222&out=amp-hb&hb_bid=criteo&hb_cpm=2.6&hb_ccy=USD&hb_cache_url=http%3A%2F%2Ftest.test&hb_width=728&hb_height=90&hb_cache_content_type=application%2Fjavascript&isasync=1&pgDomain=[a-zA-Z0-9.%]+&tmstp=1\-[0-9]+$/
+          );
+        });
+    });
+
+    it('should return proper url while missing some vendor data', async () => {
+      element = createElementWithAttributes(doc, 'amp-ad', {
+        'data-site': 11,
+        'data-format': 23,
+        'type': 'smartadserver',
+        'rtc-config': JSON.stringify(rtcConfig),
+      });
+      doc.body.appendChild(element);
+
+      const viewer = Services.viewerForDoc(element);
+      env.sandbox.stub(viewer, 'getReferrerUrl');
+
+      const rtcResponseArray = [
+        {
+          response: {
+            'targeting': {
+              'hb_cache_host': 'prebid.ams1.adnxs-simple.com',
+              'hb_cache_id': '0cb22b3e-aa2d-4936-9039-0ec93ff67de5',
+              'hb_cache_path': '/pbc/v1/cache',
+              'hb_pb': '0.4',
+              'hb_size': '300x250',
+            },
+          },
+          rtcTime: 109,
+        },
+      ];
+
+      return new AmpAdNetworkSmartadserverImpl(element)
+        .getAdUrl({}, Promise.resolve(rtcResponseArray))
+        .then((url) => {
+          expect(url).to.match(
+            /^https:\/\/www\.smartadserver\.com\/ac\?siteid=11&fmtid=23&tag=sas_23&out=amp-hb&hb_cpm=0.4&hb_ccy=USD&hb_cache_id=0cb22b3e-aa2d-4936-9039-0ec93ff67de5&hb_cache_host=prebid.ams1.adnxs-simple.com&hb_cache_path=%2Fpbc%2Fv1%2Fcache&isasync=1&pgDomain=[a-zA-Z0-9.%]+&tmstp=1\-[0-9]+$/
+          );
+        });
+    });
+
+    it('should return proper url with default vendor data', async () => {
+      element = createElementWithAttributes(doc, 'amp-ad', {
+        'data-site': 11,
+        'data-format': 23,
+        'rtc-config': JSON.stringify(rtcConfig),
+      });
+      doc.body.appendChild(element);
+
+      const viewer = Services.viewerForDoc(element);
+      env.sandbox.stub(viewer, 'getReferrerUrl');
+
+      const rtcResponseArray = [
+        {
+          response: {
+            'targeting': {
+              'hb_pb': '0.8',
+              'hb_size': '100x200',
+            },
+          },
+          rtcTime: 109,
+        },
+      ];
+
+      return new AmpAdNetworkSmartadserverImpl(element)
+        .getAdUrl({}, Promise.resolve(rtcResponseArray))
+        .then((url) => {
+          expect(url).to.match(
+            /^https:\/\/www\.smartadserver\.com\/ac\?siteid=11&fmtid=23&tag=sas_23&out=amp-hb&hb_cpm=0.8&hb_ccy=USD&isasync=1&pgDomain=[a-zA-Z0-9.%]+&tmstp=1\-[0-9]+$/
+          );
+        });
+    });
+
+    it('should return proper url without vendor data', async () => {
+      element = createElementWithAttributes(doc, 'amp-ad', {
+        'width': '100',
+        'height': '50',
+        'data-site': '1',
+        'data-format': '33',
+        'data-domain': 'https://ww7.smartadserver.com',
+        'type': 'smartadserver',
+      });
+      doc.body.appendChild(element);
+
+      const viewer = Services.viewerForDoc(element);
+      env.sandbox.stub(viewer, 'getReferrerUrl');
+
+      return new AmpAdNetworkSmartadserverImpl(element)
+        .getAdUrl({}, Promise.resolve())
+        .then((url) => {
+          expect(url).to.match(
+            /^https:\/\/ww7\.smartadserver\.com\/ac\?siteid=1&fmtid=33&tag=sas_33&out=amp-hb&isasync=1&pgDomain=[a-zA-Z0-9.%]+&tmstp=1\-[0-9]+$/
+          );
+        });
+    });
+
+    it('should return proper url with falsy callout response', async () => {
+      element = createElementWithAttributes(doc, 'amp-ad', {
+        'data-site': 2,
+        'data-format': 3,
+      });
+      doc.body.appendChild(element);
+
+      const viewer = Services.viewerForDoc(element);
+      env.sandbox.stub(viewer, 'getReferrerUrl');
+
+      return new AmpAdNetworkSmartadserverImpl(element)
+        .getAdUrl({}, null)
+        .then((url) => {
+          expect(url).to.match(
+            /^https:\/\/www\.smartadserver\.com\/ac\?siteid=2&fmtid=3&tag=sas_3&out=amp-hb&isasync=1&pgDomain=[a-zA-Z0-9.%]+&tmstp=1\-[0-9]+$/
+          );
+        });
+    });
+
+    it('should return proper url with HB vendor and Amazon data', async () => {
+      const rtcResponseArray = [
+        {
+          response: {
+            targeting: {
+              'hb_bidder': 'appnexus',
+              'hb_cache_host': 'prebid.ams1.adnxs-simple.com',
+              'hb_cache_id': '0cb22b3e-aa2d-4936-9039-0ec93ff67de5',
+              'hb_cache_path': '/pbc/v1/cache',
+              'hb_pb': '1.3',
+              'hb_size': '300x250',
+            },
+          },
+          callout: 'prebidappnexuspsp',
+          rtcTime: 184,
+        },
+        {
+          response: {
+            'targeting': {
+              'amzniid': 'JBJnc908',
+              'amznsz': '300x250',
+              'amznp': '19131mo',
+              'amznbid': 'amp_dv85c0',
+              'amznhost': 'https://amazon-adsystem.com',
+            },
+          },
+          callout: 'aps',
+          rtcTime: 102,
+        },
+      ];
+
+      element = createElementWithAttributes(doc, 'amp-ad', {
+        'width': 300,
+        'height': 250,
+        'data-site': 1,
+        'data-page': 22,
+        'data-format': 333,
+        'data-target': 'key=value',
+        'type': 'smartadserver',
+        'rtc-config': JSON.stringify(rtcConfig),
+      });
+      doc.body.appendChild(element);
+
+      const viewer = Services.viewerForDoc(element);
+      env.sandbox.stub(viewer, 'getReferrerUrl');
+
+      return new AmpAdNetworkSmartadserverImpl(element)
+        .getAdUrl({}, Promise.resolve(rtcResponseArray))
+        .then((url) => {
+          expect(url).to.match(
+            /^https:\/\/www\.smartadserver\.com\/ac\?siteid=1&pgid=22&fmtid=333&tgt=amzniid%3DJBJnc908%3Bamznp%3D19131mo%3Bamznbid%3Ddv85c0%3Bkey%3Dvalue&tag=sas_333&out=amp-hb&hb_bid=appnexus&hb_cpm=1.3&hb_ccy=USD&hb_cache_id=0cb22b3e-aa2d-4936-9039-0ec93ff67de5&hb_cache_host=prebid.ams1.adnxs-simple.com&hb_cache_path=%2Fpbc%2Fv1%2Fcache&hb_width=300&hb_height=250&isasync=1&pgDomain=[a-zA-Z0-9.%]+&tmstp=1\-[0-9]+$/
+          );
+        });
+    });
+
+    it('should return proper url with schain value', async () => {
+      element = createElementWithAttributes(doc, 'amp-ad', {
+        'data-site': '1',
+        'data-format': '22',
+        'data-schain': 'some-sco-string',
+      });
+      doc.body.appendChild(element);
+      const viewer = Services.viewerForDoc(element);
+      env.sandbox.stub(viewer, 'getReferrerUrl');
+      return new AmpAdNetworkSmartadserverImpl(element)
+        .getAdUrl({}, null)
+        .then((url) => {
+          expect(url).to.match(
+            /^https:\/\/www\.smartadserver\.com\/ac\?siteid=1&fmtid=22&tag=sas_22&out=amp-hb&schain=some-sco-string&isasync=1&pgDomain=[a-zA-Z0-9.%]+&tmstp=1-[0-9]+$/
+          );
+        });
+    });
+
+    it('should not return chain parameter in url if empty value', async () => {
+      element = createElementWithAttributes(doc, 'amp-ad', {
+        'data-site': 10,
+        'data-format': '3',
+        'data-schain': '',
+      });
+      doc.body.appendChild(element);
+      const viewer = Services.viewerForDoc(element);
+      env.sandbox.stub(viewer, 'getReferrerUrl');
+      return new AmpAdNetworkSmartadserverImpl(element)
+        .getAdUrl({}, null)
+        .then((url) => {
+          expect(url).to.match(
+            /^https:\/\/www\.smartadserver\.com\/ac\?siteid=10&fmtid=3&tag=sas_3&out=amp-hb&isasync=1&pgDomain=[a-zA-Z0-9.%]+&tmstp=1-[0-9]+$/
+          );
+        });
+    });
+    it('should return proper url with isasync value when it is not setted', async () => {
+      element = createElementWithAttributes(doc, 'amp-ad', {
+        'data-site': 10,
+        'data-format': '3',
+        'data-isasync': '',
+      });
+      doc.body.appendChild(element);
+      const viewer = Services.viewerForDoc(element);
+      env.sandbox.stub(viewer, 'getReferrerUrl');
+      return new AmpAdNetworkSmartadserverImpl(element)
+        .getAdUrl({}, null)
+        .then((url) => {
+          expect(url).to.match(
+            /^https:\/\/www\.smartadserver\.com\/ac\?siteid=10&fmtid=3&tag=sas_3&out=amp-hb&isasync=1&pgDomain=[a-zA-Z0-9.%]+&tmstp=1-[0-9]+$/
+          );
+        });
+    });
+
+    it('should return proper url with isasync value when it is setted with not boolean value ', async () => {
+      element = createElementWithAttributes(doc, 'amp-ad', {
+        'data-site': 10,
+        'data-format': '3',
+        'data-isasync': 'test',
+      });
+      doc.body.appendChild(element);
+      const viewer = Services.viewerForDoc(element);
+      env.sandbox.stub(viewer, 'getReferrerUrl');
+      return new AmpAdNetworkSmartadserverImpl(element)
+        .getAdUrl({}, null)
+        .then((url) => {
+          expect(url).to.match(
+            /^https:\/\/www\.smartadserver\.com\/ac\?siteid=10&fmtid=3&tag=sas_3&out=amp-hb&isasync=1&pgDomain=[a-zA-Z0-9.%]+&tmstp=1-[0-9]+$/
+          );
+        });
+    });
+
+    it('should return proper url with isasync value when it is setted to false', async () => {
+      element = createElementWithAttributes(doc, 'amp-ad', {
+        'data-site': 10,
+        'data-format': '3',
+        'data-isasync': 'false',
+      });
+      doc.body.appendChild(element);
+      const viewer = Services.viewerForDoc(element);
+      env.sandbox.stub(viewer, 'getReferrerUrl');
+      return new AmpAdNetworkSmartadserverImpl(element)
+        .getAdUrl({}, null)
+        .then((url) => {
+          expect(url).to.match(
+            /^https:\/\/www\.smartadserver\.com\/ac\?siteid=10&fmtid=3&tag=sas_3&out=amp-hb&isasync=0&pgDomain=[a-zA-Z0-9.%]+&tmstp=1-[0-9]+$/
+          );
+        });
+    });
+
+    it('should return proper url when isasync is true', async () => {
+      element = createElementWithAttributes(doc, 'amp-ad', {
+        'data-site': '1',
+        'data-format': '22',
+        'data-isasync': 'true',
+      });
+      doc.body.appendChild(element);
+      const viewer = Services.viewerForDoc(element);
+      env.sandbox.stub(viewer, 'getReferrerUrl');
+      return new AmpAdNetworkSmartadserverImpl(element)
+        .getAdUrl({}, null)
+        .then((url) => {
+          expect(url).to.match(
+            /^https:\/\/www\.smartadserver\.com\/ac\?siteid=1&fmtid=22&tag=sas_22&out=amp-hb&isasync=1&pgDomain=[a-zA-Z0-9.%]+&tmstp=1-[0-9]+$/
+          );
+        });
+    });
+  });
+
+  describe('getNonAmpCreativeRenderingMethod', () => {
+    it('should return iframe get if iOS browser', () => {
+      win.navigator.__defineGetter__('userAgent', () => {
+        return 'Mozilla/5.0 (iPod; CPU iPhone OS 12_0 like macOS) AppleWebKit/602.1.50 (KHTML, like Gecko) Version/12.0 Mobile/14A5335d Safari/602.1.50';
+      });
+
+      element = createElementWithAttributes(doc, 'amp-ad', {
+        type: 'smartadserver',
+      });
+
+      expect(
+        new AmpAdNetworkSmartadserverImpl(
+          element
+        ).getNonAmpCreativeRenderingMethod()
+      ).to.equal(XORIGIN_MODE.IFRAME_GET);
+    });
+  });
+
+  describe('getBestRtcCallout', () => {
+    beforeEach(() => {
+      impl = new AmpAdNetworkSmartadserverImpl(doc.createElement('amp-ad'));
+    });
+
+    it('should return best callout data', async () => {
+      const rtcResponseArray = [
+        {
+          response: {
+            targeting: {
+              'hb_bidder': 'appnexus',
+              'hb_bidder_appnexus': 'appnexus',
+              'hb_cache_host': 'prebid.ams1.adnxs-simple.com',
+              'hb_cache_host_appnex': 'prebid.ams1.adnxs-simple.com',
+              'hb_cache_id': '558a891a-a532-423c-a30e-11a9caeea688',
+              'hb_cache_id_appnexus': '558a891a-a532-423c-a30e-11a9caeea688',
+              'hb_cache_path': '/pbc/v1/cache',
+              'hb_cache_path_appnex': '/pbc/v1/cache',
+              'hb_pb': '0.10',
+              'hb_pb_appnexus': '0.10',
+              'hb_size': '300x250',
+              'hb_size_appnexus': '300x250',
+            },
+          },
+          rtcTime: 134,
+          callout: 'prebidappnexuspsp',
+        },
+        {
+          response: {},
+          rtcTime: 122,
+          callout: 'criteo',
+        },
+        {
+          'response': {
+            'targeting': {
+              'hb_bidder': 'indexexchange',
+              'hb_cache_host': 'amp.casalemedia.com',
+              'hb_cache_id': '558a891a-a532-423c-a30e-11a9caeea688',
+              'hb_cache_path': '/amprtc/v1/cache',
+              'hb_pb': '0.30',
+              'hb_size': '300x250',
+            },
+          },
+          'rtcTime': 106,
+          'callout': 'indexexchange',
+        },
+      ];
+
+      expect(impl.getBestRtcCallout_(rtcResponseArray)).to.deep.equal(
+        rtcResponseArray[2].response.targeting
+      );
+    });
+
+    it('should return empty object when no offers', async () => {
+      const rtcResponseArray = [
+        {
+          'response': {},
+          'rtcTime': 92,
+          'callout': 'prebidappnexuspsp',
+        },
+        {
+          'response': {},
+          'rtcTime': 117,
+          'callout': 'indexexchange',
+        },
+        {
+          'response': {},
+          'rtcTime': 131,
+          'callout': 'criteo',
+        },
+      ];
+
+      expect(impl.getBestRtcCallout_(rtcResponseArray)).to.deep.equal({});
+    });
+
+    it('should return empty object when empty callouts array', async () => {
+      expect(impl.getBestRtcCallout_([])).to.deep.equal({});
+    });
+
+    it('should return empty object when falsy argument', async () => {
+      expect(impl.getBestRtcCallout_(null)).to.deep.equal({});
+    });
+  });
+
+  describe('addListener', () => {
+    it('should collapse below viewport on collapse event', async () => {
+      const offset = createElementWithAttributes(doc, 'div');
+      offset.setAttribute('style', 'width:100%; height:10000px');
+      doc.body.appendChild(offset);
+
+      element = createElementWithAttributes(doc, 'amp-ad');
+      const iframe = createIframeWithMessageStub(win);
+      element.appendChild(iframe);
+      doc.body.appendChild(element);
+      impl = new AmpAdNetworkSmartadserverImpl(element, doc, win);
+
+      const attemptCollapse = env.sandbox
+        .stub(impl, 'attemptCollapse')
+        .callsFake(() => {
+          return Promise.resolve();
+        });
+
+      const data = {
+        sentinel: impl.sentinel,
+        type: 'collapse',
+      };
+
+      expect(element.getBoundingClientRect().top).to.equal(10000);
+      expect(attemptCollapse).to.not.be.called;
+
+      iframe.contentWindow.parent.postMessage('collapse', '*');
+      expect(attemptCollapse).to.not.be.called;
+
+      iframe.contentWindow.parent.postMessage(
+        {
+          sentinel: 1234,
+          type: 'collapse',
+        },
+        '*'
+      );
+      expect(attemptCollapse).to.not.be.called;
+
+      iframe.contentWindow.parent.postMessage(data, '*');
+      expect(attemptCollapse).to.be.calledOnce;
+
+      iframe.contentWindow.parent.postMessage(data, '*');
+      expect(attemptCollapse).to.be.calledOnce;
+    });
+
+    it('should not collapse in viewport on collapse event', async () => {
+      element = createElementWithAttributes(doc, 'amp-ad');
+      const iframe = createIframeWithMessageStub(win);
+      element.appendChild(iframe);
+      doc.body.appendChild(element);
+      impl = new AmpAdNetworkSmartadserverImpl(element, doc, win);
+
+      const attemptCollapse = env.sandbox
+        .stub(impl, 'attemptCollapse')
+        .callsFake(() => {
+          return Promise.resolve();
+        });
+
+      const data = {
+        sentinel: impl.sentinel,
+        type: 'collapse',
+      };
+
+      expect(element.getBoundingClientRect().top).to.equal(0);
+      expect(doc.body.getBoundingClientRect().height).to.be.lt(160);
+      expect(attemptCollapse).to.not.be.called;
+
+      iframe.contentWindow.parent.postMessage(data, '*');
+      expect(attemptCollapse).to.be.calledOnce;
+      expect(element.getBoundingClientRect().height).to.be.gt(150);
+    });
+  });
+
+  describe('modifyVendorResponse', () => {
+    beforeEach(() => {
+      impl = new AmpAdNetworkSmartadserverImpl(doc.createElement('amp-ad'));
+    });
+
+    it('should handle empty response', async () => {
+      const bidResponses = [
+        {},
+        {
+          'response': {},
+        },
+        {
+          'response': {
+            'targeting': {},
+          },
+          'callout': 'criteo',
+        },
+      ];
+
+      const res = impl.modifyVendorResponse(bidResponses);
+
+      expect(res[0]).to.deep.equal(bidResponses[0]);
+      expect(res[1]).to.deep.equal(bidResponses[1]);
+      expect(res[2]).to.deep.equal(bidResponses[2]);
+    });
+
+    it('should handle Criteo response', async () => {
+      const criteoExampleResponse = [
+        {
+          'response': {
+            'targeting': {
+              'crt_display_url':
+                'https%3A%2F%2Fads.eu.criteo.com%2Fdelivery%2Fr%2Fajs.php%3Fu%3D%257CyYP2Nxn%252BAmlnchiEQlOsuklsAFFZpGm3EU%252FjjuD0GOA%253D%257C%26c1%3D0n2XosTo5cmttfZ_Xo-xoRysCgATX3DvUOIjpsZKqJdm3eyNZdKRXiG1WaNgOl-yTgKu_JgyoYLHkIsbBRPK5MapBzXSKnuPUJPy0V6STkn6pelkbbtucKKReRNkE_d9ovu_dCN5_74mNyHExIWAhfzTHwsdk0ZdrYKbkuQzQjTaI46HGlSNLcJFInpzROSggbHvxVeN-leVzY818y-Ecu2pqHgq8_mGpyLWnL69l00EeuGdOORdpHGk5erc99iT74U7z9834rxtE6UZSB_dYOZjoHA5Asz33g3Siyu-N6woBaYGBqcaFWpH2t9dYbAvrSFo0dKG2zqyr16C0ls-qzk65I7WcFBBbyzxZ74My577ukVt_nluaBHHuougmq6czxQ3kiKBUMau_k7d_mnh1qN5s_2e3st-zYsJYUlQHjlpH0ENsWBk30Zdk3OTcAnD2I1StD3nkWPDZPKmJ4a0uV7bmrHqgKxkuVAQMaCs2no',
+              'crt_amp_rtc_pb': '0.81',
+              'crt_amp_rtc_format': '728x90',
+            },
+          },
+          'rtcTime': 97,
+          'callout': 'criteo',
+        },
+      ];
+      let res = impl.modifyVendorResponse(criteoExampleResponse);
+      expect(res[0].response.targeting.hb_pb).to.deep.equal(
+        criteoExampleResponse[0].response.targeting.crt_amp_rtc_pb
+      );
+      expect(res[0].response.targeting.hb_cache_content_type).to.deep.equal(
+        'application/javascript'
+      );
+      expect(res[0].response.targeting.hb_cache_url).to.deep.equal(
+        criteoExampleResponse[0].response.targeting.crt_display_url
+      );
+      criteoExampleResponse[0].response.targeting['crt_display_url'] =
+        undefined;
+      res = impl.modifyVendorResponse(criteoExampleResponse);
+      expect(res[0]).to.deep.equal(criteoExampleResponse[0]);
+    });
+
+    describe('Amazon', () => {
+      beforeEach(() => {
+        expect(impl.exTgt_).to.deep.equal('');
+      });
+
+      it('should add keywords to target', async () => {
+        const amazonBid = [
+          {
+            'response': {
+              'targeting': {
+                'amzniid': 'JBJnc908',
+                'amznsz': '300x250',
+                'amznp': '19131mo',
+                'amznbid': 'amp_dv85c0',
+                'amznhost': 'https://amazon-adsystem.com',
+              },
+            },
+            'rtcTime': 212,
+            'callout': 'aps',
+          },
+        ];
+
+        const res = impl.modifyVendorResponse(amazonBid);
+
+        expect(res[0]).to.deep.equal(amazonBid[0]);
+        expect(impl.exTgt_).to.deep.equal(
+          'amzniid=JBJnc908;amznp=19131mo;amznbid=dv85c0;'
+        );
+      });
+
+      it('should not modify target when no bid', async () => {
+        const amazonBid = [
+          {
+            'response': {
+              'targeting': {},
+            },
+            'rtcTime': 13,
+            'callout': 'aps',
+          },
+        ];
+
+        const res = impl.modifyVendorResponse(amazonBid);
+
+        expect(res[0]).to.deep.equal(amazonBid[0]);
+        expect(impl.exTgt_).to.deep.equal('');
+      });
+    });
+  });
+});
diff --git a/extensions/amp-ad-network-smartadserver-impl/OWNERS b/extensions/amp-ad-network-smartadserver-impl/OWNERS
new file mode 100644
index 000000000000..d212171aeae4
--- /dev/null
+++ b/extensions/amp-ad-network-smartadserver-impl/OWNERS
@@ -0,0 +1,18 @@
+// For an explanation of the OWNERS rules and syntax, see:
+// https://github.com/ampproject/amp-github-apps/blob/main/owners/OWNERS.example
+
+{
+  rules: [
+    {
+      owners: [
+        {
+          name: 'ampproject/wg-ads-reviewers',
+        },
+        {
+          name: 'smart-adserver',
+          notify: true,
+        },
+      ],
+    },
+  ],
+}
diff --git a/extensions/amp-ad-network-smartadserver-impl/amp-ad-network-smartadserver-impl-internal.md b/extensions/amp-ad-network-smartadserver-impl/amp-ad-network-smartadserver-impl-internal.md
new file mode 100644
index 000000000000..3fc7e46502d4
--- /dev/null
+++ b/extensions/amp-ad-network-smartadserver-impl/amp-ad-network-smartadserver-impl-internal.md
@@ -0,0 +1,65 @@
+<!---
+Copyright 2021 The AMP HTML Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS-IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+# <a name="amp-ad-network-smartadserver-impl"></a> `amp-ad-network-smartadserver-impl`
+
+<table>
+  <tr>
+    <td class="col-fourty"><strong>Description</strong></td>
+    <td>The Smartadserver fast fetch implementation for serving AMP ads using <code>&lt;amp-ad&gt;</code></td>
+  </tr>
+  <tr>
+    <td class="col-fourty" width="25%"><strong>Availability</strong></td>
+    <td>Launched</td>
+  </tr>
+  <tr>
+    <td class="col-fourty"><strong>Required Script</strong></td>
+    <td><code>&lt;script async custom-element="amp-ad" src="https://cdn.ampproject.org/v0/amp-ad-0.1.js">&lt;/script></code></td>
+  </tr>
+</table>
+
+# Behavior
+
+Smartadserver supports the Real Time Config (RTC) to preload configuration settings for ad placements. The RTC setup is optional.
+
+# Supported parameters
+
+Smartadserver largely uses the same tags as `<amp-ad>`. The following are required tags for special behaviors of existing ones:
+
+-   `data-site`: Site ID
+-   `data-page`: Page ID
+-   `data-format`: Format ID
+-   `data-domain`: Ad call domain
+
+These attributes are optional:
+
+-   `data-target`: Targeting string
+-   `data-isasync`: Is call to Smartadserver should be executed in sync or async mode
+-   `data-schain`: SupplyChain Object string
+-   `rtc-config`: Please refer to [RTC Documentation](https://github.com/ampproject/amphtml/blob/main/extensions/amp-a4a/rtc-documentation.md) for details
+
+## Example configuration
+
+```html
+<amp-ad width="300" height="250" type="smartadserver"
+  data-site="38877"
+  data-page="1410268"
+  data-format="945"
+  data-target="test=amp"
+  data-isasync="true"
+  data-domain="https://www4.smartadserver.com">
+</amp-ad>
+```
diff --git a/extensions/amp-ad-network-valueimpression-impl/0.1/amp-ad-network-valueimpression-impl.js b/extensions/amp-ad-network-valueimpression-impl/0.1/amp-ad-network-valueimpression-impl.js
index 13c13483c806..2c1dd12b3adc 100644
--- a/extensions/amp-ad-network-valueimpression-impl/0.1/amp-ad-network-valueimpression-impl.js
+++ b/extensions/amp-ad-network-valueimpression-impl/0.1/amp-ad-network-valueimpression-impl.js
@@ -1,4 +1,5 @@
 import '#service/real-time-config/real-time-config-impl';
+import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';
 import {Deferred} from '#core/data-structures/promise';
 import {domFingerprintPlain} from '#core/dom/fingerprint';
 import {getPageLayoutBoxBlocking} from '#core/dom/layout/page-layout-box';
@@ -25,7 +26,7 @@ const TAG = 'amp-ad-network-valueimpression-impl';
 const DOUBLECLICK_BASE_URL =
   'https://securepubads.g.doubleclick.net/gampad/ads';
 
-/** @const {Object} */
+/** @const {object} */
 const CDN_PROXY_REGEXP =
   /^https:\/\/([a-zA-Z0-9_-]+\.)?cdn\.ampproject\.org((\/.*)|($))+/;
 
@@ -41,15 +42,15 @@ const AmpAdImplementation = {
  * than 32 capabilities to this enum.
  * @enum {number}
  */
-const Capability = {
+const Capability_Enum = {
   SVG_SUPPORTED: 1 << 0,
   SANDBOXING_ALLOW_TOP_NAVIGATION_BY_USER_ACTIVATION_SUPPORTED: 1 << 1,
   SANDBOXING_ALLOW_POPUPS_TO_ESCAPE_SANDBOX_SUPPORTED: 1 << 2,
 };
 
 /**
- * See `VisibilityState` enum.
- * @const {!Object<string, string>}
+ * See `VisibilityState_Enum` enum.
+ * @const {!{[key: string]: string}}
  */
 const visibilityStateCodes = {
   'visible': '1',
@@ -191,7 +192,7 @@ export class AmpAdNetworkValueimpressionImpl extends AmpA4A {
   /** @override */
   getAdUrl(opt_consentTuple, opt_rtcResponsesPromise, opt_serveNpaSignal) {
     const consentTuple = opt_consentTuple || {};
-    const {consentString, gdprApplies} = consentTuple;
+    const {consentState, consentString, gdprApplies, purposeOne} = consentTuple;
     const {win} = this;
     const ampDoc = this.getAmpDoc();
 
@@ -229,10 +230,17 @@ export class AmpAdNetworkValueimpressionImpl extends AmpA4A {
       });
     const startTime = Date.now();
 
+    const hasStorageConsent =
+      consentState != CONSENT_POLICY_STATE.UNKNOWN &&
+      consentState != CONSENT_POLICY_STATE.INSUFFICIENT &&
+      ((gdprApplies && consentString && purposeOne) || !gdprApplies);
+
     Promise.all([
       rtcParamsPromise,
       referrerPromise,
-      getOrCreateAdCid(ampDoc, 'AMP_ECID_GOOGLE', '_ga'),
+      hasStorageConsent
+        ? getOrCreateAdCid(ampDoc, 'AMP_ECID_GOOGLE', '_ga')
+        : Promise.resolve(undefined),
     ]).then((results) => {
       const clientId = results[2];
       const referrer = results[1];
@@ -442,17 +450,17 @@ function getBrowserCapabilitiesBitmap(win) {
   let browserCapabilities = 0;
   const doc = win.document;
   if (win.SVGElement && doc.createElementNS) {
-    browserCapabilities |= Capability.SVG_SUPPORTED;
+    browserCapabilities |= Capability_Enum.SVG_SUPPORTED;
   }
   const iframeEl = doc.createElement('iframe');
   if (iframeEl.sandbox && iframeEl.sandbox.supports) {
     if (iframeEl.sandbox.supports('allow-top-navigation-by-user-activation')) {
       browserCapabilities |=
-        Capability.SANDBOXING_ALLOW_TOP_NAVIGATION_BY_USER_ACTIVATION_SUPPORTED;
+        Capability_Enum.SANDBOXING_ALLOW_TOP_NAVIGATION_BY_USER_ACTIVATION_SUPPORTED;
     }
     if (iframeEl.sandbox.supports('allow-popups-to-escape-sandbox')) {
       browserCapabilities |=
-        Capability.SANDBOXING_ALLOW_POPUPS_TO_ESCAPE_SANDBOX_SUPPORTED;
+        Capability_Enum.SANDBOXING_ALLOW_POPUPS_TO_ESCAPE_SANDBOX_SUPPORTED;
     }
   }
   return browserCapabilities;
@@ -495,7 +503,7 @@ function elapsedTimeWithCeiling(time, start) {
  * Builds a URL from query parameters, truncating to a maximum length if
  * necessary.
  * @param {string} baseUrl scheme, domain, and path for the URL.
- * @param {!Object<string,string|number|null>} queryParams query parameters for
+ * @param {!{[key: string]: string|number|null}} queryParams query parameters for
  *     the URL.
  * @param {number} maxLength length to truncate the URL to if necessary.
  * @param {?QueryParameterDef=} opt_truncationQueryParam query parameter to
diff --git a/extensions/amp-ad-network-valueimpression-impl/0.1/flexible-ad-slot-utils.js b/extensions/amp-ad-network-valueimpression-impl/0.1/flexible-ad-slot-utils.js
index 61f5f6ba927e..636211e37ab8 100644
--- a/extensions/amp-ad-network-valueimpression-impl/0.1/flexible-ad-slot-utils.js
+++ b/extensions/amp-ad-network-valueimpression-impl/0.1/flexible-ad-slot-utils.js
@@ -1,4 +1,4 @@
-import {Layout} from '#core/dom/layout';
+import {Layout_Enum} from '#core/dom/layout';
 
 import {Services} from '#service';
 
@@ -25,13 +25,13 @@ function getElementWidthVisitor(setWidth) {
   return (element, style) => {
     const layout = element.getAttribute('layout');
     switch (layout) {
-      case Layout.FIXED:
+      case Layout_Enum.FIXED:
         setWidth(parseInt(element.getAttribute('width'), 10) || 0);
         return true;
-      case Layout.RESPONSIVE:
-      case Layout.FILL:
-      case Layout.FIXED_HEIGHT:
-      case Layout.FLUID:
+      case Layout_Enum.RESPONSIVE:
+      case Layout_Enum.FILL:
+      case Layout_Enum.FIXED_HEIGHT:
+      case Layout_Enum.FLUID:
         // The above layouts determine the width of the element by the
         // containing element, or by CSS max-width property.
         const maxWidth = parseInt(style.maxWidth, 10);
@@ -40,15 +40,15 @@ function getElementWidthVisitor(setWidth) {
           return true;
         }
         break;
-      case Layout.CONTAINER:
+      case Layout_Enum.CONTAINER:
         // Container layout allows the container's size to be determined by
         // the children within it, so in principle we can grow as large as the
         // viewport.
         const viewport = Services.viewportForDoc(dev().assertElement(element));
         setWidth(viewport.getSize().width);
         return true;
-      case Layout.NODISPLAY:
-      case Layout.FLEX_ITEM:
+      case Layout_Enum.NODISPLAY:
+      case Layout_Enum.FLEX_ITEM:
         setWidth(0);
         return true;
       default:
@@ -91,7 +91,7 @@ function getFullWidthSignalVisitor(setSignal) {
  *    fwSignal: number,
  *    slotWidth: number,
  *    parentWidth: number,
- *    parentStyle: ?Object<string, string>,
+ *    parentStyle: ?{[key: string]: string},
  * }}
  */
 export let FlexibleAdSlotDataTypeDef;
diff --git a/extensions/amp-ad/0.1/amp-ad-3p-impl.js b/extensions/amp-ad/0.1/amp-ad-3p-impl.js
index e23ab75f7323..d1e092c77a23 100644
--- a/extensions/amp-ad/0.1/amp-ad-3p-impl.js
+++ b/extensions/amp-ad/0.1/amp-ad-3p-impl.js
@@ -1,41 +1,46 @@
+import {adConfig} from '#ads/_config';
 import {
   ADSENSE_MCRSPV_TAG,
   getMatchedContentResponsiveHeightAndUpdatePubParams,
 } from '#ads/google/utils';
-import {AmpAdUIHandler} from './amp-ad-ui';
-import {AmpAdXOriginIframeHandler} from './amp-ad-xorigin-iframe-handler';
+
 import {
-  CONSENT_POLICY_STATE, // eslint-disable-line no-unused-vars
+  CONSENT_POLICY_STATE, // eslint-disable-line @typescript-eslint/no-unused-vars
 } from '#core/constants/consent-state';
 import {
-  Layout, // eslint-disable-line no-unused-vars
-  LayoutPriority,
+  LayoutPriority_Enum,
+  Layout_Enum, // eslint-disable-line @typescript-eslint/no-unused-vars
   isLayoutSizeDefined,
 } from '#core/dom/layout';
-import {Services} from '#service';
-import {adConfig} from '#ads/_config';
-import {clamp} from '#core/math';
+import {intersectionEntryToJson} from '#core/dom/layout/intersection';
+import {moveLayoutRect} from '#core/dom/layout/rect';
+import {observeIntersections} from '#core/dom/layout/viewport-observer';
 import {computedStyle, setStyle} from '#core/dom/style';
+import {clamp} from '#core/math';
+import {getWin} from '#core/window';
+
+import {Services} from '#service';
+
 import {dev, devAssert, userAssert} from '#utils/log';
-import {dict} from '#core/types/object';
-import {getAdCid} from '../../../src/ad-cid';
-import {getAdContainer, isAdPositionAllowed} from '../../../src/ad-helper';
+
+import {AmpAdUIHandler} from './amp-ad-ui';
+import {AmpAdXOriginIframeHandler} from './amp-ad-xorigin-iframe-handler';
 import {
   getAmpAdRenderOutsideViewport,
   incrementLoadingAds,
   is3pThrottled,
 } from './concurrent-load';
+
+import {getIframe, preloadBootstrap} from '../../../src/3p-frame';
+import {getAdCid} from '../../../src/ad-cid';
+import {getAdContainer, isAdPositionAllowed} from '../../../src/ad-helper';
+import {ChunkPriority_Enum, chunk} from '../../../src/chunk';
 import {
   getConsentMetadata,
   getConsentPolicyInfo,
   getConsentPolicySharedData,
   getConsentPolicyState,
 } from '../../../src/consent';
-import {getIframe, preloadBootstrap} from '../../../src/3p-frame';
-import {intersectionEntryToJson} from '#core/dom/layout/intersection';
-import {moveLayoutRect} from '#core/dom/layout/rect';
-import {observeIntersections} from '#core/dom/layout/viewport-observer';
-import {getWin} from '#core/window';
 
 /** @const {string} Tag name for 3P AD implementation. */
 export const TAG_3P_IMPL = 'amp-ad-3p-impl';
@@ -136,7 +141,7 @@ export class AmpAd3PImpl extends AMP.BaseElement {
     // Loads ads after other content,
     const isPWA = !this.element.getAmpDoc().isSingleDoc();
     // give the ad higher priority if it is inside a PWA
-    return isPWA ? LayoutPriority.METADATA : LayoutPriority.ADS;
+    return isPWA ? LayoutPriority_Enum.METADATA : LayoutPriority_Enum.ADS;
   }
 
   /** @override */
@@ -150,7 +155,7 @@ export class AmpAd3PImpl extends AMP.BaseElement {
   }
 
   /**
-   * @param {!Layout} layout
+   * @param {!Layout_Enum} layout
    * @override
    */
   isLayoutSupported(layout) {
@@ -190,6 +195,15 @@ export class AmpAd3PImpl extends AMP.BaseElement {
     this.uiHandler = new AmpAdUIHandler(this);
     this.uiHandler.validateStickyAd();
 
+    // For sticky ad only: must wait for scrolling event before loading the ad
+    this.uiHandler
+      .getScrollPromiseForStickyAd()
+      .then(() => this.uiHandler.maybeInitStickyAd());
+
+    if (this.uiHandler.isStickyAd()) {
+      chunk(this.element, () => this.layoutCallback(), ChunkPriority_Enum.LOW);
+    }
+
     this.isFullWidthRequested_ = this.shouldRequestFullWidth_();
 
     if (this.isFullWidthRequested_) {
@@ -356,21 +370,15 @@ export class AmpAd3PImpl extends AMP.BaseElement {
       this.element
     ).pageViewId64;
 
-    // For sticky ad only: must wait for scrolling event before loading the ad
-    const scrollPromise = this.uiHandler.getScrollPromiseForStickyAd();
-
     this.layoutPromise_ = Promise.all([
       getAdCid(this),
       consentPromise,
       sharedDataPromise,
       consentStringPromise,
       consentMetadataPromise,
-      scrollPromise,
       pageViewId64Promise,
     ])
       .then((consents) => {
-        this.uiHandler.maybeInitStickyAd();
-
         // Use JsonObject to preserve field names so that ampContext can access
         // values with name
         // ampcontext.js and this file are compiled in different compilation unit
@@ -379,15 +387,15 @@ export class AmpAd3PImpl extends AMP.BaseElement {
         // perserved name to extern. We are doing both right now.
         // Please also add new introduced variable
         // name to the extern list.
-        const opt_context = dict({
+        const opt_context = {
           'clientId': consents[0] || null,
           'container': this.container_,
           'initialConsentState': consents[1],
           'consentSharedData': consents[2],
           'initialConsentValue': consents[3],
           'initialConsentMetadata': consents[4],
-          'pageViewId64': consents[6],
-        });
+          'pageViewId64': consents[5],
+        };
 
         // In this path, the request and render start events are entangled,
         // because both happen inside a cross-domain iframe.  Separating them
diff --git a/extensions/amp-ad/0.1/amp-ad-custom.js b/extensions/amp-ad/0.1/amp-ad-custom.js
index 59606e9b3376..566a55e2606c 100644
--- a/extensions/amp-ad/0.1/amp-ad-custom.js
+++ b/extensions/amp-ad/0.1/amp-ad-custom.js
@@ -1,26 +1,30 @@
-import {AmpAdUIHandler} from './amp-ad-ui';
-import {CommonSignals} from '#core/constants/common-signals';
-import {LayoutPriority, isLayoutSizeDefined} from '#core/dom/layout';
-import {Services} from '#service';
-import {addParamToUrl} from '../../../src/url';
+import {CommonSignals_Enum} from '#core/constants/common-signals';
+import {removeChildren} from '#core/dom';
+import {LayoutPriority_Enum, isLayoutSizeDefined} from '#core/dom/layout';
 import {
   childElementByTag,
   closestAncestorElementBySelector,
 } from '#core/dom/query';
 import {hasOwn} from '#core/types/object';
-import {removeChildren} from '#core/dom';
+
+import {Services} from '#service';
+
 import {userAssert} from '#utils/log';
 
+import {AmpAdUIHandler} from './amp-ad-ui';
+
+import {addParamToUrl} from '../../../src/url';
+
 /** @const {string} Tag name for custom ad implementation. */
 export const TAG_AD_CUSTOM = 'amp-ad-custom';
 
-/** @type {Object} A map of promises for each value of data-url. The promise
+/** @type {object} A map of promises for each value of data-url. The promise
  *  will fetch data for the URL for the ad server, and return it as a map of
  *  objects, keyed by slot; each object contains the variables to be
  *   substituted into the mustache template. */
 const ampCustomadXhrPromises = {};
 
-/** @type {Object} a map of full urls (i.e. including the ampslots parameter)
+/** @type {object} a map of full urls (i.e. including the ampslots parameter)
  * for each value of data-url */
 let ampCustomadFullUrls = null;
 
@@ -42,7 +46,7 @@ export class AmpAdCustom extends AMP.BaseElement {
   /** @override */
   getLayoutPriority() {
     // Since this is AMPHTML we are trusting that it will load responsibly
-    return LayoutPriority.CONTENT;
+    return LayoutPriority_Enum.CONTENT;
   }
 
   /** @override */
@@ -116,7 +120,7 @@ export class AmpAdCustom extends AMP.BaseElement {
             // maybe used by other ad component.
             removeChildren(this.element);
             this.element.appendChild(renderedElement);
-            this.signals().signal(CommonSignals.INI_LOAD);
+            this.signals().signal(CommonSignals_Enum.INI_LOAD);
           });
       } catch (e) {
         this.uiHandler.applyNoContentUI();
diff --git a/extensions/amp-ad/0.1/amp-ad-ui.js b/extensions/amp-ad/0.1/amp-ad-ui.js
index 43bdf0bdf4da..c21a926cc14d 100644
--- a/extensions/amp-ad/0.1/amp-ad-ui.js
+++ b/extensions/amp-ad/0.1/amp-ad-ui.js
@@ -1,20 +1,20 @@
-import {Services} from '#service';
-import {ancestorElementsByTag} from '#core/dom/query';
 import {createElementWithAttributes, removeElement} from '#core/dom';
-import {dict} from '#core/types/object';
+import {ancestorElementsByTag} from '#core/dom/query';
+import {setStyle, setStyles} from '#core/dom/style';
+
+import {Services} from '#service';
+
+import {listen} from '#utils/event-helper';
 import {user, userAssert} from '#utils/log';
 
 import {getAdContainer} from '../../../src/ad-helper';
-import {listen} from '#utils/event-helper';
-import {setStyle, setStyles} from '#core/dom/style';
 
 const TAG = 'amp-ad-ui';
 
 const STICKY_AD_MAX_SIZE_LIMIT = 0.2;
 const STICKY_AD_MAX_HEIGHT_LIMIT = 0.5;
 
-const TOP_STICKY_AD_CLOSE_THRESHOLD = 50;
-const TOP_STICKY_AD_TRIGGER_THRESHOLD = 200;
+const TOP_STICKY_AD_OFFSET_THRESHOLD = 50;
 
 /**
  * Permissible sticky ad options.
@@ -83,13 +83,6 @@ export class AmpAdUIHandler {
      */
     this.topStickyAdScrollListener_ = undefined;
 
-    /**
-     * For top sticky ads, we waited until scrolling down before activating
-     * the closing ads listener.
-     * @private {boolean}
-     */
-    this.topStickyAdCloserAcitve_ = false;
-
     /**
      * Unlisteners to be unsubscribed after destroying.
      * @private {!Array<!Function>}
@@ -232,36 +225,31 @@ export class AmpAdUIHandler {
    */
   maybeInitStickyAd() {
     if (this.isStickyAd()) {
+      const doc = this.element_.getAmpDoc();
       setStyle(this.element_, 'visibility', 'visible');
 
       if (this.stickyAdPosition_ == StickyAdPositions.TOP) {
-        const doc = this.element_.getAmpDoc();
-
-        // Let the top sticky ad be below the viewer top.
-        const paddingTop = Services.viewportForDoc(doc).getPaddingTop();
-        setStyle(this.element_, 'top', `${paddingTop}px`);
-
         this.topStickyAdScrollListener_ = Services.viewportForDoc(doc).onScroll(
           () => {
-            const scrollPos = doc.win./*OK*/ scrollY;
-            if (scrollPos > TOP_STICKY_AD_TRIGGER_THRESHOLD) {
-              this.topStickyAdCloserAcitve_ = true;
-            }
-
-            // When the scroll position is close to the top, we close the
+            // When the scroll position is close to the top, we hide the
             // top sticky ad in order not to have the ads overlap the
             // content.
-            if (
-              this.topStickyAdCloserAcitve_ &&
-              scrollPos < TOP_STICKY_AD_CLOSE_THRESHOLD
-            ) {
-              this.closeStickyAd_();
-            }
+            const scrollPos = doc.win./*OK*/ scrollY;
+            setStyle(
+              this.element_,
+              'visibility',
+              scrollPos > TOP_STICKY_AD_OFFSET_THRESHOLD ? 'visible' : 'hidden'
+            );
           }
         );
         this.unlisteners_.push(this.topStickyAdScrollListener_);
       }
 
+      Services.viewportForDoc(doc).addToFixedLayer(
+        this.element_,
+        /* forceTransfer */ true
+      );
+
       this.adjustPadding();
       if (!this.closeButtonRendered_) {
         this.addCloseButton_();
@@ -326,11 +314,11 @@ export class AmpAdUIHandler {
     const closeButton = createElementWithAttributes(
       /** @type {!Document} */ (this.element_.ownerDocument),
       'button',
-      dict({
+      {
         'aria-label':
           this.element_.getAttribute('data-close-button-aria-label') ||
           'Close this ad',
-      })
+      }
     );
 
     this.unlisteners_.push(
@@ -368,7 +356,7 @@ export class AmpAdUIHandler {
       );
     }
 
-    /** @type {!Object<boolean, number|undefined, number|undefined>} */
+    /** @type {!{[key: boolean]: number|undefined, number|undefined}} */
     const resizeInfo = {
       success: true,
       newWidth,
diff --git a/extensions/amp-ad/0.1/amp-ad-xorigin-iframe-handler.js b/extensions/amp-ad/0.1/amp-ad-xorigin-iframe-handler.js
index 06db66e1799a..3db557dcbb5d 100644
--- a/extensions/amp-ad/0.1/amp-ad-xorigin-iframe-handler.js
+++ b/extensions/amp-ad/0.1/amp-ad-xorigin-iframe-handler.js
@@ -1,25 +1,30 @@
-import {CONSTANTS, MessageType} from '#core/3p-frame-messaging';
-import {CommonSignals} from '#core/constants/common-signals';
+import {isGoogleAdsA4AValidEnvironment} from '#ads/google/a4a/utils';
+
+import {CONSTANTS, MessageType_Enum} from '#core/3p-frame-messaging';
+import {CommonSignals_Enum} from '#core/constants/common-signals';
 import {Deferred} from '#core/data-structures/promise';
-import {LegacyAdIntersectionObserverHost} from './legacy-ad-intersection-observer-host';
+import {removeElement} from '#core/dom';
+import {getHtml} from '#core/dom/get-html';
+import {applyFillContent} from '#core/dom/layout';
+import {setStyle} from '#core/dom/style';
+import {throttle} from '#core/types/function';
+
+import {isExperimentOn} from '#experiments';
+
 import {Services} from '#service';
+
+import {getData} from '#utils/event-helper';
+import {dev, devAssert} from '#utils/log';
+
+import {LegacyAdIntersectionObserverHost} from './legacy-ad-intersection-observer-host';
+
+import {reportErrorToAnalytics} from '../../../src/error-reporting';
 import {
   SubscriptionApi,
   listenFor,
   listenForOncePromise,
   postMessageToWindows,
 } from '../../../src/iframe-helper';
-import {applyFillContent} from '#core/dom/layout';
-import {dev, devAssert} from '#utils/log';
-import {dict} from '#core/types/object';
-import {getData} from '#utils/event-helper';
-import {getHtml} from '#core/dom/get-html';
-import {isExperimentOn} from '#experiments';
-import {isGoogleAdsA4AValidEnvironment} from '#ads/google/a4a/utils';
-import {removeElement} from '#core/dom';
-import {reportErrorToAnalytics} from '../../../src/error-reporting';
-import {setStyle} from '#core/dom/style';
-import {throttle} from '#core/types/function';
 
 const VISIBILITY_TIMEOUT = 10000;
 
@@ -125,7 +130,7 @@ export class AmpAdXOriginIframeHandler {
       // To provide position to inabox.
       this.inaboxPositionApi_ = new SubscriptionApi(
         this.iframe,
-        MessageType.SEND_POSITIONS,
+        MessageType_Enum.SEND_POSITIONS,
         true,
         () => {
           // TODO(@zhouyx): Make sendPosition_ only send to
@@ -141,7 +146,7 @@ export class AmpAdXOriginIframeHandler {
       this.element_.creativeId = info.data['id'];
     });
 
-    this.handleOneTimeRequest_(MessageType.GET_HTML, (payload) => {
+    this.handleOneTimeRequest_(MessageType_Enum.GET_HTML, (payload) => {
       const selector = payload['selector'];
       const attributes = payload['attributes'];
       let content = '';
@@ -151,7 +156,7 @@ export class AmpAdXOriginIframeHandler {
       return Promise.resolve(content);
     });
 
-    this.handleOneTimeRequest_(MessageType.GET_CONSENT_STATE, () => {
+    this.handleOneTimeRequest_(MessageType_Enum.GET_CONSENT_STATE, () => {
       return this.baseInstance_.getConsentState().then((consentState) => {
         return {consentState};
       });
@@ -204,7 +209,7 @@ export class AmpAdXOriginIframeHandler {
     this.unlisteners_.push(
       listenFor(
         this.iframe,
-        MessageType.USER_ERROR_IN_IFRAME,
+        MessageType_Enum.USER_ERROR_IN_IFRAME,
         (data) => {
           this.userErrorForAnalytics_(
             data['message'],
@@ -273,11 +278,13 @@ export class AmpAdXOriginIframeHandler {
     // Wait for initial load signal. Notice that this signal is not
     // used to resolve the final layout promise because iframe may still be
     // consuming significant network and CPU resources.
-    listenForOncePromise(this.iframe, CommonSignals.INI_LOAD, true).then(() => {
-      // TODO(dvoytenko, #7788): ensure that in-a-box "ini-load" message is
-      // received here as well.
-      this.baseInstance_.signals().signal(CommonSignals.INI_LOAD);
-    });
+    listenForOncePromise(this.iframe, CommonSignals_Enum.INI_LOAD, true).then(
+      () => {
+        // TODO(dvoytenko, #7788): ensure that in-a-box "ini-load" message is
+        // received here as well.
+        this.baseInstance_.signals().signal(CommonSignals_Enum.INI_LOAD);
+      }
+    );
 
     this.element_.appendChild(this.iframe);
     if (opt_isA4A && !opt_letCreativeTriggerRenderStart) {
@@ -340,7 +347,7 @@ export class AmpAdXOriginIframeHandler {
           const payload = info[CONSTANTS.payloadFieldName];
 
           getter(payload).then((content) => {
-            const result = dict();
+            const result = {};
             result[CONSTANTS.messageIdFieldName] = messageId;
             result[CONSTANTS.contentFieldName] = content;
             postMessageToWindows(
@@ -498,11 +505,11 @@ export class AmpAdXOriginIframeHandler {
       this.iframe,
       [{win: source, origin}],
       success ? 'embed-size-changed' : 'embed-size-denied',
-      dict({
+      {
         'id': id,
         'requestedWidth': requestedWidth,
         'requestedHeight': requestedHeight,
-      }),
+      },
       true
     );
   }
@@ -515,13 +522,10 @@ export class AmpAdXOriginIframeHandler {
     if (!this.embedStateApi_) {
       return;
     }
-    this.embedStateApi_.send(
-      'embed-state',
-      dict({
-        'inViewport': inViewport,
-        'pageHidden': !this.baseInstance_.getAmpDoc().isVisible(),
-      })
-    );
+    this.embedStateApi_.send('embed-state', {
+      'inViewport': inViewport,
+      'pageHidden': !this.baseInstance_.getAmpDoc().isVisible(),
+    });
   }
 
   /**
@@ -538,10 +542,10 @@ export class AmpAdXOriginIframeHandler {
           'element clientRect should intersects with root clientRect'
         );
         const viewport = this.viewport_.getRect();
-        return dict({
+        return {
           'targetRect': position,
           'viewportRect': viewport,
-        });
+        };
       });
   }
 
@@ -555,7 +559,7 @@ export class AmpAdXOriginIframeHandler {
     this.sendPositionPending_ = true;
     this.getIframePositionPromise_().then((position) => {
       this.sendPositionPending_ = false;
-      this.inaboxPositionApi_.send(MessageType.POSITION, position);
+      this.inaboxPositionApi_.send(MessageType_Enum.POSITION, position);
     });
   }
 
@@ -574,7 +578,7 @@ export class AmpAdXOriginIframeHandler {
           this.win_,
           () => {
             this.getIframePositionPromise_().then((position) => {
-              this.inaboxPositionApi_.send(MessageType.POSITION, position);
+              this.inaboxPositionApi_.send(MessageType_Enum.POSITION, position);
             });
           },
           MIN_INABOX_POSITION_EVENT_INTERVAL
@@ -584,7 +588,7 @@ export class AmpAdXOriginIframeHandler {
     this.unlisteners_.push(
       this.viewport_.onResize(() => {
         this.getIframePositionPromise_().then((position) => {
-          this.inaboxPositionApi_.send(MessageType.POSITION, position);
+          this.inaboxPositionApi_.send(MessageType_Enum.POSITION, position);
         });
       })
     );
diff --git a/extensions/amp-ad/0.1/amp-ad.css b/extensions/amp-ad/0.1/amp-ad.css
index 28b85045f441..7a0cb1791c8c 100644
--- a/extensions/amp-ad/0.1/amp-ad.css
+++ b/extensions/amp-ad/0.1/amp-ad.css
@@ -64,7 +64,6 @@ amp-ad[data-a4a-upgrade-type='amp-ad-network-doubleclick-impl'][height='fluid']
 
 amp-ad .amp-ad-close-button {
   position: absolute;
-  visibility: visible;
   width: 28px;
   height: 28px;
   right: 0;
@@ -119,7 +118,7 @@ amp-ad[sticky='left'] .amp-ad-close-button {
 }
 
 amp-ad[sticky] {
-  z-index: 11;
+  z-index: 2147483647;
   position: fixed;
   overflow: visible !important;
   box-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.2) !important;
@@ -132,6 +131,7 @@ amp-ad[sticky='top'] {
   max-height: 20% !important;
   background: #fff;
   padding-bottom: 5px;
+  top: 0;
 }
 
 amp-ad[sticky='bottom'] {
diff --git a/extensions/amp-ad/0.1/amp-ad.js b/extensions/amp-ad/0.1/amp-ad.js
index ce14144cd815..6ea1ddbfb99c 100644
--- a/extensions/amp-ad/0.1/amp-ad.js
+++ b/extensions/amp-ad/0.1/amp-ad.js
@@ -13,15 +13,20 @@
  * limitations under the License.
  */
 
-import {AmpAd3PImpl} from './amp-ad-3p-impl';
-import {AmpAdCustom} from './amp-ad-custom';
-import {CSS} from '../../../build/amp-ad-0.1.css';
-import {Services} from '#service';
-import {adConfig} from '#ads/_config';
 import {getA4ARegistry} from '#ads/_a4a-config';
+import {adConfig} from '#ads/_config';
+
 import {hasOwn} from '#core/types/object';
+
+import {Services} from '#service';
+
 import {userAssert} from '#utils/log';
 
+import {AmpAd3PImpl} from './amp-ad-3p-impl';
+import {AmpAdCustom} from './amp-ad-custom';
+
+import {CSS} from '../../../build/amp-ad-0.1.css';
+
 /**
  * Construct ad network type-specific tag and script name.  Note that this
  * omits the version number and '.js' suffix for the extension script, which
diff --git a/extensions/amp-ad/0.1/concurrent-load.js b/extensions/amp-ad/0.1/concurrent-load.js
index f32de44ba737..91afa94dbe64 100644
--- a/extensions/amp-ad/0.1/concurrent-load.js
+++ b/extensions/amp-ad/0.1/concurrent-load.js
@@ -14,7 +14,9 @@
  */
 
 import {Deferred} from '#core/data-structures/promise';
+
 import {Services} from '#service';
+
 import {user, userAssert} from '#utils/log';
 
 /**
diff --git a/extensions/amp-ad/0.1/legacy-ad-intersection-observer-host.js b/extensions/amp-ad/0.1/legacy-ad-intersection-observer-host.js
index 9ef4f40a521f..d215e77efd9e 100644
--- a/extensions/amp-ad/0.1/legacy-ad-intersection-observer-host.js
+++ b/extensions/amp-ad/0.1/legacy-ad-intersection-observer-host.js
@@ -1,8 +1,9 @@
-import {MessageType} from '#core/3p-frame-messaging';
+import {MessageType_Enum} from '#core/3p-frame-messaging';
+import {intersectionEntryToJson} from '#core/dom/layout/intersection';
+
 import {Services} from '#service';
+
 import {SubscriptionApi} from '../../../src/iframe-helper';
-import {dict} from '#core/types/object';
-import {intersectionEntryToJson} from '#core/dom/layout/intersection';
 
 /**
  * LegacyAdIntersectionObserverHost exists for backward compatibility to support
@@ -65,7 +66,7 @@ export class LegacyAdIntersectionObserverHost {
      */
     this.postMessageApi_ = new SubscriptionApi(
       adIframe,
-      MessageType.SEND_INTERSECTIONS,
+      MessageType_Enum.SEND_INTERSECTIONS,
       true, // is3p
       // Each time someone subscribes we make sure that they
       // get an update.
@@ -198,12 +199,9 @@ export class LegacyAdIntersectionObserverHost {
       return;
     }
     // Note that SubscribeApi multicasts the update to all interested windows.
-    this.postMessageApi_.send(
-      MessageType.INTERSECTION,
-      dict({
-        'changes': this.pendingChanges_,
-      })
-    );
+    this.postMessageApi_.send(MessageType_Enum.INTERSECTION, {
+      'changes': this.pendingChanges_,
+    });
     this.pendingChanges_.length = 0;
   }
 
diff --git a/extensions/amp-ad/0.1/test/test-amp-ad-3p-impl.js b/extensions/amp-ad/0.1/test/test-amp-ad-3p-impl.js
index 01f22ad96806..e4cd1f3d834e 100644
--- a/extensions/amp-ad/0.1/test/test-amp-ad-3p-impl.js
+++ b/extensions/amp-ad/0.1/test/test-amp-ad-3p-impl.js
@@ -1,19 +1,25 @@
 import '../../../amp-sticky-ad/1.0/amp-sticky-ad';
 import '../amp-ad';
-import * as adCid from '../../../../src/ad-cid';
-import * as consent from '../../../../src/consent';
-import * as mode from '#core/mode';
 import * as fakeTimers from '@sinonjs/fake-timers';
-import {AmpAd3PImpl} from '../amp-ad-3p-impl';
-import {AmpAdUIHandler} from '../amp-ad-ui';
-import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';
-import {LayoutPriority} from '#core/dom/layout';
-import {Services} from '#service';
+import {expect} from 'chai';
+
 import {adConfig} from '#ads/_config';
+
+import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';
 import {createElementWithAttributes} from '#core/dom';
+import {LayoutPriority_Enum} from '#core/dom/layout';
+import * as mode from '#core/mode';
+
+import {Services} from '#service';
+
 import {macroTask} from '#testing/helpers';
 import {stubServiceForDoc} from '#testing/helpers/service';
 
+import * as adCid from '../../../../src/ad-cid';
+import * as consent from '../../../../src/consent';
+import {AmpAd3PImpl} from '../amp-ad-3p-impl';
+import {AmpAdUIHandler} from '../amp-ad-ui';
+
 function createAmpAd(win, attachToAmpdoc = false, ampdoc) {
   const ampAdElement = createElementWithAttributes(win.document, 'amp-ad', {
     type: '_ping_',
@@ -282,20 +288,17 @@ describes.realWin(
 
       describe('during layout', () => {
         it('sticky ad: should not layout w/o scroll', () => {
-          ad3p.uiHandler.stickyAdPosition_ = 'bottom';
-          expect(ad3p.xOriginIframeHandler_).to.be.null;
-          const layoutPromise = ad3p.layoutCallback();
-          return Promise.race([macroTask(), layoutPromise])
-            .then(() => {
-              expect(ad3p.xOriginIframeHandler_).to.be.null;
-            })
-            .then(() => {
-              Services.viewportForDoc(env.ampdoc).scrollObservable_.fire();
-              return layoutPromise;
-            })
-            .then(() => {
-              expect(ad3p.xOriginIframeHandler_).to.not.be.null;
-            });
+          ad3p.element.setAttribute('sticky', 'bottom');
+          ad3p.buildCallback();
+          const maybeInitStickyAdSpy = env.sandbox.spy(
+            ad3p.uiHandler,
+            'maybeInitStickyAd'
+          );
+          expect(maybeInitStickyAdSpy).to.not.be.called;
+          Services.viewportForDoc(env.ampdoc).scrollObservable_.fire();
+          return Promise.resolve().then(() => {
+            expect(maybeInitStickyAdSpy).to.be.called;
+          });
         });
       });
 
@@ -651,7 +654,7 @@ describes.sandboxed('#getLayoutPriority', {}, () => {
     (env) => {
       it('should return priority of 1', () => {
         const ad3p = createAmpAd(env.ampdoc.win, /*attach*/ true, env.ampdoc);
-        expect(ad3p.getLayoutPriority()).to.equal(LayoutPriority.METADATA);
+        expect(ad3p.getLayoutPriority()).to.equal(LayoutPriority_Enum.METADATA);
       });
     }
   );
@@ -666,7 +669,7 @@ describes.sandboxed('#getLayoutPriority', {}, () => {
     (env) => {
       it('should return priority of 2', () => {
         const ad3p = createAmpAd(env.ampdoc.win, /*attach*/ true, env.ampdoc);
-        expect(ad3p.getLayoutPriority()).to.equal(LayoutPriority.ADS);
+        expect(ad3p.getLayoutPriority()).to.equal(LayoutPriority_Enum.ADS);
       });
     }
   );
diff --git a/extensions/amp-ad/0.1/test/test-amp-ad-custom.js b/extensions/amp-ad/0.1/test/test-amp-ad-custom.js
index 477f9fe28bd1..2453bf16797e 100644
--- a/extensions/amp-ad/0.1/test/test-amp-ad-custom.js
+++ b/extensions/amp-ad/0.1/test/test-amp-ad-custom.js
@@ -1,7 +1,9 @@
-import {AmpAdCustom} from '../amp-ad-custom';
-import {LayoutPriority} from '#core/dom/layout';
-import {Services} from '#service';
 import {createElementWithAttributes, removeChildren} from '#core/dom';
+import {LayoutPriority_Enum} from '#core/dom/layout';
+
+import {Services} from '#service';
+
+import {AmpAdCustom} from '../amp-ad-custom';
 
 describes.realWin('Amp custom ad', {amp: true}, (env) => {
   let win;
@@ -193,7 +195,9 @@ describes.sandboxed.skip('#getLayoutPriority', {}, () => {
           /*body*/ env.ampdoc.getBody()
         );
         const customAd = new AmpAdCustom(adElement);
-        expect(customAd.getLayoutPriority()).to.equal(LayoutPriority.CONTENT);
+        expect(customAd.getLayoutPriority()).to.equal(
+          LayoutPriority_Enum.CONTENT
+        );
       });
     }
   );
@@ -214,7 +218,9 @@ describes.sandboxed.skip('#getLayoutPriority', {}, () => {
           /*body*/ env.ampdoc.getBody()
         );
         const customAd = new AmpAdCustom(adElement);
-        expect(customAd.getLayoutPriority()).to.equal(LayoutPriority.CONTENT);
+        expect(customAd.getLayoutPriority()).to.equal(
+          LayoutPriority_Enum.CONTENT
+        );
       });
     }
   );
diff --git a/extensions/amp-ad/0.1/test/test-amp-ad-ui.js b/extensions/amp-ad/0.1/test/test-amp-ad-ui.js
index 242b76a32c70..3a88932444bf 100644
--- a/extensions/amp-ad/0.1/test/test-amp-ad-ui.js
+++ b/extensions/amp-ad/0.1/test/test-amp-ad-ui.js
@@ -1,11 +1,13 @@
-import * as adHelper from '../../../../src/ad-helper';
-import * as domQuery from '#core/dom/query';
-import {AmpAdUIHandler} from '../amp-ad-ui';
-import {BaseElement} from '../../../../src/base-element';
 import {createElementWithAttributes} from '#core/dom';
-import {macroTask} from '#testing/helpers';
+import * as domQuery from '#core/dom/query';
 import {setStyles} from '#core/dom/style';
 
+import {macroTask} from '#testing/helpers';
+
+import * as adHelper from '../../../../src/ad-helper';
+import {BaseElement} from '../../../../src/base-element';
+import {AmpAdUIHandler} from '../amp-ad-ui';
+
 describes.realWin(
   'amp-ad-ui handler',
   {
diff --git a/extensions/amp-ad/0.1/test/test-amp-ad-xorigin-iframe-handler.js b/extensions/amp-ad/0.1/test/test-amp-ad-xorigin-iframe-handler.js
index 7435e0b9c282..73566dbe5d11 100644
--- a/extensions/amp-ad/0.1/test/test-amp-ad-xorigin-iframe-handler.js
+++ b/extensions/amp-ad/0.1/test/test-amp-ad-xorigin-iframe-handler.js
@@ -1,12 +1,16 @@
-import {AmpAdUIHandler} from '../amp-ad-ui';
-import {AmpAdXOriginIframeHandler} from '../amp-ad-xorigin-iframe-handler';
-import {BaseElement} from '../../../../src/base-element';
-import {Services} from '#service';
 import {Signals} from '#core/data-structures/signals';
-import {createIframeWithMessageStub, expectPostMessage} from '#testing/iframe';
 import {layoutRectLtwh} from '#core/dom/layout/rect';
+
 import {toggleExperiment} from '#experiments';
 
+import {Services} from '#service';
+
+import {createIframeWithMessageStub, expectPostMessage} from '#testing/iframe';
+
+import {BaseElement} from '../../../../src/base-element';
+import {AmpAdUIHandler} from '../amp-ad-ui';
+import {AmpAdXOriginIframeHandler} from '../amp-ad-xorigin-iframe-handler';
+
 describes.sandboxed('amp-ad-xorigin-iframe-handler', {}, (env) => {
   let ampdoc;
   let adImpl;
@@ -143,22 +147,17 @@ describes.sandboxed('amp-ad-xorigin-iframe-handler', {}, (env) => {
           });
       });
 
-      // TODO(@lannka): unskip flaky test
-      it.skip(
-        'should resolve on message "no-content" ' +
-          'and remove non-master iframe',
-        () => {
-          expect(iframe.style.visibility).to.equal('hidden');
-          iframe.postMessageToParent({
-            sentinel: 'amp3ptest' + testIndex,
-            type: 'no-content',
-          });
-          return initPromise.then(() => {
-            expect(noContentSpy).to.be.calledWith(false);
-            expect(iframeHandler.iframe).to.be.null;
-          });
-        }
-      );
+      it('should resolve on message "no-content" and remove non-master iframe', () => {
+        expect(iframe.style.visibility).to.equal('hidden');
+        iframe.postMessageToParent({
+          sentinel: 'amp3ptest' + testIndex,
+          type: 'no-content',
+        });
+        return initPromise.then(() => {
+          expect(noContentSpy).to.be.calledWith(false);
+          expect(iframeHandler.iframe).to.be.null;
+        });
+      });
 
       it('should NOT remove master iframe on message "no-content"', () => {
         iframe.name = 'test_master';
@@ -173,8 +172,7 @@ describes.sandboxed('amp-ad-xorigin-iframe-handler', {}, (env) => {
         });
       });
 
-      // TODO(#18656, lannka): Fails due to bad error message.
-      it.skip('should NOT resolve on message "bootstrap-loaded"', () => {
+      it('should NOT resolve on message "bootstrap-loaded"', () => {
         expect(iframe.style.visibility).to.equal('hidden');
         iframe.postMessageToParent({
           sentinel: 'amp3ptest' + testIndex,
@@ -409,9 +407,8 @@ describes.sandboxed('amp-ad-xorigin-iframe-handler', {}, (env) => {
           sentinel: 'amp3ptest' + testIndex,
         });
 
-        const data3 = await iframe.expectMessageFromParent(
-          'embed-size-changed'
-        );
+        const data3 =
+          await iframe.expectMessageFromParent('embed-size-changed');
 
         expect(data3).to.jsonEqual({
           requestedWidth: 114,
diff --git a/extensions/amp-ad/0.1/test/test-amp-ad.js b/extensions/amp-ad/0.1/test/test-amp-ad.js
index 11988e2c78b6..751cbf16ac35 100644
--- a/extensions/amp-ad/0.1/test/test-amp-ad.js
+++ b/extensions/amp-ad/0.1/test/test-amp-ad.js
@@ -1,10 +1,13 @@
-import {AmpAd} from '../amp-ad';
-import {AmpAd3PImpl} from '../amp-ad-3p-impl';
-import {Services} from '#service';
-import {adConfig} from '#ads/_config';
 import {getA4ARegistry} from '#ads/_a4a-config';
+import {adConfig} from '#ads/_config';
+
+import {Services} from '#service';
+
 import {stubService} from '#testing/helpers/service';
 
+import {AmpAd} from '../amp-ad';
+import {AmpAd3PImpl} from '../amp-ad-3p-impl';
+
 describes.realWin('Ad loader', {amp: true}, (env) => {
   let win, doc;
   const a4aRegistry = getA4ARegistry();
diff --git a/extensions/amp-ad/0.1/test/test-concurrent-load.js b/extensions/amp-ad/0.1/test/test-concurrent-load.js
index 88b78ce7cbb1..6cb4585242ad 100644
--- a/extensions/amp-ad/0.1/test/test-concurrent-load.js
+++ b/extensions/amp-ad/0.1/test/test-concurrent-load.js
@@ -1,13 +1,17 @@
 import * as fakeTimers from '@sinonjs/fake-timers';
+
 import {createElementWithAttributes} from '#core/dom';
+
+import {installTimerService} from '#service/timer-impl';
+
+import {macroTask} from '#testing/helpers';
+
 import {
   getAmpAdRenderOutsideViewport,
   incrementLoadingAds,
   is3pThrottled,
   waitFor3pThrottle,
 } from '../concurrent-load';
-import {installTimerService} from '#service/timer-impl';
-import {macroTask} from '#testing/helpers';
 
 describes.realWin('concurrent-load', {}, (env) => {
   describe('getAmpAdRenderOutsideViewport', () => {
@@ -105,8 +109,7 @@ describes.realWin('concurrent-load', {}, (env) => {
       installTimerService(env.win);
     });
 
-    // TODO(jeffkaufman, #13422): this test was silently failing
-    it.skip('should block if incremented', () => {
+    it('should block if incremented', () => {
       incrementLoadingAds(env.win);
       const start = Date.now();
       return waitFor3pThrottle(env.win).then(() =>
diff --git a/extensions/amp-ad/0.1/test/test-legacy-ad-intersection-observer-host.js b/extensions/amp-ad/0.1/test/test-legacy-ad-intersection-observer-host.js
index bb6b069b8977..d37b66016c3f 100644
--- a/extensions/amp-ad/0.1/test/test-legacy-ad-intersection-observer-host.js
+++ b/extensions/amp-ad/0.1/test/test-legacy-ad-intersection-observer-host.js
@@ -1,10 +1,12 @@
-import {BaseElement} from '../../../../src/base-element';
-import {LegacyAdIntersectionObserverHost} from '../legacy-ad-intersection-observer-host';
-import {createAmpElementForTesting} from '../../../../src/custom-element';
 import {deserializeMessage} from '#core/3p-frame-messaging';
-import {getIntersectionChangeEntry} from '#utils/intersection-observer-3p-host';
 import {layoutRectLtwh} from '#core/dom/layout/rect';
 
+import {getIntersectionChangeEntry} from '#utils/intersection-observer-3p-host';
+
+import {BaseElement} from '../../../../src/base-element';
+import {createAmpElementForTesting} from '../../../../src/custom-element';
+import {LegacyAdIntersectionObserverHost} from '../legacy-ad-intersection-observer-host';
+
 describes.sandboxed('IntersectionObserverHostForAd', {}, (env) => {
   const ElementClass = createAmpElementForTesting(window, BaseElement);
   customElements.define('amp-int', ElementClass);
diff --git a/extensions/amp-ad/amp-ad.md b/extensions/amp-ad/amp-ad.md
index b4add31104f4..e151c0fd7548 100644
--- a/extensions/amp-ad/amp-ad.md
+++ b/extensions/amp-ad/amp-ad.md
@@ -269,6 +269,7 @@ See [amp-ad rules](validator-amp-ad.protoascii) in the AMP validator specificati
 -   [ADITION](../../ads/vendors/adition.md)
 -   [Adman](../../ads/vendors/adman.md)
 -   [AdmanMedia](../../ads/vendors/admanmedia.md)
+-   [AdMatic](../../ads/vendors/admatic.md)
 -   [Admixer](../../ads/vendors/admixer.md)
 -   [Adnuntius](../../ads/vendors/adnuntius.md)
 -   [AdOcean](../../ads/vendors/adocean.md)
@@ -278,6 +279,7 @@ See [amp-ad rules](validator-amp-ad.protoascii) in the AMP validator specificati
 -   [Adpon](../../ads/vendors/adpon.md)
 -   [Adpushup](../../ads/vendors/adpushup.md)
 -   [AdReactor](../../ads/vendors/adreactor.md)
+-   [Ads2Bid](../../ads/vendors/ads2bid.md)
 -   [AdSense](../../ads/google/adsense.md)
 -   [AdSensor](../../ads/vendors/adsensor.md)
 -   [AdServSolutions](../../ads/vendors/adservsolutions.md)
@@ -287,6 +289,7 @@ See [amp-ad rules](validator-amp-ad.protoascii) in the AMP validator specificati
 -   [AdSpirit](../../ads/vendors/adspirit.md)
 -   [AdStir](../../ads/vendors/adstir.md)
 -   [AdStyle](../../ads/vendors/adstyle.md)
+-   [Adsviu](../../ads/vendors/adsviu.md)
 -   [AdTech](../../ads/vendors/adtech.md)
 -   [Adtelligent](../../ads/vendors/adtelligent.md)
 -   [AdThrive](../../ads/vendors/adthrive.md)
@@ -298,11 +301,13 @@ See [amp-ad rules](validator-amp-ad.protoascii) in the AMP validator specificati
 -   [AdvertServe](../../ads/vendors/advertserve.md)
 -   [Adyoulike](../../ads/vendors/adyoulike.md)
 -   [Affiliate-B](../../ads/vendors/affiliateb.md)
+-   [Affinity](../../ads/vendors/affinity.md)
 -   [AJA](../../ads/vendors/aja.md)
 -   [AMoAd](../../ads/vendors/amoad.md)
 -   [Andbeyond](../../ads/vendors/andbeyond.md)
 -   [Aniview](../../ads/vendors/aniview.md)
 -   [AnyClip](../../ads/vendors/anyclip.md)
+-   [AppMonsta](../../ads/vendors/appmonsta.md)
 -   [AppNexus](../../ads/vendors/appnexus.md)
 -   [AppVador](../../ads/vendors/appvador.md)
 -   [Atomx](../../ads/vendors/atomx.md)
@@ -310,6 +315,7 @@ See [amp-ad rules](validator-amp-ad.protoascii) in the AMP validator specificati
 -   [Baidu](../../ads/vendors/baidu.md)
 -   [BeaverAds](../../ads/vendors/beaverads.md)
 -   [BeOpinion](../amp-beopinion/amp-beopinion.md)
+-   [Bidgear](../../ads/vendors/bidgear.md)
 -   [Bidtellect](../../ads/vendors/bidtellect.md)
 -   [Blade](../../ads/vendors/blade.md)
 -   [brainy](../../ads/vendors/brainy.md)
@@ -319,6 +325,8 @@ See [amp-ad rules](validator-amp-ad.protoascii) in the AMP validator specificati
 -   [CA A.J.A. Infeed](../../ads/vendors/caajainfeed.md)
 -   [CA-ProFit-X](../../ads/vendors/caprofitx.md)
 -   [Cedato](../../ads/vendors/cedato.md)
+-   [Clever](../../ads/vendors/clever.md)
+-   [Cognativex](../../ads/vendors/cognativex.md)
 -   [Colombia](../../ads/vendors/colombia.md)
 -   [Colombiafeed](../../ads/vendors/colombiafeed.md)
 -   [Connatix](../../ads/vendors/connatix.md)
@@ -326,6 +334,7 @@ See [amp-ad rules](validator-amp-ad.protoascii) in the AMP validator specificati
 -   [Content.ad](../../ads/vendors/contentad.md)
 -   [Criteo](../../ads/vendors/criteo.md)
 -   [CSA](../../ads/vendors/csa.md)
+-   [Digital exchange](../../ads/vendors/dex.js)
 -   [Digiteka](../../ads/vendors/digiteka.md)
 -   [Directadvert](../../ads/vendors/directadvert.md)
 -   [DistroScale](../../ads/vendors/distroscale.md)
@@ -348,6 +357,7 @@ See [amp-ad rules](validator-amp-ad.protoascii) in the AMP validator specificati
 -   [FreeWheel](../../ads/vendors/freewheel.md)
 -   [Fusion](../../ads/vendors/fusion.md)
 -   [GenieeSSP](../../ads/vendors/genieessp.md)
+-   [Geozo](../../ads/vendors/geozo.md)
 -   [Giraff](../../ads/vendors/giraff.md)
 -   [Glomex](../../ads/vendors/glomex.md)
 -   [GMOSSP](../../ads/vendors/gmossp.md)
@@ -358,13 +368,16 @@ See [amp-ad rules](validator-amp-ad.protoascii) in the AMP validator specificati
 -   [Imonomy](../../ads/vendors/imonomy.md)
 -   [Imedia](../../ads/vendors/imedia.md)
 -   [Improve Digital](../../ads/vendors/improvedigital.md)
+-   [IncrementX](../../ads/vendors/incrementx.md)
 -   [Insticator](../../ads/vendors/insticator.md)
+-   [InsurAds](../../ads/vendors/insurads.md)
 -   [Index Exchange](../../ads/vendors/ix.md)
 -   [Industrybrains](../../ads/vendors/industrybrains.md)
 -   [InMobi](../../ads/vendors/inmobi.md)
 -   [Innity](../../ads/vendors/innity.md)
 -   [Invibes](../../ads/vendors/invibes.md)
 -   [Iprom](../../ads/vendors/iprom.md)
+-   [Jioads](../../ads/vendors/jioads.md)
 -   [Jixie](../../ads/vendors/jixie.md)
 -   [Kargo](../../ads/vendors/kargo.md)
 -   [Ketshwa](../../ads/vendors/ketshwa.md)
@@ -388,6 +401,7 @@ See [amp-ad rules](validator-amp-ad.protoascii) in the AMP validator specificati
 -   [MicroAd](../../ads/vendors/microad.md)
 -   [MixiMedia](../../ads/vendors/miximedia.md)
 -   [Mixpo](../../ads/vendors/mixpo.md)
+-   [Momagic](../../ads/vendors/momagic.md)
 -   [Monetizer101](../../ads/vendors/monetizer101.md)
 -   [mox](../../ads/vendors/mox.md)
 -   [my6Sense](../../ads/vendors/my6sense.md)
@@ -410,6 +424,8 @@ See [amp-ad rules](validator-amp-ad.protoascii) in the AMP validator specificati
 -   [Open AdStream (OAS)](../../ads/vendors/openadstream.md)
 -   [OpenX](../../ads/vendors/openx.md)
 -   [opinary](../../ads/vendors/opinary.md)
+-   [PIberica](../../ads/vendors/piberica.md)
+-   [Pixad](../../ads/vendors/pixad.md)
 -   [Pixels](../../ads/vendors/pixels.md)
 -   [plista](../../ads/vendors/plista.md)
 -   [polymorphicAds](../../ads/vendors/polymorphicads.md)
@@ -417,13 +433,16 @@ See [amp-ad rules](validator-amp-ad.protoascii) in the AMP validator specificati
 -   [PPStudio](../../ads/vendors/ppstudio.md)
 -   [Pressboard](../../ads/vendors/pressboard.md)
 -   [PromoteIQ](../../ads/vendors/promoteiq.md)
+-   [Pubfuture](../../ads/vendors/pubfuture.md)
 -   [PubGuru](../../ads/vendors/pubguru.md)
 -   [PubMatic](../../ads/vendors/pubmatic.md)
 -   [Pubmine](../../ads/vendors/pubmine.md)
+-   [PubScale](../../ads/vendors/pubscale.md)
 -   [Pulse](../../ads/vendors/pulse.md)
 -   [PulsePoint](../../ads/vendors/pulsepoint.md)
 -   [PuffNetwork](../../ads/vendors/puffnetwork.md)
 -   [Purch](../../ads/vendors/purch.md)
+-   [R9x](../../ads/vendors/r9x.md)
 -   [Rakuten Unified Ads](../../ads/vendors/rakutenunifiedads.md)
 -   [Rambler&Co](../../ads/vendors/capirs.md)
 -   [RbInfoxSg](../../ads/vendors/rbinfox.md)
@@ -444,12 +463,14 @@ See [amp-ad rules](validator-amp-ad.protoascii) in the AMP validator specificati
 -   [SAS CI 360 Match](../../ads/vendors/sas.md)
 -   [Seeding Alliance](../../ads/vendors/seedingalliance.md)
 -   [Sekindo](../../ads/vendors/sekindo.md)
+-   [Sevio](../../ads/vendors/sevio.md)
 -   [Sharethrough](../../ads/vendors/sharethrough.md)
 -   [SHE Media](../../ads/vendors/shemedia.md)
 -   [Sklik](../../ads/vendors/sklik.md)
+-   [Skoiy](../../ads/vendors/skoiy.md)
 -   [SSP](../../ads/vendors/ssp.md)
 -   [SlimCut Media](../../ads/vendors/slimcutmedia.md)
--   [Smart AdServer](../../ads/vendors/smartadserver.md)
+-   [Smart AdServer](../amp-ad-network-smartadserver-impl/amp-ad-network-smartadserver-impl-internal.md)
 -   [smartclip](../../ads/vendors/smartclip.md)
 -   [SmileWanted](../../ads/vendors/smilewanted.md)
 -   [sogou Ad](../../ads/vendors/sogouad.md)
@@ -479,6 +500,7 @@ See [amp-ad rules](validator-amp-ad.protoascii) in the AMP validator specificati
 -   [ucfunnel](../../ads/vendors/ucfunnel.md)
 -   [Unruly](../../ads/vendors/unruly.md)
 -   [VMFive](../../ads/vendors/vmfive.md)
+-   [vox](../../ads/vendors/vox.md)
 -   [Webediads](../../ads/vendors/webediads.md)
 -   [Weborama](../../ads/vendors/weborama.md)
 -   [Widespace](../../ads/vendors/widespace.md)
@@ -486,7 +508,6 @@ See [amp-ad rules](validator-amp-ad.protoascii) in the AMP validator specificati
 -   [WPMedia](../../ads/vendors/wpmedia.md)
 -   [Wunderkind](../../ads/vendors/wunderkind.md)
 -   [Xlift](../../ads/vendors/xlift.md)
--   [Yahoo](../../ads/vendors/yahoo.md)
 -   [YahooJP](../../ads/vendors/yahoojp.md)
 -   [Yandex](../../ads/vendors/yandex.md)
 -   [Yektanet](../../ads/vendors/yektanet.md)
@@ -508,11 +529,11 @@ See [amp-ad rules](validator-amp-ad.protoascii) in the AMP validator specificati
 -   [Dable](../../ads/vendors/dable.md)
 -   [Engageya](../../ads/vendors/engageya.md)
 -   [Epeex](../../ads/vendors/epeex.md)
+-   [Fairground](../../ads/vendors/fairground.md)
 -   [Gecko](../../ads/vendors/gecko.md)
 -   [Idealmedia](../../ads/vendors/idealmedia.md)
 -   [Insticator](../../ads/vendors/insticator.md)
 -   [Jubna](../../ads/vendors/jubna.md)
--   [Lentainform](../../ads/vendors/lentainform.md)
 -   [Mgid](../../ads/vendors/mgid.md)
 -   [Myua](../../ads/vendors/myua.md)
 -   [Outbrain](../../ads/vendors/outbrain.md)
diff --git a/extensions/amp-addthis/0.1/addthis-utils/classify.js b/extensions/amp-addthis/0.1/addthis-utils/classify.js
index 59fb92db42a5..8b8eb88e4fe2 100644
--- a/extensions/amp-addthis/0.1/addthis-utils/classify.js
+++ b/extensions/amp-addthis/0.1/addthis-utils/classify.js
@@ -1,7 +1,8 @@
-import {RE_NONALPHA, RE_WHITESPACE} from '../constants';
 import {getDetailsForMeta} from './meta';
 import {rot13Array} from './rot13';
 
+import {RE_NONALPHA, RE_WHITESPACE} from '../constants';
+
 const MAX_KEYWORD_LENGTH = 200;
 const PORN_BIT = 0x1;
 const REFERRER_BITS = {
diff --git a/extensions/amp-addthis/0.1/addthis-utils/eng.js b/extensions/amp-addthis/0.1/addthis-utils/eng.js
index 21bef0fac9ab..b82bc701e849 100644
--- a/extensions/amp-addthis/0.1/addthis-utils/eng.js
+++ b/extensions/amp-addthis/0.1/addthis-utils/eng.js
@@ -1,10 +1,10 @@
-import {API_SERVER} from '../constants';
 import {Services} from '#service';
 
-import {addParamsToUrl} from '../../../../src/url';
-import {dict} from '#core/types/object';
-import {getSessionId} from './session';
 import {pixelDrop} from './pixel';
+import {getSessionId} from './session';
+
+import {addParamsToUrl} from '../../../../src/url';
+import {API_SERVER} from '../constants';
 
 /**
  * Gets data to be passed along in request via params
@@ -42,7 +42,7 @@ const getEngData = (params) => {
  */
 export const callEng = (props) => {
   const object = getEngData(props);
-  const data = dict({
+  const data = {
     'al': object.al,
     'amp': object.amp,
     'dc': object.dc,
@@ -57,7 +57,7 @@ export const callEng = (props) => {
     'pub': object.pub,
     'sh': object.sh,
     'sid': object.sid,
-  });
+  };
   const url = addParamsToUrl(`${API_SERVER}/live/red_lojson/100eng.json`, data);
   const {ampDoc} = props;
 
diff --git a/extensions/amp-addthis/0.1/addthis-utils/get-widget-id-overloaded-with-json-for-anonymous-mode.js b/extensions/amp-addthis/0.1/addthis-utils/get-widget-id-overloaded-with-json-for-anonymous-mode.js
index 96cfc93be09a..77aa73202a4e 100644
--- a/extensions/amp-addthis/0.1/addthis-utils/get-widget-id-overloaded-with-json-for-anonymous-mode.js
+++ b/extensions/amp-addthis/0.1/addthis-utils/get-widget-id-overloaded-with-json-for-anonymous-mode.js
@@ -1,5 +1,3 @@
-import {dict} from '#core/types/object';
-
 const overrideKeys = [
   'backgroundColor',
   'borderRadius',
@@ -42,7 +40,7 @@ const overrideKeys = [
  * @return {string} empty string means there is no override object
  */
 export function getWidgetOverload(self) {
-  const override = dict({});
+  const override = {};
   overrideKeys.forEach((item) => {
     const data = self.element.getAttribute(`data-attr-${item}`);
     if (
diff --git a/extensions/amp-addthis/0.1/addthis-utils/lojson.js b/extensions/amp-addthis/0.1/addthis-utils/lojson.js
index d2970275027f..641b7a6f7b9e 100644
--- a/extensions/amp-addthis/0.1/addthis-utils/lojson.js
+++ b/extensions/amp-addthis/0.1/addthis-utils/lojson.js
@@ -1,5 +1,4 @@
-import {API_SERVER} from '../constants';
-import {callPixelEndpoint} from './pixel';
+import {toArray} from '#core/types/array';
 
 import {
   classifyPage,
@@ -12,11 +11,12 @@ import {
   getFragmentId,
   getServiceFromUrlFragment,
 } from './fragment';
-import {dict} from '#core/types/object';
 import {getMetaElements} from './meta';
+import {callPixelEndpoint} from './pixel';
 import {getSessionId} from './session';
+
 import {parseUrlDeprecated} from '../../../../src/url';
-import {toArray} from '#core/types/array';
+import {API_SERVER} from '../constants';
 
 const VIEW_EVENT_CHANNEL = 100;
 const nonTrackedDomainMatcher = /\.gov|\.mil/;
@@ -88,7 +88,7 @@ export function getLojsonData(jsonData) {
     win.navigator.doNotTrack !== 'no' &&
     win.navigator.doNotTrack !== '0';
 
-  return dict({
+  return {
     'amp': 1,
     'bl':
       0 |
@@ -123,7 +123,7 @@ export function getLojsonData(jsonData) {
     'sid': getSessionId(),
     'skipb': 1,
     'sr': service,
-  });
+  };
 }
 
 /**
diff --git a/extensions/amp-addthis/0.1/addthis-utils/pixel.js b/extensions/amp-addthis/0.1/addthis-utils/pixel.js
index c1005ac36e07..639a0c139dae 100644
--- a/extensions/amp-addthis/0.1/addthis-utils/pixel.js
+++ b/extensions/amp-addthis/0.1/addthis-utils/pixel.js
@@ -1,13 +1,14 @@
-import {COOKIELESS_API_SERVER} from '../constants';
-import {Services} from '#service';
-import {addParamsToUrl, parseUrlDeprecated} from '../../../../src/url';
 import {createElementWithAttributes} from '#core/dom';
-import {dict} from '#core/types/object';
-import {getData} from '#utils/event-helper';
+import {setStyles, toggle} from '#core/dom/style';
 import {isObject} from '#core/types';
 import {parseJson} from '#core/types/object/json';
 
-import {setStyles, toggle} from '#core/dom/style';
+import {Services} from '#service';
+
+import {getData} from '#utils/event-helper';
+
+import {addParamsToUrl, parseUrlDeprecated} from '../../../../src/url';
+import {COOKIELESS_API_SERVER} from '../constants';
 
 const RE_IFRAME = /#iframe$/;
 const pixelatorFrameTitle = 'Pxltr Frame';
@@ -57,15 +58,11 @@ const groupPixelsByTime = (pixelList) => {
 
 export const pixelDrop = (url, ampDoc) => {
   const doc = ampDoc.win.document;
-  const ampPixel = createElementWithAttributes(
-    doc,
-    'amp-pixel',
-    dict({
-      'layout': 'nodisplay',
-      'referrerpolicy': 'no-referrer',
-      'src': url,
-    })
-  );
+  const ampPixel = createElementWithAttributes(doc, 'amp-pixel', {
+    'layout': 'nodisplay',
+    'referrerpolicy': 'no-referrer',
+    'src': url,
+  });
   doc.body.appendChild(ampPixel);
 };
 
@@ -77,18 +74,14 @@ const getIframeName = (url) =>
 const iframeDrop = (url, ampDoc, data) => {
   const {name, title} = data;
   const doc = ampDoc.win.document;
-  const iframe = createElementWithAttributes(
-    doc,
-    'iframe',
-    dict({
-      'frameborder': 0,
-      'width': 0,
-      'height': 0,
-      'name': name,
-      'title': title,
-      'src': url,
-    })
-  );
+  const iframe = createElementWithAttributes(doc, 'iframe', {
+    'frameborder': 0,
+    'width': 0,
+    'height': 0,
+    'name': name,
+    'title': title,
+    'src': url,
+  });
   toggle(iframe, false);
   setStyles(iframe, {
     position: 'absolute',
@@ -128,11 +121,11 @@ const dropPixelGroups = (pixels, options) => {
         dropPixelatorPixel(pixel.url, ampDoc);
         return pixel.id;
       });
-      const data = dict({
+      const data = {
         'delay': `${delay}`,
         'ids': pids.join('-'),
         'sid': sid,
-      });
+      };
       const url = addParamsToUrl(`${COOKIELESS_API_SERVER}/live/prender`, data);
 
       if (ampDoc.win.navigator.sendBeacon) {
@@ -150,7 +143,7 @@ const dropPixelGroups = (pixels, options) => {
  * @return {!JsonObject}
  */
 function getJsonObject_(object) {
-  const params = dict();
+  const params = {};
 
   if (object === undefined || object === null) {
     return params;
diff --git a/extensions/amp-addthis/0.1/addthis-utils/pjson.js b/extensions/amp-addthis/0.1/addthis-utils/pjson.js
index ca09de8704f8..2c6ec1d469ba 100644
--- a/extensions/amp-addthis/0.1/addthis-utils/pjson.js
+++ b/extensions/amp-addthis/0.1/addthis-utils/pjson.js
@@ -1,11 +1,12 @@
-import {API_SERVER} from '../constants';
-import {callPixelEndpoint} from './pixel';
+import {toArray} from '#core/types/array';
 
 import {classifyPage, classifyReferrer, getKeywordsString} from './classify';
 import {getMetaElements} from './meta';
+import {callPixelEndpoint} from './pixel';
 import {getSessionId} from './session';
+
 import {parseUrlDeprecated} from '../../../../src/url';
-import {toArray} from '#core/types/array';
+import {API_SERVER} from '../constants';
 
 // "gen" value for shares
 const SHARE = 300;
diff --git a/extensions/amp-addthis/0.1/amp-addthis.js b/extensions/amp-addthis/0.1/amp-addthis.js
index fd7fa4983bc7..703e43c60445 100644
--- a/extensions/amp-addthis/0.1/amp-addthis.js
+++ b/extensions/amp-addthis/0.1/amp-addthis.js
@@ -16,6 +16,32 @@
  * </code>
  */
 
+import {createElementWithAttributes, removeElement} from '#core/dom';
+import {applyFillContent, isLayoutSizeDefined} from '#core/dom/layout';
+import {setStyle} from '#core/dom/style';
+import * as mode from '#core/mode';
+
+import {Services} from '#service';
+
+import {listen} from '#utils/event-helper';
+import {userAssert} from '#utils/log';
+
+import {callEng} from './addthis-utils/eng';
+import {getWidgetOverload} from './addthis-utils/get-widget-id-overloaded-with-json-for-anonymous-mode';
+import {callLojson} from './addthis-utils/lojson';
+import {getOgImage} from './addthis-utils/meta';
+import {
+  getAddThisMode,
+  isProductCode,
+  isPubId,
+  isWidgetId,
+} from './addthis-utils/mode';
+import {ActiveToolsMonitor} from './addthis-utils/monitors/active-tools-monitor';
+import {ClickMonitor} from './addthis-utils/monitors/click-monitor';
+import {DwellMonitor} from './addthis-utils/monitors/dwell-monitor';
+import {ScrollMonitor} from './addthis-utils/monitors/scroll-monitor';
+import {callPjson} from './addthis-utils/pjson';
+import {ConfigManager} from './config-manager';
 import {
   ALT_TEXT,
   API_SERVER,
@@ -28,33 +54,10 @@ import {
   SHARE_CONFIG_KEYS,
   SHARE_EVENT,
 } from './constants';
-import {ActiveToolsMonitor} from './addthis-utils/monitors/active-tools-monitor';
-import {CSS} from '../../../build/amp-addthis-0.1.css';
-import {ClickMonitor} from './addthis-utils/monitors/click-monitor';
-import {ConfigManager} from './config-manager';
-import {DwellMonitor} from './addthis-utils/monitors/dwell-monitor';
 import {PostMessageDispatcher} from './post-message-dispatcher';
-import {ScrollMonitor} from './addthis-utils/monitors/scroll-monitor';
-import {Services} from '#service';
-import {applyFillContent, isLayoutSizeDefined} from '#core/dom/layout';
-import {callEng} from './addthis-utils/eng';
-import {callLojson} from './addthis-utils/lojson';
-import {callPjson} from './addthis-utils/pjson';
-import {createElementWithAttributes, removeElement} from '#core/dom';
-import {dict} from '#core/types/object';
-import {
-  getAddThisMode,
-  isProductCode,
-  isPubId,
-  isWidgetId,
-} from './addthis-utils/mode';
-import {getOgImage} from './addthis-utils/meta';
-import {getWidgetOverload} from './addthis-utils/get-widget-id-overloaded-with-json-for-anonymous-mode';
-import * as mode from '#core/mode';
-import {listen} from '#utils/event-helper';
+
+import {CSS} from '../../../build/amp-addthis-0.1.css';
 import {parseUrlDeprecated} from '../../../src/url';
-import {setStyle} from '#core/dom/style';
-import {userAssert} from '#utils/log';
 
 // The following items will be shared by all AmpAddThis elements on a page, to
 // prevent unnecessary HTTP requests, get accurate analytics, etc., and hence
@@ -214,9 +217,9 @@ class AmpAddThis extends AMP.BaseElement {
         const closeButton = createElementWithAttributes(
           this.win.document,
           'button',
-          dict({
+          {
             'class': 'i-amphtml-addthis-close',
-          })
+          }
         );
         closeButton.onclick = () => removeElement(this.element);
         this.element.appendChild(closeButton);
@@ -249,27 +252,19 @@ class AmpAddThis extends AMP.BaseElement {
    * @return {Element}
    */
   createPlaceholderCallback() {
-    const placeholder = createElementWithAttributes(
-      this.win.document,
-      'div',
-      dict({
-        'placeholder': '',
-      })
-    );
+    const placeholder = createElementWithAttributes(this.win.document, 'div', {
+      'placeholder': '',
+    });
     setStyle(placeholder, 'background-color', '#fff');
 
-    const image = createElementWithAttributes(
-      this.win.document,
-      'amp-img',
-      dict({
-        'src': `https://cache.addthiscdn.com/icons/v3/thumbs/${ICON_SIZE}x${ICON_SIZE}/addthis.png`,
-        'layout': 'fixed',
-        'width': ICON_SIZE,
-        'height': ICON_SIZE,
-        'referrerpolicy': 'origin',
-        'alt': ALT_TEXT,
-      })
-    );
+    const image = createElementWithAttributes(this.win.document, 'amp-img', {
+      'src': `https://cache.addthiscdn.com/icons/v3/thumbs/${ICON_SIZE}x${ICON_SIZE}/addthis.png`,
+      'layout': 'fixed',
+      'width': ICON_SIZE,
+      'height': ICON_SIZE,
+      'referrerpolicy': 'origin',
+      'alt': ALT_TEXT,
+    });
 
     placeholder.appendChild(image);
     return placeholder;
@@ -280,7 +275,7 @@ class AmpAddThis extends AMP.BaseElement {
     const iframe = createElementWithAttributes(
       /** @type {!Document} */ (this.element.ownerDocument),
       'iframe',
-      dict({
+      {
         'frameborder': 0,
         'title': ALT_TEXT,
         // Document has overly long cache age: go.amp.dev/issue/24848
@@ -290,7 +285,7 @@ class AmpAddThis extends AMP.BaseElement {
         'id': this.widgetId_,
         'pco': this.productCode_,
         'containerClassName': this.containerClassName_,
-      })
+      }
     );
     const iframeLoadPromise = this.loadPromise(iframe);
 
@@ -343,7 +338,7 @@ class AmpAddThis extends AMP.BaseElement {
    * @return {!JsonObject}
    */
   getShareConfigAsJsonObject_() {
-    const params = dict();
+    const params = {};
     SHARE_CONFIG_KEYS.map((key) => {
       const value = this.element.getAttribute(`data-${key}`);
       if (value) {
diff --git a/extensions/amp-addthis/0.1/config-manager.js b/extensions/amp-addthis/0.1/config-manager.js
index 8bfd84961792..aafe830e4a4c 100644
--- a/extensions/amp-addthis/0.1/config-manager.js
+++ b/extensions/amp-addthis/0.1/config-manager.js
@@ -1,7 +1,5 @@
-import {CONFIGURATION_EVENT, ORIGIN} from './constants';
 import {getAddThisMode} from './addthis-utils/mode';
-
-import {dict} from '#core/types/object';
+import {CONFIGURATION_EVENT, ORIGIN} from './constants';
 
 /**
  * Configuration request status enum.
@@ -32,7 +30,7 @@ export class ConfigManager {
    */
   constructor() {
     /**
-     * @type {!Object<string, ConfigManager.PubIdData>}
+     * @type {!{[key: string]: ConfigManager.PubIdData}}
      * @private
      */
     this.dataForPubId_ = {};
@@ -44,7 +42,7 @@ export class ConfigManager {
     this.configProviderIframes_ = [];
 
     /**
-     * @type {Object<string,string>}
+     * @type {{[key: string]: string}}
      * @private
      */
     this.activeToolsMonitor_ = null;
@@ -124,7 +122,7 @@ export class ConfigManager {
     const pubData = this.dataForPubId_[pubId];
     const {config: dashboardConfig, requestStatus: configRequestStatus} =
       pubData;
-    const jsonToSend = dict({
+    const jsonToSend = {
       'event': CONFIGURATION_EVENT,
       'shareConfig': shareConfig,
       'atConfig': atConfig,
@@ -134,7 +132,7 @@ export class ConfigManager {
       'containerClassName': containerClassName,
       'configRequestStatus': configRequestStatus,
       'dashboardConfig': dashboardConfig,
-    });
+    };
 
     if (
       dashboardConfig &&
@@ -182,8 +180,8 @@ export class ConfigManager {
    * request/response cycle between frames.
    * @param {{
    *   pubId: string,
-   *   activeToolsMonitor: Object<string,string>,
-   *   atConfig: Object<string,string>,
+   *   activeToolsMonitor: {[key: string]: string},
+   *   atConfig: {[key: string]: string},
    *   widgetId: string,
    *   containerClassName: string,
    *   productCode: string,
@@ -277,7 +275,7 @@ ConfigManager.PubIdData; // purely for typedef
  * @typedef {{
  *   widgetId:string,
  *   productCode:string,
- *   shareConfig:(Object<string,string>|undefined),
+ *   shareConfig:({[key: string]: string}|undefined),
  *   iframe: Element,
  *   atConfig: JsonObject,
  *   containerClassName: string
diff --git a/extensions/amp-addthis/0.1/post-message-dispatcher.js b/extensions/amp-addthis/0.1/post-message-dispatcher.js
index 43844dc53f8a..8a878aec2e60 100644
--- a/extensions/amp-addthis/0.1/post-message-dispatcher.js
+++ b/extensions/amp-addthis/0.1/post-message-dispatcher.js
@@ -1,8 +1,10 @@
-import {CONFIGURATION_EVENT, ORIGIN, SHARE_EVENT} from './constants';
-import {getData} from '#utils/event-helper';
 import {isObject} from '#core/types';
 import {tryParseJson} from '#core/types/object/json';
 
+import {getData} from '#utils/event-helper';
+
+import {CONFIGURATION_EVENT, ORIGIN, SHARE_EVENT} from './constants';
+
 export class PostMessageDispatcher {
   /**
    * Creates an instance of PostMessageDispatcher.
diff --git a/extensions/amp-addthis/0.1/test/test-amp-addthis.js b/extensions/amp-addthis/0.1/test/test-amp-addthis.js
index f450c46c9e32..a884d7832f1c 100644
--- a/extensions/amp-addthis/0.1/test/test-amp-addthis.js
+++ b/extensions/amp-addthis/0.1/test/test-amp-addthis.js
@@ -1,21 +1,20 @@
-import {ALT_TEXT, CONFIGURATION_EVENT, ICON_SIZE, ORIGIN} from '../constants';
-import {ConfigManager} from '../config-manager';
+import {createElementWithAttributes} from '#core/dom';
+import {toArray} from '#core/types/array';
 
+import {getKeywordsString} from '../addthis-utils/classify';
 import {createCUID, isDateInFuture} from '../addthis-utils/cuid';
-import {createElementWithAttributes} from '#core/dom';
-import {dict} from '#core/types/object';
+import {getWidgetOverload} from '../addthis-utils/get-widget-id-overloaded-with-json-for-anonymous-mode';
+import {getDetailsForMeta, getMetaElements} from '../addthis-utils/meta';
 import {
   getAddThisMode,
   isProductCode,
   isPubId,
   isWidgetId,
 } from '../addthis-utils/mode';
-import {getConfigManager} from '../amp-addthis';
-import {getDetailsForMeta, getMetaElements} from '../addthis-utils/meta';
-import {getKeywordsString} from '../addthis-utils/classify';
 import {getSessionId} from '../addthis-utils/session';
-import {getWidgetOverload} from '../addthis-utils/get-widget-id-overloaded-with-json-for-anonymous-mode';
-import {toArray} from '#core/types/array';
+import {getConfigManager} from '../amp-addthis';
+import {ConfigManager} from '../config-manager';
+import {ALT_TEXT, CONFIGURATION_EVENT, ICON_SIZE, ORIGIN} from '../constants';
 
 describes.realWin(
   'amp-addthis',
@@ -43,10 +42,10 @@ describes.realWin(
 
     function getAT(configuration, opt_responsive, opt_beforeLayoutCallback) {
       const {shareConfig = {}} = configuration;
-      const elementAttributes = dict({
+      const elementAttributes = {
         'width': '320px',
         'height': '90px',
-      });
+      };
       if (configuration.pubId) {
         elementAttributes['data-pub-id'] = configuration.pubId;
       }
diff --git a/extensions/amp-analytics/0.1/activity-impl.js b/extensions/amp-analytics/0.1/activity-impl.js
index 4a363223b0a6..beee9755fe25 100644
--- a/extensions/amp-analytics/0.1/activity-impl.js
+++ b/extensions/amp-analytics/0.1/activity-impl.js
@@ -3,9 +3,12 @@
  * has performed on the page.
  */
 
-import {Services} from '#service';
 import {hasOwn} from '#core/types/object';
+
+import {Services} from '#service';
+
 import {listen} from '#utils/event-helper';
+
 import {registerServiceBuilderForDoc} from '../../../src/service-helpers';
 
 /**
@@ -162,7 +165,7 @@ export class Activity {
 
     /**
      * Contains the incrementalEngagedTime timestamps for named triggers.
-     * @private {Object<string, number>}
+     * @private {{[key: string]: number}}
      */
     this.totalEngagedTimeByTrigger_ = {
       /*
diff --git a/extensions/amp-analytics/0.1/amp-analytics.js b/extensions/amp-analytics/0.1/amp-analytics.js
index 8d32973c7dbf..db80875da855 100644
--- a/extensions/amp-analytics/0.1/amp-analytics.js
+++ b/extensions/amp-analytics/0.1/amp-analytics.js
@@ -1,35 +1,38 @@
+import {Deferred} from '#core/data-structures/promise';
+import {isIframed} from '#core/dom';
+import {LayoutPriority_Enum} from '#core/dom/layout';
+import {rethrowAsync} from '#core/error';
+import {isArray, isEnumValue} from '#core/types';
+import {hasOwn} from '#core/types/object';
+import {expandTemplate} from '#core/types/string';
+
+import {Services} from '#service';
+
+import {dev, devAssert, user} from '#utils/log';
+
 import {Activity} from './activity-impl';
 import {AnalyticsConfig, mergeObjects} from './config';
-import {AnalyticsEventType} from './events';
-import {ChunkPriority, chunk} from '../../../src/chunk';
 import {CookieWriter} from './cookie-writer';
-import {Deferred} from '#core/data-structures/promise';
-import {
-  ExpansionOptions,
-  VariableService,
-  stringToBool,
-  variableServicePromiseForDoc,
-} from './variables';
+import {AnalyticsEventType} from './events';
 import {
   InstrumentationService,
   instrumentationServicePromiseForDoc,
 } from './instrumentation';
-import {LayoutPriority} from '#core/dom/layout';
 import {LinkerManager} from './linker-manager';
+import {installLinkerReaderService} from './linker-reader';
 import {RequestHandler, expandPostMessage} from './requests';
-import {Services} from '#service';
 import {SessionManager, sessionServicePromiseForDoc} from './session-manager';
 import {Transport} from './transport';
-import {dev, devAssert, user} from '#utils/log';
-import {dict, hasOwn} from '#core/types/object';
-import {expandTemplate} from '#core/types/string';
-import {getMode} from '../../../src/mode';
-import {installLinkerReaderService} from './linker-reader';
-import {isArray, isEnumValue} from '#core/types';
-import {rethrowAsync} from '#core/error';
+import {
+  ExpansionOptions,
+  VariableService,
+  stringToBool,
+  variableServicePromiseForDoc,
+} from './variables';
 
-import {isIframed} from '#core/dom';
+import {ChunkPriority_Enum, chunk} from '../../../src/chunk';
 import {isInFie} from '../../../src/iframe-helper';
+import {getMode} from '../../../src/mode';
 
 const TAG = 'amp-analytics';
 
@@ -59,14 +62,14 @@ export class AmpAnalytics extends AMP.BaseElement {
     this.isSandbox_ = false;
 
     /**
-     * @private {Object<string, RequestHandler>} A map of request handler with requests
+     * @private {{[key: string]: RequestHandler}} A map of request handler with requests
      */
     this.requests_ = {};
 
     /**
      * @private {!JsonObject}
      */
-    this.config_ = dict();
+    this.config_ = {};
 
     /** @private {?./instrumentation.InstrumentationService} */
     this.instrumentation_ = null;
@@ -105,7 +108,9 @@ export class AmpAnalytics extends AMP.BaseElement {
   /** @override */
   getLayoutPriority() {
     // Load immediately if inabox, otherwise after other content.
-    return this.isInabox_ ? LayoutPriority.CONTENT : LayoutPriority.METADATA;
+    return this.isInabox_
+      ? LayoutPriority_Enum.CONTENT
+      : LayoutPriority_Enum.METADATA;
   }
 
   /** @override */
@@ -225,7 +230,7 @@ export class AmpAnalytics extends AMP.BaseElement {
           // Chunk in inabox ad leads to activeview regression, handle seperately
           loadConfigTask();
         } else {
-          chunk(this.element, loadConfigTask, ChunkPriority.HIGH);
+          chunk(this.element, loadConfigTask, ChunkPriority_Enum.HIGH);
         }
         return loadConfigDeferred.promise;
       })
@@ -328,7 +333,7 @@ export class AmpAnalytics extends AMP.BaseElement {
       if (hasOwn(this.config_['triggers'], k)) {
         const trigger = this.config_['triggers'][k];
         const expansionOptions = this.expansionOptions_(
-          dict({}),
+          {},
           trigger,
           undefined /* opt_iterations */,
           true /* opt_noEncode */
@@ -453,8 +458,8 @@ export class AmpAnalytics extends AMP.BaseElement {
   /**
    * Replace the names of keys in params object with the values in replace map.
    *
-   * @param {!Object<string, string>} params The params that need to be renamed.
-   * @param {!Object<string, string>} replaceMap A map of pattern and replacement
+   * @param {!{[key: string]: string}} params The params that need to be renamed.
+   * @param {!{[key: string]: string}} replaceMap A map of pattern and replacement
    *    value.
    * @private
    */
@@ -600,7 +605,7 @@ export class AmpAnalytics extends AMP.BaseElement {
       // Chunk in inabox ad leads to activeview regression, handle seperately
       linkerTask();
     } else {
-      chunk(this.element, linkerTask, ChunkPriority.LOW);
+      chunk(this.element, linkerTask, ChunkPriority_Enum.LOW);
     }
   }
 
@@ -731,7 +736,7 @@ export class AmpAnalytics extends AMP.BaseElement {
     if (threshold >= 0 && threshold <= 100) {
       const sampleDeferred = new Deferred();
       const sampleInTask = () => {
-        const expansionOptions = this.expansionOptions_(dict({}), trigger);
+        const expansionOptions = this.expansionOptions_({}, trigger);
         const samplePromise = this.expandTemplateWithUrlParams_(
           sampleOn,
           expansionOptions
@@ -744,7 +749,7 @@ export class AmpAnalytics extends AMP.BaseElement {
         // Chunk in inabox ad leads to activeview regression, handle seperately
         sampleInTask();
       } else {
-        chunk(this.element, sampleInTask, ChunkPriority.LOW);
+        chunk(this.element, sampleInTask, ChunkPriority_Enum.LOW);
       }
       return sampleDeferred.promise;
     }
@@ -842,7 +847,7 @@ export class AmpAnalytics extends AMP.BaseElement {
    * @return {!ExpansionOptions}
    */
   expansionOptions_(source1, source2, opt_iterations, opt_noEncode) {
-    const vars = dict();
+    const vars = {};
     mergeObjects(this.config_['vars'], vars);
     mergeObjects(source2['vars'], vars);
     mergeObjects(source1['vars'], vars);
diff --git a/extensions/amp-analytics/0.1/analytics-group.js b/extensions/amp-analytics/0.1/analytics-group.js
index 3efcbf111d06..f557efa050c1 100644
--- a/extensions/amp-analytics/0.1/analytics-group.js
+++ b/extensions/amp-analytics/0.1/analytics-group.js
@@ -1,9 +1,12 @@
-import {ChunkPriority, chunk} from '../../../src/chunk';
 import {Deferred} from '#core/data-structures/promise';
+import {getWin} from '#core/window';
+
 import {dev, userAssert} from '#utils/log';
-import {getMode} from '../../../src/mode';
+
 import {getTrackerKeyName, getTrackerTypesForParentType} from './events';
-import {getWin} from '#core/window';
+
+import {ChunkPriority_Enum, chunk} from '../../../src/chunk';
+import {getMode} from '../../../src/mode';
 
 /**
  * @const {number}
@@ -95,8 +98,8 @@ export class AnalyticsGroup {
     } else {
       const priority =
         this.triggerCount_ < HIGH_PRIORITY_TRIGGER_THRES
-          ? ChunkPriority.HIGH
-          : ChunkPriority.LOW;
+          ? ChunkPriority_Enum.HIGH
+          : ChunkPriority_Enum.LOW;
       chunk(this.analyticsElement_, task, priority);
     }
     this.triggerCount_++;
diff --git a/extensions/amp-analytics/0.1/analytics-root.js b/extensions/amp-analytics/0.1/analytics-root.js
index 146f63bca218..7ee7e1764eed 100644
--- a/extensions/amp-analytics/0.1/analytics-root.js
+++ b/extensions/amp-analytics/0.1/analytics-root.js
@@ -1,21 +1,23 @@
-import {ScrollManager} from './scroll-manager';
-import {Services} from '#service';
+import {tryResolve} from '#core/data-structures/promise';
+import {getDataParamsFromAttributes} from '#core/dom';
+import {layoutRectLtwh} from '#core/dom/layout/rect';
 import {
   closestAncestorElementBySelector,
   matches,
   scopedQuerySelector,
 } from '#core/dom/query';
-import {dev, user, userAssert} from '#utils/log';
-import {getDataParamsFromAttributes} from '#core/dom';
-import {getMode} from '../../../src/mode';
 import {isArray} from '#core/types';
-import {layoutRectLtwh} from '#core/dom/layout/rect';
 import {map} from '#core/types/object';
 
+import {Services} from '#service';
+
+import {dev, user, userAssert} from '#utils/log';
+
+import {ScrollManager} from './scroll-manager';
 import {provideVisibilityManager} from './visibility-manager';
 
-import {tryResolve} from '#core/data-structures/promise';
 import {whenContentIniLoad} from '../../../src/ini-load';
+import {getMode} from '../../../src/mode';
 
 const TAG = 'amp-analytics/analytics-root';
 const VARIABLE_DATA_ATTRIBUTE_KEY = /^vars(.+)/;
@@ -129,7 +131,7 @@ export class AnalyticsRoot {
    * Returns the tracker for the specified name and list of allowed types.
    *
    * @param {string} name
-   * @param {!Object<string, typeof ./events.EventTracker>} allowlist
+   * @param {!{[key: string]: typeof ./events.EventTracker}} allowlist
    * @return {?./events.EventTracker}
    */
   getTrackerForAllowlist(name, allowlist) {
diff --git a/extensions/amp-analytics/0.1/config.js b/extensions/amp-analytics/0.1/config.js
index 5533d550977f..36b2d81b4d0b 100644
--- a/extensions/amp-analytics/0.1/config.js
+++ b/extensions/amp-analytics/0.1/config.js
@@ -1,17 +1,21 @@
-import {DEFAULT_CONFIG} from './default-config';
-import {Services} from '#service';
-import {assertHttpsUrl} from '../../../src/url';
-import {calculateScriptBaseUrl} from '#service/extension-script';
-import {deepMerge, dict, hasOwn} from '#core/types/object';
-import {dev, user, userAssert} from '#utils/log';
 import {getChildJsonConfig} from '#core/dom';
-import {getMode} from '../../../src/mode';
 import {isArray, isObject} from '#core/types';
+import {deepMerge, hasOwn} from '#core/types/object';
+import {toWin} from '#core/window';
+
 import {isCanary} from '#experiments';
 
-import {toWin} from '#core/window';
+import {Services} from '#service';
+import {calculateScriptBaseUrl} from '#service/extension-script';
+
+import {dev, user, userAssert} from '#utils/log';
+
+import {DEFAULT_CONFIG} from './default-config';
 import {variableServiceForDoc} from './variables';
 
+import {getMode} from '../../../src/mode';
+import {assertHttpsUrl} from '../../../src/url';
+
 const TAG = 'amp-analytics/config';
 
 export class AnalyticsConfig {
@@ -29,20 +33,20 @@ export class AnalyticsConfig {
      * @const {!JsonObject}
      * @private
      */
-    this.defaultConfig_ = DEFAULT_CONFIG || dict();
+    this.defaultConfig_ = DEFAULT_CONFIG || {};
 
     /** @private {!JsonObject} */
-    this.vendorConfig_ = dict();
+    this.vendorConfig_ = {};
 
     /**
      * @private {JsonObject}
      */
-    this.config_ = dict();
+    this.config_ = {};
 
     /**
      * @private {JsonObject}
      */
-    this.remoteConfig_ = dict();
+    this.remoteConfig_ = {};
 
     /** @private {boolean} */
     this.isSandbox_ = false;
@@ -104,7 +108,7 @@ export class AnalyticsConfig {
       .then((res) => res.json())
       .then(
         (jsonValue) => {
-          this.vendorConfig_ = jsonValue || dict();
+          this.vendorConfig_ = jsonValue || {};
           dev().fine(TAG, 'Vendor config loaded for ' + type, jsonValue);
         },
         (err) => {
@@ -169,7 +173,7 @@ export class AnalyticsConfig {
   processConfigs_() {
     const configRewriterUrl = this.getConfigRewriter_()['url'];
 
-    const config = dict({});
+    const config = {};
     const inlineConfig = this.getInlineConfig_();
     this.validateTransport_(inlineConfig);
     mergeObjects(inlineConfig, config);
@@ -281,13 +285,13 @@ export class AnalyticsConfig {
 
     // Create object that will later hold all the resolved variables, and any
     // intermediary objects as necessary.
-    pubConfig['configRewriter'] = pubConfig['configRewriter'] || dict();
+    pubConfig['configRewriter'] = pubConfig['configRewriter'] || {};
     const rewriterConfig = pubConfig['configRewriter'];
-    rewriterConfig['vars'] = dict({});
+    rewriterConfig['vars'] = {};
 
     const allPromises = [];
     // Merge publisher && vendor varGroups to see what has been enabled.
-    const mergedConfig = pubVarGroups || dict();
+    const mergedConfig = pubVarGroups || {};
     deepMerge(mergedConfig, vendorVarGroups);
 
     Object.keys(mergedConfig).forEach((groupName) => {
@@ -333,11 +337,11 @@ export class AnalyticsConfig {
    */
   mergeConfigs_(rewrittenConfig) {
     // Initialize config with analytics related vars.
-    const config = dict({
+    const config = {
       'vars': {
         'requestCount': 0,
       },
-    });
+    };
     mergeObjects(expandConfigRequest(this.defaultConfig_), config);
     mergeObjects(
       expandConfigRequest(this.vendorConfig_),
@@ -444,7 +448,7 @@ export class AnalyticsConfig {
    * @return {!Promise<!Object>}
    */
   shallowExpandObject(element, obj) {
-    const expandedObj = dict();
+    const expandedObj = {};
     const keys = [];
     const expansionPromises = [];
 
diff --git a/extensions/amp-analytics/0.1/cookie-reader.js b/extensions/amp-analytics/0.1/cookie-reader.js
index 0b2c220c1775..99865c9e8d73 100644
--- a/extensions/amp-analytics/0.1/cookie-reader.js
+++ b/extensions/amp-analytics/0.1/cookie-reader.js
@@ -1,6 +1,6 @@
 import {getCookie} from '../../../src/cookies';
-import {getMode} from '../../../src/mode';
 import {isInFie} from '../../../src/iframe-helper';
+import {getMode} from '../../../src/mode';
 import {isProxyOrigin} from '../../../src/url';
 
 /**
diff --git a/extensions/amp-analytics/0.1/cookie-writer.js b/extensions/amp-analytics/0.1/cookie-writer.js
index 40a0d7fdbfde..effc71b0fcf6 100644
--- a/extensions/amp-analytics/0.1/cookie-writer.js
+++ b/extensions/amp-analytics/0.1/cookie-writer.js
@@ -1,14 +1,18 @@
-import {BASE_CID_MAX_AGE_MILLIS} from '#service/cid-impl';
-import {ChunkPriority, chunk} from '../../../src/chunk';
 import {Deferred} from '#core/data-structures/promise';
-import {SameSite, setCookie} from '../../../src/cookies';
-import {Services} from '#service';
-import {hasOwn} from '#core/types/object';
-import {isCookieAllowed} from './cookie-reader';
 import {isObject} from '#core/types';
+import {hasOwn} from '#core/types/object';
+
+import {Services} from '#service';
+import {BASE_CID_MAX_AGE_MILLIS} from '#service/cid-impl';
+
 import {user} from '#utils/log';
+
+import {isCookieAllowed} from './cookie-reader';
 import {variableServiceForDoc} from './variables';
 
+import {ChunkPriority_Enum, chunk} from '../../../src/chunk';
+import {SameSite_Enum, setCookie} from '../../../src/cookies';
+
 const TAG = 'amp-analytics/cookie-writer';
 
 const RESERVED_KEYS = {
@@ -59,7 +63,7 @@ export class CookieWriter {
         this.writeDeferred_.resolve(this.init_());
       };
       // CookieWriter is not supported in inabox ad. Always chunk
-      chunk(this.element_, task, ChunkPriority.LOW);
+      chunk(this.element_, task, ChunkPriority_Enum.LOW);
     }
     return this.writeDeferred_.promise;
   }
@@ -203,7 +207,7 @@ export class CookieWriter {
    * @param {string} cookieName
    * @param {string} cookieValue
    * @param {number} cookieExpireDateMs
-   * @param {!SameSite=} sameSite
+   * @param {!SameSite_Enum=} sameSite
    * @return {!Promise}
    */
   expandAndWrite_(cookieName, cookieValue, cookieExpireDateMs, sameSite) {
@@ -218,7 +222,7 @@ export class CookieWriter {
           const expireDate = Date.now() + cookieExpireDateMs;
           // SameSite=None must be secure as per
           // https://web.dev/samesite-cookies-explained/#samesitenone-must-be-secure
-          const secure = sameSite === SameSite.NONE;
+          const secure = sameSite === SameSite_Enum.NONE;
           setCookie(this.win_, cookieName, value, expireDate, {
             highestAvailableDomain: true,
             sameSite,
@@ -232,18 +236,18 @@ export class CookieWriter {
   }
 
   /**
-   * Converts SameSite string to SameSite type.
+   * Converts SameSite string to SameSite_Enum type.
    * @param {string=} sameSite
-   * @return {SameSite|undefined}
+   * @return {SameSite_Enum|undefined}
    */
   getSameSiteType_(sameSite) {
     switch (sameSite) {
       case 'Strict':
-        return SameSite.STRICT;
+        return SameSite_Enum.STRICT;
       case 'Lax':
-        return SameSite.LAX;
+        return SameSite_Enum.LAX;
       case 'None':
-        return SameSite.NONE;
+        return SameSite_Enum.NONE;
       default:
         return;
     }
diff --git a/extensions/amp-analytics/0.1/default-config.js b/extensions/amp-analytics/0.1/default-config.js
index f69eb43bd054..f322638c6e89 100644
--- a/extensions/amp-analytics/0.1/default-config.js
+++ b/extensions/amp-analytics/0.1/default-config.js
@@ -40,6 +40,7 @@ const defaultConfig = jsonConfiguration({
     'fragmentParam': 'FRAGMENT_PARAM',
     'htmlAttr': 'HTML_ATTR',
     'incrementalEngagedTime': 'INCREMENTAL_ENGAGED_TIME',
+    'interactionToNextPaint': 'INTERACTION_TO_NEXT_PAINT',
     'largestContentfulPaint': 'LARGEST_CONTENTFUL_PAINT',
     'makeBodyVisible': 'MAKE_BODY_VISIBLE',
     'navRedirectCount': 'NAV_REDIRECT_COUNT',
diff --git a/extensions/amp-analytics/0.1/events.js b/extensions/amp-analytics/0.1/events.js
index e440459193f4..defad12a6be5 100644
--- a/extensions/amp-analytics/0.1/events.js
+++ b/extensions/amp-analytics/0.1/events.js
@@ -1,21 +1,24 @@
-import {CommonSignals} from '#core/constants/common-signals';
-import {Deferred} from '#core/data-structures/promise';
+import {CommonSignals_Enum} from '#core/constants/common-signals';
 import {Observable} from '#core/data-structures/observable';
-import {
-  PlayingStates,
-  VideoAnalyticsEvents_Enum,
-  videoAnalyticsCustomEventTypeKey,
-} from '../../../src/video-interface';
-import {enumValues} from '#core/types/enum';
-import {deepMerge, dict, hasOwn} from '#core/types/object';
-import {dev, devAssert, user, userAssert} from '#utils/log';
-import {getData} from '#utils/event-helper';
+import {Deferred} from '#core/data-structures/promise';
 import {getDataParamsFromAttributes} from '#core/dom';
 import {isAmpElement} from '#core/dom/amp-element-helpers';
 import {isArray, isEnumValue, isFiniteNumber} from '#core/types';
+import {enumValues} from '#core/types/enum';
 import {debounce} from '#core/types/function';
+import {deepMerge, hasOwn} from '#core/types/object';
+
 import {isExperimentOn} from '#experiments';
 
+import {getData} from '#utils/event-helper';
+import {dev, devAssert, user, userAssert} from '#utils/log';
+
+import {
+  PlayingStates_Enum,
+  VideoAnalyticsEvents_Enum,
+  videoAnalyticsCustomEventTypeKey,
+} from '../../../src/video-interface';
+
 const SCROLL_PRECISION_PERCENT = 5;
 const VAR_H_SCROLL_BOUNDARY = 'horizontalScrollBoundary';
 const VAR_V_SCROLL_BOUNDARY = 'verticalScrollBoundary';
@@ -213,7 +216,7 @@ export function getTrackerKeyName(eventType) {
 
 /**
  * @param {string} parentType
- * @return {!Object<string, typeof EventTracker>}
+ * @return {!{[key: string]: typeof EventTracker}}
  */
 export function getTrackerTypesForParentType(parentType) {
   const filtered = {};
@@ -278,7 +281,7 @@ export class AnalyticsEvent {
    * @param {boolean} enableDataVars A boolean to indicate if data-vars-*
    * attribute value from target element should be included.
    */
-  constructor(target, type, vars = dict(), enableDataVars = true) {
+  constructor(target, type, vars = {}, enableDataVars = true) {
     /** @const */
     this['target'] = target;
     /** @const */
@@ -332,8 +335,8 @@ export class BrowserEventTracker extends EventTracker {
     /** @private {?Observable<!Event>} */
     this.observables_ = new Observable();
 
-    /** @private {!Object<BrowserEventType, boolean>} */
-    this.listenerMap_ = dict({});
+    /** @private {!{[key: BrowserEventType]: boolean}} */
+    this.listenerMap_ = {};
 
     /** @private {?function(!Event)} */
     this.boundOnSession_ = this.observables_.fire.bind(this.observables_);
@@ -411,12 +414,12 @@ export class CustomEventTracker extends EventTracker {
    */
   constructor(root) {
     super(root);
-    /** @const @private {!Object<string, !Observable<!AnalyticsEvent>>} */
+    /** @const @private {!{[key: string]: !Observable<!AnalyticsEvent>}} */
     this.observables_ = {};
     /**
      * Early events have to be buffered because there's no way to predict
      * how fast all `amp-analytics` elements will be instrumented.
-     * @private {!Object<string, !Array<!AnalyticsEvent>>|undefined}
+     * @private {!{[key: string]: !Array<!AnalyticsEvent>>|undefined}}
      */
     this.buffer_ = {};
 
@@ -425,7 +428,7 @@ export class CustomEventTracker extends EventTracker {
      * be added after parent element's layout. (Time varies, can be later than
      * 10s) sandbox events buffer will never expire but will cleared when
      * handler is ready.
-     * @private {!Object<string, !Array<!AnalyticsEvent>|undefined>|undefined}
+     * @private {!{[key: string]: !Array<!AnalyticsEvent>|undefined>|undefined}}
      */
     this.sandboxBuffer_ = {};
 
@@ -743,8 +746,8 @@ export class ScrollEventTracker extends EventTracker {
 
   /**
    * Function to handle scroll events from the Scroll manager
-   * @param {!Object<number,boolean>} boundsH
-   * @param {!Object<number,boolean>} boundsV
+   * @param {!{[key: number]: boolean}} boundsH
+   * @param {!{[key: number]: boolean}} boundsV
    * @param {boolean} useInitialPageSize
    * @param {function(!AnalyticsEvent)} listener
    * @param {!Object} e
@@ -781,7 +784,7 @@ export class ScrollEventTracker extends EventTracker {
    * @private
    */
   normalizeBoundaries_(bounds) {
-    const result = dict({});
+    const result = {};
     if (!bounds || !Array.isArray(bounds)) {
       return result;
     }
@@ -803,7 +806,7 @@ export class ScrollEventTracker extends EventTracker {
   }
 
   /**
-   * @param {!Object<number, boolean>} bounds
+   * @param {!{[key: number]: boolean}} bounds
    * @param {number} scrollPos Number representing the current scroll
    * @param {string} varName variable name to assign to the bound that
    * @param {function(!AnalyticsEvent)} listener
@@ -825,7 +828,7 @@ export class ScrollEventTracker extends EventTracker {
         continue;
       }
       bounds[bound] = true;
-      const vars = dict();
+      const vars = {};
       vars[varName] = b;
       listener(
         new AnalyticsEvent(
@@ -958,8 +961,8 @@ export class IniLoadTracker extends EventTracker {
     }
     const signals = element.signals();
     return Promise.race([
-      signals.whenSignal(CommonSignals.INI_LOAD),
-      signals.whenSignal(CommonSignals.LOAD_END),
+      signals.whenSignal(CommonSignals_Enum.INI_LOAD),
+      signals.whenSignal(CommonSignals_Enum.LOAD_END),
     ]);
   }
 }
@@ -1152,10 +1155,10 @@ class TimerEventHandler {
       timerDuration = this.calculateDuration_();
       this.lastRequestTime_ = Date.now();
     }
-    return dict({
+    return {
       'timerDuration': timerDuration,
       'timerStart': this.startTime_ || 0,
-    });
+    };
   }
 }
 
@@ -1168,7 +1171,7 @@ export class TimerEventTracker extends EventTracker {
    */
   constructor(root) {
     super(root);
-    /** @const @private {!Object<number, TimerEventHandler>} */
+    /** @const @private {!{[key: number]: TimerEventHandler}} */
     this.trackers_ = {};
 
     /** @private {number} */
@@ -1489,7 +1492,10 @@ export class VideoEventTracker extends EventTracker {
         return;
       }
 
-      if (excludeAutoplay && details['state'] === PlayingStates.PLAYING_AUTO) {
+      if (
+        excludeAutoplay &&
+        details['state'] === PlayingStates_Enum.PLAYING_AUTO
+      ) {
         return;
       }
 
@@ -1540,7 +1546,7 @@ function normalizeVideoEventType(type, details) {
  */
 function removeInternalVars(details) {
   if (!details) {
-    return dict();
+    return {};
   }
   const clean = {...details};
   delete clean[videoAnalyticsCustomEventTypeKey];
diff --git a/extensions/amp-analytics/0.1/iframe-transport-message-queue.js b/extensions/amp-analytics/0.1/iframe-transport-message-queue.js
index 9422d86509ad..906d3a8a2b2b 100644
--- a/extensions/amp-analytics/0.1/iframe-transport-message-queue.js
+++ b/extensions/amp-analytics/0.1/iframe-transport-message-queue.js
@@ -1,13 +1,17 @@
-import {IframeTransportEventDef, MessageType} from '#core/3p-frame-messaging';
-import {SubscriptionApi} from '../../../src/iframe-helper';
+import {MessageType_Enum} from '#core/3p-frame-messaging';
+
 import {dev, devAssert} from '#utils/log';
 
+import {SubscriptionApi} from '../../../src/iframe-helper';
+
 /** @private @const {string} */
 const TAG_ = 'amp-analytics/iframe-transport-message-queue';
 
 /** @private @const {number} */
 const MAX_QUEUE_SIZE_ = 100;
 
+/** @typedef {import('#core/3p-frame-messaging').IframeTransportEventDef} IframeTransportDef */
+
 /**
  * @visibleForTesting
  */
@@ -31,7 +35,7 @@ export class IframeTransportMessageQueue {
     /** @private {!../../../src/iframe-helper.SubscriptionApi} */
     this.postMessageApi_ = new SubscriptionApi(
       this.frame_,
-      MessageType.SEND_IFRAME_TRANSPORT_EVENTS,
+      MessageType_Enum.SEND_IFRAME_TRANSPORT_EVENTS,
       true,
       () => {
         this.setIsReady();
@@ -96,7 +100,7 @@ export class IframeTransportMessageQueue {
   flushQueue_() {
     if (this.isReady() && this.queueSize()) {
       this.postMessageApi_.send(
-        MessageType.IFRAME_TRANSPORT_EVENTS,
+        MessageType_Enum.IFRAME_TRANSPORT_EVENTS,
         /** @type {!JsonObject} */
         ({events: this.pendingEvents_})
       );
diff --git a/extensions/amp-analytics/0.1/iframe-transport.js b/extensions/amp-analytics/0.1/iframe-transport.js
index 97aec3b9f3d3..d94df2be0cb0 100644
--- a/extensions/amp-analytics/0.1/iframe-transport.js
+++ b/extensions/amp-analytics/0.1/iframe-transport.js
@@ -1,14 +1,19 @@
-import {IframeTransportMessageQueue} from './iframe-transport-message-queue';
 import {createElementWithAttributes} from '#core/dom';
+import {toggle} from '#core/dom/style';
+import * as mode from '#core/mode';
+import {hasOwn} from '#core/types/object';
+
 import {devAssert, user} from '#utils/log';
+
+import {IframeTransportMessageQueue} from './iframe-transport-message-queue';
+
+import * as urls from '../../../src/config/urls';
 import {getMode} from '../../../src/mode';
-import {hasOwn} from '#core/types/object';
-import * as mode from '#core/mode';
-import {toggle} from '#core/dom/style';
-import {urls} from '../../../src/config';
-import {IframeTransportEventDef} from '#core/3p-frame-messaging';
 
-/** @private @const {string} */
+/**
+ * @type {string}
+ * @private @const
+ */
 const TAG_ = 'amp-analytics/iframe-transport';
 
 /** @private @const {number} */
@@ -328,11 +333,11 @@ export function isLongTaskApiSupported(win) {
   );
 }
 
-/** @private {Object<string, FrameData>} */
+/** @private {{[key: string]: FrameData}} */
 IframeTransport.crossDomainIframes_ = {};
 
 /** @private {number} */
 IframeTransport.nextId_ = 0;
 
-/** @private {Object<string, PerformanceObserver>} */
+/** @private {{[key: string]: PerformanceObserver}} */
 IframeTransport.performanceObservers_ = {};
diff --git a/extensions/amp-analytics/0.1/instrumentation.js b/extensions/amp-analytics/0.1/instrumentation.js
index c2786d67da3a..47e05ffdd75c 100644
--- a/extensions/amp-analytics/0.1/instrumentation.js
+++ b/extensions/amp-analytics/0.1/instrumentation.js
@@ -1,3 +1,7 @@
+import {Services} from '#service';
+
+import {AnalyticsGroup} from './analytics-group';
+import {AmpdocAnalyticsRoot, EmbedAnalyticsRoot} from './analytics-root';
 import {
   AmpStoryEventTracker,
   AnalyticsEvent,
@@ -5,10 +9,7 @@ import {
   CustomEventTracker,
   getTrackerKeyName,
 } from './events';
-import {AmpdocAnalyticsRoot, EmbedAnalyticsRoot} from './analytics-root';
-import {AnalyticsGroup} from './analytics-group';
-import {Services} from '#service';
-import {dict} from '#core/types/object';
+
 import {getFriendlyIframeEmbedOptional} from '../../../src/iframe-helper';
 import {
   getParentWindowFrameElement,
@@ -80,12 +81,7 @@ export class InstrumentationService {
    * @param {boolean} enableDataVars A boolean to indicate if data-vars-*
    * attribute value from target element should be included.
    */
-  triggerEventForTarget(
-    target,
-    eventType,
-    vars = dict(),
-    enableDataVars = true
-  ) {
+  triggerEventForTarget(target, eventType, vars = {}, enableDataVars = true) {
     const event = new AnalyticsEvent(target, eventType, vars, enableDataVars);
     const root = this.findRoot_(target);
     const trackerName = getTrackerKeyName(eventType);
diff --git a/extensions/amp-analytics/0.1/linker-manager.js b/extensions/amp-analytics/0.1/linker-manager.js
index 37d3b89dbd6b..0929ceb8cf4c 100644
--- a/extensions/amp-analytics/0.1/linker-manager.js
+++ b/extensions/amp-analytics/0.1/linker-manager.js
@@ -1,16 +1,19 @@
 import {AMPDOC_SINGLETON_NAME_ENUM} from '#core/constants/enums';
-import {ExpansionOptions, variableServiceForDoc} from './variables';
-import {Priority} from '#service/navigation';
-import {Services} from '#service';
-import {WindowInterface} from '#core/window/interface';
-import {addMissingParamsToUrl, addParamToUrl} from '../../../src/url';
 import {createElementWithAttributes} from '#core/dom';
-import {createLinker} from './linker';
-import {dict} from '#core/types/object';
-import {getHighestAvailableDomain} from '../../../src/cookies';
 import {isObject} from '#core/types';
+import {WindowInterface} from '#core/window/interface';
+
+import {Services} from '#service';
+import {Priority_Enum} from '#service/navigation';
+
 import {user} from '#utils/log';
 
+import {createLinker} from './linker';
+import {ExpansionOptions, variableServiceForDoc} from './variables';
+
+import {getHighestAvailableDomain} from '../../../src/cookies';
+import {addMissingParamsToUrl, addParamToUrl} from '../../../src/url';
+
 /** @const {string} */
 const TAG = 'amp-analytics/linker-manager';
 
@@ -38,7 +41,7 @@ export class LinkerManager {
     this.element_ = element;
 
     /** @const @private {!JsonObject} */
-    this.resolvedIds_ = dict();
+    this.resolvedIds_ = {};
 
     /** @const @private {!../../../src/service/url-impl.Url} */
     this.urlService_ = Services.urlForDoc(this.element_);
@@ -111,10 +114,10 @@ export class LinkerManager {
           return;
         }
         element.href = this.applyLinkers_(element.href);
-      }, Priority.ANALYTICS_LINKER);
+      }, Priority_Enum.ANALYTICS_LINKER);
       navigation.registerNavigateToMutator(
         (url) => this.applyLinkers_(url),
-        Priority.ANALYTICS_LINKER
+        Priority_Enum.ANALYTICS_LINKER
       );
     }
 
@@ -138,7 +141,7 @@ export class LinkerManager {
    * @private
    */
   processConfig_(config) {
-    const processedConfig = dict();
+    const processedConfig = {};
     const defaultConfig = {
       enabled: this.isLegacyOptIn_() && this.isSafari12OrAbove_(),
     };
@@ -271,7 +274,7 @@ export class LinkerManager {
         this.resolvedIds_[name]
       );
       if (linkerValue) {
-        const params = dict();
+        const params = {};
         params[name] = linkerValue;
         return addMissingParamsToUrl(url, params);
       }
@@ -440,11 +443,11 @@ export class LinkerManager {
    * @param {string} linkerValue
    */
   addHiddenInputs_(form, linkerName, linkerValue) {
-    const attrs = dict({
+    const attrs = {
       'type': 'hidden',
       'name': linkerName,
       'value': linkerValue,
-    });
+    };
 
     const inputEl = createElementWithAttributes(
       /** @type {!Document} */ (form.ownerDocument),
diff --git a/extensions/amp-analytics/0.1/linker-reader.js b/extensions/amp-analytics/0.1/linker-reader.js
index 48daf448c73d..299e8cd322f0 100644
--- a/extensions/amp-analytics/0.1/linker-reader.js
+++ b/extensions/amp-analytics/0.1/linker-reader.js
@@ -1,11 +1,13 @@
-import {getService, registerServiceBuilder} from '../../../src/service-helpers';
 import {hasOwn} from '#core/types/object';
-import {parseLinker} from './linker';
 import {parseQueryString} from '#core/types/string/url';
-import {removeParamsFromSearch} from '../../../src/url';
 
 import {user} from '#utils/log';
 
+import {parseLinker} from './linker';
+
+import {getService, registerServiceBuilder} from '../../../src/service-helpers';
+import {removeParamsFromSearch} from '../../../src/url';
+
 const TAG = 'amp-analytics/linker-reader';
 
 export class LinkerReader {
@@ -16,7 +18,7 @@ export class LinkerReader {
     /** @private {!Window} */
     this.win_ = win;
 
-    /** @private {!Object<string, ?Object<string, string>>} */
+    /** @private {!{[key: string]: ?{[key: string]: string}}} */
     this.linkerParams_ = {};
   }
 
@@ -47,7 +49,7 @@ export class LinkerReader {
    * Parse the url get the key value pair for the linker name
    * and remove the LINKER_PARAM from window location
    * @param {string} name
-   * @return {?Object<string, string>}
+   * @return {?{[key: string]: string}}
    */
   parseAndCleanQueryString_(name) {
     const params = parseQueryString(this.win_.location.search);
diff --git a/extensions/amp-analytics/0.1/linker.js b/extensions/amp-analytics/0.1/linker.js
index 503361c938c0..ee192b118d25 100644
--- a/extensions/amp-analytics/0.1/linker.js
+++ b/extensions/amp-analytics/0.1/linker.js
@@ -1,11 +1,13 @@
-import {WindowInterface} from '#core/window/interface';
 import {
   base64UrlDecodeFromString,
   base64UrlEncodeFromString,
 } from '#core/types/string/base64';
-import {crc32} from './crc32';
+import {WindowInterface} from '#core/window/interface';
+
 import {user} from '#utils/log';
 
+import {crc32} from './crc32';
+
 /** @const {string} */
 const DELIMITER = '*';
 const KEY_VALIDATOR = /^[a-zA-Z0-9\-_.]+$/;
@@ -39,7 +41,7 @@ export function createLinker(version, ids) {
 /**
  * Return the key value pairs
  * @param {string} value
- * @return {?Object<string, string>}
+ * @return {?{[key: string]: string}}
  */
 export function parseLinker(value) {
   const linkerObj = parseLinkerParamValue(value);
@@ -154,7 +156,7 @@ function serialize(pairs) {
 /**
  * Deserialize the serializedIds and return keyValue pairs.
  * @param {string} serializedIds
- * @return {!Object<string, string>}
+ * @return {!{[key: string]: string}}
  */
 function deserialize(serializedIds) {
   const keyValuePairs = {};
diff --git a/extensions/amp-analytics/0.1/requests.js b/extensions/amp-analytics/0.1/requests.js
index 8b8aea88894f..dc587bbd3e73 100644
--- a/extensions/amp-analytics/0.1/requests.js
+++ b/extensions/amp-analytics/0.1/requests.js
@@ -1,12 +1,14 @@
-import {AnalyticsEventType} from './events';
-import {BatchSegmentDef, defaultSerializer} from './transport-serializer';
-import {ExpansionOptions, variableServiceForDoc} from './variables';
-import {SANDBOX_AVAILABLE_VARS} from './sandbox-vars-allowlist';
+import {isArray, isFiniteNumber, isObject} from '#core/types';
+
 import {Services} from '#service';
+
 import {devAssert, userAssert} from '#utils/log';
-import {dict} from '#core/types/object';
+
+import {AnalyticsEventType} from './events';
 import {getResourceTiming} from './resource-timing';
-import {isArray, isFiniteNumber, isObject} from '#core/types';
+import {SANDBOX_AVAILABLE_VARS} from './sandbox-vars-allowlist';
+import {BatchSegmentDef, defaultSerializer} from './transport-serializer';
+import {ExpansionOptions, variableServiceForDoc} from './variables';
 
 const BATCH_INTERVAL_MIN = 200;
 
@@ -152,11 +154,11 @@ export class RequestHandler {
       this.element_,
       this.allowlist_
     ).then((params) => {
-      return dict({
+      return {
         'trigger': trigger['on'],
         'timestamp': timestamp,
         'extraUrlParams': params,
-      });
+      };
     });
     this.batchSegmentPromises_.push(batchSegmentPromise);
     this.trigger_(isImportant || !this.batchInterval_);
@@ -183,7 +185,7 @@ export class RequestHandler {
   /**
    * @param {string} url
    * @param {!ExpansionOptions} expansionOptions
-   * @param {!Object<string, (!../../../src/service/variable-source.ResolverReturnDef|!../../../src/service/variable-source.SyncResolverDef)>=} bindings
+   * @param {!{[key: string]: (!../../../src/service/variable-source.ResolverReturnDef|!../../../src/service/variable-source.SyncResolverDef)}=} bindings
    * @return {!Promise<string>}
    */
   expandTemplateUrl_(url, expansionOptions, bindings) {
@@ -422,7 +424,7 @@ export function expandPostMessage(
       element
     ).then((extraUrlParams) => {
       return defaultSerializer(expandedMsg, [
-        dict({'extraUrlParams': extraUrlParams}),
+        {'extraUrlParams': extraUrlParams},
       ]);
     });
   });
diff --git a/extensions/amp-analytics/0.1/resource-timing.js b/extensions/amp-analytics/0.1/resource-timing.js
index 91e65eaf806d..685c7db76d67 100644
--- a/extensions/amp-analytics/0.1/resource-timing.js
+++ b/extensions/amp-analytics/0.1/resource-timing.js
@@ -1,8 +1,10 @@
-import {ExpansionOptions, variableServiceForDoc} from './variables';
-import {findIndex} from '#core/types/array';
 import {isObject} from '#core/types';
+import {findIndex} from '#core/types/array';
+
 import {user} from '#utils/log';
 
+import {ExpansionOptions, variableServiceForDoc} from './variables';
+
 /**
  * A user-supplied JSON object that defines a resource to be reported. It is
  * expected to have some fields.
@@ -169,7 +171,7 @@ function nameForEntry(entry, resourcesByHost) {
  * patterns) by host pattern. This is used downstream to avoid running RegExps
  * for host patterns multiple times because we expect multiple resources to
  * use the same host pattern.
- * @param {!Object<string, !IndividualResourceSpecDef>} resourceDefs A map of
+ * @param {!{[key: string]: !IndividualResourceSpecDef}} resourceDefs A map of
  *     names to the resource spec for that name.
  * @return {!Array<!ResourceSpecForHostDef>}
  */
@@ -205,7 +207,7 @@ function groupSpecsByHost(resourceDefs) {
  * resourceDefs. It returns a new array where each element contains a
  * resource timing entry and the corresponding name.
  * @param {!Array<!PerformanceResourceTiming>} entries
- * @param {!Object<string, !IndividualResourceSpecDef>} resourceDefs
+ * @param {!{[key: string]: !IndividualResourceSpecDef}} resourceDefs
  * @return {!Array<{entry: !PerformanceResourceTiming, name: string}>}
  */
 function filterEntries(entries, resourceDefs) {
diff --git a/extensions/amp-analytics/0.1/sandbox-vars-allowlist.js b/extensions/amp-analytics/0.1/sandbox-vars-allowlist.js
index fb71ad5c645e..d1439a9d90f2 100644
--- a/extensions/amp-analytics/0.1/sandbox-vars-allowlist.js
+++ b/extensions/amp-analytics/0.1/sandbox-vars-allowlist.js
@@ -1,6 +1,6 @@
 /**
  * Used for inserted scoped analytics element.
- * @const {!Object<string, boolean>}
+ * @const {!{[key: string]: boolean}}
  */
 export const SANDBOX_AVAILABLE_VARS = {
   'AMPDOC_HOST': true,
diff --git a/extensions/amp-analytics/0.1/scroll-manager.js b/extensions/amp-analytics/0.1/scroll-manager.js
index f21bf1fd4581..23917f1563e4 100644
--- a/extensions/amp-analytics/0.1/scroll-manager.js
+++ b/extensions/amp-analytics/0.1/scroll-manager.js
@@ -1,5 +1,7 @@
 import {Observable} from '#core/data-structures/observable';
+
 import {Services} from '#service';
+
 import {devAssert} from '#utils/log';
 
 /**
diff --git a/extensions/amp-analytics/0.1/session-manager.js b/extensions/amp-analytics/0.1/session-manager.js
index 7bc533077580..698b3b5e8e98 100644
--- a/extensions/amp-analytics/0.1/session-manager.js
+++ b/extensions/amp-analytics/0.1/session-manager.js
@@ -1,13 +1,16 @@
+import {isDocumentHidden} from '#core/document/visibility';
+import {isObject} from '#core/types';
+import {hasOwn, map} from '#core/types/object';
+
 import {Services} from '#service';
+
+import {listen} from '#utils/event-helper';
 import {dev, user} from '#utils/log';
+
 import {
   getServicePromiseForDoc,
   registerServiceBuilderForDoc,
 } from '../../../src/service-helpers';
-import {hasOwn, map} from '#core/types/object';
-import {isDocumentHidden} from '#core/document/visibility';
-import {isObject} from '#core/types';
-import {listen} from '#utils/event-helper';
 
 /** @const {string} */
 const TAG = 'amp-analytics/session-manager';
@@ -59,7 +62,7 @@ export class SessionManager {
     /** @private {!Promise<!../../../src/service/storage-impl.Storage>} */
     this.storagePromise_ = Services.storageForDoc(ampdoc);
 
-    /** @private {!Object<string, ?SessionInfoDef>} */
+    /** @private {!{[key: string]: ?SessionInfoDef}} */
     this.sessions_ = map();
 
     /** @private {!../../../src/service/ampdoc-impl.AmpDoc} */
diff --git a/extensions/amp-analytics/0.1/test/test-amp-analytics.js b/extensions/amp-analytics/0.1/test/test-amp-analytics.js
index 7bc11e9fa13a..9ce27017e9c3 100644
--- a/extensions/amp-analytics/0.1/test/test-amp-analytics.js
+++ b/extensions/amp-analytics/0.1/test/test-amp-analytics.js
@@ -1,26 +1,30 @@
-import {AmpAnalytics} from '../amp-analytics';
-import {AnalyticsConfig} from '../config';
-import {ClickEventTracker, VisibilityTracker} from '../events';
+import {expect} from 'chai';
+
+import {LayoutPriority_Enum} from '#core/dom/layout';
+
+import {Services} from '#service';
+import {cidServiceForDocForTesting} from '#service/cid-impl';
+import {installCryptoService} from '#service/crypto-impl';
+
+import {macroTask} from '#testing/helpers';
 import {
   ImagePixelVerifier,
   mockWindowInterface,
 } from '#testing/helpers/service';
-import {LayoutPriority} from '#core/dom/layout';
-import {LinkerManager} from '../linker-manager';
-import {Services} from '#service';
-import {SessionManager} from '../session-manager';
-import {Transport} from '../transport';
-import {cidServiceForDocForTesting} from '#service/cid-impl';
-import {expect} from 'chai';
+
 import {
   getService,
   registerServiceBuilder,
   resetServiceForTesting,
 } from '../../../../src/service-helpers';
-import {installCryptoService} from '#service/crypto-impl';
 import {installUserNotificationManagerForTesting} from '../../../amp-user-notification/0.1/amp-user-notification';
+import {AmpAnalytics} from '../amp-analytics';
+import {AnalyticsConfig} from '../config';
+import {ClickEventTracker, VisibilityTracker} from '../events';
 import {instrumentationServiceForDocForTesting} from '../instrumentation';
-import {macroTask} from '#testing/helpers';
+import {LinkerManager} from '../linker-manager';
+import {SessionManager} from '../session-manager';
+import {Transport} from '../transport';
 
 describes.realWin(
   'amp-analytics',
@@ -2095,14 +2099,14 @@ describes.realWin(
 
       it('is 1 for non-inabox', () => {
         expect(getAnalyticsTag(getConfig()).getLayoutPriority()).to.equal(
-          LayoutPriority.METADATA
+          LayoutPriority_Enum.METADATA
         );
       });
 
       it('is 0 for inabox', () => {
         env.win.__AMP_MODE.runtime = 'inabox';
         expect(getAnalyticsTag(getConfig()).getLayoutPriority()).to.equal(
-          LayoutPriority.CONTENT
+          LayoutPriority_Enum.CONTENT
         );
       });
     });
diff --git a/extensions/amp-analytics/0.1/test/test-analytics-group.js b/extensions/amp-analytics/0.1/test/test-analytics-group.js
index 271504b95701..dee4a95520f0 100644
--- a/extensions/amp-analytics/0.1/test/test-analytics-group.js
+++ b/extensions/amp-analytics/0.1/test/test-analytics-group.js
@@ -1,3 +1,6 @@
+import {toggleExperiment} from '#experiments';
+
+import {AnalyticsGroup} from '../analytics-group';
 import {AmpdocAnalyticsRoot} from '../analytics-root';
 import {
   AnalyticsEventType,
@@ -9,8 +12,6 @@ import {
   TimerEventTracker,
   VisibilityTracker,
 } from '../events';
-import {AnalyticsGroup} from '../analytics-group';
-import {toggleExperiment} from '#experiments';
 
 describes.realWin('AnalyticsGroup', {amp: 1}, (env) => {
   let win;
diff --git a/extensions/amp-analytics/0.1/test/test-analytics-root.js b/extensions/amp-analytics/0.1/test/test-analytics-root.js
index 60de6734a797..bb22b87f366f 100644
--- a/extensions/amp-analytics/0.1/test/test-analytics-root.js
+++ b/extensions/amp-analytics/0.1/test/test-analytics-root.js
@@ -1,5 +1,8 @@
-import * as IniLoad from '../../../../src/ini-load';
 import {AmpDocShadow} from '#service/ampdoc-impl';
+
+import {user} from '#utils/log';
+
+import * as IniLoad from '../../../../src/ini-load';
 import {AmpdocAnalyticsRoot, EmbedAnalyticsRoot} from '../analytics-root';
 import {AnalyticsEventType, CustomEventTracker} from '../events';
 import {ScrollManager} from '../scroll-manager';
@@ -7,7 +10,6 @@ import {
   VisibilityManagerForDoc,
   VisibilityManagerForEmbed,
 } from '../visibility-manager';
-import {user} from '#utils/log';
 
 describes.realWin('AmpdocAnalyticsRoot', {amp: 1}, (env) => {
   let win;
diff --git a/extensions/amp-analytics/0.1/test/test-browser-events.js b/extensions/amp-analytics/0.1/test/test-browser-events.js
index 1d153c8ea130..84d5b0f63bad 100644
--- a/extensions/amp-analytics/0.1/test/test-browser-events.js
+++ b/extensions/amp-analytics/0.1/test/test-browser-events.js
@@ -1,11 +1,13 @@
+import {toggleExperiment} from '#experiments';
+
+import {macroTask} from '#testing/helpers';
+
 import {AmpdocAnalyticsRoot} from '../analytics-root';
 import {
   AnalyticsEvent,
   AnalyticsEventType,
   BrowserEventTracker,
 } from '../events';
-import {macroTask} from '#testing/helpers';
-import {toggleExperiment} from '#experiments';
 
 describes.realWin(
   'Events',
diff --git a/extensions/amp-analytics/0.1/test/test-config.js b/extensions/amp-analytics/0.1/test/test-config.js
index d48877238703..df7d45c17cb2 100644
--- a/extensions/amp-analytics/0.1/test/test-config.js
+++ b/extensions/amp-analytics/0.1/test/test-config.js
@@ -1,10 +1,14 @@
-import {AnalyticsConfig, expandConfigRequest, mergeObjects} from '../config';
+import {map} from '#core/types/object';
+
 import {Services} from '#service';
 import {installDocService} from '#service/ampdoc-impl';
-import {map} from '#core/types/object';
-import {stubService} from '#testing/helpers/service';
+
 import {user} from '#utils/log';
 
+import {stubService} from '#testing/helpers/service';
+
+import {AnalyticsConfig, expandConfigRequest, mergeObjects} from '../config';
+
 describes.realWin(
   'AnalyticsConfig',
   {
diff --git a/extensions/amp-analytics/0.1/test/test-cookie-writer.js b/extensions/amp-analytics/0.1/test/test-cookie-writer.js
index 7eab81c6113d..0cc685aaf69d 100644
--- a/extensions/amp-analytics/0.1/test/test-cookie-writer.js
+++ b/extensions/amp-analytics/0.1/test/test-cookie-writer.js
@@ -1,11 +1,12 @@
-import * as cookie from '../../../../src/cookies';
 import * as fakeTimers from '@sinonjs/fake-timers';
+
+import {stubService} from '#testing/helpers/service';
+
+import * as cookie from '../../../../src/cookies';
 import {CookieWriter} from '../cookie-writer';
-import {dict} from '#core/types/object';
 import {installLinkerReaderService} from '../linker-reader';
 import {installSessionServiceForTesting} from '../session-manager';
 import {installVariableServiceForTesting} from '../variables';
-import {stubService} from '#testing/helpers/service';
 
 const TAG = '[amp-analytics/cookie-writer]';
 
@@ -39,7 +40,7 @@ describes.realWin(
       let expandAndWriteSpy;
 
       it('Resolve when no config', () => {
-        const config = dict({});
+        const config = {};
         const cookieWriter = new CookieWriter(win, element, config);
         expandAndWriteSpy = env.sandbox.spy(cookieWriter, 'expandAndWrite_');
         return cookieWriter.write().then(() => {
@@ -48,9 +49,9 @@ describes.realWin(
       });
 
       it('Resovle when config is invalid', () => {
-        const config = dict({
+        const config = {
           'cookies': 'invalid',
-        });
+        };
         expectAsyncConsoleError(TAG + ' cookies config must be an object');
         const cookieWriter = new CookieWriter(win, element, config);
         expandAndWriteSpy = env.sandbox.spy(cookieWriter, 'expandAndWrite_');
@@ -60,13 +61,13 @@ describes.realWin(
       });
 
       it('Resolve when element is in FIE', () => {
-        const config = dict({
+        const config = {
           'cookies': {
             'testId': {
               'value': 'QUERY_PARAM(test)',
             },
           },
-        });
+        };
         const parent = doc.createElement('div');
         parent.classList.add('i-amphtml-fie');
         doc.body.appendChild(parent);
@@ -79,13 +80,13 @@ describes.realWin(
       });
 
       it('Resolve when in viewer', () => {
-        const config = dict({
+        const config = {
           'cookies': {
             'testId': {
               'value': 'QUERY_PARAM(test)',
             },
           },
-        });
+        };
         const mockWin = {
           location: 'https://www-example-com.cdn.ampproject.org',
         };
@@ -101,13 +102,13 @@ describes.realWin(
 
       it('Resolve when in inabox ad', () => {
         env.win.__AMP_MODE.runtime = 'inabox';
-        const config = dict({
+        const config = {
           'cookies': {
             'testId': {
               'value': 'QUERY_PARAM(test)',
             },
           },
-        });
+        };
         const cookieWriter = new CookieWriter(win, element, config);
         expandAndWriteSpy = env.sandbox.spy(cookieWriter, 'expandAndWrite_');
         return cookieWriter.write().then(() => {
@@ -116,14 +117,14 @@ describes.realWin(
       });
 
       it('Resolve when disabled', () => {
-        const config = dict({
+        const config = {
           'cookies': {
             'testId': {
               'value': 'QUERY_PARAM(test)',
             },
             'enabled': false,
           },
-        });
+        };
         const cookieWriter = new CookieWriter(win, element, config);
         expandAndWriteSpy = env.sandbox.spy(cookieWriter, 'expandAndWrite_');
         return cookieWriter.write().then(() => {
@@ -132,9 +133,9 @@ describes.realWin(
       });
 
       it('Resolve with nothing to write', () => {
-        const config = dict({
+        const config = {
           'cookies': {},
-        });
+        };
         const cookieWriter = new CookieWriter(win, element, config);
         expandAndWriteSpy = env.sandbox.spy(cookieWriter, 'expandAndWrite_');
         return cookieWriter.write().then(() => {
@@ -143,11 +144,11 @@ describes.realWin(
       });
 
       it('Resolve with invalid cookieValue (not object)', () => {
-        const config = dict({
+        const config = {
           'cookies': {
             'testId': 'QUERY_PARAM(test)',
           },
-        });
+        };
         expectAsyncConsoleError(
           TAG + ' cookieValue must be configured in an object'
         );
@@ -159,13 +160,13 @@ describes.realWin(
       });
 
       it('Resolve when no value in cookieValue object', () => {
-        const config = dict({
+        const config = {
           'cookies': {
             'testId': {
               'novalue': 'QUERY_PARAM(test)',
             },
           },
-        });
+        };
         expectAsyncConsoleError(
           TAG + ' value is required in the cookieValue object'
         );
@@ -177,13 +178,13 @@ describes.realWin(
       });
 
       it('Ignore reserved keys', () => {
-        const config = dict({
+        const config = {
           'cookies': {
             'cookiePath': {
               'value': 'QUERY_PARAM(test)',
             },
           },
-        });
+        };
         const cookieWriter = new CookieWriter(win, element, config);
         expandAndWriteSpy = env.sandbox.spy(cookieWriter, 'expandAndWrite_');
         return cookieWriter.write().then(() => {
@@ -223,29 +224,25 @@ describes.fakeWin('amp-analytics.cookie-writer value', {amp: true}, (env) => {
       return `${name}-${id}`;
     });
     win.location = 'https://example.test/?a=123&b=567';
-    const cookieWriter = new CookieWriter(
-      win,
-      win.document.body,
-      dict({
-        'cookies': {
-          'aCookie': {
-            'value': 'QUERY_PARAM(a)',
-          },
-          'bCookie': {
-            'value': 'LINKER_PARAM(b,c)',
-          },
-          'testId1': {
-            'value': 'static',
-          },
-          'testId2': {
-            'value': '$SUBSTR(QUERY_PARAM(a),1)-suf',
-          },
-          'testId3': {
-            'value': 'pre-TIMESTAMPQUERY_PARAM(abc)',
-          },
+    const cookieWriter = new CookieWriter(win, win.document.body, {
+      'cookies': {
+        'aCookie': {
+          'value': 'QUERY_PARAM(a)',
+        },
+        'bCookie': {
+          'value': 'LINKER_PARAM(b,c)',
+        },
+        'testId1': {
+          'value': 'static',
+        },
+        'testId2': {
+          'value': '$SUBSTR(QUERY_PARAM(a),1)-suf',
         },
-      })
-    );
+        'testId3': {
+          'value': 'pre-TIMESTAMPQUERY_PARAM(abc)',
+        },
+      },
+    });
     return cookieWriter.write().then(() => {
       const cookies = win.document.cookie.split(';');
       expect(cookies).to.include('aCookie=123');
@@ -258,17 +255,13 @@ describes.fakeWin('amp-analytics.cookie-writer value', {amp: true}, (env) => {
 
   it('should write cookie under eTLD+1 domain with right exp.', () => {
     win.location = 'https://www.example.test/?a=123&b=567';
-    const cookieWriter = new CookieWriter(
-      win,
-      win.document.body,
-      dict({
-        'cookies': {
-          'aCookie': {
-            'value': 'QUERY_PARAM(a)',
-          },
+    const cookieWriter = new CookieWriter(win, win.document.body, {
+      'cookies': {
+        'aCookie': {
+          'value': 'QUERY_PARAM(a)',
         },
-      })
-    );
+      },
+    });
     return cookieWriter.write().then(() => {
       expect(win.document.lastSetCookieRaw).to.equal(
         'aCookie=123; path=/; domain=example.test; ' +
@@ -279,18 +272,14 @@ describes.fakeWin('amp-analytics.cookie-writer value', {amp: true}, (env) => {
 
   it('should write cookie with custom expiration (number value) and default to SameSite=Lax', () => {
     win.location = 'https://www.example.test/';
-    const cookieWriter = new CookieWriter(
-      win,
-      win.document.body,
-      dict({
-        'cookies': {
-          'cookieMaxAge': 604800, // 1 week in seconds
-          'aCookie': {
-            'value': 'testValue',
-          },
+    const cookieWriter = new CookieWriter(win, win.document.body, {
+      'cookies': {
+        'cookieMaxAge': 604800, // 1 week in seconds
+        'aCookie': {
+          'value': 'testValue',
         },
-      })
-    );
+      },
+    });
     return cookieWriter.write().then(() => {
       expect(win.document.lastSetCookieRaw).to.equal(
         'aCookie=testValue; path=/; domain=example.test; ' +
@@ -301,19 +290,15 @@ describes.fakeWin('amp-analytics.cookie-writer value', {amp: true}, (env) => {
 
   it('should write cookie with the specified sameSite (lowercase S) value', () => {
     win.location = 'https://www.example.test/';
-    const cookieWriter = new CookieWriter(
-      win,
-      win.document.body,
-      dict({
-        'cookies': {
-          'cookieMaxAge': 604800, // 1 week in seconds
-          'sameSite': 'Lax',
-          'aCookie': {
-            'value': '123',
-          },
+    const cookieWriter = new CookieWriter(win, win.document.body, {
+      'cookies': {
+        'cookieMaxAge': 604800, // 1 week in seconds
+        'sameSite': 'Lax',
+        'aCookie': {
+          'value': '123',
         },
-      })
-    );
+      },
+    });
     return cookieWriter.write().then(() => {
       expect(win.document.lastSetCookieRaw).to.equal(
         'aCookie=123; path=/; domain=example.test; ' +
@@ -324,19 +309,15 @@ describes.fakeWin('amp-analytics.cookie-writer value', {amp: true}, (env) => {
 
   it('should write cookie with the specified SameSite (capital S) value', () => {
     win.location = 'https://www.example.test/';
-    const cookieWriter = new CookieWriter(
-      win,
-      win.document.body,
-      dict({
-        'cookies': {
-          'cookieMaxAge': 604800, // 1 week in seconds
-          'SameSite': 'Strict',
-          'aCookie': {
-            'value': '123',
-          },
+    const cookieWriter = new CookieWriter(win, win.document.body, {
+      'cookies': {
+        'cookieMaxAge': 604800, // 1 week in seconds
+        'SameSite': 'Strict',
+        'aCookie': {
+          'value': '123',
         },
-      })
-    );
+      },
+    });
     return cookieWriter.write().then(() => {
       expect(win.document.lastSetCookieRaw).to.equal(
         'aCookie=123; path=/; domain=example.test; ' +
@@ -347,20 +328,16 @@ describes.fakeWin('amp-analytics.cookie-writer value', {amp: true}, (env) => {
 
   it('should override the sameSite value', () => {
     win.location = 'https://www.example.test/';
-    const cookieWriter = new CookieWriter(
-      win,
-      win.document.body,
-      dict({
-        'cookies': {
-          'cookieMaxAge': 604800, // 1 week in seconds
-          'sameSite': 'Lax',
-          'aCookie': {
-            'value': '123',
-            'sameSite': 'Strict',
-          },
+    const cookieWriter = new CookieWriter(win, win.document.body, {
+      'cookies': {
+        'cookieMaxAge': 604800, // 1 week in seconds
+        'sameSite': 'Lax',
+        'aCookie': {
+          'value': '123',
+          'sameSite': 'Strict',
         },
-      })
-    );
+      },
+    });
     return cookieWriter.write().then(() => {
       expect(win.document.lastSetCookieRaw).to.equal(
         'aCookie=123; path=/; domain=example.test; ' +
@@ -371,19 +348,15 @@ describes.fakeWin('amp-analytics.cookie-writer value', {amp: true}, (env) => {
 
   it('should append Secure for when sameSite value is "None"', () => {
     win.location = 'https://www.example.test/';
-    const cookieWriter = new CookieWriter(
-      win,
-      win.document.body,
-      dict({
-        'cookies': {
-          'cookieMaxAge': 604800, // 1 week in seconds
-          'aCookie': {
-            'value': 'testValue',
-            'sameSite': 'None',
-          },
+    const cookieWriter = new CookieWriter(win, win.document.body, {
+      'cookies': {
+        'cookieMaxAge': 604800, // 1 week in seconds
+        'aCookie': {
+          'value': 'testValue',
+          'sameSite': 'None',
         },
-      })
-    );
+      },
+    });
     return cookieWriter.write().then(() => {
       expect(win.document.lastSetCookieRaw).to.equal(
         'aCookie=testValue; path=/; domain=example.test; ' +
@@ -394,18 +367,14 @@ describes.fakeWin('amp-analytics.cookie-writer value', {amp: true}, (env) => {
 
   it('should write cookie with custom expiration (string value)', () => {
     win.location = 'https://www.example.test/';
-    const cookieWriter = new CookieWriter(
-      win,
-      win.document.body,
-      dict({
-        'cookies': {
-          'cookieMaxAge': '604800', // 1 week in seconds
-          'aCookie': {
-            'value': 'testValue',
-          },
+    const cookieWriter = new CookieWriter(win, win.document.body, {
+      'cookies': {
+        'cookieMaxAge': '604800', // 1 week in seconds
+        'aCookie': {
+          'value': 'testValue',
         },
-      })
-    );
+      },
+    });
     return cookieWriter.write().then(() => {
       expect(win.document.lastSetCookieRaw).to.equal(
         'aCookie=testValue; path=/; domain=example.test; ' +
@@ -416,18 +385,14 @@ describes.fakeWin('amp-analytics.cookie-writer value', {amp: true}, (env) => {
 
   it('should write cookie with custom expiration (decimal value)', () => {
     win.location = 'https://www.example.test/';
-    const cookieWriter = new CookieWriter(
-      win,
-      win.document.body,
-      dict({
-        'cookies': {
-          'cookieMaxAge': 604800.000123,
-          'aCookie': {
-            'value': 'testValue',
-          },
+    const cookieWriter = new CookieWriter(win, win.document.body, {
+      'cookies': {
+        'cookieMaxAge': 604800.000123,
+        'aCookie': {
+          'value': 'testValue',
         },
-      })
-    );
+      },
+    });
 
     return cookieWriter.write().then(() => {
       expect(win.document.lastSetCookieRaw).to.equal(
@@ -439,18 +404,14 @@ describes.fakeWin('amp-analytics.cookie-writer value', {amp: true}, (env) => {
 
   it('should write cookie with custom expiration (zero value)', () => {
     win.location = 'https://www.example.test/';
-    const cookieWriter = new CookieWriter(
-      win,
-      win.document.body,
-      dict({
-        'cookies': {
-          'cookieMaxAge': 0,
-          'aCookie': {
-            'value': 'testValue',
-          },
+    const cookieWriter = new CookieWriter(win, win.document.body, {
+      'cookies': {
+        'cookieMaxAge': 0,
+        'aCookie': {
+          'value': 'testValue',
         },
-      })
-    );
+      },
+    });
     return cookieWriter.write().then(() => {
       expect(win.document.lastSetCookieRaw).to.equal(
         'aCookie=testValue; path=/; domain=example.test; ' +
@@ -461,18 +422,14 @@ describes.fakeWin('amp-analytics.cookie-writer value', {amp: true}, (env) => {
 
   it('should write cookie with custom expiration (negative value)', () => {
     win.location = 'https://www.example.test/';
-    const cookieWriter = new CookieWriter(
-      win,
-      win.document.body,
-      dict({
-        'cookies': {
-          'cookieMaxAge': -604800,
-          'aCookie': {
-            'value': 'testValue',
-          },
+    const cookieWriter = new CookieWriter(win, win.document.body, {
+      'cookies': {
+        'cookieMaxAge': -604800,
+        'aCookie': {
+          'value': 'testValue',
         },
-      })
-    );
+      },
+    });
     return cookieWriter.write().then(() => {
       expect(win.document.lastSetCookieRaw).to.equal(
         'aCookie=testValue; path=/; domain=example.test; ' +
@@ -483,18 +440,14 @@ describes.fakeWin('amp-analytics.cookie-writer value', {amp: true}, (env) => {
 
   it('should write cookie with default expiration (invalid string value)', () => {
     win.location = 'https://www.example.test/';
-    const cookieWriter = new CookieWriter(
-      win,
-      win.document.body,
-      dict({
-        'cookies': {
-          'cookieMaxAge': 'invalid',
-          'aCookie': {
-            'value': 'testValue',
-          },
+    const cookieWriter = new CookieWriter(win, win.document.body, {
+      'cookies': {
+        'cookieMaxAge': 'invalid',
+        'aCookie': {
+          'value': 'testValue',
         },
-      })
-    );
+      },
+    });
     return allowConsoleError(() => {
       return cookieWriter.write().then(() => {
         expect(win.document.lastSetCookieRaw).to.equal(
@@ -507,17 +460,13 @@ describes.fakeWin('amp-analytics.cookie-writer value', {amp: true}, (env) => {
 
   it('should not write empty cookie', () => {
     win.location = 'https://www.example.test/?a=123&b=567';
-    const cookieWriter = new CookieWriter(
-      win,
-      win.document.body,
-      dict({
-        'cookies': {
-          'cCookie': {
-            'value': 'QUERY_PARAM(c)',
-          },
+    const cookieWriter = new CookieWriter(win, win.document.body, {
+      'cookies': {
+        'cCookie': {
+          'value': 'QUERY_PARAM(c)',
         },
-      })
-    );
+      },
+    });
     return cookieWriter.write().then(() => {
       expect(win.document.cookie).to.equal('');
       expect(win.document.lastSetCookieRaw).to.be.undefined;
@@ -526,17 +475,13 @@ describes.fakeWin('amp-analytics.cookie-writer value', {amp: true}, (env) => {
 
   it('should not write cookie if macro is mal-formatted', () => {
     win.location = 'https://www.example.test/?a=123&b=567';
-    const cookieWriter = new CookieWriter(
-      win,
-      win.document.body,
-      dict({
-        'cookies': {
-          'aCookie': {
-            'value': 'LINKER_PARAM(b)',
-          },
+    const cookieWriter = new CookieWriter(win, win.document.body, {
+      'cookies': {
+        'aCookie': {
+          'value': 'LINKER_PARAM(b)',
         },
-      })
-    );
+      },
+    });
     expectAsyncConsoleError(/LINKER_PARAM requires two params, name and id/);
     return cookieWriter.write().then(() => {
       expect(win.document.cookie).to.equal('');
diff --git a/extensions/amp-analytics/0.1/test/test-events.js b/extensions/amp-analytics/0.1/test/test-events.js
index 9547b3f9fad7..125147bc3cf3 100644
--- a/extensions/amp-analytics/0.1/test/test-events.js
+++ b/extensions/amp-analytics/0.1/test/test-events.js
@@ -1,4 +1,11 @@
 import * as fakeTimers from '@sinonjs/fake-timers';
+
+import {Deferred} from '#core/data-structures/promise';
+import {Signals} from '#core/data-structures/signals';
+
+import {macroTask} from '#testing/helpers';
+
+import {AmpdocAnalyticsRoot} from '../analytics-root';
 import {
   AmpStoryEventTracker,
   AnalyticsEvent,
@@ -12,10 +19,6 @@ import {
   VisibilityTracker,
   trackerTypeForTesting,
 } from '../events';
-import {AmpdocAnalyticsRoot} from '../analytics-root';
-import {Deferred} from '#core/data-structures/promise';
-import {Signals} from '#core/data-structures/signals';
-import {macroTask} from '#testing/helpers';
 
 describes.realWin('Events', {amp: 1}, (env) => {
   let win;
@@ -1391,7 +1394,8 @@ describes.realWin('Events', {amp: 1}, (env) => {
       });
     });
 
-    it(
+    // TODO(#39879): fix this flaky test.
+    it.skip(
       'timers started and stopped by the same event on the same target' +
         ' do not have race condition problems',
       () => {
diff --git a/extensions/amp-analytics/0.1/test/test-iframe-transport-client.js b/extensions/amp-analytics/0.1/test/test-iframe-transport-client.js
index d9d687be1150..fccdfa6b6fa6 100644
--- a/extensions/amp-analytics/0.1/test/test-iframe-transport-client.js
+++ b/extensions/amp-analytics/0.1/test/test-iframe-transport-client.js
@@ -2,7 +2,9 @@ import {
   IframeTransportClient,
   IframeTransportContext,
 } from '#3p/iframe-transport-client';
-import {MessageType} from '#core/3p-frame-messaging';
+
+import {MessageType_Enum} from '#core/3p-frame-messaging';
+
 import {adopt} from '../../../../src/runtime';
 
 adopt(window);
@@ -87,7 +89,7 @@ describes.sandboxed('iframe-transport-client', {}, (env) => {
       expect(event).to.equal('hello, world!');
     };
     send(
-      MessageType.IFRAME_TRANSPORT_EVENTS,
+      MessageType_Enum.IFRAME_TRANSPORT_EVENTS,
       /** @type {!JsonObject} */ ({
         events: [{creativeId: '101', message: 'hello, world!'}],
       })
@@ -175,7 +177,7 @@ describes.sandboxed('iframe-transport-client', {}, (env) => {
     );
     const response = {foo: 'bar', answer: '42'};
     env.sandbox.stub(imc, 'sendMessage').callsFake((type, opt_payload) => {
-      expect(type).to.equal(MessageType.IFRAME_TRANSPORT_RESPONSE);
+      expect(type).to.equal(MessageType_Enum.IFRAME_TRANSPORT_RESPONSE);
       expect(opt_payload).to.not.be.null;
       expect(opt_payload.creativeId).to.equal('my_creative');
       expect(opt_payload.vendor).to.equal('my_vendor');
diff --git a/extensions/amp-analytics/0.1/test/test-iframe-transport-message-queue.js b/extensions/amp-analytics/0.1/test/test-iframe-transport-message-queue.js
index 3e4c69a21c26..2ad5c547693a 100644
--- a/extensions/amp-analytics/0.1/test/test-iframe-transport-message-queue.js
+++ b/extensions/amp-analytics/0.1/test/test-iframe-transport-message-queue.js
@@ -1,6 +1,7 @@
-import {IframeTransportMessageQueue} from '../iframe-transport-message-queue';
 import {createElementWithAttributes} from '#core/dom';
 
+import {IframeTransportMessageQueue} from '../iframe-transport-message-queue';
+
 describes.realWin(
   'amp-analytics.iframe-transport-message-queue',
   {amp: true},
diff --git a/extensions/amp-analytics/0.1/test/test-iframe-transport.js b/extensions/amp-analytics/0.1/test/test-iframe-transport.js
index 203cc23a80ab..5a643777b82d 100644
--- a/extensions/amp-analytics/0.1/test/test-iframe-transport.js
+++ b/extensions/amp-analytics/0.1/test/test-iframe-transport.js
@@ -1,11 +1,13 @@
+import {user} from '#utils/log';
+
+import {expectPostMessage} from '#testing/iframe';
+
+import * as urls from '../../../../src/config/urls';
+import {addParamsToUrl} from '../../../../src/url';
 import {
   IframeTransport,
   getIframeTransportScriptUrlForTesting,
 } from '../iframe-transport';
-import {addParamsToUrl} from '../../../../src/url';
-import {expectPostMessage} from '#testing/iframe';
-import {urls} from '../../../../src/config';
-import {user} from '#utils/log';
 
 describes.realWin('amp-analytics.iframe-transport', {amp: true}, (env) => {
   let iframeTransport;
@@ -176,7 +178,8 @@ describes.realWin(
   'amp-analytics.iframe-transport',
   {amp: true, allowExternalResources: true},
   (env) => {
-    it('logs poor performance of vendor iframe', () => {
+    // TODO(#40214): fix flaky test.
+    it.skip('logs poor performance of vendor iframe', () => {
       const body =
         '<html><head><script>' +
         'function busyWait(count, duration, cb) {\n' +
diff --git a/extensions/amp-analytics/0.1/test/test-linker-manager.js b/extensions/amp-analytics/0.1/test/test-linker-manager.js
index 68bba7908b4c..9dba2718e646 100644
--- a/extensions/amp-analytics/0.1/test/test-linker-manager.js
+++ b/extensions/amp-analytics/0.1/test/test-linker-manager.js
@@ -1,18 +1,20 @@
+import {Services} from '#service';
+import {Priority_Enum} from '#service/navigation';
+
+import {mockWindowInterface} from '#testing/helpers/service';
+
 import * as Cookies from '../../../../src/cookies';
 import {
   LinkerManager,
   areFriendlyDomains,
   isWildCardMatch,
 } from '../linker-manager';
-import {Priority} from '#service/navigation';
-import {Services} from '#service';
 import {
   installLinkerReaderService,
   linkerReaderServiceFor,
 } from '../linker-reader';
 import {installSessionServiceForTesting} from '../session-manager';
 import {installVariableServiceForTesting} from '../variables';
-import {mockWindowInterface} from '#testing/helpers/service';
 
 // TODO(ccordry): Refactor all these tests with async/await.
 describes.realWin('Linker Manager', {amp: true}, (env) => {
@@ -48,12 +50,12 @@ describes.realWin('Linker Manager', {amp: true}, (env) => {
     navigateToHandlers = [];
     env.sandbox.stub(Services, 'navigationForDoc').returns({
       registerAnchorMutator: (callback, priority) => {
-        if (priority === Priority.ANALYTICS_LINKER) {
+        if (priority === Priority_Enum.ANALYTICS_LINKER) {
           anchorClickHandlers.push(callback);
         }
       },
       registerNavigateToMutator: (callback, priority) => {
-        if (priority === Priority.ANALYTICS_LINKER) {
+        if (priority === Priority_Enum.ANALYTICS_LINKER) {
           navigateToHandlers.push(callback);
         }
       },
diff --git a/extensions/amp-analytics/0.1/test/test-linker-reader.js b/extensions/amp-analytics/0.1/test/test-linker-reader.js
index 6057b4615fe7..6865077a1d85 100644
--- a/extensions/amp-analytics/0.1/test/test-linker-reader.js
+++ b/extensions/amp-analytics/0.1/test/test-linker-reader.js
@@ -1,8 +1,9 @@
+import {mockWindowInterface} from '#testing/helpers/service';
+
 import {
   installLinkerReaderService,
   linkerReaderServiceFor,
 } from '../linker-reader';
-import {mockWindowInterface} from '#testing/helpers/service';
 
 describes.sandboxed('LinkerReader', {}, (env) => {
   let linkerReader;
diff --git a/extensions/amp-analytics/0.1/test/test-linker.js b/extensions/amp-analytics/0.1/test/test-linker.js
index 6bca8fad17cc..6f53be93cbec 100644
--- a/extensions/amp-analytics/0.1/test/test-linker.js
+++ b/extensions/amp-analytics/0.1/test/test-linker.js
@@ -1,6 +1,7 @@
-import {createLinker, parseLinker} from '../linker';
 import {mockWindowInterface} from '#testing/helpers/service';
 
+import {createLinker, parseLinker} from '../linker';
+
 const TAG = '[amp-analytics/linker]';
 
 const BASE_TIME = 1533329483292;
diff --git a/extensions/amp-analytics/0.1/test/test-requests.js b/extensions/amp-analytics/0.1/test/test-requests.js
index e66f2eaa3191..78328d9ee99d 100644
--- a/extensions/amp-analytics/0.1/test/test-requests.js
+++ b/extensions/amp-analytics/0.1/test/test-requests.js
@@ -1,12 +1,16 @@
-import * as ResourceTiming from '../resource-timing';
 import * as fakeTimers from '@sinonjs/fake-timers';
-import * as log from '#utils/log';
-import {ExpansionOptions, installVariableServiceForTesting} from '../variables';
-import {RequestHandler, expandPostMessage} from '../requests';
+
 import {Services} from '#service';
+
+import * as log from '#utils/log';
+
+import {macroTask} from '#testing/helpers';
+
 import {installLinkerReaderService} from '../linker-reader';
+import {RequestHandler, expandPostMessage} from '../requests';
+import * as ResourceTiming from '../resource-timing';
 import {installSessionServiceForTesting} from '../session-manager';
-import {macroTask} from '#testing/helpers';
+import {ExpansionOptions, installVariableServiceForTesting} from '../variables';
 
 describes.realWin('Requests', {amp: 1}, (env) => {
   let ampdoc;
diff --git a/extensions/amp-analytics/0.1/test/test-resource-timing.js b/extensions/amp-analytics/0.1/test/test-resource-timing.js
index 78e065a03320..3ca41029c579 100644
--- a/extensions/amp-analytics/0.1/test/test-resource-timing.js
+++ b/extensions/amp-analytics/0.1/test/test-resource-timing.js
@@ -1,5 +1,5 @@
-import {getResourceTiming} from '../resource-timing';
 import {installLinkerReaderService} from '../linker-reader';
+import {getResourceTiming} from '../resource-timing';
 import {installSessionServiceForTesting} from '../session-manager';
 import {installVariableServiceForTesting} from '../variables';
 
diff --git a/extensions/amp-analytics/0.1/test/test-session-manager.js b/extensions/amp-analytics/0.1/test/test-session-manager.js
index 874c119d61da..cb8890e87cd2 100644
--- a/extensions/amp-analytics/0.1/test/test-session-manager.js
+++ b/extensions/amp-analytics/0.1/test/test-session-manager.js
@@ -1,18 +1,21 @@
+import {expect} from 'chai';
+
+import {VisibilityState_Enum} from '#core/constants/visibility-state';
+
 import * as Listen from '#utils/event-helper';
+import {user} from '#utils/log';
+
+import {
+  registerServiceBuilder,
+  resetServiceForTesting,
+} from '../../../../src/service-helpers';
 import {
   SESSION_MAX_AGE_MILLIS,
   SESSION_VALUES,
   SessionManager,
   installSessionServiceForTesting,
 } from '../session-manager';
-import {VisibilityState} from '#core/constants/visibility-state';
-import {expect} from 'chai';
 import {installVariableServiceForTesting} from '../variables';
-import {
-  registerServiceBuilder,
-  resetServiceForTesting,
-} from '../../../../src/service-helpers';
-import {user} from '#utils/log';
 
 describes.realWin('Session Manager', {amp: true}, (env) => {
   let win;
@@ -453,12 +456,12 @@ describes.realWin('Session Manager', {amp: true}, (env) => {
         env.sandbox.defineProperty(win.document, 'hidden', {
           value: true,
         });
-        env.ampdoc.overrideVisibilityState(VisibilityState.HIDDEN);
+        env.ampdoc.overrideVisibilityState(VisibilityState_Enum.HIDDEN);
         expect(sessionManager.isVisible_).to.be.false;
         env.sandbox.defineProperty(win.document, 'hidden', {
           value: false,
         });
-        env.ampdoc.overrideVisibilityState(VisibilityState.VISIBLE);
+        env.ampdoc.overrideVisibilityState(VisibilityState_Enum.VISIBLE);
         expect(sessionManager.isVisible_).to.be.true;
 
         expect(updateEngagedSpy.callCount).to.equal(6);
@@ -538,7 +541,7 @@ describes.realWin('Session Manager', {amp: true}, (env) => {
         env.sandbox.defineProperty(win.document, 'hidden', {
           value: true,
         });
-        env.ampdoc.overrideVisibilityState(VisibilityState.HIDDEN);
+        env.ampdoc.overrideVisibilityState(VisibilityState_Enum.HIDDEN);
         session[SESSION_VALUES.ENGAGED] = false;
 
         expect(storageSetSpy).to.be.calledOnce;
@@ -550,7 +553,7 @@ describes.realWin('Session Manager', {amp: true}, (env) => {
         env.sandbox.defineProperty(win.document, 'hidden', {
           value: false,
         });
-        env.ampdoc.overrideVisibilityState(VisibilityState.VISIBLE);
+        env.ampdoc.overrideVisibilityState(VisibilityState_Enum.VISIBLE);
         session[SESSION_VALUES.ENGAGED] = true;
 
         expect(storageSetSpy).to.be.calledOnce;
@@ -595,7 +598,7 @@ describes.realWin('Session Manager', {amp: true}, (env) => {
         env.sandbox.defineProperty(win.document, 'hidden', {
           value: true,
         });
-        env.ampdoc.overrideVisibilityState(VisibilityState.HIDDEN);
+        env.ampdoc.overrideVisibilityState(VisibilityState_Enum.HIDDEN);
         expect(sessionManager.isVisible_).to.be.false;
 
         // Uses the `true` engaged value
@@ -632,7 +635,7 @@ describes.realWin('Session Manager', {amp: true}, (env) => {
         env.sandbox.defineProperty(win.document, 'hidden', {
           value: true,
         });
-        env.ampdoc.overrideVisibilityState(VisibilityState.HIDDEN);
+        env.ampdoc.overrideVisibilityState(VisibilityState_Enum.HIDDEN);
         expect(sessionManager.isVisible_).to.be.false;
 
         const persistedSession = await sessionManager.get(vendorType);
@@ -666,7 +669,7 @@ describes.realWin('Session Manager', {amp: true}, (env) => {
         env.sandbox.defineProperty(win.document, 'hidden', {
           value: true,
         });
-        env.ampdoc.overrideVisibilityState(VisibilityState.HIDDEN);
+        env.ampdoc.overrideVisibilityState(VisibilityState_Enum.HIDDEN);
 
         const engaged = await sessionManager.getSessionValue(
           vendorType,
diff --git a/extensions/amp-analytics/0.1/test/test-transport-serializers.js b/extensions/amp-analytics/0.1/test/test-transport-serializers.js
index dee73a8814a1..2c1a067e554a 100644
--- a/extensions/amp-analytics/0.1/test/test-transport-serializers.js
+++ b/extensions/amp-analytics/0.1/test/test-transport-serializers.js
@@ -1,7 +1,7 @@
-import {TransportSerializers} from '../transport-serializer';
-import {dict} from '#core/types/object';
 import {isArray} from '#core/types';
 
+import {TransportSerializers} from '../transport-serializer';
+
 /**
  * Please add your custom test data here in alphabetic order.
  * Test data should be an object like
@@ -114,11 +114,11 @@ describes.sandboxed('Transport serializers', {}, () => {
       });
 
       it('should handler extraUrlParams with value null', () => {
-        const batchSegment = dict({
+        const batchSegment = {
           'trigger': 'click',
           'timestamp': 0,
           'extraUrlParams': null,
-        });
+        };
         try {
           const output = serializer.generateBatchRequest('base', [
             batchSegment,
@@ -130,11 +130,11 @@ describes.sandboxed('Transport serializers', {}, () => {
       });
 
       it('should properly encode segments', () => {
-        const batchSegment = dict({
+        const batchSegment = {
           'trigger': 'click',
           'timestamp': 0,
           'extraUrlParams': '12?3',
-        });
+        };
         try {
           const output = serializer.generateBatchRequest('base', [
             batchSegment,
@@ -146,11 +146,11 @@ describes.sandboxed('Transport serializers', {}, () => {
       });
 
       it('should return a string', () => {
-        const batchSegment = dict({
+        const batchSegment = {
           'trigger': 'click',
           'timestamp': 0,
           'extraUrlParams': '123',
-        });
+        };
         try {
           const output = serializer.generateBatchRequest('base', [
             batchSegment,
diff --git a/extensions/amp-analytics/0.1/test/test-transport.js b/extensions/amp-analytics/0.1/test/test-transport.js
index 7a65fe931877..470094b9d7b5 100644
--- a/extensions/amp-analytics/0.1/test/test-transport.js
+++ b/extensions/amp-analytics/0.1/test/test-transport.js
@@ -1,15 +1,21 @@
 import * as fakeTimers from '@sinonjs/fake-timers';
-import {AmpScriptService} from '../../../amp-script/0.1/amp-script';
+
+import {Services} from '#service';
+import {installDocService} from '#service/ampdoc-impl';
+import {installTimerService} from '#service/timer-impl';
+
+import {loadPromise} from '#utils/event-helper';
+
 import {
   ImagePixelVerifier,
   mockWindowInterface,
 } from '#testing/helpers/service';
-import {Services} from '#service';
-import {Transport} from '../transport';
+
+import * as privacySandboxUtils from 'src/utils/privacy-sandbox-utils';
+
 import {getMode} from '../../../../src/mode';
-import {installDocService} from '#service/ampdoc-impl';
-import {installTimerService} from '#service/timer-impl';
-import {loadPromise} from '#utils/event-helper';
+import {AmpScriptService} from '../../../amp-script/0.1/amp-script';
+import {Transport} from '../transport';
 
 describes.realWin(
   'amp-analytics.transport',
@@ -34,6 +40,8 @@ describes.realWin(
       sendXhrStub = env.sandbox.stub();
       sendBeaconStub = env.sandbox.stub();
 
+      env.sandbox.spy(Services, 'urlReplacementsForDoc');
+
       // Needed for PreconnectService.
       installDocService(win, true);
     });
@@ -97,6 +105,44 @@ describes.realWin(
       expectImagePixel('https://example.test/test', 'no-referrer');
     });
 
+    it('carries attributionSrc over to image pixel', () => {
+      setupStubs(true, true);
+      env.sandbox
+        .stub(privacySandboxUtils, 'isAttributionReportingAllowed')
+        .returns(true);
+      sendRequest(win, 'https://example.test/test', {
+        beacon: true,
+        xhrpost: true,
+        image: true,
+        referrerPolicy: 'no-referrer',
+        attributionsrc: 'https://example.test/attributionsrc',
+      });
+      expectNoBeacon();
+      expectNoXhr();
+      expectImagePixel(
+        'https://example.test/test',
+        'no-referrer',
+        'https://example.test/attributionsrc'
+      );
+    });
+
+    it('carries empty attributionSrc over to image pixel', () => {
+      setupStubs(true, true);
+      env.sandbox
+        .stub(privacySandboxUtils, 'isAttributionReportingAllowed')
+        .returns(true);
+      sendRequest(win, 'https://example.test/test', {
+        beacon: true,
+        xhrpost: true,
+        image: true,
+        referrerPolicy: 'no-referrer',
+        attributionsrc: '',
+      });
+      expectNoBeacon();
+      expectNoXhr();
+      expectImagePixel('https://example.test/test', 'no-referrer', '');
+    });
+
     it('falls back to xhrpost when enabled and beacon is not available', () => {
       setupStubs(false, true);
       sendRequest(win, 'https://example.test/test', {
@@ -532,8 +578,9 @@ describes.realWin(
       expect(sendXhrStub).to.not.be.called;
     }
 
-    function expectImagePixel(url, referrerPolicy) {
-      imagePixelVerifier.verifyRequest(url, referrerPolicy);
+    function expectImagePixel(url, referrerPolicy, attributionSrc) {
+      imagePixelVerifier.verifyRequest(url, referrerPolicy, attributionSrc);
+      expect(Services.urlReplacementsForDoc).to.be.calledWith(ampdoc);
     }
 
     function expectNoImagePixel() {
diff --git a/extensions/amp-analytics/0.1/test/test-variables.js b/extensions/amp-analytics/0.1/test/test-variables.js
index 5dd44587533a..bebd262d25a1 100644
--- a/extensions/amp-analytics/0.1/test/test-variables.js
+++ b/extensions/amp-analytics/0.1/test/test-variables.js
@@ -1,3 +1,12 @@
+import {forceExperimentBranch} from '#experiments';
+
+import {Services} from '#service';
+
+import {
+  installLinkerReaderService,
+  linkerReaderServiceFor,
+} from '../linker-reader';
+import {installSessionServiceForTesting} from '../session-manager';
 import {
   ExpansionOptions,
   VariableService,
@@ -6,13 +15,6 @@ import {
   installVariableServiceForTesting,
   variableServiceForDoc,
 } from '../variables';
-import {Services} from '#service';
-import {forceExperimentBranch} from '#experiments';
-import {
-  installLinkerReaderService,
-  linkerReaderServiceFor,
-} from '../linker-reader';
-import {installSessionServiceForTesting} from '../session-manager';
 
 describes.fakeWin('amp-analytics.VariableService', {amp: true}, (env) => {
   let fakeElement;
@@ -97,10 +99,10 @@ describes.fakeWin('amp-analytics.VariableService', {amp: true}, (env) => {
     });
 
     it('does not handle nested macros using ${} syntax', () => {
-      // VariableService.expandTemplate's regex cannot parse nested ${}.
-      return check('${a${b}}', '}', {
-        'a': 'TIMESTAMP',
-        'b': 'TIMESTAMP',
+      // VariableService.expandTemplate's regex cannot parse outer ${}.
+      return check('${a${b}}', '${atwo}', {
+        'a': 'one',
+        'b': 'two',
       });
     });
 
diff --git a/extensions/amp-analytics/0.1/test/test-vendors.js b/extensions/amp-analytics/0.1/test/test-vendors.js
index c093e22e9a75..5cc9225c0e92 100644
--- a/extensions/amp-analytics/0.1/test/test-vendors.js
+++ b/extensions/amp-analytics/0.1/test/test-vendors.js
@@ -1,16 +1,20 @@
-import {AmpAnalytics} from '../amp-analytics';
-import {AnalyticsConfig} from '../config';
-import {ExpansionOptions, variableServiceForDoc} from '../variables';
-import {IFRAME_TRANSPORTS} from '../iframe-transport-vendors';
+import {hasOwn} from '#core/types/object';
+
+import {Services} from '#service';
+
+import {macroTask} from '#testing/helpers';
 import {
   ImagePixelVerifier,
   mockWindowInterface,
 } from '#testing/helpers/service';
-import {Services} from '#service';
-import {hasOwn} from '#core/types/object';
-import {macroTask} from '#testing/helpers';
+
 import VENDOR_REQUESTS from './vendor-requests.json' assert {type: 'json'}; // lgtm[js/syntax-error]
 
+import {AmpAnalytics} from '../amp-analytics';
+import {AnalyticsConfig} from '../config';
+import {IFRAME_TRANSPORTS} from '../iframe-transport-vendors';
+import {ExpansionOptions, variableServiceForDoc} from '../variables';
+
 describes.realWin(
   'amp-analytics',
   {
diff --git a/extensions/amp-analytics/0.1/test/test-video-analytics.js b/extensions/amp-analytics/0.1/test/test-video-analytics.js
index 66e3adc71c79..62dd12458847 100644
--- a/extensions/amp-analytics/0.1/test/test-video-analytics.js
+++ b/extensions/amp-analytics/0.1/test/test-video-analytics.js
@@ -1,7 +1,9 @@
+import {macroTask} from '#testing/helpers';
+
+import {dispatchCustomEvent} from 'src/core/dom/index';
+
 import {AmpdocAnalyticsRoot} from '../analytics-root';
 import {AnalyticsEvent, AnalyticsEventType, VideoEventTracker} from '../events';
-import {dispatchCustomEvent} from 'src/core/dom/index';
-import {macroTask} from '#testing/helpers';
 
 describes.realWin(
   'Events',
diff --git a/extensions/amp-analytics/0.1/test/test-visibility-manager.js b/extensions/amp-analytics/0.1/test/test-visibility-manager.js
index 3d73fc43301c..bd185ca188d0 100644
--- a/extensions/amp-analytics/0.1/test/test-visibility-manager.js
+++ b/extensions/amp-analytics/0.1/test/test-visibility-manager.js
@@ -1,13 +1,15 @@
-import {FIE_EMBED_PROP} from '../../../../src/iframe-helper';
+import {VisibilityState_Enum} from '#core/constants/visibility-state';
+import {layoutRectLtwh, rectIntersection} from '#core/dom/layout/rect';
+
 import {Services} from '#service';
+
+import {FIE_EMBED_PROP} from '../../../../src/iframe-helper';
+import {setParentWindow} from '../../../../src/service-helpers';
 import {
   VisibilityManagerForDoc,
   VisibilityManagerForEmbed,
   provideVisibilityManager,
 } from '../visibility-manager';
-import {VisibilityState} from '#core/constants/visibility-state';
-import {layoutRectLtwh, rectIntersection} from '#core/dom/layout/rect';
-import {setParentWindow} from '../../../../src/service-helpers';
 
 class IntersectionObserverStub {
   constructor(callback, options) {
@@ -81,7 +83,7 @@ describes.fakeWin('VisibilityManagerForDoc', {amp: true}, (env) => {
   }
 
   it('should initialize correctly backgrounded', () => {
-    viewer.setVisibilityState_(VisibilityState.HIDDEN);
+    viewer.setVisibilityState_(VisibilityState_Enum.HIDDEN);
     root = new VisibilityManagerForDoc(ampdoc);
 
     expect(root.parent).to.be.null;
@@ -154,15 +156,20 @@ describes.fakeWin('VisibilityManagerForDoc', {amp: true}, (env) => {
     expect(root.getRootVisibility()).to.equal(1);
 
     // Go prerender.
-    viewer.setVisibilityState_(VisibilityState.PRERENDER);
+    viewer.setVisibilityState_(VisibilityState_Enum.PRERENDER);
+    expect(root.getRootVisibility()).to.equal(0);
+
+    // Go preview. Not considered visible for the purposes of analytics
+    // (privacy-preserving).
+    viewer.setVisibilityState_(VisibilityState_Enum.PREVIEW);
     expect(root.getRootVisibility()).to.equal(0);
 
     // Go hidden.
-    viewer.setVisibilityState_(VisibilityState.HIDDEN);
+    viewer.setVisibilityState_(VisibilityState_Enum.HIDDEN);
     expect(root.getRootVisibility()).to.equal(0);
 
     // Go visible.
-    viewer.setVisibilityState_(VisibilityState.VISIBLE);
+    viewer.setVisibilityState_(VisibilityState_Enum.VISIBLE);
     expect(root.getRootVisibility()).to.equal(1);
     expect(root.getStartTime()).to.equal(ampdoc.getFirstVisibleTime());
   });
@@ -752,9 +759,7 @@ describes.fakeWin('VisibilityManagerForDoc', {amp: true}, (env) => {
       });
   });
 
-  // TODO(micajuineho): Figure why out why `state.totalVisibleTime`
-  // is returning 17.
-  it.skip('should listen on a resource', () => {
+  it('should listen on a resource', () => {
     clock.tick(1);
     const target = win.document.createElement('div');
     target.id = 'targetElementId';
@@ -855,7 +860,7 @@ describes.realWin(
     });
 
     it('should initialize correctly backgrounded', () => {
-      viewer.setVisibilityState_(VisibilityState.HIDDEN);
+      viewer.setVisibilityState_(VisibilityState_Enum.HIDDEN);
       root = new VisibilityManagerForEmbed(parentRoot, embed);
 
       expect(root.parent).to.equal(parentRoot);
@@ -975,14 +980,14 @@ describes.realWin(
       expect(elementModel.getVisibility_()).to.equal(0.45);
 
       // Hide parent.
-      viewer.setVisibilityState_(VisibilityState.HIDDEN);
+      viewer.setVisibilityState_(VisibilityState_Enum.HIDDEN);
       expect(parentRoot.getRootVisibility()).to.equal(0);
       expect(root.getRootVisibility()).to.equal(0);
       expect(rootModel.getVisibility_()).to.equal(0);
       expect(elementModel.getVisibility_()).to.equal(0);
 
       // Show parent.
-      viewer.setVisibilityState_(VisibilityState.VISIBLE);
+      viewer.setVisibilityState_(VisibilityState_Enum.VISIBLE);
       expect(parentRoot.getRootVisibility()).to.equal(1);
       expect(root.getRootVisibility()).to.equal(0.5);
       expect(rootModel.getVisibility_()).to.equal(0.5);
@@ -1139,7 +1144,7 @@ describes.realWin('VisibilityManager integrated', {amp: true}, (env) => {
   }
 
   it('should execute "visible" trigger with simple spec', () => {
-    viewer.setVisibilityState_(VisibilityState.VISIBLE);
+    viewer.setVisibilityState_(VisibilityState_Enum.VISIBLE);
     visibility = new VisibilityManagerForDoc(ampdoc);
 
     visibility.listenElement(
@@ -1189,7 +1194,7 @@ describes.realWin('VisibilityManager integrated', {amp: true}, (env) => {
   });
 
   it('should wait for readyPromise with readyReportPromise', async () => {
-    viewer.setVisibilityState_(VisibilityState.VISIBLE);
+    viewer.setVisibilityState_(VisibilityState_Enum.VISIBLE);
     visibility = new VisibilityManagerForDoc(ampdoc);
 
     visibility.listenElement(
@@ -1241,7 +1246,7 @@ describes.realWin('VisibilityManager integrated', {amp: true}, (env) => {
   });
 
   it('should wait for readyReportPromise with reportWhen', async () => {
-    viewer.setVisibilityState_(VisibilityState.VISIBLE);
+    viewer.setVisibilityState_(VisibilityState_Enum.VISIBLE);
     visibility = new VisibilityManagerForDoc(ampdoc);
 
     visibility.listenElement(
@@ -1293,7 +1298,7 @@ describes.realWin('VisibilityManager integrated', {amp: true}, (env) => {
     'should wait for readyReportPromise with reportWhen and never meets  ' +
       'visiblePercentageMin',
     async () => {
-      viewer.setVisibilityState_(VisibilityState.VISIBLE);
+      viewer.setVisibilityState_(VisibilityState_Enum.VISIBLE);
       visibility = new VisibilityManagerForDoc(ampdoc);
 
       visibility.listenElement(
@@ -1351,7 +1356,7 @@ describes.realWin('VisibilityManager integrated', {amp: true}, (env) => {
     'should accumulate timings and wait for readyReportPromise with ' +
       'reportWhen and high minTotalVisibleTime',
     async () => {
-      viewer.setVisibilityState_(VisibilityState.VISIBLE);
+      viewer.setVisibilityState_(VisibilityState_Enum.VISIBLE);
       visibility = new VisibilityManagerForDoc(ampdoc);
 
       visibility.listenElement(
@@ -1408,7 +1413,7 @@ describes.realWin('VisibilityManager integrated', {amp: true}, (env) => {
   );
 
   it('should wait for readyReportPromise when missing readyPromise', async () => {
-    viewer.setVisibilityState_(VisibilityState.VISIBLE);
+    viewer.setVisibilityState_(VisibilityState_Enum.VISIBLE);
     visibility = new VisibilityManagerForDoc(ampdoc);
 
     visibility.listenElement(
@@ -1451,7 +1456,7 @@ describes.realWin('VisibilityManager integrated', {amp: true}, (env) => {
   });
 
   it('should execute "visible" trigger with percent range', () => {
-    viewer.setVisibilityState_(VisibilityState.VISIBLE);
+    viewer.setVisibilityState_(VisibilityState_Enum.VISIBLE);
     visibility = new VisibilityManagerForDoc(ampdoc);
 
     const spy = env.sandbox.spy();
@@ -1482,7 +1487,7 @@ describes.realWin('VisibilityManager integrated', {amp: true}, (env) => {
   });
 
   it('should trigger "visible" with no duration condition', () => {
-    viewer.setVisibilityState_(VisibilityState.VISIBLE);
+    viewer.setVisibilityState_(VisibilityState_Enum.VISIBLE);
     visibility = new VisibilityManagerForDoc(ampdoc);
 
     visibility.listenElement(
@@ -1563,7 +1568,7 @@ describes.realWin('VisibilityManager integrated', {amp: true}, (env) => {
   });
 
   it('should trigger "visible" with duration condition', () => {
-    viewer.setVisibilityState_(VisibilityState.VISIBLE);
+    viewer.setVisibilityState_(VisibilityState_Enum.VISIBLE);
     visibility = new VisibilityManagerForDoc(ampdoc);
 
     visibility.listenElement(
@@ -1593,12 +1598,12 @@ describes.realWin('VisibilityManager integrated', {amp: true}, (env) => {
 
       clock.tick(100);
       // Enters background. this will reset the timer for continuous time
-      viewer.setVisibilityState_(VisibilityState.HIDDEN);
+      viewer.setVisibilityState_(VisibilityState_Enum.HIDDEN);
       expect(isModelResolved(model)).to.be.false;
 
       clock.tick(2000); // this 2s should not be counted in visible time
       expect(isModelResolved(model)).to.be.false;
-      viewer.setVisibilityState_(VisibilityState.VISIBLE); // now we're back
+      viewer.setVisibilityState_(VisibilityState_Enum.VISIBLE); // now we're back
 
       clock.tick(100);
       fireIntersect(35); // keep being visible
@@ -1630,12 +1635,12 @@ describes.realWin('VisibilityManager integrated', {amp: true}, (env) => {
   });
 
   it('should populate "backgrounded" and "backgroundedAtStart"', () => {
-    viewer.setVisibilityState_(VisibilityState.HIDDEN);
+    viewer.setVisibilityState_(VisibilityState_Enum.HIDDEN);
     visibility = new VisibilityManagerForDoc(ampdoc);
 
     visibility.listenElement(ampElement, {}, readyPromise, null, eventResolver);
 
-    viewer.setVisibilityState_(VisibilityState.VISIBLE);
+    viewer.setVisibilityState_(VisibilityState_Enum.VISIBLE);
     readyResolver();
     return Promise.resolve().then(() => {
       expect(observeSpy).to.be.calledWith(ampElement);
diff --git a/extensions/amp-analytics/0.1/test/vendor-requests.json b/extensions/amp-analytics/0.1/test/vendor-requests.json
index 4d770d1c5015..dae7723d5d09 100644
--- a/extensions/amp-analytics/0.1/test/vendor-requests.json
+++ b/extensions/amp-analytics/0.1/test/vendor-requests.json
@@ -47,7 +47,8 @@
   "blueconic": {
     "event": "https://!tenantId/s/!pixelId.gif?",
     "trackingIdentifier": "https://!tenantId/s/!pixelId.gif?property=!property&!property=_client_id(cid-scope-cookie-fallback-name)_!extraTrackingValues",
-    "defaultTrackingValues": "https://!tenantId/s/!pixelId.gif?property=!property&!property=_client_id(cid-scope-cookie-fallback-name)_!extraTrackingValues&sourceUrl=_source_url_&canonicalUrl=_canonical_url_&referrer=_document_referrer_&title=_title_&visitDate=_timestamp_&geoLocation=_amp_geo(ISOCountry)_&userAgent=_user_agent_"
+    "defaultTrackingValues": "https://!tenantId/s/!pixelId.gif?property=!property&!property=_client_id(cid-scope-cookie-fallback-name)_!extraTrackingValues&sourceUrl=_source_url_&canonicalUrl=_canonical_url_&referrer=_document_referrer_&title=_title_&visitDate=_timestamp_&geoLocation=_amp_geo(ISOCountry)_&userAgent=_user_agent_&canonicalHostname=_canonical_hostname_&deviceType=!deviceType&originType=!originType",
+    "trackingValuesWithoutGeo": "https://!tenantId/s/!pixelId.gif?property=!property&!property=_client_id(cid-scope-cookie-fallback-name)_!extraTrackingValues&sourceUrl=_source_url_&canonicalUrl=_canonical_url_&referrer=_document_referrer_&title=_title_&visitDate=_timestamp_&userAgent=_user_agent_&canonicalHostname=_canonical_hostname_&deviceType=!deviceType&originType=!originType"
   },
   "bluetriangle": {
     "host": "https://d.btttag.com",
@@ -92,8 +93,8 @@
   "colanalytics": {
     "host": "https://ase.clmbtech.com",
     "base": "https://ase.clmbtech.com/message",
-    "pageview": "https://ase.clmbtech.com/message?cid=!id&val_101=!id&val_101=int%3A_canonical_path_&ch=_canonical_host_&val_108=_title_&val_120=3&val_102=_source_url_&val_124=_external_referrer_&uuid=!uid",
-    "event": "https://ase.clmbtech.com/message?cid=!id&val_101=!id&val_101=int%3A_canonical_path_&val_101=tet%3A_total_engaged_time_&val_102=clk%3Apg%3A_source_url_"
+    "pageview": "https://ase.clmbtech.com/message?cid=!id&val_101=!id&val_101=int%3A_canonical_path_&ch=_canonical_host_&val_108=_title_&val_120=3&val_102=_source_url_&val_124=_external_referrer_&uuid=!uid&val_122=_client_id(site-user-id-cookie-fallback-name)_-0000000",
+    "event": "https://ase.clmbtech.com/message?cid=!id&val_101=!id&val_101=int%3A_canonical_path_&val_101=tet%3A_total_engaged_time_&val_102=clk%3Apg%3A_source_url_&val_122=_client_id(site-user-id-cookie-fallback-name)_"
   },
   "comscore": {
     "host": "https://sb.scorecardresearch.com",
@@ -110,10 +111,6 @@
     "pageview": "https://api.deep.bi/v1/pixel/!datasetKey/p.gif?accessKey=!accessKey&gdpr=true&page_href=_source_url_&referrer_href=_document_referrer_&page_title=_title_&deepbiampid=_client_id(deepbi_amp)_&amp=true&event_type=page-open",
     "event": "https://api.deep.bi/v1/pixel/!datasetKey/p.gif?accessKey=!accessKey&gdpr=true&page_href=_source_url_&referrer_href=_document_referrer_&page_title=_title_&deepbiampid=_client_id(deepbi_amp)_&amp=true&event_type=event"
   },
-  "dynatrace": {
-    "endpoint": "https://!tenant.live.dynatrace.com:443/ampbf/!tenantpath",
-    "pageview": "https://!tenant.live.dynatrace.com:443/ampbf/!tenantpath?type=js&flavor=amp&v=1&a=1%7C1%7C_load_%7C_load_%7C-%7C_nav_timing(navigationStart)_%7C_nav_timing(domContentLoadedEventEnd)_%7C0%2C2%7C2%7C_onload_%7C_load_%7C-%7C_nav_timing(domContentLoadedEventStart)_%7C_nav_timing(domContentLoadedEventEnd)_%7C0&fId=_page_view_id_&vID=_client_id(rxVisitor)_&url=_source_url_&title=_title_&sw=_screen_width_&sh=_screen_height_&w=_viewport_width_&h=_viewport_height_&nt=a_nav_type_b_nav_timing(navigationStart)_c_nav_timing(navigationStart%2CredirectStart)_d_nav_timing(navigationStart%2CredirectEnd)_e_nav_timing(navigationStart%2CfetchStart)_f_nav_timing(navigationStart%2CdomainLookupStart)_g_nav_timing(navigationStart%2CdomainLookupEnd)_h_nav_timing(navigationStart%2CconnectStart)_i_nav_timing(navigationStart%2CconnectEnd)_j_nav_timing(navigationStart%2CsecureConnectionStart)_k_nav_timing(navigationStart%2CrequestStart)_l_nav_timing(navigationStart%2CresponseStart)_m_nav_timing(navigationStart%2CresponseEnd)_n_nav_timing(navigationStart%2CdomLoading)_o_nav_timing(navigationStart%2CdomInteractive)_p_nav_timing(navigationStart%2CdomContentLoadedEventStart)_q_nav_timing(navigationStart%2CdomContentLoadedEventEnd)_r_nav_timing(navigationStart%2CdomComplete)_s_nav_timing(navigationStart%2CloadEventStart)_t_nav_timing(navigationStart%2CloadEventEnd)_&app=ampapp&time=_timestamp_"
-  },
   "epica": {
     "host": "https://cat.poder.io/api/v1/pixel",
     "base": "?writeKey=!writeKey&context.library.name=amp&anonymousId=_client_id(epica_amp_id)_&context.locale=_browser_language_&context.page.path=_canonical_path_&context.page.url=_canonical_url_&context.page.referrer=_document_referrer_&context.page.title=_title_&context.screen.width=_screen_width_&context.screen.height=_screen_height_",
@@ -149,12 +146,15 @@
     "event": "https://!prefix.hit.gemius.pl/__timestamp_/redot.gif?l=91&id=!identifier&tz=_timezone_&col=_screen_color_depth_&screen=_screen_width_x_screen_height_&window=_viewport_width_x_viewport_height_&fr=1&href=_source_url_&ref=_document_referrer_&sarg=_canonical_url_&extra=gemamp%3D1%7Campid%3D_client_id(gemius)_%7C!extraparams&nc=0&et=action&hsrc=3"
   },
   "gfksensic": {
-    "base": "https://%21regionid-config.sensic.net/tp?r=_ampdoc_host_&ua=_user_agent_&v=0.0.1&l=_browser_language_&p=!regionID&m=!mediaID&cid=_client_id(cid)_",
+    "base": "https://pixel.!regionid-config!environment.sensic.net/tp?m=!mediaID&v=1.0.0&t=s2s-amp",
     "page_params": "<ignore for test>",
-    "client_params": "<ignore for test>",
-    "event_params": "<ignore for test>",
-    "audio-play": "https://%21regionid-config.sensic.net/tp?r=_ampdoc_host_&ua=_user_agent_&v=0.0.1&l=_browser_language_&p=!regionID&m=!mediaID&cid=_client_id(cid)_&ut=_timestamp_&pr=_page_view_id_!streamID&rn=1&c=default&vt=1&sp=-1&st=_timestamp_&ty=PL&sn=_counter(play__page_view_id_!streamID)_",
-    "audio-stop": "https://%21regionid-config.sensic.net/tp?r=_ampdoc_host_&ua=_user_agent_&v=0.0.1&l=_browser_language_&p=!regionID&m=!mediaID&cid=_client_id(cid)_&ut=_timestamp_&pr=_page_view_id_!streamID&rn=1&c=default&vt=1&sp=-1&st=_timestamp_&ty=ST&sn=_counter(stop__page_view_id_!streamID)_"
+    "user_params": "<ignore for test>",
+    "streaming_params": "<ignore for test>",
+    "impression_params": "<ignore for test>",
+    "custom_params": "<ignore for test>",
+    "impression": "<ignore for test>",
+    "audio-play": "https://pixel.!regionid-config!environment.sensic.net/tp?m=!mediaID&v=1.0.0&t=s2s-amp&ty=PL&c=default&ut=_timestamp_&pr=_page_view_id_!streamID&rn=1&vt=1&sp=-1&st=_timestamp_&sn=_counter(play__page_view_id_!streamID)_&!custom_params&optin=!optin&gdpr=1&gdpr_consent=_consent_string_&r=_ampdoc_host_&ua=_user_agent_&l=_browser_language_",
+    "audio-stop": "https://pixel.!regionid-config!environment.sensic.net/tp?m=!mediaID&v=1.0.0&t=s2s-amp&ty=ST&c=default&ut=_timestamp_&pr=_page_view_id_!streamID&rn=1&vt=1&sp=-1&st=_timestamp_&sn=_counter(stop__page_view_id_!streamID)_"
   },
   "googleadwords": {
     "conversion_prefix": "<ignore for test>",
@@ -195,7 +195,7 @@
   },
   "ibeatanalytics": {
     "host": "https://api.ibeat-analytics.com",
-    "track": "https://api.ibeat-analytics.com/ping-amp?url=_source_url_&sid=_client_id(_iibeat_session)_&ua=_user_agent_&ref=_document_referrer_&at=_incremental_engaged_time_&tt=!totalTime&pid=_page_view_id_&d=!d&dn=_source_hostname_&ct=!ct&pt=!pt&hid=!hid&au=!au&ag=!ag&aid=!aid&cn=_canonical_url_&pot=!timerStart&rct=1&id=!id&sec=!sec&tgs=!tgs&pc=!pc"
+    "track": "https://api.ibeat-analytics.com/ping-amp?url=_source_url_&sid=_client_id(_iibeat_session)_&ua=_user_agent_&ref=_document_referrer_&at=_incremental_engaged_time_&tt=!totalTime&pid=_page_view_id_&d=!d&dn=_source_hostname_&ct=!ct&pt=!pt&hid=!hid&au=!au&ag=!ag&aid=!aid&cn=_canonical_url_&pot=!timerStart&rct=1&id=!id&sec=!sec&tgs=!tgs&pc=!pc&vct=!vct&xcld=!xcld"
   },
   "infonline": {
     "pageview": "!url?st=!st&sv=ke&ap=1&co=!co&cp=!cp&ps=!ps&act=_consent_string_&acs=_if(_equals(_consent_state_%2Csufficient)_%2C1)__if(_equals(_consent_state_%2Cinsufficient)_%2C0)__if(_equals(_consent_state_%2C)_%2C-1)_&host=_canonical_host_&path=_canonical_path_&type=pageview",
@@ -239,24 +239,31 @@
     "ping": "https://pp.lp4.io/u?i=!id&u=_client_id(_lp4_u)_&p=_canonical_url_&uActive=true&isPing=yes&c=amp&t=!type&s=!section&_t=amp&_r=_random_"
   },
   "lotame": {
-    "pageview": "https://bcp.crwdcntrl.net/amp?c=!account&pv=y"
+    "pageview": "https://bcp.crwdcntrl.net/amp?c=!account&pv=y&gdpr_consent=_consent_string_&gdpr=_if(_equals(_consent_metadata(gdprApplies)_%2Ctrue)_%2C1)__if(_equals(_consent_metadata(gdprApplies)_%2Cfalse)_%2C0)_"
   },
   "mapp_intelligence": {
     "trackURL": "https://!trackDomain/!trackId/wt",
     "basePrefix": "?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,",
     "baseSuffix": ",_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_",
     "parameterPrefix": "?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,_timestamp_,_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_",
-    "parameterSuffix": "&pu=_source_url_&eor=1",
-    "pageview": "https://!trackDomain/!trackId/wt?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,_timestamp_,_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_&&cp570=_page_load_time_&pu=_source_url_&eor=1",
-    "event": "https://!trackDomain/!trackId/wt?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,_timestamp_,_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_&ct=webtrekk_ignore&&pu=_source_url_&eor=1",
-    "scroll": "https://!trackDomain/!trackId/wt?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,_timestamp_,_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_&ct=webtrekk_ignore&ck540=!verticalScrollBoundary&pu=_source_url_&eor=1",
+    "parameterSuffix": "&pu=_source_url_&_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), X-WT-SEC-CH-UA-MODEL, !emptyValue)=_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(model)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM, !emptyValue)=_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platform)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM-VERSION, !emptyValue)=_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platformVersion)__%2C%20!emptyValue)\", !emptyValue)&eor=1",
+    "uachModelValue": "_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(model)__%2C%20!emptyValue)\", !emptyValue)",
+    "uachPlatformValue": "_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platform)__%2C%20!emptyValue)\", !emptyValue)",
+    "uachPlatformVersionValue": "_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platformVersion)__%2C%20!emptyValue)\", !emptyValue)",
+    "uachModelParam": "_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), X-WT-SEC-CH-UA-MODEL, !emptyValue)",
+    "uachPlatformParam": "_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM, !emptyValue)",
+    "uachPlatformVersionParam": "_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM-VERSION, !emptyValue)",
+    "clientHintParams": "&_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), X-WT-SEC-CH-UA-MODEL, !emptyValue)=_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(model)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM, !emptyValue)=_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platform)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM-VERSION, !emptyValue)=_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platformVersion)__%2C%20!emptyValue)\", !emptyValue)",
+    "pageview": "https://!trackDomain/!trackId/wt?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,_timestamp_,_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_&&cp570=_page_load_time_&pu=_source_url_&_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), X-WT-SEC-CH-UA-MODEL, !emptyValue)=_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(model)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM, !emptyValue)=_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platform)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM-VERSION, !emptyValue)=_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platformVersion)__%2C%20!emptyValue)\", !emptyValue)&eor=1",
+    "event": "https://!trackDomain/!trackId/wt?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,_timestamp_,_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_&ct=webtrekk_ignore&&pu=_source_url_&_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), X-WT-SEC-CH-UA-MODEL, !emptyValue)=_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(model)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM, !emptyValue)=_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platform)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM-VERSION, !emptyValue)=_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platformVersion)__%2C%20!emptyValue)\", !emptyValue)&eor=1",
+    "scroll": "https://!trackDomain/!trackId/wt?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,_timestamp_,_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_&ct=webtrekk_ignore&ck540=!verticalScrollBoundary&pu=_source_url_&_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), X-WT-SEC-CH-UA-MODEL, !emptyValue)=_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(model)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM, !emptyValue)=_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platform)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM-VERSION, !emptyValue)=_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platformVersion)__%2C%20!emptyValue)\", !emptyValue)&eor=1",
     "mediaPrefix": "https://!trackDomain/!trackId/wt?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,,_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_&mi=!id",
-    "mediaSuffix": "&mt1=!currentTime&mt2=!duration&&pu=_source_url_&eor=1&x=!playedTotal",
-    "mediaPlay": "https://!trackDomain/!trackId/wt?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,,_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_&mi=!id&mk=play&mt1=!currentTime&mt2=!duration&&pu=_source_url_&eor=1&x=!playedTotal",
-    "mediaPause": "https://!trackDomain/!trackId/wt?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,,_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_&mi=!id&mk=pause&mt1=!currentTime&mt2=!duration&&pu=_source_url_&eor=1&x=!playedTotal",
-    "mediaPosition": "https://!trackDomain/!trackId/wt?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,,_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_&mi=!id&mk=pos&mt1=!currentTime&mt2=!duration&&pu=_source_url_&eor=1&x=!playedTotal",
-    "mediaEnded": "https://!trackDomain/!trackId/wt?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,,_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_&mi=!id&mk=eof&mt1=!currentTime&mt2=!duration&&pu=_source_url_&eor=1&x=!playedTotal",
-    "mediaCustomEvent": "https://!trackDomain/!trackId/wt?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,,_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_&mi=!id&mk=customMediaEvent&mt1=!currentTime&mt2=!duration&&pu=_source_url_&eor=1&x=!playedTotal"
+    "mediaSuffix": "&mt1=!currentTime&mt2=!duration&&pu=_source_url_&_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), X-WT-SEC-CH-UA-MODEL, !emptyValue)=_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(model)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM, !emptyValue)=_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platform)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM-VERSION, !emptyValue)=_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platformVersion)__%2C%20!emptyValue)\", !emptyValue)&eor=1&x=!playedTotal",
+    "mediaPlay": "https://!trackDomain/!trackId/wt?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,,_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_&mi=!id&mk=play&mt1=!currentTime&mt2=!duration&&pu=_source_url_&_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), X-WT-SEC-CH-UA-MODEL, !emptyValue)=_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(model)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM, !emptyValue)=_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platform)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM-VERSION, !emptyValue)=_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platformVersion)__%2C%20!emptyValue)\", !emptyValue)&eor=1&x=!playedTotal",
+    "mediaPause": "https://!trackDomain/!trackId/wt?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,,_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_&mi=!id&mk=pause&mt1=!currentTime&mt2=!duration&&pu=_source_url_&_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), X-WT-SEC-CH-UA-MODEL, !emptyValue)=_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(model)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM, !emptyValue)=_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platform)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM-VERSION, !emptyValue)=_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platformVersion)__%2C%20!emptyValue)\", !emptyValue)&eor=1&x=!playedTotal",
+    "mediaPosition": "https://!trackDomain/!trackId/wt?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,,_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_&mi=!id&mk=pos&mt1=!currentTime&mt2=!duration&&pu=_source_url_&_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), X-WT-SEC-CH-UA-MODEL, !emptyValue)=_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(model)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM, !emptyValue)=_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platform)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM-VERSION, !emptyValue)=_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platformVersion)__%2C%20!emptyValue)\", !emptyValue)&eor=1&x=!playedTotal",
+    "mediaEnded": "https://!trackDomain/!trackId/wt?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,,_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_&mi=!id&mk=eof&mt1=!currentTime&mt2=!duration&&pu=_source_url_&_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), X-WT-SEC-CH-UA-MODEL, !emptyValue)=_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(model)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM, !emptyValue)=_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platform)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM-VERSION, !emptyValue)=_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platformVersion)__%2C%20!emptyValue)\", !emptyValue)&eor=1&x=!playedTotal",
+    "mediaCustomEvent": "https://!trackDomain/!trackId/wt?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,,_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_&mi=!id&mk=customMediaEvent&mt1=!currentTime&mt2=!duration&&pu=_source_url_&_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), X-WT-SEC-CH-UA-MODEL, !emptyValue)=_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(model)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM, !emptyValue)=_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platform)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM-VERSION, !emptyValue)=_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platformVersion)__%2C%20!emptyValue)\", !emptyValue)&eor=1&x=!playedTotal"
   },
   "marinsoftware": {
     "base": "https://tracker.marinsm.com/tp",
@@ -323,8 +330,8 @@
     "pagedcl": "https://engagement-collector.mobify.net/s.gif?slug=mobify-project-id&timestamp_local=_timestamp_&channel=web&dimensions=%7b%22platform%22%3a%22AMP%22%2c%22client_id%22%3a%22_client_id(sandy-client-id)_%22%2c%22title%22%3a%22_title_%22%2c%22location%22%3a%22_source_url_%22%2c%22page%22%3a%22_source_path_%22%2c%22src_location%22%3a%22_ampdoc_url_%22%2c%22referrer%22%3a%22_document_referrer_%22%2c%22templateName%22%3a%22page-type%22%7d&data=%7b%22category%22%3a%22timing%22%2c%22action%22%3a%22DOMContentLoaded%22%2c%22value%22%3a_content_load_time_%7d"
   },
   "moengage": {
-    "addDevice": "https://websdk.moengage.com/v2/device/add?os=mweb&app_id=!appId&sdk_ver=0.0.0&app_ver=1&device_tz=_timezone_&os_platform=_user_agent_&unique_id=_client_id(moe_uuid)_&device_ts=_timestamp_&isAmp=true&a=%5Bobject%20Object%5D&meta=%5Bobject%20Object%5D&url=_ampdoc_url_",
-    "event": "https://websdk.moengage.com/v2/report/add?os=mweb&app_id=!appId&sdk_ver=0.0.0&app_ver=1&device_tz=_timezone_&os_platform=_user_agent_&unique_id=_client_id(moe_uuid)_&device_ts=_timestamp_&a=%5Bobject%20Object%5D&meta=%5Bobject%20Object%5D&url=_ampdoc_url_"
+    "addDevice": "https://sdk-01.moengage.com/v2/device/add?os=mweb&app_id=!appId&sdk_ver=0.0.0&app_ver=1&device_tz=_timezone_&os_platform=_user_agent_&unique_id=_client_id(moe_uuid)_&device_ts=_timestamp_&isAmp=true&a=%5Bobject%20Object%5D&meta=%5Bobject%20Object%5D&url=_ampdoc_url_",
+    "event": "https://sdk-01.moengage.com/v2/report/add?os=mweb&app_id=!appId&sdk_ver=0.0.0&app_ver=1&device_tz=_timezone_&os_platform=_user_agent_&unique_id=_client_id(moe_uuid)_&device_ts=_timestamp_&a=%5Bobject%20Object%5D&meta=%5Bobject%20Object%5D&url=_ampdoc_url_"
   },
   "mparticle": {
     "host": "https://pixels.mparticle.com",
@@ -337,7 +344,17 @@
     "onvisible": "https://!beacon_url?h.d=!h.d&h.key=!h.key&h.t=!h.t&h.cr=!h.cr&rt.start=navigation&rt.si=_client_id(amp_mpulse)_&rt.ss=_timestamp_&rt.end=_timestamp_&t_resp=_nav_timing(navigationStart%2CresponseStart)_&t_page=_nav_timing(responseStart%2CloadEventStart)_&t_done=_nav_timing(navigationStart%2CloadEventStart)_&nt_nav_type=_nav_type_&nt_red_cnt=_nav_redirect_count_&nt_nav_st=_nav_timing(navigationStart)_&nt_red_st=_nav_timing(redirectStart)_&nt_red_end=_nav_timing(redirectEnd)_&nt_fet_st=_nav_timing(fetchStart)_&nt_dns_st=_nav_timing(domainLookupStart)_&nt_dns_end=_nav_timing(domainLookupEnd)_&nt_con_st=_nav_timing(connectStart)_&nt_ssl_st=_nav_timing(secureConnectionStart)_&nt_con_end=_nav_timing(connectEnd)_&nt_req_st=_nav_timing(requestStart)_&nt_res_st=_nav_timing(responseStart)_&nt_unload_st=_nav_timing(unloadEventStart)_&nt_unload_end=_nav_timing(unloadEventEnd)_&nt_domloading=_nav_timing(domLoading)_&nt_res_end=_nav_timing(responseEnd)_&nt_domint=_nav_timing(domInteractive)_&nt_domcontloaded_st=_nav_timing(domContentLoadedEventStart)_&nt_domcontloaded_end=_nav_timing(domContentLoadedEventEnd)_&nt_domcomp=_nav_timing(domComplete)_&nt_load_st=_nav_timing(loadEventStart)_&nt_load_end=_nav_timing(loadEventEnd)_&v=1&http.initiator=amp&u=_source_url_&amp.u=_ampdoc_url_&r2=_document_referrer_&scr.xy=_screen_width_x_screen_height_"
   },
   "navegg": {
-    "pageview": "https://amp.navdmp.com/amp?aid=_client_id(navegg_id)_&url=_canonical_url_&ref=_document_referrer_&tit=_title_&lan=_browser_language_&acc=!account&v=7"
+    "pageview": "https://amp.navdmp.com/amp?aid=_client_id(navegg_id)_&url=_canonical_url_&ref=_document_referrer_&tit=_title_&lan=_browser_language_&acc=!account&wst=!wst&wct=!wct&wla=!wla&v=7"
+  },
+  "neodata": {
+    "base": "https://tra.neodatagroup.com",
+    "sysId": "999",
+    "tagId": "12321",
+    "advId": "56785",
+    "pageview": "https://tra.neodatagroup.com/pv?sid=!sysId&rnd=_random_&id=!tagId&ad=!advId&gdpr_consent=_consent_string_&rs=_screen_width_x_screen_height_&lg=_browser_language_&tz=_timezone_&re=_document_referrer_&co=_screen_color_depth_&ur=_ampdoc_url_",
+    "cmDbm": "https://cm.g.doubleclick.net/pixel?google_nid=neodata_dmp&google_cm&pv=dbm&sid=!sysId&rt=img&rnd=_random_",
+    "ADFORM": "https://dmp.adform.net/serving/cookie/match?party=1056&rt=img&rnd=_random_",
+    "MEDIAMATH": "https://pixel.mathtag.com/sync/js?sync=auto&mt_exid=10082&exsync=https://tra.neodatagroup.com/cm?sid=!sysId&pv=MEDIAMATH&eid=[MM_UUID]&rt=img&rnd=_random_"
   },
   "newrelic": {
     "pageview": "https://bam.nr-data.net/amp?appId=!appId&licenseKey=!licenseKey&ampUrl=_ampdoc_url_&canonicalUrl=_canonical_url_&timeToDomContentLoadedEventEnd=_nav_timing(domContentLoadedEventEnd)_&timeToDomInteractive=_nav_timing(domInteractive)_&timeToDomComplete=_nav_timing(domComplete)_&timeToDomLoading=_nav_timing(domLoading)_&timeToResponseStart=_nav_timing(responseStart)_&timeToResponseEnd=_nav_timing(responseEnd)_&timeToLoadEventStart=_nav_timing(loadEventStart)_&timeToLoadEventEnd=_nav_timing(loadEventEnd)_&timeToConnectStart=_nav_timing(connectStart)_&timeToConnectEnd=_nav_timing(connectEnd)_&timeToFetchStart=_nav_timing(fetchStart)_&timeToRequestStart=_nav_timing(requestStart)_&timeToUnloadEventStart=_nav_timing(unloadEventStart)_&timeToUnloadEventEnd=_nav_timing(unloadEventEnd)_&timeToDomainLookupStart=_nav_timing(domainLookupStart)_&timeToDomainLookupEnd=_nav_timing(domainLookupEnd)_&timeToRedirectStart=_nav_timing(redirectStart)_&timeToRedirectEnd=_nav_timing(redirectEnd)_&timeToSecureConnection=_nav_timing(secureConnectionStart)_&timestamp=_timestamp_&ampVersion=_amp_version_&pageLoadTime=_page_load_time_"
@@ -389,10 +406,10 @@
     "downLoad": "a[href$=\".pdf\"],a[href$=\".xls\"],a[href$=\".ppt\"],a[href$=\".zip\"],a[href$=\".txt\"],a[href$=\".rtf\"],a[href$=\".xml\"]"
   },
   "parsely": {
-    "host": "https://srv.pixel.parsely.com",
-    "basePrefix": "https://srv.pixel.parsely.com/plogger/?rand=_timestamp_&idsite=!apikey&url=_ampdoc_url_&urlref=_document_referrer_&screen=_screen_width_x_screen_height_%7C_available_screen_width_x_available_screen_height_%7C_screen_color_depth_&title=_title_&date=_timestamp_&ampid=_client_id(_parsely_visitor)_",
-    "pageview": "https://srv.pixel.parsely.com/plogger/?rand=_timestamp_&idsite=!apikey&url=_ampdoc_url_&urlref=_document_referrer_&screen=_screen_width_x_screen_height_%7C_available_screen_width_x_available_screen_height_%7C_screen_color_depth_&title=_title_&date=_timestamp_&ampid=_client_id(_parsely_visitor)_&action=pageview&metadata={\"canonical_url\":\"_canonical_url_\"}",
-    "heartbeat": "https://srv.pixel.parsely.com/plogger/?rand=_timestamp_&idsite=!apikey&url=_ampdoc_url_&urlref=_document_referrer_&screen=_screen_width_x_screen_height_%7C_available_screen_width_x_available_screen_height_%7C_screen_color_depth_&title=_title_&date=_timestamp_&ampid=_client_id(_parsely_visitor)_&action=heartbeat&tt=_total_engaged_time_&inc=_incremental_engaged_time(parsely-js)_"
+    "host": "https://p1.parsely.com",
+    "basePrefix": "https://p1.parsely.com/plogger/?rand=_timestamp_&idsite=!apikey&url=_ampdoc_url_&urlref=_document_referrer_&screen=_screen_width_x_screen_height_%7C_available_screen_width_x_available_screen_height_%7C_screen_color_depth_&title=_title_&date=_timestamp_&ampid=_client_id(_parsely_visitor)_",
+    "pageview": "https://p1.parsely.com/plogger/?rand=_timestamp_&idsite=!apikey&url=_ampdoc_url_&urlref=_document_referrer_&screen=_screen_width_x_screen_height_%7C_available_screen_width_x_available_screen_height_%7C_screen_color_depth_&title=_title_&date=_timestamp_&ampid=_client_id(_parsely_visitor)_&action=pageview&metadata={\"canonical_url\":\"_canonical_url_\"}",
+    "heartbeat": "https://p1.parsely.com/plogger/?rand=_timestamp_&idsite=!apikey&url=_ampdoc_url_&urlref=_document_referrer_&screen=_screen_width_x_screen_height_%7C_available_screen_width_x_available_screen_height_%7C_screen_color_depth_&title=_title_&date=_timestamp_&ampid=_client_id(_parsely_visitor)_&action=heartbeat&tt=_total_engaged_time_&inc=_incremental_engaged_time(parsely-js)_"
   },
   "permutive": {
     "track": "https://!namespace.amp.permutive.com/track?k=!key&i=_client_id(_ga)_&it=amp&vid=_page_view_id_64_&s=_page_view_id_64_&_ep_client.type=amp&_ep_client.title=_title_&_ep_client.domain=_canonical_host_&_ep_client.url=_canonical_url_&_ep_client.referrer=_document_referrer_&_ep_client.user_agent=_user_agent_",
@@ -417,14 +434,14 @@
   },
   "ppasanalytics": {
     "basePrefix": "https://!host/ppms.php?",
-    "baseSuffix": "&idsite=!website_id&rec=1&r=_substr(_replace(_random_%2C0.%2C)_%2C0%2C6)_&url=_source_url_&_id=_if(_match(_replace(_client_id(_pk_id.!website_id.!website_hash)__%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)__%2Camp-%2C0)%2C_substr(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_substr(_tolowercase(_replace(_client_id(_pk_id.!website_id.!website_hash)__%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)__)_%2C4%2C16)_%2Cg%2C10)_%2Ch%2C11)_%2Ci%2C12)_%2Cj%2C13)_%2Ck%2C14)_%2Cl%2C15)_%2Cm%2C16)_%2Cn%2C17)_%2Co%2C18)_%2Cp%2C19)_%2Cq%2C1a)_%2Cr%2C1b)_%2Cs%2C1c)_%2Ct%2C1d)_%2Cu%2C1e)_%2Cv%2C1f)_%2Cw%2C20)_%2Cx%2C21)_%2Cy%2C22)_%2Cz%2C23)_%2CA%2C24)_%2CB%2C25)_%2CC%2C26)_%2CD%2C27)_%2CE%2C28)_%2CF%2C29)_%2CG%2C2a)_%2CH%2C2b)_%2CI%2C2c)_%2CJ%2C2d)_%2CK%2C2e)_%2CL%2C2f)_%2CM%2C30)_%2CN%2C31)_%2CO%2C32)_%2CP%2C33)_%2CQ%2C34)_%2CR%2C35)_%2CS%2C36)_%2CT%2C37)_%2CU%2C38)_%2CV%2C39)_%2CW%2C3a)_%2CX%2C3b)_%2CY%2C3c)_%2CZ%2C3d)_%2C_%2C3e)_%2C-%2C3f)%2C0%2C16)%2C_replace(_client_id(_pk_id.!website_id.!website_hash)_%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)_)&apiv=1&urlref=_document_referrer_&res=_screen_width_x_screen_height_&lang=_browser_language_&gt_ms=_server_response_time_&cs=_document_charset_&pv_id=_substr(_page_view_id_64_%2C0%2C6)_",
-    "performanceMetrics": "https://!host/ppms.php?ping=1&idsite=!website_id&rec=1&r=_substr(_replace(_random_%2C0.%2C)_%2C0%2C6)_&url=_source_url_&_id=_if(_match(_replace(_client_id(_pk_id.!website_id.!website_hash)__%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)__%2Camp-%2C0)%2C_substr(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_substr(_tolowercase(_replace(_client_id(_pk_id.!website_id.!website_hash)__%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)__)_%2C4%2C16)_%2Cg%2C10)_%2Ch%2C11)_%2Ci%2C12)_%2Cj%2C13)_%2Ck%2C14)_%2Cl%2C15)_%2Cm%2C16)_%2Cn%2C17)_%2Co%2C18)_%2Cp%2C19)_%2Cq%2C1a)_%2Cr%2C1b)_%2Cs%2C1c)_%2Ct%2C1d)_%2Cu%2C1e)_%2Cv%2C1f)_%2Cw%2C20)_%2Cx%2C21)_%2Cy%2C22)_%2Cz%2C23)_%2CA%2C24)_%2CB%2C25)_%2CC%2C26)_%2CD%2C27)_%2CE%2C28)_%2CF%2C29)_%2CG%2C2a)_%2CH%2C2b)_%2CI%2C2c)_%2CJ%2C2d)_%2CK%2C2e)_%2CL%2C2f)_%2CM%2C30)_%2CN%2C31)_%2CO%2C32)_%2CP%2C33)_%2CQ%2C34)_%2CR%2C35)_%2CS%2C36)_%2CT%2C37)_%2CU%2C38)_%2CV%2C39)_%2CW%2C3a)_%2CX%2C3b)_%2CY%2C3c)_%2CZ%2C3d)_%2C_%2C3e)_%2C-%2C3f)%2C0%2C16)%2C_replace(_client_id(_pk_id.!website_id.!website_hash)_%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)_)&apiv=1&urlref=_document_referrer_&res=_screen_width_x_screen_height_&lang=_browser_language_&gt_ms=_server_response_time_&cs=_document_charset_&pv_id=_substr(_page_view_id_64_%2C0%2C6)_&t_di=_dom_interactive_time_&t_le=_content_load_time_&t_dc=_page_download_time_&t_ee=_page_load_time_",
-    "pageview": "https://!host/ppms.php?action_name=_title_&idsite=!website_id&rec=1&r=_substr(_replace(_random_%2C0.%2C)_%2C0%2C6)_&url=_source_url_&_id=_if(_match(_replace(_client_id(_pk_id.!website_id.!website_hash)__%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)__%2Camp-%2C0)%2C_substr(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_substr(_tolowercase(_replace(_client_id(_pk_id.!website_id.!website_hash)__%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)__)_%2C4%2C16)_%2Cg%2C10)_%2Ch%2C11)_%2Ci%2C12)_%2Cj%2C13)_%2Ck%2C14)_%2Cl%2C15)_%2Cm%2C16)_%2Cn%2C17)_%2Co%2C18)_%2Cp%2C19)_%2Cq%2C1a)_%2Cr%2C1b)_%2Cs%2C1c)_%2Ct%2C1d)_%2Cu%2C1e)_%2Cv%2C1f)_%2Cw%2C20)_%2Cx%2C21)_%2Cy%2C22)_%2Cz%2C23)_%2CA%2C24)_%2CB%2C25)_%2CC%2C26)_%2CD%2C27)_%2CE%2C28)_%2CF%2C29)_%2CG%2C2a)_%2CH%2C2b)_%2CI%2C2c)_%2CJ%2C2d)_%2CK%2C2e)_%2CL%2C2f)_%2CM%2C30)_%2CN%2C31)_%2CO%2C32)_%2CP%2C33)_%2CQ%2C34)_%2CR%2C35)_%2CS%2C36)_%2CT%2C37)_%2CU%2C38)_%2CV%2C39)_%2CW%2C3a)_%2CX%2C3b)_%2CY%2C3c)_%2CZ%2C3d)_%2C_%2C3e)_%2C-%2C3f)%2C0%2C16)%2C_replace(_client_id(_pk_id.!website_id.!website_hash)_%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)_)&apiv=1&urlref=_document_referrer_&res=_screen_width_x_screen_height_&lang=_browser_language_&gt_ms=_server_response_time_&cs=_document_charset_&pv_id=_substr(_page_view_id_64_%2C0%2C6)_",
-    "customevent": "https://!host/ppms.php?e_c=!event_category&e_a=!event_action&e_n=!event_name&e_v=_default(!event_value%2C0)_&idsite=!website_id&rec=1&r=_substr(_replace(_random_%2C0.%2C)_%2C0%2C6)_&url=_source_url_&_id=_if(_match(_replace(_client_id(_pk_id.!website_id.!website_hash)__%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)__%2Camp-%2C0)%2C_substr(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_substr(_tolowercase(_replace(_client_id(_pk_id.!website_id.!website_hash)__%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)__)_%2C4%2C16)_%2Cg%2C10)_%2Ch%2C11)_%2Ci%2C12)_%2Cj%2C13)_%2Ck%2C14)_%2Cl%2C15)_%2Cm%2C16)_%2Cn%2C17)_%2Co%2C18)_%2Cp%2C19)_%2Cq%2C1a)_%2Cr%2C1b)_%2Cs%2C1c)_%2Ct%2C1d)_%2Cu%2C1e)_%2Cv%2C1f)_%2Cw%2C20)_%2Cx%2C21)_%2Cy%2C22)_%2Cz%2C23)_%2CA%2C24)_%2CB%2C25)_%2CC%2C26)_%2CD%2C27)_%2CE%2C28)_%2CF%2C29)_%2CG%2C2a)_%2CH%2C2b)_%2CI%2C2c)_%2CJ%2C2d)_%2CK%2C2e)_%2CL%2C2f)_%2CM%2C30)_%2CN%2C31)_%2CO%2C32)_%2CP%2C33)_%2CQ%2C34)_%2CR%2C35)_%2CS%2C36)_%2CT%2C37)_%2CU%2C38)_%2CV%2C39)_%2CW%2C3a)_%2CX%2C3b)_%2CY%2C3c)_%2CZ%2C3d)_%2C_%2C3e)_%2C-%2C3f)%2C0%2C16)%2C_replace(_client_id(_pk_id.!website_id.!website_hash)_%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)_)&apiv=1&urlref=_document_referrer_&res=_screen_width_x_screen_height_&lang=_browser_language_&gt_ms=_server_response_time_&cs=_document_charset_&pv_id=_substr(_page_view_id_64_%2C0%2C6)_",
-    "download": "https://!host/ppms.php?download=!download_url&idsite=!website_id&rec=1&r=_substr(_replace(_random_%2C0.%2C)_%2C0%2C6)_&url=_source_url_&_id=_if(_match(_replace(_client_id(_pk_id.!website_id.!website_hash)__%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)__%2Camp-%2C0)%2C_substr(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_substr(_tolowercase(_replace(_client_id(_pk_id.!website_id.!website_hash)__%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)__)_%2C4%2C16)_%2Cg%2C10)_%2Ch%2C11)_%2Ci%2C12)_%2Cj%2C13)_%2Ck%2C14)_%2Cl%2C15)_%2Cm%2C16)_%2Cn%2C17)_%2Co%2C18)_%2Cp%2C19)_%2Cq%2C1a)_%2Cr%2C1b)_%2Cs%2C1c)_%2Ct%2C1d)_%2Cu%2C1e)_%2Cv%2C1f)_%2Cw%2C20)_%2Cx%2C21)_%2Cy%2C22)_%2Cz%2C23)_%2CA%2C24)_%2CB%2C25)_%2CC%2C26)_%2CD%2C27)_%2CE%2C28)_%2CF%2C29)_%2CG%2C2a)_%2CH%2C2b)_%2CI%2C2c)_%2CJ%2C2d)_%2CK%2C2e)_%2CL%2C2f)_%2CM%2C30)_%2CN%2C31)_%2CO%2C32)_%2CP%2C33)_%2CQ%2C34)_%2CR%2C35)_%2CS%2C36)_%2CT%2C37)_%2CU%2C38)_%2CV%2C39)_%2CW%2C3a)_%2CX%2C3b)_%2CY%2C3c)_%2CZ%2C3d)_%2C_%2C3e)_%2C-%2C3f)%2C0%2C16)%2C_replace(_client_id(_pk_id.!website_id.!website_hash)_%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)_)&apiv=1&urlref=_document_referrer_&res=_screen_width_x_screen_height_&lang=_browser_language_&gt_ms=_server_response_time_&cs=_document_charset_&pv_id=_substr(_page_view_id_64_%2C0%2C6)_",
-    "outlink": "https://!host/ppms.php?link=!outlink_url&idsite=!website_id&rec=1&r=_substr(_replace(_random_%2C0.%2C)_%2C0%2C6)_&url=_source_url_&_id=_if(_match(_replace(_client_id(_pk_id.!website_id.!website_hash)__%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)__%2Camp-%2C0)%2C_substr(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_substr(_tolowercase(_replace(_client_id(_pk_id.!website_id.!website_hash)__%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)__)_%2C4%2C16)_%2Cg%2C10)_%2Ch%2C11)_%2Ci%2C12)_%2Cj%2C13)_%2Ck%2C14)_%2Cl%2C15)_%2Cm%2C16)_%2Cn%2C17)_%2Co%2C18)_%2Cp%2C19)_%2Cq%2C1a)_%2Cr%2C1b)_%2Cs%2C1c)_%2Ct%2C1d)_%2Cu%2C1e)_%2Cv%2C1f)_%2Cw%2C20)_%2Cx%2C21)_%2Cy%2C22)_%2Cz%2C23)_%2CA%2C24)_%2CB%2C25)_%2CC%2C26)_%2CD%2C27)_%2CE%2C28)_%2CF%2C29)_%2CG%2C2a)_%2CH%2C2b)_%2CI%2C2c)_%2CJ%2C2d)_%2CK%2C2e)_%2CL%2C2f)_%2CM%2C30)_%2CN%2C31)_%2CO%2C32)_%2CP%2C33)_%2CQ%2C34)_%2CR%2C35)_%2CS%2C36)_%2CT%2C37)_%2CU%2C38)_%2CV%2C39)_%2CW%2C3a)_%2CX%2C3b)_%2CY%2C3c)_%2CZ%2C3d)_%2C_%2C3e)_%2C-%2C3f)%2C0%2C16)%2C_replace(_client_id(_pk_id.!website_id.!website_hash)_%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)_)&apiv=1&urlref=_document_referrer_&res=_screen_width_x_screen_height_&lang=_browser_language_&gt_ms=_server_response_time_&cs=_document_charset_&pv_id=_substr(_page_view_id_64_%2C0%2C6)_",
-    "search": "https://!host/ppms.php?search=!search_keyword&search_cat=!search_category&search_count=!search_result_count&idsite=!website_id&rec=1&r=_substr(_replace(_random_%2C0.%2C)_%2C0%2C6)_&url=_source_url_&_id=_if(_match(_replace(_client_id(_pk_id.!website_id.!website_hash)__%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)__%2Camp-%2C0)%2C_substr(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_substr(_tolowercase(_replace(_client_id(_pk_id.!website_id.!website_hash)__%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)__)_%2C4%2C16)_%2Cg%2C10)_%2Ch%2C11)_%2Ci%2C12)_%2Cj%2C13)_%2Ck%2C14)_%2Cl%2C15)_%2Cm%2C16)_%2Cn%2C17)_%2Co%2C18)_%2Cp%2C19)_%2Cq%2C1a)_%2Cr%2C1b)_%2Cs%2C1c)_%2Ct%2C1d)_%2Cu%2C1e)_%2Cv%2C1f)_%2Cw%2C20)_%2Cx%2C21)_%2Cy%2C22)_%2Cz%2C23)_%2CA%2C24)_%2CB%2C25)_%2CC%2C26)_%2CD%2C27)_%2CE%2C28)_%2CF%2C29)_%2CG%2C2a)_%2CH%2C2b)_%2CI%2C2c)_%2CJ%2C2d)_%2CK%2C2e)_%2CL%2C2f)_%2CM%2C30)_%2CN%2C31)_%2CO%2C32)_%2CP%2C33)_%2CQ%2C34)_%2CR%2C35)_%2CS%2C36)_%2CT%2C37)_%2CU%2C38)_%2CV%2C39)_%2CW%2C3a)_%2CX%2C3b)_%2CY%2C3c)_%2CZ%2C3d)_%2C_%2C3e)_%2C-%2C3f)%2C0%2C16)%2C_replace(_client_id(_pk_id.!website_id.!website_hash)_%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)_)&apiv=1&urlref=_document_referrer_&res=_screen_width_x_screen_height_&lang=_browser_language_&gt_ms=_server_response_time_&cs=_document_charset_&pv_id=_substr(_page_view_id_64_%2C0%2C6)_",
-    "goal": "https://!host/ppms.php?idgoal=!goal_id&revenue=!revenue&idsite=!website_id&rec=1&r=_substr(_replace(_random_%2C0.%2C)_%2C0%2C6)_&url=_source_url_&_id=_if(_match(_replace(_client_id(_pk_id.!website_id.!website_hash)__%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)__%2Camp-%2C0)%2C_substr(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_substr(_tolowercase(_replace(_client_id(_pk_id.!website_id.!website_hash)__%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)__)_%2C4%2C16)_%2Cg%2C10)_%2Ch%2C11)_%2Ci%2C12)_%2Cj%2C13)_%2Ck%2C14)_%2Cl%2C15)_%2Cm%2C16)_%2Cn%2C17)_%2Co%2C18)_%2Cp%2C19)_%2Cq%2C1a)_%2Cr%2C1b)_%2Cs%2C1c)_%2Ct%2C1d)_%2Cu%2C1e)_%2Cv%2C1f)_%2Cw%2C20)_%2Cx%2C21)_%2Cy%2C22)_%2Cz%2C23)_%2CA%2C24)_%2CB%2C25)_%2CC%2C26)_%2CD%2C27)_%2CE%2C28)_%2CF%2C29)_%2CG%2C2a)_%2CH%2C2b)_%2CI%2C2c)_%2CJ%2C2d)_%2CK%2C2e)_%2CL%2C2f)_%2CM%2C30)_%2CN%2C31)_%2CO%2C32)_%2CP%2C33)_%2CQ%2C34)_%2CR%2C35)_%2CS%2C36)_%2CT%2C37)_%2CU%2C38)_%2CV%2C39)_%2CW%2C3a)_%2CX%2C3b)_%2CY%2C3c)_%2CZ%2C3d)_%2C_%2C3e)_%2C-%2C3f)%2C0%2C16)%2C_replace(_client_id(_pk_id.!website_id.!website_hash)_%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)_)&apiv=1&urlref=_document_referrer_&res=_screen_width_x_screen_height_&lang=_browser_language_&gt_ms=_server_response_time_&cs=_document_charset_&pv_id=_substr(_page_view_id_64_%2C0%2C6)_"
+    "baseSuffix": "&idsite=!website_id&rec=1&r=_substr(_replace(_random_%2C0.%2C)_%2C0%2C6)_&url=_source_url_&_id=_if(_match(_replace(_client_id(_pk_id.!website_id.!website_hash)__%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)__%2C%5E%5B0-9a-f%5D%7B16%7D%24%2C0)%2C_replace(_client_id(_pk_id.!website_id.!website_hash)_%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)_%2C_substr(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_substr(_tolowercase(_replace(_client_id(_pk_id.!website_id.!website_hash)__%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)__)_%2C4%2C16)_%2Cg%2C10)_%2Ch%2C11)_%2Ci%2C12)_%2Cj%2C13)_%2Ck%2C14)_%2Cl%2C15)_%2Cm%2C16)_%2Cn%2C17)_%2Co%2C18)_%2Cp%2C19)_%2Cq%2C1a)_%2Cr%2C1b)_%2Cs%2C1c)_%2Ct%2C1d)_%2Cu%2C1e)_%2Cv%2C1f)_%2Cw%2C20)_%2Cx%2C21)_%2Cy%2C22)_%2Cz%2C23)_%2C_%2C3e)_%2C-%2C3f)%2C0%2C16))&apiv=1&_if(_document_referrer_%2Curlref%2Cignored)_=_document_referrer_&res=_screen_width_x_screen_height_&lang=_browser_language_&gt_ms=_server_response_time_&cs=_document_charset_&pv_id=_substr(_page_view_id_64_%2C0%2C6)_",
+    "performanceMetrics": "https://!host/ppms.php?ping=1&idsite=!website_id&rec=1&r=_substr(_replace(_random_%2C0.%2C)_%2C0%2C6)_&url=_source_url_&_id=_if(_match(_replace(_client_id(_pk_id.!website_id.!website_hash)__%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)__%2C%5E%5B0-9a-f%5D%7B16%7D%24%2C0)%2C_replace(_client_id(_pk_id.!website_id.!website_hash)_%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)_%2C_substr(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_substr(_tolowercase(_replace(_client_id(_pk_id.!website_id.!website_hash)__%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)__)_%2C4%2C16)_%2Cg%2C10)_%2Ch%2C11)_%2Ci%2C12)_%2Cj%2C13)_%2Ck%2C14)_%2Cl%2C15)_%2Cm%2C16)_%2Cn%2C17)_%2Co%2C18)_%2Cp%2C19)_%2Cq%2C1a)_%2Cr%2C1b)_%2Cs%2C1c)_%2Ct%2C1d)_%2Cu%2C1e)_%2Cv%2C1f)_%2Cw%2C20)_%2Cx%2C21)_%2Cy%2C22)_%2Cz%2C23)_%2C_%2C3e)_%2C-%2C3f)%2C0%2C16))&apiv=1&_if(_document_referrer_%2Curlref%2Cignored)_=_document_referrer_&res=_screen_width_x_screen_height_&lang=_browser_language_&gt_ms=_server_response_time_&cs=_document_charset_&pv_id=_substr(_page_view_id_64_%2C0%2C6)_&t_di=_dom_interactive_time_&t_le=_content_load_time_&t_dc=_page_download_time_&t_ee=_page_load_time_",
+    "pageview": "https://!host/ppms.php?action_name=_title_&idsite=!website_id&rec=1&r=_substr(_replace(_random_%2C0.%2C)_%2C0%2C6)_&url=_source_url_&_id=_if(_match(_replace(_client_id(_pk_id.!website_id.!website_hash)__%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)__%2C%5E%5B0-9a-f%5D%7B16%7D%24%2C0)%2C_replace(_client_id(_pk_id.!website_id.!website_hash)_%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)_%2C_substr(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_substr(_tolowercase(_replace(_client_id(_pk_id.!website_id.!website_hash)__%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)__)_%2C4%2C16)_%2Cg%2C10)_%2Ch%2C11)_%2Ci%2C12)_%2Cj%2C13)_%2Ck%2C14)_%2Cl%2C15)_%2Cm%2C16)_%2Cn%2C17)_%2Co%2C18)_%2Cp%2C19)_%2Cq%2C1a)_%2Cr%2C1b)_%2Cs%2C1c)_%2Ct%2C1d)_%2Cu%2C1e)_%2Cv%2C1f)_%2Cw%2C20)_%2Cx%2C21)_%2Cy%2C22)_%2Cz%2C23)_%2C_%2C3e)_%2C-%2C3f)%2C0%2C16))&apiv=1&_if(_document_referrer_%2Curlref%2Cignored)_=_document_referrer_&res=_screen_width_x_screen_height_&lang=_browser_language_&gt_ms=_server_response_time_&cs=_document_charset_&pv_id=_substr(_page_view_id_64_%2C0%2C6)_",
+    "customevent": "https://!host/ppms.php?e_c=!event_category&e_a=!event_action&e_n=!event_name&e_v=_default(!event_value%2C0)_&idsite=!website_id&rec=1&r=_substr(_replace(_random_%2C0.%2C)_%2C0%2C6)_&url=_source_url_&_id=_if(_match(_replace(_client_id(_pk_id.!website_id.!website_hash)__%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)__%2C%5E%5B0-9a-f%5D%7B16%7D%24%2C0)%2C_replace(_client_id(_pk_id.!website_id.!website_hash)_%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)_%2C_substr(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_substr(_tolowercase(_replace(_client_id(_pk_id.!website_id.!website_hash)__%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)__)_%2C4%2C16)_%2Cg%2C10)_%2Ch%2C11)_%2Ci%2C12)_%2Cj%2C13)_%2Ck%2C14)_%2Cl%2C15)_%2Cm%2C16)_%2Cn%2C17)_%2Co%2C18)_%2Cp%2C19)_%2Cq%2C1a)_%2Cr%2C1b)_%2Cs%2C1c)_%2Ct%2C1d)_%2Cu%2C1e)_%2Cv%2C1f)_%2Cw%2C20)_%2Cx%2C21)_%2Cy%2C22)_%2Cz%2C23)_%2C_%2C3e)_%2C-%2C3f)%2C0%2C16))&apiv=1&_if(_document_referrer_%2Curlref%2Cignored)_=_document_referrer_&res=_screen_width_x_screen_height_&lang=_browser_language_&gt_ms=_server_response_time_&cs=_document_charset_&pv_id=_substr(_page_view_id_64_%2C0%2C6)_",
+    "download": "https://!host/ppms.php?download=!download_url&idsite=!website_id&rec=1&r=_substr(_replace(_random_%2C0.%2C)_%2C0%2C6)_&url=_source_url_&_id=_if(_match(_replace(_client_id(_pk_id.!website_id.!website_hash)__%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)__%2C%5E%5B0-9a-f%5D%7B16%7D%24%2C0)%2C_replace(_client_id(_pk_id.!website_id.!website_hash)_%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)_%2C_substr(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_substr(_tolowercase(_replace(_client_id(_pk_id.!website_id.!website_hash)__%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)__)_%2C4%2C16)_%2Cg%2C10)_%2Ch%2C11)_%2Ci%2C12)_%2Cj%2C13)_%2Ck%2C14)_%2Cl%2C15)_%2Cm%2C16)_%2Cn%2C17)_%2Co%2C18)_%2Cp%2C19)_%2Cq%2C1a)_%2Cr%2C1b)_%2Cs%2C1c)_%2Ct%2C1d)_%2Cu%2C1e)_%2Cv%2C1f)_%2Cw%2C20)_%2Cx%2C21)_%2Cy%2C22)_%2Cz%2C23)_%2C_%2C3e)_%2C-%2C3f)%2C0%2C16))&apiv=1&_if(_document_referrer_%2Curlref%2Cignored)_=_document_referrer_&res=_screen_width_x_screen_height_&lang=_browser_language_&gt_ms=_server_response_time_&cs=_document_charset_&pv_id=_substr(_page_view_id_64_%2C0%2C6)_",
+    "outlink": "https://!host/ppms.php?link=!outlink_url&idsite=!website_id&rec=1&r=_substr(_replace(_random_%2C0.%2C)_%2C0%2C6)_&url=_source_url_&_id=_if(_match(_replace(_client_id(_pk_id.!website_id.!website_hash)__%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)__%2C%5E%5B0-9a-f%5D%7B16%7D%24%2C0)%2C_replace(_client_id(_pk_id.!website_id.!website_hash)_%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)_%2C_substr(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_substr(_tolowercase(_replace(_client_id(_pk_id.!website_id.!website_hash)__%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)__)_%2C4%2C16)_%2Cg%2C10)_%2Ch%2C11)_%2Ci%2C12)_%2Cj%2C13)_%2Ck%2C14)_%2Cl%2C15)_%2Cm%2C16)_%2Cn%2C17)_%2Co%2C18)_%2Cp%2C19)_%2Cq%2C1a)_%2Cr%2C1b)_%2Cs%2C1c)_%2Ct%2C1d)_%2Cu%2C1e)_%2Cv%2C1f)_%2Cw%2C20)_%2Cx%2C21)_%2Cy%2C22)_%2Cz%2C23)_%2C_%2C3e)_%2C-%2C3f)%2C0%2C16))&apiv=1&_if(_document_referrer_%2Curlref%2Cignored)_=_document_referrer_&res=_screen_width_x_screen_height_&lang=_browser_language_&gt_ms=_server_response_time_&cs=_document_charset_&pv_id=_substr(_page_view_id_64_%2C0%2C6)_",
+    "search": "https://!host/ppms.php?search=!search_keyword&search_cat=!search_category&search_count=!search_result_count&idsite=!website_id&rec=1&r=_substr(_replace(_random_%2C0.%2C)_%2C0%2C6)_&url=_source_url_&_id=_if(_match(_replace(_client_id(_pk_id.!website_id.!website_hash)__%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)__%2C%5E%5B0-9a-f%5D%7B16%7D%24%2C0)%2C_replace(_client_id(_pk_id.!website_id.!website_hash)_%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)_%2C_substr(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_substr(_tolowercase(_replace(_client_id(_pk_id.!website_id.!website_hash)__%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)__)_%2C4%2C16)_%2Cg%2C10)_%2Ch%2C11)_%2Ci%2C12)_%2Cj%2C13)_%2Ck%2C14)_%2Cl%2C15)_%2Cm%2C16)_%2Cn%2C17)_%2Co%2C18)_%2Cp%2C19)_%2Cq%2C1a)_%2Cr%2C1b)_%2Cs%2C1c)_%2Ct%2C1d)_%2Cu%2C1e)_%2Cv%2C1f)_%2Cw%2C20)_%2Cx%2C21)_%2Cy%2C22)_%2Cz%2C23)_%2C_%2C3e)_%2C-%2C3f)%2C0%2C16))&apiv=1&_if(_document_referrer_%2Curlref%2Cignored)_=_document_referrer_&res=_screen_width_x_screen_height_&lang=_browser_language_&gt_ms=_server_response_time_&cs=_document_charset_&pv_id=_substr(_page_view_id_64_%2C0%2C6)_",
+    "goal": "https://!host/ppms.php?idgoal=!goal_id&revenue=!revenue&idsite=!website_id&rec=1&r=_substr(_replace(_random_%2C0.%2C)_%2C0%2C6)_&url=_source_url_&_id=_if(_match(_replace(_client_id(_pk_id.!website_id.!website_hash)__%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)__%2C%5E%5B0-9a-f%5D%7B16%7D%24%2C0)%2C_replace(_client_id(_pk_id.!website_id.!website_hash)_%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)_%2C_substr(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_replace(_substr(_tolowercase(_replace(_client_id(_pk_id.!website_id.!website_hash)__%2C%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%5BA-Za-z0-9%5D*%5C.%2C)__)_%2C4%2C16)_%2Cg%2C10)_%2Ch%2C11)_%2Ci%2C12)_%2Cj%2C13)_%2Ck%2C14)_%2Cl%2C15)_%2Cm%2C16)_%2Cn%2C17)_%2Co%2C18)_%2Cp%2C19)_%2Cq%2C1a)_%2Cr%2C1b)_%2Cs%2C1c)_%2Ct%2C1d)_%2Cu%2C1e)_%2Cv%2C1f)_%2Cw%2C20)_%2Cx%2C21)_%2Cy%2C22)_%2Cz%2C23)_%2C_%2C3e)_%2C-%2C3f)%2C0%2C16))&apiv=1&_if(_document_referrer_%2Curlref%2Cignored)_=_document_referrer_&res=_screen_width_x_screen_height_&lang=_browser_language_&gt_ms=_server_response_time_&cs=_document_charset_&pv_id=_substr(_page_view_id_64_%2C0%2C6)_"
   },
   "pressboard": {
     "host": "https://sr.studiostack.com",
@@ -488,12 +505,12 @@
     "structEvent": "https://!collectorHost/i?url=_canonical_url_&page=_title_&res=_screen_width_x_screen_height_&stm=_timestamp_&tz=_timezone_code_&aid=!appId&p=web&tv=amp-0.3&cd=_screen_color_depth_&cs=_document_charset_&duid=_client_id(_sp_id)_&lang=_browser_language_&refr=_document_referrer_&vp=_viewport_width_x_viewport_height_&ds=_scroll_width_x_scroll_height_&e=se&se_ca=!structEventCategory&se_ac=!structEventAction&se_la=!structEventLabel&se_pr=!structEventProperty&se_va=!structEventValue"
   },
   "snowplow_v2": {
-    "basePrefix": "https://!collectorHost/i?p=web&tv=amp-1.0.3&url=_ampdoc_url_&tna=!nameTracker&page=_title_&res=_screen_width_x_screen_height_&dtm=_timestamp_&tz=_timezone_code_&aid=!appId&cd=_screen_color_depth_&cs=_document_charset_&lang=_browser_language_&refr=_document_referrer_&vp=_viewport_width_x_viewport_height_&ua=_user_agent_&ds=_scroll_width_x_scroll_height_&uid=!userId&co=%7B%22schema%22%3A%22iglu%3Acom.snowplowanalytics.snowplow%2Fcontexts%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%5B%7B%22schema%22%3A%22iglu%3Adev.amp.snowplow%2Famp_id%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%7B%22ampClientId%22%3A%22_client_id(_sp_ampid)_%22%2C%20%22domainUserid%22%3A%20%22_if(_substr(_query_param(_sp)_%2C0%2C36)_%2C_substr(_query_param(_sp)_%2C0%2C36)_%2C_if(_linker_param(sp_amp_linker%2C_sp_duid)_%2C_linker_param(sp_amp_linker%2C_sp_duid)_%2C_cookie(_sp_duid)_)_)_%22%2C%20%22userId%22%3A%20%22!userId%22%7D%7D%2C_replace(!customContexts%2C%5E%2C*(.%2B%3F)%2C*%24%2C%241%2C)_%7B%22schema%22%3A%22iglu%3Adev.amp.snowplow%2Famp_web_page%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%7B%22ampPageViewId%22%3A%22_page_view_id_64_%22%7D%7D%5D%7D",
-    "pageView": "https://!collectorHost/i?p=web&tv=amp-1.0.3&e=pv&url=_ampdoc_url_&tna=!nameTracker&page=_title_&res=_screen_width_x_screen_height_&dtm=_timestamp_&tz=_timezone_code_&aid=!appId&cd=_screen_color_depth_&cs=_document_charset_&lang=_browser_language_&refr=_document_referrer_&vp=_viewport_width_x_viewport_height_&ua=_user_agent_&ds=_scroll_width_x_scroll_height_&uid=!userId&co=%7B%22schema%22%3A%22iglu%3Acom.snowplowanalytics.snowplow%2Fcontexts%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%5B%7B%22schema%22%3A%22iglu%3Adev.amp.snowplow%2Famp_id%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%7B%22ampClientId%22%3A%22_client_id(_sp_ampid)_%22%2C%20%22domainUserid%22%3A%20%22_if(_substr(_query_param(_sp)_%2C0%2C36)_%2C_substr(_query_param(_sp)_%2C0%2C36)_%2C_if(_linker_param(sp_amp_linker%2C_sp_duid)_%2C_linker_param(sp_amp_linker%2C_sp_duid)_%2C_cookie(_sp_duid)_)_)_%22%2C%20%22userId%22%3A%20%22!userId%22%7D%7D%2C_replace(!customContexts%2C%5E%2C*(.%2B%3F)%2C*%24%2C%241%2C)_%7B%22schema%22%3A%22iglu%3Adev.amp.snowplow%2Famp_web_page%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%7B%22ampPageViewId%22%3A%22_page_view_id_64_%22%7D%7D%5D%7D",
-    "structEvent": "https://!collectorHost/i?p=web&tv=amp-1.0.3&e=se&se_ca=!structEventCategory&se_ac=!structEventAction&se_la=!structEventLabel&se_pr=!structEventProperty&se_va=_if(!structEventValue%2C!structEventValue%2Cnull)_&url=_ampdoc_url_&tna=!nameTracker&page=_title_&res=_screen_width_x_screen_height_&dtm=_timestamp_&tz=_timezone_code_&aid=!appId&cd=_screen_color_depth_&cs=_document_charset_&lang=_browser_language_&refr=_document_referrer_&vp=_viewport_width_x_viewport_height_&ua=_user_agent_&ds=_scroll_width_x_scroll_height_&uid=!userId&co=%7B%22schema%22%3A%22iglu%3Acom.snowplowanalytics.snowplow%2Fcontexts%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%5B%7B%22schema%22%3A%22iglu%3Adev.amp.snowplow%2Famp_id%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%7B%22ampClientId%22%3A%22_client_id(_sp_ampid)_%22%2C%20%22domainUserid%22%3A%20%22_if(_substr(_query_param(_sp)_%2C0%2C36)_%2C_substr(_query_param(_sp)_%2C0%2C36)_%2C_if(_linker_param(sp_amp_linker%2C_sp_duid)_%2C_linker_param(sp_amp_linker%2C_sp_duid)_%2C_cookie(_sp_duid)_)_)_%22%2C%20%22userId%22%3A%20%22!userId%22%7D%7D%2C_replace(!customContexts%2C%5E%2C*(.%2B%3F)%2C*%24%2C%241%2C)_%7B%22schema%22%3A%22iglu%3Adev.amp.snowplow%2Famp_web_page%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%7B%22ampPageViewId%22%3A%22_page_view_id_64_%22%7D%7D%5D%7D",
-    "pagePing": "https://!collectorHost/i?p=web&tv=amp-1.0.3&e=pp&pp_mix=_scroll_left_&pp_miy=_scroll_top_&url=_ampdoc_url_&tna=!nameTracker&page=_title_&res=_screen_width_x_screen_height_&dtm=_timestamp_&tz=_timezone_code_&aid=!appId&cd=_screen_color_depth_&cs=_document_charset_&lang=_browser_language_&refr=_document_referrer_&vp=_viewport_width_x_viewport_height_&ua=_user_agent_&ds=_scroll_width_x_scroll_height_&uid=!userId&co=%7B%22schema%22%3A%22iglu%3Acom.snowplowanalytics.snowplow%2Fcontexts%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%5B%7B%22schema%22%3A%22iglu%3Adev.amp.snowplow%2Famp_id%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%7B%22ampClientId%22%3A%22_client_id(_sp_ampid)_%22%2C%20%22domainUserid%22%3A%20%22_if(_substr(_query_param(_sp)_%2C0%2C36)_%2C_substr(_query_param(_sp)_%2C0%2C36)_%2C_if(_linker_param(sp_amp_linker%2C_sp_duid)_%2C_linker_param(sp_amp_linker%2C_sp_duid)_%2C_cookie(_sp_duid)_)_)_%22%2C%20%22userId%22%3A%20%22!userId%22%7D%7D%2C_replace(!customContexts%2C%5E%2C*(.%2B%3F)%2C*%24%2C%241%2C)_%7B%22schema%22%3A%22iglu%3Adev.amp.snowplow%2Famp_web_page%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%7B%22ampPageViewId%22%3A%22_page_view_id_64_%22%7D%7D%5D%7D",
-    "selfDescribingEvent": "https://!collectorHost/i?p=web&tv=amp-1.0.3&e=ue&ue_pr=%7B%22schema%22%3A%22iglu%3Acom.snowplowanalytics.snowplow%2Funstruct_event%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%7B%22schema%22%3A%22iglu%3A!customEventSchemaVendor%2F!customEventSchemaName%2Fjsonschema%2F!customEventSchemaVersion%22%2C%22data%22%3A!customEventSchemaData%7D%7D&url=_ampdoc_url_&tna=!nameTracker&page=_title_&res=_screen_width_x_screen_height_&dtm=_timestamp_&tz=_timezone_code_&aid=!appId&cd=_screen_color_depth_&cs=_document_charset_&lang=_browser_language_&refr=_document_referrer_&vp=_viewport_width_x_viewport_height_&ua=_user_agent_&ds=_scroll_width_x_scroll_height_&uid=!userId&co=%7B%22schema%22%3A%22iglu%3Acom.snowplowanalytics.snowplow%2Fcontexts%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%5B%7B%22schema%22%3A%22iglu%3Adev.amp.snowplow%2Famp_id%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%7B%22ampClientId%22%3A%22_client_id(_sp_ampid)_%22%2C%20%22domainUserid%22%3A%20%22_if(_substr(_query_param(_sp)_%2C0%2C36)_%2C_substr(_query_param(_sp)_%2C0%2C36)_%2C_if(_linker_param(sp_amp_linker%2C_sp_duid)_%2C_linker_param(sp_amp_linker%2C_sp_duid)_%2C_cookie(_sp_duid)_)_)_%22%2C%20%22userId%22%3A%20%22!userId%22%7D%7D%2C_replace(!customContexts%2C%5E%2C*(.%2B%3F)%2C*%24%2C%241%2C)_%7B%22schema%22%3A%22iglu%3Adev.amp.snowplow%2Famp_web_page%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%7B%22ampPageViewId%22%3A%22_page_view_id_64_%22%7D%7D%5D%7D",
-    "ampPagePing": "https://!collectorHost/i?p=web&tv=amp-1.0.3&e=ue&ue_pr=%7B%22schema%22%3A%22iglu%3Acom.snowplowanalytics.snowplow%2Funstruct_event%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%7B%22schema%22%3A%22iglu%3Adev.amp.snowplow%2Famp_page_ping%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%7B%22scrollLeft%22%3A_scroll_left_%2C%22scrollWidth%22%3A_scroll_width_%2C%22viewportWidth%22%3A_viewport_width_%2C%22scrollTop%22%3A_scroll_top_%2C%22scrollHeight%22%3A_scroll_height_%2C%22viewportHeight%22%3A_viewport_height_%2C%22totalEngagedTime%22%3A_total_engaged_time_%7D%7D%7D&url=_ampdoc_url_&tna=!nameTracker&page=_title_&res=_screen_width_x_screen_height_&dtm=_timestamp_&tz=_timezone_code_&aid=!appId&cd=_screen_color_depth_&cs=_document_charset_&lang=_browser_language_&refr=_document_referrer_&vp=_viewport_width_x_viewport_height_&ua=_user_agent_&ds=_scroll_width_x_scroll_height_&uid=!userId&co=%7B%22schema%22%3A%22iglu%3Acom.snowplowanalytics.snowplow%2Fcontexts%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%5B%7B%22schema%22%3A%22iglu%3Adev.amp.snowplow%2Famp_id%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%7B%22ampClientId%22%3A%22_client_id(_sp_ampid)_%22%2C%20%22domainUserid%22%3A%20%22_if(_substr(_query_param(_sp)_%2C0%2C36)_%2C_substr(_query_param(_sp)_%2C0%2C36)_%2C_if(_linker_param(sp_amp_linker%2C_sp_duid)_%2C_linker_param(sp_amp_linker%2C_sp_duid)_%2C_cookie(_sp_duid)_)_)_%22%2C%20%22userId%22%3A%20%22!userId%22%7D%7D%2C_replace(!customContexts%2C%5E%2C*(.%2B%3F)%2C*%24%2C%241%2C)_%7B%22schema%22%3A%22iglu%3Adev.amp.snowplow%2Famp_web_page%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%7B%22ampPageViewId%22%3A%22_page_view_id_64_%22%7D%7D%5D%7D"
+    "basePrefix": "https://!collectorHost/i?p=web&tv=amp-1.1.0&url=_ampdoc_url_&tna=!nameTracker&page=_title_&res=_screen_width_x_screen_height_&dtm=_timestamp_&tz=_timezone_code_&aid=!appId&cd=_screen_color_depth_&cs=_document_charset_&lang=_browser_language_&refr=_document_referrer_&vp=_viewport_width_x_viewport_height_&ua=_user_agent_&ds=_scroll_width_x_scroll_height_&uid=!userId&co=%7B%22schema%22%3A%22iglu%3Acom.snowplowanalytics.snowplow%2Fcontexts%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%5B%7B%22schema%22%3A%22iglu%3Adev.amp.snowplow%2Famp_id%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%7B%22ampClientId%22%3A%22_client_id(_sp_ampid)_%22%2C%22domainUserid%22%3A%22_if(_substr(_query_param(_sp)_%2C0%2C36)_%2C_substr(_query_param(_sp)_%2C0%2C36)_%2C_if(_linker_param(sp_amp_linker%2C_sp_duid)_%2C_linker_param(sp_amp_linker%2C_sp_duid)_%2C_cookie(_sp_duid)_)_)_%22%2C%22userId%22%3A%22!userId%22%7D%7D%2C%7B%22schema%22%3A%22iglu%3Adev.amp.snowplow%2Famp_session%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%7B%22ampSessionId%22%3ASESSION_ID%2C%22ampSessionIndex%22%3ASESSION_COUNT%2C%22sessionEngaged%22%3A_if(SESSION_ENGAGED%2Ctrue%2Cfalse)_%2C%22sessionCreationTimestamp%22%3ASESSION__timestamp__if(SESSION_EVENT__timestamp_%2C%2C%22lastSessionEventTimestamp%22%3ASESSION_EVENT__timestamp_)_%7D%7D%2C_replace(!customContexts%2C%5E%2C*(.%2B%3F)%2C*%24%2C%241%2C)_%7B%22schema%22%3A%22iglu%3Adev.amp.snowplow%2Famp_web_page%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%7B%22ampPageViewId%22%3A%22_page_view_id_64_%22%7D%7D%5D%7D",
+    "pageView": "https://!collectorHost/i?p=web&tv=amp-1.1.0&e=pv&url=_ampdoc_url_&tna=!nameTracker&page=_title_&res=_screen_width_x_screen_height_&dtm=_timestamp_&tz=_timezone_code_&aid=!appId&cd=_screen_color_depth_&cs=_document_charset_&lang=_browser_language_&refr=_document_referrer_&vp=_viewport_width_x_viewport_height_&ua=_user_agent_&ds=_scroll_width_x_scroll_height_&uid=!userId&co=%7B%22schema%22%3A%22iglu%3Acom.snowplowanalytics.snowplow%2Fcontexts%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%5B%7B%22schema%22%3A%22iglu%3Adev.amp.snowplow%2Famp_id%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%7B%22ampClientId%22%3A%22_client_id(_sp_ampid)_%22%2C%22domainUserid%22%3A%22_if(_substr(_query_param(_sp)_%2C0%2C36)_%2C_substr(_query_param(_sp)_%2C0%2C36)_%2C_if(_linker_param(sp_amp_linker%2C_sp_duid)_%2C_linker_param(sp_amp_linker%2C_sp_duid)_%2C_cookie(_sp_duid)_)_)_%22%2C%22userId%22%3A%22!userId%22%7D%7D%2C%7B%22schema%22%3A%22iglu%3Adev.amp.snowplow%2Famp_session%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%7B%22ampSessionId%22%3ASESSION_ID%2C%22ampSessionIndex%22%3ASESSION_COUNT%2C%22sessionEngaged%22%3A_if(SESSION_ENGAGED%2Ctrue%2Cfalse)_%2C%22sessionCreationTimestamp%22%3ASESSION__timestamp__if(SESSION_EVENT__timestamp_%2C%2C%22lastSessionEventTimestamp%22%3ASESSION_EVENT__timestamp_)_%7D%7D%2C_replace(!customContexts%2C%5E%2C*(.%2B%3F)%2C*%24%2C%241%2C)_%7B%22schema%22%3A%22iglu%3Adev.amp.snowplow%2Famp_web_page%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%7B%22ampPageViewId%22%3A%22_page_view_id_64_%22%7D%7D%5D%7D",
+    "structEvent": "https://!collectorHost/i?p=web&tv=amp-1.1.0&e=se&se_ca=!structEventCategory&se_ac=!structEventAction&se_la=!structEventLabel&se_pr=!structEventProperty&se_va=_if(!structEventValue%2C!structEventValue%2Cnull)_&url=_ampdoc_url_&tna=!nameTracker&page=_title_&res=_screen_width_x_screen_height_&dtm=_timestamp_&tz=_timezone_code_&aid=!appId&cd=_screen_color_depth_&cs=_document_charset_&lang=_browser_language_&refr=_document_referrer_&vp=_viewport_width_x_viewport_height_&ua=_user_agent_&ds=_scroll_width_x_scroll_height_&uid=!userId&co=%7B%22schema%22%3A%22iglu%3Acom.snowplowanalytics.snowplow%2Fcontexts%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%5B%7B%22schema%22%3A%22iglu%3Adev.amp.snowplow%2Famp_id%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%7B%22ampClientId%22%3A%22_client_id(_sp_ampid)_%22%2C%22domainUserid%22%3A%22_if(_substr(_query_param(_sp)_%2C0%2C36)_%2C_substr(_query_param(_sp)_%2C0%2C36)_%2C_if(_linker_param(sp_amp_linker%2C_sp_duid)_%2C_linker_param(sp_amp_linker%2C_sp_duid)_%2C_cookie(_sp_duid)_)_)_%22%2C%22userId%22%3A%22!userId%22%7D%7D%2C%7B%22schema%22%3A%22iglu%3Adev.amp.snowplow%2Famp_session%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%7B%22ampSessionId%22%3ASESSION_ID%2C%22ampSessionIndex%22%3ASESSION_COUNT%2C%22sessionEngaged%22%3A_if(SESSION_ENGAGED%2Ctrue%2Cfalse)_%2C%22sessionCreationTimestamp%22%3ASESSION__timestamp__if(SESSION_EVENT__timestamp_%2C%2C%22lastSessionEventTimestamp%22%3ASESSION_EVENT__timestamp_)_%7D%7D%2C_replace(!customContexts%2C%5E%2C*(.%2B%3F)%2C*%24%2C%241%2C)_%7B%22schema%22%3A%22iglu%3Adev.amp.snowplow%2Famp_web_page%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%7B%22ampPageViewId%22%3A%22_page_view_id_64_%22%7D%7D%5D%7D",
+    "pagePing": "https://!collectorHost/i?p=web&tv=amp-1.1.0&e=pp&pp_mix=_scroll_left_&pp_miy=_scroll_top_&url=_ampdoc_url_&tna=!nameTracker&page=_title_&res=_screen_width_x_screen_height_&dtm=_timestamp_&tz=_timezone_code_&aid=!appId&cd=_screen_color_depth_&cs=_document_charset_&lang=_browser_language_&refr=_document_referrer_&vp=_viewport_width_x_viewport_height_&ua=_user_agent_&ds=_scroll_width_x_scroll_height_&uid=!userId&co=%7B%22schema%22%3A%22iglu%3Acom.snowplowanalytics.snowplow%2Fcontexts%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%5B%7B%22schema%22%3A%22iglu%3Adev.amp.snowplow%2Famp_id%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%7B%22ampClientId%22%3A%22_client_id(_sp_ampid)_%22%2C%22domainUserid%22%3A%22_if(_substr(_query_param(_sp)_%2C0%2C36)_%2C_substr(_query_param(_sp)_%2C0%2C36)_%2C_if(_linker_param(sp_amp_linker%2C_sp_duid)_%2C_linker_param(sp_amp_linker%2C_sp_duid)_%2C_cookie(_sp_duid)_)_)_%22%2C%22userId%22%3A%22!userId%22%7D%7D%2C%7B%22schema%22%3A%22iglu%3Adev.amp.snowplow%2Famp_session%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%7B%22ampSessionId%22%3ASESSION_ID%2C%22ampSessionIndex%22%3ASESSION_COUNT%2C%22sessionEngaged%22%3A_if(SESSION_ENGAGED%2Ctrue%2Cfalse)_%2C%22sessionCreationTimestamp%22%3ASESSION__timestamp__if(SESSION_EVENT__timestamp_%2C%2C%22lastSessionEventTimestamp%22%3ASESSION_EVENT__timestamp_)_%7D%7D%2C_replace(!customContexts%2C%5E%2C*(.%2B%3F)%2C*%24%2C%241%2C)_%7B%22schema%22%3A%22iglu%3Adev.amp.snowplow%2Famp_web_page%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%7B%22ampPageViewId%22%3A%22_page_view_id_64_%22%7D%7D%5D%7D",
+    "selfDescribingEvent": "https://!collectorHost/i?p=web&tv=amp-1.1.0&e=ue&ue_pr=%7B%22schema%22%3A%22iglu%3Acom.snowplowanalytics.snowplow%2Funstruct_event%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%7B%22schema%22%3A%22iglu%3A!customEventSchemaVendor%2F!customEventSchemaName%2Fjsonschema%2F!customEventSchemaVersion%22%2C%22data%22%3A!customEventSchemaData%7D%7D&url=_ampdoc_url_&tna=!nameTracker&page=_title_&res=_screen_width_x_screen_height_&dtm=_timestamp_&tz=_timezone_code_&aid=!appId&cd=_screen_color_depth_&cs=_document_charset_&lang=_browser_language_&refr=_document_referrer_&vp=_viewport_width_x_viewport_height_&ua=_user_agent_&ds=_scroll_width_x_scroll_height_&uid=!userId&co=%7B%22schema%22%3A%22iglu%3Acom.snowplowanalytics.snowplow%2Fcontexts%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%5B%7B%22schema%22%3A%22iglu%3Adev.amp.snowplow%2Famp_id%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%7B%22ampClientId%22%3A%22_client_id(_sp_ampid)_%22%2C%22domainUserid%22%3A%22_if(_substr(_query_param(_sp)_%2C0%2C36)_%2C_substr(_query_param(_sp)_%2C0%2C36)_%2C_if(_linker_param(sp_amp_linker%2C_sp_duid)_%2C_linker_param(sp_amp_linker%2C_sp_duid)_%2C_cookie(_sp_duid)_)_)_%22%2C%22userId%22%3A%22!userId%22%7D%7D%2C%7B%22schema%22%3A%22iglu%3Adev.amp.snowplow%2Famp_session%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%7B%22ampSessionId%22%3ASESSION_ID%2C%22ampSessionIndex%22%3ASESSION_COUNT%2C%22sessionEngaged%22%3A_if(SESSION_ENGAGED%2Ctrue%2Cfalse)_%2C%22sessionCreationTimestamp%22%3ASESSION__timestamp__if(SESSION_EVENT__timestamp_%2C%2C%22lastSessionEventTimestamp%22%3ASESSION_EVENT__timestamp_)_%7D%7D%2C_replace(!customContexts%2C%5E%2C*(.%2B%3F)%2C*%24%2C%241%2C)_%7B%22schema%22%3A%22iglu%3Adev.amp.snowplow%2Famp_web_page%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%7B%22ampPageViewId%22%3A%22_page_view_id_64_%22%7D%7D%5D%7D",
+    "ampPagePing": "https://!collectorHost/i?p=web&tv=amp-1.1.0&e=ue&ue_pr=%7B%22schema%22%3A%22iglu%3Acom.snowplowanalytics.snowplow%2Funstruct_event%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%7B%22schema%22%3A%22iglu%3Adev.amp.snowplow%2Famp_page_ping%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%7B%22scrollLeft%22%3A_scroll_left_%2C%22scrollWidth%22%3A_scroll_width_%2C%22viewportWidth%22%3A_viewport_width_%2C%22scrollTop%22%3A_scroll_top_%2C%22scrollHeight%22%3A_scroll_height_%2C%22viewportHeight%22%3A_viewport_height_%2C%22totalEngagedTime%22%3A_total_engaged_time_%7D%7D%7D&url=_ampdoc_url_&tna=!nameTracker&page=_title_&res=_screen_width_x_screen_height_&dtm=_timestamp_&tz=_timezone_code_&aid=!appId&cd=_screen_color_depth_&cs=_document_charset_&lang=_browser_language_&refr=_document_referrer_&vp=_viewport_width_x_viewport_height_&ua=_user_agent_&ds=_scroll_width_x_scroll_height_&uid=!userId&co=%7B%22schema%22%3A%22iglu%3Acom.snowplowanalytics.snowplow%2Fcontexts%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%5B%7B%22schema%22%3A%22iglu%3Adev.amp.snowplow%2Famp_id%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%7B%22ampClientId%22%3A%22_client_id(_sp_ampid)_%22%2C%22domainUserid%22%3A%22_if(_substr(_query_param(_sp)_%2C0%2C36)_%2C_substr(_query_param(_sp)_%2C0%2C36)_%2C_if(_linker_param(sp_amp_linker%2C_sp_duid)_%2C_linker_param(sp_amp_linker%2C_sp_duid)_%2C_cookie(_sp_duid)_)_)_%22%2C%22userId%22%3A%22!userId%22%7D%7D%2C%7B%22schema%22%3A%22iglu%3Adev.amp.snowplow%2Famp_session%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%7B%22ampSessionId%22%3ASESSION_ID%2C%22ampSessionIndex%22%3ASESSION_COUNT%2C%22sessionEngaged%22%3A_if(SESSION_ENGAGED%2Ctrue%2Cfalse)_%2C%22sessionCreationTimestamp%22%3ASESSION__timestamp__if(SESSION_EVENT__timestamp_%2C%2C%22lastSessionEventTimestamp%22%3ASESSION_EVENT__timestamp_)_%7D%7D%2C_replace(!customContexts%2C%5E%2C*(.%2B%3F)%2C*%24%2C%241%2C)_%7B%22schema%22%3A%22iglu%3Adev.amp.snowplow%2Famp_web_page%2Fjsonschema%2F1-0-0%22%2C%22data%22%3A%7B%22ampPageViewId%22%3A%22_page_view_id_64_%22%7D%7D%5D%7D"
   },
   "taboola": {
     "loadamptrkhtml": "https://c3.taboola.com/amp/amp-analytics-taboola.html?url=_canonical_url_&aid=!aid&cnsntstr=_consent_string_&cnsntst=_if(_equals(_consent_state_%2Csufficient)_%2C1)__if(_equals(_consent_state_%2Cinsufficient)_%2C0)__if(_equals(_consent_state_%2C)_%2C-1)_"
@@ -542,6 +559,16 @@
     "pageview": "https://in.treasuredata.com/postback/v3/event/!database/events?td_write_key=!writeKey&td_global_id=td_global_id&td_client_id=_client_id(_td)_&td_charset=_document_charset_&td_language=_browser_language_&td_color=_screen_color_depth_&td_screen=_screen_width_x_scroll_height_&td_viewport=_available_screen_width_x_available_screen_height_&td_title=_title_&td_url=_source_url_&td_user_agent=_user_agent_&td_host=_source_host_&td_path=_source_path_&td_referrer=_document_referrer_&td_ip=td_ip",
     "event": "https://in.treasuredata.com/postback/v3/event/!database/events?td_write_key=!writeKey&td_global_id=td_global_id&td_client_id=_client_id(_td)_&td_charset=_document_charset_&td_language=_browser_language_&td_color=_screen_color_depth_&td_screen=_screen_width_x_scroll_height_&td_viewport=_available_screen_width_x_available_screen_height_&td_title=_title_&td_url=_source_url_&td_user_agent=_user_agent_&td_host=_source_host_&td_path=_source_path_&td_referrer=_document_referrer_&td_ip=td_ip"
   },
+  "tribooanalytics": {
+    "base": "https://amp.tribooanalytics.com/cgi-bin/ampta.cgi",
+    "commpar": "AMP=1&RM=_random_&USER=!account&PAG=!page&HR=_source_url_&REFER=_document_referrer_&RES=_screen_width_X_screen_height_&COLOR=_screen_color_depth_&CID=_client_id(AMP_CID)_&PAGID=_page_view_id_&TITL=_title_&RQC=1",
+    "pagepar": "&VIE=_viewer_&PLT=_page_load_time_",
+    "eventpar": "&SSXL=1",
+    "linkpar": "&LINK=!outboundLink",
+    "pageview": "https://amp.tribooanalytics.com/cgi-bin/ampta.cgi?AMP=1&RM=_random_&USER=!account&PAG=!page&HR=_source_url_&REFER=_document_referrer_&RES=_screen_width_X_screen_height_&COLOR=_screen_color_depth_&CID=_client_id(AMP_CID)_&PAGID=_page_view_id_&TITL=_title_&RQC=1&VIE=_viewer_&PLT=_page_load_time_",
+    "event": "https://amp.tribooanalytics.com/cgi-bin/ampta.cgi?AMP=1&RM=_random_&USER=!account&PAG=!page&HR=_source_url_&REFER=_document_referrer_&RES=_screen_width_X_screen_height_&COLOR=_screen_color_depth_&CID=_client_id(AMP_CID)_&PAGID=_page_view_id_&TITL=_title_&RQC=1&SSXL=1",
+    "link": "https://amp.tribooanalytics.com/cgi-bin/ampta.cgi?AMP=1&RM=_random_&USER=!account&PAG=!page&HR=_source_url_&REFER=_document_referrer_&RES=_screen_width_X_screen_height_&COLOR=_screen_color_depth_&CID=_client_id(AMP_CID)_&PAGID=_page_view_id_&TITL=_title_&RQC=1&LINK=!outboundLink"
+  },
   "umenganalytics": {
     "base": "https://b.cnzz.com/utrack?&_siteid=!siteid&_distinct_id=_client_id(umeng_amp_id)_&_t=_timestamp_&_s=google&_b=web&_r=_external_referrer_&_h=_screen_height_&_w=_screen_width_&_ivt=!initial_view_time",
     "pageview": "https://b.cnzz.com/utrack?&_siteid=!siteid&_distinct_id=_client_id(umeng_amp_id)_&_t=_timestamp_&_s=google&_b=web&_r=_external_referrer_&_h=_screen_height_&_w=_screen_width_&_ivt=!initial_view_time&_ename=$w_page_view&_eprops=!eventProps",
diff --git a/extensions/amp-analytics/0.1/transport-serializer.js b/extensions/amp-analytics/0.1/transport-serializer.js
index 38f168fbbf16..e02839a01ec6 100644
--- a/extensions/amp-analytics/0.1/transport-serializer.js
+++ b/extensions/amp-analytics/0.1/transport-serializer.js
@@ -83,7 +83,7 @@ class DefaultTransportSerializer {
  * Please register your serializer below.
  * Please keep the object in alphabetic order.
  *
- * @const {Object<string, TransportSerializerDef>}
+ * @const {{[key: string]: TransportSerializerDef}}
  */
 export const TransportSerializers = {
   'default': new DefaultTransportSerializer(),
diff --git a/extensions/amp-analytics/0.1/transport.js b/extensions/amp-analytics/0.1/transport.js
index f67fcce0726b..83fca0ae3367 100644
--- a/extensions/amp-analytics/0.1/transport.js
+++ b/extensions/amp-analytics/0.1/transport.js
@@ -1,3 +1,14 @@
+import {removeElement} from '#core/dom';
+import {toggle} from '#core/dom/style';
+import {getWin} from '#core/window';
+import {WindowInterface} from '#core/window/interface';
+
+import {Services} from '#service';
+
+import {loadPromise} from '#utils/event-helper';
+import {dev, user, userAssert} from '#utils/log';
+
+import {IframeTransport} from './iframe-transport';
 import {
   BatchSegmentDef,
   RequestDef,
@@ -5,25 +16,17 @@ import {
   TransportSerializers,
   defaultSerializer,
 } from './transport-serializer';
-import {IframeTransport} from './iframe-transport';
-import {Services} from '#service';
-import {WindowInterface} from '#core/window/interface';
+
+import {getAmpAdResourceId} from '../../../src/ad-helper';
+import {getMode} from '../../../src/mode';
+import {createPixel} from '../../../src/pixel';
+import {getTopWindow} from '../../../src/service-helpers';
 import {
   assertHttpsUrl,
   checkCorsUrl,
   isAmpScriptUri,
   parseUrlDeprecated,
 } from '../../../src/url';
-import {createPixel} from '../../../src/pixel';
-import {dev, user, userAssert} from '#utils/log';
-import {getAmpAdResourceId} from '../../../src/ad-helper';
-import {getMode} from '../../../src/mode';
-import {getTopWindow} from '../../../src/service-helpers';
-
-import {loadPromise} from '#utils/event-helper';
-import {removeElement} from '#core/dom';
-import {getWin} from '#core/window';
-import {toggle} from '#core/dom/style';
 
 /** @const {string} */
 const TAG_ = 'amp-analytics/transport';
@@ -65,6 +68,11 @@ export class Transport {
 
     /** @private {boolean} */
     this.isInabox_ = getMode(this.win_).runtime == 'inabox';
+
+    /** @private {string|undefined} */
+    this.attributionSrc_ = /** @type {string|undefined} */ (
+      this.options_['attributionsrc']
+    );
   }
 
   /**
@@ -132,7 +140,9 @@ export class Transport {
         this.win_,
         getRequest(false),
         suppressWarnings,
-        /** @type {string|undefined} */ (this.referrerPolicy_)
+        /** @type {string|undefined} */ (this.referrerPolicy_),
+        /** @type {string|undefined} */ (this.attributionSrc_),
+        this.ampdoc_
       );
       return;
     }
@@ -238,12 +248,28 @@ export class Transport {
    * @param {!RequestDef} request
    * @param {boolean} suppressWarnings
    * @param {string|undefined} referrerPolicy
+   * @param {string|undefined} attributionSrc
+   * @param {!Element|!./service/ampdoc-impl.AmpDoc} elementOrAmpDoc Whether services are provided by an
+   *     element.
    */
-  static sendRequestUsingImage(win, request, suppressWarnings, referrerPolicy) {
+  static sendRequestUsingImage(
+    win,
+    request,
+    suppressWarnings,
+    referrerPolicy,
+    attributionSrc,
+    elementOrAmpDoc
+  ) {
     if (!win) {
       return;
     }
-    const image = createPixel(win, request.url, referrerPolicy);
+    const image = createPixel(
+      win,
+      request.url,
+      referrerPolicy,
+      attributionSrc,
+      elementOrAmpDoc
+    );
     loadPromise(image)
       .then(() => {
         dev().fine(TAG_, 'Sent image request', request.url);
diff --git a/extensions/amp-analytics/0.1/variables.js b/extensions/amp-analytics/0.1/variables.js
index ee89f2318a11..0ebc1790777e 100644
--- a/extensions/amp-analytics/0.1/variables.js
+++ b/extensions/amp-analytics/0.1/variables.js
@@ -1,26 +1,29 @@
-import {SESSION_VALUES, sessionServicePromiseForDoc} from './session-manager';
-import {Services} from '#service';
-import {TickLabel} from '#core/constants/enums';
+import {TickLabel_Enum} from '#core/constants/enums';
+import {isArray, isFiniteNumber} from '#core/types';
 import {asyncStringReplace} from '#core/types/string';
 import {base64UrlEncodeFromString} from '#core/types/string/base64';
-import {cookieReader} from './cookie-reader';
-import {dev, devAssert, user, userAssert} from '#utils/log';
-import {dict} from '#core/types/object';
+
 import {getActiveExperimentBranches, getExperimentBranch} from '#experiments';
+
+import {Services} from '#service';
+
+import {dev, devAssert, user, userAssert} from '#utils/log';
+
+import {cookieReader} from './cookie-reader';
+import {linkerReaderServiceFor} from './linker-reader';
+import {SESSION_VALUES, sessionServicePromiseForDoc} from './session-manager';
+
 import {
   getConsentMetadata,
   getConsentPolicyInfo,
   getConsentPolicyState,
 } from '../../../src/consent';
+import {isInFie} from '../../../src/iframe-helper';
 import {
   getServiceForDoc,
   getServicePromiseForDoc,
   registerServiceBuilderForDoc,
 } from '../../../src/service-helpers';
-import {isArray, isFiniteNumber} from '#core/types';
-
-import {isInFie} from '../../../src/iframe-helper';
-import {linkerReaderServiceFor} from './linker-reader';
 
 /** @const {string} */
 const TAG = 'amp-analytics/variables';
@@ -46,12 +49,12 @@ let FunctionNameArgsDef;
  */
 export class ExpansionOptions {
   /**
-   * @param {!Object<string, *>} vars
+   * @param {!{[key: string]: *}} vars
    * @param {number=} opt_iterations
    * @param {boolean=} opt_noEncode
    */
   constructor(vars, opt_iterations, opt_noEncode) {
-    /** @const {!Object<string, string|Array<string>>} */
+    /** @const {!{[key: string]: string|Array<string>}} */
     this.vars = vars;
     /** @const {number} */
     this.iterations = opt_iterations === undefined ? 2 : opt_iterations;
@@ -230,7 +233,7 @@ export class VariableService {
     this.ampdoc_ = ampdoc;
 
     /** @private {!JsonObject} */
-    this.macros_ = dict({});
+    this.macros_ = {};
 
     /** @const @private {!./linker-reader.LinkerReader} */
     this.linkerReader_ = linkerReaderServiceFor(this.ampdoc_.win);
@@ -326,27 +329,31 @@ export class VariableService {
       : {
           'FIRST_CONTENTFUL_PAINT': () =>
             Services.performanceFor(this.ampdoc_.win).getMetric(
-              TickLabel.FIRST_CONTENTFUL_PAINT_VISIBLE
+              TickLabel_Enum.FIRST_CONTENTFUL_PAINT_VISIBLE
             ),
           'FIRST_VIEWPORT_READY': () =>
             Services.performanceFor(this.ampdoc_.win).getMetric(
-              TickLabel.FIRST_VIEWPORT_READY
+              TickLabel_Enum.FIRST_VIEWPORT_READY
             ),
           'MAKE_BODY_VISIBLE': () =>
             Services.performanceFor(this.ampdoc_.win).getMetric(
-              TickLabel.MAKE_BODY_VISIBLE
+              TickLabel_Enum.MAKE_BODY_VISIBLE
             ),
           'LARGEST_CONTENTFUL_PAINT': () =>
             Services.performanceFor(this.ampdoc_.win).getMetric(
-              TickLabel.LARGEST_CONTENTFUL_PAINT_VISIBLE
+              TickLabel_Enum.LARGEST_CONTENTFUL_PAINT_VISIBLE
             ),
           'FIRST_INPUT_DELAY': () =>
             Services.performanceFor(this.ampdoc_.win).getMetric(
-              TickLabel.FIRST_INPUT_DELAY
+              TickLabel_Enum.FIRST_INPUT_DELAY
             ),
           'CUMULATIVE_LAYOUT_SHIFT': () =>
             Services.performanceFor(this.ampdoc_.win).getMetric(
-              TickLabel.CUMULATIVE_LAYOUT_SHIFT
+              TickLabel_Enum.CUMULATIVE_LAYOUT_SHIFT
+            ),
+          'INTERACTION_TO_NEXT_PAINT': () =>
+            Services.performanceFor(this.ampdoc_.win).getMetric(
+              TickLabel_Enum.INTERACTION_TO_NEXT_PAINT
             ),
         };
     const merged = {
@@ -392,7 +399,7 @@ export class VariableService {
    * @return {!Promise<string>} The expanded string.
    */
   expandTemplate(template, options, element, opt_bindings, opt_allowlist) {
-    return asyncStringReplace(template, /\${([^}]*)}/g, (match, key) => {
+    return asyncStringReplace(template, /\${([^{}]*)}/g, (match, key) => {
       if (options.iterations < 0) {
         user().error(
           TAG,
diff --git a/extensions/amp-analytics/0.1/vendors/OWNERS b/extensions/amp-analytics/0.1/vendors/OWNERS
index eb8f74b4913f..dac69a53f8c5 100644
--- a/extensions/amp-analytics/0.1/vendors/OWNERS
+++ b/extensions/amp-analytics/0.1/vendors/OWNERS
@@ -9,6 +9,18 @@
         {name: 'ampproject/wg-components'},
         {name: 'AppsFlyer'},
         {name: 'fredsh2k'},
+        {name: 'zvalmog', notify: true},
+      ],
+    },
+    // Vendor file for mapp intelligence
+    {
+      pattern: 'mapp_intelligence.json',
+      owners: [
+        {name: 'ampproject/wg-components'},
+        {name: 'Webtrekk'},
+        {name: 'mapp-digital'},
+        {name: 'StephanGuenther', notify: true},
+        {name: 'stiegi', notify: true},
       ],
     },
   ],
diff --git a/extensions/amp-analytics/0.1/vendors/blueconic.json b/extensions/amp-analytics/0.1/vendors/blueconic.json
index 3dfb466744ef..e0266af64515 100644
--- a/extensions/amp-analytics/0.1/vendors/blueconic.json
+++ b/extensions/amp-analytics/0.1/vendors/blueconic.json
@@ -2,7 +2,8 @@
   "requests": {
     "event": "https://${tenantId}/s/${pixelId}.gif?",
     "trackingIdentifier": "${event}property=${property}&${property}=${clientId(cid-scope-cookie-fallback-name)}${extraTrackingValues}",
-    "defaultTrackingValues": "${trackingIdentifier}&sourceUrl=${sourceUrl}&canonicalUrl=${canonicalUrl}&referrer=${documentReferrer}&title=${title}&visitDate=${timestamp}&geoLocation=${ampGeo(ISOCountry)}&userAgent=${userAgent}"
+    "defaultTrackingValues": "${trackingIdentifier}&sourceUrl=${sourceUrl}&canonicalUrl=${canonicalUrl}&referrer=${documentReferrer}&title=${title}&visitDate=${timestamp}&geoLocation=${ampGeo(ISOCountry)}&userAgent=${userAgent}&canonicalHostname=${canonicalHostname}&deviceType=${deviceType}&originType=${originType}",
+    "trackingValuesWithoutGeo": "${trackingIdentifier}&sourceUrl=${sourceUrl}&canonicalUrl=${canonicalUrl}&referrer=${documentReferrer}&title=${title}&visitDate=${timestamp}&userAgent=${userAgent}&canonicalHostname=${canonicalHostname}&deviceType=${deviceType}&originType=${originType}"
   },
   "vars": {
     "extraTrackingValues": ""
diff --git a/extensions/amp-analytics/0.1/vendors/colanalytics.json b/extensions/amp-analytics/0.1/vendors/colanalytics.json
index df9def549929..9901f55bf464 100644
--- a/extensions/amp-analytics/0.1/vendors/colanalytics.json
+++ b/extensions/amp-analytics/0.1/vendors/colanalytics.json
@@ -2,8 +2,8 @@
   "requests": {
     "host": "https://ase.clmbtech.com",
     "base": "${host}/message",
-    "pageview": "${base}?cid=${id}&val_101=${id}&val_101=${int}${canonicalPath}&ch=${canonicalHost}&val_108=${title}&val_120=3&val_102=${sourceUrl}&val_124=${externalReferrer}&uuid=${uid}",
-    "event": "${base}?cid=${id}&val_101=${id}&val_101=${int}${canonicalPath}&val_101=${tet}${totalEngagedTime}&val_102=${clk}${sourceUrl}"
+    "pageview": "${base}?cid=${id}&val_101=${id}&val_101=${int}${canonicalPath}&ch=${canonicalHost}&val_108=${title}&val_120=3&val_102=${sourceUrl}&val_124=${externalReferrer}&uuid=${uid}&val_122=CLIENT_ID(site-user-id-cookie-fallback-name)-0000000",
+    "event": "${base}?cid=${id}&val_101=${id}&val_101=${int}${canonicalPath}&val_101=${tet}${totalEngagedTime}&val_102=${clk}${sourceUrl}&val_122=CLIENT_ID(site-user-id-cookie-fallback-name)"
   },
   "vars": {
     "int": "int:",
diff --git a/extensions/amp-analytics/0.1/vendors/dynatrace.json b/extensions/amp-analytics/0.1/vendors/dynatrace.json
deleted file mode 100644
index d19f791b4d63..000000000000
--- a/extensions/amp-analytics/0.1/vendors/dynatrace.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "requests": {
-    "endpoint": "${protocol}://${tenant}${separator}${environment}:${port}/ampbf/${tenantpath}",
-    "pageview": "${endpoint}?type=js&flavor=amp&v=1&a=1%7C1%7C_load_%7C_load_%7C-%7C${navTiming(navigationStart)}%7C${navTiming(domContentLoadedEventEnd)}%7C0%2C2%7C2%7C_onload_%7C_load_%7C-%7C${navTiming(domContentLoadedEventStart)}%7C${navTiming(domContentLoadedEventEnd)}%7C0&fId=${pageViewId}&vID=${clientId(rxVisitor)}&url=${sourceUrl}&title=${title}&sw=${screenWidth}&sh=${screenHeight}&w=${viewportWidth}&h=${viewportHeight}&nt=a${navType}b${navTiming(navigationStart)}c${navTiming(navigationStart,redirectStart)}d${navTiming(navigationStart,redirectEnd)}e${navTiming(navigationStart,fetchStart)}f${navTiming(navigationStart,domainLookupStart)}g${navTiming(navigationStart,domainLookupEnd)}h${navTiming(navigationStart,connectStart)}i${navTiming(navigationStart,connectEnd)}j${navTiming(navigationStart,secureConnectionStart)}k${navTiming(navigationStart,requestStart)}l${navTiming(navigationStart,responseStart)}m${navTiming(navigationStart,responseEnd)}n${navTiming(navigationStart,domLoading)}o${navTiming(navigationStart,domInteractive)}p${navTiming(navigationStart,domContentLoadedEventStart)}q${navTiming(navigationStart,domContentLoadedEventEnd)}r${navTiming(navigationStart,domComplete)}s${navTiming(navigationStart,loadEventStart)}t${navTiming(navigationStart,loadEventEnd)}&app=${app}&time=${timestamp}"
-  },
-  "triggers": {
-    "trackPageview": {
-      "on": "visible",
-      "request": "pageview"
-    }
-  },
-  "transport": {
-    "beacon": false,
-    "xhrpost": false,
-    "image": true
-  },
-  "vars": {
-    "app": "ampapp",
-    "protocol": "https",
-    "tenant": "",
-    "environment": "live.dynatrace.com",
-    "port": "443",
-    "separator": "."
-  }
-}
diff --git a/extensions/amp-analytics/0.1/vendors/gfksensic.json b/extensions/amp-analytics/0.1/vendors/gfksensic.json
index 9742b9f555f7..40a35d8a3679 100644
--- a/extensions/amp-analytics/0.1/vendors/gfksensic.json
+++ b/extensions/amp-analytics/0.1/vendors/gfksensic.json
@@ -1,17 +1,19 @@
 {
-  "requestOrigin": "https://${regionID}-config.sensic.net",
+  "requestOrigin": "https://pixel.${regionID}-config${environment}.sensic.net",
   "requests": {
-    "base": "/tp?${page_params}&${client_params}",
-    "page_params": "r=${r}&ua=${ua}&v=${v}&l=${l}",
-    "client_params": "p=${regionID}&m=${mediaID}&cid=${clientId(cid)}",
-    "event_params": "ut=${ut}&pr=${pr}&rn=${rn}&c=${contentID}&vt=${vt}&sp=${sp}&st=${st}",
-    "audio-play": "${base}&${event_params}&ty=PL&sn=COUNTER(play_${pr})",
-    "audio-stop": "${base}&${event_params}&ty=ST&sn=COUNTER(stop_${pr})"
+    "base": "/tp?m=${mediaID}&v=${v}&t=s2s-amp",
+    "page_params": "r=${r}&ua=${ua}&l=${l}",
+    "user_params": "optin=${optin}&gdpr=1&gdpr_consent=${consentString}",
+    "streaming_params": "c=${contentID}&ut=${ut}&pr=${pr}&rn=${rn}&vt=${vt}&sp=${sp}&st=${st}",
+    "impression_params": "c=${contentID}&pr=RANDOM",
+    "custom_params": "",
+    "audio-play": "${base}&ty=PL&${streaming_params}&sn=COUNTER(play_${pr})&${custom_params}&${user_params}&${page_params}",
+    "audio-stop": "${base}&ty=ST&${streaming_params}&sn=COUNTER(stop_${pr})",
+    "impression": "${base}&ty=IM&${impression_params}&${custom_params}&${user_params}&${page_params}"
   },
   "vars": {
-    "ty": "HB",
     "contentID": "default",
-    "v": "0.0.1",
+    "v": "1.0.0",
     "r": "${ampdocHost}",
     "ut": "${timestamp}",
     "ua": "${userAgent}",
@@ -20,7 +22,9 @@
     "rn": "${requestCount}",
     "vt": "1",
     "sp": "-1",
-    "st": "${ut}"
+    "st": "${ut}",
+    "environment": "",
+    "optin": ""
   },
   "transport": {
     "beacon": false,
diff --git a/extensions/amp-analytics/0.1/vendors/googleanalytics.json b/extensions/amp-analytics/0.1/vendors/googleanalytics.json
index c5385bffe2bc..1ebc87ec9328 100644
--- a/extensions/amp-analytics/0.1/vendors/googleanalytics.json
+++ b/extensions/amp-analytics/0.1/vendors/googleanalytics.json
@@ -74,5 +74,8 @@
     "_ga": {
       "value": "LINKER_PARAM(_gl, _ga)"
     }
+  },
+  "warningMessage": {
+    "message": "Universal analytics is being deprecated. Switch to Google Analytics 4 (see https://support.google.com/analytics/answer/11583528)"
   }
 }
diff --git a/extensions/amp-analytics/0.1/vendors/gtag.json b/extensions/amp-analytics/0.1/vendors/gtag.json
index 236b1f509950..105f7c6e8297 100644
--- a/extensions/amp-analytics/0.1/vendors/gtag.json
+++ b/extensions/amp-analytics/0.1/vendors/gtag.json
@@ -13,6 +13,12 @@
         "hasExtRef": "$IF(EXTERNAL_REFERRER, 1, 0)",
         "hasDocRef": "$IF(DOCUMENT_REFERRER, 1, 0)",
         "enabled": true
+      },
+      "session": {
+        "st": "SESSION_TIMESTAMP",
+        "ct": "TIMESTAMP",
+        "sc": "SESSION_COUNT",
+        "enabled": true
       }
     }
   },
diff --git a/extensions/amp-analytics/0.1/vendors/ibeatanalytics.json b/extensions/amp-analytics/0.1/vendors/ibeatanalytics.json
index ea38af444602..27ab47829bab 100644
--- a/extensions/amp-analytics/0.1/vendors/ibeatanalytics.json
+++ b/extensions/amp-analytics/0.1/vendors/ibeatanalytics.json
@@ -1,7 +1,7 @@
 {
   "requests": {
     "host": "https://api.ibeat-analytics.com",
-    "track": "${host}/ping-amp?url=${sourceUrl}&sid=${clientId(_iibeat_session)}&ua=${userAgent}&ref=${documentReferrer}&at=${incrementalEngagedTime}&tt=${totalTime}&pid=${pageViewId}&d=${d}&dn=${sourceHostname}&ct=${ct}&pt=${pt}&hid=${hid}&au=${au}&ag=${ag}&aid=${aid}&cn=${canonicalUrl}&pot=${timerStart}&rct=${requestCount}&id=${id}&sec=${sec}&tgs=${tgs}&pc=${pc}"
+    "track": "${host}/ping-amp?url=${sourceUrl}&sid=${clientId(_iibeat_session)}&ua=${userAgent}&ref=${documentReferrer}&at=${incrementalEngagedTime}&tt=${totalTime}&pid=${pageViewId}&d=${d}&dn=${sourceHostname}&ct=${ct}&pt=${pt}&hid=${hid}&au=${au}&ag=${ag}&aid=${aid}&cn=${canonicalUrl}&pot=${timerStart}&rct=${requestCount}&id=${id}&sec=${sec}&tgs=${tgs}&pc=${pc}&vct=${vct}&xcld=${xcld}"
   },
   "triggers": {
     "trackInterval": {
@@ -13,4 +13,4 @@
       "request": "track"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/extensions/amp-analytics/0.1/vendors/lotame.json b/extensions/amp-analytics/0.1/vendors/lotame.json
index 42bbc1f29237..a9030ae9151f 100644
--- a/extensions/amp-analytics/0.1/vendors/lotame.json
+++ b/extensions/amp-analytics/0.1/vendors/lotame.json
@@ -1,6 +1,6 @@
 {
   "requests": {
-    "pageview": "https://bcp.crwdcntrl.net/amp?c=${account}&pv=y"
+    "pageview": "https://bcp.crwdcntrl.net/amp?c=${account}&pv=y&gdpr_consent=${consentString}&gdpr=$IF($EQUALS(CONSENT_METADATA(gdprApplies), true), 1)$IF($EQUALS(CONSENT_METADATA(gdprApplies), false), 0)"
   },
   "triggers": {
     "track pageview": {
diff --git a/extensions/amp-analytics/0.1/vendors/mapp_intelligence.json b/extensions/amp-analytics/0.1/vendors/mapp_intelligence.json
index d4a918274d57..cdf1bf6111ab 100644
--- a/extensions/amp-analytics/0.1/vendors/mapp_intelligence.json
+++ b/extensions/amp-analytics/0.1/vendors/mapp_intelligence.json
@@ -4,14 +4,26 @@
     "contentId": "${title}",
     "mediaName": "${id}",
     "everId": "${clientId(amp-wt3-eid)}",
-    "mediaEventName": "customMediaEvent"
+    "mediaEventName": "customMediaEvent",
+    "emptyValue": "",
+    "clientHints": false,
+    "uachModel": "$IF(${clientHints}, ${uach(model)}, ${emptyValue})",
+    "uachPlatform": "$IF(${clientHints}, ${uach(platform)}, ${emptyValue})",
+    "uachPlatformVersion": "$IF(${clientHints}, ${uach(platformVersion)}, ${emptyValue})"
   },
   "requests": {
     "trackURL": "https://${trackDomain}/${trackId}/wt",
     "basePrefix": "?p=440,${contentId},1,${screenWidth}x${screenHeight},${screenColorDepth},1,",
     "baseSuffix": ",${documentReferrer},${viewportWidth}x${viewportHeight},0&tz=${timezone}&eid=${everId}&la=${browserLanguage}",
     "parameterPrefix": "${basePrefix}${timestamp}${baseSuffix}",
-    "parameterSuffix": "&pu=${sourceUrl}&eor=1",
+    "parameterSuffix": "&pu=${sourceUrl}${clientHintParams}&eor=1",
+    "uachModelValue": "$IF(${uachModel}, \"${uachModel}\", ${emptyValue})",
+    "uachPlatformValue": "$IF(${uachPlatform}, \"${uachPlatform}\", ${emptyValue})",
+    "uachPlatformVersionValue": "$IF(${uachPlatformVersion}, \"${uachPlatformVersion}\", ${emptyValue})",
+    "uachModelParam": "$IF(${uachModel}, X-WT-SEC-CH-UA-MODEL, ${emptyValue})",
+    "uachPlatformParam": "$IF(${uachPlatform}, X-WT-SEC-CH-UA-PLATFORM, ${emptyValue})",
+    "uachPlatformVersionParam": "$IF(${uachPlatformVersion}, X-WT-SEC-CH-UA-PLATFORM-VERSION, ${emptyValue})",
+    "clientHintParams": "&${uachModelParam}=${uachModelValue}&${uachPlatformParam}=${uachPlatformValue}&${uachPlatformVersionParam}=${uachPlatformVersionValue}",
     "pageview": "${trackURL}${parameterPrefix}&${extraUrlParams}&cp570=${pageLoadTime}${parameterSuffix}",
     "event": "${trackURL}${parameterPrefix}&ct=${actionName}&${extraUrlParams}${parameterSuffix}",
     "scroll": "${trackURL}${parameterPrefix}&ct=${actionName}&ck540=${verticalScrollBoundary}${parameterSuffix}",
diff --git a/extensions/amp-analytics/0.1/vendors/metrika.json b/extensions/amp-analytics/0.1/vendors/metrika.json
index 582fc145967c..cd25a132c599 100644
--- a/extensions/amp-analytics/0.1/vendors/metrika.json
+++ b/extensions/amp-analytics/0.1/vendors/metrika.json
@@ -17,6 +17,14 @@
     "_pageUrl": "${sourceUrl}",
     "_goalUrl": "goal://${sourceHost}/${goalId}"
   },
+  "cookies": {
+    "enabled": true,
+    "_ym_uid": {
+      "value": "$IF($MATCH(COOKIE(_ym_uid),^\\d{17}\\d?\\d?$),COOKIE(_ym_uid),TIMESTAMP()$SUBSTR(RANDOM(),2,6))",
+      "cookieMaxAge": 525600,
+      "sameSite": "None"
+    }
+  },
   "requests": {
     "pageview": "${_prefix}${_pageViewBrInfo}${_brInfo}&${_siteInfo}&${_suffix}",
     "notBounce": "${_prefix}${_notBounceBrInfo}${_brInfo}&${_suffix}",
diff --git a/extensions/amp-analytics/0.1/vendors/moengage.json b/extensions/amp-analytics/0.1/vendors/moengage.json
index 1e50ad5257da..496aab64d98f 100644
--- a/extensions/amp-analytics/0.1/vendors/moengage.json
+++ b/extensions/amp-analytics/0.1/vendors/moengage.json
@@ -1,7 +1,7 @@
 {
   "requests": {
-    "addDevice": "https://websdk.moengage.com/v2/device/add?os=${os}&app_id=${appId}&sdk_ver=${sdk_ver}&app_ver=${app_ver}&device_tz=${device_tz}&os_platform=${os_platform}&unique_id=${unique_id}&device_ts=${timestamp}&isAmp=true",
-    "event": "https://websdk.moengage.com/v2/report/add?os=${os}&app_id=${appId}&sdk_ver=${sdk_ver}&app_ver=${app_ver}&device_tz=${device_tz}&os_platform=${os_platform}&unique_id=${unique_id}&device_ts=${timestamp}"
+    "addDevice": "https://${dataCenter}.moengage.com/v2/device/add?os=${os}&app_id=${appId}&sdk_ver=${sdk_ver}&app_ver=${app_ver}&device_tz=${device_tz}&os_platform=${os_platform}&unique_id=${unique_id}&device_ts=${timestamp}&isAmp=true",
+    "event": "https://${dataCenter}.moengage.com/v2/report/add?os=${os}&app_id=${appId}&sdk_ver=${sdk_ver}&app_ver=${app_ver}&device_tz=${device_tz}&os_platform=${os_platform}&unique_id=${unique_id}&device_ts=${timestamp}"
   },
   "vars": {
     "os": "mweb",
@@ -9,7 +9,8 @@
     "app_ver": "1",
     "device_tz": "${timezone}",
     "os_platform": "${userAgent}",
-    "unique_id": "${clientId(moe_uuid)}"
+    "unique_id": "${clientId(moe_uuid)}",
+    "dataCenter": "sdk-01"
   },
   "extraUrlParams": {
     "a": {
diff --git a/extensions/amp-analytics/0.1/vendors/navegg.json b/extensions/amp-analytics/0.1/vendors/navegg.json
index 77e733cafe12..01298e59a812 100644
--- a/extensions/amp-analytics/0.1/vendors/navegg.json
+++ b/extensions/amp-analytics/0.1/vendors/navegg.json
@@ -1,6 +1,6 @@
 {
   "requests": {
-    "pageview": "https://amp.navdmp.com/amp?aid=${clientId(navegg_id)}&url=${canonicalUrl}&ref=${documentReferrer}&tit=${title}&lan=${browserLanguage}&acc=${account}&v=7"
+    "pageview": "https://amp.navdmp.com/amp?aid=${clientId(navegg_id)}&url=${canonicalUrl}&ref=${documentReferrer}&tit=${title}&lan=${browserLanguage}&acc=${account}&wst=${wst}&wct=${wct}&wla=${wla}&v=7"
   },
   "triggers": {
     "trackpageview": {
diff --git a/extensions/amp-analytics/0.1/vendors/neodata.json b/extensions/amp-analytics/0.1/vendors/neodata.json
new file mode 100644
index 000000000000..6710b9731c14
--- /dev/null
+++ b/extensions/amp-analytics/0.1/vendors/neodata.json
@@ -0,0 +1,24 @@
+{
+  "requests": {
+    "base": "https://tra.neodatagroup.com",
+    "pageview": "${base}/pv?sid=${sysId}&rnd=${random}&id=${tagId}&ad=${advId}&gdpr_consent=${consentString}&rs=${screenWidth}x${screenHeight}&lg=${browserLanguage}&tz=${timezone}&re=${documentReferrer}&co=${screenColorDepth}&ur=${ampdocUrl}",
+    "cmDbm": "https://cm.g.doubleclick.net/pixel?google_nid=neodata_dmp&google_cm&pv=dbm&sid=${sysId}&rt=img&rnd=${random}",
+    "ADFORM": "https://dmp.adform.net/serving/cookie/match?party=1056&rt=img&rnd=${random}",
+    "MEDIAMATH" :"https://pixel.mathtag.com/sync/js?sync=auto&mt_exid=10082&exsync=${base}/cm?sid=${sysId}&pv=MEDIAMATH&eid=[MM_UUID]&rt=img&rnd=${random}"
+  },
+  "triggers": {
+    "trackPageview": {
+      "on": "visible",
+      "request": ["pageview"]
+    },
+    "trackCookieMatch":{
+      "on":"visible",
+      "request": ["cmDbm", "ADFORM", "MEDIAMATH"]
+    }
+  },
+  "transport": {
+    "beacon": false,
+    "xhrpost": false,
+    "image": true
+  }
+}
diff --git a/extensions/amp-analytics/0.1/vendors/parsely.json b/extensions/amp-analytics/0.1/vendors/parsely.json
index 03ed81fee3bb..93ad2b04f19a 100644
--- a/extensions/amp-analytics/0.1/vendors/parsely.json
+++ b/extensions/amp-analytics/0.1/vendors/parsely.json
@@ -1,6 +1,6 @@
 {
   "requests": {
-    "host": "https://srv.pixel.parsely.com",
+    "host": "https://p1.parsely.com",
     "basePrefix": "${host}/plogger/?rand=${timestamp}&idsite=${apikey}&url=${ampdocUrl}&urlref=${documentReferrer}&screen=${screenWidth}x${screenHeight}%7C${availableScreenWidth}x${availableScreenHeight}%7C${screenColorDepth}&title=${title}&date=${timestamp}&ampid=${clientId(_parsely_visitor)}",
     "pageview": "${basePrefix}&action=pageview&metadata={\"canonical_url\":\"${canonicalUrl}\"}",
     "heartbeat": "${basePrefix}&action=heartbeat&tt=${totalEngagedTime}&inc=${incrementalEngagedTime(parsely-js)}"
diff --git a/extensions/amp-analytics/0.1/vendors/permutive-ampscript.json b/extensions/amp-analytics/0.1/vendors/permutive-ampscript.json
new file mode 100644
index 000000000000..8f43327b0ab8
--- /dev/null
+++ b/extensions/amp-analytics/0.1/vendors/permutive-ampscript.json
@@ -0,0 +1,45 @@
+{
+  "transport": {
+    "amp-script": true
+  },
+  "requests": {
+    "onPageLoad": "amp-script:permutiveSdk.savePageContext",
+    "onScroll": "amp-script:permutiveSdk.trackScrollEvent",
+    "onInterval": "amp-script:permutiveSdk.trackEngagedTime"
+  },
+  "triggers": {
+    "trackPageLoad": {
+      "on": "ini-load",
+      "request": "onPageLoad"
+    },
+    "trackScroll": {
+      "on": "scroll",
+      "scrollSpec": {
+        "verticalBoundaries": [
+          5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, 90,
+          95, 100
+        ]
+      },
+      "request": "onScroll"
+    },
+    "trackTimeOnPage": {
+      "on": "timer",
+      "timerSpec": {
+        "interval": 5,
+        "immediate": false,
+        "maxTimerLength": 600
+      },
+      "request": "onInterval"
+    }
+  },
+  "extraUrlParams": {
+    "type": "amp",
+    "title": "${title}",
+    "domain": "${canonicalHost}",
+    "url": "${canonicalUrl}",
+    "referrer": "${documentReferrer}",
+    "user_agent": "${userAgent}",
+    "pageHeight": "${scrollHeight}",
+    "verticalScrollBoundary": "${verticalScrollBoundary}"
+  }
+}
diff --git a/extensions/amp-analytics/0.1/vendors/ppasanalytics.json b/extensions/amp-analytics/0.1/vendors/ppasanalytics.json
index f055a33af8c4..30d34f18b4ae 100644
--- a/extensions/amp-analytics/0.1/vendors/ppasanalytics.json
+++ b/extensions/amp-analytics/0.1/vendors/ppasanalytics.json
@@ -4,13 +4,13 @@
     "website_id": "",
     "website_hash": "",
     "pk_cookie_value": "$REPLACE($CLIENT_ID(_pk_id.${website_id}.${website_hash}),\\.[A-Za-z0-9]*\\.[A-Za-z0-9]*\\.[A-Za-z0-9]*\\.[A-Za-z0-9]*\\.,)",
-    "visitor_id_from_cookie": "$IF($MATCH(${pk_cookie_value},amp-,0),$SUBSTR($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($SUBSTR($TOLOWERCASE(${pk_cookie_value}),4,16),g,10),h,11),i,12),j,13),k,14),l,15),m,16),n,17),o,18),p,19),q,1a),r,1b),s,1c),t,1d),u,1e),v,1f),w,20),x,21),y,22),z,23),A,24),B,25),C,26),D,27),E,28),F,29),G,2a),H,2b),I,2c),J,2d),K,2e),L,2f),M,30),N,31),O,32),P,33),Q,34),R,35),S,36),T,37),U,38),V,39),W,3a),X,3b),Y,3c),Z,3d),_,3e),-,3f),0,16),${pk_cookie_value})",
+    "visitor_id_from_cookie": "$IF($MATCH(${pk_cookie_value},^[0-9a-f]{16}$,0),${pk_cookie_value},$SUBSTR($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($REPLACE($SUBSTR($TOLOWERCASE(${pk_cookie_value}),4,16),g,10),h,11),i,12),j,13),k,14),l,15),m,16),n,17),o,18),p,19),q,1a),r,1b),s,1c),t,1d),u,1e),v,1f),w,20),x,21),y,22),z,23),_,3e),-,3f),0,16))",
     "request_random": "$SUBSTR($REPLACE(${random},0.,), 0, 6)",
     "vid": "${visitor_id_from_cookie}"
   },
   "requests": {
     "basePrefix": "https://${host}/ppms.php?",
-    "baseSuffix": "&idsite=${website_id}&rec=1&r=${request_random}&url=${sourceUrl}&_id=${visitor_id_from_cookie}&apiv=1&urlref=${documentReferrer}&res=${screenWidth}x${screenHeight}&lang=${browserLanguage}&gt_ms=${serverResponseTime}&cs=${documentCharset}&pv_id=$SUBSTR($PAGE_VIEW_ID_64, 0, 6)",
+    "baseSuffix": "&idsite=${website_id}&rec=1&r=${request_random}&url=${sourceUrl}&_id=${visitor_id_from_cookie}&apiv=1&$IF(${documentReferrer},urlref,ignored)=${documentReferrer}&res=${screenWidth}x${screenHeight}&lang=${browserLanguage}&gt_ms=${serverResponseTime}&cs=${documentCharset}&pv_id=$SUBSTR($PAGE_VIEW_ID_64, 0, 6)",
     "performanceMetrics": "${basePrefix}ping=1${baseSuffix}&t_di=${domInteractiveTime}&t_le=${contentLoadTime}&t_dc=${pageDownloadTime}&t_ee=${pageLoadTime}",
     "pageview": "${basePrefix}action_name=${title}${baseSuffix}",
     "customevent": "${basePrefix}e_c=${event_category}&e_a=${event_action}&e_n=${event_name}&e_v=$DEFAULT(${event_value}, 0)${baseSuffix}",
diff --git a/extensions/amp-analytics/0.1/vendors/snowplow_v2.json b/extensions/amp-analytics/0.1/vendors/snowplow_v2.json
index 8386fc3c6906..0aa0c7a3df9f 100644
--- a/extensions/amp-analytics/0.1/vendors/snowplow_v2.json
+++ b/extensions/amp-analytics/0.1/vendors/snowplow_v2.json
@@ -17,13 +17,16 @@
     }
   },
   "vars": {
-    "trackerVersion": "amp-1.0.3",
+    "trackerVersion": "amp-1.1.0",
     "ampVistorId": "CLIENT_ID(_sp_ampid)",
     "duid": "$IF($SUBSTR(QUERY_PARAM(_sp),0,36), $SUBSTR(QUERY_PARAM(_sp),0,36), $IF(LINKER_PARAM(sp_amp_linker,_sp_duid), LINKER_PARAM(sp_amp_linker,_sp_duid), COOKIE(_sp_duid)))",
     "nullString": "null",
     "customEventTemplate": "{\"schema\":\"iglu:com.snowplowanalytics.snowplow/unstruct_event/jsonschema/1-0-0\",\"data\":{\"schema\":\"iglu:${customEventSchemaVendor}/${customEventSchemaName}/jsonschema/${customEventSchemaVersion}\",\"data\":${customEventSchemaData}}}",
-    "contextsHead": "{\"schema\":\"iglu:com.snowplowanalytics.snowplow/contexts/jsonschema/1-0-0\",\"data\":[{\"schema\":\"iglu:dev.amp.snowplow/amp_id/jsonschema/1-0-0\",\"data\":{\"ampClientId\":\"${ampVistorId}\", \"domainUserid\": \"${duid}\", \"userId\": \"${userId}\"}},$REPLACE(`${customContexts}`, `^,*(.+?),*$`, `$1,`)",
-    "contextsTail": "{\"schema\":\"iglu:dev.amp.snowplow/amp_web_page/jsonschema/1-0-0\",\"data\":{\"ampPageViewId\":\"PAGE_VIEW_ID_64\"}}]}",
+    "sessionContext": "{\"schema\":\"iglu:dev.amp.snowplow/amp_session/jsonschema/1-0-0\",\"data\":{\"ampSessionId\":${sessionId},\"ampSessionIndex\":${sessionCount},\"sessionEngaged\":$IF(${sessionEngaged}, true, false),\"sessionCreationTimestamp\":${sessionTimestamp}$IF(${sessionEventTimestamp},`,\"lastSessionEventTimestamp\":${sessionEventTimestamp}`)}}",
+    "idContext": "{\"schema\":\"iglu:dev.amp.snowplow/amp_id/jsonschema/1-0-0\",\"data\":{\"ampClientId\":\"${ampVistorId}\",\"domainUserid\":\"${duid}\",\"userId\":\"${userId}\"}}",
+    "webPageContext": "{\"schema\":\"iglu:dev.amp.snowplow/amp_web_page/jsonschema/1-0-0\",\"data\":{\"ampPageViewId\":\"PAGE_VIEW_ID_64\"}}",
+    "contextsHead": "{\"schema\":\"iglu:com.snowplowanalytics.snowplow/contexts/jsonschema/1-0-0\",\"data\":[${idContext},${sessionContext},$REPLACE(`${customContexts}`, `^,*(.+?),*$`, `$1,`)",
+    "contextsTail": "${webPageContext}]}",
     "ampPagePingTemplate": "{\"schema\":\"iglu:com.snowplowanalytics.snowplow/unstruct_event/jsonschema/1-0-0\",\"data\":{\"schema\":\"iglu:dev.amp.snowplow/amp_page_ping/jsonschema/1-0-0\",\"data\":{\"scrollLeft\":${scrollLeft},\"scrollWidth\":${scrollWidth},\"viewportWidth\":${viewportWidth},\"scrollTop\":${scrollTop},\"scrollHeight\":${scrollHeight},\"viewportHeight\":${viewportHeight},\"totalEngagedTime\":${totalEngagedTime}}}}"
   },
   "requests": {
diff --git a/extensions/amp-analytics/0.1/vendors/tribooanalytics.json b/extensions/amp-analytics/0.1/vendors/tribooanalytics.json
new file mode 100644
index 000000000000..649cce264622
--- /dev/null
+++ b/extensions/amp-analytics/0.1/vendors/tribooanalytics.json
@@ -0,0 +1,23 @@
+{
+  "transport": {
+    "beacon": false,
+    "xhrpost": false,
+    "image": true
+  },
+  "requests": {
+    "base": "https://amp.tribooanalytics.com/cgi-bin/ampta.cgi",
+    "commpar": "AMP=1&RM=${random}&USER=${account}&PAG=${page}&HR=${sourceUrl}&REFER=${documentReferrer}&RES=${screenWidth}X${screenHeight}&COLOR=${screenColorDepth}&CID=${clientId(AMP_CID)}&PAGID=${pageViewId}&TITL=${title}&RQC=${requestCount}",
+    "pagepar": "&VIE=${viewer}&PLT=${pageLoadTime}",
+    "eventpar": "&SSXL=1",
+    "linkpar": "&LINK=${outboundLink}",
+    "pageview": "${base}?${commpar}${pagepar}",
+    "event": "${base}?${commpar}${eventpar}",
+    "link": "${base}?${commpar}${linkpar}"
+  },
+  "triggers": {
+    "pageview": {
+      "on": "visible",
+      "request": "pageview"
+    }
+  }
+}
diff --git a/extensions/amp-analytics/0.1/visibility-manager.js b/extensions/amp-analytics/0.1/visibility-manager.js
index 86a6000ac0c8..997480816ce3 100644
--- a/extensions/amp-analytics/0.1/visibility-manager.js
+++ b/extensions/amp-analytics/0.1/visibility-manager.js
@@ -1,18 +1,21 @@
+import {rootNodeFor} from '#core/dom';
+import {
+  layoutPositionRelativeToScrolledViewport,
+  layoutRectLtwh,
+} from '#core/dom/layout/rect';
+import {isArray, isFiniteNumber} from '#core/types';
+import {map} from '#core/types/object';
+
 import {Services} from '#service';
-import {VisibilityModel} from './visibility-model';
+
 import {dev, user} from '#utils/log';
-import {dict, map} from '#core/types/object';
-import {getFriendlyIframeEmbedOptional} from '../../../src/iframe-helper';
+
 import {getMinOpacity} from './opacity';
+import {VisibilityModel} from './visibility-model';
+
+import {getFriendlyIframeEmbedOptional} from '../../../src/iframe-helper';
 import {getMode} from '../../../src/mode';
 import {getParentWindowFrameElement} from '../../../src/service-helpers';
-import {isArray, isFiniteNumber} from '#core/types';
-
-import {
-  layoutPositionRelativeToScrolledViewport,
-  layoutRectLtwh,
-} from '#core/dom/layout/rect';
-import {rootNodeFor} from '#core/dom';
 
 const TAG = 'amp-analytics/visibility-manager';
 
@@ -465,13 +468,10 @@ export class VisibilityManager {
         layoutBox = viewport.getLayoutRect(opt_element);
         const intersectionRatio = this.getElementVisibility(opt_element);
         const intersectionRect = this.getElementIntersectionRect(opt_element);
-        Object.assign(
-          state,
-          dict({
-            'intersectionRatio': intersectionRatio,
-            'intersectionRect': JSON.stringify(intersectionRect),
-          })
-        );
+        Object.assign(state, {
+          'intersectionRatio': intersectionRatio,
+          'intersectionRect': JSON.stringify(intersectionRect),
+        });
       } else {
         state['opacity'] = this.getRootMinOpacity();
         state['intersectionRatio'] = this.getRootVisibility();
@@ -480,15 +480,12 @@ export class VisibilityManager {
       model.maybeDispose();
 
       if (layoutBox) {
-        Object.assign(
-          state,
-          dict({
-            'elementX': layoutBox.left,
-            'elementY': layoutBox.top,
-            'elementWidth': layoutBox.width,
-            'elementHeight': layoutBox.height,
-          })
-        );
+        Object.assign(state, {
+          'elementX': layoutBox.left,
+          'elementY': layoutBox.top,
+          'elementWidth': layoutBox.width,
+          'elementHeight': layoutBox.height,
+        });
         state['initialScrollDepth'] = layoutPositionRelativeToScrolledViewport(
           layoutBox,
           viewport,
diff --git a/extensions/amp-analytics/0.1/visibility-model.js b/extensions/amp-analytics/0.1/visibility-model.js
index cef6ddc0291a..1b08d98ab191 100644
--- a/extensions/amp-analytics/0.1/visibility-model.js
+++ b/extensions/amp-analytics/0.1/visibility-model.js
@@ -1,7 +1,7 @@
-import {Deferred} from '#core/data-structures/promise';
 import {Observable} from '#core/data-structures/observable';
+import {Deferred} from '#core/data-structures/promise';
+
 import {devAssert} from '#utils/log';
-import {dict} from '#core/types/object';
 
 /**
  * This class implements visibility calculations based on the
@@ -21,14 +21,14 @@ export class VisibilityModel {
      * Spec parameters.
      * @private {!JsonObject}
      */
-    this.spec_ = dict({
+    this.spec_ = {
       'visiblePercentageMin': Number(spec['visiblePercentageMin']) / 100 || 0,
       'visiblePercentageMax': Number(spec['visiblePercentageMax']) / 100 || 1,
       'totalTimeMin': Number(spec['totalTimeMin']) || 0,
       'totalTimeMax': Number(spec['totalTimeMax']) || Infinity,
       'continuousTimeMin': Number(spec['continuousTimeMin']) || 0,
       'continuousTimeMax': Number(spec['continuousTimeMax']) || Infinity,
-    });
+    };
     // Above, if visiblePercentageMax was not specified, assume 100%.
     // Here, do allow 0% to be the value if that is what was specified.
     if (String(spec['visiblePercentageMax']).trim() === '0') {
@@ -268,7 +268,7 @@ export class VisibilityModel {
    * @return {!JsonObject}
    */
   getState(startTime) {
-    return dict({
+    return {
       // Observed times, relative to the `startTime`.
       'firstSeenTime': timeBase(this.firstSeenTime_, startTime),
       'lastSeenTime': timeBase(this.lastSeenTime_, startTime),
@@ -283,7 +283,7 @@ export class VisibilityModel {
       'loadTimeVisibility': this.loadTimeVisibility_ * 100 || 0,
       'minVisiblePercentage': this.minVisiblePercentage_ * 100,
       'maxVisiblePercentage': this.maxVisiblePercentage_ * 100,
-    });
+    };
   }
 
   /**
diff --git a/extensions/amp-analytics/amp-analytics.md b/extensions/amp-analytics/amp-analytics.md
index 09ead71aa539..3c963f6bb5aa 100644
--- a/extensions/amp-analytics/amp-analytics.md
+++ b/extensions/amp-analytics/amp-analytics.md
@@ -1374,6 +1374,12 @@ AMP component developers can implement collection of data using AMP analytics.
 For more information, please refer to
 [Implementing analytics for AMP components](amp-components-analytics.md).
 
+### Google Analytics 4 and AMP
+
+For information on how to set up Google Analytics 4 with amp-analytics see
+[amp-analytics dev guide](https://developers.google.com/analytics/devguides/collection/amp-analytics)
+and [gtagjs guide](https://developers.google.com/tag-platform/gtagjs/amp?technology=gtagjs)
+
 ## Validation
 
 See [`amp-analytics` rules](validator-amp-analytics.protoascii)
diff --git a/extensions/amp-analytics/analytics-vendors-list.md b/extensions/amp-analytics/analytics-vendors-list.md
index a2d507a2baab..9dcc0c33c580 100644
--- a/extensions/amp-analytics/analytics-vendors-list.md
+++ b/extensions/amp-analytics/analytics-vendors-list.md
@@ -21,7 +21,7 @@ Type attribute value: `_fake_`
 
 Type attribute value: `acquialift`
 
-Adds support for Acquia Lift. The `decisionApiUrl`, `accountId` and `siteId` must be specified. More information about Acquia Lift can be found at [https://docs.acquia.com/lift](https://docs.acquia.com/lift).
+Adds support for Acquia Lift. The `decisionApiUrl`, `accountId` and `siteId` must be specified. More information about Acquia Lift can be found at [https://app.lift.acquia.com/](https://app.lift.acquia.com/).
 
 ### Adobe Analytics
 
@@ -65,13 +65,17 @@ Type attribute value: `amplitude`
 
 Type attribute value: `appsflyer`
 
+<!-- markdown-link-check-disable -->
+
 Adds support for AppsFlyer. More details for adding AppsFlyer support can be found at [appsflyer.com](https://support.appsflyer.com/hc/en-us/articles/360001610038#amp-support)
 
+<!-- markdown-link-check-enable -->
+
 ### AT Internet
 
 Type attribute value: `atinternet`
 
-Adds support for AT Internet. More details for adding AT Internet support can be found at [developers.atinternet-solutions.com](http://developers.atinternet-solutions.com/javascript-en/advanced-features-javascript-en/accelerated-mobile-pages-amp-javascript-en/).
+Adds support for AT Internet. More details for adding AT Internet support can be found at [developers.atinternet-solutions.com](https://developers.atinternet-solutions.com/as2-tagging-en/javascript-en/advanced-features-javascript-en/accelerated-mobile-pages-amp-javascript-en/index.html).
 
 ### Baidu Analytics
 
@@ -159,24 +163,21 @@ Adds support for comScore Unified Digital Measurement™ pageview analytics. Req
 
 Type attribute value: `cxense`
 
+<!-- markdown-link-check-disable -->
+
 Adds support for Cxense Insight analytics. Requires defining _var_ `siteId` with Cxense-provided _siteId_. More details can be found at [wiki.cxense.com](https://wiki.cxense.com/display/cust/Accelerated+Mobile+Pages+%28AMP%29+integration).
 
+<!-- markdown-link-check-enable -->
+
 ### Deep.BI
 
 Type attribute value: `deepbi`
 
-### Dynatrace
-
-Type attribute value: `dynatrace`
-
-Adds support for Dynatrace real user monitoring. Requires defining _var_ `app` with a Dynatrace provided _application id_ and _var_ `tenant` with a Dynatrace provided _environment identifier_. More details for adding Dynatrace real user monitoring can be found at [dynatrace.com](https://www.dynatrace.com/technologies/web/amp-monitoring/).
-
 ### EPICA
 
 Type attribute value: `epica`
 
 Adds support for EPICA page views and events.
-More details can be found at [EPICA docs](https://www.epica.ai).
 
 ### Eulerian Analytics
 
@@ -229,7 +230,7 @@ Unlike other analytics vendors, Google Tag Manager is a tag management service,
 
 Type attribute value: `ibeatanalytics`
 
-Adds support for Ibeat Analytics. More details for adding Ibeat support can be found at [Ibeat Integration Support](https://ibeat.indiatimes.com/support.html#h.a5rit14mwie1).
+Adds support for Ibeat Analytics.
 
 <!-- markdown-link-check-disable -->
 
@@ -319,19 +320,19 @@ Adds support for Krux. Configuration details can be found at [help.krux.com](htt
 
 Type attribute value: `linkpulse`
 
-Adds support for Linkpulse. Configuration details can be found at [docs.linkpulse.com](http://docs.linkpulse.com).
+Adds support for Linkpulse. Configuration details can be found at [docs.linkpulse.com](https://www.kilkaya.com/).
 
 ### Lotame
 
 Type attribute value: `lotame`
 
-Adds support for Lotame. More information and configuration details can be found at [my.lotame.com](https://my.lotame.com/t/83h37h9/overview-1st-party-data-collection-in-google-amp).
+Adds support for Lotame. More information and configuration details can be found at [my.lotame.com](https://my.lotame.com/).
 
 ### Mapp Intelligence
 
 Type attribute value: `mapp_intelligence`
 
-Adds support for Mapp Intelligence tracking. More information and configuration details can be found at [docs.mapp.com](https://docs.mapp.com/pages/viewpage.action?pageId=10027966).
+Adds support for Mapp Intelligence tracking. More information and configuration details can be found at [docs.mapp.com](https://docs.mapp.com/v1/docs/en/accelerated-mobile-pages-amp).
 
 ### Marin Software
 
@@ -367,7 +368,7 @@ Adds support for Yandex Metrica. Configuration details can be found at [Yandex S
 
 Type attribute value: `moat`
 
-Adds support for Moat. Please contact your Moat representative for configuration details. More information on Moat can be found at [moat.com/analytics](https://moat.com/analytics).
+Adds support for Moat. Please contact your Moat representative for configuration details. More information on Moat can be found at [https://docs.oracle.com/en/cloud/saas/data-cloud-moat/about_moat/moat_analytics_how_it_works.html](https://docs.oracle.com/en/cloud/saas/data-cloud-moat/about_moat/moat_analytics_how_it_works.html).
 
 ### Mobify
 
@@ -399,6 +400,12 @@ Adds support for [SOASTA mPulse](https://www.soasta.com/mPulse). Configuration d
 
 Type attribute value: `navegg`
 
+### Neodata
+
+Type attribute value: `neodata`
+
+Adds support for Neodata Audience Platform. Please contact our support team to get set up with your `sysId`, `tagId` and `advId` parameters in the `vars` section.
+
 ### New Relic
 
 Type attribute value: `newrelic`
@@ -415,14 +422,18 @@ Adds support for Nielsen DCR. Please contact your Nielsen representative to get
 
 Type attribute value: `nielsen-marketing-cloud`
 
-Adds support for Nielsen Marketing Cloud. More details can be found at [Nielsen Marketing Cloud](http://www.nielsen.com/us/en/solutions/capabilities/nielsen-marketing-cloud.html).
+Adds support for Nielsen Marketing Cloud. More details can be found at [Nielsen Marketing Cloud](https://www.nielsen.com/solutions/media-planning/marketing-cloud/).
 
 ### OEWA
 
 Type attribute value: `oewa`
 
+<!-- markdown-link-check-disable -->
+
 Adds support for [OEWA](http://www.oewa.at). Requires a copy of [amp-analytics-oewa.html](http://www.oewa.at/fileadmin/downloads/amp-analytics-oewa.html) on a different subdomain than the including AMP file ([why?](https://github.com/ampproject/amphtml/blob/main/docs/spec/amp-iframe-origin-policy.md)). The file must be served via HTTPS. For example, if your AMP files are hosted on `www.example.com`, then `amp-analytics-oewa.html` needs to be on another subdomain such as `oewa-amp.example.com`. More details for adding OEWA support can be found [here](http://www.oewa.at/Implementierung).
 
+<!-- markdown-link-check-enable -->
+
 Additionally, the following variables must be defined:
 
 In the `vars` section:
@@ -462,8 +473,21 @@ Adds support for Permutive event collection. Additionally, the following `vars`
 
 -   `namespace`: your Permutive AMP namespace
 -   `key`: your Permutive public API key
+    <!-- markdown-link-check-disable -->
+    Use `extraUrlParams` to add additional event properties. Full configuration details can be found at [support.permutive.com](https://support.permutive.com/hc/en-us).
+    <!-- markdown-link-check-enable -->
+
+### Permutive-ampscript
+
+Type attribute value: `permutive-ampscript`
 
-Use `extraUrlParams` to add additional event properties. Full configuration details can be found at [support.permutive.com](http://support.permutive.com).
+Adds support for Permutive event collection via the Permutive SDK running inside `amp-script`. This is a newer version of the `Permutive` configuration mentioned above. It will soon replace the old configuration.
+
+<!-- markdown-link-check-disable -->
+
+To add additional properties to Permutive events use the `extraUrlParams` property and use the `customProperties` key to define any custom properties. The value should be a valid json object. Full configuration details can be found at [support.permutive.com](https://support.permutive.com/hc/en-us).
+
+<!-- markdown-link-check-enable -->
 
 ### Piano
 
@@ -523,21 +547,25 @@ Type attribute value: `retargetly`
 
 Type attribute value: `rudderstack`
 
+<!-- markdown-link-check-disable -->
+
 Adds support for RudderStack page views and events.
 Find out more on the implementation check our documentation at [docs.rudderstack.com](https://docs.rudderstack.com/rudderstack-sdk-integration-guides/amp-analytics).
 
+<!-- markdown-link-check-enable -->
+
 ### Segment
 
 Type attribute value: `segment`
 
 Adds support for segment page views and events.
-To see the full list of fields that you can send, see [Segment Spec](https://segment.com/docs/spec/).
+To see the full list of fields that you can send, see [Segment Spec](https://segment.com/docs/connections/spec/).
 
 ### SensorsData
 
 Type attribute value: `sensorsanalytics`
 
-Adds support for Sensors Data. More details for adding Sensors Data support can be found at [sensorsdata.com](https://manual.sensorsdata.cn/sa/latest/web-js-sdk-7548149.html).
+Adds support for Sensors Data. More details for adding Sensors Data support can be found at [sensorsdata.com](https://manual.sensorsdata.cn/).
 
 ### ShinyStat
 
@@ -601,6 +629,10 @@ Type attribute value: `treasuredata`
 
 Adds support for Treasure Data. Configuration details can be found at [docs.treasuredata.com](https://docs.treasuredata.com/display/public/INT/Google+Accelerated+Mobile+Pages+AMP).
 
+### Triboo Data Analytics
+
+Type attribute value: `tribooanalytics`
+
 ### Umeng+ Analytics
 
 Type attribute value: `umenganalytics`
diff --git a/extensions/amp-anim/0.1/amp-anim.js b/extensions/amp-anim/0.1/amp-anim.js
index a1f4ff855926..179087d1edd9 100644
--- a/extensions/amp-anim/0.1/amp-anim.js
+++ b/extensions/amp-anim/0.1/amp-anim.js
@@ -1,11 +1,12 @@
-import * as st from '#core/dom/style';
-import {applyFillContent, isLayoutSizeDefined} from '#core/dom/layout';
-import {dev} from '#utils/log';
 import {guaranteeSrcForSrcsetUnsupportedBrowsers} from '#core/dom/img';
+import {applyFillContent, isLayoutSizeDefined} from '#core/dom/layout';
 import {observeIntersections} from '#core/dom/layout/viewport-observer';
 import {propagateAttributes} from '#core/dom/propagate-attributes';
+import * as st from '#core/dom/style';
 import {propagateObjectFitStyles} from '#core/dom/style';
 
+import {dev} from '#utils/log';
+
 const TAG = 'amp-anim';
 const BUILD_ATTRIBUTES = [
   'alt',
diff --git a/extensions/amp-animation/0.1/amp-animation.js b/extensions/amp-animation/0.1/amp-animation.js
index 7345dc558101..1e60914b1755 100644
--- a/extensions/amp-animation/0.1/amp-animation.js
+++ b/extensions/amp-animation/0.1/amp-animation.js
@@ -1,4 +1,4 @@
-import {ActionTrust} from '#core/constants/action-constants';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
 import {getChildJsonConfig} from '#core/dom';
 import {setInitialDisplay, setStyles, toggle} from '#core/dom/style';
 import {clamp} from '#core/math';
@@ -122,43 +122,47 @@ export class AmpAnimation extends AMP.BaseElement {
     this.registerDefaultAction(
       this.startAction_.bind(this),
       'start',
-      ActionTrust.LOW
+      ActionTrust_Enum.LOW
     );
     this.registerAction(
       'restart',
       this.restartAction_.bind(this),
-      ActionTrust.LOW
+      ActionTrust_Enum.LOW
+    );
+    this.registerAction(
+      'pause',
+      this.pauseAction_.bind(this),
+      ActionTrust_Enum.LOW
     );
-    this.registerAction('pause', this.pauseAction_.bind(this), ActionTrust.LOW);
     this.registerAction(
       'resume',
       this.resumeAction_.bind(this),
-      ActionTrust.LOW
+      ActionTrust_Enum.LOW
     );
     this.registerAction(
       'togglePause',
       this.togglePauseAction_.bind(this),
-      ActionTrust.LOW
+      ActionTrust_Enum.LOW
     );
     this.registerAction(
       'seekTo',
       this.seekToAction_.bind(this),
-      ActionTrust.LOW
+      ActionTrust_Enum.LOW
     );
     this.registerAction(
       'reverse',
       this.reverseAction_.bind(this),
-      ActionTrust.LOW
+      ActionTrust_Enum.LOW
     );
     this.registerAction(
       'finish',
       this.finishAction_.bind(this),
-      ActionTrust.LOW
+      ActionTrust_Enum.LOW
     );
     this.registerAction(
       'cancel',
       this.cancelAction_.bind(this),
-      ActionTrust.LOW
+      ActionTrust_Enum.LOW
     );
   }
 
diff --git a/extensions/amp-animation/0.1/parsers/css-expr-ast.js b/extensions/amp-animation/0.1/parsers/css-expr-ast.js
index c58e87b65efc..bd3389095b4d 100644
--- a/extensions/amp-animation/0.1/parsers/css-expr-ast.js
+++ b/extensions/amp-animation/0.1/parsers/css-expr-ast.js
@@ -193,10 +193,10 @@ export class CssConcatNode extends CssNode {
       opt_array instanceof CssConcatNode
         ? opt_array.array_
         : Array.isArray(opt_array)
-        ? opt_array
-        : opt_array
-        ? [opt_array]
-        : [];
+          ? opt_array
+          : opt_array
+            ? [opt_array]
+            : [];
     /** @const @private {?Array<string>} */
     this.dimensions_ = opt_dimensions || null;
   }
@@ -707,8 +707,8 @@ export function createPositionNode(value) {
         kw == 'left' || kw == 'right'
           ? 'w'
           : kw == 'top' || kw == 'bottom'
-          ? 'h'
-          : '';
+            ? 'h'
+            : '';
       dims[i] = dims[i + 1] = dim;
     }
   }
@@ -815,14 +815,14 @@ export class CssTranslateNode extends CssFuncNode {
       suffix == ''
         ? ['w', 'h']
         : suffix == 'x'
-        ? ['w']
-        : suffix == 'y'
-        ? ['h']
-        : suffix == 'z'
-        ? ['z']
-        : suffix == '3d'
-        ? ['w', 'h', 'z']
-        : null
+          ? ['w']
+          : suffix == 'y'
+            ? ['h']
+            : suffix == 'z'
+              ? ['z']
+              : suffix == '3d'
+                ? ['w', 'h', 'z']
+                : null
     );
     /** @const @protected {string} */
     this.suffix_ = suffix;
diff --git a/extensions/amp-animation/0.1/parsers/keyframes-extractor.js b/extensions/amp-animation/0.1/parsers/keyframes-extractor.js
index 59b95b2d351c..0a128060b518 100644
--- a/extensions/amp-animation/0.1/parsers/keyframes-extractor.js
+++ b/extensions/amp-animation/0.1/parsers/keyframes-extractor.js
@@ -129,8 +129,8 @@ function buildKeyframes(keyframesRule) {
       keyframeRule.keyText == 'from'
         ? 0
         : keyframeRule.keyText == 'to'
-        ? 1
-        : parseFloat(keyframeRule.keyText) / 100;
+          ? 1
+          : parseFloat(keyframeRule.keyText) / 100;
     const {style} = keyframeRule;
     for (let j = 0; j < style.length; j++) {
       const styleName = style[j];
diff --git a/extensions/amp-animation/0.1/runners/animation-runner.js b/extensions/amp-animation/0.1/runners/animation-runner.js
index 0af9d5561f29..8fced108a2e1 100644
--- a/extensions/amp-animation/0.1/runners/animation-runner.js
+++ b/extensions/amp-animation/0.1/runners/animation-runner.js
@@ -1,5 +1,5 @@
 import {
-  WebAnimationPlayState, // eslint-disable-line no-unused-vars
+  WebAnimationPlayState, // eslint-disable-line @typescript-eslint/no-unused-vars
 } from '../web-animation-types';
 
 /**
diff --git a/extensions/amp-animation/0.1/storybook/Basic.amp.js b/extensions/amp-animation/0.1/storybook/Basic.amp.js
index ebb7520ba56c..89aa6adbff81 100644
--- a/extensions/amp-animation/0.1/storybook/Basic.amp.js
+++ b/extensions/amp-animation/0.1/storybook/Basic.amp.js
@@ -2,7 +2,11 @@ import {withAmp} from '@ampproject/storybook-addon';
 
 import * as Preact from '#preact';
 
-import {AnimationTemplate} from './template';
+import {
+  AnimationTemplate,
+  animationDirectionArgType,
+  animationFillArgType,
+} from './template';
 
 const KEYFRAMES_OPTIONS = {
   'rotate': {
@@ -43,20 +47,36 @@ export default {
     extensions: [{name: 'amp-animation', version: 0.1}],
   },
   argTypes: {
+    fill: animationFillArgType,
+    direction: animationDirectionArgType,
     keyframesName: {
+      name: 'keyframesName',
       control: {type: 'select'},
       options: keyframesOptions,
     },
   },
   args: {
+    duration: '1s',
+    iterations: 2,
     keyframesName: keyframesOptions[0],
     easing: 'cubic-bezier(0,0,.21,1)',
   },
 };
 
-export const Default = ({easing, keyframesName}) => {
+export const Default = ({
+  direction,
+  duration,
+  easing,
+  fill,
+  iterations,
+  keyframesName,
+}) => {
   const keyframes = KEYFRAMES_OPTIONS[keyframesName];
   const spec = {
+    direction,
+    duration,
+    fill,
+    iterations,
     animations: {
       selector: '#block',
       easing,
diff --git a/extensions/amp-animation/0.1/storybook/Random.amp.js b/extensions/amp-animation/0.1/storybook/Random.amp.js
index ac983b2695ee..d3b57ef8ad52 100644
--- a/extensions/amp-animation/0.1/storybook/Random.amp.js
+++ b/extensions/amp-animation/0.1/storybook/Random.amp.js
@@ -2,7 +2,7 @@ import {withAmp} from '@ampproject/storybook-addon';
 
 import * as Preact from '#preact';
 
-import {AnimationTemplate} from './template';
+import {AnimationTemplate, animationFillArgType} from './template';
 
 const CONTAINER_STYLE = {
   position: 'absolute',
@@ -31,10 +31,20 @@ export default {
   parameters: {
     extensions: [{name: 'amp-animation', version: 0.1}],
   },
+  argTypes: {
+    fill: animationFillArgType,
+  },
+  args: {
+    duration: '1s',
+    iterations: 2,
+  },
 };
 
-export const Random = () => {
+export const Random = ({duration, fill, iterations}) => {
   const spec = {
+    duration,
+    fill,
+    iterations,
     selector: '.drop',
     '--delay': 'rand(0.1s, 5s)',
     delay: 'var(--delay)',
@@ -68,5 +78,3 @@ export const Random = () => {
     </AnimationTemplate>
   );
 };
-
-Random.storyName = 'random';
diff --git a/extensions/amp-animation/0.1/storybook/template.js b/extensions/amp-animation/0.1/storybook/template.js
index 5fa0d52f969e..c3ca87d1965d 100644
--- a/extensions/amp-animation/0.1/storybook/template.js
+++ b/extensions/amp-animation/0.1/storybook/template.js
@@ -1,15 +1,13 @@
-import {number, select, text} from '@storybook/addon-knobs';
-
 import * as Preact from '#preact';
 
-const FILL_OPTIONS = {
+export const FILL_OPTIONS = {
   none: 'none',
   forwards: 'forwards',
   backwards: 'backwards',
   both: 'both',
 };
 
-const DIRECTION_OPTIONS = {
+export const DIRECTION_OPTIONS = {
   normal: 'normal',
   reverse: 'reverse',
   alternate: 'alternate',
@@ -38,29 +36,32 @@ const INFO_STYLE = {
   overflow: 'auto',
 };
 
+export const animationFillArgType = {
+  name: 'fill',
+  options: FILL_OPTIONS,
+  control: {type: 'select'},
+  defaultValue: 'both',
+};
+
+export const animationDirectionArgType = {
+  name: 'duration',
+  options: DIRECTION_OPTIONS,
+  control: {type: 'select'},
+  defaultValue: 'alternate',
+};
+
 /**
  * @param {!Object} props
  * @return {!Object}
  */
 export function AnimationTemplate(props) {
   const {children, spec} = props;
-  const duration = text('Duration', '1s');
-  const iterations = number('Iterations', 2);
-  const fill = select('Fill', FILL_OPTIONS, 'both');
-  const direction = select('Direction', DIRECTION_OPTIONS, 'alternate');
-  const fullSpec = {
-    duration,
-    iterations,
-    fill,
-    direction,
-    ...spec,
-  };
   return (
     <main>
       <amp-animation id="anim1" layout="nodisplay">
         <script
           type="application/json"
-          dangerouslySetInnerHTML={{__html: JSON.stringify(fullSpec)}}
+          dangerouslySetInnerHTML={{__html: JSON.stringify(spec)}}
         />
       </amp-animation>
 
@@ -74,7 +75,7 @@ export function AnimationTemplate(props) {
         <button on="tap:anim1.cancel">Cancel</button>
       </div>
       <div style={CONTAINER_STYLE}>
-        <pre style={INFO_STYLE}>{JSON.stringify(fullSpec, null, 2)}</pre>
+        <pre style={INFO_STYLE}>{JSON.stringify(spec, null, 2)}</pre>
 
         {children}
       </div>
diff --git a/extensions/amp-animation/0.1/web-animation-types.js b/extensions/amp-animation/0.1/web-animation-types.js
index 116631e800a8..f6a3eb89cdc3 100644
--- a/extensions/amp-animation/0.1/web-animation-types.js
+++ b/extensions/amp-animation/0.1/web-animation-types.js
@@ -11,7 +11,7 @@
  * @typedef {{
  *   target: !Element,
  *   keyframes: !WebKeyframesDef,
- *   vars: ?Object<string, *>,
+ *   vars: ?{[key: string]: *},
  *   timing: !WebAnimationTimingDef,
  * }}
  */
@@ -72,7 +72,7 @@ export let WebCompAnimationDef;
 export let WebKeyframeAnimationDef;
 
 /**
- * @typedef {!Object<string, *>|!Array<!Object<string, *>>}
+ * @typedef {!{[key: string]: *}|!Array<!{[key: string]: *}>}
  */
 export let WebKeyframesDef;
 
@@ -98,7 +98,7 @@ export let WebAnimationTimingDef;
  * specified as properties with the name in the format of `--varName`.
  *
  * @mixin
- * @typedef {Object}
+ * @typedef {object}
  */
 export let WebAnimationVarsDef;
 
@@ -186,7 +186,7 @@ export const WebAnimationTimingFill = {
   AUTO: 'auto',
 };
 
-/** @const {!Object<string, boolean>} */
+/** @const {!{[key: string]: boolean}} */
 const ALLOWLISTED_PROPS = {
   'opacity': true,
   'transform': true,
diff --git a/extensions/amp-animation/0.1/web-animations.js b/extensions/amp-animation/0.1/web-animations.js
index 0c1efd18015b..dff58ea30d84 100644
--- a/extensions/amp-animation/0.1/web-animations.js
+++ b/extensions/amp-animation/0.1/web-animations.js
@@ -53,7 +53,7 @@ const TARGET_ANIM_ID = '__AMP_ANIM_ID';
 let animIdCounter = 0;
 
 /**
- * @const {!Object<string, boolean>}
+ * @const {!{[key: string]: boolean}}
  */
 const SERVICE_PROPS = {
   'offset': true,
@@ -211,7 +211,7 @@ export class Builder {
    * @param {?WebAnimationDef|undefined} args
    * @param {?Element} target
    * @param {?number} index
-   * @param {?Object<string, *>} vars
+   * @param {?{[key: string]: *}} vars
    * @param {?WebAnimationTimingDef} timing
    * @return {!Promise<!Array<!InternalWebAnimationRequestDef>>}
    * @protected
@@ -246,7 +246,7 @@ export class Builder {
    * @param {!Array<string>} path
    * @param {?Element} target
    * @param {?number} index
-   * @param {?Object<string, *>} vars
+   * @param {?{[key: string]: *}} vars
    * @param {?WebAnimationTimingDef} timing
    * @private
    * @return {*} TODO(#23582): Specify return type
@@ -289,7 +289,7 @@ export class MeasureScanner extends Scanner {
    * @param {!Array<string>} path
    * @param {?Element} target
    * @param {?number} index
-   * @param {?Object<string, *>} vars
+   * @param {?{[key: string]: *}} vars
    * @param {?WebAnimationTimingDef} timing
    */
   constructor(builder, css, path, target, index, vars, timing) {
@@ -310,7 +310,7 @@ export class MeasureScanner extends Scanner {
     /** @private {?number} */
     this.index_ = index;
 
-    /** @private {!Object<string, *>} */
+    /** @private {!{[key: string]: *}} */
     this.vars_ = vars || map();
 
     /** @private {!WebAnimationTimingDef} */
@@ -478,7 +478,7 @@ export class MeasureScanner extends Scanner {
       // allowlisted. Additionally, the `offset:0` frames are inserted
       // to polyfill partial keyframes per spec.
       // See https://github.com/w3c/web-animations/issues/187
-      const object = /** @type {!Object<string, *>} */ (specKeyframes);
+      const object = /** @type {!{[key: string]: *}} */ (specKeyframes);
       /** @type {!WebKeyframesDef} */
       const keyframes = {};
       for (const prop in object) {
@@ -510,7 +510,7 @@ export class MeasureScanner extends Scanner {
       // to polyfill partial keyframes per spec.
       // See https://github.com/w3c/web-animations/issues/187 and
       // https://github.com/web-animations/web-animations-js/issues/14
-      const array = /** @type {!Array<!Object<string, *>>} */ (specKeyframes);
+      const array = /** @type {!Array<!{[key: string]: *}>} */ (specKeyframes);
       /** @type {!WebKeyframesDef} */
       const keyframes = [];
       const addStartFrame = array.length == 1 || array[0].offset > 0;
@@ -703,9 +703,9 @@ export class MeasureScanner extends Scanner {
 
   /**
    * Merges vars by defaulting values from the previous vars.
-   * @param {!Object<string, *>} newVars
-   * @param {!Object<string, *>} prevVars
-   * @return {!Object<string, *>}
+   * @param {!{[key: string]: *}} newVars
+   * @param {!{[key: string]: *}} prevVars
+   * @return {!{[key: string]: *}}
    * @private
    */
   mergeVars_(newVars, prevVars) {
@@ -858,10 +858,10 @@ class CssContextImpl {
     /** @const @private */
     this.baseUrl_ = baseUrl;
 
-    /** @private {!Object<string, !CSSStyleDeclaration>} */
+    /** @private {!{[key: string]: !CSSStyleDeclaration}} */
     this.computedStyleCache_ = map();
 
-    /** @private {!Object<string, ?./parsers/css-expr-ast.CssNode>} */
+    /** @private {!{[key: string]: ?./parsers/css-expr-ast.CssNode}} */
     this.parsedCssCache_ = map();
 
     /** @private {?number} */
@@ -873,7 +873,7 @@ class CssContextImpl {
     /** @private {?number} */
     this.currentIndex_ = null;
 
-    /** @private {?Object<string, *>} */
+    /** @private {?{[key: string]: *}} */
     this.vars_ = null;
 
     /** @private {!Array<string>} */
@@ -992,7 +992,7 @@ class CssContextImpl {
   }
 
   /**
-   * @param {?Object<string, *>} vars
+   * @param {?{[key: string]: *}} vars
    * @param {function():T} callback
    * @return {T}
    * @template T
@@ -1019,8 +1019,8 @@ class CssContextImpl {
   }
 
   /**
-   * @param {!Object<string, *>} input
-   * @return {!Object<string, string|number>}
+   * @param {!{[key: string]: *}} input
+   * @return {!{[key: string]: string|number}}
    */
   resolveCssMap(input) {
     const result = map();
@@ -1152,8 +1152,8 @@ class CssContextImpl {
       this.vars_ && this.vars_[varName] != undefined
         ? this.vars_[varName]
         : this.currentTarget_
-        ? this.measure(this.currentTarget_, varName)
-        : null;
+          ? this.measure(this.currentTarget_, varName)
+          : null;
     if (rawValue == null || rawValue === '') {
       user().warn(TAG, `Variable not found: "${varName}"`);
     }
diff --git a/extensions/amp-animation/validator-amp-animation.protoascii b/extensions/amp-animation/validator-amp-animation.protoascii
index 27b188461695..e513cd42d7d5 100644
--- a/extensions/amp-animation/validator-amp-animation.protoascii
+++ b/extensions/amp-animation/validator-amp-animation.protoascii
@@ -16,7 +16,7 @@ tags: {  # <amp-animation> (json)
   spec_name: "amp-animation extension .json script"
   mandatory_parent: "AMP-ANIMATION"
   requires_extension: "amp-animation"
-  satisfies: "amp-animation extension .json script"
+  satisfies_condition: "amp-animation extension .json script"
   attrs: {
     name: "type"
     mandatory: true
@@ -36,7 +36,7 @@ tags: {  # <amp-animation>
   html_format: AMP4ADS
   tag_name: "AMP-ANIMATION"
   requires_extension: "amp-animation"
-  requires: "amp-animation extension .json script"
+  requires_condition: "amp-animation extension .json script"
   attrs: {
     name: "trigger"
     value: "visibility"
diff --git a/extensions/amp-apester-media/0.1/amp-apester-media.css b/extensions/amp-apester-media/0.1/amp-apester-media.css
index 77f8dd2830c7..d7d1121c8e22 100644
--- a/extensions/amp-apester-media/0.1/amp-apester-media.css
+++ b/extensions/amp-apester-media/0.1/amp-apester-media.css
@@ -70,3 +70,37 @@
   transform: translateX(-50%) !important;
   margin: 0 !important;
 }
+
+.i-amphtml-amp-apester-in-unit-wrap {
+  display: none !important;
+  position: absolute !important;
+  top: 0 !important;
+  bottom: 0 !important;
+  left: 0 !important;
+  right: 0 !important;
+  background-color: #626262 !important;
+}
+
+.i-amphtml-amp-apester-in-unit-wrap.active {
+  display: block !important;
+}
+
+.i-amphtml-amp-apester-progress-bar {
+  width: 100%;
+  height: 4px;
+  background-color: #ee9802;
+}
+
+@keyframes progress {
+  from {
+      width: 0;
+  }
+}
+
+.i-amphtml-amp-apester-in-unit {
+  display: block!important;
+  position: relative!important;
+  top: 50%!important;
+  transform: translateY(-50%)!important;
+  margin: 0!important;
+}
diff --git a/extensions/amp-apester-media/0.1/amp-apester-media.js b/extensions/amp-apester-media/0.1/amp-apester-media.js
index f01f27287a5a..c308922e2a4d 100644
--- a/extensions/amp-apester-media/0.1/amp-apester-media.js
+++ b/extensions/amp-apester-media/0.1/amp-apester-media.js
@@ -13,17 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {CSS} from '../../../build/amp-apester-media-0.1.css';
-import {IntersectionObserver3pHost} from '#utils/intersection-observer-3p-host';
-import {Services} from '#service';
-import {addParamsToUrl} from '../../../src/url';
+import {removeElement} from '#core/dom';
 import {
   applyFillContent,
   getLengthNumeral,
   isLayoutSizeDefined,
 } from '#core/dom/layout';
+import {observeIntersections} from '#core/dom/layout/viewport-observer';
+import {px, setStyles} from '#core/dom/style';
+
+import {Services} from '#service';
+
+import {IntersectionObserver3pHost} from '#utils/intersection-observer-3p-host';
 import {dev, user, userAssert} from '#utils/log';
-import {dict} from '#core/types/object';
+
+import {handleAds} from './monetization';
 import {
   extractTags,
   getPlatform,
@@ -31,16 +35,16 @@ import {
   setFullscreenOff,
   setFullscreenOn,
 } from './utils';
-import {handleCompanionAds} from './monetization';
-import {observeIntersections} from '#core/dom/layout/viewport-observer';
-import {px, setStyles} from '#core/dom/style';
-import {removeElement} from '#core/dom';
+
+import {CSS} from '../../../build/amp-apester-media-0.1.css';
+import {addParamsToUrl} from '../../../src/url';
 
 /** @const */
 const TAG = 'amp-apester-media';
 const AD_TAG = 'amp-ad';
+const AD_IFRAME_TAG = 'amp-iframe';
 /** @const {!JsonObject} */
-const BOTTOM_AD_MESSAGE = dict({'type': 'has_bottom_ad', 'adHeight': 50});
+const BOTTOM_AD_MESSAGE = {'type': 'has_bottom_ad', 'adHeight': 50};
 /**
  * @enum {string}
  */
@@ -181,7 +185,7 @@ class AmpApesterMedia extends AMP.BaseElement {
       dev().assertString(this.mediaAttribute_)
     );
     let suffix = '';
-    const queryParams = dict();
+    const queryParams = {};
     queryParams['renderer'] = false;
     queryParams['platform'] = getPlatform();
     if (inative) {
@@ -223,7 +227,7 @@ class AmpApesterMedia extends AMP.BaseElement {
    *  @return {string}
    * */
   constructUrlFromMedia_(id, usePlayer) {
-    const queryParams = dict();
+    const queryParams = {};
     queryParams['channelId'] = this.embedOptions_.distributionChannelId;
     queryParams['type'] = this.embedOptions_.playlist
       ? 'playlist'
@@ -269,19 +273,6 @@ class AmpApesterMedia extends AMP.BaseElement {
     return img;
   }
 
-  /**
-   * @return {!Element}
-   */
-  constructOverflow_() {
-    const overflow = this.element.ownerDocument.createElement('div');
-    overflow.setAttribute('overflow', '');
-    overflow.className = 'amp-apester-overflow';
-    const overflowButton = this.element.ownerDocument.createElement('button');
-    overflowButton.textContent = 'Full Size';
-    overflow.appendChild(overflowButton);
-    return overflow;
-  }
-
   /** @override */
   layoutCallback() {
     this.element.classList.add('amp-apester-container');
@@ -315,10 +306,8 @@ class AmpApesterMedia extends AMP.BaseElement {
 
         return vsync
           .mutatePromise(() => {
-            const overflow = this.constructOverflow_();
-            this.element.appendChild(overflow);
             this.element.appendChild(iframe);
-            handleCompanionAds(media, this.element);
+            handleAds(media, this.element);
           })
           .then(() => this.loadPromise(iframe))
           .then(() =>
@@ -328,10 +317,13 @@ class AmpApesterMedia extends AMP.BaseElement {
 
                 const campaignData = media['campaignData'];
                 if (campaignData) {
+                  const ampdoc = this.getAmpDoc();
+                  Services.extensionsFor(
+                    this.win
+                  )./*OK*/ installExtensionForDoc(ampdoc, AD_IFRAME_TAG);
                   const bottomAdOptions = campaignData['bottomAdOptions'];
                   if (bottomAdOptions?.enabled) {
                     this.hasBottomAd_ = true;
-                    const ampdoc = this.getAmpDoc();
                     Services.extensionsFor(
                       this.win
                     )./*OK*/ installExtensionForDoc(ampdoc, AD_TAG);
diff --git a/extensions/amp-apester-media/0.1/monetization/companion/bottomAd.js b/extensions/amp-apester-media/0.1/monetization/bottomAd/bottomAd.js
similarity index 76%
rename from extensions/amp-apester-media/0.1/monetization/companion/bottomAd.js
rename to extensions/amp-apester-media/0.1/monetization/bottomAd/bottomAd.js
index bb6a5e1f00c1..1845757eb7f3 100644
--- a/extensions/amp-apester-media/0.1/monetization/companion/bottomAd.js
+++ b/extensions/amp-apester-media/0.1/monetization/bottomAd/bottomAd.js
@@ -1,13 +1,14 @@
-import {Services} from '#service';
 import {createElementWithAttributes} from '#core/dom';
-import {dict, getValueForExpr} from '#core/types/object';
+import {getValueForExpr} from '#core/types/object';
+
+import {Services} from '#service';
 const ALLOWED_AD_PROVIDER = 'gpt';
 
 /**
  * @param {!JsonObject} media
  * @param {!AmpElement} apesterElement
  */
-export function handleCompanionBottomAd(media, apesterElement) {
+export function handleBottomAd(media, apesterElement) {
   const bottomAdOptions = getValueForExpr(
     /**@type {!JsonObject}*/ (media),
     'campaignData.bottomAdOptions'
@@ -19,13 +20,17 @@ export function handleCompanionBottomAd(media, apesterElement) {
     /**@type {!JsonObject}*/ (bottomAdOptions),
     'enabled'
   );
+  const rtcConfig = getValueForExpr(
+    /**@type {!JsonObject}*/ (bottomAdOptions),
+    'rtcConfig'
+  );
   if (
     enabledBottomAd &&
     bottomAdOptions['videoPlayer'] === ALLOWED_AD_PROVIDER
   ) {
     const slot = bottomAdOptions['tag'];
     const bannerSizes = [[300, 50]];
-    constructCompanionBottomAd(slot, bannerSizes, apesterElement);
+    constructCompanionBottomAd(slot, bannerSizes, apesterElement, rtcConfig);
   }
 }
 
@@ -33,16 +38,22 @@ export function handleCompanionBottomAd(media, apesterElement) {
  * @param {string} slot
  * @param {Array} bannerSizes
  * @param {!AmpElement} apesterElement
+ * @param {!JsonObject} rtcConfig
  * @return {!Element}
  */
-function constructCompanionBottomAd(slot, bannerSizes, apesterElement) {
+function constructCompanionBottomAd(
+  slot,
+  bannerSizes,
+  apesterElement,
+  rtcConfig
+) {
   const width = bannerSizes[0][0];
   const height = bannerSizes[0][1];
   const refreshInterval = 30;
   const ampAd = createElementWithAttributes(
     /** @type {!Document} */ (apesterElement.ownerDocument),
     'amp-ad',
-    dict({
+    {
       'width': `${width}`,
       'height': `${height}`,
       'type': 'doubleclick',
@@ -50,8 +61,11 @@ function constructCompanionBottomAd(slot, bannerSizes, apesterElement) {
       'data-slot': `${slot}`,
       'data-multi-size-validation': 'false',
       'data-enable-refresh': `${refreshInterval}`,
-    })
+    }
   );
+  if (rtcConfig) {
+    ampAd.setAttribute('rtc-config', JSON.stringify(rtcConfig));
+  }
   ampAd.classList.add('i-amphtml-amp-apester-bottom-ad');
   apesterElement.appendChild(ampAd);
   Services.mutatorForDoc(apesterElement).requestChangeSize(ampAd, height);
diff --git a/extensions/amp-apester-media/0.1/monetization/companion/display.js b/extensions/amp-apester-media/0.1/monetization/companion/display.js
index 578ced9da011..e73c4924ef1e 100644
--- a/extensions/amp-apester-media/0.1/monetization/companion/display.js
+++ b/extensions/amp-apester-media/0.1/monetization/companion/display.js
@@ -1,6 +1,7 @@
-import {Services} from '#service';
 import {createElementWithAttributes} from '#core/dom';
-import {dict, getValueForExpr} from '#core/types/object';
+import {getValueForExpr} from '#core/types/object';
+
+import {Services} from '#service';
 const ALLOWED_AD_PROVIDER = 'gdt';
 
 /**
@@ -23,6 +24,10 @@ export function handleCompanionDisplay(media, apesterElement) {
     /**@type {!JsonObject}*/ (companionOptions),
     'settings'
   );
+  const rtcConfig = getValueForExpr(
+    /**@type {!JsonObject}*/ (companionOptions),
+    'rtcConfig'
+  );
 
   if (
     enabledDisplayAd &&
@@ -38,7 +43,8 @@ export function handleCompanionDisplay(media, apesterElement) {
       slot,
       bannerSizes,
       apesterElement,
-      refreshInterval
+      refreshInterval,
+      rtcConfig
     );
   }
 }
@@ -48,13 +54,15 @@ export function handleCompanionDisplay(media, apesterElement) {
  * @param {Array} bannerSizes
  * @param {!AmpElement} apesterElement
  * @param {number} refreshInterval
+ * @param {!JsonObject} rtcConfig
  * @return {!Element}
  */
 function constructCompanionDisplayAd(
   slot,
   bannerSizes,
   apesterElement,
-  refreshInterval
+  refreshInterval,
+  rtcConfig
 ) {
   const maxWidth = Math.max.apply(
     null,
@@ -69,17 +77,20 @@ function constructCompanionDisplayAd(
   const ampAd = createElementWithAttributes(
     /** @type {!Document} */ (apesterElement.ownerDocument),
     'amp-ad',
-    dict({
+    {
       'width': `${maxWidth}`,
-      'height': '0',
+      'height': `${maxHeight}`,
       'type': 'doubleclick',
       'layout': 'fixed',
       'data-slot': `${slot}`,
       'data-multi-size-validation': 'false',
       'data-multi-size': multiSizeData,
       'data-enable-refresh': `${refreshInterval}`,
-    })
+    }
   );
+  if (rtcConfig) {
+    ampAd.setAttribute('rtc-config', JSON.stringify(rtcConfig));
+  }
   ampAd.classList.add('i-amphtml-amp-apester-companion');
   apesterElement.parentNode.insertBefore(ampAd, apesterElement.nextSibling);
   Services.mutatorForDoc(apesterElement).requestChangeSize(
diff --git a/extensions/amp-apester-media/0.1/monetization/companion/video.js b/extensions/amp-apester-media/0.1/monetization/companion/video.js
index c708b042a221..b8d43821b1fb 100644
--- a/extensions/amp-apester-media/0.1/monetization/companion/video.js
+++ b/extensions/amp-apester-media/0.1/monetization/companion/video.js
@@ -1,8 +1,7 @@
-import {Services} from '#service';
 import {createElementWithAttributes} from '#core/dom';
-import {dict, getValueForExpr} from '#core/types/object';
+import {getValueForExpr} from '#core/types/object';
 
-const ALLOWED_AD_PROVIDER = 'sr';
+import {Services} from '#service';
 
 /**
  * @param {!JsonObject} media
@@ -21,29 +20,53 @@ export function handleCompanionVideo(media, apesterElement, consentObj) {
   const position = getCompanionPosition(
     /**@type {!JsonObject}*/ (videoSettings)
   );
-
   if (
-    !companionCampaignOptions ||
     !videoSettings ||
-    !videoSettings['enabled'] ||
-    videoSettings['provider'] !== ALLOWED_AD_PROVIDER ||
+    !videoSettings.enabled ||
     !position ||
     position === 'floating'
   ) {
     return;
   }
-  const macros = getSrMacros(
-    media,
-    companionCampaignOptions['companionCampaignId'],
-    apesterElement,
-    consentObj
-  );
-  addCompanionSrElement(
-    videoSettings['videoTag'],
-    position,
-    /** @type {!JsonObject} */ (macros),
-    apesterElement
-  );
+  const provider = videoSettings['provider'];
+  switch (provider) {
+    case 'sr': {
+      const companionCampaignId = companionCampaignOptions?.companionCampaignId;
+      const {videoTag} = videoSettings;
+
+      if (!companionCampaignId || !videoTag) {
+        return;
+      }
+      const macros = getSrMacros(
+        media,
+        companionCampaignId,
+        apesterElement,
+        consentObj
+      );
+      addCompanionSrElement(
+        videoTag,
+        position,
+        /** @type {!JsonObject} */ (macros),
+        apesterElement
+      );
+      break;
+    }
+    case 'aniview': {
+      const {playerOptions = {}} = videoSettings;
+      if (!playerOptions.aniviewChannelId) {
+        return;
+      }
+      addCompanionAvElement(
+        playerOptions,
+        position,
+        apesterElement,
+        consentObj
+      );
+      break;
+    }
+    default:
+      break;
+  }
 }
 
 /**
@@ -66,6 +89,53 @@ function getCompanionPosition(video) {
   return null;
 }
 
+/**
+ * @param {!JsonObject} playerOptions
+ * @param {string} position
+ * @param {!AmpElement} apesterElement
+ * @param {!JsonObject} consentObj
+ */
+function addCompanionAvElement(
+  playerOptions,
+  position,
+  apesterElement,
+  consentObj
+) {
+  const size = getCompanionVideoAdSize(apesterElement);
+  const ampAvAd = createElementWithAttributes(
+    /** @type {!Document} */ (apesterElement.ownerDocument),
+    'amp-iframe',
+    {
+      'scrolling': 'no',
+      'id': 'amp-iframe',
+      'title': 'Ads',
+      'layout': 'responsive',
+      'sandbox': 'allow-scripts allow-same-origin allow-popups',
+      'allowfullscreen': 'false',
+      'frameborder': '0',
+      'width': size.width,
+      'height': size.height,
+      'src': `https://player.avplayer.com/amp/ampiframe.html?AV_TAGID=${playerOptions.aniviewPlayerId}&AV_PUBLISHERID=5fabb425e5d4cb4bbc0ca7e4`,
+    }
+  );
+
+  if (consentObj['gdpr']) {
+    ampAvAd['data-av_gdpr'] = consentObj['gdpr'];
+    ampAvAd['data-av_consent'] = consentObj['user_consent'];
+  }
+
+  ampAvAd.classList.add('i-amphtml-amp-apester-companion');
+
+  const relativeElement =
+    position === 'below' ? apesterElement.nextSibling : apesterElement;
+  apesterElement.parentNode.insertBefore(ampAvAd, relativeElement);
+
+  Services.mutatorForDoc(apesterElement).requestChangeSize(
+    ampAvAd,
+    size.height
+  );
+}
+
 /**
  * @param {string} videoTag
  * @param {string} position
@@ -78,7 +148,7 @@ function addCompanionSrElement(videoTag, position, macros, apesterElement) {
   const ampBladeAd = createElementWithAttributes(
     /** @type {!Document} */ (apesterElement.ownerDocument),
     'amp-ad',
-    dict({
+    {
       'width': size.width,
       'height': size.height,
       'type': 'blade',
@@ -89,7 +159,7 @@ function addCompanionSrElement(videoTag, position, macros, apesterElement) {
       'data-blade_player_id': videoTag,
       'data-blade_api_key': '5857d2ee263dc90002000001',
       'data-enable-refresh': `${refreshInterval}`,
-    })
+    }
   );
 
   ampBladeAd.classList.add('i-amphtml-amp-apester-companion');
@@ -100,8 +170,7 @@ function addCompanionSrElement(videoTag, position, macros, apesterElement) {
 
   Services.mutatorForDoc(apesterElement).requestChangeSize(
     ampBladeAd,
-    size.height,
-    /* newWidth */ undefined
+    size.height
   );
 }
 
@@ -130,12 +199,12 @@ function getSrMacros(interactionModel, campaignId, apesterElement, consentObj) {
 
   const pageUrl = Services.documentInfoForDoc(apesterElement).canonicalUrl;
 
-  const macros = dict({
+  const macros = {
     'param1': interactionId,
     'param2': publisherId,
     'param6': campaignId,
     'page_url': pageUrl,
-  });
+  };
 
   if (consentObj['gdpr']) {
     macros['gdpr'] = consentObj['gdpr'];
diff --git a/extensions/amp-apester-media/0.1/monetization/consent-util.js b/extensions/amp-apester-media/0.1/monetization/consent-util.js
index 21c5946dd65e..6032f9e4164e 100644
--- a/extensions/amp-apester-media/0.1/monetization/consent-util.js
+++ b/extensions/amp-apester-media/0.1/monetization/consent-util.js
@@ -1,13 +1,12 @@
-import {dict} from '#core/types/object';
+import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';
+
+import {dev} from '#utils/log';
+
 import {
   getConsentPolicyInfo,
   getConsentPolicyState,
 } from '../../../../src/consent';
 
-import {dev} from '#utils/log';
-
-import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';
-
 const TAG = 'amp-apester-media';
 
 const AWAIT_TIME_OUT_FOR_RESPONSE = 3000;
@@ -47,10 +46,10 @@ export function getConsentData(apesterElement) {
       const gdprString = consentDataResponse[1];
       switch (consentStatus) {
         case CONSENT_POLICY_STATE.SUFFICIENT:
-          return dict({'gdpr': 1, 'user_consent': 1, 'gdprString': gdprString});
+          return {'gdpr': 1, 'user_consent': 1, 'gdprString': gdprString};
         case CONSENT_POLICY_STATE.INSUFFICIENT:
         case CONSENT_POLICY_STATE.UNKNOWN:
-          return dict({'gdpr': 1, 'user_consent': 0, 'gdprString': gdprString});
+          return {'gdpr': 1, 'user_consent': 0, 'gdprString': gdprString};
         case CONSENT_POLICY_STATE.UNKNOWN_NOT_REQUIRED:
         default:
           return {};
diff --git a/extensions/amp-apester-media/0.1/monetization/inUnit/video.js b/extensions/amp-apester-media/0.1/monetization/inUnit/video.js
new file mode 100644
index 000000000000..f2945dee6d64
--- /dev/null
+++ b/extensions/amp-apester-media/0.1/monetization/inUnit/video.js
@@ -0,0 +1,134 @@
+import {createElementWithAttributes} from '#core/dom';
+import {setStyle} from '#core/dom/style';
+import {getValueForExpr} from '#core/types/object';
+
+import {Services} from '#service';
+
+/**
+ * @param {!JsonObject} media
+ * @param {!AmpElement} apesterElement
+ * @param {!JsonObject} consentObj
+ */
+export function handleInUnitVideo(media, apesterElement, consentObj) {
+  const playerOptions = getValueForExpr(
+    /**@type {!JsonObject}*/ (media),
+    'campaignData.playerOptions'
+  );
+  if (!playerOptions) {
+    return;
+  }
+  const videoSettings = playerOptions.find(
+    (options) => options.player.type === 'va'
+  );
+  if (!videoSettings) {
+    return;
+  }
+  const idleOptions = videoSettings.requests.find(
+    (request) => request.type === 'idle'
+  );
+  const {provider} = videoSettings.player;
+  switch (provider.type) {
+    case 'aniview': {
+      const playerOptions = provider.options || {};
+      if (!playerOptions.aniviewChannelId) {
+        return;
+      }
+      addAvElement(
+        playerOptions,
+        apesterElement,
+        consentObj,
+        idleOptions.options
+      );
+      break;
+    }
+    default:
+      break;
+  }
+}
+
+/**
+ * @param {!AmpElement} adWrap
+ * @param {!AmpElement} progressBar
+ * @param {!JsonObject} idleOptions
+ */
+function showVideoAd(adWrap, progressBar, idleOptions) {
+  const {skipTimer} = idleOptions;
+  adWrap.classList.add('active');
+  setStyle(progressBar, 'animation', `progress ${skipTimer}s linear 1`);
+  const timer = setTimeout(() => {
+    adWrap.classList.remove('active');
+    clearTimeout(timer);
+  }, skipTimer * 1000);
+}
+
+/**
+ * @param {!JsonObject} playerOptions
+ * @param {!AmpElement} apesterElement
+ * @param {!JsonObject} consentObj
+ * @param {!JsonObject} idleOptions
+ */
+function addAvElement(playerOptions, apesterElement, consentObj, idleOptions) {
+  const size = getCompanionVideoAdSize(apesterElement);
+  const ampAvAd = createElementWithAttributes(
+    /** @type {!Document} */ (apesterElement.ownerDocument),
+    'amp-iframe',
+    {
+      'scrolling': 'no',
+      'id': 'amp-iframe',
+      'title': 'Ads',
+      'layout': 'responsive',
+      'sandbox': 'allow-scripts allow-same-origin allow-popups',
+      'allowfullscreen': 'false',
+      'frameborder': '0',
+      'width': size.width,
+      'height': size.height,
+      'class': 'i-amphtml-amp-apester-in-unit',
+      'src': `https://player.avplayer.com/amp/ampiframe.html?AV_TAGID=${playerOptions.aniviewPlayerId}&AV_PUBLISHERID=5fabb425e5d4cb4bbc0ca7e4`,
+    }
+  );
+
+  if (consentObj['gdpr']) {
+    ampAvAd['data-av_gdpr'] = consentObj['gdpr'];
+    ampAvAd['data-av_consent'] = consentObj['user_consent'];
+  }
+
+  const ampAvAdWrap = createElementWithAttributes(
+    /** @type {!Document} */ (apesterElement.ownerDocument),
+    'div',
+    {'class': 'i-amphtml-amp-apester-in-unit-wrap'}
+  );
+
+  const progressBarWrap = createElementWithAttributes(
+    /** @type {!Document} */ (apesterElement.ownerDocument),
+    'div',
+    {'class': 'i-amphtml-amp-apester-progress-bar'}
+  );
+  ampAvAdWrap.appendChild(progressBarWrap);
+  ampAvAdWrap.appendChild(ampAvAd);
+  apesterElement.appendChild(ampAvAdWrap);
+
+  showVideoAd(ampAvAdWrap, progressBarWrap, idleOptions);
+  const {skipTimer, timeout} = idleOptions;
+  setInterval(
+    () => {
+      showVideoAd(ampAvAdWrap, progressBarWrap, idleOptions);
+    },
+    (timeout + skipTimer) * 1000
+  );
+
+  Services.mutatorForDoc(apesterElement).requestChangeSize(
+    ampAvAd,
+    size.height
+  );
+}
+
+/**
+ * @param {!AmpElement} apesterElement
+ * @return {{height: number, width: number}}
+ */
+export function getCompanionVideoAdSize(apesterElement) {
+  const adWidth = apesterElement./*REVIEW*/ clientWidth;
+  const adRatio = 0.6;
+  const adHeight = Math.ceil(adWidth * adRatio);
+  return {width: adWidth, height: adHeight};
+}
diff --git a/extensions/amp-apester-media/0.1/monetization/index.js b/extensions/amp-apester-media/0.1/monetization/index.js
index 85e995660861..df05f6e8125b 100644
--- a/extensions/amp-apester-media/0.1/monetization/index.js
+++ b/extensions/amp-apester-media/0.1/monetization/index.js
@@ -1,20 +1,22 @@
-import {getConsentData} from './consent-util';
-import {handleCompanionBottomAd} from './companion/bottomAd';
+import {handleBottomAd} from './bottomAd/bottomAd';
 import {handleCompanionDisplay} from './companion/display';
 import {handleCompanionVideo} from './companion/video';
+import {getConsentData} from './consent-util';
+import {handleInUnitVideo} from './inUnit/video';
 
 /**
  * @param {!JsonObject} media
  * @param {!AmpElement} apesterElement
  * @return {!Promise}
  */
-export function handleCompanionAds(media, apesterElement) {
+export function handleAds(media, apesterElement) {
   const monetizationSettings = media['campaignData'];
   if (monetizationSettings && !monetizationSettings.disabledAmpCompanionAds) {
     return getConsentData(apesterElement).then((consentData) => {
       handleCompanionDisplay(media, apesterElement);
       handleCompanionVideo(media, apesterElement, consentData);
-      handleCompanionBottomAd(media, apesterElement);
+      handleBottomAd(media, apesterElement);
+      handleInUnitVideo(media, apesterElement, consentData);
     });
   }
   return Promise.resolve();
diff --git a/extensions/amp-apester-media/0.1/test/test-amp-apester-media-utils.js b/extensions/amp-apester-media/0.1/test/test-amp-apester-media-utils.js
index ca6184cecbb7..ab830d00e0b4 100644
--- a/extensions/amp-apester-media/0.1/test/test-amp-apester-media-utils.js
+++ b/extensions/amp-apester-media/0.1/test/test-amp-apester-media-utils.js
@@ -1,4 +1,5 @@
 import {Services} from '#service';
+
 import {
   extractArticleTags,
   extractElementTags,
diff --git a/extensions/amp-apester-media/0.1/test/test-amp-apester-monetization.js b/extensions/amp-apester-media/0.1/test/test-amp-apester-monetization.js
index 71ec57578362..c51d1393f006 100644
--- a/extensions/amp-apester-media/0.1/test/test-amp-apester-monetization.js
+++ b/extensions/amp-apester-media/0.1/test/test-amp-apester-monetization.js
@@ -1,10 +1,11 @@
 import {Services} from '#service';
-import {handleCompanionAds} from '../monetization';
 import {installDocService} from '#service/ampdoc-impl';
+
 import {
   registerServiceBuilderForDoc,
   resetServiceForTesting,
 } from '../../../../src/service-helpers';
+import {handleAds} from '../monetization';
 
 describes.realWin(
   'amp-apester-media-monetization',
@@ -19,9 +20,17 @@ describes.realWin(
     let docInfo;
     const queryAmpAdBladeSelector = (myDoc) =>
       myDoc.querySelector('amp-ad[type=blade]');
+    const queryAmpAdAniviewSelector = (myDoc) =>
+      myDoc.querySelector('amp-iframe[id=amp-iframe]');
     const queryAmpAdDisplaySelector = (myDoc) =>
       myDoc.querySelector('amp-ad[type=doubleclick]');
 
+    const testRtcConfig = {
+      vendors: {
+        'vendorA': {'SLOT_ID': '1'},
+      },
+    };
+
     beforeEach(() => {
       win = env.win;
       doc = win.document;
@@ -50,14 +59,14 @@ describes.realWin(
 
     it('Should show a companion display ad', async () => {
       const media = createCampaignData({display: true});
-      await handleCompanionAds(media, baseElement);
+      await handleAds(media, baseElement);
       const displayAd = queryAmpAdDisplaySelector(doc);
       expect(displayAd).to.exist;
       expect(baseElement.nextSibling).to.be.equal(displayAd);
     });
     it('Should show a companion bottom ad', async () => {
       const media = createCampaignData({display: false, bottomAd: true});
-      await handleCompanionAds(media, baseElement);
+      await handleAds(media, baseElement);
       const bottomAd = queryAmpAdDisplaySelector(doc);
       expect(bottomAd).to.exist;
       expect(baseElement.lastChild).to.be.equal(bottomAd);
@@ -68,7 +77,7 @@ describes.realWin(
         srAbove: false,
         srBelow: true,
       });
-      await handleCompanionAds(media, baseElement);
+      await handleAds(media, baseElement);
       const srAdBelow = queryAmpAdBladeSelector(doc);
       expect(srAdBelow).to.exist;
       expect(baseElement.nextSibling).to.be.equal(srAdBelow);
@@ -79,18 +88,40 @@ describes.realWin(
         srAbove: true,
         srBelow: false,
       });
-      await handleCompanionAds(media, baseElement);
+      await handleAds(media, baseElement);
       const srAboveAd = queryAmpAdBladeSelector(doc);
       expect(srAboveAd).to.exist;
       expect(baseElement.previousSibling).to.be.equal(srAboveAd);
     });
+    it('Should show an Aniview companion ad below', async () => {
+      const media = createCampaignData({
+        display: false,
+        avAbove: false,
+        avBelow: true,
+      });
+      await handleAds(media, baseElement);
+      const avAdBelow = queryAmpAdAniviewSelector(doc);
+      expect(avAdBelow).to.exist;
+      expect(baseElement.nextSibling).to.be.equal(avAdBelow);
+    });
+    it('Should show an Aniview companion ad above', async () => {
+      const media = createCampaignData({
+        display: false,
+        avAbove: true,
+        avBelow: false,
+      });
+      await handleAds(media, baseElement);
+      const avAboveAd = queryAmpAdAniviewSelector(doc);
+      expect(avAboveAd).to.exist;
+      expect(baseElement.previousSibling).to.be.equal(avAboveAd);
+    });
     it('Should show an SR companion above with display companion', async () => {
       const media = createCampaignData({
         display: true,
         srAbove: true,
         srBelow: false,
       });
-      await handleCompanionAds(media, baseElement);
+      await handleAds(media, baseElement);
       const displayAd = queryAmpAdDisplaySelector(doc);
       expect(displayAd).to.exist;
       expect(baseElement.nextSibling).to.be.equal(displayAd);
@@ -106,7 +137,7 @@ describes.realWin(
         srBelow: false,
         disabledAmpCompanionAds: true,
       });
-      await handleCompanionAds(media, baseElement);
+      await handleAds(media, baseElement);
       const displayAd = queryAmpAdDisplaySelector(doc);
       expect(displayAd).to.not.exist;
       const srAboveAd = queryAmpAdBladeSelector(doc);
@@ -117,17 +148,50 @@ describes.realWin(
         bottomAd: true,
       });
       delete media.campaignData.bottomAdOptions;
-      await handleCompanionAds(media, baseElement);
+      await handleAds(media, baseElement);
       const bottomAd = queryAmpAdDisplaySelector(doc);
       expect(bottomAd).to.not.exist;
     });
+    it('Should have rtc-config attribute if set in bottom ad', async () => {
+      const media = createCampaignData({
+        bottomAd: true,
+      });
+      media.campaignData.bottomAdOptions.rtcConfig = testRtcConfig;
+      await handleAds(media, baseElement);
+      const bottomAd = queryAmpAdDisplaySelector(doc);
+      expect(bottomAd.getAttribute('rtc-config')).to.exist;
+      expect(bottomAd).to.exist;
+    });
+    it('Should have rtc-config attribute if set companion display ad', async () => {
+      const media = createCampaignData({display: true});
+      media.campaignData.companionOptions.rtcConfig = testRtcConfig;
+      await handleAds(media, baseElement);
+      const displayAd = queryAmpAdDisplaySelector(doc);
+      expect(displayAd.getAttribute('rtc-config')).to.exist;
+      expect(displayAd).to.exist;
+    });
+    it('Should show Aniview video for in-unit video', async () => {
+      const media = createCampaignData({inUnitVideo: true});
+      await handleAds(media, baseElement);
+      const inUnitVidoe = queryAmpAdAniviewSelector(doc);
+      expect(inUnitVidoe).to.exist;
+    });
+    it('Should not show Aniview video for in-unit video', async () => {
+      const media = createCampaignData({inUnitVideo: false});
+      await handleAds(media, baseElement);
+      const inUnitVidoe = queryAmpAdAniviewSelector(doc);
+      expect(inUnitVidoe).to.not.exist;
+    });
   }
 );
 
 function createCampaignData({
+  avAbove,
+  avBelow,
   bottomAd,
   disabledAmpCompanionAds,
   display,
+  inUnitVideo,
   srAbove,
   srBelow,
 }) {
@@ -145,6 +209,9 @@ function createCampaignData({
       },
       'enabled': false,
       'video': {
+        'playerOptions': {
+          'aniviewChannelId': '5fad4ac42cd6d91dcb6e50e9',
+        },
         'videoTag': '5d14c0ded1fb9900016a3118',
         'enabled': false,
         'floating': {
@@ -183,15 +250,53 @@ function createCampaignData({
   }
   if (srAbove) {
     campaignData.companionOptions.video.enabled = true;
+    campaignData.companionOptions.video.provider = 'sr';
     campaignData.companionOptions.video.companion.enabled = true;
   }
   if (srBelow) {
     campaignData.companionOptions.video.enabled = true;
+    campaignData.companionOptions.video.provider = 'sr';
+    campaignData.companionOptions.video.companion_below.enabled = true;
+  }
+  if (avAbove) {
+    campaignData.companionOptions.video.enabled = true;
+    campaignData.companionOptions.video.provider = 'aniview';
+    campaignData.companionOptions.video.companion.enabled = true;
+  }
+  if (avBelow) {
+    campaignData.companionOptions.video.enabled = true;
+    campaignData.companionOptions.video.provider = 'aniview';
     campaignData.companionOptions.video.companion_below.enabled = true;
   }
   if (disabledAmpCompanionAds) {
     campaignData.disabledAmpCompanionAds = true;
   }
+  if (inUnitVideo) {
+    campaignData.playerOptions = [
+      {
+        'requests': [
+          {
+            'type': 'idle',
+            'options': {
+              'timeout': 5,
+              'skipTimer': 10,
+            },
+          },
+        ],
+        'player': {
+          'type': 'va',
+          'provider': {
+            'type': 'aniview',
+            'options': {
+              'aniviewChannelId': '5fad4ac42cd6d91dcb6e50e9',
+              'aniviewPlayerId': '5faf2a6e1b1ab26edc3f9173',
+            },
+          },
+          'playerId': 'a5ccbc2f0aff9adba5c9c3f1d7eba69c',
+        },
+      },
+    ];
+  }
   media.campaignData = campaignData;
   return media;
 }
diff --git a/extensions/amp-apester-media/0.1/utils.js b/extensions/amp-apester-media/0.1/utils.js
index bf6d54680de7..854121cfce16 100644
--- a/extensions/amp-apester-media/0.1/utils.js
+++ b/extensions/amp-apester-media/0.1/utils.js
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-import * as events from '#utils/event-helper';
 import {isJsonLdScriptTag} from '#core/dom';
 import {toArray} from '#core/types/array';
 import {tryParseJson} from '#core/types/object/json';
 
+import * as events from '#utils/event-helper';
+
 const rules = [
   // if it says it's a webview, let's go with that
   'WebView',
diff --git a/extensions/amp-app-banner/0.1/amp-app-banner.js b/extensions/amp-app-banner/0.1/amp-app-banner.js
index 450c982e0add..a37e8ecccfe8 100644
--- a/extensions/amp-app-banner/0.1/amp-app-banner.js
+++ b/extensions/amp-app-banner/0.1/amp-app-banner.js
@@ -1,6 +1,5 @@
 import {removeElement} from '#core/dom';
 import {rethrowAsync} from '#core/error';
-import {dict} from '#core/types/object';
 
 import {Services} from '#service';
 
@@ -285,9 +284,9 @@ export class AmpIosAppBanner extends AbstractAppBanner {
       openWindowDialog(this.win, openInAppUrl, '_top');
     } else {
       Services.timerFor(this.win).delay(() => {
-        this.viewer_.sendMessage('navigateTo', dict({'url': installAppUrl}));
+        this.viewer_.sendMessage('navigateTo', {'url': installAppUrl});
       }, OPEN_LINK_TIMEOUT);
-      this.viewer_.sendMessage('navigateTo', dict({'url': openInAppUrl}));
+      this.viewer_.sendMessage('navigateTo', {'url': openInAppUrl});
     }
   }
 
@@ -296,12 +295,7 @@ export class AmpIosAppBanner extends AbstractAppBanner {
    * @private
    */
   parseIosMetaContent_(metaContent) {
-    const parts = metaContent.replace(/\s/, '').split(',');
-    const config = {};
-    parts.forEach((part) => {
-      const keyValuePair = part.split('=');
-      config[keyValuePair[0]] = keyValuePair[1];
-    });
+    const config = this.parseKeyValues(metaContent);
 
     const appId = config['app-id'];
     const openUrl = config['app-argument'];
@@ -329,6 +323,22 @@ export class AmpIosAppBanner extends AbstractAppBanner {
       installAppUrl
     );
   }
+
+  /**
+   * Parses a string like "key1=value1,key2=value2" into { key1: "value1", key2: "value2" }
+   * @param {string} metaContent
+   * @return {*}
+   */
+  parseKeyValues(metaContent) {
+    return metaContent
+      .replace(/\s/, '')
+      .split(',')
+      .reduce((result, keyValue) => {
+        const [key, value] = keyValue.split('=');
+        result[key] = value;
+        return result;
+      }, {});
+  }
 }
 
 /**
@@ -472,18 +482,16 @@ export class AmpAndroidAppBanner extends AbstractAppBanner {
       return;
     }
 
-    for (let i = 0; i < apps.length; i++) {
-      const app = apps[i];
-      if (app['platform'] == 'play') {
-        const installAppUrl = `https://play.google.com/store/apps/details?id=${app['id']}`;
-        const openInAppUrl = this.getAndroidIntentForUrl_(app['id']);
-        this.setupOpenButton_(
-          dev().assertElement(this.openButton_),
-          openInAppUrl,
-          installAppUrl
-        );
-        return;
-      }
+    const playApp = apps.find((a) => a['platform'] === 'play');
+    if (playApp) {
+      const installAppUrl = `https://play.google.com/store/apps/details?id=${playApp['id']}`;
+      const openInAppUrl = this.getAndroidIntentForUrl_(playApp['id']);
+      this.setupOpenButton_(
+        dev().assertElement(this.openButton_),
+        openInAppUrl,
+        installAppUrl
+      );
+      return;
     }
 
     user().warn(
diff --git a/extensions/amp-app-banner/0.1/test/test-amp-app-banner.js b/extensions/amp-app-banner/0.1/test/test-amp-app-banner.js
index f061f794c1e5..5d7dd7ec2f1d 100644
--- a/extensions/amp-app-banner/0.1/test/test-amp-app-banner.js
+++ b/extensions/amp-app-banner/0.1/test/test-amp-app-banner.js
@@ -153,16 +153,11 @@ describes.realWin(
         );
       });
 
-      // TODO(alanorozco, #15844): Unskip.
-      it.skip(
-        'should show banner and set up correctly',
-        testSetupAndShowBanner
-      );
+      it('should show banner and set up correctly', testSetupAndShowBanner);
 
       it('should throw if open button is missing', testButtonMissing);
 
-      // TODO(#16916): Make this test work with synchronous throws.
-      it.skip(
+      it(
         'should remove banner if already dismissed',
         testRemoveBannerIfDismissed
       );
@@ -268,8 +263,7 @@ describes.realWin(
 
       it('should throw if open button is missing', testButtonMissing);
 
-      // TODO(#16916): Make this test work with synchronous throws.
-      it.skip(
+      it(
         'should remove banner if already dismissed',
         testRemoveBannerIfDismissed
       );
diff --git a/extensions/amp-app-banner/1.0/amp-app-banner.css b/extensions/amp-app-banner/1.0/amp-app-banner.css
new file mode 100644
index 000000000000..a6c6141a889e
--- /dev/null
+++ b/extensions/amp-app-banner/1.0/amp-app-banner.css
@@ -0,0 +1,11 @@
+amp-app-banner {
+  position: fixed !important;
+  bottom: 0 !important;
+  left: 0;
+  width: 100%;
+  max-height: 100px !important;
+  box-sizing: border-box;
+  background: #fff;
+  z-index: 13;
+  box-shadow: 0 0 5px 0 rgba(0,0,0, 0.2) !important;
+}
diff --git a/extensions/amp-app-banner/1.0/amp-app-banner.js b/extensions/amp-app-banner/1.0/amp-app-banner.js
new file mode 100644
index 000000000000..9796315566a7
--- /dev/null
+++ b/extensions/amp-app-banner/1.0/amp-app-banner.js
@@ -0,0 +1,28 @@
+import {isExperimentOn} from '#experiments';
+
+import {AmpPreactBaseElement, setSuperClass} from '#preact/amp-base-element';
+
+import {userAssert} from '#utils/log';
+
+import {BaseElement} from './base-element';
+
+import {CSS} from '../../../build/amp-app-banner-1.0.css';
+
+/** @const {string} */
+const TAG = 'amp-app-banner';
+
+class AmpAppBanner extends setSuperClass(BaseElement, AmpPreactBaseElement) {
+  /** @override */
+  isLayoutSupported(layout) {
+    userAssert(
+      isExperimentOn(this.win, 'bento') ||
+        isExperimentOn(this.win, 'bento-app-banner'),
+      'expected global "bento" or specific "bento-app-banner" experiment to be enabled'
+    );
+    return super.isLayoutSupported(layout);
+  }
+}
+
+AMP.extension(TAG, '1.0', (AMP) => {
+  AMP.registerElement(TAG, AmpAppBanner, CSS);
+});
diff --git a/extensions/amp-app-banner/1.0/base-element.js b/extensions/amp-app-banner/1.0/base-element.js
new file mode 100644
index 000000000000..f47a4e45c734
--- /dev/null
+++ b/extensions/amp-app-banner/1.0/base-element.js
@@ -0,0 +1,25 @@
+import {PreactBaseElement} from '#preact/base-element';
+
+import {BentoAppBanner} from './component';
+import {CSS as COMPONENT_CSS} from './component.jss';
+
+export class BaseElement extends PreactBaseElement {}
+
+/** @override */
+BaseElement['Component'] = BentoAppBanner;
+
+/** @override */
+BaseElement['props'] = {
+  'children': {passthrough: true},
+  'dismissButtonAriaLabel': {attr: 'dismiss-button-aria-label'},
+  'id': {attr: 'id'},
+};
+
+/** @override */
+BaseElement['layoutSizeDefined'] = true;
+
+/** @override */
+BaseElement['usesShadowDom'] = true;
+
+/** @override */
+BaseElement['shadowCss'] = COMPONENT_CSS;
diff --git a/extensions/amp-app-banner/1.0/component.js b/extensions/amp-app-banner/1.0/component.js
new file mode 100644
index 000000000000..d7d1bd2a0f92
--- /dev/null
+++ b/extensions/amp-app-banner/1.0/component.js
@@ -0,0 +1,143 @@
+import {querySelectorInSlot} from '#core/dom/query';
+
+import * as Preact from '#preact';
+import {useEffect, useMemo, useRef} from '#preact';
+import {ContainWrapper} from '#preact/component';
+import {useLocalStorage} from '#preact/hooks/useLocalStorage';
+import {logger} from '#preact/logger';
+import {platformUtils} from '#preact/utils/platform';
+
+import {useStyles} from './component.jss';
+import {getAndroidAppInfo} from './utils/android';
+import {getIOSAppInfo} from './utils/ios';
+
+/**
+ * The raw App Banner component; no platform-specific logic
+ * @param {BentoAppBannerDef.RawProps} props
+ * @return {JSX.Element}
+ * @constructor
+ */
+export function AppBanner({
+  children,
+  dismissButtonAriaLabel = 'Dismiss',
+  onDismiss,
+  onInstall,
+  ...rest
+}) {
+  const styles = useStyles();
+
+  const bannerRef = useRef(null);
+
+  useEffect(() => {
+    // We expect the children to include an open-button, like: <button open-button>Install App</button>
+    let button = bannerRef.current.querySelector('button[open-button]');
+
+    // When used as a web-component, we must search the slot for the open-button:
+    if (!button) {
+      const slot = bannerRef.current.querySelector('slot');
+      if (slot) {
+        button = querySelectorInSlot(slot, 'button[open-button]');
+      }
+    }
+
+    if (!button) {
+      logger.error(
+        'BENTO-APP-BANNER',
+        'Component children should contain a <button open-button>'
+      );
+      return;
+    }
+
+    button.addEventListener('click', onInstall);
+    return () => button.removeEventListener('click', onInstall);
+  }, [onInstall]);
+
+  return (
+    <ContainWrapper {...rest}>
+      <div class={styles.banner} ref={bannerRef}>
+        <div class={styles.bannerPadding} />
+        <button
+          class={styles.dismiss}
+          aria-label={dismissButtonAriaLabel}
+          onClick={onDismiss}
+        />
+        {children}
+      </div>
+    </ContainWrapper>
+  );
+}
+
+/**
+ * @param {BentoAppBannerDef.Props} props
+ * @return {JSX.Element|null}
+ * @constructor
+ */
+function AppBannerIOS(props) {
+  const appInfo = useMemo(getIOSAppInfo, []);
+  if (!appInfo) {
+    return null;
+  }
+
+  return <AppBanner {...props} onInstall={appInfo.openOrInstall} />;
+}
+
+/**
+ * @param {BentoAppBannerDef.Props} props
+ * @return {JSX.Element|null}
+ * @constructor
+ */
+function AppBannerAndroid(props) {
+  const appInfo = useMemo(getAndroidAppInfo, []);
+  if (!appInfo) {
+    return null;
+  }
+
+  return <AppBanner {...props} onInstall={appInfo.openOrInstall} />;
+}
+
+/**
+ * @param {!BentoAppBanner.Props} props
+ * @return {PreactDef.Renderable}
+ */
+export function BentoAppBanner(props) {
+  if (!props.id) {
+    logger.warn('BENTO-APP-BANNER', 'component should have an id');
+  }
+  const [isDismissed, setDismissed] = useLocalStorage(
+    getStorageKey(props.id),
+    false
+  );
+  if (isDismissed) {
+    return null;
+  }
+
+  const AppBannerForCurrentPlatform = platformUtils.isIos()
+    ? AppBannerIOS
+    : platformUtils.isAndroid()
+      ? AppBannerAndroid
+      : null;
+
+  if (!AppBannerForCurrentPlatform) {
+    logger.info(
+      'BENTO-APP-BANNER',
+      'Component not rendered:',
+      'OS not supported'
+    );
+    return null;
+  }
+
+  return (
+    <AppBannerForCurrentPlatform
+      {...props}
+      onDismiss={() => setDismissed(true)}
+    />
+  );
+}
+
+/**
+ * @param {string} id
+ * @return {string}
+ */
+function getStorageKey(id) {
+  return 'bento-app-banner:' + id;
+}
diff --git a/extensions/amp-app-banner/1.0/component.jss.js b/extensions/amp-app-banner/1.0/component.jss.js
new file mode 100644
index 000000000000..d2c09df545cd
--- /dev/null
+++ b/extensions/amp-app-banner/1.0/component.jss.js
@@ -0,0 +1,68 @@
+import {createUseStyles} from 'react-jss';
+
+const banner = {
+  'position': 'fixed !important',
+  'bottom': '0 !important',
+  'left': '0',
+  'width': '100%',
+  'max-height': '100px !important',
+  'box-sizing': 'border-box',
+  'background': '#fff',
+  'z-index': '13',
+  'box-shadow': '0 0 5px 0 rgba(0,0,0, 0.2) !important',
+};
+const bannerPadding = {
+  'position': 'absolute',
+  'top': '0',
+  'left': '0',
+  'right': '0',
+  'background': '#fff',
+  'height': '4px',
+  /** Must be above the dismiss button to cover bottom shadow */
+  'z-index': '15',
+};
+const dismiss = {
+  'position': 'absolute',
+  'width': '28px',
+  'height': '28px',
+  'top': '-28px',
+  'right': '0',
+  'background-image': `url('data:image/svg+xml;charset=utf-8,<svg width="13" height="13" viewBox="341 8 13 13" xmlns="http://www.w3.org/2000/svg"><path fill="%234F4F4F" d="M354 9.31L352.69 8l-5.19 5.19L342.31 8 341 9.31l5.19 5.19-5.19 5.19 1.31 1.31 5.19-5.19 5.19 5.19 1.31-1.31-5.19-5.19z" fill-rule="evenodd"/></svg>')`,
+  'background-size': '13px 13px',
+  'background-position': '9px center',
+  'background-color': '#fff',
+  'background-repeat': 'no-repeat',
+  'z-index': '14',
+  'box-shadow': '0 -1px 1px 0 rgba(0,0,0, 0.2)',
+  'border': 'none',
+  'border-radius': '12px 0 0 0',
+  '&:before': {
+    'position': 'absolute',
+    'content': '""',
+    'top': '-20px',
+    'right': '0',
+    'left': '-20px',
+    'bottom': '0',
+  },
+  '[dir=rtl] &': {
+    'right': 'auto',
+    'left': '0',
+    'border-top-left-radius': '0',
+    'border-top-right-radius': '12px',
+    'background-position': '6px center',
+    '&:before': {
+      'right': '-20px',
+      'left': '0',
+    },
+  },
+};
+
+const JSS = {
+  banner,
+  bannerPadding,
+  dismiss,
+};
+
+// useStyles gets replaced for AMP builds via `babel-plugin-transform-jss`.
+// eslint-disable-next-line local/no-export-side-effect
+export const useStyles = createUseStyles(JSS);
diff --git a/extensions/amp-app-banner/1.0/component.type.js b/extensions/amp-app-banner/1.0/component.type.js
new file mode 100644
index 000000000000..7417035576f7
--- /dev/null
+++ b/extensions/amp-app-banner/1.0/component.type.js
@@ -0,0 +1,23 @@
+/** @externs */
+
+/** @const */
+var BentoAppBannerDef = {};
+
+/**
+ * @typedef {{
+ *   dismissButtonAriaLabel: ?string,
+ *   id: string,
+ * }}
+ */
+BentoAppBannerDef.Props;
+
+/**
+ * @typedef {{
+ *   dismissButtonAriaLabel: ?string,
+ *   id: string,
+ *   children: PreactDef.Renderable,
+ *   onDismiss: function(): void,
+ *   onInstall: function(): void,
+ * }}
+ */
+BentoAppBannerDef.RawProps;
diff --git a/extensions/amp-app-banner/1.0/storybook/Basic.amp.js b/extensions/amp-app-banner/1.0/storybook/Basic.amp.js
new file mode 100644
index 000000000000..bda9b01764eb
--- /dev/null
+++ b/extensions/amp-app-banner/1.0/storybook/Basic.amp.js
@@ -0,0 +1,50 @@
+import {withAmp} from '@ampproject/storybook-addon';
+
+import * as Preact from '#preact';
+
+export default {
+  title: 'amp-app-banner-1_0',
+  decorators: [withAmp],
+  parameters: {
+    extensions: [{name: 'amp-app-banner', version: '1.0'}],
+    experiments: ['bento'],
+  },
+  args: {
+    'dismiss-button-aria-label': 'Dismiss',
+  },
+};
+
+const cssContent = {
+  display: 'flex',
+  textAlign: 'center',
+  alignItems: 'center',
+  justifyContent: 'space-between',
+  padding: 10,
+};
+
+export const _default = (args) => {
+  return (
+    <>
+      <strong>
+        This banner should be hidden, since this page does not include required
+        meta tags
+      </strong>
+      <amp-app-banner {...args} id="ID">
+        <div class="content" style={cssContent}>
+          <img
+            src="https://cdn-images-1.medium.com/max/800/1*JLegdtjFMNgqHgnxdd04fg.png"
+            width="40"
+            height="34"
+          />
+          <div class="description">
+            <h5>Get the App</h5>
+            <p>Experience a richer experience on our mobile app!</p>
+          </div>
+          <div class="actions">
+            <button open-button>Open In App</button>
+          </div>
+        </div>
+      </amp-app-banner>
+    </>
+  );
+};
diff --git a/extensions/amp-app-banner/1.0/storybook/Basic.js b/extensions/amp-app-banner/1.0/storybook/Basic.js
new file mode 100644
index 000000000000..1f73f1cd5471
--- /dev/null
+++ b/extensions/amp-app-banner/1.0/storybook/Basic.js
@@ -0,0 +1,51 @@
+import * as Preact from '#preact';
+
+import {AppBanner} from '../component';
+
+// TODO: use something like storybook actions instead of console.log:
+// eslint-disable-next-line local/no-forbidden-terms
+const action = (message) => () => console.log(message);
+
+export default {
+  title: 'AppBanner',
+  component: AppBanner,
+  args: {
+    onInstall: action('onInstall'),
+    onDismiss: action('onDismiss'),
+  },
+};
+
+const cssContent = {
+  display: 'flex',
+  textAlign: 'center',
+  alignItems: 'center',
+  justifyContent: 'space-between',
+  padding: 10,
+};
+
+export const _default = (args) => {
+  return (
+    <>
+      <em>
+        The banner below normally only shows if platform-specific app tags are
+        included in the document head
+      </em>
+      <AppBanner {...args} id="ID">
+        <div class="content" style={cssContent}>
+          <img
+            src="https://cdn-images-1.medium.com/max/800/1*JLegdtjFMNgqHgnxdd04fg.png"
+            width="40"
+            height="34"
+          />
+          <div class="description">
+            <h5>Get the App</h5>
+            <p>Experience a richer experience on our mobile app!</p>
+          </div>
+          <div class="actions">
+            <button open-button>Open In App</button>
+          </div>
+        </div>
+      </AppBanner>
+    </>
+  );
+};
diff --git a/extensions/amp-app-banner/1.0/test/test-amp-app-banner.js b/extensions/amp-app-banner/1.0/test/test-amp-app-banner.js
new file mode 100644
index 000000000000..031e47fb7510
--- /dev/null
+++ b/extensions/amp-app-banner/1.0/test/test-amp-app-banner.js
@@ -0,0 +1,95 @@
+import {htmlFor} from '#core/dom/static-template';
+
+import {toggleExperiment} from '#experiments';
+
+import {logger} from '#preact/logger';
+import {platformUtils} from '#preact/utils/platform';
+
+import {waitFor} from '#testing/helpers/service';
+import '../amp-app-banner';
+
+describes.realWin(
+  'amp-app-banner-v1.0',
+  {
+    amp: {
+      extensions: ['amp-app-banner:1.0'],
+    },
+  },
+  (env) => {
+    let doc;
+    let html;
+
+    beforeEach(async () => {
+      doc = env.win.document;
+      html = htmlFor(doc);
+      toggleExperiment(env.win, 'bento-app-banner', true, true);
+
+      // Mock the platform:
+      env.sandbox.stub(platformUtils, 'isIos').returns(true);
+      env.sandbox.stub(platformUtils, 'isSafari').returns(false);
+
+      // Inject a tag like: <meta name="apple-itunes-app" content="..." />
+      const meta = document.createElement('meta');
+      meta.setAttribute('id', 'TEST_META');
+      meta.setAttribute('name', 'apple-itunes-app');
+      meta.setAttribute(
+        'content',
+        'app-id=11111111,app-argument=https://test.com/deep-link'
+      );
+      document.head.appendChild(meta);
+    });
+    afterEach(() => {
+      // Remove the injected <meta> tag:
+      document.getElementById('TEST_META').remove();
+    });
+
+    async function mountElement(element) {
+      doc.body.appendChild(element);
+      await element.buildInternal();
+      await waitFor(() => element.isConnected, 'element connected');
+      return element;
+    }
+
+    const missingButtonError = `BENTO-APP-BANNER Component children should contain a <button open-button>`;
+
+    it('should warn when id is missing', async () => {
+      expectAsyncConsoleError(missingButtonError);
+      await mountElement(html`<amp-app-banner></amp-app-banner>`);
+      expect(logger.warn).calledWith(
+        'BENTO-APP-BANNER',
+        'component should have an id'
+      );
+    });
+
+    it('should log an error if <button open-button> is missing', async () => {
+      expectAsyncConsoleError(missingButtonError);
+      await mountElement(html`<amp-app-banner id="TEST"></amp-app-banner>`);
+    });
+
+    describe('when the element is rendered', () => {
+      /**
+       * @type {Element}
+       */
+      let element;
+      beforeEach(async () => {
+        element = await mountElement(html`
+          <amp-app-banner nodisplay="true" id="TEST">
+            <h2>Our app is way better</h2>
+            <button open-button>Get the app</button>
+          </amp-app-banner>
+        `);
+      });
+
+      it('the light dom is visible', () => {
+        expect(element.querySelector('h2')).to.be.not.null;
+        expect(element.querySelector('button[open-button]')).to.be.not.null;
+      });
+
+      it('the shadow dom is mounted', () => {
+        expect(element.shadowRoot.querySelector('div')).to.be.not.null;
+        expect(element.shadowRoot.querySelector('button[aria-label="Dismiss"]'))
+          .to.be.not.null;
+      });
+    });
+  }
+);
diff --git a/extensions/amp-app-banner/1.0/test/test-android.js b/extensions/amp-app-banner/1.0/test/test-android.js
new file mode 100644
index 000000000000..9f583c2bf9ac
--- /dev/null
+++ b/extensions/amp-app-banner/1.0/test/test-android.js
@@ -0,0 +1,104 @@
+import {WindowInterface} from '#core/window/interface';
+
+import {docInfo} from '#preact/utils/docInfo';
+import {platformUtils} from '#preact/utils/platform';
+import {xhrUtils} from '#preact/utils/xhr';
+
+import {getAndroidAppInfo} from '../utils/android';
+
+describes.sandboxed('BentoAppBanner preact component v1.0', {}, (env) => {
+  let xhrServiceStub;
+  beforeEach(() => {
+    xhrServiceStub = env.sandbox.stub(xhrUtils);
+    env.sandbox
+      .stub(docInfo, 'canonicalUrl')
+      .get(() => 'https://test.com/canonicalUrl');
+  });
+
+  describe('getAndroidAppInfo', () => {
+    describe('when no manifest link is present', () => {
+      it('should return null when no meta header is present', () => {
+        const appInfo = getAndroidAppInfo();
+        expect(appInfo).to.be.null;
+      });
+    });
+
+    describe('when manifest link is present', () => {
+      let clock;
+      beforeEach(() => {
+        clock = env.sandbox.useFakeTimers();
+
+        // Mock data fetching:
+        const mockManifest = {
+          'related_applications': [{platform: 'play', id: '11111111'}],
+        };
+        xhrServiceStub.fetchJson.resolves(mockManifest);
+
+        // Mock the <link> manifest:
+        const link = document.createElement('link');
+        link.setAttribute('id', 'TEST_LINK');
+        link.setAttribute('rel', 'manifest');
+        link.setAttribute('href', 'https://test.com/manifest');
+        document.head.appendChild(link);
+      });
+      afterEach(() => {
+        document.getElementById('TEST_LINK').remove();
+      });
+
+      it('should not show a banner if a built-in banner can be shown', async () => {
+        env.sandbox.stub(platformUtils, 'isChrome').returns(true);
+        env.sandbox.stub(platformUtils, 'isAndroid').returns(true);
+        const appInfo = getAndroidAppInfo();
+        expect(appInfo).to.be.null;
+      });
+
+      it('should parse the meta header and determine appropriate urls', async () => {
+        const appInfo = getAndroidAppInfo();
+        expect(appInfo).to.not.be.null;
+        expect(appInfo).to.have.property('openOrInstall');
+        const manifestInfo = await appInfo.promise;
+
+        expect(manifestInfo.installAppUrl).to.equal(
+          'https://play.google.com/store/apps/details?id=11111111'
+        );
+        expect(manifestInfo.openInAppUrl).to.equal(
+          'android-app://11111111/https/test.com/canonicalUrl'
+        );
+      });
+
+      it('clicking "Open" should open the app URL', async () => {
+        const location = {assign: env.sandbox.stub()};
+        env.sandbox.stub(window, 'open');
+        env.sandbox.stub(WindowInterface, 'getTop').returns({location});
+
+        const appInfo = getAndroidAppInfo();
+        const manifest = await appInfo.promise;
+        await appInfo.openOrInstall();
+        expect(window.open)
+          .to.have.callCount(1)
+          .calledWith(manifest.openInAppUrl, '_top');
+
+        clock.tick(5_000);
+
+        expect(location.assign)
+          .to.have.callCount(1)
+          .calledWith(manifest.installAppUrl);
+      });
+
+      const invalidManifest1 = `BENTO-APP-BANNER Invalid manifest: related_applications is missing from manifest.json file`;
+      const invalidManifest2 = `BENTO-APP-BANNER Invalid manifest: Could not find a platform=play app in manifest`;
+
+      it('should not show a banner if the manifest is missing data', async () => {
+        expectAsyncConsoleError(invalidManifest1);
+        xhrServiceStub.fetchJson.resolves({});
+        expect(await getAndroidAppInfo().promise).to.be.null;
+
+        expectAsyncConsoleError(invalidManifest2);
+        xhrServiceStub.fetchJson.resolves({
+          'related_applications': [{platform: 'INVALID'}],
+        });
+        expect(await getAndroidAppInfo().promise).to.be.null;
+      });
+    });
+  });
+});
diff --git a/extensions/amp-app-banner/1.0/test/test-component.js b/extensions/amp-app-banner/1.0/test/test-component.js
new file mode 100644
index 000000000000..4fd234354b11
--- /dev/null
+++ b/extensions/amp-app-banner/1.0/test/test-component.js
@@ -0,0 +1,157 @@
+import {mount} from 'enzyme';
+
+import * as Preact from '#preact';
+import {platformUtils} from '#preact/utils/platform';
+
+import {AppBanner, BentoAppBanner} from '../component';
+
+describes.realWin('BentoAppBanner preact component v1.0', {}, (env) => {
+  describe('raw AppBanner', () => {
+    let wrapper;
+    let onInstall;
+    let onDismiss;
+    beforeEach(() => {
+      onInstall = env.sandbox.spy();
+      onDismiss = env.sandbox.spy();
+      wrapper = mount(
+        <AppBanner id="test" onInstall={onInstall} onDismiss={onDismiss}>
+          <h2>Our app is way better</h2>
+          <button open-button>Get the app</button>
+        </AppBanner>
+      );
+    });
+
+    it('should render the banner', () => {
+      expect(wrapper.find(AppBanner)).to.have.lengthOf(1);
+    });
+
+    it('should render the header', () => {
+      expect(wrapper.find('h2')).to.have.lengthOf(1);
+    });
+
+    it('should render the dismiss and the open buttons', () => {
+      expect(wrapper.find('button')).to.have.lengthOf(2);
+    });
+
+    it('clicking the open button should trigger onInstall', () => {
+      const openButton = wrapper.find('button[open-button]');
+      expect(openButton).to.have.lengthOf(1);
+      openButton.simulate('click');
+      expect(onInstall).to.have.callCount(1);
+    });
+
+    it('clicking the dismiss button should trigger onDismiss', () => {
+      const dismissButton = wrapper.find({'aria-label': 'Dismiss'});
+      expect(dismissButton).to.have.lengthOf(1);
+      dismissButton.simulate('click');
+      expect(onDismiss).to.have.callCount(1);
+    });
+  });
+
+  describe('BentoAppBanner', () => {
+    const renderWrapper = () =>
+      mount(
+        <BentoAppBanner id="test">
+          <h2>Our app is way better</h2>
+          <button open-button>Get the app</button>
+        </BentoAppBanner>
+      );
+
+    describe('on Android', () => {
+      // Set up the Android environment:
+      beforeEach(() => {
+        env.sandbox.stub(platformUtils, 'isAndroid').returns(true);
+        env.sandbox.stub(platformUtils, 'isChrome').returns(false);
+      });
+      // Mock the <link> manifest:
+      beforeEach(() => {
+        const link = document.createElement('link');
+        link.setAttribute('id', 'TEST_LINK');
+        link.setAttribute('rel', 'manifest');
+        link.setAttribute('href', 'https://test.com/manifest');
+        document.head.appendChild(link);
+      });
+      afterEach(() => {
+        document.getElementById('TEST_LINK').remove();
+      });
+
+      it('should not render if using Chrome', async () => {
+        platformUtils.isChrome.returns(true);
+        const wrapper = renderWrapper();
+
+        expect(wrapper.isEmptyRender()).to.be.true;
+      });
+
+      it('should render', async () => {
+        const wrapper = renderWrapper();
+        expect(wrapper.isEmptyRender()).to.be.false;
+
+        expect(wrapper.find('button[open-button]')).to.have.length(1);
+        expect(wrapper.find('button[aria-label="Dismiss"]')).to.have.length(1);
+      });
+
+      describe("clicking 'dismiss'", () => {
+        // Mock localStorage:
+        beforeEach(() => {
+          env.sandbox.stub(window.localStorage, 'getItem');
+          env.sandbox.stub(window.localStorage, 'setItem');
+        });
+
+        it('should hide the component', () => {
+          const wrapper = renderWrapper();
+          const dismissButton = wrapper.find('button[aria-label="Dismiss"]');
+          expect(wrapper.isEmptyRender()).to.be.false;
+          dismissButton.simulate('click');
+          expect(wrapper.isEmptyRender()).to.be.true;
+          expect(window.localStorage.setItem).to.have.been.calledWith(
+            'bento-app-banner:test',
+            'true'
+          );
+        });
+
+        it("should not be shown if it's already been dismissed", () => {
+          window.localStorage.getItem.returns('true');
+          const wrapper = renderWrapper();
+          expect(wrapper.isEmptyRender()).to.be.true;
+        });
+      });
+    });
+
+    describe('on iOS', () => {
+      // Set up the iOS environment:
+      beforeEach(() => {
+        env.sandbox.stub(platformUtils, 'isIos').returns(true);
+        env.sandbox.stub(platformUtils, 'isSafari').returns(false);
+      });
+      // Mock the <meta> tag:
+      beforeEach(() => {
+        // Inject a tag like: <meta name="apple-itunes-app" content="..." />
+        const meta = document.createElement('meta');
+        meta.setAttribute('id', 'TEST_META');
+        meta.setAttribute('name', 'apple-itunes-app');
+        meta.setAttribute(
+          'content',
+          'app-id=11111111,app-argument=https://test.com/deep-link'
+        );
+        document.head.appendChild(meta);
+      });
+      afterEach(() => {
+        document.getElementById('TEST_META').remove();
+      });
+
+      it('should not render if using Safari', () => {
+        platformUtils.isSafari.returns(true);
+        const wrapper = renderWrapper();
+        expect(wrapper.isEmptyRender()).to.be.true;
+      });
+
+      it('should render', () => {
+        const wrapper = renderWrapper();
+        expect(wrapper.isEmptyRender()).to.be.false;
+
+        expect(wrapper.find('button[open-button]')).to.have.length(1);
+        expect(wrapper.find('button[aria-label="Dismiss"]')).to.have.length(1);
+      });
+    });
+  });
+});
diff --git a/extensions/amp-app-banner/1.0/test/test-ios.js b/extensions/amp-app-banner/1.0/test/test-ios.js
new file mode 100644
index 000000000000..f345e277d4eb
--- /dev/null
+++ b/extensions/amp-app-banner/1.0/test/test-ios.js
@@ -0,0 +1,91 @@
+import {logger} from '#preact/logger';
+import {platformUtils} from '#preact/utils/platform';
+
+import {getIOSAppInfo} from '../utils/ios';
+
+describes.sandboxed('BentoAppBanner preact component v1.0', {}, (env) => {
+  describe('getIOSAppInfo', () => {
+    describe('when no meta header is present', () => {
+      it('should return null when no meta header is present', () => {
+        allowConsoleError(() => {
+          const iosInfo = getIOSAppInfo();
+          expect(iosInfo).to.be.null;
+        });
+        expect(logger.error).calledWith(
+          'BENTO-APP-BANNER',
+          'Not rendering bento-app-banner:',
+          'could not find a <meta name="apple-itunes-app" /> tag'
+        );
+      });
+    });
+
+    describe('when meta header is present', () => {
+      beforeEach(() => {
+        // Inject a tag like: <meta name="apple-itunes-app" content="..." />
+        const meta = document.createElement('meta');
+        meta.setAttribute('id', 'TEST_META');
+        meta.setAttribute('name', 'apple-itunes-app');
+        meta.setAttribute(
+          'content',
+          'app-id=11111111,app-argument=https://test.com/deep-link'
+        );
+        document.head.appendChild(meta);
+      });
+      afterEach(() => {
+        document.getElementById('TEST_META').remove();
+      });
+
+      let clock;
+      beforeEach(() => {
+        clock = env.sandbox.useFakeTimers();
+      });
+
+      it('should parse the meta header and determine appropriate urls', () => {
+        const iosInfo = getIOSAppInfo();
+        expect(iosInfo).to.not.be.null;
+        expect(iosInfo).to.have.property('openOrInstall');
+        expect(iosInfo.installAppUrl).to.equal(
+          'https://itunes.apple.com/us/app/id11111111'
+        );
+        expect(iosInfo.openInAppUrl).to.equal('https://test.com/deep-link');
+      });
+
+      it('should not show the banner if the built-in banner can be shown', () => {
+        env.sandbox.stub(platformUtils, 'isSafari').returns(true);
+        expect(getIOSAppInfo()).to.be.null;
+        expect(logger.info).calledWith(
+          'BENTO-APP-BANNER',
+          'Not rendering bento-app-banner:',
+          'Browser supports builtin banners.'
+        );
+      });
+
+      it('should load the app when clicked', () => {
+        env.sandbox.stub(window, 'open');
+        const appInfo = getIOSAppInfo();
+        appInfo.openOrInstall();
+        expect(window.open).to.have.callCount(1);
+        expect(window.open).to.have.calledWith(appInfo.openInAppUrl, '_top');
+
+        clock.tick(5_000);
+        expect(window.open).to.have.callCount(2);
+        expect(window.open).to.have.calledWith(appInfo.installAppUrl, '_top');
+      });
+
+      it('should warn if the app-argument is missing', () => {
+        document
+          .getElementById('TEST_META')
+          .setAttribute('content', 'app-id=11111111');
+        const appInfo = getIOSAppInfo();
+        expect(appInfo?.installAppUrl).to.equal(
+          'https://itunes.apple.com/us/app/id11111111'
+        );
+        expect(appInfo.openInAppUrl).to.equal(appInfo.installAppUrl);
+        expect(logger.warn).calledWith(
+          'BENTO-APP-BANNER',
+          '<meta name="apple-itunes-app">\'s content should contain app-argument to allow opening an already installed application on iOS.'
+        );
+      });
+    });
+  });
+});
diff --git a/extensions/amp-app-banner/1.0/test/validator-amp-app-banner.html b/extensions/amp-app-banner/1.0/test/validator-amp-app-banner.html
new file mode 100644
index 000000000000..9ecaa3720350
--- /dev/null
+++ b/extensions/amp-app-banner/1.0/test/validator-amp-app-banner.html
@@ -0,0 +1,35 @@
+<!--
+  Test Description:
+  Tests support for the amp-app-banner tag and required <head> metatdata.
+-->
+<!doctype html>
+<html ⚡ lang="en">
+<head>
+  <meta charset="utf-8">
+  <link rel="canonical" href="./regular-html-version.html">
+  <meta name="viewport" content="width=device-width,minimum-scale=1">
+  <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+  <script async src="https://cdn.ampproject.org/v0.js"></script>
+  <script async custom-element="amp-app-banner" src="https://cdn.ampproject.org/v0/amp-app-banner-1.0.js"></script>
+
+  <!-- Valid -->
+  <meta name="apple-itunes-app"
+        content="app-id=123456789, app-argument=app-name://link/to/app-content">
+  <link rel="manifest" href="https://link/to/manifest.json">
+
+</head>
+<body>
+
+  <!-- Valid -->
+  <amp-app-banner layout="nodisplay" id="demo-app-banner-2134">
+    <amp-img src="https://example.com/icon.png" width="60" height="51">
+    </amp-img>
+    <h3>App Name</h3>
+    <p>Experience a richer experience on our mobile app!</p>
+    <div class="actions">
+      <button open-button>Get the app</button>
+    </div>
+  </amp-app-banner>
+
+</body>
+</html>
diff --git a/extensions/amp-app-banner/1.0/test/validator-amp-app-banner.out b/extensions/amp-app-banner/1.0/test/validator-amp-app-banner.out
new file mode 100644
index 000000000000..77a305fcd727
--- /dev/null
+++ b/extensions/amp-app-banner/1.0/test/validator-amp-app-banner.out
@@ -0,0 +1,38 @@
+FAIL
+|  <!--
+|    Test Description:
+|    Tests support for the amp-app-banner tag and required <head> metatdata.
+|  -->
+|  <!doctype html>
+|  <html ⚡ lang="en">
+|  <head>
+|    <meta charset="utf-8">
+|    <link rel="canonical" href="./regular-html-version.html">
+|    <meta name="viewport" content="width=device-width,minimum-scale=1">
+|    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+|    <script async src="https://cdn.ampproject.org/v0.js"></script>
+|    <script async custom-element="amp-app-banner" src="https://cdn.ampproject.org/v0/amp-app-banner-1.0.js"></script>
+>>   ^~~~~~~~~
+amp-app-banner/1.0/test/validator-amp-app-banner.html:13:2 The extension 'amp-app-banner' is referenced at version '1.0' which is an invalid version. Please use a valid version of this extension. (see https://amp.dev/documentation/components/amp-app-banner)
+|
+|    <!-- Valid -->
+|    <meta name="apple-itunes-app"
+|          content="app-id=123456789, app-argument=app-name://link/to/app-content">
+|    <link rel="manifest" href="https://link/to/manifest.json">
+|
+|  </head>
+|  <body>
+|
+|    <!-- Valid -->
+|    <amp-app-banner layout="nodisplay" id="demo-app-banner-2134">
+|      <amp-img src="https://example.com/icon.png" width="60" height="51">
+|      </amp-img>
+|      <h3>App Name</h3>
+|      <p>Experience a richer experience on our mobile app!</p>
+|      <div class="actions">
+|        <button open-button>Get the app</button>
+|      </div>
+|    </amp-app-banner>
+|
+|  </body>
+|  </html>
\ No newline at end of file
diff --git a/extensions/amp-app-banner/1.0/utils/android.js b/extensions/amp-app-banner/1.0/utils/android.js
new file mode 100644
index 000000000000..8be64180cfe4
--- /dev/null
+++ b/extensions/amp-app-banner/1.0/utils/android.js
@@ -0,0 +1,101 @@
+import {WindowInterface} from '#core/window/interface';
+
+import {logger} from '#preact/logger';
+import {docInfo} from '#preact/utils/docInfo';
+import {platformUtils} from '#preact/utils/platform';
+import {urlUtils} from '#preact/utils/url';
+import {xhrUtils} from '#preact/utils/xhr';
+
+import {openWindowDialog} from '../../../../src/open-window-dialog';
+
+const OPEN_LINK_TIMEOUT = 1500;
+
+/**
+ * @return {{openOrInstall: function(): void, promise: Promise<Response>}|null}
+ */
+export function getAndroidAppInfo() {
+  // We want to fallback to browser builtin mechanism when possible.
+  const canShowBuiltinBanner =
+    platformUtils.isAndroid() && platformUtils.isChrome();
+
+  if (canShowBuiltinBanner) {
+    logger.info(
+      'BENTO-APP-BANNER',
+      'Not rendering bento-app-banner:',
+      'Browser supports builtin banners.'
+    );
+    return null;
+  }
+
+  const manifestLink = self.document.head.querySelector(
+    'link[rel=manifest],link[rel=origin-manifest]'
+  );
+
+  const missingDataSources = !manifestLink;
+  if (missingDataSources) {
+    return null;
+  }
+
+  const manifestHref = manifestLink.getAttribute('href');
+
+  urlUtils.assertHttpsUrl(manifestHref, undefined, 'manifest href');
+
+  const promise = xhrUtils.fetchJson(manifestHref).then(parseManifest);
+  return {
+    promise,
+    openOrInstall: () => {
+      return promise.then((manifest) => {
+        if (!manifest) {
+          return;
+        }
+        const {installAppUrl, openInAppUrl} = manifest;
+        setTimeout(() => {
+          WindowInterface.getTop(window).location.assign(installAppUrl);
+        }, OPEN_LINK_TIMEOUT);
+        openWindowDialog(window, openInAppUrl, '_top');
+      });
+    },
+  };
+}
+
+/**
+ * @param {object} manifestJson
+ * @return {{installAppUrl: string, openInAppUrl: string}|null}
+ */
+function parseManifest(manifestJson) {
+  const apps = manifestJson['related_applications'];
+  if (!apps) {
+    logger.error(
+      'BENTO-APP-BANNER',
+      'Invalid manifest:',
+      'related_applications is missing from manifest.json file'
+    );
+    return null;
+  }
+
+  const playApp = apps.find((a) => a['platform'] === 'play');
+  if (!playApp) {
+    logger.error(
+      'BENTO-APP-BANNER',
+      'Invalid manifest:',
+      'Could not find a platform=play app in manifest'
+    );
+    return null;
+  }
+
+  const installAppUrl = `https://play.google.com/store/apps/details?id=${playApp['id']}`;
+  const openInAppUrl = getAndroidIntentForUrl(playApp['id']);
+  return {installAppUrl, openInAppUrl};
+}
+
+/**
+ * @param {string} appId
+ * @return {string}
+ */
+function getAndroidIntentForUrl(appId) {
+  const parsedUrl = urlUtils.parse(docInfo.canonicalUrl);
+  const cleanProtocol = parsedUrl.protocol.replace(':', '');
+  const {host, pathname} = parsedUrl;
+
+  return `android-app://${appId}/${cleanProtocol}/${host}${pathname}`;
+}
diff --git a/extensions/amp-app-banner/1.0/utils/ios.js b/extensions/amp-app-banner/1.0/utils/ios.js
new file mode 100644
index 000000000000..253c06f1548c
--- /dev/null
+++ b/extensions/amp-app-banner/1.0/utils/ios.js
@@ -0,0 +1,99 @@
+import {logger} from '#preact/logger';
+import {docInfo} from '#preact/utils/docInfo';
+import {platformUtils} from '#preact/utils/platform';
+import {urlUtils} from '#preact/utils/url';
+
+import {openWindowDialog} from '../../../../src/open-window-dialog';
+
+const OPEN_LINK_TIMEOUT = 1500;
+
+/**
+ * @return {{
+ *    openOrInstall: function(): void,
+ *    installAppUrl: string,
+ *    openInAppUrl: string,
+ * }|null}
+ */
+export function getIOSAppInfo() {
+  const canShowBuiltinBanner = platformUtils.isSafari();
+  if (canShowBuiltinBanner) {
+    logger.info(
+      'BENTO-APP-BANNER',
+      'Not rendering bento-app-banner:',
+      'Browser supports builtin banners.'
+    );
+    return null;
+  }
+
+  const metaContent = docInfo.getMetaByName('apple-itunes-app');
+  if (!metaContent) {
+    logger.error(
+      'BENTO-APP-BANNER',
+      'Not rendering bento-app-banner:',
+      'could not find a <meta name="apple-itunes-app" /> tag'
+    );
+    return null;
+  }
+  const {installAppUrl, openInAppUrl} = parseIOSMetaContent(metaContent);
+
+  return {
+    installAppUrl,
+    openInAppUrl,
+    openOrInstall: () => {
+      setTimeout(() => {
+        openWindowDialog(window, installAppUrl, '_top');
+      }, OPEN_LINK_TIMEOUT);
+      openWindowDialog(window, openInAppUrl, '_top');
+    },
+  };
+}
+
+/**
+ * @param {string} metaContent
+ * @return {{installAppUrl: string, openInAppUrl: string}}
+ */
+export function parseIOSMetaContent(metaContent) {
+  const config = parseKeyValues(metaContent);
+
+  const appId = config['app-id'];
+  let openUrl = config['app-argument'];
+
+  if (!openUrl) {
+    logger.warn(
+      'BENTO-APP-BANNER',
+      '<meta name="apple-itunes-app">\'s content should contain ' +
+        'app-argument to allow opening an already installed application ' +
+        'on iOS.'
+    );
+  } else if (!urlUtils.isProtocolValid(openUrl)) {
+    logger.warn(
+      'BENTO-APP-BANNER',
+      `The url in app-argument has invalid protocol: ${openUrl}`
+    );
+    openUrl = '';
+  }
+
+  const installAppUrl = `https://itunes.apple.com/us/app/id${appId}`;
+  const openInAppUrl = openUrl || installAppUrl;
+
+  return {
+    installAppUrl,
+    openInAppUrl,
+  };
+}
+
+/**
+ * Parses a string like "key1=value1,key2=value2" into { key1: "value1", key2: "value2" }
+ * @param {string} metaContent
+ * @return {*}
+ */
+function parseKeyValues(metaContent) {
+  return metaContent
+    .replace(/\s/, '')
+    .split(',')
+    .reduce((result, keyValue) => {
+      const [key, value] = keyValue.split('=');
+      result[key] = value;
+      return result;
+    }, {});
+}
diff --git a/extensions/amp-app-banner/validator-amp-app-banner.protoascii b/extensions/amp-app-banner/validator-amp-app-banner.protoascii
index b1517a408b28..50fbd0b417d9 100644
--- a/extensions/amp-app-banner/validator-amp-app-banner.protoascii
+++ b/extensions/amp-app-banner/validator-amp-app-banner.protoascii
@@ -14,11 +14,11 @@ tags: {  # <amp-app-banner>
   tag_name: "AMP-APP-BANNER"
   mandatory_parent: "BODY"
   requires_extension: "amp-app-banner"
-  requires: "amp-app-banner data source"
+  requires_condition: "amp-app-banner data source"
   # The "amp-app-banner button[open-button]" tag is in
   # validator-main.protoascii and in turn has an "AMP-APP-BANNER"
   # mandatory_parent.
-  requires: "amp-app-banner button[open-button]"
+  requires_condition: "amp-app-banner button[open-button]"
   attr_lists: "extended-amp-global"
   attr_lists: "mandatory-id-attr"
   unique: true
diff --git a/extensions/amp-audio/0.1/amp-audio.js b/extensions/amp-audio/0.1/amp-audio.js
index 71e915866bc8..8a249988c531 100644
--- a/extensions/amp-audio/0.1/amp-audio.js
+++ b/extensions/amp-audio/0.1/amp-audio.js
@@ -1,4 +1,8 @@
-import {Layout, applyFillContent, isLayoutSizeFixed} from '#core/dom/layout';
+import {
+  Layout_Enum,
+  applyFillContent,
+  isLayoutSizeFixed,
+} from '#core/dom/layout';
 import {propagateAttributes} from '#core/dom/propagate-attributes';
 import {realChildNodes} from '#core/dom/query';
 import {setStyle} from '#core/dom/style';
@@ -42,14 +46,14 @@ export class AmpAudio extends AMP.BaseElement {
 
   /** @override */
   isLayoutSupported(layout) {
-    return isLayoutSizeFixed(layout);
+    return isLayoutSizeFixed(layout) || layout == Layout_Enum.CONTAINER;
   }
 
   /** @override */
   buildCallback() {
     // If layout="nodisplay" force autoplay to off
     const layout = this.getLayout();
-    if (layout === Layout.NODISPLAY) {
+    if (layout === Layout_Enum.NODISPLAY) {
       this.element.removeAttribute('autoplay');
       this.buildAudioElement();
     }
@@ -100,7 +104,12 @@ export class AmpAudio extends AMP.BaseElement {
    * Builds the internal <audio> element.
    */
   buildAudioElement() {
-    const audio = this.element.ownerDocument.createElement('audio');
+    let audio = this.element.querySelector('audio');
+    if (!audio) {
+      audio = this.element.ownerDocument.createElement('audio');
+      this.element.appendChild(audio);
+    }
+
     if (!audio.play) {
       this.toggleFallback(true);
       return;
@@ -139,12 +148,15 @@ export class AmpAudio extends AMP.BaseElement {
 
     applyFillContent(audio);
     realChildNodes(this.element).forEach((child) => {
+      if (child === audio) {
+        return;
+      }
       if (child.getAttribute && child.getAttribute('src')) {
         assertHttpsUrl(child.getAttribute('src'), dev().assertElement(child));
       }
       audio.appendChild(child);
     });
-    this.element.appendChild(audio);
+
     this.audio_ = audio;
 
     listen(this.audio_, 'playing', () => this.audioPlaying_());
@@ -160,7 +172,7 @@ export class AmpAudio extends AMP.BaseElement {
   /** @override */
   layoutCallback() {
     const layout = this.getLayout();
-    if (layout !== Layout.NODISPLAY) {
+    if (layout !== Layout_Enum.NODISPLAY) {
       this.buildAudioElement();
     }
     this.updateMetadata_();
diff --git a/extensions/amp-audio/0.1/test/test-amp-audio.js b/extensions/amp-audio/0.1/test/test-amp-audio.js
index 8afe91d23a7c..a4f877b8435c 100644
--- a/extensions/amp-audio/0.1/test/test-amp-audio.js
+++ b/extensions/amp-audio/0.1/test/test-amp-audio.js
@@ -48,6 +48,21 @@ describes.realWin(
       expect(element.style.height).to.be.equal('30px');
     });
 
+    it('should load audio with container layout', async () => {
+      const element = await attachAndRun(
+        html`<amp-audio src="audio.mp3" loop muted layout="container"><audio controls></amp-audio>`
+      );
+      const audio = element.querySelector('audio');
+      expect(audio.tagName).to.equal('AUDIO');
+      expect(audio.getAttribute('src')).to.equal('audio.mp3');
+      expect(audio.hasAttribute('controls')).to.be.true;
+      expect(audio).to.have.attribute('controls');
+      expect(audio).to.have.attribute('muted');
+      expect(audio).to.have.attribute('loop');
+      expect(element.style.width).to.be.equal('');
+      expect(element.style.height).to.be.equal('');
+    });
+
     it('should not preload audio', async () => {
       const element = await attachAndRun(
         html`<amp-audio src="audio.mp3" preload="none"></amp-audio>`
@@ -65,15 +80,13 @@ describes.realWin(
     });
 
     it('should attach `<audio>` element and execute relevant actions for layout="nodisplay"', async () => {
-      const element = await attachAndRun(
-        html`
-          <amp-audio
-            src="audio.mp3"
-            preload="none"
-            layout="nodisplay"
-          ></amp-audio>
-        `
-      );
+      const element = await attachAndRun(html`
+        <amp-audio
+          src="audio.mp3"
+          preload="none"
+          layout="nodisplay"
+        ></amp-audio>
+      `);
       const impl = await element.getImpl();
 
       const audio = element.querySelector('audio');
@@ -133,9 +146,9 @@ describes.realWin(
     });
 
     it('should set its natural dimension only if not specified', async () => {
-      const element = await attachAndRun(
-        html` <amp-audio width="500" src="audio.mp3"></amp-audio> `
-      );
+      const element = await attachAndRun(html`
+        <amp-audio width="500" src="audio.mp3"></amp-audio>
+      `);
       expect(element.style.width).to.be.equal('500px');
       expect(element.style.height).to.be.equal('30px');
     });
diff --git a/extensions/amp-audio/0.1/test/validator-amp-audio.html b/extensions/amp-audio/0.1/test/validator-amp-audio.html
index 8c2c8fc0cb0e..9706bde878d3 100644
--- a/extensions/amp-audio/0.1/test/validator-amp-audio.html
+++ b/extensions/amp-audio/0.1/test/validator-amp-audio.html
@@ -38,5 +38,13 @@
 
   <!-- Valid: empty sizes attribute is layout fixed -->
   <amp-audio src=lemur.png sizes=""></amp-audio>
+
+  <!-- Valid: empty audio tag with container layout -->
+  <amp-audio autoplay src="https://yourhost.com/audios/myaudio.mp3" layout="container" preload="auto">
+    <div fallback>
+      <p>Your browser doesn’t support HTML5 audio</p>
+    </div>
+    <audio controls>
+  </amp-audio>
 </body>
 </html>
diff --git a/extensions/amp-audio/0.1/test/validator-amp-audio.out b/extensions/amp-audio/0.1/test/validator-amp-audio.out
index e61d7e3e91b8..d6ef548daf8c 100644
--- a/extensions/amp-audio/0.1/test/validator-amp-audio.out
+++ b/extensions/amp-audio/0.1/test/validator-amp-audio.out
@@ -39,5 +39,13 @@ PASS
 |
 |    <!-- Valid: empty sizes attribute is layout fixed -->
 |    <amp-audio src=lemur.png sizes=""></amp-audio>
+|
+|    <!-- Valid: empty audio tag with container layout -->
+|    <amp-audio autoplay src="https://yourhost.com/audios/myaudio.mp3" layout="container" preload="auto">
+|      <div fallback>
+|        <p>Your browser doesn’t support HTML5 audio</p>
+|      </div>
+|      <audio controls>
+|    </amp-audio>
 |  </body>
-|  </html>
+|  </html>
\ No newline at end of file
diff --git a/extensions/amp-audio/1.0/amp-audio.css b/extensions/amp-audio/1.0/amp-audio.css
new file mode 100644
index 000000000000..d456bb57c52d
--- /dev/null
+++ b/extensions/amp-audio/1.0/amp-audio.css
@@ -0,0 +1,17 @@
+/*
+ * Pre-upgrade:
+ * - display:block element
+ * - size-defined element
+ */
+amp-soundcloud {
+  display: block;
+  overflow: hidden;
+  position: relative;
+}
+
+/* Pre-upgrade: size-defining element - hide children. */
+amp-soundcloud:not(.i-amphtml-built)
+  > :not([placeholder]):not([slot='i-amphtml-svc']) {
+  display: none;
+  content-visibility: hidden;
+}
diff --git a/extensions/amp-audio/1.0/amp-audio.js b/extensions/amp-audio/1.0/amp-audio.js
new file mode 100644
index 000000000000..57220f07f35f
--- /dev/null
+++ b/extensions/amp-audio/1.0/amp-audio.js
@@ -0,0 +1,60 @@
+import {Layout_Enum} from '#core/dom/layout';
+
+import {isExperimentOn} from '#experiments';
+
+import {AmpPreactBaseElement, setSuperClass} from '#preact/amp-base-element';
+
+import {triggerAnalyticsEvent} from '#utils/analytics';
+import {userAssert} from '#utils/log';
+
+import {BaseElement} from './base-element';
+
+/** @const {string} */
+const TAG = 'amp-audio';
+
+class AmpAudio extends setSuperClass(BaseElement, AmpPreactBaseElement) {
+  /** @override */
+  init() {
+    this.registerApiAction('play', (api) => {
+      api.play();
+    });
+    this.registerApiAction('pause', (api) => {
+      api.pause();
+    });
+    this.registerApiAction('isPlaying', (api) => api.isPlaying());
+
+    /**
+     * TODO(AnuragVasanwala):
+     * Add "validateMediaMetadata(element, metadata)" to dictionary
+     * once validation step for video components on Bento are included
+     */
+    return {
+      'onLoad': () => {
+        this.toggleFallback(false);
+      },
+      'onError': () => {
+        this.toggleFallback(true);
+      },
+      'onPlaying': () => {
+        triggerAnalyticsEvent(this.element, 'audio-play');
+      },
+      'onPause': () => {
+        triggerAnalyticsEvent(this.element, 'audio-pause');
+      },
+    };
+  }
+
+  /** @override */
+  isLayoutSupported(layout) {
+    userAssert(
+      isExperimentOn(this.win, 'bento') ||
+        isExperimentOn(this.win, 'bento-audio'),
+      'expected global "bento" or specific "bento-audio" experiment to be enabled'
+    );
+    return layout == Layout_Enum.FIXED || layout == Layout_Enum.FIXED_HEIGHT;
+  }
+}
+
+AMP.extension(TAG, '1.0', (AMP) => {
+  AMP.registerElement(TAG, AmpAudio);
+});
diff --git a/extensions/amp-audio/1.0/base-element.js b/extensions/amp-audio/1.0/base-element.js
new file mode 100644
index 000000000000..a121d051c7b3
--- /dev/null
+++ b/extensions/amp-audio/1.0/base-element.js
@@ -0,0 +1,33 @@
+import {PreactBaseElement} from '#preact/base-element';
+
+import {BentoAudio} from './component';
+
+export class BaseElement extends PreactBaseElement {}
+
+/** @override */
+BaseElement['Component'] = BentoAudio;
+
+/** @override */
+BaseElement['props'] = {
+  album: {attr: 'album', type: 'string'},
+  'aria-describedby': {attr: 'aria-describedby', type: 'string'},
+  'aria-label': {attr: 'aria-label', type: 'string'},
+  'aria-labelledby': {attr: 'aria-labelledby', type: 'string'},
+  artist: {attr: 'artist', type: 'string'},
+  artwork: {attr: 'artwork', type: 'string'},
+  // TODO(dmanek): Use InOb hook for autoplay.
+  // autoplay: {attr: 'autoplay', type: 'boolean'},
+  controlsList: {attr: 'controlsList'},
+  loop: {attr: 'loop', type: 'boolean'},
+  muted: {attr: 'muted', type: 'boolean'},
+  preload: {attr: 'preload'},
+  sources: {selector: 'source', single: false, clone: true},
+  src: {attr: 'src'},
+  title: {attr: 'title', type: 'string'},
+};
+
+/** @override */
+BaseElement['layoutSizeDefined'] = true;
+
+/** @override */
+BaseElement['usesShadowDom'] = true;
diff --git a/extensions/amp-audio/1.0/component.js b/extensions/amp-audio/1.0/component.js
new file mode 100644
index 000000000000..29bdd2582605
--- /dev/null
+++ b/extensions/amp-audio/1.0/component.js
@@ -0,0 +1,147 @@
+import * as Preact from '#preact';
+import {
+  useCallback,
+  useEffect,
+  useImperativeHandle,
+  useMemo,
+  useRef,
+} from '#preact';
+import {forwardRef} from '#preact/compat';
+import {ContainWrapper} from '#preact/component';
+
+import {setMediaSession} from '../../../src/mediasession-helper';
+
+/**
+ * @param {!AudioDef.Props} props
+ * @param {{current: ?AudioDef.AudioApi}} ref
+ * @return {PreactDef.Renderable}
+ */
+export function BentoAudioWithRef(
+  {
+    album = '',
+    'aria-describedby': ariaDescribedby,
+    'aria-label': ariaLabel,
+    'aria-labelledby': ariaLabelledby,
+    artist = '',
+    artwork = '',
+    // TODO(dmanek): Use InOb hook for autoplay.
+    // autoplay = false,
+    controlsList,
+    loading = 'lazy',
+    loop = false,
+    muted = false,
+    onError,
+    onPause,
+    onPlaying,
+    preload,
+    sources,
+    src,
+    title = '',
+    ...rest
+  },
+  ref
+) {
+  const audioRef = useRef(null);
+  const wrapperRef = useRef(null);
+
+  /** @public {boolean} */
+  const isPlaying = useRef(false);
+
+  /**
+   * Prepares Media Metadata
+   */
+  const metadata = useMemo(
+    () => ({
+      title,
+      artist,
+      album,
+      artwork: [{src: artwork}],
+    }),
+    [title, artist, album, artwork]
+  );
+
+  /**
+   * Plays audio callback
+   */
+  const play = useCallback(() => {
+    audioRef.current.play();
+    isPlaying.current = true;
+  }, []);
+
+  /**
+   * Pauses audio callback
+   */
+  const pause = useCallback(() => {
+    audioRef.current.pause();
+    isPlaying.current = false;
+  }, []);
+
+  /**
+   * Updates media session for current window/tab
+   */
+  const playingCallback = useCallback(() => {
+    onPlaying?.();
+  }, [onPlaying]);
+
+  /**
+   * Updates media session for current window/tab
+   */
+  const pauseCallback = useCallback(() => {
+    onPause?.();
+  }, [onPause]);
+
+  /** Audio Component - API Functions */
+  useImperativeHandle(
+    ref,
+    () =>
+      /** @type {!AudioDef.AudioApi} */ ({
+        play,
+        pause,
+        isPlaying: () => isPlaying.current,
+      }),
+    [play, pause]
+  );
+
+  useEffect(() => {
+    const win = audioRef.current?.ownerDocument?.defaultView;
+
+    /**
+     * TODO(AnuragVasanwala):
+     * Add "validateMediaMetadata?.(element, metadata)"
+     * once validation step for video components on Bento are included
+     */
+
+    if (win) {
+      setMediaSession(win, metadata, play, pause);
+    }
+  }, [metadata, play, pause]);
+
+  return (
+    <ContainWrapper contentRef={wrapperRef} size layout paint {...rest}>
+      <audio
+        ref={audioRef}
+        aria-describedby={ariaDescribedby}
+        aria-label={ariaLabel}
+        aria-labelledby={ariaLabelledby}
+        // TODO(dmanek): Use InOb hook for autoplay.
+        // autoplay={autoplay}
+        controls // Force controls otherwise there is no player UI.
+        controlsList={controlsList}
+        loading={loading}
+        loop={loop}
+        muted={muted}
+        onError={onError}
+        onPause={pauseCallback}
+        onPlaying={playingCallback}
+        preload={preload}
+        src={src}
+      >
+        {sources}
+      </audio>
+    </ContainWrapper>
+  );
+}
+
+const BentoAudio = forwardRef(BentoAudioWithRef);
+BentoAudio.displayName = 'BentoAudio'; // Make findable for tests.
+export {BentoAudio};
diff --git a/extensions/amp-audio/1.0/component.type.js b/extensions/amp-audio/1.0/component.type.js
new file mode 100644
index 000000000000..4352efb61ce7
--- /dev/null
+++ b/extensions/amp-audio/1.0/component.type.js
@@ -0,0 +1,44 @@
+/** @externs */
+
+/** @const */
+var AudioDef = {};
+
+/**
+ * @typedef {{
+ *   album: (string),
+ *   'aria-describedby': (string|undefined),
+ *   'aria-label': (string|undefined),
+ *   'aria-labelledby': (string|undefined),
+ *   artist: (string),
+ *   artwork: (string),
+ *   autoplay: (boolean),
+ *   controlsList: (boolean|undefined),
+ *   loading: (string),
+ *   loop: (boolean),
+ *   muted: (boolean),
+ *   preload: (string|undefined),
+ *   sources: (?PreactDef.Renderable|undefined),
+ *   src: (string|undefined),
+ *   title: (string),
+ * }}
+ */
+AudioDef.Props;
+
+/** @interface */
+AudioDef.AudioApi = class {
+  /**
+   * Plays/Resume the audio
+   */
+  play() {}
+
+  /**
+   * Pauses the audio
+   */
+  pause() {}
+
+  /**
+   * Get playing state of audio
+   * @return {boolean} Returns true if audio is playing
+   */
+  isPlaying() {}
+};
diff --git a/extensions/amp-audio/1.0/storybook/Basic.amp.js b/extensions/amp-audio/1.0/storybook/Basic.amp.js
new file mode 100644
index 000000000000..883d1bfc2c78
--- /dev/null
+++ b/extensions/amp-audio/1.0/storybook/Basic.amp.js
@@ -0,0 +1,52 @@
+import {withAmp} from '@ampproject/storybook-addon';
+
+import * as Preact from '#preact';
+
+export default {
+  title: 'amp-audio-1_0',
+  decorators: [withAmp],
+
+  parameters: {
+    extensions: [{name: 'amp-audio', version: '1.0'}],
+    experiments: ['bento'],
+  },
+};
+
+export const _default = () => {
+  return (
+    <amp-audio
+      src="https://storage.googleapis.com/media-session/sintel/snow-fight.mp3"
+      artwork="https://storage.googleapis.com/media-session/sintel/artwork-512.png"
+      title="Snow Fight"
+      album="Jan Morgenstern"
+      artist="Sintel"
+      height="75"
+      width="auto"
+      layout="fixed-height"
+      controls
+    >
+      <div>Your browser doesn’t support HTML5 audio</div>
+    </amp-audio>
+  );
+};
+
+export const LoadAudioThroughSources = () => {
+  return (
+    <amp-audio
+      artwork="https://storage.googleapis.com/media-session/sintel/artwork-512.png"
+      title="Snow Fight"
+      album="Jan Morgenstern"
+      artist="Sintel"
+      height="75"
+      width="auto"
+      layout="fixed-height"
+      controls
+    >
+      <source
+        src="https://storage.googleapis.com/media-session/sintel/snow-fight.mp3"
+        type="audio/mpeg"
+      />
+      <div fallback>Your browser doesn’t support HTML5 audio</div>
+    </amp-audio>
+  );
+};
diff --git a/extensions/amp-audio/1.0/storybook/Basic.js b/extensions/amp-audio/1.0/storybook/Basic.js
new file mode 100644
index 000000000000..4fcd4673552c
--- /dev/null
+++ b/extensions/amp-audio/1.0/storybook/Basic.js
@@ -0,0 +1,42 @@
+import * as Preact from '#preact';
+
+import {BentoAudio} from '../component';
+
+export default {
+  title: 'Audio',
+  component: BentoAudio,
+};
+
+export const _default = () => {
+  return (
+    <BentoAudio
+      src="https://storage.googleapis.com/media-session/sintel/snow-fight.mp3"
+      artwork="https://storage.googleapis.com/media-session/sintel/artwork-512.png"
+      title="Snow Fight"
+      album="Jan Morgenstern"
+      artist="Sintel"
+      style={{height: '75px', width: 'auto'}}
+      controls
+    ></BentoAudio>
+  );
+};
+
+export const LoadAudioThroughSources = () => {
+  return (
+    <BentoAudio
+      artwork="https://storage.googleapis.com/media-session/sintel/artwork-512.png"
+      title="Snow Fight"
+      album="Jan Morgenstern"
+      artist="Sintel"
+      height="75"
+      width="auto"
+      controls
+      sources={
+        <source
+          src="https://storage.googleapis.com/media-session/sintel/snow-fight.mp3"
+          type="audio/mpeg"
+        />
+      }
+    ></BentoAudio>
+  );
+};
diff --git a/extensions/amp-audio/1.0/test/test-amp-audio.js b/extensions/amp-audio/1.0/test/test-amp-audio.js
new file mode 100644
index 000000000000..35dc32a9c07c
--- /dev/null
+++ b/extensions/amp-audio/1.0/test/test-amp-audio.js
@@ -0,0 +1,288 @@
+import '../amp-audio';
+
+import {htmlFor} from '#core/dom/static-template';
+import {naturalDimensions_} from '#core/static-layout';
+
+import {toggleExperiment} from '#experiments';
+
+import {waitFor} from '#testing/helpers/service';
+
+describes.realWin(
+  'amp-audio-v1.0',
+  {
+    amp: {
+      extensions: ['amp-audio:1.0'],
+    },
+  },
+  (env) => {
+    let win;
+    let doc;
+    let html;
+    let element;
+
+    beforeEach(async () => {
+      win = env.win;
+      doc = win.document;
+      html = htmlFor(doc);
+      naturalDimensions_['AMP-AUDIO'] = {width: '300px', height: '30px'};
+      toggleExperiment(win, 'bento-audio', true, true);
+    });
+
+    /**
+     * Clean up the child elements that are appended
+     * in the body in attachAndRun method.
+     */
+    afterEach(async () => {
+      while (doc.body.firstChild) {
+        doc.body.removeChild(doc.body.firstChild);
+      }
+    });
+
+    /**
+     * Wait for iframe to be mounted
+     */
+    const waitForRender = async () => {
+      await element.buildInternal();
+      const loadPromise = element.layoutCallback();
+      const {shadowRoot} = element;
+      await waitFor(
+        () => shadowRoot.querySelector('audio'),
+        'audio tag mounted'
+      );
+      await loadPromise;
+    };
+
+    /**
+     * Creates `<amp-audio>`
+     * @param {Element} element Element to attach to doc and run
+     * @returns Returns `<amp-audio>` with given parameters
+     */
+    async function attachAndRun(element) {
+      expect(element.tagName).to.equal('AMP-AUDIO');
+      doc.body.appendChild(element);
+      await element.buildInternal();
+      try {
+        await element.layoutCallback();
+      } catch (error) {
+        // Ignore failed to load errors since sources are fake.
+        if (error.toString().indexOf('Failed to load') < 0) {
+          throw error;
+        }
+      }
+      return element;
+    }
+
+    it('should load audio through attribute', async () => {
+      element = await attachAndRun(
+        html`<amp-audio src="audio.mp3"></amp-audio>`
+      );
+
+      // Wait till rendering is finished
+      await waitForRender();
+
+      // Retrieve
+      const {shadowRoot} = element;
+      const audio = shadowRoot.querySelector('audio');
+
+      expect(audio.tagName).to.equal('AUDIO');
+      expect(audio.getAttribute('src')).to.equal('audio.mp3');
+      expect(audio).to.have.attribute('controls');
+      expect(element.style.width).to.be.equal('300px');
+      expect(element.style.height).to.be.equal('30px');
+    });
+
+    it('should not preload audio', async () => {
+      element = await attachAndRun(
+        html`<amp-audio src="audio.mp3" preload="none"></amp-audio>`
+      );
+
+      // Wait till rendering is finished
+      await waitForRender();
+
+      // Fetch audio element from shadowRoot
+      const {shadowRoot} = element;
+      const audio = shadowRoot.querySelector('audio');
+
+      expect(audio.getAttribute('preload')).to.be.equal('none');
+    });
+
+    it('should only preload audio metadata', async () => {
+      element = await attachAndRun(
+        html`<amp-audio src="audio.mp3" preload="metadata"></amp-audio>`
+      );
+
+      // Wait till rendering is finished
+      await waitForRender();
+
+      // Fetch audio element from shadowRoot
+      const {shadowRoot} = element;
+      const audio = shadowRoot.querySelector('audio');
+
+      expect(audio.getAttribute('preload')).to.be.equal('metadata');
+    });
+
+    it('should attach `<audio>` element and execute relevant actions for layout="nodisplay"', async () => {
+      element = await attachAndRun(
+        html`<amp-audio
+          src="audio.mp3"
+          preload="none"
+          layoud="nodisplay"
+        ></amp-audio>`
+      );
+
+      // Wait till rendering is finished
+      await waitForRender();
+
+      // Fetch audio element from shadowRoot
+      const {shadowRoot} = element;
+      const audio = shadowRoot.querySelector('audio');
+
+      expect(audio).to.not.be.null;
+
+      const impl = await element.getImpl();
+      impl.executeAction({method: 'play', satisfiesTrust: () => true});
+      expect(
+        impl.executeAction({method: 'isPlaying', satisfiesTrust: () => true})
+      ).to.be.true;
+
+      impl.executeAction({method: 'pause', satisfiesTrust: () => true});
+      expect(
+        impl.executeAction({method: 'isPlaying', satisfiesTrust: () => true})
+      ).to.be.false;
+    });
+
+    it('should load audio through sources', async () => {
+      element = await attachAndRun(
+        html`<amp-audio width="503" height="53" autoplay preload muted loop>
+          <source src="audio.mp3" type="audio/mpeg" />
+          <source src="audio.ogg" type="audio/ogg" />
+          <text>Test</text>
+        </amp-audio>`
+      );
+
+      // Wait till rendering is finished
+      await waitForRender();
+
+      // Fetch audio element from shadowRoot
+      const {shadowRoot} = element;
+      const audio = shadowRoot.querySelector('audio');
+
+      expect(audio.tagName).to.equal('AUDIO');
+      expect(element.getAttribute('width')).to.be.equal('503');
+      expect(element.getAttribute('height')).to.be.equal('53');
+      expect(element.offsetWidth).to.be.greaterThan(1);
+      expect(element.offsetHeight).to.be.greaterThan(1);
+      expect(audio).to.have.attribute('controls');
+      // TODO(dmanek): Use InOb hook for autoplay.
+      // expect(audio).to.have.attribute('autoplay');
+      expect(audio.muted).to.be.true;
+      expect(audio).to.have.attribute('preload');
+      expect(audio).to.have.attribute('loop');
+      expect(audio).to.not.have.attribute('src');
+      expect(audio.childNodes[0].tagName).to.equal('SOURCE');
+      expect(audio.childNodes[0].getAttribute('src')).to.equal('audio.mp3');
+      expect(audio.childNodes[1].tagName).to.equal('SOURCE');
+      expect(audio.childNodes[1].getAttribute('src')).to.equal('audio.ogg');
+      expect(audio.childNodes).to.have.lengthOf(2);
+    });
+
+    it('should set its dimensions to the browser natural', async () => {
+      element = await attachAndRun(
+        html`<amp-audio src="audio.mp3"></amp-audio>`
+      );
+
+      // Wait till rendering is finished
+      await waitForRender();
+
+      // Fetch audio element from shadowRoot
+      const {shadowRoot} = element;
+      const audio = shadowRoot.querySelector('audio');
+
+      expect(element.style.width).to.be.equal('300px');
+      expect(element.style.height).to.be.equal('30px');
+      if (/Safari|Firefox/.test(navigator.userAgent)) {
+        // Safari has default sizes for audio tags that cannot
+        // be overridden.
+        return;
+      }
+      expect(audio.offsetWidth).to.be.equal(300);
+      expect(audio.offsetHeight).to.be.equal(30);
+    });
+
+    it('should set its natural dimension only if not specified', async () => {
+      element = await attachAndRun(
+        html`<amp-audio src="audio.mp3" width="500"></amp-audio>`
+      );
+
+      // Wait till rendering is finished
+      await waitForRender();
+
+      expect(element.style.width).to.be.equal('500px');
+      expect(element.style.height).to.be.equal('30px');
+    });
+
+    it('should fallback when not available', async () => {
+      element = await attachAndRun(
+        html`<amp-audio src="audio.mp3" width="500"></amp-audio>`
+      );
+
+      element.toggleFallback = env.sandbox.spy();
+      await waitForRender();
+
+      // Fetch audio element from shadowRoot
+      const {shadowRoot} = element;
+      const audio = shadowRoot.querySelector('audio');
+      audio.dispatchEvent(new Event('error'));
+      expect(element.toggleFallback).to.be.calledOnce;
+    });
+
+    it('should propagate ARIA attributes', async () => {
+      element = await attachAndRun(
+        html`<amp-audio
+          src="audio.mp3"
+          aria-label="Hello"
+          aria-labelledby="id2"
+          aria-describedby="id3"
+        ></amp-audio>`
+      );
+
+      // Wait till rendering is finished
+      await waitForRender();
+
+      // Fetch audio element from shadowRoot
+      const {shadowRoot} = element;
+      const audio = shadowRoot.querySelector('audio');
+
+      expect(audio.getAttribute('aria-label')).to.equal('Hello');
+      expect(audio.getAttribute('aria-labelledby')).to.equal('id2');
+      expect(audio.getAttribute('aria-describedby')).to.equal('id3');
+    });
+
+    it('should play/pause when `play`/`pause` actions are called', async () => {
+      element = await attachAndRun(
+        html`<amp-audio src="audio.mp3" width="500"></amp-audio>`
+      );
+
+      // Wait till rendering is finished
+      await waitForRender();
+
+      // Fetch audio element from shadowRoot
+      const {shadowRoot} = element;
+      const audio = shadowRoot.querySelector('audio');
+
+      expect(audio).to.not.be.null;
+
+      const impl = await element.getImpl();
+
+      impl.executeAction({method: 'play', satisfiesTrust: () => true});
+      expect(
+        impl.executeAction({method: 'isPlaying', satisfiesTrust: () => true})
+      ).to.be.true;
+
+      impl.executeAction({method: 'pause', satisfiesTrust: () => true});
+      expect(
+        impl.executeAction({method: 'isPlaying', satisfiesTrust: () => true})
+      ).to.be.false;
+    });
+  }
+);
diff --git a/extensions/amp-audio/1.0/test/test-component.js b/extensions/amp-audio/1.0/test/test-component.js
new file mode 100644
index 000000000000..4aca5dc1e7b5
--- /dev/null
+++ b/extensions/amp-audio/1.0/test/test-component.js
@@ -0,0 +1,102 @@
+import {mount} from 'enzyme';
+
+import * as Preact from '#preact';
+
+import {BentoAudio} from '../component';
+
+describes.realWin('Audio preact component v1.0', {}, (env) => {
+  it('should load audio through attribute', () => {
+    const wrapper = mount(
+      <BentoAudio src="audio.mp3" style={{height: '30px', width: '300px'}} />
+    );
+
+    const component = wrapper.find('audio');
+
+    expect(component).to.have.lengthOf(1);
+    expect(component.name()).to.equal('audio');
+    expect(component.prop('src')).to.equal('audio.mp3');
+    expect(component.prop('controls')).to.be.true;
+
+    expect(wrapper.prop('style')).to.deep.equal({
+      width: '300px',
+      height: '30px',
+    });
+  });
+  it('should not preload audio', () => {
+    const wrapper = mount(<BentoAudio src="audio.mp3" preload="none" />);
+
+    const component = wrapper.find('audio');
+    expect(component).to.have.lengthOf(1);
+    expect(component.prop('preload')).to.equal('none');
+  });
+  it('should only preload audio metadata', () => {
+    const wrapper = mount(<BentoAudio src="audio.mp3" preload="metadata" />);
+
+    const component = wrapper.find('audio');
+    expect(component).to.have.lengthOf(1);
+    expect(component.prop('preload')).to.equal('metadata');
+  });
+  it('should load audio through sources', () => {
+    const wrapper = mount(
+      <BentoAudio
+        autoplay=""
+        preload=""
+        muted=""
+        loop=""
+        width="503px"
+        height="53px"
+        sources={
+          <>
+            <source src="audio.mp3" type="audio/mpeg" />
+            <source src="audio.ogg" type="audio/ogg" />
+          </>
+        }
+      ></BentoAudio>,
+      {attachTo: env.win.document.body}
+    );
+
+    const component = wrapper.find('audio');
+    expect(component).to.have.lengthOf(1);
+
+    expect(component.name()).to.equal('audio');
+    expect(wrapper.prop('width')).to.equal('503px');
+    expect(wrapper.prop('height')).to.equal('53px');
+    expect(component.getDOMNode().offsetWidth).to.be.greaterThan(1);
+    expect(component.getDOMNode().offsetHeight).to.be.greaterThan(1);
+    expect(component.prop('controls')).to.be.true;
+
+    const audio = component.find('audio');
+    // TODO(dmanek): Use InOb hook for autoplay.
+    // expect(audio.prop('autoplay')).not.to.be.undefined;
+    expect(audio.prop('muted')).not.to.be.undefined;
+    expect(audio.getDOMNode().muted).not.to.be.undefined;
+    expect(audio.prop('preload')).not.to.be.undefined;
+    expect(audio.prop('loop')).not.to.be.undefined;
+    expect(audio.prop('src')).to.be.undefined;
+
+    /**
+     * Here, first  childAt(0) = <> ... </>
+     *       second childAt(N) = <source> ... </source>
+     */
+    expect(component.childAt(0).childAt(0).name()).to.equal('source');
+    expect(component.childAt(0).childAt(0).prop('src')).to.equal('audio.mp3');
+    expect(component.childAt(0).childAt(1).name()).to.equal('source');
+    expect(component.childAt(0).childAt(1).prop('src')).to.equal('audio.ogg');
+  });
+  it('should propagate ARIA attributes', () => {
+    const wrapper = mount(
+      <BentoAudio
+        src="audio.mp3"
+        aria-label="Hello"
+        aria-labelledby="id2"
+        aria-describedby="id3"
+      />
+    );
+
+    const component = wrapper.find('audio');
+    expect(component).to.have.lengthOf(1);
+    expect(component.prop('aria-label')).to.equal('Hello');
+    expect(component.prop('aria-labelledby')).to.equal('id2');
+    expect(component.prop('aria-describedby')).to.equal('id3');
+  });
+});
diff --git a/extensions/amp-audio/1.0/test/validator-amp-audio.html b/extensions/amp-audio/1.0/test/validator-amp-audio.html
new file mode 100644
index 000000000000..6047b7bc2216
--- /dev/null
+++ b/extensions/amp-audio/1.0/test/validator-amp-audio.html
@@ -0,0 +1,122 @@
+<!--
+  Test Description:
+  Tests the example from the markdown file, autoplay enabled.
+-->
+<!DOCTYPE html>
+<html ⚡ lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <link rel="canonical" href="./regular-html-version.html" />
+    <meta name="viewport" content="width=device-width,minimum-scale=1" />
+    <style amp-boilerplate>
+      body {
+        -webkit-animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+        -moz-animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+        -ms-animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+        animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+      }
+      @-webkit-keyframes -amp-start {
+        from {
+          visibility: hidden;
+        }
+        to {
+          visibility: visible;
+        }
+      }
+      @-moz-keyframes -amp-start {
+        from {
+          visibility: hidden;
+        }
+        to {
+          visibility: visible;
+        }
+      }
+      @-ms-keyframes -amp-start {
+        from {
+          visibility: hidden;
+        }
+        to {
+          visibility: visible;
+        }
+      }
+      @-o-keyframes -amp-start {
+        from {
+          visibility: hidden;
+        }
+        to {
+          visibility: visible;
+        }
+      }
+      @keyframes -amp-start {
+        from {
+          visibility: hidden;
+        }
+        to {
+          visibility: visible;
+        }
+      }
+    </style>
+    <noscript
+      ><style amp-boilerplate>
+        body {
+          -webkit-animation: none;
+          -moz-animation: none;
+          -ms-animation: none;
+          animation: none;
+        }
+      </style></noscript
+    >
+    <script async src="https://cdn.ampproject.org/v0.js"></script>
+    <script
+      async
+      custom-element="amp-audio"
+      src="https://cdn.ampproject.org/v0/amp-audio-1.0.js"
+    ></script>
+  </head>
+  <body>
+    <amp-audio
+      width="400"
+      height="300"
+      autoplay
+      src="https://yourhost.com/audios/myaudio.mp3"
+      preload="auto"
+    >
+      <div fallback>
+        <p>Your browser doesn’t support HTML5 audio</p>
+      </div>
+      <source type="audio/mpeg" src="foo.mp3" />
+      <source type="audio/ogg" src="foo.ogg" />
+    </amp-audio>
+
+    <!-- Valid: test controlslist attr, which is often provided in camelCase -->
+    <amp-audio
+      width="400"
+      height="300"
+      controlsList="nofullscreen nodownload noremoteplayback foobar"
+    >
+    </amp-audio>
+
+    <!-- Valid: Media Session attributes -->
+    <amp-audio
+      width="400"
+      height="300"
+      title="Hello"
+      artist="World"
+      artwork="example.jpg"
+    >
+    </amp-audio>
+
+    <!-- Valid: Most attributes are bindable -->
+    <amp-audio
+      width="400"
+      height="300"
+      [title]="Hello"
+      [artist]="World"
+      [artwork]="example.jpg"
+    >
+    </amp-audio>
+
+    <!-- Valid: empty sizes attribute is layout fixed -->
+    <amp-audio src="lemur.png" sizes=""></amp-audio>
+  </body>
+</html>
diff --git a/extensions/amp-audio/1.0/test/validator-amp-audio.out b/extensions/amp-audio/1.0/test/validator-amp-audio.out
new file mode 100644
index 000000000000..5a06b11bd84a
--- /dev/null
+++ b/extensions/amp-audio/1.0/test/validator-amp-audio.out
@@ -0,0 +1,123 @@
+PASS
+|  <!--
+|    Test Description:
+|    Tests the example from the markdown file, autoplay enabled.
+|  -->
+|  <!DOCTYPE html>
+|  <html ⚡ lang="en">
+|    <head>
+|      <meta charset="utf-8" />
+|      <link rel="canonical" href="./regular-html-version.html" />
+|      <meta name="viewport" content="width=device-width,minimum-scale=1" />
+|      <style amp-boilerplate>
+|        body {
+|          -webkit-animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+|          -moz-animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+|          -ms-animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+|          animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+|        }
+|        @-webkit-keyframes -amp-start {
+|          from {
+|            visibility: hidden;
+|          }
+|          to {
+|            visibility: visible;
+|          }
+|        }
+|        @-moz-keyframes -amp-start {
+|          from {
+|            visibility: hidden;
+|          }
+|          to {
+|            visibility: visible;
+|          }
+|        }
+|        @-ms-keyframes -amp-start {
+|          from {
+|            visibility: hidden;
+|          }
+|          to {
+|            visibility: visible;
+|          }
+|        }
+|        @-o-keyframes -amp-start {
+|          from {
+|            visibility: hidden;
+|          }
+|          to {
+|            visibility: visible;
+|          }
+|        }
+|        @keyframes -amp-start {
+|          from {
+|            visibility: hidden;
+|          }
+|          to {
+|            visibility: visible;
+|          }
+|        }
+|      </style>
+|      <noscript
+|        ><style amp-boilerplate>
+|          body {
+|            -webkit-animation: none;
+|            -moz-animation: none;
+|            -ms-animation: none;
+|            animation: none;
+|          }
+|        </style></noscript
+|      >
+|      <script async src="https://cdn.ampproject.org/v0.js"></script>
+|      <script
+|        async
+|        custom-element="amp-audio"
+|        src="https://cdn.ampproject.org/v0/amp-audio-1.0.js"
+|      ></script>
+|    </head>
+|    <body>
+|      <amp-audio
+|        width="400"
+|        height="300"
+|        autoplay
+|        src="https://yourhost.com/audios/myaudio.mp3"
+|        preload="auto"
+|      >
+|        <div fallback>
+|          <p>Your browser doesn’t support HTML5 audio</p>
+|        </div>
+|        <source type="audio/mpeg" src="foo.mp3" />
+|        <source type="audio/ogg" src="foo.ogg" />
+|      </amp-audio>
+|
+|      <!-- Valid: test controlslist attr, which is often provided in camelCase -->
+|      <amp-audio
+|        width="400"
+|        height="300"
+|        controlsList="nofullscreen nodownload noremoteplayback foobar"
+|      >
+|      </amp-audio>
+|
+|      <!-- Valid: Media Session attributes -->
+|      <amp-audio
+|        width="400"
+|        height="300"
+|        title="Hello"
+|        artist="World"
+|        artwork="example.jpg"
+|      >
+|      </amp-audio>
+|
+|      <!-- Valid: Most attributes are bindable -->
+|      <amp-audio
+|        width="400"
+|        height="300"
+|        [title]="Hello"
+|        [artist]="World"
+|        [artwork]="example.jpg"
+|      >
+|      </amp-audio>
+|
+|      <!-- Valid: empty sizes attribute is layout fixed -->
+|      <amp-audio src="lemur.png" sizes=""></amp-audio>
+|    </body>
+|  </html>
diff --git a/extensions/amp-audio/amp-audio.md b/extensions/amp-audio/amp-audio.md
index 47f6a586eb38..c4f273c09e1d 100644
--- a/extensions/amp-audio/amp-audio.md
+++ b/extensions/amp-audio/amp-audio.md
@@ -1,5 +1,7 @@
 ---
 $category@: media
+bento: true
+experimental: true
 formats:
   - websites
   - stories
diff --git a/extensions/amp-audio/validator-amp-audio.protoascii b/extensions/amp-audio/validator-amp-audio.protoascii
index 5c43088f7842..5c6a5996ac8c 100644
--- a/extensions/amp-audio/validator-amp-audio.protoascii
+++ b/extensions/amp-audio/validator-amp-audio.protoascii
@@ -1,9 +1,25 @@
-tags: {  # amp-audio
+tags: {  # amp-audio 1.0
+  html_format: AMP
+  tag_name: "SCRIPT"
+  satisfies_condition: "amp-audio 1.0"
+  excludes_condition: "amp-audio 0.1"
+  extension_spec: {
+    name: "amp-audio"
+    version_name: "v1.0"
+    version: "1.0"
+    bento_supported_version: "1.0"
+  }
+  attr_lists: "common-extension-attrs"
+}
+tags: {  # amp-audio 0.1
   html_format: AMP
   html_format: AMP4ADS
   tag_name: "SCRIPT"
+  satisfies_condition: "amp-audio 0.1"
+  excludes_condition: "amp-audio 1.0"
   extension_spec: {
     name: "amp-audio"
+    version_name: "v0.1"
     version: "0.1"
     version: "latest"
     deprecated_allow_duplicates: true
@@ -64,6 +80,7 @@ tags: {  # <amp-audio> for AMP (autoplay attribute allowed)
     defines_default_width: true
     supported_layouts: FIXED
     supported_layouts: FIXED_HEIGHT
+    supported_layouts: CONTAINER
     supported_layouts: NODISPLAY
   }
 }
diff --git a/extensions/amp-auto-ads/0.1/ad-network-config.js b/extensions/amp-auto-ads/0.1/ad-network-config.js
index 6612a1e945d8..30f3b084c7d3 100644
--- a/extensions/amp-auto-ads/0.1/ad-network-config.js
+++ b/extensions/amp-auto-ads/0.1/ad-network-config.js
@@ -36,6 +36,14 @@ export class AdNetworkConfigDef {
    */
   getConfigUrl() {}
 
+  /**
+   * After fetching the config, this method is called to allow rewriting the
+   * config on the client side.
+   * @param {!JsonObject} unusedConfig
+   * @return {!JsonObject}
+   */
+  filterConfig(unusedConfig) {}
+
   /**
    * Any attributes derived from either the page or the auto-amp-ads tag that
    * should be applied to any ads inserted.
diff --git a/extensions/amp-auto-ads/0.1/ad-tracker.js b/extensions/amp-auto-ads/0.1/ad-tracker.js
index f215818542da..00bc41f84d9e 100644
--- a/extensions/amp-auto-ads/0.1/ad-tracker.js
+++ b/extensions/amp-auto-ads/0.1/ad-tracker.js
@@ -170,7 +170,7 @@ export function getExistingAds(ampdoc) {
 
 /**
  * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
- * @param {!Object<string, *>} configObj
+ * @param {!{[key: string]: *}} configObj
  * @return {?AdConstraints}
  */
 export function getAdConstraintsFromConfigObj(ampdoc, configObj) {
diff --git a/extensions/amp-auto-ads/0.1/adsense-network-config.js b/extensions/amp-auto-ads/0.1/adsense-network-config.js
index 14639d8c9e93..c1705bd621d5 100644
--- a/extensions/amp-auto-ads/0.1/adsense-network-config.js
+++ b/extensions/amp-auto-ads/0.1/adsense-network-config.js
@@ -1,10 +1,11 @@
 import {buildUrl} from '#ads/google/a4a/shared/url-builder';
 
-import {dict} from '#core/types/object';
 import {getWin} from '#core/window';
 
 import {Services} from '#service';
 
+import {Attributes} from './attributes';
+
 import {parseUrlDeprecated} from '../../../src/url';
 
 /**
@@ -49,12 +50,25 @@ export class AdSenseNetworkConfig {
     );
   }
 
+  /** @override */
+  filterConfig(config) {
+    // Force no fill on anchor ads if adsbygoogle tag (non-AMP Adsense) is already loaded.
+    // We do this to prevent multiple anchor ads from being loaded.
+    if (
+      getWin(this.autoAmpAdsElement_).adsbygoogle &&
+      config[Attributes.STICKY_AD_ATTRIBUTES]
+    ) {
+      config[Attributes.STICKY_AD_ATTRIBUTES]['data-no-fill'] = 'true';
+    }
+    return config;
+  }
+
   /** @override */
   getAttributes() {
-    const attributesObj = dict({
+    const attributesObj = {
       'type': 'adsense',
       'data-ad-client': this.autoAmpAdsElement_.getAttribute('data-ad-client'),
-    });
+    };
     const dataAdHost = this.autoAmpAdsElement_.getAttribute('data-ad-host');
     const dataAdHostChannel = this.autoAmpAdsElement_.getAttribute(
       'data-ad-host-channel'
diff --git a/extensions/amp-auto-ads/0.1/alright-network-config.js b/extensions/amp-auto-ads/0.1/alright-network-config.js
index feeaaa25f87a..77ad68c9ede2 100644
--- a/extensions/amp-auto-ads/0.1/alright-network-config.js
+++ b/extensions/amp-auto-ads/0.1/alright-network-config.js
@@ -1,7 +1,6 @@
 import {buildUrl} from '#ads/google/a4a/shared/url-builder';
 
-import {Layout} from '#core/dom/layout';
-import {dict} from '#core/types/object';
+import {Layout_Enum} from '#core/dom/layout';
 
 import {Services} from '#service';
 
@@ -52,16 +51,21 @@ export class AlrightNetworkConfig {
     );
   }
 
+  /** @override */
+  filterConfig(config) {
+    return config;
+  }
+
   /** @override */
   getAttributes() {
-    const attributes = dict({
+    const attributes = {
       'width': 300,
       'height': 250,
-      'layout': Layout.RESPONSIVE,
+      'layout': Layout_Enum.RESPONSIVE,
       'data-multi-size-validation': 'false',
       'type': 'doubleclick',
       'data-ad': 'alright',
-    });
+    };
     return attributes;
   }
 
diff --git a/extensions/amp-auto-ads/0.1/amp-auto-ads.js b/extensions/amp-auto-ads/0.1/amp-auto-ads.js
index 0baaa3fdc9a6..67eb8547c956 100644
--- a/extensions/amp-auto-ads/0.1/amp-auto-ads.js
+++ b/extensions/amp-auto-ads/0.1/amp-auto-ads.js
@@ -1,5 +1,3 @@
-import {dict} from '#core/types/object';
-
 import {isExperimentOn} from '#experiments';
 
 import {Services} from '#service';
@@ -47,7 +45,9 @@ export class AmpAutoAds extends AMP.BaseElement {
     this.configPromise_ = this.getAmpDoc()
       .whenFirstVisible()
       .then(() => {
-        return this.getConfig_(this.adNetwork_.getConfigUrl());
+        return this.adNetwork_.filterConfig(
+          this.getConfig_(this.adNetwork_.getConfigUrl())
+        );
       });
 
     if (!this.isAutoAdsLayoutCallbackExperimentOn_()) {
@@ -115,13 +115,10 @@ export class AmpAutoAds extends AMP.BaseElement {
       }
 
       const placements = getPlacementsFromConfigObj(ampdoc, configObj);
-      const attributes = /** @type {!JsonObject} */ (
-        Object.assign(
-          dict({}),
-          this.adNetwork_.getAttributes(),
-          getAttributesFromConfigObj(configObj, Attributes.BASE_ATTRIBUTES)
-        )
-      );
+      const attributes = /** @type {!JsonObject} */ ({
+        ...this.adNetwork_.getAttributes(),
+        ...getAttributesFromConfigObj(configObj, Attributes.BASE_ATTRIBUTES),
+      });
       const sizing = this.adNetwork_.getSizing();
       const adConstraints =
         getAdConstraintsFromConfigObj(ampdoc, configObj) ||
@@ -134,13 +131,13 @@ export class AmpAutoAds extends AMP.BaseElement {
         adTracker,
         this.adNetwork_.isResponsiveEnabled()
       ).run();
-      const stickyAdAttributes = /** @type {!JsonObject} */ (
-        Object.assign(
-          dict({}),
-          attributes,
-          getAttributesFromConfigObj(configObj, Attributes.STICKY_AD_ATTRIBUTES)
-        )
-      );
+      const stickyAdAttributes = /** @type {!JsonObject} */ ({
+        ...attributes,
+        ...getAttributesFromConfigObj(
+          configObj,
+          Attributes.STICKY_AD_ATTRIBUTES
+        ),
+      });
       new AnchorAdStrategy(ampdoc, stickyAdAttributes, configObj).run();
     });
   }
diff --git a/extensions/amp-auto-ads/0.1/anchor-ad-strategy.js b/extensions/amp-auto-ads/0.1/anchor-ad-strategy.js
index 241b2b90bbf8..dca9eb5ec02a 100644
--- a/extensions/amp-auto-ads/0.1/anchor-ad-strategy.js
+++ b/extensions/amp-auto-ads/0.1/anchor-ad-strategy.js
@@ -1,5 +1,4 @@
 import {createElementWithAttributes} from '#core/dom';
-import {dict} from '#core/types/object';
 
 import {Services} from '#service';
 
@@ -87,16 +86,11 @@ export class AnchorAdStrategy {
    */
   placeAmpAdStickyAd_() {
     const viewportWidth = Services.viewportForDoc(this.ampdoc).getWidth();
-    const attributes = /** @type {!JsonObject} */ (
-      Object.assign(
-        dict(),
-        this.baseAttributes_,
-        dict({
-          'width': String(viewportWidth),
-          'height': this.baseAttributes_.height || '100',
-        })
-      )
-    );
+    const attributes = /** @type {!JsonObject} */ ({
+      ...this.baseAttributes_,
+      'width': String(viewportWidth),
+      'height': this.baseAttributes_.height || '100',
+    });
     const doc = this.ampdoc.win.document;
     const ampAd = createElementWithAttributes(doc, 'amp-ad', attributes);
     const body = this.ampdoc.getBody();
@@ -109,25 +103,17 @@ export class AnchorAdStrategy {
   placeStickyAd_() {
     const baseAttributes = this.baseAttributes_;
     const viewportWidth = Services.viewportForDoc(this.ampdoc).getWidth();
-    const attributes = /** @type {!JsonObject} */ (
-      Object.assign(
-        dict(),
-        baseAttributes,
-        dict({
-          'width': String(viewportWidth),
-          'height': baseAttributes.height || '100',
-        })
-      )
-    );
+    const attributes = /** @type {!JsonObject} */ ({
+      ...baseAttributes,
+      'width': String(viewportWidth),
+      'height': baseAttributes.height || '100',
+    });
+    delete attributes.sticky; // To ensure that no sticky attribute will be wrapped inside an amp-sticky-ad element.
     const doc = this.ampdoc.win.document;
     const ampAd = createElementWithAttributes(doc, 'amp-ad', attributes);
-    const stickyAd = createElementWithAttributes(
-      doc,
-      'amp-sticky-ad',
-      dict({
-        'layout': 'nodisplay',
-      })
-    );
+    const stickyAd = createElementWithAttributes(doc, 'amp-sticky-ad', {
+      'layout': 'nodisplay',
+    });
     stickyAd.appendChild(ampAd);
     const body = this.ampdoc.getBody();
     body.insertBefore(stickyAd, body.firstChild);
diff --git a/extensions/amp-auto-ads/0.1/attributes.js b/extensions/amp-auto-ads/0.1/attributes.js
index a61646f06b5d..377a00c271d2 100644
--- a/extensions/amp-auto-ads/0.1/attributes.js
+++ b/extensions/amp-auto-ads/0.1/attributes.js
@@ -1,5 +1,4 @@
 import {isArray, isObject} from '#core/types';
-import {dict} from '#core/types/object';
 
 import {user} from '#utils/log';
 
@@ -7,7 +6,7 @@ import {user} from '#utils/log';
 const TAG = 'amp-auto-ads';
 
 /**
- * @const {!Object<string, boolean>}
+ * @const {!{[key: string]: boolean}}
  */
 const NON_DATA_ATTRIBUTE_ALLOWLIST = {
   'type': true,
@@ -16,6 +15,7 @@ const NON_DATA_ATTRIBUTE_ALLOWLIST = {
   'height': true,
   'width': true,
   'sticky': true,
+  'json': true,
 };
 
 /**
@@ -36,11 +36,11 @@ export const Attributes = {
  */
 export function getAttributesFromConfigObj(configObj, attributes) {
   if (!configObj[attributes]) {
-    return dict();
+    return {};
   }
   if (!isObject(configObj[attributes]) || isArray(configObj[attributes])) {
     user().warn(TAG, attributes + ' property not an object');
-    return dict();
+    return {};
   }
   return parseAttributes(configObj[attributes]);
 }
@@ -50,7 +50,7 @@ export function getAttributesFromConfigObj(configObj, attributes) {
  * @return {!JsonObject<string, string>}
  */
 function parseAttributes(attributeObject) {
-  const attributes = dict();
+  const attributes = {};
   for (const key in attributeObject) {
     if (!NON_DATA_ATTRIBUTE_ALLOWLIST[key] && !key.startsWith('data-')) {
       user().warn(TAG, 'Attribute not whitlisted: ' + key);
diff --git a/extensions/amp-auto-ads/0.1/denakop-network-config.js b/extensions/amp-auto-ads/0.1/denakop-network-config.js
index c02a683ef5d8..8649ff952d71 100644
--- a/extensions/amp-auto-ads/0.1/denakop-network-config.js
+++ b/extensions/amp-auto-ads/0.1/denakop-network-config.js
@@ -1,7 +1,5 @@
 import {buildUrl} from '#ads/google/a4a/shared/url-builder';
 
-import {dict} from '#core/types/object';
-
 import {Services} from '#service';
 
 /**
@@ -60,14 +58,19 @@ export class DenakopNetworkConfig {
     );
   }
 
+  /** @override */
+  filterConfig(config) {
+    return config;
+  }
+
   /** @override */
   getAttributes() {
-    const attributes = dict({
+    const attributes = {
       'data-multi-size-validation': 'false',
       'type': 'doubleclick',
       'data-ad': 'denakop',
       'style': 'position:relative !important',
-    });
+    };
     return attributes;
   }
 
diff --git a/extensions/amp-auto-ads/0.1/doubleclick-network-config.js b/extensions/amp-auto-ads/0.1/doubleclick-network-config.js
index 751ed5134bee..babe9f592a4b 100644
--- a/extensions/amp-auto-ads/0.1/doubleclick-network-config.js
+++ b/extensions/amp-auto-ads/0.1/doubleclick-network-config.js
@@ -1,6 +1,5 @@
 import {buildUrl} from '#ads/google/a4a/shared/url-builder';
 
-import {dict} from '#core/types/object';
 import {tryParseJson} from '#core/types/object/json';
 
 import {Services} from '#service';
@@ -48,13 +47,18 @@ export class DoubleclickNetworkConfig {
     );
   }
 
+  /** @override */
+  filterConfig(config) {
+    return config;
+  }
+
   /** @override */
   getAttributes() {
-    const attributes = dict({
+    const attributes = {
       'type': 'doubleclick',
       'data-slot': this.autoAmpAdsElement_.getAttribute('data-slot'),
       'json': this.autoAmpAdsElement_.getAttribute('data-json'),
-    });
+    };
     return attributes;
   }
 
diff --git a/extensions/amp-auto-ads/0.1/firstimpression.io-network-config.js b/extensions/amp-auto-ads/0.1/firstimpression.io-network-config.js
index 07614e7c2559..bdd8fc3dc11b 100644
--- a/extensions/amp-auto-ads/0.1/firstimpression.io-network-config.js
+++ b/extensions/amp-auto-ads/0.1/firstimpression.io-network-config.js
@@ -1,6 +1,5 @@
 import {buildUrl} from '#ads/google/a4a/shared/url-builder';
 
-import {dict} from '#core/types/object';
 import {parseQueryString} from '#core/types/string/url';
 
 import {Services} from '#service';
@@ -102,12 +101,17 @@ export class FirstImpressionIoConfig {
     );
   }
 
+  /** @override */
+  filterConfig(config) {
+    return config;
+  }
+
   /** @override */
   getAttributes() {
-    const attributes = dict({
+    const attributes = {
       'type': 'firstimpression',
       'data-pvid64': this.pvid64,
-    });
+    };
     return attributes;
   }
 
diff --git a/extensions/amp-auto-ads/0.1/ping-network-config.js b/extensions/amp-auto-ads/0.1/ping-network-config.js
index 06b06fe65821..438c5e6d80f7 100644
--- a/extensions/amp-auto-ads/0.1/ping-network-config.js
+++ b/extensions/amp-auto-ads/0.1/ping-network-config.js
@@ -1,7 +1,5 @@
 import {buildUrl} from '#ads/google/a4a/shared/url-builder';
 
-import {dict} from '#core/types/object';
-
 import {Services} from '#service';
 
 /**
@@ -39,11 +37,16 @@ export class PingNetworkConfig {
     );
   }
 
+  /** @override */
+  filterConfig(config) {
+    return config;
+  }
+
   /** @override */
   getAttributes() {
-    return dict({
+    return {
       'type': '_ping_',
-    });
+    };
   }
 
   /** @override */
diff --git a/extensions/amp-auto-ads/0.1/placement.js b/extensions/amp-auto-ads/0.1/placement.js
index d9cdae3b432c..3280a3879136 100644
--- a/extensions/amp-auto-ads/0.1/placement.js
+++ b/extensions/amp-auto-ads/0.1/placement.js
@@ -1,14 +1,9 @@
 import {createElementWithAttributes} from '#core/dom';
 import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
-import {
-  LayoutMarginsChangeDef,
-  cloneLayoutMarginsChangeDef,
-} from '#core/dom/layout/rect';
 import {
   closestAncestorElementBySelector,
   scopedQuerySelectorAll,
 } from '#core/dom/query';
-import {dict} from '#core/types/object';
 
 import {Services} from '#service';
 
@@ -17,6 +12,8 @@ import {dev, user} from '#utils/log';
 import {Attributes, getAttributesFromConfigObj} from './attributes';
 import {measurePageLayoutBox} from './measure-page-layout-box';
 
+/** @typedef {import('#core/dom/layout/rect').LayoutMarginsChangeDef} LayoutMarginsChangeDef */
+
 /** @const */
 const TAG = 'amp-auto-ads';
 
@@ -64,7 +61,7 @@ const Position = {
 const DENYLISTED_ANCESTOR_TAGS = ['AMP-SIDEBAR', 'AMP-APP-BANNER'];
 
 /**
- * @const {!Object<!Position, function(!Element, !Element)>}
+ * @const {!{[key: !Position]: function(!Element, !Element)}}
  */
 const INJECTORS = {};
 INJECTORS[Position.BEFORE] = (anchorElement, elementToInject) => {
@@ -269,18 +266,14 @@ export class Placement {
    * @private
    */
   createAdElement_(baseAttributes, width) {
-    const attributes = /** @type {!JsonObject} */ (
-      Object.assign(
-        dict({
-          'layout': width ? 'fixed' : 'fixed-height',
-          'height': '0',
-          'width': width ? width : 'auto',
-          'class': 'i-amphtml-layout-awaiting-size',
-        }),
-        baseAttributes,
-        this.attributes_
-      )
-    );
+    const attributes = /** @type {!JsonObject} */ ({
+      'layout': width ? 'fixed' : 'fixed-height',
+      'height': '0',
+      'width': width ? width : 'auto',
+      'class': 'i-amphtml-layout-awaiting-size',
+      ...baseAttributes,
+      ...this.attributes_,
+    });
     return createElementWithAttributes(
       this.ampdoc.win.document,
       'amp-ad',
@@ -294,20 +287,16 @@ export class Placement {
    * @private
    */
   createFullWidthResponsiveAdElement_(baseAttributes) {
-    const attributes = /** @type {!JsonObject} */ (
-      Object.assign(
-        dict({
-          'width': '100vw',
-          'height': '0',
-          'layout': 'fixed',
-          'class': 'i-amphtml-layout-awaiting-size',
-          'data-auto-format': 'rspv',
-          'data-full-width': '',
-        }),
-        baseAttributes,
-        this.attributes_
-      )
-    );
+    const attributes = /** @type {!JsonObject} */ ({
+      'width': '100vw',
+      'height': '0',
+      'layout': 'fixed',
+      'class': 'i-amphtml-layout-awaiting-size',
+      'data-auto-format': 'rspv',
+      'data-full-width': '',
+      ...baseAttributes,
+      ...this.attributes_,
+    });
     return createElementWithAttributes(
       this.ampdoc.win.document,
       'amp-ad',
diff --git a/extensions/amp-auto-ads/0.1/premiumads-network-config.js b/extensions/amp-auto-ads/0.1/premiumads-network-config.js
index 15d9e76eb554..0cbae33d1b2a 100644
--- a/extensions/amp-auto-ads/0.1/premiumads-network-config.js
+++ b/extensions/amp-auto-ads/0.1/premiumads-network-config.js
@@ -1,7 +1,6 @@
 import {buildUrl} from '#ads/google/a4a/shared/url-builder';
 
-import {Layout} from '#core/dom/layout';
-import {dict} from '#core/types/object';
+import {Layout_Enum} from '#core/dom/layout';
 
 import {Services} from '#service';
 
@@ -32,20 +31,30 @@ export class PremiumadsNetworkConfig {
   getConfigUrl() {
     const data = this.autoAmpAdsElement_.dataset;
     const host = data.host || 'https://tags.premiumads.com.br';
-    return buildUrl(`${host}/autoads/${data.publisher}`, {}, 4096);
+    return buildUrl(
+      `${host}/autoads/${data.publisher}`,
+      data.json ? {'json': data.json} : {},
+      4096
+    );
+  }
+
+  /** @override */
+  filterConfig(config) {
+    return config;
   }
 
   /** @override */
   getAttributes() {
     const data = this.autoAmpAdsElement_.dataset;
-    return dict({
+    return {
       'type': 'doubleclick',
       'data-ad': 'premiumads',
-      'layout': data.layout || Layout.FIXED,
+      'json': data.json || '',
+      'layout': data.layout || Layout_Enum.FIXED,
       'style':
         data['style'] ||
-        'margin: 15px auto; position: relative !important; display: block !important;',
-    });
+        'margin: 0 auto; position: relative !important; display: block !important;',
+    };
   }
 
   /** @override */
diff --git a/extensions/amp-auto-ads/0.1/test/test-ad-strategy.js b/extensions/amp-auto-ads/0.1/test/test-ad-strategy.js
index 1965a920b4df..b1b0c5948493 100644
--- a/extensions/amp-auto-ads/0.1/test/test-ad-strategy.js
+++ b/extensions/amp-auto-ads/0.1/test/test-ad-strategy.js
@@ -1,3 +1,5 @@
+import {AmpAd} from 'extensions/amp-ad/0.1/amp-ad';
+
 import {AdStrategy} from '../ad-strategy';
 import {AdTracker} from '../ad-tracker';
 import {PlacementState, getPlacementsFromConfigObj} from '../placement';
@@ -33,6 +35,10 @@ describes.realWin(
       env.sandbox
         .stub(win.__AMP_BASE_CE_CLASS.prototype, 'whenBuilt')
         .callsFake(() => Promise.resolve());
+
+      // Stub actual amp-ad creation since we don't care about its behavior
+      // here, only that they are created.
+      env.sandbox.stub(AmpAd.prototype, 'buildCallback').resolves();
     });
 
     it('should call placeAd with correct parameters', () => {
diff --git a/extensions/amp-auto-ads/0.1/test/test-adsense-network-config.js b/extensions/amp-auto-ads/0.1/test/test-adsense-network-config.js
index 9d2010246637..d8a4b4772c9b 100644
--- a/extensions/amp-auto-ads/0.1/test/test-adsense-network-config.js
+++ b/extensions/amp-auto-ads/0.1/test/test-adsense-network-config.js
@@ -1,6 +1,7 @@
 import {Services} from '#service';
 
 import {getAdNetworkConfig} from '../ad-network-config';
+import {Attributes} from '../attributes';
 
 describes.realWin(
   'adsense-network-config',
@@ -49,6 +50,23 @@ describes.realWin(
         expect(adNetwork.isResponsiveEnabled()).to.equal(true);
       });
 
+      it('should force no-fill if adsbygoogle is set', () => {
+        const adNetwork = getAdNetworkConfig('adsense', ampAutoAdsElem);
+        env.win.adsbygoogle = {};
+        expect(
+          adNetwork.filterConfig({
+            [Attributes.STICKY_AD_ATTRIBUTES]: {
+              'data-google-id': '123',
+            },
+          })
+        ).to.deep.equal({
+          [Attributes.STICKY_AD_ATTRIBUTES]: {
+            'data-google-id': '123',
+            'data-no-fill': 'true',
+          },
+        });
+      });
+
       // TODO(bradfrizzell, #12476): Make this test work with sinon 4.0.
       it.skip("should truncate the URL if it's too long", () => {
         const adNetwork = getAdNetworkConfig('adsense', ampAutoAdsElem);
diff --git a/extensions/amp-auto-ads/0.1/test/test-amp-auto-ads.js b/extensions/amp-auto-ads/0.1/test/test-amp-auto-ads.js
index dc8d29b58b44..e5df54f37658 100644
--- a/extensions/amp-auto-ads/0.1/test/test-amp-auto-ads.js
+++ b/extensions/amp-auto-ads/0.1/test/test-amp-auto-ads.js
@@ -8,6 +8,8 @@ import {toggleExperiment} from '#experiments';
 
 import {Services} from '#service';
 
+import {sleep} from '#testing/helpers';
+
 import {BaseElement} from '../../../../src/base-element';
 
 class FakeA4A extends BaseElement {
@@ -390,17 +392,12 @@ describes.realWin(
     });
 
     describe('Anchor Ad', () => {
-      it('should not insert anchor ad if not opted in', () => {
-        return getAmpAutoAds().then(() => {
-          return new Promise((resolve) => {
-            setTimeout(() => {
-              expect(
-                env.win.document.getElementsByTagName('AMP-STICKY-AD')
-              ).to.have.lengthOf(0);
-              resolve();
-            }, 500);
-          });
-        });
+      it('should not insert anchor ad if not opted in', async () => {
+        await getAmpAutoAds();
+        await sleep(500);
+        expect(
+          env.win.document.getElementsByTagName('AMP-STICKY-AD')
+        ).to.have.lengthOf(0);
       });
 
       it('should insert three ads plus anchor ad', () => {
diff --git a/extensions/amp-auto-ads/0.1/test/test-anchor-ad-strategy.js b/extensions/amp-auto-ads/0.1/test/test-anchor-ad-strategy.js
index 9874579a651b..ce7941765652 100644
--- a/extensions/amp-auto-ads/0.1/test/test-anchor-ad-strategy.js
+++ b/extensions/amp-auto-ads/0.1/test/test-anchor-ad-strategy.js
@@ -3,6 +3,8 @@ import {waitForChild} from '#core/dom';
 
 import {Services} from '#service';
 
+import {sleep} from '#testing/helpers';
+
 import {AnchorAdStrategy} from '../anchor-ad-strategy';
 
 describes.realWin(
@@ -112,30 +114,23 @@ describes.realWin(
         return Promise.all([strategyPromise, expectPromise]);
       });
 
-      it('should not insert sticky ad if not opted in anchor ad', () => {
+      it('should not insert sticky ad if not opted in anchor ad', async () => {
         const anchorAdStrategy = new AnchorAdStrategy(
           env.ampdoc,
           attributes,
           configObj
         );
 
-        const strategyPromise = anchorAdStrategy.run().then((placed) => {
-          expect(placed).to.equal(false);
-        });
+        const placed = await anchorAdStrategy.run();
+        await expect(placed).to.equal(false);
 
-        const expectPromise = new Promise((resolve) => {
-          setTimeout(() => {
-            expect(
-              env.win.document.getElementsByTagName('AMP-STICKY-AD')
-            ).to.have.lengthOf(0);
-            resolve();
-          }, 500);
-        });
-
-        return Promise.all([strategyPromise, expectPromise]);
+        await sleep(500);
+        expect(
+          env.win.document.getElementsByTagName('AMP-STICKY-AD')
+        ).to.have.lengthOf(0);
       });
 
-      it('should not insert sticky ad if exists one', () => {
+      it('should not insert sticky ad if exists one', async () => {
         configObj['optInStatus'].push(2);
 
         const existingStickyAd =
@@ -148,20 +143,13 @@ describes.realWin(
           configObj
         );
 
-        const strategyPromise = anchorAdStrategy.run().then((placed) => {
-          expect(placed).to.equal(false);
-        });
-
-        const expectPromise = new Promise((resolve) => {
-          setTimeout(() => {
-            expect(
-              env.win.document.getElementsByTagName('AMP-STICKY-AD')
-            ).to.have.lengthOf(1);
-            resolve();
-          }, 500);
-        });
+        const placed = await anchorAdStrategy.run();
+        await expect(placed).to.equal(false);
 
-        return Promise.all([strategyPromise, expectPromise]);
+        await sleep(500);
+        expect(
+          env.win.document.getElementsByTagName('AMP-STICKY-AD')
+        ).to.have.lengthOf(1);
       });
     });
   }
diff --git a/extensions/amp-auto-ads/0.1/test/test-premiumads-network-config.js b/extensions/amp-auto-ads/0.1/test/test-premiumads-network-config.js
index e19012cd7450..eaeb8a5908a6 100644
--- a/extensions/amp-auto-ads/0.1/test/test-premiumads-network-config.js
+++ b/extensions/amp-auto-ads/0.1/test/test-premiumads-network-config.js
@@ -1,4 +1,4 @@
-import {Layout} from '#core/dom/layout';
+import {Layout_Enum} from '#core/dom/layout';
 
 import {Services} from '#service';
 
@@ -73,9 +73,10 @@ describes.realWin(
         expect(adNetwork.getAttributes()).to.deep.equal({
           'type': 'doubleclick',
           'data-ad': 'premiumads',
-          'layout': Layout.FIXED,
+          'json': '',
+          'layout': Layout_Enum.FIXED,
           'style':
-            'margin: 15px auto; position: relative !important; display: block !important;',
+            'margin: 0 auto; position: relative !important; display: block !important;',
         });
       });
 
diff --git a/extensions/amp-auto-ads/0.1/test/test-wunderkind-network-config.js b/extensions/amp-auto-ads/0.1/test/test-wunderkind-network-config.js
index 0fd3c3532826..029094d70877 100644
--- a/extensions/amp-auto-ads/0.1/test/test-wunderkind-network-config.js
+++ b/extensions/amp-auto-ads/0.1/test/test-wunderkind-network-config.js
@@ -64,8 +64,8 @@ describes.realWin(
           'type': 'wunderkind',
           'data-ad': 'wunderkind',
           'layout': 'responsive',
-          'height': '250',
-          'width': '250',
+          'height': '75vw',
+          'width': '100vw',
         });
       });
 
@@ -81,11 +81,8 @@ describes.realWin(
         const adNetwork = getAdNetworkConfig('wunderkind', ampAutoAdsElem);
         expect(adNetwork.getDefaultAdConstraints()).to.deep.equal({
           initialMinSpacing: 500,
-          subsequentMinSpacing: [
-            {adCount: 3, spacing: 1000},
-            {adCount: 6, spacing: 1500},
-          ],
-          maxAdCount: 8,
+          subsequentMinSpacing: [],
+          maxAdCount: 10,
         });
       });
 
diff --git a/extensions/amp-auto-ads/0.1/wunderkind-network-config.js b/extensions/amp-auto-ads/0.1/wunderkind-network-config.js
index 591cf907f71f..0d9d48c60a95 100644
--- a/extensions/amp-auto-ads/0.1/wunderkind-network-config.js
+++ b/extensions/amp-auto-ads/0.1/wunderkind-network-config.js
@@ -1,7 +1,5 @@
 import {buildUrl} from '#ads/google/a4a/shared/url-builder';
 
-import {dict} from '#core/types/object';
-
 import {Services} from '#service';
 
 /**
@@ -47,15 +45,20 @@ export class WunderkindNetworkConfig {
     );
   }
 
+  /** @override */
+  filterConfig(config) {
+    return config;
+  }
+
   /** @override */
   getAttributes() {
-    const attributes = dict({
+    const attributes = {
       'type': 'wunderkind',
       'data-ad': 'wunderkind',
       'layout': 'responsive',
-      'height': '250',
-      'width': '250',
-    });
+      'height': '75vw',
+      'width': '100vw',
+    };
     return attributes;
   }
 
@@ -66,11 +69,8 @@ export class WunderkindNetworkConfig {
     ).getSize().height;
     return {
       initialMinSpacing: viewportHeight,
-      subsequentMinSpacing: [
-        {adCount: 3, spacing: viewportHeight * 2},
-        {adCount: 6, spacing: viewportHeight * 3},
-      ],
-      maxAdCount: 8,
+      subsequentMinSpacing: [],
+      maxAdCount: 10,
     };
   }
 
diff --git a/extensions/amp-auto-lightbox/0.1/amp-auto-lightbox.js b/extensions/amp-auto-lightbox/0.1/amp-auto-lightbox.js
index b6a5dedbd4af..c83831019dfb 100644
--- a/extensions/amp-auto-lightbox/0.1/amp-auto-lightbox.js
+++ b/extensions/amp-auto-lightbox/0.1/amp-auto-lightbox.js
@@ -6,8 +6,8 @@
  * Instead, the runtime loads it when encountering an <amp-img>.
  */
 
-import {AmpEvents} from '#core/constants/amp-events';
-import {CommonSignals} from '#core/constants/common-signals';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
+import {CommonSignals_Enum} from '#core/constants/common-signals';
 import {dispatchCustomEvent} from '#core/dom';
 import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 import {measureIntersectionNoRoot} from '#core/dom/layout/intersection-no-root';
@@ -33,7 +33,7 @@ export const VISITED_ATTR = 'i-amphtml-auto-lightbox-visited';
 /**
  * Types of document by LD+JSON schema `@type` field where auto-lightbox should
  * be enabled.
- * @private @const {!Object<string|undefined, boolean>}
+ * @private @const {!{[key: string|undefined]: boolean}}
  */
 export const ENABLED_LD_JSON_TYPES = {
   'Article': true,
@@ -288,7 +288,7 @@ function whenLoaded(element) {
     return loadPromise(element);
   }
   return whenUpgradedToCustomElement(element).then((element) =>
-    element.signals().whenSignal(CommonSignals.LOAD_END)
+    element.signals().whenSignal(CommonSignals_Enum.LOAD_END)
   );
 }
 
@@ -442,7 +442,7 @@ export function runCandidates(ampdoc, candidates) {
         ({boundingClientRect}) => {
           if (
             candidate.tagName !== 'IMG' &&
-            !candidate.signals().get(CommonSignals.LOAD_END)
+            !candidate.signals().get(CommonSignals_Enum.LOAD_END)
           ) {
             // <amp-img> will change the img's src inline data on unlayout and
             // remove it from DOM.
@@ -479,7 +479,7 @@ export function scan(ampdoc, opt_root) {
 AMP.extension(TAG, '0.1', (AMP) => {
   const {ampdoc} = AMP;
   ampdoc.whenReady().then(() => {
-    ampdoc.getRootNode().addEventListener(AmpEvents.DOM_UPDATE, (e) => {
+    ampdoc.getRootNode().addEventListener(AmpEvents_Enum.DOM_UPDATE, (e) => {
       const {target} = e;
       scan(ampdoc, dev().assertElement(target));
     });
diff --git a/extensions/amp-auto-lightbox/0.1/test/test-amp-auto-lightbox.js b/extensions/amp-auto-lightbox/0.1/test/test-amp-auto-lightbox.js
index 8e3d75f3fb70..7b79fdce85ce 100644
--- a/extensions/amp-auto-lightbox/0.1/test/test-amp-auto-lightbox.js
+++ b/extensions/amp-auto-lightbox/0.1/test/test-amp-auto-lightbox.js
@@ -1,4 +1,6 @@
-import {CommonSignals} from '#core/constants/common-signals';
+import {Assertion} from 'chai';
+
+import {CommonSignals_Enum} from '#core/constants/common-signals';
 import {tryResolve} from '#core/data-structures/promise';
 import {Signals} from '#core/data-structures/signals';
 import {createElementWithAttributes} from '#core/dom';
@@ -94,9 +96,9 @@ describes.realWin(
       const signals = new Signals();
       element.signals = () => signals;
       if (isLoadedSuccessfully) {
-        signals.signal(CommonSignals.LOAD_END);
+        signals.signal(CommonSignals_Enum.LOAD_END);
       } else {
-        signals.rejectSignal(CommonSignals.LOAD_END, 'Mocked rejection');
+        signals.rejectSignal(CommonSignals_Enum.LOAD_END, 'Mocked rejection');
       }
       return element;
     }
@@ -293,13 +295,10 @@ describes.realWin(
       const areaDeltaPerc = RENDER_AREA_RATIO * 100;
       const {vh, vw} = {vw: 1000, vh: 600};
 
-      const expectMeetsSizingCriteria = (
-        renderWidth,
-        renderHeight,
-        naturalWidth,
-        naturalHeight
-      ) =>
-        expect(
+      Assertion.addProperty('meetSizingCriteria', function () {
+        const {naturalHeight, naturalWidth, renderHeight, renderWidth} =
+          this._obj;
+        this.assert(
           meetsSizingCriteria(
             renderWidth,
             renderHeight,
@@ -307,8 +306,12 @@ describes.realWin(
             naturalHeight,
             vw,
             vh
-          )
+          ),
+          'expected #{this} to meet sizing criteria for #{exp}',
+          'expected #{this} to not meet sizing criteria for #{exp}',
+          {vw, vh}
         );
+      });
 
       it(`accepts elements ${areaDeltaPerc}%+ of size than render area`, () => {
         const renderWidth = 1000;
@@ -321,12 +324,8 @@ describes.realWin(
 
         const axisRange = [minDim + 1, minDim + 10, minDim + 100];
         iterProduct(axisRange, axisRange, (naturalWidth, naturalHeight) => {
-          expectMeetsSizingCriteria(
-            renderWidth,
-            renderHeight,
-            naturalWidth,
-            naturalHeight
-          ).to.be.true;
+          expect({renderWidth, renderHeight, naturalWidth, naturalHeight}).to
+            .meetSizingCriteria;
         });
       });
 
@@ -341,12 +340,8 @@ describes.realWin(
 
         const axisRange = [minDim, minDim - 10, minDim - 100];
         iterProduct(axisRange, axisRange, (naturalWidth, naturalHeight) => {
-          expectMeetsSizingCriteria(
-            renderWidth,
-            renderHeight,
-            naturalWidth,
-            naturalHeight
-          ).to.be.false;
+          expect({renderWidth, renderHeight, naturalWidth, naturalHeight}).to
+            .not.meetSizingCriteria;
         });
       });
 
@@ -361,12 +356,8 @@ describes.realWin(
 
         const axisRange = [minDim, minDim + 10, minDim + 100];
         iterProduct(axisRange, axisRange, (renderWidth, renderHeight) => {
-          expectMeetsSizingCriteria(
-            renderWidth,
-            renderHeight,
-            naturalWidth,
-            naturalHeight
-          ).to.be.true;
+          expect({renderWidth, renderHeight, naturalWidth, naturalHeight}).to
+            .meetSizingCriteria;
         });
       });
 
@@ -376,12 +367,12 @@ describes.realWin(
 
         const axisRange = [minDim - 1, minDim - 10, minDim - 100];
         iterProduct(axisRange, axisRange, (renderWidth, renderHeight) => {
-          expectMeetsSizingCriteria(
+          expect({
             renderWidth,
             renderHeight,
-            /* naturalWidth */ renderWidth,
-            /* naturalHeight */ renderHeight
-          ).to.be.false;
+            naturalWidth: renderWidth,
+            naturalHeight: renderHeight,
+          }).to.not.meetSizingCriteria;
         });
       });
 
@@ -390,12 +381,12 @@ describes.realWin(
         const renderHeight = vh;
 
         [vh + 1, vh + 10, vh + 100].forEach((naturalHeight) => {
-          expectMeetsSizingCriteria(
+          expect({
             renderWidth,
             renderHeight,
-            /* naturalWidth */ renderWidth,
-            naturalHeight
-          ).to.be.true;
+            naturalWidth: renderWidth,
+            naturalHeight,
+          }).to.meetSizingCriteria;
         });
       });
 
@@ -404,12 +395,12 @@ describes.realWin(
         const renderHeight = vh;
 
         [vw + 1, vw + 10, vw + 100].forEach((naturalWidth) => {
-          expectMeetsSizingCriteria(
+          expect({
             renderWidth,
             renderHeight,
             naturalWidth,
-            /* naturalHeight */ renderHeight
-          ).to.be.true;
+            naturalHeight: renderHeight,
+          }).to.meetSizingCriteria;
         });
       });
 
@@ -419,12 +410,8 @@ describes.realWin(
 
         const axisRange = [renderWidth, renderWidth - 10, renderWidth - 100];
         iterProduct(axisRange, axisRange, (naturalWidth, naturalHeight) => {
-          expectMeetsSizingCriteria(
-            renderWidth,
-            renderHeight,
-            naturalWidth,
-            naturalHeight
-          ).to.be.false;
+          expect({renderWidth, renderHeight, naturalWidth, naturalHeight}).to
+            .not.meetSizingCriteria;
         });
       });
     });
@@ -549,14 +536,14 @@ describes.realWin(
         const signals = new Signals();
         img.signals = () => signals;
 
-        signals.signal(CommonSignals.LOAD_END);
+        signals.signal(CommonSignals_Enum.LOAD_END);
 
         const candidatePromise = Promise.all(runCandidates(env.ampdoc, [img]));
 
         // Skip microtask and reset LOAD_END to emulate unloading in the middle
         // of the candidate's measurement.
         await new Promise((resolve) => resolve());
-        signals.reset(CommonSignals.LOAD_END);
+        signals.reset(CommonSignals_Enum.LOAD_END);
 
         const elected = await candidatePromise;
         expect(elected[0]).to.be.undefined;
diff --git a/extensions/amp-autocomplete/0.1/amp-autocomplete.js b/extensions/amp-autocomplete/0.1/amp-autocomplete.js
index b0b969857bac..cffeb03e9d84 100644
--- a/extensions/amp-autocomplete/0.1/amp-autocomplete.js
+++ b/extensions/amp-autocomplete/0.1/amp-autocomplete.js
@@ -1,38 +1,35 @@
-import {ActionTrust} from '#core/constants/action-constants';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
+import {Keys_Enum} from '#core/constants/key-codes';
+import {removeChildren, tryFocus} from '#core/dom';
+import {Layout_Enum} from '#core/dom/layout';
+import {toggle} from '#core/dom/style';
+import {mod} from '#core/math';
+import {isArray, isEnumValue} from '#core/types';
+import {once} from '#core/types/function';
+import {getValueForExpr, hasOwn, map, ownProperty} from '#core/types/object';
+import {tryParseJson} from '#core/types/object/json';
+import {includes} from '#core/types/string';
+
+import {Services} from '#service';
+
+import {createCustomEvent} from '#utils/event-helper';
+import {dev, user, userAssert} from '#utils/log';
+import {setupAMPCors, setupInput, setupJsonFetchInit} from '#utils/xhr-utils';
+
+import fuzzysearch from '#third_party/fuzzysearch';
+
 import {AutocompleteBindingDef} from './autocomplete-binding-def';
 import {AutocompleteBindingInline} from './autocomplete-binding-inline';
 import {AutocompleteBindingSingle} from './autocomplete-binding-single';
+
 import {CSS} from '../../../build/amp-autocomplete-0.1.css';
-import {Keys} from '#core/constants/key-codes';
-import {Layout} from '#core/dom/layout';
-import {Services} from '#service';
-import {SsrTemplateHelper} from '../../../src/ssr-template-helper';
 import {
   UrlReplacementPolicy_Enum,
   batchFetchJsonFor,
   requestForBatchFetch,
 } from '../../../src/batched-json';
+import {SsrTemplateHelper} from '../../../src/ssr-template-helper';
 import {addParamToUrl} from '../../../src/url';
-import {createCustomEvent} from '#utils/event-helper';
-import {dev, user, userAssert} from '#utils/log';
-import {
-  dict,
-  getValueForExpr,
-  hasOwn,
-  map,
-  ownProperty,
-} from '#core/types/object';
-
-import {includes} from '#core/types/string';
-import {isArray, isEnumValue} from '#core/types';
-import {tryParseJson} from '#core/types/object/json';
-
-import {mod} from '#core/math';
-import {once} from '#core/types/function';
-import {removeChildren, tryFocus} from '#core/dom';
-import {setupAMPCors, setupInput, setupJsonFetchInit} from '#utils/xhr-utils';
-import {toggle} from '#core/dom/style';
-import fuzzysearch from '#third_party/fuzzysearch';
 
 /**
  * @typedef {{
@@ -40,7 +37,7 @@ import fuzzysearch from '#third_party/fuzzysearch';
  *   selectedText: ?string
  * }}
  */
-// eslint-disable-next-line no-unused-vars
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 let SelectionValues;
 
 const TAG = 'amp-autocomplete';
@@ -429,6 +426,7 @@ export class AmpAutocomplete extends AMP.BaseElement {
     if (this.isSsr_) {
       return requestForBatchFetch(
         this.element,
+        this.element.getAttribute('src'),
         policy,
         /* refresh */ false
       ).then((request) => {
@@ -440,12 +438,12 @@ export class AmpAutocomplete extends AMP.BaseElement {
         );
         setupJsonFetchInit(request.fetchOpt);
 
-        const attributes = dict({
+        const attributes = {
           'ampAutocompleteAttributes': {
             'items': itemsExpr,
             'maxItems': this.maxItems_,
           },
-        });
+        };
         return this.getSsrTemplateHelper().ssr(
           this.element,
           request,
@@ -899,7 +897,7 @@ export class AmpAutocomplete extends AMP.BaseElement {
    * Returns the given tokens array as a dictionary of key: token (str) and
    * value: number of occurrences.
    * @param {!Array<string>} tokens
-   * @return {!Object<string, number>}
+   * @return {!{[key: string]: number}}
    * @private
    */
   mapFromTokensArray_(tokens) {
@@ -1149,7 +1147,7 @@ export class AmpAutocomplete extends AMP.BaseElement {
       this.element,
       selectName,
       selectEvent,
-      ActionTrust.HIGH
+      ActionTrust_Enum.HIGH
     );
 
     // Ensure native change listeners are triggered
@@ -1295,7 +1293,7 @@ export class AmpAutocomplete extends AMP.BaseElement {
    */
   keyDownHandler_(event) {
     switch (event.key) {
-      case Keys.DOWN_ARROW:
+      case Keys_Enum.DOWN_ARROW:
         event.preventDefault();
         if (this.areResultsDisplayed_()) {
           // Disrupt loop around to display user input.
@@ -1309,7 +1307,7 @@ export class AmpAutocomplete extends AMP.BaseElement {
           this.autocomplete_(this.sourceData_, this.userInput_);
           this.toggleResults_(true);
         });
-      case Keys.UP_ARROW:
+      case Keys_Enum.UP_ARROW:
         event.preventDefault();
         // Disrupt loop around to display user input.
         if (this.activeIndex_ === 0) {
@@ -1317,7 +1315,7 @@ export class AmpAutocomplete extends AMP.BaseElement {
           return Promise.resolve();
         }
         return this.updateActiveItem_(-1);
-      case Keys.ENTER:
+      case Keys_Enum.ENTER:
         const shouldPreventDefault = this.binding_.shouldPreventDefaultOnEnter(
           !!this.activeElement_
         );
@@ -1336,7 +1334,7 @@ export class AmpAutocomplete extends AMP.BaseElement {
         return this.mutateElement(() => {
           this.toggleResults_(false);
         });
-      case Keys.ESCAPE:
+      case Keys_Enum.ESCAPE:
         // Select user's partial input and hide results.
         return this.mutateElement(() => {
           if (!this.fallbackDisplayed_) {
@@ -1345,7 +1343,7 @@ export class AmpAutocomplete extends AMP.BaseElement {
             this.toggleResults_(false);
           }
         });
-      case Keys.TAB:
+      case Keys_Enum.TAB:
         if (this.areResultsDisplayed_() && this.activeElement_) {
           event.preventDefault();
           const {selectedObject, selectedText} =
@@ -1355,7 +1353,7 @@ export class AmpAutocomplete extends AMP.BaseElement {
           });
         }
         return Promise.resolve();
-      case Keys.BACKSPACE:
+      case Keys_Enum.BACKSPACE:
         this.detectBackspace_ = this.shouldSuggestFirst_;
         return Promise.resolve();
       default:
@@ -1386,7 +1384,7 @@ export class AmpAutocomplete extends AMP.BaseElement {
 
   /** @override */
   isLayoutSupported(layout) {
-    return layout == Layout.CONTAINER;
+    return layout == Layout_Enum.CONTAINER;
   }
 }
 
diff --git a/extensions/amp-autocomplete/0.1/autocomplete-binding-inline.js b/extensions/amp-autocomplete/0.1/autocomplete-binding-inline.js
index 07d8f10b884e..c67cb597da5d 100644
--- a/extensions/amp-autocomplete/0.1/autocomplete-binding-inline.js
+++ b/extensions/amp-autocomplete/0.1/autocomplete-binding-inline.js
@@ -1,5 +1,6 @@
-import {ownProperty} from '#core/types/object';
 import {tryFocus} from '#core/dom';
+import {ownProperty} from '#core/types/object';
+
 import {userAssert} from '#utils/log';
 
 const TAG = 'amp-autocomplete';
diff --git a/extensions/amp-autocomplete/0.1/test/test-amp-autocomplete-bindings.js b/extensions/amp-autocomplete/0.1/test/test-amp-autocomplete-bindings.js
index 20260eb39f6c..338500efae4b 100644
--- a/extensions/amp-autocomplete/0.1/test/test-amp-autocomplete-bindings.js
+++ b/extensions/amp-autocomplete/0.1/test/test-amp-autocomplete-bindings.js
@@ -1,7 +1,8 @@
 import '../amp-autocomplete';
+import {createElementWithAttributes} from '#core/dom';
+
 import {AutocompleteBindingInline} from '../autocomplete-binding-inline';
 import {AutocompleteBindingSingle} from '../autocomplete-binding-single';
-import {createElementWithAttributes} from '#core/dom';
 
 describes.realWin(
   'amp-autocomplete bindings',
diff --git a/extensions/amp-autocomplete/0.1/test/test-amp-autocomplete-init.js b/extensions/amp-autocomplete/0.1/test/test-amp-autocomplete-init.js
index 387c36fbe10a..c3e3f188843e 100644
--- a/extensions/amp-autocomplete/0.1/test/test-amp-autocomplete-init.js
+++ b/extensions/amp-autocomplete/0.1/test/test-amp-autocomplete-init.js
@@ -187,9 +187,7 @@ describes.realWin(
       expect(impl.maxItems_).to.equal(10);
     });
     it('should error with invalid JSON script', () => {
-      expectAsyncConsoleError(
-        'Unexpected token o in JSON at position 32 [object HTMLElement]'
-      );
+      expectAsyncConsoleError(/Unexpected token/);
       return expect(
         getAutocomplete(
           {
@@ -197,7 +195,7 @@ describes.realWin(
           },
           '{ "items" : ["apple", "banana", orange] }'
         )
-      ).to.be.rejectedWith('Unexpected token o in JSON at position 32');
+      ).to.be.rejectedWith(/Unexpected token/);
     });
 
     it('should accept empty JSON script', async () => {
diff --git a/extensions/amp-autocomplete/0.1/test/test-amp-autocomplete.js b/extensions/amp-autocomplete/0.1/test/test-amp-autocomplete.js
index 5537495cde33..143e8775f7f1 100644
--- a/extensions/amp-autocomplete/0.1/test/test-amp-autocomplete.js
+++ b/extensions/amp-autocomplete/0.1/test/test-amp-autocomplete.js
@@ -1,9 +1,10 @@
 import '../amp-autocomplete';
-import {AmpAutocomplete} from '../amp-autocomplete';
-import {Keys} from '#core/constants/key-codes';
+import {Keys_Enum} from '#core/constants/key-codes';
 import {createElementWithAttributes} from '#core/dom';
 import {htmlFor} from '#core/dom/static-template';
 
+import {AmpAutocomplete} from '../amp-autocomplete';
+
 describes.realWin(
   'amp-autocomplete unit tests',
   {
@@ -616,7 +617,7 @@ describes.realWin(
     });
 
     describe('keyDownHandler_() on arrow keys', () => {
-      const event = {key: Keys.DOWN_ARROW, preventDefault: () => {}};
+      const event = {key: Keys_Enum.DOWN_ARROW, preventDefault: () => {}};
       let displayInputSpy, updateActiveSpy, eventPreventSpy;
 
       beforeEach(() => {
@@ -679,7 +680,7 @@ describes.realWin(
         return impl
           .layoutCallback()
           .then(() => {
-            event.key = Keys.UP_ARROW;
+            event.key = Keys_Enum.UP_ARROW;
             return impl.keyDownHandler_(event);
           })
           .then(() => {
@@ -693,7 +694,7 @@ describes.realWin(
         return impl
           .layoutCallback()
           .then(() => {
-            event.key = Keys.UP_ARROW;
+            event.key = Keys_Enum.UP_ARROW;
             impl.activeIndex_ = 0;
             return impl.keyDownHandler_(event);
           })
@@ -707,7 +708,7 @@ describes.realWin(
 
     describe('keyDownHandler_() on Enter', () => {
       const event = {
-        key: Keys.ENTER,
+        key: Keys_Enum.ENTER,
         preventDefault: () => {},
         target: {textContent: 'hello'},
       };
@@ -771,7 +772,7 @@ describes.realWin(
     });
 
     it('should call keyDownHandler_() on Esc', () => {
-      const event = {key: Keys.ESCAPE, preventDefault: () => {}};
+      const event = {key: Keys_Enum.ESCAPE, preventDefault: () => {}};
       const displayInputSpy = env.sandbox.spy(impl, 'displayUserInput_');
       const resetSpy = env.sandbox.spy(impl, 'resetActiveElement_');
       const toggleResultsSpy = env.sandbox.spy(impl, 'toggleResults_');
@@ -797,7 +798,7 @@ describes.realWin(
     });
 
     it('should call keyDownHandler_() on Tab', () => {
-      const event = {key: Keys.TAB, preventDefault: () => {}};
+      const event = {key: Keys_Enum.TAB, preventDefault: () => {}};
       const eventPreventSpy = env.sandbox.spy(event, 'preventDefault');
       impl.inputElement_.value = 'expected';
       impl.activeElement_ = doc.createElement('div');
@@ -817,7 +818,7 @@ describes.realWin(
     });
 
     describe('keyDownHandler_() on Backspace', () => {
-      const event = {key: Keys.BACKSPACE};
+      const event = {key: Keys_Enum.BACKSPACE};
 
       it('should set flag to true when suggest-first is present', () => {
         return impl
@@ -847,7 +848,7 @@ describes.realWin(
     });
 
     it('should call keyDownHandler_() and fallthrough on any other key', () => {
-      const event = {key: Keys.LEFT_ARROW};
+      const event = {key: Keys_Enum.LEFT_ARROW};
       return impl.layoutCallback().then(() => {
         return expect(impl.keyDownHandler_(event)).to.be.fulfilled;
       });
diff --git a/extensions/amp-base-carousel/0.1/amp-base-carousel.js b/extensions/amp-base-carousel/0.1/amp-base-carousel.js
index 87a3e92d6214..638c41300af9 100644
--- a/extensions/amp-base-carousel/0.1/amp-base-carousel.js
+++ b/extensions/amp-base-carousel/0.1/amp-base-carousel.js
@@ -1,29 +1,32 @@
-import {ActionSource} from './action-source';
-import {ActionTrust} from '#core/constants/action-constants';
-import {CSS} from '../../../build/amp-base-carousel-0.1.css';
-import {Carousel} from './carousel';
-import {CarouselEvents} from './carousel-events';
-import {ChildLayoutManager} from './child-layout-manager';
-import {Keys} from '#core/constants/key-codes';
-import {
-  ResponsiveAttributes,
-  getResponsiveAttributeValue,
-} from './responsive-attributes';
-import {Services} from '#service';
-import {createCustomEvent, getDetail} from '#utils/event-helper';
-import {dev, devAssert} from '#utils/log';
-import {dict} from '#core/types/object';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
+import {Keys_Enum} from '#core/constants/key-codes';
 import {
   dispatchCustomEvent,
   isRTL,
   iterateCursor,
   toggleAttribute,
 } from '#core/dom';
-import {htmlFor} from '#core/dom/static-template';
 import {isLayoutSizeDefined} from '#core/dom/layout';
 import {scopedQuerySelectorAll} from '#core/dom/query';
+import {htmlFor} from '#core/dom/static-template';
 import {toArray} from '#core/types/array';
 
+import {Services} from '#service';
+
+import {createCustomEvent, getDetail} from '#utils/event-helper';
+import {dev, devAssert} from '#utils/log';
+
+import {ActionSource} from './action-source';
+import {Carousel} from './carousel';
+import {CarouselEvents} from './carousel-events';
+import {ChildLayoutManager} from './child-layout-manager';
+import {
+  ResponsiveAttributes,
+  getResponsiveAttributeValue,
+} from './responsive-attributes';
+
+import {CSS} from '../../../build/amp-base-carousel-0.1.css';
+
 /**
  * @enum {number}
  */
@@ -41,8 +44,8 @@ function isSizer(el) {
   return el.tagName === 'I-AMPHTML-SIZER';
 }
 
-class AmpCarousel extends AMP.BaseElement {
-  /** @override @nocollapse */
+export class AmpCarousel extends AMP.BaseElement {
+  /** @override  */
   static prerenderAllowed() {
     return true;
   }
@@ -91,7 +94,7 @@ class AmpCarousel extends AMP.BaseElement {
 
   /**
    * The configuration for handling attributes on this element.
-   * @return {!Object<string, function(string)>}
+   * @return {!{[key: string]: function(string)}}
    * @private
    */
   getAttributeConfig_() {
@@ -361,12 +364,12 @@ class AmpCarousel extends AMP.BaseElement {
   }
 
   /**
-   * Gets the ActionSource to use for a given ActionTrust.
-   * @param {!ActionTrust} trust
+   * Gets the ActionSource to use for a given ActionTrust_Enum.
+   * @param {!ActionTrust_Enum} trust
    * @return {!ActionSource}
    */
   getActionSource_(trust) {
-    return trust >= ActionTrust.DEFAULT
+    return trust >= ActionTrust_Enum.DEFAULT
       ? ActionSource.GENERIC_HIGH_TRUST
       : ActionSource.GENERIC_LOW_TRUST;
   }
@@ -420,7 +423,7 @@ class AmpCarousel extends AMP.BaseElement {
         const {trust} = actionInvocation;
         this.carousel_.prev(this.getActionSource_(trust));
       },
-      ActionTrust.LOW
+      ActionTrust_Enum.LOW
     );
     this.registerAction(
       'next',
@@ -428,7 +431,7 @@ class AmpCarousel extends AMP.BaseElement {
         const {trust} = actionInvocation;
         this.carousel_.next(this.getActionSource_(trust));
       },
-      ActionTrust.LOW
+      ActionTrust_Enum.LOW
     );
     this.registerAction(
       'goToSlide',
@@ -438,7 +441,7 @@ class AmpCarousel extends AMP.BaseElement {
           actionSource: this.getActionSource_(trust),
         });
       },
-      ActionTrust.LOW
+      ActionTrust_Enum.LOW
     );
   }
 
@@ -571,8 +574,8 @@ class AmpCarousel extends AMP.BaseElement {
    * @param {!Event} event
    */
   onKeydown_(event) {
-    const isRight = event.key === Keys.RIGHT_ARROW;
-    const isLeft = event.key === Keys.LEFT_ARROW;
+    const isRight = event.key === Keys_Enum.RIGHT_ARROW;
+    const isLeft = event.key === Keys_Enum.LEFT_ARROW;
 
     if (!isRight && !isLeft) {
       return;
@@ -620,10 +623,10 @@ class AmpCarousel extends AMP.BaseElement {
     const detail = getDetail(event);
     const index = detail['index'];
     const actionSource = detail['actionSource'];
-    const data = dict({'index': index});
+    const data = {'index': index};
     const name = 'slideChange';
     const isHighTrust = this.isHighTrustActionSource_(actionSource);
-    const trust = isHighTrust ? ActionTrust.HIGH : ActionTrust.LOW;
+    const trust = isHighTrust ? ActionTrust_Enum.HIGH : ActionTrust_Enum.LOW;
 
     const action = createCustomEvent(this.win, `slidescroll.${name}`, data);
     this.action_.trigger(this.element, name, action, trust);
@@ -640,6 +643,21 @@ class AmpCarousel extends AMP.BaseElement {
   attributeMutated_(name, newValue) {
     this.responsiveAttributes_.updateAttribute(name, newValue);
   }
+
+  /**
+   * Used by amp-lightbox-gallery
+   *
+   * Does all the work needed to proceed to next
+   * desired direction.
+   * @param {number} dir -1 or 1
+   */
+  goCallback(dir) {
+    if (dir === 1) {
+      this.interactionNext();
+    } else {
+      this.interactionPrev();
+    }
+  }
 }
 
 AMP.extension('amp-base-carousel', '0.1', (AMP) => {
diff --git a/extensions/amp-base-carousel/0.1/auto-advance.js b/extensions/amp-base-carousel/0.1/auto-advance.js
index a1c7f8645f1e..029d673e9b12 100644
--- a/extensions/amp-base-carousel/0.1/auto-advance.js
+++ b/extensions/amp-base-carousel/0.1/auto-advance.js
@@ -1,8 +1,10 @@
-import {ActionSource} from './action-source';
-import {CarouselEvents} from './carousel-events';
 import {debounce} from '#core/types/function';
+
 import {getDetail, listen, listenOnce} from '#utils/event-helper';
 
+import {ActionSource} from './action-source';
+import {CarouselEvents} from './carousel-events';
+
 const MIN_AUTO_ADVANCE_INTERVAL = 1000;
 
 /**
diff --git a/extensions/amp-base-carousel/0.1/carousel-accessibility.js b/extensions/amp-base-carousel/0.1/carousel-accessibility.js
index 9372a25b3b6c..b07f9fc401f3 100644
--- a/extensions/amp-base-carousel/0.1/carousel-accessibility.js
+++ b/extensions/amp-base-carousel/0.1/carousel-accessibility.js
@@ -1,6 +1,7 @@
-import {CarouselEvents} from './carousel-events';
 import {getDetail} from '#utils/event-helper';
 
+import {CarouselEvents} from './carousel-events';
+
 /**
  * @typedef {{
  *   stop: function(),
diff --git a/extensions/amp-base-carousel/0.1/carousel.js b/extensions/amp-base-carousel/0.1/carousel.js
index 568f66edc620..9847d4f9de96 100644
--- a/extensions/amp-base-carousel/0.1/carousel.js
+++ b/extensions/amp-base-carousel/0.1/carousel.js
@@ -1,4 +1,21 @@
+import {iterateCursor} from '#core/dom';
+import {
+  getStyle,
+  setImportantStyles,
+  setStyle,
+  setStyles,
+} from '#core/dom/style';
+import {clamp, mod} from '#core/math';
+import {debounce} from '#core/types/function';
+
+import {createCustomEvent, listen, listenOnce} from '#utils/event-helper';
+import {dev} from '#utils/log';
+
 import {ActionSource} from './action-source';
+import {backwardWrappingDistance, forwardWrappingDistance} from './array-util';
+import {AutoAdvance} from './auto-advance';
+import {CarouselAccessibility} from './carousel-accessibility';
+import {CarouselEvents} from './carousel-events';
 import {
   Alignment,
   Axis,
@@ -10,22 +27,6 @@ import {
   updateLengthStyle,
   updateScrollPosition,
 } from './dimensions';
-import {AutoAdvance} from './auto-advance';
-import {CarouselAccessibility} from './carousel-accessibility';
-import {CarouselEvents} from './carousel-events';
-import {backwardWrappingDistance, forwardWrappingDistance} from './array-util';
-import {clamp, mod} from '#core/math';
-import {createCustomEvent, listen, listenOnce} from '#utils/event-helper';
-import {debounce} from '#core/types/function';
-import {dev} from '#utils/log';
-import {dict} from '#core/types/object';
-import {
-  getStyle,
-  setImportantStyles,
-  setStyle,
-  setStyles,
-} from '#core/dom/style';
-import {iterateCursor} from '#core/dom';
 
 /**
  * How long to wait prior to resetting the scrolling position after the last
@@ -237,7 +238,7 @@ export class Carousel {
     this.requestedIndex_ = null;
 
     /**
-     * The reference index where the the scrollable area last stopped
+     * The reference index where the scrollable area last stopped
      * scrolling. This slide is not translated and other slides are translated
      * to move before or after as needed. This is also used when looping to
      * prevent a single swipe from wrapping past the starting point.
@@ -364,7 +365,7 @@ export class Carousel {
    * slide at a time. If you are on slide 'c', advancing will move back to 'a'
    * instead of moving to 'd', which would cause no scrolling since 'd' is
    * already visible and cannot start align itself.
-   * 2. The delta would go past the start or the end and the the current index
+   * 2. The delta would go past the start or the end and the current index
    * is not at the start or end, then the advancement is capped to the start
    * or end respectively.
    * 3. The delta would go past the start or the end and the current index is
@@ -709,12 +710,12 @@ export class Carousel {
       createCustomEvent(
         this.win_,
         CarouselEvents.INDEX_CHANGE,
-        dict({
+        {
           'index': restingIndex,
           'total': this.slides_.length,
           'actionSource': actionSource,
           'slides': this.slides_,
-        }),
+        },
         {
           bubbles: true,
         }
@@ -735,12 +736,12 @@ export class Carousel {
       createCustomEvent(
         this.win_,
         CarouselEvents.OFFSET_CHANGE,
-        dict({
+        {
           'index': index,
           'total': this.slides_.length,
           'offset': this.forwards_ ? -offset : offset,
           'slides': this.slides_,
-        }),
+        },
         {
           bubbles: true,
         }
@@ -806,7 +807,7 @@ export class Carousel {
   }
 
   /**
-   * Handles a scroll event, updating the the current index as well as moving
+   * Handles a scroll event, updating the current index as well as moving
    * slides around as needed.
    * @private
    */
diff --git a/extensions/amp-base-carousel/0.1/dimensions.js b/extensions/amp-base-carousel/0.1/dimensions.js
index 0c28ccdd4961..697713eb9ecc 100644
--- a/extensions/amp-base-carousel/0.1/dimensions.js
+++ b/extensions/amp-base-carousel/0.1/dimensions.js
@@ -1,5 +1,5 @@
-import {mod} from '#core/math';
 import {setImportantStyles, setStyle} from '#core/dom/style';
+import {mod} from '#core/math';
 
 /**
  * @enum {number}
diff --git a/extensions/amp-base-carousel/0.1/responsive-attributes.js b/extensions/amp-base-carousel/0.1/responsive-attributes.js
index 681a1ad85a5f..5e5e33877464 100644
--- a/extensions/amp-base-carousel/0.1/responsive-attributes.js
+++ b/extensions/amp-base-carousel/0.1/responsive-attributes.js
@@ -84,17 +84,17 @@ export function getResponsiveAttributeValue(str) {
  */
 export class ResponsiveAttributes {
   /**
-   * @param {!Object<string, function(string)>} config A mapping of attribute
+   * @param {!{[key: string]: function(string)}} config A mapping of attribute
    *    names to functions that should handle them.
    */
   constructor(config) {
     /** @private @const */
     this.config_ = config;
 
-    /** @private @const {!Object<string, string>} */
+    /** @private @const {!{[key: string]: string}} */
     this.existingValuesMap_ = {};
 
-    /** @private @const {!Object<string, !Array<!MediaQueriesListAndValueDef>>} */
+    /** @private @const {!{[key: string]: !Array<!MediaQueriesListAndValueDef>}} */
     this.mediaQueryListsAndValues_ = {};
   }
 
diff --git a/extensions/amp-base-carousel/0.1/test-e2e/test-advance.js b/extensions/amp-base-carousel/0.1/test-e2e/test-advance.js
index 88238f343e9a..21d6351709fc 100644
--- a/extensions/amp-base-carousel/0.1/test-e2e/test-advance.js
+++ b/extensions/amp-base-carousel/0.1/test-e2e/test-advance.js
@@ -1,6 +1,7 @@
-import {getNextArrow, getPrevArrow, getSlides} from './helpers';
 import {sleep} from '#testing/helpers';
 
+import {getNextArrow, getPrevArrow, getSlides} from './helpers';
+
 const pageWidth = 500;
 const pageHeight = 800;
 
diff --git a/extensions/amp-base-carousel/0.1/test-e2e/test-arrows-non-looping.js b/extensions/amp-base-carousel/0.1/test-e2e/test-arrows-non-looping.js
index 1e30efe0d6bc..12ec711ea954 100644
--- a/extensions/amp-base-carousel/0.1/test-e2e/test-arrows-non-looping.js
+++ b/extensions/amp-base-carousel/0.1/test-e2e/test-arrows-non-looping.js
@@ -31,18 +31,21 @@ describes.endtoend(
       nextArrow = await getNextArrow(controller);
     });
 
-    it('should have the arrows in the correct initial state', async () => {
+    // TODO(#40214): fix flaky test.
+    it.skip('should have the arrows in the correct initial state', async () => {
       await expect(css(prevArrow, 'opacity')).to.equal('0');
       await expect(css(nextArrow, 'opacity')).to.equal('1');
     });
 
-    it('should show the prev arrow when going to the first slide', async () => {
+    // TODO(#40214): fix flaky test.
+    it.skip('should show the prev arrow when going to the first slide', async () => {
       await controller.click(nextArrow);
       await expect(css(prevArrow, 'opacity')).to.equal('1');
       await expect(css(nextArrow, 'opacity')).to.equal('1');
     });
 
-    it('should hide the next arrow when going to the end', async () => {
+    // TODO(#40214): fix flaky test.
+    it.skip('should hide the next arrow when going to the end', async () => {
       const el = await getScrollingElement(controller);
       await controller.scrollTo(el, {left: (SLIDE_COUNT - 1) * pageWidth});
 
diff --git a/extensions/amp-base-carousel/0.1/test-e2e/test-carousel.js b/extensions/amp-base-carousel/0.1/test-e2e/test-carousel.js
index e977f00c2e0c..6a5136cbd72e 100644
--- a/extensions/amp-base-carousel/0.1/test-e2e/test-carousel.js
+++ b/extensions/amp-base-carousel/0.1/test-e2e/test-carousel.js
@@ -1,10 +1,17 @@
-import {getScrollingElement, getSlide, waitForCarouselImg} from './helpers';
+import {sleep} from '#testing/helpers';
+
+import {
+  getScrollingElement,
+  getSlide,
+  getSlides,
+  waitForCarouselImg,
+} from './helpers';
 
 const pageWidth = 800;
 const pageHeight = 600;
 
-/** Increase timeout for running on macOS **/
-const testTimeout = 20000;
+/** Increased timeout for long-running tests. **/
+const testTimeout = 8_000;
 
 describes.endtoend(
   'amp-base-carousel - basic functionality',
@@ -25,94 +32,107 @@ describes.endtoend(
     const SLIDE_COUNT = 7;
     let controller;
 
-    function prop(el, name) {
-      return controller.getElementProperty(el, name);
-    }
-
     beforeEach(async function () {
       controller = env.controller;
     });
 
-    it.skip('should render correctly', async function () {
-      this.timeout(testTimeout);
-      const el = await getScrollingElement(controller);
+    it('should render correctly', async function () {
+      const slides = await getSlides(controller);
+      const slidesRects = await Promise.all(
+        slides.map(async (slide) => await controller.getElementRect(slide))
+      );
 
-      // We should have space for SLIDE_COUNT - 1 on either side + 1 for the
-      // current slide.
-      await expect(prop(el, 'scrollWidth')).to.equal(
-        pageWidth * (2 * (SLIDE_COUNT - 1) + 1)
+      // Slides are placed on both the left and the right of the 0th slide, so
+      // that scrolling on either direction work for the looping carousel. This
+      // verifies that all slides are positioned side-by-side with the total
+      // expected width.
+      const slidesLeftmost = Math.min(...slidesRects.map(({left}) => left));
+      const slidesRightmost = Math.max(...slidesRects.map(({right}) => right));
+      await expect(slidesRightmost - slidesLeftmost).to.equal(
+        pageWidth * SLIDE_COUNT
       );
+
+      // Verify that the 0th slide is layed out and is at the start, and that its
+      // width is equal to the page.
       await waitForCarouselImg(controller, 0);
+      await expect(slidesRects[0].left).to.equal(0);
+      await expect(slidesRects[0].width).to.equal(pageWidth);
     });
 
     it('should layout the two adjacent slides', async function () {
-      this.timeout(testTimeout);
-      // TODO(sparhami) Verify this is on the right of the 0th slide
+      const [firstSlideRect, secondSlideRect, lastSlideRect] = [
+        await controller.getElementRect(await getSlide(controller, 0)),
+        await controller.getElementRect(await getSlide(controller, 1)),
+        await controller.getElementRect(
+          await getSlide(controller, SLIDE_COUNT - 1)
+        ),
+      ];
+
+      // Verify that the second slide is layed out and is to the right of the
+      // starting slide.
       await waitForCarouselImg(controller, 1);
-      // TODO(sparhami) Verify this is on the left of the 0th slide
+      await expect(secondSlideRect.left).to.equal(firstSlideRect.right);
+
+      // Verify that the last slide is layed out and is to the left of the
+      // starting slide.
       await waitForCarouselImg(controller, SLIDE_COUNT - 1);
+      await expect(lastSlideRect.right).to.equal(firstSlideRect.left);
     });
 
     it('should snap when scrolling', async function () {
-      this.timeout(testTimeout);
       const el = await getScrollingElement(controller);
-      const firstSlide = await getSlide(controller, 0);
+      const secondSlide = await getSlide(controller, 1);
 
       // Wait for the first two slides's imgs to load.
       await waitForCarouselImg(controller, 0);
       await waitForCarouselImg(controller, 1);
 
-      const slideWidth = await prop(firstSlide, 'offsetWidth');
-      const scrollLeft = await prop(el, 'scrollLeft');
-      const snappedScrollLeft = scrollLeft + slideWidth;
-      const requestedScrollLeft = snappedScrollLeft + 1;
+      await expect(controller.getElementRect(secondSlide)).to.contain({
+        left: pageWidth,
+      });
 
-      await controller.scrollTo(el, {left: requestedScrollLeft});
+      await controller.scrollBy(el, {left: 1});
       // We should have snapped to the edge of the slide rather than the
       // requested scroll position.
-      await expect(prop(el, 'scrollLeft')).to.equal(snappedScrollLeft);
+      await expect(controller.getElementRect(secondSlide)).to.contain({
+        left: 0,
+      });
     });
 
     it('should reset the window after scroll', async function () {
-      this.timeout(testTimeout);
       const el = await getScrollingElement(controller);
-      const firstSlide = await getSlide(controller, 0);
+      const slides = await getSlides(controller);
+      const slidesRects = await Promise.all(
+        slides.map(async (slide) => await controller.getElementRect(slide))
+      );
 
       // Wait for the first two slides's imgs to load.
       await waitForCarouselImg(controller, 0);
       await waitForCarouselImg(controller, 1);
 
-      const slideWidth = await prop(firstSlide, 'offsetWidth');
-      const scrollWidth = await prop(el, 'scrollWidth');
-      const scrollLeft = await prop(el, 'scrollLeft');
-      const snappedScrollLeft = scrollLeft + slideWidth;
-      const requestedScrollLeft = snappedScrollLeft + 1;
-
-      await controller.scrollTo(el, {left: requestedScrollLeft});
-      // Wait for the scrolling to settle
-      await expect(prop(el, 'scrollLeft')).to.equal(snappedScrollLeft);
-      // The new scroll width/left should eventually be the same as before,
-      // since the windowing should have been reset around the new element.
-      await expect(prop(el, 'scrollWidth')).to.equal(scrollWidth);
-      await expect(prop(el, 'scrollLeft')).to.equal(scrollLeft);
+      await controller.scrollBy(el, {left: 1});
+      // See `should render correctly`. Results here should be the same after
+      // the scroll settles.
+      const slidesLeftmost = Math.min(...slidesRects.map(({left}) => left));
+      const slidesRightmost = Math.max(...slidesRects.map(({right}) => right));
+      await expect(slidesRightmost - slidesLeftmost).to.equal(
+        pageWidth * SLIDE_COUNT
+      );
     });
 
-    // TODO(wg-components, #27701): Flaky on Chrome+viewer environment.
-    it.skip('should have the correct scroll position when resizing', async function () {
-      this.timeout(testTimeout);
+    it('should have the correct scroll position when resizing', async function () {
+      const firstSlide = await getSlide(controller, 0);
       // Note: 513 seems to be the smallest settable width.
       await controller.setWindowRect({
         width: 800,
         height: 600,
       });
 
-      const firstSlide = await getSlide(controller, 0);
-
       // Wait for the first two slides's imgs to load.
       await waitForCarouselImg(controller, 0);
       await waitForCarouselImg(controller, 1);
       await expect(controller.getElementRect(firstSlide)).to.include({
-        'x': 0,
+        'left': 0,
         'width': 800,
       });
 
@@ -123,14 +143,15 @@ describes.endtoend(
 
       // Normally, resizing would cause the position to change. We're testing
       // that the carousel moves this to the correct position again.
+      // TODO(wg-components, #27701): Flaky on Chrome+viewer environment.
+      // Commented-out the comparison to `'left': 0` until fixed.
       await expect(controller.getElementRect(firstSlide)).to.include({
-        'x': 0,
+        /* 'left': 0, */
         'width': 900,
       });
     });
 
-    it.skip('should go to slide 0 when index is set to 0 ', async function () {
-      this.timeout(testTimeout);
+    it('should go to slide 0 when index is set to 0', async function () {
       const el = await getScrollingElement(controller);
 
       const firstSlide = await getSlide(controller, 0);
@@ -142,16 +163,20 @@ describes.endtoend(
       await waitForCarouselImg(controller, 0);
       await waitForCarouselImg(controller, 1);
 
-      await controller.scrollTo(el, {left: 1});
-      await expect(controller.getElementRect(secondSlide)).to.include({x: 0});
+      await controller.scrollBy(el, {left: 1});
+      await expect(controller.getElementRect(secondSlide)).to.include({
+        left: 0,
+      });
 
+      // Arbitrary wait because of an interaction conflict between the scroll
+      // action and click action.
+      await sleep(100);
       await controller.click(goToSlideBtn);
-      await expect(controller.getElementRect(firstSlide)).to.include({x: 0});
+      await expect(controller.getElementRect(firstSlide)).to.include({left: 0});
     });
 
     describe('looping', function () {
       it('should show the last slide when looping', async function () {
-        this.timeout(testTimeout);
         const el = await getScrollingElement(controller);
         const lastSlide = await getSlide(controller, SLIDE_COUNT - 1);
 
@@ -160,18 +185,15 @@ describes.endtoend(
         await waitForCarouselImg(controller, SLIDE_COUNT - 1);
 
         // Scroll to the previous slide by moving left by the last slide's width.
-        const slideWidth = await prop(lastSlide, 'offsetWidth');
-        const restingScrollLeft = await prop(el, 'scrollLeft');
-        const snappedScrollLeft = restingScrollLeft - slideWidth;
-        const requestedScrollLeft = snappedScrollLeft - 1;
-        await controller.scrollTo(el, {left: requestedScrollLeft});
-
-        await expect(prop(el, 'scrollLeft')).to.equal(snappedScrollLeft);
+        await controller.scrollBy(el, {left: -1});
+        await expect(controller.getElementRect(lastSlide)).to.include({
+          left: 0,
+        });
       });
 
       it('should show the first slide when looping', async function () {
-        this.timeout(testTimeout);
         const el = await getScrollingElement(controller);
+        const firstSlide = await getSlide(controller, 0);
         const lastSlide = await getSlide(controller, SLIDE_COUNT - 1);
 
         // Wait for the first and last slides to load.
@@ -179,72 +201,56 @@ describes.endtoend(
         await waitForCarouselImg(controller, SLIDE_COUNT - 1);
 
         // Go to the last slide, wait for scrolling to move and window to reset.
-        const slideWidth = await prop(lastSlide, 'offsetWidth');
-        const restingScrollLeft = await prop(el, 'scrollLeft');
-        const lastSlideScrollPos = restingScrollLeft - slideWidth;
-        await controller.scrollTo(el, {left: lastSlideScrollPos});
-        await expect(prop(el, 'scrollLeft')).to.equal(lastSlideScrollPos);
-        await expect(prop(el, 'scrollLeft')).to.equal(restingScrollLeft);
-
-        // Go to the next slide by moving the slides width to the right.
-        const snappedScrollLeft = restingScrollLeft + slideWidth;
-        const requestedScrollLeft = snappedScrollLeft + 1;
-        await controller.scrollTo(el, {left: requestedScrollLeft});
-
-        await expect(prop(el, 'scrollLeft')).to.equal(snappedScrollLeft);
+        await controller.scrollBy(el, {left: -1});
+        await expect(controller.getElementRect(lastSlide)).to.include({
+          left: 0,
+        });
+
+        // Go to the next slide.
+        await controller.scrollBy(el, {left: 1});
+        await expect(controller.getElementRect(firstSlide)).to.include({
+          left: 0,
+        });
       });
 
       // When resting the last few slides should be translated to the left.
       // Make sure we can move all the way forwards to the last slide and that it
       // is in the right place.
-      it('should display slides correctly when moving forwards', async function () {
+      // TODO(wg-components, #27701): Flaky on Chrome+viewer environment.
+      it.skip('should display slides correctly when moving forwards', async function () {
         this.timeout(testTimeout);
         const el = await getScrollingElement(controller);
-        const lastSlide = await getSlide(controller, SLIDE_COUNT - 1);
+        const slides = await getSlides(controller);
 
         // Wait for the first and last slides to load.
         await waitForCarouselImg(controller, 0);
         await waitForCarouselImg(controller, SLIDE_COUNT - 1);
 
-        // Go to the last slide, wait for scrolling to move.
-        const slideWidth = await prop(lastSlide, 'offsetWidth');
-        const restingScrollLeft = await prop(el, 'scrollLeft');
-        await controller.scrollTo(el, {
-          left: slideWidth * (SLIDE_COUNT - 2),
-        });
-
-        await expect(prop(el, 'scrollLeft')).to.equal(restingScrollLeft);
-        await expect(controller.getElementRect(lastSlide)).to.include({
-          x: 0,
-          width: slideWidth,
-        });
+        // Loop through all the slides, wait for each of them to land in place.
+        for (const slide of slides) {
+          await controller.scrollBy(el, {left: 1});
+          await expect(controller.getElementRect(slide)).to.include({left: 0});
+        }
       });
 
       // When resting the first few slides should be translated to the right.
       // Make sure we can move all the way backwards to the second slide and that
       // it is in the right place.
-      it('should display slides correctly when moving backwards', async function () {
+      // TODO(wg-components, #27701): Flaky on Chrome+viewer environment.
+      it.skip('should display slides correctly when moving backwards', async function () {
         this.timeout(testTimeout);
         const el = await getScrollingElement(controller);
-        const secondSlide = await getSlide(controller, 1);
+        const slides = await getSlides(controller);
 
         // Wait for the first and second slides to load.
         await waitForCarouselImg(controller, 0);
         await waitForCarouselImg(controller, 1);
 
-        // Go to the last slide, wait for scrolling to move.
-        const slideWidth = await prop(secondSlide, 'offsetWidth');
-        const restingScrollLeft = await prop(el, 'scrollLeft');
-        await controller.scrollTo(el, {
-          left: -(slideWidth * (SLIDE_COUNT - 2)),
-        });
-
-        await expect(prop(el, 'scrollLeft')).to.not.equal(restingScrollLeft);
-        await expect(prop(el, 'scrollLeft')).to.equal(restingScrollLeft);
-        await expect(controller.getElementRect(secondSlide)).to.include({
-          x: 0,
-          width: slideWidth,
-        });
+        // Loop through all the in reverse, wait for each of them to land in place.
+        for (const slide of [...slides].reverse()) {
+          await controller.scrollBy(el, {left: -1});
+          await expect(controller.getElementRect(slide)).to.include({left: 0});
+        }
       });
     });
   }
diff --git a/extensions/amp-base-carousel/0.1/test-e2e/test-multi-visible-single-advance.js b/extensions/amp-base-carousel/0.1/test-e2e/test-multi-visible-single-advance.js
index 600d41fe45a8..396a3e2cdea8 100644
--- a/extensions/amp-base-carousel/0.1/test-e2e/test-multi-visible-single-advance.js
+++ b/extensions/amp-base-carousel/0.1/test-e2e/test-multi-visible-single-advance.js
@@ -1,6 +1,7 @@
-import {getNextArrow, getPrevArrow, getSlides} from './helpers';
 import {awaitFrameAfter} from '#testing/helpers';
 
+import {getNextArrow, getPrevArrow, getSlides} from './helpers';
+
 describes.endtoend(
   'amp-base-carousel - advancing with multiple visible slides',
   {
diff --git a/extensions/amp-base-carousel/0.1/test-e2e/test-vertical.js b/extensions/amp-base-carousel/0.1/test-e2e/test-vertical.js
index 8ddfb119d503..a1fcc654a2bf 100644
--- a/extensions/amp-base-carousel/0.1/test-e2e/test-vertical.js
+++ b/extensions/amp-base-carousel/0.1/test-e2e/test-vertical.js
@@ -38,8 +38,7 @@ describes.endtoend(
       await waitForCarouselImg(controller, 0);
     });
 
-    // TODO(sparhami): unskip
-    it.skip('should layout the two adjacent slides', async () => {
+    it('should layout the two adjacent slides', async () => {
       // TODO(sparhami) Verify this is on the right of the 0th slide
       await waitForCarouselImg(controller, 1);
       // TODO(sparhami) Verify this is on the left of the 0th slide
diff --git a/extensions/amp-base-carousel/0.1/test/test-carousel.js b/extensions/amp-base-carousel/0.1/test/test-carousel.js
index a66474f1b606..eca39700bdcc 100644
--- a/extensions/amp-base-carousel/0.1/test/test-carousel.js
+++ b/extensions/amp-base-carousel/0.1/test/test-carousel.js
@@ -2,11 +2,13 @@
  * @fileoverview Some unit tests of the internal carousel implementation.
  */
 
-import {Carousel} from '../carousel';
-import {dev} from '#utils/log';
 import {setInitialDisplay, setStyle, setStyles} from '#core/dom/style';
 import {toArray} from '#core/types/array';
 
+import {dev} from '#utils/log';
+
+import {Carousel} from '../carousel';
+
 describes.realWin('carousel implementation', {}, (env) => {
   let win;
   let doc;
diff --git a/extensions/amp-base-carousel/0.1/test/test-child-layout-manager.js b/extensions/amp-base-carousel/0.1/test/test-child-layout-manager.js
index 60a0eddf8430..5f058d638438 100644
--- a/extensions/amp-base-carousel/0.1/test/test-child-layout-manager.js
+++ b/extensions/amp-base-carousel/0.1/test/test-child-layout-manager.js
@@ -1,17 +1,22 @@
-import {ChildLayoutManager} from '../child-layout-manager';
-import {Services} from '#service';
 import {setInitialDisplay, setStyles} from '#core/dom/style';
 
+import {Services} from '#service';
+
+import {macroTask} from '#testing/helpers';
+
+import {ChildLayoutManager} from '../child-layout-manager';
+
 /**
  * @return {!Promise<undefined>} A Promise that resolves after the browser has
  *    rendered.
  */
-function afterRenderPromise() {
-  return new Promise((resolve) => {
+async function afterRenderPromise() {
+  await new Promise((resolve) => {
     requestAnimationFrame(() => {
       setTimeout(resolve);
     });
   });
+  return macroTask();
 }
 
 /**
diff --git a/extensions/amp-base-carousel/1.0/README.md b/extensions/amp-base-carousel/1.0/README.md
index b9344283197c..c4e1cdbe77a8 100644
--- a/extensions/amp-base-carousel/1.0/README.md
+++ b/extensions/amp-base-carousel/1.0/README.md
@@ -1,20 +1,12 @@
 # Bento Carousel
 
-A generic carousel for displaying multiple similar pieces of content along a horizontal or vertical axis.
-
-Each of the component’s immediate children is considered an item in the carousel. Each of these nodes may also have arbitrary children.
-
-The carousel consists of an arbitrary number of items, as well as optional navigational arrows to go forward or backwards a single item.
-
-The carousel advances between items if the user swipes or uses the customizable arrow buttons.
+A generic carousel for displaying multiple similar pieces of content along a horizontal or vertical axis. Each of the component’s immediate children is considered an item in the carousel. Each of these nodes may also have arbitrary children. The carousel consists of an arbitrary number of items, as well as optional navigational arrows to go forward or backwards a single item. The carousel advances between items if the user swipes or uses the customizable arrow buttons.
 
 ## Web Component
 
 You must include each Bento component's required CSS library to guarantee proper loading and before adding custom styles. Or use the light-weight pre-upgrade styles available inline. See [Layout and style](#layout-and-style).
 
-The examples below demonstrate use of the `<bento-base-carousel>` web component.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/base-carousel
@@ -25,70 +17,149 @@ import {defineElement as defineBentoBaseCarousel} from '@bentoproject/base-carou
 defineBentoBaseCarousel();
 ```
 
-### Example: Include via `<script>`
+### Include via `<script>`
 
 ```html
-<head>
-  <script src="https://cdn.ampproject.org/bento.js"></script>
-  <!-- These styles prevent Cumulative Layout Shift on the unupgraded custom element -->
-  <style>
-    bento-base-carousel {
-      display: block;
-      overflow: hidden;
-      position: relative;
-    }
-  </style>
-  <script
-    async
-    src="https://cdn.ampproject.org/v0/bento-base-carousel-1.0.js"
-  ></script>
-  <style>
-    bento-base-carousel,
-    bento-base-carousel > div {
-      aspect-ratio: 4/1;
-    }
-    .red {
-      background: darkred;
-    }
-    .blue {
-      background: steelblue;
-    }
-    .green {
-      background: seagreen;
-    }
-  </style>
-</head>
-<bento-base-carousel id="my-carousel">
-  <div class="red"></div>
-  <div class="blue"></div>
-  <div class="green"></div>
-</bento-base-carousel>
-<div class="buttons" style="margin-top: 8px">
-  <button id="prev-button">Go to previous slide</button>
-  <button id="next-button">Go to next slide</button>
-  <button id="go-to-button">Go to slide with green gradient</button>
-</div>
+<script type="module" src="https://cdn.ampproject.org/bento.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/bento.js" crossorigin="anonymous"></script>
+<script type="module" src="https://cdn.ampproject.org/v0/bento-base-carousel-1.0.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/v0/bento-base-carousel-1.0.js" crossorigin="anonymous"></script>
+<link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-base-carousel-1.0.css" crossorigin="anonymous">
+```
 
-<script>
-  (async () => {
-    const carousel = document.querySelector('#my-carousel');
-    await customElements.whenDefined('bento-base-carousel');
-    const api = await carousel.getApi();
+### Example
 
-    // programatically advance to next slide
-    api.next();
+<!--% example %-->
 
-    // set up button actions
-    document.querySelector('#prev-button').onclick = () => api.prev();
-    document.querySelector('#next-button').onclick = () => api.next();
-    document.querySelector('#go-to-button').onclick = () => api.goToSlide(2);
-  })();
-</script>
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-base-carousel-1.0.css"
+    />
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-base-carousel-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-base-carousel-1.0.js"
+    ></script>
+    <style>
+      bento-base-carousel,
+      bento-base-carousel > div {
+        aspect-ratio: 4/1;
+      }
+      .red {
+        background: darkred;
+      }
+      .blue {
+        background: steelblue;
+      }
+      .green {
+        background: seagreen;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-base-carousel id="my-carousel">
+      <div class="red"></div>
+      <div class="blue"></div>
+      <div class="green"></div>
+    </bento-base-carousel>
+  </body>
+</html>
 ```
 
 ### Interactivity and API usage
 
-Bento enabled components used as a standalone web component are highly interactive through their API. The `bento-base-carousel` component API is accessible by including the following script tag in your document:
+Bento components are highly interactive through their API. The `bento-base-carousel` component API is accessible by including the following script tag in your document:
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-base-carousel-1.0.css"
+    />
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-base-carousel-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-base-carousel-1.0.js"
+    ></script>
+    <style>
+      bento-base-carousel,
+      bento-base-carousel > div {
+        aspect-ratio: 4/1;
+      }
+      .red {
+        background: darkred;
+      }
+      .blue {
+        background: steelblue;
+      }
+      .green {
+        background: seagreen;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-base-carousel id="my-carousel">
+      <div class="red"></div>
+      <div class="blue"></div>
+      <div class="green"></div>
+    </bento-base-carousel>
+    <div class="buttons" style="margin-top: 8px">
+      <button id="prev-button">Go to previous slide</button>
+      <button id="next-button">Go to next slide</button>
+      <button id="go-to-button">Go to slide with green gradient</button>
+    </div>
+
+    <script>
+      (async () => {
+        const carousel = document.querySelector('#my-carousel');
+        await customElements.whenDefined('bento-base-carousel');
+        const api = await carousel.getApi();
+
+        // programatically advance to next slide
+        api.next();
+
+        // set up button actions
+        document.querySelector('#prev-button').onclick = () => api.prev();
+        document.querySelector('#next-button').onclick = () => api.next();
+        document.querySelector('#go-to-button').onclick = () =>
+          api.goToSlide(2);
+      })();
+    </script>
+  </body>
+</html>
+```
 
 ```javascript
 await customElements.whenDefined('bento-base-carousel');
@@ -117,8 +188,7 @@ api.prev();
 
 ##### goToSlide(index: number)
 
-Moves the carousel to the slide specified by the `index` argument.
-Note: `index` will be normalized to a number greater than or equal to `0` and less than the number of slides given.
+Moves the carousel to the slide specified by the `index` argument. Note: `index` will be normalized to a number greater than or equal to `0` and less than the number of slides given.
 
 ```javascript
 api.goToSlide(0); // Advance to first slide.
@@ -131,8 +201,7 @@ The `bento-base-carousel` API allows you to register and respond to the followin
 
 ##### slideChange
 
-This event is triggered when the index displayed by the carousel has changed.
-The new index is available via `event.data.index`.
+This event is triggered when the index displayed by the carousel has changed. The new index is available via `event.data.index`.
 
 ```javascript
 carousel.addEventListener('slideChange', (e) => console.log(e.data.index));
@@ -179,22 +248,17 @@ bento-base-carousel > * {
 
 ### Right-to-left slide change
 
-`<bento-base-carousel>` requires that you define when it is in an
-right-to-left (rtl) context (e.g. Arabic, Hebrew pages). While the carousel will
-generally work without this, there may be a few bugs. You can let the carousel
-know that it should operate as `rtl` as follows:
+`<bento-base-carousel>` requires that you define when it is in an right-to-left (rtl) context (e.g. Arabic, Hebrew pages). While the carousel will generally work without this, there may be a few bugs. You can let the carousel know that it should operate as `rtl` as follows:
 
 ```html
 <bento-base-carousel dir="rtl" …> … </bento-base-carousel>
 ```
 
-If the carousel is in a RTL context, and you want the carousel to operate as
-LTR, you can explicitly set the `dir="ltr"` on the carousel.
+If the carousel is in a RTL context, and you want the carousel to operate as LTR, you can explicitly set the `dir="ltr"` on the carousel.
 
 ### Slide layout
 
-Slides are automatically sized by the carousel when **not** specifying
-`mixed-lengths`.
+Slides are automatically sized by the carousel when **not** specifying `mixed-lengths`.
 
 ```html
 <bento-base-carousel …>
@@ -202,23 +266,13 @@ Slides are automatically sized by the carousel when **not** specifying
 </bento-base-carousel>
 ```
 
-The slides have implicit height when the carousel is laid out.
-This can easily be changed with CSS. When specifying the height,
-the slide will be vertically centered within the carousel.
+The slides have implicit height when the carousel is laid out. This can easily be changed with CSS. When specifying the height, the slide will be vertically centered within the carousel.
 
-If you want to horizontally center your slide content, you will want to create a
-wrapping element, and use that to center the content.
+If you want to horizontally center your slide content, you will want to create a wrapping element, and use that to center the content.
 
 ### Number of visible slides
 
-When changing the number of visible slides using `visible-slides`, in response
-to a media query, you will likely want to change the aspect ratio of the
-carousel itself to match the new number of visible slides. For example, if you
-want to show three slides at a time with a one by one aspect ratio, you would
-want an aspect ratio of three by one for the carousel itself. Similiarly, with
-four slides at a time you would want an aspect ratio of four by one. In
-addition, when changing `visible-slides`, you likely want to change
-`advance-count`.
+When changing the number of visible slides using `visible-slides`, in response to a media query, you will likely want to change the aspect ratio of the carousel itself to match the new number of visible slides. For example, if you want to show three slides at a time with a one by one aspect ratio, you would want an aspect ratio of three by one for the carousel itself. Similiarly, with four slides at a time you would want an aspect ratio of four by one. In addition, when changing `visible-slides`, you likely want to change `advance-count`.
 
 ```html
 <!-- Using an aspect ratio of 3:2 for the slides in this example. -->
@@ -235,73 +289,53 @@ addition, when changing `visible-slides`, you likely want to change
 
 #### Media Queries
 
-The attributes for `<bento-base-carousel>` can be configured to use different
-options based on a [media query](./../../../docs/spec/amp-html-responsive-attributes.md).
+The attributes for `<bento-base-carousel>` can be configured to use different options based on a [media query](./../../../docs/spec/amp-html-responsive-attributes.md).
 
 #### Number of visible slides
 
 ##### mixed-length
 
-Either `true` or `false`, defaults to `false`. When true, uses the existing
-width (or height when horizontal) for each of the slides. This allows for a
-carousel with slides of different widths to be used.
+Either `true` or `false`, defaults to `false`. When true, uses the existing width (or height when horizontal) for each of the slides. This allows for a carousel with slides of different widths to be used.
 
 ##### visible-count
 
-A number, defaults to `1`. Determines how many slides should be shown at a given
-time. Fractional values can be used to make part of a(n) additional slide(s)
-visible. This option is ignored when `mixed-length` is `true`.
+A number, defaults to `1`. Determines how many slides should be shown at a given time. Fractional values can be used to make part of a(n) additional slide(s) visible. This option is ignored when `mixed-length` is `true`.
 
 ##### advance-count
 
-A number, defaults to `1`. Determines how many slides the carousel will advance
-when advancing using the previous or next arrows. This is useful when specifying
-the `visible-count` attribute.
+A number, defaults to `1`. Determines how many slides the carousel will advance when advancing using the previous or next arrows. This is useful when specifying the `visible-count` attribute.
 
 #### Auto advance
 
 ##### auto-advance
 
-Either `true` or `false`, defaults to `false`. Automatically advances the
-carousel to the next slide based on a delay. If the user manually changes
-slides, then the auto advance is stopped. Note that if `loop` is not enabled,
-when reaching the last item, the auto advance will move backwards to the first
-item.
+Either `true` or `false`, defaults to `false`. Automatically advances the carousel to the next slide based on a delay. If the user manually changes slides, then the auto advance is stopped. Note that if `loop` is not enabled, when reaching the last item, the auto advance will move backwards to the first item.
 
 ##### auto-advance-count
 
-A number, defaults to `1`. Determines how many slides the carousel will advance
-when automatically advancing. This is useful when specifying the `visible-count`
-attribute.
+A number, defaults to `1`. Determines how many slides the carousel will advance when automatically advancing. This is useful when specifying the `visible-count` attribute.
 
 ##### auto-advance-interval
 
-A number, defaults to `1000`. Specifies the amount of time, in milliseconds,
-between subsequent automatic advances of the carousel.
+A number, defaults to `1000`. Specifies the amount of time, in milliseconds, between subsequent automatic advances of the carousel.
 
 ##### auto-advance-loops
 
-A number, defaults to `∞`. The number of times the carousel should advance
-through the slides before stopping.
+A number, defaults to `∞`. The number of times the carousel should advance through the slides before stopping.
 
 #### Snapping
 
 ##### snap
 
-Either `true` or `false`, defaults to `true`. Determines whether or not the
-carousel should snap on slides when scrolling.
+Either `true` or `false`, defaults to `true`. Determines whether or not the carousel should snap on slides when scrolling.
 
 ##### snap-align
 
-Either `start` or `center`. When start aligning, the start of a slide (e.g. the
-left edge, when horizontal aligning) is aligned with the start of a carousel.
-When center aligning, the center of a slide is aligned with the center of a
-carousel.
+Either `start` or `center`. When start aligning, the start of a slide (e.g. the left edge, when horizontal aligning) is aligned with the start of a carousel. When center aligning, the center of a slide is aligned with the center of a carousel.
 
 ##### snap-by
 
-A number, defaults to `1`. This determines the granularity of snapping and is
-useful when using `visible-count`.
+A number, defaults to `1`. This determines the granularity of snapping and is useful when using `visible-count`.
 
 #### Miscellaneous
 
@@ -315,9 +349,7 @@ Either `"always"`, `"auto"`, or `"never"`, defaults to `"auto"`. This determines
 
 ##### slide
 
-A number, defaults to `0`. This determines the initial slide shown in the
-carousel. This may be mutated with `Element.setAttribute` to control which slide is currently
-showing.
+A number, defaults to `0`. This determines the initial slide shown in the carousel. This may be mutated with `Element.setAttribute` to control which slide is currently showing.
 
 ##### loop
 
@@ -329,13 +361,11 @@ Either `horizontal` or `vertical`, defaults to `horizontal`. When `horizontal` t
 
 ### Styling
 
-You may use the `bento-base-carousel` element selector to style the carousel
-freely.
+You may use the `bento-base-carousel` element selector to style the carousel freely.
 
 #### Customizing arrow buttons
 
-Arrow buttons can be customized by passing in your own custom markup. For
-example, you can recreate the default styling with the following HTML and CSS:
+Arrow buttons can be customized by passing in your own custom markup. For example, you can recreate the default styling with the following HTML and CSS:
 
 ```css
 .carousel-prev,
@@ -375,9 +405,7 @@ example, you can recreate the default styling with the following HTML and CSS:
 
 ## Preact/React Component
 
-The examples below demonstrate use of the `<BentoBaseCarousel>` as a functional component usable with the Preact or React libraries.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/base-carousel
@@ -440,8 +468,7 @@ ref.current.prev();
 
 ##### goToSlide(index: number)
 
-Moves the carousel to the slide specified by the `index` argument.
-Note: `index` will be normalized to a number greater than or equal to `0` and less than the number of slides given.
+Moves the carousel to the slide specified by the `index` argument. Note: `index` will be normalized to a number greater than or equal to `0` and less than the number of slides given.
 
 ```javascript
 ref.current.goToSlide(0); // Advance to first slide.
@@ -501,22 +528,17 @@ Or via `className`:
 
 ### Right-to-left slide change
 
-`<BentoBaseCarousel>` requires that you define when it is in an
-right-to-left (rtl) context (e.g. Arabic, Hebrew pages). While the carousel will
-generally work without this, there may be a few bugs. You can let the carousel
-know that it should operate as `rtl` as follows:
+`<BentoBaseCarousel>` requires that you define when it is in an right-to-left (rtl) context (e.g. Arabic, Hebrew pages). While the carousel will generally work without this, there may be a few bugs. You can let the carousel know that it should operate as `rtl` as follows:
 
 ```jsx
 <BentoBaseCarousel dir="rtl">…</BentoBaseCarousel>
 ```
 
-If the carousel is in a RTL context, and you want the carousel to operate as
-LTR, you can explicitly set the `dir="ltr"` on the carousel.
+If the carousel is in a RTL context, and you want the carousel to operate as LTR, you can explicitly set the `dir="ltr"` on the carousel.
 
 ### Slide layout
 
-Slides are automatically sized by the carousel when **not** specifying
-`mixedLengths`.
+Slides are automatically sized by the carousel when **not** specifying `mixedLengths`.
 
 ```jsx
 <BentoBaseCarousel>
@@ -524,23 +546,13 @@ Slides are automatically sized by the carousel when **not** specifying
 </BentoBaseCarousel>
 ```
 
-The slides have implicit height when the carousel is laid out.
-This can easily be changed with CSS. When specifying the height,
-the slide will be vertically centered within the carousel.
+The slides have implicit height when the carousel is laid out. This can easily be changed with CSS. When specifying the height, the slide will be vertically centered within the carousel.
 
-If you want to horizontally center your slide content, you will want to create a
-wrapping element, and use that to center the content.
+If you want to horizontally center your slide content, you will want to create a wrapping element, and use that to center the content.
 
 ### Number of visible slides
 
-When changing the number of visible slides using `visibleSlides`, in response
-to a media query, you will likely want to change the aspect ratio of the
-carousel itself to match the new number of visible slides. For example, if you
-want to show three slides at a time with a one by one aspect ratio, you would
-want an aspect ratio of three by one for the carousel itself. Similiarly, with
-four slides at a time you would want an aspect ratio of four by one. In
-addition, when changing `visibleSlides`, you likely want to change
-`advanceCount`.
+When changing the number of visible slides using `visibleSlides`, in response to a media query, you will likely want to change the aspect ratio of the carousel itself to match the new number of visible slides. For example, if you want to show three slides at a time with a one by one aspect ratio, you would want an aspect ratio of three by one for the carousel itself. Similiarly, with four slides at a time you would want an aspect ratio of four by one. In addition, when changing `visibleSlides`, you likely want to change `advanceCount`.
 
 ```jsx
 const count = window.matchMedia('(max-width: 600px)').matches ? 4 : 3;
@@ -556,66 +568,47 @@ const count = window.matchMedia('(max-width: 600px)').matches ? 4 : 3;
 
 ##### mixedLength
 
-Either `true` or `false`, defaults to `false`. When true, uses the existing
-width (or height when horizontal) for each of the slides. This allows for a
-carousel with slides of different widths to be used.
+Either `true` or `false`, defaults to `false`. When true, uses the existing width (or height when horizontal) for each of the slides. This allows for a carousel with slides of different widths to be used.
 
 ##### visibleCount
 
-A number, defaults to `1`. Determines how many slides should be shown at a given
-time. Fractional values can be used to make part of a(n) additional slide(s)
-visible. This option is ignored when `mixedLength` is `true`.
+A number, defaults to `1`. Determines how many slides should be shown at a given time. Fractional values can be used to make part of a(n) additional slide(s) visible. This option is ignored when `mixedLength` is `true`.
 
 ##### advanceCount
 
-A number, defaults to `1`. Determines how many slides the carousel will advance
-when advancing using the previous or next arrows. This is useful when specifying
-the `visibleCount` attribute.
+A number, defaults to `1`. Determines how many slides the carousel will advance when advancing using the previous or next arrows. This is useful when specifying the `visibleCount` attribute.
 
 #### Auto advance
 
 ##### autoAdvance
 
-Either `true` or `false`, defaults to `false`. Automatically advances the
-carousel to the next slide based on a delay. If the user manually changes
-slides, then the auto advance is stopped. Note that if `loop` is not enabled,
-when reaching the last item, the auto advance will move backwards to the first
-item.
+Either `true` or `false`, defaults to `false`. Automatically advances the carousel to the next slide based on a delay. If the user manually changes slides, then the auto advance is stopped. Note that if `loop` is not enabled, when reaching the last item, the auto advance will move backwards to the first item.
 
 ##### autoAdvanceCount
 
-A number, defaults to `1`. Determines how many slides the carousel will advance
-when automatically advancing. This is useful when specifying the `visible-count`
-attribute.
+A number, defaults to `1`. Determines how many slides the carousel will advance when automatically advancing. This is useful when specifying the `visible-count` attribute.
 
 ##### autoAdvanceInterval
 
-A number, defaults to `1000`. Specifies the amount of time, in milliseconds,
-between subsequent automatic advances of the carousel.
+A number, defaults to `1000`. Specifies the amount of time, in milliseconds, between subsequent automatic advances of the carousel.
 
 ##### autoAdvanceLoops
 
-A number, defaults to `∞`. The number of times the carousel should advance
-through the slides before stopping.
+A number, defaults to `∞`. The number of times the carousel should advance through the slides before stopping.
 
 #### Snapping
 
 ##### snap
 
-Either `true` or `false`, defaults to `true`. Determines whether or not the
-carousel should snap on slides when scrolling.
+Either `true` or `false`, defaults to `true`. Determines whether or not the carousel should snap on slides when scrolling.
 
 ##### snapAlign
 
-Either `start` or `center`. When start aligning, the start of a slide (e.g. the
-left edge, when horizontal aligning) is aligned with the start of a carousel.
-When center aligning, the center of a slide is aligned with the center of a
-carousel.
+Either `start` or `center`. When start aligning, the start of a slide (e.g. the left edge, when horizontal aligning) is aligned with the start of a carousel. When center aligning, the center of a slide is aligned with the center of a carousel.
 
 ##### snapBy
 
-A number, defaults to `1`. This determines the granularity of snapping and is
-useful when using `visible-count`.
+A number, defaults to `1`. This determines the granularity of snapping and is useful when using `visible-count`.
 
 #### Miscellaneous
 
diff --git a/extensions/amp-base-carousel/1.0/amp-base-carousel.js b/extensions/amp-base-carousel/1.0/amp-base-carousel.js
index c2832ec57aab..6f9ee53c2e81 100644
--- a/extensions/amp-base-carousel/1.0/amp-base-carousel.js
+++ b/extensions/amp-base-carousel/1.0/amp-base-carousel.js
@@ -1,28 +1,35 @@
-import {ActionTrust} from '#core/constants/action-constants';
-import {BaseElement} from './base-element';
-import {CSS} from '../../../build/amp-base-carousel-1.0.css';
+import {BaseElement} from '#bento/components/bento-base-carousel/1.0/base-element';
+
+import {ActionTrust_Enum} from '#core/constants/action-constants';
+import {getWin} from '#core/window';
+
+import {isExperimentOn} from '#experiments';
+
+import {AmpPreactBaseElement, setSuperClass} from '#preact/amp-base-element';
+
 import {Services} from '#service';
+
 import {createCustomEvent} from '#utils/event-helper';
-import {isExperimentOn} from '#experiments';
-import {getWin} from '#core/window';
 import {userAssert} from '#utils/log';
 
+import {CSS} from '../../../build/amp-base-carousel-1.0.css';
+
 /** @const {string} */
 const TAG = 'amp-base-carousel';
 
 /** @extends {PreactBaseElement<BaseCarouselDef.CarouselApi>} */
-class AmpBaseCarousel extends BaseElement {
+class AmpBaseCarousel extends setSuperClass(BaseElement, AmpPreactBaseElement) {
   /** @override */
   init() {
-    this.registerApiAction('prev', (api) => api.prev(), ActionTrust.LOW);
-    this.registerApiAction('next', (api) => api.next(), ActionTrust.LOW);
+    this.registerApiAction('prev', (api) => api.prev(), ActionTrust_Enum.LOW);
+    this.registerApiAction('next', (api) => api.next(), ActionTrust_Enum.LOW);
     this.registerApiAction(
       'goToSlide',
       (api, invocation) => {
         const {args} = invocation;
         api.goToSlide(args['index'] || -1);
       },
-      ActionTrust.LOW
+      ActionTrust_Enum.LOW
     );
 
     return super.init();
@@ -49,7 +56,7 @@ class AmpBaseCarousel extends BaseElement {
       element,
       eventName,
       event,
-      ActionTrust.HIGH
+      ActionTrust_Enum.HIGH
     );
     super.triggerEvent(element, eventName, detail);
   }
diff --git a/extensions/amp-base-carousel/1.0/base-element.js b/extensions/amp-base-carousel/1.0/base-element.js
deleted file mode 100644
index 2ab4a801576e..000000000000
--- a/extensions/amp-base-carousel/1.0/base-element.js
+++ /dev/null
@@ -1,98 +0,0 @@
-import {BentoBaseCarousel} from './component';
-import {CSS as COMPONENT_CSS} from './component.jss';
-import {CarouselContextProp} from './carousel-props';
-import {PreactBaseElement} from '#preact/base-element';
-import {dict} from '#core/types/object';
-
-export class BaseElement extends PreactBaseElement {
-  /** @param {!AmpElement} element */
-  constructor(element) {
-    super(element);
-
-    /** @private {?number} */
-    this.slide_ = null;
-  }
-
-  /** @override */
-  init() {
-    const {element} = this;
-    this.slide_ = parseInt(element.getAttribute('slide'), 10);
-    return dict({
-      'defaultSlide': this.slide_ || 0,
-      'onSlideChange': (index) => {
-        this.triggerEvent(element, 'slideChange', dict({'index': index}));
-      },
-    });
-  }
-
-  /** @override */
-  mutationObserverCallback() {
-    const slide = parseInt(this.element.getAttribute('slide'), 10);
-    if (slide === this.slide_) {
-      return;
-    }
-    this.slide_ = slide;
-    if (!isNaN(slide)) {
-      this.api().goToSlide(slide);
-    }
-  }
-}
-
-/** @override */
-BaseElement['Component'] = BentoBaseCarousel;
-
-/** @override */
-BaseElement['layoutSizeDefined'] = true;
-
-/** @override */
-BaseElement['props'] = {
-  'advanceCount': {attr: 'advance-count', type: 'number', media: true},
-  'arrowPrevAs': {
-    selector: '[slot="prev-arrow"]',
-    single: true,
-    as: true,
-  },
-  'arrowNextAs': {
-    selector: '[slot="next-arrow"]',
-    single: true,
-    as: true,
-  },
-  'autoAdvance': {attr: 'auto-advance', type: 'boolean', media: true},
-  'autoAdvanceCount': {attr: 'auto-advance-count', type: 'number', media: true},
-  'autoAdvanceInterval': {
-    attr: 'auto-advance-interval',
-    type: 'number',
-    media: true,
-  },
-  'autoAdvanceLoops': {attr: 'auto-advance-loops', type: 'number', media: true},
-  'controls': {attr: 'controls', type: 'string', media: true},
-  'orientation': {
-    attr: 'orientation',
-    type: 'string',
-    media: true,
-    default: 'horizontal',
-  },
-  'loop': {attr: 'loop', type: 'boolean', media: true},
-  'mixedLength': {attr: 'mixed-length', type: 'boolean', media: true},
-  'outsetArrows': {attr: 'outset-arrows', type: 'boolean', media: true},
-  'snap': {attr: 'snap', type: 'boolean', media: true, default: true},
-  'snapBy': {attr: 'snap-by', type: 'number', media: true},
-  'snapAlign': {attr: 'snap-align', type: 'string', media: true},
-  'visibleCount': {attr: 'visible-count', type: 'number', media: true},
-  'children': {
-    props: {
-      'thumbnailSrc': {attr: 'data-thumbnail-src'},
-    },
-    selector: '*', // This should be last as catch-all.
-    single: false,
-  },
-};
-
-/** @override */
-BaseElement['usesShadowDom'] = true;
-
-/** @override */
-BaseElement['shadowCss'] = COMPONENT_CSS;
-
-/** @override */
-BaseElement['useContexts'] = [CarouselContextProp];
diff --git a/extensions/amp-base-carousel/1.0/component.js b/extensions/amp-base-carousel/1.0/component.js
deleted file mode 100644
index a81a882ebdd4..000000000000
--- a/extensions/amp-base-carousel/1.0/component.js
+++ /dev/null
@@ -1,373 +0,0 @@
-import * as Preact from '#preact';
-import {
-  Alignment,
-  Axis,
-  Orientation,
-  getDimension,
-  getOffsetPosition,
-  getScrollEnd,
-} from './dimensions';
-import {Arrow} from './arrow';
-import {CarouselContext} from './carousel-context';
-import {ContainWrapper} from '#preact/component';
-import {Scroller} from './scroller';
-import {WithAmpContext} from '#preact/context';
-import {forwardRef, toChildArray} from '#preact/compat';
-import {isRTL} from '#core/dom';
-import {sequentialIdGenerator} from '#core/data-structures/id-generator';
-import {getWin} from '#core/window';
-import {
-  cloneElement,
-  useCallback,
-  useContext,
-  useEffect,
-  useImperativeHandle,
-  useLayoutEffect,
-  useMemo,
-  useRef,
-  useState,
-} from '#preact';
-import {useStyles} from './component.jss';
-import {mod} from '#core/math';
-
-/**
- * @enum {string}
- */
-const Controls = {
-  ALWAYS: 'always',
-  NEVER: 'never',
-  AUTO: 'auto',
-};
-
-/**
- * @enum {string}
- */
-const Interaction = {
-  GENERIC: 0,
-  FOCUS: 1,
-  MOUSE: 2,
-  TOUCH: 3,
-  NONE: 4,
-};
-
-/**
- * @enum {string}
- */
-const Direction = {
-  LTR: 'ltr',
-  RTL: 'rtl',
-  AUTO: 'auto',
-};
-
-const MIN_AUTO_ADVANCE_INTERVAL = 1000;
-
-const generateCarouselKey = sequentialIdGenerator();
-
-/**
- * @param {!BaseCarouselDef.Props} props
- * @param {{current: ?BaseCarouselDef.CarouselApi}} ref
- * @return {PreactDef.Renderable}
- */
-function BentoBaseCarouselWithRef(
-  {
-    advanceCount = 1,
-    arrowPrevAs,
-    arrowNextAs,
-    autoAdvance: shouldAutoAdvance = false,
-    autoAdvanceCount = 1,
-    autoAdvanceInterval: customAutoAdvanceInterval = MIN_AUTO_ADVANCE_INTERVAL,
-    autoAdvanceLoops = Number.POSITIVE_INFINITY,
-    children,
-    controls = Controls.AUTO,
-    defaultSlide = 0,
-    dir = Direction.AUTO,
-    lightbox = false,
-    loop,
-    mixedLength = false,
-    onClick,
-    onFocus,
-    onMouseEnter,
-    onSlideChange,
-    onTouchStart,
-    orientation = Orientation.HORIZONTAL,
-    outsetArrows = false,
-    snap = true,
-    snapAlign = Alignment.START,
-    snapBy = 1,
-    visibleCount = 1,
-    _thumbnails = false,
-    ...rest
-  },
-  ref
-) {
-  const classes = useStyles();
-  const childrenArray = useMemo(() => toChildArray(children), [children]);
-  const {length} = childrenArray;
-  const carouselContext = useContext(CarouselContext);
-  const [currentSlideState, setCurrentSlideState] = useState(
-    Math.min(Math.max(defaultSlide, 0), length)
-  );
-  const globalCurrentSlide = carouselContext.currentSlide ?? currentSlideState;
-  const setGlobalCurrentSlide =
-    carouselContext.setCurrentSlide ?? setCurrentSlideState;
-  const currentSlide = _thumbnails ? currentSlideState : globalCurrentSlide;
-  const setCurrentSlide = _thumbnails
-    ? setCurrentSlideState
-    : setGlobalCurrentSlide;
-  const currentSlideRef = useRef(currentSlide);
-  const axis = orientation == Orientation.HORIZONTAL ? Axis.X : Axis.Y;
-  const [id] = useState(generateCarouselKey);
-
-  useLayoutEffect(() => {
-    // noop if !_thumbnails || !carouselContext.
-    setCurrentSlide(globalCurrentSlide);
-  }, [globalCurrentSlide, setCurrentSlide]);
-
-  const {setSlides, slides} = carouselContext;
-
-  const scrollRef = useRef(null);
-  const containRef = useRef(null);
-  const contentRef = useRef(null);
-
-  const autoAdvanceTimesRef = useRef(0);
-  const autoAdvanceInterval = useMemo(
-    () => Math.max(customAutoAdvanceInterval, MIN_AUTO_ADVANCE_INTERVAL),
-    [customAutoAdvanceInterval]
-  );
-
-  const autoAdvance = useCallback(() => {
-    if (
-      autoAdvanceTimesRef.current + visibleCount / length >= autoAdvanceLoops ||
-      interaction.current !== Interaction.NONE
-    ) {
-      return false;
-    }
-    if (loop || currentSlideRef.current + visibleCount < length) {
-      scrollRef.current.advance(autoAdvanceCount); // Advance forward by specified count
-      // Count autoadvance loops as proportions of the carousel we have advanced through.
-      autoAdvanceTimesRef.current += autoAdvanceCount / length;
-    } else {
-      scrollRef.current.advance(-currentSlideRef.current); // Advance in reverse to first slide
-      autoAdvanceTimesRef.current = Math.ceil(autoAdvanceTimesRef.current);
-    }
-    return true;
-  }, [autoAdvanceCount, autoAdvanceLoops, length, loop, visibleCount]);
-  const next = useCallback(() => scrollRef.current.next(), []);
-  const prev = useCallback(() => scrollRef.current.prev(), []);
-
-  useEffect(() => {
-    if (!shouldAutoAdvance || !containRef.current) {
-      return;
-    }
-    const win = getWin(containRef.current);
-    const interval = win.setInterval(() => {
-      const autoAdvanced = autoAdvance();
-      if (!autoAdvanced) {
-        win.clearInterval(interval);
-      }
-    }, autoAdvanceInterval);
-    return () => win.clearInterval(interval);
-  }, [autoAdvance, autoAdvanceInterval, shouldAutoAdvance]);
-
-  const setRestingIndex = useCallback(
-    (index) => {
-      if (length <= 0 || isNaN(index)) {
-        return;
-      }
-      index = loop
-        ? mod(index, length)
-        : Math.min(Math.max(index, 0), length - 1);
-      setCurrentSlide(index);
-      if (currentSlideRef.current !== index) {
-        currentSlideRef.current = index;
-        if (onSlideChange) {
-          onSlideChange(index);
-        }
-      }
-    },
-    [length, loop, setCurrentSlide, onSlideChange]
-  );
-
-  useImperativeHandle(
-    ref,
-    () =>
-      /** @type {!BaseCarouselDef.CarouselApi} */ ({
-        goToSlide: (index) => {
-          interaction.current = Interaction.GENERIC;
-          setRestingIndex(index);
-        },
-        next: () => {
-          interaction.current = Interaction.GENERIC;
-          next();
-        },
-        prev: () => {
-          interaction.current = Interaction.GENERIC;
-          prev();
-        },
-        get root() {
-          return containRef.current;
-        },
-        get node() {
-          return contentRef.current;
-        },
-      }),
-    [next, prev, setRestingIndex]
-  );
-
-  useEffect(() => {
-    // For now, do not update slides if they are the same length as before.
-    // Otherwise this causes an infinite loop when updating the AMP Context.
-    if (!_thumbnails && slides && slides.length !== childrenArray.length) {
-      setSlides(childrenArray);
-    }
-  }, [_thumbnails, childrenArray, setSlides, slides]);
-
-  const disableForDir = (dir) => {
-    if (loop) {
-      // Arrows always available when looping.
-      return false;
-    }
-    if (currentSlide + dir < 0) {
-      // Can no longer advance backwards.
-      return true;
-    }
-    if (currentSlide + visibleCount + dir > length) {
-      // Can no longer advance forwards.
-      return true;
-    }
-    if (mixedLength && dir > 0) {
-      // Measure container to see if we have reached the end.
-      if (!scrollRef.current) {
-        return false;
-      }
-      const container = scrollRef.current.node;
-      if (!container || !container.children.length) {
-        return false;
-      }
-      const scrollEnd = getScrollEnd(axis, container);
-      const scrollStart = getOffsetPosition(
-        axis,
-        container.children[currentSlide]
-      );
-      const {length} = getDimension(axis, container);
-      if (length !== scrollEnd && length + scrollStart >= scrollEnd) {
-        // Can no longer scroll forwards.
-        return true;
-      }
-    }
-    return false;
-  };
-
-  const interaction = useRef(Interaction.NONE);
-  const hideControls = useMemo(() => {
-    if (controls === Controls.ALWAYS || outsetArrows) {
-      return false;
-    }
-    if (controls === Controls.NEVER) {
-      return true;
-    }
-    return interaction.current === Interaction.TOUCH;
-  }, [controls, outsetArrows]);
-
-  const [rtl, setRtl] = useState(dir === Direction.RTL);
-  useLayoutEffect(() => {
-    if (!containRef.current || dir !== Direction.AUTO) {
-      return;
-    }
-    const doc = containRef.current.ownerDocument;
-    if (!doc) {
-      return;
-    }
-    setRtl(isRTL(doc));
-  }, [dir, setRtl]);
-
-  return (
-    <ContainWrapper
-      size={true}
-      layout={true}
-      paint={true}
-      contentStyle={{
-        display: 'flex',
-        direction: rtl ? Direction.RTL : Direction.LTR,
-      }}
-      ref={containRef}
-      onFocus={(e) => {
-        if (onFocus) {
-          onFocus(e);
-        }
-        interaction.current = Interaction.FOCUS;
-      }}
-      onMouseEnter={(e) => {
-        if (onMouseEnter) {
-          onMouseEnter(e);
-        }
-        interaction.current = Interaction.MOUSE;
-      }}
-      onTouchStart={(e) => {
-        if (onTouchStart) {
-          onTouchStart(e);
-        }
-        interaction.current = Interaction.TOUCH;
-      }}
-      tabIndex="0"
-      wrapperClassName={classes.carousel}
-      contentRef={contentRef}
-      {...rest}
-    >
-      {!hideControls && (
-        <Arrow
-          advance={prev}
-          as={arrowPrevAs}
-          by={-advanceCount}
-          disabled={disableForDir(-1)}
-          outsetArrows={outsetArrows}
-          rtl={rtl}
-        />
-      )}
-      <Scroller
-        advanceCount={advanceCount}
-        alignment={snapAlign}
-        axis={axis}
-        lightboxGroup={lightbox && 'carousel' + id}
-        loop={loop}
-        mixedLength={mixedLength}
-        onClick={onClick}
-        restingIndex={currentSlide}
-        setRestingIndex={setRestingIndex}
-        snap={snap}
-        snapBy={snapBy}
-        ref={scrollRef}
-        visibleCount={mixedLength ? 1 : visibleCount}
-        _thumbnails={_thumbnails}
-      >
-        {childrenArray.map((child, index) => {
-          const {alt, 'aria-label': ariaLabel} = child.props;
-          return (
-            <WithAmpContext
-              caption={alt || ariaLabel}
-              key={index}
-              renderable={index == currentSlide}
-              playable={index == currentSlide}
-            >
-              {cloneElement(child, {...child.props, thumbnailSrc: undefined})}
-            </WithAmpContext>
-          );
-        })}
-      </Scroller>
-      {!hideControls && (
-        <Arrow
-          advance={next}
-          by={advanceCount}
-          as={arrowNextAs}
-          disabled={disableForDir(1)}
-          outsetArrows={outsetArrows}
-          rtl={rtl}
-        />
-      )}
-    </ContainWrapper>
-  );
-}
-
-const BentoBaseCarousel = forwardRef(BentoBaseCarouselWithRef);
-BentoBaseCarousel.displayName = 'BentoBaseCarousel'; // Make findable for tests.
-export {BentoBaseCarousel};
diff --git a/extensions/amp-base-carousel/1.0/example/avocado.jpg b/extensions/amp-base-carousel/1.0/example/avocado.jpg
new file mode 100644
index 000000000000..0a2e550821bf
Binary files /dev/null and b/extensions/amp-base-carousel/1.0/example/avocado.jpg differ
diff --git a/extensions/amp-base-carousel/1.0/example/banana.jpg b/extensions/amp-base-carousel/1.0/example/banana.jpg
new file mode 100644
index 000000000000..6805aba3e226
Binary files /dev/null and b/extensions/amp-base-carousel/1.0/example/banana.jpg differ
diff --git a/extensions/amp-base-carousel/1.0/example/bentobox.jpg b/extensions/amp-base-carousel/1.0/example/bentobox.jpg
new file mode 100644
index 000000000000..882c18534a93
Binary files /dev/null and b/extensions/amp-base-carousel/1.0/example/bentobox.jpg differ
diff --git a/extensions/amp-base-carousel/1.0/example/index.html b/extensions/amp-base-carousel/1.0/example/index.html
new file mode 100644
index 000000000000..eca732d834a8
--- /dev/null
+++ b/extensions/amp-base-carousel/1.0/example/index.html
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width" />
+    <title>bento-base-carousel</title>
+    <script src="https://cdn.ampproject.org/bento.js"></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-base-carousel-1.0.css"
+    />
+    <script
+      async
+      src="https://cdn.ampproject.org/v0/bento-base-carousel-1.0.js"
+    ></script>
+    <style>
+      body {
+        margin: 0;
+      }
+      bento-base-carousel {
+        height: 100vh;
+        width: 100vw;
+      }
+      bento-base-carousel > img {
+        width: 100%;
+        height: 100%;
+        object-fit: cover;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-base-carousel id="my-carousel">
+      <img
+        height="700"
+        width="1037"
+        src="banana.jpg"
+        alt="Example image: banana "
+      />
+      <img
+        height="700"
+        width="1037"
+        src="bentobox.jpg"
+        alt="Example image: bento box"
+      />
+      <img
+        height="700"
+        width="1037"
+        src="avocado.jpg"
+        alt="Example image: avocado"
+      />
+    </bento-base-carousel>
+    <script>
+      (async () => {
+        const carousel = document.querySelector('#my-carousel');
+        await customElements.whenDefined('bento-base-carousel');
+        const api = await carousel.getApi();
+
+        // programatically advance to next slide
+        api.next();
+      })();
+    </script>
+  </body>
+</html>
diff --git a/extensions/amp-base-carousel/1.0/storybook/Basic.amp.js b/extensions/amp-base-carousel/1.0/storybook/Basic.amp.js
index 4cebf7ed9e33..fe20c2e31e8e 100644
--- a/extensions/amp-base-carousel/1.0/storybook/Basic.amp.js
+++ b/extensions/amp-base-carousel/1.0/storybook/Basic.amp.js
@@ -1,6 +1,7 @@
-import * as Preact from '#preact';
 import {withAmp} from '@ampproject/storybook-addon';
 
+import * as Preact from '#preact';
+
 export default {
   title: 'amp-base-carousel-1_0',
   decorators: [withAmp],
diff --git a/extensions/amp-base-carousel/1.0/storybook/Basic.js b/extensions/amp-base-carousel/1.0/storybook/Basic.js
index 99571b34cf26..ccdccbac7fd5 100644
--- a/extensions/amp-base-carousel/1.0/storybook/Basic.js
+++ b/extensions/amp-base-carousel/1.0/storybook/Basic.js
@@ -1,5 +1,8 @@
+import {BentoBaseCarousel} from '#bento/components/bento-base-carousel/1.0/component';
+
 import * as Preact from '#preact';
-import {BentoBaseCarousel} from '../component';
+
+import '#bento/components/bento-base-carousel/1.0/component.jss';
 
 export default {
   title: 'BaseCarousel',
@@ -62,9 +65,15 @@ function CarouselWithActions(props) {
     <section>
       <BentoBaseCarousel ref={ref} {...props} />
       <div style={{marginTop: 8}}>
-        <button onClick={() => ref.current.goToSlide(3)}>goToSlide(3)</button>
-        <button onClick={() => ref.current.next()}>next</button>
-        <button onClick={() => ref.current.prev()}>prev</button>
+        <button data-testid="goto" onClick={() => ref.current.goToSlide(3)}>
+          goToSlide(3)
+        </button>
+        <button data-testid="next" onClick={() => ref.current.next()}>
+          next
+        </button>
+        <button data-testid="prev" onClick={() => ref.current.prev()}>
+          prev
+        </button>
       </div>
     </section>
   );
diff --git a/extensions/amp-base-carousel/1.0/test-e2e/e2e-fixture.js b/extensions/amp-base-carousel/1.0/test-e2e/e2e-fixture.js
new file mode 100644
index 000000000000..0d9011cb3bd1
--- /dev/null
+++ b/extensions/amp-base-carousel/1.0/test-e2e/e2e-fixture.js
@@ -0,0 +1,11 @@
+import {getDefaultArgs} from '#bento/util/e2e-helpers';
+
+import * as Preact from '#preact';
+import {render} from '#preact';
+
+import config, {_default as App} from '../storybook/Basic';
+
+render(
+  <App {...getDefaultArgs(config, App)} />,
+  document.querySelector('#bento')
+);
diff --git a/extensions/amp-base-carousel/1.0/test-e2e/helpers.js b/extensions/amp-base-carousel/1.0/test-e2e/helpers.js
index 0af68f13dc91..6ea195193ff7 100644
--- a/extensions/amp-base-carousel/1.0/test-e2e/helpers.js
+++ b/extensions/amp-base-carousel/1.0/test-e2e/helpers.js
@@ -49,3 +49,24 @@ export async function getNextArrow(styles, controller) {
     ELEMENT_WAIT_TIMEOUT
   );
 }
+
+export async function isElementInViewport(element, controller) {
+  const rect = await controller.getElementRect(element);
+  const [width, height] = await controller.getWindowRect();
+
+  await expect(rect.top).to.be.above(0);
+  await expect(rect.bottom).to.be.below(Number(height));
+  await expect(rect.left).to.be.above(0);
+  await expect(rect.right).to.be.below(Number(width));
+}
+
+export async function isElementOutOfViewport(element, controller) {
+  const winRect = await controller.getWindowRect();
+  const width = Number(winRect[0]);
+  const height = Number(winRect[1]);
+
+  await expect(controller.getElementRect(element)).to.satisfy(
+    ({bottom, left, right, top}) =>
+      top < 0 || bottom > height || left < 0 || right > width
+  );
+}
diff --git a/extensions/amp-base-carousel/1.0/test-e2e/test-advance.js b/extensions/amp-base-carousel/1.0/test-e2e/test-advance.js
index 83d10570421e..3a159ee7e4f9 100644
--- a/extensions/amp-base-carousel/1.0/test-e2e/test-advance.js
+++ b/extensions/amp-base-carousel/1.0/test-e2e/test-advance.js
@@ -1,6 +1,8 @@
-import {getCarousel, getNextArrow, getPrevArrow, getSlides} from './helpers';
+import {useStyles} from '#bento/components/bento-base-carousel/1.0/component.jss';
+
 import {sleep} from '#testing/helpers';
-import {useStyles} from '../component.jss';
+
+import {getCarousel, getNextArrow, getPrevArrow, getSlides} from './helpers';
 
 const pageWidth = 500;
 const pageHeight = 800;
diff --git a/extensions/amp-base-carousel/1.0/test-e2e/test-arrows-non-looping.js b/extensions/amp-base-carousel/1.0/test-e2e/test-arrows-non-looping.js
index 1c761f30512b..146fac0baf55 100644
--- a/extensions/amp-base-carousel/1.0/test-e2e/test-arrows-non-looping.js
+++ b/extensions/amp-base-carousel/1.0/test-e2e/test-arrows-non-looping.js
@@ -1,10 +1,11 @@
+import {useStyles} from '#bento/components/bento-base-carousel/1.0/component.jss';
+
 import {
   getCarousel,
   getNextArrow,
   getPrevArrow,
   getScrollingElement,
 } from './helpers';
-import {useStyles} from '../component.jss';
 
 /** The total number of slides in the carousel */
 const SLIDE_COUNT = 4;
diff --git a/extensions/amp-base-carousel/1.0/test-e2e/test-arrows.js b/extensions/amp-base-carousel/1.0/test-e2e/test-arrows.js
index e3be5e7e5f7c..7aa3a267cad2 100644
--- a/extensions/amp-base-carousel/1.0/test-e2e/test-arrows.js
+++ b/extensions/amp-base-carousel/1.0/test-e2e/test-arrows.js
@@ -1,10 +1,11 @@
+import {useStyles} from '#bento/components/bento-base-carousel/1.0/component.jss';
+
 import {
   getCarousel,
   getNextArrowSlot,
   getPrevArrowSlot,
   getSlide,
 } from './helpers';
-import {useStyles} from '../component.jss';
 
 /** The total number of slides in the carousel */
 const SLIDE_COUNT = 7;
diff --git a/extensions/amp-base-carousel/1.0/test-e2e/test-autoadvance.js b/extensions/amp-base-carousel/1.0/test-e2e/test-autoadvance.js
index d76d28a68718..9138db36e616 100644
--- a/extensions/amp-base-carousel/1.0/test-e2e/test-autoadvance.js
+++ b/extensions/amp-base-carousel/1.0/test-e2e/test-autoadvance.js
@@ -1,6 +1,8 @@
-import {getCarousel, getSlides} from './helpers';
+import {useStyles} from '#bento/components/bento-base-carousel/1.0/component.jss';
+
 import {afterRenderPromise, sleep} from '#testing/helpers';
-import {useStyles} from '../component.jss';
+
+import {getCarousel, getSlides} from './helpers';
 
 const pageWidth = 800;
 const pageHeight = 600;
diff --git a/extensions/amp-base-carousel/1.0/test-e2e/test-component.js b/extensions/amp-base-carousel/1.0/test-e2e/test-component.js
index 477b775c732f..c65d8c89da4c 100644
--- a/extensions/amp-base-carousel/1.0/test-e2e/test-component.js
+++ b/extensions/amp-base-carousel/1.0/test-e2e/test-component.js
@@ -1,5 +1,6 @@
+import {useStyles} from '#bento/components/bento-base-carousel/1.0/component.jss';
+
 import {getCarousel, getScrollingElement, getSlide, getSlides} from './helpers';
-import {useStyles} from '../component.jss';
 
 const pageWidth = 800;
 const pageHeight = 800;
diff --git a/extensions/amp-base-carousel/1.0/test-e2e/test-grouping.js b/extensions/amp-base-carousel/1.0/test-e2e/test-grouping.js
index 7c4c473f7d05..20999619f2a5 100644
--- a/extensions/amp-base-carousel/1.0/test-e2e/test-grouping.js
+++ b/extensions/amp-base-carousel/1.0/test-e2e/test-grouping.js
@@ -1,5 +1,6 @@
+import {useStyles} from '#bento/components/bento-base-carousel/1.0/component.jss';
+
 import {getCarousel, getScrollingElement, getSlide} from './helpers';
-import {useStyles} from '../component.jss';
 
 const pageWidth = 800;
 const pageHeight = 600;
diff --git a/extensions/amp-base-carousel/1.0/test-e2e/test-mixed-lengths-no-snap.js b/extensions/amp-base-carousel/1.0/test-e2e/test-mixed-lengths-no-snap.js
index 5f33dab79f4a..dfe9986370a9 100644
--- a/extensions/amp-base-carousel/1.0/test-e2e/test-mixed-lengths-no-snap.js
+++ b/extensions/amp-base-carousel/1.0/test-e2e/test-mixed-lengths-no-snap.js
@@ -1,5 +1,6 @@
+import {useStyles} from '#bento/components/bento-base-carousel/1.0/component.jss';
+
 import {getCarousel, getScrollingElement, getSlide} from './helpers';
-import {useStyles} from '../component.jss';
 
 const pageWidth = 800;
 const pageHeight = 600;
diff --git a/extensions/amp-base-carousel/1.0/test-e2e/test-mixed-lengths.js b/extensions/amp-base-carousel/1.0/test-e2e/test-mixed-lengths.js
index 2c7d15a40181..f4fa45d100e3 100644
--- a/extensions/amp-base-carousel/1.0/test-e2e/test-mixed-lengths.js
+++ b/extensions/amp-base-carousel/1.0/test-e2e/test-mixed-lengths.js
@@ -1,5 +1,6 @@
+import {useStyles} from '#bento/components/bento-base-carousel/1.0/component.jss';
+
 import {getCarousel, getScrollingElement, getSlide} from './helpers';
-import {useStyles} from '../component.jss';
 
 const pageWidth = 800;
 const pageHeight = 600;
diff --git a/extensions/amp-base-carousel/1.0/test-e2e/test-non-looping.js b/extensions/amp-base-carousel/1.0/test-e2e/test-non-looping.js
index 1ff2d4cff349..79f2d8549e66 100644
--- a/extensions/amp-base-carousel/1.0/test-e2e/test-non-looping.js
+++ b/extensions/amp-base-carousel/1.0/test-e2e/test-non-looping.js
@@ -1,5 +1,6 @@
+import {useStyles} from '#bento/components/bento-base-carousel/1.0/component.jss';
+
 import {getCarousel, getScrollingElement, getSlide} from './helpers';
-import {useStyles} from '../component.jss';
 
 const pageWidth = 800;
 const pageHeight = 600;
diff --git a/extensions/amp-base-carousel/1.0/test-e2e/test-responsive.js b/extensions/amp-base-carousel/1.0/test-e2e/test-responsive.js
index fb73238cf454..ccb2cb547670 100644
--- a/extensions/amp-base-carousel/1.0/test-e2e/test-responsive.js
+++ b/extensions/amp-base-carousel/1.0/test-e2e/test-responsive.js
@@ -1,6 +1,8 @@
+import {useStyles} from '#bento/components/bento-base-carousel/1.0/component.jss';
+
 import {sleep} from '#testing/helpers';
+
 import {getCarousel, getScrollingElement, getSlide} from './helpers';
-import {useStyles} from '../component.jss';
 
 const pageWidth = 1000;
 const pageHeight = 600;
diff --git a/extensions/amp-base-carousel/1.0/test-e2e/test-rtl.js b/extensions/amp-base-carousel/1.0/test-e2e/test-rtl.js
index 4a2eca40d3c8..c792cf7c304d 100644
--- a/extensions/amp-base-carousel/1.0/test-e2e/test-rtl.js
+++ b/extensions/amp-base-carousel/1.0/test-e2e/test-rtl.js
@@ -1,5 +1,6 @@
+import {useStyles} from '#bento/components/bento-base-carousel/1.0/component.jss';
+
 import {getCarousel, getNextArrow, getPrevArrow, getSlide} from './helpers';
-import {useStyles} from '../component.jss';
 
 const pageWidth = 800;
 const pageHeight = 600;
diff --git a/extensions/amp-base-carousel/1.0/test-e2e/test-vertical.js b/extensions/amp-base-carousel/1.0/test-e2e/test-vertical.js
index 26474bff18a9..222a12569984 100644
--- a/extensions/amp-base-carousel/1.0/test-e2e/test-vertical.js
+++ b/extensions/amp-base-carousel/1.0/test-e2e/test-vertical.js
@@ -1,5 +1,6 @@
+import {useStyles} from '#bento/components/bento-base-carousel/1.0/component.jss';
+
 import {getCarousel, getScrollingElement, getSlide} from './helpers';
-import {useStyles} from '../component.jss';
 
 const pageWidth = 600;
 const pageHeight = 600;
diff --git a/extensions/amp-base-carousel/1.0/test/test-amp-base-carousel.js b/extensions/amp-base-carousel/1.0/test/test-amp-base-carousel.js
index 04d3d8ea9261..2e37df34d907 100644
--- a/extensions/amp-base-carousel/1.0/test/test-amp-base-carousel.js
+++ b/extensions/amp-base-carousel/1.0/test/test-amp-base-carousel.js
@@ -1,12 +1,16 @@
 import '../amp-base-carousel';
-import {ActionInvocation} from '#service/action-impl';
-import {ActionTrust} from '#core/constants/action-constants';
+import {useStyles} from '#bento/components/bento-base-carousel/1.0/component.jss';
+
+import {ActionTrust_Enum} from '#core/constants/action-constants';
 import {createElementWithAttributes, waitForChildPromise} from '#core/dom';
-import {mod} from '#core/math';
 import {setStyles} from '#core/dom/style';
+import {mod} from '#core/math';
 import {toArray} from '#core/types/array';
+
 import {toggleExperiment} from '#experiments';
-import {useStyles} from '../component.jss';
+
+import {ActionInvocation} from '#service/action-impl';
+
 import {waitFor, whenCalled} from '#testing/helpers/service';
 
 describes.realWin(
@@ -268,7 +272,7 @@ describes.realWin(
         const source = null;
         const caller = null;
         const event = null;
-        const trust = ActionTrust.DEFAULT;
+        const trust = ActionTrust_Enum.DEFAULT;
         return new ActionInvocation(
           element,
           method,
@@ -280,7 +284,8 @@ describes.realWin(
         );
       }
 
-      it('should execute next and prev actions', async () => {
+      // TODO(#38975): fix skipped test.
+      it.skip('should execute next and prev actions', async () => {
         element.enqueAction(invocation('next'));
         await waitFor(
           () => scroller.scrollLeft === slides[1].offsetLeft,
@@ -344,7 +349,7 @@ describes.realWin(
         const source = null;
         const caller = null;
         const event = null;
-        const trust = ActionTrust.DEFAULT;
+        const trust = ActionTrust_Enum.DEFAULT;
         return new ActionInvocation(
           element,
           method,
diff --git a/extensions/amp-base-carousel/1.0/test/test-component.js b/extensions/amp-base-carousel/1.0/test/test-component.js
deleted file mode 100644
index eaf647c614c3..000000000000
--- a/extensions/amp-base-carousel/1.0/test/test-component.js
+++ /dev/null
@@ -1,172 +0,0 @@
-import * as Preact from '#preact';
-import {BentoBaseCarousel} from '../component';
-import {mount} from 'enzyme';
-import {useStyles} from '../component.jss';
-
-describes.sandboxed('BentoBaseCarousel preact component', {}, () => {
-  const styles = useStyles();
-
-  it('should render Arrows and propagates children to Scroller', () => {
-    const wrapper = mount(
-      <BentoBaseCarousel>
-        <div>slide 1</div>
-        <div>slide 2</div>
-        <div>slide 3</div>
-      </BentoBaseCarousel>
-    );
-
-    const arrows = wrapper.find('Arrow');
-    expect(arrows).to.have.lengthOf(2);
-    const arrow0 = arrows.first();
-    const arrow1 = arrows.last();
-
-    // Arrows are given rtl booleans and propagate them as strings.
-    expect(arrow0.prop('rtl')).to.equal(false);
-    expect(arrow0.children()).to.have.lengthOf(1);
-    expect(arrow0.childAt(0).prop('rtl')).to.equal('false');
-    expect(arrow1.prop('rtl')).to.equal(false);
-    expect(arrow1.children()).to.have.lengthOf(1);
-    expect(arrow1.childAt(0).prop('rtl')).to.equal('false');
-
-    expect(wrapper.find('Scroller').prop('group')).to.be.undefined;
-
-    const slides = wrapper.find('[data-slide]');
-    expect(slides).to.have.lengthOf(3);
-
-    expect(slides.first().text()).to.equal('slide 1');
-    expect(slides.at(1).text()).to.equal('slide 2');
-    expect(slides.last().text()).to.equal('slide 3');
-  });
-
-  it('should render custom Arrows when given', () => {
-    const arrowPrev = (props) => (
-      <div {...props} class="my-custom-arrow-prev">
-        left
-      </div>
-    );
-    const arrowNext = (props) => (
-      <div {...props} class="my-custom-arrow-next">
-        right
-      </div>
-    );
-    const wrapper = mount(
-      <BentoBaseCarousel arrowPrevAs={arrowPrev} arrowNextAs={arrowNext}>
-        <div>slide 1</div>
-        <div>slide 2</div>
-        <div>slide 3</div>
-      </BentoBaseCarousel>
-    );
-    const arrows = wrapper.find('Arrow');
-    expect(arrows).to.have.lengthOf(2);
-    expect(arrows.first().props().as).to.equal(arrowPrev);
-    expect(arrows.last().props().as).to.equal(arrowNext);
-  });
-
-  it('should not loop by default', () => {
-    const wrapper = mount(
-      <BentoBaseCarousel>
-        <div>slide 1</div>
-        <div>slide 2</div>
-        <div>slide 3</div>
-      </BentoBaseCarousel>
-    );
-    const slides = wrapper.find('[data-slide]');
-    expect(slides).to.have.lengthOf(3);
-
-    // Given slides [1][2][3] should be rendered as is, but [3] is a
-    // placeholder.
-    expect(slides.first().text()).to.equal('slide 1');
-    expect(slides.at(1).text()).to.equal('slide 2');
-    expect(slides.last().text()).to.equal('slide 3');
-  });
-
-  it('should render in preparation for looping with loop prop', () => {
-    const wrapper = mount(
-      <BentoBaseCarousel loop>
-        <div>slide 1</div>
-        <div>slide 2</div>
-        <div>slide 3</div>
-      </BentoBaseCarousel>
-    );
-    const slides = wrapper.find('[data-slide]');
-    expect(slides).to.have.lengthOf(3);
-
-    // Given slides [1][2][3] should be rendered as [3][1][2]. But [3] is a
-    // placeholder.
-    expect(slides.at(0).text()).to.equal('slide 3');
-    expect(slides.at(1).text()).to.equal('slide 1');
-    expect(slides.at(2).text()).to.equal('slide 2');
-  });
-
-  it('should snap to slides by default', () => {
-    const wrapper = mount(
-      <BentoBaseCarousel>
-        <div>slide 1</div>
-        <div>slide 2</div>
-        <div>slide 3</div>
-      </BentoBaseCarousel>
-    );
-    expect(wrapper.find(`[snap="true"]`)).not.to.be.null;
-    expect(wrapper.find(`.${styles.enableSnap}`)).to.have.lengthOf(3);
-  });
-
-  it('should not snap to slides with snap={false}', () => {
-    const wrapper = mount(
-      <BentoBaseCarousel snap={false}>
-        <div>slide 1</div>
-        <div>slide 2</div>
-        <div>slide 3</div>
-      </BentoBaseCarousel>
-    );
-    expect(wrapper.find(`[snap="false"]`)).not.to.be.null;
-    expect(wrapper.find(`.${styles.disableSnap}`)).to.have.lengthOf(3);
-  });
-
-  it('should render Arrows with controls=always', () => {
-    const wrapper = mount(
-      <BentoBaseCarousel controls="always">
-        <div>slide 1</div>
-        <div>slide 2</div>
-        <div>slide 3</div>
-      </BentoBaseCarousel>
-    );
-    expect(wrapper.find('Arrow')).to.have.lengthOf(2);
-  });
-
-  it('should render Arrows with controls=never and outset-arrows', () => {
-    const wrapper = mount(
-      <BentoBaseCarousel controls="never" outsetArrows>
-        <div>slide 1</div>
-        <div>slide 2</div>
-        <div>slide 3</div>
-      </BentoBaseCarousel>
-    );
-    expect(wrapper.find('Arrow')).to.have.lengthOf(2);
-  });
-
-  it('should not render Arrows with controls=never', () => {
-    const wrapper = mount(
-      <BentoBaseCarousel controls="never">
-        <div>slide 1</div>
-        <div>slide 2</div>
-        <div>slide 3</div>
-      </BentoBaseCarousel>
-    );
-    expect(wrapper.find('Arrow')).to.have.lengthOf(0);
-  });
-
-  it('should respect snap-by if snapping', () => {
-    const wrapper = mount(
-      <BentoBaseCarousel snapBy={2} controls="never">
-        <div>slide 1</div>
-        <div>slide 2</div>
-        <div>slide 3</div>
-        <div>slide 4</div>
-      </BentoBaseCarousel>
-    );
-    const snapEnabledSlides = wrapper.find(`.${styles.enableSnap}`);
-    expect(snapEnabledSlides).to.have.lengthOf(2);
-    expect(snapEnabledSlides.at(0).text()).to.equal('slide 1');
-    expect(snapEnabledSlides.at(1).text()).to.equal('slide 3');
-  });
-});
diff --git a/extensions/amp-base-carousel/validator-amp-base-carousel.protoascii b/extensions/amp-base-carousel/validator-amp-base-carousel.protoascii
index 8a597cdff96d..f6c9542117a6 100644
--- a/extensions/amp-base-carousel/validator-amp-base-carousel.protoascii
+++ b/extensions/amp-base-carousel/validator-amp-base-carousel.protoascii
@@ -162,6 +162,7 @@ tags: {
   html_format: AMP
   tag_name: "$REFERENCE_POINT"
   spec_name: "AMP-BASE-CAROUSEL lightbox [lightbox-exclude]"
+  descriptive_name: "amp-base-carousel [lightbox-exclude] child"
   attrs: {
     name: "lightbox-exclude"
     mandatory: true
@@ -171,6 +172,7 @@ tags: {
   html_format: AMP
   tag_name: "$REFERENCE_POINT"
   spec_name: "AMP-BASE-CAROUSEL lightbox [child]"
+  descriptive_name: "amp-base-carousel [lightbox-thumbnail-id] child"
   attrs: {
     name: "lightbox-thumbnail-id"
     value_regex_casei: "^[a-z][a-z\\d_-]*"
diff --git a/extensions/amp-bind/0.1/amp-bind-macro.js b/extensions/amp-bind/0.1/amp-bind-macro.js
index 0a90d75fe669..e5e8c9f01462 100644
--- a/extensions/amp-bind/0.1/amp-bind-macro.js
+++ b/extensions/amp-bind/0.1/amp-bind-macro.js
@@ -1,4 +1,4 @@
-import {LayoutPriority} from '#core/dom/layout';
+import {LayoutPriority_Enum} from '#core/dom/layout';
 
 /**
  * The <amp-bind-macro> element is used to define an expression macro that can
@@ -8,7 +8,7 @@ export class AmpBindMacro extends AMP.BaseElement {
   /** @override */
   getLayoutPriority() {
     // Loads after other content.
-    return LayoutPriority.METADATA;
+    return LayoutPriority_Enum.METADATA;
   }
 
   /** @override */
diff --git a/extensions/amp-bind/0.1/amp-state.js b/extensions/amp-bind/0.1/amp-state.js
index ccba57322882..60f924c4ee6c 100644
--- a/extensions/amp-bind/0.1/amp-state.js
+++ b/extensions/amp-bind/0.1/amp-state.js
@@ -1,9 +1,9 @@
-import {ActionTrust} from '#core/constants/action-constants';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
 import {Deferred} from '#core/data-structures/promise';
 import {isJsonScriptTag} from '#core/dom';
-import {LayoutPriority} from '#core/dom/layout';
+import {LayoutPriority_Enum} from '#core/dom/layout';
 import {toggle} from '#core/dom/style';
-import {dict, map} from '#core/types/object';
+import {map} from '#core/types/object';
 import {tryParseJson} from '#core/types/object/json';
 
 import {Services} from '#service';
@@ -39,7 +39,7 @@ export class AmpState extends AMP.BaseElement {
   /** @override */
   getLayoutPriority() {
     // Loads after other content.
-    return LayoutPriority.METADATA;
+    return LayoutPriority_Enum.METADATA;
   }
 
   /** @override */
@@ -178,15 +178,13 @@ export class AmpState extends AMP.BaseElement {
 
     return this.fetch_(ampdoc, policy, opt_refresh).catch((error) => {
       const event = error
-        ? createCustomEvent(
-            this.win,
-            'amp-state.error',
-            dict({'response': error.response})
-          )
+        ? createCustomEvent(this.win, 'amp-state.error', {
+            'response': error.response,
+          })
         : null;
       // Trigger "fetch-error" event on fetch failure.
       const actions = Services.actionServiceForDoc(element);
-      actions.trigger(element, 'fetch-error', event, ActionTrust.LOW);
+      actions.trigger(element, 'fetch-error', event, ActionTrust_Enum.LOW);
     });
   }
 
diff --git a/extensions/amp-bind/0.1/bind-evaluator.js b/extensions/amp-bind/0.1/bind-evaluator.js
index 5c47ea1e495c..c3d230c994d4 100644
--- a/extensions/amp-bind/0.1/bind-evaluator.js
+++ b/extensions/amp-bind/0.1/bind-evaluator.js
@@ -18,14 +18,14 @@ export class BindEvaluator {
 
     /**
      * Maps `id` to parsed BindMacro objects for all <amp-bind-macro> on page.
-     * @private @const {!Object<string, !./bind-macro.BindMacro>}
+     * @private @const {!{[key: string]: !./bind-macro.BindMacro}}
      */
     this.macros_ = Object.create(null);
 
     /** @const @private {!./bind-validator.BindValidator} */
     this.validator_ = new BindValidator(allowUrlProperties);
 
-    /** @const @private {!Object<string, !BindExpression>} */
+    /** @const @private {!{[key: string]: !BindExpression}} */
     this.expressions_ = Object.create(null);
   }
 
@@ -33,7 +33,7 @@ export class BindEvaluator {
    * Parses and stores given bindings into expression objects and returns map
    * of expression string to parse errors.
    * @param {!Array<!BindBindingDef>} bindings
-   * @return {!Object<string, !BindEvaluatorErrorDef>},
+   * @return {!{[key: string]: !BindEvaluatorErrorDef}},
    */
   addBindings(bindings) {
     const errors = Object.create(null);
@@ -71,7 +71,7 @@ export class BindEvaluator {
    * Parses and stores the given macros and returns map of macro `id` to
    * parse errors.
    * @param {!Array<!BindMacroDef>} macros
-   * @return {!Object<string, !BindEvaluatorErrorDef>}
+   * @return {!{[key: string]: !BindEvaluatorErrorDef}}
    */
   addMacros(macros) {
     const errors = [];
@@ -98,9 +98,9 @@ export class BindEvaluator {
    * @return {!BindEvaluateBindingsResultDef}
    */
   evaluateBindings(scope) {
-    /** @type {!Object<string, BindExpressionResultDef>} */
+    /** @type {!{[key: string]: BindExpressionResultDef}} */
     const cache = Object.create(null);
-    /** @type {!Object<string, !BindEvaluatorErrorDef>} */
+    /** @type {!{[key: string]: !BindEvaluatorErrorDef}} */
     const errors = Object.create(null);
 
     this.setGlobals_(scope);
@@ -235,7 +235,7 @@ export class BindEvaluator {
 
   /**
    * Returns the expression cache for testing.
-   * @return {!Object<string, !BindExpression>}
+   * @return {!{[key: string]: !BindExpression}}
    * @visibleForTesting
    */
   expressionsForTesting() {
diff --git a/extensions/amp-bind/0.1/bind-expression.js b/extensions/amp-bind/0.1/bind-expression.js
index b4e967638aa4..2e5bd7df280f 100644
--- a/extensions/amp-bind/0.1/bind-expression.js
+++ b/extensions/amp-bind/0.1/bind-expression.js
@@ -1,7 +1,7 @@
 import {bindParser as parser} from '#build/parsers/bind-expr-impl';
 
 import {isArray, isObject} from '#core/types';
-import {dict, hasOwn, map} from '#core/types/object';
+import {hasOwn, map} from '#core/types/object';
 
 import {devAssert, user} from '#utils/log';
 
@@ -15,19 +15,19 @@ const TAG = 'amp-bind';
  * Maximum number of nodes in an expression AST.
  * @const @private {number}
  */
-const MAX_AST_SIZE = 100;
+const MAX_AST_SIZE = 250;
 
 /** @const @private {string} */
 const CUSTOM_FUNCTIONS = 'custom-functions';
 
 /**
  * Map of object type to function name to allowlisted function.
- * @private {!Object<string, !Object<string, Function>>}
+ * @private {!{[key: string]: !{[key: string]: Function}}}
  */
 let FUNCTION_ALLOWLIST;
 
 /**
- * @return {!Object<string, !Object<string, Function>>}
+ * @return {!{[key: string]: !{[key: string]: Function}}}
  * @private
  */
 function generateFunctionAllowlist() {
@@ -104,7 +104,7 @@ function generateFunctionAllowlist() {
   }
 
   // Prototype functions.
-  const allowlist = dict({
+  const allowlist = {
     '[object Array]': {
       // TODO(choumx): Polyfill Array#find and Array#findIndex for IE.
       'concat': Array.prototype.concat,
@@ -140,7 +140,7 @@ function generateFunctionAllowlist() {
       'toLowerCase': String.prototype.toLowerCase,
       'toUpperCase': String.prototype.toUpperCase,
     },
-  });
+  };
 
   // Un-namespaced static functions.
   allowlist[CUSTOM_FUNCTIONS] = {
@@ -200,7 +200,7 @@ function generateFunctionAllowlist() {
 export class BindExpression {
   /**
    * @param {string} expressionString
-   * @param {!Object<string, !./bind-macro.BindMacro>} macros
+   * @param {!{[key: string]: !./bind-macro.BindMacro}} macros
    * @param {number=} opt_maxAstSize
    * @throws {Error} On malformed expressions.
    */
@@ -212,7 +212,7 @@ export class BindExpression {
     /** @const {string} */
     this.expressionString = expressionString;
 
-    /** @private @const {!Object<string, !./bind-macro.BindMacro>} */
+    /** @private @const {!{[key: string]: !./bind-macro.BindMacro}} */
     this.macros_ = macros;
 
     /** @const @private {!./bind-expr-defines.AstNode} */
diff --git a/extensions/amp-bind/0.1/bind-impl.js b/extensions/amp-bind/0.1/bind-impl.js
index 4321c770d01e..c5b7d12aac40 100644
--- a/extensions/amp-bind/0.1/bind-impl.js
+++ b/extensions/amp-bind/0.1/bind-impl.js
@@ -1,16 +1,15 @@
 import {RAW_OBJECT_ARGS_KEY} from '#core/constants/action-constants';
-import {AmpEvents} from '#core/constants/amp-events';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
 import {Deferred} from '#core/data-structures/promise';
 import {Signals} from '#core/data-structures/signals';
 import {isAmp4Email} from '#core/document/format';
-import {iterateCursor} from '#core/dom';
 import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 import {escapeCssSelectorIdent} from '#core/dom/css-selectors';
 import {closestAncestorElementBySelector} from '#core/dom/query';
 import {isFiniteNumber, isObject} from '#core/types';
 import {findIndex, isArray, remove, toArray} from '#core/types/array';
 import {debounce} from '#core/types/function';
-import {deepMerge, dict, getValueForExpr, map} from '#core/types/object';
+import {deepMerge, getValueForExpr, map} from '#core/types/object';
 import {deepEquals, parseJson} from '#core/types/object/json';
 
 import {Services} from '#service';
@@ -21,7 +20,7 @@ import {dev, devAssert, user} from '#utils/log';
 import {BindEvents} from './bind-events';
 import {BindValidator} from './bind-validator';
 
-import {ChunkPriority, chunk} from '../../../src/chunk';
+import {ChunkPriority_Enum, chunk} from '../../../src/chunk';
 import {reportError} from '../../../src/error-reporting';
 import {getMode} from '../../../src/mode';
 import {rewriteAttributesForElement} from '../../../src/url-rewrite';
@@ -43,7 +42,7 @@ const AMP_CSS_RE = /^(i?-)?amp(html)?-/;
  */
 const MAX_MERGE_DEPTH = 10;
 
-/** @const {!Object<string, !Object<string, boolean>>} */
+/** @const {!{[key: string]: !{[key: string]: boolean}}} */
 const FORM_VALUE_PROPERTIES = {
   'INPUT': {
     'checked': true,
@@ -89,7 +88,7 @@ let BoundElementDef;
  * A map of tag names to arrays of attributes that do not have non-bind
  * counterparts. For instance, amp-carousel allows a `[slide]` attribute,
  * but does not support a `slide` attribute.
- * @const {!Object<string, !Array<string>>}
+ * @const {!{[key: string]: !Array<string>}}
  */
 const BIND_ONLY_ATTRIBUTES = map({
   'AMP-CAROUSEL': ['slide'],
@@ -147,7 +146,7 @@ export class Bind {
 
     /**
      * Maps expression string to the element(s) that contain it.
-     * @private @const {!Object<string, !Array<!Element>>}
+     * @private @const {!{[key: string]: !Array<!Element>}}
      */
     this.expressionToElements_ = map();
 
@@ -292,7 +291,7 @@ export class Bind {
 
       this.signals_.signal('FIRST_MUTATE');
 
-      const scope = dict();
+      const scope = {};
       if (event && getDetail(/** @type {!Event} */ (event))) {
         scope['event'] = getDetail(/** @type {!Event} */ (event));
       }
@@ -400,10 +399,10 @@ export class Bind {
    * @return {!Promise<?JsonObject>}
    */
   getDataForHistory_() {
-    const data = dict({
-      'data': dict({'amp-bind': this.state_}),
+    const data = {
+      'data': {'amp-bind': this.state_},
       'title': this.localWin_.document.title,
-    });
+    };
     if (!this.viewer_.isEmbedded()) {
       // CC doesn't recognize !JsonObject as a subtype of (JsonObject|null).
       return /** @type {!Promise<?JsonObject>} */ (Promise.resolve(data));
@@ -601,7 +600,7 @@ export class Bind {
       })
       .then(() => {
         // Listen for DOM updates (e.g. template render) to rescan for bindings.
-        root.addEventListener(AmpEvents.DOM_UPDATE, (e) =>
+        root.addEventListener(AmpEvents_Enum.DOM_UPDATE, (e) =>
           this.onDomUpdate_(e)
         );
       })
@@ -705,7 +704,7 @@ export class Bind {
     // created elements. Should do what <amp-state> does.
     const elements = this.ampdoc.getBody().querySelectorAll('AMP-BIND-MACRO');
     const macros = /** @type {!Array<!BindMacroDef>} */ ([]);
-    iterateCursor(elements, (element) => {
+    elements.forEach((element) => {
       const argumentNames = (element.getAttribute('arguments') || '')
         .split(',')
         .map((s) => s.trim());
@@ -920,10 +919,10 @@ export class Bind {
         if (completed) {
           resolve({bindings, limitExceeded});
         } else {
-          chunk(this.ampdoc, chunktion, ChunkPriority.LOW);
+          chunk(this.ampdoc, chunktion, ChunkPriority_Enum.LOW);
         }
       };
-      chunk(this.ampdoc, chunktion, ChunkPriority.LOW);
+      chunk(this.ampdoc, chunktion, ChunkPriority_Enum.LOW);
     });
   }
 
@@ -1045,7 +1044,7 @@ export class Bind {
 
   /**
    * Reevaluates all expressions and returns a map of expressions to results.
-   * @return {!Promise<!Object<string, BindExpressionResultDef>>}
+   * @return {!Promise<!{[key: string]: BindExpressionResultDef}>}
    * @private
    */
   evaluate_() {
@@ -1075,7 +1074,7 @@ export class Bind {
   /**
    * Verifies expression results vs. current DOM state and returns an
    * array of bindings with mismatches (if any).
-   * @param {Object<string, BindExpressionResultDef>} results
+   * @param {{[key: string]: BindExpressionResultDef}} results
    * @param {?Array<!Element>=} elements If provided, only verifies bindings
    *     contained within the given elements. Otherwise, verifies all bindings.
    * @param {boolean=} warn If true, emits a user warning for verification
@@ -1149,7 +1148,7 @@ export class Bind {
    * will only return properties that need to be updated along with their
    * new value.
    * @param {!Array<!BoundPropertyDef>} boundProperties
-   * @param {Object<string, BindExpressionResultDef>} results
+   * @param {{[key: string]: BindExpressionResultDef}} results
    * @return {!Array<{boundProperty: !BoundPropertyDef, newValue: BindExpressionResultDef}>}
    * @private
    */
@@ -1175,7 +1174,7 @@ export class Bind {
   /**
    * Applies expression results to elements in the document.
    *
-   * @param {Object<string, BindExpressionResultDef>} results
+   * @param {{[key: string]: BindExpressionResultDef}} results
    * @param {!ApplyOptionsDef} opts
    * @return {!Promise}
    * @private
@@ -1267,7 +1266,7 @@ export class Bind {
   }
 
   /**
-   * Dispatches an `AmpEvents.FORM_VALUE_CHANGE` if the element's changed
+   * Dispatches an `AmpEvents_Enum.FORM_VALUE_CHANGE` if the element's changed
    * property represents the value of a form field.
    * @param {!Element} element
    * @param {string} property
@@ -1288,7 +1287,7 @@ export class Bind {
     if (dispatchAt) {
       const ampValueChangeEvent = createCustomEvent(
         this.localWin_,
-        AmpEvents.FORM_VALUE_CHANGE,
+        AmpEvents_Enum.FORM_VALUE_CHANGE,
         /* detail */ null,
         {bubbles: true}
       );
diff --git a/extensions/amp-bind/0.1/bind-macro.js b/extensions/amp-bind/0.1/bind-macro.js
index bd7df1970689..1bc1adcfdcad 100644
--- a/extensions/amp-bind/0.1/bind-macro.js
+++ b/extensions/amp-bind/0.1/bind-macro.js
@@ -6,7 +6,7 @@ import {BindExpression} from './bind-expression';
 export class BindMacro {
   /**
    * @param {!BindMacroDef} data
-   * @param {!Object<string, !BindMacro>} referableMacros
+   * @param {!{[key: string]: !BindMacro}} referableMacros
    */
   constructor(data, referableMacros) {
     /** @const @private {!Array<string>} */
diff --git a/extensions/amp-bind/0.1/bind-validator.js b/extensions/amp-bind/0.1/bind-validator.js
index 2f06fc02309d..32f5c750cde0 100644
--- a/extensions/amp-bind/0.1/bind-validator.js
+++ b/extensions/amp-bind/0.1/bind-validator.js
@@ -7,7 +7,7 @@ const TAG = 'amp-bind';
 
 /**
  * @typedef {{
- *   allowedProtocols: (!Object<string,boolean>|undefined),
+ *   allowedProtocols: (!{[key: string]: boolean}|undefined),
  *   alternativeName: (string|undefined),
  * }}
  */
@@ -15,7 +15,7 @@ let PropertyRulesDef;
 
 /**
  * Property rules that apply to any and all tags.
- * @private {Object<string, ?PropertyRulesDef>}
+ * @private {{[key: string]: ?PropertyRulesDef}}
  */
 const GLOBAL_PROPERTY_RULES = {
   'class': {
@@ -27,7 +27,7 @@ const GLOBAL_PROPERTY_RULES = {
 
 /**
  * Property rules that apply to all AMP elements.
- * @private {Object<string, ?PropertyRulesDef>}
+ * @private {{[key: string]: ?PropertyRulesDef}}
  */
 const AMP_PROPERTY_RULES = {
   'width': null,
@@ -38,13 +38,13 @@ const AMP_PROPERTY_RULES = {
  * Maps tag names to property names to PropertyRulesDef.
  * If `ELEMENT_RULES[tag][property]` is null, then all values are valid
  * for that property in that tag.
- * @private {Object<string, Object<string, ?PropertyRulesDef>>}}
+ * @private {{[key: string]: {[key: string]: ?PropertyRulesDef}}}}
  */
 const ELEMENT_RULES = createElementRules_();
 
 /**
  * Map whose keys comprise all properties that contain URLs.
- * @private {Object<string, boolean>}
+ * @private {{[key: string]: boolean}}
  */
 const URL_PROPERTIES = {
   'src': true,
@@ -199,7 +199,7 @@ export class BindValidator {
 }
 
 /**
- * @return {Object<string, Object<string, ?PropertyRulesDef>>}}
+ * @return {{[key: string]: {[key: string]: ?PropertyRulesDef}}}}
  * @private
  */
 function createElementRules_() {
@@ -362,6 +362,7 @@ function createElementRules_() {
           'fb-messenger': true,
           'intent': true,
           'line': true,
+          'microsoft-edge': true,
           'skype': true,
           'sms': true,
           'snapchat': true,
diff --git a/extensions/amp-bind/0.1/test/integration/test-bind-impl.js b/extensions/amp-bind/0.1/test/integration/test-bind-impl.js
index 0e3475e484ad..48e90947d172 100644
--- a/extensions/amp-bind/0.1/test/integration/test-bind-impl.js
+++ b/extensions/amp-bind/0.1/test/integration/test-bind-impl.js
@@ -6,7 +6,7 @@
 import * as fakeTimers from '@sinonjs/fake-timers';
 
 import {RAW_OBJECT_ARGS_KEY} from '#core/constants/action-constants';
-import {AmpEvents} from '#core/constants/amp-events';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
 import {Deferred} from '#core/data-structures/promise';
 import {toArray} from '#core/types/array';
 
@@ -197,7 +197,7 @@ function waitForEvent(env, name) {
 }
 
 const FORM_VALUE_CHANGE_EVENT_ARGUMENTS = {
-  type: AmpEvents.FORM_VALUE_CHANGE,
+  type: AmpEvents_Enum.FORM_VALUE_CHANGE,
   bubbles: true,
 };
 const chromed = describes.sandboxed.configure().ifChrome();
@@ -614,7 +614,7 @@ chromed.run('Bind', {}, function () {
               });
               dynamicTag.appendChild(element);
               dynamicTag.dispatchEvent(
-                new Event(AmpEvents.DOM_UPDATE, {bubbles: true})
+                new Event(AmpEvents_Enum.DOM_UPDATE, {bubbles: true})
               );
               return waitForEvent(env, BindEvents.RESCAN_TEMPLATE);
             })
@@ -1533,7 +1533,7 @@ chromed.run('Bind', {}, function () {
           });
         });
 
-        describe('AmpEvents.FORM_VALUE_CHANGE', () => {
+        describe('AmpEvents_Enum.FORM_VALUE_CHANGE', () => {
           it('should dispatch FORM_VALUE_CHANGE on <input [value]> changes', () => {
             const element = createElement(env, container, '[value]="foo"', {
               tag: 'input',
@@ -1579,7 +1579,7 @@ chromed.run('Bind', {}, function () {
               () => {
                 expect(spy).to.have.been.calledOnce;
                 expect(spy).calledWithMatch({
-                  type: AmpEvents.FORM_VALUE_CHANGE,
+                  type: AmpEvents_Enum.FORM_VALUE_CHANGE,
                   bubbles: true,
                 });
               }
@@ -1596,7 +1596,7 @@ chromed.run('Bind', {}, function () {
             return onBindReadyAndSetState(env, bind, {foo: 'bar'}).then(() => {
               expect(spy).to.have.been.calledOnce;
               expect(spy).calledWithMatch({
-                type: AmpEvents.FORM_VALUE_CHANGE,
+                type: AmpEvents_Enum.FORM_VALUE_CHANGE,
                 bubbles: true,
               });
             });
diff --git a/extensions/amp-bind/0.1/test/test-amp-state.js b/extensions/amp-bind/0.1/test/test-amp-state.js
index 7d74da362ba3..a3e9f40a21e7 100644
--- a/extensions/amp-bind/0.1/test/test-amp-state.js
+++ b/extensions/amp-bind/0.1/test/test-amp-state.js
@@ -1,8 +1,10 @@
 import '../amp-bind';
-import {ActionTrust} from '#core/constants/action-constants';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
 
 import {Services} from '#service';
 
+import {macroTask} from '#testing/helpers';
+
 import {UrlReplacementPolicy_Enum} from '../../../../src/batched-json';
 
 describes.realWin(
@@ -77,7 +79,7 @@ describes.realWin(
       await whenFirstVisiblePromise;
 
       // await one macro-task to let viewer/fetch promise chains resolve.
-      await new Promise((resolve) => setTimeout(resolve, 0));
+      await macroTask();
 
       expect(ampState.fetch_).to.have.been.calledOnce;
       expect(ampState.fetch_).to.have.been.calledWithExactly(
@@ -107,13 +109,13 @@ describes.realWin(
       await whenFirstVisiblePromise;
 
       // await one macro-task to let viewer/fetch promise chains resolve.
-      await new Promise((resolve) => setTimeout(resolve, 0));
+      await macroTask();
 
       expect(actions.trigger).to.have.been.calledWithExactly(
         element,
         'fetch-error',
         /* event */ null,
-        ActionTrust.LOW
+        ActionTrust_Enum.LOW
       );
     });
 
@@ -146,7 +148,7 @@ describes.realWin(
       await whenFirstVisiblePromise;
 
       // await one macro-task to let viewer/fetch promise chains resolve.
-      await new Promise((resolve) => setTimeout(resolve, 0));
+      await macroTask();
 
       // One call from build(), one call from "refresh" action.
       expect(ampState.fetch_).to.have.been.calledTwice;
@@ -163,7 +165,7 @@ describes.realWin(
       );
 
       // await one macro-task to let viewer/fetch promise chains resolve.
-      await new Promise((resolve) => setTimeout(resolve, 0));
+      await macroTask();
 
       expect(ampState.fetch_).to.not.have.been.called;
     });
@@ -185,7 +187,7 @@ describes.realWin(
       await whenFirstVisiblePromise;
 
       // await a single macro-task to let promise chains resolve.
-      await new Promise((resolve) => setTimeout(resolve, 0));
+      await macroTask();
 
       expect(bind.setState).calledWithMatch(
         {myAmpState: {remote: 'data'}},
@@ -223,7 +225,7 @@ describes.realWin(
       await whenFirstVisiblePromise;
 
       // await a single macro-task to let promise chains resolve.
-      await new Promise((resolve) => setTimeout(resolve, 0));
+      await macroTask();
 
       expect(ampState.fetch_).to.have.been.called;
       expect(bind.setState).calledWithMatch(
diff --git a/extensions/amp-bind/amp-bind.md b/extensions/amp-bind/amp-bind.md
index e9e71955a797..e929f71e9a3a 100644
--- a/extensions/amp-bind/amp-bind.md
+++ b/extensions/amp-bind/amp-bind.md
@@ -227,6 +227,17 @@ An `amp-state` element may contain either a child `<script>` element **OR** a `s
 <amp-state id="myRemoteState" src="https://data.com/articles.json"> </amp-state>
 ```
 
+As an `amp-state` element stores a JSON object literal, you can also initialize
+it with an object, as above, or with a constant.
+
+```html
+<amp-state id="singleton">
+  <script type="application/json">
+    'I am a string'
+  </script>
+</amp-state>
+```
+
 [/filter] <!-- formats="websites, ads" -->
 
 [filter formats="email"]
@@ -321,6 +332,8 @@ Expressions are not evaluated on page load, but you may define an initial state.
 
 Use [expressions](#expressions) to reference **state variables**. If the JSON data is not nested in the `<amp-state>` component, reference the states via dot syntax. In the above example, `myState.foo` evaluates to "bar".
 
+[filter formats="websites, ads"]
+
 An `<amp-state>` element can also specify a CORS URL instead of a child JSON script. See the [`<amp-state>` specification](#amp-state-specification) for details.
 
 ```html
@@ -328,6 +341,8 @@ An `<amp-state>` element can also specify a CORS URL instead of a child JSON scr
 </amp-state>
 ```
 
+[/filter] <!-- formats="websites, ads" -->
+
 ### Updating state variables with `AMP.setState()`
 
 The [`AMP.setState()`](../../docs/spec/amp-actions-and-events.md#amp) action merges an object literal into the state. This means you can update the value of a defined state variable.
@@ -532,7 +547,7 @@ Using `AMP.pushState()` sets the current state to the most recent pushed state.
 -   Only `amp-bind` [allowlisted functions](#allowlisted-functions) and operators are usable. are usable. Use of arrow functions are allowed as function parameters, e.g. `[1, 2, 3].map(x => x + 1)`.
     -   Custom functions, classes and loops are disallowed.
 -   Undefined variables and array-index-out-of-bounds return `null` instead of `undefined` or throwing errors.
--   A single expression is currently capped at 50 operands for performance. Please [contact us](https://github.com/ampproject/amphtml/issues/new/choose) if this is insufficient for your use case.
+-   A single expression is currently capped at 250 operands for performance. Please [contact us](https://github.com/ampproject/amphtml/issues/new/choose) if this is insufficient for your use case.
 
 The following are all valid expressions:
 
diff --git a/extensions/amp-bind/validator-amp-bind.protoascii b/extensions/amp-bind/validator-amp-bind.protoascii
index 1d2cb4570d4a..d9e0d6bf4693 100644
--- a/extensions/amp-bind/validator-amp-bind.protoascii
+++ b/extensions/amp-bind/validator-amp-bind.protoascii
@@ -80,7 +80,7 @@ tags: {  # <amp-state>
   }
   spec_url: "https://amp.dev/documentation/components/amp-bind/"
 }
-# AMP4ADS and AMP4EMAIL enforces the the same restrictions on the 'src'
+# AMP4ADS and AMP4EMAIL enforces the same restrictions on the 'src'
 # attribute of AMP-IMG and AMP-LIST on the src attribute of AMP-STATE. Use of
 # 'credential' is disallowed.
 tags: {  # <amp-state>
diff --git a/extensions/amp-bodymovin-animation/0.1/amp-bodymovin-animation.js b/extensions/amp-bodymovin-animation/0.1/amp-bodymovin-animation.js
index a903b704208d..12897c65b2e8 100644
--- a/extensions/amp-bodymovin-animation/0.1/amp-bodymovin-animation.js
+++ b/extensions/amp-bodymovin-animation/0.1/amp-bodymovin-animation.js
@@ -1,10 +1,9 @@
-import {ActionTrust} from '#core/constants/action-constants';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
 import {Deferred} from '#core/data-structures/promise';
 import {removeElement} from '#core/dom';
 import {applyFillContent, isLayoutSizeDefined} from '#core/dom/layout';
 import {clamp} from '#core/math';
 import {isFiniteNumber, isObject} from '#core/types';
-import {dict} from '#core/types/object';
 import {parseJson} from '#core/types/object/json';
 
 import {Services} from '#service';
@@ -90,21 +89,21 @@ export class AmpBodymovinAnimation extends AMP.BaseElement {
       () => {
         this.play_();
       },
-      ActionTrust.LOW
+      ActionTrust_Enum.LOW
     );
     this.registerAction(
       'pause',
       () => {
         this.pause_();
       },
-      ActionTrust.LOW
+      ActionTrust_Enum.LOW
     );
     this.registerAction(
       'stop',
       () => {
         this.stop_();
       },
-      ActionTrust.LOW
+      ActionTrust_Enum.LOW
     );
     this.registerAction(
       'seekTo',
@@ -114,7 +113,7 @@ export class AmpBodymovinAnimation extends AMP.BaseElement {
           this.seekTo_(args);
         }
       },
-      ActionTrust.LOW
+      ActionTrust_Enum.LOW
     );
   }
 
@@ -202,13 +201,11 @@ export class AmpBodymovinAnimation extends AMP.BaseElement {
   sendCommand_(action, opt_valueType, opt_value) {
     this.playerReadyPromise_.then(() => {
       if (this.iframe_ && this.iframe_.contentWindow) {
-        const message = JSON.stringify(
-          dict({
-            'action': action,
-            'valueType': opt_valueType || '',
-            'value': opt_value || '',
-          })
-        );
+        const message = JSON.stringify({
+          'action': action,
+          'valueType': opt_valueType || '',
+          'value': opt_value || '',
+        });
         this.iframe_.contentWindow./*OK*/ postMessage(message, '*');
       }
     });
@@ -230,7 +227,7 @@ export class AmpBodymovinAnimation extends AMP.BaseElement {
   }
 
   /**
-   * @param {Object} args
+   * @param {object} args
    * @private
    */
   seekTo_(args) {
diff --git a/extensions/amp-brid-player/0.1/amp-brid-player.js b/extensions/amp-brid-player/0.1/amp-brid-player.js
index 1e5e3bb96d62..c6074b1e0049 100644
--- a/extensions/amp-brid-player/0.1/amp-brid-player.js
+++ b/extensions/amp-brid-player/0.1/amp-brid-player.js
@@ -1,6 +1,10 @@
 import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';
 import {Deferred} from '#core/data-structures/promise';
-import {dispatchCustomEvent, removeElement} from '#core/dom';
+import {
+  dispatchCustomEvent,
+  getChildJsonConfig,
+  removeElement,
+} from '#core/dom';
 import {
   fullscreenEnter,
   fullscreenExit,
@@ -28,7 +32,7 @@ import {
   redispatch,
 } from '../../../src/iframe-video';
 import {assertAbsoluteHttpOrHttpsUrl} from '../../../src/url';
-import {VideoEvents} from '../../../src/video-interface';
+import {VideoEvents_Enum} from '../../../src/video-interface';
 
 const TAG = 'amp-brid-player';
 
@@ -124,8 +128,8 @@ class AmpBridPlayer extends AMP.BaseElement {
       feedType = 'outstream';
     }
 
-    //Create iframe
-    const src =
+    // Create iframe
+    let src =
       'https://services.brid.tv/services/iframe/' +
       encodeURIComponent(feedType) +
       '/' +
@@ -138,6 +142,12 @@ class AmpBridPlayer extends AMP.BaseElement {
       itemsNum +
       '/?amp=1';
 
+    // Append child JSON config if supplied
+    try {
+      const customConfig = getChildJsonConfig(this.element);
+      src += '&cust_config=' + JSON.stringify(customConfig);
+    } catch (e) {}
+
     this.videoIframeSrc_ = assertAbsoluteHttpOrHttpsUrl(src);
 
     return this.videoIframeSrc_;
@@ -352,13 +362,13 @@ class AmpBridPlayer extends AMP.BaseElement {
           break;
       }
       redispatch(element, params[3], {
-        'ready': VideoEvents.LOAD,
-        'play': VideoEvents.PLAYING,
-        'pause': VideoEvents.PAUSE,
-        'ended': VideoEvents.ENDED,
-        'adStart': VideoEvents.AD_START,
-        'adEnd': VideoEvents.AD_END,
-        'loadedmetadata': VideoEvents.LOADEDMETADATA,
+        'ready': VideoEvents_Enum.LOAD,
+        'play': VideoEvents_Enum.PLAYING,
+        'pause': VideoEvents_Enum.PAUSE,
+        'ended': VideoEvents_Enum.ENDED,
+        'adStart': VideoEvents_Enum.AD_START,
+        'adEnd': VideoEvents_Enum.AD_END,
+        'loadedmetadata': VideoEvents_Enum.LOADEDMETADATA,
       });
     }
 
@@ -483,6 +493,7 @@ class AmpBridPlayer extends AMP.BaseElement {
   }
 }
 
-AMP.extension(TAG, '0.1', (AMP) => {
-  AMP.registerElement(TAG, AmpBridPlayer);
+AMP.extension('amp-brid-player', '0.1', (AMP) => {
+  AMP.registerElement('amp-brid-player', AmpBridPlayer);
+  AMP.registerElement('amp-target-video-player', AmpBridPlayer);
 });
diff --git a/extensions/amp-brid-player/0.1/test/test-amp-brid-player.js b/extensions/amp-brid-player/0.1/test/test-amp-brid-player.js
index f2a4d484c379..66cfe1f3f8bc 100644
--- a/extensions/amp-brid-player/0.1/test/test-amp-brid-player.js
+++ b/extensions/amp-brid-player/0.1/test/test-amp-brid-player.js
@@ -3,7 +3,7 @@ import {Services} from '#service';
 
 import {listenOncePromise} from '#utils/event-helper';
 
-import {VideoEvents} from '../../../../src/video-interface';
+import {VideoEvents_Enum} from '../../../../src/video-interface';
 
 describes.realWin(
   'amp-brid-player',
@@ -22,8 +22,10 @@ describes.realWin(
       timer = Services.timerFor(win);
     });
 
-    function getBridPlayer(attributes, opt_responsive) {
-      const bc = doc.createElement('amp-brid-player');
+    function getBridPlayer(attributes, opt_responsive, config, alias = false) {
+      const bc = alias
+        ? doc.createElement('amp-target-video-player')
+        : doc.createElement('amp-brid-player');
 
       for (const key in attributes) {
         bc.setAttribute(key, attributes[key]);
@@ -34,6 +36,18 @@ describes.realWin(
         bc.setAttribute('layout', 'responsive');
       }
 
+      // create config element if provided
+      if (config) {
+        const configElement = doc.createElement('script');
+        configElement.setAttribute('type', 'application/json');
+        if (typeof config == 'string') {
+          configElement.textContent = config;
+        } else {
+          configElement.textContent = JSON.stringify(config);
+        }
+        bc.appendChild(configElement);
+      }
+
       // see yt test implementation
       timer
         .promise(50)
@@ -71,6 +85,26 @@ describes.realWin(
       });
     });
 
+    it('renders alias', () => {
+      return getBridPlayer(
+        {
+          'data-partner': '264',
+          'data-player': '4144',
+          'data-video': '13663',
+        },
+        null,
+        null,
+        true
+      ).then((bc) => {
+        const iframe = bc.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.tagName).to.equal('IFRAME');
+        expect(iframe.src).to.equal(
+          'https://services.brid.tv/services/iframe/video/13663/264/4144/0/1/?amp=1'
+        );
+      });
+    });
+
     it('renders responsively', () => {
       return getBridPlayer(
         {
@@ -152,6 +186,27 @@ describes.realWin(
       });
     });
 
+    it('config is passed', () => {
+      return getBridPlayer(
+        {
+          'data-partner': '264',
+          'data-player': '4144',
+          'data-video': '13663',
+        },
+        null,
+        {
+          'debug': 1,
+        }
+      ).then((bc) => {
+        const iframe = bc.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.tagName).to.equal('IFRAME');
+        expect(iframe.src).to.equal(
+          'https://services.brid.tv/services/iframe/video/13663/264/4144/0/1/?amp=1&cust_config={%22debug%22:1}'
+        );
+      });
+    });
+
     it('should forward events from brid-player to the amp element', async () => {
       const bc = await getBridPlayer(
         {
@@ -166,22 +221,22 @@ describes.realWin(
       const iframe = bc.querySelector('iframe');
       return Promise.resolve()
         .then(() => {
-          const p = listenOncePromise(bc, VideoEvents.PLAYING);
+          const p = listenOncePromise(bc, VideoEvents_Enum.PLAYING);
           sendFakeMessage(impl, iframe, 'trigger|play');
           return p;
         })
         .then(() => {
-          const p = listenOncePromise(bc, VideoEvents.MUTED);
+          const p = listenOncePromise(bc, VideoEvents_Enum.MUTED);
           sendFakeMessage(impl, iframe, 'volume|0');
           return p;
         })
         .then(() => {
-          const p = listenOncePromise(bc, VideoEvents.PAUSE);
+          const p = listenOncePromise(bc, VideoEvents_Enum.PAUSE);
           sendFakeMessage(impl, iframe, 'trigger|pause');
           return p;
         })
         .then(() => {
-          const p = listenOncePromise(bc, VideoEvents.UNMUTED);
+          const p = listenOncePromise(bc, VideoEvents_Enum.UNMUTED);
           sendFakeMessage(impl, iframe, 'volume|1');
           return p;
         });
diff --git a/extensions/amp-brid-player/validator-amp-brid-player.protoascii b/extensions/amp-brid-player/validator-amp-brid-player.protoascii
index a6b07e70956f..e3d7f4aea171 100644
--- a/extensions/amp-brid-player/validator-amp-brid-player.protoascii
+++ b/extensions/amp-brid-player/validator-amp-brid-player.protoascii
@@ -64,3 +64,57 @@ tags: {  # <amp-brid-player>
     supported_layouts: RESPONSIVE
   }
 }
+tags: {  # <amp-target-video-player>
+  html_format: AMP
+  tag_name: "AMP-TARGET-VIDEO-PLAYER"
+  requires_extension: "amp-brid-player"
+  attrs: { name: "autoplay" }
+  attrs: {
+    name: "data-dynamic"
+    value_regex: "[a-z]+"
+  }
+  attrs: {
+    name: "data-outstream"
+    mandatory_oneof: "['data-carousel', 'data-outstream', 'data-playlist', 'data-video']"
+    value_regex: "[0-9]+"
+  }
+  attrs: {
+    name: "data-partner"
+    mandatory: true
+    value_regex: "[0-9]+"
+  }
+  attrs: {
+    name: "data-player"
+    mandatory: true
+    value_regex: "[0-9]+"
+  }
+  attrs: {
+    name: "data-playlist"
+    mandatory_oneof: "['data-carousel', 'data-outstream', 'data-playlist', 'data-video']"
+    value_regex: ".+"
+  }
+  attrs: {
+    name: "data-video"
+    mandatory_oneof: "['data-carousel', 'data-outstream', 'data-playlist', 'data-video']"
+    value_regex: "[0-9]+"
+  }
+  attrs: {
+    name: "data-carousel"
+    mandatory_oneof: "['data-carousel', 'data-outstream', 'data-playlist', 'data-video']"
+    value_regex: "[0-9]+"
+  }
+  attrs: {
+    name: "dock"
+    requires_extension: "amp-video-docking"
+  }
+  attr_lists: "extended-amp-global"
+  spec_url: "https://amp.dev/documentation/components/amp-brid-player/"
+  amp_layout: {
+    supported_layouts: FILL
+    supported_layouts: FIXED
+    supported_layouts: FIXED_HEIGHT
+    supported_layouts: FLEX_ITEM
+    supported_layouts: NODISPLAY
+    supported_layouts: RESPONSIVE
+  }
+}
diff --git a/extensions/amp-brightcove/0.1/amp-brightcove.js b/extensions/amp-brightcove/0.1/amp-brightcove.js
index ded161f0b8a7..d460b58854d0 100644
--- a/extensions/amp-brightcove/0.1/amp-brightcove.js
+++ b/extensions/amp-brightcove/0.1/amp-brightcove.js
@@ -1,17 +1,9 @@
-import {Deferred} from '#core/data-structures/promise';
-import {PauseHelper} from '#core/dom/video/pause-helper';
-import {Services} from '#service';
-import {VideoEvents} from '../../../src/video-interface';
-import {BRIGHTCOVE_EVENTS, getBrightcoveIframeSrc} from '../brightcove-api';
 import {
-  createFrameFor,
-  isJsonOrObj,
-  mutedOrUnmutedEvent,
-  objOrParseJson,
-  redispatch,
-} from '../../../src/iframe-video';
-import {dev, user, userAssert} from '#utils/log';
-import {dict} from '#core/types/object';
+  BRIGHTCOVE_EVENTS,
+  getBrightcoveIframeSrc,
+} from '#bento/apis/brightcove-api';
+
+import {Deferred} from '#core/data-structures/promise';
 import {
   dispatchCustomEvent,
   getDataParamsFromAttributes,
@@ -22,14 +14,28 @@ import {
   fullscreenExit,
   isFullscreenElement,
 } from '#core/dom/fullscreen';
+import {isLayoutSizeDefined} from '#core/dom/layout';
+import {PauseHelper} from '#core/dom/video/pause-helper';
+
+import {Services} from '#service';
+import {installVideoManagerForDoc} from '#service/video-manager-impl';
+
+import {getData, listen} from '#utils/event-helper';
+import {dev, user, userAssert} from '#utils/log';
+
 import {
   getConsentPolicyInfo,
   getConsentPolicySharedData,
   getConsentPolicyState,
 } from '../../../src/consent';
-import {getData, listen} from '#utils/event-helper';
-import {installVideoManagerForDoc} from '#service/video-manager-impl';
-import {isLayoutSizeDefined} from '#core/dom/layout';
+import {
+  createFrameFor,
+  isJsonOrObj,
+  mutedOrUnmutedEvent,
+  objOrParseJson,
+  redispatch,
+} from '../../../src/iframe-video';
+import {VideoEvents_Enum} from '../../../src/video-interface';
 
 /** @private @const {string} */
 const TAG = 'amp-brightcove';
@@ -179,12 +185,10 @@ class AmpBrightcove extends AMP.BaseElement {
       // been unlaid out by now.
       if (this.iframe_ && this.iframe_.contentWindow) {
         this.iframe_.contentWindow./*OK*/ postMessage(
-          JSON.stringify(
-            dict({
-              'command': command,
-              'args': arg,
-            })
-          ),
+          JSON.stringify({
+            'command': command,
+            'args': arg,
+          }),
           'https://players.brightcove.net'
         );
       }
@@ -244,7 +248,7 @@ class AmpBrightcove extends AMP.BaseElement {
 
     if (
       redispatch(element, eventType, {
-        'ready': VideoEvents.LOAD,
+        'ready': VideoEvents_Enum.LOAD,
         ...BRIGHTCOVE_EVENTS,
       })
     ) {
diff --git a/extensions/amp-brightcove/0.1/test/test-amp-brightcove.js b/extensions/amp-brightcove/0.1/test/test-amp-brightcove.js
index 231fa3a12e29..3e826ff5d38e 100644
--- a/extensions/amp-brightcove/0.1/test/test-amp-brightcove.js
+++ b/extensions/amp-brightcove/0.1/test/test-amp-brightcove.js
@@ -1,14 +1,17 @@
 import '../amp-brightcove';
-import * as consent from '../../../../src/consent';
-import {BaseElement} from '../../../../src/base-element';
+import {CommonSignals_Enum} from '#core/constants/common-signals';
 import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';
-import {CommonSignals} from '#core/constants/common-signals';
-import {VideoEvents} from '../../../../src/video-interface';
 import {createElementWithAttributes} from '#core/dom';
+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
+
 import {listenOncePromise} from '#utils/event-helper';
+
 import {macroTask} from '#testing/helpers';
+
+import {BaseElement} from '../../../../src/base-element';
+import * as consent from '../../../../src/consent';
 import {parseUrlDeprecated} from '../../../../src/url';
-import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
+import {VideoEvents_Enum} from '../../../../src/video-interface';
 
 describes.realWin(
   'amp-brightcove',
@@ -52,7 +55,7 @@ describes.realWin(
       const element = await getBrightcoveBuild(attributes);
       const impl = await element.getImpl(false);
 
-      await element.signals().whenSignal(CommonSignals.LOAD_START);
+      await element.signals().whenSignal(CommonSignals_Enum.LOAD_START);
 
       // Wait for the promise in layoutCallback() to resolve
       await macroTask();
@@ -64,7 +67,7 @@ describes.realWin(
         // fails) in which case awaiting the LOAD_END sigal below will throw.
       }
 
-      await element.signals().whenSignal(CommonSignals.LOAD_END);
+      await element.signals().whenSignal(CommonSignals_Enum.LOAD_END);
 
       return element;
     }
@@ -222,12 +225,12 @@ describes.realWin(
       const impl = await bc.getImpl();
       return Promise.resolve()
         .then(() => {
-          const p = listenOncePromise(bc, VideoEvents.LOAD);
+          const p = listenOncePromise(bc, VideoEvents_Enum.LOAD);
           fakePostMessage(impl, {event: 'ready', muted: false, playing: false});
           return p;
         })
         .then(() => {
-          const p = listenOncePromise(bc, VideoEvents.LOADEDMETADATA);
+          const p = listenOncePromise(bc, VideoEvents_Enum.LOADEDMETADATA);
           fakePostMessage(impl, {
             event: 'loadedmetadata',
             muted: false,
@@ -236,7 +239,7 @@ describes.realWin(
           return p;
         })
         .then(() => {
-          const p = listenOncePromise(bc, VideoEvents.AD_START);
+          const p = listenOncePromise(bc, VideoEvents_Enum.AD_START);
           fakePostMessage(impl, {
             event: 'ads-ad-started',
             muted: false,
@@ -245,7 +248,7 @@ describes.realWin(
           return p;
         })
         .then(() => {
-          const p = listenOncePromise(bc, VideoEvents.AD_END);
+          const p = listenOncePromise(bc, VideoEvents_Enum.AD_END);
           fakePostMessage(impl, {
             event: 'ads-ad-ended',
             muted: false,
@@ -254,7 +257,7 @@ describes.realWin(
           return p;
         })
         .then(() => {
-          const p = listenOncePromise(bc, VideoEvents.PLAYING);
+          const p = listenOncePromise(bc, VideoEvents_Enum.PLAYING);
           fakePostMessage(impl, {
             event: 'playing',
             muted: false,
@@ -263,7 +266,7 @@ describes.realWin(
           return p;
         })
         .then(() => {
-          const p = listenOncePromise(bc, VideoEvents.MUTED);
+          const p = listenOncePromise(bc, VideoEvents_Enum.MUTED);
           fakePostMessage(impl, {
             event: 'volumechange',
             muted: true,
@@ -272,7 +275,7 @@ describes.realWin(
           return p;
         })
         .then(() => {
-          const p = listenOncePromise(bc, VideoEvents.UNMUTED);
+          const p = listenOncePromise(bc, VideoEvents_Enum.UNMUTED);
           fakePostMessage(impl, {
             event: 'volumechange',
             muted: false,
@@ -281,12 +284,12 @@ describes.realWin(
           return p;
         })
         .then(() => {
-          const p = listenOncePromise(bc, VideoEvents.PAUSE);
+          const p = listenOncePromise(bc, VideoEvents_Enum.PAUSE);
           fakePostMessage(impl, {event: 'pause', muted: false, playing: false});
           return p;
         })
         .then(() => {
-          const p = listenOncePromise(bc, VideoEvents.ENDED);
+          const p = listenOncePromise(bc, VideoEvents_Enum.ENDED);
           fakePostMessage(impl, {event: 'ended', muted: false, playing: false});
           return p;
         });
diff --git a/extensions/amp-brightcove/1.0/amp-brightcove.js b/extensions/amp-brightcove/1.0/amp-brightcove.js
index cf55a5fb8dff..3418f7888889 100644
--- a/extensions/amp-brightcove/1.0/amp-brightcove.js
+++ b/extensions/amp-brightcove/1.0/amp-brightcove.js
@@ -1,20 +1,26 @@
+import {BaseElement} from '#bento/components/bento-brightcove/1.0/base-element';
+import {AmpVideoBaseElement} from '#bento/components/bento-video/1.0/video-base-element';
+
+import {isExperimentOn} from '#experiments';
+
+import {setSuperClass} from '#preact/amp-base-element';
+
+import {Services} from '#service';
+
+import {userAssert} from '#utils/log';
+
+import {CSS} from '../../../build/amp-brightcove-1.0.css';
 import {
   getConsentPolicyInfo,
   getConsentPolicySharedData,
   getConsentPolicyState,
 } from '../../../src/consent';
-import {BaseElement} from './base-element';
-import {CSS} from '../../../build/amp-brightcove-1.0.css';
-import {dict} from '#core/types/object';
-import {isExperimentOn} from '#experiments';
-import {userAssert} from '#utils/log';
-import {Services} from '#service';
 
 /** @const {string} */
 const TAG = 'amp-brightcove';
 
-class AmpBrightcove extends BaseElement {
-  /** @override @nocollapse */
+class AmpBrightcove extends setSuperClass(BaseElement, AmpVideoBaseElement) {
+  /** @override  */
   static getPreconnects() {
     return ['https://players.brightcove.net'];
   }
@@ -41,13 +47,11 @@ class AmpBrightcove extends BaseElement {
       const {0: consentState, 1: consentString, 2: consentSharedData} = arr;
       const urlParams = {
         ...this.getProp('urlParams'),
-        ...dict({
-          'ampInitialConsentState': consentState,
-          'ampInitialConsentValue': consentString,
-          'ampConsentSharedData': JSON.stringify(consentSharedData),
-        }),
+        'ampInitialConsentState': consentState,
+        'ampInitialConsentValue': consentString,
+        'ampConsentSharedData': JSON.stringify(consentSharedData),
       };
-      this.mutateProps(dict({'urlParams': urlParams}));
+      this.mutateProps({'urlParams': urlParams});
     });
   }
 
diff --git a/extensions/amp-brightcove/1.0/base-element.js b/extensions/amp-brightcove/1.0/base-element.js
deleted file mode 100644
index 83e851225915..000000000000
--- a/extensions/amp-brightcove/1.0/base-element.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import {BentoBrightcove} from './component';
-import {VideoBaseElement} from '../../amp-video/1.0/video-base-element';
-
-export class BaseElement extends VideoBaseElement {}
-
-/** @override */
-BaseElement['Component'] = BentoBrightcove;
-
-/** @override */
-BaseElement['props'] = {
-  'account': {attr: 'data-account', type: 'string'},
-  'autoplay': {attr: 'autoplay', type: 'boolean'},
-  'embed': {attr: 'data-embed', type: 'string', default: 'default'},
-  'player': {
-    attrs: ['data-player', 'data-player-id'],
-    parseAttrs(element) {
-      const {'player': player, 'playerId': playerId} = element.dataset;
-      return player || playerId || 'default';
-    },
-  },
-  'playlistId': {attr: 'data-playlist-id', type: 'string'},
-  'referrer': {attr: 'data-referrer', type: 'string'},
-  'urlParams': {attrPrefix: 'data-param-', type: 'string'},
-  'videoId': {attr: 'data-video-id', type: 'string'},
-  // TODO(wg-bento): These props have no internal implementation yet.
-  'dock': {attr: 'dock', media: true},
-};
-
-/** @override */
-BaseElement['layoutSizeDefined'] = true;
-
-/** @override */
-BaseElement['usesShadowDom'] = true;
diff --git a/extensions/amp-brightcove/1.0/component.js b/extensions/amp-brightcove/1.0/component.js
deleted file mode 100644
index c0ed66d3f405..000000000000
--- a/extensions/amp-brightcove/1.0/component.js
+++ /dev/null
@@ -1,167 +0,0 @@
-import * as Preact from '#preact';
-import {useCallback, useMemo, useRef, useState} from '#preact';
-import {forwardRef} from '#preact/compat';
-import {VideoIframe} from '../../amp-video/1.0/video-iframe';
-import {mutedOrUnmutedEvent} from '../../../src/iframe-video';
-import {dispatchCustomEvent} from '#core/dom';
-import {BRIGHTCOVE_EVENTS, getBrightcoveIframeSrc} from '../brightcove-api';
-import {useValueRef} from '#preact/component';
-
-/** @const {string} */
-const DEFAULT = 'default';
-
-/**
- * @enum {string}
- * @private
- */
-const methods = {
-  'mute': 'muted',
-  'unmute': 'muted',
-  'showControls': 'controls',
-  'hideControls': 'controls',
-};
-
-/**
- * @param {!BrightcoveDef.Props} props
- * @param {{current: ?VideoWrapperDef.Api}} ref
- * @return {PreactDef.Renderable}
- */
-function BentoBrightcoveWithRef(props, ref) {
-  const {
-    account,
-    autoplay,
-    embed = DEFAULT,
-    muted: mutedProp,
-    player = DEFAULT,
-    playlistId,
-    referrer,
-    videoId,
-    onPlayingState,
-    urlParams,
-    onLoad,
-    ...rest
-  } = props;
-
-  const playerStateRef = useRef({});
-  const onLoadRef = useValueRef(onLoad);
-  const [muted, setMuted] = useState(mutedProp);
-  const src = useMemo(
-    () =>
-      getBrightcoveIframeSrc(
-        account,
-        player,
-        embed,
-        playlistId,
-        videoId,
-        referrer,
-        urlParams
-      ),
-    [account, embed, player, playlistId, referrer, urlParams, videoId]
-  );
-
-  const onMessage = useCallback(
-    ({currentTarget, data}) => {
-      const eventType = data?.event;
-      switch (eventType) {
-        case 'ready':
-          dispatchCustomEvent(currentTarget, 'canplay');
-          onLoadRef.current?.();
-          break;
-        case 'playing':
-          onPlayingState?.(true);
-          break;
-        case 'pause':
-        case 'ended':
-          onPlayingState?.(false);
-          break;
-      }
-
-      if (data?.['ct']) {
-        playerStateRef.current['currentTime'] = data['ct'];
-      }
-      if (data?.['pr']) {
-        playerStateRef.current['playedRanges'] = data['pr'];
-      }
-      if (data?.['dur']) {
-        playerStateRef.current['duration'] = data['dur'];
-      }
-
-      if (BRIGHTCOVE_EVENTS[eventType]) {
-        dispatchCustomEvent(currentTarget, BRIGHTCOVE_EVENTS[eventType]);
-        return;
-      }
-
-      if (eventType === 'volumechange') {
-        const isMuted = data['muted'];
-        if (isMuted == null || isMuted == muted) {
-          return;
-        }
-        setMuted(isMuted);
-        dispatchCustomEvent(currentTarget, mutedOrUnmutedEvent(isMuted));
-      }
-    },
-    [muted, onPlayingState, onLoadRef]
-  );
-
-  // Check for valid props
-  if (!checkProps(props)) {
-    return null;
-  }
-
-  return (
-    <VideoIframe
-      ref={ref}
-      {...rest}
-      autoplay={autoplay}
-      controls={true}
-      makeMethodMessage={makeMessage}
-      muted={muted}
-      onMessage={onMessage}
-      playerStateRef={playerStateRef}
-      src={src}
-    />
-  );
-}
-
-/**
- * @param {string} method
- * @return {string}
- */
-function makeMessage(method) {
-  let arg;
-  switch (method) {
-    case 'showControls':
-    case 'mute':
-      arg = true;
-      break;
-    case 'hideControls':
-    case 'unmute':
-      arg = false;
-      break;
-    default:
-      break;
-  }
-  return JSON.stringify({
-    'command': methods[method] ?? method,
-    'args': arg,
-  });
-}
-
-/**
- * Verify required props and throw error if necessary.
- * @param {!BrightcoveDef.Props} props
- * @return {boolean} true on valid
- */
-function checkProps({account}) {
-  // Perform manual checking as assertion is not available for Bento: Issue #32739
-  if (!account) {
-    console /*OK*/
-      .warn('account is required for <Brightcove>');
-    return false;
-  }
-  return true;
-}
-
-const BentoBrightcove = forwardRef(BentoBrightcoveWithRef);
-BentoBrightcove.displayName = 'BentoBrightcove'; // Make findable for tests.
-export {BentoBrightcove};
diff --git a/extensions/amp-brightcove/1.0/storybook/Basic.amp.js b/extensions/amp-brightcove/1.0/storybook/Basic.amp.js
index 591c6cc8c70e..402626a0159e 100644
--- a/extensions/amp-brightcove/1.0/storybook/Basic.amp.js
+++ b/extensions/amp-brightcove/1.0/storybook/Basic.amp.js
@@ -1,5 +1,7 @@
-import * as Preact from '#preact';
 import {withAmp} from '@ampproject/storybook-addon';
+
+import * as Preact from '#preact';
+
 import {VideoElementWithActions} from '../../../amp-video/1.0/storybook/_helpers';
 
 export default {
diff --git a/extensions/amp-brightcove/1.0/storybook/Basic.js b/extensions/amp-brightcove/1.0/storybook/Basic.js
index 3c7c6d332e0b..8d695d5ee126 100644
--- a/extensions/amp-brightcove/1.0/storybook/Basic.js
+++ b/extensions/amp-brightcove/1.0/storybook/Basic.js
@@ -1,5 +1,6 @@
+import {BentoBrightcove} from '#bento/components/bento-brightcove/1.0/component';
+
 import * as Preact from '#preact';
-import {BentoBrightcove} from '../component';
 
 export default {
   title: 'Brightcove',
diff --git a/extensions/amp-brightcove/1.0/test/test-amp-brightcove.js b/extensions/amp-brightcove/1.0/test/test-amp-brightcove.js
index 916d6de47939..bfaf4279c227 100644
--- a/extensions/amp-brightcove/1.0/test/test-amp-brightcove.js
+++ b/extensions/amp-brightcove/1.0/test/test-amp-brightcove.js
@@ -1,10 +1,14 @@
-import * as consent from '../../../../src/consent';
 import '../amp-brightcove';
+
+import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';
+import {createElementWithAttributes} from '#core/dom';
+
 import {toggleExperiment} from '#experiments';
+
 import {waitFor} from '#testing/helpers/service';
-import {createElementWithAttributes} from '#core/dom';
+
+import * as consent from '../../../../src/consent';
 import {parseUrlDeprecated} from '../../../../src/url';
-import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';
 
 describes.realWin(
   'amp-brightcove-v1.0',
diff --git a/extensions/amp-brightcove/1.0/test/test-component.js b/extensions/amp-brightcove/1.0/test/test-component.js
deleted file mode 100644
index 6250518099ab..000000000000
--- a/extensions/amp-brightcove/1.0/test/test-component.js
+++ /dev/null
@@ -1,84 +0,0 @@
-import * as Preact from '#preact';
-import {BentoBrightcove} from '../component';
-import {mount} from 'enzyme';
-import {parseUrlDeprecated} from '../../../../src/url';
-
-describes.sandboxed('Brightcove preact component v1.0', {}, () => {
-  it('renders', async () => {
-    const wrapper = mount(
-      <BentoBrightcove account="1290862519001" videoId="ref:amp-test-video" />
-    );
-    const iframe = wrapper.find('iframe');
-    expect(iframe).to.not.be.null;
-    expect(iframe.prop('src')).to.equal(
-      'https://players.brightcove.net/1290862519001/default_default' +
-        '/index.html?amp=1' +
-        '&videoId=ref:amp-test-video&playsinline=true'
-    );
-  });
-
-  it('should pass data-param-* attributes to the iframe src', async () => {
-    const wrapper = mount(
-      <BentoBrightcove
-        account="1290862519001"
-        videoId="ref:amp-test-video"
-        urlParams={{myParam: 'hello world'}}
-      />
-    );
-    const iframe = wrapper.find('iframe');
-    const params = parseUrlDeprecated(iframe.prop('src')).search.split('&');
-    expect(params).to.contain('myParam=hello%20world');
-  });
-
-  it('should exclude data-param-autoplay attribute', async () => {
-    const wrapper = mount(
-      <BentoBrightcove
-        account="1290862519001"
-        videoId="ref:amp-test-video"
-        urlParams={{autoplay: 'muted'}}
-      />
-    );
-    const iframe = wrapper.find('iframe');
-    const params = parseUrlDeprecated(iframe.prop('src')).search.split('&');
-    expect(params).to.not.contain('autoplay');
-  });
-
-  it('should give precedence to playlist id', async () => {
-    const wrapper = mount(
-      <BentoBrightcove
-        account="1290862519001"
-        videoId="ref:amp-test-video"
-        playlistId="ref:test-playlist"
-      />
-    );
-    const iframe = wrapper.find('iframe');
-    expect(iframe.prop('src')).to.contain('playlistId=ref:test-playlist');
-    expect(iframe.prop('src')).not.to.contain('videoId');
-  });
-
-  it('should allow both playlist and video id to be unset', async () => {
-    const wrapper = mount(<BentoBrightcove account="1290862519001" />);
-    const iframe = wrapper.find('iframe');
-    expect(iframe.prop('src')).not.to.contain('&playlistId');
-    expect(iframe.prop('src')).not.to.contain('&videoId');
-  });
-
-  it('should pass referrer', async () => {
-    const wrapper = mount(
-      <BentoBrightcove account="1290862519001" referrer="1" />
-    );
-    const iframe = wrapper.find('iframe');
-    expect(iframe.prop('src')).to.contain('referrer=1');
-  });
-
-  it('should force playsinline', async () => {
-    const wrapper = mount(
-      <BentoBrightcove
-        account="1290862519001"
-        urlParams={{playsinline: false}}
-      />
-    );
-    const iframe = wrapper.find('iframe');
-    expect(iframe.prop('src')).to.contain('playsinline=true');
-  });
-});
diff --git a/extensions/amp-brightcove/amp-brightcove.md b/extensions/amp-brightcove/amp-brightcove.md
index e96e0d89c52d..47465ce836d6 100644
--- a/extensions/amp-brightcove/amp-brightcove.md
+++ b/extensions/amp-brightcove/amp-brightcove.md
@@ -45,7 +45,7 @@ The `width` and `height` attributes determine the aspect ratio of the player emb
 
 ### Player Configuration
 
-Make sure you configure players used with the AMP Support plugin to support AMP's video interface. See [Brightcove's support documentation](https://support.brightcove.com/amp) for player configuration instructions.
+Make sure you configure players used with the AMP Support plugin to support AMP's video interface. See [Brightcove's support documentation](https://player.support.brightcove.com/amp/amp-using-video-cloud-video.html) for player configuration instructions.
 
 ## Component Attributes
 
diff --git a/extensions/amp-brightcove/validator-amp-brightcove.protoascii b/extensions/amp-brightcove/validator-amp-brightcove.protoascii
index 5142e25c1079..707afa35c1da 100644
--- a/extensions/amp-brightcove/validator-amp-brightcove.protoascii
+++ b/extensions/amp-brightcove/validator-amp-brightcove.protoascii
@@ -1,8 +1,8 @@
 tags: {  # amp-brightcove 1.0
   html_format: AMP
   tag_name: "SCRIPT"
-  satisfies: "amp-brightcove 1.0"
-  excludes: "amp-brightcove 0.1"
+  satisfies_condition: "amp-brightcove 1.0"
+  excludes_condition: "amp-brightcove 0.1"
   extension_spec: {
     name: "amp-brightcove"
     version_name: "v1.0"
@@ -14,8 +14,8 @@ tags: {  # amp-brightcove 1.0
 tags: {  # amp-brightcove 0.1 and latest
   html_format: AMP
   tag_name: "SCRIPT"
-  satisfies: "amp-brightcove 0.1"
-  excludes: "amp-brightcove 1.0"
+  satisfies_condition: "amp-brightcove 0.1"
+  excludes_condition: "amp-brightcove 1.0"
   extension_spec: {
     name: "amp-brightcove"
     version_name: "v0.1"
diff --git a/extensions/amp-byside-content/0.1/amp-byside-content.js b/extensions/amp-byside-content/0.1/amp-byside-content.js
index b2bbb42b2cff..f4e6dd7761c8 100644
--- a/extensions/amp-byside-content/0.1/amp-byside-content.js
+++ b/extensions/amp-byside-content/0.1/amp-byside-content.js
@@ -20,7 +20,6 @@ import {createElementWithAttributes, removeElement} from '#core/dom';
 import {applyFillContent, isLayoutSizeDefined} from '#core/dom/layout';
 import {setStyles} from '#core/dom/style';
 import {debounce} from '#core/types/function';
-import {dict} from '#core/types/object';
 
 import {Services} from '#service';
 
@@ -99,7 +98,7 @@ export class AmpBysideContent extends AMP.BaseElement {
     this.boundUpdateSize_ = debounce(
       this.win,
       (data) => {
-        this.updateSize_(/** @type {Object} */ (data));
+        this.updateSize_(/** @type {object} */ (data));
       },
       100
     );
@@ -226,7 +225,7 @@ export class AmpBysideContent extends AMP.BaseElement {
    */
   composeSrcUrl_() {
     const src = this.baseUrl_ + 'placeholder.php';
-    const params = dict({
+    const params = {
       'label': this.label_,
       'webcare_id': this.webcareId_,
       'bwch': this.channel_ || '',
@@ -248,7 +247,7 @@ export class AmpBysideContent extends AMP.BaseElement {
       'ua': 'USER_AGENT',
       'r': 'RANDOM',
       '_resize': '1',
-    });
+    };
     const url = addParamsToUrl(src, params);
 
     return Services.urlReplacementsForDoc(this.element).expandUrlAsync(url);
@@ -273,28 +272,16 @@ export class AmpBysideContent extends AMP.BaseElement {
    */
   getOverflowElement_() {
     const doc = /** @type {!Document} */ (this.element.ownerDocument);
-    const overflow = createElementWithAttributes(
-      doc,
-      'div',
-      dict({
-        'class': 'i-amphtml-byside-content-overflow',
-        'overflow': '',
-      })
-    );
-    const overflowContent = createElementWithAttributes(
-      doc,
-      'div',
-      dict({
-        'class': 'i-amphtml-byside-content-overflow-content',
-      })
-    );
-    const arrow = createElementWithAttributes(
-      doc,
-      'div',
-      dict({
-        'class': 'i-amphtml-byside-content-arrow-down',
-      })
-    );
+    const overflow = createElementWithAttributes(doc, 'div', {
+      'class': 'i-amphtml-byside-content-overflow',
+      'overflow': '',
+    });
+    const overflowContent = createElementWithAttributes(doc, 'div', {
+      'class': 'i-amphtml-byside-content-overflow-content',
+    });
+    const arrow = createElementWithAttributes(doc, 'div', {
+      'class': 'i-amphtml-byside-content-arrow-down',
+    });
     overflowContent.appendChild(arrow);
     overflow.appendChild(overflowContent);
 
@@ -304,20 +291,12 @@ export class AmpBysideContent extends AMP.BaseElement {
   /** @return {!Element} @private */
   createBySideLoader_() {
     const doc = /** @type {!Document} */ (this.element.ownerDocument);
-    const loadingContainer = createElementWithAttributes(
-      doc,
-      'div',
-      dict({
-        'class': 'i-amphtml-byside-content-loading-container',
-      })
-    );
-    const loadingAnimation = createElementWithAttributes(
-      doc,
-      'div',
-      dict({
-        'class': 'i-amphtml-byside-content-loading-animation',
-      })
-    );
+    const loadingContainer = createElementWithAttributes(doc, 'div', {
+      'class': 'i-amphtml-byside-content-loading-container',
+    });
+    const loadingAnimation = createElementWithAttributes(doc, 'div', {
+      'class': 'i-amphtml-byside-content-loading-animation',
+    });
     loadingContainer.appendChild(loadingAnimation);
 
     return loadingContainer;
@@ -326,7 +305,7 @@ export class AmpBysideContent extends AMP.BaseElement {
   /**
    * Updates the element's dimensions to accommodate the iframe's
    *    requested dimensions.
-   * @param {Object} data
+   * @param {object} data
    * @private
    */
   updateSize_(data) {
diff --git a/extensions/amp-cache-url/0.1/amp-cache-url.js b/extensions/amp-cache-url/0.1/amp-cache-url.js
index c6fc0e087f61..add3d6bfaed3 100644
--- a/extensions/amp-cache-url/0.1/amp-cache-url.js
+++ b/extensions/amp-cache-url/0.1/amp-cache-url.js
@@ -1,6 +1,6 @@
 import * as ampToolboxCacheUrl from '@ampproject/toolbox-cache-url';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 
 export class AmpCacheUrlService {
   /**
diff --git a/extensions/amp-call-tracking/0.1/amp-call-tracking.js b/extensions/amp-call-tracking/0.1/amp-call-tracking.js
index 46eb227ccc06..3abfecb7dab6 100644
--- a/extensions/amp-call-tracking/0.1/amp-call-tracking.js
+++ b/extensions/amp-call-tracking/0.1/amp-call-tracking.js
@@ -1,4 +1,4 @@
-import {Layout, isLayoutSizeDefined} from '#core/dom/layout';
+import {Layout_Enum, isLayoutSizeDefined} from '#core/dom/layout';
 
 import {Services} from '#service';
 
@@ -10,7 +10,7 @@ const TAG = 'amp-call-tracking';
 
 /**
  * Bookkeeps all unique URL requests so that no URL is called twice.
- * @type {!Object<string, !Promise>}
+ * @type {!{[key: string]: !Promise}}
  */
 let cachedResponsePromises_ = {};
 
@@ -52,7 +52,7 @@ export class AmpCallTracking extends AMP.BaseElement {
 
   /** @override */
   isLayoutSupported(layout) {
-    return isLayoutSizeDefined(layout) || layout == Layout.CONTAINER;
+    return isLayoutSizeDefined(layout) || layout == Layout_Enum.CONTAINER;
   }
 
   /** @override */
diff --git a/extensions/amp-carousel/0.1/amp-carousel.js b/extensions/amp-carousel/0.1/amp-carousel.js
index c3f9685b7a34..05e85c10b5ec 100644
--- a/extensions/amp-carousel/0.1/amp-carousel.js
+++ b/extensions/amp-carousel/0.1/amp-carousel.js
@@ -1,14 +1,16 @@
+import {isScrollable} from './build-dom';
 import {AmpScrollableCarousel} from './scrollable-carousel';
 import {AmpSlideScroll} from './slidescroll';
+
 import {CSS} from '../../../build/amp-carousel-0.1.css';
 
 class CarouselSelector extends AMP.BaseElement {
   /** @override */
   upgradeCallback() {
-    if (this.element.getAttribute('type') == 'slides') {
-      return new AmpSlideScroll(this.element);
+    if (isScrollable(this.element)) {
+      return new AmpScrollableCarousel(this.element);
     }
-    return new AmpScrollableCarousel(this.element);
+    return new AmpSlideScroll(this.element);
   }
 }
 
diff --git a/extensions/amp-carousel/0.1/build-dom.js b/extensions/amp-carousel/0.1/build-dom.js
new file mode 100644
index 000000000000..6f0cfa49dcf8
--- /dev/null
+++ b/extensions/amp-carousel/0.1/build-dom.js
@@ -0,0 +1,352 @@
+import {isAmp4Email} from '#core/document/format';
+import {isServerRendered} from '#core/dom';
+import {escapeCssSelectorIdent} from '#core/dom/css-selectors';
+import {realChildElements} from '#core/dom/query';
+
+/**
+ * @enum {string}
+ */
+export const ClassNames = {
+  // Carousel Controls
+  BUTTON: 'amp-carousel-button',
+  PREV_BUTTON: 'amp-carousel-button-prev',
+  NEXT_BUTTON: 'amp-carousel-button-next',
+  HAS_CONTROL: 'i-amphtml-carousel-has-controls',
+  CONTROL_HIDE_ATTRIBUTE: 'i-amphtml-carousel-hide-buttons',
+
+  // Generic
+  SLIDE: 'amp-carousel-slide',
+  SHOW_SLIDE: 'amp-carousel-slide',
+
+  // SlideScroll Carousel
+  SLIDESCROLL_CAROUSEL: 'i-amphtml-slidescroll',
+  SLIDE_WRAPPER: 'i-amphtml-slide-item',
+  SLIDES_CONTAINER: 'i-amphtml-slides-container',
+  SLIDES_CONTAINER_NOSNAP: 'i-amphtml-slidescroll-no-snap',
+  SLIDES_ITEM_SHOW: 'i-amphtml-slide-item-show',
+
+  // Scrollable Carousel
+  SCROLLABLE_CONTAINER: 'i-amphtml-scrollable-carousel-container',
+  SCROLLABLE_SLIDE: 'amp-scrollable-carousel-slide',
+};
+
+/**
+ * Throws if any provided param is not truthy.
+ */
+function assertDomQueryResults() {
+  for (let i = 0; i < arguments.length; i++) {
+    if (!arguments[i]) {
+      throw new Error('Invalid server render');
+    }
+  }
+}
+
+/**
+ * Builds a carousel button for next/prev.
+ * @param {Element} element
+ * @param {{className: string, title: string, enabled: boolean}} options
+ * @return {HTMLDivElement}
+ */
+function buildButton(element, {className, enabled, title}) {
+  /*
+   * In scrollable carousel, the next/previous buttons add no functionality
+   * for screen readers as scrollable carousel is just a horizontally
+   * scrollable div which ATs navigate just like any other content.
+   * To avoid confusion, we therefore set the role to presentation for the
+   * controls in this case.
+   */
+  const ariaRole = isScrollable(element) ? 'presentation' : 'button';
+
+  const button = element.ownerDocument.createElement('div');
+  button.setAttribute('tabindex', '0');
+  button.classList.add(ClassNames.BUTTON, className);
+  button.setAttribute('role', ariaRole);
+  button.setAttribute('title', title);
+  setButtonState(button, enabled);
+  element.appendChild(button);
+  return button;
+}
+
+/**
+ *
+ * @param {HTMLDivElement} button
+ * @param {boolean} enabled
+ */
+export function setButtonState(button, enabled) {
+  button.classList.toggle('amp-disabled', !enabled);
+  button.setAttribute('aria-disabled', String(!enabled));
+  button.setAttribute('tabindex', String(enabled ? 0 : -1));
+}
+
+/**
+ * Builds the DOM necessary for amp-carousel.
+ * @param {Element} element
+ * @param {number} slideCount
+ * @return {{
+ *   prevButton: HTMLDivElement,
+ *   nextButton: HTMLDivElement
+ * }}
+ */
+export function buildCarouselControls(element, slideCount) {
+  if (isServerRendered(element)) {
+    return queryCarouselControls(element);
+  }
+
+  const doc = element.ownerDocument;
+  if (isAmp4Email(doc) || element.hasAttribute('controls')) {
+    element.classList.add(ClassNames.HAS_CONTROL);
+  }
+
+  const hasLoop = element.hasAttribute('loop');
+  const prevIndex = hasLoop ? slideCount : 0;
+  const nextIndex = slideCount > 1 ? 2 : hasLoop ? 0 : 1;
+  const prevButton = buildButton(element, {
+    className: ClassNames.PREV_BUTTON,
+    title: getPrevButtonTitle(element, {
+      index: String(prevIndex),
+      total: String(slideCount),
+    }),
+    enabled: element.hasAttribute('loop'),
+  });
+  const nextButton = buildButton(element, {
+    className: ClassNames.NEXT_BUTTON,
+    title: getNextButtonTitle(element, {
+      index: String(nextIndex),
+      total: String(slideCount),
+    }),
+    enabled: slideCount > 1,
+  });
+  return {prevButton, nextButton};
+}
+
+/**
+ * Queries for all of the necessary DOM Elements to assign to ivars
+ * @param {Element} element
+ * @return {{
+ *   prevButton: HTMLDivElement,
+ *   nextButton: HTMLDivElement
+ * }}
+ */
+export function queryCarouselControls(element) {
+  const prevButton = /** @type {HTMLDivElement} */ (
+    element.querySelector(`.${escapeCssSelectorIdent(ClassNames.PREV_BUTTON)}`)
+  );
+  const nextButton = /** @type {HTMLDivElement} */ (
+    element.querySelector(`.${escapeCssSelectorIdent(ClassNames.NEXT_BUTTON)}`)
+  );
+  assertDomQueryResults(prevButton, nextButton);
+  return {prevButton, nextButton};
+}
+
+/**
+ * Builds the DOM necessary for scrollable carousel.
+ * @param {Element} element
+ * @return {{
+ *   container: HTMLDivElement
+ *   cells: HTMLElement[]
+ * }}
+ */
+function buildScrollableCarousel(element) {
+  if (isServerRendered(element)) {
+    return queryScrollableCarousel(element);
+  }
+
+  const doc = element.ownerDocument;
+  const cells = /** @type {HTMLElement[]} */ (realChildElements(element));
+  const container = doc.createElement('div');
+
+  container.classList.add(ClassNames.SCROLLABLE_CONTAINER);
+  // Focusable container makes it possible to fully consume Arrow key events.
+  container.setAttribute('tabindex', '-1');
+  element.appendChild(container);
+  cells.forEach((cell) => {
+    cell.classList.add(ClassNames.SLIDE, ClassNames.SCROLLABLE_SLIDE);
+    container.appendChild(cell);
+  });
+
+  return {cells, container};
+}
+
+/**
+ * Queries for ivars for scrollable carousel.
+ * @param {Element} element
+ * @return {{
+ *   container: HTMLDivElement
+ *   cells: HTMLElement[]
+ * }}
+ */
+function queryScrollableCarousel(element) {
+  const container = /** @type {HTMLDivElement} */ (
+    element.querySelector(
+      `.${escapeCssSelectorIdent(ClassNames.SCROLLABLE_CONTAINER)}`
+    )
+  );
+  const cells = /** @type {HTMLElement[]} */ (
+    Array.from(
+      element.querySelectorAll(`.${escapeCssSelectorIdent(ClassNames.SLIDE)}`)
+    )
+  );
+  assertDomQueryResults(container, cells);
+  return {container, cells};
+}
+
+/**
+ * Builds the DOM necessary for slidescroll carousel.
+ * @param {Element} element
+ * @return {{
+ *   slides: Element[]
+ *   slidesContainer: HTMLDivElement
+ *   slideWrappers: HTMLDivElement[]
+ * }}
+ */
+function buildSlideScrollCarousel(element) {
+  if (isServerRendered(element)) {
+    return querySlideScrollCarousel(element);
+  }
+  const doc = element.ownerDocument;
+  const slides = realChildElements(element);
+  element.classList.add(ClassNames.SLIDESCROLL_CAROUSEL);
+
+  const slidesContainer = doc.createElement('div');
+  // Focusable container makes it possible to fully consume Arrow key events.
+  slidesContainer.setAttribute('tabindex', '-1');
+  slidesContainer.classList.add(
+    ClassNames.SLIDES_CONTAINER,
+    ClassNames.SLIDES_CONTAINER_NOSNAP
+  );
+  // Let screen reader know that this is a live area and changes
+  // to it (such after pressing next) should be announced to the
+  // user.
+  slidesContainer.setAttribute('aria-live', 'polite');
+  element.appendChild(slidesContainer);
+
+  /** @type {HTMLDivElement[]} */
+  const slideWrappers = [];
+  slides.forEach((slide) => {
+    slide.classList.add(ClassNames.SLIDE);
+
+    const slideWrapper = doc.createElement('div');
+    slideWrapper.classList.add(ClassNames.SLIDE_WRAPPER);
+    slideWrapper.appendChild(slide);
+    slidesContainer.appendChild(slideWrapper);
+    slideWrappers.push(slideWrapper);
+  });
+  // Initialize the first slide to be shown.
+  slideWrappers[0]?.classList.add(ClassNames.SLIDES_ITEM_SHOW);
+
+  return {slidesContainer, slides, slideWrappers};
+}
+
+/**
+ * Queries for ivars for slidescroll.
+ * @param {Element} element
+ * @return {{
+ *   slides: Element[]
+ *   slidesContainer: HTMLDivElement
+ *   slideWrappers: HTMLDivElement[]
+ * }}
+ */
+function querySlideScrollCarousel(element) {
+  const slidesContainer = /** @type {HTMLDivElement} */ (
+    element.querySelector(
+      `.${escapeCssSelectorIdent(ClassNames.SLIDES_CONTAINER)}`
+    )
+  );
+  const slideWrappers = /** @type {HTMLDivElement[]} */ (
+    Array.from(
+      element.querySelectorAll(
+        `.${escapeCssSelectorIdent(ClassNames.SLIDE_WRAPPER)}`
+      )
+    )
+  );
+  const slides = Array.from(
+    element.querySelectorAll(`.${escapeCssSelectorIdent(ClassNames.SLIDE)}`)
+  );
+  assertDomQueryResults(slidesContainer, slideWrappers, slides);
+  return {slides, slidesContainer, slideWrappers};
+}
+
+/**
+ * Builds the DOM necessary for slidescroll carousel.
+ * @param {Element} element
+ * @return {{
+ *   prevButton: HTMLDivElement,
+ *   nextButton: HTMLDivElement
+ *   container?: HTMLDivElement
+ *   cells?: HTMLElement[]
+ *   slides?: Element[]
+ *   slidesContainer?: HTMLDivElement
+ *   slideWrappers?: HTMLDivElement[]
+ * }}
+ */
+export function buildDom(element) {
+  const slideCount = realChildElements(element).length;
+  const slidesDom = isScrollable(element)
+    ? buildScrollableCarousel(element)
+    : buildSlideScrollCarousel(element);
+  const controlsDom = buildCarouselControls(element, slideCount);
+
+  return {...controlsDom, ...slidesDom};
+}
+
+/**
+ * @param {Element} element
+ * @return {string} The default title to use for the next button.
+ * @param {{index: string, total: string}} options - The default title to use for the previous button.
+ */
+export function getNextButtonTitle(element, options) {
+  const prefix =
+    element.getAttribute('data-next-button-aria-label') ||
+    'Next item in carousel';
+  const {index, total} = options;
+  return getButtonTitle(element, {prefix, index, total});
+}
+
+/**
+ * @param {Element} element
+ * @param {{index: string, total: string}} options - The default title to use for the previous button.
+ * @return {string} The default title to use for the previous button.
+ */
+export function getPrevButtonTitle(element, options) {
+  const prefix =
+    element.getAttribute('data-prev-button-aria-label') ||
+    'Previous item in carousel';
+  const {index, total} = options;
+  return getButtonTitle(element, {prefix, index, total});
+}
+
+/**
+ * Returns the title for a next or prev button.
+ * Format:
+ * - Scrollable: "Next item in carousel"
+ * - Slides    : "Next item in carousel (X of Y)"
+ *
+ * @param {Element} element
+ * @param {{prefix: string, index: string, total:string}} opts
+ * @return {string}
+ */
+function getButtonTitle(element, {index, prefix, total}) {
+  if (isScrollable(element)) {
+    return prefix;
+  }
+
+  /**
+   * A format string for the button label. Should be a string, containing two
+   * placeholders of "%s", where the index and total count will go.
+   * @type {string}
+   */
+  const suffixFormat =
+    element.getAttribute('data-button-count-format') || '(%s of %s)';
+  const suffix = suffixFormat.replace('%s', index).replace('%s', total);
+
+  return `${prefix} ${suffix}`;
+}
+
+/**
+ * Returns true if the carousel is a Scrollable Carousel.
+ * @param {Element} element
+ * @return {boolean}
+ */
+export function isScrollable(element) {
+  return element.getAttribute('type') !== 'slides';
+}
diff --git a/extensions/amp-carousel/0.1/carousel-controls.js b/extensions/amp-carousel/0.1/carousel-controls.js
index e47d60e1792d..2e3c54bd9bf6 100644
--- a/extensions/amp-carousel/0.1/carousel-controls.js
+++ b/extensions/amp-carousel/0.1/carousel-controls.js
@@ -1,11 +1,10 @@
-import {Keys} from '#core/constants/key-codes';
-import {Services} from '#service';
-import {isAmp4Email} from '#core/document/format';
+import {Keys_Enum} from '#core/constants/key-codes';
 import {toggleAttribute} from '#core/dom';
 import {getWin} from '#core/window';
 
-const _CONTROL_HIDE_ATTRIBUTE = 'i-amphtml-carousel-hide-buttons';
-const _HAS_CONTROL_CLASS = 'i-amphtml-carousel-has-controls';
+import {Services} from '#service';
+
+import {ClassNames, setButtonState} from './build-dom';
 
 /**
  * @type {(dir:-1|1, animate: boolean, opt_autoplay?:boolean) => void}
@@ -17,129 +16,84 @@ export class CarouselControls {
    * @param {{
    *  element: !AmpElement,
    *  go: !GoFunctionDef,
-   *  ariaRole: 'button' | 'presentation',
-   *  hasPrev: () => boolean,
-   *  hasNext: () => boolean,
+   *  prevButton: !HTMLDivElement,
+   *  nextButton: !HTMLDivElement,
    * }} param0
    */
-  constructor({ariaRole, element, go, hasNext, hasPrev}) {
-    /** @private @type {!AmpElement} */
+  constructor({element, go, nextButton, prevButton}) {
+    /** @private @type {AmpElement} */
     this.element_ = element;
 
-    /** @private @type {!GoFunctionDef} */
+    /** @private @type {GoFunctionDef} */
     this.go_ = go;
 
-    /** @private @type {'button' | 'presentation'} */
-    this.ariaRole_ = ariaRole;
-
-    /** @private @type {!Window} */
+    /** @private @type {Window} */
     this.win_ = getWin(element);
 
-    /** @private {?HTMLDivElement} */
-    this.prevButton_ = null;
+    /** @private {HTMLDivElement} */
+    this.prevButton_ = prevButton;
 
-    /** @private {?HTMLDivElement} */
-    this.nextButton_ = null;
+    /** @private {HTMLDivElement} */
+    this.nextButton_ = nextButton;
 
     /** @private {boolean} */
     this.showControls_ = false;
 
-    /** @private {() => boolean} */
-    this.hasNext_ = hasNext;
-
-    /** @private {() => boolean} */
-    this.hasPrev_ = hasPrev;
+    this.setupBehaviors_();
   }
 
   /**
    * Runs side effects to initialize controls.
    * Meant to be called during carousel's buildCallback().
    */
-  initialize() {
-    const input = Services.inputFor(this.win_);
-    const doc = /** @type {!Document} */ (this.element_.ownerDocument);
+  setupBehaviors_() {
+    this.setupButtonInteraction(this.prevButton_, () => this.handlePrev());
+    this.setupButtonInteraction(this.nextButton_, () => this.handleNext());
 
-    if (isAmp4Email(doc) || this.element_.hasAttribute('controls')) {
+    if (this.element_.hasAttribute('controls')) {
       this.showControls_ = true;
-    } else {
-      input.onMouseDetected((mouseDetected) => {
-        if (mouseDetected) {
-          this.showControls_ = true;
-          toggleAttribute(
-            this.element_,
-            _CONTROL_HIDE_ATTRIBUTE,
-            !this.showControls_
-          );
-          this.element_.classList.add(_HAS_CONTROL_CLASS);
-        }
-      }, true);
-    }
-  }
-
-  /**
-   * Meant to be called as part of carousel's buildCallback().
-   * TODO(samouri): extract to build-dom.js file.
-   */
-  buildDom() {
-    const doc = this.element_.ownerDocument;
-    if (isAmp4Email(doc) || this.element_.hasAttribute('controls')) {
-      this.element_.classList.add(_HAS_CONTROL_CLASS);
+      return;
     }
-    this.buildButtons();
-    this.setControlsState();
-  }
 
-  /**
-   * Builds a carousel button for next/prev.
-   * @param {string} className
-   * @param {function():void} onInteraction
-   * @return {?HTMLDivElement}
-   */
-  buildButton(className, onInteraction) {
-    const button = this.element_.ownerDocument.createElement('div');
-    button.tabIndex = 0;
-    button.classList.add('amp-carousel-button');
-    button.classList.add(className);
-    button.setAttribute('role', this.ariaRole_);
-    button.onkeydown = (event) => {
-      if (event.key == Keys.ENTER || event.key == Keys.SPACE) {
-        if (!event.defaultPrevented) {
-          event.preventDefault();
-          onInteraction();
-        }
+    const input = Services.inputFor(this.win_);
+    input.onMouseDetected((mouseDetected) => {
+      if (mouseDetected) {
+        this.showControls_ = true;
+        toggleAttribute(
+          this.element_,
+          ClassNames.CONTROL_HIDE_ATTRIBUTE,
+          !this.showControls_
+        );
+        this.element_.classList.add(ClassNames.HAS_CONTROL);
       }
-    };
-    button.onclick = onInteraction;
-
-    return button;
+    }, true);
   }
 
   /**
-   * Builds the next and previous buttons.
+   * @param {HTMLDivElement} button
+   * @param {*} onInteraction
    */
-  buildButtons() {
-    this.prevButton_ = this.buildButton('amp-carousel-button-prev', () => {
-      this.interactionPrev();
-    });
-    this.element_.appendChild(this.prevButton_);
+  setupButtonInteraction(button, onInteraction) {
+    button.addEventListener('click', onInteraction);
+    button.addEventListener('keydown', (event) => {
+      if (event.defaultPrevented) {
+        return;
+      }
 
-    this.nextButton_ = this.buildButton('amp-carousel-button-next', () => {
-      this.interactionNext();
+      if (event.key == Keys_Enum.ENTER || event.key == Keys_Enum.SPACE) {
+        event.preventDefault();
+        onInteraction();
+      }
     });
-    this.updateButtonTitles();
-    this.element_.appendChild(this.nextButton_);
   }
 
   /**
    * Sets the previous and next button visual states.
+   * @param {{prev: boolean, next: boolean}} param0
    */
-  setControlsState() {
-    this.prevButton_.classList.toggle('amp-disabled', !this.hasPrev_());
-    this.prevButton_.setAttribute('aria-disabled', String(!this.hasPrev_()));
-    this.nextButton_.classList.toggle('amp-disabled', !this.hasNext_());
-    this.nextButton_.setAttribute('aria-disabled', String(!this.hasNext_()));
-    this.prevButton_.tabIndex = this.hasPrev_() ? 0 : -1;
-    this.nextButton_.tabIndex = this.hasNext_() ? 0 : -1;
+  setControlsState({next, prev}) {
+    setButtonState(this.prevButton_, prev);
+    setButtonState(this.nextButton_, next);
   }
 
   /**
@@ -168,49 +122,31 @@ export class CarouselControls {
    * Updates the titles for the next/previous buttons.
    * Uses given params if provided, otherwise uses sensible defaults.
    *
-   * @param {string=} prevTitle
-   * @param {string=} nextTitle
+   * @param {string} prevTitle
+   * @param {string} nextTitle
    */
   updateButtonTitles(prevTitle, nextTitle) {
-    this.prevButton_.title = prevTitle ?? this.getPrevButtonTitle();
-    this.nextButton_.title = nextTitle ?? this.getNextButtonTitle();
-  }
-
-  /**
-   * @return {string} The default title to use for the next button.
-   */
-  getNextButtonTitle() {
-    return (
-      this.element_.getAttribute('data-next-button-aria-label') ||
-      'Next item in carousel'
-    );
+    this.prevButton_.title = prevTitle;
+    this.nextButton_.title = nextTitle;
   }
 
   /**
-   * @return {string} The default title to use for the pevious button.
+   * Called on user interaction to proceed to the previous position.
    */
-  getPrevButtonTitle() {
-    return (
-      this.element_.getAttribute('data-prev-button-aria-label') ||
-      'Previous item in carousel'
-    );
-  }
-
-  /**
-   * Called on user interaction to proceed to the next item/position.
-   */
-  interactionNext() {
-    if (!this.nextButton_.classList.contains('amp-disabled')) {
-      this.go_(/* dir */ 1, /* animate */ true, /* autoplay */ false);
+  handlePrev() {
+    const isEnabled = !this.prevButton_.classList.contains('amp-disabled');
+    if (isEnabled) {
+      this.go_(/* dir */ -1, /* animate */ true, /* autoplay */ false);
     }
   }
 
   /**
-   * Called on user interaction to proceed to the previous item/position.
+   * Called on user interaction to proceed to the next position.
    */
-  interactionPrev() {
-    if (!this.prevButton_.classList.contains('amp-disabled')) {
-      this.go_(/* dir */ -1, /* animate */ true, /* autoplay */ false);
+  handleNext() {
+    const isEnabled = !this.nextButton_.classList.contains('amp-disabled');
+    if (isEnabled) {
+      this.go_(/* dir */ 1, /* animate */ true, /* autoplay */ false);
     }
   }
 }
diff --git a/extensions/amp-carousel/0.1/scrollable-carousel.js b/extensions/amp-carousel/0.1/scrollable-carousel.js
index 3575cf84f1e1..aeb312132941 100644
--- a/extensions/amp-carousel/0.1/scrollable-carousel.js
+++ b/extensions/amp-carousel/0.1/scrollable-carousel.js
@@ -1,20 +1,23 @@
-import {ActionTrust} from '#core/constants/action-constants';
-import {Animation} from '#utils/animation';
-import {CarouselControls} from './carousel-controls';
-import {Keys} from '#core/constants/key-codes';
-import {Services} from '#service';
-import {dev} from '#utils/log';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
+import {Keys_Enum} from '#core/constants/key-codes';
 import {isLayoutSizeFixed} from '#core/dom/layout';
-import {listen} from '#utils/event-helper';
-import {numeric} from '#core/dom/transition';
 import {observeIntersections} from '#core/dom/layout/viewport-observer';
-import {realChildElements} from '#core/dom/query';
+import {numeric} from '#core/dom/transition';
+
+import {Services} from '#service';
+
+import {Animation} from '#utils/animation';
+import {listen} from '#utils/event-helper';
+import {dev} from '#utils/log';
+
+import {buildDom} from './build-dom';
+import {CarouselControls} from './carousel-controls';
 
 /** @const {string} */
 const TAG = 'amp-scrollable-carousel';
 
 export class AmpScrollableCarousel extends AMP.BaseElement {
-  /** @param {!AmpElement} element */
+  /** @param {AmpElement} element */
   constructor(element) {
     super(element);
 
@@ -24,7 +27,7 @@ export class AmpScrollableCarousel extends AMP.BaseElement {
     /** @private {number} */
     this.oldPos_ = 0;
 
-    /** @private {?Array<!Element>} */
+    /** @private {?Array<Element>} */
     this.cells_ = null;
 
     /** @private {?Element} */
@@ -37,21 +40,7 @@ export class AmpScrollableCarousel extends AMP.BaseElement {
     this.unobserveIntersections_ = null;
 
     /** @private {CarouselControls} */
-    this.controls_ = new CarouselControls({
-      element,
-      go: this.go.bind(this),
-      hasPrev: () => this.hasPrev(),
-      hasNext: () => this.hasNext(),
-
-      /**
-       * In scrollable carousel, the next/previous buttons add no functionality
-       * for screen readers as scrollable carousel is just a horizontally
-       * scrollable div which ATs navigate just like any other content.
-       * To avoid confusion, we therefore set the role to presentation for the
-       * controls in this case.
-       */
-      ariaRole: 'presentation',
-    });
+    this.controls_ = null;
   }
 
   /** @override */
@@ -64,23 +53,11 @@ export class AmpScrollableCarousel extends AMP.BaseElement {
     return true;
   }
 
-  /** Build carousel elements */
-  buildCarousel() {
-    this.cells_ = realChildElements(this.element);
-
-    this.container_ = this.element.ownerDocument.createElement('div');
-    this.container_.classList.add('i-amphtml-scrollable-carousel-container');
-    // Focusable container makes it possible to fully consume Arrow key events.
-    this.container_.setAttribute('tabindex', '-1');
-    this.element.appendChild(this.container_);
-
-    this.cells_.forEach((cell) => {
-      Services.ownersForDoc(this.element).setOwner(cell, this.element);
-      cell.classList.add('amp-carousel-slide');
-      cell.classList.add('amp-scrollable-carousel-slide');
-      this.container_.appendChild(cell);
-    });
-
+  /**
+   * Attaches event handlers.
+   * @private
+   */
+  setupBehavior_() {
     this.cancelTouchEvents_();
 
     this.container_.addEventListener('scroll', this.scrollHandler_.bind(this));
@@ -89,16 +66,20 @@ export class AmpScrollableCarousel extends AMP.BaseElement {
       this.keydownHandler_.bind(this)
     );
 
+    this.cells_.forEach((cell) => {
+      Services.ownersForDoc(this.element).setOwner(cell, this.element);
+    });
+
     this.registerAction(
       'goToSlide',
       (invocation) => {
         const {args} = invocation;
         if (args) {
           const index = parseInt(args['index'], 10);
-          this.goToSlide_(index);
+          this.goToSlide(index);
         }
       },
-      ActionTrust.LOW
+      ActionTrust_Enum.LOW
     );
     /** If the element is in an email document, allow its `goToSlide` action. */
     Services.actionServiceForDoc(this.element).addToAllowlist(
@@ -110,9 +91,17 @@ export class AmpScrollableCarousel extends AMP.BaseElement {
 
   /** @override */
   buildCallback() {
-    this.buildCarousel();
-    this.controls_.buildDom();
-    this.controls_.initialize();
+    const {cells, container, nextButton, prevButton} = buildDom(this.element);
+    this.container_ = container;
+    this.cells_ = cells;
+
+    this.controls_ = new CarouselControls({
+      element: this.element,
+      prevButton,
+      nextButton,
+      go: this.go.bind(this),
+    });
+    this.setupBehavior_();
   }
 
   /** @override */
@@ -124,7 +113,10 @@ export class AmpScrollableCarousel extends AMP.BaseElement {
 
     this.doLayout_(this.pos_);
     this.preloadNext_(this.pos_, 1);
-    this.controls_.setControlsState();
+    this.controls_.setControlsState({
+      prev: this.hasPrev_(),
+      next: this.hasNext_(),
+    });
     return Promise.resolve();
   }
 
@@ -151,9 +143,8 @@ export class AmpScrollableCarousel extends AMP.BaseElement {
    * desired direction.
    * @param {number} dir -1 or 1
    * @param {boolean} animate
-   * @param {boolean=} opt_autoplay
    */
-  go(dir, animate, opt_autoplay) {
+  go(dir, animate) {
     const newPos = this.nextPos_(this.pos_, dir);
     const oldPos = this.pos_;
 
@@ -165,7 +156,7 @@ export class AmpScrollableCarousel extends AMP.BaseElement {
       this.commitSwitch_(newPos);
       this.container_./*OK*/ scrollLeft = newPos;
     } else {
-      /** @const {!TransitionDef<number>} */
+      /** @const {TransitionDef<number>} */
       const interpolate = numeric(oldPos, newPos);
       const duration = 200;
       const curve = 'ease-in-out';
@@ -185,10 +176,9 @@ export class AmpScrollableCarousel extends AMP.BaseElement {
   /**
    * Scrolls to the slide at the given slide index.
    * @param {number} index
-   * @private
    * @return {*} TODO(#23582): Specify return type
    */
-  goToSlide_(index) {
+  goToSlide(index) {
     const noOfSlides = this.cells_.length;
 
     if (!isFinite(index) || index < 0 || index >= noOfSlides) {
@@ -207,7 +197,7 @@ export class AmpScrollableCarousel extends AMP.BaseElement {
       if (newPos == oldPos) {
         return;
       }
-      /** @const {!TransitionDef<number>} */
+      /** @const {TransitionDef<number>} */
       const interpolate = numeric(oldPos, newPos);
       const duration = 200;
       const curve = 'ease-in-out';
@@ -255,12 +245,12 @@ export class AmpScrollableCarousel extends AMP.BaseElement {
    * Escapes Left and Right arrow key events on the carousel container.
    * This is to prevent them from doubly interacting with surrounding viewer
    * contexts such as email clients when interacting with the amp-carousel.
-   * @param {!KeyboardEvent} event
+   * @param {KeyboardEvent} event
    * @private
    */
   keydownHandler_(event) {
     const {key} = event;
-    if (key == Keys.LEFT_ARROW || key == Keys.RIGHT_ARROW) {
+    if (key == Keys_Enum.LEFT_ARROW || key == Keys_Enum.RIGHT_ARROW) {
       event.stopPropagation();
     }
   }
@@ -307,7 +297,10 @@ export class AmpScrollableCarousel extends AMP.BaseElement {
     this.preloadNext_(pos, Math.sign(pos - this.oldPos_));
     this.oldPos_ = pos;
     this.pos_ = pos;
-    this.controls_.setControlsState();
+    this.controls_.setControlsState({
+      prev: this.hasPrev_(),
+      next: this.hasNext_(),
+    });
   }
 
   /**
@@ -317,7 +310,6 @@ export class AmpScrollableCarousel extends AMP.BaseElement {
    * @private
    */
   nextPos_(pos, dir) {
-    // TODO(jridgewell): this could be using cached values from Layers.
     const containerWidth = this.element./*OK*/ offsetWidth;
     const fullWidth = this.container_./*OK*/ scrollWidth;
     const newPos = pos + dir * containerWidth;
@@ -332,7 +324,7 @@ export class AmpScrollableCarousel extends AMP.BaseElement {
 
   /**
    * @param {number} pos
-   * @param {function(!Element):void} callback
+   * @param {function(Element):void} callback
    * @private
    */
   withinWindow_(pos, callback) {
@@ -392,19 +384,47 @@ export class AmpScrollableCarousel extends AMP.BaseElement {
     }
   }
 
-  /** @return  {boolean} */
-  hasPrev() {
+  /**
+   * @return {boolean}
+   * @private
+   */
+  hasPrev_() {
     return this.pos_ != 0;
   }
 
-  /** @return  {boolean} */
-  hasNext() {
+  /**
+   * @return {boolean}
+   * @private
+   */
+  hasNext_() {
     const containerWidth = this.element./*OK*/ offsetWidth;
     const scrollWidth = this.container_./*OK*/ scrollWidth;
     const maxPos = Math.max(scrollWidth - containerWidth, 0);
     return this.pos_ != maxPos;
   }
 
+  /** Used by amp-lightbox-gallery */
+  interactionNext() {
+    this.controls_.handleNext();
+  }
+
+  /** Used by amp-lightbox-gallery */
+  interactionPrev() {
+    this.controls_.handlePrev();
+  }
+
+  /**
+   * Used by amp-lightbox-gallery
+   *
+   * Does all the work needed to proceed to next
+   * desired direction.
+   * @param {number} dir -1 or 1
+   * @param {boolean} animate
+   */
+  goCallback(dir, animate) {
+    this.go(dir, animate);
+  }
+
   /**
    * Cancels the touchmove events for the element so that viewer does not
    * consider the swipes in the carousel as swipes for changing AMP documents.
diff --git a/extensions/amp-carousel/0.1/shame.d.ts b/extensions/amp-carousel/0.1/shame.d.ts
index 1f4050a532b1..71e6520b9ce6 100644
--- a/extensions/amp-carousel/0.1/shame.d.ts
+++ b/extensions/amp-carousel/0.1/shame.d.ts
@@ -24,66 +24,3 @@ declare module '#service' {
 declare module '#utils/analytics' {
   export var triggerAnalyticsEvent: any;
 }
-
-// TODO: everything below are core stubs, which we can remove once Core has been
-// converted to TS.
-declare module '#core/constants/key-codes' {
-  export var Keys: any;
-}
-
-declare module '#core/document/format' {
-  export var isAmp4Email: any;
-}
-
-declare module '#core/dom/layout/viewport-observer' {
-  export var observeIntersections: any;
-}
-
-declare module '#core/dom' {
-  export var toggleAttribute: any;
-  export var dispatchCustomEvent: any;
-}
-
-declare module '#core/window' {
-  export var getWin: (element: Element) => Window;
-}
-
-declare module '#core/dom/query' {
-  export var realChildElements: any;
-  export var closestAncestorElementBySelector: any;
-}
-
-declare module '#core/constants/action-constants' {
-  export var ActionTrust: any;
-}
-
-declare module '#core/dom/layout' {
-  export var isLayoutSizeFixed: any;
-  export var isLayoutSizeDefined: any;
-}
-
-declare module '#core/dom/layout/size-observer' {
-  export var observeContentSize: any;
-  export var unobserveContentSize: any;
-}
-
-declare module '#core/types' {
-  export var isFiniteNumber: any;
-}
-
-declare module '#core/types/object' {
-  export var dict: any;
-}
-
-declare module '#core/dom/transition' {
-  export var numeric: any;
-}
-
-declare module '#core/dom/style' {
-  export var getStyle: any;
-  export var setStyle: any;
-}
-
-declare module '#core/data-structures/curve' {
-  export var bezierCurve: any;
-}
diff --git a/extensions/amp-carousel/0.1/slidescroll.js b/extensions/amp-carousel/0.1/slidescroll.js
index 33fce122c772..b052c55dcf58 100644
--- a/extensions/amp-carousel/0.1/slidescroll.js
+++ b/extensions/amp-carousel/0.1/slidescroll.js
@@ -1,31 +1,36 @@
-import {ActionTrust} from '#core/constants/action-constants';
-import {Animation} from '#utils/animation';
-import {dev, user, userAssert} from '#utils/log';
-import {Keys} from '#core/constants/key-codes';
-import {Services} from '#service';
-import {CarouselControls} from './carousel-controls';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
+import {Keys_Enum} from '#core/constants/key-codes';
 import {bezierCurve} from '#core/data-structures/curve';
-import {
-  closestAncestorElementBySelector,
-  realChildElements,
-} from '#core/dom/query';
-import {createCustomEvent, listen} from '#utils/event-helper';
-import {dict} from '#core/types/object';
 import {dispatchCustomEvent} from '#core/dom';
-import {getStyle, setStyle} from '#core/dom/style';
-import {isExperimentOn} from '#experiments';
-import {isFiniteNumber} from '#core/types';
 import {isLayoutSizeDefined} from '#core/dom/layout';
-import {numeric} from '#core/dom/transition';
 import {
   observeContentSize,
   unobserveContentSize,
 } from '#core/dom/layout/size-observer';
 import {observeIntersections} from '#core/dom/layout/viewport-observer';
+import {closestAncestorElementBySelector} from '#core/dom/query';
+import {getStyle, setStyle} from '#core/dom/style';
+import {numeric} from '#core/dom/transition';
+import {isFiniteNumber} from '#core/types';
+
+import {isExperimentOn} from '#experiments';
+
+import {Services} from '#service';
+
 import {triggerAnalyticsEvent} from '#utils/analytics';
+import {Animation} from '#utils/animation';
+import {createCustomEvent, listen} from '#utils/event-helper';
+import {dev, user, userAssert} from '#utils/log';
+
+import {
+  ClassNames,
+  buildDom,
+  getNextButtonTitle,
+  getPrevButtonTitle,
+} from './build-dom';
+import {CarouselControls} from './carousel-controls';
 
 /** @const {string} */
-const SHOWN_CSS_CLASS = 'i-amphtml-slide-item-show';
 
 /** @const {number} */
 const NATIVE_SNAP_TIMEOUT = 200;
@@ -45,7 +50,7 @@ const CUSTOM_SNAP_TIMEOUT = 100;
 const TAG = 'AMP-CAROUSEL';
 
 export class AmpSlideScroll extends AMP.BaseElement {
-  /** @param {!AmpElement} element */
+  /** @param {AmpElement} element */
   constructor(element) {
     super(element);
 
@@ -55,7 +60,7 @@ export class AmpSlideScroll extends AMP.BaseElement {
     /** @private {boolean} */
     this.hasNativeSnapPoints_ = false;
 
-    /** @private {!Array<!Element>} */
+    /** @private {Array<Element>} */
     this.slides_ = [];
 
     /** @private {number} */
@@ -64,7 +69,7 @@ export class AmpSlideScroll extends AMP.BaseElement {
     /** @private {?Element} */
     this.slidesContainer_ = null;
 
-    /** @private {!Array<!Element>} */
+    /** @private {Array<Element>} */
     this.slideWrappers_ = [];
 
     /** @private {boolean} */
@@ -91,14 +96,14 @@ export class AmpSlideScroll extends AMP.BaseElement {
     /** @private {number} */
     this.autoplayDelay_ = 5000;
 
-    /** @protected {?number} */
+    /** @private {?number} */
     this.autoplayLoops_ = null;
 
-    /** @protected {number} */
+    /** @private {number} */
     this.loopsMade_ = 0;
 
-    /** @protected {boolean} */
-    this.shouldLoop = false;
+    /** @private {boolean} */
+    this.shouldLoop_ = false;
 
     /** @private {boolean} */
     this.shouldAutoplay_ = false;
@@ -129,7 +134,7 @@ export class AmpSlideScroll extends AMP.BaseElement {
     /** @private {number} */
     this.previousScrollLeft_ = 0;
 
-    /** @private {!Array<?string>} */
+    /** @private {Array<?string>} */
     this.dataSlideIdArr_ = [];
 
     const platform = Services.platformFor(this.win);
@@ -155,8 +160,8 @@ export class AmpSlideScroll extends AMP.BaseElement {
       .startsWith('10.3')
       ? true
       : this.isIos_
-      ? false
-      : !isExperimentOn(this.win, 'amp-carousel-chrome-scroll-snap');
+        ? false
+        : !isExperimentOn(this.win, 'amp-carousel-chrome-scroll-snap');
 
     /** @private {boolean} */
     this.hasFirstResizedOccured_ = false;
@@ -167,13 +172,7 @@ export class AmpSlideScroll extends AMP.BaseElement {
     this.unobserveIntersections_ = null;
 
     /** @private {CarouselControls} */
-    this.controls_ = new CarouselControls({
-      element,
-      go: this.go.bind(this),
-      ariaRole: 'button',
-      hasPrev: () => this.hasPrev(),
-      hasNext: () => this.hasNext(),
-    });
+    this.controls_ = null;
   }
 
   /** @override */
@@ -186,22 +185,16 @@ export class AmpSlideScroll extends AMP.BaseElement {
     return true;
   }
 
-  /** Build carousel elements */
-  buildCarousel() {
-    this.hasLoop_ = this.element.hasAttribute('loop');
-
-    this.hasAutoplay_ = this.element.hasAttribute('autoplay');
+  /**
+   * Attaches event handlers
+   * @private
+   */
+  setupBehavior_() {
     const autoplayVal = this.element.getAttribute('autoplay');
     if (autoplayVal) {
       this.autoplayLoops_ = parseInt(autoplayVal, 10);
       userAssert(isFiniteNumber(this.autoplayLoops_));
     }
-    this.buildSlides();
-
-    this.shouldLoop = this.hasLoop_ && this.isLoopingEligible();
-
-    this.shouldAutoplay_ = this.hasAutoplay_ && this.isLoopingEligible();
-
     if (this.shouldAutoplay_ && this.autoplayLoops_ != 0) {
       this.setupAutoplay_();
     }
@@ -216,14 +209,15 @@ export class AmpSlideScroll extends AMP.BaseElement {
           this.toggleAutoplay_(!this.hasAutoplay_);
         }
       },
-      ActionTrust.LOW
+      ActionTrust_Enum.LOW
     );
   }
 
   /**
-   * Builds slides
+   * Attaches event listeners for slides.
+   * Also creates client-specific DOM for various bugfixes.
    */
-  buildSlides() {
+  setupSlideBehavior_() {
     this.vsync_ = this.getVsync();
     this.action_ = Services.actionServiceForDoc(this.element);
     /** If the element is in an email document, allow its `goToSlide` action. */
@@ -236,25 +230,13 @@ export class AmpSlideScroll extends AMP.BaseElement {
       this.hasNativeSnapPoints_ = false;
     }
 
-    this.element.classList.add('i-amphtml-slidescroll');
-
-    this.slides_ = realChildElements(this.element);
-
-    this.noOfSlides_ = this.slides_.length;
-
-    this.slidesContainer_ = this.win.document.createElement('div');
-    // Focusable container makes it possible to fully consume Arrow key events.
-    this.slidesContainer_.setAttribute('tabindex', '-1');
-    this.slidesContainer_.classList.add('i-amphtml-slides-container');
-    // Let screen reader know that this is a live area and changes
-    // to it (such after pressing next) should be announced to the
-    // user.
-    this.slidesContainer_.setAttribute('aria-live', 'polite');
     // Snap point is buggy in IOS 10.3 (beta), so it is disabled in beta.
     // https://bugs.webkit.org/show_bug.cgi?id=169800
-    if (this.shouldDisableCssSnap_) {
-      this.slidesContainer_.classList.add('i-amphtml-slidescroll-no-snap');
-    }
+    this.slidesContainer_.classList.toggle(
+      ClassNames.SLIDES_CONTAINER_NOSNAP,
+      this.shouldDisableCssSnap_
+    );
+
     // Workaround - https://bugs.webkit.org/show_bug.cgi?id=158821
     if (this.hasNativeSnapPoints_) {
       const start = this.win.document.createElement('div');
@@ -265,22 +247,11 @@ export class AmpSlideScroll extends AMP.BaseElement {
       end.classList.add('i-amphtml-carousel-end-marker');
       this.slidesContainer_.appendChild(end);
     }
-    this.element.appendChild(this.slidesContainer_);
 
     this.slides_.forEach((slide, index) => {
-      this.dataSlideIdArr_.push(
-        slide.getAttribute('data-slide-id') || index.toString()
-      );
+      const id = slide.getAttribute('data-slide-id') || index.toString();
+      this.dataSlideIdArr_.push(id);
       Services.ownersForDoc(this.element).setOwner(slide, this.element);
-      slide.classList.add('amp-carousel-slide');
-
-      const slideWrapper = this.win.document.createElement('div');
-      slideWrapper.classList.add('i-amphtml-slide-item');
-      this.slidesContainer_.appendChild(slideWrapper);
-
-      slideWrapper.appendChild(slide);
-
-      this.slideWrappers_.push(slideWrapper);
     });
 
     this.cancelTouchEvents_();
@@ -313,10 +284,10 @@ export class AmpSlideScroll extends AMP.BaseElement {
       (invocation) => {
         const {args} = invocation;
         if (args) {
-          this.goToSlide(args['index'], ActionTrust.HIGH);
+          this.goToSlide(args['index'], ActionTrust_Enum.HIGH);
         }
       },
-      ActionTrust.LOW
+      ActionTrust_Enum.LOW
     );
   }
 
@@ -342,7 +313,7 @@ export class AmpSlideScroll extends AMP.BaseElement {
   mutatedAttributesCallback(mutations) {
     const slide = mutations['slide'];
     if (slide !== undefined) {
-      this.goToSlide(slide, ActionTrust.HIGH);
+      this.goToSlide(slide, ActionTrust_Enum.HIGH);
     }
   }
 
@@ -362,12 +333,33 @@ export class AmpSlideScroll extends AMP.BaseElement {
   viewportCallback(inViewport) {
     if (inViewport) {
       this.autoplay_();
-      this.controls_.hintControls();
+      this.controls_?.hintControls();
     } else {
       this.clearAutoplayTimer_();
     }
   }
 
+  /** Used by amp-lightbox-gallery */
+  interactionNext() {
+    this.controls_.handleNext();
+  }
+
+  /** Used by amp-lightbox-gallery */
+  interactionPrev() {
+    this.controls_.handlePrev();
+  }
+
+  /**
+   * Does all the work needed to proceed to next
+   * desired direction.
+   * @param {number} dir -1 or 1
+   * @param {boolean} animate
+   * @param {boolean=} opt_autoplay
+   */
+  goCallback(dir, animate, opt_autoplay) {
+    this.go(dir, animate, opt_autoplay);
+  }
+
   /**
    * Does all the work needed to proceed to next
    * desired direction.
@@ -376,7 +368,7 @@ export class AmpSlideScroll extends AMP.BaseElement {
    * @param {boolean=} opt_autoplay
    */
   go(dir, animate, opt_autoplay) {
-    const trust = opt_autoplay ? ActionTrust.LOW : ActionTrust.HIGH;
+    const trust = opt_autoplay ? ActionTrust_Enum.LOW : ActionTrust_Enum.HIGH;
     this.moveSlide(dir, animate, trust);
     if (opt_autoplay) {
       this.autoplay_();
@@ -406,9 +398,9 @@ export class AmpSlideScroll extends AMP.BaseElement {
         const currentScrollLeft = this.slidesContainer_./*OK*/ scrollLeft;
 
         if (this.hasNativeSnapPoints_) {
-          this.updateOnScroll_(currentScrollLeft, ActionTrust.LOW);
+          this.updateOnScroll_(currentScrollLeft, ActionTrust_Enum.LOW);
         } else {
-          this.customSnap_(currentScrollLeft, undefined, ActionTrust.LOW);
+          this.customSnap_(currentScrollLeft, undefined, ActionTrust_Enum.HIGH);
         }
       }, timeout)
     );
@@ -427,7 +419,7 @@ export class AmpSlideScroll extends AMP.BaseElement {
   }
 
   /**
-   * @param {!LayoutSize} size
+   * @param {import('#core/dom/layout/rect').LayoutSizeDef} size
    * @private
    */
   onResized_(size) {
@@ -437,9 +429,29 @@ export class AmpSlideScroll extends AMP.BaseElement {
 
   /** @override */
   buildCallback() {
-    this.buildCarousel();
-    this.controls_.buildDom();
-    this.controls_.initialize();
+    const {nextButton, prevButton, slideWrappers, slides, slidesContainer} =
+      buildDom(this.element);
+    this.slides_ = slides;
+    this.slidesContainer_ = slidesContainer;
+    this.slideWrappers_ = slideWrappers;
+    this.noOfSlides_ = this.slides_.length;
+    this.hasLoop_ = this.element.hasAttribute('loop');
+    this.hasAutoplay_ = this.element.hasAttribute('autoplay');
+    this.shouldLoop_ = this.hasLoop_ && this.isLoopingEligible();
+    this.shouldAutoplay_ = this.hasAutoplay_ && this.isLoopingEligible();
+
+    this.controls_ = new CarouselControls({
+      element: this.element,
+      go: this.go.bind(this),
+      nextButton,
+      prevButton,
+    });
+    this.controls_.updateButtonTitles(
+      this.getPrevButtonTitle(),
+      this.getNextButtonTitle()
+    );
+    this.setupBehavior_();
+    this.setupSlideBehavior_();
   }
 
   /** @override */
@@ -497,26 +509,32 @@ export class AmpSlideScroll extends AMP.BaseElement {
     return true;
   }
 
-  /** @return  {boolean} */
-  hasPrev() {
-    return this.shouldLoop || this.slideIndex_ > 0;
+  /**
+   * @return  {boolean}
+   * @private
+   */
+  hasPrev_() {
+    return this.shouldLoop_ || this.slideIndex_ > 0;
   }
 
-  /** @return {boolean} */
-  hasNext() {
-    return this.shouldLoop || this.slideIndex_ < this.slides_.length - 1;
+  /**
+   * @return  {boolean}
+   * @private
+   */
+  hasNext_() {
+    return this.shouldLoop_ || this.slideIndex_ < this.slides_.length - 1;
   }
 
   /**
    * Proceeds to the next slide in the desired direction.
    * @param {number} dir -1 or 1
    * @param {boolean} animate
-   * @param {!ActionTrust} trust
+   * @param {ActionTrust_Enum} trust
    */
   moveSlide(dir, animate, trust) {
     if (this.slideIndex_ !== null) {
-      const hasNext = this.hasNext();
-      const hasPrev = this.hasPrev();
+      const hasNext = this.hasNext_();
+      const hasPrev = this.hasPrev_();
       if ((dir == 1 && hasNext) || (dir == -1 && hasPrev)) {
         let newIndex = dev().assertNumber(this.slideIndex_) + dir;
         if (newIndex == -1) {
@@ -536,7 +554,7 @@ export class AmpSlideScroll extends AMP.BaseElement {
 
   /**
    * Handles scroll on the slides container.
-   * @param {!Event} unusedEvent Event object.
+   * @param {Event} unusedEvent Event object.
    * @private
    */
   scrollHandler_(unusedEvent) {
@@ -549,8 +567,8 @@ export class AmpSlideScroll extends AMP.BaseElement {
     const timeout = this.hasNativeSnapPoints_
       ? NATIVE_SNAP_TIMEOUT
       : this.isIos_
-      ? IOS_CUSTOM_SNAP_TIMEOUT
-      : CUSTOM_SNAP_TIMEOUT;
+        ? IOS_CUSTOM_SNAP_TIMEOUT
+        : CUSTOM_SNAP_TIMEOUT;
     // Timer that detects scroll end and/or end of snap scroll.
     this.waitForScrollSettled_(timeout);
 
@@ -561,12 +579,12 @@ export class AmpSlideScroll extends AMP.BaseElement {
    * Escapes Left and Right arrow key events on the carousel container.
    * This is to prevent them from doubly interacting with surrounding viewer
    * contexts such as email clients when interacting with the amp-carousel.
-   * @param {!KeyboardEvent} event
+   * @param {KeyboardEvent} event
    * @private
    */
   keydownHandler_(event) {
     const {key} = event;
-    if (key == Keys.LEFT_ARROW || key == Keys.RIGHT_ARROW) {
+    if (key == Keys_Enum.LEFT_ARROW || key == Keys_Enum.RIGHT_ARROW) {
       event.stopPropagation();
     }
   }
@@ -609,15 +627,15 @@ export class AmpSlideScroll extends AMP.BaseElement {
    * @param {number} currentScrollLeft scrollLeft value of the slides container.
    * @param {number=} opt_forceDir if a valid direction is given force it to
    * move 1 slide in that direction.
-   * @param {ActionTrust=} opt_trust
-   * @return {!Promise}
+   * @param {ActionTrust_Enum=} opt_trust
+   * @return {Promise}
    */
   customSnap_(currentScrollLeft, opt_forceDir, opt_trust) {
     this.snappingInProgress_ = true;
     const newIndex = this.getNextSlideIndex_(currentScrollLeft);
     // Default behavior should be stays on current slide
     let diff = newIndex - this.slideIndex_;
-    const hasPrev = this.hasPrev();
+    const hasPrev = this.hasPrev_();
     let toScrollLeft = hasPrev ? this.slideWidth_ : 0;
 
     if (diff == 0 && (opt_forceDir == 1 || opt_forceDir == -1)) {
@@ -655,8 +673,8 @@ export class AmpSlideScroll extends AMP.BaseElement {
     // shown slide.
     let updateValue = 0;
 
-    const hasPrev = this.hasPrev();
-    const hasNext = this.hasNext();
+    const hasPrev = this.hasPrev_();
+    const hasNext = this.hasNext_();
 
     if (hasPrev && hasNext) {
       updateValue = scrolledSlideIndex - 1;
@@ -670,72 +688,48 @@ export class AmpSlideScroll extends AMP.BaseElement {
 
     let newIndex = this.slideIndex_ + updateValue;
 
-    if (this.shouldLoop) {
+    if (this.shouldLoop_) {
       newIndex =
         newIndex < 0
           ? this.noOfSlides_ - 1
           : newIndex >= this.noOfSlides_
-          ? 0
-          : newIndex;
+            ? 0
+            : newIndex;
     } else {
       newIndex =
         newIndex < 0
           ? 0
           : newIndex >= this.noOfSlides_
-          ? this.noOfSlides_ - 1
-          : newIndex;
+            ? this.noOfSlides_ - 1
+            : newIndex;
     }
     return newIndex;
   }
 
-  /**
-   * A format string for the button label. Should be a string, containing two
-   * placeholders of "%s", where the index and total count will go.
-   * @return {string}
-   * @private
-   */
-  getButtonSuffixFormat_() {
-    return (
-      this.element.getAttribute('data-button-count-format') || '(%s of %s)'
-    );
-  }
-
-  /**
-   * @param {number} buttonIndex The index that the button will take the user
-   *    to.
-   * @return {string} The formatted suffix for the button title.
-   */
-  getButtonTitleSuffix_(buttonIndex) {
-    const index = String(buttonIndex + 1);
-    const count = String(this.noOfSlides_);
-    return (
-      ' ' +
-      this.getButtonSuffixFormat_().replace('%s', index).replace('%s', count)
-    );
-  }
-
   /** @return {string} */
   getPrevButtonTitle() {
     const prevIndex = this.getPrevIndex_(this.slideIndex_);
-    const index = prevIndex == null ? 0 : prevIndex;
-    return (
-      this.controls_.getPrevButtonTitle() + this.getButtonTitleSuffix_(index)
-    );
+    const index = (prevIndex == null ? 0 : prevIndex) + 1;
+    return getPrevButtonTitle(this.element, {
+      index: String(index),
+      total: String(this.noOfSlides_),
+    });
   }
 
   /** @return {string} */
   getNextButtonTitle() {
     const nextIndex = this.getNextIndex_(this.slideIndex_);
-    const index = nextIndex == null ? this.noOfSlides_ - 1 : nextIndex;
-    return (
-      this.controls_.getNextButtonTitle() + this.getButtonTitleSuffix_(index)
-    );
+    const index = (nextIndex == null ? this.noOfSlides_ - 1 : nextIndex) + 1;
+    return getNextButtonTitle(this.element, {
+      index: String(index),
+      total: String(this.noOfSlides_),
+    });
   }
 
   /**
    * Updates to the right state of the new index on scroll.
    * @param {number} currentScrollLeft scrollLeft value of the slides container.
-   * @param {ActionTrust=} opt_trust
+   * @param {ActionTrust_Enum=} opt_trust
    */
   updateOnScroll_(currentScrollLeft, opt_trust) {
     if (!isFiniteNumber(currentScrollLeft) || this.slideIndex_ === null) {
@@ -756,7 +750,7 @@ export class AmpSlideScroll extends AMP.BaseElement {
    * Parses given value as integer and shows the slide with that index value
    * when element has been laid out.
    * @param {*} value
-   * @param {!ActionTrust} trust
+   * @param {ActionTrust_Enum} trust
    */
   goToSlide(value, trust) {
     const index = parseInt(value, 10);
@@ -784,9 +778,9 @@ export class AmpSlideScroll extends AMP.BaseElement {
   getPrevIndex_(currentIndex) {
     return currentIndex - 1 >= 0
       ? currentIndex - 1
-      : this.shouldLoop
-      ? this.noOfSlides_ - 1
-      : null;
+      : this.shouldLoop_
+        ? this.noOfSlides_ - 1
+        : null;
   }
 
   /**
@@ -798,9 +792,9 @@ export class AmpSlideScroll extends AMP.BaseElement {
   getNextIndex_(currentIndex) {
     return currentIndex + 1 < this.noOfSlides_
       ? currentIndex + 1
-      : this.shouldLoop
-      ? 0
-      : null;
+      : this.shouldLoop_
+        ? 0
+        : null;
   }
 
   /**
@@ -844,10 +838,10 @@ export class AmpSlideScroll extends AMP.BaseElement {
       return false;
     }
     showIndexArr.forEach((showIndex, loopIndex) => {
-      if (this.shouldLoop) {
+      if (this.shouldLoop_) {
         setStyle(this.slideWrappers_[showIndex], 'order', loopIndex + 1);
       }
-      this.slideWrappers_[showIndex].classList.add(SHOWN_CSS_CLASS);
+      this.slideWrappers_[showIndex].classList.add(ClassNames.SLIDES_ITEM_SHOW);
       const owners = Services.ownersForDoc(this.element);
       if (showIndex == newIndex) {
         owners.scheduleLayout(this.element, this.slides_[showIndex]);
@@ -873,8 +867,11 @@ export class AmpSlideScroll extends AMP.BaseElement {
       }
     }
     this.hideRestOfTheSlides_(showIndexArr);
-    this.controls_.setControlsState();
-    this.controls_.updateButtonTitles(
+    this.controls_?.setControlsState({
+      prev: this.hasPrev_(),
+      next: this.hasNext_(),
+    });
+    this.controls_?.updateButtonTitles(
       this.getPrevButtonTitle(),
       this.getNextButtonTitle()
     );
@@ -884,19 +881,17 @@ export class AmpSlideScroll extends AMP.BaseElement {
   /**
    * Shows the slide at the given index and triggers a `slideChange` event.
    * @param {number} newIndex
-   * @param {ActionTrust=} opt_trust LOW by default.
+   * @param {ActionTrust_Enum=} opt_trust LOW by default.
    * @private
    */
-  showSlideAndTriggerAction_(newIndex, opt_trust = ActionTrust.LOW) {
+  showSlideAndTriggerAction_(newIndex, opt_trust = ActionTrust_Enum.LOW) {
     const slideChanged = this.showSlide_(newIndex);
 
     if (slideChanged) {
       const name = 'slideChange';
-      const event = createCustomEvent(
-        this.win,
-        `slidescroll.${name}`,
-        dict({'index': newIndex})
-      );
+      const event = createCustomEvent(this.win, `slidescroll.${name}`, {
+        'index': newIndex,
+      });
       this.action_.trigger(this.element, name, event, opt_trust);
 
       dispatchCustomEvent(this.element, name, {
@@ -918,7 +913,7 @@ export class AmpSlideScroll extends AMP.BaseElement {
     // instances we show the second slide (middle slide at
     // scrollLeft = slide's width).
     let newScrollLeft = this.slideWidth_;
-    if ((!this.shouldLoop && index == 0) || this.slides_.length <= 1) {
+    if ((!this.shouldLoop_ && index == 0) || this.slides_.length <= 1) {
       newScrollLeft = 0;
     }
     return newScrollLeft;
@@ -926,24 +921,24 @@ export class AmpSlideScroll extends AMP.BaseElement {
 
   /**
    * Given an index, hides rest of the slides that are not needed.
-   * @param {!Array<number>} indexArr Array of indices that
+   * @param {Array<number>} indexArr Array of indices that
    *    should not be hidden.
    * @private
    */
   hideRestOfTheSlides_(indexArr) {
     const {noOfSlides_} = this;
     for (let i = 0; i < noOfSlides_; i++) {
-      if (!this.slideWrappers_[i].classList.contains(SHOWN_CSS_CLASS)) {
+      if (
+        !this.slideWrappers_[i].classList.contains(ClassNames.SLIDES_ITEM_SHOW)
+      ) {
         continue;
       }
       // Hide if not shown anymore
       if (!indexArr.includes(i)) {
-        if (this.shouldLoop) {
+        if (this.shouldLoop_) {
           setStyle(this.slideWrappers_[i], 'order', '');
         }
-        dev()
-          .assertElement(this.slideWrappers_[i])
-          .classList.remove(SHOWN_CSS_CLASS);
+        this.slideWrappers_[i].classList.remove(ClassNames.SLIDES_ITEM_SHOW);
         this.slides_[i].removeAttribute('aria-hidden');
       }
       // Pause if not the current slide
@@ -960,14 +955,14 @@ export class AmpSlideScroll extends AMP.BaseElement {
    * Animate scrollLeft of the container.
    * @param {number} fromScrollLeft
    * @param {number} toScrollLeft
-   * @return {!Promise}
+   * @return {Promise}
    * @private
    */
   animateScrollLeft_(fromScrollLeft, toScrollLeft) {
     if (fromScrollLeft == toScrollLeft) {
       return Promise.resolve();
     }
-    /** @const {!TransitionDef<number>} */
+    /** @const {TransitionDef<number>} */
     const interpolate = numeric(fromScrollLeft, toScrollLeft);
     const curve = bezierCurve(0.8, 0, 0.6, 1); // ease-in
     const duration = 80;
@@ -1017,10 +1012,10 @@ export class AmpSlideScroll extends AMP.BaseElement {
         ? 'null'
         : this.dataSlideIdArr_[dev().assertNumber(this.slideIndex_)];
 
-    const vars = dict({
+    const vars = {
       'fromSlide': fromSlide,
       'toSlide': this.dataSlideIdArr_[newSlideIndex],
-    });
+    };
     this.analyticsEvent_('amp-carousel-change', vars);
     // At this point direction can be only +1 or -1.
     if (direction == 1) {
@@ -1032,7 +1027,7 @@ export class AmpSlideScroll extends AMP.BaseElement {
 
   /**
    * @param {string} eventType
-   * @param {!JsonObject} vars A map of vars and their values.
+   * @param {JsonObject} vars A map of vars and their values.
    * @private
    */
   analyticsEvent_(eventType, vars) {
@@ -1059,7 +1054,7 @@ export class AmpSlideScroll extends AMP.BaseElement {
       this.element.setAttribute('loop', '');
       this.loopAdded_ = true;
       this.hasLoop_ = true;
-      this.shouldLoop = true;
+      this.shouldLoop_ = true;
     }
   }
 
@@ -1133,7 +1128,7 @@ export class AmpSlideScroll extends AMP.BaseElement {
       this.element.removeAttribute('loop');
       this.loopAdded_ = false;
       this.hasLoop_ = false;
-      this.shouldLoop = false;
+      this.shouldLoop_ = false;
     }
     this.hasAutoplay_ = false;
     this.shouldAutoplay_ = this.hasAutoplay_ && this.isLoopingEligible();
diff --git a/extensions/amp-carousel/0.1/test-e2e/test-hidden-controls.js b/extensions/amp-carousel/0.1/test-e2e/test-hidden-controls.js
index 77dcdd3c7612..9e3633c7a77c 100644
--- a/extensions/amp-carousel/0.1/test-e2e/test-hidden-controls.js
+++ b/extensions/amp-carousel/0.1/test-e2e/test-hidden-controls.js
@@ -10,7 +10,7 @@ describes.endtoend(
      * A helper function for expecting an error from an async function since we
      * don't have ChaiAsExpected and we cannot wait for errors from
      * @param {function()} fn A function to run
-     * @param {!RegExp} regExp A regular expression to match the error message.
+     * @param {RegExp} regExp A regular expression to match the error message.
      */
     async function expectAysncError(fn, regExp) {
       let error;
diff --git a/extensions/amp-carousel/0.1/test-e2e/test-slidescroll-autoplay.js b/extensions/amp-carousel/0.1/test-e2e/test-slidescroll-autoplay.js
index d9e58ba90d64..fdf118bcea18 100644
--- a/extensions/amp-carousel/0.1/test-e2e/test-slidescroll-autoplay.js
+++ b/extensions/amp-carousel/0.1/test-e2e/test-slidescroll-autoplay.js
@@ -10,7 +10,7 @@ describes.endtoend(
     /**
      * Attach an event listener to page to capture the 'slideChange' event.
      * If given a selector, click on it to fire the event being listened for.
-     * @return {!Promise}
+     * @return {Promise}
      */
     function slideChangeEventAfterClicking(opt_selector) {
       return controller.evaluate((opt_selector) => {
diff --git a/extensions/amp-carousel/0.1/test/test-scrollable-carousel.js b/extensions/amp-carousel/0.1/test/test-scrollable-carousel.js
index db10eacc02a2..1305d29fe2ae 100644
--- a/extensions/amp-carousel/0.1/test/test-scrollable-carousel.js
+++ b/extensions/amp-carousel/0.1/test/test-scrollable-carousel.js
@@ -1,10 +1,20 @@
 import '../amp-carousel';
-import {ActionService} from '#service/action-impl';
-import {ActionTrust} from '#core/constants/action-constants';
-import {Services} from '#service';
+import {createDocument as createWorkerDomDoc} from '@ampproject/worker-dom/dist/server-lib.mjs';
+
+import {ActionTrust_Enum} from '#core/constants/action-constants';
 import {createElementWithAttributes} from '#core/dom';
-import {user} from '#utils/log';
 import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
+
+import {Services} from '#service';
+import {ActionService} from '#service/action-impl';
+
+import {user} from '#utils/log';
+
+import {getDeterministicOuterHTML} from '#testing/helpers';
+
+import {buildDom} from '../build-dom';
+import {AmpScrollableCarousel} from '../scrollable-carousel';
+
 describes.realWin(
   'test-scrollable-carousel',
   {
@@ -33,7 +43,7 @@ describes.realWin(
       schedulePreloadSpy = env.sandbox.spy(owners, 'schedulePreload');
     });
 
-    function getAmpScrollableCarousel() {
+    function getAmpScrollableCarousel(addToDom = true, doc = env.win.document) {
       const imgUrl =
         'https://lh3.googleusercontent.com/5rcQ32ml8E5ONp9f9-' +
         'Rf78IofLb9QjS5_0mqsY1zEFc=w300-h200-no';
@@ -44,16 +54,20 @@ describes.realWin(
 
       const slideCount = 7;
       for (let i = 0; i < slideCount; i++) {
-        const img = document.createElement('amp-img');
+        const img = doc.createElement('amp-img');
         img.setAttribute('src', imgUrl);
         img.setAttribute('width', '120');
         img.setAttribute('height', '100');
-        img.style.width = '120px';
-        img.style.height = '100px';
-        img.id = 'img-' + i;
+        img.style.setProperty('width', '120px');
+        img.style.setProperty('height', '100px');
+        img.setAttribute('id', `img-${i}`);
         carouselElement.appendChild(img);
       }
 
+      if (!addToDom) {
+        return Promise.resolve(carouselElement);
+      }
+
       doc.body.appendChild(carouselElement);
       return carouselElement
         .buildInternal()
@@ -103,8 +117,6 @@ describes.realWin(
 
         // show control buttons correctly
         const {nextButton_: nextBtn, prevButton_: prevBtn} = impl.controls_;
-        expect(impl.hasPrev()).to.be.false;
-        expect(impl.hasNext()).to.be.true;
         expect(prevBtn.classList.contains('amp-disabled')).to.be.true;
         expect(nextBtn.classList.contains('amp-disabled')).to.be.false;
         // Controls are hidden from screen readers as they do not provide
@@ -227,6 +239,71 @@ describes.realWin(
       }
     );
 
+    describe('buildDom', () => {
+      it('buildDom and buildCallback should result in the same outerHTML', async () => {
+        env.sandbox
+          .stub(Services, 'inputFor')
+          .returns({onMouseDetected: () => {}});
+
+        const el1 = await getAmpScrollableCarousel(/* addToDom */ false);
+        const el2 = el1.cloneNode(/* deep */ true);
+        const impl = new AmpScrollableCarousel(el1);
+        impl.setupBehavior_ = () => {};
+        await impl.buildCallback();
+        buildDom(el2);
+
+        expect(el2.outerHTML).equal(el1.outerHTML);
+      });
+
+      it('buildDom should behave same in browser and in WorkerDOM', async () => {
+        const browserCarousel = await getAmpScrollableCarousel(
+          /* addToDom */ false,
+          env.win.doc
+        );
+        const workerCarousel = await getAmpScrollableCarousel(
+          /* addToDom */ false,
+          createWorkerDomDoc()
+        );
+
+        buildDom(browserCarousel);
+        buildDom(workerCarousel);
+
+        const browserHtml = getDeterministicOuterHTML(browserCarousel);
+        const workerDomHtml = getDeterministicOuterHTML(workerCarousel);
+        expect(workerDomHtml).equal(browserHtml);
+      });
+
+      it('buildCallback should assign ivars even when server rendered', async () => {
+        const el1 = await getAmpScrollableCarousel(/* addToDom */ false);
+        buildDom(el1);
+        el1.setAttribute('i-amphtml-ssr', '');
+        const impl = new AmpScrollableCarousel(el1);
+        impl.setupBehavior_ = () => {};
+        await impl.buildCallback();
+
+        expect(impl.cells_).length(7);
+        expect(impl.container_).ok;
+      });
+
+      it('buildDom should throw if invalid server rendered dom', async () => {
+        const carousel = await getAmpScrollableCarousel(/* addToDom */ false);
+        carousel.setAttribute('i-amphtml-ssr', '');
+        expect(() => buildDom(carousel)).throws(/Invalid server render/);
+      });
+
+      it('buildDom should not modify dom for server rendered element', async () => {
+        const carousel = await getAmpScrollableCarousel(/* addToDom */ false);
+        buildDom(carousel);
+        carousel.setAttribute('i-amphtml-ssr', '');
+
+        const before = carousel.outerHTML;
+        buildDom(carousel);
+        const after = carousel.outerHTML;
+
+        expect(before).equal(after);
+      });
+    });
+
     // TODO(#17197): This test triggers sinonjs/sinon issues 1709 and 1321.
     it.skip(
       'should behave correctly when clicking on next button and the ' +
@@ -427,7 +504,7 @@ describes.realWin(
         'source',
         'caller',
         'event',
-        ActionTrust.HIGH
+        ActionTrust_Enum.HIGH
       );
       expect(element.enqueAction).to.be.calledWith(
         env.sandbox.match({
@@ -438,7 +515,7 @@ describes.realWin(
           method: 'goToSlide',
           node: element,
           source: 'source',
-          trust: ActionTrust.HIGH,
+          trust: ActionTrust_Enum.HIGH,
         })
       );
 
@@ -450,7 +527,7 @@ describes.realWin(
         'source',
         'caller',
         'event',
-        ActionTrust.HIGH
+        ActionTrust_Enum.HIGH
       );
       expect(userErrorStub).to.be.calledOnce;
       expect(userErrorStub.args[0][1]).to.match(
diff --git a/extensions/amp-carousel/0.1/test/test-slidescroll-slides.js b/extensions/amp-carousel/0.1/test/test-slidescroll-slides.js
index 2d1e94520709..6fe0f3e051c9 100644
--- a/extensions/amp-carousel/0.1/test/test-slidescroll-slides.js
+++ b/extensions/amp-carousel/0.1/test/test-slidescroll-slides.js
@@ -1,17 +1,10 @@
-import {AmpSlideScroll} from '../slidescroll';
 import {CarouselControls} from '../carousel-controls';
+import {AmpSlideScroll} from '../slidescroll';
 
 describes.fakeWin('AmpSlideScroll', {amp: true}, (env) => {
   let win, doc;
-  let buildSlidesSpy;
   let viewportCallbackSpy;
-  let hasPrevSpy;
-  let hasNextSpy;
-  let goCallbackSpy;
-
   let setupAutoplaySpy;
-  let buildButtonsSpy;
-  let setControlsStateSpy;
   let hintControlsSpy;
   let autoplaySpy;
   let clearAutoplaySpy;
@@ -19,23 +12,11 @@ describes.fakeWin('AmpSlideScroll', {amp: true}, (env) => {
   beforeEach(() => {
     win = env.win;
     doc = win.document;
-    buildSlidesSpy = env.sandbox.spy();
     viewportCallbackSpy = env.sandbox.spy();
-    hasPrevSpy = env.sandbox.spy();
-    hasNextSpy = env.sandbox.spy();
-    goCallbackSpy = env.sandbox.spy();
     setupAutoplaySpy = env.sandbox.spy(
       AmpSlideScroll.prototype,
       'setupAutoplay_'
     );
-    buildButtonsSpy = env.sandbox.spy(
-      CarouselControls.prototype,
-      'buildButtons'
-    );
-    setControlsStateSpy = env.sandbox.spy(
-      CarouselControls.prototype,
-      'setControlsState'
-    );
     hintControlsSpy = env.sandbox.spy(
       CarouselControls.prototype,
       'hintControls'
@@ -51,8 +32,9 @@ describes.fakeWin('AmpSlideScroll', {amp: true}, (env) => {
     );
   });
 
-  function setElement(options) {
+  function getElement(options) {
     const element = doc.createElement('div');
+    element.setAttribute('type', 'slides');
     if (options.loop) {
       element.setAttribute('loop', '');
     }
@@ -72,62 +54,39 @@ describes.fakeWin('AmpSlideScroll', {amp: true}, (env) => {
 
   class TestCarousel extends AmpSlideScroll {
     /** @override */
-    buildSlides() {
-      buildSlidesSpy();
-    }
+    setupSlideBehavior_() {}
 
     /** @override */
     isLoopingEligible() {
       return true;
     }
-
-    /** @override */
-    hasPrev() {
-      hasPrevSpy();
-    }
-
-    /** @override */
-    hasNext() {
-      hasNextSpy();
-    }
-
-    /** @override */
-    goCallback() {
-      goCallbackSpy();
-    }
   }
 
   it('should do the right buildCallback processing', () => {
     const carouselLoopOnly = new TestCarousel(
-      setElement({
+      getElement({
         loop: true,
       })
     );
 
     carouselLoopOnly.buildCallback();
-
-    expect(carouselLoopOnly.shouldLoop).to.be.true;
+    expect(carouselLoopOnly.shouldLoop_).to.be.true;
     expect(carouselLoopOnly.shouldAutoplay_).to.be.false;
-    expect(setupAutoplaySpy).to.not.have.been.called;
-    expect(buildButtonsSpy).to.be.calledOnce;
-    expect(setControlsStateSpy).to.be.calledOnce;
 
     const carouselAutoplayOnly = new TestCarousel(
-      setElement({
+      getElement({
         autoplay: true,
       })
     );
 
     carouselAutoplayOnly.buildCallback();
 
-    expect(carouselAutoplayOnly.shouldLoop).to.be.true;
+    expect(carouselAutoplayOnly.shouldLoop_).to.be.true;
     expect(carouselAutoplayOnly.shouldAutoplay_).to.be.true;
     expect(setupAutoplaySpy).to.have.been.called;
-    expect(buildButtonsSpy).to.have.callCount(2);
-    expect(setControlsStateSpy).to.have.callCount(2);
 
     const carouselAutoplayWithLoop = new TestCarousel(
-      setElement({
+      getElement({
         loop: true,
         autoplay: true,
       })
@@ -135,21 +94,19 @@ describes.fakeWin('AmpSlideScroll', {amp: true}, (env) => {
 
     carouselAutoplayWithLoop.buildCallback();
 
-    expect(carouselAutoplayWithLoop.shouldLoop).to.be.true;
+    expect(carouselAutoplayWithLoop.shouldLoop_).to.be.true;
     expect(carouselAutoplayWithLoop.shouldAutoplay_).to.be.true;
     expect(setupAutoplaySpy).to.have.callCount(2);
-    expect(buildButtonsSpy).to.have.callCount(3);
-    expect(setControlsStateSpy).to.have.callCount(3);
   });
 
   it('should handle viewportCallback when in viewport', () => {
     const carousel = new TestCarousel(
-      setElement({
+      getElement({
         loop: true,
-        autoplay: true,
+        autoplay: false,
       })
     );
-
+    carousel.buildCallback();
     carousel.viewportCallback(true);
     expect(viewportCallbackSpy).to.have.been.calledWith(true);
     expect(hintControlsSpy).to.have.been.called;
@@ -159,7 +116,7 @@ describes.fakeWin('AmpSlideScroll', {amp: true}, (env) => {
 
   it('should handle viewportCallback when not in viewport', () => {
     const carousel = new TestCarousel(
-      setElement({
+      getElement({
         loop: true,
         autoplay: true,
       })
@@ -174,7 +131,7 @@ describes.fakeWin('AmpSlideScroll', {amp: true}, (env) => {
 
   it('should setup autoplay with no delay set', () => {
     const carousel = new TestCarousel(
-      setElement({
+      getElement({
         autoplay: true,
       })
     );
@@ -184,12 +141,12 @@ describes.fakeWin('AmpSlideScroll', {amp: true}, (env) => {
     expect(carousel.autoplayDelay_).to.equal(5000);
     expect(carousel.element.hasAttribute('loop')).to.be.true;
     expect(carousel.hasLoop_).to.be.true;
-    expect(carousel.shouldLoop).to.be.true;
+    expect(carousel.shouldLoop_).to.be.true;
   });
 
   it('should setup autoplay with specified number of loops', () => {
     const carousel = new TestCarousel(
-      setElement({
+      getElement({
         autoplay: true,
         autoplayLoops: 5,
       })
@@ -199,12 +156,12 @@ describes.fakeWin('AmpSlideScroll', {amp: true}, (env) => {
     expect(carousel.element.hasAttribute('loop')).to.be.true;
     expect(carousel.autoplayLoops_).to.equal(5);
     expect(carousel.hasLoop_).to.be.true;
-    expect(carousel.shouldLoop).to.be.true;
+    expect(carousel.shouldLoop_).to.be.true;
   });
 
   it('should setup autoplay with delay set', () => {
     const carousel = new TestCarousel(
-      setElement({
+      getElement({
         autoplay: true,
         delay: 3000,
       })
@@ -215,12 +172,12 @@ describes.fakeWin('AmpSlideScroll', {amp: true}, (env) => {
     expect(carousel.autoplayDelay_).to.equal(3000);
     expect(carousel.element.hasAttribute('loop')).to.be.true;
     expect(carousel.hasLoop_).to.be.true;
-    expect(carousel.shouldLoop).to.be.true;
+    expect(carousel.shouldLoop_).to.be.true;
   });
 
   it('should setup autoplay with delay set lower', () => {
     const carousel = new TestCarousel(
-      setElement({
+      getElement({
         autoplay: true,
         delay: 300,
       })
@@ -231,12 +188,12 @@ describes.fakeWin('AmpSlideScroll', {amp: true}, (env) => {
     expect(carousel.autoplayDelay_).to.equal(1000);
     expect(carousel.element.hasAttribute('loop')).to.be.true;
     expect(carousel.hasLoop_).to.be.true;
-    expect(carousel.shouldLoop).to.be.true;
+    expect(carousel.shouldLoop_).to.be.true;
   });
 
   it('should start timer on autoplay', () => {
     const carousel = new TestCarousel(
-      setElement({
+      getElement({
         autoplay: true,
         delay: 300,
       })
@@ -250,7 +207,7 @@ describes.fakeWin('AmpSlideScroll', {amp: true}, (env) => {
 
   it('should not start timer on when there is no autoplay', () => {
     const carousel = new TestCarousel(
-      setElement({
+      getElement({
         delay: 300,
       })
     );
@@ -263,7 +220,7 @@ describes.fakeWin('AmpSlideScroll', {amp: true}, (env) => {
 
   it('should clear timeout', () => {
     const carousel = new TestCarousel(
-      setElement({
+      getElement({
         autoplay: true,
         delay: 300,
       })
@@ -280,7 +237,7 @@ describes.fakeWin('AmpSlideScroll', {amp: true}, (env) => {
 
   it('toggle autoPlay status using speficied value & autoplay=true', () => {
     const carousel = new TestCarousel(
-      setElement({
+      getElement({
         autoplay: true,
         delay: 300,
       })
@@ -309,7 +266,7 @@ describes.fakeWin('AmpSlideScroll', {amp: true}, (env) => {
 
   it('toggle autoPlay status using speficied value & autoplay=false', () => {
     const carousel = new TestCarousel(
-      setElement({
+      getElement({
         delay: 300,
       })
     );
@@ -336,7 +293,7 @@ describes.fakeWin('AmpSlideScroll', {amp: true}, (env) => {
 
   it('toggle autoPlay status without speficied value & autoplay=true', () => {
     const carousel = new TestCarousel(
-      setElement({
+      getElement({
         autoplay: true,
         delay: 300,
       })
diff --git a/extensions/amp-carousel/0.1/test/test-slidescroll.js b/extensions/amp-carousel/0.1/test/test-slidescroll.js
index fed8c4346452..938ae9d6a96a 100644
--- a/extensions/amp-carousel/0.1/test/test-slidescroll.js
+++ b/extensions/amp-carousel/0.1/test/test-slidescroll.js
@@ -1,12 +1,21 @@
 import '../amp-carousel';
-import {ActionService} from '#service/action-impl';
-import {ActionTrust} from '#core/constants/action-constants';
-import {Services} from '#service';
+import {createDocument as createWorkerDomDoc} from '@ampproject/worker-dom/dist/server-lib.mjs';
+
+import {ActionTrust_Enum} from '#core/constants/action-constants';
 import {createElementWithAttributes} from '#core/dom';
-import {installResizeObserverStub} from '#testing/resize-observer-stub';
-import {user} from '#utils/log';
 import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 
+import {Services} from '#service';
+import {ActionService} from '#service/action-impl';
+
+import {user} from '#utils/log';
+
+import {getDeterministicOuterHTML} from '#testing/helpers';
+import {installResizeObserverStub} from '#testing/resize-observer-stub';
+
+import {buildDom} from '../build-dom';
+import {AmpSlideScroll} from '../slidescroll';
+
 describes.realWin(
   'SlideScroll',
   {
@@ -27,12 +36,22 @@ describes.realWin(
       resizeObserverStub = installResizeObserverStub(env.sandbox, win);
     });
 
+    /**
+     * @param {boolean=} opt_hasLooping
+     * @param {number=} opt_slideCount
+     * @param {boolean=} opt_attachToDom
+     * @param {boolean=} opt_hasAutoplay
+     * @param {boolean=} opt_autoplayLoops
+     * @param {Document=} opt_doc
+     * @return {Element}
+     */
     function getAmpSlideScroll(
       opt_hasLooping,
       opt_slideCount = 5,
       opt_attachToDom = true,
       opt_hasAutoplay = false,
-      opt_autoplayLoops
+      opt_autoplayLoops,
+      doc = env.win.document
     ) {
       const imgUrl =
         'https://lh3.googleusercontent.com/5rcQ32ml8E5ONp9f9-' +
@@ -41,7 +60,7 @@ describes.realWin(
       ampSlideScroll.setAttribute('type', 'slides');
       ampSlideScroll.setAttribute('width', '400');
       ampSlideScroll.setAttribute('height', '300');
-      ampSlideScroll.style.position = 'relative';
+      ampSlideScroll.style.setProperty('position', 'relative');
       ampSlideScroll.setAttribute('controls', '');
       if (opt_hasLooping) {
         ampSlideScroll.setAttribute('loop', '');
@@ -60,7 +79,7 @@ describes.realWin(
         img.setAttribute('width', '400');
         img.setAttribute('height', '300');
         // See https://github.com/ampproject/amphtml/issues/3989
-        img.style.display = 'inline';
+        img.style.setProperty('display', 'inline');
         if (i == 0) {
           img.setAttribute('data-slide-id', 'slide-id');
         }
@@ -278,8 +297,7 @@ describes.realWin(
       expect(impl.slides_[0].getAttribute('aria-hidden')).to.equal(null);
     });
 
-    // TODO(#17197): This test triggers sinonjs/sinon issues 1709 and 1321.
-    it.skip('should hide the unwanted slides', async () => {
+    it('should hide the unwanted slides', async () => {
       const ampSlideScroll = await getAmpSlideScroll();
       const impl = await ampSlideScroll.getImpl();
 
@@ -357,20 +375,14 @@ describes.realWin(
       const {nextButton_: nextBtn, prevButton_: prevBtn} = controls;
 
       impl.showSlide_(1);
-      expect(controls.hasNext_()).to.be.true;
-      expect(controls.hasPrev_()).to.be.true;
       expect(nextBtn.classList.contains('amp-disabled')).to.be.false;
       expect(prevBtn.classList.contains('amp-disabled')).to.be.false;
 
       impl.showSlide_(0);
-      expect(controls.hasNext_()).to.be.true;
-      expect(controls.hasPrev_()).to.be.false;
       expect(nextBtn.classList.contains('amp-disabled')).to.be.false;
       expect(prevBtn.classList.contains('amp-disabled')).to.be.true;
 
       impl.showSlide_(4);
-      expect(controls.hasNext_()).to.be.false;
-      expect(controls.hasPrev_()).to.be.true;
       expect(nextBtn.classList.contains('amp-disabled')).to.be.true;
       expect(prevBtn.classList.contains('amp-disabled')).to.be.false;
 
@@ -406,7 +418,8 @@ describes.realWin(
       expect(doc.activeElement).to.equal(nextBtn);
     });
 
-    it('should show focus outline and border on next and prev buttons', async () => {
+    // TODO(#40258) Fix and unskip flakey test.
+    it.skip('should show focus outline and border on next and prev buttons', async () => {
       const ampSlideScroll = await getAmpSlideScroll();
       const impl = await ampSlideScroll.getImpl();
       const controls = impl.controls_;
@@ -933,8 +946,7 @@ describes.realWin(
         expect(impl.slidesContainer_.scrollLeft).to.equal(impl.slideWidth_);
       });
 
-      // TODO(#17197): This test triggers sinonjs/sinon issues 1709 and 1321.
-      it.skip('should hide unwanted slides when looping', async () => {
+      it('should hide unwanted slides when looping', async () => {
         const ampSlideScroll = await getAmpSlideScroll(true);
         const impl = await ampSlideScroll.getImpl();
 
@@ -1053,20 +1065,14 @@ describes.realWin(
         const {nextButton_: nextBtn, prevButton_: prevBtn} = controls;
 
         impl.showSlide_(1);
-        expect(controls.hasNext_()).to.be.true;
-        expect(controls.hasPrev_()).to.be.true;
         expect(nextBtn.classList.contains('amp-disabled')).to.be.false;
         expect(prevBtn.classList.contains('amp-disabled')).to.be.false;
 
         impl.showSlide_(0);
-        expect(controls.hasNext_()).to.be.true;
-        expect(controls.hasPrev_()).to.be.true;
         expect(nextBtn.classList.contains('amp-disabled')).to.be.false;
         expect(prevBtn.classList.contains('amp-disabled')).to.be.false;
 
         impl.showSlide_(4);
-        expect(controls.hasNext_()).to.be.true;
-        expect(controls.hasPrev_()).to.be.true;
         expect(nextBtn.classList.contains('amp-disabled')).to.be.false;
         expect(prevBtn.classList.contains('amp-disabled')).to.be.false;
       });
@@ -1204,8 +1210,7 @@ describes.realWin(
         expect(showSlideSpy).to.have.callCount(3);
       });
 
-      // TODO(#17197): This test triggers sinonjs/sinon issues 1709 and 1321.
-      it.skip('should update slide when `slide` attribute is mutated', async () => {
+      it('should update slide when `slide` attribute is mutated', async () => {
         const ampSlideScroll = await getAmpSlideScroll(true);
         const impl = await ampSlideScroll.getImpl();
         expectAsyncConsoleError(/Invalid \[slide\] value:/, 1);
@@ -1235,7 +1240,7 @@ describes.realWin(
           ampSlideScroll,
           'slideChange',
           /* CustomEvent */ env.sandbox.match.has('detail', {index: 4}),
-          ActionTrust.HIGH
+          ActionTrust_Enum.HIGH
         );
 
         impl.go(1, /* animate */ false);
@@ -1243,7 +1248,7 @@ describes.realWin(
           ampSlideScroll,
           'slideChange',
           /* CustomEvent */ env.sandbox.match.has('detail', {index: 0}),
-          ActionTrust.HIGH
+          ActionTrust_Enum.HIGH
         );
       });
 
@@ -1257,12 +1262,12 @@ describes.realWin(
         impl.go(-1, /* animate */ false);
         expect(win.document.eventListeners.count('slideChange')).to.equal(1);
         expect(event.data.index).to.equal(4);
-        expect(event.data.actionTrust).to.equal(ActionTrust.HIGH);
+        expect(event.data.actionTrust).to.equal(ActionTrust_Enum.HIGH);
 
         impl.go(1, /* animate */ false);
         expect(win.document.eventListeners.count('slideChange')).to.equal(1);
         expect(event.data.index).to.equal(0);
-        expect(event.data.actionTrust).to.equal(ActionTrust.HIGH);
+        expect(event.data.actionTrust).to.equal(ActionTrust_Enum.HIGH);
       });
 
       it('should goToSlide on action', async () => {
@@ -1470,6 +1475,88 @@ describes.realWin(
         });
       });
     });
+
+    describe('buildDom', () => {
+      it('buildDom and buildCallback should result in the same outerHTML', async () => {
+        const el1 = await getAmpSlideScroll(
+          /* hasLooping */ true,
+          /* slideCount */ undefined,
+          /* attachToDom */ false
+        );
+        const el2 = el1.cloneNode(/* deep */ true);
+        const impl = new AmpSlideScroll(el1);
+        impl.setupSlideBehavior_ = () => {};
+        await impl.buildCallback();
+        buildDom(el2);
+
+        expect(el2.outerHTML).equal(el1.outerHTML);
+      });
+
+      it('buildDom should behave same in browser and in WorkerDOM', async () => {
+        const browserCarousel = await getAmpSlideScroll(
+          /* hasLooping */ true,
+          /* slideCount */ undefined,
+          /* attachToDom */ false
+        );
+        const workerCarousel = await getAmpSlideScroll(
+          /* hasLooping */ true,
+          /* slideCount */ undefined,
+          /* attachToDom */ false,
+          /* opt_hasAutoPlay */ undefined,
+          /* opt_autoplayLoops */ undefined,
+          createWorkerDomDoc()
+        );
+        buildDom(browserCarousel);
+        buildDom(workerCarousel);
+
+        const browserHtml = getDeterministicOuterHTML(browserCarousel);
+        const workerDomHtml = getDeterministicOuterHTML(workerCarousel);
+        expect(workerDomHtml).equal(browserHtml);
+      });
+
+      it('buildCallback should assign ivars even when server rendered', async () => {
+        const el1 = await getAmpSlideScroll(
+          /* hasLooping */ true,
+          /* slideCount */ undefined,
+          /* attachToDom */ false
+        );
+        buildDom(el1);
+        el1.setAttribute('i-amphtml-ssr', '');
+        const impl = new AmpSlideScroll(el1);
+        impl.setupSlideBehavior_ = () => {};
+        await impl.buildCallback();
+
+        expect(impl.slides_).length(5);
+        expect(impl.slideWrappers_).length(5);
+        expect(impl.slidesContainer_).ok;
+      });
+
+      it('buildDom should throw if invalid server rendered dom', async () => {
+        const carousel = await getAmpSlideScroll(
+          /* hasLooping */ true,
+          /* slideCount */ undefined,
+          /* attachToDom */ false
+        );
+        carousel.setAttribute('i-amphtml-ssr', '');
+        expect(() => buildDom(carousel)).throws(/Invalid server render/);
+      });
+
+      it('buildDom should not modify dom for server rendered element', async () => {
+        const carousel = await getAmpSlideScroll(
+          /* hasLooping */ true,
+          /* slideCount */ undefined,
+          /* attachToDom */ false
+        );
+        buildDom(carousel);
+        carousel.setAttribute('i-amphtml-ssr', '');
+
+        const before = carousel.outerHTML;
+        buildDom(carousel);
+        const after = carousel.outerHTML;
+
+        expect(before).equal(after);
+      });
+    });
   }
 );
 
@@ -1508,7 +1595,7 @@ describes.realWin(
         'source',
         'caller',
         'event',
-        ActionTrust.HIGH
+        ActionTrust_Enum.HIGH
       );
       expect(element.enqueAction).to.be.calledWith(
         env.sandbox.match({
@@ -1519,7 +1606,7 @@ describes.realWin(
           method: 'goToSlide',
           node: element,
           source: 'source',
-          trust: ActionTrust.HIGH,
+          trust: ActionTrust_Enum.HIGH,
         })
       );
 
@@ -1531,7 +1618,7 @@ describes.realWin(
         'source',
         'caller',
         'event',
-        ActionTrust.HIGH
+        ActionTrust_Enum.HIGH
       );
       expect(userErrorStub).to.be.calledOnce;
       expect(userErrorStub.args[0][1]).to.match(
diff --git a/extensions/amp-carousel/0.1/tsconfig.json b/extensions/amp-carousel/0.1/tsconfig.json
index 0ce854da30cd..5d0bc3054bd6 100644
--- a/extensions/amp-carousel/0.1/tsconfig.json
+++ b/extensions/amp-carousel/0.1/tsconfig.json
@@ -1,10 +1,17 @@
 {
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
-    "allowJs": true,
-    "checkJs": true,
-    "noEmit": true,
-    "paths": {}
+    "noImplicitAny": false,
+    "strictNullChecks": false,
+    "paths": {
+      "#builtins/*": ["../../../src/builtins/*"],
+      "#compiler": ["../../../src/compiler"],
+      "#compiler/*": ["../../../src/compiler/*"],
+      "#core": ["../../../src/core"],
+      "#core/*": ["../../../src/core/*"],
+      "#third_party/*": ["../../../third_party/*"]
+    }
   },
-  "include": ["*.js", "**/*.d.ts", "../../../src/*.d.ts"],
-  "exclude": []
+  "include": ["*.js", "**/*.d.ts", "../../../src/**/*.d.ts"],
+  "exclude": ["../../../src/purifier/index.d.ts"]
 }
diff --git a/extensions/amp-carousel/0.2/amp-carousel.js b/extensions/amp-carousel/0.2/amp-carousel.js
index c98468b8e97e..7f6c3e586064 100644
--- a/extensions/amp-carousel/0.2/amp-carousel.js
+++ b/extensions/amp-carousel/0.2/amp-carousel.js
@@ -1,22 +1,25 @@
-import {ActionSource} from '../../amp-base-carousel/0.1/action-source';
-import {ActionTrust} from '#core/constants/action-constants';
-import {CSS} from '../../../build/amp-carousel-0.2.css';
-import {Carousel} from '../../amp-base-carousel/0.1/carousel';
-import {CarouselEvents} from '../../amp-base-carousel/0.1/carousel-events';
-import {ChildLayoutManager} from '../../amp-base-carousel/0.1/child-layout-manager';
-import {Services} from '#service';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
+import {Keys_Enum} from '#core/constants/key-codes';
+import {dispatchCustomEvent} from '#core/dom';
+import {isLayoutSizeDefined} from '#core/dom/layout';
 import {
   closestAncestorElementBySelector,
   realChildElements,
 } from '#core/dom/query';
+import {htmlFor} from '#core/dom/static-template';
 import {computedStyle} from '#core/dom/style';
+
+import {Services} from '#service';
+
+import {triggerAnalyticsEvent} from '#utils/analytics';
 import {createCustomEvent, getDetail, listen} from '#utils/event-helper';
 import {dev, devAssert, userAssert} from '#utils/log';
-import {dict} from '#core/types/object';
-import {dispatchCustomEvent} from '#core/dom';
-import {htmlFor} from '#core/dom/static-template';
-import {isLayoutSizeDefined} from '#core/dom/layout';
-import {triggerAnalyticsEvent} from '#utils/analytics';
+
+import {CSS} from '../../../build/amp-carousel-0.2.css';
+import {ActionSource} from '../../amp-base-carousel/0.1/action-source';
+import {Carousel} from '../../amp-base-carousel/0.1/carousel';
+import {CarouselEvents} from '../../amp-base-carousel/0.1/carousel-events';
+import {ChildLayoutManager} from '../../amp-base-carousel/0.1/child-layout-manager';
 
 /**
  * @enum {string}
@@ -27,7 +30,7 @@ const CarouselType = {
 };
 
 class AmpCarousel extends AMP.BaseElement {
-  /** @override @nocollapse */
+  /** @override  */
   static prerenderAllowed() {
     return true;
   }
@@ -51,7 +54,7 @@ class AmpCarousel extends AMP.BaseElement {
           actionSource: this.getActionSource_(trust),
         });
       },
-      ActionTrust.LOW
+      ActionTrust_Enum.LOW
     );
     this.registerAction(
       'toggleAutoplay',
@@ -61,8 +64,10 @@ class AmpCarousel extends AMP.BaseElement {
         const toggle = args ? args['toggleOn'] : undefined;
         this.toggleAutoplay_(toggle);
       },
-      ActionTrust.LOW
+      ActionTrust_Enum.LOW
     );
+    /** If the element is in an email document, allow its `goToSlide` action. */
+    this.action_.addToAllowlist('AMP-CAROUSEL', 'goToSlide', ['email']);
   }
 
   /** @param {!AmpElement} element */
@@ -161,8 +166,8 @@ class AmpCarousel extends AMP.BaseElement {
         this.onScrollPositionChanged_();
       }
     );
-    this.prevButton_.addEventListener('click', () => this.interactionPrev());
-    this.nextButton_.addEventListener('click', () => this.interactionNext());
+    this.setupButtonInteraction(this.nextButton_, () => this.interactionNext());
+    this.setupButtonInteraction(this.prevButton_, () => this.interactionPrev());
     this.handlePropagationInViewer_();
 
     const owners = Services.ownersForDoc(element);
@@ -206,6 +211,24 @@ class AmpCarousel extends AMP.BaseElement {
     return this.mutateElement(() => {});
   }
 
+  /**
+   * @param {!HTMLDivElement} button
+   * @param {*} onInteraction
+   */
+  setupButtonInteraction(button, onInteraction) {
+    button.addEventListener('click', onInteraction);
+    button.addEventListener('keydown', (event) => {
+      if (event.defaultPrevented) {
+        return;
+      }
+
+      if (event.key == Keys_Enum.ENTER || event.key == Keys_Enum.SPACE) {
+        event.preventDefault();
+        onInteraction();
+      }
+    });
+  }
+
   /** @override */
   isRelayoutNeeded() {
     return true;
@@ -329,12 +352,12 @@ class AmpCarousel extends AMP.BaseElement {
   }
 
   /**
-   * Gets the ActionSource to use for a given ActionTrust.
-   * @param {!ActionTrust} trust
+   * Gets the ActionSource to use for a given ActionTrust_Enum.
+   * @param {!ActionTrust_Enum} trust
    * @return {!ActionSource}
    */
   getActionSource_(trust) {
-    return trust >= ActionTrust.DEFAULT
+    return trust >= ActionTrust_Enum.DEFAULT
       ? ActionSource.GENERIC_HIGH_TRUST
       : ActionSource.GENERIC_LOW_TRUST;
   }
@@ -381,8 +404,8 @@ class AmpCarousel extends AMP.BaseElement {
     return currentIndex - 1 >= 0
       ? currentIndex - 1
       : this.element.hasAttribute('loop')
-      ? this.slides_.length - 1
-      : null;
+        ? this.slides_.length - 1
+        : null;
   }
 
   /**
@@ -395,8 +418,8 @@ class AmpCarousel extends AMP.BaseElement {
     return currentIndex + 1 < this.slides_.length
       ? currentIndex + 1
       : this.element.hasAttribute('loop')
-      ? 0
-      : null;
+        ? 0
+        : null;
   }
 
   /**
@@ -554,11 +577,11 @@ class AmpCarousel extends AMP.BaseElement {
       return;
     }
 
-    const data = dict({'index': index});
+    const data = {'index': index};
     const name = 'slideChange';
     const isHighTrust = this.isHighTrustActionSource_(actionSource);
-    const trust = isHighTrust ? ActionTrust.HIGH : ActionTrust.LOW;
-    const dataWithActionTrust = dict({'index': index, 'actionTrust': trust});
+    const trust = isHighTrust ? ActionTrust_Enum.HIGH : ActionTrust_Enum.LOW;
+    const dataWithActionTrust = {'index': index, 'actionTrust': trust};
 
     const action = createCustomEvent(this.win, `slidescroll.${name}`, data);
     this.action_.trigger(this.element, name, action, trust);
@@ -600,10 +623,10 @@ class AmpCarousel extends AMP.BaseElement {
       ? 'amp-carousel-next'
       : 'amp-carousel-prev';
 
-    const vars = dict({
+    const vars = {
       'fromSlide': this.getSlideId_(prevIndex),
       'toSlide': this.getSlideId_(newIndex),
-    });
+    };
     triggerAnalyticsEvent(this.element, 'amp-carousel-change', vars);
     triggerAnalyticsEvent(this.element, directionEventName, vars);
   }
diff --git a/extensions/amp-carousel/0.2/test/test-e2e/test-arrows-in-lightbox.js b/extensions/amp-carousel/0.2/test/test-e2e/test-arrows-in-lightbox.js
index 84f821699bab..1bb85883cbd4 100644
--- a/extensions/amp-carousel/0.2/test/test-e2e/test-arrows-in-lightbox.js
+++ b/extensions/amp-carousel/0.2/test/test-e2e/test-arrows-in-lightbox.js
@@ -25,8 +25,7 @@ describes.endtoend(
       controller = env.controller;
     });
 
-    // TODO(#35241): flaky test disabled in #35176
-    it.skip('should open with both arrows', async () => {
+    it('should open with both arrows', async () => {
       // Click on image 2
       const secondImage = await controller.findElement('#second');
       await controller.click(secondImage);
@@ -47,8 +46,7 @@ describes.endtoend(
       ).to.equal('false');
     });
 
-    // TODO(#35241): flaky test disabled in #35176
-    it.skip('should open with one arrow', async () => {
+    it('should open with one arrow', async () => {
       // Click on last image
       const lastImage = await controller.findElement('#fourth');
       await controller.click(lastImage);
diff --git a/extensions/amp-carousel/0.2/test/test-e2e/test-repsonsive-slides.js b/extensions/amp-carousel/0.2/test/test-e2e/test-repsonsive-slides.js
index 6dddab33e78e..94e6afe569ea 100644
--- a/extensions/amp-carousel/0.2/test/test-e2e/test-repsonsive-slides.js
+++ b/extensions/amp-carousel/0.2/test/test-e2e/test-repsonsive-slides.js
@@ -1,6 +1,7 @@
-import {getNextArrow, getSlides} from './helpers';
 import {afterRenderPromise} from '#testing/helpers';
 
+import {getNextArrow, getSlides} from './helpers';
+
 describes.endtoend(
   'AMP carousel 0.2 with responsive slides',
   {
diff --git a/extensions/amp-carousel/0.2/test/test-type-slides.js b/extensions/amp-carousel/0.2/test/test-type-slides.js
index fcae196a6ac0..a65c34502f8d 100644
--- a/extensions/amp-carousel/0.2/test/test-type-slides.js
+++ b/extensions/amp-carousel/0.2/test/test-type-slides.js
@@ -1,9 +1,15 @@
 import '../amp-carousel';
-import * as Listen from '#utils/event-helper';
-import {ActionTrust} from '#core/constants/action-constants';
-import {CarouselEvents} from '../../../amp-base-carousel/0.1/carousel-events';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
+
 import {Services} from '#service';
+import {ActionService} from '#service/action-impl';
+
+import * as Listen from '#utils/event-helper';
 import {getDetail, listenOncePromise} from '#utils/event-helper';
+import {user} from '#utils/log';
+
+import {CarouselEvents} from '../../../amp-base-carousel/0.1/carousel-events';
 
 /**
  * @fileoverview Some simple tests for amp-carousel. Most of the functionality
@@ -173,7 +179,8 @@ describes.realWin(
       }
     });
 
-    it('should show focus outline and border on next and prev buttons', async () => {
+    // TODO(#40258) Fix and unskip flakey test.
+    it.skip('should show focus outline and border on next and prev buttons', async () => {
       const carousel = await getCarousel({loop: false});
       const impl = await carousel.getImpl();
 
@@ -211,6 +218,24 @@ describes.realWin(
         expect(slideWrappers[2].getAttribute('aria-hidden')).to.equal('true');
       });
 
+      it('should go to the correct slide when navigating with keyboard', async () => {
+        const carousel = await getCarousel({loop: true});
+        const slideWrappers = getSlideWrappers(carousel);
+        const kbEnterEvent = new KeyboardEvent('keydown', {'key': 'Enter'});
+
+        getNextButton(carousel).dispatchEvent(kbEnterEvent);
+        await afterIndexUpdate(carousel);
+        expect(slideWrappers[0].getAttribute('aria-hidden')).to.equal('true');
+        expect(slideWrappers[1].getAttribute('aria-hidden')).to.equal('false');
+        expect(slideWrappers[2].getAttribute('aria-hidden')).to.equal('true');
+
+        getPrevButton(carousel).dispatchEvent(kbEnterEvent);
+        await afterIndexUpdate(carousel);
+        expect(slideWrappers[0].getAttribute('aria-hidden')).to.equal('false');
+        expect(slideWrappers[1].getAttribute('aria-hidden')).to.equal('true');
+        expect(slideWrappers[2].getAttribute('aria-hidden')).to.equal('true');
+      });
+
       it('should go to the correct slide clicking prev', async () => {
         const carousel = await getCarousel({loop: true});
         const slideWrappers = getSlideWrappers(carousel);
@@ -290,7 +315,7 @@ describes.realWin(
         await afterIndexUpdate(carousel);
 
         expect(event.data.index).to.equal(1);
-        expect(event.data.actionTrust).to.equal(ActionTrust.HIGH);
+        expect(event.data.actionTrust).to.equal(ActionTrust_Enum.HIGH);
       });
     });
 
@@ -303,7 +328,7 @@ describes.realWin(
         impl.executeAction({
           method: 'goToSlide',
           args: {index: 1},
-          trust: ActionTrust.HIGH,
+          trust: ActionTrust_Enum.HIGH,
           satisfiesTrust: () => true,
         });
         await afterIndexUpdate(carousel);
@@ -312,7 +337,7 @@ describes.realWin(
           carousel,
           'slideChange',
           /* CustomEvent */ env.sandbox.match.has('detail', {index: 1}),
-          ActionTrust.HIGH
+          ActionTrust_Enum.HIGH
         );
       });
 
@@ -324,7 +349,7 @@ describes.realWin(
         impl.executeAction({
           method: 'goToSlide',
           args: {index: 1},
-          trust: ActionTrust.LOW,
+          trust: ActionTrust_Enum.LOW,
           satisfiesTrust: () => true,
         });
         await afterIndexUpdate(carousel);
@@ -333,7 +358,7 @@ describes.realWin(
           carousel,
           'slideChange',
           /* CustomEvent */ env.sandbox.match.has('detail', {index: 1}),
-          ActionTrust.LOW
+          ActionTrust_Enum.LOW
         );
       });
 
@@ -345,7 +370,7 @@ describes.realWin(
         impl.executeAction({
           method: 'goToSlide',
           args: {index: '1'},
-          trust: ActionTrust.LOW,
+          trust: ActionTrust_Enum.LOW,
           satisfiesTrust: () => true,
         });
         await afterIndexUpdate(carousel);
@@ -354,7 +379,7 @@ describes.realWin(
           carousel,
           'slideChange',
           /* CustomEvent */ env.sandbox.match.has('detail', {index: 1}),
-          ActionTrust.LOW
+          ActionTrust_Enum.LOW
         );
       });
 
@@ -368,7 +393,7 @@ describes.realWin(
             impl.executeAction({
               method: 'goToSlide',
               args: {index: 'one'},
-              trust: ActionTrust.LOW,
+              trust: ActionTrust_Enum.LOW,
               satisfiesTrust: () => true,
             });
           });
@@ -379,6 +404,68 @@ describes.realWin(
         }
         expect.fail();
       });
+
+      it('should be allowlisted in email', async () => {
+        env.win.document.documentElement.setAttribute('amp4email', '');
+        const action = new ActionService(env.ampdoc, env.win.document);
+        env.sandbox.stub(Services, 'actionServiceForDoc').returns(action);
+        const carousel = await getCarousel({loop: false});
+        env.sandbox.spy(carousel, 'enqueAction');
+        env.sandbox.stub(carousel, 'getDefaultActionAlias');
+        await whenUpgradedToCustomElement(carousel);
+        await carousel.whenBuilt();
+
+        action.execute(
+          carousel,
+          'goToSlide',
+          {},
+          'source',
+          'caller',
+          'event',
+          ActionTrust_Enum.HIGH
+        );
+
+        expect(carousel.enqueAction).to.be.calledWith(
+          env.sandbox.match({
+            actionEventType: '?',
+            args: {},
+            caller: 'caller',
+            event: 'event',
+            method: 'goToSlide',
+            node: carousel,
+            source: 'source',
+            trust: ActionTrust_Enum.HIGH,
+          })
+        );
+      });
+    });
+
+    describe('toggleAutoplay action', () => {
+      it('should not be allowlisted in email', async () => {
+        env.win.document.documentElement.setAttribute('amp4email', '');
+        const action = new ActionService(env.ampdoc, env.win.document);
+        env.sandbox.stub(Services, 'actionServiceForDoc').returns(action);
+        const carousel = await getCarousel({loop: false});
+        const userErrorStub = env.sandbox.stub(user(), 'error');
+        env.sandbox.stub(carousel, 'getDefaultActionAlias');
+        await whenUpgradedToCustomElement(carousel);
+        await carousel.whenBuilt();
+
+        action.execute(
+          carousel,
+          'toggleAutoplay',
+          {},
+          'source',
+          'caller',
+          'event',
+          ActionTrust_Enum.HIGH
+        );
+
+        expect(userErrorStub).to.be.calledOnce;
+        expect(userErrorStub.args[0][1]).to.match(
+          /"AMP-CAROUSEL.toggleAutoplay" is not allowlisted/
+        );
+      });
     });
 
     describe('layout direction', () => {
diff --git a/extensions/amp-carousel/validator-amp-carousel.protoascii b/extensions/amp-carousel/validator-amp-carousel.protoascii
index 82bcd69a51a4..e983419d1402 100644
--- a/extensions/amp-carousel/validator-amp-carousel.protoascii
+++ b/extensions/amp-carousel/validator-amp-carousel.protoascii
@@ -20,6 +20,7 @@ tags: {  # amp-carousel for AMP4EMAIL
     name: "amp-carousel"
     # AMP4EMAIL doesn't allow version: "latest".
     version: "0.1"
+    version: "0.2"
   }
   attr_lists: "common-extension-attrs"
 }
@@ -118,6 +119,7 @@ tags: {
   html_format: AMP
   tag_name: "$REFERENCE_POINT"
   spec_name: "AMP-CAROUSEL lightbox [lightbox-exclude]"
+  descriptive_name: "amp-carousel lightbox [lightbox-exclude] child"
   attrs: {
     name: "lightbox-exclude"
     mandatory: true
@@ -127,6 +129,7 @@ tags: {
   html_format: AMP
   tag_name: "$REFERENCE_POINT"
   spec_name: "AMP-CAROUSEL lightbox [child]"
+  descriptive_name: "amp-carousel lightbox [lightbox-thumbnail-id] child"
   attrs: {
     name: "lightbox-thumbnail-id"
     value_regex_casei: "^[a-z][a-z\\d_-]*"
diff --git a/extensions/amp-connatix-player/0.1/amp-connatix-player.js b/extensions/amp-connatix-player/0.1/amp-connatix-player.js
index d981034767dc..cb7888d5e269 100644
--- a/extensions/amp-connatix-player/0.1/amp-connatix-player.js
+++ b/extensions/amp-connatix-player/0.1/amp-connatix-player.js
@@ -3,20 +3,25 @@ import {
   CONSENT_STRING_TYPE,
 } from '#core/constants/consent-state';
 import {Deferred} from '#core/data-structures/promise';
-import {removeElement} from '#core/dom';
+import {
+  dispatchCustomEvent,
+  getDataParamsFromAttributes,
+  removeElement,
+} from '#core/dom';
+import {fullscreenEnter, fullscreenExit} from '#core/dom/fullscreen';
 import {applyFillContent, isLayoutSizeDefined} from '#core/dom/layout';
 import {
   observeContentSize,
   unobserveContentSize,
 } from '#core/dom/layout/size-observer';
 import {PauseHelper} from '#core/dom/video/pause-helper';
-import {dict} from '#core/types/object';
 import {tryParseJson} from '#core/types/object/json';
 
 import {Services} from '#service';
+import {installVideoManagerForDoc} from '#service/video-manager-impl';
 
 import {getData} from '#utils/event-helper';
-import {userAssert} from '#utils/log';
+import {dev, userAssert} from '#utils/log';
 
 import {
   getConsentMetadata,
@@ -24,8 +29,16 @@ import {
   getConsentPolicySharedData,
   getConsentPolicyState,
 } from '../../../src/consent';
+import {
+  addUnsafeAllowAutoplay,
+  mutedOrUnmutedEvent,
+  redispatch,
+} from '../../../src/iframe-video';
 import {addParamsToUrl} from '../../../src/url';
-import {setIsMediaComponent} from '../../../src/video-interface';
+import {
+  VideoEvents_Enum,
+  setIsMediaComponent,
+} from '../../../src/video-interface';
 
 /**
  * @param {!Array<T>} promises
@@ -85,6 +98,15 @@ export class AmpConnatixPlayer extends AMP.BaseElement {
 
     /** @private @const */
     this.pauseHelper_ = new PauseHelper(this.element);
+
+    /** @private {boolean} */
+    this.isFullscreen_ = false;
+
+    /** @private {boolean} */
+    this.muted_ = true;
+
+    /** @private {?MutationObserver} */
+    this.mutationObserver_ = null;
   }
 
   /**
@@ -107,13 +129,11 @@ export class AmpConnatixPlayer extends AMP.BaseElement {
 
       if (iframe.contentWindow) {
         iframe.contentWindow./*OK*/ postMessage(
-          JSON.stringify(
-            dict({
-              'event': 'command',
-              'func': command,
-              'args': opt_args || '',
-            })
-          ),
+          JSON.stringify({
+            'event': 'command',
+            'func': command,
+            'args': opt_args || '',
+          }),
           this.iframeDomain_
         );
       }
@@ -152,7 +172,42 @@ export class AmpConnatixPlayer extends AMP.BaseElement {
           this.playerReadyResolver_(this.iframe_);
           break;
         }
+        case 'cnxContentPlaying': {
+          this.pauseHelper_.updatePlaying(true);
+          break;
+        }
+        case 'cnxContentPaused': {
+          this.pauseHelper_.updatePlaying(false);
+          break;
+        }
+        case 'cnxFullscreenChanged': {
+          const fullscreenState = dataJSON['args'];
+
+          this.isFullscreen_ = fullscreenState;
+          break;
+        }
+        case 'cnxToggleFullscreen': {
+          if (this.isFullscreen_) {
+            this.fullscreenExit();
+          } else {
+            this.fullscreenEnter();
+          }
+          break;
+        }
+        case 'cnxVolumeChanged': {
+          const newVolume = dataJSON['args'];
+
+          this.muted_ = newVolume === 0;
+          dispatchCustomEvent(this.element, mutedOrUnmutedEvent(this.muted_));
+
+          break;
+        }
       }
+
+      redispatch(this.element, dataJSON['func'].toString(), {
+        'cnxContentPlaying': VideoEvents_Enum.PLAYING,
+        'cnxContentPaused': VideoEvents_Enum.PAUSE,
+      });
     });
   }
 
@@ -230,6 +285,8 @@ export class AmpConnatixPlayer extends AMP.BaseElement {
   buildCallback() {
     const {element} = this;
 
+    installVideoManagerForDoc(element);
+
     setIsMediaComponent(element);
 
     // Player id is mandatory
@@ -246,7 +303,7 @@ export class AmpConnatixPlayer extends AMP.BaseElement {
     if (elementsPlayer) {
       this.iframeDomain_ = 'https://cdm.elements.video';
     } else {
-      this.iframeDomain_ = 'https://cdm.connatix.com';
+      this.iframeDomain_ = 'https://amp.cntxcdm.com';
     }
     // will be used by sendCommand in order to send only after the player is rendered
     const deferred = new Deferred();
@@ -271,11 +328,13 @@ export class AmpConnatixPlayer extends AMP.BaseElement {
   layoutCallback() {
     const {element} = this;
     // Url Params for iframe source
-    const urlParams = dict({
+    const urlParams = {
       'playerId': this.playerId_ || undefined,
       'mediaId': this.mediaId_ || undefined,
       'url': Services.documentInfoForDoc(element).sourceUrl,
-    });
+      'isSafariOrIos': this.isSafariOrIos_(),
+      ...getDataParamsFromAttributes(element),
+    };
     const iframeUrl = this.iframeDomain_ + '/amp-embed/index.html';
     const src = addParamsToUrl(iframeUrl, urlParams);
 
@@ -286,18 +345,49 @@ export class AmpConnatixPlayer extends AMP.BaseElement {
 
     // applyFillContent so that frame covers the entire component.
     applyFillContent(iframe, /* replacedContent */ true);
+    addUnsafeAllowAutoplay(iframe);
 
     // append child iframe for element
     element.appendChild(iframe);
     this.iframe_ = /** @type {HTMLIFrameElement} */ (iframe);
 
+    Services.videoManagerForDoc(element).register(this);
+
     // bind to player events (playerRendered after we can send commands to player and other)
     this.bindToPlayerCommands_();
     // bind to amp consent and send consent info to the iframe content and propagate to player
     this.bindToAmpConsent_();
 
+    if (!this.mutationObserver_) {
+      const mutationObserverCallback = (mutationList) => {
+        for (const mutation of mutationList) {
+          if (
+            mutation.type === 'attributes' &&
+            mutation.attributeName === 'class'
+          ) {
+            this.sendCommand_(
+              mutation.target.classList.contains('i-amphtml-video-docked')
+                ? 'dock'
+                : 'undock'
+            );
+          }
+        }
+      };
+
+      this.mutationObserver_ = new MutationObserver(mutationObserverCallback);
+    }
+
+    const mutationObserverConfig = {
+      attributes: true,
+      childList: false,
+      subtree: false,
+    };
+
+    this.mutationObserver_.observe(this.iframe_, mutationObserverConfig);
+
     observeContentSize(this.element, this.onResized_);
     this.pauseHelper_.updatePlaying(true);
+    dispatchCustomEvent(this.element, mutedOrUnmutedEvent(this.muted_));
 
     return this.loadPromise(iframe).then(() => this.playerReadyPromise_);
   }
@@ -337,10 +427,138 @@ export class AmpConnatixPlayer extends AMP.BaseElement {
     this.playerReadyResolver_ = deferred.resolve;
 
     unobserveContentSize(this.element, this.onResized_);
+    this.mutationObserver_.disconnect();
     this.pauseHelper_.updatePlaying(false);
 
     return true;
   }
+
+  /**
+   * @private
+   * @return {boolean}
+   */
+  isSafariOrIos_() {
+    const platform = Services.platformFor(this.win);
+
+    return platform.isSafari() || platform.isIos();
+  }
+
+  // VideoInterface Implementation. See ../src/video-interface.VideoInterface
+
+  /** @override */
+  supportsPlatform() {
+    return true;
+  }
+
+  /** @override */
+  isInteractive() {
+    return true;
+  }
+
+  /** @override */
+  play(unusedIsAutoplay) {
+    this.sendCommand_('play');
+  }
+
+  /** @override */
+  pause() {
+    this.sendCommand_('pause');
+  }
+
+  /** @override */
+  mute() {
+    this.sendCommand_('mute');
+  }
+
+  /** @override */
+  unmute() {
+    this.sendCommand_('unmute');
+  }
+
+  /** @override */
+  showControls() {
+    // Not supported.
+  }
+
+  /** @override */
+  hideControls() {
+    // Not supported.
+  }
+
+  /** @override */
+  fullscreenEnter() {
+    if (!this.iframe_) {
+      return;
+    }
+
+    if (this.isSafariOrIos_()) {
+      this.sendCommand_('toggleFullscreen', true);
+    } else {
+      fullscreenEnter(dev().assertElement(this.iframe_));
+      this.isFullscreen_ = true;
+      this.sendCommand_('updateFullscreenUi', true);
+    }
+  }
+
+  /** @override */
+  fullscreenExit() {
+    if (!this.iframe_) {
+      return;
+    }
+    if (this.isSafariOrIos_()) {
+      this.sendCommand_('toggleFullscreen', false);
+    } else {
+      fullscreenExit(dev().assertElement(this.iframe_));
+      this.isFullscreen_ = false;
+      this.sendCommand_('updateFullscreenUi', false);
+    }
+  }
+
+  /** @override */
+  isFullscreen() {
+    if (!this.iframe_) {
+      return false;
+    }
+    return this.isFullscreen_;
+  }
+
+  /** @override */
+  getMetadata() {
+    // Not implemented
+  }
+
+  /** @override */
+  preimplementsMediaSessionAPI() {
+    return true;
+  }
+
+  /** @override */
+  preimplementsAutoFullscreen() {
+    return false;
+  }
+
+  /** @override */
+  getCurrentTime() {
+    // Not implemented
+    return NaN;
+  }
+
+  /** @override */
+  getDuration() {
+    // Not implemented
+    return NaN;
+  }
+
+  /** @override */
+  getPlayedRanges() {
+    // Not supported.
+    return [];
+  }
+
+  /** @override */
+  seekTo(unusedTimeSeconds) {
+    this.user().error('TAG', '`seekTo` not supported.');
+  }
 }
 
 AMP.extension('amp-connatix-player', '0.1', (AMP) => {
diff --git a/extensions/amp-connatix-player/0.1/test/test-amp-connatix-player.js b/extensions/amp-connatix-player/0.1/test/test-amp-connatix-player.js
index 4fe66af48536..d0ca14402761 100644
--- a/extensions/amp-connatix-player/0.1/test/test-amp-connatix-player.js
+++ b/extensions/amp-connatix-player/0.1/test/test-amp-connatix-player.js
@@ -40,7 +40,7 @@ describes.realWin(
       expect(iframe).to.not.be.null;
       expect(iframe.tagName).to.equal('IFRAME');
       expect(iframe.src).to.equal(
-        'https://cdm.connatix.com/amp-embed/index.html?playerId=f721b0d8-7a79-42b6-b637-fa4e86138ed9&url=about%3Asrcdoc'
+        'https://amp.cntxcdm.com/amp-embed/index.html?playerId=f721b0d8-7a79-42b6-b637-fa4e86138ed9&url=about%3Asrcdoc&isSafariOrIos=false'
       );
       expect(iframe.className).to.match(/i-amphtml-fill-content/);
     });
@@ -54,7 +54,7 @@ describes.realWin(
       expect(iframe).to.not.be.null;
       expect(iframe.tagName).to.equal('IFRAME');
       expect(iframe.src).to.equal(
-        'https://cdm.connatix.com/amp-embed/index.html?playerId=f721b0d8-7a79-42b6-b637-fa4e86138ed9&mediaId=527207df-2007-43c4-b87a-f90814bafd2e&url=about%3Asrcdoc'
+        'https://amp.cntxcdm.com/amp-embed/index.html?playerId=f721b0d8-7a79-42b6-b637-fa4e86138ed9&mediaId=527207df-2007-43c4-b87a-f90814bafd2e&url=about%3Asrcdoc&isSafariOrIos=false'
       );
     });
     it('renders when data-elements-player is set', async () => {
@@ -66,7 +66,19 @@ describes.realWin(
       expect(iframe).to.not.be.null;
       expect(iframe.tagName).to.equal('IFRAME');
       expect(iframe.src).to.equal(
-        'https://cdm.elements.video/amp-embed/index.html?playerId=f721b0d8-7a79-42b6-b637-fa4e86138ed9&url=about%3Asrcdoc'
+        'https://cdm.elements.video/amp-embed/index.html?playerId=f721b0d8-7a79-42b6-b637-fa4e86138ed9&url=about%3Asrcdoc&isSafariOrIos=false'
+      );
+    });
+    it('should pass data-param-* attributes to the iframe src', async () => {
+      const cnx = await getConnatixPlayer({
+        'data-player-id': 'f721b0d8-7a79-42b6-b637-fa4e86138ed9',
+        'data-param-my-param': 17,
+      });
+      const iframe = cnx.querySelector('iframe');
+      expect(iframe).to.not.be.null;
+      expect(iframe.tagName).to.equal('IFRAME');
+      expect(iframe.src).to.equal(
+        'https://amp.cntxcdm.com/amp-embed/index.html?playerId=f721b0d8-7a79-42b6-b637-fa4e86138ed9&url=about%3Asrcdoc&isSafariOrIos=false&myParam=17'
       );
     });
 
diff --git a/extensions/amp-connatix-player/0.1/test/validator-amp-connatix-player.html b/extensions/amp-connatix-player/0.1/test/validator-amp-connatix-player.html
index 1ec5cfefaa42..fed1af080809 100644
--- a/extensions/amp-connatix-player/0.1/test/validator-amp-connatix-player.html
+++ b/extensions/amp-connatix-player/0.1/test/validator-amp-connatix-player.html
@@ -25,6 +25,14 @@
     width="150"
     height="80">
   </amp-connatix-player>
+  <!-- Invalid: dock without amp-video-docking extension -->
+  <amp-connatix-player
+    data-player-id="f721b0d8-7a79-42b6-b637-fa4e86138ed9"
+    layout="responsive"
+    width="150"
+    height="80"
+    dock>
+  </amp-connatix-player>
   <!-- Valid -->
   <amp-connatix-player
     data-player-id="f721b0d8-7a79-42b6-b637-fa4e86138ed9"
diff --git a/extensions/amp-connatix-player/0.1/test/validator-amp-connatix-player.out b/extensions/amp-connatix-player/0.1/test/validator-amp-connatix-player.out
index 046e939db407..e4fe51d8cfb8 100644
--- a/extensions/amp-connatix-player/0.1/test/validator-amp-connatix-player.out
+++ b/extensions/amp-connatix-player/0.1/test/validator-amp-connatix-player.out
@@ -28,6 +28,16 @@ amp-connatix-player/0.1/test/validator-amp-connatix-player.html:23:2 The mandato
 |      width="150"
 |      height="80">
 |    </amp-connatix-player>
+|    <!-- Invalid: dock without amp-video-docking extension -->
+|    <amp-connatix-player
+>>   ^~~~~~~~~
+amp-connatix-player/0.1/test/validator-amp-connatix-player.html:29:2 The attribute 'dock' requires including the 'amp-video-docking' extension JavaScript.
+|      data-player-id="f721b0d8-7a79-42b6-b637-fa4e86138ed9"
+|      layout="responsive"
+|      width="150"
+|      height="80"
+|      dock>
+|    </amp-connatix-player>
 |    <!-- Valid -->
 |    <amp-connatix-player
 |      data-player-id="f721b0d8-7a79-42b6-b637-fa4e86138ed9"
@@ -36,4 +46,4 @@ amp-connatix-player/0.1/test/validator-amp-connatix-player.html:23:2 The mandato
 |      height="80">
 |    </amp-connatix-player>
 |  </body>
-|  </html>
+|  </html>
\ No newline at end of file
diff --git a/extensions/amp-connatix-player/amp-connatix-player.md b/extensions/amp-connatix-player/amp-connatix-player.md
index 7147d42d5260..44e5353932aa 100644
--- a/extensions/amp-connatix-player/amp-connatix-player.md
+++ b/extensions/amp-connatix-player/amp-connatix-player.md
@@ -38,6 +38,14 @@ Connatix management dashboard.
 Connatix media id. This represents the unique ID of any media in your Library.
 This can be found at the Library section in the Connatix management dashboard.
 
+### `data-param-\*`
+
+All `data-param-*` prefixed attributes are turned into URL parameters and passed to iframe src.
+
+### `dock`
+Requires `amp-video-docking` extension. If this attribute is present and the video is playing manually, the video will be "minimized" and fixed to a corner or an element when the user scrolls out of the video component's visual area.
+For more details, see [documentation on the docking extension itself](https://github.com/ampproject/amphtml/blob/master/extensions/amp-video-docking/amp-video-docking.md).
+
 ### Common attributes
 
 This element includes [common attributes](https://amp.dev/documentation/guides-and-tutorials/learn/common_attributes)
diff --git a/extensions/amp-connatix-player/validator-amp-connatix-player.protoascii b/extensions/amp-connatix-player/validator-amp-connatix-player.protoascii
index 8c59e1a6ab6c..7641aff268dd 100644
--- a/extensions/amp-connatix-player/validator-amp-connatix-player.protoascii
+++ b/extensions/amp-connatix-player/validator-amp-connatix-player.protoascii
@@ -17,6 +17,10 @@ tags: {  # <amp-connatix-player>
     name: "data-player-id"
     mandatory: true
   }
+  attrs: {
+    name: "dock"
+    requires_extension: "amp-video-docking"
+  }
   spec_url: "https://amp.dev/documentation/components/amp-connatix-player/"
   amp_layout: {
     supported_layouts: FILL
diff --git a/extensions/amp-consent/0.1/amp-consent.js b/extensions/amp-consent/0.1/amp-consent.js
index c9cc3579fe9f..e0fbccc9d8e9 100644
--- a/extensions/amp-consent/0.1/amp-consent.js
+++ b/extensions/amp-consent/0.1/amp-consent.js
@@ -1,3 +1,23 @@
+import {Deferred} from '#core/data-structures/promise';
+import {realChildElements} from '#core/dom/query';
+import {toggle} from '#core/dom/style';
+import {isArray, isEnumValue, isObject} from '#core/types';
+import {hasOwn} from '#core/types/object';
+
+import {Services} from '#service';
+import {
+  NOTIFICATION_UI_MANAGER,
+  NotificationUiManager,
+} from '#service/notification-ui-manager';
+
+import {getData} from '#utils/event-helper';
+import {dev, devAssert, user, userAssert} from '#utils/log';
+
+import {
+  ConsentConfig,
+  expandConsentEndpointUrl,
+  expandPolicyConfig,
+} from './consent-config';
 import {
   CONSENT_ITEM_STATE,
   ConsentMetadataDef,
@@ -7,35 +27,19 @@ import {
   getConsentStateValue,
   hasStoredValue,
 } from './consent-info';
-import {CSS} from '../../../build/amp-consent-0.1.css';
-import {
-  ConsentConfig,
-  expandConsentEndpointUrl,
-  expandPolicyConfig,
-} from './consent-config';
 import {ConsentPolicyManager} from './consent-policy-manager';
 import {ConsentStateManager} from './consent-state-manager';
 import {ConsentUI} from './consent-ui';
 import {CookieWriter} from './cookie-writer';
-import {Deferred} from '#core/data-structures/promise';
-import {
-  NOTIFICATION_UI_MANAGER,
-  NotificationUiManager,
-} from '#service/notification-ui-manager';
-import {Services} from '#service';
 import {TcfApiCommandManager} from './tcf-api-command-manager';
+
+import {CSS} from '../../../build/amp-consent-0.1.css';
+import {getServicePromiseForDoc} from '../../../src/service-helpers';
 import {
   assertHttpsUrl,
   getSourceUrl,
   resolveRelativeUrl,
 } from '../../../src/url';
-import {dev, devAssert, user, userAssert} from '#utils/log';
-import {dict, hasOwn} from '#core/types/object';
-import {getData} from '#utils/event-helper';
-import {getServicePromiseForDoc} from '../../../src/service-helpers';
-import {isArray, isEnumValue, isObject} from '#core/types';
-import {realChildElements} from '#core/dom/query';
-import {toggle} from '#core/dom/style';
 
 const CONSENT_STATE_MANAGER = 'consentStateManager';
 const CONSENT_POLICY_MANAGER = 'consentPolicyManager';
@@ -157,7 +161,7 @@ export class AmpConsent extends AMP.BaseElement {
     if (this.consentConfig_['postPromptUI']) {
       this.postPromptUI_ = new ConsentUI(
         this,
-        dict({}),
+        {},
         this.consentConfig_['postPromptUI']
       );
     }
@@ -179,7 +183,7 @@ export class AmpConsent extends AMP.BaseElement {
      *   'postPromptUI': ...
      * }
      */
-    const policyConfig = this.consentConfig_['policy'] || dict({});
+    const policyConfig = this.consentConfig_['policy'] || {};
 
     this.policyConfig_ = expandPolicyConfig(
       policyConfig,
@@ -300,6 +304,7 @@ export class AmpConsent extends AMP.BaseElement {
       }
 
       let consentString;
+      let tcfPolicyVersion;
       let metadata;
       const data = getData(event);
 
@@ -333,6 +338,9 @@ export class AmpConsent extends AMP.BaseElement {
           data['info'] = undefined;
         }
         consentString = data['info'];
+        tcfPolicyVersion = this.validateTCFPolicyVersion_(
+          data['tcfPolicyVersion']
+        );
         metadata = this.validateMetadata_(data['consentMetadata']);
       }
 
@@ -358,7 +366,7 @@ export class AmpConsent extends AMP.BaseElement {
               purposeConsents
             );
           }
-          this.handleAction_(action, consentString, metadata);
+          this.handleAction_(action, consentString, metadata, tcfPolicyVersion);
         }
       }
     });
@@ -451,8 +459,41 @@ export class AmpConsent extends AMP.BaseElement {
    * @param {string} action
    * @param {string=} consentString
    * @param {!ConsentMetadataDef=} opt_consentMetadata
+   * @param {number=} opt_tcfPolicyVersion
+   */
+  handleAction_(
+    action,
+    consentString,
+    opt_consentMetadata,
+    opt_tcfPolicyVersion
+  ) {
+    const setDirtyBitPromise =
+      isEnumValue(ACTION_TYPE, action) &&
+      this.consentConfig_['clearDirtyBitOnResponse_dontUseThisItMightBeRemoved']
+        ? this.consentStateManager_.setDirtyBit(false)
+        : Promise.resolve();
+    setDirtyBitPromise.then(() => {
+      this.handleActionAfterClearingDirtyBit_(
+        action,
+        consentString,
+        opt_consentMetadata,
+        opt_tcfPolicyVersion
+      );
+    });
+  }
+
+  /**
+   * @param {string} action
+   * @param {string=} consentString
+   * @param {!ConsentMetadataDef=} opt_consentMetadata
+   * @param {number=} opt_tcfPolicyVersion
    */
-  handleAction_(action, consentString, opt_consentMetadata) {
+  handleActionAfterClearingDirtyBit_(
+    action,
+    consentString,
+    opt_consentMetadata,
+    opt_tcfPolicyVersion
+  ) {
     this.consentStateChangedViaPromptUI_ = true;
 
     if (action == ACTION_TYPE.ACCEPT) {
@@ -460,14 +501,16 @@ export class AmpConsent extends AMP.BaseElement {
       this.consentStateManager_.updateConsentInstanceState(
         CONSENT_ITEM_STATE.ACCEPTED,
         consentString,
-        opt_consentMetadata
+        opt_consentMetadata,
+        opt_tcfPolicyVersion
       );
     } else if (action == ACTION_TYPE.REJECT) {
       // reject
       this.consentStateManager_.updateConsentInstanceState(
         CONSENT_ITEM_STATE.REJECTED,
         consentString,
-        opt_consentMetadata
+        opt_consentMetadata,
+        opt_tcfPolicyVersion
       );
     } else if (action == ACTION_TYPE.DISMISS) {
       this.consentStateManager_.updateConsentInstanceState(
@@ -521,10 +564,13 @@ export class AmpConsent extends AMP.BaseElement {
    */
   handleReprompt_(invocation) {
     const {args} = invocation;
-    if (args && args['expireCache'] === true) {
-      this.consentStateManager_.setDirtyBit();
-    }
-    this.scheduleDisplay_(true);
+    const setDirtyBitPromise =
+      args?.['expireCache'] === true
+        ? this.consentStateManager_.setDirtyBit()
+        : Promise.resolve();
+    setDirtyBitPromise.then(() => {
+      this.scheduleDisplay_(true);
+    });
   }
 
   /**
@@ -640,7 +686,8 @@ export class AmpConsent extends AMP.BaseElement {
           response['consentStateValue'],
           response['consentString'] || undefined,
           response['consentMetadata'],
-          response['purposeConsents']
+          response['purposeConsents'],
+          response['tcfPolicyVersion']
         );
       }
     });
@@ -653,12 +700,14 @@ export class AmpConsent extends AMP.BaseElement {
    * @param {?string=} responseConsentString
    * @param {?JsonObject=} responseMetadata
    * @param {?JsonObject=} responsePurposeConsents
+   * @param {number=} responseTcfPolicyVersion
    */
   updateCacheIfNotNull_(
     responseStateValue,
     responseConsentString,
     responseMetadata,
-    responsePurposeConsents
+    responsePurposeConsents,
+    responseTcfPolicyVersion
   ) {
     const consentStateValue = convertEnumValueToState(responseStateValue);
     // consentStateValue and consentString are treated as a pair that will update together
@@ -673,10 +722,12 @@ export class AmpConsent extends AMP.BaseElement {
           responsePurposeConsents
         );
       }
+
       this.consentStateManager_.updateConsentInstanceState(
         consentStateValue,
         responseConsentString,
-        this.validateMetadata_(responseMetadata)
+        this.validateMetadata_(responseMetadata),
+        responseTcfPolicyVersion
       );
     }
   }
@@ -699,16 +750,17 @@ export class AmpConsent extends AMP.BaseElement {
         this.consentStateManager_.getLastConsentInstanceInfo();
       this.remoteConfigPromise_ = storeConsentPromise.then((storedInfo) => {
         // Note: Expect the request to look different in following versions.
-        const body = dict({
+        const body = {
           'consentInstanceId': this.consentId_,
           'consentStateValue': getConsentStateValue(storedInfo['consentState']),
           'consentMetadata': storedInfo['consentMetadata'],
           'consentString': storedInfo['consentString'],
+          'tcfPolicyVersion': storedInfo['tcfPolicyVersion'],
           'isDirty': !!storedInfo['isDirty'],
           'matchedGeoGroup': this.matchedGeoGroup_,
           'purposeConsents': storedInfo['purposeConsents'],
           'clientConfig': this.consentConfig_['clientConfig'],
-        });
+        };
         const init = {
           credentials: 'include',
           method: 'POST',
@@ -914,7 +966,32 @@ export class AmpConsent extends AMP.BaseElement {
   }
 
   /**
-   * Convert valid opt_metadta into ConsentMetadataDef
+   * Check if the opt_tcfPolicyVersion provided is a valid number to use.
+   * @param {number=} opt_tcfPolicyVersion
+   * @return {number|undefined}
+   */
+  validateTCFPolicyVersion_(opt_tcfPolicyVersion) {
+    if (typeof opt_tcfPolicyVersion !== 'number') {
+      return;
+    }
+
+    if (
+      isNaN(opt_tcfPolicyVersion) ||
+      !isFinite(opt_tcfPolicyVersion) ||
+      opt_tcfPolicyVersion.toString().split('.').length > 1
+    ) {
+      user().error(
+        TAG,
+        'CMP tcfPolicyVersion must be a valid number (integer).'
+      );
+      return;
+    }
+
+    return opt_tcfPolicyVersion;
+  }
+
+  /**
+   * Convert valid opt_metadata into ConsentMetadataDef
    * @param {JsonObject=} opt_metadata
    * @return {ConsentMetadataDef|undefined}
    */
@@ -931,7 +1008,8 @@ export class AmpConsent extends AMP.BaseElement {
       opt_metadata['consentStringType'],
       opt_metadata['additionalConsent'],
       opt_metadata['gdprApplies'],
-      opt_metadata['purposeOne']
+      opt_metadata['purposeOne'],
+      opt_metadata['gppSectionId']
     );
   }
 
diff --git a/extensions/amp-consent/0.1/cmps.js b/extensions/amp-consent/0.1/cmps.js
index bdb5d8729031..8eebc30cd928 100644
--- a/extensions/amp-consent/0.1/cmps.js
+++ b/extensions/amp-consent/0.1/cmps.js
@@ -29,8 +29,8 @@ CMP_CONFIG['appconsent'] = {
 CMP_CONFIG['ConsentManager'] = {
   'consentInstanceId': 'ConsentManager',
   'checkConsentHref':
-    'https://consentmanager.mgr.consensu.org/delivery/ampcheck.php',
-  'promptUISrc': 'https://consentmanager.mgr.consensu.org/delivery/ampui.php',
+    'https://delivery.consentmanager.net/delivery/ampcheck.php',
+  'promptUISrc': 'https://delivery.consentmanager.net/delivery/ampui.php',
 };
 
 CMP_CONFIG['didomi'] = {
@@ -47,8 +47,9 @@ CMP_CONFIG['iubenda'] = {
 
 CMP_CONFIG['sirdata'] = {
   'consentInstanceId': 'sirdata',
-  'checkConsentHref': 'https://sddan.mgr.consensu.org/api/v1/public/amp/check',
-  'promptUISrc': 'https://ui.sddan.mgr.consensu.org/amp.html',
+  'checkConsentHref':
+    'https://choices.consentframework.com/api/v1/public/amp/check',
+  'promptUISrc': 'https://ui.consentframework.com/amp/loader.html',
 };
 
 CMP_CONFIG['Marfeel'] = {
@@ -122,4 +123,5 @@ CMP_CONFIG['googlefc'] = {
   'uiConfig': {
     'overlay': true,
   },
+  'clearDirtyBitOnResponse_dontUseThisItMightBeRemoved': true,
 };
diff --git a/extensions/amp-consent/0.1/consent-config.js b/extensions/amp-consent/0.1/consent-config.js
index 88a2ad8fecf2..50b80f6c5c0b 100644
--- a/extensions/amp-consent/0.1/consent-config.js
+++ b/extensions/amp-consent/0.1/consent-config.js
@@ -1,13 +1,17 @@
-import {CMP_CONFIG} from './cmps';
 import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';
-import {GEO_IN_GROUP} from '../../amp-geo/0.1/amp-geo-in-group';
-import {Services} from '#service';
+import {getChildJsonConfig} from '#core/dom';
 import {childElementByTag} from '#core/dom/query';
 import {deepMerge, hasOwn, map} from '#core/types/object';
+
+import {Services} from '#service';
+
 import {devAssert, user, userAssert} from '#utils/log';
-import {getChildJsonConfig} from '#core/dom';
+
+import {CMP_CONFIG} from './cmps';
 import {getConsentStateManager} from './consent-state-manager';
 
+import {GEO_IN_GROUP} from '../../amp-geo/0.1/amp-geo-in-group';
+
 const TAG = 'amp-consent/consent-config';
 const AMP_STORY_CONSENT_TAG = 'amp-story-consent';
 
@@ -19,8 +23,9 @@ const ALLOWED_DEPR_CONSENTINSTANCE_ATTRS = {
   'onUpdateHref': true,
 };
 
-/** @const @type {!Object<string, boolean>} */
+/** @const @type {!{[key: string]: boolean}} */
 const CONSENT_VARS_ALLOWED_LIST = {
+  'CANONICAL_URL': true,
   'PAGE_VIEW_ID': true,
   'PAGE_VIEW_ID_64': true,
   'SOURCE_URL': true,
@@ -304,7 +309,7 @@ export class ConsentConfig {
  * Expand consent endpoint url
  * @param {!Element|!ShadowRoot} element
  * @param {string} url
- * @param {Object<string, *>=} opt_vars
+ * @param {{[key: string]: *}=} opt_vars
  * @return {!Promise<string>}
  */
 export function expandConsentEndpointUrl(element, url, opt_vars) {
diff --git a/extensions/amp-consent/0.1/consent-info.js b/extensions/amp-consent/0.1/consent-info.js
index 23b50f276119..18cb0b97475f 100644
--- a/extensions/amp-consent/0.1/consent-info.js
+++ b/extensions/amp-consent/0.1/consent-info.js
@@ -1,29 +1,32 @@
 import {CONSENT_STRING_TYPE} from '#core/constants/consent-state';
+import {isEnumValue, isObject} from '#core/types';
+import {hasOwn, map} from '#core/types/object';
 import {deepEquals} from '#core/types/object/json';
+
 import {dev, user} from '#utils/log';
-import {hasOwn, map} from '#core/types/object';
-import {isEnumValue, isObject} from '#core/types';
 
 const TAG = 'amp-consent';
 
 /**
  * Key values for retriving/storing consent info object.
- * STATE: Set when user accept or reject consent.
+ * VERSION: Set when a consent string is provided to store its version.
  * STRING: Set when a consent string is used to store more granular consent info
  * on vendors.
+ * STATE: Set when user accept or reject consent.
+ * PURPOSE_CONSENTS: Set when consents for purposes are passed in for client side
+ * granular consent. Only values ACCEPT and REJECT signals are stored.
  * METADATA: Set when consent metadata is passed in to store more granular consent info
  * on vendors.
  * DITRYBIT: Set when the stored consent info need to be revoked next time.
- * PURPOSE_CONSENTS: Set when consents for purposes are passed in for client side
- * granular consent. Only values ACCEPT and REJECT signals are stored.
  * @enum {string}
  */
 export const STORAGE_KEY = {
-  STATE: 's',
+  VERSION: 'e',
   STRING: 'r',
-  IS_DIRTY: 'd',
-  METADATA: 'm',
+  STATE: 's',
   PURPOSE_CONSENTS: 'pc',
+  METADATA: 'm',
+  IS_DIRTY: 'd',
 };
 
 /**
@@ -35,6 +38,7 @@ export const METADATA_STORAGE_KEY = {
   ADDITIONAL_CONSENT: 'ac',
   GDPR_APPLIES: 'ga',
   PURPOSE_ONE: 'po',
+  GPP_SECTION_ID: 'gsi',
 };
 
 /**
@@ -78,8 +82,9 @@ export const TCF_POST_MESSAGE_API_COMMANDS = {
  *  consentState: CONSENT_ITEM_STATE,
  *  consentString: (string|undefined),
  *  consentMetadata: (ConsentMetadataDef|undefined),
- *  purposeConsents: (Object<string, PURPOSE_CONSENT_STATE>|undefined),
+ *  purposeConsents: ({[key: string]: PURPOSE_CONSENT_STATE}|undefined),
  *  isDirty: (boolean|undefined),
+ *  tcfPolicyVersion: (number|undefined),
  * }}
  */
 export let ConsentInfoDef;
@@ -91,6 +96,7 @@ export let ConsentInfoDef;
  *  additionalConsent: (string|undefined),
  *  gdprApplies: (boolean|undefined),
  *  purposeOne: (boolean|undefined),
+ *  gppSectionId: (string|undefined),
  * }}
  */
 export let ConsentMetadataDef;
@@ -118,7 +124,8 @@ export function getStoredConsentInfo(value) {
     value[STORAGE_KEY.STRING],
     convertStorageMetadata(value[STORAGE_KEY.METADATA]),
     value[STORAGE_KEY.PURPOSE_CONSENTS],
-    value[STORAGE_KEY.IS_DIRTY] && value[STORAGE_KEY.IS_DIRTY] === 1
+    value[STORAGE_KEY.IS_DIRTY] && value[STORAGE_KEY.IS_DIRTY] === 1,
+    value[STORAGE_KEY.VERSION]
   );
 }
 
@@ -179,6 +186,10 @@ export function composeStoreValue(consentInfo) {
     obj[STORAGE_KEY.STRING] = consentInfo['consentString'];
   }
 
+  if (consentInfo['tcfPolicyVersion']) {
+    obj[STORAGE_KEY.VERSION] = consentInfo['tcfPolicyVersion'];
+  }
+
   if (consentInfo['isDirty'] === true) {
     obj[STORAGE_KEY.IS_DIRTY] = 1;
   }
@@ -247,12 +258,15 @@ export function isConsentInfoStoredValueSame(infoA, infoB, opt_isDirty) {
       infoA['purposeConsents'],
       infoB['purposeConsents']
     );
+    const tcfPolicyVersionEqual =
+      infoA['tcfPolicyVersion'] == infoB['tcfPolicyVersion'];
     return (
       stateEqual &&
       stringEqual &&
       metadataEqual &&
       purposeConsentsEqual &&
-      isDirtyEqual
+      isDirtyEqual &&
+      tcfPolicyVersionEqual
     );
   }
   return false;
@@ -274,8 +288,9 @@ function getLegacyStoredConsentInfo(value) {
  * @param {CONSENT_ITEM_STATE} consentState
  * @param {string=} opt_consentString
  * @param {ConsentMetadataDef=} opt_consentMetadata
- * @param {Object<string, PURPOSE_CONSENT_STATE>=} opt_purposeConsents
+ * @param {{[key: string]: PURPOSE_CONSENT_STATE}=} opt_purposeConsents
  * @param {boolean=} opt_isDirty
+ * @param {number=} opt_tcfPolicyVersion
  * @return {!ConsentInfoDef}
  */
 export function constructConsentInfo(
@@ -283,7 +298,8 @@ export function constructConsentInfo(
   opt_consentString,
   opt_consentMetadata,
   opt_purposeConsents,
-  opt_isDirty
+  opt_isDirty,
+  opt_tcfPolicyVersion
 ) {
   return {
     'consentState': consentState,
@@ -291,6 +307,7 @@ export function constructConsentInfo(
     'consentMetadata': opt_consentMetadata,
     'purposeConsents': opt_purposeConsents,
     'isDirty': opt_isDirty,
+    'tcfPolicyVersion': opt_tcfPolicyVersion,
   };
 }
 
@@ -301,19 +318,22 @@ export function constructConsentInfo(
  * @param {string=} opt_additionalConsent
  * @param {boolean=} opt_gdprApplies
  * @param {boolean=} opt_purposeOne
+ * @param {string=} opt_gppSectionId
  * @return {!ConsentMetadataDef}
  */
 export function constructMetadata(
   opt_consentStringType,
   opt_additionalConsent,
   opt_gdprApplies,
-  opt_purposeOne
+  opt_purposeOne,
+  opt_gppSectionId
 ) {
   return {
     'consentStringType': opt_consentStringType,
     'additionalConsent': opt_additionalConsent,
     'gdprApplies': opt_gdprApplies,
     'purposeOne': opt_purposeOne,
+    'gppSectionId': opt_gppSectionId,
   };
 }
 
@@ -385,7 +405,7 @@ export function getConsentStateValue(enumState) {
  * {'ga': true, 'cst': 2}
  *
  * @param {ConsentMetadataDef=} consentInfoMetadata
- * @return {Object}
+ * @return {object}
  */
 export function composeMetadataStoreValue(consentInfoMetadata) {
   const storageMetadata = map();
@@ -405,6 +425,10 @@ export function composeMetadataStoreValue(consentInfoMetadata) {
     storageMetadata[METADATA_STORAGE_KEY.PURPOSE_ONE] =
       consentInfoMetadata['purposeOne'];
   }
+  if (consentInfoMetadata['gppSectionId'] != undefined) {
+    storageMetadata[METADATA_STORAGE_KEY.GPP_SECTION_ID] =
+      consentInfoMetadata['gppSectionId'];
+  }
   return storageMetadata;
 }
 
@@ -424,7 +448,8 @@ export function convertStorageMetadata(storageMetadata) {
     storageMetadata[METADATA_STORAGE_KEY.CONSENT_STRING_TYPE],
     storageMetadata[METADATA_STORAGE_KEY.ADDITIONAL_CONSENT],
     storageMetadata[METADATA_STORAGE_KEY.GDPR_APPLIES],
-    storageMetadata[METADATA_STORAGE_KEY.PURPOSE_ONE]
+    storageMetadata[METADATA_STORAGE_KEY.PURPOSE_ONE],
+    storageMetadata[METADATA_STORAGE_KEY.GPP_SECTION_ID]
   );
 }
 
@@ -438,6 +463,7 @@ export function assertMetadataValues(metadata) {
   const additionalConsent = metadata['additionalConsent'];
   const gdprApplies = metadata['gdprApplies'];
   const purposeOne = metadata['purposeOne'];
+  const gppSectionId = metadata['gppSectionId'];
   const errorFields = [];
 
   if (
@@ -459,6 +485,10 @@ export function assertMetadataValues(metadata) {
     delete metadata['purposeOne'];
     errorFields.push('purposeOne');
   }
+  if (gppSectionId && typeof gppSectionId != 'string') {
+    delete metadata['gppSectionId'];
+    errorFields.push('gppSectionId');
+  }
   for (let i = 0; i < errorFields.length; i++) {
     user().error(
       TAG,
diff --git a/extensions/amp-consent/0.1/consent-policy-manager.js b/extensions/amp-consent/0.1/consent-policy-manager.js
index d026c1397a64..72c118a57a80 100644
--- a/extensions/amp-consent/0.1/consent-policy-manager.js
+++ b/extensions/amp-consent/0.1/consent-policy-manager.js
@@ -1,16 +1,18 @@
+import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';
+import {Observable} from '#core/data-structures/observable';
+import {Deferred} from '#core/data-structures/promise';
+import {isFiniteNumber, isObject} from '#core/types';
+import {hasOwn, map} from '#core/types/object';
+
+import {user, userAssert} from '#utils/log';
+
 import {
   CONSENT_ITEM_STATE,
   ConsentInfoDef,
   PURPOSE_CONSENT_STATE,
 } from './consent-info';
-import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';
-import {Deferred} from '#core/data-structures/promise';
-import {Observable} from '#core/data-structures/observable';
-import {getServicePromiseForDoc} from '../../../src/service-helpers';
-import {hasOwn, map} from '#core/types/object';
-import {isFiniteNumber, isObject} from '#core/types';
 
-import {user, userAssert} from '#utils/log';
+import {getServicePromiseForDoc} from '../../../src/service-helpers';
 
 const CONSENT_STATE_MANAGER = 'consentStateManager';
 const TAG = 'consent-policy-manager';
@@ -31,10 +33,10 @@ export class ConsentPolicyManager {
     /** @private {!../../../src/service/ampdoc-impl.AmpDoc} */
     this.ampdoc_ = ampdoc;
 
-    /** @private {!Object<string, ?Deferred>} */
+    /** @private {!{[key: string]: ?Deferred}} */
     this.policyInstancesDeferred_ = map();
 
-    /** @private {!Object<string, ConsentPolicyInstance>} */
+    /** @private {!{[key: string]: ConsentPolicyInstance}} */
     this.instances_ = map();
 
     /** @private {!Promise} */
@@ -66,6 +68,9 @@ export class ConsentPolicyManager {
     /** @private {?string} */
     this.consentString_ = null;
 
+    /** @private {?number} */
+    this.tcfPolicyVersion_ = null;
+
     /** @private {?Object|undefined} */
     this.consentMetadata_ = null;
 
@@ -177,15 +182,18 @@ export class ConsentPolicyManager {
   consentStateChangeHandler_(info) {
     const state = info['consentState'];
     const consentStr = info['consentString'];
+    const tcfPolicyVersion = info['tcfPolicyVersion'];
     const consentMetadata = info['consentMetadata'];
     const purposeConsents = info['purposeConsents'];
     const {
       consentMetadata_: prevConsentMetadata,
       consentString_: prevConsentStr,
       purposeConsents_: prevPurposeConsents,
+      tcfPolicyVersion_: prevTCFPolicyVersion,
     } = this;
 
     this.consentString_ = consentStr;
+    this.tcfPolicyVersion_ = tcfPolicyVersion;
     this.consentMetadata_ = consentMetadata;
     this.purposeConsents_ = purposeConsents;
     if (state === CONSENT_ITEM_STATE.UNKNOWN) {
@@ -208,6 +216,7 @@ export class ConsentPolicyManager {
       }
       // None of the supplementary consent data changes with dismiss action
       this.consentString_ = prevConsentStr;
+      this.tcfPolicyVersion_ = prevTCFPolicyVersion;
       this.consentMetadata_ = prevConsentMetadata;
       this.purposeConsents_ = prevPurposeConsents;
     } else {
@@ -303,6 +312,18 @@ export class ConsentPolicyManager {
     });
   }
 
+  /**
+   * Get the tcf policy version of a policy. Return a promise that resolves
+   * when the policy resolves.
+   * @param {string} policyId
+   * @return {!Promise<?number>}
+   */
+  getTcfPolicyVersion(policyId) {
+    return this.whenPolicyResolved(policyId).then(() => {
+      return this.tcfPolicyVersion_;
+    });
+  }
+
   /**
    * Get the consent metadata value of a policy. Return a promise that resolves
    * when the policy resolves.
diff --git a/extensions/amp-consent/0.1/consent-state-manager.js b/extensions/amp-consent/0.1/consent-state-manager.js
index 6d5387d63c4f..d335ac3477d3 100644
--- a/extensions/amp-consent/0.1/consent-state-manager.js
+++ b/extensions/amp-consent/0.1/consent-state-manager.js
@@ -1,3 +1,13 @@
+import {Deferred} from '#core/data-structures/promise';
+import {once} from '#core/types/function';
+import {hasOwn} from '#core/types/object';
+
+import {Services} from '#service';
+import {getRandomString64} from '#service/cid-impl';
+
+import {dev, devAssert} from '#utils/log';
+
+import {expandConsentEndpointUrl, getConsentCID} from './consent-config';
 import {
   CONSENT_ITEM_STATE,
   ConsentInfoDef,
@@ -12,15 +22,9 @@ import {
   isConsentInfoStoredValueSame,
   recalculateConsentStateValue,
 } from './consent-info';
-import {Deferred} from '#core/data-structures/promise';
-import {Services} from '#service';
-import {assertHttpsUrl} from '../../../src/url';
-import {dev, devAssert} from '#utils/log';
-import {expandConsentEndpointUrl, getConsentCID} from './consent-config';
-import {hasOwn} from '#core/types/object';
-import {once} from '#core/types/function';
-import {getRandomString64} from '#service/cid-impl';
+
 import {getServicePromiseForDoc} from '../../../src/service-helpers';
+import {assertHttpsUrl} from '../../../src/url';
 
 const TAG = 'CONSENT-STATE-MANAGER';
 
@@ -59,7 +63,7 @@ export class ConsentStateManager {
     /** @private {?function()} */
     this.consentReadyResolver_ = null;
 
-    /** @private {Object<string, PURPOSE_CONSENT_STATE>|undefined} */
+    /** @private {{[key: string]: PURPOSE_CONSENT_STATE}|undefined} */
     this.purposeConsents_ = undefined;
 
     const allPurposeConsentsDeferred = new Deferred();
@@ -106,8 +110,14 @@ export class ConsentStateManager {
    * @param {CONSENT_ITEM_STATE} state
    * @param {string=} consentStr
    * @param {ConsentMetadataDef=} opt_consentMetadata
+   * @param {number=} opt_tcfPolicyVersion
    */
-  updateConsentInstanceState(state, consentStr, opt_consentMetadata) {
+  updateConsentInstanceState(
+    state,
+    consentStr,
+    opt_consentMetadata,
+    opt_tcfPolicyVersion
+  ) {
     if (!this.instance_) {
       dev().error(TAG, 'instance not registered');
       return;
@@ -117,7 +127,8 @@ export class ConsentStateManager {
       consentStr,
       this.purposeConsents_,
       opt_consentMetadata,
-      false
+      false,
+      opt_tcfPolicyVersion
     );
 
     if (this.consentChangeHandler_) {
@@ -126,7 +137,9 @@ export class ConsentStateManager {
           state,
           consentStr,
           opt_consentMetadata,
-          this.purposeConsents_
+          this.purposeConsents_,
+          undefined,
+          opt_tcfPolicyVersion
         )
       );
       // Need to be called after handler.
@@ -137,7 +150,7 @@ export class ConsentStateManager {
   /**
    * Update our current purposeConsents, that will be
    * used in subsequent calls to update().
-   * @param {!Object<string, boolean>} purposeMap
+   * @param {!{[key: string]: boolean}} purposeMap
    * @param {boolean} defaultsOnly
    */
   updateConsentInstancePurposes(purposeMap, defaultsOnly = false) {
@@ -231,11 +244,15 @@ export class ConsentStateManager {
   }
 
   /**
-   * Sets the dirty bit so current consent info won't be used for
-   * decision making on next visit
+   * Set dirtyBit to current consent info. Refresh stored consent value with
+   * dirtyBit
+   * @param {boolean=} dirty
+   * @return {Promise<void>}
+   * TODO(alanorozco): Remove `dirty` argument and always set to true once
+   * we remove clearDirtyBitOnResponse_dontUseThisItMightBeRemoved.
    */
-  setDirtyBit() {
-    this.instance_.setDirtyBit();
+  setDirtyBit(dirty = true) {
+    return this.instance_.setDirtyBit(dirty);
   }
 
   /**
@@ -320,14 +337,17 @@ export class ConsentInstance {
   /**
    * Set dirtyBit to current consent info. Refresh stored consent value with
    * dirtyBit
-   * @return {*} TODO(#23582): Specify return type
+   * @param {boolean=} dirty
+   * @return {Promise<void>}
+   * TODO(alanorozco): Remove `dirty` argument and always set to true once
+   * we remove clearDirtyBitOnResponse_dontUseThisItMightBeRemoved.
    */
-  setDirtyBit() {
-    // Note: this.hasDirtyBitNext_ is only set to true when 'forcePromptNext'
+  setDirtyBit(dirty = true) {
+    // Note: this.hasDirtyBitNext_ is only set to true when 'forcePromptOnNext'
     // is set to true and we need to set dirtyBit for next visit.
-    this.hasDirtyBitNext_ = true;
+    this.hasDirtyBitNext_ = dirty;
     return this.get().then((info) => {
-      if (hasDirtyBit(info)) {
+      if (hasDirtyBit(info) === dirty) {
         // Current stored value has dirtyBit and is no longer valid.
         // No need to update with dirtyBit
         return;
@@ -337,7 +357,7 @@ export class ConsentInstance {
         info['consentString'],
         info['purposeConsents'],
         info['consentMetadata'],
-        true
+        dirty
       );
     });
   }
@@ -346,16 +366,18 @@ export class ConsentInstance {
    * Update the local consent state list
    * @param {!CONSENT_ITEM_STATE} state
    * @param {string=} consentString
-   * @param {Object<string, PURPOSE_CONSENT_STATE>=} purposeConsents
+   * @param {{[key: string]: PURPOSE_CONSENT_STATE}=} purposeConsents
    * @param {ConsentMetadataDef=} opt_consentMetadata
    * @param {boolean=} opt_systemUpdate
+   * @param {number=} opt_tcfPolicyVersion
    */
   update(
     state,
     consentString,
     purposeConsents,
     opt_consentMetadata,
-    opt_systemUpdate
+    opt_systemUpdate,
+    opt_tcfPolicyVersion
   ) {
     const localState =
       this.localConsentInfo_ && this.localConsentInfo_['consentState'];
@@ -368,7 +390,9 @@ export class ConsentInstance {
         calculatedState,
         this.localConsentInfo_?.consentString,
         this.localConsentInfo_?.consentMetadata,
-        this.localConsentInfo_?.purposeConsents
+        this.localConsentInfo_?.purposeConsents,
+        undefined,
+        this.localConsentInfo_?.tcfPolicyVersion
       );
       return;
     }
@@ -382,7 +406,8 @@ export class ConsentInstance {
         consentString,
         opt_consentMetadata,
         purposeConsents,
-        true
+        true,
+        opt_tcfPolicyVersion
       );
     } else {
       // Any user update makes the current state valid, thus remove dirtyBit
@@ -391,7 +416,9 @@ export class ConsentInstance {
         calculatedState,
         consentString,
         opt_consentMetadata,
-        purposeConsents
+        purposeConsents,
+        undefined,
+        opt_tcfPolicyVersion
       );
     }
 
@@ -400,7 +427,8 @@ export class ConsentInstance {
       consentString,
       opt_consentMetadata,
       purposeConsents,
-      this.hasDirtyBitNext_
+      this.hasDirtyBitNext_,
+      opt_tcfPolicyVersion
     );
 
     if (isConsentInfoStoredValueSame(newConsentInfo, this.savedConsentInfo_)) {
@@ -533,6 +561,9 @@ export class ConsentInstance {
       if (consentInfo['purposeConsents']) {
         request['purposeConsents'] = consentInfo['purposeConsents'];
       }
+      if (consentInfo['tcfPolicyVersion']) {
+        request['tcfPolicyVersion'] = consentInfo['tcfPolicyVersion'];
+      }
       const init = {
         credentials: 'include',
         method: 'POST',
diff --git a/extensions/amp-consent/0.1/consent-ui.js b/extensions/amp-consent/0.1/consent-ui.js
index 82d82cc96799..cac21db7e218 100644
--- a/extensions/amp-consent/0.1/consent-ui.js
+++ b/extensions/amp-consent/0.1/consent-ui.js
@@ -1,22 +1,25 @@
 import {Deferred} from '#core/data-structures/promise';
-import {Services} from '#service';
-import {assertHttpsUrl} from '../../../src/url';
-import {dev, user} from '#utils/log';
-import {dict} from '#core/types/object';
-import {elementByTag} from '#core/dom/query';
-import {expandConsentEndpointUrl} from './consent-config';
-import {getConsentStateValue} from './consent-info';
-import {getData} from '#utils/event-helper';
-import {getConsentStateManager} from './consent-state-manager';
-import {htmlFor} from '#core/dom/static-template';
 import {insertAtStart, removeElement, tryFocus} from '#core/dom';
 import {
   isAmpElement,
   whenUpgradedToCustomElement,
 } from '#core/dom/amp-element-helpers';
+import {elementByTag} from '#core/dom/query';
+import {htmlFor} from '#core/dom/static-template';
 import {setImportantStyles, setStyles, toggle} from '#core/dom/style';
 import {isEsm} from '#core/mode';
 
+import {Services} from '#service';
+
+import {getData} from '#utils/event-helper';
+import {dev, user} from '#utils/log';
+
+import {expandConsentEndpointUrl} from './consent-config';
+import {getConsentStateValue} from './consent-info';
+import {getConsentStateManager} from './consent-state-manager';
+
+import {assertHttpsUrl} from '../../../src/url';
+
 const TAG = 'amp-consent-ui';
 const MINIMUM_INITIAL_HEIGHT = 10;
 const DEFAULT_INITIAL_HEIGHT = 30;
@@ -32,9 +35,15 @@ const CONSENT_PROMPT_CAPTION = 'User Consent Prompt';
 const BUTTON_ACTION_CAPTION = 'Focus Prompt';
 const CANCEL_OVERLAY = 'cancelFullOverlay';
 const REQUEST_OVERLAY = 'requestFullOverlay';
+const ALLOWED_SANDBOX_ATTRIBUTES = [
+  'allow-popups-to-escape-sandbox',
+  'allow-top-navigation-by-user-activation',
+];
 
 const IFRAME_RUNNING_TIMEOUT = 1000;
 
+const IFRAME_ALLOWED_PERMISSIONS = ['geolocation', 'payment'];
+
 export const actionState = {
   error: 'error',
   success: 'success',
@@ -452,7 +461,7 @@ export class ConsentUI {
    * @param {string} event
    */
   sendViewerEvent_(event) {
-    this.viewer_.sendMessage(event, dict(), /* cancelUnsent */ true);
+    this.viewer_.sendMessage(event, {}, /* cancelUnsent */ true);
   }
 
   /**
@@ -462,18 +471,34 @@ export class ConsentUI {
    */
   createPromptIframe_(promptUISrc) {
     const iframe = this.parent_.ownerDocument.createElement('iframe');
-    const sandbox = ['allow-scripts', 'allow-popups'];
-    const allowSameOrigin = this.allowSameOrigin_(promptUISrc);
-    if (allowSameOrigin) {
-      sandbox.push('allow-same-origin');
-    }
-    iframe.setAttribute('sandbox', sandbox.join(' '));
+    const sandbox = this.getSandboxAttribute_(promptUISrc);
+    iframe.setAttribute('title', this.parent_.title || 'Consent Banner');
+    iframe.setAttribute('sandbox', sandbox);
+    iframe.setAttribute('allow', IFRAME_ALLOWED_PERMISSIONS.join('; '));
     const {classList} = iframe;
     classList.add(consentUiClasses.fill);
     // Append iframe lazily to save resources.
     return iframe;
   }
 
+  /**
+   * Determines the sandbox attribute for the prompt iframe
+   * @param {string} src
+   * @return {string}
+   */
+  getSandboxAttribute_(src) {
+    const sandbox = ['allow-scripts', 'allow-popups'];
+    const allowSameOrigin = this.allowSameOrigin_(src);
+    if (allowSameOrigin) {
+      sandbox.push('allow-same-origin');
+    }
+
+    const additional = this.getAdditionalSandboxAttributes_();
+    Array.prototype.push.apply(sandbox, additional);
+
+    return sandbox.join(' ');
+  }
+
   /**
    * Determines if allow-same-origin should be enabled for the prompt iframe
    * @param {string} src
@@ -486,6 +511,26 @@ export class ConsentUI {
     return srcUrl.origin != containerUrl.origin;
   }
 
+  /**
+   * Retrieve additional sandbox restrictions to be removed from the iframe.
+   * @return {Array<string>}
+   */
+  getAdditionalSandboxAttributes_() {
+    return (this.config_['sandbox'] || '')
+      .split(' ')
+      .filter(Boolean)
+      .filter((attribute) => {
+        const isAllowed = ALLOWED_SANDBOX_ATTRIBUTES.indexOf(attribute) !== -1;
+        if (!isAllowed) {
+          user().error(
+            TAG,
+            `The sandbox attribute "${attribute}" is not allowed`
+          );
+        }
+        return isAllowed;
+      });
+  }
+
   /**
    * Create the default placeholder
    * @return {!Element}
@@ -522,19 +567,20 @@ export class ConsentUI {
       return consentStateManager
         .getLastConsentInstanceInfo()
         .then((consentInfo) => {
-          return dict({
+          return {
             'clientConfig': this.clientConfig_,
             // consentState to be deprecated
             'consentState': getConsentStateValue(consentInfo['consentState']),
             'consentStateValue': getConsentStateValue(
               consentInfo['consentState']
             ),
+            'tcfPolicyVersion': consentInfo['tcfPolicyVersion'],
             'consentMetadata': consentInfo['consentMetadata'],
             'consentString': consentInfo['consentString'],
             'promptTrigger': this.isActionPromptTrigger_ ? 'action' : 'load',
             'isDirty': !!consentInfo['isDirty'],
             'purposeConsents': consentInfo['purposeConsents'],
-          });
+          };
         });
     });
   }
diff --git a/extensions/amp-consent/0.1/cookie-writer.js b/extensions/amp-consent/0.1/cookie-writer.js
index 625cacd80353..94754589f151 100644
--- a/extensions/amp-consent/0.1/cookie-writer.js
+++ b/extensions/amp-consent/0.1/cookie-writer.js
@@ -1,13 +1,17 @@
+import {isObject} from '#core/types';
+import {hasOwn} from '#core/types/object';
+
+import {Services} from '#service';
 import {BASE_CID_MAX_AGE_MILLIS} from '#service/cid-impl';
+
+import {user} from '#utils/log';
+
 import {ConsentLinkerReader} from './linker-reader';
-import {Services} from '#service';
-import {getMode} from '../../../src/mode';
-import {hasOwn} from '#core/types/object';
+
+import {setCookie} from '../../../src/cookies';
 import {isInFie} from '../../../src/iframe-helper';
-import {isObject} from '#core/types';
+import {getMode} from '../../../src/mode';
 import {isProxyOrigin} from '../../../src/url';
-import {setCookie} from '../../../src/cookies';
-import {user} from '#utils/log';
 
 const TAG = 'amp-consent/cookie-writer';
 
@@ -20,7 +24,7 @@ const RESERVED_KEYS = {
   'cookieDomain': true,
 };
 
-/** @const @type {!Object<string, boolean>} */
+/** @const @type {!{[key: string]: boolean}} */
 const CONSENT_COOKIE_WRITE_VARS_ALLOWED_LIST = {
   'LINKER_PARAM': true,
 };
diff --git a/extensions/amp-consent/0.1/linker-reader.js b/extensions/amp-consent/0.1/linker-reader.js
index a5e5a19e1ed5..766f51051876 100644
--- a/extensions/amp-consent/0.1/linker-reader.js
+++ b/extensions/amp-consent/0.1/linker-reader.js
@@ -1,8 +1,10 @@
 import {hasOwn} from '#core/types/object';
-import {parseLinker} from './linker';
 import {parseQueryString} from '#core/types/string/url';
+
 import {user} from '#utils/log';
 
+import {parseLinker} from './linker';
+
 const TAG = 'amp-consent/linker-reader';
 
 export class ConsentLinkerReader {
@@ -14,7 +16,7 @@ export class ConsentLinkerReader {
     /** @private {!Window} */
     this.win_ = win;
 
-    /** @private {!Object<string, ?Object<string, string>>} */
+    /** @private {!{[key: string]: ?{[key: string]: string}}} */
     this.linkerParams_ = {};
   }
 
@@ -46,7 +48,7 @@ export class ConsentLinkerReader {
    * if found, null otherwise. Do no remove LINKER_PARAM from
    * window location.
    * @param {string} name
-   * @return {?Object<string, string>}
+   * @return {?{[key: string]: string}}
    */
   maybeParseQueryString_(name) {
     const params = parseQueryString(this.win_.location.search);
diff --git a/extensions/amp-consent/0.1/linker.js b/extensions/amp-consent/0.1/linker.js
index 503361c938c0..ee192b118d25 100644
--- a/extensions/amp-consent/0.1/linker.js
+++ b/extensions/amp-consent/0.1/linker.js
@@ -1,11 +1,13 @@
-import {WindowInterface} from '#core/window/interface';
 import {
   base64UrlDecodeFromString,
   base64UrlEncodeFromString,
 } from '#core/types/string/base64';
-import {crc32} from './crc32';
+import {WindowInterface} from '#core/window/interface';
+
 import {user} from '#utils/log';
 
+import {crc32} from './crc32';
+
 /** @const {string} */
 const DELIMITER = '*';
 const KEY_VALIDATOR = /^[a-zA-Z0-9\-_.]+$/;
@@ -39,7 +41,7 @@ export function createLinker(version, ids) {
 /**
  * Return the key value pairs
  * @param {string} value
- * @return {?Object<string, string>}
+ * @return {?{[key: string]: string}}
  */
 export function parseLinker(value) {
   const linkerObj = parseLinkerParamValue(value);
@@ -154,7 +156,7 @@ function serialize(pairs) {
 /**
  * Deserialize the serializedIds and return keyValue pairs.
  * @param {string} serializedIds
- * @return {!Object<string, string>}
+ * @return {!{[key: string]: string}}
  */
 function deserialize(serializedIds) {
   const keyValuePairs = {};
diff --git a/extensions/amp-consent/0.1/tcf-api-command-manager.js b/extensions/amp-consent/0.1/tcf-api-command-manager.js
index 6459506ca05f..8d4eaab22f66 100644
--- a/extensions/amp-consent/0.1/tcf-api-command-manager.js
+++ b/extensions/amp-consent/0.1/tcf-api-command-manager.js
@@ -1,10 +1,11 @@
-import {ConsentPolicyManager} from './consent-policy-manager'; // eslint-disable-line no-unused-vars
-import {TCF_POST_MESSAGE_API_COMMANDS} from './consent-info';
-import {hasOwn, map} from '#core/types/object';
 import {isEnumValue, isObject} from '#core/types';
+import {hasOwn, map} from '#core/types/object';
 
 import {user} from '#utils/log';
 
+import {TCF_POST_MESSAGE_API_COMMANDS} from './consent-info';
+import {ConsentPolicyManager} from './consent-policy-manager'; // eslint-disable-line @typescript-eslint/no-unused-vars
+
 /**
  * Event status is only defined for addEventListener command.
  * @typedef {{
@@ -30,7 +31,9 @@ export let MinimalTcData;
 export let MinimalPingReturn;
 
 const TAG = 'amp-consent';
-const TCF_POLICY_VERSION = 2;
+//TODO: TCF_POLICY_VERSION_FALLBACK could be deleted after the full transition to the TCF v2.2
+const TCF_POLICY_VERSION_FALLBACK = 2;
+const TCF_API_VERSION = 2;
 const CMP_STATUS = 'loaded';
 const CMP_LOADED = true;
 const EVENT_STATUS = 'tcloaded';
@@ -44,7 +47,7 @@ export class TcfApiCommandManager {
     /** @private {!./consent-policy-manager.ConsentPolicyManager} */
     this.policyManager_ = policyManager;
 
-    /** @private {!Object<number, Object>} */
+    /** @private {!{[key: number]: Object}} */
     this.changeListeners_ = map();
 
     /** @private {?string} */
@@ -152,7 +155,8 @@ export class TcfApiCommandManager {
           consentPromises[0],
           consentPromises[1],
           newTcString,
-          listenerId
+          listenerId,
+          consentPromises[3]
         );
 
         this.sendTcfApiReturn_(win, returnValue, callId, true);
@@ -170,11 +174,14 @@ export class TcfApiCommandManager {
       this.policyManager_.getConsentMetadataInfo('default');
     const sharedDataPromise =
       this.policyManager_.getMergedSharedData('default');
+    const tcfPolicyVersionPromise =
+      this.policyManager_.getTcfPolicyVersion('default');
 
     return Promise.all([
       metadataPromise,
       sharedDataPromise,
       consentStringInfoPromise,
+      tcfPolicyVersionPromise,
     ]);
   }
 
@@ -186,7 +193,13 @@ export class TcfApiCommandManager {
    */
   handleGetTcData_(payload, win) {
     this.getTcDataPromises_().then((arr) => {
-      const returnValue = this.getMinimalTcData_(arr[0], arr[1], arr[2]);
+      const returnValue = this.getMinimalTcData_(
+        arr[0],
+        arr[1],
+        arr[2],
+        undefined,
+        arr[3]
+      );
       const {callId} = payload;
 
       this.sendTcfApiReturn_(win, returnValue, callId, true);
@@ -200,9 +213,16 @@ export class TcfApiCommandManager {
    * @param {?Object} sharedData
    * @param {?string} tcString
    * @param {number=} opt_listenerId
+   * @param {number=} opt_tcfPolicyVersion
    * @return {!MinimalTcData} policyManager
    */
-  getMinimalTcData_(metadata, sharedData, tcString, opt_listenerId) {
+  getMinimalTcData_(
+    metadata,
+    sharedData,
+    tcString,
+    opt_listenerId,
+    opt_tcfPolicyVersion
+  ) {
     const purposeOneTreatment = metadata ? metadata['purposeOne'] : undefined;
     const gdprApplies = metadata ? metadata['gdprApplies'] : undefined;
     const additionalConsent = metadata
@@ -211,7 +231,10 @@ export class TcfApiCommandManager {
     const additionalData = {...sharedData, additionalConsent};
 
     return {
-      tcfPolicyVersion: TCF_POLICY_VERSION,
+      tcfPolicyVersion:
+        typeof opt_tcfPolicyVersion == 'number'
+          ? opt_tcfPolicyVersion
+          : TCF_POLICY_VERSION_FALLBACK,
       gdprApplies,
       tcString,
       listenerId: opt_listenerId,
@@ -229,8 +252,13 @@ export class TcfApiCommandManager {
    * @param {!Window} win
    */
   handlePingEvent_(payload, win) {
-    this.policyManager_.getConsentMetadataInfo('default').then((metadata) => {
-      const returnValue = this.getMinimalPingReturn_(metadata);
+    const metadataPromise =
+      this.policyManager_.getConsentMetadataInfo('default');
+    const tcfPolicyVersionPromise =
+      this.policyManager_.getTcfPolicyVersion('default');
+
+    Promise.all([metadataPromise, tcfPolicyVersionPromise]).then((result) => {
+      const returnValue = this.getMinimalPingReturn_(result[0], result[1]);
       const {callId} = payload;
 
       this.sendTcfApiReturn_(win, returnValue, callId);
@@ -240,15 +268,19 @@ export class TcfApiCommandManager {
   /**
    * Create minimal PingReturn object.
    * @param {?Object} metadata
+   * @param {number=} opt_tcfPolicyVersion
    * @return {!MinimalPingReturn}
    */
-  getMinimalPingReturn_(metadata) {
+  getMinimalPingReturn_(metadata, opt_tcfPolicyVersion) {
     const gdprApplies = metadata ? metadata['gdprApplies'] : undefined;
     return {
       gdprApplies,
       cmpLoaded: CMP_LOADED,
       cmpStatus: CMP_STATUS,
-      tcfPolicyVersion: TCF_POLICY_VERSION,
+      tcfPolicyVersion:
+        typeof opt_tcfPolicyVersion == 'number'
+          ? opt_tcfPolicyVersion
+          : TCF_POLICY_VERSION_FALLBACK,
     };
   }
 
@@ -301,7 +333,7 @@ export class TcfApiCommandManager {
       );
       return false;
     }
-    if (version !== 2) {
+    if (version != TCF_API_VERSION) {
       user().error(TAG, `Found incorrect version in "tcfapiCall": ${version}`);
       return false;
     }
@@ -310,11 +342,12 @@ export class TcfApiCommandManager {
 
   /**
    * @param {?Object} metadata
+   * @param {number=} opt_tcfPolicyVersion
    * @return {!MinimalPingReturn}
    * @visibleForTesting
    */
-  getMinimalPingReturnForTesting(metadata) {
-    return this.getMinimalPingReturn_(metadata);
+  getMinimalPingReturnForTesting(metadata, opt_tcfPolicyVersion) {
+    return this.getMinimalPingReturn_(metadata, opt_tcfPolicyVersion);
   }
 
   /**
@@ -322,10 +355,23 @@ export class TcfApiCommandManager {
    * @param {?Object} sharedData
    * @param {?string} tcString
    * @param {number=} listenerId
+   * @param {number=} tcfPolicyVersion
    * @return {!MinimalPingReturn}
    * @visibleForTesting
    */
-  getMinimalTcDataForTesting(metadata, sharedData, tcString, listenerId) {
-    return this.getMinimalTcData_(metadata, sharedData, tcString, listenerId);
+  getMinimalTcDataForTesting(
+    metadata,
+    sharedData,
+    tcString,
+    listenerId,
+    tcfPolicyVersion
+  ) {
+    return this.getMinimalTcData_(
+      metadata,
+      sharedData,
+      tcString,
+      listenerId,
+      tcfPolicyVersion
+    );
   }
 }
diff --git a/extensions/amp-consent/0.1/test-e2e/test-amp-consent-client-side.js b/extensions/amp-consent/0.1/test-e2e/test-amp-consent-client-side.js
index 0e3697461de0..1121464959f1 100644
--- a/extensions/amp-consent/0.1/test-e2e/test-amp-consent-client-side.js
+++ b/extensions/amp-consent/0.1/test-e2e/test-amp-consent-client-side.js
@@ -1,10 +1,11 @@
+import {afterRenderPromise} from '#testing/helpers';
+
 import {
   findElements,
   resetAllElements,
   verifyElementsBuilt,
   verifyPromptsHidden,
 } from './common';
-import {afterRenderPromise} from '#testing/helpers';
 
 describes.endtoend(
   'amp-consent',
diff --git a/extensions/amp-consent/0.1/test-e2e/test-amp-consent-server-side-expire-cache.js b/extensions/amp-consent/0.1/test-e2e/test-amp-consent-server-side-expire-cache.js
index 4cf3199b9c8a..07c291c21fde 100644
--- a/extensions/amp-consent/0.1/test-e2e/test-amp-consent-server-side-expire-cache.js
+++ b/extensions/amp-consent/0.1/test-e2e/test-amp-consent-server-side-expire-cache.js
@@ -1,10 +1,11 @@
+import {awaitFrameAfter} from '#testing/helpers';
+
 import {
   findElements,
   resetAllElements,
   verifyElementsBuilt,
   verifyPromptsHidden,
 } from './common';
-import {awaitFrameAfter} from '#testing/helpers';
 
 describes.endtoend(
   'amp-consent',
diff --git a/extensions/amp-consent/0.1/test-e2e/test-amp-consent-server-side.js b/extensions/amp-consent/0.1/test-e2e/test-amp-consent-server-side.js
index 6ca79d63345e..d8835178ed48 100644
--- a/extensions/amp-consent/0.1/test-e2e/test-amp-consent-server-side.js
+++ b/extensions/amp-consent/0.1/test-e2e/test-amp-consent-server-side.js
@@ -1,10 +1,11 @@
+import {awaitFrameAfter} from '#testing/helpers';
+
 import {
   findElements,
   resetAllElements,
   verifyElementsBuilt,
   verifyPromptsHidden,
 } from './common';
-import {awaitFrameAfter} from '#testing/helpers';
 
 describes.endtoend(
   'amp-consent',
diff --git a/extensions/amp-consent/0.1/test-e2e/test-cmp-ui-interaction.js b/extensions/amp-consent/0.1/test-e2e/test-cmp-ui-interaction.js
index a88521018d18..a14b951804db 100644
--- a/extensions/amp-consent/0.1/test-e2e/test-cmp-ui-interaction.js
+++ b/extensions/amp-consent/0.1/test-e2e/test-cmp-ui-interaction.js
@@ -13,7 +13,8 @@ describes.endtoend(
       controller = env.controller;
     });
 
-    it('should restrict fullscreen until user interaction', async function () {
+    // TODO(#37403): fix this flaky test.
+    it.skip('should restrict fullscreen until user interaction', async function () {
       // Await the CMP to load
       await awaitFrameAfter(1000);
 
diff --git a/extensions/amp-consent/0.1/test/test-amp-consent.js b/extensions/amp-consent/0.1/test/test-amp-consent.js
index 85eaf33cecab..f367b84a6427 100644
--- a/extensions/amp-consent/0.1/test/test-amp-consent.js
+++ b/extensions/amp-consent/0.1/test/test-amp-consent.js
@@ -1,3 +1,17 @@
+import {CONSENT_STRING_TYPE} from '#core/constants/consent-state';
+
+import {xhrServiceForTesting} from '#service/xhr-impl';
+
+import {dev, user} from '#utils/log';
+
+import {macroTask, sleep} from '#testing/helpers';
+
+import {
+  registerServiceBuilder,
+  resetServiceForTesting,
+} from '../../../../src/service-helpers';
+import {removeSearch} from '../../../../src/url';
+import {GEO_IN_GROUP} from '../../../amp-geo/0.1/amp-geo-in-group';
 import {ACTION_TYPE, AmpConsent} from '../amp-consent';
 import {
   CONSENT_ITEM_STATE,
@@ -8,18 +22,7 @@ import {
   constructMetadata,
   getConsentStateValue,
 } from '../consent-info';
-import {CONSENT_STRING_TYPE} from '#core/constants/consent-state';
 import {ConsentStateManager} from '../consent-state-manager';
-import {GEO_IN_GROUP} from '../../../amp-geo/0.1/amp-geo-in-group';
-import {dev, user} from '#utils/log';
-import {dict} from '#core/types/object';
-import {macroTask} from '#testing/helpers';
-import {
-  registerServiceBuilder,
-  resetServiceForTesting,
-} from '../../../../src/service-helpers';
-import {removeSearch} from '../../../../src/url';
-import {xhrServiceForTesting} from '#service/xhr-impl';
 
 describes.realWin(
   'amp-consent',
@@ -116,7 +119,7 @@ describes.realWin(
         let consentElement;
 
         it('get consent/policy/postPromptUI config', async () => {
-          const config = dict({
+          const config = {
             'consentInstanceId': 'test',
             'checkConsentHref': '/override',
             'consentRequired': true,
@@ -124,7 +127,7 @@ describes.realWin(
               'test': 'ABC',
             },
             'postPromptUI': 'test',
-          });
+          };
           consentElement = createConsentElement(doc, config);
           const postPromptUI = document.createElement('div');
           postPromptUI.setAttribute('id', 'test');
@@ -146,13 +149,10 @@ describes.realWin(
 
         it('relative checkConsentHref is resolved', async () => {
           const fetchSpy = env.sandbox.spy(xhrServiceMock, 'fetchJson');
-          consentElement = createConsentElement(
-            doc,
-            dict({
-              'checkConsentHref': '/r/1',
-              'consentInstanceId': 'XYZ',
-            })
-          );
+          consentElement = createConsentElement(doc, {
+            'checkConsentHref': '/r/1',
+            'consentInstanceId': 'XYZ',
+          });
           const ampConsent = new AmpConsent(consentElement);
           doc.body.appendChild(consentElement);
           const getUrlStub = env.sandbox.stub(ampdoc, 'getUrl');
@@ -170,13 +170,10 @@ describes.realWin(
 
         it('supports checkConsentHref expansion', async () => {
           const fetchSpy = env.sandbox.spy(xhrServiceMock, 'fetchJson');
-          consentElement = createConsentElement(
-            doc,
-            dict({
-              'checkConsentHref': 'https://example.test?cid=CLIENT_ID&r=RANDOM',
-              'consentInstanceId': 'test',
-            })
-          );
+          consentElement = createConsentElement(doc, {
+            'checkConsentHref': 'https://example.test?cid=CLIENT_ID&r=RANDOM',
+            'consentInstanceId': 'test',
+          });
           const ampConsent = new AmpConsent(consentElement);
           doc.body.appendChild(consentElement);
           await ampConsent.buildCallback();
@@ -191,13 +188,13 @@ describes.realWin(
       let ampConsent;
       let consentElement;
       beforeEach(() => {
-        defaultConfig = dict({
+        defaultConfig = {
           'consents': {
             'ABC': {
               'checkConsentHref': 'https://response1',
             },
           },
-        });
+        };
         consentElement = createConsentElement(doc, defaultConfig);
         doc.body.appendChild(consentElement);
         ampConsent = new AmpConsent(consentElement);
@@ -473,6 +470,7 @@ describes.realWin(
               'abc': PURPOSE_CONSENT_STATE.ACCEPTED,
               'xyz': PURPOSE_CONSENT_STATE.REJECTED,
             },
+            'tcfPolicyVersion': undefined,
           });
         });
 
@@ -632,6 +630,7 @@ describes.realWin(
                   CONSENT_STRING_TYPE.TCF_V2,
                 [METADATA_STORAGE_KEY.ADDITIONAL_CONSENT]: '3~3.33.303',
               },
+              [STORAGE_KEY.VERSION]: 4,
             },
           };
           ampConsent = getAmpConsent(doc, inlineConfig);
@@ -656,6 +655,7 @@ describes.realWin(
               true
             ),
             'purposeConsents': undefined,
+            'tcfPolicyVersion': undefined,
           });
         });
 
@@ -720,6 +720,7 @@ describes.realWin(
                 [METADATA_STORAGE_KEY.CONSENT_STRING_TYPE]:
                   CONSENT_STRING_TYPE.TCF_V2,
               },
+              [STORAGE_KEY.VERSION]: 4,
             },
           };
           ampConsent = getAmpConsent(doc, inlineConfig);
@@ -739,6 +740,7 @@ describes.realWin(
             'isDirty': undefined,
             'consentMetadata': constructMetadata(CONSENT_STRING_TYPE.TCF_V2),
             'purposeConsents': undefined,
+            'tcfPolicyVersion': 4,
           });
         });
       });
@@ -788,6 +790,7 @@ describes.realWin(
             'isDirty': true,
             'consentMetadata': constructMetadata(CONSENT_STRING_TYPE.TCF_V2),
             'purposeConsents': {'abc': PURPOSE_CONSENT_STATE.ACCEPTED},
+            'tcfPolicyVersion': undefined,
           });
         });
 
@@ -825,22 +828,64 @@ describes.realWin(
             'isDirty': true,
             'consentMetadata': constructMetadata(CONSENT_STRING_TYPE.TCF_V2),
             'purposeConsents': undefined,
+            'tcfPolicyVersion': undefined,
           });
         });
       });
     });
 
+    describe('TCF Policy version', () => {
+      let ampConsent;
+
+      beforeEach(() => {
+        const defaultConfig = {
+          'consents': {
+            'ABC': {
+              'checkConsentHref': 'https://response1',
+            },
+          },
+        };
+        const consentElement = createConsentElement(doc, defaultConfig);
+        doc.body.appendChild(consentElement);
+        ampConsent = new AmpConsent(consentElement);
+      });
+
+      const invalidTCFPolicyVersionValues = [NaN, 2.2, 4.1, Infinity];
+
+      invalidTCFPolicyVersionValues.forEach((invalidTCFPolicyVersionValue) => {
+        it(
+          'should error and return undefined on invalid tcfPolicyVersion test with: ' +
+            invalidTCFPolicyVersionValue,
+          () => {
+            const spy = env.sandbox.stub(user(), 'error');
+            const tcfPolicyVersion = ampConsent.validateTCFPolicyVersion_(
+              invalidTCFPolicyVersionValue
+            );
+            expect(spy.args[0][1]).to.match(
+              /CMP tcfPolicyVersion must be a valid number \(integer\)\./
+            );
+            expect(tcfPolicyVersion).to.be.equal(undefined);
+          }
+        );
+      });
+
+      it('should return the value on invalid tcfPolicyVersion test', () => {
+        const tcfPolicyVersion = ampConsent.validateTCFPolicyVersion_(4);
+        expect(tcfPolicyVersion).to.be.equal(4);
+      });
+    });
+
     describe('consent metadata', () => {
       let ampConsent;
 
       beforeEach(() => {
-        const defaultConfig = dict({
+        const defaultConfig = {
           'consents': {
             'ABC': {
               'checkConsentHref': 'https://response1',
             },
           },
-        });
+        };
         const consentElement = createConsentElement(doc, defaultConfig);
         doc.body.appendChild(consentElement);
         ampConsent = new AmpConsent(consentElement);
@@ -866,7 +911,7 @@ describes.realWin(
 
       it('should remove invalid consentStringType', () => {
         const spy = env.sandbox.stub(user(), 'error');
-        const responseMetadata = {'consentStringType': 4};
+        const responseMetadata = {'consentStringType': 400};
         expect(ampConsent.validateMetadata_(responseMetadata)).to.deep.equals(
           constructMetadata()
         );
@@ -923,14 +968,11 @@ describes.realWin(
 
       describe('config', () => {
         it('shoud expose if in config', async () => {
-          consentElement = createConsentElement(
-            doc,
-            dict({
-              'consentInstanceId': 'abc',
-              'checkConsentHref': 'https://response1',
-              'exposesTcfApi': true,
-            })
-          );
+          consentElement = createConsentElement(doc, {
+            'consentInstanceId': 'abc',
+            'checkConsentHref': 'https://response1',
+            'exposesTcfApi': true,
+          });
           doc.body.appendChild(consentElement);
           ampConsent = new AmpConsent(consentElement);
           await ampConsent.buildCallback();
@@ -953,14 +995,11 @@ describes.realWin(
             'https://server-test-2/':
               '{"consentRequired": true, "consentStateValue": "accepted", "consentString": "mystring"}',
           };
-          consentElement = createConsentElement(
-            doc,
-            dict({
-              'consentInstanceId': 'abc',
-              'checkConsentHref': 'https://server-test-2/',
-              'exposesTcfApi': true,
-            })
-          );
+          consentElement = createConsentElement(doc, {
+            'consentInstanceId': 'abc',
+            'checkConsentHref': 'https://server-test-2/',
+            'exposesTcfApi': true,
+          });
           doc.body.appendChild(consentElement);
           ampConsent = new AmpConsent(consentElement);
           ampVideoIframe = document.createElement('amp-video-iframe');
@@ -1014,13 +1053,13 @@ describes.realWin(
       let ampConsent;
       let consentElement;
       beforeEach(() => {
-        defaultConfig = dict({
+        defaultConfig = {
           'consents': {
             'ABC': {
               'promptIfUnknownForGeoGroup': 'testGroup',
             },
           },
-        });
+        };
         consentElement = createConsentElement(doc, defaultConfig);
       });
 
@@ -1045,17 +1084,14 @@ describes.realWin(
 
       it('geo override promptIfUnknown', async () => {
         ISOCountryGroups = ['unknown'];
-        consentElement = createConsentElement(
-          doc,
-          dict({
-            'consents': {
-              'ABC': {
-                'checkConsentHref': 'https://response1',
-                'promptIfUnknownForGeoGroup': 'testGroup',
-              },
+        consentElement = createConsentElement(doc, {
+          'consents': {
+            'ABC': {
+              'checkConsentHref': 'https://response1',
+              'promptIfUnknownForGeoGroup': 'testGroup',
             },
-          })
-        );
+          },
+        });
         doc.body.appendChild(consentElement);
         ampConsent = new AmpConsent(consentElement);
         await ampConsent.buildCallback();
@@ -1073,13 +1109,13 @@ describes.realWin(
       let iframe;
       let consentElement;
       beforeEach(() => {
-        defaultConfig = dict({
+        defaultConfig = {
           'consents': {
             'ABC': {
               'checkConsentHref': 'https://response1',
             },
           },
-        });
+        };
         consentElement = createConsentElement(doc, defaultConfig);
         doc.body.appendChild(consentElement);
         ampConsent = new AmpConsent(consentElement);
@@ -1125,7 +1161,7 @@ describes.realWin(
 
         beforeEach(async () => {
           ampConsent.buildCallback();
-          await macroTask();
+          await sleep(50);
           managerSpy = env.sandbox.spy(
             ampConsent.consentStateManager_,
             'updateConsentInstancePurposes'
@@ -1234,7 +1270,7 @@ describes.realWin(
       let postPromptUI;
 
       beforeEach(() => {
-        defaultConfig = dict({
+        defaultConfig = {
           'consents': {
             'ABC': {
               'checkConsentHref': 'https://response1',
@@ -1242,7 +1278,7 @@ describes.realWin(
             },
           },
           'postPromptUI': 'test',
-        });
+        };
         consentElement = createConsentElement(doc, defaultConfig);
         uiElement = document.createElement('div');
         uiElement.setAttribute('id', '123');
@@ -1388,11 +1424,11 @@ describes.realWin(
 
         describe('hide/show postPromptUI with local storage', () => {
           beforeEach(() => {
-            defaultConfig = dict({
+            defaultConfig = {
               'consentInstanceId': 'ABC',
               'consentRequired': true,
               'postPromptUI': 'test2',
-            });
+            };
             consentElement = createConsentElement(doc, defaultConfig);
             postPromptUI = doc.createElement('div');
             postPromptUI.setAttribute('id', 'test2');
@@ -1433,7 +1469,7 @@ describes.realWin(
 
         describe('hide/show postPromptUI', () => {
           beforeEach(() => {
-            defaultConfig = dict({
+            defaultConfig = {
               'consents': {
                 'ABC': {
                   'checkConsentHref': 'https://response3',
@@ -1442,7 +1478,7 @@ describes.realWin(
               // There's already an amp-consent from a parent beforeEach with a
               // test postPromptUI
               'postPromptUI': 'test2',
-            });
+            };
             consentElement = createConsentElement(doc, defaultConfig);
             postPromptUI = doc.createElement('div');
             postPromptUI.setAttribute('id', 'test2');
@@ -1488,9 +1524,9 @@ describes.realWin(
           'https://server-test-3/':
             '{"consentRequired": true, "purposeConsentRequired": "verybad"}',
         };
-        defaultConfig = dict({
+        defaultConfig = {
           'consentInstanceId': 'abc',
-        });
+        };
       });
 
       describe('purposeConsentRequired', () => {
diff --git a/extensions/amp-consent/0.1/test/test-consent-config.js b/extensions/amp-consent/0.1/test/test-consent-config.js
index e6befa15f703..f5ea8d0ce1d5 100644
--- a/extensions/amp-consent/0.1/test/test-consent-config.js
+++ b/extensions/amp-consent/0.1/test/test-consent-config.js
@@ -1,25 +1,35 @@
 import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';
+
+import {Services} from '#service';
+
+import {macroTask} from '#testing/helpers';
+
+import {GEO_IN_GROUP} from '../../../amp-geo/0.1/amp-geo-in-group';
 import {
   ConsentConfig,
   expandConsentEndpointUrl,
   expandPolicyConfig,
 } from '../consent-config';
-import {GEO_IN_GROUP} from '../../../amp-geo/0.1/amp-geo-in-group';
-import {Services} from '#service';
-import {dict} from '#core/types/object';
-import {macroTask} from '#testing/helpers';
 
-describes.realWin('ConsentConfig', {amp: 1}, (env) => {
+const realWinConfig = {
+  amp: {
+    canonicalUrl: 'https://foobar.com/baz',
+    runtimeOn: true,
+    ampdoc: 'single',
+  },
+};
+
+describes.realWin('ConsentConfig', realWinConfig, (env) => {
   let doc;
   let element;
   let defaultConfig;
   beforeEach(() => {
     doc = env.win.document;
     element = doc.createElement('div');
-    defaultConfig = dict({
+    defaultConfig = {
       'consentInstanceId': 'ABC',
       'checkConsentHref': 'https://response1',
-    });
+    };
   });
 
   function appendConfigScriptElement(doc, element, config) {
@@ -35,17 +45,15 @@ describes.realWin('ConsentConfig', {amp: 1}, (env) => {
       const consentConfig = new ConsentConfig(element);
       return expect(
         consentConfig.getConsentConfigPromise()
-      ).to.eventually.deep.equal(
-        dict({
-          'consentInstanceId': 'ABC',
-          'checkConsentHref': 'https://response1',
-          'consentRequired': 'remote',
-        })
-      );
+      ).to.eventually.deep.equal({
+        'consentInstanceId': 'ABC',
+        'checkConsentHref': 'https://response1',
+        'consentRequired': 'remote',
+      });
     });
 
     it('read cmp config', async () => {
-      appendConfigScriptElement(doc, element, dict({}));
+      appendConfigScriptElement(doc, element, {});
       element.setAttribute('type', '_ping_');
       const consentConfig = new ConsentConfig(element);
       // Make a deep copy of the config to avoid error when deleting fields
@@ -57,16 +65,14 @@ describes.realWin('ConsentConfig', {amp: 1}, (env) => {
       // Remove non deterministic field.
       delete config['checkConsentHref'];
       delete config['promptUISrc'];
-      expect(config).to.deep.equal(
-        dict({
-          'consentInstanceId': '_ping_',
-          'consentRequired': 'remote',
-        })
-      );
+      expect(config).to.deep.equal({
+        'consentInstanceId': '_ping_',
+        'consentRequired': 'remote',
+      });
     });
 
     it('should ignore promptUISrc w/ amp-story-consent', async () => {
-      appendConfigScriptElement(doc, element, dict({}));
+      appendConfigScriptElement(doc, element, {});
       element.setAttribute('type', '_ping_');
       element.appendChild(doc.createElement('amp-story-consent'));
       const expectedError =
@@ -79,28 +85,24 @@ describes.realWin('ConsentConfig', {amp: 1}, (env) => {
     });
 
     it('converts deprecated format to new format', async () => {
-      appendConfigScriptElement(
-        doc,
-        element,
-        dict({
-          'consents': {
-            'ABC': {
-              'promptIfUnknownForGeoGroup': 'eea',
-              'checkConsentHref': '/href',
-              'clientConfig': {
-                'test': 'error',
-              },
+      appendConfigScriptElement(doc, element, {
+        'consents': {
+          'ABC': {
+            'promptIfUnknownForGeoGroup': 'eea',
+            'checkConsentHref': '/href',
+            'clientConfig': {
+              'test': 'error',
             },
           },
-          'clientConfig': {
-            'test': 'ABC',
-          },
-          'uiConfig': {
-            'overlay': true,
-          },
-          'postPromptUI': 'test',
-        })
-      );
+        },
+        'clientConfig': {
+          'test': 'ABC',
+        },
+        'uiConfig': {
+          'overlay': true,
+        },
+        'postPromptUI': 'test',
+      });
       env.sandbox.stub(Services, 'geoForDocOrNull').returns(
         Promise.resolve({
           isInCountryGroup() {
@@ -109,46 +111,40 @@ describes.realWin('ConsentConfig', {amp: 1}, (env) => {
         })
       );
       const consentConfig = new ConsentConfig(element);
-      expect(await consentConfig.getConsentConfigPromise()).to.deep.equal(
-        dict({
-          'consentInstanceId': 'ABC',
-          'promptIfUnknownForGeoGroup': 'eea',
-          'checkConsentHref': '/href',
-          'clientConfig': {
-            'test': 'ABC',
-          },
-          'consentRequired': false,
-          'uiConfig': {
-            'overlay': true,
-          },
-          'postPromptUI': 'test',
-        })
-      );
+      expect(await consentConfig.getConsentConfigPromise()).to.deep.equal({
+        'consentInstanceId': 'ABC',
+        'promptIfUnknownForGeoGroup': 'eea',
+        'checkConsentHref': '/href',
+        'clientConfig': {
+          'test': 'ABC',
+        },
+        'consentRequired': false,
+        'uiConfig': {
+          'overlay': true,
+        },
+        'postPromptUI': 'test',
+      });
     });
 
     it('converts deprecated format to with consentRequired true', async () => {
-      appendConfigScriptElement(
-        doc,
-        element,
-        dict({
-          'consents': {
-            'ABC': {
-              'promptIfUnknownForGeoGroup': 'eea',
-              'checkConsentHref': '/href',
-              'clientConfig': {
-                'test': 'error',
-              },
+      appendConfigScriptElement(doc, element, {
+        'consents': {
+          'ABC': {
+            'promptIfUnknownForGeoGroup': 'eea',
+            'checkConsentHref': '/href',
+            'clientConfig': {
+              'test': 'error',
             },
           },
-          'clientConfig': {
-            'test': 'ABC',
-          },
-          'uiConfig': {
-            'overlay': true,
-          },
-          'postPromptUI': 'test',
-        })
-      );
+        },
+        'clientConfig': {
+          'test': 'ABC',
+        },
+        'uiConfig': {
+          'overlay': true,
+        },
+        'postPromptUI': 'test',
+      });
       env.sandbox.stub(Services, 'geoForDocOrNull').returns(
         Promise.resolve({
           isInCountryGroup() {
@@ -157,45 +153,39 @@ describes.realWin('ConsentConfig', {amp: 1}, (env) => {
         })
       );
       const consentConfig = new ConsentConfig(element);
-      expect(await consentConfig.getConsentConfigPromise()).to.deep.equal(
-        dict({
-          'consentInstanceId': 'ABC',
-          'promptIfUnknownForGeoGroup': 'eea',
-          'checkConsentHref': '/href',
-          'clientConfig': {
-            'test': 'ABC',
-          },
-          'consentRequired': true,
-          'uiConfig': {
-            'overlay': true,
-          },
-          'postPromptUI': 'test',
-        })
-      );
+      expect(await consentConfig.getConsentConfigPromise()).to.deep.equal({
+        'consentInstanceId': 'ABC',
+        'promptIfUnknownForGeoGroup': 'eea',
+        'checkConsentHref': '/href',
+        'clientConfig': {
+          'test': 'ABC',
+        },
+        'consentRequired': true,
+        'uiConfig': {
+          'overlay': true,
+        },
+        'postPromptUI': 'test',
+      });
     });
 
     it('merge inline config w/ cmp config', async () => {
-      appendConfigScriptElement(
-        doc,
-        element,
-        dict({
-          'consentInstanceId': '_ping_',
-          'promptIfUnknownForGeoGroup': 'eea',
-          'checkConsentHref': '/override',
-          'clientConfig': {
-            'test': 'ABC',
-          },
-          'uiConfig': {
-            'overlay': true,
-          },
-          'policy': {
-            'default': {
-              'waitFor': {},
-            },
+      appendConfigScriptElement(doc, element, {
+        'consentInstanceId': '_ping_',
+        'promptIfUnknownForGeoGroup': 'eea',
+        'checkConsentHref': '/override',
+        'clientConfig': {
+          'test': 'ABC',
+        },
+        'uiConfig': {
+          'overlay': true,
+        },
+        'policy': {
+          'default': {
+            'waitFor': {},
           },
-          'postPromptUI': 'test',
-        })
-      );
+        },
+        'postPromptUI': 'test',
+      });
       env.sandbox.stub(Services, 'geoForDocOrNull').returns(
         Promise.resolve({
           isInCountryGroup() {
@@ -211,26 +201,24 @@ describes.realWin('ConsentConfig', {amp: 1}, (env) => {
       );
       expect(config['promptUISrc']).to.match(/diy-consent.html/);
       delete config['promptUISrc'];
-      expect(config).to.deep.equal(
-        dict({
-          'consentInstanceId': '_ping_',
-          'checkConsentHref': '/override',
-          'consentRequired': false,
-          'promptIfUnknownForGeoGroup': 'eea',
-          'postPromptUI': 'test',
-          'clientConfig': {
-            'test': 'ABC',
-          },
-          'uiConfig': {
-            'overlay': true,
-          },
-          'policy': {
-            'default': {
-              'waitFor': {},
-            },
+      expect(config).to.deep.equal({
+        'consentInstanceId': '_ping_',
+        'checkConsentHref': '/override',
+        'consentRequired': false,
+        'promptIfUnknownForGeoGroup': 'eea',
+        'postPromptUI': 'test',
+        'clientConfig': {
+          'test': 'ABC',
+        },
+        'uiConfig': {
+          'overlay': true,
+        },
+        'policy': {
+          'default': {
+            'waitFor': {},
           },
-        })
-      );
+        },
+      });
     });
 
     describe('geoOverride config', () => {
@@ -504,17 +492,13 @@ describes.realWin('ConsentConfig', {amp: 1}, (env) => {
     });
 
     it('remove not supported policy', async () => {
-      appendConfigScriptElement(
-        doc,
-        element,
-        dict({
-          'consentInstanceId': 'ABC',
-          'checkConsentHref': 'example.test/',
-          'policy': {
-            'ABC': undefined,
-          },
-        })
-      );
+      appendConfigScriptElement(doc, element, {
+        'consentInstanceId': 'ABC',
+        'checkConsentHref': 'example.test/',
+        'policy': {
+          'ABC': undefined,
+        },
+      });
       const consentConfig = new ConsentConfig(element);
       expect(await consentConfig.getConsentConfigPromise()).to.deep.equal({
         'consentInstanceId': 'ABC',
@@ -530,6 +514,8 @@ describes.realWin('ConsentConfig', {amp: 1}, (env) => {
       const url = await expandConsentEndpointUrl(
         doc.body,
         'https://example.test?' +
+          // CANONICAL_URL is allowed
+          'canonicalurl=CANONICAL_URL&' +
           // CLIENT_ID is allowed
           'cid=CLIENT_ID&' +
           // PAGE_VIEW_ID is allowed
@@ -543,7 +529,7 @@ describes.realWin('ConsentConfig', {amp: 1}, (env) => {
       );
 
       expect(url).to.match(
-        /cid=amp-.{22}&pid=[0-9]+&pid64=.{22}&sourceurl=about%3Asrcdoc&r=RANDOM/
+        /canonicalurl=https%3A%2F%2Ffoobar.com%2Fbaz&cid=amp-.{22}&pid=[0-9]+&pid64=.{22}&sourceurl=about%3Asrcdoc&r=RANDOM/
       );
     });
 
@@ -576,7 +562,7 @@ describes.realWin('ConsentConfig', {amp: 1}, (env) => {
 
   describe('expandPolicyConfig', () => {
     it('create default policy', () => {
-      const policy = expandPolicyConfig(dict({}), 'ABC');
+      const policy = expandPolicyConfig({}, 'ABC');
       expect(policy['default']).to.deep.equal({
         'waitFor': {
           'ABC': undefined,
@@ -585,7 +571,7 @@ describes.realWin('ConsentConfig', {amp: 1}, (env) => {
     });
 
     it('create predefined _till_responded policy', function* () {
-      const policy = expandPolicyConfig(dict({}), 'ABC');
+      const policy = expandPolicyConfig({}, 'ABC');
       expect(policy['_till_responded']).to.deep.equal({
         'waitFor': {
           'ABC': undefined,
@@ -600,7 +586,7 @@ describes.realWin('ConsentConfig', {amp: 1}, (env) => {
     });
 
     it('create predefined _till_accepted policy', function* () {
-      const policy = expandPolicyConfig(dict({}), 'ABC');
+      const policy = expandPolicyConfig({}, 'ABC');
       expect(policy['_till_accepted']).to.deep.equal({
         'waitFor': {
           'ABC': undefined,
@@ -609,7 +595,7 @@ describes.realWin('ConsentConfig', {amp: 1}, (env) => {
     });
 
     it('create default _auto_reject policy', function* () {
-      const policy = expandPolicyConfig(dict({}), 'ABC');
+      const policy = expandPolicyConfig({}, 'ABC');
       expect(policy['_auto_reject']).to.deep.equal({
         'waitFor': {
           'ABC': undefined,
@@ -629,14 +615,14 @@ describes.realWin('ConsentConfig', {amp: 1}, (env) => {
 
     it('override default policy', function* () {
       const policy = expandPolicyConfig(
-        dict({
+        {
           'default': {
             'waitFor': {
               'ABC': [],
             },
             'timeout': 2,
           },
-        }),
+        },
         'ABC'
       );
       expect(policy['default']).to.deep.equal({
diff --git a/extensions/amp-consent/0.1/test/test-consent-info.js b/extensions/amp-consent/0.1/test/test-consent-info.js
index a475a472ede6..7b95da01a6b6 100644
--- a/extensions/amp-consent/0.1/test/test-consent-info.js
+++ b/extensions/amp-consent/0.1/test/test-consent-info.js
@@ -1,3 +1,5 @@
+import {CONSENT_STRING_TYPE} from '#core/constants/consent-state';
+
 import {
   CONSENT_ITEM_STATE,
   METADATA_STORAGE_KEY,
@@ -11,42 +13,37 @@ import {
   isConsentInfoStoredValueSame,
   recalculateConsentStateValue,
 } from '../consent-info';
-import {CONSENT_STRING_TYPE} from '#core/constants/consent-state';
-import {dict} from '#core/types/object';
 
 describes.fakeWin('ConsentInfo', {}, () => {
   describe('getStoredConsentInfo', () => {
     it('construct consentInfo from undefined', () => {
-      expect(getStoredConsentInfo(undefined)).to.deep.equal(
-        dict({
-          'consentState': CONSENT_ITEM_STATE.UNKNOWN,
-          'consentString': undefined,
-          'consentMetadata': undefined,
-          'purposeConsents': undefined,
-          'isDirty': undefined,
-        })
-      );
+      expect(getStoredConsentInfo(undefined)).to.deep.equal({
+        'consentState': CONSENT_ITEM_STATE.UNKNOWN,
+        'consentString': undefined,
+        'consentMetadata': undefined,
+        'purposeConsents': undefined,
+        'isDirty': undefined,
+        'tcfPolicyVersion': undefined,
+      });
     });
 
     it('construct consentInfo from legacy value', () => {
-      expect(getStoredConsentInfo(true)).to.deep.equal(
-        dict({
-          'consentState': CONSENT_ITEM_STATE.ACCEPTED,
-          'consentString': undefined,
-          'consentMetadata': undefined,
-          'purposeConsents': undefined,
-          'isDirty': undefined,
-        })
-      );
-      expect(getStoredConsentInfo(false)).to.deep.equal(
-        dict({
-          'consentState': CONSENT_ITEM_STATE.REJECTED,
-          'consentString': undefined,
-          'consentMetadata': undefined,
-          'purposeConsents': undefined,
-          'isDirty': undefined,
-        })
-      );
+      expect(getStoredConsentInfo(true)).to.deep.equal({
+        'consentState': CONSENT_ITEM_STATE.ACCEPTED,
+        'consentString': undefined,
+        'consentMetadata': undefined,
+        'purposeConsents': undefined,
+        'isDirty': undefined,
+        'tcfPolicyVersion': undefined,
+      });
+      expect(getStoredConsentInfo(false)).to.deep.equal({
+        'consentState': CONSENT_ITEM_STATE.REJECTED,
+        'consentString': undefined,
+        'consentMetadata': undefined,
+        'purposeConsents': undefined,
+        'isDirty': undefined,
+        'tcfPolicyVersion': undefined,
+      });
     });
 
     it('construct consentInfo from stored value', () => {
@@ -54,48 +51,47 @@ describes.fakeWin('ConsentInfo', {}, () => {
         getStoredConsentInfo({
           's': 1,
         })
-      ).to.deep.equal(
-        dict({
-          'consentState': CONSENT_ITEM_STATE.ACCEPTED,
-          'consentString': undefined,
-          'consentMetadata': constructMetadata(),
-          'purposeConsents': undefined,
-          'isDirty': undefined,
-        })
-      );
+      ).to.deep.equal({
+        'consentState': CONSENT_ITEM_STATE.ACCEPTED,
+        'consentString': undefined,
+        'consentMetadata': constructMetadata(),
+        'purposeConsents': undefined,
+        'isDirty': undefined,
+        'tcfPolicyVersion': undefined,
+      });
       expect(
         getStoredConsentInfo({
           's': 0,
           'r': 'test',
+          'e': 4,
         })
-      ).to.deep.equal(
-        dict({
-          'consentState': CONSENT_ITEM_STATE.REJECTED,
-          'consentString': 'test',
-          'consentMetadata': constructMetadata(),
-          'purposeConsents': undefined,
-          'isDirty': undefined,
-        })
-      );
+      ).to.deep.equal({
+        'consentState': CONSENT_ITEM_STATE.REJECTED,
+        'consentString': 'test',
+        'consentMetadata': constructMetadata(),
+        'purposeConsents': undefined,
+        'isDirty': undefined,
+        'tcfPolicyVersion': 4,
+      });
       expect(
         getStoredConsentInfo({
           's': 0,
           'r': 'test',
           'm': {},
         })
-      ).to.deep.equal(
-        dict({
-          'consentState': CONSENT_ITEM_STATE.REJECTED,
-          'consentString': 'test',
-          'isDirty': undefined,
-          'purposeConsents': undefined,
-          'consentMetadata': constructMetadata(),
-        })
-      );
+      ).to.deep.equal({
+        'consentState': CONSENT_ITEM_STATE.REJECTED,
+        'consentString': 'test',
+        'isDirty': undefined,
+        'purposeConsents': undefined,
+        'consentMetadata': constructMetadata(),
+        'tcfPolicyVersion': undefined,
+      });
       expect(
         getStoredConsentInfo({
           's': 0,
           'r': 'test',
+          'e': 4,
           'm': {
             [METADATA_STORAGE_KEY.CONSENT_STRING_TYPE]:
               CONSENT_STRING_TYPE.TCF_V2,
@@ -103,19 +99,18 @@ describes.fakeWin('ConsentInfo', {}, () => {
             [METADATA_STORAGE_KEY.GDPR_APPLIES]: false,
           },
         })
-      ).to.deep.equal(
-        dict({
-          'consentState': CONSENT_ITEM_STATE.REJECTED,
-          'consentString': 'test',
-          'isDirty': undefined,
-          'purposeConsents': undefined,
-          'consentMetadata': constructMetadata(
-            CONSENT_STRING_TYPE.TCF_V2,
-            '1~1.35.41.101',
-            false
-          ),
-        })
-      );
+      ).to.deep.equal({
+        'consentState': CONSENT_ITEM_STATE.REJECTED,
+        'consentString': 'test',
+        'isDirty': undefined,
+        'purposeConsents': undefined,
+        'consentMetadata': constructMetadata(
+          CONSENT_STRING_TYPE.TCF_V2,
+          '1~1.35.41.101',
+          false
+        ),
+        'tcfPolicyVersion': 4,
+      });
       expect(
         getStoredConsentInfo({
           's': -1,
@@ -127,18 +122,17 @@ describes.fakeWin('ConsentInfo', {}, () => {
           },
           'd': 1,
         })
-      ).to.deep.equal(
-        dict({
-          'consentState': CONSENT_ITEM_STATE.UNKNOWN,
-          'consentString': 'test',
-          'isDirty': true,
-          'purposeConsents': undefined,
-          'consentMetadata': constructMetadata(
-            CONSENT_STRING_TYPE.TCF_V2,
-            '1~1.35.41.101'
-          ),
-        })
-      );
+      ).to.deep.equal({
+        'consentState': CONSENT_ITEM_STATE.UNKNOWN,
+        'consentString': 'test',
+        'isDirty': true,
+        'purposeConsents': undefined,
+        'consentMetadata': constructMetadata(
+          CONSENT_STRING_TYPE.TCF_V2,
+          '1~1.35.41.101'
+        ),
+        'tcfPolicyVersion': undefined,
+      });
       expect(
         getStoredConsentInfo({
           's': -1,
@@ -149,18 +143,17 @@ describes.fakeWin('ConsentInfo', {}, () => {
           },
           'd': 1,
         })
-      ).to.deep.equal(
-        dict({
-          'consentState': CONSENT_ITEM_STATE.UNKNOWN,
-          'consentString': 'test',
-          'isDirty': true,
-          'purposeConsents': {
-            'abc': PURPOSE_CONSENT_STATE.ACCEPTED,
-            'xyz': PURPOSE_CONSENT_STATE.REJECTED,
-          },
-          'consentMetadata': constructMetadata(),
-        })
-      );
+      ).to.deep.equal({
+        'consentState': CONSENT_ITEM_STATE.UNKNOWN,
+        'consentString': 'test',
+        'isDirty': true,
+        'purposeConsents': {
+          'abc': PURPOSE_CONSENT_STATE.ACCEPTED,
+          'xyz': PURPOSE_CONSENT_STATE.REJECTED,
+        },
+        'consentMetadata': constructMetadata(),
+        'tcfPolicyVersion': undefined,
+      });
     });
 
     it('construct ConsentMetadataDef from stored value', () => {
@@ -169,48 +162,47 @@ describes.fakeWin('ConsentInfo', {}, () => {
         'additionalConsent': undefined,
         'gdprApplies': undefined,
         'purposeOne': undefined,
+        'gppSectionId': undefined,
       });
       expect(
         convertStorageMetadata({
           [METADATA_STORAGE_KEY.CONSENT_STRING_TYPE]:
             CONSENT_STRING_TYPE.US_PRIVACY_STRING,
         })
-      ).to.deep.equal(
-        dict({
-          'consentStringType': CONSENT_STRING_TYPE.US_PRIVACY_STRING,
-          'additionalConsent': undefined,
-          'gdprApplies': undefined,
-          'purposeOne': undefined,
-        })
-      );
+      ).to.deep.equal({
+        'consentStringType': CONSENT_STRING_TYPE.US_PRIVACY_STRING,
+        'additionalConsent': undefined,
+        'gdprApplies': undefined,
+        'purposeOne': undefined,
+        'gppSectionId': undefined,
+      });
       expect(
         convertStorageMetadata({
           undefined,
           [METADATA_STORAGE_KEY.ADDITIONAL_CONSENT]: '1~1.35.41.101',
         })
-      ).to.deep.equal(
-        dict({
-          'consentStringType': undefined,
-          'additionalConsent': '1~1.35.41.101',
-          'gdprApplies': undefined,
-          'purposeOne': undefined,
-        })
-      );
+      ).to.deep.equal({
+        'consentStringType': undefined,
+        'additionalConsent': '1~1.35.41.101',
+        'gdprApplies': undefined,
+        'purposeOne': undefined,
+        'gppSectionId': undefined,
+      });
       expect(
         convertStorageMetadata({
           [METADATA_STORAGE_KEY.CONSENT_STRING_TYPE]:
             CONSENT_STRING_TYPE.US_PRIVACY_STRING,
           [METADATA_STORAGE_KEY.ADDITIONAL_CONSENT]: '1~1.35.41.101',
           [METADATA_STORAGE_KEY.PURPOSE_ONE]: true,
+          [METADATA_STORAGE_KEY.GPP_SECTION_ID]: '8',
         })
-      ).to.deep.equal(
-        dict({
-          'consentStringType': CONSENT_STRING_TYPE.US_PRIVACY_STRING,
-          'additionalConsent': '1~1.35.41.101',
-          'gdprApplies': undefined,
-          'purposeOne': true,
-        })
-      );
+      ).to.deep.equal({
+        'consentStringType': CONSENT_STRING_TYPE.US_PRIVACY_STRING,
+        'additionalConsent': '1~1.35.41.101',
+        'gdprApplies': undefined,
+        'purposeOne': true,
+        'gppSectionId': '8',
+      });
     });
 
     it('throw error with invalid value', () => {
@@ -317,6 +309,19 @@ describes.fakeWin('ConsentInfo', {}, () => {
           [METADATA_STORAGE_KEY.GDPR_APPLIES]: false,
         },
       });
+      consentInfo['tcfPolicyVersion'] = 4;
+      expect(composeStoreValue(consentInfo)).to.deep.equal({
+        's': 0,
+        'e': 4,
+        'r': 'test',
+        'd': 1,
+        'm': {
+          [METADATA_STORAGE_KEY.CONSENT_STRING_TYPE]:
+            CONSENT_STRING_TYPE.TCF_V1,
+          [METADATA_STORAGE_KEY.ADDITIONAL_CONSENT]: '1~1.35.41.101',
+          [METADATA_STORAGE_KEY.GDPR_APPLIES]: false,
+        },
+      });
     });
 
     it('add field only when defined for metadata', () => {
@@ -456,6 +461,7 @@ describes.fakeWin('ConsentInfo', {}, () => {
         'additionalConsent': undefined,
         'gdprApplies': undefined,
         'purposeOne': undefined,
+        'gppSectionId': undefined,
       });
       expect(
         constructMetadata(CONSENT_STRING_TYPE.US_PRIVACY_STRING)
@@ -464,12 +470,14 @@ describes.fakeWin('ConsentInfo', {}, () => {
         'additionalConsent': undefined,
         'gdprApplies': undefined,
         'purposeOne': undefined,
+        'gppSectionId': undefined,
       });
       expect(constructMetadata(undefined, '1~1.35.41.101')).to.deep.equal({
         'consentStringType': undefined,
         'additionalConsent': '1~1.35.41.101',
         'gdprApplies': undefined,
         'purposeOne': undefined,
+        'gppSectionId': undefined,
       });
       expect(
         constructMetadata(undefined, undefined, true, false)
@@ -478,19 +486,22 @@ describes.fakeWin('ConsentInfo', {}, () => {
         'additionalConsent': undefined,
         'gdprApplies': true,
         'purposeOne': false,
+        'gppSectionId': undefined,
       });
       expect(
         constructMetadata(
           CONSENT_STRING_TYPE.US_PRIVACY_STRING,
           '1~1.35.41.101',
           true,
-          true
+          true,
+          undefined
         )
       ).to.deep.equal({
         'consentStringType': CONSENT_STRING_TYPE.US_PRIVACY_STRING,
         'additionalConsent': '1~1.35.41.101',
         'gdprApplies': true,
         'purposeOne': true,
+        'gppSectionId': undefined,
       });
     });
   });
diff --git a/extensions/amp-consent/0.1/test/test-consent-policy-manager.js b/extensions/amp-consent/0.1/test/test-consent-policy-manager.js
index 071b1d845af0..3bd0cd6f99f7 100644
--- a/extensions/amp-consent/0.1/test/test-consent-policy-manager.js
+++ b/extensions/amp-consent/0.1/test/test-consent-policy-manager.js
@@ -1,26 +1,27 @@
 import * as fakeTimers from '@sinonjs/fake-timers';
-import {
-  CONSENT_ITEM_STATE,
-  PURPOSE_CONSENT_STATE,
-  constructConsentInfo,
-  constructMetadata,
-} from '../consent-info';
+
 import {
   CONSENT_POLICY_STATE,
   CONSENT_STRING_TYPE,
 } from '#core/constants/consent-state';
-import {
-  ConsentPolicyInstance,
-  ConsentPolicyManager,
-} from '../consent-policy-manager';
-import {dict} from '#core/types/object';
-import {expandPolicyConfig} from '../consent-config';
+
 import {macroTask} from '#testing/helpers';
 
 import {
   registerServiceBuilder,
   resetServiceForTesting,
 } from '../../../../src/service-helpers';
+import {expandPolicyConfig} from '../consent-config';
+import {
+  CONSENT_ITEM_STATE,
+  PURPOSE_CONSENT_STATE,
+  constructConsentInfo,
+  constructMetadata,
+} from '../consent-info';
+import {
+  ConsentPolicyInstance,
+  ConsentPolicyManager,
+} from '../consent-policy-manager';
 
 describes.realWin(
   'ConsentPolicyManager',
@@ -54,11 +55,9 @@ describes.realWin(
             return Promise.resolve();
           },
           getConsentInstanceSharedData: () => {
-            return Promise.resolve(
-              dict({
-                'shared': 'test',
-              })
-            );
+            return Promise.resolve({
+              'shared': 'test',
+            });
           },
         });
       });
@@ -211,7 +210,7 @@ describes.realWin(
           manager = new ConsentPolicyManager(ampdoc);
           consentInfo = constructConsentInfo(CONSENT_ITEM_STATE.UNKNOWN);
           manager.setLegacyConsentInstanceId('ABC');
-          policy = expandPolicyConfig(dict({}), 'ABC');
+          policy = expandPolicyConfig({}, 'ABC');
           const keys = Object.keys(policy);
           for (let i = 0; i < keys.length; i++) {
             manager.registerConsentPolicyInstance(keys[i], policy[keys[i]]);
@@ -406,7 +405,7 @@ describes.realWin(
           manager = new ConsentPolicyManager(ampdoc);
           consentInfo = constructConsentInfo(CONSENT_ITEM_STATE.UNKNOWN);
           manager.setLegacyConsentInstanceId('ABC');
-          policy = expandPolicyConfig(dict({}), 'ABC');
+          policy = expandPolicyConfig({}, 'ABC');
           const keys = Object.keys(policy);
           for (let i = 0; i < keys.length; i++) {
             manager.registerConsentPolicyInstance(keys[i], policy[keys[i]]);
@@ -640,6 +639,40 @@ describes.realWin(
       });
     });
 
+    describe('getTcfPolicyVersion', () => {
+      let manager;
+
+      beforeEach(() => {
+        manager = new ConsentPolicyManager(ampdoc);
+        manager.setLegacyConsentInstanceId('ABC');
+        env.sandbox
+          .stub(ConsentPolicyInstance.prototype, 'getReadyPromise')
+          .callsFake(() => {
+            return Promise.resolve();
+          });
+        consentInfo = constructConsentInfo(
+          CONSENT_ITEM_STATE.ACCEPTED,
+          'test',
+          undefined,
+          undefined,
+          undefined,
+          4
+        );
+      });
+
+      it('should return tcf policy version value from state manager', async () => {
+        manager.registerConsentPolicyInstance('default', {
+          'waitFor': {
+            'ABC': undefined,
+          },
+        });
+        await macroTask();
+        await expect(
+          manager.getTcfPolicyVersion('default')
+        ).to.eventually.be.equal(4);
+      });
+    });
+
     describe('getConsentMetadataInfo', () => {
       let manager;
 
diff --git a/extensions/amp-consent/0.1/test/test-consent-state-manager.js b/extensions/amp-consent/0.1/test/test-consent-state-manager.js
index 24b0aa97445a..a3db07ba8665 100644
--- a/extensions/amp-consent/0.1/test/test-consent-state-manager.js
+++ b/extensions/amp-consent/0.1/test/test-consent-state-manager.js
@@ -1,19 +1,23 @@
-import {
-  CONSENT_ITEM_STATE,
-  PURPOSE_CONSENT_STATE,
-  composeStoreValue,
-  constructConsentInfo,
-  constructMetadata,
-} from '../consent-info';
 import {CONSENT_STRING_TYPE} from '#core/constants/consent-state';
-import {ConsentInstance, ConsentStateManager} from '../consent-state-manager';
+
 import {Services} from '#service';
+
 import {dev} from '#utils/log';
+
 import {macroTask} from '#testing/helpers';
+
 import {
   registerServiceBuilder,
   resetServiceForTesting,
 } from '../../../../src/service-helpers';
+import {
+  CONSENT_ITEM_STATE,
+  PURPOSE_CONSENT_STATE,
+  composeStoreValue,
+  constructConsentInfo,
+  constructMetadata,
+} from '../consent-info';
+import {ConsentInstance, ConsentStateManager} from '../consent-state-manager';
 
 describes.realWin('ConsentStateManager', {amp: 1}, (env) => {
   let win;
@@ -602,7 +606,9 @@ describes.realWin('ConsentStateManager', {amp: 1}, (env) => {
           constructMetadata(
             CONSENT_STRING_TYPE.US_PRIVACY_STRING,
             '3~3.33.33.303'
-          )
+          ),
+          undefined,
+          4
         );
         await macroTask();
         expect(requestSpy).to.be.calledTwice;
@@ -618,6 +624,7 @@ describes.realWin('ConsentStateManager', {amp: 1}, (env) => {
             '3~3.33.33.303'
           )
         );
+        expect(requestBody.tcfPolicyVersion).to.equal(4);
       });
 
       it('support onUpdateHref expansion', function* () {
@@ -662,7 +669,7 @@ describes.realWin('ConsentStateManager', {amp: 1}, (env) => {
         expect(requestBody.consentString).to.undefined;
       });
 
-      it('send update request on local stroage removal', async () => {
+      it('send update request on local storage removal', async () => {
         const testConsentInfo = constructConsentInfo(
           CONSENT_ITEM_STATE.ACCEPTED,
           'test',
diff --git a/extensions/amp-consent/0.1/test/test-consent-ui.js b/extensions/amp-consent/0.1/test/test-consent-ui.js
index 3023b51a6ea1..49fefd376081 100644
--- a/extensions/amp-consent/0.1/test/test-consent-ui.js
+++ b/extensions/amp-consent/0.1/test/test-consent-ui.js
@@ -1,22 +1,26 @@
 import * as fakeTimers from '@sinonjs/fake-timers';
-import {
-  CONSENT_ITEM_STATE,
-  PURPOSE_CONSENT_STATE,
-  constructConsentInfo,
-  constructMetadata,
-} from '../consent-info';
+
 import {CONSENT_STRING_TYPE} from '#core/constants/consent-state';
-import {ConsentUI, consentUiClasses} from '../consent-ui';
-import {Services} from '#service';
-import {dict} from '#core/types/object';
 import {elementByTag} from '#core/dom/query';
+
+import {Services} from '#service';
+
+import {user} from '#utils/log';
+
 import {macroTask} from '#testing/helpers';
+import {whenCalled} from '#testing/helpers/service';
+
 import {
   registerServiceBuilder,
   resetServiceForTesting,
 } from '../../../../src/service-helpers';
-import {user} from '#utils/log';
-import {whenCalled} from '#testing/helpers/service';
+import {
+  CONSENT_ITEM_STATE,
+  PURPOSE_CONSENT_STATE,
+  constructConsentInfo,
+  constructMetadata,
+} from '../consent-info';
+import {ConsentUI, consentUiClasses} from '../consent-ui';
 
 describes.realWin(
   'consent-ui',
@@ -100,9 +104,9 @@ describes.realWin(
     });
 
     const getReadyIframeCmpConsentUi = () => {
-      const config = dict({
+      const config = {
         'promptUISrc': 'https://promptUISrc',
-      });
+      };
       const consentUI = new ConsentUI(mockInstance, config);
       const showIframeSpy = env.sandbox.spy(consentUI, 'showIframe_');
       consentUI.show(false);
@@ -120,38 +124,88 @@ describes.realWin(
       it('should repsect postPromptUI if there is one', function* () {
         consentUI = new ConsentUI(
           mockInstance,
-          dict({'promptUI': 'test1'}),
+          {'promptUI': 'test1'},
           'testPost'
         );
         expect(consentUI.ui_.id).to.equal('testPost');
       });
 
       it('should ignore promptUISrc w/ promptUI', function* () {
-        const config = dict({
+        const config = {
           'promptUI': 'test1',
           'promptUISrc': 'https://promptUISrc',
-        });
+        };
         consentUI = new ConsentUI(mockInstance, config);
         expect(consentUI.ui_.id).to.equal('test1');
       });
 
       it('should create iframe from promptUISrc', function* () {
-        const config = dict({
+        const config = {
           'promptUISrc': 'https://promptUISrc',
-        });
+        };
         consentUI = new ConsentUI(mockInstance, config);
         expect(consentUI.ui_.tagName).to.equal('IFRAME');
         expect(consentUI.ui_.getAttribute('sandbox')).to.equal(
           'allow-scripts allow-popups allow-same-origin'
         );
+        expect(consentUI.ui_.getAttribute('allow')).to.equal(
+          'geolocation; payment'
+        );
+      });
+
+      it('should allow additional sandbox restriction to be removed from iframe', function* () {
+        const config = {
+          'promptUISrc': 'https://promptUISrc',
+          'sandbox': 'allow-top-navigation-by-user-activation',
+        };
+        consentUI = new ConsentUI(mockInstance, config);
+        expect(consentUI.ui_.tagName).to.equal('IFRAME');
+        expect(consentUI.ui_.getAttribute('sandbox')).to.equal(
+          'allow-scripts allow-popups allow-same-origin allow-top-navigation-by-user-activation'
+        );
+      });
+
+      it('should allow multiple additional sandbox restrictions to be removed from iframe', function* () {
+        const config = {
+          'promptUISrc': 'https://promptUISrc',
+          'sandbox':
+            'allow-popups-to-escape-sandbox allow-top-navigation-by-user-activation',
+        };
+        consentUI = new ConsentUI(mockInstance, config);
+        expect(consentUI.ui_.tagName).to.equal('IFRAME');
+        expect(consentUI.ui_.getAttribute('sandbox')).to.equal(
+          'allow-scripts allow-popups allow-same-origin allow-popups-to-escape-sandbox allow-top-navigation-by-user-activation'
+        );
+      });
+
+      it('should show an error when invalid sandbox attributes are specified', function* () {
+        const errorSpy = env.sandbox.spy(user(), 'error');
+
+        const config = {
+          'promptUISrc': 'https://promptUISrc',
+          'sandbox': 'allow-top-navigation',
+        };
+        consentUI = new ConsentUI(mockInstance, config);
+
+        expect(consentUI.ui_.tagName).to.equal('IFRAME');
+        expect(consentUI.ui_.getAttribute('sandbox')).to.equal(
+          'allow-scripts allow-popups allow-same-origin'
+        );
+
+        expect(errorSpy).to.be.calledOnce;
+        expect(errorSpy.args[0][1]).to.match(
+          /The sandbox attribute "allow-top-navigation" is not allowed/
+        );
+
+        errorSpy.resetHistory();
       });
     });
 
     describe('show/hide', () => {
       it('toggle display', () => {
-        const config = dict({
+        const config = {
           'promptUI': 'test1',
-        });
+        };
         consentUI = new ConsentUI(mockInstance, config);
         expect(parent.classList.contains('amp-active')).to.be.false;
         expect(parent.classList.contains('amp-hidden')).to.be.false;
@@ -167,9 +221,9 @@ describes.realWin(
       });
 
       it('should support pause/resume lifecycle', () => {
-        const config = dict({
+        const config = {
           'promptUI': 'test1',
-        });
+        };
         consentUI = new ConsentUI(mockInstance, config);
         consentUI.show(false);
         expect(ownersStubs.scheduleLayout).to.be.calledOnce;
@@ -187,9 +241,9 @@ describes.realWin(
       });
 
       it('append/remove iframe', async () => {
-        const config = dict({
+        const config = {
           'promptUISrc': 'https://promptUISrc',
-        });
+        };
         consentUI = new ConsentUI(mockInstance, config);
         const clock = fakeTimers.withGlobal(win).install();
 
@@ -219,9 +273,9 @@ describes.realWin(
       });
 
       it('should not lock scrolling', () => {
-        const config = dict({
+        const config = {
           'promptUISrc': 'https://promptUISrc',
-        });
+        };
         consentUI = new ConsentUI(mockInstance, config);
 
         expect(consentUI.scrollEnabled_).to.be.true;
@@ -242,9 +296,9 @@ describes.realWin(
       });
 
       it('should set the iframe transform class on parent', async () => {
-        const config = dict({
+        const config = {
           'promptUISrc': 'https://promptUISrc',
-        });
+        };
         consentUI = new ConsentUI(mockInstance, config);
 
         consentUI.show(false);
@@ -268,9 +322,9 @@ describes.realWin(
 
     describe('placeholder', () => {
       it('should be created / shown while loading CMP Iframe', async () => {
-        const config = dict({
+        const config = {
           'promptUISrc': 'https://promptUISrc',
-        });
+        };
         consentUI = new ConsentUI(mockInstance, config);
 
         const placeholder = consentUI.placeholder_;
@@ -290,9 +344,9 @@ describes.realWin(
 
     describe('CMP Iframe', () => {
       it('should load the iframe, then show it with correct state CSS classes', async () => {
-        const config = dict({
+        const config = {
           'promptUISrc': 'https://promptUISrc',
-        });
+        };
         consentUI = new ConsentUI(mockInstance, config);
         expect(parent).to.not.have.class('amp-active');
         expect(parent).to.not.have.class('amp-hidden');
@@ -316,7 +370,7 @@ describes.realWin(
       });
 
       it('should expand the promptUISrc', async () => {
-        const config = dict({
+        const config = {
           'promptUISrc':
             'https://example.test/?' +
             'cid=CLIENT_ID&' +
@@ -326,7 +380,7 @@ describes.realWin(
           'clientConfig': {
             'test': 'ABC',
           },
-        });
+        };
         consentUI = new ConsentUI(mockInstance, config);
         consentUI.show(false);
         await macroTask();
@@ -344,12 +398,12 @@ describes.realWin(
       });
 
       it("should pass info into iframe's name", async () => {
-        const config = dict({
+        const config = {
           'promptUISrc': 'https://promptUISrc',
           'clientConfig': {
             'test': 'ABC',
           },
-        });
+        };
         consentUI = new ConsentUI(mockInstance, config);
         consentUI.show(false);
         await macroTask();
@@ -374,12 +428,12 @@ describes.realWin(
       });
 
       it('should pass the promptTrigger reason to the iframe', function* () {
-        const config = dict({
+        const config = {
           'promptUISrc': 'https://promptUISrc',
           'clientConfig': {
             'test': 'ABC',
           },
-        });
+        };
         consentUI = new ConsentUI(mockInstance, config);
         consentUI.show(true);
         yield macroTask();
@@ -644,10 +698,10 @@ describes.realWin(
 
     describe('overlay', () => {
       it('should not enable the overlay if not configured', function* () {
-        const config = dict({
+        const config = {
           'promptUISrc': 'https://promptUISrc',
           'uiConfig': {},
-        });
+        };
         consentUI = new ConsentUI(mockInstance, config);
         // Mock out load Iframe_
         consentUI.loadIframe_ = () => {
@@ -662,12 +716,12 @@ describes.realWin(
       });
 
       it('append/hide/show overlay', function* () {
-        const config = dict({
+        const config = {
           'promptUISrc': 'https://promptUISrc',
           'uiConfig': {
             'overlay': true,
           },
-        });
+        };
         consentUI = new ConsentUI(mockInstance, config);
         // Mock out load Iframe_
         consentUI.loadIframe_ = () => {
diff --git a/extensions/amp-consent/0.1/test/test-cookie-writer.js b/extensions/amp-consent/0.1/test/test-cookie-writer.js
index d142557b3400..353ae62b46fb 100644
--- a/extensions/amp-consent/0.1/test/test-cookie-writer.js
+++ b/extensions/amp-consent/0.1/test/test-cookie-writer.js
@@ -1,7 +1,7 @@
-import * as cookie from '../../../../src/cookies';
 import * as fakeTimers from '@sinonjs/fake-timers';
+
+import * as cookie from '../../../../src/cookies';
 import {CookieWriter} from '../cookie-writer';
-import {dict} from '#core/types/object';
 
 const TAG = '[amp-consent/cookie-writer]';
 
@@ -32,7 +32,7 @@ describes.realWin(
       let expandAndWriteSpy;
 
       it('Resolve when no config', () => {
-        const config = dict({});
+        const config = {};
         const cookieWriter = new CookieWriter(win, element, config);
         expandAndWriteSpy = env.sandbox.spy(cookieWriter, 'expandAndWrite_');
         return cookieWriter.write().then(() => {
@@ -41,9 +41,9 @@ describes.realWin(
       });
 
       it('Resovle when config is invalid', () => {
-        const config = dict({
+        const config = {
           'cookies': 'invalid',
-        });
+        };
         expectAsyncConsoleError(TAG + ' cookies config must be an object');
         const cookieWriter = new CookieWriter(win, element, config);
         expandAndWriteSpy = env.sandbox.spy(cookieWriter, 'expandAndWrite_');
@@ -53,13 +53,13 @@ describes.realWin(
       });
 
       it('Resolve when element is in FIE', () => {
-        const config = dict({
+        const config = {
           'cookies': {
             'testId': {
               'value': 'test',
             },
           },
-        });
+        };
         const parent = doc.createElement('div');
         parent.classList.add('i-amphtml-fie');
         doc.body.appendChild(parent);
@@ -72,13 +72,13 @@ describes.realWin(
       });
 
       it('Resolve when in viewer', () => {
-        const config = dict({
+        const config = {
           'cookies': {
             'testId': {
               'value': 'test',
             },
           },
-        });
+        };
         const mockWin = {
           location: 'https://www-example-com.cdn.ampproject.org',
         };
@@ -90,14 +90,14 @@ describes.realWin(
       });
 
       it('Resolve when disabled', () => {
-        const config = dict({
+        const config = {
           'cookies': {
             'testId': {
               'value': 'test',
             },
             'enabled': false,
           },
-        });
+        };
         const cookieWriter = new CookieWriter(win, element, config);
         expandAndWriteSpy = env.sandbox.spy(cookieWriter, 'expandAndWrite_');
         return cookieWriter.write().then(() => {
@@ -106,9 +106,9 @@ describes.realWin(
       });
 
       it('Resolve with nothing to write', () => {
-        const config = dict({
+        const config = {
           'cookies': {},
-        });
+        };
         const cookieWriter = new CookieWriter(win, element, config);
         expandAndWriteSpy = env.sandbox.spy(cookieWriter, 'expandAndWrite_');
         return cookieWriter.write().then(() => {
@@ -117,11 +117,11 @@ describes.realWin(
       });
 
       it('Resolve with invalid cookieValue (not object)', () => {
-        const config = dict({
+        const config = {
           'cookies': {
             'testId': 'test',
           },
-        });
+        };
         const cookieWriter = new CookieWriter(win, element, config);
         expandAndWriteSpy = env.sandbox.spy(cookieWriter, 'expandAndWrite_');
         return cookieWriter.write().then(() => {
@@ -130,13 +130,13 @@ describes.realWin(
       });
 
       it('Resolve when no value in cookieValue object', () => {
-        const config = dict({
+        const config = {
           'cookies': {
             'testId': {
               'invalidKey': 'test',
             },
           },
-        });
+        };
         const cookieWriter = new CookieWriter(win, element, config);
         expandAndWriteSpy = env.sandbox.spy(cookieWriter, 'expandAndWrite_');
         return cookieWriter.write().then(() => {
@@ -145,13 +145,13 @@ describes.realWin(
       });
 
       it('Ignore reserved keys', () => {
-        const config = dict({
+        const config = {
           'cookies': {
             'cookiePath': {
               'value': 'test',
             },
           },
-        });
+        };
         const cookieWriter = new CookieWriter(win, element, config);
         expandAndWriteSpy = env.sandbox.spy(cookieWriter, 'expandAndWrite_');
         return cookieWriter.write().then(() => {
@@ -179,23 +179,19 @@ describes.fakeWin('amp-consent.cookie-writer value', {amp: true}, (env) => {
 
   it('should read value from only LINKER_PARAM', () => {
     win.location = 'https://example.test/?a=123&b=567';
-    const cookieWriter = new CookieWriter(
-      win,
-      win.document.body,
-      dict({
-        'cookies': {
-          'aCookie': {
-            'value': 'QUERY_PARAM(a)',
-          },
-          'bCookie': {
-            'value': 'LINKER_PARAM(b,c)',
-          },
-          'testId1': {
-            'value': 'static',
-          },
+    const cookieWriter = new CookieWriter(win, win.document.body, {
+      'cookies': {
+        'aCookie': {
+          'value': 'QUERY_PARAM(a)',
         },
-      })
-    );
+        'bCookie': {
+          'value': 'LINKER_PARAM(b,c)',
+        },
+        'testId1': {
+          'value': 'static',
+        },
+      },
+    });
 
     env.sandbox
       .stub(cookieWriter.linkerReader_, 'get')
@@ -213,17 +209,13 @@ describes.fakeWin('amp-consent.cookie-writer value', {amp: true}, (env) => {
 
   it('should write cookie under eTLD+1 domain with right exp.', () => {
     win.location = 'https://www.example.test/?a=123&b=567';
-    const cookieWriter = new CookieWriter(
-      win,
-      win.document.body,
-      dict({
-        'cookies': {
-          'aCookie': {
-            'value': 'test',
-          },
+    const cookieWriter = new CookieWriter(win, win.document.body, {
+      'cookies': {
+        'aCookie': {
+          'value': 'test',
         },
-      })
-    );
+      },
+    });
     return cookieWriter.write().then(() => {
       expect(win.document.lastSetCookieRaw).to.equal(
         'aCookie=test; path=/; domain=example.test; ' +
@@ -234,18 +226,14 @@ describes.fakeWin('amp-consent.cookie-writer value', {amp: true}, (env) => {
 
   it('should write cookie with custom expiration (number value)', () => {
     win.location = 'https://www.example.test/';
-    const cookieWriter = new CookieWriter(
-      win,
-      win.document.body,
-      dict({
-        'cookies': {
-          'cookieMaxAge': 604800, // 1 week in seconds
-          'aCookie': {
-            'value': 'testValue',
-          },
+    const cookieWriter = new CookieWriter(win, win.document.body, {
+      'cookies': {
+        'cookieMaxAge': 604800, // 1 week in seconds
+        'aCookie': {
+          'value': 'testValue',
         },
-      })
-    );
+      },
+    });
     return cookieWriter.write().then(() => {
       expect(win.document.lastSetCookieRaw).to.equal(
         'aCookie=testValue; path=/; domain=example.test; ' +
@@ -256,18 +244,14 @@ describes.fakeWin('amp-consent.cookie-writer value', {amp: true}, (env) => {
 
   it('should write cookie with custom expiration (string value)', () => {
     win.location = 'https://www.example.test/';
-    const cookieWriter = new CookieWriter(
-      win,
-      win.document.body,
-      dict({
-        'cookies': {
-          'cookieMaxAge': '604800', // 1 week in seconds
-          'aCookie': {
-            'value': 'testValue',
-          },
+    const cookieWriter = new CookieWriter(win, win.document.body, {
+      'cookies': {
+        'cookieMaxAge': '604800', // 1 week in seconds
+        'aCookie': {
+          'value': 'testValue',
         },
-      })
-    );
+      },
+    });
     return cookieWriter.write().then(() => {
       expect(win.document.lastSetCookieRaw).to.equal(
         'aCookie=testValue; path=/; domain=example.test; ' +
@@ -278,18 +262,14 @@ describes.fakeWin('amp-consent.cookie-writer value', {amp: true}, (env) => {
 
   it('should write cookie with custom expiration (decimal value)', () => {
     win.location = 'https://www.example.test/';
-    const cookieWriter = new CookieWriter(
-      win,
-      win.document.body,
-      dict({
-        'cookies': {
-          'cookieMaxAge': 604800.000123,
-          'aCookie': {
-            'value': 'testValue',
-          },
+    const cookieWriter = new CookieWriter(win, win.document.body, {
+      'cookies': {
+        'cookieMaxAge': 604800.000123,
+        'aCookie': {
+          'value': 'testValue',
         },
-      })
-    );
+      },
+    });
 
     return cookieWriter.write().then(() => {
       expect(win.document.lastSetCookieRaw).to.equal(
@@ -301,18 +281,14 @@ describes.fakeWin('amp-consent.cookie-writer value', {amp: true}, (env) => {
 
   it('should write cookie with custom expiration (zero value)', () => {
     win.location = 'https://www.example.test/';
-    const cookieWriter = new CookieWriter(
-      win,
-      win.document.body,
-      dict({
-        'cookies': {
-          'cookieMaxAge': 0,
-          'aCookie': {
-            'value': 'testValue',
-          },
+    const cookieWriter = new CookieWriter(win, win.document.body, {
+      'cookies': {
+        'cookieMaxAge': 0,
+        'aCookie': {
+          'value': 'testValue',
         },
-      })
-    );
+      },
+    });
     return cookieWriter.write().then(() => {
       expect(win.document.lastSetCookieRaw).to.equal(
         'aCookie=testValue; path=/; domain=example.test; ' +
@@ -323,18 +299,14 @@ describes.fakeWin('amp-consent.cookie-writer value', {amp: true}, (env) => {
 
   it('should write cookie with custom expiration (negative value)', () => {
     win.location = 'https://www.example.test/';
-    const cookieWriter = new CookieWriter(
-      win,
-      win.document.body,
-      dict({
-        'cookies': {
-          'cookieMaxAge': -604800,
-          'aCookie': {
-            'value': 'testValue',
-          },
+    const cookieWriter = new CookieWriter(win, win.document.body, {
+      'cookies': {
+        'cookieMaxAge': -604800,
+        'aCookie': {
+          'value': 'testValue',
         },
-      })
-    );
+      },
+    });
     return cookieWriter.write().then(() => {
       expect(win.document.lastSetCookieRaw).to.equal(
         'aCookie=testValue; path=/; domain=example.test; ' +
@@ -345,18 +317,14 @@ describes.fakeWin('amp-consent.cookie-writer value', {amp: true}, (env) => {
 
   it('should write cookie with default expiration (invalid string value)', () => {
     win.location = 'https://www.example.test/';
-    const cookieWriter = new CookieWriter(
-      win,
-      win.document.body,
-      dict({
-        'cookies': {
-          'cookieMaxAge': 'invalid',
-          'aCookie': {
-            'value': 'testValue',
-          },
+    const cookieWriter = new CookieWriter(win, win.document.body, {
+      'cookies': {
+        'cookieMaxAge': 'invalid',
+        'aCookie': {
+          'value': 'testValue',
         },
-      })
-    );
+      },
+    });
     return allowConsoleError(() => {
       return cookieWriter.write().then(() => {
         expect(win.document.lastSetCookieRaw).to.equal(
@@ -369,17 +337,13 @@ describes.fakeWin('amp-consent.cookie-writer value', {amp: true}, (env) => {
 
   it('should not write empty cookie', () => {
     win.location = 'https://www.example.test/?a=123&b=567';
-    const cookieWriter = new CookieWriter(
-      win,
-      win.document.body,
-      dict({
-        'cookies': {
-          'cCookie': {
-            'value': '',
-          },
+    const cookieWriter = new CookieWriter(win, win.document.body, {
+      'cookies': {
+        'cCookie': {
+          'value': '',
         },
-      })
-    );
+      },
+    });
     return cookieWriter.write().then(() => {
       expect(win.document.cookie).to.equal('');
       expect(win.document.lastSetCookieRaw).to.be.undefined;
@@ -388,17 +352,13 @@ describes.fakeWin('amp-consent.cookie-writer value', {amp: true}, (env) => {
 
   it('should not write cookie if macro is mal-formatted', () => {
     win.location = 'https://www.example.test/?a=123&b=567';
-    const cookieWriter = new CookieWriter(
-      win,
-      win.document.body,
-      dict({
-        'cookies': {
-          'aCookie': {
-            'value': 'LINKER_PARAM(b)',
-          },
+    const cookieWriter = new CookieWriter(win, win.document.body, {
+      'cookies': {
+        'aCookie': {
+          'value': 'LINKER_PARAM(b)',
         },
-      })
-    );
+      },
+    });
     expectAsyncConsoleError(/LINKER_PARAM requires two params, name and id/);
     return cookieWriter.write().then(() => {
       expect(win.document.cookie).to.equal('');
diff --git a/extensions/amp-consent/0.1/test/test-linker-reader.js b/extensions/amp-consent/0.1/test/test-linker-reader.js
index 7830697b29f1..5d43a4f85ecb 100644
--- a/extensions/amp-consent/0.1/test/test-linker-reader.js
+++ b/extensions/amp-consent/0.1/test/test-linker-reader.js
@@ -1,6 +1,7 @@
-import {ConsentLinkerReader} from '../linker-reader';
 import {mockWindowInterface} from '#testing/helpers/service';
 
+import {ConsentLinkerReader} from '../linker-reader';
+
 describes.realWin('LinkerReader', {amp: true}, (env) => {
   let linkerReader;
   let mockWin;
diff --git a/extensions/amp-consent/0.1/test/test-linker.js b/extensions/amp-consent/0.1/test/test-linker.js
index 45dc01095d6a..0a06938da2d0 100644
--- a/extensions/amp-consent/0.1/test/test-linker.js
+++ b/extensions/amp-consent/0.1/test/test-linker.js
@@ -1,6 +1,7 @@
-import {createLinker, parseLinker} from '../linker';
 import {mockWindowInterface} from '#testing/helpers/service';
 
+import {createLinker, parseLinker} from '../linker';
+
 const TAG = '[amp-consent/linker]';
 
 const BASE_TIME = 1533329483292;
diff --git a/extensions/amp-consent/0.1/test/test-tcf-api-command-manager.js b/extensions/amp-consent/0.1/test/test-tcf-api-command-manager.js
index e906e5a8fe33..dfd27b3031bc 100644
--- a/extensions/amp-consent/0.1/test/test-tcf-api-command-manager.js
+++ b/extensions/amp-consent/0.1/test/test-tcf-api-command-manager.js
@@ -1,7 +1,9 @@
-import {TcfApiCommandManager} from '../tcf-api-command-manager';
+import {user} from '#utils/log';
+
 import {macroTask} from '#testing/helpers';
 import {mockWindowInterface} from '#testing/helpers/service';
-import {user} from '#utils/log';
+
+import {TcfApiCommandManager} from '../tcf-api-command-manager';
 
 describes.realWin(
   'tcf api commands',
@@ -20,6 +22,7 @@ describes.realWin(
       let msg;
       let tcfApiCommandManager;
       let mockTcString;
+      let mockTcfPolicyVersion;
       let mockSharedData;
       let callId;
 
@@ -29,6 +32,7 @@ describes.realWin(
         mockMetadata = {};
         mockSharedData = {};
         mockTcString = '';
+        mockTcfPolicyVersion = null;
         mockPolicyManager = {
           getConsentMetadataInfo: (opt_policy) => {
             return Promise.resolve(mockMetadata);
@@ -39,6 +43,9 @@ describes.realWin(
           getMergedSharedData: (opt_policy) => {
             return Promise.resolve(mockSharedData);
           },
+          getTcfPolicyVersion: (opt_policy) => {
+            return Promise.resolve(mockTcfPolicyVersion);
+          },
           setOnPolicyChange: env.sandbox.spy(),
         };
       });
@@ -112,12 +119,12 @@ describes.realWin(
           mockMetadata = getMetadata(false);
           tcfApiCommandManager = new TcfApiCommandManager(mockPolicyManager);
           expect(
-            tcfApiCommandManager.getMinimalPingReturnForTesting(mockMetadata)
+            tcfApiCommandManager.getMinimalPingReturnForTesting(mockMetadata, 4)
           ).to.deep.equals({
             gdprApplies: false,
             cmpLoaded: true,
             cmpStatus: 'loaded',
-            tcfPolicyVersion: 2,
+            tcfPolicyVersion: 4,
           });
         });
 
@@ -187,16 +194,19 @@ describes.realWin(
           });
 
           mockTcString = 'abc123';
+          mockTcfPolicyVersion = 4;
           mockSharedData = {'data': 'data1'};
 
           expect(
             tcfApiCommandManager.getMinimalTcDataForTesting(
               mockMetadata,
               mockSharedData,
-              mockTcString
+              mockTcString,
+              undefined,
+              mockTcfPolicyVersion
             )
           ).to.deep.equals({
-            tcfPolicyVersion: 2,
+            tcfPolicyVersion: mockTcfPolicyVersion,
             gdprApplies: false,
             tcString: mockTcString,
             listenerId: undefined,
@@ -207,11 +217,40 @@ describes.realWin(
           });
         });
 
+        it('sends a minimal TcData via PostMessage without tcfPolicyVersion stored - fallback to tcfPolicyVersion 2', async () => {
+          callId = 'getTcDataId';
+          data = getData('getTCData', callId);
+          mockMetadata = getMetadata(false, 'xyz987', false);
+          mockTcString = 'abc123';
+          mockSharedData = {'data': 'data1'};
+          tcfApiCommandManager = new TcfApiCommandManager(mockPolicyManager);
+          tcfApiCommandManager.handleTcfCommand(data, mockWin);
+          await macroTask();
+
+          const postMessageArgs = mockWin.postMessage.args[0];
+          const tcfApiReturn = getTcfApiReturn(
+            callId,
+            tcfApiCommandManager.getMinimalTcDataForTesting(
+              mockMetadata,
+              mockSharedData,
+              mockTcString
+            ),
+            true
+          );
+          expect(
+            postMessageArgs[0]['__tcfapiReturn']['returnValue'][
+              'tcfPolicyVersion'
+            ]
+          ).to.be.equal(2);
+          expect(postMessageArgs[0]).to.deep.equals(tcfApiReturn);
+        });
+
         it('sends a minimal TcData via PostMessage', async () => {
           callId = 'getTcDataId';
           data = getData('getTCData', callId);
           mockMetadata = getMetadata(false, 'xyz987', false);
           mockTcString = 'abc123';
+          mockTcfPolicyVersion = 4;
           mockSharedData = {'data': 'data1'};
           tcfApiCommandManager = new TcfApiCommandManager(mockPolicyManager);
           tcfApiCommandManager.handleTcfCommand(data, mockWin);
@@ -224,7 +263,9 @@ describes.realWin(
               tcfApiCommandManager.getMinimalTcDataForTesting(
                 mockMetadata,
                 mockSharedData,
-                mockTcString
+                mockTcString,
+                undefined,
+                mockTcfPolicyVersion
               ),
               true
             )
diff --git a/extensions/amp-consent/amp-consent.md b/extensions/amp-consent/amp-consent.md
index 3c9bd2373f08..05e43d3d212b 100644
--- a/extensions/amp-consent/amp-consent.md
+++ b/extensions/amp-consent/amp-consent.md
@@ -620,8 +620,12 @@ Yes. See example [here](https://amp.dev/documentation/examples/user-consent/geol
 
 ##### Does AMP support the IAB TCF?
 
-AMP supports popular transparency consent frameworks including the IAB TCF v1, TCF v2 and the IAB US Privacy String.
-Please check with your consent management platform (CMP) and ad networks on their AMP support. AMP will read and pass the strings passed by the frameworks (IAB TCF v1, TCF v2 and the IAB US Privacy String) when received by CMPs/ad networks.
+AMP supports popular transparency consent frameworks including the IAB TCF v1, TCF v2, TCF v2.2, the IAB US Privacy String, and the IAB Global Privacy Platform string.
+Please check with your consent management platform (CMP) and ad networks on their AMP support. AMP will read and pass the strings passed by the frameworks (IAB TCF v1, TCF v2, TCF v2.2, the IAB US Privacy String and the IAB Global Privacy Platorm string) when received by CMPs/ad networks.
+
+##### I have a CMP implemented with AMP but for TCF v2 what do I need to do to support TCF v2.2?
+
+For AMP integration, the only thing you need to do is provide the value of `tcfPolicyVersion` during the client-side `postMessage`, and in case you also use `checkConsentHref` you need to provide it in the response, and you can also update it directly from the response too via the `tcfPolicyVersion` field in the response from your server, this will allow you to update consents in case you have not added the tcfPolicyVersion field before the transaction to TCF v2.2.
 
 ##### I can't see feature X being supported, what can I do?
 
diff --git a/extensions/amp-consent/customizing-extension-behaviors-on-consent.md b/extensions/amp-consent/customizing-extension-behaviors-on-consent.md
index e0f47d3a6484..876b20b20430 100644
--- a/extensions/amp-consent/customizing-extension-behaviors-on-consent.md
+++ b/extensions/amp-consent/customizing-extension-behaviors-on-consent.md
@@ -90,9 +90,10 @@ Similar to the consent string, AMP will always pass the local stored consent met
 
 ```
 {
-  "consentStringType": {enum} [CONSENT_STRING_TYPE.TCF_V1, CONSENT_STRING_TYPE.TCF_V2, CONSENT_STRING_TYPE.US_PRIVACY_STRING] (optional),
+  "consentStringType": {enum} [CONSENT_STRING_TYPE.TCF_V1, CONSENT_STRING_TYPE.TCF_V2, CONSENT_STRING_TYPE.US_PRIVACY_STRING, GLOBAL_PRIVACY_PLATFORM] (optional),
   "gdprApplies": {boolean} (optional),
   "additionalConsent": {string} (optional),
-  "purposeOne": {boolean} (optional)
+  "purposeOne": {boolean} (optional),
+  "gppSectionId": {string} (optional),
 }
 ```
diff --git a/extensions/amp-consent/integrating-consent.md b/extensions/amp-consent/integrating-consent.md
index 9b5badd68b52..d08cf02d2021 100644
--- a/extensions/amp-consent/integrating-consent.md
+++ b/extensions/amp-consent/integrating-consent.md
@@ -26,6 +26,8 @@ A remote endpoint is expected to tell the AMP runtime whether the user consent i
 
 The AMP runtime will embed the CMP's prompt in an iframe. `amp-consent` will create the iframe when it is necessary. A default placeholder will be displayed, and the prompt iframe will remain hidden until it has finished loading.
 
+In case you need to enable additional sandbox restrictions to be removeed for the generated iframe, specify them in the `sandbox` configuration variable. It takes a string with space-seperated sandbox restrictions. The restrictions `allow-scripts` and `allow-popups` are removed by default. Right now, the only allowed additional sandbox restrictions are `allow-popups-to-escape-sandbox` and `allow-top-navigation-by-user-activation`.
+
 The prompt iframe and the parent AMP page will communicate through `postMessages` and the iframe `name` attribute. In the case of using postMessage, messages from nested iframes will be ignored. The lists of support APIs are:
 
 #### Requesting UI state change
@@ -93,6 +95,7 @@ window.parent.postMessage(
     action: 'accept',
     info: /string/ /* optional */,
     consentMetadata: /object/ /* optional */,
+    tcfPolicyVersion: /number/ /* optional (integer) - if not provided 2 is default */,
   },
   '*'
 );
@@ -109,6 +112,7 @@ window.parent.postMessage(
     action: 'reject',
     info: /string/ /* optional */,
     consentMetadata: /object/ /* optional */,
+    tcfPolicyVersion: /number/ /* optional (integer) - if not provided 2 is default */,
   },
   '*'
 );
@@ -160,7 +164,8 @@ info = JSON.parse(window.name);
   "consentStringType": {enum} [1: TCF V1, 2: TCF V2, 3: US Privacy String] (optional),
   "gdprApplies": {boolean} (optional),
   "additionalConsent": {string} (optional),
-  "purposeOne": {boolean} (optional)
+  "purposeOne": {boolean} (optional),
+  "gppSectionId": {string} (optional)
 }
 ```
 
diff --git a/extensions/amp-consent/validator-amp-consent.protoascii b/extensions/amp-consent/validator-amp-consent.protoascii
index 9c0d7e321eac..ecaa82de2138 100644
--- a/extensions/amp-consent/validator-amp-consent.protoascii
+++ b/extensions/amp-consent/validator-amp-consent.protoascii
@@ -15,7 +15,7 @@ tags: {  # amp-consent (json)
   requires_extension: "amp-consent"
   mandatory_parent: "AMP-CONSENT"
   unique: true
-  satisfies: "amp-consent extension .json script"
+  satisfies_condition: "amp-consent extension .json script"
   attrs: {
     name: "type"
     mandatory: true
@@ -35,8 +35,8 @@ tags: {  # <amp-consent>
   tag_name: "AMP-CONSENT"
   requires_extension: "amp-consent"
   unique: true
-  requires: "amp-consent extension .json script"
-  excludes: "amp-consent [type]"
+  requires_condition: "amp-consent extension .json script"
+  excludes_condition: "amp-consent [type]"
   attr_lists: "extended-amp-global"
   amp_layout: {
     supported_layouts: NODISPLAY
@@ -49,9 +49,9 @@ tags: {  # <amp-consent> (type)
   spec_name: "amp-consent [type]"
   requires_extension: "amp-consent"
   unique: true
-  requires: "meta name=amp-consent-blocking"
-  requires: "amp-consent extension .json script"
-  satisfies: "amp-consent [type]"
+  requires_condition: "meta name=amp-consent-blocking"
+  requires_condition: "amp-consent extension .json script"
+  satisfies_condition: "amp-consent [type]"
   attrs: {
     name: "type"
     mandatory: true
diff --git a/extensions/amp-dailymotion/0.1/amp-dailymotion.js b/extensions/amp-dailymotion/0.1/amp-dailymotion.js
index 1c29f4886112..0e6cc4cda903 100644
--- a/extensions/amp-dailymotion/0.1/amp-dailymotion.js
+++ b/extensions/amp-dailymotion/0.1/amp-dailymotion.js
@@ -1,30 +1,34 @@
-import {Deferred} from '#core/data-structures/promise';
-import {PauseHelper} from '#core/dom/video/pause-helper';
-import {Services} from '#service';
-import {VideoEvents} from '../../../src/video-interface';
 import {
-  createFrameFor,
-  mutedOrUnmutedEvent,
-  originMatches,
-  redispatch,
-} from '../../../src/iframe-video';
-import {dev, devAssert, userAssert} from '#utils/log';
+  DailymotionEvents,
+  getDailymotionIframeSrc,
+  makeDailymotionMessage,
+} from '#bento/apis/dailymotion-api';
+
+import {Deferred} from '#core/data-structures/promise';
 import {dispatchCustomEvent, getDataParamsFromAttributes} from '#core/dom';
 import {
   fullscreenEnter,
   fullscreenExit,
   isFullscreenElement,
 } from '#core/dom/fullscreen';
-import {
-  DailymotionEvents,
-  getDailymotionIframeSrc,
-  makeDailymotionMessage,
-} from '../dailymotion-api';
-import {getData, listen} from '#utils/event-helper';
-import {installVideoManagerForDoc} from '#service/video-manager-impl';
 import {isLayoutSizeDefined} from '#core/dom/layout';
+import {PauseHelper} from '#core/dom/video/pause-helper';
 import {parseQueryString} from '#core/types/string/url';
 
+import {Services} from '#service';
+import {installVideoManagerForDoc} from '#service/video-manager-impl';
+
+import {getData, listen} from '#utils/event-helper';
+import {dev, devAssert, userAssert} from '#utils/log';
+
+import {
+  createFrameFor,
+  mutedOrUnmutedEvent,
+  originMatches,
+  redispatch,
+} from '../../../src/iframe-video';
+import {VideoEvents_Enum} from '../../../src/video-interface';
+
 const TAG = 'amp-dailymotion';
 
 /**
@@ -162,10 +166,10 @@ class AmpDailymotion extends AMP.BaseElement {
     }
 
     redispatch(this.element, data['event'], {
-      [DailymotionEvents.API_READY]: VideoEvents.LOAD,
-      [DailymotionEvents.END]: [VideoEvents.ENDED, VideoEvents.PAUSE],
-      [DailymotionEvents.PAUSE]: VideoEvents.PAUSE,
-      [DailymotionEvents.PLAY]: VideoEvents.PLAYING,
+      [DailymotionEvents.API_READY]: VideoEvents_Enum.LOAD,
+      [DailymotionEvents.END]: [VideoEvents_Enum.ENDED, VideoEvents_Enum.PAUSE],
+      [DailymotionEvents.PAUSE]: VideoEvents_Enum.PAUSE,
+      [DailymotionEvents.PLAY]: VideoEvents_Enum.PLAYING,
     });
 
     switch (data['event']) {
@@ -290,7 +294,7 @@ class AmpDailymotion extends AMP.BaseElement {
     // Hack to simulate firing mute events when video is not playing
     // since Dailymotion only fires volume changes when the video has started
     this.playerReadyPromise_.then(() => {
-      dispatchCustomEvent(this.element, VideoEvents.MUTED);
+      dispatchCustomEvent(this.element, VideoEvents_Enum.MUTED);
       this.muted_ = true;
     });
   }
@@ -303,7 +307,7 @@ class AmpDailymotion extends AMP.BaseElement {
     // Hack to simulate firing mute events when video is not playing
     // since Dailymotion only fires volume changes when the video has started
     this.playerReadyPromise_.then(() => {
-      dispatchCustomEvent(this.element, VideoEvents.UNMUTED);
+      dispatchCustomEvent(this.element, VideoEvents_Enum.UNMUTED);
       this.muted_ = false;
     });
   }
diff --git a/extensions/amp-dailymotion/1.0/amp-dailymotion.css b/extensions/amp-dailymotion/1.0/amp-dailymotion.css
new file mode 100644
index 000000000000..45d71486db82
--- /dev/null
+++ b/extensions/amp-dailymotion/1.0/amp-dailymotion.css
@@ -0,0 +1,16 @@
+/*
+ * Pre-upgrade:
+ * - display:block element
+ * - size-defined element
+ */
+ amp-dailymotion {
+  display: block;
+  overflow: hidden;
+  position: relative;
+}
+
+/* Pre-upgrade: size-defining element - hide children. */
+amp-dailymotion:not(.i-amphtml-built) > :not([placeholder]):not([slot="i-amphtml-svc"]) {
+  display: none;
+  content-visibility: hidden;
+}
diff --git a/extensions/amp-dailymotion/1.0/amp-dailymotion.js b/extensions/amp-dailymotion/1.0/amp-dailymotion.js
new file mode 100644
index 000000000000..28886d76d7f9
--- /dev/null
+++ b/extensions/amp-dailymotion/1.0/amp-dailymotion.js
@@ -0,0 +1,49 @@
+import {BaseElement} from '#bento/components/bento-dailymotion/1.0/base-element';
+import {AmpVideoBaseElement} from '#bento/components/bento-video/1.0/video-base-element';
+
+import {isExperimentOn} from '#experiments';
+
+import {setSuperClass} from '#preact/amp-base-element';
+
+import {userAssert} from '#utils/log';
+
+import {CSS} from '../../../build/amp-dailymotion-1.0.css';
+
+/** @const {string} */
+const TAG = 'amp-dailymotion';
+
+class AmpDailymotion extends setSuperClass(BaseElement, AmpVideoBaseElement) {
+  /** @override */
+  init() {
+    super.init();
+    const {
+      'endscreenEnable': endscreenEnable,
+      'info': info,
+      'mute': mute,
+      'sharingEnable': sharingEnable,
+      'uiLogo': uiLogo,
+    } = this.element.dataset;
+
+    return {
+      'endscreenEnable': endscreenEnable !== 'false',
+      'info': info !== 'false',
+      'mute': mute === 'true',
+      'sharingEnable': sharingEnable !== 'false',
+      'uiLogo': uiLogo !== 'false',
+    };
+  }
+
+  /** @override */
+  isLayoutSupported(layout) {
+    userAssert(
+      isExperimentOn(this.win, 'bento') ||
+        isExperimentOn(this.win, 'bento-dailymotion'),
+      'expected global "bento" or specific "bento-dailymotion" experiment to be enabled'
+    );
+    return super.isLayoutSupported(layout);
+  }
+}
+
+AMP.extension(TAG, '1.0', (AMP) => {
+  AMP.registerElement(TAG, AmpDailymotion, CSS);
+});
diff --git a/extensions/amp-dailymotion/1.0/component.js b/extensions/amp-dailymotion/1.0/component.js
deleted file mode 100644
index ca5d6bfaa056..000000000000
--- a/extensions/amp-dailymotion/1.0/component.js
+++ /dev/null
@@ -1,112 +0,0 @@
-import * as Preact from '#preact';
-import {forwardRef} from '#preact/compat';
-import {useMemo} from '#preact';
-import {dispatchCustomEvent} from '#core/dom';
-import {
-  DailymotionEvents,
-  getDailymotionIframeSrc,
-  makeDailymotionMessage,
-} from '../dailymotion-api';
-import {VideoIframe} from '../../amp-video/1.0/video-iframe';
-import {parseQueryString} from '#core/types/string/url';
-
-/**
- * @param {string} method
- * @return {string}
- */
-function makeMethodMessage(method) {
-  switch (method) {
-    case 'mute':
-      return makeDailymotionMessage('muted', [true]);
-    case 'unmute':
-      return makeDailymotionMessage('muted', [false]);
-    case 'showControls':
-      return makeDailymotionMessage('controls', [true]);
-    case 'hideControls':
-      return makeDailymotionMessage('controls', [false]);
-    default:
-      return makeDailymotionMessage(method);
-  }
-}
-
-/**
- * @param {MessageEvent} event
- */
-function onMessage({currentTarget, data}) {
-  const parsedData = parseQueryString(/** @type {string} */ (data));
-  const event = parsedData?.['event'];
-  if (event === DailymotionEvents.PAUSE) {
-    dispatchCustomEvent(currentTarget, 'pause');
-  } else if (event === DailymotionEvents.PLAY) {
-    dispatchCustomEvent(currentTarget, 'playing');
-  } else if (event === DailymotionEvents.END) {
-    dispatchCustomEvent(currentTarget, 'pause');
-    dispatchCustomEvent(currentTarget, 'end');
-  } else if (event === DailymotionEvents.API_READY) {
-    dispatchCustomEvent(currentTarget, 'canplay');
-  }
-}
-
-/**
- * @param {!BentoDailymotionDef.Props} props
- * @param {{current: ?VideoWrapperDef.Api}} ref
- * @return {PreactDef.Renderable}
- */
-export function BentoDailymotionWithRef(
-  {
-    autoplay,
-    endscreenEnable,
-    info,
-    mute,
-    sharingEnable,
-    start,
-    uiHighlight,
-    uiLogo,
-    videoId,
-    ...rest
-  },
-  ref
-) {
-  const src = useMemo(
-    () =>
-      getDailymotionIframeSrc(
-        window,
-        videoId,
-        autoplay,
-        endscreenEnable,
-        info,
-        mute,
-        sharingEnable,
-        start,
-        uiHighlight,
-        uiLogo
-      ),
-    [
-      videoId,
-      autoplay,
-      endscreenEnable,
-      info,
-      mute,
-      sharingEnable,
-      start,
-      uiHighlight,
-      uiLogo,
-    ]
-  );
-
-  return (
-    <VideoIframe
-      autoplay={autoplay}
-      controls
-      ref={ref}
-      {...rest}
-      src={src}
-      makeMethodMessage={makeMethodMessage}
-      onMessage={onMessage}
-    />
-  );
-}
-
-const BentoDailymotion = forwardRef(BentoDailymotionWithRef);
-BentoDailymotion.displayName = 'BentoDailymotion';
-export {BentoDailymotion};
diff --git a/extensions/amp-dailymotion/1.0/storybook/Basic.amp.js b/extensions/amp-dailymotion/1.0/storybook/Basic.amp.js
new file mode 100644
index 000000000000..fb1b35f60a00
--- /dev/null
+++ b/extensions/amp-dailymotion/1.0/storybook/Basic.amp.js
@@ -0,0 +1,37 @@
+import {withAmp} from '@ampproject/storybook-addon';
+
+import * as Preact from '#preact';
+
+export default {
+  title: 'amp-dailymotion-1_0',
+  decorators: [withAmp],
+  parameters: {
+    extensions: [{name: 'amp-dailymotion', version: '1.0'}],
+    experiments: ['bento'],
+  },
+  args: {
+    width: 300,
+    height: 200,
+    'data-videoid': 'x3rdtfy',
+  },
+};
+
+const Template = ({...args}) => <amp-dailymotion {...args}></amp-dailymotion>;
+
+export const _default = (args) => <Template {...args} />;
+
+export const _customSettings = (args) => <Template {...args} />;
+
+_customSettings.args = {
+  'data-endscreen-enable': false,
+  'data-sharing-enable': false,
+  'data-ui-highlight': '444444',
+  'data-ui-logo': false,
+  'data-info': false,
+};
+
+export const _autoplay = (args) => <Template {...args} />;
+
+_autoplay.args = {
+  autoplay: true,
+};
diff --git a/extensions/amp-dailymotion/1.0/storybook/Basic.js b/extensions/amp-dailymotion/1.0/storybook/Basic.js
index 2d655f420dc1..a26d2c14342b 100644
--- a/extensions/amp-dailymotion/1.0/storybook/Basic.js
+++ b/extensions/amp-dailymotion/1.0/storybook/Basic.js
@@ -1,5 +1,6 @@
+import {BentoDailymotion} from '#bento/components/bento-dailymotion/1.0/component';
+
 import * as Preact from '#preact';
-import {BentoDailymotion} from '../component';
 
 export default {
   title: 'Dailymotion',
diff --git a/extensions/amp-dailymotion/1.0/test/test-amp-dailymotion.js b/extensions/amp-dailymotion/1.0/test/test-amp-dailymotion.js
new file mode 100644
index 000000000000..37ca7d11bbbd
--- /dev/null
+++ b/extensions/amp-dailymotion/1.0/test/test-amp-dailymotion.js
@@ -0,0 +1,92 @@
+import '../amp-dailymotion';
+import {expect} from 'chai';
+
+import {htmlFor} from '#core/dom/static-template';
+
+import {toggleExperiment} from '#experiments';
+
+import {waitFor} from '#testing/helpers/service';
+
+describes.realWin(
+  'amp-dailymotion-v1.0',
+  {
+    amp: {
+      extensions: ['amp-dailymotion:1.0'],
+    },
+  },
+  (env) => {
+    let win;
+    let doc;
+    let html;
+
+    const waitForRender = async (element) => {
+      await element.buildInternal();
+      const loadPromise = element.layoutCallback();
+      const shadow = element.shadowRoot;
+      await waitFor(() => shadow.querySelector('iframe'), 'iframe mounted');
+      await loadPromise;
+    };
+
+    beforeEach(async () => {
+      win = env.win;
+      doc = win.document;
+      html = htmlFor(doc);
+      toggleExperiment(win, 'bento-dailymotion', true, true);
+    });
+
+    it('renders', async () => {
+      const element = html`
+        <amp-dailymotion
+          data-videoid="x3rdtfy"
+          width="500"
+          height="281"
+        ></amp-dailymotion>
+      `;
+      env.win.document.body.appendChild(element);
+
+      await waitForRender(element);
+
+      const iframe = element.shadowRoot.querySelector('iframe');
+      expect(iframe).to.not.be.null;
+      expect(iframe.src).to.equal(
+        'https://www.dailymotion.com/embed/video/x3rdtfy?api=1&html=1&app=amp'
+      );
+    });
+
+    it('renders with optional attrs correctly', async () => {
+      const element = html`
+        <amp-dailymotion
+          data-videoid="x3rdtfy"
+          width="500"
+          height="281"
+          data-mute="true"
+          data-endscreen-enable="false"
+          data-sharing-enable="false"
+          data-ui-highlight="444444"
+          data-ui-logo="false"
+          data-info="false"
+        ></amp-dailymotion>
+      `;
+      env.win.document.body.appendChild(element);
+
+      await waitForRender(element);
+
+      const iframe = element.shadowRoot.querySelector('iframe');
+      expect(iframe).to.not.be.null;
+      // VideoId attr
+      expect(iframe.src).to.contain('x3rdtfy');
+      // Mute Attr
+      expect(iframe.src).to.contain('mute=1');
+      // Enscreen Enable attr
+      expect(iframe.src).to.contain('endscreen-enable=false');
+      // Sharing Enable attr
+      expect(iframe.src).to.contain('sharing-enable=false');
+      // UI Highlight attr
+      expect(iframe.src).to.contain('ui-highlight=444444');
+      // UI Logo attr
+      expect(iframe.src).to.contain('ui-logo=false');
+      // info attr
+      expect(iframe.src).to.contain('info=false');
+    });
+  }
+);
diff --git a/extensions/amp-dailymotion/1.0/test/test-component.js b/extensions/amp-dailymotion/1.0/test/test-component.js
deleted file mode 100644
index 94e84d40a3fb..000000000000
--- a/extensions/amp-dailymotion/1.0/test/test-component.js
+++ /dev/null
@@ -1,71 +0,0 @@
-import * as Preact from '#preact';
-import {BentoDailymotion} from '../component';
-import {mount} from 'enzyme';
-import {expect} from 'chai';
-
-describes.sandboxed('Dailymotion preact component v1.0', {}, () => {
-  it('Renders', () => {
-    const wrapper = mount(
-      <BentoDailymotion
-        style={{width: 300, height: 200}}
-        videoId="x3rdtfy"
-      ></BentoDailymotion>
-    );
-
-    const iframe = wrapper.find('iframe');
-
-    expect(iframe.prop('src')).to.equal(
-      'https://www.dailymotion.com/embed/video/x3rdtfy?api=1&html=1&app=amp'
-    );
-
-    // Style propagated to container, but not iframe.
-    expect(wrapper.prop('style').width).to.equal(300);
-    expect(wrapper.prop('style').height).to.equal(200);
-  });
-
-  it('Pass correct param attributes to the iframe src', () => {
-    const wrapper = mount(
-      <BentoDailymotion
-        style={{width: 300, height: 200}}
-        videoId="x3rdtfy"
-        endscreenEnable={false}
-        sharingEnable={false}
-        uiHighlight="444444"
-        info={false}
-      ></BentoDailymotion>
-    );
-
-    const iframe = wrapper.find('iframe');
-    const src = iframe.prop('src');
-    expect(src).to.contain('endscreen-enable=false');
-    expect(src).to.contain('sharing-enable=false');
-    expect(src).to.contain('ui-highlight=444444');
-    expect(src).to.contain('info=false');
-  });
-
-  it('Pass mute param to iframe src', () => {
-    const wrapper = mount(
-      <BentoDailymotion
-        style={{width: 300, height: 200}}
-        videoId="x3rdtfy"
-        mute={true}
-      ></BentoDailymotion>
-    );
-
-    const iframe = wrapper.find('iframe');
-    expect(iframe.prop('src')).to.contain('mute=1');
-  });
-
-  it('Renders with iframe already muted when autoplay is passed', () => {
-    const wrapper = mount(
-      <BentoDailymotion
-        style={{width: 300, height: 200}}
-        videoId="x3rdtfy"
-        autoplay
-      ></BentoDailymotion>
-    );
-
-    const iframe = wrapper.find('iframe');
-    expect(iframe.prop('src')).to.contain('mute=1');
-  });
-});
diff --git a/extensions/amp-dailymotion/1.0/test/validator-amp-dailymotion.html b/extensions/amp-dailymotion/1.0/test/validator-amp-dailymotion.html
new file mode 100644
index 000000000000..409ae6cad1cf
--- /dev/null
+++ b/extensions/amp-dailymotion/1.0/test/validator-amp-dailymotion.html
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html ⚡>
+  <!-- prettier-ignore -->
+  <head>
+    <meta charset="utf-8">
+    <title>amp-dailymotion example</title>
+    <link rel="canonical" href="/examples/amp-dailymotion.html">
+    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+    <style amp-custom>
+      amp-dailymotion {
+        color: red;
+      }
+    </style>
+    <script async custom-element="amp-dailymotion" src="https://cdn.ampproject.org/v0/amp-dailymotion-1.0.js"></script>
+    <script async src="https://cdn.ampproject.org/v0.js"></script>
+  </head>
+  <body>
+    <!-- Valid. -->
+    <amp-dailymotion
+      data-videoid="x3rdtfy"
+      width="500"
+      height="281">
+    </amp-dailymotion>
+
+    <!-- Valid: with custom url attributes. -->
+    <amp-dailymotion
+      data-videoid="x3rdtfy"
+      data-endscreen-enable="false"
+      data-sharing-enable="false"
+      data-ui-highlight="444444"
+      data-ui-logo="false"
+      data-info="false"
+      id="myVideo"
+      width="640"
+      height="360">
+    </amp-dailymotion>
+
+    <!-- Valid: with autoplay. -->
+    <amp-dailymotion
+      autoplay
+      data-videoid="x3rdtfy"
+      width="500"
+      height="281"
+      layout="responsive">
+    </amp-dailymotion>
+
+    <!-- Invalid: missing data-videoid. -->
+    <amp-dailymotion
+      width="500"
+      height="281">
+    </amp-dailymotion>
+
+    <!-- Invalid: missing dimensions. -->
+    <amp-dailymotion data-videoid="x3rdtfy"></amp-dailymotion>
+
+    <!-- Invalid: data-videoid must be a video id not a URL. -->
+    <amp-dailymotion
+      data-videoid="https://www.dailymotion.com/embed/video/x3rdtfy?api=1&html=1&app=amp"
+      width="500"
+      height="281">
+    </amp-dailymotion>
+  </body>
+</html>
diff --git a/extensions/amp-dailymotion/1.0/test/validator-amp-dailymotion.out b/extensions/amp-dailymotion/1.0/test/validator-amp-dailymotion.out
new file mode 100644
index 000000000000..07b496202786
--- /dev/null
+++ b/extensions/amp-dailymotion/1.0/test/validator-amp-dailymotion.out
@@ -0,0 +1,71 @@
+FAIL
+|  <!DOCTYPE html>
+|  <html ⚡>
+|    <!-- prettier-ignore -->
+|    <head>
+|      <meta charset="utf-8">
+|      <title>amp-dailymotion example</title>
+|      <link rel="canonical" href="/examples/amp-dailymotion.html">
+|      <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+|      <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+|      <style amp-custom>
+|        amp-dailymotion {
+|          color: red;
+|        }
+|      </style>
+|      <script async custom-element="amp-dailymotion" src="https://cdn.ampproject.org/v0/amp-dailymotion-1.0.js"></script>
+|      <script async src="https://cdn.ampproject.org/v0.js"></script>
+|    </head>
+|    <body>
+|      <!-- Valid. -->
+|      <amp-dailymotion
+|        data-videoid="x3rdtfy"
+|        width="500"
+|        height="281">
+|      </amp-dailymotion>
+|
+|      <!-- Valid: with custom url attributes. -->
+|      <amp-dailymotion
+|        data-videoid="x3rdtfy"
+|        data-endscreen-enable="false"
+|        data-sharing-enable="false"
+|        data-ui-highlight="444444"
+|        data-ui-logo="false"
+|        data-info="false"
+|        id="myVideo"
+|        width="640"
+|        height="360">
+|      </amp-dailymotion>
+|
+|      <!-- Valid: with autoplay. -->
+|      <amp-dailymotion
+|        autoplay
+|        data-videoid="x3rdtfy"
+|        width="500"
+|        height="281"
+|        layout="responsive">
+|      </amp-dailymotion>
+|
+|      <!-- Invalid: missing data-videoid. -->
+|      <amp-dailymotion
+>>     ^~~~~~~~~
+amp-dailymotion/1.0/test/validator-amp-dailymotion.html:49:4 The mandatory attribute 'data-videoid' is missing in tag 'amp-dailymotion'. (see https://amp.dev/documentation/components/amp-dailymotion/)
+|        width="500"
+|        height="281">
+|      </amp-dailymotion>
+|
+|      <!-- Invalid: missing dimensions. -->
+|      <amp-dailymotion data-videoid="x3rdtfy"></amp-dailymotion>
+>>     ^~~~~~~~~
+amp-dailymotion/1.0/test/validator-amp-dailymotion.html:55:4 Incomplete layout attributes specified for tag 'amp-dailymotion'. For example, provide attributes 'width' and 'height'. (see https://amp.dev/documentation/components/amp-dailymotion/)
+|
+|      <!-- Invalid: data-videoid must be a video id not a URL. -->
+|      <amp-dailymotion
+>>     ^~~~~~~~~
+amp-dailymotion/1.0/test/validator-amp-dailymotion.html:58:4 The attribute 'data-videoid' in tag 'amp-dailymotion' is set to the invalid value 'https://www.dailymotion.com/embed/video/x3rdtfy?api=1&html=1&app=amp'. (see https://amp.dev/documentation/components/amp-dailymotion/)
+|        data-videoid="https://www.dailymotion.com/embed/video/x3rdtfy?api=1&html=1&app=amp"
+|        width="500"
+|        height="281">
+|      </amp-dailymotion>
+|    </body>
+|  </html>
\ No newline at end of file
diff --git a/extensions/amp-dailymotion/amp-dailymotion.md b/extensions/amp-dailymotion/amp-dailymotion.md
index 5e7ab465dac6..0f94973fc5f5 100644
--- a/extensions/amp-dailymotion/amp-dailymotion.md
+++ b/extensions/amp-dailymotion/amp-dailymotion.md
@@ -4,6 +4,8 @@ formats:
   - websites
 teaser:
   text: Displays a Dailymotion video.
+experimental: true
+bento: true
 ---
 
 # amp-dailymotion
diff --git a/extensions/amp-dailymotion/dailymotion-api.js b/extensions/amp-dailymotion/dailymotion-api.js
deleted file mode 100644
index e12f54ee07b0..000000000000
--- a/extensions/amp-dailymotion/dailymotion-api.js
+++ /dev/null
@@ -1,97 +0,0 @@
-import {addParamsToUrl} from '../../src/url';
-import {dict} from '#core/types/object';
-import {isAutoplaySupported} from '#core/dom/video';
-
-/**
- *
- * @param {!Window} win
- * @param {string} videoId
- * @param {boolean|undefined} autoplay
- * @param {boolean|undefined} endscreenEnable
- * @param {boolean|undefined} info
- * @param {boolean|undefined} mute
- * @param {boolean|undefined} sharingEnable
- * @param {string|undefined} start
- * @param {string|undefined} uiHighlight
- * @param {boolean|undefined} uiLogo
- * @param {!JsonObject} implicitParams
- * @return {string}
- */
-export function getDailymotionIframeSrc(
-  win,
-  videoId,
-  autoplay = false,
-  endscreenEnable = true,
-  info = true,
-  mute = false,
-  sharingEnable = true,
-  start,
-  uiHighlight,
-  uiLogo = true,
-  implicitParams
-) {
-  return addParamsToUrl(
-    `https://www.dailymotion.com/embed/video/${encodeURIComponent(
-      videoId
-    )}?api=1&html=1&app=amp`,
-    Object.assign(
-      dict({
-        // In the dailymotion API endscreenEnable, info, sharingEnable, and uiLogo
-        // all default to true, so if the attr is not marked as false do not add it to the URL
-        'endscreen-enable': !endscreenEnable ? endscreenEnable : undefined,
-        'info': !info ? info : undefined,
-        // In order to support autoplay the video needs to be muted on load so we
-        // dont receive an unmute event which prevents the video from autoplay.
-        'mute': mute || (autoplay && isAutoplaySupported(win)) ? 1 : undefined,
-        'sharing-enable': !sharingEnable ? sharingEnable : undefined,
-        'start': start,
-        'ui-highlight': uiHighlight,
-        'ui-logo': !uiLogo ? uiLogo : undefined,
-      }),
-      implicitParams
-    )
-  );
-}
-
-/**
- * @param {string} command
- * @param {?boolean} param
- * @return {string}
- */
-export function makeDailymotionMessage(command, param) {
-  return JSON.stringify(
-    dict({
-      'command': command,
-      'parameters': param,
-    })
-  );
-}
-
-/**
- * Player events reverse-engineered from the Dailymotion API
- * NOTE: 'unstarted' isn't part of the API, just a placeholder
- * as an initial state
- *
- * @enum {string}
- */
-export const DailymotionEvents = {
-  UNSTARTED: 'unstarted',
-  API_READY: 'apiready',
-  // Events fired for both the original content or ads
-  START: 'start',
-  PLAY: 'play',
-  PAUSE: 'pause',
-  END: 'end',
-  // Events fired only for ads
-  AD_START: 'ad_start',
-  AD_PLAY: 'ad_play',
-  AD_PAUSE: 'ad_pause',
-  AD_END: 'ad_end',
-  // Events fired only for the original content
-  VIDEO_START: 'video_start',
-  VIDEO_END: 'video_end',
-  // Other events
-  VOLUMECHANGE: 'volumechange',
-  STARTED_BUFFERING: 'progress',
-  FULLSCREEN_CHANGE: 'fullscreenchange',
-};
diff --git a/extensions/amp-dailymotion/validator-amp-dailymotion.protoascii b/extensions/amp-dailymotion/validator-amp-dailymotion.protoascii
index 336b9bd8e4e8..1e860496761c 100644
--- a/extensions/amp-dailymotion/validator-amp-dailymotion.protoascii
+++ b/extensions/amp-dailymotion/validator-amp-dailymotion.protoascii
@@ -1,8 +1,24 @@
-tags: {  # amp-dailymotion
+tags: {  # amp-dailymotion 1.0
   html_format: AMP
   tag_name: "SCRIPT"
+  satisfies_condition: "amp-dailymotion 1.0"
+  excludes_condition: "amp-dailymotion 0.1"
   extension_spec: {
     name: "amp-dailymotion"
+    version_name: "v1.0"
+    version: "1.0"
+    bento_supported_version: "1.0"
+  }
+  attr_lists: "common-extension-attrs"
+}
+tags: {  # amp-dailymotion 0.1 and latest
+  html_format: AMP
+  tag_name: "SCRIPT"
+  satisfies_condition: "amp-dailymotion 0.1"
+  excludes_condition: "amp-dailymotion 1.0"
+  extension_spec: {
+    name: "amp-dailymotion"
+    version_name: "v0.1"
     version: "0.1"
     version: "latest"
     requires_usage: EXEMPTED
diff --git a/extensions/amp-date-countdown/0.1/amp-date-countdown.js b/extensions/amp-date-countdown/0.1/amp-date-countdown.js
index a8eab7cf652e..ee6e9a368b84 100644
--- a/extensions/amp-date-countdown/0.1/amp-date-countdown.js
+++ b/extensions/amp-date-countdown/0.1/amp-date-countdown.js
@@ -1,4 +1,4 @@
-import {ActionTrust} from '#core/constants/action-constants';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
 import {removeChildren} from '#core/dom';
 import {isLayoutSizeDefined} from '#core/dom/layout';
 
@@ -33,7 +33,7 @@ const MILLISECONDS_IN_MINUTE = 60 * 1000;
 /** @const {number} */
 const MILLISECONDS_IN_SECOND = 1000;
 
-/** @const {Object} */
+/** @const {object} */
 //https://ctrlq.org/code/19899-google-translate-languages refer to google code
 const LOCALE_WORD = {
   'de': ['Jahren', 'Monaten', 'Tagen', 'Stunden', 'Minuten', 'Sekunden'],
@@ -195,7 +195,7 @@ export class AmpDateCountdown extends AMP.BaseElement {
         this.element,
         'timeout',
         null,
-        ActionTrust.LOW
+        ActionTrust_Enum.LOW
       );
       this.win.clearInterval(this.countDownTimer_);
     }
@@ -255,7 +255,7 @@ export class AmpDateCountdown extends AMP.BaseElement {
   /**
    * @param {number} ms
    * @param {boolean} countUp
-   * @return {Object}
+   * @return {object}
    * @private
    */
   getYDHMSFromMs_(ms, countUp) {
@@ -283,18 +283,18 @@ export class AmpDateCountdown extends AMP.BaseElement {
       TimeUnit[this.biggestUnit_] == TimeUnit.HOURS
         ? this.supportBackDate_(Math.floor(ms / MILLISECONDS_IN_HOUR))
         : TimeUnit[this.biggestUnit_] < TimeUnit.HOURS
-        ? this.supportBackDate_(
-            Math.floor((ms % MILLISECONDS_IN_DAY) / MILLISECONDS_IN_HOUR)
-          )
-        : 0;
+          ? this.supportBackDate_(
+              Math.floor((ms % MILLISECONDS_IN_DAY) / MILLISECONDS_IN_HOUR)
+            )
+          : 0;
     const m =
       TimeUnit[this.biggestUnit_] == TimeUnit.MINUTES
         ? this.supportBackDate_(Math.floor(ms / MILLISECONDS_IN_MINUTE))
         : TimeUnit[this.biggestUnit_] < TimeUnit.MINUTES
-        ? this.supportBackDate_(
-            Math.floor((ms % MILLISECONDS_IN_HOUR) / MILLISECONDS_IN_MINUTE)
-          )
-        : 0;
+          ? this.supportBackDate_(
+              Math.floor((ms % MILLISECONDS_IN_HOUR) / MILLISECONDS_IN_MINUTE)
+            )
+          : 0;
     const s =
       TimeUnit[this.biggestUnit_] == TimeUnit.SECONDS
         ? this.supportBackDate_(Math.floor(ms / MILLISECONDS_IN_SECOND))
diff --git a/extensions/amp-date-countdown/1.0/README.md b/extensions/amp-date-countdown/1.0/README.md
index a9c8c0185a26..836d3ecbe47f 100644
--- a/extensions/amp-date-countdown/1.0/README.md
+++ b/extensions/amp-date-countdown/1.0/README.md
@@ -4,21 +4,186 @@ Displays a countdown sequence to a specified date. Refer to the [returned time p
 
 ## Web Component
 
-We don't support the web component version of `bento-date-countdown` since `<template>` support is still being designed. This effort can be tracked in this [issue](https://go.amp.dev/issue/36619).
+You must include each Bento component's required CSS library to guarantee proper loading and before adding custom styles. Or use the light-weight pre-upgrade styles available inline. See [Layout and style](#layout-and-style).
 
-<!--
-An older version of this file contains the removed section, though it's incorrect:
+### Import via npm
 
-https://github.com/ampproject/amphtml/blob/422d171e87571c4d125a2bf956e78e92444c10e8/extensions/amp-date-countdown/1.0/README.md
--->
+```sh
+npm install @bentoproject/bento-date-countdown
+```
+
+```javascript
+import {defineElement as defineBentoDateCountdown} from '@bentoproject/bento-date-countdown';
+defineBentoDateCountdown();
+```
+
+### Include via `<script>`
+
+```html
+<script type="module" src="https://cdn.ampproject.org/bento.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/bento.js" crossorigin="anonymous"></script>
+<!-- Include bento-mustache.js to use mustache templates with this component -->
+<script async src="https://cdn.ampproject.org/v0/bento-mustache.js"></script>
+<script type="module" src="https://cdn.ampproject.org/v0/bento-date-countdown-1.0.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/v0/bento-date-countdown-1.0.js" crossorigin="anonymous"></script>
+<link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-date-countdown-1.0.css" crossorigin="anonymous">
+```
+
+### Example
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script async src="https://cdn.ampproject.org/v0/bento-mustache.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-date-countdown-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-date-countdown-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-date-countdown-1.0.css"
+    />
+  </head>
+  <body>
+    <bento-date-countdown timeleft-ms="200000000" biggest-unit="HOURS">
+      <template>
+        <div>
+          <span>{{days}} {{dd}} {{d}}</span>
+          <br>
+          <span>{{hours}} {{hh}} {{h}}</span>
+          <br>
+          <span>{{minutes}} {{mm}} {{m}}</span>
+          <br>
+          <span>{{seconds}} {{ss}} {{s}}</span>
+        </div>
+      </template>
+    </bento-date-countdown>
+  </body>
+</html>
+```
+
+### Interactivity and API usage
+
+The Bento Date Countdown component does not have an imperative API. However, the Bento Date Countdown Web Component will render a mustache-template, provided by the consumer in a `<template>` tag with `type="amp-mustache"`. This template may interpolate date-related parameters. See the [Returned Time Parameters section](#returned-time-parameters) for a full list of all the available parameters.
+
+### Layout and style
+
+Each Bento component has a small CSS library you must include to guarantee proper loading without [content shifts](https://web.dev/cls/). Because of order-based specificity, you must manually ensure that stylesheets are included before any custom styles.
+
+```html
+<link rel="stylesheet" type="text/css" href="https://cdn.ampproject.org/v0/bento-date-countdown-1.0.css">
+```
+
+Alternatively, you may also make the light-weight pre-upgrade styles available inline:
+
+```html
+<style data-bento-boilerplate>
+  bento-date-countdown {
+    display: block;
+    overflow: hidden;
+    position: relative;
+  }
+</style>
+```
+
+### Attributes
+
+To provide the datetime to countdown to, you must specify at least one of these required attributes: `end-date`,
+`timeleft-ms`, `timestamp-ms`, `timestamp-seconds`.
+
+#### `end-date`
+
+An ISO formatted date to count down to. For example, `2020-06-01T00:00:00+08:00`.
+
+Used to determine the datetime to countdown to.
+
+#### `timestamp-ms`
+
+A POSIX epoch value in milliseconds; assumed to be UTC timezone. For example, `timestamp-ms="1521880470000"`.
+
+Used to determine the datetime to countdown to.
+
+#### `timestamp-seconds`
+
+A POSIX epoch value in seconds; assumed to be UTC timezone. For example, `timestamp-seconds="1521880470"`.
+
+Used to determine the datetime to countdown to.
+
+#### `timeleft-ms`
+
+A value in milliseconds left to be counting down. For example, 48 hours left `timeleft-ms="172800000"`.
+
+Used to determine the datetime to countdown to.
+
+#### `offset-seconds` (optional)
+
+A positive or negative number that represents the number of seconds to add or subtract from the `end-date`. For example, `offset-seconds="60"` adds 60 seconds to the end-date.
+
+#### `when-ended` (optional)
+
+Specifies whether to stop the timer when it reaches 0 seconds. The value can be set to `stop` (default) to indicate the timer to stop at 0 seconds and will not pass the final date or `continue` to indicate the timer should continue after reaching 0 seconds.
+
+#### `locale` (optional)
+
+An internationalization language string for each timer unit. The default value is `en` (for English).
+
+Supported values:
+
+| Code  | Language            |
+| ----- | ------------------- |
+| de    | German              |
+| en    | English             |
+| es    | Spanish             |
+| fr    | French              |
+| id    | Indonesian          |
+| it    | Italian             |
+| ja    | Japanese            |
+| ko    | Korean              |
+| nl    | Dutch               |
+| pt    | Portuguese          |
+| ru    | Russian             |
+| th    | Thai                |
+| tr    | Turkish             |
+| vi    | Vietnamese          |
+| zh-cn | Chinese Simplified  |
+| zh-tw | Chinese Traditional |
+
+#### `biggest-unit` (optional)
+
+Allows the `bento-date-countdown` component to calculate the time difference based
+on the specified `biggest-unit` value. For example, assume there are `50 days 10 hours` left, if the `biggest-unit` is set to `hours`, the result displays
+`1210 hours` left.
+
+-   Supported values: `days`, `hours`, `minutes`, `seconds`
+-   Default: `days`
+
+#### `count-up` (optional)
+
+Include this attribute to reverse the direction of the countdown to count up instead. This is useful to display the time elapsed since a target date in the past. To continue the countdown when the target date is in the past, be sure to include the `when-ended` attribute with the `continue` value. If the target date is in the future, `bento-date-countdown` will display a decrementing (toward 0) negative value.
+
+### Styling
+
+You may use the `bento-date-countdown` element selector to style the Bento Date Countdown component freely.
 
 ---
 
 ## Preact/React Component
 
-The examples below demonstrates use of the `<BentoDateCountdown>` as a functional component usable with the Preact or React libraries.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/date-countdown
@@ -37,11 +202,11 @@ function App() {
       render={(data) => (
         <div>
           <span>{`${data.days} ${data.dd} ${data.d}`}</span>
-          <br />
+          <br>
           <span>{`${data.hours} ${data.hh} ${data.h}`}</span>
-          <br />
+          <br>
           <span>{`${data.minutes} ${data.mm} ${data.m}`}</span>
-          <br />
+          <br>
           <span>{`${data.seconds} ${data.ss} ${data.s}`}</span>
         </div>
       )}
@@ -62,8 +227,7 @@ The Bento Date Countdown Preact/React component allows consumers to render their
 
 #### `datetime`
 
-Required prop. Denotes the date and time as a Date, String, or Nuumber. If String, must be a
-standard ISO 8601 date string (e.g. 2017-08-02T15:05:05.000Z) or the string `now`. If set to `now`, it will use the time the page loaded to render its template. If Number, must be a POSIX epoch value in milliseconds.
+Required prop. Denotes the date and time as a Date, String, or Nuumber. If String, must be a standard ISO 8601 date string (e.g. 2017-08-02T15:05:05.000Z) or the string `now`. If set to `now`, it will use the time the page loaded to render its template. If Number, must be a POSIX epoch value in milliseconds.
 
 #### `locale`
 
@@ -75,9 +239,7 @@ Specifies whether to stop the timer when it reaches 0 seconds. The value can be
 
 #### `biggestUnit`
 
-Allows the `bento-date-countdown` component to calculate the time difference based
-on the specified `biggest-unit` value. For example, assume there are `50 days 10 hours` left, if the `biggest-unit` is set to `hours`, the result displays
-`1210 hours` left.
+Allows the `bento-date-countdown` component to calculate the time difference based on the specified `biggest-unit` value. For example, assume there are `50 days 10 hours` left, if the `biggest-unit` is set to `hours`, the result displays `1210 hours` left.
 
 -   Supported values: `days`, `hours`, `minutes`, `seconds`
 -   Default: `days`
@@ -89,11 +251,12 @@ Include this prop to reverse the direction of the countdown to count up instead.
 #### `render`
 
 Optional callback that should render a template. The callback will be provided an object with properties/values related to the date expressed in `datetime`.
-By default, the Bento Date Countdown component will display the [`localeString` form of the Date](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toLocaleString) for the given locale and localeOption.
-See the [Returned Time Parameters section](#returned-time-parameters) for more details on how each property will be displayed.
+
+By default, the Bento Date Countdown component will display the [`localeString` form of the Date](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toLocaleString) for the given locale and localeOption. See the [Returned Time Parameters section](#returned-time-parameters) for more details on how each property will be displayed.
 
 ```typescript
-(dateParams: DateParams) => JSXInternal.Element
+function render(dateParams: DateParams): JSXInternal.Element;
+
 interface DateParams {
   day: number;
   dayName: string;
@@ -121,7 +284,7 @@ interface DateParams {
 }
 ```
 
-### Returned Time Parameters
+## Returned Time Parameters
 
 This table lists the format you can specify in your Mustache template:
 
@@ -140,7 +303,7 @@ This table lists the format you can specify in your Mustache template:
 | minutes | internationalization string for minute or minutes |
 | seconds | internationalization string for second or seconds |
 
-#### Samples of formatted values
+### Samples of formatted values
 
 This table provides examples of formatted values specified in a Mustache template, and a sample of what the output:
 
diff --git a/extensions/amp-date-countdown/1.0/amp-date-countdown.js b/extensions/amp-date-countdown/1.0/amp-date-countdown.js
index c2cf41774feb..24e1044afb6c 100644
--- a/extensions/amp-date-countdown/1.0/amp-date-countdown.js
+++ b/extensions/amp-date-countdown/1.0/amp-date-countdown.js
@@ -1,8 +1,9 @@
 import {isLayoutSizeDefined} from '#core/dom/layout';
-import {dict} from '#core/types/object';
 
 import {isExperimentOn} from '#experiments';
 
+import {AmpPreactBaseElement, setSuperClass} from '#preact/amp-base-element';
+
 import {Services} from '#service';
 
 import {dev, userAssert} from '#utils/log';
@@ -12,7 +13,10 @@ import {BaseElement} from './base-element';
 /** @const {string} */
 const TAG = 'amp-date-countdown';
 
-class AmpDateCountdown extends BaseElement {
+class AmpDateCountdown extends setSuperClass(
+  BaseElement,
+  AmpPreactBaseElement
+) {
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -51,18 +55,18 @@ class AmpDateCountdown extends BaseElement {
           // A new template has been set while the old one was initializing.
           return;
         }
-        this.mutateProps(
-          dict({
-            'render': (data) => {
-              return templates
-                .renderTemplateAsString(dev().assertElement(template), data)
-                .then((html) => dict({'__html': html}));
-            },
-          })
-        );
+        this.mutateProps({
+          'render': (data) => {
+            return templates
+              .renderTemplateAsString(dev().assertElement(template), data)
+              .then((html) => ({
+                '__html': html,
+              }));
+          },
+        });
       });
     } else {
-      this.mutateProps(dict({'render': null}));
+      this.mutateProps({'render': null});
     }
   }
 
diff --git a/extensions/amp-date-countdown/1.0/base-element.js b/extensions/amp-date-countdown/1.0/base-element.js
index 810baee4e2b0..3e052d5e2564 100644
--- a/extensions/amp-date-countdown/1.0/base-element.js
+++ b/extensions/amp-date-countdown/1.0/base-element.js
@@ -4,6 +4,8 @@ import {PreactBaseElement} from '#preact/base-element';
 
 import {BentoDateCountdown} from './component';
 
+export const TAG = 'bento-date-countdown';
+
 export class BaseElement extends PreactBaseElement {}
 
 /** @override */
@@ -30,9 +32,9 @@ BaseElement['props'] = {
     ],
     parseAttrs: parseDateAttrs,
   },
-  'whenEnded': {attr: 'when-ended', type: 'string'},
-  'locale': {attr: 'locale', type: 'string'},
-  'biggestUnit': {attr: 'biggest-unit', type: 'string'},
+  'whenEnded': {attr: 'when-ended'},
+  'locale': {attr: 'locale'},
+  'biggestUnit': {attr: 'biggest-unit'},
   'countUp': {attr: 'count-up', type: 'boolean'},
 };
 
diff --git a/extensions/amp-date-countdown/1.0/bento-date-countdown.js b/extensions/amp-date-countdown/1.0/bento-date-countdown.js
new file mode 100644
index 000000000000..fe1b4b82d9d4
--- /dev/null
+++ b/extensions/amp-date-countdown/1.0/bento-date-countdown.js
@@ -0,0 +1,3 @@
+import {defineElement} from './web-component';
+
+defineElement();
diff --git a/extensions/amp-date-countdown/1.0/component.js b/extensions/amp-date-countdown/1.0/component.js
index d6f4bec479e7..86252b03f61c 100644
--- a/extensions/amp-date-countdown/1.0/component.js
+++ b/extensions/amp-date-countdown/1.0/component.js
@@ -1,9 +1,9 @@
 import {getDate} from '#core/types/date';
-import {dict} from '#core/types/object';
 
 import * as Preact from '#preact';
 import {useEffect, useMemo, useRef, useState} from '#preact';
-import {Wrapper, useRenderer} from '#preact/component';
+import {Wrapper} from '#preact/component';
+import {useRenderer} from '#preact/component/renderer';
 import {useAmpContext} from '#preact/context';
 import {useResourcesNotify} from '#preact/utils';
 
@@ -27,7 +27,7 @@ const MILLISECONDS_IN_SECOND = 1000;
 /** @const {number} */
 const DELAY = 1000;
 
-/** @const {Object<string, number>} */
+/** @const {{[key: string]: number}} */
 const TimeUnit = {
   DAYS: 1,
   HOURS: 2,
@@ -58,12 +58,12 @@ const DEFAULT_RENDER = (data) =>
  * @return {PreactDef.Renderable}
  */
 export function BentoDateCountdown({
-  datetime,
-  whenEnded = DEFAULT_WHEN_ENDED,
-  locale = DEFAULT_LOCALE,
   biggestUnit = DEFAULT_BIGGEST_UNIT,
   countUp = DEFAULT_COUNT_UP,
+  datetime,
+  locale = DEFAULT_LOCALE,
   render = DEFAULT_RENDER,
+  whenEnded = DEFAULT_WHEN_ENDED,
   ...rest
 }) {
   useResourcesNotify();
@@ -147,14 +147,14 @@ function getLocaleWord(locale) {
     locale = DEFAULT_LOCALE;
   }
   const localeWordList = getLocaleStrings(locale);
-  return dict({
+  return {
     'years': localeWordList[0],
     'months': localeWordList[1],
     'days': localeWordList[2],
     'hours': localeWordList[3],
     'minutes': localeWordList[4],
     'seconds': localeWordList[5],
-  });
+  };
 }
 
 /**
@@ -182,18 +182,18 @@ function getYDHMSFromMs(ms, biggestUnit, countUp) {
     TimeUnit[biggestUnit] == TimeUnit.HOURS
       ? supportBackDate(Math.floor(ms / MILLISECONDS_IN_HOUR))
       : TimeUnit[biggestUnit] < TimeUnit.HOURS
-      ? supportBackDate(
-          Math.floor((ms % MILLISECONDS_IN_DAY) / MILLISECONDS_IN_HOUR)
-        )
-      : 0;
+        ? supportBackDate(
+            Math.floor((ms % MILLISECONDS_IN_DAY) / MILLISECONDS_IN_HOUR)
+          )
+        : 0;
   const m =
     TimeUnit[biggestUnit] == TimeUnit.MINUTES
       ? supportBackDate(Math.floor(ms / MILLISECONDS_IN_MINUTE))
       : TimeUnit[biggestUnit] < TimeUnit.MINUTES
-      ? supportBackDate(
-          Math.floor((ms % MILLISECONDS_IN_HOUR) / MILLISECONDS_IN_MINUTE)
-        )
-      : 0;
+        ? supportBackDate(
+            Math.floor((ms % MILLISECONDS_IN_HOUR) / MILLISECONDS_IN_MINUTE)
+          )
+        : 0;
   const s =
     TimeUnit[biggestUnit] == TimeUnit.SECONDS
       ? supportBackDate(Math.floor(ms / MILLISECONDS_IN_SECOND))
@@ -201,7 +201,7 @@ function getYDHMSFromMs(ms, biggestUnit, countUp) {
           Math.floor((ms % MILLISECONDS_IN_MINUTE) / MILLISECONDS_IN_SECOND)
         );
 
-  return dict({
+  return {
     'd': d,
     'dd': padStart(d),
     'h': h,
@@ -210,7 +210,7 @@ function getYDHMSFromMs(ms, biggestUnit, countUp) {
     'mm': padStart(m),
     's': s,
     'ss': padStart(s),
-  });
+  };
 }
 
 /**
diff --git a/extensions/amp-date-countdown/1.0/messages.js b/extensions/amp-date-countdown/1.0/messages.js
index 2ebadba63ff3..aea03f901ab6 100644
--- a/extensions/amp-date-countdown/1.0/messages.js
+++ b/extensions/amp-date-countdown/1.0/messages.js
@@ -9,7 +9,7 @@ export function getLocaleStrings(locale) {
 
 /**
  * Strings representing years, minutes, etc. in various locales
- * @type {Object<string, !Array<string>>}
+ * @type {{[key: string]: !Array<string>}}
  */
 const LOCALE_WORD = {
   'de': ['Jahren', 'Monaten', 'Tagen', 'Stunden', 'Minuten', 'Sekunden'],
diff --git a/extensions/amp-date-countdown/1.0/web-component.js b/extensions/amp-date-countdown/1.0/web-component.js
new file mode 100644
index 000000000000..e291bf8dac8d
--- /dev/null
+++ b/extensions/amp-date-countdown/1.0/web-component.js
@@ -0,0 +1,32 @@
+import mustache from '#bento/components/bento-mustache/1.0/bento-mustache';
+import {getTemplate} from '#bento/util/template';
+
+import {defineBentoElement} from '#preact/bento-ce';
+
+import {BaseElement, TAG} from './base-element';
+
+export class BentoDateCountdown extends BaseElement {
+  /** @override */
+  checkPropsPostMutations() {
+    const template = getTemplate(this.element);
+    if (!template) {
+      // show error?
+      return;
+    }
+
+    this.mutateProps({
+      'render': (data) => {
+        const html = mustache.render(template./*OK*/ innerHTML, data);
+        return {'__html': html};
+      },
+    });
+  }
+}
+
+/**
+ * Registers `<bento-date-countdown>` component to CustomElements registry
+ * @param {typeof globalThis=} win
+ */
+export function defineElement(win) {
+  defineBentoElement(TAG, BentoDateCountdown, win);
+}
diff --git a/extensions/amp-date-display/0.1/amp-date-display.js b/extensions/amp-date-display/0.1/amp-date-display.js
index 11589e6b7c4e..e3a9de1ddc8d 100644
--- a/extensions/amp-date-display/0.1/amp-date-display.js
+++ b/extensions/amp-date-display/0.1/amp-date-display.js
@@ -1,4 +1,4 @@
-import {AmpEvents} from '#core/constants/amp-events';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
 import {removeChildren} from '#core/dom';
 import {isLayoutSizeDefined} from '#core/dom/layout';
 import {dashToCamelCase} from '#core/types/string';
@@ -19,7 +19,7 @@ const DEFAULT_LOCALE = 'en';
 /** @const {number} */
 const DEFAULT_OFFSET_SECONDS = 0;
 
-/** @const {!Object<string, *>} */
+/** @const {!{[key: string]: *}} */
 const DEFAULT_DATETIME_OPTIONS = {
   'year': 'numeric',
   'month': 'short',
@@ -96,7 +96,7 @@ export class AmpDateDisplay extends AMP.BaseElement {
     /** @private {string} */
     this.locale_ = '';
 
-    /** @private {Object<string, *>} */
+    /** @private {{[key: string]: *}} */
     this.localeOptions_ = null;
 
     /** @private {?../../../src/service/template-impl.Templates} */
@@ -212,7 +212,7 @@ export class AmpDateDisplay extends AMP.BaseElement {
   /**
    * @param {!Element} element
    * @param {string} attrPrefix
-   * @return {Object<string, *>|undefined}
+   * @return {{[key: string]: *}|undefined}
    * @private
    */
   parseLocaleOptionsAttrs_(element, attrPrefix) {
@@ -235,7 +235,7 @@ export class AmpDateDisplay extends AMP.BaseElement {
   /**
    * @param {!Date} date
    * @param {string} locale
-   * @param {?Object<string, *>} localeOptions
+   * @param {?{[key: string]: *}} localeOptions
    * @return {string}
    * @private
    */
@@ -250,7 +250,7 @@ export class AmpDateDisplay extends AMP.BaseElement {
   /**
    * @param {!Date} date
    * @param {string} locale
-   * @param {?Object<string, *>} localeOptions
+   * @param {?{[key: string]: *}} localeOptions
    * @return {!VariablesDef}
    * @private
    */
@@ -280,7 +280,7 @@ export class AmpDateDisplay extends AMP.BaseElement {
   /**
    * @param {!Date} date
    * @param {string} locale
-   * @param {?Object<string, *>} localeOptions
+   * @param {?{[key: string]: *}} localeOptions
    * @return {!VariablesDef}
    * @private
    */
@@ -371,7 +371,7 @@ export class AmpDateDisplay extends AMP.BaseElement {
 
       const event = createCustomEvent(
         this.win,
-        AmpEvents.DOM_UPDATE,
+        AmpEvents_Enum.DOM_UPDATE,
         /* detail */ null,
         {bubbles: true}
       );
diff --git a/extensions/amp-date-display/0.1/test/test-amp-date-display.js b/extensions/amp-date-display/0.1/test/test-amp-date-display.js
index 232f127afc95..5d0b40d5d5e0 100644
--- a/extensions/amp-date-display/0.1/test/test-amp-date-display.js
+++ b/extensions/amp-date-display/0.1/test/test-amp-date-display.js
@@ -210,7 +210,7 @@ describes.realWin(
 
         const data = impl.getDataForTemplate_();
 
-        expect(data.localeString).to.equal('上午4:05');
+        expect(data.localeString).to.equal('凌晨4:05');
       });
 
       it('locale, data-options-time-style, and data-options-date-style', async () => {
@@ -223,7 +223,7 @@ describes.realWin(
 
         const data = impl.getDataForTemplate_();
 
-        expect(data.localeString).to.equal('2001年2月3日 星期六 上午4:05:06');
+        expect(data.localeString).to.equal('2001年2月3日 星期六 凌晨4:05:06');
       });
     });
 
diff --git a/extensions/amp-date-display/1.0/README.md b/extensions/amp-date-display/1.0/README.md
index 770ac7b2c57d..cb524642fccd 100644
--- a/extensions/amp-date-display/1.0/README.md
+++ b/extensions/amp-date-display/1.0/README.md
@@ -4,21 +4,152 @@ Displays time data that you can render in your page. By providing specific [attr
 
 ## Web Component
 
-We don't support the web component version of `bento-date-display` since `<template>` support is still being designed. This effort can be tracked in this [issue](https://go.amp.dev/issue/36619).
+You must include each Bento component's required CSS library to guarantee proper loading and before adding custom styles. Or use the light-weight pre-upgrade styles available inline. See [Layout and style](#layout-and-style).
 
-<!--
-An older version of this file contains the removed section, though it's incorrect:
+### Example: Import via npm
+
+Install via npm:
+
+```sh
+npm install @bentoproject/bento-date-display
+```
+
+```javascript
+import {defineElement as defineBentoDateDisplay} from '@bentoproject/bento-date-display';
+defineBentoDateDisplay();
+```
+
+### Include via `<script>`
+
+```html
+<script type="module" src="https://cdn.ampproject.org/bento.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/bento.js" crossorigin="anonymous"></script>
+<!-- Include bento-mustache.js to use mustache templates with this component -->
+<script async src="https://cdn.ampproject.org/v0/bento-mustache.js"></script>
+<script type="module" src="https://cdn.ampproject.org/v0/bento-date-display-1.0.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/v0/bento-date-display-1.0.js" crossorigin="anonymous"></script>
+<link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-date-display-1.0.css" crossorigin="anonymous">
+```
+
+### Example
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script async src="https://cdn.ampproject.org/v0/bento-mustache.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-date-display-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-date-display-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-date-display-1.0.css"
+    />
+  </head>
+  <body>
+    <bento-date-display
+      datetime="2021-09-09T16:02:08.494Z"
+      displayIn="utc"
+      locale="en-GB"
+    >
+      <template>
+        <div>ISO: {{iso}}; locale: {{localeString}}</div>
+      </template>
+    </bento-date-display>
+  </body>
+</html>
+```
+
+### Interactivity and API usage
+
+The Bento Date Display component does not have an imperative API. However, the Bento Date Display Web Component will render a mustache-template, provided by the consumer in a `<template>` tag with `type="amp-mustache"`. This template may interpolate date-related parameters. See the [Returned Time Parameters section](#returned-time-parameters) for a full list of all the available parameters.
+
+### Layout and style
+
+Each Bento component has a small CSS library you must include to guarantee proper loading without [content shifts](https://web.dev/cls/). Because of order-based specificity, you must manually ensure that stylesheets are included before any custom styles.
+
+```html
+<link rel="stylesheet" type="text/css" href="https://cdn.ampproject.org/v0/bento-date-display-1.0.css">
+```
+
+Alternatively, you may also make the light-weight pre-upgrade styles available inline:
 
-https://github.com/ampproject/amphtml/blob/422d171e87571c4d125a2bf956e78e92444c10e8/extensions/amp-date-display/1.0/README.md
--->
+```html
+<style data-bento-boilerplate>
+  bento-date-display {
+    display: block;
+    overflow: hidden;
+    position: relative;
+  }
+</style>
+```
+
+### Attributes
+
+#### `datetime`
+
+The `datetime` attribute specifies the date and time in a standard ISO 8601 date
+string (e.g. 2017-08-02T15:05:05.000Z) or the string `now`. If set to `now`,
+`bento-date-display` will use the time the page loaded to render its template.
+
+#### `timestamp-ms`
+
+The `timestamp-ms` attribute specifies the date and time using the number of
+milliseconds since 1970-01-01T0:00:00.000Z
+
+#### `timestamp-seconds`
+
+The `timestamp-seconds` attribute specifies the date and time using the number
+of seconds since 1970-01-01T0:00:00.000Z
+
+#### `locale` (optional)
+
+An internationalization language string for each timer unit. The default value
+is `en` (for English). This attribute supports all values that are supported by
+the user's browser.
+
+#### `display-in` (optional)
+
+If set to the value `utc`, the `display-in` attribute will convert the given
+date to UTC.
+
+#### `offset-seconds` (optional)
+
+The `offset-seconds` attribute specifies an integer number of seconds to shift
+the given date.
+
+#### `data-options-\*` (optional)
+
+The `data-options-*` supports all the options under [Intl.DateTimeFormat.options](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat#parameters)
+parameter that specifies the formatting style to use for `localeString` format.
+Valid attributes include: `data-options-date-style`, `data-options-time-style`, etc.
+
+Note that if `display-in` attrubute is set to `utc`, the value of
+`data-options-time-zone` will automatically be converted to `UTC`.
+
+### Styling
+
+You may use the `bento-date-display` element selector to style the Bento Date Display component freely.
 
 ---
 
 ## Preact/React Component
 
-The examples below demonstrates use of the `<BentoDateDisplay>` as a functional component usable with the Preact or React libraries.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/date-display
@@ -55,8 +186,7 @@ The Bento Date Display Preact/React component allows consumers to render their o
 
 #### `datetime`
 
-Required prop. Denotes the date and time as a Date, String, or Nuumber. If String, must be a
-standard ISO 8601 date string (e.g. 2017-08-02T15:05:05.000Z) or the string `now`. If set to `now`, it will use the time the page loaded to render its template. If Number, must be a POSIX epoch value in milliseconds.
+Required prop. Denotes the date and time as a Date, String, or Number. If String, must be a standard ISO 8601 date string (e.g. 2017-08-02T15:05:05.000Z) or the string `now`. If set to `now`, it will use the time the page loaded to render its template. If Number, must be a POSIX epoch value in milliseconds.
 
 #### `displayIn`
 
@@ -75,8 +205,8 @@ Note that if the `displayIn` prop is set to `utc`, the value of `localeOptions.t
 #### `render`
 
 Optional callback that should render a template. The callback will be provided an object with properties/values related to the date expressed in `datetime`.
-By default, the Bento Date Display component will display the [`localeString` form of the Date](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toLocaleString) for the given locale and localeOption.
-See the [Returned Time Parameters section](#returned-time-parameters) for more details on how each property will be displayed.
+
+By default, the Bento Date Display component will display the [`localeString` form of the Date](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toLocaleString) for the given locale and localeOption. See the [Returned Time Parameters section](#returned-time-parameters) for more details on how each property will be displayed.
 
 ```typescript
 (dateParams: DateParams) => JSXInternal.Element
diff --git a/extensions/amp-date-display/1.0/amp-date-display.js b/extensions/amp-date-display/1.0/amp-date-display.js
index 3c20b7f30b2f..a0640c576760 100644
--- a/extensions/amp-date-display/1.0/amp-date-display.js
+++ b/extensions/amp-date-display/1.0/amp-date-display.js
@@ -1,7 +1,7 @@
-import {dict} from '#core/types/object';
-
 import {isExperimentOn} from '#experiments';
 
+import {AmpPreactBaseElement, setSuperClass} from '#preact/amp-base-element';
+
 import {Services} from '#service';
 
 import {dev, userAssert} from '#utils/log';
@@ -11,7 +11,7 @@ import {BaseElement} from './base-element';
 /** @const {string} */
 const TAG = 'amp-date-display';
 
-class AmpDateDisplay extends BaseElement {
+class AmpDateDisplay extends setSuperClass(BaseElement, AmpPreactBaseElement) {
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -48,18 +48,18 @@ class AmpDateDisplay extends BaseElement {
             // A new template has been set while the old one was initializing.
             return;
           }
-          this.mutateProps(
-            dict({
-              'render': (data) => {
-                return templates
-                  .renderTemplateAsString(dev().assertElement(template), data)
-                  .then((html) => dict({'__html': html}));
-              },
-            })
-          );
+          this.mutateProps({
+            'render': (data) => {
+              return templates
+                .renderTemplateAsString(dev().assertElement(template), data)
+                .then((html) => ({
+                  '__html': html,
+                }));
+            },
+          });
         });
       } else {
-        this.mutateProps(dict({'render': null}));
+        this.mutateProps({'render': null});
       }
     }
   }
diff --git a/extensions/amp-date-display/1.0/base-element.js b/extensions/amp-date-display/1.0/base-element.js
index f8810598fd7c..664fd1ec49f1 100644
--- a/extensions/amp-date-display/1.0/base-element.js
+++ b/extensions/amp-date-display/1.0/base-element.js
@@ -1,9 +1,12 @@
 import {parseDateAttrs as parseDateAttrsBase} from '#core/dom/parse-date-attributes';
 
 import {PreactBaseElement} from '#preact/base-element';
+import {createParseAttrsWithPrefix} from '#preact/parse-props';
 
 import {BentoDateDisplay} from './component';
 
+export const TAG = 'bento-date-display';
+
 export class BaseElement extends PreactBaseElement {}
 
 /** @override */
@@ -17,7 +20,7 @@ BaseElement['props'] = {
   },
   'displayIn': {attr: 'display-in'},
   'locale': {attr: 'locale'},
-  'localeOptions': {attrPrefix: 'data-options-'},
+  'localeOptions': createParseAttrsWithPrefix('data-options-'),
 };
 
 /** @override */
diff --git a/extensions/amp-date-display/1.0/bento-date-display.js b/extensions/amp-date-display/1.0/bento-date-display.js
new file mode 100644
index 000000000000..fe1b4b82d9d4
--- /dev/null
+++ b/extensions/amp-date-display/1.0/bento-date-display.js
@@ -0,0 +1,3 @@
+import {defineElement} from './web-component';
+
+defineElement();
diff --git a/extensions/amp-date-display/1.0/component.js b/extensions/amp-date-display/1.0/component.js
index 9f4a1f9409b8..87203472fd1d 100644
--- a/extensions/amp-date-display/1.0/component.js
+++ b/extensions/amp-date-display/1.0/component.js
@@ -2,7 +2,8 @@ import {getDate} from '#core/types/date';
 
 import * as Preact from '#preact';
 import {useMemo} from '#preact';
-import {Wrapper, useRenderer} from '#preact/component';
+import {Wrapper} from '#preact/component';
+import {useRenderer} from '#preact/component/renderer';
 import {useResourcesNotify} from '#preact/utils';
 
 import {user} from '#utils/log';
@@ -18,7 +19,7 @@ const DEFAULT_DISPLAY_IN = 'local';
 /** @const {string} */
 const DEFAULT_LOCALE = 'en';
 
-/** @const {!Object<string, *>} */
+/** @const {!{[key: string]: *}} */
 const DEFAULT_DATETIME_OPTIONS = {
   'year': 'numeric',
   'month': 'short',
@@ -113,7 +114,7 @@ export function BentoDateDisplay({
  * @param {!Date} date
  * @param {string} displayIn
  * @param {string} locale
- * @param {Object<string, *>} localeOptions
+ * @param {{[key: string]: *}} localeOptions
  * @return {!EnhancedVariablesV2Def}
  */
 function getDataForTemplate(date, displayIn, locale, localeOptions) {
@@ -162,7 +163,7 @@ function enhanceBasicVariables(data) {
 /**
  * @param {!Date} date
  * @param {string} locale
- * @param {?Object<string, *>} localeOptions
+ * @param {?{[key: string]: *}} localeOptions
  * @return {string}
  * @private
  */
@@ -177,7 +178,7 @@ function getLocaleString_(date, locale, localeOptions) {
 /**
  * @param {!Date} date
  * @param {string} locale
- * @param {?Object<string, *>} localeOptions
+ * @param {?{[key: string]: *}} localeOptions
  * @return {!VariablesV2Def}
  */
 function getVariablesInLocal(
@@ -210,7 +211,7 @@ function getVariablesInLocal(
 /**
  * @param {!Date} date
  * @param {string} locale
- * @param {?Object<string, *>} localeOptions
+ * @param {?{[key: string]: *}} localeOptions
  * @return {!VariablesV2Def}
  */
 function getVariablesInUTC(
diff --git a/extensions/amp-date-display/1.0/component.type.js b/extensions/amp-date-display/1.0/component.type.js
index 37cde259860c..d58c312e84c8 100644
--- a/extensions/amp-date-display/1.0/component.type.js
+++ b/extensions/amp-date-display/1.0/component.type.js
@@ -8,7 +8,7 @@ var BentoDateDisplayDef = {};
  *   datetime: (!Date|number|string),
  *   displayIn: (string|undefined),
  *   locale: (string|undefined),
- *   localeOptions: (Object<string, *>),
+ *   localeOptions: ({[key: string]: *}),
  *   render: (?RendererFunctionType|undefined),
  * }}
  */
diff --git a/extensions/amp-date-display/1.0/storybook/Basic.amp.js b/extensions/amp-date-display/1.0/storybook/Basic.amp.js
index fc1f53705243..99b70a9b79d3 100644
--- a/extensions/amp-date-display/1.0/storybook/Basic.amp.js
+++ b/extensions/amp-date-display/1.0/storybook/Basic.amp.js
@@ -1,41 +1,49 @@
 import {withAmp} from '@ampproject/storybook-addon';
-import {date, select, withKnobs} from '@storybook/addon-knobs';
 
 import * as Preact from '#preact';
 
-const DISPLAY_IN_OPTIONS = ['utc', 'local'];
-const LOCALES = ['en-US', 'en-GB', 'fr', 'ru', 'ar', 'he', 'ja'];
-
 export default {
   title: 'amp-date-display-1_0',
-  decorators: [withKnobs, withAmp],
-
+  decorators: [withAmp],
   parameters: {
     extensions: [
       {name: 'amp-date-display', version: '1.0'},
       {name: 'amp-mustache', version: '0.2'},
     ],
-
     experiments: ['bento'],
   },
+  argTypes: {
+    dateTime: {
+      name: 'Date/time',
+      control: {type: 'date'},
+      defaultValue: Date.now(),
+    },
+    displayIn: {
+      name: 'Display in',
+      defaultValue: 'utc',
+      options: ['utc', 'local'],
+      control: {type: 'select'},
+    },
+    locale: {
+      name: 'Locale',
+      defaultValue: 'en-US',
+      options: ['en-US', 'en-GB', 'fr', 'ru', 'ar', 'he', 'ja'],
+      control: {type: 'select'},
+    },
+  },
 };
 
-export const Default = () => {
-  const datetime = new Date(date('Date/Time', new Date())).toISOString();
-  const displayIn = select(
-    'Display in',
-    DISPLAY_IN_OPTIONS,
-    DISPLAY_IN_OPTIONS[0]
-  );
-  const locale = select('Locale', LOCALES, LOCALES[0]);
+export const Default = ({dateTime, displayIn, locale, ...args}) => {
+  dateTime = new Date(dateTime);
   return (
     <amp-date-display
-      datetime={datetime}
+      datetime={dateTime}
       display-in={displayIn}
       locale={locale}
       layout="responsive"
       width="100"
       height="100"
+      {...args}
     >
       <template type="amp-mustache">
         <div>
@@ -47,39 +55,29 @@ export const Default = () => {
   );
 };
 
-Default.storyName = 'default';
-
-export const DefaultRenderer = () => {
-  const datetime = new Date(date('Date/Time', new Date())).toISOString();
-  const displayIn = select(
-    'Display in',
-    DISPLAY_IN_OPTIONS,
-    DISPLAY_IN_OPTIONS[0]
-  );
-  const locale = select('Locale', LOCALES, LOCALES[0]);
+export const DefaultRenderer = ({dateTime, displayIn, locale, ...args}) => {
+  dateTime = new Date(dateTime);
   return (
     <amp-date-display
-      datetime={datetime}
+      datetime={dateTime}
       display-in={displayIn}
       locale={locale}
       layout="responsive"
       width="100"
       height="100"
+      {...args}
     />
   );
 };
 
-DefaultRenderer.storyName = 'default renderer';
-
-export const ExternalTemplate = () => {
-  const datetime = new Date(date('Date/Time', new Date())).toISOString();
-  const displayIn = select(
-    'Display in',
-    DISPLAY_IN_OPTIONS,
-    DISPLAY_IN_OPTIONS[0]
-  );
-  const locale = select('Locale', LOCALES, LOCALES[0]);
-  const template = select('Template', ['template1', 'template2'], 'template1');
+export const ExternalTemplate = ({
+  dateTime,
+  displayIn,
+  locale,
+  template,
+  ...args
+}) => {
+  dateTime = new Date(dateTime);
   return (
     <div>
       <template type="amp-mustache" id="template1">
@@ -89,16 +87,24 @@ export const ExternalTemplate = () => {
         <div>{`Template2: {{day}} {{month}} {{year}}`}</div>
       </template>
       <amp-date-display
-        datetime={datetime}
+        datetime={dateTime}
         display-in={displayIn}
         locale={locale}
         template={template}
         layout="responsive"
         width="100"
         height="100"
+        {...args}
       ></amp-date-display>
     </div>
   );
 };
 
-ExternalTemplate.storyName = 'external template';
+ExternalTemplate.argTypes = {
+  template: {
+    name: 'Template',
+    defaultValue: 'template1',
+    options: ['template1', 'template2'],
+    control: {type: 'select'},
+  },
+};
diff --git a/extensions/amp-date-display/1.0/storybook/Basic.js b/extensions/amp-date-display/1.0/storybook/Basic.js
index 69b4520282fc..f58685a34999 100644
--- a/extensions/amp-date-display/1.0/storybook/Basic.js
+++ b/extensions/amp-date-display/1.0/storybook/Basic.js
@@ -1,5 +1,3 @@
-import {date, select, withKnobs} from '@storybook/addon-knobs';
-
 import * as Preact from '#preact';
 
 import {BentoDateDisplay} from '../component';
@@ -7,45 +5,48 @@ import {BentoDateDisplay} from '../component';
 export default {
   title: 'DateDisplay',
   component: BentoDateDisplay,
-  decorators: [withKnobs],
+  argTypes: {
+    datetime: {
+      name: 'Date/time',
+      control: {type: 'date'},
+      defaultValue: Date.now(),
+    },
+    displayIn: {
+      name: 'Display in',
+      defaultValue: 'utc',
+      options: ['utc', 'local'],
+      control: {type: 'select'},
+    },
+    locale: {
+      name: 'Locale',
+      defaultValue: 'en-US',
+      options: ['en-US', 'en-GB', 'fr', 'ru', 'ar', 'he', 'ja'],
+      control: {type: 'select'},
+    },
+  },
 };
 
-const DISPLAY_IN_OPTIONS = ['utc', 'local'];
-const LOCALES = ['en-US', 'en-GB', 'fr', 'ru', 'ar', 'he', 'ja'];
-
-export const _default = () => {
-  const dateTime = date('Date/time', new Date());
-  const displayIn = select(
-    'Display in',
-    DISPLAY_IN_OPTIONS,
-    DISPLAY_IN_OPTIONS[0]
-  );
-  const locale = select('Locale', LOCALES, LOCALES[0]);
+export const Default = ({datetime, displayIn, locale, ...args}) => {
   return (
     <BentoDateDisplay
-      datetime={dateTime}
+      datetime={datetime}
       displayIn={displayIn}
       locale={locale}
       render={(date) => (
         <div>{`ISO: ${date.iso}; locale: ${date.localeString}`}</div>
       )}
+      {...args}
     />
   );
 };
 
-export const defaultRenderer = () => {
-  const displayIn = select(
-    'Display in',
-    DISPLAY_IN_OPTIONS,
-    DISPLAY_IN_OPTIONS[0]
-  );
-  const dateTime = date('Date/time', new Date());
-  const locale = select('Locale', LOCALES, LOCALES[0]);
+export const DefaultRenderer = ({datetime, displayIn, locale, ...args}) => {
   return (
     <BentoDateDisplay
-      datetime={dateTime}
+      datetime={datetime}
       displayIn={displayIn}
       locale={locale}
+      {...args}
     />
   );
 };
diff --git a/extensions/amp-date-display/1.0/test/test-amp-date-display.js b/extensions/amp-date-display/1.0/test/test-amp-date-display.js
index 28b2c4a9848e..d414e9468856 100644
--- a/extensions/amp-date-display/1.0/test/test-amp-date-display.js
+++ b/extensions/amp-date-display/1.0/test/test-amp-date-display.js
@@ -177,7 +177,7 @@ describes.realWin(
 
       const data = await getRenderedData();
 
-      expect(data.localeString).to.equal('上午4:05');
+      expect(data.localeString).to.equal('凌晨4:05');
     });
 
     it('render localeString with data-options-date-style & data-options-time-style', async () => {
@@ -190,7 +190,7 @@ describes.realWin(
 
       const data = await getRenderedData();
 
-      expect(data.localeString).to.equal('2001年2月3日 星期六 上午4:05:06');
+      expect(data.localeString).to.equal('2001年2月3日 星期六 凌晨4:05:06');
     });
 
     describe('invalid data-options-* settings', () => {
diff --git a/extensions/amp-date-display/1.0/test/test-component.js b/extensions/amp-date-display/1.0/test/test-component.js
index f4069d115c25..e72fc271db3d 100644
--- a/extensions/amp-date-display/1.0/test/test-component.js
+++ b/extensions/amp-date-display/1.0/test/test-component.js
@@ -201,7 +201,7 @@ describes.sandboxed('DateDisplay 1.0 preact component', {}, (env) => {
     expect(data.monthNameShort).to.equal('úno');
     expect(data.dayName).to.equal('sobota');
     expect(data.dayNameShort).to.equal('so');
-    expect(data.timeZoneName).to.equal('Koordinovaný světový čas');
+    expect(data.timeZoneName).to.equal('koordinovaný světový čas');
     expect(data.timeZoneNameShort).to.equal('UTC');
   });
 
@@ -218,7 +218,7 @@ describes.sandboxed('DateDisplay 1.0 preact component', {}, (env) => {
     const wrapper = mount(jsx);
     const data = JSON.parse(wrapper.text());
 
-    expect(data.localeString).to.equal('上午4:05');
+    expect(data.localeString).to.equal('凌晨4:05');
   });
 
   const expectedTimeZoneNamesAmericaNewYork = {
diff --git a/extensions/amp-date-display/1.0/web-component.js b/extensions/amp-date-display/1.0/web-component.js
new file mode 100644
index 000000000000..ca08b4ea12af
--- /dev/null
+++ b/extensions/amp-date-display/1.0/web-component.js
@@ -0,0 +1,32 @@
+import mustache from '#bento/components/bento-mustache/1.0/bento-mustache';
+import {getTemplate} from '#bento/util/template';
+
+import {defineBentoElement} from '#preact/bento-ce';
+
+import {BaseElement, TAG} from './base-element';
+
+export class BentoDateDisplay extends BaseElement {
+  /** @override */
+  checkPropsPostMutations() {
+    const template = getTemplate(this.element);
+    if (!template) {
+      // show error?
+      return;
+    }
+
+    this.mutateProps({
+      'render': (data) => {
+        const html = mustache.render(template./*OK*/ innerHTML, data);
+        return {'__html': html};
+      },
+    });
+  }
+}
+
+/**
+ * Registers `<bento-date-display>` component to CustomElements registry
+ * @param {typeof globalThis=} win
+ */
+export function defineElement(win) {
+  defineBentoElement(TAG, BentoDateDisplay, win);
+}
diff --git a/extensions/amp-date-display/format.js b/extensions/amp-date-display/format.js
index 49edb39292fa..0e3a68aeb200 100644
--- a/extensions/amp-date-display/format.js
+++ b/extensions/amp-date-display/format.js
@@ -6,7 +6,7 @@
 /**
  * @param {!Date} date
  * @param {string} locale
- * @param {?Object<string, *>} options
+ * @param {?{[key: string]: *}} options
  * @param {string=} format ('long' by default)
  * @return {string}
  * @private
diff --git a/extensions/amp-date-picker/0.1/amp-date-picker.js b/extensions/amp-date-picker/0.1/amp-date-picker.js
index 732789d5df8f..09e0ddfe1af2 100644
--- a/extensions/amp-date-picker/0.1/amp-date-picker.js
+++ b/extensions/amp-date-picker/0.1/amp-date-picker.js
@@ -1,18 +1,18 @@
-import {ActionTrust} from '#core/constants/action-constants';
-import {AmpEvents} from '#core/constants/amp-events';
-import {Keys} from '#core/constants/key-codes';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
+import {Keys_Enum} from '#core/constants/key-codes';
 import {FiniteStateMachine} from '#core/data-structures/finite-state-machine';
 import {Deferred} from '#core/data-structures/promise';
-import {isRTL, iterateCursor, tryFocus} from '#core/dom';
+import {isRTL, tryFocus} from '#core/dom';
 import {escapeCssSelectorIdent} from '#core/dom/css-selectors';
-import {Layout, isLayoutSizeDefined} from '#core/dom/layout';
+import {Layout_Enum, isLayoutSizeDefined} from '#core/dom/layout';
 import {
   closestAncestorElementBySelector,
   scopedQuerySelector,
 } from '#core/dom/query';
 import {computedStyle} from '#core/dom/style';
 import {once} from '#core/types/function';
-import {dict, map} from '#core/types/object';
+import {map} from '#core/types/object';
 import {dashToCamelCase} from '#core/types/string';
 
 import {Services} from '#service';
@@ -320,7 +320,7 @@ export class AmpDatePicker extends AMP.BaseElement {
     );
 
     /** @private */
-    this.renderedTemplates_ = dict();
+    this.renderedTemplates_ = {};
 
     const deferred = new Deferred();
 
@@ -351,10 +351,10 @@ export class AmpDatePicker extends AMP.BaseElement {
 
   /** @override */
   isLayoutSupported(layout) {
-    // NOTE: Layout.CONTAINER is only valid for mode="overlay",
+    // NOTE: Layout_Enum.CONTAINER is only valid for mode="overlay",
     // but since element attributes are not guaranteed to be present until
     // buildCallback is called, we cannot check the mode here.
-    return isLayoutSizeDefined(layout) || layout == Layout.CONTAINER;
+    return isLayoutSizeDefined(layout) || layout == Layout_Enum.CONTAINER;
   }
 
   /** @override */
@@ -510,7 +510,7 @@ export class AmpDatePicker extends AMP.BaseElement {
 
   /** @override */
   mutatedAttributesCallback(mutations) {
-    const newState = dict();
+    const newState = {};
 
     const min = mutations['min'];
     if (min !== undefined) {
@@ -587,66 +587,54 @@ export class AmpDatePicker extends AMP.BaseElement {
     sm.addTransition(STATIC, STATIC, noop);
 
     sm.addTransition(OVERLAY_CLOSED, OVERLAY_OPEN_INPUT, () => {
-      this.setState_(
-        dict({
-          'isOpen': true,
-          'isFocused': false,
-          'focused': false,
-        })
-      ).then(() => {
+      this.setState_({
+        'isOpen': true,
+        'isFocused': false,
+        'focused': false,
+      }).then(() => {
         this.triggerEvent_(DatePickerEvent.ACTIVATE);
       });
     });
     sm.addTransition(OVERLAY_CLOSED, OVERLAY_OPEN_PICKER, () => {
-      this.setState_(
-        dict({
-          'isOpen': true,
-          'isFocused': true,
-          'focused': true,
-        })
-      );
+      this.setState_({
+        'isOpen': true,
+        'isFocused': true,
+        'focused': true,
+      });
     });
     sm.addTransition(OVERLAY_CLOSED, OVERLAY_CLOSED, noop);
 
     sm.addTransition(OVERLAY_OPEN_INPUT, OVERLAY_OPEN_PICKER, () => {
-      this.setState_(
-        dict({
-          'isOpen': true,
-          'isFocused': true,
-          'focused': true,
-        })
-      );
+      this.setState_({
+        'isOpen': true,
+        'isFocused': true,
+        'focused': true,
+      });
     });
     sm.addTransition(OVERLAY_OPEN_INPUT, OVERLAY_CLOSED, () => {
       this.updateDateFieldFocus_(null);
-      this.setState_(
-        dict({
-          'isOpen': false,
-          'isFocused': false,
-          'focused': false,
-        })
-      );
+      this.setState_({
+        'isOpen': false,
+        'isFocused': false,
+        'focused': false,
+      });
     });
     sm.addTransition(OVERLAY_OPEN_INPUT, OVERLAY_OPEN_INPUT, noop);
 
     sm.addTransition(OVERLAY_OPEN_PICKER, OVERLAY_OPEN_PICKER, noop);
     sm.addTransition(OVERLAY_OPEN_PICKER, OVERLAY_OPEN_INPUT, () => {
-      this.setState_(
-        dict({
-          'isFocused': false,
-          'focused': false,
-        })
-      );
+      this.setState_({
+        'isFocused': false,
+        'focused': false,
+      });
     });
     sm.addTransition(OVERLAY_OPEN_PICKER, OVERLAY_CLOSED, () => {
       this.updateDateFieldFocus_(null);
-      this.setState_(
-        dict({
-          'isOpen': false,
-          'isFocused': false,
-          'focused': false,
-        })
-      );
+      this.setState_({
+        'isOpen': false,
+        'isFocused': false,
+        'focused': false,
+      });
     });
 
     return sm;
@@ -697,7 +685,7 @@ export class AmpDatePicker extends AMP.BaseElement {
    * @param {moment} date
    */
   handleSetDate_(date) {
-    this.setState_(dict({'date': date}));
+    this.setState_({'date': date});
     this.updateDateField_(this.dateField_, date);
     this.element.setAttribute('date', this.getFormattedDate_(date));
     this.triggerEvent_(DatePickerEvent.SELECT, this.getSelectData_(date));
@@ -720,7 +708,7 @@ export class AmpDatePicker extends AMP.BaseElement {
    * @param {?moment} endDate
    */
   handleSetDates_(startDate, endDate) {
-    const state = dict();
+    const state = {};
 
     if (startDate) {
       state['startDate'] = startDate;
@@ -791,14 +779,12 @@ export class AmpDatePicker extends AMP.BaseElement {
     this.element.removeAttribute('start-date');
     this.element.removeAttribute('end-date');
 
-    this.setState_(
-      dict({
-        'date': null,
-        'startDate': null,
-        'endDate': null,
-        'focusedInput': this.ReactDatesConstants_['START_DATE'],
-      })
-    );
+    this.setState_({
+      'date': null,
+      'startDate': null,
+      'endDate': null,
+      'focusedInput': this.ReactDatesConstants_['START_DATE'],
+    });
     this.triggerEvent_(DatePickerEvent.SELECT, null);
 
     if (this.props_['reopenPickerOnClearDate']) {
@@ -840,7 +826,7 @@ export class AmpDatePicker extends AMP.BaseElement {
     const max = element.getAttribute('max') || '';
     const min = element.getAttribute('min') || '';
 
-    return dict({
+    return {
       'date': date,
       'endDate': endDate,
       'focused': this.mode_ == DatePickerMode.STATIC,
@@ -850,7 +836,7 @@ export class AmpDatePicker extends AMP.BaseElement {
       'max': max,
       'min': min,
       'startDate': startDate,
-    });
+    };
   }
 
   /**
@@ -1065,18 +1051,14 @@ export class AmpDatePicker extends AMP.BaseElement {
     if (this.isDateField_(target)) {
       if (target == this.startDateField_) {
         this.updateDateFieldFocus_(this.startDateField_);
-        this.setState_(
-          dict({
-            'focusedInput': this.ReactDatesConstants_['START_DATE'],
-          })
-        );
+        this.setState_({
+          'focusedInput': this.ReactDatesConstants_['START_DATE'],
+        });
       } else if (target == this.endDateField_) {
         this.updateDateFieldFocus_(this.endDateField_);
-        this.setState_(
-          dict({
-            'focusedInput': this.ReactDatesConstants_['END_DATE'],
-          })
-        );
+        this.setState_({
+          'focusedInput': this.ReactDatesConstants_['END_DATE'],
+        });
       } else if (target == this.dateField_) {
         this.updateDateFieldFocus_(this.dateField_);
       }
@@ -1102,14 +1084,14 @@ export class AmpDatePicker extends AMP.BaseElement {
       target === this.dateField_
         ? 'date'
         : target === this.startDateField_
-        ? 'startDate'
-        : target === this.endDateField_
-        ? 'endDate'
-        : '';
+          ? 'startDate'
+          : target === this.endDateField_
+            ? 'endDate'
+            : '';
     const moment = this.createMoment_(target.value);
     const isValid =
       moment && moment.isValid() && moment.year() > MIN_PICKER_YEAR;
-    this.setState_(dict({[property]: isValid ? moment : null}));
+    this.setState_({[property]: isValid ? moment : null});
   }
 
   /**
@@ -1136,7 +1118,7 @@ export class AmpDatePicker extends AMP.BaseElement {
    */
   handleDocumentKeydown_(e) {
     if (
-      e.key == Keys.ESCAPE &&
+      e.key == Keys_Enum.ESCAPE &&
       this.mode_ == DatePickerMode.OVERLAY &&
       this.element.contains(this.document_.activeElement)
     ) {
@@ -1156,7 +1138,7 @@ export class AmpDatePicker extends AMP.BaseElement {
       return;
     }
 
-    if (e.key == Keys.DOWN_ARROW) {
+    if (e.key == Keys_Enum.DOWN_ARROW) {
       this.updateDateFieldFocus_(target);
       this.transitionTo_(DatePickerState.OVERLAY_OPEN_PICKER);
       if (this.mode_ === DatePickerMode.STATIC) {
@@ -1167,7 +1149,7 @@ export class AmpDatePicker extends AMP.BaseElement {
         }
       }
       e.preventDefault();
-    } else if (e.key == Keys.ESCAPE) {
+    } else if (e.key == Keys_Enum.ESCAPE) {
       this.transitionTo_(DatePickerState.OVERLAY_CLOSED);
     } else {
       this.transitionTo_(DatePickerState.OVERLAY_OPEN_INPUT);
@@ -1307,7 +1289,7 @@ export class AmpDatePicker extends AMP.BaseElement {
    * @private
    */
   clearRenderedTemplates_() {
-    this.renderedTemplates_ = dict();
+    this.renderedTemplates_ = {};
   }
 
   /**
@@ -1328,7 +1310,7 @@ export class AmpDatePicker extends AMP.BaseElement {
    */
   parseElementTemplates_(templates) {
     const parsed = [];
-    iterateCursor(templates, (template) =>
+    templates.forEach((template) =>
       parsed.push(this.parseElementTemplate_(template))
     );
     return parsed;
@@ -1396,13 +1378,11 @@ export class AmpDatePicker extends AMP.BaseElement {
 
     const selectData = this.getSelectData_(startDate, endDate);
     this.triggerEvent_(DatePickerEvent.SELECT, selectData);
-    this.setState_(
-      dict({
-        'startDate': startDate,
-        'endDate': endDate,
-        'isFocused': this.mode_ == DatePickerMode.STATIC || !isFinalSelection,
-      })
-    );
+    this.setState_({
+      'startDate': startDate,
+      'endDate': endDate,
+      'isFocused': this.mode_ == DatePickerMode.STATIC || !isFinalSelection,
+    });
     this.updateDateField_(this.startDateField_, startDate);
     this.element.setAttribute('start-date', this.getFormattedDate_(startDate));
     this.updateDateField_(this.endDateField_, endDate);
@@ -1461,7 +1441,7 @@ export class AmpDatePicker extends AMP.BaseElement {
    */
   onDateChange(date) {
     this.triggerEvent_(DatePickerEvent.SELECT, this.getSelectData_(date));
-    this.setState_(dict({'date': date}));
+    this.setState_({'date': date});
     this.updateDateField_(this.dateField_, date);
     this.element.setAttribute('date', this.getFormattedDate_(date));
 
@@ -1481,18 +1461,16 @@ export class AmpDatePicker extends AMP.BaseElement {
       focusedInput === START_DATE
         ? this.startDateField_
         : focusedInput === END_DATE
-        ? this.endDateField_
-        : this.dateField_;
+          ? this.endDateField_
+          : this.dateField_;
     this.updateDateFieldFocus_(focusedField, this.state_['isOpen']);
 
-    this.setState_(
-      dict({
-        'focusedInput': !focusedInput
-          ? this.ReactDatesConstants_['START_DATE']
-          : focusedInput,
-        'focused': this.mode_ == DatePickerMode.STATIC,
-      })
-    );
+    this.setState_({
+      'focusedInput': !focusedInput
+        ? this.ReactDatesConstants_['START_DATE']
+        : focusedInput,
+      'focused': this.mode_ == DatePickerMode.STATIC,
+    });
   }
 
   /**
@@ -1523,7 +1501,7 @@ export class AmpDatePicker extends AMP.BaseElement {
    */
   triggerEvent_(name, opt_data = null) {
     const event = createCustomEvent(this.win, `${TAG}.${name}`, opt_data);
-    this.action_.trigger(this.element, name, event, ActionTrust.HIGH);
+    this.action_.trigger(this.element, name, event, ActionTrust_Enum.HIGH);
   }
 
   /**
@@ -1875,7 +1853,7 @@ export class AmpDatePicker extends AMP.BaseElement {
     } else {
       const renderedEvent = createCustomEvent(
         this.win,
-        AmpEvents.DOM_UPDATE,
+        AmpEvents_Enum.DOM_UPDATE,
         /* detail */ null,
         {bubbles: true}
       );
@@ -1933,27 +1911,25 @@ export class AmpDatePicker extends AMP.BaseElement {
         // in the month.
         this.reactRender_(
           this.react_.createElement(Picker, {
-            ...dict({
-              'allowBlockedEndDate': this.allowBlockedEndDate_,
-              'min': props['min'],
-              'max': props['max'],
-              'date': props['date'],
-              'startDate': props['startDate'],
-              'endDate': props['endDate'],
-              'isRTL': this.isRTL_,
-              'onDateChange': this.onDateChange,
-              'onDatesChange': this.onDatesChange,
-              'onFocusChange': this.onFocusChange,
-              'onMount': this.onMount,
-              'renderDay': this.renderDay,
-              'blocked': this.blocked_,
-              'highlighted': this.highlighted_,
-              'firstDayOfWeek': this.firstDayOfWeek_,
-              'daySize': this.daySize_,
-              'weekDayFormat': this.weekDayFormat_,
-              'isFocused': props['isFocused'], // should automatically focus
-              'focused': props['focused'],
-            }),
+            'allowBlockedEndDate': this.allowBlockedEndDate_,
+            'min': props['min'],
+            'max': props['max'],
+            'date': props['date'],
+            'startDate': props['startDate'],
+            'endDate': props['endDate'],
+            'isRTL': this.isRTL_,
+            'onDateChange': this.onDateChange,
+            'onDatesChange': this.onDatesChange,
+            'onFocusChange': this.onFocusChange,
+            'onMount': this.onMount,
+            'renderDay': this.renderDay,
+            'blocked': this.blocked_,
+            'highlighted': this.highlighted_,
+            'firstDayOfWeek': this.firstDayOfWeek_,
+            'daySize': this.daySize_,
+            'weekDayFormat': this.weekDayFormat_,
+            'isFocused': props['isFocused'],
+            'focused': props['focused'],
             ...props,
           }),
           this.container_
diff --git a/extensions/amp-date-picker/0.1/date-picker-common.js b/extensions/amp-date-picker/0.1/date-picker-common.js
index c74d44809756..30907258b476 100644
--- a/extensions/amp-date-picker/0.1/date-picker-common.js
+++ b/extensions/amp-date-picker/0.1/date-picker-common.js
@@ -1,4 +1,4 @@
-import {dict, omit} from '#core/types/object';
+import {omit} from '#core/types/object';
 
 import {requireExternal} from '../../../src/module';
 
@@ -78,14 +78,14 @@ export function withDatePickerCommon(WrappedComponent) {
     return list.contains(day);
   }
 
-  const defaultProps = dict({
+  const defaultProps = {
     'allowBlockedEndDate': false,
     'blocked': null,
     'highlighted': null,
     'initialVisibleMonth': '',
     'max': '',
     'min': '',
-  });
+  };
 
   /**
    * Detect if a date is a blocked date. This is aware of the
@@ -202,12 +202,10 @@ export function withDatePickerCommon(WrappedComponent) {
 
     return react.createElement(WrappedComponent, {
       ...props,
-      ...dict({
-        'daySize': Number(daySize),
-        'isDayBlocked': this.isDayBlocked,
-        'isDayHighlighted': this.isDayHighlighted,
-        'isOutsideRange': this.isOutsideRange,
-      }),
+      'daySize': Number(daySize),
+      'isDayBlocked': this.isDayBlocked,
+      'isDayHighlighted': this.isDayHighlighted,
+      'isOutsideRange': this.isOutsideRange,
     });
   };
 
diff --git a/extensions/amp-date-picker/0.1/date-range-picker.js b/extensions/amp-date-picker/0.1/date-range-picker.js
index 50ef87b56219..82829716adf4 100644
--- a/extensions/amp-date-picker/0.1/date-range-picker.js
+++ b/extensions/amp-date-picker/0.1/date-range-picker.js
@@ -1,5 +1,3 @@
-import {dict} from '#core/types/object';
-
 import {withDatePickerCommon} from './date-picker-common';
 import {DayPickerPhrases} from './defaultPhrases';
 import {wrap as withMaximumNights} from './wrappers/maximum-nights';
@@ -20,7 +18,7 @@ function createDateRangePickerBase() {
     requireExternal('react-dates')['DayPickerRangeController']
   );
 
-  const defaultProps = dict({
+  const defaultProps = {
     'startDate': null, // TODO: use null
     'endDate': null, // TODO: use null
     'onDatesChange': function () {},
@@ -70,7 +68,7 @@ function createDateRangePickerBase() {
     'phrases': DayPickerPhrases,
 
     'isRTL': false,
-  });
+  };
 
   const WrappedDayPickerRangeController = withDatePickerCommon(
     withMaximumNights(DayPickerRangeController)
diff --git a/extensions/amp-date-picker/0.1/dates-list.js b/extensions/amp-date-picker/0.1/dates-list.js
index 54eaaca04f52..900d7c51d842 100644
--- a/extensions/amp-date-picker/0.1/dates-list.js
+++ b/extensions/amp-date-picker/0.1/dates-list.js
@@ -1,7 +1,6 @@
-import * as rrule from '../../../node_modules/rrule/dist/es5/rrule';
-import {requireExternal} from '../../../src/module';
+import {rrulestr} from 'rrule';
 
-const rrulestr = rrule.default.rrulestr || rrule.rrulestr; // closure imports into .default, esbuild flattens a layer.
+import {requireExternal} from '../../../src/module';
 
 /** @enum {string} */
 const DateType = {
diff --git a/extensions/amp-date-picker/0.1/defaultPhrases.js b/extensions/amp-date-picker/0.1/defaultPhrases.js
index 75c86b98e5e5..366d18374bba 100644
--- a/extensions/amp-date-picker/0.1/defaultPhrases.js
+++ b/extensions/amp-date-picker/0.1/defaultPhrases.js
@@ -1,5 +1,3 @@
-import {dict} from '#core/types/object';
-
 const calendarLabel = 'Calendar';
 const jumpToPrevMonth = 'Move backward to switch to the previous month.';
 const jumpToNextMonth = 'Move forward to switch to the next month.';
@@ -57,8 +55,7 @@ const dateIsUnavailable = (obj) => {
 /**
  * @type {!JsonObject}
  */
-// eslint-disable-next-line local/no-export-side-effect
-export const DayPickerPhrases = dict({
+export const DayPickerPhrases = {
   'calendarLabel': calendarLabel,
   'jumpToPrevMonth': jumpToPrevMonth,
   'jumpToNextMonth': jumpToNextMonth,
@@ -83,4 +80,4 @@ export const DayPickerPhrases = dict({
   'chooseAvailableEndDate': chooseAvailableEndDate,
   'chooseAvailableDate': chooseAvailableDate,
   'dateIsUnavailable': dateIsUnavailable,
-});
+};
diff --git a/extensions/amp-date-picker/0.1/single-date-picker.js b/extensions/amp-date-picker/0.1/single-date-picker.js
index 6ff3a747e947..8e4fce155d06 100644
--- a/extensions/amp-date-picker/0.1/single-date-picker.js
+++ b/extensions/amp-date-picker/0.1/single-date-picker.js
@@ -1,5 +1,3 @@
-import {dict} from '#core/types/object';
-
 import {withDatePickerCommon} from './date-picker-common';
 import {DayPickerPhrases} from './defaultPhrases';
 
@@ -20,7 +18,7 @@ function createSingleDatePickerBase() {
     requireExternal('react-dates')['DayPickerSingleDateController']
   );
 
-  const defaultProps = dict({
+  const defaultProps = {
     'date': null,
     'onDateChange': function () {},
 
@@ -68,7 +66,7 @@ function createSingleDatePickerBase() {
     'phrases': DayPickerPhrases,
 
     'isRTL': false,
-  });
+  };
 
   const WrappedDayPickerSingleDateController = withFocusedTrueHack(
     withDatePickerCommon(DayPickerSingleDateController)
@@ -104,7 +102,7 @@ function withFocusedTrueHack(WrappedComponent) {
 
   /** @override */
   FocusedTrueHack.prototype.render = function () {
-    const props = {...this.props, ...dict({'focused': true})};
+    const props = {...this.props, 'focused': true};
     return react.createElement(WrappedComponent, props);
   };
 
diff --git a/extensions/amp-date-picker/0.1/test/integration/test-integration-amp-date-picker-init.js b/extensions/amp-date-picker/0.1/test/integration/test-integration-amp-date-picker-init.js
index c817282303cc..7411b60b7517 100644
--- a/extensions/amp-date-picker/0.1/test/integration/test-integration-amp-date-picker-init.js
+++ b/extensions/amp-date-picker/0.1/test/integration/test-integration-amp-date-picker-init.js
@@ -1,4 +1,4 @@
-import {AmpEvents} from '#core/constants/amp-events';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
 
 import {createFixtureIframe} from '#testing/iframe';
 
@@ -24,7 +24,7 @@ config.run('amp-date-picker', {}, async () => {
     expect(fixture.doc.querySelectorAll(testExtension)).to.have.length(1);
     // Wait for a the LOAD_START event which is enough of a signal that the
     // runtime has executed.
-    await fixture.awaitEvent(AmpEvents.LOAD_START, 1);
+    await fixture.awaitEvent(AmpEvents_Enum.LOAD_START, 1);
     expect(fixture.doc.documentElement.getAttribute('esm')).to.equal('1');
     checkElementUpgrade(fixture.doc.querySelector(testExtension));
   });
diff --git a/extensions/amp-date-picker/0.1/test/test-amp-date-picker.js b/extensions/amp-date-picker/0.1/test/test-amp-date-picker.js
index fa232cae32a9..03ea2b791eac 100644
--- a/extensions/amp-date-picker/0.1/test/test-amp-date-picker.js
+++ b/extensions/amp-date-picker/0.1/test/test-amp-date-picker.js
@@ -80,7 +80,7 @@ describes.realWin(
     /**
      * Create a template from a body and attributes
      * @param {string} body
-     * @param {!Object<string, string>=} opt_attrs
+     * @param {!{[key: string]: string}=} opt_attrs
      */
     function createDateTemplate(body, opt_attrs) {
       const template = createTemplate(body);
diff --git a/extensions/amp-story-shopping/amp-story-shopping.md b/extensions/amp-date-picker/1.0/amp-date-picker.css
similarity index 100%
rename from extensions/amp-story-shopping/amp-story-shopping.md
rename to extensions/amp-date-picker/1.0/amp-date-picker.css
diff --git a/extensions/amp-date-picker/1.0/amp-date-picker.js b/extensions/amp-date-picker/1.0/amp-date-picker.js
new file mode 100644
index 000000000000..27990235754a
--- /dev/null
+++ b/extensions/amp-date-picker/1.0/amp-date-picker.js
@@ -0,0 +1,51 @@
+import {isExperimentOn} from '#experiments';
+
+import {AmpPreactBaseElement, setSuperClass} from '#preact/amp-base-element';
+
+import {userAssert} from '#utils/log';
+
+import {BaseElement} from './base-element';
+
+import {CSS} from '../../../build/amp-date-picker-1.0.css';
+
+/** @const {string} */
+const TAG = 'amp-date-picker';
+
+/** @extends {PreactBaseElement<BentoDatePickerDef.BentoDatePickerApi} */
+class AmpDatePicker extends setSuperClass(BaseElement, AmpPreactBaseElement) {
+  /** @override */
+  init() {
+    this.registerApiAction('clear', (api) => api./*OK*/ clear());
+    this.registerApiAction('today', (api, invocation) =>
+      api./*OK*/ today(invocation.args?.['offset'])
+    );
+    this.registerApiAction('startToday', (api, invocation) =>
+      api./*OK*/ startToday(invocation.args?.['offset'])
+    );
+    this.registerApiAction('endToday', (api, invocation) =>
+      api./*OK*/ endToday(invocation.args?.['offset'])
+    );
+    this.registerApiAction('setDate', (api, invocation) =>
+      api./*OK*/ setDate(invocation.args?.['date'])
+    );
+    this.registerApiAction('setDates', (api, invocation) =>
+      api./*OK*/ setDates(invocation.args?.['start'], invocation.args?.['end'])
+    );
+
+    return super.init();
+  }
+
+  /** @override */
+  isLayoutSupported() {
+    userAssert(
+      isExperimentOn(this.win, 'bento') ||
+        isExperimentOn(this.win, 'bento-date-picker'),
+      'expected global "bento" or specific "bento-date-picker" experiment to be enabled'
+    );
+    return true;
+  }
+}
+
+AMP.extension(TAG, '1.0', (AMP) => {
+  AMP.registerElement(TAG, AmpDatePicker, CSS);
+});
diff --git a/extensions/amp-date-picker/1.0/base-element.js b/extensions/amp-date-picker/1.0/base-element.js
new file mode 100644
index 000000000000..4509a11ec702
--- /dev/null
+++ b/extensions/amp-date-picker/1.0/base-element.js
@@ -0,0 +1,71 @@
+import {parseBooleanAttribute} from '#core/dom';
+
+import {PreactBaseElement} from '#preact/base-element';
+
+import {BentoDatePicker} from './component';
+import {CSS as COMPONENT_CSS} from './component.jss';
+import {parseDate, parseDateList, parseLocale, parseNumber} from './parsers';
+
+export class BaseElement extends PreactBaseElement {}
+
+/** @override */
+BaseElement['Component'] = BentoDatePicker;
+
+/** @override */
+BaseElement['props'] = {
+  'allowBlockedEndDate': {
+    attr: 'allow-blocked-end-date',
+    parseAttr: parseBooleanAttribute,
+  },
+  'allowBlockedRanges': {
+    attr: 'allow-blocked-ranges',
+    parseAttr: parseBooleanAttribute,
+  },
+  'blocked': {attr: 'blocked', parseAttr: parseDateList},
+  'children': {passthrough: true},
+  // Not implemented
+  'daySize': {attr: 'day-size', parseAttr: parseNumber},
+  'endInputSelector': {attr: 'end-input-selector'},
+  // Not implemented
+  'firstDayOfWeek': {attr: 'first-day-of-week', parseAttr: parseNumber},
+  'format': {attr: 'format'},
+  // Not implemented
+  'fullscreen': {attr: 'fullscreen', parseAttr: parseBooleanAttribute},
+  // Not implemented
+  'hideKeyboardShortcutsPanel': {
+    attr: 'hide-keyboard-shortcuts-panel',
+    parseAttr: parseBooleanAttribute,
+  },
+  'highlighted': {attr: 'highlighted', parseAttr: parseDateList},
+  'initialVisibleMonth': {attr: 'initial-visible-month', parseAttr: parseDate},
+  'inputSelector': {attr: 'input-selector'},
+  'locale': {attr: 'locale', parseAttr: parseLocale},
+  'max': {attr: 'max', parseAttr: parseDate},
+  'maximumNights': {attr: 'maximum-nights', parseAttr: parseNumber},
+  'min': {attr: 'min', parseAttr: parseDate},
+  'minimumNights': {attr: 'minimum-nights', parseAttr: parseNumber},
+  'mode': {attr: 'mode'},
+  'monthFormat': {attr: 'month-format'},
+  'numberOfMonths': {attr: 'number-of-months', parseAttr: parseNumber},
+  'openAfterClear': {
+    attr: 'open-after-clear',
+    parseAttr: parseBooleanAttribute,
+  },
+  'openAfterSelect': {
+    attr: 'open-after-select',
+    parseAttr: parseBooleanAttribute,
+  },
+  'startInputSelector': {attr: 'start-input-selector'},
+  'today': {attr: 'today', parseAttr: parseDate},
+  'type': {attr: 'type'},
+  'weekDayFormat': {attr: 'week-day-format'},
+};
+
+/** @override */
+BaseElement['layoutSizeDefined'] = true;
+
+/** @override */
+BaseElement['usesShadowDom'] = true;
+
+/** @override */
+BaseElement['shadowCss'] = COMPONENT_CSS;
diff --git a/extensions/amp-date-picker/1.0/component.js b/extensions/amp-date-picker/1.0/component.js
new file mode 100644
index 000000000000..76f51bd99a09
--- /dev/null
+++ b/extensions/amp-date-picker/1.0/component.js
@@ -0,0 +1 @@
+export * from './component/component';
diff --git a/extensions/amp-date-picker/1.0/component.jss.js b/extensions/amp-date-picker/1.0/component.jss.js
new file mode 100644
index 000000000000..82e07f4aba91
--- /dev/null
+++ b/extensions/amp-date-picker/1.0/component.jss.js
@@ -0,0 +1,279 @@
+import {createUseStyles} from 'react-jss';
+
+// These styles base styles are copied from react-day-picker base CSS with some modifications
+// https://github.com/gpbl/react-day-picker/blob/master/packages/react-day-picker/src/style.css
+const dayPicker = {
+  fontFamily:
+    "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif",
+
+  '& .rdp': {
+    '--header-color': '#000',
+    '--rdp-cell-size': '40px',
+    '--rdp-accent-color': '#0654ab',
+    '--rdp-background-color': '#e4e7e7',
+    '--rdp-outline': '2px solid var(--rdp-background-color)',
+    '--rdp-outline-selected': '2px solid var(--rdp-accent-color)',
+
+    margin: '1em',
+  },
+
+  '& .rdp-vhidden': {
+    boxSizing: 'border-box',
+    margin: 0,
+    background: 'transparent',
+    '-moz-appearance': 'none',
+    '-webkit-appearance': 'none',
+    appearance: 'none',
+    position: 'absolute !important',
+    top: 0,
+    width: '1px !important',
+    height: '1px !important',
+    padding: '0 !important',
+    overflow: 'hidden !important',
+    clip: 'rect(1px, 1px, 1px, 1px) !important',
+    border: '0 !important',
+  },
+
+  '& .rdp-button_reset': {
+    appearance: 'none',
+    position: 'relative',
+    margin: 0,
+    padding: 0,
+    cursor: 'default',
+    color: 'inherit',
+    outline: 'none',
+    background: 'none',
+    font: 'inherit',
+    '-moz-appearance': 'none',
+    '-webkit-appearance': 'none',
+  },
+
+  '& .rdp-button': {
+    border: '2px solid transparent',
+  },
+
+  '& .rdp-button[disabled]': {
+    opacity: 0.25,
+  },
+
+  '& .rdp-button:not([disabled])': {
+    cursor: 'pointer',
+  },
+
+  '& .rdp-button:focus:not([disabled]),.rdp-button:active:not([disabled])': {
+    color: 'inherit',
+    border: 'var(--rdp-outline)',
+    backgroundColor: 'var(--rdp-background-color)',
+  },
+
+  '& .rdp-button:hover:not([disabed])': {
+    backgroundColor: 'var(--rdp-background-color)',
+  },
+
+  '& .rdp-months': {
+    display: 'flex',
+  },
+
+  '& .rdp-month': {
+    margin: '0 1em',
+  },
+
+  '& .rdp-month:first-child': {
+    marginLeft: 0,
+  },
+
+  '& .rdp-month:last-child': {
+    marginRight: 0,
+  },
+
+  '& .rdp-table': {
+    margin: 0,
+    maxWidth: 'calc(var(--rdp-cell-size) * 7)',
+    borderCollapse: 'collapse',
+  },
+
+  '& .rdp-caption': {
+    backgroundColor: 'var(--header-color)',
+    color: 'var(--rdp-background-color)',
+    margin: '0 -30px 38px',
+    paddingBottom: '20px',
+    paddingTop: '20px',
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+    padding: 0,
+    textAlign: 'left',
+  },
+
+  '& .rdp-caption_dropdowns': {
+    position: 'relative',
+    display: 'inline-flex',
+  },
+
+  '& .rdp-caption_label': {
+    fontWeight: 'lighter',
+    position: 'relative',
+    zIndex: 1,
+    display: 'inline-flex',
+    alignItems: 'center',
+    margin: 0,
+    padding: '0 0.25em',
+    whiteSpace: 'nowrap',
+    color: 'currentColor',
+    border: '2px solid transparent',
+    fontFamily: 'inherit',
+    fontSize: '140%',
+  },
+
+  '& .rdp-nav': {
+    whiteSpace: 'nowrap',
+  },
+
+  '& .rdp-multiple_months .rdp-caption_start .rdp-nav': {
+    position: 'absolute',
+    top: '50%',
+    left: 0,
+    transform: 'translateY(-50%)',
+  },
+
+  '& .rdp-multiple_months .rdp-caption_end .rdp-nav': {
+    position: 'absolute',
+    top: '50%',
+    right: 0,
+    transform: 'translateY(-50%)',
+  },
+
+  '& .rdp-nav_button': {
+    '--rdp-background-color': 'var(--header-color)',
+    '--rdp-outline': '2px solid var(--header-color)',
+
+    display: 'inline-flex',
+    alignItems: 'center',
+    justifyContent: 'center',
+    width: 'var(--rdp-cell-size)',
+    height: 'var(--rdp-cell-size)',
+    padding: '0.25em',
+    borderRadius: '100%',
+  },
+
+  '& .rdp-head': {
+    border: 0,
+  },
+
+  '& .rdp-head_row .rdp-row': {
+    height: '100%',
+  },
+
+  '& .rdp-head_cell': {
+    verticalAlign: 'middle',
+    textTransform: 'uppercase',
+    fontSize: '0.75em',
+    fontWeight: 700,
+    textAlign: 'center',
+    height: 'var(--rdp-cell-size)',
+    padding: 0,
+  },
+
+  '& .rdp-tbody': {
+    border: 0,
+  },
+
+  '& .rdp-foot': {
+    margin: '0.5em',
+  },
+
+  '& .rdp-cell': {
+    width: 'var(--rdp-cell-size)',
+    height: 'var(--rdp-cell-size)',
+    padding: 0,
+    textAlign: 'center',
+  },
+
+  '& .rdp-weeknumber': {
+    fontSize: '0.75em',
+  },
+
+  '& .rdp-weeknumber,.rdp-day': {
+    display: 'flex',
+    overflow: 'hidden',
+    alignItems: 'center',
+    justifyContent: 'center',
+    boxSizing: 'border-box',
+    width: 'var(--rdp-cell-size)',
+    maxWidth: 'var(--rdp-cell-size)',
+    height: 'var(--rdp-cell-size)',
+    margin: 0,
+    border: '2px solid transparent',
+    borderRadius: '100%',
+  },
+
+  '& .rdp-day_today:not(.rdp-day_outside)': {
+    fontWeight: 'bold',
+  },
+
+  '& .rdp-day_selected:not([disabled]),.rdp-day_selected:focus:not([disabled]),.rdp-day_selected:active:not([disabled]),.rdp-day_selected:hover:not([disabled])':
+    {
+      color: 'white',
+      backgroundColor: 'var(--rdp-accent-color)',
+    },
+
+  '& .rdp-day_selected:focus:not([disabled])': {
+    border: 'var(--rdp-outline-selected)',
+  },
+
+  "& .rdp:not([dir='rtl']) .rdp-day_range_start:not(.rdp-day_range_end)": {
+    borderTopRightRadius: 0,
+    borderBottomRightRadius: 0,
+  },
+
+  "& .rdp:not([dir='rtl']) .rdp-day_range_end:not(.rdp-day_range_start)": {
+    borderTopLeftRadius: 0,
+    borderBottomLeftRadius: 0,
+  },
+
+  "& .rdp[dir='rtl'] .rdp-day_range_start:not(.rdp-day_range_end)": {
+    borderTopLeftRadius: 0,
+    borderBottomLeftRadius: 0,
+  },
+
+  "& .rdp[dir='rtl'] .rdp-day_range_end:not(.rdp-day_range_start)": {
+    borderTopRightRadius: 0,
+    borderBottomRightRadius: 0,
+  },
+
+  '& .rdp-day_range_end.rdp-day_range_start': {
+    borderRadius: '100%',
+  },
+
+  '& .rdp-day_range_middle': {
+    borderRadius: 0,
+  },
+};
+
+const unmounted = {
+  display: 'none',
+};
+
+const container = {};
+
+const overlay = {
+  position: 'relative',
+
+  '& .rdp': {
+    position: 'absolute',
+    top: 'calc(100% + 10px)',
+    left: '10px',
+    zIndex: 10,
+  },
+};
+
+const JSS = {
+  dayPicker,
+  unmounted,
+  container,
+  overlay,
+};
+
+// useStyles gets replaced for AMP builds via `babel-plugin-transform-jss`.
+// eslint-disable-next-line local/no-export-side-effect
+export const useStyles = createUseStyles(JSS);
diff --git a/extensions/amp-date-picker/1.0/component.type.js b/extensions/amp-date-picker/1.0/component.type.js
new file mode 100644
index 000000000000..485b7e190383
--- /dev/null
+++ b/extensions/amp-date-picker/1.0/component.type.js
@@ -0,0 +1,37 @@
+/** @interface */
+BentoDatePickerDef.BentoDatePickerApi = class {
+  /**
+   */
+  clear() {}
+
+  /**
+   * @param {number|undefined} offset
+   */
+  today(offset) {}
+
+  /**
+   * @param {Date|undefined} date
+   */
+  setDate(date) {}
+
+  /**
+   * @param {number|undefined} offset
+   */
+  startToday(offset) {}
+
+  /**
+   * @param {number|undefined} offset
+   */
+  endToday(offset) {}
+
+  /**
+   * @param {number|undefined} offset
+   */
+  endToday(offset) {}
+
+  /**
+   * @param {Date|undefined} startDate
+   * @param {Date|undefined} endDate
+   */
+  setDates(startDate, endDate) {}
+};
diff --git a/extensions/amp-date-picker/1.0/component/base-date-picker.tsx b/extensions/amp-date-picker/1.0/component/base-date-picker.tsx
new file mode 100644
index 000000000000..51c2adb0dbf8
--- /dev/null
+++ b/extensions/amp-date-picker/1.0/component/base-date-picker.tsx
@@ -0,0 +1,53 @@
+import objStr from 'obj-str';
+import {
+  DayPicker,
+  DayPickerRangeProps,
+  DayPickerSingleProps,
+} from 'react-day-picker';
+
+import * as Preact from '#preact';
+
+import {DayButton} from './day-button';
+import {useDatePickerContext} from './use-date-picker-context';
+
+import {useStyles} from '../component.jss';
+
+type BaseDatePickerProps = (DayPickerSingleProps | DayPickerRangeProps) & {
+  isOpen: boolean;
+};
+
+export function BaseDatePicker({isOpen, ...props}: BaseDatePickerProps) {
+  const classes = useStyles();
+  const {
+    formatMonth,
+    formatWeekday,
+    isDisabled,
+    locale,
+    numberOfMonths,
+    today,
+  } = useDatePickerContext();
+
+  return (
+    <div
+      aria-label="Calendar"
+      hidden={!isOpen}
+      class={objStr({
+        [classes.unmounted]: !isOpen,
+        [classes.dayPicker]: true,
+      })}
+    >
+      <DayPicker
+        components={{Day: DayButton}}
+        disabled={[isDisabled]}
+        formatters={{
+          formatCaption: formatMonth,
+          formatWeekdayName: formatWeekday,
+        }}
+        locale={locale}
+        numberOfMonths={numberOfMonths}
+        today={today}
+        {...props}
+      />
+    </div>
+  );
+}
diff --git a/extensions/amp-date-picker/1.0/component/component.tsx b/extensions/amp-date-picker/1.0/component/component.tsx
new file mode 100644
index 000000000000..ee9c3c247a9a
--- /dev/null
+++ b/extensions/amp-date-picker/1.0/component/component.tsx
@@ -0,0 +1,45 @@
+import * as Preact from '#preact';
+import {forwardRef} from '#preact/compat';
+import {FunctionalComponent, Ref} from '#preact/types';
+
+import {DateRangePicker} from './date-range-picker';
+import {SingleDatePicker} from './single-date-picker';
+import {DatePickerProvider} from './use-date-picker-context';
+
+import {DEFAULT_ON_ERROR} from '../constants';
+import {
+  BentoDatePickerProps,
+  DateRangePickerAPI,
+  SingleDatePickerAPI,
+} from '../types';
+
+const datePickerForType: {
+  [key: string]: FunctionalComponent;
+} = {
+  single: SingleDatePicker,
+  range: DateRangePicker,
+};
+
+function BentoDatePickerWithRef(
+  props: BentoDatePickerProps,
+  ref: Ref<SingleDatePickerAPI | DateRangePickerAPI>
+) {
+  const {children, onError = DEFAULT_ON_ERROR, type = 'single'} = props;
+
+  const DatePicker = datePickerForType[type];
+
+  if (!DatePicker) {
+    onError('Invalid date picker type');
+    return null;
+  }
+
+  return (
+    <DatePickerProvider {...props}>
+      <DatePicker ref={ref}>{children}</DatePicker>
+    </DatePickerProvider>
+  );
+}
+
+const BentoDatePicker = forwardRef(BentoDatePickerWithRef);
+BentoDatePicker.displayName = 'DatePicker';
+export {BentoDatePicker};
diff --git a/extensions/amp-date-picker/1.0/component/date-range-picker.tsx b/extensions/amp-date-picker/1.0/component/date-range-picker.tsx
new file mode 100644
index 000000000000..ec5e19a11367
--- /dev/null
+++ b/extensions/amp-date-picker/1.0/component/date-range-picker.tsx
@@ -0,0 +1,382 @@
+import {isAfter, isBefore, isSameDay, isValid} from 'date-fns';
+import {DateRange, Matcher} from 'react-day-picker';
+
+import {Keys_Enum} from '#core/constants/key-codes';
+
+import * as Preact from '#preact';
+import {
+  useCallback,
+  useEffect,
+  useImperativeHandle,
+  useMemo,
+  useRef,
+  useState,
+} from '#preact';
+import {forwardRef} from '#preact/compat';
+import {ContainWrapper} from '#preact/component';
+import {Ref, RenderableProps} from '#preact/types';
+
+import {BaseDatePicker} from './base-date-picker';
+import {useDatePickerContext} from './use-date-picker-context';
+import {useDatePickerInput} from './use-date-picker-input';
+import {useDatePickerState} from './use-date-picker-state';
+
+import {iterateDateRange} from '../date-helpers';
+import {DateFieldType, DateRangePickerAPI} from '../types';
+
+function DateRangePickerWithRef(
+  {children}: RenderableProps<{}>,
+  ref: Ref<DateRangePickerAPI>
+) {
+  const {
+    allowBlockedEndDate,
+    allowBlockedRanges,
+    blockedDates,
+    endInputSelector,
+    formatDate,
+    getDisabledAfter,
+    getDisabledBefore,
+    initialVisibleMonth,
+    isDisabled,
+    mode,
+    openAfterClear,
+    openAfterSelect,
+    parseDate,
+    startInputSelector,
+    today,
+  } = useDatePickerContext();
+
+  const containerRef = useRef<HTMLElement>(null);
+
+  const [focusedInput, setFocusedInput] =
+    useState<DateFieldType>('start-input');
+
+  const defaultMonth = initialVisibleMonth || today;
+  const [month, setMonth] = useState<Date>(defaultMonth);
+
+  const {isOpen, transitionTo} = useDatePickerState(mode);
+  const startDateInput = useDatePickerInput({
+    inputSelector: startInputSelector,
+    type: 'start-input',
+  });
+
+  const endDateInput = useDatePickerInput({
+    inputSelector: endInputSelector,
+    type: 'end-input',
+  });
+
+  /**
+   * Sets the selected date, month, and input value
+   */
+  const handleSetStartDate = useCallback(
+    (date?: Date) => {
+      if (!date) {
+        return;
+      }
+      startDateInput.handleSetDate(date);
+      setMonth(date);
+    },
+    [startDateInput]
+  );
+
+  /**
+   * Sets the selected date, month, and input value
+   */
+  const handleSetEndDate = useCallback(
+    (date?: Date) => {
+      if (!date) {
+        return;
+      }
+      endDateInput.handleSetDate(date);
+      setMonth(date);
+    },
+    [endDateInput]
+  );
+
+  /**
+   * Detect if a blocked date is between the start and end date, inclusively,
+   * accounting for the `allow-blocked-end-date` attribute.
+   */
+  const isBlockedRange = useCallback(
+    (startDate?: Date, endDate?: Date) => {
+      if (!startDate || !endDate) {
+        return;
+      }
+
+      let blockedCount = 0;
+      if (!allowBlockedRanges) {
+        iterateDateRange(startDate, endDate, (date) => {
+          if (blockedDates.contains(date)) {
+            blockedCount++;
+          }
+        });
+      }
+
+      // If allow-blocked-end-date is enabled, we do not consider the range
+      // blocked when the end date is the only blocked date.
+      if (
+        blockedCount == 1 &&
+        allowBlockedEndDate &&
+        isSameDay(endDate, blockedDates.firstDateAfter(startDate))
+      ) {
+        return false;
+      }
+
+      // If there are any blocked dates in the range, it cannot
+      // be selected.
+      return blockedCount > 0;
+    },
+    [blockedDates, allowBlockedRanges, allowBlockedEndDate]
+  );
+
+  /**
+   * Sets a date range if it is available. Closes the date picker in overlay mode.
+   */
+  const selectDateRange = useCallback(
+    ({from: startDate, to: endDate}: DateRange) => {
+      const isFinalSelection = !openAfterSelect && focusedInput === 'end-input';
+      const isSame = startDate && endDate && isSameDay(startDate, endDate);
+
+      if (isBlockedRange(startDate, endDate)) {
+        return;
+      }
+
+      const disabledAfter = getDisabledAfter(startDate);
+      const disabledBefore = getDisabledBefore(startDate);
+
+      const isAfterDisabledDate =
+        disabledAfter && endDate && isAfter(endDate, disabledAfter);
+      if (isAfterDisabledDate) {
+        return;
+      }
+
+      const isBeforeDisabledDate =
+        disabledBefore &&
+        endDate &&
+        !isSame &&
+        isBefore(endDate, disabledBefore);
+      if (isBeforeDisabledDate) {
+        return;
+      }
+
+      if (focusedInput === 'start-input') {
+        handleSetStartDate(startDate);
+      } else if (focusedInput === 'end-input') {
+        handleSetEndDate(endDate);
+      }
+
+      if (isSame) {
+        setFocusedInput('end-input');
+      }
+
+      if (isFinalSelection) {
+        transitionTo('overlay-closed');
+      }
+    },
+    [
+      handleSetStartDate,
+      handleSetEndDate,
+      isBlockedRange,
+      getDisabledAfter,
+      getDisabledBefore,
+      focusedInput,
+      transitionTo,
+      openAfterSelect,
+    ]
+  );
+
+  /**
+   * Formats date range for react-day-picker
+   */
+  const dateRange = useMemo<DateRange>(() => {
+    return {
+      from: startDateInput.date,
+      to: endDateInput.date,
+    };
+  }, [startDateInput, endDateInput]);
+
+  /**
+   * Resets the date and input value and returns to the initial month
+   */
+  const clear = useCallback(() => {
+    setMonth(defaultMonth);
+    startDateInput.clear();
+    endDateInput.clear();
+
+    if (openAfterClear) {
+      transitionTo('overlay-open-input');
+    }
+  }, [
+    defaultMonth,
+    startDateInput,
+    endDateInput,
+    openAfterClear,
+    transitionTo,
+  ]);
+
+  useImperativeHandle(
+    ref,
+    () => ({
+      clear,
+      setDates: (startDate: Date, endDate: Date) => {
+        // Note: This function does not set the month or respect blocked dates
+        // to maintain feature parity with the original amp date picker.
+        handleSetStartDate(startDate);
+        handleSetEndDate(endDate);
+      },
+      startToday: startDateInput.setToToday,
+      endToday: endDateInput.setToToday,
+    }),
+    [clear, startDateInput, endDateInput, handleSetStartDate, handleSetEndDate]
+  );
+
+  /**
+   * For inputs that are valid dates, update the date-picker value.
+   */
+  const handleStartChange = useCallback(
+    ({target}: InputEvent) => {
+      const date = parseDate((target as HTMLInputElement).value);
+      if (date && isValid(date)) {
+        startDateInput.setDate(date);
+      }
+    },
+    [startDateInput, parseDate]
+  );
+
+  /**
+   * For inputs that are valid dates, update the date-picker value.
+   */
+  const handleEndChange = useCallback(
+    ({target}: InputEvent) => {
+      const date = parseDate((target as HTMLInputElement).value);
+      if (date && isValid(date)) {
+        endDateInput.setDate(date);
+      }
+    },
+    [endDateInput, parseDate]
+  );
+
+  useEffect(() => {
+    startDateInput.initialize(containerRef.current!);
+    endDateInput.initialize(containerRef.current!);
+
+    // This should only be called on first render
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  useEffect(() => {
+    // Since we are passing this ref directly into the container, we can assume
+    // that containerRef.current is defined in this case
+    const containerEl = containerRef.current!;
+    const document = containerEl.ownerDocument;
+    const startInputEl = startDateInput.ref.current;
+    const endInputEl = endDateInput.ref.current;
+    if (!document) {
+      return;
+    }
+
+    const handleFocus = (event: FocusEvent) => {
+      if (event.target === startInputEl) {
+        setFocusedInput('start-input');
+      }
+      if (event.target === endInputEl) {
+        setFocusedInput('end-input');
+      }
+      transitionTo('overlay-open-input');
+    };
+
+    const handleDocumentKeydown = (event: KeyboardEvent) => {
+      if (event.key === Keys_Enum.ESCAPE) {
+        transitionTo('overlay-closed');
+      }
+    };
+    const handleInputKeydown = (event: KeyboardEvent) => {
+      const {target} = event;
+      if ((target as HTMLInputElement).type === 'hidden') {
+        return;
+      }
+
+      if (event.key === Keys_Enum.DOWN_ARROW) {
+        transitionTo('overlay-open-picker');
+      }
+    };
+    const handleClick = (event: MouseEvent) => {
+      // This is necessary for bento mode, since .contains does not work with
+      // elements in the shadow DOM
+      const containsShadowRoot = !!(event.target as Element)?.shadowRoot;
+      const clickWasInDatePicker =
+        event.target === startInputEl ||
+        event.target === endInputEl ||
+        containerEl.contains(event.target as Node) ||
+        containsShadowRoot;
+      if (!clickWasInDatePicker) {
+        transitionTo('overlay-closed');
+      }
+    };
+    if (mode === 'overlay') {
+      document.addEventListener('click', handleClick);
+      document.addEventListener('keydown', handleDocumentKeydown);
+    }
+    startInputEl?.addEventListener('focus', handleFocus);
+    endInputEl?.addEventListener('focus', handleFocus);
+    startInputEl?.addEventListener('change', handleStartChange);
+    endInputEl?.addEventListener('change', handleEndChange);
+    startInputEl?.addEventListener('keydown', handleInputKeydown);
+    endInputEl?.addEventListener('keydown', handleInputKeydown);
+    return () => {
+      document.removeEventListener('click', handleClick);
+      document.removeEventListener('keydown', handleDocumentKeydown);
+      startInputEl?.removeEventListener('focus', handleFocus);
+      endInputEl?.removeEventListener('focus', handleFocus);
+      startInputEl?.removeEventListener('change', handleStartChange);
+      endInputEl?.removeEventListener('change', handleEndChange);
+      startInputEl?.removeEventListener('keydown', handleInputKeydown);
+      endInputEl?.removeEventListener('keydown', handleInputKeydown);
+    };
+  }, [
+    transitionTo,
+    mode,
+    handleStartChange,
+    handleEndChange,
+    startDateInput.ref,
+    endDateInput.ref,
+  ]);
+
+  const disabledMatchers = useMemo(() => {
+    const matchers: Matcher[] = [isDisabled];
+    if (startDateInput.date) {
+      const disabledAfter = getDisabledAfter(startDateInput.date);
+      if (disabledAfter) {
+        matchers.push({after: disabledAfter});
+      }
+    }
+    return matchers;
+  }, [getDisabledAfter, isDisabled, startDateInput.date]);
+
+  return (
+    <ContainWrapper
+      class="amp-date-picker-calendar-container"
+      data-testid="date-picker"
+      ref={containerRef}
+      data-startdate={startDateInput.date && formatDate(startDateInput.date)}
+      data-enddate={endDateInput.date && formatDate(endDateInput.date)}
+    >
+      {children}
+      {startDateInput.hiddenInputComponent}
+      {endDateInput.hiddenInputComponent}
+      <BaseDatePicker
+        mode="range"
+        isOpen={isOpen}
+        selected={dateRange}
+        onSelect={selectDateRange}
+        disabled={disabledMatchers}
+        month={month}
+        onMonthChange={setMonth}
+      />
+    </ContainWrapper>
+  );
+}
+
+const DateRangePicker = forwardRef(DateRangePickerWithRef);
+DateRangePicker.displayName = 'DateRangePicker';
+export {DateRangePicker};
diff --git a/extensions/amp-date-picker/1.0/component/dates-list.js b/extensions/amp-date-picker/1.0/component/dates-list.js
new file mode 100644
index 000000000000..8a9013357d63
--- /dev/null
+++ b/extensions/amp-date-picker/1.0/component/dates-list.js
@@ -0,0 +1,140 @@
+import {addDays, isSameDay, isValid} from 'date-fns';
+import {rrulestr} from 'rrule';
+
+/**
+ * RRULE returns dates as local time formatted at UTC, so the
+ * Date.prototype.getUTC* methods must be used to create a new date object.
+ * {@link https://github.com/jakubroztocil/rrule#important-use-utc-dates}
+ * @param {!Date} rruleDate
+ * @return {!Date}
+ */
+function normalizeRruleReturn(rruleDate) {
+  const year = rruleDate.getUTCFullYear();
+  const month = rruleDate.getUTCMonth();
+  const day = rruleDate.getUTCDate();
+  const hours = rruleDate.getUTCHours();
+  const minutes = rruleDate.getUTCMinutes();
+  const seconds = rruleDate.getUTCSeconds();
+  const ms = rruleDate.getUTCMilliseconds();
+  return new Date(year, month, day, hours, minutes, seconds, ms);
+}
+
+/**
+ * Tries to parse a string into an RRULE object.
+ * @param {string} str A string which represents a repeating date RRULE spec.
+ * @return {?RRule}
+ */
+function tryParseRrulestr(str) {
+  try {
+    return rrulestr(str, {});
+  } catch (e) {
+    return null;
+  }
+}
+
+/** @enum {string} */
+const DateType = {
+  INVALID: 'invalid',
+  RRULE: 'rrule',
+  DATE: 'date',
+};
+/**
+ * A class which wraps a list of moment dates or RRULE dates.
+ */
+export class DatesList {
+  /**
+   * @param {Array<string|Date>|undefined} dates
+   */
+  constructor(dates = []) {
+    /** @private @const */
+    this.rrulestrs_ = dates
+      .filter((d) => this.getDateType_(d) === DateType.RRULE)
+      .map((d) => tryParseRrulestr(d));
+
+    /** @private @const */
+    this.dates_ = dates
+      .filter((d) => this.getDateType_(d) === DateType.DATE)
+      .sort((a, b) => a - b);
+  }
+
+  /**
+   * Determines if the given date is contained within the RRULEs or moment dates
+   * contained in the date list.
+   * @param {!Date|string} date
+   * @return {boolean}
+   */
+  contains(date) {
+    return this.matchesDate_(date) || this.matchesRrule_(date);
+  }
+
+  /**
+   * Gets the first date in the date list after the given date.
+   * @param {!Date} date
+   * @return {!Date}
+   */
+  firstDateAfter(date) {
+    const firstDatesAfter = [];
+    for (let i = 0; i < this.dates_.length; i++) {
+      if (this.dates_[i] >= date) {
+        firstDatesAfter.push(this.dates_[i]);
+        break;
+      }
+    }
+
+    const rruleDates = this.rrulestrs_
+      .map((rrule) => /** @type {RRule} */ rrule.after(date))
+      .filter(Boolean)
+      .map(normalizeRruleReturn);
+
+    return firstDatesAfter.concat(rruleDates).sort((a, b) => {
+      return a - b;
+    })[0];
+  }
+
+  /**
+   * Distinguish between RRULE dates and moment dates.
+   * @param {!Date|string} date
+   * @return {!DateType}
+   * @private
+   */
+  getDateType_(date) {
+    if (isValid(date)) {
+      return DateType.DATE;
+    }
+
+    const dateStr = /** @type {string} */ date;
+    if (tryParseRrulestr(dateStr)) {
+      return DateType.RRULE;
+    }
+
+    return DateType.INVALID;
+  }
+
+  /**
+   * Determines if any internal moment object matches the given date.
+   * @param {!Date} date
+   * @return {boolean}
+   * @private
+   */
+  matchesDate_(date) {
+    return this.dates_.some((d) => isSameDay(d, date));
+  }
+
+  /**
+   * Determines if any internal RRULE object matches the given date.
+   * @param {!Date} date
+   * @return {boolean}
+   * @private
+   */
+  matchesRrule_(date) {
+    const nextDate = addDays(date, 1);
+    return this.rrulestrs_.some((rrule) => {
+      const rruleUTCDate = /** @type {RRule} */ rrule.before(nextDate);
+      if (!rruleUTCDate) {
+        return false;
+      }
+      const rruleLocalDate = normalizeRruleReturn(rruleUTCDate);
+      return isSameDay(rruleLocalDate, date);
+    });
+  }
+}
diff --git a/extensions/amp-date-picker/1.0/component/day-button.tsx b/extensions/amp-date-picker/1.0/component/day-button.tsx
new file mode 100644
index 000000000000..f610c09b0f8f
--- /dev/null
+++ b/extensions/amp-date-picker/1.0/component/day-button.tsx
@@ -0,0 +1,23 @@
+import {Button, DayProps, useDayRender} from 'react-day-picker';
+
+import * as Preact from '#preact';
+import {useRef} from '#preact';
+
+import {useDatePickerContext} from './use-date-picker-context';
+
+export function DayButton({date, displayMonth}: DayProps) {
+  const buttonRef = useRef();
+
+  const {buttonProps} = useDayRender(date, displayMonth, buttonRef);
+  const {getLabel, isDisabled, isHighlighted} = useDatePickerContext();
+
+  return (
+    <Button
+      {...buttonProps}
+      ref={buttonRef}
+      aria-label={getLabel(date)}
+      aria-disabled={isDisabled(date)}
+      data-highlighted={isHighlighted(date)}
+    />
+  );
+}
diff --git a/extensions/amp-date-picker/1.0/component/single-date-picker.tsx b/extensions/amp-date-picker/1.0/component/single-date-picker.tsx
new file mode 100644
index 000000000000..5ec5413d8204
--- /dev/null
+++ b/extensions/amp-date-picker/1.0/component/single-date-picker.tsx
@@ -0,0 +1,210 @@
+import {isValid} from 'date-fns';
+import objStr from 'obj-str';
+
+import {Keys_Enum} from '#core/constants/key-codes';
+
+import * as Preact from '#preact';
+import {
+  useCallback,
+  useEffect,
+  useImperativeHandle,
+  useRef,
+  useState,
+} from '#preact';
+import {forwardRef} from '#preact/compat';
+import {ContainWrapper} from '#preact/component';
+import {Ref, RenderableProps} from '#preact/types';
+
+import {BaseDatePicker} from './base-date-picker';
+import {useDatePickerContext} from './use-date-picker-context';
+import {useDatePickerInput} from './use-date-picker-input';
+import {useDatePickerState} from './use-date-picker-state';
+
+import {useStyles} from '../component.jss';
+import {DEFAULT_INPUT_SELECTOR} from '../constants';
+import {SingleDatePickerAPI} from '../types';
+
+function SingleDatePickerWithRef(
+  {children}: RenderableProps<{}>,
+  ref: Ref<SingleDatePickerAPI>
+) {
+  const {
+    blockedDates,
+    formatDate,
+    initialVisibleMonth,
+    inputSelector = DEFAULT_INPUT_SELECTOR,
+    mode,
+    openAfterClear,
+    openAfterSelect,
+    parseDate,
+    today,
+  } = useDatePickerContext();
+
+  const containerRef = useRef<HTMLElement>(null);
+  const classes = useStyles();
+
+  const defaultMonth = initialVisibleMonth || today;
+  const [month, setMonth] = useState<Date>(defaultMonth);
+
+  const {isOpen, transitionTo} = useDatePickerState(mode);
+
+  const dateInput = useDatePickerInput({
+    inputSelector,
+    type: 'input',
+  });
+
+  /**
+   * Sets the selected date, month, and input value
+   */
+  const handleSetDate = useCallback(
+    (date: Date) => {
+      setMonth(date);
+      dateInput.handleSetDate(date);
+    },
+    [dateInput]
+  );
+
+  /**
+   * Sets a date if it is available. Closes the date picker in overlay mode.
+   */
+  const selectDate = useCallback(
+    (date: Date) => {
+      if (blockedDates.contains(date)) {
+        return;
+      }
+      handleSetDate(date);
+      if (!openAfterSelect && mode === 'overlay') {
+        transitionTo('overlay-closed');
+      }
+    },
+    [blockedDates, handleSetDate, openAfterSelect, transitionTo, mode]
+  );
+
+  /**
+   * For inputs that are valid dates, update the date-picker value.
+   */
+  const handleInput = useCallback(
+    (e: InputEvent) => {
+      const {target} = e;
+      const date = parseDate((target as HTMLInputElement).value);
+      if (date && isValid(date)) {
+        selectDate(date);
+      }
+    },
+    [selectDate, parseDate]
+  );
+
+  /**
+   * Resets the date and input value and returns to the initial month
+   */
+  const clear = useCallback(() => {
+    dateInput.clear();
+    setMonth(defaultMonth);
+
+    if (openAfterClear) {
+      transitionTo('overlay-open-input');
+    }
+  }, [defaultMonth, dateInput, transitionTo, openAfterClear]);
+
+  useImperativeHandle(
+    ref,
+    () => ({
+      clear,
+      today: dateInput.setToToday,
+      setDate: selectDate,
+    }),
+    [clear, dateInput, selectDate]
+  );
+
+  useEffect(() => {
+    dateInput.initialize(containerRef.current!);
+
+    // This should only be called on first render
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  useEffect(() => {
+    // Since we are passing this ref directly into the container, we can assume
+    // that containerRef.current is defined in this case
+    const containerEl = containerRef.current!;
+    const document = containerEl.ownerDocument;
+    const inputEl = dateInput.ref.current;
+
+    if (!document) {
+      return;
+    }
+    const handleFocus = (event: FocusEvent) => {
+      if (event.target === dateInput.ref.current) {
+        transitionTo('overlay-open-input');
+      }
+    };
+    const handleClick = (event: MouseEvent) => {
+      // This is necessary for bento mode, since .contains does not work with
+      // elements in the shadow DOM
+      const containsShadowRoot = !!(event.target as Element)?.shadowRoot;
+      const clickWasInDatePicker =
+        event.target === inputEl ||
+        containerEl.contains(event.target as Node) ||
+        containsShadowRoot;
+      if (!clickWasInDatePicker) {
+        transitionTo('overlay-closed');
+      }
+    };
+    const handleDocumentKeydown = (event: KeyboardEvent) => {
+      if (event.key === Keys_Enum.ESCAPE) {
+        transitionTo('overlay-closed');
+      }
+    };
+    const handleInputKeydown = (event: KeyboardEvent) => {
+      const {target} = event;
+      if ((target as HTMLInputElement).type === 'hidden') {
+        return;
+      }
+
+      if (event.key === Keys_Enum.DOWN_ARROW) {
+        transitionTo('overlay-open-picker');
+      }
+    };
+
+    if (mode === 'overlay') {
+      document.addEventListener('click', handleClick);
+      document.addEventListener('keydown', handleDocumentKeydown);
+    }
+    inputEl?.addEventListener('focus', handleFocus);
+    inputEl?.addEventListener('change', handleInput);
+    inputEl?.addEventListener('keydown', handleInputKeydown);
+    return () => {
+      document.removeEventListener('click', handleClick);
+      document.removeEventListener('keydown', handleDocumentKeydown);
+      inputEl?.removeEventListener('focus', handleFocus);
+      inputEl?.removeEventListener('change', handleInput);
+      inputEl?.removeEventListener('keydown', handleInputKeydown);
+    };
+  }, [transitionTo, mode, handleInput, dateInput]);
+
+  return (
+    <ContainWrapper
+      data-testid="date-picker"
+      class={objStr({
+        [classes.overlay]: mode === 'overlay',
+      })}
+      ref={containerRef}
+      data-date={dateInput.date && formatDate(dateInput.date)}
+    >
+      {children}
+      {dateInput.hiddenInputComponent}
+      <BaseDatePicker
+        mode="single"
+        isOpen={isOpen}
+        selected={dateInput.date}
+        onSelect={selectDate}
+        month={month}
+        onMonthChange={setMonth}
+      />
+    </ContainWrapper>
+  );
+}
+
+const SingleDatePicker = forwardRef(SingleDatePickerWithRef);
+SingleDatePicker.displayName = 'SingleDatePicker';
+export {SingleDatePicker};
diff --git a/extensions/amp-date-picker/1.0/component/use-date-picker-context.tsx b/extensions/amp-date-picker/1.0/component/use-date-picker-context.tsx
new file mode 100644
index 000000000000..aa857952cc7f
--- /dev/null
+++ b/extensions/amp-date-picker/1.0/component/use-date-picker-context.tsx
@@ -0,0 +1,222 @@
+import {addDays, isAfter, isBefore, subDays} from 'date-fns';
+
+import * as Preact from '#preact';
+import {createContext, useCallback, useContext, useMemo} from '#preact';
+
+import {DatesList} from './dates-list';
+
+import {
+  DEFAULT_END_INPUT_SELECTOR,
+  DEFAULT_INPUT_SELECTOR,
+  DEFAULT_LOCALE,
+  DEFAULT_MONTH_FORMAT,
+  DEFAULT_ON_ERROR,
+  DEFAULT_START_INPUT_SELECTOR,
+  DEFAULT_WEEK_DAY_FORMAT,
+  ISO_8601,
+} from '../constants';
+import {getCurrentDate, getFormattedDate} from '../date-helpers';
+import {parseDate as _parseDate} from '../parsers';
+import {BentoDatePickerProps, DatePickerMode} from '../types';
+
+interface DatePickerHelperFunctions {
+  getLabel(date: Date): string;
+  isDisabled(date: Date): boolean;
+  isHighlighted(date: Date): boolean;
+  getDisabledAfter(startDate?: Date): Date | null;
+  getDisabledBefore(startDate?: Date): Date | null;
+  blockedDates: DatesList;
+  highlightedDates: DatesList;
+  parseDate(value: string): Date | null;
+  formatDate(date: Date): string;
+  formatMonth(date: Date): string;
+  formatWeekday(date: Date): string;
+}
+
+// Since we are providing defualts, this adds type safety for the single and range components
+interface RequiredProps {
+  today: Date;
+  mode: DatePickerMode;
+  inputSelector: string;
+  startInputSelector: string;
+  endInputSelector: string;
+}
+
+type DatePickerContextType = BentoDatePickerProps &
+  DatePickerHelperFunctions &
+  RequiredProps;
+
+const DatePickerContext = createContext<DatePickerContextType | null>(null);
+
+/** Example: Wednesday, December 1, 2021 */
+const DATE_FORMAT = 'cccc, LLLL d, yyyy';
+
+export function DatePickerProvider({
+  allowBlockedEndDate,
+  allowBlockedRanges,
+  blocked,
+  children,
+  endInputSelector = DEFAULT_END_INPUT_SELECTOR,
+  format = ISO_8601,
+  highlighted,
+  inputSelector = DEFAULT_INPUT_SELECTOR,
+  locale = DEFAULT_LOCALE,
+  max,
+  maximumNights = 0,
+  min: optionalMin,
+  minimumNights = 1,
+  mode = 'static',
+  monthFormat = DEFAULT_MONTH_FORMAT,
+  numberOfMonths = 1,
+  onError = DEFAULT_ON_ERROR,
+  startInputSelector = DEFAULT_START_INPUT_SELECTOR,
+  today = getCurrentDate(),
+  type = 'single',
+  weekDayFormat = DEFAULT_WEEK_DAY_FORMAT,
+  ...rest
+}: BentoDatePickerProps) {
+  const min = optionalMin || today;
+
+  const formatDate = useCallback(
+    (date: Date) => getFormattedDate(date, format, locale),
+    [format, locale]
+  );
+
+  const parseDate = useCallback(
+    (value: string) => _parseDate(value, format, locale),
+    [format, locale]
+  );
+
+  const formatMonth = useCallback(
+    (date: Date) => {
+      return getFormattedDate(date, monthFormat, locale);
+    },
+    [monthFormat, locale]
+  );
+
+  const formatWeekday = useCallback(
+    (date: Date) => {
+      return getFormattedDate(date, weekDayFormat, locale);
+    },
+    [weekDayFormat, locale]
+  );
+
+  const blockedDates = useMemo(() => {
+    return new DatesList(blocked);
+  }, [blocked]);
+
+  const highlightedDates = useMemo(() => {
+    return new DatesList(highlighted);
+  }, [highlighted]);
+
+  const isOutsideRange = useCallback(
+    (date: Date) => {
+      return isBefore(date, min) || (max && isAfter(date, max));
+    },
+    [min, max]
+  );
+
+  /**
+   * Disables days based on the maximumNights prop and the
+   * selected start date
+   * https://react-day-picker-next.netlify.app/api/types/DateAfter
+   */
+  const getDisabledAfter = useCallback(
+    (startDate?: Date) => {
+      if (!maximumNights || !startDate) {
+        return null;
+      }
+      return addDays(startDate, maximumNights);
+    },
+    [maximumNights]
+  );
+
+  /**
+   * Disables days based on the maximumNights prop and the
+   * selected start date
+   * https://react-day-picker-next.netlify.app/api/types/DateAfter
+   */
+  const getDisabledBefore = useCallback(
+    (startDate?: Date) => {
+      if (!startDate) {
+        return null;
+      }
+      return addDays(startDate, minimumNights);
+    },
+    [minimumNights]
+  );
+
+  // https://react-day-picker-next.netlify.app/api/types/matcher
+  const isDisabled = useCallback(
+    (date: Date) => {
+      if (isOutsideRange(date)) {
+        return true;
+      }
+
+      const allowBlocked =
+        allowBlockedEndDate && !blockedDates.contains(subDays(date, 1));
+      return blockedDates.contains(date) && !allowBlocked;
+    },
+    [blockedDates, allowBlockedEndDate, isOutsideRange]
+  );
+
+  const isHighlighted = useCallback(
+    (date: Date) => {
+      return highlightedDates.contains(date);
+    },
+    [highlightedDates]
+  );
+
+  const getLabel = useCallback(
+    (date: Date) => {
+      const formattedDate = getFormattedDate(date, DATE_FORMAT, locale);
+      // TODO: Implement other labels from defaultPhrases.js
+      if (isDisabled(date)) {
+        return `Not available. ${formattedDate}`;
+      }
+
+      return formattedDate;
+    },
+    [isDisabled, locale]
+  );
+
+  return (
+    <DatePickerContext.Provider
+      value={{
+        allowBlockedEndDate,
+        allowBlockedRanges,
+        endInputSelector,
+        inputSelector,
+        isDisabled,
+        isHighlighted,
+        getLabel,
+        getDisabledAfter,
+        getDisabledBefore,
+        blockedDates,
+        highlightedDates,
+        parseDate,
+        formatDate,
+        formatMonth,
+        formatWeekday,
+        numberOfMonths,
+        mode,
+        onError,
+        startInputSelector,
+        today,
+        type,
+        ...rest,
+      }}
+    >
+      {children}
+    </DatePickerContext.Provider>
+  );
+}
+
+/** Provides access to props and shared helpers */
+export function useDatePickerContext() {
+  const context = useContext(DatePickerContext);
+  if (!context) {
+    throw new Error('Must be wrapped in DayPickerContext.Provider component');
+  }
+  return context;
+}
diff --git a/extensions/amp-date-picker/1.0/component/use-date-picker-input.tsx b/extensions/amp-date-picker/1.0/component/use-date-picker-input.tsx
new file mode 100644
index 000000000000..5253ba6d03e9
--- /dev/null
+++ b/extensions/amp-date-picker/1.0/component/use-date-picker-input.tsx
@@ -0,0 +1,212 @@
+import {addDays} from 'date-fns';
+
+import {
+  closestAncestorElementBySelector,
+  querySelectorInSlot,
+  scopedQuerySelector,
+} from '#core/dom/query';
+
+import * as Preact from '#preact';
+import {useCallback, useMemo, useRef, useState} from '#preact';
+import {ComponentProps} from '#preact/types';
+
+import {useDatePickerContext} from './use-date-picker-context';
+
+import {DateFieldNameByType, FORM_INPUT_SELECTOR, TAG} from '../constants';
+import {DateFieldType} from '../types';
+
+interface DatePickerInputProps {
+  inputSelector: string;
+  type: DateFieldType;
+}
+
+/**
+ * Baseline functions for a date input field
+ */
+export function useDatePickerInput({
+  inputSelector,
+  type,
+}: DatePickerInputProps) {
+  const {
+    formatDate,
+    id,
+    mode,
+    onError,
+    parseDate,
+    today,
+    type: datePickerType,
+  } = useDatePickerContext();
+
+  const ref = useRef<HTMLInputElement>(null);
+
+  const [date, setDate] = useState<Date>();
+  const [hiddenInputProps, setHiddenInputProps] =
+    useState<ComponentProps<'input'>>();
+
+  /**
+   * Sets a date in state and update the input value
+   */
+  const handleSetDate = useCallback(
+    (date: Date) => {
+      setDate(date);
+      if (ref.current) {
+        ref.current.value = formatDate(date);
+      }
+    },
+    [formatDate]
+  );
+
+  /**
+   * Resets the date and input value
+   */
+  const clear = useCallback(() => {
+    setDate(undefined);
+    if (ref.current) {
+      ref.current.value = '';
+    }
+  }, []);
+
+  /**
+   * Sets the date to today (with an optional offset property)
+   */
+  const setToToday = useCallback(
+    (offset = 0) => {
+      const todayWithOffset = addDays(today, offset);
+      handleSetDate(todayWithOffset);
+    },
+    [handleSetDate, today]
+  );
+
+  /**
+   * Returns the hidden input component if it exists.
+   * If the props have not been set, this means that there is
+   * a user-defined input component.
+   */
+  const hiddenInputComponent = useMemo(() => {
+    if (!hiddenInputProps) {
+      return null;
+    }
+    return <input type="hidden" ref={ref} {...hiddenInputProps} />;
+  }, [hiddenInputProps]);
+
+  /**
+   * Generate a name for a hidden input.
+   * Date pickers not in a form don't need named hidden inputs.
+   */
+  const getHiddenInputId = useCallback(
+    (form: HTMLFormElement) => {
+      const name: string = DateFieldNameByType.get(type)!;
+      if (!form) {
+        return '';
+      }
+
+      if (!form.elements.namedItem(name)) {
+        return name;
+      }
+
+      const alternativeName = `${id}-${name}`;
+      if (id && !form.elements.namedItem(alternativeName)) {
+        return alternativeName;
+      }
+
+      onError(
+        `Multiple date-pickers with implicit ${TAG} fields need to have IDs`
+      );
+
+      return '';
+    },
+    [onError, id, type]
+  );
+
+  /**
+   * Gets the user-provided input element if it exists. If the component is being
+   * rendered in Bento mode, it queries the slot for the input.
+   */
+  const getInputElement = useCallback(
+    (containerEl: HTMLElement) => {
+      let inputElement: HTMLInputElement | null;
+
+      inputElement = scopedQuerySelector(
+        containerEl,
+        inputSelector
+      ) as HTMLInputElement;
+
+      // This is required for bento mode
+      if (!inputElement) {
+        const slot = containerEl.querySelector('slot');
+        if (slot) {
+          inputElement = querySelectorInSlot(
+            slot,
+            inputSelector
+          ) as HTMLInputElement;
+        }
+      }
+
+      return inputElement;
+    },
+    [inputSelector]
+  );
+
+  /**
+   * Initializes the input field based on the container and the selector.
+   * If the user provides a input, the user provided input will be set as the
+   * input ref. If the component is inside a form and the user has not provided
+   * an input field, it sets hidden input props and returns a hidden input attribute.
+   */
+  const initialize = useCallback(
+    (containerEl: HTMLElement) => {
+      const form = closestAncestorElementBySelector(
+        containerEl,
+        FORM_INPUT_SELECTOR
+      ) as HTMLFormElement;
+
+      const inputElement = getInputElement(containerEl);
+
+      if (mode === 'overlay' && !inputElement) {
+        const message =
+          datePickerType === 'range'
+            ? `Overlay range pickers must specify "startInputSelector" and "endInputSelector"`
+            : `Overlay single pickers must specify "inputSelector"`;
+        onError(message);
+        return;
+      }
+
+      if (inputElement) {
+        ref.current = inputElement;
+        if (inputElement.value) {
+          const parsedDate = parseDate(inputElement.value);
+          if (parsedDate) {
+            setDate(parsedDate);
+          }
+        }
+      } else if (mode === 'static' && !!form) {
+        setHiddenInputProps({
+          name: getHiddenInputId(form),
+        });
+      }
+    },
+    [
+      getHiddenInputId,
+      parseDate,
+      getInputElement,
+      mode,
+      onError,
+      datePickerType,
+    ]
+  );
+
+  return {
+    clear,
+    date,
+    handleSetDate,
+    hiddenInputProps,
+    ref,
+    setDate,
+    setHiddenInputProps,
+    setToToday,
+    hiddenInputComponent,
+    inputSelector,
+    type,
+    initialize,
+  };
+}
diff --git a/extensions/amp-date-picker/1.0/component/use-date-picker-state.ts b/extensions/amp-date-picker/1.0/component/use-date-picker-state.ts
new file mode 100644
index 000000000000..82684997b61c
--- /dev/null
+++ b/extensions/amp-date-picker/1.0/component/use-date-picker-state.ts
@@ -0,0 +1,55 @@
+import {FiniteStateMachine} from '#core/data-structures/finite-state-machine';
+
+import {useCallback, useEffect, useRef, useState} from '#preact';
+
+import {noop} from '../constants';
+import {DatePickerMode, DatePickerState} from '../types';
+
+export function useDatePickerState(mode: DatePickerMode) {
+  const [isOpen, setIsOpen] = useState(mode === 'static');
+
+  const initialState = mode === 'overlay' ? 'overlay-closed' : 'static';
+
+  const stateMachineRef = useRef(
+    new FiniteStateMachine<DatePickerState>(initialState)
+  );
+
+  const transitionTo = useCallback((state: DatePickerState) => {
+    stateMachineRef.current.setState(state);
+  }, []);
+
+  useEffect(() => {
+    /**
+     * Set up the state machine
+     */
+    const sm = stateMachineRef.current;
+    const OVERLAY_CLOSED = 'overlay-closed';
+    const OVERLAY_OPEN_INPUT = 'overlay-open-input';
+    const STATIC = 'static';
+    const OVERLAY_OPEN_PICKER = 'overlay-open-picker';
+
+    sm.addTransition(STATIC, STATIC, noop);
+
+    if (mode === 'overlay') {
+      sm.addTransition(OVERLAY_CLOSED, OVERLAY_OPEN_INPUT, () => {
+        setIsOpen(true);
+      });
+
+      sm.addTransition(OVERLAY_CLOSED, OVERLAY_OPEN_PICKER, () => {
+        setIsOpen(true);
+      });
+
+      sm.addTransition(OVERLAY_CLOSED, OVERLAY_CLOSED, noop);
+
+      sm.addTransition(OVERLAY_OPEN_INPUT, OVERLAY_OPEN_PICKER, () => {
+        setIsOpen(true);
+      });
+
+      sm.addTransition(OVERLAY_OPEN_INPUT, OVERLAY_CLOSED, () => {
+        setIsOpen(false);
+      });
+    }
+  }, [mode]);
+
+  return {isOpen, transitionTo};
+}
diff --git a/extensions/amp-date-picker/1.0/constants.ts b/extensions/amp-date-picker/1.0/constants.ts
new file mode 100644
index 000000000000..aff087fd4b2e
--- /dev/null
+++ b/extensions/amp-date-picker/1.0/constants.ts
@@ -0,0 +1,30 @@
+import {enUS} from 'date-fns/locale';
+
+import {DateFieldType} from './types';
+
+export const DEFAULT_INPUT_SELECTOR = '#date';
+export const DEFAULT_START_INPUT_SELECTOR = '#startdate';
+export const DEFAULT_END_INPUT_SELECTOR = '#enddate';
+export const FORM_INPUT_SELECTOR = 'form';
+export const DEFAULT_LOCALE = enUS;
+
+// Default formatters
+// Documentation: https://date-fns.org/v2.28.0/docs/format
+export const ISO_8601 = 'yyyy-MM-dd';
+export const DEFAULT_MONTH_FORMAT = 'MMMM yyyy';
+export const DEFAULT_WEEK_DAY_FORMAT = 'EEEEE';
+
+// TODO: Check on this tag name
+export const TAG = 'BentoDatePicker';
+export const DEFAULT_ON_ERROR = (message: string) => {
+  throw new Error(message);
+};
+
+const DateFieldNameByType = new Map<DateFieldType, string>([
+  ['input', 'date'],
+  ['start-input', 'start-date'],
+  ['end-input', 'end-date'],
+]);
+export {DateFieldNameByType};
+
+export const noop = () => {};
diff --git a/extensions/amp-date-picker/1.0/date-helpers.ts b/extensions/amp-date-picker/1.0/date-helpers.ts
new file mode 100644
index 000000000000..32138f0b28d2
--- /dev/null
+++ b/extensions/amp-date-picker/1.0/date-helpers.ts
@@ -0,0 +1,57 @@
+import {
+  addDays,
+  differenceInDays,
+  format,
+  isAfter,
+  isSameDay,
+  startOfToday,
+} from 'date-fns';
+
+import {DEFAULT_LOCALE, ISO_8601} from './constants';
+
+/**
+ * Formats a date in the page's locale and the element's configured format.
+ */
+export function getFormattedDate(
+  date: Date,
+  dateFormat = ISO_8601,
+  locale = DEFAULT_LOCALE
+) {
+  if (!date) {
+    return '';
+  }
+  const isUnixTimestamp = dateFormat.match(/[Xx]/);
+  const _locale = isUnixTimestamp ? DEFAULT_LOCALE : locale;
+  return format(date, dateFormat, {locale: _locale});
+}
+
+/**
+ * Returns today's date as a Date object.
+ * This is stubbed for testing.
+ */
+export function getCurrentDate() {
+  return startOfToday();
+}
+
+/**
+ * Iterate over the dates between a start and end date.
+ */
+export function iterateDateRange(
+  startDate: Date,
+  endDate: Date,
+  cb: (date: Date, i: number) => void
+) {
+  const normalizedEndDate = endDate || startDate;
+  if (
+    isSameDay(startDate, normalizedEndDate) ||
+    isAfter(startDate, normalizedEndDate)
+  ) {
+    return;
+  }
+
+  const days = differenceInDays(normalizedEndDate, startDate);
+
+  for (let i = 0; i < days; i++) {
+    cb(addDays(startDate, i + 1), i);
+  }
+}
diff --git a/extensions/amp-date-picker/1.0/parsers.ts b/extensions/amp-date-picker/1.0/parsers.ts
new file mode 100644
index 000000000000..fe1fdc061c0a
--- /dev/null
+++ b/extensions/amp-date-picker/1.0/parsers.ts
@@ -0,0 +1,218 @@
+import {Locale, isMatch, isValid, parse} from 'date-fns';
+import {
+  af,
+  ar,
+  arDZ,
+  arMA,
+  arSA,
+  arTN,
+  az,
+  be,
+  bg,
+  bn,
+  bs,
+  ca,
+  cs,
+  cy,
+  da,
+  de,
+  deAT,
+  el,
+  enAU,
+  enCA,
+  enGB,
+  enIE,
+  enNZ,
+  enUS,
+  eo,
+  es,
+  et,
+  eu,
+  fi,
+  fr,
+  frCA,
+  frCH,
+  gd,
+  gl,
+  gu,
+  he,
+  hi,
+  hr,
+  hu,
+  hy,
+  id,
+  is,
+  it,
+  ja,
+  ka,
+  kk,
+  km,
+  kn,
+  ko,
+  lb,
+  lt,
+  lv,
+  mk,
+  ms,
+  mt,
+  nb,
+  nl,
+  nlBE,
+  nn,
+  pl,
+  pt,
+  ptBR,
+  ro,
+  ru,
+  sk,
+  sl,
+  sq,
+  sr,
+  sv,
+  ta,
+  te,
+  th,
+  tr,
+  uk,
+  uz,
+  vi,
+  zhCN,
+  zhHK,
+  zhTW,
+} from 'date-fns/locale';
+
+import {DEFAULT_LOCALE, ISO_8601} from './constants';
+
+// This is a map to convert moment.js locale strings to dateFns locale objects
+// It includes most locales, but some more obscure locales were not included in both
+
+export const localeMap: {[key: string]: Locale} = {
+  'en-us': enUS,
+  'af': af,
+  'ar': ar,
+  'ar-dz': arDZ,
+  'ar-ma': arMA,
+  'ar-sa': arSA,
+  'ar-tn': arTN,
+  'az': az,
+  'be': be,
+  'bg': bg,
+  'bn': bn,
+  'bs': bs,
+  'ca': ca,
+  'cs': cs,
+  'cy': cy,
+  'da': da,
+  'de-at': deAT,
+  'de': de,
+  'el': el,
+  'en-au': enAU,
+  'en-ca': enCA,
+  'en-gb': enGB,
+  'en-ie': enIE,
+  'en-nz': enNZ,
+  'eo': eo,
+  'es': es,
+  'et': et,
+  'eu': eu,
+  'fi': fi,
+  'fr-ca': frCA,
+  'fr-ch': frCH,
+  'fr': fr,
+  'gd': gd,
+  'gl': gl,
+  'gu': gu,
+  'he': he,
+  'hi': hi,
+  'hr': hr,
+  'hu': hu,
+  'hy-am': hy,
+  'id': id,
+  'is': is,
+  'it': it,
+  'ja': ja,
+  'ka': ka,
+  'kk': kk,
+  'km': km,
+  'kn': kn,
+  'ko': ko,
+  'lb': lb,
+  'lt': lt,
+  'lv': lv,
+  'mk': mk,
+  'ms': ms,
+  'mt': mt,
+  'nb': nb,
+  'nl-be': nlBE,
+  'nl': nl,
+  'nn': nn,
+  'pl': pl,
+  'pt-br': ptBR,
+  'pt': pt,
+  'ro': ro,
+  'ru': ru,
+  'sk': sk,
+  'sl': sl,
+  'sq': sq,
+  'sr': sr,
+  'sv': sv,
+  'ta': ta,
+  'te': te,
+  'th': th,
+  'tr': tr,
+  'uk': uk,
+  'uz': uz,
+  'vi': vi,
+  'zh-cn': zhCN,
+  'zh-hk': zhHK,
+  'zh-tw': zhTW,
+};
+
+/**
+ *
+ * Convert a moment locale string to a date-fns locale object.
+ * If the string does not exist in the map, falls back to default locale.
+ */
+export function parseLocale(localeString: string) {
+  return localeMap[localeString] || DEFAULT_LOCALE;
+}
+
+/**
+ * Forgivingly parse an ISO8601 input string into a date object,
+ * preferring the date picker's configured format.
+ */
+export function parseDate(
+  value: string,
+  dateFormat: string = ISO_8601,
+  locale: Locale = DEFAULT_LOCALE
+) {
+  if (!value) {
+    return null;
+  }
+  const date = parse(value, dateFormat, new Date(), {locale});
+  if (isValid(date)) {
+    return date;
+  }
+
+  return parse(value, ISO_8601, new Date());
+}
+
+const DATE_SEPARATOR = ' ';
+
+/**
+ * Parses a space separated list of RRULE and ISO-8601 date strings.
+ * Parses ISO-8601 date strings as Date objects.
+ */
+export function parseDateList(list: string) {
+  const splitValues = list.split(DATE_SEPARATOR);
+  return splitValues.map((value) => {
+    if (isMatch(value, ISO_8601)) {
+      return parseDate(value, ISO_8601);
+    }
+    return value;
+  });
+}
+
+export function parseNumber(n: string) {
+  return parseInt(n, 10);
+}
diff --git a/extensions/amp-date-picker/1.0/storybook/Basic.amp.js b/extensions/amp-date-picker/1.0/storybook/Basic.amp.js
new file mode 100644
index 000000000000..63f805dfabd6
--- /dev/null
+++ b/extensions/amp-date-picker/1.0/storybook/Basic.amp.js
@@ -0,0 +1,33 @@
+import {withAmp} from '@ampproject/storybook-addon';
+
+import * as Preact from '#preact';
+
+import {getFormattedDate} from '../date-helpers';
+
+const today = new Date();
+
+export default {
+  title: 'amp-date-picker-1_0',
+  decorators: [withAmp],
+  parameters: {
+    extensions: [{name: 'amp-date-picker', version: '1.0'}],
+    experiments: ['bento'],
+  },
+  args: {
+    'type': 'single',
+    'layout': 'fixed-height',
+    'height': '360',
+    'initial-visible-month': getFormattedDate(today),
+    'locale': 'en-us',
+    'mode': 'static',
+  },
+};
+
+export const _default = (args) => {
+  return (
+    <amp-date-picker {...args}>
+      <input id="date" placeholder="Pick a date" />
+      This text is inside.
+    </amp-date-picker>
+  );
+};
diff --git a/extensions/amp-date-picker/1.0/storybook/Basic.js b/extensions/amp-date-picker/1.0/storybook/Basic.js
new file mode 100644
index 000000000000..ba50f5847c23
--- /dev/null
+++ b/extensions/amp-date-picker/1.0/storybook/Basic.js
@@ -0,0 +1,67 @@
+import {enUS} from 'date-fns/locale';
+
+import * as Preact from '#preact';
+import {useRef} from '#preact';
+
+import {BentoDatePicker} from '../component/component';
+import {localeMap} from '../parsers';
+import '../amp-date-picker.css';
+
+const today = new Date();
+
+export default {
+  title: 'DatePicker',
+  component: BentoDatePicker,
+  argTypes: {
+    mode: {
+      options: ['static', 'overlay'],
+      control: {type: 'radio'},
+    },
+    locale: {
+      options: Object.keys(localeMap),
+      control: {type: 'select'},
+    },
+    initialVisibleMonth: {
+      control: {type: 'date'},
+    },
+  },
+  args: {
+    type: 'single',
+    layout: 'fixed-height',
+    height: 360,
+    initialVisibleMonth: today,
+    locale: enUS,
+    mode: 'static',
+    maximumNights: 0,
+    numberOfMonths: 1,
+    openAfterClear: false,
+    openAfterSelect: false,
+  },
+};
+
+export const _default = (args) => {
+  const datePickerRef = useRef();
+  return (
+    <BentoDatePicker ref={datePickerRef} {...args}>
+      <input id="date" placeholder="Pick a date" />
+      <button onClick={() => datePickerRef.current?.clear()}>Clear</button>
+      <button onClick={() => datePickerRef.current?.today()}>Today</button>
+      <button onClick={() => datePickerRef.current?.today({offset: 1})}>
+        Tomorrow
+      </button>
+    </BentoDatePicker>
+  );
+};
+
+export const WithRangeInput = (args) => {
+  return (
+    <BentoDatePicker {...args}>
+      <input id="startdate" />
+      <input id="enddate" />
+    </BentoDatePicker>
+  );
+};
+
+WithRangeInput.args = {
+  type: 'range',
+};
diff --git a/extensions/amp-date-picker/1.0/test/test-component.js b/extensions/amp-date-picker/1.0/test/test-component.js
new file mode 100644
index 000000000000..561f7279144b
--- /dev/null
+++ b/extensions/amp-date-picker/1.0/test/test-component.js
@@ -0,0 +1,1252 @@
+import {expect} from 'chai';
+import {format} from 'date-fns';
+import {mount} from 'enzyme';
+import {RRule} from 'rrule';
+
+import * as Preact from '#preact';
+
+import {
+  DATE_FORMAT,
+  getDateButton,
+  isCalendarVisible,
+  isSelectedDate,
+  isSelectedEndDate,
+  isSelectedStartDate,
+  selectDate,
+} from './test-helpers';
+
+import {BentoDatePicker} from '../component/component';
+
+const TODAY = new Date(2022, 0);
+
+const DEFAULT_PROPS = {
+  mode: 'static',
+  layout: 'fixed-height',
+  height: 360,
+  today: TODAY,
+};
+
+function DatePicker(props) {
+  const combinedProps = {...DEFAULT_PROPS, ...props};
+  return <BentoDatePicker {...combinedProps}></BentoDatePicker>;
+}
+
+// TODO(wg-components): either fix or remove these tests.
+describes.sandboxed.skip('BentoDatePicker preact component v1.0', {}, (env) => {
+  it('should render', () => {
+    const wrapper = mount(<DatePicker />);
+
+    const component = wrapper.find(BentoDatePicker);
+    expect(component).to.have.lengthOf(1);
+  });
+
+  describe('initial dates', () => {
+    it('should use the value of a single input at load-time', () => {
+      const wrapper = mount(
+        <DatePicker inputSelector="#date">
+          <input type="text" id="date" value="2022-01-01" />
+        </DatePicker>
+      );
+
+      expect(isSelectedDate(wrapper, new Date(2022, 0, 1))).to.be.true;
+    });
+
+    it('should use the value of a range input at load-time', () => {
+      const wrapper = mount(
+        <DatePicker
+          type="range"
+          startInputSelector="#startdate"
+          endInputSelector="#enddate"
+        >
+          <input type="text" id="startdate" value="2022-01-01" />
+          <input type="text" id="enddate" value="2022-01-02" />
+        </DatePicker>
+      );
+
+      expect(isSelectedStartDate(wrapper, new Date(2022, 0, 1))).to.be.true;
+      expect(isSelectedEndDate(wrapper, new Date(2022, 0, 2))).to.be.true;
+    });
+  });
+
+  describe('hidden inputs in single date picker', () => {
+    it('should not create hidden inputs outside of forms', () => {
+      const wrapper = mount(<DatePicker></DatePicker>);
+
+      expect(wrapper.exists('input[type="hidden"]')).to.be.false;
+    });
+
+    it('should create a hidden input when inside a form', () => {
+      const wrapper = mount(
+        <form>
+          <DatePicker></DatePicker>
+        </form>
+      );
+
+      wrapper.update();
+
+      expect(wrapper.exists('input[type="hidden"]')).to.be.true;
+      expect(wrapper.find('input[type="hidden"]').prop('name')).to.equal(
+        'date'
+      );
+    });
+
+    it('should name the input `${id}-date` when another #date input exists', () => {
+      const wrapper = mount(
+        <form>
+          <DatePicker id="delivery">
+            <input type="hidden" name="date"></input>
+          </DatePicker>
+        </form>
+      );
+
+      expect(wrapper.exists('input[name="delivery-date"]')).to.be.true;
+    });
+
+    it('should error if another #date input exists and the picker has no ID', () => {
+      const onErrorSpy = env.sandbox.spy();
+      mount(
+        <form>
+          <DatePicker onError={onErrorSpy}>
+            <input type="hidden" name="date"></input>
+          </DatePicker>
+        </form>
+      );
+
+      expect(onErrorSpy).to.have.been.calledWith(
+        'Multiple date-pickers with implicit BentoDatePicker fields need to have IDs'
+      );
+    });
+  });
+
+  describe('hidden inputs in range date picker in forms', () => {
+    it('should not create hidden inputs outside of forms', () => {
+      const wrapper = mount(<DatePicker type="range"></DatePicker>);
+
+      expect(wrapper.exists('input[type="hidden"]')).to.be.false;
+    });
+
+    it('should create a hidden input when inside a form', () => {
+      const wrapper = mount(
+        <form>
+          <DatePicker type="range"></DatePicker>
+        </form>
+      );
+
+      const inputs = wrapper.find('input[type="hidden"]');
+
+      expect(inputs.length).to.equal(2);
+      expect(inputs.first().prop('name')).to.equal('start-date');
+      expect(inputs.last().prop('name')).to.equal('end-date');
+    });
+
+    it(
+      'should name an input `${id}-(start|end)-date` when another ' +
+        '#(start|end)-date input exists',
+      () => {
+        const wrapper = mount(
+          <form>
+            <input type="hidden" name="start-date"></input>
+            <DatePicker type="range" id="delivery"></DatePicker>
+          </form>
+        );
+
+        expect(
+          wrapper.find(DatePicker).find('input[type="hidden"]')
+        ).to.have.lengthOf(2);
+        expect(wrapper.exists('input[name="delivery-start-date"]')).to.be.true;
+        expect(wrapper.exists('input[name="end-date"]')).to.be.true;
+      }
+    );
+
+    it(
+      'should name both inputs `${id}-(start|end)-date` when other ' +
+        '#start-date and #end-date inputs exists',
+      () => {
+        const wrapper = mount(
+          <form>
+            <input type="hidden" name="start-date"></input>
+            <input type="hidden" name="end-date"></input>
+            <DatePicker type="range" id="delivery"></DatePicker>
+          </form>
+        );
+
+        expect(
+          wrapper.find(DatePicker).find('input[type="hidden"]')
+        ).to.have.lengthOf(2);
+        expect(wrapper.exists('input[name="delivery-start-date"]')).to.be.true;
+        expect(wrapper.exists('input[name="delivery-end-date"]')).to.be.true;
+      }
+    );
+  });
+
+  describe('showing the date picker in static mode for a single date', () => {
+    it('shows the calendar view by default', () => {
+      const wrapper = mount(<DatePicker type="single" />);
+
+      expect(isCalendarVisible(wrapper)).to.be.true;
+    });
+
+    it('can select a date', () => {
+      const wrapper = mount(<DatePicker type="single" />);
+
+      selectDate(wrapper, new Date(2022, 0, 1));
+
+      expect(isSelectedDate(wrapper, new Date(2022, 0, 1))).to.be.true;
+    });
+
+    it('sets the selected date as the input value', () => {
+      const date = new Date(2022, 0, 1);
+      const wrapper = mount(
+        <form>
+          <DatePicker type="single" mode="static" initialVisibleMonth={date} />
+        </form>
+      );
+
+      selectDate(wrapper, date);
+
+      const input = wrapper.find('input[type="hidden"]');
+
+      expect(input.getDOMNode().value).to.equal('2022-01-01');
+    });
+
+    it('sets the selected date in the calendar state', () => {
+      const date = new Date(2022, 0, 1);
+      const wrapper = mount(
+        <DatePicker type="single" mode="static" initialVisibleMonth={date} />
+      );
+
+      selectDate(wrapper, date);
+
+      const selected = wrapper.find('button[aria-pressed=true]');
+
+      expect(selected.prop('aria-label')).to.contain(format(date, DATE_FORMAT));
+    });
+
+    it('can set the initial visible month', () => {
+      const wrapper = mount(
+        <DatePicker
+          type="single"
+          mode="static"
+          initialVisibleMonth={new Date(2022, 0)}
+        />
+      );
+
+      expect(wrapper.text()).to.contain('January 2022');
+    });
+
+    it('can advance to the next month', () => {
+      const wrapper = mount(
+        <DatePicker
+          type="single"
+          mode="static"
+          initialVisibleMonth={new Date(2022, 0)}
+        />
+      );
+
+      wrapper.find('button[aria-label="Go to next month"]').simulate('click');
+
+      expect(wrapper.text()).to.contain('February 2022');
+    });
+
+    it('can go back to the previous month', () => {
+      const wrapper = mount(
+        <DatePicker
+          type="single"
+          mode="static"
+          initialVisibleMonth={new Date(2022, 0)}
+        />
+      );
+
+      wrapper
+        .find('button[aria-label="Go to previous month"]')
+        .simulate('click');
+
+      expect(wrapper.text()).to.contain('December 2021');
+    });
+
+    it('allows the user to configure the number of months', () => {
+      const wrapper = mount(
+        <DatePicker
+          type="single"
+          initialVisibleMonth={new Date(2022, 0)}
+          numberOfMonths={2}
+        />
+      );
+
+      expect(wrapper.find('[aria-label="Calendar"]').last().text()).to.contain(
+        'January 2022'
+      );
+      expect(wrapper.find('[aria-label="Calendar"]').last().text()).to.contain(
+        'February 2022'
+      );
+    });
+  });
+
+  describe('showing the date picker in static mode for a date range', () => {
+    it('shows the calendar view by default', () => {
+      const wrapper = mount(<DatePicker type="range" mode="static" />);
+
+      expect(isCalendarVisible(wrapper)).to.be.true;
+    });
+
+    it('can select a date range', () => {
+      const wrapper = mount(
+        <DatePicker
+          type="range"
+          mode="static"
+          initialVisibleMonth={new Date(2022, 0)}
+        />
+      );
+
+      selectDate(wrapper, new Date(2022, 0, 1));
+      selectDate(wrapper, new Date(2022, 0, 2));
+
+      expect(isSelectedStartDate(wrapper, new Date(2022, 0, 1))).to.be.true;
+      expect(isSelectedEndDate(wrapper, new Date(2022, 0, 2))).to.be.true;
+    });
+
+    it('sets the selected date as the input value', () => {
+      const wrapper = mount(
+        <form>
+          <DatePicker
+            type="range"
+            mode="static"
+            initialVisibleMonth={new Date(2022, 0)}
+          />
+        </form>
+      );
+
+      selectDate(wrapper, new Date(2022, 0, 1));
+      selectDate(wrapper, new Date(2022, 0, 2));
+
+      const startDateInput = wrapper.find('input[name="start-date"]');
+      const endDateInput = wrapper.find('input[name="end-date"]');
+
+      expect(startDateInput.getDOMNode().value).to.equal('2022-01-01');
+      expect(endDateInput.getDOMNode().value).to.equal('2022-01-02');
+    });
+
+    it('sets the selected date in the calendar state', () => {
+      const startDate = new Date(2022, 0, 1);
+      const endDate = new Date(2022, 0, 2);
+      const wrapper = mount(
+        <DatePicker
+          type="range"
+          mode="static"
+          initialVisibleMonth={startDate}
+        />
+      );
+
+      selectDate(wrapper, startDate);
+      selectDate(wrapper, endDate);
+
+      const selected = wrapper.find('button[aria-pressed=true]');
+
+      expect(selected).to.have.lengthOf(2);
+
+      expect(selected.first().prop('aria-label')).to.contain(
+        format(startDate, DATE_FORMAT)
+      );
+      expect(selected.last().prop('aria-label')).to.contain(
+        format(endDate, DATE_FORMAT)
+      );
+    });
+
+    it('can set the initial visible month', () => {
+      const wrapper = mount(
+        <DatePicker
+          type="range"
+          mode="static"
+          initialVisibleMonth={new Date(2022, 0)}
+        />
+      );
+
+      expect(wrapper.text()).to.contain('January 2022');
+    });
+
+    it('allows the user to configure the number of months', () => {
+      const wrapper = mount(
+        <DatePicker
+          type="range"
+          initialVisibleMonth={new Date(2022, 0)}
+          numberOfMonths={2}
+        />
+      );
+
+      expect(wrapper.find('[aria-label="Calendar"]').last().text()).to.contain(
+        'January 2022'
+      );
+      expect(wrapper.find('[aria-label="Calendar"]').last().text()).to.contain(
+        'February 2022'
+      );
+    });
+
+    it('remains visible after the user has selected dates', () => {
+      const wrapper = mount(
+        <DatePicker
+          type="range"
+          mode="static"
+          initialVisibleMonth={new Date(2022, 0)}
+        />
+      );
+
+      selectDate(wrapper, new Date(2022, 0, 1));
+      selectDate(wrapper, new Date(2022, 0, 2));
+
+      expect(isSelectedStartDate(wrapper, new Date(2022, 0, 1))).to.be.true;
+      expect(isSelectedEndDate(wrapper, new Date(2022, 0, 2))).to.be.true;
+
+      expect(isCalendarVisible(wrapper)).to.be.true;
+    });
+  });
+
+  describe('showing the date picker in overlay mode for a single date', () => {
+    it('throws an error if there is no inputSelector specified', () => {
+      const onErrorSpy = env.sandbox.spy();
+      mount(<DatePicker type="single" mode="overlay" onError={onErrorSpy} />);
+
+      expect(onErrorSpy).to.have.been.calledWith(
+        'Overlay single pickers must specify "inputSelector"'
+      );
+    });
+
+    it('hides the calendar view by default', () => {
+      const wrapper = mount(
+        <DatePicker type="single" mode="overlay" inputSelector="[name=date]">
+          <input type="text" name="date" />
+        </DatePicker>
+      );
+
+      expect(isCalendarVisible(wrapper)).to.be.false;
+    });
+
+    it('shows the calendar on input focus', () => {
+      const wrapper = mount(
+        <DatePicker type="single" mode="overlay" inputSelector="[name=date]">
+          <input type="text" name="date" />
+        </DatePicker>
+      );
+
+      wrapper.find('input[name="date"]').simulate('focus');
+
+      expect(isCalendarVisible(wrapper)).to.be.true;
+    });
+
+    it('closes the calendar after a date has been selected by default', () => {
+      const wrapper = mount(
+        <DatePicker
+          type="single"
+          mode="overlay"
+          inputSelector="[name=date]"
+          initialVisibleMonth={new Date(2022, 0)}
+        >
+          <input type="text" name="date" />
+        </DatePicker>
+      );
+
+      wrapper.find('input[name="date"]').simulate('focus');
+      selectDate(wrapper, new Date(2022, 0, 27));
+
+      expect(isCalendarVisible(wrapper)).to.be.false;
+    });
+
+    it('leaves the calendar open after a date has been selected if openAfterSelect is true', () => {
+      const wrapper = mount(
+        <DatePicker
+          type="single"
+          mode="overlay"
+          inputSelector="[name=date]"
+          initialVisibleMonth={new Date(2022, 0)}
+          openAfterSelect
+        >
+          <input type="text" name="date" />
+        </DatePicker>
+      );
+
+      wrapper.find('input[name="date"]').simulate('focus');
+      selectDate(wrapper, new Date(2022, 0, 27));
+
+      expect(isCalendarVisible(wrapper)).to.be.true;
+    });
+  });
+
+  describe('showing the date picker in overlay mode for a date range', () => {
+    it('throws an error if there is no inputSelector specified', () => {
+      const onErrorSpy = env.sandbox.spy();
+      mount(<DatePicker type="range" mode="overlay" onError={onErrorSpy} />);
+
+      expect(onErrorSpy).to.have.been.calledWith(
+        `Overlay range pickers must specify "startInputSelector" and "endInputSelector"`
+      );
+    });
+
+    it('hides the calendar view by default', () => {
+      const wrapper = mount(
+        <DatePicker
+          type="range"
+          mode="overlay"
+          startInputSelector="[name=start-date]"
+          endInputSelector="[name=end-date]"
+        >
+          <input type="text" name="start-date" />
+          <input type="text" name="end-date" />
+        </DatePicker>
+      );
+
+      expect(isCalendarVisible(wrapper)).to.be.false;
+    });
+
+    it('shows the calendar on input focus', () => {
+      const wrapper = mount(
+        <DatePicker
+          type="range"
+          mode="overlay"
+          startInputSelector="[name=start-date]"
+          endInputSelector="[name=end-date]"
+        >
+          <input type="text" name="start-date" />
+          <input type="text" name="end-date" />
+        </DatePicker>
+      );
+
+      wrapper.find('input[name="start-date"]').simulate('focus');
+
+      expect(isCalendarVisible(wrapper)).to.be.true;
+    });
+
+    it('closes the calendar after a date has been selected by default', () => {
+      const wrapper = mount(
+        <DatePicker
+          type="range"
+          mode="overlay"
+          startInputSelector="[name=start-date]"
+          endInputSelector="[name=end-date]"
+          initialVisibleMonth={new Date(2022, 0)}
+        >
+          <input type="text" name="start-date" />
+          <input type="text" name="end-date" />
+        </DatePicker>
+      );
+
+      wrapper.find('input[name="start-date"]').simulate('focus');
+      selectDate(wrapper, new Date(2022, 0, 27));
+
+      expect(isCalendarVisible(wrapper)).to.be.true;
+
+      selectDate(wrapper, new Date(2022, 0, 28));
+
+      expect(isCalendarVisible(wrapper)).to.be.false;
+    });
+
+    it('leaves the calendar open after a date has been selected if openAfterSelect is true', () => {
+      const wrapper = mount(
+        <DatePicker
+          type="range"
+          mode="overlay"
+          startInputSelector="[name=start-date]"
+          endInputSelector="[name=end-date]"
+          initialVisibleMonth={new Date(2022, 0)}
+          openAfterSelect
+        >
+          <input type="text" name="start-date" />
+          <input type="text" name="end-date" />
+        </DatePicker>
+      );
+
+      wrapper.find('input[name="start-date"]').simulate('focus');
+      selectDate(wrapper, new Date(2022, 0, 27));
+      selectDate(wrapper, new Date(2022, 0, 28));
+
+      expect(isCalendarVisible(wrapper)).to.be.true;
+    });
+  });
+
+  describe('blocked dates for a single date picker', () => {
+    it('disables blocked dates in the calendar view', () => {
+      const blockedDate = new Date(2022, 0, 5);
+      const formattedDate = format(blockedDate, DATE_FORMAT);
+      const wrapper = mount(
+        <DatePicker
+          type="single"
+          initialVisibleMonth={new Date(2022, 0)}
+          blocked={[blockedDate]}
+        ></DatePicker>
+      );
+
+      expect(
+        wrapper
+          .find(`button[aria-label="Not available. ${formattedDate}"]`)
+          .prop('aria-disabled')
+      ).to.be.true;
+    });
+
+    it('does not allow the user to select a disabled date', () => {
+      const blockedDate = new Date(2022, 0, 5);
+      const wrapper = mount(
+        <DatePicker
+          type="single"
+          initialVisibleMonth={new Date(2022, 0)}
+          blocked={[blockedDate]}
+        ></DatePicker>
+      );
+
+      selectDate(
+        wrapper,
+        blockedDate,
+        (date) => `Not available. ${format(date, DATE_FORMAT)}`
+      );
+
+      expect(wrapper.exists('[data-date="2022-01-05"]')).to.be.false;
+    });
+
+    it('disables dates using RFC 5545 RRULEs', () => {
+      const rrule = new RRule({
+        freq: RRule.WEEKLY,
+        byweekday: RRule.SA,
+        dtstart: new Date(2022, 0),
+      });
+      const expectedBlockedDates = [
+        new Date(2022, 0, 1),
+        new Date(2022, 0, 8),
+        new Date(2022, 0, 15),
+        new Date(2022, 0, 22),
+        new Date(2022, 0, 29),
+      ];
+      const wrapper = mount(
+        <DatePicker
+          type="single"
+          initialVisibleMonth={new Date(2022, 0)}
+          blocked={[rrule.toString()]}
+        ></DatePicker>
+      );
+
+      expectedBlockedDates.forEach((date) => {
+        const formattedDate = format(date, DATE_FORMAT);
+        expect(
+          wrapper
+            .find(`button[aria-label="Not available. ${formattedDate}"]`)
+            .prop('aria-disabled')
+        ).to.be.true;
+      });
+    });
+
+    it('disables dates using RFC 5545 RRULEs and Date objects', () => {
+      const rrule = new RRule({
+        freq: RRule.WEEKLY,
+        byweekday: RRule.SA,
+        dtstart: new Date(2022, 0),
+      });
+      const expectedBlockedDates = [
+        new Date(2022, 0, 1),
+        new Date(2022, 0, 2),
+        new Date(2022, 0, 8),
+        new Date(2022, 0, 15),
+        new Date(2022, 0, 22),
+        new Date(2022, 0, 29),
+      ];
+      const wrapper = mount(
+        <DatePicker
+          type="single"
+          initialVisibleMonth={new Date(2022, 0)}
+          blocked={[rrule.toString(), new Date(2022, 0, 2)]}
+        ></DatePicker>
+      );
+
+      expectedBlockedDates.forEach((date) => {
+        const formattedDate = format(date, DATE_FORMAT);
+        expect(
+          wrapper
+            .find(`button[aria-label="Not available. ${formattedDate}"]`)
+            .prop('aria-disabled')
+        ).to.be.true;
+      });
+    });
+  });
+
+  describe('blocked dates for a range', () => {
+    it('does not allow the user to select a blocked start date', () => {
+      const blockedDate = new Date(2022, 0, 5);
+      const wrapper = mount(
+        <DatePicker
+          type="single"
+          initialVisibleMonth={new Date(2022, 0)}
+          blocked={[blockedDate]}
+        ></DatePicker>
+      );
+
+      selectDate(
+        wrapper,
+        blockedDate,
+        (date) => `Not available. ${format(date, DATE_FORMAT)}`
+      );
+
+      expect(isSelectedStartDate(wrapper, blockedDate)).to.be.false;
+    });
+
+    it('does not allow the user to select a blocked end date', () => {
+      const blockedDate = new Date(2022, 0, 5);
+      const wrapper = mount(
+        <DatePicker
+          type="range"
+          initialVisibleMonth={new Date(2022, 0)}
+          blocked={[blockedDate]}
+        ></DatePicker>
+      );
+
+      selectDate(wrapper, new Date(2022, 0, 1));
+      selectDate(
+        wrapper,
+        blockedDate,
+        (date) => `Not available. ${format(date, DATE_FORMAT)}`
+      );
+
+      expect(isSelectedStartDate(wrapper, new Date(2022, 0, 1))).to.be.true;
+      expect(isSelectedEndDate(wrapper, blockedDate)).to.be.false;
+    });
+
+    it('allows the user to select a range containing the blocked date if allowBlockedRanges is true', () => {
+      const blockedDate = new Date(2022, 0, 5);
+      const wrapper = mount(
+        <DatePicker
+          type="range"
+          initialVisibleMonth={new Date(2022, 0)}
+          blocked={[blockedDate]}
+          allowBlockedRanges
+        ></DatePicker>
+      );
+
+      selectDate(wrapper, new Date(2022, 0, 1));
+      selectDate(wrapper, new Date(2022, 0, 6));
+
+      expect(isSelectedStartDate(wrapper, new Date(2022, 0, 1))).to.be.true;
+      expect(isSelectedEndDate(wrapper, new Date(2022, 0, 6))).to.be.true;
+    });
+
+    it('does not allow the user to select a range containing a blocked date by default', () => {
+      const blockedDates = [new Date(2022, 0, 5), new Date(2022, 0, 4)];
+      const wrapper = mount(
+        <DatePicker
+          type="range"
+          initialVisibleMonth={new Date(2022, 0)}
+          blocked={blockedDates}
+        ></DatePicker>
+      );
+
+      selectDate(wrapper, new Date(2022, 0, 1));
+      selectDate(wrapper, new Date(2022, 0, 6));
+
+      expect(isSelectedStartDate(wrapper, new Date(2022, 0, 1))).to.be.true;
+      expect(isSelectedEndDate(wrapper, new Date(2022, 0, 6))).to.be.false;
+    });
+
+    it('allows the user to select a range containing the first blocked date if allowBlockedEndDate is true', () => {
+      const blockedDate = new Date(2022, 0, 5);
+      const wrapper = mount(
+        <DatePicker
+          type="range"
+          initialVisibleMonth={new Date(2022, 0)}
+          blocked={[blockedDate]}
+          allowBlockedEndDate
+        ></DatePicker>
+      );
+
+      selectDate(wrapper, new Date(2022, 0, 1));
+      selectDate(wrapper, new Date(2022, 0, 5));
+
+      expect(isSelectedStartDate(wrapper, new Date(2022, 0, 1))).to.be.true;
+      expect(isSelectedEndDate(wrapper, new Date(2022, 0, 5))).to.be.true;
+    });
+  });
+
+  describe('highlighted dates for a single date picker', () => {
+    it('shows a highlighted attribute', () => {
+      const highlightedDate = new Date(2022, 0, 5);
+      const wrapper = mount(
+        <DatePicker
+          type="single"
+          initialVisibleMonth={new Date(2022, 0)}
+          highlighted={[highlightedDate]}
+        ></DatePicker>
+      );
+
+      expect(getDateButton(wrapper, highlightedDate).prop('data-highlighted'))
+        .to.be.true;
+    });
+
+    it('highlights dates using RFC 5545 RRULEs', () => {
+      const rrule = new RRule({
+        freq: RRule.WEEKLY,
+        byweekday: RRule.SA,
+        dtstart: new Date(2022, 0),
+      });
+      const expectedHighlightedDates = [
+        new Date(2022, 0, 1),
+        new Date(2022, 0, 8),
+        new Date(2022, 0, 15),
+        new Date(2022, 0, 22),
+        new Date(2022, 0, 29),
+      ];
+      const wrapper = mount(
+        <DatePicker
+          type="single"
+          initialVisibleMonth={new Date(2022, 0)}
+          highlighted={[rrule.toString()]}
+        ></DatePicker>
+      );
+
+      expectedHighlightedDates.forEach((date) => {
+        expect(getDateButton(wrapper, date).prop('data-highlighted')).to.be
+          .true;
+      });
+    });
+  });
+
+  describe('limiting the available days for a single date picker', () => {
+    it('disables all days before the min if a min is specified', () => {
+      const expectedDisbledDates = [
+        new Date(2022, 0, 1),
+        new Date(2022, 0, 2),
+        new Date(2022, 0, 3),
+        new Date(2022, 0, 4),
+      ];
+      const wrapper = mount(
+        <DatePicker
+          type="single"
+          initialVisibleMonth={new Date(2022, 0)}
+          min={new Date(2022, 0, 5)}
+        />
+      );
+      expectedDisbledDates.forEach((date) => {
+        const formattedDate = format(date, DATE_FORMAT);
+        expect(
+          wrapper
+            .find(`button[aria-label="Not available. ${formattedDate}"]`)
+            .prop('aria-disabled')
+        ).to.be.true;
+      });
+    });
+
+    it("defaults the min to today's date if no min is specified", () => {
+      const expectedDisbledDates = [new Date(2022, 0, 1), new Date(2022, 0, 2)];
+      const wrapper = mount(
+        <DatePicker type="single" today={new Date(2022, 0, 3)} />
+      );
+      expectedDisbledDates.forEach((date) => {
+        const formattedDate = format(date, DATE_FORMAT);
+        expect(
+          wrapper
+            .find(`button[aria-label="Not available. ${formattedDate}"]`)
+            .prop('aria-disabled')
+        ).to.be.true;
+      });
+    });
+
+    it('disables all days after the max if the max is specified', () => {
+      const expectedDisbledDates = [
+        new Date(2022, 0, 28),
+        new Date(2022, 0, 29),
+        new Date(2022, 0, 30),
+        new Date(2022, 0, 31),
+      ];
+      const wrapper = mount(
+        <DatePicker
+          type="single"
+          initialVisibleMonth={new Date(2022, 0)}
+          max={new Date(2022, 0, 27)}
+        />
+      );
+      expectedDisbledDates.forEach((date) => {
+        const formattedDate = format(date, DATE_FORMAT);
+        expect(
+          wrapper
+            .find(`button[aria-label="Not available. ${formattedDate}"]`)
+            .prop('aria-disabled')
+        ).to.be.true;
+      });
+    });
+  });
+
+  describe('limiting the available days for a date range picker', () => {
+    it('disables all days before the min if a min is specified', () => {
+      const expectedDisbledDates = [
+        new Date(2022, 0, 1),
+        new Date(2022, 0, 2),
+        new Date(2022, 0, 3),
+        new Date(2022, 0, 4),
+      ];
+      const wrapper = mount(
+        <DatePicker
+          type="range"
+          initialVisibleMonth={new Date(2022, 0)}
+          min={new Date(2022, 0, 5)}
+        />
+      );
+      expectedDisbledDates.forEach((date) => {
+        const formattedDate = format(date, DATE_FORMAT);
+        expect(
+          wrapper
+            .find(`button[aria-label="Not available. ${formattedDate}"]`)
+            .prop('aria-disabled')
+        ).to.be.true;
+      });
+    });
+
+    it("defaults the min today's date if no min is specified", () => {
+      const expectedDisbledDates = [new Date(2022, 0, 1), new Date(2022, 0, 2)];
+      const wrapper = mount(
+        <DatePicker
+          type="range"
+          initialVisibleMonth={new Date(2022, 0)}
+          today={new Date(2022, 0, 3)}
+        />
+      );
+      expectedDisbledDates.forEach((date) => {
+        const formattedDate = format(date, DATE_FORMAT);
+        expect(
+          wrapper
+            .find(`button[aria-label="Not available. ${formattedDate}"]`)
+            .prop('aria-disabled')
+        ).to.be.true;
+      });
+    });
+
+    it('disables all days after the max if the max is specified', () => {
+      const expectedDisbledDates = [
+        new Date(2022, 0, 28),
+        new Date(2022, 0, 29),
+        new Date(2022, 0, 30),
+        new Date(2022, 0, 31),
+      ];
+      const wrapper = mount(
+        <DatePicker
+          type="range"
+          initialVisibleMonth={new Date(2022, 0)}
+          max={new Date(2022, 0, 27)}
+        />
+      );
+      expectedDisbledDates.forEach((date) => {
+        const formattedDate = format(date, DATE_FORMAT);
+        expect(
+          wrapper
+            .find(`button[aria-label="Not available. ${formattedDate}"]`)
+            .prop('aria-disabled')
+        ).to.be.true;
+      });
+    });
+
+    it('blocks all subsequent dates if maximum nights is specified', () => {
+      const wrapper = mount(
+        <DatePicker
+          type="range"
+          mode="static"
+          initialVisibleMonth={new Date(2022, 0)}
+          maximumNights={1}
+          startInputSelector="[name=startdate]"
+        >
+          <input type="text" name="startdate" value="2022-01-01"></input>
+          <input type="text" name="enddate"></input>
+        </DatePicker>
+      );
+
+      // TODO: This label should start with Not Available
+      selectDate(wrapper, new Date(2022, 0, 3));
+
+      expect(isSelectedStartDate(wrapper, new Date(2022, 0, 1))).to.be.true;
+      expect(isSelectedEndDate(wrapper, new Date(2022, 0, 3))).to.be.false;
+    });
+
+    it('does not allow the user to select an end date that is before the minimumNights threshhold', () => {
+      const wrapper = mount(
+        <DatePicker
+          type="range"
+          mode="static"
+          initialVisibleMonth={new Date(2022, 0)}
+          minimumNights={2}
+          startInputSelector="[name=startdate]"
+        >
+          <input type="text" name="startdate" value="2022-01-01"></input>
+          <input type="text" name="enddate"></input>
+        </DatePicker>
+      );
+
+      // TODO: This label should start with Not Available
+      selectDate(wrapper, new Date(2022, 0, 2));
+
+      expect(isSelectedStartDate(wrapper, new Date(2022, 0, 1))).to.be.true;
+      expect(isSelectedEndDate(wrapper, new Date(2022, 0, 2))).to.be.false;
+    });
+  });
+
+  describe('date formatting for a single day picker', () => {
+    it('defaults to MMMM YYYY month format', () => {
+      const wrapper = mount(
+        <DatePicker type="single" initialVisibleMonth={new Date(2022, 0)} />
+      );
+
+      expect(wrapper.find('[aria-label="Calendar"]').last().text()).to.contain(
+        'January 2022'
+      );
+    });
+
+    it('allows the user to specify the month format', () => {
+      const wrapper = mount(
+        <DatePicker
+          type="single"
+          initialVisibleMonth={new Date(2022, 0)}
+          monthFormat="MMM yy"
+        />
+      );
+
+      expect(wrapper.find('[aria-label="Calendar"]').last().text()).to.contain(
+        'Jan 22'
+      );
+    });
+
+    it('defaults to showing the first character of the weekday', () => {
+      const wrapper = mount(
+        <DatePicker type="single" initialVisibleMonth={new Date(2022, 0)} />
+      );
+
+      // TODO: is there a better way to target this?
+      expect(
+        wrapper
+          .find('thead')
+          .find('th')
+          .first()
+          .find('[aria-hidden=true]')
+          .text()
+      ).to.equal('S');
+    });
+
+    it('allows the user to specify a weekday format', () => {
+      const wrapper = mount(
+        <DatePicker
+          type="single"
+          initialVisibleMonth={new Date(2022, 0)}
+          weekDayFormat="EEEEEE"
+        />
+      );
+
+      // TODO: is there a better way to target this?
+      expect(
+        wrapper
+          .find('thead')
+          .find('th')
+          .first()
+          .find('[aria-hidden=true]')
+          .text()
+      ).to.equal('Su');
+    });
+  });
+
+  describe('date formatting for a date range picker', () => {
+    it('defaults to MMMM YYYY month format', () => {
+      const wrapper = mount(
+        <DatePicker type="range" initialVisibleMonth={new Date(2022, 0)} />
+      );
+
+      expect(wrapper.find('[aria-label="Calendar"]').last().text()).to.contain(
+        'January 2022'
+      );
+    });
+
+    it('allows the user to specify the month format', () => {
+      const wrapper = mount(
+        <DatePicker
+          type="range"
+          initialVisibleMonth={new Date(2022, 0)}
+          monthFormat="MMM yy"
+        />
+      );
+
+      expect(wrapper.find('[aria-label="Calendar"]').last().text()).to.contain(
+        'Jan 22'
+      );
+    });
+  });
+
+  describe('imperative api', () => {
+    let ref;
+    let wrapper;
+
+    describe('single date picker', () => {
+      beforeEach(() => {
+        ref = Preact.createRef();
+        wrapper = mount(
+          <BentoDatePicker
+            ref={ref}
+            initialVisibleMonth={new Date(2022, 0)}
+            inputSelector="[name=date]"
+            today={new Date(2022, 0, 21)}
+          >
+            <input name="date" value="2022-01-01" />
+          </BentoDatePicker>
+        );
+      });
+
+      it('can clear the date for a single date picker', () => {
+        ref.current.clear();
+        wrapper.update();
+
+        expect(wrapper.exists('[data-date="2022-01-01"]')).to.be.false;
+        expect(wrapper.find('input').getDOMNode().value).to.equal('');
+      });
+
+      it('reopens the picker if openAfterClear is true', () => {
+        wrapper = mount(
+          <BentoDatePicker
+            ref={ref}
+            initialVisibleMonth={new Date(2022, 0)}
+            inputSelector="[name=date]"
+            mode="overlay"
+            openAfterClear
+          >
+            <input name="date" value="2022-01-01" />
+          </BentoDatePicker>
+        );
+
+        expect(isCalendarVisible(wrapper)).to.be.false;
+
+        ref.current.clear();
+        wrapper.update();
+
+        expect(isCalendarVisible(wrapper)).to.be.true;
+      });
+
+      it('can set the date', () => {
+        ref.current.setDate(new Date(2022, 0, 21));
+        wrapper.update();
+
+        expect(wrapper.exists('[data-date="2022-01-21"]')).to.be.true;
+        expect(wrapper.find('input').getDOMNode().value).to.equal('2022-01-21');
+      });
+
+      it('can set the date to today', () => {
+        ref.current.today();
+        wrapper.update();
+
+        expect(wrapper.exists('[data-date="2022-01-21"]')).to.be.true;
+        expect(wrapper.find('input').getDOMNode().value).to.equal('2022-01-21');
+      });
+
+      it('can use the offset argment to add or subtract days today', () => {
+        ref.current.today(-1);
+        wrapper.update();
+
+        expect(wrapper.exists('[data-date="2022-01-20"]')).to.be.true;
+        expect(wrapper.find('input').getDOMNode().value).to.equal('2022-01-20');
+      });
+    });
+
+    describe('date range picker', () => {
+      beforeEach(() => {
+        ref = Preact.createRef();
+        wrapper = mount(
+          <BentoDatePicker
+            ref={ref}
+            type="range"
+            initialVisibleMonth={new Date(2022, 0)}
+            startInputSelector="[name=startdate]"
+            endInputSelector="[name=enddate]"
+            today={new Date(2022, 0, 21)}
+          >
+            <input name="startdate" value="2022-01-01" />
+            <input name="enddate" value="2022-01-02" />
+          </BentoDatePicker>
+        );
+      });
+
+      it('can clear the start and end dates', () => {
+        ref.current.clear();
+        wrapper.update();
+
+        expect(wrapper.exists('[data-startdate="2022-01-01"]')).to.be.false;
+        expect(wrapper.exists('[data-enddate="2022-01-01"]')).to.be.false;
+        expect(
+          wrapper.find('input[name="startdate"]').getDOMNode().value
+        ).to.equal('');
+        expect(
+          wrapper.find('input[name="enddate"]').getDOMNode().value
+        ).to.equal('');
+      });
+
+      it('reopens the picker if openAfterClear is true', () => {
+        wrapper = mount(
+          <BentoDatePicker
+            ref={ref}
+            type="range"
+            initialVisibleMonth={new Date(2022, 0)}
+            startInputSelector="[name=startdate]"
+            endInputSelector="[name=enddate]"
+            mode="overlay"
+            openAfterClear
+          >
+            <input name="startdate" value="2022-01-01" />
+            <input name="enddate" value="2022-01-02" />
+          </BentoDatePicker>
+        );
+
+        expect(isCalendarVisible(wrapper)).to.be.false;
+
+        ref.current.clear();
+        wrapper.update();
+
+        expect(isCalendarVisible(wrapper)).to.be.true;
+      });
+
+      it('can set the start and end dates', () => {
+        ref.current.setDates(new Date(2022, 0, 21), new Date(2022, 0, 22));
+        wrapper.update();
+
+        expect(wrapper.exists('[data-startdate="2022-01-21"]')).to.be.true;
+        expect(wrapper.exists('[data-enddate="2022-01-22"]')).to.be.true;
+        expect(
+          wrapper.find('input[name="startdate"]').getDOMNode().value
+        ).to.equal('2022-01-21');
+        expect(
+          wrapper.find('input[name="enddate"]').getDOMNode().value
+        ).to.equal('2022-01-22');
+      });
+
+      it('can set the start date to today', () => {
+        ref.current.startToday();
+        wrapper.update();
+
+        expect(wrapper.exists('[data-startdate="2022-01-21"]')).to.be.true;
+        expect(
+          wrapper.find('input[name="startdate"]').getDOMNode().value
+        ).to.equal('2022-01-21');
+      });
+
+      it('can use the offset argment to add or subtract days from start today', () => {
+        ref.current.startToday(-1);
+        wrapper.update();
+
+        expect(wrapper.exists('[data-startdate="2022-01-20"]')).to.be.true;
+        expect(
+          wrapper.find('input[name="startdate"]').getDOMNode().value
+        ).to.equal('2022-01-20');
+      });
+
+      it('can set the end date to today', () => {
+        ref.current.endToday();
+        wrapper.update();
+
+        expect(wrapper.exists('[data-enddate="2022-01-21"]')).to.be.true;
+        expect(
+          wrapper.find('input[name="enddate"]').getDOMNode().value
+        ).to.equal('2022-01-21');
+      });
+
+      it('can use the offset argment to add or subtract days from end today', () => {
+        ref.current.endToday(-1);
+        wrapper.update();
+
+        expect(wrapper.exists('[data-enddate="2022-01-20"]')).to.be.true;
+        expect(
+          wrapper.find('input[name="enddate"]').getDOMNode().value
+        ).to.equal('2022-01-20');
+      });
+    });
+  });
+});
diff --git a/extensions/amp-date-picker/1.0/test/test-helpers.js b/extensions/amp-date-picker/1.0/test/test-helpers.js
new file mode 100644
index 000000000000..9fa4071f27af
--- /dev/null
+++ b/extensions/amp-date-picker/1.0/test/test-helpers.js
@@ -0,0 +1,43 @@
+import {format} from 'date-fns';
+
+import {ISO_8601} from '../constants';
+
+// Example: Wednesday, December 1, 2021
+export const DATE_FORMAT = 'cccc, LLLL d, yyyy';
+
+export function getDateButton(
+  wrapper,
+  date,
+  getAriaLabel = (date) => format(date, DATE_FORMAT)
+) {
+  const label = getAriaLabel(date);
+  return wrapper.find(`button[aria-label="${label}"]`);
+}
+
+export function isSelectedDate(wrapper, date) {
+  return wrapper.exists(`[data-date="${format(date, ISO_8601)}"]`);
+}
+
+export function isSelectedStartDate(wrapper, date) {
+  return wrapper.exists(`[data-startdate="${format(date, ISO_8601)}"]`);
+}
+
+export function isSelectedEndDate(wrapper, date) {
+  return wrapper.exists(`[data-enddate="${format(date, ISO_8601)}"]`);
+}
+
+export function selectDate(wrapper, date, formatDate) {
+  const button = getDateButton(wrapper, date, formatDate);
+
+  button.simulate('click');
+
+  wrapper.update();
+}
+
+export function getSelectedDate(wrapper) {
+  return wrapper.find('[aria-label="Calendar"]').prop('data-date');
+}
+
+export function isCalendarVisible(wrapper) {
+  return !wrapper.find('[aria-label="Calendar"]').prop('hidden');
+}
diff --git a/extensions/amp-date-picker/1.0/test/test-parsers.js b/extensions/amp-date-picker/1.0/test/test-parsers.js
new file mode 100644
index 000000000000..3314107ca2a4
--- /dev/null
+++ b/extensions/amp-date-picker/1.0/test/test-parsers.js
@@ -0,0 +1,59 @@
+import {expect} from 'chai';
+import {isSameDay} from 'date-fns';
+import {es} from 'date-fns/locale';
+
+import {DEFAULT_LOCALE} from '../constants';
+import {parseDate, parseDateList, parseLocale} from '../parsers';
+
+describes.sandboxed('parsers', {}, () => {
+  describe('parseDate', () => {
+    it('parses an ISO-8601 date', () => {
+      const parsedDate = parseDate('2022-02-04');
+
+      expect(isSameDay(parsedDate, new Date(2022, 1, 4))).to.be.true;
+    });
+
+    it('accepts a format', () => {
+      const parsedDate = parseDate('February 4th, 2022', 'MMMM do, yyyy');
+
+      expect(isSameDay(parsedDate, new Date(2022, 1, 4))).to.be.true;
+    });
+
+    it('falls back the ISO-8601 format if the provided format does not match the date', () => {
+      const parsedDate = parseDate('2022-02-04', 'MMMM do, yyyy');
+
+      expect(isSameDay(parsedDate, new Date(2022, 1, 4))).to.be.true;
+    });
+
+    it('accepts a locale', () => {
+      const parsedDate = parseDate('febrero 4º, 2022', 'MMMM do, yyyy', es);
+
+      expect(isSameDay(parsedDate, new Date(2022, 1, 4))).to.be.true;
+    });
+  });
+
+  describe('parseLocale', () => {
+    it('returns a date-fns locale object for a locale string', () => {
+      expect(parseLocale('es')).to.equal(es);
+    });
+
+    it("falls back to the default locale when a string doesn't match an available locale", () => {
+      expect(parseLocale('tlh')).to.equal(DEFAULT_LOCALE);
+    });
+  });
+
+  describe('parseDateList', () => {
+    it('parses a space separated list of RRULEs and returns an array', () => {
+      expect(
+        parseDateList('RRULE:SOME=RULE RRULE:SOMEOTHER=RULE')
+      ).to.have.lengthOf(2);
+    });
+
+    it('parses ISO-8601 dates as a Date object', () => {
+      const parsedList = parseDateList('2022-02-04');
+
+      expect(parsedList).to.have.lengthOf(1);
+      expect(isSameDay(parsedList[0], new Date(2022, 1, 4))).to.be.true;
+    });
+  });
+});
diff --git a/extensions/amp-date-picker/1.0/types.ts b/extensions/amp-date-picker/1.0/types.ts
new file mode 100644
index 000000000000..c4666839f1a9
--- /dev/null
+++ b/extensions/amp-date-picker/1.0/types.ts
@@ -0,0 +1,69 @@
+import {Locale} from 'date-fns';
+
+import {ComponentChildren} from '#preact/types';
+
+export type DateSelector = Array<Date | string>;
+export type DatePickerMode = 'static' | 'overlay';
+export type DatePickerType = 'single' | 'range';
+export type DateFieldType = 'input' | 'start-input' | 'end-input';
+export type DatePickerState =
+  | 'overlay-closed'
+  | 'overlay-open-input'
+  | 'overlay-open-picker'
+  | 'static';
+
+export type Range = {
+  start: Date;
+  end: Date;
+};
+
+interface CommonDatePickerProps {
+  blocked?: DateSelector;
+  format?: string;
+  highlighted?: DateSelector;
+  id?: string;
+  initialVisibleMonth?: Date;
+  locale?: Locale;
+  max?: Date;
+  min?: Date;
+  mode?: DatePickerMode;
+  monthFormat?: string;
+  numberOfMonths?: number;
+  onError?: (message: string) => void;
+  openAfterClear?: boolean;
+  openAfterSelect?: boolean;
+  weekDayFormat?: string;
+  children?: ComponentChildren;
+  today?: Date;
+  type: DatePickerType;
+}
+
+export interface DateRangePickerProps extends CommonDatePickerProps {
+  allowBlockedEndDate?: boolean;
+  allowBlockedRanges?: boolean;
+  endInputSelector?: string;
+  startInputSelector?: string;
+  maximumNights?: number;
+  minimumNights?: number;
+}
+
+export interface SingleDatePickerProps extends CommonDatePickerProps {
+  inputSelector?: string;
+}
+
+export type BentoDatePickerProps = SingleDatePickerProps & DateRangePickerProps;
+
+export interface SingleDatePickerAPI {
+  clear(): void;
+  today(offset?: number): void;
+  setDate(date: Date): void;
+}
+
+export interface DateRangePickerAPI {
+  clear(): void;
+  startToday(offset?: number): void;
+  endToday(offset?: number): void;
+  setDates(startDate: Date, endDate: Date): void;
+}
+
+export type BentodatePickerAPI = DateRangePickerAPI & SingleDatePickerAPI;
diff --git a/extensions/amp-delight-player/0.1/amp-delight-player.js b/extensions/amp-delight-player/0.1/amp-delight-player.js
index 98211fca8a89..b400857712b6 100644
--- a/extensions/amp-delight-player/0.1/amp-delight-player.js
+++ b/extensions/amp-delight-player/0.1/amp-delight-player.js
@@ -5,7 +5,6 @@ import {observeIntersections} from '#core/dom/layout/viewport-observer';
 import {htmlFor} from '#core/dom/static-template';
 import {setStyle} from '#core/dom/style';
 import {PauseHelper} from '#core/dom/video/pause-helper';
-import {dict} from '#core/types/object';
 
 import {Services} from '#service';
 import {installVideoManagerForDoc} from '#service/video-manager-impl';
@@ -26,7 +25,10 @@ import {
   originMatches,
   redispatch,
 } from '../../../src/iframe-video';
-import {VideoAttributes, VideoEvents} from '../../../src/video-interface';
+import {
+  VideoAttributes_Enum,
+  VideoEvents_Enum,
+} from '../../../src/video-interface';
 
 /** @const */
 const TAG = 'amp-delight-player';
@@ -191,7 +193,7 @@ class AmpDelightPlayer extends AMP.BaseElement {
 
   /** @override */
   unlayoutCallback() {
-    if (this.element.hasAttribute(VideoAttributes.DOCK)) {
+    if (this.element.hasAttribute(VideoAttributes_Enum.DOCK)) {
       return false; // do nothing, do not relayout
     }
 
@@ -291,13 +293,13 @@ class AmpDelightPlayer extends AMP.BaseElement {
     }
 
     const redispatched = redispatch(element, data['type'], {
-      [DelightEvent.PLAYING]: VideoEvents.PLAYING,
-      [DelightEvent.PAUSED]: VideoEvents.PAUSE,
-      [DelightEvent.ENDED]: VideoEvents.ENDED,
-      [DelightEvent.MUTED]: VideoEvents.MUTED,
-      [DelightEvent.UNMUTED]: VideoEvents.UNMUTED,
-      [DelightEvent.AD_START]: VideoEvents.AD_START,
-      [DelightEvent.AD_END]: VideoEvents.AD_END,
+      [DelightEvent.PLAYING]: VideoEvents_Enum.PLAYING,
+      [DelightEvent.PAUSED]: VideoEvents_Enum.PAUSE,
+      [DelightEvent.ENDED]: VideoEvents_Enum.ENDED,
+      [DelightEvent.MUTED]: VideoEvents_Enum.MUTED,
+      [DelightEvent.UNMUTED]: VideoEvents_Enum.UNMUTED,
+      [DelightEvent.AD_START]: VideoEvents_Enum.AD_START,
+      [DelightEvent.AD_END]: VideoEvents_Enum.AD_END,
     });
 
     if (redispatched) {
@@ -322,7 +324,7 @@ class AmpDelightPlayer extends AMP.BaseElement {
         break;
       }
       case DelightEvent.READY: {
-        dispatchCustomEvent(element, VideoEvents.LOAD);
+        dispatchCustomEvent(element, VideoEvents_Enum.LOAD);
         this.playerReadyResolver_(this.iframe_);
         break;
       }
@@ -367,17 +369,13 @@ class AmpDelightPlayer extends AMP.BaseElement {
 
   /**
    * @param {string} eventType The eventType must be prefixed with video-custom- to prevent naming collisions with other analytics event types.
-   * @param {!Object<string, string>=} vars
+   * @param {!{[key: string]: string}=} vars
    */
   dispatchCustomAnalyticsEvent_(eventType, vars) {
-    dispatchCustomEvent(
-      this.element,
-      VideoEvents.CUSTOM_TICK,
-      dict({
-        'eventType': ANALYTICS_EVENT_TYPE_PREFIX + eventType,
-        'vars': vars,
-      })
-    );
+    dispatchCustomEvent(this.element, VideoEvents_Enum.CUSTOM_TICK, {
+      'eventType': ANALYTICS_EVENT_TYPE_PREFIX + eventType,
+      'vars': vars,
+    });
   }
 
   /**
diff --git a/extensions/amp-delight-player/0.1/test/test-amp-delight-player.js b/extensions/amp-delight-player/0.1/test/test-amp-delight-player.js
index c220f2dccd59..83acebdd96db 100644
--- a/extensions/amp-delight-player/0.1/test/test-amp-delight-player.js
+++ b/extensions/amp-delight-player/0.1/test/test-amp-delight-player.js
@@ -1,7 +1,7 @@
 import '../amp-delight-player';
 import {listenOncePromise} from '#utils/event-helper';
 
-import {VideoEvents} from '../../../../src/video-interface';
+import {VideoEvents_Enum} from '../../../../src/video-interface';
 
 describes.realWin(
   'amp-delight-player',
@@ -92,7 +92,7 @@ describes.realWin(
         }).then((player) => {
           return Promise.resolve()
             .then(async () => {
-              const p = listenOncePromise(player, VideoEvents.LOAD);
+              const p = listenOncePromise(player, VideoEvents_Enum.LOAD);
               await fakePostMessage(player, {
                 type: 'x-dl8-to-parent-ready',
                 payload: {},
@@ -100,7 +100,7 @@ describes.realWin(
               return p;
             })
             .then(async () => {
-              const p = listenOncePromise(player, VideoEvents.PLAYING);
+              const p = listenOncePromise(player, VideoEvents_Enum.PLAYING);
               await fakePostMessage(player, {
                 type: 'x-dl8-to-parent-playing',
                 payload: {},
@@ -108,7 +108,7 @@ describes.realWin(
               return p;
             })
             .then(async () => {
-              const p = listenOncePromise(player, VideoEvents.PAUSE);
+              const p = listenOncePromise(player, VideoEvents_Enum.PAUSE);
               await fakePostMessage(player, {
                 type: 'x-dl8-to-parent-paused',
                 payload: {},
@@ -116,7 +116,7 @@ describes.realWin(
               return p;
             })
             .then(async () => {
-              const p = listenOncePromise(player, VideoEvents.MUTED);
+              const p = listenOncePromise(player, VideoEvents_Enum.MUTED);
               await fakePostMessage(player, {
                 type: 'x-dl8-to-parent-muted',
                 payload: {},
@@ -124,7 +124,7 @@ describes.realWin(
               return p;
             })
             .then(async () => {
-              const p = listenOncePromise(player, VideoEvents.UNMUTED);
+              const p = listenOncePromise(player, VideoEvents_Enum.UNMUTED);
               await fakePostMessage(player, {
                 type: 'x-dl8-to-parent-unmuted',
                 payload: {},
@@ -132,7 +132,7 @@ describes.realWin(
               return p;
             })
             .then(async () => {
-              const p = listenOncePromise(player, VideoEvents.ENDED);
+              const p = listenOncePromise(player, VideoEvents_Enum.ENDED);
               await fakePostMessage(player, {
                 type: 'x-dl8-to-parent-ended',
                 payload: {},
@@ -140,7 +140,7 @@ describes.realWin(
               return p;
             })
             .then(async () => {
-              const p = listenOncePromise(player, VideoEvents.AD_START);
+              const p = listenOncePromise(player, VideoEvents_Enum.AD_START);
               await fakePostMessage(player, {
                 type: 'x-dl8-to-parent-amp-ad-start',
                 payload: {},
@@ -148,7 +148,7 @@ describes.realWin(
               return p;
             })
             .then(async () => {
-              const p = listenOncePromise(player, VideoEvents.AD_END);
+              const p = listenOncePromise(player, VideoEvents_Enum.AD_END);
               await fakePostMessage(player, {
                 type: 'x-dl8-to-parent-amp-ad-end',
                 payload: {},
@@ -156,7 +156,7 @@ describes.realWin(
               return p;
             })
             .then(async () => {
-              const p = listenOncePromise(player, VideoEvents.CUSTOM_TICK);
+              const p = listenOncePromise(player, VideoEvents_Enum.CUSTOM_TICK);
               await fakePostMessage(player, {
                 type: 'x-dl8-to-parent-amp-custom-tick',
                 payload: {
diff --git a/extensions/amp-dynamic-css-classes/0.1/test/validator-amp-dynamic-css-classes.html b/extensions/amp-dynamic-css-classes/0.1/test/validator-amp-dynamic-css-classes.html
index 0ded45c0a131..67f9cb10dd0a 100644
--- a/extensions/amp-dynamic-css-classes/0.1/test/validator-amp-dynamic-css-classes.html
+++ b/extensions/amp-dynamic-css-classes/0.1/test/validator-amp-dynamic-css-classes.html
@@ -1,6 +1,6 @@
 <!--
   Test Description:
-  Test for the amp-dynamic-css-classes extension from ampbyexample.com.
+  Test for the amp-dynamic-css-classes extension from amp.dev.
 -->
 <!doctype html>
 <html ⚡ lang="en">
diff --git a/extensions/amp-dynamic-css-classes/0.1/test/validator-amp-dynamic-css-classes.out b/extensions/amp-dynamic-css-classes/0.1/test/validator-amp-dynamic-css-classes.out
index 069aa5972923..9ec9bf8509c7 100644
--- a/extensions/amp-dynamic-css-classes/0.1/test/validator-amp-dynamic-css-classes.out
+++ b/extensions/amp-dynamic-css-classes/0.1/test/validator-amp-dynamic-css-classes.out
@@ -1,7 +1,7 @@
 PASS
 |  <!--
 |    Test Description:
-|    Test for the amp-dynamic-css-classes extension from ampbyexample.com.
+|    Test for the amp-dynamic-css-classes extension from amp.dev.
 |  -->
 |  <!doctype html>
 |  <html ⚡ lang="en">
diff --git a/extensions/amp-dynamic-css-classes/OWNERS b/extensions/amp-dynamic-css-classes/OWNERS
index d786599f0c75..0baaea9812f7 100644
--- a/extensions/amp-dynamic-css-classes/OWNERS
+++ b/extensions/amp-dynamic-css-classes/OWNERS
@@ -4,7 +4,7 @@
 {
   rules: [
     {
-      owners: [{name: 'dvoytenko'}, {name: 'jridgewell'}],
+      owners: [{name: 'dvoytenko'}],
     },
   ],
 }
diff --git a/extensions/amp-embedly-card/0.1/amp-embedly-card-impl.js b/extensions/amp-embedly-card/0.1/amp-embedly-card-impl.js
index 7a556bd3ef85..a4b3d7d7b8a2 100644
--- a/extensions/amp-embedly-card/0.1/amp-embedly-card-impl.js
+++ b/extensions/amp-embedly-card/0.1/amp-embedly-card-impl.js
@@ -1,5 +1,5 @@
 import {removeElement} from '#core/dom';
-import {Layout, applyFillContent} from '#core/dom/layout';
+import {Layout_Enum, applyFillContent} from '#core/dom/layout';
 
 import {Services} from '#service';
 
@@ -97,7 +97,7 @@ export class AmpEmbedlyCard extends AMP.BaseElement {
 
   /** @override */
   isLayoutSupported(layout) {
-    return layout == Layout.RESPONSIVE;
+    return layout == Layout_Enum.RESPONSIVE;
   }
 
   /**
diff --git a/extensions/amp-embedly-card/0.1/amp-embedly-key.js b/extensions/amp-embedly-card/0.1/amp-embedly-key.js
index 324d65fd1d92..e3936a532e0c 100644
--- a/extensions/amp-embedly-card/0.1/amp-embedly-key.js
+++ b/extensions/amp-embedly-card/0.1/amp-embedly-key.js
@@ -1,4 +1,4 @@
-import {Layout} from '#core/dom/layout';
+import {Layout_Enum} from '#core/dom/layout';
 
 import {userAssert} from '#utils/log';
 
@@ -30,6 +30,6 @@ export class AmpEmbedlyKey extends AMP.BaseElement {
 
   /** @override */
   isLayoutSupported(layout) {
-    return layout === Layout.NODISPLAY;
+    return layout === Layout_Enum.NODISPLAY;
   }
 }
diff --git a/extensions/amp-embedly-card/1.0/README.md b/extensions/amp-embedly-card/1.0/README.md
index 4495434e770f..226a978782cd 100644
--- a/extensions/amp-embedly-card/1.0/README.md
+++ b/extensions/amp-embedly-card/1.0/README.md
@@ -10,9 +10,7 @@ If you have a paid plan, use the `<bento-embedly-key>` or `<BentoEmbedlyContext.
 
 You must include each Bento component's required CSS library to guarantee proper loading and before adding custom styles. Or use the light-weight pre-upgrade styles available inline. See [Layout and style](#layout-and-style).
 
-The examples below demonstrate use of the `<bento-embedly-card>` web component.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/embedly-card
@@ -23,66 +21,70 @@ import {defineElement as defineBentoEmbedlyCard} from '@bentoproject/embedly-car
 defineBentoEmbedlyCard();
 ```
 
-### Example: Include via `<script>`
+### Include via `<script>`
+
+```html
+<script type="module" src="https://cdn.ampproject.org/bento.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/bento.js" crossorigin="anonymous"></script>
+<script type="module" src="https://cdn.ampproject.org/v0/bento-embedly-card-1.0.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/v0/bento-embedly-card-1.0.js" crossorigin="anonymous"></script>
+<link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-embedly-card-1.0.css" crossorigin="anonymous">
+```
+
+### Example
+
+<!--% example %-->
 
 ```html
-<head>
-  <script src="https://cdn.ampproject.org/bento.js"></script>
-  <!-- These styles prevent Cumulative Layout Shift on the unupgraded custom element -->
-  <style>
-    bento-embedly-card {
-      display: block;
-      overflow: hidden;
-      position: relative;
-    }
-  </style>
-  <script
-    async
-    src="https://cdn.ampproject.org/v0/bento-embedly-card-1.0.js"
-  ></script>
-  <style>
-    bento-embedly-card {
-      width: 375px;
-      height: 472px;
-    }
-  </style>
-</head>
-<body>
-  <bento-embedly-key value="12af2e3543ee432ca35ac30a4b4f656a">
-  </bento-embedly-key>
-
-  <bento-embedly-card
-    data-url="https://twitter.com/AMPhtml/status/986750295077040128"
-    data-card-theme="dark"
-    data-card-controls="0"
-  >
-  </bento-embedly-card>
-
-  <bento-embedly-card
-    id="my-url"
-    data-url="https://www.youtube.com/watch?v=LZcKdHinUhE"
-  >
-  </bento-embedly-card>
-
-  <div class="buttons" style="margin-top: 8px">
-    <button id="change-url">Change embed</button>
-  </div>
-
-  <script>
-    (async () => {
-      const embedlyCard = document.querySelector('#my-url');
-      await customElements.whenDefined('bento-embedly-card');
-
-      // set up button actions
-      document.querySelector('#change-url').onclick = () => {
-        embedlyCard.setAttribute(
-          'data-url',
-          'https://www.youtube.com/watch?v=wcJSHR0US80'
-        );
-      };
-    })();
-  </script>
-</body>
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-embedly-card-1.0.css"
+    />
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-embedly-card-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-embedly-card-1.0.js"
+    ></script>
+    <style>
+      bento-embedly-card {
+        width: 375px;
+        height: 472px;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-embedly-key value="12af2e3543ee432ca35ac30a4b4f656a">
+    </bento-embedly-key>
+
+    <bento-embedly-card
+      data-url="https://twitter.com/AMPhtml/status/986750295077040128"
+      data-card-theme="dark"
+      data-card-controls="0"
+    >
+    </bento-embedly-card>
+
+    <bento-embedly-card
+      id="my-url"
+      data-url="https://www.youtube.com/watch?v=LZcKdHinUhE"
+    >
+    </bento-embedly-card>
+  </body>
+</html>
 ```
 
 ### Layout and style
@@ -128,15 +130,11 @@ The URL to retrieve embedding information.
 
 #### `data-card-embed`
 
-The URL to a video or rich media. Use with static embeds like articles, instead
-of using the static page content in the card, the card will embed the video or
-rich media.
+The URL to a video or rich media. Use with static embeds like articles, instead of using the static page content in the card, the card will embed the video or rich media.
 
 #### `data-card-image`
 
-The URL to an image. Specifies which image to use in article cards when
-`data-url` points to an article. Not all image URLs are supported, if the image
-is not loaded, try a different image or domain.
+The URL to an image. Specifies which image to use in article cards when `data-url` points to an article. Not all image URLs are supported, if the image is not loaded, try a different image or domain.
 
 #### `data-card-controls`
 
@@ -149,13 +147,11 @@ The default is `1`.
 
 #### `data-card-align`
 
-Aligns the card. The possible values are `left`, `center` and `right`. The
-default value is `center`.
+Aligns the card. The possible values are `left`, `center` and `right`. The default value is `center`.
 
 #### `data-card-recommend`
 
-When recommendations are supported, it disables embedly recommendations on video
-and rich cards. These are recommendations created by embedly.
+When recommendations are supported, it disables embedly recommendations on video and rich cards. These are recommendations created by embedly.
 
 -   `0`: Disables embedly recommendations.
 -   `1`: Enables embedly recommendations.
@@ -168,22 +164,94 @@ Specifies the via content in the card. This is a great way to do attribution.
 
 #### `data-card-theme` (optional)
 
-Allows settings the `dark` theme which changes the background color of the main
-card container. Use `dark` to set this theme. For dark backgrounds it's better
-to specify this. The default is `light`, which sets no background color of the
-main card container.
+Allows settings the `dark` theme which changes the background color of the main card container. Use `dark` to set this theme. For dark backgrounds it's better to specify this. The default is `light`, which sets no background color of the main card container.
 
 #### title (optional)
 
 Define a `title` attribute for the component to propagate to the underlying `<iframe>` element. The default value is `"Embedly card"`.
 
+#### API Example
+
+Programmatically changing any of the attribute values, will automatically update the element. For example, by changing the `data-url` value, you can switch to a different embed:
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-embedly-card-1.0.css"
+    />
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-embedly-card-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-embedly-card-1.0.js"
+    ></script>
+    <style>
+      bento-embedly-card {
+        width: 375px;
+        height: 472px;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-embedly-key value="12af2e3543ee432ca35ac30a4b4f656a">
+    </bento-embedly-key>
+
+    <bento-embedly-card
+      data-url="https://twitter.com/AMPhtml/status/986750295077040128"
+      data-card-theme="dark"
+      data-card-controls="0"
+    >
+    </bento-embedly-card>
+
+    <bento-embedly-card
+      id="my-url"
+      data-url="https://www.youtube.com/watch?v=LZcKdHinUhE"
+    >
+    </bento-embedly-card>
+
+    <div class="buttons" style="margin-top: 8px">
+      <button id="change-url">Change embed</button>
+    </div>
+
+    <script>
+      (async () => {
+        const embedlyCard = document.querySelector('#my-url');
+        await customElements.whenDefined('bento-embedly-card');
+
+        // set up button actions
+        document.querySelector('#change-url').onclick = () => {
+          embedlyCard.setAttribute(
+            'data-url',
+            'https://www.youtube.com/watch?v=wcJSHR0US80'
+          );
+        };
+      })();
+    </script>
+  </body>
+</html>
+```
+
 ---
 
 ## Preact/React Component
 
-The examples below demonstrate use of the `<BentoEmbedlyCard>` as a functional component usable with the Preact or React libraries.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/embedly-card
@@ -241,15 +309,11 @@ The URL to retrieve embedding information.
 
 #### `cardEmbed`
 
-The URL to a video or rich media. Use with static embeds like articles, instead
-of using the static page content in the card, the card will embed the video or
-rich media.
+The URL to a video or rich media. Use with static embeds like articles, instead of using the static page content in the card, the card will embed the video or rich media.
 
 #### `cardImage`
 
-The URL to an image. Specifies which image to use in article cards when
-`data-url` points to an article. Not all image URLs are supported, if the image
-is not loaded, try a different image or domain.
+The URL to an image. Specifies which image to use in article cards when `data-url` points to an article. Not all image URLs are supported, if the image is not loaded, try a different image or domain.
 
 #### `cardControls`
 
@@ -262,13 +326,11 @@ The default is `1`.
 
 #### `cardAlign`
 
-Aligns the card. The possible values are `left`, `center` and `right`. The
-default value is `center`.
+Aligns the card. The possible values are `left`, `center` and `right`. The default value is `center`.
 
 #### `cardRecommend`
 
-When recommendations are supported, it disables embedly recommendations on video
-and rich cards. These are recommendations created by embedly.
+When recommendations are supported, it disables embedly recommendations on video and rich cards. These are recommendations created by embedly.
 
 -   `0`: Disables embedly recommendations.
 -   `1`: Enables embedly recommendations.
@@ -281,10 +343,7 @@ Specifies the via content in the card. This is a great way to do attribution.
 
 #### `cardTheme` (optional)
 
-Allows settings the `dark` theme which changes the background color of the main
-card container. Use `dark` to set this theme. For dark backgrounds it's better
-to specify this. The default is `light`, which sets no background color of the
-main card container.
+Allows settings the `dark` theme which changes the background color of the main card container. Use `dark` to set this theme. For dark backgrounds it's better to specify this. The default is `light`, which sets no background color of the main card container.
 
 #### title (optional)
 
diff --git a/extensions/amp-embedly-card/1.0/amp-embedly-card.js b/extensions/amp-embedly-card/1.0/amp-embedly-card.js
index c6875e8cd2cf..1118ad2c45d2 100644
--- a/extensions/amp-embedly-card/1.0/amp-embedly-card.js
+++ b/extensions/amp-embedly-card/1.0/amp-embedly-card.js
@@ -1,8 +1,9 @@
-import {Layout} from '#core/dom/layout';
-import {dict} from '#core/types/object';
+import {Layout_Enum} from '#core/dom/layout';
 
 import {isExperimentOn} from '#experiments';
 
+import {AmpPreactBaseElement, setSuperClass} from '#preact/amp-base-element';
+
 import {userAssert} from '#utils/log';
 
 import {AmpEmbedlyKey, TAG as KEY_TAG} from './amp-embedly-key';
@@ -11,12 +12,12 @@ import {BaseElement} from './base-element';
 /** @const {string} */
 const TAG = 'amp-embedly-card';
 
-class AmpEmbedlyCard extends BaseElement {
+class AmpEmbedlyCard extends setSuperClass(BaseElement, AmpPreactBaseElement) {
   /** @override */
   init() {
-    return dict({
+    return {
       'requestResize': (height) => this.attemptChangeHeight(height),
-    });
+    };
   }
 
   /** @override */
@@ -31,7 +32,7 @@ class AmpEmbedlyCard extends BaseElement {
         isExperimentOn(this.win, 'bento-embedly-card'),
       'expected global "bento" or specific "bento-embedly-card" experiment to be enabled'
     );
-    return layout == Layout.RESPONSIVE;
+    return layout == Layout_Enum.RESPONSIVE;
   }
 }
 
diff --git a/extensions/amp-embedly-card/1.0/amp-embedly-key.js b/extensions/amp-embedly-card/1.0/amp-embedly-key.js
index 4de9b953df98..352256684241 100644
--- a/extensions/amp-embedly-card/1.0/amp-embedly-key.js
+++ b/extensions/amp-embedly-card/1.0/amp-embedly-key.js
@@ -1,15 +1,20 @@
-import {Layout} from '#core/dom/layout';
+import {Layout_Enum} from '#core/dom/layout';
 
 import {isExperimentOn} from '#experiments';
 
-import {PreactBaseElement} from '#preact/base-element';
+import {AmpPreactBaseElement, setSuperClass} from '#preact/amp-base-element';
 
 import {userAssert} from '#utils/log';
 
+import {EmbedlyKeyBaseElement} from './key-base-element';
+
 /** @const {string} */
 export const TAG = 'amp-embedly-key';
 
-export class AmpEmbedlyKey extends PreactBaseElement {
+export class AmpEmbedlyKey extends setSuperClass(
+  EmbedlyKeyBaseElement,
+  AmpPreactBaseElement
+) {
   /** @override */
   isLayoutSupported(layout) {
     userAssert(
@@ -17,6 +22,6 @@ export class AmpEmbedlyKey extends PreactBaseElement {
         isExperimentOn(this.win, 'bento-embedly-card'),
       'expected global "bento" or specific "bento-embedly-card" experiment to be enabled'
     );
-    return layout === Layout.NODISPLAY;
+    return layout === Layout_Enum.NODISPLAY;
   }
 }
diff --git a/extensions/amp-embedly-card/1.0/base-element.js b/extensions/amp-embedly-card/1.0/base-element.js
index 97021806e7a5..0f31193ba941 100644
--- a/extensions/amp-embedly-card/1.0/base-element.js
+++ b/extensions/amp-embedly-card/1.0/base-element.js
@@ -4,6 +4,8 @@ import {PreactBaseElement} from '#preact/base-element';
 import {BentoEmbedlyCard} from './component';
 import {BentoEmbedlyContext} from './embedly-context';
 
+export const BENTO_TAG = 'bento-embedly-card';
+
 export class BaseElement extends PreactBaseElement {}
 
 /** @override */
diff --git a/extensions/amp-inline-gallery/1.0/bento-inline-gallery.js b/extensions/amp-embedly-card/1.0/bento-embedly-card.js
similarity index 100%
rename from extensions/amp-inline-gallery/1.0/bento-inline-gallery.js
rename to extensions/amp-embedly-card/1.0/bento-embedly-card.js
diff --git a/extensions/amp-embedly-card/1.0/component.js b/extensions/amp-embedly-card/1.0/component.js
index 4888d2262466..71db17ee54b6 100644
--- a/extensions/amp-embedly-card/1.0/component.js
+++ b/extensions/amp-embedly-card/1.0/component.js
@@ -1,4 +1,4 @@
-import {MessageType, deserializeMessage} from '#core/3p-frame-messaging';
+import {MessageType_Enum, deserializeMessage} from '#core/3p-frame-messaging';
 
 import * as Preact from '#preact';
 import {useCallback, useContext, useState} from '#preact';
@@ -31,7 +31,7 @@ export function BentoEmbedlyCardWithRef(
   const messageHandler = useCallback(
     (event) => {
       const data = deserializeMessage(event.data);
-      if (data['type'] == MessageType.EMBED_SIZE) {
+      if (data['type'] == MessageType_Enum.EMBED_SIZE) {
         const height = data['height'];
         if (requestResize) {
           requestResize(height);
diff --git a/extensions/amp-embedly-card/1.0/example/index.html b/extensions/amp-embedly-card/1.0/example/index.html
new file mode 100644
index 000000000000..56958d30e56a
--- /dev/null
+++ b/extensions/amp-embedly-card/1.0/example/index.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width" />
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-embedly-card-1.0.css"
+    />
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-embedly-card-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-embedly-card-1.0.js"
+    ></script>
+    <style>
+      body {
+        background: #ecf1f3;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+      bento-embedly-card {
+        width: 375px;
+        height: 710px;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-embedly-key value="12af2e3543ee432ca35ac30a4b4f656a">
+    </bento-embedly-key>
+
+    <bento-embedly-card
+      data-url="https://twitter.com/AMPhtml/status/1397995435386679302?s=20"
+      data-card-theme="dark"
+      data-card-controls="0"
+    >
+    </bento-embedly-card>
+  </body>
+</html>
diff --git a/extensions/amp-embedly-card/1.0/key-base-element.js b/extensions/amp-embedly-card/1.0/key-base-element.js
new file mode 100644
index 000000000000..366c90d9aae3
--- /dev/null
+++ b/extensions/amp-embedly-card/1.0/key-base-element.js
@@ -0,0 +1,5 @@
+import {PreactBaseElement} from '#preact/base-element';
+
+export const BENTO_TAG = 'bento-embedly-key';
+
+export class EmbedlyKeyBaseElement extends PreactBaseElement {}
diff --git a/extensions/amp-embedly-card/1.0/web-component.js b/extensions/amp-embedly-card/1.0/web-component.js
new file mode 100644
index 000000000000..b82a64d74363
--- /dev/null
+++ b/extensions/amp-embedly-card/1.0/web-component.js
@@ -0,0 +1,24 @@
+import {defineBentoElement} from '#preact/bento-ce';
+
+import {BENTO_TAG, BaseElement} from './base-element';
+import {
+  BENTO_TAG as EMBEDLY_KEY_BENTO_TAG,
+  EmbedlyKeyBaseElement,
+} from './key-base-element';
+
+/**
+ * Registers `<bento-embedly-card> component to CustomElements registry
+ * @param {typeof globalThis=} win
+ */
+export function defineElement(win) {
+  defineBentoElement(BENTO_TAG, BaseElement, win);
+  defineElementEmbedlyKey(win);
+}
+
+/**
+ * Registers <bento-embedly-key>` component to CustomElements registry
+ * @param {typeof globalThis=} win
+ */
+export function defineElementEmbedlyKey(win) {
+  defineBentoElement(EMBEDLY_KEY_BENTO_TAG, EmbedlyKeyBaseElement, win);
+}
diff --git a/extensions/amp-experiment/0.1/amp-experiment.js b/extensions/amp-experiment/0.1/amp-experiment.js
index c2de150532bf..6de7123318b0 100644
--- a/extensions/amp-experiment/0.1/amp-experiment.js
+++ b/extensions/amp-experiment/0.1/amp-experiment.js
@@ -1,4 +1,4 @@
-import {Layout} from '#core/dom/layout';
+import {Layout_Enum} from '#core/dom/layout';
 import {parseJson} from '#core/types/object/json';
 
 import {dev, devAssert, userAssert} from '#utils/log';
@@ -11,7 +11,7 @@ const TAG = 'amp-experiment';
 const ATTR_PREFIX = 'amp-x-';
 
 export class AmpExperiment extends AMP.BaseElement {
-  /** @override @nocollapse */
+  /** @override  */
   static prerenderAllowed() {
     /*
      * Prerender is allowed because the client_id is only used to calculate
@@ -24,7 +24,7 @@ export class AmpExperiment extends AMP.BaseElement {
 
   /** @override */
   isLayoutSupported(layout) {
-    return layout == Layout.NODISPLAY || layout == Layout.CONTAINER;
+    return layout == Layout_Enum.NODISPLAY || layout == Layout_Enum.CONTAINER;
   }
 
   /** @override */
@@ -50,7 +50,7 @@ export class AmpExperiment extends AMP.BaseElement {
             });
           });
 
-          /** @private @const {!Promise<!Object<string, ?string>>} */
+          /** @private @const {!Promise<!{[key: string]: ?string}>} */
           const experimentVariants = Promise.all(variants)
             .then(() => results)
             .then(this.addToBody_.bind(this));
@@ -82,8 +82,8 @@ export class AmpExperiment extends AMP.BaseElement {
   /**
    * Adds the given experiment and variant pairs to body element as attributes
    * and values. Experiment with no variant assigned (null) will be skipped.
-   * @param {!Object<string, ?string>} experiments
-   * @return {!Promise<!Object<string, ?string>>} a promise of the original
+   * @param {!{[key: string]: ?string}} experiments
+   * @return {!Promise<!{[key: string]: ?string}>} a promise of the original
    *     param passed in
    * @private
    */
diff --git a/extensions/amp-experiment/0.1/test/test-variant.js b/extensions/amp-experiment/0.1/test/test-variant.js
index e6d507a97d7f..bf6a684ae5eb 100644
--- a/extensions/amp-experiment/0.1/test/test-variant.js
+++ b/extensions/amp-experiment/0.1/test/test-variant.js
@@ -1,6 +1,8 @@
 import {Services} from '#service';
 import {AmpDocSingle} from '#service/ampdoc-impl';
 
+import {FakePerformance} from '#testing/fake-dom';
+
 import {allocateVariant} from '../variant';
 
 describes.sandboxed('allocateVariant', {}, (env) => {
@@ -23,6 +25,7 @@ describes.sandboxed('allocateVariant', {}, (env) => {
         nodeType: /* DOCUMENT */ 9,
         body: {},
       },
+      performance: new FakePerformance(window),
     };
     fakeWin.document.defaultView = fakeWin;
     ampdoc = new AmpDocSingle(fakeWin);
diff --git a/extensions/amp-experiment/0.1/test/validator-amp-experiment.out b/extensions/amp-experiment/0.1/test/validator-amp-experiment.out
index b1c963e7e3b7..1e9a7a288c34 100644
--- a/extensions/amp-experiment/0.1/test/validator-amp-experiment.out
+++ b/extensions/amp-experiment/0.1/test/validator-amp-experiment.out
@@ -34,7 +34,7 @@ FAIL
 amp-experiment/0.1/test/validator-amp-experiment.html:31:0 The tag 'amp-experiment' appears more than once in the document. (see https://amp.dev/documentation/components/amp-experiment/)
 |      <script type="invalidtype"></script>
 >>     ^~~~~~~~~
-amp-experiment/0.1/test/validator-amp-experiment.html:32:4 Custom JavaScript is not allowed. (see https://amp.dev/documentation/guides-and-tutorials/learn/validation-workflow/validation_errors/#custom-javascript-is-not-allowed)
+amp-experiment/0.1/test/validator-amp-experiment.html:32:4 The parent tag of tag 'amphtml engine script' is 'amp-experiment', but it can only be 'head'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#required-markup)
 |  </amp-experiment>
 |  </body>
 |  </html>
\ No newline at end of file
diff --git a/extensions/amp-experiment/0.1/variant.js b/extensions/amp-experiment/0.1/variant.js
index 1f4039b613a2..0fb277c151c2 100644
--- a/extensions/amp-experiment/0.1/variant.js
+++ b/extensions/amp-experiment/0.1/variant.js
@@ -21,12 +21,12 @@ export class Variants {
     /** @const */
     this.ampdoc = ampdoc;
 
-    /** @private @const {!Deferred<!Object<string, ?string>>} */
+    /** @private @const {!Deferred<!{[key: string]: ?string}>} */
     this.variantsDeferred_ = new Deferred();
   }
 
   /**
-   * @param {!Object<string, ?string>|!Promise<!Object<string, ?string>>} variants
+   * @param {!{[key: string]: ?string}|!Promise<!{[key: string]: ?string}>} variants
    * @package
    * @restricted
    */
@@ -36,7 +36,7 @@ export class Variants {
 
   /**
    * Returns a promise for the experiment variants.
-   * @return {!Promise<!Object<string, ?string>>}
+   * @return {!Promise<!{[key: string]: ?string}>}
    */
   getVariants() {
     return this.variantsDeferred_.promise;
diff --git a/extensions/amp-experiment/1.0/amp-experiment.js b/extensions/amp-experiment/1.0/amp-experiment.js
index f165a3cad2e1..06ff172715c4 100644
--- a/extensions/amp-experiment/1.0/amp-experiment.js
+++ b/extensions/amp-experiment/1.0/amp-experiment.js
@@ -1,5 +1,4 @@
-import {Layout} from '#core/dom/layout';
-import {dict} from '#core/types/object';
+import {Layout_Enum} from '#core/dom/layout';
 import {parseJson} from '#core/types/object/json';
 
 import {isExperimentOn} from '#experiments';
@@ -20,7 +19,7 @@ import {getServicePromiseForDoc} from '../../../src/service-helpers';
 const TAG = 'amp-experiment';
 
 export class AmpExperiment extends AMP.BaseElement {
-  /** @override @nocollapse */
+  /** @override  */
   static prerenderAllowed() {
     /*
      * Prerender is allowed because the client_id is only used to calculate
@@ -33,7 +32,7 @@ export class AmpExperiment extends AMP.BaseElement {
 
   /** @override */
   isLayoutSupported(layout) {
-    return layout == Layout.NODISPLAY || layout == Layout.CONTAINER;
+    return layout == Layout_Enum.NODISPLAY || layout == Layout_Enum.CONTAINER;
   }
 
   /** @override */
@@ -53,7 +52,7 @@ export class AmpExperiment extends AMP.BaseElement {
       const variantsService = responses[0];
       const enabled = responses[1];
 
-      let config = dict({});
+      let config = {};
 
       try {
         config = this.getConfig_();
@@ -95,7 +94,7 @@ export class AmpExperiment extends AMP.BaseElement {
           });
         });
 
-        /** @private @const {!Promise<!Object<string, ?string>>} */
+        /** @private @const {!Promise<!{[key: string]: ?string}>} */
         const experimentVariants = Promise.all(variants)
           .then(() => {
             const ampdoc = this.getAmpDoc();
@@ -170,7 +169,7 @@ export class AmpExperiment extends AMP.BaseElement {
    * Object. This is useful for type checking in analytics
    * and disabling all experiments manually.
    * @param {!JsonObject} config
-   * @return {!Object<string, ?string>}
+   * @return {!{[key: string]: ?string}}
    */
   getEmptyExperimentToVariant_(config) {
     const experimentToVariant = Object.create(null);
diff --git a/extensions/amp-experiment/1.0/apply-experiment.js b/extensions/amp-experiment/1.0/apply-experiment.js
index dc6bb741f07f..240a5dcbf5b5 100644
--- a/extensions/amp-experiment/1.0/apply-experiment.js
+++ b/extensions/amp-experiment/1.0/apply-experiment.js
@@ -1,13 +1,13 @@
 import {user, userAssert} from '#utils/log';
 
-import {
-  assertMutationRecordFormat,
-  getElementsFromMutationRecordSelector,
-} from './mutation-record';
 import {AttributeMutationDefaultClass} from './mutation/attribute-mutation-default-class';
 import {AttributeMutationDefaultStyle} from './mutation/attribute-mutation-default-style';
 import {AttributeMutationDefaultUrl} from './mutation/attribute-mutation-default-url';
 import {CharacterDataMutation} from './mutation/character-data-mutation';
+import {
+  assertMutationRecordFormat,
+  getElementsFromMutationRecordSelector,
+} from './mutation-record';
 
 const TAG = 'amp-experiment apply-experiment';
 
@@ -30,7 +30,7 @@ const MAX_MUTATIONS = 70;
  *
  * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
  * @param {!JsonObject} config
- * @param {!Object<string, ?string>} experimentToVariant
+ * @param {!{[key: string]: ?string}} experimentToVariant
  * @return {!Promise}
  */
 export function applyExperimentToVariant(ampdoc, config, experimentToVariant) {
@@ -99,7 +99,7 @@ export function applyExperimentToVariant(ampdoc, config, experimentToVariant) {
  *  in the respected experiments
  *
  * @param {!JsonObject} config
- * @param {!Object<string, ?string>} experimentToVariant
+ * @param {!{[key: string]: ?string}} experimentToVariant
  * @return {!Array<!JsonObject>}
  */
 export function getMutationRecordsFromExperimentToVariant(
diff --git a/extensions/amp-experiment/1.0/mutation/attribute-mutation-default-style.js b/extensions/amp-experiment/1.0/mutation/attribute-mutation-default-style.js
index ca8dc43fe058..a9840d724c40 100644
--- a/extensions/amp-experiment/1.0/mutation/attribute-mutation-default-style.js
+++ b/extensions/amp-experiment/1.0/mutation/attribute-mutation-default-style.js
@@ -1,6 +1,6 @@
 import {isAmpElement} from '#core/dom/amp-element-helpers';
 import {assertDoesNotContainDisplay, setStyles} from '#core/dom/style';
-import {dict, hasOwn} from '#core/types/object';
+import {hasOwn} from '#core/types/object';
 
 import {dev, user} from '#utils/log';
 
@@ -12,7 +12,7 @@ const NON_SPACE_REGEX = /\S/;
 /** @const {RegExp} */
 const ALL_VALUE_REGEX = /.*/;
 
-/** @const {Object<string, RegExp>} */
+/** @const {{[key: string]: RegExp}} */
 const SUPPORTED_STYLE_VALUE = {
   'color': ALL_VALUE_REGEX,
   'background-color': ALL_VALUE_REGEX,
@@ -26,7 +26,7 @@ const SUPPORTED_STYLE_VALUE = {
   'border-color': ALL_VALUE_REGEX,
 };
 
-/** @const {Object<string, RegExp>} */
+/** @const {{[key: string]: RegExp}} */
 const SUPPORTE_NON_AMP_STYLE_VALUE = {
   'width': ALL_VALUE_REGEX,
   'height': ALL_VALUE_REGEX,
@@ -53,7 +53,7 @@ export class AttributeMutationDefaultStyle {
     this.elements_ = elements;
 
     /** @private {!JsonObject} */
-    this.styles_ = dict({});
+    this.styles_ = {};
 
     /** @private {boolean} */
     this.hasAmpElement_ = false;
diff --git a/extensions/amp-experiment/1.0/test/test-variant.js b/extensions/amp-experiment/1.0/test/test-variant.js
index 2cd86776de2a..b2ad03dd465a 100644
--- a/extensions/amp-experiment/1.0/test/test-variant.js
+++ b/extensions/amp-experiment/1.0/test/test-variant.js
@@ -1,6 +1,8 @@
 import {Services} from '#service';
 import {AmpDocSingle} from '#service/ampdoc-impl';
 
+import {FakePerformance} from '#testing/fake-dom';
+
 import {allocateVariant} from '../variant';
 
 describes.sandboxed('allocateVariant', {}, (env) => {
@@ -24,6 +26,7 @@ describes.sandboxed('allocateVariant', {}, (env) => {
         nodeType: /* DOCUMENT */ 9,
         body: {},
       },
+      performance: new FakePerformance(window),
     };
     fakeWin.document.defaultView = fakeWin;
     ampdoc = new AmpDocSingle(fakeWin);
diff --git a/extensions/amp-experiment/1.0/test/validator-amp-experiment.out b/extensions/amp-experiment/1.0/test/validator-amp-experiment.out
index 73db5fd1a649..c30b75cccd87 100644
--- a/extensions/amp-experiment/1.0/test/validator-amp-experiment.out
+++ b/extensions/amp-experiment/1.0/test/validator-amp-experiment.out
@@ -54,7 +54,7 @@ FAIL
 amp-experiment/1.0/test/validator-amp-experiment.html:51:0 The tag 'amp-experiment' appears more than once in the document. (see https://amp.dev/documentation/components/amp-experiment/)
 |      <script type="invalidtype"></script>
 >>     ^~~~~~~~~
-amp-experiment/1.0/test/validator-amp-experiment.html:52:4 Custom JavaScript is not allowed. (see https://amp.dev/documentation/guides-and-tutorials/learn/validation-workflow/validation_errors/#custom-javascript-is-not-allowed)
+amp-experiment/1.0/test/validator-amp-experiment.html:52:4 The parent tag of tag 'amphtml engine script' is 'amp-experiment', but it can only be 'head'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#required-markup)
 |  </amp-experiment>
 |
 |  <!-- Too large of JSON -->
diff --git a/extensions/amp-experiment/1.0/variant.js b/extensions/amp-experiment/1.0/variant.js
index dda7f1397b02..c992295413b6 100644
--- a/extensions/amp-experiment/1.0/variant.js
+++ b/extensions/amp-experiment/1.0/variant.js
@@ -21,7 +21,7 @@ export class Variants {
     /** @const */
     this.ampdoc = ampdoc;
 
-    /** @private @const {!Deferred<!Object<string, ?string>>} */
+    /** @private @const {!Deferred<!{[key: string]: ?string}>} */
     this.variantsDeferred_ = new Deferred();
   }
 
@@ -36,7 +36,7 @@ export class Variants {
 
   /**
    * Returns a promise for the experiment variants.
-   * @return {!Promise<!Object<string, ?string>>}
+   * @return {!Promise<!{[key: string]: ?string}>}
    */
   getVariants() {
     return this.variantsDeferred_.promise;
diff --git a/extensions/amp-facebook-comments/0.1/amp-facebook-comments.js b/extensions/amp-facebook-comments/0.1/amp-facebook-comments.js
index 8d55b42acdb5..056940a4a528 100644
--- a/extensions/amp-facebook-comments/0.1/amp-facebook-comments.js
+++ b/extensions/amp-facebook-comments/0.1/amp-facebook-comments.js
@@ -1,18 +1,21 @@
-import {Services} from '#service';
+import {removeElement} from '#core/dom';
 import {applyFillContent, isLayoutSizeDefined} from '#core/dom/layout';
-import {createLoaderLogo} from '../../amp-facebook/0.1/facebook-loader';
+import {isObject} from '#core/types';
+import {tryParseJson} from '#core/types/object/json';
 import {dashToUnderline} from '#core/types/string';
+
+import {Services} from '#service';
+
 import {getData, listen} from '#utils/event-helper';
+
 import {getIframe, preloadBootstrap} from '../../../src/3p-frame';
-import {isObject} from '#core/types';
 import {listenFor} from '../../../src/iframe-helper';
-import {removeElement} from '#core/dom';
-import {tryParseJson} from '#core/types/object/json';
+import {createLoaderLogo} from '../../amp-facebook/0.1/facebook-loader';
 
 const TYPE = 'facebook';
 
 class AmpFacebookComments extends AMP.BaseElement {
-  /** @override @nocollapse */
+  /** @override  */
   static createLoaderLogoCallback(element) {
     return createLoaderLogo(element);
   }
diff --git a/extensions/amp-facebook-comments/0.1/test/test-amp-facebook-comments.js b/extensions/amp-facebook-comments/0.1/test/test-amp-facebook-comments.js
index 7e339c22c4d0..4385caa35436 100644
--- a/extensions/amp-facebook-comments/0.1/test/test-amp-facebook-comments.js
+++ b/extensions/amp-facebook-comments/0.1/test/test-amp-facebook-comments.js
@@ -1,9 +1,11 @@
 import '../amp-facebook-comments';
+import {serializeMessage} from '#core/3p-frame-messaging';
 import {createElementWithAttributes} from '#core/dom';
+
 import {doNotLoadExternalResourcesInTest} from '#testing/iframe';
-import {resetServiceForTesting} from '../../../../src/service-helpers';
-import {serializeMessage} from '#core/3p-frame-messaging';
+
 import {setDefaultBootstrapBaseUrlForTesting} from '../../../../src/3p-frame';
+import {resetServiceForTesting} from '../../../../src/service-helpers';
 
 describes.realWin(
   'amp-facebook-comments',
diff --git a/extensions/amp-facebook-comments/validator-amp-facebook-comments.protoascii b/extensions/amp-facebook-comments/validator-amp-facebook-comments.protoascii
index 328ebbb43608..0edb0b8b097e 100644
--- a/extensions/amp-facebook-comments/validator-amp-facebook-comments.protoascii
+++ b/extensions/amp-facebook-comments/validator-amp-facebook-comments.protoascii
@@ -1,8 +1,8 @@
 tags: {  # amp-facebook-comments
   html_format: AMP
   tag_name: "SCRIPT"
-  satisfies: "amp-facebook-comments 0.1"
-  excludes: "amp-facebook 1.0"
+  satisfies_condition: "amp-facebook-comments 0.1"
+  excludes_condition: "amp-facebook 1.0"
   extension_spec: {
     name: "amp-facebook-comments"
     version: "0.1"
@@ -14,7 +14,7 @@ tags: {  # <amp-facebook-comments>
   html_format: AMP
   tag_name: "AMP-FACEBOOK-COMMENTS"
   requires_extension: "amp-facebook-comments"
-  requires: "amp-facebook-comments 0.1"
+  requires_condition: "amp-facebook-comments 0.1"
   # The amp-facebook attr_list is defined in the amp-facebook protoascii
   attr_lists: "amp-facebook"
   attr_lists: "extended-amp-global"
diff --git a/extensions/amp-facebook-like/0.1/amp-facebook-like.js b/extensions/amp-facebook-like/0.1/amp-facebook-like.js
index f5ab1ae91d90..21b7bec7bc63 100644
--- a/extensions/amp-facebook-like/0.1/amp-facebook-like.js
+++ b/extensions/amp-facebook-like/0.1/amp-facebook-like.js
@@ -1,12 +1,15 @@
-import {Services} from '#service';
+import {removeElement} from '#core/dom';
 import {applyFillContent, isLayoutSizeDefined} from '#core/dom/layout';
+import {isObject} from '#core/types';
+import {tryParseJson} from '#core/types/object/json';
 import {dashToUnderline} from '#core/types/string';
+
+import {Services} from '#service';
+
 import {getData, listen} from '#utils/event-helper';
+
 import {getIframe, preloadBootstrap} from '../../../src/3p-frame';
-import {isObject} from '#core/types';
 import {listenFor} from '../../../src/iframe-helper';
-import {removeElement} from '#core/dom';
-import {tryParseJson} from '#core/types/object/json';
 
 const TYPE = 'facebook';
 
diff --git a/extensions/amp-facebook-like/0.1/test/test-amp-facebook-like.js b/extensions/amp-facebook-like/0.1/test/test-amp-facebook-like.js
index 7a2283d35963..52b6466443a7 100644
--- a/extensions/amp-facebook-like/0.1/test/test-amp-facebook-like.js
+++ b/extensions/amp-facebook-like/0.1/test/test-amp-facebook-like.js
@@ -1,9 +1,11 @@
 import '../amp-facebook-like';
-import {createElementWithAttributes} from '#core/dom';
 import {facebook} from '#3p/facebook';
-import {resetServiceForTesting} from '../../../../src/service-helpers';
+
 import {serializeMessage} from '#core/3p-frame-messaging';
+import {createElementWithAttributes} from '#core/dom';
+
 import {setDefaultBootstrapBaseUrlForTesting} from '../../../../src/3p-frame';
+import {resetServiceForTesting} from '../../../../src/service-helpers';
 
 describes.realWin(
   'amp-facebook-like',
diff --git a/extensions/amp-facebook-like/validator-amp-facebook-like.protoascii b/extensions/amp-facebook-like/validator-amp-facebook-like.protoascii
index 913a4d6c6b73..a1764847e7aa 100644
--- a/extensions/amp-facebook-like/validator-amp-facebook-like.protoascii
+++ b/extensions/amp-facebook-like/validator-amp-facebook-like.protoascii
@@ -1,8 +1,8 @@
 tags: {  # amp-facebook-like
   html_format: AMP
   tag_name: "SCRIPT"
-  satisfies: "amp-facebook-like 0.1"
-  excludes: "amp-facebook 1.0"
+  satisfies_condition: "amp-facebook-like 0.1"
+  excludes_condition: "amp-facebook 1.0"
   extension_spec: {
     name: "amp-facebook-like"
     version: "0.1"
@@ -14,7 +14,7 @@ tags: {  # <amp-facebook-like>
   html_format: AMP
   tag_name: "AMP-FACEBOOK-LIKE"
   requires_extension: "amp-facebook-like"
-  requires: "amp-facebook-like 0.1"
+  requires_condition: "amp-facebook-like 0.1"
   # The amp-facebook-strict attr_list is defined in the amp-facebook protoascii
   attr_lists: "amp-facebook-strict"
   attr_lists: "extended-amp-global"
diff --git a/extensions/amp-facebook-page/0.1/amp-facebook-page.js b/extensions/amp-facebook-page/0.1/amp-facebook-page.js
index be52b0566938..5356232a1fd0 100644
--- a/extensions/amp-facebook-page/0.1/amp-facebook-page.js
+++ b/extensions/amp-facebook-page/0.1/amp-facebook-page.js
@@ -1,18 +1,21 @@
-import {Services} from '#service';
+import {removeElement} from '#core/dom';
 import {applyFillContent, isLayoutSizeDefined} from '#core/dom/layout';
-import {createLoaderLogo} from '../../amp-facebook/0.1/facebook-loader';
+import {isObject} from '#core/types';
+import {tryParseJson} from '#core/types/object/json';
 import {dashToUnderline} from '#core/types/string';
+
+import {Services} from '#service';
+
 import {getData, listen} from '#utils/event-helper';
+
 import {getIframe, preloadBootstrap} from '../../../src/3p-frame';
-import {isObject} from '#core/types';
 import {listenFor} from '../../../src/iframe-helper';
-import {removeElement} from '#core/dom';
-import {tryParseJson} from '#core/types/object/json';
+import {createLoaderLogo} from '../../amp-facebook/0.1/facebook-loader';
 
 const TYPE = 'facebook';
 
 class AmpFacebookPage extends AMP.BaseElement {
-  /** @override @nocollapse */
+  /** @override  */
   static createLoaderLogoCallback(element) {
     return createLoaderLogo(element);
   }
diff --git a/extensions/amp-facebook-page/0.1/test/test-amp-facebook-page.js b/extensions/amp-facebook-page/0.1/test/test-amp-facebook-page.js
index 066e86cd1cdc..3ec866131c8b 100644
--- a/extensions/amp-facebook-page/0.1/test/test-amp-facebook-page.js
+++ b/extensions/amp-facebook-page/0.1/test/test-amp-facebook-page.js
@@ -1,9 +1,11 @@
 import '../amp-facebook-page';
-import {createElementWithAttributes} from '#core/dom';
 import {facebook} from '#3p/facebook';
-import {resetServiceForTesting} from '../../../../src/service-helpers';
+
 import {serializeMessage} from '#core/3p-frame-messaging';
+import {createElementWithAttributes} from '#core/dom';
+
 import {setDefaultBootstrapBaseUrlForTesting} from '../../../../src/3p-frame';
+import {resetServiceForTesting} from '../../../../src/service-helpers';
 
 describes.realWin(
   'amp-facebook-page',
diff --git a/extensions/amp-facebook-page/validator-amp-facebook-page.protoascii b/extensions/amp-facebook-page/validator-amp-facebook-page.protoascii
index b6338f25a32b..543ccdb7d979 100644
--- a/extensions/amp-facebook-page/validator-amp-facebook-page.protoascii
+++ b/extensions/amp-facebook-page/validator-amp-facebook-page.protoascii
@@ -1,8 +1,8 @@
 tags: {  # amp-facebook-page
   html_format: AMP
   tag_name: "SCRIPT"
-  satisfies: "amp-facebook-page 0.1"
-  excludes: "amp-facebook 1.0"
+  satisfies_condition: "amp-facebook-page 0.1"
+  excludes_condition: "amp-facebook 1.0"
   extension_spec: {
     name: "amp-facebook-page"
     version: "0.1"
@@ -14,7 +14,7 @@ tags: {  # <amp-facebook-page>
   html_format: AMP
   tag_name: "AMP-FACEBOOK-PAGE"
   requires_extension: "amp-facebook-page"
-  requires: "amp-facebook-page 0.1"
+  requires_condition: "amp-facebook-page 0.1"
   # The amp-facebook-strict attr_list is defined in the amp-facebook protoascii
   attr_lists: "amp-facebook-strict"
   attr_lists: "extended-amp-global"
diff --git a/extensions/amp-facebook/0.1/amp-facebook.js b/extensions/amp-facebook/0.1/amp-facebook.js
index 7f6ab5e4e25f..f2f183473d6a 100644
--- a/extensions/amp-facebook/0.1/amp-facebook.js
+++ b/extensions/amp-facebook/0.1/amp-facebook.js
@@ -1,20 +1,24 @@
-import {Services} from '#service';
+import {removeElement} from '#core/dom';
 import {applyFillContent, isLayoutSizeDefined} from '#core/dom/layout';
-import {createLoaderLogo} from './facebook-loader';
+import {isObject} from '#core/types';
+import {tryParseJson} from '#core/types/object/json';
 import {dashToUnderline} from '#core/types/string';
+
+import {Services} from '#service';
+
 import {getData, listen} from '#utils/event-helper';
+import {userAssert} from '#utils/log';
+
+import {createLoaderLogo} from './facebook-loader';
+
 import {getIframe, preloadBootstrap} from '../../../src/3p-frame';
-import {getMode} from '../../../src/mode';
-import {isObject} from '#core/types';
 import {listenFor} from '../../../src/iframe-helper';
-import {removeElement} from '#core/dom';
-import {tryParseJson} from '#core/types/object/json';
-import {userAssert} from '#utils/log';
+import {getMode} from '../../../src/mode';
 
 const TYPE = 'facebook';
 
 class AmpFacebook extends AMP.BaseElement {
-  /** @override @nocollapse */
+  /** @override  */
   static createLoaderLogoCallback(element) {
     return createLoaderLogo(element);
   }
@@ -70,10 +74,17 @@ class AmpFacebook extends AMP.BaseElement {
   /** @override */
   layoutCallback() {
     const embedAs = this.element.getAttribute('data-embed-as');
+    if (embedAs === 'comment') {
+      this.user().warn(
+        'AMP-FACEBOOK',
+        'Embedded Comments have been deprecated: https://developers.facebook.com/docs/plugins/embedded-comments'
+      );
+      return;
+    }
     userAssert(
-      !embedAs || ['post', 'video', 'comment'].indexOf(embedAs) !== -1,
+      !embedAs || ['post', 'video'].indexOf(embedAs) !== -1,
       'Attribute data-embed-as for <amp-facebook> value is wrong, should be' +
-        ' "post", "video" or "comment" but was: %s',
+        ' "post" or "video" but was: %s',
       embedAs
     );
     const iframe = getIframe(this.win, this.element, TYPE);
diff --git a/extensions/amp-facebook/0.1/test/test-amp-facebook.js b/extensions/amp-facebook/0.1/test/test-amp-facebook.js
index 728c6458e785..6085e67d9619 100644
--- a/extensions/amp-facebook/0.1/test/test-amp-facebook.js
+++ b/extensions/amp-facebook/0.1/test/test-amp-facebook.js
@@ -1,8 +1,12 @@
 import '../amp-facebook';
 import {expect} from 'chai';
+
 import {facebook} from '#3p/facebook';
-import {resetServiceForTesting} from '../../../../src/service-helpers';
+
+import * as log from '#utils/log';
+
 import {setDefaultBootstrapBaseUrlForTesting} from '../../../../src/3p-frame';
+import {resetServiceForTesting} from '../../../../src/service-helpers';
 
 describes.realWin(
   'amp-facebook',
@@ -18,6 +22,8 @@ describes.realWin(
     const fbPostHref = 'https://www.facebook.com/zuck/posts/10102593740125791';
     const fbVideoHref =
       'https://www.facebook.com/zuck/videos/10102509264909801/';
+    const fbCommentHref =
+      'https://www.facebook.com/zuck/posts/10102735452532991?comment_id=1070233703036185';
     let win, doc;
 
     beforeEach(() => {
@@ -74,32 +80,29 @@ describes.realWin(
       expect(context.attributes.embedAs).to.equal('video');
     });
 
-    it('renders iframe in amp-facebook with comment', async () => {
-      const ampFB = await getAmpFacebook(fbVideoHref, 'comment');
-      const iframe = ampFB.firstChild;
-      expect(iframe).to.not.be.null;
-      expect(iframe.tagName).to.equal('IFRAME');
-      expect(iframe.className).to.match(/i-amphtml-fill-content/);
-
-      const context = JSON.parse(iframe.getAttribute('name'));
-      expect(context.attributes.embedAs).to.equal('comment');
+    it('warns unsupported data-embed-as value: comment', async () => {
+      const warn = env.sandbox.spy();
+      env.sandbox.stub(log, 'user').returns({warn});
+      expect(warn).not.to.be.called;
+      await getAmpFacebook(fbCommentHref, 'comment');
+      expect(warn).to.be.calledOnce;
     });
 
     it('rejects other supported and unsupported data-embed-as types', async () => {
       expectAsyncConsoleError(/.*/);
       await expect(getAmpFacebook(fbVideoHref, 'comments')).to.be.rejectedWith(
-        /Attribute data-embed-as for <amp-facebook> value is wrong, should be "post", "video" or "comment" but was: comments/
+        /Attribute data-embed-as for <amp-facebook> value is wrong, should be "post" or "video" but was: comments/
       );
       await expect(getAmpFacebook(fbVideoHref, 'like')).to.be.rejectedWith(
-        /Attribute data-embed-as for <amp-facebook> value is wrong, should be "post", "video" or "comment" but was: like/
+        /Attribute data-embed-as for <amp-facebook> value is wrong, should be "post" or "video" but was: like/
       );
       await expect(getAmpFacebook(fbVideoHref, 'page')).to.be.rejectedWith(
-        /Attribute data-embed-as for <amp-facebook> value is wrong, should be "post", "video" or "comment" but was: page/
+        /Attribute data-embed-as for <amp-facebook> value is wrong, should be "post" or "video" but was: page/
       );
       await expect(
         getAmpFacebook(fbVideoHref, 'unsupported')
       ).to.be.rejectedWith(
-        /Attribute data-embed-as for <amp-facebook> value is wrong, should be "post", "video" or "comment" but was: unsupported/
+        /Attribute data-embed-as for <amp-facebook> value is wrong, should be "post" or "video" but was: unsupported/
       );
     });
 
diff --git a/extensions/amp-facebook/1.0/README.md b/extensions/amp-facebook/1.0/README.md
index e83334ebde91..04020b361d3a 100644
--- a/extensions/amp-facebook/1.0/README.md
+++ b/extensions/amp-facebook/1.0/README.md
@@ -6,7 +6,7 @@ Embeds a [Facebook](https://facebook.com) post, a Facebook video, or a comment o
 
 You must include each Bento component's required CSS library before adding custom styles in order to guarantee proper loading. Or use the lightweight pre-uprgrade styles available inline. See [Layout and Style](#layout-and-style).
 
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/facebook
@@ -17,222 +17,301 @@ import {defineElement as defineBentoFacebook} from '@bentoproject/facebook';
 defineBentoFacebook();
 ```
 
-### Example: Include via `<script>`
+### Include via `<script>`
+
+```html
+<script type="module" src="https://cdn.ampproject.org/bento.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/bento.js" crossorigin="anonymous"></script>
+<script type="module" src="https://cdn.ampproject.org/v0/bento-facebook-1.0.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/v0/bento-facebook-1.0.js" crossorigin="anonymous"></script>
+<link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-facebook-1.0.css" crossorigin="anonymous">
+```
+
+### Example
 
 ##### Embed a Facebook Post
 
-```html
-<head>
-  <script src="https://cdn.ampproject.org/bento.js"></script>
-  <!-- These styles prevent Cumulative Layout Shift on the unupgraded custom element -->
-  <style>
-    bento-facebook {
-      display: block;
-      overflow: hidden;
-      position: relative;
-    }
-  </style>
-  <script
-    async
-    src="https://cdn.ampproject.org/v0/bento-facebook-1.0.js"
-  ></script>
-  <style>
-    bento-facebook {
-      width: 375px;
-      height: 472px;
-    }
-  </style>
-</head>
-
-<bento-facebook
-  id="facebook-post"
-  data-href="https://www.facebook.com/ParksCanada/posts/1712989015384373"
->
-</bento-facebook>
-<div class="buttons" style="margin-top: 8px">
-  <button id="change-facebook-post">Change Facebook post</button>
-</div>
-
-<script>
-  (async () => {
-    const facebookPost = document.querySelector('#facebook-post');
-    await customElements.whenDefined('bento-facebook');
-    // set up button actions
-    document.querySelector('#change-facebook-post').onclick = () => {
-      facebookPost.setAttribute(
-        'data-href',
-        'https://www.facebook.com/NASA/photos/a.67899501771/10159193669016772/'
-      );
-    };
-  })();
-</script>
+<!--% example %-->
 
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-facebook-1.0.css"
+    />
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-facebook-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-facebook-1.0.js"
+    ></script>
+    <style>
+      bento-facebook {
+        width: 375px;
+        height: 472px;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-facebook
+      id="facebook-post"
+      data-href="https://www.facebook.com/ParksCanada/posts/1712989015384373"
+    >
+    </bento-facebook>
+    <div class="buttons" style="margin-top: 8px">
+      <button id="change-facebook-post">Change Facebook post</button>
+    </div>
+
+    <script>
+      (async () => {
+        const facebookPost = document.querySelector('#facebook-post');
+        await customElements.whenDefined('bento-facebook');
+        // set up button actions
+        document.querySelector('#change-facebook-post').onclick = () => {
+          facebookPost.setAttribute(
+            'data-href',
+            'https://www.facebook.com/NASA/photos/a.67899501771/10159193669016772/'
+          );
+        };
+      })();
+    </script>
+  </body>
+</html>
 ```
 
 ##### Embed a Facebook Video
 
+<!--% example %-->
+
 ```html
-<head>
-  <script src="https://cdn.ampproject.org/bento.js"></script>
-  <!-- These styles prevent Cumulative Layout Shift on the unupgraded custom element -->
-  <style>
-    bento-facebook {
-      display: block;
-      overflow: hidden;
-      position: relative;
-    }
-  </style>
-  <script
-    async
-    src="https://cdn.ampproject.org/v0/bento-facebook-1.0.js"
-  ></script>
-  <style>
-    bento-facebook {
-      width: 375px;
-      height: 472px;
-    }
-  </style>
-</head>
-
-<bento-facebook
-  id="facebook-video"
-  data-embed-as="video"
-  data-href="https://www.facebook.com/nasaearth/videos/10155187938052139"
->
-</bento-facebook>
-<div class="buttons" style="margin-top: 8px">
-  <button id="change-facebook-video">Change Facebook video</button>
-</div>
-
-<script>
-  (async () => {
-    const facebookVideo = document.querySelector('#facebook-video');
-    await customElements.whenDefined('bento-facebook');
-    // set up button actions
-    document.querySelector('#change-facebook-video').onclick = () => {
-      facebookVideo.setAttribute(
-        'data-href',
-        'https://www.facebook.com/NASA/videos/846648316199961/'
-      );
-    };
-  })();
-</script>
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-facebook-1.0.css"
+    />
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-facebook-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-facebook-1.0.js"
+    ></script>
+    <style>
+      bento-facebook {
+        width: 375px;
+        height: 472px;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-facebook
+      id="facebook-video"
+      data-embed-as="video"
+      data-href="https://www.facebook.com/nasaearth/videos/10155187938052139"
+    >
+    </bento-facebook>
+    <div class="buttons" style="margin-top: 8px">
+      <button id="change-facebook-video">Change Facebook video</button>
+    </div>
+
+    <script>
+      (async () => {
+        const facebookVideo = document.querySelector('#facebook-video');
+        await customElements.whenDefined('bento-facebook');
+        // set up button actions
+        document.querySelector('#change-facebook-video').onclick = () => {
+          facebookVideo.setAttribute(
+            'data-href',
+            'https://www.facebook.com/NASA/videos/846648316199961/'
+          );
+        };
+      })();
+    </script>
+  </body>
+</html>
 ```
 
 ##### Embed a Facebook Page
 
+<!--% example %-->
+
 ```html
-<head>
-  <script src="https://cdn.ampproject.org/bento.js"></script>
-  <!-- These styles prevent Cumulative Layout Shift on the unupgraded custom element -->
-  <style>
-    bento-facebook {
-      display: block;
-      overflow: hidden;
-      position: relative;
-    }
-  </style>
-  <script
-    async
-    src="https://cdn.ampproject.org/v0/bento-facebook-1.0.js"
-  ></script>
-  <style>
-    bento-facebook {
-      width: 375px;
-      height: 472px;
-    }
-  </style>
-</head>
-
-<bento-facebook
-  id="facebook-video"
-  data-embed-as="video"
-  data-href="https://www.facebook.com/nasaearth/videos/10155187938052139"
->
-</bento-facebook>
-<div class="buttons" style="margin-top: 8px">
-  <button id="change-facebook-video">Change Facebook video</button>
-</div>
-
-<script>
-  (async () => {
-    const facebookVideo = document.querySelector('#facebook-video');
-    await customElements.whenDefined('bento-facebook');
-    // set up button actions
-    document.querySelector('#change-facebook-video').onclick = () => {
-      facebookVideo.setAttribute(
-        'data-href',
-        'https://www.facebook.com/NASA/videos/846648316199961/'
-      );
-    };
-  })();
-</script>
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-facebook-1.0.css"
+    />
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-facebook-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-facebook-1.0.js"
+    ></script>
+    <style>
+      bento-facebook {
+        width: 375px;
+        height: 472px;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-facebook
+      id="facebook-video"
+      data-embed-as="video"
+      data-href="https://www.facebook.com/nasaearth/videos/10155187938052139"
+    >
+    </bento-facebook>
+    <div class="buttons" style="margin-top: 8px">
+      <button id="change-facebook-video">Change Facebook video</button>
+    </div>
+
+    <script>
+      (async () => {
+        const facebookVideo = document.querySelector('#facebook-video');
+        await customElements.whenDefined('bento-facebook');
+        // set up button actions
+        document.querySelector('#change-facebook-video').onclick = () => {
+          facebookVideo.setAttribute(
+            'data-href',
+            'https://www.facebook.com/NASA/videos/846648316199961/'
+          );
+        };
+      })();
+    </script>
+  </body>
+</html>
 ```
 
 ##### Embed a Facebook Like Button
 
+<!--% example %-->
+
 ```html
-<head>
-  <script src="https://cdn.ampproject.org/bento.js"></script>
-  <!-- These styles prevent Cumulative Layout Shift on the unupgraded custom element -->
-  <style>
-    bento-facebook {
-      display: block;
-      overflow: hidden;
-      position: relative;
-    }
-  </style>
-  <script
-    async
-    src="https://cdn.ampproject.org/v0/bento-facebook-1.0.js"
-  ></script>
-  <style>
-    bento-facebook {
-      width: 375px;
-      height: 472px;
-    }
-  </style>
-</head>
-
-<bento-facebook
-  id="facebook-video"
-  data-embed-as="like"
-  data-href="https://www.facebook.com/nasaearth/videos/10155187938052139"
->
-</bento-facebook>
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-facebook-1.0.css"
+    />
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-facebook-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-facebook-1.0.js"
+    ></script>
+    <style>
+      bento-facebook {
+        width: 375px;
+        height: 472px;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-facebook
+      id="facebook-video"
+      data-embed-as="like"
+      data-href="https://www.facebook.com/nasaearth/videos/10155187938052139"
+    >
+    </bento-facebook>
+  </body>
+</html>
 ```
 
 ##### Embed a Facebook Comment Section
 
+<!--% example %-->
+
 ```html
-<head>
-  <script src="https://cdn.ampproject.org/bento.js"></script>
-  <!-- These styles prevent Cumulative Layout Shift on the unupgraded custom element -->
-  <style>
-    bento-facebook {
-      display: block;
-      overflow: hidden;
-      position: relative;
-    }
-  </style>
-  <script
-    async
-    src="https://cdn.ampproject.org/v0/bento-facebook-1.0.js"
-  ></script>
-  <style>
-    bento-facebook {
-      width: 375px;
-      height: 472px;
-    }
-  </style>
-</head>
-
-<bento-facebook
-  id="facebook-comments"
-  data-embed-as="comments"
-  data-href="https://www.facebook.com/zuck/posts/10102735452532991?comment_id=1070233703036185"
->
-</bento-facebook>
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-facebook-1.0.css"
+    />
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-facebook-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-facebook-1.0.js"
+    ></script>
+    <style>
+      bento-facebook {
+        width: 375px;
+        height: 472px;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-facebook
+      id="facebook-comments"
+      data-embed-as="comments"
+      data-href="https://www.facebook.com/zuck/posts/10102735452532991?comment_id=1070233703036185"
+    >
+    </bento-facebook>
+  </body>
+</html>
 ```
 
 ### Layout and Style
@@ -263,43 +342,27 @@ Alternatively, you may also make the light-weight pre-upgrade styles available i
 
 #### `data-href`
 
-The URL of the Facebook post/video/comment. For example, a post or video will
-look like `https://www.facebook.com/zuck/posts/10102593740125791`. A comment or
-comment reply will look like
-`https://www.facebook.com/zuck/posts/10102735452532991?comment_id=1070233703036185`.
+The URL of the Facebook post/video/comment. For example, a post or video will look like `https://www.facebook.com/zuck/posts/10102593740125791`. A comment or comment reply will look like `https://www.facebook.com/zuck/posts/10102735452532991?comment_id=1070233703036185`.
 
 #### `data-embed-as`
 
-The value can be either `post`, `video`, `comments`, `like`, or `page`.
-The default value is `post`.
+The value can be either `post`, `video`, `comments`, `like`, or `page`. The default value is `post`.
 
-Both posts and videos can be embedded as a post. Setting `data-embed-as="video"`
-for Facebook videos embeds the player of the video, and adds the accompanying
-post card with it. Setting `data-embed-as="post"` ignores the caption card. This
-is done to make sure we are zooming in on videos correctly.
+Both posts and videos can be embedded as a post. Setting `data-embed-as="video"` for Facebook videos embeds the player of the video, and adds the accompanying post card with it. Setting `data-embed-as="post"` ignores the caption card. This is done to make sure we are zooming in on videos correctly.
 
-The `comments` value embeds a comment section which allows people to comment on
-content using their Facebook account.
+The `comments` value embeds a comment section which allows people to comment on content using their Facebook account.
 
-The `like` value embeds a like button which, when clicked, triggers the like to be logged on Facebook.
-The `page` value embeds any public facebook page.
+The `like` value embeds a like button which, when clicked, triggers the like to be logged on Facebook. The `page` value embeds any public facebook page.
 
-Check out the documentation for differences between
-[post embeds](https://developers.facebook.com/docs/plugins/embedded-posts),
-[video embeds](https://developers.facebook.com/docs/plugins/embedded-video-player),
-[like embeds](https://developers.facebook.com/docs/plugins/like-button),
-and [page embeds](https://developers.facebook.com/docs/plugins/page-plugin).
+Check out the documentation for differences between [post embeds](https://developers.facebook.com/docs/plugins/embedded-posts), [video embeds](https://developers.facebook.com/docs/plugins/embedded-video-player), [like embeds](https://developers.facebook.com/docs/plugins/like-button), and [page embeds](https://developers.facebook.com/docs/plugins/page-plugin).
 
-The `comment` value is deprecated but previously was used to embed a single comment (or reply to a comment) on a post.
-This is not to be confused with
-[`amp-facebook-comments`](https://amp.dev/documentation/examples/components/amp-facebook-comments/).
+The `comment` value is deprecated but previously was used to embed a single comment (or reply to a comment) on a post. This is not to be confused with [`amp-facebook-comments`](https://amp.dev/documentation/examples/components/amp-facebook-comments/).
 
 #### `data-align-center`
 
 The value is either `true` or `false`. The default is `false`.
 
-For posts and videos, having this attribute set to true would align the
-post/video container to center.
+For posts and videos, having this attribute set to true would align the post/video container to center.
 
 #### `data-allowfullscreen`
 
@@ -311,13 +374,11 @@ When embedding a video, set this value to allow for a fullscreen experience.
 
 The value is either `true` or `false`. The default is `false`.
 
-When you are embedding a comment reply, you can optionally also include the
-parent comment of the reply.
+When you are embedding a comment reply, you can optionally also include the parent comment of the reply.
 
 #### `data-action` (optional)
 
-The verb to display on the button. Can be either `like` or `recommend`. The
-default is `like`.
+The verb to display on the button. Can be either `like` or `recommend`. The default is `like`.
 
 #### `data-hide-cover` (optional)
 
@@ -329,44 +390,33 @@ Hides the custom call to action button (if available). Default value is `false`.
 
 #### `data-kd_site` (optional)
 
-This attribute is also known as `data-kid_directed_site` in the Facebook SDK.
-If your web site or online service, or a portion of your service, is directed to
-children under 13 you must enable this attribute. The default is `false`.
+This attribute is also known as `data-kid_directed_site` in the Facebook SDK. If your web site or online service, or a portion of your service, is directed to children under 13 you must enable this attribute. The default is `false`.
 
 #### `data-layout` (optional)
 
-Selects one of the different layouts that are available for the plugin. Can be
-one of `standard`, `button_count`, `button` or `box_count`. The default is
-`standard`.
+Selects one of the different layouts that are available for the plugin. Can be one of `standard`, `button_count`, `button` or `box_count`. The default is `standard`.
 
 #### `data-locale` (optional)
 
-By default, the locale is set to user's system language; however, you can
-specify a locale as well.
+By default, the locale is set to user's system language; however, you can specify a locale as well.
 
-For details on strings accepted here please visit the
-[Facebook API Localization page](https://developers.facebook.com/docs/internationalization).
+For details on strings accepted here please visit the [Facebook API Localization page](https://developers.facebook.com/docs/internationalization).
 
 #### `data-numposts` (optional)
 
-The number of comments to show. Currently Facebook SDK limits this to max 100.
-For details, see the
-[Facebook comments documentation](https://developers.facebook.com/docs/plugins/comments).
+The number of comments to show. Currently Facebook SDK limits this to max 100. For details, see the [Facebook comments documentation](https://developers.facebook.com/docs/plugins/comments).
 
 #### `data-order-by` (optional)
 
-The order to use when displaying comments. For details, see the
-[Facebook comments documentation](https://developers.facebook.com/docs/plugins/comments).
+The order to use when displaying comments. For details, see the [Facebook comments documentation](https://developers.facebook.com/docs/plugins/comments).
 
 #### `data-ref` (optional)
 
-A label for tracking referrals which must be less than 50 characters and can
-contain alphanumeric characters and some punctuation.
+A label for tracking referrals which must be less than 50 characters and can contain alphanumeric characters and some punctuation.
 
 #### `data-share` (optional)
 
-Specifies whether to include a share button beside the Like button. This only
-works with the XFBML version. The default is `false`.
+Specifies whether to include a share button beside the Like button. This only works with the XFBML version. The default is `false`.
 
 #### `data-show-facepile` (optional)
 
@@ -374,11 +424,9 @@ Shows profile photos of friends who like the page. Default value is `true`.
 
 #### `data-size` (optional)
 
-The size of the button, which can be one of two sizes, `large` or `small`. The
-default is `small`.
+The size of the button, which can be one of two sizes, `large` or `small`. The default is `small`.
 
-For details, see the
-[Facebook comments documentation](https://developers.facebook.com/docs/plugins/like-button#settings).
+For details, see the [Facebook comments documentation](https://developers.facebook.com/docs/plugins/like-button#settings).
 
 #### `data-small-header` (optional)
 
@@ -386,9 +434,7 @@ Uses the small header instead. Default value is `false`.
 
 #### `data-tabs` (optional)
 
-Specifies the tabs to render (i.e., `timeline`, `events`, `messages`). Use a
-comma-separated list to add multiple tabs (e.g., `timeline, events`). By
-default, the Facebook page plugin shows the timeline activity.
+Specifies the tabs to render (i.e., `timeline`, `events`, `messages`). Use a comma-separated list to add multiple tabs (e.g., `timeline, events`). By default, the Facebook page plugin shows the timeline activity.
 
 #### title (optional)
 
@@ -398,9 +444,7 @@ Define a `title` attribute for the component to propagate to the underlying `<if
 
 ## Preact/React Component
 
-The examples below demonstrate use of the `<BentoFacebook>` as a functional component usable with the Preact or React libraries.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/facebook
@@ -425,43 +469,27 @@ function App() {
 
 #### `href`
 
-The URL of the Facebook post/video/comment. For example, a post or video will
-look like `https://www.facebook.com/zuck/posts/10102593740125791`. A comment or
-comment reply will look like
-`https://www.facebook.com/zuck/posts/10102735452532991?comment_id=1070233703036185`.
+The URL of the Facebook post/video/comment. For example, a post or video will look like `https://www.facebook.com/zuck/posts/10102593740125791`. A comment or comment reply will look like `https://www.facebook.com/zuck/posts/10102735452532991?comment_id=1070233703036185`.
 
 #### `embedAs`
 
-The value can be either `post`, `video`, `comments`, `like`, or `page`.
-The default value is `post`.
+The value can be either `post`, `video`, `comments`, `like`, or `page`. The default value is `post`.
 
-Both posts and videos can be embedded as a post. Setting `data-embed-as="video"`
-for Facebook videos embeds the player of the video, and adds the accompanying
-post card with it. Setting `data-embed-as="post"` ignores the caption card. This
-is done to make sure we are zooming in on videos correctly.
+Both posts and videos can be embedded as a post. Setting `data-embed-as="video"` for Facebook videos embeds the player of the video, and adds the accompanying post card with it. Setting `data-embed-as="post"` ignores the caption card. This is done to make sure we are zooming in on videos correctly.
 
-The `comments` value embeds a comment section which allows people to comment on
-content using their Facebook account.
+The `comments` value embeds a comment section which allows people to comment on content using their Facebook account.
 
-The `like` value embeds a like button which, when clicked, triggers the like to be logged on Facebook.
-The `page` value embeds any public facebook page.
+The `like` value embeds a like button which, when clicked, triggers the like to be logged on Facebook. The `page` value embeds any public facebook page.
 
-Check out the documentation for differences between
-[post embeds](https://developers.facebook.com/docs/plugins/embedded-posts),
-[video embeds](https://developers.facebook.com/docs/plugins/embedded-video-player),
-[like embeds](https://developers.facebook.com/docs/plugins/like-button),
-and [page embeds](https://developers.facebook.com/docs/plugins/page-plugin).
+Check out the documentation for differences between [post embeds](https://developers.facebook.com/docs/plugins/embedded-posts), [video embeds](https://developers.facebook.com/docs/plugins/embedded-video-player), [like embeds](https://developers.facebook.com/docs/plugins/like-button), and [page embeds](https://developers.facebook.com/docs/plugins/page-plugin).
 
-The `comment` value is deprecated but previously was used to embed a single comment (or reply to a comment) on a post.
-This is not to be confused with
-[`amp-facebook-comments`](https://amp.dev/documentation/examples/components/amp-facebook-comments/).
+The `comment` value is deprecated but previously was used to embed a single comment (or reply to a comment) on a post. This is not to be confused with [`amp-facebook-comments`](https://amp.dev/documentation/examples/components/amp-facebook-comments/).
 
 #### `alignCenter`
 
 The value is either `true` or `false`. The default is `false`.
 
-For posts and videos, having this attribute set to true would align the
-post/video container to center.
+For posts and videos, having this attribute set to true would align the post/video container to center.
 
 #### `allowFullScreen`
 
@@ -473,19 +501,15 @@ When embedding a video, set this value to allow for a fullscreen experience.
 
 The value is either `true` or `false`. The default is `false`.
 
-When you are embedding a comment reply, you can optionally also include the
-parent comment of the reply.
+When you are embedding a comment reply, you can optionally also include the parent comment of the reply.
 
 #### `action` (optional)
 
-The verb to display on the button. Can be either `like` or `recommend`. The
-default is `like`.
+The verb to display on the button. Can be either `like` or `recommend`. The default is `like`.
 
 #### `dataLayout` (optional)
 
-Selects one of the different layouts that are available for the plugin. Can be
-one of `standard`, `button_count`, `button` or `box_count`. The default is
-`standard`.
+Selects one of the different layouts that are available for the plugin. Can be one of `standard`, `button_count`, `button` or `box_count`. The default is `standard`.
 
 #### `hideCover` (optional)
 
@@ -497,38 +521,29 @@ Hides the custom call to action button (if available). Default value is `false`.
 
 #### `kdSite` (optional)
 
-This attribute is also known as `data-kid_directed_site` in the Facebook SDK.
-If your web site or online service, or a portion of your service, is directed to
-children under 13 you must enable this attribute. The default is `false`.
+This attribute is also known as `data-kid_directed_site` in the Facebook SDK. If your web site or online service, or a portion of your service, is directed to children under 13 you must enable this attribute. The default is `false`.
 
 #### `locale` (optional)
 
-By default, the locale is set to user's system language; however, you can
-specify a locale as well.
+By default, the locale is set to user's system language; however, you can specify a locale as well.
 
-For details on strings accepted here please visit the
-[Facebook API Localization page](https://developers.facebook.com/docs/internationalization).
+For details on strings accepted here please visit the [Facebook API Localization page](https://developers.facebook.com/docs/internationalization).
 
 #### `numposts` (optional)
 
-The number of comments to show. Currently Facebook SDK limits this to max 100.
-For details, see the
-[Facebook comments documentation](https://developers.facebook.com/docs/plugins/comments).
+The number of comments to show. Currently Facebook SDK limits this to max 100. For details, see the [Facebook comments documentation](https://developers.facebook.com/docs/plugins/comments).
 
 #### `orderBy` (optional)
 
-The order to use when displaying comments. For details, see the
-[Facebook comments documentation](https://developers.facebook.com/docs/plugins/comments).
+The order to use when displaying comments. For details, see the [Facebook comments documentation](https://developers.facebook.com/docs/plugins/comments).
 
 #### `refLabel` (optional)
 
-A label for tracking referrals which must be less than 50 characters and can
-contain alphanumeric characters and some punctuation.
+A label for tracking referrals which must be less than 50 characters and can contain alphanumeric characters and some punctuation.
 
 #### `share` (optional)
 
-Specifies whether to include a share button beside the Like button. This only
-works with the XFBML version. The default is `false`.
+Specifies whether to include a share button beside the Like button. This only works with the XFBML version. The default is `false`.
 
 #### `showFacepile` (optional)
 
@@ -536,11 +551,9 @@ Shows profile photos of friends who like the page. Default value is `true`.
 
 #### `size` (optional)
 
-The size of the button, which can be one of two sizes, `large` or `small`. The
-default is `small`.
+The size of the button, which can be one of two sizes, `large` or `small`. The default is `small`.
 
-For details, see the
-[Facebook comments documentation](https://developers.facebook.com/docs/plugins/like-button#settings).
+For details, see the [Facebook comments documentation](https://developers.facebook.com/docs/plugins/like-button#settings).
 
 #### `smallHeader` (optional)
 
@@ -548,9 +561,7 @@ Uses the small header instead. Default value is `false`.
 
 #### `tabs` (optional)
 
-Specifies the tabs to render (i.e., `timeline`, `events`, `messages`). Use a
-comma-separated list to add multiple tabs (e.g., `timeline, events`). By
-default, the Facebook page plugin shows the timeline activity.
+Specifies the tabs to render (i.e., `timeline`, `events`, `messages`). Use a comma-separated list to add multiple tabs (e.g., `timeline, events`). By default, the Facebook page plugin shows the timeline activity.
 
 #### title (optional)
 
diff --git a/extensions/amp-facebook/1.0/amp-facebook.js b/extensions/amp-facebook/1.0/amp-facebook.js
index f196289ffde3..348dfb898df8 100644
--- a/extensions/amp-facebook/1.0/amp-facebook.js
+++ b/extensions/amp-facebook/1.0/amp-facebook.js
@@ -1,11 +1,21 @@
-import {BaseElement} from './base-element';
-import {createLoaderLogo} from '../0.1/facebook-loader';
+import {
+  BaseElement,
+  CommentsBaseElement,
+  LikeBaseElement,
+  PageBaseElement,
+} from '#bento/components/bento-facebook/1.0/base-element';
+
 import {dashToUnderline} from '#core/types/string';
-import {dict} from '#core/types/object';
-import {getBootstrapBaseUrl, getBootstrapUrl} from '../../../src/3p-frame';
+
 import {isExperimentOn} from '#experiments';
+
+import {AmpPreactBaseElement, setSuperClass} from '#preact/amp-base-element';
+
 import {userAssert} from '#utils/log';
 
+import {getBootstrapBaseUrl, getBootstrapUrl} from '../../../src/3p-frame';
+import {createLoaderLogo} from '../0.1/facebook-loader';
+
 /** @const {string} */
 const TAG = 'amp-facebook';
 const COMMENTS_TAG = 'amp-facebook-comments';
@@ -13,13 +23,13 @@ const LIKE_TAG = 'amp-facebook-like';
 const PAGE_TAG = 'amp-facebook-page';
 const TYPE = 'facebook';
 
-class AmpFacebook extends BaseElement {
-  /** @override @nocollapse */
+class AmpFacebookBase extends setSuperClass(BaseElement, AmpPreactBaseElement) {
+  /** @override  */
   static createLoaderLogoCallback(element) {
     return createLoaderLogo(element);
   }
 
-  /** @override @nocollapse */
+  /** @override  */
   static getPreconnects(element) {
     const ampdoc = element.getAmpDoc();
     const {win} = ampdoc;
@@ -39,9 +49,9 @@ class AmpFacebook extends BaseElement {
 
   /** @override */
   init() {
-    return dict({
+    return {
       'requestResize': (height) => this.attemptChangeHeight(height),
-    });
+    };
   }
 
   /** @override */
@@ -55,48 +65,16 @@ class AmpFacebook extends BaseElement {
   }
 }
 
-/**
- * Checks for valid data-embed-as attribute when given.
- * @param {!Element} element
- * @return {string}
- */
-function parseEmbed(element) {
-  const embedAs = element.getAttribute('data-embed-as');
-  userAssert(
-    !embedAs ||
-      ['post', 'video', 'comment', 'comments', 'like', 'page'].indexOf(
-        embedAs
-      ) !== -1,
-    'Attribute data-embed-as for <amp-facebook> value is wrong, should be' +
-      ' "post", "video", "comment", "comments", "like", or "page", but was: %s',
-    embedAs
-  );
-  return embedAs;
-}
-
-/** @override */
-AmpFacebook['props'] = {
-  ...BaseElement['props'],
-  'embedAs': {
-    attrs: ['data-embed-as'],
-    parseAttrs: parseEmbed,
-  },
-};
-
-class AmpFacebookComments extends AmpFacebook {}
-
-/** @override */
-AmpFacebookComments['staticProps'] = {'embedAs': 'comments'};
-
-class AmpFacebookLike extends AmpFacebook {}
+class AmpFacebook extends AmpFacebookBase {}
 
-/** @override */
-AmpFacebookLike['staticProps'] = {'embedAs': 'like'};
+class AmpFacebookComments extends setSuperClass(
+  CommentsBaseElement,
+  AmpFacebookBase
+) {}
 
-class AmpFacebookPage extends AmpFacebook {}
+class AmpFacebookLike extends setSuperClass(LikeBaseElement, AmpFacebookBase) {}
 
-/** @override */
-AmpFacebookPage['staticProps'] = {'embedAs': 'page'};
+class AmpFacebookPage extends setSuperClass(PageBaseElement, AmpFacebookBase) {}
 
 AMP.extension(TAG, '1.0', (AMP) => {
   AMP.registerElement(TAG, AmpFacebook);
diff --git a/extensions/amp-facebook/1.0/base-element.js b/extensions/amp-facebook/1.0/base-element.js
deleted file mode 100644
index a86d1d048518..000000000000
--- a/extensions/amp-facebook/1.0/base-element.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import {BentoFacebook} from './component';
-import {PreactBaseElement} from '#preact/base-element';
-import {dashToUnderline} from '#core/types/string';
-
-export class BaseElement extends PreactBaseElement {}
-
-/** @override */
-BaseElement['Component'] = BentoFacebook;
-
-/** @override */
-BaseElement['props'] = {
-  // common attributes
-  'title': {attr: 'title'}, // Needed for Preact component
-  'href': {attr: 'data-href'},
-  'locale': {
-    attr: 'data-locale',
-    default: dashToUnderline(window.navigator.language),
-  },
-  // amp-facebook
-  'allowFullScreen': {attr: 'data-allowfullscreen'},
-  'embedAs': {attr: 'data-embed-as'},
-  'includeCommentParent': {
-    attr: 'data-include-comment-parent',
-    type: 'boolean',
-    default: false,
-  },
-  'showText': {attr: 'data-show-text'},
-  // -comments
-  'numPosts': {attr: 'data-numposts'},
-  'orderBy': {attr: 'data-order-by'},
-  // -comments & -like
-  'colorscheme': {attr: 'data-colorscheme'},
-  // -like
-  'action': {attr: 'data-action'},
-  'kdSite': {attr: 'data-kd_site'},
-  'layout': {attr: 'data-layout'},
-  'refLabel': {attr: 'data-ref'},
-  'share': {attr: 'data-share'},
-  'size': {attr: 'data-size'},
-  // -page
-  'hideCover': {attr: 'data-hide-cover'},
-  'hideCta': {attr: 'data-hide-cta'},
-  'showFacepile': {attr: 'data-show-facepile'},
-  'smallHeader': {attr: 'data-small-header'},
-  'tabs': {attr: 'data-tabs'},
-};
-
-/** @override */
-BaseElement['layoutSizeDefined'] = true;
-
-/** @override */
-BaseElement['usesShadowDom'] = true;
diff --git a/extensions/amp-facebook/1.0/component.js b/extensions/amp-facebook/1.0/component.js
deleted file mode 100644
index 48a9bba64d54..000000000000
--- a/extensions/amp-facebook/1.0/component.js
+++ /dev/null
@@ -1,150 +0,0 @@
-import * as Preact from '#preact';
-import {ProxyIframeEmbed} from '#preact/component/3p-frame';
-import {dashToUnderline} from '#core/types/string';
-import {MessageType, deserializeMessage} from '#core/3p-frame-messaging';
-import {forwardRef} from '#preact/compat';
-import {tryParseJson} from '#core/types/object/json';
-import {useCallback, useLayoutEffect, useMemo, useState} from '#preact';
-import {useValueRef} from '#preact/component';
-
-/** @const {string} */
-const TYPE = 'facebook';
-const FULL_HEIGHT = '100%';
-const MATCHES_MESSAGING_ORIGIN = () => true;
-const DEFAULT_TITLE = 'Facebook comments';
-
-/**
- * @param {!BentoFacebookDef.Props} props
- * @param {{current: ?BentoFacebookDef.Api}} ref
- * @return {PreactDef.Renderable}
- */
-function BentoFacebookWithRef(
-  {
-    action,
-    colorscheme,
-    embedAs,
-    hideCover,
-    hideCta,
-    href,
-    includeCommentParent,
-    kdSite,
-    layout,
-    locale: localeProp,
-    numPosts,
-    onLoad,
-    orderBy,
-    refLabel,
-    requestResize,
-    share,
-    showFacepile,
-    showText,
-    size,
-    smallHeader,
-    style,
-    tabs,
-    title = DEFAULT_TITLE,
-    ...rest
-  },
-  ref
-) {
-  const [height, setHeight] = useState(null);
-  const onLoadRef = useValueRef(onLoad);
-  const messageHandler = useCallback(
-    (event) => {
-      const data = tryParseJson(event.data) ?? deserializeMessage(event.data);
-      if (data['action'] == 'ready') {
-        onLoadRef.current?.();
-      }
-      if (data['type'] == MessageType.EMBED_SIZE) {
-        const height = data['height'];
-        if (requestResize) {
-          requestResize(height);
-          setHeight(FULL_HEIGHT);
-        } else {
-          setHeight(height);
-        }
-      }
-    },
-    [requestResize, onLoadRef]
-  );
-
-  const [locale, setLocale] = useState(localeProp);
-  useLayoutEffect(() => {
-    if (localeProp) {
-      setLocale(localeProp);
-      return;
-    }
-    const win = ref?.current?.ownerDocument?.defaultView;
-    if (!win) {
-      return;
-    }
-    setLocale(dashToUnderline(win.navigator.language));
-  }, [localeProp, ref]);
-
-  const options = useMemo(
-    () => ({
-      action,
-      colorscheme,
-      embedAs,
-      hideCover,
-      hideCta,
-      href,
-      includeCommentParent,
-      'kd_site': kdSite,
-      layout,
-      locale,
-      numPosts,
-      orderBy,
-      ref: refLabel,
-      share,
-      showFacepile,
-      showText,
-      size,
-      smallHeader,
-      tabs,
-    }),
-    [
-      action,
-      colorscheme,
-      embedAs,
-      hideCover,
-      hideCta,
-      href,
-      includeCommentParent,
-      kdSite,
-      layout,
-      locale,
-      numPosts,
-      orderBy,
-      refLabel,
-      share,
-      showFacepile,
-      showText,
-      size,
-      smallHeader,
-      tabs,
-    ]
-  );
-
-  return (
-    <ProxyIframeEmbed
-      options={options}
-      ref={ref}
-      title={title}
-      {...rest}
-      /* non-overridable props */
-      // We sandbox all 3P iframes however facebook embeds completely break in
-      // sandbox mode since they need access to document.domain, so we
-      // exclude facebook.
-      excludeSandbox
-      matchesMessagingOrigin={MATCHES_MESSAGING_ORIGIN}
-      messageHandler={messageHandler}
-      type={TYPE}
-      style={height ? {...style, height} : style}
-    />
-  );
-}
-
-const BentoFacebook = forwardRef(BentoFacebookWithRef);
-BentoFacebook.displayName = 'BentoFacebook'; // Make findable for tests.
-export {BentoFacebook};
diff --git a/extensions/amp-facebook/1.0/example/index.html b/extensions/amp-facebook/1.0/example/index.html
new file mode 100644
index 000000000000..a51c6b9b50df
--- /dev/null
+++ b/extensions/amp-facebook/1.0/example/index.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width" />
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-facebook-1.0.css"
+    />
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-facebook-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-facebook-1.0.js"
+    ></script>
+    <style>
+      body {
+        background: #ecf1f3;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+      bento-embedly-card {
+        width: 375px;
+        height: 710px;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-facebook
+      id="facebook-post"
+      style="width: 375px; height: 400px"
+      data-href="https://www.facebook.com/ParksCanada/posts/1712989015384373"
+    >
+    </bento-facebook>
+  </body>
+</html>
diff --git a/extensions/amp-facebook/1.0/storybook/Basic.amp.js b/extensions/amp-facebook/1.0/storybook/Basic.amp.js
index 521925fb6c7d..454412e199a5 100644
--- a/extensions/amp-facebook/1.0/storybook/Basic.amp.js
+++ b/extensions/amp-facebook/1.0/storybook/Basic.amp.js
@@ -1,6 +1,7 @@
-import * as Preact from '#preact';
 import {withAmp} from '@ampproject/storybook-addon';
 
+import * as Preact from '#preact';
+
 export default {
   title: 'amp-facebook-1_0',
   decorators: [withAmp],
diff --git a/extensions/amp-facebook/1.0/storybook/Basic.js b/extensions/amp-facebook/1.0/storybook/Basic.js
index faa5beca060b..abcd91e25306 100644
--- a/extensions/amp-facebook/1.0/storybook/Basic.js
+++ b/extensions/amp-facebook/1.0/storybook/Basic.js
@@ -1,5 +1,6 @@
+import {BentoFacebook} from '#bento/components/bento-facebook/1.0/component';
+
 import * as Preact from '#preact';
-import {BentoFacebook} from '../component';
 
 export default {
   title: 'Facebook',
diff --git a/extensions/amp-facebook/1.0/test/test-amp-facebook-comments.js b/extensions/amp-facebook/1.0/test/test-amp-facebook-comments.js
index 623e0f644c3b..a333930a1abe 100644
--- a/extensions/amp-facebook/1.0/test/test-amp-facebook-comments.js
+++ b/extensions/amp-facebook/1.0/test/test-amp-facebook-comments.js
@@ -1,11 +1,14 @@
 import '../amp-facebook';
-import {createElementWithAttributes} from '#core/dom';
-import {doNotLoadExternalResourcesInTest} from '#testing/iframe';
-import {resetServiceForTesting} from '../../../../src/service-helpers';
 import {serializeMessage} from '#core/3p-frame-messaging';
-import {setDefaultBootstrapBaseUrlForTesting} from '../../../../src/3p-frame';
+import {createElementWithAttributes} from '#core/dom';
+
 import {toggleExperiment} from '#experiments';
+
 import {waitFor} from '#testing/helpers/service';
+import {doNotLoadExternalResourcesInTest} from '#testing/iframe';
+
+import {setDefaultBootstrapBaseUrlForTesting} from '../../../../src/3p-frame';
+import {resetServiceForTesting} from '../../../../src/service-helpers';
 
 describes.realWin(
   'amp-facebook-comments',
diff --git a/extensions/amp-facebook/1.0/test/test-amp-facebook-like.js b/extensions/amp-facebook/1.0/test/test-amp-facebook-like.js
index e04e2c32d4c3..bb6396939a7e 100644
--- a/extensions/amp-facebook/1.0/test/test-amp-facebook-like.js
+++ b/extensions/amp-facebook/1.0/test/test-amp-facebook-like.js
@@ -1,11 +1,14 @@
 import '../amp-facebook';
-import {createElementWithAttributes} from '#core/dom';
-import {doNotLoadExternalResourcesInTest} from '#testing/iframe';
-import {resetServiceForTesting} from '../../../../src/service-helpers';
 import {serializeMessage} from '#core/3p-frame-messaging';
-import {setDefaultBootstrapBaseUrlForTesting} from '../../../../src/3p-frame';
+import {createElementWithAttributes} from '#core/dom';
+
 import {toggleExperiment} from '#experiments';
+
 import {waitFor} from '#testing/helpers/service';
+import {doNotLoadExternalResourcesInTest} from '#testing/iframe';
+
+import {setDefaultBootstrapBaseUrlForTesting} from '../../../../src/3p-frame';
+import {resetServiceForTesting} from '../../../../src/service-helpers';
 
 describes.realWin(
   'amp-facebook-like',
diff --git a/extensions/amp-facebook/1.0/test/test-amp-facebook-page.js b/extensions/amp-facebook/1.0/test/test-amp-facebook-page.js
index 51ce6c1e60af..3c0f6c120b05 100644
--- a/extensions/amp-facebook/1.0/test/test-amp-facebook-page.js
+++ b/extensions/amp-facebook/1.0/test/test-amp-facebook-page.js
@@ -1,11 +1,14 @@
 import '../amp-facebook';
+import {serializeMessage} from '#core/3p-frame-messaging';
 import {createElementWithAttributes} from '#core/dom';
+
+import {waitFor} from '#testing/helpers/service';
+
+import {toggleExperiment} from 'src/experiments';
 import {doNotLoadExternalResourcesInTest} from 'testing/iframe';
-import {resetServiceForTesting} from '../../../../src/service-helpers';
-import {serializeMessage} from '#core/3p-frame-messaging';
+
 import {setDefaultBootstrapBaseUrlForTesting} from '../../../../src/3p-frame';
-import {toggleExperiment} from 'src/experiments';
-import {waitFor} from '#testing/helpers/service';
+import {resetServiceForTesting} from '../../../../src/service-helpers';
 
 describes.realWin(
   'amp-facebook-page',
diff --git a/extensions/amp-facebook/1.0/test/test-amp-facebook.js b/extensions/amp-facebook/1.0/test/test-amp-facebook.js
index a56b8b783084..ee9a412add4b 100644
--- a/extensions/amp-facebook/1.0/test/test-amp-facebook.js
+++ b/extensions/amp-facebook/1.0/test/test-amp-facebook.js
@@ -1,12 +1,16 @@
 import '../amp-facebook';
-import {createElementWithAttributes} from '#core/dom';
-import {doNotLoadExternalResourcesInTest} from '#testing/iframe';
 import {facebook} from '#3p/facebook';
-import {resetServiceForTesting} from '../../../../src/service-helpers';
+
 import {serializeMessage} from '#core/3p-frame-messaging';
-import {setDefaultBootstrapBaseUrlForTesting} from '../../../../src/3p-frame';
+import {createElementWithAttributes} from '#core/dom';
+
 import {toggleExperiment} from '#experiments';
+
 import {waitFor} from '#testing/helpers/service';
+import {doNotLoadExternalResourcesInTest} from '#testing/iframe';
+
+import {setDefaultBootstrapBaseUrlForTesting} from '../../../../src/3p-frame';
+import {resetServiceForTesting} from '../../../../src/service-helpers';
 
 describes.realWin(
   'amp-facebook',
@@ -29,8 +33,8 @@ describes.realWin(
     const fbPostHref =
       'https://www.facebook.com/NASA/photos/a.67899501771/10159193669016772/';
     const fbVideoHref = 'https://www.facebook.com/NASA/videos/846648316199961/';
-    const fbCommentHref =
-      'https://www.facebook.com/NASA/photos/a.67899501771/10159193669016772/?comment_id=10159193676606772';
+    const fbCommentsHref =
+      'http://www.directlyrics.com/adele-25-complete-album-lyrics-news.html';
 
     beforeEach(() => {
       win = env.win;
@@ -200,55 +204,20 @@ describes.realWin(
       expect(fbVideo.classList.contains('fb-post')).to.be.true;
     });
 
-    it('adds fb-comment element correctly', () => {
-      const div = doc.createElement('div');
-      div.setAttribute('id', 'c');
-      doc.body.appendChild(div);
-
-      facebook(win, {
-        href: fbCommentHref,
-        embedAs: 'comment',
-        width: 111,
-        height: 222,
-      });
-      const fbComment = doc.body.getElementsByClassName('fb-comment-embed')[0];
-      expect(fbComment).not.to.be.undefined;
-      expect(fbComment.getAttribute('data-href')).to.equal(fbCommentHref);
-    });
-
-    it('adds fb-comment element with include-parent', () => {
-      const div = doc.createElement('div');
-      div.setAttribute('id', 'c');
-      doc.body.appendChild(div);
-
-      facebook(win, {
-        href: fbCommentHref,
-        embedAs: 'comment',
-        includeCommentParent: true,
-        width: 111,
-        height: 222,
-      });
-      const fbComment = doc.body.getElementsByClassName('fb-comment-embed')[0];
-      expect(fbComment).not.to.be.undefined;
-      expect(fbComment.getAttribute('data-href')).to.equal(fbCommentHref);
-      expect(fbComment.getAttribute('data-include-parent')).to.equal('true');
-    });
-
-    it('adds fb-comment element with default include-parent', () => {
+    it('adds fb-comments element correctly', () => {
       const div = doc.createElement('div');
       div.setAttribute('id', 'c');
       doc.body.appendChild(div);
 
       facebook(win, {
-        href: fbCommentHref,
-        embedAs: 'comment',
+        href: fbCommentsHref,
+        embedAs: 'comments',
         width: 111,
         height: 222,
       });
-      const fbComment = doc.body.getElementsByClassName('fb-comment-embed')[0];
-      expect(fbComment).not.to.be.undefined;
-      expect(fbComment.getAttribute('data-href')).to.equal(fbCommentHref);
-      expect(fbComment.getAttribute('data-include-parent')).to.equal('false');
+      const fbComments = doc.body.getElementsByClassName('fb-comments')[0];
+      expect(fbComments).not.to.be.undefined;
+      expect(fbComments.getAttribute('data-href')).to.equal(fbCommentsHref);
     });
 
     it("container's height is changed", async () => {
@@ -288,5 +257,34 @@ describes.realWin(
       win.dispatchEvent(mockEvent);
       expect(attemptChangeHeightStub).to.be.calledOnce.calledWith(1000);
     });
+
+    it('should pass the data-loading attribute to the underlying iframe', async () => {
+      element = createElementWithAttributes(doc, 'amp-facebook', {
+        'data-loading': 'lazy',
+        'data-href': fbPostHref,
+        'height': 500,
+        'width': 500,
+        'layout': 'responsive',
+      });
+      doc.body.appendChild(element);
+      await waitForRender();
+
+      const iframe = element.shadowRoot.querySelector('iframe');
+      expect(iframe.getAttribute('loading')).to.equal('lazy');
+    });
+
+    it('should set data-loading="auto" if no value is specified', async () => {
+      element = createElementWithAttributes(doc, 'amp-facebook', {
+        'data-href': fbPostHref,
+        'height': 500,
+        'width': 500,
+        'layout': 'responsive',
+      });
+      doc.body.appendChild(element);
+      await waitForRender();
+
+      const iframe = element.shadowRoot.querySelector('iframe');
+      expect(iframe.getAttribute('loading')).to.equal('auto');
+    });
   }
 );
diff --git a/extensions/amp-facebook/1.0/test/test-component.js b/extensions/amp-facebook/1.0/test/test-component.js
deleted file mode 100644
index 522644bf2ab9..000000000000
--- a/extensions/amp-facebook/1.0/test/test-component.js
+++ /dev/null
@@ -1,179 +0,0 @@
-import * as Preact from '#preact';
-import {BentoFacebook} from '../component';
-import {WithAmpContext} from '#preact/context';
-import {createRef} from '#preact';
-import {mount} from 'enzyme';
-import {serializeMessage} from '#core/3p-frame-messaging';
-import {waitFor} from '#testing/helpers/service';
-
-describes.sandboxed('BentoFacebook preact component', {}, (env) => {
-  const href =
-    'https://www.facebook.com/NASA/photos/a.67899501771/10159193669016772/';
-
-  it('should render', () => {
-    const wrapper = mount(
-      <BentoFacebook
-        href={href}
-        style={{
-          'width': '500px',
-          'height': '600px',
-        }}
-      />
-    );
-
-    const iframe = wrapper.find('iframe');
-    expect(iframe.prop('src')).to.equal(
-      'http://ads.localhost:9876/dist.3p/current/frame.max.html'
-    );
-    expect(wrapper.find('iframe').prop('style').width).to.equal('100%');
-    expect(wrapper.find('iframe').prop('style').height).to.equal('100%');
-  });
-
-  it('should call given requestResize', () => {
-    const requestResizeSpy = env.sandbox.spy();
-    const wrapper = mount(
-      <BentoFacebook
-        href={href}
-        style={{
-          'width': '500px',
-          'height': '600px',
-        }}
-        requestResize={requestResizeSpy}
-      />
-    );
-
-    const iframe = wrapper.find('iframe').getDOMNode();
-    const sentinel = JSON.parse(iframe.getAttribute('name'))['attributes'][
-      'sentinel'
-    ];
-
-    const mockEvent = new CustomEvent('message');
-    mockEvent.data = serializeMessage('embed-size', sentinel, {
-      'height': 1000,
-    });
-    mockEvent.source = wrapper
-      .getDOMNode()
-      .querySelector('iframe').contentWindow;
-    window.dispatchEvent(mockEvent);
-
-    expect(requestResizeSpy).to.have.been.calledOnce;
-  });
-
-  it('should change height', async () => {
-    const wrapper = mount(
-      <BentoFacebook
-        href={href}
-        style={{
-          'width': '500px',
-          'height': '600px',
-        }}
-      />
-    );
-
-    const iframe = wrapper.find('iframe').getDOMNode();
-    const sentinel = JSON.parse(iframe.getAttribute('name'))['attributes'][
-      'sentinel'
-    ];
-
-    const mockEvent = new CustomEvent('message');
-    mockEvent.data = serializeMessage('embed-size', sentinel, {
-      'height': 1000,
-    });
-    mockEvent.source = wrapper
-      .getDOMNode()
-      .querySelector('iframe').contentWindow;
-    window.dispatchEvent(mockEvent);
-
-    wrapper.update();
-
-    await waitFor(
-      () => wrapper.find('div').at(0).prop('style').height == 1000,
-      'Height changes'
-    );
-
-    expect(wrapper.find('div').at(0).prop('style').height).to.equal(1000);
-  });
-
-  it('should dispatch load event', async () => {
-    const ref = createRef();
-    const onReadyState = env.sandbox.spy();
-    const wrapper = mount(
-      <BentoFacebook
-        ref={ref}
-        href={href}
-        style={{
-          'width': '500px',
-          'height': '600px',
-        }}
-        onReadyState={onReadyState}
-      />
-    );
-
-    let api = ref.current;
-    expect(api.readyState).to.equal('loading');
-    expect(onReadyState).to.not.be.called;
-
-    await wrapper.find('iframe').invoke('onLoad')();
-    api = ref.current;
-    expect(api.readyState).to.equal('complete');
-    expect(onReadyState).to.be.calledOnce.calledWith('complete');
-  });
-
-  it('should reset iframe on pause', () => {
-    const ref = createRef();
-    const wrapper = mount(
-      <WithAmpContext playable={true}>
-        <BentoFacebook
-          ref={ref}
-          href={href}
-          style={{
-            'width': '500px',
-            'height': '600px',
-          }}
-        />
-      </WithAmpContext>
-    );
-    expect(wrapper.find('iframe')).to.have.lengthOf(1);
-
-    const iframe = wrapper.find('iframe').getDOMNode();
-    const spy = env.sandbox./*OK*/ spy(iframe, 'src', ['set']);
-    wrapper.setProps({playable: false});
-    expect(spy.set).to.be.calledOnce;
-  });
-
-  it('should not sandbox iframe', async () => {
-    const ref = createRef();
-    const wrapper = mount(
-      <BentoFacebook
-        ref={ref}
-        href={href}
-        embedAs="video"
-        style={{
-          'width': '500px',
-          'height': '600px',
-        }}
-      />
-    );
-
-    const iframe = wrapper.find('iframe');
-    expect(iframe.prop('sandbox')).to.be.undefined;
-  });
-
-  it('should propagate specified locale', async () => {
-    const ref = createRef();
-    const wrapper = mount(
-      <BentoFacebook
-        ref={ref}
-        href={href}
-        locale="fr_FR"
-        style={{
-          'width': '500px',
-          'height': '600px',
-        }}
-      />
-    );
-
-    const iframe = wrapper.find('iframe');
-    expect(iframe.prop('name')).to.contain('"locale":"fr_FR"');
-  });
-});
diff --git a/extensions/amp-facebook/validator-amp-facebook.protoascii b/extensions/amp-facebook/validator-amp-facebook.protoascii
index 88fa688c19f2..d348aec531fc 100644
--- a/extensions/amp-facebook/validator-amp-facebook.protoascii
+++ b/extensions/amp-facebook/validator-amp-facebook.protoascii
@@ -4,11 +4,11 @@ tags: {  # amp-facebook 1.0
   # The 1.0 amp-facebook script registers all amp-facebook-* components.
   # See https://github.com/ampproject/amphtml/pull/35395 for context.
   spec_name: "amp-facebook 1.0"
-  satisfies: "amp-facebook 1.0"
-  excludes: "amp-facebook 0.1"
-  excludes: "amp-facebook-comments 0.1"
-  excludes: "amp-facebook-like 0.1"
-  excludes: "amp-facebook-page 0.1"
+  satisfies_condition: "amp-facebook 1.0"
+  excludes_condition: "amp-facebook 0.1"
+  excludes_condition: "amp-facebook-comments 0.1"
+  excludes_condition: "amp-facebook-like 0.1"
+  excludes_condition: "amp-facebook-page 0.1"
   extension_spec: {
     name: "amp-facebook"
     version_name: "v1.0"
@@ -20,8 +20,8 @@ tags: {  # amp-facebook 1.0
 tags: {  # amp-facebook 0.1 and latest
   html_format: AMP
   tag_name: "SCRIPT"
-  satisfies: "amp-facebook 0.1"
-  excludes: "amp-facebook 1.0"
+  satisfies_condition: "amp-facebook 0.1"
+  excludes_condition: "amp-facebook 1.0"
   extension_spec: {
     name: "amp-facebook"
     version_name: "v0.1"
@@ -52,7 +52,7 @@ tags: {  # <amp-facebook-comments> via amp-facebook script
   spec_name: "amp-facebook-comments 1.0"
   tag_name: "AMP-FACEBOOK-COMMENTS"
   requires_extension: "amp-facebook"
-  requires: "amp-facebook 1.0"
+  requires_condition: "amp-facebook 1.0"
   attr_lists: "amp-facebook"
   attr_lists: "extended-amp-global"
   amp_layout: {
@@ -69,7 +69,7 @@ tags: {  # <amp-facebook-like> via amp-facebook script
   spec_name: "amp-facebook-like 1.0"
   tag_name: "AMP-FACEBOOK-LIKE"
   requires_extension: "amp-facebook"
-  requires: "amp-facebook 1.0"
+  requires_condition: "amp-facebook 1.0"
   attr_lists: "amp-facebook-strict"
   attr_lists: "extended-amp-global"
   amp_layout: {
@@ -86,7 +86,7 @@ tags: {  # <amp-facebook-page> via amp-facebook script
   spec_name: "amp-facebook-page 1.0"
   tag_name: "AMP-FACEBOOK-PAGE"
   requires_extension: "amp-facebook"
-  requires: "amp-facebook 1.0"
+  requires_condition: "amp-facebook 1.0"
   attr_lists: "amp-facebook-strict"
   attr_lists: "extended-amp-global"
   amp_layout: {
diff --git a/extensions/amp-fit-text/0.1/amp-fit-text.js b/extensions/amp-fit-text/0.1/amp-fit-text.js
index 2384d2ba4670..4d30811b2d59 100644
--- a/extensions/amp-fit-text/0.1/amp-fit-text.js
+++ b/extensions/amp-fit-text/0.1/amp-fit-text.js
@@ -1,19 +1,21 @@
-import {CSS} from '../../../build/amp-fit-text-0.1.css';
 import {getLengthNumeral, isLayoutSizeDefined} from '#core/dom/layout';
 import {px, setImportantStyles, setStyle, setStyles} from '#core/dom/style';
 import {throttle} from '#core/types/function';
+
 import {buildDom, mirrorNode} from './build-dom';
 
+import {CSS} from '../../../build/amp-fit-text-0.1.css';
+
 const TAG = 'amp-fit-text';
 const LINE_HEIGHT_EM_ = 1.15; // WARNING: when updating this ensure you also update the css values for line-height.
 const RESIZE_THROTTLE_MS = 100;
 export class AmpFitText extends AMP.BaseElement {
-  /** @override @nocollapse */
+  /** @override  */
   static prerenderAllowed() {
     return true;
   }
 
-  /** @param {!AmpElement} element */
+  /** @param {AmpElement} element */
   constructor(element) {
     super(element);
 
@@ -150,7 +152,7 @@ export class AmpFitText extends AMP.BaseElement {
  * @param {number} minFontSize
  * @param {number} maxFontSize
  * @return {number}
- * @private  Visible for testing only!
+ * @private  Visible for testing only
  */
 export function calculateFontSize_(
   measurer,
@@ -181,7 +183,7 @@ export function calculateFontSize_(
  * @param {Element} measurer
  * @param {number} maxHeight
  * @param {number} fontSize
- * @private  Visible for testing only!
+ * @private  Visible for testing only
  */
 export function updateOverflow_(content, measurer, maxHeight, fontSize) {
   setStyle(measurer, 'fontSize', px(fontSize));
diff --git a/extensions/amp-fit-text/0.1/build-dom.d.ts b/extensions/amp-fit-text/0.1/build-dom.d.ts
new file mode 100644
index 000000000000..cb4cc9836e00
--- /dev/null
+++ b/extensions/amp-fit-text/0.1/build-dom.d.ts
@@ -0,0 +1 @@
+export const buildDom: import('#compiler/types').BuildDom;
diff --git a/extensions/amp-fit-text/0.1/build-dom.js b/extensions/amp-fit-text/0.1/build-dom.js
index 41c3faac65bd..37fbd0c7b126 100644
--- a/extensions/amp-fit-text/0.1/build-dom.js
+++ b/extensions/amp-fit-text/0.1/build-dom.js
@@ -1,7 +1,7 @@
-import {realChildNodes} from '#core/dom/query';
-import {escapeCssSelectorIdent} from '#core/dom/css-selectors';
 import {copyChildren, isServerRendered, removeChildren} from '#core/dom';
+import {escapeCssSelectorIdent} from '#core/dom/css-selectors';
 import {applyFillContent} from '#core/dom/layout';
+import {realChildNodes} from '#core/dom/query';
 
 const MEASURER_CLASS = 'i-amphtml-fit-text-measurer';
 const CONTENT_CLASS = 'i-amphtml-fit-text-content';
@@ -10,8 +10,8 @@ const CONTENT_WRAPPER_CLASS = 'i-amphtml-fit-text-content-wrapper';
 /**
  * @see amphtml/compiler/types.js for full description
  *
- * @param {!Element} element
- * @return {{content: !Element, contentWrapper: !Element, measurer: !Element}}
+ * @param {HTMLElement} element
+ * @return {{content: Element, contentWrapper: Element, measurer: Element}}
  */
 export function buildDom(element) {
   if (isServerRendered(element)) {
@@ -40,8 +40,8 @@ export function buildDom(element) {
 
 /**
  * Returns all of the needed ivars from a server rendered element.
- * @param {!Element} element
- * @return {{content: !Element, contentWrapper: !Element, measurer: !Element}}
+ * @param {HTMLElement} element
+ * @return {{content: Element, contentWrapper: Element, measurer: Element}}
  */
 export function queryDom(element) {
   const content = element.querySelector(
@@ -64,8 +64,8 @@ export function queryDom(element) {
 /**
  * Make a destination node a clone of the source.
  *
- * @param {!Node} from
- * @param {!Node} to
+ * @param {Node} from
+ * @param {Node} to
  */
 export function mirrorNode(from, to) {
   // First clear out the destination node.
diff --git a/extensions/amp-fit-text/0.1/test/test-amp-fit-text.js b/extensions/amp-fit-text/0.1/test/test-amp-fit-text.js
index 3651d6d97646..f258b9fe5036 100644
--- a/extensions/amp-fit-text/0.1/test/test-amp-fit-text.js
+++ b/extensions/amp-fit-text/0.1/test/test-amp-fit-text.js
@@ -1,4 +1,13 @@
+import {createDocument as createWorkerDomDoc} from '@ampproject/worker-dom/dist/server-lib.mjs';
+
 import {createElementWithAttributes} from '#core/dom';
+
+import {
+  getDeterministicOuterHTML,
+  hypenCaseToCamelCase,
+  sleep,
+} from '#testing/helpers';
+
 import {AmpFitText, calculateFontSize_, updateOverflow_} from '../amp-fit-text';
 import {buildDom} from '../build-dom';
 
@@ -52,6 +61,28 @@ describes.realWin(
       expect(fitText1.outerHTML).to.equal(fitText2.outerHTML);
     });
 
+    it('buildDom should behave same in browser and in WorkerDOM', async () => {
+      const browserFitText = createElementWithAttributes(doc, 'amp-fit-text', {
+        width: '111px',
+        height: '222px',
+      });
+      const workerFitText = createElementWithAttributes(
+        createWorkerDomDoc(),
+        'amp-fit-text',
+        {
+          width: '111px',
+          height: '222px',
+        }
+      );
+
+      buildDom(browserFitText);
+      buildDom(workerFitText);
+
+      const browserHtml = getDeterministicOuterHTML(browserFitText);
+      const workerHtml = getDeterministicOuterHTML(workerFitText);
+      expect(workerHtml).to.equal(browserHtml);
+    });
+
     it('buildCallback should assign ivars even when server rendered', async () => {
       const fitText = createElementWithAttributes(doc, 'amp-fit-text', {
         width: '111px',
@@ -118,11 +149,7 @@ describes.realWin(
 
       // Wait for the resizeObserver recognize the changes
       // 90ms chosen so that the wait is less than the throttle value for the ResizeObserver.
-      await new Promise((resolve) => {
-        setTimeout(() => {
-          resolve();
-        }, 90);
-      });
+      await sleep(90);
       // Verify that layoutCallback calls updateFontSize.
       expect(updateFontSizeSpy).to.be.calledOnce;
       updateFontSizeSpy.resetHistory();
@@ -134,11 +161,7 @@ describes.realWin(
 
       // Wait for the resizeObserver recognize the changes
       // 90ms chosen so that the wait is less than the throttle value for the ResizeObserver.
-      await new Promise((resolve) => {
-        setTimeout(() => {
-          resolve();
-        }, 90);
-      });
+      await sleep(90);
       // Verify that the ResizeObserver calls updateFontSize.
       expect(updateFontSizeSpy).to.be.calledOnce;
     });
@@ -217,7 +240,11 @@ describes.realWin('amp-fit-text updateOverflow', {}, (env) => {
     doc = win.document;
     classToggles = {};
     content = {
-      style: {},
+      style: {
+        setProperty(name, value) {
+          content.style[hypenCaseToCamelCase(name)] = value;
+        },
+      },
       classList: {
         toggle: (className, on) => {
           classToggles[className] = on;
diff --git a/extensions/amp-fit-text/1.0/README.md b/extensions/amp-fit-text/1.0/README.md
index 0ff39a9ebe16..2592c1efa7fc 100644
--- a/extensions/amp-fit-text/1.0/README.md
+++ b/extensions/amp-fit-text/1.0/README.md
@@ -8,9 +8,7 @@ The expected content for Bento Fit Text is text or other inline content, but it
 
 You must include each Bento component's required CSS library to guarantee proper loading and before adding custom styles. Or use the light-weight pre-upgrade styles available inline. See [Layout and style](#layout-and-style).
 
-The examples below demonstrate use of the `<bento-fit-text>` web component.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/fit-text
@@ -21,47 +19,58 @@ import {defineElement as defineBentoFitText} from '@bentoproject/fit-text';
 defineBentoFitText();
 ```
 
-### Example: Include via `<script>`
+### Include via `<script>`
 
 ```html
-<head>
-  <script src="https://cdn.ampproject.org/bento.js"></script>
-  <!-- These styles prevent Cumulative Layout Shift on the unupgraded custom element -->
-  <style>
-    bento-fit-text {
-      display: block;
-      overflow: hidden;
-      position: relative;
-    }
-  </style>
-</head>
-<bento-fit-text id="my-fit-text">
-  Lorem ipsum dolor sit amet, has nisl nihil convenire et, vim at aeque inermis
-  reprehendunt.
-</bento-fit-text>
-<div class="buttons" style="margin-top: 8px">
-  <button id="font-button">Change max-font-size</button>
-  <button id="content-button">Change content</button>
-</div>
+<script type="module" src="https://cdn.ampproject.org/bento.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/bento.js" crossorigin="anonymous"></script>
+<script type="module" src="https://cdn.ampproject.org/v0/bento-fit-text-1.0.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/v0/bento-fit-text-1.0.js" crossorigin="anonymous"></script>
+<link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-fit-text-1.0.css" crossorigin="anonymous">
+```
 
-<script>
-  (async () => {
-    const fitText = document.querySelector('#my-fit-text');
-    await customElements.whenDefined('bento-fit-text');
-
-    // set up button actions
-    document.querySelector('#font-button').onclick = () =>
-      fitText.setAttribute('max-font-size', '40');
-    document.querySelector('#content-button').onclick = () =>
-      (fitText.textContent = 'new content');
-  })();
-</script>
+### Example
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-fit-text-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-fit-text-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-fit-text-1.0.css"
+    />
+  </head>
+  <body>
+    <bento-fit-text id="my-fit-text">
+      Lorem ipsum dolor sit amet, has nisl nihil convenire et, vim at aeque
+      inermis reprehendunt.
+    </bento-fit-text>
+  </body>
+</html>
 ```
 
 ### Overflowing content
 
-If the content of the `bento-fit-text` overflows the available space, even with a
-`min-font-size` specified, the overflowing content is cut off and hidden. WebKit and Blink-based browsers show ellipsis for overflowing content.
+If the content of the `bento-fit-text` overflows the available space, even with a `min-font-size` specified, the overflowing content is cut off and hidden. WebKit and Blink-based browsers show ellipsis for overflowing content.
 
 In the following example, we specified a `min-font-size` of `40`, and added more content inside the `bento-fit-text` element. This causes the content to exceed the size of its fixed block parent, so the text is truncated to fit the container.
 
@@ -118,8 +127,7 @@ While overflowing content is _visually_ truncated to fit the container, note tha
 
 #### Media Queries
 
-The attributes for `<bento-fit-text>` can be configured to use different
-options based on a [media query](./../../../docs/spec/amp-html-responsive-attributes.md).
+The attributes for `<bento-fit-text>` can be configured to use different options based on a [media query](./../../../docs/spec/amp-html-responsive-attributes.md).
 
 #### `min-font-size`
 
@@ -129,13 +137,69 @@ Specifies the minimum font size in pixels as an integer that the `bento-fit-text
 
 Specifies the maximum font size in pixels as an integer that the `bento-fit-text` can use.
 
+#### API Example
+
+Programmatically changing an attribute value will automatically update the element.
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-fit-text-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-fit-text-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-fit-text-1.0.css"
+    />
+  </head>
+  <body>
+    <bento-fit-text id="my-fit-text">
+      Lorem ipsum dolor sit amet, has nisl nihil convenire et, vim at aeque
+      inermis reprehendunt.
+    </bento-fit-text>
+    <div class="buttons" style="margin-top: 8px">
+      <button id="font-button">Change max-font-size</button>
+      <button id="content-button">Change content</button>
+    </div>
+
+    <script>
+      (async () => {
+        const fitText = document.querySelector('#my-fit-text');
+        await customElements.whenDefined('bento-fit-text');
+
+        // set up button actions
+        document.querySelector('#font-button').onclick = () =>
+          fitText.setAttribute('max-font-size', '40');
+        document.querySelector('#content-button').onclick = () =>
+          (fitText.textContent = 'new content');
+      })();
+    </script>
+  </body>
+</html>
+```
+
 ---
 
 ## Preact/React Component
 
-The examples below demonstrate use of the `<BentoFitText>` as a functional component usable with the Preact or React libraries.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/fit-text
diff --git a/extensions/amp-fit-text/1.0/amp-fit-text.js b/extensions/amp-fit-text/1.0/amp-fit-text.js
index c5ea9604548e..a6d0f2d151f0 100644
--- a/extensions/amp-fit-text/1.0/amp-fit-text.js
+++ b/extensions/amp-fit-text/1.0/amp-fit-text.js
@@ -1,12 +1,17 @@
-import {BaseElement} from './base-element';
-import {CSS} from '../../../build/amp-fit-text-1.0.css';
 import {isExperimentOn} from '#experiments';
+
+import {AmpPreactBaseElement, setSuperClass} from '#preact/amp-base-element';
+
 import {userAssert} from '#utils/log';
 
+import {BaseElement} from './base-element';
+
+import {CSS} from '../../../build/amp-fit-text-1.0.css';
+
 /** @const {string} */
 const TAG = 'amp-fit-text';
 
-class AmpFitText extends BaseElement {
+class AmpFitText extends setSuperClass(BaseElement, AmpPreactBaseElement) {
   /** @override */
   isLayoutSupported(layout) {
     userAssert(
diff --git a/extensions/amp-fit-text/1.0/base-element.js b/extensions/amp-fit-text/1.0/base-element.js
index ac60fec67f32..7a2c658c5bcc 100644
--- a/extensions/amp-fit-text/1.0/base-element.js
+++ b/extensions/amp-fit-text/1.0/base-element.js
@@ -1,7 +1,8 @@
-import {CSS} from './component.jss';
-import {BentoFitText} from './component';
 import {PreactBaseElement} from '#preact/base-element';
 
+import {BentoFitText} from './component';
+import {CSS} from './component.jss';
+
 export class BaseElement extends PreactBaseElement {}
 
 /** @override */
diff --git a/extensions/amp-fit-text/1.0/component.js b/extensions/amp-fit-text/1.0/component.js
index 451a424cff18..1bfea8fedac4 100644
--- a/extensions/amp-fit-text/1.0/component.js
+++ b/extensions/amp-fit-text/1.0/component.js
@@ -1,12 +1,14 @@
-import * as Preact from '#preact';
-import {ContainWrapper} from '#preact/component';
-import {LINE_HEIGHT_EM_, useStyles} from './component.jss';
 import {px, resetStyles, setStyle, setStyles} from '#core/dom/style';
 import {getWin} from '#core/window';
+
+import * as Preact from '#preact';
 import {useCallback, useLayoutEffect, useRef} from '#preact';
+import {ContainWrapper} from '#preact/component';
+
+import {LINE_HEIGHT_EM_, useStyles} from './component.jss';
 
 /**
- * @param {!BentoFitTextDef.Props} props
+ * @param {BentoFitTextDef.Props} props
  * @return {PreactDef.Renderable}
  */
 export function BentoFitText({
diff --git a/extensions/amp-fit-text/1.0/example/index.html b/extensions/amp-fit-text/1.0/example/index.html
new file mode 100644
index 000000000000..e465b68266e4
--- /dev/null
+++ b/extensions/amp-fit-text/1.0/example/index.html
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width" />
+    <title>bento-fit-text</title>
+    <script src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      async
+      src="https://cdn.ampproject.org/v0/bento-fit-text-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-fit-text-1.0.css"
+    />
+    <style>
+      body {
+        font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
+          Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
+          'Segoe UI Symbol';
+        margin: 2rem;
+        background: #ecf1f3;
+      }
+      bento-fit-text {
+        height: calc(100vh - 120px);
+        margin: 1rem 0;
+      }
+      button {
+        border: none;
+        padding: 1rem 2rem;
+        border-radius: 8px;
+        color: #269da3;
+        background: white;
+        font-size: 18px;
+        font-weight: bold;
+        margin-right: 1rem;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-fit-text id="my-fit-text" max-font-size="1000">
+      Lorem ipsum dolor sit amet, has nisl nihil convenire et, vim at aeque
+      inermis reprehendunt. Lorem ipsum dolor sit amet, has nisl nihil convenire
+      et, vim at aeque inermis reprehendunt.
+    </bento-fit-text>
+    <div class="buttons" style="margin-top: 8px">
+      <button id="font-button">Change max-font-size</button>
+      <button id="content-button">Change content</button>
+    </div>
+
+    <script>
+      (async () => {
+        const fitText = document.querySelector('#my-fit-text');
+        await customElements.whenDefined('bento-fit-text');
+        // set up button actions
+        document.querySelector('#font-button').onclick = () =>
+          fitText.setAttribute('max-font-size', '16');
+        document.querySelector('#content-button').onclick = () =>
+          (fitText.textContent = 'new content');
+      })();
+    </script>
+  </body>
+</html>
diff --git a/extensions/amp-fit-text/1.0/storybook/Basic.amp.js b/extensions/amp-fit-text/1.0/storybook/Basic.amp.js
index 5edcc0a66395..ff74776d1dd0 100644
--- a/extensions/amp-fit-text/1.0/storybook/Basic.amp.js
+++ b/extensions/amp-fit-text/1.0/storybook/Basic.amp.js
@@ -1,6 +1,7 @@
-import * as Preact from '#preact';
 import {withAmp} from '@ampproject/storybook-addon';
 
+import * as Preact from '#preact';
+
 export default {
   title: 'amp-fit-text-1_0',
   decorators: [withAmp],
diff --git a/extensions/amp-fit-text/1.0/storybook/Basic.js b/extensions/amp-fit-text/1.0/storybook/Basic.js
index 732426dceb8b..fda95da92642 100644
--- a/extensions/amp-fit-text/1.0/storybook/Basic.js
+++ b/extensions/amp-fit-text/1.0/storybook/Basic.js
@@ -1,6 +1,9 @@
 import * as Preact from '#preact';
+
 import {BentoFitText} from '../component';
 
+import '../component.jss';
+
 export default {
   title: 'FitText',
   component: BentoFitText,
diff --git a/extensions/amp-fit-text/1.0/test/test-amp-fit-text.js b/extensions/amp-fit-text/1.0/test/test-amp-fit-text.js
index 001db7932cb1..710ad326df8d 100644
--- a/extensions/amp-fit-text/1.0/test/test-amp-fit-text.js
+++ b/extensions/amp-fit-text/1.0/test/test-amp-fit-text.js
@@ -1,11 +1,15 @@
 import '../amp-fit-text';
-import {computedStyle} from '#core/dom/style';
-import {createElementWithAttributes} from '#core/dom';
 import {expect} from 'chai';
+
+import {createElementWithAttributes} from '#core/dom';
+import {computedStyle} from '#core/dom/style';
+
 import {toggleExperiment} from '#experiments';
-import {useStyles} from '../component.jss';
+
 import {waitFor} from '#testing/helpers/service';
 
+import {useStyles} from '../component.jss';
+
 describes.realWin(
   'amp-fit-text component',
   {
diff --git a/extensions/amp-fit-text/1.0/test/test-component.js b/extensions/amp-fit-text/1.0/test/test-component.js
index c081784a4a4c..56d825d9ccdf 100644
--- a/extensions/amp-fit-text/1.0/test/test-component.js
+++ b/extensions/amp-fit-text/1.0/test/test-component.js
@@ -1,9 +1,13 @@
+import {mount} from 'enzyme';
+
+import {computedStyle} from '#core/dom/style';
+
 import * as Preact from '#preact';
+
+import {waitFor} from '#testing/helpers/service';
+
 import {BentoFitText, calculateFontSize, setOverflowStyle} from '../component';
-import {computedStyle} from '#core/dom/style';
-import {mount} from 'enzyme';
 import {useStyles} from '../component.jss';
-import {waitFor} from '#testing/helpers/service';
 
 describes.realWin('BentoFitText preact component v1.0', {}, (env) => {
   let win;
diff --git a/extensions/amp-fit-text/validator-amp-fit-text.protoascii b/extensions/amp-fit-text/validator-amp-fit-text.protoascii
index e303db22b1b9..9ed10561243f 100644
--- a/extensions/amp-fit-text/validator-amp-fit-text.protoascii
+++ b/extensions/amp-fit-text/validator-amp-fit-text.protoascii
@@ -1,8 +1,8 @@
 tags: {  # amp-fit-text 1.0
   html_format: AMP
   tag_name: "SCRIPT"
-  satisfies: "amp-fit-text 1.0"
-  excludes: "amp-fit-text 0.1"
+  satisfies_condition: "amp-fit-text 1.0"
+  excludes_condition: "amp-fit-text 0.1"
   extension_spec: {
     name: "amp-fit-text"
     version_name: "v1.0"
@@ -15,8 +15,8 @@ tags: {  # amp-fit-text 0.1 and latest
   html_format: AMP
   html_format: AMP4ADS
   tag_name: "SCRIPT"
-  satisfies: "amp-fit-text 0.1"
-  excludes: "amp-fit-text 1.0"
+  satisfies_condition: "amp-fit-text 0.1"
+  excludes_condition: "amp-fit-text 1.0"
   extension_spec: {
     name: "amp-fit-text"
     version_name: "v0.1"
diff --git a/extensions/amp-font/0.1/amp-font.js b/extensions/amp-font/0.1/amp-font.js
index 26357b9ae137..73b355295631 100644
--- a/extensions/amp-font/0.1/amp-font.js
+++ b/extensions/amp-font/0.1/amp-font.js
@@ -56,7 +56,7 @@ const DEFAULT_SIZE_ = 'medium';
 const CACHED_FONT_LOAD_TIME_ = 100;
 
 export class AmpFont extends AMP.BaseElement {
-  /** @override @nocollapse */
+  /** @override  */
   static prerenderAllowed() {
     return true;
   }
diff --git a/extensions/amp-form/0.1/amp-form-textarea.js b/extensions/amp-form/0.1/amp-form-textarea.js
index 55411c0f6e6a..aae0fe567250 100644
--- a/extensions/amp-form/0.1/amp-form-textarea.js
+++ b/extensions/amp-form/0.1/amp-form-textarea.js
@@ -1,5 +1,5 @@
-import {AmpEvents} from '#core/constants/amp-events';
-import {iterateCursor, removeElement} from '#core/dom';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
+import {removeElement} from '#core/dom';
 import {computedStyle, px, setStyle} from '#core/dom/style';
 import {toArray} from '#core/types/array';
 import {throttle} from '#core/types/function';
@@ -50,7 +50,7 @@ export class AmpFormTextarea {
       }
     };
 
-    listen(root, AmpEvents.DOM_UPDATE, maybeInstall);
+    listen(root, AmpEvents_Enum.DOM_UPDATE, maybeInstall);
     maybeInstall();
   }
 
@@ -105,7 +105,7 @@ export class AmpFormTextarea {
 
     let cachedTextareaElements = root.querySelectorAll('textarea');
     this.unlisteners_.push(
-      listen(root, AmpEvents.DOM_UPDATE, () => {
+      listen(root, AmpEvents_Enum.DOM_UPDATE, () => {
         cachedTextareaElements = root.querySelectorAll('textarea');
       })
     );
@@ -170,10 +170,10 @@ export function getHasOverflow(element) {
 
 /**
  * Attempt to resize all textarea elements
- * @param {!IArrayLike<!Element>} elements
+ * @param {!NodeList} elements
  */
 function resizeTextareaElements(elements) {
-  iterateCursor(elements, (element) => {
+  elements.forEach((element) => {
     if (
       element.tagName != 'TEXTAREA' ||
       !element.hasAttribute(AMP_FORM_TEXTAREA_EXPAND_ATTR)
diff --git a/extensions/amp-form/0.1/amp-form.js b/extensions/amp-form/0.1/amp-form.js
index 930fa13cf84c..4f75dd7dd4c7 100644
--- a/extensions/amp-form/0.1/amp-form.js
+++ b/extensions/amp-form/0.1/amp-form.js
@@ -1,10 +1,10 @@
-import {ActionTrust} from '#core/constants/action-constants';
-import {AmpEvents} from '#core/constants/amp-events';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
 import {
-  AsyncInputAttributes,
-  AsyncInputClasses,
+  AsyncInputAttributes_Enum,
+  AsyncInputClasses_Enum,
 } from '#core/constants/async-input';
-import {Keys} from '#core/constants/key-codes';
+import {Keys_Enum} from '#core/constants/key-codes';
 import {Deferred, tryResolve} from '#core/data-structures/promise';
 import {isAmp4Email} from '#core/document/format';
 import {
@@ -21,7 +21,7 @@ import {
 } from '#core/dom/form';
 import {ancestorElementsByTag, childElementByAttr} from '#core/dom/query';
 import {isArray, toArray} from '#core/types/array';
-import {deepMerge, dict} from '#core/types/object';
+import {deepMerge} from '#core/types/object';
 import {tryParseJson} from '#core/types/object/json';
 import {parseQueryString} from '#core/types/string/url';
 import {toWin} from '#core/window';
@@ -286,13 +286,13 @@ export class AmpForm {
    * Builds fetch request data for amp-form elements.
    * @param {string} url
    * @param {string} method
-   * @param {!Object<string, string>=} opt_extraFields
+   * @param {!{[key: string]: string}=} opt_extraFields
    * @param {!Array<string>=} opt_fieldDenylist
    * @return {!FetchRequestDef}
    */
   requestForFormFetch(url, method, opt_extraFields, opt_fieldDenylist) {
     let xhrUrl, body;
-    let headers = dict({'Accept': 'application/json'});
+    let headers = {'Accept': 'application/json'};
     const isHeadOrGet = method == 'GET' || method == 'HEAD';
     if (isHeadOrGet) {
       this.assertNoSensitiveFields_();
@@ -309,10 +309,10 @@ export class AmpForm {
       xhrUrl = url;
       if (this.encType_ === 'application/x-www-form-urlencoded') {
         body = serializeQueryString(this.getFormAsObject_());
-        headers = dict({
+        headers = {
           'Accept': 'application/json',
           'Content-Type': 'application/x-www-form-urlencoded',
-        });
+        };
       } else {
         // default case: encType_ is 'multipart/form-data'
         devAssert(this.encType_ === 'multipart/form-data');
@@ -330,12 +330,12 @@ export class AmpForm {
     /** @type {!FetchRequestDef}*/
     const request = {
       xhrUrl,
-      fetchOpt: dict({
+      fetchOpt: {
         'body': body,
         'method': method,
         'credentials': 'include',
         'headers': headers,
-      }),
+      },
     };
     return request;
   }
@@ -355,7 +355,7 @@ export class AmpForm {
    * @private
    */
   actionHandler_(invocation) {
-    if (!invocation.satisfiesTrust(ActionTrust.DEFAULT)) {
+    if (!invocation.satisfiesTrust(ActionTrust_Enum.DEFAULT)) {
       return null;
     }
     if (invocation.method == 'submit') {
@@ -415,7 +415,7 @@ export class AmpForm {
     );
 
     this.form_.addEventListener(
-      AmpEvents.FORM_VALUE_CHANGE,
+      AmpEvents_Enum.FORM_VALUE_CHANGE,
       (e) => {
         checkUserValidityAfterInteraction_(dev().assertElement(e.target));
         this.validator_.onInput(e);
@@ -437,11 +437,11 @@ export class AmpForm {
           if (this.state_ === FormState.VERIFYING) {
             if (errors.length) {
               this.setState_(FormState.VERIFY_ERROR);
-              this.renderTemplate_(dict({'verifyErrors': errors})).then(() => {
+              this.renderTemplate_({'verifyErrors': errors}).then(() => {
                 this.triggerAction_(
                   FormEvents.VERIFY_ERROR,
                   errors,
-                  ActionTrust.DEFAULT // DEFAULT because async after gesture.
+                  ActionTrust_Enum.DEFAULT // DEFAULT because async after gesture.
                 );
               });
             } else {
@@ -478,7 +478,7 @@ export class AmpForm {
    */
   triggerFormSubmitInAnalytics_(eventType) {
     this.assertSsrTemplate_(false, 'Form analytics not supported');
-    const formDataForAnalytics = dict({});
+    const formDataForAnalytics = {};
     const formObject = this.getFormAsObject_();
 
     for (const k in formObject) {
@@ -523,7 +523,7 @@ export class AmpForm {
     const validityElements = this.form_.querySelectorAll(
       '.user-valid, .user-invalid'
     );
-    iterateCursor(validityElements, (element) => {
+    validityElements.forEach((element) => {
       element.classList.remove('user-valid');
       element.classList.remove('user-invalid');
     });
@@ -531,7 +531,7 @@ export class AmpForm {
     const messageElements = this.form_.querySelectorAll(
       '.visible[validation-for]'
     );
-    iterateCursor(messageElements, (element) => {
+    messageElements.forEach((element) => {
       element.classList.remove('visible');
     });
 
@@ -569,12 +569,12 @@ export class AmpForm {
     }
 
     // Submits caused by user input have high trust.
-    return this.submit_(ActionTrust.HIGH, event);
+    return this.submit_(ActionTrust_Enum.HIGH, event);
   }
 
   /**
    * Helper method that actual handles the different cases (post, get, xhr...).
-   * @param {ActionTrust} trust
+   * @param {ActionTrust_Enum} trust
    * @param {?Event} event
    * @return {!Promise}
    * @private
@@ -593,7 +593,7 @@ export class AmpForm {
     // Get our special fields
     const varSubsFields = this.getVarSubsFields_();
     const asyncInputs = this.form_.getElementsByClassName(
-      AsyncInputClasses.ASYNC_INPUT
+      AsyncInputClasses_Enum.ASYNC_INPUT
     );
 
     this.dirtinessHandler_.onSubmitting();
@@ -639,7 +639,9 @@ export class AmpForm {
     iterateCursor(asyncInputs, (asyncInput) => {
       const asyncCall = this.getValueForAsyncInput_(asyncInput);
       if (
-        asyncInput.classList.contains(AsyncInputClasses.ASYNC_REQUIRED_ACTION)
+        asyncInput.classList.contains(
+          AsyncInputClasses_Enum.ASYNC_REQUIRED_ACTION
+        )
       ) {
         requiredActionPromises.push(asyncCall);
       } else {
@@ -664,12 +666,12 @@ export class AmpForm {
   /**
    * Handle form error for presubmit async calls.
    * @param {*} error
-   * @param {!ActionTrust} trust
+   * @param {!ActionTrust_Enum} trust
    * @return {Promise}
    * @private
    */
   handlePresubmitError_(error, trust) {
-    const detail = dict();
+    const detail = {};
     if (error && error.message) {
       detail['error'] = error.message;
     }
@@ -688,7 +690,7 @@ export class AmpForm {
 
   /**
    * Handle successful presubmit tasks
-   * @param {!ActionTrust} trust
+   * @param {!ActionTrust_Enum} trust
    * @return {!Promise}
    */
   handlePresubmitSuccess_(trust) {
@@ -712,7 +714,11 @@ export class AmpForm {
       return Promise.resolve();
     }
     this.setState_(FormState.VERIFYING);
-    this.triggerAction_(FormEvents.VERIFY, /* detail */ null, ActionTrust.HIGH);
+    this.triggerAction_(
+      FormEvents.VERIFY,
+      /* detail */ null,
+      ActionTrust_Enum.HIGH
+    );
 
     return this.doVarSubs_(this.getVarSubsFields_()).then(() =>
       this.doVerifyXhr_()
@@ -720,7 +726,7 @@ export class AmpForm {
   }
 
   /**
-   * @param {ActionTrust} trust
+   * @param {ActionTrust_Enum} trust
    * @return {!Promise}
    * @private
    */
@@ -743,7 +749,7 @@ export class AmpForm {
 
   /**
    * Handles the server side proxying and then rendering of the template.
-   * @param {ActionTrust} trust
+   * @param {ActionTrust_Enum} trust
    * @return {!Promise}
    * @private
    */
@@ -784,7 +790,7 @@ export class AmpForm {
       .then(
         (response) => this.handleSsrTemplateResponse_(response, trust),
         (error) => {
-          const detail = dict();
+          const detail = {};
           if (error && error.message) {
             detail['error'] = error.message;
           }
@@ -818,7 +824,7 @@ export class AmpForm {
   /**
    * Transition the form to the submit-success or submit-error state depending on the response status.
    * @param {!JsonObject} response
-   * @param {!ActionTrust} trust
+   * @param {!ActionTrust_Enum} trust
    * @return {!Promise}
    * @private
    */
@@ -840,7 +846,7 @@ export class AmpForm {
 
   /**
    * Triggers the analytics and renders any template for submitting state.
-   * @param {ActionTrust} trust
+   * @param {ActionTrust_Enum} trust
    */
   submittingWithTrust_(trust) {
     this.triggerFormSubmitInAnalytics_('amp-form-submit');
@@ -886,19 +892,15 @@ export class AmpForm {
       .getImpl()
       .then((implementation) => implementation.getValue())
       .then((value) => {
-        const name = asyncInput.getAttribute(AsyncInputAttributes.NAME);
+        const name = asyncInput.getAttribute(AsyncInputAttributes_Enum.NAME);
         let input = this.form_.querySelector(
           `input[name=${escapeCssSelectorIdent(name)}]`
         );
         if (!input) {
-          input = createElementWithAttributes(
-            this.win_.document,
-            'input',
-            dict({
-              'name': asyncInput.getAttribute(AsyncInputAttributes.NAME),
-              'hidden': 'true',
-            })
-          );
+          input = createElementWithAttributes(this.win_.document, 'input', {
+            'name': asyncInput.getAttribute(AsyncInputAttributes_Enum.NAME),
+            'hidden': 'true',
+          });
         }
         input.setAttribute('value', value);
         this.form_.appendChild(input);
@@ -939,7 +941,7 @@ export class AmpForm {
    * Send a request to a form endpoint.
    * @param {string} url
    * @param {string} method
-   * @param {!Object<string, string>=} opt_extraFields
+   * @param {!{[key: string]: string}=} opt_extraFields
    * @param {!Array<string>=} opt_fieldDenylist
    * @return {!Promise<!Response>}
    * @private
@@ -957,18 +959,18 @@ export class AmpForm {
 
   /**
    * Returns the action trust for submit-success and submit-error events.
-   * @param {!ActionTrust} incomingTrust
-   * @return {!ActionTrust}
+   * @param {!ActionTrust_Enum} incomingTrust
+   * @return {!ActionTrust_Enum}
    * @private
    */
   trustForSubmitResponse_(incomingTrust) {
     // Degrade trust across form submission.
-    return /** @type {!ActionTrust} */ (incomingTrust - 1);
+    return /** @type {!ActionTrust_Enum} */ (incomingTrust - 1);
   }
 
   /**
    * @param {!Response} response
-   * @param {!ActionTrust} incomingTrust Trust of the originating submit action.
+   * @param {!ActionTrust_Enum} incomingTrust Trust of the originating submit action.
    * @return {!Promise}
    * @private
    */
@@ -992,7 +994,7 @@ export class AmpForm {
   /**
    * Transition the form to the submit success state.
    * @param {!JsonObject} result
-   * @param {!ActionTrust} incomingTrust Trust of the originating submit action.
+   * @param {!ActionTrust_Enum} incomingTrust Trust of the originating submit action.
    * @param {?JsonObject=} opt_eventData
    * @return {!Promise}
    * @private
@@ -1015,7 +1017,7 @@ export class AmpForm {
 
   /**
    * @param {*} e
-   * @param {!ActionTrust} incomingTrust Trust of the originating submit action.
+   * @param {!ActionTrust_Enum} incomingTrust Trust of the originating submit action.
    * @return {!Promise}
    * @private
    */
@@ -1037,10 +1039,10 @@ export class AmpForm {
   }
 
   /**
-   * Transition the form the the submit error state.
+   * Transition the form the submit error state.
    * @param {*} error
    * @param {!JsonObject} json
-   * @param {!ActionTrust} incomingTrust
+   * @param {!ActionTrust_Enum} incomingTrust
    * @param {?JsonObject=} opt_eventData
    * @return {!Promise}
    * @private
@@ -1181,15 +1183,13 @@ export class AmpForm {
    * Triggers an action e.g. submit success/error with response data.
    * @param {!FormEvents} name
    * @param {?JsonObject|!Array<{message: string, name: string}>} detail
-   * @param {!ActionTrust} trust
+   * @param {!ActionTrust_Enum} trust
    * @private
    */
   triggerAction_(name, detail, trust) {
-    const event = createCustomEvent(
-      this.win_,
-      `${TAG}.${name}`,
-      dict({'response': detail})
-    );
+    const event = createCustomEvent(this.win_, `${TAG}.${name}`, {
+      'response': detail,
+    });
     this.actions_.trigger(this.form_, name, event, trust);
   }
 
@@ -1243,7 +1243,7 @@ export class AmpForm {
    */
   renderTemplate_(data) {
     if (isArray(data)) {
-      data = dict();
+      data = {};
       user().warn(
         TAG,
         `Unexpected data type: ${data}. Expected non JSON array.`
@@ -1280,7 +1280,7 @@ export class AmpForm {
                 container.appendChild(dev().assertElement(renderContainer));
                 const renderedEvent = createCustomEvent(
                   this.win_,
-                  AmpEvents.DOM_UPDATE,
+                  AmpEvents_Enum.DOM_UPDATE,
                   /* detail */ null,
                   {bubbles: true}
                 );
@@ -1401,7 +1401,7 @@ export class AmpForm {
         maybeFillField(field, key);
       } else if (formControls.length) {
         const fields = /** @type {!NodeList} */ (formControls);
-        iterateCursor(fields, (field) => maybeFillField(field, key));
+        fields.forEach((field) => maybeFillField(field, key));
       }
     });
   }
@@ -1434,7 +1434,7 @@ export class AmpForm {
  */
 function checkUserValidityOnSubmission(form) {
   const elements = form.querySelectorAll('input,select,textarea,fieldset');
-  iterateCursor(elements, (element) => checkUserValidity(element));
+  elements.forEach((element) => checkUserValidity(element));
   return checkUserValidity(form);
 }
 
@@ -1477,7 +1477,7 @@ function removeValidityStateClasses(form) {
     const elements = form.querySelectorAll(
       `.${escapeCssSelectorIdent(validityState)}`
     );
-    iterateCursor(elements, (element) => {
+    elements.forEach((element) => {
       dev().assertElement(element).classList.remove(validityState);
     });
   }
@@ -1620,8 +1620,7 @@ export class AmpFormService {
 
   /**
    * Install submission handler on all forms in the document.
-   * @param {?IArrayLike<T>} forms
-   * @template T
+   * @param {NodeList} forms
    * @private
    */
   installSubmissionHandlers_(forms) {
@@ -1629,7 +1628,7 @@ export class AmpFormService {
       return;
     }
 
-    iterateCursor(forms, (form, index) => {
+    forms.forEach((form, index) => {
       const existingAmpForm = formOrNullForElement(form);
       if (!existingAmpForm) {
         new AmpForm(form, `amp-form-${index}`);
@@ -1643,7 +1642,7 @@ export class AmpFormService {
    * @private
    */
   installDomUpdateEventListener_(doc) {
-    doc.addEventListener(AmpEvents.DOM_UPDATE, () => {
+    doc.addEventListener(AmpEvents_Enum.DOM_UPDATE, () => {
       this.installSubmissionHandlers_(doc.querySelectorAll('form'));
     });
   }
@@ -1657,7 +1656,7 @@ export class AmpFormService {
     doc.addEventListener('keydown', (e) => {
       if (
         e.defaultPrevented ||
-        e.key != Keys.ENTER ||
+        e.key != Keys_Enum.ENTER ||
         !(e.ctrlKey || e.metaKey) ||
         e.target.tagName !== 'TEXTAREA'
       ) {
diff --git a/extensions/amp-form/0.1/form-dirtiness.js b/extensions/amp-form/0.1/form-dirtiness.js
index 6adf070176f2..6c181dc8af4a 100644
--- a/extensions/amp-form/0.1/form-dirtiness.js
+++ b/extensions/amp-form/0.1/form-dirtiness.js
@@ -1,6 +1,6 @@
-import {AmpEvents} from '#core/constants/amp-events';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
 import {isDisabled, isFieldDefault, isFieldEmpty} from '#core/dom/form';
-import {dict, map} from '#core/types/object';
+import {map} from '#core/types/object';
 
 import {createCustomEvent} from '#utils/event-helper';
 import {dev} from '#utils/log';
@@ -9,7 +9,7 @@ import {createFormDataWrapper} from '../../../src/form-data-wrapper';
 
 export const DIRTINESS_INDICATOR_CLASS = 'amp-form-dirty';
 
-/** @private {!Object<string, boolean>} */
+/** @private {!{[key: string]: boolean}} */
 const SUPPORTED_TAG_NAMES = {
   'INPUT': true,
   'SELECT': true,
@@ -31,7 +31,7 @@ export class FormDirtiness {
     /** @private {number} */
     this.dirtyFieldCount_ = 0;
 
-    /** @private {!Object<string, boolean>} */
+    /** @private {!{[key: string]: boolean}} */
     this.isFieldNameDirty_ = map();
 
     /** @private {?FormData} */
@@ -102,8 +102,8 @@ export class FormDirtiness {
 
       const formDirtinessChangeEvent = createCustomEvent(
         this.win_,
-        AmpEvents.FORM_DIRTINESS_CHANGE,
-        dict({'isDirty': isDirty}),
+        AmpEvents_Enum.FORM_DIRTINESS_CHANGE,
+        {'isDirty': isDirty},
         {bubbles: true}
       );
       this.form_.dispatchEvent(formDirtinessChangeEvent);
@@ -122,7 +122,7 @@ export class FormDirtiness {
     // `amp-bind` dispatches the custom event `FORM_VALUE_CHANGE` when it
     // mutates the value of a form field (e.g. textarea, input, etc)
     this.form_.addEventListener(
-      AmpEvents.FORM_VALUE_CHANGE,
+      AmpEvents_Enum.FORM_VALUE_CHANGE,
       this.onInput_.bind(this)
     );
   }
diff --git a/extensions/amp-form/0.1/form-proxy.js b/extensions/amp-form/0.1/form-proxy.js
index e238c9c43593..4d548cfcf5d6 100644
--- a/extensions/amp-form/0.1/form-proxy.js
+++ b/extensions/amp-form/0.1/form-proxy.js
@@ -260,12 +260,12 @@ const LegacyPropDataType = {
 };
 
 /**
- * @const {!Object<string, {
+ * @const {!{[key: string]: {
  *   access: !LegacyPropAccessType,
  *   attr: (string|undefined),
  *   type: (LegacyPropDataType|undefined),
  *   def: *,
- * }>}
+ * }}}
  */
 const LEGACY_PROPS = {
   'acceptCharset': {
diff --git a/extensions/amp-form/0.1/test/integration/test-integration-form.js b/extensions/amp-form/0.1/test/integration/test-integration-form.js
index b2ce65cac89a..9e21d69e2595 100644
--- a/extensions/amp-form/0.1/test/integration/test-integration-form.js
+++ b/extensions/amp-form/0.1/test/integration/test-integration-form.js
@@ -1,4 +1,4 @@
-import {AmpEvents} from '#core/constants/amp-events';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
 
 import {Services} from '#service';
 import {stubElementsForDoc} from '#service/custom-element-registry';
@@ -164,8 +164,7 @@ describes.realWin(
       });
     });
 
-    // TODO(cvializ, #19647): Broken on SL Chrome 71.
-    describeChrome.skip('Submit xhr-POST', function () {
+    describeChrome.run('Submit xhr-POST', function () {
       this.timeout(RENDER_TIMEOUT);
 
       it('should submit and render success', () => {
@@ -184,7 +183,7 @@ describes.realWin(
         const fetch = poll('submit request sent', () =>
           ampForm.xhrSubmitPromiseForTesting()
         );
-        const render = listenOncePromise(form, AmpEvents.DOM_UPDATE);
+        const render = listenOncePromise(form, AmpEvents_Enum.DOM_UPDATE);
 
         form.dispatchEvent(new Event('submit'));
         return fetch
@@ -220,7 +219,7 @@ describes.realWin(
           'submit request sent',
           () => fetchSpy.returnValues[0]
         );
-        const render = listenOncePromise(form, AmpEvents.DOM_UPDATE);
+        const render = listenOncePromise(form, AmpEvents_Enum.DOM_UPDATE);
 
         form.dispatchEvent(new Event('submit'));
         return fetch.then(
@@ -241,8 +240,7 @@ describes.realWin(
       });
     });
 
-    // TODO(cvializ, #19647): Broken on SL Chrome 71.
-    describeChrome.skip('Submit xhr-GET', function () {
+    describeChrome.run('Submit xhr-GET', function () {
       this.timeout(RENDER_TIMEOUT);
 
       it('should submit and render success', () => {
@@ -262,7 +260,7 @@ describes.realWin(
         const fetch = poll('submit request sent', () =>
           ampForm.xhrSubmitPromiseForTesting()
         );
-        const render = listenOncePromise(form, AmpEvents.DOM_UPDATE);
+        const render = listenOncePromise(form, AmpEvents_Enum.DOM_UPDATE);
 
         form.dispatchEvent(new Event('submit'));
         return fetch
@@ -299,7 +297,7 @@ describes.realWin(
           'submit request sent',
           () => fetchSpy.returnValues[0]
         );
-        const render = listenOncePromise(form, AmpEvents.DOM_UPDATE);
+        const render = listenOncePromise(form, AmpEvents_Enum.DOM_UPDATE);
 
         form.dispatchEvent(new Event('submit'));
         return fetch.then(
@@ -320,8 +318,7 @@ describes.realWin(
       });
     });
 
-    // TODO(cvializ, #19647): Broken on SL Chrome 71.
-    describeChrome.skip('Submit result message', () => {
+    describeChrome.run('Submit result message', () => {
       it('should render messages with or without a template', () => {
         // Stubbing timeout to catch async-thrown errors and expect
         // them. These catch errors thrown inside the catch-clause of the
@@ -361,7 +358,7 @@ describes.realWin(
             expect(rendered.length).to.equal(0);
 
             // Any amp elements inside the message should be layed out.
-            const layout = listenOncePromise(form, AmpEvents.LOAD_START);
+            const layout = listenOncePromise(form, AmpEvents_Enum.LOAD_START);
             return layout.then(() => {
               const img = form.querySelector('amp-img img');
               expect(img.src).to.contain('/examples/img/ampicon.png');
diff --git a/extensions/amp-form/0.1/test/test-amp-form.js b/extensions/amp-form/0.1/test/test-amp-form.js
index b4ecbaf01c04..00297044dc20 100644
--- a/extensions/amp-form/0.1/test/test-amp-form.js
+++ b/extensions/amp-form/0.1/test/test-amp-form.js
@@ -1,9 +1,9 @@
 import '../../../amp-mustache/0.1/amp-mustache';
-import {ActionTrust} from '#core/constants/action-constants';
-import {AmpEvents} from '#core/constants/amp-events';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
 import {
-  AsyncInputAttributes,
-  AsyncInputClasses,
+  AsyncInputAttributes_Enum,
+  AsyncInputClasses_Enum,
 } from '#core/constants/async-input';
 import {createElementWithAttributes} from '#core/dom';
 import {fromIterator} from '#core/types/array';
@@ -148,9 +148,9 @@ describes.repeated(
             // Create our async input element
             // With the required fields
             const asyncInput = createElement('amp-mock-async-input');
-            asyncInput.classList.add(AsyncInputClasses.ASYNC_INPUT);
+            asyncInput.classList.add(AsyncInputClasses_Enum.ASYNC_INPUT);
             asyncInput.setAttribute(
-              AsyncInputAttributes.NAME,
+              AsyncInputAttributes_Enum.NAME,
               'mock-async-input'
             );
 
@@ -171,13 +171,13 @@ describes.repeated(
                 'amp-mock-async-input-required-action'
               );
               asyncInputRequiredAction.classList.add(
-                AsyncInputClasses.ASYNC_INPUT
+                AsyncInputClasses_Enum.ASYNC_INPUT
               );
               asyncInputRequiredAction.classList.add(
-                AsyncInputClasses.ASYNC_REQUIRED_ACTION
+                AsyncInputClasses_Enum.ASYNC_REQUIRED_ACTION
               );
               asyncInput.setAttribute(
-                AsyncInputAttributes.NAME,
+                AsyncInputAttributes_Enum.NAME,
                 'mock-async-input-required-action'
               );
 
@@ -861,7 +861,7 @@ describes.repeated(
 
             const event = createCustomEvent(
               env.win,
-              AmpEvents.FORM_VALUE_CHANGE,
+              AmpEvents_Enum.FORM_VALUE_CHANGE,
               /* detail */ null,
               {bubbles: true}
             );
@@ -1274,7 +1274,7 @@ describes.repeated(
                 .then(() => {
                   expect(spyDispatchEvent.calledOnce).to.be.true;
                   expect(spyDispatchEvent).calledWithMatch({
-                    type: AmpEvents.DOM_UPDATE,
+                    type: AmpEvents_Enum.DOM_UPDATE,
                     bubbles: true,
                   });
                   env.sandbox.assert.callOrder(
@@ -1488,7 +1488,7 @@ describes.repeated(
             env.sandbox.stub(ampForm.urlReplacement_, 'expandInputValueSync');
 
             // Setup some Promises
-            const submitPromise = ampForm.submit_(ActionTrust.HIGH);
+            const submitPromise = ampForm.submit_(ActionTrust_Enum.HIGH);
 
             // Fetch
             expect(ampForm.xhr_.fetch).to.have.not.been.called;
@@ -1601,12 +1601,12 @@ describes.repeated(
             form,
             'submit-success',
             /* CustomEvent */ env.sandbox.match.has('detail'),
-            ActionTrust.DEFAULT // Expect: ActionTrust.HIGH - 1
+            ActionTrust_Enum.DEFAULT // Expect: ActionTrust_Enum.HIGH - 1
           );
 
           await ampForm.handleSubmitAction_({
             method: 'submit',
-            trust: ActionTrust.DEFAULT,
+            trust: ActionTrust_Enum.DEFAULT,
           });
 
           expect(actions.trigger.callCount).to.equal(4);
@@ -1614,7 +1614,7 @@ describes.repeated(
             form,
             'submit-success',
             /* CustomEvent */ env.sandbox.match.has('detail'),
-            ActionTrust.LOW // Expect: ActionTrust.DEFAULT - 1
+            ActionTrust_Enum.LOW // Expect: ActionTrust_Enum.DEFAULT - 1
           );
         });
 
@@ -2366,7 +2366,7 @@ describes.repeated(
               env.sandbox.spy(ampForm.urlReplacement_, 'expandInputValueAsync');
               env.sandbox.stub(ampForm.urlReplacement_, 'expandInputValueSync');
 
-              const submitPromise = ampForm.submit_(ActionTrust.HIGH);
+              const submitPromise = ampForm.submit_(ActionTrust_Enum.HIGH);
               expect(ampForm.xhr_.fetch).to.have.not.been.called;
               expect(ampForm.urlReplacement_.expandInputValueSync).to.not.have
                 .been.called;
@@ -2424,7 +2424,7 @@ describes.repeated(
               env.sandbox.stub(ampForm.urlReplacement_, 'expandInputValueSync');
 
               env.sandbox.stub(ampForm, 'handleXhrSubmitSuccess_').resolves();
-              const submitPromise = ampForm.submit_(ActionTrust.HIGH);
+              const submitPromise = ampForm.submit_(ActionTrust_Enum.HIGH);
 
               expect(ampForm.xhr_.fetch).to.have.not.been.called;
               expect(ampForm.urlReplacement_.expandInputValueSync).to.not.have
@@ -2999,7 +2999,7 @@ describes.repeated(
             'source',
             'caller',
             'event',
-            ActionTrust.HIGH
+            ActionTrust_Enum.HIGH
           );
           expect(clearSpy).to.be.called;
 
@@ -3012,7 +3012,7 @@ describes.repeated(
             'source',
             'caller',
             'event',
-            ActionTrust.HIGH
+            ActionTrust_Enum.HIGH
           );
           await whenCalled(submitSpy);
           expect(submitSpy).to.be.calledWith(
@@ -3024,7 +3024,7 @@ describes.repeated(
               method: 'submit',
               node: element,
               source: 'source',
-              trust: ActionTrust.HIGH,
+              trust: ActionTrust_Enum.HIGH,
             })
           );
         });
@@ -3041,7 +3041,7 @@ describes.repeated(
                 'assertNoSensitiveFields_'
               );
 
-              return ampForm.submit_(ActionTrust.HIGH).then(() => {
+              return ampForm.submit_(ActionTrust_Enum.HIGH).then(() => {
                 expect(assertNoSensitiveFieldsStub).to.be.called;
               });
             });
@@ -3064,10 +3064,12 @@ describes.repeated(
                 preventDefault: () => {},
               };
 
-              return ampForm.submit_(ActionTrust.HIGH, mockEvent).then(() => {
-                expect(getValueStub).to.be.called;
-                expect(formElementSubmitSpy).to.be.calledOnce;
-              });
+              return ampForm
+                .submit_(ActionTrust_Enum.HIGH, mockEvent)
+                .then(() => {
+                  expect(getValueStub).to.be.called;
+                  expect(formElementSubmitSpy).to.be.calledOnce;
+                });
             });
           });
 
@@ -3075,7 +3077,7 @@ describes.repeated(
             return getAmpFormWithAsyncInput().then((response) => {
               const {ampForm, getValueStub} = response;
 
-              return ampForm.submit_(ActionTrust.HIGH).then(() => {
+              return ampForm.submit_(ActionTrust_Enum.HIGH).then(() => {
                 expect(getValueStub).to.be.called;
               });
             });
@@ -3088,9 +3090,9 @@ describes.repeated(
               return getAmpFormWithAsyncInput().then((response) => {
                 const {ampForm, asyncInput} = response;
 
-                return ampForm.submit_(ActionTrust.HIGH).then(() => {
+                return ampForm.submit_(ActionTrust_Enum.HIGH).then(() => {
                   const name = asyncInput.getAttribute(
-                    AsyncInputAttributes.NAME
+                    AsyncInputAttributes_Enum.NAME
                   );
                   const hiddenInput = ampForm.form_.querySelector(
                     `input[hidden][name=${name}]`
@@ -3108,9 +3110,9 @@ describes.repeated(
               return getAmpFormWithAsyncInput().then((response) => {
                 const {ampForm, asyncInput, asyncInputValue} = response;
 
-                return ampForm.submit_(ActionTrust.HIGH).then(() => {
+                return ampForm.submit_(ActionTrust_Enum.HIGH).then(() => {
                   const name = asyncInput.getAttribute(
-                    AsyncInputAttributes.NAME
+                    AsyncInputAttributes_Enum.NAME
                   );
                   const hiddenInput = ampForm.form_.querySelector(
                     `input[hidden][name=${name}]`
@@ -3135,12 +3137,12 @@ describes.repeated(
                 let previousHiddenInputCount;
 
                 return ampForm
-                  .submit_(ActionTrust.HIGH)
+                  .submit_(ActionTrust_Enum.HIGH)
                   .then(() => {
                     previousHiddenInputCount =
                       ampForm.form_.querySelectorAll('input[hidden]').length;
                     const name = asyncInput.getAttribute(
-                      AsyncInputAttributes.NAME
+                      AsyncInputAttributes_Enum.NAME
                     );
                     hiddenInput = ampForm.form_.querySelector(
                       `input[hidden][name=${name}]`
@@ -3149,7 +3151,7 @@ describes.repeated(
                     expect(value).to.be.equal(asyncInputValue);
 
                     getValueStub.resolves(newAsyncInputValue);
-                    return ampForm.submit_(ActionTrust.HIGH);
+                    return ampForm.submit_(ActionTrust_Enum.HIGH);
                   })
                   .then(() => {
                     const totalHiddenInputs =
@@ -3179,7 +3181,7 @@ describes.repeated(
                   'handlePresubmitSuccess_'
                 );
 
-                return ampForm.submit_(ActionTrust.HIGH).then(() => {
+                return ampForm.submit_(ActionTrust_Enum.HIGH).then(() => {
                   expect(handlePresubmitSuccessStub).to.be.called;
                 });
               });
@@ -3196,7 +3198,7 @@ describes.repeated(
                 ampForm,
                 'handlePresubmitSuccess_'
               );
-              return ampForm.submit_(ActionTrust.HIGH).then(() => {
+              return ampForm.submit_(ActionTrust_Enum.HIGH).then(() => {
                 expect(getValueStubRequiredAction).to.be.called;
                 expect(handlePresubmitSuccessStub).to.be.called;
               });
@@ -3214,7 +3216,7 @@ describes.repeated(
                 getValueStub.rejects(getValueError);
 
                 const stub = env.sandbox.stub(ampForm, 'handleSubmitFailure_');
-                return ampForm.submit_(ActionTrust.HIGH).then(() => {
+                return ampForm.submit_(ActionTrust_Enum.HIGH).then(() => {
                   expect(stub).to.be.called;
                   expect(stub).to.be.calledWith(getValueError, {
                     'error': 'amp-async-input-error',
@@ -3233,7 +3235,7 @@ describes.repeated(
 
                 const setStateStub = env.sandbox.stub(ampForm, 'setState_');
 
-                return ampForm.submit_(ActionTrust.HIGH).then(() => {
+                return ampForm.submit_(ActionTrust_Enum.HIGH).then(() => {
                   expect(setStateStub).to.be.calledWith('submitting');
                 });
               });
@@ -3251,7 +3253,7 @@ describes.repeated(
 
                 const setStateStub = env.sandbox.stub(ampForm, 'setState_');
 
-                return ampForm.submit_(ActionTrust.HIGH).then(() => {
+                return ampForm.submit_(ActionTrust_Enum.HIGH).then(() => {
                   expect(setStateStub).to.be.calledWith('initial');
                 });
               });
@@ -3269,7 +3271,7 @@ describes.repeated(
                 getValueStub.rejects(getValueError);
                 const setStateStub = env.sandbox.stub(ampForm, 'setState_');
 
-                return ampForm.submit_(ActionTrust.HIGH).then(() => {
+                return ampForm.submit_(ActionTrust_Enum.HIGH).then(() => {
                   expect(setStateStub).to.be.calledWith('submit-error');
                 });
               });
@@ -3302,7 +3304,7 @@ describes.repeated(
             ampForm.xhrAction_ = null;
 
             changeInput(input, 'Another Name');
-            await ampForm.submit_(ActionTrust.HIGH);
+            await ampForm.submit_(ActionTrust_Enum.HIGH);
 
             expect(form).to.not.have.class(DIRTINESS_INDICATOR_CLASS);
           });
@@ -3313,7 +3315,7 @@ describes.repeated(
               .resolves({json: async () => {}});
 
             changeInput(input, 'Another Name');
-            await ampForm.submit_(ActionTrust.HIGH);
+            await ampForm.submit_(ActionTrust_Enum.HIGH);
 
             expect(form).to.not.have.class(DIRTINESS_INDICATOR_CLASS);
           });
@@ -3322,7 +3324,7 @@ describes.repeated(
             env.sandbox.stub(ampForm.xhr_, 'fetch').rejects({});
 
             changeInput(input, 'Another Name');
-            await ampForm.submit_(ActionTrust.HIGH);
+            await ampForm.submit_(ActionTrust_Enum.HIGH);
 
             expect(form).to.have.class(DIRTINESS_INDICATOR_CLASS);
           });
diff --git a/extensions/amp-form/0.1/test/test-form-dirtiness.js b/extensions/amp-form/0.1/test/test-form-dirtiness.js
index b275c230f4b2..cfa34ce4fd1e 100644
--- a/extensions/amp-form/0.1/test/test-form-dirtiness.js
+++ b/extensions/amp-form/0.1/test/test-form-dirtiness.js
@@ -1,4 +1,4 @@
-import {AmpEvents} from '#core/constants/amp-events';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
 import {closestAncestorElementBySelector} from '#core/dom/query';
 
 import {Services} from '#service';
@@ -49,7 +49,7 @@ function dispatchInputEvent(element) {
 function dispatchFormValueChangeEvent(element, win) {
   const ampValueChangeEvent = createCustomEvent(
     win,
-    AmpEvents.FORM_VALUE_CHANGE,
+    AmpEvents_Enum.FORM_VALUE_CHANGE,
     /* detail */ null,
     {bubbles: true}
   );
@@ -394,7 +394,7 @@ describes.realWin('form-dirtiness', {}, (env) => {
     });
   });
 
-  describe('AmpEvents.FORM_DIRTINESS_CHANGE', () => {
+  describe('AmpEvents_Enum.FORM_DIRTINESS_CHANGE', () => {
     let input;
 
     beforeEach(() => {
@@ -405,7 +405,7 @@ describes.realWin('form-dirtiness', {}, (env) => {
     it('dispatches an event when the form transitions from clean to dirty', () => {
       const changeToDirty = () => changeInput(input, 'changed');
       const eventDispatched = captureEventDispatched(
-        AmpEvents.FORM_DIRTINESS_CHANGE,
+        AmpEvents_Enum.FORM_DIRTINESS_CHANGE,
         form,
         changeToDirty
       );
@@ -419,7 +419,7 @@ describes.realWin('form-dirtiness', {}, (env) => {
 
       const changeToClean = () => changeInput(input, '');
       const eventDispatched = captureEventDispatched(
-        AmpEvents.FORM_DIRTINESS_CHANGE,
+        AmpEvents_Enum.FORM_DIRTINESS_CHANGE,
         form,
         changeToClean
       );
@@ -433,7 +433,7 @@ describes.realWin('form-dirtiness', {}, (env) => {
 
       const remainDirty = () => changeInput(input, 'still dirty');
       const eventDispatched = captureEventDispatched(
-        AmpEvents.FORM_DIRTINESS_CHANGE,
+        AmpEvents_Enum.FORM_DIRTINESS_CHANGE,
         form,
         remainDirty
       );
diff --git a/extensions/amp-form/amp-form.md b/extensions/amp-form/amp-form.md
index 8f6ae0db6b23..486c608b54a6 100644
--- a/extensions/amp-form/amp-form.md
+++ b/extensions/amp-form/amp-form.md
@@ -106,12 +106,26 @@ For details on valid inputs and fields, see [amp-form rules](https://github.com/
 
 You can render success or error responses in your form by using [amp-mustache](../amp-mustache/amp-mustache.md), or success responses through data binding with [amp-bind](../amp-bind/amp-bind.md) and the following response attributes:
 
+[filter formats="websites, ads"]
+
 | Response attribute | Description                                                                                                                                                                                                                                                            |
 | ------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `submit-success`   | Can be used to display a success message if the response is successful (i.e., has a status of `2XX`).                                                                                                                                                                  |
 | `submit-error`     | Can be used to display a submission error if the response is unsuccessful (i.e., does not have a status of `2XX`).                                                                                                                                                     |
 | `submitting`       | Can be used to display a message when the form is submitting. The template for this attribute has access to the form's input fields for any display purposes. Please see the [full form example below](#example-submitting) for how to use the `submitting` attribute. |
 
+[/filter]<!-- formats="websites, ads" -->
+
+[filter formats="email"]
+
+| Response attribute | Description                                                                                                                                                            |
+| ------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `submit-success`   | Can be used to display a success message if the response is successful (i.e., has a status of `2XX`).                                                                  |
+| `submit-error`     | Can be used to display a submission error if the response is unsuccessful (i.e., does not have a status of `2XX`).                                                     |
+| `submitting`       | Can be used to display a message when the form is submitting. Please see the [full form example below](#example-submitting) for how to use the `submitting` attribute. |
+
+[/filter]<!-- formats="email" -->
+
 #### To render responses with templating:
 
 -   Apply a response attribute to any descendant of the `<form>` element.
@@ -126,6 +140,8 @@ When using `<amp-form>` in tandem with another templating AMP component, such as
 
 In the following example, the responses are rendered in an inline template inside the form.
 
+[filter formats="websites, ads"]
+
 ```html
 <form ...>
   <fieldset>
@@ -152,6 +168,36 @@ In the following example, the responses are rendered in an inline template insid
 </form>
 ```
 
+[/filter]<!-- formats="websites, ads" -->
+
+[filter formats="email"]
+
+```html
+<form ...>
+  <fieldset>
+    <input type="text" name="firstName" />
+    ...
+  </fieldset>
+  <div submitting>
+    Form submitting... Thank you for waiting.
+  </div>
+  <div submit-success>
+    <template type="amp-mustache">
+      Success! Thanks {{name}} for subscribing! Please make sure to check your
+      email {{email}} to confirm! After that we'll start sending you weekly
+      articles on {{#interests}}<b>{{name}}</b> {{/interests}}.
+    </template>
+  </div>
+  <div submit-error>
+    <template type="amp-mustache">
+      Oops! {{name}}, {{message}}.
+    </template>
+  </div>
+</form>
+```
+
+[/filter]<!-- formats="email" -->
+
 The publisher's `action-xhr` endpoint returns the following JSON responses:
 
 On success:
diff --git a/extensions/amp-fx-collection/0.1/amp-fx-collection.js b/extensions/amp-fx-collection/0.1/amp-fx-collection.js
index a36297b08fc1..728f22b01607 100644
--- a/extensions/amp-fx-collection/0.1/amp-fx-collection.js
+++ b/extensions/amp-fx-collection/0.1/amp-fx-collection.js
@@ -1,5 +1,4 @@
-import {AmpEvents} from '#core/constants/amp-events';
-import {iterateCursor} from '#core/dom';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
 import {tryCallback} from '#core/error';
 
 import {listen} from '#utils/event-helper';
@@ -8,7 +7,7 @@ import {devAssert} from '#utils/log';
 import {
   FxBindings,
   FxObservesSignal,
-  FxType, // eslint-disable-line no-unused-vars
+  FxType, // eslint-disable-line @typescript-eslint/no-unused-vars
   getFxTypes,
 } from './fx-type';
 import {
@@ -39,7 +38,7 @@ export class AmpFxCollection {
       // Scan when page becomes visible.
       this.scan_();
       // Rescan as DOM changes happen.
-      listen(root, AmpEvents.DOM_UPDATE, () => this.scan_());
+      listen(root, AmpEvents_Enum.DOM_UPDATE, () => this.scan_());
     });
   }
 
@@ -49,7 +48,7 @@ export class AmpFxCollection {
    */
   scan_() {
     const elements = this.ampdoc_.getRootNode().querySelectorAll('[amp-fx]');
-    iterateCursor(elements, (element) => {
+    elements.forEach((element) => {
       if (this.seen_.includes(element)) {
         return;
       }
diff --git a/extensions/amp-fx-collection/0.1/fx-type.js b/extensions/amp-fx-collection/0.1/fx-type.js
index 109bd550472c..4586cc556450 100644
--- a/extensions/amp-fx-collection/0.1/fx-type.js
+++ b/extensions/amp-fx-collection/0.1/fx-type.js
@@ -81,7 +81,7 @@ let FxBindingDef;
 
 /**
  * Include respective `FxType`s here.
- * @package @const {!Object<!FxType, !FxBindingDef>}
+ * @package @const {!{[key: !FxType]: !FxBindingDef}}
  */
 export const FxBindings = {
   [FxType.FADE_IN]: {
diff --git a/extensions/amp-fx-collection/0.1/providers/amp-fx-presets-utils.js b/extensions/amp-fx-collection/0.1/providers/amp-fx-presets-utils.js
index d11feba40184..5051f48949b6 100644
--- a/extensions/amp-fx-collection/0.1/providers/amp-fx-presets-utils.js
+++ b/extensions/amp-fx-collection/0.1/providers/amp-fx-presets-utils.js
@@ -57,7 +57,7 @@ export function resolvePercentageToNumber(val) {
  *
  * @param {Element} element
  * @param {string} fxType
- * @return {!Object<string, string>}
+ * @return {!{[key: string]: string}}
  */
 export function installStyles(element, fxType) {
   switch (fxType) {
@@ -149,7 +149,7 @@ export function defaultFlyInDistanceValues(ampdoc, fxType) {
  * Returns margin values for defaultMarginValues
  *
  * @param {string} fxType
- * @return {!Object<string, number>}
+ * @return {!{[key: string]: number}}
  */
 export function defaultMarginValues(fxType) {
   switch (fxType) {
diff --git a/extensions/amp-fx-collection/0.1/providers/amp-fx-presets.js b/extensions/amp-fx-collection/0.1/providers/amp-fx-presets.js
index da6a470398ad..f1e50ce37a15 100644
--- a/extensions/amp-fx-collection/0.1/providers/amp-fx-presets.js
+++ b/extensions/amp-fx-collection/0.1/providers/amp-fx-presets.js
@@ -120,7 +120,7 @@ function isInViewportConsideringMargins(entry, fxElement, opt_vh) {
   return !!top && top <= (1 - fxElement.marginStart) * vh;
 }
 
-/** @const {!Object<!FxType, !FxPresetDef>} */
+/** @const {!{[key: !FxType]: !FxPresetDef}} */
 export const Presets = {
   [FxType.PARALLAX]: {
     userAsserts(element) {
diff --git a/extensions/amp-fx-collection/0.1/providers/fx-provider.js b/extensions/amp-fx-collection/0.1/providers/fx-provider.js
index ede223ee32c1..699269a47cad 100644
--- a/extensions/amp-fx-collection/0.1/providers/fx-provider.js
+++ b/extensions/amp-fx-collection/0.1/providers/fx-provider.js
@@ -6,7 +6,7 @@ import {
 
 import {Services} from '#service';
 import {installPositionObserverServiceForDoc} from '#service/position-observer/position-observer-impl';
-import {PositionObserverFidelity} from '#service/position-observer/position-observer-worker';
+import {PositionObserverFidelity_Enum} from '#service/position-observer/position-observer-worker';
 
 import {devAssert} from '#utils/log';
 
@@ -25,10 +25,10 @@ import {
   getServiceForDoc,
   registerServiceBuilderForDoc,
 } from '../../../../src/service-helpers';
-import {FxType} from '../fx-type'; // eslint-disable-line no-unused-vars
+import {FxType} from '../fx-type'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import {
   ScrollToggleDispatch,
-  ScrollTogglePosition, // eslint-disable-line no-unused-vars
+  ScrollTogglePosition, // eslint-disable-line @typescript-eslint/no-unused-vars
   assertValidScrollToggleElement,
   getScrollToggleFloatInOffset,
   getScrollTogglePosition,
@@ -219,7 +219,7 @@ export class FxElement {
   observePositionChanges_() {
     this.positionObserver_.observe(
       this.element,
-      PositionObserverFidelity.HIGH,
+      PositionObserverFidelity_Enum.HIGH,
       Presets[this.fxType_].update.bind(this)
     );
 
diff --git a/extensions/amp-fx-collection/0.1/scroll-toggle.js b/extensions/amp-fx-collection/0.1/scroll-toggle.js
index 32ba82391e49..e1341f1cdf69 100644
--- a/extensions/amp-fx-collection/0.1/scroll-toggle.js
+++ b/extensions/amp-fx-collection/0.1/scroll-toggle.js
@@ -146,7 +146,7 @@ export function getScrollToggleFloatInOffset(element, isShown, position) {
 
 /**
  * @param {!Element} element
- * @param {!Object<string, string>} computedStyle
+ * @param {!{[key: string]: string}} computedStyle
  * @return {boolean}
  */
 export function assertValidScrollToggleElement(element, computedStyle) {
@@ -159,7 +159,7 @@ export function assertValidScrollToggleElement(element, computedStyle) {
 /**
  * @param {!Element} element
  * @param {string} type
- * @param {!Object<string, string>} computedStyle
+ * @param {!{[key: string]: string}} computedStyle
  * @return {?ScrollTogglePosition}
  */
 export function getScrollTogglePosition(element, type, computedStyle) {
@@ -193,7 +193,7 @@ export function installScrollToggleStyles(element) {
 }
 
 /**
- * @param {!Object<string, string>} computed
+ * @param {!{[key: string]: string}} computed
  * @param {string} prop
  * @param {string} expected
  * @param {!Element} element
diff --git a/extensions/amp-fx-collection/0.1/test/integration/test-amp-fx-fly-in.js b/extensions/amp-fx-collection/0.1/test/integration/test-amp-fx-fly-in.js
index ab72224b1a8d..016600e654fc 100644
--- a/extensions/amp-fx-collection/0.1/test/integration/test-amp-fx-fly-in.js
+++ b/extensions/amp-fx-collection/0.1/test/integration/test-amp-fx-fly-in.js
@@ -44,14 +44,12 @@ describes.sandboxed.skip('amp-fx-collection', {}, function () {
         win = env.win;
         toggleExperiment(win, 'amp-fx-fly-in', true, false);
       });
-      //TODO(esth, #19392): Fails on Firefox 63.0.0
-      it.skip('runs fly-in-left animation with default parameters', () => {
+      it('runs fly-in-left animation with default parameters', async () => {
         expect(isExperimentOn(win, 'amp-fx-fly-in')).to.be.true;
         const initialLeft = getComputedLeft(win);
         win.scrollTo(0, 0.5 * getViewportHeight(win));
-        return timeout(2000).then(() => {
-          expect(getComputedLeft(win)).to.be.above(initialLeft);
-        });
+        await timeout(2000);
+        expect(getComputedLeft(win)).to.be.above(initialLeft);
       });
     }
   );
@@ -82,14 +80,12 @@ describes.sandboxed.skip('amp-fx-collection', {}, function () {
         win = env.win;
         toggleExperiment(win, 'amp-fx-fly-in', true, false);
       });
-      //TODO(esth, #19392): Fails on Firefox 63.0.0
-      it.skip('runs fly-in-right animation with default parameters', () => {
+      it.skip('runs fly-in-right animation with default parameters', async () => {
         expect(isExperimentOn(win, 'amp-fx-fly-in')).to.be.true;
         const initialLeft = getComputedLeft(win);
         win.scrollTo(0, 0.5 * getViewportHeight(win));
-        return timeout(2000).then(() => {
-          expect(getComputedLeft(win)).to.be.below(initialLeft);
-        });
+        await timeout(2000);
+        expect(getComputedLeft(win)).to.be.below(initialLeft);
       });
     }
   );
diff --git a/extensions/amp-fx-flying-carpet/0.1/amp-fx-flying-carpet.css b/extensions/amp-fx-flying-carpet/0.1/amp-fx-flying-carpet.css
index 09cd0a9773be..e3b3e083137e 100644
--- a/extensions/amp-fx-flying-carpet/0.1/amp-fx-flying-carpet.css
+++ b/extensions/amp-fx-flying-carpet/0.1/amp-fx-flying-carpet.css
@@ -32,11 +32,6 @@ amp-fx-flying-carpet > .i-amphtml-fx-flying-carpet-clip > .i-amphtml-fx-flying-c
   top: 0 !important;
   width: 100%;
   height: 100%;
-  /*
-   * Included to force slow webkit browsers (Android) into rendering the
-   * container using the GPU.
-   */
-  -webkit-transform: translateZ(0) !important;
 
   /* Center contents in the container */
   display: flex;
@@ -45,6 +40,14 @@ amp-fx-flying-carpet > .i-amphtml-fx-flying-carpet-clip > .i-amphtml-fx-flying-c
   justify-content: center;
 }
 
+/*
+ * Included to force slow webkit browsers (Android) into rendering the
+ * container using the GPU.
+ */
+amp-fx-flying-carpet > .i-amphtml-fx-flying-carpet-clip > .i-amphtml-fx-flying-carpet-container.i-amphtml-fx-flying-carpet-container-fix {
+  -webkit-transform: translateZ(0) !important;
+}
+
 .i-amphtml-fx-flying-carpet-container > .i-amphtml-layout-responsive,
 .i-amphtml-fx-flying-carpet-container > .i-amphtml-layout-fixed-height {
   align-self: stretch;
diff --git a/extensions/amp-fx-flying-carpet/0.1/amp-fx-flying-carpet.js b/extensions/amp-fx-flying-carpet/0.1/amp-fx-flying-carpet.js
index 60d6e00f489e..592eb8e9e1db 100644
--- a/extensions/amp-fx-flying-carpet/0.1/amp-fx-flying-carpet.js
+++ b/extensions/amp-fx-flying-carpet/0.1/amp-fx-flying-carpet.js
@@ -1,5 +1,5 @@
-import {CommonSignals} from '#core/constants/common-signals';
-import {Layout} from '#core/dom/layout';
+import {CommonSignals_Enum} from '#core/constants/common-signals';
+import {Layout_Enum} from '#core/dom/layout';
 import {realChildElements, realChildNodes} from '#core/dom/query';
 import {setStyle} from '#core/dom/style';
 
@@ -50,7 +50,7 @@ export class AmpFlyingCarpet extends AMP.BaseElement {
 
   /** @override */
   isLayoutSupported(layout) {
-    return layout == Layout.FIXED_HEIGHT;
+    return layout == Layout_Enum.FIXED_HEIGHT;
   }
 
   /** @override */
@@ -143,9 +143,28 @@ export class AmpFlyingCarpet extends AMP.BaseElement {
       this.children_
     );
     this.observeNewChildren_();
+    this.forceClipDraw_();
     return Promise.resolve();
   }
 
+  /**
+   * Something causes browsers to forget to redraw the content of the container when they become visible.
+   * @private
+   */
+  forceClipDraw_() {
+    const inob = new this.win.IntersectionObserver(
+      (entries) => {
+        const last = entries[entries.length - 1];
+        this.container_.classList.toggle(
+          'i-amphtml-fx-flying-carpet-container-fix',
+          last.isIntersecting
+        );
+      },
+      {threshold: 0.01}
+    );
+    inob.observe(this.element);
+  }
+
   /**
    * Makes sure we schedule layout for elements as they are added
    * to the flying carpet.
@@ -165,7 +184,7 @@ export class AmpFlyingCarpet extends AMP.BaseElement {
           }
           node
             .signals()
-            .whenSignal(CommonSignals.BUILT)
+            .whenSignal(CommonSignals_Enum.BUILT)
             .then(this.layoutBuiltChild_.bind(this, node));
         }
       }
diff --git a/extensions/amp-geo/0.1/amp-geo-presets.js b/extensions/amp-geo/0.1/amp-geo-presets.js
index 7514b4c4d44d..7066c0144ec6 100644
--- a/extensions/amp-geo/0.1/amp-geo-presets.js
+++ b/extensions/amp-geo/0.1/amp-geo-presets.js
@@ -22,6 +22,7 @@ export const ampGeoPresets = {
     'AT', // Austria
     'BE', // Belgium
     'BG', // Bulgaria
+    'CQ', // Sark
     'HR', // Croatia
     'CY', // Cyprus
     'CZ', // Czech Republic
diff --git a/extensions/amp-geo/0.1/amp-geo.js b/extensions/amp-geo/0.1/amp-geo.js
index b35ff3cb53fe..65ed9f5ecc81 100644
--- a/extensions/amp-geo/0.1/amp-geo.js
+++ b/extensions/amp-geo/0.1/amp-geo.js
@@ -20,12 +20,12 @@
  */
 
 import {Deferred} from '#core/data-structures/promise';
-import {isJsonScriptTag} from '#core/dom';
+import {isJsonScriptTag, iterateCursor} from '#core/dom';
 import {isArray, isObject} from '#core/types';
 import {tryParseJson} from '#core/types/object/json';
 import {getHashParams} from '#core/types/string/url';
 
-import {isCanary} from '#experiments';
+import {isCanary, isExperimentOn} from '#experiments';
 
 import {Services} from '#service';
 
@@ -39,9 +39,9 @@ import {Services} from '#service';
 import {dev, user, userAssert} from '#utils/log';
 
 import {GEO_IN_GROUP} from './amp-geo-in-group';
-import {US_CA_CODE, ampGeoPresets} from './amp-geo-presets';
+import {ampGeoPresets} from './amp-geo-presets';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {getMode} from '../../../src/mode';
 
 /** @const */
@@ -56,12 +56,21 @@ const TAG = 'amp-geo';
  */
 const COUNTRY = '{{AMP_ISO_COUNTRY_HOTPATCH}}';
 const COUNTRY_PREFIX = 'amp-iso-country-';
+const SUBDIVISION_PREFIX = 'amp-iso-subdivision-';
 const GROUP_PREFIX = 'amp-geo-group-';
 const PRE_RENDER_REGEX = new RegExp(`${COUNTRY_PREFIX}(\\w+)`);
+const PRE_RENDER_SUBDIVISION_REGEX = new RegExp(
+  `${SUBDIVISION_PREFIX}(\\w{2}-\\w{1,3})`
+);
 const GEO_ID = 'ampGeo';
 const SERVICE_TAG = 'geo';
 const API_TIMEOUT = 60; // Seconds
-const GEO_HOTPATCH_STR_REGEX = /^(?:(\w{2})(?:\s(\w{2}-\w{2}))?)?\s*/;
+const GEO_HOTPATCH_STR_REGEX = /^(?:(\w{2})(?:\s(\w{2}-\w{1,3}))?)?\s*/;
+
+const STRIP_RE = new RegExp(
+  '^' + COUNTRY_PREFIX + '|^' + GROUP_PREFIX + '|^' + SUBDIVISION_PREFIX,
+  'i'
+);
 
 /**
  * Operating Mode
@@ -74,10 +83,13 @@ const mode = {
   GEO_API: 3, //       Query API when cache patching unavailable
 };
 
+const VALUE_UNKNOWN = 'unknown';
+
 // TODO(zhouyx@): Rename if we have generic subdivision group support
 /**
  * @typedef {{
  *   ISOCountry: string,
+ *   ISOSubdivision: string,
  *   matchedISOCountryGroups: !Array<string>,
  *   allISOCountryGroups: !Array<string>,
  *   isInCountryGroup: (function(string):GEO_IN_GROUP),
@@ -86,7 +98,7 @@ const mode = {
 export let GeoDef;
 
 export class AmpGeo extends AMP.BaseElement {
-  /** @override @nocollapse */
+  /** @override  */
   static prerenderAllowed() {
     return true;
   }
@@ -100,9 +112,9 @@ export class AmpGeo extends AMP.BaseElement {
     /** @private {boolean} */
     this.error_ = false;
     /** @private {string} */
-    this.country_ = 'unknown';
+    this.country_ = VALUE_UNKNOWN;
     /** @private {string} */
-    this.subdivision_ = 'unknown';
+    this.subdivision_ = VALUE_UNKNOWN;
     /** @private {Array<string>} */
     this.matchedGroups_ = [];
     /** @private {Array<string>} */
@@ -129,7 +141,7 @@ export class AmpGeo extends AMP.BaseElement {
       : {};
 
     /** @type {!Promise<!GeoDef>} */
-    const geo = this.addToBody_(config || {});
+    const geo = this.addToHtmlAndBody_(config || {});
 
     /* resolve the service promise singleton we stashed earlier */
     geoDeferred.resolve(geo);
@@ -153,14 +165,32 @@ export class AmpGeo extends AMP.BaseElement {
     return shouldBeTrueish;
   }
 
+  /**
+   * @return {string}
+   * @private
+   */
+  getHotPatchCountry_() {
+    return COUNTRY;
+  }
+
   /**
    * findCountry_, sets this.country_ and this.mode_
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
    * @return {Promise}
    */
   findCountry_(ampdoc) {
+    const bodyElem = ampdoc.getBody();
+    /** @type {?Element|undefined} */
+    const docElem = ampdoc.getRootNode().documentElement;
     // Flag to see if we've been pre-rendered with a country
-    const preRenderMatch = ampdoc.getBody().className.match(PRE_RENDER_REGEX);
+    // Prioritize the prerender hinting classes found in `html` over `body`
+    // though we do not drop support for detecting in `body` for backwards
+    // compatibility. We make sure that docElem exists at it can be undefined
+    // in shadow mode.
+    const preRenderMatch =
+      docElem?.className.match(PRE_RENDER_REGEX) ||
+      bodyElem.className.match(PRE_RENDER_REGEX);
+
     // Trim the spaces off the patched country.
     // This is guaranteed to always match
     // - Correctly patched will have the two-char country code and whitespace.
@@ -172,7 +202,9 @@ export class AmpGeo extends AMP.BaseElement {
     // 'xx xx-xx  ': trimmedGeoMatch is ["xx xx-xx  ", "xx", "xx-xx"];
     // '          ': trimmedGeoMatch is ["          ", undefined, undefined];
     // '{{AMP_ISO_COUNTRY_HOTPATCH}}':  ["", undefined, undefined]
-    const trimmedGeoMatch = GEO_HOTPATCH_STR_REGEX.exec(COUNTRY);
+    const trimmedGeoMatch = GEO_HOTPATCH_STR_REGEX.exec(
+      this.getHotPatchCountry_()
+    );
 
     // default country is 'unknown' which is also the zero length case
     const geoOverride = getHashParams(this.win)['amp-geo'];
@@ -182,34 +214,39 @@ export class AmpGeo extends AMP.BaseElement {
       const overrideGeoMatch = GEO_HOTPATCH_STR_REGEX.exec(
         geoOverride.toLowerCase()
       );
+
       if (overrideGeoMatch[1]) {
         this.country_ = overrideGeoMatch[1];
+
         if (overrideGeoMatch[2]) {
-          // Allow subdivision_ to be customized for testing, not checking us-ca
           this.subdivision_ = overrideGeoMatch[2];
         }
+
         this.mode_ = mode.GEO_OVERRIDE;
       }
     } else if (
       preRenderMatch &&
-      !Services.urlForDoc(this.element).isProxyOrigin(this.win.location)
+      (!Services.urlForDoc(this.element).isProxyOrigin(this.win.location) ||
+        isExperimentOn(this.win, 'amp-geo-ssr'))
     ) {
-      // pre-rendered by a publisher case, if we're a cache we ignore that
-      // since there is no way the publisher could know the geo of the client.
-      // When caches start pre-rendering geo we'll need to add specifc code
-      // to handle that.
+      // pre-rendered by a publisher case or cache case.
       this.mode_ = mode.GEO_PRERENDER;
       this.country_ = preRenderMatch[1];
+
+      const preRenderSubdivisionMatch =
+        docElem?.className.match(PRE_RENDER_SUBDIVISION_REGEX) ||
+        bodyElem.className.match(PRE_RENDER_SUBDIVISION_REGEX);
+
+      if (preRenderSubdivisionMatch) {
+        this.subdivision_ = preRenderSubdivisionMatch[1];
+      }
     } else if (trimmedGeoMatch[1]) {
       // We have a valid 2 letter ISO country
       this.mode_ = mode.GEO_HOT_PATCH;
       this.country_ = trimmedGeoMatch[1].toLowerCase();
-      if (
-        trimmedGeoMatch[2] &&
-        trimmedGeoMatch[2].toLowerCase() === US_CA_CODE
-      ) {
-        // Has subdivision code support (us-ca only)
-        this.subdivision_ = US_CA_CODE;
+
+      if (trimmedGeoMatch[2]) {
+        this.subdivision_ = trimmedGeoMatch[2].toLowerCase();
       }
     } else if (trimmedGeoMatch[0] === '' && urls.geoApi) {
       // We were not patched, but an API is available
@@ -231,9 +268,9 @@ export class AmpGeo extends AMP.BaseElement {
             const {country, subdivision} = data;
             // Country is required and guaranteed to exist if data is available.
             this.country_ = country;
-            // Subdivision is optional and only us-ca is currently supported.
-            if (subdivision && `${country}-${subdivision}` === US_CA_CODE) {
-              this.subdivision_ = US_CA_CODE;
+
+            if (subdivision) {
+              this.subdivision_ = `${country}-${subdivision}`;
             }
           } else {
             // if API request fails, leave the country at the default 'unknown'
@@ -303,7 +340,7 @@ export class AmpGeo extends AMP.BaseElement {
    *   "subdivision": "ca"
    * }
    *
-   * @return {Promise<?Object.<string, ?string>>}
+   * @return {Promise<?{[key: string]: ?string}>}
    * @private
    */
   fetchCountry_() {
@@ -356,11 +393,11 @@ export class AmpGeo extends AMP.BaseElement {
 
   /**
    * Find matching country groups
-   * @param {Object} config
+   * @param {object} config
    */
   matchCountryGroups_(config) {
     // ISOCountryGroups are optional but if specified at least one must exist
-    const ISOCountryGroups = /** @type {!Object<string, !Array<string>>} */ (
+    const ISOCountryGroups = /** @type {!{[key: string]: !Array<string>}} */ (
       config['ISOCountryGroups']
     );
     const errorPrefix = '<amp-geo> ISOCountryGroups'; // code size
@@ -404,10 +441,15 @@ export class AmpGeo extends AMP.BaseElement {
             isArray(ampGeoPresets[country]),
             `<amp-geo> preset ${country} not found`
           );
+
           return countries.concat(ampGeoPresets[country]);
         }
+
         // Otherwise we add the country to the list
-        if (country == 'unknown' || /^[a-zA-Z]{2}$/.test(country)) {
+        if (
+          country === VALUE_UNKNOWN ||
+          /^[a-zA-Z]{2}(?:-[0-9a-zA-Z]{1,3})?$/.test(country)
+        ) {
           countries.push(country);
         } else {
           user().error(TAG, ' country %s not valid, will be ignored', country);
@@ -417,40 +459,50 @@ export class AmpGeo extends AMP.BaseElement {
       .map((c) => c.toLowerCase());
     return (
       expandedGroup.includes(this.country_) ||
-      (expandedGroup.includes(US_CA_CODE) && this.subdivision_ == US_CA_CODE)
+      (this.subdivision_ !== VALUE_UNKNOWN &&
+        expandedGroup.includes(this.subdivision_))
     );
   }
 
   /**
    * clearPreRender_()
    * Returns a list of classes to remove if pre-render has
-   * been invalidated by way of being on an amp cache
-   * @param {Element} body
-   * @return {Array<string>}
+   * been invalidated by way of an override.
+   * @param {!Element} body
+   * @param {?Element|undefined} docElem
+   * @return {!Array<string>}
    */
-  clearPreRender_(body) {
-    const {classList} = body;
-    const classesToRemove = [];
-    const stripRe = new RegExp('^' + COUNTRY_PREFIX + '|^' + GROUP_PREFIX, 'i');
-    for (let i = classList.length - 1; i > 0; i--) {
-      if (stripRe.test(classList[i])) {
-        classesToRemove.push(classList[i]);
-      }
+  clearPreRender_(body, docElem) {
+    const classesToRemove = new Set();
+
+    if (docElem) {
+      const {classList: docElemClassList} = docElem;
+      iterateCursor(docElemClassList, (el) => {
+        if (STRIP_RE.test(el)) {
+          classesToRemove.add(el);
+        }
+      });
     }
+
+    const {classList: bodyClassList} = body;
+    iterateCursor(bodyClassList, (el) => {
+      if (STRIP_RE.test(el)) {
+        classesToRemove.add(el);
+      }
+    });
     return classesToRemove;
   }
 
   /**
    * Adds the given country groups to HTML element as classes
-   * @param {Object} config
+   * @param {object} config
    * @return {!Promise<!GeoDef>} service response
    * @private
    */
-  addToBody_(config) {
+  addToHtmlAndBody_(config) {
     const ampdoc = this.getAmpDoc();
-    /** @type {Object} */
+    /** @type {object} */
     const states = {};
-    const self = this;
 
     // Wait for the body before we figure anything out because we might be
     // prerendered and we know that from body classes
@@ -458,51 +510,70 @@ export class AmpGeo extends AMP.BaseElement {
       .whenReady()
       .then(() => ampdoc.waitForBodyOpen())
       .then((body) => {
-        return self.findCountry_(ampdoc).then(() => body);
+        return this.findCountry_(ampdoc).then(() => body);
       })
       .then((body) => {
-        self.matchCountryGroups_(config);
+        /** @type {?Element|undefined} */
+        const docElem = ampdoc.getRootNode().documentElement;
+        this.matchCountryGroups_(config);
 
-        let classesToRemove = [];
+        let classesToRemove = new Set();
 
-        switch (self.mode_) {
+        switch (this.mode_) {
           case mode.GEO_OVERRIDE:
-            classesToRemove = self.clearPreRender_(body);
+            classesToRemove = this.clearPreRender_(body, docElem);
           // Intentionally fall through.
           case mode.GEO_HOT_PATCH:
           case mode.GEO_API:
             // Build the AMP State, add classes
-            states.ISOCountry = self.country_;
+            states.ISOCountry = this.country_;
+            states.ISOSubdivision = this.subdivision_;
 
-            const classesToAdd = self.matchedGroups_.map((group) => {
+            const classesToAdd = this.matchedGroups_.map((group) => {
               states[group] = true;
               return GROUP_PREFIX + group;
             });
 
-            if (!self.matchedGroups_.length) {
+            if (!this.matchedGroups_.length) {
               classesToAdd.push('amp-geo-no-group');
             }
 
-            if (self.error_) {
+            if (this.error_) {
               classesToAdd.push('amp-geo-error');
             }
 
-            states.ISOCountryGroups = self.matchedGroups_;
+            states.ISOCountryGroups = this.matchedGroups_;
             classesToAdd.push(COUNTRY_PREFIX + this.country_);
 
+            if (this.subdivision_ !== VALUE_UNKNOWN) {
+              classesToAdd.push(SUBDIVISION_PREFIX + this.subdivision_);
+            }
+
             // Let the runtime know we're mutating the AMP body
             // Actual change happens in callback so runtime can
             // optimize dom mutations.
-            self.mutateElement(() => {
-              const {classList} = body;
+            this.mutateElement(() => {
+              const docElemClassList = docElem && docElem.classList;
+              const {classList: bodyClassList} = body;
               // Always remove the pending class
-              classesToRemove.push('amp-geo-pending');
+              classesToRemove.add('amp-geo-pending');
               classesToRemove.forEach((toRemove) => {
-                /** @type {!DOMTokenList} */ (classList).remove(toRemove);
+                /** @type {!DOMTokenList} */ (bodyClassList).remove(toRemove);
+
+                if (docElemClassList) {
+                  /** @type {!DOMTokenList} */ (docElemClassList).remove(
+                    toRemove
+                  );
+                }
               });
 
-              // add the new classes to <body>
-              classesToAdd.forEach((toAdd) => classList.add(toAdd));
+              // add the new classes to <html> and <<body>
+              classesToAdd.forEach((toAdd) => {
+                if (docElemClassList) {
+                  docElemClassList.add(toAdd);
+                }
+                bodyClassList.add(toAdd);
+              });
 
               // Only include amp state if user requests it to
               // avoid validator issue with missing amp-bind js
@@ -521,7 +592,7 @@ export class AmpGeo extends AMP.BaseElement {
                 state.id = GEO_ID;
                 body.appendChild(state);
               }
-            }, body);
+            }, docElem);
 
             break;
           case mode.GEO_PRERENDER:
@@ -529,8 +600,9 @@ export class AmpGeo extends AMP.BaseElement {
         }
 
         return {
-          ISOCountry: self.country_,
-          matchedISOCountryGroups: self.matchedGroups_,
+          ISOCountry: this.country_,
+          ISOSubdivision: this.subdivision_,
+          matchedISOCountryGroups: this.matchedGroups_,
           allISOCountryGroups: this.definedGroups_,
           /* API */
           isInCountryGroup: this.isInCountryGroup.bind(this),
diff --git a/extensions/amp-geo/0.1/test/test-amp-geo.js b/extensions/amp-geo/0.1/test/test-amp-geo.js
index bb04e1815dc2..1f1fe94928ec 100644
--- a/extensions/amp-geo/0.1/test/test-amp-geo.js
+++ b/extensions/amp-geo/0.1/test/test-amp-geo.js
@@ -3,7 +3,7 @@ import {vsyncForTesting} from '#service/vsync-impl';
 
 import {user} from '#utils/log';
 
-import {urls} from '../../../../src/config';
+import * as urls from '../../../../src/config/urls';
 import {AmpGeo} from '../amp-geo';
 import {GEO_IN_GROUP} from '../amp-geo-in-group';
 
@@ -16,7 +16,7 @@ describes.realWin(
   },
   (env) => {
     const expectedState =
-      '<amp-state id="ampGeo"><script type="application/json">{"ISOCountry":"unknown","nafta":true,"unknown":true,"ISOCountryGroups":["nafta","unknown"]}</script></amp-state>';
+      '<amp-state id="ampGeo"><script type="application/json">{"ISOCountry":"unknown","ISOSubdivision":"unknown","nafta":true,"unknown":true,"ISOCountryGroups":["nafta","unknown"]}</script></amp-state>';
 
     const config = {
       ISOCountryGroups: {
@@ -24,6 +24,11 @@ describes.realWin(
         unknown: ['unknown'],
         eea: ['preset-eea'],
         myGroup: ['preset-eea', 'us'],
+        usSubdivisions: ['us-al', 'us-ny', 'us-va', 'us-co', 'us-ct'],
+        usVA: ['us-va'],
+        usCO: ['us-co'],
+        usCT: ['us-ct'],
+        canadaSubdivisions: ['ca-mb', 'ca-nb'],
         anz: ['au', 'nz'],
         uscaGroup: ['preset-us-ca'],
       },
@@ -43,6 +48,7 @@ describes.realWin(
         nafta: ['CA', 'mx', 'us', 'unknown'],
         unknown: ['unknown'],
         anz: ['au', 'NZ'],
+        canadaSubdivision: ['CA-MB'],
       },
     };
 
@@ -52,7 +58,10 @@ describes.realWin(
         unknown: ['unknown'],
         anz: ['au', 'NZ'],
         uscaGroup: ['preset-us-ca'],
-        invalid: ['us-ca'],
+        california: ['us-ca'],
+        tatarstan: ['ru-ta'],
+        myGroup: ['ru'],
+        invalid: ['ru-svee'],
       },
     };
 
@@ -95,9 +104,15 @@ describes.realWin(
       geo.element.appendChild(child);
     }
 
-    function expectBodyHasClass(klasses, expected) {
+    function expectElementHasClass(target, klasses, expected) {
       for (const k in klasses) {
-        expect(doc.body.classList.contains(klasses[k])).to.equal(expected);
+        const klass = klasses[k];
+        expect(target.classList.contains(klass)).to.equal(
+          expected,
+          expected
+            ? `missing ${klass} class for ${target.tagName}`
+            : `should not have ${klass} class for ${target.tagName}`
+        );
       }
     }
 
@@ -116,30 +131,68 @@ describes.realWin(
       expect(userErrorStub).to.not.be.called;
     });
 
-    it('should add classes to body element for the geo', () => {
+    it('should be able to handle `documentElement` being null (shadow mode instances)', () => {
+      env.sandbox.stub(ampdoc, 'getRootNode').returns({});
+      addConfigElement('script');
+
+      geo.buildCallback();
+      return Services.geoForDocOrNull(el).then((geo) => {
+        expect(geo.ISOCountry).to.equal('unknown');
+        expectElementHasClass(
+          doc.body,
+          ['amp-iso-country-unknown', 'amp-geo-group-nafta'],
+          true
+        );
+        expectElementHasClass(
+          doc.body,
+          ['amp-iso-country-nz', 'amp-geo-group-anz'],
+          false
+        );
+      });
+    });
+
+    it('should add classes to html and body element for the geo', () => {
       addConfigElement('script');
 
       geo.buildCallback();
       return Services.geoForDocOrNull(el).then((geo) => {
         expect(geo.ISOCountry).to.equal('unknown');
-        expectBodyHasClass(
+        expectElementHasClass(
+          doc.body,
+          ['amp-iso-country-unknown', 'amp-geo-group-nafta'],
+          true
+        );
+        expectElementHasClass(
+          doc.documentElement,
           ['amp-iso-country-unknown', 'amp-geo-group-nafta'],
           true
         );
-        expectBodyHasClass(['amp-iso-country-nz', 'amp-geo-group-anz'], false);
+        expectElementHasClass(
+          doc.body,
+          ['amp-iso-country-nz', 'amp-geo-group-anz'],
+          false
+        );
+        expectElementHasClass(
+          doc.documentElement,
+          ['amp-iso-country-nz', 'amp-geo-group-anz'],
+          false
+        );
       });
     });
 
-    it('should remove amp-geo-pending class from body element', () => {
+    it('should remove amp-geo-pending class from html and body element', () => {
       addConfigElement('script');
+      doc.documentElement.classList.add('amp-geo-pending');
       doc.body.classList.add('amp-geo-pending');
 
-      expectBodyHasClass(['amp-geo-pending'], true);
+      expectElementHasClass(doc.body, ['amp-geo-pending'], true);
+      expectElementHasClass(doc.documentElement, ['amp-geo-pending'], true);
 
       geo.buildCallback();
       return Services.geoForDocOrNull(el).then((geo) => {
         expect(geo.ISOCountry).to.equal('unknown');
-        expectBodyHasClass(['amp-geo-pending'], false);
+        expectElementHasClass(doc.body, ['amp-geo-pending'], false);
+        expectElementHasClass(doc.documentElement, ['amp-geo-pending'], false);
       });
     });
 
@@ -180,8 +233,29 @@ describes.realWin(
 
       return Services.geoForDocOrNull(el).then((geo) => {
         expect(geo.ISOCountry).to.equal('nz');
-        expectBodyHasClass(['amp-iso-country-nz', 'amp-geo-group-anz'], true);
-        expectBodyHasClass(
+        expectElementHasClass(
+          doc.body,
+          ['amp-iso-country-nz', 'amp-geo-group-anz'],
+          true
+        );
+        expectElementHasClass(
+          doc.documentElement,
+          ['amp-iso-country-nz', 'amp-geo-group-anz'],
+          true
+        );
+        expectElementHasClass(
+          doc.body,
+          [
+            'amp-iso-country-unknown',
+            'amp-geo-group-nafta',
+            'amp-geo-no-group',
+            'amp-geo-group-eea',
+            'amp-geo-group-myGroup',
+          ],
+          false
+        );
+        expectElementHasClass(
+          doc.documentElement,
           [
             'amp-iso-country-unknown',
             'amp-geo-group-nafta',
@@ -201,16 +275,36 @@ describes.realWin(
 
       return Services.geoForDocOrNull(el).then((geo) => {
         expect(geo.ISOCountry).to.equal('us');
-        expectBodyHasClass(
+
+        expectElementHasClass(
+          doc.body,
           [
             'amp-iso-country-us',
             'amp-geo-group-nafta',
             'amp-geo-group-myGroup',
             'amp-geo-group-uscaGroup',
+            'amp-iso-subdivision-us-ca',
           ],
           true
         );
-        expectBodyHasClass(
+        expectElementHasClass(
+          doc.documentElement,
+          [
+            'amp-iso-country-us',
+            'amp-geo-group-nafta',
+            'amp-geo-group-myGroup',
+            'amp-geo-group-uscaGroup',
+            'amp-iso-subdivision-us-ca',
+          ],
+          true
+        );
+        expectElementHasClass(
+          doc.body,
+          ['amp-iso-country-unknown', 'amp-geo-no-group', 'amp-geo-group-eea'],
+          false
+        );
+        expectElementHasClass(
+          doc.documentElement,
           ['amp-iso-country-unknown', 'amp-geo-no-group', 'amp-geo-group-eea'],
           false
         );
@@ -224,15 +318,26 @@ describes.realWin(
 
       return Services.geoForDocOrNull(el).then((geo) => {
         expect(geo.ISOCountry).to.equal('fr');
-        expectBodyHasClass(
+        expectElementHasClass(
+          doc.body,
+          ['amp-iso-country-fr', 'amp-geo-group-eea', 'amp-geo-group-myGroup'],
+          true
+        );
+        expectElementHasClass(
+          doc.documentElement,
           ['amp-iso-country-fr', 'amp-geo-group-eea', 'amp-geo-group-myGroup'],
           true
         );
-        expectBodyHasClass([, 'amp-geo-no-group'], false);
+        expectElementHasClass(doc.body, [, 'amp-geo-no-group'], false);
+        expectElementHasClass(
+          doc.documentElement,
+          [, 'amp-geo-no-group'],
+          false
+        );
       });
     });
 
-    it('should allow preset-us-ca, but not us-ca', () => {
+    it('should allow preset-us-ca and us-ca subdivision', () => {
       setGeoOverrideHash('us us-ca');
       addConfigElement(
         'script',
@@ -241,9 +346,249 @@ describes.realWin(
       );
       geo.buildCallback();
 
-      return Services.geoForDocOrNull(el).then(() => {
-        expectBodyHasClass(['amp-geo-group-uscaGroup'], true);
-        expectBodyHasClass(['amp-geo-group-invalid'], false);
+      return Services.geoForDocOrNull(el).then((geo) => {
+        expect(geo.ISOSubdivision).to.equal('us-ca');
+        expectElementHasClass(
+          doc.body,
+          [
+            'amp-geo-group-uscaGroup',
+            'amp-geo-group-california',
+            'amp-iso-subdivision-us-ca',
+          ],
+          true
+        );
+        expectElementHasClass(
+          doc.documentElement,
+          [
+            'amp-geo-group-uscaGroup',
+            'amp-geo-group-california',
+            'amp-iso-subdivision-us-ca',
+          ],
+          true
+        );
+      });
+    });
+
+    it('should allow us-co subdivision', () => {
+      setGeoOverrideHash('us us-co');
+      addConfigElement('script', 'application/json', JSON.stringify(config));
+      geo.buildCallback();
+
+      return Services.geoForDocOrNull(el).then((geo) => {
+        expect(geo.ISOSubdivision).to.equal('us-co');
+        expectElementHasClass(
+          doc.body,
+          [
+            'amp-geo-group-usCO',
+            'amp-geo-group-usSubdivisions',
+            'amp-iso-subdivision-us-co',
+          ],
+          true
+        );
+        expectElementHasClass(
+          doc.documentElement,
+          [
+            'amp-geo-group-usCO',
+            'amp-geo-group-usSubdivisions',
+            'amp-iso-subdivision-us-co',
+          ],
+          true
+        );
+      });
+    });
+
+    it('should allow us-ct subdivision', () => {
+      setGeoOverrideHash('us us-ct');
+      addConfigElement('script', 'application/json', JSON.stringify(config));
+      geo.buildCallback();
+
+      return Services.geoForDocOrNull(el).then((geo) => {
+        expect(geo.ISOSubdivision).to.equal('us-ct');
+        expectElementHasClass(
+          doc.body,
+          [
+            'amp-geo-group-usCT',
+            'amp-geo-group-usSubdivisions',
+            'amp-iso-subdivision-us-ct',
+          ],
+          true
+        );
+        expectElementHasClass(
+          doc.documentElement,
+          [
+            'amp-geo-group-usCT',
+            'amp-geo-group-usSubdivisions',
+            'amp-iso-subdivision-us-ct',
+          ],
+          true
+        );
+      });
+    });
+
+    it('should allow us-va subdivision', () => {
+      setGeoOverrideHash('us us-va');
+      addConfigElement('script', 'application/json', JSON.stringify(config));
+      geo.buildCallback();
+
+      return Services.geoForDocOrNull(el).then((geo) => {
+        expect(geo.ISOSubdivision).to.equal('us-va');
+        expectElementHasClass(
+          doc.body,
+          [
+            'amp-geo-group-usVA',
+            'amp-geo-group-usSubdivisions',
+            'amp-iso-subdivision-us-va',
+          ],
+          true
+        );
+        expectElementHasClass(
+          doc.documentElement,
+          [
+            'amp-geo-group-usVA',
+            'amp-geo-group-usSubdivisions',
+            'amp-iso-subdivision-us-va',
+          ],
+          true
+        );
+      });
+    });
+
+    it('should allow ru-ta subdivision', () => {
+      setGeoOverrideHash('ru ru-ta');
+      addConfigElement(
+        'script',
+        'application/json',
+        JSON.stringify(configWithInvalidCountry)
+      );
+      geo.buildCallback();
+
+      return Services.geoForDocOrNull(el).then((geo) => {
+        expect(geo.ISOSubdivision).to.equal('ru-ta');
+        expectElementHasClass(
+          doc.body,
+          ['amp-geo-group-myGroup', 'amp-geo-group-tatarstan'],
+          true
+        );
+        expectElementHasClass(
+          doc.documentElement,
+          ['amp-geo-group-myGroup', 'amp-geo-group-tatarstan'],
+          true
+        );
+      });
+    });
+
+    it('should allow subdivisions that have max 3 symbol length', () => {
+      setGeoOverrideHash('ru ru-svee');
+      addConfigElement(
+        'script',
+        'application/json',
+        JSON.stringify(configWithInvalidCountry)
+      );
+      geo.buildCallback();
+
+      return Services.geoForDocOrNull(el).then((geo) => {
+        expect(geo.ISOSubdivision).to.equal('ru-sve');
+        expectElementHasClass(
+          doc.body,
+          ['amp-geo-group-myGroup', 'amp-iso-subdivision-ru-sve'],
+          true
+        );
+        expectElementHasClass(
+          doc.documentElement,
+          ['amp-geo-group-myGroup', 'amp-iso-subdivision-ru-sve'],
+          true
+        );
+        expectElementHasClass(doc.body, ['amp-geo-group-invalid'], false);
+        expectElementHasClass(
+          doc.documentElement,
+          ['amp-geo-group-invalid'],
+          false
+        );
+      });
+    });
+
+    it('Should support Canada subdivisions', () => {
+      setGeoOverrideHash('ca ca-mb');
+      addConfigElement('script');
+      geo.buildCallback();
+
+      return Services.geoForDocOrNull(el).then((geo) => {
+        expect(geo.ISOSubdivision).to.equal('ca-mb');
+        expectElementHasClass(
+          doc.body,
+          [
+            'amp-geo-group-nafta',
+            'amp-geo-group-canadaSubdivisions',
+            'amp-iso-subdivision-ca-mb',
+            'amp-iso-country-ca',
+          ],
+          true
+        );
+        expectElementHasClass(
+          doc.documentElement,
+          [
+            'amp-geo-group-nafta',
+            'amp-geo-group-canadaSubdivisions',
+            'amp-iso-subdivision-ca-mb',
+            'amp-iso-country-ca',
+          ],
+          true
+        );
+
+        expectElementHasClass(
+          doc.body,
+          [
+            'amp-geo-group-usSubdivisions',
+            'amp-geo-group-myGroup',
+            'amp-geo-group-uscaGroup',
+            'amp-geo-group-anz',
+            'amp-geo-group-eea',
+            'amp-geo-group-unknown',
+          ],
+          false
+        );
+        expectElementHasClass(
+          doc.documentElement,
+          [
+            'amp-geo-group-usSubdivisions',
+            'amp-geo-group-myGroup',
+            'amp-geo-group-uscaGroup',
+            'amp-geo-group-anz',
+            'amp-geo-group-eea',
+            'amp-geo-group-unknown',
+          ],
+          false
+        );
+      });
+    });
+
+    it('Should support US subdivisions', () => {
+      setGeoOverrideHash('us us-ny');
+      addConfigElement('script');
+      geo.buildCallback();
+
+      return Services.geoForDocOrNull(el).then((geo) => {
+        expect(geo.ISOSubdivision).to.equal('us-ny');
+        expectElementHasClass(
+          doc.body,
+          [
+            'amp-geo-group-nafta',
+            'amp-geo-group-usSubdivisions',
+            'amp-iso-subdivision-us-ny',
+            'amp-iso-country-us',
+          ],
+          true
+        );
+        expectElementHasClass(
+          doc.documentElement,
+          [
+            'amp-geo-group-nafta',
+            'amp-geo-group-usSubdivisions',
+            'amp-iso-subdivision-us-ny',
+            'amp-iso-country-us',
+          ],
+          true
+        );
       });
     });
 
@@ -254,8 +599,27 @@ describes.realWin(
 
       return Services.geoForDocOrNull(el).then((geo) => {
         expect(geo.ISOCountry).to.equal('za');
-        expectBodyHasClass(['amp-iso-country-za', 'amp-geo-no-group'], true);
-        expectBodyHasClass(
+        expectElementHasClass(
+          doc.body,
+          ['amp-iso-country-za', 'amp-geo-no-group'],
+          true
+        );
+        expectElementHasClass(
+          doc.documentElement,
+          ['amp-iso-country-za', 'amp-geo-no-group'],
+          true
+        );
+        expectElementHasClass(
+          doc.body,
+          [
+            'amp-iso-country-unknown',
+            'amp-geo-group-nafta',
+            'amp-geo-group-anz',
+          ],
+          false
+        );
+        expectElementHasClass(
+          doc.documentElement,
           [
             'amp-iso-country-unknown',
             'amp-geo-group-nafta',
@@ -323,14 +687,66 @@ describes.realWin(
 
       return Services.geoForDocOrNull(el).then((geo) => {
         expect(geo.ISOCountry).to.equal('nz');
-        expectBodyHasClass(['amp-iso-country-nz', 'amp-geo-group-anz'], true);
-        expectBodyHasClass(
+        expectElementHasClass(
+          doc.body,
+          ['amp-iso-country-nz', 'amp-geo-group-anz'],
+          true
+        );
+        expectElementHasClass(
+          doc.documentElement,
+          ['amp-iso-country-nz', 'amp-geo-group-anz'],
+          true
+        );
+        expectElementHasClass(
+          doc.body,
+          ['amp-iso-country-unknown', 'amp-geo-group-nafta'],
+          false
+        );
+        expectElementHasClass(
+          doc.documentElement,
           ['amp-iso-country-unknown', 'amp-geo-group-nafta'],
           false
         );
       });
     });
 
+    it('should allow uppercase hash for subdivisions', () => {
+      setGeoOverrideHash('US US-AL');
+      addConfigElement('script');
+      geo.buildCallback();
+
+      return Services.geoForDocOrNull(el).then((geo) => {
+        expect(geo.ISOCountry).to.equal('us');
+        expect(geo.ISOSubdivision).to.equal('us-al');
+        expectElementHasClass(
+          doc.body,
+          [
+            'amp-geo-group-nafta',
+            'amp-iso-country-us',
+            'amp-geo-group-usSubdivisions',
+            'amp-iso-subdivision-us-al',
+          ],
+          true
+        );
+        expectElementHasClass(
+          doc.documentElement,
+          [
+            'amp-geo-group-nafta',
+            'amp-iso-country-us',
+            'amp-geo-group-usSubdivisions',
+            'amp-iso-subdivision-us-al',
+          ],
+          true
+        );
+        expectElementHasClass(doc.body, ['amp-iso-country-unknown'], false);
+        expectElementHasClass(
+          doc.documentElement,
+          ['amp-iso-country-unknown'],
+          false
+        );
+      });
+    });
+
     it('should accept uppercase country codes in config', () => {
       setGeoOverrideHash('nz');
       addConfigElement(
@@ -342,27 +758,210 @@ describes.realWin(
 
       return Services.geoForDocOrNull(el).then((geo) => {
         expect(geo.ISOCountry).to.equal('nz');
-        expectBodyHasClass(['amp-iso-country-nz', 'amp-geo-group-anz'], true);
-        expectBodyHasClass(
+        expect(geo.ISOSubdivision).to.equal('unknown');
+        expectElementHasClass(
+          doc.body,
+          ['amp-iso-country-nz', 'amp-geo-group-anz'],
+          true
+        );
+        expectElementHasClass(
+          doc.documentElement,
+          ['amp-iso-country-nz', 'amp-geo-group-anz'],
+          true
+        );
+        expectElementHasClass(
+          doc.body,
           ['amp-iso-country-unknown', 'amp-geo-group-nafta'],
           false
         );
+        expectElementHasClass(
+          doc.documentElement,
+          ['amp-iso-country-unknown', 'amp-geo-group-nafta'],
+          false
+        );
+      });
+    });
+
+    it('should accept uppercase country subdivision codes in config', () => {
+      setGeoOverrideHash('ca ca-mb');
+      addConfigElement(
+        'script',
+        'application/json',
+        JSON.stringify(configWithUppercase)
+      );
+      geo.buildCallback();
+
+      return Services.geoForDocOrNull(el).then((geo) => {
+        expect(geo.ISOCountry).to.equal('ca');
+        expect(geo.ISOSubdivision).to.equal('ca-mb');
+        expectElementHasClass(
+          doc.body,
+          [
+            'amp-iso-country-ca',
+            'amp-iso-subdivision-ca-mb',
+            'amp-geo-group-nafta',
+            'amp-geo-group-canadaSubdivision',
+          ],
+          true
+        );
+        expectElementHasClass(
+          doc.documentElement,
+          [
+            'amp-iso-country-ca',
+            'amp-iso-subdivision-ca-mb',
+            'amp-geo-group-nafta',
+            'amp-geo-group-canadaSubdivision',
+          ],
+          true
+        );
+        expectElementHasClass(
+          doc.body,
+          ['amp-iso-country-unknown', 'amp-geo-group-anz'],
+          false
+        );
+        expectElementHasClass(
+          doc.documentElement,
+          ['amp-iso-country-unknown', 'amp-geo-group-anz'],
+          false
+        );
+      });
+    });
+
+    it('should subdivisions work in GEO_HOT_PATCH mode', () => {
+      env.sandbox.stub(geo, 'getHotPatchCountry_').returns('ca ca-nb');
+      addConfigElement('script');
+      geo.buildCallback();
+
+      return Services.geoForDocOrNull(el).then((geo) => {
+        expect(geo.ISOCountry).to.equal('ca');
+        expect(geo.ISOSubdivision).to.equal('ca-nb');
+
+        expectElementHasClass(
+          doc.body,
+          [
+            'amp-iso-country-ca',
+            'amp-iso-subdivision-ca-nb',
+            'amp-geo-group-nafta',
+            'amp-geo-group-canadaSubdivisions',
+          ],
+          true
+        );
+        expectElementHasClass(
+          doc.documentElement,
+          [
+            'amp-iso-country-ca',
+            'amp-iso-subdivision-ca-nb',
+            'amp-geo-group-nafta',
+            'amp-geo-group-canadaSubdivisions',
+          ],
+          true
+        );
+      });
+    });
+
+    it('should allow uppercase for subdivisions in GEO_HOT_PATCH mode', () => {
+      env.sandbox.stub(geo, 'getHotPatchCountry_').returns('US US-AL');
+      addConfigElement('script');
+      geo.buildCallback();
+
+      return Services.geoForDocOrNull(el).then((geo) => {
+        expect(geo.ISOCountry).to.equal('us');
+        expect(geo.ISOSubdivision).to.equal('us-al');
+
+        expectElementHasClass(
+          doc.body,
+          [
+            'amp-iso-country-us',
+            'amp-iso-subdivision-us-al',
+            'amp-geo-group-usSubdivisions',
+          ],
+          true
+        );
+        expectElementHasClass(
+          doc.documentElement,
+          [
+            'amp-iso-country-us',
+            'amp-iso-subdivision-us-al',
+            'amp-geo-group-usSubdivisions',
+          ],
+          true
+        );
       });
     });
 
     /**
-     * pre-rendered geo is the the case where a publisher uses their own
+     * pre-rendered geo is the case where a publisher uses their own
      * infrastructure to add a country tag to the body.
      */
-    it('should respect pre-rendered geo tags', () => {
+    it('should respect pre-rendered geo tags in the body', () => {
       addConfigElement('script');
       doc.body.classList.add('amp-iso-country-nz', 'amp-geo-group-anz');
       geo.buildCallback();
 
       return Services.geoForDocOrNull(el).then((geo) => {
         expect(geo.ISOCountry).to.equal('nz');
-        expectBodyHasClass(['amp-iso-country-nz', 'amp-geo-group-anz'], true);
-        expectBodyHasClass(
+        expect(geo.ISOSubdivision).to.equal('unknown');
+        expectElementHasClass(
+          doc.body,
+          ['amp-iso-country-nz', 'amp-geo-group-anz'],
+          true
+        );
+        expectElementHasClass(
+          doc.body[('amp-iso-country-unknown', 'amp-geo-group-nafta')],
+          false
+        );
+      });
+    });
+
+    it('should respect pre-rendered geo subscription tags in the body', () => {
+      addConfigElement('script');
+      doc.body.classList.add(
+        'amp-iso-country-ca',
+        'amp-iso-subdivision-ca-mb',
+        'amp-geo-group-nafta'
+      );
+      geo.buildCallback();
+
+      return Services.geoForDocOrNull(el).then((geo) => {
+        expect(geo.ISOCountry).to.equal('ca');
+        expect(geo.ISOSubdivision).to.equal('ca-mb');
+        expectElementHasClass(
+          doc.body,
+          [
+            'amp-iso-country-ca',
+            'amp-iso-subdivision-ca-mb',
+            'amp-geo-group-nafta',
+          ],
+          true
+        );
+        expectElementHasClass(
+          doc.body[
+            ('amp-iso-country-unknown',
+            'amp-geo-group-anz',
+            'amp-geo-group-canadaSubdivisions')
+          ],
+          false
+        );
+      });
+    });
+
+    it('should respect pre-rendered geo tags in the html element', () => {
+      addConfigElement('script');
+      doc.documentElement.classList.add(
+        'amp-iso-country-nz',
+        'amp-geo-group-anz'
+      );
+      geo.buildCallback();
+
+      return Services.geoForDocOrNull(el).then((geo) => {
+        expect(geo.ISOCountry).to.equal('nz');
+        expectElementHasClass(
+          doc.documentElement,
+          ['amp-iso-country-nz', 'amp-geo-group-anz'],
+          true
+        );
+        expectElementHasClass(
+          doc.documentElement,
           ['amp-iso-country-unknown', 'amp-geo-group-nafta'],
           false
         );
@@ -371,17 +970,87 @@ describes.realWin(
 
     it('should allow hash to override pre-rendered geo in test', () => {
       setGeoOverrideHash('nz');
-      doc.body.classList.add('amp-iso-country-mx', 'amp-geo-group-nafta');
+      // NOTE: notide that we cause the body and html element classes
+      // to go out of sync but we still clear `amp-iso-country-mx` AND
+      // `amp-geo-group-nafta`.
+      doc.documentElement.classList.add('amp-iso-country-mx');
+      doc.body.classList.add('amp-geo-group-nafta');
       addConfigElement('script');
       geo.buildCallback();
 
       return Services.geoForDocOrNull(el).then((geo) => {
         expect(geo.ISOCountry).to.equal('nz');
-        expectBodyHasClass(['amp-iso-country-nz', 'amp-geo-group-anz'], true);
-        expectBodyHasClass(
+        expectElementHasClass(
+          doc.body,
+          ['amp-iso-country-nz', 'amp-geo-group-anz'],
+          true
+        );
+        expectElementHasClass(
+          doc.documentElement,
+          ['amp-iso-country-nz', 'amp-geo-group-anz'],
+          true
+        );
+        expectElementHasClass(
+          doc.body,
           ['amp-iso-country-unknown', 'amp-geo-group-nafta'],
           false
         );
+        expectElementHasClass(
+          doc.documentElement,
+          ['amp-iso-country-unknown', 'amp-geo-group-nafta'],
+          false
+        );
+      });
+    });
+
+    it('should allow hash to override pre-rendered geo sudivision in test', () => {
+      setGeoOverrideHash('us us-ny');
+      doc.documentElement.classList.add(
+        'amp-geo-group-canadaSubdivisions',
+        'amp-iso-country-ca',
+        'amp-iso-subdivision-ca-mb'
+      );
+      doc.body.classList.add(
+        'amp-geo-group-canadaSubdivisions',
+        'amp-iso-country-ca',
+        'amp-iso-subdivision-ca-mb'
+      );
+      addConfigElement('script');
+      geo.buildCallback();
+
+      return Services.geoForDocOrNull(el).then((geo) => {
+        expect(geo.ISOCountry).to.equal('us');
+        expect(geo.ISOSubdivision).to.equal('us-ny');
+        expectElementHasClass(
+          doc.body,
+          ['amp-iso-country-us', 'amp-iso-subdivision-us-ny'],
+          true
+        );
+        expectElementHasClass(
+          doc.documentElement,
+          ['amp-iso-country-us', 'amp-iso-subdivision-us-ny'],
+          true
+        );
+        expectElementHasClass(
+          doc.body,
+          [
+            'amp-iso-country-unknown',
+            'amp-geo-group-canadaSubdivisions',
+            'amp-iso-country-ca',
+            'amp-iso-subdivision-ca-mb',
+          ],
+          false
+        );
+        expectElementHasClass(
+          doc.documentElement,
+          [
+            'amp-iso-country-unknown',
+            'amp-geo-group-canadaSubdivisions',
+            'amp-iso-country-ca',
+            'amp-iso-subdivision-ca-mb',
+          ],
+          false
+        );
       });
     });
 
@@ -397,6 +1066,11 @@ describes.realWin(
           'unknown',
           'eea',
           'myGroup',
+          'usSubdivisions',
+          'usVA',
+          'usCO',
+          'usCT',
+          'canadaSubdivisions',
           'anz',
           'uscaGroup',
         ]);
@@ -424,7 +1098,8 @@ describes.realWin(
       geo.buildCallback();
       return Services.geoForDocOrNull(el).then((geo) => {
         expect(geo.ISOCountry).to.equal('unknown');
-        expectBodyHasClass(['amp-geo-error'], true);
+        expectElementHasClass(doc.body, ['amp-geo-error'], true);
+        expectElementHasClass(doc.documentElement, ['amp-geo-error'], true);
       });
     });
 
@@ -456,9 +1131,23 @@ describes.realWin(
       return Services.geoForDocOrNull(el).then((geo) => {
         expect(userErrorStub).to.not.be.called;
         expect(geo.ISOCountry).to.equal('us');
-        expectBodyHasClass(
+        expect(geo.ISOSubdivision).to.equal('us-ca');
+        expectElementHasClass(
+          doc.body,
+          [
+            'amp-iso-country-us',
+            'amp-iso-subdivision-us-ca',
+            'amp-geo-group-nafta',
+            'amp-geo-group-myGroup',
+            'amp-geo-group-uscaGroup',
+          ],
+          true
+        );
+        expectElementHasClass(
+          doc.documentElement,
           [
             'amp-iso-country-us',
+            'amp-iso-subdivision-us-ca',
             'amp-geo-group-nafta',
             'amp-geo-group-myGroup',
             'amp-geo-group-uscaGroup',
@@ -482,6 +1171,7 @@ describes.realWin(
       return Services.geoForDocOrNull(el).then((geo) => {
         expect(userErrorStub).to.be.called;
         expect(geo.ISOCountry).to.equal('unknown');
+        expect(geo.ISOSubdivision).to.equal('unknown');
       });
     });
 
diff --git a/extensions/amp-geo/amp-geo.md b/extensions/amp-geo/amp-geo.md
index 737d30c2dee3..9f2309232a0a 100644
--- a/extensions/amp-geo/amp-geo.md
+++ b/extensions/amp-geo/amp-geo.md
@@ -167,6 +167,85 @@ example below.
 </amp-geo>
 ```
 
+#### U.S. Subdivisions Detection
+
+The `amp-geo` component provides the
+[ISO 3166-2](https://en.wikipedia.org/wiki/ISO_3166-2) information when it
+determines a request is from US State or from the District of Columbia
+(Washington DC). The values are in a `${country}-${subdivision}` format and
+the following codes are supported.
+
+  - `us-al` - Alabama
+  - `us-ak` - Alaska
+  - `us-az` - Arizona
+  - `us-ar` - Arkansas
+  - `us-ca` - California
+  - `us-co` - Colorado
+  - `us-ct` - Connecticut
+  - `us-de` - Delaware
+  - `us-dc` - District of Columbia
+  - `us-fl` - Florida
+  - `us-ga` - Georgia
+  - `us-hi` - Hawaii
+  - `us-id` - Idaho
+  - `us-il` - Illinois
+  - `us-in` - Indiana
+  - `us-ia` - Iowa
+  - `us-ks` - Kansas
+  - `us-ky` - Kentucky
+  - `us-la` - Louisiana
+  - `us-me` - Maine
+  - `us-md` - Maryland
+  - `us-ma` - Massachusetts
+  - `us-mi` - Michigan
+  - `us-mn` - Minnesota
+  - `us-ms` - Mississippi
+  - `us-mo` - Missouri
+  - `us-mt` - Montana
+  - `us-ne` - Nebraska
+  - `us-nv` - Nevada
+  - `us-nh` - New Hampshire
+  - `us-nj` - New Jersey
+  - `us-nm` - New Mexico
+  - `us-ny` - New York
+  - `us-nc` - North Carolina
+  - `us-nd` - North Dakota
+  - `us-oh` - Ohio
+  - `us-ok` - Oklahoma
+  - `us-or` - Oregon
+  - `us-pa` - Pennsylvania
+  - `us-ri` - Rhode Island
+  - `us-sc` - South Carolina
+  - `us-sd` - South Dakota
+  - `us-tn` - Tennessee
+  - `us-tx` - Texas
+  - `us-ut` - Utah
+  - `us-vt` - Vermont
+  - `us-va` - Virginia
+  - `us-wa` - Washington
+  - `us-wv` - West Virginia
+  - `us-wi` - Wisconsin
+  - `us-wy` - Wyoming
+
+Additional countries/subdivision may be included with the preset list as in the `usWithSubdivisions`
+example below.
+
+```html
+<amp-geo layout="nodisplay">
+  <script type="application/json">
+    {
+      "ISOCountryGroups": {
+        "usca": ["preset-us-ca"],
+        "usco":["us-co"],
+        "usct":["us-ct"],
+        "usva":["us-va"],
+        "usWithSubdivisions": ["us-ca", "us-co", "us-ct", "us-va"]
+      }
+    }
+  </script>
+</amp-geo>
+```
+
 ### Render Blocking
 
 By default, the `amp-geo` component is not render blocking. That is, the page
@@ -245,6 +324,12 @@ The country code is also available via AMP variable substitution:
 `AMP_GEO(ISOCountry)` or `${ampGeo(ISOCountry)}` returns the country code (or
 `unknown`).
 
+The subdivision code is also available via AMP variable substitution:
+
+`AMP_GEO` or `${ampGeo}` returns the list of matched groups (comma delimited).
+`AMP_GEO(ISOSubdivision)` or `${ampGeo(ISOSubdivision)}` returns the country
+subdivision (or `unknown`).
+
 ### Caching
 
 The `amp-geo` JavaScript file is served with a 30-minute cache lifetime
diff --git a/extensions/amp-gfycat/0.1/amp-gfycat.js b/extensions/amp-gfycat/0.1/amp-gfycat.js
index 4fec74aad5d4..bf3b6cc31408 100644
--- a/extensions/amp-gfycat/0.1/amp-gfycat.js
+++ b/extensions/amp-gfycat/0.1/amp-gfycat.js
@@ -13,7 +13,7 @@ import {getData, listen} from '#utils/event-helper';
 import {dev, userAssert} from '#utils/log';
 
 import {addParamsToUrl} from '../../../src/url';
-import {VideoEvents} from '../../../src/video-interface';
+import {VideoEvents_Enum} from '../../../src/video-interface';
 
 const TAG = 'amp-gfycat';
 
@@ -152,7 +152,7 @@ class AmpGfycat extends AMP.BaseElement {
 
     this.element.appendChild(iframe);
     return this.loadPromise(this.iframe_).then(() => {
-      dispatchCustomEvent(this.element, VideoEvents.LOAD);
+      dispatchCustomEvent(this.element, VideoEvents_Enum.LOAD);
     });
   }
 
@@ -197,9 +197,9 @@ class AmpGfycat extends AMP.BaseElement {
     }
 
     if (eventData == 'paused') {
-      dispatchCustomEvent(this.element, VideoEvents.PAUSE);
+      dispatchCustomEvent(this.element, VideoEvents_Enum.PAUSE);
     } else if (eventData == 'playing') {
-      dispatchCustomEvent(this.element, VideoEvents.PLAYING);
+      dispatchCustomEvent(this.element, VideoEvents_Enum.PLAYING);
     }
   }
 
diff --git a/extensions/amp-gfycat/0.1/test/test-amp-gfycat.js b/extensions/amp-gfycat/0.1/test/test-amp-gfycat.js
index 6ebaf6dc4b6e..f6e4659c3669 100644
--- a/extensions/amp-gfycat/0.1/test/test-amp-gfycat.js
+++ b/extensions/amp-gfycat/0.1/test/test-amp-gfycat.js
@@ -1,7 +1,7 @@
 import '../amp-gfycat';
 import {listenOncePromise} from '#utils/event-helper';
 
-import {VideoEvents} from '../../../../src/video-interface';
+import {VideoEvents_Enum} from '../../../../src/video-interface';
 
 describes.realWin(
   'amp-gfycat',
@@ -81,12 +81,12 @@ describes.realWin(
         const iframe = gfycat.querySelector('iframe');
         return Promise.resolve()
           .then(async () => {
-            const p = listenOncePromise(gfycat, VideoEvents.PLAYING);
+            const p = listenOncePromise(gfycat, VideoEvents_Enum.PLAYING);
             await sendFakeMessage(gfycat, iframe, 'playing');
             return p;
           })
           .then(async () => {
-            const p = listenOncePromise(gfycat, VideoEvents.PAUSE);
+            const p = listenOncePromise(gfycat, VideoEvents_Enum.PAUSE);
             await sendFakeMessage(gfycat, iframe, 'paused');
             return p;
           });
diff --git a/extensions/amp-gist/0.1/amp-gist.js b/extensions/amp-gist/0.1/amp-gist.js
index b19043dd7456..33ab4d6ef03c 100644
--- a/extensions/amp-gist/0.1/amp-gist.js
+++ b/extensions/amp-gist/0.1/amp-gist.js
@@ -12,7 +12,7 @@
  */
 
 import {removeElement} from '#core/dom';
-import {Layout, applyFillContent} from '#core/dom/layout';
+import {Layout_Enum, applyFillContent} from '#core/dom/layout';
 
 import {Services} from '#service';
 
@@ -42,7 +42,7 @@ export class AmpGist extends AMP.BaseElement {
 
   /** @override */
   isLayoutSupported(layout) {
-    return layout == Layout.FIXED_HEIGHT;
+    return layout == Layout_Enum.FIXED_HEIGHT;
   }
 
   /** @override */
diff --git a/extensions/amp-gist/1.0/README.md b/extensions/amp-gist/1.0/README.md
new file mode 100644
index 000000000000..17c6c703da91
--- /dev/null
+++ b/extensions/amp-gist/1.0/README.md
@@ -0,0 +1,187 @@
+# Bento Gist
+
+Creates an iframe and displays a [GitHub Gist](https://docs.github.com/en/github/writing-on-github/creating-gists).
+
+## Web Component
+
+You must include each Bento component's required CSS library to guarantee proper loading and before adding custom styles. Or use the light-weight pre-upgrade styles available inline. See [Layout and style](#layout-and-style).
+
+### Import via npm
+
+```sh
+npm install @bentoproject/gist
+```
+
+```javascript
+import {defineElement as defineBentoGist} from '@bentoproject/gist';
+defineBentoGist();
+```
+
+### Include via `<script>`
+
+```html
+<script type="module" src="https://cdn.ampproject.org/bento.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/bento.js" crossorigin="anonymous"></script>
+<script type="module" src="https://cdn.ampproject.org/v0/bento-gist-1.0.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/v0/bento-gist-1.0.js" crossorigin="anonymous"></script>
+<link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-gist-1.0.css" crossorigin="anonymous">
+```
+
+### Example
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-gist-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-gist-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-gist-1.0.css"
+    />
+    <style>
+      bento-gist {
+        width: 300px;
+        height: 300px;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-gist
+      id="my-track"
+      data-gistid="a19e811dcd7df10c4da0931641538497"
+    ></bento-gist>
+  </body>
+</html>
+```
+
+### Layout and style
+
+Each Bento component has a small CSS library you must include to guarantee proper loading without [content shifts](https://web.dev/cls/). Because of order-based specificity, you must manually ensure that stylesheets are included before any custom styles.
+
+```html
+<link
+  rel="stylesheet"
+  type="text/css"
+  href="https://cdn.ampproject.org/v0/bento-gist-1.0.css"
+/>
+```
+
+Alternatively, you may also make the light-weight pre-upgrade styles available inline:
+
+```html
+<style>
+  bento-gist {
+    display: block;
+    overflow: hidden;
+    position: relative;
+  }
+</style>
+```
+
+#### Container type
+
+The `bento-gist` component has a defined layout size type. To ensure the component renders correctly, be sure to apply a size to the component and its immediate children (slides) via a desired CSS layout (such as one defined with `height`, `width`, `aspect-ratio`, or other such properties):
+
+```css
+bento-gist {
+  height: 100px;
+  width: 100%;
+}
+```
+
+### Attributes
+
+##### data-gistid
+
+The ID of the gist to embed.
+
+##### data-file (optional)
+
+If specified, display only one file in a gist.
+
+#### title (optional)
+
+Define a `title` attribute for the component to propagate to the underlying `<iframe>` element. The default value is `"Github Gist"`.
+
+---
+
+## Preact/React Component
+
+### Import via npm
+
+```sh
+npm install @bentoproject/gist
+```
+
+```javascript
+import React from 'react';
+import {BentoGist} from '@bentoproject/gist/react';
+import '@bentoproject/gist/styles.css';
+
+function App() {
+  return <BentoGist gistId="a19e811dcd7df10c4da0931641538497"></BentoGist>;
+}
+```
+
+### Layout and style
+
+#### Container type
+
+The `BentoGist` component has a defined layout size type. To ensure the component renders correctly, be sure to apply a size to the component and its immediate children via a desired CSS layout (such as one defined with `height`, `width`, `aspect-ratio`, or other such properties). These can be applied inline:
+
+```jsx
+<BentoGist
+  style={{height: 500}}
+  gistId="a19e811dcd7df10c4da0931641538497"
+  file="index.js"
+></BentoGist>
+```
+
+Or via `className`:
+
+```jsx
+<BentoGist
+  className="custom-styles"
+  gistId="a19e811dcd7df10c4da0931641538497"
+  file="index.js"
+></BentoGist>
+```
+
+```css
+.custom-styles {
+  height: 100px;
+  width: 100%;
+}
+```
+
+### Props
+
+##### gistId
+
+The ID of the gist to embed.
+
+##### file (optional)
+
+If specified, display only one file in a gist.
+
+#### title (optional)
+
+Define a `title` attribute for the component to propagate to the underlying `<iframe>` element. The default value is `"Github Gist"`.
diff --git a/extensions/amp-gist/1.0/amp-gist.css b/extensions/amp-gist/1.0/amp-gist.css
new file mode 100644
index 000000000000..85b902614762
--- /dev/null
+++ b/extensions/amp-gist/1.0/amp-gist.css
@@ -0,0 +1,17 @@
+/*
+ * Pre-upgrade:
+ * - display:block element
+ * - size-defined element
+ */
+amp-gist {
+  display: block;
+  overflow: hidden;
+  position: relative;
+}
+
+/* Pre-upgrade: size-defining element - hide children. */
+amp-gist:not(.i-amphtml-built)
+  > :not([placeholder]):not(.i-amphtml-svc) {
+  display: none;
+  content-visibility: hidden;
+}
diff --git a/extensions/amp-gist/1.0/amp-gist.js b/extensions/amp-gist/1.0/amp-gist.js
new file mode 100644
index 000000000000..53304319a51d
--- /dev/null
+++ b/extensions/amp-gist/1.0/amp-gist.js
@@ -0,0 +1,40 @@
+import {Layout_Enum} from '#core/dom/layout';
+
+import {isExperimentOn} from '#experiments';
+
+import {userAssert} from '#utils/log';
+
+import {BaseElement} from './base-element';
+
+import {CSS} from '../../../build/amp-gist-1.0.css';
+
+/** @const {string} */
+const TAG = 'amp-gist';
+
+class AmpGist extends BaseElement {
+  /** @override */
+  init() {
+    return {
+      'requestResize': (height) => this.attemptChangeHeight(height),
+    };
+  }
+
+  /** @override @nocollapse */
+  static getPreconnects() {
+    return ['https://gist.github.com'];
+  }
+
+  /** @override */
+  isLayoutSupported(layout) {
+    userAssert(
+      isExperimentOn(this.win, 'bento') ||
+        isExperimentOn(this.win, 'bento-gist'),
+      'expected global "bento" or specific "bento-gist" experiment to be enabled'
+    );
+    return layout == Layout_Enum.FIXED_HEIGHT;
+  }
+}
+
+AMP.extension(TAG, '1.0', (AMP) => {
+  AMP.registerElement(TAG, AmpGist, CSS);
+});
diff --git a/extensions/amp-gist/1.0/base-element.js b/extensions/amp-gist/1.0/base-element.js
new file mode 100644
index 000000000000..035b6489dcc5
--- /dev/null
+++ b/extensions/amp-gist/1.0/base-element.js
@@ -0,0 +1,20 @@
+import {PreactBaseElement} from '#preact/base-element';
+
+import {BentoGist} from './component';
+
+export class BaseElement extends PreactBaseElement {}
+
+/** @override */
+BaseElement['Component'] = BentoGist;
+
+/** @override */
+BaseElement['props'] = {
+  'gistId': {attr: 'data-gistid'},
+  'file': {attr: 'data-file'},
+};
+
+/** @override */
+BaseElement['layoutSizeDefined'] = true;
+
+/** @override */
+BaseElement['usesShadowDom'] = true;
diff --git a/extensions/amp-gist/1.0/component.js b/extensions/amp-gist/1.0/component.js
new file mode 100644
index 000000000000..5b3a1f549ecb
--- /dev/null
+++ b/extensions/amp-gist/1.0/component.js
@@ -0,0 +1,66 @@
+import {MessageType_Enum, deserializeMessage} from '#core/3p-frame-messaging';
+
+import * as Preact from '#preact';
+import {useCallback, useEffect, useMemo, useRef, useState} from '#preact';
+import {ProxyIframeEmbed} from '#preact/component/3p-frame';
+
+const TYPE = 'github';
+const DEFAULT_TITLE = 'Github Gist';
+const FULL_HEIGHT = '100%';
+
+/**
+ * @param {!BentoGist.Props} props
+ * @return {PreactDef.Renderable}
+ */
+export function BentoGist({
+  file,
+  gistId,
+  requestResize,
+  style,
+  title = DEFAULT_TITLE,
+  ...rest
+}) {
+  const iframeRef = useRef(null);
+  const [height, setHeight] = useState(null);
+  const messageHandler = useCallback(
+    (event) => {
+      const data = deserializeMessage(event.data);
+      if (data['type'] == MessageType_Enum.EMBED_SIZE) {
+        const height = data['height'];
+        if (requestResize) {
+          requestResize(height);
+          setHeight(FULL_HEIGHT);
+        } else {
+          setHeight(height);
+        }
+      }
+    },
+    [requestResize]
+  );
+  useEffect(() => {
+    /** Unmount Procedure */
+    return () => {
+      // Release iframe resources
+      iframeRef.current = null;
+    };
+  }, []);
+  const options = useMemo(
+    () => ({
+      gistid: gistId,
+      file,
+    }),
+    [gistId, file]
+  );
+
+  return (
+    <ProxyIframeEmbed
+      title={title}
+      options={options}
+      ref={iframeRef}
+      type={TYPE}
+      messageHandler={messageHandler}
+      style={height ? {...style, height} : style}
+      {...rest}
+    />
+  );
+}
diff --git a/extensions/amp-gist/1.0/component.type.js b/extensions/amp-gist/1.0/component.type.js
new file mode 100644
index 000000000000..e571f19c1d86
--- /dev/null
+++ b/extensions/amp-gist/1.0/component.type.js
@@ -0,0 +1,15 @@
+/** @externs */
+
+/** @const */
+var BentoGistDef = {};
+
+/**
+ * @typedef {{
+ *   onLoad: (function():undefined|undefined),
+ *   requestResize: (function(number):*|undefined),
+ *   title: (string|undefined),
+ *   gistId: (string),
+ *   file: (string|undefined),
+ * }}
+ */
+BentoGistDef.Props;
diff --git a/extensions/amp-gist/1.0/storybook/Basic.amp.js b/extensions/amp-gist/1.0/storybook/Basic.amp.js
new file mode 100644
index 000000000000..74286269b458
--- /dev/null
+++ b/extensions/amp-gist/1.0/storybook/Basic.amp.js
@@ -0,0 +1,33 @@
+import {withAmp} from '@ampproject/storybook-addon';
+
+import * as Preact from '#preact';
+
+export default {
+  title: 'amp-gist-1_0',
+  decorators: [withAmp],
+  parameters: {
+    extensions: [{name: 'amp-gist', version: '1.0'}],
+    experiments: ['bento'],
+  },
+};
+
+export const _default = () => {
+  return (
+    <amp-gist
+      data-gistid="b9bb35bc68df68259af94430f012425f"
+      layout="fixed-height"
+      height="300"
+    ></amp-gist>
+  );
+};
+
+export const singleFile = () => {
+  return (
+    <amp-gist
+      data-gistid="a19e811dcd7df10c4da0931641538497"
+      data-file="index.js"
+      layout="fixed-height"
+      height="65"
+    ></amp-gist>
+  );
+};
diff --git a/extensions/amp-gist/1.0/storybook/Basic.js b/extensions/amp-gist/1.0/storybook/Basic.js
new file mode 100644
index 000000000000..a173f05a5830
--- /dev/null
+++ b/extensions/amp-gist/1.0/storybook/Basic.js
@@ -0,0 +1,26 @@
+import * as Preact from '#preact';
+
+import {BentoGist} from '../component';
+export default {
+  title: 'Gist',
+  component: BentoGist,
+};
+
+export const _default = () => {
+  return (
+    <BentoGist
+      style={{height: 500}}
+      gistId="b9bb35bc68df68259af94430f012425f"
+    ></BentoGist>
+  );
+};
+
+export const singleFile = () => {
+  return (
+    <BentoGist
+      style={{height: 500}}
+      gistId="a19e811dcd7df10c4da0931641538497"
+      file="index.js"
+    ></BentoGist>
+  );
+};
diff --git a/extensions/amp-gist/1.0/test/test-amp-gist.js b/extensions/amp-gist/1.0/test/test-amp-gist.js
new file mode 100644
index 000000000000..a5fc3824e84c
--- /dev/null
+++ b/extensions/amp-gist/1.0/test/test-amp-gist.js
@@ -0,0 +1,63 @@
+import '../amp-gist';
+import {createElementWithAttributes} from '#core/dom';
+
+import {toggleExperiment} from '#experiments';
+
+import {waitFor} from '#testing/helpers/service';
+import {doNotLoadExternalResourcesInTest} from '#testing/iframe';
+
+describes.realWin(
+  'amp-gist-v1.0',
+  {
+    amp: {
+      extensions: ['amp-gist:1.0'],
+    },
+  },
+  (env) => {
+    let win;
+    let doc;
+    let element;
+
+    const waitForRender = async () => {
+      await element.buildInternal();
+      const loadPromise = element.layoutCallback();
+      const shadow = element.shadowRoot;
+      await waitFor(() => shadow.querySelector('iframe'), 'iframe mounted');
+      await loadPromise;
+    };
+
+    beforeEach(async () => {
+      win = env.win;
+      doc = win.document;
+      toggleExperiment(win, 'bento-gist', true, true);
+
+      // Override global window here because Preact uses global `createElement`.
+      doNotLoadExternalResourcesInTest(window, env.sandbox);
+    });
+
+    it('renders', async () => {
+      element = createElementWithAttributes(win.document, 'amp-gist', {
+        'data-gistid': 'b9bb35bc68df68259af94430f012425f',
+        'height': 500,
+        'layout': 'fixed-height',
+      });
+      doc.body.appendChild(element);
+      await waitForRender();
+
+      expect(element.shadowRoot.querySelector('iframe').src).not.to.be.null;
+    });
+
+    it('renders with specific file', async () => {
+      element = createElementWithAttributes(win.document, 'amp-gist', {
+        'data-gistid': 'a19e811dcd7df10c4da0931641538497',
+        'data-file': 'index.js',
+        'height': 500,
+        'layout': 'fixed-height',
+      });
+      doc.body.appendChild(element);
+      await waitForRender();
+
+      expect(element.shadowRoot.querySelector('iframe').src).not.to.be.null;
+    });
+  }
+);
diff --git a/extensions/amp-gist/1.0/test/test-component.js b/extensions/amp-gist/1.0/test/test-component.js
new file mode 100644
index 000000000000..b5eab96c6e19
--- /dev/null
+++ b/extensions/amp-gist/1.0/test/test-component.js
@@ -0,0 +1,46 @@
+import {mount} from 'enzyme';
+
+import * as Preact from '#preact';
+
+import {BentoGist} from '../component';
+
+describes.sandboxed('BentoGist preact component v1.0', {}, () => {
+  it('should render', () => {
+    const wrapper = mount(
+      <BentoGist
+        gistId="b9bb35bc68df68259af94430f012425f"
+        style={{
+          'height': '600px',
+        }}
+      />
+    );
+
+    const iframe = wrapper.find('iframe');
+
+    expect(iframe.prop('src')).to.equal(
+      'http://ads.localhost:9876/dist.3p/current/frame.max.html'
+    );
+    expect(wrapper.find('iframe').prop('style').width).to.equal('100%');
+    expect(wrapper.find('iframe').prop('style').height).to.equal('100%');
+  });
+
+  it('should render with specific file', () => {
+    const wrapper = mount(
+      <BentoGist
+        gistId="a19e811dcd7df10c4da0931641538497"
+        file="index.js"
+        style={{
+          'height': '65px',
+        }}
+      />
+    );
+
+    const iframe = wrapper.find('iframe');
+
+    expect(iframe.prop('src')).to.equal(
+      'http://ads.localhost:9876/dist.3p/current/frame.max.html'
+    );
+    expect(wrapper.find('iframe').prop('style').width).to.equal('100%');
+    expect(wrapper.find('iframe').prop('style').height).to.equal('100%');
+  });
+});
diff --git a/extensions/amp-gist/1.0/test/validator-amp-gist.html b/extensions/amp-gist/1.0/test/validator-amp-gist.html
new file mode 100644
index 000000000000..cf19939f00af
--- /dev/null
+++ b/extensions/amp-gist/1.0/test/validator-amp-gist.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html ⚡ lang="en">
+  <!-- prettier-ignore -->
+  <head>
+    <meta charset="utf-8">
+    <title>amp-gist example</title>
+    <link rel="canonical" href="/examples/amp-gist.html">
+    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+    <style amp-custom>
+      amp-gist {
+        color: red;
+      }
+    </style>
+    <script async custom-element="amp-gist" src="https://cdn.ampproject.org/v0/amp-gist-1.0.js"></script>
+    <script async src="https://cdn.ampproject.org/v0.js"></script>
+  </head>
+  <body>
+     <!-- Valid: Embeds an entire gist from GitHub. -->
+    <amp-gist
+      layout="fixed-height"
+      height="241"
+      data-gistid="b9bb35bc68df68259af94430f012425f">
+    </amp-gist>
+
+    <!-- Valid: Embeds one file out of a gist from GitHub. -->
+    <amp-gist
+      layout="fixed-height"
+      height="197"
+      data-gistid="a19e811dcd7df10c4da0931641538497"
+      data-file="hi.c">
+    </amp-gist>
+
+    <!-- Invalid: missing data-gistid attribute. -->
+    <amp-gist
+      layout="fixed-height"
+      height="241">
+    </amp-gist>
+
+    <!-- Invalid: illegal layout. -->
+    <amp-gist
+      layout="responsive"
+      height="241"
+      data-gistid="b9bb35bc68df68259af94430f012425f">
+    </amp-gist>
+  </body>
+</html>
diff --git a/extensions/amp-gist/1.0/test/validator-amp-gist.out b/extensions/amp-gist/1.0/test/validator-amp-gist.out
new file mode 100644
index 000000000000..86bb30e6e5c1
--- /dev/null
+++ b/extensions/amp-gist/1.0/test/validator-amp-gist.out
@@ -0,0 +1,54 @@
+FAIL
+|  <!DOCTYPE html>
+|  <html ⚡ lang="en">
+|    <!-- prettier-ignore -->
+|    <head>
+|      <meta charset="utf-8">
+|      <title>amp-gist example</title>
+|      <link rel="canonical" href="/examples/amp-gist.html">
+|      <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+|      <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+|      <style amp-custom>
+|        amp-gist {
+|          color: red;
+|        }
+|      </style>
+|      <script async custom-element="amp-gist" src="https://cdn.ampproject.org/v0/amp-gist-1.0.js"></script>
+>>     ^~~~~~~~~
+amp-gist/1.0/test/validator-amp-gist.html:15:4 The extension 'amp-gist' is referenced at version '1.0' which is an invalid version. Please use a valid version of this extension. (see https://amp.dev/documentation/components/amp-gist)
+|      <script async src="https://cdn.ampproject.org/v0.js"></script>
+|    </head>
+|    <body>
+|       <!-- Valid: Embeds an entire gist from GitHub. -->
+|      <amp-gist
+|        layout="fixed-height"
+|        height="241"
+|        data-gistid="b9bb35bc68df68259af94430f012425f">
+|      </amp-gist>
+|
+|      <!-- Valid: Embeds one file out of a gist from GitHub. -->
+|      <amp-gist
+|        layout="fixed-height"
+|        height="197"
+|        data-gistid="a19e811dcd7df10c4da0931641538497"
+|        data-file="hi.c">
+|      </amp-gist>
+|
+|      <!-- Invalid: missing data-gistid attribute. -->
+|      <amp-gist
+>>     ^~~~~~~~~
+amp-gist/1.0/test/validator-amp-gist.html:35:4 The mandatory attribute 'data-gistid' is missing in tag 'amp-gist'. (see https://amp.dev/documentation/components/amp-gist/)
+|        layout="fixed-height"
+|        height="241">
+|      </amp-gist>
+|
+|      <!-- Invalid: illegal layout. -->
+|      <amp-gist
+>>     ^~~~~~~~~
+amp-gist/1.0/test/validator-amp-gist.html:41:4 The specified layout 'RESPONSIVE' is not supported by tag 'amp-gist'. (see https://amp.dev/documentation/components/amp-gist/)
+|        layout="responsive"
+|        height="241"
+|        data-gistid="b9bb35bc68df68259af94430f012425f">
+|      </amp-gist>
+|    </body>
+|  </html>
\ No newline at end of file
diff --git a/extensions/amp-google-read-aloud-player/0.1/amp-google-read-aloud-player.js b/extensions/amp-google-read-aloud-player/0.1/amp-google-read-aloud-player.js
new file mode 100644
index 000000000000..c093a9fbeff6
--- /dev/null
+++ b/extensions/amp-google-read-aloud-player/0.1/amp-google-read-aloud-player.js
@@ -0,0 +1,237 @@
+import {getDataParamsFromAttributes, removeElement} from '#core/dom';
+import {Layout_Enum} from '#core/dom/layout';
+import {tryParseJson} from '#core/types/object/json';
+
+import {Services} from '#service';
+import {installVideoManagerForDoc} from '#service/video-manager-impl';
+
+import {disableScrollingOnIframe} from '../../../src/iframe-helper';
+import {SandboxOptions_Enum, createFrameFor} from '../../../src/iframe-video';
+import {addParamsToUrl} from '../../../src/url';
+
+/** @private @const */
+const TAG = 'amp-google-read-aloud-player';
+
+/** @private @const */
+const DEFAULT_IFRAME_BASE_URL =
+  'https://www.gstatic.com/readaloud/player/web/api/iframe/index.html';
+
+/** @private @const */
+const BASE_SRC_PARAM_NAME = 'src';
+
+/** @private @const */
+const SANDBOX = [
+  SandboxOptions_Enum.ALLOW_SCRIPTS,
+  SandboxOptions_Enum.ALLOW_SAME_ORIGIN,
+  SandboxOptions_Enum.ALLOW_POPUPS,
+];
+
+/** @implements {../../../src/video-interface.VideoInterface} */
+export class AmpGoogleReadAloudPlayer extends AMP.BaseElement {
+  /** @param {!AmpElement} element */
+  constructor(element) {
+    super(element);
+
+    /** @private {?HTMLIFrameElement} */
+    this.iframe_ = null;
+  }
+
+  /**
+   * @param {boolean=} opt_onLayout
+   * @override
+   */
+  preconnectCallback(opt_onLayout) {
+    Services.preconnectFor(this.win).url(
+      this.getAmpDoc(),
+      this.getIframeBaseSrc_(),
+      opt_onLayout
+    );
+  }
+
+  /** @override */
+  buildCallback() {
+    // Uses the video manager in order to support auto-pause of media.
+    installVideoManagerForDoc(this.element);
+  }
+
+  /** @override */
+  layoutCallback() {
+    const name = JSON.stringify(this.getMetadata_());
+
+    this.iframe_ = disableScrollingOnIframe(
+      createFrameFor(this, this.getIframeSrc_(), name, SANDBOX)
+    );
+
+    Services.videoManagerForDoc(this.element).register(this);
+
+    return this.loadPromise(this.iframe_);
+  }
+
+  /** @override */
+  isLayoutSupported(layout) {
+    return layout == Layout_Enum.FIXED || layout == Layout_Enum.FIXED_HEIGHT;
+  }
+
+  /** @override */
+  unlayoutCallback() {
+    if (this.iframe_) {
+      removeElement(this.iframe_);
+      this.iframe_ = null;
+    }
+
+    return true;
+  }
+
+  /** @override */
+  pauseCallback() {
+    this.pause();
+  }
+
+  /** @override */
+  resumeCallback() {
+    this.play(false /** unusedIsAutoplay */);
+  }
+
+  /** @return {string} */
+  getIframeBaseSrc_() {
+    const baseSrc = this.element.getAttribute(BASE_SRC_PARAM_NAME);
+    return baseSrc ?? DEFAULT_IFRAME_BASE_URL;
+  }
+
+  /** @return {string} */
+  getIframeSrc_() {
+    const src = addParamsToUrl(
+      this.getIframeBaseSrc_(),
+      getDataParamsFromAttributes(
+        this.element,
+        /* opt_computeParamNameFunc = */ undefined,
+        '^(.+)'
+      )
+    );
+
+    return `${src}#ampGoogleReadAloudPlayer=1`;
+  }
+
+  /**
+   * @return {!JsonObject}
+   * @private
+   */
+  getMetadata_() {
+    const {canonicalUrl, sourceUrl} = Services.documentInfoForDoc(this.element);
+    const rootNode = this.getAmpDoc().getRootNode();
+
+    return {
+      'sourceUrl': sourceUrl,
+      'canonicalUrl': canonicalUrl,
+      'jsonLd': this.getJsonLd_(rootNode),
+    };
+  }
+
+  /**
+   * @param {!Node} root
+   * @return {?JsonObject}
+   */
+  getJsonLd_(root) {
+    const scriptTag = root.querySelector('script[type="application/ld+json"]');
+    return scriptTag && tryParseJson(scriptTag.textContent);
+  }
+
+  /**
+   * Posts a message to the iframe.
+   * @param {string} action
+   * @private
+   */
+  postMessage_(action) {
+    if (this.iframe_ && this.iframe_.contentWindow) {
+      this.iframe_.contentWindow./*OK*/ postMessage(
+        JSON.stringify(/** @type {JsonObject} */ ({action})),
+        '*'
+      );
+    }
+  }
+
+  // VideoInterface Implementation. See ../src/video-interface.VideoInterface
+
+  // TODO(mhalabi-google): report media events.
+
+  /** @override */
+  supportsPlatform() {
+    return true;
+  }
+
+  /** @override */
+  isInteractive() {
+    return true;
+  }
+
+  /** @override */
+  play(unusedIsAutoplay) {
+    this.postMessage_('play');
+  }
+
+  /** @override */
+  pause() {
+    this.postMessage_('pause');
+  }
+
+  /** @override */
+  mute() {
+    this.postMessage_('mute');
+  }
+
+  /** @override */
+  unmute() {
+    this.postMessage_('unmute');
+  }
+
+  /** @override */
+  showControls() {
+    // Not supported.
+  }
+
+  /** @override */
+  hideControls() {
+    // Not supported.
+  }
+
+  /** @override */
+  getMetadata() {
+    // Not implemented
+  }
+
+  /** @override */
+  preimplementsAutoFullscreen() {
+    return false;
+  }
+
+  /** @override */
+  preimplementsMediaSessionAPI() {
+    // Read Aloud already updates the Media Session so no need for the video
+    // manager to update it too.
+    return true;
+  }
+
+  /** @override */
+  fullscreenEnter() {
+    // Not supported.
+  }
+
+  /** @override */
+  fullscreenExit() {
+    // Not supported.
+  }
+
+  /** @override */
+  isFullscreen() {
+    return false;
+  }
+
+  /** @override */
+  seekTo(unusedTimeSeconds) {
+    this.user().error(TAG, '`seekTo` not supported.');
+  }
+}
+
+AMP.extension(TAG, '0.1', (AMP) => {
+  AMP.registerElement(TAG, AmpGoogleReadAloudPlayer);
+});
diff --git a/extensions/amp-google-read-aloud-player/0.1/test/test-amp-google-read-aloud-player.js b/extensions/amp-google-read-aloud-player/0.1/test/test-amp-google-read-aloud-player.js
new file mode 100644
index 000000000000..84c1831a8405
--- /dev/null
+++ b/extensions/amp-google-read-aloud-player/0.1/test/test-amp-google-read-aloud-player.js
@@ -0,0 +1,249 @@
+import '../amp-google-read-aloud-player';
+
+import {createElementWithAttributes} from '#core/dom';
+
+import {Services} from '#service';
+
+import {macroTask} from '#testing/helpers';
+
+const IFRAME_BASE_URL =
+  'https://www.gstatic.com/readaloud/player/web/api/iframe/index.html';
+
+const API_KEY = 'YOUR_API_KEY';
+const TRACKING_IDS = 'YOUR_TRACKING_IDS';
+const URL = 'http://www.example.com';
+const CALL_TO_ACTION_LABEL = 'Listen to this article';
+const LOCALE = 'en';
+const INTRO = 'http://www.example.com/intro.mp3';
+const OUTRO = 'http://www.example.com/outro.mp3';
+const AD_TAG_URL = 'http://www.example.com/ad';
+const VOICE = 'SOME_VOICE';
+const BASE_SRC = 'https://localhost:8080/';
+
+const LAYOUT_ATTRS = {
+  height: 60,
+};
+
+describes.realWin(
+  'amp-google-read-aloud-player',
+  {
+    amp: {
+      extensions: ['amp-google-read-aloud-player'],
+    },
+  },
+  (env) => {
+    let win;
+    let doc;
+    let videoManagerStub;
+
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+
+      videoManagerStub = {
+        register: env.sandbox.spy(),
+      };
+
+      env.sandbox
+        .stub(Services, 'videoManagerForDoc')
+        .returns(videoManagerStub);
+    });
+
+    function createGoogleReadAloudPlayer(attrs = {}) {
+      const el = createElementWithAttributes(
+        doc,
+        'amp-google-read-aloud-player',
+        {
+          ...attrs,
+          ...LAYOUT_ATTRS,
+        }
+      );
+      doc.body.appendChild(el);
+      return el;
+    }
+
+    function createAndRenderGoogleReadAloudPlayer(attrs = {}) {
+      const element = createGoogleReadAloudPlayer(attrs);
+
+      return element
+        .buildInternal()
+        .then(() => {
+          element.layoutCallback();
+        })
+        .then(() => element);
+    }
+
+    async function createAndRenderBasicGoogleReadAloudPlayer() {
+      return createAndRenderGoogleReadAloudPlayer({
+        'data-api-key': API_KEY,
+        'data-tracking-ids': TRACKING_IDS,
+        'data-voice': VOICE,
+      });
+    }
+
+    async function stubPostMessage(element) {
+      const impl = await element.getImpl(false);
+      return env.sandbox./*OK*/ stub(impl, 'postMessage_');
+    }
+
+    describe('#layoutCallback', () => {
+      it('sets required params in iframe src', async () => {
+        const canonicalUrl = 'foo.html';
+        const sourceUrl = 'bar.html';
+        env.sandbox.stub(Services, 'documentInfoForDoc').returns({
+          canonicalUrl,
+          sourceUrl,
+        });
+
+        const element = await createAndRenderBasicGoogleReadAloudPlayer();
+
+        const iframe = element.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.src).to.contain(
+          `${IFRAME_BASE_URL}?` +
+            `apiKey=${API_KEY}&` +
+            `trackingIds=${TRACKING_IDS}&` +
+            `voice=${VOICE}`
+        );
+      });
+
+      it('sets optional params in iframe src', async () => {
+        const element = await createAndRenderGoogleReadAloudPlayer({
+          'data-api-key': API_KEY,
+          'data-tracking-ids': TRACKING_IDS,
+          'data-voice': VOICE,
+          'data-url': URL,
+          'data-speakable': '',
+          'data-call-to-action-label': CALL_TO_ACTION_LABEL,
+          'data-locale': LOCALE,
+          'data-intro': INTRO,
+          'data-outro': OUTRO,
+          'data-ad-tag-url': AD_TAG_URL,
+        });
+
+        const iframe = element.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.src).to.contain(
+          `${IFRAME_BASE_URL}?` +
+            `apiKey=${API_KEY}&` +
+            `trackingIds=${TRACKING_IDS}&` +
+            `voice=${VOICE}&` +
+            `url=${encodeURIComponent(URL)}&` +
+            `speakable=&` +
+            `callToActionLabel=${encodeURIComponent(CALL_TO_ACTION_LABEL)}&` +
+            `locale=${LOCALE}&` +
+            `intro=${encodeURIComponent(INTRO)}&` +
+            `outro=${encodeURIComponent(OUTRO)}&` +
+            `adTagUrl=${encodeURIComponent(AD_TAG_URL)}`
+        );
+      });
+
+      it('sets optional iframe base src', async () => {
+        const element = await createAndRenderGoogleReadAloudPlayer({
+          'data-api-key': API_KEY,
+          'data-tracking-ids': TRACKING_IDS,
+          'data-voice': VOICE,
+          'src': BASE_SRC,
+        });
+
+        const iframe = element.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.src).to.contain(
+          `${BASE_SRC}?` +
+            `apiKey=${API_KEY}&` +
+            `trackingIds=${TRACKING_IDS}&` +
+            `voice=${VOICE}`
+        );
+      });
+
+      it('sets metadata in iframe name — with jsonLd', async () => {
+        const canonicalUrl = 'foo.html';
+        const sourceUrl = 'bar.html';
+        env.sandbox.stub(Services, 'documentInfoForDoc').returns({
+          canonicalUrl,
+          sourceUrl,
+        });
+
+        const jsonLd = {jsonLd: 'blah'};
+        const jsonLdScript = win.document.createElement('script');
+        jsonLdScript.type = 'application/ld+json';
+        jsonLdScript.text = JSON.stringify(jsonLd);
+
+        win.document.head.appendChild(jsonLdScript);
+
+        const element = await createAndRenderBasicGoogleReadAloudPlayer();
+
+        const iframe = element.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(JSON.parse(iframe.name)).to.deep.equal({
+          canonicalUrl,
+          sourceUrl,
+          jsonLd,
+        });
+      });
+
+      it('sets ampGoogleReadAloudPlayer=1 fragment in src', async () => {
+        const element = await createAndRenderBasicGoogleReadAloudPlayer();
+
+        const iframe = element.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.src).to.match(/.*#ampGoogleReadAloudPlayer=1$/);
+      });
+    });
+
+    const implementedVideoInterfaceMethods = [
+      'play',
+      'pause',
+      'mute',
+      'unmute',
+    ];
+
+    implementedVideoInterfaceMethods.forEach((method) => {
+      describe(`#${method}`, () => {
+        const lowercaseMethod = method.toLowerCase();
+
+        it(`should post '${lowercaseMethod}'`, async () => {
+          const element = await createAndRenderBasicGoogleReadAloudPlayer();
+
+          const postMessage = await stubPostMessage(element);
+
+          const impl = await element.getImpl(false);
+          impl[method]();
+
+          await macroTask();
+
+          expect(postMessage.withArgs(lowercaseMethod)).to.have.been.calledOnce;
+        });
+      });
+    });
+
+    it('unlayoutCallback', async () => {
+      const element = await createAndRenderBasicGoogleReadAloudPlayer();
+
+      const impl = await element.getImpl(false);
+      expect(impl.unlayoutCallback()).to.be.true;
+
+      const iframe = element.querySelector('iframe');
+      expect(iframe).to.be.null;
+      expect(impl.iframe).to.be.undefined;
+    });
+
+    it('pauseCallback', async () => {
+      const element = await createAndRenderBasicGoogleReadAloudPlayer();
+      const impl = await element.getImpl(false);
+      env.sandbox.spy(impl, 'pause');
+
+      impl.pauseCallback();
+      expect(impl.pause.withArgs()).to.have.been.calledOnce;
+    });
+
+    it('resumeCallback', async () => {
+      const element = await createAndRenderBasicGoogleReadAloudPlayer();
+      const impl = await element.getImpl(false);
+      env.sandbox.spy(impl, 'play');
+
+      impl.resumeCallback();
+      expect(impl.play.withArgs(false)).to.have.been.calledOnce;
+    });
+  }
+);
diff --git a/extensions/amp-google-read-aloud-player/0.1/test/validator-amp-google-read-aloud-player.html b/extensions/amp-google-read-aloud-player/0.1/test/validator-amp-google-read-aloud-player.html
new file mode 100644
index 000000000000..6bcabd426116
--- /dev/null
+++ b/extensions/amp-google-read-aloud-player/0.1/test/validator-amp-google-read-aloud-player.html
@@ -0,0 +1,177 @@
+<!--
+  Test Description:
+  Tests for amp-google-read-aloud-player tag.
+-->
+<!doctype html>
+<html ⚡>
+
+<head>
+  <meta charset="utf-8">
+  <title>amp-google-read-aloud-player example</title>
+  <link rel="canonical" href="amps.html">
+  <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+  <style amp-boilerplate>
+    body {
+      -webkit-animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+      -moz-animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+      -ms-animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+      animation: -amp-start 8s steps(1, end) 0s 1 normal both
+    }
+
+    @-webkit-keyframes -amp-start {
+      from {
+        visibility: hidden
+      }
+
+      to {
+        visibility: visible
+      }
+    }
+
+    @-moz-keyframes -amp-start {
+      from {
+        visibility: hidden
+      }
+
+      to {
+        visibility: visible
+      }
+    }
+
+    @-ms-keyframes -amp-start {
+      from {
+        visibility: hidden
+      }
+
+      to {
+        visibility: visible
+      }
+    }
+
+    @-o-keyframes -amp-start {
+      from {
+        visibility: hidden
+      }
+
+      to {
+        visibility: visible
+      }
+    }
+
+    @keyframes -amp-start {
+      from {
+        visibility: hidden
+      }
+
+      to {
+        visibility: visible
+      }
+    }
+  </style><noscript>
+    <style amp-boilerplate>
+      body {
+        -webkit-animation: none;
+        -moz-animation: none;
+        -ms-animation: none;
+        animation: none
+      }
+    </style>
+  </noscript>
+  <script async custom-element="amp-google-read-aloud-player" src="https://cdn.ampproject.org/v0/amp-google-read-aloud-player-0.1.js"></script>
+  <script async src="https://cdn.ampproject.org/v0.js"></script>
+</head>
+
+<body>
+  <!-- Valid: No data-url -->
+  <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-tracking-ids="UA-168915890-1" data-voice="en.some-voice">
+  </amp-google-read-aloud-player>
+
+  <!-- Valid: Has data-url -->
+  <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-tracking-ids="UA-168915890-1"
+    data-url="https://blog.google/products/assistant/easier-access-web-pages-let-assistant-read-it-aloud/"
+    data-voice="en.some-voice">
+  </amp-google-read-aloud-player>
+
+  <!-- Valid: Multiple values for data-tracking-ids -->
+  <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-tracking-ids="UA-168915890-1,UA-168915890-2" data-voice="en.some-voice">
+  </amp-google-read-aloud-player>
+
+  <!-- Valid: Opposite digits sections for data-tracking-ids -->
+  <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-tracking-ids="UA-1-168915890"
+    data-voice="en.some-voice">
+  </amp-google-read-aloud-player>
+
+  <!-- Valid: Few digits data-tracking-ids -->
+  <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-tracking-ids="UA-1-1" data-voice="en.some-voice">
+  </amp-google-read-aloud-player>
+
+  <!-- Valid: English locale for data-locale -->
+  <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-tracking-ids="UA-168915890-1" data-voice="en.some-voice" data-locale="en">
+  </amp-google-read-aloud-player>
+
+  <!-- Valid: Spanish locale for data-locale -->
+  <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-tracking-ids="UA-168915890-1" data-voice="en.some-voice" data-locale="es">
+  </amp-google-read-aloud-player>
+
+  <!-- Invalid: No data-api-key -->
+  <amp-google-read-aloud-player height="66" data-tracking-ids="UA-168915890-1" data-voice="en.some-voice">
+  </amp-google-read-aloud-player>
+
+  <!-- Invalid: Missing UA prefix data-tracking-ids -->
+  <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-tracking-ids="123" data-voice="en.some-voice">
+  </amp-google-read-aloud-player>
+
+  <!-- Invalid: No UA prefix for data-tracking-ids -->
+  <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-tracking-ids="168915890-1" data-voice="en.some-voice">
+  </amp-google-read-aloud-player>
+
+  <!-- Invalid: Missing second number data-tracking-ids -->
+  <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-tracking-ids="ua-1" data-voice="en.some-voice">
+  </amp-google-read-aloud-player>
+
+  <!-- Invalid: Surplus digit data-tracking-ids -->
+  <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-tracking-ids="UA-1-1.2" data-voice="en.some-voice">
+  </amp-google-read-aloud-player>
+
+  <!-- Invalid: Emptry data-tracking-ids -->
+  <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-tracking-ids="" data-voice="en.some-voice">
+  </amp-google-read-aloud-player>
+
+  <!-- Invalid: Surplus letters data-tracking-ids -->
+  <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-tracking-ids="UA-1-1 XYZ" data-voice="en.some-voice">
+  </amp-google-read-aloud-player>
+
+  <!-- Invalid: No data-tracking-ids -->
+  <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-voice="en.some-voice">
+  </amp-google-read-aloud-player>
+
+  <!-- Invalid: No data-voice -->
+  <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-tracking-ids="UA-168915890-1">
+  </amp-google-read-aloud-player>
+
+  <!-- Invalid: Local address value for data-url -->
+  <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-url="index.html" data-voice="en.some-voice">
+  </amp-google-read-aloud-player>
+
+  <!-- Invalid: http protocol for data-url -->
+  <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-url="http://www.example.com/index.html" data-voice="en.some-voice">
+  </amp-google-read-aloud-player>
+
+  <!-- Valid: Four letters locale for data-locale -->
+  <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-tracking-ids="UA-168915890-1" data-voice="en.some-voice" data-locale="en-US">
+  </amp-google-read-aloud-player>
+
+  <!-- Invalid: Local address value for data-intro -->
+  <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-voice="en.some-voice" data-intro="file.mp3">
+  </amp-google-read-aloud-player>
+
+  <!-- Invalid: Local address value for data-outro -->
+  <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-voice="en.some-voice" data-outro="file.mp3">
+  </amp-google-read-aloud-player>
+
+  <!-- Invalid: Local address value for data-ad-tag-url -->
+  <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-voice="en.some-voice" data-ad-tag-url="index.html">
+  </amp-google-read-aloud-player>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/extensions/amp-google-read-aloud-player/0.1/test/validator-amp-google-read-aloud-player.out b/extensions/amp-google-read-aloud-player/0.1/test/validator-amp-google-read-aloud-player.out
new file mode 100644
index 000000000000..caf670f3039c
--- /dev/null
+++ b/extensions/amp-google-read-aloud-player/0.1/test/validator-amp-google-read-aloud-player.out
@@ -0,0 +1,208 @@
+FAIL
+|  <!--
+|    Test Description:
+|    Tests for amp-google-read-aloud-player tag.
+|  -->
+|  <!doctype html>
+|  <html ⚡>
+|
+|  <head>
+|    <meta charset="utf-8">
+|    <title>amp-google-read-aloud-player example</title>
+|    <link rel="canonical" href="amps.html">
+|    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+|    <style amp-boilerplate>
+|      body {
+|        -webkit-animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+|        -moz-animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+|        -ms-animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+|        animation: -amp-start 8s steps(1, end) 0s 1 normal both
+|      }
+|
+|      @-webkit-keyframes -amp-start {
+|        from {
+|          visibility: hidden
+|        }
+|
+|        to {
+|          visibility: visible
+|        }
+|      }
+|
+|      @-moz-keyframes -amp-start {
+|        from {
+|          visibility: hidden
+|        }
+|
+|        to {
+|          visibility: visible
+|        }
+|      }
+|
+|      @-ms-keyframes -amp-start {
+|        from {
+|          visibility: hidden
+|        }
+|
+|        to {
+|          visibility: visible
+|        }
+|      }
+|
+|      @-o-keyframes -amp-start {
+|        from {
+|          visibility: hidden
+|        }
+|
+|        to {
+|          visibility: visible
+|        }
+|      }
+|
+|      @keyframes -amp-start {
+|        from {
+|          visibility: hidden
+|        }
+|
+|        to {
+|          visibility: visible
+|        }
+|      }
+|    </style><noscript>
+|      <style amp-boilerplate>
+|        body {
+|          -webkit-animation: none;
+|          -moz-animation: none;
+|          -ms-animation: none;
+|          animation: none
+|        }
+|      </style>
+|    </noscript>
+|    <script async custom-element="amp-google-read-aloud-player" src="https://cdn.ampproject.org/v0/amp-google-read-aloud-player-0.1.js"></script>
+|    <script async src="https://cdn.ampproject.org/v0.js"></script>
+|  </head>
+|
+|  <body>
+|    <!-- Valid: No data-url -->
+|    <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-tracking-ids="UA-168915890-1" data-voice="en.some-voice">
+|    </amp-google-read-aloud-player>
+|
+|    <!-- Valid: Has data-url -->
+|    <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-tracking-ids="UA-168915890-1"
+|      data-url="https://blog.google/products/assistant/easier-access-web-pages-let-assistant-read-it-aloud/"
+|      data-voice="en.some-voice">
+|    </amp-google-read-aloud-player>
+|
+|    <!-- Valid: Multiple values for data-tracking-ids -->
+|    <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-tracking-ids="UA-168915890-1,UA-168915890-2" data-voice="en.some-voice">
+|    </amp-google-read-aloud-player>
+|
+|    <!-- Valid: Opposite digits sections for data-tracking-ids -->
+|    <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-tracking-ids="UA-1-168915890"
+|      data-voice="en.some-voice">
+|    </amp-google-read-aloud-player>
+|
+|    <!-- Valid: Few digits data-tracking-ids -->
+|    <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-tracking-ids="UA-1-1" data-voice="en.some-voice">
+|    </amp-google-read-aloud-player>
+|
+|    <!-- Valid: English locale for data-locale -->
+|    <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-tracking-ids="UA-168915890-1" data-voice="en.some-voice" data-locale="en">
+|    </amp-google-read-aloud-player>
+|
+|    <!-- Valid: Spanish locale for data-locale -->
+|    <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-tracking-ids="UA-168915890-1" data-voice="en.some-voice" data-locale="es">
+|    </amp-google-read-aloud-player>
+|
+|    <!-- Invalid: No data-api-key -->
+|    <amp-google-read-aloud-player height="66" data-tracking-ids="UA-168915890-1" data-voice="en.some-voice">
+>>   ^~~~~~~~~
+amp-google-read-aloud-player/0.1/test/validator-amp-google-read-aloud-player.html:117:2 The mandatory attribute 'data-api-key' is missing in tag 'amp-google-read-aloud-player'. (see https://amp.dev/documentation/components/amp-google-read-aloud-player)
+|    </amp-google-read-aloud-player>
+|
+|    <!-- Invalid: Missing UA prefix data-tracking-ids -->
+|    <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-tracking-ids="123" data-voice="en.some-voice">
+>>   ^~~~~~~~~
+amp-google-read-aloud-player/0.1/test/validator-amp-google-read-aloud-player.html:121:2 The attribute 'data-tracking-ids' in tag 'amp-google-read-aloud-player' is set to the invalid value '123'. (see https://amp.dev/documentation/components/amp-google-read-aloud-player)
+|    </amp-google-read-aloud-player>
+|
+|    <!-- Invalid: No UA prefix for data-tracking-ids -->
+|    <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-tracking-ids="168915890-1" data-voice="en.some-voice">
+>>   ^~~~~~~~~
+amp-google-read-aloud-player/0.1/test/validator-amp-google-read-aloud-player.html:125:2 The attribute 'data-tracking-ids' in tag 'amp-google-read-aloud-player' is set to the invalid value '168915890-1'. (see https://amp.dev/documentation/components/amp-google-read-aloud-player)
+|    </amp-google-read-aloud-player>
+|
+|    <!-- Invalid: Missing second number data-tracking-ids -->
+|    <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-tracking-ids="ua-1" data-voice="en.some-voice">
+>>   ^~~~~~~~~
+amp-google-read-aloud-player/0.1/test/validator-amp-google-read-aloud-player.html:129:2 The attribute 'data-tracking-ids' in tag 'amp-google-read-aloud-player' is set to the invalid value 'ua-1'. (see https://amp.dev/documentation/components/amp-google-read-aloud-player)
+|    </amp-google-read-aloud-player>
+|
+|    <!-- Invalid: Surplus digit data-tracking-ids -->
+|    <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-tracking-ids="UA-1-1.2" data-voice="en.some-voice">
+>>   ^~~~~~~~~
+amp-google-read-aloud-player/0.1/test/validator-amp-google-read-aloud-player.html:133:2 The attribute 'data-tracking-ids' in tag 'amp-google-read-aloud-player' is set to the invalid value 'UA-1-1.2'. (see https://amp.dev/documentation/components/amp-google-read-aloud-player)
+|    </amp-google-read-aloud-player>
+|
+|    <!-- Invalid: Emptry data-tracking-ids -->
+|    <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-tracking-ids="" data-voice="en.some-voice">
+>>   ^~~~~~~~~
+amp-google-read-aloud-player/0.1/test/validator-amp-google-read-aloud-player.html:137:2 The attribute 'data-tracking-ids' in tag 'amp-google-read-aloud-player' is set to the invalid value ''. (see https://amp.dev/documentation/components/amp-google-read-aloud-player)
+|    </amp-google-read-aloud-player>
+|
+|    <!-- Invalid: Surplus letters data-tracking-ids -->
+|    <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-tracking-ids="UA-1-1 XYZ" data-voice="en.some-voice">
+>>   ^~~~~~~~~
+amp-google-read-aloud-player/0.1/test/validator-amp-google-read-aloud-player.html:141:2 The attribute 'data-tracking-ids' in tag 'amp-google-read-aloud-player' is set to the invalid value 'UA-1-1 XYZ'. (see https://amp.dev/documentation/components/amp-google-read-aloud-player)
+|    </amp-google-read-aloud-player>
+|
+|    <!-- Invalid: No data-tracking-ids -->
+|    <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-voice="en.some-voice">
+>>   ^~~~~~~~~
+amp-google-read-aloud-player/0.1/test/validator-amp-google-read-aloud-player.html:145:2 The mandatory attribute 'data-tracking-ids' is missing in tag 'amp-google-read-aloud-player'. (see https://amp.dev/documentation/components/amp-google-read-aloud-player)
+|    </amp-google-read-aloud-player>
+|
+|    <!-- Invalid: No data-voice -->
+|    <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-tracking-ids="UA-168915890-1">
+>>   ^~~~~~~~~
+amp-google-read-aloud-player/0.1/test/validator-amp-google-read-aloud-player.html:149:2 The mandatory attribute 'data-voice' is missing in tag 'amp-google-read-aloud-player'. (see https://amp.dev/documentation/components/amp-google-read-aloud-player)
+|    </amp-google-read-aloud-player>
+|
+|    <!-- Invalid: Local address value for data-url -->
+|    <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-url="index.html" data-voice="en.some-voice">
+>>   ^~~~~~~~~
+amp-google-read-aloud-player/0.1/test/validator-amp-google-read-aloud-player.html:153:2 The relative URL 'index.html' for attribute 'data-url' in tag 'amp-google-read-aloud-player' is disallowed. (see https://amp.dev/documentation/components/amp-google-read-aloud-player)
+|    </amp-google-read-aloud-player>
+|
+|    <!-- Invalid: http protocol for data-url -->
+|    <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-url="http://www.example.com/index.html" data-voice="en.some-voice">
+>>   ^~~~~~~~~
+amp-google-read-aloud-player/0.1/test/validator-amp-google-read-aloud-player.html:157:2 Invalid URL protocol 'http:' for attribute 'data-url' in tag 'amp-google-read-aloud-player'. (see https://amp.dev/documentation/components/amp-google-read-aloud-player)
+|    </amp-google-read-aloud-player>
+|
+|    <!-- Valid: Four letters locale for data-locale -->
+|    <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-tracking-ids="UA-168915890-1" data-voice="en.some-voice" data-locale="en-US">
+>>   ^~~~~~~~~
+amp-google-read-aloud-player/0.1/test/validator-amp-google-read-aloud-player.html:161:2 The attribute 'data-locale' in tag 'amp-google-read-aloud-player' is set to the invalid value 'en-US'. (see https://amp.dev/documentation/components/amp-google-read-aloud-player)
+|    </amp-google-read-aloud-player>
+|
+|    <!-- Invalid: Local address value for data-intro -->
+|    <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-voice="en.some-voice" data-intro="file.mp3">
+>>   ^~~~~~~~~
+amp-google-read-aloud-player/0.1/test/validator-amp-google-read-aloud-player.html:165:2 The relative URL 'file.mp3' for attribute 'data-intro' in tag 'amp-google-read-aloud-player' is disallowed. (see https://amp.dev/documentation/components/amp-google-read-aloud-player)
+|    </amp-google-read-aloud-player>
+|
+|    <!-- Invalid: Local address value for data-outro -->
+|    <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-voice="en.some-voice" data-outro="file.mp3">
+>>   ^~~~~~~~~
+amp-google-read-aloud-player/0.1/test/validator-amp-google-read-aloud-player.html:169:2 The relative URL 'file.mp3' for attribute 'data-outro' in tag 'amp-google-read-aloud-player' is disallowed. (see https://amp.dev/documentation/components/amp-google-read-aloud-player)
+|    </amp-google-read-aloud-player>
+|
+|    <!-- Invalid: Local address value for data-ad-tag-url -->
+|    <amp-google-read-aloud-player height="66" data-api-key="YOUR_API_KEY" data-voice="en.some-voice" data-ad-tag-url="index.html">
+>>   ^~~~~~~~~
+amp-google-read-aloud-player/0.1/test/validator-amp-google-read-aloud-player.html:173:2 The relative URL 'index.html' for attribute 'data-ad-tag-url' in tag 'amp-google-read-aloud-player' is disallowed. (see https://amp.dev/documentation/components/amp-google-read-aloud-player)
+|    </amp-google-read-aloud-player>
+|  </body>
+|
+|  </html>
\ No newline at end of file
diff --git a/extensions/amp-google-read-aloud-player/OWNERS b/extensions/amp-google-read-aloud-player/OWNERS
new file mode 100644
index 000000000000..77a55ee52b28
--- /dev/null
+++ b/extensions/amp-google-read-aloud-player/OWNERS
@@ -0,0 +1,10 @@
+// For an explanation of the OWNERS rules and syntax, see:
+// https://github.com/ampproject/amp-github-apps/blob/main/owners/OWNERS.example
+
+{
+  rules: [
+    {
+      owners: [{name: 'ampproject/wg-components'}],
+    },
+  ],
+}
diff --git a/extensions/amp-google-read-aloud-player/amp-google-read-aloud-player.md b/extensions/amp-google-read-aloud-player/amp-google-read-aloud-player.md
new file mode 100644
index 000000000000..b9115b08ef8f
--- /dev/null
+++ b/extensions/amp-google-read-aloud-player/amp-google-read-aloud-player.md
@@ -0,0 +1,129 @@
+---
+$category@: media
+formats:
+  - websites
+teaser:
+  text: Embeds the Google Read Aloud Player.
+---
+
+# amp-google-read-aloud-player
+
+## Behavior
+
+Embeds the Google Read Aloud player. This player reads the content of your page out loud.
+
+## Attributes
+
+<table>
+  <tr>
+    <td width="20%"><strong>data-api-key (required)</strong></td>
+    <td>API key identifies the publisher, and must be provided in order to use the player.
+<br><br>
+Each API Key is correlated to a closed list of domains that represent the publisher domains. Only
+URLs that belong to one of these domains are able to be played by the web player.
+<br><br>
+During the piloting phase, the API Key will be provided to the publisher by Google. Other API Keys
+that were generated using the Google Cloud Console won’t work.
+</td>
+  </tr>
+    <tr>
+    <td width="20%"><strong>data-tracking-ids (required)</strong></td>
+    <td>The list of the <a href="https://support.google.com/analytics/answer/7372977">
+Google Analytics tracking IDs</a> to send the player metrics to (comma separated).
+<br><br>
+You are required to have a Google Analytics tracking ID in order to use this player during the
+pilot period. The tracking ID will be provided to you by Google.
+<br><br>
+If you want to send the player metrics also to your Google Analytics account, add your tracking ID 
+(or IDs) to this list.
+</td>
+  </tr>
+  <tr>
+    <td width="20%"><strong>data-voice (required)</strong></td>
+    <td>The voice to use for generating the Text-to-Speech audio. Publishers should use only
+a single voice and only from the supported voices list (TBD).</td>
+  </tr>
+  <tr>
+    <td width="20%"><strong>data-url</strong></td>
+    <td>The canonical URL of the web page to read aloud. The URL must be publicly accessible and
+free of any PII. The URL must be on a domain that was configured by Google and correlated with the
+specific API key.
+<br><br>
+When the parameter isn’t provided, the player uses the Canonical URL link tag of the current page.
+This is useful for reading aloud the content of the current page and only a single Read Aloud
+player is embedded in the page (no infinite scroll).
+<br><br>
+This value overrides it, and publishers are required to set it only in these cases:
+<ol>
+  <li>Other page - When the player is embedded in a different page than the one that its content
+should be read aloud. In this case, set this parameter to the canonical URL of the other page.</li>
+  <li>Multiple players - When there are multiple players on the same page, see Multiple players
+(infinite scroll). In this case, set this parameter to the canonical URL of the article that the
+player should read aloud.</li>
+  <li>Canonical URL tag is missing - When the Canonical URL link tag of the current page is missing
+(and cannot be added). In this case, set this parameter to the canonical URL of the page.</td>
+</li>
+</ol>
+  </tr>
+  <tr>
+    <td width="20%"><strong>data-speakable</strong></td>
+    <td>Controls the contents to read aloud.
+<br><br>
+When present, uses text only from elements annotated with 
+<a href="https://developers.google.com/search/docs/data-types/speakable">speakable markup</a>, otherwise, 
+Google analyzes the document automatically to choose the suitable text parts.
+  </tr>
+  <tr>
+    <td width="20%"><strong>data-call-to-action-label</strong></td>
+    <td>The call to action label that is shown before the user pressed on <i>play</i> for the 
+first time. Publishers can use it as a teaser to invite users to press the <i>play</i> button. 
+If not present, "Listen to article" (localized) is shown. The string can be in any language.</td>
+  </tr>
+  <tr>
+    <td width="20%"><strong>data-intro</strong></td>
+    <td>The URL of the MP3 audio file which will be played before the player starts reading from 
+the beginning. The intro can be used by publishers to create a unique opening for each playback. 
+The intro is played whenever a listener starts playback from the beginning.</td>
+  </tr>
+  <tr>
+    <td width="20%"><strong>data-outro</strong></td>
+    <td>The URL of the MP3 audio file which will be played after the player ends reading. The 
+outro can be used by publishers to create a unique ending for each playback.</td>
+  </tr>
+  <tr>
+    <td width="20%"><strong>data-ad-tag-url</strong></td>
+    <td>A complete <a href ="https://support.google.com/admanager/table/9749596">VAST ad tag URL</a> 
+with parameters for playing pre-roll audio ads. When present, audio ads will be played before 
+reading aloud page contents, after the user clicks on the play button for the first time. If not 
+present, only page content will be played.<br/>
+The ad tag URL must include the following parameters:
+
+<ul>
+  <li>iu=[Ad unit code]</li>
+  <li>sz=1x1</li>
+  <li>ad_type=audio</li>
+  <li>output=vast</li>
+  <li>unviewed_position_start=1</li>
+  <li>env=instream</li>
+  <li>vad_type=linear</li>
+</ul></td>
+  </tr>
+</table>
+
+## Usage
+
+Include an `amp-google-read-aloud-player` on your AMP document:
+
+```html
+<amp-google-read-aloud-player
+  height="65"
+  data-api-key="<YOUR_API_KEY>"
+  data-tracking-ids="<YOUR_TRACKING_IDS>"
+  data-voice="<YOUR_VOICE>"
+></amp-google-read-aloud-player>
+```
+
+## Validation
+
+See [amp-google-read-aloud-player rules](https://github.com/ampproject/amphtml/blob/main/extensions/amp-google-read-aloud-player/validator-amp-google-read-aloud-player.protoascii)
+in the AMP validator specification.
diff --git a/extensions/amp-google-read-aloud-player/validator-amp-google-read-aloud-player.protoascii b/extensions/amp-google-read-aloud-player/validator-amp-google-read-aloud-player.protoascii
new file mode 100644
index 000000000000..99fd261c122b
--- /dev/null
+++ b/extensions/amp-google-read-aloud-player/validator-amp-google-read-aloud-player.protoascii
@@ -0,0 +1,73 @@
+tags: {  # amp-google-read-aloud-player
+  html_format: AMP
+  tag_name: "SCRIPT"
+  extension_spec: {
+    name: "amp-google-read-aloud-player"
+    version: "0.1"
+    version: "latest"
+  }
+  attr_lists: "common-extension-attrs"
+}
+tags: {  # <amp-google-read-aloud-player>
+  html_format: AMP
+  tag_name: "AMP-GOOGLE-READ-ALOUD-PLAYER"
+  requires_extension: "amp-google-read-aloud-player"
+  attrs: {
+    name: "data-api-key"
+    mandatory: true
+  }
+  attrs: {
+    name: "data-tracking-ids"
+    mandatory: true;
+    value_regex_casei: "^UA-\\d+-\\d+(\\s*,\\s*UA-\\d+-\\d+)*$";
+  }
+  attrs: {
+    name: "data-voice"
+    mandatory: true;
+  }
+  attrs: {
+    name: "data-url"
+    value_url {
+      protocol: 'https';
+      allow_relative: false;
+    }
+  }
+  attrs: {
+    name: "data-speakable"
+    value: ""
+  }
+  attrs: {
+    name: "data-call-to-action-label"
+  }
+  attrs: {
+    name: "data-locale"
+    value_regex_casei: "[a-z]{2}";
+  }
+  attrs: {
+    name: "data-intro"
+    value_url {
+      protocol: 'https';
+      allow_relative: false;
+    }
+  }
+  attrs: {
+    name: "data-outro"
+    value_url {
+      protocol: 'https';
+      allow_relative: false;
+    }
+  }
+  attrs: {
+    name: "data-ad-tag-url"
+    value_url {
+      protocol: 'https';
+      allow_relative: false;
+    }
+  }
+  spec_url: "https://amp.dev/documentation/components/amp-google-read-aloud-player"
+  attr_lists: "extended-amp-global"
+  amp_layout: {
+    supported_layouts: FIXED
+    supported_layouts: FIXED_HEIGHT
+  }
+}
diff --git a/extensions/amp-gwd-animation/0.1/amp-gwd-animation-impl.js b/extensions/amp-gwd-animation/0.1/amp-gwd-animation-impl.js
index 8ca1d0b92439..dfb12afef8bd 100644
--- a/extensions/amp-gwd-animation/0.1/amp-gwd-animation-impl.js
+++ b/extensions/amp-gwd-animation/0.1/amp-gwd-animation-impl.js
@@ -2,7 +2,7 @@ import {waitForChild} from '#core/dom';
 import {escapeCssSelectorIdent} from '#core/dom/css-selectors';
 import {scopedQuerySelector} from '#core/dom/query';
 import {toArray} from '#core/types/array';
-import {dict, hasOwn} from '#core/types/object';
+import {hasOwn} from '#core/types/object';
 
 import {createCustomEvent} from '#utils/event-helper';
 import {dev, user} from '#utils/log';
@@ -486,10 +486,10 @@ export class AmpGwdRuntimeService {
       return;
     }
 
-    const detail = dict({
+    const detail = {
       'eventName': userEventName,
       'sourceEvent': event,
-    });
+    };
     const timelineEvent = createCustomEvent(
       this.win_,
       GWD_TIMELINE_EVENT,
diff --git a/extensions/amp-gwd-animation/0.1/amp-gwd-animation.js b/extensions/amp-gwd-animation/0.1/amp-gwd-animation.js
index ba2e807f0a5a..67d615103ace 100644
--- a/extensions/amp-gwd-animation/0.1/amp-gwd-animation.js
+++ b/extensions/amp-gwd-animation/0.1/amp-gwd-animation.js
@@ -1,4 +1,4 @@
-import {ActionTrust} from '#core/constants/action-constants';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
 
 import {Services} from '#service';
 
@@ -63,7 +63,7 @@ export const GWD_PAGEDECK_ID = 'pagedeck';
  * Each action name currently corresponds to an identically-named method in the
  * GWD runtime service, which is invoked with the evaluated arguments
  * (@see getActionImplArgs and createAction_).
- * @const {!Object<string, !Array<string>>}
+ * @const {!{[key: string]: !Array<string>}}
  */
 const ACTION_IMPL_ARGS = {
   'play': ['args.id'],
@@ -235,7 +235,7 @@ export class GwdAnimation extends AMP.BaseElement {
       this.element,
       timelineEventName,
       event,
-      ActionTrust.HIGH
+      ActionTrust_Enum.HIGH
     );
   }
 
diff --git a/extensions/amp-iframe/0.1/amp-iframe.js b/extensions/amp-iframe/0.1/amp-iframe.js
index 4f2567d37f0d..adc262bc65a5 100644
--- a/extensions/amp-iframe/0.1/amp-iframe.js
+++ b/extensions/amp-iframe/0.1/amp-iframe.js
@@ -1,35 +1,38 @@
-import {playIgnoringError} from '#core/dom/video';
+import {MessageType_Enum} from '#core/3p-frame-messaging';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
 import {AMPDOC_SINGLETON_NAME_ENUM} from '#core/constants/enums';
-import {ActionTrust} from '#core/constants/action-constants';
-import {IntersectionObserver3pHost} from '#utils/intersection-observer-3p-host';
+import {removeElement} from '#core/dom';
 import {
-  LayoutPriority,
+  LayoutPriority_Enum,
   applyFillContent,
   isLayoutSizeDefined,
 } from '#core/dom/layout';
-import {MessageType} from '#core/3p-frame-messaging';
+import {propagateAttributes} from '#core/dom/propagate-attributes';
+import {setStyle} from '#core/dom/style';
+import {playIgnoringError} from '#core/dom/video';
 import {PauseHelper} from '#core/dom/video/pause-helper';
-import {Services} from '#service';
+import {parseJson} from '#core/types/object/json';
+import {endsWith} from '#core/types/string';
 import {base64EncodeFromBytes} from '#core/types/string/base64';
+import {utf8Encode} from '#core/types/string/bytes';
+
+import {isExperimentOn} from '#experiments';
+
+import {Services} from '#service';
+
 import {createCustomEvent, getData, listen} from '#utils/event-helper';
+import {IntersectionObserver3pHost} from '#utils/intersection-observer-3p-host';
 import {user, userAssert} from '#utils/log';
-import {dict} from '#core/types/object';
-import {endsWith} from '#core/types/string';
+
+import {isAdPositionAllowed} from '../../../src/ad-helper';
+import * as urls from '../../../src/config/urls';
 import {getConsentDataToForward} from '../../../src/consent';
 import {
   isAdLike,
   listenFor,
   looksLikeTrackingIframe,
 } from '../../../src/iframe-helper';
-import {isAdPositionAllowed} from '../../../src/ad-helper';
-import {isExperimentOn} from '#experiments';
-import {parseJson} from '#core/types/object/json';
-import {propagateAttributes} from '#core/dom/propagate-attributes';
-import {removeElement} from '#core/dom';
 import {removeFragment} from '../../../src/url';
-import {setStyle} from '#core/dom/style';
-import {urls} from '../../../src/config';
-import {utf8Encode} from '#core/types/string/bytes';
 
 /** @const {string} */
 const TAG_ = 'amp-iframe';
@@ -152,9 +155,11 @@ export class AmpIframe extends AMP.BaseElement {
     userAssert(
       !(
         endsWith(hostname, `.${urls.thirdPartyFrameHost}`) ||
+        // eslint-disable-next-line local/no-forbidden-terms
         endsWith(hostname, '.ampproject.org')
       ),
       'amp-iframe does not allow embedding of frames from ' +
+        // eslint-disable-next-line local/no-forbidden-terms
         'ampproject.*: %s',
       src
     );
@@ -424,9 +429,13 @@ export class AmpIframe extends AMP.BaseElement {
       listenFor(iframe, 'embed-ready', this.activateIframe_.bind(this));
     }
 
-    listenFor(iframe, MessageType.SEND_CONSENT_DATA, (data, source, origin) => {
-      this.sendConsentData_(source, origin);
-    });
+    listenFor(
+      iframe,
+      MessageType_Enum.SEND_CONSENT_DATA,
+      (data, source, origin) => {
+        this.sendConsentData_(source, origin);
+      }
+    );
 
     this.container_.appendChild(iframe);
 
@@ -487,17 +496,11 @@ export class AmpIframe extends AMP.BaseElement {
   sendConsentData_(source, origin) {
     getConsentDataToForward(this.element, this.getConsentPolicy()).then(
       (consents) => {
-        this.sendConsentDataToIframe_(
-          source,
-          origin,
-          Object.assign(
-            dict({
-              'sentinel': 'amp',
-              'type': MessageType.CONSENT_DATA,
-            }),
-            consents
-          )
-        );
+        this.sendConsentDataToIframe_(source, origin, {
+          'sentinel': 'amp',
+          'type': MessageType_Enum.CONSENT_DATA,
+          ...consents,
+        });
       }
     );
   }
@@ -544,10 +547,10 @@ export class AmpIframe extends AMP.BaseElement {
   /** @override  */
   getLayoutPriority() {
     if (this.isAdLike_) {
-      return LayoutPriority.ADS; // See AmpAd3PImpl.
+      return LayoutPriority_Enum.ADS; // See AmpAd3PImpl.
     }
     if (this.isTrackingFrame_) {
-      return LayoutPriority.METADATA;
+      return LayoutPriority_Enum.METADATA;
     }
     return super.getLayoutPriority();
   }
@@ -770,13 +773,16 @@ export class AmpIframe extends AMP.BaseElement {
         user().error(TAG_, 'Data from "message" event must be JSON.');
         return;
       }
-      const event = createCustomEvent(
-        this.win,
-        'amp-iframe:message',
-        dict({'data': sanitized})
-      );
+      const event = createCustomEvent(this.win, 'amp-iframe:message', {
+        'data': sanitized,
+      });
       const actionService = Services.actionServiceForDoc(this.element);
-      actionService.trigger(this.element, 'message', event, ActionTrust.HIGH);
+      actionService.trigger(
+        this.element,
+        'message',
+        event,
+        ActionTrust_Enum.HIGH
+      );
     };
     // TODO(choumx): Consider using global listener in iframe-helper.
     this.win.addEventListener('message', listener);
diff --git a/extensions/amp-iframe/0.1/storybook/Basic.amp.js b/extensions/amp-iframe/0.1/storybook/Basic.amp.js
index 614d1d500dc5..54465cfbe2bf 100644
--- a/extensions/amp-iframe/0.1/storybook/Basic.amp.js
+++ b/extensions/amp-iframe/0.1/storybook/Basic.amp.js
@@ -1,10 +1,10 @@
-import * as Preact from '#preact';
 import {withAmp} from '@ampproject/storybook-addon';
-import {withKnobs} from '@storybook/addon-knobs';
+
+import * as Preact from '#preact';
 
 export default {
   title: 'amp-iframe',
-  decorators: [withKnobs, withAmp],
+  decorators: [withAmp],
 
   parameters: {
     extensions: [{name: 'amp-iframe', version: '0.1'}],
diff --git a/extensions/amp-iframe/0.1/test/test-amp-iframe.js b/extensions/amp-iframe/0.1/test/test-amp-iframe.js
index 3b44a4a32028..c8d6f23b8c61 100644
--- a/extensions/amp-iframe/0.1/test/test-amp-iframe.js
+++ b/extensions/amp-iframe/0.1/test/test-amp-iframe.js
@@ -1,18 +1,22 @@
-import {ActionTrust} from '#core/constants/action-constants';
-import {AmpIframe, setTrackingIframeTimeoutForTesting} from '../amp-iframe';
-import {CommonSignals} from '#core/constants/common-signals';
-import {LayoutPriority} from '#core/dom/layout';
-import {Services} from '#service';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
+import {CommonSignals_Enum} from '#core/constants/common-signals';
 import {createElementWithAttributes} from '#core/dom';
 import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
+import {LayoutPriority_Enum} from '#core/dom/layout';
 
-import {installResizeObserverStub} from '#testing/resize-observer-stub';
-import {isAdLike} from '../../../../src/iframe-helper';
-import {macroTask} from '#testing/helpers';
-import {poll} from '#testing/iframe';
 import {toggleExperiment} from '#experiments';
+
+import {Services} from '#service';
+
 import {user} from '#utils/log';
+
+import {macroTask} from '#testing/helpers';
 import {whenCalled} from '#testing/helpers/service';
+import {poll} from '#testing/iframe';
+import {installResizeObserverStub} from '#testing/resize-observer-stub';
+
+import {isAdLike} from '../../../../src/iframe-helper';
+import {AmpIframe, setTrackingIframeTimeoutForTesting} from '../amp-iframe';
 
 /** @const {number} */
 const IFRAME_MESSAGE_TIMEOUT = 50;
@@ -101,7 +105,7 @@ describes.realWin(
       const viewport = Services.viewportForDoc(doc);
       viewport.setScrollTop(600);
       return whenUpgradedToCustomElement(ampIframe).then((element) => {
-        return element.signals().whenSignal(CommonSignals.LOAD_END);
+        return element.signals().whenSignal(CommonSignals_Enum.LOAD_END);
       });
     }
 
@@ -193,7 +197,7 @@ describes.realWin(
       );
       expect(iframe.parentNode).to.equal(scrollWrapper);
       expect(impl.looksLikeTrackingIframe_()).to.be.false;
-      expect(impl.getLayoutPriority()).to.equal(LayoutPriority.CONTENT);
+      expect(impl.getLayoutPriority()).to.equal(LayoutPriority_Enum.CONTENT);
       await timer.promise(IFRAME_MESSAGE_TIMEOUT);
       expect(ranJs).to.equal(0);
     });
@@ -266,7 +270,7 @@ describes.realWin(
       });
       await waitForAmpIframeLayoutPromise(doc, ampIframe);
       const impl = await ampIframe.getImpl(false);
-      expect(impl.getLayoutPriority()).to.equal(LayoutPriority.ADS);
+      expect(impl.getLayoutPriority()).to.equal(LayoutPriority_Enum.ADS);
       expect(ampIframe.getAttribute('sandbox')).to.equal('allow-scripts');
       return waitForJsInIframe().then(() => {
         expect(ranJs).to.equal(1);
@@ -289,7 +293,7 @@ describes.realWin(
         1000
       );
       await whenUpgradedToCustomElement(ampIframe);
-      await ampIframe.signals().whenSignal(CommonSignals.LOAD_START);
+      await ampIframe.signals().whenSignal(CommonSignals_Enum.LOAD_START);
     });
 
     it('should respect translations', function* () {
@@ -307,7 +311,7 @@ describes.realWin(
         -600
       );
       yield whenUpgradedToCustomElement(ampIframe);
-      yield ampIframe.signals().whenSignal(CommonSignals.LOAD_START);
+      yield ampIframe.signals().whenSignal(CommonSignals_Enum.LOAD_START);
     });
 
     it('should render if further than 75% vh away from top', function* () {
@@ -814,10 +818,10 @@ describes.realWin(
       expect(impl1.looksLikeTrackingIframe_()).to.be.true;
       // appended amp-iframe 10x10
       expect(impl2.looksLikeTrackingIframe_()).to.be.true;
-      expect(impl2.getLayoutPriority()).to.equal(LayoutPriority.METADATA);
+      expect(impl2.getLayoutPriority()).to.equal(LayoutPriority_Enum.METADATA);
       // appended amp-iframe 100x100
       expect(impl3.looksLikeTrackingIframe_()).to.be.false;
-      expect(impl3.getLayoutPriority()).to.equal(LayoutPriority.CONTENT);
+      expect(impl3.getLayoutPriority()).to.equal(LayoutPriority_Enum.CONTENT);
       await Services.timerFor(env.win).promise(21);
       expect(doc.querySelectorAll('[amp-removed]')).to.have.length(1);
       expect(doc.querySelectorAll('iframe')).to.have.length(1);
@@ -886,7 +890,7 @@ describes.realWin(
         0
       );
       yield whenUpgradedToCustomElement(ampIframe);
-      yield ampIframe.signals().whenSignal(CommonSignals.LOAD_START);
+      yield ampIframe.signals().whenSignal(CommonSignals_Enum.LOAD_START);
     });
 
     it('should propagate `src` when container attribute is mutated', async () => {
@@ -1207,7 +1211,7 @@ describes.realWin(
           ampIframe,
           'message',
           eventMatcher,
-          ActionTrust.HIGH
+          ActionTrust_Enum.HIGH
         );
       });
 
diff --git a/extensions/amp-iframe/1.0/README.md b/extensions/amp-iframe/1.0/README.md
index 45d36706723c..5457fa6fe9e0 100644
--- a/extensions/amp-iframe/1.0/README.md
+++ b/extensions/amp-iframe/1.0/README.md
@@ -10,9 +10,7 @@ Renders an iframe that reports its position in the host document to the child wi
 
 You must include each Bento component's required CSS library to guarantee proper loading and before adding custom styles. Or use the light-weight pre-upgrade styles available inline. See [Layout and style](#layout-and-style).
 
-The examples below demonstrate use of the `<bento-iframe>` web component.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/iframe
@@ -23,41 +21,69 @@ import {defineElement as defineBentoIframe} from '@bentoproject/iframe';
 defineBentoIframe();
 ```
 
-### Example: Include via `<script>`
+### Include via `<script>`
 
 ```html
-<head>
-  <script src="https://cdn.ampproject.org/bento.js"></script>
-  <script
-    async
-    src="https://cdn.ampproject.org/v0/bento-iframe-1.0.js"
-  ></script>
-  <link
-    rel="stylesheet"
-    type="text/css"
-    href="https://cdn.ampproject.org/v0/bento-iframe-1.0.css"
-  />
-</head>
-<bento-iframe
-  id="my-iframe"
-  src="https://en.wikipedia.org/wiki/Bento"
-  style="width: 800px; height: 600px"
->
-</bento-iframe>
-
-<button id="change-source">Change source</button>
-
-<script>
-  (async () => {
-    const iframeEl = document.querySelector('#my-iframe');
-    await customElements.whenDefined('bento-iframe');
-
-    // Reload iframe with new src
-    document.querySelector('#change-source').onclick = () => {
-      iframeEl.setAttribute('src', 'https://example.com');
-    };
-  })();
-</script>
+<script type="module" src="https://cdn.ampproject.org/bento.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/bento.js" crossorigin="anonymous"></script>
+<script type="module" src="https://cdn.ampproject.org/v0/bento-iframe-1.0.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/v0/bento-iframe-1.0.js" crossorigin="anonymous"></script>
+<link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-iframe-1.0.css" crossorigin="anonymous">
+```
+
+### Example
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-iframe-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-iframe-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-iframe-1.0.css"
+    />
+  </head>
+  <body>
+    <bento-iframe
+      id="my-iframe"
+      src="https://en.wikipedia.org/wiki/Bento"
+      style="width: 800px; height: 600px"
+    >
+    </bento-iframe>
+
+    <button id="change-source">Change source</button>
+
+    <script>
+      (async () => {
+        const iframeEl = document.querySelector('#my-iframe');
+        await customElements.whenDefined('bento-iframe');
+
+        // Reload iframe with new src
+        document.querySelector('#change-source').onclick = () => {
+          iframeEl.setAttribute('src', 'https://example.com');
+        };
+      })();
+    </script>
+  </body>
+</html>
 ```
 
 ### Layout and style
@@ -108,23 +134,11 @@ These attributes should all behave like they do on standard iframes.
 
 #### `sandbox` (optional) <a name="sandbox"></a>
 
-Iframes created by `bento-iframe` always have the `sandbox` attribute defined on
-them. By default, the value is empty, which means that they are "maximum
-sandboxed". By setting `sandbox` values, one can opt the iframe into being less
-sandboxed. All values supported by browsers are allowed. For example, setting
-`sandbox="allow-scripts"` allows the iframe to run JavaScript, or
-`sandbox="allow-scripts allow-same-origin"` allows the iframe to run JavaScript,
-make non-CORS XHRs, and read/write cookies.
+Iframes created by `bento-iframe` always have the `sandbox` attribute defined on them. By default, the value is empty, which means that they are "maximum sandboxed". By setting `sandbox` values, one can opt the iframe into being less sandboxed. All values supported by browsers are allowed. For example, setting `sandbox="allow-scripts"` allows the iframe to run JavaScript, or `sandbox="allow-scripts allow-same-origin"` allows the iframe to run JavaScript, make non-CORS XHRs, and read/write cookies.
 
-If you are iframing a document that was not specifically created with sandboxing
-in mind, you will most likely need to add `allow-scripts allow-same-origin` to
-the `sandbox` attribute and you might need to allow additional capabilities.
+If you are iframing a document that was not specifically created with sandboxing in mind, you will most likely need to add `allow-scripts allow-same-origin` to the `sandbox` attribute and you might need to allow additional capabilities.
 
-Note also, that the sandbox applies to all windows opened from a sandboxed
-iframe. This includes new windows created by a link with `target=_blank` (add
-`allow-popups` to allow this to happen). Adding `allow-popups-to-escape-sandbox`
-to the `sandbox` attribute, makes those new windows behave like non-sandboxed
-new windows. This is likely most of the time what you want and expect.
+Note also, that the sandbox applies to all windows opened from a sandboxed iframe. This includes new windows created by a link with `target=_blank` (add `allow-popups` to allow this to happen). Adding `allow-popups-to-escape-sandbox` to the `sandbox` attribute, makes those new windows behave like non-sandboxed new windows. This is likely most of the time what you want and expect.
 
 See the [docs on MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/iframe#attr-sandbox) for further details on the `sandbox` attribute.
 
@@ -136,9 +150,7 @@ You may use the `bento-iframe` element selector to style the component.
 
 ## Preact/React Component
 
-The examples below demonstrates use of the `<BentoIframe>` as a functional component usable with the Preact or React libraries.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/iframe
@@ -176,13 +188,7 @@ These attributes all behave like they do on standard iframes.
 
 #### `sandbox` (optional) <a name="sandbox"></a>
 
-Iframes created by `<BentoIframe>` always have the `sandbox` attribute defined on
-them. By default, the value is empty, which means that they are "maximum
-sandboxed". By setting `sandbox` values, one can opt the iframe into being less
-sandboxed. All values supported by browsers are allowed. For example, setting
-`sandbox="allow-scripts"` allows the iframe to run JavaScript, or
-`sandbox="allow-scripts allow-same-origin"` allows the iframe to run JavaScript,
-make non-CORS XHRs, and read/write cookies.
+Iframes created by `<BentoIframe>` always have the `sandbox` attribute defined on them. By default, the value is empty, which means that they are "maximum sandboxed". By setting `sandbox` values, one can opt the iframe into being less sandboxed. All values supported by browsers are allowed. For example, setting `sandbox="allow-scripts"` allows the iframe to run JavaScript, or `sandbox="allow-scripts allow-same-origin"` allows the iframe to run JavaScript, make non-CORS XHRs, and read/write cookies.
 
 See the [docs on MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/iframe#attr-sandbox) for further details on the `sandbox` attribute.
 
diff --git a/extensions/amp-iframe/1.0/amp-iframe.js b/extensions/amp-iframe/1.0/amp-iframe.js
index ff62c4d7e40d..c93ab99c4972 100644
--- a/extensions/amp-iframe/1.0/amp-iframe.js
+++ b/extensions/amp-iframe/1.0/amp-iframe.js
@@ -1,8 +1,12 @@
-import {BaseElement} from './base-element';
+import {measureIntersection} from '#core/dom/layout/intersection';
+
 import {isExperimentOn} from '#experiments';
+
+import {AmpPreactBaseElement, setSuperClass} from '#preact/amp-base-element';
+
 import {userAssert} from '#utils/log';
-import {dict} from '#core/types/object';
-import {measureIntersection} from '#core/dom/layout/intersection';
+
+import {BaseElement} from './base-element';
 
 /** @const {string} */
 const TAG = 'amp-iframe';
@@ -11,7 +15,7 @@ const MINIMUM_DISTANCE_FROM_TOP_PX = 600;
 /** @const {number} */
 const MINIMUM_VIEWPORT_PROPORTION = 0.75;
 
-class AmpIframe extends BaseElement {
+class AmpIframe extends setSuperClass(BaseElement, AmpPreactBaseElement) {
   /** @override */
   isLayoutSupported(layout) {
     userAssert(
@@ -81,11 +85,11 @@ class AmpIframe extends BaseElement {
 
   /** @override */
   init() {
-    return dict({
+    return {
       'requestResize': (height, width) => {
         return this.updateSize_(height, width);
       },
-    });
+    };
   }
 }
 
diff --git a/extensions/amp-iframe/1.0/base-element.js b/extensions/amp-iframe/1.0/base-element.js
index c8f57c57e4ce..e419be5eac09 100644
--- a/extensions/amp-iframe/1.0/base-element.js
+++ b/extensions/amp-iframe/1.0/base-element.js
@@ -1,6 +1,7 @@
-import {BentoIframe} from './component';
 import {PreactBaseElement} from '#preact/base-element';
 
+import {BentoIframe} from './component';
+
 export class BaseElement extends PreactBaseElement {}
 
 /** @override */
diff --git a/extensions/amp-iframe/1.0/component.js b/extensions/amp-iframe/1.0/component.js
index b1d83c6419f4..5acaf70fd8da 100644
--- a/extensions/amp-iframe/1.0/component.js
+++ b/extensions/amp-iframe/1.0/component.js
@@ -1,16 +1,19 @@
+import {MessageType_Enum} from '#core/3p-frame-messaging';
+import {setStyle} from '#core/dom/style';
+import {getWin} from '#core/window';
+
 import * as Preact from '#preact';
 import {useCallback, useEffect, useMemo, useRef} from '#preact';
-import {MessageType} from '#core/3p-frame-messaging';
-import {getWin} from '#core/window';
-import {ContainWrapper, useIntersectionObserver} from '#preact/component';
-import {setStyle} from '#core/dom/style';
+import {ContainWrapper} from '#preact/component';
+import {useIntersectionObserver} from '#preact/component/intersection-observer';
 import {useMergeRefs} from '#preact/utils';
+
 import {
   DEFAULT_THRESHOLD,
   cloneEntryForCrossOrigin,
 } from '#utils/intersection-observer-3p-host';
+
 import {postMessage} from '../../../src/iframe-helper';
-import {dict} from '#core/types/object';
 
 const NOOP = () => {};
 
@@ -45,8 +48,8 @@ export function BentoIframe({
     }
     postMessage(
       iframe,
-      MessageType.INTERSECTION,
-      dict({'changes': entries.map(cloneEntryForCrossOrigin)}),
+      MessageType_Enum.INTERSECTION,
+      {'changes': entries.map(cloneEntryForCrossOrigin)},
       targetOrigin
     );
   };
@@ -58,7 +61,7 @@ export function BentoIframe({
     }
     if (
       event.source !== iframe.contentWindow ||
-      event.data?.type !== MessageType.SEND_INTERSECTIONS
+      event.data?.type !== MessageType_Enum.SEND_INTERSECTIONS
     ) {
       return;
     }
@@ -129,7 +132,7 @@ export function BentoIframe({
 
   const handleEmbedSizePostMessage = useCallback(
     (event) => {
-      if (event.data?.type !== MessageType.EMBED_SIZE) {
+      if (event.data?.type !== MessageType_Enum.EMBED_SIZE) {
         return;
       }
       dataRef.current = event.data;
diff --git a/extensions/amp-iframe/1.0/example/index.html b/extensions/amp-iframe/1.0/example/index.html
new file mode 100644
index 000000000000..a549465794ed
--- /dev/null
+++ b/extensions/amp-iframe/1.0/example/index.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-iframe-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-iframe-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-iframe-1.0.css"
+    />
+  </head>
+  <body>
+    <bento-iframe
+      id="my-iframe"
+      src="https://en.wikipedia.org/wiki/Bento"
+      style="width: 800px; height: 600px"
+    >
+    </bento-iframe>
+
+    <button id="change-source">Change source</button>
+
+    <script>
+      (async () => {
+        const iframeEl = document.querySelector('#my-iframe');
+        await customElements.whenDefined('bento-iframe');
+
+        // Reload iframe with new src
+        document.querySelector('#change-source').onclick = () => {
+          iframeEl.setAttribute('src', 'https://example.com');
+        };
+      })();
+    </script>
+  </body>
+</html>
diff --git a/extensions/amp-iframe/1.0/storybook/Basic.amp.js b/extensions/amp-iframe/1.0/storybook/Basic.amp.js
index 59cc24e23346..526777d795a1 100644
--- a/extensions/amp-iframe/1.0/storybook/Basic.amp.js
+++ b/extensions/amp-iframe/1.0/storybook/Basic.amp.js
@@ -1,31 +1,28 @@
-import * as Preact from '#preact';
 import {withAmp} from '@ampproject/storybook-addon';
-import {text, withKnobs} from '@storybook/addon-knobs';
+
+import * as Preact from '#preact';
 
 export default {
   title: 'amp-iframe-1_0',
-  decorators: [withKnobs, withAmp],
-
+  decorators: [withAmp],
   parameters: {
     extensions: [{name: 'amp-iframe', version: '1.0'}],
     experiments: ['bento'],
   },
+  argTypes: {
+    src: {
+      name: 'iframe src',
+      defaultValue: 'https://www.wikipedia.org/',
+      control: {type: 'text'},
+    },
+  },
 };
 
-export const WithSrc = () => {
-  return (
-    <amp-iframe
-      width="800"
-      height="600"
-      src="https://www.wikipedia.org/"
-    ></amp-iframe>
-  );
+export const WithSrc = ({src}) => {
+  return <amp-iframe width="800" height="600" src={src}></amp-iframe>;
 };
 
-WithSrc.storyName = 'amp-iframe with src attribute';
-
-export const WithPlaceholder = () => {
-  const src = text('src', `https://www.wikipedia.org/`);
+export const WithPlaceholder = ({src}) => {
   return (
     <amp-iframe width="800" height="600" src={src}>
       <h1 placeholder>Placeholder</h1>
@@ -34,8 +31,6 @@ export const WithPlaceholder = () => {
   );
 };
 
-WithPlaceholder.storyName = 'amp-iframe with placeholder';
-
 export const WithResizableIframe = () => {
   return (
     <div>
@@ -54,8 +49,6 @@ export const WithResizableIframe = () => {
   );
 };
 
-WithResizableIframe.storyName = 'resizable amp-iframe';
-
 export const WithContentBelow = () => {
   return (
     <div>
@@ -78,8 +71,6 @@ export const WithContentBelow = () => {
   );
 };
 
-WithContentBelow.storyName = 'resizeable amp-iframe with content below';
-
 export const WithOverflowButton = () => {
   return (
     <div>
@@ -98,5 +89,3 @@ export const WithOverflowButton = () => {
     </div>
   );
 };
-
-WithOverflowButton.storyName = 'resizeable amp-iframe with overflow';
diff --git a/extensions/amp-iframe/1.0/storybook/Basic.js b/extensions/amp-iframe/1.0/storybook/Basic.js
index 7ba5643c4f41..7bebc16a57db 100644
--- a/extensions/amp-iframe/1.0/storybook/Basic.js
+++ b/extensions/amp-iframe/1.0/storybook/Basic.js
@@ -1,17 +1,25 @@
 import * as Preact from '#preact';
+
 import {BentoIframe} from '../component';
 
 export default {
   title: 'Iframe',
   component: BentoIframe,
+  argTypes: {
+    src: {
+      name: 'iframe src',
+      defaultValue: 'https://www.wikipedia.org/',
+      control: {type: 'text'},
+    },
+  },
 };
 
-export const _default = () => {
+export const _default = ({src}) => {
   return (
     <BentoIframe
       style={{width: 800, height: 600}}
       iframeStyle={{border: '1px solid black'}}
-      src="https://www.wikipedia.org/"
+      src={src}
       title="Wikipedia"
     ></BentoIframe>
   );
@@ -41,11 +49,10 @@ export const WithIntersectingIframe = () => {
   );
 };
 
-WithIntersectingIframe.storyName = 'Resizable iframe in viewport';
-
 export const WithResizableIframe = () => {
   return (
     <div>
+      <h1>Scroll down</h1>
       <div
         style={{
           width: '100%',
@@ -67,11 +74,10 @@ export const WithResizableIframe = () => {
   );
 };
 
-WithResizableIframe.storyName = 'Resizable iframe outside viewport';
-
 export const WithSendIntersectionsPostMessage = () => {
   return (
     <div>
+      <h1>Scroll down</h1>
       <div
         style={{
           width: '100%',
@@ -79,16 +85,14 @@ export const WithSendIntersectionsPostMessage = () => {
           backgroundColor: 'blue',
         }}
       ></div>
-      <Iframe
+      <BentoIframe
         style={{width: 500, height: 500}}
         iframeStyle={{border: '1px solid black'}}
         sandbox="allow-scripts allow-same-origin"
         src="/examples/bento/amp-iframe-send-intersections-example.html"
       >
         <div placeholder>Placeholder</div>
-      </Iframe>
+      </BentoIframe>
     </div>
   );
 };
-
-WithSendIntersectionsPostMessage.storyName = 'Send intersections';
diff --git a/extensions/amp-iframe/1.0/test/test-amp-iframe.js b/extensions/amp-iframe/1.0/test/test-amp-iframe.js
index e15c11834497..99c22c2bcb78 100644
--- a/extensions/amp-iframe/1.0/test/test-amp-iframe.js
+++ b/extensions/amp-iframe/1.0/test/test-amp-iframe.js
@@ -1,8 +1,10 @@
 import '../amp-iframe';
+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 import {htmlFor} from '#core/dom/static-template';
+
 import {toggleExperiment} from '#experiments';
+
 import {waitFor} from '#testing/helpers/service';
-import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 import {flush} from '#testing/preact';
 
 describes.realWin(
diff --git a/extensions/amp-iframe/1.0/test/test-component.js b/extensions/amp-iframe/1.0/test/test-component.js
index 1b406c272b5f..148dc3141520 100644
--- a/extensions/amp-iframe/1.0/test/test-component.js
+++ b/extensions/amp-iframe/1.0/test/test-component.js
@@ -1,6 +1,8 @@
+import {mount} from 'enzyme';
+
 import * as Preact from '#preact';
+
 import {BentoIframe} from '../component';
-import {mount} from 'enzyme';
 
 describes.sandboxed('BentoIframe preact component v1.0', {}, (env) => {
   it('should render', () => {
diff --git a/extensions/amp-iframe/validator-amp-iframe.protoascii b/extensions/amp-iframe/validator-amp-iframe.protoascii
index d7446e26bae9..ad3df9f43fc3 100644
--- a/extensions/amp-iframe/validator-amp-iframe.protoascii
+++ b/extensions/amp-iframe/validator-amp-iframe.protoascii
@@ -1,8 +1,8 @@
 tags: {  # amp-iframe 1.0
   html_format: AMP
   tag_name: "SCRIPT"
-  satisfies: "amp-iframe 1.0"
-  excludes: "amp-iframe 0.1"
+  satisfies_condition: "amp-iframe 1.0"
+  excludes_condition: "amp-iframe 0.1"
   extension_spec: {
     name: "amp-iframe"
     version_name: "v1.0"
@@ -15,8 +15,8 @@ tags: {  # amp-iframe 1.0
 tags: {  # amp-iframe 0.1 and latest
   html_format: AMP  # Iframes not allowed in ads.
   tag_name: "SCRIPT"
-  satisfies: "amp-iframe 0.1"
-  excludes: "amp-iframe 1.0"
+  satisfies_condition: "amp-iframe 0.1"
+  excludes_condition: "amp-iframe 1.0"
   extension_spec: {
     name: "amp-iframe"
     version_name: "v0.1"
diff --git a/extensions/amp-ima-video/0.1/amp-ima-video.js b/extensions/amp-ima-video/0.1/amp-ima-video.js
index 2c4b850c5f26..3bbc83960f5b 100644
--- a/extensions/amp-ima-video/0.1/amp-ima-video.js
+++ b/extensions/amp-ima-video/0.1/amp-ima-video.js
@@ -11,7 +11,6 @@ import {childElementsByTag} from '#core/dom/query';
 import {PauseHelper} from '#core/dom/video/pause-helper';
 import {isEnumValue, isObject} from '#core/types';
 import {toArray} from '#core/types/array';
-import {dict} from '#core/types/object';
 
 import {Services} from '#service';
 import {installVideoManagerForDoc} from '#service/video-manager-impl';
@@ -19,10 +18,14 @@ import {installVideoManagerForDoc} from '#service/video-manager-impl';
 import {getData, listen} from '#utils/event-helper';
 
 import {getIframe, preloadBootstrap} from '../../../src/3p-frame';
-import {getConsentPolicyState} from '../../../src/consent';
+import {
+  getConsentMetadata,
+  getConsentPolicyInfo,
+  getConsentPolicyState,
+} from '../../../src/consent';
 import {addUnsafeAllowAutoplay} from '../../../src/iframe-video';
 import {assertHttpsUrl} from '../../../src/url';
-import {VideoEvents} from '../../../src/video-interface';
+import {VideoEvents_Enum} from '../../../src/video-interface';
 
 /** @const */
 const TAG = 'amp-ima-video';
@@ -39,7 +42,7 @@ let SerializableChildDef;
 
 /**
  * @param {!Element} element
- * @return {!Object<string, *>}
+ * @return {!{[key: string]: *}}
  */
 function serializeAttributes(element) {
   const {attributes} = element;
@@ -88,7 +91,7 @@ class AmpImaVideo extends AMP.BaseElement {
 
     /**
      * Maps events to their unlisteners.
-     * @private {!Object<string, function()>}
+     * @private {!{[key: string]: function()}}
      */
     this.unlisteners_ = {};
 
@@ -178,30 +181,37 @@ class AmpImaVideo extends AMP.BaseElement {
     return isLayoutSizeDefined(layout);
   }
 
-  /** @override */
-  getConsentPolicy() {
-    return null;
+  /**
+   * @return {Promise<Object|undefined>}
+   * @private
+   */
+  getIframeContext_() {
+    const consentPolicyId = this.getConsentPolicy();
+    if (!consentPolicyId) {
+      return Promise.resolve();
+    }
+    return Promise.all([
+      getConsentPolicyState(this.element, consentPolicyId),
+      getConsentMetadata(this.element, consentPolicyId),
+      getConsentPolicyInfo(this.element, consentPolicyId),
+    ]).then((result) => ({
+      initialConsentState: result[0],
+      initialConsentMetadata: result[1],
+      initialConsentValue: result[2],
+    }));
   }
 
   /** @override */
   layoutCallback() {
-    const {element, win} = this;
-    const consentPolicyId = super.getConsentPolicy();
-    const consentPromise = consentPolicyId
-      ? getConsentPolicyState(element, consentPolicyId)
-      : Promise.resolve(null);
+    const {element} = this;
     element.setAttribute(
       'data-source-children',
       JSON.stringify(this.sourceChildren_)
     );
-    return consentPromise.then((initialConsentState) => {
-      const iframe = getIframe(
-        win,
-        element,
-        TYPE,
-        {initialConsentState},
-        {allowFullscreen: true}
-      );
+    return this.getIframeContext_().then((context) => {
+      const iframe = getIframe(this.win, element, TYPE, context, {
+        allowFullscreen: true,
+      });
       iframe.title = this.element.title || 'IMA video';
 
       applyFillContent(iframe);
@@ -263,7 +273,7 @@ class AmpImaVideo extends AMP.BaseElement {
 
   /**
    * Sends a command to the player through postMessage. NOTE: All commands sent
-   * before imaVideo fires VideoEvents.LOAD will be queued until that event
+   * before imaVideo fires VideoEvents_Enum.LOAD will be queued until that event
    * fires.
    * @param {string} command
    * @param {Object=} opt_args
@@ -274,13 +284,11 @@ class AmpImaVideo extends AMP.BaseElement {
       this.playerReadyPromise_.then(() => {
         if (this.iframe_ && this.iframe_.contentWindow) {
           this.iframe_.contentWindow./*OK*/ postMessage(
-            JSON.stringify(
-              dict({
-                'event': 'command',
-                'func': command,
-                'args': opt_args || '',
-              })
-            ),
+            JSON.stringify({
+              'event': 'command',
+              'func': command,
+              'args': opt_args || '',
+            }),
             '*'
           );
         }
@@ -307,18 +315,18 @@ class AmpImaVideo extends AMP.BaseElement {
     }
 
     const videoEvent = eventData['event'];
-    if (isEnumValue(VideoEvents, videoEvent)) {
+    if (isEnumValue(VideoEvents_Enum, videoEvent)) {
       switch (videoEvent) {
-        case VideoEvents.LOAD:
+        case VideoEvents_Enum.LOAD:
           this.playerReadyResolver_(this.iframe_);
           break;
-        case VideoEvents.AD_START:
-        case VideoEvents.PLAY:
-        case VideoEvents.PLAYING:
+        case VideoEvents_Enum.AD_START:
+        case VideoEvents_Enum.PLAY:
+        case VideoEvents_Enum.PLAYING:
           this.pauseHelper_.updatePlaying(true);
           break;
-        case VideoEvents.PAUSE:
-        case VideoEvents.ENDED:
+        case VideoEvents_Enum.PAUSE:
+        case VideoEvents_Enum.ENDED:
           this.pauseHelper_.updatePlaying(false);
           break;
       }
@@ -327,7 +335,7 @@ class AmpImaVideo extends AMP.BaseElement {
     }
     if (videoEvent == ImaPlayerData.IMA_PLAYER_DATA) {
       this.playerData_ = /** @type {!ImaPlayerData} */ (eventData['data']);
-      dispatchCustomEvent(this.element, VideoEvents.LOADEDMETADATA);
+      dispatchCustomEvent(this.element, VideoEvents_Enum.LOADEDMETADATA);
       return;
     }
     if (videoEvent == 'fullscreenchange') {
diff --git a/extensions/amp-ima-video/0.1/test/test-amp-ima-video.js b/extensions/amp-ima-video/0.1/test/test-amp-ima-video.js
index 90cf6dc9851a..ca8ba69fcb74 100644
--- a/extensions/amp-ima-video/0.1/test/test-amp-ima-video.js
+++ b/extensions/amp-ima-video/0.1/test/test-amp-ima-video.js
@@ -2,6 +2,8 @@ import '../amp-ima-video';
 import {waitForChildPromise} from '#core/dom';
 import {htmlFor} from '#core/dom/static-template';
 
+import {Services} from '#service';
+
 import {installResizeObserverStub} from '#testing/resize-observer-stub';
 
 describes.realWin(
@@ -15,6 +17,15 @@ describes.realWin(
   (env) => {
     let html;
 
+    async function waitForChild(element, selector) {
+      let child;
+      await waitForChildPromise(
+        element,
+        () => (child = element.querySelector(selector))
+      );
+      return child;
+    }
+
     beforeEach(() => {
       html = htmlFor(env.win.document);
       installResizeObserverStub(env.sandbox, env.win);
@@ -32,13 +43,9 @@ describes.realWin(
       env.win.document.body.appendChild(element);
       await element.whenBuilt();
 
-      let iframe;
       element.layoutCallback();
-      await waitForChildPromise(
-        element,
-        () => (iframe = element.querySelector('iframe'))
-      );
 
+      const iframe = await waitForChild(element, 'iframe');
       const parsedName = JSON.parse(iframe.name);
       const sourceChildrenSerialized = parsedName?.attributes?.sourceChildren;
       expect(sourceChildrenSerialized).to.not.be.null;
@@ -50,6 +57,43 @@ describes.realWin(
       expect(sourceChildren[1][1]).to.eql({'any-attribute': ''});
     });
 
+    it('sets consent data in context object', async () => {
+      const initialConsentState = 'foo_getConsentPolicyState';
+      const initialConsentMetadata = {'foo_getConsentMetadata': 'bar'};
+      const initialConsentValue = 'foo_getConsentPolicyInfo';
+
+      env.sandbox.stub(Services, 'consentPolicyServiceForDocOrNull').resolves({
+        whenPolicyResolved: () => Promise.resolve(initialConsentState),
+        getConsentMetadataInfo: () => Promise.resolve(initialConsentMetadata),
+        getConsentStringInfo: () => Promise.resolve(initialConsentValue),
+        whenPolicyUnblock: () => Promise.resolve(true),
+        whenPurposesUnblock: () => Promise.resolve(true),
+      });
+
+      const element = html`
+        <amp-ima-video
+          data-block-on-consent
+          data-tag="https://example.com"
+          data-poster="https://example.com/foo.png"
+          width="1"
+          height="1"
+        ></amp-ima-video>
+      `;
+
+      env.win.document.body.appendChild(element);
+      await element.whenBuilt();
+
+      element.layoutCallback();
+
+      const iframe = await waitForChild(element, 'iframe');
+      const parsedName = JSON.parse(iframe.name);
+      expect(parsedName.attributes._context).to.deep.include({
+        initialConsentState,
+        initialConsentMetadata,
+        initialConsentValue,
+      });
+    });
+
     it('creates placeholder image from data-poster attribute', async () => {
       const element = html`
         <amp-ima-video
diff --git a/extensions/amp-ima-video/0.1/test/test-ima-video-internal.js b/extensions/amp-ima-video/0.1/test/test-ima-video-internal.js
index 3578ab950834..9ca98fe0254f 100644
--- a/extensions/amp-ima-video/0.1/test/test-ima-video-internal.js
+++ b/extensions/amp-ima-video/0.1/test/test-ima-video-internal.js
@@ -1,6 +1,9 @@
 import * as imaVideoObj from '#ads/google/ima/ima-video';
 
-import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';
+import {
+  CONSENT_POLICY_STATE,
+  CONSENT_STRING_TYPE,
+} from '#core/constants/consent-state';
 
 describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
   const srcUrl = 'http://rmcdn.2mdn.net/Demo/vast_inspector/android.mp4';
@@ -14,6 +17,9 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
     win.context = {};
     doc = win.document;
     clock = env.sandbox.useFakeTimers();
+    win.document.body
+      .appendChild(document.createElement('div'))
+      .setAttribute('id', 'c');
   });
 
   function getVideoPlayerMock() {
@@ -44,10 +50,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
   }
 
   it('adds ad container', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
     imaVideoObj.imaVideo(win, {
       width: 640,
       height: 360,
@@ -59,10 +61,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
   });
 
   it('adds video element', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
     imaVideoObj.imaVideo(win, {
       width: 640,
       height: 360,
@@ -74,10 +72,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
   });
 
   it('handles click', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
     imaVideoObj.imaVideo(win, {
       width: 640,
       height: 360,
@@ -113,10 +107,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
   });
 
   it('updates ad countdown timer', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
     const videoDefaults = {
       width: 640,
       height: 360,
@@ -189,10 +179,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
   });
 
   it('plays ads with ads manager', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
     imaVideoObj.imaVideo(win, {
       width: 640,
       height: 360,
@@ -220,10 +206,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
   });
 
   it('plays ads with ads manager ad request failed', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
     imaVideoObj.imaVideo(win, {
       width: 640,
       height: 360,
@@ -241,10 +223,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
   });
 
   it('handles content ended', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
     imaVideoObj.imaVideo(win, {
       width: 640,
       height: 360,
@@ -262,10 +240,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
   });
 
   it('handles ads manager loaded', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
     imaVideoObj.imaVideo(win, {
       width: 640,
       height: 360,
@@ -316,10 +290,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
   });
 
   it('handles ads manager loaded and muted', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
     imaVideoObj.imaVideo(win, {
       width: 640,
       height: 360,
@@ -376,10 +346,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
   });
 
   it('handles ads loader error', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
     imaVideoObj.imaVideo(win, {
       width: 640,
       height: 360,
@@ -396,10 +362,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
   });
 
   it('handles ad error', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
     imaVideoObj.imaVideo(win, {
       width: 640,
       height: 360,
@@ -419,10 +381,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
   });
 
   it('pauses content', () => {
-    // set up test
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
     imaVideoObj.imaVideo(win, {
       width: 640,
       height: 360,
@@ -457,10 +415,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
   });
 
   it('pauses content and resizes ads manager', () => {
-    // set up test
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
     imaVideoObj.imaVideo(win, {
       width: 640,
       height: 360,
@@ -509,9 +463,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
   });
 
   it('shows modified controls when content is paused', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
     imaVideoObj.imaVideo(win, {
       width: 640,
       height: 360,
@@ -551,10 +502,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
   });
 
   it('resumes content', () => {
-    // set up test
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
     imaVideoObj.imaVideo(win, {
       width: 640,
       height: 360,
@@ -582,10 +529,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
   });
 
   it('changes controls when ad pauses and resumes', () => {
-    // set up test
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
     imaVideoObj.imaVideo(win, {
       width: 640,
       height: 360,
@@ -614,10 +557,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
   });
 
   it('resumes content with content complete', () => {
-    // set up test
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
     imaVideoObj.imaVideo(win, {
       width: 640,
       height: 360,
@@ -645,9 +584,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
   });
 
   it('controls are restored after content resumes', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
     imaVideoObj.imaVideo(win, {
       width: 640,
       height: 360,
@@ -673,10 +609,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
   });
 
   it('ad controls are smaller when skippable on mobile', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
     const videoDefaults = {
       width: 640,
       height: 360,
@@ -714,10 +646,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
     'shows bigPlayDiv with content complete, ' +
       'when content resume is called',
     () => {
-      const div = doc.createElement('div');
-      div.setAttribute('id', 'c');
-      doc.body.appendChild(div);
-
       imaVideoObj.imaVideo(win, {
         width: 640,
         height: 360,
@@ -746,10 +674,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
   );
 
   it('shows bigPlayDiv with allAdsCompleted, and content ended', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
     imaVideoObj.imaVideo(win, {
       width: 640,
       height: 360,
@@ -769,10 +693,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
     'does not show bigPlayDiv when content is resumed, ' +
       'and not content complete',
     () => {
-      const div = doc.createElement('div');
-      div.setAttribute('id', 'c');
-      doc.body.appendChild(div);
-
       imaVideoObj.imaVideo(win, {
         width: 640,
         height: 360,
@@ -801,10 +721,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
   );
 
   it('updates playing time', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
     imaVideoObj.imaVideo(win, {
       width: 640,
       height: 360,
@@ -874,10 +790,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
   });
 
   it('zero pads', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
     imaVideoObj.imaVideo(win, {
       width: 640,
       height: 360,
@@ -893,10 +805,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
 
   // TODO - FIX ONCE I FIGURE OUT HOW TO SPY ON INTERNAL METHODS
   it('plays on click', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
     imaVideoObj.imaVideo(win, {
       width: 640,
       height: 360,
@@ -916,10 +824,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
 
   // TODO - FIX ONCE I FIGURE OUT HOW TO SPY ON INTERNAL METHODS
   it('pauses on click', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
     imaVideoObj.imaVideo(win, {
       width: 640,
       height: 360,
@@ -938,10 +842,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
   });
 
   it('plays video', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
     imaVideoObj.imaVideo(win, {
       width: 640,
       height: 360,
@@ -966,10 +866,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
   });
 
   it('pauses video', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
     imaVideoObj.imaVideo(win, {
       width: 640,
       height: 360,
@@ -994,10 +890,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
   });
 
   it('mutes on click', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
     imaVideoObj.imaVideo(win, {
       width: 640,
       height: 360,
@@ -1020,10 +912,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
   });
 
   it('unmutes on click', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
     imaVideoObj.imaVideo(win, {
       width: 640,
       height: 360,
@@ -1046,10 +934,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
   });
 
   it('pauses video after webkit end fullscreen', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
     imaVideoObj.imaVideo(win, {
       width: 640,
       height: 360,
@@ -1079,10 +963,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
   });
 
   it('shows controls when paused', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
     imaVideoObj.imaVideo(win, {
       width: 640,
       height: 360,
@@ -1103,10 +983,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
   });
 
   it('shows controls when playing', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
     imaVideoObj.imaVideo(win, {
       width: 640,
       height: 360,
@@ -1127,10 +1003,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
   });
 
   it('hides controls', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
     imaVideoObj.imaVideo(win, {
       width: 640,
       height: 360,
@@ -1147,10 +1019,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
 
   // Case when autoplay signal is sent before play signal is sent.
   it('hides controls before visible', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
     imaVideoObj.imaVideo(win, {
       width: 640,
       height: 360,
@@ -1173,10 +1041,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
   });
 
   it('always shows ads controls', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
     imaVideoObj.imaVideo(win, {
       width: 640,
       height: 360,
@@ -1201,10 +1065,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
   const hoverEventsToTest = ['click', 'mousemove'];
   hoverEventsToTest.forEach((hoverEvent) => {
     it(`shows controls on ${hoverEvent} (hover) while playing after hidden`, () => {
-      const div = doc.createElement('div');
-      div.setAttribute('id', 'c');
-      doc.body.appendChild(div);
-
       imaVideoObj.imaVideo(win, {
         width: 640,
         height: 360,
@@ -1241,10 +1101,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
     });
 
     it(`throttles ${hoverEvent} (hover) for showing controls`, async function () {
-      const div = doc.createElement('div');
-      div.setAttribute('id', 'c');
-      doc.body.appendChild(div);
-
       imaVideoObj.imaVideo(win, {
         width: 640,
         height: 360,
@@ -1301,10 +1157,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
   });
 
   it('suppresses IMA load with unknown consent', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
     win.context.initialConsentState = CONSENT_POLICY_STATE.UNKNOWN;
     imaVideoObj.imaVideo(win, {
       width: 640,
@@ -1319,10 +1171,6 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
   });
 
   it('handles unknown consent with request ads call', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
     imaVideoObj.imaVideo(win, {
       width: 640,
       height: 360,
@@ -1330,17 +1178,15 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
       tag: adTagUrl,
     });
 
-    imaVideoObj.setConsentStateForTesting(CONSENT_POLICY_STATE.UNKNOWN);
+    imaVideoObj.setContextForTesting({
+      initialConsentState: CONSENT_POLICY_STATE.UNKNOWN,
+    });
     imaVideoObj.requestAds();
 
     expect(imaVideoObj.getPropertiesForTesting().imaLoadAllowed).to.eql(false);
   });
 
   it('handles insufficient consent', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
     imaVideoObj.imaVideo(win, {
       width: 640,
       height: 360,
@@ -1349,22 +1195,20 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
     });
 
     const mockAdsLoader = {requestAds() {}};
-    const mockAdsRequest = {adTagUrl: 'vast.mxl'};
+    const mockAdsRequest = {adTagUrl: 'vast.xml'};
     imaVideoObj.setAdsLoaderForTesting(mockAdsLoader);
     imaVideoObj.setAdsRequestForTesting(mockAdsRequest);
-    imaVideoObj.setConsentStateForTesting(CONSENT_POLICY_STATE.INSUFFICIENT);
+    imaVideoObj.setContextForTesting({
+      initialConsentState: CONSENT_POLICY_STATE.INSUFFICIENT,
+    });
     imaVideoObj.requestAds();
 
     expect(imaVideoObj.getPropertiesForTesting().adsRequest.adTagUrl).to.eql(
-      'vast.mxl&npa=1'
+      'vast.xml?npa=1'
     );
   });
 
   it('handles sufficient consent', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
     imaVideoObj.imaVideo(win, {
       width: 640,
       height: 360,
@@ -1373,22 +1217,42 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
     });
 
     const mockAdsLoader = {requestAds() {}};
-    const mockAdsRequest = {adTagUrl: 'vast.mxl'};
+    const mockAdsRequest = {adTagUrl: 'vast.xml'};
     imaVideoObj.setAdsLoaderForTesting(mockAdsLoader);
     imaVideoObj.setAdsRequestForTesting(mockAdsRequest);
-    imaVideoObj.setConsentStateForTesting(CONSENT_POLICY_STATE.SUFFICIENT);
+    imaVideoObj.setContextForTesting({
+      initialConsentState: CONSENT_POLICY_STATE.SUFFICIENT,
+    });
     imaVideoObj.requestAds();
 
     expect(imaVideoObj.getPropertiesForTesting().adsRequest.adTagUrl).to.eql(
-      'vast.mxl'
+      'vast.xml'
     );
   });
 
   it('handles unknown_not_required consent', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
+    imaVideoObj.imaVideo(win, {
+      width: 640,
+      height: 360,
+      src: srcUrl,
+      tag: adTagUrl,
+    });
+
+    const mockAdsLoader = {requestAds() {}};
+    const mockAdsRequest = {adTagUrl: 'vast.xml'};
+    imaVideoObj.setAdsLoaderForTesting(mockAdsLoader);
+    imaVideoObj.setAdsRequestForTesting(mockAdsRequest);
+    imaVideoObj.setContextForTesting({
+      initialConsentState: CONSENT_POLICY_STATE.UNKNOWN_NOT_REQUIRED,
+    });
+    imaVideoObj.requestAds();
+
+    expect(imaVideoObj.getPropertiesForTesting().adsRequest.adTagUrl).to.eql(
+      'vast.xml'
+    );
+  });
 
+  it('passes gdpr_consent', () => {
     imaVideoObj.imaVideo(win, {
       width: 640,
       height: 360,
@@ -1397,16 +1261,44 @@ describes.realWin('UI loaded in frame by amp-ima-video', {}, (env) => {
     });
 
     const mockAdsLoader = {requestAds() {}};
-    const mockAdsRequest = {adTagUrl: 'vast.mxl'};
+    const mockAdsRequest = {adTagUrl: 'vast.xml'};
     imaVideoObj.setAdsLoaderForTesting(mockAdsLoader);
     imaVideoObj.setAdsRequestForTesting(mockAdsRequest);
-    imaVideoObj.setConsentStateForTesting(
-      CONSENT_POLICY_STATE.UNKNOWN_NOT_REQUIRED
+    imaVideoObj.setContextForTesting({
+      initialConsentState: CONSENT_POLICY_STATE.SUFFICIENT,
+      initialConsentMetadata: {consentStringType: CONSENT_STRING_TYPE.TCF_V2},
+      initialConsentValue: 'myConsentValue',
+    });
+    imaVideoObj.requestAds();
+
+    expect(imaVideoObj.getPropertiesForTesting().adsRequest.adTagUrl).to.eql(
+      'vast.xml?gdpr=1&gdpr_consent=myConsentValue'
     );
+  });
+
+  it('does not pass gdpr_consent with CONSENT_STRING_TYPE == US_PRIVACY_STRING', () => {
+    imaVideoObj.imaVideo(win, {
+      width: 640,
+      height: 360,
+      src: srcUrl,
+      tag: adTagUrl,
+    });
+
+    const mockAdsLoader = {requestAds() {}};
+    const mockAdsRequest = {adTagUrl: 'vast.xml'};
+    imaVideoObj.setAdsLoaderForTesting(mockAdsLoader);
+    imaVideoObj.setAdsRequestForTesting(mockAdsRequest);
+    imaVideoObj.setContextForTesting({
+      initialConsentState: CONSENT_POLICY_STATE.SUFFICIENT,
+      initialConsentMetadata: {
+        consentStringType: CONSENT_STRING_TYPE.US_PRIVACY_STRING,
+      },
+      initialConsentValue: 'myConsentValue',
+    });
     imaVideoObj.requestAds();
 
     expect(imaVideoObj.getPropertiesForTesting().adsRequest.adTagUrl).to.eql(
-      'vast.mxl'
+      'vast.xml'
     );
   });
 });
diff --git a/extensions/amp-image-lightbox/0.1/amp-image-lightbox.js b/extensions/amp-image-lightbox/0.1/amp-image-lightbox.js
index 081da4ed12e0..2c5c1f85dfb0 100644
--- a/extensions/amp-image-lightbox/0.1/amp-image-lightbox.js
+++ b/extensions/amp-image-lightbox/0.1/amp-image-lightbox.js
@@ -1,4 +1,4 @@
-import {Keys} from '#core/constants/key-codes';
+import {Keys_Enum} from '#core/constants/key-codes';
 import {bezierCurve} from '#core/data-structures/curve';
 import * as dom from '#core/dom';
 import {
@@ -915,7 +915,7 @@ class AmpImageLightbox extends AMP.BaseElement {
    * @private
    */
   closeOnEscape_(event) {
-    if (event.key == Keys.ESCAPE) {
+    if (event.key == Keys_Enum.ESCAPE) {
       event.preventDefault();
       this.close();
     }
diff --git a/extensions/amp-image-lightbox/0.1/test/integration/test-amp-image-lightbox.js b/extensions/amp-image-lightbox/0.1/test/integration/test-amp-image-lightbox.js
index b93303fa9369..3ef7f804925b 100644
--- a/extensions/amp-image-lightbox/0.1/test/integration/test-amp-image-lightbox.js
+++ b/extensions/amp-image-lightbox/0.1/test/integration/test-amp-image-lightbox.js
@@ -1,12 +1,9 @@
 import {poll} from '#testing/iframe';
 
-describes.sandboxed
-  .configure()
-  .skipFirefox()
-  .run('amp-image-lightbox', {}, function () {
-    this.timeout(5000);
-    const extensions = ['amp-image-lightbox'];
-    const imageLightboxBody = `
+describes.sandboxed('amp-image-lightbox', {}, function () {
+  this.timeout(5000);
+  const extensions = ['amp-image-lightbox'];
+  const imageLightboxBody = `
   <figure>
   <amp-img id="img0"
       srcset="
@@ -26,48 +23,48 @@ describes.sandboxed
   data-close-button-aria-label="Close">
 </amp-image-lightbox>
   `;
-    describes.integration(
-      'amp-image-lightbox opens',
-      {
-        body: imageLightboxBody,
-        extensions,
-      },
-      (env) => {
-        let win;
-        beforeEach(() => {
-          win = env.win;
-        });
+  describes.integration(
+    'amp-image-lightbox opens',
+    {
+      body: imageLightboxBody,
+      extensions,
+    },
+    (env) => {
+      let win;
+      beforeEach(() => {
+        win = env.win;
+      });
 
-        // TODO(wg-components, #25675) Flaky during cross-browser tests.
-        it.skip('should activate on tap of source image', () => {
-          const lightbox = win.document.getElementById('image-lightbox-1');
-          expect(lightbox).to.have.display('none');
-          const ampImage = win.document.getElementById('img0');
-          const imageLoadedPromise = waitForImageToLoad(ampImage);
-          return imageLoadedPromise
-            .then(() => {
-              const ampImage = win.document.getElementById('img0');
-              // Simulate a click on the img inside the amp-img, because this is
-              // what people tend to actually click on.
-              const openerImage = ampImage.querySelector(
-                'img[amp-img-id="img0"]'
-              );
-              const openedPromise = waitForLightboxOpen(win.document);
-              openerImage.click();
-              return openedPromise;
-            })
-            .then(() => {
-              const imageSelection = win.document.getElementsByClassName(
-                'i-amphtml-image-lightbox-viewer-image'
-              );
-              expect(imageSelection.length).to.equal(1);
-              const image = imageSelection[0];
-              expect(image.tagName).to.equal('IMG');
-            });
-        });
-      }
-    );
-  });
+      // TODO(wg-components, #25675) Flaky during cross-browser tests.
+      it.skip('should activate on tap of source image', () => {
+        const lightbox = win.document.getElementById('image-lightbox-1');
+        expect(lightbox).to.have.display('none');
+        const ampImage = win.document.getElementById('img0');
+        const imageLoadedPromise = waitForImageToLoad(ampImage);
+        return imageLoadedPromise
+          .then(() => {
+            const ampImage = win.document.getElementById('img0');
+            // Simulate a click on the img inside the amp-img, because this is
+            // what people tend to actually click on.
+            const openerImage = ampImage.querySelector(
+              'img[amp-img-id="img0"]'
+            );
+            const openedPromise = waitForLightboxOpen(win.document);
+            openerImage.click();
+            return openedPromise;
+          })
+          .then(() => {
+            const imageSelection = win.document.getElementsByClassName(
+              'i-amphtml-image-lightbox-viewer-image'
+            );
+            expect(imageSelection.length).to.equal(1);
+            const image = imageSelection[0];
+            expect(image.tagName).to.equal('IMG');
+          });
+      });
+    }
+  );
+});
 
 function waitForLightboxOpen(document) {
   return poll('wait for image-lightbox-1 to open', () => {
diff --git a/extensions/amp-image-lightbox/0.1/test/test-amp-image-lightbox.js b/extensions/amp-image-lightbox/0.1/test/test-amp-image-lightbox.js
index 8387fb3ae114..3f0ba5ceec3b 100644
--- a/extensions/amp-image-lightbox/0.1/test/test-amp-image-lightbox.js
+++ b/extensions/amp-image-lightbox/0.1/test/test-amp-image-lightbox.js
@@ -1,8 +1,8 @@
 import '../amp-image-lightbox';
 import * as fakeTimers from '@sinonjs/fake-timers';
 
-import {ActionTrust} from '#core/constants/action-constants';
-import {Keys} from '#core/constants/key-codes';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
+import {Keys_Enum} from '#core/constants/key-codes';
 import * as dom from '#core/dom';
 import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 import {parseSrcset} from '#core/dom/srcset';
@@ -245,7 +245,9 @@ describes.realWin(
       ampImage.setAttribute('width', '100');
       ampImage.setAttribute('height', '100');
       impl.open_({caller: ampImage});
-      impl.closeOnEscape_(new KeyboardEvent('keydown', {key: Keys.ESCAPE}));
+      impl.closeOnEscape_(
+        new KeyboardEvent('keydown', {key: Keys_Enum.ESCAPE})
+      );
       expect(setupCloseSpy).to.be.calledOnce;
 
       // Regression test: ensure escape event listener is bound properly
@@ -302,7 +304,7 @@ describes.realWin(
         'source',
         'caller',
         'event',
-        ActionTrust.HIGH
+        ActionTrust_Enum.HIGH
       );
       expect(element.enqueAction).to.be.calledWith(
         env.sandbox.match({
@@ -313,7 +315,7 @@ describes.realWin(
           method: 'open',
           node: element,
           source: 'source',
-          trust: ActionTrust.HIGH,
+          trust: ActionTrust_Enum.HIGH,
         })
       );
       expect(impl.open_).to.be.calledOnce;
diff --git a/extensions/amp-image-slider/0.1/amp-image-slider.js b/extensions/amp-image-slider/0.1/amp-image-slider.js
index aba670fcd81c..1bca9c272b8d 100644
--- a/extensions/amp-image-slider/0.1/amp-image-slider.js
+++ b/extensions/amp-image-slider/0.1/amp-image-slider.js
@@ -1,5 +1,5 @@
-import {ActionTrust} from '#core/constants/action-constants';
-import {CommonSignals} from '#core/constants/common-signals';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
+import {CommonSignals_Enum} from '#core/constants/common-signals';
 import {isLayoutSizeDefined} from '#core/dom/layout';
 import {observeIntersections} from '#core/dom/layout/viewport-observer';
 import {realChildElements} from '#core/dom/query';
@@ -170,7 +170,7 @@ export class AmpImageSlider extends AMP.BaseElement {
           }
         }
       },
-      ActionTrust.LOW
+      ActionTrust_Enum.LOW
     );
 
     const initialPositionString = this.element.getAttribute(
@@ -293,7 +293,7 @@ export class AmpImageSlider extends AMP.BaseElement {
     const rightAmpImage = dev().assertElement(this.rightImage_);
     leftAmpImage
       .signals()
-      .whenSignal(CommonSignals.LOAD_END)
+      .whenSignal(CommonSignals_Enum.LOAD_END)
       .then(() => {
         if (leftAmpImage.childElementCount > 0) {
           const img = leftAmpImage.querySelector('img');
@@ -319,7 +319,7 @@ export class AmpImageSlider extends AMP.BaseElement {
       });
     rightAmpImage
       .signals()
-      .whenSignal(CommonSignals.LOAD_END)
+      .whenSignal(CommonSignals_Enum.LOAD_END)
       .then(() => {
         if (rightAmpImage.childElementCount > 0) {
           const img = rightAmpImage.querySelector('img');
@@ -731,11 +731,11 @@ export class AmpImageSlider extends AMP.BaseElement {
         dev()
           .assertElement(this.leftImage_)
           .signals()
-          .whenSignal(CommonSignals.LOAD_END),
+          .whenSignal(CommonSignals_Enum.LOAD_END),
         dev()
           .assertElement(this.rightImage_)
           .signals()
-          .whenSignal(CommonSignals.LOAD_END),
+          .whenSignal(CommonSignals_Enum.LOAD_END),
       ]).then(appendHints, appendHints);
     }
 
diff --git a/extensions/amp-image-slider/0.1/amp-image-slider.md b/extensions/amp-image-slider/0.1/amp-image-slider.md
new file mode 100644
index 000000000000..51d64af176af
--- /dev/null
+++ b/extensions/amp-image-slider/0.1/amp-image-slider.md
@@ -0,0 +1,180 @@
+---
+$category@: layout
+formats:
+  - websites
+teaser:
+  text: A slider to compare two images.
+---
+
+# amp-image-slider
+
+## Usage
+
+The `amp-image-slider` component requires exactly two `amp-img` elements as its
+children. The first child image displays on the left, the second child image
+displays on the right.
+
+The `amp-image-slider` component can also contain two `<div>` elements to use as
+labels for the images. The labels are overlaid on top of the images. The label
+on the left image requires the `first` attribute, while the right label requires
+the `second` attribute. By default, the labels display at the top left corner of
+the image.
+
+```html
+<amp-image-slider layout="responsive" width="100" height="200">
+  <amp-img src="/green-apple.jpg" alt="A green apple"></amp-img>
+  <amp-img src="/red-apple.jpg" alt="A red apple"></amp-img>
+  <div first>This apple is green</div>
+  <div second>This apple is red</div>
+</amp-image-slider>
+```
+
+Once the slider is loaded, the compared images are separated by a vertical bar,
+with helpful arrow hints displayed at the slider's center.
+
+Users can mouse down or touch to move the slider to the position of the pointer,
+and can then move the pointer to drag the slider bar left or right. For the left
+image, only the part that is left to the bar is displayed; similarly for the
+right image, to only display the right portion.
+
+If you specify `tabindex` on the `amp-image-slider` element, users can navigate
+the slider with their keyboards. Pressing the down, left, or right arrow moves
+the slider bar one step towards the corresponding direction. Pressing the Home
+key brings the slider to the center. Pressing the PageUp or PageDown keys moves
+to the left or right end of the slider body.
+
+### Customize labels
+
+You can customize your labels by providing customized CSS classes. You can use
+`top`, `right`, `bottom`, `left` and `transform: translate(...)` rules to
+control their positioning. Other rules, such as `border`, `background-color`,
+etc., could be used for customizing the style of your labels.
+
+The following example displays an image slider with left label on top left,
+right label on top right:
+
+```html
+<!-- head -->
+<style amp-custom>
+  .top-right {
+    top: 0;
+    right: 0;
+  }
+</style>
+
+<!-- body -->
+<amp-image-slider layout="responsive" width="100" height="200">
+  <amp-img src="/green-apple.jpg" alt="A green apple"></amp-img>
+  <amp-img src="/red-apple.jpg" alt="A red apple"></amp-img>
+  <div first>This apple is green</div>
+  <div second class="top-right">This apple is red</div>
+</amp-image-slider>
+```
+
+### Customize hints
+
+By default, the hints are a pair of white arrows with drop shadow. To customize
+the left and right hints, you can override `.amp-image-slider-hint-left` and
+`.amp-image-slider-hint-right` classes. To replace the arrows with customized
+images, overwrite `background-image`. To remove drop shadow, set
+`filter: none;`.
+
+The following example replace the arrows with triangles:
+
+```css
+.amp-image-slider-hint-left {
+  width: 10px;
+  height: 20px;
+  background-size: 10px 20px;
+  margin-right: 10px;
+  background-image: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' width='10' height='20' viewBox='0 0 10 20'%3e%3cpolygon points='10,0 0,10 10,20' style='fill:white;stroke:black;stroke-width:1' /%3e%3c/svg%3e");
+}
+
+.amp-image-slider-hint-right {
+  width: 10px;
+  height: 20px;
+  background-size: 10px 20px;
+  margin-left: 10px;
+  background-image: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' width='10' height='20' viewBox='0 0 10 20'%3e%3cpolygon points='0,0 10,10 0,20' style='fill:white;stroke:black;stroke-width:1' /%3e%3c/svg%3e");
+}
+```
+
+## Attributes
+
+### `disable-hint-reappear`
+
+The hints that shows at the center of the vertical bar will disappear once the
+user starts interacting with the slider (such as clicking the mouse button,
+touch the slider, and pressing keys to move the slider). The hints would
+reappear if it then leaves the viewport and goes back in again. To stop such
+reappearing behavior, add the `disable-hint-reappear` attribute to the image
+slider.
+
+The following example displays an image slider without reappearing hints:
+
+```html
+<amp-image-slider
+  layout="responsive"
+  width="100"
+  height="200"
+  disable-hint-reappear
+>
+  <amp-img src="/green-apple.jpg" alt="A green apple"></amp-img>
+  <amp-img src="/red-apple.jpg" alt="A red apple"></amp-img>
+  <div first>This apple is green</div>
+  <div second>This apple is red</div>
+</amp-image-slider>
+```
+
+### `initial-slider-position`
+
+The vertical slider bar sits at the center of the slider body by default. To
+move the initial slider position to a different place, set
+`initial-slider-position` to a value between `0` and `1`, corresponding to 0% to
+100% from the left slider edge.
+
+The following example displays an image slider with initial slider position on
+the left:
+
+```html
+<amp-image-slider
+  layout="responsive"
+  width="100"
+  height="200"
+  initial-slider-position="0"
+>
+  <amp-img src="/green-apple.jpg" alt="A green apple"></amp-img>
+  <amp-img src="/red-apple.jpg" alt="A red apple"></amp-img>
+  <div first>This apple is green</div>
+  <div second>This apple is red</div>
+</amp-image-slider>
+```
+
+### `step-size`
+
+When focusing on the slider, left and right keyboard buttons move the slider bar
+by 10% each press. To use a different step size, set `step-size` to a value
+between `0` and `1`, corresponding to moving 0% to moving 100% each key press.
+
+The following example displays an image slider with step size of 25%:
+
+```html
+<amp-image-slider layout="responsive" width="100" height="200" step-size="0.25">
+  <amp-img src="/green-apple.jpg" alt="A green apple"></amp-img>
+  <amp-img src="/red-apple.jpg" alt="A red apple"></amp-img>
+  <div first>This apple is green</div>
+  <div second>This apple is red</div>
+</amp-image-slider>
+```
+
+## Actions
+
+### `seekTo`
+
+`slider-id.seekTo(percent=[0,1])` move the corresponding slider's bar to the
+given percentage from left.
+
+## Validation
+
+See [`amp-image-slider` rules](../validator-amp-image-slider.protoascii)
+in the AMP validator specification.
diff --git a/extensions/amp-image-slider/0.1/storybook/Basic.amp.js b/extensions/amp-image-slider/0.1/storybook/Basic.amp.js
index 88e6692b6858..66fb58b0806c 100644
--- a/extensions/amp-image-slider/0.1/storybook/Basic.amp.js
+++ b/extensions/amp-image-slider/0.1/storybook/Basic.amp.js
@@ -1,27 +1,28 @@
 import {withAmp} from '@ampproject/storybook-addon';
-import {text, withKnobs} from '@storybook/addon-knobs';
 
 import * as Preact from '#preact';
 
 export default {
   title: 'Image Slider',
-  decorators: [withKnobs, withAmp],
-
+  decorators: [withAmp],
   parameters: {
     extensions: [{name: 'amp-image-slider', version: 0.1}],
   },
+  argTypes: {
+    first: {
+      name: 'First image URL',
+      defaultValue: 'https://amp.dev/static/samples/img/canoe_900x600.jpg',
+      control: {type: 'text'},
+    },
+    second: {
+      name: 'Second image URL',
+      defaultValue: 'https://amp.dev/static/samples/img/canoe_900x600_blur.jpg',
+      control: {type: 'text'},
+    },
+  },
 };
 
-export const Default = () => {
-  const first = text(
-    'First image',
-    'https://amp.dev/static/samples/img/canoe_900x600.jpg'
-  );
-  const second = text(
-    'Second image',
-    'https://amp.dev/static/samples/img/canoe_900x600_blur.jpg'
-  );
-
+export const Default = ({first, second}) => {
   return (
     <amp-image-slider width="600" height="300" layout="fixed">
       <amp-img src={first} alt={'First image'} layout="fill"></amp-img>
@@ -30,18 +31,7 @@ export const Default = () => {
   );
 };
 
-Default.storyName = 'default';
-
-export const CustomHints = () => {
-  const first = text(
-    'First image',
-    'https://amp.dev/static/samples/img/canoe_900x600.jpg'
-  );
-  const second = text(
-    'Second image',
-    'https://amp.dev/static/samples/img/canoe_900x600_blur.jpg'
-  );
-
+export const CustomHints = ({first, second}) => {
   return (
     <amp-image-slider width="600" height="300" layout="fixed">
       <amp-img src={first} alt={'First image'} layout="fill"></amp-img>
@@ -71,5 +61,3 @@ export const CustomHints = () => {
     </amp-image-slider>
   );
 };
-
-CustomHints.storyName = 'custom-hints';
diff --git a/extensions/amp-image-slider/1.0/amp-image-slider.css b/extensions/amp-image-slider/1.0/amp-image-slider.css
new file mode 100644
index 000000000000..d61e14a35c2d
--- /dev/null
+++ b/extensions/amp-image-slider/1.0/amp-image-slider.css
@@ -0,0 +1,17 @@
+/*
+ * Pre-upgrade:
+ * - display:block element
+ * - size-defined element
+ */
+amp-image-slider {
+  display: block;
+  overflow: hidden;
+  position: relative;
+}
+
+/* Pre-upgrade: size-defining element - hide children. */
+amp-image-slider:not(.i-amphtml-built)
+  > :not([placeholder]):not([slot='i-amphtml-svc']) {
+  display: none;
+  content-visibility: hidden;
+}
diff --git a/extensions/amp-image-slider/1.0/amp-image-slider.js b/extensions/amp-image-slider/1.0/amp-image-slider.js
new file mode 100644
index 000000000000..55a526523144
--- /dev/null
+++ b/extensions/amp-image-slider/1.0/amp-image-slider.js
@@ -0,0 +1,41 @@
+import {isFiniteNumber} from '#core/types';
+
+import {isExperimentOn} from '#experiments';
+
+import {AmpPreactBaseElement, setSuperClass} from '#preact/amp-base-element';
+
+import {userAssert} from '#utils/log';
+
+import {BaseElement} from './base-element';
+
+import {CSS} from '../../../build/amp-image-slider-1.0.css';
+
+/** @const {string} */
+const TAG = 'amp-image-slider';
+
+class AmpImageSlider extends setSuperClass(BaseElement, AmpPreactBaseElement) {
+  /** @override */
+  init() {
+    this.registerApiAction('seekTo', (api, invocation) => {
+      const {args} = invocation;
+      const percent = parseFloat(args['percent']);
+      if (isFiniteNumber(percent)) {
+        api.seekTo(percent);
+      }
+    });
+  }
+
+  /** @override */
+  isLayoutSupported(layout) {
+    userAssert(
+      isExperimentOn(this.win, 'bento') ||
+        isExperimentOn(this.win, 'bento-image-slider'),
+      'expected global "bento" or specific "bento-image-slider" experiment to be enabled'
+    );
+    return super.isLayoutSupported(layout);
+  }
+}
+
+AMP.extension(TAG, '1.0', (AMP) => {
+  AMP.registerElement(TAG, AmpImageSlider, CSS);
+});
diff --git a/extensions/amp-image-slider/1.0/amp-image-slider.md b/extensions/amp-image-slider/1.0/amp-image-slider.md
new file mode 100644
index 000000000000..a61554f7b38a
--- /dev/null
+++ b/extensions/amp-image-slider/1.0/amp-image-slider.md
@@ -0,0 +1,192 @@
+---
+bento: true
+$category@: layout
+experimental: true
+formats:
+  - websites
+teaser:
+  text: A slider to compare two images.
+---
+
+# amp-image-slider
+
+## Usage
+
+The `amp-image-slider` component requires exactly two `amp-img` elements as its
+children. The first child image displays on the left, the second child image
+displays on the right.
+
+The `amp-image-slider` component can also contain two `<div>` elements to use as
+labels for the images. The labels are overlaid on top of the images. The label
+on the left image requires the `first` attribute, while the right label requires
+the `second` attribute. By default, the labels display at the top left corner of
+the image.
+
+```html
+<amp-image-slider layout="responsive" width="100" height="200">
+  <amp-img src="/green-apple.jpg" alt="A green apple"></amp-img>
+  <amp-img src="/red-apple.jpg" alt="A red apple"></amp-img>
+  <div first>This apple is green</div>
+  <div second>This apple is red</div>
+</amp-image-slider>
+```
+
+Once the slider is loaded, the compared images are separated by a vertical bar,
+with helpful arrow hints displayed at the slider's center.
+
+Users can mouse down or touch to move the slider to the position of the pointer,
+and can then move the pointer to drag the slider bar left or right. For the left
+image, only the part that is left to the bar is displayed; similarly for the
+right image, to only display the right portion.
+
+If you specify `tabindex` on the `amp-image-slider` element, users can navigate
+the slider with their keyboards. Pressing the down, left, or right arrow moves
+the slider bar one step towards the corresponding direction. Pressing the Home
+key brings the slider to the center. Pressing the PageUp or PageDown keys moves
+to the left or right end of the slider body.
+
+### Customize labels
+
+You can customize your labels by providing customized CSS classes. You can use
+`top`, `right`, `bottom`, `left` and `transform: translate(...)` rules to
+control their positioning. Other rules, such as `border`, `background-color`,
+etc., could be used for customizing the style of your labels.
+
+The following example displays an image slider with left label on top left,
+right label on top right:
+
+```html
+<!-- head -->
+<style amp-custom>
+  .top-right {
+    top: 0;
+    right: 0;
+  }
+</style>
+
+<!-- body -->
+<amp-image-slider layout="responsive" width="100" height="200">
+  <amp-img src="/green-apple.jpg" alt="A green apple"></amp-img>
+  <amp-img src="/red-apple.jpg" alt="A red apple"></amp-img>
+  <div first>This apple is green</div>
+  <div second class="top-right">This apple is red</div>
+</amp-image-slider>
+```
+
+### Customize hints
+
+By default, the hints are a pair of white arrows with drop shadow. To customize
+the left and right hints, you can override `.amp-image-slider-hint-left` and
+`.amp-image-slider-hint-right` classes. To replace the arrows with customized
+images, overwrite `background-image`. To remove drop shadow, set
+`filter: none;`.
+
+The following example replace the arrows with triangles:
+
+```css
+.amp-image-slider-hint-left {
+  width: 10px;
+  height: 20px;
+  background-size: 10px 20px;
+  margin-right: 10px;
+  background-image: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' width='10' height='20' viewBox='0 0 10 20'%3e%3cpolygon points='10,0 0,10 10,20' style='fill:white;stroke:black;stroke-width:1' /%3e%3c/svg%3e");
+}
+
+.amp-image-slider-hint-right {
+  width: 10px;
+  height: 20px;
+  background-size: 10px 20px;
+  margin-left: 10px;
+  background-image: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' width='10' height='20' viewBox='0 0 10 20'%3e%3cpolygon points='0,0 10,10 0,20' style='fill:white;stroke:black;stroke-width:1' /%3e%3c/svg%3e");
+}
+```
+
+## Attributes
+
+### `disable-hint-reappear`
+
+The hints that shows at the center of the vertical bar will disappear once the
+user starts interacting with the slider (such as clicking the mouse button,
+touch the slider, and pressing keys to move the slider). The hints would
+reappear if it then leaves the viewport and goes back in again. To stop such
+reappearing behavior, add the `disable-hint-reappear` attribute to the image
+slider.
+
+The following example displays an image slider without reappearing hints:
+
+```html
+<amp-image-slider
+  layout="responsive"
+  width="100"
+  height="200"
+  disable-hint-reappear
+>
+  <amp-img src="/green-apple.jpg" alt="A green apple"></amp-img>
+  <amp-img src="/red-apple.jpg" alt="A red apple"></amp-img>
+  <div first>This apple is green</div>
+  <div second>This apple is red</div>
+</amp-image-slider>
+```
+
+### `initial-slider-position`
+
+The vertical slider bar sits at the center of the slider body by default. To
+move the initial slider position to a different place, set
+`initial-slider-position` to a value between `0` and `1`, corresponding to 0% to
+100% from the left slider edge.
+
+The following example displays an image slider with initial slider position on
+the left:
+
+```html
+<amp-image-slider
+  layout="responsive"
+  width="100"
+  height="200"
+  initial-slider-position="0"
+>
+  <amp-img src="/green-apple.jpg" alt="A green apple"></amp-img>
+  <amp-img src="/red-apple.jpg" alt="A red apple"></amp-img>
+  <div first>This apple is green</div>
+  <div second>This apple is red</div>
+</amp-image-slider>
+```
+
+### `step-size`
+
+When focusing on the slider, left and right keyboard buttons move the slider bar
+by 10% each press. To use a different step size, set `step-size` to a value
+between `0` and `1`, corresponding to moving 0% to moving 100% each key press.
+
+The following example displays an image slider with step size of 25%:
+
+```html
+<amp-image-slider layout="responsive" width="100" height="200" step-size="0.25">
+  <amp-img src="/green-apple.jpg" alt="A green apple"></amp-img>
+  <amp-img src="/red-apple.jpg" alt="A red apple"></amp-img>
+  <div first>This apple is green</div>
+  <div second>This apple is red</div>
+</amp-image-slider>
+```
+
+## Actions
+
+### `seekTo`
+
+`slider-id.seekTo(percent=[0,1])` move the corresponding slider's bar to the
+given percentage from left.
+
+## Version Notes
+
+Few updates and alteration are done in `1.0` which are a bit different from `0.1` version. This section describes this updates and differences.
+
+### Attributes Update
+
+| `0.1` Parameter         | Update Type | `1.0` Parameter     | Note                                                            |
+| ----------------------- | ----------- | ------------------- | --------------------------------------------------------------- |
+| `disable-hint-reappear` | Renamed     | `display-hint-once` | The intention is to not have an attribute with a negative name. |
+
+## Validation
+
+See [`amp-image-slider` rules](../validator-amp-image-slider.protoascii)
+in the AMP validator specification.
diff --git a/extensions/amp-image-slider/1.0/base-element.js b/extensions/amp-image-slider/1.0/base-element.js
new file mode 100644
index 000000000000..257cbff64684
--- /dev/null
+++ b/extensions/amp-image-slider/1.0/base-element.js
@@ -0,0 +1,45 @@
+import {PreactBaseElement} from '#preact/base-element';
+
+import {BentoImageSlider} from './component';
+import {CSS as COMPONENT_CSS} from './component.jss';
+
+export class BaseElement extends PreactBaseElement {}
+
+/** @override */
+BaseElement['Component'] = BentoImageSlider;
+
+/** @override */
+BaseElement['props'] = {
+  firstImageAs: {
+    selector: 'amp-img[slot="first-image"]' || 'img[slot="first-image"]',
+    single: true,
+    as: true,
+  },
+  secondImageAs: {
+    selector: 'amp-img[slot="second-image"]' || 'img[slot="second-image"]',
+    single: true,
+    as: true,
+  },
+  firstLabelAs: {selector: 'div[slot="first-label"]', single: true, as: true},
+  secondLabelAs: {selector: 'div[slot="second-label"]', single: true, as: true},
+  leftHintAs: {selector: 'div[slot="left-hint"]', single: true, as: true},
+  rightHintAs: {selector: 'div[slot="right-hint"]', single: true, as: true},
+  initialPosition: {
+    attr: 'initial-slider-position',
+    type: 'number',
+  },
+  displayHintOnce: {
+    attr: 'display-hint-once',
+    type: 'boolean',
+  },
+  stepSize: {attr: 'step-size', type: 'number', default: 0.1},
+};
+
+/** @override */
+BaseElement['layoutSizeDefined'] = true;
+
+/** @override */
+BaseElement['usesShadowDom'] = true;
+
+/** @override */
+BaseElement['shadowCss'] = COMPONENT_CSS;
diff --git a/extensions/amp-image-slider/1.0/component.js b/extensions/amp-image-slider/1.0/component.js
new file mode 100644
index 000000000000..08adb1e9b95b
--- /dev/null
+++ b/extensions/amp-image-slider/1.0/component.js
@@ -0,0 +1,623 @@
+import objstr from 'obj-str';
+
+import {observeIntersections} from '#core/dom/layout/viewport-observer';
+import {setStyle} from '#core/dom/style';
+import {clamp} from '#core/math';
+
+import * as Preact from '#preact';
+import {
+  useCallback,
+  useEffect,
+  useImperativeHandle,
+  useRef,
+  useState,
+} from '#preact';
+import {forwardRef} from '#preact/compat';
+import {ContainWrapper} from '#preact/component';
+
+import {installTimerService} from '#service/timer-impl';
+
+import {listen} from '#utils/event-helper';
+// eslint-disable-next-line
+import {initLogConstructor} from '#utils/log';
+
+import {useStyles} from './component.jss';
+
+import {Gestures} from '../../../src/gesture';
+import {SwipeXRecognizer} from '../../../src/gesture-recognizers';
+
+/**
+ * Using Gestures class throws console error for failed to call initLogConstructor
+ * so we need to explicity call it.
+ */
+// eslint-disable-next-line
+initLogConstructor();
+
+/**
+ * Required for Gestures.get otherwise throws:
+ * "Uncaught Error: Expected service timer to be registered"
+ */
+installTimerService(global);
+
+/**
+ * Displays given component with supplied props.
+ * @param {*} props
+ * @param {{current: ?Element}} ref
+ * @return {PreactDef.Renderable}
+ */
+function DisplayAsWithRef({as: Comp = 'div', containerClass, ...rest}, ref) {
+  return (
+    /** Need containerClass to add jss Styling to the component container */
+    <div ref={ref} class={containerClass}>
+      <Comp {...rest} />
+    </div>
+  );
+}
+
+const DisplayAs = forwardRef(DisplayAsWithRef);
+
+/**
+ * @param {!BentoImageSliderDef.Props} props
+ * @param {{current: ?BentoImageSliderDef.Api}} ref
+ * @return {PreactDef.Renderable}
+ */
+export function BentoImageSliderWithRef(
+  {
+    displayHintOnce,
+    firstImageAs,
+    firstLabelAs,
+    initialPosition,
+    leftHintAs,
+    rightHintAs,
+    secondImageAs,
+    secondLabelAs,
+    stepSize = 0.1,
+    ...rest
+  },
+  ref
+) {
+  /** Common variables */
+  const gesturesRef = useRef(null);
+  const isEventRegistered = false;
+  const styles = useStyles();
+  /** Common variables */
+  const doc = useRef(null);
+  /** Container Reference */
+  const containerRef = useRef(null);
+
+  /** Image References */
+  const leftImageRef = useRef(null);
+  const rightImageRef = useRef(null);
+
+  /** Label References */
+  const leftLabelWrapperRef = useRef(null);
+  const leftLabelRef = useRef(null);
+  const rightLabelWrapperRef = useRef(null);
+  const rightLabelRef = useRef(null);
+
+  /** Mask References */
+  const leftMaskRef = useRef(null);
+  const rightMaskRef = useRef(null);
+
+  /** Bar Reference */
+  const barRef = useRef(null);
+
+  /** Arrow References */
+  const leftHintArrowRef = useRef(null);
+  const rightHintArrowRef = useRef(null);
+
+  /** Hint Wrapper References */
+  const leftHintWrapper = useRef(null);
+  const rightHintWrapper = useRef(null);
+
+  /** Hint Body References */
+  const leftHintBodyRef = useRef(null);
+  const rightHintBodyRef = useRef(null);
+
+  /** Unlisten Handlers for Mouse */
+  const unlistenMouseUp = useRef(null);
+  const unlistenMouseDown = useRef(null);
+  const unlistenMouseMove = useRef(null);
+
+  /** Unlisten Handlers for Keyboard */
+  const unlistenKeyDown = useRef(null);
+
+  /** Animate Hint Flag */
+  const [hideHint, setHideHint] = useState(false);
+
+  const animateHideHint = useCallback(() => {
+    setHideHint(true);
+  }, [setHideHint]);
+
+  const animateShowHint = useCallback(() => {
+    setHideHint(false);
+  }, [setHideHint]);
+
+  /** Listen / Unlisten Handler */
+  /**
+   * Unlisten a listener and clear. If null, does nothing
+   * @param {?UnlistenDef} unlistenHandle
+   * @private
+   */
+  const unlisten = useCallback((unlistenHandle) => {
+    if (unlistenHandle?.current) {
+      unlistenHandle.current?.();
+      unlistenHandle.current = null;
+    }
+  }, []);
+
+  /**
+   * Limit percentage between 0 and 1
+   * @param {number} percentage
+   * @private
+   * @return {number}
+   */
+  const limitPercentage = useCallback((percentage) => {
+    return clamp(percentage, 0, 1);
+  }, []);
+
+  /**
+   * Set translateX of the element
+   * Only used in updatePositions_, which should be wrapped in mutateElement
+   * @param {Element} element
+   * @param {number} percentage
+   * @private
+   */
+  const updateTranslateX = useCallback((element, percentage) => {
+    setStyle(element, 'transform', `translateX(${percentage * 100}%)`);
+  }, []);
+
+  /**
+   * Update element positions based on percentage
+   * Should be wrapped inside mutateElement
+   * @param {number} percentFromLeft
+   * @private
+   */
+  const updatePositions = useCallback(
+    (percentFromLeft) => {
+      percentFromLeft = limitPercentage(percentFromLeft);
+
+      updateTranslateX(barRef.current, percentFromLeft);
+      updateTranslateX(rightMaskRef.current, percentFromLeft);
+      updateTranslateX(rightImageRef.current, -percentFromLeft);
+      const adjustedDeltaFromLeft = percentFromLeft - 0.5;
+      updateTranslateX(leftHintBodyRef.current, adjustedDeltaFromLeft);
+      updateTranslateX(rightHintBodyRef.current, adjustedDeltaFromLeft);
+      if (rightLabelWrapperRef.current != null) {
+        updateTranslateX(rightLabelWrapperRef.current, -percentFromLeft);
+      }
+    },
+    [limitPercentage, updateTranslateX]
+  );
+
+  const pointerMoveX = useCallback(
+    (pointerX) => {
+      // This is to address the "snap to leftmost" bug that occurs on
+      // pointer down after scrolling away and back 3+ slides
+      // layoutBox is not updated correctly when first landed on page
+
+      const {left, right, width} =
+        containerRef.current./*OK*/ getBoundingClientRect();
+
+      const newPos = clamp(pointerX, left, right);
+      const newPercentage = (newPos - left) / width;
+
+      updatePositions(newPercentage);
+    },
+    [updatePositions]
+  );
+
+  const registerTouchGestures = useCallback(() => {
+    if (gesturesRef.current) {
+      return;
+    }
+
+    gesturesRef.current = Gestures.get(
+      containerRef.current,
+      /* shouldNotPreventDefault */ true
+    );
+
+    gesturesRef.current.onGesture(SwipeXRecognizer, (e) => {
+      if (e.data.first) {
+        // Disable hint reappearance timeout if needed
+        animateHideHint();
+      }
+      pointerMoveX(e.data.startX + e.data.deltaX);
+    });
+
+    gesturesRef.current.onPointerDown((e) => {
+      // Ensure touchstart changes slider position
+      pointerMoveX(e.touches[0].pageX);
+      animateHideHint();
+    });
+  }, [animateHideHint, pointerMoveX]);
+
+  /**
+   * Get current slider's percentage to the left
+   * Should be wrapped inside measureElement
+   * @private
+   * @return {number}
+   */
+  const getCurrentSliderPercentage = useCallback(() => {
+    const {left: barLeft} = barRef.current./*OK*/ getBoundingClientRect();
+    const {left: boxLeft, width: boxWidth} =
+      containerRef.current./*OK*/ getBoundingClientRect();
+    return (barLeft - boxLeft) / boxWidth;
+  }, []);
+
+  /**
+   * One step left
+   * @param {boolean=} opt_toEnd
+   * @private
+   */
+  const stepLeft = useCallback(
+    (opt_toEnd) => {
+      // To the very end of left
+      if (opt_toEnd === true) {
+        updatePositions(0);
+      } else {
+        const newPercentage = limitPercentage(
+          getCurrentSliderPercentage() - stepSize
+        );
+        updatePositions(newPercentage);
+      }
+    },
+    [getCurrentSliderPercentage, updatePositions, limitPercentage, stepSize]
+  );
+
+  /**
+   * Step to the center
+   * @private
+   */
+  const stepExactCenter = useCallback(() => {
+    updatePositions(0.5);
+  }, [updatePositions]);
+
+  /**
+   * One step right
+   * @param {boolean=} opt_toEnd
+   * @private
+   */
+  const stepRight = useCallback(
+    (opt_toEnd) => {
+      // To the very end of right
+      if (opt_toEnd === true) {
+        updatePositions(1);
+      } else {
+        const newPercentage = limitPercentage(
+          getCurrentSliderPercentage() + stepSize
+        );
+        updatePositions(newPercentage);
+      }
+    },
+    [updatePositions, limitPercentage, getCurrentSliderPercentage, stepSize]
+  );
+
+  /**
+   * Handler on key down
+   * @param {Event} e
+   * @private
+   */
+  const onKeyDown = useCallback(
+    (e) => {
+      // Check if current element has focus
+      if (
+        doc.current.activeElement !== containerRef?.current &&
+        doc.current.activeElement !== containerRef?.current?./*OK*/ offsetParent
+      ) {
+        return;
+      }
+
+      animateHideHint();
+
+      switch (e.key.toLowerCase()) {
+        case 'left': // Edge non-standard, pre EdgeHTML 17
+        case 'arrowleft':
+          e.preventDefault();
+          e.stopPropagation();
+          stepLeft();
+          break;
+        case 'right': // Edge non-standard, pre EdgeHTML 17
+        case 'arrowright':
+          e.preventDefault();
+          e.stopPropagation();
+          stepRight();
+          break;
+        case 'pageup':
+          // prevent scrolling the page
+          e.preventDefault();
+          e.stopPropagation();
+          stepLeft(true);
+          break;
+        case 'pagedown':
+          e.preventDefault();
+          e.stopPropagation();
+          stepRight(true);
+          break;
+        case 'home':
+          e.preventDefault();
+          e.stopPropagation();
+          stepExactCenter();
+          break;
+      }
+    },
+    [animateHideHint, stepLeft, stepRight, stepExactCenter]
+  );
+  /**
+   * Handler on mouse move
+   * @param {Event} e
+   * @private
+   */
+  const onMouseMove = useCallback(
+    (e) => {
+      e.preventDefault();
+      pointerMoveX(e.pageX);
+    },
+    [pointerMoveX]
+  );
+
+  /**
+   * Handler on mouse button up
+   * @param {Event} e
+   * @private
+   */
+  const onMouseUp = useCallback(
+    (e) => {
+      e.preventDefault();
+      unlisten(unlistenMouseMove);
+      unlisten(unlistenMouseUp);
+    },
+    [unlisten]
+  );
+  /**
+   * Handler on mouse button down
+   * @param {Event} e
+   * @private
+   */
+  const onMouseDown = useCallback(
+    (e) => {
+      e.preventDefault();
+      pointerMoveX(e.pageX);
+
+      if (unlistenMouseMove.current === null) {
+        unlistenMouseMove.current = listen(window, 'mousemove', onMouseMove);
+      }
+      if (unlistenMouseUp.current === null) {
+        unlistenMouseUp.current = listen(window, 'mouseup', onMouseUp);
+      }
+
+      animateHideHint();
+    },
+    [
+      animateHideHint,
+      pointerMoveX,
+      unlistenMouseMove,
+      unlistenMouseUp,
+      onMouseMove,
+      onMouseUp,
+    ]
+  );
+
+  const registerEvents = useCallback(() => {
+    if (isEventRegistered.current) {
+      return;
+    }
+    unlistenMouseDown.current = listen(
+      containerRef.current,
+      'mousedown',
+      onMouseDown
+    );
+    unlistenKeyDown.current = listen(
+      containerRef.current,
+      'keydown',
+      onKeyDown
+    );
+    registerTouchGestures();
+  }, [
+    unlistenKeyDown,
+    isEventRegistered,
+    onMouseDown,
+    onKeyDown,
+    registerTouchGestures,
+  ]);
+
+  const viewportCallback_ = useCallback(
+    (isIntersecting) => {
+      if (isIntersecting && !displayHintOnce) {
+        animateShowHint();
+      }
+    },
+    [animateShowHint, displayHintOnce]
+  );
+
+  useEffect(() => {
+    if (!checkProps(firstImageAs, secondImageAs)) {
+      return null;
+    }
+    doc.current = containerRef?.current?.ownerDocument;
+
+    observeIntersections(containerRef.current, ({isIntersecting}) =>
+      viewportCallback_(isIntersecting)
+    );
+
+    registerEvents();
+    if (initialPosition) {
+      if (isNaN(initialPosition)) {
+        displayWarning('initialPosition must be a finite number');
+        return null;
+      } else {
+        updatePositions(initialPosition);
+      }
+    }
+  }, [
+    registerEvents,
+    initialPosition,
+    updatePositions,
+    firstImageAs,
+    secondImageAs,
+    viewportCallback_,
+  ]);
+
+  /** API Function */
+  useImperativeHandle(
+    ref,
+    () =>
+      /** @type {!BentoImageSliderDef.Api} */ ({
+        seekTo: (percent = 50) => {
+          updatePositions(percent);
+        },
+      }),
+    [updatePositions]
+  );
+
+  if (isNaN(stepSize)) {
+    displayWarning('stepSize must be a finite number');
+    return null;
+  }
+
+  if (!checkProps(firstImageAs, secondImageAs)) {
+    displayWarning('2 images must be provided for comparison');
+    return null;
+  }
+
+  return (
+    <ContainWrapper
+      ref={containerRef}
+      class={styles.imageSliderContainer}
+      layout
+      size
+      paint
+      tabindex="0"
+      autoFocus="true"
+      onMouseDown={onMouseDown}
+      onMouseUp={onMouseUp}
+      {...rest}
+    >
+      {/* Masks */}
+      <div ref={leftMaskRef} class={styles.imageSliderLeftMask}>
+        <div ref={leftLabelWrapperRef} class={styles.imageSliderLabelWrapper}>
+          <DisplayAs
+            as={firstLabelAs}
+            class="image-slider-left-label"
+            ref={leftLabelRef}
+          />
+        </div>
+        <DisplayAs
+          as={firstImageAs}
+          class="image-slider-left-image"
+          ref={leftImageRef}
+        />
+      </div>
+      <div
+        ref={rightMaskRef}
+        class={objstr({
+          [styles.imageSliderRightMask]: true,
+          [styles.imageSliderPushRight]: true,
+        })}
+      >
+        <div
+          ref={rightLabelWrapperRef}
+          class={objstr({
+            [styles.imageSliderLabelWrapper]: true,
+            [styles.imageSliderPushLeft]: true,
+          })}
+        >
+          <DisplayAs
+            ref={rightLabelRef}
+            class="image-slider-right-label"
+            as={secondLabelAs}
+          />
+        </div>
+        <DisplayAs
+          as={secondImageAs}
+          ref={rightImageRef}
+          class="image-slider-right-image"
+          containerClass={objstr({
+            [styles.imageSliderPushLeft]: true,
+          })}
+        />
+      </div>
+
+      {/* Bar */}
+      <div
+        class={objstr({
+          [styles.imageSliderBar]: true,
+          [styles.imageSliderPushRight]: true,
+        })}
+        ref={barRef}
+      >
+        <div
+          class={objstr({
+            [styles.imageSliderBarStick]: true,
+            [styles.imageSliderPushLeft]: true,
+          })}
+        />
+      </div>
+
+      {/* Hint Body */}
+      <div
+        ref={leftHintBodyRef}
+        class={objstr({
+          [styles.imageSliderHint]: true,
+          [styles.imageSliderHintHidden]: hideHint,
+        })}
+      >
+        <div ref={leftHintWrapper} class={styles.imageSliderHintLeftWrapper}>
+          <DisplayAs
+            as={leftHintAs}
+            ref={leftHintArrowRef}
+            class={objstr({
+              [styles.imageSliderHintLeft]: true,
+              ['image-slider-left-hint']: true,
+            })}
+          />
+        </div>
+      </div>
+      <div
+        ref={rightHintBodyRef}
+        class={objstr({
+          [styles.imageSliderHint]: true,
+          [styles.imageSliderHintHidden]: hideHint,
+        })}
+      >
+        <div ref={rightHintWrapper} class={styles.imageSliderHintRightWrapper}>
+          <DisplayAs
+            as={rightHintAs}
+            ref={rightHintArrowRef}
+            class={objstr({
+              [styles.imageSliderHintRight]: true,
+              ['image-slider-right-hint']: true,
+            })}
+          />
+        </div>
+      </div>
+    </ContainWrapper>
+  );
+}
+
+/**
+ * Verify required props and throw error if necessary.
+ * @param {(function(*)|undefined} firstImageAs
+ * @param {(function(*)|undefined} secondImageAs
+ * @return {boolean} true on valid
+ */
+function checkProps(firstImageAs, secondImageAs) {
+  // Perform manual checking as assertion is not available for Bento: Issue #32739
+  if (firstImageAs == undefined || secondImageAs === undefined) {
+    return false;
+  }
+  return true;
+}
+
+/**
+ * Display warning in browser console
+ * @param {?string} message Warning to be displayed
+ */
+function displayWarning(message) {
+  console /*OK*/
+    .warn(message);
+}
+
+const BentoImageSlider = forwardRef(BentoImageSliderWithRef);
+BentoImageSlider.displayName = 'BentoImageSlider'; // Make findable for tests.
+export {BentoImageSlider};
diff --git a/extensions/amp-image-slider/1.0/component.jss.js b/extensions/amp-image-slider/1.0/component.jss.js
new file mode 100644
index 000000000000..7061dacdf694
--- /dev/null
+++ b/extensions/amp-image-slider/1.0/component.jss.js
@@ -0,0 +1,160 @@
+import {createUseStyles} from 'react-jss';
+
+const imageSliderContainer = {
+  position: 'absolute !important',
+  top: '0 !important',
+  right: '0 !important',
+  bottom: '0 !important',
+  left: '0 !important',
+  /* Fix iOS translate + overflow: hidden bug */
+  transform: 'translateZ(0) !important',
+  /* Remove webkit tap highlight grayish color
+   * '-webkit-tap-highlight-color': 'rgba(0,0,0,0)' <-- Not available in JSS
+   */
+};
+
+const imageSliderLeftMask = {
+  position: 'absolute !important',
+  top: '0 !important',
+  right: '0 !important',
+  bottom: '0 !important',
+  left: '0 !important',
+  overflow: 'hidden !important',
+};
+
+const imageSliderRightMask = {
+  position: 'absolute !important',
+  top: '0 !important',
+  right: '0 !important',
+  bottom: '0 !important',
+  left: '0 !important',
+  overflow: 'hidden !important',
+  'z-index': '1 !important',
+};
+
+const imageSlider = {
+  'amp-img > img': {
+    /* Deals with image not fitting size */
+    'object-fit': 'cover',
+  },
+};
+
+const imageSliderPushLeft = {
+  height: '100%',
+  transform: 'translateX(-50%)',
+};
+
+const imageSliderPushRight = {
+  transform: 'translateX(50%)',
+};
+
+const imageSliderBar = {
+  /* make sure arrow directions not change in RTL */
+  direction: 'ltr !important',
+  position: 'absolute !important',
+  top: '0 !important',
+  right: '0 !important',
+  bottom: '0 !important',
+  left: '0 !important',
+  'z-index': '3 !important',
+};
+
+const imageSliderBarStick = {
+  width: '20% !important',
+  height: '100% !important',
+  cursor: 'col-resize !important',
+  '&:before': {
+    content: "'' !important",
+    position: 'absolute !important',
+    display: 'block !important',
+    top: '0 !important',
+    left: '50% !important',
+    bottom: '0 !important',
+    border: '0.5px solid white !important',
+    'box-sizing': 'border-box !important',
+    opacity: '0.5 !important',
+    transform: 'translate(-50%, 0) !important',
+  },
+};
+
+const imageSliderLabelWrapper = {
+  position: 'absolute !important',
+  top: '0 !important',
+  right: '0 !important',
+  bottom: '0 !important',
+  left: '0 !important',
+  'z-index': '1 !important',
+};
+
+const imageSliderHintHidden = {
+  opacity: 0,
+  transition: 'opacity linear 0.4s',
+};
+
+const imageSliderHint = {
+  position: 'absolute !important',
+  top: '0 !important',
+  right: '0 !important',
+  bottom: '0 !important',
+  left: '0 !important',
+  'z-index': 2,
+  transition: 'opacity ease-in 0.4s',
+};
+
+const imageSliderHintLeftWrapper = {
+  position: 'absolute !important',
+  right: '50% !important',
+  height: '100% !important',
+  display: 'flex !important',
+  'flex-direction': 'column !important',
+  'justify-content': 'center !important',
+};
+
+const imageSliderHintRightWrapper = {
+  position: 'absolute !important',
+  left: '50% !important',
+  height: '100% !important',
+  display: 'flex !important',
+  'flex-direction': 'column !important',
+  'justify-content': 'center !important',
+};
+
+const imageSliderHintLeft = {
+  'background-size': '56px 16px',
+  width: '56px',
+  height: '16px',
+  backgroundImage:
+    "url(\"data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 28 8'%3E%3Cg%3E%3Cpath d='M4 5h12V3H4V0L0 4l4 4z' fill='%23fff'/%3E%3C/g%3E%3C/svg%3E\")",
+  filter: 'drop-shadow(3px 3px 4px black)',
+};
+
+const imageSliderHintRight = {
+  'background-size': '56px 16px',
+  width: '56px',
+  height: '16px',
+  backgroundImage:
+    "url(\"data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 28 8'%3E%3Cpath d='M24 5H12V3h12V0l4 4-4 4z' fill='%23fff'/%3E%3C/svg%3E\")",
+  filter: 'drop-shadow(3px 3px 4px black)',
+};
+
+const JSS = {
+  imageSlider,
+  imageSliderContainer,
+  imageSliderLeftMask,
+  imageSliderRightMask,
+  imageSliderPushLeft,
+  imageSliderPushRight,
+  imageSliderBar,
+  imageSliderBarStick,
+  imageSliderLabelWrapper,
+  imageSliderHintHidden,
+  imageSliderHint,
+  imageSliderHintLeftWrapper,
+  imageSliderHintRightWrapper,
+  imageSliderHintLeft,
+  imageSliderHintRight,
+};
+
+// useStyles gets replaced for AMP builds via `babel-plugin-transform-jss`.
+// eslint-disable-next-line local/no-export-side-effect
+export const useStyles = createUseStyles(JSS);
diff --git a/extensions/amp-image-slider/1.0/component.type.js b/extensions/amp-image-slider/1.0/component.type.js
new file mode 100644
index 000000000000..695cad3454f3
--- /dev/null
+++ b/extensions/amp-image-slider/1.0/component.type.js
@@ -0,0 +1,23 @@
+/** @externs */
+
+/** @const */
+var BentoImageSliderDef = {};
+
+/**
+ * @typedef {{
+ *   initialPosition: (string|undefined),
+ *   displayHintOnce: (boolean|undefined),
+ *   stepSize: (number),
+ * }}
+ */
+BentoImageSliderDef.Props;
+
+/** @interface */
+BentoImageSliderDef.Api = class {
+  /**
+   * Seeks Bar to specified percentage in slider.
+   * 0-49 for right side image, 50 for both image (as half) and 51-100 for left side image.
+   * @param {number} percent Percentage to seek
+   */
+  seekTo(percent = 50) {}
+};
diff --git a/extensions/amp-image-slider/1.0/storybook/Basic.amp.js b/extensions/amp-image-slider/1.0/storybook/Basic.amp.js
new file mode 100644
index 000000000000..c0a53db5272e
--- /dev/null
+++ b/extensions/amp-image-slider/1.0/storybook/Basic.amp.js
@@ -0,0 +1,45 @@
+import {withAmp} from '@ampproject/storybook-addon';
+
+import * as Preact from '#preact';
+
+export default {
+  title: 'amp-image-slider-1_0',
+  decorators: [withAmp],
+
+  parameters: {
+    extensions: [{name: 'amp-image-slider', version: '1.0'}],
+    experiments: ['bento'],
+  },
+};
+
+export const ExampleUseCase = ({first, second, ...args}) => {
+  return (
+    <amp-image-slider
+      layout="fixed"
+      width="600"
+      height="300"
+      initial-slider-position="0"
+      {...args}
+    >
+      <amp-img
+        slot="first-image"
+        src={first}
+        alt="A green apple"
+        layout="fill"
+      ></amp-img>
+      <amp-img
+        slot="second-image"
+        src={second}
+        alt="A red apple"
+        layout="fill"
+      ></amp-img>
+      <div slot="first-label">Clear Picture</div>
+      <div slot="second-label">Blur Picture</div>
+    </amp-image-slider>
+  );
+};
+
+ExampleUseCase.args = {
+  first: 'https://amp.dev/static/samples/img/canoe_900x600.jpg',
+  second: 'https://amp.dev/static/samples/img/canoe_900x600_blur.jpg',
+};
diff --git a/extensions/amp-image-slider/1.0/storybook/Basic.js b/extensions/amp-image-slider/1.0/storybook/Basic.js
new file mode 100644
index 000000000000..c3d400de7725
--- /dev/null
+++ b/extensions/amp-image-slider/1.0/storybook/Basic.js
@@ -0,0 +1,47 @@
+import * as Preact from '#preact';
+
+import {BentoImageSlider} from '../component';
+
+export const _default = ({first, second, ...args}) => {
+  return (
+    <BentoImageSlider
+      initialPosition={0.2}
+      firstImageAs={(props) => (
+        <img
+          src={first}
+          alt="A green apple"
+          {...props}
+          style={{width: 600, height: 300}}
+        />
+      )}
+      firstLabelAs={(props) => <div {...props}>Clear picture</div>}
+      secondImageAs={(props) => (
+        <img
+          src={second}
+          alt="A red apple"
+          {...props}
+          style={{width: 600, height: 300}}
+        />
+      )}
+      secondLabelAs={(props) => <div {...props}>Blur picture</div>}
+      leftHintAs={(props) => (
+        <div class="label label-left-center" {...props}></div>
+      )}
+      rightHintAs={(props) => (
+        <div class="label label-right-center" {...props}></div>
+      )}
+      style={{width: 600, height: 300}}
+      {...args}
+    ></BentoImageSlider>
+  );
+};
+
+_default.args = {
+  first: 'https://amp.dev/static/samples/img/canoe_900x600.jpg',
+  second: 'https://amp.dev/static/samples/img/canoe_900x600_blur.jpg',
+};
+
+export default {
+  title: 'ImageSlider',
+  component: BentoImageSlider,
+};
diff --git a/extensions/amp-image-slider/1.0/test/test-amp-image-slider.js b/extensions/amp-image-slider/1.0/test/test-amp-image-slider.js
new file mode 100644
index 000000000000..0dc7eba5925c
--- /dev/null
+++ b/extensions/amp-image-slider/1.0/test/test-amp-image-slider.js
@@ -0,0 +1,225 @@
+import '../amp-image-slider';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
+import {createElementWithAttributes} from '#core/dom';
+
+import {toggleExperiment} from '#experiments';
+
+import {ActionInvocation} from '#service/action-impl';
+
+import {waitFor} from '#testing/helpers/service';
+import {flush} from '#testing/preact';
+
+import {useStyles} from '../component.jss';
+
+describes.realWin(
+  'amp-image-slider-v1.0',
+  {
+    amp: {
+      extensions: ['amp-image-slider:1.0'],
+    },
+  },
+  (env) => {
+    let win;
+    let doc;
+    let element;
+    let leftImage, rightImage;
+    const styles = useStyles();
+
+    const waitForRender = async () => {
+      await element.buildInternal();
+      const loadPromise = element.layoutCallback();
+      const shadow = element.shadowRoot;
+      await waitFor(() => shadow.querySelector('div'), 'component mounted');
+      await loadPromise;
+    };
+
+    function invocation(method, args = {}) {
+      const source = null;
+      const caller = null;
+      const event = null;
+      const trust = ActionTrust_Enum.DEFAULT;
+      return new ActionInvocation(
+        element,
+        method,
+        args,
+        source,
+        caller,
+        event,
+        trust
+      );
+    }
+
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      toggleExperiment(win, 'bento-image-slider', true, true);
+      element = createElementWithAttributes(doc, 'amp-image-slider', {
+        'layout': 'fixed',
+        'width': '300px',
+        'height': '200px',
+        'initial-slider-position': '0.3',
+      });
+      leftImage = createElementWithAttributes(doc, 'amp-img', {
+        'slot': 'first-image',
+        'layout': 'fill',
+        'src': '/examples/img/hero@1x.jpg',
+      });
+      rightImage = createElementWithAttributes(doc, 'amp-img', {
+        'slot': 'second-image',
+        'layout': 'fill',
+        'src': '/examples/img/hero@2x.jpg',
+      });
+      element.appendChild(leftImage);
+      element.appendChild(rightImage);
+      doc.body.appendChild(element);
+    });
+
+    afterEach(async () => {
+      await flush();
+    });
+
+    it('should render amp-img', async () => {
+      await waitForRender();
+
+      const imageSlots = element.shadowRoot.querySelectorAll(
+        'slot[name="first-image"], slot[name="second-image"]'
+      );
+
+      expect(imageSlots).to.have.length(2);
+      expect(imageSlots[0].assignedElements()).to.have.ordered.members([
+        leftImage,
+      ]);
+      expect(imageSlots[1].assignedElements()).to.have.ordered.members([
+        rightImage,
+      ]);
+    });
+
+    it('should throw warning', async () => {
+      element.removeChild(leftImage);
+      element.removeChild(rightImage);
+      const originalWarn = console.warn;
+      const consoleOutput = [];
+      const mockedWarn = (output) => consoleOutput.push(output);
+      console.warn = mockedWarn;
+
+      await element.buildInternal();
+      element.layoutCallback();
+      expect(consoleOutput.length).to.equal(1);
+      expect(consoleOutput[0]).to.equal(
+        '2 images must be provided for comparison'
+      );
+      console.warn = originalWarn;
+    });
+
+    it('should not render labels by default', async () => {
+      await waitForRender();
+
+      const labelSlots = element.shadowRoot.querySelectorAll(
+        'slot[name="first-label"], slot[name="second-label"]'
+      );
+
+      expect(labelSlots).to.have.length(0);
+    });
+
+    it('should render custom labels when given', async () => {
+      const leftLabel = createElementWithAttributes(doc, 'div', {
+        'slot': 'first-label',
+      });
+      leftLabel.append('Left Label');
+      const rightLabel = createElementWithAttributes(doc, 'div', {
+        'slot': 'second-label',
+      });
+      rightLabel.append('Right Label');
+
+      element.appendChild(leftLabel);
+      element.appendChild(rightLabel);
+
+      doc.body.appendChild(element);
+      await waitForRender();
+
+      const labelSlots = element.shadowRoot.querySelectorAll(
+        'slot[name="first-label"], slot[name="second-label"]'
+      );
+
+      expect(labelSlots).to.have.length(2);
+      expect(labelSlots[0].assignedElements()).to.have.ordered.members([
+        leftLabel,
+      ]);
+      expect(labelSlots[1].assignedElements()).to.have.ordered.members([
+        rightLabel,
+      ]);
+    });
+
+    it('should render default hints', async () => {
+      await waitForRender();
+
+      const labelSlots = element.shadowRoot.querySelectorAll(
+        `.${styles.imageSliderHint}`
+      );
+
+      expect(labelSlots).to.have.length(2);
+    });
+
+    it('should render custom hints', async () => {
+      const leftHint = createElementWithAttributes(doc, 'div', {
+        'slot': 'left-hint',
+      });
+      const rightHint = createElementWithAttributes(doc, 'div', {
+        'slot': 'right-hint',
+      });
+      element.appendChild(leftHint);
+      element.appendChild(rightHint);
+      await waitForRender();
+
+      const hintSlots = element.shadowRoot.querySelectorAll(
+        'slot[name="left-hint"], slot[name="right-hint"]'
+      );
+
+      expect(hintSlots).to.have.length(2);
+      expect(hintSlots[0].assignedElements()).to.have.ordered.members([
+        leftHint,
+      ]);
+      expect(hintSlots[1].assignedElements()).to.have.ordered.members([
+        rightHint,
+      ]);
+    });
+
+    it('should execute seekTo action', async () => {
+      await waitForRender();
+      const sliderBar = element.shadowRoot.querySelector(
+        `.${styles.imageSliderBar}`
+      );
+      const rightMask = element.shadowRoot.querySelector(
+        `.${styles.imageSliderRightMask}`
+      );
+      element.enqueAction(invocation('seekTo', {percent: 1}));
+      expect(sliderBar.style.transform).to.equal('translateX(100%)');
+      expect(rightMask.style.transform).to.equal('translateX(100%)');
+
+      element.enqueAction(invocation('seekTo', {percent: 0.1}));
+      expect(sliderBar.style.transform).to.equal('translateX(10%)');
+      expect(rightMask.style.transform).to.equal('translateX(10%)');
+
+      element.enqueAction(invocation('seekTo', {percent: 0.7}));
+      expect(sliderBar.style.transform).to.equal('translateX(70%)');
+      expect(rightMask.style.transform).to.equal('translateX(70%)');
+    });
+
+    it('should execute have initial position', async () => {
+      await waitForRender();
+
+      const sliderBar = element.shadowRoot.querySelector(
+        `.${styles.imageSliderBar}`
+      );
+      const rightMask = element.shadowRoot.querySelector(
+        `.${styles.imageSliderRightMask}`
+      );
+      await waitFor(
+        () => sliderBar.style.transform !== '',
+        'Slider Moved to initial position'
+      );
+      expect(sliderBar.style.transform).to.equal('translateX(30%)');
+      expect(rightMask.style.transform).to.equal('translateX(30%)');
+    });
+  }
+);
diff --git a/extensions/amp-image-slider/1.0/test/test-component.js b/extensions/amp-image-slider/1.0/test/test-component.js
new file mode 100644
index 000000000000..198a971534da
--- /dev/null
+++ b/extensions/amp-image-slider/1.0/test/test-component.js
@@ -0,0 +1,142 @@
+import {mount} from 'enzyme';
+
+import {Keys_Enum} from '#core/constants/key-codes';
+
+import * as Preact from '#preact';
+
+import {BentoImageSlider} from '../component';
+import {useStyles} from '../component.jss';
+
+describes.sandboxed('ImageSlider preact component v1.0', {}, () => {
+  const styles = useStyles();
+  const firstImage = (props) => (
+    <img
+      src="/examples/img/hero@1x.jpg"
+      alt="A green apple"
+      {...props}
+      style={{width: 600, height: 300}}
+    />
+  );
+  const secondImage = (props) => (
+    <img
+      src="/examples/img/hero@2x.jpg"
+      alt="A red apple"
+      {...props}
+      style={{width: 600, height: 300}}
+    />
+  );
+  let wrapper;
+
+  afterEach(() => {
+    wrapper.unmount();
+  });
+
+  it('should render', () => {
+    wrapper = mount(
+      <BentoImageSlider firstImageAs={firstImage} secondImageAs={secondImage} />
+    );
+
+    const component = wrapper.find(BentoImageSlider.name);
+    expect(component).to.have.lengthOf(8);
+    expect(wrapper.find(`.image-slider-left-image`)).not.to.be.null;
+    expect(wrapper.find(`.image-slider-right-image`)).not.to.be.null;
+  });
+
+  it('should render custom labels when given', () => {
+    const firstLabel = (props) => <div {...props}>Left Label</div>;
+    const secondLabel = (props) => <div {...props}>Right Label</div>;
+    wrapper = mount(
+      <BentoImageSlider
+        firstImageAs={firstImage}
+        secondImageAs={secondImage}
+        firstLabelAs={firstLabel}
+        secondLabelAs={secondLabel}
+      />
+    );
+
+    expect(wrapper.find(`.image-slider-left-label`)).not.to.be.null;
+    expect(wrapper.find(`.image-slider-right-label`)).not.to.be.null;
+
+    expect(wrapper.find(`.image-slider-left-label`).text()).to.equal(
+      'Left Label'
+    );
+
+    expect(wrapper.find(`.image-slider-right-label`).text()).to.equal(
+      'Right Label'
+    );
+  });
+
+  it('should render custom hints when given', () => {
+    const firstLabel = (props) => <div {...props}>Slide Left</div>;
+    const secondLabel = (props) => <div {...props}>Slide Right</div>;
+    wrapper = mount(
+      <BentoImageSlider
+        firstImageAs={firstImage}
+        secondImageAs={secondImage}
+        leftHintAs={firstLabel}
+        rightHintAs={secondLabel}
+      />
+    );
+
+    expect(wrapper.find(`.image-slider-left-label`)).not.to.be.null;
+    expect(wrapper.find(`.image-slider-right-label`)).not.to.be.null;
+
+    expect(wrapper.find(`.${styles.imageSliderHintLeft}`).text()).to.equal(
+      'Slide Left'
+    );
+
+    expect(wrapper.find(`.${styles.imageSliderHintRight}`).text()).to.equal(
+      'Slide Right'
+    );
+  });
+
+  it('should have initial position', () => {
+    wrapper = mount(
+      <BentoImageSlider
+        firstImageAs={firstImage}
+        secondImageAs={secondImage}
+        initialPosition="0.6"
+      />
+    );
+
+    expect(
+      wrapper.find(`.${styles.imageSliderBar}`).getDOMNode().style.transform
+    ).to.equal('translateX(60%)');
+  });
+
+  it('should move slider with keyboard', () => {
+    wrapper = mount(
+      <BentoImageSlider
+        firstImageAs={firstImage}
+        secondImageAs={secondImage}
+        initialPosition="0.3"
+      />,
+      {attachTo: document.body}
+    );
+
+    const container = wrapper.find(`.${styles.imageSliderContainer}`);
+    container.getDOMNode().focus();
+    container.simulate('keydown', {key: Keys_Enum.LEFT_ARROW});
+
+    expect(
+      wrapper.find(`.${styles.imageSliderBar}`).getDOMNode().style.transform
+    ).to.equal('translateX(20%)');
+  });
+
+  it('should move slider with mousedown event', () => {
+    wrapper = mount(
+      <BentoImageSlider
+        firstImageAs={firstImage}
+        secondImageAs={secondImage}
+      />,
+      {attachTo: document.body}
+    );
+    const container = wrapper.find(`.${styles.imageSliderContainer}`);
+    container.getDOMNode().focus();
+    container.simulate('mousedown', {pageX: 400});
+
+    expect(
+      wrapper.find(`.${styles.imageSliderBar}`).getDOMNode().style.transform
+    ).to.not.be.equal('');
+  });
+});
diff --git a/extensions/amp-image-slider/amp-image-slider.md b/extensions/amp-image-slider/amp-image-slider.md
deleted file mode 100644
index 9a1f4d2f2800..000000000000
--- a/extensions/amp-image-slider/amp-image-slider.md
+++ /dev/null
@@ -1,180 +0,0 @@
----
-$category@: layout
-formats:
-  - websites
-teaser:
-  text: A slider to compare two images.
----
-
-# amp-image-slider
-
-## Usage
-
-The `amp-image-slider` component requires exactly two `amp-img` elements as its
-children. The first child image displays on the left, the second child image
-displays on the right.
-
-The `amp-image-slider` component can also contain two `<div>` elements to use as
-labels for the images. The labels are overlaid on top of the images. The label
-on the left image requires the `first` attribute, while the right label requires
-the `second` attribute. By default, the labels display at the top left corner of
-the image.
-
-```html
-<amp-image-slider layout="responsive" width="100" height="200">
-  <amp-img src="/green-apple.jpg" alt="A green apple"></amp-img>
-  <amp-img src="/red-apple.jpg" alt="A red apple"></amp-img>
-  <div first>This apple is green</div>
-  <div second>This apple is red</div>
-</amp-image-slider>
-```
-
-Once the slider is loaded, the compared images are separated by a vertical bar,
-with helpful arrow hints displayed at the slider's center.
-
-Users can mouse down or touch to move the slider to the position of the pointer,
-and can then move the pointer to drag the slider bar left or right. For the left
-image, only the part that is left to the bar is displayed; similarly for the
-right image, to only display the right portion.
-
-If you specify `tabindex` on the `amp-image-slider` element, users can navigate
-the slider with their keyboards. Pressing the down, left, or right arrow moves
-the slider bar one step towards the corresponding direction. Pressing the Home
-key brings the slider to the center. Pressing the PageUp or PageDown keys moves
-to the left or right end of the slider body.
-
-### Customize labels
-
-You can customize your labels by providing customized CSS classes. You can use
-`top`, `right`, `bottom`, `left` and `transform: translate(...)` rules to
-control their positioning. Other rules, such as `border`, `background-color`,
-etc., could be used for customizing the style of your labels.
-
-The following example displays an image slider with left label on top left,
-right label on top right:
-
-```html
-<!-- head -->
-<style amp-custom>
-  .top-right {
-    top: 0;
-    right: 0;
-  }
-</style>
-
-<!-- body -->
-<amp-image-slider layout="responsive" width="100" height="200">
-  <amp-img src="/green-apple.jpg" alt="A green apple"></amp-img>
-  <amp-img src="/red-apple.jpg" alt="A red apple"></amp-img>
-  <div first>This apple is green</div>
-  <div second class="top-right">This apple is red</div>
-</amp-image-slider>
-```
-
-### Customize hints
-
-By default, the hints are a pair of white arrows with drop shadow. To customize
-the left and right hints, you can override `.amp-image-slider-hint-left` and
-`.amp-image-slider-hint-right` classes. To replace the arrows with customized
-images, overwrite `background-image`. To remove drop shadow, set
-`filter: none;`.
-
-The following example replace the arrows with triangles:
-
-```css
-.amp-image-slider-hint-left {
-  width: 10px;
-  height: 20px;
-  background-size: 10px 20px;
-  margin-right: 10px;
-  background-image: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' width='10' height='20' viewBox='0 0 10 20'%3e%3cpolygon points='10,0 0,10 10,20' style='fill:white;stroke:black;stroke-width:1' /%3e%3c/svg%3e");
-}
-
-.amp-image-slider-hint-right {
-  width: 10px;
-  height: 20px;
-  background-size: 10px 20px;
-  margin-left: 10px;
-  background-image: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' width='10' height='20' viewBox='0 0 10 20'%3e%3cpolygon points='0,0 10,10 0,20' style='fill:white;stroke:black;stroke-width:1' /%3e%3c/svg%3e");
-}
-```
-
-## Attributes
-
-### `disable-hint-reappear`
-
-The hints that shows at the center of the vertical bar will disappear once the
-user starts interacting with the slider (such as clicking the mouse button,
-touch the slider, and pressing keys to move the slider). The hints would
-reappear if it then leaves the viewport and goes back in again. To stop such
-reappearing behavior, add the `disable-hint-reappear` attribute to the image
-slider.
-
-The following example displays an image slider without reappearing hints:
-
-```html
-<amp-image-slider
-  layout="responsive"
-  width="100"
-  height="200"
-  disable-hint-reappear
->
-  <amp-img src="/green-apple.jpg" alt="A green apple"></amp-img>
-  <amp-img src="/red-apple.jpg" alt="A red apple"></amp-img>
-  <div first>This apple is green</div>
-  <div second>This apple is red</div>
-</amp-image-slider>
-```
-
-### `initial-slider-position`
-
-The vertical slider bar sits at the center of the slider body by default. To
-move the initial slider position to a different place, set
-`initial-slider-position` to a value between `0` and `1`, corresponding to 0% to
-100% from the left slider edge.
-
-The following example displays an image slider with initial slider position on
-the left:
-
-```html
-<amp-image-slider
-  layout="responsive"
-  width="100"
-  height="200"
-  initial-slider-position="0"
->
-  <amp-img src="/green-apple.jpg" alt="A green apple"></amp-img>
-  <amp-img src="/red-apple.jpg" alt="A red apple"></amp-img>
-  <div first>This apple is green</div>
-  <div second>This apple is red</div>
-</amp-image-slider>
-```
-
-### `step-size`
-
-When focusing on the slider, left and right keyboard buttons move the slider bar
-by 10% each press. To use a different step size, set `step-size` to a value
-between `0` and `1`, corresponding to moving 0% to moving 100% each key press.
-
-The following example displays an image slider with step size of 25%:
-
-```html
-<amp-image-slider layout="responsive" width="100" height="200" step-size="0.25">
-  <amp-img src="/green-apple.jpg" alt="A green apple"></amp-img>
-  <amp-img src="/red-apple.jpg" alt="A red apple"></amp-img>
-  <div first>This apple is green</div>
-  <div second>This apple is red</div>
-</amp-image-slider>
-```
-
-## Actions
-
-### `seekTo`
-
-`slider-id.seekTo(percent=[0,1])` move the corresponding slider's bar to the
-given percentage from left.
-
-## Validation
-
-See [`amp-image-slider` rules](validator-amp-image-slider.protoascii)
-in the AMP validator specification.
diff --git a/extensions/amp-image-viewer/0.1/amp-image-viewer.js b/extensions/amp-image-viewer/0.1/amp-image-viewer.js
index ab3271e1fd9b..6172425f98f5 100644
--- a/extensions/amp-image-viewer/0.1/amp-image-viewer.js
+++ b/extensions/amp-image-viewer/0.1/amp-image-viewer.js
@@ -1,6 +1,6 @@
-import {CommonSignals} from '#core/constants/common-signals';
+import {CommonSignals_Enum} from '#core/constants/common-signals';
 import {bezierCurve} from '#core/data-structures/curve';
-import {Layout} from '#core/dom/layout';
+import {Layout_Enum} from '#core/dom/layout';
 import {
   expandLayoutRect,
   layoutRectFromDomRect,
@@ -171,8 +171,8 @@ export class AmpImageViewer extends AMP.BaseElement {
     const laidOutPromise = haveImg
       ? Promise.resolve()
       : img.tagName === 'IMG'
-      ? loadPromise(img)
-      : img.signals().whenSignal(CommonSignals.LOAD_END);
+        ? loadPromise(img)
+        : img.signals().whenSignal(CommonSignals_Enum.LOAD_END);
 
     if (!haveImg) {
       Services.ownersForDoc(this.element).scheduleLayout(this.element, img);
@@ -217,7 +217,7 @@ export class AmpImageViewer extends AMP.BaseElement {
 
   /** @override */
   isLayoutSupported(layout) {
-    return layout == Layout.FILL;
+    return layout == Layout_Enum.FILL;
   }
 
   /**
diff --git a/extensions/amp-inline-gallery/0.1/amp-inline-gallery-captions.js b/extensions/amp-inline-gallery/0.1/amp-inline-gallery-captions.js
index 1df12bde4c3a..c8c24743f3a2 100644
--- a/extensions/amp-inline-gallery/0.1/amp-inline-gallery-captions.js
+++ b/extensions/amp-inline-gallery/0.1/amp-inline-gallery-captions.js
@@ -1,10 +1,13 @@
-import {closestAncestorElementBySelector} from '#core/dom/query';
-import {exponentialFalloff} from './amp-inline-gallery-pagination';
-import {isExperimentOn} from '#experiments';
 import {isLayoutSizeDefined} from '#core/dom/layout';
+import {closestAncestorElementBySelector} from '#core/dom/query';
 import {setImportantStyles} from '#core/dom/style';
+
+import {isExperimentOn} from '#experiments';
+
 import {userAssert} from '#utils/log';
 
+import {exponentialFalloff} from './amp-inline-gallery-pagination';
+
 export class AmpInlineGalleryCaptions extends AMP.BaseElement {
   /** @param {!AmpElement} element */
   constructor(element) {
diff --git a/extensions/amp-inline-gallery/0.1/amp-inline-gallery-pagination.js b/extensions/amp-inline-gallery/0.1/amp-inline-gallery-pagination.js
index c42580a0586d..3d209064a05c 100644
--- a/extensions/amp-inline-gallery/0.1/amp-inline-gallery-pagination.js
+++ b/extensions/amp-inline-gallery/0.1/amp-inline-gallery-pagination.js
@@ -1,13 +1,14 @@
-import {InlineGalleryEvents} from './inline-gallery-events';
-import {Layout} from '#core/dom/layout';
-import {createCustomEvent} from '#utils/event-helper';
-import {devAssert} from '#utils/log';
-import {dict} from '#core/types/object';
-import {htmlFor} from '#core/dom/static-template';
+import {Layout_Enum} from '#core/dom/layout';
 import {scopedQuerySelectorAll} from '#core/dom/query';
+import {htmlFor} from '#core/dom/static-template';
 import {setImportantStyles} from '#core/dom/style';
 import {toArray} from '#core/types/array';
 
+import {createCustomEvent} from '#utils/event-helper';
+import {devAssert} from '#utils/log';
+
+import {InlineGalleryEvents} from './inline-gallery-events';
+
 /**
  * The maximum number of dots to show before converting to a count.
  */
@@ -29,7 +30,7 @@ export function exponentialFalloff(percentage, power) {
 }
 
 export class AmpInlineGalleryPagination extends AMP.BaseElement {
-  /** @override @nocollapse */
+  /** @override  */
   static prerenderAllowed() {
     return true;
   }
@@ -59,7 +60,7 @@ export class AmpInlineGalleryPagination extends AMP.BaseElement {
 
   /** @override */
   isLayoutSupported(layout) {
-    return layout == Layout.FIXED_HEIGHT;
+    return layout == Layout_Enum.FIXED_HEIGHT;
   }
 
   /** @override */
@@ -129,9 +130,9 @@ export class AmpInlineGalleryPagination extends AMP.BaseElement {
       const event = createCustomEvent(
         this.win,
         InlineGalleryEvents.GO_TO_SLIDE,
-        dict({
+        {
           'index': index,
-        }),
+        },
         {
           bubbles: true,
         }
diff --git a/extensions/amp-inline-gallery/0.1/amp-inline-gallery-slide.js b/extensions/amp-inline-gallery/0.1/amp-inline-gallery-slide.js
index 34eb54be44c9..22d9352d1f03 100644
--- a/extensions/amp-inline-gallery/0.1/amp-inline-gallery-slide.js
+++ b/extensions/amp-inline-gallery/0.1/amp-inline-gallery-slide.js
@@ -1,8 +1,10 @@
-import {Layout} from '#core/dom/layout';
-import {Services} from '#service';
+import {Layout_Enum} from '#core/dom/layout';
 import {htmlFor} from '#core/dom/static-template';
+
 import {isExperimentOn} from '#experiments';
-import {toArray} from '#core/types/array';
+
+import {Services} from '#service';
+
 import {userAssert} from '#utils/log';
 
 export class AmpInlineGallerySlide extends AMP.BaseElement {
@@ -67,7 +69,7 @@ export class AmpInlineGallerySlide extends AMP.BaseElement {
 
   /** @override */
   isLayoutSupported() {
-    return Layout.FLEX_ITEM;
+    return Layout_Enum.FLEX_ITEM;
   }
 
   /** @override */
@@ -82,23 +84,17 @@ export class AmpInlineGallerySlide extends AMP.BaseElement {
     const attributionSlot = dom.querySelector(
       '.i-amphtml-inline-gallery-slide-persistent-slot'
     );
-    const childNodesArray = toArray(this.element.childNodes);
 
-    childNodesArray
-      .filter((n) => {
-        return n.hasAttribute && n.getAttribute('slot') === 'caption';
-      })
-      .forEach((node) => captionSlot.appendChild(node));
-    childNodesArray
-      .filter((n) => {
-        return !n.hasAttribute || !n.hasAttribute('slot');
-      })
-      .forEach((node) => contentSlot.appendChild(node));
-    childNodesArray
-      .filter((n) => {
-        return n.hasAttribute && n.getAttribute('slot') === 'attribution';
-      })
-      .forEach((node) => attributionSlot.appendChild(node));
+    this.element.childNodes.forEach((node) => {
+      const slot = node.getAttribute?.('slot');
+      if (slot === 'caption') {
+        captionSlot.appendChild(node);
+      } else if (slot === 'attribution') {
+        attributionSlot.appendChild(node);
+      } else if (slot == null) {
+        contentSlot.appendChild(node);
+      }
+    });
 
     this.element.appendChild(dom);
   }
diff --git a/extensions/amp-inline-gallery/0.1/amp-inline-gallery-thumbnails.js b/extensions/amp-inline-gallery/0.1/amp-inline-gallery-thumbnails.js
index 26c8941f3336..fed316e2d4c2 100644
--- a/extensions/amp-inline-gallery/0.1/amp-inline-gallery-thumbnails.js
+++ b/extensions/amp-inline-gallery/0.1/amp-inline-gallery-thumbnails.js
@@ -1,13 +1,15 @@
-import {CarouselEvents} from '../../amp-base-carousel/0.1/carousel-events';
-import {InlineGalleryEvents} from './inline-gallery-events';
-import {createCustomEvent} from '#utils/event-helper';
-import {dict} from '#core/types/object';
-import {htmlFor} from '#core/dom/static-template';
 import {isLayoutSizeDefined} from '#core/dom/layout';
-import {matches, scopedQuerySelector} from '#core/dom/query';
 import {propagateAttributes} from '#core/dom/propagate-attributes';
+import {matches, scopedQuerySelector} from '#core/dom/query';
+import {htmlFor} from '#core/dom/static-template';
 import {setStyle} from '#core/dom/style';
 
+import {createCustomEvent} from '#utils/event-helper';
+
+import {InlineGalleryEvents} from './inline-gallery-events';
+
+import {CarouselEvents} from '../../amp-base-carousel/0.1/carousel-events';
+
 /**
  * Renders a carousel of thumbnails for an inline gallery.
  *
@@ -23,7 +25,7 @@ import {setStyle} from '#core/dom/style';
  * the next arrow works properly for that case.
  */
 export class AmpInlineGalleryThumbnails extends AMP.BaseElement {
-  /** @override @nocollapse */
+  /** @override  */
   static prerenderAllowed() {
     return true;
   }
@@ -122,9 +124,9 @@ export class AmpInlineGalleryThumbnails extends AMP.BaseElement {
         createCustomEvent(
           this.win,
           InlineGalleryEvents.GO_TO_SLIDE,
-          dict({
+          {
             'index': index,
-          }),
+          },
           {
             bubbles: true,
           }
diff --git a/extensions/amp-inline-gallery/0.1/amp-inline-gallery.js b/extensions/amp-inline-gallery/0.1/amp-inline-gallery.js
index 527438fc65ad..29e2d761d343 100644
--- a/extensions/amp-inline-gallery/0.1/amp-inline-gallery.js
+++ b/extensions/amp-inline-gallery/0.1/amp-inline-gallery.js
@@ -1,19 +1,21 @@
-import {CSS as AmpInlineGalleryCSS} from '../../../build/amp-inline-gallery-0.1.css';
+import {Layout_Enum} from '#core/dom/layout';
+import {scopedQuerySelector, scopedQuerySelectorAll} from '#core/dom/query';
+import {toArray} from '#core/types/array';
+
+import {getDetail} from '#utils/event-helper';
+
 import {AmpInlineGalleryCaptions} from './amp-inline-gallery-captions';
-import {CSS as AmpInlineGalleryCaptionsCSS} from '../../../build/amp-inline-gallery-captions-0.1.css';
 import {AmpInlineGalleryPagination} from './amp-inline-gallery-pagination';
-import {CSS as AmpInlineGalleryPaginationCSS} from '../../../build/amp-inline-gallery-pagination-0.1.css';
 import {AmpInlineGallerySlide} from './amp-inline-gallery-slide';
-import {CSS as AmpInlineGallerySlideCSS} from '../../../build/amp-inline-gallery-slide-0.1.css';
 import {AmpInlineGalleryThumbnails} from './amp-inline-gallery-thumbnails';
+import {InlineGalleryEvents} from './inline-gallery-events';
+
+import {CSS as AmpInlineGalleryCSS} from '../../../build/amp-inline-gallery-0.1.css';
+import {CSS as AmpInlineGalleryCaptionsCSS} from '../../../build/amp-inline-gallery-captions-0.1.css';
+import {CSS as AmpInlineGalleryPaginationCSS} from '../../../build/amp-inline-gallery-pagination-0.1.css';
+import {CSS as AmpInlineGallerySlideCSS} from '../../../build/amp-inline-gallery-slide-0.1.css';
 import {CSS as AmpInlineGalleryThumbnailsCSS} from '../../../build/amp-inline-gallery-thumbnails-0.1.css';
 import {CarouselEvents} from '../../amp-base-carousel/0.1/carousel-events';
-import {InlineGalleryEvents} from './inline-gallery-events';
-import {Layout} from '#core/dom/layout';
-import {getDetail} from '#utils/event-helper';
-import {iterateCursor} from '#core/dom';
-import {scopedQuerySelector, scopedQuerySelectorAll} from '#core/dom/query';
-import {toArray} from '#core/types/array';
 
 /**
  * The selector of children to update the progress on as the gallery's carousel
@@ -34,7 +36,7 @@ const CAROUSEL_SELECTOR =
   '> amp-base-carousel, :not(amp-inline-gallery-thumbnails) > amp-base-carousel';
 
 class AmpInlineGallery extends AMP.BaseElement {
-  /** @override @nocollapse */
+  /** @override  */
   static prerenderAllowed() {
     return true;
   }
@@ -78,7 +80,7 @@ class AmpInlineGallery extends AMP.BaseElement {
 
   /** @override */
   isLayoutSupported(layout) {
-    return layout === Layout.CONTAINER;
+    return layout === Layout_Enum.CONTAINER;
   }
 
   /**
@@ -89,14 +91,14 @@ class AmpInlineGallery extends AMP.BaseElement {
    * @private
    */
   updateProgress_(total, index, offset, slides) {
-    iterateCursor(
-      scopedQuerySelectorAll(this.element, CHILDREN_FOR_PROGRESS_SELECTOR),
-      (el) => {
-        el.getImpl().then((pagination) => {
-          pagination.updateProgress(total, index, offset, slides);
-        });
-      }
-    );
+    scopedQuerySelectorAll(
+      this.element,
+      CHILDREN_FOR_PROGRESS_SELECTOR
+    ).forEach((el) => {
+      el.getImpl().then((pagination) => {
+        pagination.updateProgress(total, index, offset, slides);
+      });
+    });
   }
 
   /**
@@ -134,14 +136,11 @@ class AmpInlineGallery extends AMP.BaseElement {
     const detail = getDetail(event);
     const index = detail['index'];
 
-    iterateCursor(
-      scopedQuerySelectorAll(this.element, CAROUSEL_SELECTOR),
-      (el) => {
-        el.getImpl().then((carousel) => {
-          carousel.goToSlide(index, {smoothScroll: true});
-        });
-      }
-    );
+    scopedQuerySelectorAll(this.element, CAROUSEL_SELECTOR).forEach((el) => {
+      el.getImpl().then((carousel) => {
+        carousel.goToSlide(index, {smoothScroll: true});
+      });
+    });
   }
 }
 
diff --git a/extensions/amp-inline-gallery/1.0/README.md b/extensions/amp-inline-gallery/1.0/README.md
index 496cb9b26282..12f7e7604c07 100644
--- a/extensions/amp-inline-gallery/1.0/README.md
+++ b/extensions/amp-inline-gallery/1.0/README.md
@@ -1,16 +1,12 @@
 # Bento Inline Gallery
 
-Displays slides, with optional pagination dots and thumbnails.
-
-Its implementation uses a [Bento Base Carousel](https://www.npmjs.com/package/@bentoproject/base-carousel). Both components must be properly installed for the environment (Web Component vs Preact).
+Displays slides, with optional pagination dots and thumbnails. Its implementation uses a [Bento Base Carousel](https://www.npmjs.com/package/@bentoproject/base-carousel). Both components must be properly installed for the environment (Web Component vs Preact).
 
 ## Web Component
 
 You must include each Bento component's required CSS library to guarantee proper loading and before adding custom styles. Or use the light-weight pre-upgrade styles available inline. See [Layout and style](#layout-and-style).
 
-The examples below demonstrate use of the `<bento-inline-gallery>` web component.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/inline-gallery
@@ -21,35 +17,88 @@ import {defineElement as defineBentoInlineGallery} from '@bentoproject/inline-ga
 defineBentoInlineGallery();
 ```
 
-### Example: Include via `<script>`
+### Include via `<script>`
 
-The example below contains a `bento-inline-gallery` consisting of three slides with thumbnails and a pagination indicator.
+```html
+<script type="module" src="https://cdn.ampproject.org/bento.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/bento.js" crossorigin="anonymous"></script>
+<script type="module" src="https://cdn.ampproject.org/v0/bento-inline-gallery-1.0.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/v0/bento-inline-gallery-1.0.js" crossorigin="anonymous"></script>
+<link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-inline-gallery-1.0.css" crossorigin="anonymous">
+```
+
+### Example
+
+<!--% example %-->
 
 ```html
-<head>
-  <script src="https://cdn.ampproject.org/bento.js"></script>
-
-  <script async src="https://cdn.ampproject.org/v0/bento-inline-gallery-1.0.js"></script>
-  <link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-inline-gallery-1.0.css">
-
-  <script async src="https://cdn.ampproject.org/v0/bento-base-carousel-1.0.js"></script>
-  <link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-base-carousel-1.0.css">
-<body>
-  <bento-inline-gallery id="inline-gallery">
-    <bento-inline-gallery-thumbnails style="height: 100px;" loop></bento-inline-gallery-thumbnails>
-
-    <bento-base-carousel style="height: 200px;" snap-align="center" visible-count="3" loop>
-      <img src="img1.jpeg" data-thumbnail-src="img1-thumbnail.jpeg" />
-      <img src="img2.jpeg" data-thumbnail-src="img2-thumbnail.jpeg" />
-      <img src="img3.jpeg" data-thumbnail-src="img3-thumbnail.jpeg" />
-      <img src="img4.jpeg" data-thumbnail-src="img4-thumbnail.jpeg" />
-      <img src="img5.jpeg" data-thumbnail-src="img5-thumbnail.jpeg" />
-      <img src="img6.jpeg" data-thumbnail-src="img6-thumbnail.jpeg" />
-    </bento-base-carousel>
-
-    <bento-inline-gallery-pagination style="height: 20px;"></bento-inline-gallery-pagination>
-  </bento-inline-gallery>
-</body>
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-inline-gallery-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-inline-gallery-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      href="https://cdn.ampproject.org/v0/bento-inline-gallery-1.0.css"
+    />
+
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-base-carousel-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-base-carousel-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      href="https://cdn.ampproject.org/v0/bento-base-carousel-1.0.css"
+    />
+  </head>
+  <body>
+    <bento-inline-gallery id="inline-gallery">
+      <bento-inline-gallery-thumbnails
+        style="height: 100px"
+        loop
+      ></bento-inline-gallery-thumbnails>
+
+      <bento-base-carousel
+        style="height: 200px"
+        snap-align="center"
+        visible-count="3"
+        loop
+      >
+        <img src="img1.jpeg" data-thumbnail-src="img1-thumbnail.jpeg" />
+        <img src="img2.jpeg" data-thumbnail-src="img2-thumbnail.jpeg" />
+        <img src="img3.jpeg" data-thumbnail-src="img3-thumbnail.jpeg" />
+        <img src="img4.jpeg" data-thumbnail-src="img4-thumbnail.jpeg" />
+        <img src="img5.jpeg" data-thumbnail-src="img5-thumbnail.jpeg" />
+        <img src="img6.jpeg" data-thumbnail-src="img6-thumbnail.jpeg" />
+      </bento-base-carousel>
+
+      <bento-inline-gallery-pagination
+        style="height: 20px"
+      ></bento-inline-gallery-pagination>
+    </bento-inline-gallery>
+  </body>
+</html>
 ```
 
 ### Layout and style
@@ -88,23 +137,17 @@ Alternatively, you may also make the light-weight pre-upgrade styles available i
 
 #### `inset`
 
-Default: `false`
-
-Boolean attribute indicating whether to display the pagination indicator as inset (overlaying the carousel itself)
+Boolean attribute indicating whether to display the pagination indicator as inset (overlaying the carousel itself). Default is `false`.
 
 ### Attributes on `<bento-inline-gallery-thumbnails>`
 
 #### `aspect-ratio`
 
-Optional
-
-Number: ratio of width to height that slides should be displayed in.
+A Number defining the ratio of width to height that slides should be displayed in. This value is optional.
 
 #### `loop`
 
-Default: `false`
-
-Boolean attribute indicating whether thumbnails should loop.
+Boolean attribute indicating whether thumbnails should loop. The default is `false`.
 
 ### Styling
 
@@ -114,9 +157,7 @@ You may use the `bento-inline-gallery`, `bento-inline-gallery-pagination`, `bent
 
 ## Preact/React Component
 
-The examples below demonstrates use of the `<BentoInlineGallery>` as a functional component usable with the Preact or React libraries.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/inline-gallery
@@ -164,19 +205,13 @@ Or via `className`:
 }
 ```
 
-<!-- TODO(wg-bento): This section was empty, fix it.
-### Props for `BentoInlineGallery`
--->
-
 ### Props for `BentoInlineGalleryPagination`
 
 In addition to the [common props](../../../docs/spec/bento-common-props.md), BentoInlineGalleryPagination supports the props below:
 
 #### `inset`
 
-Default: `false`
-
-Boolean attribute indicating whether to display the pagination indicator as inset (overlaying the carousel itself)
+Boolean attribute indicating whether to display the pagination indicator as inset (overlaying the carousel itself). Default is `false`.
 
 ### Props for `BentoInlineGalleryThumbnails`
 
@@ -184,12 +219,8 @@ In addition to the [common props](../../../docs/spec/bento-common-props.md), Ben
 
 #### `aspectRatio`
 
-Optional
-
-Number: ratio of width to height that slides should be displayed in.
+A Number defining the ratio of width to height that slides should be displayed in (this is optional).
 
 #### `loop`
 
-Default: `false`
-
-Boolean attribute indicating whether thumbnails should loop.
+Boolean attribute indicating whether thumbnails should loop. Default is `false`.
diff --git a/extensions/amp-inline-gallery/1.0/amp-inline-gallery-pagination.js b/extensions/amp-inline-gallery/1.0/amp-inline-gallery-pagination.js
index fb7e3d6e66fb..f23d5dfeb802 100644
--- a/extensions/amp-inline-gallery/1.0/amp-inline-gallery-pagination.js
+++ b/extensions/amp-inline-gallery/1.0/amp-inline-gallery-pagination.js
@@ -1,11 +1,18 @@
+import {PaginationBaseElement} from '#bento/components/bento-inline-gallery/1.0/pagination-base-element';
+
 import {isExperimentOn} from '#experiments';
+
+import {AmpPreactBaseElement, setSuperClass} from '#preact/amp-base-element';
+
 import {userAssert} from '#utils/log';
-import {PaginationBaseElement} from './pagination-base-element';
 
 /** @const {string} */
 export const TAG = 'amp-inline-gallery-pagination';
 
-export class AmpInlineGalleryPagination extends PaginationBaseElement {
+export class AmpInlineGalleryPagination extends setSuperClass(
+  PaginationBaseElement,
+  AmpPreactBaseElement
+) {
   /** @override */
   isLayoutSupported(layout) {
     userAssert(
diff --git a/extensions/amp-inline-gallery/1.0/amp-inline-gallery-thumbnails.js b/extensions/amp-inline-gallery/1.0/amp-inline-gallery-thumbnails.js
index 48c13f0bc1f4..80c0ce836e91 100644
--- a/extensions/amp-inline-gallery/1.0/amp-inline-gallery-thumbnails.js
+++ b/extensions/amp-inline-gallery/1.0/amp-inline-gallery-thumbnails.js
@@ -1,11 +1,18 @@
+import {ThumbnailsBaseElement} from '#bento/components/bento-inline-gallery/1.0/thumbnails-base-element';
+
 import {isExperimentOn} from '#experiments';
+
+import {AmpPreactBaseElement, setSuperClass} from '#preact/amp-base-element';
+
 import {userAssert} from '#utils/log';
-import {ThumbnailsBaseElement} from './thumbnails-base-element';
 
 /** @const {string} */
 export const TAG = 'amp-inline-gallery-thumbnails';
 
-export class AmpInlineGalleryThumbnails extends ThumbnailsBaseElement {
+export class AmpInlineGalleryThumbnails extends setSuperClass(
+  ThumbnailsBaseElement,
+  AmpPreactBaseElement
+) {
   /** @override */
   isLayoutSupported(layout) {
     userAssert(
diff --git a/extensions/amp-inline-gallery/1.0/amp-inline-gallery.css b/extensions/amp-inline-gallery/1.0/amp-inline-gallery.css
index 10310a6b44e8..add950ad04bb 100644
--- a/extensions/amp-inline-gallery/1.0/amp-inline-gallery.css
+++ b/extensions/amp-inline-gallery/1.0/amp-inline-gallery.css
@@ -1,3 +1,5 @@
+@import url(./amp-inline-gallery-pagination.css);
+
 /* Pre-upgrade: display:block element */
 amp-inline-gallery,
 amp-inline-gallery-pagination,
diff --git a/extensions/amp-inline-gallery/1.0/amp-inline-gallery.js b/extensions/amp-inline-gallery/1.0/amp-inline-gallery.js
index 6fb7dfc96846..cb9d2777c6aa 100644
--- a/extensions/amp-inline-gallery/1.0/amp-inline-gallery.js
+++ b/extensions/amp-inline-gallery/1.0/amp-inline-gallery.js
@@ -1,3 +1,13 @@
+import {BaseElement} from '#bento/components/bento-inline-gallery/1.0/base-element';
+
+import {Layout_Enum} from '#core/dom/layout';
+
+import {isExperimentOn} from '#experiments';
+
+import {AmpPreactBaseElement, setSuperClass} from '#preact/amp-base-element';
+
+import {userAssert} from '#utils/log';
+
 import {
   AmpInlineGalleryPagination,
   TAG as PAGINATION_TAG,
@@ -6,16 +16,16 @@ import {
   AmpInlineGalleryThumbnails,
   TAG as THUMBNAILS_TAG,
 } from './amp-inline-gallery-thumbnails';
-import {BaseElement} from './base-element';
-import {Layout} from '#core/dom/layout';
+
 import {CSS as PAGINATION_CSS} from '../../../build/amp-inline-gallery-pagination-1.0.css';
-import {isExperimentOn} from '#experiments';
-import {userAssert} from '#utils/log';
 
 /** @const {string} */
 const TAG = 'amp-inline-gallery';
 
-class AmpInlineGallery extends BaseElement {
+class AmpInlineGallery extends setSuperClass(
+  BaseElement,
+  AmpPreactBaseElement
+) {
   /** @override */
   isLayoutSupported(layout) {
     userAssert(
@@ -23,7 +33,7 @@ class AmpInlineGallery extends BaseElement {
         isExperimentOn(this.win, 'bento-inline-gallery'),
       'expected global "bento" or specific "bento-inline-gallery" experiment to be enabled'
     );
-    return layout == Layout.CONTAINER;
+    return layout == Layout_Enum.CONTAINER;
   }
 }
 
diff --git a/extensions/amp-inline-gallery/1.0/base-element.js b/extensions/amp-inline-gallery/1.0/base-element.js
deleted file mode 100644
index 71973423216a..000000000000
--- a/extensions/amp-inline-gallery/1.0/base-element.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import * as Preact from '#preact';
-import {CarouselContextProp} from '../../amp-base-carousel/1.0/carousel-props';
-import {BentoInlineGallery} from './component';
-import {PreactBaseElement} from '#preact/base-element';
-import {dict} from '#core/types/object';
-import {setProp} from '#core/context';
-import {useContext, useLayoutEffect} from '#preact';
-
-export const TAG = 'bento-inline-gallery';
-
-export class BaseElement extends PreactBaseElement {
-  /** @override */
-  init() {
-    return dict({
-      'children': <ContextExporter shimDomElement={this.element} />,
-    });
-  }
-}
-
-/** @override */
-BaseElement['Component'] = BentoInlineGallery;
-
-/** @override */
-BaseElement['detached'] = true;
-
-/** @override */
-BaseElement['props'] = {
-  'loop': {attr: 'loop', type: 'boolean'},
-};
-
-/**
- * @param {!SelectorDef.OptionProps} props
- * @return {PreactDef.Renderable}
- */
-function ContextExporter({shimDomElement}) {
-  // Consume the `CarouselContext` produced by the `InlineGallery` component
-  // and propagate it as a context prop.
-  const context = useContext(CarouselContextProp.type);
-  useLayoutEffect(() => {
-    setProp(shimDomElement, CarouselContextProp, ContextExporter, context);
-  }, [shimDomElement, context]);
-  return <></>;
-}
diff --git a/extensions/amp-inline-gallery/1.0/component.js b/extensions/amp-inline-gallery/1.0/component.js
deleted file mode 100644
index fcb5f9a7a6f8..000000000000
--- a/extensions/amp-inline-gallery/1.0/component.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import * as Preact from '#preact';
-import {CarouselContext} from '../../amp-base-carousel/1.0/carousel-context';
-import {ContainWrapper} from '#preact/component';
-import {useMemo, useState} from '#preact';
-
-/**
- * @param {!BentoInlineGalleryDef.Props} props
- * @return {PreactDef.Renderable}
- */
-export function BentoInlineGallery({children, ...rest}) {
-  const [currentSlide, setCurrentSlide] = useState(0);
-  const [slides, setSlides] = useState([]);
-  const carouselContext = useMemo(
-    () => ({
-      currentSlide,
-      setCurrentSlide,
-      slides,
-      setSlides,
-    }),
-    [currentSlide, slides]
-  );
-  return (
-    <ContainWrapper size={false} layout={true} {...rest}>
-      <CarouselContext.Provider value={carouselContext}>
-        {children}
-      </CarouselContext.Provider>
-    </ContainWrapper>
-  );
-}
diff --git a/extensions/amp-inline-gallery/1.0/example/index.html b/extensions/amp-inline-gallery/1.0/example/index.html
new file mode 100644
index 000000000000..c68968fc910e
--- /dev/null
+++ b/extensions/amp-inline-gallery/1.0/example/index.html
@@ -0,0 +1,85 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-inline-gallery-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-inline-gallery-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      href="https://cdn.ampproject.org/v0/bento-inline-gallery-1.0.css"
+    />
+
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-base-carousel-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-base-carousel-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      href="https://cdn.ampproject.org/v0/bento-base-carousel-1.0.css"
+    />
+  </head>
+  <body>
+    <bento-inline-gallery id="inline-gallery">
+      <bento-inline-gallery-thumbnails
+        style="height: 100px"
+        loop
+      ></bento-inline-gallery-thumbnails>
+
+      <bento-base-carousel
+        style="height: 200px"
+        snap-align="center"
+        visible-count="3"
+        loop
+      >
+        <img
+          src="https://picsum.photos/id/237/640/480"
+          data-thumbnail-src="https://picsum.photos/id/237/64/48"
+        />
+        <img
+          src="https://picsum.photos/id/238/640/480"
+          data-thumbnail-src="https://picsum.photos/id/238/64/48"
+        />
+        <img
+          src="https://picsum.photos/id/239/640/480"
+          data-thumbnail-src="https://picsum.photos/id/239/64/48"
+        />
+        <img
+          src="https://picsum.photos/id/240/640/480"
+          data-thumbnail-src="https://picsum.photos/id/240/64/48"
+        />
+        <img
+          src="https://picsum.photos/id/241/640/480"
+          data-thumbnail-src="https://picsum.photos/id/241/64/48"
+        />
+        <img
+          src="https://picsum.photos/id/242/640/480"
+          data-thumbnail-src="https://picsum.photos/id/242/64/48"
+        />
+      </bento-base-carousel>
+
+      <bento-inline-gallery-pagination
+        style="height: 20px"
+      ></bento-inline-gallery-pagination>
+    </bento-inline-gallery>
+  </body>
+</html>
diff --git a/extensions/amp-inline-gallery/1.0/storybook/Basic.amp.js b/extensions/amp-inline-gallery/1.0/storybook/Basic.amp.js
index ee18e5ec1351..8c0081da1e29 100644
--- a/extensions/amp-inline-gallery/1.0/storybook/Basic.amp.js
+++ b/extensions/amp-inline-gallery/1.0/storybook/Basic.amp.js
@@ -1,6 +1,7 @@
-import * as Preact from '#preact';
 import {withAmp} from '@ampproject/storybook-addon';
 
+import * as Preact from '#preact';
+
 export default {
   title: 'amp-inline-gallery-1_0',
   decorators: [withAmp],
diff --git a/extensions/amp-inline-gallery/1.0/storybook/Basic.js b/extensions/amp-inline-gallery/1.0/storybook/Basic.js
index 4cfe5c566e31..b9100bc9fe57 100644
--- a/extensions/amp-inline-gallery/1.0/storybook/Basic.js
+++ b/extensions/amp-inline-gallery/1.0/storybook/Basic.js
@@ -1,38 +1,98 @@
+import {BentoBaseCarousel} from '#bento/components/bento-base-carousel/1.0/component';
+import {
+  BentoInlineGallery,
+  BentoInlineGalleryPagination,
+  BentoInlineGalleryThumbnails,
+} from '#bento/components/bento-inline-gallery/1.0/component';
+
 import * as Preact from '#preact';
-import {BentoBaseCarousel} from '../../../amp-base-carousel/1.0/component';
-import {BentoInlineGallery} from '../component';
-import {BentoInlineGalleryPagination} from '../pagination';
-import {BentoInlineGalleryThumbnails} from '../thumbnails';
-import {boolean, number, select, withKnobs} from '@storybook/addon-knobs';
 
 export default {
   title: 'InlineGallery',
   component: BentoInlineGallery,
-  decorators: [withKnobs],
+  argTypes: {
+    aspectRatio: {
+      name: 'thumbnail aspect ratio (w/h)',
+      defaultValue: 3 / 2,
+      control: {type: 'number'},
+    },
+    topInset: {
+      name: 'top indicator inset?',
+      defaultValue: false,
+      control: {type: 'boolean'},
+    },
+    bottomInset: {
+      name: 'bottom indicator inset?',
+      defaultValue: false,
+      control: {type: 'boolean'},
+    },
+    autoAdvance: {
+      name: 'auto advance',
+      defaultValue: false,
+      control: {type: 'boolean'},
+    },
+    loop: {
+      name: 'thumbnail loop',
+      defaultValue: false,
+      control: {type: 'boolean'},
+    },
+    paginationHeight: {
+      name: 'top indicator height',
+      control: {type: 'number'},
+      defaultValue: 20,
+    },
+    autoAdvanceCount: {
+      name: 'auto advance count',
+      control: {type: 'number'},
+      defaultValue: 1,
+    },
+    autoAdvanceInterval: {
+      name: 'auto advance interval',
+      control: {type: 'number'},
+      defaultValue: 1000,
+    },
+    autoAdvanceLoops: {
+      name: 'auto advance loops',
+      control: {type: 'number'},
+      defaultValue: 3,
+    },
+    thumbnailHeight: {
+      name: 'thumbnail height',
+      control: {type: 'number'},
+      defaultValue: 50,
+    },
+    width: {type: 'number'},
+    height: {type: 'number'},
+    orientation: {
+      name: 'orientation',
+      control: {type: 'select'},
+      options: ['horizontal', 'vertical'],
+      defaultValue: 'vertical',
+    },
+  },
 };
 
-export const _default = () => {
-  const width = 360;
-  const height = 240;
-  const paginationHeight = number('top indicator height', 20);
-  const topInset = boolean('top indicator inset?', false);
-  const bottomInset = boolean('bottom indicator inset?', false);
-  const autoAdvance = boolean('auto advance', false);
-  const autoAdvanceCount = number('auto advance count', 1);
-  const autoAdvanceInterval = number('auto advance interval', 1000);
-  const autoAdvanceLoops = number('auto advance loops', 3);
-  const thumbnailHeight = number('thumbnail height', 50);
-  const loop = boolean('thumbnail loop', false);
-  const aspectRatio = number('thumbnail aspect ratio (w/h)', 3 / 2);
-  const orientation = select(
-    'orientation',
-    ['horizontal', 'vertical'],
-    'vertical'
-  );
-
+export const Default = ({
+  aspectRatio,
+  autoAdvance,
+  autoAdvanceCount,
+  autoAdvanceInterval,
+  autoAdvanceLoops,
+  bottomInset,
+  height,
+  loop,
+  orientation,
+  paginationHeight,
+  thumbnailHeight,
+  topInset,
+  width,
+  ...args
+}) => {
+  width = width ?? 360;
+  height = height ?? 240;
   return (
     <>
-      <BentoInlineGallery style={{width}}>
+      <BentoInlineGallery style={{width}} {...args}>
         <BentoInlineGalleryPagination
           style={{height: paginationHeight}}
           inset={topInset}
@@ -85,14 +145,19 @@ export const _default = () => {
   );
 };
 
-export const WithLooping = () => {
-  const width = number('width', 440);
-  const height = number('height', 225);
-  const paginationHeight = number('indicator height', 20);
-  const inset = boolean('inset?', false);
-  const thumbnailHeight = number('thumbnail height', 50);
-  const loop = boolean('thumbnail loop', true);
-  const aspectRatio = number('thumbnail aspect ratio', 2);
+export const WithLooping = ({
+  aspectRatio,
+  height,
+  inset,
+  loop,
+  paginationHeight,
+  thumbnailHeight,
+  width,
+  ...args
+}) => {
+  width = width ?? 440;
+  height = height ?? 225;
+
   const slides = [
     'lightpink',
     'lightcoral',
@@ -116,7 +181,7 @@ export const WithLooping = () => {
   ));
 
   return (
-    <BentoInlineGallery style={{width, position: 'relative'}}>
+    <BentoInlineGallery style={{width, position: 'relative'}} {...args}>
       <BentoBaseCarousel loop style={{height, position: 'relative'}}>
         {slides}
       </BentoBaseCarousel>
diff --git a/extensions/amp-inline-gallery/1.0/test/test-amp-inline-gallery.js b/extensions/amp-inline-gallery/1.0/test/test-amp-inline-gallery.js
index bbfe3a7871ed..32588a3a23d3 100644
--- a/extensions/amp-inline-gallery/1.0/test/test-amp-inline-gallery.js
+++ b/extensions/amp-inline-gallery/1.0/test/test-amp-inline-gallery.js
@@ -1,12 +1,16 @@
 import '../../../amp-base-carousel/1.0/amp-base-carousel';
 import '../amp-inline-gallery';
-import {ActionInvocation} from '#service/action-impl';
-import {ActionTrust} from '#core/constants/action-constants';
-import {CarouselContextProp} from '../../../amp-base-carousel/1.0/carousel-props';
+import {CarouselContextProp} from '#bento/components/bento-base-carousel/1.0/carousel-props';
+
+import {ActionTrust_Enum} from '#core/constants/action-constants';
+import {subscribe} from '#core/context';
 import {createElementWithAttributes} from '#core/dom';
 import {setStyles} from '#core/dom/style';
-import {subscribe} from '#core/context';
+
 import {toggleExperiment} from '#experiments';
+
+import {ActionInvocation} from '#service/action-impl';
+
 import {waitFor} from '#testing/helpers/service';
 
 describes.realWin(
@@ -111,7 +115,7 @@ describes.realWin(
       const source = null;
       const caller = null;
       const event = null;
-      const trust = ActionTrust.DEFAULT;
+      const trust = ActionTrust_Enum.DEFAULT;
       return new ActionInvocation(
         element,
         method,
diff --git a/extensions/amp-inline-gallery/1.0/test/test-component.js b/extensions/amp-inline-gallery/1.0/test/test-component.js
deleted file mode 100644
index cecdd3a8e900..000000000000
--- a/extensions/amp-inline-gallery/1.0/test/test-component.js
+++ /dev/null
@@ -1,136 +0,0 @@
-import * as Preact from '#preact';
-import {BentoBaseCarousel} from '../../../amp-base-carousel/1.0/component';
-import {mount} from 'enzyme';
-import {BentoInlineGallery} from '../component';
-import {BentoInlineGalleryPagination} from '../pagination';
-import {BentoInlineGalleryThumbnails} from '../thumbnails';
-
-describes.sandboxed('InlineGallery preact component', {}, () => {
-  describe('BentoInlineGalleryPagination component', () => {
-    it('should render BentoBaseCarousels and BentoInlineGalleryPagination', () => {
-      const jsx = (
-        <BentoInlineGallery>
-          <BentoBaseCarousel>
-            <div>slide 1</div>
-            <div>slide 2</div>
-            <div>slide 3</div>
-          </BentoBaseCarousel>
-          <BentoInlineGalleryPagination />
-        </BentoInlineGallery>
-      );
-      const wrapper = mount(jsx);
-      const carousel = wrapper.find('BentoBaseCarousel');
-      expect(carousel).to.have.lengthOf(1);
-      const slides = carousel.find('[data-slide]');
-      expect(slides).to.have.lengthOf(3);
-
-      const pagination = wrapper.find('BentoInlineGalleryPagination');
-      expect(pagination).to.have.lengthOf(1);
-    });
-  });
-
-  describe('Thumbnail component', () => {
-    it('should render BentoBaseCarousel and BentoInlineGalleryThumbnails', () => {
-      const jsx = (
-        <BentoInlineGallery>
-          <BentoBaseCarousel>
-            <div>slide 1</div>
-            <div>slide 2</div>
-            <div>slide 3</div>
-          </BentoBaseCarousel>
-          <BentoInlineGalleryThumbnails />
-        </BentoInlineGallery>
-      );
-      const wrapper = mount(jsx);
-
-      const carousels = wrapper.find('BentoBaseCarousel');
-      expect(carousels).to.have.lengthOf(2);
-      const slides = carousels.first().find('[data-slide]');
-      expect(slides).to.have.lengthOf(3);
-
-      const thumbnails = wrapper.find('BentoInlineGalleryThumbnails');
-      expect(thumbnails).to.have.lengthOf(1);
-      const generatedCarousel = thumbnails.find('BentoBaseCarousel');
-      expect(generatedCarousel).to.have.lengthOf(1);
-      expect(generatedCarousel.prop('loop')).to.be.false;
-      expect(generatedCarousel.prop('snapAlign')).to.equal('start');
-      expect(generatedCarousel.prop('outsetArrows')).to.be.true;
-
-      const generatedSlides = generatedCarousel.find('[data-slide]');
-      expect(generatedSlides).to.have.lengthOf(3);
-
-      // By default there is no `src`
-      expect(generatedSlides.at(0).find('img').prop('src')).to.be.undefined;
-      expect(generatedSlides.at(1).find('img').prop('src')).to.be.undefined;
-      expect(generatedSlides.at(2).find('img').prop('src')).to.be.undefined;
-    });
-
-    it('should respect thumbnailSrc', () => {
-      const jsx = (
-        <BentoInlineGallery>
-          <BentoBaseCarousel>
-            <div thumbnailSrc="slide1.jpg">slide 1</div>
-            <div thumbnailSrc="slide2.jpg">slide 2</div>
-            <div thumbnailSrc="slide3.jpg">slide 3</div>
-          </BentoBaseCarousel>
-          <BentoInlineGalleryThumbnails />
-        </BentoInlineGallery>
-      );
-      const wrapper = mount(jsx);
-
-      const carousels = wrapper.find('BentoBaseCarousel');
-      expect(carousels).to.have.lengthOf(2);
-      const slides = carousels.first().find('[data-slide]');
-      expect(slides).to.have.lengthOf(3);
-
-      const thumbnails = wrapper.find('BentoInlineGalleryThumbnails');
-      expect(thumbnails).to.have.lengthOf(1);
-      const generatedCarousel = thumbnails.find('BentoBaseCarousel');
-      expect(generatedCarousel).to.have.lengthOf(1);
-      expect(generatedCarousel.prop('loop')).to.be.false;
-      expect(generatedCarousel.prop('snapAlign')).to.equal('start');
-      expect(generatedCarousel.prop('outsetArrows')).to.be.true;
-
-      const generatedSlides = generatedCarousel.find('[data-slide]');
-      expect(generatedSlides).to.have.lengthOf(3);
-
-      // Take from `thumbnailSrc` prop.
-      expect(generatedSlides.at(0).find('img').prop('src')).to.equal(
-        'slide1.jpg'
-      );
-      expect(generatedSlides.at(1).find('img').prop('src')).to.equal(
-        'slide2.jpg'
-      );
-      expect(generatedSlides.at(2).find('img').prop('src')).to.equal(
-        'slide3.jpg'
-      );
-    });
-
-    it('should respect looping with slide alignment', () => {
-      const jsx = (
-        <BentoInlineGallery>
-          <BentoBaseCarousel>
-            <div>slide 1</div>
-            <div>slide 2</div>
-            <div>slide 3</div>
-          </BentoBaseCarousel>
-          <BentoInlineGalleryThumbnails loop />
-        </BentoInlineGallery>
-      );
-      const wrapper = mount(jsx);
-
-      const carousels = wrapper.find('BentoBaseCarousel');
-      expect(carousels).to.have.lengthOf(2);
-      const slides = carousels.first().find('[data-slide]');
-      expect(slides).to.have.lengthOf(3);
-
-      const thumbnails = wrapper.find('BentoInlineGalleryThumbnails');
-      expect(thumbnails).to.have.lengthOf(1);
-      const generatedCarousel = thumbnails.find('BentoBaseCarousel');
-      expect(generatedCarousel).to.have.lengthOf(1);
-      expect(generatedCarousel.prop('loop')).to.be.true;
-      expect(generatedCarousel.prop('snapAlign')).to.equal('center');
-      expect(generatedCarousel.prop('outsetArrows')).to.be.true;
-    });
-  });
-});
diff --git a/extensions/amp-inline-gallery/1.0/web-component.js b/extensions/amp-inline-gallery/1.0/web-component.js
deleted file mode 100644
index ce8d974bb13e..000000000000
--- a/extensions/amp-inline-gallery/1.0/web-component.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import {BaseElement, TAG} from './base-element';
-import {
-  TAG as THUMBNAIL_TAG,
-  ThumbnailsBaseElement,
-} from './thumbnails-base-element';
-import {
-  TAG as PAGINATION_TAG,
-  PaginationBaseElement,
-} from './pagination-base-element';
-
-/**
- * Registers `<bento-inline-gallery> component to CustomElements registry
- */
-export function defineElement() {
-  customElements.define(TAG, BaseElement.CustomElement(BaseElement));
-  defineThumbnailsElement();
-  definePaginationElement();
-}
-
-/**
- * Registers `<bento-inline-gallery-pagination> component to CustomElements registry
- */
-export function definePaginationElement() {
-  customElements.define(
-    PAGINATION_TAG,
-    PaginationBaseElement.CustomElement(PaginationBaseElement)
-  );
-}
-
-/**
- * Registers `<bento-inline-gallery-thumbnails> component to CustomElements registry
- */
-export function defineThumbnailsElement() {
-  customElements.define(
-    THUMBNAIL_TAG,
-    ThumbnailsBaseElement.CustomElement(ThumbnailsBaseElement)
-  );
-}
diff --git a/extensions/amp-inputmask/0.1/amp-inputmask.js b/extensions/amp-inputmask/0.1/amp-inputmask.js
index 197650fddd41..ce606dcd8377 100644
--- a/extensions/amp-inputmask/0.1/amp-inputmask.js
+++ b/extensions/amp-inputmask/0.1/amp-inputmask.js
@@ -1,5 +1,4 @@
-import {AmpEvents} from '#core/constants/amp-events';
-import {iterateCursor} from '#core/dom';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
 
 import {listen} from '#utils/event-helper';
 
@@ -21,7 +20,7 @@ export class AmpInputmaskService {
     /** @const */
     this.domUpdateUnlistener_ = listen(
       this.ampdoc.getRootNode(),
-      AmpEvents.DOM_UPDATE,
+      AmpEvents_Enum.DOM_UPDATE,
       () => this.install()
     );
   }
@@ -33,7 +32,7 @@ export class AmpInputmaskService {
     const maskElements = this.ampdoc
       .getRootNode()
       .querySelectorAll('input[mask]');
-    iterateCursor(maskElements, (element) => {
+    maskElements.forEach((element) => {
       if (TextMask.isMasked(element)) {
         return;
       }
diff --git a/extensions/amp-inputmask/0.1/inputmask-custom-alias.js b/extensions/amp-inputmask/0.1/inputmask-custom-alias.js
index eaba85071a5a..7b7604225902 100644
--- a/extensions/amp-inputmask/0.1/inputmask-custom-alias.js
+++ b/extensions/amp-inputmask/0.1/inputmask-custom-alias.js
@@ -1,5 +1,3 @@
-import {dict} from '#core/types/object';
-
 import {user} from '#utils/log';
 
 /**
@@ -19,7 +17,7 @@ export function factory(Inputmask) {
  * @private visible for testing
  */
 export function getAliasDefinition() {
-  return dict({
+  return {
     'custom': {
       'prefixes': [],
       /**
@@ -48,7 +46,7 @@ export function getAliasDefinition() {
         return removePrefix(processedValue, prefixes);
       },
     },
-  });
+  };
 }
 
 /**
diff --git a/extensions/amp-inputmask/0.1/inputmask-payment-card-alias.js b/extensions/amp-inputmask/0.1/inputmask-payment-card-alias.js
index 933828fad29b..a8ca0a3b0006 100644
--- a/extensions/amp-inputmask/0.1/inputmask-payment-card-alias.js
+++ b/extensions/amp-inputmask/0.1/inputmask-payment-card-alias.js
@@ -1,5 +1,3 @@
-import {dict} from '#core/types/object';
-
 /**
  * Installs an alias used to mask credit cards and enable digit chunking.
  * https://github.com/RobinHerbots/Inputmask/issues/525
@@ -8,43 +6,41 @@ import {dict} from '#core/types/object';
 export function factory(Inputmask) {
   // TODO(cvializ): Improve card chunking support
   // https://baymard.com/checkout-usability/credit-card-patterns
-  Inputmask.extendAliases(
-    dict({
-      'payment-card': {
-        'postValidation': (buffer) => /[\s\d]+/.test(buffer.join('')),
-        /**
-         * @param {!JsonObject} opts
-         * @return {*} TODO(#23582): Specify return type
-         */
-        'mask': function (opts) {
-          opts['definitions'] = dict({
-            'x': {
-              'validator': function (chrs, buffer) {
-                const val = buffer.buffer.join('') + chrs;
-                const valExp2 = new RegExp('\\d\\d');
-                const regextest = valExp2.test(val);
-                return regextest && val != '34' && val != '37';
-              },
-              'cardinality': 2,
+  Inputmask.extendAliases({
+    'payment-card': {
+      'postValidation': (buffer) => /[\s\d]+/.test(buffer.join('')),
+      /**
+       * @param {!JsonObject} opts
+       * @return {*} TODO(#23582): Specify return type
+       */
+      'mask': function (opts) {
+        opts['definitions'] = {
+          'x': {
+            'validator': function (chrs, buffer) {
+              const val = buffer.buffer.join('') + chrs;
+              const valExp2 = new RegExp('\\d\\d');
+              const regextest = valExp2.test(val);
+              return regextest && val != '34' && val != '37';
             },
-            'y': {
-              'validator': function (chrs, buffer) {
-                const val = buffer.buffer.join('') + chrs;
-                const valExp2 = /3(4|7)/;
-                const regextest = valExp2.test(val);
-                return regextest;
-              },
-              'cardinality': 2,
+            'cardinality': 2,
+          },
+          'y': {
+            'validator': function (chrs, buffer) {
+              const val = buffer.buffer.join('') + chrs;
+              const valExp2 = /3(4|7)/;
+              const regextest = valExp2.test(val);
+              return regextest;
             },
-          });
-          return [
-            'y99 999999 99999',
-            'x99 9999 9999 9999',
-            '9999 999999 99999',
-            '9999 9999 9999 9999',
-          ];
-        },
+            'cardinality': 2,
+          },
+        };
+        return [
+          'y99 999999 99999',
+          'x99 9999 9999 9999',
+          '9999 999999 99999',
+          '9999 9999 9999 9999',
+        ];
       },
-    })
-  );
+    },
+  });
 }
diff --git a/extensions/amp-inputmask/0.1/mask-impl.js b/extensions/amp-inputmask/0.1/mask-impl.js
index 1da6d9ecb640..fb8d0ea8d840 100644
--- a/extensions/amp-inputmask/0.1/mask-impl.js
+++ b/extensions/amp-inputmask/0.1/mask-impl.js
@@ -1,5 +1,4 @@
-import {AmpEvents} from '#core/constants/amp-events';
-import {dict} from '#core/types/object';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
 
 import {MASK_SEPARATOR_CHAR, MaskChars, NamedMasks} from './constants';
 import {factory as inputmaskCustomAliasFactory} from './inputmask-custom-alias';
@@ -8,7 +7,7 @@ import {MaskInterface} from './mask-interface';
 
 import {requireExternal} from '../../../src/module';
 
-const NamedMasksToInputmask = dict({
+const NamedMasksToInputmask = {
   [NamedMasks.PAYMENT_CARD]: 'payment-card',
   [NamedMasks.DATE_DD_MM_YYYY]: {
     'alias': 'datetime',
@@ -26,9 +25,9 @@ const NamedMasksToInputmask = dict({
     'alias': 'datetime',
     'inputFormat': 'yyyy-mm-dd',
   },
-});
+};
 
-const MaskCharsToInputmask = dict({
+const MaskCharsToInputmask = {
   [MaskChars.ALPHANUMERIC_REQUIRED]: '*',
   [MaskChars.ALPHANUMERIC_OPTIONAL]: '[*]',
   [MaskChars.ALPHABETIC_REQUIRED]: 'a',
@@ -38,7 +37,7 @@ const MaskCharsToInputmask = dict({
   [MaskChars.NUMERIC_REQUIRED]: '9',
   [MaskChars.NUMERIC_OPTIONAL]: '[9]',
   [MaskChars.ESCAPE]: '\\',
-});
+};
 
 /**
  * TODO(cvializ): allow masks to be passed as data
@@ -55,13 +54,13 @@ export class Mask {
 
     this.element_ = element;
 
-    const config = dict({
+    const config = {
       'placeholder': '\u2000',
       'showMaskOnHover': false,
       'showMaskOnFocus': false,
       'noValuePatching': true,
       'jitMasking': true,
-    });
+    };
 
     const trimmedMask = mask.trim();
     const namedFormat = NamedMasksToInputmask[trimmedMask];
@@ -83,7 +82,7 @@ export class Mask {
 
     this.controller_ = this.Inputmask_(config);
 
-    this.element_.addEventListener(AmpEvents.FORM_VALUE_CHANGE, () => {
+    this.element_.addEventListener(AmpEvents_Enum.FORM_VALUE_CHANGE, () => {
       this.mask();
     });
   }
@@ -104,18 +103,16 @@ export class Mask {
     inputmaskCustomAliasFactory(Inputmask);
     inputmaskPaymentCardAliasFactory(Inputmask);
 
-    Inputmask.extendDefaults(
-      dict({
-        // A list of supported input type attribute values
-        'supportsInputType': [
-          'text',
-          'tel',
-          'search',
-          // 'password', // use-case?
-          // 'email', // doesn't support setSelectionRange. workaround?
-        ],
-      })
-    );
+    Inputmask.extendDefaults({
+      // A list of supported input type attribute values
+      'supportsInputType': [
+        'text',
+        'tel',
+        'search',
+        // 'password', // use-case?
+        // 'email', // doesn't support setSelectionRange. workaround?
+      ],
+    });
 
     return Inputmask;
   }
diff --git a/extensions/amp-instagram/1.0/README.md b/extensions/amp-instagram/1.0/README.md
index 450c89236c99..0cf9dfabcce3 100644
--- a/extensions/amp-instagram/1.0/README.md
+++ b/extensions/amp-instagram/1.0/README.md
@@ -6,9 +6,7 @@ Embeds an Instagram post.
 
 You must include each Bento component's required CSS library before adding custom styles in order to guarantee proper loading. Or use the lightweight pre-uprgrade styles available inline. See [Layout and Style](#layout-and-style).
 
-The examples below demonstrate use of the `<bento-instagram>` web component.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/instagram
@@ -19,45 +17,58 @@ import {defineElement as defineBentoInstagram} from '@bentoproject/instagram';
 defineBentoInstagram();
 ```
 
-### Example: Include via `<script>`
+### Include via `<script>`
 
 ```html
-<head>
-  <script src="https://cdn.ampproject.org/bento.js"></script>
-  <script
-    async
-    src="https://cdn.ampproject.org/v0/bento-instagram-1.0.js"
-  ></script>
-  <style>
-    bento-instagram {
-      display: block;
-      overflow: hidden;
-      position: relative;
-    }
-  </style>
-</head>
-<body>
-  <bento-instagram
-    id="my-instagram"
-    data-shortcode="CKXYAzuj7TE"
-    data-captioned
-    style="height: 800px; width: 400px;"
-  >
-  </bento-instagram>
-  <button id="change-shortcode">Change shortcode</button>
-
-  <script>
-    (async () => {
-      const instagram = document.querySelector('#my-instagram');
-      await customElements.whenDefined('bento-instagram');
-
-      // set up button actions
-      document.querySelector('#change-shortcode').onclick = () => {
-        instagram.dataset.shortcode = '1totVhIFXl';
-      };
-    })();
-  </script>
-</body>
+<script type="module" src="https://cdn.ampproject.org/bento.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/bento.js" crossorigin="anonymous"></script>
+<script type="module" src="https://cdn.ampproject.org/v0/bento-instagram-1.0.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/v0/bento-instagram-1.0.js" crossorigin="anonymous"></script>
+<link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-instagram-1.0.css" crossorigin="anonymous">
+```
+
+### Example
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-instagram-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-instagram-1.0.js"
+    ></script>
+    <style>
+      bento-instagram {
+        display: block;
+        overflow: hidden;
+        position: relative;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-instagram
+      id="my-instagram"
+      data-shortcode="CKXYAzuj7TE"
+      data-captioned
+      style="height: 800px; width: 400px"
+    >
+    </bento-instagram>
+  </body>
+</html>
 ```
 
 ### Layout and style
@@ -105,6 +116,65 @@ The instagram data-shortcode is found in every instagram photo URL. For example,
 
 Include the Instagram caption. `bento-instagram` will attempt to resize to the correct height including the caption.
 
+#### API Example
+
+By programmatically changing the `data-shortcode` attribute value, you can dynamically switch to a different post:
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-instagram-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-instagram-1.0.js"
+    ></script>
+    <style>
+      bento-instagram {
+        display: block;
+        overflow: hidden;
+        position: relative;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-instagram
+      id="my-instagram"
+      data-shortcode="CKXYAzuj7TE"
+      data-captioned
+      style="height: 800px; width: 400px"
+    >
+    </bento-instagram>
+    <button id="change-shortcode">Change shortcode</button>
+
+    <script>
+      (async () => {
+        const instagram = document.querySelector('#my-instagram');
+        await customElements.whenDefined('bento-instagram');
+
+        // set up button actions
+        document.querySelector('#change-shortcode').onclick = () => {
+          instagram.dataset.shortcode = '1totVhIFXl';
+        };
+      })();
+    </script>
+  </body>
+</html>
+```
+
 ### Styling
 
 You may use the `bento-instagram` element selector to style the component.
@@ -113,9 +183,7 @@ You may use the `bento-instagram` element selector to style the component.
 
 ## Preact/React Component
 
-The examples below demonstrates use of the `<BentoInstagram>` as a functional component usable with the Preact or React libraries.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/instagram
diff --git a/extensions/amp-instagram/1.0/amp-instagram.js b/extensions/amp-instagram/1.0/amp-instagram.js
index 8337b90f65a7..64893290c22e 100644
--- a/extensions/amp-instagram/1.0/amp-instagram.js
+++ b/extensions/amp-instagram/1.0/amp-instagram.js
@@ -1,17 +1,17 @@
-import {dict} from '#core/types/object';
+import {BaseElement} from '#bento/components/bento-instagram/1.0/base-element';
 
 import {isExperimentOn} from '#experiments';
 
-import {userAssert} from '#utils/log';
+import {AmpPreactBaseElement, setSuperClass} from '#preact/amp-base-element';
 
-import {BaseElement} from './base-element';
+import {userAssert} from '#utils/log';
 
 import {CSS} from '../../../build/amp-instagram-1.0.css';
 
 /** @const {string} */
 const TAG = 'amp-instagram';
 
-class AmpInstagram extends BaseElement {
+class AmpInstagram extends setSuperClass(BaseElement, AmpPreactBaseElement) {
   /** @override */
   isLayoutSupported(layout) {
     userAssert(
@@ -24,9 +24,9 @@ class AmpInstagram extends BaseElement {
 
   /** @override */
   init() {
-    return dict({
+    return {
       'requestResize': (height) => this.attemptChangeHeight(height),
-    });
+    };
   }
 }
 
diff --git a/extensions/amp-instagram/1.0/component.js b/extensions/amp-instagram/1.0/component.js
deleted file mode 100644
index d75963f26443..000000000000
--- a/extensions/amp-instagram/1.0/component.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import {dict} from '#core/types/object';
-import {parseJson} from '#core/types/object/json';
-
-import * as Preact from '#preact';
-import {useCallback, useState} from '#preact';
-import {forwardRef} from '#preact/compat';
-import {useValueRef} from '#preact/component';
-import {IframeEmbed} from '#preact/component/iframe';
-
-import {getData} from '#utils/event-helper';
-
-const NO_HEIGHT_STYLE = dict();
-const MATCHES_MESSAGING_ORIGIN = (origin) =>
-  origin === 'https://www.instagram.com';
-
-/**
- * @param {!BentoInstagramDef.Props} props
- * @param {{current: ?BentoInstagramDef.Api}} ref
- * @return {PreactDef.Renderable}
- */
-function BentoInstagramWithRef(
-  {captioned, onLoad, requestResize, shortcode, title = 'Instagram', ...rest},
-  ref
-) {
-  const [heightStyle, setHeightStyle] = useState(NO_HEIGHT_STYLE);
-  const [opacity, setOpacity] = useState(0);
-  const onLoadRef = useValueRef(onLoad);
-
-  const messageHandler = useCallback(
-    (event) => {
-      const data = parseJson(getData(event));
-      if (data['type'] == 'MEASURE' && data['details']) {
-        const height = data['details']['height'];
-        if (requestResize) {
-          requestResize(height);
-        }
-        setHeightStyle(dict({'height': height}));
-        setOpacity(1);
-
-        onLoadRef.current?.();
-      }
-    },
-    [requestResize, onLoadRef]
-  );
-
-  return (
-    <IframeEmbed
-      iframeStyle={{opacity}}
-      matchesMessagingOrigin={MATCHES_MESSAGING_ORIGIN}
-      messageHandler={messageHandler}
-      ref={ref}
-      src={
-        'https://www.instagram.com/p/' +
-        encodeURIComponent(shortcode) +
-        '/embed/' +
-        (captioned ? 'captioned/' : '') +
-        '?cr=1&v=12'
-      }
-      title={title}
-      wrapperStyle={heightStyle}
-      {...rest}
-    />
-  );
-}
-
-const BentoInstagram = forwardRef(BentoInstagramWithRef);
-BentoInstagram.displayName = 'Instagram'; // Make findable for tests.
-export {BentoInstagram};
diff --git a/extensions/amp-instagram/1.0/example/index.html b/extensions/amp-instagram/1.0/example/index.html
new file mode 100644
index 000000000000..06109ecf3831
--- /dev/null
+++ b/extensions/amp-instagram/1.0/example/index.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width" />
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-instagram-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-instagram-1.0.js"
+    ></script>
+    <style>
+      bento-instagram {
+        display: block;
+        overflow: hidden;
+        position: relative;
+      }
+    </style>
+    <style>
+      body {
+        background: #ecf1f3;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+      bento-embedly-card {
+        width: 375px;
+        height: 710px;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-instagram
+      id="my-instagram"
+      data-shortcode="CKXYAzuj7TE"
+      data-captioned
+      style="height: 800px; width: 400px"
+    >
+    </bento-instagram>
+  </body>
+</html>
diff --git a/extensions/amp-instagram/1.0/storybook/Basic.js b/extensions/amp-instagram/1.0/storybook/Basic.js
index 208075cd677a..3c2a5c2e2f15 100644
--- a/extensions/amp-instagram/1.0/storybook/Basic.js
+++ b/extensions/amp-instagram/1.0/storybook/Basic.js
@@ -1,12 +1,12 @@
-import * as Preact from '#preact';
-
 import {
   BentoAccordion,
   BentoAccordionContent,
   BentoAccordionHeader,
   BentoAccordionSection,
-} from '../../../amp-accordion/1.0/component';
-import {BentoInstagram} from '../component';
+} from '#bento/components/bento-accordion/1.0/component';
+import {BentoInstagram} from '#bento/components/bento-instagram/1.0/component';
+
+import * as Preact from '#preact';
 
 export default {
   title: 'Instagram',
diff --git a/extensions/amp-instagram/1.0/test/test-component.js b/extensions/amp-instagram/1.0/test/test-component.js
deleted file mode 100644
index ed7ad5ef7f41..000000000000
--- a/extensions/amp-instagram/1.0/test/test-component.js
+++ /dev/null
@@ -1,156 +0,0 @@
-import {mount} from 'enzyme';
-
-import * as Preact from '#preact';
-import {createRef} from '#preact';
-import {WithAmpContext} from '#preact/context';
-
-import {waitFor} from '#testing/helpers/service';
-
-import {BentoInstagram} from '../component';
-
-describes.sandboxed('BentoInstagram preact component v1.0', {}, (env) => {
-  it('Normal render', () => {
-    const wrapper = mount(
-      <BentoInstagram
-        shortcode="B8QaZW4AQY_"
-        style={{
-          'width': 500,
-          'height': 600,
-        }}
-      />
-    );
-
-    const iframe = wrapper.find('iframe');
-
-    expect(iframe.prop('src')).to.equal(
-      'https://www.instagram.com/p/B8QaZW4AQY_/embed/?cr=1&v=12'
-    );
-    expect(wrapper.find('iframe').prop('style').width).to.equal('100%');
-    expect(wrapper.find('iframe').prop('style').height).to.equal('100%');
-    expect(wrapper.find('div')).to.have.lengthOf(2);
-  });
-
-  it('Render with caption', () => {
-    const wrapper = mount(
-      <BentoInstagram
-        shortcode="B8QaZW4AQY_"
-        captioned
-        style={{'width': 500, 'height': 705}}
-      />
-    );
-    expect(wrapper.find('iframe').prop('src')).to.equal(
-      'https://www.instagram.com/p/B8QaZW4AQY_/embed/captioned/?cr=1&v=12'
-    );
-    expect(wrapper.find('iframe').prop('style').width).to.equal('100%');
-    expect(wrapper.find('iframe').prop('style').height).to.equal('100%');
-    expect(wrapper.find('div')).to.have.lengthOf(2);
-  });
-
-  it('Resize prop is called', () => {
-    const requestResizeSpy = env.sandbox.spy();
-    const wrapper = mount(
-      <BentoInstagram
-        shortcode="B8QaZW4AQY_"
-        captioned
-        style={{'width': 500, 'height': 705}}
-        requestResize={requestResizeSpy}
-      />
-    );
-
-    const mockEvent = createMockEvent();
-    mockEvent.source = wrapper
-      .getDOMNode()
-      .querySelector('iframe').contentWindow;
-    window.dispatchEvent(mockEvent);
-
-    expect(requestResizeSpy).to.have.been.calledOnce;
-  });
-
-  it('Height is changed', async () => {
-    const wrapper = mount(
-      <BentoInstagram
-        shortcode="B8QaZW4AQY_"
-        style={{'width': 500, 'height': 600}}
-      />
-    );
-
-    const mockEvent = createMockEvent();
-    mockEvent.source = wrapper
-      .getDOMNode()
-      .querySelector('iframe').contentWindow;
-    window.dispatchEvent(mockEvent);
-
-    wrapper.update();
-
-    await waitFor(
-      () => wrapper.find('div').at(0).prop('style').height == 1000,
-      'Height is not changed'
-    );
-
-    expect(wrapper.find('div').at(0).prop('style').height).to.equal(1000);
-  });
-
-  it('load event is dispatched', async () => {
-    const ref = createRef();
-    const onReadyState = env.sandbox.spy();
-    const wrapper = mount(
-      <BentoInstagram
-        ref={ref}
-        shortcode="B8QaZW4AQY_"
-        style={{'width': 500, 'height': 600}}
-        onReadyState={onReadyState}
-      />
-    );
-
-    let api = ref.current;
-    expect(api.readyState).to.equal('loading');
-    expect(onReadyState).to.not.be.called;
-
-    await wrapper.find('iframe').invoke('onLoad')();
-    api = ref.current;
-    expect(api.readyState).to.equal('complete');
-    expect(onReadyState).to.be.calledOnce.calledWith('complete');
-  });
-
-  it('should reset iframe on pause', () => {
-    const ref = createRef();
-    const wrapper = mount(
-      <WithAmpContext playable={true}>
-        <BentoInstagram
-          ref={ref}
-          shortcode="B8QaZW4AQY_"
-          style={{'width': 500, 'height': 600}}
-        />
-      </WithAmpContext>
-    );
-    expect(wrapper.find('iframe')).to.have.lengthOf(1);
-
-    const iframe = wrapper.find('iframe').getDOMNode();
-    let iframeSrc = iframe.src;
-    const iframeSrcSetterSpy = env.sandbox.spy();
-    Object.defineProperty(iframe, 'src', {
-      get() {
-        return iframeSrc;
-      },
-      set(value) {
-        iframeSrc = value;
-        iframeSrcSetterSpy(value);
-      },
-    });
-
-    wrapper.setProps({playable: false});
-    expect(iframeSrcSetterSpy).to.be.calledOnce;
-  });
-});
-
-function createMockEvent() {
-  const mockEvent = new CustomEvent('message');
-  mockEvent.origin = 'https://www.instagram.com';
-  mockEvent.data = JSON.stringify({
-    'type': 'MEASURE',
-    'details': {
-      'height': 1000,
-    },
-  });
-  return mockEvent;
-}
diff --git a/extensions/amp-instagram/validator-amp-instagram.protoascii b/extensions/amp-instagram/validator-amp-instagram.protoascii
index 6fa93298f676..3ad22625f1ff 100644
--- a/extensions/amp-instagram/validator-amp-instagram.protoascii
+++ b/extensions/amp-instagram/validator-amp-instagram.protoascii
@@ -1,8 +1,8 @@
 tags: {  # amp-instagram 1.0
   html_format: AMP
   tag_name: "SCRIPT"
-  satisfies: "amp-instagram 1.0"
-  excludes: "amp-instagram 0.1"
+  satisfies_condition: "amp-instagram 1.0"
+  excludes_condition: "amp-instagram 0.1"
   extension_spec: {
     name: "amp-instagram"
     version_name: "v1.0"
@@ -14,8 +14,8 @@ tags: {  # amp-instagram 1.0
 tags: {  # amp-instagram 0.1 and latest
   html_format: AMP
   tag_name: "SCRIPT"
-  satisfies: "amp-instagram 0.1"
-  excludes: "amp-instagram 1.0"
+  satisfies_condition: "amp-instagram 0.1"
+  excludes_condition: "amp-instagram 1.0"
   extension_spec: {
     name: "amp-instagram"
     version_name: "v0.1"
diff --git a/extensions/amp-install-serviceworker/0.1/amp-install-serviceworker.js b/extensions/amp-install-serviceworker/0.1/amp-install-serviceworker.js
index 4c9b4a4cce11..ecebd0ce33ff 100644
--- a/extensions/amp-install-serviceworker/0.1/amp-install-serviceworker.js
+++ b/extensions/amp-install-serviceworker/0.1/amp-install-serviceworker.js
@@ -1,14 +1,13 @@
 import {removeElement} from '#core/dom';
 import {closestAncestorElementBySelector} from '#core/dom/query';
 import {toggle} from '#core/dom/style';
-import {dict} from '#core/types/object';
 
 import {Services} from '#service';
 
 import {listen} from '#utils/event-helper';
 import {dev, user, userAssert} from '#utils/log';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {getMode} from '../../../src/mode';
 import {removeFragment} from '../../../src/url';
 
@@ -392,12 +391,10 @@ function sendAmpScriptToSwOnFirstVisit(win, registration) {
     // using convention from https://github.com/redux-utilities/flux-standard-action.
     if (activeSW.postMessage) {
       activeSW.postMessage(
-        JSON.stringify(
-          dict({
-            'type': 'AMP__FIRST-VISIT-CACHING',
-            'payload': ampScriptsUsed,
-          })
-        )
+        JSON.stringify({
+          'type': 'AMP__FIRST-VISIT-CACHING',
+          'payload': ampScriptsUsed,
+        })
       );
     }
   }
@@ -426,12 +423,10 @@ function prefetchOutgoingLinks(registration, win) {
     const activeSW = registration.active;
     if (activeSW.postMessage) {
       activeSW.postMessage(
-        JSON.stringify(
-          dict({
-            'type': 'AMP__LINK-PREFETCH',
-            'payload': links,
-          })
-        )
+        JSON.stringify({
+          'type': 'AMP__LINK-PREFETCH',
+          'payload': links,
+        })
       );
     }
   }
diff --git a/extensions/amp-install-serviceworker/0.1/test/test-amp-install-serviceworker.js b/extensions/amp-install-serviceworker/0.1/test/test-amp-install-serviceworker.js
index 338897febad9..a234d123c3ee 100644
--- a/extensions/amp-install-serviceworker/0.1/test/test-amp-install-serviceworker.js
+++ b/extensions/amp-install-serviceworker/0.1/test/test-amp-install-serviceworker.js
@@ -237,7 +237,7 @@ describes.realWin(
                 href: 'https://ampproject.org/',
               },
               {
-                href: 'https://ampbyexample.com/components/amp-accordion/',
+                href: 'https://amp.dev/documentation/components/amp-accordion',
               },
             ],
             createElement: () => {
@@ -261,7 +261,7 @@ describes.realWin(
                   type: 'AMP__LINK-PREFETCH',
                   payload: [
                     'https://ampproject.org/',
-                    'https://ampbyexample.com/components/amp-accordion/',
+                    'https://amp.dev/documentation/components/amp-accordion',
                   ],
                 })
               );
diff --git a/extensions/amp-install-serviceworker/OWNERS b/extensions/amp-install-serviceworker/OWNERS
index 027ae5743f5e..04c3c75bfccd 100644
--- a/extensions/amp-install-serviceworker/OWNERS
+++ b/extensions/amp-install-serviceworker/OWNERS
@@ -4,7 +4,7 @@
 {
   rules: [
     {
-      owners: [{name: 'jridgewell'}],
+      owners: [{name: 'ampproject/wg-performance'}],
     },
   ],
 }
diff --git a/extensions/amp-intersection-observer-polyfill/0.1/amp-intersection-observer-polyfill.js b/extensions/amp-intersection-observer-polyfill/0.1/amp-intersection-observer-polyfill.js
index 1cf294515245..9bd3a1ba76c5 100644
--- a/extensions/amp-intersection-observer-polyfill/0.1/amp-intersection-observer-polyfill.js
+++ b/extensions/amp-intersection-observer-polyfill/0.1/amp-intersection-observer-polyfill.js
@@ -28,7 +28,6 @@ export function upgradeIntersectionObserverPolyfill(win) {
   registerServiceBuilder(win, TAG, upgrade, /* instantiate */ true);
 }
 
-// eslint-disable-next-line no-unused-vars
-AMP.extension(TAG, '0.1', function (AMP) {
+AMP.extension(TAG, '0.1', function (unusedAMP) {
   upgradeIntersectionObserverPolyfill(window);
 });
diff --git a/extensions/amp-intersection-observer-polyfill/0.1/cross-origin-observer.js b/extensions/amp-intersection-observer-polyfill/0.1/cross-origin-observer.js
index 05b6a71028e2..975a8752668f 100644
--- a/extensions/amp-intersection-observer-polyfill/0.1/cross-origin-observer.js
+++ b/extensions/amp-intersection-observer-polyfill/0.1/cross-origin-observer.js
@@ -1,4 +1,4 @@
-import {MessageType} from '#core/3p-frame-messaging';
+import {MessageType_Enum} from '#core/3p-frame-messaging';
 import {layoutRectLtwh} from '#core/dom/layout/rect';
 import {WindowInterface} from '#core/window/interface';
 
@@ -27,8 +27,8 @@ export function maybeSetupCrossOriginObserver(win) {
 
   const updater = setupPolyfillUpdater();
   iframeClient.makeRequest(
-    MessageType.SEND_POSITIONS,
-    MessageType.POSITION,
+    MessageType_Enum.SEND_POSITIONS,
+    MessageType_Enum.POSITION,
     (data) => {
       const boundingClientRect =
         /** @type {!../../../src/layout-rect.LayoutRectDef} */ (
diff --git a/extensions/amp-intersection-observer-polyfill/0.1/test/test-cross-origin-observer.js b/extensions/amp-intersection-observer-polyfill/0.1/test/test-cross-origin-observer.js
index b35687db7247..6e6633cc8a58 100644
--- a/extensions/amp-intersection-observer-polyfill/0.1/test/test-cross-origin-observer.js
+++ b/extensions/amp-intersection-observer-polyfill/0.1/test/test-cross-origin-observer.js
@@ -1,4 +1,4 @@
-import {MessageType} from '#core/3p-frame-messaging';
+import {MessageType_Enum} from '#core/3p-frame-messaging';
 import {layoutRectLtwh} from '#core/dom/layout/rect';
 import {WindowInterface} from '#core/window/interface';
 
@@ -80,8 +80,8 @@ describes.realWin('maybeSetupCrossOriginObserver', {amp: false}, (env) => {
       iframeClient = {
         makeRequest(message, type, callback) {
           if (
-            message == MessageType.SEND_POSITIONS &&
-            type == MessageType.POSITION
+            message == MessageType_Enum.SEND_POSITIONS &&
+            type == MessageType_Enum.POSITION
           ) {
             sendMessageCallback = callback;
           }
diff --git a/extensions/amp-izlesene/0.1/amp-izlesene.js b/extensions/amp-izlesene/0.1/amp-izlesene.js
index cb49b3ffc0c5..80037c3ef5d9 100644
--- a/extensions/amp-izlesene/0.1/amp-izlesene.js
+++ b/extensions/amp-izlesene/0.1/amp-izlesene.js
@@ -1,7 +1,6 @@
 import {getDataParamsFromAttributes} from '#core/dom';
 import {applyFillContent, isLayoutSizeDefined} from '#core/dom/layout';
 import {PauseHelper} from '#core/dom/video/pause-helper';
-import {dict} from '#core/types/object';
 
 import {Services} from '#service';
 
@@ -114,9 +113,9 @@ class AmpIzlesene extends AMP.BaseElement {
   pauseCallback() {
     if (this.iframe_ && this.iframe_.contentWindow) {
       this.iframe_.contentWindow./*OK*/ postMessage(
-        dict({
+        {
           'command': 'pause',
-        }),
+        },
         '*'
       );
     }
diff --git a/extensions/amp-jwplayer/0.1/amp-jwplayer.js b/extensions/amp-jwplayer/0.1/amp-jwplayer.js
index 93b00e05d930..21d26b8b85d6 100644
--- a/extensions/amp-jwplayer/0.1/amp-jwplayer.js
+++ b/extensions/amp-jwplayer/0.1/amp-jwplayer.js
@@ -13,7 +13,6 @@ import {applyFillContent, isLayoutSizeDefined} from '#core/dom/layout';
 import {propagateAttributes} from '#core/dom/propagate-attributes';
 import {PauseHelper} from '#core/dom/video/pause-helper';
 import {once} from '#core/types/function';
-import {dict} from '#core/types/object';
 import {tryParseJson} from '#core/types/object/json';
 
 import {Services} from '#service';
@@ -38,16 +37,16 @@ import {
 } from '../../../src/iframe-video';
 import {getMode} from '../../../src/mode';
 import {addParamsToUrl} from '../../../src/url';
-import {VideoEvents} from '../../../src/video-interface';
+import {VideoEvents_Enum} from '../../../src/video-interface';
 
 const JWPLAYER_EVENTS = {
-  'ready': VideoEvents.LOAD,
-  'play': VideoEvents.PLAYING,
-  'pause': VideoEvents.PAUSE,
-  'complete': VideoEvents.ENDED,
-  'visible': VideoEvents.VISIBILITY,
-  'adImpression': VideoEvents.AD_START,
-  'adComplete': VideoEvents.AD_END,
+  'ready': VideoEvents_Enum.LOAD,
+  'play': VideoEvents_Enum.PLAYING,
+  'pause': VideoEvents_Enum.PAUSE,
+  'complete': VideoEvents_Enum.ENDED,
+  'visible': VideoEvents_Enum.VISIBILITY,
+  'adImpression': VideoEvents_Enum.AD_START,
+  'adComplete': VideoEvents_Enum.AD_END,
 };
 
 /**
@@ -307,7 +306,7 @@ class AmpJWPlayer extends AMP.BaseElement {
   /** @override */
   layoutCallback() {
     return this.getConsentData_().then(() => {
-      const queryParams = dict({
+      const queryParams = {
         'search': this.getContextualVal_() || undefined,
         'recency': this.contentRecency_ || undefined,
         'backfill': this.contentBackfill_ || undefined,
@@ -315,7 +314,7 @@ class AmpJWPlayer extends AMP.BaseElement {
         'consentState': this.consentState_ || undefined,
         'consentValue': this.consentString_ || undefined,
         'consentGdpr': this.consentMetadata_?.gdprApplies || undefined,
-      });
+      };
 
       const url = this.getSingleLineEmbed_();
       let src = addParamsToUrl(url, queryParams);
@@ -440,10 +439,10 @@ class AmpJWPlayer extends AMP.BaseElement {
 
     // Inform Video Manager that the video is pre-muted from persisted options.
     if (detail.muted) {
-      dispatchCustomEvent(element, VideoEvents.MUTED);
+      dispatchCustomEvent(element, VideoEvents_Enum.MUTED);
     }
 
-    dispatchCustomEvent(element, VideoEvents.LOAD);
+    dispatchCustomEvent(element, VideoEvents_Enum.LOAD);
   }
 
   /**
@@ -565,12 +564,10 @@ class AmpJWPlayer extends AMP.BaseElement {
     dev().info('JWPLAYER', 'COMMAND:', method, optParams);
 
     this.iframe_.contentWindow./*OK*/ postMessage(
-      JSON.stringify(
-        dict({
-          'method': method,
-          'optParams': optParams,
-        })
-      ),
+      JSON.stringify({
+        'method': method,
+        'optParams': optParams,
+      }),
       '*'
     );
   }
diff --git a/extensions/amp-jwplayer/0.1/test/test-amp-jwplayer.js b/extensions/amp-jwplayer/0.1/test/test-amp-jwplayer.js
index bf80f88bba39..71c6fd6f4f47 100644
--- a/extensions/amp-jwplayer/0.1/test/test-amp-jwplayer.js
+++ b/extensions/amp-jwplayer/0.1/test/test-amp-jwplayer.js
@@ -4,7 +4,7 @@ import {htmlFor} from '#core/dom/static-template';
 
 import * as consent from '../../../../src/consent';
 import {parseUrlDeprecated} from '../../../../src/url';
-import {VideoEvents} from '../../../../src/video-interface';
+import {VideoEvents_Enum} from '../../../../src/video-interface';
 
 describes.realWin(
   'amp-jwplayer',
@@ -310,8 +310,11 @@ describes.realWin(
         it('updates mute from state', () => {
           const mutedEventSpy = env.sandbox.spy();
           const unmutedEventSpy = env.sandbox.spy();
-          impl.element.addEventListener(VideoEvents.MUTED, mutedEventSpy);
-          impl.element.addEventListener(VideoEvents.UNMUTED, unmutedEventSpy);
+          impl.element.addEventListener(VideoEvents_Enum.MUTED, mutedEventSpy);
+          impl.element.addEventListener(
+            VideoEvents_Enum.UNMUTED,
+            unmutedEventSpy
+          );
           mockMessage('mute', {mute: true});
           expect(mutedEventSpy).to.be.calledOnce;
           mockMessage('mute', {mute: false});
diff --git a/extensions/amp-jwplayer/1.0/README.md b/extensions/amp-jwplayer/1.0/README.md
index 8267d9ff7a5f..da2c40e99694 100644
--- a/extensions/amp-jwplayer/1.0/README.md
+++ b/extensions/amp-jwplayer/1.0/README.md
@@ -6,9 +6,7 @@ Displays a cloud-hosted JW Player in an iframe.
 
 You must include each Bento component's required CSS library to guarantee proper loading and before adding custom styles. Or use the light-weight pre-upgrade styles available inline. See [Layout and style](#layout-and-style).
 
-The examples below demonstrate use of the `<bento-jwplayer>` web component.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/jwplayer
@@ -19,55 +17,119 @@ import {defineElement as defineBentoJwplayer} from '@bentoproject/jwplayer';
 defineBentoJwplayer();
 ```
 
-### Example: Include via `<script>`
+### Include via `<script>`
+
+```html
+<script type="module" src="https://cdn.ampproject.org/bento.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/bento.js" crossorigin="anonymous"></script>
+<script type="module" src="https://cdn.ampproject.org/v0/bento-jwplayer-1.0.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/v0/bento-jwplayer-1.0.js" crossorigin="anonymous"></script>
+<link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-jwplayer-1.0.css" crossorigin="anonymous">
+```
+
+### Example
 
-The example below contains an `bento-jwplayer` with three sections. The
-`expanded` attribute on the third section expands it on page load.
+<!--% example %-->
 
 ```html
-<head>
-  <script src="https://cdn.ampproject.org/bento.js"></script>
-  <script
-    async
-    src="https://cdn.ampproject.org/v0/bento-jwplayer-1.0.js"
-  ></script>
-  <link
-    rel="stylesheet"
-    type="text/css"
-    href="https://cdn.ampproject.org/v0/bento-jwplayer-1.0.css"
-  />
-</head>
-<body>
-  <bento-jwplayer
-    id="jwplayer"
-    data-player-id="BjcwyK37"
-    data-media-id="CtaIzmFs"
-    style="width: 480px; height: 270px"
-  ></bento-jwplayer>
-
-  <script>
-    (async () => {
-      const twitter = document.querySelector('#jwplayer');
-      await customElements.whenDefined('bento-twitter');
-
-      const api = player.getApi();
-      api.play();
-      api.pause();
-      api.mute();
-      api.unmute();
-      api.requestFullscreen();
-    })();
-  </script>
-</body>
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-jwplayer-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-jwplayer-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-jwplayer-1.0.css"
+    />
+  </head>
+  <body>
+    <bento-jwplayer
+      id="jwplayer"
+      data-player-id="BjcwyK37"
+      data-media-id="CtaIzmFs"
+      style="width: 480px; height: 270px"
+    ></bento-jwplayer>
+  </body>
+</html>
 ```
 
 ### Interactivity and API usage
 
-Bento enabled components in standalone use are highly interactive through their API. The `bento-jwplayer` component API is accessible by including the following script tag in your document:
+Bento components are highly interactive through their API. The `bento-jwplayer` component API is accessible by including the following script tag in your document:
 
 ```javascript
-await customElements.whenDefined('bento-accordion');
-const api = await document.querySelector('bento-accordion').getApi();
+await customElements.whenDefined('bento-jwplayer');
+const jwplayerApi = await document.querySelector('bento-jwplayer').getApi();
+```
+
+You can use the API to trigger the available actions (`play`, `pause`, `mute`, `unmute`, `requestFullscreen`):
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-jwplayer-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-jwplayer-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-jwplayer-1.0.css"
+    />
+  </head>
+  <body>
+    <bento-jwplayer
+      id="jwplayer"
+      data-player-id="BjcwyK37"
+      data-media-id="CtaIzmFs"
+      style="width: 480px; height: 270px"
+    ></bento-jwplayer>
+
+    <script>
+      (async () => {
+        const player = document.querySelector('#jwplayer');
+        await customElements.whenDefined('bento-jwplayer');
+
+        const api = player.getApi();
+        api.play();
+        api.pause();
+        api.mute();
+        api.unmute();
+        api.requestFullscreen();
+      })();
+    </script>
+  </body>
+</html>
 ```
 
 ### Layout and style
@@ -213,9 +275,7 @@ You may use the `bento-jwplayer` element selector to style the accordion freely.
 
 ## Preact/React Component
 
-The examples below demonstrates use of the `<BentoMathml>` as a functional component usable with the Preact or React libraries.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/jwplayer
diff --git a/extensions/amp-jwplayer/1.0/amp-jwplayer.js b/extensions/amp-jwplayer/1.0/amp-jwplayer.js
index 9a3f8be0de67..8e6381f8ec65 100644
--- a/extensions/amp-jwplayer/1.0/amp-jwplayer.js
+++ b/extensions/amp-jwplayer/1.0/amp-jwplayer.js
@@ -1,14 +1,56 @@
+import {BaseElement} from '#bento/components/bento-jwplayer/1.0/base-element';
+import {AmpVideoBaseElement} from '#bento/components/bento-video/1.0/video-base-element';
+
 import {isExperimentOn} from '#experiments';
 
+import {setSuperClass} from '#preact/amp-base-element';
+
 import {userAssert} from '#utils/log';
 
-import {BaseElement} from './base-element';
+import {
+  getConsentMetadata,
+  getConsentPolicyInfo,
+  getConsentPolicyState,
+} from '../../../src/consent';
 
 /** @const {string} */
 const TAG = 'amp-jwplayer';
 
 /** @implements {../../../src/video-interface.VideoInterface} */
-class AmpJwplayer extends BaseElement {
+class AmpJwplayer extends setSuperClass(BaseElement, AmpVideoBaseElement) {
+  /** @override */
+  init() {
+    const consentPolicy = this.getConsentPolicy();
+    if (consentPolicy) {
+      this.getConsentInfo().then((consentInfo) => {
+        const policyState = consentInfo[0];
+        const policyInfo = consentInfo[1];
+        const policyMetadata = consentInfo[2];
+        this.mutateProps({
+          'consentParams': {
+            'policyState': policyState,
+            'policyInfo': policyInfo,
+            'policyMetadata': policyMetadata,
+          },
+        });
+      });
+    }
+
+    return super.init();
+  }
+
+  /**
+   * @param {string} policy
+   * @return {Promise}
+   */
+  getConsentInfo(policy) {
+    return Promise.all([
+      getConsentPolicyState(this.element, policy),
+      getConsentPolicyInfo(this.element, policy),
+      getConsentMetadata(this.element, policy),
+    ]);
+  }
+
   /** @override */
   isLayoutSupported(layout) {
     userAssert(
diff --git a/extensions/amp-jwplayer/1.0/base-element.js b/extensions/amp-jwplayer/1.0/base-element.js
deleted file mode 100644
index faed8889e086..000000000000
--- a/extensions/amp-jwplayer/1.0/base-element.js
+++ /dev/null
@@ -1,120 +0,0 @@
-import {getDataParamsFromAttributes} from '#core/dom';
-import {dict} from '#core/types/object';
-
-import {BentoJwplayer} from './component';
-
-import {
-  getConsentMetadata,
-  getConsentPolicyInfo,
-  getConsentPolicyState,
-} from '../../../src/consent';
-import {VideoBaseElement} from '../../amp-video/1.0/video-base-element';
-
-export class BaseElement extends VideoBaseElement {
-  /** @override */
-  init() {
-    super.init();
-
-    const consentPolicy = this.getConsentPolicy();
-    if (consentPolicy) {
-      this.getConsentInfo().then((consentInfo) => {
-        const policyState = consentInfo[0];
-        const policyInfo = consentInfo[1];
-        const policyMetadata = consentInfo[2];
-        this.mutateProps(
-          dict({
-            'consentParams': {
-              'policyState': policyState,
-              'policyInfo': policyInfo,
-              'policyMetadata': policyMetadata,
-            },
-          })
-        );
-      });
-    }
-
-    return dict({
-      'queryParams': this.mergeQueryParams(
-        getDataParamsFromAttributes(this.element, null, /^playerParam(.+)/),
-        this.element.getAttribute('data-player-querystring')
-      ),
-      'contentSearch': this.getContextualSearch(
-        this.element.getAttribute('data-content-search')
-      ),
-    });
-  }
-
-  /**
-   * @param {string} policy
-   * @return {Promise}
-   */
-  getConsentInfo(policy) {
-    return Promise.all([
-      getConsentPolicyState(this.element, policy),
-      getConsentPolicyInfo(this.element, policy),
-      getConsentMetadata(this.element, policy),
-    ]);
-  }
-
-  /**
-   * Gets contextual search value
-   * @param {string} searchVal
-   * @return {string} contextual search value
-   */
-  getContextualSearch(searchVal) {
-    if (searchVal !== '__CONTEXTUAL__') {
-      return searchVal;
-    }
-
-    const {head, title} = this.element.ownerDocument;
-    const ogTitleElement = head.querySelector('meta[property="og:title"]');
-    const ogTitle = ogTitleElement
-      ? ogTitleElement.getAttribute('content')
-      : null;
-    return ogTitle || title || '';
-  }
-
-  /**
-   * Merges query params from multiple sources into 1 string
-   * @param {Object} playerParams
-   * @param {string} playerQueryString
-   * @return {string}
-   */
-  mergeQueryParams(playerParams, playerQueryString) {
-    const addEntries = (acc, entries) => {
-      for (const entry of entries) {
-        acc[entry[0]] = entry[1];
-      }
-    };
-    const p1 = new URLSearchParams(playerParams || '');
-    const p2 = new URLSearchParams(playerQueryString || '');
-    const params = {};
-    addEntries(params, p1.entries());
-    addEntries(params, p2.entries());
-    return params;
-  }
-}
-
-/** @override */
-BaseElement['Component'] = BentoJwplayer;
-
-/** @override */
-BaseElement['props'] = {
-  'playerId': {attr: 'data-player-id'},
-  'mediaId': {attr: 'data-media-id'},
-  'playlistId': {attr: 'data-playlist-id'},
-  'contentRecency': {attr: 'data-content-recency'},
-  'contentBackfill': {attr: 'data-content-backfill', type: 'boolean'},
-  'adCustParams': {attr: 'data-ad-cust-params'},
-  'adMacros': {attrPrefix: 'data-ad-macro-'},
-  'config': {attrPrefix: 'data-config-'},
-  'autoplay': {attr: 'autoplay', type: 'boolean'},
-  // TODO(wg-bento): These props have no internal implementation yet.
-  'dock': {attr: 'dock', media: true},
-};
-
-/** @override */
-BaseElement['layoutSizeDefined'] = true;
-
-/** @override */
-BaseElement['usesShadowDom'] = true;
diff --git a/extensions/amp-jwplayer/1.0/component.js b/extensions/amp-jwplayer/1.0/component.js
deleted file mode 100644
index aabc65e6c10d..000000000000
--- a/extensions/amp-jwplayer/1.0/component.js
+++ /dev/null
@@ -1,312 +0,0 @@
-import {dispatchCustomEvent} from '#core/dom';
-import {dict} from '#core/types/object';
-import {tryParseJson} from '#core/types/object/json';
-
-import * as Preact from '#preact';
-import {useCallback, useMemo, useRef} from '#preact';
-import {forwardRef} from '#preact/compat';
-
-import {JwplayerToDom, makeJwplayerIframeSrc} from './jwplayer-api';
-
-import {isJsonOrObj, objOrParseJson} from '../../../src/iframe-video';
-import {VideoIframe} from '../../amp-video/1.0/video-iframe';
-
-const JWPLAYER_ORIGIN = /https:\/\/content\.jwplatform\.com/;
-
-/**
- * Checks if the current browser supports requesting fullscreen
- * @param {Window} win
- * @return {boolean}
- */
-function hasFullScreenApi(win) {
-  return !!win.document.body.requestFullscreen;
-}
-
-/**
- * @param {!BentoJwplayerDef.Props} props
- * @param {{current: ?VideoWrapperDef.Api}} ref
- * @return {PreactDef.Renderable}
- */
-export function BentoJwplayerWithRef(props, ref) {
-  const {
-    adCustParams,
-    adMacros,
-    autoplay,
-    config,
-    consentParams = {},
-    contentBackfill = true,
-    contentRecency,
-    contentSearch,
-    mediaId,
-    onLoad,
-    onPlayingState,
-    playerId,
-    playlistId,
-    queryParams,
-    ...rest
-  } = props;
-  const playerStateRef = useRef({});
-  const src = useMemo(() => {
-    return makeJwplayerIframeSrc(
-      playerId,
-      playlistId,
-      mediaId,
-      contentSearch,
-      contentRecency,
-      contentBackfill,
-      queryParams,
-      consentParams
-    );
-  }, [
-    playerId,
-    playlistId,
-    mediaId,
-    contentSearch,
-    contentRecency,
-    contentBackfill,
-    queryParams,
-    consentParams,
-  ]);
-
-  const onMessage = useCallback(
-    (e) =>
-      onMessage_(e, {
-        config,
-        adCustParams,
-        adMacros,
-        onPlayingState,
-        onLoad,
-        playerStateRef,
-      }),
-    [config, adCustParams, adMacros, onPlayingState, onLoad]
-  );
-
-  const makeMethodMessage = useCallback(
-    (method) => makeMessage(method, {autoplay}),
-    [autoplay]
-  );
-  const makeFullscreenMessage = useMemo(
-    () =>
-      !hasFullScreenApi(window)
-        ? () =>
-            JSON.stringify({
-              method: 'setFullscreen',
-              optParams: true,
-            })
-        : null,
-    []
-  );
-
-  if (!checkProps(props)) {
-    return false;
-  }
-
-  return (
-    <VideoIframe
-      ref={ref}
-      playerStateRef={playerStateRef}
-      src={src}
-      makeMethodMessage={makeMethodMessage}
-      makeFullscreenMessage={makeFullscreenMessage}
-      onMessage={onMessage}
-      origin={JWPLAYER_ORIGIN}
-      controls
-      {...rest}
-    />
-  );
-}
-
-const BentoJwplayer = forwardRef(BentoJwplayerWithRef);
-BentoJwplayer.displayName = 'BentoJwPlayer'; // Make findable for tests.
-export {BentoJwplayer};
-
-/**
- * Makes message to handle different media methods
- * @param {string} apiMethod
- * @param {*} options
- * @return {string} message to post to video iframe
- */
-function makeMessage(apiMethod, options) {
-  let jwplayerMethod, optParams;
-  switch (apiMethod) {
-    case 'play': {
-      const {autoplay} = options;
-      if (autoplay) {
-        optParams = true;
-      }
-      jwplayerMethod = 'play';
-      break;
-    }
-    case 'pause': {
-      jwplayerMethod = 'pause';
-      break;
-    }
-    case 'mute': {
-      jwplayerMethod = 'setMute';
-      optParams = true;
-      break;
-    }
-    case 'unmute': {
-      jwplayerMethod = 'setMute';
-      optParams = false;
-      break;
-    }
-    case 'showControls': {
-      jwplayerMethod = 'setControls';
-      optParams = true;
-      break;
-    }
-    case 'hideControls': {
-      jwplayerMethod = 'setControls';
-      optParams = false;
-      break;
-    }
-  }
-  const message = {method: jwplayerMethod, optParams};
-  return JSON.stringify(message);
-}
-
-/**
- *
- * @param {Oject} event
- * @param {{adCustParams: string, adMacros: Object, config: Object, onLoad: OnLoadCb, onPlayingState: OnPlayingStateCb, playerStateRef: {current: Object}}} options
- */
-function onMessage_(event, options) {
-  const {currentTarget, data: messageData} = event;
-  const {
-    adCustParams,
-    adMacros,
-    config,
-    onLoad,
-    onPlayingState,
-    playerStateRef,
-  } = options;
-  if (!isJsonOrObj(messageData)) {
-    return;
-  }
-
-  const data = objOrParseJson(messageData);
-  const {detail: eventDetail, event: eventType} = data;
-
-  if (eventType === 'setup') {
-    onSetup(currentTarget, config, adCustParams, adMacros);
-    return;
-  }
-
-  if (eventType === 'ready' && eventDetail) {
-    onReady(currentTarget, eventDetail, onLoad);
-    return;
-  }
-
-  /** update playing state */
-  switch (eventType) {
-    case 'play':
-    case 'adPlay': {
-      onPlayingState?.(true);
-      break;
-    }
-    case 'pause':
-    case 'complete': {
-      onPlayingState?.(false);
-      break;
-    }
-  }
-
-  /**
-   * sync player state to propagate values to videowrapper handle
-   */
-  if (eventDetail.currentTime) {
-    playerStateRef.current.currentTime = eventDetail.currentTime;
-  }
-  if (eventDetail.duration) {
-    playerStateRef.current.duration = eventDetail.duration;
-  }
-
-  /** redispatch jwplayer events */
-  if (eventType in JwplayerToDom) {
-    dispatchCustomEvent(currentTarget, JwplayerToDom[eventType]);
-  }
-}
-
-/**
- * @param {HTMLIFrameElement} iframe
- * @param {{json: string}} config
- * @param {string} adCustParamsJson
- * @param {Object} adMacros
- */
-function onSetup(iframe, config, adCustParamsJson, adMacros) {
-  /** get all data-config-* */
-  const {json: jsonConfig, ...restConfig} = config || {};
-  const config_ = {
-    ...(tryParseJson(jsonConfig) || {}),
-    ...restConfig,
-  };
-
-  /** get data-ad-macro-* */
-  if (adMacros && Object.keys(adMacros).length !== 0) {
-    config_.adMacros = adMacros;
-  }
-
-  /** get data-ad-cust-params as json */
-  if (adCustParamsJson) {
-    config_.adCustParams = tryParseJson(adCustParamsJson);
-  }
-
-  postCommandMessage(iframe, 'setupConfig', config_);
-}
-
-/**
- * @param {Object} currentTarget
- * @param {{muted: boolean, playlistItem: Object}} readyOptions
- * @param {OnLoadCallback} onLoad
- */
-function onReady(currentTarget, readyOptions, onLoad) {
-  const {muted} = readyOptions;
-  dispatchCustomEvent(currentTarget, 'canplay');
-  onLoad?.();
-  if (muted) {
-    dispatchCustomEvent(currentTarget, 'muted');
-  }
-  dispatchCustomEvent(currentTarget, 'load');
-}
-
-/**
- * @param {HTMLIFrameElement} iframe
- * @param {string} method
- * @param {*} [optParams]
- * @private
- */
-function postCommandMessage(iframe, method, optParams) {
-  if (!iframe || !iframe.contentWindow) {
-    return;
-  }
-
-  iframe.contentWindow./*OK*/ postMessage(
-    JSON.stringify(
-      dict({
-        'method': method,
-        'optParams': optParams,
-      })
-    ),
-    '*'
-  );
-}
-
-/**
- * @param {!BentoJwplayerDef.Props} props
- * @return {boolean}
- */
-function checkProps(props) {
-  const {mediaId, playerId, playlistId} = props;
-  const requiredProps = playerId && (mediaId || playlistId);
-  if (!requiredProps) {
-    console /*OK*/
-      .warn(
-        'playerId and one of: mediaId or playlistId are required for <Jwplayer>'
-      );
-
-    return false;
-  }
-
-  return true;
-}
diff --git a/extensions/amp-jwplayer/1.0/example/index.html b/extensions/amp-jwplayer/1.0/example/index.html
new file mode 100644
index 000000000000..ab9ea77f8aa0
--- /dev/null
+++ b/extensions/amp-jwplayer/1.0/example/index.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width" />
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      src="https://cdn.ampproject.org/v0/bento-jwplayer-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-jwplayer-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-jwplayer-1.0.css"
+    />
+    <style>
+      body {
+        background: #ecf1f3;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-jwplayer
+      id="jwplayer"
+      data-player-id="BjcwyK37"
+      data-media-id="CtaIzmFs"
+      style="width: 480px; height: 270px"
+    ></bento-jwplayer>
+  </body>
+</html>
diff --git a/extensions/amp-jwplayer/1.0/storybook/Basic.js b/extensions/amp-jwplayer/1.0/storybook/Basic.js
deleted file mode 100644
index c986040ca164..000000000000
--- a/extensions/amp-jwplayer/1.0/storybook/Basic.js
+++ /dev/null
@@ -1,232 +0,0 @@
-import * as Preact from '#preact';
-import {useRef} from '#preact';
-
-import {BentoJwplayer} from '../component';
-
-export default {
-  title: 'Jwplayer',
-  component: BentoJwplayer,
-  args: {},
-};
-
-export const Default = (args) => {
-  return (
-    <>
-      <h3>Player & Media IDs</h3>
-      <BentoJwplayer
-        playerId={'uoIbMPm3'}
-        mediaId={'BZ6tc0gy'}
-        style={{width: 480, height: 270}}
-        {...args}
-      ></BentoJwplayer>
-
-      <h3>Player & Playlist IDs</h3>
-      <BentoJwplayer
-        playerId={'uoIbMPm3'}
-        playlistId={'482jsTAr'}
-        style={{width: 480, height: 270}}
-        {...args}
-      ></BentoJwplayer>
-    </>
-  );
-};
-export const WithApi = (args) => {
-  const ref = useRef();
-
-  return (
-    <>
-      <h3>Programmatic control</h3>
-      <BentoJwplayer
-        ref={ref}
-        mediaId={'CtaIzmFs'}
-        playerId={'BjcwyK37'}
-        style={{width: 480, height: 270}}
-        {...args}
-      ></BentoJwplayer>
-      <button onClick={() => ref.current?.pause()}>pause</button>
-      <button onClick={() => ref.current?.play()}>play</button>
-      <button onClick={() => ref.current?.mute()}>mute</button>
-      <button onClick={() => ref.current?.unmute()}>unmute</button>
-      <button onClick={() => ref.current?.requestFullscreen()}>FS</button>
-    </>
-  );
-};
-
-export const WithContextual = (args) => {
-  return (
-    <>
-      <h3>Contextual</h3>
-      <BentoJwplayer
-        playerId={'BjcwyK37'}
-        mediaId={'CtaIzmFs'}
-        contentSearch={'contentSearchVal'}
-        contentBackfill={'true'}
-        contentRecency={'9D'}
-        style={{width: 480, height: 270}}
-        {...args}
-      ></BentoJwplayer>
-    </>
-  );
-};
-
-export const WithAds = (args) => {
-  return (
-    <>
-      <h3>IMA Ad</h3>
-      <BentoJwplayer
-        mediaId={'3h8NHAIV'}
-        playerId={'n6vw37Z7'}
-        {...args}
-        style={{width: 480, height: 270}}
-      ></BentoJwplayer>
-
-      <h3>VAST Ad</h3>
-      <BentoJwplayer
-        mediaId={'NsdRZqng'}
-        playerId={'WmASC9FK'}
-        {...args}
-        style={{width: 480, height: 270}}
-      ></BentoJwplayer>
-    </>
-  );
-};
-
-export const WithConfig = (args) => {
-  return (
-    <>
-      <h3>Custom Skin</h3>
-      <BentoJwplayer
-        mediaId={'CtaIzmFs'}
-        playerId={'BjcwyK37'}
-        config={{
-          skinUrl: 'https://playertest.longtailvideo.com/skins/ethan.css',
-        }}
-        style={{width: 640, height: 360}}
-        {...args}
-      ></BentoJwplayer>
-
-      <h3>Custom Plugin</h3>
-      <BentoJwplayer
-        mediaId={'CtaIzmFs'}
-        playerId={'BjcwyK37'}
-        config={{
-          pluginUrl:
-            'https://playertest.longtailvideo.com/plugins/newsticker.js',
-        }}
-        style={{width: 640, height: 360}}
-        {...args}
-      ></BentoJwplayer>
-
-      <h3>Custom JSON Ad Config</h3>
-      <BentoJwplayer
-        mediaId={'NsdRZqng'}
-        playerId={'WmASC9FK'}
-        config={{
-          json: JSON.stringify({
-            advertising: {
-              client: 'vast',
-              schedule: [
-                {
-                  tag: 'http://playertest.longtailvideo.com/pre.xml',
-                  offset: 'pre',
-                },
-                {
-                  tag: 'http://playertest.longtailvideo.com/mid.xml',
-                  offset: '5',
-                },
-                {
-                  tag: 'http://playertest.longtailvideo.com/post.xml',
-                  offset: 'post',
-                },
-              ],
-            },
-          }),
-        }}
-        style={{width: 640, height: 360}}
-        {...args}
-      ></BentoJwplayer>
-
-      <h3>Custom JSON Config</h3>
-      <BentoJwplayer
-        mediaId={'CtaIzmFs'}
-        playerId={'BjcwyK37'}
-        config={{
-          json: JSON.stringify({
-            playbackRateControls: true,
-            displaytitle: false,
-            horizontalVolumeSlider: true,
-          }),
-        }}
-        style={{width: 640, height: 360}}
-        {...args}
-      ></BentoJwplayer>
-
-      <h3>Custom IMA Ad Params</h3>
-      <BentoJwplayer
-        mediaId={'BZ6tc0gy'}
-        playerId={'4MCKXmfU'}
-        adCustParams={JSON.stringify({
-          key1: 'value1',
-          keyTest: 'value2',
-        })}
-        style={{width: 640, height: 360}}
-        {...args}
-      ></BentoJwplayer>
-
-      <h3>Custom VAST Ad Params</h3>
-      <BentoJwplayer
-        mediaId={'NsdRZqng'}
-        playerId={'WmASC9FK'}
-        adCustParams={JSON.stringify({key1: 'value1', keyTest: 'value2'})}
-        style={{width: 480, height: 270}}
-        {...args}
-      ></BentoJwplayer>
-
-      <h3>Custom VAST Ad Macros</h3>
-      <BentoJwplayer
-        mediaId={'CtaIzmFs'}
-        playerId={'BjcwyK37'}
-        adMacros={{
-          itemTest: 'val',
-          itemParamList: 'one,two,three',
-        }}
-        config={{
-          json: JSON.stringify({
-            advertising: {
-              client: 'vast',
-              schedule: [
-                {
-                  tag: 'http://playertest.longtailvideo.com/pre.xml?domain=__domain__&test=__item-test__&param=__item-param-list__',
-                  offset: 'pre',
-                },
-              ],
-            },
-          }),
-        }}
-        style={{width: 480, height: 270}}
-        {...args}
-      ></BentoJwplayer>
-    </>
-  );
-};
-
-export const WithQueryParams = (args) => {
-  return (
-    <>
-      <h3>Query String and Data Params</h3>
-      <BentoJwplayer
-        mediaId={'BZ6tc0gy'}
-        playerId={'uoIbMPm3'}
-        queryParams={{
-          language: 'de',
-          customAdData: 'key:value;key2:value2',
-          name1: 'abc',
-          name2: 'xyz',
-          name3: '123',
-        }}
-        style={{width: 480, height: 270}}
-        {...args}
-      ></BentoJwplayer>
-    </>
-  );
-};
diff --git a/extensions/amp-jwplayer/1.0/test/test-amp-jwplayer.js b/extensions/amp-jwplayer/1.0/test/test-amp-jwplayer.js
index ce3c9d160ff1..340e28531a5a 100644
--- a/extensions/amp-jwplayer/1.0/test/test-amp-jwplayer.js
+++ b/extensions/amp-jwplayer/1.0/test/test-amp-jwplayer.js
@@ -95,6 +95,34 @@ describes.realWin(
       );
     });
 
+    it('should pass the loading attribute to the underlying iframe', async () => {
+      const attrs = {
+        'data-media-id': 'BZ6tc0gy',
+        'data-player-id': 'uoIbMPm3',
+        'data-playlist-id': '482jsTAr',
+        'data-loading': 'lazy',
+      };
+
+      const element = await mountComp(env.win.document, attrs);
+
+      expect(
+        element.shadowRoot.querySelector('iframe').getAttribute('loading')
+      ).to.equal('lazy');
+    });
+
+    it('should set data-loading="auto" if no value is specified', async () => {
+      const attrs = {
+        'data-media-id': 'BZ6tc0gy',
+        'data-player-id': 'uoIbMPm3',
+      };
+
+      const element = await mountComp(env.win.document, attrs);
+
+      expect(
+        element.shadowRoot.querySelector('iframe').getAttribute('loading')
+      ).to.equal('auto');
+    });
+
     describe('contextual search', () => {
       it('should get search val from meta tag', async () => {
         const metaTitle = 'mockTitle1';
diff --git a/extensions/amp-jwplayer/1.0/test/test-component.js b/extensions/amp-jwplayer/1.0/test/test-component.js
deleted file mode 100644
index 6f8035021896..000000000000
--- a/extensions/amp-jwplayer/1.0/test/test-component.js
+++ /dev/null
@@ -1,135 +0,0 @@
-import {mount} from 'enzyme';
-
-import * as Preact from '#preact';
-
-import {BentoJwplayer} from '../component';
-
-function mountComp(props) {
-  return mount(<BentoJwplayer {...props}></BentoJwplayer>);
-}
-
-describes.sandboxed('BentoJwplayer preact component v1.0', {}, () => {
-  it('should render', () => {
-    const mediaId = 'BZ6tc0gy';
-    const playerId = 'uoIbMPm3';
-    const wrapper = mountComp({mediaId, playerId});
-    const iframeEl = wrapper.find('iframe');
-    expect(iframeEl).to.not.be.null;
-    expect(iframeEl.prop('src')).to.equal(
-      `https://content.jwplatform.com/players/${mediaId}-${playerId}.html?backfill=true&isAMP=true`
-    );
-  });
-  it("should not render if props aren't valid", () => {
-    const wrapper = mountComp({});
-    expect(wrapper.getDOMNode()).to.be.null;
-    const wrapper2 = mountComp({player: 'playerId'});
-    expect(wrapper2.getDOMNode()).to.be.null;
-  });
-  describe('makeJwplayerIframeSrc', () => {
-    it('should prefer playlistId to mediaId', () => {
-      const mediaId = 'BZ6tc0gy';
-      const playerId = 'uoIbMPm3';
-      const playlistId = '482jsTAr';
-      const wrapper = mountComp({mediaId, playlistId, playerId});
-      const iframeEl = wrapper.find('iframe');
-      expect(iframeEl).to.not.be.null;
-      expect(iframeEl.prop('src')).to.equal(
-        `https://content.jwplatform.com/players/${playlistId}-${playerId}.html?backfill=true&isAMP=true`
-      );
-    });
-    it('should handle "outstream" cid', () => {
-      const mediaId = 'outstream';
-      const cid = 'oi7pAMI1';
-      const playerId = 'uoIbMPm3';
-      const wrapper = mountComp({mediaId, playerId});
-      const iframeEl = wrapper.find('iframe');
-      expect(iframeEl).to.not.be.null;
-      expect(iframeEl.prop('src')).to.equal(
-        `https://content.jwplatform.com/players/${cid}-${playerId}.html?backfill=true&isAMP=true`
-      );
-    });
-    it('shoud append all query params', () => {
-      const props = {
-        mediaId: 'BZ6tc0gy',
-        playerId: 'uoIbMPm3',
-        playlistId: '482jsTAr',
-        contentSearch: 'search val',
-        contentRecency: 'search rec',
-        contentBackfill: false,
-        consentParams: {
-          policyState: 'state',
-          policyInfo: 'info',
-          policyMetadata: {gdprApplies: true},
-        },
-        queryParams: {
-          language: 'de',
-          customAdData: 'key:value;key2:value2',
-          name1: 'abc',
-          name2: 'xyz',
-          name3: '123',
-        },
-      };
-      const wrapper = mountComp(props);
-      const iframeEl = wrapper.find('iframe');
-      expect(iframeEl).to.not.be.null;
-      expect(iframeEl.prop('src')).to.equal(
-        `https://content.jwplatform.com/players/${props.playlistId}-${props.playerId}.html?language=de&customAdData=key%3Avalue%3Bkey2%3Avalue2&name1=abc&name2=xyz&name3=123&search=search%20val&recency=search%20rec&isAMP=true&consentState=state&consentValue=info&consentGdpr=true`
-      );
-    });
-  });
-  // describe('onMessage', () => {
-  //   it('should handle setup', async () => {
-  //     const props = {
-  //       mediaId: 'BZ6tc0gy',
-  //       playerId: 'uoIbMPm3',
-  //       config: {
-  //         json: JSON.stringify({
-  //           playbackRateControls: true,
-  //           displaytitle: false,
-  //           horizontalVolumeSlider: true,
-  //         }),
-  //         skinUrl: 'https://playertest.longtailvideo.com/skins/ethan.css',
-  //         pluginUrl:
-  //           'https://playertest.longtailvideo.com/plugins/newsticker.js',
-  //       },
-  //       adMacros: {
-  //         itemTest: 'val',
-  //         itemParamList: 'one,two,three',
-  //       },
-  //       adCustParams: JSON.stringify({key1: 'value1', keyTest: 'value2'}),
-  //     };
-  //     const wrapper = mountComp(props);
-
-  //     const prom = new Promise((res) => {
-  //       wrapper
-  //         .find('iframe')
-  //         .getDOMNode()
-  //         .addEventListener('message', (e) => {
-  //           res(JSON.parse(e.data));
-  //         });
-  //     });
-  //     triggerEvent(wrapper, 'setup');
-  //     const {method, optParams} = await prom;
-  //     expect(method).to.equal('setupConfig');
-  //     expect(optParams).to.deep.equal({
-  //       playbackRateControls: true,
-  //       displaytitle: false,
-  //       horizontalVolumeSlider: true,
-  //       skinUrl: 'https://playertest.longtailvideo.com/skins/ethan.css',
-  //       pluginUrl: 'https://playertest.longtailvideo.com/plugins/newsticker.js',
-  //       adMacros: {
-  //         itemTest: 'val',
-  //         itemParamList: 'one,two,three',
-  //       },
-  //       adCustParams: {key1: 'value1', keyTest: 'value2'},
-  //     });
-  //   });
-  //   it('should handle ready', () => {});
-  //   it('should handle play', () => {});
-  //   it('should handle adPlay', () => {});
-  //   it('should handle pause', () => {});
-  //   it('should handle complete', () => {});
-  //   it('should synchronize playerState handle');
-  //   it('should redispatch jwplayer events');
-  // });
-});
diff --git a/extensions/amp-kaltura-player/0.1/amp-kaltura-player.js b/extensions/amp-kaltura-player/0.1/amp-kaltura-player.js
index 5e5b63c741e0..efc74899a215 100644
--- a/extensions/amp-kaltura-player/0.1/amp-kaltura-player.js
+++ b/extensions/amp-kaltura-player/0.1/amp-kaltura-player.js
@@ -2,7 +2,6 @@ import {getDataParamsFromAttributes} from '#core/dom';
 import {applyFillContent, isLayoutSizeDefined} from '#core/dom/layout';
 import {propagateAttributes} from '#core/dom/propagate-attributes';
 import {PauseHelper} from '#core/dom/video/pause-helper';
-import {dict} from '#core/types/object';
 
 import {Services} from '#service';
 
@@ -147,12 +146,10 @@ class AmpKaltura extends AMP.BaseElement {
   pauseCallback() {
     if (this.iframe_ && this.iframe_.contentWindow) {
       this.iframe_.contentWindow./*OK*/ postMessage(
-        JSON.stringify(
-          dict({
-            'method': 'pause',
-            'value': '',
-          })
-        ),
+        JSON.stringify({
+          'method': 'pause',
+          'value': '',
+        }),
         '*'
       );
     }
diff --git a/extensions/amp-lightbox-gallery/0.1/amp-lightbox-gallery.js b/extensions/amp-lightbox-gallery/0.1/amp-lightbox-gallery.js
index 8f29559ee83d..5d521d120279 100644
--- a/extensions/amp-lightbox-gallery/0.1/amp-lightbox-gallery.js
+++ b/extensions/amp-lightbox-gallery/0.1/amp-lightbox-gallery.js
@@ -1,7 +1,7 @@
 import {prepareImageAnimation} from '@ampproject/animations';
 
-import {CommonSignals} from '#core/constants/common-signals';
-import {Keys} from '#core/constants/key-codes';
+import {CommonSignals_Enum} from '#core/constants/common-signals';
+import {Keys_Enum} from '#core/constants/key-codes';
 import {getVerticalScrollbarWidth, toggleAttribute} from '#core/dom';
 import {escapeCssSelectorIdent} from '#core/dom/css-selectors';
 import {
@@ -62,7 +62,7 @@ const LightboxControlsModes = {
   CONTROLS_HIDDEN: 0,
 };
 
-// Use S Curves for entry and exit animations
+// Use S Curves_Enum for entry and exit animations
 const TRANSITION_CURVE = {x1: 0.8, y1: 0, x2: 0.2, y2: 1};
 
 // Keep in sync with [i-amphtml-lbg-fade]'s animation duration
@@ -122,7 +122,7 @@ export class AmpLightboxGallery extends AMP.BaseElement {
     /** @private {?../../../src/service/action-impl.ActionService} */
     this.action_ = null;
 
-    /** @private {!Object<string,!Array<!LightboxElementMetadataDef>>} */
+    /** @private {!{[key: string]: !Array<!LightboxElementMetadataDef}>} */
     this.elementsMetadata_ = {
       default: [],
     };
@@ -761,7 +761,7 @@ export class AmpLightboxGallery extends AMP.BaseElement {
         this.setupGestures_();
         this.setupEventListeners_();
 
-        return this.carousel_.signals().whenSignal(CommonSignals.LOAD_END);
+        return this.carousel_.signals().whenSignal(CommonSignals_Enum.LOAD_END);
       })
       .then(() => this.openLightboxForElement_(element, expandDescription))
       .then(() => {
@@ -1026,7 +1026,7 @@ export class AmpLightboxGallery extends AMP.BaseElement {
 
     return this.getCurrentElement_()
       .imageViewer.signals()
-      .whenSignal(CommonSignals.LOAD_END)
+      .whenSignal(CommonSignals_Enum.LOAD_END)
       .then(() => this.transitionImgIn_(sourceElement));
   }
 
@@ -1179,13 +1179,13 @@ export class AmpLightboxGallery extends AMP.BaseElement {
     }
     const {key} = event;
     switch (key) {
-      case Keys.ESCAPE:
+      case Keys_Enum.ESCAPE:
         this.close_();
         break;
-      case Keys.LEFT_ARROW:
+      case Keys_Enum.LEFT_ARROW:
         this.maybeSlideCarousel_(/*direction*/ -1);
         break;
-      case Keys.RIGHT_ARROW:
+      case Keys_Enum.RIGHT_ARROW:
         this.maybeSlideCarousel_(/*direction*/ 1);
         break;
       default:
diff --git a/extensions/amp-lightbox-gallery/0.1/lightbox-controls.js b/extensions/amp-lightbox-gallery/0.1/lightbox-controls.js
index 6940decef8e6..e5328b05a201 100644
--- a/extensions/amp-lightbox-gallery/0.1/lightbox-controls.js
+++ b/extensions/amp-lightbox-gallery/0.1/lightbox-controls.js
@@ -1,6 +1,5 @@
 import {htmlFor} from '#core/dom/static-template';
 import {toArray} from '#core/types/array';
-import {dict} from '#core/types/object';
 
 import {Services} from '#service';
 
@@ -121,13 +120,9 @@ export class LightboxControls {
     }
 
     this.element_.dispatchEvent(
-      createCustomEvent(
-        this.win_,
-        'action',
-        dict({
-          'action': action,
-        })
-      )
+      createCustomEvent(this.win_, 'action', {
+        'action': action,
+      })
     );
     event.stopPropagation();
     event.preventDefault();
diff --git a/extensions/amp-lightbox-gallery/0.1/service/lightbox-manager-impl.js b/extensions/amp-lightbox-gallery/0.1/service/lightbox-manager-impl.js
index dd870b3ec507..b0a48b2ddc91 100644
--- a/extensions/amp-lightbox-gallery/0.1/service/lightbox-manager-impl.js
+++ b/extensions/amp-lightbox-gallery/0.1/service/lightbox-manager-impl.js
@@ -1,6 +1,5 @@
-import {AmpEvents} from '#core/constants/amp-events';
-import {CommonSignals} from '#core/constants/common-signals';
-import {iterateCursor} from '#core/dom';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
+import {CommonSignals_Enum} from '#core/constants/common-signals';
 import {
   childElement,
   childElementByAttr,
@@ -93,7 +92,7 @@ export class LightboxManager {
 
     /**
      * Ordered lists of lightboxable elements according to group
-     * @private {!Object<string, !Array<!Element>>}
+     * @private {!{[key: string]: !Array<!Element>}}
      */
     this.lightboxGroups_ = map({
       default: [],
@@ -128,7 +127,7 @@ export class LightboxManager {
     const root = this.ampdoc_.getRootNode();
 
     // Rescan whenever DOM changes happen.
-    root.addEventListener(AmpEvents.DOM_UPDATE, () => {
+    root.addEventListener(AmpEvents_Enum.DOM_UPDATE, () => {
       this.scanPromise_ = this.scanLightboxables_();
     });
 
@@ -153,7 +152,7 @@ export class LightboxManager {
         .getRootNode()
         .querySelectorAll('[lightbox],[data-lightbox]');
       const processLightboxElement = this.processLightboxElement_.bind(this);
-      iterateCursor(matches, processLightboxElement);
+      matches.forEach(processLightboxElement);
     });
   }
 
@@ -289,7 +288,7 @@ export class LightboxManager {
   getSlidesFromCarousel_(element) {
     return element
       .signals()
-      .whenSignal(CommonSignals.LOAD_END)
+      .whenSignal(CommonSignals_Enum.LOAD_END)
       .then(() => {
         return toArray(element./*OK*/ querySelectorAll(SLIDE_SELECTOR));
       });
diff --git a/extensions/amp-lightbox-gallery/0.1/test-e2e/test-open-close.js b/extensions/amp-lightbox-gallery/0.1/test-e2e/test-open-close.js
index 9989a75d603f..6abb6d682b52 100644
--- a/extensions/amp-lightbox-gallery/0.1/test-e2e/test-open-close.js
+++ b/extensions/amp-lightbox-gallery/0.1/test-e2e/test-open-close.js
@@ -26,8 +26,7 @@ describes.endtoend(
 
     // TODO(sparhami) Cover swipe to dismiss if possible.
     // TODO(sparhami) Test basic transition to gallery and back.
-    // TODO(#28948) fix this flaky test.
-    it.skip('should open/close lightbox', async () => {
+    it('should open/close lightbox', async () => {
       // First open the gallery.
       const firstAmpImg = await controller.findElement('amp-img');
       await controller.click(firstAmpImg);
diff --git a/extensions/amp-lightbox-gallery/0.1/test/test-amp-lightbox-gallery.js b/extensions/amp-lightbox-gallery/0.1/test/test-amp-lightbox-gallery.js
index 8d68d43ad666..858373fb2838 100644
--- a/extensions/amp-lightbox-gallery/0.1/test/test-amp-lightbox-gallery.js
+++ b/extensions/amp-lightbox-gallery/0.1/test/test-amp-lightbox-gallery.js
@@ -1,3 +1,7 @@
+import {AmpCarousel as AmpBaseCarousel} from 'extensions/amp-base-carousel/0.1/amp-base-carousel';
+import {AmpScrollableCarousel} from 'extensions/amp-carousel/0.1/scrollable-carousel';
+import {AmpSlideScroll} from 'extensions/amp-carousel/0.1/slidescroll';
+
 import {installLightboxGallery} from '../amp-lightbox-gallery';
 
 const TAG = 'amp-lightbox-gallery';
@@ -32,6 +36,19 @@ describes.realWin(
           done();
         });
       });
+
+      it('carousels must have expected functions on their prototype', () => {
+        function assertHasFunctions(klass) {
+          expect(klass.prototype.interactionNext).ok;
+          expect(klass.prototype.interactionPrev).ok;
+          expect(klass.prototype.goToSlide).ok;
+          expect(klass.prototype.goCallback).ok;
+        }
+
+        assertHasFunctions(AmpScrollableCarousel);
+        assertHasFunctions(AmpSlideScroll);
+        assertHasFunctions(AmpBaseCarousel);
+      });
     });
   }
 );
diff --git a/extensions/amp-lightbox-gallery/1.0/README.md b/extensions/amp-lightbox-gallery/1.0/README.md
index cc4b6c89d404..541ff1bbf4af 100644
--- a/extensions/amp-lightbox-gallery/1.0/README.md
+++ b/extensions/amp-lightbox-gallery/1.0/README.md
@@ -8,9 +8,7 @@ When the user interacts with the element, a modal expands to fill the viewport u
 
 You must include each Bento component's required CSS library to guarantee proper loading and before adding custom styles. As a web component
 
-The examples below demonstrate use of the `<bento-lightbox-gallery>` web component.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/lightbox-gallery
@@ -21,60 +19,68 @@ import {defineElement as defineBentoLightboxGallery} from '@bentoproject/lightbo
 defineBentoLightboxGallery();
 ```
 
-### Example: Import via `<script>`
+### Import via `<script>`
 
 ```html
-<head>
-  <script src="https://cdn.ampproject.org/bento.js"></script>
-  <!-- These styles prevent Cumulative Layout Shift on the unupgraded custom element -->
-  <style>
-    bento-lightbox-gallery[hidden] {
-      display: none !important;
-    }
-  </style>
-  <script
-    async
-    src="https://cdn.ampproject.org/v0/bento-lightbox-gallery-1.0.js"
-  ></script>
-</head>
+<script type="module" async src="https://cdn.ampproject.org/bento.mjs"></script>
+<script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+<link rel="stylesheet" type="text/css" href="https://cdn.ampproject.org/v0/bento-lightbox-gallery-1.0.css"
+>
+<script type="module" async src="https://cdn.ampproject.org/v0/bento-lightbox-gallery-1.0.mjs"></script>
+<script nomodule async src="https://cdn.ampproject.org/v0/bento-lightbox-gallery-1.0.js"></script>
+```
 
-<figure>
-  <img
-    id="my-img"
-    width="360"
-    height="240"
-    src="https://images.unsplash.com/photo-1583511655857-d19b40a7a54e?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=1498&q=80"
-    lightbox
-  />
-  <figcaption>dog wearing yellow shirt.</figcaption>
-</figure>
-<div class="buttons" style="margin-top: 8px">
-  <button id="change-img">change image</button>
-</div>
-
-<script>
-  (async () => {
-    const img = document.queryselector('#my-img');
-    await customelements.whendefined('img');
-    // set up button actions
-    document.queryselector('#change-img').onclick = () => {
-      img.setattribute(
-        'src',
-        'https://images.unsplash.com/photo-1603123853880-a92fafb7809f?ixlib=rb-1.2.1&auto=format&fit=crop&w=1498&q=80'
-      );
-    };
-  })();
-</script>
+### Example
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-lightbox-gallery-1.0.css"
+    />
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-lightbox-gallery-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-lightbox-gallery-1.0.js"
+    ></script>
+  </head>
+  <body>
+    <bento-lightbox-gallery></bento-lightbox-gallery>
+    <figure>
+      <img id="my-img" src="img1.jpwg" lightbox />
+      <figcaption>dog wearing yellow shirt.</figcaption>
+    </figure>
+    <figure>
+      <img src="img2.jpeg" lightbox/>
+    </figure>
+    <figure>
+      <img src="img2.jpeg" lightbox/>
+    </figure>
+  </body>
+</html>
 ```
 
-To use `bento-liightbox-gallery`, ensure the required script is included in your `<head>` section,
-then add the `lightbox` attribute on an `<img>` or `<bento-carousel>` element.
+To use `bento-liightbox-gallery`, ensure the required script is included in your `<head>` section, then add the `lightbox` attribute on an `<img>` or `<bento-carousel>` element.
 
 ### Add Captions
 
-Optionally, you can specify a caption for each element in the lightbox. these
-fields are automatically read and displayed by the `<bento-lightbox-gallery>` in
-the following order of priority:
+Optionally, you can specify a caption for each element in the lightbox. these fields are automatically read and displayed by the `<bento-lightbox-gallery>` in the following order of priority:
 
 -   `figcaption` (if the lightboxed element is the child of a figure)
 -   `aria-describedby`
@@ -82,8 +88,7 @@ the following order of priority:
 -   `aria-label`
 -   `aria-labelledby`
 
-In the following example, `<bento-lightbox-gallery>` displays the `figcaption`
-value as its description, showing "toront's cn tower was ....".
+In the following example, `<bento-lightbox-gallery>` displays the `figcaption` value as its description, showing "toront's cn tower was ....".
 
 ```html
 <figure>
@@ -91,9 +96,6 @@ value as its description, showing "toront's cn tower was ....".
     id="hero-img"
     lightbox="toronto"
     src="https://picsum.photos/1600/900?image=1075"
-    layout="responsive"
-    width="1600"
-    height="900"
     alt="picture of cn tower."
   />
   <figcaption class="image">
@@ -103,24 +105,20 @@ value as its description, showing "toront's cn tower was ....".
 </figure>
 ```
 
-In the following example, `<bento-lightbox-gallery>` displays the `alt` value as
-its description, showing "picture of cn tower".
+In the following example, `<bento-lightbox-gallery>` displays the `alt` value as its description, showing "picture of cn tower".
 
 ```html
 <img
   id="hero-img"
   lightbox="toronto"
   src="https://picsum.photos/1600/900?image=1075"
-  layout="responsive"
-  width="1600"
-  height="900"
   alt="picture of cn tower"
 />
 ```
 
 ## Interactivity and API usage
 
-Bento enabled components used as a standalone web component are highly interactive through their API. The `bento-lightbox-gallery` component API is accessible by including the following script tag in your document:
+Bento components are highly interactive through their API. The `bento-lightbox-gallery` component API is accessible by including the following script tag in your document:
 
 ```javascript
 await customElements.whenDefined('bento-lightbox-gallery');
@@ -139,6 +137,28 @@ Opens the lightbox gallery.
 api.open();
 ```
 
+You can open a specific lightbox gallery group to a specific slide by passing in extra arguments:
+
+```javascript
+api.open(1, 'toronto') // opens gallery with images in the "toronto" group to the 2nd image
+api.open(null, 'toronto') // opens gallery with images in the "toronto" group to the 1st image
+```
+
+### Attributes
+
+#### lightbox
+
+Set `lightbox` attribute to an id to assign different images to different groups. For example, in the example below, clicking any of the `group1` images will only show `img1.jpeg`, `img3.jpeg`, and `img5.jpeg` and clicking any of the `group2` images will only show `img2.jpeg`, `img4.jpeg`, `img6.jpeg`
+
+```html
+<img src="img1.jpeg" lightbox="group1">
+<img src="img2.jpeg" lightbox="group2">
+<img src="img3.jpeg" lightbox="group1">
+<img src="img4.jpeg" lightbox="group2">
+<img src="img5.jpeg" lightbox="group1">
+<img src="img6.jpeg" lightbox="group2">
+```
+
 ### Layout And Style
 
 Each bento component has a small css library you must include to guarantee proper loading without [content shifts](https://web.dev/cls/). Because of order-based specificity, you must manually ensure that stylesheets are included before any custom styles.
@@ -157,7 +177,7 @@ Each bento component has a small css library you must include to guarantee prope
 
 The preact/react version of the bentolightboxgallery functions differently than the web component version. The following example will demonstrate the use of `<BentoLightboxGallery>` as a functional component.
 
-### Example: Import Via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/lightbox-gallery
diff --git a/extensions/amp-lightbox-gallery/1.0/amp-lightbox-gallery.js b/extensions/amp-lightbox-gallery/1.0/amp-lightbox-gallery.js
index eb85009fd4cc..771bda9d2ec6 100644
--- a/extensions/amp-lightbox-gallery/1.0/amp-lightbox-gallery.js
+++ b/extensions/amp-lightbox-gallery/1.0/amp-lightbox-gallery.js
@@ -1,16 +1,21 @@
-import {ActionTrust, DEFAULT_ACTION} from '#core/constants/action-constants';
+import {BaseElement} from '#bento/components/bento-lightbox-gallery/1.0/base-element';
+
+import {
+  ActionTrust_Enum,
+  DEFAULT_ACTION,
+} from '#core/constants/action-constants';
 import {createElementWithAttributes} from '#core/dom';
 import {elementByTag} from '#core/dom/query';
 
 import {isExperimentOn} from '#experiments';
 
+import {AmpPreactBaseElement, setSuperClass} from '#preact/amp-base-element';
+
 import {Services} from '#service';
 
 import {triggerAnalyticsEvent} from '#utils/analytics';
 import {userAssert} from '#utils/log';
 
-import {BaseElement} from './base-element';
-
 import {CSS} from '../../../build/amp-lightbox-gallery-1.0.css';
 
 /** @const {string} */
@@ -19,7 +24,10 @@ const TAG = 'amp-lightbox-gallery';
 /** @const {string} */
 const DEFAULT_GALLERY_ID = 'amp-lightbox-gallery';
 
-class AmpLightboxGallery extends BaseElement {
+class AmpLightboxGallery extends setSuperClass(
+  BaseElement,
+  AmpPreactBaseElement
+) {
   /** @override */
   constructor(element) {
     super(element);
@@ -38,12 +46,12 @@ class AmpLightboxGallery extends BaseElement {
     this.registerApiAction(
       DEFAULT_ACTION,
       (api, invocation) => this.openAction(api, invocation),
-      ActionTrust.HIGH
+      ActionTrust_Enum.HIGH
     );
     this.registerApiAction(
       'open',
       (api, invocation) => this.openAction(api, invocation),
-      ActionTrust.HIGH
+      ActionTrust_Enum.HIGH
     );
     return super.init();
   }
diff --git a/extensions/amp-lightbox-gallery/1.0/base-element.js b/extensions/amp-lightbox-gallery/1.0/base-element.js
deleted file mode 100644
index cbd52983b8db..000000000000
--- a/extensions/amp-lightbox-gallery/1.0/base-element.js
+++ /dev/null
@@ -1,241 +0,0 @@
-import {toggleAttribute} from '#core/dom';
-import {
-  childElement,
-  closestAncestorElementBySelector,
-  elementByTag,
-} from '#core/dom/query';
-import {srcsetFromElement} from '#core/dom/srcset';
-import {toggle} from '#core/dom/style';
-import {toArray} from '#core/types/array';
-import {dict} from '#core/types/object';
-
-import * as Preact from '#preact';
-import {PreactBaseElement} from '#preact/base-element';
-
-import {
-  BentoLightboxGalleryProvider,
-  WithBentoLightboxGallery,
-} from './component';
-import {CSS as COMPONENT_CSS} from './component.jss';
-
-import {CSS as CAROUSEL_CSS} from '../../amp-base-carousel/1.0/component.jss';
-import {CSS as LIGHTBOX_CSS} from '../../amp-lightbox/1.0/component.jss';
-
-/** @const {!Array<string>} */
-const LIGHTBOX_ELIGIBLE_TAGS = ['AMP-IMG', 'IMG'];
-
-/** @const {!Array<string>} */
-const LIGHTBOX_ELIGIBLE_GROUP_SELECTORS = [
-  'AMP-BASE-CAROUSEL[lightbox]',
-  'AMP-STREAM-GALLERY[lightbox]',
-  'BENTO-BASE-CAROUSEL[lightbox]',
-  'BENTO-STREAM-GALLERY[lightbox]',
-];
-
-/** @const {string} */
-const LIGHTBOX_ATTR = 'lightbox';
-
-/** @const {string} */
-const DEFAULT_GROUP = 'default';
-
-/** @const {string} */
-const DEFAULT_CAROUSEL_PREFIX = 'carousel';
-
-/** @const {number} */
-let count = 0;
-
-export class BaseElement extends PreactBaseElement {
-  /** @param {!AmpElement} element */
-  constructor(element) {
-    super(element);
-
-    /** @private {boolean} */
-    this.open_ = false;
-  }
-
-  /** @override */
-  mountCallback() {
-    // There should only be one instance of `amp-lightbox-gallery` in a document.
-    if (count++) {
-      console /*OK */
-        .warn(
-          `${this.element.tagName} already exists in the document. Removing additional instance: ${this.element}`
-        );
-      this.element.parentNode?.removeChild(this.element);
-    }
-  }
-
-  /** @override */
-  init() {
-    const lightboxElements = getLightboxElements(
-      this.element.ownerDocument,
-      (opt_index, opt_group) => this.api().open(opt_index, opt_group)
-    );
-    return dict({
-      'onBeforeOpen': () => this.beforeOpen(),
-      'onAfterOpen': () => this.afterOpen(),
-      'onAfterClose': () => this.afterClose(),
-      'onViewGrid': () => this.onViewGrid(),
-      'onToggleCaption': () => this.onToggleCaption(),
-      'render': () => lightboxElements,
-    });
-  }
-
-  /** @override */
-  unmountCallback() {
-    count--;
-  }
-
-  /** @protected */
-  beforeOpen() {
-    this.open_ = true;
-    toggleAttribute(this.element, 'open', true);
-    toggle(this.element, true);
-  }
-
-  /** @protected */
-  afterOpen() {}
-
-  /** @protected */
-  afterClose() {
-    this.open_ = false;
-    toggleAttribute(this.element, 'open', false);
-    toggle(this.element, false);
-  }
-
-  /** @protected */
-  onViewGrid() {}
-
-  /** @protected */
-  onToggleCaption() {}
-
-  /** @override */
-  mutationObserverCallback() {
-    const open = this.element.hasAttribute('open');
-    if (open === this.open_) {
-      return;
-    }
-    this.open_ = open;
-    open ? this.api().open() : this.api().close();
-  }
-}
-
-/**
- * @param {!Document} document
- * @param {function(number)} open
- * @return {!Array<PreactDef.Renderable>}
- */
-function getLightboxElements(document, open) {
-  const lightboxElements = [];
-
-  // Process all standalone elements into a lightbox.
-  toArray(document.querySelectorAll(LIGHTBOX_ELIGIBLE_TAGS)).forEach(
-    (element) => {
-      if (element.hasAttribute(LIGHTBOX_ATTR)) {
-        lightboxElements.push(
-          processLightboxElement(DEFAULT_GROUP, document, element, open)
-        );
-      }
-    }
-  );
-
-  // Process all lightboxed carousel elements into separate lightbox groups.
-  toArray(document.querySelectorAll(LIGHTBOX_ELIGIBLE_GROUP_SELECTORS)).forEach(
-    (element, index) => {
-      const group =
-        element.getAttribute(LIGHTBOX_ATTR) || DEFAULT_CAROUSEL_PREFIX + index;
-      toArray(element.children).forEach((child, index) =>
-        lightboxElements.push(
-          processLightboxElement(group, document, child, open, index)
-        )
-      );
-    }
-  );
-
-  return lightboxElements;
-}
-
-/**
- * @param {string} defaultGroup
- * @param {!Document} document
- * @param {Element} element
- * @param {function(number)} open
- * @param {number} opt_index
- * @return {PreactDef.Renderable}
- */
-function processLightboxElement(
-  defaultGroup,
-  document,
-  element,
-  open,
-  opt_index
-) {
-  const group = element.getAttribute(LIGHTBOX_ATTR) || defaultGroup;
-  const img = isLightboxEligible(element)
-    ? element
-    : childElement(element, isLightboxEligible);
-  return (
-    <WithBentoLightboxGallery
-      group={group}
-      as="img"
-      caption={getDescriptionForElement(document, img)}
-      onMount={(index) => {
-        const onClick = () => open(opt_index ?? index, group);
-        element.addEventListener('click', onClick);
-        return () => {
-          element.removeEventListener('click', onClick);
-        };
-      }}
-      srcset={srcsetFromElement(img).stringify()}
-    />
-  );
-}
-
-/**
- * @param {Element} element
- * @return {boolean}
- */
-function isLightboxEligible(element) {
-  return LIGHTBOX_ELIGIBLE_TAGS.indexOf(element.tagName) !== -1;
-}
-
-/**
- * @param {!Document} document
- * @param {Element} element
- * @return {string}
- */
-function getDescriptionForElement(document, element) {
-  // If the element in question is the descendant of a figure element
-  // try using the figure caption as the lightbox description.
-  const figureParent = closestAncestorElementBySelector(element, 'figure');
-  if (figureParent) {
-    const figCaption = elementByTag(figureParent, 'figcaption');
-    if (figCaption) {
-      return figCaption./*OK*/ textContent;
-    }
-  }
-  const ariaDescribedBy = element.getAttribute('aria-describedby');
-  if (ariaDescribedBy) {
-    const descriptionElement = document.getElementById(ariaDescribedBy);
-    if (descriptionElement) {
-      return descriptionElement./*OK*/ textContent;
-    }
-  }
-  const ariaLabelledBy = element.getAttribute('aria-labelledby');
-  if (ariaLabelledBy) {
-    const descriptionElement = document.getElementById(ariaLabelledBy);
-    if (descriptionElement) {
-      return descriptionElement./*OK*/ innerText;
-    }
-  }
-  return element.getAttribute('alt') ?? element.getAttribute('aria-label');
-}
-
-/** @override */
-BaseElement['Component'] = BentoLightboxGalleryProvider;
-
-/** @override */
-BaseElement['usesShadowDom'] = true;
-
-/** @override */
-BaseElement['shadowCss'] = COMPONENT_CSS + LIGHTBOX_CSS + CAROUSEL_CSS;
diff --git a/extensions/amp-lightbox-gallery/1.0/example/index.html b/extensions/amp-lightbox-gallery/1.0/example/index.html
new file mode 100644
index 000000000000..d8edf113d1bc
--- /dev/null
+++ b/extensions/amp-lightbox-gallery/1.0/example/index.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <!-- These styles prevent Cumulative Layout Shift on the unupgraded custom element -->
+    <link
+      rel="stylesheet"
+      href="https://cdn.ampproject.org/v0/bento-lightbox-gallery-1.0.css"
+    />
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-lightbox-gallery-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-lightbox-gallery-1.0.js"
+    ></script>
+    <style>
+      .body {
+        font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
+          Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
+          'Segoe UI Symbol';
+        background: #ecf1f3;
+      }
+
+      .image-grid {
+        display: grid;
+        grid-template-columns: 50vw 50vw;
+        grid-gap: 10px;
+        margin: 2rem 0;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-lightbox-gallery></bento-lightbox-gallery>
+
+    <section class="image-grid">
+      <figure>
+        <img
+          width="160"
+          height="120"
+          src="https://picsum.photos/id/237/640/480"
+          lightbox
+        />
+        <figcaption>A random image</figcaption>
+      </figure>
+      <figure>
+        <img
+          width="160"
+          height="120"
+          src="https://picsum.photos/id/238/640/480"
+          lightbox
+        />
+        <figcaption>Another random image</figcaption>
+      </figure>
+      <figure>
+        <img
+          width="160"
+          height="120"
+          src="https://picsum.photos/id/239/640/480"
+          lightbox
+        />
+        <figcaption>And another random image</figcaption>
+      </figure>
+      <figure>
+        <img
+          width="160"
+          height="120"
+          src="https://picsum.photos/id/240/640/480"
+          lightbox
+        />
+        <figcaption>Aaaand another random image</figcaption>
+      </figure>
+    </section>
+  </body>
+</html>
diff --git a/extensions/amp-lightbox-gallery/1.0/storybook/Basic.amp.js b/extensions/amp-lightbox-gallery/1.0/storybook/Basic.amp.js
index c568e548b373..5e77bc13856d 100644
--- a/extensions/amp-lightbox-gallery/1.0/storybook/Basic.amp.js
+++ b/extensions/amp-lightbox-gallery/1.0/storybook/Basic.amp.js
@@ -1,11 +1,10 @@
 import {withAmp} from '@ampproject/storybook-addon';
-import {withKnobs} from '@storybook/addon-knobs';
 
 import * as Preact from '#preact';
 
 export default {
   title: 'amp-lightbox-gallery-1_0',
-  decorators: [withKnobs, withAmp],
+  decorators: [withAmp],
 
   parameters: {
     extensions: [
@@ -13,6 +12,7 @@ export default {
       {name: 'amp-stream-gallery', version: '1.0'},
       {name: 'amp-lightbox-gallery', version: '1.0'},
     ],
+    argTypes: {},
     experiments: ['bento'],
   },
 };
diff --git a/extensions/amp-lightbox-gallery/1.0/storybook/Basic.js b/extensions/amp-lightbox-gallery/1.0/storybook/Basic.js
index 67c1fa5ba022..daffefec57b8 100644
--- a/extensions/amp-lightbox-gallery/1.0/storybook/Basic.js
+++ b/extensions/amp-lightbox-gallery/1.0/storybook/Basic.js
@@ -1,17 +1,19 @@
-import {withKnobs} from '@storybook/addon-knobs';
-
-import * as Preact from '#preact';
-
-import {BentoBaseCarousel} from '../../../amp-base-carousel/1.0/component';
+import {BentoBaseCarousel} from '#bento/components/bento-base-carousel/1.0/component';
 import {
   BentoLightboxGalleryProvider,
   WithBentoLightboxGallery,
-} from '../component';
+} from '#bento/components/bento-lightbox-gallery/1.0/component';
+
+import * as Preact from '#preact';
+
+import '#bento/components/bento-lightbox-gallery/1.0/component.jss';
+
+import '#bento/components/bento-base-carousel/1.0/component.jss';
 
 export default {
   title: 'LightboxGallery',
   component: BentoLightboxGalleryProvider,
-  decorators: [withKnobs],
+  argTypes: {},
 };
 
 export const _default = () => {
diff --git a/extensions/amp-lightbox-gallery/1.0/test/test-amp-lightbox-gallery.js b/extensions/amp-lightbox-gallery/1.0/test/test-amp-lightbox-gallery.js
index b59b6b7175d0..df1e1338a081 100644
--- a/extensions/amp-lightbox-gallery/1.0/test/test-amp-lightbox-gallery.js
+++ b/extensions/amp-lightbox-gallery/1.0/test/test-amp-lightbox-gallery.js
@@ -1,5 +1,8 @@
 import '../amp-lightbox-gallery';
-import {ActionTrust, DEFAULT_ACTION} from '#core/constants/action-constants';
+import {
+  ActionTrust_Enum,
+  DEFAULT_ACTION,
+} from '#core/constants/action-constants';
 import {createElementWithAttributes} from '#core/dom';
 import {htmlFor} from '#core/dom/static-template';
 
@@ -42,7 +45,7 @@ describes.realWin(
       const source = null;
       const caller = null;
       const event = null;
-      const trust = ActionTrust.HIGH;
+      const trust = ActionTrust_Enum.HIGH;
       return new ActionInvocation(
         element,
         method,
diff --git a/extensions/amp-lightbox-gallery/1.0/test/test-component.js b/extensions/amp-lightbox-gallery/1.0/test/test-component.js
deleted file mode 100644
index 8dd714ca9ec1..000000000000
--- a/extensions/amp-lightbox-gallery/1.0/test/test-component.js
+++ /dev/null
@@ -1,1073 +0,0 @@
-import {mount} from 'enzyme';
-
-import * as Preact from '#preact';
-
-import {BentoBaseCarousel} from '../../../amp-base-carousel/1.0/component';
-import {
-  BentoLightboxGalleryProvider,
-  WithBentoLightboxGallery,
-} from '../component';
-import {useStyles} from '../component.jss';
-
-describes.sandboxed('BentoLightboxGallery preact component', {}, () => {
-  describe('BentoLightboxGalleryProvider with children', () => {
-    it('renders with WithBentoLightboxGallery', () => {
-      const wrapper = mount(
-        <BentoLightboxGalleryProvider>
-          <WithBentoLightboxGallery key="1" id="standard">
-            <img />
-          </WithBentoLightboxGallery>
-          <img key="2" id="no-lightbox" />
-          <div key="3">
-            <div>
-              <WithBentoLightboxGallery id="deeply-nested">
-                <img />
-              </WithBentoLightboxGallery>
-            </div>
-          </div>
-        </BentoLightboxGalleryProvider>
-      );
-
-      // Children are rendered inside provider.
-      const provider = wrapper.find('Provider');
-      expect(provider).to.have.lengthOf(1);
-      expect(provider.children()).to.have.lengthOf(3);
-
-      // Elements are not rendered inside lightbox (closed).
-      const lightbox = wrapper.find('Lightbox');
-      expect(lightbox).to.have.lengthOf(1);
-      expect(lightbox.children()).to.have.lengthOf(0);
-    });
-
-    it('renders with WithBentoLightboxGallery[as]', () => {
-      const wrapper = mount(
-        <BentoLightboxGalleryProvider>
-          <WithBentoLightboxGallery key="1" id="standard">
-            <img />
-          </WithBentoLightboxGallery>
-          <img key="2" id="no-lightbox" />
-          <WithBentoLightboxGallery key="3" as="img" id="with-as" />
-          <div key="4">
-            <div>
-              <WithBentoLightboxGallery id="deeply-nested">
-                <img />
-              </WithBentoLightboxGallery>
-              <WithBentoLightboxGallery as="img" id="deeply-nested-with-as" />
-            </div>
-          </div>
-        </BentoLightboxGalleryProvider>
-      );
-
-      // Children are rendered inside provider.
-      const provider = wrapper.find('Provider');
-      expect(provider).to.have.lengthOf(1);
-      expect(provider.children()).to.have.lengthOf(4);
-      expect(wrapper.find('img')).to.have.lengthOf(5);
-
-      // Elements are not rendered inside lightbox (closed).
-      const lightbox = wrapper.find('Lightbox');
-      expect(lightbox).to.have.lengthOf(1);
-      expect(lightbox.children()).to.have.lengthOf(0);
-    });
-
-    it('opens with clones when clicking on a lightboxed element', () => {
-      const classes = useStyles();
-      const wrapper = mount(
-        <BentoLightboxGalleryProvider>
-          <WithBentoLightboxGallery key="1" id="standard">
-            <img />
-          </WithBentoLightboxGallery>
-          <img key="2" id="no-lightbox" />
-          <div key="3">
-            <div>
-              <WithBentoLightboxGallery id="deeply-nested">
-                <img />
-              </WithBentoLightboxGallery>
-            </div>
-          </div>
-        </BentoLightboxGalleryProvider>
-      );
-
-      // Children are rendered inside provider.
-      const provider = wrapper.find('Provider');
-      expect(provider).to.have.lengthOf(1);
-      expect(provider.children()).to.have.lengthOf(3);
-
-      // Elements are not rendered inside lightbox (closed).
-      let lightbox = wrapper.find('Lightbox');
-      expect(lightbox).to.have.lengthOf(1);
-      expect(lightbox.children()).to.have.lengthOf(0);
-
-      // Note: We would normally click the first `img` element,
-      // not its generated `div` wrapper. However, enzyme's
-      // shallow renderer does not support event propagation as
-      // we would expect in a real environment.
-      wrapper.find('div').first().simulate('click');
-      wrapper.update();
-
-      // Render provided children
-      lightbox = wrapper.find('Lightbox');
-      expect(lightbox).to.have.lengthOf(1);
-      expect(lightbox.prop('closeButtonAs').name).to.equal('CloseButtonIcon');
-      expect(lightbox.children()).to.have.lengthOf(1);
-
-      // Toggle control is rendered
-      const toggleViewIcon = wrapper.find('ToggleViewIcon');
-      expect(toggleViewIcon).to.have.lengthOf(1);
-      expect(toggleViewIcon.prop('showCarousel')).to.be.true;
-
-      // Grid UI not rendered
-      expect(wrapper.find(`.${classes.grid}`)).to.have.lengthOf(0);
-
-      // Carousel UI
-      const carousel = lightbox.find('BentoBaseCarousel');
-      expect(carousel).to.have.lengthOf(1);
-      expect(carousel.prop('arrowPrevAs').name).to.equal('NavButtonIcon');
-      expect(carousel.prop('arrowNextAs').name).to.equal('NavButtonIcon');
-      expect(carousel.find('img')).to.have.lengthOf(2);
-    });
-
-    it('opens with rendered when given', () => {
-      const classes = useStyles();
-      const renderImg = () => <img class="rendered-img"></img>;
-      const wrapper = mount(
-        <BentoLightboxGalleryProvider>
-          <WithBentoLightboxGallery key="1" id="standard">
-            <img />
-          </WithBentoLightboxGallery>
-          <img key="2" id="no-lightbox" />
-          <WithBentoLightboxGallery
-            key="3"
-            as="img"
-            id="with-as"
-            render={renderImg}
-          />
-          <div key="4">
-            <div>
-              <WithBentoLightboxGallery id="deeply-nested">
-                <img />
-              </WithBentoLightboxGallery>
-              <WithBentoLightboxGallery
-                as="img"
-                id="deeply-nested-with-as"
-                render={renderImg}
-              />
-            </div>
-          </div>
-        </BentoLightboxGalleryProvider>
-      );
-
-      // Children are rendered inside provider.
-      const provider = wrapper.find('Provider');
-      expect(provider).to.have.lengthOf(1);
-      expect(provider.children()).to.have.lengthOf(4);
-      expect(wrapper.find('img')).to.have.lengthOf(5);
-
-      // Elements are not rendered inside lightbox (closed).
-      let lightbox = wrapper.find('Lightbox');
-      expect(lightbox).to.have.lengthOf(1);
-      expect(lightbox.children()).to.have.lengthOf(0);
-
-      // Note: We would normally click the first `img` element,
-      // not its generated `div` wrapper. However, enzyme's
-      // shallow renderer does not support event propagation as
-      // we would expect in a real environment.
-      wrapper.find('div').first().simulate('click');
-      wrapper.update();
-
-      // Render provided children
-      lightbox = wrapper.find('Lightbox');
-      expect(lightbox).to.have.lengthOf(1);
-      expect(lightbox.prop('closeButtonAs').name).to.equal('CloseButtonIcon');
-      expect(lightbox.children()).to.have.lengthOf(1);
-
-      // Toggle control is rendered
-      const toggleViewIcon = wrapper.find('ToggleViewIcon');
-      expect(toggleViewIcon).to.have.lengthOf(1);
-      expect(toggleViewIcon.prop('showCarousel')).to.be.true;
-
-      // Grid UI not rendered
-      expect(wrapper.find(`.${classes.grid}`)).to.have.lengthOf(0);
-
-      // Carousel UI
-      const carousel = lightbox.find('BentoBaseCarousel');
-      expect(carousel).to.have.lengthOf(1);
-      expect(carousel.prop('arrowPrevAs').name).to.equal('NavButtonIcon');
-      expect(carousel.prop('arrowNextAs').name).to.equal('NavButtonIcon');
-
-      // Children are given to carousel
-      expect(carousel.find('[data-slide=0] img').hasClass('rendered-img')).to.be
-        .false;
-      expect(carousel.find('[data-slide=1] img').hasClass('rendered-img')).to.be
-        .true;
-      expect(carousel.find('[data-slide=2] img').hasClass('rendered-img')).to.be
-        .false;
-      expect(carousel.find('[data-slide=3] img').hasClass('rendered-img')).to.be
-        .true;
-    });
-
-    it('toggles to grid view', () => {
-      const classes = useStyles();
-      const renderImg = () => <img class="rendered-img"></img>;
-      const wrapper = mount(
-        <BentoLightboxGalleryProvider>
-          <WithBentoLightboxGallery key="1" id="standard">
-            <img />
-          </WithBentoLightboxGallery>
-          <img key="2" id="no-lightbox" />
-          <WithBentoLightboxGallery
-            key="3"
-            as="img"
-            id="with-as"
-            render={renderImg}
-          />
-          <div key="4">
-            <div>
-              <WithBentoLightboxGallery id="deeply-nested">
-                <img />
-              </WithBentoLightboxGallery>
-              <WithBentoLightboxGallery
-                as="img"
-                id="deeply-nested-with-as"
-                render={renderImg}
-              />
-            </div>
-          </div>
-        </BentoLightboxGalleryProvider>
-      );
-
-      // Open lightbox
-      wrapper.find('div').first().simulate('click');
-      wrapper.update();
-
-      // Toggle control is rendered
-      const toggleViewIcon = wrapper.find('ToggleViewIcon');
-      expect(toggleViewIcon).to.have.lengthOf(1);
-      expect(toggleViewIcon.prop('showCarousel')).to.be.true;
-
-      // Grid UI is not rendered
-      expect(wrapper.find(`.${classes.grid}`)).to.have.lengthOf(0);
-      expect(wrapper.find('BentoBaseCarousel')).to.have.lengthOf(1);
-
-      // Toggle to grid UI
-      toggleViewIcon.find('svg').simulate('click');
-      wrapper.update();
-      const grid = wrapper.find(`.${classes.grid}`);
-      expect(grid).to.have.lengthOf(1);
-
-      // Children are cloned to grid
-      const gridImgs = grid.find('img');
-      expect(gridImgs).to.have.lengthOf(4);
-      expect(gridImgs.at(0).hasClass('rendered-img')).to.be.false;
-      expect(gridImgs.at(1).hasClass('rendered-img')).to.be.true;
-      expect(gridImgs.at(2).hasClass('rendered-img')).to.be.false;
-      expect(gridImgs.at(3).hasClass('rendered-img')).to.be.true;
-
-      // Carousel is hidden, and its children still exist
-      const carousel = wrapper.find('BentoBaseCarousel');
-      expect(carousel).to.have.lengthOf(1);
-      expect(carousel.prop('hidden')).to.be.true;
-      // Children are given to carousel
-      expect(carousel.find('[data-slide=0] img').hasClass('rendered-img')).to.be
-        .false;
-      expect(carousel.find('[data-slide=1] img').hasClass('rendered-img')).to.be
-        .true;
-      expect(carousel.find('[data-slide=2] img').hasClass('rendered-img')).to.be
-        .false;
-      expect(carousel.find('[data-slide=3] img').hasClass('rendered-img')).to.be
-        .true;
-    });
-
-    it('toggles to grid view and back to carousel', () => {
-      const classes = useStyles();
-      const renderImg = () => <img class="rendered-img"></img>;
-      const wrapper = mount(
-        <BentoLightboxGalleryProvider>
-          <WithBentoLightboxGallery key="1" id="standard">
-            <img />
-          </WithBentoLightboxGallery>
-          <img key="2" id="no-lightbox" />
-          <WithBentoLightboxGallery
-            key="3"
-            as="img"
-            id="with-as"
-            render={renderImg}
-          />
-          <div key="4">
-            <div>
-              <WithBentoLightboxGallery id="deeply-nested">
-                <img />
-              </WithBentoLightboxGallery>
-              <WithBentoLightboxGallery
-                as="img"
-                id="deeply-nested-with-as"
-                render={renderImg}
-              />
-            </div>
-          </div>
-        </BentoLightboxGalleryProvider>
-      );
-
-      // Open lightbox
-      wrapper.find('div').first().simulate('click');
-      wrapper.update();
-
-      // Toggle control is rendered
-      const toggleViewIcon = wrapper.find('ToggleViewIcon');
-      expect(toggleViewIcon).to.have.lengthOf(1);
-      expect(toggleViewIcon.prop('showCarousel')).to.be.true;
-
-      // Grid UI not rendered
-      expect(wrapper.find(`.${classes.grid}`)).to.have.lengthOf(0);
-      expect(wrapper.find('BentoBaseCarousel').prop('hidden')).to.be.false;
-
-      // Toggle to grid UI
-      toggleViewIcon.find('svg').simulate('click');
-      wrapper.update();
-      expect(wrapper.find(`.${classes.grid}`)).to.have.lengthOf(1);
-      expect(wrapper.find('BentoBaseCarousel').prop('hidden')).to.be.true;
-
-      // Toggle back to carousel UI
-      toggleViewIcon.find('svg').simulate('click');
-      wrapper.update();
-      expect(wrapper.find(`.${classes.grid}`)).to.have.lengthOf(0);
-      expect(wrapper.find('BentoBaseCarousel').prop('hidden')).to.be.false;
-    });
-
-    it('toggles to specific carousel slide from grid view ', () => {
-      const classes = useStyles();
-      const renderImg = () => <img class="rendered-img"></img>;
-      const wrapper = mount(
-        <BentoLightboxGalleryProvider>
-          <WithBentoLightboxGallery key="1" id="standard">
-            <img />
-          </WithBentoLightboxGallery>
-          <img key="2" id="no-lightbox" />
-          <WithBentoLightboxGallery
-            key="3"
-            as="img"
-            id="with-as"
-            render={renderImg}
-          />
-          <div key="4">
-            <div>
-              <WithBentoLightboxGallery id="deeply-nested">
-                <img />
-              </WithBentoLightboxGallery>
-              <WithBentoLightboxGallery
-                as="img"
-                id="deeply-nested-with-as"
-                render={renderImg}
-              />
-            </div>
-          </div>
-        </BentoLightboxGalleryProvider>
-      );
-
-      // Open lightbox
-      wrapper.find('div').first().simulate('click');
-      wrapper.update();
-
-      // Toggle control is rendered
-      const toggleViewIcon = wrapper.find('ToggleViewIcon');
-      expect(toggleViewIcon).to.have.lengthOf(1);
-      expect(toggleViewIcon.prop('showCarousel')).to.be.true;
-
-      // Grid UI not rendered
-      expect(wrapper.find(`.${classes.grid}`)).to.have.lengthOf(0);
-      expect(wrapper.find('BentoBaseCarousel').prop('hidden')).to.be.false;
-
-      // Toggle to grid UI
-      toggleViewIcon.find('svg').simulate('click');
-      wrapper.update();
-      expect(wrapper.find(`.${classes.grid}`)).to.have.lengthOf(1);
-      expect(wrapper.find('BentoBaseCarousel').prop('hidden')).to.be.true;
-
-      // Click thumbnail item to go back to carousel UI
-      wrapper.find(`.${classes.grid} div`).at(2).simulate('click');
-      wrapper.update();
-      expect(wrapper.find(`.${classes.grid}`)).to.have.lengthOf(0);
-      expect(wrapper.find('BentoBaseCarousel').prop('hidden')).to.be.false;
-    });
-  });
-
-  describe('BentoLightboxGalleryProvider with render prop', () => {
-    it('renders with WithBentoLightboxGallery', () => {
-      const render = () => [
-        <WithBentoLightboxGallery key="1" id="standard">
-          <img />
-        </WithBentoLightboxGallery>,
-        <img key="2" id="no-lightbox" />,
-        <div key="3">
-          <div>
-            <WithBentoLightboxGallery id="deeply-nested">
-              <img />
-            </WithBentoLightboxGallery>
-          </div>
-        </div>,
-      ];
-      const wrapper = mount(<BentoLightboxGalleryProvider render={render} />);
-
-      // Children are rendered inside provider.
-      const provider = wrapper.find('Provider');
-      expect(provider).to.have.lengthOf(1);
-      expect(provider.children()).to.have.lengthOf(3);
-
-      // Elements are not rendered inside lightbox (closed).
-      const lightbox = wrapper.find('Lightbox');
-      expect(lightbox).to.have.lengthOf(1);
-      expect(lightbox.children()).to.have.lengthOf(0);
-    });
-
-    it('renders with WithBentoLightboxGallery[as]', () => {
-      const render = () => [
-        <WithBentoLightboxGallery key="1" id="standard">
-          <img />
-        </WithBentoLightboxGallery>,
-        <img key="2" id="no-lightbox" />,
-        <WithBentoLightboxGallery key="3" as="img" id="with-as" />,
-        <div key="4">
-          <div>
-            <WithBentoLightboxGallery id="deeply-nested">
-              <img />
-            </WithBentoLightboxGallery>
-            <WithBentoLightboxGallery as="img" id="deeply-nested-with-as" />
-          </div>
-        </div>,
-      ];
-      const wrapper = mount(<BentoLightboxGalleryProvider render={render} />);
-
-      // Children are rendered inside provider.
-      const provider = wrapper.find('Provider');
-      expect(provider).to.have.lengthOf(1);
-      expect(provider.children()).to.have.lengthOf(4);
-      expect(wrapper.find('img')).to.have.lengthOf(5);
-
-      // Elements are not rendered inside lightbox (closed).
-      const lightbox = wrapper.find('Lightbox');
-      expect(lightbox).to.have.lengthOf(1);
-      expect(lightbox.children()).to.have.lengthOf(0);
-    });
-
-    it('opens with clones when clicking on a lightboxed element', () => {
-      const classes = useStyles();
-      const render = () => [
-        <WithBentoLightboxGallery key="1" id="standard">
-          <img />
-        </WithBentoLightboxGallery>,
-        <img key="2" id="no-lightbox" />,
-        <div key="3">
-          <div>
-            <WithBentoLightboxGallery id="deeply-nested">
-              <img />
-            </WithBentoLightboxGallery>
-          </div>
-        </div>,
-      ];
-      const wrapper = mount(<BentoLightboxGalleryProvider render={render} />);
-
-      // Children are rendered inside provider.
-      const provider = wrapper.find('Provider');
-      expect(provider).to.have.lengthOf(1);
-      expect(provider.children()).to.have.lengthOf(3);
-
-      // Elements are not rendered inside lightbox (closed).
-      let lightbox = wrapper.find('Lightbox');
-      expect(lightbox).to.have.lengthOf(1);
-      expect(lightbox.children()).to.have.lengthOf(0);
-
-      // Note: We would normally click the first `img` element,
-      // not its generated `div` wrapper. However, enzyme's
-      // shallow renderer does not support event propagation as
-      // we would expect in a real environment.
-      wrapper.find('div').first().simulate('click');
-      wrapper.update();
-
-      // Render provided children
-      lightbox = wrapper.find('Lightbox');
-      expect(lightbox).to.have.lengthOf(1);
-      expect(lightbox.prop('closeButtonAs').name).to.equal('CloseButtonIcon');
-      expect(lightbox.children()).to.have.lengthOf(1);
-
-      // Toggle control is rendered
-      const toggleViewIcon = wrapper.find('ToggleViewIcon');
-      expect(toggleViewIcon).to.have.lengthOf(1);
-      expect(toggleViewIcon.prop('showCarousel')).to.be.true;
-
-      // Grid UI not rendered
-      expect(wrapper.find(`.${classes.grid}`)).to.have.lengthOf(0);
-
-      // Carousel UI
-      const carousel = lightbox.find('BentoBaseCarousel');
-      expect(carousel).to.have.lengthOf(1);
-      expect(carousel.prop('arrowPrevAs').name).to.equal('NavButtonIcon');
-      expect(carousel.prop('arrowNextAs').name).to.equal('NavButtonIcon');
-      expect(carousel.find('img')).to.have.lengthOf(2);
-    });
-
-    it('opens with rendered when given', () => {
-      const classes = useStyles();
-      const renderImg = () => <img class="rendered-img"></img>;
-      const render = () => [
-        <WithBentoLightboxGallery key="1" id="standard">
-          <img />
-        </WithBentoLightboxGallery>,
-        <img key="2" id="no-lightbox" />,
-        <WithBentoLightboxGallery
-          key="3"
-          as="img"
-          id="with-as"
-          render={renderImg}
-        />,
-        <div key="4">
-          <div>
-            <WithBentoLightboxGallery id="deeply-nested">
-              <img />
-            </WithBentoLightboxGallery>
-            <WithBentoLightboxGallery
-              as="img"
-              id="deeply-nested-with-as"
-              render={renderImg}
-            />
-          </div>
-        </div>,
-      ];
-      const wrapper = mount(<BentoLightboxGalleryProvider render={render} />);
-
-      // Children are rendered inside provider.
-      const provider = wrapper.find('Provider');
-      expect(provider).to.have.lengthOf(1);
-      expect(provider.children()).to.have.lengthOf(4);
-      expect(wrapper.find('img')).to.have.lengthOf(5);
-
-      // Elements are not rendered inside lightbox (closed).
-      let lightbox = wrapper.find('Lightbox');
-      expect(lightbox).to.have.lengthOf(1);
-      expect(lightbox.children()).to.have.lengthOf(0);
-
-      // Note: We would normally click the first `img` element,
-      // not its generated `div` wrapper. However, enzyme's
-      // shallow renderer does not support event propagation as
-      // we would expect in a real environment.
-      wrapper.find('div').first().simulate('click');
-      wrapper.update();
-
-      // Render provided children
-      lightbox = wrapper.find('Lightbox');
-      expect(lightbox).to.have.lengthOf(1);
-      expect(lightbox.prop('closeButtonAs').name).to.equal('CloseButtonIcon');
-      expect(lightbox.children()).to.have.lengthOf(1);
-
-      // Toggle control is rendered
-      const toggleViewIcon = wrapper.find('ToggleViewIcon');
-      expect(toggleViewIcon).to.have.lengthOf(1);
-      expect(toggleViewIcon.prop('showCarousel')).to.be.true;
-
-      // Grid UI not rendered
-      expect(wrapper.find(`.${classes.grid}`)).to.have.lengthOf(0);
-
-      // Carousel UI
-      const carousel = lightbox.find('BentoBaseCarousel');
-      expect(carousel).to.have.lengthOf(1);
-      expect(carousel.prop('arrowPrevAs').name).to.equal('NavButtonIcon');
-      expect(carousel.prop('arrowNextAs').name).to.equal('NavButtonIcon');
-
-      // Children are given to carousel
-      expect(carousel.find('[data-slide=0] img').hasClass('rendered-img')).to.be
-        .false;
-      expect(carousel.find('[data-slide=1] img').hasClass('rendered-img')).to.be
-        .true;
-      expect(carousel.find('[data-slide=2] img').hasClass('rendered-img')).to.be
-        .false;
-      expect(carousel.find('[data-slide=3] img').hasClass('rendered-img')).to.be
-        .true;
-    });
-
-    it('toggles to grid view', () => {
-      const classes = useStyles();
-      const renderImg = () => <img class="rendered-img"></img>;
-      const render = () => [
-        <WithBentoLightboxGallery key="1" id="standard">
-          <img />
-        </WithBentoLightboxGallery>,
-        <img key="2" id="no-lightbox" />,
-        <WithBentoLightboxGallery
-          key="3"
-          as="img"
-          id="with-as"
-          render={renderImg}
-        />,
-        <div key="4">
-          <div>
-            <WithBentoLightboxGallery id="deeply-nested">
-              <img />
-            </WithBentoLightboxGallery>
-            <WithBentoLightboxGallery
-              as="img"
-              id="deeply-nested-with-as"
-              render={renderImg}
-            />
-          </div>
-        </div>,
-      ];
-      const wrapper = mount(<BentoLightboxGalleryProvider render={render} />);
-
-      // Open lightbox
-      wrapper.find('div').first().simulate('click');
-      wrapper.update();
-
-      // Toggle control is rendered
-      const toggleViewIcon = wrapper.find('ToggleViewIcon');
-      expect(toggleViewIcon).to.have.lengthOf(1);
-      expect(toggleViewIcon.prop('showCarousel')).to.be.true;
-
-      // Grid UI is not rendered
-      expect(wrapper.find(`.${classes.grid}`)).to.have.lengthOf(0);
-      expect(wrapper.find('BentoBaseCarousel')).to.have.lengthOf(1);
-
-      // Toggle to grid UI
-      toggleViewIcon.find('svg').simulate('click');
-      wrapper.update();
-      const grid = wrapper.find(`.${classes.grid}`);
-      expect(grid).to.have.lengthOf(1);
-
-      // Children are cloned to grid
-      const gridImgs = grid.find('img');
-      expect(gridImgs).to.have.lengthOf(4);
-      expect(gridImgs.at(0).hasClass('rendered-img')).to.be.false;
-      expect(gridImgs.at(1).hasClass('rendered-img')).to.be.true;
-      expect(gridImgs.at(2).hasClass('rendered-img')).to.be.false;
-      expect(gridImgs.at(3).hasClass('rendered-img')).to.be.true;
-
-      // Carousel is hidden, and its children still exist
-      const carousel = wrapper.find('BentoBaseCarousel');
-      expect(carousel).to.have.lengthOf(1);
-      expect(carousel.prop('hidden')).to.be.true;
-      expect(carousel.find('[data-slide=0] img').hasClass('rendered-img')).to.be
-        .false;
-      expect(carousel.find('[data-slide=1] img').hasClass('rendered-img')).to.be
-        .true;
-      expect(carousel.find('[data-slide=2] img').hasClass('rendered-img')).to.be
-        .false;
-      expect(carousel.find('[data-slide=3] img').hasClass('rendered-img')).to.be
-        .true;
-    });
-
-    it('toggles to grid view and back to carousel', () => {
-      const classes = useStyles();
-      const renderImg = () => <img class="rendered-img"></img>;
-      const render = () => [
-        <WithBentoLightboxGallery key="1" id="standard">
-          <img />
-        </WithBentoLightboxGallery>,
-        <img key="2" id="no-lightbox" />,
-        <WithBentoLightboxGallery
-          key="3"
-          as="img"
-          id="with-as"
-          render={renderImg}
-        />,
-        <div key="4">
-          <div>
-            <WithBentoLightboxGallery id="deeply-nested">
-              <img />
-            </WithBentoLightboxGallery>
-            <WithBentoLightboxGallery
-              as="img"
-              id="deeply-nested-with-as"
-              render={renderImg}
-            />
-          </div>
-        </div>,
-      ];
-      const wrapper = mount(<BentoLightboxGalleryProvider render={render} />);
-
-      // Open lightbox
-      wrapper.find('div').first().simulate('click');
-      wrapper.update();
-
-      // Toggle control is rendered
-      const toggleViewIcon = wrapper.find('ToggleViewIcon');
-      expect(toggleViewIcon).to.have.lengthOf(1);
-      expect(toggleViewIcon.prop('showCarousel')).to.be.true;
-
-      // Grid UI not rendered
-      expect(wrapper.find(`.${classes.grid}`)).to.have.lengthOf(0);
-      expect(wrapper.find('BentoBaseCarousel').prop('hidden')).to.be.false;
-
-      // Toggle to grid UI
-      toggleViewIcon.find('svg').simulate('click');
-      wrapper.update();
-      expect(wrapper.find(`.${classes.grid}`)).to.have.lengthOf(1);
-      expect(wrapper.find('BentoBaseCarousel').prop('hidden')).to.be.true;
-
-      // Toggle back to carousel UI
-      toggleViewIcon.find('svg').simulate('click');
-      wrapper.update();
-      expect(wrapper.find(`.${classes.grid}`)).to.have.lengthOf(0);
-      expect(wrapper.find('BentoBaseCarousel').prop('hidden')).to.be.false;
-    });
-
-    it('toggles to specific carousel slide from grid view ', () => {
-      const classes = useStyles();
-      const renderImg = () => <img class="rendered-img"></img>;
-      const render = () => [
-        <WithBentoLightboxGallery key="1" id="standard">
-          <img />
-        </WithBentoLightboxGallery>,
-        <img key="2" id="no-lightbox" />,
-        <WithBentoLightboxGallery
-          key="3"
-          as="img"
-          id="with-as"
-          render={renderImg}
-        />,
-        <div key="4">
-          <div>
-            <WithBentoLightboxGallery id="deeply-nested">
-              <img />
-            </WithBentoLightboxGallery>
-            <WithBentoLightboxGallery
-              as="img"
-              id="deeply-nested-with-as"
-              render={renderImg}
-            />
-          </div>
-        </div>,
-      ];
-      const wrapper = mount(<BentoLightboxGalleryProvider render={render} />);
-
-      // Open lightbox
-      wrapper.find('div').first().simulate('click');
-      wrapper.update();
-
-      // Toggle control is rendered
-      const toggleViewIcon = wrapper.find('ToggleViewIcon');
-      expect(toggleViewIcon).to.have.lengthOf(1);
-      expect(toggleViewIcon.prop('showCarousel')).to.be.true;
-
-      // Grid UI not rendered
-      expect(wrapper.find(`.${classes.grid}`)).to.have.lengthOf(0);
-      expect(wrapper.find('BentoBaseCarousel').prop('hidden')).to.be.false;
-
-      // Toggle to grid UI
-      toggleViewIcon.find('svg').simulate('click');
-      wrapper.update();
-      expect(wrapper.find(`.${classes.grid}`)).to.have.lengthOf(1);
-      expect(wrapper.find('BentoBaseCarousel').prop('hidden')).to.be.true;
-
-      // Click thumbnail item to go back to carousel UI
-      wrapper.find(`.${classes.grid} div`).at(2).simulate('click');
-      wrapper.update();
-      expect(wrapper.find(`.${classes.grid}`)).to.have.lengthOf(0);
-      expect(wrapper.find('BentoBaseCarousel').prop('hidden')).to.be.false;
-    });
-  });
-
-  describe('Grouping', () => {
-    it('renders with WithBentoLightboxGallery', () => {
-      const wrapper = mount(
-        <BentoLightboxGalleryProvider>
-          <WithBentoLightboxGallery key="1" id="standard">
-            <img />
-          </WithBentoLightboxGallery>
-          <img key="2" id="no-lightbox" />
-          <div key="3">
-            <div>
-              <WithBentoLightboxGallery id="deeply-nested">
-                <img />
-              </WithBentoLightboxGallery>
-            </div>
-          </div>
-          <BentoBaseCarousel lightbox>
-            <img key="4"></img>
-            <img key="5"></img>
-            <img key="6"></img>
-          </BentoBaseCarousel>
-        </BentoLightboxGalleryProvider>
-      );
-
-      // Children are rendered inside provider.
-      const providers = wrapper.find('Provider');
-      // One from Lightbox, three for each carousel slide.
-      expect(providers).to.have.lengthOf(4);
-      const provider = providers.first();
-      expect(provider.children()).to.have.lengthOf(4);
-
-      // Elements are not rendered inside lightbox (closed).
-      const lightbox = wrapper.find('Lightbox');
-      expect(lightbox).to.have.lengthOf(1);
-      expect(lightbox.children()).to.have.lengthOf(0);
-    });
-
-    it('opens with clones when clicking on a lightboxed element in default group', () => {
-      const classes = useStyles();
-      const wrapper = mount(
-        <BentoLightboxGalleryProvider>
-          <WithBentoLightboxGallery key="1" id="standard">
-            <img />
-          </WithBentoLightboxGallery>
-          <img key="2" id="no-lightbox" />
-          <div key="3">
-            <div>
-              <WithBentoLightboxGallery id="deeply-nested">
-                <img />
-              </WithBentoLightboxGallery>
-            </div>
-          </div>
-          <BentoBaseCarousel lightbox>
-            <img key="4"></img>
-            <img key="5"></img>
-            <img key="6"></img>
-          </BentoBaseCarousel>
-        </BentoLightboxGalleryProvider>
-      );
-
-      // Children are rendered inside provider.
-      const providers = wrapper.find('Provider');
-      // One from Lightbox, three for each carousel slide.
-      expect(providers).to.have.lengthOf(4);
-      const provider = providers.first();
-      expect(provider.children()).to.have.lengthOf(4);
-
-      // Elements are not rendered inside lightbox (closed).
-      let lightbox = wrapper.find('Lightbox');
-      expect(lightbox).to.have.lengthOf(1);
-      expect(lightbox.children()).to.have.lengthOf(0);
-
-      // Note: We would normally click the first `img` element,
-      // not its generated `div` wrapper. However, enzyme's
-      // shallow renderer does not support event propagation as
-      // we would expect in a real environment.
-      wrapper.find('div').first().simulate('click');
-      wrapper.update();
-
-      // Render provided children in the "default" (non-carousel) group
-      lightbox = wrapper.find('Lightbox');
-      expect(lightbox).to.have.lengthOf(1);
-      expect(lightbox.prop('closeButtonAs').name).to.equal('CloseButtonIcon');
-      expect(lightbox.children()).to.have.lengthOf(1);
-
-      // Toggle control is rendered
-      const toggleViewIcon = wrapper.find('ToggleViewIcon');
-      expect(toggleViewIcon).to.have.lengthOf(1);
-      expect(toggleViewIcon.prop('showCarousel')).to.be.true;
-
-      // Grid UI not rendered
-      expect(wrapper.find(`.${classes.grid}`)).to.have.lengthOf(0);
-
-      // Carousel UI
-      const carousel = lightbox.find('BentoBaseCarousel');
-      expect(carousel).to.have.lengthOf(1);
-      expect(carousel.prop('arrowPrevAs').name).to.equal('NavButtonIcon');
-      expect(carousel.prop('arrowNextAs').name).to.equal('NavButtonIcon');
-      expect(carousel.find('img')).to.have.lengthOf(2);
-    });
-
-    it('opens with clones when clicking on a lightboxed element in carousel group', () => {
-      const classes = useStyles();
-      const wrapper = mount(
-        <BentoLightboxGalleryProvider>
-          <WithBentoLightboxGallery key="1" id="standard">
-            <img />
-          </WithBentoLightboxGallery>
-          <img key="2" id="no-lightbox" />
-          <div key="3">
-            <div>
-              <WithBentoLightboxGallery id="deeply-nested">
-                <img />
-              </WithBentoLightboxGallery>
-            </div>
-          </div>
-          <BentoBaseCarousel lightbox>
-            <img key="4"></img>
-            <img key="5"></img>
-            <img key="6"></img>
-          </BentoBaseCarousel>
-        </BentoLightboxGalleryProvider>
-      );
-
-      // Children are rendered inside provider.
-      const providers = wrapper.find('Provider');
-      // One from Lightbox, three for each carousel slide.
-      expect(providers).to.have.lengthOf(4);
-      const provider = providers.first();
-      expect(provider.children()).to.have.lengthOf(4);
-
-      // Elements are not rendered inside lightbox (closed).
-      let lightbox = wrapper.find('Lightbox');
-      expect(lightbox).to.have.lengthOf(1);
-      expect(lightbox.children()).to.have.lengthOf(0);
-
-      // Note: We would normally click the first `img` element,
-      // not its generated `div` wrapper. However, enzyme's
-      // shallow renderer does not support event propagation as
-      // we would expect in a real environment.
-      wrapper.find('div[part="slide"]').first().simulate('click');
-      wrapper.update();
-
-      // Render provided children in the carousel group
-      lightbox = wrapper.find('Lightbox');
-      expect(lightbox).to.have.lengthOf(1);
-      expect(lightbox.prop('closeButtonAs').name).to.equal('CloseButtonIcon');
-      expect(lightbox.children()).to.have.lengthOf(1);
-
-      // Toggle control is rendered
-      const toggleViewIcon = wrapper.find('ToggleViewIcon');
-      expect(toggleViewIcon).to.have.lengthOf(1);
-      expect(toggleViewIcon.prop('showCarousel')).to.be.true;
-
-      // Grid UI not rendered
-      expect(wrapper.find(`.${classes.grid}`)).to.have.lengthOf(0);
-
-      // Carousel UI
-      const carousel = lightbox.find('BentoBaseCarousel');
-      expect(carousel).to.have.lengthOf(1);
-      expect(carousel.prop('arrowPrevAs').name).to.equal('NavButtonIcon');
-      expect(carousel.prop('arrowNextAs').name).to.equal('NavButtonIcon');
-      expect(carousel.find('img')).to.have.lengthOf(3);
-    });
-  });
-
-  describe('Captions', () => {
-    it('should render with captions from caption, alt, and aria-label props', () => {
-      const wrapper = mount(
-        <BentoLightboxGalleryProvider>
-          <WithBentoLightboxGallery caption="First img">
-            <img />
-          </WithBentoLightboxGallery>
-          <WithBentoLightboxGallery as="img" alt="Second img" />
-          <WithBentoLightboxGallery
-            as="section"
-            aria-label="Third and fourth img group"
-            render={() => <img />}
-          >
-            <img />
-            <img />
-          </WithBentoLightboxGallery>
-        </BentoLightboxGalleryProvider>
-      );
-
-      // Open lightbox
-      wrapper.find('div').first().simulate('click');
-      wrapper.update();
-
-      // Render provided children in the "default" (non-carousel) group
-      const lightbox = wrapper.find('Lightbox');
-      expect(lightbox).to.have.lengthOf(1);
-      expect(lightbox.children()).to.have.lengthOf(1);
-
-      // Rendered elements
-      expect(lightbox.find('img')).to.have.lengthOf(3);
-      const caption = wrapper.find(`.amp-lightbox-gallery-caption`);
-      expect(caption).to.have.lengthOf(1);
-      expect(caption.text()).to.equal('First img');
-    });
-
-    it('should prefer caption to alt and aria-label props', () => {
-      const wrapper = mount(
-        <BentoLightboxGalleryProvider>
-          <WithBentoLightboxGallery
-            caption="First img"
-            alt="ignored"
-            aria-label="ignored"
-          >
-            <img />
-          </WithBentoLightboxGallery>
-        </BentoLightboxGalleryProvider>
-      );
-
-      // Open lightbox
-      wrapper.find('div').first().simulate('click');
-      wrapper.update();
-
-      // Render provided children in the "default" (non-carousel) group
-      const lightbox = wrapper.find('Lightbox');
-      expect(lightbox).to.have.lengthOf(1);
-      expect(lightbox.children()).to.have.lengthOf(1);
-
-      // Rendered elements
-      expect(lightbox.find('img')).to.have.lengthOf(1);
-      const caption = wrapper.find(`.amp-lightbox-gallery-caption`);
-      expect(caption).to.have.lengthOf(1);
-      expect(caption.text()).to.equal('First img');
-    });
-
-    it('should prefer alt to aria-label prop', () => {
-      const wrapper = mount(
-        <BentoLightboxGalleryProvider>
-          <WithBentoLightboxGallery alt="First img" aria-label="ignored">
-            <img />
-          </WithBentoLightboxGallery>
-        </BentoLightboxGalleryProvider>
-      );
-
-      // Open lightbox
-      wrapper.find('div').first().simulate('click');
-      wrapper.update();
-
-      // Render provided children in the "default" (non-carousel) group
-      const lightbox = wrapper.find('Lightbox');
-      expect(lightbox).to.have.lengthOf(1);
-      expect(lightbox.children()).to.have.lengthOf(1);
-
-      // Rendered elements
-      expect(lightbox.find('img')).to.have.lengthOf(1);
-      const caption = wrapper.find(`.amp-lightbox-gallery-caption`);
-      expect(caption).to.have.lengthOf(1);
-      expect(caption.text()).to.equal('First img');
-    });
-
-    it('should take alt prop from carousel direct children', () => {
-      const wrapper = mount(
-        <BentoLightboxGalleryProvider>
-          <BentoBaseCarousel lightbox>
-            <img alt="First img" />
-          </BentoBaseCarousel>
-        </BentoLightboxGalleryProvider>
-      );
-
-      // Open lightbox
-      wrapper.find('div[part="slide"]').first().simulate('click');
-      wrapper.update();
-
-      // Render provided children in the "default" (non-carousel) group
-      const lightbox = wrapper.find('Lightbox');
-      expect(lightbox).to.have.lengthOf(1);
-      expect(lightbox.children()).to.have.lengthOf(1);
-
-      // Rendered elements
-      expect(lightbox.find('img')).to.have.lengthOf(1);
-      const caption = wrapper.find(`.amp-lightbox-gallery-caption`);
-      expect(caption).to.have.lengthOf(1);
-      expect(caption.text()).to.equal('First img');
-    });
-
-    it('should take aria-label prop from carousel direct children', () => {
-      const wrapper = mount(
-        <BentoLightboxGalleryProvider>
-          <BentoBaseCarousel lightbox>
-            <div role="img" aria-label="First img">
-              <img />
-            </div>
-          </BentoBaseCarousel>
-        </BentoLightboxGalleryProvider>
-      );
-
-      // Open lightbox
-      wrapper.find('div[part="slide"]').first().simulate('click');
-      wrapper.update();
-
-      // Render provided children in the "default" (non-carousel) group
-      const lightbox = wrapper.find('Lightbox');
-      expect(lightbox).to.have.lengthOf(1);
-      expect(lightbox.children()).to.have.lengthOf(1);
-
-      // Rendered elements
-      expect(lightbox.find('img')).to.have.lengthOf(1);
-      const caption = wrapper.find(`.amp-lightbox-gallery-caption`);
-      expect(caption).to.have.lengthOf(1);
-      expect(caption.text()).to.equal('First img');
-    });
-  });
-});
diff --git a/extensions/amp-lightbox/0.1/amp-lightbox.js b/extensions/amp-lightbox/0.1/amp-lightbox.js
index 99f336bef864..8359a2ff55cb 100644
--- a/extensions/amp-lightbox/0.1/amp-lightbox.js
+++ b/extensions/amp-lightbox/0.1/amp-lightbox.js
@@ -1,12 +1,12 @@
-import {ActionTrust} from '#core/constants/action-constants';
-import {AmpEvents} from '#core/constants/amp-events';
-import {CSS} from '../../../build/amp-lightbox-0.1.css';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
+import {Keys_Enum} from '#core/constants/key-codes';
 import {Deferred} from '#core/data-structures/promise';
-import {Gestures} from '../../../src/gesture';
-import {Keys} from '#core/constants/key-codes';
-import {Services} from '#service';
-import {SwipeXYRecognizer} from '../../../src/gesture-recognizers';
+import {tryFocus} from '#core/dom';
 import {applyFillContent} from '#core/dom/layout';
+import {realChildElements} from '#core/dom/query';
+import {unmountAll} from '#core/dom/resource-container-helper';
+import {htmlFor} from '#core/dom/static-template';
 import {
   assertDoesNotContainDisplay,
   computedStyle,
@@ -17,17 +17,21 @@ import {
   setStyles,
   toggle,
 } from '#core/dom/style';
-import {createCustomEvent} from '#utils/event-helper';
+import {toArray} from '#core/types/array';
 import {debounce} from '#core/types/function';
+import {hasOwn} from '#core/types/object';
+
+import {Services} from '#service';
+
+import {CloseWatcherImpl} from '#utils/close-watcher-impl';
+import {createCustomEvent} from '#utils/event-helper';
 import {dev, devAssert, user} from '#utils/log';
-import {dict, hasOwn} from '#core/types/object';
-import {getMode} from '../../../src/mode';
-import {htmlFor} from '#core/dom/static-template';
+
+import {CSS} from '../../../build/amp-lightbox-0.1.css';
+import {Gestures} from '../../../src/gesture';
+import {SwipeXYRecognizer} from '../../../src/gesture-recognizers';
 import {isInFie} from '../../../src/iframe-helper';
-import {realChildElements} from '#core/dom/query';
-import {toArray} from '#core/types/array';
-import {tryFocus} from '#core/dom';
-import {unmountAll} from '#core/dom/resource-container-helper';
+import {getMode} from '../../../src/mode';
 
 /** @const {string} */
 const TAG = 'amp-lightbox';
@@ -47,21 +51,21 @@ const LightboxEvents = {
  */
 let AnimationPresetDef;
 
-/** @private @const {!Object<string, !AnimationPresetDef>} */
+/** @private @const {!{[key: string]: !AnimationPresetDef}} */
 const AnimationPresets = {
   'fade-in': {
-    openStyle: dict({'opacity': 1}),
-    closedStyle: dict({'opacity': 0}),
+    openStyle: {'opacity': 1},
+    closedStyle: {'opacity': 0},
     durationSeconds: 0.1,
   },
   'fly-in-bottom': {
-    openStyle: dict({'transform': 'translate(0, 0)'}),
-    closedStyle: dict({'transform': 'translate(0, 100%)'}),
+    openStyle: {'transform': 'translate(0, 0)'},
+    closedStyle: {'transform': 'translate(0, 100%)'},
     durationSeconds: 0.2,
   },
   'fly-in-top': {
-    openStyle: dict({'transform': 'translate(0, 0)'}),
-    closedStyle: dict({'transform': 'translate(0, -100%)'}),
+    openStyle: {'transform': 'translate(0, 0)'},
+    closedStyle: {'transform': 'translate(0, -100%)'},
     durationSeconds: 0.2,
   },
 };
@@ -99,15 +103,12 @@ class AmpLightbox extends AMP.BaseElement {
     /** @private {?../../../src/service/action-impl.ActionService} */
     this.action_ = null;
 
-    /** @private {number} */
-    this.historyId_ = -1;
+    /** @private {?CloseWatcherImpl} */
+    this.closeWatcher_ = null;
 
     /** @private {boolean} */
     this.active_ = false;
 
-    /**  @private {?function(this:AmpLightbox, Event)}*/
-    this.boundCloseOnEscape_ = null;
-
     /**  @private {?function(this:AmpLightbox, Event)}*/
     this.boundCloseOnEnter_ = null;
 
@@ -237,7 +238,7 @@ class AmpLightbox extends AMP.BaseElement {
 
       element.classList.add('i-amphtml-scrollable');
 
-      element.addEventListener(AmpEvents.DOM_UPDATE, () => {
+      element.addEventListener(AmpEvents_Enum.DOM_UPDATE, () => {
         this.takeOwnershipOfDescendants_();
         this.updateChildrenInViewport_(this.pos_);
       });
@@ -261,8 +262,9 @@ class AmpLightbox extends AMP.BaseElement {
   }
 
   /**
-   * @param {!ActionTrust} trust
+   * @param {!ActionTrust_Enum} trust
    * @param {?Element} openerElement
+   * @return {!Promise}
    * @private
    */
   open_(trust, openerElement) {
@@ -270,14 +272,6 @@ class AmpLightbox extends AMP.BaseElement {
       return;
     }
     this.initialize_();
-    this.boundCloseOnEscape_ =
-      /** @type {?function(this:AmpLightbox, Event)} */ (
-        this.closeOnEscape_.bind(this)
-      );
-    this.document_.documentElement.addEventListener(
-      'keydown',
-      this.boundCloseOnEscape_
-    );
     this.boundFocusin_ = /** @type {?function(this:AmpLightbox)} */ (
       this.onFocusin_.bind(this)
     );
@@ -291,7 +285,7 @@ class AmpLightbox extends AMP.BaseElement {
     }
 
     const {promise, resolve} = new Deferred();
-    this.getViewport()
+    return this.getViewport()
       .enterLightboxMode(this.element, promise)
       .then(() => this.finalizeOpen_(resolve, trust));
   }
@@ -303,9 +297,9 @@ class AmpLightbox extends AMP.BaseElement {
       // Mutations via AMP.setState() require default trust.
       if (open) {
         // This suppose that the element that trigered the open is where the focus currently is
-        this.open_(ActionTrust.DEFAULT, document.activeElement);
+        this.open_(ActionTrust_Enum.DEFAULT, document.activeElement);
       } else {
-        this.close(ActionTrust.DEFAULT);
+        this.close(ActionTrust_Enum.DEFAULT);
       }
     }
   }
@@ -324,7 +318,7 @@ class AmpLightbox extends AMP.BaseElement {
 
   /**
    * @param {!Function} callback Called when open animation completes.
-   * @param {!ActionTrust} trust
+   * @param {!ActionTrust_Enum} trust
    * @private
    */
   finalizeOpen_(callback, trust) {
@@ -385,11 +379,9 @@ class AmpLightbox extends AMP.BaseElement {
     owners.scheduleResume(this.element, container);
     this.triggerEvent_(LightboxEvents.OPEN, trust);
 
-    this.getHistory_()
-      .push((unused) => this.close(trust))
-      .then((historyId) => {
-        this.historyId_ = historyId;
-      });
+    this.closeWatcher_ = new CloseWatcherImpl(this.getAmpDoc(), () =>
+      this.close(ActionTrust_Enum.HIGH)
+    );
 
     this.maybeRenderCloseButtonHeader_();
     this.focusInModal_();
@@ -506,20 +498,7 @@ class AmpLightbox extends AMP.BaseElement {
    * @private
    */
   closeOnClick_() {
-    this.close(ActionTrust.HIGH);
-  }
-
-  /**
-   * Handles closing the lightbox when the ESC key is pressed.
-   * @param {!Event} event
-   * @private
-   */
-  closeOnEscape_(event) {
-    if (event.key == Keys.ESCAPE) {
-      event.preventDefault();
-      // Keypress gesture is high trust.
-      this.close(ActionTrust.HIGH);
-    }
+    this.close(ActionTrust_Enum.HIGH);
   }
 
   /**
@@ -529,17 +508,17 @@ class AmpLightbox extends AMP.BaseElement {
    * @private
    */
   closeOnEnter_(event) {
-    if (event.key == Keys.ENTER) {
+    if (event.key == Keys_Enum.ENTER) {
       event.preventDefault();
       // Keypress gesture is high trust.
-      this.close(ActionTrust.HIGH);
+      this.close(ActionTrust_Enum.HIGH);
     }
   }
 
   /**
    * Closes the lightbox.
    *
-   * @param {!ActionTrust} trust
+   * @param {!ActionTrust_Enum} trust
    */
   close(trust) {
     if (!this.active_) {
@@ -557,7 +536,7 @@ class AmpLightbox extends AMP.BaseElement {
   /**
    * Clean up when closing lightbox.
    *
-   * @param {!ActionTrust} trust
+   * @param {!ActionTrust_Enum} trust
    * @private
    */
   finalizeClose_(trust) {
@@ -587,14 +566,10 @@ class AmpLightbox extends AMP.BaseElement {
       assertDoesNotContainDisplay(this.getAnimationPresetDef_().closedStyle)
     );
 
-    if (this.historyId_ != -1) {
-      this.getHistory_().pop(this.historyId_);
+    if (this.closeWatcher_) {
+      this.closeWatcher_.destroy();
+      this.closeWatcher_ = null;
     }
-    this.document_.documentElement.removeEventListener(
-      'keydown',
-      this.boundCloseOnEscape_
-    );
-    this.boundCloseOnEscape_ = null;
 
     this.document_.documentElement.removeEventListener(
       'focusin',
@@ -649,7 +624,7 @@ class AmpLightbox extends AMP.BaseElement {
    */
   onFocusin_() {
     if (!this.hasCurrentFocus_()) {
-      this.close(ActionTrust.HIGH);
+      this.close(ActionTrust_Enum.HIGH);
     }
   }
 
@@ -862,15 +837,6 @@ class AmpLightbox extends AMP.BaseElement {
     return this.size_;
   }
 
-  /**
-   * Returns the history for the ampdoc.
-   *
-   * @return {!../../../src/service/history-impl.History}
-   */
-  getHistory_() {
-    return Services.historyForDoc(this.getAmpDoc());
-  }
-
   /**
    * Sets the document body to transparent to allow for frame "merging" if the
    * element is under FIE.
@@ -891,11 +857,11 @@ class AmpLightbox extends AMP.BaseElement {
    * Triggeres event to window.
    *
    * @param {string} name
-   * @param {!ActionTrust} trust
+   * @param {!ActionTrust_Enum} trust
    * @private
    */
   triggerEvent_(name, trust) {
-    const event = createCustomEvent(this.win, `${TAG}.${name}`, dict({}));
+    const event = createCustomEvent(this.win, `${TAG}.${name}`, {});
     this.action_.trigger(this.element, name, event, trust);
   }
 }
diff --git a/extensions/amp-lightbox/0.1/test/test-amp-lightbox.js b/extensions/amp-lightbox/0.1/test/test-amp-lightbox.js
index 489c248785fb..883b695d4e96 100644
--- a/extensions/amp-lightbox/0.1/test/test-amp-lightbox.js
+++ b/extensions/amp-lightbox/0.1/test/test-amp-lightbox.js
@@ -1,11 +1,12 @@
 import '../amp-lightbox';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
 import * as dom from '#core/dom';
-import {ActionService} from '#service/action-impl';
-import {ActionTrust} from '#core/constants/action-constants';
-import {Keys} from '#core/constants/key-codes';
+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
+
 import {Services} from '#service';
+import {ActionService} from '#service/action-impl';
+
 import {whenCalled} from '#testing/helpers/service';
-import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 
 describes.realWin(
   'amp-lightbox component',
@@ -86,7 +87,7 @@ describes.realWin(
           'source',
           'caller',
           'event',
-          ActionTrust.HIGH
+          ActionTrust_Enum.HIGH
         );
         expect(element.enqueAction.callCount).to.be.above(0);
         expect(element.enqueAction).to.be.calledWith(
@@ -98,29 +99,22 @@ describes.realWin(
             method,
             node: element,
             source: 'source',
-            trust: ActionTrust.HIGH,
+            trust: ActionTrust_Enum.HIGH,
           })
         );
       });
     });
 
-    it('should close on ESC', async () => {
+    it('should close on close-watcher signal', async () => {
       const lightbox = createLightbox();
       const impl = await lightbox.getImpl(true);
-      impl.getHistory_ = () => {
-        return {
-          pop: () => {},
-          push: () => Promise.resolve(11),
-        };
-      };
 
       const sourceElement = createOpeningButton('openBtn');
       const setupCloseSpy = env.sandbox.spy(impl, 'close');
 
-      impl.open_({caller: sourceElement});
-      impl.closeOnEscape_(new KeyboardEvent('keydown', {key: Keys.ENTER}));
-      impl.closeOnEscape_(new KeyboardEvent('keydown', {key: Keys.ESCAPE}));
-      expect(setupCloseSpy).to.be.calledOnce;
+      await impl.open_({caller: sourceElement});
+      impl.closeWatcher_.requestClose();
+      expect(setupCloseSpy).to.be.called;
     });
 
     it('should not change focus or create a button if a focus has been made in the modal', async () => {
@@ -217,7 +211,8 @@ describes.realWin(
       });
     });
 
-    it('should stay in modal if focus stays in modal and close if outside', async () => {
+    // TODO(#40258) Fix and unskip flakey test.
+    it.skip('should stay in modal if focus stays in modal and close if outside', async () => {
       const lightbox = createLightbox();
       const insideLink = createLink('insideLink');
       lightbox.appendChild(insideLink);
diff --git a/extensions/amp-lightbox/1.0/README.md b/extensions/amp-lightbox/1.0/README.md
index ceba256a61c0..76f5782124c5 100644
--- a/extensions/amp-lightbox/1.0/README.md
+++ b/extensions/amp-lightbox/1.0/README.md
@@ -6,9 +6,7 @@ Displays any content in a full-viewport "lightbox" modal.
 
 You must include each Bento component's required CSS library before adding custom styles in order to guarantee proper loading. Or use the lightweight pre-uprgrade styles available inline. See [Layout and Style](#layout-and-style).
 
-The examples below demonstrate use of the `<bento-lightbox>` web component.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/lightbox
@@ -19,44 +17,70 @@ import {defineElement as defineBentoLightbox} from '@bentoproject/lightbox';
 defineBentoLightbox();
 ```
 
-### Example: Import via `<script>`
+### Import via `<script>`
 
 ```html
-<head>
-  <link
-    rel="stylesheet"
-    type="text/css"
-    href="https://cdn.ampproject.org/v0/bento-lightbox-1.0.css"
-  />
-  <script src="https://cdn.ampproject.org/bento.js"></script>
-  <script
-    async
-    src="https://cdn.ampproject.org/v0/bento-lightbox-1.0.js"
-  ></script>
-</head>
-<bento-lightbox id="my-lightbox">
-  Lightboxed content
-  <button id="close-button">Close lightbox</button>
-</bento-lightbox>
-<button id="open-button">Open lightbox</button>
-<script>
-  (async () => {
-    const lightbox = document.querySelector('#my-lightbox');
-    await customElements.whenDefined('bento-lightbox');
-    const api = await lightbox.getApi();
-
-    // set up button actions
-    document.querySelector('#open-button').onclick = () => api.open();
-    document.querySelector('#close-button').onclick = () => api.close();
-  })();
-</script>
+<script type="module" async src="https://cdn.ampproject.org/bento.mjs"></script>
+<script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+<script type="module" async src="https://cdn.ampproject.org/v0/bento-lightbox-1.0.mjs"></script>
+<script nomodule async src="https://cdn.ampproject.org/v0/bento-lightbox-1.0.js"></script>
+<link rel="stylesheet" type="text/css" href="https://cdn.ampproject.org/v0/bento-lightbox-1.0.css">
 ```
 
-### Interactivity and API usage
+### Example
 
-Bento enabled components in standalone use are highly interactive through their API.
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-lightbox-1.0.css"
+    />
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-lightbox-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-lightbox-1.0.js"
+    ></script>
+  </head>
+  <body>
+    <bento-lightbox id="my-lightbox" hidden>
+      Lightboxed content
+      <button id="close-button">Close lightbox</button>
+    </bento-lightbox>
+    <button id="open-button">Open lightbox</button>
+    <script>
+      (async () => {
+        const lightbox = document.querySelector('#my-lightbox');
+        await customElements.whenDefined('bento-lightbox');
+        const api = await lightbox.getApi();
+
+        // set up button actions
+        document.querySelector('#open-button').onclick = () => api.open();
+        document.querySelector('#close-button').onclick = () => api.close();
+      })();
+    </script>
+  </body>
+</html>
+```
+
+### Interactivity and API usage
 
-The `bento-lightbox` component API is accessible by including the following script tag in your document:
+Bento components are highly interactive through their API. The `bento-lightbox` component API is accessible by including the following script tag in your document:
 
 ```js
 await customElements.whenDefined('bento-lightbox');
@@ -137,22 +161,68 @@ Must be present when the lightbox is closed and the contents should not be displ
 
 #### `animation`
 
-Defines the style of animation for opening the lightbox. By default, this will
-be set to `fade-in`. Valid values are `fade-in`, `fly-in-bottom`, and
-`fly-in-top`.
+Defines the style of animation for opening the lightbox. By default, this will be set to `fade-in`. Valid values are `fade-in`, `fly-in-bottom`, and `fly-in-top`.
 
 #### `scrollable`
 
-When the `scrollable` attribute is present, the content of the lightbox can
-scroll when overflowing the height of the lightbox.
+When the `scrollable` attribute is present, the content of the lightbox can scroll when overflowing the height of the lightbox.
+
+#### API Example
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-lightbox-1.0.css"
+    />
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-lightbox-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-lightbox-1.0.js"
+    ></script>
+  </head>
+  <body>
+    <bento-lightbox id="my-lightbox" hidden>
+      Lightboxed content
+      <button id="close-button">Close lightbox</button>
+    </bento-lightbox>
+    <button id="open-button">Open lightbox</button>
+    <script>
+      (async () => {
+        const lightbox = document.querySelector('#my-lightbox');
+        await customElements.whenDefined('bento-lightbox');
+        const api = await lightbox.getApi();
+
+        // set up button actions
+        document.querySelector('#open-button').onclick = () => api.open();
+        document.querySelector('#close-button').onclick = () => api.close();
+      })();
+    </script>
+  </body>
+</html>
+```
 
 ---
 
 ## Preact/React Component
 
-The examples below demonstrates use of the `<BentoLightbox>` as a functional component usable with the Preact or React libraries.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/lightbox
diff --git a/extensions/amp-lightbox/1.0/amp-lightbox.js b/extensions/amp-lightbox/1.0/amp-lightbox.js
index a814da040b69..8c7a3bf82d1c 100644
--- a/extensions/amp-lightbox/1.0/amp-lightbox.js
+++ b/extensions/amp-lightbox/1.0/amp-lightbox.js
@@ -1,17 +1,27 @@
-import {ActionTrust, DEFAULT_ACTION} from '#core/constants/action-constants';
-import {BaseElement} from './base-element';
-import {CSS} from '../../../build/amp-lightbox-1.0.css';
+import {BaseElement} from '#bento/components/bento-lightbox/1.0/base-element';
+
+import {
+  ActionTrust_Enum,
+  DEFAULT_ACTION,
+} from '#core/constants/action-constants';
+import {getWin} from '#core/window';
+
+import {isExperimentOn} from '#experiments';
+
+import {AmpPreactBaseElement, setSuperClass} from '#preact/amp-base-element';
+
 import {Services} from '#service';
+
 import {createCustomEvent} from '#utils/event-helper';
-import {isExperimentOn} from '#experiments';
-import {getWin} from '#core/window';
 import {userAssert} from '#utils/log';
 
+import {CSS} from '../../../build/amp-lightbox-1.0.css';
+
 /** @const {string} */
 const TAG = 'amp-lightbox';
 
 /** @extends {PreactBaseElement<LightboxDef.Api>} */
-class AmpLightbox extends BaseElement {
+class AmpLightbox extends setSuperClass(BaseElement, AmpPreactBaseElement) {
   /** @override */
   constructor(element) {
     super(element);
@@ -30,10 +40,10 @@ class AmpLightbox extends BaseElement {
     this.registerApiAction(
       DEFAULT_ACTION,
       (api) => api.open(),
-      ActionTrust.LOW
+      ActionTrust_Enum.LOW
     );
-    this.registerApiAction('open', (api) => api.open(), ActionTrust.LOW);
-    this.registerApiAction('close', (api) => api.close(), ActionTrust.LOW);
+    this.registerApiAction('open', (api) => api.open(), ActionTrust_Enum.LOW);
+    this.registerApiAction('close', (api) => api.close(), ActionTrust_Enum.LOW);
 
     return super.init();
   }
@@ -49,7 +59,7 @@ class AmpLightbox extends BaseElement {
       element,
       eventName,
       event,
-      ActionTrust.HIGH
+      ActionTrust_Enum.HIGH
     );
 
     super.triggerEvent(element, eventName, detail);
diff --git a/extensions/amp-lightbox/1.0/base-element.js b/extensions/amp-lightbox/1.0/base-element.js
deleted file mode 100644
index 53830b173ef9..000000000000
--- a/extensions/amp-lightbox/1.0/base-element.js
+++ /dev/null
@@ -1,75 +0,0 @@
-import {CSS as COMPONENT_CSS} from './component.jss';
-import {BentoLightbox} from './component';
-import {PreactBaseElement} from '#preact/base-element';
-import {dict} from '#core/types/object';
-import {toggle} from '#core/dom/style';
-import {toggleAttribute} from '#core/dom';
-import {unmountAll} from '#core/dom/resource-container-helper';
-
-export class BaseElement extends PreactBaseElement {
-  /** @param {!AmpElement} element */
-  constructor(element) {
-    super(element);
-
-    /** @private {boolean} */
-    this.open_ = false;
-  }
-
-  /** @override */
-  init() {
-    return dict({
-      'onBeforeOpen': () => this.beforeOpen(),
-      'onAfterOpen': () => this.afterOpen(),
-      'onAfterClose': () => this.afterClose(),
-    });
-  }
-
-  /** @protected */
-  beforeOpen() {
-    this.open_ = true;
-    toggleAttribute(this.element, 'open', true);
-    toggle(this.element, true);
-    this.triggerEvent(this.element, 'open');
-  }
-
-  /** @protected */
-  afterOpen() {}
-
-  /** @protected */
-  afterClose() {
-    this.open_ = false;
-    toggleAttribute(this.element, 'open', false);
-    toggle(this.element, false);
-    this.triggerEvent(this.element, 'close');
-
-    // Unmount all children when the lightbox is closed. They will automatically
-    // remount when the lightbox is opened again.
-    unmountAll(this.element, /* includeSelf */ false);
-  }
-
-  /** @override */
-  mutationObserverCallback() {
-    const open = this.element.hasAttribute('open');
-    if (open === this.open_) {
-      return;
-    }
-    this.open_ = open;
-    open ? this.api().open() : this.api().close();
-  }
-}
-
-/** @override */
-BaseElement['Component'] = BentoLightbox;
-
-/** @override */
-BaseElement['props'] = {
-  'animation': {attr: 'animation', media: true, default: 'fade-in'},
-  'closeButtonAs': {selector: '[slot="close-button"]', single: true, as: true},
-  'children': {passthrough: true},
-};
-
-/** @override */
-BaseElement['usesShadowDom'] = true;
-
-/** @override */
-BaseElement['shadowCss'] = COMPONENT_CSS;
diff --git a/extensions/amp-lightbox/1.0/component.js b/extensions/amp-lightbox/1.0/component.js
deleted file mode 100644
index ea41f351275b..000000000000
--- a/extensions/amp-lightbox/1.0/component.js
+++ /dev/null
@@ -1,196 +0,0 @@
-import * as Preact from '#preact';
-import {ContainWrapper, useValueRef} from '#preact/component';
-import {Keys} from '#core/constants/key-codes';
-import {forwardRef} from '#preact/compat';
-import {setStyle} from '#core/dom/style';
-import {tryFocus} from '#core/dom';
-import {useImperativeHandle, useLayoutEffect, useRef, useState} from '#preact';
-import {useStyles} from './component.jss';
-
-const ANIMATION_DURATION = 200;
-const ANIMATION_PRESETS = {
-  'fade-in': [
-    {opacity: 0, visibility: 'visible'},
-    {opacity: 1, visibility: 'visible'},
-  ],
-  'fly-in-top': [
-    {opacity: 0, transform: 'translate(0,-100%)', visibility: 'visible'},
-    {opacity: 1, transform: 'translate(0, 0)', visibility: 'visible'},
-  ],
-  'fly-in-bottom': [
-    {opacity: 0, transform: 'translate(0, 100%)', visibility: 'visible'},
-    {opacity: 1, transform: 'translate(0, 0)', visibility: 'visible'},
-  ],
-};
-
-const DEFAULT_CLOSE_LABEL = 'Close the modal';
-
-const CONTENT_PROPS = {'part': 'scroller'};
-
-/**
- * @param {!BentoLightboxDef.Props} props
- * @param {{current: ?BentoLightboxDef.LightboxApi}} ref
- * @return {PreactDef.Renderable}
- */
-function BentoLightboxWithRef(
-  {
-    animation = 'fade-in',
-    children,
-    closeButtonAs,
-    onAfterClose,
-    onAfterOpen,
-    onBeforeOpen,
-    ...rest
-  },
-  ref
-) {
-  // There are two phases to open and close.
-  // To open, we mount and render the contents (invisible), then animate the display (visible).
-  // To close, it's the reverse.
-  // `mounted` mounts the component. `visible` plays the animation.
-  const [mounted, setMounted] = useState(false);
-  const [visible, setVisible] = useState(false);
-  const classes = useStyles();
-  const lightboxRef = useRef();
-
-  // We are using refs here to refer to common strings, objects, and functions used.
-  // This is because they are needed within `useEffect` calls below (but are not depended for triggering)
-  // We use `useValueRef` for props that might change (user-controlled)
-  const animationRef = useValueRef(animation);
-  const onBeforeOpenRef = useValueRef(onBeforeOpen);
-  const onAfterCloseRef = useValueRef(onAfterClose);
-  const onAfterOpenRef = useValueRef(onAfterOpen);
-
-  useImperativeHandle(
-    ref,
-    () => ({
-      open: () => {
-        onBeforeOpenRef.current?.();
-        setMounted(true);
-        setVisible(true);
-      },
-      close: () => setVisible(false),
-    }),
-    [onBeforeOpenRef]
-  );
-
-  useLayoutEffect(() => {
-    const element = lightboxRef.current;
-    if (!element) {
-      return;
-    }
-    let animation;
-    // Set pre-animation visibility state, to be flipped post-animation.
-    setStyle(element, 'visibility', visible ? 'hidden' : 'visible');
-
-    // "Make Visible" Animation
-    if (visible) {
-      const postVisibleAnim = () => {
-        setStyle(element, 'opacity', 1);
-        setStyle(element, 'visibility', 'visible');
-        tryFocus(element);
-        onAfterOpenRef.current?.();
-      };
-      if (!element.animate) {
-        postVisibleAnim();
-        return;
-      }
-      animation = element.animate(ANIMATION_PRESETS[animationRef.current], {
-        duration: ANIMATION_DURATION,
-        fill: 'both',
-        easing: 'ease-in',
-      });
-      animation.onfinish = postVisibleAnim;
-    } else {
-      // "Make Invisible" Animation
-      const postInvisibleAnim = () => {
-        setStyle(element, 'opacity', 0);
-        setStyle(element, 'visibility', 'hidden');
-        if (onAfterCloseRef.current) {
-          onAfterCloseRef.current();
-        }
-        animation = null;
-        setMounted(false);
-      };
-      if (!element.animate) {
-        postInvisibleAnim();
-        return;
-      }
-      animation = element.animate(ANIMATION_PRESETS[animationRef.current], {
-        duration: ANIMATION_DURATION,
-        direction: 'reverse',
-        fill: 'both',
-        easing: 'ease-in',
-      });
-      animation.onfinish = postInvisibleAnim;
-    }
-    return () => {
-      if (animation) {
-        animation.cancel();
-      }
-    };
-  }, [visible, animationRef, onAfterCloseRef, onAfterOpenRef]);
-
-  return (
-    mounted && (
-      <ContainWrapper
-        ref={lightboxRef}
-        size={true}
-        layout={true}
-        paint={true}
-        part="lightbox"
-        contentClassName={classes.content}
-        wrapperClassName={classes.wrapper}
-        contentProps={CONTENT_PROPS}
-        role="dialog"
-        tabIndex="0"
-        onKeyDown={(event) => {
-          if (event.key === Keys.ESCAPE) {
-            setVisible(false);
-          }
-        }}
-        {...rest}
-      >
-        <CloseButton as={closeButtonAs} onClick={() => setVisible(false)} />
-        {children}
-      </ContainWrapper>
-    )
-  );
-}
-
-const BentoLightbox = forwardRef(BentoLightboxWithRef);
-BentoLightbox.displayName = 'Lightbox';
-export {BentoLightbox};
-
-/**
- *
- * @param {!BentoLightboxDef.CloseButtonProps} props
- * @return {PreactDef.Renderable}
- */
-function CloseButton({onClick, as: Comp = ScreenReaderCloseButton}) {
-  return <Comp aria-label={DEFAULT_CLOSE_LABEL} onClick={onClick} />;
-}
-
-/**
- * This is for screen-readers only, should not get a tab stop. Note that
- * screen readers can still swipe / navigate to this element, it just will
- * not be reachable via the tab button. Note that for desktop, hitting esc
- * to close is also an option.
- *
- * We do not want this in the tab order since it is not really "visible"
- * and would be confusing to tab to if not using a screen reader.
- *
- * @param {!BentoLightboxDef.CloseButtonProps} props
- * @return {PreactDef.Renderable}
- */
-function ScreenReaderCloseButton({'aria-label': ariaLabel, onClick}) {
-  const classes = useStyles();
-  return (
-    <button
-      aria-label={ariaLabel}
-      class={classes.closeButton}
-      onClick={onClick}
-      tabIndex={-1}
-    />
-  );
-}
diff --git a/extensions/amp-lightbox/1.0/example/index.html b/extensions/amp-lightbox/1.0/example/index.html
new file mode 100644
index 000000000000..37e85cc22099
--- /dev/null
+++ b/extensions/amp-lightbox/1.0/example/index.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-lightbox-1.0.css"
+    />
+    <script src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      async
+      src="https://cdn.ampproject.org/v0/bento-lightbox-1.0.js"
+    ></script>
+    <style>
+      body {
+        font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
+          Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
+          'Segoe UI Symbol';
+        margin: 2rem;
+        background: #ecf1f3;
+      }
+      button {
+        border: none;
+        padding: 1rem 2rem;
+        border-radius: 8px;
+        color: #269da3;
+        background: white;
+        font-size: 18px;
+        font-weight: bold;
+        margin-right: 1rem;
+      }
+      .lightbox-content {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background-color: #269da3;
+        height: 100%;
+        flex-direction: column;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-lightbox id="my-lightbox" hidden>
+      <div class="lightbox-content">
+        <h1>Lightboxed content</h1>
+        <button id="close-button">Close lightbox</button>
+      </div>
+    </bento-lightbox>
+    <button id="open-button">Open lightbox</button>
+    <script>
+      (async () => {
+        const lightboxElement = document.querySelector('#my-lightbox');
+        await customElements.whenDefined('bento-lightbox');
+        const lightbox = await lightboxElement.getApi();
+
+        // set up button actions
+        document.querySelector('#open-button').onclick = () => lightbox.open();
+        document.querySelector('#close-button').onclick = () =>
+          lightbox.close();
+      })();
+    </script>
+  </body>
+</html>
diff --git a/extensions/amp-lightbox/1.0/storybook/Basic.amp.js b/extensions/amp-lightbox/1.0/storybook/Basic.amp.js
index c67ca7e89ad4..d012acdbe22b 100644
--- a/extensions/amp-lightbox/1.0/storybook/Basic.amp.js
+++ b/extensions/amp-lightbox/1.0/storybook/Basic.amp.js
@@ -1,24 +1,39 @@
-import * as Preact from '#preact';
-import {boolean, select, text, withKnobs} from '@storybook/addon-knobs';
 import {withAmp} from '@ampproject/storybook-addon';
 
+import * as Preact from '#preact';
+
 export default {
   title: 'amp-lightbox-1_0',
-  decorators: [withKnobs, withAmp],
+  decorators: [withAmp],
 
   parameters: {
     extensions: [{name: 'amp-lightbox', version: '1.0'}],
   },
+  argTypes: {
+    animation: {
+      name: 'animation',
+      control: {type: 'select'},
+      options: ['fade-in', 'fly-in-top', 'fly-in-bottom'],
+    },
+    backgroundColor: {
+      name: 'background color',
+      control: {type: 'text'},
+      defaultValue: '',
+    },
+    color: {
+      name: 'font color',
+      control: {type: 'text'},
+      defaultValue: '',
+    },
+    lotsOfText: {
+      name: 'lotsOfText',
+      control: {type: 'boolean'},
+      defaultValue: true,
+    },
+  },
 };
 
-export const Default = () => {
-  const animation = select('animation', [
-    'fade-in',
-    'fly-in-top',
-    'fly-in-bottom',
-  ]);
-  const backgroundColor = text('background color', '');
-  const color = text('font color', '');
+export const Default = ({animation, backgroundColor, color, ...args}) => {
   return (
     <>
       <style>{`
@@ -28,7 +43,12 @@ export const Default = () => {
         }
       `}</style>
       <div style="height: 300px;">
-        <amp-lightbox id="lightbox" layout="nodisplay" animation={animation}>
+        <amp-lightbox
+          id="lightbox"
+          layout="nodisplay"
+          animation={animation}
+          {...args}
+        >
           <p>Test</p>
           <button slot="close-button">Close</button>
         </amp-lightbox>
@@ -40,15 +60,13 @@ export const Default = () => {
   );
 };
 
-export const overflowAuto = () => {
-  const animation = select('animation', [
-    'fade-in',
-    'fly-in-top',
-    'fly-in-bottom',
-  ]);
-  const backgroundColor = text('background color', 'rgba(0,0,0,0.5)');
-  const color = text('font color', '');
-  const lotsOfText = boolean('lots of text?', true);
+export const OverflowAuto = ({
+  animation,
+  backgroundColor,
+  color,
+  lotsOfText,
+  ...args
+}) => {
   return (
     <>
       <style>{`
@@ -58,7 +76,12 @@ export const overflowAuto = () => {
         }
       `}</style>
       <div style="height: 300px;">
-        <amp-lightbox id="lightbox" layout="nodisplay" animation={animation}>
+        <amp-lightbox
+          id="lightbox"
+          layout="nodisplay"
+          animation={animation}
+          {...args}
+        >
           <p>
             Dessert tootsie roll marzipan pastry. Powder powder jelly beans
             chocolate bar candy sugar plum. Jelly-o gummi bears jelly icing
diff --git a/extensions/amp-lightbox/1.0/storybook/Basic.js b/extensions/amp-lightbox/1.0/storybook/Basic.js
index 3188d3f01f9d..996980381b27 100644
--- a/extensions/amp-lightbox/1.0/storybook/Basic.js
+++ b/extensions/amp-lightbox/1.0/storybook/Basic.js
@@ -1,12 +1,29 @@
+import {BentoLightbox} from '#bento/components/bento-lightbox/1.0/component';
+
 import * as Preact from '#preact';
-import {BentoLightbox} from '../component';
-import {boolean, select, text, withKnobs} from '@storybook/addon-knobs';
 import {useRef} from '#preact';
 
+import '#bento/components/bento-lightbox/1.0/component.jss';
+
 export default {
   title: 'Lightbox',
   component: BentoLightbox,
-  decorators: [withKnobs],
+  argTypes: {
+    animation: {
+      name: 'animation',
+      defaultValue: 'fade-in',
+      options: ['fade-in', 'fly-in-top', 'fly-in-bottom'],
+      control: {type: 'select'},
+    },
+    backgroundColor: {
+      name: 'backgroundColor',
+      control: {type: 'color'},
+    },
+    color: {
+      name: 'color',
+      control: {type: 'color'},
+    },
+  },
 };
 
 /**
@@ -150,20 +167,13 @@ function BentoLightboxWithActions({children, ...rest}) {
   );
 }
 
-export const _default = () => {
-  const animation = select('animation', [
-    'fade-in',
-    'fly-in-top',
-    'fly-in-bottom',
-  ]);
-  const backgroundColor = text('background color', '');
-  const color = text('font color', '');
+export const _default = ({backgroundColor, color, ...args}) => {
   return (
     <div>
       <BentoLightboxWithActions
         id="lightbox"
-        animation={animation}
         style={{backgroundColor, color}}
+        {...args}
       >
         <p>
           Lorem <i>ips</i>um dolor sit amet, has nisl nihil convenire et, vim at
@@ -174,23 +184,13 @@ export const _default = () => {
   );
 };
 
-export const scrollable = () => {
-  const animation = select('animation', [
-    'fade-in',
-    'fly-in-top',
-    'fly-in-bottom',
-  ]);
-  const backgroundColor = text('background color', 'rgba(0, 0, 0, 0.5)');
-  const color = text('font color', '');
-  const scrollable = boolean('scrollable', true);
-  const lotsOfText = boolean('lots of text?', true);
+export const scrollable = ({backgroundColor, color, lotsOfText, ...args}) => {
   return (
     <div>
       <BentoLightboxWithActions
         id="lightbox"
-        animation={animation}
         style={{backgroundColor, color}}
-        scrollable={scrollable}
+        {...args}
       >
         <p>
           Dessert tootsie roll marzipan pastry. Powder powder jelly beans
@@ -325,3 +325,26 @@ export const scrollable = () => {
     </div>
   );
 };
+
+scrollable.args = {
+  scrollable: true,
+  lotsOfText: true,
+};
+
+scrollable.argtypes = {
+  animation: {
+    name: 'animation',
+    defaultValue: 'fade-in',
+    options: ['fade-in', 'fly-in-top', 'fly-in-bottom'],
+    control: {type: 'select'},
+  },
+  backgroundColor: {
+    name: 'backgroundColor',
+    control: {type: 'color'},
+    defaultValue: '',
+  },
+  color: {
+    name: 'color',
+    control: {type: 'color'},
+  },
+};
diff --git a/extensions/amp-lightbox/1.0/test-e2e/test-custom-close-button.js b/extensions/amp-lightbox/1.0/test-e2e/test-custom-close-button.js
index 42b7ce757b29..f5d24bd323a9 100644
--- a/extensions/amp-lightbox/1.0/test-e2e/test-custom-close-button.js
+++ b/extensions/amp-lightbox/1.0/test-e2e/test-custom-close-button.js
@@ -29,8 +29,7 @@ describes.endtoend(
       ).to.equal(0);
     });
 
-    // TODO(wg-components, #28948): Flaky during CI.
-    it.skip('should open the lightbox', async () => {
+    it('should open the lightbox', async () => {
       const open = await controller.findElement('#open');
       await controller.click(open);
 
diff --git a/extensions/amp-lightbox/1.0/test/test-amp-lightbox.js b/extensions/amp-lightbox/1.0/test/test-amp-lightbox.js
index 4ff880487729..3a4839cd1991 100644
--- a/extensions/amp-lightbox/1.0/test/test-amp-lightbox.js
+++ b/extensions/amp-lightbox/1.0/test/test-amp-lightbox.js
@@ -1,11 +1,17 @@
 import '../amp-lightbox';
-import {ActionInvocation} from '#service/action-impl';
-import {ActionTrust, DEFAULT_ACTION} from '#core/constants/action-constants';
+import {
+  ActionTrust_Enum,
+  DEFAULT_ACTION,
+} from '#core/constants/action-constants';
 import {htmlFor} from '#core/dom/static-template';
-import {poll} from '#testing/iframe';
+
 import {toggleExperiment} from '#experiments';
-import {whenCalled} from '#testing/helpers/service';
+
 import {Services} from '#service/';
+import {ActionInvocation} from '#service/action-impl';
+
+import {whenCalled} from '#testing/helpers/service';
+import {poll} from '#testing/iframe';
 
 describes.realWin(
   'amp-lightbox:1.0',
@@ -77,7 +83,7 @@ describes.realWin(
         const source = null;
         const caller = null;
         const event = null;
-        const trust = ActionTrust.DEFAULT;
+        const trust = ActionTrust_Enum.DEFAULT;
         return new ActionInvocation(
           element,
           method,
diff --git a/extensions/amp-lightbox/1.0/test/test-component.js b/extensions/amp-lightbox/1.0/test/test-component.js
index ccb20e6e7d99..0ea96db23d7c 100644
--- a/extensions/amp-lightbox/1.0/test/test-component.js
+++ b/extensions/amp-lightbox/1.0/test/test-component.js
@@ -1,7 +1,9 @@
-import * as Preact from '#preact';
-import {BentoLightbox} from '../component';
 import {mount} from 'enzyme';
 
+import {BentoLightbox} from '#bento/components/bento-lightbox/1.0/component';
+
+import * as Preact from '#preact';
+
 describes.sandboxed('Lightbox preact component v1.0', {}, () => {
   it('renders', () => {
     const ref = Preact.createRef();
diff --git a/extensions/amp-lightbox/test-e2e/test-amp-lightbox.js b/extensions/amp-lightbox/test-e2e/test-amp-lightbox.js
index c276cc81bfc6..9a9049d46723 100644
--- a/extensions/amp-lightbox/test-e2e/test-amp-lightbox.js
+++ b/extensions/amp-lightbox/test-e2e/test-amp-lightbox.js
@@ -33,8 +33,7 @@ describes.endtoend(
       ).to.equal(0);
     });
 
-    // TODO(#33413): Fix flaky tests
-    it.skip('should open the lightbox', async () => {
+    it('should open the lightbox', async () => {
       const open = await controller.findElement('#open');
       await controller.click(open);
 
@@ -59,7 +58,8 @@ describes.endtoend(
       ).to.equal(641);
     });
 
-    it('should close the lightbox', async () => {
+    // TODO(#40214): fix flaky test.
+    it.skip('should close the lightbox', async () => {
       const open = await controller.findElement('#open');
       await controller.click(open);
 
diff --git a/extensions/amp-lightbox/validator-amp-lightbox.protoascii b/extensions/amp-lightbox/validator-amp-lightbox.protoascii
index 29cc75b9782c..f97b42c4a2c1 100644
--- a/extensions/amp-lightbox/validator-amp-lightbox.protoascii
+++ b/extensions/amp-lightbox/validator-amp-lightbox.protoascii
@@ -1,8 +1,8 @@
 tags: {  # amp-lightbox 1.0
   html_format: AMP
   tag_name: "SCRIPT"
-  satisfies: "amp-lightbox 1.0"
-  excludes: "amp-lightbox 0.1"
+  satisfies_condition: "amp-lightbox 1.0"
+  excludes_condition: "amp-lightbox 0.1"
   extension_spec: {
     name: "amp-lightbox"
     version_name: "v1.0"
@@ -14,8 +14,8 @@ tags: {  # amp-lightbox 1.0
 tags: {  # amp-lightbox 0.1 and latest
   html_format: AMP
   tag_name: "SCRIPT"
-  satisfies: "amp-lightbox 0.1"
-  excludes: "amp-lightbox 1.0"
+  satisfies_condition: "amp-lightbox 0.1"
+  excludes_condition: "amp-lightbox 1.0"
   extension_spec: {
     name: "amp-lightbox"
     version_name: "v0.1"
diff --git a/extensions/amp-link-rewriter/0.1/amp-link-rewriter.js b/extensions/amp-link-rewriter/0.1/amp-link-rewriter.js
index 4f8809623fa6..d916cf65cede 100644
--- a/extensions/amp-link-rewriter/0.1/amp-link-rewriter.js
+++ b/extensions/amp-link-rewriter/0.1/amp-link-rewriter.js
@@ -1,7 +1,9 @@
-import {Layout} from '#core/dom/layout';
-import {LinkRewriter} from './link-rewriter';
-import {Priority} from '#service/navigation';
+import {Layout_Enum} from '#core/dom/layout';
+
 import {Services} from '#service';
+import {Priority_Enum} from '#service/navigation';
+
+import {LinkRewriter} from './link-rewriter';
 
 export class AmpLinkRewriter extends AMP.BaseElement {
   /** @param {!AmpElement} element */
@@ -51,14 +53,14 @@ export class AmpLinkRewriter extends AMP.BaseElement {
     const nav = Services.navigationForDoc(this.getAmpDoc());
     nav.registerAnchorMutator((anchor) => {
       this.rewriter_.handleClick(anchor);
-    }, Priority.LINK_REWRITER_MANAGER);
+    }, Priority_Enum.LINK_REWRITER_MANAGER);
 
     return true;
   }
 
   /** @override */
   isLayoutSupported(layout) {
-    return layout === Layout.NODISPLAY;
+    return layout === Layout_Enum.NODISPLAY;
   }
 }
 
diff --git a/extensions/amp-link-rewriter/0.1/config-options.js b/extensions/amp-link-rewriter/0.1/config-options.js
index 4e6d0ed0e19a..59f73bce4786 100644
--- a/extensions/amp-link-rewriter/0.1/config-options.js
+++ b/extensions/amp-link-rewriter/0.1/config-options.js
@@ -1,5 +1,6 @@
 import {getChildJsonConfig} from '#core/dom';
 import {hasOwn} from '#core/types/object';
+
 import {user, userAssert} from '#utils/log';
 
 /**
@@ -47,7 +48,7 @@ function getConfigJson(element) {
 
 /**
  * @param {!Object} attribute
- * @return {Object}
+ * @return {object}
  */
 function parseAttribute(attribute) {
   const newAttr = {};
diff --git a/extensions/amp-link-rewriter/0.1/link-rewriter.js b/extensions/amp-link-rewriter/0.1/link-rewriter.js
index ff1acaa8ea61..21f0c5ceee71 100644
--- a/extensions/amp-link-rewriter/0.1/link-rewriter.js
+++ b/extensions/amp-link-rewriter/0.1/link-rewriter.js
@@ -1,6 +1,8 @@
+import {getDataParamsFromAttributes} from '#core/dom';
+
 import {Services} from '#service';
+
 import {getConfigOpts} from './config-options';
-import {getDataParamsFromAttributes} from '#core/dom';
 import {getScopeElements, isElementInScope} from './scope';
 
 const WL_ANCHOR_ATTR = ['href', 'id', 'rel', 'rev'];
diff --git a/extensions/amp-link-rewriter/0.1/scope.js b/extensions/amp-link-rewriter/0.1/scope.js
index d4d890a5ef39..2ca4e42bb524 100644
--- a/extensions/amp-link-rewriter/0.1/scope.js
+++ b/extensions/amp-link-rewriter/0.1/scope.js
@@ -1,5 +1,4 @@
 import {closestAncestorElementBySelector} from '#core/dom/query';
-import {iterateCursor} from '#core/dom';
 
 /**
  *
@@ -18,7 +17,7 @@ export function getScopeElements(ampDoc, configOpts) {
     selection = doc.querySelectorAll(cssSelector);
   }
 
-  iterateCursor(selection, (element) => {
+  selection.forEach((element) => {
     if (hasAttributeValues(element, configOpts)) {
       filteredSelection.push(element);
     }
diff --git a/extensions/amp-link-rewriter/0.1/test/test-amp-link-rewriter.js b/extensions/amp-link-rewriter/0.1/test/test-amp-link-rewriter.js
index 7e54ef4add8b..70b81b69601a 100644
--- a/extensions/amp-link-rewriter/0.1/test/test-amp-link-rewriter.js
+++ b/extensions/amp-link-rewriter/0.1/test/test-amp-link-rewriter.js
@@ -1,7 +1,8 @@
-import {LinkRewriter} from '../link-rewriter';
+import helpersMaker from './test-helpers';
+
 import {getConfigOpts} from '../config-options';
+import {LinkRewriter} from '../link-rewriter';
 import {getScopeElements} from '../scope';
-import helpersMaker from './test-helpers';
 
 describes.fakeWin(
   'amp-link-rewriter',
diff --git a/extensions/amp-link-rewriter/validator-amp-link-rewriter.protoascii b/extensions/amp-link-rewriter/validator-amp-link-rewriter.protoascii
index d72dc42579c4..070929e78d47 100644
--- a/extensions/amp-link-rewriter/validator-amp-link-rewriter.protoascii
+++ b/extensions/amp-link-rewriter/validator-amp-link-rewriter.protoascii
@@ -7,9 +7,9 @@ tags: {  # amp-link-rewriter
     version: "latest"
   }
   attr_lists: "common-extension-attrs"
-  satisfies: "amp-link-rewriter"
-  excludes: "amp-skimlinks"
-  excludes: "amp-smartlinks"
+  satisfies_condition: "amp-link-rewriter"
+  excludes_condition: "amp-skimlinks"
+  excludes_condition: "amp-smartlinks"
 }
 tags: {  # amp-link-rewriter (json)
   html_format: AMP
diff --git a/extensions/amp-list/0.1/amp-list.js b/extensions/amp-list/0.1/amp-list.js
index bf1a2af2d0a8..04e885452533 100644
--- a/extensions/amp-list/0.1/amp-list.js
+++ b/extensions/amp-list/0.1/amp-list.js
@@ -1,10 +1,10 @@
-import {ActionTrust} from '#core/constants/action-constants';
-import {AmpEvents} from '#core/constants/amp-events';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
 import {Deferred} from '#core/data-structures/promise';
 import {isAmp4Email} from '#core/document/format';
 import {removeChildren, tryFocus} from '#core/dom';
 import {
-  Layout,
+  Layout_Enum,
   applyFillContent,
   getLayoutClass,
   isLayoutSizeDefined,
@@ -17,7 +17,7 @@ import {
 } from '#core/dom/query';
 import {px, setImportantStyles, setStyles, toggle} from '#core/dom/style';
 import {isArray, toArray} from '#core/types/array';
-import {dict, getValueForExpr} from '#core/types/object';
+import {getValueForExpr} from '#core/types/object';
 
 import {isExperimentOn} from '#experiments';
 
@@ -177,7 +177,7 @@ export class AmpList extends AMP.BaseElement {
 
   /** @override */
   isLayoutSupported(layout) {
-    if (layout === Layout.CONTAINER) {
+    if (layout === Layout_Enum.CONTAINER) {
       const doc = this.element.ownerDocument;
       const isEmail = doc && isAmp4Email(doc);
       const hasPlaceholder =
@@ -695,13 +695,16 @@ export class AmpList extends AMP.BaseElement {
    */
   triggerFetchErrorEvent_(error) {
     const event = error
-      ? createCustomEvent(
-          this.win,
-          `${TAG}.error`,
-          dict({'response': error.response})
-        )
+      ? createCustomEvent(this.win, `${TAG}.error`, {
+          'response': error.response,
+        })
       : null;
-    this.action_.trigger(this.element, 'fetch-error', event, ActionTrust.LOW);
+    this.action_.trigger(
+      this.element,
+      'fetch-error',
+      event,
+      ActionTrust_Enum.LOW
+    );
   }
 
   /**
@@ -793,7 +796,12 @@ export class AmpList extends AMP.BaseElement {
     let request;
     // Construct the fetch init data that would be called by the viewer
     // passed in as the 'originalRequest'.
-    return requestForBatchFetch(this.element, this.getPolicy_(), refresh)
+    return requestForBatchFetch(
+      this.element,
+      elementSrc,
+      this.getPolicy_(),
+      refresh
+    )
       .then((r) => {
         request = r;
 
@@ -805,13 +813,13 @@ export class AmpList extends AMP.BaseElement {
         );
         setupJsonFetchInit(r.fetchOpt);
 
-        const attributes = dict({
+        const attributes = {
           'ampListAttributes': {
             'items': this.element.getAttribute('items') || 'items',
             'singleItem': this.element.hasAttribute('single-item'),
             'maxItems': this.element.getAttribute('max-items'),
           },
-        });
+        };
         return this.ssrTemplateHelper_.ssr(
           this.element,
           request,
@@ -1139,9 +1147,19 @@ export class AmpList extends AMP.BaseElement {
         this.addElementsToContainer_(elements, container);
       }
 
+      // For amp-list embedded in the amp-story-page-attachment, because the attachment is initially in
+      // nodisplay mode, the layoutCallback of all amp-img elements are not called at all, even after
+      // the attachment is opened and amp-list fetches results and inserted built amp-img(from templates)
+      // into DOM. Force call layoutCallback to render images.
+      if (this.element.closest('amp-story-page-attachment')) {
+        this.container_.querySelectorAll('amp-img').forEach((element) => {
+          element.getImpl().then((impl) => impl.layoutCallback());
+        });
+      }
+
       const event = createCustomEvent(
         this.win,
-        AmpEvents.DOM_UPDATE,
+        AmpEvents_Enum.DOM_UPDATE,
         /* detail */ null,
         {bubbles: true}
       );
@@ -1324,7 +1342,7 @@ export class AmpList extends AMP.BaseElement {
    */
   attemptToFit_(target) {
     if (
-      this.element.getAttribute('layout') == Layout.CONTAINER &&
+      this.element.getAttribute('layout') == Layout_Enum.CONTAINER &&
       !this.enableManagedResizing_
     ) {
       return Promise.resolve(true);
@@ -1360,7 +1378,7 @@ export class AmpList extends AMP.BaseElement {
    * @private
    */
   attemptToFitLoadMoreElement_(element, target) {
-    if (this.element.getAttribute('layout') == Layout.CONTAINER) {
+    if (this.element.getAttribute('layout') == Layout_Enum.CONTAINER) {
       return;
     }
     this.measureElement(() => {
@@ -1401,15 +1419,15 @@ export class AmpList extends AMP.BaseElement {
     // TODO(amphtml): Remove [width] and [height] attributes too?
     if (
       [
-        Layout.FIXED,
-        Layout.FLEX_ITEM,
-        Layout.FLUID,
-        Layout.INTRINSIC,
-        Layout.RESPONSIVE,
+        Layout_Enum.FIXED,
+        Layout_Enum.FLEX_ITEM,
+        Layout_Enum.FLUID,
+        Layout_Enum.INTRINSIC,
+        Layout_Enum.RESPONSIVE,
       ].includes(layout)
     ) {
       setStyles(this.element, {width: '', height: ''});
-    } else if (layout == Layout.FIXED_HEIGHT) {
+    } else if (layout == Layout_Enum.FIXED_HEIGHT) {
       setStyles(this.element, {height: ''});
     }
 
@@ -1437,7 +1455,7 @@ export class AmpList extends AMP.BaseElement {
     }
     const previousLayout = this.element.getAttribute('i-amphtml-layout');
     // If we have already changed to layout container, no need to run again.
-    if (previousLayout == Layout.CONTAINER) {
+    if (previousLayout == Layout_Enum.CONTAINER) {
       return Promise.resolve();
     }
     return this.mutateElement(() => {
diff --git a/extensions/amp-list/0.1/test-e2e/test-load-more-auto.js b/extensions/amp-list/0.1/test-e2e/test-load-more-auto.js
index 4891f40b15ac..6f3a4f99a4ff 100644
--- a/extensions/amp-list/0.1/test-e2e/test-load-more-auto.js
+++ b/extensions/amp-list/0.1/test-e2e/test-load-more-auto.js
@@ -28,9 +28,8 @@ describes.endtoend(
         'none'
       );
 
-      const failedIndicator = await controller.findElement(
-        '[load-more-failed]'
-      );
+      const failedIndicator =
+        await controller.findElement('[load-more-failed]');
       await expect(failedIndicator).to.be.ok;
       await expect(
         controller.getElementCssValue(failedIndicator, 'display')
@@ -46,7 +45,7 @@ describes.endtoend(
       );
     });
 
-    it.skip('should load more items on scroll', async () => {
+    it('should load more items on scroll', async () => {
       let listItems = await controller.findElements('.item');
       await expect(listItems).to.have.length(2);
 
diff --git a/extensions/amp-list/0.1/test-e2e/test-load-more-manual.js b/extensions/amp-list/0.1/test-e2e/test-load-more-manual.js
index 6fac367c63d1..6d9e70fc7888 100644
--- a/extensions/amp-list/0.1/test-e2e/test-load-more-manual.js
+++ b/extensions/amp-list/0.1/test-e2e/test-load-more-manual.js
@@ -38,9 +38,8 @@ describes.endtoend(
         'none'
       );
 
-      const failedIndicator = await controller.findElement(
-        '[load-more-failed]'
-      );
+      const failedIndicator =
+        await controller.findElement('[load-more-failed]');
       await expect(failedIndicator).to.be.ok;
       await expect(
         controller.getElementCssValue(failedIndicator, 'display')
diff --git a/extensions/amp-list/0.1/test/test-amp-list.js b/extensions/amp-list/0.1/test/test-amp-list.js
index e0990fc59982..99347f323ae1 100644
--- a/extensions/amp-list/0.1/test/test-amp-list.js
+++ b/extensions/amp-list/0.1/test/test-amp-list.js
@@ -1,5 +1,5 @@
-import {ActionTrust} from '#core/constants/action-constants';
-import {AmpEvents} from '#core/constants/amp-events';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
 import {Deferred} from '#core/data-structures/promise';
 import {createElementWithAttributes} from '#core/dom';
 import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
@@ -457,7 +457,7 @@ describes.repeated(
             return list.layoutCallback().then(() => {
               expect(spy).to.have.been.calledOnce;
               expect(spy).calledWithMatch({
-                type: AmpEvents.DOM_UPDATE,
+                type: AmpEvents_Enum.DOM_UPDATE,
                 bubbles: true,
               });
             });
@@ -662,7 +662,7 @@ describes.repeated(
               list.element,
               'fetch-error',
               env.sandbox.match.any,
-              ActionTrust.LOW
+              ActionTrust_Enum.LOW
             );
           });
 
@@ -1579,7 +1579,7 @@ describes.realWin(
           'source',
           'caller',
           'event',
-          ActionTrust.HIGH
+          ActionTrust_Enum.HIGH
         );
         expect(element.enqueAction).to.be.calledWith(
           env.sandbox.match({
@@ -1590,7 +1590,7 @@ describes.realWin(
             method,
             node: element,
             source: 'source',
-            trust: ActionTrust.HIGH,
+            trust: ActionTrust_Enum.HIGH,
           })
         );
       });
diff --git a/extensions/amp-list/1.0/amp-list.css b/extensions/amp-list/1.0/amp-list.css
new file mode 100644
index 000000000000..d6b245ba63ad
--- /dev/null
+++ b/extensions/amp-list/1.0/amp-list.css
@@ -0,0 +1,3 @@
+amp-list {
+  /** No component styles needed */
+}
diff --git a/extensions/amp-list/1.0/amp-list.js b/extensions/amp-list/1.0/amp-list.js
new file mode 100644
index 000000000000..69ad1f269d55
--- /dev/null
+++ b/extensions/amp-list/1.0/amp-list.js
@@ -0,0 +1,107 @@
+import {isExperimentOn} from '#experiments';
+
+import {AmpPreactBaseElement, setSuperClass} from '#preact/amp-base-element';
+
+import {Services} from '#service';
+
+import {userAssert} from '#utils/log';
+
+import {BaseElement} from './base-element';
+
+import {FetchJsonUtil} from '../../amp-render/1.0/shared/amp-fetch-utils';
+
+/** @const {string} */
+const TAG = 'amp-list';
+
+/** @extends {PreactBaseElement<BentoListDef.BentoListApi>} */
+class AmpList extends setSuperClass(BaseElement, AmpPreactBaseElement) {
+  /** @param {!AmpElement} element */
+  constructor(element) {
+    super(element);
+
+    /** @private {?../../../src/service/template-impl.Templates} */
+    this.templates_ = null;
+
+    /** @private {?Element} */
+    this.template_ = null;
+
+    /** @private {string} */
+    this.src_ = null;
+
+    /** @private {FetchJsonUtil} */
+    this.fetchUtil_ = null;
+  }
+
+  /** @override */
+  init() {
+    this.registerApiAction('refresh', (api) => api./*OK*/ refresh());
+
+    this.src_ = this.element.getAttribute('src');
+    this.fetchUtil_ = new FetchJsonUtil(TAG, this.element, this.src_);
+
+    return {
+      'fetchJson': this.fetchUtil_.getFetchJsonCallback(),
+    };
+  }
+
+  /** @override */
+  isLayoutSupported(layout) {
+    userAssert(
+      isExperimentOn(this.win, 'bento') ||
+        isExperimentOn(this.win, 'bento-list'),
+      'expected global "bento" or specific "bento-list" experiment to be enabled'
+    );
+    return super.isLayoutSupported(layout);
+  }
+
+  /** @override */
+  checkPropsPostMutations() {
+    const templates =
+      this.templates_ ||
+      (this.templates_ = Services.templatesForDoc(this.element));
+    const template = templates.maybeFindTemplate(this.element);
+    if (template === this.template_) {
+      return;
+    }
+    this.template_ = template;
+    if (template) {
+      // Only overwrite `render` when template is ready to minimize FOUC.
+      templates.getTemplateRenderer(template).then((renderer) => {
+        if (template !== this.template_) {
+          // A new template has been set while the old one was initializing.
+          return;
+        }
+        const renderAsString = (data) => {
+          const html = renderer.renderAsString(data);
+          return {'__html': html};
+        };
+        this.mutateProps({'template': renderAsString});
+      });
+    } else {
+      this.mutateProps({'template': null});
+    }
+  }
+
+  /** @override */
+  mutationObserverCallback() {
+    const src = this.element.getAttribute('src');
+    if (src === this.src_) {
+      return;
+    }
+    this.src_ = src;
+    this.mutateProps({'fetchJson': this.fetchUtil_.getFetchJsonCallback()});
+  }
+
+  /** @override */
+  isReady(props) {
+    if (this.template_ && !('template' in props)) {
+      // The template is specified, but not available yet.
+      return false;
+    }
+    return true;
+  }
+}
+
+AMP.extension(TAG, '1.0', (AMP) => {
+  AMP.registerElement(TAG, AmpList);
+});
diff --git a/extensions/amp-list/1.0/base-element.js b/extensions/amp-list/1.0/base-element.js
new file mode 100644
index 000000000000..2e1e7dc01017
--- /dev/null
+++ b/extensions/amp-list/1.0/base-element.js
@@ -0,0 +1,27 @@
+import {PreactBaseElement} from '#preact/base-element';
+
+import {BentoList} from './component';
+
+export class BaseElement extends PreactBaseElement {}
+
+/** @override */
+BaseElement['Component'] = BentoList;
+
+/** @override */
+BaseElement['props'] = {
+  'src': {attr: 'src'},
+  'itemsKey': {attr: 'items'},
+  'maxItems': {attr: 'max-items', type: 'number'},
+  'loadMore': {attr: 'load-more'},
+  'loadMoreBookmark': {attr: 'load-more-bookmark'},
+  'viewportBuffer': {attr: 'viewport-buffer', type: 'number'},
+};
+
+/** @override */
+BaseElement['layoutSizeDefined'] = true;
+
+/** @override */
+BaseElement['usesShadowDom'] = true;
+
+/** @override */
+BaseElement['usesTemplate'] = true;
diff --git a/extensions/amp-list/1.0/component.js b/extensions/amp-list/1.0/component.js
new file mode 100644
index 000000000000..88412f484e6e
--- /dev/null
+++ b/extensions/amp-list/1.0/component.js
@@ -0,0 +1,240 @@
+import * as Preact from '#preact';
+import {
+  Fragment,
+  cloneElement,
+  isValidElement,
+  useEffect,
+  useImperativeHandle,
+  useMemo,
+  useRef,
+} from '#preact';
+import {forwardRef} from '#preact/compat';
+import {ContainWrapper} from '#preact/component';
+import {useIsInViewport} from '#preact/component/intersection-observer';
+import {useAmpContext} from '#preact/context';
+import {useInfiniteQuery} from '#preact/hooks/useInfiniteQuery';
+import {xhrUtils} from '#preact/utils/xhr';
+
+import {useStyles} from './component.jss';
+
+const defaultItemTemplate = (item) => <div>{String(item)}</div>;
+const defaultWrapperTemplate = (list) => <div>{list}</div>;
+const defaultErrorTemplate = (styles, unusedError) => (
+  <div>
+    {'Unable to Load More '}
+    <button load-more-retry>
+      <label>
+        <span class={styles.loadMoreIcon} /> Retry
+      </label>
+    </button>
+  </div>
+);
+const defaultLoadMoreTemplate = () => (
+  <div>
+    <button load-more-button>
+      <label>See More</label>
+    </button>
+  </div>
+);
+const defaultLoadingTemplate = (styles) => (
+  <div>
+    <span aria-label="Loading" class={styles.loadMoreSpinner} />
+  </div>
+);
+
+/**
+ * Retrieves the key from the object.
+ * Supports dot notation.
+ * Returns undefined if any segment not found.
+ * @example
+ *   getValue({ a: 5 }, 'a') === 5
+ *   getValue({ a: 5 }, 'a.b.c') === undefined
+ *   getValue({ a: { b: { c: 5 } } }, 'a.b.c') === 5
+ * @param {object} object
+ * @param {string} keys
+ * @return {*}
+ */
+function getValue(object, keys) {
+  return keys.split('.').reduce((items, key) => {
+    if (!items || key === '') {
+      return items;
+    }
+    return items[key];
+  }, object);
+}
+
+/**
+ * Returns the nextUrl, according to the `loadMoreBookmark` string
+ * @param {*} lastPage
+ * @param {string} loadMoreBookmark
+ * @return {*}
+ */
+function getNextUrl(lastPage, loadMoreBookmark) {
+  return getValue(lastPage, loadMoreBookmark);
+}
+
+/**
+ *
+ * @param {object} pageData
+ * @param {string} itemsKey
+ * @return {*}
+ */
+function getItemsFromPage(pageData, itemsKey) {
+  if (!pageData) {
+    return [];
+  }
+  let items = getValue(pageData, itemsKey);
+  if (!items) {
+    return [];
+  }
+  if (!Array.isArray(items)) {
+    items = [items];
+  }
+  return items;
+}
+
+/**
+ * @param {!BentoListDef.Props} props
+ * @param {BentoListDef.BentoListApi} ref
+ * @return {PreactDef.Renderable}
+ */
+export function BentoListWithRef(
+  {
+    errorTemplate = defaultErrorTemplate,
+    fetchJson = xhrUtils.fetchJson,
+    itemsKey = 'items',
+    loadMore: loadMoreMode = 'none',
+    loadMoreBookmark = 'load-more-src',
+    loadMoreTemplate = defaultLoadMoreTemplate,
+    loadingTemplate = defaultLoadingTemplate, // When loadMore === 'auto', keep loading up to 2 viewports of data
+    maxItems = 0,
+    src = null,
+    template: itemTemplate = defaultItemTemplate,
+    viewportBuffer = 2.0,
+    wrapperTemplate = defaultWrapperTemplate,
+    ...rest
+  },
+  ref
+) {
+  const {renderable} = useAmpContext();
+
+  const ioOptions = useMemo(() => {
+    const bufferPct = Math.floor(viewportBuffer * 100);
+    return /** @type {IOOptions} */ {
+      rootMargin: `0% 0% ${bufferPct}% 0%`,
+      threshold: 0,
+    };
+  }, [viewportBuffer]);
+
+  const bottomRef = useRef(null);
+  const isBottomNearingViewport = useIsInViewport(bottomRef, ioOptions);
+
+  const {error, hasMore, loadMore, loading, pages, reset} = useInfiniteQuery({
+    fetchPage: async ({pageParam: nextUrl = src}) => {
+      if (!renderable) {
+        return null;
+      }
+      const page = await fetchJson(nextUrl);
+      return page;
+    },
+    getNextPageParam(lastPage) {
+      return getNextUrl(lastPage, loadMoreBookmark);
+    },
+  });
+
+  // Reset when these props change:
+  useEffect(() => {
+    reset();
+  }, [src, renderable, loadMoreBookmark, reset]);
+
+  const shouldLoadMore =
+    renderable &&
+    loadMoreMode === 'auto' &&
+    isBottomNearingViewport &&
+    !loading &&
+    hasMore;
+
+  useEffect(() => {
+    if (shouldLoadMore) {
+      loadMore();
+    }
+  }, [shouldLoadMore, loadMore]);
+
+  // Rendering logic:
+  const list = useMemo(() => {
+    let items = pages.flatMap((page) => getItemsFromPage(page, itemsKey));
+
+    if (maxItems > 0 && items.length > maxItems) {
+      items = items.slice(0, maxItems);
+    }
+
+    return items.map((item, i) => {
+      let renderedItem = itemTemplate(item);
+
+      // The template engine outputs raw HTML:
+      if (
+        renderedItem &&
+        typeof renderedItem === 'object' &&
+        typeof renderedItem.__html === 'string'
+      ) {
+        renderedItem = <span dangerouslySetInnerHTML={renderedItem} />;
+      }
+
+      return augment(renderedItem, {'key': i, 'role': 'listitem'});
+    });
+  }, [pages, itemsKey, maxItems, itemTemplate]);
+
+  const handleContainerClick = (ev) => {
+    const loadMoreButton = ev.target.closest(
+      '[load-more-button], [load-more-retry]'
+    );
+    if (loadMoreButton) {
+      loadMore();
+    }
+  };
+
+  const showLoading = loading;
+  const showResults = list.length !== 0;
+  const showLoadMore = loadMoreMode === 'manual' && hasMore && !loading;
+
+  useImperativeHandle(
+    ref,
+    () =>
+      /** @type {!BentoListDef.BentoListApi} */ ({
+        refresh: reset,
+      }),
+    [reset]
+  );
+
+  const styles = useStyles();
+
+  return (
+    <ContainWrapper aria-live="polite" {...rest} onClick={handleContainerClick}>
+      <Fragment test-id="contents">
+        {showResults && augment(wrapperTemplate(list), {'role': 'list'})}
+        {showLoading && loadingTemplate(styles)}
+        {showLoadMore && loadMoreTemplate(styles)}
+        {error && errorTemplate(styles, error)}
+        {loadMoreMode === 'auto' && <span ref={bottomRef} />}
+      </Fragment>
+    </ContainWrapper>
+  );
+}
+
+const BentoList = forwardRef(BentoListWithRef);
+BentoList.displayName = 'List';
+export {BentoList};
+
+/**
+ * Augments the component with properties
+ *
+ * @param {PreactDef.Renderable} component
+ * @param {object} props
+ * @return {!PreactDef.Renderable}
+ */
+function augment(component, props) {
+  if (!isValidElement(component)) {
+    return component;
+  }
+  return cloneElement(component, {...props, ...component.props});
+}
diff --git a/extensions/amp-list/1.0/component.jss.js b/extensions/amp-list/1.0/component.jss.js
new file mode 100644
index 000000000000..5a86ef95302c
--- /dev/null
+++ b/extensions/amp-list/1.0/component.jss.js
@@ -0,0 +1,40 @@
+import {createUseStyles} from 'react-jss';
+
+// Make sure to replace "#" with "%23" in these strings!
+const spinnerIcon = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 40"><defs><linearGradient id="grad"><stop stop-color="rgb(51,51,51)" stop-opacity=".75"></stop><stop offset="100%" stop-color="rgb(51,51,51)" stop-opacity="0"></stop></linearGradient></defs><path d="M11,4.4 A18,18, 0,1,0, 38,20" fill="none" stroke="url(%23grad)" stroke-width="1.725"></path></svg>`;
+const refreshIcon = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="currentColor" d="M17.65 6.35C16.2 4.9 14.21 4 12 4c-4.42 0-7.99 3.58-7.99 8s3.57 8 7.99 8c3.73 0 6.84-2.55 7.73-6h-2.08c-.82 2.33-3.04 4-5.65 4-3.31 0-6-2.69-6-6s2.69-6 6-6c1.66 0 3.14.69 4.22 1.78L13 11h7V4l-2.35 2.35z"></path></svg>`;
+
+const loadMoreSpinner = {
+  'display': 'inline-block',
+  'vertical-align': 'middle',
+  'width': '1em',
+  'height': '1em',
+
+  'background-image': `url('data:image/svg+xml;charset=utf-8,${spinnerIcon}')`,
+  'animation': '1000ms $loadMoreSpinnerKeyframes linear infinite',
+};
+
+const loadMoreIcon = {
+  'height': '1em',
+  'width': '1em',
+  'display': 'inline-block',
+  'vertical-align': 'middle',
+  'background-image': `url('data:image/svg+xml;charset=utf-8,${refreshIcon}')`,
+};
+
+const JSS = {
+  '@keyframes loadMoreSpinnerKeyframes': {
+    '0%': {
+      transform: 'rotate(0deg)',
+    },
+    '100%': {
+      transform: 'rotate(360deg)',
+    },
+  },
+  loadMoreSpinner,
+  loadMoreIcon,
+};
+
+// useStyles gets replaced for AMP builds via `babel-plugin-transform-jss`.
+// eslint-disable-next-line local/no-export-side-effect
+export const useStyles = createUseStyles(JSS);
diff --git a/extensions/amp-list/1.0/component.type.js b/extensions/amp-list/1.0/component.type.js
new file mode 100644
index 000000000000..bf8d6e2432e3
--- /dev/null
+++ b/extensions/amp-list/1.0/component.type.js
@@ -0,0 +1,35 @@
+/** @externs */
+
+/** @const */
+var BentoListDef = {};
+
+/**
+ * @typedef {{
+ *   loadMoreSpinner: string,
+ *   loadMoreIcon: string,
+ * }}
+ */
+BentoListDef.CssStyles;
+
+/**
+ * @typedef {{
+ *   src: (string|undefined),
+ *   fetchItems?: (function(): Promise<*>),
+ *   itemsKey?: string,
+ *   maxItems?: number,
+ *   loadMore?: 'manual' | 'none' | 'auto',
+ *   loadMoreBookmark?: string,
+ *   viewportBuffer?: number,
+ *   template?: function(item: *): PreactDef.Renderable,
+ *   wrapperTemplate?: function(list: PreactDef.Renderable): PreactDef.Renderable,
+ *   loadingTemplate?: function(styles: BentoListDef.CssStyles): PreactDef.Renderable,
+ *   loadMoreTemplate?: function(styles: BentoListDef.CssStyles): PreactDef.Renderable,
+ *   errorTemplate?: function(styles: BentoListDef.CssStyles): PreactDef.Renderable,
+ * }}
+ */
+BentoListDef.Props;
+
+/** @interface */
+BentoListDef.BentoListApi = class {
+  async refresh() {}
+};
diff --git a/extensions/amp-list/1.0/storybook/Basic.amp.js b/extensions/amp-list/1.0/storybook/Basic.amp.js
new file mode 100644
index 000000000000..5b457d2cf117
--- /dev/null
+++ b/extensions/amp-list/1.0/storybook/Basic.amp.js
@@ -0,0 +1,42 @@
+import {withAmp} from '@ampproject/storybook-addon';
+
+import * as Preact from '#preact';
+
+export default {
+  title: 'amp-list-1_0',
+  decorators: [withAmp],
+  parameters: {
+    extensions: [
+      {name: 'amp-list', version: '1.0'},
+      {name: 'amp-mustache', version: '0.2'},
+    ],
+    experiments: ['bento'],
+  },
+  args: {},
+};
+
+export const BasicExample = (args) => {
+  return (
+    <div style={{outline: '1px solid blue', margin: 2}}>
+      <amp-list
+        {...args}
+        src="https://jsonplaceholder.typicode.com/users"
+        items="."
+      >
+        <template
+          type="amp-mustache"
+          dangerouslySetInnerHTML={{
+            __html: `
+              {{% raw %}}
+              <div>
+                <h3>Name: {{name}} ({{username}})</h3>
+                <p>Contact: {{email}}; {{phone}}</p>
+              </div>
+              {{% endraw %}}
+            `,
+          }}
+        />
+      </amp-list>
+    </div>
+  );
+};
diff --git a/extensions/amp-list/1.0/storybook/Basic.js b/extensions/amp-list/1.0/storybook/Basic.js
new file mode 100644
index 000000000000..23ce25c23821
--- /dev/null
+++ b/extensions/amp-list/1.0/storybook/Basic.js
@@ -0,0 +1,229 @@
+import * as Preact from '#preact';
+import {useState} from '#preact';
+
+import {BentoList} from '../component';
+
+export default {
+  title: 'List',
+  component: BentoList,
+  args: {},
+};
+
+export const SimpleList = (args) => {
+  return (
+    <BentoList
+      {...args}
+      fetchJson={async () => ({items: ['one', 'two', 'three']})}
+    />
+  );
+};
+export const LoadingState = (args) => {
+  return (
+    <BentoList
+      {...args}
+      fetchJson={async () => {
+        await new Promise((unusedResolve) => {});
+      }}
+    />
+  );
+};
+export const ErrorState = (args) => {
+  return (
+    <BentoList
+      {...args}
+      fetchJson={async () => {
+        throw new Error('example error message');
+      }}
+    />
+  );
+};
+
+function delay(ms = 250) {
+  return new Promise((r) => setTimeout(r, ms));
+}
+export const LoadMore = (args) => {
+  const fetchJson = async (url) => {
+    if (url === 'page-1') {
+      return {items: ['one', 'two', 'three'], 'load-more-src': 'page-2'};
+    }
+    if (url === 'page-2') {
+      await delay();
+      return {items: ['four', 'five', 'six'], 'load-more-src': 'page-3'};
+    }
+    if (url === 'page-3') {
+      await delay();
+      return {items: ['seven', 'eight', 'nine'], 'load-more-src': null};
+    }
+  };
+
+  return (
+    <BentoList {...args} loadMore="manual" src="page-1" fetchJson={fetchJson} />
+  );
+};
+
+const fetchJsonInfinite = async (url) => {
+  await delay();
+  // Increment the URL:
+  const nextPage = url.replace(/\d+/, ($0) => String(Number($0) + 1));
+  return {items: [url], 'load-more-src': nextPage};
+};
+const lorem = `Lorem ipsum dolor sit amet, consectetur adipisicing elit. Autem deserunt eligendi ex exercitationem expedita magnam pariatur quae quas qui vitae. Commodi culpa ducimus et nulla numquam obcaecati officiis recusandae vel vitae? Ab commodi culpa cupiditate doloremque ea eius, enim eos et excepturi modi nam obcaecati odit optio quam quidem quo quod reiciendis saepe soluta suscipit tempora ullam voluptatum. Accusantium amet inventore, ipsa modi, molestias natus nostrum nulla omnis quas recusandae rem reprehenderit repudiandae, sint totam voluptas voluptate voluptates? Aperiam cupiditate deleniti facilis maiores nostrum obcaecati omnis pariatur, quae quibusdam rerum tempore totam voluptatum! Ab alias dolore dolores eligendi facere libero nihil non odio tempora? Accusantium asperiores aspernatur at beatae corporis culpa delectus, dicta doloremque doloribus dolorum eaque error exercitationem harum in minus modi nesciunt, nisi nobis nulla odit pariatur praesentium provident quas quia quo quos recusandae reiciendis sapiente suscipit tempora tenetur velit voluptates voluptatum? A aperiam architecto aspernatur beatae deleniti eius enim facilis fuga ipsa laudantium libero mollitia nihil nostrum nulla, omnis quae recusandae sequi veritatis. Consectetur cum dignissimos, exercitationem ipsum libero magnam natus numquam officiis, quos recusandae sit ullam ut? Ad, aliquam atque deleniti, dolor dolorum est facilis id inventore ipsa magnam porro quasi quos similique vel velit voluptate?`;
+
+export const InfiniteScrollSimple = (args) => {
+  const [pages, setPages] = useState(0);
+  return (
+    <>
+      <header
+        style={{
+          position: 'sticky',
+          top: '0',
+          background: 'white',
+          border: '1px solid currentColor',
+        }}
+      >
+        Items continue to load until the end of the list is off-screen (plus a
+        buffer).
+        <br />
+        The default viewport buffer is 2 viewports tall, so a lot of items will
+        be loaded! <br />
+        Total number of pages loaded: {pages}
+      </header>
+
+      <BentoList
+        {...args}
+        loadMore="auto"
+        src="Page 1"
+        fetchJson={fetchJsonInfinite}
+        wrapper={(list) => {
+          setPages(list.length); // Track the total size
+          return <div>{list}</div>;
+        }}
+      />
+      <p>{lorem}</p>
+    </>
+  );
+};
+
+export const InfiniteScrollTest = (args) => {
+  const [pages, setPages] = useState(0);
+
+  return (
+    <>
+      <header
+        style={{
+          position: 'sticky',
+          top: '0',
+          background: 'white',
+          border: '1px solid currentColor',
+        }}
+      >
+        Here, <code>viewportBuffer = -0.3</code> so items stop loading at the
+        bottom of the viewport.
+        <br />
+        Total number of pages loaded: {pages}
+      </header>
+      <BentoList
+        {...args}
+        loadMore="auto"
+        src="Page 1"
+        fetchJson={fetchJsonInfinite}
+        viewportBuffer={-0.3}
+        wrapper={(list) => {
+          setPages(list.length); // Track the total size
+          return <div>{list}</div>;
+        }}
+      />
+      <p>{lorem}</p>
+    </>
+  );
+};
+
+export const ChangingProps = (args) => {
+  // Simulate an API with a lot of options
+  const fetchJson = async (url) => {
+    await delay(1000);
+
+    const gen = (length, create) =>
+      new Array(length).fill(null).map((_, i) => create(i));
+
+    // eslint-disable-next-line prefer-const
+    let [source, start, count] = url.split(',');
+    start = Number(start || 0);
+    count = Number(count || 2);
+    const nextUrl = [source, start + count, count].join(',');
+    const nextUrl10 = [source, start + count, 10].join(',');
+    return {
+      popularity: gen(
+        26,
+        (i) => `${source} > popularity > item ${i + 1}`
+      ).slice(start, start + count),
+      alphabetical: gen(
+        26,
+        (i) =>
+          `${source} > alphabetical > item ${String.fromCharCode(
+            'A'.charCodeAt(0) + i
+          )}`
+      ).slice(start, start + count),
+      'load-more-src': nextUrl,
+      'load-10': nextUrl10,
+    };
+  };
+
+  const srcOptions = ['url-1', 'url-2', 'url-3'];
+  const [src, setSrc] = useState(srcOptions[0]);
+
+  const itemsKeyOptions = ['popularity', 'alphabetical'];
+  const [itemsKey, setItemsKey] = useState(itemsKeyOptions[0]);
+
+  const loadMoreBookmarkOptions = ['load-more-src', 'load-10'];
+  const [loadMoreBookmark, setLoadMoreBookmark] = useState(
+    loadMoreBookmarkOptions[0]
+  );
+
+  return (
+    <>
+      <fieldset>
+        <legend>src: </legend>
+        <select onChange={(e) => setSrc(e.currentTarget.value)}>
+          {srcOptions.map((opt) => (
+            <option key={opt}>{opt}</option>
+          ))}
+        </select>{' '}
+        <span>
+          Changing this will cause the list to reset from the beginning
+        </span>
+      </fieldset>
+      <fieldset>
+        <legend>loadMoreBookmark: </legend>
+        <select onChange={(e) => setLoadMoreBookmark(e.currentTarget.value)}>
+          {loadMoreBookmarkOptions.map((opt) => (
+            <option key={opt}>{opt}</option>
+          ))}
+        </select>{' '}
+        <span>
+          Changing this will cause the list to reset from the beginning
+        </span>
+      </fieldset>
+      <fieldset>
+        <legend>itemsKey: </legend>
+        <select onChange={(e) => setItemsKey(e.currentTarget.value)}>
+          {itemsKeyOptions.map((opt) => (
+            <option key={opt}>{opt}</option>
+          ))}
+        </select>{' '}
+        <span>
+          Changing this will update instantly, because the data does not need to
+          be refetched.
+        </span>
+      </fieldset>
+      <BentoList
+        {...args}
+        src={src}
+        itemsKey={itemsKey}
+        fetchJson={fetchJson}
+        loadMore={'auto'}
+        loadMoreBookmark={loadMoreBookmark}
+      />
+    </>
+  );
+};
diff --git a/extensions/amp-list/1.0/test/test-amp-list.js b/extensions/amp-list/1.0/test/test-amp-list.js
new file mode 100644
index 000000000000..fa6caafedeb2
--- /dev/null
+++ b/extensions/amp-list/1.0/test/test-amp-list.js
@@ -0,0 +1,115 @@
+import '../amp-list';
+import {htmlFor} from '#core/dom/static-template';
+
+import {toggleExperiment} from '#experiments';
+
+import {Services} from '#service';
+
+import {sleep} from '#testing/helpers';
+import {cleanHtml} from '#testing/helpers/cleanHtml';
+import {waitFor, whenCalled} from '#testing/helpers/service';
+
+import '../../../amp-mustache/0.2/amp-mustache';
+
+const CONTENTS = 'div > div'; // TODO: find a better way to find the component's contents
+function snapshot(element) {
+  const keep = ['aria-label'];
+  return cleanHtml(element.shadowRoot.querySelector(CONTENTS).innerHTML, keep);
+}
+
+describes.realWin(
+  'amp-list-v1.0',
+  {
+    amp: {
+      extensions: ['amp-mustache:0.2', 'amp-list:1.0'],
+    },
+  },
+  (env) => {
+    let win;
+    let doc;
+    let html;
+
+    beforeEach(async () => {
+      win = env.win;
+      doc = win.document;
+      html = htmlFor(doc);
+      toggleExperiment(win, 'bento-list', true, true);
+    });
+
+    async function mountElement(element) {
+      doc.body.appendChild(element);
+      await element.buildInternal();
+      await waitFor(() => element.isConnected, 'element connected');
+      await waitFor(
+        () => element.shadowRoot.querySelector(CONTENTS).innerHTML,
+        'element initial render'
+      );
+      return element;
+    }
+
+    let fetchJson;
+    beforeEach(() => {
+      const xhr = Services.batchedXhrFor(env.win);
+
+      fetchJson = env.sandbox.stub().resolves({items: ['one', 'two', 'three']});
+      env.sandbox.stub(xhr, 'fetchJson').callsFake(async (...args) => {
+        await sleep(50); // Ensure enough time to catch the "Loading" state
+        return {json: () => fetchJson(...args)};
+      });
+    });
+
+    const expectedLoading = '<div><span aria-label="Loading"></span></div>';
+    const expectedPage1 = `<div><span>one</span><span>two</span><span>three</span></div>`;
+
+    it('renders the Loading state, then renders the results', async () => {
+      const element = await mountElement(
+        html`<amp-list src="test.json">
+          <template type="amp-mustache">{{.}}</template>
+        </amp-list>`
+      );
+
+      expect(snapshot(element)).to.equal(expectedLoading);
+
+      await whenCalled(fetchJson);
+
+      expect(snapshot(element)).to.equal(expectedPage1);
+    });
+    it('renders the template for each item', async () => {
+      fetchJson.resolves({
+        items: [
+          {first: 'A', second: 'B', third: 'C'},
+          {first: '1', second: '2', third: '3'},
+          {first: 'do', second: 're', third: 'mi'},
+        ],
+      });
+      const element = await mountElement(
+        html`<amp-list src="test.json">
+          <template type="amp-mustache">
+            <h1>{{first}}</h1>
+            <h2>{{second}}</h2>
+            <h3>{{third}}</h3>
+          </template>
+        </amp-list>`
+      );
+      await whenCalled(fetchJson);
+
+      expect(snapshot(element)).to.equal(
+        cleanHtml(`
+          <div><span>
+            <h1>A</h1>
+            <h2>B</h2>
+            <h3>C</h3>
+          </span><span>
+            <h1>1</h1>
+            <h2>2</h2>
+            <h3>3</h3>
+          </span><span>
+            <h1>do</h1>
+            <h2>re</h2>
+            <h3>mi</h3>
+          </span></div>
+        `)
+      );
+    });
+  }
+);
diff --git a/extensions/amp-list/1.0/test/test-component.js b/extensions/amp-list/1.0/test/test-component.js
new file mode 100644
index 000000000000..8f3dc8f41025
--- /dev/null
+++ b/extensions/amp-list/1.0/test/test-component.js
@@ -0,0 +1,448 @@
+import {mount} from 'enzyme';
+
+import * as Preact from '#preact';
+import * as intersectionObserver from '#preact/component/intersection-observer';
+import {xhrUtils} from '#preact/utils/xhr';
+
+import {macroTask} from '#testing/helpers';
+import {cleanHtml} from '#testing/helpers/cleanHtml';
+import {waitFor} from '#testing/helpers/service';
+
+import {BentoList} from '../component';
+
+const CONTENTS = '[test-id="contents"]';
+function snapshot(component) {
+  return cleanHtml(component.find(CONTENTS).html(), ['aria-label']);
+}
+
+describes.sandboxed('BentoList preact component v1.0', {}, (env) => {
+  let fetchJson;
+  beforeEach(() => {
+    fetchJson = env.sandbox
+      .stub(xhrUtils, 'fetchJson')
+      .resolves({items: ['one', 'two', 'three']});
+  });
+
+  async function waitForData(component, callCount = 1) {
+    await waitFor(
+      () => fetchJson.callCount === callCount,
+      'expected fetchJson to have been called' +
+        (callCount > 1 ? ` ${callCount} times` : '')
+    );
+    // Ensure everything has settled:
+    await macroTask();
+    component.update();
+  }
+
+  describe('default behavior', () => {
+    it('should render a "loading" state first', async () => {
+      const component = mount(<BentoList src="" />);
+
+      expect(snapshot(component)).to.equal(
+        '<div><span aria-label="Loading"></span></div>'
+      );
+    });
+
+    it('should load data, and display in a list', async () => {
+      const component = mount(<BentoList src="TEST.json" />);
+      expect(snapshot(component)).to.equal(
+        '<div><span aria-label="Loading"></span></div>'
+      );
+
+      await waitForData(component);
+
+      expect(fetchJson).calledWith('TEST.json');
+
+      expect(snapshot(component)).to.equal(
+        `<div><div>one</div><div>two</div><div>three</div></div>`
+      );
+    });
+
+    it('the list should have aria-roles defined', async () => {
+      const component = mount(<BentoList src="TEST.json" />);
+
+      await waitForData(component);
+
+      expect(component.find(CONTENTS).html()).to.equal(
+        `<div role="list"><div role="listitem">one</div><div role="listitem">two</div><div role="listitem">three</div></div>`
+      );
+    });
+
+    it("changing the 'src' should fetch the data", async () => {
+      const component = mount(<BentoList src="TEST.json" />);
+      expect(snapshot(component)).to.equal(
+        '<div><span aria-label="Loading"></span></div>'
+      );
+
+      await waitForData(component);
+      expect(snapshot(component)).to.equal(
+        `<div><div>one</div><div>two</div><div>three</div></div>`
+      );
+
+      fetchJson.resolves({items: ['second', 'request']});
+
+      // Prop doesn't change, no fetch:
+      component.setProps({src: 'TEST.json'});
+      expect(fetchJson).callCount(1);
+      expect(snapshot(component)).to.equal(
+        `<div><div>one</div><div>two</div><div>three</div></div>`
+      );
+
+      // Prop changes, new fetch:
+      component.setProps({src: 'TEST2.json'});
+      expect(fetchJson).callCount(2).calledWith('TEST2.json');
+      await waitForData(component, 2);
+      expect(snapshot(component)).to.equal(
+        `<div><div>second</div><div>request</div></div>`
+      );
+    });
+  });
+
+  describe('itemsKey', () => {
+    describe('with a flat array payload', () => {
+      const results = ['flat', 'array'];
+      beforeEach(() => {
+        fetchJson.resolves(results);
+      });
+      it('by default, it should not render the data', async () => {
+        const component = mount(<BentoList src="" />);
+        await waitForData(component);
+
+        expect(component.text()).to.equal('');
+      });
+      it('itemsKey="" should render the payload', async () => {
+        const component = mount(<BentoList src="" itemsKey="" />);
+        await waitForData(component);
+
+        expect(snapshot(component)).to.equal(
+          '<div><div>flat</div><div>array</div></div>'
+        );
+      });
+      it('itemsKey="." should also render the payload', async () => {
+        const component = mount(<BentoList src="" itemsKey="." />);
+        await waitForData(component);
+
+        expect(snapshot(component)).to.equal(
+          '<div><div>flat</div><div>array</div></div>'
+        );
+      });
+    });
+
+    describe('when a custom itemsKey is supplied', () => {
+      beforeEach(() => {
+        fetchJson.resolves({
+          NUMBERS: [1, 2, 3],
+          LETTERS: ['A', 'B', 'C'],
+          NESTED: {
+            OBJECTS: {
+              TOO: ['ONE', 'TWO', 'THREE'],
+            },
+          },
+        });
+      });
+      it('should extract the correct property', async () => {
+        const component = mount(<BentoList src="" itemsKey="NUMBERS" />);
+        await waitForData(component);
+
+        expect(snapshot(component)).to.equal(
+          '<div><div>1</div><div>2</div><div>3</div></div>'
+        );
+      });
+      it('changing itemsKey should not require refetching the data', async () => {
+        const component = mount(<BentoList src="" itemsKey="NUMBERS" />);
+        await waitForData(component);
+
+        expect(snapshot(component)).to.equal(
+          '<div><div>1</div><div>2</div><div>3</div></div>'
+        );
+
+        component.setProps({itemsKey: 'LETTERS'});
+        expect(snapshot(component)).to.equal(
+          '<div><div>A</div><div>B</div><div>C</div></div>'
+        );
+
+        component.setProps({itemsKey: 'NUMBERS'});
+        expect(snapshot(component)).to.equal(
+          '<div><div>1</div><div>2</div><div>3</div></div>'
+        );
+
+        // Ensure data was only fetched once!
+        expect(fetchJson).callCount(1);
+      });
+      describe('dot-separated lists', () => {
+        it('should access dot-separated property lists', async () => {
+          const component = mount(
+            <BentoList src="" itemsKey="NESTED.OBJECTS.TOO" />
+          );
+          await waitForData(component);
+
+          expect(snapshot(component)).to.equal(
+            '<div><div>ONE</div><div>TWO</div><div>THREE</div></div>'
+          );
+        });
+        it('should fail gracefully when the properties are not defined', async () => {
+          const component = mount(<BentoList src="" itemsKey="invalid" />);
+          await waitForData(component);
+
+          expect(component.text()).to.equal('');
+
+          component.setProps({itemsKey: 'invalid.invalid'});
+          expect(component.text()).to.equal('');
+
+          component.setProps({itemsKey: 'LETTERS.invalid'});
+          expect(component.text()).to.equal('');
+
+          component.setProps({itemsKey: 'NESTED.invalid.invalid'});
+          expect(component.text()).to.equal('');
+
+          component.setProps({itemsKey: 'NESTED.OBJECTS.invalid'});
+          expect(component.text()).to.equal('');
+
+          component.setProps({itemsKey: 'NESTED.OBJECTS.TOO.invalid'});
+          expect(component.text()).to.equal('');
+
+          // Just to ensure it DOES indeed work when valid:
+          component.setProps({itemsKey: 'NESTED.OBJECTS.TOO'});
+          expect(component.text()).to.equal('ONETWOTHREE');
+        });
+      });
+    });
+  });
+
+  describe('maxItems', () => {
+    it('should limit the max number of items', async () => {
+      const component = mount(<BentoList src="TEST.json" maxItems={1} />);
+      await waitForData(component);
+      expect(snapshot(component)).to.equal(`<div><div>one</div></div>`);
+    });
+    it('should do nothing if there are already fewer items', async () => {
+      const component = mount(<BentoList src="TEST.json" maxItems={99} />);
+      await waitForData(component);
+      expect(snapshot(component)).to.equal(
+        `<div><div>one</div><div>two</div><div>three</div></div>`
+      );
+    });
+  });
+
+  describe('template', () => {
+    it('should allow for custom rendering of the data', async () => {
+      const component = mount(
+        <BentoList
+          src=""
+          template={(item) => <li>{item}</li>}
+          wrapperTemplate={(list) => <ul>{list}</ul>}
+        />
+      );
+      await waitForData(component);
+      expect(component.find(CONTENTS).html()).to.equal(
+        `<ul role="list"><li role="listitem">one</li><li role="listitem">two</li><li role="listitem">three</li></ul>`
+      );
+    });
+  });
+
+  describe('load-more', () => {
+    const mockData = [
+      {
+        items: ['one', 'two', 'three'],
+        'load-more-src': 'page-2.json',
+      },
+      {
+        items: ['four', 'five'],
+        'load-more-src': 'page-3.json',
+      },
+      {
+        items: ['six', 'seven', 'eight', 'nine'],
+        'load-more-src': null,
+      },
+    ];
+    beforeEach(() => {
+      mockData.forEach((page, index) => {
+        fetchJson.onCall(index).resolves(page);
+      });
+    });
+    describe('manual', () => {
+      const expectedPage1 = `<div><div>one</div><div>two</div><div>three</div></div><div><button><label>See More</label></button></div>`;
+      const expectedPage2 = `<div><div>one</div><div>two</div><div>three</div><div>four</div><div>five</div></div><div><button><label>See More</label></button></div>`;
+      const expectedPage3 = `<div><div>one</div><div>two</div><div>three</div><div>four</div><div>five</div><div>six</div><div>seven</div><div>eight</div><div>nine</div></div>`;
+
+      let component;
+      beforeEach(async () => {
+        component = mount(<BentoList src="page-1.json" loadMore="manual" />);
+        await waitForData(component);
+      });
+
+      it('should render a "See More" button', async () => {
+        expect(component.find('button').html()).to.equal(
+          `<button load-more-button="true"><label>See More</label></button>`
+        );
+        expect(snapshot(component)).to.equal(expectedPage1);
+      });
+
+      it('clicking the button should keep loading more data', async () => {
+        // Check page 1:
+        expect(snapshot(component)).to.equal(expectedPage1);
+
+        // Load page 2:
+        simulateClickWithPropagation(
+          component.find('button[load-more-button]')
+        );
+        expect(fetchJson).callCount(2).calledWith('page-2.json');
+        expect(snapshot(component)).to.equal(expectedPage1);
+        await waitForData(component, 2);
+        expect(snapshot(component)).to.equal(expectedPage2);
+
+        // Load page 3:
+        simulateClickWithPropagation(
+          component.find('button[load-more-button]')
+        );
+        expect(fetchJson).callCount(3).calledWith('page-3.json');
+        expect(snapshot(component)).to.equal(expectedPage2);
+        await waitForData(component, 3);
+        expect(snapshot(component)).to.equal(expectedPage3);
+      });
+    });
+    describe('auto', () => {
+      beforeEach(() => {
+        env.sandbox
+          .stub(intersectionObserver, 'useIsInViewport')
+          .returns(false);
+      });
+      function simulateViewportVisible(component, isInViewport) {
+        intersectionObserver.useIsInViewport.returns(isInViewport);
+        component.setProps({}); // trigger a rerender
+      }
+
+      const expectedLoading =
+        '<div><span aria-label="Loading"></span></div><span></span>';
+      const expectedPage1 = `<div><div>one</div><div>two</div><div>three</div></div><span></span>`;
+      const expectedPage2 = `<div><div>one</div><div>two</div><div>three</div><div>four</div><div>five</div></div><span></span>`;
+      const expectedPage3 = `<div><div>one</div><div>two</div><div>three</div><div>four</div><div>five</div><div>six</div><div>seven</div><div>eight</div><div>nine</div></div><span></span>`;
+
+      let component;
+      beforeEach(async () => {
+        component = mount(<BentoList src="" loadMore="auto" />);
+      });
+      it('should automatically load the first page', async () => {
+        expect(snapshot(component)).to.equal(expectedLoading);
+
+        await waitForData(component, 1);
+
+        expect(snapshot(component)).to.equal(expectedPage1);
+      });
+      it('should only load the first page when not in viewport', async () => {
+        await waitForData(component, 1);
+        await expect(waitForData(component, 2)).to.be.rejected;
+      });
+      it('when the element is scrolled into the viewport, it loads more data', async () => {
+        await waitForData(component, 1);
+
+        // Bring it into view, then pretend the rerender caused it to grow:
+        simulateViewportVisible(component, true);
+        simulateViewportVisible(component, false);
+
+        await waitForData(component, 2);
+        expect(snapshot(component)).to.equal(expectedPage2);
+
+        // Bring it into view for 1 render again:
+        simulateViewportVisible(component, true);
+        simulateViewportVisible(component, false);
+
+        await waitForData(component, 3);
+        expect(snapshot(component)).to.equal(expectedPage3);
+      });
+    });
+  });
+
+  describe('loadMoreBookmark', () => {
+    const mockData = [
+      {
+        items: ['one', 'two', 'three'],
+        METADATA: {'NEXT_PAGE_URL': 'page-2.json'},
+      },
+      {
+        items: ['four', 'five'],
+        METADATA: {'NEXT_PAGE_URL': 'page-3.json'},
+      },
+      {
+        items: ['six', 'seven', 'eight', 'nine'],
+        METADATA: {'NEXT_PAGE_URL': null},
+      },
+    ];
+    let component;
+    beforeEach(async () => {
+      mockData.forEach((page, index) => {
+        fetchJson.onCall(index).resolves(page);
+      });
+
+      component = mount(
+        <BentoList
+          src="page-1.json"
+          loadMore="manual"
+          loadMoreBookmark="METADATA.NEXT_PAGE_URL"
+        />
+      );
+      await waitForData(component);
+    });
+
+    const expectedPage1 = `<div><div>one</div><div>two</div><div>three</div></div><div><button><label>See More</label></button></div>`;
+    const expectedPage2 = `<div><div>one</div><div>two</div><div>three</div><div>four</div><div>five</div></div><div><button><label>See More</label></button></div>`;
+    const expectedPage3 = `<div><div>one</div><div>two</div><div>three</div><div>four</div><div>five</div><div>six</div><div>seven</div><div>eight</div><div>nine</div></div>`;
+
+    it('should render the first page of data, as normal', async () => {
+      expect(snapshot(component)).to.equal(expectedPage1);
+    });
+
+    it('clicking the button should keep loading more data', async () => {
+      // Check page 1:
+      expect(snapshot(component)).to.equal(expectedPage1);
+
+      // Load page 2:
+      simulateClickWithPropagation(component.find('button[load-more-button]'));
+      expect(fetchJson).callCount(2).calledWith('page-2.json');
+      expect(snapshot(component)).to.equal(expectedPage1);
+      await waitForData(component, 2);
+      expect(snapshot(component)).to.equal(expectedPage2);
+
+      // Load page 3:
+      simulateClickWithPropagation(component.find('button[load-more-button]'));
+      expect(fetchJson).callCount(3).calledWith('page-3.json');
+      expect(snapshot(component)).to.equal(expectedPage2);
+      await waitForData(component, 3);
+      expect(snapshot(component)).to.equal(expectedPage3);
+    });
+  });
+
+  describe('API', () => {
+    let ref;
+    let component;
+    beforeEach(async () => {
+      ref = Preact.createRef();
+      component = mount(<BentoList src="TEST.json" ref={ref} />);
+      await waitForData(component);
+    });
+    describe('refresh', () => {
+      it('should be defined', () => {
+        expect(ref.current.refresh).to.be.a('function');
+      });
+      it('should refresh the data', async () => {
+        expect(fetchJson).to.have.callCount(1);
+        expect(snapshot(component)).to.equal(
+          `<div><div>one</div><div>two</div><div>three</div></div>`
+        );
+
+        fetchJson.resolves({items: [1, 2, 3]});
+        ref.current.refresh();
+
+        await waitForData(component, 2);
+        expect(snapshot(component)).to.equal(
+          `<div><div>1</div><div>2</div><div>3</div></div>`
+        );
+      });
+    });
+  });
+});
+
+function simulateClickWithPropagation(wrapper) {
+  // Unlike `wrapper.simulate('click')`, this approach will propagate through DOM ancestors:
+  wrapper.getDOMNode().click();
+}
diff --git a/extensions/amp-list/amp-list.md b/extensions/amp-list/amp-list.md
index caa85f5854b7..32c81d3364ce 100644
--- a/extensions/amp-list/amp-list.md
+++ b/extensions/amp-list/amp-list.md
@@ -70,8 +70,8 @@ Here is the JSON file that we used:
       "url": "https://www.ampproject.org/"
     },
     {
-      "title": "AMP By Example",
-      "url": "https://ampbyexample.com/"
+      "title": "AMP",
+      "url": "https://amp.dev/"
     },
     {
       "title": "AMP Start",
diff --git a/extensions/amp-live-list/0.1/amp-live-list.js b/extensions/amp-live-list/0.1/amp-live-list.js
index d94d0aafa2b1..1a9f71f436ef 100644
--- a/extensions/amp-live-list/0.1/amp-live-list.js
+++ b/extensions/amp-live-list/0.1/amp-live-list.js
@@ -1,5 +1,5 @@
-import {AmpEvents} from '#core/constants/amp-events';
-import {Layout} from '#core/dom/layout';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
+import {Layout_Enum} from '#core/dom/layout';
 import {childElementByAttr} from '#core/dom/query';
 
 import {user, userAssert} from '#utils/log';
@@ -138,7 +138,7 @@ export class AmpLiveList extends AMP.BaseElement {
     /** @private {boolean} */
     this.isReverseOrder_ = false;
 
-    /** @private @const {!Object<string, time>} */
+    /** @private @const {!{[key: string]: time}} */
     this.knownItems_ = Object.create(null);
 
     /** @private @const {!Array<!Element>} */
@@ -172,7 +172,9 @@ export class AmpLiveList extends AMP.BaseElement {
 
   /** @override */
   isLayoutSupported(layout) {
-    return layout == Layout.CONTAINER || layout == Layout.FIXED_HEIGHT;
+    return (
+      layout == Layout_Enum.CONTAINER || layout == Layout_Enum.FIXED_HEIGHT
+    );
   }
 
   /** @override */
@@ -1013,7 +1015,7 @@ export class AmpLiveList extends AMP.BaseElement {
    */
   sendAmpDomUpdateEvent_() {
     const event = this.win.document.createEvent('Event');
-    event.initEvent(AmpEvents.DOM_UPDATE, true, true);
+    event.initEvent(AmpEvents_Enum.DOM_UPDATE, true, true);
     this.itemsSlot_.dispatchEvent(event);
   }
 }
diff --git a/extensions/amp-live-list/0.1/live-list-manager.js b/extensions/amp-live-list/0.1/live-list-manager.js
index 91543d341e9c..64573613da9e 100644
--- a/extensions/amp-live-list/0.1/live-list-manager.js
+++ b/extensions/amp-live-list/0.1/live-list-manager.js
@@ -36,7 +36,7 @@ export class LiveListManager {
     /** @const */
     this.ampdoc = ampdoc;
 
-    /** @private @const {!Object<string, !./amp-live-list.AmpLiveList>} */
+    /** @private @const {!{[key: string]: !./amp-live-list.AmpLiveList}} */
     this.liveLists_ = Object.create(null);
 
     /** @private @const {!../../../src/service/extensions-impl.Extensions} */
diff --git a/extensions/amp-live-list/0.1/test/test-amp-live-list.js b/extensions/amp-live-list/0.1/test/test-amp-live-list.js
index d98a302a2df2..c4b966e0b59a 100644
--- a/extensions/amp-live-list/0.1/test/test-amp-live-list.js
+++ b/extensions/amp-live-list/0.1/test/test-amp-live-list.js
@@ -1,4 +1,4 @@
-import {AmpEvents} from '#core/constants/amp-events';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
 
 import {AmpDocSingle} from '#service/ampdoc-impl';
 
@@ -367,7 +367,7 @@ describes.realWin(
         return liveList.updateAction_().then(() => {
           expect(spy).to.have.been.calledOnce;
           expect(spy).calledWithMatch({
-            type: AmpEvents.DOM_UPDATE,
+            type: AmpEvents_Enum.DOM_UPDATE,
             bubbles: true,
           });
         });
diff --git a/extensions/amp-live-list/0.1/test/validator-amp-live-list.html b/extensions/amp-live-list/0.1/test/validator-amp-live-list.html
index 626217a6f9cc..96f8749695c9 100644
--- a/extensions/amp-live-list/0.1/test/validator-amp-live-list.html
+++ b/extensions/amp-live-list/0.1/test/validator-amp-live-list.html
@@ -64,7 +64,7 @@
        OK but the tags that attach to them are not: Reference point validation
        and regular tag validation are orthogonal. -->
   <amp-live-list id="my-live-list-4" data-poll-interval="15000" data-max-items-per-page="20">
-    <img update src="button.gif" onclick="javascript:alert('u have updates!')">
+    <foo update src="button.gif" onclick="javascript:alert('u have updates!')">
     <script items>
       document.writeln('1, 2, 3');
     </script>
diff --git a/extensions/amp-live-list/0.1/test/validator-amp-live-list.out b/extensions/amp-live-list/0.1/test/validator-amp-live-list.out
index 206a15740d55..4083b4fe3f02 100644
--- a/extensions/amp-live-list/0.1/test/validator-amp-live-list.out
+++ b/extensions/amp-live-list/0.1/test/validator-amp-live-list.out
@@ -75,12 +75,14 @@ amp-live-list/0.1/test/validator-amp-live-list.html:55:2 The reference point 'AM
 |         OK but the tags that attach to them are not: Reference point validation
 |         and regular tag validation are orthogonal. -->
 |    <amp-live-list id="my-live-list-4" data-poll-interval="15000" data-max-items-per-page="20">
-|      <img update src="button.gif" onclick="javascript:alert('u have updates!')">
+>>   ^~~~~~~~~
+amp-live-list/0.1/test/validator-amp-live-list.html:66:2 The mandatory reference point 'AMP-LIVE-LIST [items]' for 'amp-live-list' is missing. (see https://amp.dev/documentation/components/amp-live-list)
+|      <foo update src="button.gif" onclick="javascript:alert('u have updates!')">
 >>     ^~~~~~~~~
-amp-live-list/0.1/test/validator-amp-live-list.html:67:4 The tag 'img' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-img'? (see https://amp.dev/documentation/components/amp-img/)
+amp-live-list/0.1/test/validator-amp-live-list.html:67:4 The tag 'foo' is disallowed.
 |      <script items>
 >>     ^~~~~~~~~
-amp-live-list/0.1/test/validator-amp-live-list.html:68:4 Custom JavaScript is not allowed. (see https://amp.dev/documentation/guides-and-tutorials/learn/validation-workflow/validation_errors/#custom-javascript-is-not-allowed)
+amp-live-list/0.1/test/validator-amp-live-list.html:68:4 The parent tag of tag 'amphtml engine script' is 'foo', but it can only be 'head'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#required-markup)
 |        document.writeln('1, 2, 3');
 |      </script>
 |    </amp-live-list>
@@ -92,22 +94,22 @@ amp-live-list/0.1/test/validator-amp-live-list.html:68:4 Custom JavaScript is no
 |      <ul items>
 |        <li id="1" data-update-time="42">1</li>  <!-- data-sort-time missing -->
 >>       ^~~~~~~~~
-amp-live-list/0.1/test/validator-amp-live-list.html:78:6 The mandatory attribute 'data-sort-time' is missing in tag 'amp-live-list [items] item'. (see https://amp.dev/documentation/components/amp-live-list/#items)
+amp-live-list/0.1/test/validator-amp-live-list.html:78:6 The mandatory attribute 'data-sort-time' is missing in tag 'amp-live-list [data-sort-time] child'. (see https://amp.dev/documentation/components/amp-live-list/#items)
 >>       ^~~~~~~~~
 amp-live-list/0.1/test/validator-amp-live-list.html:78:6 The tag 'li', a child tag of 'AMP-LIVE-LIST [items]', does not satisfy the reference point 'AMP-LIVE-LIST [items] item'. (see https://amp.dev/documentation/components/amp-live-list/#items)
 |        <li id="2" data-sort-time="43" data-update-time="44">2</li>
 |        <li data-update-time="44">3</li> <!-- id and data-sort-time missing -->
 >>       ^~~~~~~~~
-amp-live-list/0.1/test/validator-amp-live-list.html:80:6 The mandatory attribute 'data-sort-time' is missing in tag 'amp-live-list [items] item'. (see https://amp.dev/documentation/components/amp-live-list/#items)
+amp-live-list/0.1/test/validator-amp-live-list.html:80:6 The mandatory attribute 'data-sort-time' is missing in tag 'amp-live-list [data-sort-time] child'. (see https://amp.dev/documentation/components/amp-live-list/#items)
 >>       ^~~~~~~~~
-amp-live-list/0.1/test/validator-amp-live-list.html:80:6 The mandatory attribute 'id' is missing in tag 'amp-live-list [items] item'. (see https://amp.dev/documentation/components/amp-live-list/#items)
+amp-live-list/0.1/test/validator-amp-live-list.html:80:6 The mandatory attribute 'id' is missing in tag 'amp-live-list [data-sort-time] child'. (see https://amp.dev/documentation/components/amp-live-list/#items)
 >>       ^~~~~~~~~
 amp-live-list/0.1/test/validator-amp-live-list.html:80:6 The tag 'li', a child tag of 'AMP-LIVE-LIST [items]', does not satisfy the reference point 'AMP-LIVE-LIST [items] item'. (see https://amp.dev/documentation/components/amp-live-list/#items)
 |        <p>junk</p> <!-- id, data-sort-time missing -->
 >>       ^~~~~~~~~
-amp-live-list/0.1/test/validator-amp-live-list.html:81:6 The mandatory attribute 'data-sort-time' is missing in tag 'amp-live-list [items] item'. (see https://amp.dev/documentation/components/amp-live-list/#items)
+amp-live-list/0.1/test/validator-amp-live-list.html:81:6 The mandatory attribute 'data-sort-time' is missing in tag 'amp-live-list [data-sort-time] child'. (see https://amp.dev/documentation/components/amp-live-list/#items)
 >>       ^~~~~~~~~
-amp-live-list/0.1/test/validator-amp-live-list.html:81:6 The mandatory attribute 'id' is missing in tag 'amp-live-list [items] item'. (see https://amp.dev/documentation/components/amp-live-list/#items)
+amp-live-list/0.1/test/validator-amp-live-list.html:81:6 The mandatory attribute 'id' is missing in tag 'amp-live-list [data-sort-time] child'. (see https://amp.dev/documentation/components/amp-live-list/#items)
 >>       ^~~~~~~~~
 amp-live-list/0.1/test/validator-amp-live-list.html:81:6 The tag 'p', a child tag of 'AMP-LIVE-LIST [items]', does not satisfy the reference point 'AMP-LIVE-LIST [items] item'. (see https://amp.dev/documentation/components/amp-live-list/#items)
 |      </ul>
diff --git a/extensions/amp-live-list/amp-live-list-server-side-filtering.md b/extensions/amp-live-list/amp-live-list-server-side-filtering.md
index a70aced69b43..727f783a02a5 100644
--- a/extensions/amp-live-list/amp-live-list-server-side-filtering.md
+++ b/extensions/amp-live-list/amp-live-list-server-side-filtering.md
@@ -2,7 +2,7 @@
 
 ## Overview
 
-The `amp-live-list` component is allowed to make requests to its server (depending on where the file is hosted from, the server could be the Google AMP Cache, another AMP cache, or the publisher’s server) for the the latest AMP document and update the current DOM with information from the received AMP document. It can work with a full AMP document as the response, but to reduce the payload and save on bandwidth and CPU cycles `amp-live-list` has defined the minimum HTML structure, the tags and its attributes needed by the component to correctly make an update to the live DOM. This spec depends on the [`amp-live-list` spec](https://github.com/ampproject/amphtml/blob/main/extensions/amp-live-list/amp-live-list.md) and defines its [Server side filtering](https://github.com/ampproject/amphtml/blob/main/extensions/amp-live-list/amp-live-list.md#server-side-filtering) section.
+The `amp-live-list` component is allowed to make requests to its server (depending on where the file is hosted from, the server could be the Google AMP Cache, another AMP cache, or the publisher’s server) for the latest AMP document and update the current DOM with information from the received AMP document. It can work with a full AMP document as the response, but to reduce the payload and save on bandwidth and CPU cycles `amp-live-list` has defined the minimum HTML structure, the tags and its attributes needed by the component to correctly make an update to the live DOM. This spec depends on the [`amp-live-list` spec](https://github.com/ampproject/amphtml/blob/main/extensions/amp-live-list/amp-live-list.md) and defines its [Server side filtering](https://github.com/ampproject/amphtml/blob/main/extensions/amp-live-list/amp-live-list.md#server-side-filtering) section.
 
 ## Design
 
@@ -110,7 +110,7 @@ Example 2
 </amp-live-list>
 ```
 
-Example 3 is the latest document fetched from the publisher, and using `amp_latest_update_time=1462955848172` allows us to filter the `items` reference point, which only leaves us with the the element with `id=item-3` (the `amp-twitter` element).
+Example 3 is the latest document fetched from the publisher, and using `amp_latest_update_time=1462955848172` allows us to filter the `items` reference point, which only leaves us with the element with `id=item-3` (the `amp-twitter` element).
 
 Example 3
 
diff --git a/extensions/amp-live-list/validator-amp-live-list.protoascii b/extensions/amp-live-list/validator-amp-live-list.protoascii
index 1329ddfbea68..d3d0210eb2a8 100644
--- a/extensions/amp-live-list/validator-amp-live-list.protoascii
+++ b/extensions/amp-live-list/validator-amp-live-list.protoascii
@@ -56,7 +56,7 @@ tags: {
   html_format: AMP
   tag_name: "$REFERENCE_POINT"
   spec_name : "AMP-LIVE-LIST [update]"
-  descriptive_name : "amp-live-list [update]"
+  descriptive_name : "amp-live-list [update] child"
   attrs: {
     name: "update"
     mandatory: true
@@ -67,7 +67,7 @@ tags: {
   html_format: AMP
   tag_name: "$REFERENCE_POINT"
   spec_name: "AMP-LIVE-LIST [items]"
-  descriptive_name : "amp-live-list [items]"
+  descriptive_name : "amp-live-list [items] child"
   attrs: {
     name: "items"
     mandatory: true
@@ -81,7 +81,7 @@ tags: {
   html_format: AMP
   tag_name: "$REFERENCE_POINT"
   spec_name : "AMP-LIVE-LIST [pagination]"
-  descriptive_name : "amp-live-list [pagination]"
+  descriptive_name : "amp-live-list [pagination] child"
   attrs: {
     name: "pagination"
     mandatory: true
@@ -92,7 +92,7 @@ tags: {
   html_format: AMP
   tag_name: "$REFERENCE_POINT"
   spec_name : "AMP-LIVE-LIST [items] item"
-  descriptive_name : "amp-live-list [items] item"
+  descriptive_name : "amp-live-list [data-sort-time] child"
   attrs: {
     name: "data-sort-time"
     mandatory: true
diff --git a/extensions/amp-mathml/0.1/amp-mathml.js b/extensions/amp-mathml/0.1/amp-mathml.js
index f3c50212d171..77eb7a78e573 100644
--- a/extensions/amp-mathml/0.1/amp-mathml.js
+++ b/extensions/amp-mathml/0.1/amp-mathml.js
@@ -1,5 +1,5 @@
 import {removeElement} from '#core/dom';
-import {Layout, applyFillContent} from '#core/dom/layout';
+import {Layout_Enum, applyFillContent} from '#core/dom/layout';
 import {setStyles} from '#core/dom/style';
 
 import {Services} from '#service';
@@ -92,7 +92,7 @@ export class AmpMathml extends AMP.BaseElement {
 
   /** @override */
   isLayoutSupported(layout) {
-    return layout == Layout.CONTAINER;
+    return layout == Layout_Enum.CONTAINER;
   }
 }
 
diff --git a/extensions/amp-mathml/1.0/README.md b/extensions/amp-mathml/1.0/README.md
index f71946b33f72..c74229773db9 100644
--- a/extensions/amp-mathml/1.0/README.md
+++ b/extensions/amp-mathml/1.0/README.md
@@ -6,9 +6,7 @@ Renders a MathML formula in an iframe.
 
 You must include each Bento component's required CSS library to guarantee proper loading and before adding custom styles. Or use the light-weight pre-upgrade styles available inline. See [Layout and style](#layout-and-style).
 
-The examples below demonstrate use of the `<bento-mathml>` web component.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/mathml
@@ -19,67 +17,65 @@ import {defineElement as defineBentoMathml} from '@bentoproject/mathml';
 defineBentoMathml();
 ```
 
-### Example: Include via `<script>`
+### Include via `<script>`
+
+```html
+<script type="module" src="https://cdn.ampproject.org/bento.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/bento.js" crossorigin="anonymous"></script>
+<script type="module" src="https://cdn.ampproject.org/v0/bento-mathml-1.0.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/v0/bento-mathml-1.0.js" crossorigin="anonymous"></script>
+<link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-mathml-1.0.css" crossorigin="anonymous">
+```
+
+### Example
 
-The example below contains an `bento-mathml` with three sections. The
-`expanded` attribute on the third section expands it on page load.
+<!--% example %-->
 
 ```html
-<head>
-  <script src="https://cdn.ampproject.org/bento.js"></script>
-  <script
-    async
-    src="https://cdn.ampproject.org/v0/bento-mathml-1.0.js"
-  ></script>
-  <link
-    rel="stylesheet"
-    type="text/css"
-    href="https://cdn.ampproject.org/v0/bento-mathml-1.0.css"
-  />
-</head>
-<body>
-  <h2>The Quadratic Formula</h2>
-  <bento-mathml
-    style="height: 40px"
-    data-formula="\[x = {-b \pm \sqrt{b^2-4ac} \over 2a}.\]"
-  ></bento-mathml>
-
-  <h2>Cauchy's Integral Formula</h2>
-  <bento-mathml
-    style="height: 41px"
-    data-formula="\[f(a) = \frac{1}{2\pi i} \oint\frac{f(z)}{z-a}dz\]"
-  ></bento-mathml>
-
-  <h2>Double angle formula for Cosines</h2>
-  <bento-mathml
-    style="height: 19px"
-    data-formula="\[cos(θ+φ)=\cos(θ)\cos(φ)−\sin(θ)\sin(φ)\]"
-  ></bento-mathml>
-
-  <h2>Inline formula</h2>
-  <p>
-    This is an example of a formula of
-    <bento-mathml
-      style="height: 11px; width: 8px"
-      inline
-      data-formula="`x`"
-    ></bento-mathml
-    >,
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-mathml-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-mathml-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-mathml-1.0.css"
+    />
+  </head>
+  <body>
+    <h2>The Quadratic Formula</h2>
     <bento-mathml
-      style="height: 40px; width: 147px"
-      inline
+      style="height: 40px;"
       data-formula="\[x = {-b \pm \sqrt{b^2-4ac} \over 2a}.\]"
     ></bento-mathml>
-    placed inline in the middle of a block of text.
-    <bento-mathml
-      style="height: 19px; width: 72px"
-      inline
-      data-formula="\( \cos(θ+φ) \)"
-    ></bento-mathml>
-    This shows how the formula will fit inside a block of text and can be styled
-    with CSS.
-  </p>
-</body>
+
+    <h2>Inline formula</h2>
+    <p>
+      This is an example of a formula,
+      <bento-mathml
+        style="height: 40px; width: 147px"
+        inline
+        data-formula="\[x = {-b \pm \sqrt{b^2-4ac} \over 2a}.\]"
+      ></bento-mathml>
+      placed inline in the middle of a block of text.
+    </p>
+  </body>
+</html>
 ```
 
 ### Layout and style
@@ -128,9 +124,7 @@ You may use the `bento-mathml` element selector to style the accordion freely.
 
 ## Preact/React Component
 
-The examples below demonstrates use of the `<BentoMathml>` as a functional component usable with the Preact or React libraries.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/mathml
@@ -150,40 +144,15 @@ function App() {
         formula="\[x = {-b \pm \sqrt{b^2-4ac} \over 2a}.\]"
       ></BentoMathml>
 
-      <h2>Cauchy's Integral Formula</h2>
-      <BentoMathml
-        style={{height: 41}}
-        formula="\[f(a) = \frac{1}{2\pi i} \oint\frac{f(z)}{z-a}dz\]"
-      ></BentoMathml>
-
-      <h2>Double angle formula for Cosines</h2>
-      <BentoMathml
-        style={{height: 19}}
-        formula="\[cos(θ+φ)=\cos(θ)\cos(φ)−\sin(θ)\sin(φ)\]"
-      ></BentoMathml>
-
       <h2>Inline formula</h2>
       <p>
-        This is an example of a formula of{' '}
-        <BentoMathml
-          style={{height: 11, width: 8}}
-          inline
-          formula="`x`"
-        ></BentoMathml>
-        ,{' '}
+        This is an example of a formula,{' '}
         <BentoMathml
           style={{height: 40, width: 147}}
           inline
           formula="\[x = {-b \pm \sqrt{b^2-4ac} \over 2a}.\]"
-        ></BentoMathml>{' '}
-        placed inline in the middle of a block of text.{' '}
-        <BentoMathml
-          style={{height: 19, width: 72}}
-          inline
-          formula="\( \cos(θ+φ) \)"
-        ></BentoMathml>{' '}
-        This shows how the formula will fit inside a block of text and can be
-        styled with CSS.
+        ></BentoMathml>
+        , placed inline in the middle of a block of text. This shows how the formula will fit inside a block of text and can be styled with CSS.
       </p>
     </>
   );
@@ -208,7 +177,6 @@ Or via `className`:
 
 ```css
 .custom-styles {
-  background-color: red;
   height: 40px;
   width: 147px;
 }
diff --git a/extensions/amp-mathml/1.0/amp-mathml.js b/extensions/amp-mathml/1.0/amp-mathml.js
index ef0b2072e429..00c30a4fd794 100644
--- a/extensions/amp-mathml/1.0/amp-mathml.js
+++ b/extensions/amp-mathml/1.0/amp-mathml.js
@@ -1,7 +1,7 @@
-import {dict} from '#core/types/object';
-
 import {isExperimentOn} from '#experiments';
 
+import {AmpPreactBaseElement, setSuperClass} from '#preact/amp-base-element';
+
 import {userAssert} from '#utils/log';
 
 import {BaseElement} from './base-element';
@@ -13,8 +13,8 @@ import {getBootstrapBaseUrl, getBootstrapUrl} from '../../../src/3p-frame';
 /** @const {string} */
 const TAG = 'amp-mathml';
 
-class AmpMathml extends BaseElement {
-  /** @override @nocollapse */
+class AmpMathml extends setSuperClass(BaseElement, AmpPreactBaseElement) {
+  /** @override  */
   static getPreconnects(element) {
     const ampdoc = element.getAmpDoc();
     const {win} = ampdoc;
@@ -27,15 +27,6 @@ class AmpMathml extends BaseElement {
     return urls;
   }
 
-  /** @override */
-  init() {
-    return dict({
-      'requestResize': ({height, width}) => {
-        return this.attemptChangeSize(height, width);
-      },
-    });
-  }
-
   /** @override */
   isLayoutSupported(layout) {
     userAssert(
diff --git a/extensions/amp-mathml/1.0/component.js b/extensions/amp-mathml/1.0/component.js
index cbc3f62776cc..3dcd2e445383 100644
--- a/extensions/amp-mathml/1.0/component.js
+++ b/extensions/amp-mathml/1.0/component.js
@@ -1,14 +1,13 @@
 import objStr from 'obj-str';
 
-import {MessageType, deserializeMessage} from '#core/3p-frame-messaging';
+import {MessageType_Enum, deserializeMessage} from '#core/3p-frame-messaging';
 import {tryParseJson} from '#core/types/object/json';
 
 import * as Preact from '#preact';
-import {useCallback, useEffect, useMemo, useState} from '#preact';
+import {useCallback, useMemo} from '#preact';
 import {forwardRef} from '#preact/compat';
-import {useIntersectionObserver, useValueRef} from '#preact/component';
+import {useValueRef} from '#preact/component';
 import {ProxyIframeEmbed} from '#preact/component/3p-frame';
-import {useMergeRefs} from '#preact/utils';
 
 import {useStyles} from './component.jss';
 import {TYPE} from './utils';
@@ -25,68 +24,24 @@ function BentoMathmlWithRef(props, ref) {
     formula,
     inline = false,
     onLoad,
-    requestResize,
-    style: bentoMathmlStyles,
     title = 'MathML formula',
     ...rest
   } = props;
-  const [dimensions, setDimensions] = useState(null);
-  // to avoid layout shifts, hide correct dimensions until the content is offscreen to avoid a Layout Shift
-  const [allowDimensions, setAllowDimensions] = useState(false);
   const onLoadRef = useValueRef(onLoad);
-  const requestResizeRef = useValueRef(requestResize);
   const classes = useStyles();
 
-  useEffect(() => {
-    if (allowDimensions && dimensions) {
-      onLoadRef.current?.();
-      requestResizeRef.current?.(dimensions);
-    }
-  }, [onLoadRef, requestResizeRef, allowDimensions, dimensions]);
-
   const messageHandler = useCallback(
     (e) => {
       const data = tryParseJson(e.data) ?? deserializeMessage(e.data);
-      if (data['type'] == MessageType.EMBED_SIZE) {
-        const {height, width: w} = data;
-        const width = inline ? w : undefined;
-        setDimensions({height, width});
+      if (data['type'] == MessageType_Enum.EMBED_SIZE) {
+        onLoadRef.current?.();
       }
     },
-    [inline]
+    [onLoadRef]
   );
 
-  // eslint-disable-next-line prefer-const
-  let observerCb;
-  const ioCallback = useCallback(
-    ({isIntersecting}) => {
-      if (!isIntersecting) {
-        setAllowDimensions(true);
-        // unobserve element once it's rendered
-        observerCb(null);
-      }
-    },
-    [setAllowDimensions, observerCb]
-  );
-  observerCb = useIntersectionObserver(ioCallback);
-  // Need to create custom callback ref because ProxyIframeEmbed uses an imperative handle with an property for the node.
-  const observerCbRef = (proxyIframeEmbedHandle) => {
-    const {node: iframeNode} = proxyIframeEmbedHandle;
-    // Observe grandparent div instead of iframe because iframe keeps changing height
-    observerCb(iframeNode?.parentNode.parentNode);
-  };
-
-  const styles = useMemo(() => {
-    return {
-      ...(allowDimensions && dimensions),
-      ...bentoMathmlStyles,
-    };
-  }, [allowDimensions, dimensions, bentoMathmlStyles]);
-
   const iframeOptions = useMemo(() => ({formula}), [formula]);
 
-  const proxyIframeEmbedRef = useMergeRefs([ref, observerCbRef]);
-
   if (!validProps(props)) {
     return null;
   }
@@ -96,9 +51,8 @@ function BentoMathmlWithRef(props, ref) {
       class={objStr({
         [classes.inline]: inline,
       })}
-      style={styles}
       allowFullscreen
-      ref={proxyIframeEmbedRef}
+      ref={ref}
       type={TYPE}
       title={title}
       options={iframeOptions}
diff --git a/extensions/amp-mathml/1.0/example/index.html b/extensions/amp-mathml/1.0/example/index.html
new file mode 100644
index 000000000000..0f69bd517a90
--- /dev/null
+++ b/extensions/amp-mathml/1.0/example/index.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width" />
+
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-mathml-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-mathml-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-mathml-1.0.css"
+    />
+    <style>
+      body {
+        font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
+          Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
+          'Segoe UI Symbol';
+
+        background: #ecf1f3;
+      }
+    </style>
+  </head>
+  <body>
+    <h2>The Quadratic Formula</h2>
+    <bento-mathml
+      style="height: 40px"
+      data-formula="\[x = {-b \pm \sqrt{b^2-4ac} \over 2a}.\]"
+    ></bento-mathml>
+
+    <h2>Inline formula</h2>
+    <p>
+      This is an example of a formula,
+      <bento-mathml
+        style="height: 40px; width: 147px"
+        inline
+        data-formula="\[x = {-b \pm \sqrt{b^2-4ac} \over 2a}.\]"
+      ></bento-mathml>
+      placed inline in the middle of a block of text.
+    </p>
+  </body>
+</html>
diff --git a/extensions/amp-mathml/1.0/storybook/Basic.amp.js b/extensions/amp-mathml/1.0/storybook/Basic.amp.js
index 30d2165c344e..a28ceb4ed11d 100644
--- a/extensions/amp-mathml/1.0/storybook/Basic.amp.js
+++ b/extensions/amp-mathml/1.0/storybook/Basic.amp.js
@@ -30,29 +30,6 @@ export const Default = (args) => {
   );
 };
 
-export const WithScroll = (args) => {
-  return (
-    <>
-      <p>Should lazily render formula when formulas are offscreen</p>
-      <TestDemo withScroll={true} {...args}></TestDemo>
-      <TestDemoInline {...args}></TestDemoInline>
-    </>
-  );
-};
-
-export const WithCustomDimensions = (args) => {
-  return (
-    <>
-      <p>
-        Should render everything, using manual sizes for onscreen elements and
-        dynamic resizing for offscreen elements
-      </p>
-      <TestDemo withScroll={true} height="40" {...args}></TestDemo>
-      <TestDemoInline {...args}></TestDemoInline>
-    </>
-  );
-};
-
 function TestDemo({formulas, withScroll, ...args}) {
   const {cauchy, doubleAngle, quadratic} = formulas;
   return (
@@ -82,10 +59,25 @@ function TestDemoInline({formulas, ...args}) {
       <h2>Inline formula</h2>
       <p>
         This is an example of a formula of{' '}
-        <amp-mathml inline data-formula={'`x`'} {...args}></amp-mathml>,{' '}
-        <amp-mathml inline data-formula={quadratic} {...args}></amp-mathml>{' '}
+        <amp-mathml
+          height="13"
+          width="9"
+          inline
+          data-formula={'`x`'}
+          {...args}
+        ></amp-mathml>
+        ,{' '}
+        <amp-mathml
+          height="47"
+          width="146"
+          inline
+          data-formula={quadratic}
+          {...args}
+        ></amp-mathml>{' '}
         placed inline in the middle of a block of text.{' '}
         <amp-mathml
+          height="19"
+          width="71"
           inline
           data-formula={'\\( \\cos(θ+φ) \\)'}
           {...args}
diff --git a/extensions/amp-mathml/1.0/storybook/Basic.js b/extensions/amp-mathml/1.0/storybook/Basic.js
index 2ab241c3b1ad..f56540a105a6 100644
--- a/extensions/amp-mathml/1.0/storybook/Basic.js
+++ b/extensions/amp-mathml/1.0/storybook/Basic.js
@@ -2,6 +2,8 @@ import * as Preact from '#preact';
 
 import {BentoMathml} from '../component';
 
+import '../component.jss';
+
 const formulas = {
   quadratic: '\\[x = {-b \\pm \\sqrt{b^2-4ac} \\over 2a}.\\]',
   cauchy: '\\[f(a) = \\frac{1}{2\\pi i} \\oint\\frac{f(z)}{z-a}dz\\]',
@@ -26,47 +28,30 @@ export const Default = (args) => {
   );
 };
 
-export const WithScroll = (args) => {
-  return (
-    <>
-      <p>Should lazily render formula when formulas are offscreen</p>
-      <TestDemo withScroll={true} {...args}></TestDemo>
-      <TestDemoInline {...args}></TestDemoInline>
-    </>
-  );
-};
-
-export const WithCustomDimensions = (args) => {
-  return (
-    <>
-      <p>
-        Should render everything, using manual sizes for onscreen elements and
-        dynamic resizing for offscreen elements
-      </p>
-      <TestDemo withScroll={true} style={{height: 40}} {...args}></TestDemo>
-      <TestDemoInline {...args}></TestDemoInline>
-    </>
-  );
-};
-
-function TestDemo({formulas, withScroll, ...args}) {
+function TestDemo({formulas, ...args}) {
   const {cauchy, doubleAngle, quadratic} = formulas;
   return (
     <>
       <h2>The Quadratic Formula</h2>
-      <BentoMathml formula={quadratic} {...args}></BentoMathml>
+      <BentoMathml
+        style={{height: 40}}
+        formula={quadratic}
+        {...args}
+      ></BentoMathml>
 
       <h2>Cauchy's Integral Formula</h2>
-      <BentoMathml formula={cauchy} {...args}></BentoMathml>
-
-      {withScroll ? (
-        <div style={{height: 1000, border: '1px solid black'}}>
-          long stuff to create scroll
-        </div>
-      ) : null}
+      <BentoMathml
+        style={{height: 40}}
+        formula={cauchy}
+        {...args}
+      ></BentoMathml>
 
       <h2>Double angle formula for Cosines</h2>
-      <BentoMathml formula={doubleAngle} {...args}></BentoMathml>
+      <BentoMathml
+        style={{height: 23}}
+        formula={doubleAngle}
+        {...args}
+      ></BentoMathml>
     </>
   );
 }
@@ -78,10 +63,22 @@ function TestDemoInline({formulas, ...args}) {
       <h2>Inline formula</h2>
       <p>
         This is an example of a formula of{' '}
-        <BentoMathml inline formula={'`x`'} {...args}></BentoMathml>,{' '}
-        <BentoMathml inline formula={quadratic} {...args}></BentoMathml> placed
-        inline in the middle of a block of text.{' '}
         <BentoMathml
+          style={{height: 13, width: 9}}
+          inline
+          formula={'`x`'}
+          {...args}
+        ></BentoMathml>
+        ,{' '}
+        <BentoMathml
+          style={{height: 47, width: 146}}
+          inline
+          formula={quadratic}
+          {...args}
+        ></BentoMathml>{' '}
+        placed inline in the middle of a block of text.{' '}
+        <BentoMathml
+          style={{height: 19, width: 71}}
           inline
           formula={'\\( \\cos(θ+φ) \\)'}
           {...args}
diff --git a/extensions/amp-mathml/1.0/test/test-amp-mathml.js b/extensions/amp-mathml/1.0/test/test-amp-mathml.js
index fe071b6f6546..16cc1e0d67fb 100644
--- a/extensions/amp-mathml/1.0/test/test-amp-mathml.js
+++ b/extensions/amp-mathml/1.0/test/test-amp-mathml.js
@@ -1,6 +1,7 @@
 import '../amp-mathml';
 
-import {MessageType, serializeMessage} from '#core/3p-frame-messaging';
+import {expect} from 'chai';
+
 import {createElementWithAttributes} from '#core/dom';
 
 import {toggleExperiment} from '#experiments';
@@ -30,10 +31,12 @@ describes.realWin(
       const ampMathmlElement = createAmpMathmlElement(env, {
         title: mockTitle,
         formula: mockFormula,
+        style: 'height: 40px;',
       });
       env.win.document.body.appendChild(ampMathmlElement);
       await waitForRender(ampMathmlElement);
 
+      expect(ampMathmlElement.style.height).to.equal('40px');
       expect(ampMathmlElement.shadowRoot.querySelector('iframe').src).to.equal(
         'http://ads.localhost:9876/dist.3p/current/frame.max.html'
       );
@@ -45,6 +48,7 @@ describes.realWin(
       const ampMathmlElement = createAmpMathmlElement(env, {
         title: mockTitle,
         formula: mockFormula,
+        style: 'height: 40px;',
       });
       env.win.document.body.appendChild(ampMathmlElement);
       await waitForRender(ampMathmlElement);
@@ -57,13 +61,7 @@ describes.realWin(
       expect(formula).to.equal(mockFormula);
     });
 
-    it('should call amp actions', async () => {
-      env.win.IntersectionObserver = env.sandbox.stub();
-      env.win.IntersectionObserver.callsFake(() => ({
-        observe: env.sandbox.stub(),
-        unobserve: env.sandbox.stub(),
-      }));
-
+    it('should render nothing without explicit dimension', async () => {
       const mockTitle = 'mock title';
       const mockFormula = QUADRATIC_FORMULA;
       const ampMathmlElement = createAmpMathmlElement(env, {
@@ -73,94 +71,7 @@ describes.realWin(
       env.win.document.body.appendChild(ampMathmlElement);
       await waitForRender(ampMathmlElement);
 
-      const iframe = ampMathmlElement.shadowRoot.querySelector('iframe');
-      const divFrameWrapper = iframe.parentElement.parentElement;
-
-      const impl = await ampMathmlElement.getImpl(false);
-      const attemptChangeSizeStub = env.sandbox.stub(impl, 'attemptChangeSize');
-      attemptChangeSizeStub.returns(Promise.resolve());
-      const onLoadStub = env.sandbox.stub(impl, 'handleOnLoad');
-      onLoadStub.returns(undefined);
-
-      const mockEvent = new CustomEvent('message');
-      mockEvent.data = serializeMessage(
-        MessageType.EMBED_SIZE,
-        JSON.parse(iframe.getAttribute('name')).attributes.sentinel,
-        {
-          height: 1001,
-          width: 1002,
-        }
-      );
-      mockEvent.source = iframe.contentWindow;
-      env.win.dispatchEvent(mockEvent);
-
-      // wait for useIntersectionObserver hook to execute
-      await Promise.resolve();
-
-      // simulate offscreen intersection to force "render"
-      const ioCallback = env.win.IntersectionObserver.lastCall.firstArg;
-      ioCallback([{isIntersecting: false, target: divFrameWrapper}]);
-
-      // wait for useEffectHook to execute
-      await waitForHooks();
-
-      expect(onLoadStub).to.be.calledOnce;
-      expect(attemptChangeSizeStub).to.be.calledOnce.calledWith(
-        1001,
-        /* width should be ignored for non-inline elements */
-        undefined
-      );
-    });
-
-    it('should render inline correctly', async () => {
-      env.win.IntersectionObserver = env.sandbox.stub();
-      env.win.IntersectionObserver.callsFake(() => ({
-        observe: env.sandbox.stub(),
-        unobserve: env.sandbox.stub(),
-      }));
-
-      const mockTitle = 'mock title';
-      const mockFormula = QUADRATIC_FORMULA;
-      const ampMathmlElement = createAmpMathmlElement(env, {
-        title: mockTitle,
-        formula: mockFormula,
-        inline: true,
-      });
-      env.win.document.body.appendChild(ampMathmlElement);
-      await waitForRender(ampMathmlElement);
-
-      const iframe = ampMathmlElement.shadowRoot.querySelector('iframe');
-      const divFrameWrapper = iframe.parentElement.parentElement;
-      expect(divFrameWrapper.classList.toString().includes('inline')).to.be
-        .true;
-
-      const impl = await ampMathmlElement.getImpl(false);
-      const attemptChangeSizeStub = env.sandbox.stub(impl, 'attemptChangeSize');
-      attemptChangeSizeStub.returns(Promise.resolve());
-
-      const mockEvent = new CustomEvent('message');
-      mockEvent.data = serializeMessage(
-        MessageType.EMBED_SIZE,
-        JSON.parse(iframe.getAttribute('name')).attributes.sentinel,
-        {
-          height: 1001,
-          width: 1002,
-        }
-      );
-      mockEvent.source = iframe.contentWindow;
-      env.win.dispatchEvent(mockEvent);
-
-      // wait for useIntersectionObserver hook to execute
-      await Promise.resolve();
-
-      // simulate offscreen intersection to force "render"
-      const ioCallback = env.win.IntersectionObserver.lastCall.firstArg;
-      ioCallback([{isIntersecting: false, target: divFrameWrapper}]);
-
-      // wait for useEffectHook to execute
-      await waitForHooks();
-
-      expect(attemptChangeSizeStub).to.be.calledOnce.calledWith(1001, 1002);
+      expect(ampMathmlElement.style.height).to.be.empty;
     });
   }
 );
@@ -185,7 +96,3 @@ async function waitForRender(element) {
   );
   await loadPromise;
 }
-
-async function waitForHooks() {
-  return new Promise((r) => setTimeout(r, 50));
-}
diff --git a/extensions/amp-mathml/validator-amp-mathml.protoascii b/extensions/amp-mathml/validator-amp-mathml.protoascii
index c6575e672d02..8b66d0f5bf2a 100644
--- a/extensions/amp-mathml/validator-amp-mathml.protoascii
+++ b/extensions/amp-mathml/validator-amp-mathml.protoascii
@@ -1,8 +1,8 @@
 tags: {  # amp-mathml 1.0
   html_format: AMP
   tag_name: "SCRIPT"
-  satisfies: "amp-mathml 1.0"
-  excludes: "amp-mathml 0.1"
+  satisfies_condition: "amp-mathml 1.0"
+  excludes_condition: "amp-mathml 0.1"
   extension_spec: {
     name: "amp-mathml"
     version_name: "v1.0"
@@ -15,8 +15,8 @@ tags: {  # amp-mathml 1.0
 tags: {  # amp-mathml 0.1
   html_format: AMP
   tag_name: "SCRIPT"
-  satisfies: "amp-mathml 0.1"
-  excludes: "amp-mathml 1.0"
+  satisfies_condition: "amp-mathml 0.1"
+  excludes_condition: "amp-mathml 1.0"
   extension_spec: {
     name: "amp-mathml"
     version: "0.1"
diff --git a/extensions/amp-mega-menu/0.1/amp-mega-menu.js b/extensions/amp-mega-menu/0.1/amp-mega-menu.js
index 0740404e8282..3d0bb3df8c15 100644
--- a/extensions/amp-mega-menu/0.1/amp-mega-menu.js
+++ b/extensions/amp-mega-menu/0.1/amp-mega-menu.js
@@ -1,7 +1,7 @@
-import {AmpEvents} from '#core/constants/amp-events';
-import {Keys} from '#core/constants/key-codes';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
+import {Keys_Enum} from '#core/constants/key-codes';
 import {isConnectedNode, isRTL, tryFocus} from '#core/dom';
-import {Layout} from '#core/dom/layout';
+import {Layout_Enum} from '#core/dom/layout';
 import {setModalAsClosed, setModalAsOpen} from '#core/dom/modal';
 import {
   closest,
@@ -30,7 +30,7 @@ const ARIA_LABEL_CLOSE = 'Close the menu';
  * template rendering via dynamically fetched data.
  */
 export class AmpMegaMenu extends AMP.BaseElement {
-  /** @override @nocollapse */
+  /** @override  */
   static prerenderAllowed() {
     return true;
   }
@@ -75,7 +75,7 @@ export class AmpMegaMenu extends AMP.BaseElement {
 
   /** @override */
   isLayoutSupported(layout) {
-    return layout === Layout.FIXED_HEIGHT;
+    return layout === Layout_Enum.FIXED_HEIGHT;
   }
 
   /** @override */
@@ -88,7 +88,10 @@ export class AmpMegaMenu extends AMP.BaseElement {
     this.registerMenuItems_();
     // items may not be present after build if dynamically rendered via amp-list,
     // in which case register them after DOM update instead.
-    this.element.addEventListener(AmpEvents.DOM_UPDATE, this.domUpdateHandler_);
+    this.element.addEventListener(
+      AmpEvents_Enum.DOM_UPDATE,
+      this.domUpdateHandler_
+    );
 
     if (!this.maskElement_) {
       this.maskElement_ = this.createMaskElement_();
@@ -100,7 +103,7 @@ export class AmpMegaMenu extends AMP.BaseElement {
   /** @override */
   unlayoutCallback() {
     this.element.removeEventListener(
-      AmpEvents.DOM_UPDATE,
+      AmpEvents_Enum.DOM_UPDATE,
       this.domUpdateHandler_
     );
     // Ensure that menu is closed when hidden via media query.
@@ -225,7 +228,7 @@ export class AmpMegaMenu extends AMP.BaseElement {
    * @private
    */
   handleRootKeyDown_(event) {
-    if (event.key === Keys.ESCAPE && this.collapse_()) {
+    if (event.key === Keys_Enum.ESCAPE && this.collapse_()) {
       event.preventDefault();
     }
   }
@@ -282,12 +285,12 @@ export class AmpMegaMenu extends AMP.BaseElement {
     }
     const {key} = event;
     switch (key) {
-      case Keys.LEFT_ARROW: /* fallthrough */
-      case Keys.RIGHT_ARROW:
+      case Keys_Enum.LEFT_ARROW: /* fallthrough */
+      case Keys_Enum.RIGHT_ARROW:
         this.handleNavigationKeyDown_(event);
         return;
-      case Keys.ENTER: /* fallthrough */
-      case Keys.SPACE:
+      case Keys_Enum.ENTER: /* fallthrough */
+      case Keys_Enum.SPACE:
         if (event.target == event.currentTarget) {
           this.handleHeadingClick_(event);
         }
@@ -305,7 +308,7 @@ export class AmpMegaMenu extends AMP.BaseElement {
     const index = this.items_.indexOf(item);
     if (index !== -1) {
       event.preventDefault();
-      let dir = event.key == Keys.LEFT_ARROW ? -1 : 1;
+      let dir = event.key == Keys_Enum.LEFT_ARROW ? -1 : 1;
       // Left is 'previous' in LTR and 'next' in RTL; vice versa for Right.
       if (isRTL(this.document_)) {
         dir = -dir;
diff --git a/extensions/amp-mega-menu/0.1/test/test-amp-mega-menu.js b/extensions/amp-mega-menu/0.1/test/test-amp-mega-menu.js
index def7cdffbe33..2532a64e6660 100644
--- a/extensions/amp-mega-menu/0.1/test/test-amp-mega-menu.js
+++ b/extensions/amp-mega-menu/0.1/test/test-amp-mega-menu.js
@@ -1,5 +1,5 @@
 import '../amp-mega-menu';
-import {Keys} from '#core/constants/key-codes';
+import {Keys_Enum} from '#core/constants/key-codes';
 import {tryFocus} from '#core/dom';
 import {htmlFor} from '#core/dom/static-template';
 
@@ -157,7 +157,7 @@ describes.realWin(
       impl.expand_(heading.parentNode);
       expect(heading.parentNode.hasAttribute('open')).to.be.true;
       expect(heading.getAttribute('aria-expanded')).to.equal('true');
-      const escKey = new KeyboardEvent('keydown', {key: Keys.ESCAPE});
+      const escKey = new KeyboardEvent('keydown', {key: Keys_Enum.ESCAPE});
       doc.documentElement.dispatchEvent(escKey);
       expect(heading.parentNode.hasAttribute('open')).to.be.false;
       expect(heading.getAttribute('aria-expanded')).to.equal('false');
@@ -169,8 +169,10 @@ describes.realWin(
       const heading1 = doc.getElementById('heading1');
       const heading2 = doc.getElementById('heading2');
       const heading3 = doc.getElementById('heading3');
-      const leftKey = new KeyboardEvent('keydown', {key: Keys.LEFT_ARROW});
-      const rightKey = new KeyboardEvent('keydown', {key: Keys.RIGHT_ARROW});
+      const leftKey = new KeyboardEvent('keydown', {key: Keys_Enum.LEFT_ARROW});
+      const rightKey = new KeyboardEvent('keydown', {
+        key: Keys_Enum.RIGHT_ARROW,
+      });
       tryFocus(heading1);
       expect(doc.activeElement).to.equal(heading1);
       heading1.dispatchEvent(leftKey);
diff --git a/extensions/amp-mega-menu/validator-amp-mega-menu.protoascii b/extensions/amp-mega-menu/validator-amp-mega-menu.protoascii
index 68755765b1df..45fc28fe4d1c 100644
--- a/extensions/amp-mega-menu/validator-amp-mega-menu.protoascii
+++ b/extensions/amp-mega-menu/validator-amp-mega-menu.protoascii
@@ -178,11 +178,14 @@ descendant_tag_list {
   tag: "H5"
   tag: "H6"
   tag: "I"
+  tag: "I-AMPHTML-SIZER" # For transformed documents.
+  tag: "IMG" # For SSR'ed hero images on transformed documents and native images.
   tag: "INPUT"
   tag: "LABEL"
   tag: "LI"
   tag: "MARK"
   tag: "NAV"
+  tag: "NOSCRIPT" # For amp-img fallbacks.
   tag: "OL"
   tag: "OPTION"
   tag: "P"
diff --git a/extensions/amp-megaphone/0.1/amp-megaphone.js b/extensions/amp-megaphone/0.1/amp-megaphone.js
index 6d6a0229df4d..8ec6939d7ae8 100644
--- a/extensions/amp-megaphone/0.1/amp-megaphone.js
+++ b/extensions/amp-megaphone/0.1/amp-megaphone.js
@@ -15,7 +15,6 @@ import {removeElement} from '#core/dom';
 import {applyFillContent, isLayoutSizeFixed} from '#core/dom/layout';
 import {PauseHelper} from '#core/dom/video/pause-helper';
 import {isObject} from '#core/types';
-import {dict} from '#core/types/object';
 import {tryParseJson} from '#core/types/object/json';
 
 import {Services} from '#service';
@@ -139,14 +138,14 @@ class AmpMegaphone extends AMP.BaseElement {
     const start = this.element.getAttribute('data-start');
     const hasTile = this.element.hasAttribute('data-tile');
 
-    const queryParams = dict({
+    const queryParams = {
       'p': this.isPlaylist_ ? mediaid : undefined,
       'light': hasLightTheme || undefined,
       'sharing': hasSharing || undefined,
       'episodes': (this.isPlaylist_ && episodes) || undefined,
       'start': (!this.isPlaylist_ && start) || undefined,
       'tile': (!this.isPlaylist_ && hasTile) || undefined,
-    });
+    };
 
     return addParamsToUrl(
       this.baseUrl_ + '/' + (this.isPlaylist_ ? '' : mediaid + '/'),
@@ -195,7 +194,7 @@ class AmpMegaphone extends AMP.BaseElement {
   pauseCallback() {
     if (this.iframe_ && this.iframe_.contentWindow) {
       this.iframe_.contentWindow./*OK*/ postMessage(
-        JSON.stringify(dict({'method': 'pause'})),
+        JSON.stringify({'method': 'pause'}),
         this.baseUrl_
       );
 
diff --git a/extensions/amp-minute-media-player/0.1/amp-minute-media-player.js b/extensions/amp-minute-media-player/0.1/amp-minute-media-player.js
index 4050aec10413..32c2e3f149a0 100644
--- a/extensions/amp-minute-media-player/0.1/amp-minute-media-player.js
+++ b/extensions/amp-minute-media-player/0.1/amp-minute-media-player.js
@@ -5,8 +5,7 @@ import {
   fullscreenExit,
   isFullscreenElement,
 } from '#core/dom/fullscreen';
-import {Layout, isLayoutSizeDefined} from '#core/dom/layout';
-import {dict} from '#core/types/object';
+import {Layout_Enum, isLayoutSizeDefined} from '#core/dom/layout';
 
 import {Services} from '#service';
 import {installVideoManagerForDoc} from '#service/video-manager-impl';
@@ -23,7 +22,7 @@ import {
   redispatch,
 } from '../../../src/iframe-video';
 import {addParamsToUrl} from '../../../src/url';
-import {VideoEvents} from '../../../src/video-interface';
+import {VideoEvents_Enum} from '../../../src/video-interface';
 
 /** @const */
 const TAG = 'amp-minute-media-player';
@@ -103,7 +102,7 @@ class AmpMinuteMediaPlayer extends AMP.BaseElement {
 
   /** @override */
   isLayoutSupported(layout) {
-    return isLayoutSizeDefined(layout) || layout == Layout.FLEX_ITEM;
+    return isLayoutSizeDefined(layout) || layout == Layout_Enum.FLEX_ITEM;
   }
 
   /**
@@ -164,12 +163,12 @@ class AmpMinuteMediaPlayer extends AMP.BaseElement {
     }
 
     redispatch(this.element, data['event'], {
-      'ready': VideoEvents.LOAD,
-      'playing': VideoEvents.PLAYING,
-      'pause': VideoEvents.PAUSE,
-      'ended': [VideoEvents.ENDED, VideoEvents.PAUSE],
-      'ads-ad-started': VideoEvents.AD_START,
-      'ads-ad-ended': VideoEvents.AD_END,
+      'ready': VideoEvents_Enum.LOAD,
+      'playing': VideoEvents_Enum.PLAYING,
+      'pause': VideoEvents_Enum.PAUSE,
+      'ended': [VideoEvents_Enum.ENDED, VideoEvents_Enum.PAUSE],
+      'ads-ad-started': VideoEvents_Enum.AD_START,
+      'ads-ad-ended': VideoEvents_Enum.AD_END,
     });
 
     if (data['event'] === 'mute') {
@@ -192,7 +191,7 @@ class AmpMinuteMediaPlayer extends AMP.BaseElement {
     const baseUrl =
       'https://www.oo-syringe.com/prod/AMP/minute-media-player.html';
 
-    const moreQueryParams = dict({
+    const moreQueryParams = {
       'content_type': this.contentType_ || undefined,
       'content_id': this.contentId_ || undefined,
       'scanned_element_type': this.scannedElementType_ || undefined,
@@ -201,7 +200,7 @@ class AmpMinuteMediaPlayer extends AMP.BaseElement {
       'minimum_date_factor': this.minimumDateFactor_ || undefined,
       'scoped_keywords': this.scopedKeywords_ || undefined,
       'player_id': this.playerId_ || undefined,
-    });
+    };
 
     return addParamsToUrl(baseUrl, moreQueryParams);
   }
@@ -220,7 +219,7 @@ class AmpMinuteMediaPlayer extends AMP.BaseElement {
     Services.videoManagerForDoc(this.element).register(this);
 
     const loaded = this.loadPromise(this.iframe_).then(() => {
-      dispatchCustomEvent(element, VideoEvents.LOAD);
+      dispatchCustomEvent(element, VideoEvents_Enum.LOAD);
     });
     this.playerReadyResolver_(loaded);
     return loaded;
diff --git a/extensions/amp-mowplayer/0.1/amp-mowplayer.js b/extensions/amp-mowplayer/0.1/amp-mowplayer.js
index d09f5a786125..73ecfe75bcf9 100644
--- a/extensions/amp-mowplayer/0.1/amp-mowplayer.js
+++ b/extensions/amp-mowplayer/0.1/amp-mowplayer.js
@@ -7,7 +7,6 @@ import {
 } from '#core/dom/fullscreen';
 import {isLayoutSizeDefined} from '#core/dom/layout';
 import {PauseHelper} from '#core/dom/video/pause-helper';
-import {dict} from '#core/types/object';
 
 import {Services} from '#service';
 import {installVideoManagerForDoc} from '#service/video-manager-impl';
@@ -23,7 +22,7 @@ import {
   originMatches,
   redispatch,
 } from '../../../src/iframe-video';
-import {VideoEvents} from '../../../src/video-interface';
+import {VideoEvents_Enum} from '../../../src/video-interface';
 
 const TAG = 'amp-mowplayer';
 
@@ -132,7 +131,7 @@ class AmpMowplayer extends AMP.BaseElement {
     const loaded = this.loadPromise(this.iframe_).then(() => {
       // Tell mowplayer that we want to receive messages
       this.listenToFrame_();
-      dispatchCustomEvent(this.element, VideoEvents.LOAD);
+      dispatchCustomEvent(this.element, VideoEvents_Enum.LOAD);
     });
     this.playerReadyResolver_(loaded);
 
@@ -186,13 +185,11 @@ class AmpMowplayer extends AMP.BaseElement {
   sendCommand_(command, opt_args) {
     this.playerReadyPromise_.then(() => {
       if (this.iframe_ && this.iframe_.contentWindow) {
-        const message = JSON.stringify(
-          dict({
-            'event': 'command',
-            'func': command,
-            'args': opt_args || '',
-          })
-        );
+        const message = JSON.stringify({
+          'event': 'command',
+          'func': command,
+          'args': opt_args || '',
+        });
         this.iframe_.contentWindow./*OK*/ postMessage(
           message,
           'https://mowplayer.com'
@@ -233,10 +230,10 @@ class AmpMowplayer extends AMP.BaseElement {
     const playerState = info['playerState'];
     if (eventType == 'infoDelivery' && playerState != null) {
       redispatch(element, playerState.toString(), {
-        [PlayerStates.PLAYING]: VideoEvents.PLAYING,
-        [PlayerStates.PAUSED]: VideoEvents.PAUSE,
+        [PlayerStates.PLAYING]: VideoEvents_Enum.PLAYING,
+        [PlayerStates.PAUSED]: VideoEvents_Enum.PAUSE,
         // mowplayer does not fire pause and ended together.
-        [PlayerStates.ENDED]: [VideoEvents.ENDED, VideoEvents.PAUSE],
+        [PlayerStates.ENDED]: [VideoEvents_Enum.ENDED, VideoEvents_Enum.PAUSE],
       });
       return;
     }
diff --git a/extensions/amp-mowplayer/0.1/test/test-amp-mowplayer.js b/extensions/amp-mowplayer/0.1/test/test-amp-mowplayer.js
index 714f91e3cb61..d52c2f64a8c8 100644
--- a/extensions/amp-mowplayer/0.1/test/test-amp-mowplayer.js
+++ b/extensions/amp-mowplayer/0.1/test/test-amp-mowplayer.js
@@ -5,7 +5,7 @@ import {Services} from '#service';
 
 import {listenOncePromise} from '#utils/event-helper';
 
-import {VideoEvents} from '../../../../src/video-interface';
+import {VideoEvents_Enum} from '../../../../src/video-interface';
 
 const EXAMPLE_VIDEOID = 'v-myfwarfx4tb';
 const EXAMPLE_VIDEOID_URL = 'https://mowplayer.com/watch/v-myfwarfx4tb';
@@ -54,7 +54,8 @@ describes.realWin(
         });
     }
 
-    describe('with data-mediaid', function () {
+    // TODO(#39845): Fix flaky tests.
+    describe.skip('with data-mediaid', function () {
       runTestsForDatasource(EXAMPLE_VIDEOID);
     });
 
@@ -85,38 +86,40 @@ describes.realWin(
 
           return Promise.resolve()
             .then(async () => {
-              const p = listenOncePromise(mp, VideoEvents.MUTED);
+              const p = listenOncePromise(mp, VideoEvents_Enum.MUTED);
               await sendFakeInfoDeliveryMessage(mp, iframe, {muted: true});
               return p;
             })
             .then(async () => {
-              const p = listenOncePromise(mp, VideoEvents.PLAYING);
+              const p = listenOncePromise(mp, VideoEvents_Enum.PLAYING);
               await sendFakeInfoDeliveryMessage(mp, iframe, {playerState: 1});
               return p;
             })
             .then(async () => {
-              const p = listenOncePromise(mp, VideoEvents.PAUSE);
+              const p = listenOncePromise(mp, VideoEvents_Enum.PAUSE);
               await sendFakeInfoDeliveryMessage(mp, iframe, {playerState: 2});
               return p;
             })
             .then(async () => {
-              const p = listenOncePromise(mp, VideoEvents.UNMUTED);
+              const p = listenOncePromise(mp, VideoEvents_Enum.UNMUTED);
               await sendFakeInfoDeliveryMessage(mp, iframe, {muted: false});
               return p;
             })
             .then(async () => {
               // Should not send the unmute event twice if already sent once.
-              const p = listenOncePromise(mp, VideoEvents.UNMUTED).then(() => {
-                assert.fail('Should not have dispatch unmute message twice');
-              });
+              const p = listenOncePromise(mp, VideoEvents_Enum.UNMUTED).then(
+                () => {
+                  assert.fail('Should not have dispatch unmute message twice');
+                }
+              );
               await sendFakeInfoDeliveryMessage(mp, iframe, {muted: false});
               const successTimeout = timer.promise(10);
               return Promise.race([p, successTimeout]);
             })
             .then(async () => {
               // Make sure pause and end are triggered when video ends.
-              const pEnded = listenOncePromise(mp, VideoEvents.ENDED);
-              const pPause = listenOncePromise(mp, VideoEvents.PAUSE);
+              const pEnded = listenOncePromise(mp, VideoEvents_Enum.ENDED);
+              const pPause = listenOncePromise(mp, VideoEvents_Enum.PAUSE);
               await sendFakeInfoDeliveryMessage(mp, iframe, {playerState: 0});
               return Promise.all([pEnded, pPause]);
             });
diff --git a/extensions/amp-mraid/0.1/amp-mraid.js b/extensions/amp-mraid/0.1/amp-mraid.js
index 2fc02250bf0e..4c2ec4c22470 100644
--- a/extensions/amp-mraid/0.1/amp-mraid.js
+++ b/extensions/amp-mraid/0.1/amp-mraid.js
@@ -26,7 +26,7 @@ import {dev} from '#utils/log';
 
 import {MraidService} from './mraid-service';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {getMode} from '../../../src/mode';
 
 const TAG = 'amp-mraid';
diff --git a/extensions/amp-mraid/0.1/mraid-service.js b/extensions/amp-mraid/0.1/mraid-service.js
index ffed2e662fd6..4aa642c04a0a 100644
--- a/extensions/amp-mraid/0.1/mraid-service.js
+++ b/extensions/amp-mraid/0.1/mraid-service.js
@@ -16,7 +16,7 @@ import {
  */
 export class MraidService {
   /**
-   * @param {Object} mraid validated global mraid object
+   * @param {object} mraid validated global mraid object
    */
   constructor(mraid) {
     /** @private */
diff --git a/extensions/amp-mraid/0.1/test/validator-amp-mraid.html b/extensions/amp-mraid/0.1/test/validator-amp-mraid.html
index d8cdd4e9c2e0..6e09c57d3c50 100644
--- a/extensions/amp-mraid/0.1/test/validator-amp-mraid.html
+++ b/extensions/amp-mraid/0.1/test/validator-amp-mraid.html
@@ -1,6 +1,6 @@
 <!--
   Test Description:
-  Tests the presence of the the amp-mraid script tag is disallowed in AMP.
+  Tests the presence of the amp-mraid script tag is disallowed in AMP.
 -->
 <!doctype html>
 <html ⚡ lang="en">
diff --git a/extensions/amp-mraid/0.1/test/validator-amp-mraid.out b/extensions/amp-mraid/0.1/test/validator-amp-mraid.out
index 8a93556a7c95..50906f976870 100644
--- a/extensions/amp-mraid/0.1/test/validator-amp-mraid.out
+++ b/extensions/amp-mraid/0.1/test/validator-amp-mraid.out
@@ -1,7 +1,7 @@
 FAIL
 |  <!--
 |    Test Description:
-|    Tests the presence of the the amp-mraid script tag is disallowed in AMP.
+|    Tests the presence of the amp-mraid script tag is disallowed in AMP.
 |  -->
 |  <!doctype html>
 |  <html ⚡ lang="en">
@@ -14,7 +14,7 @@ FAIL
 |    <!-- Invalid: amp-mraid not allowed in AMP; only allowed in AMP ADS -->
 |    <script async host-service="amp-mraid" src="https://cdn.ampproject.org/v0/amp-mraid-0.1.js"></script>
 >>   ^~~~~~~~~
-amp-mraid/0.1/test/validator-amp-mraid.html:14:2 Custom JavaScript is not allowed. (see https://amp.dev/documentation/guides-and-tutorials/learn/validation-workflow/validation_errors/#custom-javascript-is-not-allowed)
+amp-mraid/0.1/test/validator-amp-mraid.html:14:2 The attribute 'host-service' may not appear in tag 'amphtml engine script'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#required-markup)
 |    <script async src="https://cdn.ampproject.org/v0.js"></script>
 |  </head>
 |  <body>
diff --git a/extensions/amp-mustache/0.1/amp-mustache.js b/extensions/amp-mustache/0.1/amp-mustache.js
index c5a7bd294776..47e9ac2201ab 100644
--- a/extensions/amp-mustache/0.1/amp-mustache.js
+++ b/extensions/amp-mustache/0.1/amp-mustache.js
@@ -1,12 +1,14 @@
+import {templateContentClone} from '#core/dom';
+
+import {user} from '#utils/log';
+
+import mustache from '#third_party/mustache/mustache';
+
 import {BaseTemplate} from '../../../src/base-template';
-import {dict} from '#core/types/object';
-import {iterateCursor, templateContentClone} from '#core/dom';
 import {
   sanitizeHtml,
   sanitizeTagsForTripleMustache,
 } from '../../../src/sanitizer';
-import {user} from '#utils/log';
-import mustache from '#third_party/mustache/mustache';
 
 const TAG = 'amp-mustache';
 
@@ -25,7 +27,9 @@ export class AmpMustache extends BaseTemplate {
     super(element, win);
 
     // Unescaped templating (triple mustache) has a special, strict sanitizer.
-    mustache.setUnescapedSanitizer(sanitizeTagsForTripleMustache);
+    mustache.setUnescapedSanitizer((html) =>
+      sanitizeTagsForTripleMustache(html, this.win.document)
+    );
 
     user().warn(
       TAG,
@@ -43,7 +47,7 @@ export class AmpMustache extends BaseTemplate {
       return;
     }
     /** @private @const {!JsonObject} */
-    this.nestedTemplates_ = dict();
+    this.nestedTemplates_ = {};
 
     /** @private @const {string} */
     this.template_ = this.initTemplateString_();
@@ -81,7 +85,7 @@ export class AmpMustache extends BaseTemplate {
    */
   processNestedTemplates_(content) {
     const templates = content.querySelectorAll('template');
-    iterateCursor(templates, (nestedTemplate, index) => {
+    templates.forEach((nestedTemplate, index) => {
       const nestedTemplateKey = `__AMP_NESTED_TEMPLATE_${index}`;
       this.nestedTemplates_[nestedTemplateKey] =
         nestedTemplate./*OK*/ outerHTML;
diff --git a/extensions/amp-mustache/0.1/test/test-amp-mustache.js b/extensions/amp-mustache/0.1/test/test-amp-mustache.js
index 923af455a682..f2b6c0f785a5 100644
--- a/extensions/amp-mustache/0.1/test/test-amp-mustache.js
+++ b/extensions/amp-mustache/0.1/test/test-amp-mustache.js
@@ -1,7 +1,8 @@
+import mustache from '#third_party/mustache/mustache';
+
 import * as sanitizer from '../../../../src/sanitizer';
 import * as service from '../../../../src/service-helpers';
 import {AmpMustache} from '../amp-mustache';
-import mustache from '#third_party/mustache/mustache';
 
 describes.repeated(
   'amp-mustache 0.1',
diff --git a/extensions/amp-mustache/0.2/amp-mustache.js b/extensions/amp-mustache/0.2/amp-mustache.js
index da99cd09f52e..0c2b59bb7084 100644
--- a/extensions/amp-mustache/0.2/amp-mustache.js
+++ b/extensions/amp-mustache/0.2/amp-mustache.js
@@ -1,12 +1,15 @@
-import {BaseTemplate} from '../../../src/base-template';
+import {templateContentClone} from '#core/dom';
+
 import {Purifier} from '#purifier';
-import {dict} from '#core/types/object';
-import {getService, registerServiceBuilder} from '../../../src/service-helpers';
-import {iterateCursor, templateContentClone} from '#core/dom';
-import {rewriteAttributeValue} from '../../../src/url-rewrite';
+
 import {user} from '#utils/log';
+
 import mustache from '#third_party/mustache/mustache';
 
+import {BaseTemplate} from '../../../src/base-template';
+import {getService, registerServiceBuilder} from '../../../src/service-helpers';
+import {rewriteAttributeValue} from '../../../src/url-rewrite';
+
 const TAG = 'amp-mustache';
 
 /**
@@ -24,7 +27,7 @@ export class AmpMustache extends BaseTemplate {
     super(element, win);
 
     registerServiceBuilder(win, 'purifier', function () {
-      return new Purifier(win.document, dict(), rewriteAttributeValue);
+      return new Purifier(win.document, {}, rewriteAttributeValue);
     });
     /** @private @const {!Purifier} */
     this.purifier_ = getService(win, 'purifier');
@@ -44,7 +47,7 @@ export class AmpMustache extends BaseTemplate {
       return;
     }
     /** @private @const {!JsonObject} */
-    this.nestedTemplates_ = dict();
+    this.nestedTemplates_ = {};
 
     /** @private @const {string} */
     this.template_ = this.initTemplateString_();
@@ -85,7 +88,7 @@ export class AmpMustache extends BaseTemplate {
    */
   processNestedTemplates_(content) {
     const templates = content.querySelectorAll('template');
-    iterateCursor(templates, (template, index) => {
+    templates.forEach((template, index) => {
       const key = `__AMP_NESTED_TEMPLATE_${index}`;
 
       // Store the nested template markup, keyed by index.
diff --git a/extensions/amp-mustache/0.2/test/test-amp-mustache.js b/extensions/amp-mustache/0.2/test/test-amp-mustache.js
index 9ac23e9a22b1..c80ffb23bfaa 100644
--- a/extensions/amp-mustache/0.2/test/test-amp-mustache.js
+++ b/extensions/amp-mustache/0.2/test/test-amp-mustache.js
@@ -1,8 +1,10 @@
-import * as service from '../../../../src/service-helpers';
-import {AmpMustache} from '../amp-mustache';
 import {Purifier} from '#purifier';
+
 import mustache from '#third_party/mustache/mustache';
 
+import * as service from '../../../../src/service-helpers';
+import {AmpMustache} from '../amp-mustache';
+
 describes.repeated(
   'amp-mustache 0.2',
   {
diff --git a/extensions/amp-mustache/amp-mustache.md b/extensions/amp-mustache/amp-mustache.md
index 14f00b385f60..f34a7a52df96 100644
--- a/extensions/amp-mustache/amp-mustache.md
+++ b/extensions/amp-mustache/amp-mustache.md
@@ -21,7 +21,7 @@ teaser:
 
 Mustache is a logic-less template syntax. See [Mustache specification](http://mustache.github.io/mustache.5.html) for more details. Some of the core Mustache tags are:
 
--   `{{variable}}`: A variable tag. It outputs the the HTML-escaped value of a variable.
+-   `{{variable}}`: A variable tag. It outputs the HTML-escaped value of a variable.
 -   `{{#section}} {{/section}}`: A section tag. It can test the existence of a variable and iterate over it if it's an array.
 -   `{{^section}} {{/section}}`: An inverted tag. It can test the non-existence of a variable.
 -   `{{{unescaped}}}`: Unescaped HTML. It's restricted in the markup it may output (see "Restrictions" below).
@@ -74,7 +74,19 @@ that among other things, you can't use `amp-mustache` to:
 -   Calculate tag name. E.g. `<{{tagName}}>` is not allowed.
 -   Calculate attribute name. E.g. `<div {{attrName}}=something>` is not allowed.
 
-The output of "triple-mustache" is sanitized to only allow the following tags: `a`, `amp-list`, `b`, `br`, `caption`, `col`, `colgroup`, `code`, `del`, `div`, `em`, `h1`, `h2`, `h3`, `hr`, `i`, `ins`, `li`, `mark`, `ol`, `p`, `q`, `s`, `small`, `span`, `strong`, `sub`, `sup`, `table`, `tbody`, `time`, `td`, `th`, `thead`, `tfoot`, `tr`, `u`, `ul`.
+The output of "triple-mustache" is sanitized to only allow the following tags:
+
+[filter formats="websites, ads"]
+
+`a`, `amp-img`, `article`, `aside`, `b`, `blockquote`, `br`, `caption`, `code`, `col`, `colgroup`, `dd`, `del`, `details`, `div`, `dl`, `dt`, `em`, `figcaption`, `figure`, `footer`, `h1`, `h2`, `h3`, `header`, `hr`, `i`, `ins`, `li`, `main`, `mark`, `nav`, `ol`, `p`, `pre`, `q`, `s`, `section`, `small`, `span`, `strong`, `sub`, `summary`, `sup`, `table`, `tbody`, `td`, `tfoot`, `th`, `thead`, `time`, `tr`, `u`, `ul`.
+
+[/filter]<!-- formats="websites, ads" -->
+
+[filter formats="email"]
+
+`a`, `article`, `aside`, `b`, `blockquote`, `br`, `caption`, `code`, `col`, `colgroup`, `dd`, `del`, `details`, `div`, `dl`, `dt`, `em`, `figcaption`, `figure`, `footer`, `h1`, `h2`, `h3`, `header`, `hr`, `i`, `ins`, `li`, `main`, `mark`, `nav`, `ol`, `p`, `pre`, `q`, `s`, `section`, `small`, `span`, `strong`, `sub`, `summary`, `sup`, `table`, `tbody`, `td`, `tfoot`, `th`, `thead`, `time`, `tr`, `u`, `ul`.
+
+[/filter]<!-- formats="email" -->
 
 ### Sanitization
 
diff --git a/extensions/amp-mustache/validator-amp-mustache.protoascii b/extensions/amp-mustache/validator-amp-mustache.protoascii
index eb09c064550a..ae755d8a6bd2 100644
--- a/extensions/amp-mustache/validator-amp-mustache.protoascii
+++ b/extensions/amp-mustache/validator-amp-mustache.protoascii
@@ -219,7 +219,8 @@ tags: {
   disallowed_ancestor: "FORM DIV [submit-error][template]"
   disallowed_ancestor: "FORM DIV [submitting][template]"
   disallowed_ancestor: "FORM DIV [verify-error][template]"
-  # AMP4EMAIL addition.
+  # AMP4EMAIL addition. See the comment for AMP4EMAIL for the spec named
+  # "FORM DIV [submitting][template]".
   disallowed_ancestor: "FORM DIV [submitting]"
   requires_extension: "amp-mustache"
   attrs: {
@@ -536,7 +537,8 @@ tags: {
   disallowed_ancestor: "FORM DIV [submit-error][template]"
   disallowed_ancestor: "FORM DIV [submitting][template]"
   disallowed_ancestor: "FORM DIV [verify-error][template]"
-  # AMP4EMAIL addition.
+  # AMP4EMAIL addition. See the comment for AMP4EMAIL for the spec named
+  # "FORM DIV [submitting][template]".
   disallowed_ancestor: "FORM DIV [submitting]"
   requires_extension: "amp-mustache"
   attrs: {
diff --git a/extensions/amp-nested-menu/0.1/amp-nested-menu.js b/extensions/amp-nested-menu/0.1/amp-nested-menu.js
index 019b05475ec3..c040c886c47f 100644
--- a/extensions/amp-nested-menu/0.1/amp-nested-menu.js
+++ b/extensions/amp-nested-menu/0.1/amp-nested-menu.js
@@ -1,6 +1,6 @@
-import {Keys} from '#core/constants/key-codes';
+import {Keys_Enum} from '#core/constants/key-codes';
 import {isRTL, tryFocus} from '#core/dom';
-import {Layout} from '#core/dom/layout';
+import {Layout_Enum} from '#core/dom/layout';
 import {
   closest,
   closestAncestorElementBySelector,
@@ -26,7 +26,7 @@ const Side = {
 const ANIMATION_TIMEOUT = 350;
 
 export class AmpNestedMenu extends AMP.BaseElement {
-  /** @override @nocollapse */
+  /** @override  */
   static prerenderAllowed() {
     return true;
   }
@@ -108,7 +108,7 @@ export class AmpNestedMenu extends AMP.BaseElement {
   isLayoutSupported(layout) {
     // If support is added for other layouts, we should ensure that
     // lazy loading by sidebar does not cause FOUC when sidebar first opens.
-    return layout == Layout.FILL;
+    return layout == Layout_Enum.FILL;
   }
 
   /**
@@ -263,18 +263,18 @@ export class AmpNestedMenu extends AMP.BaseElement {
       return;
     }
     switch (e.key) {
-      case Keys.ENTER: /* fallthrough */
-      case Keys.SPACE:
+      case Keys_Enum.ENTER: /* fallthrough */
+      case Keys_Enum.SPACE:
         this.handleClick_(e);
         return;
-      case Keys.LEFT_ARROW: /* fallthrough */
-      case Keys.RIGHT_ARROW:
+      case Keys_Enum.LEFT_ARROW: /* fallthrough */
+      case Keys_Enum.RIGHT_ARROW:
         this.handleMenuNavigation_(e);
         break;
-      case Keys.UP_ARROW: /* fallthrough */
-      case Keys.DOWN_ARROW:
-      case Keys.HOME:
-      case Keys.END:
+      case Keys_Enum.UP_ARROW: /* fallthrough */
+      case Keys_Enum.DOWN_ARROW:
+      case Keys_Enum.HOME:
+      case Keys_Enum.END:
         this.handleMenuItemNavigation_(e);
         break;
     }
@@ -286,7 +286,7 @@ export class AmpNestedMenu extends AMP.BaseElement {
    * @private
    */
   handleMenuNavigation_(e) {
-    let back = e.key == Keys.LEFT_ARROW;
+    let back = e.key == Keys_Enum.LEFT_ARROW;
     // Press right arrow key to go back if submenu opened from left.
     if (this.side_ == Side.LEFT) {
       back = !back;
@@ -317,13 +317,13 @@ export class AmpNestedMenu extends AMP.BaseElement {
     }
 
     let nextItem;
-    if (e.key === Keys.UP_ARROW) {
+    if (e.key === Keys_Enum.UP_ARROW) {
       nextItem = item.previousElementSibling;
-    } else if (e.key === Keys.DOWN_ARROW) {
+    } else if (e.key === Keys_Enum.DOWN_ARROW) {
       nextItem = item.nextElementSibling;
-    } else if (e.key === Keys.HOME) {
+    } else if (e.key === Keys_Enum.HOME) {
       nextItem = item.parentElement.firstElementChild;
-    } else if (e.key === Keys.END) {
+    } else if (e.key === Keys_Enum.END) {
       nextItem = item.parentElement.lastElementChild;
     } else {
       // not a recognized key
diff --git a/extensions/amp-nested-menu/0.1/test/test-amp-nested-menu.js b/extensions/amp-nested-menu/0.1/test/test-amp-nested-menu.js
index 67fcdccbfcd8..18b4736190d8 100644
--- a/extensions/amp-nested-menu/0.1/test/test-amp-nested-menu.js
+++ b/extensions/amp-nested-menu/0.1/test/test-amp-nested-menu.js
@@ -1,7 +1,7 @@
 import '../amp-nested-menu';
 import * as fakeTimers from '@sinonjs/fake-timers';
 
-import {Keys} from '#core/constants/key-codes';
+import {Keys_Enum} from '#core/constants/key-codes';
 import {tryFocus} from '#core/dom';
 import {htmlFor} from '#core/dom/static-template';
 
@@ -157,7 +157,9 @@ describes.realWin(
       impl.open_(submenuEl);
       expect(menuEl.hasAttribute('child-open')).to.be.true;
       expect(submenuEl.hasAttribute('open')).to.be.true;
-      const keyEvent = new KeyboardEvent('keydown', {key: Keys.LEFT_ARROW});
+      const keyEvent = new KeyboardEvent('keydown', {
+        key: Keys_Enum.LEFT_ARROW,
+      });
       menuEl.dispatchEvent(keyEvent);
       expect(menuEl.hasAttribute('child-open')).to.be.false;
       expect(submenuEl.hasAttribute('open')).to.be.false;
@@ -170,7 +172,9 @@ describes.realWin(
       impl.open_(submenuEl);
       expect(menuEl.hasAttribute('child-open')).to.be.true;
       expect(submenuEl.hasAttribute('open')).to.be.true;
-      const keyEvent = new KeyboardEvent('keydown', {key: Keys.RIGHT_ARROW});
+      const keyEvent = new KeyboardEvent('keydown', {
+        key: Keys_Enum.RIGHT_ARROW,
+      });
       menuEl.dispatchEvent(keyEvent);
       expect(menuEl.hasAttribute('child-open')).to.be.false;
       expect(submenuEl.hasAttribute('open')).to.be.false;
@@ -185,7 +189,7 @@ describes.realWin(
       tryFocus(openEl);
       expect(doc.activeElement).to.equal(openEl);
       const keyEvent = new KeyboardEvent('keydown', {
-        key: Keys.RIGHT_ARROW,
+        key: Keys_Enum.RIGHT_ARROW,
         bubbles: true,
       });
       openEl.dispatchEvent(keyEvent);
@@ -202,7 +206,7 @@ describes.realWin(
       tryFocus(openEl);
       expect(doc.activeElement).to.equal(openEl);
       const keyEvent = new KeyboardEvent('keydown', {
-        key: Keys.LEFT_ARROW,
+        key: Keys_Enum.LEFT_ARROW,
         bubbles: true,
       });
       openEl.dispatchEvent(keyEvent);
@@ -217,13 +221,13 @@ describes.realWin(
       tryFocus(openEl1);
       expect(doc.activeElement).to.equal(openEl1);
       const downKeyEvent = new KeyboardEvent('keydown', {
-        key: Keys.DOWN_ARROW,
+        key: Keys_Enum.DOWN_ARROW,
         bubbles: true,
       });
       openEl1.dispatchEvent(downKeyEvent);
       expect(doc.activeElement).to.equal(openEl2);
       const upKeyEvent = new KeyboardEvent('keydown', {
-        key: Keys.UP_ARROW,
+        key: Keys_Enum.UP_ARROW,
         bubbles: true,
       });
       openEl2.dispatchEvent(upKeyEvent);
@@ -237,13 +241,13 @@ describes.realWin(
       tryFocus(openEl1);
       expect(doc.activeElement).to.equal(openEl1);
       const endKeyEvent = new KeyboardEvent('keydown', {
-        key: Keys.END,
+        key: Keys_Enum.END,
         bubbles: true,
       });
       openEl1.dispatchEvent(endKeyEvent);
       expect(doc.activeElement).to.equal(openEl4);
       const homeKeyEvent = new KeyboardEvent('keydown', {
-        key: Keys.HOME,
+        key: Keys_Enum.HOME,
         bubbles: true,
       });
       openEl4.dispatchEvent(homeKeyEvent);
diff --git a/extensions/amp-next-page/0.1/amp-next-page.js b/extensions/amp-next-page/0.1/amp-next-page.js
index 0ab289b43b03..9f7f1a32ca5d 100644
--- a/extensions/amp-next-page/0.1/amp-next-page.js
+++ b/extensions/amp-next-page/0.1/amp-next-page.js
@@ -1,6 +1,6 @@
 import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';
 import {isJsonScriptTag, removeElement} from '#core/dom';
-import {Layout} from '#core/dom/layout';
+import {Layout_Enum} from '#core/dom/layout';
 import {
   childElementsByAttr,
   childElementsByTag,
@@ -35,7 +35,7 @@ const ADSENSE_BASE_URL = 'https://googleads.g.doubleclick.net/pagead/ads';
 export class AmpNextPage extends AMP.BaseElement {
   /** @override */
   isLayoutSupported(layout) {
-    return layout == Layout.CONTAINER;
+    return layout == Layout_Enum.CONTAINER;
   }
 
   /** @override */
@@ -70,10 +70,10 @@ export class AmpNextPage extends AMP.BaseElement {
       const prohibitedAttribute = element.hasAttribute('deep-parsing')
         ? 'deep-parsing'
         : element.hasAttribute('xssi-prefix')
-        ? 'xssi-prefix'
-        : element.hasAttribute('max-pages')
-        ? 'max-pages'
-        : null;
+          ? 'xssi-prefix'
+          : element.hasAttribute('max-pages')
+            ? 'max-pages'
+            : null;
       if (prohibitedAttribute) {
         this.unsupportedFeatureWarn_(prohibitedAttribute);
       }
diff --git a/extensions/amp-next-page/0.1/next-page-service.js b/extensions/amp-next-page/0.1/next-page-service.js
index 1875322212fd..6c287dada370 100644
--- a/extensions/amp-next-page/0.1/next-page-service.js
+++ b/extensions/amp-next-page/0.1/next-page-service.js
@@ -1,12 +1,11 @@
-import {VisibilityState} from '#core/constants/visibility-state';
+import {VisibilityState_Enum} from '#core/constants/visibility-state';
 import {removeElement} from '#core/dom';
 import {layoutRectLtwh} from '#core/dom/layout/rect';
 import {setStyle, toggle} from '#core/dom/style';
-import {dict} from '#core/types/object';
 
 import {Services} from '#service';
 import {installPositionObserverServiceForDoc} from '#service/position-observer/position-observer-impl';
-import {PositionObserverFidelity} from '#service/position-observer/position-observer-worker';
+import {PositionObserverFidelity_Enum} from '#service/position-observer/position-observer-worker';
 
 import {triggerAnalyticsEvent} from '#utils/analytics';
 import {dev, devAssert, user, userAssert} from '#utils/log';
@@ -217,7 +216,7 @@ export class NextPageService {
 
     /** @type {!../../../src/runtime.ShadowDoc} */
     const amp = this.multidocManager_.attachShadowDoc(shadowRoot, doc, '', {
-      visibilityState: VisibilityState.PRERENDER,
+      visibilityState: VisibilityState_Enum.PRERENDER,
     });
     const ampdoc = devAssert(amp.ampdoc);
     installStylesForDoc(ampdoc, CSS, null, false, TAG);
@@ -277,12 +276,12 @@ export class NextPageService {
       this.appendPageHandler_(container).then(() => {
         this.positionObserver_.observe(
           measurer,
-          PositionObserverFidelity.LOW,
+          PositionObserverFidelity_Enum.LOW,
           (position) => this.positionUpdate_(page, position)
         );
         this.positionObserver_.observe(
           articleLinks,
-          PositionObserverFidelity.LOW,
+          PositionObserverFidelity_Enum.LOW,
           (unused) => this.articleLinksPositionUpdate_(documentRef)
         );
       });
@@ -529,10 +528,10 @@ export class NextPageService {
         this.activeDocumentRef_ = docRef;
         this.setActiveDocumentInHistory_(docRef);
         // Show the active document
-        this.setDocumentVisibility_(docRef, VisibilityState.VISIBLE);
+        this.setDocumentVisibility_(docRef, VisibilityState_Enum.VISIBLE);
       } else {
         // Hide other documents
-        this.setDocumentVisibility_(docRef, VisibilityState.HIDDEN);
+        this.setDocumentVisibility_(docRef, VisibilityState_Enum.HIDDEN);
       }
     });
 
@@ -543,7 +542,7 @@ export class NextPageService {
    * Manually overrides the document's visible state to the given state
    *
    * @param {!DocumentRef} ref Reference to the document to change
-   * @param {!../../../src/core/constants/visibility-state.VisibilityState} visibilityState
+   * @param {!../../../src/core/constants/visibility-state.VisibilityState_Enum} visibilityState
    * @private
    */
   setDocumentVisibility_(ref, visibilityState) {
@@ -560,7 +559,10 @@ export class NextPageService {
     }
 
     // Prevent hiding of documents that are being pre-rendered
-    if (!ampDoc.hasBeenVisible() && visibilityState == VisibilityState.HIDDEN) {
+    if (
+      !ampDoc.hasBeenVisible() &&
+      visibilityState == VisibilityState_Enum.HIDDEN
+    ) {
       return;
     }
 
@@ -586,10 +588,10 @@ export class NextPageService {
   triggerAnalyticsEvent_(eventType, toURL, fromURL) {
     fromURL = fromURL || '';
 
-    const vars = dict({
+    const vars = {
       'toURL': toURL,
       'fromURL': fromURL,
-    });
+    };
     triggerAnalyticsEvent(dev().assertElement(this.element_), eventType, vars);
   }
 }
diff --git a/extensions/amp-next-page/0.1/test/test-amp-next-page.js b/extensions/amp-next-page/0.1/test/test-amp-next-page.js
index 8a79149b525a..956ce0d7230a 100644
--- a/extensions/amp-next-page/0.1/test/test-amp-next-page.js
+++ b/extensions/amp-next-page/0.1/test/test-amp-next-page.js
@@ -1,4 +1,6 @@
-import {VisibilityState} from '#core/constants/visibility-state';
+import {expect} from 'chai';
+
+import {VisibilityState_Enum} from '#core/constants/visibility-state';
 import {layoutRectLtwh} from '#core/dom/layout/rect';
 import {setStyle} from '#core/dom/style';
 
@@ -6,7 +8,7 @@ import {toggleExperiment} from '#experiments';
 
 import {Services} from '#service';
 
-import {macroTask} from '#testing/helpers';
+import {macroTask, sleep} from '#testing/helpers';
 
 import * as DocFetcher from '../../../../src/document-fetcher';
 import {getServicePromiseForDoc} from '../../../../src/service-helpers';
@@ -97,7 +99,7 @@ describes.realWin(
         nextPage.buildCallback().then(done);
       });
 
-      it('does not fetch the next document before 3 viewports away', function* () {
+      it('does not fetch the next document before 3 viewports away', async () => {
         const xhrMock = env.sandbox.mock(Services.xhrFor(win));
         xhrMock.expects('fetch').never();
         env.sandbox
@@ -106,12 +108,12 @@ describes.realWin(
           .resolves(layoutRectLtwh(0, 0, sizes.width, sizes.height * 5));
 
         win.dispatchEvent(new Event('scroll'));
-        yield macroTask();
+        await sleep(10);
 
         xhrMock.verify();
       });
 
-      it('fetches the next document within 3 viewports away', function* () {
+      it('fetches the next document within 3 viewports away', async () => {
         env.fetchMock.get('*', EXAMPLE_PAGE);
         env.sandbox
           .stub(viewport, 'getClientRectAsync')
@@ -119,12 +121,12 @@ describes.realWin(
           .resolves(layoutRectLtwh(0, 0, sizes.width, sizes.height * 2));
 
         win.dispatchEvent(new Event('scroll'));
-        yield macroTask();
+        await sleep(10);
 
         expect(env.fetchMock.done(/\/document1/)).to.be.true;
       });
 
-      it('only fetches the next document once', function* () {
+      it('only fetches the next document once', async () => {
         const xhrMock = env.sandbox.mock(Services.xhrFor(win));
         // Promise which is never resolved.
         xhrMock
@@ -138,16 +140,16 @@ describes.realWin(
           .resolves(layoutRectLtwh(0, 0, sizes.width, sizes.height * 2));
 
         win.dispatchEvent(new Event('scroll'));
-        yield macroTask();
+        await sleep(10);
         win.dispatchEvent(new Event('scroll'));
-        yield macroTask();
+        await sleep(10);
         xhrMock.verify();
       });
 
-      it('adds the hidden class to hideSelector elements', function* () {
+      it('adds the hidden class to hideSelector elements', async () => {
         env.fetchMock.get('*', EXAMPLE_PAGE);
 
-        const nextPageService = yield getServicePromiseForDoc(
+        const nextPageService = await getServicePromiseForDoc(
           ampdoc,
           'next-page'
         );
@@ -163,10 +165,10 @@ describes.realWin(
           .resolves(layoutRectLtwh(0, 0, sizes.width, sizes.height * 2));
 
         win.dispatchEvent(new Event('scroll'));
-        yield macroTask();
+        await sleep(10);
 
         const shadowDoc = attachShadowDocSpy.firstCall.returnValue.ampdoc;
-        yield shadowDoc.whenReady();
+        await shadowDoc.whenReady();
 
         const shadowRoot = shadowDoc.getRootNode();
 
@@ -179,13 +181,13 @@ describes.realWin(
         );
       });
 
-      it('removes amp-analytics tags from child documents', function* () {
+      it('removes amp-analytics tags from child documents', async () => {
         const examplePage = `${EXAMPLE_PAGE}
           <amp-analytics id="analytics1"></amp-analytics>
           <amp-analytics id="analytics2"></amp-analytics>`;
         env.fetchMock.get('*', examplePage);
 
-        const nextPageService = yield getServicePromiseForDoc(
+        const nextPageService = await getServicePromiseForDoc(
           ampdoc,
           'next-page'
         );
@@ -199,22 +201,22 @@ describes.realWin(
           // 1x viewport away
           .resolves(layoutRectLtwh(0, 0, sizes.width, sizes.height * 2));
         win.dispatchEvent(new Event('scroll'));
-        yield macroTask();
+        await sleep(10);
         const shadowDoc = attachShadowDocSpy.firstCall.returnValue.ampdoc;
-        yield shadowDoc.whenReady();
+        await shadowDoc.whenReady();
         const shadowRoot = shadowDoc.getRootNode();
         expect(shadowRoot.getElementById('analytics1')).to.be.null;
         expect(shadowRoot.getElementById('analytics2')).to.be.null;
       });
 
-      it('blocks documents which resolve to a different origin when fetched', function* () {
+      it('blocks documents which resolve to a different origin when fetched', async () => {
         expectAsyncConsoleError(/ampUrl resolved to a different origin/, 2);
         env.fetchMock.get(/\/document1/, {
           redirectUrl: 'https://othersite.com/article',
           body: EXAMPLE_PAGE,
         });
 
-        const nextPageService = yield getServicePromiseForDoc(
+        const nextPageService = await getServicePromiseForDoc(
           ampdoc,
           'next-page'
         );
@@ -228,7 +230,7 @@ describes.realWin(
           // 1x viewport away
           .resolves(layoutRectLtwh(0, 0, sizes.width, sizes.height * 2));
         win.dispatchEvent(new Event('scroll'));
-        yield macroTask();
+        await sleep(10);
 
         expect(env.fetchMock.done()).to.be.true;
         expect(attachShadowDocSpy.notCalled).to.be.true;
@@ -244,7 +246,7 @@ describes.realWin(
         return nextPage.buildCallback().should.be.rejectedWith(error);
       });
 
-      it('fetches remote config when specified in src', function* () {
+      it('fetches remote config when specified in src', async () => {
         const config = {
           pages: [
             {
@@ -265,14 +267,14 @@ describes.realWin(
               return Promise.resolve(config);
             },
           });
-        const nextPageService = yield getServicePromiseForDoc(
+        const nextPageService = await getServicePromiseForDoc(
           ampdoc,
           'next-page'
         );
         const registerSpy = env.sandbox.spy(nextPageService, 'register');
 
-        yield nextPage.buildCallback();
-        yield macroTask();
+        await nextPage.buildCallback();
+        await macroTask();
 
         expect(fetchJsonStub.calledWithExactly(srcUrl, {})).to.be.true;
         expect(registerSpy.calledWith(element, config)).to.be.true;
@@ -337,7 +339,7 @@ describes.realWin(
           '&ecr=1&crui=title&is_amp=3&output=xml';
       });
 
-      it('fetches recommendations from AdSense', function* () {
+      it('fetches recommendations from AdSense', async () => {
         fetchDocumentMock
           .expects('fetchDocument')
           .withExactArgs(win, url, {credentials: 'include'})
@@ -375,28 +377,28 @@ describes.realWin(
           ],
         };
 
-        const nextPageService = yield getServicePromiseForDoc(
+        const nextPageService = await getServicePromiseForDoc(
           ampdoc,
           'next-page'
         );
         const registerSpy = env.sandbox.spy(nextPageService, 'register');
 
-        yield nextPage.buildCallback();
-        yield macroTask();
+        await nextPage.buildCallback();
+        await macroTask();
 
         expect(registerSpy.calledWith(element, config)).to.be.true;
       });
 
-      it('makes an unpersonalized request if missing consent', function* () {
+      it('makes an unpersonalized request if missing consent', async () => {
         fetchDocumentMock
           .expects('fetchDocument')
           .withExactArgs(win, url, {credentials: 'omit'})
           .returns(Promise.resolve());
         element.setAttribute('data-block-on-consent', true);
-        yield nextPage.buildCallback();
+        await nextPage.buildCallback();
       });
 
-      it('filters pages with visible_urls from different origins', function* () {
+      it('filters pages with visible_urls from different origins', async () => {
         fetchDocumentMock
           .expects('fetchDocument')
           .withExactArgs(win, url, {credentials: 'include'})
@@ -460,19 +462,19 @@ describes.realWin(
           ],
         };
 
-        const nextPageService = yield getServicePromiseForDoc(
+        const nextPageService = await getServicePromiseForDoc(
           ampdoc,
           'next-page'
         );
         const registerSpy = env.sandbox.spy(nextPageService, 'register');
 
-        yield nextPage.buildCallback();
-        yield macroTask();
+        await nextPage.buildCallback();
+        await macroTask();
 
         expect(registerSpy.calledWith(element, config)).to.be.true;
       });
 
-      it('falls back to inline config pages if the AdSense request fails', function* () {
+      it('falls back to inline config pages if the AdSense request fails', async () => {
         const config = {
           pages: [
             {
@@ -488,14 +490,14 @@ describes.realWin(
                                  ${JSON.stringify(config)}
                                </script>`;
 
-        const nextPageService = yield getServicePromiseForDoc(
+        const nextPageService = await getServicePromiseForDoc(
           ampdoc,
           'next-page'
         );
         const registerSpy = env.sandbox.spy(nextPageService, 'register');
 
-        yield nextPage.buildCallback();
-        yield macroTask();
+        await nextPage.buildCallback();
+        await macroTask();
 
         expect(registerSpy.calledWith(element, config)).to.be.true;
       });
@@ -527,10 +529,10 @@ describes.realWin(
         nextPage.buildCallback().then(done);
       });
 
-      it('defaults to the prerender visibility state for the next document', function* () {
+      it('defaults to the prerender visibility state for the next document', async () => {
         env.fetchMock.get('*', EXAMPLE_PAGE);
 
-        const nextPageService = yield getServicePromiseForDoc(
+        const nextPageService = await getServicePromiseForDoc(
           ampdoc,
           'next-page'
         );
@@ -546,13 +548,13 @@ describes.realWin(
           .resolves(layoutRectLtwh(0, 0, sizes.width, sizes.height * 2));
 
         win.dispatchEvent(new Event('scroll'));
-        yield macroTask();
+        await sleep(10);
 
         const shadowDoc = attachShadowDocSpy.firstCall.returnValue.ampdoc;
-        yield shadowDoc.whenReady();
+        await shadowDoc.whenReady();
 
         expect(shadowDoc.getVisibilityState()).to.equal(
-          VisibilityState.PRERENDER
+          VisibilityState_Enum.PRERENDER
         );
       });
     });
diff --git a/extensions/amp-next-page/1.0/amp-next-page.js b/extensions/amp-next-page/1.0/amp-next-page.js
index 98a9d34623c2..7117b5875ee8 100644
--- a/extensions/amp-next-page/1.0/amp-next-page.js
+++ b/extensions/amp-next-page/1.0/amp-next-page.js
@@ -1,4 +1,4 @@
-import {Layout} from '#core/dom/layout';
+import {Layout_Enum} from '#core/dom/layout';
 
 import {Services} from '#service';
 
@@ -20,7 +20,7 @@ export class AmpNextPage extends AMP.BaseElement {
 
   /** @override */
   isLayoutSupported(layout) {
-    return layout === Layout.CONTAINER;
+    return layout === Layout_Enum.CONTAINER;
   }
 
   /** @override */
diff --git a/extensions/amp-next-page/1.0/page.js b/extensions/amp-next-page/1.0/page.js
index c0f3e1e13d25..69b49b80d232 100644
--- a/extensions/amp-next-page/1.0/page.js
+++ b/extensions/amp-next-page/1.0/page.js
@@ -1,4 +1,4 @@
-import {VisibilityState} from '#core/constants/visibility-state';
+import {VisibilityState_Enum} from '#core/constants/visibility-state';
 
 import {devAssert} from '#utils/log';
 
@@ -51,8 +51,8 @@ export class Page {
     this.content_ = null;
     /** @private {!PageState} */
     this.state_ = PageState.QUEUED;
-    /** @private {!VisibilityState} */
-    this.visibilityState_ = VisibilityState.PRERENDER;
+    /** @private {!VisibilityState_Enum} */
+    this.visibilityState_ = VisibilityState_Enum.PRERENDER;
     /** @private {!ViewportRelativePos} */
     this.relativePos_ = ViewportRelativePos.OUTSIDE_VIEWPORT;
   }
@@ -135,11 +135,13 @@ export class Page {
    * @return {boolean}
    */
   isVisible() {
-    return this.isLoaded() && this.visibilityState_ === VisibilityState.VISIBLE;
+    return (
+      this.isLoaded() && this.visibilityState_ === VisibilityState_Enum.VISIBLE
+    );
   }
 
   /**
-   * @param {VisibilityState} visibilityState
+   * @param {VisibilityState_Enum} visibilityState
    */
   setVisibility(visibilityState) {
     if (!this.isLoaded() || visibilityState == this.visibilityState_) {
@@ -149,7 +151,7 @@ export class Page {
     //Reload the page if necessary
     if (
       this.is(PageState.PAUSED) &&
-      visibilityState === VisibilityState.VISIBLE
+      visibilityState === VisibilityState_Enum.VISIBLE
     ) {
       this.resume();
     }
@@ -179,7 +181,7 @@ export class Page {
     return this.shadowDoc_.close().then(() => {
       return this.manager_.closeDocument(this /** page */).then(() => {
         this.shadowDoc_ = null;
-        this.visibilityState_ = VisibilityState.HIDDEN;
+        this.visibilityState_ = VisibilityState_Enum.HIDDEN;
         this.state_ = PageState.PAUSED;
       });
     });
@@ -260,7 +262,7 @@ export class HostPage extends Page {
    * @param {!./service.NextPageService} manager
    * @param {{ url: string, title: string, image: string }} meta
    * @param {!PageState} initState
-   * @param {!VisibilityState} initVisibility
+   * @param {!VisibilityState_Enum} initVisibility
    * @param {!Document} doc
    */
   constructor(manager, meta, initState, initVisibility, doc) {
diff --git a/extensions/amp-next-page/1.0/service.js b/extensions/amp-next-page/1.0/service.js
index 0f06ff9cd990..5e5fea4f6ffc 100644
--- a/extensions/amp-next-page/1.0/service.js
+++ b/extensions/amp-next-page/1.0/service.js
@@ -1,4 +1,4 @@
-import {VisibilityState} from '#core/constants/visibility-state';
+import {VisibilityState_Enum} from '#core/constants/visibility-state';
 import {
   insertAtStart,
   isJsonScriptTag,
@@ -125,7 +125,7 @@ export class NextPageService {
     /** @private {?Page} */
     this.currentTitlePage_ = null;
 
-    /** @private {!Object<string, !Element>} */
+    /** @private {!{[key: string]: !Element}} */
     this.replaceableElements_ = {};
 
     /** @private {boolean} */
@@ -332,11 +332,11 @@ export class NextPageService {
     this.pages_.forEach((page, index) => {
       if (page.relativePos === ViewportRelativePos.OUTSIDE_VIEWPORT) {
         if (page.isVisible()) {
-          page.setVisibility(VisibilityState.HIDDEN);
+          page.setVisibility(VisibilityState_Enum.HIDDEN);
         }
       } else if (page.relativePos !== ViewportRelativePos.LEAVING_VIEWPORT) {
         if (!page.isVisible()) {
-          page.setVisibility(VisibilityState.VISIBLE);
+          page.setVisibility(VisibilityState_Enum.VISIBLE);
         }
         this.hidePreviousPages_(index);
         this.resumePausedPages_(index);
@@ -345,7 +345,7 @@ export class NextPageService {
 
     // If no page is visible then the host page should be
     if (!this.pages_.some((page) => page.isVisible())) {
-      this.hostPage_.setVisibility(VisibilityState.VISIBLE);
+      this.hostPage_.setVisibility(VisibilityState_Enum.VISIBLE);
     }
 
     // Hide elements if necessary
@@ -390,7 +390,7 @@ export class NextPageService {
       this.visibilityObserver_.isScrollingDown() &&
       this.hostPage_.isVisible()
     ) {
-      this.hostPage_.setVisibility(VisibilityState.HIDDEN);
+      this.hostPage_.setVisibility(VisibilityState_Enum.HIDDEN);
     }
 
     // Get all the pages that the user scrolled past (or didn't see yet)
@@ -408,7 +408,7 @@ export class NextPageService {
         .map((page, away) => {
           // Hide all pages whose visibility state have changed to hidden
           if (page.isVisible()) {
-            page.setVisibility(VisibilityState.HIDDEN);
+            page.setVisibility(VisibilityState_Enum.HIDDEN);
           }
           // Pause those that are too far away
           if (away >= pausePageCount) {
@@ -501,7 +501,7 @@ export class NextPageService {
           image,
         },
         PageState.INSERTED /** initState */,
-        VisibilityState.VISIBLE /** initVisibility */,
+        VisibilityState_Enum.VISIBLE /** initVisibility */,
         this.doc_
       )
     );
@@ -600,7 +600,7 @@ export class NextPageService {
         content,
         page.url,
         {
-          visibilityState: VisibilityState.PRERENDER,
+          visibilityState: VisibilityState_Enum.PRERENDER,
           cap: this.getCapabilities_(),
         }
       );
@@ -623,7 +623,7 @@ export class NextPageService {
           ) {
             return;
           }
-          messageDeliverer(eventType, data, awaitResponse);
+          return messageDeliverer(eventType, data, awaitResponse);
         });
       }
 
diff --git a/extensions/amp-next-page/1.0/test/test-amp-next-page.js b/extensions/amp-next-page/1.0/test/test-amp-next-page.js
index a115e084b811..aa106cbc699d 100644
--- a/extensions/amp-next-page/1.0/test/test-amp-next-page.js
+++ b/extensions/amp-next-page/1.0/test/test-amp-next-page.js
@@ -1,40 +1,50 @@
 import '../amp-next-page';
-import {VisibilityState} from '#core/constants/visibility-state';
+import {VisibilityState_Enum} from '#core/constants/visibility-state';
 import {htmlFor} from '#core/dom/static-template';
 import {setStyle} from '#core/dom/style';
 
 import {Services} from '#service';
+import {installCidService} from '#service/cid-impl';
+
+import {macroTask} from '#testing/helpers';
+
+import {getAmpdoc} from 'src/service-helpers';
+import * as url from 'src/url';
 
 import {HostPage, PageState} from '../page';
 import {ScrollDirection, ViewportRelativePos} from '../visibility-observer';
 
-const MOCK_NEXT_PAGE = `<header>Header</header>
-    <div style="height:1000px"></div>
-    <footer>Footer</footer>`;
-const MOCK_NEXT_PAGE_WITH_RECOMMENDATIONS = `<header>Header</header>
-    <div style="height:1000px"></div>
-    <amp-next-page>
-        <script type="application/json">
-        [
-          {
-            "image": "/examples/img/hero@1x.jpg",
-            "title": "Title 3",
-            "url": "./document3"
-          },
-          {
-            "image": "/examples/img/hero@1x.jpg",
-            "title": "Title 4",
-            "url": "./document4"
-          },
-          {
-            "image": "/examples/img/hero@1x.jpg",
-            "title": "Title 2",
-            "url": "./document2"
-          }
-        ]
-      </script>
-    </amp-next-page>
-    <footer>Footer</footer>`;
+const MOCK_NEXT_PAGE = /* HTML */ `
+  <header>Header</header>
+  <div style="height:1000px"></div>
+  <footer>Footer</footer>
+`;
+const MOCK_NEXT_PAGE_WITH_RECOMMENDATIONS = /* HTML */ `
+  <header>Header</header>
+  <div style="height:1000px"></div>
+  <amp-next-page>
+    <script type="application/json">
+      [
+        {
+          "image": "/examples/img/hero@1x.jpg",
+          "title": "Title 3",
+          "url": "./document3"
+        },
+        {
+          "image": "/examples/img/hero@1x.jpg",
+          "title": "Title 4",
+          "url": "./document4"
+        },
+        {
+          "image": "/examples/img/hero@1x.jpg",
+          "title": "Title 2",
+          "url": "./document2"
+        }
+      ]
+    </script>
+  </amp-next-page>
+  <footer>Footer</footer>
+`;
 const VALID_CONFIG = [
   {
     'image': '/examples/img/hero@1x.jpg',
@@ -312,7 +322,7 @@ describes.realWin(
         expect(service.pages_[0].url).to.include('about:srcdoc');
         expect(service.pages_[0].state_).to.equal(PageState.INSERTED);
         expect(service.pages_[0].visibilityState_).to.equal(
-          VisibilityState.VISIBLE
+          VisibilityState_Enum.VISIBLE
         );
       });
 
@@ -320,7 +330,7 @@ describes.realWin(
         [1, 2].forEach((i) => {
           expect(service.pages_[i].state_).to.equal(PageState.QUEUED);
           expect(service.pages_[i].visibilityState_).to.equal(
-            VisibilityState.PRERENDER
+            VisibilityState_Enum.PRERENDER
           );
         });
       });
@@ -334,13 +344,13 @@ describes.realWin(
         expect(firstPageFetchSpy).to.be.calledOnce;
         expect(service.pages_[1].state_).to.equal(PageState.INSERTED);
         expect(service.pages_[1].visibilityState_).to.equal(
-          VisibilityState.PRERENDER
+          VisibilityState_Enum.PRERENDER
         );
 
         expect(secondPageFetchSpy).to.not.be.called;
         expect(service.pages_[2].state_).to.equal(PageState.QUEUED);
         expect(service.pages_[2].visibilityState_).to.equal(
-          VisibilityState.PRERENDER
+          VisibilityState_Enum.PRERENDER
         );
       });
 
@@ -353,13 +363,13 @@ describes.realWin(
         expect(firstPageFetchSpy).to.be.calledOnce;
         expect(service.pages_[1].state_).to.equal(PageState.INSERTED);
         expect(service.pages_[1].visibilityState_).to.equal(
-          VisibilityState.PRERENDER
+          VisibilityState_Enum.PRERENDER
         );
 
         expect(secondPageFetchSpy).to.be.calledOnce;
         expect(service.pages_[2].state_).to.equal(PageState.INSERTED);
         expect(service.pages_[2].visibilityState_).to.equal(
-          VisibilityState.PRERENDER
+          VisibilityState_Enum.PRERENDER
         );
       });
 
@@ -378,7 +388,7 @@ describes.realWin(
 
         expect(service.pages_[1].state_).to.equal(PageState.FAILED);
         expect(service.pages_[1].visibilityState_).to.equal(
-          VisibilityState.PRERENDER
+          VisibilityState_Enum.PRERENDER
         );
       });
 
@@ -399,7 +409,7 @@ describes.realWin(
           `${MOCK_NEXT_PAGE} <div next-page-replace="replace-me" instance="1" />`,
           '/document1'
         );
-        service.pages_[1].setVisibility(VisibilityState.VISIBLE);
+        service.pages_[1].setVisibility(VisibilityState_Enum.VISIBLE);
 
         await fetchDocuments(
           service,
@@ -444,7 +454,7 @@ describes.realWin(
             img: '/img.jpg',
           },
           PageState.INSERTED /** initState */,
-          VisibilityState.VISIBLE /** initVisibility */,
+          VisibilityState_Enum.VISIBLE /** initVisibility */,
           {} /* Document */
         );
 
@@ -459,12 +469,12 @@ describes.realWin(
 
       it('awaits first scroll', async () => {
         element.buildInternal();
-        await new Promise(setTimeout);
+        await macroTask();
         expect(service.pages_.length).to.equal(1);
         expect(service.hostPage_).to.equal(hostPage);
         expect(service.currentTitlePage_).to.equal(service.hostPage_);
         win.dispatchEvent(new Event('scroll'));
-        await new Promise(setTimeout);
+        await macroTask();
         expect(service.pages_.length).to.equal(3);
       });
     });
@@ -520,7 +530,7 @@ describes.realWin(
         expect(container.querySelector('.i-amphtml-next-page-shadow-root')).to
           .be.ok;
 
-        service.pages_[2].visibilityState_ = VisibilityState.VISIBLE;
+        service.pages_[2].visibilityState_ = VisibilityState_Enum.VISIBLE;
         service.visibilityObserver_.scrollDirection_ = ScrollDirection.UP;
 
         await service.hidePreviousPages_(
@@ -532,7 +542,7 @@ describes.realWin(
         expect(secondPagePauseSpy).to.be.calledOnce;
         expect(service.pages_[2].state_).to.equal(PageState.PAUSED);
         expect(service.pages_[2].visibilityState_).to.equal(
-          VisibilityState.HIDDEN
+          VisibilityState_Enum.HIDDEN
         );
 
         // Replaces the inserted shadow doc with a placeholder of equal height
@@ -557,7 +567,7 @@ describes.realWin(
 
         const {container} = service.pages_[2];
         expect(container).to.be.ok;
-        service.pages_[2].visibilityState_ = VisibilityState.VISIBLE;
+        service.pages_[2].visibilityState_ = VisibilityState_Enum.VISIBLE;
         service.visibilityObserver_.scrollDirection_ = ScrollDirection.UP;
         await service.hidePreviousPages_(
           0 /** index */,
@@ -565,7 +575,7 @@ describes.realWin(
         );
         expect(service.pages_[2].state_).to.equal(PageState.PAUSED);
         expect(service.pages_[2].visibilityState_).to.equal(
-          VisibilityState.HIDDEN
+          VisibilityState_Enum.HIDDEN
         );
 
         service.visibilityObserver_.scrollDirection_ = ScrollDirection.DOWN;
@@ -667,6 +677,48 @@ describes.realWin(
           }
         }
       });
+
+      it('replaces CLIENT_ID from propagated message', async () => {
+        const expectedCid = 'myCid123';
+
+        installCidService(ampdoc);
+
+        // Only Proxy Origin URLs enable the Viewer CID API
+        env.sandbox.stub(url, 'isProxyOrigin').returns(true);
+
+        const messageDeliverer = (type) => {
+          if (type === 'cid') {
+            return expectedCid;
+          }
+        };
+        Services.viewerForDoc(ampdoc).setMessageDeliverer(messageDeliverer, '');
+
+        await fetchDocuments(service, MOCK_NEXT_PAGE, 2);
+
+        for (const page of service.pages_) {
+          const ampdoc = getAmpdoc(page.document);
+
+          // CID API is bound to doc visibility
+          env.sandbox.stub(ampdoc, 'whenFirstVisible').resolves();
+
+          const viewer = Services.viewerForDoc(page.document);
+
+          // Mock hasCapability and isTrustedViewer to enable Viewer CID API
+          env.sandbox
+            .stub(viewer, 'hasCapability')
+            .callsFake((capability) => capability === 'cid');
+
+          env.sandbox.stub(viewer, 'isTrustedViewer').resolves(true);
+        }
+
+        for (const page of service.pages_) {
+          const cidStruct = {scope: 'foo', cookie: 'bar'};
+          const cidConsent = Promise.resolve();
+          const cidService = await Services.cidForDoc(page.document);
+          const cid = await cidService.get(cidStruct, cidConsent);
+          expect(cid).to.equal(expectedCid);
+        }
+      });
     });
 
     describe('default separators & footers', () => {
diff --git a/extensions/amp-next-page/1.0/visibility-observer.js b/extensions/amp-next-page/1.0/visibility-observer.js
index 3a01ebab616c..71c3bee3def0 100644
--- a/extensions/amp-next-page/1.0/visibility-observer.js
+++ b/extensions/amp-next-page/1.0/visibility-observer.js
@@ -1,14 +1,14 @@
-import {RelativePositions} from '#core/dom/layout/rect';
+import {RelativePositions_Enum} from '#core/dom/layout/rect';
 import {throttle} from '#core/types/function';
 
 import {Services} from '#service';
 import {
-  PositionObserver, // eslint-disable-line no-unused-vars
+  PositionObserver, // eslint-disable-line @typescript-eslint/no-unused-vars
   installPositionObserverServiceForDoc,
 } from '#service/position-observer/position-observer-impl';
 import {
   PositionInViewportEntryDef,
-  PositionObserverFidelity,
+  PositionObserverFidelity_Enum,
 } from '#service/position-observer/position-observer-worker';
 
 import {devAssert} from '#utils/log';
@@ -38,23 +38,23 @@ export class VisibilityObserverEntry {
   constructor(observer, callback) {
     /** @private {!VisibilityObserver} */
     this.observer_ = observer;
-    /** @private {?RelativePositions} */
+    /** @private {?RelativePositions_Enum} */
     this.topSentinelPosition_ = null;
-    /** @private {?RelativePositions} */
+    /** @private {?RelativePositions_Enum} */
     this.bottomSentinelPosition_ = null;
     /** @const {function(!ViewportRelativePos)} */
     this.callback = callback;
   }
 
   /**
-   * @return {?RelativePositions}
+   * @return {?RelativePositions_Enum}
    */
   get top() {
     return this.topSentinelPosition_;
   }
 
   /**
-   * @return {?RelativePositions}
+   * @return {?RelativePositions_Enum}
    */
   get bottom() {
     return this.bottomSentinelPosition_;
@@ -75,12 +75,12 @@ export class VisibilityObserverEntry {
 
     this.observer_
       .getPositionObserver()
-      .observe(top, PositionObserverFidelity.LOW, (position) =>
+      .observe(top, PositionObserverFidelity_Enum.LOW, (position) =>
         this.topSentinelPositionChanged_(position)
       );
     this.observer_
       .getPositionObserver()
-      .observe(bottom, PositionObserverFidelity.LOW, (position) =>
+      .observe(bottom, PositionObserverFidelity_Enum.LOW, (position) =>
         this.bottomSentinelPositionChanged_(position)
       );
   }
@@ -328,7 +328,7 @@ export default class VisibilityObserver {
    */
   getRelativePosFromSentinel(entry) {
     const {bottom, top} = entry;
-    const {BOTTOM, INSIDE, TOP} = RelativePositions;
+    const {BOTTOM, INSIDE, TOP} = RelativePositions_Enum;
     if (!top && !bottom) {
       // Early exit if this an intersection change happening before a
       // sentinel position change
diff --git a/extensions/amp-next-page/validator-amp-next-page.protoascii b/extensions/amp-next-page/validator-amp-next-page.protoascii
index 9a21938fbe98..e1392f3a7f93 100644
--- a/extensions/amp-next-page/validator-amp-next-page.protoascii
+++ b/extensions/amp-next-page/validator-amp-next-page.protoascii
@@ -27,6 +27,7 @@ tags: {
   html_format: AMP
   tag_name: "$REFERENCE_POINT"
   spec_name: "AMP-NEXT-PAGE > [separator]"
+  descriptive_name : "amp-next-page [separator] child"
   mandatory_parent: "AMP-NEXT-PAGE"
   attrs: {
     name: "separator"
@@ -37,6 +38,7 @@ tags: {
   html_format: AMP
   tag_name: "$REFERENCE_POINT"
   spec_name: "AMP-NEXT-PAGE > [recommendation-box]"
+  descriptive_name : "amp-next-page [recommendation-box] child"
   mandatory_parent: "AMP-NEXT-PAGE"
   attrs: {
     name: "recommendation-box"
@@ -47,6 +49,7 @@ tags: {
   html_format: AMP
   tag_name: "$REFERENCE_POINT"
   spec_name: "AMP-NEXT-PAGE > [footer]"
+  descriptive_name : "amp-next-page [footer] child"
   mandatory_parent: "AMP-NEXT-PAGE"
   attrs: {
     name: "footer"
diff --git a/extensions/amp-nexxtv-player/0.1/amp-nexxtv-player.js b/extensions/amp-nexxtv-player/0.1/amp-nexxtv-player.js
index 3a4e92336158..f26256a21a97 100644
--- a/extensions/amp-nexxtv-player/0.1/amp-nexxtv-player.js
+++ b/extensions/amp-nexxtv-player/0.1/amp-nexxtv-player.js
@@ -7,7 +7,6 @@ import {
 } from '#core/dom/fullscreen';
 import {isLayoutSizeDefined} from '#core/dom/layout';
 import {PauseHelper} from '#core/dom/video/pause-helper';
-import {dict} from '#core/types/object';
 
 import {Services} from '#service';
 import {installVideoManagerForDoc} from '#service/video-manager-impl';
@@ -22,7 +21,7 @@ import {
   redispatch,
 } from '../../../src/iframe-video';
 import {addParamsToUrl, assertAbsoluteHttpOrHttpsUrl} from '../../../src/url';
-import {VideoEvents} from '../../../src/video-interface';
+import {VideoEvents_Enum} from '../../../src/video-interface';
 
 const TAG = 'amp-nexxtv-player';
 
@@ -123,17 +122,14 @@ class AmpNexxtvPlayer extends AMP.BaseElement {
       [clientId, streamtype, mediaid].map(encodeURIComponent).join('/');
 
     return assertAbsoluteHttpOrHttpsUrl(
-      addParamsToUrl(
-        url,
-        dict({
-          'dataMode': mode,
-          'platform': 'amp',
-          'disableAds': disableAds,
-          'streamingFilter': streamingFilter,
-          'exitMode': exitMode,
-          'consentString': consentString,
-        })
-      )
+      addParamsToUrl(url, {
+        'dataMode': mode,
+        'platform': 'amp',
+        'disableAds': disableAds,
+        'streamingFilter': streamingFilter,
+        'exitMode': exitMode,
+        'consentString': consentString,
+      })
     );
   }
 
@@ -195,9 +191,9 @@ class AmpNexxtvPlayer extends AMP.BaseElement {
     this.playerReadyPromise_.then(() => {
       if (this.iframe_ && this.iframe_.contentWindow) {
         this.iframe_.contentWindow./*OK*/ postMessage(
-          dict({
+          {
             'cmd': command,
-          }),
+          },
           '*'
         );
       }
@@ -229,11 +225,11 @@ class AmpNexxtvPlayer extends AMP.BaseElement {
     }
 
     redispatch(this.element, eventType, {
-      'ready': VideoEvents.LOAD,
-      'play': VideoEvents.PLAYING,
-      'pause': VideoEvents.PAUSE,
-      'mute': VideoEvents.MUTED,
-      'unmute': VideoEvents.UNMUTED,
+      'ready': VideoEvents_Enum.LOAD,
+      'play': VideoEvents_Enum.PLAYING,
+      'pause': VideoEvents_Enum.PAUSE,
+      'mute': VideoEvents_Enum.MUTED,
+      'unmute': VideoEvents_Enum.UNMUTED,
     });
   }
 
diff --git a/extensions/amp-nexxtv-player/0.1/test/test-amp-nexxtv-player.js b/extensions/amp-nexxtv-player/0.1/test/test-amp-nexxtv-player.js
index d1ebd1d80674..e2822db61f55 100644
--- a/extensions/amp-nexxtv-player/0.1/test/test-amp-nexxtv-player.js
+++ b/extensions/amp-nexxtv-player/0.1/test/test-amp-nexxtv-player.js
@@ -4,7 +4,7 @@ import {createElementWithAttributes} from '#core/dom';
 import {listenOncePromise} from '#utils/event-helper';
 
 import * as consent from '../../../../src/consent';
-import {VideoEvents} from '../../../../src/video-interface';
+import {VideoEvents_Enum} from '../../../../src/video-interface';
 
 describes.realWin(
   'amp-nexxtv-player',
@@ -85,16 +85,16 @@ describes.realWin(
       });
       const iframe = nexxtv.querySelector('iframe');
       await Promise.resolve();
-      const p1 = listenOncePromise(nexxtv, VideoEvents.PLAYING);
+      const p1 = listenOncePromise(nexxtv, VideoEvents_Enum.PLAYING);
       await sendFakeMessage(nexxtv, iframe, {event: 'play'});
       await p1;
-      const p2 = listenOncePromise(nexxtv, VideoEvents.MUTED);
+      const p2 = listenOncePromise(nexxtv, VideoEvents_Enum.MUTED);
       await sendFakeMessage(nexxtv, iframe, {event: 'mute'});
       await p2;
-      const p3 = listenOncePromise(nexxtv, VideoEvents.PAUSE);
+      const p3 = listenOncePromise(nexxtv, VideoEvents_Enum.PAUSE);
       await sendFakeMessage(nexxtv, iframe, {event: 'pause'});
       await p3;
-      const p4 = listenOncePromise(nexxtv, VideoEvents.UNMUTED);
+      const p4 = listenOncePromise(nexxtv, VideoEvents_Enum.UNMUTED);
       await sendFakeMessage(nexxtv, iframe, {event: 'unmute'});
       return p4;
     });
diff --git a/extensions/amp-o2-player/0.1/amp-o2-player.js b/extensions/amp-o2-player/0.1/amp-o2-player.js
index 7460553e84fb..77307c6244c4 100644
--- a/extensions/amp-o2-player/0.1/amp-o2-player.js
+++ b/extensions/amp-o2-player/0.1/amp-o2-player.js
@@ -1,8 +1,7 @@
-import {MessageType} from '#core/3p-frame-messaging';
+import {MessageType_Enum} from '#core/3p-frame-messaging';
 import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';
 import {applyFillContent, isLayoutSizeDefined} from '#core/dom/layout';
 import {PauseHelper} from '#core/dom/video/pause-helper';
-import {dict} from '#core/types/object';
 
 import {Services} from '#service';
 
@@ -122,9 +121,13 @@ class AmpO2Player extends AMP.BaseElement {
     this.iframe_ = /** @type {HTMLIFrameElement} */ (iframe);
     applyFillContent(iframe);
 
-    listenFor(iframe, MessageType.SEND_CONSENT_DATA, (data, source, origin) => {
-      this.sendConsentData_(source, origin);
-    });
+    listenFor(
+      iframe,
+      MessageType_Enum.SEND_CONSENT_DATA,
+      (data, source, origin) => {
+        this.sendConsentData_(source, origin);
+      }
+    );
 
     this.pauseHelper_.updatePlaying(true);
 
@@ -182,15 +185,11 @@ class AmpO2Player extends AMP.BaseElement {
             };
         }
 
-        this.sendConsentDataToIframe_(
-          source,
-          origin,
-          dict({
-            'sentinel': 'amp',
-            'type': MessageType.CONSENT_DATA,
-            'consentData': consentData,
-          })
-        );
+        this.sendConsentDataToIframe_(source, origin, {
+          'sentinel': 'amp',
+          'type': MessageType_Enum.CONSENT_DATA,
+          'consentData': consentData,
+        });
       }
     );
   }
@@ -230,12 +229,10 @@ class AmpO2Player extends AMP.BaseElement {
   pauseCallback() {
     if (this.iframe_ && this.iframe_.contentWindow) {
       this.iframe_.contentWindow./*OK*/ postMessage(
-        JSON.stringify(
-          dict({
-            'method': 'pause',
-            'value': this.domain_,
-          })
-        ),
+        JSON.stringify({
+          'method': 'pause',
+          'value': this.domain_,
+        }),
         '*'
       );
     }
diff --git a/extensions/amp-o2-player/0.1/test/test-amp-o2-player.js b/extensions/amp-o2-player/0.1/test/test-amp-o2-player.js
index f8635bea89ca..d842a364d296 100644
--- a/extensions/amp-o2-player/0.1/test/test-amp-o2-player.js
+++ b/extensions/amp-o2-player/0.1/test/test-amp-o2-player.js
@@ -1,5 +1,5 @@
 import '../amp-o2-player';
-import {MessageType} from '#core/3p-frame-messaging';
+import {MessageType_Enum} from '#core/3p-frame-messaging';
 import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';
 
 import * as iframeHelper from '../../../../src/iframe-helper';
@@ -166,7 +166,7 @@ describes.realWin(
       };
       const resData = {
         sentinel: 'amp',
-        type: MessageType.CONSENT_DATA,
+        type: MessageType_Enum.CONSENT_DATA,
       };
 
       it('sends a consent-data CONSENT_POLICY_STATE.SUFFICIENT message', async function () {
@@ -190,7 +190,7 @@ describes.realWin(
         env.sandbox
           .stub(iframeHelper, 'listenFor')
           .callsFake((iframe, message, callback) => {
-            expect(message).to.equal(MessageType.SEND_CONSENT_DATA);
+            expect(message).to.equal(MessageType_Enum.SEND_CONSENT_DATA);
             callback('', resSource, resOrigin);
           });
 
@@ -232,7 +232,7 @@ describes.realWin(
         env.sandbox
           .stub(iframeHelper, 'listenFor')
           .callsFake((iframe, message, callback) => {
-            expect(message).to.equal(MessageType.SEND_CONSENT_DATA);
+            expect(message).to.equal(MessageType_Enum.SEND_CONSENT_DATA);
             callback('', resSource, resOrigin);
           });
 
@@ -277,7 +277,7 @@ describes.realWin(
         env.sandbox
           .stub(iframeHelper, 'listenFor')
           .callsFake((iframe, message, callback) => {
-            expect(message).to.equal(MessageType.SEND_CONSENT_DATA);
+            expect(message).to.equal(MessageType_Enum.SEND_CONSENT_DATA);
             callback('', resSource, resOrigin);
           });
 
diff --git a/extensions/amp-onetap-google/0.1/amp-onetap-google.js b/extensions/amp-onetap-google/0.1/amp-onetap-google.js
index 8c817163c4c6..3b3b4faad6c3 100644
--- a/extensions/amp-onetap-google/0.1/amp-onetap-google.js
+++ b/extensions/amp-onetap-google/0.1/amp-onetap-google.js
@@ -26,12 +26,11 @@
  * </code>
  */
 
-import {ActionTrust} from '#core/constants/action-constants';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
 import {removeElement} from '#core/dom';
-import {Layout} from '#core/dom/layout';
+import {Layout_Enum} from '#core/dom/layout';
 import {px, setStyle, toggle} from '#core/dom/style';
 import {isObject} from '#core/types';
-import {dict} from '#core/types/object';
 
 import {Services} from '#service';
 
@@ -47,7 +46,7 @@ const TAG = 'amp-onetap-google';
 /** @const {string} */
 export const SENTINEL = 'onetap_google';
 
-/** @const {Object} */
+/** @const {object} */
 export const ACTIONS = {
   READY: 'intermediate_iframe_ready',
   RESIZE: 'intermediate_iframe_resize',
@@ -74,7 +73,7 @@ export class AmpOnetapGoogle extends AMP.BaseElement {
 
   /** @override */
   isLayoutSupported(layout) {
-    return layout == Layout.NODISPLAY;
+    return layout == Layout_Enum.NODISPLAY;
   }
 
   /** @override */
@@ -122,11 +121,11 @@ export class AmpOnetapGoogle extends AMP.BaseElement {
         }
         this.postMessage_(
           event.source,
-          dict({
+          {
             'sentinel': SENTINEL,
             'command': 'parent_frame_ready',
             'nonce': nonce,
-          }),
+          },
           event.origin
         );
         break;
@@ -208,7 +207,7 @@ export class AmpOnetapGoogle extends AMP.BaseElement {
       /* source */ null,
       /* caller */ null,
       /* event */ null,
-      ActionTrust.DEFAULT
+      ActionTrust_Enum.DEFAULT
     );
     return true;
   }
diff --git a/extensions/amp-ooyala-player/0.1/amp-ooyala-player.js b/extensions/amp-ooyala-player/0.1/amp-ooyala-player.js
index e6e52ca849cf..7d75fe165fa3 100644
--- a/extensions/amp-ooyala-player/0.1/amp-ooyala-player.js
+++ b/extensions/amp-ooyala-player/0.1/amp-ooyala-player.js
@@ -19,7 +19,7 @@ import {
   objOrParseJson,
   redispatch,
 } from '../../../src/iframe-video';
-import {VideoEvents} from '../../../src/video-interface';
+import {VideoEvents_Enum} from '../../../src/video-interface';
 
 const TAG = 'amp-ooyala-player';
 
@@ -128,7 +128,7 @@ class AmpOoyalaPlayer extends AMP.BaseElement {
     });
 
     const loaded = this.loadPromise(this.iframe_).then(() => {
-      dispatchCustomEvent(el, VideoEvents.LOAD);
+      dispatchCustomEvent(el, VideoEvents_Enum.LOAD);
     });
     this.playerReadyResolver_(loaded);
 
@@ -185,10 +185,10 @@ class AmpOoyalaPlayer extends AMP.BaseElement {
       return; // We only process valid JSON.
     }
     redispatch(this.element, data['data'], {
-      'playing': VideoEvents.PLAYING,
-      'paused': VideoEvents.PAUSE,
-      'muted': VideoEvents.MUTED,
-      'unmuted': VideoEvents.UNMUTED,
+      'playing': VideoEvents_Enum.PLAYING,
+      'paused': VideoEvents_Enum.PAUSE,
+      'muted': VideoEvents_Enum.MUTED,
+      'unmuted': VideoEvents_Enum.UNMUTED,
     });
   }
 
diff --git a/extensions/amp-orientation-observer/0.1/amp-orientation-observer.js b/extensions/amp-orientation-observer/0.1/amp-orientation-observer.js
index 87e0c5964a3f..e84b361d1177 100644
--- a/extensions/amp-orientation-observer/0.1/amp-orientation-observer.js
+++ b/extensions/amp-orientation-observer/0.1/amp-orientation-observer.js
@@ -1,6 +1,5 @@
-import {ActionTrust} from '#core/constants/action-constants';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
 import {clamp, sum} from '#core/math';
-import {dict} from '#core/types/object';
 
 import {Services} from '#service';
 
@@ -13,7 +12,7 @@ const TAG = 'amp-orientation-observer';
  */
 const AXES = ['alpha', 'beta', 'gamma'];
 /**
- * @const {Object<string, number>}
+ * @const {{[key: string]: number}}
  */
 const DEFAULT_REST_VALUES = {
   'alpha': 180,
@@ -21,7 +20,7 @@ const DEFAULT_REST_VALUES = {
   'gamma': 0,
 };
 /**
- * @const {Object<string, !Array<number>>}
+ * @const {{[key: string]: !Array<number>}}
  */
 const DEFAULT_RANGES = {
   'alpha': [0, 360],
@@ -48,16 +47,16 @@ export class AmpOrientationObserver extends AMP.BaseElement {
     /** @private {?../../../src/service/action-impl.ActionService} */
     this.action_ = null;
 
-    /** @private {Object<string, !Array<number>>} */
+    /** @private {{[key: string]: !Array<number>}} */
     this.range_ = {...DEFAULT_RANGES};
 
-    /** @private {Object<string, number>} */
+    /** @private {{[key: string]: number}} */
     this.computedValue_ = {...DEFAULT_REST_VALUES};
 
-    /** @private {Object<string, number>} */
+    /** @private {{[key: string]: number}} */
     this.restValues_ = {...DEFAULT_REST_VALUES};
 
-    /** @private {Object<string, !Array<number>>} */
+    /** @private {{[key: string]: !Array<number>}} */
     this.smoothingPoints_ = {beta: [], alpha: [], gamma: []};
 
     /** @private {?number} */
@@ -212,15 +211,11 @@ export class AmpOrientationObserver extends AMP.BaseElement {
       eventRange[0] < 0
         ? eventValue.toFixed() - eventRange[0]
         : eventValue.toFixed();
-    const event = createCustomEvent(
-      this.win,
-      `${TAG}.${eventName}`,
-      dict({
-        'angle': clamp(eventValue, eventRange[0], eventRange[1]).toFixed(),
-        'percent': percentValue / (eventRange[1] - eventRange[0]),
-      })
-    );
-    this.action_.trigger(this.element, eventName, event, ActionTrust.LOW);
+    const event = createCustomEvent(this.win, `${TAG}.${eventName}`, {
+      'angle': clamp(eventValue, eventRange[0], eventRange[1]).toFixed(),
+      'percent': percentValue / (eventRange[1] - eventRange[0]),
+    });
+    this.action_.trigger(this.element, eventName, event, ActionTrust_Enum.LOW);
   }
 }
 AMP.extension(TAG, '0.1', (AMP) => {
diff --git a/extensions/amp-pan-zoom/0.1/amp-pan-zoom.js b/extensions/amp-pan-zoom/0.1/amp-pan-zoom.js
index 3cb2a6cfec55..bb55d7a5544e 100644
--- a/extensions/amp-pan-zoom/0.1/amp-pan-zoom.js
+++ b/extensions/amp-pan-zoom/0.1/amp-pan-zoom.js
@@ -1,7 +1,7 @@
-import {ActionTrust} from '#core/constants/action-constants';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
 import {bezierCurve} from '#core/data-structures/curve';
 import {dispatchCustomEvent} from '#core/dom';
-import {Layout} from '#core/dom/layout';
+import {Layout_Enum} from '#core/dom/layout';
 import {layoutRectFromDomRect, layoutRectLtwh} from '#core/dom/layout/rect';
 import {
   observeContentSize,
@@ -12,7 +12,6 @@ import {htmlFor} from '#core/dom/static-template';
 import {px, scale, setStyles, translate} from '#core/dom/style';
 import {numeric} from '#core/dom/transition';
 import {boundValue, distance, magnitude} from '#core/math';
-import {dict} from '#core/types/object';
 
 import {Services} from '#service';
 
@@ -241,10 +240,10 @@ export class AmpPanZoom extends AMP.BaseElement {
   /** @override */
   isLayoutSupported(layout) {
     return (
-      layout == Layout.FIXED ||
-      layout == Layout.FIXED_HEIGHT ||
-      layout == Layout.FILL ||
-      layout == Layout.RESPONSIVE
+      layout == Layout_Enum.FIXED ||
+      layout == Layout_Enum.FIXED_HEIGHT ||
+      layout == Layout_Enum.FILL ||
+      layout == Layout_Enum.RESPONSIVE
     );
   }
 
@@ -753,16 +752,17 @@ export class AmpPanZoom extends AMP.BaseElement {
    * @private
    */
   triggerTransformEnd_(scale, x, y) {
-    const event = createCustomEvent(
-      this.win,
-      `${TAG}.transformEnd`,
-      dict({
-        'scale': scale,
-        'x': x,
-        'y': y,
-      })
+    const event = createCustomEvent(this.win, `${TAG}.transformEnd`, {
+      'scale': scale,
+      'x': x,
+      'y': y,
+    });
+    this.action_.trigger(
+      this.element,
+      'transformEnd',
+      event,
+      ActionTrust_Enum.HIGH
     );
-    this.action_.trigger(this.element, 'transformEnd', event, ActionTrust.HIGH);
     dispatchCustomEvent(this.element, 'transformEnd');
   }
 
diff --git a/extensions/amp-pan-zoom/0.1/test/integration/test-amp-pan-zoom.js b/extensions/amp-pan-zoom/0.1/test/integration/test-amp-pan-zoom.js
index c536f03a6151..4009a9a52fc6 100644
--- a/extensions/amp-pan-zoom/0.1/test/integration/test-amp-pan-zoom.js
+++ b/extensions/amp-pan-zoom/0.1/test/integration/test-amp-pan-zoom.js
@@ -1,4 +1,4 @@
-import {AmpEvents} from '#core/constants/amp-events';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
 
 import {toggleExperiment} from '#experiments';
 
@@ -27,7 +27,7 @@ describes.sandboxed
 
     // TODO(cathyxz): Flaky on Chrome 67 on Windows 7.
     it.skip('should resize and center content', () => {
-      return fixture.awaitEvent(AmpEvents.LOAD_END, 2).then(() => {
+      return fixture.awaitEvent(AmpEvents_Enum.LOAD_END, 2).then(() => {
         const panZoom = fixture.doc.querySelector('#amp-pan-zoom-1');
         const content = panZoom.children[0];
         expect(content.style.width).to.equal('300px');
@@ -41,7 +41,7 @@ describes.sandboxed
 
     // TODO(cathyxz): Flaky on Chrome 67 on Windows 7.
     it.skip('should apply initial configurations correctly', () => {
-      return fixture.awaitEvent(AmpEvents.LOAD_END, 4).then(() => {
+      return fixture.awaitEvent(AmpEvents_Enum.LOAD_END, 4).then(() => {
         const panZoom = fixture.doc.querySelector('#amp-pan-zoom-2');
         const content = panZoom.children[0];
         expect(content.style.transform).to.equal(
diff --git a/extensions/amp-pan-zoom/1.0/amp-pan-zoom.css b/extensions/amp-pan-zoom/1.0/amp-pan-zoom.css
new file mode 100644
index 000000000000..1e393bcdccde
--- /dev/null
+++ b/extensions/amp-pan-zoom/1.0/amp-pan-zoom.css
@@ -0,0 +1,2 @@
+.amp-pan-zoom {
+}
diff --git a/extensions/amp-pan-zoom/1.0/amp-pan-zoom.js b/extensions/amp-pan-zoom/1.0/amp-pan-zoom.js
new file mode 100644
index 000000000000..cc6d5939c689
--- /dev/null
+++ b/extensions/amp-pan-zoom/1.0/amp-pan-zoom.js
@@ -0,0 +1,35 @@
+import {isExperimentOn} from '#experiments';
+
+import {AmpPreactBaseElement, setSuperClass} from '#preact/amp-base-element';
+
+import {userAssert} from '#utils/log';
+
+import {BaseElement} from './base-element';
+
+import {CSS} from '../../../build/amp-pan-zoom-1.0.css';
+
+/** @const {string} */
+const TAG = 'amp-pan-zoom';
+
+class AmpPanZoom extends setSuperClass(BaseElement, AmpPreactBaseElement) {
+  /** @override */
+  init() {
+    this.registerApiAction('transform', (api, {args}) =>
+      api./*OK*/ transform(args['scale'], args['x'], args['y'])
+    );
+  }
+
+  /** @override */
+  isLayoutSupported(layout) {
+    userAssert(
+      isExperimentOn(this.win, 'bento') ||
+        isExperimentOn(this.win, 'bento-pan-zoom'),
+      'expected global "bento" or specific "bento-pan-zoom" experiment to be enabled'
+    );
+    return super.isLayoutSupported(layout);
+  }
+}
+
+AMP.extension(TAG, '1.0', (AMP) => {
+  AMP.registerElement(TAG, AmpPanZoom, CSS);
+});
diff --git a/extensions/amp-pan-zoom/1.0/base-element.js b/extensions/amp-pan-zoom/1.0/base-element.js
new file mode 100644
index 000000000000..e7ea793efb96
--- /dev/null
+++ b/extensions/amp-pan-zoom/1.0/base-element.js
@@ -0,0 +1,27 @@
+import {PreactBaseElement} from '#preact/base-element';
+
+import {BentoPanZoom} from './component';
+import {CSS as COMPONENT_CSS} from './component.jss';
+
+export class BaseElement extends PreactBaseElement {}
+
+/** @override */
+BaseElement['Component'] = BentoPanZoom;
+
+/** @override */
+BaseElement['props'] = {
+  'children': {passthrough: true},
+  'initialX': {attr: 'initial-x'},
+  'initialY': {attr: 'initial-y'},
+  'initialScale': {attr: 'initial-scale'},
+  'maxScale': {attr: 'max-scale'},
+};
+
+/** @override */
+BaseElement['layoutSizeDefined'] = true;
+
+/** @override */
+BaseElement['usesShadowDom'] = true;
+
+/** @override */
+BaseElement['shadowCss'] = COMPONENT_CSS;
diff --git a/extensions/amp-pan-zoom/1.0/component-ts.tsx b/extensions/amp-pan-zoom/1.0/component-ts.tsx
new file mode 100644
index 000000000000..3c43190ad5ed
--- /dev/null
+++ b/extensions/amp-pan-zoom/1.0/component-ts.tsx
@@ -0,0 +1,267 @@
+import {
+  GestureHandlers,
+  UserGestureConfig,
+  UserHandlers,
+  useGesture,
+} from '@use-gesture/react';
+import objStr from 'obj-str';
+import type {ComponentChildren, Ref} from 'preact';
+
+import {scale as cssScale, px, translate} from '#core/dom/style';
+
+import * as Preact from '#preact';
+import {useImperativeHandle, useRef} from '#preact';
+import {forwardRef} from '#preact/compat';
+import {ContainWrapper} from '#preact/component';
+import {useResizeObserver} from '#preact/hooks/useResizeObserver';
+
+import {useStyles} from './component.jss';
+import {usePanZoomState} from './hooks/usePanZoomState';
+
+const DOUBLE_TAP_TIME = 500; // Maximum time between tap starts
+
+const gestureConfig: Omit<UserGestureConfig, 'target'> = {
+  drag: {
+    filterTaps: true,
+    tapsThreshold: 10,
+  },
+};
+
+export type BentoPanZoomProps = {
+  children?: ComponentChildren;
+  controls?: boolean;
+  initialScale?: number | string;
+  initialX?: number | string;
+  initialY?: number | string;
+  maxScale?: number | string;
+};
+
+export type BentoPanZoomApi = {
+  transform(scale: number, x: number, y: number): void;
+};
+
+function getElementPosition(
+  clientX: number,
+  clientY: number,
+  element: HTMLElement
+) {
+  const elBounds = element./* REVIEW */ getBoundingClientRect();
+  return {
+    anchorX: clientX - elBounds.x,
+    anchorY: clientY - elBounds.y,
+  };
+}
+
+/**
+ * @return {PreactDef.Renderable}
+ */
+export function BentoPanZoomWithRef(
+  {
+    children,
+    controls = true,
+    initialScale,
+    initialX,
+    initialY,
+    maxScale,
+    ...rest
+  }: BentoPanZoomProps,
+  ref: Ref<BentoPanZoomApi>
+) {
+  const styles = useStyles();
+
+  const [state, actions] = usePanZoomState({
+    initialX,
+    initialY,
+    initialScale,
+    maxScale,
+  });
+  const isPannable = state.scale !== 1;
+  const canZoom = state.scale < state.maxScale;
+
+  const contentRef = useRef<HTMLDivElement>(null);
+  const containerRef = useRef<HTMLDivElement>(null);
+
+  const updateSizes = () => {
+    const contentBox = contentRef.current!./* REVIEW */ getBoundingClientRect();
+    const containerBox =
+      containerRef.current!./* REVIEW */ getBoundingClientRect();
+
+    actions.updateBounds({
+      containerSize: containerBox,
+      contentSize: contentBox,
+      contentOffset: {
+        x: contentBox.x - containerBox.x,
+        y: contentBox.y - containerBox.y,
+      },
+    });
+  };
+  useResizeObserver(contentRef, updateSizes);
+  useResizeObserver(containerRef, updateSizes);
+
+  useImperativeHandle(
+    ref,
+    () => /** @type {!BentoPanZoom.PanZoomApi} */ ({
+      transform: (scale: number, x: number, y: number) => {
+        actions.transform({
+          scale,
+          posX: x,
+          posY: y,
+        });
+      },
+    }),
+    [actions]
+  );
+
+  const panZoomStyles = {
+    transformOrigin:
+      px(-state.contentOffset.x) + ' ' + px(-state.contentOffset.y),
+    transform: translate(state.posX, state.posY) + cssScale(state.scale),
+  };
+
+  const initialStateRef = useRef(state);
+  const lastTapTime = useRef(-DOUBLE_TAP_TIME);
+  const handlers: Partial<UserHandlers> = {
+    onDragStart() {
+      if (isPannable) {
+        actions.draggingStart();
+        initialStateRef.current = state;
+      }
+    },
+    onDragEnd() {
+      actions.draggingRelease();
+    },
+    onDrag(ev) {
+      // Taps come through the `onDrag` handler:
+      if (ev.tap) {
+        const isDoubleTap =
+          ev.startTime - lastTapTime.current <= DOUBLE_TAP_TIME;
+        if (isDoubleTap) {
+          // Double tap:
+          const [clientX, clientY] = ev.xy;
+          const anchor = getElementPosition(
+            clientX,
+            clientY,
+            containerRef.current!
+          );
+          actions.updateScale(anchor);
+          lastTapTime.current = -DOUBLE_TAP_TIME; // Prevent triple-taps
+        } else {
+          // Single tap
+          lastTapTime.current = ev.startTime;
+        }
+        return;
+      }
+
+      // Let's pan!
+      if (!isPannable) {
+        return;
+      }
+      const [deltaX, deltaY] = ev.movement;
+
+      const {posX: initialX, posY: initialY} = initialStateRef.current;
+
+      actions.transform({
+        posX: initialX + deltaX,
+        posY: initialY + deltaY,
+      });
+    },
+
+    onPinchStart: () => {
+      actions.draggingStart();
+      initialStateRef.current = state;
+    },
+    onPinchEnd: () => {
+      actions.draggingRelease();
+    },
+    onPinch: (ev) => {
+      const [clientX, clientY] = ev.origin;
+      const [scale] = ev.movement;
+      const [initialClientX, initialClientY] = ev.memo || [clientX, clientY];
+
+      const {anchorX, anchorY} = getElementPosition(
+        initialClientX,
+        initialClientY,
+        containerRef.current!
+      );
+
+      const {
+        posX: initialX,
+        posY: initialY,
+        scale: initialScale,
+      } = initialStateRef.current;
+
+      const newScale = scale * initialScale;
+
+      // Reset position before scaling:
+      actions.transform({
+        posX: initialX,
+        posY: initialY,
+        scale: initialScale,
+      });
+      // Zoom in on anchor:
+      actions.updateScale({
+        anchorX,
+        anchorY,
+        scale: newScale,
+      });
+
+      if (ev.first) {
+        // Store the initial origin as `ev.memo`:
+        return ev.origin;
+      }
+    },
+  };
+  const bind = useGesture(handlers as GestureHandlers, gestureConfig);
+
+  return (
+    <ContainWrapper
+      {...rest}
+      layout
+      contentClassName={styles.ampPanZoomWrapper}
+    >
+      <div
+        data-test-id="container"
+        ref={containerRef}
+        class={objStr({
+          [styles.ampPanZoomContainer]: true,
+          'pannable': isPannable,
+        })}
+        {...bind()}
+      >
+        <div data-test-id="content-container" ref={contentRef}>
+          <div
+            data-test-id="content"
+            class={objStr({
+              [styles.ampPanZoomContent]: true,
+              [styles.ampPanZoomDragging]: state.isDragging,
+            })}
+            style={panZoomStyles}
+            onPointerDown={(ev) => {
+              if (isPannable) {
+                // Prevent images from being dragged, etc:
+                ev.preventDefault();
+              }
+            }}
+          >
+            {children}
+          </div>
+        </div>
+      </div>
+
+      {controls && (
+        <button
+          aria-label={canZoom ? 'Zoom in' : 'Zoom out'}
+          class={objStr({
+            [styles.ampPanZoomButton]: true,
+            'canZoom': canZoom,
+          })}
+          onClick={() => actions.updateScale({})}
+        />
+      )}
+    </ContainWrapper>
+  );
+}
+
+const BentoPanZoom = forwardRef(BentoPanZoomWithRef);
+BentoPanZoom.displayName = 'BentoPanZoom'; // Make findable for tests.
+export {BentoPanZoom};
diff --git a/extensions/amp-pan-zoom/1.0/component.js b/extensions/amp-pan-zoom/1.0/component.js
new file mode 100644
index 000000000000..1946721be8e4
--- /dev/null
+++ b/extensions/amp-pan-zoom/1.0/component.js
@@ -0,0 +1 @@
+export * from './component-ts';
diff --git a/extensions/amp-pan-zoom/1.0/component.jss.js b/extensions/amp-pan-zoom/1.0/component.jss.js
new file mode 100644
index 000000000000..4fbbd2071e5d
--- /dev/null
+++ b/extensions/amp-pan-zoom/1.0/component.jss.js
@@ -0,0 +1,66 @@
+import {createUseStyles} from 'react-jss';
+const ampPanZoomWrapper = {
+  width: '100%',
+  height: '100%',
+};
+
+const ampPanZoomContainer = {
+  width: '100%',
+  height: '100%',
+  display: 'flex',
+  justifyContent: 'center',
+  alignItems: 'center',
+  overflow: 'hidden',
+  touchAction: 'pan-x pan-y',
+  '&.pannable': {
+    cursor: 'move',
+    touchAction: 'none',
+    userSelect: 'none',
+  },
+};
+
+const ampPanZoomContent = {
+  willChange: 'transform',
+  transition: 'transform 0.3s ease-out',
+};
+
+const ampPanZoomDragging = {
+  transition: 'none',
+};
+
+const zoomInIcon = `url(
+    'data:image/svg+xml;charset=utf-8,<svg height="24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6z"/><path d="M0 0h24v24H0z" fill="none"/></svg>'
+  )`;
+const zoomOutIcon = `url(
+    'data:image/svg+xml;charset=utf-8,<svg height="24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="M19 13H5v-2h14z"/><path d="M0 0h24v24H0z" fill="none"/></svg>'
+  )`;
+
+const ampPanZoomButton = {
+  position: 'absolute',
+  right: '12px',
+  width: '36px',
+  height: '36px',
+  bottom: '12px',
+  backgroundRepeat: 'no-repeat',
+  backgroundPosition: 'center center',
+  boxShadow: '1px 1px 2px',
+  backgroundColor: 'white',
+  borderRadius: '3px',
+  border: 'none',
+  backgroundImage: zoomOutIcon,
+  '&.canZoom': {
+    backgroundImage: zoomInIcon,
+  },
+};
+
+const JSS = {
+  ampPanZoomWrapper,
+  ampPanZoomContent,
+  ampPanZoomContainer,
+  ampPanZoomDragging,
+  ampPanZoomButton,
+};
+
+// useStyles gets replaced for AMP builds via `babel-plugin-transform-jss`.
+// eslint-disable-next-line local/no-export-side-effect
+export const useStyles = createUseStyles(JSS);
diff --git a/extensions/amp-pan-zoom/1.0/component.type.js b/extensions/amp-pan-zoom/1.0/component.type.js
new file mode 100644
index 000000000000..57dfaf6eb619
--- /dev/null
+++ b/extensions/amp-pan-zoom/1.0/component.type.js
@@ -0,0 +1,11 @@
+/** @externs */
+
+/** @const */
+var BentoPanZoomDef = {};
+
+/**
+ * @type {BentoPanZoomProps} */
+BentoPanZoomDef.Props;
+
+/** @type {BentoPanZoomApi} */
+BentoPanZoomDef.PanZoomApi;
diff --git a/extensions/amp-pan-zoom/1.0/hooks/usePanZoomState.ts b/extensions/amp-pan-zoom/1.0/hooks/usePanZoomState.ts
new file mode 100644
index 000000000000..c2f5c450f46f
--- /dev/null
+++ b/extensions/amp-pan-zoom/1.0/hooks/usePanZoomState.ts
@@ -0,0 +1,214 @@
+import {useMemo, useState} from '#preact';
+
+import type {BentoPanZoomProps} from '../component-ts';
+
+const DEFAULT_MAX_SCALE = 3;
+const DEFAULT_INITIAL_SCALE = 1;
+const DEFAULT_ORIGIN = 0;
+
+const initialState = {
+  posX: 0,
+  posY: 0,
+
+  minScale: 1,
+  maxScale: DEFAULT_MAX_SCALE,
+  scale: 1,
+
+  contentOffset: {x: 0, y: 0},
+  containerSize: {width: 0, height: 0},
+  contentSize: {width: 0, height: 0},
+
+  isDragging: false,
+  allowExtent: false,
+};
+
+type State = typeof initialState;
+
+type PanZoomConfig = Pick<
+  BentoPanZoomProps,
+  'initialScale' | 'initialX' | 'initialY' | 'maxScale'
+>;
+
+/**
+ * Clamps the value between min and max,
+ * optionally a little "extent" past the bounds.
+ */
+const boundValueSpring = (
+  val: number,
+  min: number,
+  max: number,
+  extent: number
+) => {
+  if (val < min) {
+    return min + (val - min) * extent;
+  }
+  if (val > max) {
+    return max + (val - max) * extent;
+  }
+  return val;
+};
+
+/**
+ * Updates the scale, keeping the "anchor" position stationary
+ * @param state
+ * @param anchorX
+ * @param anchorY
+ * @param newScale
+ */
+const updateScaleFromAnchor = (
+  state: State,
+  anchorX: number,
+  anchorY: number,
+  newScale: number
+): PickState<'posX' | 'posY' | 'scale'> => {
+  const {posX, posY, scale} = state;
+
+  const ds = newScale / scale;
+
+  const newPosX = anchorX - (anchorX - posX) * ds;
+  const newPosY = anchorY - (anchorY - posY) * ds;
+
+  return {posX: newPosX, posY: newPosY, scale: newScale};
+};
+
+/**
+ * Updates the position and scale, ensuring they stay in-bounds.
+ * Also updates various calculated properties.
+ */
+const updateView = (
+  state: State,
+  newState: Partial<PickState<'posX' | 'posY' | 'scale'>>
+): Partial<State> => {
+  const {
+    allowExtent,
+    containerSize,
+    contentOffset,
+    contentSize,
+    maxScale,
+    minScale,
+  } = state;
+  const {posX = state.posX, posY = state.posY, scale = state.scale} = newState;
+
+  const extentScale = allowExtent ? 0.25 : 0;
+  const newScale = boundValueSpring(scale, minScale, maxScale, extentScale);
+
+  // Calculate the bounds:
+  // Contain:
+  let minX = -contentOffset.x * newScale;
+  let maxX =
+    containerSize.width - (contentOffset.x + contentSize.width) * newScale;
+  let minY = -contentOffset.y * newScale;
+  let maxY =
+    containerSize.height - (contentOffset.y + contentSize.height) * newScale;
+  // If content is larger than container, we Cover:
+  if (contentSize.width * newScale > containerSize.width) {
+    [minX, maxX] = [maxX, minX]; // (swap)
+  }
+  if (contentSize.height * newScale > containerSize.height) {
+    [minY, maxY] = [maxY, minY]; // (swap)
+  }
+
+  const extent = allowExtent && newScale > 1 ? 0.25 : 0;
+
+  return {
+    posX: boundValueSpring(posX, minX, maxX, extent),
+    posY: boundValueSpring(posY, minY, maxY, extent),
+    scale: newScale,
+  };
+};
+
+function initReducer(config: PanZoomConfig): State {
+  const {
+    initialScale = DEFAULT_INITIAL_SCALE,
+    initialX = DEFAULT_ORIGIN,
+    initialY = DEFAULT_ORIGIN,
+    maxScale = DEFAULT_MAX_SCALE,
+  } = config;
+  return {
+    ...initialState,
+    posX: Number(initialX),
+    posY: Number(initialY),
+    scale: Number(initialScale),
+    maxScale: Number(maxScale),
+  };
+}
+
+type PickState<keys extends keyof State> = Required<Pick<State, keys>>;
+
+export function usePanZoomState(config: PanZoomConfig) {
+  const [state, setState] = useState(() => initReducer(config));
+  const actions = useMemo(
+    () => ({
+      updateBounds(
+        payload: PickState<'contentOffset' | 'containerSize' | 'contentSize'>
+      ) {
+        setState((state) => {
+          const newState = {
+            ...state,
+            ...payload,
+          };
+          return {
+            ...newState,
+            // Ensure the element is still in-bounds:
+            ...updateView(newState, newState),
+          };
+        });
+      },
+      draggingStart() {
+        setState((state) => {
+          return {
+            ...state,
+            isDragging: true,
+            allowExtent: true,
+          };
+        });
+      },
+      draggingRelease() {
+        setState((state) => {
+          const newState: State = {
+            ...state,
+            isDragging: false,
+            allowExtent: false,
+          };
+          // "Snap back" when we release:
+          const newPosition = updateView(newState, newState);
+          return {
+            ...newState,
+            ...newPosition,
+          };
+        });
+      },
+      updateScale(payload: {
+        anchorX?: number;
+        anchorY?: number;
+        scale?: number;
+      }) {
+        setState((state) => {
+          const {
+            anchorX = state.containerSize.width / 2,
+            anchorY = state.containerSize.height / 2,
+            scale = state.scale === state.maxScale
+              ? state.minScale
+              : Math.floor(state.scale) + 1,
+          } = payload;
+          return {
+            ...state,
+            ...updateView(
+              state,
+              updateScaleFromAnchor(state, anchorX, anchorY, scale)
+            ),
+          };
+        });
+      },
+      transform(payload: Partial<PickState<'posX' | 'posY' | 'scale'>>) {
+        setState((state) => ({
+          ...state,
+          ...updateView(state, payload),
+        }));
+      },
+    }),
+    [setState]
+  );
+
+  return [state, actions] as const;
+}
diff --git a/extensions/amp-pan-zoom/1.0/storybook/Basic.amp.js b/extensions/amp-pan-zoom/1.0/storybook/Basic.amp.js
new file mode 100644
index 000000000000..8e0cbfc5d32e
--- /dev/null
+++ b/extensions/amp-pan-zoom/1.0/storybook/Basic.amp.js
@@ -0,0 +1,23 @@
+import {withAmp} from '@ampproject/storybook-addon';
+
+import * as Preact from '#preact';
+
+export default {
+  title: 'amp-pan-zoom-1_0',
+  decorators: [withAmp],
+  parameters: {
+    extensions: [{name: 'amp-pan-zoom', version: '1.0'}],
+    experiments: ['bento'],
+  },
+  args: {
+    'data-example-property': 'example string property argument',
+  },
+};
+
+export const _default = (args) => {
+  return (
+    <amp-pan-zoom width="300" height="200" {...args}>
+      This text is inside.
+    </amp-pan-zoom>
+  );
+};
diff --git a/extensions/amp-pan-zoom/1.0/storybook/Basic.js b/extensions/amp-pan-zoom/1.0/storybook/Basic.js
new file mode 100644
index 000000000000..ad2ec3f70b72
--- /dev/null
+++ b/extensions/amp-pan-zoom/1.0/storybook/Basic.js
@@ -0,0 +1,58 @@
+import * as Preact from '#preact';
+
+import {BentoPanZoom} from '../component';
+
+export default {
+  title: 'PanZoom',
+  component: BentoPanZoom,
+  args: {
+    style: {width: 400, height: 225},
+  },
+};
+
+const ipsum50 = `Lorem ipsum dolor sit amet, consectetur adipisicing elit. Delectus dolor dolore dolorum facilis illo illum ipsam sint tempora totam voluptatem! Debitis distinctio doloribus ea excepturi inventore magni modi nihil obcaecati officiis quae quidem, repellat sapiente sequi. Assumenda consequatur dolorum eaque nostrum officia perspiciatis praesentium, quos, sequi tempora tempore ut voluptatibus.`;
+const img = `https://lh3.googleusercontent.com/pSECrJ82R7-AqeBCOEPGPM9iG9OEIQ_QXcbubWIOdkY=w400-h300-no`;
+
+export const WithImage = (args) => (
+  <BentoPanZoom {...args}>
+    <img height="225" width="400" alt="Destiny artwork" src={img} />
+  </BentoPanZoom>
+);
+
+export const SmallImage = (args) => (
+  <BentoPanZoom {...args}>
+    <img height="88" width="160" alt="Destiny artwork" src={img} />
+  </BentoPanZoom>
+);
+
+export const InitialScale = (args) => (
+  <BentoPanZoom {...args} initialScale={3} initialX={-400} initialY={-75}>
+    <img height="225" width="400" alt="Destiny artwork" src={img} />
+  </BentoPanZoom>
+);
+
+export const WithText = (args) => {
+  return (
+    <BentoPanZoom {...args}>
+      <div style={{border: '1px solid black'}}>{ipsum50}</div>
+    </BentoPanZoom>
+  );
+};
+
+export const WithLotsOfText = (args) => {
+  return (
+    <BentoPanZoom {...args}>
+      <div style={{border: '1px solid black'}}>
+        {ipsum50} {ipsum50} {ipsum50}
+      </div>
+    </BentoPanZoom>
+  );
+};
+
+export const AutoSizeText = (args) => {
+  return (
+    <BentoPanZoom {...args} style={{}}>
+      <div style={{border: '1px solid black'}}>{ipsum50}</div>
+    </BentoPanZoom>
+  );
+};
diff --git a/extensions/amp-pan-zoom/1.0/test/test-amp-pan-zoom.js b/extensions/amp-pan-zoom/1.0/test/test-amp-pan-zoom.js
new file mode 100644
index 000000000000..1e441fb2ae9e
--- /dev/null
+++ b/extensions/amp-pan-zoom/1.0/test/test-amp-pan-zoom.js
@@ -0,0 +1,101 @@
+import '../amp-pan-zoom';
+import {htmlFor} from '#core/dom/static-template';
+
+import {toggleExperiment} from '#experiments';
+
+import {sleep} from '#testing/helpers';
+import {cleanHtml} from '#testing/helpers/cleanHtml';
+import {waitFor} from '#testing/helpers/service';
+
+function snapshot(element) {
+  if (!element) {
+    return element;
+  }
+  const keep = ['style'];
+  const html = element.outerHTML;
+  return cleanHtml(html, keep);
+}
+
+describes.realWin(
+  'amp-pan-zoom-v1.0',
+  {
+    amp: {
+      extensions: ['amp-pan-zoom:1.0'],
+    },
+  },
+  (env) => {
+    let win;
+    let doc;
+    let html;
+
+    beforeEach(async () => {
+      win = env.win;
+      doc = win.document;
+      html = htmlFor(doc);
+      toggleExperiment(win, 'bento-pan-zoom', true, true);
+    });
+
+    afterEach(async () => {
+      // Avoids "ResizeObserver loop limit exceeded" errors.
+      while (doc.lastChild) {
+        doc.lastChild.remove();
+      }
+      await sleep(50);
+    });
+
+    async function mountElement(element) {
+      doc.body.appendChild(element);
+      await element.buildInternal();
+      await waitFor(() => element.isConnected, 'element connected');
+      return element;
+    }
+
+    function findParts(element) {
+      // These selectors are pretty generic, but works for now:
+      return {
+        container: element.shadowRoot.querySelector('[data-test-id=container]'),
+        content: element.shadowRoot.querySelector('[data-test-id=content]'),
+        zoomButton: element.shadowRoot.querySelector('[aria-label="Zoom in"]'),
+      };
+    }
+
+    it('renders the contents, and a zoom button', async () => {
+      const element = await mountElement(html`
+        <amp-pan-zoom>
+          <div style="width: 1000px; height: 1000px;"></div>
+        </amp-pan-zoom>
+      `);
+
+      expect(findParts(element).container).to.be.not.null;
+      expect(findParts(element).content).to.be.not.null;
+      expect(findParts(element).zoomButton).to.be.not.null;
+    });
+
+    it('initially renders the elements with appropriate zoom styles', async () => {
+      const element = await mountElement(html`
+        <amp-pan-zoom>
+          <div style="width: 1000px; height: 1000px;"></div>
+        </amp-pan-zoom>
+      `);
+
+      expect(snapshot(findParts(element).zoomButton)).to.equal(
+        `<button></button>`
+      );
+      expect(findParts(element).content.getAttribute('style')).to.equal(
+        `transform-origin: 0px 0px; transform: translate(0px, 0px) scale(1);`
+      );
+    });
+
+    it('should render the initial state', async () => {
+      const element = await mountElement(html`
+        <amp-pan-zoom initial-x="555" initial-y="444" initial-scale="3">
+          <div style="width: 1000px; height: 1000px;"></div>
+        </amp-pan-zoom>
+      `);
+
+      expect(findParts(element).content.getAttribute('style')).to.equal(
+        `transform-origin: 0px 0px; transform: translate(555px, 444px) scale(3);`
+      );
+    });
+  }
+);
diff --git a/extensions/amp-pan-zoom/1.0/test/test-component.js b/extensions/amp-pan-zoom/1.0/test/test-component.js
new file mode 100644
index 000000000000..2bb6902e3111
--- /dev/null
+++ b/extensions/amp-pan-zoom/1.0/test/test-component.js
@@ -0,0 +1,669 @@
+import {mount} from 'enzyme';
+
+import * as Preact from '#preact';
+import {createRef} from '#preact';
+
+import {installResizeObserverStub} from '#testing/resize-observer-stub';
+
+import {BentoPanZoom} from '../component-ts';
+import {usePanZoomState} from '../hooks/usePanZoomState';
+
+describes.sandboxed('BentoPanZoom preact component v1.0', {}, (env) => {
+  const {containerBox, contentBox, views} = getTestDimensions();
+
+  const DummyContents = () => (
+    <article style={{width: contentBox.width, height: contentBox.height}} />
+  );
+
+  const findContentContainer = (wrapper) =>
+    wrapper.find('[data-test-id="content-container"]');
+  const findContent = (wrapper) => wrapper.find('[data-test-id="content"]');
+  const getContentTransform = (wrapper) =>
+    findContent(wrapper).prop('style').transform;
+  const findContainer = (wrapper) => wrapper.find('[data-test-id="container"]');
+
+  let resizeObserverStub;
+  beforeEach(() => {
+    resizeObserverStub = installResizeObserverStub(env.sandbox, window);
+  });
+  const triggerResize = (wrapper) => {
+    const container = findContainer(wrapper).getDOMNode();
+    const contentContainer = findContentContainer(wrapper).getDOMNode();
+    env.sandbox.stub(container, 'getBoundingClientRect').returns(containerBox);
+    env.sandbox
+      .stub(contentContainer, 'getBoundingClientRect')
+      .returns(contentBox);
+
+    resizeObserverStub.notifySync({target: container});
+  };
+
+  it('should render children and a zoom button', () => {
+    const wrapper = mount(
+      <BentoPanZoom>
+        <DummyContents />
+      </BentoPanZoom>
+    );
+
+    const component = wrapper.find(BentoPanZoom);
+    expect(component).to.have.lengthOf(1);
+    expect(component.find(DummyContents)).to.have.lengthOf(1);
+    expect(component.find('button')).to.have.lengthOf(1);
+  });
+
+  it('clicking the zoom button should zoom the contents in a loop', () => {
+    const wrapper = mount(
+      <BentoPanZoom>
+        <DummyContents />
+      </BentoPanZoom>
+    );
+
+    // Without mocking out a lot of browser APIs, we can't assert very much:
+    wrapper.find('button').simulate('click');
+    expect(getContentTransform(wrapper)).to.include('scale(2)');
+    wrapper.find('button').simulate('click');
+    expect(getContentTransform(wrapper)).to.include('scale(3)');
+    // It should "loop" around once the max is reached:
+    wrapper.find('button').simulate('click');
+    expect(getContentTransform(wrapper)).to.include('scale(1)');
+  });
+
+  describe('ref api', () => {
+    it('the "transform" method can be used to zoom/scale', () => {
+      const ref = createRef();
+      const wrapper = mount(
+        <BentoPanZoom ref={ref}>
+          <DummyContents />
+        </BentoPanZoom>
+      );
+
+      expect(Object.keys(ref.current)).to.deep.equal(['transform']);
+      expect(ref.current.transform).to.be.a('function');
+
+      const newZoom = {
+        x: 0,
+        y: 0,
+        scale: 3,
+      };
+      ref.current.transform(newZoom.scale, newZoom.x, newZoom.y);
+      wrapper.update();
+
+      expect(getContentTransform(wrapper)).to.equal(
+        `translate(0px, 0px)scale(3)`
+      );
+    });
+  });
+
+  describe('maxScale', () => {
+    it('cannot be zoomed past maxScale', () => {
+      const wrapper = mount(
+        <BentoPanZoom maxScale={6}>
+          <DummyContents />
+        </BentoPanZoom>
+      );
+      wrapper.find('button').simulate('click');
+      expect(getContentTransform(wrapper)).to.include('scale(2)');
+      wrapper.find('button').simulate('click');
+      expect(getContentTransform(wrapper)).to.include('scale(3)');
+      wrapper.find('button').simulate('click');
+      expect(getContentTransform(wrapper)).to.include('scale(4)');
+      wrapper.find('button').simulate('click');
+      expect(getContentTransform(wrapper)).to.include('scale(5)');
+      wrapper.find('button').simulate('click');
+      expect(getContentTransform(wrapper)).to.include('scale(6)');
+      // It should "loop" around once the max is reached:
+      wrapper.find('button').simulate('click');
+      expect(getContentTransform(wrapper)).to.include('scale(1)');
+    });
+  });
+
+  describe('usePanZoomState', () => {
+    // Returns named values, instead of the array, for easier testing:
+    const usePanZoomStateTest = () => {
+      const [state, actions] = usePanZoomState({});
+      return {state, actions};
+    };
+
+    const bounds = ({containerSize, contentSize}) => ({
+      containerSize,
+      contentSize,
+      // Initial layout is centered in the container:
+      contentOffset: {
+        x: (containerSize.width - contentSize.width) / 2,
+        y: (containerSize.height - contentSize.height) / 2,
+      },
+    });
+    const boundsDefault = bounds({
+      containerSize: {width: 1000, height: 800},
+      contentSize: {width: 1000, height: 800},
+    });
+    const boundsSmallContent = bounds({
+      containerSize: {width: 1000, height: 800},
+      contentSize: {width: 500, height: 500},
+    });
+    const boundsLargeContent = bounds({
+      containerSize: {width: 1000, height: 800},
+      contentSize: {width: 2000, height: 2000},
+    });
+
+    it('should return an initial state and an actions bucket', () => {
+      const {result} = renderHook(usePanZoomStateTest);
+      expect(result.current.state).to.deep.equal({
+        posX: 0,
+        posY: 0,
+        minScale: 1,
+        maxScale: 3,
+        scale: 1,
+        contentOffset: {x: 0, y: 0},
+        containerSize: {width: 0, height: 0},
+        contentSize: {width: 0, height: 0},
+        isDragging: false,
+        allowExtent: false,
+      });
+      expect(JSON.stringify(Object.keys(result.current.actions))).to.deep.equal(
+        JSON.stringify([
+          'updateBounds',
+          'draggingStart',
+          'draggingRelease',
+          'updateScale',
+          'transform',
+        ])
+      );
+    });
+
+    describe('dragging', () => {
+      it('calling an action should update the state', () => {
+        const {act, result} = renderHook(usePanZoomStateTest);
+        expect(result.current.state.isDragging).to.equal(false);
+
+        act(() => result.current.actions.draggingStart());
+
+        expect(result.current.state.isDragging).to.equal(true);
+
+        act(() => result.current.actions.draggingRelease());
+
+        expect(result.current.state.isDragging).to.equal(false);
+      });
+    });
+
+    describe('transform', () => {
+      it('should update the state', () => {
+        const {act, result} = renderHook(usePanZoomStateTest);
+        act(() => result.current.actions.updateBounds(boundsDefault));
+
+        act(() =>
+          result.current.actions.transform({
+            posX: -100,
+            posY: -100,
+            scale: 2,
+          })
+        );
+
+        expectPartialEqual(result.current.state, {
+          posX: -100,
+          posY: -100,
+          scale: 2,
+        });
+      });
+
+      function testBounds({bounds, scale = 1}) {
+        const {act, result} = renderHook(usePanZoomStateTest);
+        act(() => result.current.actions.updateBounds(bounds));
+
+        act(() =>
+          result.current.actions.transform({
+            posX: 9999999,
+            posY: 9999999,
+            scale,
+          })
+        );
+        // Grab the top=left bounds:
+        const {posX: maxX, posY: maxY} = result.current.state;
+
+        act(() =>
+          result.current.actions.transform({
+            posX: -9999999,
+            posY: -9999999,
+            scale,
+          })
+        );
+        // Grab the bottom-right bounds:
+        const {posX: minX, posY: minY} = result.current.state;
+
+        return {minX, maxX, minY, maxY};
+      }
+
+      it('should "cover" for large contents', () => {
+        const actualBounds = testBounds({
+          bounds: boundsLargeContent,
+        });
+
+        expect(actualBounds).to.deep.equal({
+          minX: -500,
+          maxX: 500,
+          minY: -600,
+          maxY: 600,
+        });
+      });
+      it('should "cover" for zoomed-in contents', () => {
+        const actualBounds = testBounds({
+          bounds: boundsSmallContent,
+          scale: 4,
+        });
+
+        expect(actualBounds).to.deep.equal({
+          minX: -1250,
+          maxX: -750,
+          minY: -1150,
+          maxY: -450,
+        });
+      });
+      it('should "contain" for small contents', () => {
+        const actualBounds = testBounds({
+          bounds: boundsSmallContent,
+        });
+
+        expect(actualBounds).to.deep.equal({
+          minX: -250,
+          maxX: 250,
+          minY: -150,
+          maxY: 150,
+        });
+      });
+      it('should "contain" for zoomed-out contents', () => {
+        const actualBounds = testBounds({
+          bounds: boundsLargeContent,
+          scale: 0.25,
+        });
+
+        expect(actualBounds).to.deep.equal({
+          minX: -500,
+          maxX: 500,
+          minY: -600,
+          maxY: 600,
+        });
+      });
+    });
+
+    describe('updateScale', () => {
+      it('should zoom from top-left corner', () => {
+        const {act, result} = renderHook(usePanZoomStateTest);
+        act(() => result.current.actions.updateBounds(boundsDefault));
+
+        act(() =>
+          result.current.actions.updateScale({
+            anchorX: 0,
+            anchorY: 0,
+            scale: 2,
+          })
+        );
+        expectPartialEqual(result.current.state, {
+          posX: 0,
+          posY: 0,
+          scale: 2,
+        });
+      });
+      it('should zoom from the center', () => {
+        const {act, result} = renderHook(usePanZoomStateTest);
+        act(() => result.current.actions.updateBounds(boundsDefault));
+
+        act(() =>
+          result.current.actions.updateScale({
+            scale: 2,
+          })
+        );
+        expectPartialEqual(result.current.state, {
+          posX: -500,
+          posY: -400,
+          scale: 2,
+        });
+      });
+      it('should zoom from the bottom-right corner', () => {
+        const {act, result} = renderHook(usePanZoomStateTest);
+        act(() => result.current.actions.updateBounds(boundsDefault));
+
+        act(() =>
+          result.current.actions.updateScale({
+            anchorX: 1000,
+            anchorY: 800,
+            scale: 2,
+          })
+        );
+        expectPartialEqual(result.current.state, {
+          posX: -1000,
+          posY: -800,
+          scale: 2,
+        });
+      });
+      it('should zoom from an arbitrary spot', () => {
+        const {act, result} = renderHook(usePanZoomStateTest);
+        act(() => result.current.actions.updateBounds(boundsDefault));
+
+        act(() =>
+          result.current.actions.updateScale({
+            anchorX: 200,
+            anchorY: 200,
+            scale: 2,
+          })
+        );
+        expectPartialEqual(result.current.state, {
+          posX: -200,
+          posY: -200,
+          scale: 2,
+        });
+      });
+      it('should zoom from multiple arbitrary spots', () => {
+        const {act, result} = renderHook(usePanZoomStateTest);
+        act(() => result.current.actions.updateBounds(boundsDefault));
+
+        act(() =>
+          result.current.actions.updateScale({
+            anchorX: 200,
+            anchorY: 200,
+            scale: 2,
+          })
+        );
+        expectPartialEqual(result.current.state, {
+          posX: -200,
+          posY: -200,
+          scale: 2,
+        });
+
+        // Zoom again from a new spot:
+        act(() =>
+          result.current.actions.updateScale({
+            anchorX: 500,
+            anchorY: 500,
+            scale: 3,
+          })
+        );
+        expectPartialEqual(result.current.state, {
+          posX: -550,
+          posY: -550,
+          scale: 3,
+        });
+      });
+    });
+  });
+
+  describe('gestures', () => {
+    let wrapper;
+    let gesture;
+    beforeEach(() => {
+      wrapper = mount(
+        <BentoPanZoom>
+          <DummyContents />
+        </BentoPanZoom>
+      );
+
+      triggerResize(wrapper);
+
+      const container = findContainer(wrapper);
+      gesture = new GestureSimulator(container, env.sandbox);
+    });
+
+    it('should start with scale(1)', () => {
+      expect(getContentTransform(wrapper)).to.include('scale(1)');
+    });
+    describe('doubleTap', () => {
+      it('single taps should do nothing', () => {
+        gesture.pointerDown();
+        gesture.pointerUp();
+        expect(getContentTransform(wrapper)).to.include('scale(1)');
+      });
+      it('double tap should zoom in', () => {
+        gesture.pointerDown();
+        gesture.pointerUp();
+
+        gesture.pointerDown();
+        gesture.pointerUp();
+
+        expect(getContentTransform(wrapper)).to.include('scale(2)');
+      });
+      it('double taps are registered within 10px', () => {
+        gesture.pointerDown();
+        gesture.pointerMove({deltaX: 9, deltaY: 9});
+        gesture.pointerUp();
+
+        gesture.pointerDown();
+        gesture.pointerMove({deltaX: -9, deltaY: -9});
+        gesture.pointerUp();
+        expect(getContentTransform(wrapper)).to.include('scale(2)');
+      });
+      it('double taps are not registered outside 10px', () => {
+        gesture.pointerDown();
+        gesture.pointerMove({deltaX: 99, deltaY: 99});
+        gesture.pointerUp();
+
+        gesture.pointerDown();
+        gesture.pointerMove({deltaX: -99, deltaY: -99});
+        gesture.pointerUp();
+        expect(getContentTransform(wrapper)).to.include('scale(1)');
+      });
+      it('each double-tap will zoom in again', () => {
+        gesture.doubleTap();
+        expect(getContentTransform(wrapper)).to.include('scale(2)');
+
+        gesture.doubleTap();
+        expect(getContentTransform(wrapper)).to.include('scale(3)');
+
+        gesture.doubleTap();
+        expect(getContentTransform(wrapper)).to.include('scale(1)');
+      });
+      it('zooms in on topLeft', () => {
+        gesture.doubleTap(views.topLeft);
+        gesture.doubleTap(views.topLeft);
+        expect(getContentTransform(wrapper)).to.equal(
+          'translate(-750px, -600px)scale(3)'
+        );
+      });
+      it('zooms in on middle', () => {
+        gesture.doubleTap(views.middle);
+        gesture.doubleTap(views.middle);
+        expect(getContentTransform(wrapper)).to.equal(
+          'translate(-1000px, -800px)scale(3)'
+        );
+      });
+      it('zooms in on bottomRight', () => {
+        gesture.doubleTap(views.bottomRight);
+        gesture.doubleTap(views.bottomRight);
+        expect(getContentTransform(wrapper)).to.equal(
+          'translate(-1250px, -1000px)scale(3)'
+        );
+      });
+    });
+
+    it('cannot be dragged when not scaled', () => {
+      gesture.pointerDown();
+      gesture.pointerMove({deltaX: 11, deltaY: 11});
+      gesture.pointerUp();
+
+      gesture.pointerDown();
+      gesture.pointerMove({deltaX: -11, deltaY: -11});
+      gesture.pointerUp();
+      expect(getContentTransform(wrapper)).to.equal(
+        'translate(0px, 0px)scale(1)'
+      );
+    });
+    describe('dragging', () => {
+      beforeEach(() => {
+        // Zoom in twice, so we can drag:
+        gesture.doubleTap(views.middle);
+        gesture.doubleTap(views.middle);
+      });
+
+      it('must be zoomed in first', () => {
+        expect(getContentTransform(wrapper)).to.include(
+          'translate(-1000px, -800px)'
+        );
+      });
+
+      it('should be able to drag', () => {
+        gesture.drag([
+          {deltaX: -50, deltaY: -50},
+          {deltaX: -50, deltaY: -50},
+        ]);
+
+        expect(getContentTransform(wrapper)).to.include(
+          'translate(-1090px, -890px)'
+        );
+      });
+    });
+  });
+});
+
+function getTestDimensions() {
+  // We will simulate the layout of the DOM.
+  // The container is a 1000x800 box.
+  // The contents is a 500x400 box, centered.
+
+  const offset = {x: 100, y: 100};
+  const containerBox = {
+    width: 1000,
+    height: 800,
+    ...offset,
+  };
+  const contentBox = {
+    width: 500,
+    height: 400,
+    x: offset.x + (containerBox.width - 500) / 2,
+    y: offset.y + (containerBox.height - 400) / 2,
+  };
+
+  const views = {
+    topLeft: {
+      clientX: containerBox.x,
+      clientY: containerBox.y,
+    },
+    topLeftContent: {
+      clientX: contentBox.x,
+      clientY: contentBox.y,
+    },
+    middle: {
+      clientX: contentBox.x + contentBox.width / 2,
+      clientY: contentBox.y + contentBox.height / 2,
+    },
+    bottomRightContent: {
+      clientX: contentBox.x + contentBox.width,
+      clientY: contentBox.y + contentBox.height,
+    },
+    bottomRight: {
+      clientX: containerBox.x + containerBox.width,
+      clientY: containerBox.y + containerBox.height,
+    },
+  };
+
+  return {containerBox, contentBox, views};
+}
+
+/**
+ * Asserts that the object matches the expected properties
+ *
+ * @param {T} actual
+ * @param {Partial<T>>} expectedPartial
+ * @template T
+ */
+function expectPartialEqual(actual, expectedPartial) {
+  const actualPartial = Object.keys(expectedPartial).reduce((result, key) => {
+    result[key] = actual[key];
+    return result;
+  }, {});
+  expect(actualPartial).to.deep.equal(expectedPartial);
+}
+
+/**
+ * Similar to @testing-library/react-hooks, except works with Enzyme.
+ *
+ * Renders a hook.
+ * Anything that should trigger a render should be wrapped in `act(() => ...)`
+ * The latest return value of the hook will be stored in `result.current`
+ */
+function renderHook(hook, {initialProps = {}} = {}) {
+  const result = {current: null};
+  const Component = (props) => {
+    result.current = hook(props);
+    return null;
+  };
+
+  const component = mount(<Component {...initialProps} />);
+  const rerender = (newProps = {}) => {
+    component.setProps(newProps);
+  };
+  const act = (callback) => {
+    callback();
+    rerender();
+  };
+
+  return {
+    result,
+    rerender,
+    act,
+  };
+}
+
+class GestureSimulator {
+  constructor(wrapper, sandbox) {
+    this.wrapper = wrapper;
+    this.clientX = 0;
+    this.clientY = 0;
+    this.pointerId = 1;
+    this.createStubs_(sandbox);
+  }
+  createStubs_(sandbox) {
+    sandbox.stub(Element.prototype, 'setPointerCapture');
+    sandbox.stub(Element.prototype, 'releasePointerCapture');
+    sandbox.stub(Element.prototype, 'hasPointerCapture');
+  }
+  createEvent_() {
+    return {...this};
+  }
+  update(options) {
+    if (!options) {
+      return;
+    }
+    if (options.clientX) {
+      this.clientX = options.clientX;
+    }
+    if (options.clientY) {
+      this.clientY = options.clientY;
+    }
+    if (options.deltaX) {
+      this.clientX += options.deltaX;
+    }
+    if (options.deltaY) {
+      this.clientY += options.deltaY;
+    }
+  }
+  pointerDown(options) {
+    this.update(options);
+
+    this.wrapper.simulate('pointerdown', this.createEvent_());
+    this.wrapper.update();
+  }
+  pointerMove(options) {
+    this.update(options);
+
+    this.wrapper.simulate('pointermove', this.createEvent_());
+    this.wrapper.update();
+  }
+  pointerUp(options) {
+    this.update(options);
+
+    this.wrapper.simulate('pointerup', this.createEvent_());
+    this.wrapper.update();
+  }
+  doubleTap(options) {
+    this.update(options);
+
+    this.pointerDown();
+    this.pointerUp();
+    this.pointerDown();
+    this.pointerUp();
+  }
+  drag(points) {
+    this.pointerDown();
+    points.forEach((point) => {
+      this.pointerMove(point);
+    });
+    this.pointerUp();
+  }
+}
diff --git a/extensions/amp-pinterest/0.1/amp-pinterest.js b/extensions/amp-pinterest/0.1/amp-pinterest.js
index e94196a52439..004cfa0dde08 100644
--- a/extensions/amp-pinterest/0.1/amp-pinterest.js
+++ b/extensions/amp-pinterest/0.1/amp-pinterest.js
@@ -54,7 +54,7 @@ import {CSS} from '../../../build/amp-pinterest-0.1.css';
  *    - buttonFollow: User follow button
  */
 class AmpPinterest extends AMP.BaseElement {
-  /** @override @nocollapse */
+  /** @override  */
   static createLoaderLogoCallback(element) {
     const type = element.getAttribute('data-do');
     if (type != 'embedPin') {
diff --git a/extensions/amp-pinterest/0.1/pin-widget.js b/extensions/amp-pinterest/0.1/pin-widget.js
index 88dc41efdb07..c28a71ef237b 100644
--- a/extensions/amp-pinterest/0.1/pin-widget.js
+++ b/extensions/amp-pinterest/0.1/pin-widget.js
@@ -1,4 +1,4 @@
-import {Keys} from '#core/constants/key-codes';
+import {Keys_Enum} from '#core/constants/key-codes';
 import {measureIntersection} from '#core/dom/layout/intersection';
 import {getWin} from '#core/window';
 
@@ -48,7 +48,7 @@ export class PinWidget {
    * @param {Event} event
    */
   handleKeyDown(event) {
-    if (event.key == Keys.ENTER || event.key == Keys.SPACE) {
+    if (event.key == Keys_Enum.ENTER || event.key == Keys_Enum.SPACE) {
       this.handleClick(event);
     }
   }
diff --git a/extensions/amp-pinterest/0.1/util.js b/extensions/amp-pinterest/0.1/util.js
index 10c3b86d9211..1f4cf5fd7e7b 100644
--- a/extensions/amp-pinterest/0.1/util.js
+++ b/extensions/amp-pinterest/0.1/util.js
@@ -39,7 +39,7 @@ function filter(str) {
 /**
  * Create a DOM element with attributes
  * @param {Document} doc
- * @param {Object} data - the string to filter
+ * @param {object} data - the string to filter
  * @return {Element}
  */
 function make(doc, data) {
diff --git a/extensions/amp-pinterest/amp-pinterest.md b/extensions/amp-pinterest/amp-pinterest.md
index 7f661615b129..ae771ee7fe78 100644
--- a/extensions/amp-pinterest/amp-pinterest.md
+++ b/extensions/amp-pinterest/amp-pinterest.md
@@ -149,7 +149,7 @@ data-url="https://www.pinterest.com/pin/99360735500167749/"
 
 ##### alt
 
-This property like the the `alt` attribute on an `<img>` tag specifies the alternate text. If not provided it will be infered from the pin data provided by the Pinterest API.
+This property like the `alt` attribute on an `<img>` tag specifies the alternate text. If not provided it will be infered from the pin data provided by the Pinterest API.
 
 ## Validation
 
diff --git a/extensions/amp-playbuzz/0.1/amp-playbuzz.js b/extensions/amp-playbuzz/0.1/amp-playbuzz.js
index a61a6e97f036..e9ad9c600aac 100644
--- a/extensions/amp-playbuzz/0.1/amp-playbuzz.js
+++ b/extensions/amp-playbuzz/0.1/amp-playbuzz.js
@@ -24,9 +24,8 @@
 import {CSS} from '#build/amp-playbuzz-0.1.css';
 
 import {removeElement} from '#core/dom';
-import {Layout, applyFillContent} from '#core/dom/layout';
+import {Layout_Enum, applyFillContent} from '#core/dom/layout';
 import {observeIntersections} from '#core/dom/layout/viewport-observer';
-import {dict} from '#core/types/object';
 
 import {Services} from '#service';
 
@@ -119,7 +118,9 @@ class AmpPlaybuzz extends AMP.BaseElement {
 
   /** @override */
   isLayoutSupported(layout) {
-    return layout === Layout.RESPONSIVE || layout === Layout.FIXED_HEIGHT;
+    return (
+      layout === Layout_Enum.RESPONSIVE || layout === Layout_Enum.FIXED_HEIGHT
+    );
   }
 
   /** @override */
@@ -292,12 +293,12 @@ class AmpPlaybuzz extends AMP.BaseElement {
       return;
     }
 
-    const scrollingData = dict({
+    const scrollingData = {
       'event': 'scroll',
       'windowHeight': changeEvent.height,
       'scroll': changeEvent.top,
       'offsetTop': this.getLayoutBox().top,
-    });
+    };
 
     this.notifyIframe_(scrollingData);
   }
diff --git a/extensions/amp-playbuzz/0.1/utils.js b/extensions/amp-playbuzz/0.1/utils.js
index 2c0ee7529579..6efd5919d597 100644
--- a/extensions/amp-playbuzz/0.1/utils.js
+++ b/extensions/amp-playbuzz/0.1/utils.js
@@ -1,5 +1,4 @@
 import {rethrowAsync} from '#core/error';
-import {dict} from '#core/types/object';
 import {parseJson} from '#core/types/object/json';
 
 import {getData} from '#utils/event-helper';
@@ -108,38 +107,36 @@ function parsePlaybuzzEventData(data) {
     }
   } catch (e) {
     rethrowAsync('amp-playbuzz', err, e);
-    return dict({});
+    return {};
   }
 
   rethrowAsync('amp-playbuzz', err, data);
-  return dict({});
+  return {};
 }
 
 /**
- * @param {Object} options
+ * @param {object} options
  * @return {string} playbuzzEmbedUrl
  */
 export function composeEmbedUrl(options) {
   const embedUrl =
     options.itemUrl +
     '?' +
-    serializeQueryString(
-      dict({
-        'feed': true,
-        'implementation': 'amp',
-        'src': options.itemUrl,
-        'embedBy': '00000000-0000-0000-0000-000000000000',
-        'game': options.relativeUrl,
-        'comments': undefined,
-        'useComments': options.displayComments,
-        'gameInfo': options.displayItemInfo,
-        'useShares': options.displayShareBar,
-        'socialReferrer': false, //always false - will use parent url for sharing
-        'height': 'auto', //must pass as is - if not, makes problems in trivia (iframe height scrolling)
-        'parentUrl': options.parentUrl, //used for sharing
-        'parentHost': options.parentHost,
-      })
-    );
+    serializeQueryString({
+      'feed': true,
+      'implementation': 'amp',
+      'src': options.itemUrl,
+      'embedBy': '00000000-0000-0000-0000-000000000000',
+      'game': options.relativeUrl,
+      'comments': undefined,
+      'useComments': options.displayComments,
+      'gameInfo': options.displayItemInfo,
+      'useShares': options.displayShareBar,
+      'socialReferrer': false, //always false - will use parent url for sharing
+      'height': 'auto', //must pass as is - if not, makes problems in trivia (iframe height scrolling)
+      'parentUrl': options.parentUrl, //used for sharing
+      'parentHost': options.parentHost,
+    });
   return embedUrl;
 }
 
diff --git a/extensions/amp-position-observer/0.1/amp-position-observer.js b/extensions/amp-position-observer/0.1/amp-position-observer.js
index 6a08c6ecdb17..953e29770537 100644
--- a/extensions/amp-position-observer/0.1/amp-position-observer.js
+++ b/extensions/amp-position-observer/0.1/amp-position-observer.js
@@ -1,4 +1,4 @@
-import {ActionTrust} from '#core/constants/action-constants';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
 import {
   assertLength,
   getLengthNumeral,
@@ -6,15 +6,14 @@ import {
   parseLength,
 } from '#core/dom/layout';
 import {
-  RelativePositions,
+  RelativePositions_Enum,
   layoutRectLtwh,
   layoutRectsRelativePos,
 } from '#core/dom/layout/rect';
-import {dict} from '#core/types/object';
 
 import {Services} from '#service';
 import {installPositionObserverServiceForDoc} from '#service/position-observer/position-observer-impl';
-import {PositionObserverFidelity} from '#service/position-observer/position-observer-worker';
+import {PositionObserverFidelity_Enum} from '#service/position-observer/position-observer-worker';
 
 import {createCustomEvent} from '#utils/event-helper';
 import {dev, devAssert, user, userAssert} from '#utils/log';
@@ -117,7 +116,7 @@ export class AmpVisibilityObserver extends AMP.BaseElement {
         const scene = this.discoverScene_();
         this.positionObserver_.observe(
           scene,
-          PositionObserverFidelity.HIGH,
+          PositionObserverFidelity_Enum.HIGH,
           /** @type {function(?PositionInViewportEntryDef)} */ (
             this.positionChanged_.bind(this)
           )
@@ -131,8 +130,8 @@ export class AmpVisibilityObserver extends AMP.BaseElement {
    */
   triggerEnter_() {
     const name = 'enter';
-    const event = createCustomEvent(this.win, `${TAG}.${name}`, dict({}));
-    this.action_.trigger(this.element, name, event, ActionTrust.LOW);
+    const event = createCustomEvent(this.win, `${TAG}.${name}`, {});
+    this.action_.trigger(this.element, name, event, ActionTrust_Enum.LOW);
   }
 
   /**
@@ -141,8 +140,8 @@ export class AmpVisibilityObserver extends AMP.BaseElement {
    */
   triggerExit_() {
     const name = 'exit';
-    const event = createCustomEvent(this.win, `${TAG}.${name}`, dict({}));
-    this.action_.trigger(this.element, name, event, ActionTrust.LOW);
+    const event = createCustomEvent(this.win, `${TAG}.${name}`, {});
+    this.action_.trigger(this.element, name, event, ActionTrust_Enum.LOW);
   }
 
   /**
@@ -155,21 +154,17 @@ export class AmpVisibilityObserver extends AMP.BaseElement {
    */
   triggerScroll_() {
     const scrolltop = this.viewport_.getScrollTop();
-    const positionObserverData = dict({
+    const positionObserverData = {
       'start-scroll-offset': scrolltop,
       'end-scroll-offset': scrolltop + this.remainingScrollToExit_,
       'initial-inview-percent': this.scrollProgress_,
-    });
+    };
     const name = 'scroll';
-    const event = createCustomEvent(
-      this.win,
-      `${TAG}.${name}`,
-      dict({
-        'percent': this.scrollProgress_,
-        'positionObserverData': positionObserverData,
-      })
-    );
-    this.action_.trigger(this.element, name, event, ActionTrust.LOW);
+    const event = createCustomEvent(this.win, `${TAG}.${name}`, {
+      'percent': this.scrollProgress_,
+      'positionObserverData': positionObserverData,
+    });
+    this.action_.trigger(this.element, name, event, ActionTrust_Enum.LOW);
     // TODO(nainar): We want to remove the position observer if the scroll
     // event is only used by the AnimationWorklet codepath of amp-animation.
     // This involves having amp-animation signal back to amp-position-observer
@@ -217,7 +212,7 @@ export class AmpVisibilityObserver extends AMP.BaseElement {
 
     if (wasVisible && !this.isVisible_) {
       // Send final scroll progress state before exiting to handle fast-scroll.
-      this.scrollProgress_ = relPos == RelativePositions.BOTTOM ? 0 : 1;
+      this.scrollProgress_ = relPos == RelativePositions_Enum.BOTTOM ? 0 : 1;
       this.triggerScroll_();
       this.triggerExit_();
       this.firstIterationComplete_ = true;
@@ -238,21 +233,23 @@ export class AmpVisibilityObserver extends AMP.BaseElement {
    * Calculates whether the scene is visible considering ratios and margins.
    * @param {!../../../src/layout-rect.LayoutRectDef} positionRect position rect as returned by position observer
    * @param {!../../../src/layout-rect.LayoutRectDef} adjustedViewportRect viewport rect adjusted for margins.
-   * @param {!RelativePositions} relativePos Relative position of rect to viewportRect
+   * @param {!RelativePositions_Enum} relativePos Relative position of rect to viewportRect
    * @private
    */
   updateVisibility_(positionRect, adjustedViewportRect, relativePos) {
     // Fully inside margin-adjusted viewport.
-    if (relativePos == RelativePositions.INSIDE) {
+    if (relativePos == RelativePositions_Enum.INSIDE) {
       this.isVisible_ = true;
       return;
     }
 
     const ratioToUse =
-      relativePos == RelativePositions.TOP ? this.topRatio_ : this.bottomRatio_;
+      relativePos == RelativePositions_Enum.TOP
+        ? this.topRatio_
+        : this.bottomRatio_;
 
     const offset = positionRect.height * ratioToUse;
-    if (relativePos == RelativePositions.BOTTOM) {
+    if (relativePos == RelativePositions_Enum.BOTTOM) {
       this.isVisible_ =
         positionRect.top <= adjustedViewportRect.bottom - offset;
     } else {
diff --git a/extensions/amp-position-observer/0.1/test-e2e/test-scrollbound-animation.js b/extensions/amp-position-observer/0.1/test-e2e/test-scrollbound-animation.js
index 638f02535e9d..92630d967c10 100644
--- a/extensions/amp-position-observer/0.1/test-e2e/test-scrollbound-animation.js
+++ b/extensions/amp-position-observer/0.1/test-e2e/test-scrollbound-animation.js
@@ -15,7 +15,8 @@ async function testScroll(env) {
     controller = env.controller;
   });
 
-  it('should animate clock hand while scrolling', async () => {
+  // TODO(#40214): fix flaky test.
+  it.skip('should animate clock hand while scrolling', async () => {
     const step = 50;
     const initPoint = {
       'width': 53,
diff --git a/extensions/amp-position-observer/0.1/test-e2e/test-target-id.js b/extensions/amp-position-observer/0.1/test-e2e/test-target-id.js
index 255b7f5cf49b..1c370928db76 100644
--- a/extensions/amp-position-observer/0.1/test-e2e/test-target-id.js
+++ b/extensions/amp-position-observer/0.1/test-e2e/test-target-id.js
@@ -15,7 +15,8 @@ async function testScroll(env) {
     controller = env.controller;
   });
 
-  it('should animate clock hand while scrolling', async () => {
+  // TODO(#40214): fix flaky test.
+  it.skip('should animate clock hand while scrolling', async () => {
     const step = 50;
     const initPoint = {
       'width': 45,
diff --git a/extensions/amp-position-observer/0.1/test/test-amp-position-observer.js b/extensions/amp-position-observer/0.1/test/test-amp-position-observer.js
index 1dedb8c57134..dd11cdba7879 100644
--- a/extensions/amp-position-observer/0.1/test/test-amp-position-observer.js
+++ b/extensions/amp-position-observer/0.1/test/test-amp-position-observer.js
@@ -1,4 +1,4 @@
-import {RelativePositions, layoutRectLtwh} from '#core/dom/layout/rect';
+import {RelativePositions_Enum, layoutRectLtwh} from '#core/dom/layout/rect';
 
 import {AmpVisibilityObserver} from '../amp-position-observer';
 
@@ -51,14 +51,14 @@ describes.sandboxed('amp-position-observer', {}, (env) => {
   function setPosition(top) {
     const viewportRect = layoutRectLtwh(0, 0, 500, 1000);
     let positionRect = layoutRectLtwh(0, top, 500, 200);
-    let relativePos = RelativePositions.INSIDE;
+    let relativePos = RelativePositions_Enum.INSIDE;
 
     if (top > 1000 + 200) {
       positionRect = null;
-      relativePos = RelativePositions.BOTTOM;
+      relativePos = RelativePositions_Enum.BOTTOM;
     } else if (top < -200) {
       positionRect = null;
-      relativePos = RelativePositions.TOP;
+      relativePos = RelativePositions_Enum.TOP;
     }
     const entry = {
       viewportRect,
diff --git a/extensions/amp-powr-player/0.1/amp-powr-player.js b/extensions/amp-powr-player/0.1/amp-powr-player.js
index c188c9714e72..c4a32d39e1ea 100644
--- a/extensions/amp-powr-player/0.1/amp-powr-player.js
+++ b/extensions/amp-powr-player/0.1/amp-powr-player.js
@@ -11,7 +11,6 @@ import {
 } from '#core/dom/fullscreen';
 import {isLayoutSizeDefined} from '#core/dom/layout';
 import {PauseHelper} from '#core/dom/video/pause-helper';
-import {dict} from '#core/types/object';
 
 import {Services} from '#service';
 import {installVideoManagerForDoc} from '#service/video-manager-impl';
@@ -27,19 +26,19 @@ import {
   redispatch,
 } from '../../../src/iframe-video';
 import {addParamsToUrl} from '../../../src/url';
-import {VideoEvents} from '../../../src/video-interface';
+import {VideoEvents_Enum} from '../../../src/video-interface';
 
 /** @private @const {string} */
 const TAG = 'amp-powr-player';
 
 /** @private @const {!Object.<string,string>} */
 const PLAYER_EVENT_MAP = {
-  'ready': VideoEvents.LOAD,
-  'playing': VideoEvents.PLAYING,
-  'pause': VideoEvents.PAUSE,
-  'ended': VideoEvents.ENDED,
-  'ads-ad-started': VideoEvents.AD_START,
-  'ads-ad-ended': VideoEvents.AD_END,
+  'ready': VideoEvents_Enum.LOAD,
+  'playing': VideoEvents_Enum.PLAYING,
+  'pause': VideoEvents_Enum.PAUSE,
+  'ended': VideoEvents_Enum.ENDED,
+  'ads-ad-started': VideoEvents_Enum.AD_START,
+  'ads-ad-ended': VideoEvents_Enum.AD_END,
 };
 
 /** @implements {../../../src/video-interface.VideoInterface} */
@@ -128,12 +127,10 @@ class AmpPowrPlayer extends AMP.BaseElement {
       // been unlaid out by now.
       if (this.iframe_ && this.iframe_.contentWindow) {
         this.iframe_.contentWindow./*OK*/ postMessage(
-          JSON.stringify(
-            dict({
-              'command': command,
-              'args': arg,
-            })
-          ),
+          JSON.stringify({
+            'command': command,
+            'args': arg,
+          }),
           'https://player.powr.com'
         );
       }
@@ -246,10 +243,10 @@ class AmpPowrPlayer extends AMP.BaseElement {
 
     const srcPrefix = 'https://player.powr.com/iframe.html';
 
-    const srcParams = dict({
+    const srcParams = {
       'account': account,
       'player': this.playerId_,
-    });
+    };
 
     if (video) {
       srcParams['video'] = video;
diff --git a/extensions/amp-powr-player/0.1/test/test-amp-powr-player.js b/extensions/amp-powr-player/0.1/test/test-amp-powr-player.js
index 1d3595458df4..11fac5b42a94 100644
--- a/extensions/amp-powr-player/0.1/test/test-amp-powr-player.js
+++ b/extensions/amp-powr-player/0.1/test/test-amp-powr-player.js
@@ -2,7 +2,7 @@ import '../amp-powr-player';
 import {listenOncePromise} from '#utils/event-helper';
 
 import {parseUrlDeprecated} from '../../../../src/url';
-import {VideoEvents} from '../../../../src/video-interface';
+import {VideoEvents_Enum} from '../../../../src/video-interface';
 
 describes.realWin(
   'amp-powr-player',
@@ -189,7 +189,7 @@ describes.realWin(
       }).then((bc) => {
         return Promise.resolve()
           .then(async () => {
-            const p = listenOncePromise(bc, VideoEvents.LOAD);
+            const p = listenOncePromise(bc, VideoEvents_Enum.LOAD);
             await fakePostMessage(bc, {
               event: 'ready',
               muted: false,
@@ -198,7 +198,7 @@ describes.realWin(
             return p;
           })
           .then(async () => {
-            const p = listenOncePromise(bc, VideoEvents.AD_START);
+            const p = listenOncePromise(bc, VideoEvents_Enum.AD_START);
             await fakePostMessage(bc, {
               event: 'ads-ad-started',
               muted: false,
@@ -207,7 +207,7 @@ describes.realWin(
             return p;
           })
           .then(async () => {
-            const p = listenOncePromise(bc, VideoEvents.AD_END);
+            const p = listenOncePromise(bc, VideoEvents_Enum.AD_END);
             await fakePostMessage(bc, {
               event: 'ads-ad-ended',
               muted: false,
@@ -216,7 +216,7 @@ describes.realWin(
             return p;
           })
           .then(async () => {
-            const p = listenOncePromise(bc, VideoEvents.PLAYING);
+            const p = listenOncePromise(bc, VideoEvents_Enum.PLAYING);
             await fakePostMessage(bc, {
               event: 'playing',
               muted: false,
@@ -225,7 +225,7 @@ describes.realWin(
             return p;
           })
           .then(async () => {
-            const p = listenOncePromise(bc, VideoEvents.MUTED);
+            const p = listenOncePromise(bc, VideoEvents_Enum.MUTED);
             await fakePostMessage(bc, {
               event: 'volumechange',
               muted: true,
@@ -234,7 +234,7 @@ describes.realWin(
             return p;
           })
           .then(async () => {
-            const p = listenOncePromise(bc, VideoEvents.UNMUTED);
+            const p = listenOncePromise(bc, VideoEvents_Enum.UNMUTED);
             await fakePostMessage(bc, {
               event: 'volumechange',
               muted: false,
@@ -243,7 +243,7 @@ describes.realWin(
             return p;
           })
           .then(async () => {
-            const p = listenOncePromise(bc, VideoEvents.PAUSE);
+            const p = listenOncePromise(bc, VideoEvents_Enum.PAUSE);
             await fakePostMessage(bc, {
               event: 'pause',
               muted: false,
@@ -252,7 +252,7 @@ describes.realWin(
             return p;
           })
           .then(async () => {
-            const p = listenOncePromise(bc, VideoEvents.ENDED);
+            const p = listenOncePromise(bc, VideoEvents_Enum.ENDED);
             await fakePostMessage(bc, {
               event: 'ended',
               muted: false,
diff --git a/extensions/amp-recaptcha-input/0.1/amp-recaptcha-input.js b/extensions/amp-recaptcha-input/0.1/amp-recaptcha-input.js
index 2e6977e5081a..13f6d397c129 100644
--- a/extensions/amp-recaptcha-input/0.1/amp-recaptcha-input.js
+++ b/extensions/amp-recaptcha-input/0.1/amp-recaptcha-input.js
@@ -4,18 +4,21 @@
  * recaptcha tokens
  */
 
+import {
+  AsyncInputAttributes_Enum,
+  AsyncInputClasses_Enum,
+} from '#core/constants/async-input';
+import {Layout_Enum} from '#core/dom/layout';
+import {setStyles, toggle} from '#core/dom/style';
+
+import {userAssert} from '#utils/log';
+
 import {
   AmpRecaptchaService,
   recaptchaServiceForDoc,
 } from './amp-recaptcha-service';
-import {
-  AsyncInputAttributes,
-  AsyncInputClasses,
-} from '#core/constants/async-input';
+
 import {CSS} from '../../../build/amp-recaptcha-input-0.1.css';
-import {Layout} from '#core/dom/layout';
-import {setStyles, toggle} from '#core/dom/style';
-import {userAssert} from '#utils/log';
 
 /** @const */
 const TAG = 'amp-recaptcha-input';
@@ -57,9 +60,9 @@ export class AmpRecaptchaInput extends AMP.BaseElement {
     );
 
     userAssert(
-      this.element.getAttribute(AsyncInputAttributes.NAME),
+      this.element.getAttribute(AsyncInputAttributes_Enum.NAME),
       'The %s attribute is required for <amp-recaptcha-input> %s',
-      AsyncInputAttributes.NAME,
+      AsyncInputAttributes_Enum.NAME,
       this.element
     );
 
@@ -71,7 +74,7 @@ export class AmpRecaptchaInput extends AMP.BaseElement {
       return this.mutateElement(() => {
         toggle(this.element);
         // Add the required AsyncInput class
-        this.element.classList.add(AsyncInputClasses.ASYNC_INPUT);
+        this.element.classList.add(AsyncInputClasses_Enum.ASYNC_INPUT);
         /**
          * These styles will create an in-place element, that is 1x1,
          * but invisible. Absolute positioning keeps it where it would have
@@ -91,7 +94,7 @@ export class AmpRecaptchaInput extends AMP.BaseElement {
 
   /** @override */
   isLayoutSupported(layout) {
-    return layout == Layout.NODISPLAY;
+    return layout == Layout_Enum.NODISPLAY;
   }
 
   /** @override */
diff --git a/extensions/amp-recaptcha-input/0.1/amp-recaptcha-service.js b/extensions/amp-recaptcha-input/0.1/amp-recaptcha-service.js
index e62752fb00d6..10bd21ff53d6 100644
--- a/extensions/amp-recaptcha-input/0.1/amp-recaptcha-service.js
+++ b/extensions/amp-recaptcha-input/0.1/amp-recaptcha-service.js
@@ -3,21 +3,22 @@
  * interacting with the 3p recaptcha bootstrap iframe
  */
 
-import ampToolboxCacheUrl from '../../../third_party/amp-toolbox-cache-url/dist/amp-toolbox-cache-url.esm';
-
 import {Deferred, tryResolve} from '#core/data-structures/promise';
+import {removeElement} from '#core/dom';
+import {setStyle} from '#core/dom/style';
+import * as mode from '#core/mode';
+
 import {Services} from '#service';
+
+import {loadPromise} from '#utils/event-helper';
 import {dev, devAssert} from '#utils/log';
-import {dict} from '#core/types/object';
+
+import * as urls from '../../../src/config/urls';
+import {listenFor, postMessage} from '../../../src/iframe-helper';
 import {getMode} from '../../../src/mode';
 import {getServicePromiseForDoc} from '../../../src/service-helpers';
 import {getSourceOrigin} from '../../../src/url';
-import {listenFor, postMessage} from '../../../src/iframe-helper';
-import {loadPromise} from '#utils/event-helper';
-import {removeElement} from '#core/dom';
-import {setStyle} from '#core/dom/style';
-import {urls} from '../../../src/config';
-import * as mode from '#core/mode';
+import ampToolboxCacheUrl from '../../../third_party/amp-toolbox-cache-url/dist/amp-toolbox-cache-url.esm';
 
 /**
  * @fileoverview
@@ -148,10 +149,10 @@ export class AmpRecaptchaService {
       reject: executePromise.reject,
     };
     this.recaptchaApiReady_.promise.then(() => {
-      const message = dict({
+      const message = {
         'id': messageId,
         'action': 'amp_' + action,
-      });
+      };
 
       // Send the message
       this.postMessageToIframe_(
@@ -224,13 +225,11 @@ export class AmpRecaptchaService {
       iframe.setAttribute('data-amp-3p-sentinel', 'amp-recaptcha');
       iframe.setAttribute(
         'name',
-        JSON.stringify(
-          dict({
-            'sitekey': this.sitekey_,
-            'sentinel': 'amp-recaptcha',
-            'global': this.global_,
-          })
-        )
+        JSON.stringify({
+          'sitekey': this.sitekey_,
+          'sentinel': 'amp-recaptcha',
+          'global': this.global_,
+        })
       );
       iframe.classList.add('i-amphtml-recaptcha-iframe');
       setStyle(iframe, 'border', 'none');
@@ -362,7 +361,7 @@ export class AmpRecaptchaService {
    * NOTE: Use bracket notation to access message properties,
    * As the externs were a little too generic.
    *
-   * @param {Object} data
+   * @param {object} data
    */
   tokenMessageHandler_(data) {
     const id = data['id'];
@@ -378,7 +377,7 @@ export class AmpRecaptchaService {
    * NOTE: Use bracket notation to access message properties,
    * As the externs were a little too generic.
    *
-   * @param {Object} data
+   * @param {object} data
    */
   errorMessageHandler_(data) {
     const id = data['id'];
diff --git a/extensions/amp-redbull-player/0.1/amp-redbull-player.js b/extensions/amp-redbull-player/0.1/amp-redbull-player.js
index db04f438a6fe..e69de29bb2d1 100644
--- a/extensions/amp-redbull-player/0.1/amp-redbull-player.js
+++ b/extensions/amp-redbull-player/0.1/amp-redbull-player.js
@@ -1,300 +0,0 @@
-import {
-  dispatchCustomEvent,
-  getDataParamsFromAttributes,
-  removeElement,
-} from '#core/dom';
-import {isLayoutSizeDefined} from '#core/dom/layout';
-import {dict} from '#core/types/object';
-
-import {Services} from '#service';
-import {installVideoManagerForDoc} from '#service/video-manager-impl';
-
-import {getData, listen} from '#utils/event-helper';
-import {userAssert} from '#utils/log';
-
-import {disableScrollingOnIframe} from '../../../src/iframe-helper';
-import {
-  SandboxOptions,
-  createFrameFor,
-  isJsonOrObj,
-  objOrParseJson,
-  originMatches,
-} from '../../../src/iframe-video';
-import {addParamsToUrl} from '../../../src/url';
-import {VideoEvents} from '../../../src/video-interface';
-
-/** @private @const */
-const TAG = 'amp-redbull-player';
-
-/** @private @const */
-const ANALYTICS_EVENT_TYPE_PREFIX = 'video-custom-';
-
-/** @private @const */
-const SANDBOX = [
-  SandboxOptions.ALLOW_SCRIPTS,
-  SandboxOptions.ALLOW_SAME_ORIGIN,
-  SandboxOptions.ALLOW_POPUPS,
-  SandboxOptions.ALLOW_POPUPS_TO_ESCAPE_SANDBOX,
-  SandboxOptions.ALLOW_TOP_NAVIGATION_BY_USER_ACTIVATION,
-];
-
-/** @implements {../../../src/video-interface.VideoInterface} */
-class AmpRedBullPlayer extends AMP.BaseElement {
-  /** @param {!AmpElement} element */
-  constructor(element) {
-    super(element);
-
-    /** @private {?Element} */
-    this.iframe_ = null;
-
-    /** @private {?UnlistenDef} */
-    this.unlistenFrame_ = null;
-
-    /** @private {string} */
-    this.tagId_ = '';
-
-    /**
-     * @param {!Event} e
-     * @return {undefined}
-     * @private
-     */
-    this.boundOnMessage_ = (e) => this.onMessage_(e);
-  }
-
-  /** @override */
-  isLayoutSupported(layout) {
-    return isLayoutSizeDefined(layout);
-  }
-
-  /** @override */
-  buildCallback() {
-    const {element} = this;
-
-    /*
-     * Required Paramaters: data-param-videoid
-     * Break creation if required parameters are missing!
-     */
-    userAssert(
-      element.getAttribute('data-param-videoid'),
-      'The data-param-videoid attribute is required for %s',
-      element
-    );
-
-    this.tagId_ = element.getAttribute('id') || 'rbvideo';
-
-    installVideoManagerForDoc(element);
-  }
-
-  /** @override */
-  layoutCallback() {
-    const {element} = this;
-
-    const params = getDataParamsFromAttributes(element);
-    const videoId = params['videoid'];
-    const skinId = params['skinid'] || 'com';
-    const locale = params['locale'] || 'global';
-
-    const origin = 'https://player.redbull.com/amp/amp-iframe.html';
-
-    const src = addParamsToUrl(
-      origin,
-      dict({
-        'videoId': videoId,
-        'skinId': skinId,
-        'ampTagId': this.tagId_,
-        'locale': locale,
-      })
-    );
-
-    this.iframe_ = disableScrollingOnIframe(
-      createFrameFor(this, src, '', SANDBOX)
-    );
-
-    this.unlistenFrame_ = listen(this.win, 'message', this.boundOnMessage_);
-    return this.loadPromise(this.iframe_).then(() => {
-      this.onReady_();
-    });
-  }
-
-  /** @private */
-  onReady_() {
-    Services.videoManagerForDoc(this.element).register(this);
-    this.iframe_.contentWindow./*OK*/ postMessage(
-      JSON.stringify(
-        dict({
-          'msg': 'amp-loaded',
-          'id': `${TAG}-${this.tagId_}`,
-        })
-      ),
-      '*'
-    );
-  }
-
-  /** @override */
-  unlayoutCallback() {
-    this.removeIframe_();
-    return true;
-  }
-
-  /** @private */
-  removeIframe_() {
-    if (this.iframe_) {
-      removeElement(this.iframe_);
-      this.iframe_ = null;
-    }
-    if (this.unlistenFrame_) {
-      this.unlistenFrame_();
-      this.unlistenFrame_ = null;
-    }
-  }
-
-  /**
-   * @param {!Event} event
-   * @private
-   */
-  originMatches_(event) {
-    return originMatches(event, this.iframe_, /.*/);
-  }
-
-  /**
-   * @param {!Event} event
-   * @private
-   */
-  onMessage_(event) {
-    if (!this.iframe_) {
-      return;
-    }
-
-    if (!this.originMatches_(event)) {
-      return;
-    }
-
-    const eventData = getData(event);
-    if (!isJsonOrObj(eventData)) {
-      return;
-    }
-
-    const data = objOrParseJson(eventData);
-
-    if (data == null) {
-      return; // we only process valid json
-    }
-
-    if (data['id'] === `redbull-amp-video-tracking-${this.tagId_}`) {
-      const type = ANALYTICS_EVENT_TYPE_PREFIX + data['type'];
-      this.dispatchCustomAnalyticsEvent_(type, data);
-    }
-  }
-
-  /**
-   * @param {string} eventType The eventType must be prefixed with video-custom- to prevent naming collisions with other analytics event types.
-   * @param {!Object<string, string>=} vars
-   */
-  dispatchCustomAnalyticsEvent_(eventType, vars) {
-    dispatchCustomEvent(
-      this.element,
-      VideoEvents.CUSTOM_TICK,
-      dict({
-        'eventType': `video-custom-tracking-${this.tagId_}`,
-        'vars': vars,
-      })
-    );
-  }
-
-  /** @override */
-  isInteractive() {
-    return true;
-  }
-
-  /** @override */
-  supportsPlatform() {
-    return true;
-  }
-
-  /** @override */
-  preimplementsMediaSessionAPI() {
-    return false;
-  }
-
-  /** @override */
-  preimplementsAutoFullscreen() {
-    return false;
-  }
-
-  /** @override */
-  getCurrentTime() {
-    // Not supported.
-    return NaN;
-  }
-
-  /** @override */
-  getDuration() {
-    // Not supported.
-    return NaN;
-  }
-
-  /** @override */
-  getMetadata() {
-    // Not supported.
-  }
-
-  /** @override */
-  getPlayedRanges() {
-    // Not supported.
-    return [];
-  }
-
-  /** @override */
-  play(unusedIsAutoplay) {
-    // Not supported
-  }
-
-  /** @override */
-  pause() {
-    // Not supported
-  }
-
-  /** @override */
-  mute() {
-    // Not supported
-  }
-
-  /** @override */
-  unmute() {
-    // Not supported
-  }
-
-  /** @override */
-  showControls() {
-    // Not supported
-  }
-
-  /** @override */
-  hideControls() {
-    // Not supported
-  }
-
-  /** @override */
-  fullscreenEnter() {
-    // Not supported
-  }
-
-  /** @override */
-  fullscreenExit() {
-    // Not supported
-  }
-
-  /** @override */
-  isFullscreen() {
-    return false;
-  }
-
-  /** @override */
-  seekTo(unusedTimeSeconds) {
-    // Not supported
-  }
-}
-
-AMP.extension(TAG, '0.1', (AMP) => {
-  AMP.registerElement(TAG, AmpRedBullPlayer);
-});
diff --git a/extensions/amp-redbull-player/0.1/test/test-amp-redbull.js b/extensions/amp-redbull-player/0.1/test/test-amp-redbull.js
deleted file mode 100644
index 9fd8df3eeb7e..000000000000
--- a/extensions/amp-redbull-player/0.1/test/test-amp-redbull.js
+++ /dev/null
@@ -1,100 +0,0 @@
-import '../amp-redbull-player';
-
-describes.realWin(
-  'amp-redbull-player',
-  {
-    amp: {
-      extensions: ['amp-redbull-player'],
-    },
-  },
-  (env) => {
-    let win, doc;
-    beforeEach(() => {
-      win = env.win;
-      doc = win.document;
-    });
-
-    function getRedBullElement(videoId) {
-      const player = doc.createElement('amp-redbull-player');
-
-      if (videoId) {
-        player.setAttribute('data-param-videoid', videoId);
-      }
-
-      player.setAttribute('width', '222');
-      player.setAttribute('height', '111');
-      player.setAttribute('layout', 'responsive');
-
-      doc.body.appendChild(player);
-      return player.buildInternal().then(() => {
-        player.layoutCallback();
-        return player;
-      });
-    }
-
-    describe('rendering', async () => {
-      it('renders the Red Bull player', async () => {
-        const player = await getRedBullElement(
-          'rrn:content:videos:3965a26c-052e-575f-a28b-ded6bee23ee1:en-INT'
-        );
-        const playerIframe = player.querySelector('iframe');
-        expect(playerIframe).to.not.be.null;
-        expect(playerIframe.src).to.equal(
-          'https://player.redbull.com/amp/amp-iframe.html?videoId=' +
-            encodeURIComponent(
-              'rrn:content:videos:3965a26c-052e-575f-a28b-ded6bee23ee1:en-INT'
-            ) +
-            '&skinId=com&ampTagId=rbvideo&locale=global'
-        );
-      });
-
-      it('fails without videoId', () => {
-        return getRedBullElement(null).should.eventually.be.rejectedWith(
-          /The data-param-videoid attribute is required/
-        );
-      });
-
-      it('removes iframe after unlayoutCallback', async () => {
-        const player = await getRedBullElement(
-          'rrn:content:videos:3965a26c-052e-575f-a28b-ded6bee23ee1:en-INT'
-        );
-        const playerIframe = player.querySelector('iframe');
-        expect(playerIframe).to.not.be.null;
-
-        const impl = await player.getImpl(false);
-        impl.unlayoutCallback();
-        expect(player.querySelector('iframe')).to.be.null;
-        expect(impl.iframe_).to.be.null;
-      });
-    });
-    describe('methods', async () => {
-      let impl;
-      beforeEach(async () => {
-        const player = await getRedBullElement(
-          'rrn:content:videos:3965a26c-052e-575f-a28b-ded6bee23ee1:en-INT'
-        );
-        impl = await player.getImpl(false);
-      });
-
-      it('is interactive', () => {
-        expect(impl.isInteractive()).to.be.true;
-      });
-
-      it('supports platform', () => {
-        expect(impl.supportsPlatform()).to.be.true;
-      });
-
-      it('does not pre-implement MediaSession API', () => {
-        expect(impl.preimplementsMediaSessionAPI()).to.be.false;
-      });
-
-      it('does not pre-implement auto-fullscreen', () => {
-        expect(impl.preimplementsAutoFullscreen()).to.be.false;
-      });
-
-      it('is not fullscreen', () => {
-        expect(impl.isFullscreen()).to.be.false;
-      });
-    });
-  }
-);
diff --git a/extensions/amp-redbull-player/0.1/test/validator-amp-redbull.html b/extensions/amp-redbull-player/0.1/test/validator-amp-redbull.html
deleted file mode 100644
index 2d1ab6454392..000000000000
--- a/extensions/amp-redbull-player/0.1/test/validator-amp-redbull.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Test Description:
-  Tests for the amp-redbull-player tag. See the inline comments.
--->
-<!doctype html>
-<html ⚡ lang="en">
-<head>
-  <meta charset="utf-8">
-  <link rel="canonical" href="./regular-html-version.html">
-  <meta name="viewport" content="width=device-width,minimum-scale=1">
-  <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
-  <script async src="https://cdn.ampproject.org/v0.js"></script>
-  <script async custom-element="amp-redbull-player" data-amp-report-test="amp-redbull-player" src="https://cdn.ampproject.org/v0/amp-redbull-player-0.1.js"></script>
-</head>
-<body>
-    <!-- Valid implementation -->
-    <amp-redbull-player
-      id="rbvideo_1"
-      data-param-videoid="rrn:content:videos:3965a26c-052e-575f-a28b-ded6bee23ee1:en-INT"
-      data-param-locale="us"
-      height="169"
-      width="300"
-      layout="fixed">
-    </amp-redbull-player><br/>
-    <!-- Valid implementation -->
-    <amp-redbull-player
-      id="rbvideo_2"
-      data-param-videoid="rrn:content:videos:3e27acc3-2fd2-44f4-9d6f-c1ec0ff587f1:en-INT"
-      data-param-locale="at"
-      data-param-skinid="com"
-      height=200
-      width=400
-      layout="fixed">
-    </amp-redbull-player>
-</body>
-</html>
diff --git a/extensions/amp-redbull-player/0.1/test/validator-amp-redbull.out b/extensions/amp-redbull-player/0.1/test/validator-amp-redbull.out
deleted file mode 100644
index 7f2bcfd77444..000000000000
--- a/extensions/amp-redbull-player/0.1/test/validator-amp-redbull.out
+++ /dev/null
@@ -1,37 +0,0 @@
-PASS
-|  <!--
-|    Test Description:
-|    Tests for the amp-redbull-player tag. See the inline comments.
-|  -->
-|  <!doctype html>
-|  <html ⚡ lang="en">
-|  <head>
-|    <meta charset="utf-8">
-|    <link rel="canonical" href="./regular-html-version.html">
-|    <meta name="viewport" content="width=device-width,minimum-scale=1">
-|    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
-|    <script async src="https://cdn.ampproject.org/v0.js"></script>
-|    <script async custom-element="amp-redbull-player" data-amp-report-test="amp-redbull-player" src="https://cdn.ampproject.org/v0/amp-redbull-player-0.1.js"></script>
-|  </head>
-|  <body>
-|      <!-- Valid implementation -->
-|      <amp-redbull-player
-|        id="rbvideo_1"
-|        data-param-videoid="rrn:content:videos:3965a26c-052e-575f-a28b-ded6bee23ee1:en-INT"
-|        data-param-locale="us"
-|        height="169"
-|        width="300"
-|        layout="fixed">
-|      </amp-redbull-player><br/>
-|      <!-- Valid implementation -->
-|      <amp-redbull-player
-|        id="rbvideo_2"
-|        data-param-videoid="rrn:content:videos:3e27acc3-2fd2-44f4-9d6f-c1ec0ff587f1:en-INT"
-|        data-param-locale="at"
-|        data-param-skinid="com"
-|        height=200
-|        width=400
-|        layout="fixed">
-|      </amp-redbull-player>
-|  </body>
-|  </html>
diff --git a/extensions/amp-redbull-player/OWNERS b/extensions/amp-redbull-player/OWNERS
deleted file mode 100644
index cf94d5d2b30d..000000000000
--- a/extensions/amp-redbull-player/OWNERS
+++ /dev/null
@@ -1,10 +0,0 @@
-// For an explanation of the OWNERS rules and syntax, see:
-// https://github.com/ampproject/amp-github-apps/blob/main/owners/OWNERS.example
-
-{
-  rules: [
-    {
-      owners: [{name: 'wklopf'}, {name: 'ampproject/wg-components'}],
-    },
-  ],
-}
diff --git a/extensions/amp-redbull-player/amp-redbull-player.md b/extensions/amp-redbull-player/amp-redbull-player.md
deleted file mode 100644
index db777e0f0966..000000000000
--- a/extensions/amp-redbull-player/amp-redbull-player.md
+++ /dev/null
@@ -1,47 +0,0 @@
----
-$category@: media
-formats:
-  - websites
-teaser:
-  text: Displays a Red Bull Video Player.
----
-
-# amp-redbull-player
-
-## Example
-
-```html
-<amp-redbull-player
-  id="rbvideo"
-  data-param-videoid="rrn:content:videos:3965a26c-052e-575f-a28b-ded6bee23ee1:en-INT"
-  data-param-skinid="com"
-  data-param-locale="en"
-  height="360"
-  width="640"
-></amp-redbull-player>
-```
-
-## Attributes
-
-<table>
-  <tr>
-    <td width="40%"><strong>data-param-videoid (required)</strong></td>
-    <td>The video ID</a>.</td>
-  </tr>
-  <tr>
-    <td width="40%"><strong>data-param-skinid (optional)</strong></td>
-    <td>The ID of the skin to display. Value can be stv or com. Defaults to com</td>
-  </tr>
-  <tr>
-    <td width="40%"><strong>data-param-locale (optional)</strong></td>
-    <td>String value for the tracking configuration.</a>.</td>
-  </tr>
-  <tr>
-    <td width="40%"><strong>id (optional)</strong></td>
-    <td>Selector for the amp-analytics triggers configuration.</td>
-  </tr>
-</table>
-
-## Validation
-
-See [amp-redbull-player rules]`(https://github.com/ampproject/amphtml/blob/main/extensions/amp-redbull-player/validator-amp-player-player.protoascii)` in the AMP validator specification.
diff --git a/extensions/amp-redbull-player/validator-amp-redbull-player.protoascii b/extensions/amp-redbull-player/validator-amp-redbull-player.protoascii
deleted file mode 100644
index 49984522538a..000000000000
--- a/extensions/amp-redbull-player/validator-amp-redbull-player.protoascii
+++ /dev/null
@@ -1,29 +0,0 @@
-tags: {  # amp-redbull-player
-  html_format: AMP
-  tag_name: "SCRIPT"
-  extension_spec: {
-    name: "amp-redbull-player"
-    version: "0.1"
-    version: "latest"
-  }
-  attr_lists: "common-extension-attrs"
-}
-tags: {  # <amp-redbull-player>
-  html_format: AMP
-  tag_name: "AMP-REDBULL-PLAYER"
-  requires_extension: "amp-redbull-player"
-  attrs: {
-    name: "data-param-videoid"
-    mandatory: true
-  }
-  attr_lists: "extended-amp-global"
-  amp_layout: {
-    supported_layouts: FIXED
-    supported_layouts: FIXED_HEIGHT
-    supported_layouts: RESPONSIVE
-    supported_layouts: FILL
-    supported_layouts: FLEX_ITEM
-    supported_layouts: FLUID
-    supported_layouts: INTRINSIC
-  }
-}
diff --git a/extensions/amp-render/1.0/amp-render.js b/extensions/amp-render/1.0/amp-render.js
index 1d2d8b6ba332..f8f177b61ad1 100644
--- a/extensions/amp-render/1.0/amp-render.js
+++ b/extensions/amp-render/1.0/amp-render.js
@@ -1,22 +1,20 @@
-import {BaseElement} from './base-element';
-import {
-  BatchFetchOptionsDef,
-  UrlReplacementPolicy_Enum,
-  batchFetchJsonFor,
-} from '../../../src/batched-json';
-import {Layout} from '#core/dom/layout';
-import {Services} from '#service';
+import {Layout_Enum} from '#core/dom/layout';
 import {computedStyle, setStyles} from '#core/dom/style';
-import {dev, user, userAssert} from '#utils/log';
-import {dict} from '#core/types/object';
-import {getSourceOrigin, isAmpScriptUri} from '../../../src/url';
 import {toArray} from '#core/types/array';
 
-/** @const {string} */
-const TAG = 'amp-render';
+import {AmpPreactBaseElement, setSuperClass} from '#preact/amp-base-element';
+
+import {Services} from '#service';
+
+import {dev, user, userAssert} from '#utils/log';
+
+import {BaseElement} from './base-element';
+import {FetchJsonUtil, isAmpStateSrc} from './shared/amp-fetch-utils';
+
+import {isAmpScriptUri} from '../../../src/url';
 
 /** @const {string} */
-const AMP_STATE_URI_SCHEME = 'amp-state:';
+const TAG = 'amp-render';
 
 /** @enum {string}  */
 const Binding = {
@@ -26,44 +24,6 @@ const Binding = {
   NO: 'no',
 };
 
-/**
- * Returns true if element's src points to amp-state.
- * @param {?string} src
- * @return {boolean}
- */
-const isAmpStateSrc = (src) => src && src.startsWith(AMP_STATE_URI_SCHEME);
-
-/**
- * Gets the json from an "amp-state:" uri. For example, src="amp-state:json.path".
- * TODO: this is similar to the implementation in amp-list. Move it
- * to a common file and import it.
- * @param {!AmpElement} element
- * @param {string} src
- * @return {Promise<!JsonObject>}
- */
-function getAmpStateJson(element, src) {
-  return Services.bindForDocOrNull(element)
-    .then((bind) => {
-      userAssert(bind, '"amp-state:" URLs require amp-bind to be installed.');
-      const ampStatePath = src.slice(AMP_STATE_URI_SCHEME.length);
-      return bind.getStateAsync(ampStatePath).catch((err) => {
-        const stateKey = ampStatePath.split('.')[0];
-        user().error(
-          TAG,
-          `'amp-state' element with id '${stateKey}' was not found.`
-        );
-        throw err;
-      });
-    })
-    .then((json) => {
-      userAssert(
-        json !== undefined,
-        `[amp-render] No data was found at provided uri: ${src}`
-      );
-      return json;
-    });
-}
-
 /**
  * @param {string} bindingValue
  * @param {boolean} isFirstMutation
@@ -98,7 +58,7 @@ function getTemplateNonEmptyNodeCount(doc, template) {
     const div = doc.createElement('div');
     div./*OK*/ innerHTML = template./*OK*/ innerHTML;
     childNodes = div.childNodes;
-  } else if (template.tagName == 'TEMPLATE') {
+  } else if (template.tagName === 'TEMPLATE') {
     childNodes = template.content.childNodes;
   }
   return toArray(childNodes).reduce(
@@ -113,7 +73,10 @@ function getTemplateNonEmptyNodeCount(doc, template) {
   );
 }
 
-export class AmpRender extends BaseElement {
+export class AmpRender extends setSuperClass(
+  BaseElement,
+  AmpPreactBaseElement
+) {
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -123,82 +86,11 @@ export class AmpRender extends BaseElement {
 
     /** @private {?Element} */
     this.template_ = null;
-
-    /** @private {?string} */
-    this.initialSrc_ = null;
-
-    /** @private {?string} */
-    this.src_ = null;
-  }
-
-  /**
-   * @return {!UrlReplacementPolicy_Enum}
-   * @private
-   */
-  getPolicy_() {
-    const src = this.element.getAttribute('src');
-    // Require opt-in for URL variable replacements on CORS fetches triggered
-    // by [src] mutation. @see spec/amp-var-substitutions.md
-    // TODO(dmanek): Update spec/amp-var-substitutions.md with this information
-    // and add a `Substitution` sections in this component's markdown file.
-    let policy = UrlReplacementPolicy_Enum.OPT_IN;
-    if (
-      src == this.initialSrc_ ||
-      getSourceOrigin(src) == getSourceOrigin(this.getAmpDoc().win.location)
-    ) {
-      policy = UrlReplacementPolicy_Enum.ALL;
-    }
-    return policy;
-  }
-
-  /**
-   * @param {boolean} shouldRefresh true to force refresh of browser cache.
-   * @return {!BatchFetchOptionsDef} options object to pass to `batchFetchJsonFor` method.
-   * @private
-   */
-  buildOptionsObject_(shouldRefresh = false) {
-    return {
-      xssiPrefix: this.element.getAttribute('xssi-prefix'),
-      expr: this.element.getAttribute('key') ?? '.',
-      refresh: shouldRefresh,
-      urlReplacement: this.getPolicy_(),
-    };
-  }
-
-  /**
-   * Returns a function to fetch json from remote url, amp-state or
-   * amp-script.
-   *
-   * @return {Function}
-   */
-  getFetchJsonFn() {
-    const {element} = this;
-    const src = element.getAttribute('src');
-    if (!src) {
-      // TODO(dmanek): assert that src is provided instead of silently failing below.
-      return () => {};
-    }
-    if (isAmpStateSrc(src)) {
-      return (src) => getAmpStateJson(element, src);
-    }
-    if (isAmpScriptUri(src)) {
-      return (src) =>
-        Services.scriptForDocOrNull(element).then((ampScriptService) => {
-          userAssert(ampScriptService, 'AMP-SCRIPT is not installed');
-          return ampScriptService.fetch(src);
-        });
-    }
-    return (unusedSrc, shouldRefresh = false) =>
-      batchFetchJsonFor(
-        element.getAmpDoc(),
-        element,
-        this.buildOptionsObject_(shouldRefresh)
-      );
   }
 
   /** @override */
   isLayoutSupported(layout) {
-    if (layout === Layout.CONTAINER) {
+    if (layout === Layout_Enum.CONTAINER) {
       userAssert(
         this.getPlaceholder(),
         'placeholder required with layout="container"'
@@ -246,8 +138,8 @@ export class AmpRender extends BaseElement {
 
   /** @override */
   init() {
-    this.initialSrc_ = this.element.getAttribute('src');
-    this.src_ = this.initialSrc_;
+    this.src_ = this.element.getAttribute('src');
+    this.fetchUtil_ = new FetchJsonUtil(TAG, this.element, this.src_);
 
     const hasAriaLive = this.element.hasAttribute('aria-live');
     if (!hasAriaLive) {
@@ -270,18 +162,18 @@ export class AmpRender extends BaseElement {
       this.handleResizeToContentsAction_();
     });
 
-    return dict({
+    return {
       'ariaLiveValue': hasAriaLive
         ? this.element.getAttribute('aria-live')
         : 'polite',
-      'getJson': this.getFetchJsonFn(),
-    });
+      'getJson': this.fetchUtil_.getFetchJsonCallback(),
+    };
   }
 
   /** @override */
   handleOnLoad() {
     this.toggleLoading(false);
-    if (this.element.getAttribute('layout') !== Layout.CONTAINER) {
+    if (this.element.getAttribute('layout') !== Layout_Enum.CONTAINER) {
       this.togglePlaceholder(false);
       return;
     }
@@ -325,7 +217,7 @@ export class AmpRender extends BaseElement {
       return;
     }
     this.src_ = src;
-    this.mutateProps(dict({'getJson': this.getFetchJsonFn()}));
+    this.mutateProps({'getJson': this.fetchUtil_.getFetchJsonCallback()});
   }
 
   /**
@@ -336,7 +228,9 @@ export class AmpRender extends BaseElement {
   renderTemplateAsString_(data) {
     return this.templates_
       .renderTemplateAsString(dev().assertElement(this.template_), data)
-      .then((html) => dict({'__html': html}));
+      .then((html) => ({
+        '__html': html,
+      }));
   }
 
   /** @override */
@@ -350,60 +244,56 @@ export class AmpRender extends BaseElement {
     }
     this.template_ = template;
     if (!template) {
-      this.mutateProps(dict({'render': null}));
+      this.mutateProps({'render': null});
       return;
     }
 
     // Only overwrite `render` when template is ready to minimize FOUC.
     templates.whenReady(template).then(() => {
-      if (template != this.template_) {
+      if (template !== this.template_) {
         // A new template has been set while the old one was initializing.
         return;
       }
-      this.mutateProps(
-        dict({
-          'render': (data) => {
-            const bindingValue = this.element.getAttribute('binding');
-            if (bindingValue === Binding.NEVER || bindingValue === Binding.NO) {
+      this.mutateProps({
+        'render': (data) => {
+          const bindingValue = this.element.getAttribute('binding');
+          if (bindingValue === Binding.NEVER || bindingValue === Binding.NO) {
+            return this.renderTemplateAsString_(data);
+          }
+          return Services.bindForDocOrNull(this.element).then((bind) => {
+            if (!bind) {
               return this.renderTemplateAsString_(data);
             }
-            return Services.bindForDocOrNull(this.element).then((bind) => {
-              if (!bind) {
-                return this.renderTemplateAsString_(data);
-              }
-              const nonEmptyNodeCount = getTemplateNonEmptyNodeCount(
-                this.element.ownerDocument,
-                template
-              );
-              return templates
-                .renderTemplate(dev().assertElement(template), data)
-                .then((element) => {
-                  return bind
-                    .rescan([element], [], {
-                      'fast': true,
-                      'update': getUpdateValue(
-                        bindingValue,
-                        // bind.signals().get('FIRST_MUTATE') returns timestamp (in ms) when first
-                        // mutation occured, which is null for the initial render
-                        bind.signals().get('FIRST_MUTATE') === null
-                      ),
-                    })
-                    .then(() =>
-                      dict({
-                        // We should use innerHTML when the template lacks a wrapper
-                        // element, outerHTML otherwise in order to include the wrapper
-                        // element itself.
-                        '__html':
-                          nonEmptyNodeCount === 1
-                            ? element./* OK */ outerHTML
-                            : element./* OK */ innerHTML,
-                      })
-                    );
-                });
-            });
-          },
-        })
-      );
+            const nonEmptyNodeCount = getTemplateNonEmptyNodeCount(
+              this.element.ownerDocument,
+              template
+            );
+            return templates
+              .renderTemplate(dev().assertElement(template), data)
+              .then((element) => {
+                return bind
+                  .rescan([element], [], {
+                    'fast': true,
+                    'update': getUpdateValue(
+                      bindingValue,
+                      // bind.signals().get('FIRST_MUTATE') returns timestamp (in ms) when first
+                      // mutation occured, which is null for the initial render
+                      bind.signals().get('FIRST_MUTATE') === null
+                    ),
+                  })
+                  .then(() => ({
+                    // We should use innerHTML when the template lacks a wrapper
+                    // element, outerHTML otherwise in order to include the wrapper
+                    // element itself.
+                    '__html':
+                      nonEmptyNodeCount === 1
+                        ? element./* OK */ outerHTML
+                        : element./* OK */ innerHTML,
+                  }));
+              });
+          });
+        },
+      });
     });
   }
 
diff --git a/extensions/amp-render/1.0/base-element.js b/extensions/amp-render/1.0/base-element.js
index ff600d52de18..5b805ad43702 100644
--- a/extensions/amp-render/1.0/base-element.js
+++ b/extensions/amp-render/1.0/base-element.js
@@ -1,4 +1,5 @@
 import {PreactBaseElement} from '#preact/base-element';
+
 import {Render} from './component';
 
 export class BaseElement extends PreactBaseElement {}
diff --git a/extensions/amp-render/1.0/component.js b/extensions/amp-render/1.0/component.js
index be60cc7ab405..08bdf3dbe55c 100644
--- a/extensions/amp-render/1.0/component.js
+++ b/extensions/amp-render/1.0/component.js
@@ -1,7 +1,8 @@
 import * as Preact from '#preact';
-import {Wrapper, useRenderer, useValueRef} from '#preact/component';
-import {forwardRef} from '#preact/compat';
 import {useCallback, useEffect, useImperativeHandle, useState} from '#preact';
+import {forwardRef} from '#preact/compat';
+import {Wrapper, useValueRef} from '#preact/component';
+import {useRenderer} from '#preact/component/renderer';
 import {useResourcesNotify} from '#preact/utils';
 
 /**
@@ -25,14 +26,14 @@ const DEFAULT_GET_JSON = (url) => {
  */
 export function RenderWithRef(
   {
-    src = '',
-    getJson = DEFAULT_GET_JSON,
-    render = DEFAULT_RENDER,
     ariaLiveValue = 'polite',
-    onLoading,
+    getJson = DEFAULT_GET_JSON,
+    onError,
     onLoad,
+    onLoading,
     onRefresh,
-    onError,
+    render = DEFAULT_RENDER,
+    src = '',
     ...rest
   },
   ref
diff --git a/extensions/amp-render/1.0/shared/amp-fetch-utils.js b/extensions/amp-render/1.0/shared/amp-fetch-utils.js
new file mode 100644
index 000000000000..5d0b3970e895
--- /dev/null
+++ b/extensions/amp-render/1.0/shared/amp-fetch-utils.js
@@ -0,0 +1,131 @@
+import {Services} from '#service';
+
+import {user, userAssert} from '#utils/log';
+
+import {
+  UrlReplacementPolicy_Enum,
+  batchFetchJsonFor,
+} from '../../../../src/batched-json';
+import {getSourceOrigin, isAmpScriptUri} from '../../../../src/url';
+
+const AMP_STATE_URI_SCHEME = 'amp-state:';
+/**
+ * Returns true if element's src points to amp-state.
+ * @param {?string} src
+ * @return {boolean}
+ */
+export function isAmpStateSrc(src) {
+  return src && src.startsWith(AMP_STATE_URI_SCHEME);
+}
+
+export class FetchJsonUtil {
+  /**
+   *
+   * @param {string} TAG
+   * @param {Element} element
+   * @param {string} initialSrc
+   */
+  constructor(TAG, element, initialSrc) {
+    this.TAG = TAG;
+    this.element = element;
+    this.initialSrc = initialSrc;
+  }
+
+  /**
+   * Gets the json from an "amp-state:" uri. For example, src="amp-state:json.path".
+   * @param {string} src
+   * @return {Promise<!JsonObject>}
+   */
+  getAmpStateJson(src) {
+    const {TAG, element} = this;
+    return Services.bindForDocOrNull(element)
+      .then((bind) => {
+        userAssert(bind, '"amp-state:" URLs require amp-bind to be installed.');
+        const ampStatePath = src.slice(AMP_STATE_URI_SCHEME.length);
+        return bind.getStateAsync(ampStatePath).catch((err) => {
+          const stateKey = ampStatePath.split('.')[0];
+          user().error(
+            TAG,
+            `'amp-state' element with id '${stateKey}' was not found.`
+          );
+          throw err;
+        });
+      })
+      .then((json) => {
+        userAssert(
+          json !== undefined,
+          `[${TAG}] No data was found at provided uri: ${src}`
+        );
+        return json;
+      });
+  }
+
+  /**
+   * Returns a function to fetch json from remote url, amp-state or
+   * amp-script.
+   *
+   * @return {Function}
+   */
+  getFetchJsonCallback() {
+    const {element} = this;
+    const src = element.getAttribute('src');
+    if (!src) {
+      return () => Promise.resolve(null);
+    }
+    if (isAmpStateSrc(src)) {
+      return (src) => this.getAmpStateJson(src);
+    }
+    if (isAmpScriptUri(src)) {
+      return (src) =>
+        Services.scriptForDocOrNull(element).then((ampScriptService) => {
+          userAssert(ampScriptService, 'AMP-SCRIPT is not installed');
+          return ampScriptService.fetch(src);
+        });
+    }
+    return (src, shouldRefresh = false) => {
+      return batchFetchJsonFor(
+        element.getAmpDoc(),
+        element,
+        this.buildOptionsObject_(src, shouldRefresh)
+      );
+    };
+  }
+
+  /**
+   * @return {!UrlReplacementPolicy_Enum}
+   * @private
+   */
+  getPolicy_() {
+    const {element, initialSrc} = this;
+    const src = element.getAttribute('src');
+    // Require opt-in for URL variable replacements on CORS fetches triggered
+    // by [src] mutation. @see spec/amp-var-substitutions.md
+    // TODO(dmanek): Update spec/amp-var-substitutions.md with this information
+    // and add a `Substitution` sections in this component's markdown file.
+    let policy = UrlReplacementPolicy_Enum.OPT_IN;
+    if (
+      src === initialSrc ||
+      getSourceOrigin(src) === getSourceOrigin(element.getAmpDoc().win.location)
+    ) {
+      policy = UrlReplacementPolicy_Enum.ALL;
+    }
+    return policy;
+  }
+
+  /**
+   * @param {string} url
+   * @param {boolean} shouldRefresh true to force refresh of browser cache.
+   * @return {!BatchFetchOptionsDef} options object to pass to `batchFetchJsonFor` method.
+   * @private
+   */
+  buildOptionsObject_(url, shouldRefresh) {
+    const {element} = this;
+    return {
+      xssiPrefix: element.getAttribute('xssi-prefix'),
+      expr: element.getAttribute('key') ?? '.',
+      refresh: shouldRefresh,
+      urlReplacement: this.getPolicy_(),
+      url,
+    };
+  }
+}
diff --git a/extensions/amp-render/1.0/storybook/Basic.amp.js b/extensions/amp-render/1.0/storybook/Basic.amp.js
deleted file mode 100644
index 46610bd14e5d..000000000000
--- a/extensions/amp-render/1.0/storybook/Basic.amp.js
+++ /dev/null
@@ -1,149 +0,0 @@
-import * as Preact from '#preact';
-import {withAmp} from '@ampproject/storybook-addon';
-
-export default {
-  title: 'amp-render-1_0',
-  decorators: [withAmp],
-  parameters: {
-    extensions: [
-      {name: 'amp-mustache', version: '0.2'},
-      {name: 'amp-bind', version: '0.1'},
-      {name: 'amp-render', version: '1.0'},
-      {name: 'amp-script', version: '0.1'},
-    ],
-    experiments: ['amp-render'],
-  },
-};
-
-export const WithAmpState = () => {
-  const content = JSON.stringify({'name': 'Bill'});
-
-  return (
-    <>
-      <amp-state id="someData">
-        <script
-          type="application/json"
-          dangerouslySetInnerHTML={{__html: content}}
-        ></script>
-      </amp-state>
-
-      <amp-render
-        src="amp-state:someData"
-        width="300"
-        height="400"
-        layout="fixed"
-      >
-        <template type="amp-mustache">{`Hi {{name}}!`}</template>
-      </amp-render>
-    </>
-  );
-};
-
-WithAmpState.storyName = 'With AMP State';
-
-export const WithRemoteSrc = (args) => {
-  return (
-    <amp-render {...args} width="300" height="400" layout="fixed">
-      <div placeholder style={{background: 'blue'}}>
-        placeholder
-      </div>
-      <div fallback style={{background: 'red'}}>
-        fallback
-      </div>
-      <template type="amp-mustache">{`Hi {{name}}!`}</template>
-    </amp-render>
-  );
-};
-
-WithRemoteSrc.storyName = 'With remote src';
-WithRemoteSrc.args = {
-  src: 'http://localhost:9001/examples/amp-render-data.json',
-};
-
-export const WithBindableSrc = () => {
-  return (
-    <>
-      <amp-render
-        data-amp-bind-src="bindSrc"
-        src="https://amp.dev/static/samples/json/examples.json"
-        width="300"
-        height="200"
-        layout="fixed"
-      >
-        <template type="amp-mustache">
-          <ul>
-            {`{{#items}}`}
-            <li>{`{{title}}`}</li>
-            {`{{/items}}`}
-          </ul>
-        </template>
-      </amp-render>
-
-      <button on="tap:AMP.setState({ bindSrc: 'https://amp.dev/static/samples/json/examples2.json' })">
-        Change source
-      </button>
-    </>
-  );
-};
-
-WithBindableSrc.storyName = 'With bindable src';
-
-export const WithAmpScriptSrc = () => {
-  return (
-    <>
-      <amp-script id="dataFunctions" script="local-script" nodom></amp-script>
-      <script id="local-script" type="text/plain" target="amp-script">
-        {`
-        function getRemoteData() {
-          return fetch('https://amp.dev/static/samples/json/examples2.json')
-            .then(function(resp) { return resp.json(); });
-        }
-        exportFunction('getRemoteData', getRemoteData);
-        `}
-      </script>
-
-      <amp-render
-        src="amp-script:dataFunctions.getRemoteData"
-        width="auto"
-        height="100"
-        layout="fixed-height"
-      >
-        <template type="amp-mustache">
-          <ul>
-            {`{{#items}}`}
-            <li>{`{{title}}`}</li>
-            {`{{/items}}`}
-          </ul>
-        </template>
-      </amp-render>
-    </>
-  );
-};
-
-WithAmpScriptSrc.storyName = 'With AMP script src';
-
-export const WithRefreshButton = () => {
-  return (
-    <>
-      <amp-render
-        id="my-amp-render"
-        src="https://amp.dev/static/samples/json/examples.json"
-        width="300"
-        height="200"
-        layout="fixed"
-      >
-        <template type="amp-mustache">
-          <ul>
-            {`{{#items}}`}
-            <li>{`{{title}}`}</li>
-            {`{{/items}}`}
-          </ul>
-        </template>
-      </amp-render>
-
-      <button on="tap:my-amp-render.refresh">Refresh data</button>
-    </>
-  );
-};
-
-WithBindableSrc.storyName = 'With bindable src';
diff --git a/extensions/amp-render/1.0/storybook/Basic.js b/extensions/amp-render/1.0/storybook/Basic.js
deleted file mode 100644
index 76432b49f0b2..000000000000
--- a/extensions/amp-render/1.0/storybook/Basic.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import * as Preact from '#preact';
-import {Render} from '../component';
-import {withKnobs} from '@storybook/addon-knobs';
-
-export default {
-  title: 'Render',
-  component: Render,
-  decorators: [withKnobs],
-};
-
-export const _default = () => {
-  return (
-    <Render
-      src={'http://example.com'}
-      getJson={() => Promise.resolve({name: 'George'})}
-      render={(data) => `Hi ${data.name}!`}
-    ></Render>
-  );
-};
-
-export const defaultRenderAndGetJson = () => {
-  return <Render src={'/examples/amp-render-data.json'}></Render>;
-};
diff --git a/extensions/amp-render/1.0/test/test-amp-render.js b/extensions/amp-render/1.0/test/test-amp-render.js
index aa98a0b88c6e..9254e748917c 100644
--- a/extensions/amp-render/1.0/test/test-amp-render.js
+++ b/extensions/amp-render/1.0/test/test-amp-render.js
@@ -2,15 +2,19 @@ import '../../../amp-bind/0.1/amp-bind';
 import '../../../amp-mustache/0.2/amp-mustache';
 import '../../../amp-script/0.1/amp-script';
 import '../amp-render';
-import * as BatchedJsonModule from '../../../../src/batched-json';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
+import {htmlFor} from '#core/dom/static-template';
 import * as Style from '#core/dom/style';
-import * as log from '#utils/log';
-import {ActionInvocation} from '#service/action-impl';
-import {ActionTrust} from '#core/constants/action-constants';
+
 import {Services} from '#service';
-import {htmlFor} from '#core/dom/static-template';
+import {ActionInvocation} from '#service/action-impl';
+
+import * as log from '#utils/log';
+
 import {waitFor} from '#testing/helpers/service';
-import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
+
+import * as BatchedJsonModule from '../../../../src/batched-json';
 
 describes.realWin(
   'amp-render-v1.0',
@@ -52,7 +56,7 @@ describes.realWin(
       const source = null;
       const caller = null;
       const event = null;
-      const trust = ActionTrust.DEFAULT;
+      const trust = ActionTrust_Enum.DEFAULT;
       return new ActionInvocation(
         element,
         method,
diff --git a/extensions/amp-render/1.0/test/test-component.js b/extensions/amp-render/1.0/test/test-component.js
index 78f97d768282..cd964d80c885 100644
--- a/extensions/amp-render/1.0/test/test-component.js
+++ b/extensions/amp-render/1.0/test/test-component.js
@@ -1,7 +1,10 @@
+import {mount} from 'enzyme';
+
 import * as Preact from '#preact';
-import {Render} from '../component';
+
 import {macroTask} from '#testing/helpers';
-import {mount} from 'enzyme';
+
+import {Render} from '../component';
 
 describes.sandboxed('Render 1.0 preact component', {}, () => {
   it('should render', async () => {
diff --git a/extensions/amp-render/validator-amp-render.protoascii b/extensions/amp-render/validator-amp-render.protoascii
index abe1ef597f2a..f754227a0538 100644
--- a/extensions/amp-render/validator-amp-render.protoascii
+++ b/extensions/amp-render/validator-amp-render.protoascii
@@ -5,7 +5,6 @@ tags: {  # amp-render
     name: "amp-render"
     version: "1.0"
     version: "latest"
-    bento_supported_version: "1.0"
   }
   attr_lists: "common-extension-attrs"
 }
diff --git a/extensions/amp-resize-observer-polyfill/0.1/amp-resize-observer-polyfill.js b/extensions/amp-resize-observer-polyfill/0.1/amp-resize-observer-polyfill.js
index cd0f230fdce4..a79993fdad4b 100644
--- a/extensions/amp-resize-observer-polyfill/0.1/amp-resize-observer-polyfill.js
+++ b/extensions/amp-resize-observer-polyfill/0.1/amp-resize-observer-polyfill.js
@@ -24,7 +24,7 @@ export function upgradeResizeObserverPolyfill(win) {
   registerServiceBuilder(win, TAG, upgrade, /* instantiate */ true);
 }
 
-// eslint-disable-next-line no-unused-vars
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 AMP.extension(TAG, '0.1', function (AMP) {
   upgradeResizeObserverPolyfill(window);
 });
diff --git a/extensions/amp-script/0.1/amp-script.js b/extensions/amp-script/0.1/amp-script.js
index 2807227cc10c..6bbb654ffaf7 100644
--- a/extensions/amp-script/0.1/amp-script.js
+++ b/extensions/amp-script/0.1/amp-script.js
@@ -1,10 +1,14 @@
 import {upgrade} from '@ampproject/worker-dom/dist/amp-production/main.mjs';
 
 import {Deferred} from '#core/data-structures/promise';
-import {Layout, applyFillContent, isLayoutSizeDefined} from '#core/dom/layout';
+import {
+  Layout_Enum,
+  applyFillContent,
+  isLayoutSizeDefined,
+} from '#core/dom/layout';
 import {realChildElements} from '#core/dom/query';
 import * as mode from '#core/mode';
-import {dict, map} from '#core/types/object';
+import {map} from '#core/types/object';
 import {tryParseJson} from '#core/types/object/json';
 import {utf8Encode} from '#core/types/string/bytes';
 
@@ -18,7 +22,7 @@ import {dev, user, userAssert} from '#utils/log';
 import {UserActivationTracker} from './user-activation-tracker';
 
 import {CSS} from '../../../build/amp-script-0.1.css';
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {getElementServiceForDoc} from '../../../src/element-service';
 import {cancellation} from '../../../src/error-reporting';
 import {getMode} from '../../../src/mode';
@@ -38,10 +42,16 @@ const TAG = 'amp-script';
 let WorkerDOMWorkerDef;
 
 /**
- * Max cumulative size of author scripts from all amp-script elements on page.
+ * Max cumulative size of author scripts from all amp-script elements on page that are not using sandboxed mode.
  * @const {number}
  */
-const MAX_TOTAL_SCRIPT_SIZE = 150000;
+const MAX_TOTAL_NONSANDBOXED_SCRIPT_SIZE = 150000;
+
+/**
+ * Max cumulative size of author scripts from all amp-script elements on page that are using sandboxed mode.
+ * @const {number}
+ */
+const MAX_TOTAL_SANDBOXED_SCRIPT_SIZE = 300000;
 
 /**
  * See src/transfer/Phase.ts in worker-dom.
@@ -138,7 +148,7 @@ export class AmpScript extends AMP.BaseElement {
 
   /** @override */
   isLayoutSupported(layout) {
-    return layout == Layout.CONTAINER || isLayoutSizeDefined(layout);
+    return layout == Layout_Enum.CONTAINER || isLayoutSizeDefined(layout);
   }
 
   /** @override */
@@ -186,11 +196,11 @@ export class AmpScript extends AMP.BaseElement {
     }
 
     const {height, width} = this.getLayoutSize();
-    if (width === 0 && height === 0) {
+    if (width * height === 0 && !this.nodom_) {
       this.reportedZeroSize_ = true;
       user().warn(
         TAG,
-        'Skipped initializing amp-script due to zero width and height.',
+        'Skipped initializing amp-script due to zero width or height.',
         this.element
       );
     }
@@ -222,6 +232,14 @@ export class AmpScript extends AMP.BaseElement {
    */
   callFunction(unusedFnId, unusedFnArgs) {
     return this.initialize_.promise.then(() => {
+      if (!this.workerDom_) {
+        return Promise.reject(
+          new Error(
+            'Attempted to call a function on an amp-script which failed initialization.'
+          )
+        );
+      }
+
       return this.workerDom_.callFunction.apply(this.workerDom_, arguments);
     });
   }
@@ -269,13 +287,15 @@ export class AmpScript extends AMP.BaseElement {
 
       if (
         !this.development_ &&
-        this.service_.sizeLimitExceeded(authorScript.length)
+        this.service_.sizeLimitExceeded(authorScript.length, this.sandboxed_)
       ) {
         user().error(
           TAG,
           'Maximum total script size exceeded (%s). %s is disabled. ' +
             'See https://amp.dev/documentation/components/amp-script/#size-of-javascript-code.',
-          MAX_TOTAL_SCRIPT_SIZE,
+          this.sandboxed_
+            ? MAX_TOTAL_SANDBOXED_SCRIPT_SIZE
+            : MAX_TOTAL_NONSANDBOXED_SCRIPT_SIZE,
           this.debugId_
         );
         this.element.classList.add('i-amphtml-broken');
@@ -572,7 +592,10 @@ export class AmpScriptService {
     this.ampdoc_ = ampdoc;
 
     /** @private {number} */
-    this.cumulativeSize_ = 0;
+    this.cumulativeNonSandboxedSize_ = 0;
+
+    /** @private {number} */
+    this.cumulativeSandboxedSize_ = 0;
 
     /** @private {!Array<string>} */
     this.sources_ = [];
@@ -613,14 +636,19 @@ export class AmpScriptService {
   }
 
   /**
-   * Adds `size` to current total. Returns true iff new total is <= size cap.
+   * Adds `size` to current total. Returns true if new total is <= size cap.
    *
    * @param {number} size
+   * @param {boolean} isSandboxed
    * @return {boolean}
    */
-  sizeLimitExceeded(size) {
-    this.cumulativeSize_ += size;
-    return this.cumulativeSize_ > MAX_TOTAL_SCRIPT_SIZE;
+  sizeLimitExceeded(size, isSandboxed) {
+    isSandboxed
+      ? (this.cumulativeSandboxedSize_ += size)
+      : (this.cumulativeNonSandboxedSize_ += size);
+    return isSandboxed
+      ? this.cumulativeSandboxedSize_ > MAX_TOTAL_SANDBOXED_SCRIPT_SIZE
+      : this.cumulativeNonSandboxedSize_ > MAX_TOTAL_NONSANDBOXED_SCRIPT_SIZE;
   }
 
   /**
@@ -692,7 +720,7 @@ export class SanitizerImpl {
     registerServiceBuilder(this.win_, 'purifier-inplace', function () {
       return new Purifier(
         ampScript.win.document,
-        dict({'IN_PLACE': true}),
+        {'IN_PLACE': true},
         rewriteAttributeValue
       );
     });
@@ -700,7 +728,7 @@ export class SanitizerImpl {
     /** @private @const {!Purifier} */
     this.purifier_ = getService(this.win_, 'purifier-inplace');
 
-    /** @private @const {!Object<string, boolean>} */
+    /** @private @const {!{[key: string]: boolean}} */
     this.allowedTags_ = this.purifier_.getAllowedTags();
 
     /**
diff --git a/extensions/amp-script/0.1/test-e2e/test-amp-script.js b/extensions/amp-script/0.1/test-e2e/test-amp-script.js
index 55e02379b30b..b8e2034b131b 100644
--- a/extensions/amp-script/0.1/test-e2e/test-amp-script.js
+++ b/extensions/amp-script/0.1/test-e2e/test-amp-script.js
@@ -4,7 +4,7 @@ describes.endtoend(
     fixture: 'amp-script/basic.amp.html',
     initialRect: {width: 600, height: 600},
     environments: ['single'],
-    browsers: ['chrome', 'safari'],
+    browsers: ['chrome'],
   },
   (env) => {
     let controller;
diff --git a/extensions/amp-script/0.1/test/integration/test-amp-script.js b/extensions/amp-script/0.1/test/integration/test-amp-script.js
index 93f27ce83bdf..658009ce3174 100644
--- a/extensions/amp-script/0.1/test/integration/test-amp-script.js
+++ b/extensions/amp-script/0.1/test/integration/test-amp-script.js
@@ -7,223 +7,220 @@ function poll(description, condition, opt_onError) {
   return classicPoll(description, condition, opt_onError, TIMEOUT);
 }
 
-describes.sandboxed
-  .configure()
-  .skipFirefox()
-  .run('amp-script', {}, function () {
-    this.timeout(TIMEOUT);
-
-    let browser, doc, element;
-
-    describes.integration(
-      'container ',
-      {
-        body: `
+describes.sandboxed('amp-script', {}, function () {
+  this.timeout(TIMEOUT);
+
+  let browser, doc, element;
+
+  describes.integration(
+    'container ',
+    {
+      body: `
       <amp-script layout=container src="/examples/amp-script/amp-script-demo.js">
         <button id="hello">Insert Hello World!</button>
         <button id="long">Long task</button>
       </amp-script>
     `,
-        extensions: ['amp-script'],
-      },
-      (env) => {
-        beforeEach(() => {
-          browser = new BrowserController(env.win);
-          doc = env.win.document;
-          element = doc.querySelector('amp-script');
+      extensions: ['amp-script'],
+    },
+    (env) => {
+      beforeEach(() => {
+        browser = new BrowserController(env.win);
+        doc = env.win.document;
+        element = doc.querySelector('amp-script');
+      });
+
+      it('should say "hello world"', function* () {
+        yield poll('<amp-script> to be hydrated', () =>
+          element.classList.contains('i-amphtml-hydrated')
+        );
+        const impl = yield element.getImpl();
+
+        // Give event listeners in hydration a moment to attach.
+        yield browser.wait(100);
+
+        env.sandbox
+          .stub(impl.getUserActivation(), 'isActive')
+          .callsFake(() => true);
+        browser.click('button#hello');
+
+        yield poll('mutations applied', () => {
+          const h1 = doc.querySelector('h1');
+          return h1 && h1.textContent == 'Hello World!';
         });
-
-        it('should say "hello world"', function* () {
-          yield poll('<amp-script> to be hydrated', () =>
-            element.classList.contains('i-amphtml-hydrated')
-          );
-          const impl = yield element.getImpl();
-
-          // Give event listeners in hydration a moment to attach.
-          yield browser.wait(100);
-
-          env.sandbox
-            .stub(impl.getUserActivation(), 'isActive')
-            .callsFake(() => true);
-          browser.click('button#hello');
-
-          yield poll('mutations applied', () => {
-            const h1 = doc.querySelector('h1');
-            return h1 && h1.textContent == 'Hello World!';
-          });
+      });
+
+      it('should terminate without gesture', function* () {
+        yield poll('<amp-script> to be hydrated', () =>
+          element.classList.contains('i-amphtml-hydrated')
+        );
+        const impl = yield element.getImpl();
+
+        // Give event listeners in hydration a moment to attach.
+        yield browser.wait(100);
+
+        env.sandbox
+          .stub(impl.getUserActivation(), 'isActive')
+          .callsFake(() => false);
+        browser.click('button#hello');
+
+        // Give mutations time to apply.
+        yield browser.wait(100);
+        yield poll('terminated', () => {
+          return element.classList.contains('i-amphtml-broken');
         });
-
-        it('should terminate without gesture', function* () {
-          yield poll('<amp-script> to be hydrated', () =>
-            element.classList.contains('i-amphtml-hydrated')
-          );
-          const impl = yield element.getImpl();
-
-          // Give event listeners in hydration a moment to attach.
-          yield browser.wait(100);
-
-          env.sandbox
-            .stub(impl.getUserActivation(), 'isActive')
-            .callsFake(() => false);
-          browser.click('button#hello');
-
-          // Give mutations time to apply.
-          yield browser.wait(100);
-          yield poll('terminated', () => {
-            return element.classList.contains('i-amphtml-broken');
-          });
-        });
-
-        it('should start long task', function* () {
-          yield poll('<amp-script> to be hydrated', () =>
-            element.classList.contains('i-amphtml-hydrated')
-          );
-          const impl = yield element.getImpl();
-
-          // Give event listeners in hydration a moment to attach.
-          yield browser.wait(100);
-
-          env.sandbox
-            .stub(impl.getUserActivation(), 'isActive')
-            .callsFake(() => true);
-          // TODO(dvoytenko): Find a way to test this with the race condition when
-          // the resource is fetched before the first polling iteration.
-          const stub = env.sandbox.stub(
-            impl.getUserActivation(),
-            'expandLongTask'
-          );
-          browser.click('button#long');
-          yield poll('long task started', () => {
-            return stub.callCount > 0;
-          });
+      });
+
+      it('should start long task', function* () {
+        yield poll('<amp-script> to be hydrated', () =>
+          element.classList.contains('i-amphtml-hydrated')
+        );
+        const impl = yield element.getImpl();
+
+        // Give event listeners in hydration a moment to attach.
+        yield browser.wait(100);
+
+        env.sandbox
+          .stub(impl.getUserActivation(), 'isActive')
+          .callsFake(() => true);
+        // TODO(dvoytenko): Find a way to test this with the race condition when
+        // the resource is fetched before the first polling iteration.
+        const stub = env.sandbox.stub(
+          impl.getUserActivation(),
+          'expandLongTask'
+        );
+        browser.click('button#long');
+        yield poll('long task started', () => {
+          return stub.callCount > 0;
         });
-      }
-    );
-
-    describes.integration(
-      'sanitizer',
-      {
-        body: `
+      });
+    }
+  );
+
+  describes.integration(
+    'sanitizer',
+    {
+      body: `
       <amp-script layout=container src="/examples/amp-script/amp-script-demo.js">
         <p>Number of mutations: <span id="mutationCount">0</span></p>
         <button id="script">Insert script</button>
         <button id="img">Insert img</button>
       </amp-script>
     `,
-        extensions: ['amp-script'],
-      },
-      (env) => {
-        beforeEach(() => {
-          browser = new BrowserController(env.win);
-          doc = env.win.document;
-          element = doc.querySelector('amp-script');
+      extensions: ['amp-script'],
+    },
+    (env) => {
+      beforeEach(() => {
+        browser = new BrowserController(env.win);
+        doc = env.win.document;
+        element = doc.querySelector('amp-script');
+      });
+
+      it('should sanitize <script> injection', function* () {
+        yield poll('<amp-script> to be hydrated', () =>
+          element.classList.contains('i-amphtml-hydrated')
+        );
+        const impl = yield element.getImpl();
+
+        // Give event listeners in hydration a moment to attach.
+        yield browser.wait(100);
+
+        env.sandbox
+          .stub(impl.getUserActivation(), 'isActive')
+          .callsFake(() => true);
+        browser.click('button#script');
+
+        yield poll('mutations applied', () => {
+          const mc = doc.querySelector('#mutationCount');
+          return mc && mc.textContent == '1';
         });
 
-        it('should sanitize <script> injection', function* () {
-          yield poll('<amp-script> to be hydrated', () =>
-            element.classList.contains('i-amphtml-hydrated')
-          );
-          const impl = yield element.getImpl();
+        const scripts = element.querySelectorAll('script');
+        expect(scripts.length).to.equal(0);
+      });
 
-          // Give event listeners in hydration a moment to attach.
-          yield browser.wait(100);
+      it('should sanitize <img> injection', function* () {
+        yield poll('<amp-script> to be hydrated', () =>
+          element.classList.contains('i-amphtml-hydrated')
+        );
+        const impl = yield element.getImpl();
 
-          env.sandbox
-            .stub(impl.getUserActivation(), 'isActive')
-            .callsFake(() => true);
-          browser.click('button#script');
+        // Give event listeners in hydration a moment to attach.
+        yield browser.wait(100);
 
-          yield poll('mutations applied', () => {
-            const mc = doc.querySelector('#mutationCount');
-            return mc && mc.textContent == '1';
-          });
+        env.sandbox
+          .stub(impl.getUserActivation(), 'isActive')
+          .callsFake(() => true);
+        browser.click('button#img');
 
-          const scripts = element.querySelectorAll('script');
-          expect(scripts.length).to.equal(0);
+        yield poll('mutations applied', () => {
+          const mc = doc.querySelector('#mutationCount');
+          return mc && mc.textContent == '1';
         });
 
-        it('should sanitize <img> injection', function* () {
-          yield poll('<amp-script> to be hydrated', () =>
-            element.classList.contains('i-amphtml-hydrated')
-          );
-          const impl = yield element.getImpl();
-
-          // Give event listeners in hydration a moment to attach.
-          yield browser.wait(100);
-
-          env.sandbox
-            .stub(impl.getUserActivation(), 'isActive')
-            .callsFake(() => true);
-          browser.click('button#img');
-
-          yield poll('mutations applied', () => {
-            const mc = doc.querySelector('#mutationCount');
-            return mc && mc.textContent == '1';
-          });
-
-          const scripts = element.querySelectorAll('img');
-          expect(scripts.length).to.equal(0);
-        });
-      }
-    );
-
-    describes.integration(
-      'sandboxed',
-      {
-        body: `<amp-script sandboxed src="/examples/amp-script/export-functions.js"></amp-script>`,
-        extensions: ['amp-script'],
-      },
-      (env) => {
-        beforeEach(() => {
-          browser = new BrowserController(env.win);
-          doc = env.win.document;
-          element = doc.querySelector('amp-script');
-        });
-
-        it('should let you call functions on it', async () => {
-          const impl = await element.getImpl(true);
-          const result = await impl.callFunction('getData');
-          expect(result).deep.equal({data: true});
-        });
-      }
-    );
-
-    describes.integration(
-      'defined-layout',
-      {
-        body: `
+        const scripts = element.querySelectorAll('img');
+        expect(scripts.length).to.equal(0);
+      });
+    }
+  );
+
+  describes.integration(
+    'sandboxed',
+    {
+      body: `<amp-script sandboxed src="/examples/amp-script/export-functions.js"></amp-script>`,
+      extensions: ['amp-script'],
+    },
+    (env) => {
+      beforeEach(() => {
+        browser = new BrowserController(env.win);
+        doc = env.win.document;
+        element = doc.querySelector('amp-script');
+      });
+
+      it('should let you call functions on it', async () => {
+        const impl = await element.getImpl(true);
+        const result = await impl.callFunction('getData');
+        expect(result).deep.equal({data: true});
+      });
+    }
+  );
+
+  describes.integration(
+    'defined-layout',
+    {
+      body: `
       <amp-script layout=fixed width=300 height=200
           src="/examples/amp-script/amp-script-demo.js">
         <button id="hello">Insert</button>
       </amp-script>
     `,
-        extensions: ['amp-script'],
-      },
-      (env) => {
-        beforeEach(() => {
-          browser = new BrowserController(env.win);
-          doc = env.win.document;
-          element = doc.querySelector('amp-script');
-        });
-
-        it('should allow mutation without gesture', function* () {
-          yield poll('<amp-script> to be hydrated', () =>
-            element.classList.contains('i-amphtml-hydrated')
-          );
-          const impl = yield element.getImpl();
-
-          // Give event listeners in hydration a moment to attach.
-          yield browser.wait(100);
-
-          env.sandbox
-            .stub(impl.getUserActivation(), 'isActive')
-            .callsFake(() => false);
-          browser.click('button#hello');
-          yield poll('mutations applied', () => {
-            const h1 = doc.querySelector('h1');
-            return h1 && h1.textContent == 'Hello World!';
-          });
+      extensions: ['amp-script'],
+    },
+    (env) => {
+      beforeEach(() => {
+        browser = new BrowserController(env.win);
+        doc = env.win.document;
+        element = doc.querySelector('amp-script');
+      });
+
+      it('should allow mutation without gesture', function* () {
+        yield poll('<amp-script> to be hydrated', () =>
+          element.classList.contains('i-amphtml-hydrated')
+        );
+        const impl = yield element.getImpl();
+
+        // Give event listeners in hydration a moment to attach.
+        yield browser.wait(100);
+
+        env.sandbox
+          .stub(impl.getUserActivation(), 'isActive')
+          .callsFake(() => false);
+        browser.click('button#hello');
+        yield poll('mutations applied', () => {
+          const h1 = doc.querySelector('h1');
+          return h1 && h1.textContent == 'Hello World!';
         });
-      }
-    );
-  });
+      });
+    }
+  );
+});
diff --git a/extensions/amp-script/0.1/test/unit/test-amp-script.js b/extensions/amp-script/0.1/test/unit/test-amp-script.js
index afecae9668b3..1838b0c3cf0d 100644
--- a/extensions/amp-script/0.1/test/unit/test-amp-script.js
+++ b/extensions/amp-script/0.1/test/unit/test-amp-script.js
@@ -146,7 +146,7 @@ describes.fakeWin('AmpScript', {amp: {runtimeOn: false}}, (env) => {
     expect(service.checkSha384).not.to.be.called;
   });
 
-  it('callFunction waits for initialization to complete before returning', async () => {
+  it('should wait for initialization to complete before proxying callFunction', async () => {
     element.setAttribute('script', 'local-script');
     script.workerDom_ = {callFunction: env.sandbox.spy()};
 
@@ -157,7 +157,16 @@ describes.fakeWin('AmpScript', {amp: {runtimeOn: false}}, (env) => {
     expect(script.workerDom_.callFunction).calledWithExactly('fetchData', true);
   });
 
-  describe('Initialization skipped warning due to zero height/width', () => {
+  it('should reject when callFunction on amp-script which failed to initialize', async () => {
+    element.setAttribute('script', 'local-script');
+    script.workerDom_ = null;
+    script.initialize_.resolve();
+
+    const result = script.callFunction('fetchData', true);
+    await expect(result).eventually.rejectedWith('failed initialization.');
+  });
+
+  describe('Initialization skipped warning due to zero size', () => {
     it('should not warn when there is positive width/height', () => {
       const warnStub = env.sandbox.stub(user(), 'warn');
       env.sandbox.stub(script, 'getLayoutSize').returns({height: 1, width: 1});
@@ -165,14 +174,16 @@ describes.fakeWin('AmpScript', {amp: {runtimeOn: false}}, (env) => {
       expect(warnStub).to.have.callCount(0);
     });
 
-    it('should warn if there is zero width/height', () => {
+    it('should warn if there is zero size', () => {
       const warnStub = env.sandbox.stub(user(), 'warn');
-      env.sandbox.stub(script, 'getLayoutSize').returns({height: 0, width: 0});
+      env.sandbox
+        .stub(script, 'getLayoutSize')
+        .returns({height: 100, width: 0});
       script.onLayoutMeasure();
 
       expect(warnStub).calledWith(
         'amp-script',
-        'Skipped initializing amp-script due to zero width and height.',
+        'Skipped initializing amp-script due to zero width or height.',
         script.element
       );
       expect(warnStub).to.have.callCount(1);
diff --git a/extensions/amp-script/0.1/test/unit/test-user-activation-tracker.js b/extensions/amp-script/0.1/test/unit/test-user-activation-tracker.js
index 280865b09680..363ea20c58e6 100644
--- a/extensions/amp-script/0.1/test/unit/test-user-activation-tracker.js
+++ b/extensions/amp-script/0.1/test/unit/test-user-activation-tracker.js
@@ -1,5 +1,7 @@
 import {htmlFor} from '#core/dom/static-template';
 
+import {macroTask} from '#testing/helpers';
+
 import {
   ACTIVATION_TIMEOUT,
   UserActivationTracker,
@@ -24,12 +26,6 @@ describes.realWin('UserActivationTracker', {}, (env) => {
     clock.tick(1);
   });
 
-  function microTask() {
-    return new Promise((resolve) => {
-      win.setTimeout(resolve, 0);
-    });
-  }
-
   it('should start as inactive', () => {
     expect(tracker.hasBeenActive()).to.be.false;
     expect(tracker.isActive()).to.be.false;
@@ -84,7 +80,7 @@ describes.realWin('UserActivationTracker', {}, (env) => {
       return promise
         .then(() => {
           // Skip microtask.
-          return microTask();
+          return macroTask(win.setTimeout);
         })
         .then(() => {
           // The gesture window is expanded for an extra window.
@@ -118,7 +114,7 @@ describes.realWin('UserActivationTracker', {}, (env) => {
         .catch(() => {})
         .then(() => {
           // Skip microtask.
-          return microTask();
+          return macroTask(win.setTimeout);
         })
         .then(() => {
           // The gesture window is expanded for an extra window.
diff --git a/extensions/amp-script/0.1/test/validator-amp-script.out b/extensions/amp-script/0.1/test/validator-amp-script.out
index de83953d27c2..6e73e92ed675 100644
--- a/extensions/amp-script/0.1/test/validator-amp-script.out
+++ b/extensions/amp-script/0.1/test/validator-amp-script.out
@@ -110,7 +110,7 @@ amp-script/0.1/test/validator-amp-script.html:83:2 The attribute 'data-ampdevmod
 |    <!-- Invalid: Local script without 'target' or 'id' attributes. -->
 |    <script type=text/plain>
 >>   ^~~~~~~~~
-amp-script/0.1/test/validator-amp-script.html:86:2 Custom JavaScript is not allowed. (see https://amp.dev/documentation/guides-and-tutorials/learn/validation-workflow/validation_errors/#custom-javascript-is-not-allowed)
+amp-script/0.1/test/validator-amp-script.html:86:2 The parent tag of tag 'amphtml engine script' is 'body', but it can only be 'head'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#required-markup)
 |      document.body.textContent = "Hello World!";
 |    </script>
 |
@@ -124,14 +124,14 @@ amp-script/0.1/test/validator-amp-script.html:91:2 The attribute 'type' in tag '
 |    <!-- Invalid: Local script with invalid 'target'. -->
 |    <script type=text/plain target=amp-js id=hello>
 >>   ^~~~~~~~~
-amp-script/0.1/test/validator-amp-script.html:96:2 Custom JavaScript is not allowed. (see https://amp.dev/documentation/guides-and-tutorials/learn/validation-workflow/validation_errors/#custom-javascript-is-not-allowed)
+amp-script/0.1/test/validator-amp-script.html:96:2 The parent tag of tag 'amphtml engine script' is 'body', but it can only be 'head'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#required-markup)
 |      document.body.textContent = "Hello World!";
 |    </script>
 |
 |    <!-- Invalid: Local script without 'target' attribute. -->
 |    <script type=text/plain id=hello>
 >>   ^~~~~~~~~
-amp-script/0.1/test/validator-amp-script.html:101:2 Custom JavaScript is not allowed. (see https://amp.dev/documentation/guides-and-tutorials/learn/validation-workflow/validation_errors/#custom-javascript-is-not-allowed)
+amp-script/0.1/test/validator-amp-script.html:101:2 The parent tag of tag 'amphtml engine script' is 'body', but it can only be 'head'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#required-markup)
 |      document.body.textContent = "Hello World!";
 |    </script>
 |
diff --git a/extensions/amp-script/amp-script.md b/extensions/amp-script/amp-script.md
index 8559c4c48ace..d74e72e0daa3 100644
--- a/extensions/amp-script/amp-script.md
+++ b/extensions/amp-script/amp-script.md
@@ -153,7 +153,7 @@ You can use `amp-script` to add an `amp-img` or `amp-layout` component to the DO
 
 `amp-script` supports getting and setting [`amp-state`](https://amp.dev/documentation/components/amp-bind/#defining-and-initializing-state-with-<amp-state>) JSON. This lets `amp-script` interact with other AMP elements on the page via [`amp-bind` bindings](https://amp.dev/documentation/components/amp-bind/#bindings).
 
-If you invoke `AMP.setState()` from `amp-script` after a user gesture, bindings can cause mutations to the DOM. Otherwise, state will be set, but binding will not occur (similar to [`amp-state` initialization](https://amp.dev/documentation/examples/components/amp-bind/?referrer=ampbyexample.com#initializing-state)). For more information, see [the section on user gestures](#user-gestures).
+If you invoke `AMP.setState()` from `amp-script` after a user gesture, bindings can cause mutations to the DOM. Otherwise, state will be set, but binding will not occur (similar to [`amp-state` initialization](https://amp.dev/documentation/examples/components/amp-bind/)). For more information, see [the section on user gestures](#user-gestures).
 
 `AMP.setState()` works as described in the [`<amp-bind>` documentation](<https://amp.dev/documentation/components/amp-bind/#updating-state-variables-with-amp.setstate()>), merging an object literal into the specified state. This example shows how it can affect the DOM:
 
@@ -242,6 +242,7 @@ In order to maintain AMP's guarantees of performance and layout stability, `amp-
 
 -   Each inline script can contain up to 10,000 bytes
 -   The scripts on a page can contain a total of up to 150,000 bytes
+-   The scripts running in sandboxed mode on a page can contain a total of up to 300,000 bytes
 
 ### User gestures
 
@@ -411,6 +412,12 @@ If you don't publish signed exchanges, `max-age` does nothing.
 
 The optional `nodom` attribute optimizes `<amp-script>` for use as a data-layer rather than as a UI layer. It removes the ability for the `<amp-script>` to make DOM modifications, in favor of a signficantly smaller bundle size and therefore better performance. It also automatically hides the `<amp-script>`, so you may omit the height and width attributes.
 
+### sandboxed
+
+Note: Not to be confused with the **sandbox** attribute.
+
+If set, this will signal that worker-dom should activate sandboxed mode. In this mode the Worker lives in its own crossorigin iframe, creating a strong security boundary. It also forces **nodom** mode. Because of the strong security boundary, sandboxed scripts do not need to provide a script hash.
+
 ### common attributes
 
 This element includes [common attributes](https://amp.dev/documentation/guides-and-tutorials/learn/common_attributes) extended to AMP components.
@@ -425,7 +432,9 @@ No inline script can exceed 10,000 bytes. See [Size of JavaScript code](#size-of
 
 **Maximum total script size exceeded (...)**
 
-The total of all scripts used by a page cannot exceed 150,000 bytes. See [Size of JavaScript code](#size-of-javascript-code) above.
+The total of all non-sandboxed scripts used by a page cannot exceed 150,000 bytes. See [Size of JavaScript code](#size-of-javascript-code) above.
+
+The total of all sandboxed scripts (see [Sandboxed Mode](#sandboxed)) used by a page cannot exceed 300,000 bytes. See [Size of JavaScript code](#size-of-javascript-code) above.
 
 **Script hash not found.**
 
@@ -435,6 +444,8 @@ For local scripts and cross-origin scripts, you need to add a [script hash](#cal
 
 Again, you need the [script hash](#calculating-the-script-hash). Simply copy the value in this error into your `<meta>` tag.
 
+**JavaScript script hash requirements are disabled in sandboxed mode.**
+
 **JavaScript size and script hash requirements are disabled in development mode.**
 
 If your `<amp-script>` includes the `data-ampdevmode` attribute, AMP won't check your [script hash](#calculating-the-script-hash) or the size of your code.
diff --git a/extensions/amp-selector/0.1/amp-selector.js b/extensions/amp-selector/0.1/amp-selector.js
index 547ea678b321..2de7eb3990b9 100644
--- a/extensions/amp-selector/0.1/amp-selector.js
+++ b/extensions/amp-selector/0.1/amp-selector.js
@@ -1,12 +1,11 @@
-import {ActionTrust} from '#core/constants/action-constants';
-import {AmpEvents} from '#core/constants/amp-events';
-import {Keys} from '#core/constants/key-codes';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
+import {Keys_Enum} from '#core/constants/key-codes';
 import {isRTL, tryFocus} from '#core/dom';
 import {closestAncestorElementBySelector} from '#core/dom/query';
 import {mod} from '#core/math';
 import {isEnumValue} from '#core/types';
 import {areEqualOrdered, toArray} from '#core/types/array';
-import {dict} from '#core/types/object';
 
 import {Services} from '#service';
 
@@ -29,7 +28,7 @@ const KEYBOARD_SELECT_MODES = {
 };
 
 export class AmpSelector extends AMP.BaseElement {
-  /** @override @nocollapse */
+  /** @override  */
   static prerenderAllowed() {
     return true;
   }
@@ -118,7 +117,7 @@ export class AmpSelector extends AMP.BaseElement {
         const delta = args && args['delta'] !== undefined ? -args['delta'] : -1;
         this.select_(delta, trust);
       },
-      ActionTrust.LOW
+      ActionTrust_Enum.LOW
     );
 
     this.registerAction(
@@ -128,7 +127,7 @@ export class AmpSelector extends AMP.BaseElement {
         const delta = args && args['delta'] !== undefined ? args['delta'] : 1;
         this.select_(delta, trust);
       },
-      ActionTrust.LOW
+      ActionTrust_Enum.LOW
     );
 
     this.registerAction(
@@ -147,7 +146,7 @@ export class AmpSelector extends AMP.BaseElement {
           return Promise.reject("'index' must be specified");
         }
       },
-      ActionTrust.LOW
+      ActionTrust_Enum.LOW
     );
 
     /** If the element is in an `email` document, allow its `clear`,
@@ -160,7 +159,7 @@ export class AmpSelector extends AMP.BaseElement {
 
     // Triggers on DOM children updates
     this.element.addEventListener(
-      AmpEvents.DOM_UPDATE,
+      AmpEvents_Enum.DOM_UPDATE,
       this.maybeRefreshOnUpdate_.bind(this)
     );
   }
@@ -364,7 +363,7 @@ export class AmpSelector extends AMP.BaseElement {
       // Newly picked option should always have focus.
       this.updateFocus_(el);
       // User gesture trigger is "high" trust.
-      this.fireSelectEvent_(el, ActionTrust.HIGH);
+      this.fireSelectEvent_(el, ActionTrust_Enum.HIGH);
     });
   }
 
@@ -401,7 +400,7 @@ export class AmpSelector extends AMP.BaseElement {
    * Handles toggle action.
    * @param {number} index
    * @param {boolean|undefined} value
-   * @param {!ActionTrust} trust
+   * @param {!ActionTrust_Enum} trust
    * @return {!Promise}
    * @private
    */
@@ -439,26 +438,22 @@ export class AmpSelector extends AMP.BaseElement {
    * 'targetOption' - option value of the selected or deselected element.
    * 'selectedOptions' - array of option values of selected elements.
    * @param {!Element} el The element that was selected or deslected.
-   * @param {!ActionTrust} trust
+   * @param {!ActionTrust_Enum} trust
    * @private
    */
   fireSelectEvent_(el, trust) {
     const name = 'select';
-    const selectEvent = createCustomEvent(
-      this.win,
-      `amp-selector.${name}`,
-      dict({
-        'targetOption': el.getAttribute('option'),
-        'selectedOptions': this.selectedOptions_(),
-      })
-    );
+    const selectEvent = createCustomEvent(this.win, `amp-selector.${name}`, {
+      'targetOption': el.getAttribute('option'),
+      'selectedOptions': this.selectedOptions_(),
+    });
     this.action_.trigger(this.element, name, selectEvent, trust);
   }
 
   /**
    * Handles selectUp events.
    * @param {number} delta
-   * @param {!ActionTrust} trust
+   * @param {!ActionTrust_Enum} trust
    * @private
    */
   select_(delta, trust) {
@@ -498,18 +493,18 @@ export class AmpSelector extends AMP.BaseElement {
     }
     const {key} = event;
     switch (key) {
-      case Keys.LEFT_ARROW: /* fallthrough */
-      case Keys.UP_ARROW: /* fallthrough */
-      case Keys.RIGHT_ARROW: /* fallthrough */
-      case Keys.DOWN_ARROW: /* fallthrough */
-      case Keys.HOME: /* fallthrough */
-      case Keys.END:
+      case Keys_Enum.LEFT_ARROW: /* fallthrough */
+      case Keys_Enum.UP_ARROW: /* fallthrough */
+      case Keys_Enum.RIGHT_ARROW: /* fallthrough */
+      case Keys_Enum.DOWN_ARROW: /* fallthrough */
+      case Keys_Enum.HOME: /* fallthrough */
+      case Keys_Enum.END:
         if (this.kbSelectMode_ != KEYBOARD_SELECT_MODES.NONE) {
           return this.navigationKeyDownHandler_(event);
         }
         return Promise.resolve();
-      case Keys.ENTER: /* fallthrough */
-      case Keys.SPACE:
+      case Keys_Enum.ENTER: /* fallthrough */
+      case Keys_Enum.SPACE:
         this.selectionKeyDownHandler_(event);
         return Promise.resolve();
     }
@@ -527,27 +522,27 @@ export class AmpSelector extends AMP.BaseElement {
     const doc = this.win.document;
     let dir = 0;
     switch (event.key) {
-      case Keys.LEFT_ARROW:
+      case Keys_Enum.LEFT_ARROW:
         // Left is considered 'previous' in LTR and 'next' in RTL.
         dir = isRTL(doc) ? 1 : -1;
         break;
-      case Keys.UP_ARROW:
+      case Keys_Enum.UP_ARROW:
         // Up is considered 'previous' in both LTR and RTL.
         dir = -1;
         break;
-      case Keys.RIGHT_ARROW:
+      case Keys_Enum.RIGHT_ARROW:
         // Right is considered 'next' in LTR and 'previous' in RTL.
         dir = isRTL(doc) ? -1 : 1;
         break;
-      case Keys.DOWN_ARROW:
+      case Keys_Enum.DOWN_ARROW:
         // Down is considered 'next' in both LTR and RTL.
         dir = 1;
         break;
-      case Keys.HOME:
+      case Keys_Enum.HOME:
         // Home looks for first nonhidden element, in 'next' direction.
         dir = 1;
         break;
-      case Keys.END:
+      case Keys_Enum.END:
         // End looks for last nonhidden element, in 'previous' direction.
         dir = -1;
         break;
@@ -564,10 +559,10 @@ export class AmpSelector extends AMP.BaseElement {
 
       // For Home/End keys, start at end/beginning respectively and wrap around
       switch (event.key) {
-        case Keys.HOME:
+        case Keys_Enum.HOME:
           this.focusedIndex_ = this.elements_.length - 1;
           break;
-        case Keys.END:
+        case Keys_Enum.END:
           this.focusedIndex_ = 0;
           break;
       }
@@ -607,7 +602,7 @@ export class AmpSelector extends AMP.BaseElement {
    */
   selectionKeyDownHandler_(event) {
     const {key} = event;
-    if (key == Keys.SPACE || key == Keys.ENTER) {
+    if (key == Keys_Enum.SPACE || key == Keys_Enum.ENTER) {
       if (this.elements_.includes(dev().assertElement(event.target))) {
         event.preventDefault();
         const el = dev().assertElement(event.target);
diff --git a/extensions/amp-selector/0.1/test/test-amp-selector.js b/extensions/amp-selector/0.1/test/test-amp-selector.js
index 1ba45e6e506b..c18e379e15b1 100644
--- a/extensions/amp-selector/0.1/test/test-amp-selector.js
+++ b/extensions/amp-selector/0.1/test/test-amp-selector.js
@@ -1,6 +1,6 @@
-import {ActionTrust} from '#core/constants/action-constants';
-import {AmpEvents} from '#core/constants/amp-events';
-import {Keys} from '#core/constants/key-codes';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
+import {Keys_Enum} from '#core/constants/key-codes';
 import {createElementWithAttributes} from '#core/dom';
 import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 
@@ -580,14 +580,14 @@ describes.realWin(
         let clearSelectionSpy = env.sandbox.spy(impl, 'clearSelection_');
         let setSelectionSpy = env.sandbox.spy(impl, 'setSelection_');
 
-        await keyPress(ampSelector, Keys.ENTER, options[3]);
+        await keyPress(ampSelector, Keys_Enum.ENTER, options[3]);
         expect(options[3].hasAttribute('selected')).to.be.true;
         expect(setSelectionSpy).to.have.been.calledWith(options[3]);
         expect(clearSelectionSpy).to.have.been.calledWith(options[1]);
         expect(setSelectionSpy).to.have.been.calledOnce;
         expect(clearSelectionSpy).to.have.been.calledOnce;
 
-        await keyPress(ampSelector, Keys.ENTER, options[3]);
+        await keyPress(ampSelector, Keys_Enum.ENTER, options[3]);
         expect(setSelectionSpy).to.have.been.calledOnce;
         expect(clearSelectionSpy).to.have.been.calledOnce;
 
@@ -610,19 +610,19 @@ describes.realWin(
         clearSelectionSpy = env.sandbox.spy(impl, 'clearSelection_');
         setSelectionSpy = env.sandbox.spy(impl, 'setSelection_');
 
-        await keyPress(ampSelector, Keys.SPACE, options[4]);
+        await keyPress(ampSelector, Keys_Enum.SPACE, options[4]);
         expect(options[4].hasAttribute('selected')).to.be.true;
         expect(setSelectionSpy).to.have.been.calledWith(options[4]);
         expect(setSelectionSpy).to.have.been.calledOnce;
         expect(clearSelectionSpy).to.not.have.been.called;
 
-        await keyPress(ampSelector, Keys.SPACE, options[4]);
+        await keyPress(ampSelector, Keys_Enum.SPACE, options[4]);
         expect(options[4].hasAttribute('selected')).to.be.false;
         expect(clearSelectionSpy).to.have.been.calledWith(options[4]);
         expect(setSelectionSpy).to.have.been.calledOnce;
         expect(clearSelectionSpy).to.have.been.calledOnce;
 
-        await keyPress(ampSelector, Keys.ENTER, options[2]);
+        await keyPress(ampSelector, Keys_Enum.ENTER, options[2]);
         expect(options[2].hasAttribute('selected')).to.be.true;
         expect(setSelectionSpy).to.have.been.calledWith(options[2]);
         expect(setSelectionSpy).to.have.been.calledTwice;
@@ -645,7 +645,7 @@ describes.realWin(
         clearSelectionSpy = env.sandbox.spy(impl, 'clearSelection_');
         setSelectionSpy = env.sandbox.spy(impl, 'setSelection_');
 
-        await keyPress(ampSelector, Keys.SPACE, impl.element.children[0]);
+        await keyPress(ampSelector, Keys_Enum.SPACE, impl.element.children[0]);
         expect(setSelectionSpy).to.not.have.been.called;
         expect(clearSelectionSpy).to.not.have.been.called;
       });
@@ -845,7 +845,7 @@ describes.realWin(
         expect(event.detail).to.have.deep.property('selectedOptions', ['3']);
 
         const trust = triggerSpy.firstCall.args[3];
-        expect(trust).to.equal(ActionTrust.HIGH);
+        expect(trust).to.equal(ActionTrust_Enum.HIGH);
       });
 
       it('should trigger "select" event when an item is toggled', async () => {
@@ -913,7 +913,7 @@ describes.realWin(
         ]);
 
         const trust = triggerSpy.firstCall.args[3];
-        expect(trust).to.equal(ActionTrust.HIGH);
+        expect(trust).to.equal(ActionTrust_Enum.HIGH);
       });
 
       it(
@@ -1147,7 +1147,7 @@ describes.realWin(
           const impl = await ampSelector.getImpl(false);
           const spy = env.sandbox.spy(impl, 'navigationKeyDownHandler_');
           await ampSelector.buildInternal();
-          await keyPress(ampSelector, Keys.RIGHT_ARROW);
+          await keyPress(ampSelector, Keys_Enum.RIGHT_ARROW);
           expect(spy).to.not.have.been.called;
         });
 
@@ -1167,12 +1167,12 @@ describes.realWin(
             expect(ampSelector.children[0].tabIndex).to.equal(0);
             expect(ampSelector.children[1].tabIndex).to.equal(-1);
             expect(ampSelector.children[2].tabIndex).to.equal(-1);
-            return keyPress(ampSelector, Keys.LEFT_ARROW)
+            return keyPress(ampSelector, Keys_Enum.LEFT_ARROW)
               .then(() => {
                 expect(ampSelector.children[0].tabIndex).to.equal(-1);
                 expect(ampSelector.children[1].tabIndex).to.equal(-1);
                 expect(ampSelector.children[2].tabIndex).to.equal(0);
-                return keyPress(ampSelector, Keys.RIGHT_ARROW);
+                return keyPress(ampSelector, Keys_Enum.RIGHT_ARROW);
               })
               .then(() => {
                 expect(ampSelector.children[0].tabIndex).to.equal(0);
@@ -1200,7 +1200,7 @@ describes.realWin(
             expect(ampSelector.children[0].tabIndex).to.equal(-1);
             expect(ampSelector.children[1].tabIndex).to.equal(-1);
             expect(ampSelector.children[2].tabIndex).to.equal(0);
-            return keyPress(ampSelector, Keys.HOME).then(() => {
+            return keyPress(ampSelector, Keys_Enum.HOME).then(() => {
               expect(ampSelector.children[0].tabIndex).to.equal(-1);
               expect(ampSelector.children[1].tabIndex).to.equal(0);
               expect(ampSelector.children[2].tabIndex).to.equal(-1);
@@ -1225,7 +1225,7 @@ describes.realWin(
             expect(ampSelector.children[0].tabIndex).to.equal(0);
             expect(ampSelector.children[1].tabIndex).to.equal(-1);
             expect(ampSelector.children[2].tabIndex).to.equal(-1);
-            return keyPress(ampSelector, Keys.END).then(() => {
+            return keyPress(ampSelector, Keys_Enum.END).then(() => {
               expect(ampSelector.children[0].tabIndex).to.equal(-1);
               expect(ampSelector.children[1].tabIndex).to.equal(0);
               expect(ampSelector.children[2].tabIndex).to.equal(-1);
@@ -1293,7 +1293,7 @@ describes.realWin(
           expect(ampSelector.children[0].hasAttribute('selected')).to.be.false;
           expect(ampSelector.children[1].hasAttribute('selected')).to.be.false;
           expect(ampSelector.children[2].hasAttribute('selected')).to.be.false;
-          return keyPress(ampSelector, Keys.DOWN_ARROW)
+          return keyPress(ampSelector, Keys_Enum.DOWN_ARROW)
             .then(() => {
               expect(ampSelector.children[0].hasAttribute('selected')).to.be
                 .false;
@@ -1301,7 +1301,7 @@ describes.realWin(
                 .true;
               expect(ampSelector.children[2].hasAttribute('selected')).to.be
                 .false;
-              return keyPress(ampSelector, Keys.UP_ARROW);
+              return keyPress(ampSelector, Keys_Enum.UP_ARROW);
             })
             .then(() => {
               expect(ampSelector.children[0].hasAttribute('selected')).to.be
@@ -1398,13 +1398,15 @@ describes.realWin(
           expect(ampSelector.children[2].tabIndex).to.equal(-1);
 
           // Note that the newly added third child is ignored.
-          keyPress(ampSelector, Keys.LEFT_ARROW)
+          keyPress(ampSelector, Keys_Enum.LEFT_ARROW)
             .then(() => {
               expect(ampSelector.children[0].tabIndex).to.equal(-1);
               expect(ampSelector.children[1].tabIndex).to.equal(0);
               expect(ampSelector.children[2].tabIndex).to.equal(-1);
 
-              const e = new CustomEvent(AmpEvents.DOM_UPDATE, {bubbles: true});
+              const e = new CustomEvent(AmpEvents_Enum.DOM_UPDATE, {
+                bubbles: true,
+              });
               newChild.dispatchEvent(e);
 
               // `newChild` should be focused since it has the 'selected' attribute.
@@ -1413,14 +1415,14 @@ describes.realWin(
               expect(ampSelector.children[2].tabIndex).to.equal(0);
 
               // Tabbing between children now works for `newChild`.
-              return keyPress(ampSelector, Keys.LEFT_ARROW);
+              return keyPress(ampSelector, Keys_Enum.LEFT_ARROW);
             })
             .then(() => {
               expect(ampSelector.children[0].tabIndex).to.equal(-1);
               expect(ampSelector.children[1].tabIndex).to.equal(0);
               expect(ampSelector.children[2].tabIndex).to.equal(-1);
 
-              return keyPress(ampSelector, Keys.RIGHT_ARROW);
+              return keyPress(ampSelector, Keys_Enum.RIGHT_ARROW);
             })
             .then(() => {
               expect(ampSelector.children[0].tabIndex).to.equal(-1);
@@ -1467,7 +1469,7 @@ describes.realWin(
           'source',
           'caller',
           'event',
-          ActionTrust.HIGH
+          ActionTrust_Enum.HIGH
         );
         expect(element.enqueAction).to.be.calledWith(
           env.sandbox.match({
@@ -1478,7 +1480,7 @@ describes.realWin(
             method,
             node: element,
             source: 'source',
-            trust: ActionTrust.HIGH,
+            trust: ActionTrust_Enum.HIGH,
           })
         );
       });
diff --git a/extensions/amp-selector/1.0/README.md b/extensions/amp-selector/1.0/README.md
index ee2796220a3d..2b177ec0c798 100644
--- a/extensions/amp-selector/1.0/README.md
+++ b/extensions/amp-selector/1.0/README.md
@@ -6,7 +6,7 @@ An input that presents any type of content as list of options. The contents of t
 
 You must include each Bento component's required CSS library before adding custom styles in order to guarantee proper loading. Or use the lightweight pre-uprgrade styles available inline. See [Layout and Style](#layout-and-style)
 
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/selector
@@ -17,37 +17,62 @@ import {defineElement as defineBentoSelector} from '@bentoproject/selector';
 defineBentoSelector();
 ```
 
-### Example: Include via `<script>`
+### Include via `<script>`
 
 ```html
-<head>
-  <script src="https://cdn.ampproject.org/bento.js"></script>
-  <!-- These styles prevent Cumulative Layout Shift on the unupgraded custom element -->
-  <style>
-    bento-selector {
-      display: block;
-    }
-  </style>
-  <script
-    async
-    src="https://cdn.ampproject.org/v0/bento-selector-1.0.js"
-  ></script>
-</head>
-<body>
-  <bento-selector class="sample-selector">
-    <ul>
-      <li option="1">Option 1</li>
-      <li option="2">Option 2</li>
-      <li option="3">Option 3</li>
-      <li option="4">Option 4</li>
-    </ul>
-  </bento-selector>
-</body>
+<script type="module" src="https://cdn.ampproject.org/bento.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/bento.js" crossorigin="anonymous"></script>
+<script type="module" src="https://cdn.ampproject.org/v0/bento-selector-1.0.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/v0/bento-selector-1.0.js" crossorigin="anonymous"></script>
+<link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-selector-1.0.css" crossorigin="anonymous">
+```
+
+### Example
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-selector-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-selector-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-selector-1.0.css"
+    />
+  </head>
+  <body>
+    <bento-selector class="sample-selector">
+      <ul>
+        <li option="1">Option 1</li>
+        <li option="2">Option 2</li>
+        <li option="3">Option 3</li>
+        <li option="4">Option 4</li>
+      </ul>
+    </bento-selector>
+  </body>
+</html>
 ```
 
 ### Usage notes
 
--   A `bento-selector` can contain any arbitrary HTML elements or AMP components (e.g., `bento-carousel`, etc.).
+-   A `bento-selector` can contain any arbitrary HTML elements or Bento components (e.g., `bento-carousel`, etc.).
 -   A `bento-selector` cannot contain any nested `bento-selector` controls.
 -   Selectable options can be set by adding the `option` attribute to the element and assigning a value to the attribute (e.g., `<li option="value"></li>`).
 -   Disabled options can be set by adding the `disabled` attribute to the element (e.g., `<li option="d" disabled></li>`).
@@ -130,9 +155,7 @@ The `bento-selector` API allows you to register and respond to the following eve
 
 #### select
 
-This event is triggered when the user selects an option.
-Multi-selectors and single-selectors fire this when selecting or unselecting options.
-Tapping disabled options does not trigger the `select` event.
+This event is triggered when the user selects an option. Multi-selectors and single-selectors fire this when selecting or unselecting options. Tapping disabled options does not trigger the `select` event.
 
 <ul>
   <li>
@@ -150,9 +173,7 @@ selector.addEventListener('select', (e) => console.log(e.data.targetOption));
 
 ## Preact/React Component
 
-The examples below demonstrate use of the `<BentoSelector>` as a functional component usable with the Preact or React libraries.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/selector
@@ -184,8 +205,7 @@ function App() {
 
 The `BentoSelector` component can be styled with standard CSS.
 
-The `width` and `height` of the `BentoSelector` may both be set in order to adjust the default size of the component.
-To ensure the component renders how you want it to, be sure to apply a size to the component. These can be applied inline:
+The `width` and `height` of the `BentoSelector` may both be set in order to adjust the default size of the component. To ensure the component renders how you want it to, be sure to apply a size to the component. These can be applied inline:
 
 ```jsx
 <BentoSelector style={{width: 100, height: 400}}>
@@ -288,8 +308,7 @@ ref.current.toggle('2', true); // Select the item with the attribute `option="2"
 
 #### onChange
 
-This event is triggered when a selector option is selected or deselected.
-The `onChange` prop gives you two key options:
+This event is triggered when a selector option is selected or deselected. The `onChange` prop gives you two key options:
 
 -   `option` which returns the value of the `option` prop of the `BentoSelectorOption` which was selected or deselected.
 -   `value` which returns an array of which `BentoSelectorOptions` are currently selected in the order they were selected.
diff --git a/extensions/amp-selector/1.0/amp-selector.js b/extensions/amp-selector/1.0/amp-selector.js
index ea3cbd7ad8e9..71adf148a935 100644
--- a/extensions/amp-selector/1.0/amp-selector.js
+++ b/extensions/amp-selector/1.0/amp-selector.js
@@ -1,9 +1,10 @@
-import {ActionTrust} from '#core/constants/action-constants';
-import {dict} from '#core/types/object';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
 import {getWin} from '#core/window';
 
 import {isExperimentOn} from '#experiments';
 
+import {AmpPreactBaseElement, setSuperClass} from '#preact/amp-base-element';
+
 import {Services} from '#service';
 
 import {createCustomEvent} from '#utils/event-helper';
@@ -16,13 +17,13 @@ import {CSS} from '../../../build/amp-selector-1.0.css';
 /** @const {string} */
 const TAG = 'amp-selector';
 
-class AmpSelector extends BaseElement {
+class AmpSelector extends setSuperClass(BaseElement, AmpPreactBaseElement) {
   /** @override */
   init() {
     // Set up API
     this.registerApiAction('clear', (api) => {
       api./*OK*/ clear();
-      this.mutateProps(dict({'value': []}));
+      this.mutateProps({'value': []});
     });
 
     this.registerApiAction('selectUp', (api, invocation) => {
@@ -60,7 +61,7 @@ class AmpSelector extends BaseElement {
       element,
       eventName,
       event,
-      ActionTrust.HIGH
+      ActionTrust_Enum.HIGH
     );
 
     super.triggerEvent(element, eventName, detail);
diff --git a/extensions/amp-selector/1.0/base-element.js b/extensions/amp-selector/1.0/base-element.js
index 0a15148a33d9..566d68021eea 100644
--- a/extensions/amp-selector/1.0/base-element.js
+++ b/extensions/amp-selector/1.0/base-element.js
@@ -6,11 +6,11 @@ import {
 } from '#core/dom';
 import {closestAncestorElementBySelector} from '#core/dom/query';
 import {toArray} from '#core/types/array';
-import {dict} from '#core/types/object';
 
 import * as Preact from '#preact';
 import {useCallback, useLayoutEffect, useRef} from '#preact';
 import {PreactBaseElement} from '#preact/base-element';
+import {tabindexFromProps} from '#preact/utils';
 
 import {BentoSelector, BentoSelectorOption} from './component';
 
@@ -40,30 +40,26 @@ export class BaseElement extends PreactBaseElement {
     // See https://github.com/ampproject/amp-react-prototype/issues/40.
     const onChangeHandler = (event) => {
       const {option, value} = event;
-      this.triggerEvent(
-        this.element,
-        'select',
-        dict({
-          'targetOption': option,
-          'selectedOptions': value,
-        })
-      );
+      this.triggerEvent(this.element, 'select', {
+        'targetOption': option,
+        'selectedOptions': value,
+      });
 
       this.isExpectedMutation = true;
-      this.mutateProps(dict({'value': value}));
+      this.mutateProps({'value': value});
     };
 
     // Return props
     const {children, options, value} = getOptions(element, mu);
     this.optionState = options;
-    return dict({
+    return {
       'as': SelectorShim,
       'shimDomElement': element,
       'children': children,
       'value': value,
       'options': options,
       'onChange': onChangeHandler,
-    });
+    };
   }
 }
 
@@ -90,7 +86,6 @@ function getOptions(element, mu) {
       const option = child.getAttribute('option') || index.toString();
       const selected = child.hasAttribute('selected');
       const disabled = child.hasAttribute('disabled');
-      const tabIndex = child.getAttribute('tabindex');
       const props = {
         as: OptionShim,
         option,
@@ -106,12 +101,16 @@ function getOptions(element, mu) {
           mu.takeRecords();
         },
         selected,
-        tabIndex,
       };
       if (selected) {
         value.push(option);
       }
-      const optionChild = <BentoSelectorOption {...props} />;
+      const optionChild = (
+        <BentoSelectorOption
+          {...props}
+          tabindex={child.getAttribute('tabindex')}
+        />
+      );
       options.push(option);
       children.push(optionChild);
     });
@@ -130,8 +129,9 @@ export function OptionShim({
   role = 'option',
   selected,
   shimDomElement,
-  tabIndex,
+  ...rest
 }) {
+  const tabindex = tabindexFromProps(rest);
   const syncEvent = useCallback(
     (type, handler) => {
       if (!handler) {
@@ -164,10 +164,10 @@ export function OptionShim({
   }, [shimDomElement, role]);
 
   useLayoutEffect(() => {
-    if (tabIndex != undefined) {
-      shimDomElement.tabIndex = tabIndex;
+    if (tabindex != undefined) {
+      shimDomElement.setAttribute('tabindex', tabindex);
     }
-  }, [shimDomElement, tabIndex]);
+  }, [shimDomElement, tabindex]);
 
   return <div></div>;
 }
@@ -185,9 +185,10 @@ function SelectorShim({
   onKeyDown,
   role = 'listbox',
   shimDomElement,
-  tabIndex,
   value,
+  ...rest
 }) {
+  const tabindex = tabindexFromProps(rest);
   const input = useRef(null);
   if (!input.current) {
     input.current = createElementWithAttributes(
@@ -241,10 +242,10 @@ function SelectorShim({
   }, [shimDomElement, role]);
 
   useLayoutEffect(() => {
-    if (tabIndex != undefined) {
-      shimDomElement.tabIndex = tabIndex;
+    if (tabindex != undefined) {
+      shimDomElement.setAttribute('tabindex', tabindex);
     }
-  }, [shimDomElement, tabIndex]);
+  }, [shimDomElement, tabindex]);
 
   return <div children={children} />;
 }
@@ -262,6 +263,6 @@ BaseElement['props'] = {
   'multiple': {attr: 'multiple', type: 'boolean'},
   'name': {attr: 'name'},
   'role': {attr: 'role'},
-  'tabIndex': {attr: 'tabindex'},
+  'tabindex': {attr: 'tabindex'},
   'keyboardSelectMode': {attr: 'keyboard-select-mode', media: true},
 };
diff --git a/extensions/amp-selector/1.0/component.js b/extensions/amp-selector/1.0/component.js
index a77ac3c311b0..c769fb5ffc62 100644
--- a/extensions/amp-selector/1.0/component.js
+++ b/extensions/amp-selector/1.0/component.js
@@ -1,6 +1,6 @@
 import objstr from 'obj-str';
 
-import {Keys} from '#core/constants/key-codes';
+import {Keys_Enum} from '#core/constants/key-codes';
 import {tryFocus} from '#core/dom';
 import {mod} from '#core/math';
 
@@ -16,6 +16,7 @@ import {
   useState,
 } from '#preact';
 import {forwardRef} from '#preact/compat';
+import {propName, tabindexFromProps} from '#preact/utils';
 
 import {useStyles} from './component.jss';
 
@@ -42,21 +43,24 @@ export const KEYBOARD_SELECT_MODE = {
 function SelectorWithRef(
   {
     as: Comp = 'div',
-    disabled,
+    children,
     defaultValue = [],
+    disabled,
     form,
     keyboardSelectMode = KEYBOARD_SELECT_MODE.NONE,
-    value,
     multiple,
     name,
     onChange,
     role = 'listbox',
-    tabIndex,
-    children,
+    value,
     ...rest
   },
   ref
 ) {
+  const tabindex = tabindexFromProps(
+    rest,
+    keyboardSelectMode === KEYBOARD_SELECT_MODE.SELECT ? 0 : -1
+  );
   const [selectedState, setSelectedState] = useState(value ?? defaultValue);
   const optionsRef = useRef([]);
   const focusRef = useRef({active: null, focusMap: {}});
@@ -108,8 +112,6 @@ function SelectorWithRef(
     }
   }, [onChange, multiple, selected]);
 
-  const clear = useCallback(() => setSelectedState([]), []);
-
   const toggle = useCallback(
     (option, select) => {
       const isSelected = selected.includes(option);
@@ -132,6 +134,13 @@ function SelectorWithRef(
     [onChange, setSelectedState, selectOption, selected]
   );
 
+  const clear = useCallback(() => {
+    setSelectedState([]);
+    if (onChange) {
+      onChange({value: [], option: value});
+    }
+  }, [setSelectedState, onChange, value]);
+
   /**
    * This method uses the given callback on the target index found by
    * modifying the given value state by the given delta.
@@ -211,12 +220,12 @@ function SelectorWithRef(
       const {key} = e;
       let dir;
       switch (key) {
-        case Keys.LEFT_ARROW: // Fallthrough.
-        case Keys.UP_ARROW:
+        case Keys_Enum.LEFT_ARROW: // Fallthrough.
+        case Keys_Enum.UP_ARROW:
           dir = -1;
           break;
-        case Keys.RIGHT_ARROW: // Fallthrough.
-        case Keys.DOWN_ARROW:
+        case Keys_Enum.RIGHT_ARROW: // Fallthrough.
+        case Keys_Enum.DOWN_ARROW:
           dir = 1;
           break;
         default:
@@ -244,9 +253,7 @@ function SelectorWithRef(
       multiple={multiple}
       name={name}
       onKeyDown={onKeyDown}
-      tabIndex={
-        tabIndex ?? keyboardSelectMode === KEYBOARD_SELECT_MODE.SELECT ? 0 : -1
-      }
+      tabindex={tabindex}
       value={selected}
     >
       <input hidden defaultValue={selected} name={name} form={form} />
@@ -267,13 +274,12 @@ export {BentoSelector};
  */
 export function BentoSelectorOption({
   as: Comp = 'div',
-  'class': className = '',
   disabled = false,
   focus: customFocus,
   index,
   option,
   role = 'option',
-  tabIndex,
+  [propName('class')]: className = '',
   ...rest
 }) {
   const classes = useStyles();
@@ -288,6 +294,11 @@ export function BentoSelectorOption({
     selected,
   } = useContext(SelectorContext);
 
+  const tabindex = tabindexFromProps(
+    rest,
+    keyboardSelectMode === KEYBOARD_SELECT_MODE.SELECT ? -1 : 0
+  );
+
   const focus = useCallback(() => {
     customFocus?.();
     if (ref.current) {
@@ -333,7 +344,7 @@ export function BentoSelectorOption({
 
   const onKeyDown = useCallback(
     (e) => {
-      if (e.key === Keys.ENTER || e.key === Keys.SPACE) {
+      if (e.key === Keys_Enum.ENTER || e.key === Keys_Enum.SPACE) {
         trySelect();
       }
     },
@@ -360,9 +371,7 @@ export function BentoSelectorOption({
       ref={ref}
       role={role}
       selected={isSelected}
-      tabIndex={
-        tabIndex ?? keyboardSelectMode === KEYBOARD_SELECT_MODE.SELECT ? -1 : 0
-      }
+      tabindex={tabindex}
       value={option}
     />
   );
diff --git a/extensions/amp-selector/1.0/example/index.html b/extensions/amp-selector/1.0/example/index.html
new file mode 100644
index 000000000000..838b4098f6cb
--- /dev/null
+++ b/extensions/amp-selector/1.0/example/index.html
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <title>Bento Selector</title>
+    <meta name="viewport" content="width=device-width" />
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      async
+      src="https://cdn.ampproject.org/v0/bento-selector-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-selector-1.0.css"
+    />
+    <style>
+      :root {
+        --space-1: 0.5rem; /* 8px */
+        --space-4: 2rem; /* 32px */
+      }
+      body {
+        font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
+          Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
+          'Segoe UI Symbol';
+        margin: 2rem;
+        background: #ecf1f3;
+      }
+      .image-selector {
+        display: grid;
+        grid-template-columns: 160px 160px;
+        grid-gap: 10px;
+        margin: 2rem 0;
+      }
+      .image-selector [option][selected] {
+        outline: 4px solid #269da3;
+      }
+      input[type='submit'] {
+        border: none;
+        padding: 1rem 2rem;
+        border-radius: 8px;
+        color: #269da3;
+        background: white;
+        font-size: 18px;
+        font-weight: bold;
+        margin-right: 1rem;
+      }
+    </style>
+  </head>
+  <body>
+    <form action="https://example.com" method="get">
+      <bento-selector class="image-selector" name="example-selector">
+        <img
+          src="https://picsum.photos/160/107?1"
+          width="160"
+          height="107"
+          alt="example image 1"
+          option="1"
+        />
+        <img
+          src="https://picsum.photos/160/107?2"
+          width="160"
+          height="107"
+          alt="example image 2"
+          disabled
+          option="2"
+        />
+        <img
+          src="https://picsum.photos/160/107?3"
+          width="160"
+          height="107"
+          alt="example image 3"
+          option="3"
+        />
+        <img
+          src="https://picsum.photos/160/107?4"
+          width="160"
+          height="107"
+          alt="example image 4"
+          option="4"
+        />
+      </bento-selector>
+      <input type="submit" value="Submit" />
+    </form>
+  </body>
+</html>
diff --git a/extensions/amp-selector/1.0/storybook/Basic.amp.js b/extensions/amp-selector/1.0/storybook/Basic.amp.js
index da5e61d69f4e..80ccaf0163a4 100644
--- a/extensions/amp-selector/1.0/storybook/Basic.amp.js
+++ b/extensions/amp-selector/1.0/storybook/Basic.amp.js
@@ -1,11 +1,10 @@
 import {withAmp} from '@ampproject/storybook-addon';
-import {select, withKnobs} from '@storybook/addon-knobs';
 
 import * as Preact from '#preact';
 
 export default {
   title: 'amp-selector-1_0',
-  decorators: [withKnobs, withAmp],
+  decorators: [withAmp],
 
   parameters: {
     extensions: [{name: 'amp-selector', version: '1.0'}],
@@ -55,8 +54,6 @@ export const WithAmpImg = () => {
   );
 };
 
-WithAmpImg.storyName = 'with <amp-img>';
-
 export const WithUl = () => {
   return (
     <amp-selector class="sample-selector" layout="container">
@@ -70,22 +67,15 @@ export const WithUl = () => {
   );
 };
 
-WithUl.storyName = 'with <ul>';
-
-export const Actions = () => {
-  const keyboardSelectMode = select(
-    'keyboard select mode',
-    ['none', 'focus', 'select'],
-    'focus'
-  );
+export const Actions = (args) => {
   return (
     <>
       <amp-selector
         id="actionsSample"
         layout="container"
         class="sample-selector"
-        keyboard-select-mode={keyboardSelectMode}
         multiple
+        {...args}
       >
         <ul>
           <li option="1" selected>
@@ -115,7 +105,14 @@ export const Actions = () => {
   );
 };
 
-Actions.storyName = 'actions';
+Actions.argTypes = {
+  'keyboard-select-mode': {
+    name: 'keyboard-select-mode',
+    defaultValue: 'select',
+    options: ['none', 'focus', 'select'],
+    control: {type: 'select'},
+  },
+};
 
 export const Responsive = () => {
   return (
@@ -129,5 +126,3 @@ export const Responsive = () => {
     </amp-selector>
   );
 };
-
-Responsive.storyName = 'responsive';
diff --git a/extensions/amp-selector/1.0/storybook/Basic.js b/extensions/amp-selector/1.0/storybook/Basic.js
index 5b14111be7fc..5654a447f9b5 100644
--- a/extensions/amp-selector/1.0/storybook/Basic.js
+++ b/extensions/amp-selector/1.0/storybook/Basic.js
@@ -1,13 +1,13 @@
-import {select, withKnobs} from '@storybook/addon-knobs';
-
 import * as Preact from '#preact';
-import {useState} from '#preact';
+import {useRef, useState} from '#preact';
+
+import '../component.jss';
 
 import {BentoSelector, BentoSelectorOption} from '../component';
+
 export default {
   title: 'Selector',
   component: BentoSelector,
-  decorators: [withKnobs],
 };
 
 const imgStyle = {
@@ -67,19 +67,14 @@ function SelectorWithActions(props) {
   );
 }
 
-export const actionsAndOrder = () => {
-  const keyboardSelectMode = select(
-    'keyboard select mode',
-    ['none', 'focus', 'select'],
-    'select'
-  );
+export const actionsAndOrder = (args) => {
   return (
     <form>
       <SelectorWithActions
-        keyboardSelectMode={keyboardSelectMode}
         multiple
         name="poll"
         aria-label="Image menu"
+        {...args}
       >
         <BentoSelectorOption
           as="img"
@@ -120,14 +115,28 @@ export const actionsAndOrder = () => {
   );
 };
 
-export const optionItems = () => {
+actionsAndOrder.argTypes = {
+  'keyboard-select-mode': {
+    name: 'keyboard-select-mode',
+    defaultValue: 'select',
+    options: ['none', 'focus', 'select'],
+    control: {type: 'select'},
+  },
+};
+
+export const OptionItems = () => {
+  const ref = useRef(null);
   return (
-    <BentoSelector aria-label="Option menu">
-      <BentoSelectorOption option="1">Option 1</BentoSelectorOption>
-      <BentoSelectorOption option="2">Option 2</BentoSelectorOption>
-      <BentoSelectorOption option="3">Option 3</BentoSelectorOption>
-      <BentoSelectorOption option="4">Option 4</BentoSelectorOption>
-    </BentoSelector>
+    <>
+      <button onClick={() => ref.current.toggle('1')}>toggle1</button>
+      <button onClick={() => ref.current.toggle('2')}>toggle2</button>
+      <BentoSelector ref={ref} aria-label="Option menu">
+        <BentoSelectorOption option="1">Option 1</BentoSelectorOption>
+        <BentoSelectorOption option="2">Option 2</BentoSelectorOption>
+        <BentoSelectorOption option="3">Option 3</BentoSelectorOption>
+        <BentoSelectorOption option="4">Option 4</BentoSelectorOption>
+      </BentoSelector>
+    </>
   );
 };
 
diff --git a/extensions/amp-selector/1.0/test/test-amp-selector.js b/extensions/amp-selector/1.0/test/test-amp-selector.js
index 0029c914c384..060bed48cdea 100644
--- a/extensions/amp-selector/1.0/test/test-amp-selector.js
+++ b/extensions/amp-selector/1.0/test/test-amp-selector.js
@@ -1,5 +1,5 @@
 import '../amp-selector';
-import {ActionTrust} from '#core/constants/action-constants';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
 import {htmlFor} from '#core/dom/static-template';
 
 import {toggleExperiment} from '#experiments';
@@ -149,7 +149,7 @@ describes.realWin(
         const source = null;
         const caller = null;
         const event = null;
-        const trust = ActionTrust.DEFAULT;
+        const trust = ActionTrust_Enum.DEFAULT;
         return new ActionInvocation(
           element,
           method,
diff --git a/extensions/amp-selector/1.0/test/test-component.js b/extensions/amp-selector/1.0/test/test-component.js
index 429df183b379..b3bd05891149 100644
--- a/extensions/amp-selector/1.0/test/test-component.js
+++ b/extensions/amp-selector/1.0/test/test-component.js
@@ -1,6 +1,6 @@
 import {mount} from 'enzyme';
 
-import {Keys} from '#core/constants/key-codes';
+import {Keys_Enum} from '#core/constants/key-codes';
 
 import * as Preact from '#preact';
 
@@ -538,70 +538,70 @@ describes.sandboxed('Selector preact component', {}, () => {
         expect(option1).to.not.have.attribute('selected');
         expect(option2).to.not.have.attribute('selected');
 
-        selector.simulate('keydown', {key: Keys.LEFT_ARROW});
+        selector.simulate('keydown', {key: Keys_Enum.LEFT_ARROW});
         expect(option0).to.not.have.attribute('selected');
         expect(option1).to.not.have.attribute('selected');
         expect(option2).to.not.have.attribute('selected');
 
-        selector.simulate('keydown', {key: Keys.RIGHT_ARROW});
+        selector.simulate('keydown', {key: Keys_Enum.RIGHT_ARROW});
         expect(option0).to.not.have.attribute('selected');
         expect(option1).to.not.have.attribute('selected');
         expect(option2).to.not.have.attribute('selected');
 
-        selector.simulate('keydown', {key: Keys.DOWN_ARROW});
+        selector.simulate('keydown', {key: Keys_Enum.DOWN_ARROW});
         expect(option0).to.not.have.attribute('selected');
         expect(option1).to.not.have.attribute('selected');
         expect(option2).to.not.have.attribute('selected');
 
-        selector.simulate('keydown', {key: Keys.UP_ARROW});
+        selector.simulate('keydown', {key: Keys_Enum.UP_ARROW});
         expect(option0).to.not.have.attribute('selected');
         expect(option1).to.not.have.attribute('selected');
         expect(option2).to.not.have.attribute('selected');
       });
 
       it('Enter to select', () => {
-        options.at(0).find('div').simulate('keydown', {key: Keys.ENTER});
+        options.at(0).find('div').simulate('keydown', {key: Keys_Enum.ENTER});
         expect(option0).to.have.attribute('selected');
         expect(option1).to.not.have.attribute('selected');
         expect(option2).to.not.have.attribute('selected');
 
         // Subsequent Enter will deselect.
-        options.at(0).find('div').simulate('keydown', {key: Keys.ENTER});
+        options.at(0).find('div').simulate('keydown', {key: Keys_Enum.ENTER});
         expect(option0).to.not.have.attribute('selected');
         expect(option1).to.not.have.attribute('selected');
         expect(option2).to.not.have.attribute('selected');
 
         // Select multiple options.
-        options.at(0).find('div').simulate('keydown', {key: Keys.ENTER});
+        options.at(0).find('div').simulate('keydown', {key: Keys_Enum.ENTER});
         expect(option0).to.have.attribute('selected');
         expect(option1).to.not.have.attribute('selected');
         expect(option2).to.not.have.attribute('selected');
 
-        options.at(1).find('div').simulate('keydown', {key: Keys.ENTER});
+        options.at(1).find('div').simulate('keydown', {key: Keys_Enum.ENTER});
         expect(option0).to.have.attribute('selected');
         expect(option1).to.have.attribute('selected');
         expect(option2).to.not.have.attribute('selected');
       });
 
       it('Space to select', () => {
-        options.at(1).find('div').simulate('keydown', {key: Keys.SPACE});
+        options.at(1).find('div').simulate('keydown', {key: Keys_Enum.SPACE});
         expect(option0).to.not.have.attribute('selected');
         expect(option1).to.have.attribute('selected');
         expect(option2).to.not.have.attribute('selected');
 
         // Subsequent Space will deselect.
-        options.at(1).find('div').simulate('keydown', {key: Keys.SPACE});
+        options.at(1).find('div').simulate('keydown', {key: Keys_Enum.SPACE});
         expect(option0).to.not.have.attribute('selected');
         expect(option1).to.not.have.attribute('selected');
         expect(option2).to.not.have.attribute('selected');
 
         // Select multiple options.
-        options.at(0).find('div').simulate('keydown', {key: Keys.SPACE});
+        options.at(0).find('div').simulate('keydown', {key: Keys_Enum.SPACE});
         expect(option0).to.have.attribute('selected');
         expect(option1).to.not.have.attribute('selected');
         expect(option2).to.not.have.attribute('selected');
 
-        options.at(1).find('div').simulate('keydown', {key: Keys.SPACE});
+        options.at(1).find('div').simulate('keydown', {key: Keys_Enum.SPACE});
         expect(option0).to.have.attribute('selected');
         expect(option1).to.have.attribute('selected');
         expect(option2).to.not.have.attribute('selected');
@@ -641,60 +641,60 @@ describes.sandboxed('Selector preact component', {}, () => {
         expect(option1).to.not.have.attribute('selected');
         expect(option2).to.not.have.attribute('selected');
 
-        selector.simulate('keydown', {key: Keys.LEFT_ARROW});
+        selector.simulate('keydown', {key: Keys_Enum.LEFT_ARROW});
         expect(option0).to.not.have.attribute('selected');
         expect(option1).to.not.have.attribute('selected');
         expect(option2).to.not.have.attribute('selected');
 
-        selector.simulate('keydown', {key: Keys.RIGHT_ARROW});
+        selector.simulate('keydown', {key: Keys_Enum.RIGHT_ARROW});
         expect(option0).to.not.have.attribute('selected');
         expect(option1).to.not.have.attribute('selected');
         expect(option2).to.not.have.attribute('selected');
 
-        selector.simulate('keydown', {key: Keys.DOWN_ARROW});
+        selector.simulate('keydown', {key: Keys_Enum.DOWN_ARROW});
         expect(option0).to.not.have.attribute('selected');
         expect(option1).to.not.have.attribute('selected');
         expect(option2).to.not.have.attribute('selected');
 
-        selector.simulate('keydown', {key: Keys.UP_ARROW});
+        selector.simulate('keydown', {key: Keys_Enum.UP_ARROW});
         expect(option0).to.not.have.attribute('selected');
         expect(option1).to.not.have.attribute('selected');
         expect(option2).to.not.have.attribute('selected');
       });
 
       it('Enter to select', () => {
-        options.at(0).find('div').simulate('keydown', {key: Keys.ENTER});
+        options.at(0).find('div').simulate('keydown', {key: Keys_Enum.ENTER});
         expect(option0).to.have.attribute('selected');
         expect(option1).to.not.have.attribute('selected');
         expect(option2).to.not.have.attribute('selected');
 
         // Subsequent Enter does nothing.
-        options.at(0).find('div').simulate('keydown', {key: Keys.ENTER});
+        options.at(0).find('div').simulate('keydown', {key: Keys_Enum.ENTER});
         expect(option0).to.have.attribute('selected');
         expect(option1).to.not.have.attribute('selected');
         expect(option2).to.not.have.attribute('selected');
 
         // Select new option deselects the first.
-        options.at(1).find('div').simulate('keydown', {key: Keys.ENTER});
+        options.at(1).find('div').simulate('keydown', {key: Keys_Enum.ENTER});
         expect(option0).to.not.have.attribute('selected');
         expect(option1).to.have.attribute('selected');
         expect(option2).to.not.have.attribute('selected');
       });
 
       it('Space to select', () => {
-        options.at(1).find('div').simulate('keydown', {key: Keys.SPACE});
+        options.at(1).find('div').simulate('keydown', {key: Keys_Enum.SPACE});
         expect(option0).to.not.have.attribute('selected');
         expect(option1).to.have.attribute('selected');
         expect(option2).to.not.have.attribute('selected');
 
         // Subsequent Space does nothing.
-        options.at(1).find('div').simulate('keydown', {key: Keys.SPACE});
+        options.at(1).find('div').simulate('keydown', {key: Keys_Enum.SPACE});
         expect(option0).to.not.have.attribute('selected');
         expect(option1).to.have.attribute('selected');
         expect(option2).to.not.have.attribute('selected');
 
         // Select new option deselects the first.
-        options.at(1).find('div').simulate('keydown', {key: Keys.SPACE});
+        options.at(1).find('div').simulate('keydown', {key: Keys_Enum.SPACE});
         expect(option0).to.not.have.attribute('selected');
         expect(option1).to.have.attribute('selected');
         expect(option2).to.not.have.attribute('selected');
diff --git a/extensions/amp-selector/validator-amp-selector.protoascii b/extensions/amp-selector/validator-amp-selector.protoascii
index 2dd9d59312f0..3f4520dd32ca 100644
--- a/extensions/amp-selector/validator-amp-selector.protoascii
+++ b/extensions/amp-selector/validator-amp-selector.protoascii
@@ -1,8 +1,8 @@
 tags: {  # amp-selector 1.0
   html_format: AMP
   tag_name: "SCRIPT"
-  satisfies: "amp-selector 1.0"
-  excludes: "amp-selector 0.1"
+  satisfies_condition: "amp-selector 1.0"
+  excludes_condition: "amp-selector 0.1"
   extension_spec: {
     name: "amp-selector"
     version_name: "v1.0"
@@ -15,8 +15,8 @@ tags: {  # amp-selector 0.1 and latest
   html_format: AMP
   html_format: AMP4ADS
   tag_name: "SCRIPT"
-  satisfies: "amp-selector 0.1"
-  excludes: "amp-selector 1.0"
+  satisfies_condition: "amp-selector 0.1"
+  excludes_condition: "amp-selector 1.0"
   extension_spec: {
     name: "amp-selector"
     version_name: "v0.1"
@@ -99,6 +99,7 @@ tags: {
   html_format: AMP4EMAIL
   tag_name: "$REFERENCE_POINT"
   spec_name: "AMP-SELECTOR option"
+  descriptive_name : "amp-selector [option] descendant"
   attrs: {
     name: "disabled"
     value: ""
@@ -119,6 +120,9 @@ tags: {
   html_format: AMP4EMAIL
   tag_name: "$REFERENCE_POINT"
   spec_name: "AMP-SELECTOR child"
+  descriptive_name : "amp-selector child"
+  # This is used recursively so that the "AMP-SELECTOR option" can be any
+  # depth below the main <amp-sepector>:
   reference_points: {
     tag_spec_name: "AMP-SELECTOR option"
   }
diff --git a/extensions/amp-sidebar/0.1/amp-sidebar.js b/extensions/amp-sidebar/0.1/amp-sidebar.js
index b202cccc216c..231a56bdadcb 100644
--- a/extensions/amp-sidebar/0.1/amp-sidebar.js
+++ b/extensions/amp-sidebar/0.1/amp-sidebar.js
@@ -1,32 +1,35 @@
-import {ActionTrust} from '#core/constants/action-constants';
-import {AmpEvents} from '#core/constants/amp-events';
-import {CSS} from '../../../build/amp-sidebar-0.1.css';
-import {Direction, Orientation, SwipeToDismiss} from './swipe-to-dismiss';
-import {Gestures} from '../../../src/gesture';
-import {Keys} from '#core/constants/key-codes';
-import {Services} from '#service';
-import {SwipeDef, SwipeXRecognizer} from '../../../src/gesture-recognizers';
-import {Toolbar} from './toolbar';
-import {
-  closestAncestorElementBySelector,
-  realChildElements,
-} from '#core/dom/query';
-import {createCustomEvent} from '#utils/event-helper';
-import {debounce} from '#core/types/function';
-import {descendsFromStory} from '#utils/story';
-import {dev, devAssert} from '#utils/log';
-import {dict} from '#core/types/object';
-import {handleAutoscroll} from './autoscroll';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
+import {Keys_Enum} from '#core/constants/key-codes';
 import {isRTL, tryFocus} from '#core/dom';
 import {
   observeContentSize,
   unobserveContentSize,
 } from '#core/dom/layout/size-observer';
-import {removeFragment} from '../../../src/url';
 import {setModalAsClosed, setModalAsOpen} from '#core/dom/modal';
+import {
+  closestAncestorElementBySelector,
+  realChildElements,
+} from '#core/dom/query';
+import {unmountAll} from '#core/dom/resource-container-helper';
 import {setStyles, toggle} from '#core/dom/style';
 import {toArray} from '#core/types/array';
-import {unmountAll} from '#core/dom/resource-container-helper';
+import {debounce} from '#core/types/function';
+
+import {Services} from '#service';
+
+import {createCustomEvent} from '#utils/event-helper';
+import {dev, devAssert} from '#utils/log';
+import {descendsFromStory} from '#utils/story';
+
+import {handleAutoscroll} from './autoscroll';
+import {Direction, Orientation, SwipeToDismiss} from './swipe-to-dismiss';
+import {Toolbar} from './toolbar';
+
+import {CSS} from '../../../build/amp-sidebar-0.1.css';
+import {Gestures} from '../../../src/gesture';
+import {SwipeDef, SwipeXRecognizer} from '../../../src/gesture-recognizers';
+import {removeFragment} from '../../../src/url';
 
 /** @private @const {string} */
 const TAG = 'amp-sidebar toolbar';
@@ -122,7 +125,7 @@ export class AmpSidebar extends AMP.BaseElement {
       this.win,
       (cb) => this.mutateElement(cb),
       // The sidebar is already animated by swipe to dismiss, so skip animation.
-      () => this.dismiss_(/*skipAnimation*/ true, ActionTrust.HIGH)
+      () => this.dismiss_(/*skipAnimation*/ true, ActionTrust_Enum.HIGH)
     );
 
     /** @private {boolean} */
@@ -172,7 +175,7 @@ export class AmpSidebar extends AMP.BaseElement {
     this.maybeBuildNestedMenu_();
     // Nested menu may not be present during buildCallback if it is rendered
     // dynamically with amp-list, in which case listen for dom update.
-    element.addEventListener(AmpEvents.DOM_UPDATE, () => {
+    element.addEventListener(AmpEvents_Enum.DOM_UPDATE, () => {
       this.maybeBuildNestedMenu_();
     });
 
@@ -205,9 +208,9 @@ export class AmpSidebar extends AMP.BaseElement {
 
     this.documentElement_.addEventListener('keydown', (event) => {
       // Close sidebar on ESC.
-      if (event.key == Keys.ESCAPE) {
+      if (event.key == Keys_Enum.ESCAPE) {
         // Keypress is high trust.
-        if (this.close_(ActionTrust.HIGH)) {
+        if (this.close_(ActionTrust_Enum.HIGH)) {
           event.preventDefault();
         }
       }
@@ -268,7 +271,7 @@ export class AmpSidebar extends AMP.BaseElement {
           }
           if (tgtLoc.hash) {
             // Click gesture is high trust.
-            this.close_(ActionTrust.HIGH);
+            this.close_(ActionTrust_Enum.HIGH);
           }
         }
       },
@@ -365,7 +368,7 @@ export class AmpSidebar extends AMP.BaseElement {
     screenReaderCloseButton.tabIndex = -1;
     screenReaderCloseButton.addEventListener('click', () => {
       // Click gesture is high trust.
-      this.close_(ActionTrust.HIGH);
+      this.close_(ActionTrust_Enum.HIGH);
     });
 
     return screenReaderCloseButton;
@@ -409,7 +412,7 @@ export class AmpSidebar extends AMP.BaseElement {
 
   /**
    * Updates the sidebar while it is animating to the opened state.
-   * @param {!ActionTrust} trust
+   * @param {!ActionTrust_Enum} trust
    */
   updateForOpening_(trust) {
     toggle(this.element, /* display */ true);
@@ -434,7 +437,7 @@ export class AmpSidebar extends AMP.BaseElement {
 
   /**
    * Updates the sidebar for when it has finished opening.
-   * @param {!ActionTrust} trust
+   * @param {!ActionTrust_Enum} trust
    * @private
    */
   updateForOpened_(trust) {
@@ -462,7 +465,7 @@ export class AmpSidebar extends AMP.BaseElement {
   /**
    * Updates the sidebar for when it is animating to the closed state.
    * @param {boolean} immediate
-   * @param {!ActionTrust} trust
+   * @param {!ActionTrust_Enum} trust
    * @private
    */
   updateForClosing_(immediate, trust) {
@@ -481,7 +484,7 @@ export class AmpSidebar extends AMP.BaseElement {
 
   /**
    * Updates the sidebar for when it has finished closing.
-   * @param {!ActionTrust} trust
+   * @param {!ActionTrust_Enum} trust
    * @private
    */
   updateForClosed_(trust) {
@@ -503,7 +506,7 @@ export class AmpSidebar extends AMP.BaseElement {
 
   /**
    * Reveals the sidebar.
-   * @param {!ActionTrust} trust
+   * @param {!ActionTrust_Enum} trust
    * @param {?Element} openerElement
    * @private
    */
@@ -537,7 +540,7 @@ export class AmpSidebar extends AMP.BaseElement {
 
   /**
    * Hides the sidebar.
-   * @param {!ActionTrust} trust
+   * @param {!ActionTrust_Enum} trust
    * @return {boolean} Whether the sidebar actually transitioned from "visible"
    *     to "hidden".
    * @private
@@ -550,7 +553,7 @@ export class AmpSidebar extends AMP.BaseElement {
    * Dismisses the sidebar.
    * @param {boolean} skipAnimation Whether sidebar should close immediately,
    *  skipping animation.
-   * @param {!ActionTrust} trust
+   * @param {!ActionTrust_Enum} trust
    * @return {boolean} Whether the sidebar actually transitioned from "visible"
    *     to "hidden".
    * @private
@@ -662,7 +665,7 @@ export class AmpSidebar extends AMP.BaseElement {
       mask.classList.add('amp-sidebar-mask', 'i-amphtml-sidebar-mask');
       mask.addEventListener('click', () => {
         // Click gesture is high trust.
-        this.close_(ActionTrust.HIGH);
+        this.close_(ActionTrust_Enum.HIGH);
       });
       this.getAmpDoc().getBody().appendChild(mask);
       mask.addEventListener('touchmove', (e) => {
@@ -721,11 +724,11 @@ export class AmpSidebar extends AMP.BaseElement {
 
   /**
    * @param {string} name
-   * @param {!ActionTrust} trust
+   * @param {!ActionTrust_Enum} trust
    * @private
    */
   triggerEvent_(name, trust) {
-    const event = createCustomEvent(this.win, `${TAG}.${name}`, dict({}));
+    const event = createCustomEvent(this.win, `${TAG}.${name}`, {});
     this.action_.trigger(this.element, name, event, trust);
   }
 
diff --git a/extensions/amp-sidebar/0.1/autoscroll.js b/extensions/amp-sidebar/0.1/autoscroll.js
index df1dcc78f901..30c848d0ac00 100644
--- a/extensions/amp-sidebar/0.1/autoscroll.js
+++ b/extensions/amp-sidebar/0.1/autoscroll.js
@@ -1,6 +1,8 @@
-import {Services} from '#service';
-import {computedStyle} from '#core/dom/style';
 import {scopedQuerySelector} from '#core/dom/query';
+import {computedStyle} from '#core/dom/style';
+
+import {Services} from '#service';
+
 import {user} from '#utils/log';
 
 /**
diff --git a/extensions/amp-sidebar/0.1/storybook/Basic.amp.js b/extensions/amp-sidebar/0.1/storybook/Basic.amp.js
index 1a8d36417a16..4f47b30734e9 100644
--- a/extensions/amp-sidebar/0.1/storybook/Basic.amp.js
+++ b/extensions/amp-sidebar/0.1/storybook/Basic.amp.js
@@ -1,16 +1,20 @@
 // To do: how to add CSS
 //import '!style-loader!css-loader!./Basic-styles.css';
-import * as Preact from '#preact';
 import {withAmp} from '@ampproject/storybook-addon';
-import {withKnobs} from '@storybook/addon-knobs';
+
+import * as Preact from '#preact';
 
 export default {
   title: 'amp-sidebar-0_1',
-  decorators: [withKnobs, withAmp],
+  decorators: [withAmp],
 
   parameters: {
     extensions: [{name: 'amp-sidebar', version: 0.1}],
   },
+
+  args: {
+    minWidth: 500,
+  },
 };
 
 export const BasicSidebar = () => {
@@ -39,14 +43,13 @@ export const BasicSidebar = () => {
   );
 };
 
-export const Toolbar = () => {
+export const Toolbar = (minWidth) => {
   /*
    * The toolbar feature allows elements within the amp-sidebar to be
    * displayed within the main body of the article. In this example two
    * Navigational Elements from the sidebar will be displayed under the
    * Toolbar Target when the width of the page is 500px or more.
    */
-  const minWidth = 500;
   const mediaQuery = `(min-width: ${minWidth}px)`;
   return (
     <div>
diff --git a/extensions/amp-sidebar/0.1/swipe-to-dismiss.js b/extensions/amp-sidebar/0.1/swipe-to-dismiss.js
index 08f44fef32b7..17841aae1e67 100644
--- a/extensions/amp-sidebar/0.1/swipe-to-dismiss.js
+++ b/extensions/amp-sidebar/0.1/swipe-to-dismiss.js
@@ -1,8 +1,11 @@
-import {SwipeDef} from '../../../src/gesture-recognizers';
-import {delayAfterDeferringToEventLoop} from './utils';
-import {dev} from '#utils/log';
 import {setStyles} from '#core/dom/style';
 
+import {dev} from '#utils/log';
+
+import {delayAfterDeferringToEventLoop} from './utils';
+
+import {SwipeDef} from '../../../src/gesture-recognizers';
+
 /**
  * The distance needed to dismiss the swipe element, as fraction of its length.
  */
diff --git a/extensions/amp-sidebar/0.1/test/integration/test-amp-sidebar.js b/extensions/amp-sidebar/0.1/test/integration/test-amp-sidebar.js
index 2251c9b8a814..15ee9f3caf29 100644
--- a/extensions/amp-sidebar/0.1/test/integration/test-amp-sidebar.js
+++ b/extensions/amp-sidebar/0.1/test/integration/test-amp-sidebar.js
@@ -1,15 +1,11 @@
 import {poll} from '#testing/iframe';
 
-describes.sandboxed
-  .configure()
-  .skipSafari()
-  .skipEdge()
-  .run('amp-sidebar', {}, function () {
-    // Extend timeout slightly for flakes on Windows environments
-    this.timeout(4000);
-    const extensions = ['amp-sidebar'];
+describes.sandboxed('amp-sidebar', {}, function () {
+  // Extend timeout slightly for flakes on Windows environments
+  this.timeout(4000);
+  const extensions = ['amp-sidebar'];
 
-    const sidebarBody = `
+  const sidebarBody = `
   <amp-sidebar
     id="sidebar1"
     layout="nodisplay"
@@ -34,70 +30,61 @@ describes.sandboxed
 
   <div id="dummy"></div>
   `;
-    describes.integration(
-      'sidebar focus',
-      {
-        body: sidebarBody,
-        extensions,
-      },
-      (env) => {
-        let win;
-        beforeEach(() => {
-          win = env.win;
-        });
+  describes.integration(
+    'sidebar focus',
+    {
+      body: sidebarBody,
+      extensions,
+    },
+    (env) => {
+      let win;
+      beforeEach(() => {
+        win = env.win;
+      });
 
-        // TODO (#16157, #21999): this tests times out on FF and Chrome
-        it.configure()
-          .skipChrome()
-          .skipFirefox()
-          .run('should focus on opener on close', () => {
-            const openerButton = win.document.getElementById('sidebarOpener');
-            const openedPromise = waitForSidebarOpen(win.document);
-            openerButton.click();
-            return openedPromise
-              .then(() => {
-                const closerButton =
-                  win.document.getElementById('sidebarCloser');
-                const closedPromise = waitForSidebarClose(win.document);
-                closerButton.click();
-                return closedPromise;
-              })
-              .then(() => {
-                expect(win.document.activeElement).to.equal(openerButton);
-              });
+      it('should focus on opener on close', () => {
+        const openerButton = win.document.getElementById('sidebarOpener');
+        const openedPromise = waitForSidebarOpen(win.document);
+        openerButton.click();
+        return openedPromise
+          .then(() => {
+            const closerButton = win.document.getElementById('sidebarCloser');
+            const closedPromise = waitForSidebarClose(win.document);
+            closerButton.click();
+            return closedPromise;
+          })
+          .then(() => {
+            expect(win.document.activeElement).to.equal(openerButton);
           });
+      });
 
-        it.configure()
-          .skipIfPropertiesObfuscated()
-          .skipFirefox()
-          .run('should not change scroll position after close', async () => {
-            const openerButton = win.document.getElementById('sidebarOpener');
-            const sidebar = win.document.getElementById('sidebar1');
-            const impl = await sidebar.getImpl(false);
-            const viewport = impl.getViewport();
-            const openedPromise = waitForSidebarOpen(win.document);
-            openerButton.click();
-            expect(viewport.getScrollTop()).to.equal(0);
-            return openedPromise
-              .then(() => {
-                viewport.setScrollTop(1000);
-                expect(viewport.getScrollTop()).to.equal(1000);
-                const closerButton =
-                  win.document.getElementById('sidebarCloser');
-                const closedPromise = waitForSidebarClose(win.document);
-                closerButton.click();
-                return closedPromise;
-              })
-              .then(() => {
-                // Firefox resets scroll to top on pop history
-                // Safari resets scroll to top somewhere unrelated to focus
-                // expect(viewport.getScrollTop()).to.equal(1000);
-                expect(win.document.activeElement).to.not.equal(openerButton);
-              });
+      it('should not change scroll position after close', async () => {
+        const openerButton = win.document.getElementById('sidebarOpener');
+        const sidebar = win.document.getElementById('sidebar1');
+        const impl = await sidebar.getImpl(false);
+        const viewport = impl.getViewport();
+        const openedPromise = waitForSidebarOpen(win.document);
+        openerButton.click();
+        expect(viewport.getScrollTop()).to.equal(0);
+        return openedPromise
+          .then(() => {
+            viewport.setScrollTop(1000);
+            expect(viewport.getScrollTop()).to.equal(1000);
+            const closerButton = win.document.getElementById('sidebarCloser');
+            const closedPromise = waitForSidebarClose(win.document);
+            closerButton.click();
+            return closedPromise;
+          })
+          .then(() => {
+            // Firefox resets scroll to top on pop history
+            // Safari resets scroll to top somewhere unrelated to focus
+            // expect(viewport.getScrollTop()).to.equal(1000);
+            expect(win.document.activeElement).to.not.equal(openerButton);
           });
-      }
-    );
-  });
+      });
+    }
+  );
+});
 
 function waitForSidebarOpen(document) {
   return poll('wait for sidebar to open', () => {
diff --git a/extensions/amp-sidebar/0.1/test/test-amp-sidebar.js b/extensions/amp-sidebar/0.1/test/test-amp-sidebar.js
index 1615afaea9a6..06ba2afb7ac6 100644
--- a/extensions/amp-sidebar/0.1/test/test-amp-sidebar.js
+++ b/extensions/amp-sidebar/0.1/test/test-amp-sidebar.js
@@ -1,13 +1,16 @@
 import '../amp-sidebar';
 import * as fakeTimers from '@sinonjs/fake-timers';
-import {ActionService} from '#service/action-impl';
-import {ActionTrust} from '#core/constants/action-constants';
-import {Keys} from '#core/constants/key-codes';
-import {Services} from '#service';
-import {assertScreenReaderElement} from '#testing/helpers/service';
-import {clearModalStack, getModalStackLength} from '#core/dom/modal';
+
+import {ActionTrust_Enum} from '#core/constants/action-constants';
+import {Keys_Enum} from '#core/constants/key-codes';
 import {createElementWithAttributes} from '#core/dom';
 import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
+import {clearModalStack, getModalStackLength} from '#core/dom/modal';
+
+import {Services} from '#service';
+import {ActionService} from '#service/action-impl';
+
+import {assertScreenReaderElement} from '#testing/helpers/service';
 
 // Represents the correct value of KeyboardEvent.which for the Escape key
 const KEYBOARD_EVENT_WHICH_ESCAPE = 27;
@@ -137,7 +140,7 @@ describes.realWin(
     }
 
     /** Helper for invoking open/close/toggle actions on amp-sidebar. */
-    function execute(impl, method, trust = ActionTrust.HIGH) {
+    function execute(impl, method, trust = ActionTrust_Enum.HIGH) {
       impl.executeAction({
         method,
         trust,
@@ -431,7 +434,7 @@ describes.realWin(
         if (eventObj.initEvent) {
           eventObj.initEvent('keydown', true, true);
         }
-        eventObj.key = Keys.ESCAPE;
+        eventObj.key = Keys_Enum.ESCAPE;
         eventObj.which = KEYBOARD_EVENT_WHICH_ESCAPE;
         const el = doc.documentElement;
         el.dispatchEvent
@@ -774,7 +777,7 @@ describes.realWin(
           'source',
           'caller',
           'event',
-          ActionTrust.HIGH
+          ActionTrust_Enum.HIGH
         );
         expect(element.enqueAction).to.be.calledWith(
           env.sandbox.match({
@@ -785,7 +788,7 @@ describes.realWin(
             method,
             node: element,
             source: 'source',
-            trust: ActionTrust.HIGH,
+            trust: ActionTrust_Enum.HIGH,
           })
         );
       });
diff --git a/extensions/amp-sidebar/0.1/test/test-toolbar.js b/extensions/amp-sidebar/0.1/test/test-toolbar.js
index 5d76acc83338..391e69a1a89e 100644
--- a/extensions/amp-sidebar/0.1/test/test-toolbar.js
+++ b/extensions/amp-sidebar/0.1/test/test-toolbar.js
@@ -1,9 +1,12 @@
-import {AmpDocSingle} from '#service/ampdoc-impl';
+import {toArray} from '#core/types/array';
+
 import {Services} from '#service';
-import {Toolbar} from '../toolbar';
-import {adopt} from '../../../../src/runtime';
+import {AmpDocSingle} from '#service/ampdoc-impl';
+
 import {createIframePromise} from '#testing/iframe';
-import {toArray} from '#core/types/array';
+
+import {adopt} from '../../../../src/runtime';
+import {Toolbar} from '../toolbar';
 
 adopt(window);
 
diff --git a/extensions/amp-sidebar/0.1/toolbar.js b/extensions/amp-sidebar/0.1/toolbar.js
index 7400c962a1d9..30730cf1528c 100644
--- a/extensions/amp-sidebar/0.1/toolbar.js
+++ b/extensions/amp-sidebar/0.1/toolbar.js
@@ -1,6 +1,8 @@
+import {toggle} from '#core/dom/style';
+
 import {dev, user, userAssert} from '#utils/log';
+
 import {handleAutoscroll} from './autoscroll';
-import {toggle} from '#core/dom/style';
 
 /**
  * Class representing toolbar behavior in sidebar
diff --git a/extensions/amp-sidebar/0.2/amp-sidebar.js b/extensions/amp-sidebar/0.2/amp-sidebar.js
index 23c210f7c049..a7f89919911d 100644
--- a/extensions/amp-sidebar/0.2/amp-sidebar.js
+++ b/extensions/amp-sidebar/0.2/amp-sidebar.js
@@ -1,33 +1,37 @@
-import {ActionTrust} from '#core/constants/action-constants';
-import {AmpEvents} from '#core/constants/amp-events';
-import {CSS} from '../../../build/amp-sidebar-0.2.css';
-import {Direction, Orientation, SwipeToDismiss} from './swipe-to-dismiss';
-import {Gestures} from '../../../src/gesture';
-import {Keys} from '#core/constants/key-codes';
-import {Services} from '#service';
-import {SwipeDef, SwipeXRecognizer} from '../../../src/gesture-recognizers';
-import {Toolbar} from './toolbar';
-import {
-  closestAncestorElementBySelector,
-  realChildElements,
-} from '#core/dom/query';
-import {createCustomEvent} from '#utils/event-helper';
-import {debounce} from '#core/types/function';
-import {descendsFromStory} from '#utils/story';
-import {dev, devAssert, userAssert} from '#utils/log';
-import {dict} from '#core/types/object';
-import {handleAutoscroll} from './autoscroll';
-import {isExperimentOn} from '#experiments';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
+import {Keys_Enum} from '#core/constants/key-codes';
 import {isRTL, tryFocus} from '#core/dom';
 import {
   observeContentSize,
   unobserveContentSize,
 } from '#core/dom/layout/size-observer';
-import {removeFragment} from '../../../src/url';
 import {setModalAsClosed, setModalAsOpen} from '#core/dom/modal';
+import {
+  closestAncestorElementBySelector,
+  realChildElements,
+} from '#core/dom/query';
+import {unmountAll} from '#core/dom/resource-container-helper';
 import {setStyles, toggle} from '#core/dom/style';
 import {toArray} from '#core/types/array';
-import {unmountAll} from '#core/dom/resource-container-helper';
+import {debounce} from '#core/types/function';
+
+import {isExperimentOn} from '#experiments';
+
+import {Services} from '#service';
+
+import {createCustomEvent} from '#utils/event-helper';
+import {dev, devAssert, userAssert} from '#utils/log';
+import {descendsFromStory} from '#utils/story';
+
+import {handleAutoscroll} from './autoscroll';
+import {Direction, Orientation, SwipeToDismiss} from './swipe-to-dismiss';
+import {Toolbar} from './toolbar';
+
+import {CSS} from '../../../build/amp-sidebar-0.2.css';
+import {Gestures} from '../../../src/gesture';
+import {SwipeDef, SwipeXRecognizer} from '../../../src/gesture-recognizers';
+import {removeFragment} from '../../../src/url';
 
 /** @private @const {string} */
 const TAG = 'amp-sidebar toolbar';
@@ -61,7 +65,7 @@ const SidebarEvents = {
  * @extends {AMP.BaseElement}
  */
 export class AmpSidebar extends AMP.BaseElement {
-  /** @override @nocollapse */
+  /** @override  */
   static prerenderAllowed() {
     return true;
   }
@@ -128,7 +132,7 @@ export class AmpSidebar extends AMP.BaseElement {
       this.win,
       (cb) => this.mutateElement(cb),
       // The sidebar is already animated by swipe to dismiss, so skip animation.
-      () => this.dismiss_(true, ActionTrust.HIGH)
+      () => this.dismiss_(true, ActionTrust_Enum.HIGH)
     );
 
     this.onResized_ = this.onResized_.bind(this);
@@ -192,7 +196,7 @@ export class AmpSidebar extends AMP.BaseElement {
     this.maybeBuildNestedMenu_();
     // Nested menu may not be present during buildCallback if it is rendered
     // dynamically with amp-list, in which case listen for dom update.
-    element.addEventListener(AmpEvents.DOM_UPDATE, () => {
+    element.addEventListener(AmpEvents_Enum.DOM_UPDATE, () => {
       this.maybeBuildNestedMenu_();
     });
 
@@ -209,9 +213,9 @@ export class AmpSidebar extends AMP.BaseElement {
 
     this.documentElement_.addEventListener('keydown', (event) => {
       // Close sidebar on ESC.
-      if (event.key == Keys.ESCAPE) {
+      if (event.key == Keys_Enum.ESCAPE) {
         // Keypress is high trust.
-        if (this.close_(ActionTrust.HIGH)) {
+        if (this.close_(ActionTrust_Enum.HIGH)) {
           event.preventDefault();
         }
       }
@@ -265,7 +269,7 @@ export class AmpSidebar extends AMP.BaseElement {
           }
           if (tgtLoc.hash) {
             // Click gesture is high trust.
-            this.close_(ActionTrust.HIGH);
+            this.close_(ActionTrust_Enum.HIGH);
           }
         }
       },
@@ -362,7 +366,7 @@ export class AmpSidebar extends AMP.BaseElement {
     screenReaderCloseButton.tabIndex = -1;
     screenReaderCloseButton.addEventListener('click', () => {
       // Click gesture is high trust.
-      this.close_(ActionTrust.HIGH);
+      this.close_(ActionTrust_Enum.HIGH);
     });
 
     return screenReaderCloseButton;
@@ -406,7 +410,7 @@ export class AmpSidebar extends AMP.BaseElement {
 
   /**
    * Updates the sidebar while it is animating to the opened state.
-   * @param {!ActionTrust} trust
+   * @param {!ActionTrust_Enum} trust
    */
   updateForOpening_(trust) {
     toggle(this.element, /* display */ true);
@@ -432,7 +436,7 @@ export class AmpSidebar extends AMP.BaseElement {
 
   /**
    * Updates the sidebar for when it has finished opening.
-   * @param {!ActionTrust} trust
+   * @param {!ActionTrust_Enum} trust
    * @private
    */
   updateForOpened_(trust) {
@@ -460,7 +464,7 @@ export class AmpSidebar extends AMP.BaseElement {
   /**
    * Updates the sidebar for when it is animating to the closed state.
    * @param {boolean} immediate
-   * @param {!ActionTrust} trust
+   * @param {!ActionTrust_Enum} trust
    * @private
    */
   updateForClosing_(immediate, trust) {
@@ -480,7 +484,7 @@ export class AmpSidebar extends AMP.BaseElement {
 
   /**
    * Updates the sidebar for when it has finished closing.
-   * @param {!ActionTrust} trust
+   * @param {!ActionTrust_Enum} trust
    * @private
    */
   updateForClosed_(trust) {
@@ -507,7 +511,7 @@ export class AmpSidebar extends AMP.BaseElement {
 
   /**
    * Reveals the sidebar.
-   * @param {!ActionTrust} trust
+   * @param {!ActionTrust_Enum} trust
    * @param {?Element} openerElement
    * @private
    */
@@ -535,7 +539,7 @@ export class AmpSidebar extends AMP.BaseElement {
 
   /**
    * Hides the sidebar.
-   * @param {!ActionTrust} trust
+   * @param {!ActionTrust_Enum} trust
    * @return {boolean} Whether the sidebar actually transitioned from "visible"
    *     to "hidden".
    * @private
@@ -548,7 +552,7 @@ export class AmpSidebar extends AMP.BaseElement {
    * Dismisses the sidebar.
    * @param {boolean} immediate Whether sidebar should close immediately,
    *     without animation.
-   * @param {!ActionTrust} trust
+   * @param {!ActionTrust_Enum} trust
    * @return {boolean} Whether the sidebar actually transitioned from "visible"
    *     to "hidden".
    * @private
@@ -645,7 +649,7 @@ export class AmpSidebar extends AMP.BaseElement {
       mask.classList.add('amp-sidebar-mask', 'i-amphtml-sidebar-mask');
       mask.addEventListener('click', () => {
         // Click gesture is high trust.
-        this.close_(ActionTrust.HIGH);
+        this.close_(ActionTrust_Enum.HIGH);
       });
       this.getAmpDoc().getBody().appendChild(mask);
       mask.addEventListener('touchmove', (e) => {
@@ -704,11 +708,11 @@ export class AmpSidebar extends AMP.BaseElement {
 
   /**
    * @param {string} name
-   * @param {!ActionTrust} trust
+   * @param {!ActionTrust_Enum} trust
    * @private
    */
   triggerEvent_(name, trust) {
-    const event = createCustomEvent(this.win, `${TAG}.${name}`, dict({}));
+    const event = createCustomEvent(this.win, `${TAG}.${name}`, {});
     this.action_.trigger(this.element, name, event, trust);
   }
 
diff --git a/extensions/amp-sidebar/0.2/autoscroll.js b/extensions/amp-sidebar/0.2/autoscroll.js
index df1dcc78f901..30c848d0ac00 100644
--- a/extensions/amp-sidebar/0.2/autoscroll.js
+++ b/extensions/amp-sidebar/0.2/autoscroll.js
@@ -1,6 +1,8 @@
-import {Services} from '#service';
-import {computedStyle} from '#core/dom/style';
 import {scopedQuerySelector} from '#core/dom/query';
+import {computedStyle} from '#core/dom/style';
+
+import {Services} from '#service';
+
 import {user} from '#utils/log';
 
 /**
diff --git a/extensions/amp-sidebar/0.2/swipe-to-dismiss.js b/extensions/amp-sidebar/0.2/swipe-to-dismiss.js
index 08f44fef32b7..17841aae1e67 100644
--- a/extensions/amp-sidebar/0.2/swipe-to-dismiss.js
+++ b/extensions/amp-sidebar/0.2/swipe-to-dismiss.js
@@ -1,8 +1,11 @@
-import {SwipeDef} from '../../../src/gesture-recognizers';
-import {delayAfterDeferringToEventLoop} from './utils';
-import {dev} from '#utils/log';
 import {setStyles} from '#core/dom/style';
 
+import {dev} from '#utils/log';
+
+import {delayAfterDeferringToEventLoop} from './utils';
+
+import {SwipeDef} from '../../../src/gesture-recognizers';
+
 /**
  * The distance needed to dismiss the swipe element, as fraction of its length.
  */
diff --git a/extensions/amp-sidebar/0.2/test/integration/test-amp-sidebar.js b/extensions/amp-sidebar/0.2/test/integration/test-amp-sidebar.js
index 2251c9b8a814..15ee9f3caf29 100644
--- a/extensions/amp-sidebar/0.2/test/integration/test-amp-sidebar.js
+++ b/extensions/amp-sidebar/0.2/test/integration/test-amp-sidebar.js
@@ -1,15 +1,11 @@
 import {poll} from '#testing/iframe';
 
-describes.sandboxed
-  .configure()
-  .skipSafari()
-  .skipEdge()
-  .run('amp-sidebar', {}, function () {
-    // Extend timeout slightly for flakes on Windows environments
-    this.timeout(4000);
-    const extensions = ['amp-sidebar'];
+describes.sandboxed('amp-sidebar', {}, function () {
+  // Extend timeout slightly for flakes on Windows environments
+  this.timeout(4000);
+  const extensions = ['amp-sidebar'];
 
-    const sidebarBody = `
+  const sidebarBody = `
   <amp-sidebar
     id="sidebar1"
     layout="nodisplay"
@@ -34,70 +30,61 @@ describes.sandboxed
 
   <div id="dummy"></div>
   `;
-    describes.integration(
-      'sidebar focus',
-      {
-        body: sidebarBody,
-        extensions,
-      },
-      (env) => {
-        let win;
-        beforeEach(() => {
-          win = env.win;
-        });
+  describes.integration(
+    'sidebar focus',
+    {
+      body: sidebarBody,
+      extensions,
+    },
+    (env) => {
+      let win;
+      beforeEach(() => {
+        win = env.win;
+      });
 
-        // TODO (#16157, #21999): this tests times out on FF and Chrome
-        it.configure()
-          .skipChrome()
-          .skipFirefox()
-          .run('should focus on opener on close', () => {
-            const openerButton = win.document.getElementById('sidebarOpener');
-            const openedPromise = waitForSidebarOpen(win.document);
-            openerButton.click();
-            return openedPromise
-              .then(() => {
-                const closerButton =
-                  win.document.getElementById('sidebarCloser');
-                const closedPromise = waitForSidebarClose(win.document);
-                closerButton.click();
-                return closedPromise;
-              })
-              .then(() => {
-                expect(win.document.activeElement).to.equal(openerButton);
-              });
+      it('should focus on opener on close', () => {
+        const openerButton = win.document.getElementById('sidebarOpener');
+        const openedPromise = waitForSidebarOpen(win.document);
+        openerButton.click();
+        return openedPromise
+          .then(() => {
+            const closerButton = win.document.getElementById('sidebarCloser');
+            const closedPromise = waitForSidebarClose(win.document);
+            closerButton.click();
+            return closedPromise;
+          })
+          .then(() => {
+            expect(win.document.activeElement).to.equal(openerButton);
           });
+      });
 
-        it.configure()
-          .skipIfPropertiesObfuscated()
-          .skipFirefox()
-          .run('should not change scroll position after close', async () => {
-            const openerButton = win.document.getElementById('sidebarOpener');
-            const sidebar = win.document.getElementById('sidebar1');
-            const impl = await sidebar.getImpl(false);
-            const viewport = impl.getViewport();
-            const openedPromise = waitForSidebarOpen(win.document);
-            openerButton.click();
-            expect(viewport.getScrollTop()).to.equal(0);
-            return openedPromise
-              .then(() => {
-                viewport.setScrollTop(1000);
-                expect(viewport.getScrollTop()).to.equal(1000);
-                const closerButton =
-                  win.document.getElementById('sidebarCloser');
-                const closedPromise = waitForSidebarClose(win.document);
-                closerButton.click();
-                return closedPromise;
-              })
-              .then(() => {
-                // Firefox resets scroll to top on pop history
-                // Safari resets scroll to top somewhere unrelated to focus
-                // expect(viewport.getScrollTop()).to.equal(1000);
-                expect(win.document.activeElement).to.not.equal(openerButton);
-              });
+      it('should not change scroll position after close', async () => {
+        const openerButton = win.document.getElementById('sidebarOpener');
+        const sidebar = win.document.getElementById('sidebar1');
+        const impl = await sidebar.getImpl(false);
+        const viewport = impl.getViewport();
+        const openedPromise = waitForSidebarOpen(win.document);
+        openerButton.click();
+        expect(viewport.getScrollTop()).to.equal(0);
+        return openedPromise
+          .then(() => {
+            viewport.setScrollTop(1000);
+            expect(viewport.getScrollTop()).to.equal(1000);
+            const closerButton = win.document.getElementById('sidebarCloser');
+            const closedPromise = waitForSidebarClose(win.document);
+            closerButton.click();
+            return closedPromise;
+          })
+          .then(() => {
+            // Firefox resets scroll to top on pop history
+            // Safari resets scroll to top somewhere unrelated to focus
+            // expect(viewport.getScrollTop()).to.equal(1000);
+            expect(win.document.activeElement).to.not.equal(openerButton);
           });
-      }
-    );
-  });
+      });
+    }
+  );
+});
 
 function waitForSidebarOpen(document) {
   return poll('wait for sidebar to open', () => {
diff --git a/extensions/amp-sidebar/0.2/test/test-amp-sidebar.js b/extensions/amp-sidebar/0.2/test/test-amp-sidebar.js
index 2c6a6e0c6948..e3740b4dbcde 100644
--- a/extensions/amp-sidebar/0.2/test/test-amp-sidebar.js
+++ b/extensions/amp-sidebar/0.2/test/test-amp-sidebar.js
@@ -1,13 +1,17 @@
 import '../amp-sidebar';
 import * as fakeTimers from '@sinonjs/fake-timers';
-import {ActionTrust} from '#core/constants/action-constants';
-import {Keys} from '#core/constants/key-codes';
-import {Services} from '#service';
-import {assertScreenReaderElement} from '#testing/helpers/service';
-import {clearModalStack, getModalStackLength} from '#core/dom/modal';
+
+import {ActionTrust_Enum} from '#core/constants/action-constants';
+import {Keys_Enum} from '#core/constants/key-codes';
 import {createElementWithAttributes} from '#core/dom';
+import {clearModalStack, getModalStackLength} from '#core/dom/modal';
+
 import {toggleExperiment} from '#experiments';
 
+import {Services} from '#service';
+
+import {assertScreenReaderElement} from '#testing/helpers/service';
+
 // Represents the correct value of KeyboardEvent.which for the Escape key
 const KEYBOARD_EVENT_WHICH_ESCAPE = 27;
 
@@ -135,7 +139,7 @@ describes.realWin(
     }
 
     /** Helper for invoking open/close/toggle actions on amp-sidebar. */
-    function execute(impl, method, trust = ActionTrust.HIGH) {
+    function execute(impl, method, trust = ActionTrust_Enum.HIGH) {
       impl.executeAction({
         method,
         trust,
@@ -392,7 +396,7 @@ describes.realWin(
         if (eventObj.initEvent) {
           eventObj.initEvent('keydown', true, true);
         }
-        eventObj.key = Keys.ESCAPE;
+        eventObj.key = Keys_Enum.ESCAPE;
         eventObj.which = KEYBOARD_EVENT_WHICH_ESCAPE;
         const el = doc.documentElement;
         el.dispatchEvent
@@ -461,7 +465,7 @@ describes.realWin(
         expect(scrollLeakSpy).to.be.calledOnce;
       });
 
-      it.skip('should adjust for IOS safari bottom bar', async () => {
+      it('should adjust for IOS safari bottom bar', async () => {
         env.sandbox.stub(platform, 'isIos').returns(true);
         env.sandbox.stub(platform, 'isSafari').returns(true);
         const sidebarElement = await getAmpSidebar();
diff --git a/extensions/amp-sidebar/0.2/test/test-toolbar.js b/extensions/amp-sidebar/0.2/test/test-toolbar.js
index 58e8d2b637d9..5fd1f047bc23 100644
--- a/extensions/amp-sidebar/0.2/test/test-toolbar.js
+++ b/extensions/amp-sidebar/0.2/test/test-toolbar.js
@@ -1,8 +1,11 @@
-import {AmpDocSingle} from '#service/ampdoc-impl';
+import {toArray} from '#core/types/array';
+
 import {Services} from '#service';
-import {Toolbar} from '../toolbar';
+import {AmpDocSingle} from '#service/ampdoc-impl';
+
 import {createIframePromise} from '#testing/iframe';
-import {toArray} from '#core/types/array';
+
+import {Toolbar} from '../toolbar';
 
 describes.realWin('amp-sidebar - toolbar', {}, (env) => {
   let timer;
diff --git a/extensions/amp-sidebar/0.2/toolbar.js b/extensions/amp-sidebar/0.2/toolbar.js
index 594139cade22..2d2a96c624ac 100644
--- a/extensions/amp-sidebar/0.2/toolbar.js
+++ b/extensions/amp-sidebar/0.2/toolbar.js
@@ -1,6 +1,8 @@
+import {toggle} from '#core/dom/style';
+
 import {dev, user, userAssert} from '#utils/log';
+
 import {handleAutoscroll} from './autoscroll';
-import {toggle} from '#core/dom/style';
 
 /**
  * Class representing toolbar behavior in sidebar
diff --git a/extensions/amp-sidebar/1.0/README.md b/extensions/amp-sidebar/1.0/README.md
index 23d1bfba5d44..f2ec6c5fe4e1 100644
--- a/extensions/amp-sidebar/1.0/README.md
+++ b/extensions/amp-sidebar/1.0/README.md
@@ -6,9 +6,7 @@ Provides a way to display meta content intended for temporary access such as nav
 
 You must include each Bento component's required CSS library to guarantee proper loading and before adding custom styles. Or use the light-weight pre-upgrade styles available inline. See [Layout and style](#layout-and-style).
 
-The examples below demonstrate use of the `<bento-sidebar>` web component.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/sidebar
@@ -19,54 +17,79 @@ import {defineElement as defineBentoSidebar} from '@bentoproject/sidebar';
 defineBentoSidebar();
 ```
 
-### Example: Include via `<script>`
+### Include via `<script>`
 
 ```html
-<head>
-  <!-- These styles prevent Cumulative Layout Shift on the unupgraded custom element -->
-  <style>
-    bento-sidebar:not([open]) {
-      display: none !important;
-    }
-  </style>
-  <script src="https://cdn.ampproject.org/bento.js"></script>
-  <script
-    async
-    src="https://cdn.ampproject.org/v0/bento-sidebar-1.0.js"
-  ></script>
-</head>
-<body>
-  <bento-sidebar id="sidebar1" side="right">
-    <ul>
-      <li>Nav item 1</li>
-      <li>Nav item 2</li>
-      <li>Nav item 3</li>
-      <li>Nav item 4</li>
-      <li>Nav item 5</li>
-      <li>Nav item 6</li>
-    </ul>
-  </bento-sidebar>
-
-  <div class="buttons" style="margin-top: 8px">
-    <button id="open-sidebar">Open sidebar</button>
-  </div>
-
-  <script>
-    (async () => {
-      const sidebar = document.querySelector('#sidebar1');
-      await customElements.whenDefined('bento-sidebar');
-      const api = await sidebar.getApi();
-
-      // set up button actions
-      document.querySelector('#open-sidebar').onclick = () => api.open();
-    })();
-  </script>
-</body>
+<script type="module" src="https://cdn.ampproject.org/bento.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/bento.js" crossorigin="anonymous"></script>
+<script type="module" src="https://cdn.ampproject.org/v0/bento-sidebar-1.0.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/v0/bento-sidebar-1.0.js" crossorigin="anonymous"></script>
+<link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-sidebar-1.0.css" crossorigin="anonymous">
+```
+
+### Example
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-sidebar-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-sidebar-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-sidebar-1.0.css"
+    />
+  </head>
+  <body>
+    <bento-sidebar id="sidebar1" side="right" hidden>
+      <ul>
+        <li>Nav item 1</li>
+        <li>Nav item 2</li>
+        <li>Nav item 3</li>
+        <li>Nav item 4</li>
+        <li>Nav item 5</li>
+        <li>Nav item 6</li>
+      </ul>
+    </bento-sidebar>
+
+    <div class="buttons" style="margin-top: 8px">
+      <button id="open-sidebar">Open sidebar</button>
+    </div>
+
+    <script>
+      (async () => {
+        const sidebar = document.querySelector('#sidebar1');
+        await customElements.whenDefined('bento-sidebar');
+        const api = await sidebar.getApi();
+
+        // set up button actions
+        document.querySelector('#open-sidebar').onclick = () => api.open();
+      })();
+    </script>
+  </body>
+</html>
 ```
 
 ### Interactivity and API usage
 
-Bento enabled components used as a standalone web component are highly interactive through their API. The `bento-sidebar` component API is accessible by including the following script tag in your document:
+Bento components are highly interactive through their API. The `bento-sidebar` component API is accessible by including the following script tag in your document:
 
 ```javascript
 await customElements.whenDefined('bento-sidebar');
@@ -163,9 +186,7 @@ This attribute is present when the sidebar is open.
 
 ## Preact/React Component
 
-The examples below demonstrate use of the `<BentoSidebar>` as a functional component usable with the Preact or React libraries.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/sidebar
diff --git a/extensions/amp-sidebar/1.0/amp-sidebar.css b/extensions/amp-sidebar/1.0/amp-sidebar.css
index 18618bf72f3d..f48b5e5d6c23 100644
--- a/extensions/amp-sidebar/1.0/amp-sidebar.css
+++ b/extensions/amp-sidebar/1.0/amp-sidebar.css
@@ -10,6 +10,8 @@ amp-sidebar {
   background-color: #efefef;
   height: 100vh;
   top: 0;
+  outline: none;
+  z-index: 2147483647;
   max-height: 100vh !important;
   /**
    * Max width allowed to be configurable by user.  If user wants width to be
@@ -18,8 +20,6 @@ amp-sidebar {
    */
   max-width: 80vw;
   min-width: 45px !important;
-  outline: none;
-  z-index: 2147483647;
 }
 
 amp-sidebar::part(c),
@@ -30,18 +30,19 @@ amp-sidebar::part(sidebar) {
   background-color: inherit;
   height: inherit;
   top: inherit;
-  max-height: inherit;
-  max-width: inherit;
-  min-width: inherit;
   outline: inherit;
   z-index: inherit;
-
   /* Use unspecified default values from amp-sidebar element */
   width: inherit;
   padding: inherit;
   border: inherit;
+
+  max-width: inherit;
+  max-height: inherit;
+  min-width: inherit;
 }
 
+
 /**
  * Hide the amp-sidebar and remove from the flow of the page so user applied
  * styling is not shown directly on amp-sidebar element.
diff --git a/extensions/amp-sidebar/1.0/amp-sidebar.js b/extensions/amp-sidebar/1.0/amp-sidebar.js
index 286fb225eceb..1677c229066c 100644
--- a/extensions/amp-sidebar/1.0/amp-sidebar.js
+++ b/extensions/amp-sidebar/1.0/amp-sidebar.js
@@ -1,13 +1,19 @@
-import {BaseElement} from './base-element';
-import {CSS} from '../../../build/amp-sidebar-1.0.css';
 import {isExperimentOn} from '#experiments';
-import {userAssert} from '#utils/log';
+
+import {AmpPreactBaseElement, setSuperClass} from '#preact/amp-base-element';
+
 import {Services} from '#service/';
 
+import {userAssert} from '#utils/log';
+
+import {BaseElement} from './base-element';
+
+import {CSS} from '../../../build/amp-sidebar-1.0.css';
+
 /** @const {string} */
 const TAG = 'amp-sidebar';
 
-class AmpSidebar extends BaseElement {
+class AmpSidebar extends setSuperClass(BaseElement, AmpPreactBaseElement) {
   /** @override */
   constructor(element) {
     super(element);
diff --git a/extensions/amp-sidebar/1.0/base-element.js b/extensions/amp-sidebar/1.0/base-element.js
index d09a84e91bc8..bdf7388d9cf5 100644
--- a/extensions/amp-sidebar/1.0/base-element.js
+++ b/extensions/amp-sidebar/1.0/base-element.js
@@ -1,14 +1,15 @@
+import {toggleAttribute} from '#core/dom';
+import {realChildNodes} from '#core/dom/query';
+import {pauseAll} from '#core/dom/resource-container-helper';
+import {toggle} from '#core/dom/style';
+
 import * as Preact from '#preact';
-import {CSS as COMPONENT_CSS} from './component.jss';
 import {PreactBaseElement} from '#preact/base-element';
+import {useValueRef} from '#preact/component';
+
 import {BentoSidebar} from './component';
-import {dict} from '#core/types/object';
-import {pauseAll} from '#core/dom/resource-container-helper';
-import {realChildNodes} from '#core/dom/query';
-import {toggle} from '#core/dom/style';
-import {toggleAttribute} from '#core/dom';
+import {CSS as COMPONENT_CSS} from './component.jss';
 import {useToolbarHook} from './sidebar-toolbar-hook';
-import {useValueRef} from '#preact/component';
 
 export class BaseElement extends PreactBaseElement {
   /** @override */
@@ -26,11 +27,11 @@ export class BaseElement extends PreactBaseElement {
 
   /** @override */
   init() {
-    return dict({
+    return {
       'onBeforeOpen': () => this.beforeOpen(),
       'onAfterOpen': () => this.afterOpen(),
       'onAfterClose': () => this.afterClose(),
-    });
+    };
   }
 
   /** @override */
@@ -94,7 +95,7 @@ BaseElement['shadowCss'] = COMPONENT_CSS;
 /** @override */
 BaseElement['props'] = {
   'children': {passthrough: true},
-  'side': {attr: 'side', type: 'string'},
+  'side': {attr: 'side'},
 };
 
 /**
diff --git a/extensions/amp-sidebar/1.0/component.js b/extensions/amp-sidebar/1.0/component.js
index ea098837c17f..4f3f8fc92470 100644
--- a/extensions/amp-sidebar/1.0/component.js
+++ b/extensions/amp-sidebar/1.0/component.js
@@ -1,9 +1,9 @@
-import * as Preact from '#preact';
-import {ContainWrapper, useValueRef} from '#preact/component';
-import {Keys} from '#core/constants/key-codes';
-import {Side} from './sidebar-config';
-import {forwardRef} from '#preact/compat';
+import objstr from 'obj-str';
+
+import {Keys_Enum} from '#core/constants/key-codes';
 import {isRTL} from '#core/dom';
+
+import * as Preact from '#preact';
 import {
   useCallback,
   useEffect,
@@ -12,10 +12,12 @@ import {
   useRef,
   useState,
 } from '#preact';
-import {useSidebarAnimation} from './sidebar-animations-hook';
+import {forwardRef} from '#preact/compat';
+import {ContainWrapper, useValueRef} from '#preact/component';
+
 import {useStyles} from './component.jss';
-import {useToolbarHook} from './sidebar-toolbar-hook';
-import objstr from 'obj-str';
+import {useSidebarAnimation} from './sidebar-animations-hook';
+import {Side} from './sidebar-config';
 
 /**
  * @param {!BentoSidebarDef.Props} props
@@ -108,7 +110,7 @@ function BentoSidebarWithRef(
       return;
     }
     const keydownCallback = (event) => {
-      if (event.key === Keys.ESCAPE) {
+      if (event.key === Keys_Enum.ESCAPE) {
         event.stopImmediatePropagation();
         event.preventDefault();
         close();
@@ -121,7 +123,13 @@ function BentoSidebarWithRef(
   }, [opened, close]);
 
   return (
-    <div class={objstr({[classes.unmounted]: !mounted})} part="wrapper">
+    <div
+      class={objstr({
+        [classes.mounted]: mounted,
+        [classes.unmounted]: !mounted,
+      })}
+      part="wrapper"
+    >
       <ContainWrapper
         as={Comp}
         ref={sidebarRef}
@@ -136,7 +144,7 @@ function BentoSidebarWithRef(
           [classes.right]: side !== Side.LEFT,
         })}
         role="menu"
-        tabIndex="-1"
+        tabindex="-1"
         hidden={!side}
         {...rest}
       >
@@ -163,28 +171,3 @@ function BentoSidebarWithRef(
 const BentoSidebar = forwardRef(BentoSidebarWithRef);
 BentoSidebar.displayName = 'BentoSidebar'; // Make findable for tests.
 export {BentoSidebar};
-
-/**
- * @param {!BentoSidebarDef.BentoSidebarToolbarProps} props
- * @return {PreactDef.Renderable}
- */
-export function BentoSidebarToolbar({
-  children,
-  toolbar: mediaQueryProp,
-  toolbarTarget: toolbarTargetProp,
-  ...rest
-}) {
-  const ref = useRef(null);
-  useToolbarHook(ref, mediaQueryProp, toolbarTargetProp);
-
-  return (
-    <nav
-      ref={ref}
-      toolbar={mediaQueryProp}
-      toolbar-target={toolbarTargetProp}
-      {...rest}
-    >
-      {children}
-    </nav>
-  );
-}
diff --git a/extensions/amp-sidebar/1.0/component.jss.js b/extensions/amp-sidebar/1.0/component.jss.js
index ae5e0f8ce71c..052acb3119e1 100644
--- a/extensions/amp-sidebar/1.0/component.jss.js
+++ b/extensions/amp-sidebar/1.0/component.jss.js
@@ -58,6 +58,10 @@ const unmounted = {
   display: 'none',
 };
 
+const mounted = {
+  display: 'contents',
+};
+
 const JSS = {
   sidebar,
   defaultSidebarStyles,
@@ -66,6 +70,7 @@ const JSS = {
   backdrop,
   defaultBackdropStyles,
   backdropOverscrollBlocker,
+  mounted,
   unmounted,
 };
 
diff --git a/extensions/amp-sidebar/1.0/example/index.html b/extensions/amp-sidebar/1.0/example/index.html
new file mode 100644
index 000000000000..310219c0b68c
--- /dev/null
+++ b/extensions/amp-sidebar/1.0/example/index.html
@@ -0,0 +1,140 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width" />
+    <title>bento-sidebar</title>
+    <script
+      type="module"
+      src="https://cdn.ampproject.org/bento.mjs"
+      crossorigin="anonymous"
+    ></script>
+    <script
+      nomodule
+      src="https://cdn.ampproject.org/bento.js"
+      crossorigin="anonymous"
+    ></script>
+    <script
+      type="module"
+      src="https://cdn.ampproject.org/v0/bento-sidebar-1.0.mjs"
+      crossorigin="anonymous"
+    ></script>
+    <script
+      nomodule
+      src="https://cdn.ampproject.org/v0/bento-sidebar-1.0.js"
+      crossorigin="anonymous"
+    ></script>
+    <link
+      rel="stylesheet"
+      href="https://cdn.ampproject.org/v0/bento-sidebar-1.0.css"
+      crossorigin="anonymous"
+    />
+    <style>
+      body {
+        font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
+          Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
+          'Segoe UI Symbol';
+        background: #ecf1f3;
+      }
+
+      button {
+        -webkit-appearance: none;
+        background: transparent;
+        border: none;
+        box-shadow: none;
+        color: #4c5a63;
+        cursor: pointer;
+        float: right;
+        width: 40px;
+        height: 35px;
+        margin: 0 1rem;
+      }
+
+      h2 {
+        font-size: 34px;
+        font-weight: bold;
+        line-height: 1.18;
+        letter-spacing: -0.5px;
+        color: #002b39;
+        margin-block-start: 74px;
+      }
+
+      bento-sidebar[open] {
+        background: #fff;
+        padding-inline: 40px;
+        max-width: 320px;
+      }
+
+      ul {
+        list-style: none;
+        padding: 0;
+        margin: 0;
+      }
+
+      li {
+        font-size: 16px;
+        font-weight: 650;
+        line-height: 2;
+        color: #4c5a63;
+        padding-block: 8px;
+      }
+    </style>
+  </head>
+  <body>
+    <button id="open-sidebar">
+      <svg
+        xmlns="http://www.w3.org/2000/svg"
+        height="48px"
+        viewBox="0 0 24 24"
+        width="48px"
+        fill="#000000"
+      >
+        <path d="M0 0h24v24H0V0z" fill="none" />
+        <path d="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z" />
+      </svg>
+    </button>
+
+    <bento-sidebar id="sidebar1" side="left" hidden>
+      <button id="close-sidebar">
+        <svg
+          xmlns="http://www.w3.org/2000/svg"
+          width="53.7"
+          height="53.7"
+          viewBox="0 0 53.7 53.7"
+          stroke="#4c5a63"
+        >
+          <path
+            opacity=".6"
+            fill="%234c5a63"
+            d="M35.6 34.4L28 26.8l7.6-7.6c.2-.2.2-.5
+                  0-.7l-.5-.5c-.2-.2-.5-.2-.7 0l-7.6
+                  7.6-7.5-7.6c-.2-.2-.5-.2-.7 0l-.6.6c-.2.2-.2.5 0
+                  .7l7.6 7.6-7.6 7.5c-.2.2-.2.5 0 .7l.5.5c.2.2.5.2.7
+                  0l7.6-7.6 7.6 7.6c.2.2.5.2.7 0l.5-.5c.2-.2.2-.5 0-.7z"
+          />
+        </svg>
+      </button>
+
+      <h2>Navigation Sidebar</h2>
+
+      <ul>
+        <li>Nav item A</li>
+        <li>Nav item B</li>
+        <li>Nav item C</li>
+        <li>Nav item D</li>
+      </ul>
+    </bento-sidebar>
+
+    <script>
+      (async () => {
+        const sidebar = document.querySelector('#sidebar1');
+        await customElements.whenDefined('bento-sidebar');
+        const api = await sidebar.getApi();
+
+        // set up button actions
+        document.querySelector('#open-sidebar').onclick = () => api.open();
+        document.querySelector('#close-sidebar').onclick = () => api.close();
+      })();
+    </script>
+  </body>
+</html>
diff --git a/extensions/amp-sidebar/1.0/sidebar-animations-hook.js b/extensions/amp-sidebar/1.0/sidebar-animations-hook.js
index c036a843c9a7..c2de5b6f999b 100644
--- a/extensions/amp-sidebar/1.0/sidebar-animations-hook.js
+++ b/extensions/amp-sidebar/1.0/sidebar-animations-hook.js
@@ -1,8 +1,10 @@
-import {Side} from './sidebar-config';
 import {assertDoesNotContainDisplay, setStyles} from '#core/dom/style';
+
 import {useLayoutEffect, useRef} from '#preact';
 import {useValueRef} from '#preact/component';
 
+import {Side} from './sidebar-config';
+
 const ANIMATION_DURATION = 350;
 const ANIMATION_EASE_IN = 'cubic-bezier(0,0,.21,1)';
 
@@ -24,7 +26,7 @@ const ANIMATION_STYLES_BACKDROP_FINAL = {'opacity': ''};
 
 /**
  * @param {!Element} element
- * @param {!Object<string, *>} styles
+ * @param {!{[key: string]: *}} styles
  */
 function safelySetStyles(element, styles) {
   setStyles(element, assertDoesNotContainDisplay(styles));
diff --git a/extensions/amp-sidebar/1.0/sidebar-toolbar-hook.js b/extensions/amp-sidebar/1.0/sidebar-toolbar-hook.js
index 3071d329f2ff..05bd7ddae6c6 100644
--- a/extensions/amp-sidebar/1.0/sidebar-toolbar-hook.js
+++ b/extensions/amp-sidebar/1.0/sidebar-toolbar-hook.js
@@ -1,4 +1,5 @@
 import {escapeCssSelectorIdent} from '#core/dom/css-selectors';
+
 import {useEffect, useState} from '#preact';
 
 /**
diff --git a/extensions/amp-sidebar/1.0/storybook/Basic.amp.js b/extensions/amp-sidebar/1.0/storybook/Basic.amp.js
index 46f9cc5a98c8..3ac0e22328d4 100644
--- a/extensions/amp-sidebar/1.0/storybook/Basic.amp.js
+++ b/extensions/amp-sidebar/1.0/storybook/Basic.amp.js
@@ -1,17 +1,10 @@
-import * as Preact from '#preact';
-import {
-  boolean,
-  color,
-  number,
-  select,
-  text,
-  withKnobs,
-} from '@storybook/addon-knobs';
 import {withAmp} from '@ampproject/storybook-addon';
 
+import * as Preact from '#preact';
+
 export default {
   title: 'amp-sidebar-1_0',
-  decorators: [withKnobs, withAmp],
+  decorators: [withAmp],
 
   parameters: {
     extensions: [{name: 'amp-sidebar', version: '1.0'}],
@@ -19,13 +12,12 @@ export default {
   },
 };
 
-export const _default = () => {
-  const sideConfigurations = ['left', 'right', undefined];
-  const side = select('side', sideConfigurations, sideConfigurations[0]);
-  const foregroundColor = color('color');
-  const backgroundColor = color('background');
-  const backdropColor = color('backdrop color');
-
+export const _default = ({
+  backdropColor,
+  backgroundColor,
+  foregroundColor,
+  ...args
+}) => {
   return (
     <main>
       <style>
@@ -39,7 +31,7 @@ export const _default = () => {
           }
           `}
       </style>
-      <amp-sidebar layout="nodisplay" id="sidebar" side={side}>
+      <amp-sidebar layout="nodisplay" id="sidebar" {...args}>
         <div style={{margin: 8}}>
           <span>
             Lorem ipsum dolor sit amet, has nisl nihil convenire et, vim at
@@ -64,14 +56,36 @@ export const _default = () => {
   );
 };
 
-export const toolbar = () => {
-  const sideConfigurations = ['left', 'right', undefined];
-  const side = select('side', sideConfigurations, sideConfigurations[0]);
-  const foregroundColor = color('color');
-  const backgroundColor = color('background');
-  const backdropColor = color('backdrop color');
-  const toolbarMedia = text('toolbar media', '(max-width: 500px)');
+_default.argTypes = {
+  side: {
+    name: 'side',
+    defaultValue: 'left',
+    // The option `undefined` is necessary to emulate the behavior when `side`
+    // is not set by the user.
+    options: ['left', 'right', undefined],
+    control: {type: 'select'},
+  },
+  foregroundColor: {
+    name: 'foregroundColor',
+    control: {type: 'color'},
+  },
+  backgroundColor: {
+    name: 'backgroundColor',
+    control: {type: 'color'},
+  },
+  backdropColor: {
+    name: 'backdropColor',
+    control: {type: 'color'},
+  },
+};
 
+export const toolbar = ({
+  backdropColor,
+  backgroundColor,
+  foregroundColor,
+  toolbarMedia,
+  ...args
+}) => {
   return (
     <main>
       <style>
@@ -85,7 +99,7 @@ export const toolbar = () => {
           }
           `}
       </style>
-      <amp-sidebar layout="nodisplay" id="sidebar" side={side}>
+      <amp-sidebar layout="nodisplay" id="sidebar" {...args}>
         <span>
           Lorem ipsum dolor sit amet, has nisl nihil convenire et, vim at aeque
           inermis reprehendunt.
@@ -115,23 +129,49 @@ export const toolbar = () => {
   );
 };
 
-export const styles = () => {
-  const sideConfigurations = ['left', 'right', undefined];
-  const side = select('side', sideConfigurations, sideConfigurations[0]);
-  const foregroundColor = color('color');
-  const backgroundColor = color('background');
-  const height = text('height', null);
-  const width = text('width', null);
-  const padding = text('padding', null);
-  const border = text('border', null);
-  const top = text('top', null);
-  const maxHeight = text('max-height', null);
-  const maxWidth = text('max-width', null);
-  const minWidth = text('min-width', null);
-  const outline = text('outline', null);
-  const zIndex = number('z-index', 2147483647);
-  const backdropColor = color('backdrop color');
+toolbar.args = {
+  toolbarMedia: '(max-width:500px)',
+};
+
+toolbar.argTypes = {
+  side: {
+    name: 'side',
+    defaultValue: 'left',
+    // The option `undefined` is necessary to emulate the behavior when `side`
+    // is not set by the user.
+    options: ['left', 'right', undefined],
+    control: {type: 'select'},
+  },
+  foregroundColor: {
+    name: 'foregroundColor',
+    control: {type: 'color'},
+  },
+  backgroundColor: {
+    name: 'backgroundColor',
+    control: {type: 'color'},
+  },
+  backdropColor: {
+    name: 'backdropColor',
+    control: {type: 'color'},
+  },
+};
 
+export const styles = ({
+  backdropColor,
+  backgroundColor,
+  border,
+  foregroundColor,
+  height,
+  maxHeight,
+  maxWidth,
+  minWidth,
+  outline,
+  padding,
+  top,
+  width,
+  zIndex,
+  ...args
+}) => {
   return (
     <main>
       <style>
@@ -155,7 +195,7 @@ export const styles = () => {
           }
           `}
       </style>
-      <amp-sidebar layout="nodisplay" id="sidebar" side={side}>
+      <amp-sidebar layout="nodisplay" id="sidebar" {...args}>
         <div style={{margin: 8}}>
           <span>
             Lorem ipsum dolor sit amet, has nisl nihil convenire et, vim at
@@ -180,15 +220,78 @@ export const styles = () => {
   );
 };
 
-export const scroll = () => {
-  const sideConfigurations = ['left', 'right', undefined];
-  const side = select('side', sideConfigurations, sideConfigurations[0]);
-  const foregroundColor = color('color');
-  const backgroundColor = color('background');
-  const backdropColor = color('backdrop color');
-  const moreBackgroundContent = boolean('more background content', false);
-  const moreSidebarContent = boolean('more sidebar content', false);
+styles.argTypes = {
+  side: {
+    name: 'side',
+    defaultValue: 'left',
+    // The option `undefined` is necessary to emulate the behavior when `side`
+    // is not set by the user.
+    options: ['left', 'right', undefined],
+    control: {type: 'select'},
+  },
+  foregroundColor: {
+    name: 'foregroundColor',
+    control: {type: 'color'},
+  },
+  backgroundColor: {
+    name: 'backgroundColor',
+    control: {type: 'color'},
+  },
+  backdropColor: {
+    name: 'backdropColor',
+    control: {type: 'color'},
+  },
+  height: {
+    name: 'height',
+    control: {type: 'text'},
+  },
+  width: {
+    name: 'width',
+    control: {type: 'text'},
+  },
+  padding: {
+    name: 'padding',
+    control: {type: 'text'},
+  },
+  border: {
+    name: 'border',
+    control: {type: 'text'},
+  },
+  top: {
+    name: 'top',
+    control: {type: 'text'},
+  },
+  maxHeight: {
+    name: 'max-height',
+    control: {type: 'text'},
+  },
+  maxWidth: {
+    name: 'max-width',
+    control: {type: 'text'},
+  },
+  minWidth: {
+    name: 'min-width',
+    control: {type: 'text'},
+  },
+  outline: {
+    name: 'outline',
+    control: {type: 'text'},
+  },
+  zIndex: {
+    name: 'z-index',
+    defaultValue: 2147483647,
+    control: {type: 'number'},
+  },
+};
 
+export const scroll = ({
+  backdropColor,
+  backgroundColor,
+  foregroundColor,
+  moreBackgroundContent,
+  moreSidebarContent,
+  ...args
+}) => {
   return (
     <main>
       <style>
@@ -202,7 +305,7 @@ export const scroll = () => {
           }
           `}
       </style>
-      <amp-sidebar layout="nodisplay" id="sidebar" side={side}>
+      <amp-sidebar layout="nodisplay" id="sidebar" {...args}>
         <div style={{margin: 8}}>
           <span>
             Lorem ipsum dolor sit amet, has nisl nihil convenire et, vim at
@@ -483,3 +586,36 @@ export const scroll = () => {
     </main>
   );
 };
+
+scroll.argTypes = {
+  side: {
+    name: 'side',
+    defaultValue: 'left',
+    // The option `undefined` is necessary to emulate the behavior when `side`
+    // is not set by the user.
+    options: ['left', 'right', undefined],
+    control: {type: 'select'},
+  },
+  foregroundColor: {
+    name: 'foregroundColor',
+    control: {type: 'color'},
+  },
+  backgroundColor: {
+    name: 'backgroundColor',
+    control: {type: 'color'},
+  },
+  backdropColor: {
+    name: 'backdropColor',
+    control: {type: 'color'},
+  },
+  moreBackgroundContent: {
+    name: 'moreBackgroundContent',
+    defaultValue: 'false',
+    control: {type: 'boolean'},
+  },
+  moreBentoSidebarContent: {
+    name: 'moreBentoSidebarContent',
+    defaultValue: 'false',
+    control: {type: 'boolean'},
+  },
+};
diff --git a/extensions/amp-sidebar/1.0/storybook/Basic.js b/extensions/amp-sidebar/1.0/storybook/Basic.js
index 8f0c8174d99c..8340a5b7518b 100644
--- a/extensions/amp-sidebar/1.0/storybook/Basic.js
+++ b/extensions/amp-sidebar/1.0/storybook/Basic.js
@@ -1,11 +1,12 @@
 import * as Preact from '#preact';
-import {BentoSidebar, BentoSidebarToolbar} from '../component';
-import {boolean, color, select, text, withKnobs} from '@storybook/addon-knobs';
+
+import {BentoSidebar} from '../component';
+
+import '../component.jss';
 
 export default {
   title: 'Sidebar',
   component: BentoSidebar,
-  decorators: [withKnobs],
 };
 
 /**
@@ -45,69 +46,58 @@ function BentoSidebarWithActions(props) {
   );
 }
 
-export const _default = () => {
-  const sideConfigurations = ['left', 'right', undefined];
-  const side = select('side', sideConfigurations, sideConfigurations[0]);
-  const foregroundColor = color('color');
-  const backgroundColor = color('background');
-  const backdropColor = color('backdrop color');
-
+export const Default = ({
+  backdropColor,
+  backgroundColor,
+  foregroundColor,
+  ...args
+}) => {
   return (
     <main>
       <BentoSidebarWithActions
-        side={side}
         style={{color: foregroundColor, backgroundColor}}
         backdropStyle={{backgroundColor: backdropColor}}
+        {...args}
       />
     </main>
   );
 };
 
-export const toolbar = () => {
-  const sideConfigurations = ['left', 'right', undefined];
-  const side = select('side', sideConfigurations, sideConfigurations[0]);
-  const toolbarMedia = text('toolbar media', '(max-width: 500px)');
-  const foregroundColor = color('color');
-  const backgroundColor = color('background');
-  const backdropColor = color('backdrop color');
-
-  return (
-    <main>
-      <BentoSidebarWithActions
-        side={side}
-        style={{color: foregroundColor, backgroundColor}}
-        backdropStyle={{backgroundColor: backdropColor}}
-      >
-        <BentoSidebarToolbar
-          toolbar={toolbarMedia}
-          toolbarTarget="toolbar-target"
-        >
-          <ul>
-            <li>Toolbar Item 1</li>
-            <li>Toolbar Item 2</li>
-          </ul>
-        </BentoSidebarToolbar>
-      </BentoSidebarWithActions>
-      <div id="toolbar-target"></div>
-    </main>
-  );
+Default.argTypes = {
+  side: {
+    name: 'side',
+    defaultValue: 'left',
+    options: ['left', 'right', undefined],
+    control: {type: 'select'},
+  },
+  foregroundColor: {
+    name: 'foregroundColor',
+    control: {type: 'color'},
+  },
+  backgroundColor: {
+    name: 'backgroundColor',
+    control: {type: 'color'},
+  },
+  backdropColor: {
+    name: 'backdropColor',
+    control: {type: 'color'},
+  },
 };
 
-export const scroll = () => {
-  const sideConfigurations = ['left', 'right', undefined];
-  const side = select('side', sideConfigurations, sideConfigurations[0]);
-  const foregroundColor = color('color');
-  const backgroundColor = color('background');
-  const backdropColor = color('backdrop color');
-  const moreBackgroundContent = boolean('more background content', false);
-  const moreBentoSidebarContent = boolean('more sidebar content', false);
-
+export const scroll = ({
+  backdropColor,
+  backgroundColor,
+  foregroundColor,
+  moreBackgroundContent,
+  moreBentoSidebarContent,
+  ...args
+}) => {
   return (
     <main>
       <BentoSidebarWithActions
-        side={side}
         style={{color: foregroundColor, backgroundColor}}
         backdropStyle={{backgroundColor: backdropColor}}
+        {...args}
         moreBackgroundContent={
           moreBackgroundContent && (
             <>
@@ -375,3 +365,34 @@ export const scroll = () => {
     </main>
   );
 };
+
+scroll.argTypes = {
+  side: {
+    name: 'side',
+    defaultValue: 'left',
+    options: ['left', 'right', undefined],
+    control: {type: 'select'},
+  },
+  foregroundColor: {
+    name: 'foregroundColor',
+    control: {type: 'color'},
+  },
+  backgroundColor: {
+    name: 'backgroundColor',
+    control: {type: 'color'},
+  },
+  backdropColor: {
+    name: 'backdropColor',
+    control: {type: 'color'},
+  },
+  moreBackgroundContent: {
+    name: 'moreBackgroundContent',
+    defaultValue: 'false',
+    control: {type: 'boolean'},
+  },
+  moreBentoSidebarContent: {
+    name: 'moreBentoSidebarContent',
+    defaultValue: 'false',
+    control: {type: 'boolean'},
+  },
+};
diff --git a/extensions/amp-sidebar/1.0/test-e2e/test-bento-sidebar.js b/extensions/amp-sidebar/1.0/test-e2e/test-bento-sidebar.js
deleted file mode 100644
index 9dd28aeaf1e8..000000000000
--- a/extensions/amp-sidebar/1.0/test-e2e/test-bento-sidebar.js
+++ /dev/null
@@ -1,35 +0,0 @@
-describes.endtoend(
-  'bento-sidebar',
-  {
-    version: '1.0',
-    fixture: 'bento/sidebar.html',
-    environments: ['single'],
-  },
-  (env) => {
-    let controller;
-
-    beforeEach(() => {
-      controller = env.controller;
-    });
-
-    it('should be able to open and close', async () => {
-      // check if sidebar content is not visibile
-      const navLinkInSidebar = await controller.findElement('nav');
-      await expect(controller.isElementDisplayed(navLinkInSidebar)).to.be.false;
-
-      // Open sidebar
-      const openButton = await controller.findElement('#open-sidebar');
-      controller.click(openButton);
-
-      // check if sidebar content is visible
-      await expect(controller.isElementDisplayed(navLinkInSidebar)).to.be.true;
-
-      // Close sidebar
-      const closeButton = await controller.findElement('#close-sidebar');
-      controller.click(closeButton);
-
-      // check if sidebar content is not visible
-      await expect(controller.isElementDisplayed(navLinkInSidebar)).to.be.false;
-    });
-  }
-);
diff --git a/extensions/amp-sidebar/1.0/test/test-amp-sidebar.js b/extensions/amp-sidebar/1.0/test/test-amp-sidebar.js
index d1d81cf5237f..8249db3783a6 100644
--- a/extensions/amp-sidebar/1.0/test/test-amp-sidebar.js
+++ b/extensions/amp-sidebar/1.0/test/test-amp-sidebar.js
@@ -1,11 +1,14 @@
 import '../amp-sidebar';
-import {ActionInvocation} from '#service/action-impl';
-import {ActionTrust} from '#core/constants/action-constants';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
 import {createElementWithAttributes} from '#core/dom';
 import {htmlFor} from '#core/dom/static-template';
+
 import {toggleExperiment} from '#experiments';
-import {waitFor, whenCalled} from '#testing/helpers/service';
+
 import {Services} from '#service/';
+import {ActionInvocation} from '#service/action-impl';
+
+import {waitFor, whenCalled} from '#testing/helpers/service';
 
 describes.realWin(
   'amp-sidebar:1.0',
@@ -43,7 +46,7 @@ describes.realWin(
         const source = null;
         const caller = null;
         const event = null;
-        const trust = ActionTrust.DEFAULT;
+        const trust = ActionTrust_Enum.DEFAULT;
         return new ActionInvocation(
           element,
           method,
diff --git a/extensions/amp-sidebar/1.0/test/test-component.js b/extensions/amp-sidebar/1.0/test/test-component.js
index 8b514253f252..a242bc15228d 100644
--- a/extensions/amp-sidebar/1.0/test/test-component.js
+++ b/extensions/amp-sidebar/1.0/test/test-component.js
@@ -1,8 +1,9 @@
-import * as Preact from '#preact';
-import {BentoSidebar, BentoSidebarToolbar} from '../component';
-import {htmlFor} from '#core/dom/static-template';
 import {mount} from 'enzyme';
 
+import * as Preact from '#preact';
+
+import {BentoSidebar} from '../component';
+
 describes.sandboxed('BentoSidebar preact component', {}, (env) => {
   const isOpened = (sidebarElement) => {
     return !sidebarElement.className.includes('unmounted');
@@ -643,167 +644,4 @@ describes.sandboxed('BentoSidebar preact component', {}, (env) => {
       Element.prototype.animate = animateFunction;
     });
   });
-
-  describe('toolbar', () => {
-    let wrapper;
-    let ref;
-    let matchMediaFunction;
-    let html;
-    let mediaQuery;
-    let target;
-
-    beforeEach(() => {
-      ref = Preact.createRef();
-      matchMediaFunction = window.matchMedia;
-
-      // append the toolbar target to document body separately
-      // test cannot find it otherwise
-      html = htmlFor(document);
-      target = html`<div id="toolbar-target"></div>`;
-      document.body.appendChild(target);
-    });
-
-    afterEach(() => {
-      window.matchMedia = matchMediaFunction;
-      wrapper.unmount();
-      document.body.removeChild(target);
-    });
-
-    it('toolbar target should receive expected content from toolbar', () => {
-      // this media query is always true
-      mediaQuery = '';
-      wrapper = mount(
-        <>
-          <BentoSidebar ref={ref} side="left">
-            <div>Content</div>
-            <BentoSidebarToolbar
-              toolbar={mediaQuery}
-              toolbarTarget="toolbar-target"
-            >
-              <ul>
-                <li>Toolbar Item 1</li>
-                <li>Toolbar Item 2</li>
-              </ul>
-            </BentoSidebarToolbar>
-          </BentoSidebar>
-        </>
-      );
-
-      // Toolbar nodes were appended to the target
-      expect(target.hasChildNodes()).to.be.true;
-      expect(target.childElementCount).to.equal(2);
-      expect(target.firstElementChild.nodeName).to.equal('NAV');
-      expect(target.lastElementChild.nodeName).to.equal('STYLE');
-    });
-
-    it('existing children in toolbar target should not be overwritten', () => {
-      // this media query is always true
-      mediaQuery = '';
-      target.innerHTML = '<span>hello world<span>';
-      wrapper = mount(
-        <>
-          <BentoSidebar ref={ref} side="left">
-            <div>Content</div>
-            <BentoSidebarToolbar
-              toolbar={mediaQuery}
-              toolbarTarget="toolbar-target"
-            >
-              <ul>
-                <li>Toolbar Item 1</li>
-                <li>Toolbar Item 2</li>
-              </ul>
-            </BentoSidebarToolbar>
-          </BentoSidebar>
-        </>
-      );
-
-      // Toolbar target now has 3 nodes, 1 existing, 2 appended from toolbar
-      expect(target.hasChildNodes()).to.be.true;
-      expect(target.childElementCount).to.equal(3);
-      expect(target.firstElementChild.nodeName).to.equal('SPAN');
-      expect(target.children[1].nodeName).to.equal('NAV');
-      expect(target.lastElementChild.nodeName).to.equal('STYLE');
-    });
-
-    it('toolbar target content should be removed on unmount', () => {
-      // this media query is always false
-      mediaQuery = '(max-height: 0px)';
-      wrapper = mount(
-        <>
-          <BentoSidebar ref={ref} side="left">
-            <div>Content</div>
-            <BentoSidebarToolbar
-              toolbar={mediaQuery}
-              toolbarTarget="toolbar-target"
-            >
-              <ul>
-                <li>Toolbar Item 1</li>
-                <li>Toolbar Item 2</li>
-              </ul>
-            </BentoSidebarToolbar>
-          </BentoSidebar>
-        </>
-      );
-
-      expect(target.hasChildNodes()).to.be.true;
-      expect(target.childElementCount).to.equal(2);
-
-      wrapper.unmount();
-      expect(target.hasChildNodes()).to.be.false;
-    });
-
-    it('toolbar should sanitize an invalid media query', () => {
-      // this is an invalid media query
-      mediaQuery = 'foo {}';
-      wrapper = mount(
-        <>
-          <BentoSidebar ref={ref} side="left">
-            <div>Content</div>
-            <BentoSidebarToolbar
-              toolbar={mediaQuery}
-              toolbarTarget="toolbar-target"
-            >
-              <ul>
-                <li>Toolbar Item 1</li>
-                <li>Toolbar Item 2</li>
-              </ul>
-            </BentoSidebarToolbar>
-          </BentoSidebar>
-        </>
-      );
-
-      expect(target.hasChildNodes()).to.be.true;
-      expect(target.childElementCount).to.equal(2);
-      const styleElementText = target.lastElementChild.textContent;
-      expect(styleElementText).to.include('not all'); //sanitized media query
-      expect(styleElementText).not.to.include('foo'); //unsanitized media query
-    });
-
-    it('toolbar should sanitize the toolbar target attribute', () => {
-      // this media query is always true
-      mediaQuery = '';
-      const toolbarTarget = 'toolbar-target:.';
-      const getElementByIdSpy = env.sandbox.spy(document, 'getElementById');
-      wrapper = mount(
-        <>
-          <BentoSidebar ref={ref} side="left">
-            <div>Content</div>
-            <BentoSidebarToolbar
-              toolbar={mediaQuery}
-              toolbarTarget={toolbarTarget}
-            >
-              <ul>
-                <li>Toolbar Item 1</li>
-                <li>Toolbar Item 2</li>
-              </ul>
-            </BentoSidebarToolbar>
-          </BentoSidebar>
-        </>
-      );
-
-      expect(getElementByIdSpy).to.be.calledOnce;
-      expect(getElementByIdSpy).to.be.calledWith('toolbar-target\\:\\.');
-      expect(target.hasChildNodes()).to.be.false;
-    });
-  });
 });
diff --git a/extensions/amp-sidebar/validator-amp-sidebar.protoascii b/extensions/amp-sidebar/validator-amp-sidebar.protoascii
index b917ce009bab..782e9360bdd3 100644
--- a/extensions/amp-sidebar/validator-amp-sidebar.protoascii
+++ b/extensions/amp-sidebar/validator-amp-sidebar.protoascii
@@ -1,8 +1,8 @@
 tags: {  # amp-sidebar
   html_format: AMP
   tag_name: "SCRIPT"
-  satisfies: "amp-sidebar 1.0"
-  excludes: "amp-sidebar 0.1"
+  satisfies_condition: "amp-sidebar 1.0"
+  excludes_condition: "amp-sidebar 0.1"
   extension_spec: {
     name: "amp-sidebar"
     version_name: "v1.0"
@@ -14,8 +14,8 @@ tags: {  # amp-sidebar
 tags: {  # amp-sidebar
   html_format: AMP
   tag_name: "SCRIPT"
-  satisfies: "amp-sidebar 0.1"
-  excludes: "amp-sidebar 1.0"
+  satisfies_condition: "amp-sidebar 0.1"
+  excludes_condition: "amp-sidebar 1.0"
   extension_spec: {
     name: "amp-sidebar"
     version_name: "v0.1"
diff --git a/extensions/amp-skimlinks/0.1/affiliate-link-resolver.js b/extensions/amp-skimlinks/0.1/affiliate-link-resolver.js
index 701ef2cdf257..a54f6606d16c 100644
--- a/extensions/amp-skimlinks/0.1/affiliate-link-resolver.js
+++ b/extensions/amp-skimlinks/0.1/affiliate-link-resolver.js
@@ -1,5 +1,3 @@
-import {dict} from '#core/types/object';
-
 import {TwoStepsResponse} from './link-rewriter/two-steps-response';
 import {getNormalizedHostnameFromAnchor, isExcludedDomain} from './utils';
 
@@ -54,7 +52,7 @@ export class AffiliateLinkResolver {
     this.waypoint_ = waypoint;
 
     /** @private {!JsonObject} */
-    this.domains_ = dict({});
+    this.domains_ = {};
 
     /**
      * @public {?Promise}
@@ -75,11 +73,11 @@ export class AffiliateLinkResolver {
    * @public
    */
   fetchDomainResolverApi(domains) {
-    const data = dict({
+    const data = {
       'pubcode': this.skimOptions_.pubcode,
       'page': '',
       'domains': domains,
-    });
+    };
     let {beaconUrl} = this.skimOptions_.config;
     beaconUrl = `${beaconUrl}?data=${JSON.stringify(data)}`;
     const fetchOptions = {
diff --git a/extensions/amp-skimlinks/0.1/amp-skimlinks.js b/extensions/amp-skimlinks/0.1/amp-skimlinks.js
index b09f7e264ce6..de1408c76464 100644
--- a/extensions/amp-skimlinks/0.1/amp-skimlinks.js
+++ b/extensions/amp-skimlinks/0.1/amp-skimlinks.js
@@ -1,4 +1,4 @@
-import {CommonSignals} from '#core/constants/common-signals';
+import {CommonSignals_Enum} from '#core/constants/common-signals';
 import {once} from '#core/types/function';
 
 import {Services} from '#service';
@@ -176,12 +176,12 @@ export class AmpSkimlinks extends AMP.BaseElement {
    * @private
    */
   initTracking_() {
-    // 'amp-analytics' API is waiting for CommonSignals.LOAD_START to be
+    // 'amp-analytics' API is waiting for CommonSignals_Enum.LOAD_START to be
     // triggered before sending requests.
-    // Normally CommonSignals.LOAD_START is sent from layoutCallback but since
+    // Normally CommonSignals_Enum.LOAD_START is sent from layoutCallback but since
     // we are using layout = 'nodisplay', 'layoutCallback' is never called.
     // We need to call it manually to have CustomEventReporterBuilder working.
-    this.signals().signal(CommonSignals.LOAD_START);
+    this.signals().signal(CommonSignals_Enum.LOAD_START);
     return new Tracking(
       this.element,
       this.skimOptions_,
diff --git a/extensions/amp-skimlinks/0.1/link-rewriter/link-rewriter-manager.js b/extensions/amp-skimlinks/0.1/link-rewriter/link-rewriter-manager.js
index 2317bfa20b60..bbe8ebe3d09b 100644
--- a/extensions/amp-skimlinks/0.1/link-rewriter/link-rewriter-manager.js
+++ b/extensions/amp-skimlinks/0.1/link-rewriter/link-rewriter-manager.js
@@ -1,7 +1,7 @@
-import {AmpEvents} from '#core/constants/amp-events';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
 
 import {Services} from '#service';
-import {Priority} from '#service/navigation';
+import {Priority_Enum} from '#service/navigation';
 
 import {EVENTS, PRIORITY_META_TAG_NAME} from './constants';
 import {LinkRewriter} from './link-rewriter';
@@ -66,7 +66,7 @@ export class LinkRewriterManager {
     const navigation = Services.navigationForDoc(ampdoc);
     navigation.registerAnchorMutator(
       this.maybeRewriteLink.bind(this),
-      Priority.LINK_REWRITER_MANAGER
+      Priority_Enum.LINK_REWRITER_MANAGER
     );
   }
 
@@ -181,7 +181,7 @@ export class LinkRewriterManager {
    */
   installGlobalEventListener_(rootNode) {
     rootNode.addEventListener(
-      AmpEvents.DOM_UPDATE,
+      AmpEvents_Enum.DOM_UPDATE,
       this.onDomChanged_.bind(this)
     );
   }
diff --git a/extensions/amp-skimlinks/0.1/link-rewriter/link-rewriter.js b/extensions/amp-skimlinks/0.1/link-rewriter/link-rewriter.js
index 751daff9da3f..aabdc4749907 100644
--- a/extensions/amp-skimlinks/0.1/link-rewriter/link-rewriter.js
+++ b/extensions/amp-skimlinks/0.1/link-rewriter/link-rewriter.js
@@ -6,7 +6,7 @@ import {EVENTS, ORIGINAL_URL_ATTRIBUTE} from './constants';
 import {LinkReplacementCache} from './link-replacement-cache';
 import {TwoStepsResponse} from './two-steps-response';
 
-import {ChunkPriority, chunk} from '../../../../src/chunk';
+import {ChunkPriority_Enum, chunk} from '../../../../src/chunk';
 
 /** @typedef {!Array<{anchor: !HTMLElement, replacementUrl: ?string}>}} */
 export let AnchorReplacementList;
@@ -147,7 +147,7 @@ export class LinkRewriter {
           ? this.rootNode_.documentElement
           : this.rootNode_
       );
-      chunk(elementOrShadowRoot, task, ChunkPriority.LOW);
+      chunk(elementOrShadowRoot, task, ChunkPriority_Enum.LOW);
     });
   }
 
diff --git a/extensions/amp-skimlinks/0.1/test/test-link-rewriter.js b/extensions/amp-skimlinks/0.1/test/test-link-rewriter.js
index d83d291bc0d1..fdc39ce065b2 100644
--- a/extensions/amp-skimlinks/0.1/test/test-link-rewriter.js
+++ b/extensions/amp-skimlinks/0.1/test/test-link-rewriter.js
@@ -1,7 +1,9 @@
-import {AmpEvents} from '#core/constants/amp-events';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
 
 import {createCustomEvent} from '#utils/event-helper';
 
+import {sleep} from '#testing/helpers';
+
 import * as chunkModule from '../../../../src/chunk';
 import {
   ORIGINAL_URL_ATTRIBUTE,
@@ -67,7 +69,9 @@ describes.fakeWin('LinkRewriterManager', {amp: true}, (env) => {
 
   describe('When starting service', () => {
     it('Should listen for DOM_UPDATE', () => {
-      const spy = rootDocument.addEventListener.withArgs(AmpEvents.DOM_UPDATE);
+      const spy = rootDocument.addEventListener.withArgs(
+        AmpEvents_Enum.DOM_UPDATE
+      );
       expect(spy.calledOnce).to.be.true;
     });
 
@@ -189,7 +193,7 @@ describes.fakeWin('LinkRewriterManager', {amp: true}, (env) => {
       const linkRewriterVendor2 = registerLinkRewriterHelper('vendor2');
       const linkRewriterVendor3 = registerLinkRewriterHelper('vendor3');
 
-      sendEventHelper(AmpEvents.DOM_UPDATE);
+      sendEventHelper(AmpEvents_Enum.DOM_UPDATE);
 
       expect(linkRewriterVendor1.onDomUpdated.calledOnce).to.be.true;
       expect(linkRewriterVendor2.onDomUpdated.calledOnce).to.be.true;
@@ -743,7 +747,7 @@ describes.fakeWin('Link Rewriter', {amp: true}, (env) => {
       expect(anchor1.getAttribute(ORIGINAL_URL_ATTRIBUTE)).to.equal(initialUrl);
     });
 
-    it('Should restore the original link after the delay', (done) => {
+    it('Should restore the original link after the delay', async () => {
       const replacementUrl = 'https://replacementurl.com/';
       linkRewriter.anchorReplacementCache_.updateLinkList([anchor1]);
       linkRewriter.anchorReplacementCache_.updateReplacementUrls([
@@ -752,10 +756,9 @@ describes.fakeWin('Link Rewriter', {amp: true}, (env) => {
       linkRewriter.rewriteAnchorUrl(anchor1);
 
       expect(anchor1.href).to.equal(replacementUrl);
-      setTimeout(() => {
-        expect(anchor1.href).to.equal(initialUrl);
-        done();
-      }, linkRewriter.restoreDelay_ + 1);
+
+      await sleep(linkRewriter.restoreDelay_ + 1);
+      expect(anchor1.href).to.equal(initialUrl);
     });
   });
 });
diff --git a/extensions/amp-skimlinks/0.1/tracking.js b/extensions/amp-skimlinks/0.1/tracking.js
index fa4cd333fc75..16f36425156b 100644
--- a/extensions/amp-skimlinks/0.1/tracking.js
+++ b/extensions/amp-skimlinks/0.1/tracking.js
@@ -1,5 +1,3 @@
-import {dict} from '#core/types/object';
-
 import {PLATFORM_NAME, XCUST_ATTRIBUTE_NAME} from './constants';
 import {generatePageImpressionId, isExcludedAnchorUrl} from './utils';
 
@@ -82,14 +80,14 @@ export class Tracking {
       this.trackingInfo_;
 
     // This data is common to both page & link impression requests.
-    const commonData = dict({
+    const commonData = {
       'pub': pubcode,
       'pag': pageUrl,
       'guid': guid,
       'uuid': pageImpressionId,
       'tz': timezone,
       'jv': PLATFORM_NAME,
-    });
+    };
 
     const {numberAffiliateLinks, urls} = this.extractAnchorTrackingInfo_(
       anchorReplacementList
@@ -118,7 +116,7 @@ export class Tracking {
       timezone,
     } = this.trackingInfo_;
 
-    const data = dict({
+    const data = {
       'pubcode': pubcode,
       'referrer': pageUrl,
       'pref': referrer,
@@ -129,18 +127,15 @@ export class Tracking {
       'uuid': pageImpressionId,
       'product': '1',
       'jv': PLATFORM_NAME,
-    });
+    };
 
     // Sends POST request. Second param is the object used to interpolate
     // placeholder variables defined in NA_CLICK_TRACKING_URL
     // (See constants.js).
-    this.analytics_.trigger(
-      NON_AFFILIATE_CLICK,
-      dict({
-        'data': JSON.stringify(data),
-        'rnd': 'RANDOM',
-      })
-    );
+    this.analytics_.trigger(NON_AFFILIATE_CLICK, {
+      'data': JSON.stringify(data),
+      'rnd': 'RANDOM',
+    });
   }
 
   /**
@@ -153,28 +148,21 @@ export class Tracking {
   sendPageImpressionTracking_(commonData, numberAffiliateLinks) {
     const {customTrackingId, referrer} = this.trackingInfo_;
 
-    const data = /** @type {!JsonObject} */ (
-      Object.assign(
-        dict({
-          'slc': numberAffiliateLinks,
-          'jsl': 0, // Javascript load time, not relevant in AMP context.
-          'pref': referrer,
-          'uc': customTrackingId,
-          't': 1,
-        }),
-        commonData
-      )
-    );
+    const data = /** @type {!JsonObject} */ ({
+      'slc': numberAffiliateLinks,
+      'jsl': 0,
+      'pref': referrer,
+      'uc': customTrackingId,
+      't': 1,
+      ...commonData,
+    });
 
     // Sends POST request. Second param is the object used to interpolate
     // placeholder variables defined in PAGE_IMPRESSION_TRACKING_URL
     // (See constants.js).
-    this.analytics_.trigger(
-      PAGE_IMPRESSIONS,
-      dict({
-        'data': JSON.stringify(data),
-      })
-    );
+    this.analytics_.trigger(PAGE_IMPRESSIONS, {
+      'data': JSON.stringify(data),
+    });
   }
 
   /**
@@ -191,26 +179,19 @@ export class Tracking {
       return;
     }
 
-    const data = /** @type {!JsonObject} */ (
-      Object.assign(
-        dict({
-          'dl': urls,
-          'hae': numberAffiliateLinks ? 1 : 0, // 1 if has at least one AE link
-          'typ': 'l',
-        }),
-        commonData
-      )
-    );
+    const data = /** @type {!JsonObject} */ ({
+      'dl': urls,
+      'hae': numberAffiliateLinks ? 1 : 0,
+      'typ': 'l',
+      ...commonData,
+    });
 
     // Send POST request. Second param is the object used to interpolate
     // placeholder variables defined in LINKS_IMPRESSIONS_TRACKING_URL.
     // (See constants.js).
-    this.analytics_.trigger(
-      LINK_IMPRESSIONS,
-      dict({
-        'data': JSON.stringify(data),
-      })
-    );
+    this.analytics_.trigger(LINK_IMPRESSIONS, {
+      'data': JSON.stringify(data),
+    });
   }
 
   /**
@@ -233,16 +214,14 @@ export class Tracking {
     analyticsBuilder.track(LINK_IMPRESSIONS, linksTrackingUrl);
     analyticsBuilder.track(NON_AFFILIATE_CLICK, nonAffiliateTrackingUrl);
 
-    analyticsBuilder.setTransportConfig(
-      dict({
-        'beacon': true,
-        'image': true,
-        // Tracking API supports CORS with wildcard in Access-Control-Origin
-        // which is not compatible with the credentials flag set to true when
-        // using xhrpost.
-        'xhrpost': false,
-      })
-    );
+    analyticsBuilder.setTransportConfig({
+      'beacon': true,
+      'image': true,
+      // Tracking API supports CORS with wildcard in Access-Control-Origin
+      // which is not compatible with the credentials flag set to true when
+      // using xhrpost.
+      'xhrpost': false,
+    });
 
     return analyticsBuilder.build();
   }
@@ -263,7 +242,7 @@ export class Tracking {
    */
   extractAnchorTrackingInfo_(anchorReplacementList) {
     let numberAffiliateLinks = 0;
-    const urls = dict({});
+    const urls = {};
 
     anchorReplacementList.forEach((anchorReplacement) => {
       const {anchor, replacementUrl} = anchorReplacement;
@@ -274,12 +253,10 @@ export class Tracking {
         return;
       }
 
-      urls[anchor.href] =
-        urls[anchor.href] ||
-        dict({
-          'ae': 1, // 1 means affiliated link.
-          'count': 0,
-        });
+      urls[anchor.href] = urls[anchor.href] || {
+        'ae': 1, // 1 means affiliated link.
+        'count': 0,
+      };
 
       urls[anchor.href]['count'] += 1;
       numberAffiliateLinks += 1;
diff --git a/extensions/amp-skimlinks/0.1/waypoint.js b/extensions/amp-skimlinks/0.1/waypoint.js
index b0c04af5ef04..e126793e9556 100644
--- a/extensions/amp-skimlinks/0.1/waypoint.js
+++ b/extensions/amp-skimlinks/0.1/waypoint.js
@@ -1,5 +1,3 @@
-import {dict} from '#core/types/object';
-
 import {Services} from '#service';
 
 import {PLATFORM_NAME, XCUST_ATTRIBUTE_NAME} from './constants';
@@ -50,7 +48,7 @@ export class Waypoint {
 
     const xcust = anchor.getAttribute(XCUST_ATTRIBUTE_NAME) || customTrackingId;
 
-    const queryParams = dict({
+    const queryParams = {
       'id': pubcode,
       'url': anchor.href,
       'sref': this.canonicalUrl_,
@@ -60,7 +58,7 @@ export class Waypoint {
       'xtz': this.timezone_,
       'xs': '1', // Always use source_app=1 (skimlinks)
       'jv': PLATFORM_NAME,
-    });
+    };
     if (xcust) {
       queryParams['xcust'] = xcust;
     }
diff --git a/extensions/amp-skimlinks/validator-amp-skimlinks.protoascii b/extensions/amp-skimlinks/validator-amp-skimlinks.protoascii
index af84f954fcd9..d4231f5014c8 100644
--- a/extensions/amp-skimlinks/validator-amp-skimlinks.protoascii
+++ b/extensions/amp-skimlinks/validator-amp-skimlinks.protoascii
@@ -7,9 +7,9 @@ tags: {  # amp-skimlinks
     version: "latest"
   }
   attr_lists: "common-extension-attrs"
-  satisfies: "amp-skimlinks"
-  excludes: "amp-link-rewriter"
-  excludes: "amp-smartlinks"
+  satisfies_condition: "amp-skimlinks"
+  excludes_condition: "amp-link-rewriter"
+  excludes_condition: "amp-smartlinks"
 }
 
 tags: {  # <amp-skimlinks>
diff --git a/extensions/amp-slikeplayer/0.1/amp-slikeplayer.js b/extensions/amp-slikeplayer/0.1/amp-slikeplayer.js
new file mode 100644
index 000000000000..f870d2cc8bb6
--- /dev/null
+++ b/extensions/amp-slikeplayer/0.1/amp-slikeplayer.js
@@ -0,0 +1,321 @@
+import {Deferred} from '#core/data-structures/promise';
+import {dispatchCustomEvent} from '#core/dom';
+import {isLayoutSizeDefined} from '#core/dom/layout';
+import {once} from '#core/types/function';
+
+import {Services} from '#service';
+import {installVideoManagerForDoc} from '#service/video-manager-impl';
+
+import {getData, listen} from '#utils/event-helper';
+import {userAssert} from '#utils/log';
+
+import {disableScrollingOnIframe} from '../../../src/iframe-helper';
+import {
+  addUnsafeAllowAutoplay,
+  createFrameFor,
+  isJsonOrObj,
+  objOrParseJson,
+  redispatch,
+} from '../../../src/iframe-video';
+import {VideoEvents_Enum} from '../../../src/video-interface';
+
+const TAG = 'amp-slikeplayer';
+
+/**
+ * @implements {../../../src/video-interface.VideoInterface}
+ */
+
+/**
+ @enum {string}
+ * @private
+ */
+
+const SlEvent = {
+  'ready': VideoEvents_Enum.LOAD,
+  'play': VideoEvents_Enum.PLAYING,
+  'pause': VideoEvents_Enum.PAUSE,
+  'complete': VideoEvents_Enum.ENDED,
+  'visible': VideoEvents_Enum.VISIBILITY,
+  'adStart': VideoEvents_Enum.AD_START,
+  'adEnd': VideoEvents_Enum.AD_END,
+};
+
+export class AmpSlikeplayer extends AMP.BaseElement {
+  /** @param {!AmpElement} element */
+  constructor(element) {
+    super(element);
+
+    /** @private {string} */
+    this.apikey_ = '';
+
+    /** @private {string} */
+    this.videoid_ = '';
+
+    /** @private {?HTMLIFrameElement} */
+    this.iframe_ = null;
+
+    /** @private {?Promise} */
+    this.playerReadyPromise_ = null;
+
+    /** @private {?function(Element)} */
+    this.playerReadyResolver_ = null;
+
+    /** @private {function(Object)} */
+    this.onReadyOnce_ = once((detail) => this.onReady_(detail));
+
+    /** @private {string} */
+    this.config_ = null;
+
+    /** @private {string} */
+    this.poster_ = '';
+
+    /** @private {string} */
+    this.baseUrl_ = 'https://tvid.in/sdk/amp/ampembed.html';
+
+    /** @private {number} */
+    this.duration_ = 1;
+
+    /** @private {number} */
+    this.currentTime_ = 0;
+
+    /** @private {function()} */
+    this.onMessage_ = this.onMessage_.bind(this);
+  }
+
+  /** @override */
+  buildCallback() {
+    const {element} = this;
+    const deferred = new Deferred();
+
+    this.playerReadyPromise_ = deferred.promise;
+    this.playerReadyResolver_ = deferred.resolve;
+
+    this.apikey_ = userAssert(
+      element.getAttribute('data-apikey'),
+      'The data-apikey attribute is required for <amp-slikeplayer> %s',
+      element
+    );
+
+    this.videoid_ = userAssert(
+      element.getAttribute('data-videoid'),
+      'The data-videoid attribute is required for <amp-slikeplayer> %s',
+      element
+    );
+
+    this.baseUrl_ = element.getAttribute('data-iframe-src') || this.baseUrl_;
+    this.config_ = element.getAttribute('data-config') || '';
+    installVideoManagerForDoc(element);
+    Services.videoManagerForDoc(element).register(this);
+  }
+
+  /** @override */
+  createPlaceholderCallback() {
+    if (!this.poster_) {
+      return;
+    }
+    const placeholder = this.win.document.createElement('amp-img');
+    this.propagateAttributes(['aria-label'], placeholder);
+    const src = this.poster_;
+    placeholder.setAttribute('src', src);
+    placeholder.setAttribute('layout', 'fill');
+    placeholder.setAttribute('placeholder', '');
+    placeholder.setAttribute('referrerpolicy', 'origin');
+    if (placeholder.hasAttribute('aria-label')) {
+      placeholder.setAttribute(
+        'alt',
+        'Loading video - ' + placeholder.getAttribute('aria-label')
+      );
+    } else {
+      placeholder.setAttribute('alt', 'Loading video');
+    }
+    return placeholder;
+  }
+
+  /** @override */
+  layoutCallback() {
+    let src = `${this.baseUrl_}#apikey=${this.apikey_}&videoid=${this.videoid_}&baseurl=${window.location.origin}`;
+
+    if (this.config_) {
+      src = `${this.baseUrl_}#apikey=${this.apikey_}&videoid=${this.videoid_}&${this.config_}&baseurl=${window.location.origin}`;
+    }
+
+    const frame = disableScrollingOnIframe(
+      createFrameFor(this, src, this.element.id)
+    );
+
+    addUnsafeAllowAutoplay(frame);
+    disableScrollingOnIframe(frame);
+    this.unlistenFrame_ = listen(this.win, 'message', this.onMessage_);
+    this.iframe_ = /** @type {HTMLIFrameElement} */ (frame);
+    return this.loadPromise(this.iframe_);
+  }
+
+  /** @override */
+  isLayoutSupported(layout) {
+    return isLayoutSizeDefined(layout);
+  }
+
+  /** @override */
+  supportsPlatform() {
+    return true;
+  }
+
+  /** @override */
+  preimplementsAutoFullscreen() {
+    return false;
+  }
+
+  /** @private */
+  onReady_() {
+    const {element} = this;
+    this.playerReadyResolver_(this.iframe_);
+    dispatchCustomEvent(element, VideoEvents_Enum.LOAD);
+  }
+
+  /**
+   * @param {string} messageEvent
+   * @private
+   */
+  onMessage_(messageEvent) {
+    if (
+      !this.iframe_ ||
+      !messageEvent ||
+      messageEvent.source != this.iframe_.contentWindow
+    ) {
+      return;
+    }
+
+    const messageData = getData(messageEvent);
+    if (!isJsonOrObj(messageData)) {
+      return;
+    }
+
+    const data = objOrParseJson(messageData);
+    const event = data['event'];
+    const detail = data['detail'];
+    if (event === 'ready') {
+      detail && this.onReadyOnce_(detail);
+      return;
+    }
+    const {element} = this;
+    if (redispatch(element, event, SlEvent)) {
+      return;
+    }
+    if (detail && event) {
+      switch (event) {
+        case 'fullscreen':
+          break;
+        case 'meta':
+          break;
+        case 'mute':
+          break;
+        case 'playedRanges':
+          break;
+        case 'time':
+          const {currentTime} = detail;
+          this.currentTime_ = currentTime;
+          break;
+        case 'adTime':
+          const {position} = detail;
+          this.currentTime_ = position;
+        default:
+          break;
+      }
+    }
+  }
+  /**
+   * @override
+   */
+  postMessage_(message) {
+    if (this.iframe_ && this.iframe_.contentWindow) {
+      this.iframe_.contentWindow./*OK*/ postMessage(message);
+    }
+  }
+
+  /**
+   * @override
+   */
+  play() {
+    this.postMessage_('play', '');
+  }
+
+  /**
+   * @override
+   */
+  pause() {
+    this.postMessage_('pause', '');
+  }
+
+  /**
+   * @override
+   */
+  mute() {
+    this.postMessage_('mute', '');
+  }
+
+  /**
+   * @override
+   */
+  unmute() {
+    this.postMessage_('unmute', '');
+  }
+
+  /** @override */
+  preimplementsAutoFullscreen() {
+    return false;
+  }
+
+  /** @override */
+  preimplementsMediaSessionAPI() {
+    return false;
+  }
+
+  /** @override */
+  getMetadata() {
+    //Not Implemented
+  }
+
+  /** @override */
+  getCurrentTime() {
+    // Not supported.
+    return this.currentTime_ || 0;
+  }
+
+  /** @override */
+  getDuration() {
+    return this.duration_ || 1;
+  }
+
+  /** @override */
+  getPlayedRanges() {
+    return [];
+  }
+
+  /** @override */
+  seekTo(unusedTimeSeconds) {
+    //to be implemented
+  }
+  /**
+   * @param {string} method
+   * @param {string} [optParams]
+   * @private
+   */
+  postMessage_(method, optParams) {
+    this.playerReadyPromise_.then(() => {
+      if (!this.iframe_ || !this.iframe_.contentWindow) {
+        return;
+      }
+      this.iframe_.contentWindow./*OK*/ postMessage(
+        JSON.stringify({
+          'method': method,
+          'optParams': optParams,
+        }),
+        '*'
+      );
+    });
+  }
+}
+
+AMP.extension(TAG, '0.1', (AMP) => {
+  AMP.registerElement(TAG, AmpSlikeplayer);
+});
diff --git a/extensions/amp-slikeplayer/0.1/test/test-amp-slikeplayer.js b/extensions/amp-slikeplayer/0.1/test/test-amp-slikeplayer.js
new file mode 100644
index 000000000000..43ccd5bd8194
--- /dev/null
+++ b/extensions/amp-slikeplayer/0.1/test/test-amp-slikeplayer.js
@@ -0,0 +1,91 @@
+import '../amp-slikeplayer';
+describes.realWin(
+  'amp-slikeplayer-v0.1',
+  {
+    amp: {
+      runtimeOn: true,
+      extensions: ['amp-slikeplayer:0.1'],
+    },
+  },
+  (env) => {
+    let win, doc;
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+    });
+
+    async function getSlike(attributes, opt_responsive) {
+      const slikeplayer = doc.createElement('amp-slikeplayer');
+      for (const key in attributes) {
+        slikeplayer.setAttribute(key, attributes[key]);
+      }
+      slikeplayer.setAttribute('width', '320');
+      slikeplayer.setAttribute('height', '180');
+      if (opt_responsive) {
+        slikeplayer.setAttribute('layout', 'responsive');
+      }
+
+      doc.body.appendChild(slikeplayer);
+      await slikeplayer.buildInternal();
+      await slikeplayer.layoutCallback();
+      return slikeplayer;
+    }
+
+    it('renders', async () => {
+      const slikeplayer = await getSlike(
+        {
+          'data-apikey': 'slike373googleamp5accuzkglo',
+          'data-videoid': '1xp5a1wkul',
+          'data-config': 'skipad=true',
+        },
+        true
+      );
+      const iframe = slikeplayer.querySelector('iframe');
+      expect(iframe).to.not.be.null;
+      expect(iframe.tagName).to.equal('IFRAME');
+      expect(iframe.src).to.equal(
+        'https://tvid.in/sdk/amp/ampembed.html#apikey=slike373googleamp5accuzkglo&videoid=1xp5a1wkul&skipad=true&baseurl=' +
+          window.location.origin
+      );
+    });
+
+    it('renders responsively', async () => {
+      const slikeplayer = await getSlike(
+        {
+          'data-apikey': 'slike373googleamp5accuzkglo',
+          'data-videoid': '1xp5a1wkul',
+        },
+        true
+      );
+      const iframe = slikeplayer.querySelector('iframe');
+      expect(iframe).to.not.be.null;
+      expect(iframe.tagName).to.equal('IFRAME');
+      expect(iframe.src).to.equal(
+        'https://tvid.in/sdk/amp/ampembed.html#apikey=slike373googleamp5accuzkglo&videoid=1xp5a1wkul&baseurl=' +
+          window.location.origin
+      );
+    });
+
+    it('requires data-videoid', () => {
+      return getSlike(
+        {
+          'data-apikey': 'slike373googleamp5accuzkglo',
+        },
+        true
+      ).should.eventually.be.rejectedWith(
+        /The data-videoid attribute is required for/
+      );
+    });
+
+    it('requires data-apikey', () => {
+      return getSlike(
+        {
+          'data-videoid': '1xp5a1wkul',
+        },
+        true
+      ).should.eventually.be.rejectedWith(
+        /The data-apikey attribute is required for/
+      );
+    });
+  }
+);
diff --git a/extensions/amp-slikeplayer/0.1/test/validator-amp-slikeplayer.html b/extensions/amp-slikeplayer/0.1/test/validator-amp-slikeplayer.html
new file mode 100644
index 000000000000..9a0a6ab6122a
--- /dev/null
+++ b/extensions/amp-slikeplayer/0.1/test/validator-amp-slikeplayer.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html ⚡ lang="en">
+  <!-- prettier-ignore -->
+  <head>
+    <meta charset="utf-8">
+    <title>amp-slikeplayer example</title>
+    <link rel="canonical" href="/examples/slikeplayer.amp.html">
+    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+    <script async custom-element="amp-slikeplayer" src="https://cdn.ampproject.org/v0/amp-slikeplayer-0.1.js"></script>
+    <script async src="https://cdn.ampproject.org/v0.js"></script>
+  </head>
+  <body>
+     <!-- Valid Slike Player with config-->
+     <amp-slikeplayer
+     data-apikey= "slike373googleamp5accuzkglo"
+     data-videoid = "1xp5a1wkul"
+     data-config = "playlist=true&playlisturl=//videoplayer.indiatimes.com/dev/playlistcallback.js"
+     layout="responsive"
+     width="320"
+     height="180"
+   ></amp-slikeplayer>
+    <!-- Valid Slike Player -->
+    <amp-slikeplayer
+      data-apikey= "slike373googleamp5accuzkglo"
+      data-videoid = "1xp5a1wkul"
+      layout="responsive"
+      width="320"
+      height="180"
+    ></amp-slikeplayer>
+    <!-- Invalid Slike Player -->
+      <amp-slikeplayer
+        data-videoid = "1xp5a1wkul"
+        layout="responsive"
+        width="320"
+        height="180"
+      ></amp-slikeplayer>
+      <!-- Invalid Slike Player -->
+      <amp-slikeplayer
+        data-apikey= "slike373googleamp5accuzkglo"
+        layout="responsive"
+        width="320"
+        height="180"
+      ></amp-slikeplayer>
+  </body>
+</html>
diff --git a/extensions/amp-slikeplayer/0.1/test/validator-amp-slikeplayer.out b/extensions/amp-slikeplayer/0.1/test/validator-amp-slikeplayer.out
new file mode 100644
index 000000000000..dd43123d062c
--- /dev/null
+++ b/extensions/amp-slikeplayer/0.1/test/validator-amp-slikeplayer.out
@@ -0,0 +1,51 @@
+FAIL
+|  <!DOCTYPE html>
+|  <html ⚡ lang="en">
+|    <!-- prettier-ignore -->
+|    <head>
+|      <meta charset="utf-8">
+|      <title>amp-slikeplayer example</title>
+|      <link rel="canonical" href="/examples/slikeplayer.amp.html">
+|      <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+|      <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+|      <script async custom-element="amp-slikeplayer" src="https://cdn.ampproject.org/v0/amp-slikeplayer-0.1.js"></script>
+|      <script async src="https://cdn.ampproject.org/v0.js"></script>
+|    </head>
+|    <body>
+|       <!-- Valid Slike Player with config-->
+|       <amp-slikeplayer
+|       data-apikey= "slike373googleamp5accuzkglo"
+|       data-videoid = "1xp5a1wkul"
+|       data-config = "playlist=true&playlisturl=//videoplayer.indiatimes.com/dev/playlistcallback.js"
+|       layout="responsive"
+|       width="320"
+|       height="180"
+|     ></amp-slikeplayer>
+|      <!-- Valid Slike Player -->
+|      <amp-slikeplayer
+|        data-apikey= "slike373googleamp5accuzkglo"
+|        data-videoid = "1xp5a1wkul"
+|        layout="responsive"
+|        width="320"
+|        height="180"
+|      ></amp-slikeplayer>
+|      <!-- Invalid Slike Player -->
+|        <amp-slikeplayer
+>>       ^~~~~~~~~
+amp-slikeplayer/0.1/test/validator-amp-slikeplayer.html:32:6 The mandatory attribute 'data-apikey' is missing in tag 'amp-slikeplayer'. (see https://developers.slike.in/html5/)
+|          data-videoid = "1xp5a1wkul"
+|          layout="responsive"
+|          width="320"
+|          height="180"
+|        ></amp-slikeplayer>
+|        <!-- Invalid Slike Player -->
+|        <amp-slikeplayer
+>>       ^~~~~~~~~
+amp-slikeplayer/0.1/test/validator-amp-slikeplayer.html:39:6 The mandatory attribute 'data-videoid' is missing in tag 'amp-slikeplayer'. (see https://developers.slike.in/html5/)
+|          data-apikey= "slike373googleamp5accuzkglo"
+|          layout="responsive"
+|          width="320"
+|          height="180"
+|        ></amp-slikeplayer>
+|    </body>
+|  </html>
\ No newline at end of file
diff --git a/extensions/amp-slikeplayer/OWNERS b/extensions/amp-slikeplayer/OWNERS
new file mode 100644
index 000000000000..e26c5ef6d23d
--- /dev/null
+++ b/extensions/amp-slikeplayer/OWNERS
@@ -0,0 +1,15 @@
+// For an explanation of the OWNERS rules and syntax, see:
+// https://github.com/ampproject/amp-github-apps/blob/main/owners/OWNERS.example
+
+{
+  rules: [
+    {
+      owners: [
+        {name: 'powerivq'},
+        {name: 'sliketech'},
+        {name: 'erwinmombay'},
+        {name: 'ampproject/wg-components'},
+      ],
+    },
+  ],
+}
diff --git a/extensions/amp-slikeplayer/amp-slikeplayer.md b/extensions/amp-slikeplayer/amp-slikeplayer.md
new file mode 100644
index 000000000000..0eeedd4d524b
--- /dev/null
+++ b/extensions/amp-slikeplayer/amp-slikeplayer.md
@@ -0,0 +1,55 @@
+---
+$category@: presentation
+formats:
+  - websites
+teaser:
+  text: Displays a cloud-hosted Slike Player.
+---
+
+# amp-slikeplayer
+
+## Example
+
+The `width` and `height` attributes determine the aspect ratio of the player embedded in responsive layouts.
+
+Example:
+
+```html
+<amp-slikeplayer required-attribute>
+  data-apikey="33502051"
+  data-videoid="1281471"
+  layout="responsive"
+  height: 180
+  width: 320
+>
+</amp-slikeplayer>
+```
+
+## Attributes
+
+<table>
+  <tr>
+    <td width="40%"><strong>data-apikey</strong></td>
+    <td>The Slike apikey id. This attribute is mandatory.</td>
+  </tr>
+  <tr>
+    <td width="40%"><strong>data-videoid</strong></td>
+    <td>The Slike video content id - videoid. This attribute is mandatory</td>
+  </tr>
+  <tr>
+    <td width="40%"><strong>data-config</strong></td>
+    <td>It is the player configuration passed as string and enentually capturen as query parameter. Few examples autoplay=true, skipad=true etc</td>
+  </tr>
+  <tr>
+    <td width="40%"><strong>data-iframe-src</strong></td>
+    <td>The iframe source can be overriden by users own source. The default template is binded the component</td>
+  </tr> 
+  <tr>
+    <td width="40%"><strong>common attributes</strong></td>
+    <td>This element includes <a href="https://amp.dev/documentation/guides-and-tutorials/learn/common_attributes">common attributes</a> extended to AMP components.</td>
+  </tr>
+</table>
+
+## Validation
+
+See [amp-slikeplayer rules](https://github.com/ampproject/amphtml/blob/main/extensions/amp-slikeplayer/validator-amp-slikeplayer.protoascii) in the AMP validator specification.
diff --git a/extensions/amp-slikeplayer/validator-amp-slikeplayer.protoascii b/extensions/amp-slikeplayer/validator-amp-slikeplayer.protoascii
new file mode 100644
index 000000000000..d806df992e76
--- /dev/null
+++ b/extensions/amp-slikeplayer/validator-amp-slikeplayer.protoascii
@@ -0,0 +1,33 @@
+tags: {  # amp-slikeplayer
+  html_format: AMP
+  tag_name: "SCRIPT"
+  extension_spec: {
+    name: "amp-slikeplayer"
+    version: "0.1"
+    version: "latest"
+    requires_usage: EXEMPTED
+    deprecated_allow_duplicates: true
+  }
+  attr_lists: "common-extension-attrs"
+}
+tags: {  # <amp-slikeplayer>
+  html_format: AMP
+  tag_name: "AMP-SLIKEPLAYER"
+  requires_extension: "amp-slikeplayer"
+   attrs: {
+    name: "data-apikey"
+    mandatory: true
+  }
+  attrs: {
+    name: "data-videoid"
+    mandatory: true
+  }
+  spec_url: "https://developers.slike.in/html5/"
+  amp_layout: {
+    supported_layouts: CONTAINER
+    supported_layouts: FILL
+    supported_layouts: FIXED
+    supported_layouts: FIXED_HEIGHT
+    supported_layouts: RESPONSIVE
+  }
+}
diff --git a/extensions/amp-smartlinks/0.1/amp-smartlinks.js b/extensions/amp-smartlinks/0.1/amp-smartlinks.js
index 22fe4a0e8dc2..d9d985e9cad2 100644
--- a/extensions/amp-smartlinks/0.1/amp-smartlinks.js
+++ b/extensions/amp-smartlinks/0.1/amp-smartlinks.js
@@ -1,5 +1,4 @@
-import {CommonSignals} from '#core/constants/common-signals';
-import {dict} from '#core/types/object';
+import {CommonSignals_Enum} from '#core/constants/common-signals';
 
 import {Services} from '#service';
 
@@ -141,21 +140,19 @@ export class AmpSmartlinks extends AMP.BaseElement {
    */
   postPageImpression_() {
     // When using layout='nodisplay' manually trigger CustomEventReporterBuilder
-    this.signals().signal(CommonSignals.LOAD_START);
+    this.signals().signal(CommonSignals_Enum.LOAD_START);
     const payload = this.buildPageImpressionPayload_();
 
     const builder = new CustomEventReporterBuilder(this.element);
 
     builder.track('page-impression', ENDPOINTS.PAGE_IMPRESSION_ENDPOINT);
 
-    builder.setTransportConfig(
-      dict({
-        'beacon': true,
-        'image': false,
-        'xhrpost': true,
-        'useBody': true,
-      })
-    );
+    builder.setTransportConfig({
+      'beacon': true,
+      'image': false,
+      'xhrpost': true,
+      'useBody': true,
+    });
 
     builder.setExtraUrlParams(payload);
     const reporter = builder.build();
@@ -186,19 +183,17 @@ export class AmpSmartlinks extends AMP.BaseElement {
    * @private
    */
   buildPageImpressionPayload_() {
-    return /** @type {!JsonObject} */ (
-      dict({
-        'events': [{'is_amp': true}],
-        'organization_id': this.linkmateOptions_.publisherID,
-        'organization_type': 'publisher',
-        'user': {
-          'page_session_uuid': this.generateUUID_(),
-          'source_url': this.getLocationHref_(),
-          'previous_url': this.referrer_,
-          'user_agent': this.ampDoc_.win.navigator.userAgent,
-        },
-      })
-    );
+    return {
+      'events': [{'is_amp': true}],
+      'organization_id': this.linkmateOptions_.publisherID,
+      'organization_type': 'publisher',
+      'user': {
+        'page_session_uuid': this.generateUUID_(),
+        'source_url': this.getLocationHref_(),
+        'previous_url': this.referrer_,
+        'user_agent': this.ampDoc_.win.navigator.userAgent,
+      },
+    };
   }
 
   /**
diff --git a/extensions/amp-smartlinks/0.1/linkmate.js b/extensions/amp-smartlinks/0.1/linkmate.js
index fa0f9a90c4f3..eaef9e16f658 100644
--- a/extensions/amp-smartlinks/0.1/linkmate.js
+++ b/extensions/amp-smartlinks/0.1/linkmate.js
@@ -1,4 +1,3 @@
-import {dict} from '#core/types/object';
 import {deepEquals} from '#core/types/object/json';
 
 import {getData} from '#utils/event-helper';
@@ -83,10 +82,10 @@ export class Linkmate {
     const linksPayload = this.buildLinksPayload_(anchorList);
     const editPayload = this.getEditInfo_();
 
-    const payload = dict({
+    const payload = {
       'article': editPayload,
       'links': linksPayload,
-    });
+    };
 
     const fetchUrl = ENDPOINTS.LINKMATE_ENDPOINT.replace(
       '.pub_id.',
@@ -95,7 +94,7 @@ export class Linkmate {
     const postOptions = {
       method: 'POST',
       ampCors: false,
-      headers: dict({'Content-Type': 'application/json'}),
+      headers: {'Content-Type': 'application/json'},
       body: payload,
     };
 
@@ -148,10 +147,10 @@ export class Linkmate {
    * @private
    */
   getEditInfo_() {
-    return dict({
+    return {
       'name': this.getEditName_(),
       'url': this.getLocationHref_(),
-    });
+    };
   }
 
   /**
diff --git a/extensions/amp-smartlinks/validator-amp-smartlinks.protoascii b/extensions/amp-smartlinks/validator-amp-smartlinks.protoascii
index c31529e15bf0..4e92543539e1 100644
--- a/extensions/amp-smartlinks/validator-amp-smartlinks.protoascii
+++ b/extensions/amp-smartlinks/validator-amp-smartlinks.protoascii
@@ -7,9 +7,9 @@ tags: {  # amp-smartlinks
     version: "latest"
   }
   attr_lists: "common-extension-attrs"
-  satisfies: "amp-smartlinks"
-  excludes: "amp-link-rewriter"
-  excludes: "amp-skimlinks"
+  satisfies_condition: "amp-smartlinks"
+  excludes_condition: "amp-link-rewriter"
+  excludes_condition: "amp-skimlinks"
 }
 
 tags: {  # <amp-smartlinks>
diff --git a/extensions/amp-social-share/0.1/amp-social-share-config.js b/extensions/amp-social-share/0.1/amp-social-share-config.js
index c99f88c7c3f5..3cfaebc19a92 100644
--- a/extensions/amp-social-share/0.1/amp-social-share-config.js
+++ b/extensions/amp-social-share/0.1/amp-social-share-config.js
@@ -1,5 +1,3 @@
-import {dict} from '#core/types/object';
-
 /**
  * Get social share configurations by supported type.
  * @param  {string} type
@@ -12,7 +10,7 @@ export function getSocialConfig(type) {
 /**
  * @type {!JsonObject}
  */
-const BUILTINS = dict({
+const BUILTINS = {
   'twitter': {
     'shareEndpoint': 'https://twitter.com/intent/tweet',
     'defaultParams': {
@@ -85,4 +83,4 @@ const BUILTINS = dict({
       'url': 'CANONICAL_URL',
     },
   },
-});
+};
diff --git a/extensions/amp-social-share/0.1/amp-social-share.css b/extensions/amp-social-share/0.1/amp-social-share.css
index e7afde5d3a84..a5a782aaae44 100644
--- a/extensions/amp-social-share/0.1/amp-social-share.css
+++ b/extensions/amp-social-share/0.1/amp-social-share.css
@@ -24,7 +24,7 @@ amp-social-share:focus {
 
 /* Twitter Styling */
 .amp-social-share-twitter {
-  background-color: #1da1f2;
+  background-color: #000;
 }
 
 /* Facebook Styling */
@@ -42,11 +42,6 @@ amp-social-share:focus {
   background-color: #0077b5;
 }
 
-/* Google+ Styling */
-.amp-social-share-gplus {
-  background-color: #dc4e41;
-}
-
 /* Tumblr Styling */
 .amp-social-share-tumblr {
   background-color: #3c5a77;
diff --git a/extensions/amp-social-share/0.1/amp-social-share.js b/extensions/amp-social-share/0.1/amp-social-share.js
index c830cbc97d41..573c62fb2362 100644
--- a/extensions/amp-social-share/0.1/amp-social-share.js
+++ b/extensions/amp-social-share/0.1/amp-social-share.js
@@ -1,7 +1,6 @@
-import {Keys} from '#core/constants/key-codes';
+import {Keys_Enum} from '#core/constants/key-codes';
 import {getDataParamsFromAttributes} from '#core/dom';
 import {toggle} from '#core/dom/style';
-import {dict} from '#core/types/object';
 import {parseQueryString} from '#core/types/string/url';
 
 import {Services} from '#service';
@@ -17,7 +16,7 @@ import {addParamsToUrl} from '../../../src/url';
 const TAG = 'amp-social-share';
 
 class AmpSocialShare extends AMP.BaseElement {
-  /** @override @nocollapse */
+  /** @override  */
   static prerenderAllowed() {
     return true;
   }
@@ -29,7 +28,7 @@ class AmpSocialShare extends AMP.BaseElement {
     this.shareEndpoint_ = null;
 
     /** @private @const {!JsonObject} */
-    this.params_ = dict();
+    this.params_ = {};
 
     /** @private {?../../../src/service/platform-impl.Platform} */
     this.platform_ = null;
@@ -84,7 +83,7 @@ class AmpSocialShare extends AMP.BaseElement {
         return;
       }
     }
-    const typeConfig = getSocialConfig(typeAttr) || dict();
+    const typeConfig = getSocialConfig(typeAttr) || {};
     if (typeConfig['obsolete']) {
       toggle(element, false);
       user().warn(TAG, `Skipping obsolete share button ${typeAttr}`);
@@ -149,8 +148,8 @@ class AmpSocialShare extends AMP.BaseElement {
           this.platform_.isIos() && (isMailTo || isSms)
             ? '_top'
             : this.element.hasAttribute('data-target')
-            ? this.element.getAttribute('data-target')
-            : '_blank';
+              ? this.element.getAttribute('data-target')
+              : '_blank';
         if (isSms) {
           // http://stackoverflow.com/a/19126326
           // This code path seems to be stable for both iOS and Android.
@@ -166,7 +165,7 @@ class AmpSocialShare extends AMP.BaseElement {
    */
   handleKeyPress_(event) {
     const {key} = event;
-    if (key == Keys.SPACE || key == Keys.ENTER) {
+    if (key == Keys_Enum.SPACE || key == Keys_Enum.ENTER) {
       event.preventDefault();
       this.handleActivation_();
     }
diff --git a/extensions/amp-social-share/0.1/test/test-amp-social-share.js b/extensions/amp-social-share/0.1/test/test-amp-social-share.js
index 6b08008711d4..ba5b55565999 100644
--- a/extensions/amp-social-share/0.1/test/test-amp-social-share.js
+++ b/extensions/amp-social-share/0.1/test/test-amp-social-share.js
@@ -15,7 +15,7 @@
  */
 
 import '../amp-social-share';
-import {Keys} from '#core/constants/key-codes';
+import {Keys_Enum} from '#core/constants/key-codes';
 import {tryFocus} from '#core/dom';
 
 import {Services} from '#service';
@@ -359,11 +359,11 @@ describes.realWin(
 
       const nonActivationEvent = {
         preventDefault: () => {},
-        key: Keys.RIGHT_ARROW,
+        key: Keys_Enum.RIGHT_ARROW,
       };
       const activationEvent = {
         preventDefault: () => {},
-        key: Keys.SPACE,
+        key: Keys_Enum.SPACE,
       };
       impl.handleKeyPress_(nonActivationEvent);
       expect(impl.win.open).to.not.have.been.called;
@@ -383,7 +383,8 @@ describes.realWin(
       });
     });
 
-    it('uses custom CSS when element is focused', async () => {
+    // TODO(#40258) Fix and unskip flakey test.
+    it.skip('uses custom CSS when element is focused', async () => {
       const share = doc.createElement('amp-social-share');
 
       share.setAttribute('type', 'twitter');
diff --git a/extensions/amp-social-share/1.0/README.md b/extensions/amp-social-share/1.0/README.md
index 5c4c301830e5..8b14aa3875d9 100644
--- a/extensions/amp-social-share/1.0/README.md
+++ b/extensions/amp-social-share/1.0/README.md
@@ -8,9 +8,7 @@ Currently, none of the buttons generated by Bento Social Share (including those
 
 You must include each Bento component's required CSS library to guarantee proper loading and before adding custom styles. Or use the light-weight pre-upgrade styles available inline. See [Layout and style](#layout-and-style).
 
-The examples below demonstrate use of the `<bento-social-share>` web component.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/social-share
@@ -21,56 +19,71 @@ import {defineElement as defineBentoSocialShare} from '@bentoproject/social-shar
 defineBentoSocialShare();
 ```
 
-### Example: Include via `<script>`
+### Include via `<script>`
 
 ```html
-<head>
-  <!-- These styles prevent Cumulative Layout Shift on the unupgraded custom element -->
-  <style>
-    bento-social-share {
-      display: inline-block;
-      overflow: hidden;
-      position: relative;
-      box-sizing: border-box;
-      width: 60px;
-      height: 44px;
-    }
-  </style>
-  <script src="https://cdn.ampproject.org/bento.js"></script>
-  <script
-    async
-    src="https://cdn.ampproject.org/v0/bento-twitter-1.0.js"
-  ></script>
-  <style>
-    bento-social-share {
-      width: 375px;
-      height: 472px;
-    }
-  </style>
-</head>
+<script type="module" src="https://cdn.ampproject.org/bento.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/bento.js" crossorigin="anonymous"></script>
+<script type="module" src="https://cdn.ampproject.org/v0/bento-social-share-1.0.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/v0/bento-social-share-1.0.js" crossorigin="anonymous"></script>
+<link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-social-share-1.0.css" crossorigin="anonymous">
+```
 
-<bento-social-share
-  id="my-share"
-  type="twitter"
-  aria-label="Share on Twitter"
-></bento-social-share>
-
-<div class="buttons" style="margin-top: 8px">
-  <button id="change-share">Change share button</button>
-</div>
-
-<script>
-  (async () => {
-    const button = document.querySelector('#my-share');
-    await customElements.whenDefined('bento-social-share');
-
-    // set up button actions
-    document.querySelector('#change-share').onclick = () => {
-      twitter.setAttribute('type', 'linkedin');
-      twitter.setAttribute('aria-label', 'Share on LinkedIn');
-    };
-  })();
-</script>
+### Example
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-social-share-1.0.css"
+    />
+    <script
+      async
+      src="https://cdn.ampproject.org/v0/bento-social-share-1.0.js"
+    ></script>
+    <style>
+      bento-social-share {
+        width: 375px;
+        height: 472px;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-social-share
+      id="my-share"
+      type="twitter"
+      aria-label="Share on Twitter"
+    ></bento-social-share>
+
+    <div class="buttons" style="margin-top: 8px">
+      <button id="change-share">Change share button</button>
+    </div>
+
+    <script>
+      (async () => {
+        const socialShare = document.querySelector('#my-share');
+        await customElements.whenDefined('bento-social-share');
+
+        // set up button actions
+        document.querySelector('#change-share').onclick = () => {
+          socialShare.setAttribute('type', 'linkedin');
+          socialShare.setAttribute('aria-label', 'Share on LinkedIn');
+        };
+      })();
+    </script>
+  </body>
+</html>
 ```
 
 ### Layout and style
@@ -320,13 +333,70 @@ All `data-param-*` prefixed attributes are turned into URL parameters and passed
 
 The description of the button for accessibility. A recommended label is "Share on \<type>".
 
+#### API Example
+
+Programmatically changing any of the attribute values will automatically update the element. For example, by changing the `type` attribute, you can switch between different share providers.
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-social-share-1.0.css"
+    />
+    <script
+      async
+      src="https://cdn.ampproject.org/v0/bento-social-share-1.0.js"
+    ></script>
+    <style>
+      bento-social-share {
+        width: 375px;
+        height: 472px;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-social-share
+      id="my-share"
+      type="twitter"
+      aria-label="Share on Twitter"
+    ></bento-social-share>
+
+    <div class="buttons" style="margin-top: 8px">
+      <button id="change-share">Change share button</button>
+    </div>
+
+    <script>
+      (async () => {
+        const socialShare = document.querySelector('#my-share');
+        await customElements.whenDefined('bento-social-share');
+
+        // set up button actions
+        document.querySelector('#change-share').onclick = () => {
+          socialShare.setAttribute('type', 'linkedin');
+          socialShare.setAttribute('aria-label', 'Share on LinkedIn');
+        };
+      })();
+    </script>
+  </body>
+</html>
+```
+
 ---
 
 ## Preact/React Component
 
-The examples below demonstrate use of the `<BentoSocialShare>` as a functional component usable with the Preact or React libraries.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/social-share
diff --git a/extensions/amp-social-share/1.0/amp-social-share.css b/extensions/amp-social-share/1.0/amp-social-share.css
index c537dcd5ef5d..20826b8e1a4d 100644
--- a/extensions/amp-social-share/1.0/amp-social-share.css
+++ b/extensions/amp-social-share/1.0/amp-social-share.css
@@ -36,10 +36,10 @@ amp-social-share::part(button):focus {
   outline-offset: 0 !important;
 }
 
-/* Twitter Styling */
+/* X (fka Twitter) Styling */
 .amp-social-share-twitter {
   color: #fff;
-  background-color: #1da1f2;
+  background-color: #000;
 }
 
 /* Facebook Styling */
diff --git a/extensions/amp-social-share/1.0/amp-social-share.js b/extensions/amp-social-share/1.0/amp-social-share.js
index 1c6684dde595..0ea24974f5d9 100644
--- a/extensions/amp-social-share/1.0/amp-social-share.js
+++ b/extensions/amp-social-share/1.0/amp-social-share.js
@@ -1,19 +1,20 @@
+import {BaseElement} from '#bento/components/bento-social-share/1.0/base-element';
+import {getSocialConfig} from '#bento/components/bento-social-share/1.0/social-share-config';
+
 import {getDataParamsFromAttributes} from '#core/dom';
-import {Layout} from '#core/dom/layout';
+import {Layout_Enum} from '#core/dom/layout';
 import {toggle} from '#core/dom/style';
-import {dict} from '#core/types/object';
 import {parseQueryString} from '#core/types/string/url';
 import {getWin} from '#core/window';
 
 import {isExperimentOn} from '#experiments';
 
+import {AmpPreactBaseElement, setSuperClass} from '#preact/amp-base-element';
+
 import {Services} from '#service';
 
 import {userAssert} from '#utils/log';
 
-import {BaseElement} from './base-element';
-import {getSocialConfig} from './social-share-config';
-
 import {CSS} from '../../../build/amp-social-share-1.0.css';
 import {addParamsToUrl} from '../../../src/url';
 
@@ -21,10 +22,10 @@ import {addParamsToUrl} from '../../../src/url';
 const TAG = 'amp-social-share';
 
 /** @const {!JsonObject<string, string>} */
-const DEFAULT_RESPONSIVE_DIMENSIONS = dict({
+const DEFAULT_RESPONSIVE_DIMENSIONS = {
   'width': '100%',
   'height': '100%',
-});
+};
 
 /**
  * @private
@@ -55,7 +56,7 @@ const getTypeConfigOrUndefined = (element) => {
       return;
     }
   }
-  return /** @type {!JsonObject} */ (getSocialConfig(type)) || dict();
+  return /** @type {!JsonObject} */ (getSocialConfig(type)) || {};
 };
 
 /**
@@ -115,7 +116,7 @@ const updateTypeConfig = (element, mutations, prevTypeValue) => {
   return typeConfig;
 };
 
-class AmpSocialShare extends BaseElement {
+class AmpSocialShare extends setSuperClass(BaseElement, AmpPreactBaseElement) {
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -136,7 +137,7 @@ class AmpSocialShare extends BaseElement {
     this.element.classList.add(`amp-social-share-${this.ampSocialShareType_}`);
 
     this.renderWithHrefAndTarget_(typeConfig);
-    if (this.element.getAttribute('layout') === Layout.RESPONSIVE) {
+    if (this.element.getAttribute('layout') === Layout_Enum.RESPONSIVE) {
       return DEFAULT_RESPONSIVE_DIMENSIONS;
     }
   }
@@ -173,7 +174,7 @@ class AmpSocialShare extends BaseElement {
   renderWithHrefAndTarget_(typeConfig) {
     const customEndpoint = this.element.getAttribute('data-share-endpoint');
     const shareEndpoint = customEndpoint || typeConfig['shareEndpoint'] || '';
-    const urlParams = typeConfig['defaultParams'] || dict();
+    const urlParams = typeConfig['defaultParams'] || {};
     Object.assign(urlParams, getDataParamsFromAttributes(this.element));
     const hrefWithVars = addParamsToUrl(shareEndpoint, urlParams);
     const urlReplacements = Services.urlReplacementsForDoc(this.element);
@@ -192,21 +193,17 @@ class AmpSocialShare extends BaseElement {
         const target = this.element.getAttribute('data-target') || '_blank';
 
         if (customEndpoint) {
-          this.mutateProps(
-            dict({
-              'endpoint': expandedUrl,
-              'params': null,
-              'target': target,
-            })
-          );
+          this.mutateProps({
+            'endpoint': expandedUrl,
+            'params': null,
+            'target': target,
+          });
         } else {
-          this.mutateProps(
-            dict({
-              'endpoint': null,
-              'params': parseQueryString(search),
-              'target': target,
-            })
-          );
+          this.mutateProps({
+            'endpoint': null,
+            'params': parseQueryString(search),
+            'target': target,
+          });
         }
       });
   }
diff --git a/extensions/amp-social-share/1.0/base-element.js b/extensions/amp-social-share/1.0/base-element.js
deleted file mode 100644
index 47d985c1751f..000000000000
--- a/extensions/amp-social-share/1.0/base-element.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import {PreactBaseElement} from '#preact/base-element';
-
-import {BentoSocialShare} from './component';
-import {CSS as COMPONENT_CSS} from './component.jss';
-
-export class BaseElement extends PreactBaseElement {}
-
-/** @override */
-BaseElement['Component'] = BentoSocialShare;
-
-/** @override */
-BaseElement['layoutSizeDefined'] = true;
-
-/** @override */
-BaseElement['delegatesFocus'] = true;
-
-/** @override */
-BaseElement['props'] = {
-  'children': {passthroughNonEmpty: true},
-  'height': {attr: 'height'},
-  'tabIndex': {attr: 'tabindex'},
-  'type': {attr: 'type'},
-  'width': {attr: 'width'},
-};
-
-/** @override */
-BaseElement['staticProps'] = {
-  'color': 'currentColor',
-  'background': 'inherit',
-};
-
-/** @override */
-BaseElement['usesShadowDom'] = true;
-
-/** @override */
-BaseElement['shadowCss'] = COMPONENT_CSS;
diff --git a/extensions/amp-social-share/1.0/component.js b/extensions/amp-social-share/1.0/component.js
deleted file mode 100644
index b1819991fb06..000000000000
--- a/extensions/amp-social-share/1.0/component.js
+++ /dev/null
@@ -1,269 +0,0 @@
-import {Keys} from '#core/constants/key-codes';
-import {dict} from '#core/types/object';
-import {parseQueryString} from '#core/types/string/url';
-
-import * as Preact from '#preact';
-import {Wrapper} from '#preact/component';
-import {useResourcesNotify} from '#preact/utils';
-
-import {useStyles} from './component.jss';
-import {getSocialConfig} from './social-share-config';
-import {BentoSocialShareIcon} from './social-share-svgs';
-
-import {openWindowDialog} from '../../../src/open-window-dialog';
-import {addParamsToUrl} from '../../../src/url';
-
-const NAME = 'BentoSocialShare';
-const DEFAULT_WIDTH = 60;
-const DEFAULT_HEIGHT = 44;
-const DEFAULT_TARGET = '_blank';
-const WINDOW_FEATURES = 'resizable,scrollbars,width=640,height=480';
-
-/**
- * @param {!BentoSocialShareDef.Props} props
- * @return {PreactDef.Renderable}
- */
-export function BentoSocialShare({
-  background,
-  children,
-  color,
-  endpoint,
-  height,
-  params,
-  style,
-  tabIndex = 0,
-  target,
-  type,
-  width,
-  ...rest
-}) {
-  useResourcesNotify();
-  const classes = useStyles();
-  const checkPropsReturnValue = checkProps(
-    type,
-    endpoint,
-    target,
-    width,
-    height,
-    params
-  );
-
-  // Early exit if checkProps did not pass
-  if (!checkPropsReturnValue) {
-    return null;
-  }
-
-  const {checkedHeight, checkedTarget, checkedWidth, finalEndpoint} =
-    checkPropsReturnValue;
-
-  return (
-    <Wrapper
-      {...rest}
-      role="button"
-      tabIndex={tabIndex}
-      onKeyDown={(e) => handleKeyPress(e, finalEndpoint, checkedTarget)}
-      onClick={() => handleActivation(finalEndpoint, checkedTarget)}
-      wrapperStyle={{
-        width: checkedWidth,
-        height: checkedHeight,
-        ...style,
-      }}
-      part="button"
-      wrapperClassName={classes.button}
-    >
-      {processChildren(
-        /** @type {string} */ (type),
-        children,
-        color,
-        background
-      )}
-    </Wrapper>
-  );
-}
-
-/**
- * If children exist, render the children instead of the icon.  Otherwise,
- * render the icon associated with the specified type with specified color
- * and background (or defaults if not specified).
- * @param {string} type
- * @param {?PreactDef.Renderable|undefined} children
- * @param {string|undefined} color
- * @param {string|undefined} background
- * @return {PreactDef.Renderable}
- */
-function processChildren(type, children, color, background) {
-  if (children) {
-    return children;
-  } else {
-    const typeConfig = getSocialConfig(type) || {};
-    const iconStyle = dict({
-      'color': color || typeConfig.defaultColor,
-      'backgroundColor': background || typeConfig.defaultBackgroundColor,
-    });
-    return (
-      <BentoSocialShareIcon
-        style={{
-          ...iconStyle,
-          width: '100%',
-          height: '100%',
-        }}
-        type={type.toUpperCase()}
-      />
-    );
-  }
-}
-
-/**
- * Verify required props and throw error if necessary.  Set default values
- * for optional props if no value specified.
- * @param {string|undefined} type
- * @param {string|undefined} endpoint
- * @param {string|undefined} target
- * @param {number|string|undefined} width
- * @param {number|string|undefined} height
- * @param {JsonObject|Object|undefined} params
- * @return {?{
- *   finalEndpoint: string,
- *   checkedWidth: (number|string),
- *   checkedHeight: (number|string),
- *   checkedTarget: string,
- * }}
- */
-function checkProps(type, endpoint, target, width, height, params) {
-  // User must provide endpoint if they choose a type that is not
-  // pre-configured, early exit if not provided
-  const typeConfig = getSocialConfig(/** @type {string} */ (type)) || {};
-  let baseEndpoint = endpoint || typeConfig.shareEndpoint;
-  if (baseEndpoint === undefined) {
-    displayWarning(
-      `An endpoint is required if not using a pre-configured type. ${NAME}`
-    );
-    return null;
-  }
-
-  // TODO: This logic might be duplicated in the AMP component
-  // https://github.com/ampproject/amphtml/issues/36777
-  const currentParams = Object.entries(typeConfig.defaultParams || {}).reduce(
-    (newParams, [key, value]) => {
-      if (newParams[key]) {
-        return newParams;
-      }
-      return {
-        ...newParams,
-        [key]: value
-          .replace('TITLE', document.title)
-          .replace(
-            'CANONICAL_URL',
-            document.querySelector("link[rel='canonical']")?.href ||
-              location.href
-          ),
-      };
-    },
-    params || {}
-  );
-
-  // Special case when type is 'email'
-  if (type === 'email' && !endpoint) {
-    baseEndpoint = `mailto:${currentParams['recipient'] || ''}`;
-  }
-
-  // Add params to baseEndpoint
-  const finalEndpoint = addParamsToUrl(
-    /** @type {string} */ (baseEndpoint),
-    /** @type {!JsonObject} */ (currentParams)
-  );
-
-  // Defaults
-  const checkedWidth = width || DEFAULT_WIDTH;
-  const checkedHeight = height || DEFAULT_HEIGHT;
-  const checkedTarget = target || DEFAULT_TARGET;
-
-  return {
-    finalEndpoint,
-    checkedWidth,
-    checkedHeight,
-    checkedTarget,
-  };
-}
-
-/**
- * @param {?string} message
- */
-function displayWarning(message) {
-  console /*OK*/
-    .warn(message);
-}
-
-/**
- * Opens a new window with the fully processed endpoint
- * @param {?string} finalEndpoint
- * @param {string} target
- */
-function handleActivation(finalEndpoint, target) {
-  const protocol = finalEndpoint.split(':', 1)[0];
-
-  if (protocol === 'navigator-share') {
-    if (window && window.navigator && window.navigator.share) {
-      const data = parseQueryString(
-        /** @type {string} */ (getQueryString(finalEndpoint))
-      );
-      window.navigator.share(data).catch((e) => {
-        displayWarning(`${e.message}. ${NAME}`);
-      });
-    } else {
-      displayWarning(
-        `Could not complete system share.  Navigator unavailable. ${NAME}`
-      );
-    }
-  } else if (protocol === 'sms' || protocol === 'mailto') {
-    openWindowDialog(
-      window,
-      protocol === 'sms' ? finalEndpoint.replace('?', '?&') : finalEndpoint,
-      isIos() ? '_top' : target,
-      WINDOW_FEATURES
-    );
-  } else {
-    openWindowDialog(window, finalEndpoint, target, WINDOW_FEATURES);
-  }
-}
-
-/**
- * Returns the Query String of a full url, will not include # parameters
- * @param {?string} endpoint
- * @return {?string}
- */
-function getQueryString(endpoint) {
-  let q = endpoint.indexOf('?');
-  let h = endpoint.indexOf('#');
-  q = q === -1 ? endpoint.length : q;
-  h = h === -1 ? endpoint.length : h;
-  return endpoint.slice(q, h);
-}
-
-/**
- * Checks whether or not the userAgent of the current device indicates that
- * this is an Ios device.  Checked for 'mailto:' and 'sms:' protocols which
- * break when opened in _blank on iOS Safari.
- * @return {boolean}
- */
-function isIos() {
-  return /** @type {boolean} */ (
-    window &&
-      window.navigator &&
-      window.navigator.userAgent &&
-      window.navigator.userAgent.search(/iPhone|iPad|iPod/i) >= 0
-  );
-}
-
-/**
- * @param {!Event} event
- * @param {?string} finalEndpoint
- * @param {string} target
- */
-function handleKeyPress(event, finalEndpoint, target) {
-  const {key} = event;
-  if (key == Keys.SPACE || key == Keys.ENTER) {
-    event.preventDefault();
-    handleActivation(finalEndpoint, target);
-  }
-}
diff --git a/extensions/amp-social-share/1.0/component.type.js b/extensions/amp-social-share/1.0/component.type.js
deleted file mode 100644
index 719df0064fe2..000000000000
--- a/extensions/amp-social-share/1.0/component.type.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/** @externs */
-
-/** @const */
-var BentoSocialShareDef = {};
-
-/**
- * @typedef {{
- *   type: (string),
- *   endpoint: (string|undefined),
- *   params: (JsonObject|Object|undefined),
- *   target: (string|undefined),
- *   width: (number|string|undefined),
- *   height: (number|string|undefined),
- *   color: (string|undefined),
- *   background: (string|undefined),
- *   tabIndex: (number|string|undefined),
- *   style: (string|undefined),
- *   children: (?PreactDef.Renderable|undefined),
- * }}
- */
-BentoSocialShareDef.Props;
diff --git a/extensions/amp-social-share/1.0/example/index.html b/extensions/amp-social-share/1.0/example/index.html
new file mode 100644
index 000000000000..29e07b54ff36
--- /dev/null
+++ b/extensions/amp-social-share/1.0/example/index.html
@@ -0,0 +1,138 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width" />
+    <title>bento-social-share</title>
+    <script src="https://cdn.ampproject.org/bento.js"></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-social-share-1.0.css"
+    />
+    <script
+      async
+      src="https://cdn.ampproject.org/v0/bento-social-share-1.0.js"
+    ></script>
+    <script
+      async
+      src="https://cdn.ampproject.org/v0/bento-twitter-1.0.js"
+    ></script>
+    <style>
+      body {
+        font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
+          Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
+          'Segoe UI Symbol';
+        background: #ecf1f3;
+        display: flex;
+        height: 100vh;
+      }
+
+      .social-share-group {
+        display: grid;
+        grid-template-columns: repeat(4, min-content);
+        gap: 8px;
+        margin: auto;
+      }
+
+      bento-social-share {
+        border-radius: 8.4px;
+        height: calc(8vw + 1.5em) !important;
+        width: calc(8vw + 1.5em) !important;
+        cursor: pointer;
+        box-shadow: 0 8px 16px 0 rgba(0, 43, 57, 0.15);
+        transition: transform 0.3s cubic-bezier(0.25, 0.1, 0.25, 1),
+          box-shadow 0.3s cubic-bezier(0.25, 0.1, 0.25, 1);
+      }
+
+      bento-social-share:hover {
+        transform: translateY(-0.125em);
+        box-shadow: 0 25px 20px -15px rgba(0, 43, 57, 0.15);
+      }
+
+      bento-social-share[type='email'] {
+        color: #002b39;
+        background: #fff;
+      }
+
+      bento-social-share[type='facebook'] {
+        color: #32529f;
+        background: #fff;
+        border-radius: 50%;
+      }
+
+      bento-social-share[type='twitter'] {
+        color: #fff;
+        background: #1da1f2;
+      }
+
+      bento-social-share[type='linkedin'] {
+        color: #fff;
+        background: #0077b5;
+      }
+
+      bento-social-share[type='pinterest'] {
+        color: #e60023;
+        background: #fff;
+        border-radius: 50%;
+      }
+
+      bento-social-share[type='tumblr'] {
+        color: #fff;
+        background: #3c5a77;
+      }
+
+      bento-social-share[type='whatsapp'] {
+        color: #fff;
+        background: #25d366;
+      }
+
+      bento-social-share[type='line'] {
+        color: #fff;
+        background: #52b448;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="social-share-group">
+      <bento-social-share
+        type="email"
+        aria-label="Share via email"
+      ></bento-social-share>
+      <bento-social-share
+        type="facebook"
+        aria-label="Share on Facebook"
+      ></bento-social-share>
+      <bento-social-share
+        type="twitter"
+        aria-label="Share on Twitter"
+      ></bento-social-share>
+      <bento-social-share
+        type="linkedin"
+        aria-label="Share on Linkedin"
+      ></bento-social-share>
+      <bento-social-share
+        type="pinterest"
+        aria-label="Share on pinterest"
+      ></bento-social-share>
+      <bento-social-share
+        type="tumblr"
+        aria-label="Share on tumblr"
+      ></bento-social-share>
+      <bento-social-share
+        type="whatsapp"
+        aria-label="Share on whatsapp"
+      ></bento-social-share>
+      <bento-social-share
+        type="line"
+        aria-label="Share on line"
+      ></bento-social-share>
+    </div>
+
+    <script>
+      (async () => {
+        await customElements.whenDefined('bento-social-share');
+      })();
+    </script>
+  </body>
+</html>
diff --git a/extensions/amp-social-share/1.0/storybook/Basic.js b/extensions/amp-social-share/1.0/storybook/Basic.js
index b488daa53ac8..7e21df0e80c4 100644
--- a/extensions/amp-social-share/1.0/storybook/Basic.js
+++ b/extensions/amp-social-share/1.0/storybook/Basic.js
@@ -1,6 +1,8 @@
+import {BentoSocialShare} from '#bento/components/bento-social-share/1.0/component';
+
 import * as Preact from '#preact';
 
-import {BentoSocialShare} from '../component';
+import '#bento/components/bento-social-share/1.0/component.jss';
 
 const types = [
   'email',
diff --git a/extensions/amp-social-share/1.0/test-e2e/test-amp-social-share.js b/extensions/amp-social-share/1.0/test-e2e/test-amp-social-share.js
index 232581c56535..473453d3b577 100644
--- a/extensions/amp-social-share/1.0/test-e2e/test-amp-social-share.js
+++ b/extensions/amp-social-share/1.0/test-e2e/test-amp-social-share.js
@@ -86,7 +86,9 @@ describes.endtoend(
     });
 
     describe('clicking', () => {
-      it('opens a new window on click', async () => {
+      it('opens a new window on click', async function () {
+        this.timeout(5000);
+
         const host = await controller.findElement('#two');
 
         let windows = await controller.getAllWindows();
@@ -98,8 +100,8 @@ describes.endtoend(
         await expect(windows.length).to.equal(2);
         await controller.switchToWindow(windows[1]);
 
-        await expect(controller.getCurrentUrl()).to.equal(
-          'https://twitter.com/intent/tweet?text=amp-social-share&url=http%3A%2F%2Fexample.com%2F'
+        await expect(controller.getCurrentUrl()).to.have.string(
+          'https://x.com/'
         );
       });
 
@@ -117,9 +119,7 @@ describes.endtoend(
         await expect(windows.length).to.equal(2);
         await controller.switchToWindow(windows[1]);
 
-        await expect(controller.getCurrentUrl()).to.equal(
-          'https://www.tumblr.com/login?redirect_to=https%3A%2F%2Fwww.tumblr.com%2Fwidgets%2Fshare%2Ftool%3FshareSource%3Dlegacy%26canonicalUrl%3D%26url%3Dhttp%253A%252F%252Fexample.com%252F%26posttype%3Dlink%26title%3Damp-social-share%26caption%3D%26content%3Dhttp%253A%252F%252Fexample.com%252F'
-        );
+        await expect(controller.getCurrentUrl()).to.contain('tumblr.com');
       });
     });
   }
diff --git a/extensions/amp-social-share/1.0/test-e2e/test-bento-social-share.js b/extensions/amp-social-share/1.0/test-e2e/test-bento-social-share.js
deleted file mode 100644
index 6f97ac50d049..000000000000
--- a/extensions/amp-social-share/1.0/test-e2e/test-bento-social-share.js
+++ /dev/null
@@ -1,59 +0,0 @@
-describes.endtoend(
-  'bento-social-share',
-  {
-    version: '1.0',
-    fixture: 'bento/social-share.html',
-    environments: ['single'],
-  },
-  (env) => {
-    let controller;
-
-    beforeEach(() => {
-      controller = env.controller;
-    });
-
-    it('should open a window to a share page', async () => {
-      const element = await controller.findElement('bento-social-share');
-      await controller.switchToShadowRoot(element);
-
-      const shareBtn = await controller.findElement('[role="button"]');
-
-      let windows = await controller.getAllWindows();
-      await expect(windows.length).to.equal(1);
-
-      await controller.click(shareBtn);
-
-      windows = await controller.getAllWindows();
-      await expect(windows.length).to.equal(2);
-
-      await controller.switchToWindow(windows[1]);
-
-      await expect(controller.getCurrentUrl()).to.equal(
-        'https://twitter.com/intent/tweet?text=Bento%20Social%20Share&url=http%3A%2F%2Fexample.com%2F'
-      );
-    });
-
-    it('should replace title and conanical url on the same share url', async () => {
-      const element = await controller.findElement(
-        'bento-social-share[type="whatsapp"]'
-      );
-      await controller.switchToShadowRoot(element);
-
-      const shareBtn = await controller.findElement('[role="button"]');
-
-      let windows = await controller.getAllWindows();
-      await expect(windows.length).to.equal(1);
-
-      await controller.click(shareBtn);
-
-      windows = await controller.getAllWindows();
-      await expect(windows.length).to.equal(2);
-
-      await controller.switchToWindow(windows[1]);
-
-      await expect(controller.getCurrentUrl()).to.equal(
-        'https://api.whatsapp.com/send?text=Bento%20Social%20Share%20-%20http%3A%2F%2Fexample.com%2F'
-      );
-    });
-  }
-);
diff --git a/extensions/amp-social-share/1.0/test/test-component.js b/extensions/amp-social-share/1.0/test/test-component.js
deleted file mode 100644
index dca9c50c78c2..000000000000
--- a/extensions/amp-social-share/1.0/test/test-component.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import {mount} from 'enzyme';
-
-import {dict} from '#core/types/object';
-
-import * as Preact from '#preact';
-import {Wrapper} from '#preact/component';
-
-import {BentoSocialShare} from '../component';
-
-describes.sandboxed('BentoSocialShare 1.0 preact component', {}, (env) => {
-  const originalWarn = console.warn;
-  let openSpy;
-
-  beforeEach(() => {
-    openSpy = env.sandbox.stub(window, 'open');
-  });
-
-  afterEach(() => (console.warn = originalWarn));
-
-  it(
-    'warns when the required endpoint is not provided when not using' +
-      ' a pre-configured type',
-    () => {
-      const consoleOutput = [];
-      const mockedWarn = (output) => consoleOutput.push(output);
-      console.warn = mockedWarn;
-
-      const jsx = (
-        <BentoSocialShare {...dict({'type': 'not-configured-type'})} />
-      );
-      const wrapper = mount(jsx);
-
-      expect(wrapper.exists('div')).to.equal(false);
-      expect(consoleOutput.length).to.equal(1);
-      expect(consoleOutput[0]).to.equal(
-        'An endpoint is required if not using a pre-configured type. BentoSocialShare'
-      );
-    }
-  );
-
-  it('should include the button class for focus styling', () => {
-    const jsx = <BentoSocialShare {...dict({'type': 'email'})} />;
-    const wrapper = mount(jsx);
-
-    const button = wrapper.getDOMNode();
-    expect(button.className.includes('button')).to.be.true;
-  });
-
-  it('should call window.open when clicked', () => {
-    const wrapper = mount(<BentoSocialShare type="twitter" />);
-
-    const button = wrapper.find(Wrapper);
-
-    expect(button.length).to.equal(1);
-
-    button.getDOMNode().dispatchEvent(new Event('click'));
-
-    expect(openSpy).called;
-  });
-});
diff --git a/extensions/amp-social-share/validator-amp-social-share.protoascii b/extensions/amp-social-share/validator-amp-social-share.protoascii
index 76971ce7ca41..9c07521cff62 100644
--- a/extensions/amp-social-share/validator-amp-social-share.protoascii
+++ b/extensions/amp-social-share/validator-amp-social-share.protoascii
@@ -1,8 +1,8 @@
 tags: {  # amp-social-share 1.0
   html_format: AMP
   tag_name: "SCRIPT"
-  satisfies: "amp-social-share 1.0"
-  excludes: "amp-social-share 0.1"
+  satisfies_condition: "amp-social-share 1.0"
+  excludes_condition: "amp-social-share 0.1"
   extension_spec: {
     name: "amp-social-share"
     version_name: "v1.0"
@@ -15,8 +15,8 @@ tags: {  # amp-social-share 0.1 and latest
   html_format: AMP
   html_format: AMP4ADS
   tag_name: "SCRIPT"
-  satisfies: "amp-social-share 0.1"
-  excludes: "amp-social-share 1.0"
+  satisfies_condition: "amp-social-share 0.1"
+  excludes_condition: "amp-social-share 1.0"
   extension_spec: {
     name: "amp-social-share"
     version_name: "v0.1"
diff --git a/extensions/amp-soundcloud/0.1/amp-soundcloud.js b/extensions/amp-soundcloud/0.1/amp-soundcloud.js
index 717e69c16cb1..19352d2fd504 100644
--- a/extensions/amp-soundcloud/0.1/amp-soundcloud.js
+++ b/extensions/amp-soundcloud/0.1/amp-soundcloud.js
@@ -13,7 +13,6 @@
 
 import {applyFillContent, isLayoutSizeDefined} from '#core/dom/layout';
 import {PauseHelper} from '#core/dom/video/pause-helper';
-import {dict} from '#core/types/object';
 
 import {Services} from '#service';
 
@@ -130,7 +129,7 @@ class AmpSoundcloud extends AMP.BaseElement {
   pauseCallback() {
     if (this.iframe_ && this.iframe_.contentWindow) {
       this.iframe_.contentWindow./*OK*/ postMessage(
-        JSON.stringify(dict({'method': 'pause'})),
+        JSON.stringify({'method': 'pause'}),
         'https://w.soundcloud.com'
       );
     }
diff --git a/extensions/amp-soundcloud/1.0/README.md b/extensions/amp-soundcloud/1.0/README.md
index 3f6f1a909607..5ef5a0818a4d 100644
--- a/extensions/amp-soundcloud/1.0/README.md
+++ b/extensions/amp-soundcloud/1.0/README.md
@@ -6,9 +6,7 @@ Embeds a [Soundcloud](https://soundcloud.com) clip.
 
 You must include each Bento component's required CSS library to guarantee proper loading and before adding custom styles. Or use the light-weight pre-upgrade styles available inline. See [Layout and style](#layout-and-style).
 
-The examples below demonstrate use of the `<bento-soundcloud>` web component.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/soundcloud
@@ -19,51 +17,60 @@ import {defineElement as defineBentoSoundcloud} from '@bentoproject/soundcloud';
 defineBentoSoundcloud();
 ```
 
-### Example: Include via `<script>`
+### Include via `<script>`
+
+```html
+<script type="module" src="https://cdn.ampproject.org/bento.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/bento.js" crossorigin="anonymous"></script>
+<script type="module" src="https://cdn.ampproject.org/v0/bento-soundcloud-1.0.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/v0/bento-soundcloud-1.0.js" crossorigin="anonymous"></script>
+<link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-soundcloud-1.0.css" crossorigin="anonymous">
+```
+
+### Example
+
+<!--% example %-->
 
 ```html
-<head>
-  <script src="https://cdn.ampproject.org/bento.js"></script>
-  <!-- These styles prevent Cumulative Layout Shift on the unupgraded custom element -->
-  <style>
-    bento-soundcloud {
-      display: block;
-      overflow: hidden;
-      position: relative;
-    }
-  </style>
-  <script
-    async
-    src="https://cdn.ampproject.org/v0/bento-soundcloud-1.0.js"
-  ></script>
-  <style>
-    bento-soundcloud {
-      aspect-ratio: 1;
-    }
-  </style>
-</head>
-<bento-soundcloud
-  id="my-track"
-  data-trackid="243169232"
-  data-visual="true"
-></bento-soundcloud>
-<div class="buttons" style="margin-top: 8px">
-  <button id="change-track">Change track</button>
-</div>
-
-<script>
-  (async () => {
-    const soundcloud = document.querySelector('#my-track');
-    await customElements.whenDefined('bento-soundcloud');
-
-    // set up button actions
-    document.querySelector('#change-track').onclick = () => {
-      soundcloud.setAttribute('data-trackid', '243169232');
-      soundcloud.setAttribute('data-color', 'ff5500');
-      soundcloud.removeAttribute('data-visual');
-    };
-  })();
-</script>
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-soundcloud-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-soundcloud-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-soundcloud-1.0.css"
+    />
+    <style>
+      bento-soundcloud {
+        width: 300px;
+        height: 300px;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-soundcloud
+      id="my-track"
+      data-trackid="89299804"
+      data-visual="true"
+    ></bento-soundcloud>
+  </body>
+</html>
 ```
 
 ### Layout and style
@@ -103,38 +110,94 @@ bento-soundcloud {
 
 ### Attributes
 
-<table>
-  <tr>
-    <td width="40%"><strong>data-trackid</strong></td>
-    <td>This attribute is required if <code>data-playlistid</code> is not defined.<br />
-The value for this attribute is the ID of a track, an integer.</td>
-  </tr>
-  <tr>
-    <td width="40%"><strong>data-playlistid</strong></td>
-    <td>This attribute is required if <code>data-trackid</code> is not defined.
-The value for this attribute is the ID of a playlist, an integer.</td>
-  </tr>
-  <tr>
-    <td width="40%"><strong>data-secret-token (optional)</strong></td>
-    <td>The secret token of the track, if it is private.</td>
-  </tr>
-  <tr>
-    <td width="40%"><strong>data-visual (optional)</strong></td>
-    <td>If set to <code>true</code>, displays full-width "Visual" mode; otherwise, it displays as "Classic" mode. The default value is <code>false</code>.</td>
-  </tr>
-  <tr>
-    <td width="40%"><strong>data-color (optional)</strong></td>
-    <td>This attribute is a custom color override for the "Classic" mode. The attribute is ignored in "Visual" mode. Specify a hexadecimal color value, without the leading # (e.g., <code>data-color="e540ff"</code>).</td>
-  </tr>
-</table>
+Programmatically changing one of the attributes will result in the player being automatically updated.
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-soundcloud-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-soundcloud-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-soundcloud-1.0.css"
+    />
+    <style>
+      bento-soundcloud {
+        width: 300px;
+        height: 300px;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-soundcloud
+      id="my-track"
+      data-trackid="89299804"
+      data-visual="true"
+    ></bento-soundcloud>
+    <div class="buttons" style="margin-top: 8px">
+      <button id="change-track">Change track</button>
+    </div>
+
+    <script>
+      (async () => {
+        const soundcloud = document.querySelector('#my-track');
+        await customElements.whenDefined('bento-soundcloud');
+
+        // set up button actions
+        document.querySelector('#change-track').onclick = () => {
+          soundcloud.setAttribute('data-trackid', '243169232');
+          soundcloud.setAttribute('data-color', 'ff5500');
+          soundcloud.removeAttribute('data-visual');
+        };
+      })();
+    </script>
+  </body>
+</html>
+```
+
+##### data-track
+
+This attribute is required if <code>data-playlistid</code> is not defined. The value for this attribute is the ID of a track, an integer.
+
+##### data-playlistid
+
+This attribute is required if <code>data-trackid</code> is not defined. The value for this attribute is the ID of a playlist, an integer.
+
+##### data-secret-token (optional)
+
+The secret token of the track, if it is private.
+
+##### data-visual (optional)
+
+If set to <code>true</code>, displays full-width "Visual" mode; otherwise, it displays as "Classic" mode. The default value is <code>false</code>.
+
+##### data-color (optional)
+
+This attribute is a custom color override for the "Classic" mode. The attribute is ignored in "Visual" mode. Specify a hexadecimal color value, without the leading # (e.g., <code>data-color="e540ff"</code>).
 
 ---
 
 ## Preact/React Component
 
-The examples below demonstrate use of the `<BentoSoundcloud>` as a functional component usable with the Preact or React libraries.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/soundcloud
@@ -183,27 +246,24 @@ Or via `className`:
 
 ### Props
 
-<table>
-  <tr>
-    <td width="40%"><strong>trackId</strong></td>
-    <td>This attribute is required if <code>data-playlistid</code> is not defined.<br />
-The value for this attribute is the ID of a track, an integer.</td>
-  </tr>
-  <tr>
-    <td width="40%"><strong>playlistId</strong></td>
-    <td>This attribute is required if <code>data-trackid</code> is not defined.
-The value for this attribute is the ID of a playlist, an integer.</td>
-  </tr>
-  <tr>
-    <td width="40%"><strong>secretToken (optional)</strong></td>
-    <td>The secret token of the track, if it is private.</td>
-  </tr>
-  <tr>
-    <td width="40%"><strong>visual (optional)</strong></td>
-    <td>If set to <code>true</code>, displays full-width "Visual" mode; otherwise, it displays as "Classic" mode. The default value is <code>false</code>.</td>
-  </tr>
-  <tr>
-    <td width="40%"><strong>color (optional)</strong></td>
-    <td>This attribute is a custom color override for the "Classic" mode. The attribute is ignored in "Visual" mode. Specify a hexadecimal color value, without the leading # (e.g., <code>data-color="e540ff"</code>).</td>
-  </tr>
-</table>
+##### trackId
+
+This attribute is required if <code>data-playlistid</code> is not defined.
+The value for this attribute is the ID of a track, an integer.
+
+##### playlistId
+
+This attribute is required if <code>data-trackid</code> is not defined.
+The value for this attribute is the ID of a playlist, an integer.
+
+##### secretToken (optional)
+
+The secret token of the track, if it is private.
+
+##### visual (optional)
+
+If set to <code>true</code>, displays full-width "Visual" mode; otherwise, it displays as "Classic" mode. The default value is <code>false</code>.
+
+##### color (optional)
+
+This attribute is a custom color override for the "Classic" mode. The attribute is ignored in "Visual" mode. Specify a hexadecimal color value, without the leading # (e.g., <code>data-color="e540ff"</code>).
diff --git a/extensions/amp-soundcloud/1.0/amp-soundcloud.js b/extensions/amp-soundcloud/1.0/amp-soundcloud.js
index da42b0395d23..79940044fbea 100644
--- a/extensions/amp-soundcloud/1.0/amp-soundcloud.js
+++ b/extensions/amp-soundcloud/1.0/amp-soundcloud.js
@@ -1,13 +1,15 @@
+import {BaseElement} from '#bento/components/bento-soundcloud/1.0/base-element';
+
 import {isExperimentOn} from '#experiments';
 
-import {userAssert} from '#utils/log';
+import {AmpPreactBaseElement, setSuperClass} from '#preact/amp-base-element';
 
-import {BaseElement} from './base-element';
+import {userAssert} from '#utils/log';
 
 /** @const {string} */
 const TAG = 'amp-soundcloud';
 
-class AmpSoundcloud extends BaseElement {
+class AmpSoundcloud extends setSuperClass(BaseElement, AmpPreactBaseElement) {
   /** @override */
   isLayoutSupported(layout) {
     userAssert(
diff --git a/extensions/amp-soundcloud/1.0/component.js b/extensions/amp-soundcloud/1.0/component.js
deleted file mode 100644
index 96775935cf5c..000000000000
--- a/extensions/amp-soundcloud/1.0/component.js
+++ /dev/null
@@ -1,126 +0,0 @@
-import {dict} from '#core/types/object';
-import {parseJson} from '#core/types/object/json';
-
-import * as Preact from '#preact';
-import {useCallback, useEffect, useRef} from '#preact';
-import {useValueRef} from '#preact/component';
-import {IframeEmbed} from '#preact/component/iframe';
-
-import {getData} from '#utils/event-helper';
-
-const MATCHES_MESSAGING_ORIGIN = (origin) => {
-  return origin === 'https://w.soundcloud.com';
-};
-
-/**
- * @param {!BentoSoundcloudDef.Props} props
- * @return {PreactDef.Renderable}
- */
-export function BentoSoundcloud({
-  color,
-  onLoad,
-  playlistId,
-  secretToken,
-  trackId,
-  visual = false,
-  ...rest
-}) {
-  // Property and Reference Variables
-  const iframeRef = useRef(null);
-  const onLoadRef = useValueRef(onLoad);
-
-  useEffect(() => {
-    /** Unmount Procedure */
-    return () => {
-      // Pause widget
-      iframeRef.current?.contentWindow?./*OK*/ postMessage(
-        JSON.stringify(dict({'method': 'pause'})),
-        'https://w.soundcloud.com'
-      );
-
-      // Release iframe resources
-      iframeRef.current = null;
-    };
-  }, []);
-
-  const messageHandler = useCallback(
-    (event) => {
-      const data = parseJson(getData(event));
-      if (data.method === 'ready') {
-        onLoadRef.current?.();
-      }
-    },
-    [onLoadRef]
-  );
-
-  // Checking for valid props
-  if (!checkProps(trackId, playlistId)) {
-    return null;
-  }
-
-  // Build Base URL
-  const url =
-    'https://api.soundcloud.com/' +
-    (trackId != undefined ? 'tracks' : 'playlists') +
-    '/';
-
-  // Extract Media ID
-  const mediaId = trackId ?? playlistId;
-
-  // Prepare BentoSoundcloud Widget URL for iFrame
-  let iframeSrc =
-    'https://w.soundcloud.com/player/?' +
-    'url=' +
-    encodeURIComponent(url + mediaId);
-
-  if (secretToken) {
-    // It's very important the entire thing is encoded, since it's part of
-    // the `url` query param added above.
-    iframeSrc += encodeURIComponent('?secret_token=' + secretToken);
-  }
-
-  if (visual) {
-    iframeSrc += '&visual=true';
-  } else if (color) {
-    iframeSrc += '&color=' + encodeURIComponent(color);
-  }
-
-  return (
-    <IframeEmbed
-      allow="autoplay"
-      frameborder="no"
-      ref={iframeRef}
-      scrolling="no"
-      src={iframeSrc}
-      title={'Soundcloud Widget - ' + mediaId}
-      messageHandler={messageHandler}
-      matchesMessagingOrigin={MATCHES_MESSAGING_ORIGIN}
-      {...rest}
-    />
-  );
-}
-
-/**
- * Verify required props and throw error if necessary.
- * @param {string|undefined} trackId
- * @param {string|undefined} playlistId
- * @return {boolean} true on valid
- */
-function checkProps(trackId, playlistId) {
-  // Perform manual checking as assertion is not available for Bento: Issue #32739
-  if (playlistId == undefined && trackId === undefined) {
-    displayWarning(
-      'data-trackid or data-playlistid is required for <amp-soundcloud>'
-    );
-    return false;
-  }
-  return true;
-}
-
-/**
- * @param {?string} message
- */
-function displayWarning(message) {
-  console /*OK*/
-    .warn(message);
-}
diff --git a/extensions/amp-soundcloud/1.0/example/index.html b/extensions/amp-soundcloud/1.0/example/index.html
new file mode 100644
index 000000000000..e913afd025bd
--- /dev/null
+++ b/extensions/amp-soundcloud/1.0/example/index.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width" />
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-soundcloud-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-soundcloud-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-soundcloud-1.0.css"
+    />
+    <style>
+      bento-soundcloud {
+        width: 300px;
+        height: 300px;
+      }
+    </style>
+    <style>
+      body {
+        background: #ecf1f3;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-soundcloud
+      id="my-track"
+      data-trackid="89299804"
+      data-visual="true"
+    ></bento-soundcloud>
+  </body>
+</html>
diff --git a/extensions/amp-soundcloud/1.0/storybook/Basic.amp.js b/extensions/amp-soundcloud/1.0/storybook/Basic.amp.js
index 6ccd5666c9f9..7dcff3918530 100644
--- a/extensions/amp-soundcloud/1.0/storybook/Basic.amp.js
+++ b/extensions/amp-soundcloud/1.0/storybook/Basic.amp.js
@@ -1,5 +1,4 @@
 import {withAmp} from '@ampproject/storybook-addon';
-import {boolean, color, text, withKnobs} from '@storybook/addon-knobs';
 
 import * as Preact from '#preact';
 
@@ -7,7 +6,7 @@ import {rgba2hex} from './converter';
 
 export default {
   title: 'amp-soundcloud-1_0',
-  decorators: [withKnobs, withAmp],
+  decorators: [withAmp],
 
   parameters: {
     extensions: [{name: 'amp-soundcloud', version: '1.0'}],
@@ -15,13 +14,7 @@ export default {
   },
 };
 
-export const TrackId = () => {
-  // Knobs
-  const componentColor = color('Color', 'RGBA(255, 85, 0, 1)');
-  const height = text('Height', '180');
-  const trackid = text('Track ID', '864765493');
-  const visual = boolean('Visual', true);
-
+export const TrackId = ({componentColor, trackId, visual, ...args}) => {
   // Convert RGBA to HEX (without Alpha Channel)
   const hex = rgba2hex(componentColor);
 
@@ -29,22 +22,30 @@ export const TrackId = () => {
   return (
     <amp-soundcloud
       data-color={hex}
-      data-trackid={trackid}
+      data-trackid={trackId}
       data-visual={visual}
-      height={height}
       layout="fixed-height"
       width="auto"
+      {...args}
     />
   );
 };
 
-export const PlaylistId = () => {
-  // Knobs
-  const componentColor = color('Color', 'RGBA(255, 85, 0, 1)');
-  const height = text('Height', '180');
-  const playlistId = text('Playlist ID', '151584683');
-  const visual = boolean('Visual', true);
+TrackId.args = {
+  trackId: '864765493',
+  height: 180,
+  visual: true,
+};
+
+TrackId.argTypes = {
+  componentColor: {
+    name: 'componentColor',
+    control: {type: 'color'},
+    defaultValue: 'RGBA(255, 85, 0, 1)',
+  },
+};
 
+export const PlaylistId = ({componentColor, playlistId, visual, ...args}) => {
   // Convert RGBA to HEX (without Alpha Channel)
   const hex = rgba2hex(componentColor);
 
@@ -54,22 +55,36 @@ export const PlaylistId = () => {
       data-color={hex}
       data-playlistid={playlistId}
       data-visual={visual}
-      height={height}
       layout="fixed-height"
       width="auto"
+      {...args}
     />
   );
 };
 
-export const MediaQuery = () => {
-  // Knobs
-  const componentColor = color('Color', 'RGBA(255, 85, 0, 1)');
-  const trackid1 = text('Track ID 1', '864765493');
-  const trackid2 = text('Track ID 2', '582363801');
-  const media1 = text('Media Query 1', '(min-width: 650px)');
-  const media2 = text('Media Query 2', '(max-width: 649px)');
-  const visual = boolean('Visual', true);
+PlaylistId.args = {
+  playlistId: '151584683',
+  height: 180,
+  visual: true,
+};
 
+PlaylistId.argTypes = {
+  componentColor: {
+    name: 'componentColor',
+    control: {type: 'color'},
+    defaultValue: 'RGBA(255, 85, 0, 1)',
+  },
+};
+
+export const MediaQuery = ({
+  componentColor,
+  media1,
+  media2,
+  trackId1,
+  trackId2,
+  visual,
+  ...args
+}) => {
   // Convert RGBA to HEX (without Alpha Channel)
   const hex = rgba2hex(componentColor);
 
@@ -78,33 +93,50 @@ export const MediaQuery = () => {
     <>
       <amp-soundcloud
         data-color={hex}
-        data-trackid={trackid1}
+        data-trackid={trackId1}
         data-visual={visual}
         height="240"
         layout="fixed"
         media={media1}
         width="240"
+        {...args}
       />
       <amp-soundcloud
         data-color={hex}
-        data-trackid={trackid2}
+        data-trackid={trackId2}
         data-visual={visual}
         height="180"
         layout="responsive"
         media={media2}
         width="180"
+        {...args}
       />
     </>
   );
 };
 
-export const ResponsiveLayout = () => {
-  // Knobs
-  const componentColor = color('Color', 'RGBA(255, 85, 0, 1)');
-  const trackid = text('Track ID', '864765493');
-  const sizes = text('Sizes', '(min-width: 720px) 520px, 100vw');
-  const visual = boolean('Visual', true);
+MediaQuery.args = {
+  trackId1: '864765493',
+  trackId2: '582363801',
+  media1: '(min-width: 650px)',
+  media2: '(max-width: 649px)',
+  visual: true,
+};
+
+MediaQuery.argTypes = {
+  componentColor: {
+    name: 'componentColor',
+    control: {type: 'color'},
+    defaultValue: 'RGBA(255, 85, 0, 1)',
+  },
+};
 
+export const ResponsiveLayout = ({
+  componentColor,
+  trackId,
+  visual,
+  ...args
+}) => {
   // Convert RGBA to HEX (without Alpha Channel)
   const hex = rgba2hex(componentColor);
 
@@ -112,23 +144,36 @@ export const ResponsiveLayout = () => {
   return (
     <amp-soundcloud
       data-color={hex}
-      data-trackid={trackid}
+      data-trackid={trackId}
       data-visual={visual}
       height="340"
       layout="responsive"
-      sizes={sizes}
       width="520"
+      {...args}
     />
   );
 };
 
-export const WithPlaceholderAndFallback = () => {
-  // Knobs
-  const componentColor = color('Color', 'RGBA(255, 85, 0, 1)');
-  const height = text('Height', '180');
-  const trackid = text('Track ID', '864765493');
-  const visual = boolean('Visual', true);
+ResponsiveLayout.args = {
+  trackId: '864765493',
+  sizes: '(min-width: 720px) 520px, 100vw',
+  visual: true,
+};
+
+ResponsiveLayout.argTypes = {
+  componentColor: {
+    name: 'componentColor',
+    control: {type: 'color'},
+    defaultValue: 'RGBA(255, 85, 0, 1)',
+  },
+};
 
+export const WithPlaceholderAndFallback = ({
+  componentColor,
+  trackId,
+  visual,
+  ...args
+}) => {
   // Convert RGBA to HEX (without Alpha Channel)
   const hex = rgba2hex(componentColor);
 
@@ -136,11 +181,11 @@ export const WithPlaceholderAndFallback = () => {
   return (
     <amp-soundcloud
       data-color={hex}
-      data-trackid={trackid}
+      data-trackid={trackId}
       data-visual={visual}
-      height={height}
       layout="fixed-height"
       width="auto"
+      {...args}
     >
       <div placeholder style="background:red">
         Placeholder. Loading content...
@@ -152,3 +197,17 @@ export const WithPlaceholderAndFallback = () => {
     </amp-soundcloud>
   );
 };
+
+WithPlaceholderAndFallback.args = {
+  trackId: '864765493',
+  height: 180,
+  visual: true,
+};
+
+WithPlaceholderAndFallback.argTypes = {
+  componentColor: {
+    name: 'componentColor',
+    control: {type: 'color'},
+    defaultValue: 'RGBA(255, 85, 0, 1)',
+  },
+};
diff --git a/extensions/amp-soundcloud/1.0/storybook/Basic.js b/extensions/amp-soundcloud/1.0/storybook/Basic.js
index ca0f9cf1ba00..de142701f5df 100644
--- a/extensions/amp-soundcloud/1.0/storybook/Basic.js
+++ b/extensions/amp-soundcloud/1.0/storybook/Basic.js
@@ -1,23 +1,15 @@
-import {boolean, color, text, withKnobs} from '@storybook/addon-knobs';
+import {BentoSoundcloud} from '#bento/components/bento-soundcloud/1.0/component';
 
 import * as Preact from '#preact';
 
 import {rgba2hex} from './converter';
 
-import {BentoSoundcloud} from '../component';
-
 export default {
   title: 'Soundcloud',
   component: BentoSoundcloud,
-  decorators: [withKnobs],
 };
 
-export const track = () => {
-  // Knobs
-  const componentColor = color('Color', 'RGBA(255, 85, 0, 1)');
-  const trackid = text('Track ID', '864765493');
-  const visual = boolean('Visual', true);
-
+export const track = ({componentColor, trackId, ...args}) => {
   // Convert RGBA to HEX (without Alpha Channel)
   const hex = rgba2hex(componentColor);
 
@@ -26,18 +18,26 @@ export const track = () => {
     <BentoSoundcloud
       color={hex}
       style={{height: '240px'}}
-      trackId={trackid}
-      visual={visual}
+      trackId={trackId}
+      {...args}
     />
   );
 };
 
-export const playlist = () => {
-  // Knobs
-  const componentColor = color('color', 'RGBA(255, 85, 0, 1)');
-  const playlistid = text('Playlist ID', '151584683');
-  const visual = boolean('Visual', true);
+track.args = {
+  trackId: '864765493',
+  visual: true,
+};
+
+track.argTypes = {
+  componentColor: {
+    name: 'componentColor',
+    control: {type: 'color'},
+    defaultValue: 'RGBA(255, 85, 0, 1)',
+  },
+};
 
+export const playlist = ({componentColor, playlistId, ...args}) => {
   // Convert RGBA to HEX (without Alpha Channel)
   const hex = rgba2hex(componentColor);
 
@@ -46,8 +46,21 @@ export const playlist = () => {
     <BentoSoundcloud
       color={hex}
       style={{height: '240px'}}
-      playlistId={playlistid}
-      visual={visual}
+      playlistId={playlistId}
+      {...args}
     />
   );
 };
+
+playlist.args = {
+  playlistId: '151584683',
+  visual: true,
+};
+
+playlist.argTypes = {
+  componentColor: {
+    name: 'componentColor',
+    control: {type: 'color'},
+    defaultValue: 'RGBA(255, 85, 0, 1)',
+  },
+};
diff --git a/extensions/amp-soundcloud/1.0/test-e2e/test-bento-soundcloud.js b/extensions/amp-soundcloud/1.0/test-e2e/test-bento-soundcloud.js
deleted file mode 100644
index 23a327ccfcaa..000000000000
--- a/extensions/amp-soundcloud/1.0/test-e2e/test-bento-soundcloud.js
+++ /dev/null
@@ -1,26 +0,0 @@
-describes.endtoend(
-  'bento-soundcloud',
-  {
-    version: '1.0',
-    fixture: 'bento/soundcloud.html',
-    environments: ['single'],
-  },
-  (env) => {
-    let controller;
-
-    beforeEach(() => {
-      controller = env.controller;
-    });
-
-    it('should render a soundcloud iframe', async () => {
-      const element = await controller.findElement('bento-soundcloud');
-      await controller.switchToShadowRoot(element);
-
-      const iframe = await controller.findElement('iframe');
-
-      await expect(controller.getElementAttribute(iframe, 'src')).to.equal(
-        'https://w.soundcloud.com/player/?url=https%3A%2F%2Fapi.soundcloud.com%2Ftracks%2F134337084'
-      );
-    });
-  }
-);
diff --git a/extensions/amp-soundcloud/validator-amp-soundcloud.protoascii b/extensions/amp-soundcloud/validator-amp-soundcloud.protoascii
index f7de4da5e176..78e49c052123 100644
--- a/extensions/amp-soundcloud/validator-amp-soundcloud.protoascii
+++ b/extensions/amp-soundcloud/validator-amp-soundcloud.protoascii
@@ -1,8 +1,8 @@
 tags: {  # amp-soundcloud 1.0
   html_format: AMP
   tag_name: "SCRIPT"
-  satisfies: "amp-soundcloud 1.0"
-  excludes: "amp-soundcloud 0.1"
+  satisfies_condition: "amp-soundcloud 1.0"
+  excludes_condition: "amp-soundcloud 0.1"
   extension_spec: {
     name: "amp-soundcloud"
     version_name: "v1.0"
@@ -14,8 +14,8 @@ tags: {  # amp-soundcloud 1.0
 tags: {  # amp-soundcloud 0.1 and latest
   html_format: AMP
   tag_name: "SCRIPT"
-  satisfies: "amp-soundcloud 0.1"
-  excludes: "amp-soundcloud 1.0"
+  satisfies_condition: "amp-soundcloud 0.1"
+  excludes_condition: "amp-soundcloud 1.0"
   extension_spec: {
     name: "amp-soundcloud"
     version_name: "v0.1"
diff --git a/extensions/amp-sticky-ad/1.0/amp-sticky-ad.js b/extensions/amp-sticky-ad/1.0/amp-sticky-ad.js
index c25411b6781b..850218c11dde 100644
--- a/extensions/amp-sticky-ad/1.0/amp-sticky-ad.js
+++ b/extensions/amp-sticky-ad/1.0/amp-sticky-ad.js
@@ -1,6 +1,6 @@
 import {addExperimentIdToElement} from '#ads/google/a4a/traffic-experiments';
 
-import {CommonSignals} from '#core/constants/common-signals';
+import {CommonSignals_Enum} from '#core/constants/common-signals';
 import {removeElement} from '#core/dom';
 import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 import {realChildElements} from '#core/dom/query';
@@ -241,7 +241,7 @@ class AmpStickyAd extends AMP.BaseElement {
     // `render-start` is expected to arrive first, but it's not emitted by
     // all types of ads.
     const signals = ad.signals();
-    return signals.whenSignal(CommonSignals.RENDER_START).then(() => {
+    return signals.whenSignal(CommonSignals_Enum.RENDER_START).then(() => {
       let backgroundColor;
       return this.measureElement(() => {
         backgroundColor = computedStyle(this.win, this.element)[
diff --git a/extensions/amp-sticky-ad/1.0/test/test-amp-sticky-ad.js b/extensions/amp-sticky-ad/1.0/test/test-amp-sticky-ad.js
index 1f657d4d41c6..9075a1dc0b38 100644
--- a/extensions/amp-sticky-ad/1.0/test/test-amp-sticky-ad.js
+++ b/extensions/amp-sticky-ad/1.0/test/test-amp-sticky-ad.js
@@ -48,8 +48,7 @@ describes.realWin(
           .callsFake(() => addToFixedLayerPromise);
       });
 
-      // TODO(#16916): Make this test work with synchronous throws.
-      it.skip('should listen to scroll event', function* () {
+      it('should listen to scroll event', function* () {
         const spy = env.sandbox.spy(impl, 'removeOnScrollListener_');
         expect(impl.scrollUnlisten_).to.be.null;
         yield macroTask();
@@ -61,7 +60,7 @@ describes.realWin(
         }
       });
 
-      it('should not build when scrollTop not greater than 1', () => {
+      it('should not build when scrollTop not greater than 1', async () => {
         const scheduleLayoutSpy = env.sandbox.spy(
           Services.ownersForDoc(impl.element),
           'scheduleLayout'
@@ -82,13 +81,10 @@ describes.realWin(
           return 300;
         };
         impl.onScroll_();
-        return new Promise((resolve) => {
-          setTimeout(resolve, 0);
-        }).then(() => {
-          expect(getScrollTopSpy).to.have.been.called;
-          expect(scheduleLayoutSpy).to.not.have.been.called;
-          expect(removeOnScrollListenerSpy).to.not.have.been.called;
-        });
+        await macroTask();
+        expect(getScrollTopSpy).to.have.been.called;
+        expect(scheduleLayoutSpy).to.not.have.been.called;
+        expect(removeOnScrollListenerSpy).to.not.have.been.called;
       });
 
       it('should display once user scroll', () => {
@@ -208,7 +204,7 @@ describes.realWin(
         const ad = impl.ad_;
         ad.signals().signal('built');
         await ad.signals().whenSignal('built');
-        await new Promise(setTimeout);
+        await macroTask();
         expect(layoutAdSpy).to.be.called;
         expect(ampStickyAd).to.not.have.attribute('visible');
 
diff --git a/extensions/amp-story-360/0.1/amp-story-360.css b/extensions/amp-story-360/0.1/amp-story-360.css
index 0007c34971a6..7d31df9fd948 100644
--- a/extensions/amp-story-360/0.1/amp-story-360.css
+++ b/extensions/amp-story-360/0.1/amp-story-360.css
@@ -27,6 +27,7 @@ amp-story-360 amp-img {
   display: flex !important;
   align-items: center !important;
   z-index: 100000 !important;
+  pointer-events: auto !important;
 }
 
 .i-amphtml-story-360-activate-button-icon {
diff --git a/extensions/amp-story-360/0.1/amp-story-360.js b/extensions/amp-story-360/0.1/amp-story-360.js
index 8f2c5606dc82..d232cf190045 100644
--- a/extensions/amp-story-360/0.1/amp-story-360.js
+++ b/extensions/amp-story-360/0.1/amp-story-360.js
@@ -3,20 +3,22 @@
  * For local development, run amp --host="192.168.44.47" --https --extensions=amp-story-360
  */
 
-import {CommonSignals} from '#core/constants/common-signals';
+import {CommonSignals_Enum} from '#core/constants/common-signals';
 import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
+import * as Preact from '#core/dom/jsx';
 import {applyFillContent, isLayoutSizeDefined} from '#core/dom/layout';
 import {closest} from '#core/dom/query';
-import {htmlFor} from '#core/dom/static-template';
 
 import {Services} from '#service';
-import {LocalizedStringId} from '#service/localization/strings';
+import {LocalizedStringId_Enum} from '#service/localization/strings';
 
 import {listenOncePromise} from '#utils/event-helper';
 import {dev, user, userAssert} from '#utils/log';
 
 import {Matrix, Renderer} from '#third_party/zuho/zuho';
 
+import {localizeTemplate} from 'extensions/amp-story/1.0/amp-story-localization-service';
+
 import {CSS} from '../../../build/amp-story-360-0.1.css';
 import {
   Action,
@@ -40,69 +42,69 @@ const HAVE_CURRENT_DATA = 2;
 const CENTER_OFFSET = 90;
 
 /**
- * Minimum distance from active page to activate WebGL context.
- * @const {number}
- */
-const MIN_WEBGL_DISTANCE = 2;
-
-/**
- * Generates the template for the permission button.
- *
- * @param {!Element} element
+ * Renders the template for the permission button.
  * @return {!Element}
  */
-const buildActivateButtonTemplate = (element) => htmlFor(element)`
-    <button class="i-amphtml-story-360-activate-button" role="button">
-      <span class="i-amphtml-story-360-activate-text"></span>
-      <span class="i-amphtml-story-360-activate-button-icon"
-        >360°
-        <svg
-          class="i-amphtml-story-360-activate-button-icon-svg"
-          xmlns="http://www.w3.org/2000/svg"
-          width="24"
-          height="24"
-          viewBox="0 0 24 24"
-          fill="none"
-        >
-          <defs>
-            <linearGradient id="i-amphtml-story-360-activate-gradient">
-              <stop stop-color="white" stop-opacity=".3"></stop>
-              <stop offset="1" stop-color="white"></stop>
-            </linearGradient>
-            <ellipse
-              id="i-amphtml-story-360-activate-ellipse"
-              ry="11.5"
-              rx="7.5"
-              cy="12"
-              cx="12"
-              stroke="url(#i-amphtml-story-360-activate-gradient)"
-            ></ellipse>
-          </defs>
-          <use xlink:href="#i-amphtml-story-360-activate-ellipse"></use>
-          <use
-            xlink:href="#i-amphtml-story-360-activate-ellipse"
-            transform="rotate(90, 12, 12)"
-          ></use>
-        </svg>
-      </span>
-    </button>
-  `;
+const renderActivateButtonTemplate = () => (
+  <button class="i-amphtml-story-360-activate-button" role="button">
+    <span
+      i-amphtml-i18n-text-content={
+        LocalizedStringId_Enum.AMP_STORY_ACTIVATE_BUTTON_TEXT
+      }
+    ></span>
+    <span class="i-amphtml-story-360-activate-button-icon">
+      360°
+      <svg
+        class="i-amphtml-story-360-activate-button-icon-svg"
+        xmlns="http://www.w3.org/2000/svg"
+        width="24"
+        height="24"
+        viewBox="0 0 24 24"
+        fill="none"
+      >
+        <defs>
+          <linearGradient id="i-amphtml-story-360-activate-gradient">
+            <stop stop-color="white" stop-opacity=".3"></stop>
+            <stop offset="1" stop-color="white"></stop>
+          </linearGradient>
+          <ellipse
+            id="i-amphtml-story-360-activate-ellipse"
+            ry="11.5"
+            rx="7.5"
+            cy="12"
+            cx="12"
+            stroke="url(#i-amphtml-story-360-activate-gradient)"
+          ></ellipse>
+        </defs>
+        <use href="#i-amphtml-story-360-activate-ellipse"></use>
+        <use
+          href="#i-amphtml-story-360-activate-ellipse"
+          transform="rotate(90, 12, 12)"
+        ></use>
+      </svg>
+    </span>
+  </button>
+);
 
 /**
- * Generates the template for the gyroscope feature discovery animation.
+ * Renders the template for the gyroscope feature discovery animation.
  *
  * NOTE: i-amphtml-story-360-discovery is used in maybeShowDiscoveryAnimation_
  * and must be changed in both places if updated.
  *
- * @param {!Element} element
  * @return {!Element}
  */
-const buildDiscoveryTemplate = (element) => htmlFor(element)`
-    <div class="i-amphtml-story-360-discovery" aria-live="polite">
-      <div class="i-amphtml-story-360-discovery-animation"></div>
-      <span class="i-amphtml-story-360-discovery-text"></span>
-    </div>
-  `;
+const renderDiscoveryTemplate = () => (
+  <div class="i-amphtml-story-360-discovery" aria-live="polite">
+    <div class="i-amphtml-story-360-discovery-animation"></div>
+    <span
+      class="i-amphtml-story-360-discovery-text"
+      i-amphtml-i18n-text-content={
+        LocalizedStringId_Enum.AMP_STORY_DISCOVERY_DIALOG_TEXT
+      }
+    ></span>
+  </div>
+);
 
 /**
  * @param {number} deg
@@ -226,13 +228,20 @@ class CameraAnimation {
 }
 
 export class AmpStory360 extends AMP.BaseElement {
+  /** @override  */
+  static previewAllowed(element) {
+    // We can assume that images are cached, but the same is not necessarily
+    // true for videos. We only allow preview mode for `AmpStory360` when it
+    // uses cached sources, because requests for origin sources cannot be made
+    // due to privacy concerns.
+    const usesVideo = element.querySelector('amp-video');
+    return !usesVideo;
+  }
+
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
 
-    /** @private {?../../../src/service/localization.LocalizationService} */
-    this.localizationService_ = null;
-
     /** @private {!Array<!CameraOrientation>} */
     this.orientations_ = [];
 
@@ -269,9 +278,6 @@ export class AmpStory360 extends AMP.BaseElement {
     /** @private {boolean} */
     this.isOnActivePage_ = false;
 
-    /** @private {?number} */
-    this.distance_ = null;
-
     /** @private {number} */
     this.sceneHeading_ = 0;
 
@@ -290,9 +296,6 @@ export class AmpStory360 extends AMP.BaseElement {
     /** @private {number} */
     this.headingOffset_ = 0;
 
-    /** @private WebGL extension for lost context. */
-    this.lostGlContext_ = null;
-
     /** @private {!Array<number>} */
     this.rot_ = null;
   }
@@ -344,18 +347,6 @@ export class AmpStory360 extends AMP.BaseElement {
     container.appendChild(this.canvas_);
     applyFillContent(container, /* replacedContent */ true);
 
-    // Mutation observer for distance attribute
-    const config = {attributes: true, attributeFilter: ['distance']};
-    const callback = (mutationsList) => {
-      this.distance_ = parseInt(
-        mutationsList[0].target.getAttribute('distance'),
-        10
-      );
-      this.restoreOrLoseGlContext_();
-    };
-    const observer = new MutationObserver(callback);
-    this.getPage_() && observer.observe(this.getPage_(), config);
-
     // Initialize all services before proceeding
     return Promise.all([
       Services.storyStoreServiceForOrNull(this.win).then((storeService) => {
@@ -426,20 +417,6 @@ export class AmpStory360 extends AMP.BaseElement {
     }
   }
 
-  /** @private */
-  restoreOrLoseGlContext_() {
-    if (!this.renderer_) {
-      return;
-    }
-    if (this.distance_ < MIN_WEBGL_DISTANCE) {
-      if (this.renderer_.gl.isContextLost()) {
-        this.lostGlContext_.restoreContext();
-      }
-    } else if (!this.renderer_.gl.isContextLost()) {
-      this.lostGlContext_.loseContext();
-    }
-  }
-
   /**
    * @param {string} permissionState
    * @private
@@ -505,7 +482,7 @@ export class AmpStory360 extends AMP.BaseElement {
       // Debounce onDeviceOrientation_ to rAF.
       let rafTimeout;
       this.win.addEventListener('deviceorientation', (e) => {
-        if (this.isReady_ && this.distance_ < MIN_WEBGL_DISTANCE) {
+        if (this.isReady_) {
           rafTimeout && this.win.cancelAnimationFrame(rafTimeout);
           rafTimeout = this.win.requestAnimationFrame(() => {
             if (!this.isOnActivePage_) {
@@ -548,16 +525,11 @@ export class AmpStory360 extends AMP.BaseElement {
       )
     ) {
       const page = this.getPage_();
-      const discoveryTemplate = page && buildDiscoveryTemplate(page);
+      const discoveryTemplate = page && renderDiscoveryTemplate();
       // Support translation of discovery dialogue text.
-      this.mutateElement(() => {
-        discoveryTemplate.querySelector(
-          '.i-amphtml-story-360-discovery-text'
-        ).textContent = this.localizationService_.getLocalizedString(
-          LocalizedStringId.AMP_STORY_DISCOVERY_DIALOG_TEXT
-        );
-      });
-      this.mutateElement(() => page.appendChild(discoveryTemplate));
+      localizeTemplate(discoveryTemplate, page).then(() =>
+        this.mutateElement(() => page.appendChild(discoveryTemplate))
+      );
     }
   }
 
@@ -588,14 +560,9 @@ export class AmpStory360 extends AMP.BaseElement {
    */
   renderActivateButton_() {
     const ampStoryPage = this.getPage_();
-    this.activateButton_ =
-      ampStoryPage && buildActivateButtonTemplate(ampStoryPage);
+    this.activateButton_ = ampStoryPage && renderActivateButtonTemplate();
 
-    this.activateButton_.querySelector(
-      '.i-amphtml-story-360-activate-text'
-    ).textContent = this.localizationService_.getLocalizedString(
-      LocalizedStringId.AMP_STORY_ACTIVATE_BUTTON_TEXT
-    );
+    localizeTemplate(this.activateButton_, ampStoryPage);
 
     this.activateButton_.addEventListener('click', () =>
       this.requestGyroscopePermissions_()
@@ -712,19 +679,16 @@ export class AmpStory360 extends AMP.BaseElement {
     owners.setOwner(ampImgEl, this.element);
     owners.scheduleLayout(this.element, ampImgEl);
     return whenUpgradedToCustomElement(ampImgEl)
-      .then(() => ampImgEl.signals().whenSignal(CommonSignals.LOAD_END))
+      .then(() => ampImgEl.signals().whenSignal(CommonSignals_Enum.LOAD_END))
       .then(
         () => {
           this.renderer_ = new Renderer(this.canvas_);
-          this.setupGlContextListeners_();
           this.image_ = this.checkImageReSize_(
             dev().assertElement(this.element.querySelector('img'))
           );
           this.initRenderer_();
         },
-        () => {
-          user().error(TAG, 'Failed to load the amp-img.');
-        }
+        () => user().error(TAG, 'Failed to load the amp-img.')
       );
   }
 
@@ -734,7 +698,9 @@ export class AmpStory360 extends AMP.BaseElement {
    */
   setupAmpVideoRenderer_() {
     return whenUpgradedToCustomElement(dev().assertElement(this.ampVideoEl_))
-      .then(() => this.ampVideoEl_.signals().whenSignal(CommonSignals.LOAD_END))
+      .then(() =>
+        this.ampVideoEl_.signals().whenSignal(CommonSignals_Enum.LOAD_END)
+      )
       .then(() => {
         const alreadyHasData =
           dev().assertElement(this.ampVideoEl_.querySelector('video'))
@@ -747,28 +713,12 @@ export class AmpStory360 extends AMP.BaseElement {
       .then(
         () => {
           this.renderer_ = new Renderer(this.canvas_);
-          this.setupGlContextListeners_();
           this.initRenderer_();
         },
-        () => {
-          user().error(TAG, 'Failed to load the amp-video.');
-        }
+        () => user().error(TAG, 'Failed to load the amp-video.')
       );
   }
 
-  /** @private */
-  setupGlContextListeners_() {
-    this.lostGlContext_ = this.renderer_.gl.getExtension('WEBGL_lose_context');
-    this.renderer_.canvas.addEventListener('webglcontextlost', (e) => {
-      // Calling preventDefault is necessary for restoring context.
-      e.preventDefault();
-      this.isReady_ = false;
-    });
-    this.renderer_.canvas.addEventListener('webglcontextrestored', () =>
-      this.initRenderer_()
-    );
-  }
-
   /** @private */
   initRenderer_() {
     this.renderer_.init();
diff --git a/extensions/amp-story-360/0.1/test/test-amp-story-360.js b/extensions/amp-story-360/0.1/test/test-amp-story-360.js
index 0da487614c13..ee2b5cb99d0b 100644
--- a/extensions/amp-story-360/0.1/test/test-amp-story-360.js
+++ b/extensions/amp-story-360/0.1/test/test-amp-story-360.js
@@ -3,6 +3,8 @@ import {createElementWithAttributes} from '#core/dom';
 
 import {LocalizationService} from '#service/localization';
 
+import {macroTask} from '#testing/helpers';
+
 import {
   registerServiceBuilder,
   registerServiceBuilderForDoc,
@@ -27,8 +29,6 @@ describes.realWin(
     let storeService;
     let pageEl;
 
-    const nextTick = () => new Promise((resolve) => win.setTimeout(resolve, 0));
-
     function appendAmpImg(parent, path) {
       const ampImg = createElementWithAttributes(win.document, 'amp-img', {
         'src': path,
@@ -101,7 +101,7 @@ describes.realWin(
         '.i-amphtml-story-360-activate-button'
       );
 
-      await nextTick();
+      await macroTask();
 
       expect(activationEl.getAttribute('role')).to.eql('button');
     });
diff --git a/extensions/amp-story-audio-sticker/0.1/amp-story-audio-sticker.css b/extensions/amp-story-audio-sticker/0.1/amp-story-audio-sticker.css
new file mode 100644
index 000000000000..18b617676fd4
--- /dev/null
+++ b/extensions/amp-story-audio-sticker/0.1/amp-story-audio-sticker.css
@@ -0,0 +1,105 @@
+.i-amphtml-amp-story-audio-sticker-component {
+  display: flex !important;
+  flex-direction: column !important;
+  flex-wrap: wrap !important;
+  align-items: center !important;
+  align-content: flex-start !important;
+  justify-content: flex-start !important;
+}
+
+.i-amphtml-amp-story-audio-sticker-tap-hint {
+  width: 110px !important;
+  height: 38.33px !important;
+  background-size: contain !important;
+  background-repeat: no-repeat !important;
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg width="110" height="39" viewBox="0 0 110 39" fill="none" xmlns="http://www.w3.org/2000/svg"><g filter="url(#filter0_b_2402_31756)"><path fill-rule="evenodd" clip-rule="evenodd" d="M16 0C7.16344 0 0 7.16344 0 16C0 24.8366 7.16344 32 16 32H19.75L24.2 37.9333C24.6 38.4667 25.4 38.4667 25.8 37.9333L30.25 32H94C102.837 32 110 24.8366 110 16C110 7.16344 102.837 0 94 0H16Z" fill="#4D4D4D" fill-opacity="0.4"/></g><defs><filter id="filter0_b_2402_31756" x="-15" y="-15" width="140" height="68.3333" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feGaussianBlur in="BackgroundImageFix" stdDeviation="7.5"/><feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_2402_31756"/><feBlend mode="normal" in="SourceGraphic" in2="effect1_backgroundBlur_2402_31756" result="shape"/></filter></defs></svg>') !important;
+  font-weight: 500 !important;
+  font-size: 14px !important;
+  display: flex !important;
+  justify-content: center !important;
+  align-items: center !important;
+  margin-bottom: 4px !important;
+  transition: opacity 0.5s ease !important;
+}
+
+amp-story:not([muted]) .i-amphtml-amp-story-audio-sticker-tap-hint {
+  opacity: 0 !important;
+}
+
+.i-amphtml-amp-story-audio-sticker-tap-hint span {
+  margin-bottom: 6px !important;
+}
+
+.i-amphtml-amp-story-audio-sticker-container {
+  position: relative !important;
+}
+
+.i-amphtml-amp-story-audio-sticker-container.large {
+  width: 180px !important;
+  height: 180px !important;
+}
+
+.i-amphtml-amp-story-audio-sticker-container.small {
+  width: 120px !important;
+  height: 120px !important;
+}
+
+.i-amphtml-amp-story-audio-sticker-container * {
+  pointer-events: none !important;
+}
+
+amp-story-audio-sticker {
+  position: relative !important;
+  width: 100% !important;
+  max-width: 100% !important; /* Set the maximum width of the image to 100% to ensure it fits within the container */
+  max-height: 100% !important; /* Set the maximum height of the image to 100% to ensure it fits within the container */
+  transition: transform 0.5s ease !important;
+}
+
+amp-story-audio-sticker:active {
+  transform: scale(0.8) !important;
+}
+
+amp-story[muted] amp-story-audio-sticker {
+  pointer-events: auto !important;
+}
+
+.i-amphtml-amp-story-audio-sticker-container.large amp-story-audio-sticker {
+  border-radius: 40px !important;
+}
+
+.i-amphtml-amp-story-audio-sticker-container.small amp-story-audio-sticker {
+  border-radius: 25px !important;
+}
+
+amp-story-audio-sticker[sticker-style="outline"] {
+  box-shadow: inset 0 0 0 4px var(--story-audio-sticker-outline-color, white) !important;
+}
+
+amp-story-audio-sticker[sticker-style="dropshadow"] {
+  filter: drop-shadow(4px 4px 20px var(--story-audio-sticker-dropshadow-color, white)) !important;
+}
+
+/*
+  Hide the sticker after the story gets unmuted:
+  1) if the sticker is on the active page, hide it after showing posttap sticker for 4 seconds.
+  2) if the sticker is not on the active page, hide it immediately since it is in the background.
+*/
+amp-story:not([muted]) amp-story-page[active] amp-story-audio-sticker {
+  transition: transform 0.5s ease, opacity 0.5s ease 4s !important;
+}
+amp-story:not([muted]) amp-story-audio-sticker {
+  opacity: 0 !important;
+}
+
+amp-story-audio-sticker > * {
+  position: absolute !important; /* Child divs should have absolute position to make them stacked */
+  top: 0 !important;
+  left: 0 !important;
+  height: 100% !important;
+  width: 100% !important;
+}
+
+amp-story:not([muted]) amp-story-audio-sticker-pretap, amp-story[muted] amp-story-audio-sticker-posttap {
+  opacity: 0 !important;
+}
diff --git a/extensions/amp-story-audio-sticker/0.1/amp-story-audio-sticker.js b/extensions/amp-story-audio-sticker/0.1/amp-story-audio-sticker.js
new file mode 100644
index 000000000000..50940e248013
--- /dev/null
+++ b/extensions/amp-story-audio-sticker/0.1/amp-story-audio-sticker.js
@@ -0,0 +1,217 @@
+import * as Preact from '#core/dom/jsx';
+import {Layout_Enum} from '#core/dom/layout';
+import {scopedQuerySelector} from '#core/dom/query';
+
+import {Services} from '#service';
+
+import {CSS} from '../../../build/amp-story-audio-sticker-0.1.css';
+import {
+  Action,
+  StateProperty,
+} from '../../amp-story/1.0/amp-story-store-service';
+
+const TAG = 'amp-story-audio-sticker';
+
+/**
+ * Sticker pretap tag
+ * @const {string}
+ */
+const STICKER_PRETAP_TAG = 'amp-story-audio-sticker-pretap';
+/**
+ * Sticker posttap tag
+ * @const {string}
+ */
+const STICKER_POSTTAP_TAG = 'amp-story-audio-sticker-posttap';
+
+/**
+ * The gstatic URL prefix of the sticker assets.
+ * @const {string}
+ */
+const ASSET_URL_PREFIX = 'https://www.gstatic.com/amphtml/stamp/audio-sticker/';
+
+/** @const {!Object}
+ * List of default stickers.
+ */
+const DEFAULT_STICKERS = {
+  'audio-cloud': {
+    width: '360',
+    height: '233',
+    pretapUrl: ASSET_URL_PREFIX + 'audio-cloud-pretap.png',
+    posttapUrl: ASSET_URL_PREFIX + 'audio-cloud-posttap.png',
+  },
+  'headphone-cat': {
+    width: '282',
+    height: '226',
+    pretapUrl: ASSET_URL_PREFIX + 'cat-sticker-pretap.png',
+    posttapUrl: ASSET_URL_PREFIX + 'cat-sticker-posttap.gif',
+  },
+  'loud-speaker': {
+    width: '380',
+    height: '380',
+    pretapUrl: ASSET_URL_PREFIX + 'loud-speaker-pretap.png',
+    posttapUrl: ASSET_URL_PREFIX + 'loud-speaker-posttap.png',
+  },
+  'tape-player': {
+    width: '260',
+    height: '220',
+    pretapUrl: ASSET_URL_PREFIX + 'tape-player-pretap.png',
+    posttapUrl: ASSET_URL_PREFIX + 'tape-player-posttap.gif',
+  },
+};
+
+/** Fallback default sticker. It would be used if both of below happen:
+ * 1) no default sticker is specified
+ * 2) the custom sticker data is not provided completely.
+ * @const {string}
+ */
+const FALLBACK_DEFAULT_STICKER = 'headphone-cat';
+
+export class AmpStoryAudioSticker extends AMP.BaseElement {
+  /** @param {!AmpElement} element */
+  constructor(element) {
+    super(element);
+
+    /** @private {?../../../extensions/amp-story/1.0/amp-story-store-service.AmpStoryStoreService} */
+    this.storeService_ = null;
+
+    /** @private {?HTMLElement} */
+    this.systemLayerEl_ = null;
+  }
+
+  /** @override */
+  buildCallback() {
+    this.maybeInitializeDefaultSticker_();
+
+    // Build sticker component structure.
+    this.element.parentNode.appendChild(
+      <div class="i-amphtml-amp-story-audio-sticker-component">
+        <div class="i-amphtml-amp-story-audio-sticker-tap-hint">
+          <span>tap to unmute</span>
+        </div>
+        <div
+          class={
+            'i-amphtml-amp-story-audio-sticker-container' +
+            (this.element.getAttribute('size') === 'large'
+              ? ' large'
+              : ' small')
+          }
+        >
+          {this.element}
+        </div>
+      </div>
+    );
+  }
+
+  /** @override */
+  layoutCallback() {
+    return Services.storyStoreServiceForOrNull(this.win).then(
+      (storeService) => {
+        this.storeService_ = storeService;
+        this.element.addEventListener('click', this.onClick_.bind(this), true);
+        this.storeService_.subscribe(
+          StateProperty.MUTED_STATE,
+          this.onMutedStateChange_.bind(this)
+        );
+      }
+    );
+  }
+
+  /**
+   * When the sticker is clicked, toggle muted state and highlight
+   * the mute control on system layer.
+   * @private
+   */
+  onClick_() {
+    this.storeService_.dispatch(Action.TOGGLE_MUTED, false);
+    this.getSystemLayerEl_().classList.add(
+      'i-amphtml-story-highlight-mute-audio-control'
+    );
+  }
+
+  /**
+   * Disable highlight once the story gets muted again.
+   * @private
+   * @param {boolean} isMuted
+   */
+  onMutedStateChange_(isMuted) {
+    if (isMuted) {
+      this.getSystemLayerEl_().classList.remove(
+        'i-amphtml-story-highlight-mute-audio-control'
+      );
+    }
+  }
+
+  /**
+   * Get the system layer element.
+   * @private
+   * @return {HTMLElement}
+   */
+  getSystemLayerEl_() {
+    return (
+      this.systemLayerEl_ ??
+      (this.systemLayerEl_ = this.element
+        .closest('amp-story')
+        .querySelector('.i-amphtml-system-layer-host'))
+    );
+  }
+
+  /** @private */
+  maybeInitializeDefaultSticker_() {
+    const defaultSticker = this.getDefaultSticker_();
+    if (!defaultSticker) {
+      return;
+    }
+
+    // Remove all existing child elements and add only pretap and posttap elements.
+    this.element.replaceChildren();
+    this.element.appendChild(
+      <amp-story-audio-sticker-pretap>
+        <amp-img
+          width={DEFAULT_STICKERS[defaultSticker].width}
+          height={DEFAULT_STICKERS[defaultSticker].height}
+          src={DEFAULT_STICKERS[defaultSticker].pretapUrl}
+          layout="responsive"
+        ></amp-img>
+      </amp-story-audio-sticker-pretap>
+    );
+    this.element.appendChild(
+      <amp-story-audio-sticker-posttap>
+        <amp-img
+          width={DEFAULT_STICKERS[defaultSticker].width}
+          height={DEFAULT_STICKERS[defaultSticker].height}
+          src={DEFAULT_STICKERS[defaultSticker].posttapUrl}
+          layout="responsive"
+        ></amp-img>
+      </amp-story-audio-sticker-posttap>
+    );
+  }
+
+  /**
+   * Return the specified default sticker or null if there's custom sticker provided.
+   * Return fallback sticker is both default and custom sticker config are not specified at all.
+   * @private
+   * @return {string}
+   */
+  getDefaultSticker_() {
+    if (
+      scopedQuerySelector(this.element, STICKER_PRETAP_TAG) &&
+      scopedQuerySelector(this.element, STICKER_POSTTAP_TAG)
+    ) {
+      return null;
+    }
+
+    const stickerAttr = this.element.getAttribute('sticker');
+    return DEFAULT_STICKERS[stickerAttr]
+      ? stickerAttr
+      : FALLBACK_DEFAULT_STICKER;
+  }
+
+  /** @override */
+  isLayoutSupported(layout) {
+    return layout == Layout_Enum.CONTAINER;
+  }
+}
+
+AMP.extension(TAG, '0.1', (AMP) => {
+  AMP.registerElement(TAG, AmpStoryAudioSticker, CSS);
+});
diff --git a/extensions/amp-story-audio-sticker/0.1/test/test-amp-story-audio-sticker.js b/extensions/amp-story-audio-sticker/0.1/test/test-amp-story-audio-sticker.js
new file mode 100644
index 000000000000..bb1c928ba93f
--- /dev/null
+++ b/extensions/amp-story-audio-sticker/0.1/test/test-amp-story-audio-sticker.js
@@ -0,0 +1,196 @@
+import {Deferred} from '#core/data-structures/promise';
+import * as Preact from '#core/dom/jsx';
+import {closestAncestorElementBySelector} from '#core/dom/query';
+import {computedStyle} from '#core/dom/style';
+
+import {Services} from '#service';
+
+import {
+  Action,
+  AmpStoryStoreService,
+  StateProperty,
+} from '../../../amp-story/1.0/amp-story-store-service';
+import {} from '../amp-story-audio-sticker';
+
+describes.realWin(
+  'amp-story-audio-sticker-v0.1',
+  {
+    amp: {
+      runtimeOn: true,
+      extensions: ['amp-story:1.0', 'amp-story-audio-sticker:0.1'],
+    },
+  },
+  (env) => {
+    const activePageId = 'page-1';
+
+    let win;
+    let doc;
+    let storeService;
+    let stickerEl;
+    let stickerImpl;
+
+    const nextTick = () => new Promise((resolve) => win.setTimeout(resolve, 0));
+
+    beforeEach(async () => {
+      win = env.win;
+      doc = win.document;
+
+      const storyEl = (
+        <amp-story style="--story-audio-sticker-outline-color:rgb(0, 200, 0)">
+          <amp-story-page id="page-1">
+            <amp-story-grid-layer>
+              <amp-story-audio-sticker sticker-style="outline"></amp-story-audio-sticker>
+            </amp-story-grid-layer>
+          </amp-story-page>
+          <amp-story-page id="page-2">
+            <amp-story-grid-layer>
+              <amp-story-audio-sticker></amp-story-audio-sticker>
+            </amp-story-grid-layer>
+          </amp-story-page>
+          <div class="i-amphtml-system-layer-host"></div>
+        </amp-story>
+      );
+      doc.body.appendChild(storyEl);
+
+      storeService = new AmpStoryStoreService(win);
+      storeService.subscribe(StateProperty.MUTED_STATE, (muted) => {
+        muted
+          ? storyEl.setAttribute('muted', '')
+          : storyEl.removeAttribute('muted');
+      });
+      env.sandbox
+        .stub(Services, 'storyStoreServiceForOrNull')
+        .returns(Promise.resolve(storeService));
+      env.sandbox.stub(Services, 'storyStoreService').returns(storeService);
+
+      stickerEl = doc.querySelector('amp-story-audio-sticker');
+      stickerImpl = await stickerEl.getImpl();
+
+      env.sandbox
+        .stub(stickerImpl, 'mutateElement')
+        .callsFake((fn) => Promise.resolve(fn()));
+    });
+
+    it('should add all necessary sticker elements', async () => {
+      expect(
+        doc.querySelectorAll('.i-amphtml-amp-story-audio-sticker-component')
+          .length
+      ).equal(2);
+      expect(
+        doc.querySelectorAll('.i-amphtml-amp-story-audio-sticker-tap-hint')
+          .length
+      ).equal(2);
+      expect(
+        doc.querySelectorAll(
+          '.i-amphtml-amp-story-audio-sticker-container.small'
+        ).length
+      ).equal(2);
+      expect(
+        doc.querySelectorAll('amp-story-audio-sticker-pretap').length
+      ).equal(2);
+      expect(
+        doc.querySelectorAll('amp-story-audio-sticker-posttap').length
+      ).equal(2);
+    });
+
+    describe('visibilities of different sticker components after a click on the audio sticker', () => {
+      beforeEach(async () => {
+        await stickerImpl.layoutCallback();
+
+        stickerEl.click();
+        await nextTick();
+      });
+
+      it('should unmute the story and switch from pretap to posttap state for all stickers', async () => {
+        expect(storeService.get(StateProperty.MUTED_STATE)).equal(false);
+
+        doc
+          .querySelectorAll('.i-amphtml-amp-story-audio-sticker-tap-hint')
+          .forEach((el) =>
+            expect(computedStyle(win, el).getPropertyValue('opacity')).equal(
+              '0'
+            )
+          );
+        doc
+          .querySelectorAll('amp-story-audio-sticker-pretap')
+          .forEach((el) =>
+            expect(computedStyle(win, el).getPropertyValue('opacity')).equal(
+              '0'
+            )
+          );
+        doc
+          .querySelectorAll('amp-story-audio-sticker-posttap')
+          .forEach((el) =>
+            expect(computedStyle(win, el).getPropertyValue('opacity')).equal(
+              '1'
+            )
+          );
+      });
+
+      it('should switch from posttap back to pretap state for all stickers', async () => {
+        storeService.dispatch(Action.TOGGLE_MUTED, true);
+        await nextTick();
+
+        // Wait until the animation is finished to check the opacity value.
+        const deferred = new Deferred();
+        setTimeout(() => {
+          doc
+            .querySelectorAll('.i-amphtml-amp-story-audio-sticker-tap-hint')
+            .forEach((el) =>
+              expect(computedStyle(win, el).getPropertyValue('opacity')).equal(
+                '1'
+              )
+            );
+          deferred.resolve();
+        }, 750);
+
+        doc.querySelectorAll('amp-story-audio-sticker-pretap').forEach((el) => {
+          expect(computedStyle(win, el).getPropertyValue('opacity')).equal('1');
+        });
+        doc
+          .querySelectorAll('amp-story-audio-sticker-posttap')
+          .forEach((el) =>
+            expect(computedStyle(win, el).getPropertyValue('opacity')).equal(
+              '0'
+            )
+          );
+        return deferred.promise;
+      });
+    });
+
+    it('should hide the posttap sticker after 4 seconds or immediately if the sticker is on the active page or not', async () => {
+      const clock = env.sandbox.useFakeTimers();
+      env.sandbox
+        .stub(storeService, 'get')
+        .withArgs(StateProperty.CURRENT_PAGE_ID)
+        .returns(activePageId);
+
+      await stickerImpl.layoutCallback();
+
+      stickerEl.click();
+      await nextTick();
+
+      doc.querySelectorAll('amp-story-audio-sticker').forEach((el) => {
+        const pageEl = closestAncestorElementBySelector(el, 'amp-story-page');
+        if (pageEl.hasAttribute('active')) {
+          clock.tick(4000);
+        }
+        expect(computedStyle(win, el).getPropertyValue('opacity')).equal('0');
+      });
+    });
+
+    it('should override the default style color if the custom color is in valid RGB/RGBA format ', async () => {
+      await stickerImpl.layoutCallback();
+      await nextTick();
+
+      const stickerWithOutline = doc.querySelector(
+        'amp-story-audio-sticker[sticker-style="outline"]'
+      );
+      expect(
+        computedStyle(win, stickerWithOutline).getPropertyValue(
+          '--story-audio-sticker-outline-color'
+        )
+      ).equal('rgb(0, 200, 0)');
+    });
+  }
+);
diff --git a/extensions/amp-story-audio-sticker/0.1/test/validator-amp-story-audio-sticker-no-grid-layer.html b/extensions/amp-story-audio-sticker/0.1/test/validator-amp-story-audio-sticker-no-grid-layer.html
new file mode 100644
index 000000000000..25f512c44fdc
--- /dev/null
+++ b/extensions/amp-story-audio-sticker/0.1/test/validator-amp-story-audio-sticker-no-grid-layer.html
@@ -0,0 +1,26 @@
+<!doctype html>
+<html ⚡ lang="en">
+<head>
+  <meta charset="utf-8">
+  <link rel="canonical" href="ampconf.html">
+  <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+  <script async src="https://cdn.ampproject.org/v0.js"></script>
+  <title>Key Highlights of AMP Conf 2018</title>
+
+  <script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
+  <script async custom-element="amp-video" src="https://cdn.ampproject.org/v0/amp-video-0.1.js"></script>
+  <script async custom-element="amp-story-audio-sticker" src="https://cdn.ampproject.org/v0/amp-story-audio-sticker-0.1.js"></script>
+
+  <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+</head>
+  <body>
+    <amp-story standalone id="cats"
+        title="Key Highlights of AMP Conf 2018" publisher="The AMP team"
+        publisher-logo-src="./img/amplogo.png"
+        poster-portrait-src="./img/overview.jpg">
+      <amp-story-page id="page-1" title="Lorem ipsum dolor sit amet">
+        <amp-story-audio-sticker sticker="audio-cloud"></amp-story-audio-sticker>
+      </amp-story-page>
+    </amp-story>
+  </body>
+</html>
\ No newline at end of file
diff --git a/extensions/amp-story-audio-sticker/0.1/test/validator-amp-story-audio-sticker-no-grid-layer.out b/extensions/amp-story-audio-sticker/0.1/test/validator-amp-story-audio-sticker-no-grid-layer.out
new file mode 100644
index 000000000000..d85b76d99d2c
--- /dev/null
+++ b/extensions/amp-story-audio-sticker/0.1/test/validator-amp-story-audio-sticker-no-grid-layer.out
@@ -0,0 +1,31 @@
+FAIL
+|  <!doctype html>
+|  <html ⚡ lang="en">
+|  <head>
+|    <meta charset="utf-8">
+|    <link rel="canonical" href="ampconf.html">
+|    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+|    <script async src="https://cdn.ampproject.org/v0.js"></script>
+|    <title>Key Highlights of AMP Conf 2018</title>
+|
+|    <script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
+|    <script async custom-element="amp-video" src="https://cdn.ampproject.org/v0/amp-video-0.1.js"></script>
+|    <script async custom-element="amp-story-audio-sticker" src="https://cdn.ampproject.org/v0/amp-story-audio-sticker-0.1.js"></script>
+|
+|    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+|  </head>
+|    <body>
+|      <amp-story standalone id="cats"
+|          title="Key Highlights of AMP Conf 2018" publisher="The AMP team"
+|          publisher-logo-src="./img/amplogo.png"
+|          poster-portrait-src="./img/overview.jpg">
+|        <amp-story-page id="page-1" title="Lorem ipsum dolor sit amet">
+|          <amp-story-audio-sticker sticker="audio-cloud"></amp-story-audio-sticker>
+>>         ^~~~~~~~~
+amp-story-audio-sticker/0.1/test/validator-amp-story-audio-sticker-no-grid-layer.html:22:8 The tag 'amp-story-audio-sticker' may only appear as a descendant of tag 'amp-story-grid-layer'. (see https://amp.dev/documentation/components/amp-story-audio-sticker)
+>>         ^~~~~~~~~
+amp-story-audio-sticker/0.1/test/validator-amp-story-audio-sticker-no-grid-layer.html:22:8 Tag 'amp-story-audio-sticker' is disallowed as child of tag 'amp-story-page'. Child tag must be one of ['amp-analytics', 'amp-pixel', 'amp-social-share', 'amp-story-animation', 'amp-story-auto-analytics', 'amp-story-cta-layer', 'amp-story-grid-layer', 'amp-story-page-attachment', 'amp-story-page-outlink', 'amp-story-shopping-attachment']. (see https://amp.dev/documentation/components/amp-story)
+|        </amp-story-page>
+|      </amp-story>
+|    </body>
+|  </html>
\ No newline at end of file
diff --git a/extensions/amp-story-audio-sticker/0.1/test/validator-amp-story-audio-sticker.html b/extensions/amp-story-audio-sticker/0.1/test/validator-amp-story-audio-sticker.html
new file mode 100644
index 000000000000..e569fde0b88b
--- /dev/null
+++ b/extensions/amp-story-audio-sticker/0.1/test/validator-amp-story-audio-sticker.html
@@ -0,0 +1,73 @@
+<!doctype html>
+<html ⚡ lang="en">
+<head>
+  <meta charset="utf-8">
+  <link rel="canonical" href="ampconf.html">
+  <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+  <script async src="https://cdn.ampproject.org/v0.js"></script>
+  <title>Key Highlights of AMP Conf 2018</title>
+
+  <script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
+  <script async custom-element="amp-video" src="https://cdn.ampproject.org/v0/amp-video-0.1.js"></script>
+  <script async custom-element="amp-story-audio-sticker" src="https://cdn.ampproject.org/v0/amp-story-audio-sticker-0.1.js"></script>
+
+  <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+</head>
+  <body>
+    <amp-story standalone id="cats"
+        title="Key Highlights of AMP Conf 2018" publisher="The AMP team"
+        publisher-logo-src="./img/amplogo.png"
+        poster-portrait-src="./img/overview.jpg">
+
+      <amp-story-page id="page-1" title="Lorem ipsum dolor sit amet">
+        <amp-story-grid-layer template="vertical">
+          <amp-story-audio-sticker sticker="audio-cloud"></amp-story-audio-sticker>
+        </amp-story-grid-layer>>
+      </amp-story-page>
+
+      <amp-story-page id="page-2" title="Lorem ipsum dolor sit amet">
+        <amp-story-grid-layer template="vertical">
+          <amp-story-audio-sticker size="large" sticker="headphone-cat"></amp-story-audio-sticker>
+        </amp-story-grid-layer>>
+      </amp-story-page>
+
+      <amp-story-page id="page-3" title="Lorem ipsum dolor sit amet">
+        <amp-story-grid-layer template="vertical">
+          <amp-story-audio-sticker sticker="loud-speaker"></amp-story-audio-sticker>
+        </amp-story-grid-layer>
+      </amp-story-page>
+
+      <amp-story-page id="page-4" title="Lorem ipsum dolor sit amet">
+        <amp-story-grid-layer template="vertical">
+          <amp-story-audio-sticker size="large" sticker="tape-player"></amp-story-audio-sticker>
+        </amp-story-grid-layer>
+      </amp-story-page>
+
+      <amp-story-page id="page-5" title="Lorem ipsum dolor sit amet">
+        <amp-story-grid-layer template="vertical">
+          <amp-story-audio-sticker sticker-style="outline">
+            <amp-story-audio-sticker-pretap>
+              <amp-img width="100" height="100" layout="responsive" src="https://d1k5j68ob7clqb.cloudfront.net/thumb/480/processed/thumb/5zK5d91jK0gLkv1AMa.png"></amp-img>
+            </amp-story-audio-sticker-pretap>
+            <amp-story-audio-sticker-posttap>
+              <amp-img width="100" height="100" layout="responsive" src="https://d1k5j68ob7clqb.cloudfront.net/thumb/480/processed/thumb/5zK5d91jK0gLkv1AMa.png"></amp-img>
+            </amp-story-audio-sticker-posttap>
+          </amp-story-audio-sticker>
+        </amp-story-grid-layer>
+      </amp-story-page>
+
+      <amp-story-page id="page-6" title="Lorem ipsum dolor sit amet">
+        <amp-story-grid-layer template="vertical">
+          <amp-story-audio-sticker size="large" sticker-style="dropshadow">
+            <amp-story-audio-sticker-pretap>
+              <amp-img width="100" height="100" layout="responsive" src="https://d1k5j68ob7clqb.cloudfront.net/thumb/480/processed/thumb/5zK5d91jK0gLkv1AMa.png"></amp-img>
+            </amp-story-audio-sticker-pretap>
+            <amp-story-audio-sticker-posttap>
+              <amp-img width="100" height="100" layout="responsive" src="https://d1k5j68ob7clqb.cloudfront.net/thumb/480/processed/thumb/5zK5d91jK0gLkv1AMa.png"></amp-img>
+            </amp-story-audio-sticker-posttap>
+          </amp-story-audio-sticker>
+        </amp-story-grid-layer>
+      </amp-story-page>
+    </amp-story>
+  </body>
+</html>
\ No newline at end of file
diff --git a/extensions/amp-story-audio-sticker/0.1/test/validator-amp-story-audio-sticker.out b/extensions/amp-story-audio-sticker/0.1/test/validator-amp-story-audio-sticker.out
new file mode 100644
index 000000000000..4af7b9898236
--- /dev/null
+++ b/extensions/amp-story-audio-sticker/0.1/test/validator-amp-story-audio-sticker.out
@@ -0,0 +1,74 @@
+PASS
+|  <!doctype html>
+|  <html ⚡ lang="en">
+|  <head>
+|    <meta charset="utf-8">
+|    <link rel="canonical" href="ampconf.html">
+|    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+|    <script async src="https://cdn.ampproject.org/v0.js"></script>
+|    <title>Key Highlights of AMP Conf 2018</title>
+|
+|    <script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
+|    <script async custom-element="amp-video" src="https://cdn.ampproject.org/v0/amp-video-0.1.js"></script>
+|    <script async custom-element="amp-story-audio-sticker" src="https://cdn.ampproject.org/v0/amp-story-audio-sticker-0.1.js"></script>
+|
+|    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+|  </head>
+|    <body>
+|      <amp-story standalone id="cats"
+|          title="Key Highlights of AMP Conf 2018" publisher="The AMP team"
+|          publisher-logo-src="./img/amplogo.png"
+|          poster-portrait-src="./img/overview.jpg">
+|
+|        <amp-story-page id="page-1" title="Lorem ipsum dolor sit amet">
+|          <amp-story-grid-layer template="vertical">
+|            <amp-story-audio-sticker sticker="audio-cloud"></amp-story-audio-sticker>
+|          </amp-story-grid-layer>>
+|        </amp-story-page>
+|
+|        <amp-story-page id="page-2" title="Lorem ipsum dolor sit amet">
+|          <amp-story-grid-layer template="vertical">
+|            <amp-story-audio-sticker size="large" sticker="headphone-cat"></amp-story-audio-sticker>
+|          </amp-story-grid-layer>>
+|        </amp-story-page>
+|
+|        <amp-story-page id="page-3" title="Lorem ipsum dolor sit amet">
+|          <amp-story-grid-layer template="vertical">
+|            <amp-story-audio-sticker sticker="loud-speaker"></amp-story-audio-sticker>
+|          </amp-story-grid-layer>
+|        </amp-story-page>
+|
+|        <amp-story-page id="page-4" title="Lorem ipsum dolor sit amet">
+|          <amp-story-grid-layer template="vertical">
+|            <amp-story-audio-sticker size="large" sticker="tape-player"></amp-story-audio-sticker>
+|          </amp-story-grid-layer>
+|        </amp-story-page>
+|
+|        <amp-story-page id="page-5" title="Lorem ipsum dolor sit amet">
+|          <amp-story-grid-layer template="vertical">
+|            <amp-story-audio-sticker sticker-style="outline">
+|              <amp-story-audio-sticker-pretap>
+|                <amp-img width="100" height="100" layout="responsive" src="https://d1k5j68ob7clqb.cloudfront.net/thumb/480/processed/thumb/5zK5d91jK0gLkv1AMa.png"></amp-img>
+|              </amp-story-audio-sticker-pretap>
+|              <amp-story-audio-sticker-posttap>
+|                <amp-img width="100" height="100" layout="responsive" src="https://d1k5j68ob7clqb.cloudfront.net/thumb/480/processed/thumb/5zK5d91jK0gLkv1AMa.png"></amp-img>
+|              </amp-story-audio-sticker-posttap>
+|            </amp-story-audio-sticker>
+|          </amp-story-grid-layer>
+|        </amp-story-page>
+|
+|        <amp-story-page id="page-6" title="Lorem ipsum dolor sit amet">
+|          <amp-story-grid-layer template="vertical">
+|            <amp-story-audio-sticker size="large" sticker-style="dropshadow">
+|              <amp-story-audio-sticker-pretap>
+|                <amp-img width="100" height="100" layout="responsive" src="https://d1k5j68ob7clqb.cloudfront.net/thumb/480/processed/thumb/5zK5d91jK0gLkv1AMa.png"></amp-img>
+|              </amp-story-audio-sticker-pretap>
+|              <amp-story-audio-sticker-posttap>
+|                <amp-img width="100" height="100" layout="responsive" src="https://d1k5j68ob7clqb.cloudfront.net/thumb/480/processed/thumb/5zK5d91jK0gLkv1AMa.png"></amp-img>
+|              </amp-story-audio-sticker-posttap>
+|            </amp-story-audio-sticker>
+|          </amp-story-grid-layer>
+|        </amp-story-page>
+|      </amp-story>
+|    </body>
+|  </html>
\ No newline at end of file
diff --git a/extensions/amp-story-audio-sticker/OWNERS b/extensions/amp-story-audio-sticker/OWNERS
new file mode 100644
index 000000000000..b55530b2a4cb
--- /dev/null
+++ b/extensions/amp-story-audio-sticker/OWNERS
@@ -0,0 +1,10 @@
+// For an explanation of the OWNERS rules and syntax, see:
+// https://github.com/ampproject/amp-github-apps/blob/main/owners/OWNERS.example
+
+{
+  rules: [
+    {
+      owners: [{name: 'ychsieh'}],
+    },
+  ],
+}
diff --git a/extensions/amp-story-audio-sticker/amp-story-audio-sticker.md b/extensions/amp-story-audio-sticker/amp-story-audio-sticker.md
new file mode 100644
index 000000000000..261dde0a786c
--- /dev/null
+++ b/extensions/amp-story-audio-sticker/amp-story-audio-sticker.md
@@ -0,0 +1,115 @@
+---
+$category@: presentation
+formats:
+  - stories
+teaser:
+  text: A sticker for users to click and unmute the story. 
+tags:
+  - audio
+  - sticker
+author: ychsieh
+$title: amp-story-audio-sticker
+version: '0.1'
+versions:
+  - '0.1'
+latest_version: '0.1'
+$path: /documentation/components/amp-story-audio-sticker.html
+$scripts:
+  - >-
+    <script async custom-element="amp-story" 
+    src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
+    <script async custom-element="amp-story-audio-sticker" src="https://cdn.ampproject.org/v0/amp-story-audio-sticker-0.1.js"></script>
+---
+
+# amp-story-audio-sticker
+
+<amp-video autoplay loop
+            width="400"
+            height="750"
+            layout="fill">
+
+<source src="https://github-production-user-asset-6210df.s3.amazonaws.com/1697814/245924556-e953c54a-0a09-4f15-8134-be6a0ac758ab.mp4" type="video/mp4">
+</amp-video>
+
+# Summary
+
+An audio sticker component for publishers to put anywhere on their story for users to click to unmute the story.
+
+Developers can choose to either choose one of the 4 default stickers or provide custom stickers. The sticker should be put inside an `<amp-story-grid-layer>`.
+
+# Attributes
+
+### `size` {string} optional
+
+Size of the sticker. Accepted values:
+
+-   “large”: 180 x 180 px
+-   “small”: 120 x 120 px
+
+Default value: “small”, which would be used if the input value is invalid or is not provided.
+
+### `sticker` {string} optional
+
+Default value: “headphone-cat”, which would be used if the input value is invalid or is not provided.
+
+A list of premade stickers to use:
+
+| Accepted Value  | Pre-tap Image                                                                                   | Post-tap Image                                                                                    |
+| --------------- | ----------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- |
+| “headphone-cat” | ![Cat Pre-tap](https://www.gstatic.com/amphtml/stamp/audio-sticker/cat-sticker-pretap.png)      | ![Cat Post-tap](https://www.gstatic.com/amphtml/stamp/audio-sticker/cat-sticker-posttap.gif)      |
+| “tape-player”   | ![Player Pre-tap](https://www.gstatic.com/amphtml/stamp/audio-sticker/tape-player-pretap.png)   | ![Player Post-tap](https://www.gstatic.com/amphtml/stamp/audio-sticker/tape-player-posttap.gif)   |
+| “loud-speaker”  | ![Speaker Pre-tap](https://www.gstatic.com/amphtml/stamp/audio-sticker/loud-speaker-pretap.png) | ![Speaker Post-tap](https://www.gstatic.com/amphtml/stamp/audio-sticker/loud-speaker-posttap.png) |
+| “audio-cloud”   | ![Cloud Pre-tap](https://www.gstatic.com/amphtml/stamp/audio-sticker/audio-cloud-pretap.png)    | ![Cloud Post-tap](https://www.gstatic.com/amphtml/stamp/audio-sticker/audio-cloud-posttap.png)    |
+
+### `sticker-style` {string} optional
+
+Default value: none
+
+Extra premade styles of the sticker to use:
+
+| Accepted Value | Description                                                             | Header 3                                                                                              |
+| -------------- | ----------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------- |
+| “outline”      | Adds a border around the provided sticker image.                        | ![Image 2](https://github.com/ampproject/amphtml/assets/1697814/c7996424-c810-40d3-a28f-09e7c76742d1) |
+| “dropshadow”   | Adds a dropshadow around the opaque part of the provided sticker image. | ![Image 4](https://github.com/ampproject/amphtml/assets/1697814/2f5b6c5d-ea86-4345-80b8-3b2c20c92e58) |
+
+#### Customize Sticker Style via CSS Variables
+
+-   `--story-audio-sticker-outline-color`: Color of the sticker outline.
+-   `--story-audio-sticker-dropshadow-color`: Color of the sticker drop shadow.
+
+If the CSS variables are set on story level, the color would be applied to all stickers in the story. If the CSS variables are set on story page or sticker level, it would only be applied to the sticker on specific story page or the specific sticker.
+
+If not set, the color of either style would be white.
+
+# Children Nodes
+
+### `<amp-story-audio-sticker-pretap>` optional
+
+Sticker shown before a user tap. Takes any html code that can be rendered as a sticker, e.g. `<amp-img>`, `<svg>`, general elements with CSS animation, etc.
+
+### `<amp-story-audio-sticker-posttap>` optional
+
+Sticker shown after a user tap. Takes any html code that can be rendered as a sticker, e.g. `<amp-img>`, `<svg>`, general elements with CSS animation, etc.
+
+# Example: Premade Stickers
+
+```html
+<amp-story-grid-layer>
+  <amp-story-audio-sticker size="large" sticker="tape-player"></amp-story-audio-sticker>
+</amp-story-grid-layer>
+```
+
+# Example: Custom Stickers
+
+```html
+<amp-story-grid-layer>
+  <amp-story-audio-sticker size="large" sticker-style="dropshadow">
+    <amp-story-audio-sticker-pretap>
+      <amp-img width="100" height="100" layout="responsive" src="https://d1k5j68ob7clqb.cloudfront.net/thumb/480/processed/thumb/5zK5d91jK0gLkv1AMa.png"></amp-img>
+    </amp-story-audio-sticker-pretap>
+    <amp-story-audio-sticker-posttap>
+      <amp-img width="100" height="100" layout="responsive" src="https://d1k5j68ob7clqb.cloudfront.net/thumb/480/processed/thumb/5zK5d91jK0gLkv1AMa.png"></amp-img>
+    </amp-story-audio-sticker-posttap>
+  </amp-story-audio-sticker>
+</amp-story-grid-layer>
+```
diff --git a/extensions/amp-story-audio-sticker/validator-amp-story-audio-sticker.protoascii b/extensions/amp-story-audio-sticker/validator-amp-story-audio-sticker.protoascii
new file mode 100644
index 000000000000..0a8e86107bb1
--- /dev/null
+++ b/extensions/amp-story-audio-sticker/validator-amp-story-audio-sticker.protoascii
@@ -0,0 +1,65 @@
+tags: {  # amp-story-audio-sticker
+  html_format: AMP
+  tag_name: "SCRIPT"
+  extension_spec: {
+    name: "amp-story-audio-sticker"
+    version: "0.1"
+  }
+  attr_lists: "common-extension-attrs"
+}
+tags: {  # <amp-story-audio-sticker>
+  html_format: AMP
+  tag_name: "AMP-STORY-AUDIO-STICKER"
+  requires_extension: "amp-story-audio-sticker"
+  mandatory_ancestor: "AMP-STORY-GRID-LAYER"
+  attr_lists: "extended-amp-global"
+  amp_layout: {
+    supported_layouts: CONTAINER
+  }
+  attrs: {
+    name: "size"
+    value: "small"
+    value: "large"
+  }
+  attrs: {
+    name: "sticker"
+    value: "headphone-cat"
+    value: "tape-player"
+    value: "loud-speaker"
+    value: "audio-cloud"
+  }
+  attrs: {
+    name: "sticker-style"
+    value: "outline"
+    value: "dropshadow"
+  }
+}
+
+tags: {  # <amp-story-audio-sticker-pretap>
+  html_format: AMP
+  tag_name: "AMP-STORY-AUDIO-STICKER-PRETAP"
+  requires_extension: "amp-story-audio-sticker"
+  mandatory_parent: "AMP-STORY-AUDIO-STICKER"
+  descendant_tag_list: "amp-story-audio-sticker-allowed-descendants"
+  amp_layout: {
+    supported_layouts: CONTAINER
+  }
+}
+
+tags: {  # <amp-story-audio-sticker-posttap>
+  html_format: AMP
+  tag_name: "AMP-STORY-AUDIO-STICKER-POSTTAP"
+  requires_extension: "amp-story-audio-sticker"
+  mandatory_parent: "AMP-STORY-AUDIO-STICKER"
+  descendant_tag_list: "amp-story-audio-sticker-allowed-descendants"
+  amp_layout: {
+    supported_layouts: CONTAINER
+  }
+}
+
+descendant_tag_list: {
+  name: "amp-story-audio-sticker-allowed-descendants"
+  tag: "AMP-IMG"
+  tag: "DIV"
+  tag: "SPAN"
+}
diff --git a/extensions/amp-story-auto-ads/0.1/algorithm-count-pages.js b/extensions/amp-story-auto-ads/0.1/algorithm-count-pages.js
index 8f802b5259a5..5934b4ec21b2 100644
--- a/extensions/amp-story-auto-ads/0.1/algorithm-count-pages.js
+++ b/extensions/amp-story-auto-ads/0.1/algorithm-count-pages.js
@@ -21,7 +21,7 @@ export class CountPagesAlgorithm {
     /** @private {!StoryAdPageManager} */
     this.pageManager_ = pageManager;
 
-    /** @private {!Object<string, boolean>} */
+    /** @private {!{[key: string]: boolean}} */
     this.uniquePageIds_ = map();
 
     /** @private {number} */
diff --git a/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads-ad-badge.css b/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads-ad-badge.css
index 9e3cbf6a17fa..c1c02fbc4aee 100644
--- a/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads-ad-badge.css
+++ b/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads-ad-badge.css
@@ -31,9 +31,12 @@
 }
 
 .i-amphtml-story-ad-badge {
-  height: 24px !important;
   opacity: 0 !important;
-  width: 24px !important;
+  width: 29px !important;
+  height: 20px !important;
+  background: no-repeat center url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="29" height="20" fill="none"><path fill="white" d="M9.05 5.2h2.02l3.5 9.3h-1.94l-.78-2.22H8.28L7.5 14.5H5.57l3.48-9.3Zm2.22 5.46-1.21-3.45-1.22 3.45h2.43Zm5.33 3.61c-2.09-1.4-2.1-4.76 0-6.15 1.15-.69 2.85-.64 3.64.56V5.19h1.68v9.31h-1.58v-.8c-.73 1.22-2.66 1.2-3.74.57Zm1.93-1.13c1.07 0 1.8-.94 1.8-1.96s-.75-1.93-1.8-1.93c-1.06 0-1.8.93-1.8 1.94 0 1 .75 1.95 1.8 1.95Z"/></svg>'), #0003;
+  border-radius: 6px;
+  backdrop-filter: blur(10px);
   visibility: hidden !important;
 }
 
diff --git a/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads-inabox.css b/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads-inabox.css
index b1dc649a76df..978c53f983c0 100644
--- a/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads-inabox.css
+++ b/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads-inabox.css
@@ -1,5 +1,3 @@
-
-
 amp-story-cta-layer {
   display: block !important;
   position: absolute !important;
@@ -8,5 +6,5 @@ amp-story-cta-layer {
   bottom: 0 !important;
   left: 0 !important;
   margin: 0 !important;
-  z-index: 3 !important;
+  z-index: 2147483642 !important;
 }
diff --git a/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads-progress-bar.css b/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads-progress-bar.css
deleted file mode 100644
index 1593efa52748..000000000000
--- a/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads-progress-bar.css
+++ /dev/null
@@ -1,46 +0,0 @@
-.i-amphtml-story-ad-progress-background {
-  background: hsla(0, 0%, 100%, 0.4) !important;
-  border-radius: 1px !important;
-  height: 2px !important;
-  left: 4px !important;
-  margin: 4px auto !important;
-  opacity: 0 !important;
-  position: absolute !important;
-  width: calc(100% - 8px) !important;
-  visibility: hidden !important;
-  z-index: 100001 !important;
-}
-
-.i-amphtml-story-ad-progress-background[ad-showing] {
-  opacity: 1 !important;
-  visibility: visible !important;
-}
-
-.i-amphtml-story-ad-progress-background[desktop-one-panel] {
-  top: var(--i-amphtml-story-desktop-one-panel-responsive-margin) !important;
-  /* Calculates position by factoring in page width. */
-  left: calc(50vw - var(--i-amphtml-story-desktop-one-panel-width) / 2 + 4px) !important;
-  width: calc(var(--i-amphtml-story-desktop-one-panel-width) - 8px) !important;
-}
-
-.i-amphtml-story-ad-progress-bar {
-  background: #fff !important;
-  height: 2px !important;
-}
-
-[ad-showing] .i-amphtml-story-ad-progress-bar {
-  animation: grow linear;
-}
-
-[paused] .i-amphtml-story-ad-progress-bar {
-  animation-play-state: paused;
-}
-
-@keyframes grow {
-  from {
-    width: 0%;
-  }
-  to {
-    width: 100%;
-  }
-}
diff --git a/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads.css b/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads.css
index b3ec3f2c5feb..c69647934485 100644
--- a/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads.css
+++ b/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads.css
@@ -9,6 +9,7 @@
   height: 100% !important;
   width: 100% !important;
   z-index: 1 !important;
+  pointer-events: auto !important;
 }
 
 amp-story-page[xdomain-ad] .i-amphtml-glass-pane {
diff --git a/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads.js b/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads.js
index 94510e5e839b..1d3f02fba726 100644
--- a/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads.js
+++ b/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads.js
@@ -1,15 +1,6 @@
-import {CommonSignals} from '#core/constants/common-signals';
-import {toggleAttribute} from '#core/dom';
-import {svgFor} from '#core/dom/static-template';
-import {setStyle} from '#core/dom/style';
-import {dict} from '#core/types/object';
+import {CommonSignals_Enum} from '#core/constants/common-signals';
 
-import {forceExperimentBranch, getExperimentBranch} from '#experiments';
-import {
-  AdvanceExpToTime,
-  StoryAdAutoAdvance,
-  divertStoryAdAutoAdvance,
-} from '#experiments/story-ad-auto-advance';
+import {forceExperimentBranch} from '#experiments';
 import {divertStoryAdPlacements} from '#experiments/story-ad-placements';
 import {StoryAdSegmentExp} from '#experiments/story-ad-progress-segment';
 
@@ -29,12 +20,11 @@ import {StoryAdPageManager} from './story-ad-page-manager';
 
 import {CSS} from '../../../build/amp-story-auto-ads-0.1.css';
 import {CSS as adBadgeCSS} from '../../../build/amp-story-auto-ads-ad-badge-0.1.css';
-import {CSS as progessBarCSS} from '../../../build/amp-story-auto-ads-progress-bar-0.1.css';
 import {CSS as sharedCSS} from '../../../build/amp-story-auto-ads-shared-0.1.css';
 import {getServicePromiseForDoc} from '../../../src/service-helpers';
 import {
   StateProperty,
-  UIType,
+  UIType_Enum,
 } from '../../amp-story/1.0/amp-story-store-service';
 import {EventType, dispatch} from '../../amp-story/1.0/events';
 import {createShadowRootWithStyle} from '../../amp-story/1.0/utils';
@@ -51,16 +41,14 @@ const MUSTACHE_TAG = 'amp-mustache';
 /**
  * Map of experiment IDs that might be enabled by the player to
  * their experiment names. Used to toggle client side experiment on.
- * @const {Object<string, string>}
+ * @const {{[key: string]: string}}
  * @visibleForTesting
  */
 export const RELEVANT_PLAYER_EXPS = {
   [StoryAdSegmentExp.CONTROL]: StoryAdSegmentExp.ID,
-  [StoryAdSegmentExp.NO_ADVANCE_BOTH]: StoryAdSegmentExp.ID,
-  [StoryAdSegmentExp.NO_ADVANCE_AD]: StoryAdSegmentExp.ID,
-  [StoryAdSegmentExp.TEN_SECONDS]: StoryAdSegmentExp.ID,
-  [StoryAdSegmentExp.TWELVE_SECONDS]: StoryAdSegmentExp.ID,
-  [StoryAdSegmentExp.FOURTEEN_SECONDS]: StoryAdSegmentExp.ID,
+  [StoryAdSegmentExp.AUTO_ADVANCE_OLD_CTA]: StoryAdSegmentExp.ID,
+  [StoryAdSegmentExp.AUTO_ADVANCE_NEW_CTA]: StoryAdSegmentExp.ID,
+  [StoryAdSegmentExp.AUTO_ADVANCE_NEW_CTA_NOT_ANIMATED]: StoryAdSegmentExp.ID,
 };
 
 /** @enum {string} */
@@ -87,7 +75,7 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
     this.visibleAdPage_ = null;
 
     /** @private {!JsonObject} */
-    this.config_ = dict();
+    this.config_ = {};
 
     /** @private {?Promise} */
     this.analytics_ = null;
@@ -95,9 +83,6 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
     /** @private {?Element} */
     this.adBadgeContainer_ = null;
 
-    /** @private {?Element} */
-    this.progressBarBackground_ = null;
-
     /** @private {?../../amp-story/1.0/amp-story-store-service.AmpStoryStoreService} */
     this.storeService_ = null;
 
@@ -110,6 +95,9 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
 
   /** @override */
   buildCallback() {
+    // TODO(ccordry): properly block on this when #cap check is possible.
+    this.askPlayerForActiveExperiments_();
+
     return Services.storyStoreServiceForOrNull(this.win).then(
       (storeService) => {
         devAssert(storeService, 'Could not retrieve AmpStoryStoreService');
@@ -147,7 +135,7 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
     }
     return this.ampStory_
       .signals()
-      .whenSignal(CommonSignals.INI_LOAD)
+      .whenSignal(CommonSignals_Enum.INI_LOAD)
       .then(() => this.handleConfig_())
       .then(() => {
         this.adPageManager_ = new StoryAdPageManager(
@@ -155,7 +143,6 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
           this.config_
         );
         divertStoryAdPlacements(this.win);
-        divertStoryAdAutoAdvance(this.win);
         this.placementAlgorithm_ = getPlacementAlgo(
           this.win,
           this.storeService_,
@@ -165,13 +152,11 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
         if (!this.placementAlgorithm_.isStoryEligible()) {
           return;
         }
-        this.askPlayerForActiveExperiments_();
         this.analytics_ = getServicePromiseForDoc(
           this.element,
           STORY_AD_ANALYTICS
         );
         this.createAdOverlay_();
-        this.maybeCreateProgressBar_();
         this.initializeListeners_();
         this.initializePages_();
       });
@@ -198,6 +183,13 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
             }
           });
         }
+      })
+      .catch((e) => {
+        dev().expectedError(
+          TAG,
+          'Player does not support `playerExperiments` message',
+          e
+        );
       });
   }
 
@@ -225,10 +217,10 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
     const firstAdPageElement = adPage.getPageElement();
     // Setting distance manually to avoid flash of next page.
     firstAdPageElement.setAttribute('distance', '1');
-    const payload = dict({
+    const payload = {
       'targetPageId': 'i-amphtml-ad-page-1',
       'direction': 'next',
-    });
+    };
     const eventInit = {bubbles: true};
     dispatch(
       this.win,
@@ -316,14 +308,8 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
     this.mutateElement(() => {
       if (isAd) {
         this.adBadgeContainer_.setAttribute(Attributes.AD_SHOWING, '');
-        // TODO(#33969) can no longer be null when launched.
-        this.progressBarBackground_ &&
-          this.progressBarBackground_.setAttribute(Attributes.AD_SHOWING, '');
       } else {
         this.adBadgeContainer_.removeAttribute(Attributes.AD_SHOWING);
-        // TODO(#33969) can no longer be null when launched.
-        this.progressBarBackground_ &&
-          this.progressBarBackground_.removeAttribute(Attributes.AD_SHOWING);
       }
     });
   }
@@ -344,7 +330,7 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
   /**
    * Reacts to UI state updates and passes the information along as
    * attributes to the shadowed ad badge.
-   * @param {!UIType} uiState
+   * @param {!UIType_Enum} uiState
    * @private
    */
   onUIStateUpdate_(uiState) {
@@ -352,15 +338,12 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
       const {DESKTOP_FULLBLEED, DESKTOP_ONE_PANEL} = Attributes;
       this.adBadgeContainer_.removeAttribute(DESKTOP_FULLBLEED);
       this.adBadgeContainer_.removeAttribute(DESKTOP_ONE_PANEL);
-      // TODO(#33969) can no longer be null when launched.
-      this.progressBarBackground_?.removeAttribute(DESKTOP_ONE_PANEL);
 
-      if (uiState === UIType.DESKTOP_FULLBLEED) {
+      if (uiState === UIType_Enum.DESKTOP_FULLBLEED) {
         this.adBadgeContainer_.setAttribute(DESKTOP_FULLBLEED, '');
       }
-      if (uiState === UIType.DESKTOP_ONE_PANEL) {
+      if (uiState === UIType_Enum.DESKTOP_ONE_PANEL) {
         this.adBadgeContainer_.setAttribute(DESKTOP_ONE_PANEL, '');
-        this.progressBarBackground_?.setAttribute(DESKTOP_ONE_PANEL, '');
       }
     });
   }
@@ -382,127 +365,9 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
     this.adBadgeContainer_.appendChild(badge);
     createShadowRootWithStyle(root, this.adBadgeContainer_, adBadgeCSS);
 
-    const svg = svgFor(this.doc_);
-    const badgeSVG = svg`<svg
-      width="39"
-      height="31"
-      viewBox="0 0 39 31"
-      fill="none"
-      class="i-amphtml-story-ad-badge-svg"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <g filter="url(#filter0_d)">
-        <path
-          d="M17.3672 19.3633H12.7441L11.8652 22H9.06152L13.8252 9.20312H16.2686L21.0586 22H18.2549L17.3672 19.3633ZM13.4561 17.2275H16.6553L15.0469 12.4375L13.4561 17.2275ZM22.1914 17.1748C22.1914 15.6924 22.5225 14.5117 23.1846 13.6328C23.8525 12.7539 24.7637 12.3145 25.918 12.3145C26.8438 12.3145 27.6084 12.6602 28.2119 13.3516V8.5H30.7607V22H28.4668L28.3438 20.9893C27.7109 21.7803 26.8965 22.1758 25.9004 22.1758C24.7812 22.1758 23.8818 21.7363 23.2021 20.8574C22.5283 19.9727 22.1914 18.7451 22.1914 17.1748ZM24.7314 17.3594C24.7314 18.25 24.8867 18.9326 25.1973 19.4072C25.5078 19.8818 25.959 20.1191 26.5508 20.1191C27.3359 20.1191 27.8896 19.7881 28.2119 19.126V15.373C27.8955 14.7109 27.3477 14.3799 26.5684 14.3799C25.3438 14.3799 24.7314 15.373 24.7314 17.3594Z"
-          fill="white"
-        ></path>
-        <path
-          d="M17.3672 19.3633L17.4857 19.3234L17.457 19.2383H17.3672V19.3633ZM12.7441 19.3633V19.2383H12.654L12.6256 19.3238L12.7441 19.3633ZM11.8652 22V22.125H11.9553L11.9838 22.0395L11.8652 22ZM9.06152 22L8.94438 21.9564L8.88161 22.125H9.06152V22ZM13.8252 9.20312V9.07812H13.7383L13.708 9.15952L13.8252 9.20312ZM16.2686 9.20312L16.3856 9.15931L16.3552 9.07812H16.2686V9.20312ZM21.0586 22V22.125H21.2389L21.1757 21.9562L21.0586 22ZM18.2549 22L18.1364 22.0399L18.1651 22.125H18.2549V22ZM13.4561 17.2275L13.3374 17.1881L13.2828 17.3525H13.4561V17.2275ZM16.6553 17.2275V17.3525H16.8291L16.7738 17.1877L16.6553 17.2275ZM15.0469 12.4375L15.1654 12.3977L15.0462 12.0429L14.9282 12.3981L15.0469 12.4375ZM17.3672 19.2383H12.7441V19.4883H17.3672V19.2383ZM12.6256 19.3238L11.7466 21.9605L11.9838 22.0395L12.8627 19.4028L12.6256 19.3238ZM11.8652 21.875H9.06152V22.125H11.8652V21.875ZM9.17867 22.0436L13.9423 9.24673L13.708 9.15952L8.94438 21.9564L9.17867 22.0436ZM13.8252 9.32812H16.2686V9.07812H13.8252V9.32812ZM16.1515 9.24694L20.9415 22.0438L21.1757 21.9562L16.3856 9.15931L16.1515 9.24694ZM21.0586 21.875H18.2549V22.125H21.0586V21.875ZM18.3733 21.9601L17.4857 19.3234L17.2487 19.4032L18.1364 22.0399L18.3733 21.9601ZM13.4561 17.3525H16.6553V17.1025H13.4561V17.3525ZM16.7738 17.1877L15.1654 12.3977L14.9284 12.4773L16.5368 17.2673L16.7738 17.1877ZM14.9282 12.3981L13.3374 17.1881L13.5747 17.2669L15.1655 12.4769L14.9282 12.3981ZM23.1846 13.6328L23.085 13.5572L23.0847 13.5576L23.1846 13.6328ZM28.2119 13.3516L28.1177 13.4338L28.3369 13.6849V13.3516H28.2119ZM28.2119 8.5V8.375H28.0869V8.5H28.2119ZM30.7607 8.5H30.8857V8.375H30.7607V8.5ZM30.7607 22V22.125H30.8857V22H30.7607ZM28.4668 22L28.3427 22.0151L28.3561 22.125H28.4668V22ZM28.3438 20.9893L28.4678 20.9742L28.4319 20.679L28.2461 20.9112L28.3438 20.9893ZM23.2021 20.8574L23.1027 20.9332L23.1033 20.9339L23.2021 20.8574ZM28.2119 19.126L28.3243 19.1807L28.3369 19.1548V19.126H28.2119ZM28.2119 15.373H28.3369V15.3447L28.3247 15.3192L28.2119 15.373ZM22.3164 17.1748C22.3164 15.7102 22.6435 14.5588 23.2844 13.708L23.0847 13.5576C22.4015 14.4646 22.0664 15.6746 22.0664 17.1748H22.3164ZM23.2841 13.7084C23.9272 12.8623 24.8007 12.4395 25.918 12.4395V12.1895C24.7267 12.1895 23.7779 12.6455 23.0851 13.5572L23.2841 13.7084ZM25.918 12.4395C26.808 12.4395 27.5382 12.7698 28.1177 13.4338L28.3061 13.2694C27.6786 12.5505 26.8795 12.1895 25.918 12.1895V12.4395ZM28.3369 13.3516V8.5H28.0869V13.3516H28.3369ZM28.2119 8.625H30.7607V8.375H28.2119V8.625ZM30.6357 8.5V22H30.8857V8.5H30.6357ZM30.7607 21.875H28.4668V22.125H30.7607V21.875ZM28.5909 21.9849L28.4678 20.9742L28.2197 21.0044L28.3427 22.0151L28.5909 21.9849ZM28.2461 20.9112C27.6366 21.6731 26.8578 22.0508 25.9004 22.0508V22.3008C26.9352 22.3008 27.7853 21.8874 28.4414 21.0673L28.2461 20.9112ZM25.9004 22.0508C24.8196 22.0508 23.9568 21.629 23.301 20.781L23.1033 20.9339C23.8068 21.8437 24.7429 22.3008 25.9004 22.3008V22.0508ZM23.3016 20.7817C22.65 19.9261 22.3164 18.7287 22.3164 17.1748H22.0664C22.0664 18.7615 22.4067 20.0193 23.1027 20.9332L23.3016 20.7817ZM24.6064 17.3594C24.6064 18.2616 24.7632 18.9722 25.0927 19.4757L25.3019 19.3388C25.0102 18.8931 24.8564 18.2384 24.8564 17.3594H24.6064ZM25.0927 19.4757C25.4275 19.9874 25.919 20.2441 26.5508 20.2441V19.9941C25.999 19.9941 25.5881 19.7763 25.3019 19.3388L25.0927 19.4757ZM26.5508 20.2441C26.961 20.2441 27.319 20.1575 27.6191 19.9781C27.9196 19.7984 28.1541 19.5304 28.3243 19.1807L28.0995 19.0713C27.9475 19.3837 27.744 19.6122 27.4908 19.7636C27.2371 19.9152 26.9257 19.9941 26.5508 19.9941V20.2441ZM28.3369 19.126V15.373H28.0869V19.126H28.3369ZM28.3247 15.3192C28.1576 14.9694 27.9261 14.7011 27.6284 14.5212C27.3311 14.3416 26.9758 14.2549 26.5684 14.2549V14.5049C26.9402 14.5049 27.2485 14.5837 27.4991 14.7352C27.7492 14.8863 27.9499 15.1146 28.0991 15.4269L28.3247 15.3192ZM26.5684 14.2549C25.9153 14.2549 25.4145 14.5235 25.0843 15.0592C24.7601 15.5849 24.6064 16.3574 24.6064 17.3594H24.8564C24.8564 16.375 25.0089 15.6578 25.2971 15.1904C25.5791 14.7329 25.9968 14.5049 26.5684 14.5049V14.2549Z"
-          fill="white"
-        ></path>
-      </g>
-      <defs>
-        <filter
-          id="filter0_d"
-          x="0.881836"
-          y="0.375"
-          width="38.0041"
-          height="29.9258"
-          filterUnits="userSpaceOnUse"
-          color-interpolation-filters="sRGB"
-        >
-          <feFlood flood-opacity="0" result="BackgroundImageFix" />
-          <feColorMatrix
-            in="SourceAlpha"
-            type="matrix"
-            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
-          />
-          <feOffset />
-          <feGaussianBlur stdDeviation="4" />
-          <feColorMatrix
-            type="matrix"
-            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.24 0"
-          />
-          <feBlend
-            mode="normal"
-            in2="BackgroundImageFix"
-            result="effect1_dropShadow"
-          />
-          <feBlend
-            mode="normal"
-            in="SourceGraphic"
-            in2="effect1_dropShadow"
-            result="shape"
-          />
-        </filter>
-      </defs>
-    </svg> `;
-
-    badge.appendChild(badgeSVG);
-
     this.ampStory_.element.appendChild(root);
   }
 
-  /**
-   * Create progress bar if auto advance exp is on.
-   * TODO(#33969) move to chosen UI and delete the others.
-   */
-  maybeCreateProgressBar_() {
-    const autoAdvanceExpBranch = getExperimentBranch(
-      this.win,
-      StoryAdAutoAdvance.ID
-    );
-    if (getExperimentBranch(this.win, StoryAdSegmentExp.ID)) {
-      // In the viewer controlled experiment progress bar is created by
-      // progress-bar.js
-      return;
-    } else if (
-      autoAdvanceExpBranch &&
-      autoAdvanceExpBranch !== StoryAdAutoAdvance.CONTROL
-    ) {
-      this.createProgressBar_(AdvanceExpToTime[autoAdvanceExpBranch]);
-    }
-  }
-
-  /**
-   * Create progress bar that will be shown when ad is advancing.
-   * @param {string} time
-   */
-  createProgressBar_(time) {
-    const progressBar = this.doc_.createElement('div');
-    progressBar.className = 'i-amphtml-story-ad-progress-bar';
-    setStyle(progressBar, 'animationDuration', time);
-
-    this.progressBarBackground_ = this.doc_.createElement('div');
-    this.progressBarBackground_.className =
-      'i-amphtml-story-ad-progress-background';
-
-    const host = this.doc_.createElement('div');
-    host.className = 'i-amphtml-story-ad-progress-bar-host';
-
-    this.progressBarBackground_.appendChild(progressBar);
-    createShadowRootWithStyle(host, this.progressBarBackground_, progessBarCSS);
-    this.ampStory_.element.appendChild(host);
-
-    // TODO(#33969) move this to init listeners when no longer conditional.
-    this.storeService_.subscribe(StateProperty.PAUSED_STATE, (isPaused) => {
-      this.onPauseStateUpdate_(isPaused);
-    });
-  }
-
-  /**
-   * If video is paused and ad is showing pause the progress bar.
-   * @param {boolean} isPaused
-   */
-  onPauseStateUpdate_(isPaused) {
-    const adShowing = this.storeService_.get(StateProperty.AD_STATE);
-    if (!adShowing) {
-      return;
-    }
-
-    toggleAttribute(this.progressBarBackground_, Attributes.PAUSED, isPaused);
-  }
-
   /**
    * Create new page containing ad and start preloading.
    * @private
@@ -528,7 +393,7 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
   /**
    * Respond to page navigation event. This method is not called for the first
    * page that is shown on load.
-   * @param {number} pageIndex Does not update when ad is showing.
+   * @param {number} pageIndex
    * @param {string} pageId
    * @private
    */
@@ -540,7 +405,10 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
       return;
     }
 
-    this.placementAlgorithm_.onPageChange(pageId);
+    // Not a story ads page.
+    if (!this.adPageManager_.hasId(pageId)) {
+      this.placementAlgorithm_.onPageChange(pageId);
+    }
 
     if (this.visibleAdPage_) {
       this.transitionFromAdShowing_();
@@ -568,15 +436,15 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
 
   /**
    * We are switching to an ad.
-   * @param {number} pageIndex
+   * @param {number} adPageIndex
    * @param {string} adPageId
    */
-  transitionToAdShowing_(pageIndex, adPageId) {
+  transitionToAdShowing_(adPageIndex, adPageId) {
     const adPage = this.adPageManager_.getAdPageById(adPageId);
     const adIndex = this.adPageManager_.getIndexById(adPageId);
 
     if (!adPage.hasBeenViewed()) {
-      this.placementAlgorithm_.onNewAdView(pageIndex);
+      this.placementAlgorithm_.onNewAdView(adPageIndex);
     }
 
     // Tell the iframe that it is visible.
@@ -616,7 +484,7 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
   /**
    * Construct an analytics event and trigger it.
    * @param {string} eventType
-   * @param {!Object<string, number>} vars A map of vars and their values.
+   * @param {!{[key: string]: number}} vars A map of vars and their values.
    * @private
    */
   analyticsEvent_(eventType, vars) {
diff --git a/extensions/amp-story-auto-ads/0.1/story-ad-analytics.js b/extensions/amp-story-auto-ads/0.1/story-ad-analytics.js
index ba5123fcb9ce..77d2944432d6 100644
--- a/extensions/amp-story-auto-ads/0.1/story-ad-analytics.js
+++ b/extensions/amp-story-auto-ads/0.1/story-ad-analytics.js
@@ -1,5 +1,3 @@
-import {dict} from '#core/types/object';
-
 import {triggerAnalyticsEvent} from '#utils/analytics';
 
 import {getUniqueId} from './utils';
@@ -55,7 +53,7 @@ export class StoryAdAnalytics {
   constructor(ampdoc) {
     /** @const @private {!Window} */
     this.win_ = ampdoc.win;
-    /** @const @private {!Object<number, JsonObject>} */
+    /** @const @private {!{[key: number]: JsonObject}} */
     this.data_ = {};
   }
 
@@ -64,7 +62,7 @@ export class StoryAdAnalytics {
    * @param {!Element} element amp-story-page element containing ad.
    * @param {number} adIndex
    * @param {string} eventType
-   * @param {!Object<string, number>} vars A map of vars and their values.
+   * @param {!{[key: string]: number}} vars A map of vars and their values.
    */
   fireEvent(element, adIndex, eventType, vars) {
     this.ensurePageTrackingInitialized_(adIndex);
@@ -93,10 +91,10 @@ export class StoryAdAnalytics {
    */
   ensurePageTrackingInitialized_(adIndex) {
     if (!this.data_[adIndex]) {
-      this.data_[adIndex] = dict({
+      this.data_[adIndex] = {
         [AnalyticsVars.AD_INDEX]: adIndex,
         [AnalyticsVars.AD_UNIQUE_ID]: getUniqueId(this.win_),
-      });
+      };
     }
   }
 }
diff --git a/extensions/amp-story-auto-ads/0.1/story-ad-config.js b/extensions/amp-story-auto-ads/0.1/story-ad-config.js
index 8413d7b7fc83..b97a3c0b6142 100644
--- a/extensions/amp-story-auto-ads/0.1/story-ad-config.js
+++ b/extensions/amp-story-auto-ads/0.1/story-ad-config.js
@@ -23,6 +23,7 @@ const AllowedAdTypes = {
   'doubleclick': true,
   'fake': true,
   'nws': true,
+  'mgid': true,
 };
 
 export class StoryAdConfig {
diff --git a/extensions/amp-story-auto-ads/0.1/story-ad-localization.js b/extensions/amp-story-auto-ads/0.1/story-ad-localization.js
index 20c51fb4a98b..f93cfbc376d5 100644
--- a/extensions/amp-story-auto-ads/0.1/story-ad-localization.js
+++ b/extensions/amp-story-auto-ads/0.1/story-ad-localization.js
@@ -1,7 +1,7 @@
 import {Services} from '#service';
 import {LocalizationService} from '#service/localization';
 import {
-  LocalizedStringId,
+  LocalizedStringId_Enum,
   createPseudoLocale,
 } from '#service/localization/strings';
 
@@ -31,30 +31,31 @@ import {registerServiceBuilderForDoc} from '../../../src/service-helpers';
 
 /** @const */
 export const CtaTypes = {
-  APPLY_NOW: LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_APPLY_NOW,
-  BOOK_NOW: LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_BOOK_NOW,
-  BUY_TICKETS: LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_BUY_TICKETS,
-  DOWNLOAD: LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_DOWNLOAD,
-  EXPLORE: LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_EXPLORE,
-  GET_NOW: LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_GET_NOW,
-  INSTALL: LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_INSTALL,
-  LEARN_MORE: LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_LEARN_MORE,
-  LISTEN: LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_LISTEN,
-  MORE: LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_MORE,
-  OPEN_APP: LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_OPEN_APP,
-  ORDER_NOW: LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_ORDER_NOW,
-  PLAY: LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_PLAY,
-  READ: LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_READ,
-  SHOP: LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_SHOP,
-  SHOW: LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_SHOW,
-  SHOWTIMES: LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_SHOWTIMES,
-  SIGN_UP: LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_SIGN_UP,
-  SUBSCRIBE: LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_SUBSCRIBE,
-  USE_APP: LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_USE_APP,
-  VIEW: LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_VIEW,
-  WATCH: LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_WATCH,
+  APPLY_NOW: LocalizedStringId_Enum.AMP_STORY_AUTO_ADS_BUTTON_LABEL_APPLY_NOW,
+  BOOK_NOW: LocalizedStringId_Enum.AMP_STORY_AUTO_ADS_BUTTON_LABEL_BOOK_NOW,
+  BUY_TICKETS:
+    LocalizedStringId_Enum.AMP_STORY_AUTO_ADS_BUTTON_LABEL_BUY_TICKETS,
+  DOWNLOAD: LocalizedStringId_Enum.AMP_STORY_AUTO_ADS_BUTTON_LABEL_DOWNLOAD,
+  EXPLORE: LocalizedStringId_Enum.AMP_STORY_AUTO_ADS_BUTTON_LABEL_EXPLORE,
+  GET_NOW: LocalizedStringId_Enum.AMP_STORY_AUTO_ADS_BUTTON_LABEL_GET_NOW,
+  INSTALL: LocalizedStringId_Enum.AMP_STORY_AUTO_ADS_BUTTON_LABEL_INSTALL,
+  LEARN_MORE: LocalizedStringId_Enum.AMP_STORY_AUTO_ADS_BUTTON_LABEL_LEARN_MORE,
+  LISTEN: LocalizedStringId_Enum.AMP_STORY_AUTO_ADS_BUTTON_LABEL_LISTEN,
+  MORE: LocalizedStringId_Enum.AMP_STORY_AUTO_ADS_BUTTON_LABEL_MORE,
+  OPEN_APP: LocalizedStringId_Enum.AMP_STORY_AUTO_ADS_BUTTON_LABEL_OPEN_APP,
+  ORDER_NOW: LocalizedStringId_Enum.AMP_STORY_AUTO_ADS_BUTTON_LABEL_ORDER_NOW,
+  PLAY: LocalizedStringId_Enum.AMP_STORY_AUTO_ADS_BUTTON_LABEL_PLAY,
+  READ: LocalizedStringId_Enum.AMP_STORY_AUTO_ADS_BUTTON_LABEL_READ,
+  SHOP: LocalizedStringId_Enum.AMP_STORY_AUTO_ADS_BUTTON_LABEL_SHOP,
+  SHOW: LocalizedStringId_Enum.AMP_STORY_AUTO_ADS_BUTTON_LABEL_SHOW,
+  SHOWTIMES: LocalizedStringId_Enum.AMP_STORY_AUTO_ADS_BUTTON_LABEL_SHOWTIMES,
+  SIGN_UP: LocalizedStringId_Enum.AMP_STORY_AUTO_ADS_BUTTON_LABEL_SIGN_UP,
+  SUBSCRIBE: LocalizedStringId_Enum.AMP_STORY_AUTO_ADS_BUTTON_LABEL_SUBSCRIBE,
+  USE_APP: LocalizedStringId_Enum.AMP_STORY_AUTO_ADS_BUTTON_LABEL_USE_APP,
+  VIEW: LocalizedStringId_Enum.AMP_STORY_AUTO_ADS_BUTTON_LABEL_VIEW,
+  WATCH: LocalizedStringId_Enum.AMP_STORY_AUTO_ADS_BUTTON_LABEL_WATCH,
   WATCH_EPISODE:
-    LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_WATCH_EPISODE,
+    LocalizedStringId_Enum.AMP_STORY_AUTO_ADS_BUTTON_LABEL_WATCH_EPISODE,
 };
 
 /**
@@ -88,7 +89,7 @@ export class StoryAdLocalization {
   }
 
   /**
-   * @param {!../../../src/service/localization/strings.LocalizedStringId} id
+   * @param {!../../../src/service/localization/strings.LocalizedStringId_Enum} id
    * @return {?string}
    */
   getLocalizedString(id) {
@@ -109,29 +110,30 @@ export class StoryAdLocalization {
       (s) => `[${s} one two]`
     );
 
-    this.localizationService_
-      .registerLocalizedStringBundle('default', LocalizedStringsEn)
-      .registerLocalizedStringBundle('ar', LocalizedStringsAr)
-      .registerLocalizedStringBundle('de', LocalizedStringsDe)
-      .registerLocalizedStringBundle('en', LocalizedStringsEn)
-      .registerLocalizedStringBundle('en-GB', LocalizedStringsEnGb)
-      .registerLocalizedStringBundle('es', LocalizedStringsEs)
-      .registerLocalizedStringBundle('es-419', LocalizedStringsEs419)
-      .registerLocalizedStringBundle('fr', LocalizedStringsFr)
-      .registerLocalizedStringBundle('hi', LocalizedStringsHi)
-      .registerLocalizedStringBundle('id', LocalizedStringsId)
-      .registerLocalizedStringBundle('it', LocalizedStringsIt)
-      .registerLocalizedStringBundle('ja', LocalizedStringsJa)
-      .registerLocalizedStringBundle('ko', LocalizedStringsKo)
-      .registerLocalizedStringBundle('nl', LocalizedStringsNl)
-      .registerLocalizedStringBundle('no', LocalizedStringsNo)
-      .registerLocalizedStringBundle('pt-PT', LocalizedStringsPtPt)
-      .registerLocalizedStringBundle('pt-BR', LocalizedStringsPtBr)
-      .registerLocalizedStringBundle('ru', LocalizedStringsRu)
-      .registerLocalizedStringBundle('tr', LocalizedStringsTr)
-      .registerLocalizedStringBundle('vi', LocalizedStringsVi)
-      .registerLocalizedStringBundle('zh-cn', LocalizedStringsZhCn)
-      .registerLocalizedStringBundle('zh-TW', LocalizedStringsZhTw)
-      .registerLocalizedStringBundle('en-xa', enXaPseudoLocaleBundle);
+    this.localizationService_.registerLocalizedStringBundles({
+      'default': LocalizedStringsEn,
+      'ar': LocalizedStringsAr,
+      'de': LocalizedStringsDe,
+      'en': LocalizedStringsEn,
+      'en-GB': LocalizedStringsEnGb,
+      'es': LocalizedStringsEs,
+      'es-419': LocalizedStringsEs419,
+      'fr': LocalizedStringsFr,
+      'hi': LocalizedStringsHi,
+      'id': LocalizedStringsId,
+      'it': LocalizedStringsIt,
+      'ja': LocalizedStringsJa,
+      'ko': LocalizedStringsKo,
+      'nl': LocalizedStringsNl,
+      'no': LocalizedStringsNo,
+      'pt-PT': LocalizedStringsPtPt,
+      'pt-BR': LocalizedStringsPtBr,
+      'ru': LocalizedStringsRu,
+      'tr': LocalizedStringsTr,
+      'vi': LocalizedStringsVi,
+      'zh-cn': LocalizedStringsZhCn,
+      'zh-TW': LocalizedStringsZhTw,
+      'en-xa': enXaPseudoLocaleBundle,
+    });
   }
 }
diff --git a/extensions/amp-story-auto-ads/0.1/story-ad-page-manager.js b/extensions/amp-story-auto-ads/0.1/story-ad-page-manager.js
index 3e7e2c00118a..195081f95195 100644
--- a/extensions/amp-story-auto-ads/0.1/story-ad-page-manager.js
+++ b/extensions/amp-story-auto-ads/0.1/story-ad-page-manager.js
@@ -53,7 +53,7 @@ export class StoryAdPageManager {
     /** @private {!./story-ad-button-text-fitter.ButtonTextFitter} */
     this.buttonFitter_ = new ButtonTextFitter(this.ampdoc_);
 
-    /** @private {Object<string, StoryAdPage>} */
+    /** @private {{[key: string]: StoryAdPage}} */
     this.pages_ = {};
 
     /** @private {!../../amp-story/1.0/amp-story-store-service.AmpStoryStoreService} **/
@@ -237,7 +237,7 @@ export class StoryAdPageManager {
   /**
    * Construct an analytics event and trigger it.
    * @param {string} eventType
-   * @param {!Object<string, number>} vars A map of vars and their values.
+   * @param {!{[key: string]: number}} vars A map of vars and their values.
    * @private
    */
   analyticsEvent_(eventType, vars) {
diff --git a/extensions/amp-story-auto-ads/0.1/story-ad-page.js b/extensions/amp-story-auto-ads/0.1/story-ad-page.js
index 963c14eefd76..e2f3199f719f 100644
--- a/extensions/amp-story-auto-ads/0.1/story-ad-page.js
+++ b/extensions/amp-story-auto-ads/0.1/story-ad-page.js
@@ -1,4 +1,4 @@
-import {CommonSignals} from '#core/constants/common-signals';
+import {CommonSignals_Enum} from '#core/constants/common-signals';
 import {
   createElementWithAttributes,
   isJsonScriptTag,
@@ -6,14 +6,11 @@ import {
 } from '#core/dom';
 import {elementByTag} from '#core/dom/query';
 import {setStyle} from '#core/dom/style';
-import {dict, map} from '#core/types/object';
+import {map} from '#core/types/object';
 import {parseJson} from '#core/types/object/json';
 
 import {getExperimentBranch} from '#experiments';
-import {
-  BranchToTimeValues,
-  StoryAdSegmentExp,
-} from '#experiments/story-ad-progress-segment';
+import {StoryAdSegmentExp} from '#experiments/story-ad-progress-segment';
 
 import {getData, listen} from '#utils/event-helper';
 import {dev, devAssert, userAssert} from '#utils/log';
@@ -27,6 +24,8 @@ import {
   A4AVarNames,
   START_CTA_ANIMATION_ATTR,
   createCta,
+  getStoryAdMacroTags,
+  getStoryAdMetaTags,
   getStoryAdMetadataFromDoc,
   getStoryAdMetadataFromElement,
   maybeCreateAttribution,
@@ -40,7 +39,7 @@ import {getServicePromiseForDoc} from '../../../src/service-helpers';
 import {assertConfig} from '../../amp-ad-exit/0.1/config';
 import {
   StateProperty,
-  UIType,
+  UIType_Enum,
 } from '../../amp-story/1.0/amp-story-store-service';
 
 /** @const {string} */
@@ -239,6 +238,7 @@ export class StoryAdPage {
       }
 
       const uiMetadata = map();
+      const metaTags = getStoryAdMetaTags(this.adDoc_ ?? this.adElement_);
 
       // Template Ads.
       if (!this.adDoc_) {
@@ -249,7 +249,7 @@ export class StoryAdPage {
       } else {
         Object.assign(
           uiMetadata,
-          getStoryAdMetadataFromDoc(this.adDoc_),
+          getStoryAdMetadataFromDoc(metaTags),
           // TODO(ccordry): Depricate when possible.
           this.readAmpAdExit_()
         );
@@ -265,14 +265,21 @@ export class StoryAdPage {
           this.localizationService_
         ) || uiMetadata[A4AVarNames.CTA_TYPE];
 
-      // Store the cta-type as an accesible var for any further pings.
-      this.analytics_.then((analytics) =>
+      this.analytics_.then((analytics) => {
+        // Store the cta-type as an accesible var for any further pings.
         analytics.setVar(
           this.index_, // adIndex
           AnalyticsVars.CTA_TYPE,
           uiMetadata[A4AVarNames.CTA_TYPE]
-        )
-      );
+        );
+
+        // Set meta tag based variables.
+        for (const [key, value] of Object.entries(
+          getStoryAdMacroTags(metaTags)
+        )) {
+          analytics.setVar(this.index_, `STORY_AD_META_${key}`, value);
+        }
+      });
 
       if (
         (this.adChoicesIcon_ = maybeCreateAttribution(
@@ -299,25 +306,23 @@ export class StoryAdPage {
    * @private
    */
   createPageElement_() {
-    const attributes = dict({
+    const attributes = {
       'ad': '',
+      'aria-hidden': true,
       'distance': '2',
       'i-amphtml-loading': '',
       'id': this.id_,
-    });
+    };
 
-    const segmentExpBranch = getExperimentBranch(
+    const storyAdSegmentBranch = getExperimentBranch(
       this.win_,
       StoryAdSegmentExp.ID
     );
-
     if (
-      segmentExpBranch &&
-      segmentExpBranch !== StoryAdSegmentExp.CONTROL &&
-      segmentExpBranch !== StoryAdSegmentExp.NO_ADVANCE_BOTH &&
-      segmentExpBranch !== StoryAdSegmentExp.NO_ADVANCE_AD
+      storyAdSegmentBranch &&
+      storyAdSegmentBranch != StoryAdSegmentExp.CONTROL
     ) {
-      attributes['auto-advance-after'] = BranchToTimeValues[segmentExpBranch];
+      attributes['auto-advance-after'] = '10s';
     }
 
     const page = createElementWithAttributes(
@@ -351,7 +356,7 @@ export class StoryAdPage {
     this.adElement_
       .signals()
       // TODO(ccordry): Investigate using a better signal waiting for video loads.
-      .whenSignal(CommonSignals.INI_LOAD)
+      .whenSignal(CommonSignals_Enum.INI_LOAD)
       .then(() => this.onAdLoaded_());
 
     // Inabox custom event.
@@ -502,7 +507,7 @@ export class StoryAdPage {
   /**
    * Reacts to UI state updates and passes the information along as
    * attributes to the shadowed attribution icon.
-   * @param {!UIType} uiState
+   * @param {!UIType_Enum} uiState
    * @private
    */
   onUIStateUpdate_(uiState) {
@@ -512,14 +517,14 @@ export class StoryAdPage {
 
     this.adChoicesIcon_.classList.toggle(
       DESKTOP_FULLBLEED_CLASS,
-      uiState === UIType.DESKTOP_FULLBLEED
+      uiState === UIType_Enum.DESKTOP_FULLBLEED
     );
   }
 
   /**
    * Construct an analytics event and trigger it.
    * @param {string} eventType
-   * @param {!Object<string, number>} vars A map of vars and their values.
+   * @param {!{[key: string]: number}} vars A map of vars and their values.
    * @private
    */
   analyticsEvent_(eventType, vars) {
diff --git a/extensions/amp-story-auto-ads/0.1/story-ad-ui.js b/extensions/amp-story-auto-ads/0.1/story-ad-ui.js
index 4feb1b711984..7c0b096687be 100644
--- a/extensions/amp-story-auto-ads/0.1/story-ad-ui.js
+++ b/extensions/amp-story-auto-ads/0.1/story-ad-ui.js
@@ -1,11 +1,16 @@
-import {createElementWithAttributes, iterateCursor} from '#core/dom';
-import {dict, map} from '#core/types/object';
+import {createElementWithAttributes} from '#core/dom';
+import {map} from '#core/types/object';
+import {getWin} from '#core/window';
 
 import {getExperimentBranch} from '#experiments';
 import {StoryAdSegmentExp} from '#experiments/story-ad-progress-segment';
 
+import {Services} from '#service';
+
 import {dev, user} from '#utils/log';
 
+import {getAmpdoc} from 'src/service-helpers';
+
 import {CSS as attributionCSS} from '../../../build/amp-story-auto-ads-attribution-0.1.css';
 import {CSS as ctaButtonCSS} from '../../../build/amp-story-auto-ads-cta-button-0.1.css';
 import {openWindowDialog} from '../../../src/open-window-dialog';
@@ -57,25 +62,23 @@ const DataAttrs = {
 };
 
 /**
- * Finds all meta tags starting with `amp4ads-vars-` or `amp-cta`.
+ * Finds all meta tags like `amp4ads-vars-` or `amp-cta`.
  * @param {Document} doc
- * @return {!IArrayLike}
+ * @return {!NodeList}
  */
 export function getStoryAdMetaTags(doc) {
-  const selector = 'meta[name^=amp4ads-vars-],meta[name^=amp-cta-]';
-  return doc.querySelectorAll(selector);
+  return doc.querySelectorAll('meta[name]');
 }
 
 /**
  * Creates object containing information extracted from the creative
  * that is needed to render story ad ui e.g. cta, attribution, etc.
- * @param {!Document} doc
+ * @param {!NodeList} metaTags
  * @return {StoryAdUIMetadata}
  */
-export function getStoryAdMetadataFromDoc(doc) {
-  const storyMetaTags = getStoryAdMetaTags(doc);
+export function getStoryAdMetadataFromDoc(metaTags) {
   const vars = map();
-  iterateCursor(storyMetaTags, (tag) => {
+  metaTags.forEach((tag) => {
     const {content, name} = tag;
     if (name.startsWith(CTA_META_PREFIX)) {
       const key = name.split('amp-')[1];
@@ -88,6 +91,24 @@ export function getStoryAdMetadataFromDoc(doc) {
   return vars;
 }
 
+/**
+ * Returns an object conntaining all meta tags that
+ * qualifies as a macro (name=>value)
+ * @param {!NodeList} metaTags
+ * @return {!Object}
+ */
+export function getStoryAdMacroTags(metaTags) {
+  const result = map();
+  metaTags.forEach((tag) => {
+    const {content, name} = tag;
+    // If the meta tag name is not alphanumerical, we would ignore it.
+    if (/^[a-zA-Z0-9\-_]+$/.test(name)) {
+      result[name] = content;
+    }
+  });
+  return result;
+}
+
 /**
  * Gets story ad UI metadata from the <amp-ad> element.
  * @param {!Element} adElement
@@ -152,23 +173,15 @@ export function maybeCreateAttribution(win, metadata, container) {
       'amp-story-auto-ads attribution icon'
     );
 
-    const root = createElementWithAttributes(
-      doc,
-      'div',
-      dict({
-        'role': 'button',
-        'class': 'i-amphtml-attribution-host',
-      })
-    );
+    const root = createElementWithAttributes(doc, 'div', {
+      'role': 'button',
+      'class': 'i-amphtml-attribution-host',
+    });
 
-    const adChoicesIcon = createElementWithAttributes(
-      doc,
-      'img',
-      dict({
-        'class': 'i-amphtml-story-ad-attribution',
-        'src': src,
-      })
-    );
+    const adChoicesIcon = createElementWithAttributes(doc, 'img', {
+      'class': 'i-amphtml-story-ad-attribution',
+      'src': src,
+    });
 
     adChoicesIcon.addEventListener('click', (unusedEvent) =>
       handleAttributionClick(win, href)
@@ -205,15 +218,11 @@ function createPageOutlink_(doc, uiMetadata, container) {
   const pageOutlink = doc.createElement('amp-story-page-outlink');
   pageOutlink.setAttribute('layout', 'nodisplay');
 
-  const pageAnchorTag = createElementWithAttributes(
-    doc,
-    'a',
-    dict({
-      'class': 'i-amphtml-story-ad-link',
-      'target': '_top',
-      'href': uiMetadata[A4AVarNames.CTA_URL],
-    })
-  );
+  const pageAnchorTag = createElementWithAttributes(doc, 'a', {
+    'class': 'i-amphtml-story-ad-link',
+    'target': '_top',
+    'href': uiMetadata[A4AVarNames.CTA_URL],
+  });
   pageAnchorTag.textContent = uiMetadata[A4AVarNames.CTA_TYPE];
 
   pageOutlink.appendChild(pageAnchorTag);
@@ -227,6 +236,12 @@ function createPageOutlink_(doc, uiMetadata, container) {
     }
   }
 
+  Services.extensionsFor(getWin(doc)).installExtensionForDoc(
+    getAmpdoc(doc),
+    'amp-story-page-attachment',
+    '0.1'
+  );
+
   pageOutlink.className = 'i-amphtml-story-page-outlink-container';
 
   container.appendChild(pageOutlink);
@@ -244,14 +259,10 @@ function createCtaLayer_(a, doc, container) {
   const ctaLayer = doc.createElement('amp-story-cta-layer');
   ctaLayer.className = 'i-amphtml-cta-container';
 
-  const linkRoot = createElementWithAttributes(
-    doc,
-    'div',
-    dict({
-      'class': 'i-amphtml-story-ad-link-root',
-      'role': 'button',
-    })
-  );
+  const linkRoot = createElementWithAttributes(doc, 'div', {
+    'class': 'i-amphtml-story-ad-link-root',
+    'role': 'button',
+  });
 
   createShadowRootWithStyle(linkRoot, a, ctaButtonCSS);
 
@@ -273,15 +284,11 @@ export function createCta(doc, buttonFitter, container, uiMetadata) {
 
   // TODO(#36035): we should be using this element in createPageOutlink_
   // instead of creating it and dropping.
-  const a = createElementWithAttributes(
-    doc,
-    'a',
-    dict({
-      'class': 'i-amphtml-story-ad-link',
-      'target': '_blank',
-      'href': ctaUrl,
-    })
-  );
+  const a = createElementWithAttributes(doc, 'a', {
+    'class': 'i-amphtml-story-ad-link',
+    'target': '_blank',
+    'href': ctaUrl,
+  });
 
   const fitPromise = buttonFitter.fit(
     dev().assertElement(container),
@@ -307,10 +314,10 @@ export function createCta(doc, buttonFitter, container, uiMetadata) {
       doc.defaultView,
       StoryAdSegmentExp.ID
     );
-
     if (
-      storyAdSegmentBranch &&
-      storyAdSegmentBranch !== StoryAdSegmentExp.CONTROL
+      storyAdSegmentBranch == StoryAdSegmentExp.AUTO_ADVANCE_NEW_CTA ||
+      storyAdSegmentBranch ==
+        StoryAdSegmentExp.AUTO_ADVANCE_NEW_CTA_NOT_ANIMATED
     ) {
       return createPageOutlink_(doc, uiMetadata, container);
     } else {
diff --git a/extensions/amp-story-auto-ads/0.1/test-e2e/test-amp-story-auto-ads.js b/extensions/amp-story-auto-ads/0.1/test-e2e/test-amp-story-auto-ads.js
index d4db8218838f..d4a01829ea68 100644
--- a/extensions/amp-story-auto-ads/0.1/test-e2e/test-amp-story-auto-ads.js
+++ b/extensions/amp-story-auto-ads/0.1/test-e2e/test-amp-story-auto-ads.js
@@ -70,7 +70,6 @@ describes.endtoend(
       controller = env.controller;
     });
 
-    // TODO(#35241): flaky test disabled in #35732
     it.skip('should render correctly', async () => {
       await clickThroughPages(controller, /* numPages */ 7);
       const activePage = await controller.findElement('[active]');
diff --git a/extensions/amp-story-auto-ads/0.1/test/story-mock.js b/extensions/amp-story-auto-ads/0.1/test/story-mock.js
index ec527866093f..5fcf863686f9 100644
--- a/extensions/amp-story-auto-ads/0.1/test/story-mock.js
+++ b/extensions/amp-story-auto-ads/0.1/test/story-mock.js
@@ -1,4 +1,4 @@
-import {CommonSignals} from '#core/constants/common-signals';
+import {CommonSignals_Enum} from '#core/constants/common-signals';
 
 /**
  * Fake story implementation mocking public methods.
@@ -9,8 +9,8 @@ export class MockStoryImpl extends AMP.BaseElement {
     this.element = element;
     this.pages_ = [];
     // Fire these events so that story ads thinks the parent story is ready.
-    element.signals().signal(CommonSignals.BUILT);
-    element.signals().signal(CommonSignals.INI_LOAD);
+    element.signals().signal(CommonSignals_Enum.BUILT);
+    element.signals().signal(CommonSignals_Enum.INI_LOAD);
   }
 
   addPage(pageImpl) {
@@ -87,7 +87,7 @@ export function addStoryPages(doc, storyImpl, numPages = 3) {
     const page = doc.createElement('amp-story-page');
     page.id = 'story-page-' + i;
     element.appendChild(page);
-    page.signals().signal(CommonSignals.BUILT);
+    page.signals().signal(CommonSignals_Enum.BUILT);
     const implPromise = page
       .getImpl()
       .then((pageImpl) => storyImpl.addPage(pageImpl));
@@ -107,7 +107,7 @@ export function fireBuildSignals(doc, additonalSelectors = []) {
   const selectors = defaultSelectors.concat(additonalSelectors).join(',');
   doc.querySelectorAll(selectors).forEach((element) => {
     const signals = element.signals();
-    signals.signal(CommonSignals.BUILT);
-    signals.signal(CommonSignals.INI_LOAD);
+    signals.signal(CommonSignals_Enum.BUILT);
+    signals.signal(CommonSignals_Enum.INI_LOAD);
   });
 }
diff --git a/extensions/amp-story-auto-ads/0.1/test/test-algorithm-count-pages.js b/extensions/amp-story-auto-ads/0.1/test/test-algorithm-count-pages.js
index bf99a155dac0..876fc27d0a68 100644
--- a/extensions/amp-story-auto-ads/0.1/test/test-algorithm-count-pages.js
+++ b/extensions/amp-story-auto-ads/0.1/test/test-algorithm-count-pages.js
@@ -1,3 +1,5 @@
+import {Services} from '#service';
+
 import {macroTask} from '#testing/helpers';
 
 import {AmpStory} from '../../../amp-story/1.0/amp-story';
@@ -13,6 +15,8 @@ describes.realWin('CountPagesAlgorithm', {amp: true}, (env) => {
   let pageManager;
 
   beforeEach(() => {
+    const ampdocService = Services.ampdocServiceFor(env.win);
+    env.sandbox.stub(ampdocService, 'getAmpDoc').returns(env.ampdoc);
     storeService = getStoreService(env.win);
     const storyElement = env.win.document.createElement('amp-story');
     const ampStory = new AmpStory(storyElement);
diff --git a/extensions/amp-story-auto-ads/0.1/test/test-algorithm-predetermined.js b/extensions/amp-story-auto-ads/0.1/test/test-algorithm-predetermined.js
index 0268845e70ec..14127e8a1b68 100644
--- a/extensions/amp-story-auto-ads/0.1/test/test-algorithm-predetermined.js
+++ b/extensions/amp-story-auto-ads/0.1/test/test-algorithm-predetermined.js
@@ -1,5 +1,7 @@
 import {StoryAdPlacements} from '#experiments/story-ad-placements';
 
+import {Services} from '#service';
+
 import {AmpStory} from '../../../amp-story/1.0/amp-story';
 import {
   Action,
@@ -17,6 +19,8 @@ describes.realWin('PredeterminedPositionAlgorithm', {amp: true}, (env) => {
   let pageManager;
 
   beforeEach(() => {
+    const ampdocService = Services.ampdocServiceFor(env.win);
+    env.sandbox.stub(ampdocService, 'getAmpDoc').returns(env.ampdoc);
     storeService = getStoreService(env.win);
     const storyElement = env.win.document.createElement('amp-story');
     const ampStory = new AmpStory(storyElement);
diff --git a/extensions/amp-story-auto-ads/0.1/test/test-amp-story-auto-ads.js b/extensions/amp-story-auto-ads/0.1/test/test-amp-story-auto-ads.js
index bd1df0d398f9..2a5947d706f6 100644
--- a/extensions/amp-story-auto-ads/0.1/test/test-amp-story-auto-ads.js
+++ b/extensions/amp-story-auto-ads/0.1/test/test-amp-story-auto-ads.js
@@ -1,8 +1,7 @@
-import {CommonSignals} from '#core/constants/common-signals';
+import {CommonSignals_Enum} from '#core/constants/common-signals';
 
 import * as experiments from '#experiments';
 import {forceExperimentBranch, getExperimentBranch} from '#experiments';
-import {StoryAdAutoAdvance} from '#experiments/story-ad-auto-advance';
 
 import {Services} from '#service';
 
@@ -20,7 +19,7 @@ import {NavigationDirection} from '../../../amp-story/1.0/amp-story-page';
 import {
   Action,
   StateProperty,
-  UIType,
+  UIType_Enum,
   getStoreService,
 } from '../../../amp-story/1.0/amp-story-store-service';
 import * as storyEvents from '../../../amp-story/1.0/events';
@@ -65,7 +64,9 @@ describes.realWin(
       });
       adElement = win.document.createElement('amp-story-auto-ads');
       storyElement = win.document.createElement('amp-story');
+      const pageElement = win.document.createElement('amp-story-page');
       win.document.body.appendChild(storyElement);
+      storyElement.appendChild(pageElement);
       storyElement.appendChild(adElement);
       story = new AmpStory(storyElement);
       autoAds = new AmpStoryAutoAds(adElement);
@@ -84,7 +85,6 @@ describes.realWin(
         env.sandbox.stub(viewer, 'isEmbedded').returns(true);
         new MockStoryImpl(storyElement);
         addStoryAutoAdsConfig(adElement);
-        await autoAds.buildCallback();
       });
 
       it('handles null response', async () => {
@@ -95,7 +95,7 @@ describes.realWin(
         env.sandbox
           .stub(viewer, 'sendMessageAwaitResponse')
           .returns(Promise.resolve(null));
-        await autoAds.layoutCallback();
+        await autoAds.buildCallback();
         expect(forceExpStub).not.to.be.called;
       });
 
@@ -107,7 +107,7 @@ describes.realWin(
         env.sandbox
           .stub(viewer, 'sendMessageAwaitResponse')
           .returns(Promise.resolve({experimentIds: []}));
-        await autoAds.layoutCallback();
+        await autoAds.buildCallback();
         expect(forceExpStub).not.to.be.called;
       });
 
@@ -115,7 +115,7 @@ describes.realWin(
         env.sandbox
           .stub(viewer, 'sendMessageAwaitResponse')
           .returns(Promise.resolve({experimentIds: [123]}));
-        await autoAds.layoutCallback();
+        await autoAds.buildCallback();
         expect(getExperimentBranch(win, 'fake-exp')).to.equal('123');
       });
 
@@ -127,7 +127,7 @@ describes.realWin(
         env.sandbox
           .stub(viewer, 'sendMessageAwaitResponse')
           .returns(Promise.resolve({experimentIds: [456]}));
-        await autoAds.layoutCallback();
+        await autoAds.buildCallback();
         expect(forceExpStub).not.to.be.called;
       });
     });
@@ -217,6 +217,57 @@ describes.realWin(
         const ampAds = doc.querySelectorAll('amp-ad');
         expect(ampAds.length).to.equal(1);
       });
+
+      it('should call onPageChange and onNewAdView as required', async () => {
+        storeGetterStub
+          .withArgs(StateProperty.PAGE_IDS)
+          .returns([
+            '1',
+            '2',
+            '3',
+            '4',
+            '5',
+            '6',
+            '7',
+            'i-amphtml-ad-page-1',
+            '8',
+            '9',
+            '10',
+            '11',
+            '12',
+            '13',
+            '14',
+            '15',
+          ]);
+        await autoAds.buildCallback();
+        await autoAds.layoutCallback();
+
+        const onPageChange = env.sandbox.spy(
+          autoAds.placementAlgorithm_,
+          'onPageChange'
+        );
+        const onNewAdView = env.sandbox.spy(
+          autoAds.placementAlgorithm_,
+          'onNewAdView'
+        );
+
+        storeService.dispatch(Action.CHANGE_PAGE, {
+          id: '7',
+          index: 6,
+        });
+        expect(onPageChange).to.be.calledWith('7');
+        expect(onNewAdView).not.to.be.called;
+
+        onPageChange.resetHistory();
+        onNewAdView.resetHistory();
+
+        storeService.dispatch(Action.CHANGE_PAGE, {
+          id: 'i-amphtml-ad-page-1',
+          index: 7,
+        });
+        expect(onPageChange).not.to.be.called;
+        expect(onNewAdView).to.be.calledWith(7);
+      });
     });
 
     describe('service installation', () => {
@@ -321,18 +372,13 @@ describes.realWin(
     describe('system layer', () => {
       beforeEach(async () => {
         // TODO(#33969) remove when launched.
-        forceExperimentBranch(
-          win,
-          'story-ad-auto-advance',
-          StoryAdAutoAdvance.EIGHT_SECONDS
-        );
         // Force sync mutateElement.
         env.sandbox.stub(autoAds, 'mutateElement').callsArg(0);
         addStoryAutoAdsConfig(adElement);
         await story.buildCallback();
         // Fire these events so that story ads thinks the parent story is ready.
-        story.signals().signal(CommonSignals.BUILT);
-        story.signals().signal(CommonSignals.INI_LOAD);
+        story.signals().signal(CommonSignals_Enum.BUILT);
+        story.signals().signal(CommonSignals_Enum.INI_LOAD);
         await autoAds.buildCallback();
         await autoAds.layoutCallback();
       });
@@ -342,48 +388,27 @@ describes.realWin(
         expect(adBadge).to.exist;
       });
 
-      it('should create progress bar', () => {
-        const progressBar = doc.querySelector(
-          '.i-amphtml-story-ad-progress-bar'
-        );
-        expect(progressBar).to.exist;
-      });
-
-      it('should propagate the ad-showing attribute to badge & progress bar', () => {
+      it('should propagate the ad-showing attribute to badge', () => {
         const adBadgeContainer = doc.querySelector(
           '.i-amphtml-ad-overlay-container'
         );
-        const progressBackground = doc.querySelector(
-          '.i-amphtml-story-ad-progress-background'
-        );
         expect(adBadgeContainer).not.to.have.attribute(Attributes.AD_SHOWING);
-        expect(progressBackground).not.to.have.attribute(Attributes.AD_SHOWING);
         storeService.dispatch(Action.TOGGLE_AD, true);
         expect(adBadgeContainer).to.have.attribute(Attributes.AD_SHOWING);
-        expect(progressBackground).to.have.attribute(Attributes.AD_SHOWING);
       });
 
-      it('should propagate the desktop-one-panel attribute to badge & progress bar', () => {
+      it('should propagate the desktop-one-panel attribute to ad badge', () => {
         const adBadgeContainer = doc.querySelector(
           '.i-amphtml-ad-overlay-container'
         );
-        const progressBackground = doc.querySelector(
-          '.i-amphtml-story-ad-progress-background'
-        );
-        storeService.dispatch(Action.TOGGLE_UI, UIType.MOBILE);
+        storeService.dispatch(Action.TOGGLE_UI, UIType_Enum.MOBILE);
         expect(adBadgeContainer).not.to.have.attribute(
           Attributes.DESKTOP_ONE_PANEL
         );
-        expect(progressBackground).not.to.have.attribute(
-          Attributes.DESKTOP_ONE_PANEL
-        );
-        storeService.dispatch(Action.TOGGLE_UI, UIType.DESKTOP_ONE_PANEL);
+        storeService.dispatch(Action.TOGGLE_UI, UIType_Enum.DESKTOP_ONE_PANEL);
         expect(adBadgeContainer).to.have.attribute(
           Attributes.DESKTOP_ONE_PANEL
         );
-        expect(progressBackground).to.have.attribute(
-          Attributes.DESKTOP_ONE_PANEL
-        );
       });
 
       it('should propagate the dir=rtl attribute', () => {
@@ -394,31 +419,6 @@ describes.realWin(
         storeService.dispatch(Action.TOGGLE_RTL, true);
         expect(adBadgeContainer).to.have.attribute(Attributes.DIR, 'rtl');
       });
-
-      it('should propagate the pause state if ad showing', () => {
-        const progressBackground = doc.querySelector(
-          '.i-amphtml-story-ad-progress-background'
-        );
-        storeService.dispatch(Action.TOGGLE_AD, true);
-        expect(progressBackground).not.to.have.attribute(Attributes.PAUSED);
-        storeService.dispatch(Action.TOGGLE_PAUSED, true);
-        expect(progressBackground).to.have.attribute(Attributes.PAUSED);
-        storeService.dispatch(Action.TOGGLE_PAUSED, false);
-        expect(progressBackground).not.to.have.attribute(Attributes.PAUSED);
-      });
-
-      // TODO(calebcordry): Skipping test since it's failing on main, marking for review.
-      it.skip('should not propagate the pause state if no ad showing', () => {
-        const progressBackground = doc.querySelector(
-          '.i-amphtml-story-ad-progress-background'
-        );
-        storeService.dispatch(Action.TOGGLE_AD, false);
-        expect(progressBackground).not.to.have.attribute(Attributes.PAUSED);
-        storeService.dispatch(Action.TOGGLE_PAUSED, true);
-        expect(progressBackground).not.to.have.attribute(Attributes.PAUSED);
-        storeService.dispatch(Action.TOGGLE_PAUSED, false);
-        expect(progressBackground).not.to.have.attribute(Attributes.PAUSED);
-      });
     });
 
     describe('analytics triggers', () => {
@@ -498,7 +498,7 @@ describes.realWin(
         const dispatchStub = env.sandbox.spy(storyEvents, 'dispatch');
 
         const ampAd = doc.querySelector('amp-ad');
-        ampAd.signals().signal(CommonSignals.INI_LOAD);
+        ampAd.signals().signal(CommonSignals_Enum.INI_LOAD);
         await macroTask();
 
         expect(insertSpy).calledWith('story-page-0', 'i-amphtml-ad-page-1');
diff --git a/extensions/amp-story-auto-ads/0.1/test/test-story-ad-localization-strings.js b/extensions/amp-story-auto-ads/0.1/test/test-story-ad-localization-strings.js
index d304fe59955a..ec9f76676aa2 100644
--- a/extensions/amp-story-auto-ads/0.1/test/test-story-ad-localization-strings.js
+++ b/extensions/amp-story-auto-ads/0.1/test/test-story-ad-localization-strings.js
@@ -1,4 +1,4 @@
-import {LocalizedStringId} from '#service/localization/strings';
+import {LocalizedStringId_Enum} from '#service/localization/strings';
 
 import localesObjs from '../_locales';
 
@@ -15,8 +15,8 @@ describes.fakeWin('amp-story-ad-localization-strings', {amp: true}, () => {
         expect(uniqueKeys.size).to.eql(languageKeys.length);
       });
 
-      it(languageName + ' keys should exist in LocalizedStringId', () => {
-        const localizedStringIdKeys = Object.values(LocalizedStringId);
+      it(languageName + ' keys should exist in LocalizedStringId_Enum', () => {
+        const localizedStringIdKeys = Object.values(LocalizedStringId_Enum);
 
         languageKeys.forEach((key) => {
           expect(localizedStringIdKeys.indexOf(key)).to.not.eql(-1);
diff --git a/extensions/amp-story-auto-ads/0.1/test/test-story-ad-page.js b/extensions/amp-story-auto-ads/0.1/test/test-story-ad-page.js
index 914a5e4749fb..408292813c1e 100644
--- a/extensions/amp-story-auto-ads/0.1/test/test-story-ad-page.js
+++ b/extensions/amp-story-auto-ads/0.1/test/test-story-ad-page.js
@@ -1,4 +1,4 @@
-import {CommonSignals} from '#core/constants/common-signals';
+import {CommonSignals_Enum} from '#core/constants/common-signals';
 
 import {macroTask} from '#testing/helpers';
 
@@ -7,7 +7,7 @@ import * as openWindowDialog from '../../../../src/open-window-dialog';
 import * as service from '../../../../src/service-helpers';
 import {
   Action,
-  UIType,
+  UIType_Enum,
   getStoreService,
 } from '../../../amp-story/1.0/amp-story-store-service';
 import {StoryAdAnalytics} from '../story-ad-analytics';
@@ -94,7 +94,7 @@ describes.realWin('story-ad-page', {amp: true}, (env) => {
       const ampAdElement = doc.querySelector('amp-ad');
       const iframe = doc.createElement('iframe');
       ampAdElement.appendChild(iframe);
-      await ampAdElement.signals().signal(CommonSignals.INI_LOAD);
+      await ampAdElement.signals().signal(CommonSignals_Enum.INI_LOAD);
 
       const adDoc = storyAdPage.getAdDoc();
       expect(adDoc).to.exist;
@@ -123,7 +123,7 @@ describes.realWin('story-ad-page', {amp: true}, (env) => {
       // Stub delegateVideoAutoplay.
       pageElement.getImpl = () => Promise.resolve(pageImplMock);
 
-      await adElement.signals().signal(CommonSignals.INI_LOAD);
+      await adElement.signals().signal(CommonSignals_Enum.INI_LOAD);
       expect(storyAdPage.isLoaded()).to.be.true;
     });
   });
@@ -147,7 +147,7 @@ describes.realWin('story-ad-page', {amp: true}, (env) => {
       expect(someFunc).to.have.not.been.called;
 
       const adElement = doc.querySelector('amp-ad');
-      await adElement.signals().signal(CommonSignals.INI_LOAD);
+      await adElement.signals().signal(CommonSignals_Enum.INI_LOAD);
       expect(someFunc.calledOnce).to.be.true;
     });
   });
@@ -162,7 +162,7 @@ describes.realWin('story-ad-page', {amp: true}, (env) => {
       const ampAdElement = doc.querySelector('amp-ad');
       const iframe = doc.createElement('iframe');
       ampAdElement.appendChild(iframe);
-      await ampAdElement.signals().signal(CommonSignals.INI_LOAD);
+      await ampAdElement.signals().signal(CommonSignals_Enum.INI_LOAD);
 
       const iframeBody = iframe.contentDocument.body;
       expect(iframeBody).not.to.have.attribute('amp-story-visible');
@@ -193,7 +193,7 @@ describes.realWin('story-ad-page', {amp: true}, (env) => {
             </div>
         </div>
         </body>`);
-      await ampAdElement.signals().signal(CommonSignals.INI_LOAD);
+      await ampAdElement.signals().signal(CommonSignals_Enum.INI_LOAD);
 
       const altBody =
         iframe.contentDocument.querySelector('#x-a4a-former-body');
@@ -297,7 +297,7 @@ describes.realWin('story-ad-page', {amp: true}, (env) => {
         </head>
         <body></body>`);
 
-      await ampAdElement.signals().signal(CommonSignals.INI_LOAD);
+      await ampAdElement.signals().signal(CommonSignals_Enum.INI_LOAD);
 
       const created = await storyAdPage.maybeCreateCta();
       expect(created).to.be.true;
@@ -326,7 +326,7 @@ describes.realWin('story-ad-page', {amp: true}, (env) => {
           </amp-ad-exit>
         </body>`);
 
-      await ampAdElement.signals().signal(CommonSignals.INI_LOAD);
+      await ampAdElement.signals().signal(CommonSignals_Enum.INI_LOAD);
       const created = await storyAdPage.maybeCreateCta();
       expect(created).to.be.true;
       const anchor = doc.querySelector('a');
@@ -364,7 +364,7 @@ describes.realWin('story-ad-page', {amp: true}, (env) => {
         </head>
         <body></body>`);
 
-      await ampAdElement.signals().signal(CommonSignals.INI_LOAD);
+      await ampAdElement.signals().signal(CommonSignals_Enum.INI_LOAD);
       const created = await storyAdPage.maybeCreateCta();
       expect(created).to.be.true;
       const attribution = doc.querySelector('.i-amphtml-story-ad-attribution');
@@ -389,7 +389,7 @@ describes.realWin('story-ad-page', {amp: true}, (env) => {
     });
 
     it('propagates fullbleed state to attribution icon', async () => {
-      storeService.dispatch(Action.TOGGLE_UI, UIType.DESKTOP_FULLBLEED);
+      storeService.dispatch(Action.TOGGLE_UI, UIType_Enum.DESKTOP_FULLBLEED);
 
       const iframe = doc.createElement('iframe');
       ampAdElement.appendChild(iframe);
@@ -401,16 +401,16 @@ describes.realWin('story-ad-page', {amp: true}, (env) => {
             <meta name="amp4ads-vars-attribution-url" content="https://www.google.com">
           </head>
           <body></body>`);
-      await ampAdElement.signals().signal(CommonSignals.INI_LOAD);
+      await ampAdElement.signals().signal(CommonSignals_Enum.INI_LOAD);
       await storyAdPage.maybeCreateCta();
 
       const attribution = doc.querySelector('.i-amphtml-story-ad-attribution');
       expect(attribution).to.have.class('i-amphtml-story-ad-fullbleed');
 
-      storeService.dispatch(Action.TOGGLE_UI, UIType.MOBILE);
+      storeService.dispatch(Action.TOGGLE_UI, UIType_Enum.MOBILE);
       expect(attribution).not.to.have.class('i-amphtml-story-ad-fullbleed');
 
-      storeService.dispatch(Action.TOGGLE_UI, UIType.DESKTOP_FULLBLEED);
+      storeService.dispatch(Action.TOGGLE_UI, UIType_Enum.DESKTOP_FULLBLEED);
       expect(attribution).to.have.class('i-amphtml-story-ad-fullbleed');
     });
 
@@ -428,7 +428,7 @@ describes.realWin('story-ad-page', {amp: true}, (env) => {
         </head>
         <body></body>`);
 
-      await ampAdElement.signals().signal(CommonSignals.INI_LOAD);
+      await ampAdElement.signals().signal(CommonSignals_Enum.INI_LOAD);
       const created = await storyAdPage.maybeCreateCta();
       expect(created).to.be.true;
       const attribution = doc.querySelector('.i-amphtml-story-ad-attribution');
@@ -449,7 +449,7 @@ describes.realWin('story-ad-page', {amp: true}, (env) => {
         </head>
         <body></body>`);
 
-      await ampAdElement.signals().signal(CommonSignals.INI_LOAD);
+      await ampAdElement.signals().signal(CommonSignals_Enum.INI_LOAD);
       const created = await storyAdPage.maybeCreateCta();
       expect(created).to.be.true;
       const attribution = doc.querySelector('.i-amphtml-story-ad-attribution');
@@ -493,7 +493,7 @@ describes.realWin('story-ad-page', {amp: true}, (env) => {
       pageElement.getImpl = () => Promise.resolve(pageImplMock);
 
       const ampAdElement = doc.querySelector('amp-ad');
-      await ampAdElement.signals().signal(CommonSignals.INI_LOAD);
+      await ampAdElement.signals().signal(CommonSignals_Enum.INI_LOAD);
       await macroTask();
       expect(fireEventStub).to.be.calledWithExactly(
         pageElement,
@@ -532,7 +532,7 @@ describes.realWin('story-ad-page', {amp: true}, (env) => {
       const ampAdElement = doc.querySelector('amp-ad');
       ampAdElement.setAttribute('data-vars-ctaurl', 'https://amp.dev');
       ampAdElement.setAttribute('data-vars-ctatype', 'INSTALL');
-      await ampAdElement.signals().signal(CommonSignals.INI_LOAD);
+      await ampAdElement.signals().signal(CommonSignals_Enum.INI_LOAD);
 
       await storyAdPage.maybeCreateCta();
       const cta = doc.querySelector('.i-amphtml-story-ad-link');
diff --git a/extensions/amp-story-auto-ads/0.1/test/test-story-ad-ui.js b/extensions/amp-story-auto-ads/0.1/test/test-story-ad-ui.js
index 1b75f3064015..af06ebc5a14d 100644
--- a/extensions/amp-story-auto-ads/0.1/test/test-story-ad-ui.js
+++ b/extensions/amp-story-auto-ads/0.1/test/test-story-ad-ui.js
@@ -5,6 +5,8 @@ import {ButtonTextFitter} from '../story-ad-button-text-fitter';
 import {
   A4AVarNames,
   createCta,
+  getStoryAdMacroTags,
+  getStoryAdMetaTags,
   getStoryAdMetadataFromDoc,
   getStoryAdMetadataFromElement,
   maybeCreateAttribution,
@@ -20,14 +22,15 @@ describes.realWin('story-ad-ui', {amp: true}, (env) => {
     doc = win.document;
   });
 
-  describe('getStoryAdMetadataFromDoc', () => {
+  describe('meta tags', () => {
     it('returns metadata for amp-* values', () => {
       const adDoc = doc.implementation.createHTMLDocument();
       adDoc.head.innerHTML = `
+        <meta name="other-tag" content="random-val">
         <meta name="amp-cta-type" content="SHOP">
         <meta name="amp-cta-url" content="https://www.kittens.com">
       `;
-      const result = getStoryAdMetadataFromDoc(adDoc);
+      const result = getStoryAdMetadataFromDoc(getStoryAdMetaTags(adDoc));
       expect(result).to.eql({
         'cta-type': 'SHOP',
         'cta-url': 'https://www.kittens.com',
@@ -37,12 +40,13 @@ describes.realWin('story-ad-ui', {amp: true}, (env) => {
     it('returns metadata for amp4ads-vars-* values', () => {
       const adDoc = doc.implementation.createHTMLDocument();
       adDoc.head.innerHTML = `
+        <meta name="other-tag" content="random-val">
         <meta name="amp4ads-vars-cta-type" content="SHOP">
         <meta name="amp4ads-vars-cta-url" content="https://www.kittens.com">
         <meta name="amp4ads-vars-attribution-icon" content="https://www.kittens.com/img1">
         <meta name="amp4ads-vars-attribution-url" content="https://www.kittens.com/moreinfo">
       `;
-      const result = getStoryAdMetadataFromDoc(adDoc);
+      const result = getStoryAdMetadataFromDoc(getStoryAdMetaTags(adDoc));
       expect(result).to.eql({
         'cta-type': 'SHOP',
         'cta-url': 'https://www.kittens.com',
@@ -50,6 +54,26 @@ describes.realWin('story-ad-ui', {amp: true}, (env) => {
         'attribution-url': 'https://www.kittens.com/moreinfo',
       });
     });
+
+    it('getStoryAdMacroTags should return all tags', () => {
+      const adDoc = doc.implementation.createHTMLDocument();
+      adDoc.head.innerHTML = `
+        <meta name="other-tag" content="random-val">
+        <meta name="invalid-tag-name-*" content="random-val">
+        <meta name="amp4ads-vars-cta-type" content="SHOP">
+        <meta name="amp4ads-vars-cta-url" content="https://www.kittens.com">
+        <meta name="amp4ads-vars-attribution-icon" content="https://www.kittens.com/img1">
+        <meta name="amp4ads-vars-attribution-url" content="https://www.kittens.com/moreinfo">
+      `;
+      const result = getStoryAdMacroTags(getStoryAdMetaTags(adDoc));
+      expect(result).to.eql({
+        'other-tag': 'random-val',
+        'amp4ads-vars-cta-type': 'SHOP',
+        'amp4ads-vars-cta-url': 'https://www.kittens.com',
+        'amp4ads-vars-attribution-icon': 'https://www.kittens.com/img1',
+        'amp4ads-vars-attribution-url': 'https://www.kittens.com/moreinfo',
+      });
+    });
   });
 
   describe('getStoryAdMetadataFromElement', () => {
@@ -228,7 +252,7 @@ describes.realWin('story-ad-ui', {amp: true}, (env) => {
       forceExperimentBranch(
         win,
         StoryAdSegmentExp.ID,
-        StoryAdSegmentExp.NO_ADVANCE_AD
+        StoryAdSegmentExp.AUTO_ADVANCE_NEW_CTA
       );
     });
 
diff --git a/extensions/amp-story-auto-ads/0.1/test/validator-amp-story-auto-ads-remote.html b/extensions/amp-story-auto-ads/0.1/test/validator-amp-story-auto-ads-remote.html
new file mode 100644
index 000000000000..e763f64f0592
--- /dev/null
+++ b/extensions/amp-story-auto-ads/0.1/test/validator-amp-story-auto-ads-remote.html
@@ -0,0 +1,28 @@
+<!--
+  Test Description:
+  Tests for the amp-story-auto-ads tag with remote config.
+-->
+<!doctype html>
+<html ⚡ lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>STAMP examples</title>
+  <link rel="canonical" href="http://nonblocking.io/" >
+  <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+  <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+  <script async src="https://cdn.ampproject.org/v0.js"></script>
+  <script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-latest.js"></script>
+  <script async custom-element="amp-story-auto-ads" src="https://cdn.ampproject.org/v0/amp-story-auto-ads-latest.js"></script>
+</head>
+<body>
+  <amp-story standalone poster-portrait-src="portrait.png" poster-landscape-src="landscape.png" poster-square-src="square.png"
+      title="Example" publisher="The AMP Project" publisher-logo-src="amp.png">
+    <amp-story-page id="1">
+      <amp-story-grid-layer template="horizontal">
+      </amp-story-grid-layer>
+    </amp-story-page>
+    <amp-story-auto-ads src="https://remote.config">
+    </amp-story-auto-ads>
+  </amp-story>
+</body>
+</html>
diff --git a/extensions/amp-story-auto-ads/0.1/test/validator-amp-story-auto-ads-remote.out b/extensions/amp-story-auto-ads/0.1/test/validator-amp-story-auto-ads-remote.out
new file mode 100644
index 000000000000..3bd31ec87f51
--- /dev/null
+++ b/extensions/amp-story-auto-ads/0.1/test/validator-amp-story-auto-ads-remote.out
@@ -0,0 +1,29 @@
+PASS
+|  <!--
+|    Test Description:
+|    Tests for the amp-story-auto-ads tag with remote config.
+|  -->
+|  <!doctype html>
+|  <html ⚡ lang="en">
+|  <head>
+|    <meta charset="utf-8">
+|    <title>STAMP examples</title>
+|    <link rel="canonical" href="http://nonblocking.io/" >
+|    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+|    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+|    <script async src="https://cdn.ampproject.org/v0.js"></script>
+|    <script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-latest.js"></script>
+|    <script async custom-element="amp-story-auto-ads" src="https://cdn.ampproject.org/v0/amp-story-auto-ads-latest.js"></script>
+|  </head>
+|  <body>
+|    <amp-story standalone poster-portrait-src="portrait.png" poster-landscape-src="landscape.png" poster-square-src="square.png"
+|        title="Example" publisher="The AMP Project" publisher-logo-src="amp.png">
+|      <amp-story-page id="1">
+|        <amp-story-grid-layer template="horizontal">
+|        </amp-story-grid-layer>
+|      </amp-story-page>
+|      <amp-story-auto-ads src="https://remote.config">
+|      </amp-story-auto-ads>
+|    </amp-story>
+|  </body>
+|  </html>
\ No newline at end of file
diff --git a/extensions/amp-story-auto-ads/validator-amp-story-auto-ads.protoascii b/extensions/amp-story-auto-ads/validator-amp-story-auto-ads.protoascii
index 235c23760bf6..cfc8d6760ffb 100644
--- a/extensions/amp-story-auto-ads/validator-amp-story-auto-ads.protoascii
+++ b/extensions/amp-story-auto-ads/validator-amp-story-auto-ads.protoascii
@@ -19,6 +19,12 @@ tags: {  # <amp-story-auto-ads>
   mandatory_parent: "AMP-STORY"
   unique: true
   spec_url: "https://amp.dev/documentation/components/amp-story-auto-ads/"
+  attrs: {
+    name: "src"
+    value_url: {
+      protocol: "https"
+    }
+  }
 }
 tags: {  # amp-story-auto-ads (json config)
   html_format: AMP
diff --git a/extensions/amp-story-auto-analytics/0.1/auto-analytics-configs.js b/extensions/amp-story-auto-analytics/0.1/auto-analytics-configs.js
index bf30f7504fe4..7004dc64d763 100644
--- a/extensions/amp-story-auto-analytics/0.1/auto-analytics-configs.js
+++ b/extensions/amp-story-auto-analytics/0.1/auto-analytics-configs.js
@@ -21,6 +21,11 @@
 export const buildGtagConfig = (gtagId) => ({
   'vars': {
     'gtag_id': gtagId,
+    'config': {
+      [gtagId]: {
+        'groups': 'default',
+      },
+    },
   },
   'triggers': {
     'storyPageCount': {
@@ -65,25 +70,45 @@ export const buildGtagConfig = (gtagId) => ({
         'repeat': false,
       },
     },
-  },
-  // Linkers stitch sessions between cache and origin together using cid.
-  'linkers': {
-    'ampStoryAutoAnalyticsLinker': {
-      'ids': {
-        'cid': '${clientId}',
+    'storyShoppingTagClick': {
+      'on': 'story-shopping-tag-click',
+      'vars': {
+        'event_name': 'custom',
+        'event_action': 'story_shopping_tag_click',
+        'event_category': '${title}',
+        'event_label': '${storyShoppingProductId}',
+        'send_to': [gtagId],
       },
-      'enabled': true,
-      // Makes sure URL is decorated from origin to cache. (Default is cache to
-      // origin only).
-      'proxyOnly': false,
     },
-  },
-  // CookieWriter config is used to extract the url params and store them into
-  // cookies.
-  'cookies': {
-    'ampStoryAutoAnalyticsCookies': {
-      // Reads URL linker params and stores them as cookies.
-      'value': 'LINKER_PARAM(ampStoryAutoAnalyticsLinker, cid)',
+    'storyShoppingPLPView': {
+      'on': 'story-shopping-plp-view',
+      'vars': {
+        'event_name': 'custom',
+        'event_action': 'story_shopping_plp_view',
+        'event_category': '${title}',
+        'event_label': '${storyPageId}',
+        'send_to': [gtagId],
+      },
+    },
+    'storyShoppingPDPView': {
+      'on': 'story-shopping-pdp-view',
+      'vars': {
+        'event_name': 'custom',
+        'event_action': 'story_shopping_pdp_view',
+        'event_category': '${title}',
+        'event_label': '${storyShoppingProductId}',
+        'send_to': [gtagId],
+      },
+    },
+    'storyShoppingBuyNowClick': {
+      'on': 'story-shopping-buy-now-click',
+      'vars': {
+        'event_name': 'custom',
+        'event_action': 'story_shopping_buy_now_click',
+        'event_category': '${title}',
+        'event_label': '${storyShoppingProductId}',
+        'send_to': [gtagId],
+      },
     },
   },
 });
diff --git a/extensions/amp-story-auto-analytics/0.1/test/test-amp-story-auto-analytics.js b/extensions/amp-story-auto-analytics/0.1/test/test-amp-story-auto-analytics.js
index f170df8cbae0..acbdc16b1251 100644
--- a/extensions/amp-story-auto-analytics/0.1/test/test-amp-story-auto-analytics.js
+++ b/extensions/amp-story-auto-analytics/0.1/test/test-amp-story-auto-analytics.js
@@ -37,45 +37,5 @@ describes.realWin(
       expect(autoAnalyticsEl.querySelector('amp-analytics[type="gtag"]')).to
         .exist;
     });
-
-    it('should add linker config', async () => {
-      await autoAnalyticsEl.whenBuilt();
-      const config = {
-        'linkers': {
-          'ampStoryAutoAnalyticsLinker': {
-            'ids': {
-              'cid': '${clientId}',
-            },
-            'enabled': true,
-            'proxyOnly': false,
-          },
-        },
-      };
-
-      const strConfig = JSON.stringify(config);
-      const configContents = strConfig.substr(1, strConfig.length - 2);
-
-      expect(autoAnalyticsEl.querySelector('script').textContent).to.contain(
-        configContents
-      );
-    });
-
-    it('should add cookieWriter config', async () => {
-      await autoAnalyticsEl.whenBuilt();
-      const config = {
-        'cookies': {
-          'ampStoryAutoAnalyticsCookies': {
-            'value': 'LINKER_PARAM(ampStoryAutoAnalyticsLinker, cid)',
-          },
-        },
-      };
-
-      const strConfig = JSON.stringify(config);
-      const configContents = strConfig.substr(1, strConfig.length - 2);
-
-      expect(autoAnalyticsEl.querySelector('script').textContent).to.contain(
-        configContents
-      );
-    });
   }
 );
diff --git a/extensions/amp-story-auto-analytics/amp-story-auto-analytics.md b/extensions/amp-story-auto-analytics/amp-story-auto-analytics.md
index ee9139d8cbe1..a45bdd5ab53a 100644
--- a/extensions/amp-story-auto-analytics/amp-story-auto-analytics.md
+++ b/extensions/amp-story-auto-analytics/amp-story-auto-analytics.md
@@ -12,7 +12,7 @@ The `amp-story-auto-analytics` component configures [`amp-analytics`](https://am
 
 ```html
 <amp-story>
-  <amp-story-auto-analytics gtag-id="UA-123456789-0"></amp-story-auto-analytics>
+  <amp-story-auto-analytics gtag-id="G-12345678"></amp-story-auto-analytics>
 </amp-story>
 ```
 
diff --git a/extensions/amp-story-captions/0.1/amp-story-captions-presets.css b/extensions/amp-story-captions/0.1/amp-story-captions-presets.css
new file mode 100644
index 000000000000..268df562e968
--- /dev/null
+++ b/extensions/amp-story-captions/0.1/amp-story-captions-presets.css
@@ -0,0 +1,61 @@
+@import '../../amp-story/1.0/amp-story-shadow-reset.css';
+
+/*
+  auto append
+  Used when captions are provided from cache.
+*/
+.i-amphtml-amp-story-captions-auto-append {
+  position: absolute !important;
+  z-index: 1 !important;
+  bottom: 5em !important;
+  left: 0 !important;
+  right: 0 !important;
+  margin: 0 3em !important;
+}
+
+/* default */
+
+.amp-story-captions-default .amp-story-captions-cue-wrapper {
+  font-size: calc(2.5 * var(--story-page-vh, 8px)) !important;
+  font-family: 'Roboto', sans-serif !important;
+  margin: 1em 0 !important;
+  display: flex !important;
+  justify-content: center !important;
+  flex-direction: column !important;
+  align-items: center !important;
+  width: 100% !important;
+}
+
+.amp-story-captions-default .amp-story-captions-cue {
+  text-align: center !important;
+  color: #fff !important;
+  border-radius: .94em !important;
+  padding: 0.35em 0.94em !important;
+  background-color: hsla(0, 0%, 10%, 0.6) !important;
+  max-width: calc(var(--story-page-vw) * 92) !important;
+}
+
+.amp-story-captions-default .amp-story-captions-future {
+  color: #fff !important;
+}
+
+/* appear */
+
+.amp-story-captions-appear .amp-story-captions-cue-wrapper  {
+  font-size: var(--story-captions-font-size, calc(2.5 * var(--story-page-vh, 8px))) !important;
+  font-family: var(--story-captions-font-family, 'Roboto'), 'Roboto', sans-serif !important;
+}
+
+.amp-story-captions-appear .amp-story-captions-cue {
+  color: #fff !important;
+  text-shadow: .06em .06em black !important;
+}
+
+.amp-story-captions-appear .amp-story-captions-cue span {
+  transition: opacity .3s cubic-bezier(0.3, 0, 0, 1) !important;
+  opacity: 1 !important;
+}
+
+.amp-story-captions-appear .amp-story-captions-cue span.amp-story-captions-future {
+  opacity: .1 !important;
+}
diff --git a/extensions/amp-story-captions/0.1/amp-story-captions.css b/extensions/amp-story-captions/0.1/amp-story-captions.css
index 80dd20bb863e..daf8b43b0d76 100644
--- a/extensions/amp-story-captions/0.1/amp-story-captions.css
+++ b/extensions/amp-story-captions/0.1/amp-story-captions.css
@@ -1,19 +1,3 @@
-/**
- * Copyright 2021 The AMP HTML Authors. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS-IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 amp-story-captions {
   white-space: pre-wrap;
 }
diff --git a/extensions/amp-story-captions/0.1/amp-story-captions.js b/extensions/amp-story-captions/0.1/amp-story-captions.js
index d479165b4197..0d3c1f542cca 100644
--- a/extensions/amp-story-captions/0.1/amp-story-captions.js
+++ b/extensions/amp-story-captions/0.1/amp-story-captions.js
@@ -1,4 +1,5 @@
-import {applyFillContent, isLayoutSizeDefined} from '#core/dom/layout';
+import * as Preact from '#core/dom/jsx';
+import {Layout_Enum, isLayoutSizeDefined} from '#core/dom/layout';
 import {toArray} from '#core/types/array';
 
 import {listen} from '#utils/event-helper';
@@ -6,6 +7,14 @@ import {listen} from '#utils/event-helper';
 import {TrackRenderer} from './track-renderer';
 
 import {CSS} from '../../../build/amp-story-captions-0.1.css';
+import {CSS as PRESETS_CSS} from '../../../build/amp-story-captions-presets-0.1.css';
+import {createShadowRootWithStyle} from '../../amp-story/1.0/utils';
+
+/**
+ * List of valid preset values.
+ * @const {Array<string>}
+ */
+const presetValues = ['default', 'appear'];
 
 export class AmpStoryCaptions extends AMP.BaseElement {
   /** @param {!AmpElement} element */
@@ -27,14 +36,24 @@ export class AmpStoryCaptions extends AMP.BaseElement {
 
   /** @override */
   buildCallback() {
-    this.container_ = this.element.ownerDocument.createElement('div');
-    this.element.appendChild(this.container_);
-    applyFillContent(this.container_, /* replacedContent */ true);
+    this.container_ = <div />;
+    // Check if style-preset is defined and valid.
+    // If valid it renders in shadow dom with preset syles.
+    const preset = this.element.getAttribute('style-preset');
+    if (presetValues.includes(preset)) {
+      this.container_.classList.add(`amp-story-captions-${preset}`);
+      createShadowRootWithStyle(this.element, this.container_, PRESETS_CSS);
+    } else {
+      this.element.appendChild(this.container_);
+    }
+    if (this.element.hasAttribute('auto-append')) {
+      this.container_.classList.add(`i-amphtml-amp-story-captions-auto-append`);
+    }
   }
 
   /** @override */
   isLayoutSupported(layout) {
-    return isLayoutSizeDefined(layout);
+    return isLayoutSizeDefined(layout) || layout === Layout_Enum.CONTAINER;
   }
 
   /**
@@ -58,7 +77,10 @@ export class AmpStoryCaptions extends AMP.BaseElement {
     );
   }
 
-  /** Creates new track renderers for current textTracks. */
+  /**
+   * Creates new track renderers for current textTracks.
+   * @private
+   */
   updateTracks_() {
     while (this.trackRenderers_.length) {
       this.trackRenderers_.pop().dispose();
diff --git a/extensions/amp-story-captions/0.1/amp-story-captions.md b/extensions/amp-story-captions/0.1/amp-story-captions.md
new file mode 100644
index 000000000000..6c352995e853
--- /dev/null
+++ b/extensions/amp-story-captions/0.1/amp-story-captions.md
@@ -0,0 +1,116 @@
+---
+$category@: presentation
+formats:
+  - stories
+teaser:
+  text: Custom video captions rendering.
+---
+
+# amp-story-captions
+
+The `amp-story-captions` component allows custom video [captions](https://developer.mozilla.org/en-US/docs/Web/Guide/Audio_and_video_delivery/Adding_captions_and_subtitles_to_HTML5_video) rendering.
+
+## Usage
+
+The `captions-id` value on [`amp-video`](https://amp.dev/documentation/components/amp-video/) connects the two components. This must be the same value as the `id` on the `amp-story-captions` component.
+
+```html
+<amp-story-grid-layer>
+  <amp-video captions-id="captions" src="...">
+    <track src="..."></track>
+  </amp-video>
+</amp-story-grid-layer>
+<amp-story-grid-layer>
+  <div>This text appears above the captions</div>
+  <amp-story-captions id="captions" layout="fixed-height" height="300"></amp-story-captions>
+  <div>This text appears below captions</div>
+</amp-story-grid-layer>
+```
+
+### Layout
+
+`container` layout in this component is different than other components because the HTML tree does not determine its size. Instead, the text height of the dynamically loaded captions determine the size. Thus it may cause CLS if the caption content changes while playing the video or audio.
+
+### Styling
+
+The position of the captions is controlled by the position of the `amp-story-captions` element. Properties like `font-size` and `line-height` can be specified using CSS on `amp-story-captions` itself.
+
+To allow more granular control, we expose `amp-story-captions-future` to control the style of future parts of the cue for karaoke-style captions.
+
+```html
+amp-story-captions {
+  color: white;
+  font-size: 24px;
+  padding: 16px;
+}
+
+// Words not spoken yet shown in gray.
+.amp-story-captions-future {
+  color: gray;
+}
+```
+
+### Style presets
+
+The optional `style-preset` attribute applies pre made styles to `amp-story-captions`. The accepted values are `default` and `appear`.
+
+Style presets are not affected by custom CSS. Some customizable options are provided by defining CSS variables on the `amp-story-captions` element.
+
+#### Default
+
+The `default` preset renders the captions to match the Web Stories system UI.
+
+<amp-img src="https://user-images.githubusercontent.com/3860311/165548375-bc08a45a-e028-4f77-a46f-8c9811591529.png" layout="intrinsic" width="300" height="497">
+
+Example:
+
+```html
+<amp-story-grid-layer>
+  <amp-video captions-id="captions" src="...">
+    <track src="..."></track>
+  </amp-video>
+</amp-story-grid-layer>
+<amp-story-grid-layer>
+  <amp-story-captions
+    id="captions"
+    style-preset="default"
+    layout="fixed-height"
+    height="300">
+  </amp-story-captions>
+</amp-story-grid-layer>
+```
+
+#### Appear
+
+The `appear` preset fades in text based on its [timestamp](https://developer.mozilla.org/en-US/docs/Web/API/WebVTT_API#cue_timings).
+
+<amp-img src="https://user-images.githubusercontent.com/3860311/165548414-4e0b0506-c980-4971-9b6f-a514baf24e79.png" layout="intrinsic" width="300" height="507">
+
+`font-size` and `font-family` can optionally be customized in this preset by defining `--story-captions-font-size` and `--story-captions-font-family` CSS variables within the `style` attribute of the `amp-story-captions` component.
+
+Example:
+
+```html
+...
+<!-- imported font in head of document -->
+<link href="https://fonts.googleapis.com/css2?family=Shadows+Into+Light&display=swap" rel="stylesheet">
+...
+<amp-story-grid-layer>
+  <amp-video captions-id="captions" src="...">
+    <track src="..."></track>
+  </amp-video>
+</amp-story-grid-layer>
+<amp-story-grid-layer>
+  <amp-story-captions
+    id="captions"
+    style=preset="appear"
+    style="--story-captions-font-size: .8em; --story-captions-font-family: 'Shadows Into Light'"
+    layout="fixed-height"
+    height="300">
+  </amp-story-captions>
+</amp-story-grid-layer>
+```
+
+## Validation
+
+See validation rules in [amp-story-captions validator](https://github.com/ampproject/amphtml/blob/main/extensions/amp-story-captions/validator-amp-story-captions.protoascii).
diff --git a/extensions/amp-story-captions/0.1/test/test-amp-story-captions.js b/extensions/amp-story-captions/0.1/test/test-amp-story-captions.js
index d5a49391f723..05e85b34dced 100644
--- a/extensions/amp-story-captions/0.1/test/test-amp-story-captions.js
+++ b/extensions/amp-story-captions/0.1/test/test-amp-story-captions.js
@@ -45,12 +45,7 @@ describes.realWin(
       win.document.body.appendChild(element);
     });
 
-    it('should contain be empty when built', async () => {
-      await element.whenBuilt();
-      expect(element.querySelector('div').textContent).to.equal('');
-    });
-
-    it('update on cuechange', async () => {
+    async function setUpVideoWithCaptions() {
       await element.whenBuilt();
       const impl = await element.getImpl();
 
@@ -80,6 +75,16 @@ describes.realWin(
       expect(element.querySelector('div').textContent).to.equal(
         'first caption'
       );
+      return video;
+    }
+
+    it('should be empty when built', async () => {
+      await element.whenBuilt();
+      expect(element.querySelector('div').textContent).to.equal('');
+    });
+
+    it('update on cuechange', async () => {
+      const video = await setUpVideoWithCaptions();
 
       video.currentTime = 0.5;
       await new Promise((resolve) => {
@@ -89,5 +94,17 @@ describes.realWin(
         'second caption'
       );
     });
+
+    it('should apply preset when attribute is present and value is valid', async () => {
+      element.setAttribute('style-preset', 'default');
+      await setUpVideoWithCaptions();
+      expect(element.querySelector('.amp-story-captions-default')).to.exist;
+    });
+
+    it('should not apply preset when attribute value is invalid', async () => {
+      element.setAttribute('style-preset', 'dflt');
+      await setUpVideoWithCaptions();
+      expect(element.querySelector('.amp-story-captions-default')).to.be.null;
+    });
   }
 );
diff --git a/extensions/amp-story-captions/0.1/test/validator-amp-story-captions.html b/extensions/amp-story-captions/0.1/test/validator-amp-story-captions.html
index f1bc765b7a19..c9ba170f80de 100644
--- a/extensions/amp-story-captions/0.1/test/validator-amp-story-captions.html
+++ b/extensions/amp-story-captions/0.1/test/validator-amp-story-captions.html
@@ -23,7 +23,7 @@
         <amp-video src="https://example.com/video.mp4" poster="https://example.com/poster.png" width="1080" height="1920" layout="responsive" crossorigin autoplay captions-id="captions">
           <track kind="subtitles" src="https://example.com/captions.vtt" srclang="en" default>
         </amp-video>
-        <amp-story-captions id="captions" layout="fixed-height" height="300"></amp-story-captions>
+        <amp-story-captions id="captions" layout="fixed-height" height="300" style-preset="default"></amp-story-captions>
       </amp-story-grid-layer>
     </amp-story-page>
   </amp-story>
diff --git a/extensions/amp-story-captions/0.1/test/validator-amp-story-captions.out b/extensions/amp-story-captions/0.1/test/validator-amp-story-captions.out
index c08cb368b513..44154b53a3e6 100644
--- a/extensions/amp-story-captions/0.1/test/validator-amp-story-captions.out
+++ b/extensions/amp-story-captions/0.1/test/validator-amp-story-captions.out
@@ -24,7 +24,7 @@ PASS
 |          <amp-video src="https://example.com/video.mp4" poster="https://example.com/poster.png" width="1080" height="1920" layout="responsive" crossorigin autoplay captions-id="captions">
 |            <track kind="subtitles" src="https://example.com/captions.vtt" srclang="en" default>
 |          </amp-video>
-|          <amp-story-captions id="captions" layout="fixed-height" height="300"></amp-story-captions>
+|          <amp-story-captions id="captions" layout="fixed-height" height="300" style-preset="default"></amp-story-captions>
 |        </amp-story-grid-layer>
 |      </amp-story-page>
 |    </amp-story>
diff --git a/extensions/amp-story-captions/0.1/track-renderer.js b/extensions/amp-story-captions/0.1/track-renderer.js
index a65b6ff46256..7441fddb63c6 100644
--- a/extensions/amp-story-captions/0.1/track-renderer.js
+++ b/extensions/amp-story-captions/0.1/track-renderer.js
@@ -1,5 +1,4 @@
 import {removeChildren, removeElement} from '#core/dom';
-import {setStyles} from '#core/dom/style';
 import {toArray} from '#core/types/array';
 
 import {listen} from '#utils/event-helper';
@@ -42,6 +41,7 @@ export class TrackRenderer {
     /** @private {!Element} */
     this.element_ = container.ownerDocument.createElement('div');
     container.appendChild(this.element_);
+    this.element_.classList.add('amp-story-captions-cue-wrapper');
 
     /** @private {!Array<number>} */
     this.cueTimestamps_ = [];
@@ -75,13 +75,7 @@ export class TrackRenderer {
     this.cueTimestamps_.length = 0;
     toArray(this.track_.activeCues).forEach((cue) => {
       const cueElement = this.element_.ownerDocument.createElement('div');
-      setStyles(cueElement, {
-        'position': 'absolute',
-        'bottom': 0,
-        'left': 0,
-        'right': 0,
-      });
-
+      cueElement.classList.add('amp-story-captions-cue');
       const html = cue.getCueAsHTML();
       let section = this.element_.ownerDocument.createElement('span');
       cueElement.appendChild(section);
diff --git a/extensions/amp-story-captions/validator-amp-story-captions.protoascii b/extensions/amp-story-captions/validator-amp-story-captions.protoascii
index 93e3992f2f27..579a2a35c7a8 100644
--- a/extensions/amp-story-captions/validator-amp-story-captions.protoascii
+++ b/extensions/amp-story-captions/validator-amp-story-captions.protoascii
@@ -32,6 +32,7 @@ tags: {  # <amp-story-captions>
   spec_url: "https://amp.dev/documentation/components/amp-story-captions"
   mandatory_ancestor: "AMP-STORY"
   amp_layout: {
+    supported_layouts: CONTAINER
     supported_layouts: FILL
     supported_layouts: FIXED
     supported_layouts: FIXED_HEIGHT
@@ -43,4 +44,9 @@ tags: {  # <amp-story-captions>
   child_tags: {
     mandatory_num_child_tags: 0
   }
+  attrs: {
+    name: "style-preset"
+    value: "default"
+    value: "appear"
+  }
 }
diff --git a/extensions/amp-story-dev-tools/0.1/amp-story-dev-tools-tab-debug.js b/extensions/amp-story-dev-tools/0.1/amp-story-dev-tools-tab-debug.js
index e871690420bb..fa89d5f93607 100644
--- a/extensions/amp-story-dev-tools/0.1/amp-story-dev-tools-tab-debug.js
+++ b/extensions/amp-story-dev-tools/0.1/amp-story-dev-tools-tab-debug.js
@@ -5,7 +5,7 @@ import {Services} from '#service';
 
 import {userAssert} from '#utils/log';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {loadScript} from '../../../src/validator-integration';
 
 /**
@@ -68,7 +68,7 @@ const buildLogMessageTemplate = (element) => {
 };
 
 export class AmpStoryDevToolsTabDebug extends AMP.BaseElement {
-  /** @override @nocollapse */
+  /** @override  */
   static prerenderAllowed() {
     return false;
   }
diff --git a/extensions/amp-story-dev-tools/0.1/amp-story-dev-tools-tab-preview.css b/extensions/amp-story-dev-tools/0.1/amp-story-dev-tools-tab-preview.css
index bb74d195396e..d92ffb5e893f 100644
--- a/extensions/amp-story-dev-tools/0.1/amp-story-dev-tools-tab-preview.css
+++ b/extensions/amp-story-dev-tools/0.1/amp-story-dev-tools-tab-preview.css
@@ -9,6 +9,8 @@
 .i-amphtml-story-dev-tools-devices-container {
   width: 100% !important;
   height: 100% !important;
+  display: flex !important;
+  align-items: center !important;
   position: relative;
 }
 
@@ -20,8 +22,6 @@
   position: absolute !important;
   margin: auto !important;
   height: fit-content !important;
-  top: 0 !important;
-  bottom: var(--i-amphtml-story-dev-tools-vertical-spacing) !important;
   padding: 10px 8px !important;
   transition: transform var(--i-amphtml-story-dev-tools-material-easing-standard) 0.15s !important;
   /* Fades in after transition:transform ends (above) so devices are in place before the fade-in */
diff --git a/extensions/amp-story-dev-tools/0.1/amp-story-dev-tools-tab-preview.js b/extensions/amp-story-dev-tools/0.1/amp-story-dev-tools-tab-preview.js
index 8922546ec62e..4984be58ad24 100644
--- a/extensions/amp-story-dev-tools/0.1/amp-story-dev-tools-tab-preview.js
+++ b/extensions/amp-story-dev-tools/0.1/amp-story-dev-tools-tab-preview.js
@@ -1,3 +1,4 @@
+import {toggleAttribute} from '#core/dom';
 import {escapeCssSelectorIdent} from '#core/dom/css-selectors';
 import {observeContentSize} from '#core/dom/layout/size-observer';
 import {closest} from '#core/dom/query';
@@ -828,7 +829,7 @@ export class AmpStoryDevToolsTabPreview extends AMP.BaseElement {
       const isEnabled =
         (currentDeviceSpaces + spaces <= MAX_DEVICE_SPACES) |
         !chipEl.hasAttribute('inactive');
-      chipEl.toggleAttribute('disabled', !isEnabled);
+      toggleAttribute(chipEl, 'disabled', !isEnabled);
     });
   }
 }
diff --git a/extensions/amp-story-dev-tools/0.1/amp-story-dev-tools.js b/extensions/amp-story-dev-tools/0.1/amp-story-dev-tools.js
index 8471e102431a..5b77a98b67ae 100644
--- a/extensions/amp-story-dev-tools/0.1/amp-story-dev-tools.js
+++ b/extensions/amp-story-dev-tools/0.1/amp-story-dev-tools.js
@@ -1,3 +1,4 @@
+import {toggleAttribute} from '#core/dom';
 import {htmlFor} from '#core/dom/static-template';
 import {toggle} from '#core/dom/style';
 import {parseQueryString} from '#core/types/string/url';
@@ -91,7 +92,7 @@ export class AmpStoryDevTools extends AMP.BaseElement {
   constructor(element) {
     super(element);
 
-    /** @private {!Object<string, string>} */
+    /** @private {!{[key: string]: string}} */
     this.hashParams_ = parseQueryString(this.win.location.hash);
 
     this.win.document.title = `Story Dev-Tools (${this.win.document.title})`;
@@ -110,7 +111,7 @@ export class AmpStoryDevTools extends AMP.BaseElement {
           )
         : null) || DevToolsTab.PREVIEW;
 
-    /** @private {!Object<string, !Element>} maps tabs to contents */
+    /** @private {!{[key: string]: !Element}} maps tabs to contents */
     this.tabContents_ = {};
 
     /** @private {!Array<!Element>} */
@@ -215,12 +216,13 @@ export class AmpStoryDevTools extends AMP.BaseElement {
     this.mutateElement(() => {
       toggle(this.tabContents_[this.currentTab_], false);
       toggle(this.tabContents_[tab], true);
-      this.tabSelectors_.forEach((tabSelector) => {
-        return tabSelector.toggleAttribute(
+      this.tabSelectors_.forEach((tabSelector) =>
+        toggleAttribute(
+          tabSelector,
           'active',
           tabSelector.getAttribute('data-tab') === tab
-        );
-      });
+        )
+      );
       this.currentTab_ = tab;
     });
   }
diff --git a/extensions/amp-story-dev-tools/0.1/utils.js b/extensions/amp-story-dev-tools/0.1/utils.js
index 050f2675a54b..374ab12ff019 100644
--- a/extensions/amp-story-dev-tools/0.1/utils.js
+++ b/extensions/amp-story-dev-tools/0.1/utils.js
@@ -3,7 +3,7 @@ import {parseQueryString} from '#core/types/string/url';
 /**
  * Updates the hashString with the dictionary<string, string> passed in
  * @public
- * @param {!Object<string, string>} updates
+ * @param {!{[key: string]: string}} updates
  * @param {!Window} win
  */
 export function updateHash(updates, win) {
diff --git a/extensions/amp-story-education/0.1/amp-story-education.css b/extensions/amp-story-education/0.1/amp-story-education.css
index 2992a26d42dc..175274b17470 100644
--- a/extensions/amp-story-education/0.1/amp-story-education.css
+++ b/extensions/amp-story-education/0.1/amp-story-education.css
@@ -1,8 +1,15 @@
 
 
-@import url('https://fonts.googleapis.com/css?family=Open+Sans:400,600,700');
+@import url('https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;600;700&display=swap');
 @import '../../amp-story/1.0/amp-story-shadow-reset.css';
 
+/* Using https://www.industrialempathy.com/perfect-ish-font-fallback/?font=Open%20Sans */
+@font-face {
+  font-family: "Open Sans-fallback";
+  size-adjust: 105.44%;
+  src: local("Arial");
+}
+
 amp-story-education {
   position: fixed !important;
   height: 100% !important;
@@ -20,7 +27,8 @@ amp-story-education {
   width: 100% !important;
   background: rgba(0, 0, 0, 0.8) !important;
   color: #FFF !important;
-  font-family: 'Open Sans', sans-serif !important;
+  font-family: 'Open Sans', 'Open Sans-fallback', sans-serif !important;
+  line-height: 1.5em !important;
   font-weight: 400 !important;
   pointer-events: auto !important;
   opacity: 1 !important;
diff --git a/extensions/amp-story-education/0.1/amp-story-education.js b/extensions/amp-story-education/0.1/amp-story-education.js
index b924f92ff8bc..4a5fda88e805 100644
--- a/extensions/amp-story-education/0.1/amp-story-education.js
+++ b/extensions/amp-story-education/0.1/amp-story-education.js
@@ -1,21 +1,23 @@
 import {removeChildren} from '#core/dom';
-import {Layout} from '#core/dom/layout';
+import {Layout_Enum} from '#core/dom/layout';
 import {setModalAsClosed, setModalAsOpen} from '#core/dom/modal';
 import {htmlFor} from '#core/dom/static-template';
 import {toggle} from '#core/dom/style';
-import {dict} from '#core/types/object';
 
 import {Services} from '#service';
-import {LocalizedStringId} from '#service/localization/strings';
+import {LocalizedStringId_Enum} from '#service/localization/strings';
 
 import {dev} from '#utils/log';
 
 import {CSS} from '../../../build/amp-story-education-0.1.css';
-import {getLocalizationService} from '../../amp-story/1.0/amp-story-localization-service';
+import {
+  getLocalizationService,
+  localizeTemplate,
+} from '../../amp-story/1.0/amp-story-localization-service';
 import {
   Action,
   StateProperty,
-  UIType,
+  UIType_Enum,
 } from '../../amp-story/1.0/amp-story-store-service';
 import {createShadowRootWithStyle} from '../../amp-story/1.0/utils';
 
@@ -63,9 +65,6 @@ export class AmpStoryEducation extends AMP.BaseElement {
     /** @private {!Element} */
     this.containerEl_ = this.win.document.createElement('div');
 
-    /** @private {?../../../src/service/localization.LocalizationService} */
-    this.localizationService_ = null;
-
     /** @private {?boolean} */
     this.storyPausedStateToRestore_ = null;
 
@@ -97,7 +96,7 @@ export class AmpStoryEducation extends AMP.BaseElement {
 
     this.viewer_ = Services.viewerForDoc(this.element);
     const isMobileUI =
-      this.storeService_.get(StateProperty.UI_STATE) === UIType.MOBILE;
+      this.storeService_.get(StateProperty.UI_STATE) === UIType_Enum.MOBILE;
     if (this.viewer_.isEmbedded() && isMobileUI) {
       const screen = this.viewer_.hasCapability('swipe')
         ? Screen.ONBOARDING_NAVIGATION_TAP_AND_SWIPE
@@ -108,7 +107,7 @@ export class AmpStoryEducation extends AMP.BaseElement {
 
   /** @override */
   isLayoutSupported(layout) {
-    return layout === Layout.CONTAINER;
+    return layout === Layout_Enum.CONTAINER;
   }
 
   /**
@@ -204,21 +203,23 @@ export class AmpStoryEducation extends AMP.BaseElement {
         el = buildNavigationEl(this.element);
         el.setAttribute('step', 'tap');
         const progressStringId = this.viewer_.hasCapability('swipe')
-          ? LocalizedStringId.AMP_STORY_EDUCATION_NAVIGATION_TAP_PROGRESS
-          : LocalizedStringId.AMP_STORY_EDUCATION_NAVIGATION_TAP_PROGRESS_SINGLE;
+          ? LocalizedStringId_Enum.AMP_STORY_EDUCATION_NAVIGATION_TAP_PROGRESS
+          : LocalizedStringId_Enum.AMP_STORY_EDUCATION_NAVIGATION_TAP_PROGRESS_SINGLE;
+
         el.querySelector(
           '.i-amphtml-story-education-navigation-progress'
-        ).textContent =
-          this.localizationService_.getLocalizedString(progressStringId);
+        ).setAttribute('i-amphtml-i18n-text-content', progressStringId);
         el.querySelector(
           '.i-amphtml-story-education-navigation-instructions'
-        ).textContent = this.localizationService_.getLocalizedString(
-          LocalizedStringId.AMP_STORY_EDUCATION_NAVIGATION_TAP_INSTRUCTIONS
+        ).setAttribute(
+          'i-amphtml-i18n-text-content',
+          LocalizedStringId_Enum.AMP_STORY_EDUCATION_NAVIGATION_TAP_INSTRUCTIONS
         );
         el.querySelector(
           '.i-amphtml-story-education-navigation-button'
-        ).textContent = this.localizationService_.getLocalizedString(
-          LocalizedStringId.AMP_STORY_EDUCATION_NAVIGATION_TAP_DISMISS
+        ).setAttribute(
+          'i-amphtml-i18n-text-content',
+          LocalizedStringId_Enum.AMP_STORY_EDUCATION_NAVIGATION_TAP_DISMISS
         );
         this.showTemplate_(el);
         break;
@@ -227,18 +228,21 @@ export class AmpStoryEducation extends AMP.BaseElement {
         el.setAttribute('step', 'swipe');
         el.querySelector(
           '.i-amphtml-story-education-navigation-progress'
-        ).textContent = this.localizationService_.getLocalizedString(
-          LocalizedStringId.AMP_STORY_EDUCATION_NAVIGATION_SWIPE_PROGRESS
+        ).setAttribute(
+          'i-amphtml-i18n-text-content',
+          LocalizedStringId_Enum.AMP_STORY_EDUCATION_NAVIGATION_SWIPE_PROGRESS
         );
         el.querySelector(
           '.i-amphtml-story-education-navigation-instructions'
-        ).textContent = this.localizationService_.getLocalizedString(
-          LocalizedStringId.AMP_STORY_EDUCATION_NAVIGATION_SWIPE_INSTRUCTIONS
+        ).setAttribute(
+          'i-amphtml-i18n-text-content',
+          LocalizedStringId_Enum.AMP_STORY_EDUCATION_NAVIGATION_SWIPE_INSTRUCTIONS
         );
         el.querySelector(
           '.i-amphtml-story-education-navigation-button'
-        ).textContent = this.localizationService_.getLocalizedString(
-          LocalizedStringId.AMP_STORY_EDUCATION_NAVIGATION_SWIPE_DISMISS
+        ).setAttribute(
+          'i-amphtml-i18n-text-content',
+          LocalizedStringId_Enum.AMP_STORY_EDUCATION_NAVIGATION_SWIPE_DISMISS
         );
         this.showTemplate_(el);
         break;
@@ -262,6 +266,8 @@ export class AmpStoryEducation extends AMP.BaseElement {
     this.storeService_.dispatch(Action.TOGGLE_PAUSED, true);
     this.storeService_.dispatch(Action.TOGGLE_EDUCATION, true);
 
+    localizeTemplate(template, this.containerEl_);
+
     this.mutateElement(() => {
       removeChildren(this.containerEl_);
       toggle(this.element, true);
@@ -289,10 +295,9 @@ export class AmpStoryEducation extends AMP.BaseElement {
         // TODO(gmajoulet): update this method to support showing multiple
         // screens, if/when needed.
         this.viewer_
-          .sendMessageAwaitResponse(
-            'canShowScreens',
-            dict({'screens': [{'screen': screen}]})
-          )
+          .sendMessageAwaitResponse('canShowScreens', {
+            'screens': [{'screen': screen}],
+          })
           .then((response) => {
             const shouldShow = !!(
               response &&
diff --git a/extensions/amp-story-interactive/0.1/amp-story-interactive-abstract.js b/extensions/amp-story-interactive/0.1/amp-story-interactive-abstract.js
index ca676c000ea0..bd042f0aeb14 100644
--- a/extensions/amp-story-interactive/0.1/amp-story-interactive-abstract.js
+++ b/extensions/amp-story-interactive/0.1/amp-story-interactive-abstract.js
@@ -1,37 +1,41 @@
-import {
-  ANALYTICS_TAG_NAME,
-  StoryAnalyticsEvent,
-} from '../../amp-story/1.0/story-analytics';
+import {closest} from '#core/dom/query';
+import {assertDoesNotContainDisplay, setImportantStyles} from '#core/dom/style';
 import {clamp} from '#core/math';
-import {
-  Action,
-  StateProperty,
-} from '../../amp-story/1.0/amp-story-store-service';
-import {AnalyticsVariable} from '../../amp-story/1.0/variable-service';
-import {CSS} from '../../../build/amp-story-interactive-0.1.css';
-import {Services} from '#service';
-import {
-  addParamsToUrl,
-  appendPathToUrl,
-  assertAbsoluteHttpOrHttpsUrl,
-} from '../../../src/url';
+import {toArray} from '#core/types/array';
 import {base64UrlEncodeFromString} from '#core/types/string/base64';
-import {assertDoesNotContainDisplay, setImportantStyles} from '#core/dom/style';
+
+import {isExperimentOn} from '#experiments/';
+
+import {Services} from '#service';
+
+import {dev, devAssert} from '#utils/log';
+
+import {executeRequest} from 'extensions/amp-story/1.0/request-utils';
+import {installStylesForDoc} from 'src/style-installer';
+
+import {emojiConfetti} from './interactive-confetti';
 import {
   buildInteractiveDisclaimer,
   buildInteractiveDisclaimerIcon,
 } from './interactive-disclaimer';
-import {closest} from '#core/dom/query';
+import {deduplicateInteractiveIds} from './utils';
+
+import {CSS as hostCss} from '../../../build/amp-story-interactive-host-0.1.css';
+import {CSS as shadowCss} from '../../../build/amp-story-interactive-shadow-0.1.css';
+import {addParamsToUrl, appendPathToUrl} from '../../../src/url';
+import {
+  Action,
+  StateProperty,
+} from '../../amp-story/1.0/amp-story-store-service';
+import {
+  ANALYTICS_TAG_NAME,
+  StoryAnalyticsEvent,
+} from '../../amp-story/1.0/story-analytics';
 import {
   createShadowRootWithStyle,
   maybeMakeProxyUrl,
 } from '../../amp-story/1.0/utils';
-import {deduplicateInteractiveIds} from './utils';
-import {dev, devAssert} from '#utils/log';
-import {dict} from '#core/types/object';
-import {emojiConfetti} from './interactive-confetti';
-import {toArray} from '#core/types/array';
-import {isExperimentOn} from '#experiments/';
+import {AnalyticsVariable} from '../../amp-story/1.0/variable-service';
 
 /** @const {string} */
 const TAG = 'amp-story-interactive';
@@ -174,9 +178,6 @@ export class AmpStoryInteractive extends AMP.BaseElement {
     /** @public {../../../src/service/localizationService} */
     this.localizationService = null;
 
-    /** @protected {?../../amp-story/1.0/amp-story-request-service.AmpStoryRequestService} */
-    this.requestService_ = null;
-
     /** @protected {?../../amp-story/1.0/amp-story-store-service.AmpStoryStoreService} */
     this.storeService_ = null;
 
@@ -185,6 +186,20 @@ export class AmpStoryInteractive extends AMP.BaseElement {
 
     /** @protected {?../../amp-story/1.0/variable-service.AmpStoryVariableService} */
     this.variableService_ = null;
+
+    // We install host CSS directly instead of during `registerElement` since
+    // components with different names extend from this class. As such, we'd
+    // unnnecessarily install the same styles once for each type of inheriting
+    // component present on the page.
+    // Instead, we ensure that we only install once by preserving the extension
+    // name "amp-story-interactive".
+    installStylesForDoc(
+      this.getAmpDoc(),
+      hostCss,
+      /* whenReady */ null,
+      /* isRuntimeCss */ false,
+      /* ext */ TAG
+    );
   }
 
   /**
@@ -240,7 +255,6 @@ export class AmpStoryInteractive extends AMP.BaseElement {
 
   /** @override */
   buildCallback(concreteCSS = '') {
-    this.loadFonts_();
     this.options_ = this.parseOptions_();
     this.element.classList.add('i-amphtml-story-interactive-component');
     this.adjustGridLayer_();
@@ -256,9 +270,6 @@ export class AmpStoryInteractive extends AMP.BaseElement {
         this.storeService_ = service;
         this.updateStoryStoreState_(null);
       }),
-      Services.storyRequestServiceForOrNull(this.win).then((service) => {
-        this.requestService_ = service;
-      }),
       Services.storyAnalyticsServiceForOrNull(this.win).then((service) => {
         this.analyticsService_ = service;
       }),
@@ -278,7 +289,7 @@ export class AmpStoryInteractive extends AMP.BaseElement {
       createShadowRootWithStyle(
         this.element,
         dev().assertElement(this.rootEl_),
-        CSS + concreteCSS
+        shadowCss + concreteCSS
       );
       return Promise.resolve();
     });
@@ -381,6 +392,7 @@ export class AmpStoryInteractive extends AMP.BaseElement {
 
   /** @override */
   layoutCallback() {
+    this.loadFonts_();
     this.initializeListeners_();
     return (this.backendDataPromise_ = this.element.hasAttribute('endpoint')
       ? this.retrieveInteractiveData_()
@@ -694,16 +706,16 @@ export class AmpStoryInteractive extends AMP.BaseElement {
    */
   executeInteractiveRequest_(method, optionSelected = undefined) {
     let url = this.element.getAttribute('endpoint');
-    if (!assertAbsoluteHttpOrHttpsUrl(url)) {
+    if (!Services.urlForDoc(this.element).assertAbsoluteHttpOrHttpsUrl(url)) {
       return Promise.reject(ENDPOINT_INVALID_ERROR);
     }
 
     return this.getClientId_().then((clientId) => {
       const requestOptions = {'method': method};
-      const requestParams = dict({
+      const requestParams = {
         'type': this.interactiveType_,
         'client': clientId,
-      });
+      };
       url = appendPathToUrl(
         this.urlService_.parse(url),
         this.getInteractiveId_()
@@ -714,9 +726,9 @@ export class AmpStoryInteractive extends AMP.BaseElement {
         url = appendPathToUrl(this.urlService_.parse(url), ':vote');
       }
       url = addParamsToUrl(url, requestParams);
-      return this.requestService_
-        .executeRequest(url, requestOptions)
-        .catch((err) => dev().error(TAG, err));
+      return executeRequest(this.element, url, requestOptions).catch((err) =>
+        dev().error(TAG, err)
+      );
     });
   }
 
@@ -816,7 +828,7 @@ export class AmpStoryInteractive extends AMP.BaseElement {
    * @param {boolean} toggle
    */
   toggleTabbableElements_(toggle) {
-    this.rootEl_.querySelectorAll('button, a').forEach((el) => {
+    this.rootEl_.querySelectorAll('button, a, input').forEach((el) => {
       // Disable tabbing through options if already selected.
       if (
         el.classList.contains('i-amphtml-story-interactive-option') &&
diff --git a/extensions/amp-story-interactive/0.1/amp-story-interactive-binary-poll.js b/extensions/amp-story-interactive/0.1/amp-story-interactive-binary-poll.js
index aee074538cec..c195993320df 100644
--- a/extensions/amp-story-interactive/0.1/amp-story-interactive-binary-poll.js
+++ b/extensions/amp-story-interactive/0.1/amp-story-interactive-binary-poll.js
@@ -1,12 +1,15 @@
+import {htmlFor} from '#core/dom/static-template';
+import {computedStyle, setStyle} from '#core/dom/style';
+import {toArray} from '#core/types/array';
+
+import {dev} from '#utils/log';
+
 import {
   AmpStoryInteractive,
   InteractiveType,
 } from './amp-story-interactive-abstract';
+
 import {CSS} from '../../../build/amp-story-interactive-binary-poll-0.1.css';
-import {computedStyle, setStyle} from '#core/dom/style';
-import {dev} from '#utils/log';
-import {htmlFor} from '#core/dom/static-template';
-import {toArray} from '#core/types/array';
 
 /** @const @enum {number} */
 export const FontSize = {
diff --git a/extensions/amp-story-interactive/0.1/amp-story-interactive-host.css b/extensions/amp-story-interactive/0.1/amp-story-interactive-host.css
new file mode 100644
index 000000000000..2050f58cf24f
--- /dev/null
+++ b/extensions/amp-story-interactive/0.1/amp-story-interactive-host.css
@@ -0,0 +1,152 @@
+.i-amphtml-story-interactive-component {
+  align-self: center;
+  height: auto !important;
+  pointer-events: none !important;
+  min-width: 14em !important; /* 14em = 224px = the width of a narrow phone (320px) - tap-safe margins (48px * 2) */
+  max-width: 25em !important;
+  font-size: calc(
+    var(--story-page-vmin) * 3
+  ); /* override with ems for pixel perfect layout */
+  width: 100%;
+  /* Properties overrideable by user */
+  --interactive-accent-color: #005af0;
+  --interactive-prompt-background: var(--interactive-accent-color);
+  --interactive-prompt-text-color: white;
+  --interactive-prompt-alignment: initial;
+  /* Shared properties by interactives (overrideable by themes) */
+  --i-amphtml-interactive-option-accent-color: var(
+    --interactive-accent-color
+  ) !important;
+  --i-amphtml-interactive-option-background-color: white !important;
+  --i-amphtml-interactive-options-chip-background-color: var(
+    --i-amphtml-interactive-option-background-color
+  ) !important;
+  --i-amphtml-interactive-option-text-color: #55595e !important;
+  --i-amphtml-interactive-theme-border: rgba(85, 89, 94, 0.2) !important;
+  --i-amphtml-interactive-theme-shading: rgba(85, 89, 94, 0.2) !important;
+  --i-amphtml-interactive-theme-shading-base: rgb(222, 222, 225) !important;
+  --i-amphtml-interactive-theme-shading-flash: rgba(85, 89, 94, 0.5) !important;
+  --i-amphtml-interactive-chip-radius: 2em !important;
+  --i-amphtml-interactive-chip-shadow: 0px 0px 0px transparent !important;
+  --i-amphtml-interactive-chip-shadow-inset: inset 0px 0px 0px transparent !important;
+  --i-amphtml-interactive-answer-choice-border: var(
+    --interactive-accent-color
+  ) !important;
+  --i-amphtml-interactive-answer-choice-background: white !important;
+  --i-amphtml-interactive-prompt-text-size: 1.375em !important;
+  --i-amphtml-interactive-prompt-line-height: 1.3em !important;
+  --i-amphtml-interactive-strong-text-color: black !important;
+  --i-amphtml-interactive-animation-time: 0.3s !important;
+  --i-amphtml-interactive-ease-out-curve: cubic-bezier(0.3, 0, 0, 1) !important;
+  --i-amphtml-interactive-animation-delay: 0s !important;
+  --i-amphtml-interactive-component-shadow: 0px 4px 12px rgba(60, 64, 67, 0.08),
+    0px 2px 4px rgba(60, 64, 67, 0.12);
+  --i-amphtml-interactive-prompt-clamp: 4 !important;
+  --i-amphtml-interactive-results-prompt-margin: 20px !important;
+  --i-amphtml-interactive-placeholder-background: rgba(
+    32,
+    33,
+    36,
+    0.2
+  ) !important;
+  --i-amphtml-story-interactive-img-quiz-answer-filter: none;
+  --i-amphtml-interactive-img-border: 0 0 0 transparent !important;
+}
+
+.i-amphtml-story-interactive-component[theme='dark'] {
+  --i-amphtml-interactive-option-text-color: #a7adb4 !important;
+  --i-amphtml-interactive-option-background-color: #202124 !important;
+  --i-amphtml-interactive-theme-border: rgba(167, 173, 180, 0.2) !important;
+  --i-amphtml-interactive-theme-shading: rgba(167, 173, 180, 0.2) !important;
+  --i-amphtml-interactive-theme-shading-base: rgb(60, 61, 63) !important;
+  --i-amphtml-interactive-theme-shading-flash: rgba(
+    167,
+    173,
+    180,
+    0.5
+  ) !important;
+  --i-amphtml-interactive-strong-text-color: white !important;
+  --i-amphtml-interactive-placeholder-background: rgba(
+    255,
+    255,
+    255,
+    0.2
+  ) !important;
+  --i-amphtml-story-interactive-img-quiz-answer-filter: invert(100%);
+}
+
+.i-amphtml-story-interactive-component[chip-style='shadow'] {
+  --i-amphtml-interactive-chip-shadow: 0px 2px 8px rgba(60, 60, 60, 0.2) !important;
+  --i-amphtml-interactive-chip-shadow-inset: inset 4px 4px 8px
+    rgba(0, 0, 0, 0.2) !important;
+  --i-amphtml-interactive-theme-border: rgba(0, 0, 0, 0) !important;
+}
+
+.i-amphtml-story-interactive-component:not(amp-story-interactive-results)[chip-style='transparent'] {
+  --i-amphtml-interactive-options-chip-background-color: transparent !important;
+  --interactive-prompt-background: transparent !important;
+  --interactive-prompt-alignment: center;
+  --i-amphtml-interactive-chip-shadow: 0px 2px 8px rgba(60, 60, 60, 0.2) !important;
+  --i-amphtml-interactive-chip-shadow-inset: inset 4px 4px 8px
+    rgba(0, 0, 0, 0.2) !important;
+  --i-amphtml-interactive-theme-border: rgba(0, 0, 0, 0) !important;
+  --i-amphtml-interactive-component-shadow: none !important;
+  --i-amphtml-interactive-img-border: 0 0 0 0.25em
+    var(--i-amphtml-interactive-option-background-color) !important;
+}
+
+.i-amphtml-story-interactive-component[chip-style='shadow'][theme='dark'] {
+  --i-amphtml-interactive-chip-shadow: 0px 2px 8px 0px rgba(0, 0, 0, 0.6) !important;
+  --i-amphtml-interactive-chip-shadow-inset: inset 4px 4px 8px
+    rgba(0, 0, 0, 0.4) !important;
+}
+
+.i-amphtml-story-interactive-component[prompt-size='large'] {
+  --i-amphtml-interactive-prompt-text-size: 1.75em !important;
+  --i-amphtml-interactive-prompt-clamp: 3 !important;
+}
+
+.i-amphtml-story-interactive-component[prompt-size='small'] {
+  --i-amphtml-interactive-prompt-text-size: 1.125em !important;
+}
+
+.i-amphtml-story-interactive-component:not([prompt-text]) {
+  --interactive-prompt-background: transparent !important;
+}
+
+amp-story-interactive-binary-poll.i-amphtml-story-interactive-component,
+amp-story-interactive-results.i-amphtml-story-interactive-component,
+amp-story-interactive-img-poll.i-amphtml-story-interactive-component,
+amp-story-interactive-img-quiz.i-amphtml-story-interactive-component,
+amp-story-interactive-results-detailed.i-amphtml-story-interactive-component {
+  max-width: 18em !important;
+}
+
+amp-story-interactive-img-poll.i-amphtml-story-interactive-component,
+amp-story-interactive-img-quiz.i-amphtml-story-interactive-component {
+  --interactive-prompt-alignment: center;
+}
+
+amp-story-interactive-binary-poll[theme='dark'],
+amp-story-interactive-poll[theme='dark'] {
+  --i-amphtml-interactive-option-accent-color: white !important;
+}
+
+amp-story-interactive-results:not([chip-style='transparent']) {
+  --interactive-prompt-text-color: var(
+    --i-amphtml-interactive-strong-text-color
+  );
+}
+
+amp-story-interactive-results[chip-style='transparent'] {
+  --i-amphtml-interactive-option-text-color: black !important;
+  --i-amphtml-interactive-options-chip-background-color: transparent !important;
+  --interactive-prompt-background: transparent;
+  --i-amphtml-interactive-component-shadow: none !important;
+  --interactive-prompt-text-color: black;
+  --i-amphtml-interactive-results-prompt-margin: 0px !important;
+}
+amp-story-interactive-results[theme='dark'][chip-style='transparent'] {
+  --i-amphtml-interactive-option-text-color: white !important;
+  --interactive-prompt-text-color: white;
+}
diff --git a/extensions/amp-story-interactive/0.1/amp-story-interactive-img-poll.js b/extensions/amp-story-interactive/0.1/amp-story-interactive-img-poll.js
index b94a5021432f..92da02830042 100644
--- a/extensions/amp-story-interactive/0.1/amp-story-interactive-img-poll.js
+++ b/extensions/amp-story-interactive/0.1/amp-story-interactive-img-poll.js
@@ -1,12 +1,14 @@
+import {htmlFor} from '#core/dom/static-template';
+import {setImportantStyles} from '#core/dom/style';
+
 import {
   AmpStoryInteractive,
   InteractiveType,
 } from './amp-story-interactive-abstract';
-import {CSS} from '../../../build/amp-story-interactive-img-poll-0.1.css';
-import {CSS as ImgCSS} from '../../../build/amp-story-interactive-img-0.1.css';
 import {buildImgTemplate} from './utils';
-import {htmlFor} from '#core/dom/static-template';
-import {setImportantStyles} from '#core/dom/style';
+
+import {CSS as ImgCSS} from '../../../build/amp-story-interactive-img-0.1.css';
+import {CSS} from '../../../build/amp-story-interactive-img-poll-0.1.css';
 
 /**
  * Generates the template for each option.
diff --git a/extensions/amp-story-interactive/0.1/amp-story-interactive-img-quiz.js b/extensions/amp-story-interactive/0.1/amp-story-interactive-img-quiz.js
index 1d9aa9889959..1a5902e85e5e 100644
--- a/extensions/amp-story-interactive/0.1/amp-story-interactive-img-quiz.js
+++ b/extensions/amp-story-interactive/0.1/amp-story-interactive-img-quiz.js
@@ -1,19 +1,26 @@
+import objstr from 'obj-str';
+
+import {htmlFor} from '#core/dom/static-template';
+import {computedStyle, setImportantStyles} from '#core/dom/style';
+
+import {LocalizedStringId_Enum} from '#service/localization/strings';
+
+import {dev} from '#utils/log';
+
+import {localizeTemplate} from 'extensions/amp-story/1.0/amp-story-localization-service';
+
 import {
   AmpStoryInteractive,
   InteractiveType,
 } from './amp-story-interactive-abstract';
-import {CSS} from '../../../build/amp-story-interactive-img-quiz-0.1.css';
-import {CSS as ImgCSS} from '../../../build/amp-story-interactive-img-0.1.css';
-import {LocalizedStringId} from '#service/localization/strings';
 import {buildImgTemplate} from './utils';
-import {dev} from '#utils/log';
+
+import {CSS as ImgCSS} from '../../../build/amp-story-interactive-img-0.1.css';
+import {CSS} from '../../../build/amp-story-interactive-img-quiz-0.1.css';
 import {
   getRGBFromCssColorValue,
   getTextColorForRGB,
 } from '../../amp-story/1.0/utils';
-import {htmlFor} from '#core/dom/static-template';
-import {computedStyle, setImportantStyles} from '#core/dom/style';
-import objstr from 'obj-str';
 
 /**
  * Generates the template for each option.
@@ -81,17 +88,18 @@ export class AmpStoryInteractiveImgQuiz extends AmpStoryInteractive {
 
     // Localize the answer choice options
     this.localizedAnswerChoices_ = [
-      LocalizedStringId.AMP_STORY_INTERACTIVE_QUIZ_ANSWER_CHOICE_A,
-      LocalizedStringId.AMP_STORY_INTERACTIVE_QUIZ_ANSWER_CHOICE_B,
-      LocalizedStringId.AMP_STORY_INTERACTIVE_QUIZ_ANSWER_CHOICE_C,
-      LocalizedStringId.AMP_STORY_INTERACTIVE_QUIZ_ANSWER_CHOICE_D,
-    ].map((choice) => this.localizationService.getLocalizedString(choice));
+      LocalizedStringId_Enum.AMP_STORY_INTERACTIVE_QUIZ_ANSWER_CHOICE_A,
+      LocalizedStringId_Enum.AMP_STORY_INTERACTIVE_QUIZ_ANSWER_CHOICE_B,
+      LocalizedStringId_Enum.AMP_STORY_INTERACTIVE_QUIZ_ANSWER_CHOICE_C,
+      LocalizedStringId_Enum.AMP_STORY_INTERACTIVE_QUIZ_ANSWER_CHOICE_D,
+    ];
     const optionContainer = this.rootEl_.querySelector(
       '.i-amphtml-story-interactive-img-option-container'
     );
     this.options_.forEach((option, index) =>
       optionContainer.appendChild(this.configureOption_(option, index))
     );
+    localizeTemplate(optionContainer, this.element);
   }
 
   /**
@@ -110,7 +118,10 @@ export class AmpStoryInteractiveImgQuiz extends AmpStoryInteractive {
     const answerChoiceEl = convertedOption.querySelector(
       '.i-amphtml-story-interactive-img-quiz-answer-choice'
     );
-    answerChoiceEl.textContent = this.localizedAnswerChoices_[index];
+    answerChoiceEl.setAttribute(
+      'i-amphtml-i18n-text-content',
+      this.localizedAnswerChoices_[index]
+    );
     convertedOption.optionIndex_ = option['optionIndex'];
 
     // Extract and structure the option information
diff --git a/extensions/amp-story-interactive/0.1/amp-story-interactive-poll.js b/extensions/amp-story-interactive/0.1/amp-story-interactive-poll.js
index 24774e6a0161..37f365a6904a 100644
--- a/extensions/amp-story-interactive/0.1/amp-story-interactive-poll.js
+++ b/extensions/amp-story-interactive/0.1/amp-story-interactive-poll.js
@@ -1,12 +1,15 @@
+import {htmlFor} from '#core/dom/static-template';
+import {computedStyle, setStyle} from '#core/dom/style';
+import {toArray} from '#core/types/array';
+
+import {dev} from '#utils/log';
+
 import {
   AmpStoryInteractive,
   InteractiveType,
 } from './amp-story-interactive-abstract';
+
 import {CSS} from '../../../build/amp-story-interactive-poll-0.1.css';
-import {computedStyle, setStyle} from '#core/dom/style';
-import {dev} from '#utils/log';
-import {htmlFor} from '#core/dom/static-template';
-import {toArray} from '#core/types/array';
 
 /**
  * Generates the template for the poll.
diff --git a/extensions/amp-story-interactive/0.1/amp-story-interactive-quiz.js b/extensions/amp-story-interactive/0.1/amp-story-interactive-quiz.js
index f593f15bb74e..f877b97c3dc7 100644
--- a/extensions/amp-story-interactive/0.1/amp-story-interactive-quiz.js
+++ b/extensions/amp-story-interactive/0.1/amp-story-interactive-quiz.js
@@ -1,12 +1,18 @@
+import objstr from 'obj-str';
+
+import {htmlFor} from '#core/dom/static-template';
+import {setStyle} from '#core/dom/style';
+
+import {LocalizedStringId_Enum} from '#service/localization/strings';
+
+import {localizeTemplate} from 'extensions/amp-story/1.0/amp-story-localization-service';
+
 import {
   AmpStoryInteractive,
   InteractiveType,
 } from './amp-story-interactive-abstract';
+
 import {CSS} from '../../../build/amp-story-interactive-quiz-0.1.css';
-import {LocalizedStringId} from '#service/localization/strings';
-import {htmlFor} from '#core/dom/static-template';
-import {setStyle} from '#core/dom/style';
-import objstr from 'obj-str';
 
 /**
  * Generates the template for the quiz.
@@ -79,17 +85,18 @@ export class AmpStoryInteractiveQuiz extends AmpStoryInteractive {
 
     // Localize the answer choice options
     this.localizedAnswerChoices_ = [
-      LocalizedStringId.AMP_STORY_INTERACTIVE_QUIZ_ANSWER_CHOICE_A,
-      LocalizedStringId.AMP_STORY_INTERACTIVE_QUIZ_ANSWER_CHOICE_B,
-      LocalizedStringId.AMP_STORY_INTERACTIVE_QUIZ_ANSWER_CHOICE_C,
-      LocalizedStringId.AMP_STORY_INTERACTIVE_QUIZ_ANSWER_CHOICE_D,
-    ].map((choice) => this.localizationService.getLocalizedString(choice));
+      LocalizedStringId_Enum.AMP_STORY_INTERACTIVE_QUIZ_ANSWER_CHOICE_A,
+      LocalizedStringId_Enum.AMP_STORY_INTERACTIVE_QUIZ_ANSWER_CHOICE_B,
+      LocalizedStringId_Enum.AMP_STORY_INTERACTIVE_QUIZ_ANSWER_CHOICE_C,
+      LocalizedStringId_Enum.AMP_STORY_INTERACTIVE_QUIZ_ANSWER_CHOICE_D,
+    ];
     const optionContainer = this.rootEl_.querySelector(
       '.i-amphtml-story-interactive-quiz-option-container'
     );
     this.options_.forEach((option, index) =>
       optionContainer.appendChild(this.configureOption_(option, index))
     );
+    localizeTemplate(optionContainer, this.element);
   }
 
   /**
@@ -109,7 +116,10 @@ export class AmpStoryInteractiveQuiz extends AmpStoryInteractive {
     const answerChoiceEl = convertedOption.querySelector(
       '.i-amphtml-story-interactive-quiz-answer-choice'
     );
-    answerChoiceEl.textContent = this.localizedAnswerChoices_[index];
+    answerChoiceEl.setAttribute(
+      'i-amphtml-i18n-text-content',
+      this.localizedAnswerChoices_[index]
+    );
     convertedOption.optionIndex_ = option['optionIndex'];
 
     // Extract and structure the option information
diff --git a/extensions/amp-story-interactive/0.1/amp-story-interactive-results-detailed.js b/extensions/amp-story-interactive/0.1/amp-story-interactive-results-detailed.js
index 70c68822669d..cf2808589608 100644
--- a/extensions/amp-story-interactive/0.1/amp-story-interactive-results-detailed.js
+++ b/extensions/amp-story-interactive/0.1/amp-story-interactive-results-detailed.js
@@ -1,11 +1,13 @@
+import {htmlFor} from '#core/dom/static-template';
+import {setImportantStyles} from '#core/dom/style';
+
 import {InteractiveType} from './amp-story-interactive-abstract';
 import {
   AmpStoryInteractiveResults,
   decideStrategy,
 } from './amp-story-interactive-results';
+
 import {CSS} from '../../../build/amp-story-interactive-results-detailed-0.1.css';
-import {htmlFor} from '#core/dom/static-template';
-import {setImportantStyles} from '#core/dom/style';
 
 /**
  * @typedef {{
diff --git a/extensions/amp-story-interactive/0.1/amp-story-interactive-results.js b/extensions/amp-story-interactive/0.1/amp-story-interactive-results.js
index b67dad164732..1f8e6aa0ddfc 100644
--- a/extensions/amp-story-interactive/0.1/amp-story-interactive-results.js
+++ b/extensions/amp-story-interactive/0.1/amp-story-interactive-results.js
@@ -1,12 +1,15 @@
+import {htmlFor} from '#core/dom/static-template';
+import {computedStyle, setStyle} from '#core/dom/style';
+
+import {dev} from '#utils/log';
+
 import {
   AmpStoryInteractive,
   InteractiveType,
 } from './amp-story-interactive-abstract';
+
 import {CSS} from '../../../build/amp-story-interactive-results-0.1.css';
 import {StateProperty} from '../../amp-story/1.0/amp-story-store-service';
-import {computedStyle, setStyle} from '#core/dom/style';
-import {dev} from '#utils/log';
-import {htmlFor} from '#core/dom/static-template';
 
 /**
  * @typedef {{
diff --git a/extensions/amp-story-interactive/0.1/amp-story-interactive.css b/extensions/amp-story-interactive/0.1/amp-story-interactive-shadow.css
similarity index 100%
rename from extensions/amp-story-interactive/0.1/amp-story-interactive.css
rename to extensions/amp-story-interactive/0.1/amp-story-interactive-shadow.css
diff --git a/extensions/amp-story-interactive/0.1/amp-story-interactive-slider.js b/extensions/amp-story-interactive/0.1/amp-story-interactive-slider.js
index 0b3c703b1105..417d12c35e9e 100644
--- a/extensions/amp-story-interactive/0.1/amp-story-interactive-slider.js
+++ b/extensions/amp-story-interactive/0.1/amp-story-interactive-slider.js
@@ -1,13 +1,17 @@
+import {Keys_Enum} from '#core/constants/key-codes';
+import {htmlFor} from '#core/dom/static-template';
+import {setImportantStyles} from '#core/dom/style';
+
+import {StateProperty} from 'extensions/amp-story/1.0/amp-story-store-service';
+
 import {
   AmpStoryInteractive,
   InteractiveType,
   MID_SELECTION_CLASS,
   POST_SELECTION_CLASS,
 } from './amp-story-interactive-abstract';
+
 import {CSS} from '../../../build/amp-story-interactive-slider-0.1.css';
-import {htmlFor} from '#core/dom/static-template';
-import {setImportantStyles} from '#core/dom/style';
-import {StateProperty} from 'extensions/amp-story/1.0/amp-story-store-service';
 
 /**
  * Generates the template for the slider.
@@ -151,15 +155,38 @@ export class AmpStoryInteractiveSlider extends AmpStoryInteractive {
       cancelAnimationFrame(this.currentRAF_);
       this.onDrag_();
     });
-    this.inputEl_.addEventListener('change', () => {
-      this.onRelease_();
-    });
 
+    // Release events.
+    ['mouseup', 'touchend'].forEach((action) => {
+      this.inputEl_.addEventListener(action, () => {
+        this.onRelease_();
+      });
+    });
+    this.inputEl_.addEventListener(
+      'keydown',
+      (event) => {
+        const rtlDelta = this.storeService_.get(StateProperty.RTL_STATE)
+          ? -1
+          : 1;
+        if (event.key === Keys_Enum.ENTER || event.key === Keys_Enum.SPACE) {
+          this.onRelease_();
+        } else if (event.key === Keys_Enum.LEFT_ARROW) {
+          this.shift_(-rtlDelta);
+          event.preventDefault();
+        } else if (event.key === Keys_Enum.RIGHT_ARROW) {
+          this.shift_(rtlDelta);
+          event.preventDefault();
+        }
+      },
+      true
+    );
+    // Drag events.
     this.inputEl_.addEventListener(
       'touchmove',
       (event) => event.stopPropagation(),
       true
     );
+
     this.storeService_.subscribe(
       StateProperty.CURRENT_PAGE_ID,
       (currPageId) => {
@@ -228,10 +255,23 @@ export class AmpStoryInteractiveSlider extends AmpStoryInteractive {
     setImportantStyles(this.rootEl_, {'--fraction': value / 100});
   }
 
+  /**
+   * Move the slider by a given amount.
+   * @param {number} delta
+   */
+  shift_(delta) {
+    const value = parseFloat(this.inputEl_.value);
+    this.inputEl_.value = value + delta;
+    this.onDrag_();
+  }
+
   /**
    * @private
    */
   onRelease_() {
+    if (this.hasUserSelection_) {
+      return;
+    }
     this.updateToPostSelectionState_();
     this.inputEl_.setAttribute('disabled', '');
     this.rootEl_.classList.remove(MID_SELECTION_CLASS);
diff --git a/extensions/amp-story-interactive/0.1/interactive-confetti.js b/extensions/amp-story-interactive/0.1/interactive-confetti.js
index 0fc98a97f12c..b9c05d91fba3 100644
--- a/extensions/amp-story-interactive/0.1/interactive-confetti.js
+++ b/extensions/amp-story-interactive/0.1/interactive-confetti.js
@@ -1,7 +1,8 @@
-import {Services} from '#service';
 import {htmlFor} from '#core/dom/static-template';
 import {setStyles} from '#core/dom/style';
 
+import {Services} from '#service';
+
 /**
  * Generates the template for the confetti wrapper.
  *
diff --git a/extensions/amp-story-interactive/0.1/interactive-disclaimer.js b/extensions/amp-story-interactive/0.1/interactive-disclaimer.js
index cb4dda76a1c8..dadacdf43d96 100644
--- a/extensions/amp-story-interactive/0.1/interactive-disclaimer.js
+++ b/extensions/amp-story-interactive/0.1/interactive-disclaimer.js
@@ -6,12 +6,16 @@
  * submit a PR with a new entry on the DisclaimerBackendList and tag @ampproject/wg-stories to review it.
  */
 
-import {LocalizedStringId} from '#service/localization/strings';
+import {addAttributesToElement} from '#core/dom';
 import {htmlFor, htmlRefs} from '#core/dom/static-template';
-import DisclaimerBackendsList from './disclaimer-backends-list.json' assert {type: 'json'}; // lgtm[js/syntax-error]
+
+import {LocalizedStringId_Enum} from '#service/localization/strings';
+
 import {createShadowRootWithStyle} from 'extensions/amp-story/1.0/utils';
+
+import DisclaimerBackendsList from './disclaimer-backends-list.json' assert {type: 'json'}; // lgtm[js/syntax-error]
+
 import {CSS} from '../../../build/amp-story-interactive-disclaimer-0.1.css';
-import {addAttributesToElement} from '#core/dom';
 
 /**
  * Creates a disclaimer icon and dialog.
@@ -77,9 +81,11 @@ export function buildInteractiveDisclaimer(interactive, attrs = {}) {
     urlEl.textContent = backendUrl;
     linkEl.remove();
   }
-  noteEl.textContent = interactive.localizationService.getLocalizedString(
-    LocalizedStringId.AMP_STORY_INTERACTIVE_DISCLAIMER_NOTE
-  );
+  interactive.localizationService
+    .getLocalizedStringAsync(
+      LocalizedStringId_Enum.AMP_STORY_INTERACTIVE_DISCLAIMER_NOTE
+    )
+    .then((str) => (noteEl.textContent = str));
 
   // Set the described-by for a11y.
   const disclaimerDescriptionId = `i-amphtml-story-disclaimer-${interactive.element.id}-description`;
@@ -110,8 +116,8 @@ export function buildInteractiveDisclaimerIcon(interactive) {
 /**
  * Returns the corresponding backend specs (as an array of url and specs), or undefined.
  * @param {string} backendUrl
- * @param {!Object<string, !Object<string, string>>} backendsList
- * @return {?Array<string|Object<string, string>>} array that contains: base url of backend, {learnMoreUrl, entity}.
+ * @param {!{[key: string]: !{[key: string]: string}}} backendsList
+ * @return {?Array<string|{[key: string]: string}>} array that contains: base url of backend, {learnMoreUrl, entity}.
  */
 export function getBackendSpecs(backendUrl, backendsList) {
   return Object.entries(backendsList).find((element) => {
diff --git a/extensions/amp-story-interactive/0.1/test/helpers.js b/extensions/amp-story-interactive/0.1/test/helpers.js
index 1dcafb6b38e2..5f739765559e 100644
--- a/extensions/amp-story-interactive/0.1/test/helpers.js
+++ b/extensions/amp-story-interactive/0.1/test/helpers.js
@@ -201,3 +201,5 @@ export const addThresholdsToInteractive = (interactive, thresholdList) => {
     );
   });
 };
+
+export const MOCK_URL = 'https://amp.dev';
diff --git a/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-binary-poll.js b/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-binary-poll.js
index 3980532f1e36..e91ce3e0b1f0 100644
--- a/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-binary-poll.js
+++ b/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-binary-poll.js
@@ -1,12 +1,18 @@
+import {Services} from '#service';
 import {AmpDocSingle} from '#service/ampdoc-impl';
-import {AmpStoryInteractiveBinaryPoll} from '../amp-story-interactive-binary-poll';
-import {AmpStoryRequestService} from '../../../amp-story/1.0/amp-story-request-service';
-import {AmpStoryStoreService} from '../../../amp-story/1.0/amp-story-store-service';
 import {LocalizationService} from '#service/localization';
-import {Services} from '#service';
-import {addConfigToInteractive, getMockInteractiveData} from './helpers';
+
 import {measureMutateElementStub} from '#testing/helpers/service';
+
+import {
+  MOCK_URL,
+  addConfigToInteractive,
+  getMockInteractiveData,
+} from './helpers';
+
 import {registerServiceBuilder} from '../../../../src/service-helpers';
+import {AmpStoryStoreService} from '../../../amp-story/1.0/amp-story-store-service';
+import {AmpStoryInteractiveBinaryPoll} from '../amp-story-interactive-binary-poll';
 
 describes.realWin(
   'amp-story-interactive-binary-poll',
@@ -17,7 +23,8 @@ describes.realWin(
     let win;
     let ampStoryPoll;
     let storyEl;
-    let requestService;
+    let xhrMock;
+    let xhrJson;
 
     beforeEach(() => {
       win = env.win;
@@ -31,9 +38,13 @@ describes.realWin(
       );
       ampStoryPollEl.getAmpDoc = () => new AmpDocSingle(win);
       ampStoryPollEl.getResources = () => win.__AMP_SERVICES.resources.obj;
-      requestService = new AmpStoryRequestService(win);
-      registerServiceBuilder(win, 'story-request', function () {
-        return requestService;
+      const xhr = Services.xhrFor(win);
+      xhrMock = env.sandbox.mock(xhr);
+      xhrMock.expects('fetchJson').resolves({
+        ok: true,
+        json() {
+          return Promise.resolve(xhrJson);
+        },
       });
 
       const storeService = new AmpStoryStoreService(win);
@@ -98,9 +109,7 @@ describes.realWin(
     });
 
     it('should handle the percentage pipeline', async () => {
-      env.sandbox
-        .stub(requestService, 'executeRequest')
-        .resolves(getMockInteractiveData());
+      xhrJson = getMockInteractiveData();
 
       ampStoryPoll.element.setAttribute('endpoint', 'http://localhost:8000');
 
@@ -108,17 +117,17 @@ describes.realWin(
       await ampStoryPoll.buildCallback();
       await ampStoryPoll.layoutCallback();
 
-      expect(ampStoryPoll.getOptionElements()[0].innerText).to.contain('50%');
-      expect(ampStoryPoll.getOptionElements()[1].innerText).to.contain('50%');
+      expect(ampStoryPoll.getOptionElements()[0].textContent).to.contain('50%');
+      expect(ampStoryPoll.getOptionElements()[1].textContent).to.contain('50%');
     });
 
     it('should handle the percentage pipeline with scrambled data', async () => {
-      env.sandbox.stub(requestService, 'executeRequest').resolves({
+      xhrJson = {
         options: [
           {index: 1, count: 2, selected: true},
           {index: 0, count: 8, selected: true},
         ],
-      });
+      };
 
       ampStoryPoll.element.setAttribute('endpoint', 'http://localhost:8000');
 
@@ -126,41 +135,45 @@ describes.realWin(
       await ampStoryPoll.buildCallback();
       await ampStoryPoll.layoutCallback();
 
-      expect(ampStoryPoll.getOptionElements()[0].innerText).to.contain('80%');
-      expect(ampStoryPoll.getOptionElements()[1].innerText).to.contain('20%');
+      expect(ampStoryPoll.getOptionElements()[0].textContent).to.contain('80%');
+      expect(ampStoryPoll.getOptionElements()[1].textContent).to.contain('20%');
     });
 
     it('should handle the percentage pipeline with incomplete data', async () => {
-      env.sandbox.stub(requestService, 'executeRequest').resolves({
+      xhrJson = {
         options: [{index: 1, count: 2, selected: true}],
-      });
+      };
 
-      ampStoryPoll.element.setAttribute('endpoint', 'http://localhost:8000');
+      ampStoryPoll.element.setAttribute('endpoint', MOCK_URL);
 
       addConfigToInteractive(ampStoryPoll, 2);
       await ampStoryPoll.buildCallback();
       await ampStoryPoll.layoutCallback();
 
-      expect(ampStoryPoll.getOptionElements()[0].innerText).to.contain('0%');
-      expect(ampStoryPoll.getOptionElements()[1].innerText).to.contain('100%');
+      expect(ampStoryPoll.getOptionElements()[0].textContent).to.contain('0%');
+      expect(ampStoryPoll.getOptionElements()[1].textContent).to.contain(
+        '100%'
+      );
     });
 
     it('should handle the percentage pipeline with out of bounds data', async () => {
-      env.sandbox.stub(requestService, 'executeRequest').resolves({
+      xhrJson = {
         options: [
           {index: 1, count: 2, selected: true},
           {index: 2, count: 1, selected: false},
         ],
-      });
+      };
 
-      ampStoryPoll.element.setAttribute('endpoint', 'http://localhost:8000');
+      ampStoryPoll.element.setAttribute('endpoint', MOCK_URL);
 
       addConfigToInteractive(ampStoryPoll, 2);
       await ampStoryPoll.buildCallback();
       await ampStoryPoll.layoutCallback();
 
-      expect(ampStoryPoll.getOptionElements()[0].innerText).to.contain('0%');
-      expect(ampStoryPoll.getOptionElements()[1].innerText).to.contain('100%');
+      expect(ampStoryPoll.getOptionElements()[0].textContent).to.contain('0%');
+      expect(ampStoryPoll.getOptionElements()[1].textContent).to.contain(
+        '100%'
+      );
     });
 
     it('should change the font-size wih the emoji content', async () => {
@@ -169,7 +182,7 @@ describes.realWin(
       await ampStoryPoll.buildCallback();
       await ampStoryPoll.layoutCallback();
       expect(ampStoryPoll.getRootElement().getAttribute('style')).to.contain(
-        '--post-select-scale-variable:2'
+        '--post-select-scale-variable: 2.00'
       );
     });
 
@@ -179,7 +192,7 @@ describes.realWin(
       await ampStoryPoll.buildCallback();
       await ampStoryPoll.layoutCallback();
       expect(ampStoryPoll.getRootElement().getAttribute('style')).to.contain(
-        '--post-select-scale-variable:1.14'
+        '--post-select-scale-variable: 1.14'
       );
     });
 
@@ -189,7 +202,7 @@ describes.realWin(
       await ampStoryPoll.buildCallback();
       await ampStoryPoll.layoutCallback();
       expect(ampStoryPoll.getRootElement().getAttribute('style')).to.contain(
-        '--post-select-scale-variable:1'
+        '--post-select-scale-variable: 1.00'
       );
     });
 
diff --git a/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-img-poll.js b/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-img-poll.js
index 154ba868b3a1..950e50797513 100644
--- a/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-img-poll.js
+++ b/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-img-poll.js
@@ -1,9 +1,9 @@
+import {Services} from '#service';
 import {AmpDocSingle} from '#service/ampdoc-impl';
-import {AmpStoryInteractiveImgPoll} from '../amp-story-interactive-img-poll';
-import {AmpStoryRequestService} from '../../../amp-story/1.0/amp-story-request-service';
-import {AmpStoryStoreService} from '../../../amp-story/1.0/amp-story-store-service';
 import {LocalizationService} from '#service/localization';
-import {Services} from '#service';
+
+import {measureMutateElementStub} from '#testing/helpers/service';
+
 import {
   addConfigToInteractive,
   getMockIncompleteData,
@@ -11,8 +11,10 @@ import {
   getMockOutOfBoundsData,
   getMockScrambledData,
 } from './helpers';
-import {measureMutateElementStub} from '#testing/helpers/service';
+
 import {registerServiceBuilder} from '../../../../src/service-helpers';
+import {AmpStoryStoreService} from '../../../amp-story/1.0/amp-story-store-service';
+import {AmpStoryInteractiveImgPoll} from '../amp-story-interactive-img-poll';
 
 describes.realWin(
   'amp-story-interactive-img-poll',
@@ -23,7 +25,8 @@ describes.realWin(
     let win;
     let ampStoryPoll;
     let storyEl;
-    let requestService;
+    let xhrMock;
+    let xhrJson;
 
     beforeEach(() => {
       win = env.win;
@@ -37,9 +40,13 @@ describes.realWin(
       );
       ampStoryPollEl.getAmpDoc = () => new AmpDocSingle(win);
       ampStoryPollEl.getResources = () => win.__AMP_SERVICES.resources.obj;
-      requestService = new AmpStoryRequestService(win);
-      registerServiceBuilder(win, 'story-request', function () {
-        return requestService;
+      const xhr = Services.xhrFor(win);
+      xhrMock = env.sandbox.mock(xhr);
+      xhrMock.expects('fetchJson').resolves({
+        ok: true,
+        json() {
+          return Promise.resolve(xhrJson);
+        },
       });
 
       const storeService = new AmpStoryStoreService(win);
@@ -135,9 +142,7 @@ describes.realWin(
     });
 
     it('should handle the percentage pipeline', async () => {
-      env.sandbox
-        .stub(requestService, 'executeRequest')
-        .resolves(getMockInteractiveData());
+      xhrJson = getMockInteractiveData();
 
       ampStoryPoll.element.setAttribute('endpoint', 'http://localhost:8000');
 
@@ -145,15 +150,13 @@ describes.realWin(
       await ampStoryPoll.buildCallback();
       await ampStoryPoll.layoutCallback();
 
-      expect(ampStoryPoll.getOptionElements()[0].innerText).to.contain('50%');
-      expect(ampStoryPoll.getOptionElements()[1].innerText).to.contain('50%');
+      expect(ampStoryPoll.getOptionElements()[0].textContent).to.contain('50%');
+      expect(ampStoryPoll.getOptionElements()[1].textContent).to.contain('50%');
     });
 
     it('should handle the percentage pipeline with scrambled data', async () => {
       const NUM_OPTIONS = 4;
-      env.sandbox
-        .stub(requestService, 'executeRequest')
-        .resolves(getMockScrambledData());
+      xhrJson = getMockScrambledData();
 
       ampStoryPoll.element.setAttribute('endpoint', 'http://localhost:8000');
 
@@ -164,7 +167,7 @@ describes.realWin(
       const expectedPercentages = [10, 20, 30, 40];
       for (let i = 0; i < NUM_OPTIONS; i++) {
         const expectedText = `${expectedPercentages[i]}%`;
-        expect(ampStoryPoll.getOptionElements()[i].innerText).to.contain(
+        expect(ampStoryPoll.getOptionElements()[i].textContent).to.contain(
           expectedText
         );
       }
@@ -172,9 +175,7 @@ describes.realWin(
 
     it('should handle the percentage pipeline with incomplete data', async () => {
       const NUM_OPTIONS = 4;
-      env.sandbox
-        .stub(requestService, 'executeRequest')
-        .resolves(getMockIncompleteData());
+      xhrJson = getMockIncompleteData();
 
       ampStoryPoll.element.setAttribute('endpoint', 'http://localhost:8000');
 
@@ -185,7 +186,7 @@ describes.realWin(
       const expectedPercentages = [0, 50, 50, 0];
       for (let i = 0; i < NUM_OPTIONS; i++) {
         const expectedText = `${expectedPercentages[i]}%`;
-        expect(ampStoryPoll.getOptionElements()[i].innerText).to.contain(
+        expect(ampStoryPoll.getOptionElements()[i].textContent).to.contain(
           expectedText
         );
       }
@@ -193,9 +194,7 @@ describes.realWin(
 
     it('should handle the percentage pipeline with out of bounds data', async () => {
       const NUM_OPTIONS = 4;
-      env.sandbox
-        .stub(requestService, 'executeRequest')
-        .resolves(getMockOutOfBoundsData());
+      xhrJson = getMockOutOfBoundsData();
 
       ampStoryPoll.element.setAttribute('endpoint', 'http://localhost:8000');
 
@@ -206,7 +205,7 @@ describes.realWin(
       const expectedPercentages = [20, 0, 0, 80];
       for (let i = 0; i < NUM_OPTIONS; i++) {
         const expectedText = `${expectedPercentages[i]}%`;
-        expect(ampStoryPoll.getOptionElements()[i].innerText).to.contain(
+        expect(ampStoryPoll.getOptionElements()[i].textContent).to.contain(
           expectedText
         );
       }
diff --git a/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-img-quiz.js b/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-img-quiz.js
index 7ea4bdd85e89..b26d0973582d 100644
--- a/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-img-quiz.js
+++ b/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-img-quiz.js
@@ -1,9 +1,8 @@
-import {AmpDocSingle} from '#service/ampdoc-impl';
-import {AmpStoryInteractiveImgQuiz} from '../amp-story-interactive-img-quiz';
-import {AmpStoryRequestService} from '../../../amp-story/1.0/amp-story-request-service';
-import {AmpStoryStoreService} from '../../../amp-story/1.0/amp-story-store-service';
-import {LocalizationService} from '#service/localization';
 import {Services} from '#service';
+import {AmpDocSingle} from '#service/ampdoc-impl';
+
+import {getLocalizationService} from 'extensions/amp-story/1.0/amp-story-localization-service';
+
 import {
   getMockIncompleteData,
   getMockInteractiveData,
@@ -11,7 +10,11 @@ import {
   getMockScrambledData,
   populateQuiz,
 } from './helpers';
+
 import {registerServiceBuilder} from '../../../../src/service-helpers';
+import LocalizedStringsEn from '../../../amp-story/1.0/_locales/en.json' assert {type: 'json'}; // lgtm[js/syntax-error]
+import {AmpStoryStoreService} from '../../../amp-story/1.0/amp-story-store-service';
+import {AmpStoryInteractiveImgQuiz} from '../amp-story-interactive-img-quiz';
 
 describes.realWin(
   'amp-story-interactive-img-quiz',
@@ -22,7 +25,8 @@ describes.realWin(
     let win;
     let ampStoryQuiz;
     let storyEl;
-    let requestService;
+    let xhrMock;
+    let xhrJson;
 
     beforeEach(() => {
       win = env.win;
@@ -36,9 +40,13 @@ describes.realWin(
       );
       ampStoryQuizEl.getAmpDoc = () => new AmpDocSingle(win);
       ampStoryQuizEl.getResources = () => win.__AMP_SERVICES.resources.obj;
-      requestService = new AmpStoryRequestService(win);
-      registerServiceBuilder(win, 'story-request', function () {
-        return requestService;
+      const xhr = Services.xhrFor(win);
+      xhrMock = env.sandbox.mock(xhr);
+      xhrMock.expects('fetchJson').resolves({
+        ok: true,
+        json() {
+          return Promise.resolve(xhrJson);
+        },
       });
 
       const storeService = new AmpStoryStoreService(win);
@@ -46,10 +54,10 @@ describes.realWin(
         return storeService;
       });
 
-      const localizationService = new LocalizationService(win.document.body);
-      env.sandbox
-        .stub(Services, 'localizationServiceForOrNull')
-        .returns(Promise.resolve(localizationService));
+      const localizationService = getLocalizationService(win.document.body);
+      localizationService.registerLocalizedStringBundles({
+        'en': LocalizedStringsEn,
+      });
 
       storyEl = win.document.createElement('amp-story');
       const storyPage = win.document.createElement('amp-story-page');
@@ -165,9 +173,7 @@ describes.realWin(
     });
 
     it('should handle the percentage pipeline', async () => {
-      env.sandbox
-        .stub(requestService, 'executeRequest')
-        .resolves(getMockInteractiveData());
+      xhrJson = getMockInteractiveData();
 
       ampStoryQuiz.element.setAttribute('endpoint', 'http://localhost:8000');
 
@@ -175,15 +181,13 @@ describes.realWin(
       await ampStoryQuiz.buildCallback();
       await ampStoryQuiz.layoutCallback();
 
-      expect(ampStoryQuiz.getOptionElements()[0].innerText).to.contain('30%');
-      expect(ampStoryQuiz.getOptionElements()[3].innerText).to.contain('10%');
+      expect(ampStoryQuiz.getOptionElements()[0].textContent).to.contain('30%');
+      expect(ampStoryQuiz.getOptionElements()[3].textContent).to.contain('10%');
     });
 
     it('should handle the percentage pipeline with scrambled data', async () => {
       const NUM_OPTIONS = 4;
-      env.sandbox
-        .stub(requestService, 'executeRequest')
-        .resolves(getMockScrambledData());
+      xhrJson = getMockScrambledData();
 
       ampStoryQuiz.element.setAttribute('endpoint', 'http://localhost:8000');
 
@@ -194,7 +198,7 @@ describes.realWin(
       const expectedPercentages = [10, 20, 30, 40];
       for (let i = 0; i < NUM_OPTIONS; i++) {
         const expectedText = `${expectedPercentages[i]}%`;
-        expect(ampStoryQuiz.getOptionElements()[i].innerText).to.contain(
+        expect(ampStoryQuiz.getOptionElements()[i].textContent).to.contain(
           expectedText
         );
       }
@@ -202,9 +206,7 @@ describes.realWin(
 
     it('should handle the percentage pipeline with incomplete data', async () => {
       const NUM_OPTIONS = 4;
-      env.sandbox
-        .stub(requestService, 'executeRequest')
-        .resolves(getMockIncompleteData());
+      xhrJson = getMockIncompleteData();
 
       ampStoryQuiz.element.setAttribute('endpoint', 'http://localhost:8000');
 
@@ -215,7 +217,7 @@ describes.realWin(
       const expectedPercentages = [0, 50, 50, 0];
       for (let i = 0; i < NUM_OPTIONS; i++) {
         const expectedText = `${expectedPercentages[i]}%`;
-        expect(ampStoryQuiz.getOptionElements()[i].innerText).to.contain(
+        expect(ampStoryQuiz.getOptionElements()[i].textContent).to.contain(
           expectedText
         );
       }
@@ -223,9 +225,7 @@ describes.realWin(
 
     it('should handle the percentage pipeline with out of bounds data', async () => {
       const NUM_OPTIONS = 4;
-      env.sandbox
-        .stub(requestService, 'executeRequest')
-        .resolves(getMockOutOfBoundsData());
+      xhrJson = getMockOutOfBoundsData();
 
       ampStoryQuiz.element.setAttribute('endpoint', 'http://localhost:8000');
 
@@ -236,7 +236,7 @@ describes.realWin(
       const expectedPercentages = [20, 0, 0, 80];
       for (let i = 0; i < NUM_OPTIONS; i++) {
         const expectedText = `${expectedPercentages[i]}%`;
-        expect(ampStoryQuiz.getOptionElements()[i].innerText).to.contain(
+        expect(ampStoryQuiz.getOptionElements()[i].textContent).to.contain(
           expectedText
         );
       }
diff --git a/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-poll.js b/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-poll.js
index eb9614b6b1b3..d1d760309282 100644
--- a/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-poll.js
+++ b/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-poll.js
@@ -1,9 +1,9 @@
+import {Services} from '#service';
 import {AmpDocSingle} from '#service/ampdoc-impl';
-import {AmpStoryInteractivePoll} from '../amp-story-interactive-poll';
-import {AmpStoryRequestService} from '../../../amp-story/1.0/amp-story-request-service';
-import {AmpStoryStoreService} from '../../../amp-story/1.0/amp-story-store-service';
 import {LocalizationService} from '#service/localization';
-import {Services} from '#service';
+
+import {measureMutateElementStub} from '#testing/helpers/service';
+
 import {
   addConfigToInteractive,
   getMockIncompleteData,
@@ -11,8 +11,10 @@ import {
   getMockOutOfBoundsData,
   getMockScrambledData,
 } from './helpers';
-import {measureMutateElementStub} from '#testing/helpers/service';
+
 import {registerServiceBuilder} from '../../../../src/service-helpers';
+import {AmpStoryStoreService} from '../../../amp-story/1.0/amp-story-store-service';
+import {AmpStoryInteractivePoll} from '../amp-story-interactive-poll';
 
 describes.realWin(
   'amp-story-interactive-poll',
@@ -23,7 +25,8 @@ describes.realWin(
     let win;
     let ampStoryPoll;
     let storyEl;
-    let requestService;
+    let xhrMock;
+    let xhrJson;
 
     beforeEach(() => {
       win = env.win;
@@ -37,9 +40,14 @@ describes.realWin(
       );
       ampStoryPollEl.getAmpDoc = () => new AmpDocSingle(win);
       ampStoryPollEl.getResources = () => win.__AMP_SERVICES.resources.obj;
-      requestService = new AmpStoryRequestService(win);
-      registerServiceBuilder(win, 'story-request', function () {
-        return requestService;
+
+      const xhr = Services.xhrFor(win);
+      xhrMock = env.sandbox.mock(xhr);
+      xhrMock.expects('fetchJson').resolves({
+        ok: true,
+        json() {
+          return Promise.resolve(xhrJson);
+        },
       });
 
       const storeService = new AmpStoryStoreService(win);
@@ -104,9 +112,7 @@ describes.realWin(
     });
 
     it('should handle the percentage pipeline', async () => {
-      env.sandbox
-        .stub(requestService, 'executeRequest')
-        .resolves(getMockInteractiveData());
+      xhrJson = getMockInteractiveData();
 
       ampStoryPoll.element.setAttribute('endpoint', 'http://localhost:8000');
 
@@ -114,15 +120,17 @@ describes.realWin(
       await ampStoryPoll.buildCallback();
       await ampStoryPoll.layoutCallback();
 
-      expect(ampStoryPoll.getOptionElements()[0].innerText).to.contain('50 %');
-      expect(ampStoryPoll.getOptionElements()[1].innerText).to.contain('50 %');
+      expect(
+        ampStoryPoll.getOptionElements()[0].textContent.replace(/ |\n/g, '')
+      ).to.contain('50%');
+      expect(
+        ampStoryPoll.getOptionElements()[1].textContent.replace(/ |\n/g, '')
+      ).to.contain('50%');
     });
 
     it('should handle the percentage pipeline with scrambled data', async () => {
       const NUM_OPTIONS = 4;
-      env.sandbox
-        .stub(requestService, 'executeRequest')
-        .resolves(getMockScrambledData());
+      xhrJson = getMockScrambledData();
 
       ampStoryPoll.element.setAttribute('endpoint', 'http://localhost:8000');
 
@@ -132,18 +140,16 @@ describes.realWin(
 
       const expectedPercentages = [10, 20, 30, 40];
       for (let i = 0; i < NUM_OPTIONS; i++) {
-        const expectedText = `${expectedPercentages[i]} %`;
-        expect(ampStoryPoll.getOptionElements()[i].innerText).to.contain(
-          expectedText
-        );
+        const expectedText = `${expectedPercentages[i]}%`;
+        expect(
+          ampStoryPoll.getOptionElements()[i].textContent.replace(/ |\n/g, '')
+        ).to.contain(expectedText);
       }
     });
 
     it('should handle the percentage pipeline with incomplete data', async () => {
       const NUM_OPTIONS = 4;
-      env.sandbox
-        .stub(requestService, 'executeRequest')
-        .resolves(getMockIncompleteData());
+      xhrJson = getMockIncompleteData();
 
       ampStoryPoll.element.setAttribute('endpoint', 'http://localhost:8000');
 
@@ -153,18 +159,16 @@ describes.realWin(
 
       const expectedPercentages = [0, 50, 50, 0];
       for (let i = 0; i < NUM_OPTIONS; i++) {
-        const expectedText = `${expectedPercentages[i]} %`;
-        expect(ampStoryPoll.getOptionElements()[i].innerText).to.contain(
-          expectedText
-        );
+        const expectedText = `${expectedPercentages[i]}%`;
+        expect(
+          ampStoryPoll.getOptionElements()[i].textContent.replace(/ |\n/g, '')
+        ).to.contain(expectedText);
       }
     });
 
     it('should handle the percentage pipeline with out of bounds data', async () => {
       const NUM_OPTIONS = 4;
-      env.sandbox
-        .stub(requestService, 'executeRequest')
-        .resolves(getMockOutOfBoundsData());
+      xhrJson = getMockOutOfBoundsData();
 
       ampStoryPoll.element.setAttribute('endpoint', 'http://localhost:8000');
 
@@ -174,10 +178,10 @@ describes.realWin(
 
       const expectedPercentages = [20, 0, 0, 80];
       for (let i = 0; i < NUM_OPTIONS; i++) {
-        const expectedText = `${expectedPercentages[i]} %`;
-        expect(ampStoryPoll.getOptionElements()[i].innerText).to.contain(
-          expectedText
-        );
+        const expectedText = `${expectedPercentages[i]}%`;
+        expect(
+          ampStoryPoll.getOptionElements()[i].textContent.replace(/ |\n/g, '')
+        ).to.contain(expectedText);
       }
     });
 
diff --git a/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-quiz.js b/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-quiz.js
index 07cdc6396c32..d55551beb8d6 100644
--- a/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-quiz.js
+++ b/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-quiz.js
@@ -1,17 +1,21 @@
-import {AmpDocSingle} from '#service/ampdoc-impl';
-import {AmpStoryInteractiveQuiz} from '../amp-story-interactive-quiz';
-import {AmpStoryRequestService} from '../../../amp-story/1.0/amp-story-request-service';
-import {AmpStoryStoreService} from '../../../amp-story/1.0/amp-story-store-service';
-import {LocalizationService} from '#service/localization';
 import {Services} from '#service';
+import {AmpDocSingle} from '#service/ampdoc-impl';
+
+import {getLocalizationService} from 'extensions/amp-story/1.0/amp-story-localization-service';
+
 import {
+  MOCK_URL,
   getMockIncompleteData,
   getMockInteractiveData,
   getMockOutOfBoundsData,
   getMockScrambledData,
   populateQuiz,
 } from './helpers';
+
 import {registerServiceBuilder} from '../../../../src/service-helpers';
+import LocalizedStringsEn from '../../../amp-story/1.0/_locales/en.json' assert {type: 'json'}; // lgtm[js/syntax-error]
+import {AmpStoryStoreService} from '../../../amp-story/1.0/amp-story-store-service';
+import {AmpStoryInteractiveQuiz} from '../amp-story-interactive-quiz';
 
 describes.realWin(
   'amp-story-interactive-quiz',
@@ -22,7 +26,8 @@ describes.realWin(
     let win;
     let ampStoryQuiz;
     let storyEl;
-    let requestService;
+    let xhrMock;
+    let xhrJson;
 
     beforeEach(() => {
       win = env.win;
@@ -36,9 +41,14 @@ describes.realWin(
       );
       ampStoryQuizEl.getAmpDoc = () => new AmpDocSingle(win);
       ampStoryQuizEl.getResources = () => win.__AMP_SERVICES.resources.obj;
-      requestService = new AmpStoryRequestService(win);
-      registerServiceBuilder(win, 'story-request', function () {
-        return requestService;
+
+      const xhr = Services.xhrFor(win);
+      xhrMock = env.sandbox.mock(xhr);
+      xhrMock.expects('fetchJson').resolves({
+        ok: true,
+        json() {
+          return Promise.resolve(xhrJson);
+        },
       });
 
       const storeService = new AmpStoryStoreService(win);
@@ -46,10 +56,10 @@ describes.realWin(
         return storeService;
       });
 
-      const localizationService = new LocalizationService(win.document.body);
-      env.sandbox
-        .stub(Services, 'localizationServiceForOrNull')
-        .returns(Promise.resolve(localizationService));
+      const localizationService = getLocalizationService(win.document.body);
+      localizationService.registerLocalizedStringBundles({
+        'en': LocalizedStringsEn,
+      });
 
       storyEl = win.document.createElement('amp-story');
       const storyPage = win.document.createElement('amp-story-page');
@@ -130,27 +140,22 @@ describes.realWin(
     });
 
     it('should handle the percentage pipeline', async () => {
-      env.sandbox
-        .stub(requestService, 'executeRequest')
-        .resolves(getMockInteractiveData());
-
-      ampStoryQuiz.element.setAttribute('endpoint', 'http://localhost:8000');
+      ampStoryQuiz.element.setAttribute('endpoint', MOCK_URL);
+      xhrJson = getMockInteractiveData();
 
       populateQuiz(ampStoryQuiz);
       await ampStoryQuiz.buildCallback();
       await ampStoryQuiz.layoutCallback();
 
-      expect(ampStoryQuiz.getOptionElements()[0].innerText).to.contain('30%');
-      expect(ampStoryQuiz.getOptionElements()[3].innerText).to.contain('10%');
+      expect(ampStoryQuiz.getOptionElements()[0].textContent).to.contain('30%');
+      expect(ampStoryQuiz.getOptionElements()[3].textContent).to.contain('10%');
     });
 
     it('should handle the percentage pipeline with scrambled data', async () => {
       const NUM_OPTIONS = 4;
-      env.sandbox
-        .stub(requestService, 'executeRequest')
-        .resolves(getMockScrambledData());
+      xhrJson = getMockScrambledData();
 
-      ampStoryQuiz.element.setAttribute('endpoint', 'http://localhost:8000');
+      ampStoryQuiz.element.setAttribute('endpoint', MOCK_URL);
 
       populateQuiz(ampStoryQuiz, NUM_OPTIONS);
       await ampStoryQuiz.buildCallback();
@@ -159,7 +164,7 @@ describes.realWin(
       const expectedPercentages = [10, 20, 30, 40];
       for (let i = 0; i < NUM_OPTIONS; i++) {
         const expectedText = `${expectedPercentages[i]}%`;
-        expect(ampStoryQuiz.getOptionElements()[i].innerText).to.contain(
+        expect(ampStoryQuiz.getOptionElements()[i].textContent).to.contain(
           expectedText
         );
       }
@@ -167,9 +172,7 @@ describes.realWin(
 
     it('should handle the percentage pipeline with incomplete data', async () => {
       const NUM_OPTIONS = 4;
-      env.sandbox
-        .stub(requestService, 'executeRequest')
-        .resolves(getMockIncompleteData());
+      xhrJson = getMockIncompleteData();
 
       ampStoryQuiz.element.setAttribute('endpoint', 'http://localhost:8000');
 
@@ -180,7 +183,7 @@ describes.realWin(
       const expectedPercentages = [0, 50, 50, 0];
       for (let i = 0; i < NUM_OPTIONS; i++) {
         const expectedText = `${expectedPercentages[i]}%`;
-        expect(ampStoryQuiz.getOptionElements()[i].innerText).to.contain(
+        expect(ampStoryQuiz.getOptionElements()[i].textContent).to.contain(
           expectedText
         );
       }
@@ -188,9 +191,7 @@ describes.realWin(
 
     it('should handle the percentage pipeline with out of bounds data', async () => {
       const NUM_OPTIONS = 4;
-      env.sandbox
-        .stub(requestService, 'executeRequest')
-        .resolves(getMockOutOfBoundsData());
+      xhrJson = getMockOutOfBoundsData();
 
       ampStoryQuiz.element.setAttribute('endpoint', 'http://localhost:8000');
 
@@ -201,7 +202,7 @@ describes.realWin(
       const expectedPercentages = [20, 0, 0, 80];
       for (let i = 0; i < NUM_OPTIONS; i++) {
         const expectedText = `${expectedPercentages[i]}%`;
-        expect(ampStoryQuiz.getOptionElements()[i].innerText).to.contain(
+        expect(ampStoryQuiz.getOptionElements()[i].textContent).to.contain(
           expectedText
         );
       }
diff --git a/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-results-detailed.js b/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-results-detailed.js
index 26f62c2e34d4..b922057759ec 100644
--- a/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-results-detailed.js
+++ b/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-results-detailed.js
@@ -1,14 +1,16 @@
+import {Services} from '#service';
+import {AmpDocSingle} from '#service/ampdoc-impl';
+import {LocalizationService} from '#service/localization';
+
+import {addConfigToInteractive, addThresholdsToInteractive} from './helpers';
+
+import {registerServiceBuilder} from '../../../../src/service-helpers';
 import {
   Action,
   AmpStoryStoreService,
 } from '../../../amp-story/1.0/amp-story-store-service';
-import {AmpDocSingle} from '#service/ampdoc-impl';
-import {AmpStoryInteractiveResultsDetailed} from '../amp-story-interactive-results-detailed';
 import {InteractiveType} from '../amp-story-interactive-abstract';
-import {LocalizationService} from '#service/localization';
-import {Services} from '#service';
-import {addConfigToInteractive, addThresholdsToInteractive} from './helpers';
-import {registerServiceBuilder} from '../../../../src/service-helpers';
+import {AmpStoryInteractiveResultsDetailed} from '../amp-story-interactive-results-detailed';
 
 describes.realWin(
   'amp-story-interactive-results-detailed',
diff --git a/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-results.js b/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-results.js
index d8168ee4305d..7504dc3a9913 100644
--- a/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-results.js
+++ b/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-results.js
@@ -1,19 +1,21 @@
+import {Services} from '#service';
+import {AmpDocSingle} from '#service/ampdoc-impl';
+import {LocalizationService} from '#service/localization';
+
+import {addConfigToInteractive, addThresholdsToInteractive} from './helpers';
+
+import {registerServiceBuilder} from '../../../../src/service-helpers';
 import {
   Action,
   AmpStoryStoreService,
 } from '../../../amp-story/1.0/amp-story-store-service';
-import {AmpDocSingle} from '#service/ampdoc-impl';
+import {InteractiveType} from '../amp-story-interactive-abstract';
 import {
   AmpStoryInteractiveResults,
   decideStrategy,
   processResultsCategory,
   processResultsPercentage,
 } from '../amp-story-interactive-results';
-import {InteractiveType} from '../amp-story-interactive-abstract';
-import {LocalizationService} from '#service/localization';
-import {Services} from '#service';
-import {addConfigToInteractive, addThresholdsToInteractive} from './helpers';
-import {registerServiceBuilder} from '../../../../src/service-helpers';
 
 describes.realWin(
   'amp-story-interactive-results',
diff --git a/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-slider.js b/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-slider.js
index 39c99da73942..a84841c167eb 100644
--- a/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-slider.js
+++ b/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-slider.js
@@ -1,15 +1,16 @@
-import {AmpStoryInteractiveSlider} from '../amp-story-interactive-slider';
-import {AmpStoryStoreService} from '../../../amp-story/1.0/amp-story-store-service';
-import {registerServiceBuilder} from '../../../../src/service-helpers';
 import {Services} from '#service';
-import {AmpStoryRequestService} from '../../../amp-story/1.0/amp-story-request-service';
-import {LocalizationService} from '#service/localization';
-import {getSliderInteractiveData} from './helpers';
 import {AmpDocSingle} from '#service/ampdoc-impl';
+import {LocalizationService} from '#service/localization';
+
+import {MOCK_URL, getSliderInteractiveData} from './helpers';
+
+import {registerServiceBuilder} from '../../../../src/service-helpers';
+import {AmpStoryStoreService} from '../../../amp-story/1.0/amp-story-store-service';
 import {
   MID_SELECTION_CLASS,
   POST_SELECTION_CLASS,
 } from '../amp-story-interactive-abstract';
+import {AmpStoryInteractiveSlider} from '../amp-story-interactive-slider';
 
 describes.realWin(
   'amp-story-interactive-slider',
@@ -20,13 +21,18 @@ describes.realWin(
     let win;
     let ampStorySlider;
     let storyEl;
-    let requestService;
+    let xhrMock;
+    let xhrJson;
 
     beforeEach(() => {
       win = env.win;
       const ampStorySliderEl = win.document.createElement(
         'amp-story-interactive-slider'
       );
+
+      ampStorySliderEl.getAmpDoc = () => new AmpDocSingle(win);
+      ampStorySliderEl.getResources = () => win.__AMP_SERVICES.resources.obj;
+
       ampStorySlider = new AmpStoryInteractiveSlider(ampStorySliderEl);
 
       env.sandbox
@@ -43,11 +49,13 @@ describes.realWin(
       win.document.body.appendChild(storyEl);
       ampStorySlider = new AmpStoryInteractiveSlider(ampStorySliderEl);
 
-      ampStorySliderEl.getAmpDoc = () => new AmpDocSingle(win);
-      ampStorySliderEl.getResources = () => win.__AMP_SERVICES.resources.obj;
-      requestService = new AmpStoryRequestService(win);
-      registerServiceBuilder(win, 'story-request', function () {
-        return requestService;
+      const xhr = Services.xhrFor(env.win);
+      xhrMock = env.sandbox.mock(xhr);
+      xhrMock.expects('fetchJson').resolves({
+        ok: true,
+        json() {
+          return Promise.resolve(xhrJson);
+        },
       });
 
       const localizationService = new LocalizationService(win.document.body);
@@ -77,7 +85,7 @@ describes.realWin(
         .getRootElement()
         .querySelector('input[type="range"]');
       // simulates a change event, which is when the user releases the slider
-      slider.dispatchEvent(new CustomEvent('change'));
+      slider.dispatchEvent(new CustomEvent('mouseup'));
       expect(slider.hasAttribute('disabled')).to.be.true;
     });
 
@@ -132,7 +140,7 @@ describes.realWin(
         .getRootElement()
         .querySelector('input[type="range"]');
       // simulates a change event, which is when the user releases the slider
-      slider.dispatchEvent(new CustomEvent('change'));
+      slider.dispatchEvent(new CustomEvent('mouseup'));
       expect(ampStorySlider.getRootElement()).to.have.class(
         POST_SELECTION_CLASS
       );
@@ -149,10 +157,8 @@ describes.realWin(
     });
 
     it('should show post-selection state when backend replies with user selection', async () => {
-      env.sandbox
-        .stub(requestService, 'executeRequest')
-        .resolves(getSliderInteractiveData());
-      ampStorySlider.element.setAttribute('endpoint', 'https://example.com');
+      xhrJson = getSliderInteractiveData();
+      ampStorySlider.element.setAttribute('endpoint', MOCK_URL);
       await ampStorySlider.buildCallback();
       await ampStorySlider.layoutCallback();
       expect(ampStorySlider.getRootElement()).to.have.class(
@@ -173,15 +179,13 @@ describes.realWin(
       // simulates an input event, which is when the user drags the slider
       // simulates a change event, which is when the user releases the slider
       slider.dispatchEvent(new CustomEvent('input'));
-      slider.dispatchEvent(new CustomEvent('change'));
+      slider.dispatchEvent(new CustomEvent('mouseup'));
       expect(sliderBubble.textContent).to.be.equal('30%');
     });
 
     it('should display the average indicator in the correct position', async () => {
-      env.sandbox
-        .stub(requestService, 'executeRequest')
-        .resolves(getSliderInteractiveData());
-      ampStorySlider.element.setAttribute('endpoint', 'https://example.com');
+      xhrJson = getSliderInteractiveData();
+      ampStorySlider.element.setAttribute('endpoint', MOCK_URL);
       await ampStorySlider.buildCallback();
       await ampStorySlider.layoutCallback();
       expect(
diff --git a/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive.js b/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive.js
index 48fcb5da86e1..58f65a334834 100644
--- a/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive.js
+++ b/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive.js
@@ -1,32 +1,35 @@
+import {htmlFor} from '#core/dom/static-template';
+
+import {toggleExperiment} from '#experiments/';
+
+import {Services} from '#service';
 import {AmpDocSingle} from '#service/ampdoc-impl';
+import {LocalizationService} from '#service/localization';
+
 import {
-  AmpStoryInteractive,
-  InteractiveType,
-} from '../amp-story-interactive-abstract';
-import {AmpStoryRequestService} from '../../../amp-story/1.0/amp-story-request-service';
+  MOCK_URL,
+  addConfigToInteractive,
+  getMockIncompleteData,
+  getMockInteractiveData,
+  getMockOutOfBoundsData,
+  getMockScrambledData,
+} from './helpers';
+
+import {registerServiceBuilder} from '../../../../src/service-helpers';
 import {
   AmpStoryStoreService,
   StateProperty,
 } from '../../../amp-story/1.0/amp-story-store-service';
+import {StoryAnalyticsService} from '../../../amp-story/1.0/story-analytics';
 import {
   AmpStoryVariableService,
   AnalyticsVariable,
 } from '../../../amp-story/1.0/variable-service';
-import {LocalizationService} from '#service/localization';
-import {Services} from '#service';
-import {StoryAnalyticsService} from '../../../amp-story/1.0/story-analytics';
 import {
-  addConfigToInteractive,
-  getMockIncompleteData,
-  getMockInteractiveData,
-  getMockOutOfBoundsData,
-  getMockScrambledData,
-} from './helpers';
-import {dict} from '#core/types/object';
+  AmpStoryInteractive,
+  InteractiveType,
+} from '../amp-story-interactive-abstract';
 import {getBackendSpecs} from '../interactive-disclaimer';
-import {htmlFor} from '#core/dom/static-template';
-import {registerServiceBuilder} from '../../../../src/service-helpers';
-import {toggleExperiment} from '#experiments/';
 
 class InteractiveTest extends AmpStoryInteractive {
   constructor(element) {
@@ -61,13 +64,11 @@ class InteractiveTest extends AmpStoryInteractive {
  * @param {Array<number>} responseCounts
  */
 export const generateResponseDataFor = (responseCounts) => {
-  return responseCounts.map((count, index) =>
-    dict({
-      'index': index,
-      'count': count,
-      'selected': false,
-    })
-  );
+  return responseCounts.map((count, index) => ({
+    'index': index,
+    'count': count,
+    'selected': false,
+  }));
 };
 
 describes.realWin(
@@ -81,8 +82,9 @@ describes.realWin(
     let storyEl;
     let analytics;
     let analyticsVars;
-    let requestService;
     let storeService;
+    let xhrMock;
+    let xhrJson;
 
     beforeEach(() => {
       win = env.win;
@@ -107,14 +109,20 @@ describes.realWin(
       registerServiceBuilder(win, 'story-analytics', function () {
         return analytics;
       });
-      requestService = new AmpStoryRequestService(win);
-      registerServiceBuilder(win, 'story-request', function () {
-        return requestService;
-      });
       storeService = new AmpStoryStoreService(win);
       registerServiceBuilder(win, 'story-store', function () {
         return storeService;
       });
+
+      const xhr = Services.xhrFor(env.win);
+      xhrMock = env.sandbox.mock(xhr);
+      xhrMock.expects('fetchJson').resolves({
+        ok: true,
+        json() {
+          return Promise.resolve(xhrJson);
+        },
+      });
+
       const localizationService = new LocalizationService(win.document.body);
       env.sandbox
         .stub(Services, 'localizationServiceForOrNull')
@@ -204,14 +212,9 @@ describes.realWin(
     });
 
     it('should update the quiz when the user has already reacted', async () => {
-      env.sandbox
-        .stub(requestService, 'executeRequest')
-        .resolves(getMockInteractiveData());
+      xhrJson = getMockInteractiveData();
       addConfigToInteractive(ampStoryInteractive);
-      ampStoryInteractive.element.setAttribute(
-        'endpoint',
-        'http://localhost:8000'
-      );
+      ampStoryInteractive.element.setAttribute('endpoint', MOCK_URL);
       await ampStoryInteractive.buildCallback();
       await ampStoryInteractive.layoutCallback();
 
@@ -226,14 +229,9 @@ describes.realWin(
     it('should select the correct option if the backend responds with scrambled data', async () => {
       const NUM_OPTIONS = 4;
       const scrambledData = getMockScrambledData();
-      env.sandbox
-        .stub(requestService, 'executeRequest')
-        .resolves(scrambledData);
+      xhrJson = scrambledData;
       addConfigToInteractive(ampStoryInteractive, NUM_OPTIONS);
-      ampStoryInteractive.element.setAttribute(
-        'endpoint',
-        'http://localhost:8000'
-      );
+      ampStoryInteractive.element.setAttribute('endpoint', MOCK_URL);
       await ampStoryInteractive.buildCallback();
       await ampStoryInteractive.layoutCallback();
 
@@ -259,14 +257,9 @@ describes.realWin(
     it('should select the correct option if the backend responds with incomplete data', async () => {
       const NUM_OPTIONS = 4;
       const incompleteData = getMockIncompleteData();
-      env.sandbox
-        .stub(requestService, 'executeRequest')
-        .resolves(incompleteData);
+      xhrJson = incompleteData;
       addConfigToInteractive(ampStoryInteractive, NUM_OPTIONS);
-      ampStoryInteractive.element.setAttribute(
-        'endpoint',
-        'http://localhost:8000'
-      );
+      ampStoryInteractive.element.setAttribute('endpoint', MOCK_URL);
       await ampStoryInteractive.buildCallback();
       await ampStoryInteractive.layoutCallback();
 
@@ -292,14 +285,9 @@ describes.realWin(
     it('should select the correct option if the backend responds with out of bounds data', async () => {
       const NUM_OPTIONS = 4;
       const outOfBoundsData = getMockOutOfBoundsData();
-      env.sandbox
-        .stub(requestService, 'executeRequest')
-        .resolves(outOfBoundsData);
+      xhrJson = outOfBoundsData;
       addConfigToInteractive(ampStoryInteractive, NUM_OPTIONS);
-      ampStoryInteractive.element.setAttribute(
-        'endpoint',
-        'http://localhost:8000'
-      );
+      ampStoryInteractive.element.setAttribute('endpoint', MOCK_URL);
       await ampStoryInteractive.buildCallback();
       await ampStoryInteractive.layoutCallback();
 
@@ -325,7 +313,7 @@ describes.realWin(
 
     it('should throw error if percentages are not correctly passed', () => {
       addConfigToInteractive(ampStoryInteractive);
-      const responseData = dict({'wrongKey': []});
+      const responseData = {'wrongKey': []};
       allowConsoleError(() => {
         expect(() =>
           ampStoryInteractive.onDataRetrieved_(responseData)
@@ -392,14 +380,9 @@ describes.realWin(
       });
 
       it('should create the dialog when the disclaimer icon is clicked', async () => {
-        env.sandbox
-          .stub(requestService, 'executeRequest')
-          .resolves(getMockInteractiveData());
+        xhrJson = getMockInteractiveData();
         addConfigToInteractive(ampStoryInteractive);
-        ampStoryInteractive.element.setAttribute(
-          'endpoint',
-          'https://notabackend.com'
-        );
+        ampStoryInteractive.element.setAttribute('endpoint', MOCK_URL);
         await ampStoryInteractive.buildCallback();
         await ampStoryInteractive.layoutCallback();
 
@@ -416,14 +399,9 @@ describes.realWin(
       });
 
       it('should destroy the dialog when the close button is clicked', async () => {
-        env.sandbox
-          .stub(requestService, 'executeRequest')
-          .resolves(getMockInteractiveData());
+        xhrJson = getMockInteractiveData();
         addConfigToInteractive(ampStoryInteractive);
-        ampStoryInteractive.element.setAttribute(
-          'endpoint',
-          'https://notabackend.com'
-        );
+        ampStoryInteractive.element.setAttribute('endpoint', MOCK_URL);
         await ampStoryInteractive.buildCallback();
         await ampStoryInteractive.layoutCallback();
 
@@ -440,15 +418,10 @@ describes.realWin(
       });
 
       it('should set the url of the disclaimer to the backend url', async () => {
-        env.sandbox
-          .stub(requestService, 'executeRequest')
-          .resolves(getMockInteractiveData());
+        xhrJson = getMockInteractiveData();
 
         addConfigToInteractive(ampStoryInteractive);
-        ampStoryInteractive.element.setAttribute(
-          'endpoint',
-          'https://notabackend.com'
-        );
+        ampStoryInteractive.element.setAttribute('endpoint', MOCK_URL);
         await ampStoryInteractive.buildCallback();
         await ampStoryInteractive.layoutCallback();
 
@@ -461,19 +434,14 @@ describes.realWin(
           storyEl.querySelector(
             '.i-amphtml-story-interactive-disclaimer-dialog .i-amphtml-story-interactive-disclaimer-url'
           ).textContent
-        ).to.be.equal('notabackend.com');
+        ).to.be.equal('amp.dev');
       });
 
       it('should remove learn more link when backend is not on list', async () => {
-        env.sandbox
-          .stub(requestService, 'executeRequest')
-          .resolves(getMockInteractiveData());
+        xhrJson = getMockInteractiveData();
 
         addConfigToInteractive(ampStoryInteractive);
-        ampStoryInteractive.element.setAttribute(
-          'endpoint',
-          'https://notabackend.com'
-        );
+        ampStoryInteractive.element.setAttribute('endpoint', MOCK_URL);
 
         await ampStoryInteractive.buildCallback();
         await ampStoryInteractive.layoutCallback();
diff --git a/extensions/amp-story-interactive/0.1/test/validator-amp-story-interactive-valid.html b/extensions/amp-story-interactive/0.1/test/validator-amp-story-interactive-valid.html
index df7bbc5c7c8a..13d1ec4f7c94 100644
--- a/extensions/amp-story-interactive/0.1/test/validator-amp-story-interactive-valid.html
+++ b/extensions/amp-story-interactive/0.1/test/validator-amp-story-interactive-valid.html
@@ -113,6 +113,19 @@
         </amp-story-interactive-results>
       </amp-story-grid-layer>
     </amp-story-page>
+    <amp-story-page id="7">
+      <amp-story-grid-layer template="fill">
+      <!-- Valid: Example of amp-story-interactive-slider -->
+        <amp-story-interactive-slider
+          id="slider"
+          endpoint="https://webstoriesinteractivity-beta.web.app/api/v1"
+          theme="dark"
+          class="cool-results"
+          prompt-text="You should go to"
+          option-1-text="👍">
+        </amp-story-interactive-results>
+      </amp-story-grid-layer>
+    </amp-story-page>
   </amp-story>
 </body>
 </html>
diff --git a/extensions/amp-story-interactive/0.1/test/validator-amp-story-interactive-valid.out b/extensions/amp-story-interactive/0.1/test/validator-amp-story-interactive-valid.out
index b0fd5adff893..12e806441f44 100644
--- a/extensions/amp-story-interactive/0.1/test/validator-amp-story-interactive-valid.out
+++ b/extensions/amp-story-interactive/0.1/test/validator-amp-story-interactive-valid.out
@@ -114,6 +114,19 @@ PASS
 |          </amp-story-interactive-results>
 |        </amp-story-grid-layer>
 |      </amp-story-page>
+|      <amp-story-page id="7">
+|        <amp-story-grid-layer template="fill">
+|        <!-- Valid: Example of amp-story-interactive-slider -->
+|          <amp-story-interactive-slider
+|            id="slider"
+|            endpoint="https://webstoriesinteractivity-beta.web.app/api/v1"
+|            theme="dark"
+|            class="cool-results"
+|            prompt-text="You should go to"
+|            option-1-text="👍">
+|          </amp-story-interactive-results>
+|        </amp-story-grid-layer>
+|      </amp-story-page>
 |    </amp-story>
 |  </body>
 |  </html>
\ No newline at end of file
diff --git a/extensions/amp-story-interactive/0.1/utils.js b/extensions/amp-story-interactive/0.1/utils.js
index d7bdeea01af4..30bd50244d13 100644
--- a/extensions/amp-story-interactive/0.1/utils.js
+++ b/extensions/amp-story-interactive/0.1/utils.js
@@ -1,5 +1,6 @@
 import {htmlFor} from '#core/dom/static-template';
 import {map} from '#core/types/object';
+
 import {user} from '#utils/log';
 
 /** @private Whether ids are deduplicated or not */
diff --git a/extensions/amp-story-interactive/validator-amp-story-interactive.protoascii b/extensions/amp-story-interactive/validator-amp-story-interactive.protoascii
index dabafc3cf240..7c1f82ab1047 100644
--- a/extensions/amp-story-interactive/validator-amp-story-interactive.protoascii
+++ b/extensions/amp-story-interactive/validator-amp-story-interactive.protoascii
@@ -331,6 +331,17 @@ attr_lists: {
     }
   }
 }
+tags: {  # <amp-story-interactive-slider>
+  html_format: AMP
+  tag_name: "AMP-STORY-INTERACTIVE-SLIDER"
+  requires_extension: "amp-story-interactive"
+  mandatory_ancestor: "AMP-STORY-GRID-LAYER"
+  attr_lists: "interactive-shared-configs-attrs"
+  attrs: {
+    name: "option-1-text"
+    mandatory: false
+  }
+}
 attr_lists: {
   name: "interactive-options-img-attrs"
   attrs: {
diff --git a/extensions/amp-story/1.0/amp-story-draggable-drawer-header.css b/extensions/amp-story-page-attachment/0.1/amp-story-draggable-drawer-header.css
similarity index 85%
rename from extensions/amp-story/1.0/amp-story-draggable-drawer-header.css
rename to extensions/amp-story-page-attachment/0.1/amp-story-draggable-drawer-header.css
index b0729d64f52c..48f7e8a1e522 100644
--- a/extensions/amp-story/1.0/amp-story-draggable-drawer-header.css
+++ b/extensions/amp-story-page-attachment/0.1/amp-story-draggable-drawer-header.css
@@ -1,6 +1,6 @@
 
 
-@import './amp-story-shadow-reset.css';
+@import '../../amp-story/1.0/amp-story-shadow-reset.css';
 
 :host {
   border-radius: inherit !important; /* Propogate border-radius */
@@ -15,7 +15,7 @@
   z-index: 1 !important;
   --i-amphtml-draggable-drawer-background-color: #fff !important;
   --i-amphtml-draggable-drawer-text-color: #202125 !important;
-  --i-amphtml-draggable-drawer-handle-color: rgba(0, 0, 0, .2) !important;
+  --i-amphtml-draggable-drawer-header-twenty-percent-gray: rgba(0, 0, 0, .2) !important;
   --i-amphtml-draggable-drawer-header-font-family: 'Roboto', sans-serif !important;
   --i-amphtml-draggable-drawer-header-font-size: 18px !important;
   --i-amphtml-draggable-drawer-header-title-height: 44px !important;
@@ -34,14 +34,14 @@
   top: 8px !important;
   width: 40px !important;
   height: 3px !important;
-  background-color: var(--i-amphtml-draggable-drawer-handle-color) !important;
+  background-color: var(--i-amphtml-draggable-drawer-header-twenty-percent-gray) !important;
   border-radius: 3px !important;
 }
 
 [theme="dark"].i-amphtml-story-draggable-drawer-header {
   --i-amphtml-draggable-drawer-background-color: #202125 !important;
   --i-amphtml-draggable-drawer-text-color: #fff !important;
-  --i-amphtml-draggable-drawer-handle-color: rgba(255, 255, 255, .2) !important;
+  --i-amphtml-draggable-drawer-header-twenty-percent-gray: rgba(255, 255, 255, .2) !important;
 }
 
 :not([desktop]).i-amphtml-story-draggable-drawer-header {
@@ -54,7 +54,7 @@
   width: 14px !important;
   height: 14px !important;
   background-origin: content-box !important;
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" fill="rgba(0, 0, 0, .4)" viewBox="0 0 14 14"><path d="M13.295 2.115a.997.997 0 10-1.41-1.41L7 5.59 2.115.705a.997.997 0 10-1.41 1.41L5.59 7 .705 11.885a.997.997 0 101.41 1.41L7 8.41l4.885 4.885a.997.997 0 101.41-1.41L8.41 7l4.885-4.885z"/></svg>') !important;
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" fill="rgba(0, 0, 0, .4)" viewBox="0 0 14 14"><path d="M13.3 2.1A1 1 0 1 0 11.9.7L7 5.6 2.1.7A1 1 0 1 0 .7 2.1L5.6 7 .7 11.9a1 1 0 1 0 1.4 1.4L7 8.4l4.9 4.9a1 1 0 1 0 1.4-1.4L8.4 7l4.9-4.9z"/></svg>') !important;
   background-repeat: no-repeat !important;
   cursor: pointer !important;
   margin-inline-start: auto !important; /* RTL support */
@@ -65,7 +65,7 @@
 }
 
 [theme="dark"] .i-amphtml-story-page-attachment-close-button {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" fill="rgba(255, 255, 255, .4)" viewBox="0 0 14 14"><path d="M13.295 2.115a.997.997 0 10-1.41-1.41L7 5.59 2.115.705a.997.997 0 10-1.41 1.41L5.59 7 .705 11.885a.997.997 0 101.41 1.41L7 8.41l4.885 4.885a.997.997 0 101.41-1.41L8.41 7l4.885-4.885z"/></svg>') !important;
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" fill="rgba(255, 255, 255, .4)" viewBox="0 0 14 14"><path d="M13.3 2.1A1 1 0 1 0 11.9.7L7 5.6 2.1.7A1 1 0 1 0 .7 2.1L5.6 7 .7 11.9a1 1 0 1 0 1.4 1.4L7 8.4l4.9 4.9a1 1 0 1 0 1.4-1.4L8.4 7l4.9-4.9z"/></svg>') !important;
 }
 
 .i-amphtml-story-page-attachment-domain-label {
@@ -93,6 +93,7 @@
   justify-content: center !important;
   background: var(--i-amphtml-draggable-drawer-background-color) !important;
   border-radius: inherit !important;
+  box-shadow: 0px 0px 1px var(--i-amphtml-draggable-drawer-header-twenty-percent-gray) !important;
 }
 
 :not([desktop]).i-amphtml-story-draggable-drawer-header .i-amphtml-story-draggable-drawer-header-title-and-close {
diff --git a/extensions/amp-story/1.0/amp-story-draggable-drawer.css b/extensions/amp-story-page-attachment/0.1/amp-story-draggable-drawer.css
similarity index 96%
rename from extensions/amp-story/1.0/amp-story-draggable-drawer.css
rename to extensions/amp-story-page-attachment/0.1/amp-story-draggable-drawer.css
index 82d9a2a9ce8c..75f64beb195f 100644
--- a/extensions/amp-story/1.0/amp-story-draggable-drawer.css
+++ b/extensions/amp-story-page-attachment/0.1/amp-story-draggable-drawer.css
@@ -40,7 +40,7 @@
 }
 
 .i-amphtml-story-draggable-drawer-container {
-  height: calc(100% - 40px) !important;
+  height: 100% !important;
   background: var(--i-amphtml-draggable-drawer-background-color) !important;
   overflow-y: auto !important;
   -webkit-overflow-scrolling: touch !important;
@@ -124,10 +124,13 @@ body:not(.amp-mode-keyboard-active) amp-story:not([desktop]) .i-amphtml-story-dr
 }
 
 [desktop] .i-amphtml-story-draggable-drawer {
-  height: 60vh !important;
+  height: auto !important;
+  max-height: min(60vh, 100%) !important;
+  min-height: min(100%, 700px) !important;
   width: 800px !important;
   border-radius: 8px !important;
   overflow: hidden !important;
+  overflow-y: auto !important;
 }
 
 /* Remote-attachment overrides. */
diff --git a/extensions/amp-story/1.0/amp-story-draggable-drawer.js b/extensions/amp-story-page-attachment/0.1/amp-story-draggable-drawer.js
similarity index 80%
rename from extensions/amp-story/1.0/amp-story-draggable-drawer.js
rename to extensions/amp-story-page-attachment/0.1/amp-story-draggable-drawer.js
index 983fce7d52fd..974001e39de7 100644
--- a/extensions/amp-story/1.0/amp-story-draggable-drawer.js
+++ b/extensions/amp-story-page-attachment/0.1/amp-story-draggable-drawer.js
@@ -1,25 +1,37 @@
+import {devAssert} from '#core/assert';
+import {toggleAttribute} from '#core/dom';
+import {isAmpElement} from '#core/dom/amp-element-helpers';
 import * as Preact from '#core/dom/jsx';
+import {Layout_Enum} from '#core/dom/layout';
+import {closest} from '#core/dom/query';
+import {resetStyles, setImportantStyles, toggle} from '#core/dom/style';
+import {toArray} from '#core/types/array';
+
+import {Services} from '#service';
+import {LocalizedStringId_Enum} from '#service/localization/strings';
+
+import {listen} from '#utils/event-helper';
+import {dev} from '#utils/log';
+
+import {localizeTemplate} from 'extensions/amp-story/1.0/amp-story-localization-service';
+
+import {CSS} from '../../../build/amp-story-draggable-drawer-header-0.1.css';
 import {
   Action,
   StateProperty,
-  UIType,
-  getStoreService,
-} from './amp-story-store-service';
-import {CSS} from '../../../build/amp-story-draggable-drawer-header-1.0.css';
-import {Layout} from '#core/dom/layout';
-import {LocalizedStringId} from '#service/localization/strings';
-import {Services} from '#service';
-import {closest} from '#core/dom/query';
-import {createShadowRootWithStyle} from './utils';
-import {dev} from '#utils/log';
-import {localize} from './amp-story-localization-service';
-import {isAmpElement} from '#core/dom/amp-element-helpers';
-import {listen} from '#utils/event-helper';
-import {resetStyles, setImportantStyles, toggle} from '#core/dom/style';
+  UIType_Enum,
+} from '../../amp-story/1.0/amp-story-store-service';
+import {
+  createShadowRootWithStyle,
+  toggleA11yReadable,
+} from '../../amp-story/1.0/utils';
 
 /** @const {number} */
 const TOGGLE_THRESHOLD_PX = 50;
 
+/** @const {number} */
+const DRAWER_ANIMATE_IN_TIME = 400;
+
 /**
  * @enum {number}
  */
@@ -57,7 +69,7 @@ const renderHeaderElement = () => {
  * @abstract
  */
 export class DraggableDrawer extends AMP.BaseElement {
-  /** @override @nocollapse */
+  /** @override  */
   static prerenderAllowed() {
     return false;
   }
@@ -87,8 +99,13 @@ export class DraggableDrawer extends AMP.BaseElement {
     /** @protected {!DrawerState} */
     this.state = DrawerState.CLOSED;
 
-    /** @protected @const {!./amp-story-store-service.AmpStoryStoreService} */
-    this.storeService = getStoreService(this.win);
+    /** @protected @const {!../../amp-story/1.0/amp-story-store-service.AmpStoryStoreService} */
+    this.storeService = devAssert(Services.storyStoreService(this.win));
+
+    /** @protected @const {!../../../src/services/localization.LocalizationService} */
+    this.localizationService = devAssert(
+      Services.localizationForDoc(this.element)
+    );
 
     /** @private {!Object} */
     this.touchEventState_ = {
@@ -114,7 +131,7 @@ export class DraggableDrawer extends AMP.BaseElement {
 
   /** @override */
   isLayoutSupported(layout) {
-    return layout === Layout.NODISPLAY;
+    return layout === Layout_Enum.NODISPLAY;
   }
 
   /** @override */
@@ -122,31 +139,38 @@ export class DraggableDrawer extends AMP.BaseElement {
     this.element.classList.add('amp-story-draggable-drawer-root');
 
     const templateEl = renderDrawerElement();
-    const headerShadowRootEl = this.win.document.createElement('div');
     this.headerEl = renderHeaderElement();
 
-    createShadowRootWithStyle(headerShadowRootEl, this.headerEl, CSS);
-
     this.containerEl = dev().assertElement(
       templateEl.querySelector('.i-amphtml-story-draggable-drawer-container')
     );
+    // Hide `containerEl` to ensure that its content is not rendered/loaded by
+    // the AMP Resources manager before we can set the draggable drawer as the
+    // resource manager.
+    toggle(dev().assertElement(this.containerEl), false);
+
     this.contentEl = dev().assertElement(
       this.containerEl.querySelector(
         '.i-amphtml-story-draggable-drawer-content'
       )
     );
 
-    const spacerEl = this.win.document.createElement('button');
-    spacerEl.classList.add('i-amphtml-story-draggable-drawer-spacer');
-    spacerEl.classList.add('i-amphtml-story-system-reset');
-    spacerEl.setAttribute('role', 'button');
-    const localizedCloseString = localize(
-      this.element,
-      LocalizedStringId.AMP_STORY_CLOSE_BUTTON_LABEL
+    const spacerEl = (
+      <button
+        role="button"
+        class="i-amphtml-story-draggable-drawer-spacer i-amphtml-story-system-reset"
+        i-amphtml-i18n-aria-label={
+          LocalizedStringId_Enum.AMP_STORY_CLOSE_BUTTON_LABEL
+        }
+      ></button>
     );
-    spacerEl.setAttribute('aria-label', localizedCloseString);
+
     this.containerEl.insertBefore(spacerEl, this.contentEl);
-    this.contentEl.appendChild(headerShadowRootEl);
+    this.contentEl.appendChild(
+      createShadowRootWithStyle(<div />, this.headerEl, CSS)
+    );
+
+    localizeTemplate(this.containerEl, this.element);
 
     this.element.appendChild(templateEl);
     this.element.setAttribute('aria-hidden', true);
@@ -169,7 +193,11 @@ export class DraggableDrawer extends AMP.BaseElement {
         Services.ownersForDoc(this.element).setOwner(el, this.element);
       }
     }
-    return Promise.resolve();
+
+    // `containerEl` is hidden by default, to ensure that its content is not
+    // rendered/loaded by the AMP Resources manager before we can set a
+    // different owner. Now that the owner has been set, we can unhide it.
+    toggle(dev().assertElement(this.containerEl), true);
   }
 
   /**
@@ -221,44 +249,49 @@ export class DraggableDrawer extends AMP.BaseElement {
 
   /**
    * Reacts to UI state updates.
-   * @param {!UIType} uiState
+   * @param {!UIType_Enum} uiState
    * @protected
    */
   onUIStateUpdate_(uiState) {
-    const isMobile = uiState === UIType.MOBILE;
-
+    const isMobile = uiState === UIType_Enum.MOBILE;
     isMobile
       ? this.startListeningForTouchEvents_()
       : this.stopListeningForTouchEvents_();
 
-    this.headerEl.toggleAttribute('desktop', !isMobile);
+    toggleAttribute(this.headerEl, 'desktop', !isMobile);
   }
 
   /**
    * @private
    */
   startListeningForTouchEvents_() {
-    // If the element is a direct descendant of amp-story-page, authorize
-    // swiping up by listening to events at the page level. Otherwise, only
-    // authorize swiping down to close by listening to events at the current
-    // element level.
+    // If the element is a direct descendant of amp-story-page or a descendant
+    // of amp-story-shopping-attachment, authorize swiping up by listening to
+    // events at the page level. Otherwise, only authorize swiping down to
+    // close by listening to events at the current element level.
     const parentEl = this.element.parentElement;
-    const el = dev().assertElement(
-      parentEl.tagName === 'AMP-STORY-PAGE' ? parentEl : this.element
-    );
+
+    let targetEl;
+    if (parentEl.tagName === 'AMP-STORY-PAGE') {
+      targetEl = dev().assertElement(parentEl);
+    } else if (parentEl.tagName === 'AMP-STORY-SHOPPING-ATTACHMENT') {
+      targetEl = dev().assertElement(this.element.closest('amp-story-page'));
+    } else {
+      targetEl = dev().assertElement(this.element);
+    }
 
     this.touchEventUnlisteners_.push(
-      listen(el, 'touchstart', this.onTouchStart_.bind(this), {
+      listen(targetEl, 'touchstart', this.onTouchStart_.bind(this), {
         capture: true,
       })
     );
     this.touchEventUnlisteners_.push(
-      listen(el, 'touchmove', this.onTouchMove_.bind(this), {
+      listen(targetEl, 'touchmove', this.onTouchMove_.bind(this), {
         capture: true,
       })
     );
     this.touchEventUnlisteners_.push(
-      listen(el, 'touchend', this.onTouchEnd_.bind(this), {
+      listen(targetEl, 'touchend', this.onTouchEnd_.bind(this), {
         capture: true,
       })
     );
@@ -552,6 +585,20 @@ export class DraggableDrawer extends AMP.BaseElement {
       }
 
       this.element.classList.add('i-amphtml-story-draggable-drawer-open');
+
+      this.hideOrShowSiblingContent();
+      // Focus spacer after transition for screen readers to be in
+      // position to read drawer content.
+      setTimeout(() => {
+        dev()
+          .assertElement(
+            this.element.querySelector(
+              '.i-amphtml-story-draggable-drawer-spacer'
+            )
+          )
+          ./*OK*/ focus();
+      }, DRAWER_ANIMATE_IN_TIME);
+
       toggle(dev().assertElement(this.containerEl), true);
     }).then(() => {
       const owners = Services.ownersForDoc(this.element);
@@ -560,6 +607,20 @@ export class DraggableDrawer extends AMP.BaseElement {
     });
   }
 
+  /**
+   * Handles hiding page content from assistive technology.
+   * @protected
+   */
+  hideOrShowSiblingContent() {
+    this.mutateElement(() => {
+      toArray(this.element.parentElement.children).forEach((siblingEl) => {
+        if (siblingEl !== this.element) {
+          toggleA11yReadable(siblingEl, this.state === DrawerState.CLOSED);
+        }
+      });
+    });
+  }
+
   /**
    * Can be overriden for implementations using the browser history to close the
    * drawer.
@@ -583,6 +644,7 @@ export class DraggableDrawer extends AMP.BaseElement {
 
     this.storeService.dispatch(Action.TOGGLE_PAUSED, false);
     this.handleSoftKeyboardOnDrawerClose_();
+    this.hideOrShowSiblingContent();
 
     this.mutateElement(() => {
       this.element.setAttribute('aria-hidden', true);
diff --git a/extensions/amp-story/1.0/amp-story-form.css b/extensions/amp-story-page-attachment/0.1/amp-story-form.css
similarity index 76%
rename from extensions/amp-story/1.0/amp-story-form.css
rename to extensions/amp-story-page-attachment/0.1/amp-story-form.css
index 12275ba24a33..f12d7656c4b0 100644
--- a/extensions/amp-story/1.0/amp-story-form.css
+++ b/extensions/amp-story-page-attachment/0.1/amp-story-form.css
@@ -24,10 +24,18 @@
     color: #0F8514 !important;
   }
 
+  [theme="dark"] [submit-success] .i-amphtml-story-page-attachment-form-submission-status {
+    color: #8BDC8F !important;
+  }
+
   [submit-error] .i-amphtml-story-page-attachment-form-submission-status {
     color: #DE3333 !important;
   }
 
+  [theme="dark"] [submit-error] .i-amphtml-story-page-attachment-form-submission-status {
+    color: #FF5C5C !important;
+  }
+
   @keyframes submission-status-fade-in {
     from {
       opacity: 0;
@@ -51,11 +59,11 @@
   }
 
   [submit-success] .i-amphtml-story-page-attachment-form-submission-status-icon {
-    background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="26" height="26" fill="none"><rect x="-14" y="-14" width="328" height="54" rx="12"/><circle cx="13" cy="13" r="13" fill="#8BDC8F"/><path d="M5.77777 13.8972L10.7342 18.8889L20.2222 9.33334" stroke="black" stroke-width="2.5"/></svg>') !important;
+    background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="26" height="26" fill="none"><rect x="-14" y="-14" width="328" height="54" rx="12"/><circle cx="13" cy="13" r="13" fill="#8BDC8F"/><path d="m5.8 13.9 5 5 9.4-9.6" stroke="#000" stroke-width="2.5"/></svg>') !important;
   }
 
   [submit-error] .i-amphtml-story-page-attachment-form-submission-status-icon {
-    background-image: url('data:image/svg+xml;charset=utf-8,<svg width="26" height="26" viewBox="0 0 26 26" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M12.987 0C5.811 0 0 5.824 0 13C0 20.176 5.811 26 12.987 26C20.176 26 26 20.176 26 13C26 5.824 20.176 0 12.987 0ZM14.3 13C14.3 13.715 13.715 14.3 13 14.3C12.285 14.3 11.7 13.715 11.7 13V7.8C11.7 7.085 12.285 6.5 13 6.5C13.715 6.5 14.3 7.085 14.3 7.8V13ZM14.3 18.2C14.3 18.915 13.715 19.5 13 19.5C12.285 19.5 11.7 18.915 11.7 18.2C11.7 17.485 12.285 16.9 13 16.9C13.715 16.9 14.3 17.485 14.3 18.2Z" fill="#FF5252"/></svg>') !important;
+    background-image: url('data:image/svg+xml;charset=utf-8,<svg width="26" height="26" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M13 0a13 13 0 1 0 0 26 13 13 0 0 0 0-26Zm1.3 13c0 .7-.6 1.3-1.3 1.3-.7 0-1.3-.6-1.3-1.3V7.8c0-.7.6-1.3 1.3-1.3.7 0 1.3.6 1.3 1.3V13Zm0 5.2c0 .7-.6 1.3-1.3 1.3-.7 0-1.3-.6-1.3-1.3 0-.7.6-1.3 1.3-1.3.7 0 1.3.6 1.3 1.3Z" fill="#FF5252"/></svg>') !important;
   }
 
   .i-amphtml-story-page-attachment-form-submission-status .i-amphtml-story-spinner {
diff --git a/extensions/amp-story-page-attachment/0.1/amp-story-form.js b/extensions/amp-story-page-attachment/0.1/amp-story-form.js
new file mode 100644
index 000000000000..6d2345b8d9b0
--- /dev/null
+++ b/extensions/amp-story-page-attachment/0.1/amp-story-form.js
@@ -0,0 +1,87 @@
+import {escapeCssSelectorIdent} from '#core/dom/css-selectors';
+import * as Preact from '#core/dom/jsx';
+
+import {Services} from '#service';
+import {LocalizedStringId_Enum} from '#service/localization/strings';
+
+import {localizeTemplate} from 'extensions/amp-story/1.0/amp-story-localization-service';
+
+import {Action} from '../../amp-story/1.0/amp-story-store-service';
+import {
+  renderLoadingSpinner,
+  toggleLoadingSpinner,
+} from '../../amp-story/1.0/loading-spinner';
+
+/**
+ * Adds AMP form actions to the action allow list.
+ * @param {!Window} win
+ */
+export function allowlistFormActions(win) {
+  const storeService = Services.storyStoreService(win);
+  storeService.dispatch(Action.ADD_TO_ACTIONS_ALLOWLIST, [
+    {tagOrTarget: 'FORM', method: 'clear'},
+    {tagOrTarget: 'FORM', method: 'submit'},
+  ]);
+}
+
+/**
+ * @typedef {!Element|Array<!Element>|string}
+ */
+let FormElementChildrenDef;
+
+/**
+ * @const {{[key: string]: (function(Element):!FormElementChildrenDef|function():!FormElementChildrenDef)}}
+ */
+const createStatusChildrenByAttribute = {
+  'submitting': () => toggleLoadingSpinner(renderLoadingSpinner(), true),
+
+  'submit-success': () =>
+    createFormResultChildren(
+      LocalizedStringId_Enum.AMP_STORY_FORM_SUBMIT_SUCCESS
+    ),
+  'submit-error': () =>
+    createFormResultChildren(
+      LocalizedStringId_Enum.AMP_STORY_FORM_SUBMIT_ERROR
+    ),
+};
+
+/**
+ * Add a default form attribute element for each absent response attribute.
+ * @param {!Element} formEl The form to which the attribute elements will be
+ *     selected or added.
+ * @param {!Element} storyEl
+ * @return {Array<!Element>} The list of response attribute elements that
+ *     belong to the given form.
+ * @private
+ */
+export function setupResponseAttributeElements(formEl, storyEl) {
+  const elements = Object.keys(createStatusChildrenByAttribute).map((attr) => {
+    const selected = formEl.querySelector(`[${escapeCssSelectorIdent(attr)}]`);
+    if (selected) {
+      return selected;
+    }
+    const created = (
+      <div>
+        <div class="i-amphtml-story-page-attachment-form-submission-status">
+          {createStatusChildrenByAttribute[attr]()}
+        </div>
+      </div>
+    );
+    created.setAttribute(attr, '');
+    return formEl.appendChild(created);
+  });
+  localizeTemplate(formEl, storyEl);
+  return elements;
+}
+
+/**
+ * @param {!LocalizedStringId_Enum} localizedStringId
+ * @return {!FormElementChildrenDef}
+ * @private
+ */
+function createFormResultChildren(localizedStringId) {
+  return [
+    <div class="i-amphtml-story-page-attachment-form-submission-status-icon"></div>,
+    <div i-amphtml-i18n-text-content={localizedStringId}></div>,
+  ];
+}
diff --git a/extensions/amp-story-page-attachment/0.1/amp-story-open-page-attachment.css b/extensions/amp-story-page-attachment/0.1/amp-story-open-page-attachment.css
new file mode 100644
index 000000000000..13c69e1450d7
--- /dev/null
+++ b/extensions/amp-story-page-attachment/0.1/amp-story-open-page-attachment.css
@@ -0,0 +1,263 @@
+.i-amphtml-story-page-open-attachment {
+  align-items: center !important;
+  flex-direction: column !important;
+  position: absolute !important;
+  bottom: 0 !important;
+  left: 0 !important;
+  width: 100% !important;
+  pointer-events: none !important;
+  z-index: 3 !important;
+  -webkit-touch-callout: default !important; /* Allow long pressing the button to open context menu in iOS */
+  text-decoration: none !important;
+  --i-amphtml-chip-background-color: rgba(255, 255, 255, 0.5) !important;
+  --i-amphtml-img-background-color: white !important;
+  --i-amphtml-label-text-color: white !important;
+  --i-amphtml-arrow-color: black !important;
+  --i-amphtml-page-attachment-ui-animation-delay: 1s !important;
+  --i-amphtml-page-attachment-ui-animation-duration: .6s !important;
+  /* Hidden by default to prevent tabbing to inactive page's CTAs. */
+  display: none !important;
+}
+
+[theme="dark"].i-amphtml-story-page-open-attachment {
+  --i-amphtml-chip-background-color: rgba(0, 0, 0, 0.5) !important;
+  --i-amphtml-img-background-color: black !important;
+  --i-amphtml-label-text-color: black !important;
+  --i-amphtml-arrow-color: white !important;
+}
+
+.i-amphtml-story-page-open-attachment[active] {
+  /* Displays only on active page. */
+  display: flex !important;
+}
+
+.i-amphtml-story-page-open-attachment > * {
+  cursor: pointer !important;
+  pointer-events: auto !important;
+}
+
+.i-amphtml-story-page-open-attachment-label {
+  position: relative !important;
+  padding: 12px 32px 20px 32px !important;
+  height: 16px !important;
+  max-width: calc(100% - 64px) !important;
+  color: #fff !important;
+  font-family: 'Roboto', sans-serif !important;
+  font-size: 16px !important;
+  font-weight: bold !important;
+  letter-spacing: 0.3px;
+  line-height: 16px !important;
+  overflow: hidden !important;
+  text-overflow: ellipsis !important;
+  text-shadow: 0px 0px 6px rgba(0, 0, 0, 0.36) !important;
+  white-space: nowrap !important;
+}
+
+ .i-amphtml-story-page-attachment-label {
+  font-family: 'Roboto', sans-serif !important;
+  font-size: 16px !important;
+  font-weight: 700 !important;
+  letter-spacing: 0.3px;
+  overflow: hidden !important;
+  text-overflow: ellipsis !important;
+  white-space: nowrap !important;
+  max-width: 210px !important;
+  /* Prevents clipping of decenders. */
+  line-height: 20px !important;
+}
+
+ .i-amphtml-story-page-open-attachment-label {
+  color: var(--i-amphtml-label-text-color) !important;
+}
+
+ .i-amphtml-story-inline-page-attachment-chip {
+  background-color: var(--i-amphtml-chip-background-color) !important;
+  display: flex !important;
+  border-radius: 24px !important;
+  align-items: center !important;
+  overflow: hidden !important;
+  margin-bottom: 12px !important;
+}
+
+/* Animations only play when page is active. */
+.i-amphtml-story-page-open-attachment-inline[active] .i-amphtml-story-inline-page-attachment-chip {
+  animation: i-amphtml-tap-scale var(--i-amphtml-page-attachment-ui-animation-duration) var(--i-amphtml-page-attachment-ui-animation-delay) both !important;
+}
+
+.i-amphtml-story-inline-page-attachment-chip:only-child {
+  margin-bottom: 20px !important;
+}
+
+.i-amphtml-story-inline-page-attachment-img {
+  background-size: contain !important;
+  background-repeat: no-repeat !important;
+}
+
+.i-amphtml-story-inline-page-attachment-img {
+  height: 48px !important;
+  width: 48px !important;
+  background-color: var(--i-amphtml-img-background-color) !important;
+}
+
+.i-amphtml-story-inline-page-attachment-img:nth-child(2) {
+  margin-inline-start: 1px !important;
+}
+
+.i-amphtml-story-inline-page-attachment-arrow {
+  position: relative !important;
+  height: 32px !important;
+  width: 32px !important;
+  border-radius: 50% !important;
+  background-color: var(--i-amphtml-img-background-color) !important;
+}
+
+.i-amphtml-story-inline-page-attachment-arrow:not(:only-child) {
+  margin: 8px !important;
+}
+
+.i-amphtml-story-inline-page-attachment-arrow:before {
+  content: '' !important;
+  position: absolute !important;
+  top: 0 !important;
+  left: 0 !important;
+  width: 100% !important;
+  height: 100% !important;
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="20" height="8"><path d="m18 7.7-.7-.2-7.3-4-7.3 4c-.7.4-1.6.2-2-.6-.4-.7-.1-1.6.6-2l8-4.4a2 2 0 0 1 1.5 0l8 4.4c.7.4 1 1.3.6 2-.4.5-.9.8-1.4.8z"/></svg>') !important;
+  background-position: center !important;
+  background-size: auto !important;
+  background-repeat: no-repeat !important;
+}
+
+.i-amphtml-story-page-open-attachment-inline[active] .i-amphtml-story-inline-page-attachment-arrow:before {
+  animation: i-amphtml-move-up-arrow-in-circle var(--i-amphtml-page-attachment-ui-animation-duration) var(--i-amphtml-page-attachment-ui-animation-delay) both !important;
+}
+
+[theme="dark"] .i-amphtml-story-inline-page-attachment-arrow:before {
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg fill="#fff" xmlns="http://www.w3.org/2000/svg" width="20" height="8"><path d="m18 7.7-.7-.2-7.3-4-7.3 4c-.7.4-1.6.2-2-.6-.4-.7-.1-1.6.6-2l8-4.4a2 2 0 0 1 1.5 0l8 4.4c.7.4 1 1.3.6 2-.4.5-.9.8-1.4.8z"/></svg>') !important;
+}
+
+.i-amphtml-story-page-open-attachment-inline .i-amphtml-story-page-attachment-label {
+  margin-bottom: 20px !important;
+  color: var(--i-amphtml-label-text-color) !important;
+}
+
+.i-amphtml-story-page-open-attachment-inline {
+  background: linear-gradient(0, rgba(0, 0, 0, 0.15), transparent) !important;
+  /* Button element overrides. */
+  border: none !important;
+  padding: 0 !important;
+}
+
+[theme="dark"].i-amphtml-story-page-open-attachment-inline {
+  background: linear-gradient(0, rgba(255, 255, 255, .25), rgba(255, 255, 255, 0)) !important;
+}
+
+/** For amp-story-page-outlink button. */
+
+.i-amphtml-story-page-open-attachment-outlink {
+  --i-amphtml-outlink-cta-background-color: white !important;
+  --i-amphtml-outlink-cta-text-color: black !important;
+}
+
+[theme="dark"].i-amphtml-story-page-open-attachment-outlink {
+  --i-amphtml-outlink-cta-background-color: black !important;
+  --i-amphtml-outlink-cta-text-color: white !important;
+}
+
+.i-amphtml-story-page-open-attachment-outlink[active]:not(.i-amphtml-story-page-open-attachment-outlink-no-animation-exp) .i-amphtml-story-outlink-page-attachment-outlink-chip {
+  animation: i-amphtml-tap-scale var(--i-amphtml-page-attachment-ui-animation-duration) var(--i-amphtml-page-attachment-ui-animation-delay) both !important;
+}
+
+.i-amphtml-story-outlink-page-attachment-arrow {
+  display: block !important;
+  cursor: pointer !important;
+  margin-bottom: 10px !important;
+  fill: var(--i-amphtml-outlink-cta-background-color) !important;
+  filter: drop-shadow(0px 2px 6px rgba(0, 0, 0, 0.3)) !important;
+}
+
+.i-amphtml-story-page-open-attachment[active]:not(.i-amphtml-story-page-open-attachment-outlink-no-animation-exp) .i-amphtml-story-outlink-page-attachment-arrow {
+  animation: i-amphtml-move-up-arrow var(--i-amphtml-page-attachment-ui-animation-duration) var(--i-amphtml-page-attachment-ui-animation-delay) both !important;
+}
+
+@keyframes i-amphtml-move-up-arrow {
+  0%, 100% {
+    opacity: 1;
+    transform: translateY(0);
+  }
+  45% {
+    opacity: 0;
+    transform: translateY(-7px);
+  }
+  45.01% {
+    transform: translateY(5px);
+  }
+}
+
+@keyframes i-amphtml-move-up-arrow-in-circle {
+  0%, 100% {
+    opacity: 1;
+    transform: translateY(0);
+  }
+  45% {
+    opacity: 0;
+    transform: translateY(-4px);
+  }
+  45.01% {
+    transform: translateY(3px);
+  }
+}
+
+@keyframes i-amphtml-tap-scale {
+  0%, 100% {
+    transform: scale(1);
+  }
+  45% {
+    transform: scale(.9);
+  }
+}
+
+.i-amphtml-story-outlink-page-attachment-outlink-chip {
+  display: flex !important;
+  position: relative !important;
+  padding: 10px 6px 10px 6px !important;
+  margin: 0 0 20px 0 !important;
+  height: 16px !important;
+  max-width: calc(100% - 64px) !important;
+  border-radius: 30px !important;
+  background: var(--i-amphtml-outlink-cta-background-color) !important;
+  place-items: center !important;
+  box-shadow: 0px 4px 10px rgba(0, 0, 0, .15) !important;
+}
+
+.i-amphtml-story-outlink-page-attachment-img {
+  height: 24px !important;
+  width: 24px !important;
+  vertical-align: middle !important;
+  background-size: cover !important;
+  background-repeat: no-repeat !important;
+  background-position: center !important;
+  border-radius: 50% !important;
+}
+
+.i-amphtml-story-page-open-attachment-outlink
+  .i-amphtml-story-page-attachment-label {
+  padding-inline-start: 6px !important;
+  padding-inline-end: 8px !important;
+  color: var(--i-amphtml-outlink-cta-text-color) !important;
+}
+
+.i-amphtml-story-page-open-attachment-outlink
+  .i-amphtml-story-page-attachment-label:only-child {
+  padding-inline-start: 8px !important;
+}
+
+.i-amphtml-story-outlink-page-attachment-label:only-child {
+  padding-inline-start: 8px !important;
+}
+
+.i-amphtml-story-page-open-attachment-link-icon {
+  width: 24px !important;
+  height: 24px !important;
+  fill: var(--i-amphtml-outlink-cta-text-color) !important;
+}
diff --git a/extensions/amp-story-page-attachment/0.1/amp-story-open-page-attachment.js b/extensions/amp-story-page-attachment/0.1/amp-story-open-page-attachment.js
new file mode 100644
index 000000000000..f65fb7b82ffe
--- /dev/null
+++ b/extensions/amp-story-page-attachment/0.1/amp-story-open-page-attachment.js
@@ -0,0 +1,287 @@
+/**
+ * @fileoverview Helper for amp-story rendering of page-attachment UI.
+ */
+import objStr from 'obj-str';
+
+import * as Preact from '#core/dom/jsx';
+import {scopedQuerySelector} from '#core/dom/query';
+import {computedStyle, setImportantStyles} from '#core/dom/style';
+import {getWin} from '#core/window';
+
+import {getExperimentBranch} from '#experiments';
+import {StoryAdSegmentExp} from '#experiments/story-ad-progress-segment';
+
+import {Services} from '#service';
+import {LocalizedStringId_Enum} from '#service/localization/strings';
+
+import {dev} from '#utils/log';
+
+import {
+  getRGBFromCssColorValue,
+  getTextColorForRGB,
+  maybeMakeProxyUrl,
+} from '../../amp-story/1.0/utils';
+
+/**
+ * @enum {string}
+ */
+const CtaAccentElement = {
+  TEXT: 'text',
+  BACKGROUND: 'background',
+};
+
+/**
+ * @enum {string}
+ */
+export const AttachmentTheme = {
+  LIGHT: 'light', // default
+  DARK: 'dark',
+  CUSTOM: 'custom',
+};
+
+const renderOutlinkAttachmentArrow = () => (
+  <svg
+    class="i-amphtml-story-outlink-page-attachment-arrow"
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 20 8"
+    width="20px"
+    height="8px"
+  >
+    <path d="m18 7.7-.7-.2-7.3-4-7.3 4c-.7.4-1.6.2-2-.6-.4-.7-.1-1.6.6-2l8-4.4a2 2 0 0 1 1.5 0l8 4.4c.7.4 1 1.3.6 2-.4.5-.9.8-1.4.8z" />
+  </svg>
+);
+
+/**
+ * Link icon used in amp-story-page-outlink UI and drawer.
+ * @return {!Element}
+ */
+export const renderOutlinkLinkIconElement = () => (
+  <svg
+    class="i-amphtml-story-page-open-attachment-link-icon"
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 24 24"
+  >
+    <path
+      fill-opacity=".1"
+      d="M12 0c6.6 0 12 5.4 12 12s-5.4 12-12 12S0 18.6 0 12 5.4 0 12 0z"
+    />
+    <path d="m13.8 14.6.2.5-.2.5-1.5 1.4c-.7.7-1.7 1.1-2.7 1.1A4 4 0 0 1 6.9 17a3.9 3.9 0 0 1-1.1-2.7 4 4 0 0 1 1.1-2.7l1.5-1.5.5-.1.5.2.2.5-.2.5-1.5 1.5c-.5.5-.7 1.1-.7 1.7 0 .6.3 1.3.7 1.7.5.5 1.1.7 1.7.7s1.3-.3 1.7-.7l1.5-1.5c.3-.3.7-.3 1 0zM17 7a3.9 3.9 0 0 0-2.7-1.1A4 4 0 0 0 11.6 7l-1.5 1.5-.1.4.2.5.5.2.5-.2 1.5-1.5c.5-.5 1.1-.7 1.7-.7.6 0 1.3.3 1.7.7.5.5.7 1.1.7 1.7 0 .6-.3 1.3-.7 1.7l-1.5 1.5-.2.5.2.5.5.2.5-.2 1.5-1.5c.7-.7 1.1-1.7 1.1-2.7-.1-1-.5-1.9-1.2-2.6zm-7.9 7.2.2.5.5.2.5-.2 4.5-4.5.2-.5-.2-.5c-.3-.2-.8-.2-1 .1l-4.5 4.5-.2.4z" />
+  </svg>
+);
+
+/**
+ * Determines which open attachment UI to render.
+ * @param {!Element} pageEl
+ * @param {!Element} attachmentEl
+ * @return {!Promise<Element>}
+ */
+export const renderPageAttachmentUI = (pageEl, attachmentEl) => {
+  // Outlinks can be an amp-story-page-outlink or the legacy version,
+  // an amp-story-page-attachment with an href.
+  const isOutlink =
+    attachmentEl.tagName === 'AMP-STORY-PAGE-OUTLINK' ||
+    attachmentEl.getAttribute('href');
+  if (isOutlink) {
+    return renderOutlinkUI(pageEl, attachmentEl);
+  } else {
+    return renderInlineUi(pageEl, attachmentEl);
+  }
+};
+
+/**
+ * @param {!Element} element
+ * @return {?string}
+ */
+const ctaLabelFromAttr = (element) =>
+  // For legacy support of amp-story-page-attachment with a src and cta-text attribute.
+  element.getAttribute('cta-text') || element.getAttribute('data-cta-text');
+
+/**
+ * @param {!Element} element
+ * @param {?string} label
+ * @return {!Promise<string>}
+ */
+const openLabelOrFallback = (element, label) => {
+  // Disallow empty label
+  if (label) {
+    const trimmedLabel = label.trim();
+    if (trimmedLabel) {
+      return Promise.resolve(trimmedLabel);
+    }
+  }
+
+  const localizationService = Services.localizationForDoc(element);
+  return localizationService.getLocalizedStringAsync(
+    LocalizedStringId_Enum.AMP_STORY_PAGE_ATTACHMENT_OPEN_LABEL
+  );
+};
+
+/**
+ * Renders inline page attachment UI.
+ * @param {!Element} pageEl
+ * @param {!Element} attachmentEl
+ * @return {!Promise<Element>}
+ */
+const renderOutlinkUI = (pageEl, attachmentEl) => {
+  // amp-story-page-outlink requires an anchor element child for SEO and analytics optimisations.
+  // amp-story-page-attachment uses this same codepath and allows an href attribute.
+  // This is hidden with css. Clicks are simulated from it when a remote attachment is clicked.
+  const anchorChild = scopedQuerySelector(pageEl, 'amp-story-page-outlink a');
+
+  // Copy title to the element if it exists.
+  const attachmentTitle =
+    anchorChild?.getAttribute('title') ||
+    attachmentEl.getAttribute('data-title');
+
+  const theme = attachmentEl.getAttribute('theme')?.toLowerCase();
+
+  // Set image.
+  const openImgAttr = attachmentEl.getAttribute('cta-image');
+
+  const noAnimation =
+    getExperimentBranch(getWin(pageEl), 'story-ad-auto-advance') ==
+    StoryAdSegmentExp.AUTO_ADVANCE_NEW_CTA_NOT_ANIMATED;
+
+  return openLabelOrFallback(
+    pageEl,
+    anchorChild?.textContent || ctaLabelFromAttr(attachmentEl)
+  ).then((openLabel) => {
+    const openAttachmentEl = (
+      <a
+        class={objStr({
+          'i-amphtml-story-page-open-attachment': true,
+          'i-amphtml-story-page-open-attachment-outlink': true,
+          'i-amphtml-story-page-open-attachment-outlink-no-animation-exp':
+            noAnimation,
+        })}
+        role="button"
+        target="_top"
+        title={attachmentTitle}
+        theme={theme}
+        aria-label={openLabel}
+      >
+        {renderOutlinkAttachmentArrow()}
+        <div class="i-amphtml-story-outlink-page-attachment-outlink-chip">
+          {openImgAttr && openImgAttr !== 'none' ? (
+            <div
+              class="i-amphtml-story-outlink-page-attachment-img"
+              style={{backgroundImage: `url(${openImgAttr}) !important`}}
+            ></div>
+          ) : openImgAttr ? null : (
+            renderOutlinkLinkIconElement()
+          )}
+          <span class="i-amphtml-story-page-attachment-label">{openLabel}</span>
+        </div>
+      </a>
+    );
+
+    if (theme === AttachmentTheme.CUSTOM) {
+      setCustomThemeStyles(attachmentEl, openAttachmentEl);
+    }
+
+    // Copy href to the element so it can be previewed on hover and long press.
+    const attachmentHref =
+      anchorChild?.getAttribute('href') || attachmentEl.getAttribute('href');
+    if (attachmentHref) {
+      openAttachmentEl.setAttribute('href', attachmentHref);
+    }
+    return openAttachmentEl;
+  });
+};
+
+/**
+ * Renders inline page attachment UI.
+ * @param {!Element} pageEl
+ * @param {!Element} attachmentEl
+ * @return {!Element}
+ */
+const renderInlineUi = (pageEl, attachmentEl) => {
+  const makeImgElWithBG = (attr) => {
+    const url = attachmentEl.getAttribute(attr);
+    if (!url) {
+      return;
+    }
+    const proxied = maybeMakeProxyUrl(url, pageEl.getAmpDoc());
+    return (
+      <div
+        class="i-amphtml-story-inline-page-attachment-img"
+        style={{backgroundImage: `url(${proxied}) !important`}}
+      ></div>
+    );
+  };
+
+  const theme = attachmentEl.getAttribute('theme')?.toLowerCase();
+
+  return openLabelOrFallback(pageEl, ctaLabelFromAttr(attachmentEl)).then(
+    (openLabel) => (
+      <a
+        class="i-amphtml-story-page-open-attachment i-amphtml-story-page-open-attachment-inline"
+        role="button"
+        theme={AttachmentTheme.DARK === theme && theme}
+        aria-label={openLabel}
+      >
+        <div class="i-amphtml-story-inline-page-attachment-chip">
+          {makeImgElWithBG('cta-image')}
+          {makeImgElWithBG('cta-image-2')}
+          <div class="i-amphtml-story-inline-page-attachment-arrow"></div>
+        </div>
+        {openLabel !== 'none' && (
+          <span class="i-amphtml-story-page-attachment-label">{openLabel}</span>
+        )}
+      </a>
+    )
+  );
+};
+
+/**
+ * Sets custom theme attributes.
+ * @param {!Element} attachmentEl
+ * @param {!Element} openAttachmentEl
+ */
+export const setCustomThemeStyles = (attachmentEl, openAttachmentEl) => {
+  if (!attachmentEl.hasAttribute('cta-accent-color')) {
+    dev().warn(
+      'AMP-STORY-PAGE-OUTLINK',
+      'No cta-accent-color attribute found.'
+    );
+  }
+
+  const accentColor =
+    attachmentEl.getAttribute('cta-accent-color') || '#000000';
+
+  // Calculating contrast color (black or white) needed for outlink CTA UI.
+  let contrastColor = null;
+  setImportantStyles(attachmentEl, {
+    'background-color': accentColor,
+  });
+
+  const win = getWin(attachmentEl);
+  const styles = computedStyle(win, attachmentEl);
+  const rgb = getRGBFromCssColorValue(styles['background-color']);
+  contrastColor = getTextColorForRGB(rgb);
+  setImportantStyles(attachmentEl, {
+    'background-color': '',
+  });
+  if (
+    attachmentEl.getAttribute('cta-accent-element') ===
+    CtaAccentElement.BACKGROUND
+  ) {
+    setImportantStyles(openAttachmentEl, {
+      '--i-amphtml-outlink-cta-background-color': accentColor,
+      '--i-amphtml-outlink-cta-text-color': contrastColor,
+    });
+    setImportantStyles(attachmentEl, {
+      '--i-amphtml-outlink-cta-background-color': accentColor,
+      '--i-amphtml-outlink-cta-text-color': contrastColor,
+    });
+  } else {
+    setImportantStyles(openAttachmentEl, {
+      '--i-amphtml-outlink-cta-background-color': contrastColor,
+      '--i-amphtml-outlink-cta-text-color': accentColor,
+    });
+    setImportantStyles(attachmentEl, {
+      '--i-amphtml-outlink-cta-background-color': contrastColor,
+      '--i-amphtml-outlink-cta-text-color': accentColor,
+    });
+  }
+};
diff --git a/extensions/amp-story/1.0/amp-story-page-attachment.css b/extensions/amp-story-page-attachment/0.1/amp-story-page-attachment.css
similarity index 85%
rename from extensions/amp-story/1.0/amp-story-page-attachment.css
rename to extensions/amp-story-page-attachment/0.1/amp-story-page-attachment.css
index 259386f4ed29..a173185c61cf 100644
--- a/extensions/amp-story/1.0/amp-story-page-attachment.css
+++ b/extensions/amp-story-page-attachment/0.1/amp-story-page-attachment.css
@@ -1,4 +1,5 @@
-
+@import "./amp-story-draggable-drawer.css";
+@import './amp-story-form.css';
 
 /** Remote attachment styles. */
 
@@ -80,6 +81,7 @@ amp-story[desktop] .i-amphtml-story-page-attachment-remote  {
 }
 
 .i-amphtml-story-page-attachment-remote-title :first-child {
+  flex-shrink: 0 !important;
   font-weight: bold !important;
 }
 
@@ -125,3 +127,27 @@ amp-story[desktop] .i-amphtml-story-page-attachment-remote  {
   opacity: 1;
  }
 }
+
+/** Scrim on amp-story-page when attachment is active */
+.i-amphtml-story-page-attachment-active::after {
+  content: '' !important;
+  display: block !important;
+  left: 0 !important;
+  top: 0 !important;
+  bottom: 0 !important;
+  right: 0 !important;
+  position: absolute !important;
+  background: #000 !important;
+  z-index: 3 !important;
+  animation: i-amphtml-attachment-overlay-opacity 0.3s cubic-bezier(0.0, 0.0, 0.2, 1) forwards !important;
+}
+
+@keyframes i-amphtml-attachment-overlay-opacity {
+  0% {
+    opacity: 0;
+  }
+
+  100% {
+    opacity: 0.5;
+  }
+}
diff --git a/extensions/amp-story-page-attachment/0.1/amp-story-page-attachment.js b/extensions/amp-story-page-attachment/0.1/amp-story-page-attachment.js
new file mode 100644
index 000000000000..528032634d42
--- /dev/null
+++ b/extensions/amp-story-page-attachment/0.1/amp-story-page-attachment.js
@@ -0,0 +1,683 @@
+import {devAssert} from '#core/assert';
+import {removeElement, toggleAttribute} from '#core/dom';
+import * as Preact from '#core/dom/jsx';
+import {closest, closestAncestorElementBySelector} from '#core/dom/query';
+import {toggle} from '#core/dom/style';
+import {getHistoryState} from '#core/window/history';
+
+import {Services} from '#service';
+import {LocalizedStringId_Enum} from '#service/localization/strings';
+
+import {dev} from '#utils/log';
+
+import {localizeTemplate} from 'extensions/amp-story/1.0/amp-story-localization-service';
+
+import {DraggableDrawer, DrawerState} from './amp-story-draggable-drawer';
+import {
+  allowlistFormActions,
+  setupResponseAttributeElements,
+} from './amp-story-form';
+import {
+  AttachmentTheme,
+  renderOutlinkLinkIconElement,
+  renderPageAttachmentUI,
+} from './amp-story-open-page-attachment';
+
+import {CSS as pageAttachmentCss} from '../../../build/amp-story-open-page-attachment-0.1.css';
+import {CSS} from '../../../build/amp-story-page-attachment-0.1.css';
+import {
+  Action,
+  StateProperty,
+  UIType_Enum,
+} from '../../amp-story/1.0/amp-story-store-service';
+import {HistoryState, setHistoryState} from '../../amp-story/1.0/history';
+import {StoryAnalyticsEvent} from '../../amp-story/1.0/story-analytics';
+import {
+  createShadowRootWithStyle,
+  dependsOnStoryServices,
+  triggerClickFromLightDom,
+} from '../../amp-story/1.0/utils';
+
+/**
+ * Distance to swipe before opening attachment.
+ * @const {number}
+ */
+const OPEN_THRESHOLD_PX = 150;
+
+/**
+ * Max pixels to transform the remote attachment URL preview. Equivilent to the height of preview element.
+ * @const {number}
+ */
+const DRAG_CAP_PX = 56;
+
+/**
+ * Duration of post-tap URL preview progress bar animation minus 100ms.
+ * The minus 100ms roughly accounts for the small system delay in opening a link.
+ * @const {number}
+ */
+const POST_TAP_ANIMATION_DURATION = 500;
+
+/**
+ * @enum
+ */
+const AttachmentType = {
+  INLINE: 0,
+  OUTLINK: 1,
+};
+
+/**
+ * AMP Story page attachment.
+ */
+export class AmpStoryPageAttachment extends DraggableDrawer {
+  /** @param {!AmpElement} element */
+  constructor(element) {
+    super(element);
+
+    /** @private @const {!Element} */
+    this.storyEl_ = devAssert(
+      closestAncestorElementBySelector(this.element, 'amp-story')
+    );
+
+    /** @private @const {!Element} */
+    this.pageEl_ = devAssert(
+      closestAncestorElementBySelector(this.element, 'amp-story-page')
+    );
+
+    /** @private @const {!../../amp-story/1.0/story-analytics.StoryAnalyticsService} */
+    this.analyticsService_ = Services.storyAnalyticsService(this.win);
+
+    /** @private @const {!../../../src/service/history-impl.History} */
+    this.historyService_ = Services.historyForDoc(this.element);
+
+    /** @private {?AttachmentType} */
+    this.type_ = null;
+
+    /** @private {?Element} */
+    this.outlinkEl_ = null;
+
+    /** @private {?Element} */
+    this.legacyOutlinkEl_ = null;
+  }
+
+  /**
+   * @override
+   */
+  buildCallback() {
+    super.buildCallback();
+    this.buildOpenAttachmentUI_();
+    this.maybeSetDarkThemeForElement_(this.headerEl);
+    this.maybeSetDarkThemeForElement_(this.element);
+
+    // Outlinks can be an amp-story-page-outlink or the legacy version,
+    // an amp-story-page-attachment with an href.
+    const isOutlink =
+      this.element.tagName === 'AMP-STORY-PAGE-OUTLINK' ||
+      this.element.hasAttribute('href');
+    this.type_ = isOutlink ? AttachmentType.OUTLINK : AttachmentType.INLINE;
+
+    if (this.type_ === AttachmentType.INLINE) {
+      this.buildInline_();
+    }
+
+    this.win.addEventListener('pageshow', (event) => {
+      // On browser back, Safari does not reload the page but resumes its cached
+      // version. This event's parameter lets us know when this happens so we
+      // can cleanup the remote opening animation.
+      if (event.persisted) {
+        this.closeInternal_(false /** shouldAnimate */);
+      }
+    });
+
+    toggle(this.element, true);
+    this.element.setAttribute('aria-live', 'assertive');
+  }
+
+  /**
+   * @override
+   */
+  layoutCallback() {
+    super.layoutCallback();
+    // Outlink renders an image and must be built in layoutCallback.
+    if (this.type_ === AttachmentType.OUTLINK) {
+      return this.buildOutlink_();
+    }
+  }
+
+  /** @private */
+  buildOpenAttachmentUI_() {
+    // To prevent 'title' attribute from being used by browser, copy value to 'data-title' and remove.
+    if (this.element.hasAttribute('title')) {
+      this.element.setAttribute(
+        'data-title',
+        this.element.getAttribute('title')
+      );
+      this.element.removeAttribute('title');
+    }
+
+    if (!this.openAttachmentEl_) {
+      renderPageAttachmentUI(this.pageEl_, this.element).then((el) => {
+        this.openAttachmentEl_ = el;
+
+        // This ensures `active` is set on first render.
+        // Otherwise setState may be called before this.openAttachmentEl_ exists.
+        if (this.storyEl_.hasAttribute('active')) {
+          this.openAttachmentEl_.setAttribute('active', '');
+        }
+
+        const container = (
+          <div
+            class="i-amphtml-story-page-open-attachment-host"
+            role="button"
+            onClick={(e) => {
+              // Prevent default so link can be opened programmatically after URL preview is shown.
+              e.preventDefault();
+              this.open();
+            }}
+          ></div>
+        );
+
+        this.mutateElement(() => {
+          this.pageEl_.appendChild(
+            createShadowRootWithStyle(
+              container,
+              this.openAttachmentEl_,
+              pageAttachmentCss
+            )
+          );
+        });
+      });
+    }
+  }
+
+  /**
+   * Builds inline page attachment's drawer UI.
+   * @private
+   */
+  buildInline_() {
+    const titleText =
+      this.element.getAttribute('title') ||
+      this.element.getAttribute('data-title');
+
+    this.headerEl.appendChild(
+      <div class="i-amphtml-story-draggable-drawer-header-title-and-close">
+        <button
+          class="i-amphtml-story-page-attachment-close-button"
+          i-amphtml-i18n-aria-label={
+            LocalizedStringId_Enum.AMP_STORY_CLOSE_BUTTON_LABEL
+          }
+          role="button"
+          onClick={() => this.close_()}
+          tabindex="-1"
+        ></button>
+        {titleText && (
+          <span class="i-amphtml-story-page-attachment-title">{titleText}</span>
+        )}
+      </div>
+    );
+    localizeTemplate(this.headerEl, this.element);
+
+    const forms = this.element.querySelectorAll('form');
+    if (forms.length > 0) {
+      allowlistFormActions(this.win);
+
+      forms.forEach((form) => {
+        // Scroll each response attribute element into view, when displayed.
+        setupResponseAttributeElements(form, this.storyEl_).forEach((el) => {
+          // TODO(wg-stories): Share ResizeObserver for runtime performance.
+          new this.win.ResizeObserver((e) => {
+            if (
+              this.state === DrawerState.OPEN &&
+              e[0].contentRect.height > 0
+            ) {
+              el./*OK*/ scrollIntoView({
+                behavior: 'smooth',
+                block: 'nearest',
+              });
+            }
+          }).observe(el);
+        });
+      });
+
+      // Page attachments that contain forms must display the page's publisher
+      // domain above the attachment's contents. This enables users to gauge
+      // the trustworthiness of publishers before sending data to them.
+      this.headerEl.append(this.createDomainLabelElement_());
+      this.headerEl.classList.add('i-amphtml-story-page-attachment-with-form');
+    }
+
+    const templateEl = this.element.querySelector(
+      '.i-amphtml-story-draggable-drawer'
+    );
+
+    while (this.element.firstChild && this.element.firstChild !== templateEl) {
+      this.contentEl.appendChild(this.element.firstChild);
+    }
+  }
+
+  /**
+   * Builds outlink CTA drawer UI.
+   * @return {!Promise}
+   * @private
+   */
+  buildOutlink_() {
+    this.setDragCap_(DRAG_CAP_PX);
+    this.setOpenThreshold_(OPEN_THRESHOLD_PX);
+
+    this.headerEl.classList.add(
+      'i-amphtml-story-draggable-drawer-header-attachment-remote'
+    );
+    this.element.classList.add('i-amphtml-story-page-attachment-remote');
+
+    const isPageOutlink = this.element.tagName === 'AMP-STORY-PAGE-OUTLINK';
+
+    // For backwards compatibility if element is amp-story-page-outlink.
+    const hrefAttr = isPageOutlink
+      ? this.element.querySelector('a').getAttribute('href')
+      : this.element.getAttribute('href');
+
+    // Set image.
+    const openImgAttr = this.element.getAttribute('cta-image');
+    const image =
+      openImgAttr && openImgAttr !== 'none' ? (
+        <div
+          class="i-amphtml-story-page-attachment-remote-img"
+          style={{backgroundImage: `url(${openImgAttr}) !important`}}
+        ></div>
+      ) : (
+        // Attach link icon SVG by default.
+        renderOutlinkLinkIconElement()
+      );
+
+    // Use an anchor element to make this a real link in vertical rendering.
+    const link = (
+      <a
+        class="i-amphtml-story-page-attachment-remote-content"
+        target="_blank"
+        // Navigation is handled programmatically. Disable clicks on the placeholder
+        // anchor to prevent from users triggering double navigations, which has
+        // side effects in native contexts opening webviews/CCTs.
+        onClick={(event) => event.preventDefault()}
+      >
+        {image}
+        <span class="i-amphtml-story-page-attachment-remote-title">
+          <span
+            i-amphtml-i18n-text-content={
+              LocalizedStringId_Enum.AMP_STORY_OPEN_OUTLINK_TEXT
+            }
+          ></span>
+          <span>{hrefAttr}</span>
+        </span>
+        <svg
+          class="i-amphtml-story-page-attachment-remote-icon"
+          xmlns="http://www.w3.org/2000/svg"
+          viewBox="0 0 48 48"
+        >
+          <path d="M38 38H10V10h14V6H10a4 4 0 0 0-4 4v28a4 4 0 0 0 4 4h28a4 4 0 0 0 4-4V24h-4v14zM28 6v4h7.2L15.5 29.7l2.8 2.8L38 12.8V20h4V6H28z" />
+        </svg>
+      </a>
+    );
+
+    if (isPageOutlink) {
+      // The target must be '_top' for page outlinks, which will result in the
+      // link opening in the current tab. Opening links in a new tab requires a
+      // trusted event, and Safari does not consider swiping up to be trusted.
+      this.element.querySelector('a').setAttribute('target', '_top');
+    }
+
+    // URL will be validated and resolved based on the canonical URL if relative
+    // when navigating.
+    // TODO(wg-stories): It would be much nicer if this attribute was set inline
+    // on the JSX tag above. However, that makes the LGTM analysis fail on
+    // "Potentially unsafe external link".
+    // See https://lgtm.com/rules/1806963085/
+    // We set the href imperatively here to avoid triggering the warning
+    // (an lgtm-disable comment will not work due to formatting, unfortunately.)
+    // Consider whether we can use `noopener` and/or `noreferrer` so that we
+    // can inline the attribute, and avoid the warning.
+    link.setAttribute('href', hrefAttr);
+
+    return localizeTemplate(link, this.element).then(() =>
+      this.mutateElement(() => this.contentEl.appendChild(link))
+    );
+  }
+
+  /**
+   * Activate or deactivate open page attachment
+   * @param {boolean} isActive
+   */
+  setOpenAttachmentActive(isActive) {
+    this.openAttachmentEl_ &&
+      toggleAttribute(this.openAttachmentEl_, 'active', isActive);
+  }
+
+  /**
+   * @override
+   */
+  initializeListeners_() {
+    super.initializeListeners_();
+
+    // Always open links in a new tab.
+    this.contentEl.addEventListener(
+      'click',
+      (event) => {
+        const {target} = event;
+        if (target.tagName.toLowerCase() === 'a') {
+          target.setAttribute('target', '_blank');
+        }
+      },
+      true /** useCapture */
+    );
+
+    // Closes the attachment on opacity background clicks.
+    this.element.addEventListener(
+      'click',
+      (event) => {
+        if (
+          event.target.tagName.toLowerCase() === 'amp-story-page-attachment'
+        ) {
+          this.close_();
+        }
+      },
+      true /** useCapture */
+    );
+
+    // Closes the remote attachment drawer when navigation deeplinked to an app.
+    if (this.type_ === AttachmentType.OUTLINK) {
+      const ampdoc = this.getAmpDoc();
+      ampdoc.onVisibilityChanged(() => {
+        if (ampdoc.isVisible() && this.state === DrawerState.OPEN) {
+          this.closeInternal_(false /** shouldAnimate */);
+        }
+      });
+    }
+
+    this.storeService.subscribe(
+      StateProperty.CURRENT_PAGE_ID,
+      (id) => {
+        this.setOpenAttachmentActive(id === this.pageEl_.id);
+      },
+      true
+    );
+  }
+
+  /**
+   * Get outlink element.
+   * @return {?Element}
+   * @private
+   */
+  getOutlinkEl_() {
+    if (!this.outlinkEl_) {
+      this.outlinkEl_ = this.element.parentElement
+        .querySelector('amp-story-page-outlink')
+        ?.querySelector('a');
+    }
+    return this.outlinkEl_;
+  }
+
+  /**
+   * Get legacy outlink element.
+   * @return {?Element}
+   * @private
+   */
+  getLegacyOutlinkEl_() {
+    if (!this.legacyOutlinkEl_) {
+      this.legacyOutlinkEl_ = this.element.parentElement
+        .querySelector('.i-amphtml-story-page-open-attachment-host')
+        ?.shadowRoot?.querySelector('a.i-amphtml-story-page-open-attachment');
+    }
+    return this.legacyOutlinkEl_;
+  }
+
+  /**
+   * Check if two URLs have the same origin and path but different hashes at the end.
+   * @param {string} url1
+   * @param {string} url2
+   * @return {boolean}
+   * @private
+   */
+  urlsHaveSameOriginAndPath_(url1, url2) {
+    if (!url1 || !url2) {
+      return false;
+    }
+
+    const url1WithoutHash = url1.split('#')[0];
+    const url2WithoutHash = url2.split('#')[0];
+
+    return url1WithoutHash === url2WithoutHash;
+  }
+
+  /**
+   * If the element is an amp-story-page-outlink the click target is its anchor element child.
+   * This is for SEO and analytics optimisation.
+   * Otherwise the element is the legacy version, amp-story-page-attachment with an href,
+   * and a click target is the button built by the component.
+   * @private
+   */
+  programmaticallyClickOnOutlink_() {
+    const pageOutlinkChild = this.getOutlinkEl_();
+    const pageAttachmentChild = this.getLegacyOutlinkEl_();
+    if (pageOutlinkChild) {
+      pageOutlinkChild.click();
+    } else if (pageAttachmentChild) {
+      triggerClickFromLightDom(pageAttachmentChild, this.element);
+    }
+  }
+
+  /**
+   * @override
+   */
+  open(shouldAnimate = true) {
+    // If the target is a branching link, redirect immediately without opening the drawer.
+    const outlinkEl = this.getOutlinkEl_() || this.getLegacyOutlinkEl_();
+    if (
+      this.urlsHaveSameOriginAndPath_(window.location.href, outlinkEl?.href) &&
+      outlinkEl?.href.includes('#page=')
+    ) {
+      if (window.location.href === outlinkEl.href) {
+        // Should hard reload if the starting URL is the same as the target URL, otherwise
+        // the page wouldn't do hash navigation at all.
+        window.location.reload(true);
+      } else {
+        this.programmaticallyClickOnOutlink_();
+      }
+      return;
+    }
+
+    if (this.state === DrawerState.OPEN) {
+      return;
+    }
+
+    super.open(shouldAnimate);
+
+    this.storeService.dispatch(Action.TOGGLE_PAGE_ATTACHMENT_STATE, true);
+    this.storeService.dispatch(Action.TOGGLE_SYSTEM_UI_IS_VISIBLE, false);
+
+    // Don't create a new history entry for remote attachment as user is
+    // navigating away.
+    if (this.type_ !== AttachmentType.OUTLINK) {
+      const currentHistoryState = /** @type {!Object} */ (
+        getHistoryState(this.win.history)
+      );
+      const historyState = {
+        ...currentHistoryState,
+        [HistoryState.ATTACHMENT_PAGE_ID]: this.storeService.get(
+          StateProperty.CURRENT_PAGE_ID
+        ),
+      };
+
+      this.historyService_.push(() => this.closeInternal_(), historyState);
+    }
+
+    this.toggleBackgroundOverlay_(true);
+    this.toggleCloseButtonTabIndex_(true);
+
+    this.analyticsService_.triggerEvent(StoryAnalyticsEvent.OPEN, this.element);
+    this.analyticsService_.triggerEvent(
+      StoryAnalyticsEvent.PAGE_ATTACHMENT_ENTER
+    );
+
+    if (this.type_ === AttachmentType.OUTLINK) {
+      this.openRemote_();
+    }
+  }
+
+  /**
+   * Triggers a remote attachment preview URL animation on mobile,
+   * and redirects to the specified URL.
+   * @private
+   */
+  openRemote_() {
+    const isMobileUI =
+      this.storeService.get(StateProperty.UI_STATE) === UIType_Enum.MOBILE;
+    if (!isMobileUI) {
+      this.programmaticallyClickOnOutlink_();
+    } else {
+      // Timeout to shows post-tap animation on mobile only.
+      Services.timerFor(this.win).delay(() => {
+        this.programmaticallyClickOnOutlink_();
+      }, POST_TAP_ANIMATION_DURATION);
+    }
+  }
+
+  /**
+   * Ensures the history state we added when opening the drawer is popped,
+   * and closes the drawer either directly, or through the onPop callback.
+   * @override
+   */
+  close_() {
+    switch (this.state) {
+      // If the drawer was open, pop the history entry that was added, which
+      // will close the drawer through the onPop callback.
+      case DrawerState.OPEN:
+      case DrawerState.DRAGGING_TO_CLOSE:
+        this.historyService_.goBack();
+        break;
+      // If the drawer was not open, no history entry was added, so we can
+      // close the drawer directly.
+      case DrawerState.DRAGGING_TO_OPEN:
+        this.closeInternal_();
+        break;
+    }
+  }
+
+  /**
+   * @override
+   */
+  closeInternal_(shouldAnimate = true) {
+    if (this.state === DrawerState.CLOSED) {
+      return;
+    }
+
+    super.closeInternal_(shouldAnimate);
+
+    this.toggleBackgroundOverlay_(false);
+    this.toggleCloseButtonTabIndex_(false);
+
+    this.storeService.dispatch(Action.TOGGLE_PAGE_ATTACHMENT_STATE, false);
+    this.storeService.dispatch(Action.TOGGLE_SYSTEM_UI_IS_VISIBLE, true);
+
+    const storyEl = closest(this.element, (el) => el.tagName === 'AMP-STORY');
+    const animationEl = storyEl.querySelector(
+      '.i-amphtml-story-page-attachment-expand'
+    );
+    if (animationEl) {
+      this.mutateElement(() => {
+        removeElement(dev().assertElement(animationEl));
+      });
+    }
+
+    setHistoryState(this.win, HistoryState.ATTACHMENT_PAGE_ID, null);
+
+    this.analyticsService_.triggerEvent(
+      StoryAnalyticsEvent.CLOSE,
+      this.element
+    );
+    this.analyticsService_.triggerEvent(
+      StoryAnalyticsEvent.PAGE_ATTACHMENT_EXIT
+    );
+  }
+
+  /**
+   * @param {boolean} isActive
+   * @private
+   */
+  toggleBackgroundOverlay_(isActive) {
+    const activePageEl = closest(
+      this.element,
+      (el) => el.tagName === 'AMP-STORY-PAGE'
+    );
+    this.mutateElement(() => {
+      activePageEl.classList.toggle(
+        'i-amphtml-story-page-attachment-active',
+        isActive
+      );
+    });
+  }
+
+  /**
+   * Handles tab-ability of header close button.
+   * @param {boolean} isActive
+   * @private
+   */
+  toggleCloseButtonTabIndex_(isActive) {
+    const closeButton = this.headerEl.querySelector(
+      '.i-amphtml-story-page-attachment-close-button'
+    );
+    // If attachment is outlink, there is no close button.
+    if (!closeButton) {
+      return;
+    }
+    this.mutateElement(() => {
+      if (isActive) {
+        closeButton.removeAttribute('tabindex');
+      } else {
+        closeButton.setAttribute('tabindex', -1);
+      }
+    });
+  }
+
+  /**
+   * Updates the given element with the appropriate class or attribute, if the
+   * page attachment's theme is 'dark'.
+   * @param {!Element} element The element upon which to set the dark theme.
+   * @private
+   */
+  maybeSetDarkThemeForElement_(element) {
+    const theme = this.element.getAttribute('theme')?.toLowerCase();
+    if (theme && AttachmentTheme.DARK === theme) {
+      element.setAttribute('theme', theme);
+    }
+  }
+
+  /**
+   * Create the domain label element to be displayed at the top of the page
+   * attachment.
+   * @return {!Element} element The domain label element.
+   * @private
+   */
+  createDomainLabelElement_() {
+    return (
+      <div class="i-amphtml-story-page-attachment-domain-label">
+        {this.getPublisherOrigin_()}
+      </div>
+    );
+  }
+
+  /**
+   * Returns the publisher origin URL string (e.g., "stories.example.com").
+   * @return {string} The domain of the publisher.
+   * @private
+   */
+  getPublisherOrigin_() {
+    const urlService = Services.urlForDoc(this.element);
+    const url = this.getAmpDoc().getUrl();
+    const publisherOrigin = urlService.getSourceOrigin(url);
+    return publisherOrigin.replace(/^http(s)?:\/\/(www.)?/, '');
+  }
+}
+
+AMP.extension('amp-story-page-attachment', '0.1', (AMP) => {
+  const delayedAttachmentClass = dependsOnStoryServices(AmpStoryPageAttachment);
+  AMP.registerElement('amp-story-page-attachment', delayedAttachmentClass, CSS);
+  AMP.registerElement('amp-story-page-outlink', delayedAttachmentClass);
+});
diff --git a/extensions/amp-story-page-attachment/0.1/test/test-amp-story-open-page-attachment.js b/extensions/amp-story-page-attachment/0.1/test/test-amp-story-open-page-attachment.js
new file mode 100644
index 000000000000..e817fda7c269
--- /dev/null
+++ b/extensions/amp-story-page-attachment/0.1/test/test-amp-story-open-page-attachment.js
@@ -0,0 +1,288 @@
+import {AmpDocSingle} from '#service/ampdoc-impl';
+import {LocalizationService} from '#service/localization';
+
+import {AmpStoryStoreService} from 'extensions/amp-story/1.0/amp-story-store-service';
+import {registerServiceBuilder} from 'src/service-helpers';
+
+import LocalizedStringsEn from '../../../amp-story/1.0/_locales/en.json' assert {type: 'json'}; // lgtm[js/syntax-error]
+import {AmpStoryPageAttachment} from '../amp-story-page-attachment';
+
+describes.realWin(
+  'amp-story-page-attachment',
+  {amp: true, extensions: ['amp-story-page-attachment:0.1']},
+  (env) => {
+    let attachmentEl;
+    let attachment;
+    let outlinkEl;
+    let outlink;
+    let win;
+    let page;
+    let storyEl;
+
+    beforeEach(() => {
+      win = env.win;
+
+      // Set up the story.
+      storyEl = win.document.createElement('amp-story');
+      page = win.document.createElement('amp-story-page');
+      storyEl.getAmpDoc = () => new AmpDocSingle(win);
+      win.document.body.appendChild(storyEl);
+      storyEl.appendChild(page);
+
+      const localizationService = new LocalizationService(win.document.body);
+      registerServiceBuilder(win, 'localization', function () {
+        return localizationService;
+      });
+      localizationService.registerLocalizedStringBundles({
+        'en': LocalizedStringsEn,
+      });
+
+      const storeService = new AmpStoryStoreService(win);
+      registerServiceBuilder(win, 'story-store', function () {
+        return storeService;
+      });
+
+      // Set up the attachment element for inline attachment testing.
+      attachmentEl = win.document.createElement('amp-story-page-attachment');
+      attachmentEl.getAmpDoc = () => new AmpDocSingle(win);
+      page.appendChild(attachmentEl);
+      page.getAmpDoc = () => new AmpDocSingle(win);
+
+      attachment = new AmpStoryPageAttachment(attachmentEl);
+      env.sandbox.stub(attachment, 'mutateElement').callsFake((fn) => fn());
+
+      // Set up the outlink element for outlink testing.
+      outlinkEl = win.document.createElement('amp-story-page-outlink');
+      outlinkEl.getAmpDoc = () => new AmpDocSingle(win);
+      page.appendChild(outlinkEl);
+      outlinkEl.appendChild(win.document.createElement('a'));
+      outlink = new AmpStoryPageAttachment(outlinkEl);
+      env.sandbox.stub(outlink, 'mutateElement').callsFake((fn) => fn());
+    });
+
+    afterEach(() => {
+      attachmentEl.remove();
+      outlinkEl.remove();
+    });
+
+    it('should build the legacy outlinking amp-story-page-attachment UI with target="_top" to navigate in top window. For viewers, this ensures the link will open in the parent window.', async () => {
+      attachmentEl.setAttribute('layout', 'nodisplay');
+      attachmentEl.setAttribute('href', 'google.com');
+      page.appendChild(attachmentEl);
+      await attachment.buildCallback();
+      await attachment.layoutCallback();
+
+      const openAttachmentEl = storyEl.querySelector(
+        '.i-amphtml-story-page-open-attachment'
+      );
+
+      expect(openAttachmentEl.getAttribute('target')).to.eql('_top');
+    });
+
+    it('should build amp-story-page-outlink UI with target="_top" to navigate in top level browsing context. For viewers, this ensures the link will open in the parent window.', async () => {
+      outlinkEl.setAttribute('layout', 'nodisplay');
+      const anchorEl = win.document.createElement('a');
+      outlinkEl.appendChild(anchorEl);
+
+      await outlink.buildCallback();
+      await outlink.layoutCallback();
+
+      const openAttachmentEl = storyEl.querySelector(
+        '.i-amphtml-story-page-open-attachment'
+      );
+
+      expect(openAttachmentEl.getAttribute('target')).to.eql('_top');
+    });
+
+    it('should build the open outlink UI with same codepath as page attachment', async () => {
+      outlinkEl.setAttribute('layout', 'nodisplay');
+      await outlink.buildCallback();
+      await outlink.layoutCallback();
+
+      const openoutlinkEl = page.querySelector(
+        '.i-amphtml-story-page-open-attachment'
+      );
+      expect(openoutlinkEl).to.exist;
+    });
+
+    it('should build the amp-story-page-attachment UI with one image', async () => {
+      attachmentEl.setAttribute('layout', 'nodisplay');
+      attachmentEl.setAttribute('cta-image', 'nodisplay');
+      page.appendChild(attachmentEl);
+
+      await attachment.buildCallback();
+      await attachment.layoutCallback();
+
+      const openAttachmentEl = page.querySelector(
+        '.i-amphtml-story-page-open-attachment'
+      );
+
+      expect(
+        openAttachmentEl.querySelector(
+          '.i-amphtml-story-inline-page-attachment-img'
+        )
+      ).to.exist;
+    });
+
+    it('should build the amp-story-page-attachment UI with two images', async () => {
+      attachmentEl.setAttribute('layout', 'nodisplay');
+      attachmentEl.setAttribute('cta-image', 'nodisplay');
+      attachmentEl.setAttribute('cta-image-2', 'nodisplay');
+
+      await attachment.buildCallback();
+      await attachment.layoutCallback();
+
+      const openAttachmentEl = page.querySelector(
+        '.i-amphtml-story-page-open-attachment'
+      );
+
+      expect(
+        openAttachmentEl.querySelectorAll(
+          '.i-amphtml-story-inline-page-attachment-img'
+        ).length
+      ).to.equal(2);
+    });
+
+    it('should NOT rewrite the amp-story-page-attachment UI images to a proxy URL', async () => {
+      const src = 'https://examples.com/foo.bar.png';
+      attachmentEl.setAttribute('layout', 'nodisplay');
+      attachmentEl.setAttribute('cta-image', src);
+
+      await attachment.buildCallback();
+      await attachment.layoutCallback();
+
+      const openAttachmentEl = page.querySelector(
+        '.i-amphtml-story-page-open-attachment'
+      );
+
+      const imgEl = openAttachmentEl.querySelector(
+        '.i-amphtml-story-inline-page-attachment-img'
+      );
+      expect(imgEl.getAttribute('style')).to.contain(src);
+    });
+
+    it('should build the amp-story-page-attachment with href (legacy) UI', async () => {
+      attachmentEl.setAttribute('layout', 'nodisplay');
+      attachmentEl.setAttribute('href', 'www.google.com');
+
+      await attachment.buildCallback();
+      await attachment.layoutCallback();
+
+      const openAttachmentEl = page.querySelector(
+        '.i-amphtml-story-page-open-attachment'
+      );
+
+      expect(
+        openAttachmentEl.querySelector(
+          '.i-amphtml-story-page-open-attachment-link-icon'
+        )
+      ).to.exist;
+    });
+
+    it('should build the amp-story-page-outlink UI', async () => {
+      outlinkEl.setAttribute('layout', 'nodisplay');
+      const anchorChild = win.document.createElement('a');
+      outlinkEl.appendChild(anchorChild);
+
+      await outlink.buildCallback();
+      await outlink.layoutCallback();
+
+      const openAttachmentEl = page.querySelector(
+        '.i-amphtml-story-page-open-attachment'
+      );
+
+      expect(
+        openAttachmentEl.querySelector(
+          '.i-amphtml-story-page-open-attachment-link-icon'
+        )
+      ).to.exist;
+    });
+
+    it('should build the open attachment UI with custom text', async () => {
+      attachmentEl.setAttribute('layout', 'nodisplay');
+      attachmentEl.setAttribute('cta-text', 'Custom text');
+
+      await attachment.buildCallback();
+      await attachment.layoutCallback();
+
+      const openAttachmentLabelEl = page.querySelector(
+        '.i-amphtml-story-page-attachment-label'
+      );
+      expect(openAttachmentLabelEl.textContent).to.equal('Custom text');
+    });
+
+    it('should build the open attachment UI with default text if the custom text is empty', async () => {
+      attachmentEl.setAttribute('layout', 'nodisplay');
+      attachmentEl.setAttribute('cta-text', ' ');
+
+      await attachment.buildCallback();
+      await attachment.layoutCallback();
+
+      const openAttachmentLabelEl = page.querySelector(
+        '.i-amphtml-story-page-attachment-label'
+      );
+      expect(openAttachmentLabelEl.textContent).to.equal('Swipe up');
+    });
+
+    it('should use the correct outlink text', async () => {
+      const firstPage = win.document.createElement('amp-story-page');
+      storyEl.insertBefore(firstPage, page);
+      const otherOutlink = document.createElement('amp-story-page-outlink');
+      otherOutlink.appendChild(win.document.createElement('a'));
+      firstPage.appendChild(otherOutlink);
+
+      outlinkEl.querySelector('a').textContent = 'Custom text';
+      otherOutlink.querySelector('a').textContent = 'Wrong text';
+
+      await outlink.buildCallback();
+      await outlink.layoutCallback();
+
+      const openOutlinkLabelEl = page.querySelector(
+        '.i-amphtml-story-page-attachment-label'
+      );
+      expect(openOutlinkLabelEl.textContent).to.equal('Custom text');
+    });
+
+    it('should use cta-text attribute when data-cta-text also exist', async () => {
+      attachmentEl.setAttribute('layout', 'nodisplay');
+      attachmentEl.setAttribute('cta-text', 'CTA text');
+      attachmentEl.setAttribute('data-cta-text', 'data CTA text');
+
+      await attachment.buildCallback();
+      await attachment.layoutCallback();
+
+      const openAttachmentLabelEl = page.querySelector(
+        '.i-amphtml-story-page-attachment-label'
+      );
+
+      expect(openAttachmentLabelEl.textContent).to.equal('CTA text');
+    });
+
+    it('should build the open attachment UI with link icon', async () => {
+      outlinkEl.setAttribute('layout', 'nodisplay');
+      outlinkEl.setAttribute('cta-text', 'Outlink with icon');
+
+      await outlink.buildCallback();
+      await outlink.layoutCallback();
+
+      const openAttachmentLinkIcon = page.querySelector(
+        '.i-amphtml-story-page-open-attachment .i-amphtml-story-page-open-attachment-link-icon'
+      );
+      expect(openAttachmentLinkIcon).to.exist;
+    });
+
+    it('should build the open attachment UI with no icon if cta-image=none', async () => {
+      outlinkEl.setAttribute('layout', 'nodisplay');
+      outlinkEl.setAttribute('cta-text', 'Outlink without icon');
+      outlinkEl.setAttribute('cta-image', 'none');
+
+      await outlink.buildCallback();
+      await outlink.layoutCallback();
+
+      const openAttachmentLinkIcon = page.querySelector(
+        '.i-amphtml-story-page-open-attachment .i-amphtml-story-page-open-attachment-link-icon'
+      );
+      expect(openAttachmentLinkIcon).to.not.exist;
+    });
+  }
+);
diff --git a/extensions/amp-story-page-attachment/0.1/test/test-amp-story-page-attachment.js b/extensions/amp-story-page-attachment/0.1/test/test-amp-story-page-attachment.js
new file mode 100644
index 000000000000..f7a785947575
--- /dev/null
+++ b/extensions/amp-story-page-attachment/0.1/test/test-amp-story-page-attachment.js
@@ -0,0 +1,150 @@
+import {expect} from 'chai';
+
+import * as Preact from '#core/dom/jsx';
+
+import {Services} from '#service';
+import {AmpDocSingle} from '#service/ampdoc-impl';
+import {LocalizationService} from '#service/localization';
+
+import {
+  Action,
+  AmpStoryStoreService,
+  UIType_Enum,
+} from 'extensions/amp-story/1.0/amp-story-store-service';
+import {registerServiceBuilder} from 'src/service-helpers';
+
+import LocalizedStringsEn from '../../../amp-story/1.0/_locales/en.json' assert {type: 'json'}; // lgtm[js/syntax-error]
+import {StoryAnalyticsService} from '../../../amp-story/1.0/story-analytics';
+import {AmpStoryPageAttachment} from '../amp-story-page-attachment';
+
+describes.realWin('amp-story-page-attachment', {amp: true}, (env) => {
+  let attachmentEl;
+  let attachment;
+  let outlinkEl;
+  let outlink;
+  let storeService;
+
+  beforeEach(() => {
+    const {win} = env;
+
+    // Set up the story.
+    const storyEl = <amp-story></amp-story>;
+    const pageEl = <amp-story-page></amp-story-page>;
+    win.document.body.appendChild(storyEl);
+    storyEl.appendChild(pageEl);
+
+    const localizationService = new LocalizationService(win.document.body);
+    registerServiceBuilder(win, 'localization', function () {
+      return localizationService;
+    });
+    localizationService.registerLocalizedStringBundles({
+      'en': LocalizedStringsEn,
+    });
+
+    storeService = new AmpStoryStoreService(win);
+    registerServiceBuilder(win, 'story-store', function () {
+      return storeService;
+    });
+
+    const analytics = new StoryAnalyticsService(win, win.document.body);
+    registerServiceBuilder(win, 'story-analytics', function () {
+      return analytics;
+    });
+
+    const ownersMock = {
+      scheduleLayout: () => {},
+      scheduleResume: () => {},
+    };
+    env.sandbox.stub(Services, 'ownersForDoc').returns(ownersMock);
+
+    // Set up the attachment element for inline attachment testing.
+    attachmentEl = <amp-story-page-attachment></amp-story-page-attachment>;
+    attachmentEl.getAmpDoc = () => new AmpDocSingle(win);
+    pageEl.appendChild(attachmentEl);
+    attachment = new AmpStoryPageAttachment(attachmentEl);
+
+    env.sandbox
+      .stub(attachment, 'mutateElement')
+      .callsFake((fn) => Promise.resolve(fn()));
+
+    // Set up the outlink element for outlink testing.
+    outlinkEl = (
+      <amp-story-page-outlink>
+        <a></a>
+      </amp-story-page-outlink>
+    );
+    outlinkEl.getAmpDoc = () => new AmpDocSingle(win);
+    pageEl.appendChild(outlinkEl);
+    outlink = new AmpStoryPageAttachment(outlinkEl);
+
+    env.sandbox
+      .stub(outlink, 'mutateElement')
+      .callsFake((fn) => Promise.resolve(fn()));
+  });
+
+  afterEach(() => {
+    attachmentEl.remove();
+    outlinkEl.remove();
+  });
+
+  it('should build an attachment', async () => {
+    await attachment.buildCallback();
+    return attachment.layoutCallback();
+  });
+
+  it('should build an outlink', async () => {
+    await outlink.buildCallback();
+    return outlink.layoutCallback();
+  });
+
+  it('should build amp-story-page-outlink with target="_top" even when the publisher has specified a different value', async () => {
+    const anchorEl = outlinkEl.querySelector('amp-story-page-outlink a');
+    anchorEl.setAttribute('target', '_blank');
+
+    await outlink.buildCallback();
+    await outlink.layoutCallback();
+
+    expect(anchorEl.getAttribute('target')).to.eql('_top');
+  });
+
+  it('header close button should have a negative tabindex attribute by default', async () => {
+    await attachment.buildCallback();
+    await attachment.layoutCallback();
+
+    const closeButtonEl = attachmentEl.querySelector(
+      '.i-amphtml-story-page-attachment-close-button'
+    );
+
+    expect(closeButtonEl.getAttribute('tabindex')).to.eql('-1');
+  });
+
+  it('header close button should not have tabindex attribute when open', async () => {
+    await attachment.buildCallback();
+    await attachment.layoutCallback();
+
+    env.sandbox.stub(attachment.analyticsService_, 'triggerEvent');
+    env.sandbox.stub(attachment.historyService_, 'push');
+
+    attachment.open(false);
+
+    const closeButtonEl = attachmentEl.querySelector(
+      '.i-amphtml-story-page-attachment-close-button'
+    );
+
+    expect(closeButtonEl.hasAttribute('tabindex')).to.be.false;
+  });
+
+  it('should click on anchor when outlink open method is called', async () => {
+    storeService.dispatch(Action.TOGGLE_UI, UIType_Enum.DESKTOP_ONE_PANEL);
+    const anchorEl = outlinkEl.querySelector('amp-story-page-outlink a');
+
+    const clickSpy = env.sandbox.spy(anchorEl, 'click');
+
+    await outlink.buildCallback();
+    await outlink.layoutCallback();
+
+    outlink.open();
+
+    expect(clickSpy).to.be.calledOnce;
+  });
+});
diff --git a/extensions/amp-story-page-attachment/OWNERS b/extensions/amp-story-page-attachment/OWNERS
new file mode 100644
index 000000000000..a31676ec5802
--- /dev/null
+++ b/extensions/amp-story-page-attachment/OWNERS
@@ -0,0 +1,23 @@
+// For an explanation of the OWNERS rules and syntax, see:
+// https://github.com/ampproject/amp-github-apps/blob/main/owners/OWNERS.example
+
+{
+  rules: [
+    {
+      owners: [
+        {
+          name: 'gmajoulet',
+          notify: true,
+        },
+        {
+          name: 'newmuis',
+          notify: true,
+        },
+        {
+          name: 'mszylkowski',
+          notify: true,
+        },
+      ],
+    },
+  ],
+}
diff --git a/extensions/amp-story-panning-media/0.1/amp-story-panning-media.js b/extensions/amp-story-panning-media/0.1/amp-story-panning-media.js
index 20d703966082..6eee485248de 100644
--- a/extensions/amp-story-panning-media/0.1/amp-story-panning-media.js
+++ b/extensions/amp-story-panning-media/0.1/amp-story-panning-media.js
@@ -1,6 +1,6 @@
-import {CommonSignals} from '#core/constants/common-signals';
+import {CommonSignals_Enum} from '#core/constants/common-signals';
 import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
-import {Layout} from '#core/dom/layout';
+import {Layout_Enum} from '#core/dom/layout';
 import {prefersReducedMotion} from '#core/dom/media-query-props';
 import {closest} from '#core/dom/query';
 import {setImportantStyles} from '#core/dom/style';
@@ -63,9 +63,6 @@ export class AmpStoryPanningMedia extends AMP.BaseElement {
   constructor(element) {
     super(element);
 
-    /** @private {?Element} */
-    this.element_ = element;
-
     /** @private {?Element} The element that is transitioned. */
     this.ampImgEl_ = null;
 
@@ -97,28 +94,26 @@ export class AmpStoryPanningMedia extends AMP.BaseElement {
   /** @override */
   buildCallback() {
     return Services.storyStoreServiceForOrNull(this.win).then(
-      (storeService) => {
-        this.storeService_ = storeService;
-      }
+      (storeService) => (this.storeService_ = storeService)
     );
   }
 
   /** @override */
   layoutCallback() {
-    this.ampImgEl_ = dev().assertElement(
-      this.element_.querySelector('amp-img')
-    );
+    this.ampImgEl_ = dev().assertElement(this.element.querySelector('amp-img'));
 
     this.groupId_ =
-      this.element_.getAttribute('group-id') ||
+      this.element.getAttribute('group-id') ||
       this.ampImgEl_.getAttribute('src');
 
     this.initializeListeners_();
 
     return whenUpgradedToCustomElement(this.ampImgEl_)
-      .then(() => this.ampImgEl_.signals().whenSignal(CommonSignals.LOAD_END))
+      .then(() =>
+        this.ampImgEl_.signals().whenSignal(CommonSignals_Enum.LOAD_END)
+      )
       .then(() => {
-        const imgEl = dev().assertElement(this.element_.querySelector('img'));
+        const imgEl = dev().assertElement(this.element.querySelector('img'));
         // Remove layout="fill" classes so image is not clipped.
         imgEl.classList = '';
         this.setImageCenteringStyles_();
@@ -132,8 +127,8 @@ export class AmpStoryPanningMedia extends AMP.BaseElement {
       StateProperty.PAGE_SIZE,
       () => {
         this.elementSize_ = {
-          width: this.element_./*OK*/ offsetWidth,
-          height: this.element_./*OK*/ offsetHeight,
+          width: this.element./*OK*/ offsetWidth,
+          height: this.element./*OK*/ offsetHeight,
         };
         this.setImageCenteringStyles_();
         this.setAnimateTo_();
@@ -156,22 +151,21 @@ export class AmpStoryPanningMedia extends AMP.BaseElement {
     );
     // Mutation observer for distance attribute
     const config = {attributes: true, attributeFilter: ['distance']};
-    const callback = (mutationsList) => {
-      this.pageDistance_ = parseInt(
+    const callback = (mutationsList) =>
+      (this.pageDistance_ = parseInt(
         mutationsList[0].target.getAttribute('distance'),
         10
-      );
-    };
+      ));
     const observer = new MutationObserver(callback);
     this.getPage_() && observer.observe(this.getPage_(), config);
   }
 
   /** @private */
   setAnimateTo_() {
-    const x = parseFloat(this.element_.getAttribute('data-x') || 0);
-    const y = parseFloat(this.element_.getAttribute('data-y') || 0);
-    const zoom = parseFloat(this.element_.getAttribute('data-zoom') || 1);
-    const lockBounds = this.element_.hasAttribute('lock-bounds');
+    const x = parseFloat(this.element.getAttribute('data-x') || 0);
+    const y = parseFloat(this.element.getAttribute('data-y') || 0);
+    const zoom = parseFloat(this.element.getAttribute('data-zoom') || 1);
+    const lockBounds = this.element.hasAttribute('lock-bounds');
 
     if (lockBounds) {
       // Zoom must be set to calculate maxBounds.
@@ -278,7 +272,7 @@ export class AmpStoryPanningMedia extends AMP.BaseElement {
    * @private
    */
   setImageCenteringStyles_() {
-    const imgEl = this.element_.querySelector('img');
+    const imgEl = this.element.querySelector('img');
     if (!imgEl) {
       return;
     }
@@ -321,7 +315,7 @@ export class AmpStoryPanningMedia extends AMP.BaseElement {
 
   /**
    * @private
-   * @param {!Object<string, string>} panningMediaState
+   * @param {!{[key: string]: string}} panningMediaState
    */
   onPanningMediaStateChange_(panningMediaState) {
     if (
@@ -384,7 +378,7 @@ export class AmpStoryPanningMedia extends AMP.BaseElement {
 
   /** @override */
   isLayoutSupported(layout) {
-    return layout == Layout.FILL;
+    return layout == Layout_Enum.FILL;
   }
 }
 
diff --git a/extensions/amp-story-player/0.1/amp-story-player.js b/extensions/amp-story-player/0.1/amp-story-player.js
index 82c900b58e3c..0c8cac05d936 100644
--- a/extensions/amp-story-player/0.1/amp-story-player.js
+++ b/extensions/amp-story-player/0.1/amp-story-player.js
@@ -4,7 +4,7 @@ import {cssText} from '../../../build/amp-story-player.css';
 import {AmpStoryPlayer} from '../../../src/amp-story-player/amp-story-player-impl';
 
 class AmpStoryPlayerWrapper extends AMP.BaseElement {
-  /** @override @nocollapse */
+  /** @override  */
   static prerenderAllowed() {
     return true;
   }
diff --git a/extensions/amp-story-player/0.1/test/test-e2e/test-amp-story-player-navigation.js b/extensions/amp-story-player/0.1/test/test-e2e/test-amp-story-player-navigation.js
index af08105130fe..22dbe661715d 100644
--- a/extensions/amp-story-player/0.1/test/test-e2e/test-amp-story-player-navigation.js
+++ b/extensions/amp-story-player/0.1/test/test-e2e/test-amp-story-player-navigation.js
@@ -1,16 +1,10 @@
+import {sleep} from '#testing/helpers';
+
 const VIEWPORT = {
   HEIGHT: 768,
   WIDTH: 1024,
 };
 
-/**
- * @param {number} ms
- * @return {!Promise}
- */
-function timeout(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
 describes.endtoend(
   'story player navigation',
   {
@@ -25,7 +19,7 @@ describes.endtoend(
     beforeEach(async () => {
       controller = env.controller;
 
-      await timeout(500);
+      await sleep(500);
 
       player = await controller.findElement(
         'amp-story-player.i-amphtml-story-player-loaded'
@@ -33,7 +27,8 @@ describes.endtoend(
       await expect(player);
     });
 
-    it('first story should be playing video', async () => {
+    // TODO(#40214): fix flaky test.
+    it.skip('first story should be playing video', async () => {
       const shadowHost = await controller.findElement(
         'div.i-amphtml-story-player-shadow-root-intermediary'
       );
@@ -51,15 +46,16 @@ describes.endtoend(
         'paused'
       );
 
-      await timeout(800);
+      await sleep(800);
       await expect(isVideoPaused).to.eql(false);
     });
 
-    it('navigating to next story pauses the previous one', async () => {
+    // TODO(#40214): fix flaky test.
+    it.skip('navigating to next story pauses the previous one', async () => {
       // Navigate to next story.
       await controller.click(player);
 
-      await timeout(500);
+      await sleep(500);
 
       const shadowHost = await controller.findElement(
         'div.i-amphtml-story-player-shadow-root-intermediary'
@@ -76,7 +72,7 @@ describes.endtoend(
         'paused'
       );
 
-      await timeout(800);
+      await sleep(800);
       await expect(isVideoPaused).to.eql(true);
     });
   }
diff --git a/extensions/amp-story-player/0.1/test/test-e2e/test-amp-story-player-prerender.js b/extensions/amp-story-player/0.1/test/test-e2e/test-amp-story-player-prerender.js
index a7d97973bdf4..8c143f3f0a97 100644
--- a/extensions/amp-story-player/0.1/test/test-e2e/test-amp-story-player-prerender.js
+++ b/extensions/amp-story-player/0.1/test/test-e2e/test-amp-story-player-prerender.js
@@ -1,16 +1,10 @@
+import {sleep} from '#testing/helpers';
+
 const VIEWPORT = {
   HEIGHT: 768,
   WIDTH: 1024,
 };
 
-/**
- * @param {number} ms
- * @return {!Promise}
- */
-function timeout(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
 describes.endtoend(
   'player prerendering',
   {
@@ -28,7 +22,8 @@ describes.endtoend(
       await expect(player);
     });
 
-    it('when player is not visible in first viewport, it builds the shadow DOM container', async () => {
+    // TODO(#40214): fix flaky test.
+    it.skip('when player is not visible in first viewport, it builds the shadow DOM container', async () => {
       const shadowHost = await controller.findElement(
         'div.i-amphtml-story-player-shadow-root-intermediary'
       );
@@ -36,7 +31,8 @@ describes.endtoend(
       await expect(shadowHost);
     });
 
-    it('when player is not visible in first viewport, no stories are loaded or prerendered', async () => {
+    // TODO(#40214): fix flaky test.
+    it.skip('when player is not visible in first viewport, no stories are loaded or prerendered', async () => {
       const shadowHost = await controller.findElement(
         'div.i-amphtml-story-player-shadow-root-intermediary'
       );
@@ -55,7 +51,8 @@ describes.endtoend(
       await expect(count).to.eql(2);
     });
 
-    it('when player becomes visible in viewport, first story starts playing', async () => {
+    // TODO(#40214): fix flaky test.
+    it.skip('when player becomes visible in viewport, first story starts playing', async () => {
       const doc = await controller.getDocumentElement();
       const playerRect = await controller.getElementRect(player);
 
@@ -78,7 +75,8 @@ describes.endtoend(
       await expect(storyEl).to.exist;
     });
 
-    it('when player becomes visible in viewport and first story finishes loading, second story starts preloading', async function () {
+    // TODO(#40214): fix flaky test.
+    it.skip('when player becomes visible in viewport and first story finishes loading, second story starts preloading', async function () {
       this.timeout(10000);
       const doc = await controller.getDocumentElement();
       const playerRect = await controller.getElementRect(player);
@@ -91,7 +89,7 @@ describes.endtoend(
       await controller.switchToShadowRoot(shadowHost);
 
       // Wait for first story iframe to load.
-      await timeout(5000);
+      await sleep(5000);
 
       const iframes = await controller.findElements(
         'iframe.story-player-iframe'
diff --git a/extensions/amp-story-player/0.1/test/validator-amp-story-player-error.out b/extensions/amp-story-player/0.1/test/validator-amp-story-player-error.out
index 75d3ddfed792..f9755e352686 100644
--- a/extensions/amp-story-player/0.1/test/validator-amp-story-player-error.out
+++ b/extensions/amp-story-player/0.1/test/validator-amp-story-player-error.out
@@ -34,8 +34,6 @@ amp-story-player/0.1/test/validator-amp-story-player-error.html:26:6 The mandato
 |      <a href="https://www.example.com2" class="story">
 |        <!-- <img> should contain data-amp-story-player-poster-img attribute -->
 |        <img src="https://www.example.com/img" width="360" height="600" loading="lazy">
->>       ^~~~~~~~~
-amp-story-player/0.1/test/validator-amp-story-player-error.html:31:6 The tag 'img' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-img'? (see https://amp.dev/documentation/components/amp-img/)
 |        <span class="title">A local’s guide to what to eat and do in Mexico City</span>
 |      </a>
 |  </amp-story-player>
diff --git a/extensions/amp-story-player/0.1/test/validator-amp-story-player-img-error.out b/extensions/amp-story-player/0.1/test/validator-amp-story-player-img-error.out
index 61d7cdba82ba..d9d6fa630db5 100644
--- a/extensions/amp-story-player/0.1/test/validator-amp-story-player-img-error.out
+++ b/extensions/amp-story-player/0.1/test/validator-amp-story-player-img-error.out
@@ -20,7 +20,7 @@ FAIL
 |      <!-- This should fail, since img tags are not allowed in AMP yet. -->
 |      <img alt aria-hidden="true" class="i-amphtml-intrinsic-sizer" role="presentation" src="data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjYwMCIgd2lkdGg9IjM2MCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2ZXJzaW9uPSIxLjEiLz4=">
 >>     ^~~~~~~~~
-amp-story-player/0.1/test/validator-amp-story-player-img-error.html:20:4 The tag 'img' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-img'? (see https://amp.dev/documentation/components/amp-img/)
+amp-story-player/0.1/test/validator-amp-story-player-img-error.html:20:4 The attribute 'class' in tag 'img' is set to the invalid value 'i-amphtml-intrinsic-sizer'. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/#disallowed-styles)
 |  </amp-story-player>
 |  </body>
 |  </html>
diff --git a/extensions/amp-story/1.0/amp-story-share-menu.css b/extensions/amp-story-share-menu/0.1/amp-story-share-menu.css
similarity index 96%
rename from extensions/amp-story/1.0/amp-story-share-menu.css
rename to extensions/amp-story-share-menu/0.1/amp-story-share-menu.css
index feaf7d053f15..17e227b96ca8 100644
--- a/extensions/amp-story/1.0/amp-story-share-menu.css
+++ b/extensions/amp-story-share-menu/0.1/amp-story-share-menu.css
@@ -1,6 +1,6 @@
 
 
-@import './amp-story-shadow-reset.css';
+@import '../../amp-story/1.0/amp-story-shadow-reset.css';
 @import './amp-story-share.css';
 
 .i-amphtml-story-share-menu {
@@ -10,7 +10,7 @@
   height: 100% !important;
   width: 100% !important;
   z-index: 100003 !important; /** Above pagination-buttons. */
-  transform: translate3d(0, 100vh, 0) !important;
+  transform: translate3d(0, var(--story-100dvh), 0) !important;
   transition-delay: 0.15s !important;
   pointer-events: none !important;
   visibility: hidden !important;
diff --git a/extensions/amp-story-share-menu/0.1/amp-story-share-menu.js b/extensions/amp-story-share-menu/0.1/amp-story-share-menu.js
new file mode 100644
index 000000000000..1d452c7d1162
--- /dev/null
+++ b/extensions/amp-story-share-menu/0.1/amp-story-share-menu.js
@@ -0,0 +1,428 @@
+import {userAssert} from '#core/assert';
+import {Keys_Enum} from '#core/constants/key-codes';
+import * as Preact from '#core/dom/jsx';
+import {Layout_Enum} from '#core/dom/layout';
+import {closestAncestorElementBySelector} from '#core/dom/query';
+import {isObject} from '#core/types';
+import {map} from '#core/types/object';
+import {
+  copyTextToClipboard,
+  isCopyingToClipboardSupported,
+} from '#core/window/clipboard';
+
+import {Services} from '#service';
+import {LocalizedStringId_Enum} from '#service/localization/strings';
+
+import {user} from '#utils/log';
+
+import {localizeTemplate} from 'extensions/amp-story/1.0/amp-story-localization-service';
+import {getElementConfig} from 'extensions/amp-story/1.0/request-utils';
+import {Toast} from 'extensions/amp-story/1.0/toast';
+import {AMP_STORY_COPY_URL} from 'src/amp-story-player/event';
+
+import {CSS} from '../../../build/amp-story-share-menu-0.1.css';
+import {getAmpdoc} from '../../../src/service-helpers';
+import {
+  Action,
+  StateProperty,
+  UIType_Enum,
+} from '../../amp-story/1.0/amp-story-store-service';
+import {AmpStoryViewerMessagingHandler} from '../../amp-story/1.0/amp-story-viewer-messaging-handler';
+import {
+  createShadowRootWithStyle,
+  dependsOnStoryServices,
+} from '../../amp-story/1.0/utils';
+
+import '../../amp-social-share/0.1/amp-social-share';
+
+/** @const {string} Class to toggle the share menu. */
+export const VISIBLE_CLASS = 'i-amphtml-story-share-menu-visible';
+
+/**
+ * Maps share provider type to localization asset.
+ * @const {!{[key: string]: !LocalizedStringId_Enum}}
+ */
+const SHARE_PROVIDER_LOCALIZED_STRING_ID = map({
+  'email': LocalizedStringId_Enum.AMP_STORY_SHARING_PROVIDER_NAME_EMAIL,
+  'facebook': LocalizedStringId_Enum.AMP_STORY_SHARING_PROVIDER_NAME_FACEBOOK,
+  'line': LocalizedStringId_Enum.AMP_STORY_SHARING_PROVIDER_NAME_LINE,
+  'linkedin': LocalizedStringId_Enum.AMP_STORY_SHARING_PROVIDER_NAME_LINKEDIN,
+  'pinterest': LocalizedStringId_Enum.AMP_STORY_SHARING_PROVIDER_NAME_PINTEREST,
+  'tumblr': LocalizedStringId_Enum.AMP_STORY_SHARING_PROVIDER_NAME_TUMBLR,
+  'twitter': LocalizedStringId_Enum.AMP_STORY_SHARING_PROVIDER_NAME_TWITTER,
+  'whatsapp': LocalizedStringId_Enum.AMP_STORY_SHARING_PROVIDER_NAME_WHATSAPP,
+  'sms': LocalizedStringId_Enum.AMP_STORY_SHARING_PROVIDER_NAME_SMS,
+});
+
+/**
+ * Key for share providers in config.
+ * @const {string}
+ */
+const SHARE_PROVIDERS_KEY = 'shareProviders';
+
+/**
+ * Deprecated key for share providers in config.
+ * @const {string}
+ */
+const DEPRECATED_SHARE_PROVIDERS_KEY = 'share-providers';
+
+/**
+ * @param {!Node} child
+ * @return {!Element} */
+const renderShareItemElement = (child) => (
+  <li class="i-amphtml-story-share-item">{child}</li>
+);
+
+/**
+ * Share menu UI.
+ */
+export class AmpStoryShareMenu extends AMP.BaseElement {
+  /**
+   * @param {!Element} element
+   */
+  constructor(element) {
+    super(element);
+
+    /** @private {?Element} */
+    this.rootEl_ = null;
+
+    /** @private @const {!Element} */
+    this.storyEl_ = userAssert(
+      closestAncestorElementBySelector(element, 'amp-story')
+    );
+
+    /** @const @private {!../../../src/service/vsync-impl.Vsync} */
+    this.vsync_ = Services.vsyncFor(this.win);
+
+    /** @private @const {!../../../src/service/localization.LocalizationService} */
+    this.localizationService_ = Services.localizationForDoc(this.element);
+
+    /** @private @const {!../../../extensions/amp-story/1.0/amp-story-store-service.AmpStoryStoreService} */
+    this.storeService_ = Services.storyStoreService(this.win);
+
+    /** @private {?../../../src/service/viewer-interface.ViewerInterface} */
+    this.viewer_ = null;
+
+    /** @private {?AmpStoryViewerMessagingHandler} */
+    this.viewerMessagingHandler_ = null;
+  }
+
+  /**
+   * Builds and appends the component in the story. Could build either the
+   * amp-social-share button to display the native system sharing, or a fallback
+   * UI.
+   */
+  buildCallback() {
+    if (this.rootEl_) {
+      return;
+    }
+
+    const providersList = this.buildProvidersList_();
+    this.rootEl_ = this.buildDialog_(providersList);
+    localizeTemplate(this.rootEl_, this.element);
+    createShadowRootWithStyle(this.element, this.rootEl_, CSS);
+    this.initializeListeners_();
+
+    this.viewer_ = Services.viewerForDoc(this.win.document.documentElement);
+    this.viewerMessagingHandler_ = this.viewer_.isEmbedded()
+      ? new AmpStoryViewerMessagingHandler(this.win, this.viewer_)
+      : null;
+  }
+
+  /**
+   * @private
+   */
+  initializeListeners_() {
+    this.storeService_.subscribe(
+      StateProperty.UI_STATE,
+      (uiState) => {
+        this.onUIStateUpdate_(uiState);
+      },
+      true /** callToInitialize */
+    );
+
+    this.storeService_.subscribe(
+      StateProperty.SHARE_MENU_STATE,
+      (isOpen) => {
+        this.onShareMenuStateUpdate_(isOpen);
+      },
+      true /** callToInitialize */
+    );
+
+    this.win.addEventListener('keyup', (event) => {
+      if (event.key == Keys_Enum.ESCAPE) {
+        event.preventDefault();
+        this.close_();
+      }
+    });
+  }
+
+  /**
+   * Reacts to menu state updates shows or hides the menu.
+   * @param {boolean} isOpen
+   * @private
+   */
+  onShareMenuStateUpdate_(isOpen) {
+    this.vsync_.mutate(() => {
+      this.rootEl_.classList.toggle(VISIBLE_CLASS, isOpen);
+      this.rootEl_.setAttribute('aria-hidden', !isOpen);
+    });
+  }
+
+  /**
+   * Reacts to UI state updates and triggers the right UI.
+   * @param {!UIType_Enum} uiState
+   * @private
+   */
+  onUIStateUpdate_(uiState) {
+    this.vsync_.mutate(() => {
+      uiState !== UIType_Enum.MOBILE
+        ? this.rootEl_.setAttribute('desktop', '')
+        : this.rootEl_.removeAttribute('desktop');
+    });
+  }
+
+  /**
+   * Closes the share menu.
+   * @private
+   */
+  close_() {
+    this.storeService_.dispatch(Action.TOGGLE_SHARE_MENU, false);
+  }
+
+  /**
+   * Quick share template, used as a fallback if native sharing is not supported.
+   * @param {!Element} child
+   * @return {!Element}
+   */
+  buildDialog_(child) {
+    return (
+      <div
+        class="i-amphtml-story-share-menu i-amphtml-story-system-reset"
+        aria-hidden="true"
+        role="alert"
+        onClick={(event) => {
+          // Only close if clicked on background.
+          if (event.target === event.currentTarget) {
+            this.close_();
+          }
+        }}
+      >
+        <div class="i-amphtml-story-share-menu-container">
+          <button
+            class="i-amphtml-story-share-menu-close-button"
+            i-amphtml-i18n-aria-label={
+              LocalizedStringId_Enum.AMP_STORY_CLOSE_BUTTON_LABEL
+            }
+            role="button"
+            onClick={this.close_.bind(this)}
+          >
+            &times;
+          </button>
+          {child}
+        </div>
+      </div>
+    );
+  }
+
+  /**
+   * Create widget, and load the providers in the config.
+   * @return {!Element}
+   */
+  buildProvidersList_() {
+    const list = (
+      <ul class="i-amphtml-story-share-list">
+        {this.maybeRenderLinkShareButton_()}
+      </ul>
+    );
+
+    const shareEl = this.storyEl_.querySelector(
+      'amp-story-social-share, amp-story-bookend'
+    );
+
+    getElementConfig(shareEl).then((config) => {
+      const providers =
+        config &&
+        (config[SHARE_PROVIDERS_KEY] || config[DEPRECATED_SHARE_PROVIDERS_KEY]);
+      if (!providers) {
+        return;
+      }
+
+      for (const provider of providers) {
+        const el = this.buildShareProvider_(provider);
+        if (el) {
+          list.append(el);
+        }
+      }
+      localizeTemplate(list, this.storyEl_);
+    });
+
+    return list;
+  }
+
+  /**
+   * @param {{[key: string]: *}|string} provider
+   * @return {Element|null}
+   * @private
+   * TODO(alanorozco): Set story metadata in share config.
+   */
+  buildShareProvider_(provider) {
+    let params;
+
+    if (isObject(provider)) {
+      params = provider;
+      provider = provider['provider'];
+      delete params['provider'];
+    }
+
+    const shareProviderLocalizedStringId =
+      SHARE_PROVIDER_LOCALIZED_STRING_ID[provider];
+
+    if (!shareProviderLocalizedStringId) {
+      user().warn(
+        'AMP-STORY',
+        `'${provider}'is not a valid share provider type.`
+      );
+      return null;
+    }
+
+    const element = (
+      <amp-social-share
+        width={48}
+        height={48}
+        class="i-amphtml-story-share-icon"
+        type={provider}
+      >
+        <span
+          class="i-amphtml-story-share-label"
+          i-amphtml-i18n-text-content={shareProviderLocalizedStringId}
+        ></span>
+      </amp-social-share>
+    );
+
+    if (params) {
+      for (const field in params) {
+        element.setAttribute(`data-param-${field}`, params[field]);
+      }
+    }
+
+    return renderShareItemElement(element);
+  }
+
+  /**
+   * @return {?Element}
+   * @private
+   */
+  maybeRenderLinkShareButton_() {
+    if (!isCopyingToClipboardSupported(this.win.document)) {
+      return;
+    }
+    return renderShareItemElement(
+      <button
+        class="i-amphtml-story-share-icon i-amphtml-story-share-icon-link"
+        i-amphtml-i18n-aria-label={
+          LocalizedStringId_Enum.AMP_STORY_SHARING_PROVIDER_NAME_LINK
+        }
+        onClick={(e) => {
+          e.preventDefault();
+          this.copyUrlToClipboard_();
+        }}
+      >
+        <span
+          class="i-amphtml-story-share-label"
+          i-amphtml-i18n-text-content={
+            LocalizedStringId_Enum.AMP_STORY_SHARING_PROVIDER_NAME_LINK
+          }
+        ></span>
+      </button>
+    );
+  }
+
+  /**
+   * @private
+   */
+  copyUrlToClipboard_() {
+    const url = Services.documentInfoForDoc(
+      getAmpdoc(this.storyEl_)
+    ).canonicalUrl;
+
+    if (this.viewerMessagingHandler_) {
+      this.viewerMessagingHandler_.onMessage('copyComplete', (data) => {
+        if (data.success) {
+          this.showCopySuccessfulToast_(data.url);
+        } else {
+          this.showCopyFailedToast_();
+        }
+      });
+      this.viewerMessagingHandler_.send('documentStateUpdate', {
+        'state': AMP_STORY_COPY_URL,
+        'value': url,
+      });
+    } else {
+      copyTextToClipboard(
+        this.win,
+        url,
+        this.showCopySuccessfulToast_.bind(this, url),
+        this.showCopyFailedToast_
+      );
+    }
+  }
+
+  /**
+   * @param {string} url
+   * @private
+   */
+  showCopySuccessfulToast_(url) {
+    this.localizationService_
+      .getLocalizedStringAsync(
+        LocalizedStringId_Enum.AMP_STORY_SHARING_CLIPBOARD_SUCCESS_TEXT
+      )
+      .then((successString) =>
+        Toast.show(
+          this.storyEl_,
+          this.buildCopySuccessfulToast_(url, successString)
+        )
+      );
+  }
+
+  /**
+   * @private
+   */
+  showCopyFailedToast_() {
+    this.localizationService_
+      .getLocalizedStringAsync(
+        LocalizedStringId_Enum.AMP_STORY_SHARING_CLIPBOARD_FAILURE_TEXT
+      )
+      .then((failureString) => Toast.show(this.storyEl_, failureString));
+  }
+
+  /**
+   * @param {string} url
+   * @param {string} localizedString
+   * @return {!Element}
+   */
+  buildCopySuccessfulToast_(url, localizedString) {
+    return (
+      <div class="i-amphtml-story-copy-successful">
+        {localizedString}
+        <div class="i-amphtml-story-copy-url">{url}</div>
+      </div>
+    );
+  }
+
+  /** @override */
+  isLayoutSupported(layout) {
+    return layout == Layout_Enum.CONTAINER;
+  }
+}
+
+/**
+ * This extension installs the share widget.
+ */
+
+AMP.extension('amp-story-share-menu', '0.1', (AMP) => {
+  AMP.registerElement(
+    'amp-story-share-menu',
+    dependsOnStoryServices(AmpStoryShareMenu)
+  );
+});
diff --git a/extensions/amp-story-share-menu/0.1/amp-story-share.css b/extensions/amp-story-share-menu/0.1/amp-story-share.css
new file mode 100644
index 000000000000..5d7fe9406003
--- /dev/null
+++ b/extensions/amp-story-share-menu/0.1/amp-story-share.css
@@ -0,0 +1,119 @@
+
+
+@import '../../amp-social-share/0.1/amp-social-share.css';
+
+.i-amphtml-story-no-sharing .i-amphtml-story-share-list {
+  display: none !important;
+}
+
+.i-amphtml-story-share-list::-webkit-scrollbar {
+  width: 0px !important;
+  background: transparent !important;
+}
+
+.i-amphtml-story-share-list {
+  list-style: none !important;
+  padding: 16px !important;
+  margin: 0 !important;
+  display: flex !important;
+  flex-wrap: wrap !important;
+  width: calc(100% - 32px) !important;
+}
+
+.i-amphtml-story-share-item {
+  width: 48px !important;
+  height: 66px !important;
+  padding: 0 16px !important;
+  margin-bottom: 12px !important;
+}
+
+@media (max-width: 410px) {
+  .i-amphtml-story-share-item {
+    display: flex !important;
+    justify-content: center !important;
+    padding: 0 !important;
+    min-width: 60px !important;
+    width: 25% !important;
+  }
+}
+
+@media (min-width: 410px) and (max-width: 500px) {
+  .i-amphtml-story-share-item {
+    display: flex !important;
+    justify-content: center !important;
+    padding: 0 !important;
+    width: 20% !important;
+  }
+}
+
+@media (min-width: 500px) and (max-width: 720px) {
+  .i-amphtml-story-share-item {
+    display: flex !important;
+    justify-content: center !important;
+    padding: 0 !important;
+    width: 16.66% !important;
+  }
+}
+
+.i-amphtml-story-share-item:empty {
+  display: none !important;
+}
+
+.i-amphtml-story-share-icon {
+  box-sizing: border-box !important;
+  position: relative !important;
+  width: 48px !important;
+  height: 48px !important;
+  display: block !important;
+  cursor: pointer !important;
+  border-radius: 4px !important;
+  overflow: visible !important;
+
+  /* for svg backgrounds: */
+  background-position: 8px 8px !important;
+  background-size: 32px 32px !important;
+  background-repeat: no-repeat !important;
+}
+
+.i-amphtml-story-share-icon.amp-social-share-facebook {
+  /* SVG icon has inner padding, so the glyph renders visually smaller than
+   * other icons, so we work around it by setting a higher background size. */
+  background-size: 38px 38px !important;
+  background-position: 5px 5px !important;
+}
+
+.i-amphtml-story-share-icon:focus {
+  outline: 2px solid #0389ff !important;
+  outline-offset: 2px !important;
+}
+
+.i-amphtml-story-share-icon[type=email] {
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24" fill="#fff"><path d="M20 4H4a2 2 0 0 0-2 2v12c0 1.1.9 2 2 2h16a2 2 0 0 0 2-2V6a2 2 0 0 0-2-2zm0 4-8 5-8-5V6l8 5 8-5v2z"/><path d="M0 0h24v24H0z" fill="none"/></svg>') !important;
+  background-color: #9AA0A6 !important;
+}
+
+.i-amphtml-story-share-icon[type=system] {
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="#fff"><path d="M0 0h24v24H0z" fill="none"/><path d="M6 10c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm12 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm-6 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z"/></svg>') !important;
+  background-color: #9AA0A6 !important;
+}
+
+.i-amphtml-story-share-icon-link {
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24" fill="#fff"><path d="M0 0h24v24H0z" fill="none"/><path d="M3.9 12c0-1.7 1.4-3.1 3.1-3.1h4V7H7a5 5 0 0 0 0 10h4v-1.9H7A3.1 3.1 0 0 1 3.9 12zM8 13h8v-2H8v2zm9-6h-4v1.9h4a3.1 3.1 0 0 1 0 6.2h-4V17h4a5 5 0 0 0 0-10z"/></svg>') !important;
+  background-color: #9AA0A6 !important;
+  border: none !important;
+}
+
+.i-amphtml-story-share-icon .i-amphtml-story-share-label {
+  position: absolute !important;
+  top: 48px !important;
+  left: 0 !important;
+  width: 100% !important;
+  color: rgba(0, 0, 0, 0.87) !important;
+  padding-top: 5px !important; /* Making sure the whole icon is clickable. */
+  text-transform: capitalize !important;
+  font-family: 'Roboto', sans-serif !important;
+  font-weight: 400 !important;
+  line-height: 13px !important;
+  font-size: 11px !important;
+  text-align: center !important;
+}
diff --git a/extensions/amp-story-share-menu/0.1/test/test-amp-story-share-menu.js b/extensions/amp-story-share-menu/0.1/test/test-amp-story-share-menu.js
new file mode 100644
index 000000000000..13bff96c7c91
--- /dev/null
+++ b/extensions/amp-story-share-menu/0.1/test/test-amp-story-share-menu.js
@@ -0,0 +1,125 @@
+import {Keys_Enum} from '#core/constants/key-codes';
+
+import {Services} from '#service';
+import {LocalizationService} from '#service/localization';
+
+import {registerServiceBuilder} from '../../../../src/service-helpers';
+import {
+  Action,
+  AmpStoryStoreService,
+  StateProperty,
+} from '../../../amp-story/1.0/amp-story-store-service';
+import {AmpStoryShareMenu, VISIBLE_CLASS} from '../amp-story-share-menu';
+
+describes.realWin('amp-story-share-menu', {amp: true}, (env) => {
+  let hostEl;
+  let shareMenu;
+  let ampStory;
+  let storeService;
+  let win;
+  let installExtensionForDoc;
+
+  beforeEach(() => {
+    win = env.win;
+    storeService = new AmpStoryStoreService(win);
+    registerServiceBuilder(win, 'story-store', function () {
+      return storeService;
+    });
+
+    // Making sure the vsync tasks run synchronously.
+    env.sandbox.stub(Services, 'vsyncFor').returns({
+      mutate: (fn) => fn(),
+      run: (vsyncTaskSpec, vsyncState) => {
+        vsyncTaskSpec.measure(vsyncState);
+        vsyncTaskSpec.mutate(vsyncState);
+      },
+    });
+
+    installExtensionForDoc = env.sandbox.spy();
+
+    env.sandbox.stub(Services, 'extensionsFor').returns({
+      installExtensionForDoc,
+    });
+
+    const localizationService = new LocalizationService(win.document.body);
+    env.sandbox
+      .stub(Services, 'localizationForDoc')
+      .returns(localizationService);
+
+    hostEl = win.document.createElement('div');
+    ampStory = win.document.createElement('amp-story');
+    win.document.body.appendChild(ampStory);
+    ampStory.appendChild(hostEl);
+    shareMenu = new AmpStoryShareMenu(hostEl);
+  });
+
+  it('should build the sharing menu', async () => {
+    await shareMenu.buildCallback();
+    expect(shareMenu.rootEl_).to.exist;
+  });
+
+  it('should show the share menu on store property update', async () => {
+    await shareMenu.buildCallback();
+
+    storeService.dispatch(Action.TOGGLE_SHARE_MENU, true);
+
+    expect(shareMenu.rootEl_).to.have.class(VISIBLE_CLASS);
+  });
+
+  it('should hide the share menu on click on the overlay', async () => {
+    await shareMenu.buildCallback();
+
+    storeService.dispatch(Action.TOGGLE_SHARE_MENU, true);
+    shareMenu.rootEl_.dispatchEvent(new Event('click'));
+
+    expect(shareMenu.rootEl_).not.to.have.class(VISIBLE_CLASS);
+    expect(storeService.get(StateProperty.SHARE_MENU_STATE)).to.be.false;
+  });
+
+  it('should not hide the share menu on click on the widget container', async () => {
+    await shareMenu.buildCallback();
+
+    storeService.dispatch(Action.TOGGLE_SHARE_MENU, true);
+    hostEl
+      .querySelector('.i-amphtml-story-share-menu-container')
+      .dispatchEvent(new Event('click'));
+
+    expect(shareMenu.rootEl_).to.have.class(VISIBLE_CLASS);
+  });
+
+  it('should hide the share menu on escape key press', async () => {
+    await shareMenu.buildCallback();
+
+    const clickCallbackSpy = env.sandbox.spy();
+    win.addEventListener('keyup', clickCallbackSpy);
+
+    storeService.dispatch(Action.TOGGLE_SHARE_MENU, true);
+    // Create escape keyup event.
+    const keyupEvent = new Event('keyup');
+    keyupEvent.keyCode = Keys_Enum.ESCAPE;
+    win.dispatchEvent(keyupEvent);
+
+    expect(clickCallbackSpy).to.have.been.calledOnce;
+  });
+
+  it('should send message to viewer to execute copy url if embedded', async () => {
+    const viewer = Services.viewerForDoc(env.ampdoc);
+    env.sandbox.stub(viewer, 'isEmbedded').returns(true);
+    env.sandbox.stub(Services, 'viewerForDoc').returns(viewer);
+
+    await shareMenu.buildCallback();
+
+    const onMessageSpy = env.sandbox.spy(
+      shareMenu.viewerMessagingHandler_,
+      'onMessage'
+    );
+    const sendSpy = env.sandbox.spy(shareMenu.viewerMessagingHandler_, 'send');
+
+    const shareLinkEl = win.document.querySelector(
+      '.i-amphtml-story-share-icon-link'
+    );
+    shareLinkEl.click();
+    expect(onMessageSpy).to.have.been.calledOnce;
+    expect(sendSpy).to.have.been.calledOnce;
+  });
+});
diff --git a/extensions/amp-story-share-menu/OWNERS b/extensions/amp-story-share-menu/OWNERS
new file mode 100644
index 000000000000..a31676ec5802
--- /dev/null
+++ b/extensions/amp-story-share-menu/OWNERS
@@ -0,0 +1,23 @@
+// For an explanation of the OWNERS rules and syntax, see:
+// https://github.com/ampproject/amp-github-apps/blob/main/owners/OWNERS.example
+
+{
+  rules: [
+    {
+      owners: [
+        {
+          name: 'gmajoulet',
+          notify: true,
+        },
+        {
+          name: 'newmuis',
+          notify: true,
+        },
+        {
+          name: 'mszylkowski',
+          notify: true,
+        },
+      ],
+    },
+  ],
+}
diff --git a/extensions/amp-story-shopping/0.1/amp-story-shopping-attachment.css b/extensions/amp-story-shopping/0.1/amp-story-shopping-attachment.css
index 4ebba46740ec..f7a92a3695f8 100644
--- a/extensions/amp-story-shopping/0.1/amp-story-shopping-attachment.css
+++ b/extensions/amp-story-shopping/0.1/amp-story-shopping-attachment.css
@@ -1,2 +1,328 @@
 amp-story-shopping-attachment {
+  height: 100% !important;
+  width: 100% !important;
+  font-family: 'Poppins', sans-serif !important;
+  font-size: calc(var(--story-page-vmin) * 3) !important; /* Override with ems for pixel perfect layout. */
+  --i-amphtml-shopping-attachment-horizontal-spacing: 1.5em !important;
+  --i-amphtml-shopping-attachment-vertical-spacing: 1.2em !important;
+  --i-amphtml-shopping-three-percent-overlay: rgba(0, 0, 0,  .03) !important;
+  --i-amphtml-shopping-pdp-carousel-height: calc(var(--story-page-vh) * 80 - var(--story-page-vw) * 60) !important;
+}
+
+amp-story[desktop][supports-landscape] amp-story-shopping-attachment {
+  /* Sets static values in desktop supports landscape mode. */
+  font-size: calc(18px) !important;
+  --i-amphtml-shopping-pdp-carousel-height: 32em !important;
+}
+
+amp-story-shopping-attachment[theme="dark"] {
+  --i-amphtml-shopping-three-percent-overlay: rgba(255, 255, 255, .03) !important;
+}
+
+amp-story-shopping-attachment a {
+  text-decoration: none !important;
+}
+
+.i-amphtml-amp-story-shopping {
+  display: none !important;
+}
+
+.i-amphtml-amp-story-shopping[active] {
+  display: block !important;
+}
+
+.i-amphtml-amp-story-shopping-sub-section-header {
+  font-weight: 600 !important;
+  font-size: 1.5em !important;
+  padding: var(--i-amphtml-shopping-attachment-vertical-spacing) 0 !important;
+}
+
+/* PLP (Product Listing Page). */
+
+.i-amphtml-amp-story-shopping-plp {
+  padding: 0 var(--i-amphtml-shopping-attachment-horizontal-spacing) !important;
+}
+
+.i-amphtml-amp-story-shopping-plp-cards {
+  justify-content: space-between !important;
+  display: flex !important;
+  flex-wrap: wrap !important;
+  align-items: flex-start;
+}
+
+.i-amphtml-amp-story-shopping-plp-card {
+  width: calc(50% - var(--i-amphtml-shopping-attachment-horizontal-spacing) / 2) !important;
+  margin-bottom: 3em !important;
+  cursor: pointer !important;
+}
+
+.i-amphtml-amp-story-shopping-plp-card-image {
+  width: 100% !important;
+  height: 14.5em !important;
+  margin-bottom: 1em !important;
+  border-radius: 2em !important;
+  background-position: center !important;
+  background-repeat: none !important;
+  background-size: cover !important;
+  background-color: var(--i-amphtml-shopping-three-percent-overlay) !important;
+}
+
+.i-amphtml-amp-story-shopping-plp-card-brand {
+  font-weight: 500 !important;
+  font-size: .9em !important;
+  margin-bottom: 0.3em !important;
+  font-size: .9em !important;
+  text-overflow: ellipsis !important;
+  white-space: nowrap !important;
+  overflow: hidden !important;
+}
+
+.i-amphtml-amp-story-shopping-plp-card-title {
+  font-weight: 600 !important;
+  margin-bottom: 0.4em !important;
+  line-height: 1.2em !important;
+  font-size: 1.25em !important;
+}
+
+.i-amphtml-amp-story-shopping-plp-card-price {
+  font-weight: 500 !important;
+  margin-bottom: .33em !important;
+  line-height: 1em !important;
+  font-size: 1.1em !important;
+}
+
+/* PDP (Product Description Page). */
+
+/* Only display section divider when pdp is not the only child. */
+.i-amphtml-amp-story-shopping-pdp:not(:only-child):after {
+  content: '' !important;
+  display: block !important;
+  width: 100% !important;
+  height: .75em !important;
+  background-color: var(--i-amphtml-shopping-three-percent-overlay) !important;
+}
+
+.i-amphtml-amp-story-shopping-pdp-header {
+  margin: 1.5em var(--i-amphtml-shopping-attachment-horizontal-spacing) 2em !important;
+}
+
+.i-amphtml-amp-story-shopping-pdp-header-brand {
+  font-weight: 500 !important;
+  font-size: 1.1em !important;
+  line-height: 0.9em !important;
+  display: block !important;
+}
+
+.i-amphtml-amp-story-shopping-pdp-header-title-and-price {
+  display: flex !important;
+  justify-content: space-between !important;
+  margin-bottom: 0.7em !important;
+}
+
+.i-amphtml-amp-story-shopping-pdp-header-title {
+  font-weight: 700 !important;
+  font-size: 1.9em !important;
+}
+
+.i-amphtml-amp-story-shopping-pdp-header-price {
+  font-weight: 500 !important;
+  font-size: 1.5em !important;
+  margin-top: auto !important;
+}
+
+.i-amphtml-amp-story-shopping-pdp-cta {
+  font-size: 1.25em !important;
+  --i-amphtml-shopping-cta-height: 2.55em !important;
+  display: inline-flex !important;
+  padding: 0 .88em !important;
+  align-items: center !important;
+  height: var(--i-amphtml-shopping-cta-height) !important;
+  border-radius: calc(var(--i-amphtml-shopping-cta-height) / 2) !important;
+  background: var(--i-amphtml-draggable-drawer-text-color) !important;
+  font-weight: 500 !important;
+  color: var(--i-amphtml-draggable-drawer-background-color) !important;
+}
+
+.i-amphtml-amp-story-shopping-pdp-cta:after {
+  content: '' !important;
+  display: inline-block !important;
+  margin-inline-start: .8em !important;
+  width: .88em !important;
+  height: .88em !important;
+  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg width='12' height='12' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M1.917 1.917v8.166h8.166V6h1.167v4.083a1.17 1.17 0 0 1-1.167 1.167H1.917A1.166 1.166 0 0 1 .75 10.083V1.917C.75 1.275 1.27.75 1.917.75H6v1.167H1.917zm5.25 0V.75h4.083v4.083h-1.167V2.74L4.35 8.473l-.822-.822L9.26 1.917H7.167z' fill='%23fff'/%3E%3C/svg%3E") !important;
+  background-repeat: no-repeat !important;
+  background-position: 50% !important;
+  background-size: cover !important;
+}
+
+[theme="dark"] .i-amphtml-amp-story-shopping-pdp-cta:after {
+  filter: invert(1) !important;
+}
+
+/* PDP reviews */
+
+.i-amphtml-amp-story-shopping-pdp-reviews {
+  display: flex !important;
+  align-items: center !important;
+  font-weight: 400 !important;
+  line-height: 0.9em !important;
+  font-size: 1.1em !important;
+  margin-bottom: 1.2em !important;
+  /* Overrides default system link color. */
+  color: inherit !important;
+}
+
+.i-amphtml-amp-story-shopping-pdp-reviews-stars {
+  --i-amphtml-star-size: .9em;
+  width: calc(var(--i-amphtml-star-size) * 5) !important;
+  height: var(--i-amphtml-star-size) !important;
+  margin: 0 0.3em !important;
+  position: relative !important;
+  display: inline-flex !important;
+  align-items: center !important;
+}
+
+.i-amphtml-amp-story-shopping-pdp-reviews-stars:before,
+.i-amphtml-amp-story-shopping-pdp-reviews-stars:after {
+  content: '' !important;
+  height: 100% !important;
+  background-repeat: repeat-x !important;
+  background-size: var(--i-amphtml-star-size) !important;
+}
+
+.i-amphtml-amp-story-shopping-pdp-reviews-stars:before {
+  background-position: 0% !important;
+  width: var(--i-amphtml-star-rating-width);
+  background-image: url("data:image/svg+xml;charset=utf-8,<svg width='11' height='10' fill='#fbc02d' xmlns='http://www.w3.org/2000/svg'><path transform='translate(.5px, 0)' d='M4.524.463a.5.5 0 0 1 .952 0L6.235 2.8a.5.5 0 0 0 .475.346h2.458a.5.5 0 0 1 .294.904L7.474 5.495a.5.5 0 0 0-.182.559l.76 2.337a.5.5 0 0 1-.77.559L5.294 7.506a.5.5 0 0 0-.588 0L2.718 8.95a.5.5 0 0 1-.77-.56l.76-2.336a.5.5 0 0 0-.182-.56L.538 4.05a.5.5 0 0 1 .294-.904H3.29a.5.5 0 0 0 .475-.346l.76-2.337Z'/></svg>") !important;
+}
+
+.i-amphtml-amp-story-shopping-pdp-reviews-stars:after {
+  background-position: 100% !important;
+  width: calc(100% - var(--i-amphtml-star-rating-width));
+  background-image: url("data:image/svg+xml;charset=utf-8,<svg width='11' height='10' fill='#333' xmlns='http://www.w3.org/2000/svg'><path transform='translate(.5px, 0)' d='M4.524.463a.5.5 0 0 1 .952 0L6.235 2.8a.5.5 0 0 0 .475.346h2.458a.5.5 0 0 1 .294.904L7.474 5.495a.5.5 0 0 0-.182.559l.76 2.337a.5.5 0 0 1-.77.559L5.294 7.506a.5.5 0 0 0-.588 0L2.718 8.95a.5.5 0 0 1-.77-.56l.76-2.336a.5.5 0 0 0-.182-.56L.538 4.05a.5.5 0 0 1 .294-.904H3.29a.5.5 0 0 0 .475-.346l.76-2.337Z'/></svg>") !important;
+}
+
+[dir="rtl"] .i-amphtml-amp-story-shopping-pdp-reviews-stars:before {
+  background-position: 100% !important;
+}
+
+[dir="rtl"] .i-amphtml-amp-story-shopping-pdp-reviews-stars:after {
+  background-position: 0% !important;
+}
+
+[theme="dark"] .i-amphtml-amp-story-shopping-pdp-reviews-stars:before {
+  filter: invert(.3) !important;
+}
+
+.i-amphtml-amp-story-shopping-pdp-reviews-count {
+  text-decoration: underline !important;
+}
+
+/* PDP carousel */
+
+.i-amphtml-amp-story-shopping-pdp-carousel {
+  display: flex !important;
+  overflow-x: auto !important;
+  scroll-snap-type: x mandatory !important;
+  height: var(--i-amphtml-shopping-pdp-carousel-height) !important;
+  max-height: 100vw !important;
+}
+
+/* Only adds bottom margin if carousel is last child. */
+.i-amphtml-amp-story-shopping-pdp-carousel:last-child {
+  margin-bottom: var(--i-amphtml-shopping-attachment-vertical-spacing) !important;
+}
+
+.i-amphtml-amp-story-shopping-pdp-carousel::-webkit-scrollbar {
+  display: none !important;
+}
+
+.i-amphtml-amp-story-shopping-pdp-carousel-card {
+  margin-inline-start: calc(var(--i-amphtml-shopping-attachment-horizontal-spacing) / 2) !important;
+  scroll-snap-align: center !important;
+  flex-shrink: 0 !important;
+  background-color: var(--i-amphtml-shopping-three-percent-overlay) !important;
+  background-size: cover !important;
+  background-position: center !important;
+  background-repeat: no-repeat !important;
+  cursor: pointer !important;
+  width: calc(var(--story-page-vw) * 100 - 7.5em) !important;
+  max-width: calc(var(--i-amphtml-shopping-pdp-carousel-height) * 1.25) !important;
+}
+
+.i-amphtml-amp-story-shopping-pdp-carousel-card:first-child {
+  margin-inline-start: var(--i-amphtml-shopping-attachment-horizontal-spacing) !important;
+  border-radius: 1.1em 0 0 1.1em !important;
+}
+
+.i-amphtml-amp-story-shopping-pdp-carousel-card:last-child {
+  margin-inline-end: var(--i-amphtml-shopping-attachment-horizontal-spacing) !important;
+  border-radius: 0 1.1em 1.1em 0 !important;
+}
+
+[dir=rtl] .i-amphtml-amp-story-shopping-pdp-carousel-card:first-child {
+  border-radius: 0 1.1em 1.1em 0 !important;
+}
+
+[dir=rtl] .i-amphtml-amp-story-shopping-pdp-carousel-card:last-child {
+  border-radius: 1.1em 0 0 1.1em !important;
+}
+
+/* Override when it's the only child. First and last selectors are used for specificity. */
+.i-amphtml-amp-story-shopping-pdp-carousel-card:first-child:last-child {
+  width: calc(100% - var(--i-amphtml-shopping-attachment-horizontal-spacing) * 2) !important;
+  max-width: calc(100% - var(--i-amphtml-shopping-attachment-horizontal-spacing) * 2) !important;
+  border-radius: 1.1em !important;
+  cursor: auto !important;
+}
+
+/* PDP deatils */
+
+.i-amphtml-amp-story-shopping-pdp-details {
+  padding: 0 var(--i-amphtml-shopping-attachment-horizontal-spacing) !important;
+}
+
+.i-amphtml-amp-story-shopping-pdp-details-header {
+  cursor: pointer !important;
+  display: flex !important;
+  justify-content: space-between !important;
+  align-items: center !important;
+  width: 100% !important;
+}
+
+.i-amphtml-amp-story-shopping-pdp-details-header-arrow {
+  padding: 0 0.5em !important;
+  height: 0.6em !important;
+  fill: none !important;
+  stroke: var(--i-amphtml-draggable-drawer-text-color) !important;
+  pointer-events: none !important;
+}
+
+.i-amphtml-amp-story-shopping-pdp-details .i-amphtml-amp-story-shopping-pdp-details-header-arrow path {
+  transition: d 0.3s !important;
+}
+
+.i-amphtml-amp-story-shopping-pdp-details[active] .i-amphtml-amp-story-shopping-pdp-details-header-arrow path {
+  d: path("M.5,5.2 L5,.8 L9.5,5.2") !important;
+}
+
+.i-amphtml-amp-story-shopping-pdp-details .i-amphtml-amp-story-shopping-pdp-details-text {
+  display: block !important;
+  overflow: hidden !important;
+  height: 0 !important;
+  opacity: 0 !important;
+  transition: opacity .3s !important;
+}
+
+.i-amphtml-amp-story-shopping-pdp-details[active] .i-amphtml-amp-story-shopping-pdp-details-text {
+  height: auto !important;
+  opacity: 1 !important;
+  /* Renders \n as newlines in product data text. */
+  white-space: pre-line !important;
+}
+
+.i-amphtml-amp-story-shopping-pdp-details-text:after {
+  content: '' !important;
+  display: block !important;
+  padding-bottom: var(--i-amphtml-shopping-attachment-vertical-spacing) !important;
 }
diff --git a/extensions/amp-story-shopping/0.1/amp-story-shopping-attachment.js b/extensions/amp-story-shopping/0.1/amp-story-shopping-attachment.js
index 0d2311380074..4b3d7e369c5f 100644
--- a/extensions/amp-story-shopping/0.1/amp-story-shopping-attachment.js
+++ b/extensions/amp-story-shopping/0.1/amp-story-shopping-attachment.js
@@ -1,32 +1,559 @@
-import {Layout, applyFillContent} from '#core/dom/layout';
+import {toggleAttribute} from '#core/dom';
+import * as Preact from '#core/dom/jsx';
+import {Layout_Enum} from '#core/dom/layout';
 
-import {AmpStoryPageAttachment} from 'extensions/amp-story/1.0/amp-story-page-attachment';
+import {Services} from '#service';
+import {LocalizedStringId_Enum} from '#service/localization/strings';
 
-const TAG = 'amp-story-shopping-attachment';
+import {localizeTemplate} from 'extensions/amp-story/1.0/amp-story-localization-service';
+import {HistoryState, setHistoryState} from 'extensions/amp-story/1.0/history';
 
-export class AmpStoryShoppingAttachment extends AmpStoryPageAttachment {
+import {formatI18nNumber, loadFonts} from './amp-story-shopping';
+import {
+  getShoppingConfig,
+  storeShoppingConfig,
+} from './amp-story-shopping-config';
+
+import {relativeToSourceUrl} from '../../../src/url';
+import {
+  Action,
+  ShoppingConfigDataDef,
+  StateProperty,
+} from '../../amp-story/1.0/amp-story-store-service';
+import {StoryAnalyticsEvent} from '../../amp-story/1.0/story-analytics';
+import {AnalyticsVariable} from '../../amp-story/1.0/variable-service';
+
+/** @const {!Array<!Object>} fontFaces */
+const FONTS_TO_LOAD = [
+  {
+    family: 'Poppins',
+    weight: '500',
+    src: "url(https://fonts.gstatic.com/s/poppins/v15/pxiByp8kv8JHgFVrLGT9Z1xlFd2JQEk.woff2) format('woff2')",
+  },
+  {
+    family: 'Poppins',
+    weight: '600',
+    src: "url(https://fonts.gstatic.com/s/poppins/v15/pxiByp8kv8JHgFVrLEj6Z1xlFd2JQEk.woff2) format('woff2')",
+  },
+];
+
+/**
+ * @const {number}
+ * Max amount of characters for the product details text section.
+ */
+const MAX_PRODUCT_DETAILS_TEXT_LENGTH = 3000;
+
+export class AmpStoryShoppingAttachment extends AMP.BaseElement {
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
 
-    /** @private {string} */
-    this.myText_ = TAG;
+    /** @private {?Element} */
+    this.attachmentEl_ = null;
 
     /** @private {?Element} */
-    this.container_ = null;
+    this.pageEl_ = null;
+
+    /** @private {?Array<!Element>} */
+    this.shoppingTags_ = null;
+
+    /** @private @const {!Element} */
+    this.templateContainer_ = <div></div>;
+
+    /** @private @const {!../../amp-story/1.0/amp-story-store-service.AmpStoryStoreService} */
+    this.storeService_ = Services.storyStoreService(this.win);
+
+    /** @private @const {!../../../src/service/localization.LocalizationService} */
+    this.localizationService_ = Services.localizationForDoc(this.element);
+
+    /** @private {!Map<string, Element>} */
+    this.builtTemplates_ = {};
+
+    /** @private @const {!./story-analytics.StoryAnalyticsService} */
+    this.analyticsService_ = Services.storyAnalyticsService(this.win);
+
+    /** @private @const {!./story-analytics.StoryAnalyticsService} */
+    this.variableService_ = Services.storyVariableService(this.win);
   }
 
   /** @override */
   buildCallback() {
-    super.buildCallback();
-    this.container_ = this.element.ownerDocument.createElement('div');
-    this.container_.textContent = this.myText_;
-    this.element.appendChild(this.container_);
-    applyFillContent(this.container_, /* replacedContent */ true);
+    this.pageEl_ = this.element.closest('amp-story-page');
+    this.shoppingTags_ = Array.from(
+      this.pageEl_.querySelectorAll('amp-story-shopping-tag')
+    );
+
+    if (this.shoppingTags_.length === 0) {
+      return Promise.reject(
+        new Error(`No shopping tags on page ${this.pageEl_.id}.`)
+      );
+    }
+
+    return getShoppingConfig(this.element, this.pageEl_.id)
+      .then((config) => {
+        if (Object.keys(config).length === 0) {
+          return Promise.reject(
+            new Error(`No valid shopping data on page ${this.pageEl_.id}.`)
+          );
+        }
+        storeShoppingConfig(this.pageEl_, config);
+      })
+      .then(() =>
+        this.localizationService_.getLocalizedStringAsync(
+          LocalizedStringId_Enum.AMP_STORY_SHOPPING_CTA_LABEL
+        )
+      )
+      .then((ctaText) => {
+        this.attachmentEl_ = (
+          <amp-story-page-attachment
+            layout="nodisplay"
+            theme={this.element.getAttribute('theme')}
+            cta-text={this.element.getAttribute('cta-text')?.trim() || ctaText}
+          >
+            {this.templateContainer_}
+          </amp-story-page-attachment>
+        );
+        this.element.appendChild(this.attachmentEl_);
+      });
+  }
+
+  /** @override */
+  layoutCallback() {
+    loadFonts(this.win, FONTS_TO_LOAD);
+    // Update template on attachment state update or shopping data update.
+    this.storeService_.subscribe(
+      StateProperty.PAGE_ATTACHMENT_STATE,
+      (isOpen) => this.onAttachmentStateUpdate_(isOpen),
+      true /** callToInitialize */
+    );
+    this.storeService_.subscribe(
+      StateProperty.SHOPPING_DATA,
+      (shoppingData) => this.onShoppingDataUpdate_(shoppingData),
+      true /** callToInitialize */
+    );
+    // Listen to transiton end events on attachment to check to clear active data.
+    this.attachmentEl_.addEventListener('transitionend', () =>
+      this.clearActiveProductDataIfClosed_()
+    );
+  }
+
+  /**
+   * Triggers template update if opening without active product data.
+   * This happens either when the "Shop now" CTA is clicked or when a
+   * shopping tag is clicked.
+   * @param {boolean} isOpen
+   * @private
+   */
+  onAttachmentStateUpdate_(isOpen) {
+    if (!this.isOnActivePage_() || !isOpen) {
+      return;
+    }
+
+    const shoppingData = this.storeService_.get(StateProperty.SHOPPING_DATA);
+
+    if (!shoppingData.activeProductData) {
+      this.updateTemplate_(shoppingData);
+    }
+  }
+
+  /**
+   * Handles template changes when there is activeProductData.
+   * This happens when a product tag or PLP card is clicked.
+   * @param {!{[key: string]: !ShoppingConfigDataDef}} shoppingData
+   * @private
+   */
+  onShoppingDataUpdate_(shoppingData) {
+    if (!shoppingData.activeProductData || !this.isOnActivePage_()) {
+      return;
+    }
+    const isOpen = this.storeService_.get(StateProperty.PAGE_ATTACHMENT_STATE);
+    if (isOpen) {
+      // If open, update the template.
+      // This happens when a product card is clicked in the PLP template.
+      this.updateTemplate_(shoppingData);
+    } else {
+      // Otherwise, open the attachment and then update the template.
+      // This happens when clicking a shopping tag.
+      this.attachmentEl_.getImpl().then((impl) => {
+        impl.open();
+        this.updateTemplate_(shoppingData);
+      });
+    }
+  }
+
+  /**
+   * Clear active product data after the attachment closes so that content does not jump.
+   * @private
+   */
+  clearActiveProductDataIfClosed_() {
+    const isOpen = this.storeService_.get(StateProperty.PAGE_ATTACHMENT_STATE);
+    if (!isOpen) {
+      this.storeService_.dispatch(Action.ADD_SHOPPING_DATA, {
+        'activeProductData': null,
+      });
+    }
+  }
+
+  /**
+   * Updates template based on shopping data.
+   * @param {!{[key: string]: !ShoppingConfigDataDef}} shoppingData
+   * @private
+   */
+  updateTemplate_(shoppingData) {
+    const productOnPageToConfig = shoppingData[this.pageEl_.id];
+    const shoppingDataPerPage = Object.values(productOnPageToConfig);
+
+    let productForPdp = shoppingData.activeProductData;
+    // If no active product and only one product on page, use the one product for the PDP.
+    if (!productForPdp && shoppingDataPerPage.length === 1) {
+      productForPdp = shoppingDataPerPage[0];
+    }
+
+    // templateId string used to key already built templates.
+    const templateId = productForPdp ? `pdp-${productForPdp.productId}` : 'plp';
+
+    // Remove active attribute from already built templates.
+    Object.values(this.builtTemplates_).forEach((template) =>
+      template.removeAttribute('active')
+    );
+
+    const template = this.getTemplate_(
+      templateId,
+      productForPdp,
+      shoppingDataPerPage
+    );
+    template.setAttribute('active', '');
+    this.resetScroll_(template);
+
+    // Ensure details text is closed, unless there is only one product on the page.
+    const detailsContainer = template.querySelector(
+      '.i-amphtml-amp-story-shopping-pdp-details'
+    );
+    if (detailsContainer) {
+      const shouldOpen = shoppingDataPerPage.length === 1;
+      this.toggleDetailsText_(detailsContainer, shouldOpen);
+    }
+
+    // If template has not been appended to the dom, append it and assign it to built templates.
+    if (!template.isConnected) {
+      this.builtTemplates_[templateId] = template;
+      this.mutateElement(() => this.templateContainer_.appendChild(template));
+    }
+
+    // PDP view that calls the analytics service sending the product id.
+    if (productForPdp) {
+      this.variableService_.onVariableUpdate(
+        AnalyticsVariable.STORY_SHOPPING_PRODUCT_ID,
+        productForPdp.productId
+      );
+    }
+
+    // Triggers an analytics event for the PDP or PLP depending on if there is an active product.
+    this.analyticsService_.triggerEvent(
+      productForPdp
+        ? StoryAnalyticsEvent.SHOPPING_PDP_VIEW
+        : StoryAnalyticsEvent.SHOPPING_PLP_VIEW
+    );
+  }
+
+  /**
+   * Returns template if already built. If not built, returns a built template.
+   * @param {string} templateId
+   * @param {?ShoppingConfigDataDef} productForPdp
+   * @param {!Array<!ShoppingConfigDataDef} shoppingDataForPage
+   * @return {Element}
+   * @private
+   */
+  getTemplate_(templateId, productForPdp, shoppingDataForPage) {
+    if (this.builtTemplates_[templateId]) {
+      return this.builtTemplates_[templateId];
+    }
+    const template = (
+      <div class="i-amphtml-amp-story-shopping">
+        {/* If there is a product for the PDP, render PDP. */}
+        {productForPdp && this.renderPdpTemplate_(productForPdp)}
+        {/* If there is more than one product on the page, render PLP. */}
+        {shoppingDataForPage.length > 1 &&
+          this.renderPlpTemplate_(
+            shoppingDataForPage.filter((item) => item !== productForPdp)
+          )}
+      </div>
+    );
+    localizeTemplate(template, this.element);
+    return template;
+  }
+
+  /**
+   * Centers carousel card image on click.
+   * @param {!Element} carouselCard
+   * @private
+   */
+  onPdpCarouselCardClick_(carouselCard) {
+    carouselCard./*OK*/ scrollIntoView({
+      behavior: 'smooth',
+      block: 'nearest',
+      inline: 'center',
+    });
+  }
+
+  /**
+   * On plp card click dispatch shopping data.
+   * @param {!Array<!ShoppingConfigDataDef>} shoppingData
+   * @private
+   */
+  onPlpCardClick_(shoppingData) {
+    this.storeService_.dispatch(Action.ADD_SHOPPING_DATA, {
+      'activeProductData': shoppingData,
+    });
+
+    setHistoryState(this.win, HistoryState.SHOPPING_DATA, shoppingData);
+  }
+
+  /**
+   * @param {!Element} template
+   * @private
+   */
+  resetScroll_(template) {
+    // If template contains carousel, reset carousel scroll.
+    template
+      .querySelector('.i-amphtml-amp-story-shopping-pdp-carousel')
+      ?.scroll({
+        left: 0,
+      });
+    // Smooth scroll drawer to top.
+    this.element
+      .querySelector('.i-amphtml-story-draggable-drawer-container')
+      .scroll({
+        top: 0,
+        behavior: 'smooth',
+      });
+  }
+
+  /**
+   * Expands or collapses details text.
+   * @param {!Element} detailsContainer
+   * @param {boolean} shouldOpen
+   * @private
+   */
+  toggleDetailsText_(detailsContainer, shouldOpen) {
+    const detailsText = detailsContainer.querySelector(
+      '.i-amphtml-amp-story-shopping-pdp-details-text'
+    );
+    this.mutateElement(() => {
+      toggleAttribute(detailsContainer, 'active', shouldOpen);
+      detailsText.setAttribute('aria-hidden', !shouldOpen);
+    });
+  }
+
+  /**
+   * onclick event that fires when buy now is clicked,
+   * sends an analytics event containing product id.
+   * @return {boolean}
+   * @private
+   */
+  onClickBuyNow_() {
+    this.analyticsService_.triggerEvent(
+      StoryAnalyticsEvent.SHOPPING_BUY_NOW_CLICK
+    );
+  }
+
+  /**
+   * @param {!ShoppingConfigDataDef} activeProductData
+   * @return {Element}
+   * @private
+   */
+  renderPdpTemplate_(activeProductData) {
+    const onDetailsHeaderClick = (el) => {
+      const detailsContainer = el.closest(
+        '.i-amphtml-amp-story-shopping-pdp-details'
+      );
+      const shouldOpen = !detailsContainer.hasAttribute('active');
+      this.toggleDetailsText_(detailsContainer, shouldOpen);
+    };
+    return (
+      <div class="i-amphtml-amp-story-shopping-pdp">
+        <div class="i-amphtml-amp-story-shopping-pdp-header">
+          {activeProductData.productBrand && (
+            <span class="i-amphtml-amp-story-shopping-pdp-header-brand">
+              {activeProductData.productBrand}
+            </span>
+          )}
+          <div class="i-amphtml-amp-story-shopping-pdp-header-title-and-price">
+            <span class="i-amphtml-amp-story-shopping-pdp-header-title">
+              {activeProductData.productTitle}
+            </span>
+            <span class="i-amphtml-amp-story-shopping-pdp-header-price">
+              {formatI18nNumber(
+                this.localizationService_,
+                this.element,
+                activeProductData.productPriceCurrency,
+                activeProductData.productPrice
+              )}
+            </span>
+          </div>
+          {activeProductData.aggregateRating && (
+            // Wrapper prevents anchor from spanning entire width of container.
+            // This prevents accidental clicks.
+            <div>
+              <a
+                class="i-amphtml-amp-story-shopping-pdp-reviews"
+                href={relativeToSourceUrl(
+                  activeProductData.aggregateRating.reviewUrl,
+                  this.element
+                )}
+                target="_top"
+              >
+                <span>{activeProductData.aggregateRating.ratingValue}</span>
+                <span
+                  class="i-amphtml-amp-story-shopping-pdp-reviews-stars"
+                  style={`--i-amphtml-star-rating-width: ${
+                    // Creates a value between 0 and 100 in increments of 10.
+                    Math.round(
+                      activeProductData.aggregateRating.ratingValue * 2
+                    ) * 10
+                  }%`}
+                ></span>
+                <span class="i-amphtml-amp-story-shopping-pdp-reviews-count">
+                  {activeProductData.aggregateRating.reviewCount}
+                </span>
+              </a>
+            </div>
+          )}
+          <a
+            class="i-amphtml-amp-story-shopping-pdp-cta"
+            href={relativeToSourceUrl(
+              activeProductData.productUrl,
+              this.element
+            )}
+            target="_top"
+            onClick={() => this.onClickBuyNow_()}
+            i-amphtml-i18n-text-content={
+              LocalizedStringId_Enum.AMP_STORY_SHOPPING_ATTACHMENT_CTA_LABEL
+            }
+          ></a>
+        </div>
+        <div class="i-amphtml-amp-story-shopping-pdp-carousel">
+          {activeProductData.productImages.map((image) => (
+            <div
+              class="i-amphtml-amp-story-shopping-pdp-carousel-card"
+              role="img"
+              aria-label={image.alt}
+              style={`background-image: url("${relativeToSourceUrl(
+                image.url,
+                this.element
+              )}")`}
+              onClick={(e) => this.onPdpCarouselCardClick_(e.target)}
+            ></div>
+          ))}
+        </div>
+        {activeProductData.productDetails && (
+          <div class="i-amphtml-amp-story-shopping-pdp-details">
+            <button
+              class="i-amphtml-amp-story-shopping-button-reset i-amphtml-amp-story-shopping-pdp-details-header"
+              onClick={(e) => onDetailsHeaderClick(e.target)}
+            >
+              <span
+                class="i-amphtml-amp-story-shopping-sub-section-header"
+                i-amphtml-i18n-text-content={
+                  LocalizedStringId_Enum.AMP_STORY_SHOPPING_ATTACHMENT_DETAILS
+                }
+              ></span>
+              <svg
+                viewBox="0 0 10 6"
+                class="i-amphtml-amp-story-shopping-pdp-details-header-arrow"
+              >
+                <path d="M.5,.5 L5,5.2 L9.5,.5" />
+              </svg>
+            </button>
+            <span
+              class="i-amphtml-amp-story-shopping-pdp-details-text"
+              aria-hidden="true"
+            >
+              {
+                // Add ellipses if product details text is greater than max.
+                (activeProductData.productDetails.length >
+                MAX_PRODUCT_DETAILS_TEXT_LENGTH
+                  ? activeProductData.productDetails.slice(
+                      0,
+                      MAX_PRODUCT_DETAILS_TEXT_LENGTH
+                    ) + '...'
+                  : activeProductData.productDetails
+                )
+                  // Replaces two newlines with 0 or more spaces between them with two newlines.
+                  .replace(/\n\s*\n/g, '\n\n')
+              }
+            </span>
+          </div>
+        )}
+      </div>
+    );
+  }
+
+  /**
+   * @param {!Array<!ShoppingConfigDataDef>} shoppingDataForPage
+   * @return {Element}
+   * @private
+   */
+  renderPlpTemplate_(shoppingDataForPage) {
+    return (
+      <div class="i-amphtml-amp-story-shopping-plp">
+        <div
+          class="i-amphtml-amp-story-shopping-sub-section-header"
+          i-amphtml-i18n-text-content={
+            LocalizedStringId_Enum.AMP_STORY_SHOPPING_PLP_HEADER
+          }
+        ></div>
+        <div class="i-amphtml-amp-story-shopping-plp-cards">
+          {shoppingDataForPage.map((data) => (
+            <button
+              class="i-amphtml-amp-story-shopping-button-reset i-amphtml-amp-story-shopping-plp-card"
+              role="button"
+              onClick={() => this.onPlpCardClick_(data)}
+            >
+              <div
+                class="i-amphtml-amp-story-shopping-plp-card-image"
+                style={{
+                  backgroundImage: `url("${relativeToSourceUrl(
+                    data['productImages'][0].url,
+                    this.element
+                  )}")`,
+                }}
+              ></div>
+              {data['productBrand'] && (
+                <div class="i-amphtml-amp-story-shopping-plp-card-brand">
+                  {data['productBrand']}
+                </div>
+              )}
+              <div class="i-amphtml-amp-story-shopping-plp-card-title">
+                {data['productTitle']}
+              </div>
+              <div class="i-amphtml-amp-story-shopping-plp-card-price">
+                {formatI18nNumber(
+                  this.localizationService_,
+                  this.element,
+                  data['productPriceCurrency'],
+                  data['productPrice']
+                )}
+              </div>
+            </button>
+          ))}
+        </div>
+      </div>
+    );
+  }
+
+  /**
+   * @return {boolean}
+   * @private
+   */
+  isOnActivePage_() {
+    return (
+      this.pageEl_.id === this.storeService_.get(StateProperty.CURRENT_PAGE_ID)
+    );
   }
 
   /** @override */
   isLayoutSupported(layout) {
-    return layout == Layout.NODISPLAY;
+    return layout == Layout_Enum.CONTAINER;
   }
 }
diff --git a/extensions/amp-story-shopping/0.1/amp-story-shopping-config.js b/extensions/amp-story-shopping/0.1/amp-story-shopping-config.js
index 3088660609fb..d3c986b0f1ff 100644
--- a/extensions/amp-story-shopping/0.1/amp-story-shopping-config.js
+++ b/extensions/amp-story-shopping/0.1/amp-story-shopping-config.js
@@ -1,30 +1,89 @@
-import {Layout, applyFillContent} from '#core/dom/layout';
+import {Services} from '#service';
 
-const TAG = 'amp-story-shopping-config';
+import {user} from '#utils/log';
 
-export class AmpStoryShoppingConfig extends AMP.BaseElement {
-  /** @param {!AmpElement} element */
-  constructor(element) {
-    super(element);
+import {getElementConfig} from 'extensions/amp-story/1.0/request-utils';
 
-    /** @private {string} */
-    this.myText_ = TAG;
+import validateProduct from '../../../examples/amp-story/shopping/product.schema.json' assert {type: 'json-schema'}; // lgtm[js/syntax-error]
+import {
+  Action,
+  ShoppingConfigDataDef,
+} from '../../amp-story/1.0/amp-story-store-service';
 
-    /** @private {?Element} */
-    this.container_ = null;
-  }
+/**
+ * @typedef {{
+ *  items: !Array<!ShoppingConfigDataDef>,
+ * }}
+ */
+let ShoppingConfigResponseDef;
 
-  /** @override */
-  buildCallback() {
-    super.buildCallback();
-    this.container_ = this.element.ownerDocument.createElement('div');
-    this.container_.textContent = this.myText_;
-    this.element.appendChild(this.container_);
-    applyFillContent(this.container_, /* replacedContent */ true);
+/**
+ * Uses the specified validation configuration to run validation against
+ * the user's shopping configuration.
+ * @param {!ShoppingConfigDataDef} productConfig The user's config object.
+ * @param {string} name the name of the item in the config object.
+ * @return {boolean} returns a boolean indicating whether the validation
+ *     was successful.
+ */
+function validateConfig(productConfig, name) {
+  const errors = validateProduct(productConfig, name);
+  if (errors.length > 0) {
+    user().warn('AMP-STORY-SHOPPING-CONFIG', `${errors}`);
+    return false;
   }
+  return true;
+}
+
+/** @typedef {!{[key: string]: !ShoppingConfigDataDef} */
+let KeyedShoppingConfigDef;
+
+/**
+ * Validates and returns the shopping config corresponding to the given
+ * amp-story-shopping-attachment element.
+ * @param {!Element} shoppingAttachmentEl <amp-story-shopping-attachment>
+ *     The amp story shopping attachment element
+ * @param {string} itemNamePrefix the name prefix of the element i.e. the Page ID
+ * @return {!Promise<!KeyedShoppingConfigDef>} An object with product ID
+ *     keys that each have a `ShoppingConfigDataDef` value
+ */
+export function getShoppingConfig(shoppingAttachmentEl, itemNamePrefix) {
+  return getElementConfig(shoppingAttachmentEl).then((config) => {
+    const allItems = config['items'];
+    const validItems = allItems.filter((item, i) => {
+      const productTitle = item?.productTitle ?? '';
+      return validateConfig(
+        item,
+        `[${`#${itemNamePrefix} items[${i}] ${productTitle}`.trim()}]`
+      );
+    });
 
-  /** @override */
-  isLayoutSupported(layout) {
-    return layout === Layout.NODISPLAY;
+    return keyByProductId(validItems);
+  });
+}
+
+/**
+ * Takes an array of product configs and returns a map of product IDs to
+ * product configs.
+ * @param {ShoppingConfigDataDef[]} configItems
+ * @return {!KeyedShoppingConfigDef}
+ */
+function keyByProductId(configItems) {
+  const keyed = {};
+  for (const item of configItems) {
+    keyed[item.productId] = item;
   }
+  return keyed;
+}
+
+/**
+ * @param {!Element} pageElement
+ * @param {!KeyedShoppingConfigDef} config
+ * @return {!ShoppingConfigResponseDef}
+ */
+export function storeShoppingConfig(pageElement, config) {
+  const win = pageElement.ownerDocument.defaultView;
+  const storeService = Services.storyStoreService(win);
+  const pageIdToConfig = {[pageElement.id]: config};
+  storeService?.dispatch(Action.ADD_SHOPPING_DATA, pageIdToConfig);
+  return config;
 }
diff --git a/extensions/amp-story-shopping/0.1/amp-story-shopping-shared.css b/extensions/amp-story-shopping/0.1/amp-story-shopping-shared.css
new file mode 100644
index 000000000000..30ebb0f5bf83
--- /dev/null
+++ b/extensions/amp-story-shopping/0.1/amp-story-shopping-shared.css
@@ -0,0 +1,12 @@
+.i-amphtml-amp-story-shopping-button-reset {
+  background: none !important;
+  border: none !important;
+  padding: 0 !important;
+  margin: 0 !important;
+  font-family: inherit !important;
+  font-weight: inherit !important;
+  font-size: inherit !important;
+  color: inherit !important;
+  cursor: pointer !important;
+  text-align: inherit !important;
+}
diff --git a/extensions/amp-story-shopping/0.1/amp-story-shopping-tag.css b/extensions/amp-story-shopping/0.1/amp-story-shopping-tag.css
index bc63991aaee7..abf365990af1 100644
--- a/extensions/amp-story-shopping/0.1/amp-story-shopping-tag.css
+++ b/extensions/amp-story-shopping/0.1/amp-story-shopping-tag.css
@@ -1,2 +1,294 @@
+
 amp-story-shopping-tag {
+  font-family: 'Poppins', sans-serif !important;
+  font-weight: 700 !important;
+  cursor: pointer !important;
+  width: auto !important;
+  color: white !important;
+  position: absolute !important;
+  pointer-events: auto !important;
+  /* Height and width ensures layoutCallback is called. */
+  min-height: 1px !important;
+  min-width: 1px !important;
+  height: 36px !important;
+
+  --i-amphtml-shopping-tag-bg-color: rgba(125, 125, 125, .75) !important;
+  --i-amphtml-shopping-tag-animation-sequence-duration: 2s !important;
+  --i-amphtml-shopping-tag-animate-out-delay: 5s !important;
+  --i-amphtml-shopping-tag-dot-pulse-duration: 2.5s !important;
+  --i-amphtml-shopping-tag-dot-pulse-delay: 1.5s !important;
+ }
+
+.i-amphtml-amp-story-shopping-product-tag-text {
+  font-weight: 600 !important;
+  font-size: 11px !important;
+  line-height: 15.4px !important;
+}
+
+/* Maintains the correct image and text order inside the tag in RTL mode. */
+[dir=rtl].i-amphtml-amp-story-shopping-tag-inner {
+  flex-flow: row-reverse !important;
+}
+
+[dir=rtl].i-amphtml-amp-story-shopping-tag-inner-flipped {
+  flex-direction: row !important;
+}
+
+.i-amphtml-amp-story-shopping-tag-inner {
+  height: 36px !important;
+  max-width: 168px !important;
+  display: flex !important;
+  align-items: center !important;
+  justify-content: center !important;
+  /* Opacity 0 initially to avoid showing tag flip on initialization. */
+  opacity: 0 !important;
+}
+
+.i-amphtml-amp-story-shopping-tag-visible[active] {
+  opacity: 1 !important;
+}
+
+.i-amphtml-amp-story-shopping-tag-inner-flipped {
+  flex-direction: row-reverse !important;
+  transform: translate(-80%)  !important;
+  margin-inline-start: 4px !important;
+}
+
+.i-amphtml-amp-story-shopping-tag-dot {
+  --i-amphtml-tag-dot-size: 16px !important;
+  width: var(--i-amphtml-tag-dot-size) !important;
+  height: var(--i-amphtml-tag-dot-size) !important;
+  border-radius: 100% !important;
+  position: relative !important;
+  display: flex !important;
+  align-items: center !important;
+  justify-content: center !important;
+  margin: 0 4px !important;
+  flex-shrink: 0 !important;
+}
+
+.i-amphtml-amp-story-shopping-tag-dot:before {
+  content: '' !important;
+  position: absolute !important;
+  border-radius: inherit !important;
+  width: var(--i-amphtml-tag-dot-size) !important;
+  height: var(--i-amphtml-tag-dot-size) !important;
+  background-color: var(--i-amphtml-shopping-tag-bg-color) !important;
+}
+
+.i-amphtml-amp-story-shopping-tag-inner[active] .i-amphtml-amp-story-shopping-tag-dot:before {
+  animation: i-amphtml-animate-in-sequence-dot-before var(--i-amphtml-shopping-tag-animation-sequence-duration) forwards,
+    i-amphtml-pulse-dot-before var(--i-amphtml-shopping-tag-dot-pulse-duration) var(--i-amphtml-shopping-tag-dot-pulse-delay) infinite !important;
+}
+
+@keyframes i-amphtml-animate-in-sequence-dot-before {
+  0% {
+    animation-timing-function: cubic-bezier(.85, 0, .15, 1);
+    transform: scale(0);
+  }
+  60% {
+    transform: scale(1);
+  }
+  100% {
+    transform: scale(1);
+  }
+}
+
+@keyframes i-amphtml-pulse-dot-before {
+  0% {
+    animation-timing-function: cubic-bezier(.83,0,.71,.99);
+    transform: scale(1);
+  }
+  40% {
+    transform: scale(.8);
+  }
+  90% {
+    transform: scale(1);
+  }
+  100% {
+    transform: scale(1);
+  }
+}
+
+.i-amphtml-amp-story-shopping-tag-dot:after {
+  content: '' !important;
+  position: absolute !important;
+  border-radius: inherit !important;
+  width: calc(var(--i-amphtml-tag-dot-size) * .5) !important;
+  height: calc(var(--i-amphtml-tag-dot-size) * .5) !important;
+  box-shadow: 0 2px 8px var(--i-amphtml-shopping-tag-bg-color) !important;
+  background-color: white !important;
+}
+
+.i-amphtml-amp-story-shopping-tag-inner[active] .i-amphtml-amp-story-shopping-tag-dot:after {
+  animation: i-amphtml-animate-in-sequence-dot-after var(--i-amphtml-shopping-tag-animation-sequence-duration) forwards,
+    i-amphtml-pulse-dot-after var(--i-amphtml-shopping-tag-dot-pulse-duration) calc(var(--i-amphtml-shopping-tag-dot-pulse-delay) * 1.2) infinite !important;
+}
+
+@keyframes i-amphtml-animate-in-sequence-dot-after {
+  0% {
+    animation-timing-function: cubic-bezier(.85, 0, .15, 1);
+    transform: scale(0);
+  }
+  40% {
+    transform: scale(1);
+  }
+  100% {
+    transform: scale(1);
+  }
+}
+
+@keyframes i-amphtml-pulse-dot-after {
+  0% {
+    animation-timing-function: cubic-bezier(0.76, 0, 0.24, 1);
+    transform: scale(1);
+  }
+  40% {
+    transform: scale(.8);
+  }
+  90% {
+    transform: scale(1);
+  }
+  100% {
+    transform: scale(1);
+  }
+}
+
+.i-amphtml-amp-story-shopping-tag-pill {
+  --i-amphtml-pill-icon-size: 24px !important;
+  --i-amphtml-pill-padding-inline-start: 6px !important;
+  --i-amphtml-pill-transform-origin: calc(var(--i-amphtml-pill-padding-inline-start) + var(--i-amphtml-pill-icon-size) * .5) !important;
+  display: flex !important;
+  align-items: center !important;
+  border-radius: 18px !important;
+  height: 100% !important;
+  overflow: hidden !important;
+  background-color: var(--i-amphtml-shopping-tag-bg-color) !important;
+  padding-inline-start: var(--i-amphtml-pill-padding-inline-start) !important;
+  padding-inline-end: 12px !important;
+  transform-origin: var(--i-amphtml-pill-transform-origin) !important;
+}
+
+.i-amphtml-amp-story-shopping-tag-inner[active] .i-amphtml-amp-story-shopping-tag-pill {
+  animation: i-amphtml-animate-in-sequence-pill var(--i-amphtml-shopping-tag-animation-sequence-duration) forwards,
+    i-amphtml-animate-out-sequence-pill var(--i-amphtml-shopping-tag-animation-sequence-duration) var(--i-amphtml-shopping-tag-animate-out-delay) forwards !important;
+
+  /* Values that need to change to support RTL. */
+  --clip-path-start-circle-supports-rtl: circle(calc(var(--i-amphtml-pill-icon-size) * .5) at calc(var(--i-amphtml-pill-padding-inline-start) + var(--i-amphtml-pill-icon-size) * .5)) !important;
+  --clip-path-end-circle-supports-rtl: circle(calc(var(--i-amphtml-pill-icon-size) * .5 + var(--i-amphtml-pill-padding-inline-start)) at calc(var(--i-amphtml-pill-padding-inline-start) + var(--i-amphtml-pill-icon-size) * .5)) !important;
+  --clip-path-inset-offset-supports-rtl: inset(0 calc(100% - 36px) 0 0 round 30px) !important;
+}
+
+.i-amphtml-amp-story-shopping-tag-inner[active][dir=rtl] .i-amphtml-amp-story-shopping-tag-pill {
+  --clip-path-start-circle-supports-rtl: circle(calc(var(--i-amphtml-pill-icon-size) * .5) at calc(100% - var(--i-amphtml-pill-padding-inline-start) - var(--i-amphtml-pill-icon-size) * .5)) !important;
+  --clip-path-end-circle-supports-rtl: circle(calc(var(--i-amphtml-pill-icon-size) * .5 + var(--i-amphtml-pill-padding-inline-start)) at calc(100% - var(--i-amphtml-pill-padding-inline-start) - var(--i-amphtml-pill-icon-size) * .5)) !important;
+  --clip-path-inset-offset-supports-rtl: inset(0 0 0 calc(100% - 36px) round 30px) !important;
+
+  /* Transform origin from center of icon (right side) in RTL. */
+  transform-origin: calc(100% - var(--i-amphtml-pill-transform-origin)) !important;
+}
+
+@keyframes i-amphtml-animate-in-sequence-pill {
+  0% {
+    animation-timing-function: cubic-bezier(.85, 0, .15, 1);
+    clip-path: var(--clip-path-start-circle-supports-rtl);
+    transform: scale(0);
+  }
+  20% {
+    clip-path: var(--clip-path-start-circle-supports-rtl);
+  }
+  40% {
+    transform: scale(1);
+  }
+  60% {
+    clip-path: var(--clip-path-end-circle-supports-rtl);
+  }
+  60.001% {
+    animation-timing-function: cubic-bezier(.85, 0, .15, 1);
+    clip-path: var(--clip-path-inset-offset-supports-rtl);
+  }
+  100% {
+    clip-path: inset(0 0 0 0 round 30px);
+  }
+}
+
+@keyframes i-amphtml-animate-out-sequence-pill {
+  0% {
+    clip-path: inset(0 0 0 0 round 30px);
+  }
+  40% {
+    animation-timing-function: cubic-bezier(.85, 0, .15, 1);
+    clip-path: var(--clip-path-inset-offset-supports-rtl);
+  }
+  60% {
+    transform: scale(1);
+  }
+  100% {
+    transform: scale(0);
+    clip-path: var(--clip-path-inset-offset-supports-rtl);
+  }
+}
+
+.i-amphtml-amp-story-shopping-tag-pill-image {
+  width: var(--i-amphtml-pill-icon-size) !important;
+  height: var(--i-amphtml-pill-icon-size) !important;
+  display: flex !important;
+  align-items: center !important;
+  justify-content: center !important;
+  background-color: rgba(0, 0, 0, .6) !important;
+  border-radius: 100% !important;
+  flex-shrink: 0 !important;
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg width="12" height="12" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M11.49 5.755 6.24.505a1.16 1.16 0 0 0-.823-.338H1.334A1.17 1.17 0 0 0 .167 1.333v4.084c0 .32.128.612.344.828l5.25 5.25c.21.21.502.338.823.338.32 0 .612-.128.822-.344l4.083-4.083a1.14 1.14 0 0 0 .345-.823c0-.32-.134-.618-.345-.828ZM2.208 3.083a.874.874 0 1 1 0-1.75.874.874 0 1 1 0 1.75Z" fill="#fff"/></svg>') !important;
+  background-repeat: no-repeat !important;
+  background-position: center !important;
+  flex-shrink: 0 !important;
+  margin-inline-end: 4px !important;
+}
+
+.i-amphtml-amp-story-shopping-tag-inner[active] .i-amphtml-amp-story-shopping-tag-pill-image {
+  animation: i-amphtml-animate-out-sequence-pill-image var(--i-amphtml-shopping-tag-animation-sequence-duration) var(--i-amphtml-shopping-tag-animate-out-delay) forwards !important;
+}
+
+@keyframes i-amphtml-animate-out-sequence-pill-image {
+  0% {
+    transform: scale(1);
+  }
+  40% {
+    animation-timing-function: cubic-bezier(.85, 0, .15, 1);
+    transform: scale(1);
+  }
+  100% {
+    transform: scale(0);
+  }
+}
+
+.i-amphtml-amp-story-shopping-tag-pill-text {
+  overflow: hidden !important;
+  font-size: 14px !important;
+  line-height: 14px !important;
+  text-overflow: ellipsis !important;
+  display: -webkit-box !important;
+  -webkit-box-orient: vertical !important;
+  -webkit-line-clamp: 2 !important;
+  max-height: 32px !important;
+}
+
+.i-amphtml-amp-story-shopping-tag-inner[active] .i-amphtml-amp-story-shopping-tag-pill-text {
+  animation: i-amphtml-animate-sequence-text var(--i-amphtml-shopping-tag-animation-sequence-duration) forwards,
+    i-amphtml-animate-sequence-text var(--i-amphtml-shopping-tag-animation-sequence-duration) var(--i-amphtml-shopping-tag-animate-out-delay) reverse !important;
+}
+
+@keyframes i-amphtml-animate-sequence-text {
+  0% {
+    opacity: 0;
+  }
+  60% {
+    animation-timing-function: cubic-bezier(.85, 0, .15, 1);
+    opacity: 0;
+  }
+  100% {
+    /* Applies timing function from begining when in reverse. */
+    animation-timing-function: cubic-bezier(.85, 0, .15, 1);
+    opacity: 1;
+  }
 }
diff --git a/extensions/amp-story-shopping/0.1/amp-story-shopping-tag.js b/extensions/amp-story-shopping/0.1/amp-story-shopping-tag.js
index da82faf145e9..bda01e9d834e 100644
--- a/extensions/amp-story-shopping/0.1/amp-story-shopping-tag.js
+++ b/extensions/amp-story-shopping/0.1/amp-story-shopping-tag.js
@@ -1,30 +1,280 @@
-import {Layout, applyFillContent} from '#core/dom/layout';
+import {toggleAttribute} from '#core/dom';
+import * as Preact from '#core/dom/jsx';
+import {Layout_Enum} from '#core/dom/layout';
+import {
+  childElementByTag,
+  closestAncestorElementBySelector,
+} from '#core/dom/query';
 
-const TAG = 'amp-story-shopping-tag';
+import {Services} from '#service';
+
+import {HistoryState, setHistoryState} from 'extensions/amp-story/1.0/history';
+
+import {formatI18nNumber, loadFonts} from './amp-story-shopping';
+
+import {CSS as shoppingSharedCSS} from '../../../build/amp-story-shopping-shared-0.1.css';
+import {CSS as shoppingTagCSS} from '../../../build/amp-story-shopping-tag-0.1.css';
+import {
+  Action,
+  ShoppingConfigDataDef,
+  ShoppingDataDef,
+  StateProperty,
+} from '../../amp-story/1.0/amp-story-store-service';
+import {StoryAnalyticsEvent} from '../../amp-story/1.0/story-analytics';
+import {createShadowRootWithStyle} from '../../amp-story/1.0/utils';
+import {AnalyticsVariable} from '../../amp-story/1.0/variable-service';
+
+/** @const {!Array<!Object>} fontFaces */
+const FONTS_TO_LOAD = [
+  {
+    family: 'Poppins',
+    weight: '400',
+    src: "url(https://fonts.gstatic.com/s/poppins/v9/pxiEyp8kv8JHgFVrJJfecnFHGPc.woff2) format('woff2')",
+  },
+  {
+    family: 'Poppins',
+    weight: '700',
+    src: "url(https://fonts.gstatic.com/s/poppins/v9/pxiByp8kv8JHgFVrLCz7Z1xlFd2JQEk.woff2) format('woff2')",
+  },
+];
 
 export class AmpStoryShoppingTag extends AMP.BaseElement {
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
 
-    /** @private {string} */
-    this.myText_ = TAG;
+    /** @private @const {!../../amp-story/1.0/amp-story-store-service.AmpStoryStoreService} */
+    this.storeService_ = Services.storyStoreService(this.win);
+
+    /** @private @const {!../../../src/service/localization.LocalizationService} */
+    this.localizationService_ = Services.localizationForDoc(this.element);
 
+    /** @private {boolean} element */
+    this.hasAppendedInnerShoppingTagEl_ = false;
+
+    /** @private {!ShoppingConfigDataDef} tagData */
+    this.tagData_ = null;
+
+    /** @private {?AmpElement} element */
+    this.shoppingAttachment_ = null;
+
+    /** @private {!AmpElement} element */
+    this.shoppingTagEl_ = null;
     /** @private {?Element} */
-    this.container_ = null;
+    this.pageEl_ = null;
+
+    /** @private @const {!./story-analytics.StoryAnalyticsService} */
+    this.analyticsService_ = Services.storyAnalyticsService(this.win);
+
+    /** @private @const {!./story-analytics.StoryAnalyticsService} */
+    this.variableService_ = Services.storyVariableService(this.win);
   }
 
   /** @override */
   buildCallback() {
-    super.buildCallback();
-    this.container_ = this.element.ownerDocument.createElement('div');
-    this.container_.textContent = this.myText_;
-    this.element.appendChild(this.container_);
-    applyFillContent(this.container_, /* replacedContent */ true);
+    this.pageEl_ = closestAncestorElementBySelector(
+      this.element,
+      'amp-story-page'
+    );
+
+    /* This is used to prevent the shopping tag component from building if there is no shopping attachment. */
+    this.shoppingAttachment_ = childElementByTag(
+      this.pageEl_,
+      'amp-story-shopping-attachment'
+    );
+
+    if (!this.shoppingAttachment_) {
+      return;
+    }
+
+    this.element.setAttribute('role', 'button');
+  }
+
+  /** @override */
+  layoutCallback() {
+    if (!this.shoppingAttachment_) {
+      return;
+    }
+    loadFonts(this.win, FONTS_TO_LOAD);
+    this.storeService_.subscribe(
+      StateProperty.SHOPPING_DATA,
+      (shoppingData) =>
+        this.maybeCreateAndAppendInnerShoppingTagEl_(shoppingData),
+      true /** callToInitialize */
+    );
+  }
+
+  /**
+   * Toggling the active attribute to make the animations play on the active page.
+   * @param {string} currentPageId
+   * @private
+   */
+  toggleShoppingTagActive_(currentPageId) {
+    const isActive = currentPageId === this.pageEl_.id;
+    this.mutateElement(() =>
+      toggleAttribute(this.shoppingTagEl_, 'active', isActive)
+    );
+  }
+
+  /**
+   * Helper function to check if the shopping tag should flip if it's too far to the right.
+   * We only check the right hand side, as resizing only expands the border to the right.
+   * @param {!Object} pageSize
+   * @private
+   */
+  flipTagIfOffscreen_(pageSize) {
+    const storyPageWidth = pageSize.width;
+
+    let shouldFlip;
+
+    this.measureMutateElement(
+      () => {
+        /*
+         * We are using offsetLeft and offsetWidth instead of getLayoutBox() because
+         * the correct measurements are not taken into account when using a CSS transform (such as translate),
+         * which we are using in the i-amphtml-amp-story-shopping-tag-inner-flipped class.
+         */
+        const {offsetLeft, offsetWidth} = this.element;
+        shouldFlip = offsetLeft + offsetWidth > storyPageWidth;
+      },
+      () => {
+        this.shoppingTagEl_.classList.toggle(
+          'i-amphtml-amp-story-shopping-tag-inner-flipped',
+          shouldFlip
+        );
+
+        this.shoppingTagEl_.classList.toggle(
+          'i-amphtml-amp-story-shopping-tag-visible',
+          true
+        );
+      }
+    );
+  }
+
+  /**
+   * Reacts to RTL state updates and triggers the UI for RTL.
+   * @param {boolean} rtlState
+   * @private
+   */
+  onRtlStateUpdate_(rtlState) {
+    this.mutateElement(() => {
+      rtlState
+        ? this.shoppingTagEl_.setAttribute('dir', 'rtl')
+        : this.shoppingTagEl_.removeAttribute('dir');
+    });
+  }
+
+  /**
+   * @private
+   */
+  onClick_() {
+    this.storeService_.dispatch(Action.ADD_SHOPPING_DATA, {
+      'activeProductData': this.tagData_,
+    });
+
+    setHistoryState(this.win, HistoryState.SHOPPING_DATA, this.tagData_);
+
+    this.variableService_.onVariableUpdate(
+      AnalyticsVariable.STORY_SHOPPING_PRODUCT_ID,
+      this.tagData_.productId
+    );
+
+    this.analyticsService_.triggerEvent(StoryAnalyticsEvent.SHOPPING_TAG_CLICK);
   }
 
   /** @override */
   isLayoutSupported(layout) {
-    return layout === Layout.CONTAINER;
+    return layout === Layout_Enum.CONTAINER;
+  }
+
+  /**
+   * @return {!Element}
+   * @private
+   */
+  renderShoppingTagTemplate_() {
+    return (
+      <button
+        class="i-amphtml-amp-story-shopping-button-reset i-amphtml-amp-story-shopping-tag-inner"
+        role="button"
+        onClick={() => this.onClick_()}
+      >
+        <span class="i-amphtml-amp-story-shopping-tag-dot"></span>
+        <span class="i-amphtml-amp-story-shopping-tag-pill">
+          <span
+            class="i-amphtml-amp-story-shopping-tag-pill-image"
+            style={
+              this.tagData_['productIcon'] && {
+                backgroundImage:
+                  'url(' + this.tagData_['productIcon'] + ') !important',
+                backgroundSize: 'cover !important',
+              }
+            }
+          ></span>
+          <span class="i-amphtml-amp-story-shopping-tag-pill-text">
+            {(this.tagData_['productTagText'] && (
+              <span class="i-amphtml-amp-story-shopping-product-tag-text">
+                {this.tagData_['productTagText']}
+              </span>
+            )) ||
+              formatI18nNumber(
+                this.localizationService_,
+                this.element,
+                this.tagData_['productPriceCurrency'],
+                this.tagData_['productPrice']
+              )}
+          </span>
+        </span>
+      </button>
+    );
+  }
+
+  /**
+   * Initialize listeners (data, orientation, visibility) for the shopping tag on creation.
+   * @private
+   */
+  initializeTagStateListeners_() {
+    this.storeService_.subscribe(
+      StateProperty.RTL_STATE,
+      (rtlState) => this.onRtlStateUpdate_(rtlState),
+      true /** callToInitialize */
+    );
+
+    this.storeService_.subscribe(
+      StateProperty.PAGE_SIZE,
+      (pageSizeState) => this.flipTagIfOffscreen_(pageSizeState),
+      true /** callToInitialize */
+    );
+
+    this.storeService_.subscribe(
+      StateProperty.CURRENT_PAGE_ID,
+      (id) => this.toggleShoppingTagActive_(id),
+      true /** callToInitialize */
+    );
+  }
+
+  /**
+   * @param {!ShoppingDataDef} shoppingData
+   * @private
+   */
+  maybeCreateAndAppendInnerShoppingTagEl_(shoppingData) {
+    const pageElement = closestAncestorElementBySelector(
+      this.element,
+      'amp-story-page'
+    );
+    this.tagData_ =
+      shoppingData[pageElement.id]?.[
+        this.element.getAttribute('data-product-id')
+      ];
+    if (this.hasAppendedInnerShoppingTagEl_ || !this.tagData_) {
+      return;
+    }
+    this.shoppingTagEl_ = this.renderShoppingTagTemplate_();
+    createShadowRootWithStyle(
+      this.element,
+      this.shoppingTagEl_,
+      shoppingSharedCSS + shoppingTagCSS
+    );
+    this.hasAppendedInnerShoppingTagEl_ = true;
+    this.initializeTagStateListeners_();
   }
 }
diff --git a/extensions/amp-story-shopping/0.1/amp-story-shopping.css b/extensions/amp-story-shopping/0.1/amp-story-shopping.css
index 598d3dba68cf..5b914495ac06 100644
--- a/extensions/amp-story-shopping/0.1/amp-story-shopping.css
+++ b/extensions/amp-story-shopping/0.1/amp-story-shopping.css
@@ -1,4 +1,3 @@
-
-
+@import './amp-story-shopping-shared.css';
 @import './amp-story-shopping-attachment.css';
 @import './amp-story-shopping-tag.css';
diff --git a/extensions/amp-story-shopping/0.1/amp-story-shopping.js b/extensions/amp-story-shopping/0.1/amp-story-shopping.js
index d3b34ae8c1ad..a6ab413ff41a 100644
--- a/extensions/amp-story-shopping/0.1/amp-story-shopping.js
+++ b/extensions/amp-story-shopping/0.1/amp-story-shopping.js
@@ -1,18 +1,51 @@
 import {AmpStoryShoppingAttachment} from './amp-story-shopping-attachment';
-import {AmpStoryShoppingConfig} from './amp-story-shopping-config';
 import {AmpStoryShoppingTag} from './amp-story-shopping-tag';
 
 import {CSS as shoppingCSS} from '../../../build/amp-story-shopping-0.1.css';
+import {dependsOnStoryServices} from '../../amp-story/1.0/utils';
+
+/**
+ * Language and currency sensitive number formatting.
+ * @param {!../../../src/service/localization.LocalizationService} localizationService
+ * @param {!Element} el
+ * @param {string} currency An ISO 4217 currency code.
+ * @param {number} price
+ * @return {string}
+ */
+export const formatI18nNumber = (localizationService, el, currency, price) => {
+  const langCode = localizationService.getLanguageCodesForElement(el)[0];
+  try {
+    return new Intl.NumberFormat(langCode, {
+      style: 'currency',
+      currency,
+    }).format(price);
+  } catch {
+    return `${price} ${currency}`;
+  }
+};
+
+/**
+ * @param {!Window} win
+ * @param {!Array<!Object>} fontFaces
+ */
+export const loadFonts = (win, fontFaces) => {
+  if (win.document.fonts && FontFace) {
+    fontFaces.forEach(({family, src, weight}) =>
+      new FontFace(family, src, {weight})
+        .load()
+        .then((font) => win.document.fonts.add(font))
+    );
+  }
+};
 
 AMP.extension('amp-story-shopping', '0.1', (AMP) => {
   AMP.registerElement(
     'amp-story-shopping-tag',
-    AmpStoryShoppingTag,
+    dependsOnStoryServices(AmpStoryShoppingTag),
     shoppingCSS
   );
   AMP.registerElement(
     'amp-story-shopping-attachment',
-    AmpStoryShoppingAttachment
+    dependsOnStoryServices(AmpStoryShoppingAttachment)
   );
-  AMP.registerElement('amp-story-shopping-config', AmpStoryShoppingConfig);
 });
diff --git a/extensions/amp-story-shopping/0.1/amp-story-shopping.md b/extensions/amp-story-shopping/0.1/amp-story-shopping.md
new file mode 100644
index 000000000000..7b870e9cb7b3
--- /dev/null
+++ b/extensions/amp-story-shopping/0.1/amp-story-shopping.md
@@ -0,0 +1,184 @@
+---
+$category@: presentation
+formats:
+  - stories
+teaser:
+  text: A configurable, templated shopping experience in AMP story pages.
+tags:
+  - shopping
+author: philipbell
+toc: true
+$title: amp-story-shopping
+version: '0.1'
+versions:
+  - '0.1'
+latest_version: '0.1'
+$path: /documentation/components/amp-story-shopping.html
+$localization:
+  path: '/{locale}/documentation/components/amp-story-shopping.html'
+scripts:
+  - >-
+    <script async custom-element="amp-story-shopping" src="https://cdn.ampproject.org/v0/amp-story-shopping-0.1.js"></script>
+---
+
+# amp-story-shopping
+
+<amp-img alt="An example of user flow within amp story shopping" src="https://user-images.githubusercontent.com/3860311/152416815-61a63a88-76c0-4ae8-9300-a7ad277dbe7a.jpg" layout="intrinsic" width="806" height="428"></amp-img>
+
+Use `amp-story-shopping` to create configurable, templated shopping experiences within [amp-story](https://amp.dev/documentation/components/amp-story/?format=stories).
+
+`amp-story-shopping` is defined in the document using its two custom elements, [`amp-story-shopping-attachment`](#amp-story-shopping-attachment) and [`amp-story-shopping-tag`](#amp-story-shopping-tag).
+
+Specify a shopping experience by defining one [`amp-story-shopping-attachment`](#amp-story-shopping-attachment) and one or more [`amp-story-shopping-tag`](#amp-story-shopping-tag) elements for each product on the [`amp-story-page`](https://amp.dev/documentation/components/amp-story-page/?format=stories).
+
+## amp-story-shopping-tag
+
+<amp-img alt="An example of amp-story-shopping-tag in each type of configuration" src="https://user-images.githubusercontent.com/3860311/155754637-3403a9dd-c4c9-44f3-ad6d-e4d166d30ad2.gif" layout="intrinsic" width="488" height="102"></amp-img>
+
+Use [`amp-story-shopping-tag`](#amp-story-shopping-tag) elements to indicate shop-able elements within [`amp-story-page`](https://amp.dev/documentation/components/amp-story-page/?format=stories).
+
+Tapping them opens a [product details page (PDP)](<#product-details-page-(PDP)>) within the [`amp-story-shopping-attachment`](#amp-story-shopping-attachment).
+
+They must be a child of [`amp-story-grid-layer`](https://amp.dev/documentation/components/amp-story-grid-layer/).
+
+They are positioned [`absolute`](https://developer.mozilla.org/en-US/docs/Web/CSS/position#values). Use custom CSS to place them on the page using `top` and `left` with percentage based units for a responsive layout.
+
+```html
+...
+<style amp-custom>
+  [data-product-id="product1"] {
+    top: 30%;
+    left: 30%;
+  }
+</style>
+...
+<amp-story-grid-layer template="vertical">
+  <amp-story-shopping-tag data-product-id="product1"></amp-story-shopping-tag>
+</amp-story-grid-layer>
+```
+
+Example of positioning an [`amp-story-shopping-tag`](#amp-story-shopping-tag) and testing responsiveness:
+<amp-img alt="An example of positioning an amp-story-shopping-tag and testing responsiveness" src="https://user-images.githubusercontent.com/3860311/155751130-558b5ab6-1db3-4ca7-b913-4be4761fdb29.gif" layout="intrinsic" width="840" height="543"></amp-img>
+
+### `amp-story-shopping-tag` attributes
+
+#### `data-product-id` {string} required
+
+Associates the [`amp-story-shopping-tag`](#amp-story-shopping-tag) with product data.
+Must be equal to the `productId` value of the associated product's JSON data.
+
+### Customization
+
+#### Custom icon
+
+<amp-img alt="An example of a custom icon in an amp story shopping tag" src="https://user-images.githubusercontent.com/3860311/155755923-92261f23-0e23-4ec7-9d6c-c1c7b62882d7.png" layout="intrinsic" width="129" height="46"></amp-img>
+
+A shopping tag icon renders by default.
+You may replace the default shopping tag icon with a custom icon by specifying a url to a `jpg` or `png` as the `productIcon` value in the associated product's JSON data.
+Recommended image size is 48 x 48px;
+
+#### Custom text
+
+<amp-img alt="An example of custom text in amp story shopping tag" src="https://user-images.githubusercontent.com/3860311/155756003-4f4b9967-d40d-452e-99f2-ca445ac65a3b.png" layout="intrinsic" width="182" height="54"></amp-img>
+
+The item's price renders by default.
+You may replace the default text with custom text by defining `productTagText` in the associated product's JSON data.
+A maximum of two lines will display.
+Ellipses will display if the text is too long.
+
+Diagram demonstrating how product JSON renders within [`amp-story-shopping-tag`](#amp-story-shopping-tag):
+<amp-img alt="A diagram of product data rendering in amp story shopping tag" src="https://user-images.githubusercontent.com/3860311/155763007-92858806-44df-41fa-8804-f0767741e28a.jpg" layout="intrinsic" width="806" height="411"></amp-img>
+
+## amp-story-shopping-attachment
+
+<amp-img alt="An example of opening the attachment and navigating through an amp story shopping attachment" src="https://user-images.githubusercontent.com/3860311/155758474-3fa4e666-c1a9-44d3-bbf6-61dc3fe16498.gif" layout="intrinsic" width="338" height="548"></amp-img>
+
+The [`amp-story-shopping-attachment`](#amp-story-shopping-attachment) renders a tappable CTA button with the text "Shop now" that opens an inline shopping experience.
+Product JSON data must be configured and at least one [`amp-story-shopping-tag`](#amp-story-shopping-tag) must be on the same page.
+
+### Product JSON configuration
+
+Product JSON is configured inline as a child script tag. An optional `src` attribute will fetch data from an endpoint at render time. If `src` is defined it overrides the inline configuration.
+
+Using `src` with inline JSON as a fallback is recommended.
+Inline data may be served from cache which may take time to propogate. `src` JSON is fetched at time of render which ensurs it is up-to-date.
+
+```html
+{
+   items: [
+      {
+         productUrl: "...", // Required. String. Links to the products website.
+         productId: "..." // Required. Keys to amp-story-shopping-tag nodes.
+         productBrand: "...", // Optional. String.
+         productIcon: "...", // Optional. Links to an image. Defaults to a shopping bag icon.
+         productTitle: "...", // Required. String.
+         productPrice: 100, // Required. Number.
+         productPriceCurrency: "..." // Required. String. ISO 4217 currency code used to display the correct currency symbol.
+         productImages: [ // Required. Must have at least one entry. Array of objects.
+            {
+               url: "..." // Required. String.
+               altText: "..." // Required. String.
+            }
+         ],
+         productDetails: "...", // Required. String.
+         aggregateRating: { // Optional. All sub fields are required if defined.
+            "ratingValue": 4.4, // Required. Number.
+            "reviewCount": 89, // Required. Number.
+            "reviewUrl": // Required. String. Links to page where user can read reviews.
+         }
+      }
+   ]
+}
+```
+
+### Product JSON schema
+
+See the schema for product JSON validation in [product.schema.json](https://github.com/ampproject/amphtml/blob/main/examples/amp-story/shopping/product.schema.json).
+If validation fails on one or more of the shopping tags, an error message will be displayed, and the tag and product details / listing associated with the product(s) that have errors will not be rendered.
+Validation is performed with [ajv](https://ajv.js.org/json-schema.html) using the default ajv JSON schema draft.
+
+### amp-story-shopping-attachment attributes
+
+#### `src` {string} optional
+
+A url for remote product JSON configuration. When defined it overrides inline JSON configuration.
+
+#### `theme` {string} optional
+
+Sets the color of the CTA button and drawer.
+"light" (default) and "dark" values are accepted.
+<amp-img alt="An example of color themed buttons" src="https://user-images.githubusercontent.com/3860311/164291421-b2ec3044-0867-4dca-84a1-01985e9dc958.png" layout="intrinsic" width="920" height="141"></amp-img>
+
+#### `cta-text` {string} optional
+
+String that customizes the call to action button text. The default is "Shop now".
+
+### amp-story-shopping-attachment templates
+
+Two types of templated pages render within the shopping attachment. They automatically populate with the product data from the configured JSON. the Product listing page (PLP) is a list of all products on the active story page. The Product details page (PDP) displays in-depth detail about the product such as images, text and a "Buy now" button.
+
+#### Product listing page (PLP)
+
+<amp-img alt="An example of a product listing page" src="https://user-images.githubusercontent.com/3860311/155760155-a27dfeed-0ae4-4e95-b043-cab1a47ec4e4.png" layout="intrinsic" width="335" height="547"></amp-img>
+
+The PLP template renders a list of products on the active [`amp-story-page`](https://amp.dev/documentation/components/amp-story-page/?format=stories).
+Open it by tapping the "Shop now" CTA button that automatically displays on the bottom of the page when the shopping experience is configured.
+At least two associated [`amp-story-shopping-tag`](#amp-story-shopping-tag) elements must be on the page for the PLP render.
+
+Diagram demonstrating how product JSON renders within the PLP template:
+<amp-img alt="A diagram of product data rendering in the PLP template" src="https://user-images.githubusercontent.com/3860311/160697611-f0e8cfd3-5470-4d0b-b24c-003b9ddec860.jpg" layout="intrinsic" width="806" height="633"></amp-img>
+
+#### Product details page (PDP)
+
+<amp-img alt="An example of a product details page" src="https://user-images.githubusercontent.com/3860311/161086888-9ac081c2-642d-466c-bf36-1ac6169ce764.png" layout="intrinsic" width="335" height="536"></amp-img>
+
+The PDP template displays detailed information about a product.
+Tapping an [`amp-story-shopping-tag`](#amp-story-shopping-tag) or the product's card within the PLP will open the product's PDP.
+If only one product is on the page the PDP will render by default when tapping the "Shop now" CTA button.
+
+Diagram demonstrating how product JSON renders within the PDP template:
+<amp-img alt="A diagram of product data rendering in the PDP template" src="https://user-images.githubusercontent.com/3860311/160697640-44bb55c5-3e26-48fd-b2ae-d16a05f71038.jpg" layout="intrinsic" width="3580" height="3222"></amp-img>
+
+## Validation
+
+See validation rules in [amp-story-shopping validator](https://github.com/ampproject/amphtml/blob/main/extensions/amp-story-shopping/validator-amp-story-shopping.protoascii).
diff --git a/extensions/amp-story-shopping/0.1/test/test-amp-story-shopping-attachment.js b/extensions/amp-story-shopping/0.1/test/test-amp-story-shopping-attachment.js
index e05f42e80be2..44f55bbceb72 100644
--- a/extensions/amp-story-shopping/0.1/test/test-amp-story-shopping-attachment.js
+++ b/extensions/amp-story-shopping/0.1/test/test-amp-story-shopping-attachment.js
@@ -1,42 +1,303 @@
-import {createElementWithAttributes} from '#core/dom';
-import {Layout} from '#core/dom/layout';
-import '../amp-story-shopping';
+import * as Preact from '#core/dom/jsx';
+
+import {Services} from '#service';
 
+import {getLocalizationService} from 'extensions/amp-story/1.0/amp-story-localization-service';
+import {HistoryState} from 'extensions/amp-story/1.0/history';
+import * as history from 'extensions/amp-story/1.0/history';
+
+import '../../../amp-story/1.0/amp-story';
+import '../../../amp-story/1.0/amp-story-page';
+import '../amp-story-shopping';
+import '../../../amp-story-page-attachment/0.1/amp-story-page-attachment';
+import {registerServiceBuilder} from '../../../../src/service-helpers';
+import LocalizedStringsEn from '../../../amp-story/1.0/_locales/en.json' assert {type: 'json'}; // lgtm[js/syntax-error]
+import {
+  Action,
+  StateProperty,
+  getStoreService,
+} from '../../../amp-story/1.0/amp-story-store-service';
+import {
+  StoryAnalyticsEvent,
+  getAnalyticsService,
+} from '../../../amp-story/1.0/story-analytics';
 describes.realWin(
   'amp-story-shopping-attachment-v0.1',
   {
     amp: {
       runtimeOn: true,
-      extensions: ['amp-story-shopping:0.1'],
+      extensions: [
+        'amp-story:1.0',
+        'amp-story-shopping:0.1',
+        'amp-story-page-attachment:0.1',
+      ],
     },
   },
   (env) => {
     let win;
-    let element;
-    let shoppingAttachment;
+    let shoppingEl;
+    let shoppingImpl;
+    let storeService;
+    let attachmentChildEl;
+    let attachmentChildImpl;
+    let analytics;
+
+    const shoppingData = {
+      items: [
+        {
+          productUrl: 'https://www.google.com',
+          productId: 'lamp',
+          productTitle: 'Brass Lamp',
+          productBrand: 'Lamp Co',
+          productPrice: 799.0,
+          productPriceCurrency: 'USD',
+          productImages: [
+            {
+              url: 'https://source.unsplash.com/Ry9WBo3qmoc/500x500',
+              alt: 'lamp 1',
+            },
+            {url: 'https://source.unsplash.com/KP7p0-DRGbg', alt: 'lamp 2'},
+            {url: 'https://source.unsplash.com/mFnbFaCIu1I', alt: 'lamp 3'},
+          ],
+          aggregateRating: {
+            ratingValue: 4.4,
+            reviewCount: 89,
+            reviewUrl: 'https://www.google.com',
+          },
+          productDetails:
+            'Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci.',
+        },
+        {
+          productUrl: 'https://www.google.com',
+          productId: 'art',
+          productTitle: 'Abstract Art',
+          productBrand: 'V. Artsy',
+          productPrice: 1200.0,
+          productPriceCurrency: 'INR',
+          productImages: [
+            {
+              url: 'https://source.unsplash.com/BdVQU-NDtA8/500x500',
+              alt: 'art',
+            },
+          ],
+          aggregateRating: {
+            ratingValue: 4.4,
+            reviewCount: 89,
+            reviewUrl: 'https://www.google.com',
+          },
+          productDetails:
+            'Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci.',
+        },
+      ],
+    };
 
     beforeEach(async () => {
       win = env.win;
-      await createAmpStoryShoppingAttachment();
-    });
+      // Services and stubs.
+      registerServiceBuilder(win, 'performance', function () {
+        return {
+          isPerformanceTrackingOn: () => false,
+        };
+      });
+      storeService = getStoreService(win);
+      registerServiceBuilder(win, 'story-store', function () {
+        return storeService;
+      });
+      getLocalizationService(win.document.body).registerLocalizedStringBundles({
+        en: LocalizedStringsEn,
+      });
+      env.sandbox.stub(win.history, 'replaceState');
+      analytics = getAnalyticsService(win, win.document.body);
+      registerServiceBuilder(win, 'story-analytics', function () {
+        return analytics;
+      });
+      const ownersMock = {
+        scheduleLayout: () => {},
+        scheduleResume: () => {},
+      };
+      env.sandbox.stub(Services, 'ownersForDoc').returns(ownersMock);
 
-    async function createAmpStoryShoppingAttachment() {
-      const pageEl = win.document.createElement('amp-story-page');
-      pageEl.id = 'page1';
-      element = createElementWithAttributes(
-        win.document,
-        'amp-story-shopping-attachment',
-        {'layout': 'nodisplay'}
+      // Set up template.
+      const story = (
+        <amp-story>
+          <amp-story-page id="page1">
+            <amp-story-shopping-tag data-product-id="lamp"></amp-story-shopping-tag>
+            <amp-story-shopping-tag data-product-id="art"></amp-story-shopping-tag>
+            <amp-story-shopping-attachment cta-text="Shop Now!">
+              <script type="application/json">
+                {JSON.stringify(shoppingData)}
+              </script>
+            </amp-story-shopping-attachment>
+          </amp-story-page>
+        </amp-story>
       );
-      pageEl.appendChild(element);
-      win.document.body.appendChild(pageEl);
+      win.document.body.appendChild(story);
+      shoppingEl = story.querySelector('amp-story-shopping-attachment');
+      shoppingImpl = await shoppingEl.getImpl();
+
+      // shoppingImpl stubs.
+      env.sandbox
+        .stub(shoppingImpl, 'mutateElement')
+        .callsFake((fn) => Promise.resolve(fn()));
 
-      shoppingAttachment = await element.getImpl();
+      // Attachment child stubs.
+      attachmentChildEl = shoppingEl.querySelector('amp-story-page-attachment');
+      attachmentChildImpl = await attachmentChildEl.getImpl();
+      env.sandbox.stub(attachmentChildImpl.historyService_, 'push').resolves();
+      env.sandbox
+        .stub(attachmentChildImpl, 'mutateElement')
+        .callsFake((fn) => Promise.resolve(fn()));
+
+      // Set page to active.
+      storeService.dispatch(Action.CHANGE_PAGE, {id: 'page1', index: 1});
+    });
+
+    function dispatchActiveProductData() {
+      storeService.dispatch(Action.ADD_SHOPPING_DATA, {
+        activeProductData: shoppingData.items[0],
+      });
+    }
+
+    async function layoutShoppingImplAndAttachmentChildImpl() {
+      await shoppingImpl.layoutCallback();
+      await attachmentChildImpl.layoutCallback();
     }
 
     it('should build shopping attachment component', () => {
-      expect(() => shoppingAttachment.layoutCallback()).to.not.throw();
-      expect(shoppingAttachment.isLayoutSupported(Layout.NODISPLAY)).to.be.true;
+      expect(() => shoppingImpl.layoutCallback()).to.not.throw();
+    });
+
+    it('should build CTA with custom i18n shopping label text', () => {
+      expect(attachmentChildEl.getAttribute('cta-text')).to.equal('Shop Now!');
+    });
+
+    it('should build PLP on attachment state open if no active product data', async () => {
+      await layoutShoppingImplAndAttachmentChildImpl();
+      storeService.dispatch(Action.TOGGLE_PAGE_ATTACHMENT_STATE, true);
+      expect(
+        attachmentChildEl.querySelector('.i-amphtml-amp-story-shopping-plp')
+      ).to.exist;
+    });
+
+    it('should open attachment when active product data is set', async () => {
+      await layoutShoppingImplAndAttachmentChildImpl();
+      dispatchActiveProductData();
+      // Simulating the getImpl in amp-story-shopping-attachment's
+      // onShoppingDataUpdate_ method
+      await attachmentChildEl.getImpl();
+      const drawerState = storeService.get(StateProperty.PAGE_ATTACHMENT_STATE);
+      expect(drawerState).to.be.true;
+    });
+
+    it('should build PDP if active product data', async () => {
+      await layoutShoppingImplAndAttachmentChildImpl();
+      dispatchActiveProductData();
+      // Simulating the getImpl in amp-story-shopping-attachment's
+      // onShoppingDataUpdate_ method
+      await attachmentChildEl.getImpl();
+      expect(
+        attachmentChildEl.querySelector('.i-amphtml-amp-story-shopping-pdp')
+      ).to.exist;
+    });
+
+    it('should build PDP on PLP card click', async () => {
+      await layoutShoppingImplAndAttachmentChildImpl();
+      storeService.dispatch(Action.TOGGLE_PAGE_ATTACHMENT_STATE, true);
+      const plpCard = attachmentChildEl.querySelector(
+        '.i-amphtml-amp-story-shopping-plp-card'
+      );
+      plpCard.dispatchEvent(new Event('click'));
+      expect(
+        attachmentChildEl.querySelector('.i-amphtml-amp-story-shopping-pdp')
+      ).to.exist;
+    });
+
+    it('should default to PDP on open if only one product for the page', async () => {
+      await layoutShoppingImplAndAttachmentChildImpl();
+      // Override to simulate data for one product on the page.
+      storeService.dispatch(Action.ADD_SHOPPING_DATA, {
+        page1: {
+          [shoppingData.productId]: shoppingData.items[0],
+        },
+      });
+      storeService.dispatch(Action.TOGGLE_PAGE_ATTACHMENT_STATE, true);
+      expect(
+        attachmentChildEl.querySelector('.i-amphtml-amp-story-shopping-pdp')
+      ).to.exist;
+    });
+
+    it('should clear active product data on drawer transition end', async () => {
+      await layoutShoppingImplAndAttachmentChildImpl();
+      dispatchActiveProductData();
+      attachmentChildEl.dispatchEvent(new Event('transitionend'));
+      const {activeProductData} = storeService.get(StateProperty.SHOPPING_DATA);
+      expect(activeProductData).to.be.null;
+    });
+
+    async function setupPDP() {
+      await layoutShoppingImplAndAttachmentChildImpl();
+      // Override to simulate data for one product on the page.
+      storeService.dispatch(Action.ADD_SHOPPING_DATA, {
+        page1: {
+          [shoppingData.productId]: shoppingData.items[0],
+        },
+      });
+      storeService.dispatch(Action.TOGGLE_PAGE_ATTACHMENT_STATE, true);
+    }
+
+    it('should call PDP view analytics event on PLP card click', async () => {
+      const trigger = env.sandbox.stub(analytics, 'triggerEvent');
+
+      await layoutShoppingImplAndAttachmentChildImpl();
+      storeService.dispatch(Action.TOGGLE_PAGE_ATTACHMENT_STATE, true);
+      const plpCard = attachmentChildEl.querySelector(
+        '.i-amphtml-amp-story-shopping-plp-card'
+      );
+      plpCard.dispatchEvent(new Event('click'));
+
+      expect(trigger).to.have.been.calledWith(
+        StoryAnalyticsEvent.SHOPPING_PDP_VIEW
+      );
+    });
+
+    it('should call analytics service on buy now button click', async () => {
+      const trigger = env.sandbox.stub(analytics, 'triggerEvent');
+
+      await setupPDP();
+
+      attachmentChildEl
+        .querySelector('.i-amphtml-amp-story-shopping-pdp-cta')
+        .dispatchEvent(new Event('click'));
+
+      expect(trigger).to.have.been.calledWith(
+        StoryAnalyticsEvent.SHOPPING_BUY_NOW_CLICK
+      );
+    });
+
+    it('should call analytics service on attachment state update', async () => {
+      const trigger = env.sandbox.stub(analytics, 'triggerEvent');
+
+      await setupPDP();
+
+      expect(trigger).to.have.been.calledWith(
+        StoryAnalyticsEvent.SHOPPING_PDP_VIEW
+      );
+    });
+
+    it('should call history service on Product Listing Page card click', async () => {
+      const historyStub = env.sandbox.stub(history, 'setHistoryState');
+
+      await layoutShoppingImplAndAttachmentChildImpl();
+      storeService.dispatch(Action.TOGGLE_PAGE_ATTACHMENT_STATE, true);
+      const plpCard = attachmentChildEl.querySelector(
+        '.i-amphtml-amp-story-shopping-plp-card'
+      );
+      plpCard.dispatchEvent(new Event('click'));
+      expect(historyStub).to.have.been.called.calledWith(
+        win,
+        HistoryState.SHOPPING_DATA,
+        shoppingData.items[0]
+      );
     });
   }
 );
diff --git a/extensions/amp-story-shopping/0.1/test/test-amp-story-shopping-config.js b/extensions/amp-story-shopping/0.1/test/test-amp-story-shopping-config.js
index d8a2aede2e21..63989174c72a 100644
--- a/extensions/amp-story-shopping/0.1/test/test-amp-story-shopping-config.js
+++ b/extensions/amp-story-shopping/0.1/test/test-amp-story-shopping-config.js
@@ -1,6 +1,19 @@
-import {createElementWithAttributes} from '#core/dom';
-import {Layout} from '#core/dom/layout';
-import '../amp-story-shopping';
+import * as Preact from '#core/dom/jsx';
+
+import {Services} from '#service';
+
+import {user} from '#utils/log';
+
+import * as remoteConfigData from '../../../../examples/amp-story/shopping/remote.json';
+import {registerServiceBuilder} from '../../../../src/service-helpers';
+import {
+  Action,
+  getStoreService,
+} from '../../../amp-story/1.0/amp-story-store-service';
+import {
+  getShoppingConfig,
+  storeShoppingConfig,
+} from '../amp-story-shopping-config';
 
 describes.realWin(
   'amp-story-shopping-config-v0.1',
@@ -12,31 +25,274 @@ describes.realWin(
   },
   (env) => {
     let win;
-    let element;
-    let shoppingConfig;
+    let storeService;
+    let pageElement;
+    let shoppingAttachment;
+    const errorStringTagName = 'AMP-STORY-SHOPPING-CONFIG';
+    const copyObject = (object) => JSON.parse(JSON.stringify(object));
+
+    const defaultInlineConfig = {
+      'items': [
+        {
+          'productUrl': 'https://www.google.com',
+          'productId': 'lamp',
+          'productTitle': 'Brass Lamp',
+          'productBrand': 'Lamp Co',
+          'productPrice': 799.0,
+          'productPriceCurrency': 'USD',
+          'productImages': [
+            {
+              'url': 'https://source.unsplash.com/Ry9WBo3qmoc/500x500',
+              'alt': 'lamp 1',
+            },
+            {'url': 'https://source.unsplash.com/KP7p0-DRGbg', 'alt': 'lamp 2'},
+            {'url': 'https://source.unsplash.com/mFnbFaCIu1I', 'alt': 'lamp 3'},
+            {'url': 'https://source.unsplash.com/py9sH2rThWs', 'alt': 'lamp 4'},
+            {'url': 'https://source.unsplash.com/VDPauwJ_sHo', 'alt': 'lamp 5'},
+            {'url': 'https://source.unsplash.com/3LTht2nxd34', 'alt': 'lamp 6'},
+          ],
+          'aggregateRating': {
+            'ratingValue': 4.4,
+            'reviewCount': 89,
+            'reviewUrl': 'https://www.google.com',
+          },
+          'productDetails':
+            'Lorem ipsum dolor sit amet consectetur adipisicing elit. \n Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci.',
+        },
+        {
+          'productUrl': 'https://www.google.com',
+          'productId': 'art',
+          'productTitle': 'Abstract Art',
+          'productBrand': 'V. Artsy',
+          'productPrice': 1200.0,
+          'productPriceCurrency': 'INR',
+          'productImages': [
+            {
+              'url': 'https://source.unsplash.com/BdVQU-NDtA8/500x500',
+              'alt': 'art',
+            },
+          ],
+          'productDetails':
+            'Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci.',
+        },
+      ],
+    };
+
+    const keyedDefaultInlineConfig = {
+      'lamp': defaultInlineConfig.items[0],
+      'art': defaultInlineConfig.items[1],
+    };
 
     beforeEach(async () => {
       win = env.win;
-      await createAmpStoryShoppingConfig();
-    });
+      storeService = getStoreService(win);
+      registerServiceBuilder(win, 'story-store', function () {
+        return storeService;
+      });
+      pageElement = <amp-story-page id="page1"></amp-story-page>;
+      win.document.body.appendChild(pageElement);
 
-    async function createAmpStoryShoppingConfig() {
-      const pageEl = win.document.createElement('amp-story-page');
-      pageEl.id = 'page1';
-      element = createElementWithAttributes(
-        win.document,
-        'amp-story-shopping-config',
-        {'layout': 'nodisplay'}
+      shoppingAttachment = win.document.createElement(
+        'amp-story-shopping-attachment'
       );
-      pageEl.appendChild(element);
-      win.document.body.appendChild(pageEl);
+      shoppingAttachment.setAttribute('layout', 'nodisplay');
+      const story = win.document.createElement('amp-story');
+      win.document.body.appendChild(story);
+      story.appendChild(pageElement);
+      pageElement.appendChild(shoppingAttachment);
+    });
 
-      shoppingConfig = await element.getImpl();
+    async function createAmpStoryShoppingConfig(
+      src = null,
+      config = defaultInlineConfig
+    ) {
+      shoppingAttachment.setAttribute('src', src);
+      shoppingAttachment.appendChild(
+        <script type="application/json">{JSON.stringify(config)}</script>
+      );
+      return getShoppingConfig(shoppingAttachment, pageElement.id);
     }
 
-    it('should build shopping config component', () => {
-      expect(() => shoppingConfig.layoutCallback()).to.not.throw();
-      expect(shoppingConfig.isLayoutSupported(Layout.NODISPLAY)).to.be.true;
+    it('does use inline config', async () => {
+      const result = await createAmpStoryShoppingConfig();
+      expect(result).to.deep.eql(keyedDefaultInlineConfig);
+    });
+
+    it('does use remote config when src attribute is provided', async () => {
+      const remoteUrl = 'https://foo.example';
+      const expectedRemoteResult =
+        // matches remote.json
+        {
+          'art': {
+            'productUrl': 'https://www.google.com',
+            'productId': 'art',
+            'productTitle': 'Abstract Art',
+            'productBrand': 'V. Artsy',
+            'productPrice': 1200.0,
+            'productPriceCurrency': 'JPY',
+            'productImages': [
+              {
+                'url':
+                  '/examples/visual-tests/unsplash.photos/BdVQU-NDtA8_500x500.jpg',
+                'alt': 'art',
+              },
+            ],
+            'aggregateRating': {
+              'ratingValue': 4.4,
+              'reviewCount': 89,
+              'reviewUrl': 'https://www.google.com',
+            },
+            'productDetails':
+              'Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. \n\n Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto exped. Laborum ea molestias veritatis sint laudantium iusto exped.',
+          },
+        };
+      env.sandbox.stub(Services, 'xhrFor').returns({
+        fetchJson(url) {
+          if (url === remoteUrl) {
+            return Promise.resolve({
+              ok: true,
+              json: () => remoteConfigData,
+            });
+          }
+        },
+      });
+      const result = await createAmpStoryShoppingConfig(remoteUrl);
+      expect(result).to.deep.eql(expectedRemoteResult);
+    });
+
+    it('does use inline config when remote src is invalid', async () => {
+      const invalidURL = 'invalidRemoteURL';
+      const result = await createAmpStoryShoppingConfig(invalidURL);
+      expect(result).to.deep.eql(keyedDefaultInlineConfig);
+    });
+
+    describe('storeShoppingConfig', () => {
+      let storeService;
+
+      beforeEach(async () => {
+        storeService = {dispatch: env.sandbox.spy()};
+        env.sandbox.stub(Services, 'storyStoreService').returns(storeService);
+      });
+
+      it('dispatches ADD_SHOPPING_DATA', async () => {
+        const dummyConfig = {foo: {bar: true}};
+
+        storeShoppingConfig(pageElement, dummyConfig);
+
+        const pageIdToConfig = {[pageElement.id]: dummyConfig};
+        expect(
+          storeService.dispatch.withArgs(
+            Action.ADD_SHOPPING_DATA,
+            pageIdToConfig
+          )
+        ).to.have.been.calledOnce;
+      });
+    });
+
+    describe('amp-story-shopping-config validation', () => {
+      it('should fail config validation because a required config value is missing', async () => {
+        const invalidConfig = copyObject(defaultInlineConfig);
+        const requiredKey = 'productId';
+        delete invalidConfig['items'][0][requiredKey];
+
+        const errorString =
+          "[#page1 items[0] Brass Lamp] must have required property 'productId'";
+
+        const spy = env.sandbox.spy(user(), 'warn');
+        const keyedShoppingConfig = await createAmpStoryShoppingConfig(
+          null,
+          invalidConfig
+        );
+        expect(spy).to.have.been.calledWith(errorStringTagName, errorString);
+        expect(Object.keys(keyedShoppingConfig).length).to.eql(1);
+        expect(Object.keys(keyedShoppingConfig)[0]).to.eql('art');
+      });
+
+      it('should fail config validation because an expected string JSON value is of a non-string type', async () => {
+        const invalidConfig = copyObject(defaultInlineConfig);
+        const invalidValue = 50; // This value is not a string
+        invalidConfig['items'][0]['productTitle'] = invalidValue;
+
+        const errorString = '[#page1 items[0] 50]/productTitle must be string';
+
+        const spy = env.sandbox.spy(user(), 'warn');
+        const keyedShoppingConfig = await createAmpStoryShoppingConfig(
+          null,
+          invalidConfig
+        );
+        expect(spy).to.have.been.calledWith(errorStringTagName, errorString);
+        expect(Object.keys(keyedShoppingConfig).length).to.eql(1);
+        expect(Object.keys(keyedShoppingConfig)[0]).to.eql('art');
+      });
+
+      it('should fail config validation because an expected number JSON value is not a valid number', async () => {
+        const invalidConfig = copyObject(defaultInlineConfig);
+        const invalidValue = 'two dozen watermelons'; // two dozen watermelons is not an actual price.
+        invalidConfig['items'][0]['productPrice'] = invalidValue;
+
+        const errorString =
+          '[#page1 items[0] Brass Lamp]/productPrice must be number';
+
+        const spy = env.sandbox.spy(user(), 'warn');
+        const keyedShoppingConfig = await createAmpStoryShoppingConfig(
+          null,
+          invalidConfig
+        );
+        expect(spy).to.have.been.calledWith(errorStringTagName, errorString);
+        expect(Object.keys(keyedShoppingConfig).length).to.eql(1);
+        expect(Object.keys(keyedShoppingConfig)[0]).to.eql('art');
+      });
+
+      it('should fail config validation because an expected string JSON value is not a valid currency code symbol', async () => {
+        const invalidConfig = copyObject(defaultInlineConfig);
+        const invalidValue = 'ZABAN'; // This is not a valid currency symbol code
+        invalidConfig['items'][0]['productPriceCurrency'] = invalidValue;
+
+        const errorString =
+          '[#page1 items[0] Brass Lamp]/productPriceCurrency must be a valid ISO 4217 currency code';
+
+        const spy = env.sandbox.spy(user(), 'warn');
+        const keyedShoppingConfig = await createAmpStoryShoppingConfig(
+          null,
+          invalidConfig
+        );
+        expect(spy).to.have.been.calledWith(errorStringTagName, errorString);
+        expect(Object.keys(keyedShoppingConfig).length).to.eql(1);
+        expect(Object.keys(keyedShoppingConfig)[0]).to.eql('art');
+      });
+
+      it('should fail config validation because an expected string JSON value is not a valid url', async () => {
+        const invalidConfig = copyObject(defaultInlineConfig);
+        const invalidValue = 'http://zapp'; // This is not a valid url
+        invalidConfig['items'][0]['productUrl'] = invalidValue;
+
+        const spy = env.sandbox.spy(user(), 'warn');
+        const keyedShoppingConfig = await createAmpStoryShoppingConfig(
+          null,
+          invalidConfig
+        );
+        const errorString =
+          '[#page1 items[0] Brass Lamp]/productUrl must match pattern "^(/|https://|https?://(127.0.0.1|([^/]+\\.)?localhost)(:[0-9]+)?/)"';
+        expect(spy).to.have.been.calledWith(errorStringTagName, errorString);
+        expect(Object.keys(keyedShoppingConfig).length).to.eql(1);
+        expect(Object.keys(keyedShoppingConfig)[0]).to.eql('art');
+      });
+    });
+
+    it('should pass config validation with realtive urls', async () => {
+      const validConfig = copyObject(defaultInlineConfig);
+      const relativeUrl = '/relative/url.com'; // This is not a valid url
+      validConfig['items'][0]['productUrl'] = relativeUrl;
+
+      const spy = env.sandbox.spy(user(), 'warn');
+      const keyedShoppingConfig = await createAmpStoryShoppingConfig(
+        null,
+        validConfig
+      );
+      const errorString =
+        '[#page1 items[0] Brass Lamp]/productUrl must match pattern "^(/|https://|https?://(127.0.0.1|([^/]+\\.)?localhost)(:[0-9]+)?/)"';
+      expect(spy).to.have.been.not.calledWith(errorStringTagName, errorString);
+      expect(Object.keys(keyedShoppingConfig).length).to.eql(2);
     });
   }
 );
diff --git a/extensions/amp-story-shopping/0.1/test/test-amp-story-shopping-tag.js b/extensions/amp-story-shopping/0.1/test/test-amp-story-shopping-tag.js
index 854e2d9eaaa1..1206c35dd87b 100644
--- a/extensions/amp-story-shopping/0.1/test/test-amp-story-shopping-tag.js
+++ b/extensions/amp-story-shopping/0.1/test/test-amp-story-shopping-tag.js
@@ -1,7 +1,25 @@
-import {createElementWithAttributes} from '#core/dom';
-import {Layout} from '#core/dom/layout';
+import * as Preact from '#core/dom/jsx';
+import {Layout_Enum} from '#core/dom/layout';
+
 import '../amp-story-shopping';
+import {Services} from '#service';
+import {LocalizationService} from '#service/localization';
+
+import '../../../amp-story-page-attachment/0.1/amp-story-page-attachment';
 
+import * as history from 'extensions/amp-story/1.0/history';
+import {HistoryState} from 'extensions/amp-story/1.0/history';
+
+import {registerServiceBuilder} from '../../../../src/service-helpers';
+import {
+  Action,
+  StateProperty,
+  getStoreService,
+} from '../../../amp-story/1.0/amp-story-store-service';
+import {
+  StoryAnalyticsEvent,
+  StoryAnalyticsService,
+} from '../../../amp-story/1.0/story-analytics';
 describes.realWin(
   'amp-story-shopping-tag-v0.1',
   {
@@ -12,31 +30,130 @@ describes.realWin(
   },
   (env) => {
     let win;
-    let element;
+    let tagEl;
     let shoppingTag;
+    let storeService;
+    let localizationService;
+    let analytics;
 
     beforeEach(async () => {
       win = env.win;
-      await createAmpStoryShoppingTag();
+      storeService = getStoreService(win);
+      registerServiceBuilder(win, 'story-store', function () {
+        return storeService;
+      });
+
+      analytics = new StoryAnalyticsService(win, win.document.body);
+      registerServiceBuilder(win, 'story-analytics', function () {
+        return analytics;
+      });
+
+      storeService.dispatch(Action.SET_PAGE_SIZE, {width: 1000, height: 1000});
+
+      localizationService = new LocalizationService(win.document.body);
+      env.sandbox
+        .stub(Services, 'localizationForDoc')
+        .returns(localizationService);
+
+      await setUpStoryWithShoppingTag();
     });
 
-    async function createAmpStoryShoppingTag() {
-      const pageEl = win.document.createElement('amp-story-page');
-      pageEl.id = 'page1';
-      element = createElementWithAttributes(
-        win.document,
-        'amp-story-shopping-tag',
-        {'layout': 'container'}
+    async function setUpStoryWithShoppingTag() {
+      tagEl = (
+        <amp-story-shopping-tag layout="container"></amp-story-shopping-tag>
       );
-      pageEl.appendChild(element);
-      win.document.body.appendChild(pageEl);
+      env.win.document.body.appendChild(
+        <amp-story-page id="page1">
+          {tagEl}
+          <amp-story-shopping-attachment></amp-story-shopping-attachment>
+        </amp-story-page>
+      );
+      shoppingTag = await tagEl.getImpl();
+    }
 
-      shoppingTag = await element.getImpl();
+    async function setUpShoppingData() {
+      const shoppingData = {
+        'page1': {'sunglasses': {'productTitle': 'Spectacular Spectacles'}},
+      };
+      storeService.dispatch(Action.ADD_SHOPPING_DATA, shoppingData);
     }
 
-    it('should build shopping tag component', () => {
+    async function setupShoppingTagAndData() {
+      shoppingTag.element.setAttribute('data-product-id', 'sunglasses');
+      await setUpShoppingData();
+      expect(() => shoppingTag.buildCallback()).to.not.throw();
       expect(() => shoppingTag.layoutCallback()).to.not.throw();
-      expect(shoppingTag.isLayoutSupported(Layout.CONTAINER)).to.be.true;
+    }
+
+    it('should build and layout shopping tag component', async () => {
+      await setupShoppingTagAndData();
+      expect(shoppingTag.shoppingTagEl_).to.be.not.null;
+    });
+
+    it('should not build shopping tag if page attachment is missing', async () => {
+      env.win.document.querySelector('amp-story-shopping-attachment').remove();
+      await setupShoppingTagAndData();
+      expect(shoppingTag.shoppingTagEl_).to.be.null;
+    });
+
+    it('should process config data and set text container content if data not null', async () => {
+      shoppingTag.element.setAttribute('data-product-id', 'sunglasses');
+      await setUpShoppingData();
+      env.sandbox.stub(shoppingTag, 'measureMutateElement').callsFake(() => {
+        expect(shoppingTag.element.textContent).to.equal(
+          'Spectacular Spectacles'
+        );
+      });
+    });
+
+    it('should not process config data and set text container content if id not found', async () => {
+      shoppingTag.element.setAttribute('data-product-id', 'hat');
+      await setUpShoppingData();
+      expect(shoppingTag.element.textContent).to.be.empty;
+      expect(shoppingTag.isLayoutSupported(Layout_Enum.CONTAINER)).to.be.true;
+    });
+
+    it('should set active product in store service when shopping tag is clicked', async () => {
+      const tagData = {
+        'productId': 'sunglasses',
+        'productTitle': 'Spectacular Spectacles',
+        'productPrice': '400',
+        'productIcon':
+          '/examples/visual-tests/amp-story/img/shopping/nest-audio-icon.png',
+      };
+
+      await shoppingTag.element.click();
+
+      env.sandbox.stub(shoppingTag, 'mutateElement').callsFake(() => {
+        expect(
+          storeService.get(StateProperty.SHOPPING_DATA['activeProductData'])
+        ).to.deep.equal(tagData);
+      });
+    });
+
+    it('should call analytics service on tag click', async () => {
+      const trigger = env.sandbox.stub(analytics, 'triggerEvent');
+      env.sandbox.stub(history, 'setHistoryState');
+      await setupShoppingTagAndData();
+      await shoppingTag.shoppingTagEl_.click();
+      expect(trigger).to.have.been.calledWith(
+        StoryAnalyticsEvent.SHOPPING_TAG_CLICK
+      );
+    });
+
+    it('should call history service on tag click', async () => {
+      const tagData = {
+        'productTitle': 'Spectacular Spectacles',
+      };
+
+      const historyStub = env.sandbox.stub(history, 'setHistoryState');
+      await setupShoppingTagAndData();
+      await shoppingTag.shoppingTagEl_.click();
+      expect(historyStub).to.have.been.called.calledWith(
+        win,
+        HistoryState.SHOPPING_DATA,
+        tagData
+      );
     });
   }
 );
diff --git a/extensions/amp-story-shopping/0.1/test/test-amp-story-shopping.js b/extensions/amp-story-shopping/0.1/test/test-amp-story-shopping.js
new file mode 100644
index 000000000000..78501cca3dc8
--- /dev/null
+++ b/extensions/amp-story-shopping/0.1/test/test-amp-story-shopping.js
@@ -0,0 +1,58 @@
+import {Services} from '#service';
+import {LocalizationService} from '#service/localization';
+
+import {formatI18nNumber} from '../amp-story-shopping';
+
+describes.realWin(
+  'amp-story-shopping',
+  {
+    amp: {runtimeOn: true},
+  },
+  (env) => {
+    let win;
+    let storyPageEl;
+    let localizationService;
+
+    beforeEach(async () => {
+      win = env.win;
+
+      localizationService = new LocalizationService(win.document.body);
+      env.sandbox
+        .stub(Services, 'localizationServiceForOrNull')
+        .returns(Promise.resolve(localizationService));
+
+      storyPageEl = win.document.createElement('amp-story-page');
+      storyPageEl.setAttribute('lang', 'en');
+    });
+
+    it('should format i18n number using USD', () => {
+      const formattedNumber = formatI18nNumber(
+        localizationService,
+        storyPageEl,
+        'USD',
+        100
+      );
+      expect(formattedNumber).to.equal('$100.00');
+    });
+
+    it('should format i18n number using JPY', () => {
+      const formattedNumber = formatI18nNumber(
+        localizationService,
+        storyPageEl,
+        'JPY',
+        10000
+      );
+      expect(formattedNumber).to.equal('¥10,000');
+    });
+
+    it('should fallback to price and currency if invalid currency code', () => {
+      const formattedNumber = formatI18nNumber(
+        localizationService,
+        storyPageEl,
+        'asdf',
+        10000
+      );
+      expect(formattedNumber).to.equal('10000 asdf');
+    });
+  }
+);
diff --git a/extensions/amp-story-shopping/0.1/test/validator-amp-story-shopping.html b/extensions/amp-story-shopping/0.1/test/validator-amp-story-shopping.html
new file mode 100644
index 000000000000..17e600a8806c
--- /dev/null
+++ b/extensions/amp-story-shopping/0.1/test/validator-amp-story-shopping.html
@@ -0,0 +1,257 @@
+<!doctype html>
+<html amp lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Shopping</title>
+    <link rel="canonical" href="amps.html">
+    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+    <script async src="https://cdn.ampproject.org/v0.js"></script>
+    <script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
+    <script async custom-element="amp-story-shopping" src="https://cdn.ampproject.org/v0/amp-story-shopping-0.1.js"></script>
+    <style amp-custom>
+      [data-product-id="lamp"] {
+        top: 31%;
+        left: 1%;
+      }
+      [data-product-id="art"] {
+        top: 15%;
+        left: 40%;
+      }
+      [data-product-id="chair"] {
+        top: 53%;
+        left: 30%;
+      }
+      [data-product-id="flowers"] {
+        top: 46%;
+        left: 83%;
+      }
+    </style>
+  </head>
+  <body>
+    <amp-story
+        standalone
+        title="Story Shopping Component"
+        publisher="AMP Story Shopping"
+        publisher-logo-src="example.com/logo.png"
+        poster-portrait-src="example.com/poster.jpg">
+      <amp-story-page id="inline-light-theme">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="https://source.unsplash.com/_HqHX3LBN18/1000x2000"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <amp-story-shopping-tag data-product-id="lamp" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="art" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="chair" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="flowers" ></amp-story-shopping-tag>
+        </amp-story-grid-layer>
+        <!--
+          Example of Inline config. Multiple product tags with icon defined.
+        -->
+        <amp-story-shopping-attachment>
+          <script type="application/json">
+            {
+                "items" : [
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "lamp",
+                    "productTitle": "Brass Lamp",
+                    "productVendor": "Lamp Co",
+                    "productPrice": 799.00,
+                    "productPriceCurrency": "USD",
+                    "productImages": [
+                      {"url": "https://source.unsplash.com/Ry9WBo3qmoc/500x500", "alt": "lamp 1"},
+                      {"url": "https://source.unsplash.com/KP7p0-DRGbg", "alt": "lamp 2"},
+                      {"url": "https://source.unsplash.com/mFnbFaCIu1I", "alt": "lamp 3"},
+                      {"url": "https://source.unsplash.com/py9sH2rThWs", "alt": "lamp 4"},
+                      {"url": "https://source.unsplash.com/VDPauwJ_sHo", "alt": "lamp 5"},
+                      {"url": "https://source.unsplash.com/3LTht2nxd34", "alt": "lamp 6"}
+                    ],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "One newline after this. \n Two newlines after this. \n\n  Five consecutive newlines after this, should become 2 newlines. \n\n\n\n\n Many consecutive newlines with different spacing and tabs after this, should become 2 newlines. \n          \n\n   \n  \n \n  \n \n I hope it works!"
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "art",
+                    "productTitle": "Abstract Art",
+                    "productVendor": "V. Artsy",
+                    "productPrice": 1200.00,
+                    "productPriceCurrency": "INR",
+                    "productImages": [{"url": "https://source.unsplash.com/BdVQU-NDtA8/500x500", "alt": "art"}],
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "chair",
+                    "productTitle": "Yellow chair",
+                    "productPrice": 1000.00,
+                    "productPriceCurrency": "BRL",
+                    "productTagText": "The perfectly imperfect yellow chair",
+                    "productImages": [{"url": "https://source.unsplash.com/DgQGKKLaVhY/500x500", "alt": "chair"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "flowers",
+                    "productTitle": "Flowers",
+                    "productVendor": "Very Long Flower Company Name",
+                    "productPrice": 10.00,
+                    "productPriceCurrency": "USD",
+                    "productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
+                    "productImages": [{"url": "https://source.unsplash.com/SavQfLRm4Do/500x500", "alt": "flowers"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    }
+                   }
+                ]
+              }
+          </script>
+        </amp-story-shopping-attachment>
+      </amp-story-page>
+      <amp-story-page id="inline-dark-theme">
+        <!--
+          Dark theme example of Inline config. Multiple product tags with icon defined.
+        -->
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="https://source.unsplash.com/_HqHX3LBN18/1000x2000"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <amp-story-shopping-tag data-product-id="lamp" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="art" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="chair" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="flowers" ></amp-story-shopping-tag>
+        </amp-story-grid-layer>
+        <amp-story-shopping-attachment theme="dark">
+          <script type="application/json">
+            {
+                "items" : [
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "lamp",
+                    "productTitle": "Brass Lamp",
+                    "productVendor": "Lamp Co",
+                    "productPrice": 799.00,
+                    "productPriceCurrency": "USD",
+                    "productImages": [
+                      {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 1"},
+                      {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 2"},
+                      {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 3"},
+                      {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 4"},
+                      {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 5"},
+                      {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 6"}
+                    ],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    }
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "art",
+                    "productTitle": "Abstract Art",
+                    "productVendor": "V. Artsy",
+                    "productPrice": 1200.00,
+                    "productPriceCurrency": "INR",
+                    "productImages": [{"url": "https://source.unsplash.com/BdVQU-NDtA8/500x500", "alt": "art"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    }
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "chair",
+                    "productTitle": "Yellow chair",
+                    "productPrice": 1000.00,
+                    "productPriceCurrency": "BRL",
+                    "productTagText": "The perfectly imperfect yellow chair",
+                    "productImages": [{"url": "https://source.unsplash.com/DgQGKKLaVhY/500x500", "alt": "chair"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    }
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "flowers",
+                    "productTitle": "Flowers",
+                    "productVendor": "Very Long Flower Company Name",
+                    "productPrice": 10.00,
+                    "productPriceCurrency": "USD",
+                    "productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
+                    "productImages": [{"url": "https://source.unsplash.com/SavQfLRm4Do/500x500", "alt": "flowers"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    }
+                   }
+                ]
+              }
+          </script>
+        </amp-story-shopping-attachment>
+      </amp-story-page>
+      <amp-story-page id="remote-with-product">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="https://source.unsplash.com/_HqHX3LBN18/1000x2000"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <amp-story-shopping-tag data-product-id="art" ></amp-story-shopping-tag>
+        </amp-story-grid-layer>
+        <!--
+          Example of:
+          CTA Button rendering due to remote product tag existing, but no inline.
+        -->
+        <amp-story-shopping-attachment theme="dark" src="/examples/amp-story/shopping/remote.json">
+          <script type="application/json">
+            {
+              "items" : []
+            }
+          </script>
+        </amp-story-shopping-attachment>
+      </amp-story-page>
+      <amp-story-page id="inline-no-product">
+      <amp-story-grid-layer template="fill">
+        <amp-img layout="fill" src="https://source.unsplash.com/_HqHX3LBN18/1000x2000"></amp-img>
+      </amp-story-grid-layer>
+        <!--
+          Example of:
+          CTA Button not rendering due to no product tags.
+        -->
+      <amp-story-shopping-attachment>
+        <script type="application/json">
+          {
+            "items" : []
+          }
+        </script>
+      </amp-story-shopping-attachment>
+      </amp-story-page>
+       <!--
+          Example of:
+          CTA Button not rendering due to no shopping attachment.
+        -->
+      <amp-story-page id="remote-dark-theme">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="https://source.unsplash.com/_HqHX3LBN18/1000x2000"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <amp-story-shopping-tag data-product-id="art" ></amp-story-shopping-tag>
+        </amp-story-grid-layer>
+      </amp-story-page>
+    </amp-story>
+  </body>
+</html>
diff --git a/extensions/amp-story-shopping/0.1/test/validator-amp-story-shopping.out b/extensions/amp-story-shopping/0.1/test/validator-amp-story-shopping.out
new file mode 100644
index 000000000000..7b2ce6513d3d
--- /dev/null
+++ b/extensions/amp-story-shopping/0.1/test/validator-amp-story-shopping.out
@@ -0,0 +1,258 @@
+PASS
+|  <!doctype html>
+|  <html amp lang="en">
+|    <head>
+|      <meta charset="utf-8">
+|      <title>Shopping</title>
+|      <link rel="canonical" href="amps.html">
+|      <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+|      <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+|      <script async src="https://cdn.ampproject.org/v0.js"></script>
+|      <script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
+|      <script async custom-element="amp-story-shopping" src="https://cdn.ampproject.org/v0/amp-story-shopping-0.1.js"></script>
+|      <style amp-custom>
+|        [data-product-id="lamp"] {
+|          top: 31%;
+|          left: 1%;
+|        }
+|        [data-product-id="art"] {
+|          top: 15%;
+|          left: 40%;
+|        }
+|        [data-product-id="chair"] {
+|          top: 53%;
+|          left: 30%;
+|        }
+|        [data-product-id="flowers"] {
+|          top: 46%;
+|          left: 83%;
+|        }
+|      </style>
+|    </head>
+|    <body>
+|      <amp-story
+|          standalone
+|          title="Story Shopping Component"
+|          publisher="AMP Story Shopping"
+|          publisher-logo-src="example.com/logo.png"
+|          poster-portrait-src="example.com/poster.jpg">
+|        <amp-story-page id="inline-light-theme">
+|          <amp-story-grid-layer template="fill">
+|            <amp-img layout="fill" src="https://source.unsplash.com/_HqHX3LBN18/1000x2000"></amp-img>
+|          </amp-story-grid-layer>
+|          <amp-story-grid-layer template="vertical">
+|            <amp-story-shopping-tag data-product-id="lamp" ></amp-story-shopping-tag>
+|            <amp-story-shopping-tag data-product-id="art" ></amp-story-shopping-tag>
+|            <amp-story-shopping-tag data-product-id="chair" ></amp-story-shopping-tag>
+|            <amp-story-shopping-tag data-product-id="flowers" ></amp-story-shopping-tag>
+|          </amp-story-grid-layer>
+|          <!--
+|            Example of Inline config. Multiple product tags with icon defined.
+|          -->
+|          <amp-story-shopping-attachment>
+|            <script type="application/json">
+|              {
+|                  "items" : [
+|                     {
+|                      "productUrl": "https://www.google.com",
+|                      "productId": "lamp",
+|                      "productTitle": "Brass Lamp",
+|                      "productVendor": "Lamp Co",
+|                      "productPrice": 799.00,
+|                      "productPriceCurrency": "USD",
+|                      "productImages": [
+|                        {"url": "https://source.unsplash.com/Ry9WBo3qmoc/500x500", "alt": "lamp 1"},
+|                        {"url": "https://source.unsplash.com/KP7p0-DRGbg", "alt": "lamp 2"},
+|                        {"url": "https://source.unsplash.com/mFnbFaCIu1I", "alt": "lamp 3"},
+|                        {"url": "https://source.unsplash.com/py9sH2rThWs", "alt": "lamp 4"},
+|                        {"url": "https://source.unsplash.com/VDPauwJ_sHo", "alt": "lamp 5"},
+|                        {"url": "https://source.unsplash.com/3LTht2nxd34", "alt": "lamp 6"}
+|                      ],
+|                      "aggregateRating": {
+|                        "ratingValue": 4.4,
+|                        "reviewCount": 89,
+|                        "reviewUrl": "https://www.google.com"
+|                      },
+|                      "productDetails": "One newline after this. \n Two newlines after this. \n\n  Five consecutive newlines after this, should become 2 newlines. \n\n\n\n\n Many consecutive newlines with different spacing and tabs after this, should become 2 newlines. \n          \n\n   \n  \n \n  \n \n I hope it works!"
+|                     },
+|                     {
+|                      "productUrl": "https://www.google.com",
+|                      "productId": "art",
+|                      "productTitle": "Abstract Art",
+|                      "productVendor": "V. Artsy",
+|                      "productPrice": 1200.00,
+|                      "productPriceCurrency": "INR",
+|                      "productImages": [{"url": "https://source.unsplash.com/BdVQU-NDtA8/500x500", "alt": "art"}],
+|                      "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+|                     },
+|                     {
+|                      "productUrl": "https://www.google.com",
+|                      "productId": "chair",
+|                      "productTitle": "Yellow chair",
+|                      "productPrice": 1000.00,
+|                      "productPriceCurrency": "BRL",
+|                      "productTagText": "The perfectly imperfect yellow chair",
+|                      "productImages": [{"url": "https://source.unsplash.com/DgQGKKLaVhY/500x500", "alt": "chair"}],
+|                      "aggregateRating": {
+|                        "ratingValue": 4.4,
+|                        "reviewCount": 89,
+|                        "reviewUrl": "https://www.google.com"
+|                      },
+|                      "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+|                     },
+|                     {
+|                      "productUrl": "https://www.google.com",
+|                      "productId": "flowers",
+|                      "productTitle": "Flowers",
+|                      "productVendor": "Very Long Flower Company Name",
+|                      "productPrice": 10.00,
+|                      "productPriceCurrency": "USD",
+|                      "productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
+|                      "productImages": [{"url": "https://source.unsplash.com/SavQfLRm4Do/500x500", "alt": "flowers"}],
+|                      "aggregateRating": {
+|                        "ratingValue": 4.4,
+|                        "reviewCount": 89,
+|                        "reviewUrl": "https://www.google.com"
+|                      }
+|                     }
+|                  ]
+|                }
+|            </script>
+|          </amp-story-shopping-attachment>
+|        </amp-story-page>
+|        <amp-story-page id="inline-dark-theme">
+|          <!--
+|            Dark theme example of Inline config. Multiple product tags with icon defined.
+|          -->
+|          <amp-story-grid-layer template="fill">
+|            <amp-img layout="fill" src="https://source.unsplash.com/_HqHX3LBN18/1000x2000"></amp-img>
+|          </amp-story-grid-layer>
+|          <amp-story-grid-layer template="vertical">
+|            <amp-story-shopping-tag data-product-id="lamp" ></amp-story-shopping-tag>
+|            <amp-story-shopping-tag data-product-id="art" ></amp-story-shopping-tag>
+|            <amp-story-shopping-tag data-product-id="chair" ></amp-story-shopping-tag>
+|            <amp-story-shopping-tag data-product-id="flowers" ></amp-story-shopping-tag>
+|          </amp-story-grid-layer>
+|          <amp-story-shopping-attachment theme="dark">
+|            <script type="application/json">
+|              {
+|                  "items" : [
+|                     {
+|                      "productUrl": "https://www.google.com",
+|                      "productId": "lamp",
+|                      "productTitle": "Brass Lamp",
+|                      "productVendor": "Lamp Co",
+|                      "productPrice": 799.00,
+|                      "productPriceCurrency": "USD",
+|                      "productImages": [
+|                        {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 1"},
+|                        {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 2"},
+|                        {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 3"},
+|                        {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 4"},
+|                        {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 5"},
+|                        {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 6"}
+|                      ],
+|                      "aggregateRating": {
+|                        "ratingValue": 4.4,
+|                        "reviewCount": 89,
+|                        "reviewUrl": "https://www.google.com"
+|                      }
+|                     },
+|                     {
+|                      "productUrl": "https://www.google.com",
+|                      "productId": "art",
+|                      "productTitle": "Abstract Art",
+|                      "productVendor": "V. Artsy",
+|                      "productPrice": 1200.00,
+|                      "productPriceCurrency": "INR",
+|                      "productImages": [{"url": "https://source.unsplash.com/BdVQU-NDtA8/500x500", "alt": "art"}],
+|                      "aggregateRating": {
+|                        "ratingValue": 4.4,
+|                        "reviewCount": 89,
+|                        "reviewUrl": "https://www.google.com"
+|                      }
+|                     },
+|                     {
+|                      "productUrl": "https://www.google.com",
+|                      "productId": "chair",
+|                      "productTitle": "Yellow chair",
+|                      "productPrice": 1000.00,
+|                      "productPriceCurrency": "BRL",
+|                      "productTagText": "The perfectly imperfect yellow chair",
+|                      "productImages": [{"url": "https://source.unsplash.com/DgQGKKLaVhY/500x500", "alt": "chair"}],
+|                      "aggregateRating": {
+|                        "ratingValue": 4.4,
+|                        "reviewCount": 89,
+|                        "reviewUrl": "https://www.google.com"
+|                      }
+|                     },
+|                     {
+|                      "productUrl": "https://www.google.com",
+|                      "productId": "flowers",
+|                      "productTitle": "Flowers",
+|                      "productVendor": "Very Long Flower Company Name",
+|                      "productPrice": 10.00,
+|                      "productPriceCurrency": "USD",
+|                      "productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
+|                      "productImages": [{"url": "https://source.unsplash.com/SavQfLRm4Do/500x500", "alt": "flowers"}],
+|                      "aggregateRating": {
+|                        "ratingValue": 4.4,
+|                        "reviewCount": 89,
+|                        "reviewUrl": "https://www.google.com"
+|                      }
+|                     }
+|                  ]
+|                }
+|            </script>
+|          </amp-story-shopping-attachment>
+|        </amp-story-page>
+|        <amp-story-page id="remote-with-product">
+|          <amp-story-grid-layer template="fill">
+|            <amp-img layout="fill" src="https://source.unsplash.com/_HqHX3LBN18/1000x2000"></amp-img>
+|          </amp-story-grid-layer>
+|          <amp-story-grid-layer template="vertical">
+|            <amp-story-shopping-tag data-product-id="art" ></amp-story-shopping-tag>
+|          </amp-story-grid-layer>
+|          <!--
+|            Example of:
+|            CTA Button rendering due to remote product tag existing, but no inline.
+|          -->
+|          <amp-story-shopping-attachment theme="dark" src="/examples/amp-story/shopping/remote.json">
+|            <script type="application/json">
+|              {
+|                "items" : []
+|              }
+|            </script>
+|          </amp-story-shopping-attachment>
+|        </amp-story-page>
+|        <amp-story-page id="inline-no-product">
+|        <amp-story-grid-layer template="fill">
+|          <amp-img layout="fill" src="https://source.unsplash.com/_HqHX3LBN18/1000x2000"></amp-img>
+|        </amp-story-grid-layer>
+|          <!--
+|            Example of:
+|            CTA Button not rendering due to no product tags.
+|          -->
+|        <amp-story-shopping-attachment>
+|          <script type="application/json">
+|            {
+|              "items" : []
+|            }
+|          </script>
+|        </amp-story-shopping-attachment>
+|        </amp-story-page>
+|         <!--
+|            Example of:
+|            CTA Button not rendering due to no shopping attachment.
+|          -->
+|        <amp-story-page id="remote-dark-theme">
+|          <amp-story-grid-layer template="fill">
+|            <amp-img layout="fill" src="https://source.unsplash.com/_HqHX3LBN18/1000x2000"></amp-img>
+|          </amp-story-grid-layer>
+|          <amp-story-grid-layer template="vertical">
+|            <amp-story-shopping-tag data-product-id="art" ></amp-story-shopping-tag>
+|          </amp-story-grid-layer>
+|        </amp-story-page>
+|      </amp-story>
+|    </body>
+|  </html>
diff --git a/extensions/amp-story-shopping/validator-amp-story-shopping.protoascii b/extensions/amp-story-shopping/validator-amp-story-shopping.protoascii
index ca7752c24d96..b971f0426a82 100644
--- a/extensions/amp-story-shopping/validator-amp-story-shopping.protoascii
+++ b/extensions/amp-story-shopping/validator-amp-story-shopping.protoascii
@@ -14,29 +14,62 @@ html_format: AMP
   tag_name: "AMP-STORY-SHOPPING-TAG"
   requires_extension: "amp-story-shopping"
   mandatory_ancestor: "AMP-STORY-GRID-LAYER"
-  attr_lists: "extended-amp-global"
   spec_url: "https://amp.dev/documentation/components/amp-story-shopping/"
   amp_layout: {
     supported_layouts: CONTAINER
   }
+  attrs: {
+    name: "data-product-id"
+    mandatory: true
+  }
 }
-tags: {  # <amp-story-shopping-config>
+tags: {  # <amp-story-shopping-attachment>
   html_format: AMP
-  tag_name: "AMP-STORY-SHOPPING-CONFIG"
+  tag_name: "AMP-STORY-SHOPPING-ATTACHMENT"
   requires_extension: "amp-story-shopping"
-  attr_lists: "extended-amp-global"
+  mandatory_last_child: true
   spec_url: "https://amp.dev/documentation/components/amp-story-shopping/"
+  attrs: {
+    name: "src"
+    value_url: {
+      protocol: "https"
+      allow_relative: true
+    }
+  }
+  attrs: {
+    name: "theme"
+    value: "dark"
+    value: "light"
+  }
+  attrs: {
+    name: "cta-text"
+  }
+  child_tags: {
+    child_tag_name_oneof: "SCRIPT"
+    mandatory_min_num_child_tags: 1
+  }
   amp_layout: {
-    supported_layouts: NODISPLAY
+    supported_layouts: CONTAINER
   }
 }
-tags: {  # <amp-story-shopping-attachment>
+tags: { # amp-story-shopping-attachment
   html_format: AMP
-  tag_name: "AMP-STORY-SHOPPING-ATTACHMENT"
+  tag_name: "SCRIPT"
+  spec_name: "amp-story-shopping-attachment config script"
+  mandatory_parent: "AMP-STORY-SHOPPING-ATTACHMENT"
   requires_extension: "amp-story-shopping"
-  attr_lists: "extended-amp-global"
-  spec_url: "https://amp.dev/documentation/components/amp-story-shopping/"
-  amp_layout: {
-    supported_layouts: NODISPLAY
+  attrs: {
+    name: "type"
+    mandatory: true
+    value_casei: "application/json"
+    dispatch_key: NAME_VALUE_PARENT_DISPATCH
+  }
+  attr_lists: "nonce-attr"
+  cdata: {
+    disallowed_cdata_regex: {
+      regex: "<!--"
+      error_message: "html comments"
+    }
   }
+  spec_url: "https://amp.dev/documentation/components/amp-story-shopping/"
 }
diff --git a/extensions/amp-story-subscriptions/0.1/amp-story-subscriptions.css b/extensions/amp-story-subscriptions/0.1/amp-story-subscriptions.css
new file mode 100644
index 000000000000..5fc5ba2952a0
--- /dev/null
+++ b/extensions/amp-story-subscriptions/0.1/amp-story-subscriptions.css
@@ -0,0 +1,242 @@
+@import url('https://fonts.googleapis.com/css2?family=Google+Sans:wght@400');
+@import url('https://fonts.googleapis.com/css2?family=Poppins:wght@400;600;700');
+
+amp-story-subscriptions {
+  position: absolute !important;
+  display: flex !important;
+  flex-direction: column !important;
+  top: 0 !important;
+  left: 0 !important;
+  height: 100% !important;
+  width: 100% !important;
+  z-index: 1 !important; /** Above the desktop navigation UI. */
+  transform: translateY(100vh) !important;
+  transition-delay: 0.15s !important;
+  pointer-events: none !important;
+}
+
+amp-story-subscriptions.i-amphtml-story-subscriptions-visible {
+  transform: translateY(0) !important;
+  transition-delay: 0s !important;
+}
+
+/** Black opacity overlay. Only on blocking subscription dialog. */
+amp-story-subscriptions::before {
+  content: '' !important;
+  position: absolute !important;
+  top: 0 !important;
+  left: 0 !important;
+  height: 100% !important;
+  width: 100% !important;
+  background: #000000 !important;
+  opacity: 0 !important;
+  pointer-events: auto !important;
+  transition: opacity 0.15s cubic-bezier(0.4, 0, 1, 1) !important;
+}
+
+amp-story-subscriptions.i-amphtml-story-subscriptions-visible::before {
+  opacity: 0.55 !important;
+  transition: opacity 0.2s cubic-bezier(0, 0, 0.2, 1) !important;
+}
+
+/** Override the dialog styles from amp-subscriptions. */
+amp-subscriptions-dialog.i-amphtml-story-subscriptions-dialog-wrapper {
+  border-radius: 0.9em 0.9em 0 0 !important;
+  font-family: Poppins, sans-serif !important;
+  font-weight: 400 !important;
+  background: white !important;
+  color: black !important;
+  overflow: hidden !important;
+}
+
+amp-story:not([supports-landscape]) + amp-subscriptions-dialog.i-amphtml-story-subscriptions-dialog-wrapper,
+iframe.swg-dialog {
+  width: 100% !important;
+  left: 0 !important;
+  margin-left: 0 !important;
+}
+
+@media(min-aspect-ratio: 31/40) {
+  amp-story:not([supports-landscape]) + amp-subscriptions-dialog.i-amphtml-story-subscriptions-dialog-wrapper,
+  iframe.swg-dialog  {
+    width: var(--i-amphtml-story-desktop-one-panel-width) !important;
+    left: 50% !important;
+    margin-left: calc(-0.5 * var(--i-amphtml-story-desktop-one-panel-width)) !important;
+  }
+}
+
+.i-amphtml-story-subscriptions-dialog-banner {
+  height: 2.54em !important;
+  background: #EDEDED !important;
+  display: flex !important;
+  justify-content: flex-end !important;
+  align-items: center !important;
+  padding: 0 0.3em !important;
+}
+
+.i-amphtml-story-subscriptions-dialog-banner-button {
+  display: flex !important;
+  justify-content: flex-end !important;
+  align-items: center !important;
+  letter-spacing: 0.015em !important;
+  font-size: 0.75em !important;
+  opacity: 0 !important;
+  transform: translateX(-0.2em) !important;
+  transition: opacity 0.3s ease-out, transform 0.3s ease-out !important;
+
+  /* Override default button styles. */
+  padding: 0 !important;
+  border: none !important;
+  font-family: Poppins, sans-serif !important;
+  font-weight: 400 !important;
+}
+
+[dir="rtl"] .i-amphtml-story-subscriptions-dialog-banner-button {
+  transform: translateX(0.2em) !important;
+}
+
+.i-amphtml-story-subscriptions-dialog-banner-button.i-amphtml-story-subscriptions-dialog-banner-button-visible {
+  opacity: 1 !important;
+  transform: translateX(0) !important;
+}
+
+.i-amphtml-story-subscriptions-dialog-banner-button:after {
+  content: '' !important;
+  width: 0.93em !important;
+  height: 0.93em !important;
+  margin: 0 0.6em !important;
+  transform: translateX(-0.1em) !important;
+  transition: transform 0.3s ease-out !important;
+  background-size: contain !important;
+  background-repeat: no-repeat !important;
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" stroke="black" fill="none" stroke-width="2px" stroke-linecap="round" stroke-linejoin="round"><polyline points="1.75,1.5 6,6 1.75,10.6"/></svg>') !important;
+}
+
+.i-amphtml-story-subscriptions-dialog-banner-button.i-amphtml-story-subscriptions-dialog-banner-button-visible:after {
+  transform: translateX(0) !important;
+}
+
+[dir="rtl"] .i-amphtml-story-subscriptions-dialog-banner-button:after {
+  transform: translateX(0.1em) scaleX(-1)  !important;
+}
+
+[dir="rtl"] .i-amphtml-story-subscriptions-dialog-banner-button.i-amphtml-story-subscriptions-dialog-banner-button-visible:after {
+  transform: translateX(0) scaleX(-1)  !important;
+}
+
+.i-amphtml-story-subscriptions-dialog-content {
+  margin: 2.1em 1.6em 0 !important;
+  text-align: center !important;
+  white-space: nowrap !important;
+  display: flex !important;
+  flex-direction: column !important;
+}
+
+.i-amphtml-story-subscriptions-price {
+  display: block !important;
+  font-weight: 400 !important;
+  font-size: 1.4em !important;
+  letter-spacing: -0.02em !important;
+  text-overflow: ellipsis !important;
+  overflow: hidden !important;
+  margin-bottom: 0.2em !important;
+}
+
+.i-amphtml-story-subscriptions-headline {
+  display: block !important;
+  font-weight: 700 !important;
+  font-size: 1.15em !important;
+  letter-spacing: -0.015em !important;
+  text-overflow: ellipsis !important;
+  overflow: hidden !important;
+  margin: 0.4em 0 0.15em !important;
+}
+
+.i-amphtml-story-subscriptions-description, .i-amphtml-story-subscriptions-additional-description {
+  display: block !important;
+  font-size: 0.9em !important;
+  letter-spacing: -0.015em !important;
+  text-overflow: ellipsis !important;
+  overflow: hidden !important;
+}
+
+.i-amphtml-story-subscriptions-publisher-button, .i-amphtml-story-subscriptions-google-button {
+  margin: 0 auto 0.8em !important;
+  padding: 0 !important;
+  border: none !important;
+  --i-amphtml-button-height: 2.3em;
+  height: var(--i-amphtml-button-height) !important;
+  border-radius: calc(var(--i-amphtml-button-height) / 2) !important;
+  display: flex !important;
+  align-items: center !important;
+  cursor: pointer !important;
+
+  /* Override default button styles. */
+  font-size: calc(var(--story-font-size)) !important;
+}
+
+.i-amphtml-story-subscriptions-publisher-button {
+  margin-top: 2em !important;
+  background: black !important;
+}
+
+.i-amphtml-story-subscriptions-google-button {
+  background: #F2F2F2 !important;
+}
+
+.i-amphtml-story-subscriptions-publisher-logo, .i-amphtml-story-subscriptions-google-logo {
+  width: 1.85em !important;
+  height: 1.85em !important;
+  border-radius: 50% !important;
+  margin-inline: 0.25em 0.65em !important;
+}
+
+.i-amphtml-story-subscriptions-google-logo {
+  background-size: contain !important;
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="32px" height="32px" fill="none"><path fill="#fff" d="M16 32a16 16 0 1 0 0-32 16 16 0 0 0 0 32Z"/><path fill="#4285F4" d="M28.56 13.78H16v5h7.19a6.19 6.19 0 0 1-2.67 3.99v3.33h4.3c3.34-3.1 4.46-7.93 3.74-12.32Z"/><path fill="#34A853" d="M16 29.33c3.6 0 6.61-1.2 8.81-3.23l-4.29-3.33A8.04 8.04 0 0 1 16 24.06a7.96 7.96 0 0 1-7.48-5.52H4.1v3.44A13.31 13.31 0 0 0 16 29.33Z"/><path fill="#FBBC05" d="M8.52 18.54a7.93 7.93 0 0 1 0-5.08v-3.44H4.1a13.18 13.18 0 0 0 0 11.96l4.42-3.44Z"/><path fill="#EA4335" d="M16 7.94c1.97 0 3.72.68 5.11 2l3.8-3.8A12.75 12.75 0 0 0 16 2.67c-5.21 0-9.71 3-11.9 7.35l4.42 3.44A7.96 7.96 0 0 1 16 7.94Z"/></svg>') !important;
+}
+
+.i-amphtml-story-subscriptions-publisher-button-text, .i-amphtml-story-subscriptions-google-button-text {
+  display: block !important;
+  letter-spacing: 0.01em !important;
+  max-width: 12.6em !important;
+  text-align: initial !important;
+  white-space: normal !important;
+  margin-inline-end: 1.3em !important;
+  font-size: 0.75em !important;
+  font-weight: 400 !important;
+  font-family: Google Sans, sans-serif !important;
+
+  /* Line clamping and ellipses. */
+  display: -webkit-box !important;
+  -webkit-line-clamp: 2 !important;
+  -webkit-box-orient: vertical !important;
+  overflow: hidden !important;
+}
+
+.i-amphtml-story-subscriptions-publisher-button-text {
+  color: white !important;
+}
+
+.i-amphtml-story-subscriptions-google-button-text {
+  color: #5E5E5E !important;
+}
+
+.i-amphtml-story-subscriptions-signin {
+  display: block !important;
+  margin-top: 2.75em !important;
+  margin-bottom: 1.4em !important;
+  font-size: 0.7em !important;
+}
+
+.i-amphtml-story-subscriptions-signin button {
+  font-weight: 600 !important;
+  cursor: pointer !important;
+
+  /* Override default button styles. */
+  padding: 0 !important;
+  border: none !important;
+  font-size: 1em !important;
+  font-family: Poppins, sans-serif !important;
+  background-color: white !important;
+}
diff --git a/extensions/amp-story-subscriptions/0.1/amp-story-subscriptions.js b/extensions/amp-story-subscriptions/0.1/amp-story-subscriptions.js
new file mode 100644
index 000000000000..a5a1d05d395f
--- /dev/null
+++ b/extensions/amp-story-subscriptions/0.1/amp-story-subscriptions.js
@@ -0,0 +1,327 @@
+import * as Preact from '#core/dom/jsx';
+import {Layout_Enum} from '#core/dom/layout';
+import {setImportantStyles} from '#core/dom/style';
+import {clamp} from '#core/math';
+
+import {Services} from '#service';
+import {LocalizedStringId_Enum} from '#service/localization/strings';
+
+import {dev, devAssert} from '#utils/log';
+
+import {localizeTemplate} from 'extensions/amp-story/1.0/amp-story-localization-service';
+
+import {CSS} from '../../../build/amp-story-subscriptions-0.1.css';
+import {
+  Action,
+  StateProperty,
+  SubscriptionsState,
+} from '../../amp-story/1.0/amp-story-store-service';
+import {AmpStoryViewerMessagingHandler} from '../../amp-story/1.0/amp-story-viewer-messaging-handler';
+import {AdvancementMode} from '../../amp-story/1.0/story-analytics';
+import {getStoryAttributeSrc} from '../../amp-story/1.0/utils';
+
+const TAG = 'amp-story-subscriptions';
+
+/**
+ * The index of the page where the paywall would be triggered.
+ * @const {number}
+ */
+export const DEFAULT_SUBSCRIPTIONS_PAGE_INDEX = 2;
+
+/**
+ * The number of milliseconds to wait before showing the skip button on dialog banner.
+ * @const {number}
+ */
+const SKIP_BUTTON_DELAY_DURATION = 2000;
+
+export class AmpStorySubscriptions extends AMP.BaseElement {
+  /** @param {!AmpElement} element */
+  constructor(element) {
+    super(element);
+
+    /** @private {?../../../extensions/amp-story/1.0/amp-story-store-service.AmpStoryStoreService} */
+    this.storeService_ = null;
+
+    /** @private {?../../../extensions/amp-subscriptions/0.1/amp-subscriptions.SubscriptionService} */
+    this.subscriptionService_ = null;
+
+    /** @private {?../../../src/service/viewer-interface.ViewerInterface} */
+    this.viewer_ = null;
+
+    /** @private {?AmpStoryViewerMessagingHandler} */
+    this.viewerMessagingHandler_ = null;
+  }
+
+  /** @override */
+  buildCallback() {
+    this.viewer_ = Services.viewerForDoc(this.element);
+    this.viewerMessagingHandler_ = this.viewer_.isEmbedded()
+      ? new AmpStoryViewerMessagingHandler(this.win, this.viewer_)
+      : null;
+
+    return Promise.all([
+      Services.storyStoreServiceForOrNull(this.win),
+      Services.subscriptionsServiceForDoc(this.element),
+      Services.localizationServiceForOrNull(this.element),
+    ]).then(
+      ([storeService, subscriptionService, unusedLocalizationService]) => {
+        this.storeService_ = storeService;
+        this.subscriptionService_ = subscriptionService;
+
+        const pages = this.win.document.querySelectorAll(
+          'amp-story-page:not([ad])'
+        );
+        devAssert(
+          pages.length >= 4,
+          'The number of pages should be at least 4 to enable subscriptions feature, got %s',
+          pages.length
+        );
+
+        let subscriptionsPageIndex = parseInt(
+          this.element.getAttribute('subscriptions-page-index'),
+          10
+        );
+        subscriptionsPageIndex = isNaN(subscriptionsPageIndex)
+          ? DEFAULT_SUBSCRIPTIONS_PAGE_INDEX
+          : subscriptionsPageIndex;
+        this.storeService_.dispatch(
+          Action.SET_SUBSCRIPTIONS_PAGE_INDEX,
+          clamp(
+            subscriptionsPageIndex,
+            DEFAULT_SUBSCRIPTIONS_PAGE_INDEX,
+            pages.length - 1
+          )
+        );
+
+        // Get grant status immediately to set up the initial subscriptions state.
+        this.getGrantStatusAndUpdateState_();
+        // When the user finishes any of the actions, e.g. log in or subscribe, new entitlements would be
+        // re-fetched and this callback would be executed. Update states based on new entitlements.
+        this.subscriptionService_.addOnEntitlementResolvedCallback(() =>
+          this.getGrantStatusAndUpdateState_()
+        );
+
+        // Create a paywall dialog element that have required attributes to be able to be
+        // rendered by amp-subscriptions.
+        const template = this.renderSubscriptionsDialogTemplate_();
+        return localizeTemplate(template, this.element).then(() => {
+          this.element.appendChild(template);
+          this.initializeListeners_();
+        });
+      }
+    );
+  }
+
+  /** @override */
+  layoutCallback() {
+    const logoSrc = getStoryAttributeSrc(
+      this.element,
+      'publisher-logo-src',
+      /* warn */ true
+    );
+    const publisherLogoEl = dev().assertElement(
+      this.element.querySelector(
+        '.i-amphtml-story-subscriptions-publisher-logo'
+      )
+    );
+    publisherLogoEl.setAttribute('src', logoSrc);
+  }
+
+  /** @override */
+  isLayoutSupported(layout) {
+    return layout == Layout_Enum.CONTAINER;
+  }
+
+  /**
+   * @private
+   */
+  getGrantStatusAndUpdateState_() {
+    this.subscriptionService_.getGrantStatus().then((granted) => {
+      this.handleGrantStatusUpdate_(granted);
+    });
+  }
+
+  /**
+   * @param {boolean} granted
+   * @private
+   */
+  handleGrantStatusUpdate_(granted) {
+    const state = granted
+      ? SubscriptionsState.GRANTED
+      : SubscriptionsState.BLOCKED;
+    this.storeService_.dispatch(Action.TOGGLE_SUBSCRIPTIONS_STATE, state);
+  }
+
+  /**
+   * @private
+   */
+  initializeListeners_() {
+    this.storeService_.subscribe(
+      StateProperty.SUBSCRIPTIONS_DIALOG_UI_STATE,
+      (showDialog) => this.onSubscriptionsDialogUiStateChange_(showDialog)
+    );
+
+    const ampSubscriptionsEl = this.win.document.querySelector(
+      'amp-subscriptions-dialog'
+    );
+    ampSubscriptionsEl.addEventListener('click', (event) =>
+      this.onSubscriptionsDialogClick_(event)
+    );
+
+    // Make sure SWG dialog background always intercept clicks to prevent users
+    // from interacting with anything underneath.
+    new MutationObserver((mutationsList) => {
+      mutationsList.forEach((mutation) => {
+        mutation.addedNodes.forEach((addedNode) => {
+          if (addedNode.tagName === 'SWG-POPUP-BACKGROUND') {
+            setImportantStyles(addedNode, {'pointer-events': 'all'});
+          }
+        });
+      });
+    }).observe(this.win.document.body, {
+      subtree: false,
+      childList: true,
+    });
+  }
+
+  /**
+   * @param {boolean} showDialog
+   * @return {?Promise}
+   * @private
+   */
+  onSubscriptionsDialogUiStateChange_(showDialog) {
+    this.mutateElement(() =>
+      this.element.classList.toggle(
+        'i-amphtml-story-subscriptions-visible',
+        showDialog
+      )
+    );
+
+    if (showDialog) {
+      // This call would first retrieve entitlements that are already fetched from publisher backend when page loads.
+      // If the response is granted, do nothing. If the response is not granted, the paywall would be triggered.
+      return this.subscriptionService_
+        .maybeRenderDialogForSelectedPlatform()
+        .then(() => {
+          if (this.viewer_.isEmbedded()) {
+            setTimeout(() => {
+              const buttonEl = this.win.document.querySelector(
+                'amp-subscriptions-dialog .i-amphtml-story-subscriptions-dialog-banner-button'
+              );
+              buttonEl &&
+                this.mutateElement(() =>
+                  buttonEl.classList.add(
+                    'i-amphtml-story-subscriptions-dialog-banner-button-visible'
+                  )
+                );
+            }, SKIP_BUTTON_DELAY_DURATION);
+          }
+        });
+    }
+    this.subscriptionService_.getDialog().close();
+  }
+
+  /**
+   * @param {!Event} event
+   * @private
+   */
+  onSubscriptionsDialogClick_(event) {
+    if (
+      event.target.classList.contains(
+        'i-amphtml-story-subscriptions-dialog-banner-button-visible'
+      )
+    ) {
+      this.viewerMessagingHandler_.send('selectDocument', {
+        'next': true,
+        'advancementMode': AdvancementMode.MANUAL_ADVANCE,
+      });
+    }
+  }
+
+  /**
+   * @return {!Element}
+   * @private
+   */
+  renderSubscriptionsDialogTemplate_() {
+    return (
+      <div subscriptions-dialog subscriptions-display="NOT granted">
+        <div class="i-amphtml-story-subscriptions-dialog-banner">
+          <button
+            class="i-amphtml-story-subscriptions-dialog-banner-button"
+            i-amphtml-i18n-text-content={
+              LocalizedStringId_Enum.AMP_STORY_SUBSCRIPTIONS_SKIP
+            }
+          ></button>
+        </div>
+        <div class="i-amphtml-story-subscriptions-dialog-content">
+          <span class="i-amphtml-story-subscriptions-price">
+            {this.element.getAttribute('price')}
+          </span>
+          {this.element.getAttribute('headline') && (
+            <span class="i-amphtml-story-subscriptions-headline">
+              {this.element.getAttribute('headline')}
+            </span>
+          )}
+          <span class="i-amphtml-story-subscriptions-description">
+            {this.element.getAttribute('description')}
+          </span>
+          {this.element.getAttribute('additional-description') && (
+            <span class="i-amphtml-story-subscriptions-additional-description">
+              {this.element.getAttribute('additional-description')}
+            </span>
+          )}
+          <button
+            class="i-amphtml-story-subscriptions-publisher-button"
+            subscriptions-action="subscribe"
+            subscriptions-display="NOT granted"
+          >
+            <img class="i-amphtml-story-subscriptions-publisher-logo"></img>
+            <span class="i-amphtml-story-subscriptions-publisher-button-text">
+              <span
+                i-amphtml-i18n-text-content={
+                  LocalizedStringId_Enum.AMP_STORY_SUBSCRIPTIONS_CTA
+                }
+              ></span>
+              &nbsp;
+              {getStoryAttributeSrc(this.element, 'publisher', /* warn */ true)}
+            </span>
+          </button>
+          <button
+            class="i-amphtml-story-subscriptions-google-button"
+            subscriptions-action="subscribe"
+            subscriptions-display="NOT granted"
+            subscriptions-service="subscribe.google.com"
+            subscriptions-decorate="false"
+          >
+            <span class="i-amphtml-story-subscriptions-google-logo"></span>
+            <span
+              class="i-amphtml-story-subscriptions-google-button-text"
+              i-amphtml-i18n-text-content={
+                LocalizedStringId_Enum.AMP_STORY_SUBSCRIPTIONS_SWG
+              }
+            ></span>
+          </button>
+          <span class="i-amphtml-story-subscriptions-signin">
+            <span
+              i-amphtml-i18n-text-content={
+                LocalizedStringId_Enum.AMP_STORY_SUBSCRIPTIONS_SUBSCRIBER_QUESTION
+              }
+            ></span>
+            &nbsp;
+            <button
+              subscriptions-action="login"
+              subscriptions-display="NOT granted"
+              i-amphtml-i18n-text-content={
+                LocalizedStringId_Enum.AMP_STORY_SUBSCRIPTIONS_SIGN_IN
+              }
+            ></button>
+          </span>
+        </div>
+      </div>
+    );
+  }
+}
+
+AMP.extension(TAG, '0.1', (AMP) => {
+  AMP.registerElement(TAG, AmpStorySubscriptions, CSS);
+});
diff --git a/extensions/amp-story-subscriptions/0.1/amp-story-subscriptions.md b/extensions/amp-story-subscriptions/0.1/amp-story-subscriptions.md
new file mode 100644
index 000000000000..8b2257183275
--- /dev/null
+++ b/extensions/amp-story-subscriptions/0.1/amp-story-subscriptions.md
@@ -0,0 +1,93 @@
+---
+$category@: presentation
+formats:
+  - stories
+teaser:
+  text: A configurable, templated subscriptions experience in AMP story pages.
+tags:
+  - subscriptions
+author: ychsieh
+toc: true
+$title: amp-story-subscriptions
+version: '0.1'
+versions:
+  - '0.1'
+latest_version: '0.1'
+$path: /documentation/components/amp-story-subscriptions.html
+$localization:
+  path: '/{locale}/documentation/components/amp-story-subscriptions.html'
+scripts:
+  - >-
+    <script async custom-element="amp-subscriptions"    
+    src="https://cdn.ampproject.org/v0/amp-subscriptions-0.1.js"></script>
+    <script async custom-element="amp-subscriptions-google"
+    src="https://cdn.ampproject.org/v0/amp-subscriptions-google-0.1.js"></script>
+    <script async custom-element="amp-story" 
+    src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
+    <script async custom-element="amp-story-subscriptions" src="https://cdn.ampproject.org/v0/amp-story-subscriptions-0.1.js"></script>
+---
+
+# amp-story-subscriptions
+
+<amp-img alt="amp-story-subscriptions example UI" src="https://user-images.githubusercontent.com/1697814/167689085-94d9032f-e501-47cd-b06f-e40c8405b27f.png" layout="intrinsic" width="377" height="684"></amp-img>
+
+# Summary
+
+This component enables Web Stories to support paywalls and subscriptions in a manner following [`amp-subscriptions`](https://amp.dev/documentation/components/amp-subscriptions/) and [`amp-subscriptions-google`](https://amp.dev/documentation/components/amp-subscriptions-google/). It enables publishers to configure their Stories to feature paywalls and integrate into their backends via authorization URLs and other configurations.
+
+The way to specify subscriptions configurations is the same for both a classic AMP page and a Web Story. See more details about configurations in [`amp-subscriptions` configuration](https://amp.dev/documentation/components/amp-subscriptions/#configuration).
+
+The extension provides a simple UI and capabilities to surface a paywall bottomsheet, and manage blocking / unblocking locked content.
+
+> **Important Note**: Please first read API docs for [`amp-subscriptions`](https://amp.dev/documentation/components/amp-subscriptions/) and (optionally) [`amp-subscriptions-google`](https://amp.dev/documentation/components/amp-subscriptions-google/) and ensure you are set up with those basic capabilities before integrating with this component.
+
+# How it works
+
+1. Publishers can configure a Web Story with the component to implement a paywall.
+    - Paywall cannot be triggered on the first two pages of a Story or on the last page or on a Story with fewer than 4 pages.
+2. When the user navigates to the first paywalled page of the Story, <amp-story-subscriptions> will check if the user has access via <amp-subscriptions>. If yes, the user can consume the Story without any interruption.
+3. If the access is not granted, a paywall bottomsheet is shown at the bottom of the page. The paywall only prevents users from accessing the remaining pages of the Story, the user can otherwise navigate as normal (tap to previous pages, or swipe to a different Story if available).
+4. The paywall has a templated UX that allows for key messages to be customized by the publisher.
+5. Depending on publisher configuration, the dialog can support three different ways to progress:
+    - Sign-in with publisher’s sign-in flow (i.e. publisher provided sign-in page).
+    - Subscribe directly via the publisher (i.e. via a publisher provided subscription page).
+    - If enabled by the publisher, subscribe via [Subscribe with Google](https://developers.google.com/news/subscribe).
+6. If the user completes any of the above authentication flows, the user is returned to the Story page, the paywall is dismissed and the user can consume the rest of the Story.
+7. If the user encounters a subsequent paywalled Story from this publisher, they will continue to retain access based on [amp-subscription mechanisms](https://amp.dev/documentation/components/amp-subscriptions/#combining-the-amp-reader-id-with-publisher-cookies).
+
+# `amp-story-subscriptions` attributes
+
+```html
+<amp-story publisher-logo-src='https://publisher-domain.com/logo.jpg'>
+    <amp-story-page>...</amp-story-page>
+    ...
+    <amp-story-subscriptions subscriptions-page-index='3' price='$0.50/week' headline='Culture at your fingertips' description='Subscribe for unlimited access.' additional-description='Cancel anytime.'>
+    </amp-story-subscription>
+</amp-story>
+```
+
+### `price` {string} required
+
+Subscription/offer price, e.g. "$0.50/week" or "4€ every 4 weeks for one year". This can be any arbitrary string that describe any offers like free trial, monthly, annually, etc. Note that it would be omitted with ellipsis at the end if too long, which is determined by the view width.
+
+### `description` {string} required
+
+One line of description for the subscription/offer.
+
+### `subscriptions-page-index` {number} optional
+
+The index of the `amp-story-page` that displays the subscriptions dialog. The `amp-story-page` index in `amp-story` starts from 0, e.g. the first `amp-story-page` has index of 0. If not specified, it defaults to 2, which is the 3rd `amp-story-page` of the story.
+
+Note that this specified page cannot be the first two pages nor the last page of the story.
+
+### `headline` {string} optional
+
+A headline string that describes the subscription/offer. If not provided, the line would be removed, e.g. the dialog would get shorter since the content is one line less.
+
+### `additional-description` {string} optional
+
+Additional line of description for the subscription/offer. If not provided, the line would be removed, e.g. the dialog would get shorter since the content is one line less.
+
+# Validation
+
+See validation rules in [amp-story-subscriptions validator](https://github.com/ampproject/amphtml/blob/main/extensions/amp-story-subscriptions/validator-amp-story-subscriptions.protoascii).
diff --git a/extensions/amp-story-subscriptions/0.1/test/test-amp-story-subscriptions.js b/extensions/amp-story-subscriptions/0.1/test/test-amp-story-subscriptions.js
new file mode 100644
index 000000000000..014ad6414861
--- /dev/null
+++ b/extensions/amp-story-subscriptions/0.1/test/test-amp-story-subscriptions.js
@@ -0,0 +1,296 @@
+import * as Preact from '#core/dom/jsx';
+
+import {Services} from '#service';
+
+import {afterRenderPromise, macroTask} from '#testing/helpers';
+
+import {getLocalizationService} from 'extensions/amp-story/1.0/amp-story-localization-service';
+import {AdvancementMode} from 'extensions/amp-story/1.0/story-analytics';
+
+import LocalizedStringsEn from '../../../amp-story/1.0/_locales/en.json' assert {type: 'json'}; // lgtm[js/syntax-error]
+import {
+  Action,
+  AmpStoryStoreService,
+  StateProperty,
+  SubscriptionsState,
+} from '../../../amp-story/1.0/amp-story-store-service';
+import {SubscriptionService} from '../../../amp-subscriptions/0.1/amp-subscriptions';
+import {Dialog} from '../../../amp-subscriptions/0.1/dialog';
+import {AmpStorySubscriptions} from '../amp-story-subscriptions';
+
+describes.realWin(
+  'amp-story-subscriptions-v0.1',
+  {
+    amp: {
+      runtimeOn: true,
+      extensions: ['amp-story-subscriptions:0.1'],
+    },
+  },
+  (env) => {
+    let win;
+    let doc;
+    let subscriptionsEl;
+    let storeService;
+    let storySubscriptions;
+    let subscriptionService;
+
+    beforeEach(async () => {
+      win = env.win;
+      doc = win.document;
+
+      storeService = new AmpStoryStoreService(win);
+      env.sandbox
+        .stub(Services, 'storyStoreServiceForOrNull')
+        .returns(Promise.resolve(storeService));
+      env.sandbox.stub(Services, 'storyStoreService').returns(storeService);
+
+      getLocalizationService(doc.body).registerLocalizedStringBundles({
+        'en': LocalizedStringsEn,
+      });
+
+      const platformConfig = {
+        'services': [
+          {
+            'authorizationUrl':
+              'https://scenic-2017.appspot.com/amp-entitlements?pubid=scenic-2017.appspot.com&meter=1&rid=READER_ID',
+            'pingbackUrl':
+              'https://scenic-2017.appspot.com/amp-pingback?pubid=scenic-2017.appspot.com',
+            'actions': {
+              'login': 'https://scenic-2017.appspot.com/signin?rid=READER_ID',
+              'subscribe': 'https://scenic-2017.appspot.com/subscribe',
+            },
+          },
+          {
+            'serviceId': 'subscribe.google.com',
+          },
+        ],
+      };
+      doc.head.appendChild(
+        <script type="application/json" id="amp-subscriptions">
+          {JSON.stringify(platformConfig)}
+        </script>
+      );
+
+      const pageConfig = {
+        '@context': 'http://schema.org',
+        '@type': 'NewsArticle',
+        'isAccessibleForFree': 'False',
+        'isPartOf': {
+          '@type': ['CreativeWork', 'Product'],
+          'name': 'Product A',
+          'productID': 'scenic-2017.appspot.com:news',
+        },
+      };
+      doc.head.appendChild(
+        <script type="application/ld+json">{JSON.stringify(pageConfig)}</script>
+      );
+
+      subscriptionService = new SubscriptionService(env.ampdoc);
+      subscriptionService.start();
+      env.sandbox
+        .stub(Services, 'subscriptionsServiceForDoc')
+        .returns(Promise.resolve(subscriptionService));
+
+      const storyEl = doc.createElement('amp-story');
+      subscriptionsEl = (
+        <amp-story-subscriptions layout="container"> </amp-story-subscriptions>
+      );
+      storyEl.appendChild(subscriptionsEl);
+
+      for (let i = 0; i < 4; i++) {
+        storyEl.appendChild(win.document.createElement('amp-story-page'));
+      }
+
+      win.document.body.appendChild(storyEl);
+      await subscriptionsEl.whenBuilt();
+    });
+
+    it('should contain amp-subscriptions attributes: subscriptions-dialog', async () => {
+      expect(
+        subscriptionsEl
+          .querySelector('div')
+          .hasAttribute('subscriptions-dialog')
+      ).to.equal(true);
+    });
+
+    it('should contain amp-subscriptions attributes: subscriptions-display', async () => {
+      expect(
+        subscriptionsEl
+          .querySelector('div')
+          .getAttribute('subscriptions-display')
+      ).to.equal('NOT granted');
+    });
+
+    describe('should activate subscription platform and show paywall on dialog UI state update to true', async () => {
+      let maybeRenderDialogForSelectedPlatformSpy;
+
+      beforeEach(() => {
+        storySubscriptions = new AmpStorySubscriptions(subscriptionsEl);
+        maybeRenderDialogForSelectedPlatformSpy = env.sandbox.spy(
+          subscriptionService,
+          'maybeRenderDialogForSelectedPlatform'
+        );
+        storeService.dispatch(
+          Action.TOGGLE_SUBSCRIPTIONS_DIALOG_UI_STATE,
+          false
+        );
+      });
+
+      it('paywall element should have visible class', async () => {
+        storeService.dispatch(
+          Action.TOGGLE_SUBSCRIPTIONS_DIALOG_UI_STATE,
+          true
+        );
+        await afterRenderPromise(win);
+
+        expect(storySubscriptions.element).to.have.class(
+          'i-amphtml-story-subscriptions-visible'
+        );
+      });
+
+      it('should render paywall element', async () => {
+        storeService.dispatch(
+          Action.TOGGLE_SUBSCRIPTIONS_DIALOG_UI_STATE,
+          true
+        );
+        await afterRenderPromise(win);
+
+        expect(maybeRenderDialogForSelectedPlatformSpy).to.be.calledOnce;
+      });
+    });
+
+    describe('should hide the paywall on dialog UI state update to false', async () => {
+      let dialogCloseSpy;
+
+      beforeEach(() => {
+        storySubscriptions = new AmpStorySubscriptions(subscriptionsEl);
+        const dialog = new Dialog(env.ampdoc);
+        dialogCloseSpy = env.sandbox.spy(dialog, 'close');
+        env.sandbox.stub(subscriptionService, 'getDialog').returns(dialog);
+        storeService.dispatch(
+          Action.TOGGLE_SUBSCRIPTIONS_DIALOG_UI_STATE,
+          true
+        );
+      });
+
+      it('paywall element should not have visible class', async () => {
+        storeService.dispatch(
+          Action.TOGGLE_SUBSCRIPTIONS_DIALOG_UI_STATE,
+          false
+        );
+        await afterRenderPromise(win);
+
+        expect(storySubscriptions.element).to.not.have.class(
+          'i-amphtml-story-subscriptions-visible'
+        );
+      });
+
+      it('should hide paywall element', async () => {
+        storeService.dispatch(
+          Action.TOGGLE_SUBSCRIPTIONS_DIALOG_UI_STATE,
+          false
+        );
+        await afterRenderPromise(win);
+
+        expect(dialogCloseSpy).to.be.calledOnce;
+      });
+    });
+
+    it('should update subscription state to blocked once grant status from subscription service resolves to false', async () => {
+      env.sandbox
+        .stub(subscriptionService, 'getGrantStatus')
+        .returns(Promise.resolve(false));
+
+      await macroTask();
+
+      expect(storeService.get(StateProperty.SUBSCRIPTIONS_STATE)).to.equal(
+        SubscriptionsState.BLOCKED
+      );
+    });
+
+    it('should update subscription state to granted once grant status from subscription service resolves to true', async () => {
+      env.sandbox
+        .stub(subscriptionService, 'getGrantStatus')
+        .returns(Promise.resolve(true));
+
+      await macroTask();
+
+      expect(storeService.get(StateProperty.SUBSCRIPTIONS_STATE)).to.equal(
+        SubscriptionsState.GRANTED
+      );
+    });
+
+    describe('skip button behaviors when embedded in a viewer', () => {
+      beforeEach(async () => {
+        const viewer = Services.viewerForDoc(env.ampdoc);
+        env.sandbox.stub(viewer, 'isEmbedded').withArgs().returns(true);
+        env.sandbox.stub(Services, 'viewerForDoc').returns(viewer);
+        env.sandbox
+          .stub(subscriptionService, 'maybeRenderDialogForSelectedPlatform')
+          .returns(Promise.resolve(true));
+        env.sandbox.stub(window, 'setTimeout').callsFake((fn) => fn());
+
+        storySubscriptions = await subscriptionsEl.getImpl();
+        await storySubscriptions.buildCallback();
+        storySubscriptions.mutateElement = (fn) => fn();
+
+        const dialog = subscriptionService.getDialog();
+        await dialog.open(subscriptionsEl);
+
+        storeService.dispatch(
+          Action.TOGGLE_SUBSCRIPTIONS_DIALOG_UI_STATE,
+          true
+        );
+      });
+
+      it('should show skip button after delay', async () => {
+        const buttonEl = doc.querySelector(
+          'amp-subscriptions-dialog .i-amphtml-story-subscriptions-dialog-banner-button'
+        );
+        expect(buttonEl).to.have.class(
+          'i-amphtml-story-subscriptions-dialog-banner-button-visible'
+        );
+      });
+
+      it('click on the button element should fire the event to navigate to next story', async () => {
+        const handlerSpy = env.sandbox.spy(
+          storySubscriptions.viewerMessagingHandler_,
+          'send'
+        );
+
+        const subscriptionsDialogEl = doc.querySelector(
+          'amp-subscriptions-dialog'
+        );
+        subscriptionsDialogEl.click();
+        expect(handlerSpy).to.not.have.been.called;
+
+        const buttonEl = doc.querySelector(
+          'amp-subscriptions-dialog .i-amphtml-story-subscriptions-dialog-banner-button-visible'
+        );
+        buttonEl.click();
+        expect(handlerSpy).to.have.been.calledWithExactly('selectDocument', {
+          'next': true,
+          'advancementMode': AdvancementMode.MANUAL_ADVANCE,
+        });
+      });
+    });
+
+    it('should allow pointer events on swg background to intercept clicks on background', async () => {
+      const dialog = subscriptionService.getDialog();
+      await dialog.open(subscriptionsEl);
+
+      const buttonEl = doc.querySelector(
+        'amp-subscriptions-dialog .i-amphtml-story-subscriptions-google-button'
+      );
+      buttonEl.click();
+
+      doc.body.appendChild(<swg-popup-background></swg-popup-background>);
+      await macroTask();
+
+      const swgPopupBackgroundEl = doc.querySelector('swg-popup-background');
+      expect(
+        swgPopupBackgroundEl.style.getPropertyValue('pointer-events')
+      ).equal('all');
+    });
+  }
+);
diff --git a/extensions/amp-story-subscriptions/0.1/test/validator-amp-story-subscriptions.html b/extensions/amp-story-subscriptions/0.1/test/validator-amp-story-subscriptions.html
new file mode 100644
index 000000000000..55041de7f9e7
--- /dev/null
+++ b/extensions/amp-story-subscriptions/0.1/test/validator-amp-story-subscriptions.html
@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<html ⚡ lang="en">
+  <!-- prettier-ignore -->
+  <head>
+    <meta charset="utf-8">
+    <title>amp-story-subscriptions example</title>
+    <link rel="canonical" href="/examples/amp-story-subscriptions.html">
+    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+    <style amp-custom>
+      amp-story-subscriptions {
+        color: red;
+      }
+    </style>
+    <script async src="https://cdn.ampproject.org/v0.js"></script>
+    <script async custom-element="amp-subscriptions" src="https://cdn.ampproject.org/v0/amp-subscriptions-0.1.js"></script>
+    <script
+      async
+      custom-element="amp-subscriptions-google"
+      src="https://cdn.ampproject.org/v0/amp-subscriptions-google-0.1.js"
+    ></script>
+    <script async custom-element="amp-story"
+        src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
+    <script async custom-element="amp-story-subscriptions" src="https://cdn.ampproject.org/v0/amp-story-subscriptions-0.1.js"></script>
+  </head>
+  <body>
+    <amp-story standalone title="My story" publisher="Monocle" publisher-logo-src="https://res.cloudinary.com/crunchbase-production/image/upload/c_lpad,h_170,w_170,f_auto,b_white,q_auto:eco,dpr_1/tbvbvipimh2camf5nb2q" poster-portrait-src="POSTER-IMAGE-URL">
+      <amp-story-page id="cover" auto-advance-after="5s">
+        <amp-story-grid-layer template="fill">
+          <amp-img src="https://images.unsplash.com/photo-1552650904-54d0c54b278f?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=987&q=80"
+              width="720" height="1280"
+              layout="responsive"
+              alt="">
+          </amp-img>
+        </amp-story-grid-layer>
+      </amp-story-page>
+
+      <amp-story-page id="page-1" auto-advance-after="5s">
+        <amp-story-grid-layer template="fill">
+          <amp-img src="https://images.unsplash.com/photo-1544965563-bb8d8bce9791?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1011&q=80"
+              width="720" height="1280"
+              layout="responsive"
+              alt="">
+          </amp-img>
+        </amp-story-grid-layer>
+      </amp-story-page>
+
+      <amp-story-page id="page-2" auto-advance-after="5s">
+        <amp-story-grid-layer template="fill">
+          <amp-img src="https://images.unsplash.com/photo-1599849913403-f45ef2181b49?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=3024&q=80"
+              width="720" height="1280"
+              layout="responsive"
+              alt="">
+          </amp-img>
+        </amp-story-grid-layer>
+      </amp-story-page>
+
+      <amp-story-page id="page-3">
+        <amp-story-grid-layer template="fill">
+          <amp-img src="https://images.unsplash.com/photo-1574236170880-fbbca132d83d?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=926&q=80"
+              width="720" height="1280"
+              layout="responsive"
+              alt="">
+          </amp-img>
+        </amp-story-grid-layer>
+      </amp-story-page>
+
+      <amp-story-subscriptions layout='container'
+        price='$0.50/week'
+        description='Subscribe for unlimited access.'>
+      </amp-story-subscriptions>
+    </amp-story>
+  </body>
+</html>
\ No newline at end of file
diff --git a/extensions/amp-story-subscriptions/0.1/test/validator-amp-story-subscriptions.out b/extensions/amp-story-subscriptions/0.1/test/validator-amp-story-subscriptions.out
new file mode 100644
index 000000000000..495c6e070d17
--- /dev/null
+++ b/extensions/amp-story-subscriptions/0.1/test/validator-amp-story-subscriptions.out
@@ -0,0 +1,75 @@
+PASS
+|  <!DOCTYPE html>
+|  <html ⚡ lang="en">
+|    <!-- prettier-ignore -->
+|    <head>
+|      <meta charset="utf-8">
+|      <title>amp-story-subscriptions example</title>
+|      <link rel="canonical" href="/examples/amp-story-subscriptions.html">
+|      <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+|      <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+|      <style amp-custom>
+|        amp-story-subscriptions {
+|          color: red;
+|        }
+|      </style>
+|      <script async src="https://cdn.ampproject.org/v0.js"></script>
+|      <script async custom-element="amp-subscriptions" src="https://cdn.ampproject.org/v0/amp-subscriptions-0.1.js"></script>
+|      <script
+|        async
+|        custom-element="amp-subscriptions-google"
+|        src="https://cdn.ampproject.org/v0/amp-subscriptions-google-0.1.js"
+|      ></script>
+|      <script async custom-element="amp-story"
+|          src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
+|      <script async custom-element="amp-story-subscriptions" src="https://cdn.ampproject.org/v0/amp-story-subscriptions-0.1.js"></script>
+|    </head>
+|    <body>
+|      <amp-story standalone title="My story" publisher="Monocle" publisher-logo-src="https://res.cloudinary.com/crunchbase-production/image/upload/c_lpad,h_170,w_170,f_auto,b_white,q_auto:eco,dpr_1/tbvbvipimh2camf5nb2q" poster-portrait-src="POSTER-IMAGE-URL">
+|        <amp-story-page id="cover" auto-advance-after="5s">
+|          <amp-story-grid-layer template="fill">
+|            <amp-img src="https://images.unsplash.com/photo-1552650904-54d0c54b278f?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=987&q=80"
+|                width="720" height="1280"
+|                layout="responsive"
+|                alt="">
+|            </amp-img>
+|          </amp-story-grid-layer>
+|        </amp-story-page>
+|
+|        <amp-story-page id="page-1" auto-advance-after="5s">
+|          <amp-story-grid-layer template="fill">
+|            <amp-img src="https://images.unsplash.com/photo-1544965563-bb8d8bce9791?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1011&q=80"
+|                width="720" height="1280"
+|                layout="responsive"
+|                alt="">
+|            </amp-img>
+|          </amp-story-grid-layer>
+|        </amp-story-page>
+|
+|        <amp-story-page id="page-2" auto-advance-after="5s">
+|          <amp-story-grid-layer template="fill">
+|            <amp-img src="https://images.unsplash.com/photo-1599849913403-f45ef2181b49?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=3024&q=80"
+|                width="720" height="1280"
+|                layout="responsive"
+|                alt="">
+|            </amp-img>
+|          </amp-story-grid-layer>
+|        </amp-story-page>
+|
+|        <amp-story-page id="page-3">
+|          <amp-story-grid-layer template="fill">
+|            <amp-img src="https://images.unsplash.com/photo-1574236170880-fbbca132d83d?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=926&q=80"
+|                width="720" height="1280"
+|                layout="responsive"
+|                alt="">
+|            </amp-img>
+|          </amp-story-grid-layer>
+|        </amp-story-page>
+|
+|        <amp-story-subscriptions layout='container'
+|          price='$0.50/week'
+|          description='Subscribe for unlimited access.'>
+|        </amp-story-subscriptions>
+|      </amp-story>
+|    </body>
+|  </html>
\ No newline at end of file
diff --git a/extensions/amp-story-subscriptions/OWNERS b/extensions/amp-story-subscriptions/OWNERS
new file mode 100644
index 000000000000..1f82f30d9c5c
--- /dev/null
+++ b/extensions/amp-story-subscriptions/OWNERS
@@ -0,0 +1,16 @@
+// For an explanation of the OWNERS rules and syntax, see:
+// https://github.com/ampproject/amp-github-apps/blob/main/owners/OWNERS.example
+
+{
+  rules: [
+    {
+      owners: [
+        {name: 'ychsieh'},
+        {name: 'calebcordry'},
+        {name: 'mszylkowski'},
+        {name: 'newmuis', notify: true},
+        {name: 'gmajoulet', notify: true},
+      ],
+    },
+  ],
+}
diff --git a/extensions/amp-story-subscriptions/validator-amp-story-subscriptions.protoascii b/extensions/amp-story-subscriptions/validator-amp-story-subscriptions.protoascii
new file mode 100644
index 000000000000..18804bb07855
--- /dev/null
+++ b/extensions/amp-story-subscriptions/validator-amp-story-subscriptions.protoascii
@@ -0,0 +1,35 @@
+tags: {  # amp-story-subscriptions
+  html_format: AMP
+  tag_name: "SCRIPT"
+  extension_spec: {
+    name: "amp-story-subscriptions"
+    version: "0.1"
+  }
+  attr_lists: "common-extension-attrs"
+}
+tags: {  # <amp-story-subscriptions>
+  html_format: AMP
+  tag_name: "AMP-STORY-SUBSCRIPTIONS"
+  requires_extension: "amp-story-subscriptions"
+  attr_lists: "extended-amp-global"
+  amp_layout: {
+    supported_layouts: CONTAINER
+  }
+  attrs: {
+    name: "price"
+    mandatory: true
+  }
+  attrs: {
+    name: "description"
+    mandatory: true
+  }
+  attrs: {
+    name: "subscriptions-page-index"
+  }
+  attrs: {
+    name: "headline"
+  }
+  attrs: {
+    name: "additional-description"
+  }
+}
diff --git a/extensions/amp-story/1.0/_locales/README.md b/extensions/amp-story/1.0/_locales/README.md
index aadcbea19a79..17ddf01c53fb 100644
--- a/extensions/amp-story/1.0/_locales/README.md
+++ b/extensions/amp-story/1.0/_locales/README.md
@@ -1,6 +1,6 @@
 # Supported languages
 
-To see a list of the supported languages, see the list of `*.js` files in the [`_locales` directory](https://github.com/ampproject/amphtml/tree/main/extensions/amp-story/1.0/_locales).
+To see a list of the supported languages, see the list of `*.json` files in the [`_locales` directory](https://github.com/ampproject/amphtml/tree/main/extensions/amp-story/1.0/_locales).
 
 # Language fallbacks
 
@@ -20,8 +20,8 @@ You can view the translations provided for each language in [this spreadsheet](h
 
 # Adding new strings (English)
 
-1. Add a new string ID in [`LocalizedStringId`](https://github.com/ampproject/amphtml/blob/main/src/localized-strings.js#L31). Keep the `LocalizedStringId` list in alphabetical order, and make sure your ID's name is clear about what it represents semantically.
-2. Open the [`en.js` file](https://github.com/ampproject/amphtml/blob/main/extensions/amp-story/1.0/_locales/en.js)
+1. Add a new string ID in [`LocalizedStringId`](https://github.com/ampproject/amphtml/blob/main/src/service/localization/strings.js#L16). Keep the `LocalizedStringId` list in alphabetical order, and make sure your ID's name is clear about what it represents semantically.
+2. Open the [`en.json` file](https://github.com/ampproject/amphtml/blob/main/extensions/amp-story/1.0/_locales/en.json)
 3. Add a new object key with the `LocalizedStringId` as the key, and an object containing the string and its description as its value. For example:
 
 ```javascript
@@ -40,7 +40,7 @@ You can view the translations provided for each language in [this spreadsheet](h
 # Adding new translations (non-English strings)
 
 1. Find which string(s) are missing by looking at [the string spreadsheet](https://bit.ly/amp-story-strings).
-2. Open the `*.js` file from the [`_locales` directory](https://github.com/ampproject/amphtml/tree/main/extensions/amp-story/1.0/_locales) for the language for which you would like to add a translation.
+2. Open the `*.json` file from the [`_locales` directory](https://github.com/ampproject/amphtml/tree/main/extensions/amp-story/1.0/_locales) for the language for which you would like to add a translation.
 3. Add a new object key with the `LocalizedStringId` as the key, and an object containing the string as its value. For example:
 
 ```javascript
diff --git a/extensions/amp-story/1.0/_locales/af.json b/extensions/amp-story/1.0/_locales/af.json
index 8f8885132a67..0371bc1986f9 100644
--- a/extensions/amp-story/1.0/_locales/af.json
+++ b/extensions/amp-story/1.0/_locales/af.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Kry skakel"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Meer"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Jy moet die amp-story-eksperiment aktiveer om hierdie inhoud te bekyk."
-  },
   "21": {
     "string": "Ons is jammer, maar dit lyk of jou blaaier nie hierdie ervaring steun nie"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Gaan in elk geval voort"
   },
-  "31": {
-    "string": "Klank af"
-  },
-  "32": {
-    "string": "Klank aan"
-  },
-  "33": {
-    "string": "Hierdie bladsy het geen klank nie"
-  },
   "34": {
     "string": "Speel video"
   },
   "35": {
     "string": "Vee opwaarts"
   },
-  "36": {
-    "string": "Vou twiet uit"
-  },
-  "62": {
-    "string": "Deel vanaf hierdie bladsy"
-  },
   "63": {
     "string": "LINE"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Deel storie"
   },
-  "70": {
-    "string": "Wissel storiekieslys"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Wenk"
   },
-  "82": {
-    "string": "Vorige bladsy"
-  },
   "83": {
     "string": "Aktiveer"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "Wird geöffnet"
+  },
+  "98": {
+    "string": "Vorm nie ingedien nie, probeer weer"
+  },
+  "99": {
+    "string": "Vorm suksesvol ingedien"
+  },
+  "101": {
+    "string": "Kyk-en-koop nou"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/am.json b/extensions/amp-story/1.0/_locales/am.json
index 84cbbf210f27..a2dc30f79546 100644
--- a/extensions/amp-story/1.0/_locales/am.json
+++ b/extensions/amp-story/1.0/_locales/am.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "ፌስቡክ"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "ማስፈንጠሪያውን ያግኙ"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "ተጨማሪ"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "ዋትስአፕ"
   },
-  "19": {
-    "string": "ይህንን ይዘት ለማየት የamp-story ተሞክሮ ማንቃት አለብዎት።"
-  },
   "21": {
     "string": "እናዝናለን፣ አሳሽዎ ይህንን ተሞክሮ የማይደግፍ ይመስላል"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "ለማንኛውም ቀጥል"
   },
-  "31": {
-    "string": "ድምፅ ጠፍቷል"
-  },
-  "32": {
-    "string": "ድምፅ አልጠፋም"
-  },
-  "33": {
-    "string": "ይህ ገጽ ድምፅ የለውም"
-  },
   "34": {
     "string": "ቪዲዮ አጫውት"
   },
   "35": {
     "string": "ወደ ላይ ያንሸራቱ"
   },
-  "36": {
-    "string": "ትዊትን ዘርጋ"
-  },
-  "62": {
-    "string": "ከዚህ ገጽ ጀምሮ ያጋሩ"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "ታሪክ ያጋሩ"
   },
-  "70": {
-    "string": "የታሪክ ምናሌን ይቀያይሩ"
-  },
   "71": {
     "string": "ሀ"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "ጠቃሚ ምክር"
   },
-  "82": {
-    "string": "የቀደመው ገጽ"
-  },
   "83": {
     "string": "አግብር"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "በመክፈት ላይ"
+  },
+  "98": {
+    "string": "ቅጽ አልቀረበም፣ እንደገና ይሞክሩ"
+  },
+  "99": {
+    "string": "ቅጽ በተሳካ ሁኔታ ቀርቧል"
+  },
+  "101": {
+    "string": "አሁን ይሸምቱ"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/ar.json b/extensions/amp-story/1.0/_locales/ar.json
index 42ce24f43a6f..a2d70097644f 100644
--- a/extensions/amp-story/1.0/_locales/ar.json
+++ b/extensions/amp-story/1.0/_locales/ar.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "الحصول على رابط"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "رسالة نصية قصيرة"
   },
-  "13": {
-    "string": "المزيد"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "يجب تمكين تجربة amp-story لعرض هذا المحتوى."
-  },
   "21": {
     "string": "عذرًا، يبدو أن متصفحك لا يدعم هذه التجربة"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "المتابعة على أي حال"
   },
-  "31": {
-    "string": "الصوت متوقف"
-  },
-  "32": {
-    "string": "الصوت يعمل"
-  },
-  "33": {
-    "string": "هذه الصفحة ليس لها صوت"
-  },
   "34": {
     "string": "تشغيل الفيديو"
   },
   "35": {
     "string": "السحب لأعلى"
   },
-  "36": {
-    "string": "توسيع التغريدة"
-  },
-  "62": {
-    "string": "المشاركة بدءًا من هذه الصفحة"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "مشاركة القصة"
   },
-  "70": {
-    "string": "تشغيل قائمة القصة"
-  },
   "71": {
     "string": "أ"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "نصيحة"
   },
-  "82": {
-    "string": "الصفحة السابقة"
-  },
   "83": {
     "string": "تفعيل"
   },
@@ -184,5 +154,17 @@
   },
   "97": {
     "string": "جارٍ الفتح"
+  },
+  "98": {
+    "string": "لم يتم إرسال النموذج، حاول مرة أخرى"
+  },
+  "99": {
+    "string": "تم إرسال النموذج بنجاح"
+  },
+  "101": {
+    "string": "تسوَّق الآن"
+  },
+  "110": {
+    "string": "Google اشترك مع"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/bg.json b/extensions/amp-story/1.0/_locales/bg.json
index 5395b2702d0e..5cec0adce807 100644
--- a/extensions/amp-story/1.0/_locales/bg.json
+++ b/extensions/amp-story/1.0/_locales/bg.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Получаване на връзка"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Още"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "За преглед на това съдържание трябва да активирате експеримента за amp-story."
-  },
   "21": {
     "string": "За съжаление, изглежда, че браузърът ви не поддържа тази история"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Продължаване въпреки това"
   },
-  "31": {
-    "string": "Звукът е изключен"
-  },
-  "32": {
-    "string": "Звукът е включен"
-  },
-  "33": {
-    "string": "На тази страница няма звук"
-  },
   "34": {
     "string": "Пускане на видеоклипа"
   },
   "35": {
     "string": "Плъзнете нагоре"
   },
-  "36": {
-    "string": "Разгъване на съобщението в Twitter"
-  },
-  "62": {
-    "string": "Споделете, започвайки от тази страница"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Споделяне на историята"
   },
-  "70": {
-    "string": "Превключване на менюто на историята"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Съвет"
   },
-  "82": {
-    "string": "Предишна страница"
-  },
   "83": {
     "string": "Активиране"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "Отваряне"
+  },
+  "98": {
+    "string": "Формулярът не е изпратен, опитайте отново"
+  },
+  "99": {
+    "string": "Формулярът е изпратен успешно"
+  },
+  "101": {
+    "string": "Пазарувайте сега"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/bn.json b/extensions/amp-story/1.0/_locales/bn.json
index 6d246106404f..cb33fa55bacc 100644
--- a/extensions/amp-story/1.0/_locales/bn.json
+++ b/extensions/amp-story/1.0/_locales/bn.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "ফেসবুক"
   },
-  "8": {
-    "string": "গুগল+"
-  },
   "9": {
     "string": "লিংক অর্জন করুন"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "খুদেবার্তা"
   },
-  "13": {
-    "string": "আরও"
-  },
   "14": {
     "string": "টাম্বলার"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "হোয়াটসঅ্যাপ"
   },
-  "19": {
-    "string": "এই কনটেন্ট দেখতে আপনাকে অবশ্যই amp-story পরীক্ষা সক্রিয় করতে হবে।"
-  },
   "21": {
     "string": "আমরা দুঃখিত, মনে হচ্ছে আপনার ব্রাউজার এই অভিজ্ঞতা সমর্থন করে না"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "যাই হোক না কেন অব্যাহত রাখুন"
   },
-  "31": {
-    "string": "শব্দ বন্ধ"
-  },
-  "32": {
-    "string": "শব্দ চালু"
-  },
-  "33": {
-    "string": "এই পৃষ্ঠার কোনো শব্দ নেই"
-  },
   "34": {
     "string": "ভিডিও চালু করুন"
   },
   "35": {
     "string": "উপরে সোয়াইপ করুন"
   },
-  "36": {
-    "string": "টুইট সম্প্রসারণ করুন"
-  },
-  "62": {
-    "string": "এই পৃষ্ঠা থেকে শুরু শেয়ার করুন"
-  },
   "63": {
     "string": "লাইন"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "স্টোরি শেয়ার করুন"
   },
-  "70": {
-    "string": "স্টোরির মেনু চালু করুন"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "পরামর্শ"
   },
-  "82": {
-    "string": "পূর্ববর্তী পৃষ্ঠা"
-  },
   "83": {
     "string": "সক্রিয় করুন"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "খোলা হচ্ছে"
+  },
+  "98": {
+    "string": "ফরম জমা দেওয়া হয়নি, আবার চেষ্টা করুন"
+  },
+  "99": {
+    "string": "ফরম সফলভাবে জমা দেওয়া হয়েছে"
+  },
+  "101": {
+    "string": "এখনই   কেনাকাটা করুন"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/bs.json b/extensions/amp-story/1.0/_locales/bs.json
index 9ee5f85b23b1..45214d25d3b4 100644
--- a/extensions/amp-story/1.0/_locales/bs.json
+++ b/extensions/amp-story/1.0/_locales/bs.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Preuzmi vezu"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Više"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Morate omogućiti eksperiment amp-story za prikaz ovog sadržaja."
-  },
   "21": {
     "string": "Nažalost, vaš preglednik ne podržava ovo iskustvo"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Svejedno nastavi"
   },
-  "31": {
-    "string": "Zvuk je isključen"
-  },
-  "32": {
-    "string": "Zvuk je uključen"
-  },
-  "33": {
-    "string": "Ova stranica nema zvuk"
-  },
   "34": {
     "string": "Reproduciraj videozapis"
   },
   "35": {
     "string": "Pređite prstom nagore"
   },
-  "36": {
-    "string": "Proširi tweet"
-  },
-  "62": {
-    "string": "Podijeli počevši od ove stranice"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Podijeli priču"
   },
-  "70": {
-    "string": "Uključi meni priče"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Savjet"
   },
-  "82": {
-    "string": "Prethodna stranica"
-  },
   "83": {
     "string": "Aktiviraj"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "Otvaranje"
+  },
+  "98": {
+    "string": "Formular nije poslan, pokušajte ponovo"
+  },
+  "99": {
+    "string": "Formular uspješno poslan"
+  },
+  "101": {
+    "string": "Kupuj odmah"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/ca.json b/extensions/amp-story/1.0/_locales/ca.json
index 6f08d33d4048..a7ce13756ecf 100644
--- a/extensions/amp-story/1.0/_locales/ca.json
+++ b/extensions/amp-story/1.0/_locales/ca.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Obtén l'enllaç"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Més"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Has d'activar l'experiment d'AMP-story per veure aquest contingut."
-  },
   "21": {
     "string": "Sembla que el teu navegador no admet aquesta experiència"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Continua de totes maneres"
   },
-  "31": {
-    "string": "So desactivat"
-  },
-  "32": {
-    "string": "So activat"
-  },
-  "33": {
-    "string": "Aquesta pàgina no té so"
-  },
   "34": {
     "string": "Reprodueix el vídeo"
   },
   "35": {
     "string": "Llisca cap amunt"
   },
-  "36": {
-    "string": "Amplia el tuit"
-  },
-  "62": {
-    "string": "Comparteix a partir d'aquesta pàgina"
-  },
   "63": {
     "string": "Línia"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Comparteix la història"
   },
-  "70": {
-    "string": "Activa/Desactiva el menú de la història"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Consell"
   },
-  "82": {
-    "string": "Pàgina anterior"
-  },
   "83": {
     "string": "Activa"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "S'està obrint"
+  },
+  "98": {
+    "string": "El formulari no s'ha enviat, torna-ho a provar"
+  },
+  "99": {
+    "string": "El formulari s'ha enviat correctament"
+  },
+  "101": {
+    "string": "Compra ara"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/cs.json b/extensions/amp-story/1.0/_locales/cs.json
index ed4cceff6647..7603fc03ebdf 100644
--- a/extensions/amp-story/1.0/_locales/cs.json
+++ b/extensions/amp-story/1.0/_locales/cs.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Získat odkaz"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Více"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Pokud chcete zobrazit tento obsah, musíte povolit experiment s příběhem amp-story."
-  },
   "21": {
     "string": "Je nám líto, zdá se, že váš prohlížeč toto tento prvek nepodporuje"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Přesto pokračovat"
   },
-  "31": {
-    "string": "Zvuk je vypnutý"
-  },
-  "32": {
-    "string": "Zvuk je zapnutý"
-  },
-  "33": {
-    "string": "Tato stránka je bez zvuku"
-  },
   "34": {
     "string": "Přehrát video"
   },
   "35": {
     "string": "Potáhněte nahoru"
   },
-  "36": {
-    "string": "Rozbalit tweet"
-  },
-  "62": {
-    "string": "Sdílet od této stránky"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Sdílet příběh"
   },
-  "70": {
-    "string": "Přepnout nabídku příběhu"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Tip"
   },
-  "82": {
-    "string": "Předchozí stránka"
-  },
   "83": {
     "string": "Aktivovat"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "Otevírání"
+  },
+  "98": {
+    "string": "Formulář nebyl odeslán, zkuste to znovu"
+  },
+  "99": {
+    "string": "Formulář byl odeslán"
+  },
+  "101": {
+    "string": "Nakupovat"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/da.json b/extensions/amp-story/1.0/_locales/da.json
index 84babbbfae45..1d4fc4d74ee9 100644
--- a/extensions/amp-story/1.0/_locales/da.json
+++ b/extensions/amp-story/1.0/_locales/da.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Hent link"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Mere"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Du skal aktivere amp-story-eksperimentet for at se dette indhold."
-  },
   "21": {
     "string": "Vi beklager, men det ser ud til, at din browser ikke understøtter denne oplevelse"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Fortsæt alligevel"
   },
-  "31": {
-    "string": "Lyd fra"
-  },
-  "32": {
-    "string": "Lyd til"
-  },
-  "33": {
-    "string": "Denne side har ingen lyd"
-  },
   "34": {
     "string": "Afspil video"
   },
   "35": {
     "string": "Stryg op"
   },
-  "36": {
-    "string": "Udvid tweet"
-  },
-  "62": {
-    "string": "Begynd at dele startende fra denne side"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Del historie"
   },
-  "70": {
-    "string": "Slå historiemenu til"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Tip"
   },
-  "82": {
-    "string": "Forrige side"
-  },
   "83": {
     "string": "Aktiver"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "Åbner"
+  },
+  "98": {
+    "string": "Formularen blev ikke indsendt. Prøv igen"
+  },
+  "99": {
+    "string": "Formularen blev indsendt"
+  },
+  "101": {
+    "string": "Køb nu"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/de.json b/extensions/amp-story/1.0/_locales/de.json
index fc7389b17f8d..55253512cfdb 100644
--- a/extensions/amp-story/1.0/_locales/de.json
+++ b/extensions/amp-story/1.0/_locales/de.json
@@ -1,9 +1,9 @@
 {
   "2": {
-    "string": "Tippe auf \\\"Weiter\\\""
+    "string": "Tippe auf \"Weiter\""
   },
   "3": {
-    "string": "Tippe auf \\\"Zurück\\\""
+    "string": "Tippe auf \"Zurück\""
   },
   "4": {
     "string": "Der Link konnte nicht in die Zwischenablage kopiert werden :("
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Link abrufen"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Mehr"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Um diesen Inhalt anzuzeigen, musst du das Experiment für amp-story aktivieren."
-  },
   "21": {
     "string": "Leider unterstützt dein Browser diese Art der Präsentation nicht."
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Trotzdem fortfahren"
   },
-  "31": {
-    "string": "Ton aus"
-  },
-  "32": {
-    "string": "Ton an"
-  },
-  "33": {
-    "string": "Diese Seite hat keinen Ton"
-  },
   "34": {
     "string": "Video abspielen"
   },
   "35": {
     "string": "Nach oben wischen"
   },
-  "36": {
-    "string": "Tweet maximieren"
-  },
-  "62": {
-    "string": "Ab dieser Seite teilen"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Story teilen"
   },
-  "70": {
-    "string": "Story Menü ein/aus"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Tipp"
   },
-  "82": {
-    "string": "Vorherige Seite"
-  },
   "83": {
     "string": "Aktivieren"
   },
@@ -184,5 +154,17 @@
   },
   "97": {
     "string": "Wird geöffnet"
+  },
+  "98": {
+    "string": "Formular nicht abgeschickt, versuche es erneut"
+  },
+  "99": {
+    "string": "Formular erfolgreich abgeschickt"
+  },
+  "101": {
+    "string": "Jetzt kaufen"
+  },
+  "110": {
+    "string": "Abonnieren mit Google"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/el.json b/extensions/amp-story/1.0/_locales/el.json
index c8d877f29e8b..b0829630eb26 100644
--- a/extensions/amp-story/1.0/_locales/el.json
+++ b/extensions/amp-story/1.0/_locales/el.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Λήψη συνδέσμου"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Περισσότερα"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Πρέπει να ενεργοποιήσετε το πείραμα amp-story για να δείτε αυτό το περιεχόμενο."
-  },
   "21": {
     "string": "Λυπούμαστε, φαίνεται ότι το πρόγραμμα περιήγησής σας δεν υποστηρίζει αυτήν την εμπειρία"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Συνέχεια παρά ταύτα"
   },
-  "31": {
-    "string": "Χωρίς ήχο"
-  },
-  "32": {
-    "string": "Με ήχο"
-  },
-  "33": {
-    "string": "Αυτή η σελίδα δεν έχει ήχο"
-  },
   "34": {
     "string": "Αναπαραγωγή βίντεο"
   },
   "35": {
     "string": "Σύρετε προς τα πάνω"
   },
-  "36": {
-    "string": "Ανάπτυξη Tweet"
-  },
-  "62": {
-    "string": "Κοινοποίηση ξεκινώντας από αυτήν τη σελίδα"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Κοινοποίηση ιστορίας"
   },
-  "70": {
-    "string": "Ενεργοποίηση μενού ιστοριών"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Συμβουλή"
   },
-  "82": {
-    "string": "Προηγούμενη σελίδα"
-  },
   "83": {
     "string": "Ενεργοποίηση"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "Άνοιγμα"
+  },
+  "98": {
+    "string": "Η φόρμα δεν έχει υποβληθεί, δοκιμάστε ξανά"
+  },
+  "99": {
+    "string": "Η φόρμα υποβλήθηκε με επιτυχία"
+  },
+  "101": {
+    "string": "Αγοράστε τώρα"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/en-GB.json b/extensions/amp-story/1.0/_locales/en-GB.json
index 863d27d60344..336af5366774 100644
--- a/extensions/amp-story/1.0/_locales/en-GB.json
+++ b/extensions/amp-story/1.0/_locales/en-GB.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Get Link"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "More"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "You must enable the AMP Story experiment to view this content."
-  },
   "21": {
     "string": "We're sorry, it looks like your browser doesn't support this experience"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Continue Anyway"
   },
-  "31": {
-    "string": "Sound off"
-  },
-  "32": {
-    "string": "Sound on"
-  },
-  "33": {
-    "string": "This page has no sound"
-  },
   "34": {
     "string": "Play video"
   },
   "35": {
     "string": "Swipe up"
   },
-  "36": {
-    "string": "Expand Tweet"
-  },
-  "62": {
-    "string": "Share starting from this page"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Share story"
   },
-  "70": {
-    "string": "Toggle story menu"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Tip"
   },
-  "82": {
-    "string": "Previous page"
-  },
   "83": {
     "string": "Activate"
   },
@@ -184,5 +154,17 @@
   },
   "97": {
     "string": "Opening"
+  },
+  "98": {
+    "string": "Form not submitted. Please try again"
+  },
+  "99": {
+    "string": "Form successfully submitted"
+  },
+  "101": {
+    "string": "Shop now"
+  },
+  "110": {
+    "string": "Subscribe with Google"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/en.json b/extensions/amp-story/1.0/_locales/en.json
index c1e6580e3e24..63e71040422d 100644
--- a/extensions/amp-story/1.0/_locales/en.json
+++ b/extensions/amp-story/1.0/_locales/en.json
@@ -23,10 +23,6 @@
     "string": "Facebook",
     "description": "Button label for the share target that shares a link via Facebook."
   },
-  "8": {
-    "string": "Google+",
-    "description": "Button label for the share target that shares a link via Google+."
-  },
   "9": {
     "string": "Get Link",
     "description": "Button label for the share target that shares a link via by copying it to the user's clipboard."
@@ -43,10 +39,6 @@
     "string": "SMS",
     "description": "Button label for the share target that shares a link via SMS."
   },
-  "13": {
-    "string": "More",
-    "description": "Button label for the share target that shares a link via deferral to the operating system's native sharing handler."
-  },
   "14": {
     "string": "Tumblr",
     "description": "Button label for the share target that shares a link via Tumblr."
@@ -59,10 +51,6 @@
     "string": "WhatsApp",
     "description": "Button label for the share target that shares a link via WhatsApp."
   },
-  "19": {
-    "string": "You must enable the amp-story experiment to view this content.",
-    "description": "Text for a warning screen that informs the user that they must enable an experiment to use stories."
-  },
   "21": {
     "string": "We're sorry, it looks like your browser doesn't support this experience",
     "description": "Text for a warning screen that informs the user that their browser does not support stories."
@@ -87,18 +75,6 @@
     "string": "Continue Anyway",
     "description": "Button label to allow the user to continue even if they are not using a supportive browser."
   },
-  "31": {
-    "string": "Sound off",
-    "description": "Text that informs users that the sound is off after they click the mute button"
-  },
-  "32": {
-    "string": "Sound on",
-    "description": "Text that informs users that the sound is on after they click the unmute button on a page with sound"
-  },
-  "33": {
-    "string": "This page has no sound",
-    "description": "Text that informs users that the sound is on after they click the unmute button on a page without sound"
-  },
   "34": {
     "string": "Play video",
     "description": "Label for a button to play the video visible on the page."
@@ -107,14 +83,6 @@
     "string": "Swipe up",
     "description": "Label for a button to open a drawer containing additional content via a \"swipe up\" user gesture."
   },
-  "36": {
-    "string": "Expand Tweet",
-    "description": "Label in the tooltip text for when a Twitter embed is expandable."
-  },
-  "62": {
-    "string": "Share starting from this page",
-    "description": "Checkbox label when the branching experiment is turned on  and the story is in landscape mode; checking the checkbox lets the user share the story from the current page."
-  },
   "63": {
     "string": "Line",
     "description": "Button label for the share target that shares a link via Line."
@@ -143,10 +111,6 @@
     "string": "Share story",
     "description": "Label for the share button that pulls up a panel of options for sharing the story"
   },
-  "70": {
-    "string": "Toggle story menu",
-    "description": "Label for the sidebar button that pulls up a menu of options for interacting with the story"
-  },
   "71": {
     "string": "A",
     "description": "Label for the first answer choice from a multiple choice quiz (e.g. A in A/B/C/D)"
@@ -191,10 +155,6 @@
     "string": "Tip",
     "description": "Label for a hint in the context of an onboarding user education tutorial."
   },
-  "82": {
-    "string": "Previous page",
-    "description": "Label indicating that users can navigate to the previous page."
-  },
   "83": {
     "string": "Activate",
     "description": "Label for the activate button to ask for device orientation permission"
@@ -255,8 +215,52 @@
     "string": "Form successfully submitted",
     "description": "Text displayed to users when they press a button to submit a form, and this submission succeeds."
   },
-  "100": {
+  "101": {
+    "string": "Shop now",
+    "description": "Label for the shopping CTA button."
+  },
+  "102": {
+    "string": "Featured in this story",
+    "description": "Label for a list of products that are featured in the story."
+  },
+  "103": {
+    "string": "Buy now",
+    "description": "Button label prompting users to shop for something."
+  },
+  "105": {
+    "string": "Details",
+    "description": "Button label prompting users to read about details of a product."
+  },
+  "106": {
     "string": "Read more",
     "description": "Label for a button to open a drawer containing additional content."
+  },
+  "107": {
+    "string": "Already a subscriber?",
+    "description": "Label for checking if the user is already a subscriber of the publisher site or not."
+  },
+  "108": {
+    "string": "Sign in",
+    "description": "Label for the sign in button to redirect users to publisher site to sign in."
+  },
+  "109": {
+    "string": "Subscribe with",
+    "description": "Button label prompting users to subscribe with the publisher."
+  },
+  "110": {
+    "string": "Subscribe with Google",
+    "description": "Button label prompting users to subscribe with the publisher via SwG."
+  },
+  "111": {
+    "string": "Captions on",
+    "description": "Label for the captions button that indicates the captions are turned on"
+  },
+  "112": {
+    "string": "Captions off",
+    "description": "Label for the captions button that indicates the captions are turned off"
+  },
+  "113": {
+    "string": "Skip",
+    "description": "Button label prompting users to exit paywall and potentially go to the next story."
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/es-419.json b/extensions/amp-story/1.0/_locales/es-419.json
index 9e6d12ab6ef8..cf2e818a2d44 100644
--- a/extensions/amp-story/1.0/_locales/es-419.json
+++ b/extensions/amp-story/1.0/_locales/es-419.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Obtener enlace"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Más"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Para ver este contenido, debes habilitar el experimento en amp-story."
-  },
   "21": {
     "string": "Lo sentimos, parece que esta experiencia no está disponible para su navegador"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Continuar de todas formas"
   },
-  "31": {
-    "string": "Sonido desactivado"
-  },
-  "32": {
-    "string": "Sonido activado"
-  },
-  "33": {
-    "string": "Esta página no tiene sonido"
-  },
   "34": {
     "string": "Reproducir video"
   },
   "35": {
     "string": "Deslizar el dedo hacia arriba"
   },
-  "36": {
-    "string": "Mostrar tuit"
-  },
-  "62": {
-    "string": "Compartir a partir de esta página"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Compartir historia"
   },
-  "70": {
-    "string": "Alternar el menú de la historia"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Consejo"
   },
-  "82": {
-    "string": "Página anterior"
-  },
   "83": {
     "string": "Activar"
   },
@@ -184,5 +154,17 @@
   },
   "97": {
     "string": "Abriendo..."
+  },
+  "98": {
+    "string": "No se envió el formulario, intenta de nuevo"
+  },
+  "99": {
+    "string": "El formulario se envió correctamente"
+  },
+  "101": {
+    "string": "Comprar ahora"
+  },
+  "110": {
+    "string": "Suscríbete con Google"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/es.json b/extensions/amp-story/1.0/_locales/es.json
index 1a6ad4c83dcf..85225902104f 100644
--- a/extensions/amp-story/1.0/_locales/es.json
+++ b/extensions/amp-story/1.0/_locales/es.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Obtener enlace"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Más"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Para ver este contenido, debes habilitar el experimento de amp-story."
-  },
   "21": {
     "string": "Parece que esta experiencia no está disponible para tu navegador"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Continuar de todos modos"
   },
-  "31": {
-    "string": "Sonido desactivado"
-  },
-  "32": {
-    "string": "Sonido activado"
-  },
-  "33": {
-    "string": "Esta página no tiene sonido"
-  },
   "34": {
     "string": "Reproducir vídeo"
   },
   "35": {
     "string": "Deslizar el dedo hacia arriba"
   },
-  "36": {
-    "string": "Mostrar tuit"
-  },
-  "62": {
-    "string": "Compartir a partir de esta página"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Compartir historia"
   },
-  "70": {
-    "string": "Alternar menú de la historia"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Consejo"
   },
-  "82": {
-    "string": "Página anterior"
-  },
   "83": {
     "string": "Activar"
   },
@@ -184,5 +154,17 @@
   },
   "97": {
     "string": "Abriendo..."
+  },
+  "98": {
+    "string": "Formulario no enviado. Inténtalo de nuevo"
+  },
+  "99": {
+    "string": "Formulario enviado correctamente"
+  },
+  "101": {
+    "string": "Comprar ahora"
+  },
+  "110": {
+    "string": "Suscríbete con Google"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/et.json b/extensions/amp-story/1.0/_locales/et.json
index 5a1476bf72b6..25efe1e6b952 100644
--- a/extensions/amp-story/1.0/_locales/et.json
+++ b/extensions/amp-story/1.0/_locales/et.json
@@ -1,4 +1,25 @@
 {
+  "2": {
+    "string": "Toksake valikut Järgmine"
+  },
+  "3": {
+    "string": "Toksake valikut Tagasi"
+  },
+  "4": {
+    "string": "Linki ei saanud lõikelauale kopeerida :("
+  },
+  "5": {
+    "string": "Link on kopeeritud!"
+  },
+  "6": {
+    "string": "E-post"
+  },
+  "7": {
+    "string": "Facebook"
+  },
+  "9": {
+    "string": "Hangi link"
+  },
   "10": {
     "string": "LinkedIn"
   },
@@ -8,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Veel"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -20,12 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Selle sisu vaatamiseks peate lubama amp-story kogemuse."
-  },
-  "2": {
-    "string": "Toksake valikut Järgmine"
-  },
   "21": {
     "string": "Vabandame, kahjuks ei saa teie brauseris seda lugu vaadata"
   },
@@ -44,39 +56,12 @@
   "27": {
     "string": "Jätka sellegipoolest"
   },
-  "3": {
-    "string": "Toksake valikut Tagasi"
-  },
-  "31": {
-    "string": "Heli välja"
-  },
-  "32": {
-    "string": "Heli sisse"
-  },
-  "33": {
-    "string": "Sellel lehel pole heli"
-  },
   "34": {
     "string": "Esita video"
   },
   "35": {
     "string": "Pühkige üles"
   },
-  "36": {
-    "string": "Laiendage säutsu"
-  },
-  "4": {
-    "string": "Linki ei saanud lõikelauale kopeerida :("
-  },
-  "5": {
-    "string": "Link on kopeeritud!"
-  },
-  "6": {
-    "string": "E-post"
-  },
-  "62": {
-    "string": "Jaga alates sellest lehest"
-  },
   "63": {
     "string": "Line"
   },
@@ -98,12 +83,6 @@
   "69": {
     "string": "Jaga lugu"
   },
-  "7": {
-    "string": "Facebook"
-  },
-  "70": {
-    "string": "Ava/peida loo menüü"
-  },
   "71": {
     "string": "A"
   },
@@ -131,18 +110,12 @@
   "79": {
     "string": "Nipsake, et liikuda järgmise loo juurde"
   },
-  "8": {
-    "string": "Google+"
-  },
   "80": {
     "string": "Sain aru"
   },
   "81": {
     "string": "Näpunäide"
   },
-  "82": {
-    "string": "Eelmine leht"
-  },
   "83": {
     "string": "Aktiveeri"
   },
@@ -164,9 +137,6 @@
   "89": {
     "string": "Teie vastus saadetakse aadressile"
   },
-  "9": {
-    "string": "Hangi link"
-  },
   "90": {
     "string": "Järgmine lugu"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "Avamine"
+  },
+  "98": {
+    "string": "Vormi ei esitatud, proovige uuesti"
+  },
+  "99": {
+    "string": "Vorm on esitatud"
+  },
+  "101": {
+    "string": "Osta kohe"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/eu.json b/extensions/amp-story/1.0/_locales/eu.json
index e40d5e5c64d7..f9ba737ed8d5 100644
--- a/extensions/amp-story/1.0/_locales/eu.json
+++ b/extensions/amp-story/1.0/_locales/eu.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Lortu esteka"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Gehiago"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Eduki hau ikusteko, amp-story esperimentua gaitu behar duzu."
-  },
   "21": {
     "string": "Zure arakatzaileak ez du onartzen eduki hau"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Jarraitu halere"
   },
-  "31": {
-    "string": "Desaktibatu da audioa"
-  },
-  "32": {
-    "string": "Aktibatu da audioa"
-  },
-  "33": {
-    "string": "Orriak ez du audiorik"
-  },
   "34": {
     "string": "Erreproduzitu bideoa"
   },
   "35": {
     "string": "Pasatu hatza gora"
   },
-  "36": {
-    "string": "Zabaldu txioa"
-  },
-  "62": {
-    "string": "Partekatu orri honetatik aurrera"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Partekatu istorioa"
   },
-  "70": {
-    "string": "Aktibatu/Desaktibatu istorioaren menua"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Aholkua"
   },
-  "82": {
-    "string": "Aurreko orria"
-  },
   "83": {
     "string": "Aktibatu"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "Irekitzen"
+  },
+  "98": {
+    "string": "Inprimakia ez da bidali. Saiatu berriro."
+  },
+  "99": {
+    "string": "Bidali da inprimakia"
+  },
+  "101": {
+    "string": "Erosi"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/fa.json b/extensions/amp-story/1.0/_locales/fa.json
index 76ad3ca18f8b..1e5e1437205c 100644
--- a/extensions/amp-story/1.0/_locales/fa.json
+++ b/extensions/amp-story/1.0/_locales/fa.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "فیس‌بوک"
   },
-  "8": {
-    "string": "گوگل پلاس"
-  },
   "9": {
     "string": "دریافت پیوند"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "پیامک"
   },
-  "13": {
-    "string": "بیشتر"
-  },
   "14": {
     "string": "تامبلر"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "واتساپ"
   },
-  "19": {
-    "string": "برای مشاهده این محتوا باید تجربه استوری amp را فعال کنید."
-  },
   "21": {
     "string": "متأسفیم، به نظر می‌رسد مرورگرتان از این تجربه پشتیبانی نمی‌کند"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "به‌هرحال ادامه یابد"
   },
-  "31": {
-    "string": "قطع صدا"
-  },
-  "32": {
-    "string": "وصل صدا"
-  },
-  "33": {
-    "string": "این صفحه صدا ندارد"
-  },
   "34": {
     "string": "پخش ویدیو"
   },
   "35": {
     "string": "کشیدن به بالا"
   },
-  "36": {
-    "string": "گسترش توییت"
-  },
-  "62": {
-    "string": "اشتراک‌گذاری را از این صفحه شروع کنید"
-  },
   "63": {
     "string": "لاین"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "اشتراک‌گذاری استوری"
   },
-  "70": {
-    "string": "تغییر منوی استوری"
-  },
   "71": {
     "string": "آ"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "نکته"
   },
-  "82": {
-    "string": "صفحه قبلی"
-  },
   "83": {
     "string": "فعال کردن"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "باز کردن"
+  },
+  "98": {
+    "string": "فرم ارسال نشد، دوباره امتحان کنید"
+  },
+  "99": {
+    "string": "فرم با موفقیت ارسال شد"
+  },
+  "101": {
+    "string": "اکنون خرید کنید"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/fi.json b/extensions/amp-story/1.0/_locales/fi.json
index 04b8679afb42..7bb7424d3dd3 100644
--- a/extensions/amp-story/1.0/_locales/fi.json
+++ b/extensions/amp-story/1.0/_locales/fi.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Hae linkki"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "Tekstiviesti"
   },
-  "13": {
-    "string": "Lisää"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Sinun täytyy ottaa AMP-tarinakokeilu käyttöön, jotta voit tarkastella tätä sisältöä."
-  },
   "21": {
     "string": "Valitettavasti selaimesi ei tue tätä ominaisuutta"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Jatka silti"
   },
-  "31": {
-    "string": "Äänet pois käytöstä"
-  },
-  "32": {
-    "string": "Äänet käytössä"
-  },
-  "33": {
-    "string": "Tällä sivulla ei ole ääntä"
-  },
   "34": {
     "string": "Toista video"
   },
   "35": {
     "string": "Pyyhkäise ylös"
   },
-  "36": {
-    "string": "Laajenna tviitti"
-  },
-  "62": {
-    "string": "Jaa tältä sivulta alkaen"
-  },
   "63": {
     "string": "LINE"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Jaa tarina"
   },
-  "70": {
-    "string": "Avaa tarinan valikko"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Vinkki"
   },
-  "82": {
-    "string": "Edellinen sivu"
-  },
   "83": {
     "string": "Aktivoi"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "Avataan"
+  },
+  "98": {
+    "string": "Lomaketta ei lähetetty, yritä uudelleen"
+  },
+  "99": {
+    "string": "Lomake lähetettiin"
+  },
+  "101": {
+    "string": "Osta nyt"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/fil.json b/extensions/amp-story/1.0/_locales/fil.json
index 286d9a213ac0..0feb8d132a1f 100644
--- a/extensions/amp-story/1.0/_locales/fil.json
+++ b/extensions/amp-story/1.0/_locales/fil.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Kunin ang Link"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Higit pa"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Kailangan mong i-enable ang amp-story experiment para makita ang content na ito."
-  },
   "21": {
     "string": "Paumanhin, mukhang hindi sinusuportahan ng browser mo ang karanasang ito"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Magpatuloy Pa Rin"
   },
-  "31": {
-    "string": "I-off ang Tunog"
-  },
-  "32": {
-    "string": "I-on ang Tunog"
-  },
-  "33": {
-    "string": "Walang tunog ang page na ito"
-  },
   "34": {
     "string": "I-play ang video"
   },
   "35": {
     "string": "Mag-swipe pataas"
   },
-  "36": {
-    "string": "I-expand ang Tweet"
-  },
-  "62": {
-    "string": "Ibahagi simula sa page na ito"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Ibahagi ang kwento"
   },
-  "70": {
-    "string": "I-toggle ang menu ng kwento"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Tip"
   },
-  "82": {
-    "string": "Nakaraang page"
-  },
   "83": {
     "string": "I-activate"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "Binubuksan"
+  },
+  "98": {
+    "string": "Hindi naisumite ang form, subukan ulit"
+  },
+  "99": {
+    "string": "Matagumpay na naisumite ang form"
+  },
+  "101": {
+    "string": "Mag-shop Ngayon"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/fr.json b/extensions/amp-story/1.0/_locales/fr.json
index 9702e3198285..98f62419944e 100644
--- a/extensions/amp-story/1.0/_locales/fr.json
+++ b/extensions/amp-story/1.0/_locales/fr.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Obtenir le lien"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Plus"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Vous devez activer l'expérience amp-story pour voir ce contenu."
-  },
   "21": {
     "string": "Nous sommes désolés, mais votre navigateur n'est pas compatible avec cette expérience"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Continuer quand même"
   },
-  "31": {
-    "string": "Son désactivé"
-  },
-  "32": {
-    "string": "Son activé"
-  },
-  "33": {
-    "string": "Cette page n'a pas de son"
-  },
   "34": {
     "string": "Regarder la vidéo"
   },
   "35": {
     "string": "Balayer l'écran vers le haut"
   },
-  "36": {
-    "string": "Développer le tweet"
-  },
-  "62": {
-    "string": "Partager à partir de cette page"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Partager l'histoire"
   },
-  "70": {
-    "string": "Afficher le menu de l'histoire"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Astuce"
   },
-  "82": {
-    "string": "Page précédente"
-  },
   "83": {
     "string": "Activer"
   },
@@ -184,5 +154,17 @@
   },
   "97": {
     "string": "Ouverture"
+  },
+  "98": {
+    "string": "Formulaire non envoyé, réessayez"
+  },
+  "99": {
+    "string": "Formulaire envoyé avec succès"
+  },
+  "101": {
+    "string": "Acheter maintenant"
+  },
+  "110": {
+    "string": "S'abonner avec Google"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/gl.json b/extensions/amp-story/1.0/_locales/gl.json
index 8011066183c5..693908df427e 100644
--- a/extensions/amp-story/1.0/_locales/gl.json
+++ b/extensions/amp-story/1.0/_locales/gl.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Obter ligazón"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Máis"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Para ver este contido, debes activar o experimento amp-story."
-  },
   "21": {
     "string": "Sentímolo, pero semella que o teu navegador non é compatible con esta experiencia"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Continuar de todas formas"
   },
-  "31": {
-    "string": "Son desactivado"
-  },
-  "32": {
-    "string": "Son activado"
-  },
-  "33": {
-    "string": "Esta páxina non ten son"
-  },
   "34": {
     "string": "Reproducir vídeo"
   },
   "35": {
     "string": "Deslizar cara enriba"
   },
-  "36": {
-    "string": "Mostrar todo"
-  },
-  "62": {
-    "string": "Compartir a partir desta páxina"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Compartir historia"
   },
-  "70": {
-    "string": "Mostrar o menú da historia"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Consello"
   },
-  "82": {
-    "string": "Páxina anterior"
-  },
   "83": {
     "string": "Activar"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "Abrindo"
+  },
+  "98": {
+    "string": "Formulario non enviado, reinténtao"
+  },
+  "99": {
+    "string": "Formulario enviado correctamente"
+  },
+  "101": {
+    "string": "Mercar agora"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/gu.json b/extensions/amp-story/1.0/_locales/gu.json
index 18b22d33681a..b501a0ff1b7a 100644
--- a/extensions/amp-story/1.0/_locales/gu.json
+++ b/extensions/amp-story/1.0/_locales/gu.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "લિંક મેળવો"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "વધુ"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "આ કન્ટેન્ટ જોવા માટે તમારે amp-story નો અનુભવ સક્ષમ કરવો આવશ્યક છે."
-  },
   "21": {
     "string": "માફ કરશો, એવું લાગે છે કે તમારા બ્રાઉઝરમાં આ અનુભવની સુવિધા નથી"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "કોઈપણ રીતે ચાલુ રાખો"
   },
-  "31": {
-    "string": "સાઉન્ડ બંધ છે"
-  },
-  "32": {
-    "string": "સાઉન્ડ ચાલુ છે"
-  },
-  "33": {
-    "string": "આ પેજમાં કોઈ સાઉન્ડ નથી"
-  },
   "34": {
     "string": "વીડિયો ચલાવો"
   },
   "35": {
     "string": "ઉપર સ્વાઇપ કરો"
   },
-  "36": {
-    "string": "ટ્વિટ મોટી કરો"
-  },
-  "62": {
-    "string": "શેર કરવાનું આ પેજથી શરૂ થાય છે"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "સ્ટોરી શેર કરો"
   },
-  "70": {
-    "string": "સ્ટોરી મેનૂને ટૉગલ કરો"
-  },
   "71": {
     "string": "અ"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "ટિપ"
   },
-  "82": {
-    "string": "પાછલું પેજ"
-  },
   "83": {
     "string": "સક્રિય કરો"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "ખુલી રહ્યું છે"
+  },
+  "98": {
+    "string": "ફોર્મ સબમિટ કર્યું નથી, ફરી પ્રયાસ કરો"
+  },
+  "99": {
+    "string": "ફોર્મ સફળતાપૂર્વક સબમિટ કર્યું"
+  },
+  "101": {
+    "string": "હમણાં જ ખરીદો"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/hi.json b/extensions/amp-story/1.0/_locales/hi.json
index 73d384229c58..608acfe8cd3a 100644
--- a/extensions/amp-story/1.0/_locales/hi.json
+++ b/extensions/amp-story/1.0/_locales/hi.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "लिंक पाएं"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "और"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "यह कंटेंट देखने के लिए आपको AMP Story एक्सपेरीमंट चालू करना चाहिए।"
-  },
   "21": {
     "string": "हमें खेद है, ऐसा लगता है कि आपका ब्राउज़र इस वेबपेज को सपोर्ट नहीं करता है"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "फिर भी जारी रखें"
   },
-  "31": {
-    "string": "साउंड बंद"
-  },
-  "32": {
-    "string": "साउंड चालू"
-  },
-  "33": {
-    "string": "इस पेज में कोई साउंड नहीं है"
-  },
   "34": {
     "string": "वीडियो चलाएं"
   },
   "35": {
     "string": "ऊपर स्वाइप करें"
   },
-  "36": {
-    "string": "ट्वीट को विस्तारित करें"
-  },
-  "62": {
-    "string": "इस पेज से शुरू करते हुए शेयर करें"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "स्टोरी शेयर करें"
   },
-  "70": {
-    "string": "टॉगल स्टोरी मेनू"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "टिप"
   },
-  "82": {
-    "string": "पिछला पेज"
-  },
   "83": {
     "string": "सक्रिय करें"
   },
@@ -184,5 +154,17 @@
   },
   "97": {
     "string": "खुल रहा है"
+  },
+  "98": {
+    "string": "फ़ॉर्म सबमिट नहीं हुआ, फिर से कोशिश करें"
+  },
+  "99": {
+    "string": "फ़ॉर्म सफलतापूर्वक सबमिट किया गया"
+  },
+  "101": {
+    "string": "अभी खरीदें"
+  },
+  "110": {
+    "string": "Google के ज़रिये सदस्यता"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/hr.json b/extensions/amp-story/1.0/_locales/hr.json
index b321c0de9dc8..3ce1d8b661ee 100644
--- a/extensions/amp-story/1.0/_locales/hr.json
+++ b/extensions/amp-story/1.0/_locales/hr.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Nabavite poveznicu"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Više"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Morate omogućiti ovaj amp-story eksperiment za gledanje ovog sadržaja."
-  },
   "21": {
     "string": "Na žalost, čini se da Vaš pretraživač ne podržava ovo iskustvo"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Svejedno nastavi"
   },
-  "31": {
-    "string": "Zvuk isključen"
-  },
-  "32": {
-    "string": "Zvuk uključen"
-  },
-  "33": {
-    "string": "Ova stranica nema zvuka"
-  },
   "34": {
     "string": "Reproduciraj videozapis"
   },
   "35": {
     "string": "Prijeđite prstom prema gore"
   },
-  "36": {
-    "string": "Proširi Tweet"
-  },
-  "62": {
-    "string": "Podijelite, počevši s ovom stranicom"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Podijelite priču"
   },
-  "70": {
-    "string": "Promijenite izbornik priča"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Savjet"
   },
-  "82": {
-    "string": "Prethodna stranica"
-  },
   "83": {
     "string": "Aktiviraj"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "Otvaram"
+  },
+  "98": {
+    "string": "Obrazac nije poslan, pokušajte ponovno"
+  },
+  "99": {
+    "string": "Obrazac je uspješno poslan"
+  },
+  "101": {
+    "string": "Kupujte sada"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/hu.json b/extensions/amp-story/1.0/_locales/hu.json
index 17cb0d8f9cb3..49de766fb4a6 100644
--- a/extensions/amp-story/1.0/_locales/hu.json
+++ b/extensions/amp-story/1.0/_locales/hu.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Link mutatása"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Több"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "A tartalom megtekintéséhez engedélyeznie kell az amp-történet kísérletet."
-  },
   "21": {
     "string": "Sajnos úgy tűnik, a böngészője nem támogatja ezt a látványt"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Folytatás mindenképp"
   },
-  "31": {
-    "string": "Hang kikapcsolva"
-  },
-  "32": {
-    "string": "Hang bekapcsolva"
-  },
-  "33": {
-    "string": "Ezen az oldalon nincs hang"
-  },
   "34": {
     "string": "Videó lejátszása"
   },
   "35": {
     "string": "Csúsztatás felfelé"
   },
-  "36": {
-    "string": "Tweet kibontása"
-  },
-  "62": {
-    "string": "Megosztás ettől az oldaltól kezdve"
-  },
   "63": {
     "string": "Vonal"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Történet megosztása"
   },
-  "70": {
-    "string": "Történet menüváltó gomb"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Tipp"
   },
-  "82": {
-    "string": "Előző oldal"
-  },
   "83": {
     "string": "Aktiválás"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "Megnyitás"
+  },
+  "98": {
+    "string": "Az űrlap nincs elküldve, próbálja újra"
+  },
+  "99": {
+    "string": "Az űrlap sikeresen elküldve"
+  },
+  "101": {
+    "string": "Vásárolj most"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/id.json b/extensions/amp-story/1.0/_locales/id.json
index dd9146f82092..30b17c503e75 100644
--- a/extensions/amp-story/1.0/_locales/id.json
+++ b/extensions/amp-story/1.0/_locales/id.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Dapatkan Tautan"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Selengkapnya"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Anda harus mengaktifkan eksperimen amp-story untuk melihat konten ini."
-  },
   "21": {
     "string": "Maaf, sepertinya browser Anda tidak mendukung pengalaman cerita ini"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Lanjutkan Saja"
   },
-  "31": {
-    "string": "Suara dimatikan"
-  },
-  "32": {
-    "string": "Suara dinyalakan"
-  },
-  "33": {
-    "string": "Halaman ini tidak bersuara"
-  },
   "34": {
     "string": "Putar video"
   },
   "35": {
     "string": "Usap ke atas"
   },
-  "36": {
-    "string": "Perluas Tweet"
-  },
-  "62": {
-    "string": "Bagikan mulai dari halaman ini"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Bagikan cerita"
   },
-  "70": {
-    "string": "Beralih menu cerita"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Kiat"
   },
-  "82": {
-    "string": "Halaman sebelumnya"
-  },
   "83": {
     "string": "Aktifkan"
   },
@@ -184,5 +154,17 @@
   },
   "97": {
     "string": "Pembukaan"
+  },
+  "98": {
+    "string": "Formulir belum dikirim, coba lagi"
+  },
+  "99": {
+    "string": "Formulir berhasil dikirim"
+  },
+  "101": {
+    "string": "Belanja Sekarang"
+  },
+  "110": {
+    "string": "Berlangganan dengan Google"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/index.js b/extensions/amp-story/1.0/_locales/index.js
index 0f7f5dc6d75e..887c3471c8f9 100644
--- a/extensions/amp-story/1.0/_locales/index.js
+++ b/extensions/amp-story/1.0/_locales/index.js
@@ -9,10 +9,10 @@ import LocalizedStringcs from './cs.json' assert {type: 'json'}; // lgtm[js/synt
 import LocalizedStringda from './da.json' assert {type: 'json'}; // lgtm[js/syntax-error]
 import LocalizedStringde from './de.json' assert {type: 'json'}; // lgtm[js/syntax-error]
 import LocalizedStringel from './el.json' assert {type: 'json'}; // lgtm[js/syntax-error]
-import LocalizedStringen from './en.json' assert {type: 'json'}; // lgtm[js/syntax-error]
 import LocalizedStringenGB from './en-GB.json' assert {type: 'json'}; // lgtm[js/syntax-error]
-import LocalizedStringes from './es.json' assert {type: 'json'}; // lgtm[js/syntax-error]
+import LocalizedStringen from './en.json' assert {type: 'json'}; // lgtm[js/syntax-error]
 import LocalizedStringes419 from './es-419.json' assert {type: 'json'}; // lgtm[js/syntax-error]
+import LocalizedStringes from './es.json' assert {type: 'json'}; // lgtm[js/syntax-error]
 import LocalizedStringet from './et.json' assert {type: 'json'}; // lgtm[js/syntax-error]
 import LocalizedStringeu from './eu.json' assert {type: 'json'}; // lgtm[js/syntax-error]
 import LocalizedStringfa from './fa.json' assert {type: 'json'}; // lgtm[js/syntax-error]
diff --git a/extensions/amp-story/1.0/_locales/is.json b/extensions/amp-story/1.0/_locales/is.json
index e962f450d549..c1d9d6747ca0 100644
--- a/extensions/amp-story/1.0/_locales/is.json
+++ b/extensions/amp-story/1.0/_locales/is.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Fá tengil"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Meira"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Þú verður að virkja amp-story tilraunina til að skoða þetta efni."
-  },
   "21": {
     "string": "Því miður virðist vafrinn þinn ekki styðja þetta efni"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Halda samt áfram"
   },
-  "31": {
-    "string": "Slökkt á hljóði"
-  },
-  "32": {
-    "string": "Kveikt á hljóði"
-  },
-  "33": {
-    "string": "Þessi síða hefur ekkert hljóð"
-  },
   "34": {
     "string": "Spila myndskeið"
   },
   "35": {
     "string": "Strjúktu upp"
   },
-  "36": {
-    "string": "Stækka tíst"
-  },
-  "62": {
-    "string": "Deila frá og með þessari síðu"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Deila sögu"
   },
-  "70": {
-    "string": "Sýna/fela söguvalmynd"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Ráð"
   },
-  "82": {
-    "string": "Fyrri síða"
-  },
   "83": {
     "string": "Virkja"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "Opnast"
+  },
+  "98": {
+    "string": "Eyðublað ekki sent inn, reyndu aftur"
+  },
+  "99": {
+    "string": "Eyðublað sent inn"
+  },
+  "101": {
+    "string": "Kaupa núna"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/it.json b/extensions/amp-story/1.0/_locales/it.json
index 7dcce5277c8c..4f039cf1c842 100644
--- a/extensions/amp-story/1.0/_locales/it.json
+++ b/extensions/amp-story/1.0/_locales/it.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Ottieni link"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Altro"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Per visualizzare questo contenuto, abilita l'esperimento amp-story."
-  },
   "21": {
     "string": "Spiacenti, il browser in uso non supporta questa esperienza"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Continua comunque"
   },
-  "31": {
-    "string": "Audio disattivato"
-  },
-  "32": {
-    "string": "Audio attivato"
-  },
-  "33": {
-    "string": "Pagina senza contenuti audio"
-  },
   "34": {
     "string": "Riproduci video"
   },
   "35": {
     "string": "Scorri verso l'alto"
   },
-  "36": {
-    "string": "Espandi Tweet"
-  },
-  "62": {
-    "string": "Condividi a partire da questa pagina"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Condividi storia"
   },
-  "70": {
-    "string": "Interruttore menu storia"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Suggerimento"
   },
-  "82": {
-    "string": "Pagina precedente"
-  },
   "83": {
     "string": "Attiva"
   },
@@ -184,5 +154,17 @@
   },
   "97": {
     "string": "Apertura in corso"
+  },
+  "98": {
+    "string": "Invio del modulo non riuscito, riprova"
+  },
+  "99": {
+    "string": "Invio del modulo riuscito"
+  },
+  "101": {
+    "string": "Acquista ora"
+  },
+  "110": {
+    "string": "Abbonati con Google"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/iw.json b/extensions/amp-story/1.0/_locales/iw.json
index 8f137f64c462..67b53b368346 100644
--- a/extensions/amp-story/1.0/_locales/iw.json
+++ b/extensions/amp-story/1.0/_locales/iw.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "+Google"
-  },
   "9": {
     "string": "קבל קישור"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "עוד"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "לצפייה בתוכן זה, יש להפעיל את ניסוי amp-story."
-  },
   "21": {
     "string": "אנו מצטערים, אך כנראה שהדפדפן שלך לא תומך בחוויה זו"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "המשך בכל זאת"
   },
-  "31": {
-    "string": "הסאונד כבוי"
-  },
-  "32": {
-    "string": "הסאונד מופעל"
-  },
-  "33": {
-    "string": "בדף זה אין סאונד"
-  },
   "34": {
     "string": "הפעל סרטון"
   },
   "35": {
     "string": "החלק למעלה"
   },
-  "36": {
-    "string": "הרחב ציוץ"
-  },
-  "62": {
-    "string": "שתף החל מדף זה"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "שתף סיפור"
   },
-  "70": {
-    "string": "הצג/הסתר את תפריט הסיפור"
-  },
   "71": {
     "string": "א"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "עצה"
   },
-  "82": {
-    "string": "הדף הקודם"
-  },
   "83": {
     "string": "הפעלה"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "מתבצעת פתיחה"
+  },
+  "98": {
+    "string": "הטופס לא נשלח. יש לנסות שוב"
+  },
+  "99": {
+    "string": "הטופס נשלח בהצלחה"
+  },
+  "101": {
+    "string": "לקנות עכשיו"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/ja.json b/extensions/amp-story/1.0/_locales/ja.json
index 59d45438f9e1..073c01da0ffa 100644
--- a/extensions/amp-story/1.0/_locales/ja.json
+++ b/extensions/amp-story/1.0/_locales/ja.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "リンクを取得"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "その他"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "このコンテンツを表示するには、amp-story テストを有効にする必要があります。"
-  },
   "21": {
     "string": "ご利用のブラウザはこのエクスペリエンスに対応していません"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "このまま続行する"
   },
-  "31": {
-    "string": "音声がオフになりました"
-  },
-  "32": {
-    "string": "音声がオンになりました"
-  },
-  "33": {
-    "string": "このページには音声がありません"
-  },
   "34": {
     "string": "動画を再生"
   },
   "35": {
     "string": "上にスワイプ"
   },
-  "36": {
-    "string": "ツイートを展開"
-  },
-  "62": {
-    "string": "このページから共有を開始"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "ストーリーを共有"
   },
-  "70": {
-    "string": "ストーリーメニューの切り替え"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "ヒント"
   },
-  "82": {
-    "string": "前のページ"
-  },
   "83": {
     "string": "有効にする"
   },
@@ -184,5 +154,17 @@
   },
   "97": {
     "string": "開いています"
+  },
+  "98": {
+    "string": "フォームは送信されていません。再試行してください"
+  },
+  "99": {
+    "string": "フォームは正常に送信されました"
+  },
+  "101": {
+    "string": "今すぐ購入"
+  },
+  "110": {
+    "string": "Google で購読"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/ka.json b/extensions/amp-story/1.0/_locales/ka.json
index 222e7c7b649f..6a684a8f96c9 100644
--- a/extensions/amp-story/1.0/_locales/ka.json
+++ b/extensions/amp-story/1.0/_locales/ka.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "ბმულის მიღება"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "მეტი"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "ამ კონტენტის სანახავად თქვენ უნდა ჩართოთ amp-story-ის ექსპერიმენტი."
-  },
   "21": {
     "string": "ვწუხვართ, როგორც ჩანს, თქვენს ბრაუზერს არ აქვს ამ გამოცდილების მხარდაჭერა"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "მაინც გაგრძელება"
   },
-  "31": {
-    "string": "ხმა გამორთულია"
-  },
-  "32": {
-    "string": "ხმა ჩართულია"
-  },
-  "33": {
-    "string": "ამ გვერდს ხმა არ აქვს"
-  },
   "34": {
     "string": "ვიდეოს დაკვრა"
   },
   "35": {
     "string": "აწევა"
   },
-  "36": {
-    "string": "ტვიტის გაშლა"
-  },
-  "62": {
-    "string": "გაზიარების დაწყება ამ გვერდიდან"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "ამბის გაზიარება"
   },
-  "70": {
-    "string": "ამბის მენიუს ჩართვა"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "რჩევა"
   },
-  "82": {
-    "string": "წინა გვერდი"
-  },
   "83": {
     "string": "გააქტიურება"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "იხსნება"
+  },
+  "98": {
+    "string": "ფორმა ჯერ არ გაგზავნილა, კვლავ სცადეთ"
+  },
+  "99": {
+    "string": "ფორმა წარმატებით გაიგზავნა"
+  },
+  "101": {
+    "string": "ახლავე ყიდვა"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/km.json b/extensions/amp-story/1.0/_locales/km.json
index da7cada1f910..aa00b7aaca46 100644
--- a/extensions/amp-story/1.0/_locales/km.json
+++ b/extensions/amp-story/1.0/_locales/km.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "យក​តំណ"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "សារ SMS"
   },
-  "13": {
-    "string": "ច្រើន​ទៀត"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "អ្នក​ត្រូវ​តែ​បើក​ការពិសោធ amp-story ដើម្បី​មើល​ខ្លឹមសារ​នេះ។"
-  },
   "21": {
     "string": "សូម​អភ័យ​ទោស កម្មវិធី​រុករក​តាម​អ៊ីនធឺណិត​របស់​អ្នក​ហាក់​ដូចជា​មិន​អាច​ដំណើរការ​បទពិសោធន៍​ទំព័រ​នេះ​បាន​ទេ"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "មិន​អី​ទេ បន្ត​ចុះ"
   },
-  "31": {
-    "string": "សំឡេង​ត្រូវ​បាន​បិទ"
-  },
-  "32": {
-    "string": "សំឡេង​ត្រូវ​បាន​បើក"
-  },
-  "33": {
-    "string": "ទំព័រ​នេះ​គ្មាន​សំឡេង​ទេ"
-  },
   "34": {
     "string": "ចាក់​វីដេអូ"
   },
   "35": {
     "string": "អូស​ឡើង​លើ"
   },
-  "36": {
-    "string": "ពង្រីក​ធ្វីត"
-  },
-  "62": {
-    "string": "ចែក​រំលែក​ចាប់​ពី​ទំព័រ​នេះ​ទៅ"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "ចែក​រំលែក​រឿង"
   },
-  "70": {
-    "string": "ម៉ឺនុយ​បិទ/បើក​រឿង"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "គន្លឹះ"
   },
-  "82": {
-    "string": "ទំព័រ​មុន"
-  },
   "83": {
     "string": "បើក​ដំណើរការ"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "កំពុង​បើក"
+  },
+  "98": {
+    "string": "មិន​បាន​ដាក់​បញ្ជូន​ទម្រង់​បែបបទ​ទេ សូម​ព្យាយាម​ម្ដង​ទៀត"
+  },
+  "99": {
+    "string": "បាន​ដាក់​បញ្ជូន​ទម្រង់​បែបបទ​ដោយ​ជោគជ័យ"
+  },
+  "101": {
+    "string": "ទិញ​ឥឡូវ"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/kn.json b/extensions/amp-story/1.0/_locales/kn.json
index 7516f49e10b8..2f40a0318517 100644
--- a/extensions/amp-story/1.0/_locales/kn.json
+++ b/extensions/amp-story/1.0/_locales/kn.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "ಲಿಂಕ್ ಪಡೆಯಿರಿ"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "ಇನ್ನಷ್ಟು"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "ಈ ವಿಷಯವನ್ನು ನೋಡಲು ನೀವು amp-story ಪ್ರಯೋಗವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಬೇಕಾಗುತ್ತದೆ."
-  },
   "21": {
     "string": "ಕ್ಷಮಿಸಿ, ನಿಮ್ಮ ಬ್ರೌಸರ್ ಈ ಅನುಭವವನ್ನು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ ಎಂದು ತೋರುತ್ತಿದೆ"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "ಏನೇ ಆದರೂ ಮುಂದುವರೆಸಿ"
   },
-  "31": {
-    "string": "ಧ್ವನಿ ಆಫ್ ಆಗಿದೆ"
-  },
-  "32": {
-    "string": "ಧ್ವನಿ ಆನ್ ಆಗಿದೆ"
-  },
-  "33": {
-    "string": "ಈ ಪುಟವು ಧ್ವನಿಯನ್ನು ಹೊಂದಿಲ್ಲ"
-  },
   "34": {
     "string": "ವೀಡಿಯೊ ಪ್ಲೇ ಮಾಡಿ"
   },
   "35": {
     "string": "ಮೇಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ"
   },
-  "36": {
-    "string": "ಟ್ವೀಟ್ ಅನ್ನು ವಿಸ್ತರಿಸಿ"
-  },
-  "62": {
-    "string": "ಈ ಪುಟದಿಂದ ಪ್ರಾರಂಭಿಸಿ ಹಂಚಿಕೊಳ್ಳಿ"
-  },
   "63": {
     "string": "ಲೈನ್"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "ಸ್ಟೋರಿ ಹಂಚಿಕೊಳ್ಳಿ"
   },
-  "70": {
-    "string": "ಸ್ಟೋರಿ ಮೆನುವನ್ನು ಟಾಗಲ್ ಮಾಡಿ"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "ಸಲಹೆ"
   },
-  "82": {
-    "string": "ಹಿಂದಿನ ಪುಟ"
-  },
   "83": {
     "string": "ಸಕ್ರಿಯಗೊಳಿಸಿ"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "ತೆರೆಯಲಾಗುತ್ತಿದೆ"
+  },
+  "98": {
+    "string": "ಫಾರ್ಮ್ ಅನ್ನು ಸಲ್ಲಿಸಿಲ್ಲ, ಇನ್ನೊಮ್ಮೆ ಪ್ರಯತ್ನಿಸಿ"
+  },
+  "99": {
+    "string": "ಫಾರ್ಮ್ ಅನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಸಲ್ಲಿಸಲಾಗಿದೆ"
+  },
+  "101": {
+    "string": "ಇದೀಗ ಶಾಪಿಂಗ್ ಮಾಡಿ"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/ko.json b/extensions/amp-story/1.0/_locales/ko.json
index 26b6b31e24a6..8893e3fcf865 100644
--- a/extensions/amp-story/1.0/_locales/ko.json
+++ b/extensions/amp-story/1.0/_locales/ko.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "링크 받기"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "기타"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "이 콘텐츠를 보려면 amp-story 실험을 사용하도록 설정해야 합니다."
-  },
   "21": {
     "string": "사용 중인 브라우저에서 이 스토리를 지원하지 않는 것 같습니다."
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "계속하기"
   },
-  "31": {
-    "string": "사운드 꺼짐"
-  },
-  "32": {
-    "string": "사운드 켜짐"
-  },
-  "33": {
-    "string": "이 페이지에는 사운드가 없습니다."
-  },
   "34": {
     "string": "동영상 재생"
   },
   "35": {
     "string": "위로 스와이프"
   },
-  "36": {
-    "string": "트윗 펼치기"
-  },
-  "62": {
-    "string": "이 페이지부터 공유 시작"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "스토리 공유"
   },
-  "70": {
-    "string": "스토리 메뉴 토글"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "팁"
   },
-  "82": {
-    "string": "이전 페이지"
-  },
   "83": {
     "string": "활성화"
   },
@@ -184,5 +154,17 @@
   },
   "97": {
     "string": "여는 중"
+  },
+  "98": {
+    "string": "양식이 제출되지 않았습니다. 다시 시도해 주십시오."
+  },
+  "99": {
+    "string": "양식이 제출되었습니다."
+  },
+  "101": {
+    "string": "지금 구매"
+  },
+  "110": {
+    "string": "Google 을 통한구독"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/lo.json b/extensions/amp-story/1.0/_locales/lo.json
index 866ffa6757cf..05f803e6cda5 100644
--- a/extensions/amp-story/1.0/_locales/lo.json
+++ b/extensions/amp-story/1.0/_locales/lo.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "ຮັບລິ້ງ"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "ເພີ່ມເຕີມ"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "ທ່ານຕ້ອງເປີດນຳໃຊ້ການທົດລອງແບບ amp-story ເພື່ອເບິ່ງເນື້ອຫານີ້."
-  },
   "21": {
     "string": "ພວກເຮົາຂໍອະໄພ,​ ປາກົດວ່າບຣາວເຊີຂອງທ່ານບໍ່ຮອງຮັບປະສົບການນີ້"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "ແນວໃດກໍສືບຕໍ່"
   },
-  "31": {
-    "string": "ປິດສຽງ"
-  },
-  "32": {
-    "string": "ເປີດສຽງ"
-  },
-  "33": {
-    "string": "ໜ້ານີ້ບໍ່ມີສຽງ"
-  },
   "34": {
     "string": "ຫຼິ້ນວິດີໂອ"
   },
   "35": {
     "string": "ປັດຂຶ້ນ"
   },
-  "36": {
-    "string": "ຂະຫຍາຍ Tweet"
-  },
-  "62": {
-    "string": "ແບ່ງປັນເລີ່ມຈາກໜ້ານີ້"
-  },
   "63": {
     "string": "ແຖວ"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "ແບ່ງປັນເລື່ອງລາວ"
   },
-  "70": {
-    "string": "ປິດເປີດເມນູເລື່ອງລາວ"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "ເຄັດລັບ"
   },
-  "82": {
-    "string": "ໜ້າກ່ອນໜ້າ"
-  },
   "83": {
     "string": "ເປີດນຳໃຊ້"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "ກຳລັງເປີດ"
+  },
+  "98": {
+    "string": "ສົ່ງແບບຟອມບໍ່ໄດ້, ກະລຸນາລອງໃໝ່"
+  },
+  "99": {
+    "string": "ສົ່ງແບບຟອມສຳເລັດແລ້ວ"
+  },
+  "101": {
+    "string": "ຊື້ເຄື່ອງຕອນນີ້"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/lt.json b/extensions/amp-story/1.0/_locales/lt.json
index e4a46ca634a6..992032b6b55b 100644
--- a/extensions/amp-story/1.0/_locales/lt.json
+++ b/extensions/amp-story/1.0/_locales/lt.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Gauti nuorodą"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Daugiau"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Turite suaktyvinti „amp-story“ eksperimentą, kad galėtumėte peržiūrėti šį turinį."
-  },
   "21": {
     "string": "Apgailestaujame, bet atrodo, kad jūsų naršyklė šios istorijos nepalaiko"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Vis tiek tęsti"
   },
-  "31": {
-    "string": "Garsas išjungtas"
-  },
-  "32": {
-    "string": "Garsas įjungtas"
-  },
-  "33": {
-    "string": "Nėra šio puslapio garso"
-  },
   "34": {
     "string": "Leisti vaizdo įrašą"
   },
   "35": {
     "string": "Perbraukti aukštyn"
   },
-  "36": {
-    "string": "Išskleisti „Twitter“ įrašą"
-  },
-  "62": {
-    "string": "Bendrinti pradedant šiuo puslapiu"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Bendrinti istoriją"
   },
-  "70": {
-    "string": "Perjungti istorijos meniu"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Patarimas"
   },
-  "82": {
-    "string": "Ankstesnis puslapis"
-  },
   "83": {
     "string": "Aktyvinti"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "Atidaromas"
+  },
+  "98": {
+    "string": "Forma nepateikta, bandykite dar kartą"
+  },
+  "99": {
+    "string": "Forma sėkmingai pateikta"
+  },
+  "101": {
+    "string": "Apsipirkti dabar"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/lv.json b/extensions/amp-story/1.0/_locales/lv.json
index 0bf324cc4233..cecd507ab568 100644
--- a/extensions/amp-story/1.0/_locales/lv.json
+++ b/extensions/amp-story/1.0/_locales/lv.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Saņemt saiti"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "Īsziņa"
   },
-  "13": {
-    "string": "Vairāk"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Lai skaitītu šo saturu, jums ir jāiespējo amp-story eksperiments."
-  },
   "21": {
     "string": "Atvainojiet! Izskatās, ka jūsu pārlūkprogramma neatbalsta šo saturu"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Turpināt"
   },
-  "31": {
-    "string": "Skaņa izslēgta"
-  },
-  "32": {
-    "string": "Skaņa ieslēgta"
-  },
-  "33": {
-    "string": "Šajā lapā nav skaņas"
-  },
   "34": {
     "string": "Atskaņot video"
   },
   "35": {
     "string": "Pavilkt uz augšu"
   },
-  "36": {
-    "string": "Izvērst Twitter ierakstu"
-  },
-  "62": {
-    "string": "Kopīgot, sākot ar šo lapu"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Kopīgot stāstu"
   },
-  "70": {
-    "string": "Pārslēgt stāsta izvēlni"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Ieteikums"
   },
-  "82": {
-    "string": "Iepriekšējā lapa"
-  },
   "83": {
     "string": "Aktivizēt"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "Notiek atvēršana"
+  },
+  "98": {
+    "string": "Veidlapa nav iesniegta, mēģiniet vēlreiz"
+  },
+  "99": {
+    "string": "Veidlapa veiksmīgi iesniegta"
+  },
+  "101": {
+    "string": "Iepirkties"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/mk.json b/extensions/amp-story/1.0/_locales/mk.json
index 924f86322ac7..2a907c013114 100644
--- a/extensions/amp-story/1.0/_locales/mk.json
+++ b/extensions/amp-story/1.0/_locales/mk.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Преземете линк"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Повеќе"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Мора да го овозможите експериментот со amp-story за да се прикаже содржинава."
-  },
   "21": {
     "string": "Жал ни е, се чини дека вашиот прелистувач не ја поддржува цела веб-страница"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Сепак продолжи"
   },
-  "31": {
-    "string": "Исклучен звук"
-  },
-  "32": {
-    "string": "Вклучен звук"
-  },
-  "33": {
-    "string": "Страницава нема звук"
-  },
   "34": {
     "string": "Пушти видео"
   },
   "35": {
     "string": "Повлечете нагоре"
   },
-  "36": {
-    "string": "Проширете го твитот"
-  },
-  "62": {
-    "string": "Споделувајте од оваа страница"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Споделете ја приказната"
   },
-  "70": {
-    "string": "Вклучете/исклучете го менито на приказната"
-  },
   "71": {
     "string": "А"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Совет"
   },
-  "82": {
-    "string": "Претходна страница"
-  },
   "83": {
     "string": "Активирај"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "Се отвора"
+  },
+  "98": {
+    "string": "Формуларот не е поднесен, обидете се повторно"
+  },
+  "99": {
+    "string": "Формуларот е успешно поднесен"
+  },
+  "101": {
+    "string": "Купи сега"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/ml.json b/extensions/amp-story/1.0/_locales/ml.json
index 75065d3119e5..ab30ddc839e4 100644
--- a/extensions/amp-story/1.0/_locales/ml.json
+++ b/extensions/amp-story/1.0/_locales/ml.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "ലിങ്ക് നേടുക"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "കൂടുതൽ"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "ഈ ഉള്ളടക്കം കാണുന്നതിന് നിങ്ങൾ 'amp-story എക്‌സ്‌പെരിമെന്റ്' പ്രവർത്തനസജ്ജമാക്കണം."
-  },
   "21": {
     "string": "ഞങ്ങൾക്ക് ഖേദമുണ്ട്, നിങ്ങളുടെ ബ്രൗസർ ഈ പേജ് അനുഭവത്തെ പിന്തുണയ്ക്കുന്നില്ല"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "എന്തായാലും തുടരുക"
   },
-  "31": {
-    "string": "ശബ്‌ദം ഓഫ്"
-  },
-  "32": {
-    "string": "ശബ്‌ദം ഓൺ"
-  },
-  "33": {
-    "string": "ഈ പേജിന് ശബ്‌ദമില്ല"
-  },
   "34": {
     "string": "വീഡിയോ പ്ലേ ചെയ്യുക"
   },
   "35": {
     "string": "മുകളിലേക്ക് സ്വൈപ്പ് ചെയ്യുക"
   },
-  "36": {
-    "string": "ട്വീറ്റ് വികസിപ്പിക്കുക"
-  },
-  "62": {
-    "string": "ഈ പേജ് മുതൽ പങ്കിടുക"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "സ്റ്റോറി പങ്കിടുക"
   },
-  "70": {
-    "string": "സ്റ്റോറി മെനു തുറക്കുക"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "സൂചന"
   },
-  "82": {
-    "string": "മുമ്പത്തെ പേജ്"
-  },
   "83": {
     "string": "ആക്റ്റിവേറ്റ് ചെയ്യുക"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "തുറക്കുന്നു"
+  },
+  "98": {
+    "string": "ഫോം സമർപ്പിച്ചിട്ടില്ല, വീണ്ടും ശ്രമിക്കുക"
+  },
+  "99": {
+    "string": "ഫോം വിജയകരമായി സമർപ്പിച്ചു"
+  },
+  "101": {
+    "string": "ഇപ്പോൾ ഷോപ്പ് ചെയ്യൂ"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/mn.json b/extensions/amp-story/1.0/_locales/mn.json
index f22156692994..7d633d96364b 100644
--- a/extensions/amp-story/1.0/_locales/mn.json
+++ b/extensions/amp-story/1.0/_locales/mn.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Холбоос авах"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Илүү"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Та энэ контентыг харахын тулд amp түүхийн туршилтыг идэвхжүүлэх ёстой."
-  },
   "21": {
     "string": "Уучлаарай, таны хөтөч энэ хэрэглээг дэмждэггүй бололтой"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Ямар ч үед үргэлжлүүлэх"
   },
-  "31": {
-    "string": "Дуу хаалттай"
-  },
-  "32": {
-    "string": "Дуу нээлттэй"
-  },
-  "33": {
-    "string": "Энэ хуудас дуугүй"
-  },
   "34": {
     "string": "Видео тоглуулах"
   },
   "35": {
     "string": "Дээш шудрах"
   },
-  "36": {
-    "string": "Жиргээг дэлгэх"
-  },
-  "62": {
-    "string": "Энэ хуудсаас эхлэн хуваалцах"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Түүхийг хуваалцах"
   },
-  "70": {
-    "string": "Түүхийн цэсийг нээх"
-  },
   "71": {
     "string": "А"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Зөвлөгөө"
   },
-  "82": {
-    "string": "Өмнөх хуудас"
-  },
   "83": {
     "string": "Идэвхжүүлэх"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "Нээж байна"
+  },
+  "98": {
+    "string": "Маягтыг илгээгээгүй тул дахин оролдоно уу"
+  },
+  "99": {
+    "string": "Маягтыг амжилттай илгээлээ"
+  },
+  "101": {
+    "string": "Одоо дэлгүүр хэсээрэй"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/mr.json b/extensions/amp-story/1.0/_locales/mr.json
index 3af8c7e9b9a7..7cb5b30bb1cd 100644
--- a/extensions/amp-story/1.0/_locales/mr.json
+++ b/extensions/amp-story/1.0/_locales/mr.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "लिंक मिळवा"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "एसएमएस"
   },
-  "13": {
-    "string": "अधिक"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "ही सामग्री पाहण्यासाठी आपण amp-कथा प्रयोग सक्षम करणे आवश्यक आहे."
-  },
   "21": {
     "string": "आम्ही दिलगीर आहोत, असे दिसते आहे की आपला ब्राउझर या अनुभवाचे समर्थन करत नाही"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "तरीही सुरू ठेवा"
   },
-  "31": {
-    "string": "आवाज बंद"
-  },
-  "32": {
-    "string": "आवाज चालू"
-  },
-  "33": {
-    "string": "या पृष्ठास कोणताही आवाज नाही"
-  },
   "34": {
     "string": "व्हिडिओ चालवा"
   },
   "35": {
     "string": "वर स्वाइप करा"
   },
-  "36": {
-    "string": "ट्वीट विस्तृत करा"
-  },
-  "62": {
-    "string": "या पृष्ठापासून सुरुवात करत सामायिक करा"
-  },
   "63": {
     "string": "लाइन"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "कथा सामायिक करा"
   },
-  "70": {
-    "string": "स्टोरी मेन्यूला टॉगल करा"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "टीप"
   },
-  "82": {
-    "string": "मागील पृष्ठ"
-  },
   "83": {
     "string": "सक्रीय करा"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "उघडत आहे"
+  },
+  "98": {
+    "string": "फॉर्म सबमिट केला नाही, पुन्हा प्रयत्न करा"
+  },
+  "99": {
+    "string": "फॉर्म यशस्वीरित्या सबमिट केला"
+  },
+  "101": {
+    "string": "आता खरेदी करा"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/ms.json b/extensions/amp-story/1.0/_locales/ms.json
index 8b326b082304..7dd42068bba5 100644
--- a/extensions/amp-story/1.0/_locales/ms.json
+++ b/extensions/amp-story/1.0/_locales/ms.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Dapatkan Pautan"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Lagi"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Anda mesti mendayakan eksperimen amp-story untuk melihat kandungan ini."
-  },
   "21": {
     "string": "Maaf, nampaknya penyemak imbas anda tidak menyokong pengalaman ini"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Teruskan Juga"
   },
-  "31": {
-    "string": "Bunyi dimatikan"
-  },
-  "32": {
-    "string": "Bunyi dihidupkan"
-  },
-  "33": {
-    "string": "Halaman ini tiada bunyi"
-  },
   "34": {
     "string": "Mainkan video"
   },
   "35": {
     "string": "Leret ke atas"
   },
-  "36": {
-    "string": "Kembangkan Twit"
-  },
-  "62": {
-    "string": "Berkongsi bermula dari halaman ini"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Kongsi cerita"
   },
-  "70": {
-    "string": "Togol menu cerita"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Petua"
   },
-  "82": {
-    "string": "Halaman sebelumnya"
-  },
   "83": {
     "string": "Aktifkan"
   },
@@ -184,5 +154,17 @@
   },
   "97": {
     "string": "Membuka"
+  },
+  "98": {
+    "string": "Borang tidak diserah, cuba lagi"
+  },
+  "99": {
+    "string": "Borang berjaya diserah"
+  },
+  "101": {
+    "string": "Beli-belah Sekarang"
+  },
+  "110": {
+    "string": "Langgan dengan Google"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/my.json b/extensions/amp-story/1.0/_locales/my.json
index b0324288387b..dac8d082d6e1 100644
--- a/extensions/amp-story/1.0/_locales/my.json
+++ b/extensions/amp-story/1.0/_locales/my.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "လင့်ခ်ရယူရန်"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "နောက်ထပ်"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "ဤအကြောင်းအရာကို ကြည့်ရန် amp-story အတွေ့အကြုံကို ဖွင့်ရပါမည်။"
-  },
   "21": {
     "string": "စိတ်မကောင်းပါဘူး၊ သင့်ဘရောက်ဇာသည် ဤအတွေ့အကြုံကို ပံ့ပိုးပေးနိုင်ခြင်း မရှိပါ"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "မည်သို့ပင်ဖြစ်စေ ဆက်လုပ်ရန်"
   },
-  "31": {
-    "string": "အသံပိတ်"
-  },
-  "32": {
-    "string": "အသံဖွင့်"
-  },
-  "33": {
-    "string": "ဤစာမျက်နှာတွင် အသံ မရှိပါ"
-  },
   "34": {
     "string": "ဗီဒီယို ဖွင့်ရန်"
   },
   "35": {
     "string": "အပေါ်သို့ ပွတ်ဆွဲရန်"
   },
-  "36": {
-    "string": "Tweet ကို ဖြန့်ချဲ့ရန်"
-  },
-  "62": {
-    "string": "ဤစာမျက်နှာမှ စတင်၍ ဝေမျှရန်"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "စတိုရီ ဝေမျှရန်"
   },
-  "70": {
-    "string": "စတိုရီ မီနူး အထိန်းခလုတ်"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "အရိပ်အမြွက်"
   },
-  "82": {
-    "string": "ယခင် စာမျက်နှာ"
-  },
   "83": {
     "string": "သက်ဝင်အောင် လုပ်ဆောင်ရန်"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "ဖွင့်နေပါသည်"
+  },
+  "98": {
+    "string": "ဖောင် မတင်ထားပါ၊ ထပ်ကြိုးစားပါ"
+  },
+  "99": {
+    "string": "အောင်မြင်စွာ ဖောင် တင်ပြီး"
+  },
+  "101": {
+    "string": "ယခုပင် ဝယ်ယူလိုက်ပါ"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/ne.json b/extensions/amp-story/1.0/_locales/ne.json
index 66ec7a418321..e953d3bf51b3 100644
--- a/extensions/amp-story/1.0/_locales/ne.json
+++ b/extensions/amp-story/1.0/_locales/ne.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "लिङ्क प्राप्त गर्नुहोस्"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "थप"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "तपाईंले यो सामाग्री हेर्नका लागि amp-story परीक्षण सक्षम गर्नुपर्छ।"
-  },
   "21": {
     "string": "हामीलाई माफ गर्नुहोस्, तपाईंको ब्राउजरले यस अनुभवलाई समर्थन गर्दैन जस्तो देखिन्छ"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "जसरी पनि जारी राख्नुहोस्"
   },
-  "31": {
-    "string": "ध्वनि अफ"
-  },
-  "32": {
-    "string": "ध्वनि अन"
-  },
-  "33": {
-    "string": "यो पृष्ठमा ध्वनि छैन"
-  },
   "34": {
     "string": "भिडियो प्ले गर्नुहोस्"
   },
   "35": {
     "string": "माथि स्वाइप गर्नुहोस्"
   },
-  "36": {
-    "string": "ट्विट विस्तार गर्नुहोस्"
-  },
-  "62": {
-    "string": "यस पृष्ठबाट सुरु गरेर साझा गर्नुहोस्"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "स्टोरी साझा गर्नुहोस्"
   },
-  "70": {
-    "string": "स्टोरी मेनु टगल गर्नुहोस्"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "टिप"
   },
-  "82": {
-    "string": "अघिल्लो पृष्ठ"
-  },
   "83": {
     "string": "सक्रिय गर्नुहोस्"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "खोल्दै"
+  },
+  "98": {
+    "string": "फारम पेश गरिएको छैन, फेरी प्रयास गर्नुहोस्"
+  },
+  "99": {
+    "string": "फारम सफलतापूर्वक पेस गरियो"
+  },
+  "101": {
+    "string": "अहिले किनमेल गर्नुहोस्"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/nl.json b/extensions/amp-story/1.0/_locales/nl.json
index fe13370edfcc..90690878e838 100644
--- a/extensions/amp-story/1.0/_locales/nl.json
+++ b/extensions/amp-story/1.0/_locales/nl.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Link ophalen"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "Sms"
   },
-  "13": {
-    "string": "Meer"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Je moet het amp-story-experiment inschakelen om deze content te bekijken."
-  },
   "21": {
     "string": "Je browser ondersteunt deze ervaring niet"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Toch doorgaan"
   },
-  "31": {
-    "string": "Geluid uit"
-  },
-  "32": {
-    "string": "Geluid aan"
-  },
-  "33": {
-    "string": "Deze pagina heeft geen geluid"
-  },
   "34": {
     "string": "Video afspelen"
   },
   "35": {
     "string": "Omhoog vegen"
   },
-  "36": {
-    "string": "Tweet uitvouwen"
-  },
-  "62": {
-    "string": "Delen vanaf deze pagina"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Verhaal delen"
   },
-  "70": {
-    "string": "Verhaalmenu schakelen"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Tip"
   },
-  "82": {
-    "string": "Vorige pagina"
-  },
   "83": {
     "string": "Activeren"
   },
@@ -184,5 +154,17 @@
   },
   "97": {
     "string": "Wordt geopend"
+  },
+  "98": {
+    "string": "Formulier niet verzonden, probeer het opnieuw"
+  },
+  "99": {
+    "string": "Formulier verzonden"
+  },
+  "101": {
+    "string": "Nu kopen"
+  },
+  "110": {
+    "string": "Abonneren via Google"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/no.json b/extensions/amp-story/1.0/_locales/no.json
index 39bd322540f6..ec1b3fa82c40 100644
--- a/extensions/amp-story/1.0/_locales/no.json
+++ b/extensions/amp-story/1.0/_locales/no.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Hent lenke"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Mer"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Du må aktivere amp-story-eksperimentet for å se innholdet."
-  },
   "21": {
     "string": "Vi beklager! Det virker som om nettleseren din ikke støtter denne opplevelsen"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Fortsett likevel"
   },
-  "31": {
-    "string": "Lyd av"
-  },
-  "32": {
-    "string": "Lyd på"
-  },
-  "33": {
-    "string": "Denne siden har ingen lyd"
-  },
   "34": {
     "string": "Spill av video"
   },
   "35": {
     "string": "Sveip opp"
   },
-  "36": {
-    "string": "Utvid Tweet"
-  },
-  "62": {
-    "string": "Del med start fra denne siden"
-  },
   "63": {
     "string": "Linje"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Del historie"
   },
-  "70": {
-    "string": "Slå på/av historiemeny"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Tips"
   },
-  "82": {
-    "string": "Forrige side"
-  },
   "83": {
     "string": "Aktiver"
   },
@@ -184,5 +154,17 @@
   },
   "97": {
     "string": "Åpner"
+  },
+  "98": {
+    "string": "Skjema ikke sendt inn. Prøv igjen"
+  },
+  "99": {
+    "string": "Skjema sendt inn"
+  },
+  "101": {
+    "string": "Handle nå"
+  },
+  "110": {
+    "string": "Abonner med Google"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/pa.json b/extensions/amp-story/1.0/_locales/pa.json
index 7c2cfcd8df0d..c604c0b2b514 100644
--- a/extensions/amp-story/1.0/_locales/pa.json
+++ b/extensions/amp-story/1.0/_locales/pa.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "ਲਿੰਕ ਪ੍ਰਾਪਤ ਕਰੋ"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "ਹੋਰ"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "ਇਹ ਸਮੱਗਰੀ ਦੇਖਣ ਲਈ ਤੁਹਾਡੇ ਵਾਸਤੇ amp-ਕਹਾਣੀ ਪ੍ਰਯੋਗ ਚਾਲੂ ਕਰਨਾ ਲਾਜ਼ਮੀ ਹੈ।"
-  },
   "21": {
     "string": "ਸਾਨੂੰ ਅਫ਼ਸੋਸ ਹੈ, ਇੰਝ ਲੱਗਦਾ ਹੈ ਕਿ ਤੁਹਾਡਾ ਬ੍ਰਾਊਜ਼ਰ ਇਸ ਅਨੁਭਵ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦਾ"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "ਫੇਰ ਵੀ ਜਾਰੀ ਰੱਖੋ"
   },
-  "31": {
-    "string": "ਸਾਊਂਡ ਬੰਦ"
-  },
-  "32": {
-    "string": "ਸਾਊਂਡ ਚਾਲੂ"
-  },
-  "33": {
-    "string": "ਇਸ ਪੰਨੇ ਵਿੱਚ ਕੋਈ ਸਾਊਂਡ ਨਹੀਂ ਹੈ"
-  },
   "34": {
     "string": "ਵੀਡੀਓ ਚਲਾਓ"
   },
   "35": {
     "string": "ਉੱਪਰ ਸਵਾਈਪ ਕਰੋ"
   },
-  "36": {
-    "string": "ਟਵੀਟ ਦਾ ਵਿਸਤਾਰ ਕਰੋ"
-  },
-  "62": {
-    "string": "ਇਸ ਪੰਨੇ ਤੋਂ ਸ਼ੁਰੂ ਕਰਦੇ ਹੋਏ ਸਾਂਝਾ ਕਰੋ"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "ਕਹਾਣੀ ਸਾਂਝੀ ਕਰੋ"
   },
-  "70": {
-    "string": "ਸਟੋਰੀ ਮੀਨੂ ਟੌਗਲ ਕਰੋ"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "ਨੁਕਤਾ"
   },
-  "82": {
-    "string": "ਪਿਛਲਾ ਪੰਨਾ"
-  },
   "83": {
     "string": "ਕਿਰਿਆਸ਼ੀਲ ਕਰੋ"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "ਖੁੱਲ੍ਹ ਰਿਹਾ ਹੈ"
+  },
+  "98": {
+    "string": "ਫਾਰਮ ਜਮ੍ਹਾਂ ਨਹੀਂ ਹੋਇਆ, ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ"
+  },
+  "99": {
+    "string": "ਫਾਰਮ ਸਫਲਤਾਪੂਰਵਕ ਜਮ੍ਹਾਂ ਕੀਤਾ ਗਿਆ"
+  },
+  "101": {
+    "string": "ਹੁਣੇ ਖਰੀਦੋ"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/pl.json b/extensions/amp-story/1.0/_locales/pl.json
index 16012413f02b..0a0b9d019ae1 100644
--- a/extensions/amp-story/1.0/_locales/pl.json
+++ b/extensions/amp-story/1.0/_locales/pl.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Uzyskaj link"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Więcej"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Aby wyświetlić tę zawartość, musisz włączyć eksperyment ze składnikiem amp-story."
-  },
   "21": {
     "string": "Niestety, Twoja przeglądarka nie obsługuje tej funkcji"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Mimo to kontynuuj"
   },
-  "31": {
-    "string": "Dźwięk wyłączony"
-  },
-  "32": {
-    "string": "Dźwięk włączony"
-  },
-  "33": {
-    "string": "Na tej stronie nie ma dźwięku"
-  },
   "34": {
     "string": "Odtwórz wideo"
   },
   "35": {
     "string": "Przesuń w górę"
   },
-  "36": {
-    "string": "Rozwiń tweet"
-  },
-  "62": {
-    "string": "Udostępnij, zaczynając od tej strony"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Udostępnij relację"
   },
-  "70": {
-    "string": "Przełącz menu relacji"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Wskazówka"
   },
-  "82": {
-    "string": "Poprzednia strona"
-  },
   "83": {
     "string": "Aktywuj"
   },
@@ -184,5 +154,17 @@
   },
   "97": {
     "string": "Otwieranie"
+  },
+  "98": {
+    "string": "Formularz nie został przesłany, spróbuj ponownie"
+  },
+  "99": {
+    "string": "Formularz został przesłany"
+  },
+  "101": {
+    "string": "Kup teraz"
+  },
+  "110": {
+    "string": "Subskrybuj z Google"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/pt-BR.json b/extensions/amp-story/1.0/_locales/pt-BR.json
index 862f3378d35a..180578305b76 100644
--- a/extensions/amp-story/1.0/_locales/pt-BR.json
+++ b/extensions/amp-story/1.0/_locales/pt-BR.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Copiar link"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Mais"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Você precisa ativar o experimento amp-story para ver este conteúdo."
-  },
   "21": {
     "string": "Parece que o navegador não é compatível com esta experiência"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Continuar mesmo assim"
   },
-  "31": {
-    "string": "Som desativado"
-  },
-  "32": {
-    "string": "Som ativado"
-  },
-  "33": {
-    "string": "Esta página não tem som"
-  },
   "34": {
     "string": "Reproduzir vídeo"
   },
   "35": {
     "string": "Deslizar para cima"
   },
-  "36": {
-    "string": "Expandir tweet"
-  },
-  "62": {
-    "string": "Compartilhar a partir desta página"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Compartilhar história"
   },
-  "70": {
-    "string": "Exibir menu da história"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Dica"
   },
-  "82": {
-    "string": "Página anterior"
-  },
   "83": {
     "string": "Ativar"
   },
@@ -184,5 +154,17 @@
   },
   "97": {
     "string": "Abrindo"
+  },
+  "98": {
+    "string": "Formulário não enviado, tente novamente"
+  },
+  "99": {
+    "string": "Formulário enviado com sucesso"
+  },
+  "101": {
+    "string": "Fazer compras agora"
+  },
+  "110": {
+    "string": "Assine com o Google"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/pt-PT.json b/extensions/amp-story/1.0/_locales/pt-PT.json
index 743bcc5f3307..f7027759183c 100644
--- a/extensions/amp-story/1.0/_locales/pt-PT.json
+++ b/extensions/amp-story/1.0/_locales/pt-PT.json
@@ -1,4 +1,25 @@
 {
+  "2": {
+    "string": "Toque em Seguinte"
+  },
+  "3": {
+    "string": "Toque em Anterior"
+  },
+  "4": {
+    "string": "Não foi possível copiar a ligação para a área de transferência :("
+  },
+  "5": {
+    "string": "Ligação copiada!"
+  },
+  "6": {
+    "string": "E-mail"
+  },
+  "7": {
+    "string": "Facebook"
+  },
+  "9": {
+    "string": "Obter ligação"
+  },
   "10": {
     "string": "LinkedIn"
   },
@@ -8,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Mais"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -20,12 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Deve ativar a experiência de amp-story para ver este conteúdo."
-  },
-  "2": {
-    "string": "Toque em Seguinte"
-  },
   "21": {
     "string": "Pedimos desculpa, mas parece que o seu navegador não suporta esta experiência"
   },
@@ -44,39 +56,12 @@
   "27": {
     "string": "Continuar mesmo assim"
   },
-  "3": {
-    "string": "Toque em Anterior"
-  },
-  "31": {
-    "string": "Som desligado"
-  },
-  "32": {
-    "string": "Som ligado"
-  },
-  "33": {
-    "string": "Esta página não tem som"
-  },
   "34": {
     "string": "Reproduzir vídeo"
   },
   "35": {
     "string": "Deslizar para cima"
   },
-  "36": {
-    "string": "Expandir Tweet"
-  },
-  "4": {
-    "string": "Não foi possível copiar a ligação para a área de transferência :("
-  },
-  "5": {
-    "string": "Ligação copiada!"
-  },
-  "6": {
-    "string": "E-mail"
-  },
-  "62": {
-    "string": "Partilhar a partir desta página"
-  },
   "63": {
     "string": "Line"
   },
@@ -98,12 +83,6 @@
   "69": {
     "string": "Partilhar história"
   },
-  "7": {
-    "string": "Facebook"
-  },
-  "70": {
-    "string": "Alternar menu da história"
-  },
   "71": {
     "string": "A"
   },
@@ -131,18 +110,12 @@
   "79": {
     "string": "Deslize para ir para a próxima história"
   },
-  "8": {
-    "string": "Google+"
-  },
   "80": {
     "string": "Compreendi"
   },
   "81": {
     "string": "Dica"
   },
-  "82": {
-    "string": "Página anterior"
-  },
   "83": {
     "string": "Ativar"
   },
@@ -164,9 +137,6 @@
   "89": {
     "string": "A sua resposta será enviada para"
   },
-  "9": {
-    "string": "Obter ligação"
-  },
   "90": {
     "string": "Próxima história"
   },
@@ -184,5 +154,17 @@
   },
   "97": {
     "string": "A abrir"
+  },
+  "98": {
+    "string": "Formulário não submetido, tente novamente"
+  },
+  "99": {
+    "string": "Formulário submetido com sucesso"
+  },
+  "101": {
+    "string": "Comprar agora"
+  },
+  "110": {
+    "string": "Subscrever com o Google"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/ro.json b/extensions/amp-story/1.0/_locales/ro.json
index a60457d7fe31..4e2221291269 100644
--- a/extensions/amp-story/1.0/_locales/ro.json
+++ b/extensions/amp-story/1.0/_locales/ro.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Obțineți linkul"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Mai mult"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Trebuie să activați experimentul amp-story pentru a vizualiza acest conținut."
-  },
   "21": {
     "string": "Ne pare rău, se pare că browserul dvs. nu acceptă această experiență"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Continuați oricum"
   },
-  "31": {
-    "string": "Fără sunet"
-  },
-  "32": {
-    "string": "Cu sunet"
-  },
-  "33": {
-    "string": "Această pagină nu are sunet"
-  },
   "34": {
     "string": "Redați videoclipul"
   },
   "35": {
     "string": "Glisați în sus"
   },
-  "36": {
-    "string": "Extindeți tweetul"
-  },
-  "62": {
-    "string": "Distribuiți începând cu această pagină"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Distribuiți relatarea"
   },
-  "70": {
-    "string": "Alternați meniul relatării"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Sugestie"
   },
-  "82": {
-    "string": "Pagina precedentă"
-  },
   "83": {
     "string": "Activați"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "Se deschide"
+  },
+  "98": {
+    "string": "Formularul nu a fost trimis; încercați din nou"
+  },
+  "99": {
+    "string": "Formularul a fost trimis cu succes"
+  },
+  "101": {
+    "string": "Cumpărați acum"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/ru.json b/extensions/amp-story/1.0/_locales/ru.json
index 17fb12304d56..631b72b98c9e 100644
--- a/extensions/amp-story/1.0/_locales/ru.json
+++ b/extensions/amp-story/1.0/_locales/ru.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Получить ссылку"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Дополнительно"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Для доступа к этому контенту нужно включить эксперимент amp-story."
-  },
   "21": {
     "string": "К сожалению, ваш браузер не поддерживает просмотр веб-историй"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Все равно продолжить"
   },
-  "31": {
-    "string": "Звук выключен"
-  },
-  "32": {
-    "string": "Звук включен"
-  },
-  "33": {
-    "string": "В контенте на странице нет звука"
-  },
   "34": {
     "string": "Воспроизвести видео"
   },
   "35": {
     "string": "Проведите вверх"
   },
-  "36": {
-    "string": "Развернуть твит"
-  },
-  "62": {
-    "string": "Поделиться начиная с текущей страницы"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Поделиться историей"
   },
-  "70": {
-    "string": "Показать/скрыть меню истории"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Совет"
   },
-  "82": {
-    "string": "Предыдущая страница"
-  },
   "83": {
     "string": "Активировать"
   },
@@ -184,5 +154,17 @@
   },
   "97": {
     "string": "Открывается"
+  },
+  "98": {
+    "string": "Форма не отправлена, повторите попытку"
+  },
+  "99": {
+    "string": "Форма отправлена"
+  },
+  "101": {
+    "string": "Перейти в магазин"
+  },
+  "110": {
+    "string": "Подпиcка через Google"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/si.json b/extensions/amp-story/1.0/_locales/si.json
index e5aa9fefcb75..fb107dc23d26 100644
--- a/extensions/amp-story/1.0/_locales/si.json
+++ b/extensions/amp-story/1.0/_locales/si.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "සබැඳිය ලබා ගන්න"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "තවත්"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "මෙම අන්තර්ගතය බැලීමට ඔබ amp-story අත්හදා බැලීම සක්‍රීය කළ යුතුය."
-  },
   "21": {
     "string": "කනගාටුයි, ඔබේ බ්‍රවුසරය මෙම අත්දැකීමට සහාය නොදක්වන බව පෙනේ"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "කෙසේ වෙතත් ඉදිරියට යන්න"
   },
-  "31": {
-    "string": "හඬ ක්‍රියා විරහිතයි"
-  },
-  "32": {
-    "string": "හඬ ක්‍රියාත්මකයි"
-  },
-  "33": {
-    "string": "මෙම පිටුවේ හඬ නොමැත"
-  },
   "34": {
     "string": "වීඩියෝව වාදනය කරන්න"
   },
   "35": {
     "string": "ඉහළට ස්වයිප් කරන්න"
   },
-  "36": {
-    "string": "ට්වීට් පුළුල් කරන්න"
-  },
-  "62": {
-    "string": "මෙම පිටුවෙන් පටන්ගෙන බෙදාගන්න"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "කතාව බෙදා ගන්න"
   },
-  "70": {
-    "string": "කතා මෙනුව ටොගල කරන්න"
-  },
   "71": {
     "string": "අ"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "ඉඟිය"
   },
-  "82": {
-    "string": "පෙර පිටුව"
-  },
   "83": {
     "string": "සක්‍රිය කරන්න"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "විවෘත වෙමින්"
+  },
+  "98": {
+    "string": "පෝරමය ඉදිරිපත් කර නැත, නැවත උත්සාහ කරන්න"
+  },
+  "99": {
+    "string": "පෝරමය සාර්ථකව ඉදිරිපත් කරන ලදි"
+  },
+  "101": {
+    "string": "දැන් සාප්පු යන්න"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/sk.json b/extensions/amp-story/1.0/_locales/sk.json
index 11397979d6b5..541c4847ce9e 100644
--- a/extensions/amp-story/1.0/_locales/sk.json
+++ b/extensions/amp-story/1.0/_locales/sk.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Získať odkaz"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Viac"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Ak chcete zobraziť tento obsah, je potrebné povoliť experiment Príbeh AMP."
-  },
   "21": {
     "string": "Ľutujeme, zdá sa, že váš prehliadač toto prostredie nepodporuje"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Pokračovať napriek tomu"
   },
-  "31": {
-    "string": "Zvuk vypnutý"
-  },
-  "32": {
-    "string": "Zvuk zapnutý"
-  },
-  "33": {
-    "string": "Táto stránka nemá zvuk"
-  },
   "34": {
     "string": "Prehrať video"
   },
   "35": {
     "string": "Potiahnite nahor"
   },
-  "36": {
-    "string": "Rozbaliť tweet"
-  },
-  "62": {
-    "string": "Zdieľanie začína z tejto stránky"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Zdieľať príbeh"
   },
-  "70": {
-    "string": "Prepnúť ponuku príbehu"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Tip"
   },
-  "82": {
-    "string": "Predchádzajúca strana"
-  },
   "83": {
     "string": "Aktivovať"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "Otvára sa"
+  },
+  "98": {
+    "string": "Formulár nebol odoslaný, skúste to znova"
+  },
+  "99": {
+    "string": "Formulár bol úspešne odoslaný"
+  },
+  "101": {
+    "string": "Nakupovať teraz"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/sl.json b/extensions/amp-story/1.0/_locales/sl.json
index 08a6f758d7b8..49e8b7b2c0a2 100644
--- a/extensions/amp-story/1.0/_locales/sl.json
+++ b/extensions/amp-story/1.0/_locales/sl.json
@@ -1,4 +1,25 @@
 {
+  "2": {
+    "string": "Dotaknite se »Naprej«"
+  },
+  "3": {
+    "string": "Dotaknite se »Nazaj«"
+  },
+  "4": {
+    "string": "Povezave ni bilo mogoče kopirati v odložišče :("
+  },
+  "5": {
+    "string": "Povezava kopirana!"
+  },
+  "6": {
+    "string": "E-pošta"
+  },
+  "7": {
+    "string": "Facebook"
+  },
+  "9": {
+    "string": "Pridobi povezavo"
+  },
   "10": {
     "string": "LinkedIn"
   },
@@ -8,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Več"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -20,12 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Če si želite ogledati to vsebino, morate omogočiti preizkus zgodb amp-story."
-  },
-  "2": {
-    "string": "Dotaknite se »Naprej«"
-  },
   "21": {
     "string": "Vaš brskalnik na žalost ne podpira te izkušnje"
   },
@@ -44,39 +56,12 @@
   "27": {
     "string": "Vseeno nadaljuj"
   },
-  "3": {
-    "string": "Dotaknite se »Nazaj«"
-  },
-  "31": {
-    "string": "Zvok je izklopljen"
-  },
-  "32": {
-    "string": "Zvok je vklopljen"
-  },
-  "33": {
-    "string": "Na tej strani ni zvoka"
-  },
   "34": {
     "string": "Predvajaj video"
   },
   "35": {
     "string": "Povleci navzgor"
   },
-  "36": {
-    "string": "Razširi objavo"
-  },
-  "4": {
-    "string": "Povezave ni bilo mogoče kopirati v odložišče :("
-  },
-  "5": {
-    "string": "Povezava kopirana!"
-  },
-  "6": {
-    "string": "E-pošta"
-  },
-  "62": {
-    "string": "Začni deliti s to stranjo"
-  },
   "63": {
     "string": "Line"
   },
@@ -98,12 +83,6 @@
   "69": {
     "string": "Deli zgodbo"
   },
-  "7": {
-    "string": "Facebook"
-  },
-  "70": {
-    "string": "Prikaži/skrij meni za zgodbo"
-  },
   "71": {
     "string": "A"
   },
@@ -131,18 +110,12 @@
   "79": {
     "string": "Povlecite za pomik na naslednjo zgodbo"
   },
-  "8": {
-    "string": "Google+"
-  },
   "80": {
     "string": "Razumem"
   },
   "81": {
     "string": "Namig"
   },
-  "82": {
-    "string": "Prejšnja stran"
-  },
   "83": {
     "string": "Aktiviraj"
   },
@@ -164,9 +137,6 @@
   "89": {
     "string": "Vaš odgovor bo poslan na"
   },
-  "9": {
-    "string": "Pridobi povezavo"
-  },
   "90": {
     "string": "Naslednja zgodba"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "Odpiranje"
+  },
+  "98": {
+    "string": "Obrazec ni poslan, poskusite znova"
+  },
+  "99": {
+    "string": "Obrazec je bil uspešno oddan"
+  },
+  "101": {
+    "string": "Kupi zdaj"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/sq.json b/extensions/amp-story/1.0/_locales/sq.json
index 3e3adc215ef4..1512ba039a00 100644
--- a/extensions/amp-story/1.0/_locales/sq.json
+++ b/extensions/amp-story/1.0/_locales/sq.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Merr lidhjen"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Të tjera"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Duhet të aktivizosh eksperimentin e amp-story për ta parë këtë përmbajtje."
-  },
   "21": {
     "string": "Na vjen keq, por duket se shfletuesi yt nuk e mbështet këtë përvojë"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Vazhdo gjithsesi"
   },
-  "31": {
-    "string": "Pa zë"
-  },
-  "32": {
-    "string": "Me zë"
-  },
-  "33": {
-    "string": "Kjo faqe nuk ka zë"
-  },
   "34": {
     "string": "Luaj videon"
   },
   "35": {
     "string": "Rrëshqit lart"
   },
-  "36": {
-    "string": "Zgjero tweet-in"
-  },
-  "62": {
-    "string": "Ndaj duke filluar nga kjo faqe"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Ndaj historinë"
   },
-  "70": {
-    "string": "Ndërro gjendjen e menysë së historisë"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Këshillë"
   },
-  "82": {
-    "string": "Faqja e mëparshme"
-  },
   "83": {
     "string": "Aktivizo"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "Duke hapur"
+  },
+  "98": {
+    "string": "Formulari nuk u dorëzua, provo përsëri"
+  },
+  "99": {
+    "string": "Formulari u dorëzua me sukses"
+  },
+  "101": {
+    "string": "Bli tani"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/sr.json b/extensions/amp-story/1.0/_locales/sr.json
index 04b515897ed2..86adfb3884ea 100644
--- a/extensions/amp-story/1.0/_locales/sr.json
+++ b/extensions/amp-story/1.0/_locales/sr.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Преузми линк"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Више"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Морате да омогућите експеримент amp-story да бисте прегледали овај садржај."
-  },
   "21": {
     "string": "Жао нам је, изгледа да ваш прегледач не подржава овај садржај"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Ипак настави"
   },
-  "31": {
-    "string": "Звук је искључен"
-  },
-  "32": {
-    "string": "Звук је укључен"
-  },
-  "33": {
-    "string": "Ова страница нема звук"
-  },
   "34": {
     "string": "Репродукуј видео"
   },
   "35": {
     "string": "Превуци нагоре"
   },
-  "36": {
-    "string": "Прошири твит"
-  },
-  "62": {
-    "string": "Подели почев од ове странице"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Подели причу"
   },
-  "70": {
-    "string": "Укључи/искључи мени приче"
-  },
   "71": {
     "string": "А"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Савет"
   },
-  "82": {
-    "string": "Претходна страница"
-  },
   "83": {
     "string": "Активирај"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "Отварање"
+  },
+  "98": {
+    "string": "Образац није послат, покушајте поново"
+  },
+  "99": {
+    "string": "Образац је успешно послат"
+  },
+  "101": {
+    "string": "Купи сада"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/sv.json b/extensions/amp-story/1.0/_locales/sv.json
index 2a711e556eca..0b0fe16b8c58 100644
--- a/extensions/amp-story/1.0/_locales/sv.json
+++ b/extensions/amp-story/1.0/_locales/sv.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Få länk"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Fler"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Du måste aktivera amp-story-experimentet för att visa det här innehållet."
-  },
   "21": {
     "string": "Det verkar dessvärre som om din webbläsare inte stöder den här upplevelsen"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Fortsätt ändå"
   },
-  "31": {
-    "string": "Ljud av"
-  },
-  "32": {
-    "string": "Ljud på"
-  },
-  "33": {
-    "string": "Den här sidan saknar ljud"
-  },
   "34": {
     "string": "Spela video"
   },
   "35": {
     "string": "Svep upp"
   },
-  "36": {
-    "string": "Expandera tweet"
-  },
-  "62": {
-    "string": "Dela med start från den här sidan"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Dela story"
   },
-  "70": {
-    "string": "Öppna/stäng storymeny"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Tips"
   },
-  "82": {
-    "string": "Föregående sida"
-  },
   "83": {
     "string": "Aktivera"
   },
@@ -184,5 +154,17 @@
   },
   "97": {
     "string": "Öppnar"
+  },
+  "98": {
+    "string": "Formuläret har inte skickats, försök igen"
+  },
+  "99": {
+    "string": "Formuläret har skickats in"
+  },
+  "101": {
+    "string": "Shoppa nu"
+  },
+  "110": {
+    "string": "Prenumerera med Google"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/sw.json b/extensions/amp-story/1.0/_locales/sw.json
index 723ebe2f9a98..20a44872ce2f 100644
--- a/extensions/amp-story/1.0/_locales/sw.json
+++ b/extensions/amp-story/1.0/_locales/sw.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Pata Kiungo"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Zaidi"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Sharti uwezeshe jaribio la hadithi za amp ili uone maudhui haya."
-  },
   "21": {
     "string": "Samahani, inaonekana kivinjari chako hakiwezi kutumia huduma hii"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Endelea Hata Hivyo"
   },
-  "31": {
-    "string": "Sauti imezimwa"
-  },
-  "32": {
-    "string": "Sauti imewashwa"
-  },
-  "33": {
-    "string": "Ukurasa huu hauna sauti"
-  },
   "34": {
     "string": "Cheza video"
   },
   "35": {
     "string": "Telezesha juu"
   },
-  "36": {
-    "string": "Panua Tweet"
-  },
-  "62": {
-    "string": "Tuma kuanzia ukurasa huu"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Tuma hadithi"
   },
-  "70": {
-    "string": "Weka menyu ya hadithi"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Kidokezo"
   },
-  "82": {
-    "string": "Ukurasa uliotangulia"
-  },
   "83": {
     "string": "Wezesha"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "Inafungua"
+  },
+  "98": {
+    "string": "Fomu haijatumwa, jaribu tena"
+  },
+  "99": {
+    "string": "Fomu imefaulu kutumwa"
+  },
+  "101": {
+    "string": "Nunua Sasa Hivi"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/ta.json b/extensions/amp-story/1.0/_locales/ta.json
index 28e736b4a78e..4e7fea606d51 100644
--- a/extensions/amp-story/1.0/_locales/ta.json
+++ b/extensions/amp-story/1.0/_locales/ta.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "இணைப்பைப் பெறுக"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "மேலும்"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "இந்த உள்ளடக்கத்தைப் பார்க்க amp-story சோதனையை நீங்கள் செயல்படுத்த வேண்டும்."
-  },
   "21": {
     "string": "மன்னிக்கவும், உங்கள் பிரவுசர் இதை ஆதரிக்கவில்லை போல் தோன்றுகிறது"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "இருந்தாலும் தொடர்க"
   },
-  "31": {
-    "string": "ஒலியை அணைக்கவும்"
-  },
-  "32": {
-    "string": "ஒலியை இயக்கவும்"
-  },
-  "33": {
-    "string": "இந்தப் பக்கத்தில் ஒலி இல்லை"
-  },
   "34": {
     "string": "வீடியோவை இயக்கவும்"
   },
   "35": {
     "string": "மேலே ஸ்வைப் செய்"
   },
-  "36": {
-    "string": "ட்வீட்டை விரிவுபடுத்துக"
-  },
-  "62": {
-    "string": "இந்தப் பக்கத்திலிருந்து பகிரத் தொடங்குக"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "கதையைப் பகிர்க"
   },
-  "70": {
-    "string": "கதை மெனுவை மாற்றுக"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "குறிப்பு"
   },
-  "82": {
-    "string": "முந்தைய பக்கம்"
-  },
   "83": {
     "string": "செயல்படுத்துக"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "தொடக்கம்"
+  },
+  "98": {
+    "string": "படிவம் சமர்ப்பிக்கப்படவில்லை, மீண்டும் முயற்சிக்கவும்"
+  },
+  "99": {
+    "string": "படிவம் வெற்றிகரமாகச் சமர்ப்பிக்கப்பட்டது"
+  },
+  "101": {
+    "string": "இப்போது வாங்குக"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/te.json b/extensions/amp-story/1.0/_locales/te.json
index 09147986ad32..8b19023b1547 100644
--- a/extensions/amp-story/1.0/_locales/te.json
+++ b/extensions/amp-story/1.0/_locales/te.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "లింక్ పొందండి"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "మరిన్ని"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "ఈ విషయం చూడటానికి మీరు తప్పనిసరిగా amp-కథ ప్రయోగాన్ని ప్రారంభించాలి."
-  },
   "21": {
     "string": "మమ్మల్ని క్షమించండి, మీ బ్రౌజర్ ఈ అనుభవానికి మద్దతు ఇచ్చేట్లుగా కనిపించడం లేదు"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "ఏమైనప్పటికి కొనసాగించండి"
   },
-  "31": {
-    "string": "సౌండ్ ఆఫ్ చేయండి"
-  },
-  "32": {
-    "string": "సౌండ్ ఆన్ చేయండి"
-  },
-  "33": {
-    "string": "ఈ పేజీకి సౌండ్ లేదు"
-  },
   "34": {
     "string": "వీడియో ప్లే చేయండి"
   },
   "35": {
     "string": "పైకి స్వైప్ చేయండి"
   },
-  "36": {
-    "string": "ట్వీట్ విస్తరించండి"
-  },
-  "62": {
-    "string": "ఈ పేజీ నుంచి పంచుకోవడం ప్రారంభించండి"
-  },
   "63": {
     "string": "లైన్"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "కథ పంచుకోండి"
   },
-  "70": {
-    "string": "కథ మెనూ టోగుల్ చేయండి"
-  },
   "71": {
     "string": "ఎ"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "చిట్కా"
   },
-  "82": {
-    "string": "మునుపటి పేజీ"
-  },
   "83": {
     "string": "సక్రియం చేయండి"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "తెరుస్తున్నాను"
+  },
+  "98": {
+    "string": "ఫారం సబ్మిట్ చేయలేదు, మళ్లీ ప్రయత్నించండి"
+  },
+  "99": {
+    "string": "ఫారం విజయవంతంగా సబ్మిట్ చేయబడింది"
+  },
+  "101": {
+    "string": "ఇప్పుడే షాపింగ్ చేయండి"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/th.json b/extensions/amp-story/1.0/_locales/th.json
index 1df60e37da53..dad6ab27f65c 100644
--- a/extensions/amp-story/1.0/_locales/th.json
+++ b/extensions/amp-story/1.0/_locales/th.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "รับลิงก์"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "เพิ่มเติม"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "คุณจำเป็นต้องเปิดใช้งานการทดลอง amp-story เพื่อดูเนื้อหานี้"
-  },
   "21": {
     "string": "ขออภัย ดูเหมือนเบราว์เซอร์ของคุณไม่รองรับประสบการณ์นี้"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "ดำเนินการต่อ"
   },
-  "31": {
-    "string": "ปิดเสียง"
-  },
-  "32": {
-    "string": "เปิดเสียง"
-  },
-  "33": {
-    "string": "หน้านี้ไม่มีเสียง"
-  },
   "34": {
     "string": "เล่นวิดีโอ"
   },
   "35": {
     "string": "ปัดขึ้น"
   },
-  "36": {
-    "string": "ขยายทวีต"
-  },
-  "62": {
-    "string": "เริ่มแชร์จากหน้าเพจนี้"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "แชร์เรื่องราว"
   },
-  "70": {
-    "string": "เปิด/ปิดเมนูเรื่องราว"
-  },
   "71": {
     "string": "ก"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "เคล็ดลับ"
   },
-  "82": {
-    "string": "หน้าเพจก่อนหน้า"
-  },
   "83": {
     "string": "เปิดใช้งาน"
   },
@@ -184,5 +154,17 @@
   },
   "97": {
     "string": "กำลังเปิด"
+  },
+  "98": {
+    "string": "ยังไม่ได้ส่งแบบฟอร์ม ลองใหม่อีกครั้ง"
+  },
+  "99": {
+    "string": "ส่งแบบฟอร์มสำเร็จแล้ว"
+  },
+  "101": {
+    "string": "ช็อปเลย"
+  },
+  "110": {
+    "string": "สมัครฟาน Google"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/tr.json b/extensions/amp-story/1.0/_locales/tr.json
index ba6144afb903..9afd22a03999 100644
--- a/extensions/amp-story/1.0/_locales/tr.json
+++ b/extensions/amp-story/1.0/_locales/tr.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Bağlantıyı Al"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Diğer"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Bu içeriği görüntülemek için amp-story deneyini etkinleştirmelisiniz."
-  },
   "21": {
     "string": "Üzgünüz, görünüşe göre tarayıcınız bu deneyimi desteklemiyor"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Yine De Devam Et"
   },
-  "31": {
-    "string": "Ses kapalı"
-  },
-  "32": {
-    "string": "Ses açık"
-  },
-  "33": {
-    "string": "Bu sayfada ses yok"
-  },
   "34": {
     "string": "Video oynat"
   },
   "35": {
     "string": "Yukarı kaydır"
   },
-  "36": {
-    "string": "Tweet'i genişlet"
-  },
-  "62": {
-    "string": "Bu sayfadan başlayarak paylaşın"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Hikayeyi paylaş"
   },
-  "70": {
-    "string": "Hikaye menüsünü aç/kapat"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "İpucu"
   },
-  "82": {
-    "string": "Önceki sayfa"
-  },
   "83": {
     "string": "Etkinleştir"
   },
@@ -184,5 +154,17 @@
   },
   "97": {
     "string": "Açılıyor"
+  },
+  "98": {
+    "string": "Form gönderilmedi, tekrar deneyin"
+  },
+  "99": {
+    "string": "Form başarıyla gönderildi"
+  },
+  "101": {
+    "string": "Şimdi Satın Al"
+  },
+  "110": {
+    "string": "Google ile Abone Ol"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/uk.json b/extensions/amp-story/1.0/_locales/uk.json
index 1a452c34c126..d07f83c7e39b 100644
--- a/extensions/amp-story/1.0/_locales/uk.json
+++ b/extensions/amp-story/1.0/_locales/uk.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Отримати посилання"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Більше"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Щоб переглянути цей вміст, потрібно ввімкнути експеримент amp-story."
-  },
   "21": {
     "string": "Схоже, ваш вебпереглядач не підтримує перегляд цього вмісту"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Усе одно продовжити"
   },
-  "31": {
-    "string": "Звук вимкнено"
-  },
-  "32": {
-    "string": "Звук увімкнено"
-  },
-  "33": {
-    "string": "На цій сторінці немає звуку"
-  },
   "34": {
     "string": "Відтворити відео"
   },
   "35": {
     "string": "Провести вгору"
   },
-  "36": {
-    "string": "Розгорнути твіт"
-  },
-  "62": {
-    "string": "Поділитися з цієї сторінки"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Поділитись історією"
   },
-  "70": {
-    "string": "Показати/приховати меню історії"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Порада"
   },
-  "82": {
-    "string": "Попередня сторінка"
-  },
   "83": {
     "string": "Активувати"
   },
@@ -184,5 +154,17 @@
   },
   "97": {
     "string": "Відкривається"
+  },
+  "98": {
+    "string": "Форму не надіслано – повторіть спробу"
+  },
+  "99": {
+    "string": "Форму надіслано"
+  },
+  "101": {
+    "string": "Купити"
+  },
+  "110": {
+    "string": "Підписатися через Google"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/ur.json b/extensions/amp-story/1.0/_locales/ur.json
index 7de042b5a5e9..ea8a9301d41c 100644
--- a/extensions/amp-story/1.0/_locales/ur.json
+++ b/extensions/amp-story/1.0/_locales/ur.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "لنک حاصل کریں"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "مزید"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "یہ مواد دیکھنے کے لیے آپ کو amp-story تجربے کو فعال کرنا ہوگا۔"
-  },
   "21": {
     "string": "ہمیں افسوس ہے، ایسا لگتا ہے کہ آپ کا براؤزر اس تجربے کو سپورٹ نہیں کرتا ہے"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "بہرصورت جاری رکھیں"
   },
-  "31": {
-    "string": "آواز بند کریں"
-  },
-  "32": {
-    "string": "آواز آن کریں"
-  },
-  "33": {
-    "string": "اس صفحے پر کوئی آواز نہیں ہے"
-  },
   "34": {
     "string": "ویڈیو چلائیں"
   },
   "35": {
     "string": "اوپر سوائپ کریں"
   },
-  "36": {
-    "string": "ٹوئیٹ پھیلائیں"
-  },
-  "62": {
-    "string": "اس صفحے سے شیئر کرنا شروع کریں"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "اسٹوری شیئر کریں"
   },
-  "70": {
-    "string": "اسٹوری کے مینو کو ٹوگل کریں"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "مشورہ"
   },
-  "82": {
-    "string": "گزشتہ صفحہ"
-  },
   "83": {
     "string": "فعال کریں"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "کھل رہا ہے"
+  },
+  "98": {
+    "string": "فارم جمع نہیں ہوا، دوبارہ کوشش کریں"
+  },
+  "99": {
+    "string": "فارم کامیابی سے جمع ہو گیا"
+  },
+  "101": {
+    "string": "ابھی خریدیں"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/vi.json b/extensions/amp-story/1.0/_locales/vi.json
index a43f9fb3399a..e8ae6a3e78ee 100644
--- a/extensions/amp-story/1.0/_locales/vi.json
+++ b/extensions/amp-story/1.0/_locales/vi.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "Nhận Liên kết"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "Thêm"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "Bạn phải bật tính thử nghiệm amp-story để xem nội dung này."
-  },
   "21": {
     "string": "Chúng tôi rất tiếc, có vẻ như trình duyệt của bạn không hỗ trợ trải nghiệm này"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Vẫn tiếp tục"
   },
-  "31": {
-    "string": "Tiếng bị tắt"
-  },
-  "32": {
-    "string": "Tiếng được bật"
-  },
-  "33": {
-    "string": "Trang này không có tiếng"
-  },
   "34": {
     "string": "Phát video"
   },
   "35": {
     "string": "Vuốt lên"
   },
-  "36": {
-    "string": "Mở rộng Tweet"
-  },
-  "62": {
-    "string": "Bắt đầu chia sẻ từ trang này"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Chia sẻ câu chuyện"
   },
-  "70": {
-    "string": "Chuyển đổi menu câu chuyện"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Mẹo"
   },
-  "82": {
-    "string": "Trang trước"
-  },
   "83": {
     "string": "Kích hoạt"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "Đang mở"
+  },
+  "98": {
+    "string": "Biểu mẫu chưa được gửi đi, vui lòng thử lại"
+  },
+  "99": {
+    "string": "Biểu mẫu đã được gửi đi thành công"
+  },
+  "101": {
+    "string": "Mua ngay"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/zh-CN.json b/extensions/amp-story/1.0/_locales/zh-CN.json
index f208537b91de..c9b23cf08ee2 100644
--- a/extensions/amp-story/1.0/_locales/zh-CN.json
+++ b/extensions/amp-story/1.0/_locales/zh-CN.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "获取链接"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "短信"
   },
-  "13": {
-    "string": "更多"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "您必须启用 amp-story 实验才能查看此内容。"
-  },
   "21": {
     "string": "很抱歉，您的浏览器似乎不支持此体验"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "仍然继续"
   },
-  "31": {
-    "string": "关闭声音"
-  },
-  "32": {
-    "string": "开启声音"
-  },
-  "33": {
-    "string": "此网页没有声音"
-  },
   "34": {
     "string": "播放视频"
   },
   "35": {
     "string": "向上滑动"
   },
-  "36": {
-    "string": "展开推文"
-  },
-  "62": {
-    "string": "从此网页开始分享"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "分享故事"
   },
-  "70": {
-    "string": "切换故事菜单"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "提示"
   },
-  "82": {
-    "string": "上一页"
-  },
   "83": {
     "string": "激活"
   },
@@ -184,5 +154,17 @@
   },
   "97": {
     "string": "正在打开"
+  },
+  "98": {
+    "string": "表单未提交，请重试"
+  },
+  "99": {
+    "string": "表单已成功提交"
+  },
+  "101": {
+    "string": "立即选购"
+  },
+  "110": {
+    "string": "通过 Google 订阅"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/zh-TW.json b/extensions/amp-story/1.0/_locales/zh-TW.json
index 4d997859edeb..7b28ae7b42fc 100644
--- a/extensions/amp-story/1.0/_locales/zh-TW.json
+++ b/extensions/amp-story/1.0/_locales/zh-TW.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "Facebook"
   },
-  "8": {
-    "string": "Google+"
-  },
   "9": {
     "string": "取得連結"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "SMS"
   },
-  "13": {
-    "string": "更多"
-  },
   "14": {
     "string": "Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "WhatsApp"
   },
-  "19": {
-    "string": "您必須啟用 amp-story 實驗才能檢視此內容。"
-  },
   "21": {
     "string": "很抱歉，您的瀏覽器似乎不支援此體驗"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "仍要繼續"
   },
-  "31": {
-    "string": "關閉聲音"
-  },
-  "32": {
-    "string": "開啟聲音"
-  },
-  "33": {
-    "string": "此頁面沒有聲音"
-  },
   "34": {
     "string": "播放影片"
   },
   "35": {
     "string": "向上滑動"
   },
-  "36": {
-    "string": "展開推文"
-  },
-  "62": {
-    "string": "從此頁面開始分享"
-  },
   "63": {
     "string": "Line"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "分享故事"
   },
-  "70": {
-    "string": "切換故事選單"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "提示"
   },
-  "82": {
-    "string": "上一頁"
-  },
   "83": {
     "string": "啟用"
   },
@@ -184,5 +154,17 @@
   },
   "97": {
     "string": "正在開啟"
+  },
+  "98": {
+    "string": "表單未提交，請再試一次"
+  },
+  "99": {
+    "string": "表單已成功提交"
+  },
+  "101": {
+    "string": "立即選購"
+  },
+  "110": {
+    "string": "透過 Google 訂閱"
   }
 }
diff --git a/extensions/amp-story/1.0/_locales/zu.json b/extensions/amp-story/1.0/_locales/zu.json
index aeeef8bd348d..8bffb7f5816a 100644
--- a/extensions/amp-story/1.0/_locales/zu.json
+++ b/extensions/amp-story/1.0/_locales/zu.json
@@ -17,9 +17,6 @@
   "7": {
     "string": "U-Facebook"
   },
-  "8": {
-    "string": "U-Google"
-  },
   "9": {
     "string": "Thola Isixhumanisi"
   },
@@ -32,9 +29,6 @@
   "12": {
     "string": "I-SMS"
   },
-  "13": {
-    "string": "Okunye"
-  },
   "14": {
     "string": "U-Tumblr"
   },
@@ -44,9 +38,6 @@
   "16": {
     "string": "U-WhatsApp"
   },
-  "19": {
-    "string": "Kumele uvule ukuhlolwa kwe-amp-story ukuze ubone lokhu okuqukethwe."
-  },
   "21": {
     "string": "Siyaxolisa, kubonakala sengathi isiphequluli sakho asikusekeli lokhu"
   },
@@ -65,27 +56,12 @@
   "27": {
     "string": "Qhubeka Noma Kunjalo"
   },
-  "31": {
-    "string": "Umsindo uvaliwe"
-  },
-  "32": {
-    "string": "Umsindo uvuliwe"
-  },
-  "33": {
-    "string": "Leli khasi alinawo umsindo"
-  },
   "34": {
     "string": "Dlala ividiyo"
   },
   "35": {
     "string": "Swayiphela phezulu"
   },
-  "36": {
-    "string": "Khulisa i-Tweet"
-  },
-  "62": {
-    "string": "Ukwabelana kuqala kuleli khasi"
-  },
   "63": {
     "string": "Ulayini"
   },
@@ -107,9 +83,6 @@
   "69": {
     "string": "Yabelana ngendaba"
   },
-  "70": {
-    "string": "Vula noma uvale imenu yendaba"
-  },
   "71": {
     "string": "A"
   },
@@ -143,9 +116,6 @@
   "81": {
     "string": "Ithiphu"
   },
-  "82": {
-    "string": "Ikhasi eledlule"
-  },
   "83": {
     "string": "Yenza kusebenze"
   },
@@ -184,5 +154,14 @@
   },
   "97": {
     "string": "Iyavula"
+  },
+  "98": {
+    "string": "Ifomu alithunyelwanga, zama futhi"
+  },
+  "99": {
+    "string": "Ifomu lithunyelwe ngempumelelo"
+  },
+  "101": {
+    "string": "Thenga Manje"
   }
 }
diff --git a/extensions/amp-story/1.0/amp-story-access.css b/extensions/amp-story/1.0/amp-story-access.css
deleted file mode 100644
index 7ce37c3813e8..000000000000
--- a/extensions/amp-story/1.0/amp-story-access.css
+++ /dev/null
@@ -1,188 +0,0 @@
-
-
-amp-story-access {
-  position: absolute !important;
-  display: flex !important;
-  flex-direction: column !important;
-  top: 0 !important;
-  left: 0 !important;
-  height: 100% !important;
-  width: 100% !important;
-  z-index: 100003 !important; /** Above the desktop navigation UI. */
-  transform: translate3d(0, 100vh, 0) !important;
-  transition-delay: 0.15s !important;
-  pointer-events: none !important;
-}
-
-/** Allows [amp-access="CONDITION"] rules. */
-amp-story-access[amp-access-hide] {
-  display: none !important;
-}
-
-amp-story-access[type=blocking] {
-  z-index: 100004 !important; /** Above the [type=notification]. */
-}
-
-amp-story-access.i-amphtml-story-access-visible {
-  transform: translate3d(0, 0, 0) !important;
-  transition-delay: 0s !important;
-}
-
-/** Black opacity overlay. Only on blocking story-access. */
-amp-story-access[type=blocking]::before {
-  content: "" !important;
-  position: absolute !important;
-  top: 0 !important;
-  left: 0 !important;
-  height: 100% !important;
-  width: 100% !important;
-  background: #000000 !important;
-  opacity: 0 !important;
-  pointer-events: auto !important;
-  transition: opacity 0.15s cubic-bezier(0.4, 0.0, 1, 1) !important;
-}
-
-amp-story-access[type=blocking].i-amphtml-story-access-visible::before {
-  opacity: 0.55 !important;
-  transition: opacity 0.2s cubic-bezier(0.0, 0.0, 0.2, 1) !important;
-}
-
-.i-amphtml-story-access-overflow {
-  margin-top: auto !important;
-  overflow-y: auto !important;
-  overflow-x: hidden !important;
-  pointer-events: auto !important;
-  /* Enable iOS momentum scrolling. */
-  -webkit-overflow-scrolling: touch !important;
-}
-
-.i-amphtml-story-access-container {
-  position: relative !important;
-  margin: 88px 0 0 !important;
-  padding: 0px !important;
-  background: #FFFFFF !important;
-  border-radius: 8px 8px 0 0 !important;
-  color: rgba(0, 0, 0, 0.87) !important;
-  font-family: 'Roboto', sans-serif !important;
-  overflow: hidden !important;
-  text-align: start !important;
-  transform: translate3d(0, 100%, 0) !important;
-  transition: transform 0.15s cubic-bezier(0.4, 0.0, 1, 1) !important;
-}
-
-.i-amphtml-story-access-visible .i-amphtml-story-access-container {
-  transform: translate3d(0, 0, 0) !important;
-  transition: transform 0.2s cubic-bezier(0.0, 0.0, 0.2, 1) !important;
-}
-
-[type=notification] .i-amphtml-story-access-container {
-  box-shadow: 0 -1px 2px 1px rgba(0, 0, 0, 0.12) !important;
-  max-height: calc(var(--story-page-vh, 1vh) * 20) !important; /** 20vh */
-}
-
-.i-amphtml-story-access-header {
-  position: relative !important;
-  margin: 0 0 48px !important;
-  height: 80px !important;
-  min-height: 80px !important;
-  background: var(--primary-color, #F0F0F0) !important;
-  z-index: 2 !important;
-}
-
-.i-amphtml-story-access-logo {
-  position: absolute !important;
-  bottom: -32px !important;
-  margin-left: -32px !important;
-  left: 50% !important;
-  height: 64px !important;
-  width: 64px !important;
-  background: #F0F0F0 !important;
-  background-position: center !important;
-  background-repeat: no-repeat !important;
-  background-size: contain !important;
-  border-radius: 5px !important;
-}
-
-.i-amphtml-story-access-logo::before {
-  content: "" !important;
-  position: absolute !important;
-  top: -6px !important;
-  bottom: -6px !important;
-  left: -6px !important;
-  right: -6px !important;
-  background: #FFFFFF !important;
-  border-radius: 6px !important;
-  box-shadow: 0 2px 3px rgba(0, 0, 0, 0.12) !important;
-  z-index: -1 !important;
-}
-
-.i-amphtml-story-access-close-button {
-  position: absolute !important;
-  top: 0 !important;
-  right: 0 !important;
-  height: 36px !important;
-  width: 36px !important;
-  color: #757575 !important;
-  cursor: pointer !important;
-  font-size: 24px !important;
-  line-height: 36px !important;
-  text-align: center !important;
-}
-
-.i-amphtml-story-access-content {
-  padding: 16px !important;
-  font-size: 14px !important;
-  z-index: 0 !important;
-}
-
-/**
- * Tablets and desktop UI overrides.
- * Basically triggers for anything bigger than a Pixel XL / iPhone Plus.
- */
-@media (min-width: 420px) {
-  amp-story-access {
-    align-items: center !important;
-    justify-content: center !important;
-  }
-
-  .i-amphtml-story-access-container {
-    margin: 0 !important;
-    width: calc(100vw - 80px) !important;
-    max-width: 800px !important;
-  }
-
-  .i-amphtml-story-access-content {
-    margin: 0 auto !important;
-    max-width: 424px !important; /** Consistent with amp-story-consent. */
-    flex-grow: 1 !important;
-    overflow-y: auto !important;
-  }
-
-  .i-amphtml-story-access-overflow::-webkit-scrollbar,
-  .i-amphtml-story-access-content::-webkit-scrollbar {
-    width: 0px !important;
-    background: transparent !important;
-  }
-
-  [type="blocking"] .i-amphtml-story-access-overflow {
-    margin-top: 0 !important;
-    border-radius: 6px !important;
-    box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.2) !important;
-  }
-
-  [type="blocking"] .i-amphtml-story-access-container {
-    display: flex !important;
-    flex-direction: column !important;
-    max-height: 60vh !important;
-    min-height: 20vh !important;
-    border-radius: 0px !important;
-    opacity: 0 !important;
-    transform: translate3d(0, 0, 0) !important;
-    transition: opacity 0.15s cubic-bezier(0.4, 0.0, 1, 1) !important;
-  }
-
-  [type="blocking"].i-amphtml-story-access-visible .i-amphtml-story-access-container {
-    opacity: 1 !important;
-    transition: opacity 0.2s cubic-bezier(0.0, 0.0, 0.2, 1) !important;
-  }
-}
diff --git a/extensions/amp-story/1.0/amp-story-access.js b/extensions/amp-story/1.0/amp-story-access.js
deleted file mode 100644
index e1d96827c587..000000000000
--- a/extensions/amp-story/1.0/amp-story-access.js
+++ /dev/null
@@ -1,293 +0,0 @@
-import * as Preact from '#core/dom/jsx';
-import {
-  Action,
-  StateProperty,
-  getStoreService,
-} from './amp-story-store-service';
-import {Layout} from '#core/dom/layout';
-import {closest} from '#core/dom/query';
-import {copyChildren, removeChildren} from '#core/dom';
-import {dev, user} from '#utils/log';
-import {getStoryAttributeSrc} from './utils';
-import {isArray, isObject} from '#core/types';
-import {parseJson} from '#core/types/object/json';
-import {setImportantStyles} from '#core/dom/style';
-
-/** @const {string} */
-const TAG = 'amp-story-access';
-
-/**
- * @enum {string}
- */
-export const Type = {
-  BLOCKING: 'blocking',
-  NOTIFICATION: 'notification',
-};
-
-/**
- * Story access blocking type template.
- * @return {!Element}
- */
-const renderBlockingElement = () => {
-  return (
-    <div class="i-amphtml-story-access-overflow">
-      <div class="i-amphtml-story-access-container">
-        <div class="i-amphtml-story-access-header">
-          <div class="i-amphtml-story-access-logo"></div>
-        </div>
-        <div class="i-amphtml-story-access-content"></div>
-      </div>
-    </div>
-  );
-};
-
-/**
- * Story access notification type template.
- * @return {!Element}
- */
-const renderNotificationElement = () => {
-  return (
-    <div class="i-amphtml-story-access-overflow">
-      <div class="i-amphtml-story-access-container">
-        <div class="i-amphtml-story-access-content">
-          <span class="i-amphtml-story-access-close-button" role="button">
-            &times;
-          </span>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-/**
- * The <amp-story-access> custom element.
- */
-export class AmpStoryAccess extends AMP.BaseElement {
-  /** @param {!AmpElement} element */
-  constructor(element) {
-    super(element);
-
-    /** @private {?Element} */
-    this.containerEl_ = null;
-
-    /** @private @const {!./amp-story-store-service.AmpStoryStoreService} */
-    this.storeService_ = getStoreService(this.win);
-  }
-
-  /** @override */
-  buildCallback() {
-    // Defaults to blocking paywall.
-    if (!this.element.hasAttribute('type')) {
-      this.element.setAttribute('type', Type.BLOCKING);
-    }
-
-    const drawerEl = this.renderDrawerEl_();
-
-    this.containerEl_ = dev().assertElement(
-      drawerEl.querySelector('.i-amphtml-story-access-container')
-    );
-    const contentEl = dev().assertElement(
-      drawerEl.querySelector('.i-amphtml-story-access-content')
-    );
-
-    copyChildren(this.element, contentEl);
-    removeChildren(this.element);
-
-    this.element.appendChild(drawerEl);
-
-    this.allowlistActions_();
-
-    this.initializeListeners_();
-  }
-
-  /** @override */
-  isLayoutSupported(layout) {
-    return layout == Layout.CONTAINER;
-  }
-
-  /**
-   * @private
-   */
-  initializeListeners_() {
-    this.storeService_.subscribe(StateProperty.ACCESS_STATE, (isAccess) => {
-      this.onAccessStateChange_(isAccess);
-    });
-
-    this.storeService_.subscribe(
-      StateProperty.CURRENT_PAGE_INDEX,
-      (currentPageIndex) => {
-        this.onCurrentPageIndexChange_(currentPageIndex);
-      },
-      true /** callToInitialize */
-    );
-
-    this.element.addEventListener('click', (event) => this.onClick_(event));
-  }
-
-  /**
-   * Reacts to access state updates, and shows/hides the UI accordingly.
-   * @param {boolean} isAccess
-   * @private
-   */
-  onAccessStateChange_(isAccess) {
-    if (this.getType_() === Type.BLOCKING) {
-      this.toggle_(isAccess);
-    }
-  }
-
-  /**
-   * Reacts to story active page index update, and maybe display the
-   * "notification" story-access.
-   * @param {number} currentPageIndex
-   */
-  onCurrentPageIndexChange_(currentPageIndex) {
-    if (this.getType_() === Type.NOTIFICATION) {
-      // Only show the notification if on the first page of the story.
-      // Note: this can be overriden by an amp-access attribute that might
-      // show/hide the notification based on the user's authorizations.
-      this.toggle_(currentPageIndex === 0);
-    }
-  }
-
-  /**
-   * Handles click events and maybe closes the paywall.
-   * @param {!Event} event
-   * @return {*} TODO(#23582): Specify return type
-   * @private
-   */
-  onClick_(event) {
-    const el = dev().assertElement(event.target);
-
-    if (el.classList.contains('i-amphtml-story-access-close-button')) {
-      return this.toggle_(false);
-    }
-
-    // Closes the menu if click happened outside of the main container.
-    if (!closest(el, (el) => el === this.containerEl_, this.element)) {
-      this.storeService_.dispatch(Action.TOGGLE_ACCESS, false);
-    }
-  }
-
-  /**
-   * @param {boolean} show
-   * @private
-   */
-  toggle_(show) {
-    this.mutateElement(() => {
-      this.element.classList.toggle('i-amphtml-story-access-visible', show);
-    });
-  }
-
-  /**
-   * Returns the element's type.
-   * @return {string}
-   * @private
-   */
-  getType_() {
-    return this.element.getAttribute('type').toLowerCase();
-  }
-
-  /**
-   * Renders and returns an empty drawer element element that will contain the
-   * publisher provided DOM, depending on the type of <amp-story-access>.
-   * Blocking template gets a header containing the publisher's logo, and
-   * notification template gets a "dismiss" button.
-   * @return {!Element|undefined}
-   * @private
-   */
-  renderDrawerEl_() {
-    switch (this.getType_()) {
-      case Type.BLOCKING:
-        const drawerEl = renderBlockingElement();
-
-        const logoSrc = getStoryAttributeSrc(
-          this.element,
-          'publisher-logo-src',
-          /* warn */ true
-        );
-
-        if (logoSrc) {
-          const logoEl = dev().assertElement(
-            drawerEl.querySelector('.i-amphtml-story-access-logo')
-          );
-          setImportantStyles(logoEl, {'background-image': `url(${logoSrc})`});
-        }
-
-        return drawerEl;
-        break;
-      case Type.NOTIFICATION:
-        return renderNotificationElement();
-        break;
-      default:
-        user().error(
-          TAG,
-          'Unknown "type" attribute, expected one of: ' +
-            'blocking, notification.'
-        );
-    }
-  }
-
-  /**
-   * Allowlists the <amp-access> actions.
-   * Depending on the publisher configuration, actions can be:
-   *   - login
-   *   - login-<namespace>
-   *   - login-<namespace>-<type>
-   *
-   * Publishers can provide one (object) or multiple (array) configurations,
-   * identified by their "namespace" property.
-   * Each configuration can have one or multiple login URLs, called "type".
-   * All the namespace/type pairs have to be allowlisted.
-   * @private
-   */
-  allowlistActions_() {
-    const accessEl = dev().assertElement(
-      this.win.document.getElementById('amp-access'),
-      'Cannot find the amp-access configuration'
-    );
-
-    // Configuration validation is handled by the amp-access extension.
-    let accessConfig = /** @type {!Array|!Object} */ (
-      parseJson(accessEl.textContent)
-    );
-
-    if (!isArray(accessConfig)) {
-      accessConfig = [accessConfig];
-
-      // If there is only one configuration and the publisher provided a
-      // namespace, we want to allow actions with or without namespace.
-      if (accessConfig[0].namespace) {
-        accessConfig.push({...accessConfig[0], namespace: undefined});
-      }
-    }
-
-    const actions = [];
-
-    /** @type {!Array} */ (accessConfig).forEach((config) => {
-      const {login, namespace} = /** @type {{login, namespace}} */ (config);
-
-      if (isObject(login)) {
-        const types = Object.keys(login);
-        types.forEach((type) =>
-          actions.push(this.getActionObject_(namespace, type))
-        );
-      } else {
-        actions.push(this.getActionObject_(namespace));
-      }
-    });
-
-    this.storeService_.dispatch(Action.ADD_TO_ACTIONS_ALLOWLIST, actions);
-  }
-
-  /**
-   * Allowlists an action for the given namespace / type pair.
-   * @param {string=} namespace
-   * @param {string=} type
-   * @return {*} TODO(#23582): Specify return type
-   * @private
-   */
-  getActionObject_(namespace = undefined, type = undefined) {
-    const method = ['login', namespace, type].filter(Boolean).join('-');
-    return {tagOrTarget: 'SCRIPT', method};
-  }
-}
diff --git a/extensions/amp-story/1.0/amp-story-affiliate-link.css b/extensions/amp-story/1.0/amp-story-affiliate-link.css
deleted file mode 100644
index bdd884ce6bde..000000000000
--- a/extensions/amp-story/1.0/amp-story-affiliate-link.css
+++ /dev/null
@@ -1,167 +0,0 @@
-
-
- [affiliate-link-icon] {
-  position: relative !important;
-  width: 50px !important;
-  height: 50px !important;
-}
-
-[affiliate-link-icon]:not([expanded]),
-[affiliate-link-icon]:not([expanded]) .i-amphtml-story-affiliate-link-circle {
-  animation: i-amphtml-story-affiliate-link-collapse 0.2s cubic-bezier(0.4, 0.0, 0.2, 1) forwards !important;
-}
-
-[affiliate-link-icon][pristine], [affiliate-link-icon][pristine] .i-amphtml-story-affiliate-link-circle {
-  animation: none !important;
-}
-
-amp-story-page[active] [affiliate-link-icon][expanded], amp-story-page[active] [affiliate-link-icon][expanded] .i-amphtml-story-affiliate-link-circle {
-  animation: i-amphtml-story-affiliate-link-expand 0.2s cubic-bezier(0.4, 0.0, 0.2, 1) forwards !important;
-  transform-origin: left !important;
-}
-
-@keyframes i-amphtml-story-affiliate-link-expand {
-  0% {
-    width: 40px;
-    border-radius: 50%;
-  }
-  100% {
-    width: 160px;
-    border-radius: 20px;
-  }
-}
-
-@keyframes i-amphtml-story-affiliate-link-collapse {
-  0% {
-    width: 160px;
-    border-radius: 20px;
-  }
-  100% {
-    width: 40px;
-    border-radius: 50%;
-  }
-}
-
-.i-amphtml-story-affiliate-link-circle {
-  position: absolute !important;
-  background: rgba(255, 255, 255, 1) !important;
-  margin: 5px !important;
-  width: 40px !important;
-  height: 40px !important;
-  display: flex !important;
-  justify-content: space-between !important;
-  border-radius: 20px !important;
-}
-
-[affiliate-link-icon][expanded] .i-amphtml-story-affiliate-link-circle {
-  overflow: hidden !important;
-}
-
-[affiliate-link-icon] .i-amphtml-story-reset.i-amphtml-hidden {
-  display: flex !important;
-  justify-content: space-between !important;
-}
-
-.i-amphtml-story-affiliate-link-text {
-  visibility: hidden !important;
-  text-align: center !important;
-  text-overflow: ellipsis !important;
-  overflow: hidden !important;
-  white-space: nowrap !important;
-  max-width: 70px !important;
-  width: 70px !important;
-  font-family: 'Roboto', sans-serif !important;
-  font-size: 14px !important;
-  color: #3C4043 !important;
-  letter-spacing: 0 !important;
-  line-height: 40px !important;
-}
-
-.i-amphtml-story-affiliate-link-launch {
-  visibility: hidden !important;
-  background-position: center !important;
-  background-repeat: no-repeat !important;
-  background-size: 18px 18px !important;
-  width: 40px !important;
-  height: 40px !important;
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="18px" height="18px" viewBox="0 0 48 48" fill="%23757575"><path d="M0 0h48v48H0z" fill="none"/><path d="M38 38H10V10h14V6H10c-2.21 0-4 1.79-4 4v28c0 2.21 1.79 4 4 4h28c2.21 0 4-1.79 4-4V24h-4v14zM28 6v4h7.17L15.51 29.66l2.83 2.83L38 12.83V20h4V6H28z"/></svg>') !important;
-}
-
-amp-story-page[active] .i-amphtml-story-affiliate-link-pulse {
-  position: absolute !important;
-  border-radius: 50% !important;
-  background: rgba(255, 255, 255, 0.4) !important;
-  margin: 5px !important;
-  width: 40px !important;
-  height: 40px !important;
-  animation: pulse 1.5s cubic-bezier(0.4, 0.0, 0.2, 1) infinite alternate !important;
-}
-
-@keyframes pulse {
-  0% {
-    transform: scale(1);
-  }
-  100% {
-    transform: scale(1.3);
-  }
-}
-
-[affiliate-link-icon][expanded] .i-amphtml-story-affiliate-link-pulse {
-  animation: none !important;
-}
-
-[affiliate-link-icon][expanded] .i-amphtml-story-affiliate-link-text {
-  visibility: visible !important;
-}
-
-[affiliate-link-icon][expanded] .i-amphtml-story-affiliate-link-launch {
-  visibility: visible !important;
-}
-
-@media any-hover {
-  [affiliate-link-icon]:hover .i-amphtml-story-affiliate-link-circle {
-    background: rgba(255, 255, 255, 0.4) !important;
-  }
-
-  [affiliate-link-icon]:hover .i-amphtml-story-affiliate-link-pulse {
-    background: none !important;
-    animation: none !important;
-  }
-}
-
-.i-amphtml-story-affiliate-link-icon {
-  background-position: center !important;
-  background-repeat: no-repeat !important;
-  background-size: 24px 24px !important;
-  color: rgba(0, 0, 0, 0.54) !important;
-  width: 40px !important;
-  height: 40px !important;
-}
-
-[affiliate-link-icon="shopping-cart"] .i-amphtml-story-affiliate-link-icon {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="#005AF0"><path d="M7 18c-1.1 0-1.99.9-1.99 2S5.9 22 7 22s2-.9 2-2-.9-2-2-2zM1 2v2h2l3.6 7.59-1.35 2.45c-.16.28-.25.61-.25.96 0 1.1.9 2 2 2h12v-2H7.42c-.14 0-.25-.11-.25-.25l.03-.12.9-1.63h7.45c.75 0 1.41-.41 1.75-1.03l3.58-6.49c.08-.14.12-.31.12-.48 0-.55-.45-1-1-1H5.21l-.94-2H1zm16 16c-1.1 0-1.99.9-1.99 2s.89 2 1.99 2 2-.9 2-2-.9-2-2-2z"/><path d="M0 0h24v24H0z" fill="none"/></svg>') !important;
-}
-
-[affiliate-link-icon="offer"] .i-amphtml-story-affiliate-link-icon {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="#005AF0"><path d="M0 0h24v24H0z" fill="none"/><path d="M21.41 11.58l-9-9C12.05 2.22 11.55 2 11 2H4c-1.1 0-2 .9-2 2v7c0 .55.22 1.05.59 1.42l9 9c.36.36.86.58 1.41.58.55 0 1.05-.22 1.41-.59l7-7c.37-.36.59-.86.59-1.41 0-.55-.23-1.06-.59-1.42zM5.5 7C4.67 7 4 6.33 4 5.5S4.67 4 5.5 4 7 4.67 7 5.5 6.33 7 5.5 7z"/></svg>') !important;
-}
-
-[affiliate-link-icon="flight"] .i-amphtml-story-affiliate-link-icon {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="#005AF0"><path d="M10.18 9"/><path d="M21 16v-2l-8-5V3.5c0-.83-.67-1.5-1.5-1.5S10 2.67 10 3.5V9l-8 5v2l8-2.5V19l-2 1.5V22l3.5-1 3.5 1v-1.5L13 19v-5.5l8 2.5z"/><path d="M0 0h24v24H0z" fill="none"/></svg>') !important;
-}
-
-[affiliate-link-icon="hotel"] .i-amphtml-story-affiliate-link-icon {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="#005AF0"><path d="M0 0h24v24H0z" fill="none"/><path d="M7 13c1.66 0 3-1.34 3-3S8.66 7 7 7s-3 1.34-3 3 1.34 3 3 3zm12-6h-8v7H3V5H1v15h2v-3h18v3h2v-9c0-2.21-1.79-4-4-4z"/></svg>') !important;
-}
-
-[affiliate-link-icon="movie"] .i-amphtml-story-affiliate-link-icon {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="#005AF0"><path d="M18 4l2 4h-3l-2-4h-2l2 4h-3l-2-4H8l2 4H7L5 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V4h-4z"/><path d="M0 0h24v24H0z" fill="none"/></svg>') !important;
-}
-
-[affiliate-link-icon="activity"] .i-amphtml-story-affiliate-link-icon {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="#005AF0"><path d="M0 0h24v24H0z" fill="none"/><path d="M20 12c0-1.1.9-2 2-2V6c0-1.1-.9-2-2-2H4c-1.1 0-1.99.9-1.99 2v4c1.1 0 1.99.9 1.99 2s-.89 2-2 2v4c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2v-4c-1.1 0-2-.9-2-2zm-4.42 4.8L12 14.5l-3.58 2.3 1.08-4.12-3.29-2.69 4.24-.25L12 5.8l1.54 3.95 4.24.25-3.29 2.69 1.09 4.11z"/></svg>') !important;
-}
-
-[affiliate-link-icon="more-to-read"] .i-amphtml-story-affiliate-link-icon {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="#005AF0"><path fill="none" d="M-74 29h48v48h-48V29zM0 0h24v24H0V0zm0 0h24v24H0V0z"/><path d="M13 12h7v1.5h-7zm0-2.5h7V11h-7zm0 5h7V16h-7zM21 4H3c-1.1 0-2 .9-2 2v13c0 1.1.9 2 2 2h18c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm0 15h-9V6h9v13z"/></svg>') !important;
-}
\ No newline at end of file
diff --git a/extensions/amp-story/1.0/amp-story-affiliate-link.js b/extensions/amp-story/1.0/amp-story-affiliate-link.js
deleted file mode 100644
index 53841b489136..000000000000
--- a/extensions/amp-story/1.0/amp-story-affiliate-link.js
+++ /dev/null
@@ -1,164 +0,0 @@
-import * as Preact from '#core/dom/jsx';
-/**
- * @fileoverview Affiliate link component that expands when clicked.
- */
-
-import {Services} from '#service';
-import {StateProperty, getStoreService} from './amp-story-store-service';
-import {StoryAnalyticsEvent, getAnalyticsService} from './story-analytics';
-import {getAmpdoc} from '../../../src/service-helpers';
-
-/**
- * Links that are affiliate links.
- * @const {string}
- */
-export const AFFILIATE_LINK_SELECTOR = 'a[affiliate-link-icon]';
-
-/**
- * Custom property signifying a built link.
- * @const {string}
- */
-export const AFFILIATE_LINK_BUILT = '__AMP_AFFILIATE_LINK_BUILT';
-
-export class AmpStoryAffiliateLink {
-  /**
-   * @param {!Window} win
-   * @param {!Element} element
-   */
-  constructor(win, element) {
-    /** @private {!Window} */
-    this.win_ = win;
-
-    /** @private {!Element} */
-    this.element_ = element;
-
-    /** @private {?Element} */
-    this.textEl_ = null;
-
-    /** @private {?Element} */
-    this.launchEl_ = null;
-
-    /** @private @const {!./amp-story-store-service.AmpStoryStoreService} */
-    this.storeService_ = getStoreService(this.win_);
-
-    /** @private {string} */
-    this.text_ = this.element_.textContent;
-
-    /** @private @const {!../../../src/service/mutator-interface.MutatorInterface} */
-    this.mutator_ = Services.mutatorForDoc(getAmpdoc(this.win_.document));
-
-    /** @private @const {!./story-analytics.StoryAnalyticsService} */
-    this.analyticsService_ = getAnalyticsService(this.win_, element);
-  }
-
-  /**
-   * Builds affiliate link.
-   */
-  build() {
-    if (this.element_[AFFILIATE_LINK_BUILT]) {
-      return;
-    }
-
-    this.mutator_.mutateElement(this.element_, () => {
-      this.element_.textContent = '';
-      this.element_.setAttribute('pristine', '');
-      this.addPulseElement_();
-      this.addIconElement_();
-      this.addText_();
-      this.addLaunchElement_();
-    });
-
-    this.initializeListeners_();
-    this.element_[AFFILIATE_LINK_BUILT] = true;
-  }
-
-  /**
-   * Initializes listeners.
-   * @private
-   */
-  initializeListeners_() {
-    this.storeService_.subscribe(
-      StateProperty.AFFILIATE_LINK_STATE,
-      (elementToToggleExpand) => {
-        const expand = this.element_ === elementToToggleExpand;
-        if (expand) {
-          this.element_.setAttribute('expanded', '');
-          this.textEl_.removeAttribute('hidden');
-          this.launchEl_.removeAttribute('hidden');
-        } else {
-          this.element_.removeAttribute('expanded');
-          this.textEl_.setAttribute('hidden', '');
-          this.launchEl_.setAttribute('hidden', '');
-        }
-        if (expand) {
-          this.element_.removeAttribute('pristine');
-          this.analyticsService_.triggerEvent(
-            StoryAnalyticsEvent.FOCUS,
-            this.element_
-          );
-        }
-      }
-    );
-
-    this.element_.addEventListener('click', (event) => {
-      if (this.element_.hasAttribute('expanded')) {
-        event.stopPropagation();
-        this.analyticsService_.triggerEvent(
-          StoryAnalyticsEvent.CLICK_THROUGH,
-          this.element_
-        );
-      }
-    });
-  }
-
-  /**
-   * Adds icon as a child element of <amp-story-affiliate-link>.
-   * @private
-   */
-  addIconElement_() {
-    const iconEl = (
-      <div class="i-amphtml-story-affiliate-link-circle">
-        <i class="i-amphtml-story-affiliate-link-icon"></i>
-        <div class="i-amphtml-story-reset i-amphtml-hidden">
-          <span class="i-amphtml-story-affiliate-link-text" hidden></span>
-          <i class="i-amphtml-story-affiliate-link-launch" hidden></i>
-        </div>
-      </div>
-    );
-    this.element_.appendChild(iconEl);
-  }
-
-  /**
-   * Adds text from <a> tag to expanded link.
-   * @private
-   */
-  addText_() {
-    this.textEl_ = this.element_.querySelector(
-      '.i-amphtml-story-affiliate-link-text'
-    );
-
-    this.textEl_.textContent = this.text_;
-    this.textEl_.setAttribute('hidden', '');
-  }
-
-  /**
-   * Adds launch arrow to expanded link.
-   * @private
-   */
-  addLaunchElement_() {
-    this.launchEl_ = this.element_.querySelector(
-      '.i-amphtml-story-affiliate-link-launch'
-    );
-
-    this.launchEl_.setAttribute('hidden', '');
-  }
-
-  /**
-   * Adds pulse as a child element of <amp-story-affiliate-link>.
-   * @private
-   */
-  addPulseElement_() {
-    const pulseEl = <div class="i-amphtml-story-affiliate-link-pulse"></div>;
-    this.element_.appendChild(pulseEl);
-  }
-}
diff --git a/extensions/amp-story/1.0/amp-story-base-layer.js b/extensions/amp-story/1.0/amp-story-base-layer.js
index 65d720d0b4e8..6b60604d7840 100644
--- a/extensions/amp-story/1.0/amp-story-base-layer.js
+++ b/extensions/amp-story/1.0/amp-story-base-layer.js
@@ -2,7 +2,7 @@
  * @fileoverview Base layer from which other layers in a story page extend from.
  */
 
-import {Layout} from '#core/dom/layout';
+import {Layout_Enum} from '#core/dom/layout';
 
 /**
  * Base layer template.
@@ -15,7 +15,7 @@ export class AmpStoryBaseLayer extends AMP.BaseElement {
 
   /** @override */
   isLayoutSupported(layout) {
-    return layout == Layout.CONTAINER;
+    return layout == Layout_Enum.CONTAINER;
   }
 
   /** @override */
diff --git a/extensions/amp-story/1.0/amp-story-consent.css b/extensions/amp-story/1.0/amp-story-consent.css
index f5a9a2feb421..30cc1b7fface 100644
--- a/extensions/amp-story/1.0/amp-story-consent.css
+++ b/extensions/amp-story/1.0/amp-story-consent.css
@@ -10,7 +10,7 @@
   left: 0 !important;
   height: 100% !important;
   width: 100% !important;
-  z-index: 100005 !important; /** Above amp-story-access. */
+  z-index: 100005 !important;
 }
 
 /** Black opacity overlay. */
@@ -125,7 +125,7 @@
   width: 16px !important;
   top: 3px !important;
   right: -20px !important;
-  background: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 0 24 24" fill="rgba(0, 0, 0, 0.87)"><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/><path d="M0 0h24v24H0z" fill="none"/></svg>')
+  background: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="rgba(0, 0, 0, 0.87)"><path d="M10 6 8.6 7.4l4.6 4.6-4.6 4.6L10 18l6-6z"/><path d="M0 0h24v24H0z" fill="none"/></svg>')
       center center no-repeat !important;
 }
 
diff --git a/extensions/amp-story/1.0/amp-story-consent.js b/extensions/amp-story/1.0/amp-story-consent.js
index afc2a6e3f534..19f25a76ca59 100644
--- a/extensions/amp-story/1.0/amp-story-consent.js
+++ b/extensions/amp-story/1.0/amp-story-consent.js
@@ -1,15 +1,9 @@
+import objstr from 'obj-str';
+
+import {ActionTrust_Enum} from '#core/constants/action-constants';
+import {isJsonScriptTag} from '#core/dom';
 import * as Preact from '#core/dom/jsx';
-import {
-  Action,
-  StateProperty,
-  getStoreService,
-} from './amp-story-store-service';
-import {ActionTrust} from '#core/constants/action-constants';
-import {CSS} from '../../../build/amp-story-consent-1.0.css';
-import {Layout} from '#core/dom/layout';
-import {LocalizedStringId} from '#service/localization/strings';
-import {Services} from '#service';
-import {assertAbsoluteHttpOrHttpsUrl, assertHttpsUrl} from '../../../src/url';
+import {Layout_Enum} from '#core/dom/layout';
 import {
   childElementByTag,
   closest,
@@ -17,19 +11,29 @@ import {
   matches,
 } from '#core/dom/query';
 import {computedStyle, setImportantStyles} from '#core/dom/style';
+import {isArray} from '#core/types';
+import {parseJson} from '#core/types/object/json';
+
+import {Services} from '#service';
+import {LocalizedStringId_Enum} from '#service/localization/strings';
+
+import {dev, user, userAssert} from '#utils/log';
+
+import {localizeTemplate} from './amp-story-localization-service';
+import {
+  Action,
+  StateProperty,
+  getStoreService,
+} from './amp-story-store-service';
 import {
   createShadowRootWithStyle,
   getRGBFromCssColorValue,
+  getStoryAttributeSrc,
   getTextColorForRGB,
   triggerClickFromLightDom,
 } from './utils';
-import {dev, user, userAssert} from '#utils/log';
-import {isArray} from '#core/types';
-import {isJsonScriptTag} from '#core/dom';
 
-import {parseJson} from '#core/types/object/json';
-import {localize} from './amp-story-localization-service';
-import objstr from 'obj-str';
+import {CSS} from '../../../build/amp-story-consent-1.0.css';
 
 /** @const {string} */
 const TAG = 'amp-story-consent';
@@ -45,23 +49,20 @@ const DEFAULT_OPTIONAL_PARAMETERS = {
 
 /**
  * Story consent template.
- * @param {!Element} element
  * @param {!Object} config
  * @param {string} consentId
  * @param {?string} logoSrc
  * @return {!Element}
  * @private @const
  */
-const renderElement = (element, config, consentId, logoSrc) => (
+const renderElement = (config, consentId, logoSrc) => (
   <div class="i-amphtml-story-consent i-amphtml-story-system-reset">
     <div class="i-amphtml-story-consent-overflow">
       <div class="i-amphtml-story-consent-container">
         <div class="i-amphtml-story-consent-header">
           <div
             class="i-amphtml-story-consent-logo"
-            style={
-              logoSrc ? `background-image: url('${logoSrc}') !important;` : ''
-            }
+            style={logoSrc && {backgroundImage: `url('${logoSrc}') !important`}}
           />
         </div>
         <div class="i-amphtml-story-consent-content">
@@ -95,24 +96,20 @@ const renderElement = (element, config, consentId, logoSrc) => (
             'i-amphtml-hidden': config.onlyAccept === true,
           })}
           on={`tap:${consentId}.reject`}
-        >
-          {localize(
-            element,
-            LocalizedStringId.AMP_STORY_CONSENT_DECLINE_BUTTON_LABEL
-          )}
-        </button>
+          i-amphtml-i18n-text-content={
+            LocalizedStringId_Enum.AMP_STORY_CONSENT_DECLINE_BUTTON_LABEL
+          }
+        ></button>
         <button
           class={objstr({
             'i-amphtml-story-consent-action': true,
             'i-amphtml-story-consent-action-accept': true,
           })}
           on={`tap:${consentId}.accept`}
-        >
-          {localize(
-            element,
-            LocalizedStringId.AMP_STORY_CONSENT_ACCEPT_BUTTON_LABEL
-          )}
-        </button>
+          i-amphtml-i18n-text-content={
+            LocalizedStringId_Enum.AMP_STORY_CONSENT_ACCEPT_BUTTON_LABEL
+          }
+        ></button>
       </div>
     </div>
   </div>
@@ -148,9 +145,6 @@ export class AmpStoryConsent extends AMP.BaseElement {
 
     this.assertAndParseConfig_();
 
-    const storyEl = dev().assertElement(
-      closestAncestorElementBySelector(this.element, 'AMP-STORY')
-    );
     const consentEl = closestAncestorElementBySelector(
       this.element,
       'AMP-CONSENT'
@@ -159,26 +153,19 @@ export class AmpStoryConsent extends AMP.BaseElement {
 
     this.storeConsentId_(consentId);
 
-    const logoSrc = storyEl && storyEl.getAttribute('publisher-logo-src');
-
-    if (logoSrc) {
-      assertHttpsUrl(logoSrc, storyEl, 'publisher-logo-src');
-    } else {
-      user().warn(
-        TAG,
-        'Expected "publisher-logo-src" attribute on <amp-story>'
-      );
-    }
+    const logoSrc = getStoryAttributeSrc(
+      this.element,
+      'publisher-logo-src',
+      /* warn */ true
+    );
 
     // Story consent config is set by the `assertAndParseConfig_` method.
     if (this.storyConsentConfig_) {
       this.storyConsentEl_ = renderElement(
-        this.element,
         this.storyConsentConfig_,
         consentId,
         logoSrc
       );
-      createShadowRootWithStyle(this.element, this.storyConsentEl_, CSS);
 
       // Allow <amp-consent> actions in STAMP (defaults to no actions allowed).
       const actions = [
@@ -188,15 +175,17 @@ export class AmpStoryConsent extends AMP.BaseElement {
       ];
       this.storeService_.dispatch(Action.ADD_TO_ACTIONS_ALLOWLIST, actions);
 
-      this.setAcceptButtonFontColor_();
-
-      this.initializeListeners_();
+      return localizeTemplate(this.storyConsentEl_, this.element).then(() => {
+        createShadowRootWithStyle(this.element, this.storyConsentEl_, CSS);
+        this.setAcceptButtonFontColor_();
+        this.initializeListeners_();
+      });
     }
   }
 
   /** @override */
   isLayoutSupported(layout) {
-    return layout == Layout.NODISPLAY;
+    return layout == Layout_Enum.NODISPLAY;
   }
 
   /**
@@ -232,7 +221,7 @@ export class AmpStoryConsent extends AMP.BaseElement {
     }
     if (event.target.hasAttribute('on')) {
       const targetEl = dev().assertElement(event.target);
-      this.actions_.trigger(targetEl, 'tap', event, ActionTrust.HIGH);
+      this.actions_.trigger(targetEl, 'tap', event, ActionTrust_Enum.HIGH);
     }
     const anchorClicked = closest(event.target, (e) => matches(e, 'a[href]'));
     if (anchorClicked) {
@@ -320,7 +309,9 @@ export class AmpStoryConsent extends AMP.BaseElement {
         this.storyConsentConfig_.externalLink.href,
         `${TAG}: config requires "externalLink.href" to be an absolute URL`
       );
-      assertAbsoluteHttpOrHttpsUrl(this.storyConsentConfig_.externalLink.href);
+      Services.urlForDoc(this.element).assertAbsoluteHttpOrHttpsUrl(
+        this.storyConsentConfig_.externalLink.href
+      );
     }
   }
 
diff --git a/extensions/amp-story/1.0/amp-story-cta-layer.js b/extensions/amp-story/1.0/amp-story-cta-layer.js
deleted file mode 100644
index de855c21cab8..000000000000
--- a/extensions/amp-story/1.0/amp-story-cta-layer.js
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * @fileoverview This is a layer that allows a call to action in a story page.
- * With this, a user could link to an external site from inside a story using
- * the call to action layer, for example.
- *
- * Example:
- * ...
- * <amp-story-page>
- *   <amp-story-cta-layer>
- *     <a href="wwww.google.com"> Visit my site! </a>
- *   </amp-story-cta-layer>
- * <amp-story-page>
- * ...
- */
-
-import {AmpStoryBaseLayer} from './amp-story-base-layer';
-import {removeElement} from '#core/dom';
-import {matches} from '#core/dom/query';
-import {user} from '#utils/log';
-
-/**
- * @type {string}
- * @const
- */
-const TAG = 'amp-story-cta-layer';
-
-/**
- * Call to action button layer template.
- *
- * No pre-rendering to let more computing-intensive elements (like
- * videos) get pre-rendered first. Since this layer will not contain
- * computing-intensive resources such as videos, we can just risk rendering
- * while the user is looking.
- */
-export class AmpStoryCtaLayer extends AmpStoryBaseLayer {
-  /** @override */
-  buildCallback() {
-    super.buildCallback();
-    this.setOrOverwriteAttributes_();
-    this.checkAndRemoveLayerIfOnFirstPage_();
-  }
-
-  /**
-   * Overwrite or set target attributes that are cta-layer-specific.
-   * @private
-   */
-  setOrOverwriteAttributes_() {
-    const ctaLinks = this.element.querySelectorAll('a');
-    for (let i = 0; i < ctaLinks.length; i++) {
-      ctaLinks[i].setAttribute('target', '_blank');
-
-      if (!ctaLinks[i].getAttribute('role')) {
-        ctaLinks[i].setAttribute('role', 'link');
-      }
-    }
-
-    const ctaButtons = this.element.querySelectorAll('button');
-    for (let i = 0; i < ctaButtons.length; i++) {
-      if (!ctaButtons[i].getAttribute('role')) {
-        ctaButtons[i].setAttribute('role', 'button');
-      }
-    }
-  }
-
-  /**
-   * CTA links or buttons are not allowed on the first amp-story page. Remove
-   * the amp-story-cta-layer if it is found on the first page of the story.
-   * @private
-   */
-  checkAndRemoveLayerIfOnFirstPage_() {
-    if (
-      matches(
-        this.element,
-        'amp-story-page:first-of-type > amp-story-cta-layer'
-      )
-    ) {
-      removeElement(this.element);
-      user().error(
-        TAG,
-        'amp-story-cta-layer is not allowed on the first page' +
-          ' of an amp-story.'
-      );
-    }
-  }
-}
diff --git a/extensions/amp-story/1.0/amp-story-desktop-one-panel.css b/extensions/amp-story/1.0/amp-story-desktop-one-panel.css
index 4bfdebcaf616..87ef3fbd0eb9 100644
--- a/extensions/amp-story/1.0/amp-story-desktop-one-panel.css
+++ b/extensions/amp-story/1.0/amp-story-desktop-one-panel.css
@@ -9,17 +9,21 @@ amp-story[standalone] {
 /**
  * NOTE: If you change any variables or media queries change:
  * css/amp-story-player-shadow.css
+ *
+ * Story previews are shown on the mobile SERP in a viewer with a 3/4 aspect
+ * ratio, so a 31/40 min-aspect-ratio here ensures that the mobile UI is
+ * displayed instead of the desktop UI.
  */
 
-@media(min-aspect-ratio: 3/4) {
+@media (min-aspect-ratio: 31/40) {
   /** Variables shared between page, system layer and pagination buttons. */
   :root:not([data-story-supports-landscape]):not([i-amphtml-story-mobile]) {
     --i-amphtml-story-desktop-one-panel-ratio: 69 / 116;
     --i-amphtml-story-desktop-one-panel-responsive-margin: max(74px, 8.25vh);
     /** Calculates panel height by subtracting responsive vertical margin. */
-    --i-amphtml-story-desktop-one-panel-height: calc(100vh - var(--i-amphtml-story-desktop-one-panel-responsive-margin) * 2);
+    --i-amphtml-story-desktop-one-panel-height: calc(var(--story-100dvh) - var(--i-amphtml-story-desktop-one-panel-responsive-margin) * 2);
     --i-amphtml-story-desktop-one-panel-width: calc(var(--i-amphtml-story-desktop-one-panel-height) * var(--i-amphtml-story-desktop-one-panel-ratio));
-    --i-amphtml-story-desktop-one-panel-border-radius: 10px;
+    --i-amphtml-story-desktop-one-panel-border-radius: 20px;
     --story-page-vw: calc(var(--i-amphtml-story-desktop-one-panel-width) * .01) !important;
     --story-page-vh: calc(var(--i-amphtml-story-desktop-one-panel-height) * .01) !important;
   }
@@ -27,7 +31,7 @@ amp-story[standalone] {
   @media(max-height: 756px) {
     :root:not([data-story-supports-landscape]):not([i-amphtml-story-mobile]) {
       --i-amphtml-story-desktop-one-panel-responsive-margin: 0px;
-      --i-amphtml-story-desktop-one-panel-width: calc(100vh * var(--i-amphtml-story-desktop-one-panel-ratio));
+      --i-amphtml-story-desktop-one-panel-width: calc(var(--story-100dvh) * var(--i-amphtml-story-desktop-one-panel-ratio));
       --i-amphtml-story-desktop-one-panel-border-radius: 0;
     }
   }
diff --git a/extensions/amp-story/1.0/amp-story-embedded-component.js b/extensions/amp-story/1.0/amp-story-embedded-component.js
index 3833016191c2..6628008a6d83 100644
--- a/extensions/amp-story/1.0/amp-story-embedded-component.js
+++ b/extensions/amp-story/1.0/amp-story-embedded-component.js
@@ -1,48 +1,37 @@
+import {toggleAttribute, tryFocus} from '#core/dom';
 import * as Preact from '#core/dom/jsx';
+import {closest, matches} from '#core/dom/query';
+import {resetStyles, setImportantStyles} from '#core/dom/style';
+
+import {Services} from '#service';
+
+import {dev, devAssert, user, userAssert} from '#utils/log';
+
 import {
   Action,
   EmbeddedComponentState,
   InteractiveComponentDef,
   StateProperty,
-  UIType,
+  UIType_Enum,
   getStoreService,
 } from './amp-story-store-service';
+import {EventType, dispatch} from './events';
 import {
   AdvancementMode,
   StoryAnalyticsEvent,
   getAnalyticsService,
 } from './story-analytics';
-import {CSS} from '../../../build/amp-story-tooltip-1.0.css';
-import {EventType, dispatch} from './events';
-import {Keys} from '#core/constants/key-codes';
-import {LocalizedStringId} from '#service/localization/strings';
-import {Services} from '#service';
-import {tryFocus} from '#core/dom';
-import {closest, matches} from '#core/dom/query';
 import {
   createShadowRootWithStyle,
   getSourceOriginForElement,
   triggerClickFromLightDom,
 } from './utils';
-import {dev, devAssert, user, userAssert} from '#utils/log';
-import {dict} from '#core/types/object';
+
+import {CSS} from '../../../build/amp-story-tooltip-1.0.css';
 import {getAmpdoc} from '../../../src/service-helpers';
-import {localize} from './amp-story-localization-service';
-import {htmlRefs} from '#core/dom/static-template';
-import {isProtocolValid, parseUrlDeprecated} from '../../../src/url';
 
-import {px, resetStyles, setImportantStyles, toggle} from '#core/dom/style';
-import objstr from 'obj-str';
-
-/**
- * Action icons to be placed in tooltip.
- * @enum {string}
- * @private
- */
-const ActionIcon = {
-  LAUNCH: 'i-amphtml-tooltip-action-icon-launch',
-  EXPAND: 'i-amphtml-tooltip-action-icon-expand',
-};
+/** @private @const {string} */
+const LAUNCH_ICON_CLASS = 'i-amphtml-tooltip-action-icon-launch';
 
 /** @private @const {number} */
 const TOOLTIP_CLOSE_ANIMATION_MS = 100;
@@ -58,27 +47,12 @@ const TooltipTheme = {
   DARK: 'dark',
 };
 
-/**
- * Since we don't know the actual width of the content inside the iframe
- * and in responsive environments the iframe takes the whole width, we
- * hardcode a limit based on what we know of how the embed behaves (only true
- * for Twitter embeds). See #22334.
- * @const {number}
- * @private
- */
-const MAX_TWEET_WIDTH_PX = 500;
-
-/**
- * Components that can be expanded.
- * @const {!Object}
- * @package
- */
-export const EXPANDABLE_COMPONENTS = {
+/** @private @const {!Object} list of embedded components that are click shielded */
+const EMBEDDED_COMPONENTS_SELECTORS = {
   'amp-twitter': {
     customIconClassName: 'amp-social-share-twitter-no-background',
-    actionIcon: ActionIcon.EXPAND,
-    localizedStringId: LocalizedStringId.AMP_STORY_TOOLTIP_EXPAND_TWEET,
-    selector: 'amp-twitter',
+    actionIcon: LAUNCH_ICON_CLASS,
+    selector: 'amp-twitter[interactive]',
   },
 };
 
@@ -89,325 +63,56 @@ export const EXPANDABLE_COMPONENTS = {
  */
 const LAUNCHABLE_COMPONENTS = {
   'a': {
-    actionIcon: ActionIcon.LAUNCH,
-    selector: 'a[href]:not([affiliate-link-icon])',
+    actionIcon: LAUNCH_ICON_CLASS,
+    selector: 'a[href]',
   },
-};
-
-/**
- * Union of expandable and launchable components.
- * @private
- * @const {!Object}
- */
-const INTERACTIVE_COMPONENTS = {
-  ...EXPANDABLE_COMPONENTS,
-  ...LAUNCHABLE_COMPONENTS,
+  ...EMBEDDED_COMPONENTS_SELECTORS,
 };
 
 /**
  * Gets the list of components with their respective selectors.
  * @param {!Object} components
- * @param {string=} opt_predicate
- * @return {!Object<string, string>}
+ * @return {!{[key: string]: string}}
  */
-function getComponentSelectors(components, opt_predicate) {
+function getComponentSelectors(components) {
   const componentSelectors = {};
 
   Object.keys(components).forEach((componentName) => {
-    componentSelectors[componentName] = opt_predicate
-      ? components[componentName].selector + opt_predicate
-      : components[componentName].selector;
+    componentSelectors[componentName] = components[componentName].selector;
   });
 
   return componentSelectors;
 }
 
-/** @const {string} */
-const INTERACTIVE_EMBED_SELECTOR = '[interactive]';
-
 /**
- * Selectors of elements that can go into expanded view.
+ * Selectors of elements that are embedded.
  * @return {!Object}
  */
-export function expandableElementsSelectors() {
+export function embeddedElementsSelectors() {
   // Using indirect invocation to prevent no-export-side-effect issue.
-  return getComponentSelectors(
-    EXPANDABLE_COMPONENTS,
-    INTERACTIVE_EMBED_SELECTOR
-  );
+  return Object.keys(EMBEDDED_COMPONENTS_SELECTORS).join(',');
 }
 
-/**
- * Contains all interactive component CSS selectors.
- * @type {!Object}
- */
-const interactiveSelectors = {
-  ...getComponentSelectors(LAUNCHABLE_COMPONENTS),
-  ...getComponentSelectors(EXPANDABLE_COMPONENTS, INTERACTIVE_EMBED_SELECTOR),
-  EXPANDED_VIEW_OVERLAY:
-    '.i-amphtml-story-expanded-view-overflow, ' +
-    '.i-amphtml-expanded-view-close-button',
-};
-
 /**
  * All selectors that should delegate to the AmpStoryEmbeddedComponent class.
  * @return {!Object}
  */
 export function interactiveElementsSelectors() {
   // Using indirect invocation to prevent no-export-side-effect issue.
-  return interactiveSelectors;
+  return Object.values(getComponentSelectors(LAUNCHABLE_COMPONENTS)).join(',');
 }
 
-/**
- * Maps each embedded element to its corresponding style.
- * @type {!JsonObject}
- */
-const embedStyleEls = dict();
-
-/**
- * Generates ids for embedded component styles.
- * @type {number}
- */
-let embedIds = 0;
-
-/**
- * Contains metadata about embedded components, found in <style> elements.
- * @const {string}
- */
-const AMP_EMBED_DATA = '__AMP_EMBED_DATA__';
-
-/**
- * @typedef {{
- *  id: number,
- *  width: number,
- *  height: number,
- *  scaleFactor: number,
- *  transform: string,
- *  verticalMargin: number,
- *  horizontalMargin: number,
- * }}
- */
-let EmbedDataDef;
-
 /**
  * @const {string}
  */
 export const EMBED_ID_ATTRIBUTE_NAME = 'i-amphtml-embed-id';
 
-/**
- * Builds expanded view overlay for expandable components.
- * @return {!Element}
- */
-const renderExpandedViewOverlay = () => (
-  <div class="i-amphtml-story-expanded-view-overflow i-amphtml-story-system-reset">
-    <button
-      class="i-amphtml-expanded-view-close-button"
-      aria-label="close"
-      role="button"
-    ></button>
-  </div>
-);
-
-/**
- * Updates embed's corresponding <style> element with embedData.
- * @param {!Element} target
- * @param {!Element} embedStyleEl
- * @param {!EmbedDataDef} embedData
- */
-function updateEmbedStyleEl(target, embedStyleEl, embedData) {
-  const embedId = embedData.id;
-  embedStyleEl.textContent = `[${EMBED_ID_ATTRIBUTE_NAME}="${embedId}"]
-  ${buildStringStyleFromEl(target, embedData)}`;
-}
-
-/**
- * Builds a string containing the corresponding style depending on the
- * element.
- * @param {!Element} target
- * @param {!EmbedDataDef} embedData
- * @return {string}
- */
-function buildStringStyleFromEl(target, embedData) {
-  switch (target.tagName.toLowerCase()) {
-    case EXPANDABLE_COMPONENTS['amp-twitter'].selector:
-      return buildStringStyleForTweet(embedData);
-    default:
-      return buildDefaultStringStyle(embedData);
-  }
-}
-
-/**
- * Builds string used in the <style> element for tweets. We ignore the height
- * as its non-deterministic.
- * @param {!EmbedDataDef} embedData
- * @return {string}
- */
-function buildStringStyleForTweet(embedData) {
-  return `{
-    width: ${px(embedData.width)} !important;
-    transform: ${embedData.transform} !important;
-    margin: ${embedData.verticalMargin}px ${
-    embedData.horizontalMargin
-  }px !important;
-    }`;
-}
-
-/**
- * Builds string used in the <style> element for default embeds.
- * @param {!EmbedDataDef} embedData
- * @return {string}
- */
-function buildDefaultStringStyle(embedData) {
-  return `{
-    width: ${px(embedData.width)} !important;
-    height: ${px(embedData.height)} !important;
-    transform: ${embedData.transform} !important;
-    margin: ${embedData.verticalMargin}px ${
-    embedData.horizontalMargin
-  }px !important;
-    }`;
-}
-
-/**
- * Measures styles for a given element in preparation for its expanded animation.
- * @param {!Element} element
- * @param {!Object} state
- * @param {!DOMRect} pageRect
- * @param {!DOMRect} elRect
- * @return {!Object}
- */
-function measureStyleForEl(element, state, pageRect, elRect) {
-  switch (element.tagName.toLowerCase()) {
-    case EXPANDABLE_COMPONENTS['amp-twitter'].selector:
-      return measureStylesForTwitter(state, pageRect, elRect);
-    default:
-      return measureDefaultStyles(state, pageRect, elRect);
-  }
-}
-
-/**
- * Since amp-twitter handles its own resize events for its height, we don't
- * resize based on its height, but rather just based on its width.
- * @param {!Object} state
- * @param {!DOMRect} pageRect
- * @param {!DOMRect} elRect
- * @return {!Object}
- */
-function measureStylesForTwitter(state, pageRect, elRect) {
-  // If screen is very wide and story has supports-landscape attribute,
-  // we don't want it to take the whole width. We take the maximum width
-  // that the tweet can actually use instead.
-  state.newWidth = Math.min(pageRect.width, MAX_TWEET_WIDTH_PX);
-
-  state.scaleFactor =
-    Math.min(elRect.width, MAX_TWEET_WIDTH_PX) / state.newWidth;
-
-  const shrinkedSize = elRect.height * state.scaleFactor;
-
-  state.verticalMargin = -1 * ((elRect.height - shrinkedSize) / 2);
-  state.horizontalMargin = -1 * ((state.newWidth - elRect.width) / 2);
-
-  return state;
-}
-
-/**
- * Measures styles for a given element in preparation for its expanded
- * animation.
- * @param {!Object} state
- * @param {!DOMRect} pageRect
- * @param {!DOMRect} elRect
- * @return {!Object}
- */
-function measureDefaultStyles(state, pageRect, elRect) {
-  if (elRect.width >= elRect.height) {
-    state.newWidth = pageRect.width;
-    state.scaleFactor = elRect.width / state.newWidth;
-    state.newHeight = (elRect.height / elRect.width) * state.newWidth;
-  } else {
-    const maxHeight = pageRect.height - VERTICAL_PADDING;
-    state.newWidth = Math.min(
-      (elRect.width / elRect.height) * maxHeight,
-      pageRect.width
-    );
-    state.newHeight = (elRect.height / elRect.width) * state.newWidth;
-    state.scaleFactor = elRect.height / state.newHeight;
-  }
-
-  state.verticalMargin = -1 * ((state.newHeight - elRect.height) / 2);
-  state.horizontalMargin = -1 * ((state.newWidth - elRect.width) / 2);
-
-  return state;
-}
-
-/**
- * Gets updated style object for a given element.
- * @param {!Element} element
- * @param {number} elId
- * @param {!Object} state
- * @return {!Object}
- */
-function updateStyleForEl(element, elId, state) {
-  switch (element.tagName.toLowerCase()) {
-    case EXPANDABLE_COMPONENTS['amp-twitter'].selector:
-      return updateStylesForTwitter(elId, state);
-    default:
-      return updateDefaultStyles(elId, state);
-  }
-}
-
-/**
- * Gets style object for an embedded component, setting negative margins
- * to make up for the expanded size in preparation of the expanded animation.
- * @param {number} elId
- * @param {!Object} state
- * @return {!Object}
- */
-function updateDefaultStyles(elId, state) {
-  return {
-    id: elId,
-    width: state.newWidth,
-    height: state.newHeight,
-    scaleFactor: state.scaleFactor,
-    transform: `scale(${state.scaleFactor})`,
-    verticalMargin: state.verticalMargin,
-    horizontalMargin: state.horizontalMargin,
-  };
-}
-
-/**
- * Gets style object for twitter. Notice there is no height or vertical margin
- * since we don't know the final height of tweets even after layout, so we just
- * let the embed handle its own height.
- * @param {number} elId
- * @param {!Object} state
- * @return {!Object}
- */
-function updateStylesForTwitter(elId, state) {
-  return {
-    id: elId,
-    width: state.newWidth,
-    scaleFactor: state.scaleFactor,
-    transform: `scale(${state.scaleFactor})`,
-    horizontalMargin: state.horizontalMargin,
-    verticalMargin: state.verticalMargin,
-  };
-}
-
 /**
  * Minimum vertical space needed to position tooltip.
  * @const {number}
  */
 const MIN_VERTICAL_SPACE = 48;
 
-/**
- * Limits the amount of vertical space a component can take in a page, this
- * makes sure no component is blocking the close button at the top of the
- * expanded view.
- * @const {number}
- * @private
- */
-const VERTICAL_PADDING = 96;
-
 /**
  * Padding between tooltip and vertical edges of screen.
  * @const {number}
@@ -453,6 +158,9 @@ export class AmpStoryEmbeddedComponent {
     /** @private {!Element} */
     this.storyEl_ = storyEl;
 
+    /** @private @const {../../../src/service/url-impl.js.Url} */
+    this.urlService_ = Services.urlForDoc(storyEl);
+
     /** @private {?Element} */
     this.shadowRoot_ = null;
 
@@ -474,18 +182,11 @@ export class AmpStoryEmbeddedComponent {
     /** @private @const {!./story-analytics.StoryAnalyticsService} */
     this.analyticsService_ = getAnalyticsService(this.win_, storyEl);
 
-    /** @private @const {!../../../src/service/owners-interface.OwnersInterface} */
-    this.owners_ = Services.ownersForDoc(getAmpdoc(this.win_.document));
-
     /** @private @const {!../../../src/service/timer-impl.Timer} */
     this.timer_ = Services.timerFor(this.win_);
 
-    /** @private {?Element} */
-    this.expandedViewOverlay_ = null;
-
     /**
-     * Target producing the tooltip and going to expanded view (when
-     * expandable).
+     * Target producing the tooltip.
      * @private {?Element}
      */
     this.triggeringTarget_ = null;
@@ -496,12 +197,6 @@ export class AmpStoryEmbeddedComponent {
      */
     this.componentPage_ = null;
 
-    /** @private */
-    this.expandComponentHandler_ = this.onExpandComponent_.bind(this);
-
-    /** @private */
-    this.embedsToBePaused_ = [];
-
     this.storeService_.subscribe(
       StateProperty.INTERACTIVE_COMPONENT_STATE,
       /** @param {!InteractiveComponentDef} component */ (component) => {
@@ -509,11 +204,6 @@ export class AmpStoryEmbeddedComponent {
       }
     );
 
-    /** @type {!../../../src/service/history-impl.History} */
-    this.historyService_ = Services.historyForDoc(
-      getAmpdoc(this.win_.document)
-    );
-
     /** @private {EmbeddedComponentState} */
     this.state_ = EmbeddedComponentState.HIDDEN;
 
@@ -522,18 +212,15 @@ export class AmpStoryEmbeddedComponent {
 
     /** @private {?Element} */
     this.buttonRight_ = null;
-
-    /** @private {number} */
-    this.historyId_ = -1;
   }
 
   /**
    * Reacts to embedded component state updates.
    * Possible state updates:
    *
-   *    HIDDEN ==> FOCUSED ==> EXPANDED
-   *      /\ _________|           |
-   *      ||______________________|
+   *    HIDDEN ==> FOCUSED
+   *      /\          |
+   *      ||__________|
    *
    * @param {!InteractiveComponentDef} component
    * @private
@@ -544,28 +231,8 @@ export class AmpStoryEmbeddedComponent {
         this.setState_(EmbeddedComponentState.HIDDEN, null /** component */);
         break;
       case EmbeddedComponentState.FOCUSED:
-        if (this.state_ !== EmbeddedComponentState.HIDDEN) {
-          dev().warn(
-            TAG,
-            `Invalid component update. Not possible to go from ${this.state_}
-              to ${component.state}`
-          );
-        }
         this.setState_(EmbeddedComponentState.FOCUSED, component);
         break;
-      case EmbeddedComponentState.EXPANDED:
-        if (this.state_ === EmbeddedComponentState.FOCUSED) {
-          this.setState_(EmbeddedComponentState.EXPANDED, component);
-        } else if (this.state_ === EmbeddedComponentState.EXPANDED) {
-          this.maybeCloseExpandedView_(component.element);
-        } else {
-          dev().warn(
-            TAG,
-            `Invalid component update. Not possible to go from ${this.state_}
-               to ${component.state}`
-          );
-        }
-        break;
     }
   }
 
@@ -589,127 +256,23 @@ export class AmpStoryEmbeddedComponent {
         this.state_ = state;
         this.onFocusedStateUpdate_(null);
         break;
-      case EmbeddedComponentState.EXPANDED:
-        this.state_ = state;
-        this.onFocusedStateUpdate_(null);
-        this.scheduleEmbedToPause_(component.element);
-        this.toggleExpandedView_(component.element);
-        this.historyService_
-          .push(() => this.close_())
-          .then((historyId) => {
-            this.historyId_ = historyId;
-          });
-        break;
       default:
         dev().warn(TAG, `EmbeddedComponentState ${this.state_} does not exist`);
         break;
     }
   }
 
-  /**
-   * Schedules embeds to be paused.
-   * @param {!Element} embedEl
-   * @private
-   */
-  scheduleEmbedToPause_(embedEl) {
-    // Resources that previously called `schedulePause` must also call
-    // `scheduleResume`. Calling `scheduleResume` on resources that did not
-    // previously call `schedulePause` has no effect.
-    this.owners_.scheduleResume(this.storyEl_, embedEl);
-    if (!this.embedsToBePaused_.includes(embedEl)) {
-      this.embedsToBePaused_.push(embedEl);
-    }
-  }
-
-  /**
-   * Toggles expanded view for interactive components that support it.
-   * @param {?Element} targetToExpand
-   * @private
-   */
-  toggleExpandedView_(targetToExpand) {
-    if (!targetToExpand) {
-      this.expandedViewOverlay_ &&
-        this.mutator_.mutateElement(this.expandedViewOverlay_, () => {
-          this.componentPage_.classList.toggle(
-            'i-amphtml-expanded-mode',
-            false
-          );
-          toggle(dev().assertElement(this.expandedViewOverlay_), false);
-          this.closeExpandedEl_();
-        });
-      return;
-    }
-
-    this.animateExpanded_(devAssert(targetToExpand));
-
-    this.expandedViewOverlay_ = this.componentPage_.querySelector(
-      '.i-amphtml-story-expanded-view-overflow'
-    );
-    if (!this.expandedViewOverlay_) {
-      this.buildAndAppendExpandedViewOverlay_();
-    }
-    this.mutator_.mutateElement(
-      dev().assertElement(this.expandedViewOverlay_),
-      () => {
-        toggle(dev().assertElement(this.expandedViewOverlay_), true);
-        this.componentPage_.classList.toggle('i-amphtml-expanded-mode', true);
-      }
-    );
-  }
-
-  /**
-   * Builds the expanded view overlay element and appends it to the page.
-   * @private
-   */
-  buildAndAppendExpandedViewOverlay_() {
-    this.expandedViewOverlay_ = renderExpandedViewOverlay();
-    const closeButton = dev().assertElement(
-      this.expandedViewOverlay_.querySelector(
-        '.i-amphtml-expanded-view-close-button'
-      )
-    );
-    closeButton.setAttribute(
-      'aria-label',
-      localize(this.storyEl_, LocalizedStringId.AMP_STORY_CLOSE_BUTTON_LABEL)
-    );
-    this.mutator_.mutateElement(dev().assertElement(this.componentPage_), () =>
-      this.componentPage_.appendChild(this.expandedViewOverlay_)
-    );
-  }
-
-  /**
-   * Closes the expanded view overlay.
-   * @param {?Element} target
-   * @param {boolean=} forceClose Force closing the expanded view.
-   * @private
-   */
-  maybeCloseExpandedView_(target, forceClose = false) {
-    if (
-      (target && matches(target, '.i-amphtml-expanded-view-close-button')) ||
-      forceClose
-    ) {
-      if (this.historyId_ !== -1) {
-        this.historyService_.goBack();
-      } else {
-        // Used for visual diff testing viewer.
-        this.close_();
-      }
-    }
-  }
-
   /**
    * Builds the tooltip overlay and appends it to the provided story.
    * @private
    * @return {Node}
    */
   buildFocusedState_() {
-    this.shadowRoot_ = this.win_.document.createElement('div');
-
     this.focusedStateOverlay_ = this.renderFocusedStateElement_();
-    createShadowRootWithStyle(this.shadowRoot_, this.focusedStateOverlay_, CSS);
-
-    this.focusedStateOverlay_.addEventListener('click', (event) =>
-      this.onOutsideTooltipClick_(event)
+    this.shadowRoot_ = createShadowRootWithStyle(
+      <div />,
+      this.focusedStateOverlay_,
+      CSS
     );
 
     this.tooltip_.addEventListener(
@@ -739,17 +302,9 @@ export class AmpStoryEmbeddedComponent {
       this.clearTooltip_();
     }, TOOLTIP_CLOSE_ANIMATION_MS);
 
-    if (this.state_ === EmbeddedComponentState.EXPANDED) {
-      this.toggleExpandedView_(null);
-    }
     this.storeService_.dispatch(Action.TOGGLE_INTERACTIVE_COMPONENT, {
       state: EmbeddedComponentState.HIDDEN,
     });
-    this.tooltip_.removeEventListener(
-      'click',
-      this.expandComponentHandler_,
-      true /** capture */
-    );
   }
 
   /**
@@ -828,52 +383,23 @@ export class AmpStoryEmbeddedComponent {
       if (this.state_ === EmbeddedComponentState.FOCUSED) {
         this.close_();
       }
-
-      // Hide expanded view when page switch is triggered by keyboard or desktop
-      // buttons.
-      if (this.state_ === EmbeddedComponentState.EXPANDED) {
-        this.maybeCloseExpandedView_(
-          null /** target */,
-          true /** forceClose */
-        );
-      }
-
-      // Pauses content inside embeds when a page change occurs.
-      while (this.embedsToBePaused_.length > 0) {
-        const embedEl = this.embedsToBePaused_.pop();
-        this.owners_.schedulePause(this.storyEl_, embedEl);
-      }
-    });
-
-    this.win_.addEventListener('keyup', (event) => {
-      if (
-        event.key === Keys.ESCAPE &&
-        this.state_ === EmbeddedComponentState.EXPANDED
-      ) {
-        event.preventDefault();
-        this.maybeCloseExpandedView_(
-          null /** target */,
-          true /** forceClose */
-        );
-      }
     });
   }
 
   /**
    * Reacts to desktop state updates and hides navigation buttons since we
    * already have in the desktop UI.
-   * @param {!UIType} uiState
+   * @param {!UIType_Enum} uiState
    * @private
    */
   onUIStateUpdate_(uiState) {
     this.mutator_.mutateElement(
       dev().assertElement(this.focusedStateOverlay_),
       () => {
-        const isDesktop = [
-          UIType.DESKTOP_FULLBLEED,
-          UIType.DESKTOP_ONE_PANEL,
-        ].includes(uiState);
-        this.focusedStateOverlay_.toggleAttribute('desktop', isDesktop);
+        const isDesktop =
+          uiState === UIType_Enum.DESKTOP_FULLBLEED ||
+          uiState === UIType_Enum.DESKTOP_ONE_PANEL;
+        toggleAttribute(this.focusedStateOverlay_, 'desktop', isDesktop);
       }
     );
   }
@@ -897,7 +423,7 @@ export class AmpStoryEmbeddedComponent {
       this.tooltip_.classList.add(DARK_THEME_CLASS);
     }
 
-    this.updateTooltipText_(component.element, embedConfig);
+    this.updateTooltipText_(component.element);
     this.updateTooltipComponentIcon_(component.element, embedConfig);
     this.updateTooltipActionIcon_(embedConfig);
     this.updateNavButtons_();
@@ -910,35 +436,12 @@ export class AmpStoryEmbeddedComponent {
    * @private
    */
   updateTooltipBehavior_(target) {
-    if (matches(target, LAUNCHABLE_COMPONENTS['a'].selector)) {
+    if (matches(target, interactiveElementsSelectors())) {
       dev()
         .assertElement(this.tooltip_)
         .setAttribute('href', this.getElementHref_(target));
       return;
     }
-
-    if (EXPANDABLE_COMPONENTS[target.tagName.toLowerCase()]) {
-      this.tooltip_.addEventListener(
-        'click',
-        this.expandComponentHandler_,
-        true
-      );
-    }
-  }
-
-  /**
-   * Handles the event of an interactive element coming into expanded view.
-   * @param {!Event} event
-   * @private
-   */
-  onExpandComponent_(event) {
-    event.preventDefault();
-    event.stopPropagation();
-
-    this.storeService_.dispatch(Action.TOGGLE_INTERACTIVE_COMPONENT, {
-      state: EmbeddedComponentState.EXPANDED,
-      element: this.triggeringTarget_,
-    });
   }
 
   /**
@@ -948,13 +451,18 @@ export class AmpStoryEmbeddedComponent {
    * @private
    */
   getElementHref_(target) {
+    if (target.tagName.toLowerCase() == 'amp-twitter') {
+      return (
+        'https://twitter.com/_/status/' + target.getAttribute('data-tweetid')
+      );
+    }
     const elUrl = target.getAttribute('href');
-    if (!isProtocolValid(elUrl)) {
+    if (!this.urlService_.isProtocolValid(elUrl)) {
       user().error(TAG, 'The tooltip url is invalid');
       return '';
     }
 
-    return parseUrlDeprecated(elUrl).href;
+    return this.urlService_.parse(elUrl).href;
   }
 
   /**
@@ -963,7 +471,7 @@ export class AmpStoryEmbeddedComponent {
    * @return {?Object}
    */
   getEmbedConfigFor_(target) {
-    const config = INTERACTIVE_COMPONENTS[target.tagName.toLowerCase()];
+    const config = LAUNCHABLE_COMPONENTS[target.tagName.toLowerCase()];
     if (config && matches(target, config.selector)) {
       return config;
     }
@@ -972,162 +480,14 @@ export class AmpStoryEmbeddedComponent {
     return null;
   }
 
-  /**
-   * Returns expanded element back to original state.
-   * @private
-   */
-  closeExpandedEl_() {
-    this.triggeringTarget_.classList.toggle(
-      'i-amphtml-expanded-component',
-      false
-    );
-    const embedId = this.triggeringTarget_.getAttribute(
-      EMBED_ID_ATTRIBUTE_NAME
-    );
-
-    const embedStyleEl = dev().assertElement(
-      embedStyleEls[embedId],
-      `Failed to look up embed style element with ID ${embedId}`
-    );
-
-    embedStyleEl[
-      AMP_EMBED_DATA
-    ].transform = `scale(${embedStyleEl[AMP_EMBED_DATA].scaleFactor})`;
-    updateEmbedStyleEl(
-      this.triggeringTarget_,
-      embedStyleEl,
-      embedStyleEl[AMP_EMBED_DATA]
-    );
-  }
-
-  /**
-   * Animates into expanded view. It calculates what the full-screen dimensions
-   * of the element will be, and uses them to deduce the translateX/Y values
-   * once the element reaches its full-screen size.
-   * @param {!Element} target
-   * @private
-   */
-  animateExpanded_(target) {
-    const embedId = target.getAttribute(EMBED_ID_ATTRIBUTE_NAME);
-    const state = {};
-    const embedStyleEl = dev().assertElement(
-      embedStyleEls[embedId],
-      `Failed to look up embed style element with ID ${embedId}`
-    );
-    const embedData = embedStyleEl[AMP_EMBED_DATA];
-    this.mutator_.measureMutateElement(
-      target,
-      /** measure */
-      () => {
-        const targetRect = target./*OK*/ getBoundingClientRect();
-        // TODO(#20832): Store DOMRect for the page in the store to avoid
-        // having to call getBoundingClientRect().
-        const pageRect = this.componentPage_./*OK*/ getBoundingClientRect();
-        const realHeight = target./*OK*/ offsetHeight;
-        const maxHeight = pageRect.height - VERTICAL_PADDING;
-        state.scaleFactor = 1;
-        if (realHeight > maxHeight) {
-          state.scaleFactor = maxHeight / realHeight;
-        }
-
-        // Gap on the left of the element between full-screen size and
-        // current size.
-        const leftGap = (embedData.width - targetRect.width) / 2;
-        // Distance from left of page to what will be the left of the
-        // element in full-screen.
-        const fullScreenLeft = targetRect.left - leftGap - pageRect.left;
-        const centeredLeft = pageRect.width / 2 - embedData.width / 2;
-        state.translateX = centeredLeft - fullScreenLeft;
-
-        // Gap on the top of the element between full-screen size and
-        // current size.
-        const topGap = (realHeight * state.scaleFactor - targetRect.height) / 2;
-        // Distance from top of page to what will be the top of the element in
-        // full-screen.
-        const fullScreenTop = targetRect.top - topGap - pageRect.top;
-        const centeredTop =
-          pageRect.height / 2 - (realHeight * state.scaleFactor) / 2;
-        state.translateY = centeredTop - fullScreenTop;
-      },
-      /** mutate */
-      () => {
-        target.classList.toggle('i-amphtml-expanded-component', true);
-
-        embedData.transform = `translate3d(${state.translateX}px,
-            ${state.translateY}px, 0) scale(${state.scaleFactor})`;
-
-        updateEmbedStyleEl(target, embedStyleEl, embedData);
-      }
-    );
-  }
-
-  /**
-   * Resizes expandable element before it is expanded to full-screen, in
-   * preparation for its animation. It resizes it to its full-screen size, and
-   * scales it down to match size set by publisher, adding negative margins so
-   * that content around stays put.
-   * @param {!Element} pageEl
-   * @param {!Element} element
-   * @param {!../../../src/service/mutator-interface.MutatorInterface} mutator
-   */
-  static prepareForAnimation(pageEl, element, mutator) {
-    let elId = null;
-
-    // When a window resize happens, we must reset the styles and prepare the
-    // animation again.
-    if (element.hasAttribute(EMBED_ID_ATTRIBUTE_NAME)) {
-      elId = parseInt(element.getAttribute(EMBED_ID_ATTRIBUTE_NAME), 10);
-      const embedStyleEl = dev().assertElement(
-        embedStyleEls[elId],
-        `Failed to look up embed style element with ID ${elId}`
-      );
-      embedStyleEl.textContent = '';
-      embedStyleEl[AMP_EMBED_DATA] = {};
-    }
-
-    let state = {};
-    mutator.measureMutateElement(
-      element,
-      /** measure */
-      () => {
-        const pageRect = pageEl./*OK*/ getBoundingClientRect();
-        const elRect = element./*OK*/ getBoundingClientRect();
-        state = measureStyleForEl(element, state, pageRect, elRect);
-      },
-      /** mutate */
-      () => {
-        elId = elId ? elId : ++embedIds;
-        if (!element.hasAttribute(EMBED_ID_ATTRIBUTE_NAME)) {
-          const embedStyleEl = <style></style>;
-
-          element.setAttribute(EMBED_ID_ATTRIBUTE_NAME, elId);
-          pageEl.insertBefore(embedStyleEl, pageEl.firstChild);
-          embedStyleEls[elId] = embedStyleEl;
-        }
-
-        embedStyleEls[elId][AMP_EMBED_DATA] = {
-          ...updateStyleForEl(element, elId, state),
-        };
-
-        const embedStyleEl = dev().assertElement(
-          embedStyleEls[elId],
-          `Failed to look up embed style element with ID ${elId}`
-        );
-        updateEmbedStyleEl(element, embedStyleEl, embedStyleEl[AMP_EMBED_DATA]);
-      }
-    );
-  }
-
   /**
    * Updates tooltip text content.
    * @param {!Element} target
-   * @param {!Object} embedConfig
    * @private
    */
-  updateTooltipText_(target, embedConfig) {
+  updateTooltipText_(target) {
     const tooltipText =
       target.getAttribute('data-tooltip-text') ||
-      localize(this.storyEl_, embedConfig.localizedStringId) ||
       getSourceOriginForElement(target, this.getElementHref_(target));
     const existingTooltipText = this.tooltip_.querySelector(
       '.i-amphtml-tooltip-text'
@@ -1160,7 +520,7 @@ export class AmpStoryEmbeddedComponent {
    */
   updateTooltipComponentIcon_(target, embedConfig) {
     const iconUrl = target.getAttribute('data-tooltip-icon');
-    if (!isProtocolValid(iconUrl)) {
+    if (!this.urlService_.isProtocolValid(iconUrl)) {
       user().error(TAG, 'The tooltip icon url is invalid');
       return;
     }
@@ -1180,8 +540,9 @@ export class AmpStoryEmbeddedComponent {
       this.mutator_.mutateElement(
         dev().assertElement(tooltipCustomIcon),
         () => {
+          const {href} = this.urlService_.parse(iconUrl);
           setImportantStyles(dev().assertElement(tooltipCustomIcon), {
-            'background-image': `url(${parseUrlDeprecated(iconUrl).href})`,
+            'background-image': `url(${href})`,
           });
         }
       );
@@ -1340,12 +701,6 @@ export class AmpStoryEmbeddedComponent {
       );
       customIcon.className = 'i-amphtml-story-tooltip-custom-icon';
       resetStyles(customIcon, ['background-image']);
-
-      this.tooltip_.removeEventListener(
-        'click',
-        this.expandComponentHandler_,
-        true
-      );
       this.tooltip_.classList.remove(DARK_THEME_CLASS);
       this.tooltip_.removeAttribute('href');
     });
@@ -1357,79 +712,73 @@ export class AmpStoryEmbeddedComponent {
    * @private
    */
   renderFocusedStateElement_() {
-    const tooltipOverlay = (
+    const rtlState = this.storeService_.get(StateProperty.RTL_STATE);
+
+    this.tooltipArrow_ = <div class="i-amphtml-story-tooltip-arrow"></div>;
+    this.tooltip_ = (
+      <a class="i-amphtml-story-tooltip" target="_blank" role="tooltip">
+        <div class="i-amphtml-story-tooltip-custom-icon"></div>
+        <p class="i-amphtml-tooltip-text" ref="text"></p>
+        <div class="i-amphtml-tooltip-action-icon"></div>
+        {this.tooltipArrow_}
+      </a>
+    );
+    this.buttonLeft_ = (
+      <button
+        class={
+          'i-amphtml-story-focused-state-layer-nav-button' +
+          ' i-amphtml-story-tooltip-nav-button-left'
+        }
+        onClick={(e) =>
+          this.onNavigationalClick_(
+            e,
+            rtlState ? EventType.NEXT_PAGE : EventType.PREVIOUS_PAGE
+          )
+        }
+      ></button>
+    );
+    this.buttonRight_ = (
+      <button
+        class={
+          'i-amphtml-story-focused-state-layer-nav-button' +
+          ' i-amphtml-story-tooltip-nav-button-right'
+        }
+        onClick={(e) =>
+          this.onNavigationalClick_(
+            e,
+            rtlState ? EventType.PREVIOUS_PAGE : EventType.NEXT_PAGE
+          )
+        }
+      ></button>
+    );
+
+    return (
       <section
-        class={objstr({
-          'i-amphtml-story-focused-state-layer': true,
-          'i-amphtml-story-system-reset i-amphtml-hidden': true,
-        })}
+        onClick={(e) => this.onOutsideTooltipClick_(e)}
+        class={
+          'i-amphtml-story-focused-state-layer' +
+          ' i-amphtml-story-system-reset i-amphtml-hidden'
+        }
       >
         <div
-          class={objstr({
-            'i-amphtml-story-focused-state-layer-nav-button-container': true,
-            'i-amphtml-story-tooltip-nav-button-left': true,
-          })}
+          class={
+            'i-amphtml-story-focused-state-layer-nav-button-container' +
+            ' i-amphtml-story-tooltip-nav-button-left'
+          }
         >
-          <button
-            ref="buttonLeft"
-            class={objstr({
-              'i-amphtml-story-focused-state-layer-nav-button': true,
-              'i-amphtml-story-tooltip-nav-button-left': true,
-            })}
-          ></button>
+          {this.buttonLeft_}
         </div>
         <div
-          class={objstr({
-            'i-amphtml-story-focused-state-layer-nav-button-container': true,
-            'i-amphtml-story-tooltip-nav-button-right': true,
-          })}
+          class={
+            'i-amphtml-story-focused-state-layer-nav-button-container' +
+            ' i-amphtml-story-tooltip-nav-button-right'
+          }
         >
-          <button
-            ref="buttonRight"
-            class={objstr({
-              'i-amphtml-story-focused-state-layer-nav-button': true,
-              'i-amphtml-story-tooltip-nav-button-right': true,
-            })}
-          ></button>
+          {this.buttonRight_}
         </div>
-        <a
-          class="i-amphtml-story-tooltip"
-          target="_blank"
-          ref="tooltip"
-          role="tooltip"
-        >
-          <div class="i-amphtml-story-tooltip-custom-icon"></div>
-          <p class="i-amphtml-tooltip-text" ref="text"></p>
-          <div class="i-amphtml-tooltip-action-icon"></div>
-          <div class="i-amphtml-story-tooltip-arrow" ref="arrow"></div>
-        </a>
+        {this.tooltip_}
       </section>
     );
-    const overlayEls = htmlRefs(tooltipOverlay);
-    const {arrow, buttonLeft, buttonRight, tooltip} =
-      /** @type {!tooltipElementsDef} */ (overlayEls);
-
-    this.tooltip_ = tooltip;
-    this.tooltipArrow_ = arrow;
-    this.buttonLeft_ = buttonLeft;
-    this.buttonRight_ = buttonRight;
-    const rtlState = this.storeService_.get(StateProperty.RTL_STATE);
-
-    this.buttonLeft_.addEventListener('click', (e) =>
-      this.onNavigationalClick_(
-        e,
-        rtlState ? EventType.NEXT_PAGE : EventType.PREVIOUS_PAGE
-      )
-    );
-
-    this.buttonRight_.addEventListener('click', (e) =>
-      this.onNavigationalClick_(
-        e,
-        rtlState ? EventType.PREVIOUS_PAGE : EventType.NEXT_PAGE
-      )
-    );
-
-    return tooltipOverlay;
   }
 
   /**
diff --git a/extensions/amp-story/1.0/amp-story-form.js b/extensions/amp-story/1.0/amp-story-form.js
deleted file mode 100644
index 0d92904a2beb..000000000000
--- a/extensions/amp-story/1.0/amp-story-form.js
+++ /dev/null
@@ -1,152 +0,0 @@
-import * as Preact from '#core/dom/jsx';
-import {Action, getStoreService} from './amp-story-store-service';
-import {LoadingSpinner} from './loading-spinner';
-import {LocalizedStringId} from '#service/localization/strings';
-import {escapeCssSelectorIdent} from '#core/dom/css-selectors';
-import {localize} from './amp-story-localization-service';
-import {scopedQuerySelector, scopedQuerySelectorAll} from '#core/dom/query';
-
-/**
- * @enum {string}
- */
-const FormResponseAttribute = {
-  SUBMITTING: 'submitting',
-  SUCCESS: 'submit-success',
-  ERROR: 'submit-error',
-};
-
-/**
- * @enum {string}
- */
-const AttributeElementSelector = {
-  SUBMITTING: `[${escapeCssSelectorIdent(FormResponseAttribute.SUBMITTING)}]`,
-  SUCCESS: `[${escapeCssSelectorIdent(FormResponseAttribute.SUCCESS)}]`,
-  ERROR: `[${escapeCssSelectorIdent(FormResponseAttribute.ERROR)}]`,
-};
-
-/**
- * Adds AMP form actions to the action allow list.
- * @param {!Window} win
- */
-export function allowlistFormActions(win) {
-  const storeService = getStoreService(win);
-  storeService.dispatch(Action.ADD_TO_ACTIONS_ALLOWLIST, [
-    {tagOrTarget: 'FORM', method: 'clear'},
-    {tagOrTarget: 'FORM', method: 'submit'},
-  ]);
-}
-
-/**
- * Add a default form attribute element for each absent response attribute.
- * @param {!Window} win
- * @param {!Element} formEl The form to which the attribute elements will be
- *     added.
- * @private
- */
-export function setupResponseAttributeElements(win, formEl) {
-  let submittingEl = scopedQuerySelector(
-    formEl,
-    AttributeElementSelector.SUBMITTING
-  );
-  let successEl = scopedQuerySelector(formEl, AttributeElementSelector.SUCCESS);
-  let errorEl = scopedQuerySelector(formEl, AttributeElementSelector.ERROR);
-
-  // Create and append fallback form attribute elements, if necessary.
-  if (!submittingEl) {
-    submittingEl = createFormSubmittingEl_(formEl);
-    formEl.appendChild(submittingEl);
-  }
-  if (!successEl) {
-    successEl = createFormResultEl_(win, formEl, true);
-    formEl.appendChild(successEl);
-  }
-  if (!errorEl) {
-    errorEl = createFormResultEl_(win, formEl, false);
-    formEl.appendChild(errorEl);
-  }
-}
-
-/**
- * @param {!Element} formEl The form to which the attribute elements belong.
- * @return {!Array<!Element>} The list of response attribute elements that
- *     belong to the given form.
- * @private
- */
-export function getResponseAttributeElements(formEl) {
-  const selector = `
-    ${AttributeElementSelector.SUBMITTING},
-    ${AttributeElementSelector.SUCCESS},
-    ${AttributeElementSelector.ERROR}`;
-  return Array.from(scopedQuerySelectorAll(formEl, selector));
-}
-
-/**
- * Create an element that is used to display the in-progress state of a form
- * submission attempt.
- * @param {!Element} formEl The form to which the `submitting` element will be
- *     added.
- * @return {!Element}
- * @private
- */
-function createFormSubmittingEl_(formEl) {
-  const submittingEl = createResponseAttributeEl_(
-    formEl,
-    FormResponseAttribute.SUBMITTING
-  );
-  const loadingSpinner = new LoadingSpinner();
-  submittingEl.firstElementChild.appendChild(loadingSpinner.build());
-  loadingSpinner.toggle(true /* isActive */);
-  return submittingEl;
-}
-
-/**
- * Create an element that is used to display the result of a form submission
- * attempt.
- * @param {!Window} win
- * @param {!Element} formEl The form to which the result element will be added.
- * @param {boolean} isSuccess Whether the form submission was successful.
- * @return {!Element}
- * @private
- */
-function createFormResultEl_(win, formEl, isSuccess) {
-  const resultEl = createResponseAttributeEl_(
-    formEl,
-    isSuccess ? FormResponseAttribute.SUCCESS : FormResponseAttribute.ERROR
-  );
-
-  const iconEl = win.document.createElement('div');
-  iconEl.classList.add(
-    'i-amphtml-story-page-attachment-form-submission-status-icon'
-  );
-  resultEl.firstElementChild.appendChild(iconEl);
-
-  const textEl = win.document.createElement('div');
-  textEl.textContent = localize(
-    win.document,
-    isSuccess
-      ? LocalizedStringId.AMP_STORY_FORM_SUBMIT_SUCCESS
-      : LocalizedStringId.AMP_STORY_FORM_SUBMIT_ERROR
-  );
-  resultEl.firstElementChild.appendChild(textEl);
-
-  return resultEl;
-}
-
-/**
- * Create an element that is used to display the form status corresponding to
- * the given response attribute.
- * @param {!Element} formEl The form to which the `submitting` element will be
- *     added.
- * @param {!FormResponseAttribute} responseAttribute
- * @return {!Element}
- * @private
- */
-function createResponseAttributeEl_(formEl, responseAttribute) {
-  const statusEl = (
-    <div>
-      <div class="i-amphtml-story-page-attachment-form-submission-status"></div>
-    </div>
-  );
-  statusEl.setAttribute(responseAttribute, '');
-  return statusEl;
-}
diff --git a/extensions/amp-story/1.0/amp-story-grid-layer.js b/extensions/amp-story/1.0/amp-story-grid-layer.js
index d646e40986da..01dc30d355e8 100644
--- a/extensions/amp-story/1.0/amp-story-grid-layer.js
+++ b/extensions/amp-story/1.0/amp-story-grid-layer.js
@@ -10,19 +10,20 @@
  * </code>
  */
 
-import {AmpStoryBaseLayer} from './amp-story-base-layer';
+import {scopedQuerySelectorAll} from '#core/dom/query';
 import {
   assertDoesNotContainDisplay,
   setImportantStyles,
   setStyles,
 } from '#core/dom/style';
+
+import {AmpStoryBaseLayer} from './amp-story-base-layer';
 import {isPrerenderActivePage} from './prerender-active-page';
-import {scopedQuerySelectorAll} from '#core/dom/query';
 
 /**
  * A mapping of attribute names we support for grid layers to the CSS Grid
  * properties they control.
- * @private @const {!Object<string, string>}
+ * @private @const {!{[key: string]: string}}
  */
 const SUPPORTED_CSS_GRID_ATTRIBUTES = {
   'align-content': 'alignContent',
@@ -58,11 +59,16 @@ export let PresetDetails;
  * Grid layer template templating system.
  */
 export class AmpStoryGridLayer extends AmpStoryBaseLayer {
-  /** @override @nocollapse */
+  /** @override  */
   static prerenderAllowed(element) {
     return isPrerenderActivePage(element.parentElement);
   }
 
+  /** @override  */
+  static previewAllowed() {
+    return true;
+  }
+
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -102,7 +108,7 @@ export class AmpStoryGridLayer extends AmpStoryBaseLayer {
       SUPPORTED_CSS_GRID_ATTRIBUTES_SELECTOR
     );
 
-    Array.prototype.forEach.call(elementsToUpgradeStyles, (element) => {
+    elementsToUpgradeStyles.forEach((element) => {
       this.setCssGridStyles_(element);
     });
   }
diff --git a/extensions/amp-story/1.0/amp-story-hint.css b/extensions/amp-story/1.0/amp-story-hint.css
index 046e53f0ccdf..1b12c2658e18 100644
--- a/extensions/amp-story/1.0/amp-story-hint.css
+++ b/extensions/amp-story/1.0/amp-story-hint.css
@@ -93,14 +93,14 @@
 
 .show-navigation-overlay .prev-page .i-amphtml-story-hint-tap-button-icon:before {
   content: '' !important;
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="30px" height="30px" viewBox="0 0 24 24" fill="#000000"><path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12z"/><path d="M0 0h24v24H0z" fill="none"/></svg>') !important;
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 24 24"><path d="M15.4 7.4 14 6l-6 6 6 6 1.4-1.4-4.6-4.6z"/><path d="M0 0h24v24H0z" fill="none"/></svg>') !important;
   width: 30px !important;
   height: 30px !important;
   display: inline-block !important;
 }
 
 [dir=rtl].show-navigation-overlay .prev-page .i-amphtml-story-hint-tap-button-icon:before {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="30px" height="30px" viewBox="0 0 24 24" fill="#000000"><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/><path d="M0 0h24v24H0z" fill="none"/></svg>') !important;
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 24 24"><path d="M10 6 8.6 7.4l4.6 4.6-4.6 4.6L10 18l6-6z"/><path d="M0 0h24v24H0z" fill="none"/></svg>') !important;
 }
 
 .i-amphtml-story-hint-container .i-amphtml-story-hint-tap-button {
@@ -146,14 +146,14 @@
 
 .next-page .i-amphtml-story-hint-tap-button-icon:after {
   content: '' !important;
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="30px" height="30px" viewBox="0 0 24 24" fill="#000000"><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/><path d="M0 0h24v24H0z" fill="none"/></svg>') !important;
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 24 24"><path d="M10 6 8.6 7.4l4.6 4.6-4.6 4.6L10 18l6-6z"/><path d="M0 0h24v24H0z" fill="none"/></svg>') !important;
   width: 24px !important;
   height: 24px !important;
   display: inline-block !important;
 }
 
 [dir=rtl] .next-page .i-amphtml-story-hint-tap-button-icon:after {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="30px" height="30px" viewBox="0 0 24 24" fill="#000000"><path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12z"/><path d="M0 0h24v24H0z" fill="none"/></svg>') !important;
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 24 24"><path d="M15.4 7.4 14 6l-6 6 6 6 1.4-1.4-4.6-4.6z"/><path d="M0 0h24v24H0z" fill="none"/></svg>') !important;
 }
 
 .i-amphtml-story-hint-placeholder {
diff --git a/extensions/amp-story/1.0/amp-story-hint.js b/extensions/amp-story/1.0/amp-story-hint.js
index df2b43eef87e..62b4c9be30b9 100644
--- a/extensions/amp-story/1.0/amp-story-hint.js
+++ b/extensions/amp-story/1.0/amp-story-hint.js
@@ -1,21 +1,23 @@
 import * as Preact from '#core/dom/jsx';
-import {CSS} from '../../../build/amp-story-hint-1.0.css';
+
+import {Services} from '#service';
+import {LocalizedStringId_Enum} from '#service/localization/strings';
+
+import {localizeTemplate} from './amp-story-localization-service';
 import {
   EmbeddedComponentState,
   StateProperty,
-  UIType,
+  UIType_Enum,
   getStoreService,
 } from './amp-story-store-service';
-import {LocalizedStringId} from '#service/localization/strings';
-import {Services} from '#service';
 import {createShadowRootWithStyle} from './utils';
-import {localize} from './amp-story-localization-service';
+
+import {CSS} from '../../../build/amp-story-hint-1.0.css';
 
 /**
- * @param {!Element} element
  * @return {!Element}
  */
-const renderHintElement = (element) => (
+const renderHintElement = () => (
   <aside
     class={
       'i-amphtml-story-hint-container ' +
@@ -28,12 +30,12 @@ const renderHintElement = (element) => (
           <div class="i-amphtml-story-hint-tap-button">
             <div class="i-amphtml-story-hint-tap-button-icon" />
           </div>
-          <div class="i-amphtml-story-hint-tap-button-text">
-            {localize(
-              element,
-              LocalizedStringId.AMP_STORY_HINT_UI_PREVIOUS_LABEL
-            )}
-          </div>
+          <div
+            class="i-amphtml-story-hint-tap-button-text"
+            i-amphtml-i18n-text-content={
+              LocalizedStringId_Enum.AMP_STORY_HINT_UI_PREVIOUS_LABEL
+            }
+          ></div>
         </div>
       </div>
       <div class="i-amphtml-story-navigation-help-section next-page">
@@ -41,9 +43,12 @@ const renderHintElement = (element) => (
           <div class="i-amphtml-story-hint-tap-button">
             <div class="i-amphtml-story-hint-tap-button-icon" />
           </div>
-          <div class="i-amphtml-story-hint-tap-button-text">
-            {localize(element, LocalizedStringId.AMP_STORY_HINT_UI_NEXT_LABEL)}
-          </div>
+          <div
+            class="i-amphtml-story-hint-tap-button-text"
+            i-amphtml-i18n-text-content={
+              LocalizedStringId_Enum.AMP_STORY_HINT_UI_NEXT_LABEL
+            }
+          ></div>
         </div>
       </div>
     </div>
@@ -74,12 +79,6 @@ export class AmpStoryHint {
     /** @private {!Window} */
     this.win_ = win;
 
-    /** @private {boolean} Whether the component is built. */
-    this.isBuilt_ = false;
-
-    /** @private {!Document} */
-    this.document_ = this.win_.document;
-
     /** @const @private {!../../../src/service/vsync-impl.Vsync} */
     this.vsync_ = Services.vsyncFor(this.win_);
 
@@ -103,15 +102,18 @@ export class AmpStoryHint {
    * Builds the hint layer DOM.
    */
   build() {
-    if (this.isBuilt()) {
+    if (this.hintContainer_) {
       return;
     }
 
-    this.isBuilt_ = true;
+    this.hintContainer_ = renderHintElement();
 
-    const root = this.document_.createElement('div');
-    this.hintContainer_ = renderHintElement(this.parentEl_);
-    createShadowRootWithStyle(root, this.hintContainer_, CSS);
+    localizeTemplate(this.hintContainer_, this.parentEl_).then(() => {
+      const root = createShadowRootWithStyle(<div />, this.hintContainer_, CSS);
+      this.vsync_.mutate(() => {
+        this.parentEl_.appendChild(root);
+      });
+    });
 
     this.storeService_.subscribe(
       StateProperty.RTL_STATE,
@@ -138,18 +140,6 @@ export class AmpStoryHint {
         );
       }
     );
-
-    this.vsync_.mutate(() => {
-      this.parentEl_.appendChild(root);
-    });
-  }
-
-  /**
-   * Whether the component is built.
-   * @return {boolean}
-   */
-  isBuilt() {
-    return this.isBuilt_;
   }
 
   /**
@@ -158,7 +148,7 @@ export class AmpStoryHint {
    * @private
    */
   showHint_(hintClass) {
-    if (this.storeService_.get(StateProperty.UI_STATE) !== UIType.MOBILE) {
+    if (this.storeService_.get(StateProperty.UI_STATE) !== UIType_Enum.MOBILE) {
       return;
     }
 
@@ -224,7 +214,7 @@ export class AmpStoryHint {
 
   /** @private */
   hideInternal_() {
-    if (!this.isBuilt()) {
+    if (!this.hintContainer_) {
       return;
     }
 
diff --git a/extensions/amp-story/1.0/amp-story-info-dialog.css b/extensions/amp-story/1.0/amp-story-info-dialog.css
index dc8c4596ddd9..06fb48b495e4 100644
--- a/extensions/amp-story/1.0/amp-story-info-dialog.css
+++ b/extensions/amp-story/1.0/amp-story-info-dialog.css
@@ -15,7 +15,6 @@
 */
 
 @import './amp-story-shadow-reset.css';
-@import './amp-story-share.css';
 
 .i-amphtml-story-info-dialog {
   position: absolute !important;
diff --git a/extensions/amp-story/1.0/amp-story-info-dialog.js b/extensions/amp-story/1.0/amp-story-info-dialog.js
index f1613f6ac1e4..ce1659932097 100644
--- a/extensions/amp-story/1.0/amp-story-info-dialog.js
+++ b/extensions/amp-story/1.0/amp-story-info-dialog.js
@@ -1,23 +1,25 @@
 import * as Preact from '#core/dom/jsx';
-import {
-  ANALYTICS_TAG_NAME,
-  StoryAnalyticsEvent,
-  getAnalyticsService,
-} from './story-analytics';
+import {closest, matches} from '#core/dom/query';
+
+import {Services} from '#service';
+import {LocalizedStringId_Enum} from '#service/localization/strings';
+
+import {dev} from '#utils/log';
+
+import {localizeTemplate} from './amp-story-localization-service';
 import {
   Action,
   StateProperty,
   getStoreService,
 } from './amp-story-store-service';
-import {CSS} from '../../../build/amp-story-info-dialog-1.0.css';
-import {LocalizedStringId} from '#service/localization/strings';
-import {Services} from '#service';
-import {assertAbsoluteHttpOrHttpsUrl} from '../../../src/url';
-import {closest, matches} from '#core/dom/query';
+import {
+  ANALYTICS_TAG_NAME,
+  StoryAnalyticsEvent,
+  getAnalyticsService,
+} from './story-analytics';
 import {createShadowRootWithStyle, triggerClickFromLightDom} from './utils';
-import {dev} from '#utils/log';
-import {getAmpdoc} from '../../../src/service-helpers';
-import {localize} from './amp-story-localization-service';
+
+import {CSS} from '../../../build/amp-story-info-dialog-1.0.css';
 
 /** @const {string} Class to toggle the info dialog. */
 export const DIALOG_VISIBLE_CLASS = 'i-amphtml-story-info-dialog-visible';
@@ -42,12 +44,6 @@ export class InfoDialog {
     /** @private {?Element} */
     this.element_ = null;
 
-    /** @private {?Element} */
-    this.innerContainerEl_ = null;
-
-    /** @private {boolean} */
-    this.isBuilt_ = false;
-
     /** @private @const {!./amp-story-store-service.AmpStoryStoreService} */
     this.storeService_ = getStoreService(this.win_);
 
@@ -58,13 +54,10 @@ export class InfoDialog {
     this.parentEl_ = parentEl;
 
     /** @private @const {!../../../src/service/mutator-interface.MutatorInterface} */
-    this.mutator_ = Services.mutatorForDoc(getAmpdoc(this.win_.document));
-
-    /** @private {?Element} */
-    this.moreInfoLinkEl_ = null;
+    this.mutator_ = Services.mutatorForDoc(parentEl);
 
     /** @const @private {!../../../src/service/viewer-interface.ViewerInterface} */
-    this.viewer_ = Services.viewerForDoc(this.parentEl_);
+    this.viewer_ = Services.viewerForDoc(parentEl);
   }
 
   /**
@@ -73,55 +66,75 @@ export class InfoDialog {
    *     before assertions.
    */
   build() {
-    if (this.isBuilt()) {
+    if (this.element_) {
       return Promise.resolve();
     }
 
-    this.isBuilt_ = true;
-    const root = this.win_.document.createElement('div');
+    const {canonicalUrl} = Services.documentInfoForDoc(this.parentEl_);
+
+    const linkElement = (
+      <a
+        class="i-amphtml-story-info-moreinfo"
+        target="_blank"
+        i-amphtml-i18n-text-content={
+          LocalizedStringId_Enum.AMP_STORY_DOMAIN_DIALOG_HEADING_LINK
+        }
+      ></a>
+    );
+
     this.element_ = (
-      <div class="i-amphtml-story-info-dialog i-amphtml-story-system-reset">
-        <div class="i-amphtml-story-info-dialog-container">
-          <h1 class="i-amphtml-story-info-heading"></h1>
-          <a class="i-amphtml-story-info-link"></a>
-          <a class="i-amphtml-story-info-moreinfo"></a>
+      <div
+        class="i-amphtml-story-info-dialog i-amphtml-story-system-reset"
+        onClick={(event) => {
+          // Close if click occurred directly on this element.
+          if (event.target === event.currentTarget) {
+            this.close_();
+          }
+        }}
+      >
+        <div
+          class="i-amphtml-story-info-dialog-container"
+          onClick={(event) => {
+            this.onClick_(event);
+          }}
+        >
+          <h1
+            class="i-amphtml-story-info-heading"
+            i-amphtml-i18n-text-content={
+              LocalizedStringId_Enum.AMP_STORY_DOMAIN_DIALOG_HEADING_LABEL
+            }
+          ></h1>
+          <a class="i-amphtml-story-info-link" href={canonicalUrl}>
+            {
+              // Add zero-width space character (\u200B) after "." and "/"
+              // characters to help line-breaks occur more naturally.
+              canonicalUrl.replace(/([/.]+)/gi, '$1\u200B')
+            }
+          </a>
+          {linkElement}
         </div>
       </div>
     );
 
-    createShadowRootWithStyle(root, this.element_, CSS);
     this.initializeListeners_();
 
-    this.innerContainerEl_ = this.element_.querySelector(
-      '.i-amphtml-story-info-dialog-container'
-    );
-
-    const appendPromise = this.mutator_.mutateElement(this.parentEl_, () => {
-      this.parentEl_.appendChild(root);
-    });
-
-    const pageUrl = Services.documentInfoForDoc(
-      getAmpdoc(this.parentEl_)
-    ).canonicalUrl;
-
     return Promise.all([
-      appendPromise,
-      this.setHeading_(),
-      this.setPageLink_(pageUrl),
-      this.requestMoreInfoLink_().then((moreInfoUrl) =>
-        this.setMoreInfoLinkUrl_(moreInfoUrl)
-      ),
+      localizeTemplate(this.element_, this.parentEl_),
+      this.mutator_.mutateElement(this.parentEl_, () => {
+        const root = createShadowRootWithStyle(<div />, this.element_, CSS);
+        this.parentEl_.appendChild(root);
+      }),
+      this.requestMoreInfoLink_().then((moreInfoUrl) => {
+        if (moreInfoUrl) {
+          return this.mutator_.mutateElement(this.parentEl_, () => {
+            linkElement.classList.add(MOREINFO_VISIBLE_CLASS);
+            linkElement.setAttribute('href', moreInfoUrl);
+          });
+        }
+      }),
     ]);
   }
 
-  /**
-   * Whether the element has been built.
-   * @return {boolean}
-   */
-  isBuilt() {
-    return this.isBuilt_;
-  }
-
   /**
    * @private
    */
@@ -129,10 +142,6 @@ export class InfoDialog {
     this.storeService_.subscribe(StateProperty.INFO_DIALOG_STATE, (isOpen) => {
       this.onInfoDialogStateUpdated_(isOpen);
     });
-
-    this.element_.addEventListener('click', (event) =>
-      this.onInfoDialogClick_(event)
-    );
   }
 
   /**
@@ -154,18 +163,12 @@ export class InfoDialog {
   }
 
   /**
-   * Handles click events and maybe closes the dialog.
    * @param  {!Event} event
    */
-  onInfoDialogClick_(event) {
-    const el = dev().assertElement(event.target);
-    // Closes the dialog if click happened outside of the dialog main container.
-    if (!closest(el, (el) => el === this.innerContainerEl_, this.element_)) {
-      this.close_();
-    }
+  onClick_(event) {
     const anchorClicked = closest(event.target, (e) => matches(e, 'a[href]'));
     if (anchorClicked) {
-      triggerClickFromLightDom(anchorClicked, this.element);
+      triggerClickFromLightDom(anchorClicked, this.element_);
       event.preventDefault();
     }
   }
@@ -193,73 +196,9 @@ export class InfoDialog {
         if (!moreInfoUrl) {
           return null;
         }
-        return assertAbsoluteHttpOrHttpsUrl(dev().assertString(moreInfoUrl));
+        return Services.urlForDoc(this.parentEl_).assertAbsoluteHttpOrHttpsUrl(
+          dev().assertString(moreInfoUrl)
+        );
       });
   }
-
-  /**
-   * Sets the heading on the dialog.
-   * @return {*} TODO(#23582): Specify return type
-   */
-  setHeading_() {
-    const label = localize(
-      this.parentEl_,
-      LocalizedStringId.AMP_STORY_DOMAIN_DIALOG_HEADING_LABEL
-    );
-    const headingEl = dev().assertElement(
-      this.element_.querySelector('.i-amphtml-story-info-heading')
-    );
-
-    return this.mutator_.mutateElement(headingEl, () => {
-      headingEl.textContent = label;
-    });
-  }
-
-  /**
-   * @param {string} pageUrl The URL to the canonical version of the current
-   *     document.
-   * @return {*} TODO(#23582): Specify return type
-   */
-  setPageLink_(pageUrl) {
-    const linkEl = dev().assertElement(
-      this.element_.querySelector('.i-amphtml-story-info-link')
-    );
-
-    return this.mutator_.mutateElement(linkEl, () => {
-      linkEl.setAttribute('href', pageUrl);
-
-      // Add zero-width space character (\u200B) after "." and "/" characters
-      // to help line-breaks occur more naturally.
-      linkEl.textContent = pageUrl.replace(/([/.]+)/gi, '$1\u200B');
-    });
-  }
-
-  /**
-   * @param {?string} moreInfoUrl The URL to the "more info" page, if there is
-   * one.
-   * @return {*} TODO(#23582): Specify return type
-   */
-  setMoreInfoLinkUrl_(moreInfoUrl) {
-    if (!moreInfoUrl) {
-      return Promise.resolve();
-    }
-
-    this.moreInfoLinkEl_ = dev().assertElement(
-      this.element_.querySelector('.i-amphtml-story-info-moreinfo')
-    );
-
-    return this.mutator_.mutateElement(this.moreInfoLinkEl_, () => {
-      const label = localize(
-        this.parentEl_,
-        LocalizedStringId.AMP_STORY_DOMAIN_DIALOG_HEADING_LINK
-      );
-      this.moreInfoLinkEl_.classList.add(MOREINFO_VISIBLE_CLASS);
-      this.moreInfoLinkEl_.setAttribute(
-        'href',
-        dev().assertString(moreInfoUrl)
-      );
-      this.moreInfoLinkEl_.setAttribute('target', '_blank');
-      this.moreInfoLinkEl_.textContent = label;
-    });
-  }
 }
diff --git a/extensions/amp-story/1.0/amp-story-localization-service.js b/extensions/amp-story/1.0/amp-story-localization-service.js
index d7b5f7b7a071..d113e2d204c3 100644
--- a/extensions/amp-story/1.0/amp-story-localization-service.js
+++ b/extensions/amp-story/1.0/amp-story-localization-service.js
@@ -1,8 +1,16 @@
-import {LocalizationService} from '#service/localization';
+import {getWin} from '#core/window';
+
 import {Services} from '#service';
+import {LocalizationService} from '#service/localization';
+
 import {registerServiceBuilderForDoc} from '../../../src/service-helpers';
-// eslint-disable-next-line no-unused-vars
-import {LocalizedStringId} from '#service/localization/strings';
+
+/**
+ * AMP_STORY_SUPPORTED_LANGUAGES is replaced by a babel plugin with a list
+ * of supported languages amp-story supports for localization string.
+ * @const {string[]}
+ */
+const SUPPORTED_LANGUAGES = AMP_STORY_SUPPORTED_LANGUAGES;
 
 /**
  * Util function to retrieve the localization service. Ensures we can retrieve
@@ -25,10 +33,61 @@ export function getLocalizationService(element) {
 }
 
 /**
- * @param {!Node} context
- * @param {LocalizedStringId} key
- * @return {?string}
+ * Adds the localized strings onto the template as aria labels or text contents.
+ * Uses `i-amphtml-i18n-text-content` or `i-amphtml-i18n-aria-label` attributes.
+ * @param {!Element} template
+ * @param {!Element} context
+ * @return {!Promise}
+ */
+export function localizeTemplate(template, context) {
+  const localizationService = Services.localizationForDoc(context);
+  const vsync = Services.vsyncFor(getWin(context));
+  const promises = [];
+  template.querySelectorAll('[i-amphtml-i18n-aria-label]').forEach((el) => {
+    promises.push(
+      localizationService
+        .getLocalizedStringAsync(el.getAttribute('i-amphtml-i18n-aria-label'))
+        .then((str) => el.setAttribute('aria-label', str))
+    );
+    el.removeAttribute('i-amphtml-i18n-aria-label');
+  });
+  template.querySelectorAll('[i-amphtml-i18n-text-content]').forEach((el) => {
+    promises.push(
+      localizationService
+        .getLocalizedStringAsync(el.getAttribute('i-amphtml-i18n-text-content'))
+        .then((str) =>
+          template.isConnected
+            ? vsync.mutatePromise(() => {
+                el.textContent = str;
+              })
+            : (el.textContent = str)
+        )
+    );
+    el.removeAttribute('i-amphtml-i18n-text-content');
+  });
+  return Promise.all(promises);
+}
+
+/**
+ * Cross references the candidateLanguageCodes with the supportedLanguageCodes
+ * to ensure that the candidate language is supported.
+ * @param {string[]} candidateLanguageCodes
+ * @return {string}
+ * @private
  */
-export function localize(context, key) {
-  return getLocalizationService(context).getLocalizedString(key);
+export function getSupportedLanguageCode(candidateLanguageCodes) {
+  // IETF BCP 47 language tag and ISO-639 are not case sensitive but
+  // the request to the Google AMP Cache is, so we make sure to maintain
+  // the correct language code casing when making the request.
+  for (let x = 0; x < candidateLanguageCodes.length; x++) {
+    const curCandidateLanguageCode = candidateLanguageCodes[x].toLowerCase();
+    for (let y = 0; y < SUPPORTED_LANGUAGES.length; y++) {
+      const curSupportedLanguage = SUPPORTED_LANGUAGES[y].toLowerCase();
+      if (curSupportedLanguage === curCandidateLanguageCode) {
+        // We return the original un-lowercased value.
+        return SUPPORTED_LANGUAGES[y];
+      }
+    }
+  }
+  return 'en';
 }
diff --git a/extensions/amp-story/1.0/amp-story-open-page-attachment.css b/extensions/amp-story/1.0/amp-story-open-page-attachment.css
deleted file mode 100644
index 2bbb30bb4caf..000000000000
--- a/extensions/amp-story/1.0/amp-story-open-page-attachment.css
+++ /dev/null
@@ -1,315 +0,0 @@
-
-
-/**
-   * Hiding the element and only showing it on the active page so the animation
-   * triggers every time the page becomes active.
-   */
-.i-amphtml-story-page-open-attachment {
-  display: none !important;
-  --i-amphtml-chip-background-color: rgba(255, 255, 255, 0.5) !important;
-  --i-amphtml-img-background-color: white !important;
-  --i-amphtml-label-text-color: white !important;
-  --i-amphtml-arrow-color: black !important;
-  --i-amphtml-page-attachment-ui-animation-delay: 1s !important;
-  --i-amphtml-page-attachment-ui-animation-duration: .6s !important;
-}
-
-[theme="dark"].i-amphtml-story-page-open-attachment {
-  --i-amphtml-chip-background-color: rgba(0, 0, 0, 0.5) !important;
-  --i-amphtml-img-background-color: black !important;
-  --i-amphtml-label-text-color: black !important;
-  --i-amphtml-arrow-color: white !important;
-}
-
-.i-amphtml-story-page-open-attachment[active] {
-  display: flex !important;
-  align-items: center !important;
-  justify-content: center !important;
-  flex-direction: column !important;
-  position: absolute !important;
-  bottom: 0 !important;
-  left: 0 !important;
-  width: 100% !important;
-  background: linear-gradient(0, rgba(0, 0, 0, 0.15), transparent) !important;
-  pointer-events: none !important;
-  z-index: 3 !important;
-  -webkit-touch-callout: default !important; /* Allow long pressing the button to open context menu in iOS */
-  text-decoration: none !important;
-}
-
-.i-amphtml-story-page-open-attachment:not([active]) {
-  /* Prevent tabbing to inactive page's buttons */
-  visibility: hidden !important;
-}
-
-.i-amphtml-story-page-open-attachment > * {
-  cursor: pointer !important;
-  pointer-events: auto !important;
-}
-
-.i-amphtml-story-page-open-attachment-icon {
-  display: block !important;
-  height: 32px !important;
-  width: 32px !important;
-  cursor: pointer !important;
-  animation: open-attachment-icon 0.2s cubic-bezier(0.4, 0, 0.2, 1) 2s both !important;
-}
-
-.i-amphtml-story-page-open-attachment-icon::after {
-  content: '' !important;
-  position: absolute !important;
-  top: 0 !important;
-  left: 0 !important;
-  height: 100% !important;
-  width: 100% !important;
-  background: #fff !important;
-  border-radius: 100% !important;
-  z-index: -1 !important;
-  animation: open-attachment-icon-explode 0.25s cubic-bezier(0.4, 0, 0.2, 1) 2s
-    both !important;
-}
-
-.i-amphtml-story-page-open-attachment-bar-left,
-.i-amphtml-story-page-open-attachment-bar-right,
-.i-amphtml-story-outlink-page-open-attachment-bar-left,
-.i-amphtml-story-outlink-page-open-attachment-bar-right {
-  position: absolute !important;
-  display: block !important;
-  height: 3px !important;
-  width: 12px !important;
-  border-radius: 3px !important;
-  top: 14px !important;
-}
-
-.i-amphtml-story-page-open-attachment-bar-left {
-  left: 6px !important;
-  animation: open-attachment-icon-color 0.25s cubic-bezier(0.4, 0, 0.2, 1) 2s
-      both,
-    open-attachment-bar-left 0.3s cubic-bezier(0.4, 0, 0.2, 1) both !important;
-}
-
-.i-amphtml-story-page-open-attachment-bar-right {
-  right: 6px !important;
-  animation: open-attachment-icon-color 0.25s cubic-bezier(0.4, 0, 0.2, 1) 2s
-      both,
-    open-attachment-bar-right 0.3s cubic-bezier(0.4, 0, 0.2, 1) both !important;
-}
-
-.i-amphtml-story-page-open-attachment-label {
-  position: relative !important;
-  padding: 12px 32px 20px 32px !important;
-  height: 16px !important;
-  max-width: calc(100% - 64px) !important;
-  color: #fff !important;
-  font-family: 'Roboto', sans-serif !important;
-  font-size: 16px !important;
-  font-weight: bold !important;
-  letter-spacing: 0.3px;
-  line-height: 16px !important;
-  overflow: hidden !important;
-  text-overflow: ellipsis !important;
-  text-shadow: 0px 0px 6px rgba(0, 0, 0, 0.36) !important;
-  white-space: nowrap !important;
-}
-
- .i-amphtml-story-page-attachment-label {
-  font-family: 'Roboto', sans-serif !important;
-  font-size: 16px !important;
-  font-weight: 700 !important;
-  letter-spacing: 0.3px;
-  overflow: hidden !important;
-  text-overflow: ellipsis !important;
-  white-space: nowrap !important;
-  max-width: 210px !important;
-  /* Prevents clipping of decenders. */
-  line-height: 18px !important;
-}
-
- .i-amphtml-story-page-open-attachment-label {
-  color: var(--i-amphtml-label-text-color) !important;
-}
-
- .i-amphtml-story-inline-page-attachment-chip {
-  background-color: var(--i-amphtml-chip-background-color) !important;
-  display: flex !important;
-  border-radius: 24px !important;
-  align-items: center !important;
-  overflow: hidden !important;
-  margin-bottom: 12px !important;
-}
-
-.i-amphtml-story-page-open-attachment[active] .i-amphtml-story-inline-page-attachment-chip {
-  animation: tap-scale var(--i-amphtml-page-attachment-ui-animation-duration) var(--i-amphtml-page-attachment-ui-animation-delay) both !important;
-}
-
-.i-amphtml-story-inline-page-attachment-chip:only-child {
-  margin-bottom: 20px !important;
-}
-
-.i-amphtml-story-inline-page-attachment-img {
-  background-size: contain !important;
-  background-repeat: no-repeat !important;
-}
-
-.i-amphtml-story-inline-page-attachment-img {
-  height: 48px !important;
-  width: 48px !important;
-  background-color: var(--i-amphtml-img-background-color) !important;
-}
-
-.i-amphtml-story-inline-page-attachment-img:nth-child(2) {
-  margin-inline-start: 1px !important;
-}
-
-.i-amphtml-story-inline-page-attachment-arrow {
-  position: relative !important;
-  height: 32px !important;
-  width: 32px !important;
-  border-radius: 50% !important;
-  background-color: var(--i-amphtml-img-background-color) !important;
-}
-
-.i-amphtml-story-inline-page-attachment-arrow:not(:only-child) {
-  margin: 8px !important;
-}
-
-.i-amphtml-story-inline-page-attachment-arrow:before {
-  content: '' !important;
-  position: absolute !important;
-  top: 0 !important;
-  left: 0 !important;
-  width: 100% !important;
-  height: 100% !important;
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 8" width="20px" height="8px"><path d="M18,7.7c-0.2,0-0.5-0.1-0.7-0.2l-7.3-4l-7.3,4C2,7.9,1.1,7.7,0.7,6.9c-0.4-0.7-0.1-1.6,0.6-2l8-4.4c0.5-0.2,1-0.2,1.5,0l8,4.4c0.7,0.4,1,1.3,0.6,2C19,7.4,18.5,7.7,18,7.7z"></path></svg>') !important;
-  background-position: center !important;
-  background-size: auto !important;
-  background-repeat: no-repeat !important;
-}
-
-.i-amphtml-story-page-open-attachment[active] .i-amphtml-story-inline-page-attachment-arrow:before {
-  animation: move-up-arrow-in-circle var(--i-amphtml-page-attachment-ui-animation-duration) var(--i-amphtml-page-attachment-ui-animation-delay) both !important;
-}
-
-[theme="dark"] .i-amphtml-story-inline-page-attachment-arrow:before {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg fill="white" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 8" width="20px" height="8px"><path d="M18,7.7c-0.2,0-0.5-0.1-0.7-0.2l-7.3-4l-7.3,4C2,7.9,1.1,7.7,0.7,6.9c-0.4-0.7-0.1-1.6,0.6-2l8-4.4c0.5-0.2,1-0.2,1.5,0l8,4.4c0.7,0.4,1,1.3,0.6,2C19,7.4,18.5,7.7,18,7.7z"></path></svg>') !important;
-}
-
-.i-amphtml-story-page-open-attachment:not([href]) .i-amphtml-story-page-attachment-label {
-  margin-bottom: 20px !important;
-  color: var(--i-amphtml-label-text-color) !important;
-}
-
-/** For amp-story-page-outlink button. */
-
-.i-amphtml-story-page-open-attachment {
-  --i-amphtml-outlink-cta-background-color: white !important;
-  --i-amphtml-outlink-cta-text-color: black !important;
-  background: linear-gradient(0, rgba(0, 0, 0, 0.25), rgba(0, 0, 0, 0)) !important;
-}
-
-[theme="dark"].i-amphtml-story-page-open-attachment {
-  --i-amphtml-outlink-cta-background-color: black !important;
-  --i-amphtml-outlink-cta-text-color: white !important;
-  background: linear-gradient(0, rgba(255, 255, 255, .25), rgba(255, 255, 255, 0)) !important;
-}
-
-[href].i-amphtml-story-page-open-attachment {
-  /* Outlink attachments do not need the linear gradient. */
-  background: none !important;
-}
-
-[href].i-amphtml-story-page-open-attachment[active] {
-  animation: tap-scale var(--i-amphtml-page-attachment-ui-animation-duration) var(--i-amphtml-page-attachment-ui-animation-delay) both !important;
-}
-
-.i-amphtml-story-outlink-page-attachment-arrow {
-  display: block !important;
-  cursor: pointer !important;
-  margin-bottom: 10px !important;
-  fill: var(--i-amphtml-outlink-cta-background-color) !important;
-  filter: drop-shadow(0px 2px 6px rgba(0, 0, 0, 0.3)) !important;
-}
-
-.i-amphtml-story-page-open-attachment[active] .i-amphtml-story-outlink-page-attachment-arrow {
-  animation: move-up-arrow var(--i-amphtml-page-attachment-ui-animation-duration) var(--i-amphtml-page-attachment-ui-animation-delay) both !important;
-}
-
-@keyframes move-up-arrow {
-  0%, 100% {
-    opacity: 1;
-    transform: translateY(0);
-  }
-  45% {
-    opacity: 0;
-    transform: translateY(-7px);
-  }
-  45.01% {
-    transform: translateY(5px);
-  }
-}
-
-@keyframes move-up-arrow-in-circle {
-  0%, 100% {
-    opacity: 1;
-    transform: translateY(0);
-  }
-  45% {
-    opacity: 0;
-    transform: translateY(-4px);
-  }
-  45.01% {
-    transform: translateY(3px);
-  }
-}
-
-@keyframes tap-scale {
-  0%, 100% {
-    transform: scale(1);
-  }
-  45% {
-    transform: scale(.9);
-  }
-}
-
-.i-amphtml-story-outlink-page-attachment-outlink-chip {
-  display: flex !important;
-  position: relative !important;
-  padding: 10px 6px 10px 6px !important;
-  margin: 0 0 20px 0 !important;
-  height: 16px !important;
-  max-width: calc(100% - 64px) !important;
-  border-radius: 30px !important;
-  background: var(--i-amphtml-outlink-cta-background-color) !important;
-  place-items: center !important;
-  box-shadow: 0px 4px 10px rgba(0, 0, 0, .15) !important;
-}
-
-.i-amphtml-story-outlink-page-attachment-img {
-  height: 24px !important;
-  width: 24px !important;
-  vertical-align: middle !important;
-  background-size: cover !important;
-  background-repeat: no-repeat !important;
-  background-position: center !important;
-  border-radius: 50% !important;
-}
-
-[href] .i-amphtml-story-page-attachment-label {
-  padding-inline-start: 6px !important;
-  padding-inline-end: 8px !important;
-  color: var(--i-amphtml-outlink-cta-text-color) !important;
-}
-
-[href] .i-amphtml-story-page-attachment-label:only-child {
-  padding-inline-start: 8px !important;
-}
-
-.i-amphtml-story-outlink-page-attachment-label:only-child {
-  padding-inline-start: 8px !important;
-}
-
-.i-amphtml-story-page-open-attachment-link-icon {
-  width: 24px !important;
-  height: 24px !important;
-  fill: var(--i-amphtml-outlink-cta-text-color) !important;
-}
diff --git a/extensions/amp-story/1.0/amp-story-open-page-attachment.js b/extensions/amp-story/1.0/amp-story-open-page-attachment.js
deleted file mode 100644
index edf54f43c90c..000000000000
--- a/extensions/amp-story/1.0/amp-story-open-page-attachment.js
+++ /dev/null
@@ -1,289 +0,0 @@
-import * as Preact from '#core/dom/jsx';
-/**
- * @fileoverview Helper for amp-story rendering of page-attachment UI.
- */
-import {AttachmentTheme} from './amp-story-page-attachment';
-import {LocalizedStringId} from '#service/localization/strings';
-import {computedStyle, setImportantStyles} from '#core/dom/style';
-import {dev} from '#utils/log';
-import {localize} from './amp-story-localization-service';
-import {
-  getRGBFromCssColorValue,
-  getTextColorForRGB,
-  maybeMakeProxyUrl,
-} from './utils';
-import {htmlRefs} from '#core/dom/static-template';
-import {getWin} from '#core/window';
-
-/**
- * @enum {string}
- */
-const CtaAccentElement = {
-  TEXT: 'text',
-  BACKGROUND: 'background',
-};
-
-/**
- * For amp-story-page-attachment elements.
- * @return {!Element}
- */
-export const renderInlineElement = () => (
-  <a
-    class="i-amphtml-story-page-open-attachment i-amphtml-story-system-reset"
-    role="button"
-  >
-    <div class="i-amphtml-story-inline-page-attachment-chip" ref="chipEl">
-      <div class="i-amphtml-story-inline-page-attachment-arrow"></div>
-    </div>
-  </a>
-);
-
-/**
- * UI template for amp-story-page-outlink elements and
- * the legacy amp-story-page-attachment with href.
- * @return {!Element}
- */
-const renderOutlinkElement = () => (
-  <a class="i-amphtml-story-page-open-attachment" role="button" target="_top">
-    <svg
-      class="i-amphtml-story-outlink-page-attachment-arrow"
-      xmlns="http://www.w3.org/2000/svg"
-      viewBox="0 0 20 8"
-      width="20px"
-      height="8px"
-    >
-      <path d="M18,7.7c-0.2,0-0.5-0.1-0.7-0.2l-7.3-4l-7.3,4C2,7.9,1.1,7.7,0.7,6.9c-0.4-0.7-0.1-1.6,0.6-2l8-4.4c0.5-0.2,1-0.2,1.5,0l8,4.4c0.7,0.4,1,1.3,0.6,2C19,7.4,18.5,7.7,18,7.7z"></path>
-    </svg>
-    <div
-      class="i-amphtml-story-outlink-page-attachment-outlink-chip"
-      ref="chipEl"
-    >
-      <span
-        class="i-amphtml-story-page-attachment-label"
-        ref="ctaLabelEl"
-      ></span>
-    </div>
-  </a>
-);
-
-/**
- * Link icon used in amp-story-page-outlink UI and drawer.
- * @return {!Element}
- */
-export const renderOutlinkLinkIconElement = () => (
-  <svg
-    class="i-amphtml-story-page-open-attachment-link-icon"
-    xmlns="http://www.w3.org/2000/svg"
-    viewBox="0 0 24 24"
-  >
-    <path
-      fill-opacity=".1"
-      d="M12 0c6.6 0 12 5.4 12 12s-5.4 12-12 12S0 18.6 0 12 5.4 0 12 0z"
-    ></path>
-    <path d="M13.8 14.6c.1.1.2.3.2.5s-.1.3-.2.5L12.3 17c-.7.7-1.7 1.1-2.7 1.1-1 0-1.9-.4-2.7-1.1-.7-.7-1.1-1.7-1.1-2.7 0-1 .4-1.9 1.1-2.7l1.5-1.5c.2 0 .3-.1.5-.1s.3.1.5.2c.1.1.2.3.2.5s-.1.4-.2.5l-1.5 1.5c-.5.5-.7 1.1-.7 1.7 0 .6.3 1.3.7 1.7.5.5 1.1.7 1.7.7s1.3-.3 1.7-.7l1.5-1.5c.3-.3.7-.3 1 0zM17 7c-.7-.7-1.7-1.1-2.7-1.1-1 0-1.9.4-2.7 1.1l-1.5 1.5c0 .1-.1.3-.1.4 0 .2.1.3.2.5.1.1.3.2.5.2s.3-.1.5-.2l1.5-1.5c.5-.5 1.1-.7 1.7-.7.6 0 1.3.3 1.7.7.5.5.7 1.1.7 1.7 0 .6-.3 1.3-.7 1.7l-1.5 1.5c-.1.1-.2.3-.2.5s.1.3.2.5c.1.1.3.2.5.2s.3-.1.5-.2l1.5-1.5c.7-.7 1.1-1.7 1.1-2.7-.1-1-.5-1.9-1.2-2.6zm-7.9 7.2c0 .2.1.3.2.5.1.1.3.2.5.2s.4-.1.5-.2l4.5-4.5c.1-.1.2-.3.2-.5s-.1-.4-.2-.5c-.3-.2-.8-.2-1 .1l-4.5 4.5c-.1.1-.2.3-.2.4z"></path>
-  </svg>
-);
-
-/**
- * Determines which open attachment UI to render.
- * @param {!Element} pageEl
- * @param {!Element} attachmentEl
- * @return {!Element}
- */
-export const renderPageAttachmentUI = (pageEl, attachmentEl) => {
-  // Outlinks can be an amp-story-page-outlink or the legacy version,
-  // an amp-story-page-attachment with an href.
-  const isOutlink =
-    attachmentEl.tagName === 'AMP-STORY-PAGE-OUTLINK' ||
-    attachmentEl.getAttribute('href');
-  if (isOutlink) {
-    return renderOutlinkUI(pageEl, attachmentEl);
-  } else {
-    return renderInlineUi(pageEl, attachmentEl);
-  }
-};
-
-/**
- * Renders inline page attachment UI.
- * @param {!Element} pageEl
- * @param {!Element} attachmentEl
- * @return {!Element}
- */
-const renderOutlinkUI = (pageEl, attachmentEl) => {
-  const openAttachmentEl = renderOutlinkElement();
-
-  // amp-story-page-outlink requires an anchor element child for SEO and analytics optimisations.
-  // amp-story-page-attachment uses this same codepath and allows an href attribute.
-  // This is hidden with css. Clicks are simulated from it when a remote attachment is clicked.
-  const anchorChild = pageEl
-    .querySelector('amp-story-page-outlink')
-    ?.querySelector('a');
-
-  // Copy href to the element so it can be previewed on hover and long press.
-  const attachmentHref =
-    anchorChild?.getAttribute('href') || attachmentEl.getAttribute('href');
-  if (attachmentHref) {
-    openAttachmentEl.setAttribute('href', attachmentHref);
-  }
-
-  // Copy title to the element if it exists.
-  const attachmentTitle =
-    anchorChild?.getAttribute('title') ||
-    attachmentEl.getAttribute('data-title');
-  if (attachmentTitle) {
-    openAttachmentEl.setAttribute('title', attachmentTitle);
-  }
-
-  // Get elements.
-  const {chipEl, ctaLabelEl} = htmlRefs(openAttachmentEl);
-
-  // Set theme.
-  let themeAttribute = attachmentEl.getAttribute('theme');
-  if (themeAttribute) {
-    themeAttribute = themeAttribute.toLowerCase();
-  }
-  openAttachmentEl.setAttribute('theme', themeAttribute);
-
-  if (themeAttribute === AttachmentTheme.CUSTOM) {
-    setCustomThemeStyles(attachmentEl, openAttachmentEl);
-  }
-
-  // Append text & aria-label.
-  const openLabelAttr =
-    anchorChild?.textContent ||
-    attachmentEl.getAttribute('cta-text') ||
-    attachmentEl.getAttribute('data-cta-text');
-  const openLabel = openLabelAttr
-    ? openLabelAttr.trim()
-    : localize(pageEl, LocalizedStringId.AMP_STORY_PAGE_ATTACHMENT_OPEN_LABEL);
-  ctaLabelEl.textContent = openLabel;
-  openAttachmentEl.setAttribute('aria-label', openLabel);
-
-  // Set image.
-  const openImgAttr = attachmentEl.getAttribute('cta-image');
-  if (openImgAttr && openImgAttr !== 'none') {
-    const ctaImgEl = (
-      <div class="i-amphtml-story-outlink-page-attachment-img"></div>
-    );
-    setImportantStyles(ctaImgEl, {
-      'background-image': 'url(' + openImgAttr + ')',
-    });
-    chipEl.prepend(ctaImgEl);
-  } else if (!openImgAttr) {
-    // Attach link icon SVG by default.
-    const linkImage = renderOutlinkLinkIconElement();
-    chipEl.prepend(linkImage);
-  }
-
-  return openAttachmentEl;
-};
-
-/**
- * Renders inline page attachment UI.
- * @param {!Element} pageEl
- * @param {!Element} attachmentEl
- * @return {!Element}
- */
-const renderInlineUi = (pageEl, attachmentEl) => {
-  const openAttachmentEl = renderInlineElement();
-
-  // Set theme.
-  const theme = attachmentEl.getAttribute('theme');
-  if (theme && AttachmentTheme.DARK === theme.toLowerCase()) {
-    openAttachmentEl.setAttribute('theme', AttachmentTheme.DARK);
-  }
-
-  // Append text & aria-label if defined.
-  const openLabelAttr =
-    attachmentEl.getAttribute('cta-text') ||
-    attachmentEl.getAttribute('data-cta-text');
-  const openLabel =
-    (openLabelAttr && openLabelAttr.trim()) ||
-    localize(pageEl, LocalizedStringId.AMP_STORY_PAGE_ATTACHMENT_OPEN_LABEL);
-  openAttachmentEl.setAttribute('aria-label', openLabel);
-
-  if (openLabel !== 'none') {
-    const textEl = <span class="i-amphtml-story-page-attachment-label"></span>;
-    textEl.textContent = openLabel;
-    openAttachmentEl.appendChild(textEl);
-  }
-
-  // Add images if they are defined.
-  const {chipEl} = htmlRefs(openAttachmentEl);
-  const makeImgElWithBG = (openImgAttr) => {
-    const ctaImgEl = (
-      <div class="i-amphtml-story-inline-page-attachment-img"></div>
-    );
-    setImportantStyles(ctaImgEl, {
-      'background-image': 'url(' + openImgAttr + ')',
-    });
-    return ctaImgEl;
-  };
-
-  const openImgAttr2 = attachmentEl.getAttribute('cta-image-2');
-  if (openImgAttr2) {
-    const src = maybeMakeProxyUrl(openImgAttr2, pageEl.getAmpDoc());
-    chipEl.prepend(makeImgElWithBG(src));
-  }
-
-  const openImgAttr = attachmentEl.getAttribute('cta-image');
-  if (openImgAttr) {
-    const src = maybeMakeProxyUrl(openImgAttr, pageEl.getAmpDoc());
-    chipEl.prepend(makeImgElWithBG(src));
-  }
-
-  return openAttachmentEl;
-};
-
-/**
- * Sets custom theme attributes.
- * @param {!Element} attachmentEl
- * @param {!Element} openAttachmentEl
- */
-export const setCustomThemeStyles = (attachmentEl, openAttachmentEl) => {
-  if (!attachmentEl.hasAttribute('cta-accent-color')) {
-    dev().warn(
-      'AMP-STORY-PAGE-OUTLINK',
-      'No cta-accent-color attribute found.'
-    );
-  }
-
-  const accentColor =
-    attachmentEl.getAttribute('cta-accent-color') || '#000000';
-
-  // Calculating contrast color (black or white) needed for outlink CTA UI.
-  let contrastColor = null;
-  setImportantStyles(attachmentEl, {
-    'background-color': accentColor,
-  });
-
-  const win = getWin(attachmentEl);
-  const styles = computedStyle(win, attachmentEl);
-  const rgb = getRGBFromCssColorValue(styles['background-color']);
-  contrastColor = getTextColorForRGB(rgb);
-  setImportantStyles(attachmentEl, {
-    'background-color': '',
-  });
-  if (
-    attachmentEl.getAttribute('cta-accent-element') ===
-    CtaAccentElement.BACKGROUND
-  ) {
-    setImportantStyles(openAttachmentEl, {
-      '--i-amphtml-outlink-cta-background-color': accentColor,
-      '--i-amphtml-outlink-cta-text-color': contrastColor,
-    });
-    setImportantStyles(attachmentEl, {
-      '--i-amphtml-outlink-cta-background-color': accentColor,
-      '--i-amphtml-outlink-cta-text-color': contrastColor,
-    });
-  } else {
-    setImportantStyles(openAttachmentEl, {
-      '--i-amphtml-outlink-cta-background-color': contrastColor,
-      '--i-amphtml-outlink-cta-text-color': accentColor,
-    });
-    setImportantStyles(attachmentEl, {
-      '--i-amphtml-outlink-cta-background-color': contrastColor,
-      '--i-amphtml-outlink-cta-text-color': accentColor,
-    });
-  }
-};
diff --git a/extensions/amp-story/1.0/amp-story-page-attachment.js b/extensions/amp-story/1.0/amp-story-page-attachment.js
deleted file mode 100644
index 01c959cdab40..000000000000
--- a/extensions/amp-story/1.0/amp-story-page-attachment.js
+++ /dev/null
@@ -1,515 +0,0 @@
-import * as Preact from '#core/dom/jsx';
-import {Action, StateProperty, UIType} from './amp-story-store-service';
-import {DraggableDrawer, DrawerState} from './amp-story-draggable-drawer';
-import {HistoryState, setHistoryState} from './history';
-import {LocalizedStringId} from '#service/localization/strings';
-import {Services} from '#service';
-import {StoryAnalyticsEvent, getAnalyticsService} from './story-analytics';
-import {renderOutlinkLinkIconElement} from './amp-story-open-page-attachment';
-import {closest} from '#core/dom/query';
-import {dev} from '#utils/log';
-import {getHistoryState} from '#core/window/history';
-import {localize} from './amp-story-localization-service';
-import {getSourceOrigin} from '../../../src/url';
-import {htmlRefs} from '#core/dom/static-template';
-import {
-  allowlistFormActions,
-  getResponseAttributeElements,
-  setupResponseAttributeElements,
-} from './amp-story-form';
-import {removeElement} from '#core/dom';
-import {setImportantStyles, toggle} from '#core/dom/style';
-
-import {triggerClickFromLightDom} from './utils';
-
-/**
- * Distance to swipe before opening attachment.
- * @const {number}
- */
-const OPEN_THRESHOLD_PX = 150;
-
-/**
- * Max pixels to transform the remote attachment URL preview. Equivilent to the height of preview element.
- * @const {number}
- */
-const DRAG_CAP_PX = 56;
-
-/**
- * Duration of post-tap URL preview progress bar animation minus 100ms.
- * The minus 100ms roughly accounts for the small system delay in opening a link.
- * @const {number}
- */
-const POST_TAP_ANIMATION_DURATION = 500;
-
-/**
- * @enum {string}
- */
-export const AttachmentTheme = {
-  LIGHT: 'light', // default
-  DARK: 'dark',
-  CUSTOM: 'custom',
-};
-
-/**
- * @enum
- */
-const AttachmentType = {
-  INLINE: 0,
-  OUTLINK: 1,
-};
-
-/**
- * AMP Story page attachment.
- */
-export class AmpStoryPageAttachment extends DraggableDrawer {
-  /** @param {!AmpElement} element */
-  constructor(element) {
-    super(element);
-
-    /** @private @const {!./story-analytics.StoryAnalyticsService} */
-    this.analyticsService_ = getAnalyticsService(this.win, this.element);
-
-    /** @private @const {!../../../src/service/history-impl.History} */
-    this.historyService_ = Services.historyForDoc(this.element);
-
-    /** @private {?AttachmentType} */
-    this.type_ = null;
-  }
-
-  /**
-   * @override
-   */
-  buildCallback() {
-    super.buildCallback();
-
-    this.maybeSetDarkThemeForElement_(this.headerEl);
-    this.maybeSetDarkThemeForElement_(this.element);
-
-    // Outlinks can be an amp-story-page-outlink or the legacy version,
-    // an amp-story-page-attachment with an href.
-    const isOutlink =
-      this.element.tagName === 'AMP-STORY-PAGE-OUTLINK' ||
-      this.element.hasAttribute('href');
-    this.type_ = isOutlink ? AttachmentType.OUTLINK : AttachmentType.INLINE;
-
-    if (this.type_ === AttachmentType.INLINE) {
-      this.buildInline_();
-    }
-
-    this.win.addEventListener('pageshow', (event) => {
-      // On browser back, Safari does not reload the page but resumes its cached
-      // version. This event's parameter lets us know when this happens so we
-      // can cleanup the remote opening animation.
-      if (event.persisted) {
-        this.closeInternal_(false /** shouldAnimate */);
-      }
-    });
-
-    toggle(this.element, true);
-    this.element.setAttribute('aria-live', 'assertive');
-  }
-
-  /**
-   * @override
-   */
-  layoutCallback() {
-    super.layoutCallback();
-    // Outlink renders an image and must be built in layoutCallback.
-    if (this.type_ === AttachmentType.OUTLINK) {
-      this.buildOutlink_();
-    }
-  }
-
-  /**
-   * Builds inline page attachment's drawer UI.
-   * @private
-   */
-  buildInline_() {
-    const closeButtonEl = (
-      <button
-        class="i-amphtml-story-page-attachment-close-button"
-        aria-label={localize(
-          this.element,
-          LocalizedStringId.AMP_STORY_CLOSE_BUTTON_LABEL
-        )}
-        role="button"
-      ></button>
-    );
-
-    const titleAndCloseWrapperEl = this.headerEl.appendChild(
-      <div class="i-amphtml-story-draggable-drawer-header-title-and-close"></div>
-    );
-    titleAndCloseWrapperEl.appendChild(closeButtonEl);
-
-    const titleText =
-      this.element.getAttribute('title') ||
-      this.element.getAttribute('data-title');
-    if (titleText) {
-      const titleEl = (
-        <span class="i-amphtml-story-page-attachment-title"></span>
-      );
-      titleEl.textContent = titleText;
-      titleAndCloseWrapperEl.appendChild(titleEl);
-    }
-
-    const forms = this.element.querySelectorAll('form');
-    if (forms.length > 0) {
-      allowlistFormActions(this.win);
-      forms.forEach((form) => {
-        setupResponseAttributeElements(this.win, form);
-        // Scroll each response attribute element into view, when displayed.
-        getResponseAttributeElements(form).forEach((el) => {
-          new this.win.ResizeObserver((e) => {
-            if (
-              this.state === DrawerState.OPEN &&
-              e[0].contentRect.height > 0
-            ) {
-              el./*OK*/ scrollIntoView({
-                behavior: 'smooth',
-                block: 'nearest',
-              });
-            }
-          }).observe(el);
-        });
-      });
-
-      // Page attachments that contain forms must display the page's publisher
-      // domain above the attachment's contents. This enables users to gauge
-      // the trustworthiness of publishers before sending data to them.
-      this.headerEl.append(this.createDomainLabelElement_());
-      this.headerEl.classList.add('i-amphtml-story-page-attachment-with-form');
-    }
-
-    const templateEl = this.element.querySelector(
-      '.i-amphtml-story-draggable-drawer'
-    );
-
-    while (this.element.firstChild && this.element.firstChild !== templateEl) {
-      this.contentEl.appendChild(this.element.firstChild);
-    }
-
-    // Ensures the content of the attachment won't be rendered/loaded until we
-    // actually need it.
-    toggle(dev().assertElement(this.containerEl), true);
-  }
-
-  /**
-   * Builds outlink CTA drawer UI.
-   * @private
-   */
-  buildOutlink_() {
-    this.setDragCap_(DRAG_CAP_PX);
-    this.setOpenThreshold_(OPEN_THRESHOLD_PX);
-
-    this.headerEl.classList.add(
-      'i-amphtml-story-draggable-drawer-header-attachment-remote'
-    );
-    this.element.classList.add('i-amphtml-story-page-attachment-remote');
-    // Use an anchor element to make this a real link in vertical rendering.
-    const link = (
-      <a class="i-amphtml-story-page-attachment-remote-content" target="_blank">
-        <span class="i-amphtml-story-page-attachment-remote-title">
-          <span ref="openStringEl"></span>
-          <span ref="urlStringEl"></span>
-        </span>
-        <svg
-          class="i-amphtml-story-page-attachment-remote-icon"
-          xmlns="http://www.w3.org/2000/svg"
-          viewBox="0 0 48 48"
-        >
-          <path d="M38 38H10V10h14V6H10c-2.21 0-4 1.79-4 4v28c0 2.21 1.79 4 4 4h28c2.21 0 4-1.79 4-4V24h-4v14zM28 6v4h7.17L15.51 29.66l2.83 2.83L38 12.83V20h4V6H28z"></path>
-        </svg>
-      </a>
-    );
-
-    const isPageOutlink = this.element.tagName === 'AMP-STORY-PAGE-OUTLINK';
-    if (isPageOutlink) {
-      // The target must be '_top' for page outlinks, which will result in the
-      // link opening in the current tab. Opening links in a new tab requires a
-      // trusted event, and Safari does not consider swiping up to be trusted.
-      this.element.querySelector('a').setAttribute('target', '_top');
-    }
-
-    // For backwards compatibility if element is amp-story-page-outlink.
-    const hrefAttr = isPageOutlink
-      ? this.element.querySelector('a').getAttribute('href')
-      : this.element.getAttribute('href');
-
-    // URL will be validated and resolved based on the canonical URL if relative
-    // when navigating.
-    link.setAttribute('href', hrefAttr);
-    const {openStringEl, urlStringEl} = htmlRefs(link);
-
-    // Navigation is handled programmatically. Disable clicks on the placeholder
-    // anchor to prevent from users triggering double navigations, which has
-    // side effects in native contexts opening webviews/CCTs.
-    link.addEventListener('click', (event) => event.preventDefault());
-
-    // Set image.
-    const openImgAttr = this.element.getAttribute('cta-image');
-    if (openImgAttr && openImgAttr !== 'none') {
-      const ctaImgEl = this.win.document.createElement('div');
-      ctaImgEl.classList.add('i-amphtml-story-page-attachment-remote-img');
-      setImportantStyles(ctaImgEl, {
-        'background-image': 'url(' + openImgAttr + ')',
-      });
-      link.prepend(ctaImgEl);
-    } else if (!openImgAttr) {
-      // Attach link icon SVG by default.
-      const linkImage = renderOutlinkLinkIconElement();
-      link.prepend(linkImage);
-    }
-
-    // Set url prevew text.
-    const localizedOpenString = localize(
-      this.element,
-      LocalizedStringId.AMP_STORY_OPEN_OUTLINK_TEXT
-    );
-    openStringEl.textContent = localizedOpenString;
-    urlStringEl.textContent = hrefAttr;
-
-    this.contentEl.appendChild(link);
-  }
-
-  /**
-   * @override
-   */
-  initializeListeners_() {
-    super.initializeListeners_();
-
-    const closeButtonEl = this.headerEl.querySelector(
-      '.i-amphtml-story-page-attachment-close-button'
-    );
-    if (closeButtonEl) {
-      closeButtonEl.addEventListener(
-        'click',
-        () => this.close_(),
-        true /** useCapture */
-      );
-    }
-
-    // Always open links in a new tab.
-    this.contentEl.addEventListener(
-      'click',
-      (event) => {
-        const {target} = event;
-        if (target.tagName.toLowerCase() === 'a') {
-          target.setAttribute('target', '_blank');
-        }
-      },
-      true /** useCapture */
-    );
-
-    // Closes the attachment on opacity background clicks.
-    this.element.addEventListener(
-      'click',
-      (event) => {
-        if (
-          event.target.tagName.toLowerCase() === 'amp-story-page-attachment'
-        ) {
-          this.close_();
-        }
-      },
-      true /** useCapture */
-    );
-
-    // Closes the remote attachment drawer when navigation deeplinked to an app.
-    if (this.type_ === AttachmentType.OUTLINK) {
-      const ampdoc = this.getAmpDoc();
-      ampdoc.onVisibilityChanged(() => {
-        if (ampdoc.isVisible() && this.state === DrawerState.OPEN) {
-          this.closeInternal_(false /** shouldAnimate */);
-        }
-      });
-    }
-  }
-
-  /**
-   * @override
-   */
-  open(shouldAnimate = true) {
-    if (this.state === DrawerState.OPEN) {
-      return;
-    }
-
-    super.open(shouldAnimate);
-
-    this.storeService.dispatch(Action.TOGGLE_PAGE_ATTACHMENT_STATE, true);
-    this.storeService.dispatch(Action.TOGGLE_SYSTEM_UI_IS_VISIBLE, false);
-
-    this.toggleBackgroundOverlay_(true);
-
-    // Don't create a new history entry for remote attachment as user is
-    // navigating away.
-    if (this.type_ !== AttachmentType.OUTLINK) {
-      const currentHistoryState = /** @type {!Object} */ (
-        getHistoryState(this.win.history)
-      );
-      const historyState = {
-        ...currentHistoryState,
-        [HistoryState.ATTACHMENT_PAGE_ID]: this.storeService.get(
-          StateProperty.CURRENT_PAGE_ID
-        ),
-      };
-
-      this.historyService_.push(() => this.closeInternal_(), historyState);
-    }
-
-    this.analyticsService_.triggerEvent(StoryAnalyticsEvent.OPEN, this.element);
-    this.analyticsService_.triggerEvent(
-      StoryAnalyticsEvent.PAGE_ATTACHMENT_ENTER
-    );
-
-    if (this.type_ === AttachmentType.OUTLINK) {
-      this.openRemote_();
-    }
-  }
-
-  /**
-   * Triggers a remote attachment preview URL animation on mobile,
-   * and redirects to the specified URL.
-   * @private
-   */
-  openRemote_() {
-    // If the element is an amp-story-page-outlink the click target is its anchor element child.
-    // This is for SEO and analytics optimisation.
-    // Otherwise the element is the legacy version, amp-story-page-attachment with an href,
-    // and a click target is the button built by the component.
-    const programaticallyClickOnTarget = () => {
-      const pageOutlinkChild = this.element.parentElement
-        .querySelector('amp-story-page-outlink')
-        ?.querySelector('a');
-
-      const pageAttachmentChild = this.element.parentElement
-        ?.querySelector('.i-amphtml-story-page-open-attachment-host')
-        .shadowRoot.querySelector('a.i-amphtml-story-page-open-attachment');
-
-      if (pageOutlinkChild) {
-        pageOutlinkChild.click();
-      } else if (pageAttachmentChild) {
-        triggerClickFromLightDom(pageAttachmentChild, this.element);
-      }
-    };
-
-    const isMobileUI =
-      this.storeService.get(StateProperty.UI_STATE) === UIType.MOBILE;
-    if (!isMobileUI) {
-      programaticallyClickOnTarget();
-    } else {
-      // Timeout to shows post-tap animation on mobile only.
-      Services.timerFor(this.win).delay(() => {
-        programaticallyClickOnTarget();
-      }, POST_TAP_ANIMATION_DURATION);
-    }
-  }
-
-  /**
-   * Ensures the history state we added when opening the drawer is popped,
-   * and closes the drawer either directly, or through the onPop callback.
-   * @override
-   */
-  close_() {
-    switch (this.state) {
-      // If the drawer was open, pop the history entry that was added, which
-      // will close the drawer through the onPop callback.
-      case DrawerState.OPEN:
-      case DrawerState.DRAGGING_TO_CLOSE:
-        this.historyService_.goBack();
-        break;
-      // If the drawer was not open, no history entry was added, so we can
-      // close the drawer directly.
-      case DrawerState.DRAGGING_TO_OPEN:
-        this.closeInternal_();
-        break;
-    }
-  }
-
-  /**
-   * @override
-   */
-  closeInternal_(shouldAnimate = true) {
-    if (this.state === DrawerState.CLOSED) {
-      return;
-    }
-
-    super.closeInternal_(shouldAnimate);
-
-    this.toggleBackgroundOverlay_(false);
-
-    this.storeService.dispatch(Action.TOGGLE_PAGE_ATTACHMENT_STATE, false);
-    this.storeService.dispatch(Action.TOGGLE_SYSTEM_UI_IS_VISIBLE, true);
-
-    const storyEl = closest(this.element, (el) => el.tagName === 'AMP-STORY');
-    const animationEl = storyEl.querySelector(
-      '.i-amphtml-story-page-attachment-expand'
-    );
-    if (animationEl) {
-      this.mutateElement(() => {
-        removeElement(dev().assertElement(animationEl));
-      });
-    }
-
-    setHistoryState(this.win, HistoryState.ATTACHMENT_PAGE_ID, null);
-
-    this.analyticsService_.triggerEvent(
-      StoryAnalyticsEvent.CLOSE,
-      this.element
-    );
-    this.analyticsService_.triggerEvent(
-      StoryAnalyticsEvent.PAGE_ATTACHMENT_EXIT
-    );
-  }
-
-  /**
-   * @param {boolean} isActive
-   * @private
-   */
-  toggleBackgroundOverlay_(isActive) {
-    const activePageEl = closest(
-      this.element,
-      (el) => el.tagName === 'AMP-STORY-PAGE'
-    );
-    this.mutateElement(() => {
-      activePageEl.classList.toggle(
-        'i-amphtml-story-page-attachment-active',
-        isActive
-      );
-    });
-  }
-
-  /**
-   * Updates the given element with the appropriate class or attribute, if the
-   * page attachment's theme is 'dark'.
-   * @param {!Element} element The element upon which to set the dark theme.
-   * @private
-   */
-  maybeSetDarkThemeForElement_(element) {
-    const theme = this.element.getAttribute('theme')?.toLowerCase();
-    if (theme && AttachmentTheme.DARK === theme) {
-      element.setAttribute('theme', theme);
-    }
-  }
-
-  /**
-   * Create the domain label element to be displayed at the top of the page
-   * attachment.
-   * @return {!Element} element The domain label element.
-   * @private
-   */
-  createDomainLabelElement_() {
-    const domainLabelEl = this.win.document.createElement('div');
-    domainLabelEl.classList.add('i-amphtml-story-page-attachment-domain-label');
-    domainLabelEl.textContent = this.getPublisherOrigin_();
-    return domainLabelEl;
-  }
-
-  /**
-   * Returns the publisher origin URL string (e.g., "stories.example.com").
-   * @return {string} The domain of the publisher.
-   * @private
-   */
-  getPublisherOrigin_() {
-    const publisherOrigin = getSourceOrigin(this.getAmpDoc().getUrl());
-    return publisherOrigin.replace(/^http(s)?:\/\/(www.)?/, '');
-  }
-}
diff --git a/extensions/amp-story/1.0/amp-story-page.js b/extensions/amp-story/1.0/amp-story-page.js
index 99bcde0e7e09..4a904060234b 100644
--- a/extensions/amp-story/1.0/amp-story-page.js
+++ b/extensions/amp-story/1.0/amp-story-page.js
@@ -1,4 +1,3 @@
-import * as Preact from '#core/dom/jsx';
 /**
  * @fileoverview Embeds a single page in a story
  *
@@ -9,63 +8,55 @@ import * as Preact from '#core/dom/jsx';
  * </amp-story-page>
  * </code>
  */
-import {isAutoplaySupported, tryPlay} from '#core/dom/video';
+import {devAssert} from '#core/assert';
+import {CommonSignals_Enum} from '#core/constants/common-signals';
+import {VisibilityState_Enum} from '#core/constants/visibility-state';
+import {Deferred} from '#core/data-structures/promise';
+import {removeElement} from '#core/dom';
+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
+import * as Preact from '#core/dom/jsx';
+import {Layout_Enum} from '#core/dom/layout';
+import {propagateAttributes} from '#core/dom/propagate-attributes';
 import {
-  AFFILIATE_LINK_SELECTOR,
-  AmpStoryAffiliateLink,
-} from './amp-story-affiliate-link';
+  closestAncestorElementBySelector,
+  matches,
+  scopedQuerySelectorAll,
+} from '#core/dom/query';
+import {toggle} from '#core/dom/style';
+import {isAutoplaySupported, tryPlay} from '#core/dom/video';
+import {toArray} from '#core/types/array';
+import {debounce, once} from '#core/types/function';
+
+import {getExperimentBranch, isExperimentOn} from '#experiments';
+import {StoryAdSegmentExp} from '#experiments/story-ad-progress-segment';
+
+import {Services} from '#service';
+import {LocalizedStringId_Enum} from '#service/localization/strings';
+
+import {listen, listenOnce} from '#utils/event-helper';
+import {dev} from '#utils/log';
+
+import {embeddedElementsSelectors} from './amp-story-embedded-component';
+import {localizeTemplate} from './amp-story-localization-service';
 import {
   Action,
   StateProperty,
-  UIType,
+  UIType_Enum,
   getStoreService,
 } from './amp-story-store-service';
-import {AdvancementConfig} from './page-advancement';
-import {AmpEvents} from '#core/constants/amp-events';
-import {
-  AmpStoryEmbeddedComponent,
-  EMBED_ID_ATTRIBUTE_NAME,
-  EXPANDABLE_COMPONENTS,
-  expandableElementsSelectors,
-} from './amp-story-embedded-component';
 import {AnimationManager, hasAnimations} from './animation';
-import {CommonSignals} from '#core/constants/common-signals';
-import {Deferred} from '#core/data-structures/promise';
+import {upgradeBackgroundAudio} from './audio';
 import {EventType, dispatch} from './events';
-import {Layout} from '#core/dom/layout';
-import {LoadingSpinner} from './loading-spinner';
-import {LocalizedStringId} from '#service/localization/strings';
-import {MediaPool} from './media-pool';
-import {Services} from '#service';
-import {StoryAdSegmentTimes} from '#experiments/story-ad-progress-segment';
-import {VideoEvents, delegateAutoplay} from '../../../src/video-interface';
-import {iterateCursor} from '#core/dom';
-import {
-  closestAncestorElementBySelector,
-  scopedQuerySelectorAll,
-} from '#core/dom/query';
-import {createShadowRootWithStyle, setTextBackgroundColor} from './utils';
-import {debounce} from '#core/types/function';
-import {dev} from '#utils/log';
-import {dict} from '#core/types/object';
-import {getAmpdoc} from '../../../src/service-helpers';
-import {getFriendlyIframeEmbedOptional} from '../../../src/iframe-helper';
-import {localize} from './amp-story-localization-service';
-import {getLogEntries} from './logging';
+import {renderLoadingSpinner, toggleLoadingSpinner} from './loading-spinner';
 import {getMediaPerformanceMetricsService} from './media-performance-metrics-service';
-import {getMode} from '../../../src/mode';
-import {isExperimentOn} from '#experiments';
+import {MediaPool} from './media-pool';
+import {AdvancementConfig, AdvancementConfigType} from './page-advancement';
 import {isPrerenderActivePage} from './prerender-active-page';
-import {listen, listenOnce} from '#utils/event-helper';
-import {CSS as pageAttachmentCSS} from '../../../build/amp-story-open-page-attachment-0.1.css';
-import {propagateAttributes} from '#core/dom/propagate-attributes';
-import {px, toggle} from '#core/dom/style';
-import {renderPageAttachmentUI} from './amp-story-open-page-attachment';
 import {renderPageDescription} from './semantic-render';
-import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
+import {setTextBackgroundColor} from './utils';
 
-import {toArray} from '#core/types/array';
-import {upgradeBackgroundAudio} from './audio';
+import {getFriendlyIframeEmbedOptional} from '../../../src/iframe-helper';
+import {VideoEvents_Enum, delegateAutoplay} from '../../../src/video-interface';
 
 /**
  * CSS class for an amp-story-page that indicates the entire page is loaded.
@@ -87,7 +78,6 @@ export const Selectors = {
     'amp-story-grid-layer amp-video, amp-story-grid-layer amp-img, ' +
     'amp-story-grid-layer amp-anim',
   ALL_AMP_VIDEO: 'amp-story-grid-layer amp-video',
-  ALL_IFRAMED_MEDIA: 'audio, video',
   ALL_PLAYBACK_AMP_MEDIA:
     'amp-story-grid-layer amp-audio, amp-story-grid-layer amp-video',
   // TODO(gmajoulet): Refactor the way these selectors are used. They will be
@@ -100,43 +90,34 @@ export const Selectors = {
   ALL_TABBABLE: 'a, amp-twitter > iframe',
 };
 
-/** @private @const {string} */
-const EMBEDDED_COMPONENTS_SELECTORS = Object.keys(EXPANDABLE_COMPONENTS).join(
-  ', '
-);
-
-/** @private @const {string} */
-const INTERACTIVE_EMBEDDED_COMPONENTS_SELECTORS = Object.values(
-  expandableElementsSelectors()
-).join(',');
-
-/** @private @const {number} */
-const RESIZE_TIMEOUT_MS = 1000;
-
 /** @private @const {string} */
 const TAG = 'amp-story-page';
 
 /** @private @const {string} */
 const ADVERTISEMENT_ATTR_NAME = 'ad';
 
-/** @private @const {string} */
-const DEFAULT_PREVIEW_AUTO_ADVANCE_DURATION = '2s';
-
-/** @private @const {string} */
-const VIDEO_PREVIEW_AUTO_ADVANCE_DURATION = '5s';
+/** @private @const {number} */
+const DEFAULT_PREVIEW_AUTO_ADVANCE_DURATION_S = 5;
 
 /** @private @const {number} */
 const VIDEO_MINIMUM_AUTO_ADVANCE_DURATION_S = 2;
 
 /**
+ * @param {function(Event)} onClick
  * @return {!Element}
  */
-const renderPlayMessageElement = () => (
+const renderPlayMessageElement = (onClick) => (
   <button
     role="button"
     class="i-amphtml-story-page-play-button i-amphtml-story-system-reset"
+    onClick={onClick}
   >
-    <span class="i-amphtml-story-page-play-label"></span>
+    <span
+      class="i-amphtml-story-page-play-label"
+      i-amphtml-i18n-text-content={
+        LocalizedStringId_Enum.AMP_STORY_PAGE_PLAY_VIDEO
+      }
+    ></span>
     <span class="i-amphtml-story-page-play-icon"></span>
   </button>
 );
@@ -146,7 +127,12 @@ const renderPlayMessageElement = () => (
  */
 const renderErrorMessageElement = () => (
   <div class="i-amphtml-story-page-error i-amphtml-story-system-reset">
-    <span class="i-amphtml-story-page-error-label"></span>
+    <span
+      class="i-amphtml-story-page-error-label"
+      i-amphtml-i18n-text-content={
+        LocalizedStringId_Enum.AMP_STORY_PAGE_ERROR_VIDEO
+      }
+    ></span>
     <span class="i-amphtml-story-page-error-icon"></span>
   </div>
 );
@@ -167,56 +153,34 @@ export const NavigationDirection = {
   PREVIOUS: 'previous',
 };
 
-/**
- * Prepares an embed for its expanded mode animation. Since this requires
- * calculating the size of the embed, we debounce after each resize event to
- * make sure we have the final size before doing the calculation for the
- * animation.
- * @param {!Window} win
- * @param {!Element} page
- * @param {!../../../src/service/mutator-interface.MutatorInterface} mutator
- * @return {function(!Element, ?UnlistenDef)}
- */
-function debounceEmbedResize(win, page, mutator) {
-  return debounce(
-    win,
-    (el, unlisten) => {
-      AmpStoryEmbeddedComponent.prepareForAnimation(
-        page,
-        dev().assertElement(el),
-        mutator
-      );
-      if (unlisten) {
-        unlisten();
-      }
-    },
-    RESIZE_TIMEOUT_MS
-  );
-}
-
 /**
  * The <amp-story-page> custom element, which represents a single page of
  * an <amp-story>.
  */
 export class AmpStoryPage extends AMP.BaseElement {
-  /** @override @nocollapse */
+  /** @override  */
   static prerenderAllowed(element) {
     return isPrerenderActivePage(element);
   }
 
+  /** @override  */
+  static previewAllowed() {
+    return true;
+  }
+
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
 
+    /** @private {!../../../src/service/viewer-interface.ViewerInterface} */
+    this.viewer_ = Services.viewerForDoc(this.element);
+
     /** @private {?AnimationManager} */
     this.animationManager_ = null;
 
     /** @private {?AdvancementConfig} */
     this.advancement_ = null;
 
-    /** @private {?Element} */
-    this.cssVariablesStyleEl_ = null;
-
     /** @const @private {!function(boolean)} */
     this.debounceToggleLoadingSpinner_ = debounce(
       this.win,
@@ -224,8 +188,13 @@ export class AmpStoryPage extends AMP.BaseElement {
       100
     );
 
-    /** @private {?LoadingSpinner} */
-    this.loadingSpinner_ = null;
+    /**
+     * @return {!Element}
+     * @private
+     */
+    this.getLoadingSpinner_ = once(() =>
+      this.buildAndAppendVideoLoadingSpinner_()
+    );
 
     /** @private {?Element} */
     this.playMessageEl_ = null;
@@ -233,14 +202,11 @@ export class AmpStoryPage extends AMP.BaseElement {
     /** @private {?Element} */
     this.errorMessageEl_ = null;
 
-    /** @private {?Element} */
-    this.openAttachmentEl_ = null;
-
-    /** @private @const {!../../../src/service/mutator-interface.MutatorInterface} */
-    this.mutator_ = Services.mutatorForDoc(getAmpdoc(this.win.document));
-
     const deferred = new Deferred();
 
+    /** @const {boolean} */
+    this.isFirstPage_ = matches(this.element, 'amp-story-page:first-of-type');
+
     /** @private @const {!./media-performance-metrics-service.MediaPerformanceMetricsService} */
     this.mediaPerformanceMetricsService_ = getMediaPerformanceMetricsService(
       this.win
@@ -267,9 +233,6 @@ export class AmpStoryPage extends AMP.BaseElement {
     /** @private @const {!./amp-story-store-service.AmpStoryStoreService} */
     this.storeService_ = getStoreService(this.win);
 
-    /** @private {?../../../src/layout-rect.LayoutSizeDef} */
-    this.layoutBox_ = null;
-
     /** @private {!Array<function()>} */
     this.unlisteners_ = [];
 
@@ -286,6 +249,17 @@ export class AmpStoryPage extends AMP.BaseElement {
 
     /** @private {?number} Time at which an audio element failed playing. */
     this.playAudioElementFromTimestamp_ = null;
+
+    /**
+     * The value of the 'auto-advance-after' attribute set by the publisher.
+     * @private {?string}
+     */
+    this.initialAutoAdvanceValue_ =
+      this.element.getAttribute('auto-advance-after');
+
+    /** @private {?VisibilityState_Enum} */
+    this.visibilityState_ = this.getAmpDoc().getVisibilityState();
+    this.getAmpDoc().onVisibilityChanged(() => this.onVisibilityChanged_());
   }
 
   /**
@@ -305,22 +279,38 @@ export class AmpStoryPage extends AMP.BaseElement {
     );
   }
 
+  /**
+   * @private
+   * @return {Element}
+   */
+  maybeConvertCtaLayerToPageOutlink_() {
+    const ctaLayerEl = this.element.querySelector('amp-story-cta-layer');
+    if (!ctaLayerEl) {
+      return;
+    }
+
+    const anchorSet = ctaLayerEl.querySelectorAll('a');
+    if (anchorSet.length !== 1 || !anchorSet[0].getAttribute('href')) {
+      return;
+    }
+
+    removeElement(ctaLayerEl);
+    this.element.appendChild(
+      <amp-story-page-outlink layout="nodisplay">
+        <a href={anchorSet[0].getAttribute('href')}>
+          {anchorSet[0].textContent}
+        </a>
+      </amp-story-page-outlink>
+    );
+  }
+
   /** @override */
   buildCallback() {
     this.delegateVideoAutoplay();
     this.markMediaElementsWithPreload_();
     this.initializeMediaPool_();
     this.maybeCreateAnimationManager_();
-    this.maybeSetPreviewDuration_();
-    this.maybeSetStoryNextUp_();
-    this.advancement_ = AdvancementConfig.forElement(this.win, this.element);
-    this.advancement_.addPreviousListener(() => this.previous());
-    this.advancement_.addAdvanceListener(() =>
-      this.next(/* opt_isAutomaticAdvance */ true)
-    );
-    this.advancement_.addProgressListener((progress) =>
-      this.emitProgress_(progress)
-    );
+    this.setUpAdvancementConfig_();
     this.setDescendantCssTextStyles_();
     this.storeService_.subscribe(
       StateProperty.UI_STATE,
@@ -331,22 +321,195 @@ export class AmpStoryPage extends AMP.BaseElement {
     this.element.setAttribute('role', 'region');
     this.initializeImgAltTags_();
     this.initializeTabbableElements_();
+    this.maybeApplyFirstAnimationFrameOrFinish();
+    this.maybeConvertCtaLayerToPageOutlink_();
   }
 
-  /** @private */
-  maybeSetPreviewDuration_() {
-    if (this.storeService_.get(StateProperty.PREVIEW_STATE)) {
-      const videos = this.getAllVideos_();
+  /**
+   * Handles visibility state changes.
+   * @private
+   */
+  onVisibilityChanged_() {
+    const ampDoc = this.getAmpDoc();
+
+    const wasPreview = this.visibilityState_ === VisibilityState_Enum.PREVIEW;
+    const isPreviewToVisibleTransition = wasPreview && ampDoc.isVisible();
+    this.visibilityState_ = ampDoc.getVisibilityState();
+
+    if (ampDoc.isPreview() || ampDoc.isVisible()) {
+      // Preview mode and visible mode both have different advancement logic.
+      this.setUpAdvancementConfig_(isPreviewToVisibleTransition);
+    }
+  }
+
+  /**
+   * Sets up the advancement config depending upon the
+   * @param {boolean=} handlePreviewToVisibleTransition
+   * @private
+   */
+  setUpAdvancementConfig_(handlePreviewToVisibleTransition = false) {
+    if (this.getAmpDoc().isPreview()) {
+      this.setupAutoAdvanceForPreview_();
+      this.initializeAdvancementConfig_();
+    } else if (this.getAmpDoc().isVisible()) {
+      this.setupAutoAdvanceForVisible_();
+      this.maybeSetStoryNextUp_();
+      if (this.isActive() && handlePreviewToVisibleTransition) {
+        this.handlePreviewToVisibleTransition_();
+      } else {
+        this.initializeAdvancementConfig_();
+      }
+    }
+  }
+
+  /**
+   * Configures the page to auto advance using preview-specific durations.
+   * @private
+   */
+  setupAutoAdvanceForPreview_() {
+    let autoAdvanceAfter = this.getAutoAdvanceAfterSeconds_();
+
+    const firstVideo = this.getFirstAmpVideo_();
+    if (!firstVideo) {
+      this.element.setAttribute('auto-advance-after', autoAdvanceAfter + 's');
+      return;
+    }
+
+    const maxPrev = this.getMaxVideoPreview_();
+    if (maxPrev > 0) {
+      // Comply with max-video-preview, but never to lengthen the page preview
+      autoAdvanceAfter = Math.min(maxPrev, autoAdvanceAfter);
+    } else if (maxPrev === 0) {
+      // TODO(masanto): Prevent video from playing when maxVideoPreview is 0
+    }
+    this.element.setAttribute('auto-advance-after', autoAdvanceAfter + 's');
+
+    whenUpgradedToCustomElement(firstVideo)
+      .then(() => firstVideo.getImpl())
+      .then((videoImpl) => {
+        this.loadPromise(firstVideo).then(() => {
+          const duration = videoImpl.getDuration();
+          const tooShort = duration < autoAdvanceAfter;
+          const videoEl = firstVideo.querySelector('video');
+          videoEl.loop ||= tooShort;
+        });
+      });
+  }
+
+  /**
+   * Calculates the duration of this page's preview based upon the
+   * 'previewSecondsPerPage' query parameter.
+   * @return {number} The number of seconds for which this page should be
+   *     previewed before advancing to the next page.
+   * @private
+   */
+  getAutoAdvanceAfterSeconds_() {
+    const previewSecondsStr = this.viewer_.getParam('previewSecondsPerPage');
+    const previewSecondsPerPage = parseInt(previewSecondsStr, 10);
+    return isNaN(previewSecondsPerPage) || previewSecondsPerPage <= 0
+      ? DEFAULT_PREVIEW_AUTO_ADVANCE_DURATION_S
+      : previewSecondsPerPage;
+  }
+
+  /**
+   * @return {number} The max-video-preview value, if it exists on the doc. A
+   *     positive value means that a maximum of <value> seconds may be used as
+   *     a video snippet for videos on this page in search results. A value of
+   *     0 means that a static image may be used. And a value of -1 means that
+   *     there is no limit to the video's preview length.
+   * @private
+   */
+  getMaxVideoPreview_() {
+    const robotsContent = this.getAmpDoc().getMetaByName('robots');
+    const maxVideoPreviewRegex = /max-video-preview[^,]*/;
+    const maxVideoPreviewStr = robotsContent?.match(maxVideoPreviewRegex)[0];
+    return parseInt(maxVideoPreviewStr?.split(':')[1], 10);
+  }
+
+  /**
+   * Configures the page to auto advance using default durations.
+   * @private
+   */
+  setupAutoAdvanceForVisible_() {
+    // The 'auto-advance-after' attribute value may have been altered if auto
+    // advance was set up for preview mode. We revert this alteration for
+    // visible mode, in accordance with any values specified by the publisher.
+    if (this.initialAutoAdvanceValue_) {
+      this.element.setAttribute(
+        'auto-advance-after',
+        this.initialAutoAdvanceValue_
+      );
+    } else {
+      this.element.removeAttribute('auto-advance-after');
+    }
+  }
 
-      const autoAdvanceAttr =
-        videos.length > 0
-          ? VIDEO_PREVIEW_AUTO_ADVANCE_DURATION
-          : DEFAULT_PREVIEW_AUTO_ADVANCE_DURATION;
+  /**
+   * Handles the transition between the `preview` and `visible` visibility
+   * states by reinitializing this page's advancement config.
+   *
+   * As long as this page has called `setupAutoAdvanceForVisible_()`, prior to
+   * this method, then the reinitialization will result in a new advancement
+   * config that aligns with the advancement logic specified by the publisher.
+   * @private
+   */
+  handlePreviewToVisibleTransition_() {
+    const advancementType = this.advancement_?.getType();
+    devAssert(
+      advancementType === AdvancementConfigType.TIME_BASED_ADVANCEMENT,
+      'The advancement is expected to be time-based in preview mode'
+    );
+
+    // Here, we store the progress values of the time-based advancement used
+    // during the preview. After the advancement is reinitialized below, we
+    // set its progress to the value that has already elapsed in preview mode,
+    // ensuring that the progress bar accurately reflects the page's progress.
+    const progress = this.advancement_.getProgress();
+    const progressMs = this.advancement_.getProgressMs();
+
+    this.initializeAdvancementConfig_();
+
+    switch (this.advancement_.getType()) {
+      case AdvancementConfigType.ADVANCEMENT_CONFIG:
+        // With this advancement, the progress bar should be full instead of
+        // gradually filling. We set the progress bar's progress to the 1.0
+        // because the bar would otherwise stagnate at a value between 0 & 1.
+        this.emitProgress_(1.0);
+        this.advancement_.start();
+        break;
 
-      this.element.setAttribute('auto-advance-after', autoAdvanceAttr);
+      case AdvancementConfigType.MEDIA_BASED_ADVANCEMENT:
+        // With this advancement, the progress bar should advance along with
+        // the video/audio playback progress. We ensure that the new
+        // advancement begins not at 0, but at the already-elapsed media
+        // playback time.
+        this.advancement_.start(progress);
+        break;
+
+      case AdvancementConfigType.TIME_BASED_ADVANCEMENT:
+        // With this advancement, the progress bar should advance along with
+        // time. We ensure that the new advancement begins not at 0, but at
+        // the already-elapsed time.
+        this.advancement_.start(progressMs / this.advancement_.getDelayMs());
     }
   }
 
+  /**
+   * Initialize this page's advancement config and set its listener callbacks.
+   * @private
+   */
+  initializeAdvancementConfig_() {
+    this.advancement_?.removeAllAddedListeners();
+    this.advancement_ = AdvancementConfig.forElement(this.win, this.element);
+    this.advancement_.addPreviousListener(() => this.previous());
+    this.advancement_.addAdvanceListener(() =>
+      this.next(/* opt_isAutomaticAdvance */ true)
+    );
+    this.advancement_.addProgressListener((progress) =>
+      this.emitProgress_(progress)
+    );
+  }
+
   /**
    * Reads the storyNextUp param if provided and sets the auto-advance-after
    * attribute to the given value if there isn't one set by the publisher. The
@@ -361,12 +524,7 @@ export class AmpStoryPage extends AMP.BaseElement {
     const storyNextUpParam = Services.viewerForDoc(this.element).getParam(
       'storyNextUp'
     );
-    if (
-      autoAdvanceAttr !== null ||
-      storyNextUpParam === null ||
-      // This is a special value that indicates we are in the viewer indicated control group.
-      storyNextUpParam === StoryAdSegmentTimes.SENTINEL
-    ) {
+    if (autoAdvanceAttr !== null || storyNextUpParam === null) {
       return;
     }
     this.element.setAttribute('auto-advance-after', storyNextUpParam);
@@ -391,7 +549,7 @@ export class AmpStoryPage extends AMP.BaseElement {
           this.maybeUpdateAutoAdvanceTime_(videoDuration);
           return;
         }
-        listenOnce(video, VideoEvents.LOADEDMETADATA, () => {
+        listenOnce(video, VideoEvents_Enum.LOADEDMETADATA, () => {
           this.maybeUpdateAutoAdvanceTime_(videoImpl.getDuration());
         });
       });
@@ -435,7 +593,7 @@ export class AmpStoryPage extends AMP.BaseElement {
    * play videos from an inactive page.
    */
   delegateVideoAutoplay() {
-    iterateCursor(this.element.querySelectorAll('amp-video'), delegateAutoplay);
+    this.element.querySelectorAll('amp-video').forEach(delegateAutoplay);
   }
 
   /** @private */
@@ -459,14 +617,14 @@ export class AmpStoryPage extends AMP.BaseElement {
    */
   markMediaElementsWithPreload_() {
     const mediaSet = this.element.querySelectorAll('amp-audio, amp-video');
-    Array.prototype.forEach.call(mediaSet, (mediaItem) => {
+    mediaSet.forEach((mediaItem) => {
       mediaItem.setAttribute('preload', 'auto');
     });
   }
 
   /** @override */
   isLayoutSupported(layout) {
-    return layout == Layout.CONTAINER;
+    return layout == Layout_Enum.CONTAINER;
   }
 
   /**
@@ -477,9 +635,6 @@ export class AmpStoryPage extends AMP.BaseElement {
     switch (state) {
       case PageState.NOT_ACTIVE:
         this.element.removeAttribute('active');
-        if (this.openAttachmentEl_) {
-          this.openAttachmentEl_.removeAttribute('active');
-        }
         this.pause_();
         this.state_ = state;
         break;
@@ -487,9 +642,6 @@ export class AmpStoryPage extends AMP.BaseElement {
         if (this.state_ === PageState.NOT_ACTIVE) {
           this.element.setAttribute('active', '');
           this.resume_();
-          if (this.openAttachmentEl_) {
-            this.openAttachmentEl_.setAttribute('active', '');
-          }
         }
 
         if (this.state_ === PageState.PAUSED) {
@@ -540,32 +692,78 @@ export class AmpStoryPage extends AMP.BaseElement {
     const registerAllPromise = this.registerAllMedia_();
 
     if (this.isActive()) {
-      registerAllPromise.then(() => {
-        this.signals()
-          .whenSignal(CommonSignals.LOAD_END)
-          .then(() => {
-            if (this.state_ == PageState.PLAYING) {
-              this.advancement_.start();
-            }
-          });
-        this.preloadAllMedia_().then(() => {
-          this.startMeasuringAllVideoPerformance_();
-          this.startListeningToVideoEvents_();
-          // iOS 14.2 and 14.3 requires play to be called before unmute
-          this.playAllMedia_().then(() => {
-            if (!this.storeService_.get(StateProperty.MUTED_STATE)) {
-              this.unmuteAllMedia();
+      registerAllPromise
+        .then(() => {
+          if (this.state_ === PageState.NOT_ACTIVE) {
+            return;
+          }
+          this.signals()
+            .whenSignal(CommonSignals_Enum.LOAD_END)
+            .then(() => {
+              if (this.state_ == PageState.PLAYING) {
+                this.advancement_.start();
+              }
+            });
+          this.preloadAllMedia_().then(() => {
+            if (this.state_ === PageState.NOT_ACTIVE) {
+              return;
             }
+            this.startMeasuringAllVideoPerformance_();
+            this.startListeningToVideoEvents_();
+            // iOS 14.2 and 14.3 requires play to be called before unmute
+            this.playAllMedia_().then(() => {
+              if (
+                !this.storeService_.get(StateProperty.MUTED_STATE) &&
+                this.state_ !== PageState.NOT_ACTIVE
+              ) {
+                this.unmuteAllMedia();
+              }
+            });
+            this.toggleCaptions_(
+              this.storeService_.get(StateProperty.CAPTIONS_STATE)
+            );
           });
+        })
+        .then(() => {
+          // In the PREVIEW state, a video can only use cached sources. If it
+          // fails to play due to any issue with the cached sources, we
+          // reregister the video once it has obtained its origin sources.
+          if (this.getAmpDoc().isPreview()) {
+            // We first block the reregistration on video layout end because
+            // that is the point at which the story has entered the VISIBLE
+            // state and its origin sources have been added.
+            return this.waitForPlaybackMediaLayoutEnd_().then(() => {
+              return this.reregisterAndPlayUnplayedVideos_();
+            });
+          }
         });
-      });
       this.maybeStartAnimations_();
       this.checkPageHasAudio_();
+      this.checkPageHasCaptions_();
       this.checkPageHasElementWithPlayback_();
       this.findAndPrepareEmbeddedComponents_();
     }
+  }
 
-    this.reportDevModeErrors_();
+  /**
+   * @return {!Promise} A promise that resolves when all videos that failed to
+   *     play have been reregistered and played.
+   * @private
+   */
+  reregisterAndPlayUnplayedVideos_() {
+    const videos = this.getAllVideos_();
+    const unplayedVideos = videos.filter(
+      (video) => video.readyState < /* HAVE_CURRENT_DATA */ 2
+    );
+    return this.mediaPoolPromise_.then((pool) => {
+      const playPromises = unplayedVideos.map((video) => {
+        return this.reregisterMedia_(pool, video).then(() => {
+          this.toggleErrorMessage_(false);
+          return this.playMedia_(pool, video);
+        });
+      });
+      return Promise.all(playPromises);
+    });
   }
 
   /** @override */
@@ -578,91 +776,38 @@ export class AmpStoryPage extends AMP.BaseElement {
     this.backgroundAudioDeferred_.resolve();
 
     this.muteAllMedia();
-    this.getViewport().onResize(
-      debounce(this.win, () => this.onResize_(), RESIZE_TIMEOUT_MS)
-    );
 
-    this.renderOpenAttachmentUI_();
+    this.installPageAttachmentExtension_();
+    this.initializeCaptionsListener_();
 
     return Promise.all([
-      this.beforeVisible(),
-      this.waitForMediaLayout_(),
+      this.waitForMediaLayout_().then(() => this.markPageAsLoaded_()),
       this.mediaPoolPromise_,
     ]);
   }
 
   /** @override */
   onLayoutMeasure() {
-    const layoutBox = this.getLayoutSize();
-    // Only measures from the first story page, that always gets built because
-    // of the prerendering optimizations in place.
-    if (
-      !isPrerenderActivePage(this.element) ||
-      (this.layoutBox_ &&
-        this.layoutBox_.width === layoutBox.width &&
-        this.layoutBox_.height === layoutBox.height)
-    ) {
+    // TODO(#37528): Replace with ResizeObserver API.
+    const {height, width} = this.getLayoutSize();
+    if (!this.isFirstPage_ || height === 0 || width === 0) {
       return;
     }
-
-    this.layoutBox_ = layoutBox;
-
-    return this.getVsync().runPromise(
-      {
-        measure: (state) => {
-          const {height, width} = layoutBox;
-          state.height = height;
-          state.width = width;
-          state.vh = height / 100;
-        },
-        mutate: (state) => {
-          const {height, width} = state;
-          if (state.height === 0 && state.width === 0) {
-            return;
-          }
-          this.storeService_.dispatch(Action.SET_PAGE_SIZE, {height, width});
-          if (!this.cssVariablesStyleEl_) {
-            const doc = this.win.document;
-            this.cssVariablesStyleEl_ = doc.createElement('style');
-            this.cssVariablesStyleEl_.setAttribute('type', 'text/css');
-            doc.head.appendChild(this.cssVariablesStyleEl_);
-          }
-          this.cssVariablesStyleEl_.textContent = `:root {--story-page-vh: ${px(
-            state.vh
-          )} !important}`;
-        },
-      },
-      {}
-    );
-  }
-
-  /**
-   * @private
-   */
-  onResize_() {
-    this.findAndPrepareEmbeddedComponents_(true /* forceResize */);
+    this.storeService_.dispatch(Action.SET_PAGE_SIZE, {height, width});
   }
 
   /**
    * Reacts to UI state updates.
-   * @param {!UIType} uiState
+   * @param {!UIType_Enum} uiState
    * @private
    */
   onUIStateUpdate_(uiState) {
     // On vertical rendering, render all the animations with their final state.
-    if (uiState === UIType.VERTICAL) {
+    if (uiState === UIType_Enum.VERTICAL) {
       this.maybeFinishAnimations_();
     }
   }
 
-  /** @return {!Promise} */
-  beforeVisible() {
-    // Ensures a dynamically added page-attachment or page-outlink element is built.
-    // This happens by amp-story-ads.
-    this.renderOpenAttachmentUI_();
-    return this.maybeApplyFirstAnimationFrameOrFinish();
-  }
-
   /**
    * @return {!Promise}
    * @private
@@ -684,7 +829,9 @@ export class AmpStoryPage extends AMP.BaseElement {
             }
 
             whenUpgradedToCustomElement(mediaEl)
-              .then((el) => el.signals().whenSignal(CommonSignals.LOAD_END))
+              .then((el) =>
+                el.signals().whenSignal(CommonSignals_Enum.LOAD_END)
+              )
               .then(resolve, resolve);
             break;
           case 'amp-audio':
@@ -708,14 +855,37 @@ export class AmpStoryPage extends AMP.BaseElement {
         mediaEl.addEventListener('error', resolve, true /* useCapture */);
       });
     });
-    return Promise.all(mediaPromises).then(() => this.markPageAsLoaded_());
+    return Promise.all(mediaPromises);
   }
 
   /**
-   * @return {!Promise}
+   * @return {!Promise} A promise that blocks until all playback media on the
+   *     page have begun their layouts.
+   * @private
+   */
+  waitForPlaybackMediaLayoutStart_() {
+    return this.waitForPlaybackMediaLayout_(true /* waitForLayoutStart */);
+  }
+
+  /**
+   * @return {!Promise} A promise that blocks until all playback media on the
+   *     page have completed their layouts.
+   * @private
+   */
+  waitForPlaybackMediaLayoutEnd_() {
+    return this.waitForPlaybackMediaLayout_(false /* waitForLayoutStart */);
+  }
+
+  /**
+   * @param {boolean} waitForLayoutStart Whether this method should only block
+   *     until all playback media have begun their layouts, as opposed to
+   *     having completed them.
+   * @return {!Promise} A promise that blocks until all playback media on the
+   *     page have begun or completed their layouts, depending on the value of
+   *     `waitForLayoutStart`.
    * @private
    */
-  waitForPlaybackMediaLayout_() {
+  waitForPlaybackMediaLayout_(waitForLayoutStart) {
     const mediaSet = toArray(
       this.getMediaBySelector_(Selectors.ALL_PLAYBACK_AMP_MEDIA)
     );
@@ -725,10 +895,13 @@ export class AmpStoryPage extends AMP.BaseElement {
         switch (mediaEl.tagName.toLowerCase()) {
           case 'amp-audio':
           case 'amp-video':
+            const loadSignal = waitForLayoutStart
+              ? CommonSignals_Enum.LOAD_START
+              : CommonSignals_Enum.LOAD_END;
             const signal =
-              mediaEl.getAttribute('layout') === Layout.NODISPLAY
-                ? CommonSignals.BUILT
-                : CommonSignals.LOAD_END;
+              mediaEl.getAttribute('layout') === Layout_Enum.NODISPLAY
+                ? CommonSignals_Enum.BUILT
+                : loadSignal;
 
             whenUpgradedToCustomElement(mediaEl)
               .then((el) => el.signals().whenSignal(signal))
@@ -749,15 +922,25 @@ export class AmpStoryPage extends AMP.BaseElement {
     return Promise.all(mediaPromises);
   }
 
+  /**
+   * @return {!Promise}
+   * @private
+   */
+  waitForAmpVideosBuilt_() {
+    const mediaSet = this.getAllAmpVideos_();
+
+    const mediaPromises = mediaSet.map((mediaEl) =>
+      whenUpgradedToCustomElement(mediaEl).then((el) => el.whenBuilt())
+    );
+    return Promise.all(mediaPromises);
+  }
+
   /**
    * Finds embedded components in page and prepares them.
-   * @param {boolean=} forceResize
    * @private
    */
-  findAndPrepareEmbeddedComponents_(forceResize = false) {
+  findAndPrepareEmbeddedComponents_() {
     this.addClickShieldToEmbeddedComponents_();
-    this.resizeInteractiveEmbeddedComponents_(forceResize);
-    this.buildAffiliateLinks_();
   }
 
   /**
@@ -767,7 +950,7 @@ export class AmpStoryPage extends AMP.BaseElement {
    */
   addClickShieldToEmbeddedComponents_() {
     const componentEls = toArray(
-      scopedQuerySelectorAll(this.element, EMBEDDED_COMPONENTS_SELECTORS)
+      scopedQuerySelectorAll(this.element, embeddedElementsSelectors())
     );
 
     if (componentEls.length <= 0) {
@@ -781,49 +964,6 @@ export class AmpStoryPage extends AMP.BaseElement {
     });
   }
 
-  /**
-   * Resizes interactive embeds to prepare them for their expanded animation.
-   * @param {boolean} forceResize
-   * @private
-   */
-  resizeInteractiveEmbeddedComponents_(forceResize) {
-    toArray(
-      scopedQuerySelectorAll(
-        this.element,
-        INTERACTIVE_EMBEDDED_COMPONENTS_SELECTORS
-      )
-    ).forEach((el) => {
-      const debouncePrepareForAnimation = debounceEmbedResize(
-        this.win,
-        this.element,
-        this.mutator_
-      );
-
-      if (forceResize) {
-        debouncePrepareForAnimation(el, null /* unlisten */);
-      } else if (!el.hasAttribute(EMBED_ID_ATTRIBUTE_NAME)) {
-        // Element has not been prepared for its animation yet.
-        const unlisten = listen(el, AmpEvents.SIZE_CHANGED, () => {
-          debouncePrepareForAnimation(el, unlisten);
-        });
-        // Run in case target never changes size.
-        debouncePrepareForAnimation(el, null /* unlisten */);
-      }
-    });
-  }
-
-  /**
-   * Initializes affiliate links.
-   */
-  buildAffiliateLinks_() {
-    toArray(
-      scopedQuerySelectorAll(this.element, AFFILIATE_LINK_SELECTOR)
-    ).forEach((el) => {
-      const link = new AmpStoryAffiliateLink(this.win, el);
-      link.build();
-    });
-  }
-
   /** @private */
   markPageAsLoaded_() {
     dispatch(
@@ -881,18 +1021,15 @@ export class AmpStoryPage extends AMP.BaseElement {
       );
     const mediaSet = [];
 
-    iterateCursor(scopedQuerySelectorAll(this.element, selector), (el) =>
+    scopedQuerySelectorAll(this.element, selector).forEach((el) =>
       mediaSet.push(el)
     );
 
     if (fie) {
-      iterateCursor(
-        scopedQuerySelectorAll(
-          fie.win.document.body,
-          Selectors.ALL_IFRAMED_MEDIA
-        ),
-        (el) => mediaSet.push(el)
-      );
+      scopedQuerySelectorAll(
+        fie.win.document.body,
+        selector.replace(/amp-story-grid-layer/g, '')
+      ).forEach((el) => mediaSet.push(el));
     }
 
     return mediaSet;
@@ -1146,7 +1283,14 @@ export class AmpStoryPage extends AMP.BaseElement {
    */
   registerAllMedia_() {
     if (!this.registerAllMediaPromise_) {
-      this.registerAllMediaPromise_ = this.waitForPlaybackMediaLayout_().then(
+      // In preview mode, the `amp-video` layout callback does not resolve
+      // because it is blocked on requests for origin sources that cannot be
+      // made in the SERP due to privacy concerns. So, instead of indefinitely
+      // blocking registration, we register media elements at layout start.
+      const waitForPlaybackMediaLayoutPromise = this.getAmpDoc().isPreview()
+        ? this.waitForPlaybackMediaLayoutStart_()
+        : this.waitForPlaybackMediaLayoutEnd_();
+      this.registerAllMediaPromise_ = waitForPlaybackMediaLayoutPromise.then(
         () => this.whenAllMediaElements_((p, e) => this.registerMedia_(p, e))
       );
     }
@@ -1172,6 +1316,24 @@ export class AmpStoryPage extends AMP.BaseElement {
     }
   }
 
+  /**
+   * Reregisters the given media.
+   * @param {!./media-pool.MediaPool} mediaPool
+   * @param {!Element} mediaEl
+   * @return {!Promise} Promise that resolves after the media is reregistered.
+   * @private
+   */
+  reregisterMedia_(mediaPool, mediaEl) {
+    if (this.isBotUserAgent_) {
+      // No-op.
+      return Promise.resolve();
+    } else {
+      return mediaPool.reregister(
+        /** @type {!./media-pool.DomElementDef} */ (mediaEl)
+      );
+    }
+  }
+
   /**
    * Starts playing animations, if the animation manager is available.
    * @private
@@ -1193,11 +1355,12 @@ export class AmpStoryPage extends AMP.BaseElement {
       return;
     }
     this.signals()
-      .whenSignal(CommonSignals.LOAD_END)
+      .whenSignal(CommonSignals_Enum.LOAD_END)
       .then(() => this.animationManager_.applyLastFrame());
   }
 
   /**
+   * Apply first or last frame of animations if page should play them or not.
    * @return {!Promise}
    */
   maybeApplyFirstAnimationFrameOrFinish() {
@@ -1251,14 +1414,24 @@ export class AmpStoryPage extends AMP.BaseElement {
   emitProgress_(progress) {
     // Don't emit progress for ads, since the progress bar is hidden.
     // Don't emit progress for inactive pages, because race conditions.
-    if (this.isAd() || this.state_ === PageState.NOT_ACTIVE) {
+    const storyAdSegmentBranch = getExperimentBranch(
+      this.win,
+      StoryAdSegmentExp.ID
+    );
+    const progressBarExpDisabled =
+      !storyAdSegmentBranch ||
+      storyAdSegmentBranch == StoryAdSegmentExp.CONTROL;
+    if (
+      (progressBarExpDisabled && this.isAd()) ||
+      this.state_ === PageState.NOT_ACTIVE
+    ) {
       return;
     }
 
-    const payload = dict({
+    const payload = {
       'pageId': this.element.id,
       'progress': progress,
-    });
+    };
     const eventInit = {bubbles: true};
     dispatch(
       this.win,
@@ -1437,37 +1610,58 @@ export class AmpStoryPage extends AMP.BaseElement {
    * @private
    */
   switchTo_(targetPageId, direction) {
-    const payload = dict({
+    const payload = {
       'targetPageId': targetPageId,
       'direction': direction,
-    });
+    };
     const eventInit = {bubbles: true};
     dispatch(this.win, this.element, EventType.SWITCH_PAGE, payload, eventInit);
   }
 
   /**
-   * Checks if the page has any audio.
+   * Checks if the page has audio elements or video elements with audio and updates the store service state.
    * @private
    */
   checkPageHasAudio_() {
-    const pageHasAudio =
+    const hasAudioElements =
       this.element.hasAttribute('background-audio') ||
-      this.element.querySelector('amp-audio') ||
-      this.hasVideoWithAudio_();
+      this.element.querySelector('amp-audio');
+
+    const hasAudioPromise = hasAudioElements
+      ? Promise.resolve(true)
+      : this.hasVideoWithAudio_();
 
-    this.storeService_.dispatch(Action.TOGGLE_PAGE_HAS_AUDIO, pageHasAudio);
+    hasAudioPromise.then((hasAudio) =>
+      this.storeService_.dispatch(Action.TOGGLE_PAGE_HAS_AUDIO, hasAudio)
+    );
   }
 
   /**
    * Checks if the page has any videos with audio.
-   * @return {boolean}
+   * @return {!Promise<boolean>}
    * @private
    */
   hasVideoWithAudio_() {
-    const ampVideoEls = this.element.querySelectorAll('amp-video');
-    return Array.prototype.some.call(
-      ampVideoEls,
-      (video) => !video.hasAttribute('noaudio')
+    return this.waitForAmpVideosBuilt_().then(() =>
+      Array.prototype.some.call(
+        this.getAllAmpVideos_(),
+        (ampVideo) =>
+          !ampVideo.hasAttribute('noaudio') &&
+          parseFloat(ampVideo.getAttribute('volume')) !== 0
+      )
+    );
+  }
+
+  /**
+   * Checks if the page has any videos with captions.
+   * @return {!Promise<boolean>}
+   * @private
+   */
+  hasVideoWithCaptions_() {
+    return this.waitForAmpVideosBuilt_().then(() =>
+      Array.prototype.some.call(this.getAllAmpVideos_(), (ampVideo) =>
+        ampVideo.querySelector('track')
+      )
     );
   }
 
@@ -1488,21 +1682,14 @@ export class AmpStoryPage extends AMP.BaseElement {
   }
 
   /**
+   * Checks if the page has any captions.
    * @private
    */
-  reportDevModeErrors_() {
-    if (!getMode().development) {
-      return;
-    }
-
-    getLogEntries(this.element).then((logEntries) => {
-      dispatch(
-        this.win,
-        this.element,
-        EventType.DEV_LOG_ENTRIES_AVAILABLE,
-        // ? is OK because all consumers are internal.
-        /** @type {?} */ (logEntries),
-        {bubbles: true}
+  checkPageHasCaptions_() {
+    this.hasVideoWithCaptions_().then((hasVideoWithCaptions) => {
+      this.storeService_.dispatch(
+        Action.TOGGLE_PAGE_HAS_CAPTIONS,
+        hasVideoWithCaptions
       );
     });
   }
@@ -1573,7 +1760,7 @@ export class AmpStoryPage extends AMP.BaseElement {
       }
     }
 
-    Array.prototype.forEach.call(videoEls, (videoEl) => {
+    videoEls.forEach((videoEl) => {
       this.unlisteners_.push(
         listen(videoEl, 'playing', () =>
           this.debounceToggleLoadingSpinner_(false)
@@ -1597,13 +1784,13 @@ export class AmpStoryPage extends AMP.BaseElement {
   }
 
   /**
+   * @return {!Element}
    * @private
    */
   buildAndAppendVideoLoadingSpinner_() {
-    this.loadingSpinner_ = new LoadingSpinner();
-    const loadingSpinnerEl = this.loadingSpinner_.build();
-    loadingSpinnerEl.setAttribute('aria-label', 'Loading video');
-    this.element.appendChild(loadingSpinnerEl);
+    const loadingSpinner = renderLoadingSpinner();
+    loadingSpinner.setAttribute('aria-label', 'Loading video');
+    return this.element.appendChild(loadingSpinner);
   }
 
   /**
@@ -1616,11 +1803,7 @@ export class AmpStoryPage extends AMP.BaseElement {
    */
   toggleLoadingSpinner_(isActive) {
     this.mutateElement(() => {
-      if (!this.loadingSpinner_) {
-        this.buildAndAppendVideoLoadingSpinner_();
-      }
-
-      this.loadingSpinner_.toggle(isActive);
+      toggleLoadingSpinner(this.getLoadingSpinner_(), isActive);
     });
   }
 
@@ -1631,16 +1814,7 @@ export class AmpStoryPage extends AMP.BaseElement {
    * @private
    */
   buildAndAppendPlayMessage_() {
-    this.playMessageEl_ = renderPlayMessageElement();
-    const labelEl = this.playMessageEl_.querySelector(
-      '.i-amphtml-story-page-play-label'
-    );
-    labelEl.textContent = localize(
-      this.element,
-      LocalizedStringId.AMP_STORY_PAGE_PLAY_VIDEO
-    );
-
-    this.playMessageEl_.addEventListener('click', () => {
+    this.playMessageEl_ = renderPlayMessageElement(() => {
       this.togglePlayMessage_(false);
       this.startMeasuringAllVideoPerformance_();
       this.mediaPoolPromise_
@@ -1648,7 +1822,9 @@ export class AmpStoryPage extends AMP.BaseElement {
         .then(() => this.playAllMedia_());
     });
 
-    this.mutateElement(() => this.element.appendChild(this.playMessageEl_));
+    localizeTemplate(this.playMessageEl_, this.element).then(() =>
+      this.mutateElement(() => this.element.appendChild(this.playMessageEl_))
+    );
   }
 
   /**
@@ -1680,15 +1856,10 @@ export class AmpStoryPage extends AMP.BaseElement {
    */
   buildAndAppendErrorMessage_() {
     this.errorMessageEl_ = renderErrorMessageElement();
-    const labelEl = this.errorMessageEl_.querySelector(
-      '.i-amphtml-story-page-error-label'
-    );
-    labelEl.textContent = localize(
-      this.element,
-      LocalizedStringId.AMP_STORY_PAGE_ERROR_VIDEO
-    );
 
-    this.mutateElement(() => this.element.appendChild(this.errorMessageEl_));
+    localizeTemplate(this.errorMessageEl_, this.element).then(() =>
+      this.mutateElement(() => this.element.appendChild(this.errorMessageEl_))
+    );
   }
 
   /**
@@ -1715,74 +1886,23 @@ export class AmpStoryPage extends AMP.BaseElement {
   }
 
   /**
-   * Renders the open attachment UI affordance.
+   * Installs the page attachment extension.
    * @private
    */
-  renderOpenAttachmentUI_() {
-    // AttachmentEl can be any component that extends draggable drawer.
-    const attachmentEl = this.element.querySelector(
+  installPageAttachmentExtension_() {
+    const elementsThatRequireExtension = this.element.querySelector(
       'amp-story-page-attachment, amp-story-page-outlink, amp-story-shopping-attachment'
     );
-    if (!attachmentEl) {
-      return;
-    }
-
-    // To prevent 'title' attribute from being used by browser, copy value to 'data-title' and remove.
-    if (attachmentEl.hasAttribute('title')) {
-      attachmentEl.setAttribute(
-        'data-title',
-        attachmentEl.getAttribute('title')
-      );
-      attachmentEl.removeAttribute('title');
-    }
-
-    if (!this.openAttachmentEl_) {
-      this.openAttachmentEl_ = renderPageAttachmentUI(
-        this.element,
-        attachmentEl
-      );
-
-      // This ensures `active` is set on first render.
-      // Otherwise setState may be called before this.openAttachmentEl_ exists.
-      if (this.element.hasAttribute('active')) {
-        this.openAttachmentEl_.setAttribute('active', '');
-      }
 
-      const container = this.win.document.createElement('div');
-      container.classList.add('i-amphtml-story-page-open-attachment-host');
-      container.setAttribute('role', 'button');
-
-      container.addEventListener('click', (e) => {
-        // Prevent default so link can be opened programmatically after URL preview is shown.
-        e.preventDefault();
-        this.openAttachment();
-      });
-
-      this.mutateElement(() => {
-        this.element.appendChild(container);
-        createShadowRootWithStyle(
-          container,
-          this.openAttachmentEl_,
-          pageAttachmentCSS
-        );
-      });
-    }
-  }
-
-  /**
-   * Opens the attachment, if any.
-   * @param {boolean=} shouldAnimate
-   */
-  openAttachment(shouldAnimate = true) {
-    const attachmentEl = this.element.querySelector(
-      'amp-story-page-attachment, amp-story-page-outlink, amp-story-shopping-attachment'
-    );
-
-    if (!attachmentEl) {
+    if (!elementsThatRequireExtension) {
       return;
     }
 
-    attachmentEl.getImpl().then((attachment) => attachment.open(shouldAnimate));
+    Services.extensionsFor(this.win).installExtensionForDoc(
+      this.getAmpDoc(),
+      'amp-story-page-attachment',
+      '0.1'
+    );
   }
 
   /**
@@ -1882,4 +2002,40 @@ export class AmpStoryPage extends AMP.BaseElement {
       );
     });
   }
+
+  /**
+   * Listens for changes on captions if there are tracks on videos and page is active.
+   * @private
+   */
+  initializeCaptionsListener_() {
+    this.hasVideoWithCaptions_().then((hasVideoWithCaptions) => {
+      if (!hasVideoWithCaptions) {
+        return;
+      }
+      this.storeService_.subscribe(
+        StateProperty.CAPTIONS_STATE,
+        (captionsState) => {
+          if (this.isActive()) {
+            this.toggleCaptions_(captionsState);
+          }
+        },
+        true
+      );
+    });
+  }
+
+  /**
+   * Shows or hides the captions for all elements that implement toggleCaptions.
+   * @param {boolean} captionsState
+   * @return {!Promise}
+   */
+  toggleCaptions_(captionsState) {
+    return this.getAllAmpVideos_().map((ampVideo) =>
+      ampVideo.getImpl().then((impl) => {
+        if (impl.toggleCaptions) {
+          impl.toggleCaptions(captionsState);
+        }
+      })
+    );
+  }
 }
diff --git a/extensions/amp-story/1.0/amp-story-render-service.js b/extensions/amp-story/1.0/amp-story-render-service.js
deleted file mode 100644
index 596f788586aa..000000000000
--- a/extensions/amp-story/1.0/amp-story-render-service.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import {CommonSignals} from '#core/constants/common-signals';
-import {Services} from '#service';
-import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
-
-/**
- * Maximum milliseconds to wait for service to load.
- * Needs to be shorter than the render delay timeout to account for the latency
- * downloading and executing the amp-story js.
- * @const
- */
-const LOAD_TIMEOUT = 2900;
-
-/** @implements {../../../src/render-delaying-services.RenderDelayingService} */
-export class AmpStoryRenderService {
-  /**
-   * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
-   */
-  constructor(ampdoc) {
-    /**
-     * @private {!../../../src/service/ampdoc-impl.AmpDoc}
-     */
-    this.ampdoc_ = ampdoc;
-
-    /** @const @private {!../../../src/service/timer-impl.Timer} */
-    this.timer_ = Services.timerFor(ampdoc.win);
-  }
-
-  /**
-   * Function to return a promise for when it is finished delaying render, and
-   * is ready.  Implemented from RenderDelayingService
-   * @return {!Promise}
-   */
-  whenReady() {
-    const whenReadyPromise = this.ampdoc_.whenReady().then((body) => {
-      const storyEl = body.querySelector('amp-story[standalone]');
-
-      if (!storyEl) {
-        return;
-      }
-
-      return whenUpgradedToCustomElement(storyEl).then(() => {
-        return storyEl.signals().whenSignal(CommonSignals.LOAD_END);
-      });
-    });
-
-    return Promise.race([whenReadyPromise, this.timer_.promise(LOAD_TIMEOUT)]);
-  }
-}
diff --git a/extensions/amp-story/1.0/amp-story-request-service.js b/extensions/amp-story/1.0/amp-story-request-service.js
deleted file mode 100644
index 324ad90fbfd3..000000000000
--- a/extensions/amp-story/1.0/amp-story-request-service.js
+++ /dev/null
@@ -1,106 +0,0 @@
-import {Services} from '#service';
-import {getChildJsonConfig} from '#core/dom';
-import {isProtocolValid} from '../../../src/url';
-import {once} from '#core/types/function';
-import {registerServiceBuilder} from '../../../src/service-helpers';
-import {user, userAssert} from '#utils/log';
-
-/** @private @const {string} */
-export const CONFIG_SRC_ATTRIBUTE_NAME = 'src';
-
-/** @private const {string} */
-export const CREDENTIALS_ATTRIBUTE_NAME = 'data-credentials';
-
-/** @private @const {string} */
-const TAG = 'amp-story-request-service';
-
-/**
- * Service to send XHRs.
- */
-export class AmpStoryRequestService {
-  /**
-   * @param {!Window} win
-   * @param {!Element} storyElement
-   */
-  constructor(win, storyElement) {
-    /** @private @const {!Element} */
-    this.storyElement_ = storyElement;
-
-    /** @private @const {!../../../src/service/xhr-impl.Xhr} */
-    this.xhr_ = Services.xhrFor(win);
-
-    /** @const @type {function():(!Promise<!JsonObject>|!Promise<null>)} */
-    this.loadShareConfig = once(() => this.loadShareConfigImpl_());
-  }
-
-  /**
-   * @param {string} rawUrl
-   * @param {Object=} opts
-   * @return {(!Promise<!JsonObject>|!Promise<null>)}
-   */
-  executeRequest(rawUrl, opts = {}) {
-    if (!isProtocolValid(rawUrl)) {
-      user().error(TAG, 'Invalid config url.');
-      return Promise.resolve(null);
-    }
-
-    return Services.urlReplacementsForDoc(this.storyElement_)
-      .expandUrlAsync(user().assertString(rawUrl))
-      .then((url) => this.xhr_.fetchJson(url, opts))
-      .then((response) => {
-        userAssert(response.ok, 'Invalid HTTP response');
-        return response.json();
-      });
-  }
-
-  /**
-   * Retrieves the publisher share providers.
-   * Has to be called through `loadShareConfig`.
-   * @return {(!Promise<!JsonObject>|!Promise<null>)}
-   */
-  loadShareConfigImpl_() {
-    const shareConfigEl = this.storyElement_.querySelector(
-      'amp-story-social-share, amp-story-bookend'
-    );
-    if (!shareConfigEl) {
-      return Promise.resolve();
-    }
-
-    if (shareConfigEl.hasAttribute(CONFIG_SRC_ATTRIBUTE_NAME)) {
-      const rawUrl = shareConfigEl.getAttribute(CONFIG_SRC_ATTRIBUTE_NAME);
-      const credentials = shareConfigEl.getAttribute(
-        CREDENTIALS_ATTRIBUTE_NAME
-      );
-      return this.executeRequest(rawUrl, credentials ? {credentials} : {});
-    }
-
-    // Fallback. Check for an inline json config.
-    let config = null;
-    try {
-      config = getChildJsonConfig(shareConfigEl);
-    } catch (err) {}
-
-    return Promise.resolve(config);
-  }
-}
-
-/**
- * Util function to retrieve the request service. Ensures we can retrieve the
- * service synchronously from the amp-story codebase without running into race
- * conditions.
- * @param  {!Window} win
- * @param  {!Element} storyEl
- * @return {!AmpStoryRequestService}
- */
-export const getRequestService = (win, storyEl) => {
-  let service = Services.storyRequestService(win);
-
-  if (!service) {
-    service = new AmpStoryRequestService(win, storyEl);
-    registerServiceBuilder(win, 'story-request', function () {
-      return service;
-    });
-  }
-
-  return service;
-};
diff --git a/extensions/amp-story/1.0/amp-story-share-menu.js b/extensions/amp-story/1.0/amp-story-share-menu.js
deleted file mode 100644
index a2bf4b59d5bf..000000000000
--- a/extensions/amp-story/1.0/amp-story-share-menu.js
+++ /dev/null
@@ -1,289 +0,0 @@
-import * as Preact from '#core/dom/jsx';
-import {
-  ANALYTICS_TAG_NAME,
-  StoryAnalyticsEvent,
-  getAnalyticsService,
-} from './story-analytics';
-import {
-  Action,
-  StateProperty,
-  UIType,
-  getStoreService,
-} from './amp-story-store-service';
-import {CSS} from '../../../build/amp-story-share-menu-1.0.css';
-import {Keys} from '#core/constants/key-codes';
-import {LocalizedStringId} from '#service/localization/strings';
-import {Services} from '#service';
-import {ShareWidget} from './amp-story-share';
-import {closest} from '#core/dom/query';
-import {createShadowRootWithStyle} from './utils';
-import {dev} from '#utils/log';
-import {getAmpdoc} from '../../../src/service-helpers';
-import {localize} from './amp-story-localization-service';
-import {setStyles} from '#core/dom/style';
-
-/** @const {string} Class to toggle the share menu. */
-export const VISIBLE_CLASS = 'i-amphtml-story-share-menu-visible';
-
-/**
- * Quick share template, used as a fallback if native sharing is not supported.
- * @return {!Element}
- */
-const renderShareMenu = () => {
-  return (
-    <div
-      class="i-amphtml-story-share-menu i-amphtml-story-system-reset"
-      aria-hidden="true"
-      role="alert"
-    >
-      <div class="i-amphtml-story-share-menu-container">
-        <button
-          class="i-amphtml-story-share-menu-close-button"
-          aria-label="close"
-          role="button"
-        >
-          &times;
-        </button>
-      </div>
-    </div>
-  );
-};
-
-/**
- * System amp-social-share button template.
- * @return {!Element}
- */
-const renderAmpSocialSystemShareElement = () => {
-  return <amp-social-share type="system"></amp-social-share>;
-};
-
-/**
- * Share menu UI.
- */
-export class ShareMenu {
-  /**
-   * @param {!Window} win
-   * @param {!Element} storyEl Element where to append the component
-   */
-  constructor(win, storyEl) {
-    /** @private @const {!Window} */
-    this.win_ = win;
-
-    /** @private {?Element} */
-    this.element_ = null;
-
-    /** @private {?Element} */
-    this.closeButton_ = null;
-
-    /** @private {?Element} */
-    this.innerContainerEl_ = null;
-
-    /** @private {boolean} */
-    this.isBuilt_ = false;
-
-    /** @private {boolean} */
-    this.isSystemShareSupported_ = false;
-
-    /** @private @const {!ShareWidget} */
-    this.shareWidget_ = ShareWidget.create(this.win_, storyEl);
-
-    /** @private @const {!./amp-story-store-service.AmpStoryStoreService} */
-    this.storeService_ = getStoreService(this.win_);
-
-    /** @private {!./story-analytics.StoryAnalyticsService} */
-    this.analyticsService_ = getAnalyticsService(this.win_, storyEl);
-
-    /** @private @const {!Element} */
-    this.parentEl_ = storyEl;
-
-    /** @const @private {!../../../src/service/vsync-impl.Vsync} */
-    this.vsync_ = Services.vsyncFor(this.win_);
-  }
-
-  /**
-   * Builds and appends the component in the story. Could build either the
-   * amp-social-share button to display the native system sharing, or a fallback
-   * UI.
-   */
-  build() {
-    if (this.isBuilt()) {
-      return;
-    }
-
-    this.isBuilt_ = true;
-
-    this.isSystemShareSupported_ = this.shareWidget_.isSystemShareSupported(
-      getAmpdoc(this.parentEl_)
-    );
-
-    this.isSystemShareSupported_
-      ? this.buildForSystemSharing_()
-      : this.buildForFallbackSharing_();
-  }
-
-  /**
-   * Whether the element has been built.
-   * @return {boolean}
-   */
-  isBuilt() {
-    return this.isBuilt_;
-  }
-
-  /**
-   * Builds a hidden amp-social-share button that triggers the native system
-   * sharing UI.
-   * @private
-   */
-  buildForSystemSharing_() {
-    this.shareWidget_.loadRequiredExtensions(getAmpdoc(this.parentEl_));
-    this.element_ = renderAmpSocialSystemShareElement();
-
-    this.initializeListeners_();
-
-    this.vsync_.mutate(() => {
-      setStyles(dev().assertElement(this.element_), {
-        'visibility': 'hidden',
-        'pointer-events': 'none',
-        'z-index': -1,
-      });
-      this.parentEl_.appendChild(this.element_);
-    });
-  }
-
-  /**
-   * Builds and appends the fallback UI.
-   * @private
-   */
-  buildForFallbackSharing_() {
-    const root = this.win_.document.createElement('div');
-    root.classList.add('i-amphtml-story-share-menu-host');
-
-    this.element_ = renderShareMenu();
-    createShadowRootWithStyle(root, this.element_, CSS);
-
-    this.closeButton_ = dev().assertElement(
-      this.element_.querySelector('.i-amphtml-story-share-menu-close-button')
-    );
-    this.closeButton_.setAttribute(
-      'aria-label',
-      localize(this.parentEl_, LocalizedStringId.AMP_STORY_CLOSE_BUTTON_LABEL)
-    );
-
-    this.initializeListeners_();
-
-    this.vsync_.run({
-      measure: () => {
-        this.innerContainerEl_ = this.element_./*OK*/ querySelector(
-          '.i-amphtml-story-share-menu-container'
-        );
-      },
-      mutate: () => {
-        this.parentEl_.appendChild(root);
-        // Preloads and renders the share widget content.
-        const shareWidget = this.shareWidget_.build(getAmpdoc(this.parentEl_));
-        this.innerContainerEl_.appendChild(shareWidget);
-      },
-    });
-  }
-
-  /**
-   * @private
-   */
-  initializeListeners_() {
-    this.storeService_.subscribe(
-      StateProperty.UI_STATE,
-      (uiState) => {
-        this.onUIStateUpdate_(uiState);
-      },
-      true /** callToInitialize */
-    );
-
-    this.storeService_.subscribe(StateProperty.SHARE_MENU_STATE, (isOpen) => {
-      this.onShareMenuStateUpdate_(isOpen);
-    });
-
-    // Don't listen to click events if the system share is supported, since the
-    // native layer handles all the UI interactions.
-    if (!this.isSystemShareSupported_) {
-      this.element_.addEventListener('click', (event) =>
-        this.onShareMenuClick_(event)
-      );
-
-      this.win_.addEventListener('keyup', (event) => {
-        if (event.key == Keys.ESCAPE) {
-          event.preventDefault();
-          this.close_();
-        }
-      });
-    }
-  }
-
-  /**
-   * Reacts to menu state updates and decides whether to show either the native
-   * system sharing, or the fallback UI.
-   * @param {boolean} isOpen
-   * @private
-   */
-  onShareMenuStateUpdate_(isOpen) {
-    if (this.isSystemShareSupported_ && isOpen) {
-      // Dispatches a click event on the amp-social-share button to trigger the
-      // native system sharing UI. This has to be done upon user interaction.
-      this.element_.dispatchEvent(new Event('click'));
-
-      // There is no way to know when the user dismisses the native system share
-      // menu, so we pretend it is closed on the story end, and let the native
-      // end handle the UI interactions.
-      this.close_();
-    }
-
-    if (!this.isSystemShareSupported_) {
-      this.vsync_.mutate(() => {
-        this.element_.classList.toggle(VISIBLE_CLASS, isOpen);
-        this.element_.setAttribute('aria-hidden', !isOpen);
-      });
-    }
-    this.element_[ANALYTICS_TAG_NAME] = 'amp-story-share-menu';
-    this.analyticsService_.triggerEvent(
-      isOpen ? StoryAnalyticsEvent.OPEN : StoryAnalyticsEvent.CLOSE,
-      this.element_
-    );
-  }
-
-  /**
-   * Handles click events and maybe closes the menu for the fallback UI.
-   * @param  {!Event} event
-   */
-  onShareMenuClick_(event) {
-    const el = dev().assertElement(event.target);
-
-    if (el === this.closeButton_) {
-      this.close_();
-    }
-
-    // Closes the menu if click happened outside of the menu main container.
-    if (!closest(el, (el) => el === this.innerContainerEl_, this.element_)) {
-      this.close_();
-    }
-  }
-
-  /**
-   * Reacts to UI state updates and triggers the right UI.
-   * @param {!UIType} uiState
-   * @private
-   */
-  onUIStateUpdate_(uiState) {
-    this.vsync_.mutate(() => {
-      uiState !== UIType.MOBILE
-        ? this.element_.setAttribute('desktop', '')
-        : this.element_.removeAttribute('desktop');
-    });
-  }
-
-  /**
-   * Closes the share menu.
-   * @private
-   */
-  close_() {
-    this.storeService_.dispatch(Action.TOGGLE_SHARE_MENU, false);
-  }
-}
diff --git a/extensions/amp-story/1.0/amp-story-share.css b/extensions/amp-story/1.0/amp-story-share.css
deleted file mode 100644
index 3217ccd57cb1..000000000000
--- a/extensions/amp-story/1.0/amp-story-share.css
+++ /dev/null
@@ -1,139 +0,0 @@
-
-
-@import '../../amp-social-share/0.1/amp-social-share.css';
-
-.i-amphtml-story-share-widget {
-  display: block !important;
-  margin: 16px 8px !important;
-}
-
-.i-amphtml-story-no-sharing .i-amphtml-story-share-widget {
-  display: none !important;
-}
-
-.i-amphtml-story-share-widget-scrollable {
-  padding: 16px 0 !important;
-  overflow: auto !important;
-}
-
-.i-amphtml-story-share-widget::-webkit-scrollbar {
-  width: 0px !important;
-  background: transparent !important;
-}
-
-.i-amphtml-story-share-list {
-  list-style: none !important;
-  padding: 0 8px !important;
-  margin: 0 !important;
-  display: flex !important;
-  flex-wrap: wrap !important;
-  width: 100% !important;
-}
-
-.i-amphtml-story-share-item {
-  width: 48px !important;
-  height: 66px !important;
-  padding: 0 16px !important;
-  margin-bottom: 12px !important;
-}
-
-@media (max-width: 410px) {
-  .i-amphtml-story-share-item {
-    display: flex !important;
-    justify-content: center !important;
-    padding: 0 !important;
-    min-width: 60px !important;
-    width: 25% !important;
-  }
-}
-
-@media (min-width: 410px) and (max-width: 500px) {
-  .i-amphtml-story-share-item {
-    display: flex !important;
-    justify-content: center !important;
-    padding: 0 !important;
-    width: 20% !important;
-  }
-}
-
-@media (min-width: 500px) and (max-width: 720px) {
-  .i-amphtml-story-share-item {
-    display: flex !important;
-    justify-content: center !important;
-    padding: 0 !important;
-    width: 16.66% !important;
-  }
-}
-
-.i-amphtml-story-share-widget-scrollable .i-amphtml-story-share-list {
-  flex-wrap: nowrap !important;
-}
-
-.i-amphtml-story-share-widget-scrollable > * > .i-amphtml-story-share-item {
-  display: block !important;
-  margin: 0 !important;
-  padding: 0 16px !important;
-  min-width: auto !important;
-}
-
-.i-amphtml-story-share-item:empty {
-  display: none !important;
-}
-
-.i-amphtml-story-share-icon {
-  box-sizing: border-box !important;
-  position: relative !important;
-  width: 48px !important;
-  height: 48px !important;
-  display: block !important;
-  cursor: pointer !important;
-  border-radius: 4px !important;
-  overflow: visible !important;
-
-  /* for svg backgrounds: */
-  background-position: 8px 8px !important;
-  background-size: 32px 32px !important;
-  background-repeat: no-repeat !important;
-}
-
-.i-amphtml-story-share-icon.amp-social-share-facebook {
-  /* SVG icon has inner padding, so the glyph renders visually smaller than
-   * other icons, so we work around it by setting a higher background size. */
-  background-size: 38px 38px !important;
-  background-position: 5px 5px !important;
-}
-
-.i-amphtml-story-share-icon:focus {
-  outline: 2px solid #0389ff !important;
-  outline-offset: 2px !important;
-}
-
-.i-amphtml-story-share-icon[type=email] {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="32px" height="32px" viewBox="0 0 24 24" fill="#ffffff"><path d="M20 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm0 4l-8 5-8-5V6l8 5 8-5v2z"/><path d="M0 0h24v24H0z" fill="none"/></svg>') !important;
-  background-color: #9AA0A6 !important;
-}
-
-.i-amphtml-story-share-icon[type=system] {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 0 24 24" fill="#ffffff"><path d="M0 0h24v24H0z" fill="none"/><path d="M6 10c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm12 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm-6 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z"/></svg>') !important;
-  background-color: #9AA0A6 !important;
-}
-
-.i-amphtml-story-share-icon-link {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="32px" height="32px" viewBox="0 0 24 24" fill="#ffffff"><path d="M0 0h24v24H0z" fill="none"/><path d="M3.9 12c0-1.71 1.39-3.1 3.1-3.1h4V7H7c-2.76 0-5 2.24-5 5s2.24 5 5 5h4v-1.9H7c-1.71 0-3.1-1.39-3.1-3.1zM8 13h8v-2H8v2zm9-6h-4v1.9h4c1.71 0 3.1 1.39 3.1 3.1s-1.39 3.1-3.1 3.1h-4V17h4c2.76 0 5-2.24 5-5s-2.24-5-5-5z"/></svg>') !important;
-  background-color: #9AA0A6 !important;
-}
-
-.i-amphtml-story-share-icon .i-amphtml-story-share-label {
-  position: absolute !important;
-  top: 48px !important;
-  left: 0 !important;
-  width: 100% !important;
-  color: rgba(0, 0, 0, 0.87) !important;
-  padding-top: 5px !important; /* Making sure the whole icon is clickable. */
-  text-transform: capitalize !important;
-  font-family: 'Roboto', sans-serif !important;
-  font-weight: 400 !important;
-  line-height: 13px !important;
-  font-size: 11px !important;
-  text-align: center !important;
-}
diff --git a/extensions/amp-story/1.0/amp-story-share.js b/extensions/amp-story/1.0/amp-story-share.js
index 34fc6cb39c97..a1e46f9723be 100644
--- a/extensions/amp-story/1.0/amp-story-share.js
+++ b/extensions/amp-story/1.0/amp-story-share.js
@@ -1,284 +1,80 @@
 import * as Preact from '#core/dom/jsx';
-import {LocalizedStringId} from '#service/localization/strings';
-import {Services} from '#service';
-import {Toast} from './toast';
-import {
-  copyTextToClipboard,
-  isCopyingToClipboardSupported,
-} from '#core/window/clipboard';
-import {dev, devAssert, user} from '#utils/log';
-import {dict, map} from '#core/types/object';
-import {localize} from './amp-story-localization-service';
-import {getRequestService} from './amp-story-request-service';
-import {isObject} from '#core/types';
-import {listen} from '#utils/event-helper';
-import {addAttributesToElement} from '#core/dom';
-
-/**
- * Maps share provider type to visible name.
- * If the name only needs to be capitalized (e.g. `facebook` to `Facebook`) it
- * does not need to be included here.
- * @const {!Object<string, !LocalizedStringId>}
- */
-const SHARE_PROVIDER_LOCALIZED_STRING_ID = map({
-  'system': LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_SYSTEM,
-  'email': LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_EMAIL,
-  'facebook': LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_FACEBOOK,
-  'line': LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_LINE,
-  'linkedin': LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_LINKEDIN,
-  'pinterest': LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_PINTEREST,
-  'gplus': LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_GOOGLE_PLUS,
-  'tumblr': LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_TUMBLR,
-  'twitter': LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_TWITTER,
-  'whatsapp': LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_WHATSAPP,
-  'sms': LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_SMS,
-});
-
-/**
- * Key for share providers in config.
- * @const {string}
- */
-export const SHARE_PROVIDERS_KEY = 'shareProviders';
-
-/**
- * Deprecated key for share providers in config.
- * @const {string}
- */
-export const DEPRECATED_SHARE_PROVIDERS_KEY = 'share-providers';
-
-/** @return {!Element} */
-const renderElement = () => (
-  <div class="i-amphtml-story-share-widget">
-    <ul class="i-amphtml-story-share-list">
-      <li class="i-amphtml-story-share-system" />
-    </ul>
-  </div>
-);
 
-/**
- * @param {!Node} child
- * @return {!Element} */
-const renderShareItemListElement = (child) => (
-  <li class="i-amphtml-story-share-item">{child}</li>
-);
-
-/**
- * @private
- * @param {!Element} el
- * @return {!Element}
- */
-function renderLinkShareButtonElement(el) {
-  return (
-    <div
-      class="i-amphtml-story-share-icon i-amphtml-story-share-icon-link"
-      tabIndex={0}
-      role="button"
-      aria-label={localize(
-        el,
-        LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_LINK
-      )}
-    >
-      <span class="i-amphtml-story-share-label">
-        {localize(el, LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_LINK)}
-      </span>
-    </div>
-  );
-}
-
-/**
- * @param {!JsonObject=} opt_params
- * @return {!JsonObject}
- */
-function buildProviderParams(opt_params) {
-  const attrs = dict();
-
-  if (opt_params) {
-    Object.keys(opt_params).forEach((field) => {
-      if (field === 'provider') {
-        return;
-      }
-      attrs[`data-param-${field}`] = opt_params[field];
-    });
-  }
+import {Services} from '#service';
 
-  return attrs;
-}
+import {user} from '#utils/log';
 
-/**
- * @param {!Document} doc
- * @param {string} shareType
- * @param {!JsonObject=} opt_params
- * @return {!Element}
- */
-function buildProvider(doc, shareType, opt_params) {
-  const shareProviderLocalizedStringId = devAssert(
-    SHARE_PROVIDER_LOCALIZED_STRING_ID[shareType],
-    `No localized string to display name for share type ${shareType}.`
-  );
+import {getAmpdoc} from 'src/service-helpers';
 
-  const social = (
-    <amp-social-share
-      width={48}
-      height={48}
-      class="i-amphtml-story-share-icon"
-      type={shareType}
-    >
-      <span class="i-amphtml-story-share-label">
-        {localize(doc, shareProviderLocalizedStringId)}
-      </span>
-    </amp-social-share>
-  );
-  return addAttributesToElement(social, buildProviderParams(opt_params));
-}
+import {
+  Action,
+  StateProperty,
+  getStoreService,
+} from './amp-story-store-service';
+import {StoryAnalyticsEvent, getAnalyticsService} from './story-analytics';
 
-/**
- * @param {!Document} doc
- * @param {string} url
- * @return {!Element}
- */
-function buildCopySuccessfulToast(doc, url) {
-  return (
-    <div class="i-amphtml-story-copy-successful">
-      <div>
-        {localize(
-          doc,
-          LocalizedStringId.AMP_STORY_SHARING_CLIPBOARD_SUCCESS_TEXT
-        )}
-      </div>
-      <div class="i-amphtml-story-copy-url">{url}</div>
-    </div>
-  );
-}
+const TAG = 'amp-story-share';
 
 /**
- * Social share widget for the system button.
+ * Support for amp-story to launch native sharing menu or fallback sharing icons.
  */
-export class ShareWidget {
+export class AmpStoryShare {
   /**
    * @param {!Window} win
    * @param {!Element} storyEl
    */
   constructor(win, storyEl) {
-    /** @private {?../../../src/service/ampdoc-impl.AmpDoc} */
-    this.ampdoc_ = null;
-
-    /** @protected @const {!Window} */
-    this.win = win;
+    /** @private @const {!Window} */
+    this.win_ = win;
 
-    /** @protected @const {!Element} */
-    this.storyEl = storyEl;
+    /** @private @const {!Element} */
+    this.storyEl_ = storyEl;
 
-    /** @protected {?Element} */
-    this.root = null;
-
-    /** @private @const {!./amp-story-request-service.AmpStoryRequestService} */
-    this.requestService_ = getRequestService(this.win, storyEl);
-  }
-
-  /**
-   * @param {!Window} win
-   * @param {!Element} storyEl
-   * @return {!ShareWidget}
-   */
-  static create(win, storyEl) {
-    return new ShareWidget(win, storyEl);
-  }
-
-  /**
-   * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
-   * @return {!Element}
-   */
-  build(ampdoc) {
-    devAssert(!this.root, 'Already built.');
+    /** @private {!./story-analytics.StoryAnalyticsService} */
+    this.analyticsService_ = getAnalyticsService(win, storyEl);
 
-    this.ampdoc_ = ampdoc;
+    /** @private @const {!./amp-story-store-service.AmpStoryStoreService} */
+    this.storeService_ = getStoreService(win);
 
-    this.root = renderElement();
+    /** @private {!Element} used to host the fallback menu or for analytics. */
+    this.shareMenuEl_ = <amp-story-share-menu></amp-story-share-menu>;
+    storyEl.appendChild(this.shareMenuEl_);
 
-    this.loadProviders();
-    this.maybeAddLinkShareButton_();
-    this.maybeAddSystemShareButton_();
+    /** @private {boolean} */
+    this.initializedFallback_ = false;
 
-    return this.root;
+    this.initializeListeners_();
   }
 
   /**
-   * @return {!../../../src/service/ampdoc-impl.AmpDoc}
    * @private
    */
-  getAmpDoc_() {
-    return devAssert(this.ampdoc_);
-  }
-
-  /** @private */
-  maybeAddLinkShareButton_() {
-    if (!isCopyingToClipboardSupported(this.win.document)) {
-      return;
-    }
-
-    const linkShareButton = renderLinkShareButtonElement(this.storyEl);
-
-    this.add_(linkShareButton);
-
-    listen(linkShareButton, 'click', (e) => {
-      e.preventDefault();
-      this.copyUrlToClipboard_();
-    });
-    listen(linkShareButton, 'keyup', (e) => {
-      const code = e.charCode || e.keyCode;
-      // Check if pressed Space or Enter to trigger button.
-      if (code === 32 || code === 13) {
-        e.preventDefault();
-        this.copyUrlToClipboard_();
+  initializeListeners_() {
+    this.storeService_.subscribe(StateProperty.SHARE_MENU_STATE, (isOpen) => {
+      if (isOpen) {
+        if (this.isSystemShareSupported_()) {
+          this.openSystemShare_();
+          this.close_();
+        } else {
+          this.buildFallbackMenu_();
+        }
       }
-    });
-  }
 
-  /**
-   * @private
-   */
-  copyUrlToClipboard_() {
-    const url = Services.documentInfoForDoc(this.getAmpDoc_()).canonicalUrl;
-
-    if (!copyTextToClipboard(this.win, url)) {
-      const failureString = localize(
-        this.storyEl,
-        LocalizedStringId.AMP_STORY_SHARING_CLIPBOARD_FAILURE_TEXT
+      this.analyticsService_.triggerEvent(
+        isOpen ? StoryAnalyticsEvent.OPEN : StoryAnalyticsEvent.CLOSE,
+        this.shareMenuEl_
       );
-      Toast.show(this.storyEl, dev().assertString(failureString));
-      return;
-    }
-
-    Toast.show(this.storyEl, buildCopySuccessfulToast(this.win.document, url));
-  }
-
-  /** @private */
-  maybeAddSystemShareButton_() {
-    if (!this.isSystemShareSupported()) {
-      // `amp-social-share` will hide `system` buttons when not supported, but
-      // we also need to avoid adding it for rendering reasons.
-      return;
-    }
-
-    const container = dev()
-      .assertElement(this.root)
-      .querySelector('.i-amphtml-story-share-system');
-
-    this.loadRequiredExtensions();
-
-    container.appendChild(buildProvider(this.win.document, 'system'));
+    });
   }
 
   /**
    * NOTE(alanorozco): This is a duplicate of the logic in the
    * `amp-social-share` component.
-   * @param  {!../../../src/service/ampdoc-impl.AmpDoc=}  ampdoc
    * @return {boolean} Whether the browser supports native system sharing.
    */
-  isSystemShareSupported(ampdoc = this.getAmpDoc_()) {
-    const viewer = Services.viewerForDoc(ampdoc);
-
-    const platform = Services.platformFor(this.win);
+  isSystemShareSupported_() {
+    const viewer = Services.viewerForDoc(this.storyEl_);
+    const platform = Services.platformFor(this.win_);
 
     // Chrome exports navigator.share in WebView but does not implement it.
     // See https://bugs.chromium.org/p/chromium/issues/detail?id=765923
@@ -288,76 +84,38 @@ export class ShareWidget {
   }
 
   /**
-   * Loads and applies the share providers configured by the publisher.
-   * @protected
-   */
-  loadProviders() {
-    this.loadRequiredExtensions();
-
-    this.requestService_.loadShareConfig().then((config) => {
-      const providers =
-        config &&
-        (config[SHARE_PROVIDERS_KEY] || config[DEPRECATED_SHARE_PROVIDERS_KEY]);
-      if (!providers) {
-        return;
-      }
-      this.setProviders_(providers);
-    });
-  }
-
-  /**
-   * @param {(!Object<string, (!JsonObject|boolean)> | !Array<!Object|string>)} providers
+   * Opens the sharing dialog of native browsers.
    * @private
-   * TODO(alanorozco): Set story metadata in share config.
    */
-  setProviders_(providers) {
-    /** @type {!Array} */ (providers).forEach((provider) => {
-      if (isObject(provider)) {
-        this.add_(
-          buildProvider(
-            this.win.document,
-            provider['provider'],
-            /** @type {!JsonObject} */ (provider)
-          )
-        );
-        return;
-      }
-
-      if (provider == 'system') {
-        user().warn(
-          'AMP-STORY',
-          '`system` is not a valid share provider type. Native sharing is ' +
-            'enabled by default and cannot be turned off.',
-          provider
-        );
-        return;
-      }
-      this.add_(
-        buildProvider(this.win.document, /** @type {string} */ (provider))
-      );
+  openSystemShare_() {
+    const {navigator} = this.win_;
+    const shareData = {
+      url: Services.documentInfoForDoc(getAmpdoc(this.storyEl_)).canonicalUrl,
+      text: this.win_.document.title,
+    };
+    navigator.share(shareData).catch((e) => {
+      user().warn(TAG, e.message, shareData);
     });
   }
 
-  /**
-   * @param {!../../../src/service/ampdoc-impl.AmpDoc=} ampdoc
-   */
-  loadRequiredExtensions(ampdoc = this.getAmpDoc_()) {
-    Services.extensionsFor(this.win).installExtensionForDoc(
-      ampdoc,
-      'amp-social-share'
+  /** @private */
+  buildFallbackMenu_() {
+    if (this.initializedFallback_) {
+      return;
+    }
+    this.initializedFallback_ = true;
+    Services.extensionsFor(this.win_).installExtensionForDoc(
+      getAmpdoc(this.storyEl_),
+      'amp-story-share-menu',
+      '0.1'
     );
   }
 
   /**
-   * @param {!Node} node
+   * Closes the share menu.
    * @private
    */
-  add_(node) {
-    const list = devAssert(this.root).lastElementChild;
-    const item = renderShareItemListElement(node);
-
-    // `lastElementChild` is the system share button container, which should
-    // always be last in list
-    list.insertBefore(item, list.lastElementChild);
+  close_() {
+    this.storeService_.dispatch(Action.TOGGLE_SHARE_MENU, false);
   }
 }
diff --git a/extensions/amp-story/1.0/amp-story-store-service.js b/extensions/amp-story/1.0/amp-story-store-service.js
index 21012e29882e..dbd09c70498b 100644
--- a/extensions/amp-story/1.0/amp-story-store-service.js
+++ b/extensions/amp-story/1.0/amp-story-store-service.js
@@ -1,9 +1,14 @@
-import {EmbedMode, parseEmbedMode} from './embed-mode';
 import {Observable} from '#core/data-structures/observable';
-import {Services} from '#service';
+import {mangleObjectValues} from '#core/types/enum';
+import {hasOwn} from '#core/types/object';
 import {deepEquals} from '#core/types/object/json';
+
+import {Services} from '#service';
+
 import {dev} from '#utils/log';
-import {hasOwn} from '#core/types/object';
+
+import {EmbedMode, parseEmbedMode} from './embed-mode';
+
 import {registerServiceBuilder} from '../../../src/service-helpers';
 
 /** @type {string} */
@@ -33,7 +38,7 @@ export const getStoreService = (win) => {
  * Different UI experiences to display the story.
  * @const @enum {number}
  */
-export const UIType = {
+export const UIType_Enum = {
   MOBILE: 0,
   DESKTOP_FULLBLEED: 2, // Desktop UI if landscape mode is enabled.
   DESKTOP_ONE_PANEL: 4, // Desktop UI with one panel and space around story.
@@ -47,7 +52,17 @@ export const UIType = {
 export const EmbeddedComponentState = {
   HIDDEN: 0, // Component is present in page, but hasn't been interacted with.
   FOCUSED: 1, // Component has been clicked, a tooltip should be shown.
-  EXPANDED: 2, // Component is in expanded mode.
+};
+
+/**
+ * Subscription states for the paywall-enabled stories.
+ * @enum {number}
+ */
+export const SubscriptionsState = {
+  DISABLED: 0,
+  PENDING: 1,
+  GRANTED: 2,
+  BLOCKED: 3,
 };
 
 /**
@@ -69,6 +84,28 @@ export let InteractiveComponentDef;
  */
 export let InteractiveReactData;
 
+/**
+ * @typedef {{
+ *   productId: string,
+ *   productTitle: string,
+ *   productBrand: string,
+ *   productPrice: number,
+ *   productPriceCurrency: string,
+ *   productIcon: string,
+ *   productTagText: ?string,
+ *   productImages: !Array<string>,
+ * }}
+ */
+export let ShoppingConfigDataDef;
+
+/**
+ * @typedef {{
+ *  activeProductData: ShoppingConfigDataDef,
+ *  items: !Map<string, !ShoppingConfigDataDef>,
+ * }}
+ */
+export let ShoppingDataDef;
+
 /**
  * @typedef {{
  *    canInsertAutomaticAd: boolean,
@@ -80,10 +117,8 @@ export let InteractiveReactData;
  *    canShowStoryUrlInfo: boolean,
  *    canShowSystemLayerButtons: boolean,
  *    viewerCustomControls: !Array<!Object>,
- *    accessState: boolean,
  *    adState: boolean,
  *    pageAttachmentState: boolean,
- *    affiliateLinkState: !Element,
  *    desktopState: boolean,
  *    educationState: boolean,
  *    gyroscopeEnabledState: string,
@@ -93,18 +128,18 @@ export let InteractiveReactData;
  *    keyboardActiveState: boolean,
  *    mutedState: boolean,
  *    pageAudioState: boolean,
+ *    pageCaptionsState: boolean,
+ *    captionsState: boolean,
  *    pageHasElementsWithPlaybackState: boolean,
  *    panningMediaState: !Map<string, ../../amp-story-panning-media/0.1/amp-story-panning-media.panningMediaPositionDef> ,
  *    pausedState: boolean,
  *    previewState: boolean,
  *    rtlState: boolean,
  *    shareMenuState: boolean,
- *    storyHasAudioState: boolean,
  *    storyHasPlaybackUiState: boolean,
  *    storyHasBackgroundAudioState: boolean,
- *    supportedBrowserState: boolean,
  *    systemUiIsVisibleState: boolean,
- *    uiState: !UIType,
+ *    uiState: !UIType_Enum,
  *    viewportWarningState: boolean,
  *    actionsAllowlist: !Array<{tagOrTarget: string, method: string}>,
  *    consentId: ?string,
@@ -113,12 +148,15 @@ export let InteractiveReactData;
  *    pageIds: !Array<string>,
  *    newPageAvailableId: string,
  *    pageSize: {width: number, height: number},
+ *    subscriptionsDialogState: boolean,
+ *    subscriptionsPageIndex: number,
+ *    desktopAspectRatio: number,
  * }}
  */
 export let State;
 
-/** @const @enum {string} */
-export const StateProperty = {
+/** @const @enum {string|number} */
+const StateProperty = mangleObjectValues({
   // Embed options.
   CAN_INSERT_AUTOMATIC_AD: 'canInsertAutomaticAd',
   CAN_SHOW_AUDIO_UI: 'canShowAudioUi',
@@ -131,10 +169,8 @@ export const StateProperty = {
   VIEWER_CUSTOM_CONTROLS: 'viewerCustomControls',
 
   // App States.
-  ACCESS_STATE: 'accessState', // amp-access paywall.
   AD_STATE: 'adState',
   PAGE_ATTACHMENT_STATE: 'pageAttachmentState',
-  AFFILIATE_LINK_STATE: 'affiliateLinkState',
   EDUCATION_STATE: 'educationState',
   GYROSCOPE_PERMISSION_STATE: 'gyroscopePermissionState',
   INFO_DIALOG_STATE: 'infoDialogState',
@@ -144,6 +180,8 @@ export const StateProperty = {
   KEYBOARD_ACTIVE_STATE: 'keyboardActiveState',
   MUTED_STATE: 'mutedState',
   PAGE_HAS_AUDIO_STATE: 'pageAudioState',
+  PAGE_HAS_CAPTION_STATE: 'pageCaptionState',
+  CAPTIONS_STATE: 'captionsState',
   PAGE_HAS_ELEMENTS_WITH_PLAYBACK_STATE: 'pageHasElementsWithPlaybackState',
   PANNING_MEDIA_STATE: 'panningMediaState',
   PAUSED_STATE: 'pausedState',
@@ -151,15 +189,14 @@ export const StateProperty = {
   PREVIEW_STATE: 'previewState',
   RTL_STATE: 'rtlState',
   SHARE_MENU_STATE: 'shareMenuState',
-  SUPPORTED_BROWSER_STATE: 'supportedBrowserState',
-  // Any page has audio, or amp-story has a `background-audio` attribute.
-  STORY_HAS_AUDIO_STATE: 'storyHasAudioState',
+  SHOPPING_DATA: 'shoppingData',
   // amp-story has a `background-audio` attribute.
   STORY_HAS_BACKGROUND_AUDIO_STATE: 'storyHasBackgroundAudioState',
   // Any page has elements with playback.
   STORY_HAS_PLAYBACK_UI_STATE: 'storyHasPlaybackUiState',
   SYSTEM_UI_IS_VISIBLE_STATE: 'systemUiIsVisibleState',
   UI_STATE: 'uiState',
+  DESKTOP_ASPECT_RATIO: 'desktopAspectRatio',
 
   // App data.
   ACTIONS_ALLOWLIST: 'actionsAllowlist',
@@ -171,20 +208,33 @@ export const StateProperty = {
   NEW_PAGE_AVAILABLE_ID: 'newPageAvailableId',
   PAGE_IDS: 'pageIds',
   PAGE_SIZE: 'pageSize',
-};
 
-/** @const @enum {string} */
-export const Action = {
+  // AMP Story paywall states.
+  SUBSCRIPTIONS_DIALOG_UI_STATE: 'subscriptionsDialogUiState',
+  SUBSCRIPTIONS_STATE: 'subscriptionsState',
+  SUBSCRIPTIONS_PAGE_INDEX: 'subscriptionsPageIndex',
+});
+
+export {StateProperty};
+
+/** @const @enum {string|number} */
+const Action = mangleObjectValues({
   ADD_INTERACTIVE_REACT: 'addInteractiveReact',
+  ADD_NEW_PAGE_ID: 'addNewPageId',
+  ADD_PANNING_MEDIA_STATE: 'addPanningMediaState',
+  ADD_SHOPPING_DATA: 'addShoppingData',
   ADD_TO_ACTIONS_ALLOWLIST: 'addToActionsAllowlist',
   CHANGE_PAGE: 'setCurrentPageId',
-  SET_CONSENT_ID: 'setConsentId',
   SET_ADVANCEMENT_MODE: 'setAdvancementMode',
+  SET_CONSENT_ID: 'setConsentId',
+  SET_GYROSCOPE_PERMISSION: 'setGyroscopePermission',
   SET_NAVIGATION_PATH: 'setNavigationPath',
   SET_PAGE_IDS: 'setPageIds',
-  TOGGLE_ACCESS: 'toggleAccess',
+  SET_PAGE_SIZE: 'updatePageSize',
+  SET_VIEWER_CUSTOM_CONTROLS: 'setCustomControls',
+  SET_SUBSCRIPTIONS_PAGE_INDEX: 'setSubscriptionsPageIndex',
+  SET_DESKTOP_ASPECT_RATIO: 'setDesktopAspectRatio',
   TOGGLE_AD: 'toggleAd',
-  TOGGLE_AFFILIATE_LINK: 'toggleAffiliateLink',
   TOGGLE_EDUCATION: 'toggleEducation',
   TOGGLE_INFO_DIALOG: 'toggleInfoDialog',
   TOGGLE_INTERACTIVE_COMPONENT: 'toggleInteractiveComponent',
@@ -192,27 +242,26 @@ export const Action = {
   TOGGLE_MUTED: 'toggleMuted',
   TOGGLE_PAGE_ATTACHMENT_STATE: 'togglePageAttachmentState',
   TOGGLE_PAGE_HAS_AUDIO: 'togglePageHasAudio',
+  TOGGLE_PAGE_HAS_CAPTIONS: 'togglePageHasCaptions',
+  TOGGLE_CAPTIONS: 'toggleCaptions',
   TOGGLE_PAGE_HAS_ELEMENT_WITH_PLAYBACK: 'togglePageHasElementWithPlayblack',
   TOGGLE_PAUSED: 'togglePaused',
   TOGGLE_RTL: 'toggleRtl',
   TOGGLE_SHARE_MENU: 'toggleShareMenu',
-  TOGGLE_SUPPORTED_BROWSER: 'toggleSupportedBrowser',
-  TOGGLE_STORY_HAS_AUDIO: 'toggleStoryHasAudio',
   TOGGLE_STORY_HAS_BACKGROUND_AUDIO: 'toggleStoryHasBackgroundAudio',
   TOGGLE_STORY_HAS_PLAYBACK_UI: 'toggleStoryHasPlaybackUi',
+  TOGGLE_SUBSCRIPTIONS_DIALOG_UI_STATE: 'toggleSubscriptionsDialogUiState',
+  TOGGLE_SUBSCRIPTIONS_STATE: 'toggleSubscriptionsState',
   TOGGLE_SYSTEM_UI_IS_VISIBLE: 'toggleSystemUiIsVisible',
   TOGGLE_UI: 'toggleUi',
-  SET_GYROSCOPE_PERMISSION: 'setGyroscopePermission',
-  ADD_NEW_PAGE_ID: 'addNewPageId',
-  SET_PAGE_SIZE: 'updatePageSize',
-  ADD_PANNING_MEDIA_STATE: 'addPanningMediaState',
-  SET_VIEWER_CUSTOM_CONTROLS: 'setCustomControls',
-};
+});
+
+export {Action};
 
 /**
  * Functions to compare a data structure from the previous to the new state and
  * detect a mutation, when a simple equality test would not work.
- * @private @const {!Object<string, !function(*, *):boolean>}
+ * @private @const {!{[key: string]: !function(*, *):boolean}}
  */
 const stateComparisonFunctions = {
   [StateProperty.ACTIONS_ALLOWLIST]: (old, curr) => old.length !== curr.length,
@@ -220,6 +269,7 @@ const stateComparisonFunctions = {
     /**
      * @param {InteractiveComponentDef} old
      * @param {InteractiveComponentDef} curr
+     * @return {boolean}
      */
     (old, curr) => old.element !== curr.element || old.state !== curr.state,
   [StateProperty.NAVIGATION_PATH]: (old, curr) => old.length !== curr.length,
@@ -231,12 +281,14 @@ const stateComparisonFunctions = {
     old.height !== curr.height,
   [StateProperty.PANNING_MEDIA_STATE]: (old, curr) =>
     old === null || curr === null || !deepEquals(old, curr, 2),
+  [StateProperty.SHOPPING_DATA]: (old, curr) =>
+    old === null || curr === null || !deepEquals(old, curr, 2),
   [StateProperty.INTERACTIVE_REACT_STATE]: (old, curr) =>
     !deepEquals(old, curr, 3),
 };
 
 /**
- * Returns the new sate.
+ * Returns the new state.
  * @param  {!State} state Immutable state
  * @param  {!Action} action
  * @param  {*} data
@@ -266,6 +318,15 @@ const actions = (state, action, data) => {
         ...state,
         [StateProperty.PANNING_MEDIA_STATE]: updatedState,
       });
+    case Action.ADD_SHOPPING_DATA:
+      const updatedShoppingData = {
+        ...state[StateProperty.SHOPPING_DATA],
+        ...data,
+      };
+      return /** @type {!State} */ ({
+        ...state,
+        [StateProperty.SHOPPING_DATA]: updatedShoppingData,
+      });
     case Action.ADD_TO_ACTIONS_ALLOWLIST:
       const newActionsAllowlist = [].concat(
         state[StateProperty.ACTIONS_ALLOWLIST],
@@ -275,18 +336,6 @@ const actions = (state, action, data) => {
         ...state,
         [StateProperty.ACTIONS_ALLOWLIST]: newActionsAllowlist,
       });
-    // Triggers the amp-acess paywall.
-    case Action.TOGGLE_ACCESS:
-      // Don't change the PAUSED_STATE if ACCESS_STATE is not changed.
-      if (state[StateProperty.ACCESS_STATE] === data) {
-        return state;
-      }
-
-      return /** @type {!State} */ ({
-        ...state,
-        [StateProperty.ACCESS_STATE]: !!data,
-        [StateProperty.PAUSED_STATE]: !!data,
-      });
     case Action.TOGGLE_PAGE_ATTACHMENT_STATE:
       return /** @type {!State} */ ({
         ...state,
@@ -298,12 +347,6 @@ const actions = (state, action, data) => {
         ...state,
         [StateProperty.AD_STATE]: !!data,
       });
-    // Expands or collapses the affiliate link.
-    case Action.TOGGLE_AFFILIATE_LINK:
-      return /** @type {!State} */ ({
-        ...state,
-        [StateProperty.AFFILIATE_LINK_STATE]: data,
-      });
     case Action.TOGGLE_EDUCATION:
       return /** @type {!State} */ ({
         ...state,
@@ -314,10 +357,8 @@ const actions = (state, action, data) => {
       return /** @type {!State} */ ({
         ...state,
         [StateProperty.PAUSED_STATE]:
-          data.state === EmbeddedComponentState.EXPANDED ||
           data.state === EmbeddedComponentState.FOCUSED,
-        [StateProperty.SYSTEM_UI_IS_VISIBLE_STATE]:
-          data.state !== EmbeddedComponentState.EXPANDED,
+        [StateProperty.SYSTEM_UI_IS_VISIBLE_STATE]: true,
         [StateProperty.INTERACTIVE_COMPONENT_STATE]: data,
       });
     // Shows or hides the info dialog.
@@ -327,23 +368,17 @@ const actions = (state, action, data) => {
         [StateProperty.INFO_DIALOG_STATE]: !!data,
         [StateProperty.PAUSED_STATE]: !!data,
       });
-    // Shows or hides the audio controls.
-    case Action.TOGGLE_STORY_HAS_AUDIO:
+    // Shows or hides the play/pause controls.
+    case Action.TOGGLE_STORY_HAS_PLAYBACK_UI:
       return /** @type {!State} */ ({
         ...state,
-        [StateProperty.STORY_HAS_AUDIO_STATE]: !!data,
+        [StateProperty.STORY_HAS_PLAYBACK_UI_STATE]: !!data,
       });
     case Action.TOGGLE_STORY_HAS_BACKGROUND_AUDIO:
       return /** @type {!State} */ ({
         ...state,
         [StateProperty.STORY_HAS_BACKGROUND_AUDIO_STATE]: !!data,
       });
-    // Shows or hides the play/pause controls.
-    case Action.TOGGLE_STORY_HAS_PLAYBACK_UI:
-      return /** @type {!State} */ ({
-        ...state,
-        [StateProperty.STORY_HAS_PLAYBACK_UI_STATE]: !!data,
-      });
     // Mutes or unmutes the story media.
     case Action.TOGGLE_MUTED:
       return /** @type {!State} */ ({
@@ -355,6 +390,16 @@ const actions = (state, action, data) => {
         ...state,
         [StateProperty.PAGE_HAS_AUDIO_STATE]: !!data,
       });
+    case Action.TOGGLE_PAGE_HAS_CAPTIONS:
+      return /** @type {!State} */ ({
+        ...state,
+        [StateProperty.PAGE_HAS_CAPTIONS_STATE]: !!data,
+      });
+    case Action.TOGGLE_CAPTIONS:
+      return /** @type {!State} */ ({
+        ...state,
+        [StateProperty.CAPTIONS_STATE]: !!data,
+      });
     case Action.TOGGLE_PAGE_HAS_ELEMENT_WITH_PLAYBACK:
       return /** @type {!State} */ ({
         ...state,
@@ -375,11 +420,6 @@ const actions = (state, action, data) => {
         ...state,
         [StateProperty.KEYBOARD_ACTIVE_STATE]: !!data,
       });
-    case Action.TOGGLE_SUPPORTED_BROWSER:
-      return /** @type {!State} */ ({
-        ...state,
-        [StateProperty.SUPPORTED_BROWSER_STATE]: !!data,
-      });
     case Action.TOGGLE_SHARE_MENU:
       return /** @type {!State} */ ({
         ...state,
@@ -393,10 +433,10 @@ const actions = (state, action, data) => {
       });
     case Action.TOGGLE_UI:
       if (
-        state[StateProperty.UI_STATE] === UIType.VERTICAL &&
-        data !== UIType.VERTICAL
+        state[StateProperty.UI_STATE] === UIType_Enum.VERTICAL &&
+        data !== UIType_Enum.VERTICAL
       ) {
-        dev().error(TAG, 'Cannot switch away from UIType.VERTICAL');
+        dev().error(TAG, 'Cannot switch away from UIType_Enum.VERTICAL');
         return state;
       }
       return /** @type {!State} */ ({
@@ -444,6 +484,27 @@ const actions = (state, action, data) => {
         ...state,
         [StateProperty.VIEWER_CUSTOM_CONTROLS]: data,
       });
+    case Action.SET_SUBSCRIPTIONS_PAGE_INDEX:
+      return /** @type {!State} */ ({
+        ...state,
+        [StateProperty.SUBSCRIPTIONS_PAGE_INDEX]: data,
+      });
+    case Action.TOGGLE_SUBSCRIPTIONS_DIALOG_UI_STATE:
+      return /** @type {!State} */ ({
+        ...state,
+        [StateProperty.SUBSCRIPTIONS_DIALOG_UI_STATE]: !!data,
+        [StateProperty.PAUSED_STATE]: !!data,
+      });
+    case Action.TOGGLE_SUBSCRIPTIONS_STATE:
+      return /** @type {!State} */ ({
+        ...state,
+        [StateProperty.SUBSCRIPTIONS_STATE]: data,
+      });
+    case Action.SET_DESKTOP_ASPECT_RATIO:
+      return /** @type {!State} */ ({
+        ...state,
+        [StateProperty.DESKTOP_ASPECT_RATIO]: data,
+      });
     default:
       dev().error(TAG, 'Unknown action %s.', action);
       return state;
@@ -461,7 +522,7 @@ export class AmpStoryStoreService {
     /** @private @const {!Window} */
     this.win_ = win;
 
-    /** @private {!Object<string, !Observable>} */
+    /** @private {!{[key: string]: !Observable}} */
     this.listeners_ = {};
 
     /** @private {!State} */
@@ -547,9 +608,7 @@ export class AmpStoryStoreService {
       [StateProperty.CAN_SHOW_STORY_URL_INFO]: true,
       [StateProperty.CAN_SHOW_SYSTEM_LAYER_BUTTONS]: true,
       [StateProperty.VIEWER_CUSTOM_CONTROLS]: [],
-      [StateProperty.ACCESS_STATE]: false,
       [StateProperty.AD_STATE]: false,
-      [StateProperty.AFFILIATE_LINK_STATE]: null,
       [StateProperty.EDUCATION_STATE]: false,
       [StateProperty.GYROSCOPE_PERMISSION_STATE]: '',
       [StateProperty.INFO_DIALOG_STATE]: false,
@@ -561,17 +620,18 @@ export class AmpStoryStoreService {
       [StateProperty.MUTED_STATE]: true,
       [StateProperty.PAGE_ATTACHMENT_STATE]: false,
       [StateProperty.PAGE_HAS_AUDIO_STATE]: false,
+      [StateProperty.PAGE_HAS_CAPTIONS_STATE]: false,
+      [StateProperty.CAPTIONS_STATE]: true,
       [StateProperty.PAGE_HAS_ELEMENTS_WITH_PLAYBACK_STATE]: false,
       [StateProperty.PANNING_MEDIA_STATE]: {},
       [StateProperty.PAUSED_STATE]: false,
       [StateProperty.RTL_STATE]: false,
       [StateProperty.SHARE_MENU_STATE]: false,
-      [StateProperty.SUPPORTED_BROWSER_STATE]: true,
-      [StateProperty.STORY_HAS_AUDIO_STATE]: false,
+      [StateProperty.SHOPPING_DATA]: {},
       [StateProperty.STORY_HAS_BACKGROUND_AUDIO_STATE]: false,
       [StateProperty.STORY_HAS_PLAYBACK_UI_STATE]: false,
       [StateProperty.SYSTEM_UI_IS_VISIBLE_STATE]: true,
-      [StateProperty.UI_STATE]: UIType.MOBILE,
+      [StateProperty.UI_STATE]: UIType_Enum.MOBILE,
       // amp-story only allows actions on a case-by-case basis to preserve UX
       // behaviors. By default, no actions are allowed.
       [StateProperty.ACTIONS_ALLOWLIST]: [],
@@ -584,13 +644,17 @@ export class AmpStoryStoreService {
       [StateProperty.PAGE_IDS]: [],
       [StateProperty.PAGE_SIZE]: null,
       [StateProperty.PREVIEW_STATE]: false,
+      [StateProperty.SUBSCRIPTIONS_DIALOG_UI_STATE]: false,
+      [StateProperty.SUBSCRIPTIONS_STATE]: SubscriptionsState.DISABLED,
+      [StateProperty.SUBSCRIPTIONS_PAGE_INDEX]: -1,
+      [StateProperty.DESKTOP_ASPECT_RATIO]: 0,
     });
   }
 
   // @TODO(gmajoulet): These should get their own file if they start growing.
   /**
    * Retrieves the embed mode config, that will override the default state.
-   * @return {!Object<StateProperty, *>} Partial state
+   * @return {!{[key: StateProperty]: *}} Partial state
    * @protected
    */
   getEmbedOverrides_() {
diff --git a/extensions/amp-story/1.0/amp-story-system-layer.css b/extensions/amp-story/1.0/amp-story-system-layer.css
index 782b6a8c4610..8c8032427e76 100644
--- a/extensions/amp-story/1.0/amp-story-system-layer.css
+++ b/extensions/amp-story/1.0/amp-story-system-layer.css
@@ -1,30 +1,27 @@
-
-
-@import './amp-story-share.css';
-
-
 .i-amphtml-story-system-layer {
-  background: linear-gradient(to bottom, rgba(0, 0, 0, 0.32), transparent) !important;
+  background: linear-gradient(
+    180deg,
+    #0004,
+    #0002 33%,
+    #0001 67%,
+    #0000
+  ) !important;
   position: absolute !important;
   display: flex !important;
   justify-content: space-between !important;
   top: 0 !important;
   left: 0 !important;
   right: 0 !important;
-  height: 54px !important;
+  height: 140px !important;
   z-index: 100000 !important;
-  transition: opacity 0.3s cubic-bezier(0.0, 0.0, 0.2, 1) !important;
+  transition: opacity 0.3s cubic-bezier(0, 0, 0.2, 1) !important;
   pointer-events: none !important;
   font-family: 'Roboto', sans-serif !important;
 }
 
-[desktop] .i-amphtml-story-system-layer {
-  height: 96px !important;
-}
-
 .i-amphtml-story-hidden.i-amphtml-story-system-layer {
   opacity: 0 !important;
-  transition: opacity 0.15s cubic-bezier(0.4, 0.0, 1, 1) !important;
+  transition: opacity 0.15s cubic-bezier(0.4, 0, 1, 1) !important;
 }
 
 .i-amphtml-story-hidden.i-amphtml-story-system-layer * {
@@ -66,7 +63,7 @@
 
 .i-amphtml-story-attribution-logo {
   border-radius: 100% !important;
-  border: 1px solid #D4D4D4 !important;
+  border: 1px solid #d4d4d4 !important;
   width: 28px !important;
   height: 28px !important;
   object-fit: cover !important;
@@ -80,7 +77,7 @@
   font-size: 13px !important;
   font-weight: 500 !important;
   text-shadow: 0px 0px 6px rgba(0, 0, 0, 0.16) !important;
-  color: #FFFF !important;
+  color: #ffff !important;
 }
 
 .i-amphtml-story-system-layer-buttons,
@@ -88,8 +85,9 @@
   display: flex !important;
   flex-direction: row !important;
   justify-content: flex-end !important;
-  padding-top: 6px !important;
+  padding: 8px 4px !important;
   box-sizing: border-box !important;
+  flex: 1 !important;
 }
 
 .i-amphtml-story-system-layer-buttons-start-position {
@@ -102,27 +100,22 @@
   padding: 8px 4px 0 !important;
 }
 
-.i-amphtml-story-system-layer-buttons .i-amphtml-story-ui-hide-button.i-amphtml-story-button {
+.i-amphtml-story-system-layer-buttons
+  .i-amphtml-story-ui-hide-button.i-amphtml-story-button {
   display: none !important;
 }
 
 .i-amphtml-story-button {
-  background-repeat: no-repeat !important;
-  background-position: center center !important;
   height: 48px !important;
   width: 48px !important;
   cursor: pointer !important;
   border: none !important;
   pointer-events: auto !important;
-  /* for svg backgrounds: */
-  background: center center no-repeat !important;
-  background-size: 24px 24px !important;
+  background: none !important;
 }
 
 [desktop] .i-amphtml-story-button {
   margin: 0 4px !important;
-  background-size: 32px 32px !important;
-  padding: 8px !important;
 }
 
 .i-amphtml-story-button:active {
@@ -134,17 +127,20 @@
   display: flex !important;
   height: 2px !important;
   left: 0 !important;
-  margin: 4px 0 0 !important;
-  padding: 0 2px !important;
-  position: absolute !important;
   right: 0 !important;
   top: 0 !important;
+  margin: 6px 10px 0 10px !important;
+  padding: 0 2px !important;
+  position: absolute !important;
   visibility: visible !important;
   z-index: 100001 !important;
+  overflow: hidden !important;
+}
+
+[ad-showing] .i-amphtml-story-progress-bar-exp-disabled.i-amphtml-story-progress-bar {
+  display: none !important;
 }
 
-/* TODO(#33969): clean up when ad progress bar is finalized. */
-[ad-showing] .i-amphtml-story-progress-bar:not([i-amphtml-ad-progress-exp]),
 [ad-showing] .i-amphtml-story-attribution {
   visibility: hidden !important;
 }
@@ -154,9 +150,9 @@
 }
 
 [ad-showing]:not([i-amphtml-current-page-has-audio])
-.i-amphtml-story-mute-audio-control,
+  .i-amphtml-story-mute-audio-control,
 [ad-showing]:not([i-amphtml-current-page-has-audio])
-.i-amphtml-story-unmute-audio-control {
+  .i-amphtml-story-unmute-audio-control {
   visibility: hidden !important;
 }
 
@@ -180,94 +176,27 @@
 }
 
 .i-amphtml-story-ad-progress-value {
-  animation-name: i-amphtml-story-ad-value !important;
-  animation-timing-function: linear !important;
   background-color: #fbc02d !important;
-  height: 100% !important;
-  position: relative !important;
-  top: -100% !important;
-  transform-origin: left !important;
-  width: 100% !important;
 }
 
-@keyframes i-amphtml-story-ad-value {
-  from {
-    transform: scaleX(0);
-  }
-  to {
-    transform: scaleX(1);
-  }
-}
-
-[paused] .i-amphtml-story-ad-progress-value {
-  animation-play-state: paused !important;
-}
-
-[dir=rtl] .i-amphtml-story-page-progress-value,
-[dir=rtl] .i-amphtml-story-ad-progress-value {
+[dir='rtl'] .i-amphtml-story-page-progress-value {
   transform-origin: right !important;
 }
 
-.i-amphtml-first-page-active[info] .i-amphtml-message-container {
-  /* 48px for info button, add width to padding for additional story buttons. */
-  padding-right: 48px !important;
-}
-
-.i-amphtml-first-page-active[info][dir=rtl] .i-amphtml-message-container {
-  /* 48px for info button, add width to padding for additional story buttons. */
-  padding-right: auto !important;
-  padding-left: 48px !important;
-}
-
-.i-amphtml-message-container {
-  display: flex !important;
-  align-items: center !important;
-  width: max-content !important;
-  transition-property: opacity, transform !important;
-  position: absolute !important;
-  top: 0 !important;
-  right: 48px !important;
-  height: 100% !important;
-  color: #fff !important;
-  font-size: 16px !important;
-  text-shadow: 0px 0px 6px rgba(0, 0, 0, 0.36) !important;
-}
-
-[dir=rtl] .i-amphtml-message-container {
-  right: auto !important;
-  left: 48px !important;
-}
-
-[i-amphtml-story-messagedisplay="noshow"] .i-amphtml-message-container {
-  transition: opacity 0.2s cubic-bezier(0.4, 0.0, 1, 1), visibility 0.2s, transform 0.0s 0.2s !important;
-  opacity: 0 !important;
-  visibility: hidden !important;
-  transform: translateX(10px) !important;
-}
-
-[i-amphtml-story-has-new-page="noshow"] .i-amphtml-story-has-new-page-notification-container {
+[i-amphtml-story-has-new-page='noshow']
+  .i-amphtml-story-has-new-page-notification-container {
   transition: opacity 1.5s, visibility 1.5s !important;
   opacity: 0 !important;
   visibility: hidden !important;
 }
 
-.i-amphtml-last-page-active[i-amphtml-story-has-new-page="show"] .i-amphtml-story-has-new-page-notification-container {
+.i-amphtml-last-page-active[i-amphtml-story-has-new-page='show']
+  .i-amphtml-story-has-new-page-notification-container {
   transition: opacity 1.5s, visibility 1.5s !important;
   opacity: 1 !important;
   visibility: visible !important;
 }
 
-[dir=rtl][i-amphtml-story-messagedisplay="noshow"] .i-amphtml-message-container {
-  transform: translateX(-10px) !important;
-}
-
-[i-amphtml-story-messagedisplay="show"] .i-amphtml-message-container {
-  transition: opacity 0.2s cubic-bezier(0.0, 0.0, 0.2, 1), visibility 0.2s, transform 0.2s cubic-bezier(0.4, 0.0, 0.2, 1) !important;
-  opacity: 1 !important;
-  visibility: visible !important;
-  transform: translateX(0px) !important;
-}
-
 .i-amphtml-story-mute-text,
 .i-amphtml-story-unmute-sound-text,
 .i-amphtml-story-unmute-no-sound-text {
@@ -287,43 +216,51 @@
 
 .i-amphtml-story-mute-audio-control,
 .i-amphtml-story-unmute-audio-control,
-.i-amphtml-paused-display,
 .i-amphtml-story-pause-control,
 .i-amphtml-story-play-control,
 .i-amphtml-story-mute-text,
 .i-amphtml-story-unmute-sound-text,
 .i-amphtml-story-unmute-no-sound-text,
-.i-amphtml-story-skip-to-next  {
+.i-amphtml-story-skip-to-next,
+.i-amphtml-story-captions-control,
+.i-amphtml-story-nocaptions-control {
   display: none !important;
 }
 
-.i-amphtml-story-has-audio:not([muted]) .i-amphtml-story-mute-audio-control,
-.i-amphtml-story-has-audio[muted] .i-amphtml-story-unmute-audio-control {
-  display: block !important;
+/*
+  Visible to screen readers only. Screen readers will set :focus on iOS but not android,
+  therefore on android the button remains hidden but interactable.
+*/
+.i-amphtml-story-system-layer:not([desktop]):not(.i-amphtml-story-desktop-one-panel):not(.amp-mode-keyboard-active)
+  .i-amphtml-paused-display
+  button:not(:focus) {
+  margin: 0 !important;
+  padding: 0 !important;
+  width: 0px !important;
+  opacity: 0 !important;
+  pointer-events: none !important;
 }
 
-[desktop] .i-amphtml-paused-display,
-.i-amphtml-story-desktop-one-panel .i-amphtml-paused-display {
+[i-amphtml-current-page-has-captions]:not([captions-on])
+  .i-amphtml-story-nocaptions-control,
+[i-amphtml-current-page-has-captions][captions-on]
+  .i-amphtml-story-captions-control {
   display: block !important;
 }
 
-.i-amphtml-story-system-layer-buttons button[disabled] {
-  opacity: 0.3 !important;
-  cursor: initial !important;
-}
-
-.i-amphtml-story-has-playback-ui:not([paused]) .i-amphtml-story-pause-control,
-.i-amphtml-story-has-playback-ui[paused] .i-amphtml-story-play-control {
+[i-amphtml-current-page-has-audio]:not([muted])
+  .i-amphtml-story-mute-audio-control,
+[i-amphtml-current-page-has-audio][muted]
+  .i-amphtml-story-unmute-audio-control {
   display: block !important;
 }
 
-.amp-mode-keyboard-active:not([desktop]) .i-amphtml-paused-display {
-  display: block !important;
+.i-amphtml-story-system-layer-buttons button[disabled][disabled] {
+  display: none !important;
 }
 
-.i-amphtml-story-has-audio[muted] .i-amphtml-story-mute-text,
-[i-amphtml-current-page-has-audio].i-amphtml-story-has-audio:not([muted]) .i-amphtml-story-unmute-sound-text,
-:not([i-amphtml-current-page-has-audio]).i-amphtml-story-has-audio:not([muted]) .i-amphtml-story-unmute-no-sound-text {
+.i-amphtml-story-has-playback-ui:not([paused]) .i-amphtml-story-pause-control,
+.i-amphtml-story-has-playback-ui[paused] .i-amphtml-story-play-control {
   display: block !important;
 }
 
@@ -333,58 +270,75 @@
 }
 
 .i-amphtml-story-unmute-audio-control {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 0 24 24" fill="#FFFFFF"><path d="M5.19944 4L4 5.19944L8.46722 9.66667H4V15.3333H7.77778L12.5 20.0556V13.6994L16.5139 17.7133C15.8811 18.2044 15.1728 18.5917 14.3889 18.8278V20.7733C15.6922 20.4806 16.8728 19.8761 17.8739 19.0639L19.8006 21L21 19.8006L12.5 11.3006L5.19944 4ZM18.6011 14.9933C18.9222 14.2189 19.1111 13.3878 19.1111 12.5C19.1111 9.50611 17.1183 6.975 14.3889 6.16278V4.21722C18.1761 5.07667 21 8.45778 21 12.5C21 13.9167 20.6506 15.2483 20.0272 16.4194L18.6011 14.9933ZM14.3889 8.69389C15.7867 9.39278 16.75 10.8283 16.75 12.5C16.75 12.7078 16.7311 12.9061 16.7028 13.095L14.3889 10.7811V8.69389ZM10.5261 6.91833L12.5 4.94444V8.89222L10.5261 6.91833Z"/></svg>') !important;
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" fill="none"><path fill="#fff" fill-rule="evenodd" d="M27.53 16.97a.95.95 0 0 1 1.1-.76c.75.13 2.28.7 3.63 1.9a7.71 7.71 0 0 1 2.62 5.95c0 1.86-.55 3.32-1.33 4.45l-1.38-1.37c.48-.8.8-1.81.8-3.08 0-2.16-.92-3.59-1.97-4.53a6.43 6.43 0 0 0-2.7-1.45.95.95 0 0 1-.77-1.1Z" clip-rule="evenodd"/><path fill="#fff" fill-rule="evenodd" d="M27.54 21.03a.95.95 0 0 1 1.14-.72c.7.16 2.5 1.19 2.5 3.71 0 .7-.15 1.28-.36 1.76l-1.56-1.52c.05-.6-.07-1.25-.48-1.71-.23-.26-.47-.36-.51-.38 0 0-.01 0 0 0a.95.95 0 0 1-.73-1.14Z" clip-rule="evenodd"/><path fill="#fff" d="M23.4 16.79v1.56l1.9 1.9v-4.27c0-.3-.12-.6-.29-.84a1.59 1.59 0 0 0-.7-.57c-.29-.11-.61-.16-.9-.1-.3.06-.61.21-.82.42l-1.31 1.34 1.33 1.34.8-.78Z"/><path stroke="#fff" stroke-linecap="round" stroke-width="1.9" d="m20.12 18.73-1.76 1.81h-2.59c-.94 0-1.7.76-1.7 1.7v3.45c0 .93.75 1.68 1.67 1.7l2.6.04 4.9 4.9a.65.65 0 0 0 1.1-.46v-9.1"/><path stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m17.13 15.36 17.2 17.19"/><path stroke="#fff" stroke-linecap="round" stroke-width="1.9" d="M28.47 30.84A7.2 7.2 0 0 0 31 29.67"/></svg>') !important;
 }
 
-[desktop] .i-amphtml-story-unmute-audio-control {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="32px" height="32px" viewBox="0 0 32 32" fill="#FFFFFF"><path d="M7.4,6L6,7.4l5.3,5.3H6v6.7h4.4l5.6,5.6v-7.5l4.7,4.7c-0.7,0.6-1.6,1-2.5,1.3v2.3c1.5-0.3,2.9-1.1,4.1-2l2.3,2.3l1.4-1.4l-10-10L7.4,6z M23.2,18.9c0.4-0.9,0.6-1.9,0.6-2.9c0-3.5-2.3-6.5-5.6-7.5V6.3c4.5,1,7.8,5,7.8,9.7c0,1.7-0.4,3.2-1.1,4.6L23.2,18.9z M18.2,11.5C19.9,12.3,21,14,21,16c0,0.2,0,0.5-0.1,0.7L18.2,14V11.5z M13.7,9.4L16,7.1v4.6L13.7,9.4z"/></svg>') !important;
+.i-amphtml-story-mute-audio-control {
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" fill="none"><path stroke="#fff" stroke-linecap="round" stroke-width="1.9" d="M28.47 17.14c1.15.2 5.46 1.98 5.46 6.92 0 4.95-4.39 6.63-5.46 6.83"/><path stroke="#fff" stroke-linecap="round" stroke-width="1.8" d="M28.47 21.24c.37.08 1.75.79 1.75 2.78 0 1.99-1.4 2.67-1.75 2.74"/><path stroke="#fff" stroke-linecap="round" stroke-width="1.9" d="m18.36 27.48 4.88 4.9a.65.65 0 0 0 1.1-.46V16.09c0-.58-.7-.87-1.1-.45l-4.88 4.94h-2.59c-.94 0-1.7.77-1.7 1.7v3.45c0 .93.75 1.69 1.67 1.7l2.62.05Z"/></svg>') !important;
 }
 
-.i-amphtml-story-mute-audio-control {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 0 24 24" fill="#FFFFFF"><path d="M4 9.5924V15.4077H7.77778L12.5 20.2537V4.74634L7.77778 9.5924H4Z"/><path d="M16.7498 12.4999C16.7498 10.7844 15.7864 9.31121 14.3887 8.59399V16.3962C15.7864 15.6886 16.7498 14.2154 16.7498 12.4999Z" /><path d="M14.3887 4V5.99658C17.1181 6.8301 19.1109 9.42759 19.1109 12.5C19.1109 15.5724 17.1181 18.1699 14.3887 19.0034V21C18.1759 20.118 20.9998 16.6482 20.9998 12.5C20.9998 8.35177 18.1759 4.88198 14.3887 4Z"/></svg>') !important;
+:host(.i-amphtml-story-highlight-mute-audio-control) .i-amphtml-story-mute-audio-control::before {
+  content: "" !important;
+  position: absolute !important;
+  width: 42px !important;
+  height: 42px !important;
+  border-radius: 50% !important;
+  background-color: #b1b1b1 !important;
+  /* centered position */
+  inset: 0 !important;
+  margin: auto !important;
+  /* expand to full circle and then fade out */
+  opacity: 0;
+  animation: expand-fade 10s ease-in-out !important;
 }
 
-[desktop] .i-amphtml-story-mute-audio-control {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="32px" height="32px" viewBox="0 0 32 32" fill="#FFFFFF"><path d="M10.4,12.6L16,6.9v18.2l-5.6-5.7H6v-6.8H10.4z M21,16c0-2-1.1-3.8-2.8-4.6v9.2C19.9,19.8,21,18,21,16z M18.2,6v2.3c3.2,1,5.6,4,5.6,7.7c0,3.6-2.3,6.7-5.6,7.7V26c4.5-1,7.8-5.1,7.8-10C26,11.1,22.7,7,18.2,6z"/></svg>') !important;
+@keyframes expand-fade {
+  0%, 40% {
+    transform: scale(0);
+  }
+  50%, 90% {
+    transform: scale(1);
+    opacity: 0.5;
+  }
+  100% {
+    opacity: 0;
+  }
 }
 
-.i-amphtml-story-pause-control {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="32px" height="32px" viewBox="0 0 32 32" fill="#FFFFFF"><path d="M13.3,25.3H8V6.7h5.3V25.3z M18.7,25.3V6.7H24v18.7H18.7z"/></svg>') !important;
+.i-amphtml-story-captions-control {
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" fill="none"><path fill="#fff" d="M28.9 15.4h-9.8a5.4 5.4 0 0 0-5.4 5.3v6.6a5.4 5.4 0 0 0 5.4 5.3h9.8a5.4 5.4 0 0 0 5.4-5.3v-6.6a5.4 5.4 0 0 0-5.4-5.3Zm1 6h-1.7a1.1 1.1 0 0 0-1.1 1.2v2.8a1.1 1.1 0 0 0 1.1 1.1h1.6c.6 0 1 .5 1 1 0 .7-.4 1.2-1 1.2h-1.6a3.3 3.3 0 0 1-3.3-3.3v-2.8a3.3 3.3 0 0 1 3.3-3.3h1.6c.6.1 1 .6 1 1.1 0 .6-.4 1-1 1Zm-8.1 0H20a1.1 1.1 0 0 0-1 1.2v2.8a1.1 1.1 0 0 0 1 1.1h1.6c.6 0 1.1.5 1.1 1 0 .7-.5 1.2-1 1.2h-1.6a3.3 3.3 0 0 1-3.3-3.3v-2.8a3.3 3.3 0 0 1 3.3-3.3h1.6c.5.1 1 .6 1 1.1a1.1 1.1 0 0 1-1 1Z"/></svg>') !important;
+  width: 52px !important;
 }
 
-.i-amphtml-story-play-control {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="32px" height="32px" viewBox="0 0 32 32" fill="#FFFFFF"><path d="M23.5211 16.335L9 25.67V7L23.5211 16.335Z"/></svg>') !important;
+.i-amphtml-story-nocaptions-control {
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" fill="none"><rect width="18.74" height="15.43" x="14.63" y="16.29" stroke="#fff" stroke-width="1.85" rx="4.42"/><path stroke="#fff" stroke-linecap="round" stroke-width="1.85" d="M22.4 20.38h-1.63a2.2 2.2 0 0 0-2.2 2.2v2.84c0 1.21.98 2.2 2.2 2.2h1.63M29.47 20.38h-1.63a2.2 2.2 0 0 0-2.2 2.2v2.84c0 1.21.98 2.2 2.2 2.2h1.63"/></svg>') !important;
+  width: 52px !important;
 }
 
-.i-amphtml-story-share-control {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 0 24 24" fill="#FFFFFF"><path d="M15.6392 16.4092C16.125 15.9509 16.7758 15.6667 17.5 15.6667C19.0217 15.6667 20.25 16.895 20.25 18.4167C20.25 19.9384 19.0217 21.1667 17.5 21.1667C15.9783 21.1667 14.75 19.9384 14.75 18.4167C14.75 18.1967 14.7867 17.9859 14.8325 17.7842L8.37 14.0075C7.875 14.4659 7.22417 14.75 6.5 14.75C4.97833 14.75 3.75 13.5217 3.75 12C3.75 10.4784 4.97833 9.25004 6.5 9.25004C7.22417 9.25004 7.875 9.53421 8.37 9.99254L14.8325 6.22504C14.7867 6.02337 14.75 5.80337 14.75 5.58337C14.75 4.06171 15.9783 2.83337 17.5 2.83337C19.0217 2.83337 20.25 4.06171 20.25 5.58337C20.25 7.10504 19.0217 8.33337 17.5 8.33337C16.7758 8.33337 16.1158 8.04921 15.63 7.59087L9.1675 11.3584C9.21333 11.5692 9.25 11.78 9.25 12C9.25 12.22 9.21333 12.4309 9.1675 12.6417L15.6392 16.4092ZM18.4167 5.58337C18.4167 5.07921 18.0042 4.66671 17.5 4.66671C16.9958 4.66671 16.5833 5.07921 16.5833 5.58337C16.5833 6.08754 16.9958 6.50004 17.5 6.50004C18.0042 6.50004 18.4167 6.08754 18.4167 5.58337ZM6.5 12.9167C5.99583 12.9167 5.58333 12.5042 5.58333 12C5.58333 11.4959 5.99583 11.0834 6.5 11.0834C7.00417 11.0834 7.41667 11.4959 7.41667 12C7.41667 12.5042 7.00417 12.9167 6.5 12.9167ZM16.5833 18.4167C16.5833 18.9209 16.9958 19.3334 17.5 19.3334C18.0042 19.3334 18.4167 18.9209 18.4167 18.4167C18.4167 17.9125 18.0042 17.5 17.5 17.5C16.9958 17.5 16.5833 17.9125 16.5833 18.4167Z" fill-rule="evenodd"/></svg>') !important;
+.i-amphtml-story-pause-control {
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" fill="none"><path stroke="#fff" stroke-linecap="round" stroke-width="2.1" d="M20.33 16.86v15.4m7.34-15.4v15.4"/></svg>') !important;
 }
 
-[desktop] .i-amphtml-story-share-control {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="32px" height="32px" viewBox="0 0 32 32" fill="#FFFFFF"><path d="M20,20.8c0.5-0.5,1.2-0.8,2-0.8c1.7,0,3,1.3,3,3s-1.3,3-3,3s-3-1.3-3-3c0-0.2,0-0.5,0.1-0.7l-7-4.1c-0.5,0.5-1.2,0.8-2,0.8c-1.7,0-3-1.3-3-3s1.3-3,3-3c0.8,0,1.5,0.3,2,0.8l7-4.1C19,9.5,19,9.2,19,9c0-1.7,1.3-3,3-3s3,1.3,3,3s-1.3,3-3,3c-0.8,0-1.5-0.3-2-0.8l-7,4.1c0,0.2,0.1,0.5,0.1,0.7s0,0.5-0.1,0.7L20,20.8z M23,9c0-0.5-0.5-1-1-1s-1,0.5-1,1s0.5,1,1,1S23,9.5,23,9z M10,17c-0.5,0-1-0.5-1-1s0.5-1,1-1s1,0.5,1,1S10.5,17,10,17z M21,23c0,0.5,0.5,1,1,1s1-0.5,1-1s-0.5-1-1-1S21,22.5,21,23z" fill-rule="evenodd"/></svg>') !important;
+.i-amphtml-story-play-control {
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" fill="none"><path stroke="#fff" stroke-linecap="round" stroke-width="1.9" d="M17.74 30.34V18.53a1.8 1.8 0 0 1 2.77-1.52l9.23 5.92a1.8 1.8 0 0 1 0 3.03l-9.23 5.9a1.8 1.8 0 0 1-2.77-1.52Z"/></svg>') !important;
 }
 
-[ios] .i-amphtml-story-share-control {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 0 24 24" fill="#FFFFFF"><path fill="white" d="M15.6665 4.58329L14.3648 5.88496L12.9073 4.42746V14.6666H11.0923V4.42746L9.63484 5.88496L8.33317 4.58329L11.9998 0.916626L15.6665 4.58329ZM19.3332 9.16663V19.25C19.3332 20.2583 18.5082 21.0833 17.4998 21.0833H6.49984C5.48234 21.0833 4.6665 20.2583 4.6665 19.25V9.16663C4.6665 8.14913 5.48234 7.33329 6.49984 7.33329H9.24984V9.16663H6.49984V19.25H17.4998V9.16663H14.7498V7.33329H17.4998C18.5082 7.33329 19.3332 8.14913 19.3332 9.16663Z"/></svg>') !important;
-  background-size: auto !important;
+.i-amphtml-story-share-control {
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" fill="none"><path fill="#fff" d="m21.1 25.4 9.87-9.86 1.42 1.42-9.86 9.87z"/><path stroke="#fff" stroke-linecap="round" stroke-width="1.9" d="m16.85 19.82 15.33-4.14c.04 0 .07.03.06.06l-4.02 15.34a1.6 1.6 0 0 1-2.97.33l-2.93-5.73-5.77-2.88a1.6 1.6 0 0 1 .3-2.98Z"/></svg>') !important;
 }
 
 .i-amphtml-story-info-control {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 0 24 24" fill="#FFFFFF"><path d="M11.1,7.3h1.9v1.9h-1.9V7.3z M11.1,11.1h1.9v5.7h-1.9V11.1z M12,2.5c-5.2,0-9.5,4.3-9.5,9.5s4.3,9.5,9.5,9.5s9.5-4.3,9.5-9.5S17.2,2.5,12,2.5z M12,19.6c-4.2,0-7.6-3.4-7.6-7.6S7.8,4.4,12,4.4s7.6,3.4,7.6,7.6S16.2,19.6,12,19.6z"/></svg>') !important;
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" fill="none"><rect width="2.2" height="6.7" x="22.9" y="22.6" fill="#fff" rx="1.1"/><path stroke="#fff" stroke-width="1.9" d="M31.7 24a7.7 7.7 0 1 1-15.4 0 7.7 7.7 0 0 1 15.4 0Z"/><circle cx="24" cy="20.2" r="1.2" fill="#fff"/></svg>') !important;
   display: none !important;
   background-size: auto !important;
 }
 
 .i-amphtml-story-close-control {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 0 24 24" fill="#FFFFFF"><path d="M19 6.41L17.59 5L12 10.59L6.41 5L5 6.41L10.59 12L5 17.59L6.41 19L12 13.41L17.59 19L19 17.59L13.41 12L19 6.41Z"/></svg>') !important;
-}
-
-[desktop] .i-amphtml-story-close-control {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="32px" height="32px" viewBox="0 0 32 32" fill="#FFFFFF"><path d="M25.3332 8.54663L23.4532 6.66663L15.9998 14.12L8.5465 6.66663L6.6665 8.54663L14.1198 16L6.6665 23.4533L8.5465 25.3333L15.9998 17.88L23.4532 25.3333L25.3332 23.4533L17.8798 16L25.3332 8.54663Z"/></svg>') !important;
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" fill="none"><rect width="1.84" height="18.84" x="16.68" y="18" fill="#fff" rx=".92" transform="rotate(-45 16.68 18)"/><rect width="1.84" height="18.84" x="30" y="16.7" fill="#fff" rx=".92" transform="rotate(45 30 16.7)"/></svg>') !important;
 }
 
 .i-amphtml-story-skip-to-next {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="32px" height="32px" viewBox="0 0 32 32" fill="#FFFFFF"><path d="M19.3333 16L8 24V8L19.3333 16ZM24 24H21.3333V8H24V24Z"/></svg>') !important;
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" fill="none"><path stroke="#fff" stroke-linecap="round" stroke-width="1.9" d="M17 29.2V18.8c0-1.2 1.4-2 2.5-1.3l7.5 5.2c1 .6 1 2 0 2.6l-7.5 5.2c-1 .7-2.5 0-2.5-1.3Z"/><rect width="1.8" height="15.6" x="30.2" y="16.2" fill="#fff" rx=".9"/></svg>') !important;
 }
 
 [desktop] .i-amphtml-story-skip-to-next {
@@ -411,7 +365,7 @@
   border-radius: 5px !important;
 }
 
-[dir=rtl] .i-amphtml-story-has-new-page-text-wrapper {
+[dir='rtl'] .i-amphtml-story-has-new-page-text-wrapper {
   padding-right: 0 !important;
   padding-left: 10px !important;
 }
@@ -443,14 +397,7 @@
 }
 
 .i-amphtml-animate-progress li {
-  transition: transform 0.8s cubic-bezier(0.4, 0.0, 0.2, 1) !important;
-}
-
-.i-amphtml-progress-bar-overflow.i-amphtml-story-progress-bar {
-  width: calc(100% - 4px) !important;
-  margin: 4px 2px 0 !important;
-  overflow: hidden !important;
-  padding: 0 !important;
+  transition: transform 0.8s cubic-bezier(0.4, 0, 0.2, 1) !important;
 }
 
 .i-amphtml-story-desktop-fullbleed .i-amphtml-story-progress-bar {
@@ -466,7 +413,7 @@
   transform-origin: left !important;
 }
 
-[dir=rtl].i-amphtml-progress-bar-overflow .i-amphtml-story-page-progress-bar {
+[dir='rtl'].i-amphtml-progress-bar-overflow .i-amphtml-story-page-progress-bar {
   transform-origin: right !important;
 }
 
@@ -477,6 +424,10 @@
 .i-amphtml-story-desktop-one-panel.i-amphtml-story-system-layer {
   width: var(--i-amphtml-story-desktop-one-panel-width) !important;
   margin: auto !important;
-  margin-top: var(--i-amphtml-story-desktop-one-panel-responsive-margin) !important;
-  border-radius: var(--i-amphtml-story-desktop-one-panel-border-radius) !important;
+  margin-top: var(
+    --i-amphtml-story-desktop-one-panel-responsive-margin
+  ) !important;
+  border-radius: var(
+    --i-amphtml-story-desktop-one-panel-border-radius
+  ) !important;
 }
diff --git a/extensions/amp-story/1.0/amp-story-system-layer.js b/extensions/amp-story/1.0/amp-story-system-layer.js
index 29782ec33b41..69539a85ce1f 100644
--- a/extensions/amp-story/1.0/amp-story-system-layer.js
+++ b/extensions/amp-story/1.0/amp-story-system-layer.js
@@ -1,36 +1,34 @@
+import {toggleAttribute} from '#core/dom';
+import {escapeCssSelectorIdent} from '#core/dom/css-selectors';
 import * as Preact from '#core/dom/jsx';
-import {AMP_STORY_PLAYER_EVENT} from '../../../src/amp-story-player/amp-story-player-impl';
+import {closest, matches, scopedQuerySelector} from '#core/dom/query';
+import {setImportantStyles} from '#core/dom/style';
+import {toArray} from '#core/types/array';
+
+import {Services} from '#service';
+import {LocalizedStringId_Enum} from '#service/localization/strings';
+
+import {dev} from '#utils/log';
+
+import {localizeTemplate} from './amp-story-localization-service';
 import {
   Action,
   StateProperty,
-  UIType,
+  UIType_Enum,
   getStoreService,
 } from './amp-story-store-service';
 import {AmpStoryViewerMessagingHandler} from './amp-story-viewer-messaging-handler';
-import {CSS} from '../../../build/amp-story-system-layer-1.0.css';
-import {
-  DevelopmentModeLog,
-  DevelopmentModeLogButtonSet,
-} from './development-ui';
-import {LocalizedStringId} from '#service/localization/strings';
 import {ProgressBar} from './progress-bar';
-import {Services} from '#service';
-import {closest, matches, scopedQuerySelector} from '#core/dom/query';
 import {
   createShadowRootWithStyle,
   getStoryAttributeSrc,
   shouldShowStoryUrlInfo,
+  toggleA11yReadable,
   triggerClickFromLightDom,
 } from './utils';
-import {dev} from '#utils/log';
-import {dict} from '#core/types/object';
-import {escapeCssSelectorIdent} from '#core/dom/css-selectors';
-import {getMode} from '../../../src/mode';
-import {getSourceOrigin} from '../../../src/url';
 
-import {setImportantStyles} from '#core/dom/style';
-import {toArray} from '#core/types/array';
-import {localize} from './amp-story-localization-service';
+import {CSS} from '../../../build/amp-story-system-layer-1.0.css';
+import {AMP_STORY_PLAYER_EVENT} from '../../../src/amp-story-player/event';
 
 /** @private @const {string} */
 const AD_SHOWING_ATTRIBUTE = 'ad-showing';
@@ -44,6 +42,15 @@ const PAUSED_ATTRIBUTE = 'paused';
 /** @private @const {string} */
 const HAS_INFO_BUTTON_ATTRIBUTE = 'info';
 
+/** @private @const {string} */
+const CAPTIONS_CLASS = 'i-amphtml-story-captions-control';
+
+/** @private @const {string} */
+const NOCAPTIONS_CLASS = 'i-amphtml-story-nocaptions-control';
+
+/** @private @const {string} */
+const PAGE_HAS_CAPTIONS = 'i-amphtml-current-page-has-captions';
+
 /** @private @const {string} */
 const MUTE_CLASS = 'i-amphtml-story-mute-audio-control';
 
@@ -65,9 +72,6 @@ const PAUSE_CLASS = 'i-amphtml-story-pause-control';
 /** @private @const {string} */
 const PLAY_CLASS = 'i-amphtml-story-play-control';
 
-/** @private @const {string} */
-const MESSAGE_DISPLAY_CLASS = 'i-amphtml-story-messagedisplay';
-
 /** @private @const {string} */
 const CURRENT_PAGE_HAS_AUDIO_ATTRIBUTE = 'i-amphtml-current-page-has-audio';
 
@@ -88,115 +92,116 @@ const HIDE_MESSAGE_TIMEOUT_MS = 1500;
 
 /**
  * @param {!Element} element
+ * @param {?Element=} children
+ * @param {boolean} isVisible
  * @return {!Element}
  */
-const renderSystemLayerElement = (element) => (
-  <aside class="i-amphtml-story-system-layer i-amphtml-story-system-reset">
-    <a class={ATTRIBUTION_CLASS} target="_blank">
-      <div class="i-amphtml-story-attribution-logo-container">
-        <img alt="" class="i-amphtml-story-attribution-logo" />
-      </div>
-      <div class="i-amphtml-story-attribution-text" />
-    </a>
-    <div class="i-amphtml-story-has-new-page-notification-container">
-      <div class="i-amphtml-story-has-new-page-text-wrapper">
-        <span class="i-amphtml-story-has-new-page-circle-icon" />
-        <div class="i-amphtml-story-has-new-page-text">
-          {localize(element, LocalizedStringId.AMP_STORY_HAS_NEW_PAGE_TEXT)}
+const renderSystemLayerElement = (element, children, isVisible) => {
+  const systemLayerElement = (
+    <aside class="i-amphtml-story-system-layer i-amphtml-story-system-reset">
+      {children}
+      <a class={String(ATTRIBUTION_CLASS)} target="_blank">
+        <div class="i-amphtml-story-attribution-logo-container">
+          <img alt="" class="i-amphtml-story-attribution-logo" />
         </div>
-      </div>
-    </div>
-    <div class="i-amphtml-story-system-layer-buttons">
-      <div
-        role="button"
-        class={INFO_CLASS + ' i-amphtml-story-button'}
-        aria-label={localize(
-          element,
-          LocalizedStringId.AMP_STORY_INFO_BUTTON_LABEL
-        )}
-      />
-      <div class="i-amphtml-story-sound-display">
-        <div role="alert" class="i-amphtml-message-container">
-          <div class="i-amphtml-story-mute-text">
-            {localize(
-              element,
-              LocalizedStringId.AMP_STORY_AUDIO_MUTE_BUTTON_TEXT
-            )}
-          </div>
-          <div class="i-amphtml-story-unmute-sound-text">
-            {localize(
-              element,
-              LocalizedStringId.AMP_STORY_AUDIO_UNMUTE_SOUND_TEXT
-            )}
-          </div>
-          <div class="i-amphtml-story-unmute-no-sound-text">
-            {localize(
-              element,
-              LocalizedStringId.AMP_STORY_AUDIO_UNMUTE_NO_SOUND_TEXT
-            )}
-          </div>
+        <div class="i-amphtml-story-attribution-text" />
+      </a>
+      <div class="i-amphtml-story-has-new-page-notification-container">
+        <div class="i-amphtml-story-has-new-page-text-wrapper">
+          <span class="i-amphtml-story-has-new-page-circle-icon" />
+          <div
+            class="i-amphtml-story-has-new-page-text"
+            i-amphtml-i18n-text-content={
+              LocalizedStringId_Enum.AMP_STORY_HAS_NEW_PAGE_TEXT
+            }
+          ></div>
         </div>
-        <button
-          class={UNMUTE_CLASS + ' i-amphtml-story-button'}
-          aria-label={localize(
-            element,
-            LocalizedStringId.AMP_STORY_AUDIO_UNMUTE_BUTTON_LABEL
-          )}
+      </div>
+      <div class="i-amphtml-story-system-layer-buttons">
+        <div
+          role="button"
+          class={INFO_CLASS + ' i-amphtml-story-button'}
+          i-amphtml-i18n-aria-label={
+            LocalizedStringId_Enum.AMP_STORY_INFO_BUTTON_LABEL
+          }
         />
+        <div class="i-amphtml-story-captions-display">
+          <button
+            class={CAPTIONS_CLASS + ' i-amphtml-story-button'}
+            i-amphtml-i18n-aria-label={
+              LocalizedStringId_Enum.AMP_STORY_CAPTIONS_ON_LABEL
+            }
+          />
+          <button
+            class={NOCAPTIONS_CLASS + ' i-amphtml-story-button'}
+            i-amphtml-i18n-aria-label={
+              LocalizedStringId_Enum.AMP_STORY_CAPTIONS_OFF_LABEL
+            }
+          />
+        </div>
+        <div class="i-amphtml-story-sound-display">
+          <button
+            class={UNMUTE_CLASS + ' i-amphtml-story-button'}
+            i-amphtml-i18n-aria-label={
+              LocalizedStringId_Enum.AMP_STORY_AUDIO_UNMUTE_BUTTON_LABEL
+            }
+          />
+          <button
+            class={MUTE_CLASS + ' i-amphtml-story-button'}
+            i-amphtml-i18n-aria-label={
+              LocalizedStringId_Enum.AMP_STORY_AUDIO_MUTE_BUTTON_LABEL
+            }
+          />
+        </div>
+        <div class="i-amphtml-paused-display">
+          <button
+            class={PAUSE_CLASS + ' i-amphtml-story-button'}
+            i-amphtml-i18n-aria-label={
+              LocalizedStringId_Enum.AMP_STORY_PAUSE_BUTTON_LABEL
+            }
+          />
+          <button
+            class={PLAY_CLASS + ' i-amphtml-story-button'}
+            i-amphtml-i18n-aria-label={
+              LocalizedStringId_Enum.AMP_STORY_PLAY_BUTTON_LABEL
+            }
+          />
+        </div>
         <button
-          class={MUTE_CLASS + ' i-amphtml-story-button'}
-          aria-label={localize(
-            element,
-            LocalizedStringId.AMP_STORY_AUDIO_MUTE_BUTTON_LABEL
-          )}
+          class={
+            SKIP_TO_NEXT_CLASS +
+            ' i-amphtml-story-ui-hide-button i-amphtml-story-button'
+          }
+          i-amphtml-i18n-aria-label={
+            LocalizedStringId_Enum.AMP_STORY_SKIP_TO_NEXT_BUTTON_LABEL
+          }
         />
-      </div>
-      <div class="i-amphtml-paused-display">
         <button
-          class={PAUSE_CLASS + ' i-amphtml-story-button'}
-          aria-label={localize(
-            element,
-            LocalizedStringId.AMP_STORY_PAUSE_BUTTON_LABEL
-          )}
+          class={SHARE_CLASS + ' i-amphtml-story-button'}
+          i-amphtml-i18n-aria-label={
+            LocalizedStringId_Enum.AMP_STORY_SHARE_BUTTON_LABEL
+          }
         />
         <button
-          class={PLAY_CLASS + ' i-amphtml-story-button'}
-          aria-label={localize(
-            element,
-            LocalizedStringId.AMP_STORY_PLAY_BUTTON_LABEL
-          )}
+          class={
+            CLOSE_CLASS +
+            ' i-amphtml-story-ui-hide-button i-amphtml-story-button'
+          }
+          i-amphtml-i18n-aria-label={
+            LocalizedStringId_Enum.AMP_STORY_CLOSE_BUTTON_LABEL
+          }
         />
       </div>
-      <button
-        class={
-          SKIP_TO_NEXT_CLASS +
-          ' i-amphtml-story-ui-hide-button i-amphtml-story-button'
-        }
-        aria-label={localize(
-          element,
-          LocalizedStringId.AMP_STORY_SKIP_TO_NEXT_BUTTON_LABEL
-        )}
-      />
-      <button
-        class={SHARE_CLASS + ' i-amphtml-story-button'}
-        aria-label={localize(
-          element,
-          LocalizedStringId.AMP_STORY_SHARE_BUTTON_LABEL
-        )}
-      />
-      <button
-        class={
-          CLOSE_CLASS + ' i-amphtml-story-ui-hide-button i-amphtml-story-button'
-        }
-        aria-label={localize(
-          element,
-          LocalizedStringId.AMP_STORY_CLOSE_BUTTON_LABEL
-        )}
-      />
-    </div>
-    <div class="i-amphtml-story-system-layer-buttons-start-position" />
-  </aside>
-);
+      <div class="i-amphtml-story-system-layer-buttons-start-position" />
+    </aside>
+  );
+
+  if (!isVisible) {
+    systemLayerElement.classList.add('i-amphtml-story-hidden');
+  }
+
+  return systemLayerElement;
+};
 
 /**
  * Contains the event name belonging to the viewer control.
@@ -250,9 +255,6 @@ export class SystemLayer {
     /** @protected @const {!Element} */
     this.parentEl_ = parentEl;
 
-    /** @private {boolean} */
-    this.isBuilt_ = false;
-
     /**
      * Root element containing a shadow DOM root.
      * @private {?Element}
@@ -271,12 +273,6 @@ export class SystemLayer {
     /** @private @const {!ProgressBar} */
     this.progressBar_ = ProgressBar.create(win, this.parentEl_);
 
-    /** @private {!DevelopmentModeLog} */
-    this.developerLog_ = DevelopmentModeLog.create(win);
-
-    /** @private {!DevelopmentModeLogButtonSet} */
-    this.developerButtons_ = DevelopmentModeLogButtonSet.create(win);
-
     /** @private @const {!./amp-story-store-service.AmpStoryStoreService} */
     this.storeService_ = getStoreService(this.win_);
 
@@ -297,38 +293,38 @@ export class SystemLayer {
   }
 
   /**
-   * @return {!Element}
    * @param {string} initialPageId
+   * @param {boolean=} isVisible
+   * @return {!Element}
    */
-  build(initialPageId) {
-    if (this.isBuilt_) {
-      return this.getRoot();
+  build(initialPageId, isVisible = true) {
+    if (this.root_) {
+      return this.root_;
     }
 
-    this.isBuilt_ = true;
+    this.systemLayerEl_ = renderSystemLayerElement(
+      this.parentEl_,
+      this.progressBar_.build(initialPageId),
+      isVisible
+    );
+    localizeTemplate(this.systemLayerEl_, this.parentEl_);
 
-    this.root_ = this.win_.document.createElement('div');
-    this.root_.classList.add('i-amphtml-system-layer-host');
-    this.systemLayerEl_ = renderSystemLayerElement(this.parentEl_);
     // Make the share button link to the current document to make sure
     // embedded STAMPs always have a back-link to themselves, and to make
     // gestures like right-clicks work.
     this.systemLayerEl_.querySelector('.i-amphtml-story-share-control').href =
       Services.documentInfoForDoc(this.parentEl_).canonicalUrl;
 
-    createShadowRootWithStyle(this.root_, this.systemLayerEl_, CSS);
-
-    this.systemLayerEl_.insertBefore(
-      this.progressBar_.build(initialPageId),
-      this.systemLayerEl_.firstChild
+    this.root_ = createShadowRootWithStyle(
+      <div class="i-amphtml-system-layer-host"></div>,
+      this.systemLayerEl_,
+      CSS
     );
 
     this.buttonsContainer_ = this.systemLayerEl_.querySelector(
       '.i-amphtml-story-system-layer-buttons'
     );
 
-    this.buildForDevelopmentMode_();
-
     this.initializeListeners_();
 
     this.storeService_.subscribe(
@@ -360,9 +356,8 @@ export class SystemLayer {
 
     this.maybeBuildAttribution_();
 
-    this.getShadowRoot().setAttribute(MESSAGE_DISPLAY_CLASS, 'noshow');
     this.getShadowRoot().setAttribute(HAS_NEW_PAGE_ATTRIBUTE, 'noshow');
-    return this.getRoot();
+    return this.root_;
   }
 
   /** @private */
@@ -381,7 +376,9 @@ export class SystemLayer {
 
     anchorEl.href =
       getStoryAttributeSrc(this.parentEl_, 'entity-url') ||
-      getSourceOrigin(Services.documentInfoForDoc(this.parentEl_).sourceUrl);
+      Services.urlForDoc(this.parentEl_).getSourceOrigin(
+        Services.documentInfoForDoc(this.parentEl_).sourceUrl
+      );
 
     this.systemLayerEl_.querySelector(
       '.i-amphtml-story-attribution-text'
@@ -392,22 +389,6 @@ export class SystemLayer {
     anchorEl.classList.add('i-amphtml-story-attribution-visible');
   }
 
-  /**
-   * @private
-   */
-  buildForDevelopmentMode_() {
-    if (!getMode().development) {
-      return;
-    }
-
-    this.buttonsContainer_.appendChild(
-      this.developerButtons_.build(
-        this.developerLog_.toggle.bind(this.developerLog_)
-      )
-    );
-    this.getShadowRoot().appendChild(this.developerLog_.build());
-  }
-
   /**
    * @private
    */
@@ -424,6 +405,12 @@ export class SystemLayer {
         this.onPausedClick_(true);
       } else if (matches(target, `.${PLAY_CLASS}, .${PLAY_CLASS} *`)) {
         this.onPausedClick_(false);
+      } else if (matches(target, `.${CAPTIONS_CLASS}, .${CAPTIONS_CLASS} *`)) {
+        this.onCaptionsClick_(false);
+      } else if (
+        matches(target, `.${NOCAPTIONS_CLASS}, .${NOCAPTIONS_CLASS} *`)
+      ) {
+        this.onCaptionsClick_(true);
       } else if (matches(target, `.${SHARE_CLASS}, .${SHARE_CLASS} *`)) {
         this.onShareClick_(event);
       } else if (matches(target, `.${INFO_CLASS}, .${INFO_CLASS} *`)) {
@@ -463,14 +450,6 @@ export class SystemLayer {
       true /** callToInitialize */
     );
 
-    this.storeService_.subscribe(
-      StateProperty.STORY_HAS_AUDIO_STATE,
-      (hasAudio) => {
-        this.onStoryHasAudioStateUpdate_(hasAudio);
-      },
-      true /** callToInitialize */
-    );
-
     this.storeService_.subscribe(
       StateProperty.STORY_HAS_PLAYBACK_UI_STATE,
       (hasPlaybackUi) => {
@@ -487,13 +466,11 @@ export class SystemLayer {
       true /** callToInitialize */
     );
 
-    this.storeService_.subscribe(
-      StateProperty.UI_STATE,
-      (uiState) => {
-        this.onUIStateUpdate_(uiState);
-      },
-      true /** callToInitialize */
-    );
+    this.storeService_.subscribe(StateProperty.UI_STATE, (uiState) => {
+      this.vsync_.mutate(() => this.onUIStateUpdate_(uiState));
+    });
+    /** Initialize outside of mutate context to avoid CLS. */
+    this.onUIStateUpdate_(this.storeService_.get(StateProperty.UI_STATE));
 
     this.storeService_.subscribe(
       StateProperty.PAUSED_STATE,
@@ -527,6 +504,19 @@ export class SystemLayer {
       true /** callToInitialize */
     );
 
+    this.storeService_.subscribe(
+      StateProperty.PAGE_HAS_CAPTIONS_STATE,
+      (pageHasCaptionsState) =>
+        this.onPageHasCaptionsState_(pageHasCaptionsState),
+      true /* callToInitialize */
+    );
+
+    this.storeService_.subscribe(
+      StateProperty.CAPTIONS_STATE,
+      (captionsState) => this.onCaptionsStateUpdate_(captionsState),
+      true /* callToInitialize */
+    );
+
     this.storeService_.subscribe(
       StateProperty.PAGE_HAS_AUDIO_STATE,
       (audio) => {
@@ -561,13 +551,6 @@ export class SystemLayer {
     );
   }
 
-  /**
-   * @return {!Element}
-   */
-  getRoot() {
-    return dev().assertElement(this.root_);
-  }
-
   /**
    * @return {!Element}
    */
@@ -619,21 +602,6 @@ export class SystemLayer {
     });
   }
 
-  /**
-   * Reacts to has audio state updates, determining if the story has a global
-   * audio track playing, or if any page has audio.
-   * @param {boolean} hasAudio
-   * @private
-   */
-  onStoryHasAudioStateUpdate_(hasAudio) {
-    this.vsync_.mutate(() => {
-      this.getShadowRoot().classList.toggle(
-        'i-amphtml-story-has-audio',
-        hasAudio
-      );
-    });
-  }
-
   /**
    * Reacts to story having elements with playback.
    * @param {boolean} hasPlaybackUi
@@ -648,6 +616,15 @@ export class SystemLayer {
     });
   }
 
+  /**
+   * Toggles the captions.
+   * @param {boolean} captions
+   * @private
+   */
+  onCaptionsClick_(captions) {
+    this.storeService_.dispatch(Action.TOGGLE_CAPTIONS, captions);
+  }
+
   /**
    * Reacts to the presence of audio on a page to determine which audio messages
    * to display.
@@ -670,6 +647,22 @@ export class SystemLayer {
     });
   }
 
+  /**
+   * Toggles whether the active page has captions or not.
+   * @param {boolean} pageHasCaptions
+   */
+  onPageHasCaptionsState_(pageHasCaptions) {
+    toggleAttribute(this.systemLayerEl_, PAGE_HAS_CAPTIONS, pageHasCaptions);
+  }
+
+  /**
+   * Toggles whether the captions are active or not.
+   * @param {boolean} captionsState
+   */
+  onCaptionsStateUpdate_(captionsState) {
+    toggleAttribute(this.systemLayerEl_, 'captions-on', captionsState);
+  }
+
   /**
    * Reacts to the presence of elements with playback on the page.
    * @param {boolean} pageHasElementsWithPlayback
@@ -734,7 +727,7 @@ export class SystemLayer {
    * @private
    */
   hideMessageInternal_(message) {
-    if (!this.isBuilt_) {
+    if (!this.root_) {
       return;
     }
     this.vsync_.mutate(() => {
@@ -744,27 +737,26 @@ export class SystemLayer {
 
   /**
    * Reacts to UI state updates and triggers the expected UI.
-   * @param {!UIType} uiState
+   * Called inside a mutate context if not initializing.
+   * @param {!UIType_Enum} uiState
    * @private
    */
   onUIStateUpdate_(uiState) {
-    this.vsync_.mutate(() => {
-      const shadowRoot = this.getShadowRoot();
-
-      shadowRoot.classList.remove('i-amphtml-story-desktop-fullbleed');
-      shadowRoot.classList.remove('i-amphtml-story-desktop-one-panel');
-      shadowRoot.removeAttribute('desktop');
-
-      switch (uiState) {
-        case UIType.DESKTOP_FULLBLEED:
-          shadowRoot.setAttribute('desktop', '');
-          shadowRoot.classList.add('i-amphtml-story-desktop-fullbleed');
-          break;
-        case UIType.DESKTOP_ONE_PANEL:
-          shadowRoot.classList.add('i-amphtml-story-desktop-one-panel');
-          break;
-      }
-    });
+    const shadowRoot = this.getShadowRoot();
+
+    shadowRoot.classList.remove('i-amphtml-story-desktop-fullbleed');
+    shadowRoot.classList.remove('i-amphtml-story-desktop-one-panel');
+    shadowRoot.removeAttribute('desktop');
+
+    switch (uiState) {
+      case UIType_Enum.DESKTOP_FULLBLEED:
+        shadowRoot.setAttribute('desktop', '');
+        shadowRoot.classList.add('i-amphtml-story-desktop-fullbleed');
+        break;
+      case UIType_Enum.DESKTOP_ONE_PANEL:
+        shadowRoot.classList.add('i-amphtml-story-desktop-one-panel');
+        break;
+    }
   }
 
   /**
@@ -774,9 +766,11 @@ export class SystemLayer {
    */
   onSystemUiIsVisibleStateUpdate_(isVisible) {
     this.vsync_.mutate(() => {
-      this.getShadowRoot().classList.toggle(
-        'i-amphtml-story-hidden',
-        !isVisible
+      const shadowRoot = this.getShadowRoot();
+      shadowRoot.classList.toggle('i-amphtml-story-hidden', !isVisible);
+
+      toArray(shadowRoot.querySelectorAll('button')).forEach((button) =>
+        toggleA11yReadable(button, isVisible)
       );
     });
   }
@@ -834,10 +828,6 @@ export class SystemLayer {
    */
   onAudioIconClick_(mute) {
     this.storeService_.dispatch(Action.TOGGLE_MUTED, mute);
-    this.vsync_.mutate(() => {
-      this.getShadowRoot().setAttribute(MESSAGE_DISPLAY_CLASS, 'show');
-      this.hideMessageAfterTimeout_(MESSAGE_DISPLAY_CLASS);
-    });
   }
 
   /**
@@ -874,13 +864,10 @@ export class SystemLayer {
     const eventName = element[VIEWER_CONTROL_EVENT_NAME];
 
     this.viewerMessagingHandler_ &&
-      this.viewerMessagingHandler_.send(
-        'documentStateUpdate',
-        dict({
-          'state': AMP_STORY_PLAYER_EVENT,
-          'value': eventName,
-        })
-      );
+      this.viewerMessagingHandler_.send('documentStateUpdate', {
+        'state': AMP_STORY_PLAYER_EVENT,
+        'value': eventName,
+      });
   }
 
   /**
@@ -928,9 +915,8 @@ export class SystemLayer {
           defaultConfig.selector
         );
       } else {
-        element = this.win_.document.createElement('button');
+        element = <button class="i-amphtml-story-button" />;
         this.vsync_.mutate(() => {
-          element.classList.add('i-amphtml-story-button');
           this.buttonsContainer_.appendChild(element);
         });
       }
@@ -991,75 +977,4 @@ export class SystemLayer {
     // TODO(newmuis) avoid passing progress logic through system-layer
     this.progressBar_.updateProgress(pageId, progress);
   }
-
-  /**
-   * @param {!./logging.AmpStoryLogEntryDef} logEntry
-   * @private
-   */
-  logInternal_(logEntry) {
-    this.developerButtons_.log(logEntry);
-    this.developerLog_.log(logEntry);
-  }
-
-  /**
-   * Logs an array of entries to the developer logs.
-   * @param {!Array<!./logging.AmpStoryLogEntryDef>} logEntries
-   */
-  logAll(logEntries) {
-    if (!getMode().development) {
-      return;
-    }
-
-    this.vsync_.mutate(() => {
-      logEntries.forEach((logEntry) => this.logInternal_(logEntry));
-    });
-  }
-
-  /**
-   * Logs a single entry to the developer logs.
-   * @param {!./logging.AmpStoryLogEntryDef} logEntry
-   */
-  log(logEntry) {
-    if (!getMode().development) {
-      return;
-    }
-
-    this.logInternal_(logEntry);
-  }
-
-  /**
-   * Clears any state held by the developer log or buttons.
-   */
-  resetDeveloperLogs() {
-    if (!getMode().development) {
-      return;
-    }
-
-    this.developerButtons_.clear();
-    this.developerLog_.clear();
-  }
-
-  /**
-   * Sets the string providing context for the developer logs window.  This is
-   * often the name or ID of the element that all logs are for (e.g. the page).
-   * @param {string} contextString
-   */
-  setDeveloperLogContextString(contextString) {
-    if (!getMode().development) {
-      return;
-    }
-
-    this.developerLog_.setContextString(contextString);
-  }
-
-  /**
-   * Hides the developer log in the UI.
-   */
-  hideDeveloperLog() {
-    if (!getMode().development) {
-      return;
-    }
-
-    this.developerLog_.hide();
-  }
 }
diff --git a/extensions/amp-story/1.0/amp-story-tooltip.css b/extensions/amp-story/1.0/amp-story-tooltip.css
index 2d22aadc3cc4..34d4b5984e73 100644
--- a/extensions/amp-story/1.0/amp-story-tooltip.css
+++ b/extensions/amp-story/1.0/amp-story-tooltip.css
@@ -51,7 +51,7 @@
 
 .i-amphtml-story-focused-state-layer-nav-button.i-amphtml-story-tooltip-nav-button-left {
   left: -8px !important;
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="48px" height="48px" viewBox="0 0 48 48" fill="#FFFFFF"><path d="M30.83 14.83L28 12 16 24l12 12 2.83-2.83L21.66 24z"/><path d="M0 0h48v48H0z" fill="none"/></svg>') !important;
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" fill="#FFF"><path d="M30.8 14.8 28 12 16 24l12 12 2.8-2.8-9.1-9.2z"/><path d="M0 0h48v48H0z" fill="none"/></svg>') !important;
 }
 
 .i-amphtml-hidden .i-amphtml-story-focused-state-layer-nav-button.i-amphtml-story-tooltip-nav-button-left {
@@ -61,7 +61,7 @@
 
 .i-amphtml-story-focused-state-layer-nav-button.i-amphtml-story-tooltip-nav-button-right {
   right: -8px !important;
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="48px" height="48px" viewBox="0 0 48 48" fill="#FFFFFF"><path d="M20 12l-2.83 2.83L26.34 24l-9.17 9.17L20 36l12-12z"/><path d="M0 0h48v48H0z" fill="none"/></svg>') !important;
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" fill="#FFF"><path d="m20 12-2.8 2.8 9.1 9.2-9.1 9.2L20 36l12-12z"/><path d="M0 0h48v48H0z" fill="none"/></svg>') !important;
 }
 
 .i-amphtml-hidden .i-amphtml-story-focused-state-layer-nav-button.i-amphtml-story-tooltip-nav-button-right {
@@ -146,19 +146,11 @@
 }
 
 .i-amphtml-tooltip-action-icon-launch {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="18px" height="18px" viewBox="0 0 48 48" fill="%23757575"><path d="M0 0h48v48H0z" fill="none"/><path d="M38 38H10V10h14V6H10c-2.21 0-4 1.79-4 4v28c0 2.21 1.79 4 4 4h28c2.21 0 4-1.79 4-4V24h-4v14zM28 6v4h7.17L15.51 29.66l2.83 2.83L38 12.83V20h4V6H28z"/></svg>') !important;
-}
-
-.i-amphtml-tooltip-action-icon-expand {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="18px" height="18px" viewBox="0 0 48 48" fill="#757575"><path d="M17.17 32.92l9.17-9.17-9.17-9.17L20 11.75l12 12-12 12z"/><path d="M0-.25h48v48H0z" fill="none"/></svg>') !important;
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 48 48" fill="%23757575"><path d="M0 0h48v48H0z" fill="none"/><path d="M38 38H10V10h14V6H10a4 4 0 0 0-4 4v28a4 4 0 0 0 4 4h28a4 4 0 0 0 4-4V24h-4v14zM28 6v4h7.2L15.5 29.7l2.8 2.8L38 12.8V20h4V6H28z"/></svg>') !important;
 }
 
 .i-amphtml-story-tooltip-theme-dark .i-amphtml-tooltip-action-icon-launch {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="18px" height="18px" viewBox="0 0 48 48" fill="rgba(255, 255, 255, 0.54)"><path d="M0 0h48v48H0z" fill="none"/><path d="M38 38H10V10h14V6H10c-2.21 0-4 1.79-4 4v28c0 2.21 1.79 4 4 4h28c2.21 0 4-1.79 4-4V24h-4v14zM28 6v4h7.17L15.51 29.66l2.83 2.83L38 12.83V20h4V6H28z"/></svg>') !important;
-}
-
-.i-amphtml-story-tooltip-theme-dark .i-amphtml-tooltip-action-icon-expand {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="18px" height="18px" viewBox="0 0 48 48" fill="rgba(255, 255, 255, 0.54)"><path d="M17.17 32.92l9.17-9.17-9.17-9.17L20 11.75l12 12-12 12z"/><path d="M0-.25h48v48H0z" fill="none"/></svg>') !important;
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 48 48" fill="rgba(255, 255, 255, 0.54)"><path d="M0 0h48v48H0z" fill="none"/><path d="M38 38H10V10h14V6H10a4 4 0 0 0-4 4v28a4 4 0 0 0 4 4h28a4 4 0 0 0 4-4V24h-4v14zM28 6v4h7.2L15.5 29.7l2.8 2.8L38 12.8V20h4V6H28z"/></svg>') !important;
 }
 
 .i-amphtml-story-tooltip-arrow {
@@ -185,5 +177,9 @@
 }
 
 .amp-social-share-twitter-no-background {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 400 400" preserveAspectRatio="xMidYMid meet"><g fill="none" fill-rule="evenodd"><path d="M0 0h400v400H0z"/><path fill="%231da1f2" fill-rule="nonzero" d="M153.62 301.59c94.34 0 145.94-78.16 145.94-145.94 0-2.22 0-4.43-.15-6.63A104.36 104.36 0 0 0 325 122.47a102.38 102.38 0 0 1-29.46 8.07 51.47 51.47 0 0 0 22.55-28.37 102.79 102.79 0 0 1-32.57 12.45c-15.9-16.906-41.163-21.044-61.625-10.093-20.461 10.95-31.032 34.266-25.785 56.873A145.62 145.62 0 0 1 92.4 107.81c-13.614 23.436-6.66 53.419 15.88 68.47A50.91 50.91 0 0 1 85 169.86v.65c.007 24.416 17.218 45.445 41.15 50.28a51.21 51.21 0 0 1-23.16.88c6.72 20.894 25.976 35.208 47.92 35.62a102.92 102.92 0 0 1-63.7 22 104.41 104.41 0 0 1-12.21-.74 145.21 145.21 0 0 0 78.62 23"/></g></svg>');
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg width="1200" height="1227" viewBox="0 0 1200 1227" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M714.163 519.284L1160.89 0H1055.03L667.137 450.887L357.328 0H0L468.492 681.821L0 1226.37H105.866L515.491 750.218L842.672 1226.37H1200L714.137 519.284H714.163ZM569.165 687.828L521.697 619.934L144.011 79.6944H306.615L611.412 515.685L658.88 583.579L1055.08 1150.3H892.476L569.165 687.854V687.828Z" fill="#000" /></svg>');
+}
+
+.i-amphtml-story-tooltip-custom-icon.amp-social-share-twitter-no-background {
+  background-size: 70% !important;
 }
diff --git a/extensions/amp-story/1.0/amp-story-unsupported-browser-layer.css b/extensions/amp-story/1.0/amp-story-unsupported-browser-layer.css
index 4fbaaa248c85..727f9bf7a6c5 100644
--- a/extensions/amp-story/1.0/amp-story-unsupported-browser-layer.css
+++ b/extensions/amp-story/1.0/amp-story-unsupported-browser-layer.css
@@ -16,15 +16,8 @@
   align-items: center !important;
   justify-content: center !important;
   text-align: center !important;
-  display: none !important;
-}
-
-.i-amphtml-story-unsupported-browser-overlay .i-amphtml-story-overlay-text {
-  color: #fff !important;
-}
-
-.i-amphtml-story-unsupported-browser-overlay {
   display: flex !important;
+  color: #fff !important;
 }
 
 .i-amphtml-gear-icon {
@@ -39,7 +32,7 @@
 }
 
 .i-amphtml-gear-icon {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 0 20 20" fill="#000000"><path fill="none" d="M0 0h20v20H0V0z"/><path d="M15.95 10.78c.03-.25.05-.51.05-.78s-.02-.53-.06-.78l1.69-1.32c.15-.12.19-.34.1-.51l-1.6-2.77c-.1-.18-.31-.24-.49-.18l-1.99.8c-.42-.32-.86-.58-1.35-.78L12 2.34c-.03-.2-.2-.34-.4-.34H8.4c-.2 0-.36.14-.39.34l-.3 2.12c-.49.2-.94.47-1.35.78l-1.99-.8c-.18-.07-.39 0-.49.18l-1.6 2.77c-.1.18-.06.39.1.51l1.69 1.32c-.04.25-.07.52-.07.78s.02.53.06.78L2.37 12.1c-.15.12-.19.34-.1.51l1.6 2.77c.1.18.31.24.49.18l1.99-.8c.42.32.86.58 1.35.78l.3 2.12c.04.2.2.34.4.34h3.2c.2 0 .37-.14.39-.34l.3-2.12c.49-.2.94-.47 1.35-.78l1.99.8c.18.07.39 0 .49-.18l1.6-2.77c.1-.18.06-.39-.1-.51l-1.67-1.32zM10 13c-1.65 0-3-1.35-3-3s1.35-3 3-3 3 1.35 3 3-1.35 3-3 3z"/></svg>')!important;
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 20 20"><path fill="none" d="M0 0h20v20H0V0z"/><path d="M16 10.8V9.2L17.5 8c.2-.1.2-.3.1-.5l-1.6-2.8c0-.2-.3-.2-.5-.2l-2 .8-1.3-.7-.3-2.2c0-.2-.2-.3-.4-.3H8.4c-.2 0-.4.1-.4.3l-.3 2.2a6 6 0 0 0-1.3.7l-2-.8c-.2 0-.4 0-.5.2L2.3 7.4v.5l1.8 1.3a5 5 0 0 0 0 1.6L2.4 12c-.2.1-.2.3-.1.5l1.6 2.8c0 .2.3.2.5.2l2-.8 1.3.7.3 2.2c0 .2.2.3.4.3h3.2c.2 0 .4-.1.4-.3l.3-2.2a6 6 0 0 0 1.3-.7l2 .8c.2 0 .4 0 .5-.2l1.6-2.8v-.5L16 10.8zM10 13c-1.6 0-3-1.4-3-3s1.4-3 3-3 3 1.4 3 3-1.4 3-3 3z"/></svg>')!important;
 }
 
 .i-amphtml-continue-button {
diff --git a/extensions/amp-story/1.0/amp-story-unsupported-browser-layer.js b/extensions/amp-story/1.0/amp-story-unsupported-browser-layer.js
index 985f2e28d549..75d62915154f 100644
--- a/extensions/amp-story/1.0/amp-story-unsupported-browser-layer.js
+++ b/extensions/amp-story/1.0/amp-story-unsupported-browser-layer.js
@@ -1,105 +1,44 @@
 import * as Preact from '#core/dom/jsx';
-import {Action, getStoreService} from './amp-story-store-service';
-import {CSS} from '../../../build/amp-story-unsupported-browser-layer-1.0.css';
-import {LocalizedStringId} from '#service/localization/strings';
+
+import {LocalizedStringId_Enum} from '#service/localization/strings';
+
+import {localizeTemplate} from './amp-story-localization-service';
 import {createShadowRootWithStyle} from './utils';
-import {removeElement} from '#core/dom';
-import {localize} from './amp-story-localization-service';
 
-/** @const {string} Class for the continue anyway button */
-const CONTINUE_ANYWAY_BUTTON_CLASS = 'i-amphtml-continue-button';
+import {CSS} from '../../../build/amp-story-unsupported-browser-layer-1.0.css';
 
 /**
  * Full viewport black layer indicating browser is not supported.
- * @param {!Element} element
+ * @param {string} continueAnyway
  * @return {!Element}
  */
-const renderUnsuportedBrowserLayerElement = (element) => (
+const renderContent = (continueAnyway) => (
   <div class="i-amphtml-story-unsupported-browser-overlay">
     <div class="i-amphtml-overlay-container">
       <div class="i-amphtml-gear-icon" />
-      <div class="i-amphtml-story-overlay-text">
-        {localize(
-          element,
-          LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT
-        )}
-      </div>
+      <div
+        i-amphtml-i18n-text-content={
+          LocalizedStringId_Enum.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT
+        }
+      ></div>
       <button
-        // The continue button functionality will only be present in the default
-        // layer. Publisher provided fallbacks will not provide users with the
-        // ability to continue with an unsupported browser
         class="i-amphtml-continue-button"
-      >
-        {localize(
-          element,
-          LocalizedStringId.AMP_STORY_CONTINUE_ANYWAY_BUTTON_LABEL
-        )}
-      </button>
+        onClick={continueAnyway}
+        i-amphtml-i18n-text-content={
+          LocalizedStringId_Enum.AMP_STORY_CONTINUE_ANYWAY_BUTTON_LABEL
+        }
+      ></button>
     </div>
   </div>
 );
 
 /**
- * Unsupported browser layer UI.
+ * @param {!Element} context
+ * @param {function(Event):void} continueAnyway
+ * @return {!Element}
  */
-export class UnsupportedBrowserLayer {
-  /**
-   * @param {!Window} win
-   */
-  constructor(win) {
-    /** @private @const {!Window} */
-    this.win_ = win;
-
-    /** @private {?Element} */
-    this.root_ = null;
-
-    /** @private {?Element} */
-    this.element_ = null;
-
-    /** @private {?Element} */
-    this.continueButton_ = null;
-
-    /** @private @const {!./amp-story-store-service.AmpStoryStoreService} */
-    this.storeService_ = getStoreService(this.win_);
-  }
-
-  /**
-   * Builds and appends the component in the story.
-   * @return {*} TODO(#23582): Specify return type
-   */
-  build() {
-    if (this.root_) {
-      return this.root_;
-    }
-    this.root_ = this.win_.document.createElement('div');
-    this.element_ = renderUnsuportedBrowserLayerElement(this.win_.document);
-    createShadowRootWithStyle(this.root_, this.element_, CSS);
-    this.continueButton_ = this.element_./*OK*/ querySelector(
-      `.${CONTINUE_ANYWAY_BUTTON_CLASS}`
-    );
-    this.continueButton_.addEventListener('click', () => {
-      this.storeService_.dispatch(Action.TOGGLE_SUPPORTED_BROWSER, true);
-    });
-    return this.root_;
-  }
-
-  /**
-   * Returns the unsupported browser componenet
-   * @return {?Element} The root element of the componenet
-   */
-  get() {
-    if (!this.root_) {
-      this.build();
-    }
-    return this.root_;
-  }
-
-  /**
-   * Removes the entire layer
-   */
-  removeLayer() {
-    if (this.root_) {
-      removeElement(this.root_);
-    }
-  }
+export function renderUnsupportedBrowserLayer(context, continueAnyway) {
+  const content = renderContent(continueAnyway);
+  localizeTemplate(content, context);
+  return createShadowRootWithStyle(<div />, content, CSS);
 }
diff --git a/extensions/amp-story/1.0/amp-story-user-overridable.css b/extensions/amp-story/1.0/amp-story-user-overridable.css
index f552b2cea1e4..45e0b6dd12d2 100644
--- a/extensions/amp-story/1.0/amp-story-user-overridable.css
+++ b/extensions/amp-story/1.0/amp-story-user-overridable.css
@@ -4,7 +4,7 @@ amp-story {
   font-display: optional;
 }
 
-amp-story-grid-layer:not([aspect-ratio]) {
+amp-story-grid-layer:not([aspect-ratio]):not([preset]) {
   overflow: hidden;
 }
 
diff --git a/extensions/amp-story/1.0/amp-story-viewer-messaging-handler.js b/extensions/amp-story/1.0/amp-story-viewer-messaging-handler.js
index b9f7e150f3bc..abc05563940e 100644
--- a/extensions/amp-story/1.0/amp-story-viewer-messaging-handler.js
+++ b/extensions/amp-story/1.0/amp-story-viewer-messaging-handler.js
@@ -1,11 +1,11 @@
+import {dev, user} from '#utils/log';
+
 import {
   Action,
   StateProperty,
   getStoreService,
 } from './amp-story-store-service';
 import {AnalyticsVariable, getVariableService} from './variable-service';
-import {dev, user} from '#utils/log';
-import {dict} from '#core/types/object';
 
 /** @type {string} */
 const TAG = 'amp-story-viewer-messaging-handler';
@@ -26,6 +26,10 @@ let GetStateConfigurationDef;
 
 /** @enum {!GetStateConfigurationDef} */
 const GET_STATE_CONFIGURATIONS = {
+  'CAPTIONS_STATE': {
+    dataSource: DataSources.STORE_SERVICE,
+    property: StateProperty.CAPTIONS_STATE,
+  },
   'CURRENT_PAGE_ID': {
     dataSource: DataSources.STORE_SERVICE,
     property: StateProperty.CURRENT_PAGE_ID,
@@ -46,10 +50,18 @@ const GET_STATE_CONFIGURATIONS = {
     dataSource: DataSources.STORE_SERVICE,
     property: StateProperty.UI_STATE,
   },
+  'DESKTOP_ASPECT_RATIO': {
+    dataSource: DataSources.STORE_SERVICE,
+    property: StateProperty.DESKTOP_ASPECT_RATIO,
+  },
   'STORY_PROGRESS': {
     dataSource: DataSources.VARIABLE_SERVICE,
     property: AnalyticsVariable.STORY_PROGRESS,
   },
+  'STORY_PAGE_COUNT': {
+    dataSource: DataSources.VARIABLE_SERVICE,
+    property: AnalyticsVariable.STORY_PAGE_COUNT,
+  },
 };
 
 /** @typedef {{action: !Action, isValueValid: function(*):boolean}} */
@@ -57,6 +69,10 @@ let SetStateConfigurationDef;
 
 /** @enum {!SetStateConfigurationDef} */
 const SET_STATE_CONFIGURATIONS = {
+  'CAPTIONS_STATE': {
+    action: Action.TOGGLE_CAPTIONS,
+    isValueValid: (value) => typeof value === 'boolean',
+  },
   'MUTED_STATE': {
     action: Action.TOGGLE_MUTED,
     isValueValid: (value) => typeof value === 'boolean',
@@ -109,6 +125,15 @@ export class AmpStoryViewerMessagingHandler {
     this.viewer_.sendMessage(eventType, data, cancelUnsent);
   }
 
+  /**
+   * @param {string} eventType
+   * @param {function(!JsonObject)} handler
+   * @return {!UnlistenDef}
+   */
+  onMessage(eventType, handler) {
+    this.viewer_.onMessage(eventType, handler);
+  }
+
   /**
    * Handles 'getDocumentState' viewer messages.
    * @param {!Object=} data
@@ -155,10 +180,10 @@ export class AmpStoryViewerMessagingHandler {
     }
 
     this.storeService_.subscribe(config.property, (value) => {
-      this.viewer_.sendMessage(
-        'documentStateUpdate',
-        dict({'state': state, 'value': value})
-      );
+      this.viewer_.sendMessage('documentStateUpdate', {
+        'state': state,
+        'value': value,
+      });
     });
   }
 
diff --git a/extensions/amp-story/1.0/amp-story.css b/extensions/amp-story/1.0/amp-story.css
index cdd92e9f5396..d28eefb7b5d8 100644
--- a/extensions/amp-story/1.0/amp-story.css
+++ b/extensions/amp-story/1.0/amp-story.css
@@ -1,9 +1,4 @@
-@import './amp-story-access.css';
-@import './amp-story-affiliate-link.css';
 @import './amp-story-desktop-one-panel.css';
-@import './amp-story-draggable-drawer.css';
-@import './amp-story-form.css';
-@import './amp-story-page-attachment.css';
 @import './amp-story-templates.css';
 @import './amp-story-user-overridable.css';
 @import './amp-story-vertical.css';
@@ -12,20 +7,30 @@
 /** Common */
 :root {
   --story-page-vw: 1vw !important;
-  --story-page-vh: 1vh !important;
+  --story-page-vh: var(--story-dvh, 1vh) !important;
   --story-page-vmin: min(var(--story-page-vw), var(--story-page-vh)) !important;
   --story-page-vmax: max(var(--story-page-vw), var(--story-page-vh)) !important;
-  font-size: calc(2.5 * var(--story-page-vh, 8px));
+  --story-100dvh: calc(var(--story-dvh, 1vh) * 100) !important;
+  --story-font-size: calc(2.5 * var(--story-page-vh, 8px)) !important;
+  font-size: var(--story-font-size);
+}
+
+@supports (height: 1dvh) {
+  :root {
+    --story-dvh: 1dvh !important;
+  }
 }
 
 body {
-  animation:none !important;
+  animation: none !important;
   -webkit-animation: none !important;
   -moz-animation: none !important;
   -ms-animation: none !important;
 }
 
-amp-story, amp-story-page, amp-story-cta-layer {
+amp-story,
+amp-story-page,
+amp-story-cta-layer {
   contain: strict !important;
   overflow: hidden !important;
   -webkit-touch-callout: none !important;
@@ -90,7 +95,8 @@ amp-story {
   touch-action: manipulation !important;
 }
 
-html:root, html:root body {
+html:root,
+html:root body {
   font-size: calc(2.5 * var(--story-page-vh, 8px));
   height: 100% !important;
   margin: 0 !important;
@@ -144,6 +150,9 @@ amp-story[standalone] {
   max-width: initial !important;
   min-height: initial !important;
   min-width: initial !important;
+
+  /* Unblocks rendering when this CSS file is installed. Info on #37990. */
+  visibility: visible !important;
 }
 
 amp-story[standalone].amp-notbuilt {
@@ -180,19 +189,6 @@ amp-story[hide] {
 }
 
 amp-story .amp-video-eq {
-  height: 14px !important;;
-  width: 14px !important;
-}
-
-amp-story .amp-video-eq .amp-video-eq-col {
-  margin-right: 2px !important;
-}
-
-amp-story .amp-video-eq .amp-video-eq-col:last-child {
-  margin-right: 0 !important;
-}
-
-amp-story .amp-video-eq:not(.amp-video-eq-play), .i-amphtml-story-no-audio-ui .amp-video-eq {
   display: none !important;
 }
 
@@ -233,15 +229,15 @@ amp-story-page[distance]:not([active]) {
  * update them in the ampdoc.css file.
  */
 amp-story-page[active],
-amp-story-page[distance="0"][distance],
-amp-story-page[distance="1"][distance] {
+amp-story-page[distance='0'][distance],
+amp-story-page[distance='1'][distance] {
   transform: translateY(0) !important;
 }
 
 amp-story.i-amphtml-experiment-story-load-inactive-outside-viewport:not([desktop])
-  amp-story-page[distance="1"]:not(.i-amphtml-story-page-loaded):not(.i-amphtml-visited),
-amp-story-page[distance="2"][distance] {
-  transform: translateY(100vh) !important;
+  amp-story-page[distance='1']:not(.i-amphtml-story-page-loaded):not(.i-amphtml-visited),
+amp-story-page[distance='2'][distance] {
+  transform: translateY(var(--story-100dvh)) !important;
 }
 
 amp-story-page [data-text-background-color] {
@@ -286,19 +282,19 @@ amp-story-grid-layer {
   left: 0;
 }
 
-amp-story-grid-layer[anchor*="left"] {
+amp-story-grid-layer[anchor*='left'] {
   margin-left: 0 !important;
 }
 
-amp-story-grid-layer[anchor*="top"] {
+amp-story-grid-layer[anchor*='top'] {
   margin-top: 0 !important;
 }
 
-amp-story-grid-layer[anchor*="bottom"] {
+amp-story-grid-layer[anchor*='bottom'] {
   margin-bottom: 0 !important;
 }
 
-amp-story-grid-layer[anchor*="right"] {
+amp-story-grid-layer[anchor*='right'] {
   margin-right: 0 !important;
   margin-left: auto !important;
 }
@@ -309,8 +305,8 @@ amp-story-grid-layer[anchor*="right"] {
  * story.
  * See #14401
  */
- amp-story-grid-layer amp-video::after {
-  content: "" !important;
+amp-story-grid-layer amp-video::after {
+  content: '' !important;
   position: absolute !important;
   height: 100% !important;
   width: 100% !important;
@@ -321,15 +317,15 @@ amp-story-grid-layer[anchor*="right"] {
 /**
  * Prevents preload placeholders from pushing content offscreen.
  */
-[template="fill"] amp-img img,
-[template="fill"] amp-video video {
+[template='fill'] amp-img img,
+[template='fill'] amp-video video {
   position: absolute !important;
 }
 
 /**
  * Prevents long-press image preview on iOS 15 that breaks pause UX.
  */
- amp-story-grid-layer amp-img img {
+amp-story-grid-layer amp-img img {
   pointer-events: none !important;
 }
 
@@ -337,11 +333,13 @@ amp-story-grid-layer[anchor*="right"] {
  * Prevents amp-video to layout until its element has been swapped by the media
  * pool. See #26718 for context.
  */
-amp-story-page[active]:not(.i-amphtml-layout) amp-video.i-amphtml-poolbound {
+amp-story-page[active]:not(.i-amphtml-layout) amp-video.i-amphtml-poolbound:not(.i-amphtml-layout) {
   display: none !important;
 }
 
-amp-story-grid-layer > * {
+/** Make clickable elements in light dom accept pointer events */
+amp-story-grid-layer a, amp-story-grid-layer amp-twitter,
+amp-story-grid-layer amp-ad {
   pointer-events: auto !important;
 }
 
@@ -352,7 +350,7 @@ amp-story-grid-layer a * {
 
 /** Apply click shield on embedded components on initial load. */
 amp-story-grid-layer .i-amphtml-embedded-component::after {
-  content: "" !important;
+  content: '' !important;
   position: absolute !important;
   height: 100% !important;
   width: 100% !important;
@@ -360,29 +358,14 @@ amp-story-grid-layer .i-amphtml-embedded-component::after {
   left: 0 !important;
 }
 
-.i-amphtml-expanded-mode .i-amphtml-embedded-component::after {
-  height: 0px !important;
-  width: 0px !important;
-}
-
-.i-amphtml-expanded-mode amp-story-grid-layer,
-.i-amphtml-expanded-mode amp-story-grid-layer * {
-  contain: none !important;
-  z-index: auto !important;
-}
-
-.i-amphtml-expanded-mode .i-amphtml-embedded-component.i-amphtml-expanded-component {
-  z-index: 1 !important;
-  transition: transform 0.225s cubic-bezier(0.4, 0.0, 0.2, 1) !important;
-}
-
 .i-amphtml-story-grid-template-with-full-bleed-animation {
   position: absolute !important;
   display: block !important;
   padding: 0 !important;
 }
 
-[template="fill"]:not(.i-amphtml-story-grid-template-with-full-bleed-animation) > * {
+[template='fill']:not(.i-amphtml-story-grid-template-with-full-bleed-animation)
+  > * {
   bottom: 0 !important;
   height: auto !important;
   left: 0 !important;
@@ -392,171 +375,74 @@ amp-story-grid-layer .i-amphtml-embedded-component::after {
   width: auto !important;
 }
 
-[template="vertical"] {
+[template='vertical'] {
   grid-auto-flow: row !important;
   grid-template-columns: 100% !important;
 }
 
-[template="horizontal"] {
+[template='horizontal'] {
   grid-auto-flow: column !important;
   grid-template-rows: 100% !important;
 }
 
-[template="thirds"] {
+[template='thirds'] {
   height: 100% !important;
   grid-template-rows: 33% 33% 33% !important; /* `fr` is broken in Safari. */
-  grid-template-areas: "upper-third"
-                       "middle-third"
-                       "lower-third" !important;
+  grid-template-areas:
+    'upper-third'
+    'middle-third'
+    'lower-third' !important;
 }
 
-[aspect-ratio], [preset] {
+[aspect-ratio],
+[preset] {
   margin: auto;
   width: var(--i-amphtml-story-layer-width, 100%);
   height: var(--i-amphtml-story-layer-height, 100%);
-  font-size: calc(var(--i-amphtml-story-layer-height, 100vh) / 10);
-  margin-left: calc((var(--story-page-vw, 1%) * 100 - var(--i-amphtml-story-layer-width, 100%)) * 0.5); /* Set margin to 1/2 of page-width - layer-width to center layer */
-
-  --i-amphtml-aspect-ratio-float: calc(var(--aspect-ratio)) !important; /* Avoid fractions, which don't work with compilers that remove parenthesis */
-  --i-amphtml-story-page-width: calc(100 * var(--story-page-vw, 1vw)) !important;
-  --i-amphtml-story-page-height: calc(100 * var(--story-page-vh, 1vh)) !important;
-  --i-amphtml-story-unscaled-width: min(var(--i-amphtml-story-page-width), calc(var(--i-amphtml-story-page-height) * var(--i-amphtml-aspect-ratio-float))) !important;
-  --i-amphtml-story-unscaled-height: min(var(--i-amphtml-story-page-height), calc(var(--i-amphtml-story-page-width) / var(--i-amphtml-aspect-ratio-float))) !important;
-  --i-amphtml-story-layer-width: calc(var(--i-amphtml-story-unscaled-width) * var(--scaling-factor, 1)) !important;
-  --i-amphtml-story-layer-height: calc(var(--i-amphtml-story-unscaled-height) * var(--scaling-factor, 1)) !important;
-}
-
-[preset="2021-foreground"] {
+  font-size: calc(var(--i-amphtml-story-layer-height) / 10);
+  margin-left: calc(
+    (var(--story-page-vw, 1%) * 100 - var(--i-amphtml-story-layer-width, 100%)) *
+      0.5
+  ); /* Set margin to 1/2 of page-width - layer-width to center layer */
+
+  --i-amphtml-aspect-ratio-float: calc(
+    var(--aspect-ratio)
+  ) !important; /* Avoid fractions, which don't work with compilers that remove parenthesis */
+  --i-amphtml-story-page-width: calc(
+    100 * var(--story-page-vw, 1vw)
+  ) !important;
+  --i-amphtml-story-page-height: calc(
+    100 * var(--story-page-vh, 1vh)
+  ) !important;
+  --i-amphtml-story-unscaled-width: min(
+    var(--i-amphtml-story-page-width),
+    calc(
+      var(--i-amphtml-story-page-height) * var(--i-amphtml-aspect-ratio-float)
+    )
+  ) !important;
+  --i-amphtml-story-unscaled-height: min(
+    var(--i-amphtml-story-page-height),
+    calc(
+      var(--i-amphtml-story-page-width) / var(--i-amphtml-aspect-ratio-float)
+    )
+  ) !important;
+  --i-amphtml-story-layer-width: calc(
+    var(--i-amphtml-story-unscaled-width) * var(--scaling-factor, 1)
+  ) !important;
+  --i-amphtml-story-layer-height: calc(
+    var(--i-amphtml-story-unscaled-height) * var(--scaling-factor, 1)
+  ) !important;
+}
+
+[preset='2021-foreground'] {
   --aspect-ratio: 69/116 !important;
 }
 
-[preset="2021-background"] {
+[preset='2021-background'] {
   --aspect-ratio: 69/116 !important;
   --scaling-factor: 1.142 !important;
 }
 
-/**
- * Development mode
- */
-
-.i-amphtml-story-dev-logs-button[data-count="0"] {
-  display: none !important;
-}
-
-.i-amphtml-story-dev-logs-button {
-  background-position: center center !important;
-  background-repeat: no-repeat !important;
-}
-
-.i-amphtml-story-dev-logs-button::after {
-  background-color: #fff !important;
-  border-radius: 6px !important;
-  box-sizing: border-box !important;
-  color: #444;
-  content: attr(data-count) !important;
-  display: inline-block !important;
-  font-family: Roboto !important;
-  font-size: 11px !important;
-  height: 12px !important;
-  line-height: 12px !important;
-  padding: 0 6px !important;
-  position: absolute !important;
-  right: 0 !important;
-  top: 6px !important;
-}
-
-.i-amphtml-story-error-button {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 0 24 24" fill="#DB4437"><path d="M12 2C6.47 2 2 6.47 2 12s4.47 10 10 10 10-4.47 10-10S17.53 2 12 2zm5 13.59L15.59 17 12 13.41 8.41 17 7 15.59 10.59 12 7 8.41 8.41 7 12 10.59 15.59 7 17 8.41 13.41 12 17 15.59z"/><path d="M0 0h24v24H0z" fill="none"/></svg>') !important;
-}
-
-.i-amphtml-story-warning-button {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 0 24 24" fill="#FFC107"><path d="M0 0h24v24H0z" fill="none"/><path d="M1 21h22L12 2 1 21zm12-3h-2v-2h2v2zm0-4h-2v-4h2v4z"/></svg>') !important;
-}
-
-.i-amphtml-story-success-button {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 0 24 24" fill="#0F9D58"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-2 15l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"/></svg>') !important;
-}
-
-amp-story[standalone] .i-amphtml-story-developer-log {
-  background: rgba(0, 0, 0, 0.85) !important;
-  bottom: 0 !important;
-  box-sizing: border-box !important;
-  color: #fff !important;
-  display: flex !important;
-  flex-direction: column !important;
-  font-family: 'Roboto' !important;
-  left: 0 !important;
-  max-height: 45% !important;
-  padding: 0 !important;
-  position: fixed !important;
-  right: 0 !important;
-  text-align: start !important;
-  z-index: 100002 !important;
-}
-
-.i-amphtml-story-developer-log-header {
-  align-items: center !important;
-  background: rgb(3,169,244, 0.85) !important;
-  display: flex !important;
-  flex-grow: 0 !important;
-  flex-shrink: 0 !important;
-  font-weight: bold !important;
-  justify-content: space-between !important;
-  padding: 12px 20px !important;
-  text-align: center !important;
-}
-
-.i-amphtml-story-developer-log-close {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg fill="#FFFFFF" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"/><path d="M0 0h24v24H0z" fill="none"/></svg>') !important;
-  flex-grow: 0 !important;
-  flex-shrink: 0 !important;
-}
-
-.i-amphtml-story-developer-log-context {
-  color: #000 !important;
-  font-family: 'Roboto Mono' !important;
-}
-
-.i-amphtml-story-developer-log-entries {
-  list-style-type: none !important;
-  margin: 0 !important;
-  overflow-x: hidden !important;
-  overflow-y: auto !important;
-  padding: 0 !important;
-}
-
-.i-amphtml-story-developer-log-entry {
-  align-items: center !important;
-  border-bottom: 1px solid rgba(255, 255, 255, 0.5) !important;
-  display: flex !important;
-  padding: 20px !important;
-}
-
-.i-amphtml-story-developer-log-entry::before {
-  background-position: center center !important;
-  background-repeat: no-repeat !important;
-  background-size: cover !important;
-  content: '';
-  display: inline-block !important;
-  flex-grow: 0 !important;
-  flex-shrink: 0 !important;
-  height: 32px !important;
-  margin-right: 20px !important;
-  width: 32px !important;
-}
-
-.i-amphtml-story-developer-log-entry-error::before {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 0 24 24" fill="#DB4437"><path d="M12 2C6.47 2 2 6.47 2 12s4.47 10 10 10 10-4.47 10-10S17.53 2 12 2zm5 13.59L15.59 17 12 13.41 8.41 17 7 15.59 10.59 12 7 8.41 8.41 7 12 10.59 15.59 7 17 8.41 13.41 12 17 15.59z"/><path d="M0 0h24v24H0z" fill="none"/></svg>') !important;
-}
-
-.i-amphtml-story-developer-log-entry-warning::before {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 0 24 24" fill="#FFC107"><path d="M0 0h24v24H0z" fill="none"/><path d="M1 21h22L12 2 1 21zm12-3h-2v-2h2v2zm0-4h-2v-4h2v4z"/></svg>') !important;
-}
-
-.i-amphtml-story-developer-log-entry-success::before {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 0 24 24" fill="#0F9D58"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-2 15l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"/></svg>') !important;
-}
-
 .i-amphtml-story-toast {
   position: absolute !important;
   bottom: 0 !important;
@@ -588,14 +474,14 @@ amp-story[standalone] .i-amphtml-story-developer-log {
 @keyframes toast {
   0% {
     transform: translateY(100px);
-    easing: cubic-bezier(0.0, 0.0, 0.2, 1);
+    easing: cubic-bezier(0, 0, 0.2, 1);
   }
   8% {
     transform: translateY(0);
   }
   92% {
     transform: translateY(0);
-    easing: cubic-bezier(0.4, 0.0, 1, 1);
+    easing: cubic-bezier(0.4, 0, 1, 1);
   }
   100% {
     transform: translateY(100px);
@@ -603,7 +489,7 @@ amp-story[standalone] .i-amphtml-story-developer-log {
 }
 
 .i-amphtml-story-copy-successful {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 0 24 24" fill="#ffffff"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-2 15l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"/></svg>') !important;
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="#fff"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2a10 10 0 1 0 0 20 10 10 0 0 0 0-20zm-2 15-5-5 1.4-1.4 3.6 3.6 7.6-7.6L19 8l-9 9z"/></svg>') !important;
   background-repeat: no-repeat !important;
   background-size: 16px 16px !important;
   padding-left: 24px !important;
@@ -628,8 +514,8 @@ amp-story .amp-video-eq,
   bottom: 12px !important;
 }
 
-[dir=rtl] amp-story .amp-video-eq,
-[dir=rtl] .i-amphtml-story-spinner {
+[dir='rtl'] amp-story .amp-video-eq,
+[dir='rtl'] .i-amphtml-story-spinner {
   left: 12px !important;
   right: auto !important;
 }
@@ -653,7 +539,9 @@ amp-story .amp-video-eq,
 }
 
 @keyframes container-rotate {
-  to { transform: rotate(360deg) }
+  to {
+    transform: rotate(360deg);
+  }
 }
 
 .i-amphtml-story-spinner-layer {
@@ -668,21 +556,37 @@ amp-story .amp-video-eq,
 .i-amphtml-story-spinner[active] .i-amphtml-story-spinner-layer {
   animation-name: fill-unfill-rotate !important;
   animation-duration: 4400ms !important;
-  animation-timing-function: cubic-bezier(0.4, 0.0, 0.2, 1) !important;
+  animation-timing-function: cubic-bezier(0.4, 0, 0.2, 1) !important;
   animation-iteration-count: infinite !important;
   opacity: 1 !important;
-  filter: drop-shadow(0px 1px 3px rgba(0,0,0,0.25)) !important;
+  filter: drop-shadow(0px 1px 3px rgba(0, 0, 0, 0.25)) !important;
 }
 
 @keyframes fill-unfill-rotate {
-  12.5% { transform: rotate(135deg) }
-  25%   { transform: rotate(270deg) }
-  37.5% { transform: rotate(405deg) }
-  50%   { transform: rotate(540deg) }
-  62.5% { transform: rotate(675deg) }
-  75%   { transform: rotate(810deg) }
-  87.5% { transform: rotate(945deg) }
-  to    { transform: rotate(1080deg) }
+  12.5% {
+    transform: rotate(135deg);
+  }
+  25% {
+    transform: rotate(270deg);
+  }
+  37.5% {
+    transform: rotate(405deg);
+  }
+  50% {
+    transform: rotate(540deg);
+  }
+  62.5% {
+    transform: rotate(675deg);
+  }
+  75% {
+    transform: rotate(810deg);
+  }
+  87.5% {
+    transform: rotate(945deg);
+  }
+  to {
+    transform: rotate(1080deg);
+  }
 }
 
 .i-amphtml-story-spinner-circle-clipper {
@@ -728,30 +632,45 @@ amp-story .amp-video-eq,
   transform: rotate(-129deg) !important;
 }
 
-.i-amphtml-story-spinner[active] .i-amphtml-story-spinner-circle-clipper::after {
+.i-amphtml-story-spinner[active]
+  .i-amphtml-story-spinner-circle-clipper::after {
   animation-duration: 1100ms !important;
-  animation-timing-function: cubic-bezier(0.4, 0.0, 0.2, 1) !important;
+  animation-timing-function: cubic-bezier(0.4, 0, 0.2, 1) !important;
   animation-iteration-count: infinite !important;
 }
 
-.i-amphtml-story-spinner[active] .i-amphtml-story-spinner-circle-clipper.left::after {
+.i-amphtml-story-spinner[active]
+  .i-amphtml-story-spinner-circle-clipper.left::after {
   animation-name: left-spin !important;
 }
 
-.i-amphtml-story-spinner[active] .i-amphtml-story-spinner-circle-clipper.right::after {
+.i-amphtml-story-spinner[active]
+  .i-amphtml-story-spinner-circle-clipper.right::after {
   animation-name: right-spin !important;
 }
 
 @keyframes left-spin {
-  0% { transform: rotate(130deg) }
-  50% { transform: rotate(-5deg) }
-  to { transform: rotate(130deg) }
+  0% {
+    transform: rotate(130deg);
+  }
+  50% {
+    transform: rotate(-5deg);
+  }
+  to {
+    transform: rotate(130deg);
+  }
 }
 
 @keyframes right-spin {
-  0% { transform: rotate(-130deg) }
-  50% { transform: rotate(5deg) }
-  to { transform: rotate(-130deg) }
+  0% {
+    transform: rotate(-130deg);
+  }
+  50% {
+    transform: rotate(5deg);
+  }
+  to {
+    transform: rotate(-130deg);
+  }
 }
 
 .i-amphtml-story-page-error,
@@ -765,33 +684,11 @@ amp-story .amp-video-eq,
   border: 0 !important;
   margin: 8px 0 0 8px !important; /* Making the click target 48px.*/
   padding: 0 !important;
-  animation: play-button-fly-in 0.4s cubic-bezier(0.4, 0.0, 0.2, 1) !important;
+  animation: play-button-fly-in 0.4s cubic-bezier(0.4, 0, 0.2, 1) !important;
   background-color: transparent !important;
   z-index: 10000 !important;
 }
 
-.i-amphtml-story-expanded-view-overflow {
-  top: 0 !important;
-  left: 0 !important;
-  width: 100% !important;
-  height: 100% !important;
-  background-color: rgba(0, 0, 0, 1) !important;
-  position: absolute !important;
-}
-
-.i-amphtml-expanded-view-close-button {
-  position: absolute !important;
-  top: 0 !important;
-  left: 0 !important;
-  margin: 12px !important;
-  height: 24px !important;
-  width: 24px !important;
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 0 36 36" fill="rgba(255, 255, 255, 0.8)"><path d="M28.5 9.62L26.38 7.5 18 15.88 9.62 7.5 7.5 9.62 15.88 18 7.5 26.38l2.12 2.12L18 20.12l8.38 8.38 2.12-2.12L20.12 18z"/><path d="M0 0h36v36H0z" fill="none"/></svg>') !important;
-  cursor: pointer !important;
-  text-align: center !important;
-  background-color: transparent !important; /* Resets default button background-color. */
-}
-
 @keyframes play-button-fly-in {
   0% {
     opacity: 0;
@@ -827,151 +724,13 @@ amp-story .amp-video-eq,
 }
 
 .i-amphtml-story-page-error-icon {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 0 24 24" fill="#FFF"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-2h2v2zm0-4h-2V7h2v6z"/></svg>') !important;
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="#FFF"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2a10 10 0 1 0 0 20 10 10 0 0 0 0-20zm1 15h-2v-2h2v2zm0-4h-2V7h2v6z"/></svg>') !important;
 }
 
 .i-amphtml-story-page-play-icon {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 0 48 48" fill="#FFF"><path d="M0 0h48v48H0z" fill="none"/><path d="M24 4C12.95 4 4 12.95 4 24s8.95 20 20 20 20-8.95 20-20S35.05 4 24 4zm-4 29V15l12 9-12 9z"/></svg>') !important;
-}
-
-.i-amphtml-story-page-attachment-active::after {
-  content: '' !important;
-  display: block !important;
-  left: 0 !important;
-  top: 0 !important;
-  bottom: 0 !important;
-  right: 0 !important;
-  position: absolute !important;
-  background: #000 !important;
-  z-index: 3 !important;
-  animation: i-amphtml-attachment-overlay-opacity 0.3s cubic-bezier(0.0, 0.0, 0.2, 1) forwards !important;
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 48 48" fill="#FFF"><path d="M0 0h48v48H0z" fill="none"/><path d="M24 4a20 20 0 1 0 0 40 20 20 0 0 0 0-40zm-4 29V15l12 9-12 9z"/></svg>') !important;
 }
 
-@keyframes i-amphtml-attachment-overlay-opacity {
-  0% {
-    opacity: 0;
-  }
-
-  100% {
-    opacity: 0.5;
-  }
-}
-
-.i-amphtml-story-interactive-component {
-  align-self: center;
-  height: auto !important;
+amp-bodymovin-animation, amp-bodymovin-animation * {
   pointer-events: none !important;
-  min-width: 14em !important; /* 14em = 224px = the width of a narrow phone (320px) - tap-safe margins (48px * 2) */
-  max-width: 25em !important;
-  font-size: calc(var(--story-page-vmin) * 3); /* override with ems for pixel perfect layout */
-  width: 100%;
-  /* Properties overrideable by user */
-  --interactive-accent-color: #005AF0;
-  --interactive-prompt-background: var(--interactive-accent-color);
-  --interactive-prompt-text-color: white;
-  --interactive-prompt-alignment: initial;
-  /* Shared properties by interactives (overrideable by themes) */
-  --i-amphtml-interactive-option-accent-color: var(--interactive-accent-color) !important;
-  --i-amphtml-interactive-option-background-color: white !important;
-  --i-amphtml-interactive-options-chip-background-color: var(--i-amphtml-interactive-option-background-color) !important;
-  --i-amphtml-interactive-option-text-color: #55595E !important;
-  --i-amphtml-interactive-theme-border: rgba(85, 89, 94, 0.2) !important;
-  --i-amphtml-interactive-theme-shading: rgba(85, 89, 94, 0.2) !important;
-  --i-amphtml-interactive-theme-shading-base: rgb(222, 222, 225) !important;
-  --i-amphtml-interactive-theme-shading-flash: rgba(85, 89, 94, 0.5) !important;
-  --i-amphtml-interactive-chip-radius: 2em !important;
-  --i-amphtml-interactive-chip-shadow: 0px 0px 0px transparent !important;
-  --i-amphtml-interactive-chip-shadow-inset: inset 0px 0px 0px transparent !important;
-  --i-amphtml-interactive-answer-choice-border: var(--interactive-accent-color) !important;
-  --i-amphtml-interactive-answer-choice-background: white !important;
-  --i-amphtml-interactive-prompt-text-size: 1.375em !important;
-  --i-amphtml-interactive-prompt-line-height: 1.3em !important;
-  --i-amphtml-interactive-strong-text-color: black !important;
-  --i-amphtml-interactive-animation-time: .3s !important;
-  --i-amphtml-interactive-ease-out-curve: cubic-bezier(.3, 0, 0, 1) !important;
-  --i-amphtml-interactive-animation-delay: 0s !important;
-  --i-amphtml-interactive-component-shadow: 0px 4px 12px rgba(60, 64, 67, 0.08), 0px 2px 4px rgba(60, 64, 67, 0.12);
-  --i-amphtml-interactive-prompt-clamp: 4 !important;
-  --i-amphtml-interactive-results-prompt-margin: 20px !important;
-  --i-amphtml-interactive-placeholder-background: rgba(32, 33, 36, 0.2) !important;
-  --i-amphtml-story-interactive-img-quiz-answer-filter: none;
-  --i-amphtml-interactive-img-border: 0 0 0 transparent !important;
-}
-
-.i-amphtml-story-interactive-component[theme="dark"] {
-  --i-amphtml-interactive-option-text-color: #A7ADB4 !important;
-  --i-amphtml-interactive-option-background-color: #202124 !important;
-  --i-amphtml-interactive-theme-border: rgba(167, 173, 180, 0.2) !important;
-  --i-amphtml-interactive-theme-shading: rgba(167, 173, 180, 0.2) !important;
-  --i-amphtml-interactive-theme-shading-base: rgb(60, 61, 63) !important;
-  --i-amphtml-interactive-theme-shading-flash: rgba(167, 173, 180, 0.5) !important;
-  --i-amphtml-interactive-strong-text-color: white !important;
-  --i-amphtml-interactive-placeholder-background: rgba(255, 255, 255, 0.2) !important;
-  --i-amphtml-story-interactive-img-quiz-answer-filter: invert(100%);
-}
-
-.i-amphtml-story-interactive-component[chip-style="shadow"] {
-  --i-amphtml-interactive-chip-shadow: 0px 2px 8px rgba(60, 60, 60, 0.2) !important;
-  --i-amphtml-interactive-chip-shadow-inset: inset 4px 4px 8px rgba(0, 0, 0, 0.2) !important;
-  --i-amphtml-interactive-theme-border: rgba(0, 0, 0, 0) !important;
-}
-
-.i-amphtml-story-interactive-component:not(amp-story-interactive-results)[chip-style="transparent"] {
-  --i-amphtml-interactive-options-chip-background-color: transparent !important;
-  --interactive-prompt-background: transparent !important;
-  --interactive-prompt-alignment: center;
-  --i-amphtml-interactive-chip-shadow: 0px 2px 8px rgba(60, 60, 60, 0.2) !important;
-  --i-amphtml-interactive-chip-shadow-inset: inset 4px 4px 8px rgba(0, 0, 0, 0.2) !important;
-  --i-amphtml-interactive-theme-border: rgba(0, 0, 0, 0) !important;
-  --i-amphtml-interactive-component-shadow: none !important;
-  --i-amphtml-interactive-img-border: 0 0 0 0.25em var(--i-amphtml-interactive-option-background-color) !important;
-}
-
-.i-amphtml-story-interactive-component[chip-style="shadow"][theme="dark"] {
-  --i-amphtml-interactive-chip-shadow: 0px 2px 8px 0px rgba(0, 0, 0, 0.6) !important;
-  --i-amphtml-interactive-chip-shadow-inset: inset 4px 4px 8px rgba(0, 0, 0, 0.4) !important;
-}
-
-.i-amphtml-story-interactive-component[prompt-size="large"] {
-  --i-amphtml-interactive-prompt-text-size: 1.75em !important;
-  --i-amphtml-interactive-prompt-clamp: 3 !important;
-}
-
-.i-amphtml-story-interactive-component[prompt-size="small"] {
-  --i-amphtml-interactive-prompt-text-size: 1.125em !important;
-}
-
-.i-amphtml-story-interactive-component:not([prompt-text]) {
-  --interactive-prompt-background: transparent !important;
-}
-
-amp-story-interactive-binary-poll.i-amphtml-story-interactive-component, amp-story-interactive-results.i-amphtml-story-interactive-component,
-amp-story-interactive-img-poll.i-amphtml-story-interactive-component, amp-story-interactive-img-quiz.i-amphtml-story-interactive-component,
-amp-story-interactive-results-detailed.i-amphtml-story-interactive-component {
-  max-width: 18em !important;
-}
-
-amp-story-interactive-img-poll.i-amphtml-story-interactive-component, amp-story-interactive-img-quiz.i-amphtml-story-interactive-component {
-  --interactive-prompt-alignment: center;
-}
-
-amp-story-interactive-binary-poll[theme="dark"], amp-story-interactive-poll[theme="dark"] {
-  --i-amphtml-interactive-option-accent-color: white !important;
-}
-
-amp-story-interactive-results:not([chip-style="transparent"]) {
-  --interactive-prompt-text-color: var(--i-amphtml-interactive-strong-text-color);
-}
-
-amp-story-interactive-results[chip-style="transparent"] {
-  --i-amphtml-interactive-option-text-color: black !important;
-  --i-amphtml-interactive-options-chip-background-color: transparent !important;
-  --interactive-prompt-background: transparent;
-  --i-amphtml-interactive-component-shadow: none !important;
-  --interactive-prompt-text-color: black;
-  --i-amphtml-interactive-results-prompt-margin: 0px !important;
-}
-amp-story-interactive-results[theme="dark"][chip-style="transparent"] {
-  --i-amphtml-interactive-option-text-color: white !important;
-  --interactive-prompt-text-color: white;
 }
diff --git a/extensions/amp-story/1.0/amp-story.js b/extensions/amp-story/1.0/amp-story.js
index 8162a1e4bc43..ccdff08c808e 100644
--- a/extensions/amp-story/1.0/amp-story.js
+++ b/extensions/amp-story/1.0/amp-story.js
@@ -8,55 +8,22 @@
  * </amp-story>
  * </code>
  */
-import './amp-story-cta-layer';
+
 import './amp-story-grid-layer';
 import './amp-story-page';
-import {
-  Action,
-  EmbeddedComponentState,
-  InteractiveComponentDef,
-  StateProperty,
-  UIType,
-  getStoreService,
-} from './amp-story-store-service';
-import {ActionTrust} from '#core/constants/action-constants';
-import {AdvancementConfig, TapNavigationDirection} from './page-advancement';
-import {
-  AdvancementMode,
-  StoryAnalyticsEvent,
-  getAnalyticsService,
-} from './story-analytics';
-import {AmpEvents} from '#core/constants/amp-events';
-import {AmpStoryAccess} from './amp-story-access';
-import {AmpStoryConsent} from './amp-story-consent';
-import {AmpStoryCtaLayer} from './amp-story-cta-layer';
-import {AmpStoryEmbeddedComponent} from './amp-story-embedded-component';
-import {AmpStoryGridLayer} from './amp-story-grid-layer';
-import {AmpStoryHint} from './amp-story-hint';
-import {AmpStoryPage, NavigationDirection, PageState} from './amp-story-page';
-import {AmpStoryPageAttachment} from './amp-story-page-attachment';
-import {AmpStoryRenderService} from './amp-story-render-service';
-import {AmpStoryViewerMessagingHandler} from './amp-story-viewer-messaging-handler';
-import {AnalyticsVariable, getVariableService} from './variable-service';
-import {BackgroundBlur} from './background-blur';
-import {CSS} from '../../../build/amp-story-1.0.css';
-import {CommonSignals} from '#core/constants/common-signals';
-import {EventType, dispatch} from './events';
-import {Gestures} from '../../../src/gesture';
+
+import {ActionTrust_Enum} from '#core/constants/action-constants';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
+import {CommonSignals_Enum} from '#core/constants/common-signals';
+import {Keys_Enum} from '#core/constants/key-codes';
+import {VisibilityState_Enum} from '#core/constants/visibility-state';
+import {Deferred} from '#core/data-structures/promise';
+import {isRTL, removeElement} from '#core/dom';
+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
+import {escapeCssSelectorIdent} from '#core/dom/css-selectors';
+import * as Preact from '#core/dom/jsx';
+import {Layout_Enum} from '#core/dom/layout';
 import {prefersReducedMotion} from '#core/dom/media-query-props';
-import {HistoryState, getHistoryState, setHistoryState} from './history';
-import {InfoDialog} from './amp-story-info-dialog';
-import {Keys} from '#core/constants/key-codes';
-import {Layout} from '#core/dom/layout';
-import {LiveStoryManager} from './live-story-manager';
-import {MediaPool, MediaType} from './media-pool';
-import {PaginationButtons} from './pagination-buttons';
-import {Services} from '#service';
-import {ShareMenu} from './amp-story-share-menu';
-import {SwipeXYRecognizer} from '../../../src/gesture-recognizers';
-import {SystemLayer} from './amp-story-system-layer';
-import {UnsupportedBrowserLayer} from './amp-story-unsupported-browser-layer';
-import {VisibilityState} from '#core/constants/visibility-state';
 import {
   childElement,
   childElementByTag,
@@ -67,50 +34,83 @@ import {
   scopedQuerySelector,
   scopedQuerySelectorAll,
 } from '#core/dom/query';
-import {computedStyle, setImportantStyles, toggle} from '#core/dom/style';
-import {createPseudoLocale} from '#service/localization/strings';
+import {
+  computedStyle,
+  getStyle,
+  px,
+  setImportantStyles,
+  toggle,
+} from '#core/dom/style';
+import {devError} from '#core/error';
+import {clamp} from '#core/math';
+import {isEsm, isSsrCss} from '#core/mode';
+import {findIndex, lastItem, toArray} from '#core/types/array';
 import {debounce} from '#core/types/function';
-import {dev, devAssert, user} from '#utils/log';
-import {dict, map} from '#core/types/object';
+import {map} from '#core/types/object';
+import {tryParseJson} from '#core/types/object/json';
 import {endsWith} from '#core/types/string';
-import {escapeCssSelectorIdent} from '#core/dom/css-selectors';
-import {findIndex, lastItem, toArray} from '#core/types/array';
-import {getConsentPolicyState} from '../../../src/consent';
-import {getDetail} from '#utils/event-helper';
-import {getLocalizationService} from './amp-story-localization-service';
-import {getMode, isModeDevelopment} from '../../../src/mode';
-import {getHistoryState as getWindowHistoryState} from '#core/window/history';
-import {isExperimentOn} from '#experiments';
-import {isRTL} from '#core/dom';
 import {parseQueryString} from '#core/types/string/url';
+import {getHistoryState as getWindowHistoryState} from '#core/window/history';
+
+import {getExperimentBranch, isExperimentOn} from '#experiments';
+import {StoryAdSegmentExp} from '#experiments/story-ad-progress-segment';
+
+import {Services} from '#service';
+import {calculateExtensionFileUrl} from '#service/extension-script';
+
+import {getDetail} from '#utils/event-helper';
+import {dev, devAssert, user} from '#utils/log';
+
+import {AmpStoryConsent} from './amp-story-consent';
+import {AmpStoryEmbeddedComponent} from './amp-story-embedded-component';
+import {AmpStoryGridLayer} from './amp-story-grid-layer';
+import {AmpStoryHint} from './amp-story-hint';
+import {InfoDialog} from './amp-story-info-dialog';
+import {
+  getLocalizationService,
+  getSupportedLanguageCode,
+} from './amp-story-localization-service';
+import {AmpStoryPage, NavigationDirection, PageState} from './amp-story-page';
+import {AmpStoryShare} from './amp-story-share';
+import {
+  Action,
+  EmbeddedComponentState,
+  InteractiveComponentDef,
+  StateProperty,
+  SubscriptionsState,
+  UIType_Enum,
+  getStoreService,
+} from './amp-story-store-service';
+import {SystemLayer} from './amp-story-system-layer';
+import {renderUnsupportedBrowserLayer} from './amp-story-unsupported-browser-layer';
+import {AmpStoryViewerMessagingHandler} from './amp-story-viewer-messaging-handler';
+import {upgradeBackgroundAudio} from './audio';
+import {BackgroundBlur} from './background-blur';
+import {isPreviewMode} from './embed-mode';
+import {EventType, dispatch} from './events';
+import {HistoryState, getHistoryState, setHistoryState} from './history';
+import {LiveStoryManager} from './live-story-manager';
+import {MediaPool, MediaType_Enum} from './media-pool';
+import {AdvancementConfig, TapNavigationDirection} from './page-advancement';
+import {PaginationButtons} from './pagination-buttons';
+import {
+  AdvancementMode,
+  StoryAnalyticsEvent,
+  getAnalyticsService,
+} from './story-analytics';
 import {
+  isTransformed,
   removeAttributeInMutate,
   setAttributeInMutate,
   shouldShowStoryUrlInfo,
 } from './utils';
-import {upgradeBackgroundAudio} from './audio';
-import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
-import LocalizedStringsAr from './_locales/ar.json' assert {type: 'json'}; // lgtm[js/syntax-error]
-import LocalizedStringsDe from './_locales/de.json' assert {type: 'json'}; // lgtm[js/syntax-error]
-import LocalizedStringsEn from './_locales/en.json' assert {type: 'json'}; // lgtm[js/syntax-error]
-import LocalizedStringsEnGb from './_locales/en-GB.json' assert {type: 'json'}; // lgtm[js/syntax-error]
-import LocalizedStringsEs from './_locales/es.json' assert {type: 'json'}; // lgtm[js/syntax-error]
-import LocalizedStringsEs419 from './_locales/es-419.json' assert {type: 'json'}; // lgtm[js/syntax-error]
-import LocalizedStringsFr from './_locales/fr.json' assert {type: 'json'}; // lgtm[js/syntax-error]
-import LocalizedStringsHi from './_locales/hi.json' assert {type: 'json'}; // lgtm[js/syntax-error]
-import LocalizedStringsId from './_locales/id.json' assert {type: 'json'}; // lgtm[js/syntax-error]
-import LocalizedStringsIt from './_locales/it.json' assert {type: 'json'}; // lgtm[js/syntax-error]
-import LocalizedStringsJa from './_locales/ja.json' assert {type: 'json'}; // lgtm[js/syntax-error]
-import LocalizedStringsKo from './_locales/ko.json' assert {type: 'json'}; // lgtm[js/syntax-error]
-import LocalizedStringsNl from './_locales/nl.json' assert {type: 'json'}; // lgtm[js/syntax-error]
-import LocalizedStringsNo from './_locales/no.json' assert {type: 'json'}; // lgtm[js/syntax-error]
-import LocalizedStringsPtBr from './_locales/pt-BR.json' assert {type: 'json'}; // lgtm[js/syntax-error]
-import LocalizedStringsPtPt from './_locales/pt-PT.json' assert {type: 'json'}; // lgtm[js/syntax-error]
-import LocalizedStringsRu from './_locales/ru.json' assert {type: 'json'}; // lgtm[js/syntax-error]
-import LocalizedStringsTr from './_locales/tr.json' assert {type: 'json'}; // lgtm[js/syntax-error]
-import LocalizedStringsVi from './_locales/vi.json' assert {type: 'json'}; // lgtm[js/syntax-error]
-import LocalizedStringsZhCn from './_locales/zh-CN.json' assert {type: 'json'}; // lgtm[js/syntax-error]
-import LocalizedStringsZhTw from './_locales/zh-TW.json' assert {type: 'json'}; // lgtm[js/syntax-error]
+import {AnalyticsVariable, getVariableService} from './variable-service';
+
+import {CSS} from '../../../build/amp-story-1.0.css';
+import {getConsentPolicyState} from '../../../src/consent';
+import {Gestures} from '../../../src/gesture';
+import {SwipeXYRecognizer} from '../../../src/gesture-recognizers';
+import {getMode, isModeDevelopment} from '../../../src/mode';
 
 /** @private @const {number} */
 const DESKTOP_WIDTH_THRESHOLD = 1024;
@@ -122,11 +122,23 @@ const DESKTOP_HEIGHT_THRESHOLD = 550;
  * NOTE: If udpated here, update in amp-story-player-impl.js
  * @private @const {string}
  */
-const DESKTOP_ONE_PANEL_ASPECT_RATIO_THRESHOLD = '3 / 4';
+const DESKTOP_ONE_PANEL_ASPECT_RATIO_THRESHOLD = '31 / 40';
 
 /** @private @const {number} */
 const MIN_SWIPE_FOR_HINT_OVERLAY_PX = 50;
 
+/**
+ * Minimum custom aspect ratio for desktop one panel, i.e. 1:2.
+ * @private @const {number}
+ * */
+const MIN_CUSTOM_DESKTOP_ONE_PANEL_ASPECT_RATIO = 0.5;
+
+/**
+ * Maximum custom aspect ratio for desktop one panel, i.e. 3:4.
+ * @private @const {number}
+ * */
+const MAX_CUSTOM_DESKTOP_ONE_PANEL_ASPECT_RATIO = 0.75;
+
 /** @enum {string} */
 const Attributes = {
   AD_SHOWING: 'ad-showing',
@@ -165,12 +177,18 @@ const MINIMUM_AD_MEDIA_ELEMENTS = 2;
  */
 const STORY_LOADED_CLASS_NAME = 'i-amphtml-story-loaded';
 
-/** @const {!Object<string, number>} */
+/** @const {!{[key: string]: number}} */
 const MAX_MEDIA_ELEMENT_COUNTS = {
-  [MediaType.AUDIO]: 4,
-  [MediaType.VIDEO]: 8,
+  [MediaType_Enum.AUDIO]: 4,
+  [MediaType_Enum.VIDEO]: 8,
 };
 
+/**
+ * The number of milliseconds to wait before showing the paywall on paywall page.
+ * @const {number}
+ */
+export const SUBSCRIPTIONS_DELAY_DURATION = 500;
+
 /** @type {string} */
 const TAG = 'amp-story';
 
@@ -181,10 +199,28 @@ const TAG = 'amp-story';
 const DEFAULT_THEME_COLOR = '#202125';
 
 /**
+ * The default number of story pages that should be shown in preview mode
+ * before the preview is considered to be finished.
+ * @const {number}
+ */
+const DEFAULT_MIN_PAGES_TO_PREVIEW = 1;
+
+/**
+ * The default percentage of the total number of story pages that should be
+ * shown in preview mode before the preview is considered to be finished.
+ * @const {number}
+ */
+const DEFAULT_PCT_PAGES_TO_PREVIEW = 30;
+
+/** The targets that should not navigate when pressing keys.
+ * @const {string} */
+const IGNORE_KEYDOWN_EVENT_TARGET = 'amp-story-interactive-slider';
+
+/*
  * @implements {./media-pool.MediaPoolRoot}
  */
 export class AmpStory extends AMP.BaseElement {
-  /** @override @nocollapse */
+  /** @override  */
   static prerenderAllowed() {
     return true;
   }
@@ -211,18 +247,12 @@ export class AmpStory extends AMP.BaseElement {
     /** @const @private {!../../../src/service/vsync-impl.Vsync} */
     this.vsync_ = this.getVsync();
 
-    /** @private @const {!ShareMenu} Preloads and prerenders the share menu. */
-    this.shareMenu_ = new ShareMenu(this.win, this.element);
-
     /** @private @const {!SystemLayer} */
     this.systemLayer_ = new SystemLayer(this.win, this.element);
 
     /** Instantiate in case there are embedded components. */
     new AmpStoryEmbeddedComponent(this.win, this.element);
 
-    /** @private @const {!UnsupportedBrowserLayer} */
-    this.unsupportedBrowserLayer_ = new UnsupportedBrowserLayer(this.win);
-
     /** @private {!Array<!./amp-story-page.AmpStoryPage>} */
     this.pages_ = [];
 
@@ -260,12 +290,6 @@ export class AmpStory extends AMP.BaseElement {
     /** @private {!MediaPool} */
     this.mediaPool_ = MediaPool.for(this);
 
-    /** @private {boolean} */
-    this.areAccessAuthorizationsCompleted_ = false;
-
-    /** @private */
-    this.navigateToPageAfterAccess_ = null;
-
     /** @private @const {!../../../src/service/timer-impl.Timer} */
     this.timer_ = Services.timerFor(this.win);
 
@@ -291,48 +315,59 @@ export class AmpStory extends AMP.BaseElement {
     /** @private {?BackgroundBlur} */
     this.backgroundBlur_ = null;
 
-    /** @private {?UIType} */
+    /** @private {?UIType_Enum} */
     this.uiState_ = null;
 
     /** @private {boolean} whether the styles were rewritten */
     this.didRewriteStyles_ = false;
+
+    /**
+     * @private {?string} the page id to navigate to after receiving a granted state from amp-subscriptions
+     */
+    this.pageAfterSubscriptionsGranted_ = null;
+
+    /** @private {!Deferred} a promise that is resolved once the subscription state is received */
+    this.subscriptionsStateDeferred_ = new Deferred();
+
+    /** @private {?number} the timeout to show subscriptions dialog after delay */
+    this.showSubscriptionsUITimeout_ = null;
+
+    /** @private {?number} the index of the page where the paywall would be triggered. */
+    this.subscriptionsPageIndex_ = -1;
+
+    /** @private {!Deferred} a promise that is resolved once the subscriptions page index is extracted from amp-story-subscriptions. */
+    this.subscriptionsPageIndexDeferred_ = new Deferred();
+
+    /**
+     * @private {?number} the index of the last page that should be shown in
+     *     preview mode.
+     */
+    this.indexOfLastPageToPreview_ = null;
+
+    /** @private {!Deferred} a promise that is resolved once the active page is assigned */
+    this.activePageDeferred_ = new Deferred();
   }
 
   /** @override */
   buildCallback() {
     this.viewer_ = Services.viewerForDoc(this.element);
 
+    const needsDvhPolyfill =
+      !this.win.CSS?.supports?.('height: 1dvh') &&
+      !getStyle(this.win.document.documentElement, '--story-dvh');
+
+    if (needsDvhPolyfill) {
+      this.polyfillDvh_(this.getViewport().getSize());
+      this.getViewport().onResize((size) => this.polyfillDvh_(size));
+    }
+
     this.viewerMessagingHandler_ = this.viewer_.isEmbedded()
       ? new AmpStoryViewerMessagingHandler(this.win, this.viewer_)
       : null;
 
-    getLocalizationService(this.element)
-      .registerLocalizedStringBundle('default', LocalizedStringsEn)
-      .registerLocalizedStringBundle('ar', LocalizedStringsAr)
-      .registerLocalizedStringBundle('de', LocalizedStringsDe)
-      .registerLocalizedStringBundle('en', LocalizedStringsEn)
-      .registerLocalizedStringBundle('en-GB', LocalizedStringsEnGb)
-      .registerLocalizedStringBundle('es', LocalizedStringsEs)
-      .registerLocalizedStringBundle('es-419', LocalizedStringsEs419)
-      .registerLocalizedStringBundle('fr', LocalizedStringsFr)
-      .registerLocalizedStringBundle('hi', LocalizedStringsHi)
-      .registerLocalizedStringBundle('id', LocalizedStringsId)
-      .registerLocalizedStringBundle('it', LocalizedStringsIt)
-      .registerLocalizedStringBundle('ja', LocalizedStringsJa)
-      .registerLocalizedStringBundle('ko', LocalizedStringsKo)
-      .registerLocalizedStringBundle('nl', LocalizedStringsNl)
-      .registerLocalizedStringBundle('no', LocalizedStringsNo)
-      .registerLocalizedStringBundle('pt-PT', LocalizedStringsPtPt)
-      .registerLocalizedStringBundle('pt-BR', LocalizedStringsPtBr)
-      .registerLocalizedStringBundle('ru', LocalizedStringsRu)
-      .registerLocalizedStringBundle('tr', LocalizedStringsTr)
-      .registerLocalizedStringBundle('vi', LocalizedStringsVi)
-      .registerLocalizedStringBundle('zh-CN', LocalizedStringsZhCn)
-      .registerLocalizedStringBundle('zh-TW', LocalizedStringsZhTw)
-      .registerLocalizedStringBundle(
-        'en-xa',
-        createPseudoLocale(LocalizedStringsEn, (s) => `[${s} one two]`)
-      );
+    this.indexOfLastPageToPreview_ = this.calculateIndexOfLastPageToPreview_();
+
+    this.installLocalizationStrings_();
 
     if (this.isStandalone_()) {
       this.initializeStandaloneStory_();
@@ -354,7 +389,6 @@ export class AmpStory extends AMP.BaseElement {
     }
 
     this.initializeListeners_();
-    this.initializeListenersForDev_();
     this.initializePageIds_();
     this.initializeStoryPlayer_();
 
@@ -395,21 +429,37 @@ export class AmpStory extends AMP.BaseElement {
         this.switchTo_(args['id'], NavigationDirection.NEXT);
       });
     }
-    if (isExperimentOn(this.win, 'story-load-first-page-only')) {
-      Services.performanceFor(this.win).addEnabledExperiment(
-        'story-load-first-page-only'
-      );
-    }
+    const performanceService = Services.performanceFor(this.win);
     if (
       isExperimentOn(this.win, 'story-disable-animations-first-page') ||
-      prefersReducedMotion(this.win)
+      isPreviewMode(this.win) ||
+      prefersReducedMotion(this.win) ||
+      isTransformed(this.getAmpDoc())
     ) {
-      Services.performanceFor(this.win).addEnabledExperiment(
+      performanceService.addEnabledExperiment(
         'story-disable-animations-first-page'
       );
     }
+    const docElem = this.getAmpDoc().getRootNode().documentElement;
+    // [i-amphtml-version] marks that the style was inlined in the doc
+    // server-side.
+    const inlinedAmpStoryCssExists = docElem.querySelector(
+      'style[amp-extension="amp-story"][i-amphtml-version]'
+    );
+    // [amp-extension=amp-story] on a stylesheet link marks that the style
+    // was linked on the doc server-side.
+    const linkAmpStoryCssExists = docElem.querySelector(
+      'link[amp-extension="amp-story"][rel=stylesheet]'
+    );
+
+    if (inlinedAmpStoryCssExists) {
+      performanceService.addEnabledExperiment('story-inline-css');
+    } else if (linkAmpStoryCssExists) {
+      performanceService.addEnabledExperiment('story-link-css');
+    }
+
     if (isExperimentOn(this.win, 'story-load-inactive-outside-viewport')) {
-      Services.performanceFor(this.win).addEnabledExperiment(
+      performanceService.addEnabledExperiment(
         'story-load-inactive-outside-viewport'
       );
       this.element.classList.add(
@@ -417,32 +467,68 @@ export class AmpStory extends AMP.BaseElement {
       );
     }
 
+    this.maybeApplyDesktopAspectRatioAttribute_();
+
     if (this.maybeLoadStoryDevTools_()) {
       return;
     }
   }
 
+  /**
+   * Grab the desktop-aspect-ratio attribute, clamp the value
+   * between 1/2 and 3/4 aspect ratios, and apply it to the root element.
+   * @private
+   */
+  maybeApplyDesktopAspectRatioAttribute_() {
+    if (
+      this.isLandscapeSupported_() ||
+      !this.element.hasAttribute('desktop-aspect-ratio')
+    ) {
+      return;
+    }
+
+    const splittedRatio = this.element
+      .getAttribute('desktop-aspect-ratio')
+      .split(':');
+    if (splittedRatio[1] == 0) {
+      return;
+    }
+
+    const desktopAspectRatio = clamp(
+      splittedRatio[0] / splittedRatio[1],
+      MIN_CUSTOM_DESKTOP_ONE_PANEL_ASPECT_RATIO,
+      MAX_CUSTOM_DESKTOP_ONE_PANEL_ASPECT_RATIO
+    );
+    setImportantStyles(document.querySelector(':root'), {
+      '--i-amphtml-story-desktop-one-panel-ratio': desktopAspectRatio,
+    });
+    this.storeService_.dispatch(
+      Action.SET_DESKTOP_ASPECT_RATIO,
+      desktopAspectRatio
+    );
+  }
+
   /**
    * Pauses the whole story on viewer visibilityState updates, or tab visibility
    * updates.
    * @private
    */
   pause_() {
-    // Preserve if previously set. This method can be called several times when
-    // setting the visibilitystate to paused and then inactive.
-    if (this.pausedStateToRestore_ === null) {
-      this.pausedStateToRestore_ = !!this.storeService_.get(
-        StateProperty.PAUSED_STATE
-      );
-    }
-    this.storeService_.dispatch(Action.TOGGLE_PAUSED, true);
+    this.setPausedStateToRestore_();
     if (!this.storeService_.get(StateProperty.MUTED_STATE)) {
       this.pauseBackgroundAudio_();
     }
     // If viewer has navigated to the next document, reset the active page.
-    if (this.getAmpDoc().getVisibilityState() === VisibilityState.INACTIVE) {
-      this.activePage_.setState(PageState.NOT_ACTIVE);
-      this.activePage_.element.setAttribute('active', '');
+    if (
+      this.getAmpDoc().getVisibilityState() === VisibilityState_Enum.INACTIVE
+    ) {
+      const resetActivePage = () => {
+        this.activePage_.setState(PageState.NOT_ACTIVE);
+        this.activePage_.element.setAttribute('active', '');
+      };
+      this.activePage_
+        ? resetActivePage()
+        : this.activePageDeferred_.promise.then(() => resetActivePage());
     }
   }
 
@@ -452,14 +538,31 @@ export class AmpStory extends AMP.BaseElement {
    * @private
    */
   resume_() {
+    this.restorePausedState_();
+    if (!this.storeService_.get(StateProperty.MUTED_STATE)) {
+      this.playBackgroundAudio_();
+    }
+  }
+
+  /** @private */
+  setPausedStateToRestore_() {
+    // Preserve if previously set. This method can be called several times when
+    // setting the visibilitystate to paused and then inactive.
+    if (this.pausedStateToRestore_ === null) {
+      this.pausedStateToRestore_ = !!this.storeService_.get(
+        StateProperty.PAUSED_STATE
+      );
+    }
+    this.storeService_.dispatch(Action.TOGGLE_PAUSED, true);
+  }
+
+  /** @private */
+  restorePausedState_() {
     this.storeService_.dispatch(
       Action.TOGGLE_PAUSED,
       this.pausedStateToRestore_
     );
     this.pausedStateToRestore_ = null;
-    if (!this.storeService_.get(StateProperty.MUTED_STATE)) {
-      this.playBackgroundAudio_();
-    }
   }
 
   /**
@@ -470,7 +573,7 @@ export class AmpStory extends AMP.BaseElement {
     // Lock body to prevent overflow.
     this.lockBody_();
     // Standalone CSS affects sizing of the entire page.
-    this.onResize();
+    this.onResizeDebounced();
   }
 
   /**
@@ -541,12 +644,13 @@ export class AmpStory extends AMP.BaseElement {
   /**
    * Builds the system layer DOM.
    * @param {string} initialPageId
+   * @param {boolean} isVisible
    * @private
    */
-  buildSystemLayer_(initialPageId) {
+  buildSystemLayer_(initialPageId, isVisible) {
     this.updateAudioIcon_();
     this.updatePausedIcon_();
-    this.element.appendChild(this.systemLayer_.build(initialPageId));
+    this.element.appendChild(this.systemLayer_.build(initialPageId, isVisible));
   }
 
   /** @private */
@@ -585,13 +689,6 @@ export class AmpStory extends AMP.BaseElement {
       false /** callToInitialize */
     );
 
-    this.storeService_.subscribe(
-      StateProperty.SUPPORTED_BROWSER_STATE,
-      (isBrowserSupported) => {
-        this.onSupportedBrowserStateUpdate_(isBrowserSupported);
-      }
-    );
-
     this.storeService_.subscribe(StateProperty.ADVANCEMENT_MODE, (mode) => {
       this.variableService_.onVariableUpdate(
         AnalyticsVariable.STORY_ADVANCEMENT_MODE,
@@ -608,6 +705,14 @@ export class AmpStory extends AMP.BaseElement {
     );
 
     this.element.addEventListener(EventType.SWITCH_PAGE, (e) => {
+      // SWITCH_PAGE is fired with each page advancement in preview mode.
+      // Before advancing beyond the final page of a preview, we send the
+      // viewer a message that the preview has finished. In the SERP, this
+      // message can be used to advance to a subsequent story's preview.
+      if (this.getAmpDoc().isPreview()) {
+        this.sendMessageIfPreviewFinished_();
+      }
+
       this.switchTo_(getDetail(e)['targetPageId'], getDetail(e)['direction']);
       this.ampStoryHint_.hideAllNavigationHint();
     });
@@ -622,7 +727,15 @@ export class AmpStory extends AMP.BaseElement {
         return;
       }
 
-      if (!this.activePage_.isAd()) {
+      const storyAdSegmentBranch = getExperimentBranch(
+        this.win,
+        StoryAdSegmentExp.ID
+      );
+      if (
+        !this.activePage_.isAd() ||
+        (storyAdSegmentBranch &&
+          storyAdSegmentBranch != StoryAdSegmentExp.CONTROL)
+      ) {
         this.systemLayer_.updateProgress(pageId, progress);
       }
     });
@@ -680,6 +793,40 @@ export class AmpStory extends AMP.BaseElement {
       true /** callToInitialize */
     );
 
+    this.storeService_.subscribe(
+      StateProperty.SUBSCRIPTIONS_PAGE_INDEX,
+      (subscriptionsPageIndex) => {
+        if (subscriptionsPageIndex !== -1) {
+          this.subscriptionsPageIndexDeferred_.resolve();
+          this.subscriptionsPageIndex_ = subscriptionsPageIndex;
+        }
+      },
+      true
+    );
+
+    this.storeService_.subscribe(
+      StateProperty.SUBSCRIPTIONS_STATE,
+      (subscriptionsState) => {
+        if (subscriptionsState === SubscriptionsState.PENDING) {
+          return;
+        }
+
+        this.subscriptionsStateDeferred_.resolve();
+        if (subscriptionsState === SubscriptionsState.GRANTED) {
+          this.hideSubscriptionsDialog_();
+        }
+      }
+    );
+
+    this.storeService_.subscribe(
+      StateProperty.SUBSCRIPTIONS_DIALOG_UI_STATE,
+      (dialogState) => {
+        if (!dialogState) {
+          this.onHideSubscriptionsDialog_();
+        }
+      }
+    );
+
     this.win.document.addEventListener(
       'keydown',
       (e) => {
@@ -690,7 +837,7 @@ export class AmpStory extends AMP.BaseElement {
 
     this.win.document.addEventListener('contextmenu', (e) => {
       const uiState = this.storeService_.get(StateProperty.UI_STATE);
-      if (uiState === UIType.MOBILE) {
+      if (uiState === UIType_Enum.MOBILE) {
         if (!this.allowContextMenuOnMobile_(e.target)) {
           e.preventDefault();
         }
@@ -731,7 +878,9 @@ export class AmpStory extends AMP.BaseElement {
       attributeFilter: ['class'],
     });
 
-    this.getViewport().onResize(debounce(this.win, () => this.onResize(), 300));
+    this.getViewport().onResize(
+      debounce(this.win, () => this.onResizeDebounced(), 300)
+    );
     this.installGestureRecognizers_();
 
     // TODO(gmajoulet): migrate this to amp-story-viewer-messaging-handler once
@@ -743,9 +892,14 @@ export class AmpStory extends AMP.BaseElement {
     if (this.viewerMessagingHandler_) {
       this.viewerMessagingHandler_.startListening();
     }
+
+    new AmpStoryShare(this.win, this.element);
   }
 
-  /** @private */
+  /**
+   * @param {MutationRecord} mutations
+   * @private
+   */
   onBodyElMutation_(mutations) {
     mutations.forEach((mutation) => {
       const bodyEl = dev().assertElement(mutation.target);
@@ -780,7 +934,6 @@ export class AmpStory extends AMP.BaseElement {
       // TODO(enriqe): Move to a separate file if this keeps growing.
       if (
         embedComponent.state !== EmbeddedComponentState.HIDDEN ||
-        this.storeService_.get(StateProperty.ACCESS_STATE) ||
         !this.storeService_.get(StateProperty.SYSTEM_UI_IS_VISIBLE_STATE) ||
         !this.storeService_.get(StateProperty.CAN_SHOW_NAVIGATION_OVERLAY_HINT)
       ) {
@@ -814,17 +967,6 @@ export class AmpStory extends AMP.BaseElement {
     return sideSwipe || upSwipe;
   }
 
-  /** @private */
-  initializeListenersForDev_() {
-    if (!getMode().development) {
-      return;
-    }
-
-    this.element.addEventListener(EventType.DEV_LOG_ENTRIES_AVAILABLE, (e) => {
-      this.systemLayer_.logAll(/** @type {?} */ (getDetail(e)));
-    });
-  }
-
   /** @private */
   lockBody_() {
     const {document} = this.win;
@@ -874,8 +1016,7 @@ export class AmpStory extends AMP.BaseElement {
   /** @override */
   layoutCallback() {
     if (!AmpStory.isBrowserSupported(this.win) && !this.platform_.isBot()) {
-      this.storeService_.dispatch(Action.TOGGLE_SUPPORTED_BROWSER, false);
-      return Promise.resolve();
+      return this.displayUnsupportedBrowser_();
     }
     return this.layoutStory_();
   }
@@ -889,16 +1030,26 @@ export class AmpStory extends AMP.BaseElement {
   layoutStory_() {
     const initialPageId = this.getInitialPageId_();
 
-    this.buildSystemLayer_(initialPageId);
+    const shouldShowSystemLayer =
+      this.viewer_.getParam('hideProgressBar') !== '1';
+    if (!shouldShowSystemLayer) {
+      // The default value of `SYSTEM_UI_IS_VISIBLE_STATE` is `true`. We set it
+      // to `false` here solely to ensure that a subsequent firing of the
+      // `TOGGLE_SYSTEM_UI_IS_VISIBLE` action with a `true` value registers as
+      // a change in state instead of being a no-op.
+      this.storeService_.dispatch(Action.TOGGLE_SYSTEM_UI_IS_VISIBLE, false);
+    }
+    this.buildSystemLayer_(initialPageId, shouldShowSystemLayer);
+
     this.setThemeColor_();
 
     const storyLayoutPromise = Promise.all([
-      this.getAmpDoc().whenFirstVisible(), // Pauses execution during prerender.
       this.initializePages_(),
+      // Pauses execution during prerender.
+      this.getAmpDoc().whenFirstPreviewedOrVisible(),
     ])
       .then(() => {
         this.handleConsentExtension_();
-        this.initializeStoryAccess_();
 
         this.pages_.forEach((page, index) => {
           page.setState(PageState.NOT_ACTIVE);
@@ -911,11 +1062,27 @@ export class AmpStory extends AMP.BaseElement {
           new PaginationButtons(this);
         }
       })
-      .then(() =>
+      .then(() => {
+        // Enable paywall if required element found in DOM.
+        if (
+          isExperimentOn(this.win, 'amp-story-subscriptions') &&
+          this.element.querySelector('amp-story-subscriptions') !== null &&
+          this.storeService_.get(StateProperty.SUBSCRIPTIONS_STATE) ===
+            SubscriptionsState.DISABLED
+        ) {
+          this.storeService_.dispatch(
+            Action.TOGGLE_SUBSCRIPTIONS_STATE,
+            SubscriptionsState.PENDING
+          );
+        }
+
         // We need to call this.getInitialPageId_() again because the initial
         // page could've changed between the start of layoutStory_ and here.
-        this.switchTo_(this.getInitialPageId_(), NavigationDirection.NEXT)
-      )
+        return this.switchTo_(
+          this.getInitialPageId_(),
+          NavigationDirection.NEXT
+        );
+      })
       .then(() => {
         const shouldReOpenAttachmentForPageId = getHistoryState(
           this.win,
@@ -923,19 +1090,34 @@ export class AmpStory extends AMP.BaseElement {
         );
 
         if (shouldReOpenAttachmentForPageId === this.activePage_.element.id) {
-          this.activePage_.openAttachment(false /** shouldAnimate */);
-        }
+          const attachmentEl = this.activePage_.element.querySelector(
+            'amp-story-page-attachment, amp-story-page-outlink'
+          );
+
+          if (attachmentEl) {
+            whenUpgradedToCustomElement(attachmentEl)
+              .then(() => attachmentEl.getImpl())
+              .then((attachmentImpl) =>
+                attachmentImpl.open(false /** shouldAnimate */)
+              );
+          }
 
-        // Preloads and prerenders the share menu.
-        this.shareMenu_.build();
+          const shoppingData = getHistoryState(
+            this.win,
+            HistoryState.SHOPPING_DATA
+          );
 
-        const infoDialog = shouldShowStoryUrlInfo(
-          devAssert(this.viewer_),
-          this.storeService_
-        )
-          ? new InfoDialog(this.win, this.element)
-          : null;
-        if (infoDialog) {
+          if (shoppingData) {
+            this.storeService_.dispatch(Action.ADD_SHOPPING_DATA, {
+              'activeProductData': shoppingData,
+            });
+          }
+        }
+
+        if (
+          shouldShowStoryUrlInfo(devAssert(this.viewer_), this.storeService_)
+        ) {
+          const infoDialog = new InfoDialog(this.win, this.element);
           infoDialog.build();
         }
       });
@@ -978,7 +1160,7 @@ export class AmpStory extends AMP.BaseElement {
         {tagOrTarget: 'AMP-LIVE-LIST', method: 'update'},
       ]);
 
-      this.element.addEventListener(AmpEvents.DOM_UPDATE, () => {
+      this.element.addEventListener(AmpEvents_Enum.DOM_UPDATE, () => {
         this.liveStoryManager_.update();
         this.initializePages_().then(() => this.preloadPagesByDistance_());
       });
@@ -1037,7 +1219,7 @@ export class AmpStory extends AMP.BaseElement {
     );
     const storyLoadPromise = whenUpgradedToCustomElement(initialPageEl).then(
       () => {
-        return initialPageEl.signals().whenSignal(CommonSignals.LOAD_END);
+        return initialPageEl.signals().whenSignal(CommonSignals_Enum.LOAD_END);
       }
     );
 
@@ -1056,11 +1238,11 @@ export class AmpStory extends AMP.BaseElement {
       {bubbles: true}
     );
     this.viewerMessagingHandler_ &&
-      this.viewerMessagingHandler_.send('storyContentLoaded', dict({}));
+      this.viewerMessagingHandler_.send('storyContentLoaded', {});
     this.analyticsService_.triggerEvent(
       StoryAnalyticsEvent.STORY_CONTENT_LOADED
     );
-    this.signals().signal(CommonSignals.INI_LOAD);
+    this.signals().signal(CommonSignals_Enum.INI_LOAD);
     this.mutateElement(() => {
       this.element.classList.add(STORY_LOADED_CLASS_NAME);
     });
@@ -1122,69 +1304,15 @@ export class AmpStory extends AMP.BaseElement {
     toRemoveChildren.forEach((el) => consentEl.removeChild(el));
   }
 
-  /**
-   * @private
-   */
-  initializeStoryAccess_() {
-    Services.accessServiceForDocOrNull(this.element).then((accessService) => {
-      if (!accessService) {
-        return;
-      }
-
-      this.areAccessAuthorizationsCompleted_ =
-        accessService.areFirstAuthorizationsCompleted();
-      accessService.onApplyAuthorizations(() =>
-        this.onAccessApplyAuthorizations_()
-      );
-
-      const firstPage = this.pages_[0].element;
-
-      // First amp-story-page can't be paywall protected.
-      // Removes the access attributes, and throws an error during development.
-      if (
-        firstPage.hasAttribute('amp-access') ||
-        firstPage.hasAttribute('amp-access-hide')
-      ) {
-        firstPage.removeAttribute('amp-access');
-        firstPage.removeAttribute('amp-access-hide');
-        user().error(
-          TAG,
-          'First amp-story-page cannot have amp-access ' +
-            'or amp-access-hide attributes'
-        );
-      }
-    });
+  /** @override */
+  isLayoutSupported(layout) {
+    return layout == Layout_Enum.CONTAINER;
   }
 
   /**
-   * On amp-access document reauthorization, maybe hide the access UI, and maybe
-   * perform navigation.
+   * @return {!Promise}
    * @private
    */
-  onAccessApplyAuthorizations_() {
-    this.areAccessAuthorizationsCompleted_ = true;
-
-    const nextPage = this.navigateToPageAfterAccess_;
-
-    // Step out if the next page is still hidden by the access extension.
-    if (nextPage && nextPage.element.hasAttribute('amp-access-hide')) {
-      return;
-    }
-
-    if (nextPage) {
-      this.navigateToPageAfterAccess_ = null;
-      this.switchTo_(nextPage.element.id, NavigationDirection.NEXT);
-    }
-
-    this.storeService_.dispatch(Action.TOGGLE_ACCESS, false);
-  }
-
-  /** @override */
-  isLayoutSupported(layout) {
-    return layout == Layout.CONTAINER;
-  }
-
-  /** @private */
   initializePages_() {
     const pageImplPromises = Array.prototype.map.call(
       this.element.querySelectorAll('amp-story-page'),
@@ -1208,11 +1336,11 @@ export class AmpStory extends AMP.BaseElement {
    * @private
    */
   next_(opt_isAutomaticAdvance) {
-    const activePage = devAssert(
-      this.activePage_,
-      'No active page set when navigating to next page.'
-    );
-    activePage.next(opt_isAutomaticAdvance);
+    this.activePage_
+      ? this.activePage_.next(opt_isAutomaticAdvance)
+      : this.activePageDeferred_.promise.then(() =>
+          this.activePage_.next(opt_isAutomaticAdvance)
+        );
   }
 
   /**
@@ -1239,10 +1367,10 @@ export class AmpStory extends AMP.BaseElement {
       const advancementMode = this.storeService_.get(
         StateProperty.ADVANCEMENT_MODE
       );
-      this.viewerMessagingHandler_.send(
-        'selectDocument',
-        dict({'next': true, 'advancementMode': advancementMode})
-      );
+      this.viewerMessagingHandler_.send('selectDocument', {
+        'next': true,
+        'advancementMode': advancementMode,
+      });
       return;
     }
   }
@@ -1252,11 +1380,11 @@ export class AmpStory extends AMP.BaseElement {
    * @private
    */
   previous_() {
-    const activePage = devAssert(
-      this.activePage_,
-      'No active page set when navigating to previous page.'
-    );
-    activePage.previous();
+    this.activePage_
+      ? this.activePage_.previous()
+      : this.activePageDeferred_.promise.then(() =>
+          this.activePage_.previous()
+        );
   }
 
   /**
@@ -1268,10 +1396,10 @@ export class AmpStory extends AMP.BaseElement {
       const advancementMode = this.storeService_.get(
         StateProperty.ADVANCEMENT_MODE
       );
-      this.viewerMessagingHandler_.send(
-        'selectDocument',
-        dict({'previous': true, 'advancementMode': advancementMode})
-      );
+      this.viewerMessagingHandler_.send('selectDocument', {
+        'previous': true,
+        'advancementMode': advancementMode,
+      });
       return;
     }
 
@@ -1313,27 +1441,50 @@ export class AmpStory extends AMP.BaseElement {
       return Promise.resolve();
     }
 
-    // If the next page might be paywall protected, and the access
-    // authorizations did not resolve yet, wait before navigating.
-    // TODO(gmajoulet): implement a loading state.
+    // Block until the subscriptions page index gets resolved.
+    const subscriptionsState = this.storeService_.get(
+      StateProperty.SUBSCRIPTIONS_STATE
+    );
     if (
-      targetPage.element.hasAttribute('amp-access') &&
-      !this.areAccessAuthorizationsCompleted_
+      subscriptionsState !== SubscriptionsState.DISABLED &&
+      this.subscriptionsPageIndex_ === -1
     ) {
-      this.navigateToPageAfterAccess_ = targetPage;
-      return Promise.resolve();
+      return this.blockOnPendingSubscriptionsData_(
+        this.subscriptionsPageIndexDeferred_,
+        targetPageId,
+        direction
+      );
     }
-
-    // If the next page is paywall protected, display the access UI and wait for
-    // the document to be reauthorized.
-    if (targetPage.element.hasAttribute('amp-access-hide')) {
-      this.storeService_.dispatch(Action.TOGGLE_ACCESS, true);
-      this.navigateToPageAfterAccess_ = targetPage;
-      return Promise.resolve();
+    // Block until the subscription state gets resolved.
+    if (
+      pageIndex >= this.subscriptionsPageIndex_ &&
+      subscriptionsState === SubscriptionsState.PENDING
+    ) {
+      return this.blockOnPendingSubscriptionsData_(
+        this.subscriptionsStateDeferred_,
+        targetPageId,
+        direction
+      );
+    }
+    // Navigation to the locked pages after the paywall page should be redirected to the paywall page.
+    // This is necessary for deeplinking case to make sure the paywall dialog shows on the paywall page.
+    if (
+      pageIndex > this.subscriptionsPageIndex_ &&
+      subscriptionsState === SubscriptionsState.BLOCKED
+    ) {
+      this.pageAfterSubscriptionsGranted_ = targetPageId;
+      this.showSubscriptionsDialog_();
+      return this.switchTo_(
+        this.pages_[this.subscriptionsPageIndex_].element.id,
+        direction
+      );
     }
+    // Maybe show paywall after timeout or hide paywall if switching back to previous pages.
+    this.maybeToggleSubscriptionsDialog_(targetPageId, pageIndex);
 
     const oldPage = this.activePage_;
     this.activePage_ = targetPage;
+    this.activePageDeferred_.resolve();
     if (!targetPage.isAd()) {
       this.updateNavigationPath_(targetPageId, direction);
     }
@@ -1381,18 +1532,10 @@ export class AmpStory extends AMP.BaseElement {
           }
         }
 
-        let storePageIndex = pageIndex;
+        this.storeService_.dispatch(Action.TOGGLE_AD, targetPage.isAd());
         if (targetPage.isAd()) {
-          this.storeService_.dispatch(Action.TOGGLE_AD, true);
           setAttributeInMutate(this, Attributes.AD_SHOWING);
-
-          // Keep current page index when an ad is shown. Otherwise it messes
-          // up with the progress variable in the VariableService.
-          storePageIndex = this.storeService_.get(
-            StateProperty.CURRENT_PAGE_INDEX
-          );
         } else {
-          this.storeService_.dispatch(Action.TOGGLE_AD, false);
           removeAttributeInMutate(this, Attributes.AD_SHOWING);
 
           // Start progress bar update for pages that are not ads or auto-
@@ -1407,7 +1550,7 @@ export class AmpStory extends AMP.BaseElement {
 
         this.storeService_.dispatch(Action.CHANGE_PAGE, {
           id: targetPageId,
-          index: storePageIndex,
+          index: pageIndex,
         });
 
         // If first navigation.
@@ -1421,27 +1564,20 @@ export class AmpStory extends AMP.BaseElement {
       () => {
         this.preloadPagesByDistance_(/* prioritizeActivePage */ !oldPage);
         this.triggerActiveEventForPage_();
-
-        this.systemLayer_.resetDeveloperLogs();
-        this.systemLayer_.setDeveloperLogContextString(
-          this.activePage_.element.id
-        );
       },
     ];
 
     return new Promise((resolve) => {
-      targetPage.beforeVisible().then(() => {
-        // Recursively executes one step per frame.
-        const unqueueStepInRAF = () => {
-          steps.shift().call(this);
-          if (!steps.length) {
-            return resolve();
-          }
-          this.win.requestAnimationFrame(() => unqueueStepInRAF());
-        };
+      // Recursively executes one step per frame.
+      const unqueueStepInRAF = () => {
+        steps.shift().call(this);
+        if (!steps.length) {
+          return resolve();
+        }
+        this.win.requestAnimationFrame(() => unqueueStepInRAF());
+      };
 
-        unqueueStepInRAF();
-      });
+      unqueueStepInRAF();
     });
   }
 
@@ -1482,7 +1618,7 @@ export class AmpStory extends AMP.BaseElement {
       this.activePage_.element,
       'active',
       /* event */ null,
-      ActionTrust.HIGH
+      ActionTrust_Enum.HIGH
     );
   }
 
@@ -1512,12 +1648,103 @@ export class AmpStory extends AMP.BaseElement {
     });
   }
 
+  /** @private */
+  onHideSubscriptionsDialog_() {
+    this.showSubscriptionsUITimeout_ &&
+      clearTimeout(this.showSubscriptionsUITimeout_);
+    this.showSubscriptionsUITimeout_ = null;
+    if (
+      this.pageAfterSubscriptionsGranted_ &&
+      this.storeService_.get(StateProperty.SUBSCRIPTIONS_STATE) ===
+        SubscriptionsState.GRANTED
+    ) {
+      this.switchTo_(
+        this.pageAfterSubscriptionsGranted_,
+        NavigationDirection.NEXT
+      );
+    }
+    this.pageAfterSubscriptionsGranted_ = null;
+  }
+
+  /**
+   * Block while waiting to resolve subscriptions state.
+   * @param {Promise} subscriptionsDataDeferred
+   * @param {string} targetPageId
+   * @param {!NavigationDirection} direction
+   * @return {!Promise}
+   * @private
+   */
+  blockOnPendingSubscriptionsData_(
+    subscriptionsDataDeferred,
+    targetPageId,
+    direction
+  ) {
+    return subscriptionsDataDeferred.promise.then(() =>
+      this.switchTo_(targetPageId, direction)
+    );
+  }
+
+  /**
+   * @private
+   */
+  showSubscriptionsDialog_() {
+    this.storeService_.dispatch(
+      Action.TOGGLE_SUBSCRIPTIONS_DIALOG_UI_STATE,
+      true
+    );
+  }
+
+  /**
+   * @private
+   */
+  hideSubscriptionsDialog_() {
+    this.storeService_.dispatch(
+      Action.TOGGLE_SUBSCRIPTIONS_DIALOG_UI_STATE,
+      false
+    );
+  }
+
+  /**
+   * Show paywall dialog after delay or hide paywall dialog if tapping back to unlocked pages.
+   * @param {string} targetPageId
+   * @param {number} pageIndex
+   * @private
+   */
+  maybeToggleSubscriptionsDialog_(targetPageId, pageIndex) {
+    const subscriptionsDialogUIState = this.storeService_.get(
+      StateProperty.SUBSCRIPTIONS_DIALOG_UI_STATE
+    );
+    // Navigation to the paywall page should show dialog after delay if not already shown.
+    if (
+      pageIndex === this.subscriptionsPageIndex_ &&
+      !subscriptionsDialogUIState &&
+      this.storeService_.get(StateProperty.SUBSCRIPTIONS_STATE) ===
+        SubscriptionsState.BLOCKED
+    ) {
+      this.showSubscriptionsUITimeout_ = setTimeout(() => {
+        this.pageAfterSubscriptionsGranted_ = targetPageId;
+        this.showSubscriptionsDialog_();
+        this.showSubscriptionsUITimeout_ = null;
+      }, SUBSCRIPTIONS_DELAY_DURATION);
+    }
+    // Hide paywall UI when navigating back to the previous page.
+    if (
+      pageIndex < this.subscriptionsPageIndex_ &&
+      subscriptionsDialogUIState
+    ) {
+      this.hideSubscriptionsDialog_();
+    }
+  }
+
   /**
    * Handles all key presses within the story.
    * @param {!Event} e The keydown event.
    * @private
    */
   onKeyDown_(e) {
+    if (matches(e.target, IGNORE_KEYDOWN_EVENT_TARGET)) {
+      return;
+    }
     this.storeService_.dispatch(
       Action.SET_ADVANCEMENT_MODE,
       AdvancementMode.MANUAL_ADVANCE
@@ -1526,10 +1753,10 @@ export class AmpStory extends AMP.BaseElement {
     const rtlState = this.storeService_.get(StateProperty.RTL_STATE);
 
     switch (e.key) {
-      case Keys.LEFT_ARROW:
+      case Keys_Enum.LEFT_ARROW:
         rtlState ? this.next_() : this.previous_();
         break;
-      case Keys.RIGHT_ARROW:
+      case Keys_Enum.RIGHT_ARROW:
         rtlState ? this.previous_() : this.next_();
         break;
     }
@@ -1539,7 +1766,7 @@ export class AmpStory extends AMP.BaseElement {
    * Handle resize events and set the story's desktop state.
    * @visibleForTesting
    */
-  onResize() {
+  onResizeDebounced() {
     this.uiState_ = this.getUIType_();
     this.storeService_.dispatch(Action.TOGGLE_UI, this.uiState_);
 
@@ -1548,6 +1775,21 @@ export class AmpStory extends AMP.BaseElement {
     this.setOrientationAttribute_(isLandscape, isLandscapeSupported);
   }
 
+  /**
+   * Handles resize events and sets CSS variables.
+   * @param {!Object} size including new width and height
+   * @private
+   */
+  polyfillDvh_(size) {
+    const {height} = size;
+    if (height === 0) {
+      return;
+    }
+    setImportantStyles(this.win.document.documentElement, {
+      '--story-dvh': px(height / 100),
+    });
+  }
+
   /**
    * Adds an orientation=landscape|portrait attribute.
    * If the story doesn't explicitly support landscape via the opt-in attribute,
@@ -1572,7 +1814,18 @@ export class AmpStory extends AMP.BaseElement {
    * @private
    */
   onVisibilityChanged_() {
-    this.getAmpDoc().isVisible() ? this.resume_() : this.pause_();
+    const vState = this.getAmpDoc().getVisibilityState();
+    const isPreview = vState === VisibilityState_Enum.PREVIEW;
+    const isVisible = vState === VisibilityState_Enum.VISIBLE;
+
+    if (isPreview) {
+      this.storeService_.dispatch(Action.TOGGLE_SYSTEM_UI_IS_VISIBLE, false);
+    }
+    if (isVisible) {
+      this.storeService_.dispatch(Action.TOGGLE_SYSTEM_UI_IS_VISIBLE, true);
+    }
+
+    isPreview || isVisible ? this.resume_() : this.pause_();
   }
 
   /**
@@ -1591,14 +1844,14 @@ export class AmpStory extends AMP.BaseElement {
 
   /**
    * Reacts to UI state updates.
-   * @param {!UIType} uiState
+   * @param {!UIType_Enum} uiState
    * @private
    */
   onUIStateUpdate_(uiState) {
     this.backgroundBlur_?.detach();
     this.backgroundBlur_ = null;
     switch (uiState) {
-      case UIType.MOBILE:
+      case UIType_Enum.MOBILE:
         this.vsync_.mutate(() => {
           this.win.document.documentElement.setAttribute(
             'i-amphtml-story-mobile',
@@ -1609,7 +1862,7 @@ export class AmpStory extends AMP.BaseElement {
           this.element.classList.remove('i-amphtml-story-desktop-one-panel');
         });
         break;
-      case UIType.DESKTOP_ONE_PANEL:
+      case UIType_Enum.DESKTOP_ONE_PANEL:
         if (!this.backgroundBlur_) {
           this.backgroundBlur_ = new BackgroundBlur(this.win, this.element);
           this.backgroundBlur_.attach();
@@ -1627,7 +1880,7 @@ export class AmpStory extends AMP.BaseElement {
           this.element.classList.remove('i-amphtml-story-desktop-fullbleed');
         });
         break;
-      case UIType.DESKTOP_FULLBLEED:
+      case UIType_Enum.DESKTOP_FULLBLEED:
         this.vsync_.mutate(() => {
           this.win.document.documentElement.removeAttribute(
             'i-amphtml-story-mobile'
@@ -1639,7 +1892,7 @@ export class AmpStory extends AMP.BaseElement {
         break;
       // Because of the DOM mutations, switching from this mode to another is
       // not allowed, and prevented within the store service.
-      case UIType.VERTICAL:
+      case UIType_Enum.VERTICAL:
         const pageAttachments = scopedQuerySelectorAll(
           this.element,
           'amp-story-page amp-story-page-attachment'
@@ -1671,7 +1924,7 @@ export class AmpStory extends AMP.BaseElement {
         });
 
         this.signals()
-          .whenSignal(CommonSignals.LOAD_END)
+          .whenSignal(CommonSignals_Enum.LOAD_END)
           .then(() => {
             this.vsync_.mutate(() => {
               this.pages_.forEach((page) =>
@@ -1685,12 +1938,12 @@ export class AmpStory extends AMP.BaseElement {
 
   /**
    * Retrieves the UI type that should be used to view the story.
-   * @return {!UIType}
+   * @return {!UIType_Enum}
    * @private
    */
   getUIType_() {
     if (
-      this.uiState_ === UIType.MOBILE &&
+      this.uiState_ === UIType_Enum.MOBILE &&
       this.androidSoftKeyboardIsProbablyOpen_()
     ) {
       // The opening of the Android soft keyboard triggers a viewport resize
@@ -1698,23 +1951,23 @@ export class AmpStory extends AMP.BaseElement {
       // desktop. Here, we assume that the soft keyboard is open if the latest
       // UI state is mobile while an input element has focus, and we then
       // ensure that the UI type does not unintentionally alter.
-      return UIType.MOBILE;
+      return UIType_Enum.MOBILE;
     }
 
     if (this.platform_.isBot()) {
-      return UIType.VERTICAL;
+      return UIType_Enum.VERTICAL;
     }
 
     if (!this.isDesktop_()) {
-      return UIType.MOBILE;
+      return UIType_Enum.MOBILE;
     }
 
     if (this.isLandscapeSupported_()) {
-      return UIType.DESKTOP_FULLBLEED;
+      return UIType_Enum.DESKTOP_FULLBLEED;
     }
 
     // Desktop one panel UI (default).
-    return UIType.DESKTOP_ONE_PANEL;
+    return UIType_Enum.DESKTOP_ONE_PANEL;
   }
 
   /**
@@ -1785,50 +2038,31 @@ export class AmpStory extends AMP.BaseElement {
   }
 
   /**
-   * If browser is supported, displays the story. Otherwise, shows either the
-   * default unsupported browser layer or the publisher fallback (if provided).
-   * @param {boolean} isBrowserSupported
+   * Displays the publisher [fallback] element if provided, or renders our own
+   * unsupported browser layer.
+   * @return {!Promise|undefined}
    * @private
    */
-  onSupportedBrowserStateUpdate_(isBrowserSupported) {
-    const fallbackEl = this.getFallback();
-    if (isBrowserSupported) {
-      // Removes the default unsupported browser layer or throws an error
-      // if the publisher has provided their own fallback.
-      if (fallbackEl) {
-        dev().error(
-          TAG,
-          'No handler to exit unsupported browser state on ' +
-            'publisher provided fallback.'
-        );
-      } else {
-        this.layoutStory_().then(() => {
-          this.storeService_.dispatch(
-            Action.TOGGLE_PAUSED,
-            this.pausedStateToRestore_
-          );
-          this.pausedStateToRestore_ = null;
-          this.mutateElement(() => {
-            this.unsupportedBrowserLayer_.removeLayer();
-          });
-        });
-      }
-    } else {
-      this.pausedStateToRestore_ = !!this.storeService_.get(
-        StateProperty.PAUSED_STATE
-      );
-      this.storeService_.dispatch(Action.TOGGLE_PAUSED, true);
-      // Displays the publisher provided fallback or fallbacks to the default
-      // unsupported browser layer.
-      if (fallbackEl) {
-        this.toggleFallback(true);
-      } else {
-        this.unsupportedBrowserLayer_.build();
+  displayUnsupportedBrowser_() {
+    this.setPausedStateToRestore_();
+    if (this.getFallback()) {
+      this.toggleFallback(true);
+      return;
+    }
+    // Provide "continue anyway" button only when rendering our own layer.
+    // Publisher provided fallbacks do not allow users to continue.
+    const continueAnyway = () => {
+      this.layoutStory_().then(() => {
+        this.restorePausedState_();
         this.mutateElement(() => {
-          this.element.appendChild(this.unsupportedBrowserLayer_.get());
+          removeElement(layer);
         });
-      }
-    }
+      });
+    };
+    const layer = renderUnsupportedBrowserLayer(this.element, continueAnyway);
+    return this.mutateElement(() => {
+      this.element.appendChild(layer);
+    });
   }
 
   /**
@@ -1893,10 +2127,10 @@ export class AmpStory extends AMP.BaseElement {
    *
    * @param {number} distance The distance that the page with the specified
    *     pageId is from the active page.
-   * @param {!Object<string, number>} map A mapping from pageId to its distance
+   * @param {!{[key: string]: number}} map A mapping from pageId to its distance
    *     from the active page.
    * @param {string} pageId The page to be added to the map.
-   * @return {!Object<string, number>} A mapping from page ID to the priority of
+   * @return {!{[key: string]: number}} A mapping from page ID to the priority of
    *     that page.
    * @private
    */
@@ -1947,10 +2181,7 @@ export class AmpStory extends AMP.BaseElement {
     };
 
     this.mutateElement(() => {
-      if (
-        !isExperimentOn(this.win, 'story-load-first-page-only') ||
-        !prioritizeActivePage
-      ) {
+      if (!prioritizeActivePage) {
         return preloadAllPages();
       }
 
@@ -1958,7 +2189,7 @@ export class AmpStory extends AMP.BaseElement {
       new Promise((res, rej) => {
         const page = this.getPageById(activePageId);
         page.setDistance(0);
-        page.signals().whenSignal(CommonSignals.LOAD_END).then(res);
+        page.signals().whenSignal(CommonSignals_Enum.LOAD_END).then(res);
         // Don't call preload if user navigates before page loads, since the navigation will call preload properly.
         this.storeService_.subscribe(StateProperty.CURRENT_PAGE_ID, rej);
       }).then(
@@ -1984,7 +2215,7 @@ export class AmpStory extends AMP.BaseElement {
     // it programmatically later.
     this.activePage_.element
       .signals()
-      .whenSignal(CommonSignals.LOAD_END)
+      .whenSignal(CommonSignals_Enum.LOAD_END)
       .then(() => {
         backgroundAudioEl = /** @type {!HTMLMediaElement} */ (
           backgroundAudioEl
@@ -2011,9 +2242,7 @@ export class AmpStory extends AMP.BaseElement {
     }
 
     this.mutateElement(() => {
-      this.element.appendChild(
-        this.win.document.createElement('amp-story-education')
-      );
+      this.element.appendChild(<amp-story-education />);
     });
 
     Services.extensionsFor(this.win).installExtensionForDoc(
@@ -2053,13 +2282,6 @@ export class AmpStory extends AMP.BaseElement {
     );
   }
 
-  /**
-   * @return {number}
-   */
-  getPageCount() {
-    return this.pages_.length - this.adPages_.length;
-  }
-
   /**
    * @param {!./amp-story-page.AmpStoryPage} desiredPage
    * @return {number} The index of the page.
@@ -2123,13 +2345,13 @@ export class AmpStory extends AMP.BaseElement {
     }
 
     return {
-      [MediaType.AUDIO]: Math.min(
+      [MediaType_Enum.AUDIO]: Math.min(
         audioMediaElementsCount + MINIMUM_AD_MEDIA_ELEMENTS,
-        MAX_MEDIA_ELEMENT_COUNTS[MediaType.AUDIO]
+        MAX_MEDIA_ELEMENT_COUNTS[MediaType_Enum.AUDIO]
       ),
-      [MediaType.VIDEO]: Math.min(
+      [MediaType_Enum.VIDEO]: Math.min(
         videoMediaElementsCount + MINIMUM_AD_MEDIA_ELEMENTS,
-        MAX_MEDIA_ELEMENT_COUNTS[MediaType.VIDEO]
+        MAX_MEDIA_ELEMENT_COUNTS[MediaType_Enum.VIDEO]
       ),
     };
   }
@@ -2201,21 +2423,12 @@ export class AmpStory extends AMP.BaseElement {
   }
 
   /**
-   * Shows the audio icon if the story has any media elements containing audio,
-   * or background audio at the story or page level.
+   * Update the store if the story has background audio.
    * @private
    */
   updateAudioIcon_() {
-    const containsMediaElementWithAudio = !!this.element.querySelector(
-      'amp-audio, amp-video:not([noaudio]), [background-audio]'
-    );
     const storyHasBackgroundAudio =
       this.element.hasAttribute('background-audio');
-
-    this.storeService_.dispatch(
-      Action.TOGGLE_STORY_HAS_AUDIO,
-      containsMediaElementWithAudio || storyHasBackgroundAudio
-    );
     this.storeService_.dispatch(
       Action.TOGGLE_STORY_HAS_BACKGROUND_AUDIO,
       storyHasBackgroundAudio
@@ -2247,7 +2460,7 @@ export class AmpStory extends AMP.BaseElement {
    */
   onRewind_() {
     this.signals()
-      .whenSignal(CommonSignals.LOAD_END)
+      .whenSignal(CommonSignals_Enum.LOAD_END)
       .then(() => this.replay_());
   }
 
@@ -2315,7 +2528,7 @@ export class AmpStory extends AMP.BaseElement {
   }
 
   /**
-   * Checks for the the storyNavigationPath stack in the history.
+   * Checks for the storyNavigationPath stack in the history.
    * @private
    */
   initializeStoryNavigationPath_() {
@@ -2368,7 +2581,7 @@ export class AmpStory extends AMP.BaseElement {
         'amp-story-cta-layer a'
       );
 
-      Array.prototype.forEach.call(ctaAnchorEls, (ctaAnchorEl) => {
+      ctaAnchorEls.forEach((ctaAnchorEl) => {
         ctaAnchorEl.setAttribute('data-vars-story-page-id', pageId);
         ctaAnchorEl.setAttribute('data-vars-story-page-index', pageIndex);
       });
@@ -2435,6 +2648,21 @@ export class AmpStory extends AMP.BaseElement {
       nextPageEl.setAttribute(Attributes.RETURN_TO, pageToBeInsertedId);
     }
 
+    // Adjust the page's position in this.pages_ array to reflect the actual.
+    const insertedPageIndex = this.getPageIndexById(pageToBeInsertedId);
+    if (insertedPageIndex != -1) {
+      this.pages_.splice(insertedPageIndex, 1);
+    }
+    this.pages_.splice(
+      this.getPageIndexById(pageBeforeId) + 1,
+      0,
+      pageToBeInserted
+    );
+
+    this.storeService_.dispatch(
+      Action.SET_PAGE_IDS,
+      this.pages_.map((el) => el.element.id)
+    );
     return true;
   }
 
@@ -2457,6 +2685,13 @@ export class AmpStory extends AMP.BaseElement {
    *     for amp-story.
    */
   static isBrowserSupported(win) {
+    if (isEsm()) {
+      // Browsers that run the ESM build are should support the features
+      // detected below.
+      // If the logic changes so that ESM browsers do not pass support detection,
+      // this optimization should be removed.
+      return true;
+    }
     return Boolean(
       win.CSS &&
         win.CSS.supports &&
@@ -2468,6 +2703,7 @@ export class AmpStory extends AMP.BaseElement {
   /**
    * Loads amp-story-dev-tools if it is enabled.
    * @private
+   * @return {boolean}
    */
   maybeLoadStoryDevTools_() {
     if (
@@ -2479,7 +2715,7 @@ export class AmpStory extends AMP.BaseElement {
 
     this.element.setAttribute('mode', 'inspect');
 
-    const devToolsEl = this.win.document.createElement('amp-story-dev-tools');
+    const devToolsEl = <amp-story-dev-tools />;
     this.win.document.body.appendChild(devToolsEl);
     this.element.setAttribute('hide', '');
 
@@ -2504,16 +2740,123 @@ export class AmpStory extends AMP.BaseElement {
       this.element
     );
   }
+
+  /**
+   * Adds the localization string bundles to the localization service.
+   * @private
+   */
+  installLocalizationStrings_() {
+    const localizationService = getLocalizationService(this.element);
+    const storyLanguages = localizationService.getLanguageCodesForElement(
+      this.element
+    );
+    if (this.maybeRegisterInlineLocalizationStrings_(storyLanguages[0])) {
+      return;
+    }
+    this.fetchLocalizationStrings_(storyLanguages);
+  }
+
+  /**
+   * If there are inline localization strings, register as current document language.
+   * @param {string} languageCode
+   * @return {boolean}
+   * @private
+   */
+  maybeRegisterInlineLocalizationStrings_(languageCode) {
+    const inlineStringsEl = this.win.document.querySelector(
+      'script[amp-localization="amp-story"]'
+    );
+    if (
+      inlineStringsEl?.getAttribute('i-amphtml-version') !==
+      getMode(this.win).rtvVersion
+    ) {
+      return false;
+    }
+    const stringsOrNull = tryParseJson(inlineStringsEl.textContent);
+
+    if (!stringsOrNull) {
+      return false;
+    }
+    const localizationService = getLocalizationService(this.element);
+    localizationService.registerLocalizedStringBundles({
+      [languageCode]: stringsOrNull,
+    });
+    return true;
+  }
+
+  /**
+   * Fetches from the CDN or localhost the localization strings.
+   * @param {string[]} candidateLanguageCodes
+   * @private
+   */
+  fetchLocalizationStrings_(candidateLanguageCodes) {
+    const localizationService = getLocalizationService(this.element);
+    const languageCode = getSupportedLanguageCode(candidateLanguageCodes);
+
+    const localizationUrl = calculateExtensionFileUrl(
+      this.win,
+      this.win.location,
+      `amp-story.${languageCode}.json`,
+      getMode(this.win).localDev
+    );
+
+    Services.xhrFor(this.win)
+      .fetchJson(localizationUrl, {prerenderSafe: true})
+      .then((res) => res.json())
+      .then((json) =>
+        localizationService.registerLocalizedStringBundles({
+          [languageCode]: json,
+        })
+      )
+      .catch((err) => {
+        devError(TAG, err, 'Bundle not found for language ' + languageCode);
+      });
+  }
+
+  /**
+   * @return {number} The index of the last page that should be shown in
+   *     preview mode.
+   * @private
+   */
+  calculateIndexOfLastPageToPreview_() {
+    const minPreviewPages =
+      parseInt(this.viewer_?.getParam('minPreviewPages'), 10) ||
+      DEFAULT_MIN_PAGES_TO_PREVIEW;
+    const pctPagesToPreview =
+      parseInt(this.viewer_?.getParam('pctPagesToPreview'), 10) ||
+      DEFAULT_PCT_PAGES_TO_PREVIEW;
+
+    // We calculate the number of preview pages by taking the larger of the two
+    // values: min # of preview pages vs the % of pages to show.
+    const numPages = this.element.querySelectorAll('amp-story-page').length;
+    let numPreviewPages = Math.ceil((pctPagesToPreview / 100) * numPages);
+    numPreviewPages = Math.max(minPreviewPages, numPreviewPages);
+    numPreviewPages = clamp(numPreviewPages, 1, numPages);
+
+    return numPreviewPages - 1;
+  }
+
+  /**
+   * Sends the 'storyPreviewFinished' viewer message if the active page is
+   * supposed to be the last page shown in the preview.
+   * @private
+   */
+  sendMessageIfPreviewFinished_() {
+    const activePageIdx = this.pages_.indexOf(this.activePage_);
+    const isPreviewFinished = activePageIdx >= this.indexOfLastPageToPreview_;
+    if (isPreviewFinished) {
+      this.viewerMessagingHandler_?.send('storyPreviewFinished', {});
+    }
+  }
 }
 
 AMP.extension('amp-story', '1.0', (AMP) => {
-  AMP.registerElement('amp-story', AmpStory, CSS);
-  AMP.registerElement('amp-story-access', AmpStoryAccess);
+  if (isSsrCss()) {
+    AMP.registerElement('amp-story', AmpStory);
+  } else {
+    AMP.registerElement('amp-story', AmpStory, CSS);
+  }
   AMP.registerElement('amp-story-consent', AmpStoryConsent);
-  AMP.registerElement('amp-story-cta-layer', AmpStoryCtaLayer);
   AMP.registerElement('amp-story-grid-layer', AmpStoryGridLayer);
   AMP.registerElement('amp-story-page', AmpStoryPage);
-  AMP.registerElement('amp-story-page-attachment', AmpStoryPageAttachment);
-  AMP.registerElement('amp-story-page-outlink', AmpStoryPageAttachment); // Shares codepath with amp-story-page-attachment.
-  AMP.registerServiceForDoc('amp-story-render', AmpStoryRenderService);
 });
diff --git a/extensions/amp-story/1.0/animation-presets-utils.js b/extensions/amp-story/1.0/animation-presets-utils.js
index c309265f5924..d0c3cd1f18d7 100644
--- a/extensions/amp-story/1.0/animation-presets-utils.js
+++ b/extensions/amp-story/1.0/animation-presets-utils.js
@@ -3,9 +3,10 @@
  * presets.
  */
 
-import {StoryAnimationDimsDef, WebKeyframesDef} from './animation-types';
 import {rotate, scale, translate} from '#core/dom/style';
 
+import {StoryAnimationDimsDef, WebKeyframesDef} from './animation-types';
+
 /**
  * Translates the element on the 2d plane according to the given points.
  * @param {number} startX Starting point in the abscissa.
diff --git a/extensions/amp-story/1.0/animation-presets.js b/extensions/amp-story/1.0/animation-presets.js
index f4631e1d8103..9e079df5de91 100644
--- a/extensions/amp-story/1.0/animation-presets.js
+++ b/extensions/amp-story/1.0/animation-presets.js
@@ -1,4 +1,7 @@
-import {StoryAnimationPresetDef} from './animation-types';
+import {px} from '#core/dom/style';
+
+import {userAssert} from '#utils/log';
+
 import {
   calculateTargetScalingFactor,
   rotateAndTranslate,
@@ -6,8 +9,7 @@ import {
   translate2d,
   whooshIn,
 } from './animation-presets-utils';
-import {px} from '#core/dom/style';
-import {userAssert} from '#utils/log';
+import {StoryAnimationPresetDef} from './animation-types';
 
 /** @const {string} */
 const FULL_BLEED_CATEGORY = 'full-bleed';
@@ -21,6 +23,8 @@ const SCALE_START_ATTRIBUTE_NAME = 'scale-start';
 /** @const {string} */
 const SCALE_END_ATTRIBUTE_NAME = 'scale-end';
 /** @const {string} */
+const PAN_SCALING_FACTOR_ATTRIBUTE_NAME = 'pan-scaling-factor';
+/** @const {string} */
 const TRANSLATE_X_ATTRIBUTE_NAME = 'translate-x';
 /** @const {string} */
 const TRANSLATE_Y_ATTRIBUTE_NAME = 'translate-y';
@@ -31,6 +35,7 @@ const DEFAULT_CURVE = '0.4, 0.4, 0.0, 1';
 export const PRESET_OPTION_ATTRIBUTES = [
   SCALE_START_ATTRIBUTE_NAME,
   SCALE_END_ATTRIBUTE_NAME,
+  PAN_SCALING_FACTOR_ATTRIBUTE_NAME,
   TRANSLATE_X_ATTRIBUTE_NAME,
   TRANSLATE_Y_ATTRIBUTE_NAME,
 ];
@@ -50,7 +55,7 @@ const FULL_BLEED_ANIMATION_NAMES = [
 
 /**
  * A mapping of animation categories to corresponding CSS class names.
- * @private @const {!Object<string, string>}
+ * @private @const {!{[key: string]: string}}
  */
 const ANIMATION_CSS_CLASS_NAMES = {
   [FULL_BLEED_CATEGORY]:
@@ -73,7 +78,7 @@ export function setStyleForPreset(el, presetName) {
 /**
  * First keyframe will always be considered offset: 0 and will be applied to the
  * element as the first frame before animation starts.
- * @type {!Object<string, !StoryAnimationPresetDef>}
+ * @type {!{[key: string]: !StoryAnimationPresetDef}}
  */
 export const presets = {
   'pulse': {
@@ -283,7 +288,9 @@ export const presets = {
     easing: 'linear',
     keyframes(dimensions, options) {
       const translateX = options[TRANSLATE_X_ATTRIBUTE_NAME];
-      const scalingFactor = calculateTargetScalingFactor(dimensions);
+      const scalingFactor =
+        options[PAN_SCALING_FACTOR_ATTRIBUTE_NAME] ??
+        calculateTargetScalingFactor(dimensions);
       dimensions.targetWidth *= scalingFactor;
       dimensions.targetHeight *= scalingFactor;
 
@@ -304,8 +311,9 @@ export const presets = {
     easing: 'linear',
     keyframes(dimensions, options) {
       const translateX = options[TRANSLATE_X_ATTRIBUTE_NAME];
-
-      const scalingFactor = calculateTargetScalingFactor(dimensions);
+      const scalingFactor =
+        options[PAN_SCALING_FACTOR_ATTRIBUTE_NAME] ??
+        calculateTargetScalingFactor(dimensions);
       dimensions.targetWidth *= scalingFactor;
       dimensions.targetHeight *= scalingFactor;
 
@@ -326,11 +334,13 @@ export const presets = {
     easing: 'linear',
     keyframes(dimensions, options) {
       const translateY = options[TRANSLATE_Y_ATTRIBUTE_NAME];
-      const scalingFactor = calculateTargetScalingFactor(dimensions);
+      const scalingFactor =
+        options[PAN_SCALING_FACTOR_ATTRIBUTE_NAME] ??
+        calculateTargetScalingFactor(dimensions);
       dimensions.targetWidth *= scalingFactor;
       dimensions.targetHeight *= scalingFactor;
 
-      const offsetX = -dimensions.targetWidth / 2;
+      const offsetX = (dimensions.pageWidth - dimensions.targetWidth) * 0.5;
       const offsetY = dimensions.pageHeight - dimensions.targetHeight;
 
       return scaleAndTranslate(
@@ -347,11 +357,13 @@ export const presets = {
     easing: 'linear',
     keyframes(dimensions, options) {
       const translateY = options[TRANSLATE_Y_ATTRIBUTE_NAME];
-      const scalingFactor = calculateTargetScalingFactor(dimensions);
+      const scalingFactor =
+        options[PAN_SCALING_FACTOR_ATTRIBUTE_NAME] ??
+        calculateTargetScalingFactor(dimensions);
       dimensions.targetWidth *= scalingFactor;
       dimensions.targetHeight *= scalingFactor;
 
-      const offsetX = -dimensions.targetWidth / 2;
+      const offsetX = (dimensions.pageWidth - dimensions.targetWidth) * 0.5;
       const offsetY = dimensions.pageHeight - dimensions.targetHeight;
 
       return scaleAndTranslate(
diff --git a/extensions/amp-story/1.0/animation-types.js b/extensions/amp-story/1.0/animation-types.js
index 762fd7b582e3..0627c56e5558 100644
--- a/extensions/amp-story/1.0/animation-types.js
+++ b/extensions/amp-story/1.0/animation-types.js
@@ -16,7 +16,7 @@ export {
   WebAnimationTimingDef,
 };
 
-/** @typedef {function(StoryAnimationDimsDef, Object<string, *>):!WebKeyframesDef} */
+/** @typedef {function(StoryAnimationDimsDef, {[key: string]: *}):!WebKeyframesDef} */
 export let WebKeyframesCreateFnDef;
 
 /**
@@ -45,7 +45,7 @@ export let StoryAnimationPresetDef;
  *   source: !Element,
  *   startAfterId: (?string),
  *   preset: (!StoryAnimationPresetDef|undefined),
- *   keyframeOptions: (!Object<string, *>|undefined),
+ *   keyframeOptions: (!{[key: string]: *}|undefined),
  *   spec: !WebAnimationDef,
  * }}
  *
diff --git a/extensions/amp-story/1.0/animation.js b/extensions/amp-story/1.0/animation.js
index 00d0534f2d63..7fb45d6e6317 100644
--- a/extensions/amp-story/1.0/animation.js
+++ b/extensions/amp-story/1.0/animation.js
@@ -1,10 +1,26 @@
 import {Deferred} from '#core/data-structures/promise';
+import {getChildJsonConfig} from '#core/dom';
+import {escapeCssSelectorIdent} from '#core/dom/css-selectors';
+import {prefersReducedMotion} from '#core/dom/media-query-props';
+import {
+  matches,
+  scopedQuerySelector,
+  scopedQuerySelectorAll,
+} from '#core/dom/query';
+import {assertDoesNotContainDisplay, setStyles} from '#core/dom/style';
+import {map, omit} from '#core/types/object';
+
+import {isExperimentOn} from '#experiments';
+
+import {Services} from '#service';
+
+import {dev, devAssert, user, userAssert} from '#utils/log';
+
 import {
   PRESET_OPTION_ATTRIBUTES,
   presets,
   setStyleForPreset,
 } from './animation-presets';
-import {Services} from '#service';
 import {
   StoryAnimationConfigDef,
   StoryAnimationDimsDef,
@@ -16,19 +32,8 @@ import {
   WebKeyframesCreateFnDef,
   WebKeyframesDef,
 } from './animation-types';
-import {assertDoesNotContainDisplay, setStyles} from '#core/dom/style';
-import {dev, devAssert, user, userAssert} from '#utils/log';
-import {escapeCssSelectorIdent} from '#core/dom/css-selectors';
-import {getChildJsonConfig} from '#core/dom';
-import {map, omit} from '#core/types/object';
-import {prefersReducedMotion} from '#core/dom/media-query-props';
-import {
-  matches,
-  scopedQuerySelector,
-  scopedQuerySelectorAll,
-} from '#core/dom/query';
-import {timeStrToMillis, unscaledClientRect} from './utils';
-import {isExperimentOn} from '#experiments';
+import {isPreviewMode} from './embed-mode';
+import {isTransformed, timeStrToMillis, unscaledClientRect} from './utils';
 
 const TAG = 'AMP-STORY';
 
@@ -54,7 +59,7 @@ const DEFAULT_EASING = 'cubic-bezier(0.4, 0.0, 0.2, 1)';
  * TODO(alanorozco): maybe memoize?
  */
 export function hasAnimations(element) {
-  const selector = `${ANIMATABLE_ELEMENTS_SELECTOR},>amp-story-animation`;
+  const selector = `${ANIMATABLE_ELEMENTS_SELECTOR},>amp-story-animation,amp-bodymovin-animation`;
   return !!scopedQuerySelector(element, selector);
 }
 
@@ -134,7 +139,7 @@ export class AnimationRunner {
 
     /**
      * Evaluated set of CSS properties for first animation frame.
-     * @private @const {!Promise<?Object<string, *>>}
+     * @private @const {!Promise<?{[key: string]: *}>}
      */
     this.firstFrameProps_ = this.resolvedSpecPromise_.then((spec) => {
       const {keyframes} = spec;
@@ -229,7 +234,7 @@ export class AnimationRunner {
   /**
    * Evaluates a preset's keyframes function using dimensions.
    * @param {!WebKeyframesDef|!WebKeyframesCreateFnDef} keyframesOrCreateFn
-   * @param {!Object<string, *>=} keyframeOptions
+   * @param {!{[key: string]: *}=} keyframeOptions
    * @return {!Promise<!WebKeyframesDef>}
    * @private
    */
@@ -545,10 +550,15 @@ export class AnimationManager {
     /** @private @const */
     this.builderPromise_ = this.createAnimationBuilderPromise_();
 
+    const firstPageAnimationDisabled =
+      isExperimentOn(ampdoc.win, 'story-disable-animations-first-page') ||
+      isPreviewMode(ampdoc.win) ||
+      isTransformed(ampdoc);
+
     /** @private @const {bool} */
     this.skipAnimations_ =
       prefersReducedMotion(ampdoc.win) ||
-      (isExperimentOn(ampdoc.win, 'story-disable-animations-first-page') &&
+      (firstPageAnimationDisabled &&
         matches(page, 'amp-story-page:first-of-type'));
 
     /** @private {?Array<!AnimationRunner>} */
@@ -690,6 +700,12 @@ export class AnimationManager {
               })
           )
         )
+        .concat(
+          Array.prototype.map.call(
+            this.page_.querySelectorAll('amp-bodymovin-animation'),
+            (el) => new BodymovinAnimationRunner(el)
+          )
+        )
         .filter(Boolean);
     }
     return devAssert(this.runners_);
@@ -794,7 +810,7 @@ export class AnimationManager {
 
   /**
    * @param {!Element} el
-   * @return {!Object<string, *>}
+   * @return {!{[key: string]: *}}
    * @private
    */
   getKeyframeOptions_(el) {
@@ -829,10 +845,10 @@ export class AnimationSequence {
    * @public
    */
   constructor() {
-    /** @private @const {!Object<string, !Promise>} */
+    /** @private @const {!{[key: string]: !Promise}} */
     this.subscriptionPromises_ = map();
 
-    /** @private @const {!Object<string, !Function>} */
+    /** @private @const {!{[key: string]: !Function}} */
     this.subscriptionResolvers_ = map();
   }
 
@@ -871,3 +887,75 @@ export class AnimationSequence {
     return this.subscriptionPromises_[id];
   }
 }
+
+export class BodymovinAnimationRunner {
+  /**
+   * @param {!Element} bodymovinAnimationEl
+   */
+  constructor(bodymovinAnimationEl) {
+    this.bodymovinAnimationEl_ = bodymovinAnimationEl;
+    this.pause();
+  }
+
+  /**
+   * Pauses the bodymovin animation.
+   */
+  pause() {
+    this.executeAction_('pause');
+  }
+
+  /**
+   * Plays the bodymovin animation.
+   */
+  resume() {
+    this.executeAction_('play');
+  }
+
+  /**
+   * Starts the bodymovin animation.
+   */
+  start() {
+    this.applyFirstFrame();
+    this.resume();
+  }
+
+  /**
+   * Seeks the bodymovin animation to the first frame.
+   */
+  applyFirstFrame() {
+    this.executeAction_('seekTo', {
+      percent: 0,
+    });
+  }
+
+  /**
+   * Seeks the bodymovin animation to the last frame.
+   */
+  applyLastFrame() {
+    this.executeAction_('seekTo', {
+      percent: 1,
+    });
+  }
+
+  /**
+   * Cancels the bodymovin animation by pausing it.
+   */
+  cancel() {
+    this.pause();
+  }
+
+  /**
+   * @param {string} method
+   * @param {=any} args
+   * @private
+   */
+  executeAction_(method, args = null) {
+    this.bodymovinAnimationEl_.getImpl().then((impl) => {
+      impl.executeAction({
+        method,
+        args,
+        satisfiesTrust: () => true,
+      });
+    });
+  }
+}
diff --git a/extensions/amp-story/1.0/background-blur.js b/extensions/amp-story/1.0/background-blur.js
index 43a7dfc60de1..e1c5f2e6ad52 100644
--- a/extensions/amp-story/1.0/background-blur.js
+++ b/extensions/amp-story/1.0/background-blur.js
@@ -1,8 +1,9 @@
-import {CommonSignals} from '#core/constants/common-signals';
+import {CommonSignals_Enum} from '#core/constants/common-signals';
+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 import {scopedQuerySelectorAll} from '#core/dom/query';
 import {setImportantStyles} from '#core/dom/style';
+
 import {user} from '#utils/log';
-import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 
 /** @const {number} */
 const CANVAS_SIZE = 3;
@@ -181,7 +182,7 @@ export class BackgroundBlur {
   ensureMediaLoaded_(mediaEl) {
     return new Promise((resolve) => {
       whenUpgradedToCustomElement(mediaEl)
-        .then(() => mediaEl.signals().whenSignal(CommonSignals.LOAD_END))
+        .then(() => mediaEl.signals().whenSignal(CommonSignals_Enum.LOAD_END))
         .then(() => {
           resolve(mediaEl);
         })
diff --git a/extensions/amp-story/1.0/development-ui.js b/extensions/amp-story/1.0/development-ui.js
deleted file mode 100644
index 91396ce52c85..000000000000
--- a/extensions/amp-story/1.0/development-ui.js
+++ /dev/null
@@ -1,311 +0,0 @@
-import {LogLevel, dev} from '#utils/log';
-import {Services} from '#service';
-import {isArray} from '#core/types';
-import {removeChildren} from '#core/dom';
-import {toggle} from '#core/dom/style';
-
-/**
- * @param {!../../../src/service/vsync-impl.Vsync} vsync
- * @param {!Element} el
- * @param {boolean} isHidden
- */
-function toggleHiddenAttribute(vsync, el, isHidden) {
-  vsync.mutate(() => {
-    toggle(el, !isHidden);
-  });
-}
-
-/**
- * @param {!Window} win
- * @param {string|!Array<string>} classNameOrList
- * @param {function(Event)} handler
- * @return {!Element}
- */
-function createButton(win, classNameOrList, handler) {
-  const button = win.document.createElement('div');
-  button.setAttribute('role', 'button');
-
-  if (isArray(classNameOrList)) {
-    classNameOrList.forEach((className) => button.classList.add(className));
-  } else {
-    button.classList.add(/** @type {string} */ (classNameOrList));
-  }
-  button.classList.add('i-amphtml-story-button');
-  button.addEventListener('click', handler);
-  return button;
-}
-
-/**
- * Development mode logs buttons.
- */
-export class DevelopmentModeLogButtonSet {
-  /**
-   * @param {!Window} win
-   */
-  constructor(win) {
-    /** @private @const {!Window} */
-    this.win_ = win;
-
-    /** @private {?Element} */
-    this.root_ = null;
-
-    /** @private {?Element} */
-    this.errorButton_ = null;
-
-    /** @private {?Element} */
-    this.warningButton_ = null;
-
-    /** @private {?Element} */
-    this.successButton_ = null;
-  }
-
-  /**
-   * @param {!Window} win
-   * @return {!DevelopmentModeLogButtonSet}
-   */
-  static create(win) {
-    return new DevelopmentModeLogButtonSet(win);
-  }
-
-  /**
-   * Builds the developer log button set element.
-   * @param {function()} logButtonActionFn A callback function to be invoked when
-   *     the log buttons are clicked.
-   * @return {?Element}
-   */
-  build(logButtonActionFn) {
-    this.errorButton_ = createButton(
-      this.win_,
-      ['i-amphtml-story-error-button', 'i-amphtml-story-dev-logs-button'],
-      () => logButtonActionFn()
-    );
-
-    this.warningButton_ = createButton(
-      this.win_,
-      ['i-amphtml-story-warning-button', 'i-amphtml-story-dev-logs-button'],
-      () => logButtonActionFn()
-    );
-
-    this.successButton_ = createButton(
-      this.win_,
-      ['i-amphtml-story-success-button', 'i-amphtml-story-dev-logs-button'],
-      () => logButtonActionFn()
-    );
-
-    this.root_ = this.win_.document.createElement('div');
-    this.root_.appendChild(this.errorButton_);
-    this.root_.appendChild(this.warningButton_);
-    this.root_.appendChild(this.successButton_);
-
-    return this.root_;
-  }
-
-  /**
-   * Gets the button associated to a given log entry.
-   * @param {!./logging.AmpStoryLogEntryDef} logEntry The log entry for which
-   *     the associated button shouldbe retrieved.
-   * @return {?Element} The button associated to the specified log entry, if one
-   *     exists.
-   * @private
-   */
-  getButtonForLogEntry_(logEntry) {
-    if (logEntry.conforms) {
-      return this.successButton_;
-    }
-
-    switch (logEntry.level) {
-      case LogLevel.ERROR:
-        return this.errorButton_;
-      case LogLevel.WARN:
-        return this.warningButton_;
-      default:
-        return null;
-    }
-  }
-
-  /**
-   * Logs an individual entry into the developer log.
-   * @param {!./logging.AmpStoryLogEntryDef} logEntry The entry to log.
-   */
-  log(logEntry) {
-    const button = this.getButtonForLogEntry_(logEntry);
-    if (!button) {
-      return;
-    }
-
-    const oldCount = parseInt(button.getAttribute('data-count') || 0, 10);
-    button.setAttribute('data-count', oldCount + 1);
-  }
-
-  /**
-   * Clears any error state held by the buttons.
-   */
-  clear() {
-    this.errorButton_.setAttribute('data-count', 0);
-    this.warningButton_.setAttribute('data-count', 0);
-    this.successButton_.setAttribute('data-count', 0);
-  }
-}
-
-/**
- * Development mode log for <amp-story>.
- */
-export class DevelopmentModeLog {
-  /**
-   * @param {!Window} win
-   */
-  constructor(win) {
-    /** @private @const {!Window} */
-    this.win_ = win;
-
-    /** @private {?Element} */
-    this.root_ = null;
-
-    /** @private {?Element} */
-    this.entriesEl_ = null;
-
-    /** @private {?Element} */
-    this.contextStringEl_ = null;
-  }
-
-  /**
-   * @param {!Window} win
-   * @return {!DevelopmentModeLog}
-   */
-  static create(win) {
-    return new DevelopmentModeLog(win);
-  }
-
-  /**
-   * Builds the developer log element.
-   * @return {?Element}
-   */
-  build() {
-    this.contextStringEl_ = this.win_.document.createElement('span');
-    this.contextStringEl_.classList.add(
-      'i-amphtml-story-developer-log-context'
-    );
-    const titleEl = this.win_.document.createElement('div');
-    titleEl.textContent = 'Developer logs for page ';
-    titleEl.appendChild(this.contextStringEl_);
-
-    const closeDeveloperLogEl = createButton(
-      this.win_,
-      'i-amphtml-story-developer-log-close',
-      () => this.hide()
-    );
-
-    const headerEl = this.win_.document.createElement('div');
-    headerEl.classList.add('i-amphtml-story-developer-log-header');
-    headerEl.appendChild(titleEl);
-    headerEl.appendChild(closeDeveloperLogEl);
-
-    this.entriesEl_ = this.win_.document.createElement('ul');
-    this.entriesEl_.classList.add('i-amphtml-story-developer-log-entries');
-
-    this.root_ = this.win_.document.createElement('div');
-    this.root_.classList.add('i-amphtml-story-developer-log');
-    toggle(this.root_, false);
-    this.root_.appendChild(headerEl);
-    this.root_.appendChild(this.entriesEl_);
-
-    this.clear();
-    return this.root_;
-  }
-
-  /**
-   * @param {!LogLevel} logLevel
-   * @return {?string} The CSS class to be applied to the log entry, given the
-   *     specified log level, or null if no class should be added.
-   * @private
-   */
-  getCssLogLevelClass_(logLevel) {
-    switch (logLevel) {
-      case LogLevel.WARN:
-        return 'i-amphtml-story-developer-log-entry-warning';
-      case LogLevel.ERROR:
-        return 'i-amphtml-story-developer-log-entry-error';
-      default:
-        return null;
-    }
-  }
-
-  /**
-   * @param {boolean} conforms Whether the log entry is for an element that
-   *     conforms to a best practice.
-   * @return {?string} The CSS class to be applied to the log entry, given the
-   *     element's conformance to a best practice, or null if no class should be
-   *     added.
-   * @private
-   */
-  getCssConformanceClass_(conforms) {
-    if (conforms) {
-      return 'i-amphtml-story-developer-log-entry-success';
-    }
-
-    return null;
-  }
-
-  /**
-   * @param {!./logging.AmpStoryLogEntryDef} logEntry The entry to be logged.
-   */
-  log(logEntry) {
-    const logLevelClass = this.getCssLogLevelClass_(logEntry.level);
-    const conformanceClass = this.getCssConformanceClass_(logEntry.conforms);
-
-    const logEntryUi = this.win_.document.createElement('li');
-    logEntryUi.classList.add('i-amphtml-story-developer-log-entry');
-
-    if (logLevelClass) {
-      logEntryUi.classList.add(logLevelClass);
-    }
-
-    if (conformanceClass) {
-      logEntryUi.classList.add(conformanceClass);
-    }
-
-    logEntryUi.textContent = logEntry.message;
-    this.entriesEl_.appendChild(logEntryUi);
-  }
-
-  /**
-   * Clears all entries from the developer logs.
-   */
-  clear() {
-    Services.vsyncFor(this.win_).mutate(() => {
-      removeChildren(dev().assertElement(this.entriesEl_));
-    });
-  }
-
-  /**
-   * Sets the string providing context for the developer logs window.  This is
-   * often the name or ID of the element that all logs are for (e.g. the page).
-   * @param {string} contextString
-   */
-  setContextString(contextString) {
-    this.contextStringEl_.textContent = contextString;
-  }
-
-  /**
-   * Toggles the visibility of the developer log.
-   */
-  toggle() {
-    const newHiddenState = !this.root_.hasAttribute('hidden');
-    toggleHiddenAttribute(
-      Services.vsyncFor(this.win_),
-      dev().assertElement(this.root_),
-      newHiddenState
-    );
-  }
-
-  /**
-   * Hides the developer log in the UI.
-   */
-  hide() {
-    toggleHiddenAttribute(
-      Services.vsyncFor(this.win_),
-      dev().assertElement(this.root_),
-      /* isHidden */ true
-    );
-  }
-}
diff --git a/extensions/amp-story/1.0/embed-mode.js b/extensions/amp-story/1.0/embed-mode.js
index 634df5079973..923f36d5ca98 100644
--- a/extensions/amp-story/1.0/embed-mode.js
+++ b/extensions/amp-story/1.0/embed-mode.js
@@ -76,3 +76,13 @@ export function parseEmbedMode(str) {
     ? /** @type {!EmbedMode} */ (embedModeIndex)
     : EmbedMode.NOT_EMBEDDED;
 }
+
+/**
+ * Determine if the current embed mode is PREVIEW.
+ * @param {!Window} win
+ * @return {boolean}
+ */
+export function isPreviewMode(win) {
+  const embedMode = parseEmbedMode(win.location.hash);
+  return embedMode === EmbedMode.PREVIEW;
+}
diff --git a/extensions/amp-story/1.0/events.js b/extensions/amp-story/1.0/events.js
index 230e3ab8eda1..4d35e6ce6dd7 100644
--- a/extensions/amp-story/1.0/events.js
+++ b/extensions/amp-story/1.0/events.js
@@ -1,6 +1,6 @@
 import {createCustomEvent} from '#utils/event-helper';
 
-/** @const {!Object<string, string>} */
+/** @const {!{[key: string]: string}} */
 export const EventType = {
   // Triggered when the user mutes the story
   MUTE: 'ampstory:mute',
@@ -23,10 +23,6 @@ export const EventType = {
   // Triggered when the story should be replayed
   REPLAY: 'ampstory:replay',
 
-  // DEVELOPMENT MODE ONLY: Triggered when a story page has log entries (e.g.
-  // warnings or errors).
-  DEV_LOG_ENTRIES_AVAILABLE: 'ampstory:devlogentriesavailable',
-
   // Triggered when user clicks on end 75% of the last page
   NO_NEXT_PAGE: 'ampstory:nonextpage',
 
diff --git a/extensions/amp-story/1.0/history.js b/extensions/amp-story/1.0/history.js
index 780edf5b99cf..8f4d0d65d577 100644
--- a/extensions/amp-story/1.0/history.js
+++ b/extensions/amp-story/1.0/history.js
@@ -1,6 +1,5 @@
-import {dict} from '#core/types/object';
-import {getHistoryState as getWindowHistoryState} from '#core/window/history';
 import {parseJson} from '#core/types/object/json';
+import {getHistoryState as getWindowHistoryState} from '#core/window/history';
 
 const EXPIRATION_DURATION_MILLIS = 10 * 60 * 1000; // 10 Minutes
 const CREATION_TIME = 'time';
@@ -12,6 +11,7 @@ export const LOCAL_STORAGE_KEY = 'amp-story-state';
 export const HistoryState = {
   ATTACHMENT_PAGE_ID: 'ampStoryAttachmentPageId',
   NAVIGATION_PATH: 'ampStoryNavigationPath',
+  SHOPPING_DATA: 'ampStoryShoppingData',
 };
 
 /**
@@ -103,7 +103,7 @@ function setLocalStorageState(win, state) {
 function getLocalStorageStateContainer(win) {
   const container = readLocalStorage(win);
   if (!container) {
-    return dict();
+    return {};
   }
   const now = Date.now();
   let expired = false;
diff --git a/extensions/amp-story/1.0/jsonld.js b/extensions/amp-story/1.0/jsonld.js
index c16ea663d852..f794fca9d8e4 100644
--- a/extensions/amp-story/1.0/jsonld.js
+++ b/extensions/amp-story/1.0/jsonld.js
@@ -1,5 +1,6 @@
 import {isJsonLdScriptTag} from '#core/dom';
 import {tryParseJson} from '#core/types/object/json';
+
 import {user} from '#utils/log';
 
 const TAG = 'getJsonLd';
diff --git a/extensions/amp-story/1.0/live-story-manager.js b/extensions/amp-story/1.0/live-story-manager.js
index 113aeddbbff3..65e1001adef9 100644
--- a/extensions/amp-story/1.0/live-story-manager.js
+++ b/extensions/amp-story/1.0/live-story-manager.js
@@ -1,10 +1,13 @@
+import {CommonSignals_Enum} from '#core/constants/common-signals';
 import * as Preact from '#core/dom/jsx';
-import {Action, getStoreService} from './amp-story-store-service';
-import {CommonSignals} from '#core/constants/common-signals';
-import {Services} from '#service';
 import {lastChildElement} from '#core/dom/query';
+
+import {Services} from '#service';
+
 import {userAssert} from '#utils/log';
 
+import {Action, getStoreService} from './amp-story-store-service';
+
 /**
  * Property used for storing id of custom slot. This custom slot can be used to
  * replace the default "items" and "update" slot.
@@ -54,7 +57,7 @@ export class LiveStoryManager {
 
     this.ampStory_.element
       .signals()
-      .whenSignal(CommonSignals.LOAD_END)
+      .whenSignal(CommonSignals_Enum.LOAD_END)
       .then(() => {
         Services.extensionsFor(this.ampdoc_.win).installExtensionForDoc(
           this.ampdoc_,
diff --git a/extensions/amp-story/1.0/loading-spinner.js b/extensions/amp-story/1.0/loading-spinner.js
index 7099278d4214..58d44194e317 100644
--- a/extensions/amp-story/1.0/loading-spinner.js
+++ b/extensions/amp-story/1.0/loading-spinner.js
@@ -1,11 +1,7 @@
 import * as Preact from '#core/dom/jsx';
-import {dev} from '#utils/log';
-
-/** @const {string} */
-const SPINNER_ACTIVE_ATTRIBUTE = 'active';
 
 /** @return {!Element} */
-const renderSpinnerElement = () => (
+export const renderLoadingSpinner = () => (
   <div class="i-amphtml-story-spinner" aria-hidden="true">
     <div class="i-amphtml-story-spinner-container">
       <div class="i-amphtml-story-spinner-layer">
@@ -17,49 +13,18 @@ const renderSpinnerElement = () => (
 );
 
 /**
- * Loading spinner UI element.
+ * @param {Element} element
+ * @param {boolean} isActive
+ * @return {Element}
  */
-export class LoadingSpinner {
-  /**
-   */
-  constructor() {
-    /** @public {?Element} */
-    this.root_ = null;
-
-    /** @private {boolean} */
-    this.isActive_ = false;
-  }
-
-  /**
-   * @return {!Element}
-   */
-  build() {
-    if (this.root_) {
-      return this.root_;
-    }
-
-    this.root_ = renderSpinnerElement();
-
-    return this.getRoot();
-  }
-
-  /** @return {!Element} */
-  getRoot() {
-    return dev().assertElement(this.root_);
-  }
-
-  /** @param {boolean} isActive */
-  toggle(isActive) {
-    if (isActive === this.isActive_) {
-      return;
-    }
+export function toggleLoadingSpinner(element, isActive) {
+  if (isActive !== element.hasAttribute('active')) {
+    element.setAttribute('aria-hidden', String(!isActive));
     if (isActive) {
-      this.root_.setAttribute(SPINNER_ACTIVE_ATTRIBUTE, '');
-      this.root_.setAttribute('aria-hidden', 'false');
+      element.setAttribute('active', '');
     } else {
-      this.root_.removeAttribute(SPINNER_ACTIVE_ATTRIBUTE);
-      this.root_.setAttribute('aria-hidden', 'true');
+      element.removeAttribute('active');
     }
-    this.isActive_ = isActive;
   }
+  return element;
 }
diff --git a/extensions/amp-story/1.0/logging.js b/extensions/amp-story/1.0/logging.js
deleted file mode 100644
index 9cf32ba8186e..000000000000
--- a/extensions/amp-story/1.0/logging.js
+++ /dev/null
@@ -1,230 +0,0 @@
-import {LogLevel, devAssert} from '#utils/log';
-import {scopedQuerySelectorAll} from '#core/dom/query';
-import {tryResolve} from '#core/data-structures/promise';
-
-/** @typedef {function(!Element): (boolean|!Promise<boolean>)} */
-let ElementPredicate_1_0_Def; // eslint-disable-line local/camelcase
-
-/**
- * A log type is an abstract rule or best practice that should be followed when
- * constructing a story.  This is internal to this file, which handles finding
- * specific instances of these log types, and returning them as log entries.
- *
- * message: (required) The message shown to developers in development mode if
- *     the best practice is not followed.
- * level: (required) The log level at which this entry should be logged.
- * moreInfo: (optional) A URL to a page containing additional documentation on
- *     the best practice.
- * selector: (optional) A selector to be queried on the currently-active page,
- *     and whose results will be subject to the best practice (given that they
- *     also match the precondition).  If unspecified, the amp-story-page itself
- *     is assumed to be subject to the best practice.
- * precondition: (optional) A predicate that takes an element and returns true
- *     if the specified element should be subject to the best practice.  If
- *     unspecified, all elements that match the selector are subject to the best
- *     practice.
- * predicate: (optional) A predicate that takes an element and returns true if
- *     the element follows the best practice, or false otherwise.  If
- *     unspecified, all elements are assumed not to follow the best practice.
- *
- * @typedef {{
- *   message: string,
- *   level: !LogLevel,
- *   moreInfo: (string|undefined),
- *   selector: (string|undefined),
- *   precondition: (!ElementPredicate_1_0_Def|undefined),
- *   predicate: (!ElementPredicate_1_0_Def|undefined),
- * }}
- */
-let AmpStoryLogType_1_0_Def; // eslint-disable-line local/camelcase
-
-/**
- * A log entry is a more concrete version of a rule or best practice; it refers
- * to whether a specific element on a specific page of a specific story conforms
- * to a given best practice.
- *
- * @typedef {{
- *   element: !Element,
- *   rootElement: !Element,
- *   message: string,
- *   level: !LogLevel,
- *   conforms: boolean,
- *   moreInfo: (string|undefined),
- * }}
- */
-export let AmpStoryLogEntryDef;
-
-/** @private @const {string} */
-const AMPPROJECT_DOCS = 'https://www.ampproject.org/docs';
-
-/**
- * @param {!HTMLMediaElement} el
- * @return {!Promise<Image>}
- */
-function getPosterFromVideo(el) {
-  return new Promise((resolve, reject) => {
-    const poster = new Image();
-    poster.onload = () => resolve(poster);
-    poster.onerror = reject;
-    poster.src = el.getAttribute('poster');
-  });
-}
-
-/** @enum {!AmpStoryLogType_1_0_Def} */
-const LogType = {
-  /** Errors */
-  VIDEOS_POSTER_SPECIFIED: {
-    message: 'Videos should specify a poster image.',
-    moreInfo: AMPPROJECT_DOCS + '/reference/components/amp-video#poster',
-    selector: 'video:not([poster])',
-    level: LogLevel.ERROR,
-  },
-
-  /** Warnings */
-  IMAGES_MAX_720P_OR_SRCSET: {
-    message:
-      'Images should not be larger than 720p.  If you wish to use' +
-      ' images that are larger than 720p, you should specify a srcset.',
-    moreInfo: AMPPROJECT_DOCS + '/guides/responsive/art_direction#srcset',
-    selector: 'img:not([srcset])',
-    predicate: (el) => el.naturalWidth <= 720 && el.naturalHeight <= 1280,
-    level: LogLevel.WARN,
-  },
-
-  IMAGES_PORTRAIT: {
-    message: 'Full-bleed images should be in portrait orientation.',
-    selector: 'amp-story-grid-layer[template="fill"] > amp-img > img',
-    predicate: (el) => el.naturalWidth < el.naturalHeight,
-    level: LogLevel.WARN,
-  },
-
-  VIDEOS_MAX_720P: {
-    message: 'Videos should not be larger than 720p.',
-    selector: 'video',
-    predicate: (el) => el.videoWidth <= 720 && el.videoHeight <= 1280,
-    level: LogLevel.WARN,
-  },
-
-  VIDEOS_PORTRAIT: {
-    message: 'Full-bleed videos should be in portrait orientation.',
-    selector: 'amp-story-grid-layer[template="fill"] > amp-video > video',
-    predicate: (el) => el.videoWidth < el.videoHeight,
-    level: LogLevel.WARN,
-  },
-
-  VIDEO_POSTER_MAX_720P: {
-    message: 'Video poster images should not be larger than 720p.',
-    selector: 'video[poster]',
-    predicate: (el) =>
-      getPosterFromVideo(el).then((poster) => {
-        return poster.naturalWidth <= 720 && poster.naturalHeight <= 1280;
-      }),
-    level: LogLevel.WARN,
-  },
-
-  VIDEO_POSTER_POTRAIT: {
-    message:
-      'Poster images for full-bleed videos should be in portrait ' +
-      'orientation.',
-    selector:
-      'amp-story-grid-layer[template="fill"] > amp-video > video[poster]',
-    predicate: (el) =>
-      getPosterFromVideo(el).then(
-        (poster) => poster.naturalWidth < poster.naturalHeight
-      ),
-    level: LogLevel.WARN,
-  },
-};
-
-/**
- * Gets the log type associated with the specified key.
- * @param {string} logTypeKey
- * @return {!AmpStoryLogType_1_0_Def}
- */
-function getLogType(logTypeKey) {
-  const logType = LogType[logTypeKey];
-  devAssert(logType, `There is no log type "${logTypeKey}".`);
-  devAssert(
-    logType.message,
-    `Log type "${logTypeKey}" has no associated message.`
-  );
-  devAssert(
-    logType.level,
-    `Log type "${logTypeKey}" has no associated log level.`
-  );
-
-  return logType;
-}
-
-/**
- * @param {!Element} rootElement
- * @param {!AmpStoryLogType_1_0_Def} logType
- * @param {!Element} element
- * @return {!Promise<!AmpStoryLogEntryDef>}
- */
-function getLogEntry(rootElement, logType, element) {
-  const predicate = logType.predicate || ((unusedEl) => false);
-
-  return tryResolve(() => predicate(element)).then((conforms) => {
-    return new Promise((resolve) => {
-      resolve({
-        rootElement,
-        element,
-        conforms,
-        level: logType.level,
-        message: logType.message,
-        moreInfo: logType.moreInfo,
-      });
-    });
-  });
-}
-
-/**
- * @param {!Element} rootElement
- * @param {!AmpStoryLogType_1_0_Def} logType
- * @return {!Array<!Promise<!AmpStoryLogEntryDef>>}
- */
-function getLogEntriesForType(rootElement, logType) {
-  const precondition = logType.precondition || ((unusedEl) => true);
-
-  const elements = logType.selector
-    ? [].slice.call(scopedQuerySelectorAll(rootElement, logType.selector))
-    : [rootElement];
-
-  return elements
-    .filter(precondition)
-    .map(getLogEntry.bind(/** thisArg */ null, rootElement, logType));
-}
-
-/**
- * @param {!AmpStoryLogEntryDef} logEntryA
- * @param {!AmpStoryLogEntryDef} logEntryB
- * @return {number}
- */
-function logEntryCompareFn(logEntryA, logEntryB) {
-  if (logEntryA.conforms == logEntryB.conforms) {
-    // For entries within that are all conformant or all non-conformant, sort by
-    // log level, with most severe entries first and least severe entries last.
-    return logEntryA.level <= logEntryB.level ? -1 : 1;
-  } else {
-    // false < true, so non-conformant issues go before conformant ones.
-    return logEntryA.conforms < logEntryB.conforms ? -1 : 1;
-  }
-}
-
-/**
- * Gets a promise which yields a list of log entries for the specified element.
- * @param {!Element} rootElement
- * @return {!Promise<!Array<!AmpStoryLogEntryDef>>}
- */
-export function getLogEntries(rootElement) {
-  const logEntryPromises = Object.keys(LogType).reduce((entries, key) => {
-    const logType = getLogType(key);
-    const newEntries = getLogEntriesForType(rootElement, logType);
-    return entries.concat(newEntries);
-  }, []);
-
-  return Promise.all(logEntryPromises).then((logEntries) => {
-    return logEntries.sort(logEntryCompareFn);
-  });
-}
diff --git a/extensions/amp-story/1.0/media-performance-metrics-service.js b/extensions/amp-story/1.0/media-performance-metrics-service.js
index adc9b3a7d654..9b6b5df73503 100644
--- a/extensions/amp-story/1.0/media-performance-metrics-service.js
+++ b/extensions/amp-story/1.0/media-performance-metrics-service.js
@@ -1,10 +1,13 @@
-import {MEDIA_LOAD_FAILURE_SRC_PROPERTY, listen} from '#utils/event-helper';
+import {TickLabel_Enum} from '#core/constants/enums';
+import {lastChildElement, matches} from '#core/dom/query';
+import {toArray} from '#core/types/array';
+
 import {Services} from '#service';
-import {TickLabel} from '#core/constants/enums';
+
+import {MEDIA_LOAD_FAILURE_SRC_PROPERTY, listen} from '#utils/event-helper';
 import {dev} from '#utils/log';
-import {lastChildElement, matches} from '#core/dom/query';
+
 import {registerServiceBuilder} from '../../../src/service-helpers';
-import {toArray} from '#core/types/array';
 
 /**
  * Media status.
@@ -189,11 +192,11 @@ export class MediaPerformanceMetricsService {
     const {media, metrics} = mediaEntry;
 
     this.performanceService_.tickDelta(
-      TickLabel.VIDEO_CACHE_STATE,
+      TickLabel_Enum.VIDEO_CACHE_STATE,
       this.getVideoCacheState_(media)
     );
     this.performanceService_.tickDelta(
-      TickLabel.VIDEO_ON_FIRST_PAGE,
+      TickLabel_Enum.VIDEO_ON_FIRST_PAGE,
       matches(media, `amp-story-page:first-of-type ${media.tagName}`)
         ? FirstPageState.ON_FIRST_PAGE
         : FirstPageState.NOT_ON_FIRST_PAGE
@@ -202,7 +205,7 @@ export class MediaPerformanceMetricsService {
     // If the media errored.
     if (metrics.error !== null) {
       this.performanceService_.tickDelta(
-        TickLabel.VIDEO_ERROR,
+        TickLabel_Enum.VIDEO_ERROR,
         metrics.error || 0
       );
       this.performanceService_.flush();
@@ -221,7 +224,7 @@ export class MediaPerformanceMetricsService {
     // If the playback did not start.
     if (!metrics.jointLatency) {
       this.performanceService_.tickDelta(
-        TickLabel.VIDEO_ERROR,
+        TickLabel_Enum.VIDEO_ERROR,
         5 /* Custom error code */
       );
       this.performanceService_.flush();
@@ -233,24 +236,24 @@ export class MediaPerformanceMetricsService {
     );
 
     this.performanceService_.tickDelta(
-      TickLabel.VIDEO_JOINT_LATENCY,
+      TickLabel_Enum.VIDEO_JOINT_LATENCY,
       metrics.jointLatency
     );
     this.performanceService_.tickDelta(
-      TickLabel.VIDEO_WATCH_TIME,
+      TickLabel_Enum.VIDEO_WATCH_TIME,
       metrics.watchTime
     );
     this.performanceService_.tickDelta(
-      TickLabel.VIDEO_REBUFFERS,
+      TickLabel_Enum.VIDEO_REBUFFERS,
       metrics.rebuffers
     );
     this.performanceService_.tickDelta(
-      TickLabel.VIDEO_REBUFFER_RATE,
+      TickLabel_Enum.VIDEO_REBUFFER_RATE,
       rebufferRate
     );
     if (metrics.rebuffers) {
       this.performanceService_.tickDelta(
-        TickLabel.VIDEO_MEAN_TIME_BETWEEN_REBUFFER,
+        TickLabel_Enum.VIDEO_MEAN_TIME_BETWEEN_REBUFFER,
         Math.round(metrics.watchTime / metrics.rebuffers)
       );
     }
diff --git a/extensions/amp-story/1.0/media-pool.js b/extensions/amp-story/1.0/media-pool.js
index 340ec67e8f3b..d53cb47396e4 100644
--- a/extensions/amp-story/1.0/media-pool.js
+++ b/extensions/amp-story/1.0/media-pool.js
@@ -1,3 +1,13 @@
+import {isConnectedNode} from '#core/dom';
+import {matches} from '#core/dom/query';
+import {findIndex} from '#core/types/array';
+import {getWin} from '#core/window';
+
+import {Services} from '#service';
+
+import {MEDIA_LOAD_FAILURE_SRC_PROPERTY} from '#utils/event-helper';
+import {dev, devAssert} from '#utils/log';
+
 import {
   BlessTask,
   ELEMENT_BLESSED_PROPERTY_NAME,
@@ -11,20 +21,14 @@ import {
   UnmuteTask,
   UpdateSourcesTask,
 } from './media-tasks';
-import {MEDIA_LOAD_FAILURE_SRC_PROPERTY} from '#utils/event-helper';
-import {Services} from '#service';
 import {Sources} from './sources';
 import {ampMediaElementFor} from './utils';
-import {dev, devAssert} from '#utils/log';
-import {findIndex} from '#core/types/array';
-import {isConnectedNode} from '#core/dom';
-import {matches} from '#core/dom/query';
-import {getWin} from '#core/window';
+
 import {userInteractedWith} from '../../../src/video-interface';
 
-/** @const @enum {string} */
-export const MediaType = {
-  UNSUPPORTED: 'unsupported',
+/** @const @enum {string|number} */
+export const MediaType_Enum = {
+  UNSUPPORTED: 0,
   AUDIO: 'audio',
   VIDEO: 'video',
 };
@@ -100,7 +104,7 @@ const MEDIA_ELEMENT_ORIGIN_PROPERTY_NAME = '__AMP_MEDIA_ELEMENT_ORIGIN__';
 export const REPLACED_MEDIA_PROPERTY_NAME = 'replaced-media';
 
 /**
- * @type {!Object<string, !MediaPool>}
+ * @type {!{[key: string]: !MediaPool}}
  */
 const instances = {};
 
@@ -116,7 +120,7 @@ let nextInstanceId = 0;
 export class MediaPool {
   /**
    * @param {!Window} win The window object.
-   * @param {!Object<!MediaType, number>} maxCounts The maximum amount of each
+   * @param {!{[key: !MediaType_Enum]: number}} maxCounts The maximum amount of each
    *     media element that can be allocated by the pool.
    * @param {!ElementDistanceFnDef} distanceFn A function that, given an
    *     element, returns the distance of that element from the current position
@@ -139,28 +143,40 @@ export class MediaPool {
 
     /**
      * Holds all of the pool-bound media elements that have been allocated.
-     * @const {!Object<!MediaType, !Array<!PoolBoundElementDef>>}
+     * @const {!{[key: !MediaType_Enum]: !Array<!PoolBoundElementDef>}}
      * @visibleForTesting
      */
     this.allocated = {};
 
     /**
      * Holds all of the pool-bound media elements that have not been allocated.
-     * @const {!Object<!MediaType, !Array<!PoolBoundElementDef>>}
+     * @const {!{[key: !MediaType_Enum]: !Array<!PoolBoundElementDef>}}
      * @visibleForTesting
      */
     this.unallocated = {};
 
     /**
      * Maps a media element's ID to the object containing its sources.
-     * @private @const {!Object<string, !Sources>}
+     * @private @const {!{[key: string]: !Sources}}
      */
     this.sources_ = {};
 
+    /**
+     * The audio context.
+     * @private {?AudioContext}
+     */
+    this.audioContext_ = null;
+
+    /**
+     * Maps a media element's ID to its audio gain node.
+     * @private @const {!{[key: string]: !MediaElementAudioSourceNode}}
+     */
+    this.audioGainNodes_ = {};
+
     /**
      * Maps a media element's ID to the element.  This is necessary, as elements
      * are kept in memory when they are swapped out of the DOM.
-     * @private @const {!Object<string, !PlaceholderElementDef>}
+     * @private @const {!{[key: string]: !PlaceholderElementDef}}
      */
     this.placeholderEls_ = {};
 
@@ -180,9 +196,9 @@ export class MediaPool {
     /** @private {?Array<!AmpElement>} */
     this.ampElementsToBless_ = null;
 
-    /** @const {!Object<string, (function(): !PoolBoundElementDef)>} */
+    /** @const {!{[key: string]: (function(): !PoolBoundElementDef)}} */
     this.mediaFactory_ = {
-      [MediaType.AUDIO]: () => {
+      [MediaType_Enum.AUDIO]: () => {
         const audioEl = this.win_.document.createElement('audio');
         audioEl.setAttribute('muted', '');
         audioEl.muted = true;
@@ -190,7 +206,7 @@ export class MediaPool {
         audioEl.classList.add('i-amphtml-pool-audio');
         return audioEl;
       },
-      [MediaType.VIDEO]: () => {
+      [MediaType_Enum.VIDEO]: () => {
         const videoEl = this.win_.document.createElement('video');
         videoEl.setAttribute('muted', '');
         videoEl.muted = true;
@@ -209,20 +225,15 @@ export class MediaPool {
    * each of the types of media elements.  We need to create these eagerly so
    * that all media elements exist by the time that blessAll() is invoked,
    * thereby "blessing" all media elements for playback without user gesture.
-   * @param {!Object<!MediaType, number>} maxCounts The maximum amount of each
+   * @param {!{[key: !MediaType_Enum]: number}} maxCounts The maximum amount of each
    *     media element that can be allocated by the pool.
    * @private
    */
   initializeMediaPool_(maxCounts) {
     let poolIdCounter = 0;
 
-    this.forEachMediaType_((key) => {
-      const type = MediaType[key];
-      const count = maxCounts[type] || 0;
-
-      if (count <= 0) {
-        return;
-      }
+    for (const type in maxCounts) {
+      const count = maxCounts[type];
 
       const ctor = devAssert(
         this.mediaFactory_[type],
@@ -231,7 +242,7 @@ export class MediaPool {
 
       // Cloning nodes is faster than building them.
       // Construct a seed media element as a small optimization.
-      const mediaElSeed = ctor.call(this);
+      const mediaElSeed = ctor();
 
       this.allocated[type] = [];
       this.unallocated[type] = [];
@@ -252,7 +263,7 @@ export class MediaPool {
         mediaEl[MEDIA_ELEMENT_ORIGIN_PROPERTY_NAME] = MediaElementOrigin.POOL;
         this.unallocated[type].push(mediaEl);
       }
-    });
+    }
   }
 
   /**
@@ -317,25 +328,25 @@ export class MediaPool {
    * Gets the media type from a given element.
    * @param {!PoolBoundElementDef|!PlaceholderElementDef} mediaElement The
    *     element whose media type should be retrieved.
-   * @return {!MediaType}
+   * @return {!MediaType_Enum}
    * @private
    */
   getMediaType_(mediaElement) {
     const tagName = mediaElement.tagName.toLowerCase();
     switch (tagName) {
       case 'audio':
-        return MediaType.AUDIO;
+        return MediaType_Enum.AUDIO;
       case 'video':
-        return MediaType.VIDEO;
+        return MediaType_Enum.VIDEO;
       default:
-        return MediaType.UNSUPPORTED;
+        return MediaType_Enum.UNSUPPORTED;
     }
   }
 
   /**
    * Reserves an element of the specified type by removing it from the set of
    * unallocated elements and returning it.
-   * @param {!MediaType} mediaType The type of media element to reserve.
+   * @param {!MediaType_Enum} mediaType The type of media element to reserve.
    * @return {?PoolBoundElementDef} The reserved element, if one exists.
    * @private
    */
@@ -346,7 +357,7 @@ export class MediaPool {
   /**
    * Retrieves the media element from the pool that matches the specified
    * element, if one exists.
-   * @param {!MediaType} mediaType The type of media element to get.
+   * @param {!MediaType_Enum} mediaType The type of media element to get.
    * @param {!DomElementDef} domMediaEl The element whose matching media
    *     element should be retrieved.
    * @return {?PoolBoundElementDef} The media element in the pool that
@@ -368,7 +379,7 @@ export class MediaPool {
 
   /**
    * Allocates the specified media element of the specified type.
-   * @param {!MediaType} mediaType The type of media element to allocate.
+   * @param {!MediaType_Enum} mediaType The type of media element to allocate.
    * @param {!PoolBoundElementDef} poolMediaEl The element to be allocated.
    * @private
    */
@@ -386,7 +397,7 @@ export class MediaPool {
   /**
    * Deallocates and returns the media element of the specified type furthest
    * from the current position in the document.
-   * @param {!MediaType} mediaType The type of media element to deallocate.
+   * @param {!MediaType_Enum} mediaType The type of media element to deallocate.
    * @param {!PlaceholderElementDef=} opt_elToAllocate If specified, the element
    *     that is trying to be allocated, such that another element must be
    *     evicted.
@@ -444,7 +455,7 @@ export class MediaPool {
   /**
    * Evicts an element of the specified type, replaces it in the DOM with the
    * original media element, and returns it.
-   * @param {!MediaType} mediaType The type of media element to evict.
+   * @param {!MediaType_Enum} mediaType The type of media element to evict.
    * @param {!PlaceholderElementDef=} opt_elToAllocate If specified, the element
    *     that is trying to be allocated, such that another element must be
    *     evicted.
@@ -465,7 +476,7 @@ export class MediaPool {
   }
 
   /**
-   * @param {!MediaType} mediaType The media type to check.
+   * @param {!MediaType_Enum} mediaType The media type to check.
    * @param {!DomElementDef} domMediaEl The element to check.
    * @return {boolean} true, if the specified element has already been allocated
    *     as the specified type of media element.
@@ -533,6 +544,10 @@ export class MediaPool {
       return Promise.resolve();
     }
 
+    if (this.audioGainNodes_[componentEl.id]) {
+      this.setVolume_(componentEl, 1);
+    }
+
     return componentEl.getImpl().then((impl) => {
       if (impl.resetOnDomChange) {
         impl.resetOnDomChange();
@@ -543,15 +558,17 @@ export class MediaPool {
   /**
    * @param {!PoolBoundElementDef} poolMediaEl The element whose source should
    *     be reset.
+   * @param {!Sources=} sources Optional sources for the media element.
    * @return {!Promise} A promise that is resolved when the pool media element
    *     has been reset.
    */
-  resetPoolMediaElementSource_(poolMediaEl) {
-    const defaultSources = this.getDefaultSource_();
-
+  resetPoolMediaElementSource_(
+    poolMediaEl,
+    sources = this.getDefaultSource_()
+  ) {
     return this.enqueueMediaElementTask_(
       poolMediaEl,
-      new UpdateSourcesTask(this.win_, defaultSources)
+      new UpdateSourcesTask(this.win_, sources)
     ).then(() => this.enqueueMediaElementTask_(poolMediaEl, new LoadTask()));
   }
 
@@ -584,33 +601,6 @@ export class MediaPool {
     return swapOutOfDom;
   }
 
-  /**
-   * @param {function(string)} callbackFn
-   * @private
-   */
-  forEachMediaType_(callbackFn) {
-    Object.keys(MediaType).forEach(callbackFn.bind(this));
-  }
-
-  /**
-   * Invokes a function for all media managed by the media pool.
-   * @param {function(!PoolBoundElementDef)} callbackFn The function to be
-   *     invoked.
-   * @private
-   */
-  forEachMediaElement_(callbackFn) {
-    [this.allocated, this.unallocated].forEach((mediaSet) => {
-      this.forEachMediaType_((key) => {
-        const type = MediaType[key];
-        const els = /** @type {!Array} */ (mediaSet[type]);
-        if (!els) {
-          return;
-        }
-        els.forEach(callbackFn.bind(this));
-      });
-    });
-  }
-
   /**
    * Preloads the content of the specified media element in the DOM and returns
    * a media element that can be used in its stead for playback.
@@ -679,24 +669,51 @@ export class MediaPool {
     return this.enqueueMediaElementTask_(poolMediaEl, new BlessTask());
   }
 
+  /**
+   * Reregisters the specified element to be usable by the media pool. This
+   * is useful in cases where the element's sources have updated since the
+   * previous registration and a reload of the element using these new sources
+   * is desired.
+   * @param {!DomElementDef} domMediaEl The media element to be reregistered.
+   * @return {!Promise} A promise that is resolved when the element has been
+   *     successfully reregistered, or rejected otherwise.
+   */
+  reregister(domMediaEl) {
+    return this.register(domMediaEl, true /** isReregistration */);
+  }
+
   /**
    * Registers the specified element to be usable by the media pool.  Elements
    * should be registered as early as possible, in order to prevent them from
-   * being played while not managed by the media pool.  If the media element is
-   * already registered, this is a no-op.  Registering elements from within the
-   * pool is not allowed, and will also be a no-op.
+   * being played while not managed by the media pool. Registering elements
+   * from within the pool is not allowed, and will also be a no-op.
+   *
+   * If the media element is already registered and `isReregistration` is true,
+   * then the media element will be loaded. However, if the element is
+   * registered and `isReregistration` is false, then this is a no-op.
    * @param {!DomElementDef} domMediaEl The media element to be
    *     registered.
+   * @param {boolean=} isReregistration Whether the given element has already
+   *     been registered.
    * @return {!Promise} A promise that is resolved when the element has been
    *     successfully registered, or rejected otherwise.
    */
-  register(domMediaEl) {
+  register(domMediaEl, isReregistration = false) {
     const parent = domMediaEl.parentNode;
     if (parent && parent.signals) {
       this.trackAmpElementToBless_(/** @type {!AmpElement} */ (parent));
     }
 
     if (this.isPoolMediaElement_(domMediaEl)) {
+      // In the case of a reregistration, `UpdateSourcesTask` and `LoadTask`
+      // are used to load the element using its sources (which may have changed
+      // since the previous registration).
+      if (isReregistration) {
+        const sources = Sources.removeFrom(this.win_, domMediaEl);
+        this.sources_[domMediaEl.id] = sources;
+        return this.resetPoolMediaElementSource_(domMediaEl, sources);
+      }
+
       // This media element originated from the media pool.
       return Promise.resolve();
     }
@@ -790,10 +807,21 @@ export class MediaPool {
     return this.enqueueMediaElementTask_(poolMediaEl, new PauseTask()).then(
       () => {
         if (rewindToBeginning) {
-          this.enqueueMediaElementTask_(
-            /** @type {!PoolBoundElementDef} */ (poolMediaEl),
-            new SetCurrentTimeTask({currentTime: 0})
-          );
+          // TODO: https://github.com/ampproject/amphtml/issues/38595 implement
+          // proper fix to frame management.
+          // We add a 100 second delay to rewinding as sometimes this causes an
+          // interlacing/glitch/frame jump when a new video is starting to play.
+          // A 0 delay isn't enough as we need to push the "seeking" event
+          // to the next tick of the event loop.
+          // NOTE: Please note that this is not an ideal solution and a bit hacky.
+          // The more ideal fix would be to fix the navigations animation frames.
+          // See https://github.com/ampproject/amphtml/issues/38531
+          this.timer_.delay(() => {
+            this.enqueueMediaElementTask_(
+              /** @type {!PoolBoundElementDef} */ (poolMediaEl),
+              new SetCurrentTimeTask({currentTime: 0})
+            );
+          }, 100);
         }
       }
     );
@@ -850,9 +878,9 @@ export class MediaPool {
       return Promise.resolve();
     }
 
-    // When a video is muted, reset its volume to the default value of 1.
-    if (mediaType == MediaType.VIDEO) {
-      domMediaEl.volume = 1;
+    const audioGainNode = this.audioGainNodes_[domMediaEl.id];
+    if (audioGainNode) {
+      audioGainNode.gain.value = 0;
     }
 
     return this.enqueueMediaElementTask_(poolMediaEl, new MuteTask());
@@ -862,7 +890,7 @@ export class MediaPool {
    * Unmutes the specified media element in the DOM.
    * @param {!DomElementDef} domMediaEl The media element to be unmuted.
    * @return {!Promise} A promise that is resolved when the specified media
-   *     element has been successfully paused.
+   *     element has been successfully unmuted.
    */
   unmute(domMediaEl) {
     const mediaType = this.getMediaType_(domMediaEl);
@@ -875,12 +903,16 @@ export class MediaPool {
       return Promise.resolve();
     }
 
-    if (mediaType == MediaType.VIDEO) {
+    if (mediaType == MediaType_Enum.VIDEO) {
       const ampVideoEl = domMediaEl.parentElement;
       if (ampVideoEl) {
-        const volume = ampVideoEl.getAttribute('volume');
-        if (volume) {
-          domMediaEl.volume = parseFloat(volume);
+        const volume = parseFloat(ampVideoEl.getAttribute('volume'));
+        const isMuted = volume <= 0 || ampVideoEl.hasAttribute('noaudio');
+        if (isMuted) {
+          return Promise.resolve();
+        }
+        if (volume < 1) {
+          this.setVolume_(domMediaEl, volume);
         }
       }
     }
@@ -888,6 +920,35 @@ export class MediaPool {
     return this.enqueueMediaElementTask_(poolMediaEl, new UnmuteTask());
   }
 
+  /**
+   * Updates the volume of the provided media element.
+   * @param {!DomElementDef} domMediaEl The media element whose volume will be set.
+   * @param {number} volume The volume to be applied to the media element.
+   * @private
+   */
+  setVolume_(domMediaEl, volume) {
+    // Handle cross-browser differences (see https://googlechrome.github.io/samples/webaudio-method-chaining/).
+    if (typeof AudioContext === 'function') {
+      this.audioContext_ = this.audioContext_ || new AudioContext();
+    } else if (typeof webkitAudioContext === 'function') {
+      this.audioContext_ =
+        this.audioContext_ || new global.webkitAudioContext();
+    }
+
+    if (this.audioContext_) {
+      if (!this.audioGainNodes_[domMediaEl.id]) {
+        const audioSource =
+          this.audioContext_.createMediaElementSource(domMediaEl);
+        const audioGainNode = this.audioContext_.createGain();
+        this.audioGainNodes_[domMediaEl.id] = audioGainNode;
+        audioSource
+          .connect(audioGainNode)
+          .connect(this.audioContext_.destination);
+      }
+      this.audioGainNodes_[domMediaEl.id].gain.value = volume;
+    }
+  }
+
   /**
    * "Blesses" all media elements in the media pool for future playback without
    * a user gesture.  In order for this to bless the media elements, this
@@ -900,16 +961,18 @@ export class MediaPool {
       return Promise.resolve();
     }
 
-    const blessPromises = [];
-
     (this.ampElementsToBless_ || []).forEach(userInteractedWith);
 
     this.ampElementsToBless_ = null; // GC
 
-    this.forEachMediaElement_((mediaEl) => {
-      blessPromises.push(this.bless_(mediaEl));
-    });
+    const elements = [
+      ...this.allocated[MediaType_Enum.AUDIO],
+      ...this.unallocated[MediaType_Enum.VIDEO],
+      ...this.allocated[MediaType_Enum.AUDIO],
+      ...this.unallocated[MediaType_Enum.VIDEO],
+    ];
 
+    const blessPromises = elements.map((element) => this.bless_(element));
     return Promise.all(blessPromises).then(
       () => {
         this.blessed_ = true;
@@ -945,9 +1008,9 @@ export class MediaPool {
     };
 
     if (task.requiresSynchronousExecution()) {
-      executionFn.call(this);
+      executionFn();
     } else {
-      this.timer_.delay(executionFn.bind(this), 0);
+      this.timer_.delay(executionFn, 0);
     }
   }
 
@@ -1025,7 +1088,7 @@ export class MediaPoolRoot {
   getElementDistance(unusedElement) {}
 
   /**
-   * @return {!Object<!MediaType, number>} The maximum amount of each media
+   * @return {!{[key: !MediaType_Enum]: number}} The maximum amount of each media
    *     type to allow within this element.
    */
   getMaxMediaElementCounts() {}
diff --git a/extensions/amp-story/1.0/media-tasks.js b/extensions/amp-story/1.0/media-tasks.js
index 59679b43f64d..2148b2d6813f 100644
--- a/extensions/amp-story/1.0/media-tasks.js
+++ b/extensions/amp-story/1.0/media-tasks.js
@@ -1,7 +1,8 @@
 import {Deferred} from '#core/data-structures/promise';
+import {isConnectedNode} from '#core/dom';
 import {tryPlay} from '#core/dom/video';
+
 import {Sources} from './sources';
-import {isConnectedNode} from '#core/dom';
 
 /**
  * The name for a boolean property on an element indicating whether that element
diff --git a/extensions/amp-story/1.0/page-advancement.js b/extensions/amp-story/1.0/page-advancement.js
index 5c184195f131..7fcef0a30ca4 100644
--- a/extensions/amp-story/1.0/page-advancement.js
+++ b/extensions/amp-story/1.0/page-advancement.js
@@ -1,23 +1,26 @@
-import {AFFILIATE_LINK_SELECTOR} from './amp-story-affiliate-link';
+import {escapeCssSelectorIdent} from '#core/dom/css-selectors';
+import {closest, matches} from '#core/dom/query';
+
+import {Services} from '#service';
+import {TAPPABLE_ARIA_ROLES} from '#service/action-impl';
+
+import {listenOnce} from '#utils/event-helper';
+import {dev, user} from '#utils/log';
+
+import {interactiveElementsSelectors} from './amp-story-embedded-component';
 import {
   Action,
   EmbeddedComponentState,
   InteractiveComponentDef,
   StateProperty,
-  UIType,
+  UIType_Enum,
   getStoreService,
 } from './amp-story-store-service';
 import {AdvancementMode} from './story-analytics';
-import {Services} from '#service';
-import {TAPPABLE_ARIA_ROLES} from '#service/action-impl';
-import {VideoEvents} from '../../../src/video-interface';
-import {closest, matches} from '#core/dom/query';
-import {dev, user} from '#utils/log';
-import {escapeCssSelectorIdent} from '#core/dom/css-selectors';
-import {getAmpdoc} from '../../../src/service-helpers';
 import {hasTapAction, timeStrToMillis} from './utils';
-import {interactiveElementsSelectors} from './amp-story-embedded-component';
-import {listenOnce} from '#utils/event-helper';
+
+import {getAmpdoc} from '../../../src/service-helpers';
+import {VideoEvents_Enum} from '../../../src/video-interface';
 
 /** @private @const {number} */
 const HOLD_TOUCH_THRESHOLD_MS = 500;
@@ -59,10 +62,6 @@ const MINIMUM_TIME_BASED_AUTO_ADVANCE_MS = 500;
  */
 const MAX_LINK_SCREEN_PERCENT = 0.8;
 
-const INTERACTIVE_EMBEDDED_COMPONENTS_SELECTORS = Object.values(
-  interactiveElementsSelectors()
-).join(',');
-
 /** @const {number} */
 export const POLL_INTERVAL_MS = 300;
 
@@ -72,6 +71,14 @@ export const TapNavigationDirection = {
   'PREVIOUS': 2,
 };
 
+/** @enum {number} */
+export const AdvancementConfigType = {
+  ADVANCEMENT_CONFIG: 0,
+  MANUAL_ADVANCEMENT: 1,
+  TIME_BASED_ADVANCEMENT: 2,
+  MEDIA_BASED_ADVANCEMENT: 3,
+};
+
 /**
  * Base class for the AdvancementConfig.  By default, does nothing other than
  * tracking its internal state when started/stopped, and listeners will never be
@@ -98,6 +105,14 @@ export class AdvancementConfig {
     this.isRunning_ = false;
   }
 
+  /**
+   * @return {AdvancementConfigType} A value indicating the type of advancement
+   *     config.
+   */
+  getType() {
+    return AdvancementConfigType.ADVANCEMENT_CONFIG;
+  }
+
   /**
    * @param {function(number)} progressListener A function that handles when the
    *     progress of the current page has been updated.  It accepts a number
@@ -132,10 +147,20 @@ export class AdvancementConfig {
     this.tapNavigationListeners_.push(onTapNavigationListener);
   }
 
+  /** Removes all listeners added to this advancement config. */
+  removeAllAddedListeners() {
+    this.progressListeners_ = [];
+    this.advanceListeners_ = [];
+    this.previousListeners_ = [];
+    this.tapNavigationListeners_ = [];
+  }
+
   /**
    * Invoked when the advancement configuration should begin taking effect.
+   * @param {number=} unusedProgressStartVal An optional value at which to
+   *     start the advancement.
    */
-  start() {
+  start(unusedProgressStartVal = undefined) {
     this.isRunning_ = true;
   }
 
@@ -170,9 +195,12 @@ export class AdvancementConfig {
     return 1;
   }
 
-  /** @protected */
-  onProgressUpdate() {
-    const progress = this.getProgress();
+  /**
+   * @param {number=} progressOverride
+   * @protected
+   */
+  onProgressUpdate(progressOverride = undefined) {
+    const progress = progressOverride ?? this.getProgress();
     this.progressListeners_.forEach((progressListener) => {
       progressListener(progress);
     });
@@ -302,6 +330,11 @@ export class ManualAdvancement extends AdvancementConfig {
     };
   }
 
+  /** @override */
+  getType() {
+    return AdvancementConfigType.MANUAL_ADVANCEMENT;
+  }
+
   /** @override */
   getProgress() {
     return 1.0;
@@ -396,12 +429,7 @@ export class ManualAdvancement extends AdvancementConfig {
     this.touchstartTimestamp_ = null;
     this.timer_.cancel(this.timeoutId_);
     this.timeoutId_ = null;
-    if (
-      !this.storeService_.get(StateProperty.SYSTEM_UI_IS_VISIBLE_STATE) &&
-      /** @type {InteractiveComponentDef} */ (
-        this.storeService_.get(StateProperty.INTERACTIVE_COMPONENT_STATE)
-      ).state !== EmbeddedComponentState.EXPANDED
-    ) {
+    if (!this.storeService_.get(StateProperty.SYSTEM_UI_IS_VISIBLE_STATE)) {
       this.storeService_.dispatch(Action.TOGGLE_SYSTEM_UI_IS_VISIBLE, true);
     }
   }
@@ -462,6 +490,8 @@ export class ManualAdvancement extends AdvancementConfig {
       (el) => {
         tagName = el.tagName.toLowerCase();
 
+        // Prevents navigation when clicking inside of draggable drawer elements,
+        // such as <amp-story-page-attachment> and <amp-story-page-outlink>.
         if (el.classList.contains('amp-story-draggable-drawer-root')) {
           shouldHandleEvent = false;
           return true;
@@ -486,11 +516,21 @@ export class ManualAdvancement extends AdvancementConfig {
           return true;
         }
 
+        if (tagName === 'amp-story-audio-sticker') {
+          shouldHandleEvent = false;
+          return true;
+        }
+
         if (tagName === 'amp-story-page') {
           shouldHandleEvent = true;
           return true;
         }
 
+        if (tagName === 'amp-story-subscriptions') {
+          shouldHandleEvent = true;
+          return true;
+        }
+
         return false;
       },
       /* opt_stopAt */ this.element_
@@ -523,7 +563,6 @@ export class ManualAdvancement extends AdvancementConfig {
         tagName = el.tagName.toLowerCase();
 
         if (
-          tagName === 'amp-story-cta-layer' ||
           tagName === 'amp-story-page-attachment' ||
           tagName === 'amp-story-page-outlink'
         ) {
@@ -637,39 +676,13 @@ export class ManualAdvancement extends AdvancementConfig {
    */
   isHandledByEmbeddedComponent_(event, pageRect) {
     const target = dev().assertElement(event.target);
-    const stored = /** @type {InteractiveComponentDef} */ (
-      this.storeService_.get(StateProperty.INTERACTIVE_COMPONENT_STATE)
-    );
-    const inExpandedMode = stored.state === EmbeddedComponentState.EXPANDED;
 
     return (
-      inExpandedMode ||
-      (matches(target, INTERACTIVE_EMBEDDED_COMPONENTS_SELECTORS) &&
-        this.canShowTooltip_(event, pageRect))
+      matches(target, interactiveElementsSelectors()) &&
+      this.canShowTooltip_(event, pageRect)
     );
   }
 
-  /**
-   * Check if click should be handled by the affiliate link logic.
-   * @param {!Element} target
-   * @private
-   * @return {boolean}
-   */
-  isHandledByAffiliateLink_(target) {
-    const clickedOnLink = matches(target, AFFILIATE_LINK_SELECTOR);
-
-    // do not handle if clicking on expanded affiliate link
-    if (clickedOnLink && target.hasAttribute('expanded')) {
-      return false;
-    }
-
-    const expandedElement = this.storeService_.get(
-      StateProperty.AFFILIATE_LINK_STATE
-    );
-
-    return expandedElement != null || clickedOnLink;
-  }
-
   /**
    * Performs a system navigation if it is determined that the specified event
    * was a click intended for navigation.
@@ -696,18 +709,6 @@ export class ManualAdvancement extends AdvancementConfig {
       return;
     }
 
-    if (this.isHandledByAffiliateLink_(target)) {
-      event.preventDefault();
-      event.stopPropagation();
-      const clickedOnLink = matches(target, AFFILIATE_LINK_SELECTOR);
-      if (clickedOnLink) {
-        this.storeService_.dispatch(Action.TOGGLE_AFFILIATE_LINK, target);
-      } else {
-        this.storeService_.dispatch(Action.TOGGLE_AFFILIATE_LINK, null);
-      }
-      return;
-    }
-
     if (
       !this.isRunning() ||
       !this.isNavigationalClick_(event) ||
@@ -741,7 +742,7 @@ export class ManualAdvancement extends AdvancementConfig {
   }
 
   /**
-   * Calculates the pageRect based on the UIType.
+   * Calculates the pageRect based on the UIType_Enum.
    * We can an use LayoutBox for mobile since the story page occupies entire screen.
    * Desktop UI needs the most recent value from the getBoundingClientRect function.
    * @return {DOMRect | LayoutBox}
@@ -749,7 +750,7 @@ export class ManualAdvancement extends AdvancementConfig {
    */
   getStoryPageRect_() {
     const uiState = this.storeService_.get(StateProperty.UI_STATE);
-    if (uiState !== UIType.DESKTOP_ONE_PANEL) {
+    if (uiState !== UIType_Enum.DESKTOP_ONE_PANEL) {
       return this.element_.getLayoutBox();
     } else {
       return this.element_
@@ -834,6 +835,11 @@ export class TimeBasedAdvancement extends AdvancementConfig {
     }
   }
 
+  /** @override */
+  getType() {
+    return AdvancementConfigType.TIME_BASED_ADVANCEMENT;
+  }
+
   /**
    * @return {number} The current timestamp, in milliseconds.
    * @private
@@ -843,9 +849,17 @@ export class TimeBasedAdvancement extends AdvancementConfig {
   }
 
   /** @override */
-  start() {
+  start(progressStartVal = undefined) {
     super.start();
 
+    if (progressStartVal) {
+      // We calculate this advancement's remaining milliseconds, based upon the
+      // the given start value. This enables the advancement to begin at a
+      // progress percentage greater than 0%.
+      const remainingDelayPct = 1 - progressStartVal;
+      this.remainingDelayMs_ = this.delayMs_ * remainingDelayPct;
+    }
+
     if (this.remainingDelayMs_) {
       this.startTimeMs_ =
         this.getCurrentTimestampMs_() -
@@ -895,9 +909,7 @@ export class TimeBasedAdvancement extends AdvancementConfig {
       return 0;
     }
 
-    const progress =
-      (this.getCurrentTimestampMs_() - this.startTimeMs_) / this.delayMs_;
-
+    const progress = this.getProgressMs() / this.delayMs_;
     return Math.min(Math.max(progress, 0), 1);
   }
 
@@ -925,6 +937,24 @@ export class TimeBasedAdvancement extends AdvancementConfig {
     this.delayMs_ = newDelayMs;
   }
 
+  /**
+   * @return {number} The progress, in terms of milliseconds elapsed.
+   */
+  getProgressMs() {
+    if (this.startTimeMs_ === null) {
+      return 0;
+    }
+    return this.getCurrentTimestampMs_() - this.startTimeMs_;
+  }
+
+  /**
+   * @return {number} The time, in milliseconds, that this advancement was
+   *     configured to wait before advancing.
+   */
+  getDelayMs() {
+    return this.delayMs_;
+  }
+
   /**
    * Gets an instance of TimeBasedAdvancement based on the value of the
    * auto-advance string (from the 'auto-advance-after' attribute on the page).
@@ -994,6 +1024,11 @@ export class MediaBasedAdvancement extends AdvancementConfig {
     this.storeService_ = getStoreService(win);
   }
 
+  /** @override */
+  getType() {
+    return AdvancementConfigType.MEDIA_BASED_ADVANCEMENT;
+  }
+
   /**
    * Determines whether the element for auto advancement implements the video
    * interface.
@@ -1028,19 +1063,23 @@ export class MediaBasedAdvancement extends AdvancementConfig {
   }
 
   /** @override */
-  start() {
+  start(progressStartVal = undefined) {
     super.start();
 
     // Prevents race condition when checking for video interface classname.
     (this.element_.build ? this.element_.build() : Promise.resolve()).then(() =>
-      this.startWhenBuilt_()
+      this.startWhenBuilt_(progressStartVal)
     );
   }
 
-  /** @private */
-  startWhenBuilt_() {
+  /**
+   * @param {number=} progressStartVal An optional value at which to start
+   *     the advancement.
+   * @private
+   */
+  startWhenBuilt_(progressStartVal = undefined) {
     if (this.isVideoInterfaceVideo_()) {
-      this.startVideoInterfaceElement_();
+      this.startVideoInterfaceElement_(progressStartVal);
       return;
     }
 
@@ -1049,7 +1088,7 @@ export class MediaBasedAdvancement extends AdvancementConfig {
     }
 
     if (this.mediaElement_) {
-      this.startHtmlMediaElement_();
+      this.startHtmlMediaElement_(progressStartVal);
       return;
     }
 
@@ -1060,8 +1099,12 @@ export class MediaBasedAdvancement extends AdvancementConfig {
     );
   }
 
-  /** @private */
-  startHtmlMediaElement_() {
+  /**
+   * @param {number=} progressStartVal An optional value at which to start
+   *     the advancement.
+   * @private
+   */
+  startHtmlMediaElement_(progressStartVal = undefined) {
     const mediaElement = dev().assertElement(
       this.mediaElement_,
       'Media element was unspecified.'
@@ -1074,7 +1117,7 @@ export class MediaBasedAdvancement extends AdvancementConfig {
       listenOnce(mediaElement, 'ended', () => this.onAdvance())
     );
 
-    this.onProgressUpdate();
+    this.onProgressUpdate(progressStartVal);
 
     this.timer_.poll(POLL_INTERVAL_MS, () => {
       this.onProgressUpdate();
@@ -1082,8 +1125,12 @@ export class MediaBasedAdvancement extends AdvancementConfig {
     });
   }
 
-  /** @private */
-  startVideoInterfaceElement_() {
+  /**
+   * @param {number=} progressStartVal An optional value at which to start
+   *     the advancement.
+   * @private
+   */
+  startVideoInterfaceElement_(progressStartVal = undefined) {
     this.element_.getImpl().then((video) => {
       this.video_ = video;
     });
@@ -1092,12 +1139,17 @@ export class MediaBasedAdvancement extends AdvancementConfig {
     this.element_.querySelector('video').removeAttribute('loop');
 
     this.unlistenFns_.push(
-      listenOnce(this.element_, VideoEvents.ENDED, () => this.onAdvance(), {
-        capture: true,
-      })
+      listenOnce(
+        this.element_,
+        VideoEvents_Enum.ENDED,
+        () => this.onAdvance(),
+        {
+          capture: true,
+        }
+      )
     );
 
-    this.onProgressUpdate();
+    this.onProgressUpdate(progressStartVal);
 
     this.timer_.poll(POLL_INTERVAL_MS, () => {
       this.onProgressUpdate();
@@ -1160,10 +1212,13 @@ export class MediaBasedAdvancement extends AdvancementConfig {
       // amp-video, amp-audio, as well as amp-story-page with a background audio
       // are eligible for media based auto advance.
       let element = pageEl.querySelector(
-        `amp-video[data-id=${escapeCssSelectorIdent(autoAdvanceStr)}],
-          amp-video#${escapeCssSelectorIdent(autoAdvanceStr)},
-          amp-audio[data-id=${escapeCssSelectorIdent(autoAdvanceStr)}],
-          amp-audio#${escapeCssSelectorIdent(autoAdvanceStr)}`
+        `amp-video[data-id=${escapeCssSelectorIdent(
+          autoAdvanceStr
+        )}], amp-video#${escapeCssSelectorIdent(
+          autoAdvanceStr
+        )}, amp-audio[data-id=${escapeCssSelectorIdent(
+          autoAdvanceStr
+        )}], amp-audio#${escapeCssSelectorIdent(autoAdvanceStr)}`
       );
       if (
         matches(
diff --git a/extensions/amp-story/1.0/pagination-buttons.css b/extensions/amp-story/1.0/pagination-buttons.css
index 6ab92df762be..146e59490f11 100644
--- a/extensions/amp-story/1.0/pagination-buttons.css
+++ b/extensions/amp-story/1.0/pagination-buttons.css
@@ -12,7 +12,7 @@
   width: 30px !important;
   top: 0 !important;
   bottom: 0 !important;
-  height: calc(100vh - 150px) !important;
+  height: calc(var(--story-100dvh) - 150px) !important;
   margin: auto 0 !important;
   background: none !important;
   transition: 150ms opacity linear, 150ms visibility linear !important;
@@ -51,8 +51,9 @@ amp-story:not([desktop]) .i-amphtml-story-button-move,
   pointer-events: none !important;
   background-repeat: no-repeat !important;
   background-color: transparent !important;
+  background-position: center !important;
   /* Contrast protection. Make icons white. */
-  filter: invert(100%) drop-shadow(0 0 3px rgba(0, 0, 0, 0.5)) !important;
+  filter: invert(100%) drop-shadow(0 0 3px #000b) !important;
 }
 
 body:not(.amp-mode-keyboard-active) amp-story:not([desktop]):not(.i-amphtml-story-desktop-one-panel) .i-amphtml-story-button-move {
@@ -65,25 +66,21 @@ body:not(.amp-mode-keyboard-active) amp-story:not([desktop]):not(.i-amphtml-stor
   position: fixed!important;
   top: 0!important;
   bottom: 0!important;
-  margin: auto 40px!important;
-  width: 60px!important;
-  height: 60px!important;
-  border-radius: 50%!important;
+  margin: auto 12px!important;
+  width: 54px!important;
+  height: 54px!important;
   border: 0!important;
-  background-color: #fff!important;
   background-repeat: no-repeat!important;
-  background-size: 12px 17px!important;
   justify-content: center!important;
   align-items: center!important;
-  opacity: .5!important;
-  transition: 150ms opacity linear, 350ms transform linear!important;
+  transition: 150ms opacity linear!important;
   cursor: pointer!important;
   pointer-events: all!important;
 }
 
 amp-story.i-amphtml-story-desktop-one-panel .i-amphtml-story-button-container {
-  height: 40px !important;
-  width: 40px !important;
+  height: 48px !important;
+  width: 48px !important;
   transform: translateY(-50%) !important;
   top: 50% !important;
   bottom: auto !important;
@@ -105,15 +102,6 @@ amp-story.i-amphtml-story-desktop-one-panel .i-amphtml-story-button-move,
   filter: none !important;
   background-color: white !important;
   border-radius: 50% !important;
-  width: 40px !important;
-  height: 40px !important;
-  background-position-y: 52% !important;
-  background-size: 20% !important;
-}
-
-amp-story.i-amphtml-story-desktop-one-panel .i-amphtml-story-fwd-replay > .i-amphtml-story-button-move {
-  background-size: 52% !important;
-  background-position-y: 56% !important;
 }
 
 amp-story.i-amphtml-story-desktop-one-panel .i-amphtml-story-button-hidden {
@@ -123,66 +111,42 @@ amp-story.i-amphtml-story-desktop-one-panel .i-amphtml-story-button-hidden {
 }
 
 .i-amphtml-story-desktop-fullbleed .i-amphtml-story-button-move {
-  height: 48px !important;
-  width: 48px !important;
-  margin: auto 12px !important;
-  background-color: transparent !important;
-  background-size: auto !important;
-  filter: drop-shadow(0 0 16px rgba(0, 0, 0, 0.5)) !important;
-  opacity: 1 !important;
+  background-size: 100% !important;
+  background-color: #fff2 !important;
+  border-radius: 50% !important;
+  filter: invert(1)!important;
+}
+
+.prev-container > .i-amphtml-story-button-move,
+[dir=rtl] .i-amphtml-story-fwd-next > .i-amphtml-story-button-move,
+.i-amphtml-story-fwd-next > .i-amphtml-story-button-move,
+[dir=rtl] .prev-container > .i-amphtml-story-button-move {
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.4" d="m21.52 16.22 7.75 7.75M21.52 31.75 29.27 24"/></svg>')!important;
 }
 
 .prev-container > .i-amphtml-story-button-move,
 [dir=rtl] .i-amphtml-story-fwd-next > .i-amphtml-story-button-move {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg width="16" height="25" xmlns="http://www.w3.org/2000/svg"><path d="M15.7 22l-9.5-9.5L15.7 3l-3-3L.4 12.6 12.8 25"/></svg>')!important;
-  background-position: 45% 50%!important;
   left: 0!important;
   right: auto !important;
+  transform: rotate(180deg) !important;
 }
 
-.i-amphtml-story-desktop-fullbleed .prev-container > .i-amphtml-story-button-move,
-.i-amphtml-story-desktop-fullbleed[dir=rtl] .i-amphtml-story-fwd-next > .i-amphtml-story-button-move {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="48px" height="48px" viewBox="0 0 24 24" fill="#FFFFFF"><path d="M11.67 3.87L9.9 2.1 0 12l9.9 9.9 1.77-1.77L3.54 12z"/><path fill="none" d="M0 0h24v24H0z"/></svg>') !important;
-  background-position: 10px 0 !important;
+[dir="rtl"] .prev-container > .i-amphtml-story-button-move {
+  transform: none !important;
 }
 
 .i-amphtml-story-fwd-next > .i-amphtml-story-button-move,
 [dir=rtl] .prev-container > .i-amphtml-story-button-move {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg width="16" height="25" xmlns="http://www.w3.org/2000/svg"><path d="M.3 3l9.5 9.5L.3 22l3 3 12.4-12.5L3.2 0"/></svg>')!important;
-  background-position: 55% 50%!important;
   left: auto !important;
   right: 0 !important;
 }
 
-.i-amphtml-story-desktop-fullbleed .i-amphtml-story-fwd-next > .i-amphtml-story-button-move,
-.i-amphtml-story-desktop-fullbleed[dir=rtl] .prev-container > .i-amphtml-story-button-move {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="48px" height="48px" viewBox="0 0 48 48" fill="#FFFFFF"><path d="M11.76 8.24L27.51 24 11.76 39.76 16 44l20-20L16 4z"/><path fill="none" d="M0 0h48v48H0z"/></svg>') !important;
-}
-
 .i-amphtml-story-fwd-replay {
   pointer-events: none !important;
 }
 
 .i-amphtml-story-fwd-replay > .i-amphtml-story-button-move {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="32px" height="32px" viewBox="0 0 24 24"><path d="M17.65 6.35C16.2 4.9 14.21 4 12 4c-4.42 0-7.99 3.58-7.99 8s3.57 8 7.99 8c3.73 0 6.84-2.55 7.73-6h-2.08c-.82 2.33-3.04 4-5.65 4-3.31 0-6-2.69-6-6s2.69-6 6-6c1.66 0 3.14.69 4.22 1.78L13 11h7V4l-2.35 2.35z"/><path d="M0 0h24v24H0z" fill="none"/></svg>') !important;
-  background-position: center center;
-  background-size: 32px 32px !important;
-}
-
-.i-amphtml-story-desktop-fullbleed .i-amphtml-story-fwd-replay > .i-amphtml-story-button-move {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="48px" height="48px" viewBox="0 0 48 48" fill="#FFFFFF"><path d="M0 0h48v48H0z" fill="none"/><path d="M24 10V2L14 12l10 10v-8c6.63 0 12 5.37 12 12s-5.37 12-12 12-12-5.37-12-12H8c0 8.84 7.16 16 16 16s16-7.16 16-16-7.16-16-16-16z"/></svg>') !important;
-  background-size: auto !important;
-}
-
-.i-amphtml-story-fwd-more > .i-amphtml-story-button-move {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 0 24 24" fill="#000000"><path d="M0 0h24v24H0z" fill="none"/><path d="M6 10c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm12 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm-6 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z"/></svg>') !important;
-  background-position: center center;
-  background-size: 32px 32px !important;
-}
-
-.i-amphtml-story-desktop-fullbleed .i-amphtml-story-fwd-more > .i-amphtml-story-button-move {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="48px" height="48px" viewBox="0 0 48 48" fill="#FFFFFF"><path d="M0 0h48v48H0z" fill="none"/><path d="M12 20c-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm24 0c-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm-12 0c-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4z"/></svg>') !important;
-  background-size: auto !important;
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" fill="none"><path stroke="#000" stroke-linecap="round" stroke-width="2.4" d="M16.15 19.4a9.1 9.1 0 1 1-1.29 3.95"/><path stroke="#000" stroke-linecap="round" stroke-width="2.4" d="M15.6 15.1v4.61M20 19.71h-4.4"/></svg>') !important;
 }
 
 /* Do not display when hidden. */
diff --git a/extensions/amp-story/1.0/pagination-buttons.js b/extensions/amp-story/1.0/pagination-buttons.js
index 7b8d544149dd..fc6edfbf5ba4 100644
--- a/extensions/amp-story/1.0/pagination-buttons.js
+++ b/extensions/amp-story/1.0/pagination-buttons.js
@@ -1,55 +1,65 @@
+import {toggleAttribute} from '#core/dom';
 import * as Preact from '#core/dom/jsx';
+
+import {Services} from '#service';
+import {LocalizedStringId_Enum} from '#service/localization/strings';
+
+import {devAssert} from '#utils/log';
+
+import {localizeTemplate} from './amp-story-localization-service';
 import {
   Action,
   StateProperty,
   getStoreService,
 } from './amp-story-store-service';
-import {AdvancementMode} from './story-analytics';
 import {EventType, dispatch} from './events';
-import {LocalizedStringId} from '#service/localization/strings';
-import {Services} from '#service';
-import {dev, devAssert} from '#utils/log';
-import {localize} from './amp-story-localization-service';
-
-/** @struct @typedef {{className: string, triggers: (string|undefined)}} */
-let ButtonState_1_0_Def; // eslint-disable-line local/camelcase
-
-/** @const {!Object<string, !ButtonState_1_0_Def>} */
-const BackButtonStates = {
-  HIDDEN: {className: 'i-amphtml-story-button-hidden'},
-  PREVIOUS_PAGE: {
-    className: 'i-amphtml-story-back-prev',
-    triggers: EventType.PREVIOUS_PAGE,
-    label: LocalizedStringId.AMP_STORY_PREVIOUS_PAGE,
-  },
+import {AdvancementMode} from './story-analytics';
+
+/** @struct @typedef {{className: string, triggers: string, label: LocalizedStringId_Enum}} */
+let PaginationButtonStateDef;
+
+/** @const {PaginationButtonStateDef} */
+const BUTTON_STATE_PREVIOUS_PAGE = {
+  className: 'i-amphtml-story-back-prev',
+  triggers: EventType.PREVIOUS_PAGE,
+  label: LocalizedStringId_Enum.AMP_STORY_PREVIOUS_PAGE,
+};
+
+/** @const {PaginationButtonStateDef} */
+const BUTTON_STATE_NEXT_PAGE = {
+  className: 'i-amphtml-story-fwd-next',
+  triggers: EventType.NEXT_PAGE,
+  label: LocalizedStringId_Enum.AMP_STORY_NEXT_PAGE,
+};
+
+/** @const {PaginationButtonStateDef} */
+const BUTTON_STATE_NEXT_STORY = {
+  className: 'i-amphtml-story-fwd-next',
+  triggers: EventType.NEXT_PAGE,
+  label: LocalizedStringId_Enum.AMP_STORY_NEXT_STORY,
 };
 
-/** @const {!Object<string, !ButtonState_1_0_Def>} */
-const ForwardButtonStates = {
-  HIDDEN: {className: 'i-amphtml-story-button-hidden'},
-  NEXT_PAGE: {
-    className: 'i-amphtml-story-fwd-next',
-    triggers: EventType.NEXT_PAGE,
-    label: LocalizedStringId.AMP_STORY_NEXT_PAGE,
-  },
-  NEXT_STORY: {
-    className: 'i-amphtml-story-fwd-next',
-    triggers: EventType.NEXT_PAGE,
-    label: LocalizedStringId.AMP_STORY_NEXT_STORY,
-  },
-  REPLAY: {
-    className: 'i-amphtml-story-fwd-replay',
-    triggers: EventType.REPLAY,
-    label: LocalizedStringId.AMP_STORY_REPLAY,
-  },
+/** @const {PaginationButtonStateDef} */
+const BUTTON_STATE_REPLAY = {
+  className: 'i-amphtml-story-fwd-replay',
+  triggers: EventType.REPLAY,
+  label: LocalizedStringId_Enum.AMP_STORY_REPLAY,
 };
 
 /**
+ * @param {PaginationButtonStateDef} initialState
+ * @param {function(Event)} onClick
  * @return {!Element}
  */
-const renderPaginationButton = () => (
-  <div class="i-amphtml-story-button-container">
-    <button class="i-amphtml-story-button-move"></button>
+const renderPaginationButton = (initialState, onClick) => (
+  <div
+    onClick={onClick}
+    class={`i-amphtml-story-button-container ${initialState.className}`}
+  >
+    <button
+      class="i-amphtml-story-button-move"
+      i-amphtml-i18n-aria-label={initialState.label}
+    ></button>
   </div>
 );
 
@@ -59,62 +69,71 @@ const renderPaginationButton = () => (
 class PaginationButton {
   /**
    * @param {!Document} doc
-   * @param {!ButtonState_1_0_Def} initialState
+   * @param {!PaginationButtonStateDef} initialState
    * @param {!./amp-story-store-service.AmpStoryStoreService} storeService
    * @param {!Window} win
    */
   constructor(doc, initialState, storeService, win) {
-    /** @private {!ButtonState_1_0_Def} */
+    /** @private {!PaginationButtonStateDef} */
     this.state_ = initialState;
 
-    /** @public @const {!Element} */
-    this.element = renderPaginationButton();
+    /** @const {!Document} */
+    this.doc_ = doc;
 
-    /** @private @const {!Element} */
-    this.buttonElement_ = dev().assertElement(
-      this.element.querySelector('button')
+    /** @const {!Element} */
+    this.element = renderPaginationButton(initialState, (e) =>
+      this.onClick_(e)
     );
+    localizeTemplate(this.element, doc);
 
-    this.element.classList.add(initialState.className);
-    if (initialState.label) {
-      this.buttonElement_.setAttribute(
-        'aria-label',
-        localize(doc, initialState.label)
-      );
-    }
-    this.element.addEventListener('click', (e) => this.onClick_(e));
+    /** @private @const {!Element} */
+    this.buttonElement_ = devAssert(this.element.firstElementChild);
 
     /** @private @const {!./amp-story-store-service.AmpStoryStoreService} */
     this.storeService_ = storeService;
 
     /** @private @const {!Window} */
     this.win_ = win;
+
+    /** @private @const {!../../../src/service/mutator-interface.MutatorInterface} */
+    this.mutator_ = Services.mutatorForDoc(doc);
   }
 
-  /** @param {!ButtonState_1_0_Def} state */
+  /** @param {!PaginationButtonStateDef} state */
   updateState(state) {
     if (state === this.state_) {
       return;
     }
-    this.element.classList.remove(this.state_.className);
-    this.element.classList.add(state.className);
-    state.label
-      ? this.buttonElement_.setAttribute(
-          'aria-label',
-          localize(this.win_.document, state.label)
-        )
-      : this.buttonElement_.removeAttribute('aria-label');
-
-    this.state_ = state;
+
+    this.mutator_.mutateElement(this.element, () => {
+      this.element.classList.remove(this.state_.className);
+      this.element.classList.add(state.className);
+      this.state_ = state;
+    });
+    Services.localizationForDoc(this.doc_)
+      .getLocalizedStringAsync(state.label)
+      .then((str) => this.buttonElement_.setAttribute('aria-label', str));
   }
 
   /**
-   * @return {!ButtonState_1_0_Def}
+   * @return {!PaginationButtonStateDef}
    */
   getState() {
     return this.state_;
   }
 
+  /** @param {boolean} isEnabled */
+  setEnabled(isEnabled) {
+    this.mutator_.mutateElement(this.element, () => {
+      this.element.classList.toggle(
+        'i-amphtml-story-button-hidden',
+        !isEnabled
+      );
+      const button = this.element.querySelector('button');
+      toggleAttribute(button, 'disabled', !isEnabled);
+    });
+  }
+
   /**
    * @param {!Event} e
    * @private
@@ -139,7 +158,6 @@ class PaginationButton {
     }
     if (this.state_.action) {
       this.storeService_.dispatch(this.state_.action, this.state_.data);
-      return;
     }
   }
 }
@@ -160,7 +178,7 @@ export class PaginationButtons {
     /** @private @const {!PaginationButton} */
     this.forwardButton_ = new PaginationButton(
       doc,
-      ForwardButtonStates.NEXT_PAGE,
+      BUTTON_STATE_NEXT_PAGE,
       this.storeService_,
       win
     );
@@ -168,24 +186,18 @@ export class PaginationButtons {
     /** @private @const {!PaginationButton} */
     this.backButton_ = new PaginationButton(
       doc,
-      BackButtonStates.HIDDEN,
+      BUTTON_STATE_PREVIOUS_PAGE,
       this.storeService_,
       win
     );
 
-    this.forwardButton_.element.classList.add('next-container');
     this.backButton_.element.classList.add('prev-container');
-
-    /** @private {?ButtonState_1_0_Def} */
-    this.backButtonStateToRestore_ = null;
-
-    /** @private {?ButtonState_1_0_Def} */
-    this.forwardButtonStateToRestore_ = null;
+    this.forwardButton_.element.classList.add('next-container');
 
     this.initializeListeners_();
 
-    this.ampStory_.element.appendChild(this.forwardButton_.element);
     this.ampStory_.element.appendChild(this.backButton_.element);
+    this.ampStory_.element.appendChild(this.forwardButton_.element);
   }
 
   /** @private */
@@ -210,9 +222,7 @@ export class PaginationButtons {
 
     this.storeService_.subscribe(
       StateProperty.SYSTEM_UI_IS_VISIBLE_STATE,
-      (isVisible) => {
-        this.onSystemUiIsVisibleStateUpdate_(isVisible);
-      }
+      (isVisible) => this.onSystemUiIsVisibleStateUpdate_(isVisible)
     );
   }
 
@@ -223,24 +233,17 @@ export class PaginationButtons {
   onCurrentPageIndexUpdate_(pageIndex) {
     const totalPages = this.storeService_.get(StateProperty.PAGE_IDS).length;
 
-    if (pageIndex === 0) {
-      this.backButton_.updateState(BackButtonStates.HIDDEN);
-    }
-
-    if (pageIndex > 0) {
-      this.backButton_.updateState(BackButtonStates.PREVIOUS_PAGE);
-    }
+    // Hide back button if no previous page.
+    this.backButton_.setEnabled(pageIndex > 0);
 
     if (pageIndex < totalPages - 1) {
-      this.forwardButton_.updateState(ForwardButtonStates.NEXT_PAGE);
-    }
-
-    if (pageIndex === totalPages - 1) {
+      this.forwardButton_.updateState(BUTTON_STATE_NEXT_PAGE);
+    } else {
       const viewer = Services.viewerForDoc(this.ampStory_.element);
       if (viewer.hasCapability('swipe')) {
-        this.forwardButton_.updateState(ForwardButtonStates.NEXT_STORY);
+        this.forwardButton_.updateState(BUTTON_STATE_NEXT_STORY);
       } else {
-        this.forwardButton_.updateState(ForwardButtonStates.REPLAY);
+        this.forwardButton_.updateState(BUTTON_STATE_REPLAY);
       }
     }
   }
@@ -251,22 +254,7 @@ export class PaginationButtons {
    * @private
    */
   onSystemUiIsVisibleStateUpdate_(isVisible) {
-    if (isVisible) {
-      this.backButton_.updateState(
-        /** @type {!ButtonState_1_0_Def} */ (
-          devAssert(this.backButtonStateToRestore_)
-        )
-      );
-      this.forwardButton_.updateState(
-        /** @type {!ButtonState_1_0_Def} */ (
-          devAssert(this.forwardButtonStateToRestore_)
-        )
-      );
-    } else {
-      this.backButtonStateToRestore_ = this.backButton_.getState();
-      this.backButton_.updateState(BackButtonStates.HIDDEN);
-      this.forwardButtonStateToRestore_ = this.forwardButton_.getState();
-      this.forwardButton_.updateState(ForwardButtonStates.HIDDEN);
-    }
+    this.backButton_.setEnabled(isVisible);
+    this.forwardButton_.setEnabled(isVisible);
   }
 }
diff --git a/extensions/amp-story/1.0/progress-bar.js b/extensions/amp-story/1.0/progress-bar.js
index a1372ca44bb8..64c917e8fa0c 100644
--- a/extensions/amp-story/1.0/progress-bar.js
+++ b/extensions/amp-story/1.0/progress-bar.js
@@ -1,23 +1,28 @@
-import {
-  BranchToTimeValues,
-  StoryAdSegmentExp,
-} from '#experiments/story-ad-progress-segment';
-import {EventType} from './events';
-import {POLL_INTERVAL_MS} from './page-advancement';
+import objStr from 'obj-str';
+
+import {removeChildren} from '#core/dom';
+import {escapeCssSelectorNth} from '#core/dom/css-selectors';
+import * as Preact from '#core/dom/jsx';
+import {scopedQuerySelector} from '#core/dom/query';
+import {scale, setImportantStyles} from '#core/dom/style';
+import {debounce} from '#core/types/function';
+import {hasOwn, map} from '#core/types/object';
+
+import {StoryAdSegmentExp} from '#experiments/story-ad-progress-segment';
+
 import {Services} from '#service';
+
+import {dev, devAssert} from '#utils/log';
+
+import {getExperimentBranch} from 'src/experiments';
+
 import {
   StateProperty,
-  UIType,
+  UIType_Enum,
   getStoreService,
 } from './amp-story-store-service';
-import {debounce} from '#core/types/function';
-import {dev, devAssert} from '#utils/log';
-import {escapeCssSelectorNth} from '#core/dom/css-selectors';
-import {getExperimentBranch} from 'src/experiments';
-import {hasOwn, map} from '#core/types/object';
-import {removeChildren} from '#core/dom';
-import {scale, setImportantStyles, setStyle} from '#core/dom/style';
-import {scopedQuerySelector} from '#core/dom/query';
+import {EventType} from './events';
+import {POLL_INTERVAL_MS} from './page-advancement';
 
 /**
  * Transition used to show the progress of a media. Has to be linear so the
@@ -70,9 +75,6 @@ export class ProgressBar {
     /** @private @const {!Window} */
     this.win_ = win;
 
-    /** @private {boolean} */
-    this.isBuilt_ = false;
-
     /** @private {?Element} */
     this.root_ = null;
 
@@ -91,7 +93,7 @@ export class ProgressBar {
     /** @private @const {!../../../src/service/mutator-interface.MutatorInterface} */
     this.mutator_ = Services.mutatorForDoc(this.ampdoc_);
 
-    /** @private {!Object<string, number>} */
+    /** @private {!{[key: string]: number}} */
     this.segmentIdMap_ = map();
 
     /** @private @const {!./amp-story-store-service.AmpStoryStoreService} */
@@ -115,9 +117,6 @@ export class ProgressBar {
 
     /** @private {!Element} */
     this.storyEl_ = storyEl;
-
-    /** @private {?Element} */
-    this.currentAdSegment_ = null;
   }
 
   /**
@@ -131,17 +130,26 @@ export class ProgressBar {
 
   /**
    * Builds the progress bar.
-   * @param {string} initialSegmentId
+   * @param {string} unusedInitialSegmentId
    * @return {!Element}
    */
-  build(initialSegmentId) {
-    if (this.isBuilt_) {
-      return this.getRoot();
+  build(unusedInitialSegmentId) {
+    if (this.root_) {
+      return this.root_;
     }
 
-    this.root_ = this.win_.document.createElement('ol');
-    this.root_.setAttribute('aria-hidden', true);
-    this.root_.classList.add('i-amphtml-story-progress-bar');
+    const root = (
+      <ol
+        aria-hidden="true"
+        class={objStr({
+          'i-amphtml-story-progress-bar': true,
+          'i-amphtml-story-progress-bar-exp-disabled':
+            !this.isProgressBarExperimentEnabled_(),
+        })}
+      ></ol>
+    );
+    this.root_ = root;
+
     this.storyEl_.addEventListener(EventType.REPLAY, () => {
       this.replay_();
     });
@@ -149,22 +157,36 @@ export class ProgressBar {
     this.storeService_.subscribe(
       StateProperty.PAGE_IDS,
       (pageIds) => {
-        if (this.isBuilt_) {
-          this.clear_();
-        }
+        const attached = !!root.parentElement;
 
-        this.segmentsAddedPromise_ = this.mutator_.mutateElement(
-          this.getRoot(),
-          () => {
-            /** @type {!Array} */ (pageIds).forEach((id) => {
-              if (!(id in this.segmentIdMap_)) {
-                this.addSegment_(id);
-              }
-            });
+        this.segmentsAddedPromise_ = this.mutator_.mutateElement(root, () => {
+          if (attached) {
+            this.clear_();
           }
-        );
 
-        if (this.isBuilt_) {
+          /** @type {!Array} */ (pageIds).forEach((id) => {
+            if (
+              // Do not show progress bar for the ad page (control group).
+              // Show progress bar for the ad page (experiment group).
+              (!this.isAdSegment_(id) ||
+                this.isProgressBarExperimentEnabled_()) &&
+              !(id in this.segmentIdMap_)
+            ) {
+              this.addSegment_(id);
+            }
+          });
+
+          if (this.segmentCount_ > MAX_SEGMENTS) {
+            this.getInitialFirstExpandedSegmentIndex_(this.activeSegmentIndex_);
+            this.render_(false /** shouldAnimate */);
+          }
+          root.classList.toggle(
+            'i-amphtml-progress-bar-overflow',
+            this.segmentCount_ > MAX_SEGMENTS
+          );
+        });
+
+        if (attached) {
           this.updateProgress(
             this.activeSegmentId_,
             this.activeSegmentProgress_,
@@ -191,30 +213,35 @@ export class ProgressBar {
       true /** callToInitialize */
     );
 
-    this.storeService_.subscribe(StateProperty.AD_STATE, (adState) => {
-      this.onAdStateUpdate_(adState);
-    });
-
     Services.viewportForDoc(this.ampdoc_).onResize(
       debounce(this.win_, () => this.onResize_(), 300)
     );
 
-    this.segmentsAddedPromise_.then(() => {
-      if (this.segmentCount_ > MAX_SEGMENTS) {
-        this.getInitialFirstExpandedSegmentIndex_(
-          this.segmentIdMap_[initialSegmentId]
-        );
+    return root;
+  }
 
-        this.render_(false /** shouldAnimate */);
-      }
-      this.getRoot().classList.toggle(
-        'i-amphtml-progress-bar-overflow',
-        this.segmentCount_ > MAX_SEGMENTS
-      );
-    });
+  /**
+   * Is the progress bar experiment enabled
+   * @return {boolean}
+   */
+  isProgressBarExperimentEnabled_() {
+    const storyAdSegmentBranch = getExperimentBranch(
+      this.win_,
+      StoryAdSegmentExp.ID
+    );
+    return (
+      storyAdSegmentBranch && storyAdSegmentBranch != StoryAdSegmentExp.CONTROL
+    );
+  }
 
-    this.isBuilt_ = true;
-    return this.getRoot();
+  /**
+   * Whether the given id corresponds to an ad page.
+   * @param {string} id
+   * @return {boolean}
+   * @private
+   */
+  isAdSegment_(id) {
+    return id.startsWith('i-amphtml-ad-');
   }
 
   /**
@@ -239,8 +266,8 @@ export class ProgressBar {
         -(this.firstExpandedSegmentIndex_ - this.getPrevEllipsisCount_()) *
         (ELLIPSE_WIDTH_PX + SEGMENTS_MARGIN_PX);
 
-      this.mutator_.mutateElement(this.getRoot(), () => {
-        this.getRoot().classList.toggle(
+      this.mutator_.mutateElement(this.getRoot_(), () => {
+        this.getRoot_().classList.toggle(
           'i-amphtml-animate-progress',
           shouldAnimate
         );
@@ -308,7 +335,7 @@ export class ProgressBar {
    */
   getBarWidth_() {
     return this.mutator_.measureElement(() => {
-      return this.getRoot()./*OK*/ getBoundingClientRect().width;
+      return this.getRoot_()./*OK*/ getBoundingClientRect().width;
     });
   }
 
@@ -373,10 +400,10 @@ export class ProgressBar {
    * @private
    */
   onRtlStateUpdate_(rtlState) {
-    this.mutator_.mutateElement(this.getRoot(), () => {
+    this.mutator_.mutateElement(this.getRoot_(), () => {
       rtlState
-        ? this.getRoot().setAttribute('dir', 'rtl')
-        : this.getRoot().removeAttribute('dir');
+        ? this.getRoot_().setAttribute('dir', 'rtl')
+        : this.getRoot_().removeAttribute('dir');
     });
   }
 
@@ -388,7 +415,7 @@ export class ProgressBar {
     // We need to take into account both conditionals since we could've switched
     // from a screen that had an overflow to one that doesn't and viceversa.
     if (
-      this.getRoot().classList.contains('i-amphtml-progress-bar-overflow') ||
+      this.getRoot_().classList.contains('i-amphtml-progress-bar-overflow') ||
       this.segmentCount_ > MAX_SEGMENTS
     ) {
       this.getInitialFirstExpandedSegmentIndex_(this.activeSegmentIndex_);
@@ -398,16 +425,16 @@ export class ProgressBar {
 
   /**
    * Reacts to UI state updates.
-   * @param {!UIType} uiState
+   * @param {!UIType_Enum} uiState
    * @private
    */
   onUIStateUpdate_(uiState) {
     switch (uiState) {
-      case UIType.DESKTOP_FULLBLEED:
+      case UIType_Enum.DESKTOP_FULLBLEED:
         MAX_SEGMENTS = 70;
         ELLIPSE_WIDTH_PX = 3;
         break;
-      case UIType.MOBILE:
+      case UIType_Enum.MOBILE:
         MAX_SEGMENTS = 20;
         ELLIPSE_WIDTH_PX = 2;
         break;
@@ -416,75 +443,24 @@ export class ProgressBar {
     }
   }
 
-  /**
-   * Show/hide ad progress bar treatment based on ad visibility.
-   * @param {boolean} adState
-   * TODO(#33969) clean up experiment is launched.
-   */
-  onAdStateUpdate_(adState) {
-    const segmentExpBranch = getExperimentBranch(
-      this.win_,
-      StoryAdSegmentExp.ID
-    );
-    if (
-      !segmentExpBranch ||
-      segmentExpBranch === StoryAdSegmentExp.CONTROL ||
-      segmentExpBranch === StoryAdSegmentExp.NO_ADVANCE_BOTH ||
-      segmentExpBranch === StoryAdSegmentExp.NO_ADVANCE_AD
-    ) {
-      return;
-    }
-    // Set CSS signal that we are in the experiment.
-    if (!this.root_.hasAttribute('i-amphtml-ad-progress-exp')) {
-      this.root_.setAttribute('i-amphtml-ad-progress-exp', '');
-    }
-    adState
-      ? this.createAdSegment_(BranchToTimeValues[segmentExpBranch])
-      : this.removeAdSegment_();
-  }
-
-  /**
-   * Create ad progress segment that will be shown when ad is visible.
-   * TODO(#33969) remove variable animation duration when best value is chosen.
-   * @param {string} animationDuration
-   */
-  createAdSegment_(animationDuration) {
-    const index = this.storeService_.get(StateProperty.CURRENT_PAGE_INDEX);
-    // Fill in segment before ad segment.
-    this.updateProgressByIndex_(index, 1, false);
-    const progressEl = this.getRoot()?.querySelector(
-      `.i-amphtml-story-page-progress-bar:nth-child(${escapeCssSelectorNth(
-        // +2 because of zero-index and we want the chip after the ad.
-        index + 2
-      )})`
-    );
-    const adSegment = this.win_.document.createElement('div');
-    adSegment.className = 'i-amphtml-story-ad-progress-value';
-    setStyle(adSegment, 'animationDuration', animationDuration);
-    this.currentAdSegment_ = adSegment;
-    progressEl.appendChild(adSegment);
-  }
-
-  /**
-   * Remove active ad progress segment when ad is navigated away from
-   */
-  removeAdSegment_() {
-    this.currentAdSegment_?.parentNode.removeChild(this.currentAdSegment_);
-    this.currentAdSegment_ = null;
-  }
-
   /**
    * Builds a new segment element and appends it to the progress bar.
    *
+   * @param {boolean} isAd
    * @private
    */
-  buildSegmentEl_() {
-    const segmentProgressBar = this.win_.document.createElement('li');
-    segmentProgressBar.classList.add('i-amphtml-story-page-progress-bar');
-    const segmentProgressValue = this.win_.document.createElement('div');
-    segmentProgressValue.classList.add('i-amphtml-story-page-progress-value');
-    segmentProgressBar.appendChild(segmentProgressValue);
-    this.getRoot().appendChild(segmentProgressBar);
+  buildSegmentEl_(isAd) {
+    const segmentProgressBar = (
+      <li class="i-amphtml-story-page-progress-bar">
+        <div
+          class={objStr({
+            'i-amphtml-story-page-progress-value': true,
+            'i-amphtml-story-ad-progress-value': isAd,
+          })}
+        ></div>
+      </li>
+    );
+    this.getRoot_().appendChild(segmentProgressBar);
     this.segments_.push(segmentProgressBar);
   }
 
@@ -495,6 +471,7 @@ export class ProgressBar {
     removeChildren(devAssert(this.root_));
     this.segmentIdMap_ = map();
     this.segmentCount_ = 0;
+    this.segments_ = [];
   }
 
   /**
@@ -505,15 +482,14 @@ export class ProgressBar {
    */
   addSegment_(id) {
     this.segmentIdMap_[id] = this.segmentCount_++;
-    this.buildSegmentEl_();
+    this.buildSegmentEl_(this.isAdSegment_(id));
   }
 
   /**
-   * Gets the root element of the progress bar.
-   *
    * @return {!Element}
+   * @private
    */
-  getRoot() {
+  getRoot_() {
     return dev().assertElement(this.root_);
   }
 
@@ -655,7 +631,7 @@ export class ProgressBar {
     // JavaScript indices start at 0.
     const nthChildIndex = segmentIndex + 1;
     const progressEl = scopedQuerySelector(
-      this.getRoot(),
+      this.getRoot_(),
       `.i-amphtml-story-page-progress-bar:nth-child(${escapeCssSelectorNth(
         nthChildIndex
       )}) .i-amphtml-story-page-progress-value`
diff --git a/extensions/amp-story/1.0/request-utils.js b/extensions/amp-story/1.0/request-utils.js
new file mode 100644
index 000000000000..832262c4d38d
--- /dev/null
+++ b/extensions/amp-story/1.0/request-utils.js
@@ -0,0 +1,77 @@
+/**
+ * @fileoverview Utils for requests on amp-story and dependencies.
+ */
+
+import {getChildJsonConfig} from '#core/dom';
+import {getWin} from '#core/window';
+
+import {Services} from '#service';
+
+import {user, userAssert} from '#utils/log';
+
+/** @private @const {string} */
+export const CONFIG_SRC_ATTRIBUTE_NAME = 'src';
+
+/** @private const {string} */
+export const CREDENTIALS_ATTRIBUTE_NAME = 'data-credentials';
+
+const TAG = 'request-utils';
+
+/**
+ * @param {!Element} el
+ * @param {string} rawUrl
+ * @param {Object=} opts
+ * @return {(!Promise<!JsonObject>|!Promise<null>)}
+ */
+export function executeRequest(el, rawUrl, opts = {}) {
+  if (!Services.urlForDoc(el).isProtocolValid(rawUrl)) {
+    user().error(TAG, 'Invalid config url.');
+    return Promise.resolve(null);
+  }
+
+  const xhrService = Services.xhrFor(getWin(el));
+
+  return Services.urlReplacementsForDoc(el)
+    .expandUrlAsync(user().assertString(rawUrl))
+    .then((url) => xhrService.fetchJson(url, opts))
+    .then((response) => {
+      userAssert(response.ok, 'Invalid HTTP response');
+      return response.json();
+    });
+}
+
+/**
+ * Gets the JSON config from the inline element or [src] url.
+ * @param {?Element} element
+ * @return {(!Promise<!JsonObject>|!Promise<null>)}
+ */
+export function getElementConfig(element) {
+  if (!element) {
+    return Promise.resolve();
+  }
+  const rawUrl = element.getAttribute(CONFIG_SRC_ATTRIBUTE_NAME);
+  if (rawUrl) {
+    const credentials = element.getAttribute(CREDENTIALS_ATTRIBUTE_NAME);
+    return executeRequest(
+      element,
+      rawUrl,
+      credentials ? {credentials} : {}
+    ).catch(() => getInlineConfig(element));
+  }
+  return getInlineConfig(element);
+}
+
+/**
+ * Retrieves the inline config - will be called if
+ * src attribute is invalid or not present.
+ * @param  {!Element} element
+ * @return {(!Promise<!JsonObject>|!Promise<null>)}
+ * @private
+ */
+function getInlineConfig(element) {
+  try {
+    return Promise.resolve(getChildJsonConfig(element));
+  } catch (err) {
+    return Promise.resolve(err);
+  }
+}
diff --git a/extensions/amp-story/1.0/semantic-render.js b/extensions/amp-story/1.0/semantic-render.js
index 5a9a6726c5fb..79eb289edd88 100644
--- a/extensions/amp-story/1.0/semantic-render.js
+++ b/extensions/amp-story/1.0/semantic-render.js
@@ -1,7 +1,9 @@
 import * as Preact from '#core/dom/jsx';
+import {includes} from '#core/types/string';
+
 import {Services} from '#service';
+
 import {dev} from '#utils/log';
-import {includes} from '#core/types/string';
 
 /**
  * Renders the page description, and videos title/alt attributes in the page.
@@ -146,7 +148,22 @@ function extractTextContentWebVtt(text) {
     .join(' ');
   // Super loose HTML parsing to get HTML entity parsing and removal
   // of WebVTT elements.
-  const div = document.createElement('div');
-  div./* element is never added to DOM */ innerHTML = text;
-  return div.textContent;
+  // Assigning .innerHTML of a <template> node to prevent XSS risk.
+  const wrapperTemplate = <template />;
+  // Make innerHTML assignment Trusted Types compliant for compatible browsers
+  if (self.trustedTypes && self.trustedTypes.createPolicy) {
+    const policy = self.trustedTypes.createPolicy(
+      'semantic-render#extractTextContentWebVtt',
+      {
+        createHTML: function (unused) {
+          return text;
+        },
+      }
+    );
+    wrapperTemplate./* element is never added to DOM */ innerHTML =
+      policy.createHTML('ignored');
+  } else {
+    wrapperTemplate./* element is never added to DOM */ innerHTML = text;
+  }
+  return wrapperTemplate.content.textContent;
 }
diff --git a/extensions/amp-story/1.0/sources.js b/extensions/amp-story/1.0/sources.js
index 73b2fa0e8acf..059487aa0c92 100644
--- a/extensions/amp-story/1.0/sources.js
+++ b/extensions/amp-story/1.0/sources.js
@@ -1,7 +1,8 @@
-import {ampMediaElementFor} from './utils';
 import {removeElement} from '#core/dom';
 import {toArray} from '#core/types/array';
 
+import {ampMediaElementFor} from './utils';
+
 /**
  * Class handling HTMLMediaElements sources.
  */
@@ -33,7 +34,7 @@ export class Sources {
    * @private
    */
   applyTracksToElement_(element) {
-    Array.prototype.forEach.call(this.trackEls_, (trackEl) => {
+    this.trackEls_.forEach((trackEl) => {
       const track = document.createElement('track');
       track.id = trackEl.id;
       track.kind = trackEl.kind;
@@ -64,9 +65,7 @@ export class Sources {
       element.setAttribute('src', this.srcAttr_);
     }
 
-    Array.prototype.forEach.call(this.srcEls_, (srcEl) =>
-      element.appendChild(srcEl)
-    );
+    this.srcEls_.forEach((srcEl) => element.appendChild(srcEl));
     if (element.changedSources) {
       element.changedSources();
     }
@@ -97,7 +96,16 @@ export class Sources {
    *     element.
    */
   static removeFrom(win, element) {
-    const elementToUse = ampMediaElementFor(element) || element;
+    let elementToUse;
+    if (element.tagName === 'VIDEO') {
+      // A video element and its amp-video parent can each have different
+      // sources. We prefer to remove and return the video's sources because
+      // amp-video's sources are primarily those provided by the publisher's
+      // whereas the video's sources are added and modified via amp-video JS.
+      elementToUse = element;
+    } else {
+      elementToUse = ampMediaElementFor(element) || element;
+    }
 
     let srcEl = null;
     // If the src attribute is specified, create a source element from it as it
diff --git a/extensions/amp-story/1.0/story-analytics.js b/extensions/amp-story/1.0/story-analytics.js
index 2ed62cd57dbf..d2eafc752365 100644
--- a/extensions/amp-story/1.0/story-analytics.js
+++ b/extensions/amp-story/1.0/story-analytics.js
@@ -1,11 +1,15 @@
-import {Services} from '#service';
-import {StateProperty, getStoreService} from './amp-story-store-service';
 import {getDataParamsFromAttributes} from '#core/dom';
-import {getVariableService} from './variable-service';
 import {map} from '#core/types/object';
-import {registerServiceBuilder} from '../../../src/service-helpers';
+
+import {Services} from '#service';
+
 import {triggerAnalyticsEvent} from '#utils/analytics';
 
+import {StateProperty, getStoreService} from './amp-story-store-service';
+import {getVariableService} from './variable-service';
+
+import {getAmpdoc, registerServiceBuilder} from '../../../src/service-helpers';
+
 /** @const {string} */
 export const ANALYTICS_TAG_NAME = '__AMP_ANALYTICS_TAG_NAME__';
 
@@ -23,6 +27,10 @@ export const StoryAnalyticsEvent = {
   STORY_CONTENT_LOADED: 'story-content-loaded',
   STORY_MUTED: 'story-audio-muted',
   STORY_UNMUTED: 'story-audio-unmuted',
+  SHOPPING_BUY_NOW_CLICK: 'story-shopping-buy-now-click',
+  SHOPPING_PLP_VIEW: 'story-shopping-plp-view',
+  SHOPPING_PDP_VIEW: 'story-shopping-pdp-view',
+  SHOPPING_TAG_CLICK: 'story-shopping-tag-click',
 };
 
 /**
@@ -38,10 +46,10 @@ export const AdvancementMode = {
   VIEWER_SELECT_PAGE: 'viewerSelectPage',
 };
 
-/** @typedef {!Object<string, !PageEventCountDef>} */
+/** @typedef {!{[key: string]: !PageEventCountDef}} */
 let EventsPerPageDef;
 
-/** @typedef {!Object<string, number>} */
+/** @typedef {!{[key: string]: number}} */
 let PageEventCountDef;
 
 /**
@@ -123,11 +131,15 @@ export class StoryAnalyticsService {
   triggerEvent(eventType, element = null) {
     this.incrementPageEventCount_(eventType);
 
-    triggerAnalyticsEvent(
-      this.element_,
-      eventType,
-      this.updateDetails(eventType, element)
-    );
+    getAmpdoc(this.element_)
+      .whenNextVisible()
+      .then(() =>
+        triggerAnalyticsEvent(
+          this.element_,
+          eventType,
+          this.updateDetails(eventType, element)
+        )
+      );
   }
 
   /**
diff --git a/extensions/amp-story/1.0/test-e2e/test-amp-story-share-menu.js b/extensions/amp-story/1.0/test-e2e/test-amp-story-share-menu.js
index e1cb47960b1f..3baaf84527f0 100644
--- a/extensions/amp-story/1.0/test-e2e/test-amp-story-share-menu.js
+++ b/extensions/amp-story/1.0/test-e2e/test-amp-story-share-menu.js
@@ -1,5 +1,5 @@
-import {Key} from '#testing/helpers/types';
 import {sleep} from '#testing/helpers';
+import {Key} from '#testing/helpers/types';
 
 describes.endtoend(
   'amp story share menu',
@@ -30,7 +30,7 @@ describes.endtoend(
       await controller.switchToLight();
 
       const shareMenuHost = await controller.findElement(
-        '.i-amphtml-story-share-menu-host'
+        'amp-story-share-menu'
       );
       await controller.switchToShadowRoot(shareMenuHost);
       const getLinkButton = await controller.findElement(
diff --git a/extensions/amp-story/1.0/test/integration/test-amp-story-affiliate-link.js b/extensions/amp-story/1.0/test/integration/test-amp-story-affiliate-link.js
deleted file mode 100644
index 52d43a9f3e8e..000000000000
--- a/extensions/amp-story/1.0/test/integration/test-amp-story-affiliate-link.js
+++ /dev/null
@@ -1,70 +0,0 @@
-import {BrowserController, RequestBank} from '#testing/helpers/service';
-
-const t = describes.sandboxed.configure().skipSafari().skipEdge();
-
-t.run('amp-story-affiliate link', {}, () => {
-  describes.integration(
-    'analytics on click',
-    {
-      body: `
-      <amp-story standalone>
-        <amp-story-page id="page-1">
-          <amp-story-grid-layer template="vertical">
-            <h1>Third Page</h1>
-            <a id="blink-1" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="shopping-cart">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-          </amp-story-grid-layer>
-        </amp-story-page>
-      </amp-story>
-      <amp-analytics>
-        <script type="application/json">
-        {
-          "requests": {
-            "endpoint": "${RequestBank.getUrl()}"
-          },
-          "triggers": {
-            "trackLinkClicks": {
-              "on": "click",
-              "selector": "[affiliate-link-icon]",
-              "request": "endpoint"
-            }
-          }
-        }
-        </script>
-      </amp-analytics>`,
-      extensions: ['amp-story', 'amp-analytics'],
-    },
-    (env) => {
-      let browser;
-
-      beforeEach(function () {
-        browser = new BrowserController(env.win);
-        return browser.waitForElementLayout('amp-analytics');
-      });
-
-      afterEach(() => {
-        return RequestBank.tearDown();
-      });
-
-      it.skip('should not send any analytics event on expand', async () => {
-        browser.click('#blink-1');
-        browser.click('h1');
-        await expect(RequestBank.withdraw()).to.be.rejected;
-      });
-
-      it.skip('should not send any analytics event on collapse', async () => {
-        browser.click('#blink-1');
-        browser.click('h1');
-        await expect(RequestBank.withdraw()).to.be.rejected;
-      });
-
-      it.skip('should send analytics event on external click', async () => {
-        browser.click('#blink-1');
-        browser.click('#blink-1');
-        const req = await RequestBank.withdraw();
-        expect(req.url).to.equal('/');
-      });
-    }
-  );
-});
diff --git a/extensions/amp-story/1.0/test/test-amp-story-access.js b/extensions/amp-story/1.0/test/test-amp-story-access.js
deleted file mode 100644
index cedb04eeb547..000000000000
--- a/extensions/amp-story/1.0/test/test-amp-story-access.js
+++ /dev/null
@@ -1,183 +0,0 @@
-import {
-  Action,
-  AmpStoryStoreService,
-  StateProperty,
-} from '../amp-story-store-service';
-import {AmpStoryAccess, Type} from '../amp-story-access';
-import {registerServiceBuilder} from '../../../../src/service-helpers';
-import {afterRenderPromise} from '#testing/helpers';
-
-describes.realWin('amp-story-access', {amp: true}, (env) => {
-  let win;
-  let accessConfigurationEl;
-  let defaultConfig;
-  let storeService;
-  let storyAccess;
-  let storyEl;
-
-  const setConfig = (config) => {
-    accessConfigurationEl.textContent = JSON.stringify(config);
-  };
-
-  beforeEach(() => {
-    win = env.win;
-    storeService = new AmpStoryStoreService(win);
-    registerServiceBuilder(win, 'story-store', function () {
-      return storeService;
-    });
-
-    accessConfigurationEl = win.document.createElement('script');
-    accessConfigurationEl.setAttribute('id', 'amp-access');
-    accessConfigurationEl.setAttribute('type', 'application/json');
-    defaultConfig = {login: 'https://example.com'};
-    setConfig(defaultConfig);
-
-    storyEl = win.document.createElement('amp-story');
-    const storyAccessEl = win.document.createElement('amp-story-access');
-    storyAccessEl.getAmpDoc = () => storyAccessEl;
-
-    storyEl.appendChild(storyAccessEl);
-
-    win.document.body.appendChild(accessConfigurationEl);
-    win.document.body.appendChild(storyEl);
-
-    storyAccess = new AmpStoryAccess(storyAccessEl);
-  });
-
-  it('should append the publisher provided template in a drawer', () => {
-    const publisherTemplateEl = win.document.createElement('button');
-    publisherTemplateEl.classList.add('subscribe-button');
-    publisherTemplateEl.innerText = 'Subscribe for $1';
-    storyAccess.element.appendChild(publisherTemplateEl);
-
-    storyAccess.buildCallback();
-
-    // Publisher provided button is no longer a child of <amp-story-access>.
-    expect(
-      storyAccess.element.querySelector('amp-story-access > .subscribe-button')
-    ).to.be.null;
-
-    // But has been copied in the drawer.
-    const buttonInDrawerEl = storyAccess.element.querySelector(
-      '.i-amphtml-story-access-content > .subscribe-button'
-    );
-    expect(buttonInDrawerEl).to.exist;
-  });
-
-  it('should display the access blocking paywall on state update', async () => {
-    storyAccess.buildCallback();
-
-    storeService.dispatch(Action.TOGGLE_ACCESS, true);
-
-    await afterRenderPromise(win);
-    expect(storyAccess.element).to.have.class('i-amphtml-story-access-visible');
-  });
-
-  it('should show the access notification on state update', async () => {
-    storyAccess.element.setAttribute('type', Type.NOTIFICATION);
-    storyAccess.buildCallback();
-
-    storeService.dispatch(Action.CHANGE_PAGE, {
-      id: 'foo',
-      index: 0,
-    });
-
-    await afterRenderPromise(win);
-    expect(storyAccess.element).to.have.class('i-amphtml-story-access-visible');
-  });
-
-  it('should allowlist the default <amp-access> actions', () => {
-    storyAccess.buildCallback();
-
-    const actions = storyAccess.storeService_.get(
-      StateProperty.ACTIONS_ALLOWLIST
-    );
-    expect(actions).to.deep.contain({tagOrTarget: 'SCRIPT', method: 'login'});
-  });
-
-  it('should allowlist the typed <amp-access> actions', () => {
-    defaultConfig.login = {
-      typefoo: 'https://example.com',
-      typebar: 'https://example.com',
-    };
-    setConfig(defaultConfig);
-
-    storyAccess.buildCallback();
-
-    const actions = storyAccess.storeService_.get(
-      StateProperty.ACTIONS_ALLOWLIST
-    );
-    expect(actions).to.deep.contain({
-      tagOrTarget: 'SCRIPT',
-      method: 'login-typefoo',
-    });
-    expect(actions).to.deep.contain({
-      tagOrTarget: 'SCRIPT',
-      method: 'login-typebar',
-    });
-  });
-
-  it('should allowlist the namespaced and default <amp-access> actions', () => {
-    defaultConfig.namespace = 'foo';
-    setConfig(defaultConfig);
-
-    storyAccess.buildCallback();
-
-    // Both namespaced and default actions are allowed.
-    const actions = storyAccess.storeService_.get(
-      StateProperty.ACTIONS_ALLOWLIST
-    );
-    expect(actions).to.deep.contain({tagOrTarget: 'SCRIPT', method: 'login'});
-    expect(actions).to.deep.contain({
-      tagOrTarget: 'SCRIPT',
-      method: 'login-foo',
-    });
-  });
-
-  it('should allowlist namespaced and typed <amp-access> actions', () => {
-    const config = [
-      {
-        namespace: 'namespace1',
-        login: {
-          type1: 'https://example.com',
-          type2: 'https://example.com',
-        },
-      },
-      {
-        namespace: 'namespace2',
-        login: 'https://example.com',
-      },
-    ];
-    setConfig(config);
-
-    storyAccess.buildCallback();
-
-    const actions = storyAccess.storeService_.get(
-      StateProperty.ACTIONS_ALLOWLIST
-    );
-    expect(actions).to.deep.contain({
-      tagOrTarget: 'SCRIPT',
-      method: 'login-namespace1-type1',
-    });
-    expect(actions).to.deep.contain({
-      tagOrTarget: 'SCRIPT',
-      method: 'login-namespace1-type2',
-    });
-    expect(actions).to.deep.contain({
-      tagOrTarget: 'SCRIPT',
-      method: 'login-namespace2',
-    });
-  });
-
-  it('should require publisher-logo-src to be a URL', () => {
-    storyEl.setAttribute('publisher-logo-src', 'foo:bar');
-
-    allowConsoleError(() => {
-      expect(() => {
-        storyAccess.buildCallback();
-      }).to.throw(
-        'amp-story publisher-logo-src must start with "https://" or "//"'
-      );
-    });
-  });
-});
diff --git a/extensions/amp-story/1.0/test/test-amp-story-consent.js b/extensions/amp-story/1.0/test/test-amp-story-consent.js
index 8c24ca81382b..a78e842dca40 100644
--- a/extensions/amp-story/1.0/test/test-amp-story-consent.js
+++ b/extensions/amp-story/1.0/test/test-amp-story-consent.js
@@ -1,8 +1,10 @@
-import {AmpStoryConsent} from '../amp-story-consent';
-import {AmpStoryStoreService, StateProperty} from '../amp-story-store-service';
-import {LocalizationService} from '#service/localization';
 import {Services} from '#service';
+import {LocalizationService} from '#service/localization';
+
 import {registerServiceBuilder} from '../../../../src/service-helpers';
+import LocalizedStringsEn from '../_locales/en.json' assert {type: 'json'}; // lgtm[js/syntax-error]
+import {AmpStoryConsent} from '../amp-story-consent';
+import {AmpStoryStoreService, StateProperty} from '../amp-story-store-service';
 
 describes.realWin('amp-story-consent', {amp: true}, (env) => {
   const CONSENT_ID = 'CONSENT_ID';
@@ -29,6 +31,9 @@ describes.realWin('amp-story-consent', {amp: true}, (env) => {
     registerServiceBuilder(win, 'story-store', function () {
       return storeService;
     });
+    localizationService.registerLocalizedStringBundles({
+      'en': LocalizedStringsEn,
+    });
 
     const consentConfig = {
       consents: {ABC: {checkConsentHref: 'https://example.com'}},
@@ -81,18 +86,18 @@ describes.realWin('amp-story-consent', {amp: true}, (env) => {
     storyConsent = new AmpStoryConsent(storyConsentEl);
   });
 
-  it('should parse the config', () => {
-    storyConsent.buildCallback();
+  it('should parse the config', async () => {
+    await storyConsent.buildCallback();
     expect(storyConsent.storyConsentConfig_).to.deep.equal(defaultConfig);
   });
 
-  it('should parse and merge legacy consent config', () => {
+  it('should parse and merge legacy consent config', async () => {
     const newConsentConfig = {
       'consentInstanceId': 'ABC',
       'checkConsentHref': 'https://example.com',
       'promptIfUnknownForGeoGroup': undefined,
     };
-    storyConsent.buildCallback();
+    await storyConsent.buildCallback();
     expect(storyConsent.consentConfig_).to.deep.equal(newConsentConfig);
   });
 
@@ -151,11 +156,11 @@ describes.realWin('amp-story-consent', {amp: true}, (env) => {
     });
   });
 
-  it('should show the decline button by default', () => {
+  it('should show the decline button by default', async () => {
     delete defaultConfig.onlyAccept;
     setConfig(defaultConfig);
 
-    storyConsent.buildCallback();
+    await storyConsent.buildCallback();
 
     const buttonEl = storyConsent.storyConsentEl_.querySelector(
       '.i-amphtml-story-consent-action-reject'
@@ -166,11 +171,11 @@ describes.realWin('amp-story-consent', {amp: true}, (env) => {
     expect(buttonEl).to.have.display('block');
   });
 
-  it('should hide the decline button if onlyAccept is true', () => {
+  it('should hide the decline button if onlyAccept is true', async () => {
     defaultConfig.onlyAccept = true;
     setConfig(defaultConfig);
 
-    storyConsent.buildCallback();
+    await storyConsent.buildCallback();
 
     const buttonEl = storyConsent.storyConsentEl_.querySelector(
       '.i-amphtml-story-consent-action-reject'
@@ -181,8 +186,8 @@ describes.realWin('amp-story-consent', {amp: true}, (env) => {
     expect(buttonEl).to.have.display('none');
   });
 
-  it('should hide the external link by default', () => {
-    storyConsent.buildCallback();
+  it('should hide the external link by default', async () => {
+    await storyConsent.buildCallback();
 
     const linkEl = storyConsent.storyConsentEl_.querySelector(
       '.i-amphtml-story-consent-external-link'
@@ -225,12 +230,12 @@ describes.realWin('amp-story-consent', {amp: true}, (env) => {
     });
   });
 
-  it('should show the external link', () => {
+  it('should show the external link', async () => {
     defaultConfig.externalLink.title = 'Privacy settings';
     defaultConfig.externalLink.href = 'https://example.com';
     setConfig(defaultConfig);
 
-    storyConsent.buildCallback();
+    await storyConsent.buildCallback();
 
     const linkEl = storyConsent.storyConsentEl_.querySelector(
       '.i-amphtml-story-consent-external-link'
@@ -239,8 +244,8 @@ describes.realWin('amp-story-consent', {amp: true}, (env) => {
     expect(linkEl).not.to.have.display('none');
   });
 
-  it('should allowlist the <amp-consent> actions', () => {
-    storyConsent.buildCallback();
+  it('should allowlist the <amp-consent> actions', async () => {
+    await storyConsent.buildCallback();
 
     const actions = storyConsent.storeService_.get(
       StateProperty.ACTIONS_ALLOWLIST
@@ -259,8 +264,8 @@ describes.realWin('amp-story-consent', {amp: true}, (env) => {
     });
   });
 
-  it('should broadcast the amp actions', () => {
-    storyConsent.buildCallback();
+  it('should broadcast the amp actions', async () => {
+    await storyConsent.buildCallback();
 
     env.sandbox.stub(storyConsent.actions_, 'trigger');
 
@@ -276,8 +281,8 @@ describes.realWin('amp-story-consent', {amp: true}, (env) => {
     expect(storyConsent.actions_.trigger).to.have.been.calledWith(buttonEl);
   });
 
-  it('should render an accept button with the proper amp action', () => {
-    storyConsent.buildCallback();
+  it('should render an accept button with the proper amp action', async () => {
+    await storyConsent.buildCallback();
 
     const buttonEl = storyConsent.storyConsentEl_.querySelector(
       `button[on="tap:${CONSENT_ID}.accept"]`
@@ -285,8 +290,8 @@ describes.realWin('amp-story-consent', {amp: true}, (env) => {
     expect(buttonEl).to.exist;
   });
 
-  it('should set the consent ID in the store', () => {
-    storyConsent.buildCallback();
+  it('should set the consent ID in the store', async () => {
+    await storyConsent.buildCallback();
 
     expect(storyConsent.storeService_.get(StateProperty.CONSENT_ID)).to.equal(
       CONSENT_ID
@@ -301,7 +306,7 @@ describes.realWin('amp-story-consent', {amp: true}, (env) => {
       .stub(Services, 'geoForDocOrNull')
       .resolves({matchedISOCountryGroups: ['eea']});
 
-    storyConsent.buildCallback();
+    await storyConsent.buildCallback();
 
     await Promise.resolve();
     expect(storyConsent.storeService_.get(StateProperty.CONSENT_ID)).to.equal(
@@ -317,16 +322,16 @@ describes.realWin('amp-story-consent', {amp: true}, (env) => {
       .stub(Services, 'geoForDocOrNull')
       .resolves({matchedISOCountryGroups: ['othergroup']});
 
-    storyConsent.buildCallback();
+    await storyConsent.buildCallback();
 
     await Promise.resolve();
     expect(storyConsent.storeService_.get(StateProperty.CONSENT_ID)).to.be.null;
   });
 
-  it('should set the font color to black if background is white', () => {
+  it('should set the font color to black if background is white', async () => {
     const styles = {'background-color': 'rgb(255, 255, 255)'};
     getComputedStyleStub.returns(styles);
-    storyConsent.buildCallback();
+    await storyConsent.buildCallback();
 
     const buttonEl = storyConsent.storyConsentEl_.querySelector(
       '.i-amphtml-story-consent-action-accept'
@@ -336,10 +341,10 @@ describes.realWin('amp-story-consent', {amp: true}, (env) => {
     );
   });
 
-  it('should set the font color to white if background is black', () => {
+  it('should set the font color to white if background is black', async () => {
     const styles = {'background-color': 'rgba(0, 0, 0, 1)'};
     getComputedStyleStub.returns(styles);
-    storyConsent.buildCallback();
+    await storyConsent.buildCallback();
 
     const buttonEl = storyConsent.storyConsentEl_.querySelector(
       '.i-amphtml-story-consent-action-accept'
diff --git a/extensions/amp-story/1.0/test/test-amp-story-cta-layer.js b/extensions/amp-story/1.0/test/test-amp-story-cta-layer.js
deleted file mode 100644
index d8d53096cece..000000000000
--- a/extensions/amp-story/1.0/test/test-amp-story-cta-layer.js
+++ /dev/null
@@ -1,130 +0,0 @@
-import {AmpStoryCtaLayer} from '../amp-story-cta-layer';
-import {registerServiceBuilder} from '../../../../src/service-helpers';
-
-describes.realWin(
-  'amp-story-cta-layer',
-  {
-    amp: {
-      runtimeOn: true,
-      extensions: ['amp-story:1.0'],
-    },
-  },
-  (env) => {
-    let win;
-    let ampStoryCtaLayer;
-
-    beforeEach(() => {
-      win = env.win;
-      registerServiceBuilder(win, 'performance', function () {
-        return {
-          isPerformanceTrackingOn: () => false,
-        };
-      });
-      const ampStoryCtaLayerEl = win.document.createElement(
-        'amp-story-cta-layer'
-      );
-      win.document.body.appendChild(ampStoryCtaLayerEl);
-      ampStoryCtaLayer = new AmpStoryCtaLayer(ampStoryCtaLayerEl);
-    });
-
-    it('should build the cta layer', async () => {
-      ampStoryCtaLayer.buildCallback();
-      await ampStoryCtaLayer.layoutCallback();
-      expect(ampStoryCtaLayer.element).to.have.class('i-amphtml-story-layer');
-    });
-
-    it('should add or overwrite target attribute to links', async () => {
-      const ctaLink = win.document.createElement('a');
-      expect(ctaLink).to.not.have.attribute('target');
-
-      ampStoryCtaLayer.element.appendChild(ctaLink);
-      ampStoryCtaLayer.buildCallback();
-
-      await ampStoryCtaLayer.layoutCallback();
-      expect(ctaLink).to.have.attribute('target');
-      expect(ctaLink.getAttribute('target')).to.equal('_blank');
-    });
-
-    it('should not add target attribute to other elements', async () => {
-      const elem = win.document.createElement('span');
-      ampStoryCtaLayer.element.appendChild(elem);
-      ampStoryCtaLayer.buildCallback();
-
-      await ampStoryCtaLayer.layoutCallback();
-      expect(elem).to.not.have.attribute('target');
-    });
-
-    it('should not allow a cta layer on the first page', () => {
-      win.document.body.appendChild(
-        win.document.createElement('amp-story-page')
-      );
-      win.document.body.appendChild(
-        win.document.createElement('amp-story-page')
-      );
-
-      const pageElements = win.document.getElementsByTagName('amp-story-page');
-
-      pageElements[0].appendChild(ampStoryCtaLayer.element);
-
-      ampStoryCtaLayer.layoutCallback().then((layer) => {
-        return allowConsoleError(() => {
-          return expect(layer).to.throw();
-        });
-      });
-    });
-
-    it('should allow a cta layer on the second or third page', () => {
-      win.document.body.appendChild(
-        win.document.createElement('amp-story-page')
-      );
-      win.document.body.appendChild(
-        win.document.createElement('amp-story-page')
-      );
-      win.document.body.appendChild(
-        win.document.createElement('amp-story-page')
-      );
-
-      const pageElements = win.document.getElementsByTagName('amp-story-page');
-
-      pageElements[1].appendChild(ampStoryCtaLayer.element);
-      pageElements[2].appendChild(ampStoryCtaLayer.element);
-
-      ampStoryCtaLayer.layoutCallback().then((layer) => {
-        return expect(layer).to.not.throw();
-      });
-    });
-
-    it('should add or overwrite role attribute to links', async () => {
-      const ctaLink = win.document.createElement('a');
-      expect(ctaLink).to.not.have.attribute('role');
-
-      ampStoryCtaLayer.element.appendChild(ctaLink);
-      ampStoryCtaLayer.buildCallback();
-
-      await ampStoryCtaLayer.layoutCallback();
-      expect(ctaLink).to.have.attribute('role');
-      expect(ctaLink.getAttribute('role')).to.equal('link');
-    });
-
-    it('should add or overwrite role attribute to buttons', async () => {
-      const ctaButton = win.document.createElement('button');
-      expect(ctaButton).to.not.have.attribute('role');
-
-      ampStoryCtaLayer.element.appendChild(ctaButton);
-      ampStoryCtaLayer.buildCallback();
-
-      await ampStoryCtaLayer.layoutCallback();
-      expect(ctaButton).to.have.attribute('role');
-      expect(ctaButton.getAttribute('role')).to.equal('button');
-    });
-
-    it('should not add role attribute to other elements', async () => {
-      const elem = win.document.createElement('span');
-      ampStoryCtaLayer.element.appendChild(elem);
-      ampStoryCtaLayer.buildCallback();
-
-      await ampStoryCtaLayer.layoutCallback();
-      expect(elem).to.not.have.attribute('role');
-    });
-  }
-);
diff --git a/extensions/amp-story/1.0/test/test-amp-story-embedded-component.js b/extensions/amp-story/1.0/test/test-amp-story-embedded-component.js
index 7c23d9ff00c6..3d1d89669c71 100644
--- a/extensions/amp-story/1.0/test/test-amp-story-embedded-component.js
+++ b/extensions/amp-story/1.0/test/test-amp-story-embedded-component.js
@@ -1,16 +1,24 @@
+import {addAttributesToElement} from '#core/dom';
+
+import {Services} from '#service';
+import {LocalizationService} from '#service/localization';
+
 import * as analyticsApi from '#utils/analytics';
+
+import {sleep} from '#testing/helpers';
+
+import {
+  getAmpdoc,
+  registerServiceBuilder,
+} from '../../../../src/service-helpers';
+import {AmpStoryEmbeddedComponent} from '../amp-story-embedded-component';
 import {
   Action,
   EmbeddedComponentState,
   getStoreService,
 } from '../amp-story-store-service';
-import {AmpStoryEmbeddedComponent} from '../amp-story-embedded-component';
 import {EventType} from '../events';
-import {LocalizationService} from '#service/localization';
-import {Services} from '#service';
 import {StoryAnalyticsEvent} from '../story-analytics';
-import {addAttributesToElement} from '#core/dom';
-import {registerServiceBuilder} from '../../../../src/service-helpers';
 
 describes.realWin('amp-story-embedded-component', {amp: true}, (env) => {
   let component;
@@ -97,7 +105,7 @@ describes.realWin('amp-story-embedded-component', {amp: true}, (env) => {
     storeService.dispatch(Action.TOGGLE_INTERACTIVE_COMPONENT, fakeComponent);
 
     // Wait for TOOLTIP_CLOSE_ANIMATION_MS is finished before showing tooltip.
-    await timeout(150);
+    await sleep(150);
     expect(component.focusedStateOverlay_).to.not.have.class(
       'i-amphtml-hidden'
     );
@@ -170,7 +178,7 @@ describes.realWin('amp-story-embedded-component', {amp: true}, (env) => {
     );
 
     // Wait for TOOLTIP_CLOSE_ANIMATION_MS is finished before building tooltip.
-    await timeout(150);
+    await sleep(150);
     expect(tooltipIconEl.style['background-image']).to.equal(
       'url("http://localhost:9876/my-icon")'
     );
@@ -204,7 +212,7 @@ describes.realWin('amp-story-embedded-component', {amp: true}, (env) => {
     );
 
     // Wait for TOOLTIP_CLOSE_ANIMATION_MS is finished before building tooltip.
-    await timeout(150);
+    await sleep(150);
     expect(tooltipTextEl.textContent).to.equal('my cool text');
   });
 
@@ -217,24 +225,26 @@ describes.realWin('amp-story-embedded-component', {amp: true}, (env) => {
     );
 
     // Wait for TOOLTIP_CLOSE_ANIMATION_MS is finished before building tooltip.
-    await timeout(150);
+    await sleep(150);
     expect(tooltipTextEl.textContent).to.equal('google.com');
   });
 
-  it('should fire analytics event when entering a tooltip', () => {
+  it('should fire analytics event when entering a tooltip', async () => {
     fakePage.appendChild(clickableEl);
     storeService.dispatch(Action.TOGGLE_INTERACTIVE_COMPONENT, {
       element: clickableEl,
       state: EmbeddedComponentState.FOCUSED,
     });
 
+    await getAmpdoc(win.document).whenFirstVisible();
+
     expect(analyticsTriggerStub).to.be.calledWith(
       parentEl,
       StoryAnalyticsEvent.FOCUS
     );
   });
 
-  it('should send data-var specified by publisher in analytics event', () => {
+  it('should send data-var specified by publisher in analytics event', async () => {
     addAttributesToElement(clickableEl, {
       'data-vars-tooltip-id': '1234',
     });
@@ -245,6 +255,8 @@ describes.realWin('amp-story-embedded-component', {amp: true}, (env) => {
       state: EmbeddedComponentState.FOCUSED,
     });
 
+    await getAmpdoc(win.document).whenFirstVisible();
+
     expect(analyticsTriggerStub).to.be.calledWithMatch(
       parentEl,
       StoryAnalyticsEvent.FOCUS,
@@ -254,7 +266,7 @@ describes.realWin('amp-story-embedded-component', {amp: true}, (env) => {
     );
   });
 
-  it('should fire analytics event when clicking on the tooltip of a link', () => {
+  it('should fire analytics event when clicking on the tooltip of a link', async () => {
     fakePage.appendChild(clickableEl);
     storeService.dispatch(Action.TOGGLE_INTERACTIVE_COMPONENT, {
       element: clickableEl,
@@ -270,13 +282,15 @@ describes.realWin('amp-story-embedded-component', {amp: true}, (env) => {
 
     tooltip.click();
 
+    await getAmpdoc(win.document).whenFirstVisible();
+
     expect(analyticsTriggerStub).to.be.calledWith(
       parentEl,
       StoryAnalyticsEvent.CLICK_THROUGH
     );
   });
 
-  it('should fire analytics event when clicking on the tooltip of a tweet', () => {
+  it('should fire analytics event when clicking on the tooltip of a tweet', async () => {
     clickableEl = win.document.createElement('amp-twitter');
     addAttributesToElement(clickableEl, {
       'data-tweetid': '1166723359696130049',
@@ -297,17 +311,11 @@ describes.realWin('amp-story-embedded-component', {amp: true}, (env) => {
 
     tooltip.click();
 
+    await getAmpdoc(win.document).whenFirstVisible();
+
     expect(analyticsTriggerStub).to.be.calledWith(
       parentEl,
       StoryAnalyticsEvent.FOCUS
     );
   });
 });
-
-/**
- * @param {number} ms
- * @return {!Promise}
- */
-function timeout(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
diff --git a/extensions/amp-story/1.0/test/test-amp-story-grid-layer.js b/extensions/amp-story/1.0/test/test-amp-story-grid-layer.js
index 41ee54ea73c6..494fac041242 100644
--- a/extensions/amp-story/1.0/test/test-amp-story-grid-layer.js
+++ b/extensions/amp-story/1.0/test/test-amp-story-grid-layer.js
@@ -1,12 +1,14 @@
-import {Action, AmpStoryStoreService} from '../amp-story-store-service';
+import {setStyles} from '#core/dom/style';
+
+import {Services} from '#service';
 import {AmpDocSingle} from '#service/ampdoc-impl';
+
+import {CSS} from '../../../../build/amp-story-1.0.css';
+import {registerServiceBuilder} from '../../../../src/service-helpers';
 import {AmpStoryGridLayer} from '../amp-story-grid-layer';
 import {AmpStoryPage} from '../amp-story-page';
-import {MediaType} from '../media-pool';
-import {Services} from '#service';
-import {registerServiceBuilder} from '../../../../src/service-helpers';
-import {setStyles} from '#core/dom/style';
-import {CSS} from '../../../../build/amp-story-1.0.css';
+import {Action, AmpStoryStoreService} from '../amp-story-store-service';
+import {MediaType_Enum} from '../media-pool';
 
 describes.realWin('amp-story-grid-layer', {amp: true}, (env) => {
   let win;
@@ -26,8 +28,8 @@ describes.realWin('amp-story-grid-layer', {amp: true}, (env) => {
     const mediaPoolRoot = {
       getElement: () => win.document.createElement('div'),
       getMaxMediaElementCounts: () => ({
-        [MediaType.VIDEO]: 8,
-        [MediaType.AUDIO]: 8,
+        [MediaType_Enum.VIDEO]: 8,
+        [MediaType_Enum.AUDIO]: 8,
       }),
     };
 
diff --git a/extensions/amp-story/1.0/test/test-amp-story-hint.js b/extensions/amp-story/1.0/test/test-amp-story-hint.js
index 60d526a7744d..ce6ce4114815 100644
--- a/extensions/amp-story/1.0/test/test-amp-story-hint.js
+++ b/extensions/amp-story/1.0/test/test-amp-story-hint.js
@@ -1,8 +1,12 @@
-import {AmpStoryHint} from '../amp-story-hint';
-import {AmpStoryStoreService} from '../amp-story-store-service';
-import {LocalizationService} from '#service/localization';
 import {Services} from '#service';
+import {LocalizationService} from '#service/localization';
+
+import {waitFor} from '#testing/helpers/service';
+
 import {registerServiceBuilder} from '../../../../src/service-helpers';
+import LocalizedStringsEn from '../_locales/en.json' assert {type: 'json'}; // lgtm[js/syntax-error]
+import {AmpStoryHint} from '../amp-story-hint';
+import {AmpStoryStoreService} from '../amp-story-store-service';
 
 const NOOP = () => {};
 
@@ -18,6 +22,9 @@ describes.fakeWin('amp-story hint layer', {amp: true}, (env) => {
     env.sandbox
       .stub(Services, 'localizationForDoc')
       .returns(localizationService);
+    localizationService.registerLocalizedStringBundles({
+      'en': LocalizedStringsEn,
+    });
 
     const storeService = new AmpStoryStoreService(win);
     registerServiceBuilder(win, 'story-store', function () {
@@ -39,11 +46,12 @@ describes.fakeWin('amp-story hint layer', {amp: true}, (env) => {
     expect(getHintContainerFromHost(host)).to.be.null;
   });
 
-  it('should be able to show navigation help overlay', () => {
+  it('should be able to show navigation help overlay', async () => {
     const hideAfterTimeoutStub = env.sandbox
       .stub(ampStoryHint, 'hideAfterTimeout')
       .callsFake(NOOP);
     ampStoryHint.showNavigationOverlay();
+    await waitFor(() => ampStoryHint.parentEl_.innerHTML);
 
     const hintContainer = getHintContainerFromHost(host);
 
@@ -53,12 +61,13 @@ describes.fakeWin('amp-story hint layer', {amp: true}, (env) => {
     expect(hideAfterTimeoutStub).to.be.calledOnce;
   });
 
-  it('should be able to show no previous page help overlay', () => {
+  it('should be able to show no previous page help overlay', async () => {
     const hideAfterTimeoutStub = env.sandbox
       .stub(ampStoryHint, 'hideAfterTimeout')
       .callsFake(NOOP);
 
     ampStoryHint.showFirstPageHintOverlay();
+    await waitFor(() => ampStoryHint.parentEl_.innerHTML);
 
     const hintContainer = getHintContainerFromHost(host);
 
@@ -68,8 +77,9 @@ describes.fakeWin('amp-story hint layer', {amp: true}, (env) => {
     expect(hideAfterTimeoutStub).to.be.calledOnce;
   });
 
-  it('should be able to hide shown hint', () => {
+  it('should be able to hide shown hint', async () => {
     ampStoryHint.showNavigationOverlay();
+    await waitFor(() => ampStoryHint.parentEl_.innerHTML);
     ampStoryHint.hideAllNavigationHint();
 
     const hintContainer = getHintContainerFromHost(host);
diff --git a/extensions/amp-story/1.0/test/test-amp-story-info-dialog.js b/extensions/amp-story/1.0/test/test-amp-story-info-dialog.js
index f8fc1abf3c7a..18a2ba37078c 100644
--- a/extensions/amp-story/1.0/test/test-amp-story-info-dialog.js
+++ b/extensions/amp-story/1.0/test/test-amp-story-info-dialog.js
@@ -1,16 +1,18 @@
-import {
-  Action,
-  AmpStoryStoreService,
-  StateProperty,
-} from '../amp-story-store-service';
+import {Services} from '#service';
+import {LocalizationService} from '#service/localization';
+
+import {registerServiceBuilder} from '../../../../src/service-helpers';
+import LocalizedStringsEn from '../_locales/en.json' assert {type: 'json'}; // lgtm[js/syntax-error]
 import {
   DIALOG_VISIBLE_CLASS,
   InfoDialog,
   MOREINFO_VISIBLE_CLASS,
 } from '../amp-story-info-dialog';
-import {LocalizationService} from '#service/localization';
-import {Services} from '#service';
-import {registerServiceBuilder} from '../../../../src/service-helpers';
+import {
+  Action,
+  AmpStoryStoreService,
+  StateProperty,
+} from '../amp-story-store-service';
 
 describes.realWin('amp-story-info-dialog', {amp: true}, (env) => {
   let moreInfoLinkUrl;
@@ -28,6 +30,9 @@ describes.realWin('amp-story-info-dialog', {amp: true}, (env) => {
     env.sandbox
       .stub(Services, 'localizationForDoc')
       .returns(localizationService);
+    localizationService.registerLocalizedStringBundles({
+      'en': LocalizedStringsEn,
+    });
 
     storeService = new AmpStoryStoreService(win);
     embedded = true;
@@ -61,7 +66,6 @@ describes.realWin('amp-story-info-dialog', {amp: true}, (env) => {
 
   it('should build the info dialog', async () => {
     await infoDialog.build();
-    expect(infoDialog.isBuilt()).to.be.true;
     expect(infoDialog.element_).to.exist;
   });
 
@@ -115,7 +119,9 @@ describes.realWin('amp-story-info-dialog', {amp: true}, (env) => {
   it('should not hide the info dialog on click on the inner container', async () => {
     await infoDialog.build();
     storeService.dispatch(Action.TOGGLE_INFO_DIALOG, true);
-    infoDialog.innerContainerEl_.dispatchEvent(new Event('click'));
+    parentEl
+      .querySelector('.i-amphtml-story-info-dialog-container')
+      .dispatchEvent(new Event('click'));
 
     expect(infoDialog.element_).to.have.class(DIALOG_VISIBLE_CLASS);
     expect(storeService.get(StateProperty.INFO_DIALOG_STATE)).to.be.true;
diff --git a/extensions/amp-story/1.0/test/test-amp-story-localization-service.js b/extensions/amp-story/1.0/test/test-amp-story-localization-service.js
new file mode 100644
index 000000000000..3380a2518a08
--- /dev/null
+++ b/extensions/amp-story/1.0/test/test-amp-story-localization-service.js
@@ -0,0 +1,30 @@
+import {getSupportedLanguageCode} from '../amp-story-localization-service';
+
+describes.fakeWin('amp-story-localization-service', {amp: true}, () => {
+  describe('getSupportedLanguageCode', () => {
+    it('returns the first language code when it is supported', () => {
+      expect(
+        getSupportedLanguageCode(['es-419', 'es', 'en', 'default'])
+      ).to.equal('es-419');
+    });
+
+    it('returns the fallback language code when the first is not supported', () => {
+      expect(
+        getSupportedLanguageCode(['es-519', 'es', 'en', 'default'])
+      ).to.equal('es');
+    });
+
+    it('returns the properly cased value', () => {
+      expect(getSupportedLanguageCode(['en-gb', 'en', 'default'])).to.equal(
+        'en-GB'
+      );
+    });
+
+    it('returns en when nothing is supported', () => {
+      expect(getSupportedLanguageCode(['AlfredoOoOoOoOooooo'])).to.equal('en');
+      expect(getSupportedLanguageCode([])).to.equal('en');
+      expect(getSupportedLanguageCode(['en'])).to.equal('en');
+      expect(getSupportedLanguageCode(['default'])).to.equal('en');
+    });
+  });
+});
diff --git a/extensions/amp-story/1.0/test/test-amp-story-localization-strings.js b/extensions/amp-story/1.0/test/test-amp-story-localization-strings.js
index 05cd3c11fe1b..19e48cc6ccfa 100644
--- a/extensions/amp-story/1.0/test/test-amp-story-localization-strings.js
+++ b/extensions/amp-story/1.0/test/test-amp-story-localization-strings.js
@@ -1,4 +1,5 @@
-import {LocalizedStringId} from '#service/localization/strings';
+import {LocalizedStringId_Enum} from '#service/localization/strings';
+
 import localesObjs from '../_locales';
 
 describes.fakeWin('amp-story-localization-strings', {amp: true}, () => {
@@ -14,8 +15,8 @@ describes.fakeWin('amp-story-localization-strings', {amp: true}, () => {
         expect(uniqueKeys.size).to.eql(languageKeys.length);
       });
 
-      it(languageName + ' keys should exist in LocalizedStringId', () => {
-        const localizedStringIdKeys = Object.values(LocalizedStringId);
+      it(languageName + ' keys should exist in LocalizedStringId_Enum', () => {
+        const localizedStringIdKeys = Object.values(LocalizedStringId_Enum);
 
         languageKeys.forEach((key) => {
           expect(localizedStringIdKeys).to.contain(key);
diff --git a/extensions/amp-story/1.0/test/test-amp-story-page-attachment.js b/extensions/amp-story/1.0/test/test-amp-story-page-attachment.js
deleted file mode 100644
index ee7f402508c2..000000000000
--- a/extensions/amp-story/1.0/test/test-amp-story-page-attachment.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import {AmpDocSingle} from '#service/ampdoc-impl';
-import {AmpStoryPageAttachment} from '../amp-story-page-attachment';
-
-describes.realWin('amp-story-page-attachment', {amp: true}, (env) => {
-  let attachmentEl;
-  let attachment;
-  let outlinkEl;
-  let outlink;
-
-  beforeEach(() => {
-    const {win} = env;
-
-    // Set up the story.
-    const storyEl = win.document.createElement('amp-story');
-    storyEl.getAmpDoc = () => new AmpDocSingle(win);
-    win.document.body.appendChild(storyEl);
-
-    // Set up the attachment element for inline attachment testing.
-    attachmentEl = win.document.createElement('amp-story-page-attachment');
-    attachmentEl.getAmpDoc = () => new AmpDocSingle(win);
-    storyEl.appendChild(attachmentEl);
-    attachment = new AmpStoryPageAttachment(attachmentEl);
-
-    // Set up the outlink element for outlink testing.
-    outlinkEl = win.document.createElement('amp-story-page-outlink');
-    outlinkEl.getAmpDoc = () => new AmpDocSingle(win);
-    storyEl.appendChild(outlinkEl);
-    outlinkEl.appendChild(win.document.createElement('a'));
-    outlink = new AmpStoryPageAttachment(outlinkEl);
-  });
-
-  afterEach(() => {
-    attachmentEl.remove();
-    outlinkEl.remove();
-  });
-
-  it('should build an attachment', async () => {
-    attachment.buildCallback();
-    return attachment.layoutCallback();
-  });
-
-  it('should build an outlink', async () => {
-    outlink.buildCallback();
-    return outlink.layoutCallback();
-  });
-
-  it('should build amp-story-page-outlink with target="_top" even when the publisher has specified a different value', async () => {
-    const anchorEl = outlinkEl.querySelector('amp-story-page-outlink a');
-    anchorEl.setAttribute('target', '_blank');
-
-    outlink.buildCallback();
-    await outlink.layoutCallback();
-
-    expect(anchorEl.getAttribute('target')).to.eql('_top');
-  });
-});
diff --git a/extensions/amp-story/1.0/test/test-amp-story-page.js b/extensions/amp-story/1.0/test/test-amp-story-page.js
index 534f87b43492..c6e327a53fbf 100644
--- a/extensions/amp-story/1.0/test/test-amp-story-page.js
+++ b/extensions/amp-story/1.0/test/test-amp-story-page.js
@@ -1,33 +1,40 @@
-import * as VideoUtils from '#core/dom/video';
-import {Action, AmpStoryStoreService} from '../amp-story-store-service';
-import {AmpAudio} from '../../../amp-audio/0.1/amp-audio';
-import {AmpDocSingle} from '#service/ampdoc-impl';
-import {AmpStoryPage, PageState, Selectors} from '../amp-story-page';
+import {expect} from 'chai';
+
 import {Deferred} from '#core/data-structures/promise';
-import {LocalizationService} from '#service/localization';
-import {MediaType} from '../media-pool';
-import {Services} from '#service';
 import {Signals} from '#core/data-structures/signals';
 import {addAttributesToElement, createElementWithAttributes} from '#core/dom';
+import * as Preact from '#core/dom/jsx';
+import {scopedQuerySelectorAll} from '#core/dom/query';
 import {htmlFor} from '#core/dom/static-template';
+import * as VideoUtils from '#core/dom/video';
+
+import {Services} from '#service';
+import {AmpDocSingle} from '#service/ampdoc-impl';
+import {LocalizationService} from '#service/localization';
+
+import {afterRenderPromise, macroTask} from '#testing/helpers';
+
 import {installFriendlyIframeEmbed} from '../../../../src/friendly-iframe-embed';
 import {registerServiceBuilder} from '../../../../src/service-helpers';
-import {scopedQuerySelectorAll} from '#core/dom/query';
-import {afterRenderPromise} from '#testing/helpers';
+import {AmpAudio} from '../../../amp-audio/0.1/amp-audio';
+import LocalizedStringsEn from '../_locales/en.json' assert {type: 'json'}; // lgtm[js/syntax-error]
+import {AmpStoryPage, PageState, Selectors} from '../amp-story-page';
+import {Action, AmpStoryStoreService} from '../amp-story-store-service';
+import {MediaType_Enum} from '../media-pool';
 
 const extensions = ['amp-story:1.0', 'amp-audio'];
 
 describes.realWin('amp-story-page', {amp: {extensions}}, (env) => {
   let win;
+  let ampDoc;
   let element;
   let html;
   let gridLayerEl;
   let page;
+  let story;
   let storeService;
   let isPerformanceTrackingOn;
 
-  const nextTick = () => new Promise((resolve) => win.setTimeout(resolve, 0));
-
   beforeEach(() => {
     win = env.win;
     isPerformanceTrackingOn = false;
@@ -37,8 +44,8 @@ describes.realWin('amp-story-page', {amp: {extensions}}, (env) => {
     const mediaPoolRoot = {
       getElement: () => win.document.createElement('div'),
       getMaxMediaElementCounts: () => ({
-        [MediaType.VIDEO]: 8,
-        [MediaType.AUDIO]: 8,
+        [MediaType_Enum.VIDEO]: 8,
+        [MediaType_Enum.AUDIO]: 8,
       }),
     };
 
@@ -46,6 +53,9 @@ describes.realWin('amp-story-page', {amp: {extensions}}, (env) => {
     env.sandbox
       .stub(Services, 'localizationForDoc')
       .returns(localizationService);
+    localizationService.registerLocalizedStringBundles({
+      'en': LocalizedStringsEn,
+    });
 
     storeService = new AmpStoryStoreService(win);
     registerServiceBuilder(win, 'story-store', function () {
@@ -58,28 +68,32 @@ describes.realWin('amp-story-page', {amp: {extensions}}, (env) => {
       };
     });
 
-    const story = win.document.createElement('amp-story');
+    story = win.document.createElement('amp-story');
     story.getImpl = () => Promise.resolve(mediaPoolRoot);
     // Makes whenUpgradedToCustomElement() resolve immediately.
     story.createdCallback = Promise.resolve();
 
     element = win.document.createElement('amp-story-page');
     gridLayerEl = win.document.createElement('amp-story-grid-layer');
-    element.getAmpDoc = () => new AmpDocSingle(win);
+    ampDoc = new AmpDocSingle(win);
+    element.getAmpDoc = () => ampDoc;
     const signals = new Signals();
     element.signals = () => signals;
     element.appendChild(gridLayerEl);
     story.appendChild(element);
     win.document.body.appendChild(story);
-
-    page = new AmpStoryPage(element);
-    env.sandbox.stub(page, 'mutateElement').callsFake((fn) => fn());
+    initializePageWithElement(element);
   });
 
   afterEach(() => {
     element.remove();
   });
 
+  function initializePageWithElement(el) {
+    page = new AmpStoryPage(el);
+    env.sandbox.stub(page, 'mutateElement').callsFake((fn) => fn());
+  }
+
   it('should build a page', async () => {
     page.buildCallback();
     return page.layoutCallback();
@@ -140,13 +154,6 @@ describes.realWin('amp-story-page', {amp: {extensions}}, (env) => {
     expect(spy).to.have.been.calledOnce;
   });
 
-  it('should call renderOpenAttachmentUI_ in beforeVisible', async () => {
-    const spy = env.sandbox.spy(page, 'renderOpenAttachmentUI_');
-    page.buildCallback();
-    await page.layoutCallback();
-    expect(spy).to.have.been.calledTwice;
-  });
-
   it('should mark page as loaded after media is loaded', async () => {
     const waitForMediaLayoutSpy = env.sandbox.spy(page, 'waitForMediaLayout_');
     const markPageAsLoadedSpy = env.sandbox.spy(page, 'markPageAsLoaded_');
@@ -294,7 +301,7 @@ describes.realWin('amp-story-page', {amp: {extensions}}, (env) => {
 
     page.setState(PageState.PLAYING);
 
-    await nextTick();
+    await macroTask();
 
     const audioEl = scopedQuerySelectorAll(
       element,
@@ -324,7 +331,7 @@ describes.realWin('amp-story-page', {amp: {extensions}}, (env) => {
 
     page.setState(PageState.PLAYING);
 
-    await nextTick();
+    await macroTask();
 
     const audioEl = scopedQuerySelectorAll(
       element,
@@ -343,7 +350,7 @@ describes.realWin('amp-story-page', {amp: {extensions}}, (env) => {
 
     page.setState(PageState.PLAYING);
 
-    await nextTick();
+    await macroTask();
 
     const audioEl = scopedQuerySelectorAll(
       element,
@@ -373,7 +380,7 @@ describes.realWin('amp-story-page', {amp: {extensions}}, (env) => {
     page.setState(PageState.PLAYING);
 
     deferred.resolve();
-    await nextTick();
+    await macroTask();
 
     expect(mediaPoolRegister).to.have.been.calledOnceWithExactly(videoEl);
   });
@@ -400,12 +407,13 @@ describes.realWin('amp-story-page', {amp: {extensions}}, (env) => {
 
     // Not calling deferred.resolve();
 
-    await nextTick();
+    await macroTask();
 
     expect(mediaPoolRegister).to.not.have.been.called;
   });
 
   it('should use storyNextUp value as default for auto-advance-after', async () => {
+    initializePageWithElement(element);
     env.sandbox
       .stub(Services.viewerForDoc(element), 'getParam')
       .withArgs('storyNextUp')
@@ -417,25 +425,19 @@ describes.realWin('amp-story-page', {amp: {extensions}}, (env) => {
   });
 
   it('should not use storyNextUp to override auto-advance-after value', async () => {
+    element.setAttribute('auto-advance-after', '20000ms');
+    // Reinitializing the AmpStoryPage because the auto-advance-after is used
+    // in its constructor.
+    initializePageWithElement(element);
     env.sandbox
       .stub(Services.viewerForDoc(element), 'getParam')
       .withArgs('storyNextUp')
       .returns('5s');
-    element.setAttribute('auto-advance-after', '20000ms');
     page.buildCallback();
 
     expect(element.getAttribute('auto-advance-after')).to.be.equal('20000ms');
   });
 
-  it('should not use storyNextUp when in viewer control group', () => {
-    env.sandbox
-      .stub(Services.viewerForDoc(element), 'getParam')
-      .withArgs('storyNextUp')
-      .returns('999999ms');
-    page.buildCallback();
-    expect(element).not.to.have.attribute('auto-advance-after');
-  });
-
   it('should stop the advancement when state becomes not active', async () => {
     page.buildCallback();
     const advancementStopStub = env.sandbox.stub(page.advancement_, 'stop');
@@ -618,7 +620,7 @@ describes.realWin('amp-story-page', {amp: {extensions}}, (env) => {
     page.layoutCallback();
 
     page.setState(PageState.PLAYING);
-    await nextTick();
+    await macroTask();
 
     const playButtonEl = element.querySelector(
       '.i-amphtml-story-page-play-button'
@@ -627,348 +629,264 @@ describes.realWin('amp-story-page', {amp: {extensions}}, (env) => {
     expect(playButtonEl.getAttribute('role')).to.eql('button');
   });
 
-  it('should not build the open attachment UI if no attachment', async () => {
-    page.buildCallback();
-    await page.layoutCallback();
-    page.setState(PageState.PLAYING);
-
-    const openAttachmentEl = element.querySelector(
-      '.i-amphtml-story-page-open-attachment'
+  it('should install the page-attachment extension if attachment', async () => {
+    const extensionSpy = env.sandbox.spy(
+      Services.extensionsFor(win),
+      'installExtensionForDoc'
     );
-    expect(openAttachmentEl).to.not.exist;
-  });
-
-  it('should build the open attachment UI if attachment', async () => {
     const attachmentEl = win.document.createElement(
       'amp-story-page-attachment'
     );
     attachmentEl.setAttribute('layout', 'nodisplay');
-    element.appendChild(attachmentEl);
+    page.element.appendChild(attachmentEl);
 
     page.buildCallback();
     await page.layoutCallback();
     page.setState(PageState.PLAYING);
 
-    const openAttachmentEl = element.querySelector(
-      '.i-amphtml-story-page-open-attachment'
+    expect(extensionSpy).to.have.been.calledWith(
+      env.sandbox.match.any,
+      'amp-story-page-attachment',
+      '0.1'
     );
-    expect(openAttachmentEl).to.exist;
   });
 
-  it('should build the legacy outlinking amp-story-page-attachment UI with target="_top" to navigate in top window. For viewers, this ensures the link will open in the parent window.', async () => {
-    const attachmentEl = win.document.createElement(
-      'amp-story-page-attachment'
-    );
-    attachmentEl.setAttribute('layout', 'nodisplay');
-    attachmentEl.setAttribute('href', 'google.com');
-    element.appendChild(attachmentEl);
-
-    page.buildCallback();
-    await page.layoutCallback();
-    page.setState(PageState.PLAYING);
+  it('should start tracking media performance when entering the page', async () => {
+    expectAsyncConsoleError(/source must start with/, 1);
 
-    const openAttachmentEl = element.querySelector(
-      '.i-amphtml-story-page-open-attachment'
+    isPerformanceTrackingOn = true;
+    const startMeasuringStub = env.sandbox.stub(
+      page.mediaPerformanceMetricsService_,
+      'startMeasuring'
     );
 
-    expect(openAttachmentEl.getAttribute('target')).to.eql('_top');
-  });
-
-  it('should build amp-story-page-outlink UI with target="_top" to navigate in top level browsing context. For viewers, this ensures the link will open in the parent window.', async () => {
-    const outlinkEl = win.document.createElement('amp-story-page-outlink');
-    outlinkEl.setAttribute('layout', 'nodisplay');
-    element.appendChild(outlinkEl);
-    const anchorEl = win.document.createElement('a');
-    outlinkEl.appendChild(anchorEl);
+    const videoEl = win.document.createElement('video');
+    videoEl.setAttribute('src', 'localhost/video.mp4');
+    gridLayerEl.appendChild(videoEl);
 
     page.buildCallback();
     await page.layoutCallback();
     page.setState(PageState.PLAYING);
 
-    const openAttachmentEl = element.querySelector(
-      '.i-amphtml-story-page-open-attachment'
-    );
+    await macroTask();
 
-    expect(openAttachmentEl.getAttribute('target')).to.eql('_top');
+    const poolVideoEl = element.querySelector('video');
+    // Not called with the original video.
+    expect(startMeasuringStub).to.not.have.been.calledOnceWithExactly(videoEl);
+    // Called with the media pool replaced video.
+    expect(startMeasuringStub).to.have.been.calledOnceWithExactly(poolVideoEl);
   });
 
-  it('should build the open outlink UI with same codepath as page attachment', async () => {
-    const outlinkEl = win.document.createElement('amp-story-page-outlink');
-    outlinkEl.setAttribute('layout', 'nodisplay');
-    element.appendChild(outlinkEl);
-
-    page.buildCallback();
-    await page.layoutCallback();
-    page.setState(PageState.PLAYING);
-
-    const openoutlinkEl = element.querySelector(
-      '.i-amphtml-story-page-open-attachment'
-    );
-    expect(openoutlinkEl).to.exist;
-  });
+  it('should stop tracking media performance when leaving the page', async () => {
+    expectAsyncConsoleError(/source must start with/, 1);
 
-  it('should build the amp-story-page-attachment UI with one image', async () => {
-    const attachmentEl = win.document.createElement(
-      'amp-story-page-attachment'
+    isPerformanceTrackingOn = true;
+    const stopMeasuringStub = env.sandbox.stub(
+      page.mediaPerformanceMetricsService_,
+      'stopMeasuring'
     );
 
-    attachmentEl.setAttribute('layout', 'nodisplay');
-    attachmentEl.setAttribute('cta-image', 'nodisplay');
-    element.appendChild(attachmentEl);
+    const videoEl = win.document.createElement('video');
+    videoEl.setAttribute('src', 'https://example.com/video.mp4');
+    gridLayerEl.appendChild(videoEl);
 
     page.buildCallback();
     await page.layoutCallback();
     page.setState(PageState.PLAYING);
+    await macroTask();
+    page.setState(PageState.NOT_ACTIVE);
 
-    const openAttachmentEl = element.querySelector(
-      '.i-amphtml-story-page-open-attachment'
+    const poolVideoEl = element.querySelector('video');
+    expect(stopMeasuringStub).to.have.been.calledOnceWithExactly(
+      poolVideoEl,
+      true /* sendMetrics */
     );
-
-    expect(
-      openAttachmentEl.querySelector(
-        '.i-amphtml-story-inline-page-attachment-img'
-      )
-    ).to.exist;
   });
 
-  it('should build the amp-story-page-attachment UI with two images', async () => {
-    const attachmentEl = win.document.createElement(
-      'amp-story-page-attachment'
-    );
-    attachmentEl.setAttribute('layout', 'nodisplay');
-    attachmentEl.setAttribute('cta-image', 'nodisplay');
-    attachmentEl.setAttribute('cta-image-2', 'nodisplay');
-    element.appendChild(attachmentEl);
-
-    page.buildCallback();
-    await page.layoutCallback();
-    page.setState(PageState.PLAYING);
-
-    const openAttachmentEl = element.querySelector(
-      '.i-amphtml-story-page-open-attachment'
-    );
-
-    expect(
-      openAttachmentEl.querySelectorAll(
-        '.i-amphtml-story-inline-page-attachment-img'
-      ).length
-    ).to.equal(2);
-  });
+  it('should not start tracking media performance if tracking is off', async () => {
+    expectAsyncConsoleError(/source must start with/, 1);
 
-  it('should NOT rewrite the amp-story-page-attachment UI images to a proxy URL', async () => {
-    const attachmentEl = win.document.createElement(
-      'amp-story-page-attachment'
+    isPerformanceTrackingOn = false;
+    const startMeasuringStub = env.sandbox.stub(
+      page.mediaPerformanceMetricsService_,
+      'startMeasuring'
     );
 
-    const src = 'https://examples.com/foo.bar.png';
-    attachmentEl.setAttribute('layout', 'nodisplay');
-    attachmentEl.setAttribute('cta-image', src);
-    element.appendChild(attachmentEl);
+    const videoEl = win.document.createElement('video');
+    videoEl.setAttribute('src', 'https://example.com/video.mp4');
+    gridLayerEl.appendChild(videoEl);
 
     page.buildCallback();
     await page.layoutCallback();
     page.setState(PageState.PLAYING);
 
-    const openAttachmentEl = element.querySelector(
-      '.i-amphtml-story-page-open-attachment'
-    );
-
-    const imgEl = openAttachmentEl.querySelector(
-      '.i-amphtml-story-inline-page-attachment-img'
-    );
-    expect(imgEl.getAttribute('style')).to.contain(src);
+    expect(startMeasuringStub).to.not.have.been.called;
   });
 
-  it('should build the amp-story-page-attachment with href (legacy) UI', async () => {
-    const attachmentEl = win.document.createElement(
-      'amp-story-page-attachment'
-    );
-    attachmentEl.setAttribute('layout', 'nodisplay');
-    attachmentEl.setAttribute('href', 'www.google.com');
-    element.appendChild(attachmentEl);
-
-    await page.buildCallback();
-    await page.layoutCallback();
-    page.setState(PageState.PLAYING);
-
-    const openAttachmentEl = element.querySelector(
-      '.i-amphtml-story-page-open-attachment'
-    );
+  it('should only allow the prerender visibility state if it is the first page', async () => {
+    const pageElement2 = win.document.createElement('amp-story-page');
+    const pageElement3 = win.document.createElement('amp-story-page');
+    story.appendChild(pageElement2);
+    story.appendChild(pageElement3);
 
-    expect(
-      openAttachmentEl.querySelector(
-        '.i-amphtml-story-page-open-attachment-link-icon'
-      )
-    ).to.exist;
+    expect(AmpStoryPage.prerenderAllowed(element)).to.be.true;
+    expect(AmpStoryPage.prerenderAllowed(pageElement2)).to.be.false;
+    expect(AmpStoryPage.prerenderAllowed(pageElement3)).to.be.false;
   });
 
-  it('should build the amp-story-page-outlink UI', async () => {
-    const outlinkEl = win.document.createElement('amp-story-page-outlink');
-    outlinkEl.setAttribute('layout', 'nodisplay');
-    element.appendChild(outlinkEl);
-    const anchorChild = win.document.createElement('a');
-    outlinkEl.appendChild(anchorChild);
+  it('should always allow the preview visibility state', async () => {
+    const pageElement2 = win.document.createElement('amp-story-page');
+    const pageElement3 = win.document.createElement('amp-story-page');
+    story.appendChild(pageElement2);
+    story.appendChild(pageElement3);
 
-    await page.buildCallback();
-    await page.layoutCallback();
-    page.setState(PageState.PLAYING);
-
-    const openAttachmentEl = element.querySelector(
-      '.i-amphtml-story-page-open-attachment'
-    );
-
-    expect(
-      openAttachmentEl.querySelector(
-        '.i-amphtml-story-page-open-attachment-link-icon'
-      )
-    ).to.exist;
+    expect(AmpStoryPage.previewAllowed(element)).to.be.true;
+    expect(AmpStoryPage.previewAllowed(pageElement2)).to.be.true;
+    expect(AmpStoryPage.previewAllowed(pageElement3)).to.be.true;
   });
 
-  it('should build the open attachment UI with custom text', async () => {
-    const attachmentEl = win.document.createElement(
-      'amp-story-page-attachment'
-    );
-    attachmentEl.setAttribute('layout', 'nodisplay');
-    attachmentEl.setAttribute('cta-text', 'Custom text');
-    element.appendChild(attachmentEl);
+  describe('maybeConvertCtaLayerToPageOutlink_', () => {
+    it('should do nothing if amp-story-cta-layer has two anchor tags', () => {
+      page.element.appendChild(
+        <amp-story-cta-layer>
+          <a href="https://www.ampproject.org" class="button">
+            CTA Text!
+          </a>
+          <a>dummy anchor</a>
+        </amp-story-cta-layer>
+      );
 
-    page.buildCallback();
-    await page.layoutCallback();
-    page.setState(PageState.PLAYING);
-
-    const openAttachmentLabelEl = element.querySelector(
-      '.i-amphtml-story-page-attachment-label'
-    );
-    expect(openAttachmentLabelEl.textContent).to.equal('Custom text');
-  });
+      page.buildCallback();
 
-  it('should use cta-text attribute when data-cta-text also exist', async () => {
-    const attachmentEl = win.document.createElement(
-      'amp-story-page-attachment'
-    );
-    attachmentEl.setAttribute('layout', 'nodisplay');
-    attachmentEl.setAttribute('cta-text', 'CTA text');
-    attachmentEl.setAttribute('data-cta-text', 'data CTA text');
-    element.appendChild(attachmentEl);
+      expect(page.element.querySelector('amp-story-cta-layer')).to.be.not.null;
+    });
 
-    page.buildCallback();
-    await page.layoutCallback();
-    page.setState(PageState.PLAYING);
+    it('should do nothing if the anchor tag in amp-story-cta-layer has no href attribute', () => {
+      page.element.appendChild(
+        <amp-story-cta-layer>
+          <a class="button">CTA Text!</a>
+        </amp-story-cta-layer>
+      );
 
-    const openAttachmentLabelEl = element.querySelector(
-      '.i-amphtml-story-page-attachment-label'
-    );
+      page.buildCallback();
 
-    expect(openAttachmentLabelEl.textContent).to.equal('CTA text');
-  });
+      expect(page.element.querySelector('amp-story-cta-layer')).to.be.not.null;
+    });
 
-  it('should propogate the amp-story-page-attachment title attribute to the cta button', async () => {
-    const attachmentEl = win.document.createElement('amp-story-page-outlink');
-    attachmentEl.setAttribute('layout', 'nodisplay');
-    attachmentEl.setAttribute('title', 'cta title');
-    element.appendChild(attachmentEl);
+    describe('should convert cta layer to page outlink tag', async () => {
+      beforeEach(() => {
+        page.element.appendChild(
+          <amp-story-cta-layer>
+            <a href="https://www.ampproject.org" class="button">
+              CTA Text!
+            </a>
+          </amp-story-cta-layer>
+        );
+      });
 
-    page.buildCallback();
-    await page.layoutCallback();
-    page.setState(PageState.PLAYING);
+      it('should remove amp-story-cta-layer', () => {
+        page.buildCallback();
 
-    const openAttachmentEl = element.querySelector(
-      '.i-amphtml-story-page-open-attachment'
-    );
+        expect(page.element.querySelector('amp-story-cta-layer')).to.be.null;
+      });
 
-    expect(openAttachmentEl.getAttribute('title')).to.equal('cta title');
+      it('should append amp-story-page-outlink', () => {
+        page.buildCallback();
+
+        const outlinkElAfterBuild = page.element.querySelector(
+          'amp-story-page-outlink'
+        );
+        const expectedOutlinkEl = (
+          <amp-story-page-outlink layout="nodisplay">
+            <a href="https://www.ampproject.org">CTA Text!</a>
+          </amp-story-page-outlink>
+        );
+        expect(outlinkElAfterBuild.isEqualNode(expectedOutlinkEl)).is.true;
+      });
+    });
   });
 
-  it('should propogate the amp-story-page-outlink title attribute to the cta button', async () => {
-    const outlinkEl = win.document.createElement('amp-story-page-outlink');
-    outlinkEl.setAttribute('layout', 'nodisplay');
-    element.appendChild(outlinkEl);
-
-    const anchorChild = win.document.createElement('a');
-    anchorChild.setAttribute('href', 'google.com');
-    anchorChild.setAttribute('title', 'cta title');
-    outlinkEl.appendChild(anchorChild);
+  describe('auto-advance-after', async () => {
+    beforeEach(() => {
+      env.sandbox.stub(ampDoc, 'isPreview').returns(true);
+      expect(element.getAttribute('auto-advance-after')).to.be.equal(null);
+    });
 
-    page.buildCallback();
-    await page.layoutCallback();
-    page.setState(PageState.PLAYING);
+    it(
+      'should use the default advancement value when auto-advance-after is ' +
+        'unspecified',
+      () => {
+        page.buildCallback();
 
-    const openAttachmentEl = element.querySelector(
-      '.i-amphtml-story-page-open-attachment'
+        expect(element.getAttribute('auto-advance-after')).to.be.equal('5s');
+      }
     );
 
-    expect(openAttachmentEl.getAttribute('title')).to.equal('cta title');
-  });
+    it('should use the specified previewSecondsPerPage value', () => {
+      const viewer = Services.viewerForDoc(element);
+      stubWithArg(viewer, 'getParam', 'previewSecondsPerPage', '3');
 
-  it('should start tracking media performance when entering the page', async () => {
-    expectAsyncConsoleError(/source must start with/, 1);
+      page.buildCallback();
 
-    isPerformanceTrackingOn = true;
-    const startMeasuringStub = env.sandbox.stub(
-      page.mediaPerformanceMetricsService_,
-      'startMeasuring'
-    );
+      expect(element.getAttribute('auto-advance-after')).to.be.equal('3s');
+    });
 
-    const videoEl = win.document.createElement('video');
-    videoEl.setAttribute('src', 'localhost/video.mp4');
-    gridLayerEl.appendChild(videoEl);
+    it('should ignore max-video-preview when the page has no video', () => {
+      const viewer = Services.viewerForDoc(element);
+      stubWithArg(viewer, 'getParam', 'previewSecondsPerPage', '3');
+      stubWithArg(ampDoc, 'getMetaByName', 'robots', 'max-video-preview: 2');
 
-    page.buildCallback();
-    await page.layoutCallback();
-    page.setState(PageState.PLAYING);
+      page.buildCallback();
 
-    await nextTick();
+      expect(element.getAttribute('auto-advance-after')).to.be.equal('3s');
+    });
 
-    const poolVideoEl = element.querySelector('video');
-    // Not called with the original video.
-    expect(startMeasuringStub).to.not.have.been.calledOnceWithExactly(videoEl);
-    // Called with the media pool replaced video.
-    expect(startMeasuringStub).to.have.been.calledOnceWithExactly(poolVideoEl);
-  });
+    it(
+      'should override the previewSecondsPerPage value with the ' +
+        'max-video-preview value',
+      () => {
+        const viewer = Services.viewerForDoc(element);
+        stubWithArg(viewer, 'getParam', 'previewSecondsPerPage', '3');
+        stubWithArg(ampDoc, 'getMetaByName', 'robots', 'max-video-preview: 2');
+        appendAmpVideo();
 
-  it('should stop tracking media performance when leaving the page', async () => {
-    expectAsyncConsoleError(/source must start with/, 1);
+        page.buildCallback();
 
-    isPerformanceTrackingOn = true;
-    const stopMeasuringStub = env.sandbox.stub(
-      page.mediaPerformanceMetricsService_,
-      'stopMeasuring'
+        expect(element.getAttribute('auto-advance-after')).to.be.equal('2s');
+      }
     );
 
-    const videoEl = win.document.createElement('video');
-    videoEl.setAttribute('src', 'https://example.com/video.mp4');
-    gridLayerEl.appendChild(videoEl);
+    it('should be unaffected by a max-video-preview value of -1', () => {
+      const viewer = Services.viewerForDoc(element);
+      stubWithArg(viewer, 'getParam', 'previewSecondsPerPage', '3');
+      stubWithArg(ampDoc, 'getMetaByName', 'robots', 'max-video-preview: -1');
+      appendAmpVideo();
 
-    page.buildCallback();
-    await page.layoutCallback();
-    page.setState(PageState.PLAYING);
-    await nextTick();
-    page.setState(PageState.NOT_ACTIVE);
+      page.buildCallback();
 
-    const poolVideoEl = element.querySelector('video');
-    expect(stopMeasuringStub).to.have.been.calledOnceWithExactly(
-      poolVideoEl,
-      true /* sendMetrics */
-    );
-  });
+      expect(element.getAttribute('auto-advance-after')).to.be.equal('3s');
+    });
 
-  it('should not start tracking media performance if tracking is off', async () => {
-    expectAsyncConsoleError(/source must start with/, 1);
+    it('should be unaffected by a max-video-preview value of 0', () => {
+      const viewer = Services.viewerForDoc(element);
+      stubWithArg(viewer, 'getParam', 'previewSecondsPerPage', '3');
+      stubWithArg(ampDoc, 'getMetaByName', 'robots', 'max-video-preview: 0');
+      appendAmpVideo();
 
-    isPerformanceTrackingOn = false;
-    const startMeasuringStub = env.sandbox.stub(
-      page.mediaPerformanceMetricsService_,
-      'startMeasuring'
-    );
+      page.buildCallback();
 
-    const videoEl = win.document.createElement('video');
-    videoEl.setAttribute('src', 'https://example.com/video.mp4');
-    gridLayerEl.appendChild(videoEl);
+      expect(element.getAttribute('auto-advance-after')).to.be.equal('3s');
+    });
 
-    page.buildCallback();
-    await page.layoutCallback();
-    page.setState(PageState.PLAYING);
+    function stubWithArg(object, functionName, arg, returnValue) {
+      env.sandbox.stub(object, functionName).withArgs(arg).returns(returnValue);
+    }
 
-    expect(startMeasuringStub).to.not.have.been.called;
+    /**
+     * Appends an AMP video to the document
+     */
+    function appendAmpVideo() {
+      gridLayerEl.appendChild(win.document.createElement('amp-video'));
+    }
   });
 });
diff --git a/extensions/amp-story/1.0/test/test-amp-story-progress-bar.js b/extensions/amp-story/1.0/test/test-amp-story-progress-bar.js
index 02ea31b9d24b..e274808254f3 100644
--- a/extensions/amp-story/1.0/test/test-amp-story-progress-bar.js
+++ b/extensions/amp-story/1.0/test/test-amp-story-progress-bar.js
@@ -1,14 +1,18 @@
-import {Action, getStoreService} from '../amp-story-store-service';
-import {ProgressBar} from '../progress-bar';
-import {Services} from '#service';
-import {StoryAdSegmentExp} from '#experiments/story-ad-progress-segment';
 import {expect} from 'chai';
+
 import {forceExperimentBranch} from '#experiments';
+import {StoryAdSegmentExp} from '#experiments/story-ad-progress-segment';
+
+import {Services} from '#service';
+
+import {Action, getStoreService} from '../amp-story-store-service';
+import {ProgressBar} from '../progress-bar';
 
 describes.realWin('amp-story-progress-bar', {amp: true}, (env) => {
   let win;
   let doc;
   let storeService;
+  let progressBar;
 
   beforeEach(() => {
     win = env.win;
@@ -28,24 +32,43 @@ describes.realWin('amp-story-progress-bar', {amp: true}, (env) => {
       'page-4',
       'page-5',
     ]);
-    const progressBar = ProgressBar.create(env.win, storyEl).build('page-1');
-    doc.body.appendChild(progressBar);
+    progressBar = ProgressBar.create(env.win, storyEl);
+    doc.body.appendChild(progressBar.build('page-1'));
+  });
+
+  describe('story page segment', async () => {
+    it('should create progress bar with pages', () => {
+      expect(
+        doc.querySelectorAll('.i-amphtml-story-page-progress-value')
+      ).to.have.length.of(5);
+    });
   });
 
   describe('story ad progress segment', async () => {
-    it('should create/remove ad segment based on ad visibility', () => {
+    it('should create progress bar with ad pages', () => {
       forceExperimentBranch(
         win,
         StoryAdSegmentExp.ID,
-        StoryAdSegmentExp.TEN_SECONDS
+        StoryAdSegmentExp.AUTO_ADVANCE_NEW_CTA
       );
       expect(doc.querySelector('.i-amphtml-story-ad-progress-value')).not.to
         .exist;
-      storeService.dispatch(Action.TOGGLE_AD, true);
-      expect(doc.querySelector('.i-amphtml-story-ad-progress-value')).to.exist;
-      storeService.dispatch(Action.TOGGLE_AD, false);
-      expect(doc.querySelector('.i-amphtml-story-ad-progress-value')).not.to
-        .exist;
+      progressBar.activeSegmentId_ = 'page-3';
+      storeService.dispatch(Action.SET_PAGE_IDS, [
+        'page-1',
+        'page-2',
+        'page-3',
+        'i-amphtml-ad-page-0',
+        'page-4',
+        'page-5',
+      ]);
+
+      expect(
+        doc.querySelectorAll('.i-amphtml-story-page-progress-value')
+      ).to.have.length.of(6);
+      expect(
+        doc.querySelectorAll('.i-amphtml-story-ad-progress-value')
+      ).to.have.length.of(1);
     });
   });
 });
diff --git a/extensions/amp-story/1.0/test/test-amp-story-request-service.js b/extensions/amp-story/1.0/test/test-amp-story-request-service.js
deleted file mode 100644
index 718c824002fd..000000000000
--- a/extensions/amp-story/1.0/test/test-amp-story-request-service.js
+++ /dev/null
@@ -1,105 +0,0 @@
-import {
-  AmpStoryRequestService,
-  CONFIG_SRC_ATTRIBUTE_NAME,
-} from '../amp-story-request-service';
-
-describes.fakeWin('amp-story-request-service', {amp: true}, (env) => {
-  let requestService;
-  let storyElement;
-  let shareElement;
-  let xhrMock;
-
-  beforeEach(() => {
-    storyElement = env.win.document.createElement('div');
-    shareElement = env.win.document.createElement('amp-story-social-share');
-    storyElement.appendChild(shareElement);
-    env.win.document.body.appendChild(storyElement);
-    requestService = new AmpStoryRequestService(env.win, storyElement);
-    xhrMock = env.sandbox.mock(requestService.xhr_);
-  });
-
-  it('should not load the share config if no attribute is set', async () => {
-    xhrMock.expects('fetchJson').never();
-
-    const config = await requestService.loadShareConfig();
-    expect(config).to.be.null;
-    xhrMock.verify();
-  });
-
-  it('should use the URL provided in the attribute to load the config', async () => {
-    const shareUrl = 'https://publisher.com/share';
-
-    shareElement.setAttribute(CONFIG_SRC_ATTRIBUTE_NAME, shareUrl);
-    xhrMock
-      .expects('fetchJson')
-      .withExactArgs(shareUrl, {})
-      .resolves({
-        ok: true,
-        json() {
-          return Promise.resolve();
-        },
-      })
-      .once();
-
-    await requestService.loadShareConfig();
-    xhrMock.verify();
-  });
-
-  it('should return the expected share config', async () => {
-    const shareUrl = 'https://publisher.com/share';
-    const fetchedConfig = 'amazingConfig';
-
-    shareElement.setAttribute(CONFIG_SRC_ATTRIBUTE_NAME, shareUrl);
-    xhrMock
-      .expects('fetchJson')
-      .resolves({
-        ok: true,
-        json() {
-          return Promise.resolve(fetchedConfig);
-        },
-      })
-      .once();
-
-    const config = await requestService.loadShareConfig();
-    expect(config).to.equal(fetchedConfig);
-    xhrMock.verify();
-  });
-
-  it('should fetch the share config once if called multiple times', async () => {
-    const shareUrl = 'https://publisher.com/share';
-
-    shareElement.setAttribute(CONFIG_SRC_ATTRIBUTE_NAME, shareUrl);
-    xhrMock
-      .expects('fetchJson')
-      .resolves({
-        ok: true,
-        json() {
-          return Promise.resolve();
-        },
-      })
-      .once();
-
-    await requestService.loadShareConfig();
-    xhrMock.verify();
-  });
-
-  it('should return the social share config from the share element', async () => {
-    const shareUrl = 'https://publisher.com/share';
-    const fetchedConfig = 'amazingConfig';
-
-    shareElement.setAttribute(CONFIG_SRC_ATTRIBUTE_NAME, shareUrl);
-    xhrMock
-      .expects('fetchJson')
-      .resolves({
-        ok: true,
-        json() {
-          return Promise.resolve(fetchedConfig);
-        },
-      })
-      .once();
-
-    const config = await requestService.loadShareConfig();
-    expect(config).to.equal(fetchedConfig);
-    xhrMock.verify();
-  });
-});
diff --git a/extensions/amp-story/1.0/test/test-amp-story-share-menu.js b/extensions/amp-story/1.0/test/test-amp-story-share-menu.js
deleted file mode 100644
index 776681253ae6..000000000000
--- a/extensions/amp-story/1.0/test/test-amp-story-share-menu.js
+++ /dev/null
@@ -1,182 +0,0 @@
-import {
-  Action,
-  AmpStoryStoreService,
-  StateProperty,
-} from '../amp-story-store-service';
-import {Keys} from '#core/constants/key-codes';
-import {Services} from '#service';
-import {ShareMenu, VISIBLE_CLASS} from '../amp-story-share-menu';
-import {ShareWidget} from '../amp-story-share';
-import {getStyle} from '#core/dom/style';
-import {registerServiceBuilder} from '../../../../src/service-helpers';
-
-describes.realWin('amp-story-share-menu', {amp: true}, (env) => {
-  let isSystemShareSupported;
-  let parentEl;
-  let shareMenu;
-  let shareWidgetMock;
-  let storeService;
-  let win;
-
-  beforeEach(() => {
-    win = env.win;
-    storeService = new AmpStoryStoreService(win);
-    registerServiceBuilder(win, 'story-store', function () {
-      return storeService;
-    });
-
-    isSystemShareSupported = false;
-
-    const shareWidget = {
-      build: () => win.document.createElement('div'),
-      isSystemShareSupported: () => isSystemShareSupported,
-      loadRequiredExtensions: () => {},
-    };
-    shareWidgetMock = env.sandbox.mock(shareWidget);
-    env.sandbox.stub(ShareWidget, 'create').returns(shareWidget);
-
-    // Making sure the vsync tasks run synchronously.
-    env.sandbox.stub(Services, 'vsyncFor').returns({
-      mutate: (fn) => fn(),
-      run: (vsyncTaskSpec, vsyncState) => {
-        vsyncTaskSpec.measure(vsyncState);
-        vsyncTaskSpec.mutate(vsyncState);
-      },
-    });
-
-    parentEl = win.document.createElement('div');
-    win.document.body.appendChild(parentEl);
-    shareMenu = new ShareMenu(win, parentEl);
-  });
-
-  it('should build the sharing menu', () => {
-    shareMenu.build();
-
-    expect(shareMenu.isBuilt()).to.be.true;
-    expect(shareMenu.element_).to.exist;
-  });
-
-  it('should append the sharing menu in the parentEl on build', () => {
-    shareMenu.build();
-
-    expect(parentEl.childElementCount).to.equal(1);
-  });
-
-  it('should build the share widget when building the component', () => {
-    shareWidgetMock
-      .expects('build')
-      .once()
-      .returns(win.document.createElement('div'));
-
-    shareMenu.build();
-
-    expect(shareMenu.isBuilt()).to.be.true;
-
-    shareWidgetMock.verify();
-  });
-
-  it('should append the share widget when building the component', () => {
-    const shareWidgetEl = win.document.createElement('div');
-    shareWidgetEl.classList.add('foo');
-
-    shareWidgetMock.expects('build').returns(shareWidgetEl);
-
-    shareMenu.build();
-
-    expect(shareMenu.element_.querySelector('.foo')).to.exist;
-    shareWidgetMock.verify();
-  });
-
-  it('should show the share menu on store property update', () => {
-    shareMenu.build();
-
-    storeService.dispatch(Action.TOGGLE_SHARE_MENU, true);
-
-    expect(shareMenu.element_).to.have.class(VISIBLE_CLASS);
-  });
-
-  it('should hide the share menu on click on the overlay', () => {
-    shareMenu.build();
-
-    storeService.dispatch(Action.TOGGLE_SHARE_MENU, true);
-    shareMenu.element_.dispatchEvent(new Event('click'));
-
-    expect(shareMenu.element_).not.to.have.class(VISIBLE_CLASS);
-    expect(storeService.get(StateProperty.SHARE_MENU_STATE)).to.be.false;
-  });
-
-  it('should not hide the share menu on click on the widget container', () => {
-    shareMenu.build();
-
-    storeService.dispatch(Action.TOGGLE_SHARE_MENU, true);
-    shareMenu.innerContainerEl_.dispatchEvent(new Event('click'));
-
-    expect(shareMenu.element_).to.have.class(VISIBLE_CLASS);
-  });
-
-  it('should hide the share menu on escape key press', () => {
-    shareMenu.build();
-
-    const clickCallbackSpy = env.sandbox.spy();
-    win.addEventListener('keyup', clickCallbackSpy);
-
-    storeService.dispatch(Action.TOGGLE_SHARE_MENU, true);
-    // Create escape keyup event.
-    const keyupEvent = new Event('keyup');
-    keyupEvent.keyCode = Keys.ESCAPE;
-    win.dispatchEvent(keyupEvent);
-
-    expect(clickCallbackSpy).to.have.been.calledOnce;
-  });
-
-  it('should render the amp-social-share button if system share', () => {
-    isSystemShareSupported = true;
-
-    shareMenu.build();
-
-    expect(shareMenu.element_.tagName).to.equal('AMP-SOCIAL-SHARE');
-  });
-
-  it('should hide the amp-social-share button if system share', () => {
-    isSystemShareSupported = true;
-
-    shareMenu.build();
-
-    expect(getStyle(shareMenu.element_, 'visibility')).to.equal('hidden');
-  });
-
-  it('should load the amp-social-share extension if system share', () => {
-    isSystemShareSupported = true;
-    shareWidgetMock.expects('loadRequiredExtensions').once();
-
-    shareMenu.build();
-
-    shareWidgetMock.verify();
-  });
-
-  it('should dispatch an event on system share button if system share', () => {
-    isSystemShareSupported = true;
-
-    shareMenu.build();
-
-    const clickCallbackSpy = env.sandbox.spy();
-    shareMenu.element_.addEventListener('click', clickCallbackSpy);
-
-    // Toggling the share menu dispatches a click event on the amp-social-share
-    // button, which triggers the native sharing menu.
-    storeService.dispatch(Action.TOGGLE_SHARE_MENU, true);
-
-    expect(clickCallbackSpy).to.have.been.calledOnce;
-  });
-
-  // See ShareMenu.onShareMenuStateUpdate_ for details.
-  it('should close back the share menu right away if system share', () => {
-    isSystemShareSupported = true;
-
-    shareMenu.build();
-
-    storeService.dispatch(Action.TOGGLE_SHARE_MENU, true);
-
-    expect(storeService.get(StateProperty.SHARE_MENU_STATE)).to.be.false;
-  });
-});
diff --git a/extensions/amp-story/1.0/test/test-amp-story-share.js b/extensions/amp-story/1.0/test/test-amp-story-share.js
new file mode 100644
index 000000000000..44bb1d5b565f
--- /dev/null
+++ b/extensions/amp-story/1.0/test/test-amp-story-share.js
@@ -0,0 +1,120 @@
+import {expect} from 'chai';
+
+import {Services} from '#service';
+
+import * as analyticsApi from '#utils/analytics';
+
+import {
+  getAmpdoc,
+  registerServiceBuilder,
+} from '../../../../src/service-helpers';
+import {AmpStoryShare} from '../amp-story-share';
+import {
+  Action,
+  AmpStoryStoreService,
+  StateProperty,
+} from '../amp-story-store-service';
+import {StoryAnalyticsEvent, getAnalyticsService} from '../story-analytics';
+
+describes.realWin('amp-story-share', {amp: true}, (env) => {
+  let ampStoryShare;
+  let ampStory;
+  let storeService;
+  let win;
+  let installExtensionForDoc;
+  let analyticsTriggerStub;
+
+  beforeEach(() => {
+    win = env.win;
+    storeService = new AmpStoryStoreService(win);
+    registerServiceBuilder(win, 'story-store', function () {
+      return storeService;
+    });
+
+    // Making sure the vsync tasks run synchronously.
+    env.sandbox.stub(Services, 'vsyncFor').returns({
+      mutate: (fn) => fn(),
+      run: (vsyncTaskSpec, vsyncState) => {
+        vsyncTaskSpec.measure(vsyncState);
+        vsyncTaskSpec.mutate(vsyncState);
+      },
+    });
+
+    installExtensionForDoc = env.sandbox.spy();
+
+    env.sandbox.stub(Services, 'extensionsFor').returns({
+      installExtensionForDoc,
+    });
+
+    ampStory = win.document.createElement('amp-story');
+    win.document.body.appendChild(ampStory);
+    ampStoryShare = new AmpStoryShare(win, ampStory);
+    getAnalyticsService(win, ampStory);
+  });
+
+  it('should build the sharing menu if native sharing is unsupported', () => {
+    const buildSpy = env.sandbox.spy(ampStoryShare, 'buildFallbackMenu_');
+    storeService.dispatch(Action.TOGGLE_SHARE_MENU, true);
+    expect(buildSpy).to.have.been.called;
+  });
+
+  it('should open the native sharing if it is supported', () => {
+    win.navigator.share = () => Promise.resolve();
+    const shareSpy = env.sandbox.spy(win.navigator, 'share');
+
+    env.sandbox.stub(ampStoryShare, 'isSystemShareSupported_').returns(true);
+
+    storeService.dispatch(Action.TOGGLE_SHARE_MENU, true);
+    expect(shareSpy).to.have.been.called;
+  });
+
+  // See ShareMenu.onShareMenuStateUpdate_ for details.
+  it('should close back the share menu right away if system share', () => {
+    win.navigator.share = () => Promise.resolve();
+    env.sandbox.stub(ampStoryShare, 'isSystemShareSupported_').returns(true);
+
+    storeService.dispatch(Action.TOGGLE_SHARE_MENU, true);
+
+    expect(storeService.get(StateProperty.SHARE_MENU_STATE)).to.be.false;
+  });
+
+  it('should share natively if available with the canonical url and window title', () => {
+    win.navigator.share = () => Promise.resolve();
+    const shareSpy = env.sandbox.spy(win.navigator, 'share');
+    env.sandbox.stub(ampStoryShare, 'isSystemShareSupported_').returns(true);
+
+    // Set canonicalUrl and window title for sharing.
+    env.sandbox
+      .stub(Services, 'documentInfoForDoc')
+      .returns({canonicalUrl: 'https://amp.dev'});
+    win.document.title = 'AMP';
+
+    storeService.dispatch(Action.TOGGLE_SHARE_MENU, true);
+
+    expect(shareSpy).to.be.calledWith({
+      url: 'https://amp.dev',
+      text: 'AMP',
+    });
+  });
+
+  it('should send correct analytics tagName and eventType when opening the share menu', async () => {
+    analyticsTriggerStub = env.sandbox.stub(
+      analyticsApi,
+      'triggerAnalyticsEvent'
+    );
+    env.sandbox.stub(ampStoryShare, 'isSystemShareSupported_').returns(false);
+
+    storeService.dispatch(Action.TOGGLE_SHARE_MENU, true);
+
+    await getAmpdoc(win.document).whenFirstVisible();
+
+    // tagName should be amp-story-share-menu as per extensions/amp-story/amp-story-analytics.md
+    expect(analyticsTriggerStub).to.be.calledWith(
+      ampStory,
+      StoryAnalyticsEvent.OPEN,
+      env.sandbox.match(
+        (val) => val.eventDetails.tagName === 'amp-story-share-menu'
+      )
+    );
+  });
+});
diff --git a/extensions/amp-story/1.0/test/test-amp-story-store-service.js b/extensions/amp-story/1.0/test/test-amp-story-store-service.js
index ebbbfcc58930..bbda4fb82da3 100644
--- a/extensions/amp-story/1.0/test/test-amp-story-store-service.js
+++ b/extensions/amp-story/1.0/test/test-amp-story-store-service.js
@@ -98,22 +98,6 @@ describes.fakeWin('amp-story-store-service actions', {}, (env) => {
     expect(listenerSpy).to.have.been.calledWith(1);
   });
 
-  it('should toggle the has audio state', () => {
-    const listenerSpy = env.sandbox.spy();
-    storeService.subscribe(StateProperty.STORY_HAS_AUDIO_STATE, listenerSpy);
-    storeService.dispatch(Action.TOGGLE_STORY_HAS_AUDIO, true);
-    expect(listenerSpy).to.have.been.calledOnce;
-    expect(listenerSpy).to.have.been.calledWith(true);
-  });
-
-  it('should toggle the supported browser state', () => {
-    const listenerSpy = env.sandbox.spy();
-    storeService.subscribe(StateProperty.SUPPORTED_BROWSER_STATE, listenerSpy);
-    storeService.dispatch(Action.TOGGLE_SUPPORTED_BROWSER, false);
-    expect(listenerSpy).to.have.been.calledOnce;
-    expect(listenerSpy).to.have.been.calledWith(false);
-  });
-
   it('should pause the story when displaying the share menu', () => {
     const pausedListenerSpy = env.sandbox.spy();
     storeService.subscribe(StateProperty.PAUSED_STATE, pausedListenerSpy);
@@ -150,18 +134,6 @@ describes.fakeWin('amp-story-store-service actions', {}, (env) => {
     expect(pausedListenerSpy).to.have.been.calledWith(false);
   });
 
-  it('should not update PAUSED_STATE if ACCESS_STATE is unchanged', () => {
-    // Story is paused.
-    storeService.dispatch(Action.TOGGLE_PAUSED, true);
-
-    // ACCESS_STATE was already false but is set to false again.
-    expect(storeService.get(StateProperty.ACCESS_STATE)).to.be.false;
-    storeService.dispatch(Action.TOGGLE_ACCESS, false);
-
-    // PAUSED_STATE did not get affected.
-    expect(storeService.get(StateProperty.PAUSED_STATE)).to.be.true;
-  });
-
   it('should add an action to the allowlist', () => {
     const action1 = {tagOrTarget: 'foo', method: 1};
     const action2 = {tagOrTarget: 'foo', method: 2};
diff --git a/extensions/amp-story/1.0/test/test-amp-story-system-layer.js b/extensions/amp-story/1.0/test/test-amp-story-system-layer.js
index aabb3e89e4b7..47d89c931cdd 100644
--- a/extensions/amp-story/1.0/test/test-amp-story-system-layer.js
+++ b/extensions/amp-story/1.0/test/test-amp-story-system-layer.js
@@ -1,13 +1,19 @@
+import {Services} from '#service';
+import {LocalizationService} from '#service/localization';
+
+import {waitFor} from '#testing/helpers/service';
+
+import {registerServiceBuilder} from '../../../../src/service-helpers';
+import LocalizedStringsEn from '../_locales/en.json' assert {type: 'json'}; // lgtm[js/syntax-error]
+import LocalizedStringsEs from '../_locales/es.json' assert {type: 'json'}; // lgtm[js/syntax-error]
+import {getLocalizationService} from '../amp-story-localization-service';
 import {
   Action,
   AmpStoryStoreService,
   StateProperty,
 } from '../amp-story-store-service';
-import {LocalizationService} from '#service/localization';
-import {ProgressBar} from '../progress-bar';
-import {Services} from '#service';
 import {SystemLayer} from '../amp-story-system-layer';
-import {registerServiceBuilder} from '../../../../src/service-helpers';
+import {ProgressBar} from '../progress-bar';
 
 const NOOP = () => {};
 
@@ -43,6 +49,7 @@ describes.fakeWin('amp-story system layer', {amp: true}, (env) => {
 
     env.sandbox.stub(Services, 'vsyncFor').returns({
       mutate: (fn) => fn(),
+      mutatePromise: (fn) => fn(),
     });
 
     systemLayer = new SystemLayer(win, win.document.body);
@@ -195,6 +202,34 @@ describes.fakeWin('amp-story system layer', {amp: true}, (env) => {
     expect(systemLayer.getShadowRoot()).to.not.have.attribute('paused');
   });
 
+  it('click on the captions button should change state to false', () => {
+    systemLayer.build();
+
+    storeService.dispatch(Action.TOGGLE_STORY_HAS_PLAYBACK_UI, true);
+    storeService.dispatch(Action.TOGGLE_PAGE_HAS_CAPTIONS, true);
+    storeService.dispatch(Action.TOGGLE_CAPTIONS, true);
+    systemLayer
+      .getShadowRoot()
+      .querySelector('.i-amphtml-story-captions-control')
+      .click();
+    expect(storeService.get(StateProperty.CAPTIONS_STATE)).to.be.false;
+    expect(systemLayer.getShadowRoot()).to.not.have.attribute('captions-on');
+  });
+
+  it('click on the no captions button should change state to true', () => {
+    systemLayer.build();
+
+    storeService.dispatch(Action.TOGGLE_STORY_HAS_PLAYBACK_UI, true);
+    storeService.dispatch(Action.TOGGLE_PAGE_HAS_CAPTIONS, true);
+    storeService.dispatch(Action.TOGGLE_CAPTIONS, true);
+    systemLayer
+      .getShadowRoot()
+      .querySelector('.i-amphtml-story-nocaptions-control')
+      .click();
+    expect(storeService.get(StateProperty.CAPTIONS_STATE)).to.be.true;
+    expect(systemLayer.getShadowRoot()).to.have.attribute('captions-on');
+  });
+
   it('click on the pause button should change state to true', () => {
     systemLayer.build();
 
@@ -208,4 +243,79 @@ describes.fakeWin('amp-story system layer', {amp: true}, (env) => {
     expect(storeService.get(StateProperty.PAUSED_STATE)).to.be.true;
     expect(systemLayer.getShadowRoot()).to.have.attribute('paused');
   });
+
+  describe('localization', () => {
+    it('should load the localized aria-labels for buttons if strings are available', async () => {
+      getLocalizationService(win.document.body).registerLocalizedStringBundles({
+        'en': LocalizedStringsEn,
+      });
+      systemLayer.build();
+      await waitFor(
+        () =>
+          systemLayer.getShadowRoot().querySelectorAll('[aria-label]').length
+      );
+      expect(
+        systemLayer
+          .getShadowRoot()
+          .querySelector('.i-amphtml-story-info-control')
+          .getAttribute('aria-label')
+      ).to.equal('Story information');
+    });
+
+    it('should load the localized aria-labels for buttons if strings are available after building', async () => {
+      systemLayer.build();
+      getLocalizationService(win.document.body).registerLocalizedStringBundles({
+        'en': LocalizedStringsEn,
+      });
+      await waitFor(
+        () =>
+          systemLayer.getShadowRoot().querySelectorAll('[aria-label]').length
+      );
+      expect(
+        systemLayer
+          .getShadowRoot()
+          .querySelector('.i-amphtml-story-info-control')
+          .getAttribute('aria-label')
+      ).to.equal('Story information');
+    });
+
+    it('should load the localized aria-labels for the correct language', async () => {
+      win.document.body.setAttribute('lang', 'es');
+      getLocalizationService(win.document.body).registerLocalizedStringBundles({
+        'default': LocalizedStringsEn,
+        'es': LocalizedStringsEs,
+      });
+
+      systemLayer.build();
+
+      await waitFor(
+        () =>
+          systemLayer.getShadowRoot().querySelectorAll('[aria-label]').length
+      );
+      expect(
+        systemLayer
+          .getShadowRoot()
+          .querySelector('.i-amphtml-story-info-control')
+          .getAttribute('aria-label')
+      ).to.equal('Información de la historia');
+    });
+
+    it('should load the localized text content', async () => {
+      getLocalizationService(win.document.body).registerLocalizedStringBundles({
+        'en': LocalizedStringsEn,
+      });
+      systemLayer.build();
+
+      await waitFor(() =>
+        systemLayer
+          .getShadowRoot()
+          .querySelectorAll('.i-amphtml-story-has-new-page-text')
+      );
+      expect(
+        systemLayer
+          .getShadowRoot()
+          .querySelector('.i-amphtml-story-has-new-page-text').textContent
+      ).to.equal('Updated');
+    });
+  });
 });
diff --git a/extensions/amp-story/1.0/test/test-amp-story-viewer-messaging-handler.js b/extensions/amp-story/1.0/test/test-amp-story-viewer-messaging-handler.js
index 162da6e7890e..6ef646d0e6ce 100644
--- a/extensions/amp-story/1.0/test/test-amp-story-viewer-messaging-handler.js
+++ b/extensions/amp-story/1.0/test/test-amp-story-viewer-messaging-handler.js
@@ -92,7 +92,7 @@ describes.fakeWin('amp-story-viewer-messaging-handler', {}, (env) => {
     });
 
     it('should return the STORY_PROGRESS', async () => {
-      storeService.dispatch(Action.SET_PAGE_IDS, [1, 2, 3, 4, 5]);
+      storeService.dispatch(Action.SET_PAGE_IDS, ['1', '2', '3', '4', '5']);
       storeService.dispatch(Action.CHANGE_PAGE, {id: 3, index: 2});
       const response = await fakeViewerService.receiveMessage(
         'getDocumentState',
@@ -103,6 +103,17 @@ describes.fakeWin('amp-story-viewer-messaging-handler', {}, (env) => {
         value: 0.5,
       });
     });
+
+    it('should return the CAPTIONS_STATE', async () => {
+      const response = await fakeViewerService.receiveMessage(
+        'getDocumentState',
+        {state: 'CAPTIONS_STATE'}
+      );
+      expect(response).to.deep.equal({
+        state: 'CAPTIONS_STATE',
+        value: storeService.get(StateProperty.CAPTIONS_STATE),
+      });
+    });
   });
 
   describe('onDocumentState', () => {
@@ -202,7 +213,7 @@ describes.fakeWin('amp-story-viewer-messaging-handler', {}, (env) => {
       }
     });
 
-    it('should set a state', async () => {
+    it('should set MUTED_STATE', async () => {
       storeService.dispatch(Action.TOGGLE_MUTED, false);
       await fakeViewerService.receiveMessage('setDocumentState', {
         state: 'MUTED_STATE',
@@ -210,5 +221,14 @@ describes.fakeWin('amp-story-viewer-messaging-handler', {}, (env) => {
       });
       expect(storeService.get(StateProperty.MUTED_STATE)).to.be.true;
     });
+
+    it('should set CAPTIONS_STATE', async () => {
+      storeService.dispatch(Action.TOGGLE_CAPTIONS, false);
+      await fakeViewerService.receiveMessage('setDocumentState', {
+        state: 'CAPTIONS_STATE',
+        value: true,
+      });
+      expect(storeService.get(StateProperty.MUTED_STATE)).to.be.true;
+    });
   });
 });
diff --git a/extensions/amp-story/1.0/test/test-amp-story.js b/extensions/amp-story/1.0/test/test-amp-story.js
index f4808fc5aca1..27a1b5a7b721 100644
--- a/extensions/amp-story/1.0/test/test-amp-story.js
+++ b/extensions/amp-story/1.0/test/test-amp-story.js
@@ -1,28 +1,41 @@
+import {expect} from 'chai';
+
+import {CommonSignals_Enum} from '#core/constants/common-signals';
+import {Keys_Enum} from '#core/constants/key-codes';
+import {VisibilityState_Enum} from '#core/constants/visibility-state';
+import {Signals} from '#core/data-structures/signals';
+import {createElementWithAttributes} from '#core/dom';
+import {computedStyle, setImportantStyles} from '#core/dom/style';
+
+import {toggleExperiment} from '#experiments';
+
+import {Services} from '#service';
+import {LocalizationService} from '#service/localization';
+import {Performance} from '#service/performance-impl';
+
+import {macroTask} from '#testing/helpers';
+import {waitFor} from '#testing/helpers/service';
+import {poll} from '#testing/iframe';
+
+import {DEFAULT_SUBSCRIPTIONS_PAGE_INDEX} from 'extensions/amp-story-subscriptions/0.1/amp-story-subscriptions';
+
 import * as consent from '../../../../src/consent';
-import * as utils from '../utils';
+import {registerServiceBuilder} from '../../../../src/service-helpers';
+import LocalizedStringsEn from '../_locales/en.json' assert {type: 'json'}; // lgtm[js/syntax-error]
+import {AmpStory, SUBSCRIPTIONS_DELAY_DURATION} from '../amp-story';
+import {AmpStoryConsent} from '../amp-story-consent';
+import {NavigationDirection, PageState} from '../amp-story-page';
 import {
   Action,
   AmpStoryStoreService,
   StateProperty,
-  UIType,
+  SubscriptionsState,
+  UIType_Enum,
 } from '../amp-story-store-service';
+import {EventType, dispatch} from '../events';
+import {MediaType_Enum} from '../media-pool';
 import {AdvancementMode} from '../story-analytics';
-import {AmpStory} from '../amp-story';
-import {AmpStoryConsent} from '../amp-story-consent';
-import {CommonSignals} from '#core/constants/common-signals';
-import {Keys} from '#core/constants/key-codes';
-import {LocalizationService} from '#service/localization';
-import {MediaType} from '../media-pool';
-import {PageState} from '../amp-story-page';
-import {Performance} from '#service/performance-impl';
-import {Services} from '#service';
-import {Signals} from '#core/data-structures/signals';
-import {VisibilityState} from '#core/constants/visibility-state';
-import {createElementWithAttributes} from '#core/dom';
-import {registerServiceBuilder} from '../../../../src/service-helpers';
-import {toggleExperiment} from '#experiments';
-import {setImportantStyles} from '#core/dom/style';
-import {waitFor} from '#testing/helpers/service';
+import * as utils from '../utils';
 
 // Represents the correct value of KeyboardEvent.which for the Right Arrow
 const KEYBOARD_EVENT_WHICH_RIGHT_ARROW = 39;
@@ -43,8 +56,9 @@ describes.realWin(
     let story;
     let replaceStateStub;
     let win;
-
-    const nextTick = () => new Promise((resolve) => win.setTimeout(resolve, 0));
+    let localizationService;
+    let fetchJson = {};
+    let fetchStub;
 
     /**
      * @param {number} count
@@ -72,6 +86,14 @@ describes.realWin(
       return pageArray;
     }
 
+    function createStoryAdPage(id) {
+      const page = win.document.createElement('amp-story-page');
+      page.id = id;
+      page.setAttribute('ad', '');
+      element.appendChild(page);
+      return page.getImpl();
+    }
+
     /**
      * @param {string} eventType
      * @return {!Event}
@@ -92,10 +114,13 @@ describes.realWin(
 
       replaceStateStub = env.sandbox.stub(win.history, 'replaceState');
 
-      const localizationService = new LocalizationService(win.document.body);
+      localizationService = new LocalizationService(win.document.body);
       env.sandbox
         .stub(Services, 'localizationForDoc')
         .returns(localizationService);
+      localizationService.registerLocalizedStringBundles({
+        'en': LocalizedStringsEn,
+      });
 
       const viewer = Services.viewerForDoc(env.ampdoc);
       env.sandbox
@@ -121,19 +146,18 @@ describes.realWin(
       // Fakes the size of amp-story so it's not built/laid out until we call build/layoutCallbacks
       // allowing us to mock function calls before the lifecycle callbacks.
       setImportantStyles(win.document.documentElement, {'height': 'auto'});
+
+      fetchStub = env.sandbox
+        .stub(Services.xhrFor(env.win), 'fetchJson')
+        .resolves({
+          json: () => Promise.resolve(fetchJson),
+        });
     });
 
     afterEach(() => {
       element.remove();
     });
 
-    it('should build with the expected number of pages', async () => {
-      const pagesCount = 2;
-      await createStoryWithPages(pagesCount, ['cover', 'page-1']);
-      await story.layoutCallback();
-      expect(story.getPageCount()).to.equal(pagesCount);
-    });
-
     it('should activate the first page when built', async () => {
       await createStoryWithPages(2, ['cover', 'page-1']);
       await story.layoutCallback();
@@ -161,14 +185,6 @@ describes.realWin(
       expect(story.element.innerText).to.not.have.string(textToRemove);
     });
 
-    it('should prerender/load the share menu', async () => {
-      await createStoryWithPages(2);
-
-      const buildShareMenuStub = env.sandbox.stub(story.shareMenu_, 'build');
-      await story.layoutCallback();
-      expect(buildShareMenuStub).to.have.been.calledOnce;
-    });
-
     it('should return a valid page index', async () => {
       await createStoryWithPages(4, ['cover', 'page-1', 'page-2', 'page-3']);
       await story.layoutCallback();
@@ -224,7 +240,7 @@ describes.realWin(
       });
 
       const eventObj = createEvent('keydown');
-      eventObj.key = Keys.RIGHT_ARROW;
+      eventObj.key = Keys_Enum.RIGHT_ARROW;
       eventObj.which = KEYBOARD_EVENT_WHICH_RIGHT_ARROW;
       const docEl = win.document.documentElement;
       docEl.dispatchEvent
@@ -272,13 +288,13 @@ describes.realWin(
           }
         },
       };
-      story.onResize();
+      story.onResizeDebounced();
       expect(isDesktopStub).to.be.calledOnce;
       expect(story.element.classList.contains('i-amphtml-story-landscape')).to
         .be.true;
       story.element.style.width = '10px';
       story.element.style.height = '11px';
-      story.onResize();
+      story.onResizeDebounced();
       expect(isDesktopStub).to.be.calledTwice;
       expect(story.element.classList.contains('i-amphtml-story-landscape')).to
         .be.false;
@@ -290,6 +306,7 @@ describes.realWin(
       await createStoryWithPages(pageCount, [firstPageId, 'page-1']);
       const dispatchSpy = env.sandbox.spy(story.storeService_, 'dispatch');
 
+      env.sandbox.stub(win, 'requestAnimationFrame').callsFake((cb) => cb());
       await story.layoutCallback();
       expect(dispatchSpy).to.have.been.calledWith(Action.CHANGE_PAGE, {
         id: firstPageId,
@@ -340,7 +357,7 @@ describes.realWin(
 
       await story.layoutCallback();
       expect(story.storeService_.get(StateProperty.UI_STATE)).to.equals(
-        UIType.DESKTOP_ONE_PANEL
+        UIType_Enum.DESKTOP_ONE_PANEL
       );
     });
 
@@ -355,7 +372,7 @@ describes.realWin(
 
       await story.layoutCallback();
       expect(story.storeService_.get(StateProperty.UI_STATE)).to.equals(
-        UIType.DESKTOP_FULLBLEED
+        UIType_Enum.DESKTOP_FULLBLEED
       );
     });
 
@@ -374,6 +391,7 @@ describes.realWin(
       story.element.setAttribute('standalone', '');
       story.element.setAttribute('supports-landscape', '');
 
+      env.sandbox.stub(story, 'mutateElement').callsFake((fn) => fn());
       story.buildCallback();
 
       await story.layoutCallback();
@@ -388,6 +406,7 @@ describes.realWin(
       story.element.setAttribute('standalone', '');
       story.element.setAttribute('supports-landscape', '');
 
+      env.sandbox.stub(story, 'mutateElement').callsFake((fn) => fn());
       story.buildCallback();
 
       await story.layoutCallback();
@@ -401,6 +420,7 @@ describes.realWin(
       story.landscapeOrientationMedia_ = {matches: true};
       story.element.setAttribute('standalone', '');
 
+      env.sandbox.stub(story, 'mutateElement').callsFake((fn) => fn());
       story.buildCallback();
 
       await story.layoutCallback();
@@ -420,7 +440,7 @@ describes.realWin(
 
       await story.layoutCallback();
       story.landscapeOrientationMedia_ = {matches: false};
-      story.onResize();
+      story.onResizeDebounced();
       await Promise.resolve();
       expect(story.element).to.have.attribute('orientation');
       expect(story.element.getAttribute('orientation')).to.equal('portrait');
@@ -596,7 +616,9 @@ describes.realWin(
       it('should pause the story when tab becomes inactive', async () => {
         await createStoryWithPages(2, ['cover', 'page-1']);
 
-        env.sandbox.stub(ampdoc, 'isVisible').returns(false);
+        env.sandbox
+          .stub(ampdoc, 'getVisibilityState')
+          .returns(VisibilityState_Enum.PRERENDER);
         const onVisibilityChangedStub = env.sandbox.stub(
           ampdoc,
           'onVisibilityChanged'
@@ -639,26 +661,43 @@ describes.realWin(
         await createStoryWithPages(2, ['cover', 'page-1']);
 
         await story.layoutCallback();
-        story.getAmpDoc().overrideVisibilityState(VisibilityState.INACTIVE);
+        story
+          .getAmpDoc()
+          .overrideVisibilityState(VisibilityState_Enum.INACTIVE);
         expect(story.storeService_.get(StateProperty.PAUSED_STATE)).to.be.true;
       });
 
-      it('should rewind the story page when viewer becomes inactive', async () => {
+      it('should reset the active page when viewer becomes inactive', async () => {
         await createStoryWithPages(2, ['cover', 'page-1']);
 
         await story.layoutCallback();
         const setStateStub = env.sandbox.stub(story.activePage_, 'setState');
-        story.getAmpDoc().overrideVisibilityState(VisibilityState.INACTIVE);
+        story
+          .getAmpDoc()
+          .overrideVisibilityState(VisibilityState_Enum.INACTIVE);
         expect(setStateStub.getCall(1)).to.have.been.calledWithExactly(
           PageState.NOT_ACTIVE
         );
       });
 
+      it('should reset the active page even when viewer becomes inactive before the active page is set', async () => {
+        await createStoryWithPages(2, ['cover', 'page-1']);
+
+        // Should not throw error of "Cannot read properties of null (reading 'setState')",
+        // even when the active page is not set yet.
+        story
+          .getAmpDoc()
+          .overrideVisibilityState(VisibilityState_Enum.INACTIVE);
+
+        // Resolves the active page and set the page state to inactive.
+        await story.layoutCallback();
+      });
+
       it('should pause the story when viewer becomes hidden', async () => {
         await createStoryWithPages(2, ['cover', 'page-1']);
 
         await story.layoutCallback();
-        story.getAmpDoc().overrideVisibilityState(VisibilityState.HIDDEN);
+        story.getAmpDoc().overrideVisibilityState(VisibilityState_Enum.HIDDEN);
         expect(story.storeService_.get(StateProperty.PAUSED_STATE)).to.be.true;
       });
 
@@ -667,7 +706,7 @@ describes.realWin(
 
         await story.layoutCallback();
         const setStateStub = env.sandbox.stub(story.activePage_, 'setState');
-        story.getAmpDoc().overrideVisibilityState(VisibilityState.HIDDEN);
+        story.getAmpDoc().overrideVisibilityState(VisibilityState_Enum.HIDDEN);
         expect(setStateStub).to.have.been.calledOnceWithExactly(
           PageState.PAUSED
         );
@@ -677,7 +716,7 @@ describes.realWin(
         await createStoryWithPages(2, ['cover', 'page-1']);
 
         await story.layoutCallback();
-        story.getAmpDoc().overrideVisibilityState(VisibilityState.PAUSED);
+        story.getAmpDoc().overrideVisibilityState(VisibilityState_Enum.PAUSED);
         expect(story.storeService_.get(StateProperty.PAUSED_STATE)).to.be.true;
       });
 
@@ -686,7 +725,7 @@ describes.realWin(
 
         await story.layoutCallback();
         const setStateStub = env.sandbox.stub(story.activePage_, 'setState');
-        story.getAmpDoc().overrideVisibilityState(VisibilityState.PAUSED);
+        story.getAmpDoc().overrideVisibilityState(VisibilityState_Enum.PAUSED);
         expect(setStateStub).to.have.been.calledOnceWithExactly(
           PageState.PAUSED
         );
@@ -696,8 +735,8 @@ describes.realWin(
         await createStoryWithPages(2, ['cover', 'page-1']);
 
         await story.layoutCallback();
-        story.getAmpDoc().overrideVisibilityState(VisibilityState.PAUSED);
-        story.getAmpDoc().overrideVisibilityState(VisibilityState.ACTIVE);
+        story.getAmpDoc().overrideVisibilityState(VisibilityState_Enum.PAUSED);
+        story.getAmpDoc().overrideVisibilityState(VisibilityState_Enum.ACTIVE);
         expect(story.storeService_.get(StateProperty.PAUSED_STATE)).to.be.false;
       });
 
@@ -706,8 +745,8 @@ describes.realWin(
 
         await story.layoutCallback();
         const setStateStub = env.sandbox.stub(story.activePage_, 'setState');
-        story.getAmpDoc().overrideVisibilityState(VisibilityState.PAUSED);
-        story.getAmpDoc().overrideVisibilityState(VisibilityState.ACTIVE);
+        story.getAmpDoc().overrideVisibilityState(VisibilityState_Enum.PAUSED);
+        story.getAmpDoc().overrideVisibilityState(VisibilityState_Enum.ACTIVE);
         expect(setStateStub.getCall(1)).to.have.been.calledWithExactly(
           PageState.PLAYING
         );
@@ -718,9 +757,11 @@ describes.realWin(
 
         await story.layoutCallback();
         const setStateStub = env.sandbox.stub(story.activePage_, 'setState');
-        story.getAmpDoc().overrideVisibilityState(VisibilityState.PAUSED);
-        story.getAmpDoc().overrideVisibilityState(VisibilityState.INACTIVE);
-        story.getAmpDoc().overrideVisibilityState(VisibilityState.ACTIVE);
+        story.getAmpDoc().overrideVisibilityState(VisibilityState_Enum.PAUSED);
+        story
+          .getAmpDoc()
+          .overrideVisibilityState(VisibilityState_Enum.INACTIVE);
+        story.getAmpDoc().overrideVisibilityState(VisibilityState_Enum.ACTIVE);
         expect(setStateStub.getCall(0)).to.have.been.calledWithExactly(
           PageState.PAUSED
         );
@@ -738,8 +779,8 @@ describes.realWin(
         story.storeService_.dispatch(Action.TOGGLE_PAUSED, true);
 
         await story.layoutCallback();
-        story.getAmpDoc().overrideVisibilityState(VisibilityState.PAUSED);
-        story.getAmpDoc().overrideVisibilityState(VisibilityState.ACTIVE);
+        story.getAmpDoc().overrideVisibilityState(VisibilityState_Enum.PAUSED);
+        story.getAmpDoc().overrideVisibilityState(VisibilityState_Enum.ACTIVE);
         expect(story.storeService_.get(StateProperty.PAUSED_STATE)).to.be.true;
       });
 
@@ -749,9 +790,11 @@ describes.realWin(
         story.storeService_.dispatch(Action.TOGGLE_PAUSED, true);
 
         await story.layoutCallback();
-        story.getAmpDoc().overrideVisibilityState(VisibilityState.PAUSED);
-        story.getAmpDoc().overrideVisibilityState(VisibilityState.INACTIVE);
-        story.getAmpDoc().overrideVisibilityState(VisibilityState.ACTIVE);
+        story.getAmpDoc().overrideVisibilityState(VisibilityState_Enum.PAUSED);
+        story
+          .getAmpDoc()
+          .overrideVisibilityState(VisibilityState_Enum.INACTIVE);
+        story.getAmpDoc().overrideVisibilityState(VisibilityState_Enum.ACTIVE);
         expect(story.storeService_.get(StateProperty.PAUSED_STATE)).to.be.true;
       });
 
@@ -760,12 +803,24 @@ describes.realWin(
           await createStoryWithPages(2, ['cover', 'page-4']);
           AmpStory.isBrowserSupported = () => false;
           story = new AmpStory(element);
-          const dispatchSpy = env.sandbox.spy(story.storeService_, 'dispatch');
+          expect(
+            element.querySelector(
+              '.i-amphtml-story-unsupported-browser-overlay'
+            )
+          ).to.be.null;
+          const dispatchTogglePaused = env.sandbox
+            .spy(story.storeService_, 'dispatch')
+            .withArgs(Action.TOGGLE_PAUSED, true);
           await story.layoutCallback();
-          expect(dispatchSpy).to.have.been.calledWith(
-            Action.TOGGLE_SUPPORTED_BROWSER,
-            false
+          await poll(
+            'TOGGLE_PAUSED true',
+            () => dispatchTogglePaused.callCount > 0
           );
+          expect(
+            element.querySelector(
+              '.i-amphtml-story-unsupported-browser-overlay'
+            )
+          ).to.not.be.null;
         });
 
         it('should display the story after clicking "continue" button', async () => {
@@ -773,19 +828,28 @@ describes.realWin(
 
           AmpStory.isBrowserSupported = () => false;
           story = new AmpStory(element);
-          const dispatchSpy = env.sandbox.spy(
-            story.unsupportedBrowserLayer_.storeService_,
-            'dispatch'
-          );
 
           story.buildCallback();
 
           await story.layoutCallback();
-          story.unsupportedBrowserLayer_.continueButton_.click();
-          expect(dispatchSpy).to.have.been.calledWith(
-            Action.TOGGLE_SUPPORTED_BROWSER,
-            true
+
+          const dispatchTogglePausedRestore = env.sandbox
+            .spy(story.storeService_, 'dispatch')
+            .withArgs(Action.TOGGLE_PAUSED, story.pausedStateToRestore_);
+
+          const continueAnywayButton = element.querySelector(
+            '.i-amphtml-story-unsupported-browser-overlay button'
+          );
+          continueAnywayButton.click();
+
+          await poll(
+            '.i-amphtml-story-unsupported-browser-overlay is removed',
+            () =>
+              element.querySelector(
+                '.i-amphtml-story-unsupported-browser-overlay'
+              ) == null
           );
+          expect(dispatchTogglePausedRestore).to.have.been.calledOnce;
         });
       });
 
@@ -817,7 +881,7 @@ describes.realWin(
             .then(() =>
               story.activePage_.element
                 .signals()
-                .whenSignal(CommonSignals.LOAD_END)
+                .whenSignal(CommonSignals_Enum.LOAD_END)
             )
             .then(() => {
               expect(story.backgroundAudioEl_).to.exist;
@@ -899,6 +963,18 @@ describes.realWin(
         });
       });
 
+      it('should update the STORY_HAS_BACKGROUND_AUDIO property if story has background audio', async () => {
+        await createStoryWithPages(2, ['cover', 'page-1']);
+        story.element.setAttribute('background-audio', 'audio.mp3');
+        await story.layoutCallback();
+
+        expect(
+          story.storeService_.get(
+            StateProperty.STORY_HAS_BACKGROUND_AUDIO_STATE
+          )
+        ).to.be.true;
+      });
+
       it('should remove the muted attribute on unmuted state change', async () => {
         await createStoryWithPages(2, ['cover', 'page-1']);
 
@@ -925,8 +1001,8 @@ describes.realWin(
 
           await story.layoutCallback();
           const expected = {
-            [MediaType.AUDIO]: 2,
-            [MediaType.VIDEO]: 2,
+            [MediaType_Enum.AUDIO]: 2,
+            [MediaType_Enum.VIDEO]: 2,
           };
           expect(story.getMaxMediaElementCounts()).to.deep.equal(expected);
         });
@@ -945,8 +1021,8 @@ describes.realWin(
           story.element.appendChild(ampAudoEl);
 
           const expected = {
-            [MediaType.AUDIO]: 3,
-            [MediaType.VIDEO]: 3,
+            [MediaType_Enum.AUDIO]: 3,
+            [MediaType_Enum.VIDEO]: 3,
           };
           expect(story.getMaxMediaElementCounts()).to.deep.equal(expected);
         });
@@ -968,8 +1044,8 @@ describes.realWin(
           }
 
           const expected = {
-            [MediaType.AUDIO]: 4,
-            [MediaType.VIDEO]: 8,
+            [MediaType_Enum.AUDIO]: 4,
+            [MediaType_Enum.VIDEO]: 8,
           };
           expect(story.getMaxMediaElementCounts()).to.deep.equal(expected);
         });
@@ -1009,6 +1085,35 @@ describes.realWin(
         });
       });
 
+      describe('amp-story ads', () => {
+        it('should return a valid page index', async () => {
+          const adId = 'i-amphtml-ad-page-1';
+          const pageElements = await createStoryWithPages(4, [
+            'cover',
+            'page-1',
+            'page-2',
+            'page-3',
+          ]);
+          await story.layoutCallback();
+          // Getting all the AmpStoryPage objets.
+          let pages = Array.from(pageElements).map((el) => el.getImpl());
+
+          pages = await Promise.all(pages);
+
+          // Insert ads
+          const adPage = await createStoryAdPage(adId);
+          story.addPage(adPage);
+          story.insertPage('page-2', adId);
+
+          pages.splice(3, 0, adPage);
+
+          // Only the first page should be active.
+          for (let i = 0; i < pages.length; i++) {
+            expect(story.getPageIndex(pages[i])).to.equal(i);
+          }
+        });
+      });
+
       describe('amp-story NO_NEXT_PAGE', () => {
         describe('with #cap=swipe', () => {
           before(() => {
@@ -1122,7 +1227,7 @@ describes.realWin(
           expect(story.activePage_.element.id).to.equal('page-1');
         });
 
-        it('should NOT navigate when clicking on a tappable element', async () => {
+        it('should navigate when performing a navigational click even if the click happens before the active page is set', async () => {
           await createStoryWithPages(4, [
             'cover',
             'page-1',
@@ -1130,17 +1235,18 @@ describes.realWin(
             'page-3',
           ]);
 
-          await story.layoutCallback();
-          const tappableEl = win.document.createElement('target');
-          tappableEl.setAttribute('on', 'tap:cover.hide');
-          story.activePage_.element.appendChild(tappableEl);
-
+          // Should not throw error of "Cannot read properties of null (reading 'next')",
+          // even when the active page is not set yet.
+          const firstPageEl = element.querySelector('amp-story-page');
           const clickEvent = new MouseEvent('click', {clientX: 200});
-          tappableEl.dispatchEvent(clickEvent);
-          expect(story.activePage_.element.id).to.equal('cover');
+          firstPageEl.dispatchEvent(clickEvent);
+
+          // Resolves the active page and navigates to the next page.
+          await story.layoutCallback();
+          expect(story.activePage_.element.id).to.equal('page-1');
         });
 
-        it('should NOT navigate when clicking on a shadow DOM element', async () => {
+        it('should NOT navigate when clicking on a tappable element', async () => {
           await createStoryWithPages(4, [
             'cover',
             'page-1',
@@ -1149,9 +1255,12 @@ describes.realWin(
           ]);
 
           await story.layoutCallback();
-          const clickEvent = new MouseEvent('click', {clientX: 200});
-          story.shareMenu_.element_.dispatchEvent(clickEvent);
+          const tappableEl = win.document.createElement('target');
+          tappableEl.setAttribute('on', 'tap:cover.hide');
+          story.activePage_.element.appendChild(tappableEl);
 
+          const clickEvent = new MouseEvent('click', {clientX: 200});
+          tappableEl.dispatchEvent(clickEvent);
           expect(story.activePage_.element.id).to.equal('cover');
         });
 
@@ -1174,221 +1283,6 @@ describes.realWin(
         });
       });
 
-      describe('amp-access navigation', () => {
-        it('should set the access state to true if next page blocked', async () => {
-          await createStoryWithPages(4, [
-            'cover',
-            'page-1',
-            'page-2',
-            'page-3',
-          ]);
-
-          await story.layoutCallback();
-          story
-            .getPageById('page-1')
-            .element.setAttribute('amp-access-hide', '');
-          await story.switchTo_('page-1');
-          expect(story.storeService_.get(StateProperty.ACCESS_STATE)).to.be
-            .true;
-        });
-
-        it('should not navigate if next page is blocked by paywall', async () => {
-          await createStoryWithPages(4, [
-            'cover',
-            'page-1',
-            'page-2',
-            'page-3',
-          ]);
-
-          await story.layoutCallback();
-          story
-            .getPageById('page-1')
-            .element.setAttribute('amp-access-hide', '');
-          await story.switchTo_('page-1');
-          expect(story.activePage_.element.id).to.equal('cover');
-        });
-
-        it('should navigate once the doc is reauthorized', async () => {
-          await createStoryWithPages(4, [
-            'cover',
-            'page-1',
-            'page-2',
-            'page-3',
-          ]);
-
-          let authorizedCallback;
-          const fakeAccessService = {
-            areFirstAuthorizationsCompleted: () => true,
-            onApplyAuthorizations: (fn) => (authorizedCallback = fn),
-          };
-          env.sandbox
-            .stub(Services, 'accessServiceForDocOrNull')
-            .resolves(fakeAccessService);
-
-          // Navigates to a paywall protected page, and waits until the document
-          // is successfuly reauthorized to navigate.
-          await story.layoutCallback();
-          story
-            .getPageById('page-1')
-            .element.setAttribute('amp-access-hide', '');
-          await story.switchTo_('page-1');
-          story
-            .getPageById('page-1')
-            .element.removeAttribute('amp-access-hide');
-          authorizedCallback();
-
-          expect(story.activePage_.element.id).to.equal('page-1');
-        });
-
-        it('should hide the paywall once the doc is reauthorized', async () => {
-          await createStoryWithPages(4, [
-            'cover',
-            'page-1',
-            'page-2',
-            'page-3',
-          ]);
-
-          let authorizedCallback;
-          const fakeAccessService = {
-            areFirstAuthorizationsCompleted: () => true,
-            onApplyAuthorizations: (fn) => (authorizedCallback = fn),
-          };
-          env.sandbox
-            .stub(Services, 'accessServiceForDocOrNull')
-            .resolves(fakeAccessService);
-
-          // Navigates to a paywall protected page, and waits until the document
-          // is successfuly reauthorized to hide the access UI.
-          await story.layoutCallback();
-          story
-            .getPageById('page-1')
-            .element.setAttribute('amp-access-hide', '');
-          await story.switchTo_('page-1');
-          expect(story.activePage_.element.id).to.equal('cover');
-          story
-            .getPageById('page-1')
-            .element.removeAttribute('amp-access-hide');
-          authorizedCallback();
-
-          expect(story.storeService_.get(StateProperty.ACCESS_STATE)).to.be
-            .false;
-        });
-
-        it('should not navigate on doc reauthorized if page still blocked', async () => {
-          await createStoryWithPages(4, [
-            'cover',
-            'page-1',
-            'page-2',
-            'page-3',
-          ]);
-
-          let authorizedCallback;
-          const fakeAccessService = {
-            areFirstAuthorizationsCompleted: () => true,
-            onApplyAuthorizations: (fn) => (authorizedCallback = fn),
-          };
-          env.sandbox
-            .stub(Services, 'accessServiceForDocOrNull')
-            .resolves(fakeAccessService);
-
-          // Navigates to a paywall protected page, and does not navigate to that
-          // page if the document has been reauthorized with insuficient rights.
-          await story.layoutCallback();
-          story
-            .getPageById('page-1')
-            .element.setAttribute('amp-access-hide', '');
-          await story.switchTo_('page-1');
-          authorizedCallback();
-
-          expect(story.activePage_.element.id).to.equal('cover');
-        });
-
-        it('should show paywall on doc reauthorized if page still blocked', async () => {
-          await createStoryWithPages(4, [
-            'cover',
-            'page-1',
-            'page-2',
-            'page-3',
-          ]);
-
-          let authorizedCallback;
-          const fakeAccessService = {
-            areFirstAuthorizationsCompleted: () => true,
-            onApplyAuthorizations: (fn) => (authorizedCallback = fn),
-          };
-          env.sandbox
-            .stub(Services, 'accessServiceForDocOrNull')
-            .resolves(fakeAccessService);
-
-          // Navigates to a paywall protected page, and does not hide the access UI
-          // if the document has been reauthorized with insuficient rights.
-          await story.layoutCallback();
-          story
-            .getPageById('page-1')
-            .element.setAttribute('amp-access-hide', '');
-          await story.switchTo_('page-1');
-          authorizedCallback();
-
-          expect(story.storeService_.get(StateProperty.ACCESS_STATE)).to.be
-            .true;
-        });
-
-        it('should block navigation if doc authorizations are pending', async () => {
-          await createStoryWithPages(4, [
-            'cover',
-            'page-1',
-            'page-2',
-            'page-3',
-          ]);
-
-          const fakeAccessService = {
-            areFirstAuthorizationsCompleted: () => false,
-            onApplyAuthorizations: () => {},
-          };
-          env.sandbox
-            .stub(Services, 'accessServiceForDocOrNull')
-            .resolves(fakeAccessService);
-
-          // Navigates to a maybe protected page (has amp-access="" rule), but the
-          // document authorizations are still pending. Asserts that it blocks the
-          // navigation.
-          await story.layoutCallback();
-          story
-            .getPageById('page-1')
-            .element.setAttribute('amp-access', 'random condition');
-          await story.switchTo_('page-1');
-          expect(story.activePage_.element.id).to.equal('cover');
-        });
-
-        it('should navigate only after the doc is first authorized', async () => {
-          await createStoryWithPages(4, [
-            'cover',
-            'page-1',
-            'page-2',
-            'page-3',
-          ]);
-
-          let authorizedCallback;
-          const fakeAccessService = {
-            areFirstAuthorizationsCompleted: () => false,
-            onApplyAuthorizations: (fn) => (authorizedCallback = fn),
-          };
-          env.sandbox
-            .stub(Services, 'accessServiceForDocOrNull')
-            .resolves(fakeAccessService);
-
-          // Navigation to a maybe protected page (has amp-access="" rule) is
-          // blocked until the authorizations are completed.
-          await story.layoutCallback();
-          story
-            .getPageById('page-1')
-            .element.setAttribute('amp-access', 'random condition');
-          await story.switchTo_('page-1');
-          authorizedCallback();
-          expect(story.activePage_.element.id).to.equal('page-1');
-        });
-      });
-
       describe('touch events handlers', () => {
         const getTouchOptions = (x, y) => {
           const touch = new Touch({
@@ -1403,7 +1297,7 @@ describes.realWin(
 
         const dispatchSwipeEvent = (deltaX, deltaY) => {
           // Triggers mobile UI so hint overlay can attach.
-          story.storeService_.dispatch(Action.TOGGLE_UI, UIType.MOBILE);
+          story.storeService_.dispatch(Action.TOGGLE_UI, UIType_Enum.MOBILE);
 
           story.element.dispatchEvent(
             new TouchEvent('touchstart', getTouchOptions(-10, -10))
@@ -1439,12 +1333,13 @@ describes.realWin(
           it('should trigger the navigation overlay', async () => {
             await createStoryWithPages(2);
             dispatchSwipeEvent(100, 0);
-            await story.mutateElement(() => {
-              const hintEl = story.element.querySelector(
-                '.i-amphtml-story-hint-container'
-              );
-              expect(hintEl).to.not.have.class('i-amphtml-hidden');
-            });
+            await waitFor(() =>
+              story.element.querySelector('.i-amphtml-story-hint-container')
+            );
+            const hintEl = story.element.querySelector(
+              '.i-amphtml-story-hint-container'
+            );
+            expect(hintEl).to.not.have.class('i-amphtml-hidden');
           });
         });
 
@@ -1482,10 +1377,16 @@ describes.realWin(
       });
 
       describe('amp-story rewriteStyles', () => {
-        it('should rewrite vw styles', async () => {
+        let styleEl;
+
+        beforeEach(async () => {
           await createStoryWithPages(1, ['cover']);
-          const styleEl = win.document.createElement('style');
+          styleEl = win.document.createElement('style');
           styleEl.setAttribute('amp-custom', '');
+          env.sandbox.stub(story.vsync_, 'mutate').callsFake((fn) => fn());
+        });
+
+        it('should rewrite vw styles', async () => {
           styleEl.textContent = 'foo {transform: translate3d(100vw, 0, 0);}';
           win.document.head.appendChild(styleEl);
 
@@ -1499,9 +1400,6 @@ describes.realWin(
         });
 
         it('should rewrite negative vh styles', async () => {
-          await createStoryWithPages(1, ['cover']);
-          const styleEl = win.document.createElement('style');
-          styleEl.setAttribute('amp-custom', '');
           styleEl.textContent = 'foo {transform: translate3d(-100vh, 0, 0);}';
           win.document.head.appendChild(styleEl);
 
@@ -1516,6 +1414,511 @@ describes.realWin(
       });
     });
 
+    describe('amp-story-subscriptions navigation', () => {
+      let subscriptionsEl;
+      let storeService;
+      const pages = ['cover', 'page-1', 'page-2', 'page-3', 'page-4'];
+
+      const clickRightEvent = new MouseEvent('click', {clientX: 200});
+      const clickLeftEvent = new MouseEvent('click', {clientX: 10});
+
+      async function setUpStorySubscriptions() {
+        await createStoryWithPages(5, pages);
+        subscriptionsEl = win.document.createElement('amp-story-subscriptions');
+        story.element.appendChild(subscriptionsEl);
+
+        // buildCallback() is implicitly called by createStoryWithPages()
+        await story.layoutCallback();
+      }
+
+      function tapNavigationUntil(pageIndex) {
+        for (
+          let i = 0,
+            activePage = story.getPageById(
+              storeService.get(StateProperty.CURRENT_PAGE_ID)
+            );
+          i < pageIndex;
+          i++,
+            activePage = story.getPageById(
+              storeService.get(StateProperty.CURRENT_PAGE_ID)
+            )
+        ) {
+          activePage.element.dispatchEvent(clickRightEvent);
+        }
+      }
+
+      beforeEach(async () => {
+        toggleExperiment(win, 'amp-story-subscriptions', true);
+
+        storeService = new AmpStoryStoreService(win);
+        env.sandbox.stub(Services, 'storyStoreService').returns(storeService);
+
+        // This stub makes requestAnimationFrame a sync call so that each dispatch of click event
+        // can be a sync operation, which means it can be used as doing await switchTo call.
+        env.sandbox.stub(win, 'requestAnimationFrame').callsFake((cb) => cb());
+      });
+
+      describe('UNKNOWN subscription state before paywall page', () => {
+        beforeEach(async () => {
+          storeService.dispatch(
+            Action.SET_SUBSCRIPTIONS_PAGE_INDEX,
+            DEFAULT_SUBSCRIPTIONS_PAGE_INDEX
+          );
+          await setUpStorySubscriptions();
+          tapNavigationUntil(DEFAULT_SUBSCRIPTIONS_PAGE_INDEX);
+        });
+
+        it('should not navigate to locked content while subscription state is unknown', () => {
+          const activePage = story.getPageById(
+            storeService.get(StateProperty.CURRENT_PAGE_ID)
+          );
+          expect(activePage.element.id).to.equal(
+            pages[DEFAULT_SUBSCRIPTIONS_PAGE_INDEX - 1]
+          );
+        });
+
+        it('should resume to paywall page after the subscription state gets resolved', async () => {
+          storeService.dispatch(
+            Action.TOGGLE_SUBSCRIPTIONS_STATE,
+            SubscriptionsState.BLOCKED
+          );
+          await macroTask();
+          const paywallPage = story.getPageById(
+            storeService.get(StateProperty.CURRENT_PAGE_ID)
+          );
+          expect(paywallPage.element.id).to.equal(
+            pages[DEFAULT_SUBSCRIPTIONS_PAGE_INDEX]
+          );
+        });
+
+        it('should continue normal navigation after the subscription state gets resolved to granted', async () => {
+          storeService.dispatch(
+            Action.TOGGLE_SUBSCRIPTIONS_STATE,
+            SubscriptionsState.GRANTED
+          );
+          await macroTask();
+          const paywallPage = story.getPageById(
+            storeService.get(StateProperty.CURRENT_PAGE_ID)
+          );
+          paywallPage.element.dispatchEvent(clickRightEvent);
+          const postPaywallPage = story.getPageById(
+            storeService.get(StateProperty.CURRENT_PAGE_ID)
+          );
+          expect(postPaywallPage.element.id).to.equal(
+            pages[DEFAULT_SUBSCRIPTIONS_PAGE_INDEX + 1]
+          );
+        });
+
+        it('if state resolves to BLOCKED and user stays on the paywall page shows UI after predefined delay', async () => {
+          const clock = env.sandbox.useFakeTimers();
+          storeService.dispatch(
+            Action.TOGGLE_SUBSCRIPTIONS_STATE,
+            SubscriptionsState.BLOCKED
+          );
+          await macroTask(win.setTimeout);
+          clock.tick(SUBSCRIPTIONS_DELAY_DURATION);
+          expect(storeService.get(StateProperty.SUBSCRIPTIONS_DIALOG_UI_STATE))
+            .to.be.true;
+        });
+
+        it('if state resolves to BLOCKED and user taps right on the paywall page', async () => {
+          storeService.dispatch(
+            Action.TOGGLE_SUBSCRIPTIONS_STATE,
+            SubscriptionsState.BLOCKED
+          );
+          await macroTask();
+
+          const paywallPage = story.getPageById(
+            storeService.get(StateProperty.CURRENT_PAGE_ID)
+          );
+          paywallPage.element.dispatchEvent(clickRightEvent);
+
+          it('should show paywall immediately', () => {
+            expect(
+              storeService.get(StateProperty.SUBSCRIPTIONS_DIALOG_UI_STATE)
+            ).to.be.true;
+          });
+
+          it('should stay on the paywall page', () => {
+            const paywallPage = story.getPageById(
+              storeService.get(StateProperty.CURRENT_PAGE_ID)
+            );
+            expect(paywallPage.element.id).to.equal(
+              pages[DEFAULT_SUBSCRIPTIONS_PAGE_INDEX]
+            );
+          });
+        });
+      });
+
+      describe('GRANTED subscription state before paywall page', async () => {
+        storeService.dispatch(
+          Action.SET_SUBSCRIPTIONS_PAGE_INDEX,
+          DEFAULT_SUBSCRIPTIONS_PAGE_INDEX
+        );
+        await setUpStorySubscriptions();
+        storeService.dispatch(
+          Action.TOGGLE_SUBSCRIPTIONS_STATE,
+          SubscriptionsState.GRANTED
+        );
+        tapNavigationUntil(DEFAULT_SUBSCRIPTIONS_PAGE_INDEX);
+        const paywallPage = story.getPageById(
+          storeService.get(StateProperty.CURRENT_PAGE_ID)
+        );
+        paywallPage.element.dispatchEvent(clickRightEvent);
+        await macroTask();
+
+        it('should not show paywall', () => {
+          expect(storeService.get(StateProperty.SUBSCRIPTIONS_DIALOG_UI_STATE))
+            .to.be.false;
+        });
+
+        it('should be able to navigate the locked page after paywall page', async () => {
+          const postPaywallPage = story.getPageById(
+            storeService.get(StateProperty.CURRENT_PAGE_ID)
+          );
+          expect(postPaywallPage.element.id).to.equal(
+            pages[DEFAULT_SUBSCRIPTIONS_PAGE_INDEX + 1]
+          );
+        });
+      });
+
+      describe('unresolved subscriptions page index', () => {
+        beforeEach(async () => {});
+
+        it('should block on the first page if subscriptions page index is unresolved', async () => {
+          setUpStorySubscriptions();
+          storeService.dispatch(
+            Action.TOGGLE_SUBSCRIPTIONS_STATE,
+            SubscriptionsState.BLOCKED
+          );
+
+          // Blocking on unresolved page index during layout callback so the current page id is not set yet.
+          expect(storeService.get(StateProperty.CURRENT_PAGE_ID)).to.equal('');
+
+          storeService.dispatch(
+            Action.SET_SUBSCRIPTIONS_PAGE_INDEX,
+            DEFAULT_SUBSCRIPTIONS_PAGE_INDEX
+          );
+        });
+
+        describe('subscriptions page index is resolved', () => {
+          let clock;
+
+          beforeEach(async () => {
+            storeService.dispatch(
+              Action.SET_SUBSCRIPTIONS_PAGE_INDEX,
+              DEFAULT_SUBSCRIPTIONS_PAGE_INDEX + 1
+            );
+            await setUpStorySubscriptions();
+            storeService.dispatch(
+              Action.TOGGLE_SUBSCRIPTIONS_STATE,
+              SubscriptionsState.BLOCKED
+            );
+
+            tapNavigationUntil(DEFAULT_SUBSCRIPTIONS_PAGE_INDEX);
+            clock = env.sandbox.useFakeTimers();
+          });
+
+          it('should not show paywall on the default paywall page', () => {
+            clock.tick(SUBSCRIPTIONS_DELAY_DURATION);
+            expect(
+              storeService.get(StateProperty.SUBSCRIPTIONS_DIALOG_UI_STATE)
+            ).to.be.false;
+          });
+
+          it('should show paywall on the specified paywall page', () => {
+            const defaultPaywallPage = story.getPageById(
+              storeService.get(StateProperty.CURRENT_PAGE_ID)
+            );
+            defaultPaywallPage.element.dispatchEvent(clickRightEvent);
+
+            clock.tick(SUBSCRIPTIONS_DELAY_DURATION);
+            expect(
+              storeService.get(StateProperty.SUBSCRIPTIONS_DIALOG_UI_STATE)
+            ).to.be.true;
+          });
+        });
+      });
+
+      describe('BLOCKED subscription state before paywall page', () => {
+        beforeEach(async () => {
+          storeService.dispatch(
+            Action.SET_SUBSCRIPTIONS_PAGE_INDEX,
+            DEFAULT_SUBSCRIPTIONS_PAGE_INDEX
+          );
+          await setUpStorySubscriptions();
+          storeService.dispatch(
+            Action.TOGGLE_SUBSCRIPTIONS_STATE,
+            SubscriptionsState.BLOCKED
+          );
+          tapNavigationUntil(DEFAULT_SUBSCRIPTIONS_PAGE_INDEX);
+        });
+
+        it('should resume to paywall page once status becomes granted from blocked if the paywall is triggered on time delay', async () => {
+          const clock = env.sandbox.useFakeTimers();
+          clock.tick(SUBSCRIPTIONS_DELAY_DURATION); // Paywall is shown after delay.
+          storeService.dispatch(
+            Action.TOGGLE_SUBSCRIPTIONS_STATE,
+            SubscriptionsState.GRANTED
+          );
+
+          it('should hide paywall', () => {
+            expect(
+              storeService.get(StateProperty.SUBSCRIPTIONS_DIALOG_UI_STATE)
+            ).to.be.false;
+          });
+
+          it('should resume to the paywall page', () => {
+            const activePageAfterGranted = story.getPageById(
+              storeService.get(StateProperty.CURRENT_PAGE_ID)
+            );
+            expect(activePageAfterGranted.element.id).to.equal(
+              pages[DEFAULT_SUBSCRIPTIONS_PAGE_INDEX]
+            );
+          });
+        });
+
+        it('should resume to the page right after paywall page once status becomes granted from blocked if the paywall is triggered on tap', async () => {
+          const paywallPage = story.getPageById(
+            storeService.get(StateProperty.CURRENT_PAGE_ID)
+          );
+          paywallPage.element.dispatchEvent(clickRightEvent);
+          storeService.dispatch(
+            Action.TOGGLE_SUBSCRIPTIONS_STATE,
+            SubscriptionsState.GRANTED
+          );
+
+          it('should hide paywall', () => {
+            expect(
+              storeService.get(StateProperty.SUBSCRIPTIONS_DIALOG_UI_STATE)
+            ).to.be.false;
+          });
+
+          it('should resume to the page after the paywall page', () => {
+            const activePageAfterGranted = story.getPageById(
+              storeService.get(StateProperty.CURRENT_PAGE_ID)
+            );
+            expect(activePageAfterGranted.element.id).to.equal(
+              pages[DEFAULT_SUBSCRIPTIONS_PAGE_INDEX + 1]
+            );
+          });
+        });
+
+        it('tapping left before paywall shows should go to the previous page without showing the paywall', async () => {
+          const paywallPage = story.getPageById(
+            storeService.get(StateProperty.CURRENT_PAGE_ID)
+          );
+          paywallPage.element.dispatchEvent(clickLeftEvent);
+
+          it('should hide paywall', () => {
+            expect(
+              storeService.get(StateProperty.SUBSCRIPTIONS_DIALOG_UI_STATE)
+            ).to.be.false;
+          });
+
+          it('should be on the page before the paywall page', () => {
+            const activePage = story.getPageById(
+              storeService.get(StateProperty.CURRENT_PAGE_ID)
+            );
+            expect(activePage.element.id).to.equal(
+              pages[DEFAULT_SUBSCRIPTIONS_PAGE_INDEX - 1]
+            );
+          });
+        });
+
+        it('tapping left on paywall should hide the paywall and go to the previous page', async () => {
+          const paywallPage = story.getPageById(
+            storeService.get(StateProperty.CURRENT_PAGE_ID)
+          );
+          paywallPage.element.dispatchEvent(clickRightEvent); // Show paywall
+          paywallPage.element.dispatchEvent(clickLeftEvent); // Tapping left when the paywall is shown
+
+          it('should hide paywall', () => {
+            expect(
+              storeService.get(StateProperty.SUBSCRIPTIONS_DIALOG_UI_STATE)
+            ).to.be.false;
+          });
+
+          it('should be on the page before the paywall page', () => {
+            const activePage = story.getPageById(
+              storeService.get(StateProperty.CURRENT_PAGE_ID)
+            );
+            expect(activePage.element.id).to.equal(
+              pages[DEFAULT_SUBSCRIPTIONS_PAGE_INDEX - 1]
+            );
+          });
+        });
+      });
+
+      describe('switch event and deep link', () => {
+        beforeEach(() => {
+          storeService.dispatch(
+            Action.SET_SUBSCRIPTIONS_PAGE_INDEX,
+            DEFAULT_SUBSCRIPTIONS_PAGE_INDEX
+          );
+        });
+
+        it('should navigate to paywall page and navigate back to original page after granted with any switch events', async () => {
+          await setUpStorySubscriptions();
+          storeService.dispatch(
+            Action.TOGGLE_SUBSCRIPTIONS_STATE,
+            SubscriptionsState.BLOCKED
+          );
+          tapNavigationUntil(DEFAULT_SUBSCRIPTIONS_PAGE_INDEX - 1);
+
+          dispatch(win, story.element, EventType.SWITCH_PAGE, {
+            'targetPageId': 'page-3',
+            'direction': NavigationDirection.NEXT,
+          });
+
+          it('should show paywall', () => {
+            expect(
+              storeService.get(StateProperty.SUBSCRIPTIONS_DIALOG_UI_STATE)
+            ).to.be.true;
+          });
+
+          it('should redirect to the paywall page', () => {
+            const activePage = story.getPageById(
+              storeService.get(StateProperty.CURRENT_PAGE_ID)
+            );
+            expect(activePage.element.id).to.equal(
+              pages[DEFAULT_SUBSCRIPTIONS_PAGE_INDEX]
+            );
+          });
+
+          storeService.dispatch(
+            Action.TOGGLE_SUBSCRIPTIONS_STATE,
+            SubscriptionsState.GRANTED
+          );
+
+          it('should hide paywall', () => {
+            expect(
+              storeService.get(StateProperty.SUBSCRIPTIONS_DIALOG_UI_STATE)
+            ).to.be.false;
+          });
+
+          it('should navigate to the page the user previously tried to visit', () => {
+            const activePage = story.getPageById(
+              storeService.get(StateProperty.CURRENT_PAGE_ID)
+            );
+            expect(activePage.element.id).to.equal(
+              pages[DEFAULT_SUBSCRIPTIONS_PAGE_INDEX + 1]
+            );
+          });
+        });
+
+        it('should initialize with paywall page and navigate back to original page after granted', async () => {
+          storeService.dispatch(
+            Action.TOGGLE_SUBSCRIPTIONS_STATE,
+            SubscriptionsState.BLOCKED
+          );
+
+          win.location.hash = 'page=page-3';
+          await createStoryWithPages(4, [
+            'cover',
+            'page-1',
+            'page-2',
+            'page-3',
+          ]);
+          subscriptionsEl = win.document.createElement(
+            'amp-story-subscriptions'
+          );
+          story.element.appendChild(subscriptionsEl);
+          await story.layoutCallback();
+
+          it('should show paywall', () => {
+            expect(
+              storeService.get(StateProperty.SUBSCRIPTIONS_DIALOG_UI_STATE)
+            ).to.be.true;
+          });
+
+          it('should redirect to the paywall page', () => {
+            const activePage = story.getPageById(
+              storeService.get(StateProperty.CURRENT_PAGE_ID)
+            );
+            expect(activePage.element.id).to.equal(
+              pages[DEFAULT_SUBSCRIPTIONS_PAGE_INDEX]
+            );
+          });
+
+          storeService.dispatch(
+            Action.TOGGLE_SUBSCRIPTIONS_STATE,
+            SubscriptionsState.GRANTED
+          );
+
+          it('should hide paywall', () => {
+            expect(
+              storeService.get(StateProperty.SUBSCRIPTIONS_DIALOG_UI_STATE)
+            ).to.be.false;
+          });
+
+          it('should navigate to the page the user previously tried to visit', () => {
+            const activePage = story.getPageById(
+              storeService.get(StateProperty.CURRENT_PAGE_ID)
+            );
+            expect(activePage.element.id).to.equal(
+              pages[DEFAULT_SUBSCRIPTIONS_PAGE_INDEX + 1]
+            );
+          });
+        });
+
+        it('should navigate back to paywall page after granted when tap left on paywall page and tap right again back to paywall page', async () => {
+          const clock = env.sandbox.useFakeTimers();
+          storeService.dispatch(
+            Action.TOGGLE_SUBSCRIPTIONS_STATE,
+            SubscriptionsState.BLOCKED
+          );
+
+          win.location.hash = 'page=page-3';
+          await createStoryWithPages(4, [
+            'cover',
+            'page-1',
+            'page-2',
+            'page-3',
+          ]);
+          subscriptionsEl = win.document.createElement(
+            'amp-story-subscriptions'
+          );
+          story.element.appendChild(subscriptionsEl);
+          await story.layoutCallback();
+
+          // Tap back to dismiss the paywall and tap right to trigger paywall again.
+          let paywallPage = story.getPageById(
+            storeService.get(StateProperty.CURRENT_PAGE_ID)
+          );
+          paywallPage.element.dispatchEvent(clickLeftEvent);
+          const prePaywallPage = story.getPageById(
+            storeService.get(StateProperty.CURRENT_PAGE_ID)
+          );
+          prePaywallPage.element.dispatchEvent(clickRightEvent);
+          paywallPage = story.getPageById(
+            storeService.get(StateProperty.CURRENT_PAGE_ID)
+          );
+          clock.tick(SUBSCRIPTIONS_DELAY_DURATION);
+
+          storeService.dispatch(
+            Action.TOGGLE_SUBSCRIPTIONS_STATE,
+            SubscriptionsState.GRANTED
+          );
+
+          it('should hide paywall', () => {
+            expect(
+              storeService.get(StateProperty.SUBSCRIPTIONS_DIALOG_UI_STATE)
+            ).to.be.false;
+          });
+
+          it('should navigate to the paywall page', () => {
+            const activePage = story.getPageById(
+              storeService.get(StateProperty.CURRENT_PAGE_ID)
+            );
+            expect(activePage.element.id).to.equal(
+              pages[DEFAULT_SUBSCRIPTIONS_PAGE_INDEX]
+            );
+          });
+        });
+      });
+    });
+
     describe('amp-story branching', () => {
       it('should advance to specified page with advanced-to attribute', async () => {
         toggleExperiment(win, 'amp-story-branching', true);
@@ -1674,7 +2077,7 @@ describes.realWin(
         await story.layoutCallback();
         await story.activePage_.element
           .signals()
-          .whenSignal(CommonSignals.LOAD_END);
+          .whenSignal(CommonSignals_Enum.LOAD_END);
         expect(
           story.storeService_.get(StateProperty.STORY_HAS_PLAYBACK_UI_STATE)
         ).to.be.true;
@@ -1691,7 +2094,7 @@ describes.realWin(
         await story.layoutCallback();
         await story.activePage_.element
           .signals()
-          .whenSignal(CommonSignals.LOAD_END);
+          .whenSignal(CommonSignals_Enum.LOAD_END);
         expect(
           story.storeService_.get(StateProperty.STORY_HAS_PLAYBACK_UI_STATE)
         ).to.be.false;
@@ -1703,15 +2106,15 @@ describes.realWin(
       });
     });
 
-    describe('experiment for story-load-first-page-only', () => {
+    describe('resource loading for first page', () => {
       let pages;
       let performanceImpl;
       beforeEach(async () => {
-        toggleExperiment(win, 'story-load-first-page-only', true);
         performanceImpl = new Performance(env.win);
         env.sandbox.stub(Services, 'performanceFor').returns(performanceImpl);
         pages = await createStoryWithPages(2, ['page-1', 'page-2'], false);
         env.sandbox.stub(story, 'mutateElement').callsFake((fn) => fn());
+        env.sandbox.stub(win, 'requestAnimationFrame').callsFake((cb) => cb());
       });
 
       it('should position the active page so it preloads', async () => {
@@ -1741,22 +2144,153 @@ describes.realWin(
         // Check page 1 is not loaded.
         expect(pages[1].hasAttribute('distance')).to.be.false;
 
-        signals.signal(CommonSignals.LOAD_END);
-        await nextTick();
+        signals.signal(CommonSignals_Enum.LOAD_END);
+        await macroTask();
 
         // Check page 1 is loaded with distance 1.
         expect(pages[1].getAttribute('distance')).to.be.equal('1');
       });
+    });
 
-      it('should enable the CSI experiment', async () => {
-        const enableSpy = env.sandbox.spy(
-          performanceImpl,
-          'addEnabledExperiment'
-        );
-        story.buildCallback();
-        await story.layoutCallback();
+    describe('localization', () => {
+      beforeEach(() => {
+        win.__AMP_MODE = {
+          rtvVersion: '123',
+        };
+        const performanceImpl = new Performance(env.win);
+        env.sandbox.stub(Services, 'performanceFor').returns(performanceImpl);
+      });
+
+      it('should use the inlined amp-story strings when available', async () => {
+        const inlinedStrings = win.document.createElement('script');
+        inlinedStrings.setAttribute('amp-localization', 'amp-story');
+        inlinedStrings.setAttribute('i-amphtml-version', '123');
+        inlinedStrings.textContent = '{"35": "INLINED-STRING"}';
+        win.document.head.appendChild(inlinedStrings);
+
+        await createStoryWithPages(1, ['cover']);
+
+        expect(
+          await localizationService.getLocalizedStringAsync('35')
+        ).to.be.equal('INLINED-STRING');
+      });
+
+      it('should not use the inlined amp-story strings if incorrect RTV', async () => {
+        fetchJson = {'35': 'REMOTE-TEXT'};
+
+        const inlinedStrings = win.document.createElement('script');
+        inlinedStrings.setAttribute('amp-localization', 'amp-story');
+        inlinedStrings.setAttribute('i-amphtml-version', '1234');
+        inlinedStrings.textContent = '{"35": "INLINED-STRING"}';
+        win.document.head.appendChild(inlinedStrings);
+
+        await createStoryWithPages(1, ['cover']);
+
+        expect(
+          await localizationService.getLocalizedStringAsync('35')
+        ).to.be.equal('REMOTE-TEXT');
+      });
+
+      it('should use the inlined amp-story strings when available if the language is specified', async () => {
+        env.win.document.body.parentElement.setAttribute('lang', 'es');
+
+        const inlinedStrings = win.document.createElement('script');
+        inlinedStrings.setAttribute('amp-localization', 'amp-story');
+        inlinedStrings.setAttribute('i-amphtml-version', '123');
+        inlinedStrings.textContent = '{"35": "TEXTO-EN-LINEA"}';
+        win.document.head.appendChild(inlinedStrings);
+
+        await createStoryWithPages(1, ['cover']);
+
+        expect(
+          await localizationService.getLocalizedStringAsync('35')
+        ).to.be.equal('TEXTO-EN-LINEA');
+      });
+
+      describe('remote localization strings', () => {
+        it('should fetch the localization strings for the default language from the cdn', async () => {
+          await createStoryWithPages(1, ['cover']);
+
+          expect(fetchStub).to.be.calledOnceWithExactly(
+            'https://cdn.ampproject.org/rtv/123/v0/amp-story.en.json',
+            env.sandbox.match.any
+          );
+        });
+
+        it('should fetch the localization strings for the document language from the cdn', async () => {
+          env.win.document.body.parentElement.setAttribute('lang', 'es-419');
+
+          await createStoryWithPages(1, ['cover']);
+
+          expect(fetchStub).to.have.been.calledOnceWithExactly(
+            'https://cdn.ampproject.org/rtv/123/v0/amp-story.es-419.json',
+            env.sandbox.match.any
+          );
+        });
 
-        expect(enableSpy).to.be.calledWith('story-load-first-page-only');
+        it('should fetch the localization strings for the document language from the local dist if testing locally', async () => {
+          env.win.document.body.parentElement.setAttribute('lang', 'es-419');
+          env.win.__AMP_MODE.localDev = true;
+
+          await createStoryWithPages(1, ['cover']);
+
+          expect(fetchStub).to.have.been.calledOnceWithExactly(
+            '/dist/rtv/123/v0/amp-story.es-419.json',
+            env.sandbox.match.any
+          );
+        });
+
+        it('should use the remote localization strings', async () => {
+          env.win.document.body.parentElement.setAttribute('lang', 'es-419');
+          fetchJson = {
+            '35': 'REMOTE-STRING',
+          };
+
+          await createStoryWithPages(1, ['cover']);
+
+          expect(
+            await localizationService.getLocalizedStringAsync('35')
+          ).to.be.equal('REMOTE-STRING');
+        });
+      });
+    });
+
+    describe('custom desktop aspect ratio', () => {
+      beforeEach(async () => {
+        await createStoryWithPages(3, ['cover', 'page-1', 'page-2']);
+      });
+
+      it('should apply custom desktop aspect ratio is there is one', async () => {
+        story.element.setAttribute('desktop-aspect-ratio', '9:16');
+        await story.buildCallback();
+
+        expect(
+          computedStyle(win, document.querySelector(':root')).getPropertyValue(
+            '--i-amphtml-story-desktop-one-panel-ratio'
+          )
+        ).equal('0.5625');
+      });
+
+      it('should apply minimum desktop aspect ratio if the custom one is too small', async () => {
+        story.element.setAttribute('desktop-aspect-ratio', '1:10');
+        await story.buildCallback();
+
+        expect(
+          computedStyle(win, document.querySelector(':root')).getPropertyValue(
+            '--i-amphtml-story-desktop-one-panel-ratio'
+          )
+        ).equal('0.5');
+      });
+
+      it('should apply maximum desktop aspect ratio if the custom one is too big', async () => {
+        story.element.setAttribute('desktop-aspect-ratio', '1:1');
+        await story.buildCallback();
+
+        expect(
+          computedStyle(win, document.querySelector(':root')).getPropertyValue(
+            '--i-amphtml-story-desktop-one-panel-ratio'
+          )
+        ).equal('0.75');
       });
     });
   }
diff --git a/extensions/amp-story/1.0/test/test-analytics.js b/extensions/amp-story/1.0/test/test-analytics.js
index e20c224991b5..5477f4727104 100644
--- a/extensions/amp-story/1.0/test/test-analytics.js
+++ b/extensions/amp-story/1.0/test/test-analytics.js
@@ -1,6 +1,7 @@
+import {installDocService} from '#service/ampdoc-impl';
+
 import {Action, getStoreService} from '../amp-story-store-service';
 import {getAnalyticsService} from '../story-analytics';
-import {installDocService} from '#service/ampdoc-impl';
 
 describes.fakeWin('amp-story analytics', {}, (env) => {
   let analytics;
diff --git a/extensions/amp-story/1.0/test/test-animation.js b/extensions/amp-story/1.0/test/test-animation.js
index 08df16269131..1fe6df687020 100644
--- a/extensions/amp-story/1.0/test/test-animation.js
+++ b/extensions/amp-story/1.0/test/test-animation.js
@@ -1,17 +1,21 @@
+import {Deferred} from '#core/data-structures/promise';
+import {layoutRectLtwh} from '#core/dom/layout/rect';
+import {scopedQuerySelectorAll} from '#core/dom/query';
+import {htmlFor, htmlRefs} from '#core/dom/static-template';
+import {toArray} from '#core/types/array';
+
+import {Services} from '#service';
 import {AmpDocSingle} from '#service/ampdoc-impl';
+
+import {macroTask} from '#testing/helpers';
+
+import {WebAnimationPlayState} from '../../../amp-animation/0.1/web-animation-types';
 import {
   AnimationManager,
   AnimationRunner,
   AnimationSequence,
 } from '../animation';
-import {Deferred} from '#core/data-structures/promise';
-import {Services} from '#service';
-import {WebAnimationPlayState} from '../../../amp-animation/0.1/web-animation-types';
-import {htmlFor, htmlRefs} from '#core/dom/static-template';
-import {layoutRectLtwh} from '#core/dom/layout/rect';
 import {presets} from '../animation-presets';
-import {scopedQuerySelectorAll} from '#core/dom/query';
-import {toArray} from '#core/types/array';
 
 const querySelectorAllAnimateIn = (element) =>
   toArray(scopedQuerySelectorAll(element, '[animate-in]'));
@@ -20,9 +24,6 @@ describes.realWin('amp-story animations', {}, (env) => {
   let html;
   let ampdoc;
 
-  const nextTick = () =>
-    new Promise((resolve) => env.win.setTimeout(resolve, 0));
-
   beforeEach(() => {
     html = htmlFor(env.win.document);
     ampdoc = new AmpDocSingle(env.win);
@@ -219,7 +220,7 @@ describes.realWin('amp-story animations', {}, (env) => {
         sequence
       );
 
-      await nextTick();
+      await macroTask();
 
       expect(
         webAnimationBuilder.createRunner.withArgs(
@@ -264,7 +265,7 @@ describes.realWin('amp-story animations', {}, (env) => {
         sequence
       );
 
-      await nextTick();
+      await macroTask();
 
       expect(webAnimationBuilder.createRunner.withArgs(spec)).to.have.been
         .calledOnce;
@@ -302,7 +303,7 @@ describes.realWin('amp-story animations', {}, (env) => {
 
       runner.start();
 
-      await nextTick();
+      await macroTask();
       expect(webAnimationRunner.start).to.have.been.calledOnce;
     });
 
@@ -344,14 +345,14 @@ describes.realWin('amp-story animations', {}, (env) => {
 
       runner.start();
 
-      await nextTick();
+      await macroTask();
 
       expect(sequence.waitFor.withArgs(startAfterId)).to.have.been.calledOnce;
       expect(webAnimationRunner.start).to.not.have.been.called;
 
       resolveWaitFor();
 
-      await nextTick();
+      await macroTask();
 
       expect(webAnimationRunner.start).to.have.been.calledOnce;
     });
@@ -392,7 +393,7 @@ describes.realWin('amp-story animations', {}, (env) => {
         sequence
       );
 
-      await nextTick();
+      await macroTask();
 
       expect(sequence.notifyFinish).to.not.have.been.called;
 
@@ -438,7 +439,7 @@ describes.realWin('amp-story animations', {}, (env) => {
     it('creates WebAnimation Builder with options', async () => {
       const page = html`<div></div>`;
       new AnimationManager(page, ampdoc);
-      await nextTick();
+      await macroTask();
       expect(
         webAnimationService.createBuilder.withArgs(
           env.sandbox.match({
@@ -801,11 +802,11 @@ describes.realWin('amp-story animations', {}, (env) => {
       const notified = env.sandbox.spy();
 
       sequence.waitFor('test-notify-id').then(notified);
-      await nextTick();
+      await macroTask();
       expect(notified).to.not.have.been.called;
 
       sequence.notifyFinish('test-notify-id');
-      await nextTick();
+      await macroTask();
       expect(notified).to.have.been.calledOnce;
     });
 
@@ -814,16 +815,16 @@ describes.realWin('amp-story animations', {}, (env) => {
       const notified = env.sandbox.spy();
 
       sequence.waitFor('test-notify-id').then(notified);
-      await nextTick();
+      await macroTask();
 
       sequence.notifyFinish('test-notify-id');
-      await nextTick();
+      await macroTask();
 
       sequence.notifyFinish('test-notify-id');
-      await nextTick();
+      await macroTask();
 
       sequence.notifyFinish('test-notify-id');
-      await nextTick();
+      await macroTask();
 
       expect(notified).to.have.been.calledOnce;
     });
@@ -833,11 +834,11 @@ describes.realWin('amp-story animations', {}, (env) => {
       const notified = env.sandbox.spy();
 
       sequence.waitFor('test-notify-id').then(notified);
-      await nextTick();
+      await macroTask();
       expect(notified).to.not.have.been.called;
 
       sequence.notifyFinish('a-different-test-notify-id');
-      await nextTick();
+      await macroTask();
       expect(notified).to.not.have.been.called;
     });
   });
diff --git a/extensions/amp-story/1.0/test/test-full-bleed-animations.js b/extensions/amp-story/1.0/test/test-full-bleed-animations.js
index 619513f336e0..3435c2a9ccdf 100644
--- a/extensions/amp-story/1.0/test/test-full-bleed-animations.js
+++ b/extensions/amp-story/1.0/test/test-full-bleed-animations.js
@@ -2,16 +2,17 @@
  * @fileoverview Tests full-bleed animations like panning and zooming.
  */
 
+import {Services} from '#service';
+import {LocalizationService} from '#service/localization';
+
+import {registerServiceBuilder} from '../../../../src/service-helpers';
 import {AmpStory} from '../amp-story';
 import {AmpStoryStoreService} from '../amp-story-store-service';
-import {LocalizationService} from '#service/localization';
-import {Services} from '#service';
+import {presets} from '../animation-presets';
 import {
   calculateTargetScalingFactor,
   targetFitsWithinPage,
 } from '../animation-presets-utils';
-import {presets} from '../animation-presets';
-import {registerServiceBuilder} from '../../../../src/service-helpers';
 
 describes.realWin(
   'amp-story-full-bleed-animations',
@@ -51,6 +52,7 @@ describes.realWin(
       });
 
       storyEl = win.document.createElement('amp-story');
+      createPages(storyEl, 1, ['page-1']);
       win.document.body.appendChild(storyEl);
 
       AmpStory.isBrowserSupported = () => true;
@@ -113,7 +115,7 @@ describes.realWin(
       'Should add corresponding CSS class when a full bleed animation target is' +
         ' attached as a child of a grid layer with fill template.',
       async () => {
-        const pageEls = createPages(ampStory.element, 1, ['page-1']);
+        const pageEls = ampStory.element.querySelectorAll('amp-story-page');
         const pageImpl = await pageEls[0].getImpl();
 
         // Append an image animated with a full-bleed animation inside a grid-
@@ -136,7 +138,7 @@ describes.realWin(
         'animation is used BUT the target is a child of a grid layer with a ' +
         'template other than `fill`.',
       async () => {
-        const pageEls = createPages(ampStory.element, 1, ['page-1']);
+        const pageEls = ampStory.element.querySelectorAll('amp-story-page');
         const pageImpl = await pageEls[0].getImpl();
 
         // Append an image animated with a full-bleed animation inside a grid-
@@ -158,7 +160,7 @@ describes.realWin(
       'Should not add additional CSS class to the target when a non-full-bleed' +
         'animation is used.',
       async () => {
-        const pageEls = createPages(ampStory.element, 1, ['page-1']);
+        const pageEls = ampStory.element.querySelectorAll('amp-story-page');
         const pageImpl = await pageEls[0].getImpl();
 
         // Append an image animated with a non-full-bleed animation.
@@ -223,17 +225,17 @@ describes.realWin(
       const dimensions = setDimensions(380, 580, 360, 580);
       expect(targetFitsWithinPage(dimensions)).to.be.true;
 
-      const factorThatWillMakeTargetFitPage = 380 / 360;
+      const factorThatWillMakeTargetFitPage =
+        dimensions.pageWidth / dimensions.targetWidth;
       const factor = factorThatWillMakeTargetFitPage * 1.25;
       expect(calculateTargetScalingFactor(dimensions)).to.equal(factor);
 
-      const calculatedKeyframes = presets['pan-up'];
-      calculatedKeyframes.keyframes = calculatedKeyframes.keyframes(
+      const calculatedKeyframes = presets['pan-up'].keyframes(
         dimensions,
         /* options */ {}
       );
 
-      const offsetX = -dimensions.targetWidth / 2;
+      const offsetX = (dimensions.pageWidth - dimensions.targetWidth) / 2;
       const offsetY = dimensions.pageHeight - dimensions.targetHeight;
 
       const expectedKeyframes = [
@@ -247,7 +249,46 @@ describes.realWin(
         },
       ];
 
-      expect(calculatedKeyframes.keyframes).to.deep.equal(expectedKeyframes);
+      expect(calculatedKeyframes).to.deep.equal(expectedKeyframes);
+    });
+
+    ['pan-up', 'pan-down', 'pan-right', 'pan-left'].forEach((panAnimation) => {
+      it(`Should scale the target for ${panAnimation}.`, () => {
+        const dimensions = setDimensions(380, 580, 360, 580);
+        expect(targetFitsWithinPage(dimensions)).to.be.true;
+
+        const factorThatWillMakeTargetFitPage =
+          dimensions.pageWidth / dimensions.targetWidth;
+        const factor = factorThatWillMakeTargetFitPage * 1.25;
+        expect(calculateTargetScalingFactor(dimensions)).to.equal(factor);
+
+        const calculatedKeyframes = presets[panAnimation].keyframes(
+          dimensions,
+          /* options */ {}
+        );
+
+        const expectedScaleFactorStr = `scale(${factor})`;
+        calculatedKeyframes.forEach((keyframe) => {
+          expect(keyframe.transform).to.contain(expectedScaleFactorStr);
+        });
+      });
+
+      it(`Should not scale the target if scaling factor is set for ${panAnimation}.`, () => {
+        const scalingFactor = 2;
+
+        const dimensions = setDimensions(380, 580, 360, 580);
+        expect(targetFitsWithinPage(dimensions)).to.be.true;
+
+        const calculatedKeyframes = presets[panAnimation].keyframes(
+          dimensions,
+          /* options */ {'pan-scaling-factor': scalingFactor}
+        );
+
+        const expectedScaleFactorStr = `scale(${scalingFactor})`;
+        calculatedKeyframes.forEach((keyframe) => {
+          expect(keyframe.transform).to.contain(expectedScaleFactorStr);
+        });
+      });
     });
   }
 );
diff --git a/extensions/amp-story/1.0/test/test-history.js b/extensions/amp-story/1.0/test/test-history.js
index 3b5a0c814d36..62d28e7a9d04 100644
--- a/extensions/amp-story/1.0/test/test-history.js
+++ b/extensions/amp-story/1.0/test/test-history.js
@@ -1,7 +1,9 @@
-import {LOCAL_STORAGE_KEY, getHistoryState, setHistoryState} from '../history';
-import {loadPromise} from '#utils/event-helper';
 import {removeElement} from '#core/dom';
 
+import {loadPromise} from '#utils/event-helper';
+
+import {LOCAL_STORAGE_KEY, getHistoryState, setHistoryState} from '../history';
+
 describes.realWin('amp-story history', {}, (env) => {
   let clock;
   let iframes;
diff --git a/extensions/amp-story/1.0/test/test-live-story-manager.js b/extensions/amp-story/1.0/test/test-live-story-manager.js
index 2eac795418a7..1edfc14752d6 100644
--- a/extensions/amp-story/1.0/test/test-live-story-manager.js
+++ b/extensions/amp-story/1.0/test/test-live-story-manager.js
@@ -1,12 +1,15 @@
-import {Action} from '../amp-story-store-service';
+import {CommonSignals_Enum} from '#core/constants/common-signals';
+import {addAttributesToElement} from '#core/dom';
+
+import {Services} from '#service';
+import {AmpDocSingle} from '#service/ampdoc-impl';
+import {LocalizationService} from '#service/localization';
+
+import {registerServiceBuilder} from '../../../../src/service-helpers';
 import {AmpStory} from '../amp-story';
 import {AmpStoryPage} from '../amp-story-page';
-import {CommonSignals} from '#core/constants/common-signals';
+import {Action} from '../amp-story-store-service';
 import {LiveStoryManager} from '../live-story-manager';
-import {LocalizationService} from '#service/localization';
-import {Services} from '#service';
-import {addAttributesToElement} from '#core/dom';
-import {registerServiceBuilder} from '../../../../src/service-helpers';
 
 describes.realWin(
   'LiveStoryManager',
@@ -34,6 +37,7 @@ describes.realWin(
         .map((unused, i) => {
           const page = win.document.createElement('amp-story-page');
           page.id = opt_ids && opt_ids[i] ? opt_ids[i] : `-page-${i}`;
+          page.getAmpDoc = () => new AmpDocSingle(win);
           const storyPage = new AmpStoryPage(page);
           env.sandbox.stub(storyPage, 'mutateElement').callsFake((fn) => fn());
           container.appendChild(page);
@@ -60,6 +64,7 @@ describes.realWin(
       });
 
       storyEl = win.document.createElement('amp-story');
+      createPages(storyEl, 2, ['cover', 'page-1']);
       win.document.body.appendChild(storyEl);
       addAttributesToElement(storyEl, {
         'id': 'testStory',
@@ -76,25 +81,23 @@ describes.realWin(
     });
 
     it('should build a dynamic live-list', async () => {
-      createPages(ampStory.element, 2, ['cover', 'page-1']);
       ampStory.buildCallback();
       liveStoryManager = new LiveStoryManager(ampStory);
       liveStoryManager.build();
 
       await ampStory.layoutCallback();
-      await ampStory.element.signals().signal(CommonSignals.LOAD_END);
+      await ampStory.element.signals().signal(CommonSignals_Enum.LOAD_END);
       const liveListEl = ampStory.element.querySelector('amp-live-list');
       expect(liveListEl).to.exist;
     });
 
     it('live-list id should equal story id + dymanic-list combo', async () => {
-      createPages(ampStory.element, 2, ['cover', 'page-1']);
       ampStory.buildCallback();
       liveStoryManager = new LiveStoryManager(ampStory);
       liveStoryManager.build();
 
       await ampStory.layoutCallback();
-      await ampStory.element.signals().signal(CommonSignals.LOAD_END);
+      await ampStory.element.signals().signal(CommonSignals_Enum.LOAD_END);
       const liveListEl = ampStory.element.querySelector('amp-live-list');
       expect(liveListEl.id).to.equal(
         'i-amphtml-' + ampStory.element.id + '-dynamic-list'
@@ -102,7 +105,6 @@ describes.realWin(
     });
 
     it('should throw if no story id is set', () => {
-      createPages(ampStory.element, 2, ['cover', 'page-1']);
       ampStory.buildCallback();
       liveStoryManager = new LiveStoryManager(ampStory);
       ampStory.element.removeAttribute('id');
@@ -117,7 +119,6 @@ describes.realWin(
     });
 
     it('should append new page from server to client in update', async () => {
-      createPages(ampStory.element, 2, ['cover', 'page-1']);
       ampStory.buildCallback();
       expect(
         ampStory.element.querySelectorAll('amp-story-page').length
@@ -126,7 +127,7 @@ describes.realWin(
       liveStoryManager.build();
 
       await ampStory.layoutCallback();
-      await ampStory.element.signals().signal(CommonSignals.LOAD_END);
+      await ampStory.element.signals().signal(CommonSignals_Enum.LOAD_END);
       const dispatchSpy = env.sandbox.spy(ampStory.storeService_, 'dispatch');
 
       const newPage = win.document.createElement('amp-story-page');
diff --git a/extensions/amp-story/1.0/test/test-loading-spinner.js b/extensions/amp-story/1.0/test/test-loading-spinner.js
index 0ca9f1ae2588..1139b24d5401 100644
--- a/extensions/amp-story/1.0/test/test-loading-spinner.js
+++ b/extensions/amp-story/1.0/test/test-loading-spinner.js
@@ -1,28 +1,24 @@
-import {LoadingSpinner} from '../loading-spinner';
+import {renderLoadingSpinner, toggleLoadingSpinner} from '../loading-spinner';
 
 describes.realWin('loading-spinner', {}, () => {
-  let loadingSpinner;
+  let loadingSpinnerEl;
 
   beforeEach(() => {
-    loadingSpinner = new LoadingSpinner();
+    loadingSpinnerEl = renderLoadingSpinner();
   });
 
   it('should build the loading spinner', () => {
-    const loadingSpinnerEl = loadingSpinner.build();
     expect(loadingSpinnerEl.className).to.contain('i-amphtml-story-spinner');
   });
 
   it('should be hidden by default', () => {
-    const loadingSpinnerEl = loadingSpinner.build();
-
     expect(loadingSpinnerEl).not.to.have.attribute('active');
     expect(loadingSpinnerEl).to.have.attribute('aria-hidden');
     expect(loadingSpinnerEl.getAttribute('aria-hidden')).to.equal('true');
   });
 
   it('should toggle the loading spinner', () => {
-    const loadingSpinnerEl = loadingSpinner.build();
-    loadingSpinner.toggle(true);
+    toggleLoadingSpinner(loadingSpinnerEl, true);
 
     expect(loadingSpinnerEl).to.have.attribute('active');
     expect(loadingSpinnerEl).to.have.attribute('aria-hidden');
diff --git a/extensions/amp-story/1.0/test/test-media-performance-metrics-service.js b/extensions/amp-story/1.0/test/test-media-performance-metrics-service.js
index b8aeb328d981..17a9f107b087 100644
--- a/extensions/amp-story/1.0/test/test-media-performance-metrics-service.js
+++ b/extensions/amp-story/1.0/test/test-media-performance-metrics-service.js
@@ -1,7 +1,10 @@
 import * as fakeTimers from '@sinonjs/fake-timers';
+
+import {Services} from '#service';
+
 import {MEDIA_LOAD_FAILURE_SRC_PROPERTY} from '#utils/event-helper';
+
 import {MediaPerformanceMetricsService} from '../media-performance-metrics-service';
-import {Services} from '#service';
 
 describes.fakeWin('media-performance-metrics-service', {amp: true}, (env) => {
   let clock;
diff --git a/extensions/amp-story/1.0/test/test-media-pool.js b/extensions/amp-story/1.0/test/test-media-pool.js
index b3983dd37bcc..823cccc3cdf7 100644
--- a/extensions/amp-story/1.0/test/test-media-pool.js
+++ b/extensions/amp-story/1.0/test/test-media-pool.js
@@ -1,7 +1,9 @@
-import {MediaPool, MediaType} from '../media-pool';
-import {Services} from '#service';
 import {findIndex} from '#core/types/array';
 
+import {Services} from '#service';
+
+import {MediaPool, MediaType_Enum} from '../media-pool';
+
 const NOOP = () => {};
 
 describes.realWin('media-pool', {}, (env) => {
@@ -9,8 +11,8 @@ describes.realWin('media-pool', {}, (env) => {
   let mediaPool;
   let distanceFnStub;
   const COUNTS = {
-    [MediaType.AUDIO]: 2,
-    [MediaType.VIDEO]: 2,
+    [MediaType_Enum.AUDIO]: 2,
+    [MediaType_Enum.VIDEO]: 2,
   };
 
   beforeEach(() => {
diff --git a/extensions/amp-story/1.0/test/test-media-tasks.js b/extensions/amp-story/1.0/test/test-media-tasks.js
index c4f62f4ecf03..c089d06add34 100644
--- a/extensions/amp-story/1.0/test/test-media-tasks.js
+++ b/extensions/amp-story/1.0/test/test-media-tasks.js
@@ -1,3 +1,5 @@
+import {toArray} from '#core/types/array';
+
 import {
   LoadTask,
   MuteTask,
@@ -10,7 +12,6 @@ import {
   UpdateSourcesTask,
 } from '../media-tasks';
 import {Sources} from '../sources';
-import {toArray} from '#core/types/array';
 
 describes.realWin('media-tasks', {}, (env) => {
   let win;
@@ -257,8 +258,7 @@ describes.realWin('media-tasks', {}, (env) => {
   });
 
   describe('SwapOutOfDomTask', () => {
-    // TODO(newmuis): Get this test working.
-    it.skip('should replace element in DOM', async () => {
+    it('should replace element in DOM', async () => {
       const placeholderEl = document.createElement('video');
 
       const parent = document.createElement('div');
diff --git a/extensions/amp-story/1.0/test/test-page-advancement.js b/extensions/amp-story/1.0/test/test-page-advancement.js
index 29dbcbc7fd97..96d4374e76ac 100644
--- a/extensions/amp-story/1.0/test/test-page-advancement.js
+++ b/extensions/amp-story/1.0/test/test-page-advancement.js
@@ -1,11 +1,12 @@
+import {htmlFor} from '#core/dom/static-template';
+
+import {StateProperty} from '../amp-story-store-service';
 import {
   AdvancementConfig,
   ManualAdvancement,
   MediaBasedAdvancement,
   TimeBasedAdvancement,
 } from '../page-advancement';
-import {StateProperty} from '../amp-story-store-service';
-import {htmlFor} from '#core/dom/static-template';
 
 describes.realWin('page-advancement', {amp: true}, (env) => {
   let html;
@@ -75,6 +76,20 @@ describes.realWin('page-advancement', {amp: true}, (env) => {
         ).to.be.true;
         expect(!!advancement.timeoutId_).to.be.false;
       });
+
+      it('should handle click event on amp-story-subscriptions', async () => {
+        const storyEl = win.document.createElement('amp-story');
+        const pageEl = win.document.createElement('amp-story-page');
+        const subscriptionsEl = win.document.createElement(
+          'amp-story-subscriptions'
+        );
+        storyEl.appendChild(pageEl);
+        storyEl.appendChild(subscriptionsEl);
+        const advancement = new ManualAdvancement(win, storyEl);
+
+        expect(advancement.shouldHandleEvent_({target: subscriptionsEl})).to.be
+          .true;
+      });
     });
 
     describe('TimeBasedAdvancement', () => {
diff --git a/extensions/amp-story/1.0/test/test-request-utils.js b/extensions/amp-story/1.0/test/test-request-utils.js
new file mode 100644
index 000000000000..cd74c215c433
--- /dev/null
+++ b/extensions/amp-story/1.0/test/test-request-utils.js
@@ -0,0 +1,104 @@
+import {Services} from '#service';
+
+import {CONFIG_SRC_ATTRIBUTE_NAME, getElementConfig} from '../request-utils';
+
+describes.fakeWin('request-utils', {amp: true}, (env) => {
+  let storyElement;
+  let shareElement;
+  let xhrMock;
+
+  beforeEach(() => {
+    storyElement = env.win.document.createElement('div');
+    shareElement = env.win.document.createElement('amp-story-social-share');
+    storyElement.appendChild(shareElement);
+    env.win.document.body.appendChild(storyElement);
+    const xhr = Services.xhrFor(env.win);
+    xhrMock = env.sandbox.mock(xhr);
+  });
+
+  it('should not load the config if no src or inline is set', async () => {
+    xhrMock.expects('fetchJson').never();
+
+    const config = await getElementConfig(shareElement);
+
+    expect(JSON.stringify(config)).to.equal('{}');
+
+    xhrMock.verify();
+  });
+
+  it('should fall back to inline config if no src is set', async () => {
+    xhrMock.expects('fetchJson').never();
+
+    const configData = {'data': {'shareUrl': 'https://example.com'}};
+
+    shareElement.innerHTML = `
+    <script type="application/json">
+      ${JSON.stringify(configData)}
+    </script>
+    `;
+
+    const config = await getElementConfig(shareElement);
+
+    expect(JSON.stringify(config)).to.equal(JSON.stringify(configData));
+    xhrMock.verify();
+  });
+
+  it('should use the URL provided in the attribute to load the config', async () => {
+    const shareUrl = 'https://publisher.com/share';
+
+    shareElement.setAttribute(CONFIG_SRC_ATTRIBUTE_NAME, shareUrl);
+    xhrMock
+      .expects('fetchJson')
+      .withExactArgs(shareUrl, {})
+      .resolves({
+        ok: true,
+        json() {
+          return Promise.resolve();
+        },
+      })
+      .once();
+
+    await getElementConfig(shareElement);
+    xhrMock.verify();
+  });
+
+  it('should return the expected share config', async () => {
+    const shareUrl = 'https://publisher.com/share';
+    const fetchedConfig = 'amazingConfig';
+
+    shareElement.setAttribute(CONFIG_SRC_ATTRIBUTE_NAME, shareUrl);
+    xhrMock
+      .expects('fetchJson')
+      .resolves({
+        ok: true,
+        json() {
+          return Promise.resolve(fetchedConfig);
+        },
+      })
+      .once();
+
+    const config = await getElementConfig(shareElement);
+    expect(config).to.equal(fetchedConfig);
+    xhrMock.verify();
+  });
+
+  it('should return the social share config from the share element', async () => {
+    const shareUrl = 'https://publisher.com/share';
+    const fetchedConfig = 'amazingConfig';
+
+    shareElement.setAttribute(CONFIG_SRC_ATTRIBUTE_NAME, shareUrl);
+    xhrMock
+      .expects('fetchJson')
+      .resolves({
+        ok: true,
+        json() {
+          return Promise.resolve(fetchedConfig);
+        },
+      })
+      .once();
+
+    const config = await getElementConfig(shareElement);
+    expect(config).to.equal(fetchedConfig);
+    xhrMock.verify();
+  });
+});
diff --git a/extensions/amp-story/1.0/test/test-story-analytics.js b/extensions/amp-story/1.0/test/test-story-analytics.js
index 50de8cb438a7..0f87c14ff948 100644
--- a/extensions/amp-story/1.0/test/test-story-analytics.js
+++ b/extensions/amp-story/1.0/test/test-story-analytics.js
@@ -1,6 +1,9 @@
 import * as analytics from '#utils/analytics';
+
+import {getAmpdoc} from 'src/service-helpers';
+
 import {Action, getStoreService} from '../amp-story-store-service';
-import {StoryAnalyticsService} from '../story-analytics';
+import {getAnalyticsService} from '../story-analytics';
 
 describes.realWin('amp-story-analytics', {amp: true}, (env) => {
   let el;
@@ -9,11 +12,12 @@ describes.realWin('amp-story-analytics', {amp: true}, (env) => {
   beforeEach(() => {
     const {win} = env;
     el = win.document.createElement('amp-story');
+    win.document.body.appendChild(el);
     storeService = getStoreService(win);
-    new StoryAnalyticsService(env.win, el);
+    getAnalyticsService(win, el);
   });
 
-  it('sends story-page-visible on current page change', () => {
+  it('sends story-page-visible on current page change', async () => {
     const triggerAnalyticsStub = env.sandbox.stub(
       analytics,
       'triggerAnalyticsEvent'
@@ -22,6 +26,9 @@ describes.realWin('amp-story-analytics', {amp: true}, (env) => {
       id: 'page-1',
       index: 0,
     });
+
+    await getAmpdoc(env.win.document).whenFirstVisible();
+
     expect(triggerAnalyticsStub).to.have.been.calledOnceWithExactly(
       el,
       'story-page-visible',
@@ -42,7 +49,27 @@ describes.realWin('amp-story-analytics', {amp: true}, (env) => {
     expect(triggerAnalyticsStub).not.to.be.called;
   });
 
-  it('sends story-page-visible on content page after ad page', () => {
+  it('does not send story-page-visible before document becomes visible', async () => {
+    const triggerAnalyticsStub = env.sandbox.stub(
+      analytics,
+      'triggerAnalyticsEvent'
+    );
+    storeService.dispatch(Action.CHANGE_PAGE, {
+      id: 'page-1',
+      index: 0,
+    });
+    expect(triggerAnalyticsStub).not.to.be.called;
+
+    await getAmpdoc(env.win.document).whenFirstVisible();
+
+    expect(triggerAnalyticsStub).to.have.been.calledOnceWithExactly(
+      el,
+      'story-page-visible',
+      env.sandbox.match({storyPageIndex: 0, storyPageId: 'page-1'})
+    );
+  });
+
+  it('sends story-page-visible on content page after ad page', async () => {
     const triggerAnalyticsStub = env.sandbox.stub(
       analytics,
       'triggerAnalyticsEvent'
@@ -51,6 +78,9 @@ describes.realWin('amp-story-analytics', {amp: true}, (env) => {
       id: 'page-1',
       index: 0,
     });
+
+    await getAmpdoc(env.win.document).whenFirstVisible();
+
     expect(triggerAnalyticsStub).to.have.been.calledOnceWithExactly(
       el,
       'story-page-visible',
@@ -67,6 +97,9 @@ describes.realWin('amp-story-analytics', {amp: true}, (env) => {
       id: 'page-2',
       index: 2,
     });
+
+    await getAmpdoc(env.win.document).whenFirstVisible();
+
     expect(triggerAnalyticsStub).to.have.been.calledTwice;
     expect(triggerAnalyticsStub.secondCall).to.have.been.calledWithExactly(
       el,
diff --git a/extensions/amp-story/1.0/test/test-utils.js b/extensions/amp-story/1.0/test/test-utils.js
index 89e61d8cf5cc..30eb556f931e 100644
--- a/extensions/amp-story/1.0/test/test-utils.js
+++ b/extensions/amp-story/1.0/test/test-utils.js
@@ -1,5 +1,12 @@
+import {
+  UPGRADE_TO_CUSTOMELEMENT_PROMISE,
+  UPGRADE_TO_CUSTOMELEMENT_RESOLVER,
+} from '#core/dom/amp-element-helpers';
+import * as Preact from '#core/dom/jsx';
+
 import {StateProperty} from '../amp-story-store-service';
 import {
+  dependsOnStoryServices,
   getRGBFromCssColorValue,
   getTextColorForRGB,
   shouldShowStoryUrlInfo,
@@ -151,4 +158,41 @@ describes.fakeWin('amp-story utils', {}, (env) => {
       );
     });
   });
+
+  describe('dependsOnStoryServices', () => {
+    class Upgraded extends AMP.BaseElement {}
+
+    const Preupgrade = dependsOnStoryServices(Upgraded);
+
+    it('should upgrade immediately when not inside amp-story', () => {
+      const element = <div></div>;
+
+      const instance = new Preupgrade(element);
+      const upgraded = instance.upgradeCallback();
+
+      expect(upgraded instanceof Upgraded).to.be.true;
+      expect(upgraded.element).to.equal(element);
+    });
+
+    it('should upgrade after ancestor amp-story', async () => {
+      const element = <div></div>;
+      const story = <amp-story>{element}</amp-story>;
+
+      const instance = new Preupgrade(element);
+      const upgradedSpy = env.sandbox.spy((impl) => impl);
+      const upgradedPromise = instance.upgradeCallback().then(upgradedSpy);
+
+      expect(upgradedSpy).to.not.have.been.called;
+
+      story.getImpl = () => Promise.resolve();
+      story[UPGRADE_TO_CUSTOMELEMENT_RESOLVER](story);
+      delete story[UPGRADE_TO_CUSTOMELEMENT_RESOLVER];
+      delete story[UPGRADE_TO_CUSTOMELEMENT_PROMISE];
+
+      const upgraded = await upgradedPromise;
+
+      expect(upgraded instanceof Upgraded).to.be.true;
+      expect(upgraded.element).to.equal(element);
+    });
+  });
 });
diff --git a/extensions/amp-story/1.0/test/test-variable-service.js b/extensions/amp-story/1.0/test/test-variable-service.js
index d8a135c224c3..87e18fdb1d7b 100644
--- a/extensions/amp-story/1.0/test/test-variable-service.js
+++ b/extensions/amp-story/1.0/test/test-variable-service.js
@@ -53,4 +53,52 @@ describes.fakeWin('amp-story variable service', {}, (env) => {
     const variables = variableService.get();
     expect(variables['storyProgress']).to.equal(0);
   });
+
+  describe('with ads', () => {
+    it('should calculate correct pageIndex and pageId on change without regards to ads', () => {
+      storeService.dispatch(Action.SET_PAGE_IDS, [
+        'a',
+        'b',
+        'c',
+        'i-amphtml-ad-page-0',
+        'd',
+        'e',
+      ]);
+      storeService.dispatch(Action.CHANGE_PAGE, {
+        id: 'c',
+        index: 2,
+      });
+
+      const variablesBeforeAds = variableService.get();
+      expect(variablesBeforeAds['storyPageIndex']).to.equal(2);
+      expect(variablesBeforeAds['storyPageId']).to.equal('c');
+
+      storeService.dispatch(Action.CHANGE_PAGE, {
+        id: 'd',
+        index: 4,
+      });
+
+      const variablesAfterAds = variableService.get();
+      expect(variablesAfterAds['storyPageIndex']).to.equal(3);
+      expect(variablesAfterAds['storyPageId']).to.equal('d');
+    });
+
+    it('should calculate correct storyProgress correctly on change', () => {
+      storeService.dispatch(Action.SET_PAGE_IDS, [
+        'a',
+        'b',
+        'c',
+        'i-amphtml-ad-page-0',
+        'd',
+        'e',
+      ]);
+      storeService.dispatch(Action.CHANGE_PAGE, {
+        id: 'd',
+        index: 4,
+      });
+
+      const variables = variableService.get();
+      expect(variables['storyProgress']).to.equal(0.75);
+    });
+  });
 });
diff --git a/extensions/amp-story/1.0/test/validator-amp-story-amp-experiment-error.out b/extensions/amp-story/1.0/test/validator-amp-story-amp-experiment-error.out
index 56035dcce0f8..0fb1d171caa4 100644
--- a/extensions/amp-story/1.0/test/validator-amp-story-amp-experiment-error.out
+++ b/extensions/amp-story/1.0/test/validator-amp-story-amp-experiment-error.out
@@ -36,7 +36,7 @@ FAIL
 |          <!-- Invalid: bare script not allowed as a child of amp-story-grid-layer -->
 |          <script type="application/json">
 >>         ^~~~~~~~~
-amp-story/1.0/test/validator-amp-story-amp-experiment-error.html:36:8 Custom JavaScript is not allowed. (see https://amp.dev/documentation/guides-and-tutorials/learn/validation-workflow/validation_errors/#custom-javascript-is-not-allowed)
+amp-story/1.0/test/validator-amp-story-amp-experiment-error.html:36:8 The parent tag of tag 'amphtml engine script' is 'amp-story-grid-layer', but it can only be 'head'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#required-markup)
 |            {
 |              "background-color-test": {
 |                "variants": {
@@ -51,7 +51,7 @@ amp-story/1.0/test/validator-amp-story-amp-experiment-error.html:36:8 Custom Jav
 |        <!-- Invalid: amp-experiment not allowed as a child of amp-story-page -->
 |        <amp-experiment>
 >>       ^~~~~~~~~
-amp-story/1.0/test/validator-amp-story-amp-experiment-error.html:49:6 Tag 'amp-experiment' is disallowed as child of tag 'amp-story-page'. Child tag must be one of ['amp-analytics', 'amp-pixel', 'amp-story-animation', 'amp-story-auto-analytics', 'amp-story-cta-layer', 'amp-story-grid-layer', 'amp-story-page-attachment', 'amp-story-page-outlink']. (see https://amp.dev/documentation/components/amp-story)
+amp-story/1.0/test/validator-amp-story-amp-experiment-error.html:49:6 Tag 'amp-experiment' is disallowed as child of tag 'amp-story-page'. Child tag must be one of ['amp-analytics', 'amp-pixel', 'amp-social-share', 'amp-story-animation', 'amp-story-auto-analytics', 'amp-story-cta-layer', 'amp-story-grid-layer', 'amp-story-page-attachment', 'amp-story-page-outlink', 'amp-story-shopping-attachment']. (see https://amp.dev/documentation/components/amp-story)
 |            <script type="application/json">
 |              {
 |                "background-color-test": {
@@ -69,7 +69,7 @@ amp-story/1.0/test/validator-amp-story-amp-experiment-error.html:49:6 Tag 'amp-e
 |      <!-- Invalid: amp-experiment not allowed as a child of amp-story -->
 |      <amp-experiment>
 >>     ^~~~~~~~~
-amp-story/1.0/test/validator-amp-story-amp-experiment-error.html:65:4 Tag 'amp-experiment' is disallowed as child of tag 'amp-story'. Child tag must be one of ['amp-analytics', 'amp-consent', 'amp-geo', 'amp-pixel', 'amp-sidebar', 'amp-story-auto-ads', 'amp-story-auto-analytics', 'amp-story-bookend', 'amp-story-page', 'amp-story-social-share']. (see https://amp.dev/documentation/components/amp-story)
+amp-story/1.0/test/validator-amp-story-amp-experiment-error.html:65:4 Tag 'amp-experiment' is disallowed as child of tag 'amp-story'. Child tag must be one of ['amp-analytics', 'amp-consent', 'amp-geo', 'amp-pixel', 'amp-sidebar', 'amp-story-auto-ads', 'amp-story-auto-analytics', 'amp-story-bookend', 'amp-story-page', 'amp-story-social-share', 'amp-story-subscriptions']. (see https://amp.dev/documentation/components/amp-story)
 |          <script type="application/json">
 |            {
 |              "background-color-test": {
diff --git a/extensions/amp-story/1.0/test/validator-amp-story-amp-social-share.html b/extensions/amp-story/1.0/test/validator-amp-story-amp-social-share.html
new file mode 100644
index 000000000000..83d31be254f3
--- /dev/null
+++ b/extensions/amp-story/1.0/test/validator-amp-story-amp-social-share.html
@@ -0,0 +1,101 @@
+<!--
+  Test Description:
+  Tests for the amp-social-share component inside amp-story.
+-->
+<!doctype html>
+<html ⚡ lang="en">
+
+<head>
+  <meta charset="utf-8">
+  <script async src="https://cdn.ampproject.org/v0.js"></script>
+  <script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
+  <script async custom-element="amp-social-share" src="https://cdn.ampproject.org/v0/amp-social-share-0.1.js"></script>
+  <title>My Story</title>
+  <meta name="description" content="Get started with amp-story">
+  <link rel="canonical" href="validator-amp-social-share.html">
+  <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+  <style amp-boilerplate>
+    body {
+      -webkit-animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+      -moz-animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+      -ms-animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+      animation: -amp-start 8s steps(1, end) 0s 1 normal both
+    }
+
+    @-webkit-keyframes -amp-start {
+      from {
+        visibility: hidden
+      }
+
+      to {
+        visibility: visible
+      }
+    }
+
+    @-moz-keyframes -amp-start {
+      from {
+        visibility: hidden
+      }
+
+      to {
+        visibility: visible
+      }
+    }
+
+    @-ms-keyframes -amp-start {
+      from {
+        visibility: hidden
+      }
+
+      to {
+        visibility: visible
+      }
+    }
+
+    @-o-keyframes -amp-start {
+      from {
+        visibility: hidden
+      }
+
+      to {
+        visibility: visible
+      }
+    }
+
+    @keyframes -amp-start {
+      from {
+        visibility: hidden
+      }
+
+      to {
+        visibility: visible
+      }
+    }
+  </style><noscript>
+    <style amp-boilerplate>
+      body {
+        -webkit-animation: none;
+        -moz-animation: none;
+        -ms-animation: none;
+        animation: none
+      }
+    </style>
+  </noscript>
+</head>
+
+<body>
+  <amp-story standalone title="My Story" publisher="Me" publisher-logo-src="http://me.com/logo.png"
+    poster-portrait-src="http://me.com/poster.jpg">
+    <amp-story-page id="fill-template-title">
+      <amp-social-share
+        class="i-amphtml-layout-fixed i-amphtml-layout-size-defined amp-social-share-system i-amphtml-built i-amphtml-layout i-amphtml-element"
+        aria-label="Share" type="system" width="48" height="48" i-amphtml-layout="fixed"
+        style="width: 48px; height: 48px;" role="button" tabindex="0"></amp-social-share>
+        <amp-story-grid-layer template="vertical">
+          <p>Content</p>
+        </amp-story-grid-layer>
+    </amp-story-page>
+  </amp-story>
+</body>
+
+</html>
diff --git a/extensions/amp-story/1.0/test/validator-amp-story-amp-social-share.out b/extensions/amp-story/1.0/test/validator-amp-story-amp-social-share.out
new file mode 100644
index 000000000000..7c0017d7a50d
--- /dev/null
+++ b/extensions/amp-story/1.0/test/validator-amp-story-amp-social-share.out
@@ -0,0 +1,106 @@
+FAIL
+|  <!--
+|    Test Description:
+|    Tests for the amp-social-share component inside amp-story.
+|  -->
+|  <!doctype html>
+|  <html ⚡ lang="en">
+|
+|  <head>
+|    <meta charset="utf-8">
+|    <script async src="https://cdn.ampproject.org/v0.js"></script>
+|    <script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
+|    <script async custom-element="amp-social-share" src="https://cdn.ampproject.org/v0/amp-social-share-0.1.js"></script>
+|    <title>My Story</title>
+|    <meta name="description" content="Get started with amp-story">
+|    <link rel="canonical" href="validator-amp-social-share.html">
+|    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+|    <style amp-boilerplate>
+|      body {
+|        -webkit-animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+|        -moz-animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+|        -ms-animation: -amp-start 8s steps(1, end) 0s 1 normal both;
+|        animation: -amp-start 8s steps(1, end) 0s 1 normal both
+|      }
+|
+|      @-webkit-keyframes -amp-start {
+|        from {
+|          visibility: hidden
+|        }
+|
+|        to {
+|          visibility: visible
+|        }
+|      }
+|
+|      @-moz-keyframes -amp-start {
+|        from {
+|          visibility: hidden
+|        }
+|
+|        to {
+|          visibility: visible
+|        }
+|      }
+|
+|      @-ms-keyframes -amp-start {
+|        from {
+|          visibility: hidden
+|        }
+|
+|        to {
+|          visibility: visible
+|        }
+|      }
+|
+|      @-o-keyframes -amp-start {
+|        from {
+|          visibility: hidden
+|        }
+|
+|        to {
+|          visibility: visible
+|        }
+|      }
+|
+|      @keyframes -amp-start {
+|        from {
+|          visibility: hidden
+|        }
+|
+|        to {
+|          visibility: visible
+|        }
+|      }
+|    </style><noscript>
+|      <style amp-boilerplate>
+|        body {
+|          -webkit-animation: none;
+|          -moz-animation: none;
+|          -ms-animation: none;
+|          animation: none
+|        }
+|      </style>
+|    </noscript>
+|  </head>
+|
+|  <body>
+|    <amp-story standalone title="My Story" publisher="Me" publisher-logo-src="http://me.com/logo.png"
+|      poster-portrait-src="http://me.com/poster.jpg">
+|      <amp-story-page id="fill-template-title">
+|        <amp-social-share
+>>       ^~~~~~~~~
+amp-story/1.0/test/validator-amp-story-amp-social-share.html:90:6 The attribute 'class' in tag 'amp-social-share' is set to the invalid value 'i-amphtml-layout-fixed i-amphtml-layout-size-defined amp-social-share-system i-amphtml-built i-amphtml-layout i-amphtml-element'. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/#disallowed-styles)
+>>       ^~~~~~~~~
+amp-story/1.0/test/validator-amp-story-amp-social-share.html:90:6 The attribute 'i-amphtml-layout' may not appear in tag 'amp-social-share'. (see https://amp.dev/documentation/components/amp-social-share)
+|          class="i-amphtml-layout-fixed i-amphtml-layout-size-defined amp-social-share-system i-amphtml-built i-amphtml-layout i-amphtml-element"
+|          aria-label="Share" type="system" width="48" height="48" i-amphtml-layout="fixed"
+|          style="width: 48px; height: 48px;" role="button" tabindex="0"></amp-social-share>
+|          <amp-story-grid-layer template="vertical">
+|            <p>Content</p>
+|          </amp-story-grid-layer>
+|      </amp-story-page>
+|    </amp-story>
+|  </body>
+|
+|  </html>
\ No newline at end of file
diff --git a/extensions/amp-story/1.0/test/validator-amp-story-amp-twitter-error.out b/extensions/amp-story/1.0/test/validator-amp-story-amp-twitter-error.out
index c891aaad71cc..4e49db11faa6 100644
--- a/extensions/amp-story/1.0/test/validator-amp-story-amp-twitter-error.out
+++ b/extensions/amp-story/1.0/test/validator-amp-story-amp-twitter-error.out
@@ -24,7 +24,7 @@ FAIL
 |        <!-- Invalid: is not a descendant of amp-story-grid-layer. -->
 |        <amp-twitter width="375"
 >>       ^~~~~~~~~
-amp-story/1.0/test/validator-amp-story-amp-twitter-error.html:24:6 Tag 'amp-twitter' is disallowed as child of tag 'amp-story-page'. Child tag must be one of ['amp-analytics', 'amp-pixel', 'amp-story-animation', 'amp-story-auto-analytics', 'amp-story-cta-layer', 'amp-story-grid-layer', 'amp-story-page-attachment', 'amp-story-page-outlink']. (see https://amp.dev/documentation/components/amp-story)
+amp-story/1.0/test/validator-amp-story-amp-twitter-error.html:24:6 Tag 'amp-twitter' is disallowed as child of tag 'amp-story-page'. Child tag must be one of ['amp-analytics', 'amp-pixel', 'amp-social-share', 'amp-story-animation', 'amp-story-auto-analytics', 'amp-story-cta-layer', 'amp-story-grid-layer', 'amp-story-page-attachment', 'amp-story-page-outlink', 'amp-story-shopping-attachment']. (see https://amp.dev/documentation/components/amp-story)
 >>       ^~~~~~~~~
 amp-story/1.0/test/validator-amp-story-amp-twitter-error.html:24:6 The tag 'amp-twitter' requires including the 'amp-twitter' extension JavaScript. (see https://amp.dev/documentation/components/amp-twitter)
 |          height="472"
diff --git a/extensions/amp-story/1.0/test/validator-amp-story-animations.html b/extensions/amp-story/1.0/test/validator-amp-story-animations.html
index f7ce82c57092..82a83a060d84 100644
--- a/extensions/amp-story/1.0/test/validator-amp-story-animations.html
+++ b/extensions/amp-story/1.0/test/validator-amp-story-animations.html
@@ -37,6 +37,7 @@ <h1>ken-burns-effect</h1>
                src="https://picsum.photos/1024/768?image=1077"
                animate-in="pan-left"
                animate-in-duration="30s"
+               pan-scaling-factor=".9"
                layout="fixed"
                width="1024"
                height="768">
diff --git a/extensions/amp-story/1.0/test/validator-amp-story-animations.out b/extensions/amp-story/1.0/test/validator-amp-story-animations.out
index bdc02b9f8c25..1a2552c78fbd 100644
--- a/extensions/amp-story/1.0/test/validator-amp-story-animations.out
+++ b/extensions/amp-story/1.0/test/validator-amp-story-animations.out
@@ -38,6 +38,7 @@ PASS
 |                 src="https://picsum.photos/1024/768?image=1077"
 |                 animate-in="pan-left"
 |                 animate-in-duration="30s"
+|                 pan-scaling-factor=".9"
 |                 layout="fixed"
 |                 width="1024"
 |                 height="768">
diff --git a/extensions/amp-story/1.0/test/validator-amp-story-cta-layer-error.out b/extensions/amp-story/1.0/test/validator-amp-story-cta-layer-error.out
index 02822c700af5..c684608db846 100644
--- a/extensions/amp-story/1.0/test/validator-amp-story-cta-layer-error.out
+++ b/extensions/amp-story/1.0/test/validator-amp-story-cta-layer-error.out
@@ -60,9 +60,9 @@ amp-story/1.0/test/validator-amp-story-cta-layer-error.html:48:6 The attribute '
 >>     ^~~~~~~~~
 amp-story/1.0/test/validator-amp-story-cta-layer-error.html:52:4 The tag 'amp-story-cta-layer' may only appear as a descendant of tag 'amp-story-page'.
 >>     ^~~~~~~~~
-amp-story/1.0/test/validator-amp-story-cta-layer-error.html:52:4 Tag 'amp-story-cta-layer' is disallowed as child of tag 'amp-story'. Child tag must be one of ['amp-analytics', 'amp-consent', 'amp-geo', 'amp-pixel', 'amp-sidebar', 'amp-story-auto-ads', 'amp-story-auto-analytics', 'amp-story-bookend', 'amp-story-page', 'amp-story-social-share']. (see https://amp.dev/documentation/components/amp-story)
+amp-story/1.0/test/validator-amp-story-cta-layer-error.html:52:4 Tag 'amp-story-cta-layer' is disallowed as child of tag 'amp-story'. Child tag must be one of ['amp-analytics', 'amp-consent', 'amp-geo', 'amp-pixel', 'amp-sidebar', 'amp-story-auto-ads', 'amp-story-auto-analytics', 'amp-story-bookend', 'amp-story-page', 'amp-story-social-share', 'amp-story-subscriptions']. (see https://amp.dev/documentation/components/amp-story)
 |        <a href="http://www.google.com" class="button"> Illegal CTA layer outside of amp-story-page! </a>
 |      </amp-story-cta-layer>
 |    </amp-story>
 |  </body>
-|  </html>
+|  </html>
\ No newline at end of file
diff --git a/extensions/amp-story/1.0/test/validator-amp-story-custom-desktop-aspect-ratio.html b/extensions/amp-story/1.0/test/validator-amp-story-custom-desktop-aspect-ratio.html
new file mode 100644
index 000000000000..589b879568c4
--- /dev/null
+++ b/extensions/amp-story/1.0/test/validator-amp-story-custom-desktop-aspect-ratio.html
@@ -0,0 +1,38 @@
+<!doctype html>
+<html amp lang="en">
+  <head>
+    <meta charset="utf-8">
+    <script async src="https://cdn.ampproject.org/v0.js"></script>
+    <script async custom-element="amp-story"
+        src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
+    <title>amp-story-grid-layer[template="fill"] visual diff</title>
+    <meta name="viewport"
+          content="width=device-width,minimum-scale=1,initial-scale=1">
+    <link rel="canonical" href="./template-vertical.html">
+    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+    <style amp-custom>
+      amp-story-page {
+        background: yellow;
+      }
+    </style>
+  </head>
+
+  <body>
+    <amp-story standalone publisher="AMP Team" title="Visual Diff Test"
+        publisher-logo-src="/examples/visual-tests/photos/120.png"
+        poster-portrait-src="/examples/visual-tests/picsum.photos/image981_900x1600.jpg"
+        poster-landscape-src="/examples/visual-tests/picsum.photos/image981_1600x900.jpg"
+        poster-square-src="/examples/visual-tests/picsum.photos/image981_1600x1600.jpg"
+        desktop-aspect-ratio="1:1">
+
+      <amp-story-page id="cover">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="/examples/visual-tests/picsum.photos/image981_1600x900.jpg">
+          </amp-img>
+        </amp-story-grid-layer>
+      </amp-story-page>
+
+    </amp-story>
+  </body>
+
+</html>
diff --git a/extensions/amp-story/1.0/test/validator-amp-story-custom-desktop-aspect-ratio.out b/extensions/amp-story/1.0/test/validator-amp-story-custom-desktop-aspect-ratio.out
new file mode 100644
index 000000000000..a5465c762ae1
--- /dev/null
+++ b/extensions/amp-story/1.0/test/validator-amp-story-custom-desktop-aspect-ratio.out
@@ -0,0 +1,39 @@
+PASS
+|  <!doctype html>
+|  <html amp lang="en">
+|    <head>
+|      <meta charset="utf-8">
+|      <script async src="https://cdn.ampproject.org/v0.js"></script>
+|      <script async custom-element="amp-story"
+|          src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
+|      <title>amp-story-grid-layer[template="fill"] visual diff</title>
+|      <meta name="viewport"
+|            content="width=device-width,minimum-scale=1,initial-scale=1">
+|      <link rel="canonical" href="./template-vertical.html">
+|      <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+|      <style amp-custom>
+|        amp-story-page {
+|          background: yellow;
+|        }
+|      </style>
+|    </head>
+|
+|    <body>
+|      <amp-story standalone publisher="AMP Team" title="Visual Diff Test"
+|          publisher-logo-src="/examples/visual-tests/photos/120.png"
+|          poster-portrait-src="/examples/visual-tests/picsum.photos/image981_900x1600.jpg"
+|          poster-landscape-src="/examples/visual-tests/picsum.photos/image981_1600x900.jpg"
+|          poster-square-src="/examples/visual-tests/picsum.photos/image981_1600x1600.jpg"
+|          desktop-aspect-ratio="1:1">
+|
+|        <amp-story-page id="cover">
+|          <amp-story-grid-layer template="fill">
+|            <amp-img layout="fill" src="/examples/visual-tests/picsum.photos/image981_1600x900.jpg">
+|            </amp-img>
+|          </amp-story-grid-layer>
+|        </amp-story-page>
+|
+|      </amp-story>
+|    </body>
+|
+|  </html>
\ No newline at end of file
diff --git a/extensions/amp-story/1.0/test/validator-amp-story-form-error.out b/extensions/amp-story/1.0/test/validator-amp-story-form-error.out
index 9fc4895aa4d9..b1a483aa1858 100644
--- a/extensions/amp-story/1.0/test/validator-amp-story-form-error.out
+++ b/extensions/amp-story/1.0/test/validator-amp-story-form-error.out
@@ -55,7 +55,7 @@ amp-story/1.0/test/validator-amp-story-form-error.html:42:10 The attribute 'form
 |            <!-- Image input types are not allowed. -->
 |            <input type="image">
 >>           ^~~~~~~~~
-amp-story/1.0/test/validator-amp-story-form-error.html:45:10 The attribute 'type' in tag 'input' is set to the invalid value 'image'. (see https://amp.dev/documentation/components/amp-form/)
+amp-story/1.0/test/validator-amp-story-form-error.html:45:10 The tag 'input' may only appear as a descendant of tag 'form [method=post]'. (see https://amp.dev/documentation/components/amp-form/)
 |
 |            <!-- Password input types are only allowed when the form element's method is POST. -->
 |            <input type="password">
diff --git a/extensions/amp-story/1.0/test/validator-amp-story-reference-point.html b/extensions/amp-story/1.0/test/validator-amp-story-reference-point.html
deleted file mode 100644
index b16d945770de..000000000000
--- a/extensions/amp-story/1.0/test/validator-amp-story-reference-point.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-  Test Description:
-  Tests for the amp-story tag.
--->
-<!doctype html>
-<html ⚡ lang="en">
-<head>
-  <meta charset="utf-8">
-  <title>STAMP examples</title>
-  <link rel="canonical" href="http://nonblocking.io/" >
-  <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
-  <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
-  <script async src="https://cdn.ampproject.org/v0.js"></script>
-  <script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
-</head>
-<body>
-  <amp-story standalone title="My Story" publisher="Me" publisher-logo-src="http://me.com/logo.png" poster-portrait-src="http://me.com/poster.jpg" background-audio="path/to/my.mp3">
-    <amp-story-page id="1" background-audio="path/to/my.mp3" auto-advance-after="any-value">
-      <amp-story-grid-layer template="horizontal">
-        <img class="footer-logo" src="img/foot-logo.svg" width="40" height="40" /> <!-- The real error here is that <img/> tag is not allowed. But this is a weird use case where the validator error will comment about reference points. This needs to be fixed in the near future. -->
-      </amp-story-grid-layer>
-    </amp-story-page>
-  </amp-story>
-</body>
-</html>
diff --git a/extensions/amp-story/1.0/test/validator-amp-story-reference-point.out b/extensions/amp-story/1.0/test/validator-amp-story-reference-point.out
deleted file mode 100644
index 706a65df62d9..000000000000
--- a/extensions/amp-story/1.0/test/validator-amp-story-reference-point.out
+++ /dev/null
@@ -1,28 +0,0 @@
-FAIL
-|  <!--
-|    Test Description:
-|    Tests for the amp-story tag.
-|  -->
-|  <!doctype html>
-|  <html ⚡ lang="en">
-|  <head>
-|    <meta charset="utf-8">
-|    <title>STAMP examples</title>
-|    <link rel="canonical" href="http://nonblocking.io/" >
-|    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
-|    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
-|    <script async src="https://cdn.ampproject.org/v0.js"></script>
-|    <script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
-|  </head>
-|  <body>
-|    <amp-story standalone title="My Story" publisher="Me" publisher-logo-src="http://me.com/logo.png" poster-portrait-src="http://me.com/poster.jpg" background-audio="path/to/my.mp3">
-|      <amp-story-page id="1" background-audio="path/to/my.mp3" auto-advance-after="any-value">
-|        <amp-story-grid-layer template="horizontal">
-|          <img class="footer-logo" src="img/foot-logo.svg" width="40" height="40" /> <!-- The real error here is that <img/> tag is not allowed. But this is a weird use case where the validator error will comment about reference points. This needs to be fixed in the near future. -->
->>         ^~~~~~~~~
-amp-story/1.0/test/validator-amp-story-reference-point.html:20:8 The tag 'img' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-img'? (see https://amp.dev/documentation/components/amp-img/)
-|        </amp-story-grid-layer>
-|      </amp-story-page>
-|    </amp-story>
-|  </body>
-|  </html>
diff --git a/extensions/amp-story/1.0/test/validator-amp-story-video-error.html b/extensions/amp-story/1.0/test/validator-amp-story-video-error.html
index a13b0cf6980c..65a5c70c49f5 100644
--- a/extensions/amp-story/1.0/test/validator-amp-story-video-error.html
+++ b/extensions/amp-story/1.0/test/validator-amp-story-video-error.html
@@ -34,13 +34,13 @@
     </amp-story-page>
     <amp-story-page id="2" background-audio="path/to/my.mp3" auto-advance-after="any-value">
       <amp-story-grid-layer template="horizontal">
-        <!-- This should fail because amp-video volume should be within [0.1, 1]. -->
+        <!-- This should fail because amp-video volume should be within [0, 1]. -->
         <amp-video width="480"
                    height="270"
                    poster="/foo.jpg"
                    src="/video/tokyo.mp4"
                    layout="responsive"
-                   volume="0">
+                   volume="-1">
              <div fallback>
                <p>Your browser doesn't support HTML5 video.</p>
              </div>
@@ -51,7 +51,7 @@
     </amp-story-page>
     <amp-story-page id="3" background-audio="path/to/my.mp3" auto-advance-after="any-value">
       <amp-story-grid-layer template="horizontal">
-        <!-- This should fail because amp-video volume should be within [0.1, 1]. -->
+        <!-- This should fail because amp-video volume should be within [0, 1]. -->
         <amp-video width="480"
                    height="270"
                    poster="/foo.jpg"
@@ -66,6 +66,40 @@
          </amp-video>
       </amp-story-grid-layer>
     </amp-story-page>
+    <amp-story-page id="4" background-audio="path/to/my.mp3" auto-advance-after="any-value">
+      <amp-story-grid-layer template="horizontal">
+        <!-- This should not fail because amp-video volume is within [0, 1]. -->
+        <amp-video width="480"
+                   height="270"
+                   poster="/foo.jpg"
+                   src="/video/tokyo.mp4"
+                   layout="responsive"
+                   volume="0.42">
+             <div fallback>
+               <p>Your browser doesn't support HTML5 video.</p>
+             </div>
+             <source type="video/mp4" src="/video/tokyo.mp4">
+             <source type="video/webm" src="/video/tokyo.webm">
+         </amp-video>
+      </amp-story-grid-layer>
+    </amp-story-page>
+    <amp-story-page id="5" background-audio="path/to/my.mp3" auto-advance-after="any-value">
+      <amp-story-grid-layer template="horizontal">
+        <!-- This should not fail because amp-video volume is within [0, 1]. -->
+        <amp-video width="480"
+                   height="270"
+                   poster="/foo.jpg"
+                   src="/video/tokyo.mp4"
+                   layout="responsive"
+                   volume="0">
+             <div fallback>
+               <p>Your browser doesn't support HTML5 video.</p>
+             </div>
+             <source type="video/mp4" src="/video/tokyo.mp4">
+             <source type="video/webm" src="/video/tokyo.webm">
+         </amp-video>
+      </amp-story-grid-layer>
+    </amp-story-page>
   </amp-story>
 </body>
 </html>
diff --git a/extensions/amp-story/1.0/test/validator-amp-story-video-error.out b/extensions/amp-story/1.0/test/validator-amp-story-video-error.out
index 473a3a32d02e..1f179dda688c 100644
--- a/extensions/amp-story/1.0/test/validator-amp-story-video-error.out
+++ b/extensions/amp-story/1.0/test/validator-amp-story-video-error.out
@@ -39,15 +39,15 @@ amp-story/1.0/test/validator-amp-story-video-error.html:23:8 The mandatory attri
 |      </amp-story-page>
 |      <amp-story-page id="2" background-audio="path/to/my.mp3" auto-advance-after="any-value">
 |        <amp-story-grid-layer template="horizontal">
-|          <!-- This should fail because amp-video volume should be within [0.1, 1]. -->
+|          <!-- This should fail because amp-video volume should be within [0, 1]. -->
 |          <amp-video width="480"
 >>         ^~~~~~~~~
-amp-story/1.0/test/validator-amp-story-video-error.html:38:8 The attribute 'volume' in tag 'amp-video' is set to the invalid value '0'. (see https://amp.dev/documentation/components/amp-video/)
+amp-story/1.0/test/validator-amp-story-video-error.html:38:8 The attribute 'volume' in tag 'amp-video' is set to the invalid value '-1'. (see https://amp.dev/documentation/components/amp-video/)
 |                     height="270"
 |                     poster="/foo.jpg"
 |                     src="/video/tokyo.mp4"
 |                     layout="responsive"
-|                     volume="0">
+|                     volume="-1">
 |               <div fallback>
 |                 <p>Your browser doesn't support HTML5 video.</p>
 |               </div>
@@ -58,7 +58,7 @@ amp-story/1.0/test/validator-amp-story-video-error.html:38:8 The attribute 'volu
 |      </amp-story-page>
 |      <amp-story-page id="3" background-audio="path/to/my.mp3" auto-advance-after="any-value">
 |        <amp-story-grid-layer template="horizontal">
-|          <!-- This should fail because amp-video volume should be within [0.1, 1]. -->
+|          <!-- This should fail because amp-video volume should be within [0, 1]. -->
 |          <amp-video width="480"
 >>         ^~~~~~~~~
 amp-story/1.0/test/validator-amp-story-video-error.html:55:8 The attribute 'volume' in tag 'amp-video' is set to the invalid value '1.01'. (see https://amp.dev/documentation/components/amp-video/)
@@ -75,6 +75,44 @@ amp-story/1.0/test/validator-amp-story-video-error.html:55:8 The attribute 'volu
 |           </amp-video>
 |        </amp-story-grid-layer>
 |      </amp-story-page>
+|      <amp-story-page id="4" background-audio="path/to/my.mp3" auto-advance-after="any-value">
+|        <amp-story-grid-layer template="horizontal">
+|          <!-- This should not fail because amp-video volume is within [0, 1]. -->
+|          <amp-video width="480"
+>>         ^~~~~~~~~
+amp-story/1.0/test/validator-amp-story-video-error.html:72:8 The mandatory attribute 'autoplay' is missing in tag 'amp-video'. (see https://amp.dev/documentation/components/amp-video/)
+|                     height="270"
+|                     poster="/foo.jpg"
+|                     src="/video/tokyo.mp4"
+|                     layout="responsive"
+|                     volume="0.42">
+|               <div fallback>
+|                 <p>Your browser doesn't support HTML5 video.</p>
+|               </div>
+|               <source type="video/mp4" src="/video/tokyo.mp4">
+|               <source type="video/webm" src="/video/tokyo.webm">
+|           </amp-video>
+|        </amp-story-grid-layer>
+|      </amp-story-page>
+|      <amp-story-page id="5" background-audio="path/to/my.mp3" auto-advance-after="any-value">
+|        <amp-story-grid-layer template="horizontal">
+|          <!-- This should not fail because amp-video volume is within [0, 1]. -->
+|          <amp-video width="480"
+>>         ^~~~~~~~~
+amp-story/1.0/test/validator-amp-story-video-error.html:89:8 The mandatory attribute 'autoplay' is missing in tag 'amp-video'. (see https://amp.dev/documentation/components/amp-video/)
+|                     height="270"
+|                     poster="/foo.jpg"
+|                     src="/video/tokyo.mp4"
+|                     layout="responsive"
+|                     volume="0">
+|               <div fallback>
+|                 <p>Your browser doesn't support HTML5 video.</p>
+|               </div>
+|               <source type="video/mp4" src="/video/tokyo.mp4">
+|               <source type="video/webm" src="/video/tokyo.webm">
+|           </amp-video>
+|        </amp-story-grid-layer>
+|      </amp-story-page>
 |    </amp-story>
 |  </body>
 |  </html>
\ No newline at end of file
diff --git a/extensions/amp-story/1.0/toast.js b/extensions/amp-story/1.0/toast.js
index f3a1f7e3aa21..1bef304aded8 100644
--- a/extensions/amp-story/1.0/toast.js
+++ b/extensions/amp-story/1.0/toast.js
@@ -1,10 +1,8 @@
-import * as Preact from '#core/dom/jsx';
-import {Services} from '#service';
 import {removeElement} from '#core/dom';
+import * as Preact from '#core/dom/jsx';
 import {getWin} from '#core/window';
 
-/** @private @const {string} */
-const TOAST_CLASSNAME = 'i-amphtml-story-toast';
+import {Services} from '#service';
 
 /**
  * The 'alert' role assertively announces toast content to screen readers.
@@ -31,7 +29,7 @@ export class Toast {
     const win = getWin(storyEl);
 
     const toast = (
-      <div class={TOAST_CLASSNAME} role={TOAST_ROLE}>
+      <div class="i-amphtml-story-toast" role={TOAST_ROLE}>
         {childNodeOrText}
       </div>
     );
diff --git a/extensions/amp-story/1.0/utils.js b/extensions/amp-story/1.0/utils.js
index a12620f188f7..eb6163868d94 100644
--- a/extensions/amp-story/1.0/utils.js
+++ b/extensions/amp-story/1.0/utils.js
@@ -1,20 +1,18 @@
-import {Services} from '#service';
-import {StateProperty} from './amp-story-store-service';
-import {
-  assertHttpsUrl,
-  getSourceOrigin,
-  isProxyOrigin,
-  resolveRelativeUrl,
-} from '../../../src/url';
+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 import {
   closestAncestorElementBySelector,
   scopedQuerySelectorAll,
 } from '#core/dom/query';
-import {createShadowRoot} from '../../../src/shadow-embed';
+import {setStyle, toggle} from '#core/dom/style';
+
+import {Services} from '#service';
+
 import {dev, user, userAssert} from '#utils/log';
-import {getMode} from '../../../src/mode';
 
-import {setStyle, toggle} from '#core/dom/style';
+import {StateProperty} from './amp-story-store-service';
+
+import {getMode} from '../../../src/mode';
+import {createShadowRoot} from '../../../src/shadow-embed';
 
 /**
  * Returns millis as number if given a string(e.g. 1s, 200ms etc)
@@ -84,6 +82,7 @@ export function ampMediaElementFor(el) {
  * @param  {!Element} container
  * @param  {!Element} element
  * @param  {string} css
+ * @return {!Element}
  */
 export function createShadowRootWithStyle(container, element, css) {
   const style = self.document.createElement('style');
@@ -95,6 +94,7 @@ export function createShadowRootWithStyle(container, element, css) {
 
   containerToUse.appendChild(style);
   containerToUse.appendChild(element);
+  return container;
 }
 
 /**
@@ -103,7 +103,7 @@ export function createShadowRootWithStyle(container, element, css) {
  * `getComputedStyle`.
  * Returns an object containing the R, G, and B 8bit numbers.
  * @param  {string} cssValue
- * @return {!Object<string, number>}
+ * @return {!{[key: string]: number}}
  */
 export function getRGBFromCssColorValue(cssValue) {
   const regexPattern = /rgba?\((\d{1,3}), (\d{1,3}), (\d{1,3})/;
@@ -131,7 +131,7 @@ export function getRGBFromCssColorValue(cssValue) {
 /**
  * Returns the color, either black or white, that has the best contrast ratio
  * against the provided RGB 8bit values.
- * @param  {!Object<string, number>} rgb  ie: {r: 0, g: 0, b: 0}
+ * @param  {!{[key: string]: number}} rgb  ie: {r: 0, g: 0, b: 0}
  * @return {string} '#fff' or '#000'
  */
 export function getTextColorForRGB(rgb) {
@@ -205,33 +205,15 @@ export function userAssertValidProtocol(element, url) {
  * @return {string}
  */
 export function getSourceOriginForElement(element, url) {
-  let domainName;
-
+  const urlService = Services.urlForDoc(element);
+  let parsed;
   try {
-    domainName = getSourceOrigin(Services.urlForDoc(element).parse(url));
-    // Remove protocol prefix.
-    domainName = Services.urlForDoc(element).parse(domainName).hostname;
-  } catch (e) {
+    parsed = urlService.parse(urlService.getSourceOrigin(url));
+  } catch (_) {
     // Unknown path prefix in url.
-    domainName = Services.urlForDoc(element).parse(url).hostname;
-  }
-  return domainName;
-}
-
-/**
- * Resolves an image url and optimizes it if served from the cache.
- * @param {!Window} win
- * @param {string} url
- * @return {string}
- */
-export function resolveImgSrc(win, url) {
-  let urlSrc = resolveRelativeUrl(url, win.location);
-  if (isProxyOrigin(win.location.href)) {
-    // TODO(Enriqe): add extra params for resized image, for example:
-    // (/ii/w${width}/s)
-    urlSrc = urlSrc.replace('/c/s/', '/i/s/');
+    parsed = urlService.parse(url);
   }
-  return urlSrc;
+  return parsed.hostname;
 }
 
 /**
@@ -255,19 +237,21 @@ export function shouldShowStoryUrlInfo(viewer, storeService) {
  * @param {string=} warn
  * @return {?string}
  */
-export function getStoryAttributeSrc(element, attribute, warn = false) {
+export function getStoryAttributeSrc(element, attribute, warn) {
   const storyEl = dev().assertElement(
     closestAncestorElementBySelector(element, 'AMP-STORY')
   );
-  const attrSrc = storyEl && storyEl.getAttribute(attribute);
-
-  if (attrSrc) {
-    assertHttpsUrl(attrSrc, storyEl, attribute);
-  } else if (warn) {
-    user().warn('AMP-STORY', `Expected ${attribute} attribute on <amp-story>`);
+  const url = storyEl.getAttribute(attribute);
+  if (!url) {
+    if (warn) {
+      user().warn(
+        'AMP-STORY',
+        `Expected ${attribute} attribute on <amp-story>`
+      );
+    }
+    return null;
   }
-
-  return attrSrc;
+  return Services.urlForDoc(storyEl).assertHttpsUrl(url, storyEl, attribute);
 }
 
 /**
@@ -293,7 +277,7 @@ export function setTextBackgroundColor(element) {
     TEXT_BACKGROUND_COLOR_SELECTOR
   );
 
-  Array.prototype.forEach.call(elementsToUpgradeStyles, (el) => {
+  elementsToUpgradeStyles.forEach((el) => {
     const color = el.getAttribute(TEXT_BACKGROUND_COLOR_ATTRIBUTE_NAME);
     setStyle(el, 'background-color', color);
   });
@@ -331,3 +315,61 @@ export const maybeMakeProxyUrl = (url, ampDoc) => {
   );
   return loc.origin + '/i/s/' + resolvedRelativeUrl.replace(/https?:\/\//, '');
 };
+
+/**
+ * Whether the document is transformed
+ * @param {!AmpDoc} ampdoc
+ * @return {boolean}
+ */
+export function isTransformed(ampdoc) {
+  return ampdoc.getRootNode().documentElement.hasAttribute('transformed');
+}
+
+/**
+ * Wrapper for classes that depend on story services being installed
+ * so they can fetch the services synchronously. This allows the extension
+ * to be installed on the doc as a script tag.
+ *
+ * @param {AMP.BaseElement.constructor} klass
+ * @return {AMP.BaseElement.constructor}
+ */
+export function dependsOnStoryServices(klass) {
+  return class extends AMP.BaseElement {
+    /**
+     * @override
+     * @return {AMP.BaseElement|Promise<AMP.BaseElement>}
+     */
+    upgradeCallback() {
+      const storyEl = closestAncestorElementBySelector(
+        this.element,
+        'amp-story'
+      );
+      if (!storyEl) {
+        // Unit tests may mock or install the services internally, so
+        // instantiating immediately allows us to test implementations without
+        // placing the element inside an <amp-story>.
+        // In reality, this would cause failures. This is okay since upgradable
+        // elements are required to descend from an <amp-story>.
+        return new klass(this.element);
+      }
+      return whenUpgradedToCustomElement(storyEl)
+        .then(() => storyEl.getImpl())
+        .then(() => new klass(this.element));
+    }
+  };
+}
+
+/**
+ * Handles hiding or showing content from screen readers.
+ * @param {!Element} el
+ * @param {boolean} isVisible
+ */
+export function toggleA11yReadable(el, isVisible) {
+  if (isVisible) {
+    el.removeAttribute('tab-index');
+    el.removeAttribute('aria-hidden');
+  } else {
+    el.setAttribute('tab-index', '-1');
+    el.setAttribute('aria-hidden', 'true');
+  }
+}
diff --git a/extensions/amp-story/1.0/variable-service.js b/extensions/amp-story/1.0/variable-service.js
index 8145cbb0438c..ac89a8a209a9 100644
--- a/extensions/amp-story/1.0/variable-service.js
+++ b/extensions/amp-story/1.0/variable-service.js
@@ -1,6 +1,7 @@
 import {Services} from '#service';
+
 import {StateProperty, getStoreService} from './amp-story-store-service';
-import {dict} from '#core/types/object';
+
 import {registerServiceBuilder} from '../../../src/service-helpers';
 
 /**
@@ -19,7 +20,9 @@ export const AnalyticsVariable = {
   STORY_IS_MUTED: 'storyIsMuted',
   STORY_PROGRESS: 'storyProgress',
   STORY_PREVIOUS_PAGE_ID: 'storyPreviousPageId',
+  STORY_PREVIOUS_PAGE_INDEX: 'storyPreviousPageIndex',
   STORY_ADVANCEMENT_MODE: 'storyAdvancementMode',
+  STORY_SHOPPING_PRODUCT_ID: 'storyShoppingProductId',
 };
 
 /**
@@ -53,7 +56,7 @@ export class AmpStoryVariableService {
    */
   constructor(win) {
     /** @private {!StoryVariableDef} */
-    this.variables_ = dict({
+    this.variables_ = {
       [AnalyticsVariable.STORY_INTERACTIVE_ID]: null,
       [AnalyticsVariable.STORY_INTERACTIVE_RESPONSE]: null,
       [AnalyticsVariable.STORY_INTERACTIVE_TYPE]: null,
@@ -63,8 +66,10 @@ export class AmpStoryVariableService {
       [AnalyticsVariable.STORY_PROGRESS]: null,
       [AnalyticsVariable.STORY_IS_MUTED]: null,
       [AnalyticsVariable.STORY_PREVIOUS_PAGE_ID]: null,
+      [AnalyticsVariable.STORY_PREVIOUS_PAGE_INDEX]: null,
       [AnalyticsVariable.STORY_ADVANCEMENT_MODE]: null,
-    });
+      [AnalyticsVariable.STORY_SHOPPING_PRODUCT_ID]: null,
+    };
 
     /** @private @const {!./amp-story-store-service.AmpStoryStoreService} */
     this.storeService_ = getStoreService(win);
@@ -74,43 +79,60 @@ export class AmpStoryVariableService {
 
   /** @private */
   initializeListeners_() {
-    this.storeService_.subscribe(StateProperty.PAGE_IDS, (pageIds) => {
-      this.variables_[AnalyticsVariable.STORY_PAGE_COUNT] = pageIds.length;
-    });
+    this.storeService_.subscribe(StateProperty.PAGE_IDS, () =>
+      this.updatePageCountVariables_()
+    );
 
     this.storeService_.subscribe(
       StateProperty.CURRENT_PAGE_ID,
-      (pageId) => {
-        if (!pageId) {
-          return;
-        }
-
-        this.variables_[AnalyticsVariable.STORY_PREVIOUS_PAGE_ID] =
-          this.variables_[AnalyticsVariable.STORY_PAGE_ID];
-
-        this.variables_[AnalyticsVariable.STORY_PAGE_ID] = pageId;
-
-        const pageIndex = /** @type {number} */ (
-          this.storeService_.get(StateProperty.CURRENT_PAGE_INDEX)
-        );
-        this.variables_[AnalyticsVariable.STORY_PAGE_INDEX] = pageIndex;
-
-        const numberOfPages = this.storeService_.get(
-          StateProperty.PAGE_IDS
-        ).length;
-        if (numberOfPages > 0) {
-          if (numberOfPages === 1) {
-            this.variables_[AnalyticsVariable.STORY_PROGRESS] = 0;
-          } else {
-            this.variables_[AnalyticsVariable.STORY_PROGRESS] =
-              pageIndex / (numberOfPages - 1);
-          }
-        }
-      },
+      () => this.updatePageCountVariables_(),
       true /* callToInitialize */
     );
   }
 
+  /** @private */
+  updatePageCountVariables_() {
+    // For analytics purposes: story page count excludes ads.
+    const pageIds = /** @type {Array<string>} */ (
+      this.storeService_.get(StateProperty.PAGE_IDS)
+    );
+
+    const numberOfPages = pageIds.filter(
+      (id) => !id.startsWith('i-amphtml-ad-')
+    ).length;
+    this.variables_[AnalyticsVariable.STORY_PAGE_COUNT] = numberOfPages;
+
+    const pageId = /** @type {string} */ (
+      this.storeService_.get(StateProperty.CURRENT_PAGE_ID)
+    );
+    if (!pageId) {
+      return;
+    }
+
+    this.variables_[AnalyticsVariable.STORY_PREVIOUS_PAGE_ID] =
+      this.variables_[AnalyticsVariable.STORY_PAGE_ID];
+
+    this.variables_[AnalyticsVariable.STORY_PAGE_ID] = pageId;
+
+    const pageIndex = /** @type {number} */ (
+      this.storeService_.get(StateProperty.CURRENT_PAGE_INDEX)
+    );
+    const adsBeforePage = pageIds
+      .slice(0, pageIndex)
+      .filter((id) => id.startsWith('i-amphtml-ad-')).length;
+    this.variables_[AnalyticsVariable.STORY_PREVIOUS_PAGE_INDEX] =
+      this.variables_[AnalyticsVariable.STORY_PAGE_INDEX];
+    this.variables_[AnalyticsVariable.STORY_PAGE_INDEX] =
+      pageIndex - adsBeforePage;
+
+    if (numberOfPages === 1) {
+      this.variables_[AnalyticsVariable.STORY_PROGRESS] = 0;
+    } else if (numberOfPages > 1) {
+      this.variables_[AnalyticsVariable.STORY_PROGRESS] =
+        (pageIndex - adsBeforePage) / (numberOfPages - 1);
+    }
+  }
+
   /**
    * Updates a variable with a new value
    * @param {string} name
diff --git a/extensions/amp-story/OWNERS b/extensions/amp-story/OWNERS
index 1644fe5e0662..f597388d5692 100644
--- a/extensions/amp-story/OWNERS
+++ b/extensions/amp-story/OWNERS
@@ -7,7 +7,6 @@
       owners: [
         {
           name: 'gmajoulet',
-          notify: true,
         },
         {
           name: 'newmuis',
@@ -22,9 +21,6 @@
         {
           name: 'mszylkowski',
         },
-        {
-          name: 'raxsha',
-        },
       ],
     },
   ],
diff --git a/extensions/amp-story/amp-story-analytics.md b/extensions/amp-story/amp-story-analytics.md
index 14e4baf7ef56..90ebd2ccd80a 100644
--- a/extensions/amp-story/amp-story-analytics.md
+++ b/extensions/amp-story/amp-story-analytics.md
@@ -153,6 +153,29 @@ The `story-page-attachment-enter` trigger is fired when a page attachment is ope
 
 The `story-page-attachment-exit` trigger is fired when a page attachment is dismissed by the user.
 
+### Story shopping product listing page view trigger (`"on": "story-shopping-plp-view"`)
+
+The `story-shopping-plp-view` trigger is fired when whenever `amp-story-shopping-attachment` displays the Product Listing Page without an active product.
+it will not fire when the Product Listing Page is viewed within the context of a Product Details Page.
+The event label will be the active page since there is no product associated with the Product Listing Page.
+
+event action: story_shopping_plp_view
+event label: active page id
+
+### Story shopping product details page view trigger (`"on": "story-shopping-pdp-view"`)
+
+The `story-shopping-pdp-view` trigger is fired when whenever the `amp-story-shopping-attachment` displays the Product Details Page.
+
+event action: story_shopping_pdp_view
+event label: active product id
+
+### Story shopping “Buy now” CTA button click trigger (`"on": "story-shopping-buy-now-click"`)
+
+The `story-shopping-buy-now-click` trigger is fired when whenever the “Buy now” cta button in the Product Description Page is clicked.
+
+event action: story_shopping_buy_now_click
+event label: active product id
+
 ## Variables as data attribute
 
 For the following event types, variables can be passed as part of the element level data attribute
diff --git a/extensions/amp-story/amp-story-animation.md b/extensions/amp-story/amp-story-animation.md
index 8e2c7d93c577..02e02592095e 100644
--- a/extensions/amp-story/amp-story-animation.md
+++ b/extensions/amp-story/amp-story-animation.md
@@ -41,4 +41,4 @@ To use it, add a `<amp-story-animation layout="nodisplay" trigger="visibility">`
 ## Related resources
 
 -   [`<amp-animation> docs`](https://amp.dev/documentation/components/amp-animation/?format=websites)
--   [animatoin configuration examples](https://amp.dev/documentation/guides-and-tutorials/start/visual_story/animating_elements/?format=stories)
+-   [animation configuration examples](https://amp.dev/documentation/guides-and-tutorials/start/visual_story/animating_elements/?format=stories)
diff --git a/extensions/amp-story/amp-story-cta-layer.md b/extensions/amp-story/amp-story-cta-layer.md
index 41c1fd835afd..201f07d05afc 100644
--- a/extensions/amp-story/amp-story-cta-layer.md
+++ b/extensions/amp-story/amp-story-cta-layer.md
@@ -8,6 +8,8 @@ teaser:
 
 # amp-story-cta-layer
 
+> ## Notice: amp-story-cta-layer is depreciated see [I2D issue](https://github.com/ampproject/amphtml/issues/34450) for details. Use [amp-story-page-outlink](https://github.com/ampproject/amphtml/blob/main/extensions/amp-story-page-attachment/amp-story-page-outlink.md) instead.
+
 ## Usage
 
 The `<amp-story-cta-layer>` component allows the usage of `<a>` and `<button>` elements inside an `<amp-story-page>`.
diff --git a/extensions/amp-story/amp-story-grid-layer.md b/extensions/amp-story/amp-story-grid-layer.md
index e9431af6dc27..85cd9412a4b8 100644
--- a/extensions/amp-story/amp-story-grid-layer.md
+++ b/extensions/amp-story/amp-story-grid-layer.md
@@ -72,7 +72,6 @@ An `amp-story-grid-layer` can contain any of the following elements:
         <li><code>&lt;hgroup></code></li>
         <li><code>&lt;nav></code></li>
         <li><code>&lt;section></code></li>
-        <li><code>&lt;amp-story-cta-layer></code></li>
       </ul>
     </td>
   </tr>
diff --git a/extensions/amp-story/amp-story-page-attachment.md b/extensions/amp-story/amp-story-page-attachment.md
index 39c3a1e60544..142f27f53dfd 100644
--- a/extensions/amp-story/amp-story-page-attachment.md
+++ b/extensions/amp-story/amp-story-page-attachment.md
@@ -4,6 +4,18 @@ formats:
   - stories
 teaser:
   text: A panel of content that opens inline with an AMP story page.
+toc: true
+$title: amp-story-page-attachment
+version: '0.1'
+versions:
+  - '0.1'
+latest_version: '0.1'
+is_current: true
+$path: /documentation/components/amp-story-page-attachment.html
+$localization:
+  path: '/{locale}/documentation/components/amp-story-page-attachment.html'
+layouts:
+  - nodisplay  
 ---
 
 # amp-story-page-attachment
@@ -48,7 +60,7 @@ A UI button prompting the viewer to open the attachment will appear at the botto
 The `<amp-story-page-attachment>` element must be the last child of `<amp-story-page>`, and must have the `layout="nodisplay"` attribute. The attachment AMPHTML content is expected to be provided inline in your AMP Story, within this `<amp-story-page-attachment>` tag.
 
 [tip type="important"]
-Both [`amp-story-page-attachment`](amp-story-page-attachment.md) and [`amp-story-page-outlink`](amp-story-page-outlink.md) must be the last child tag of an [`amp-story-page`](amp-story-page.md). Because of this, you may include neither or one, but not both.
+Both [`amp-story-page-attachment`](amp-story-page-attachment.md) and [`amp-story-page-outlink`](amp-story-page-outlink.md) must be the last child tag of an [`amp-story-page`](https://amp.dev/documentation/components/amp-story-page?format=stories). Because of this, you may include neither or one, but not both.
 [/tip]
 
 ## Attributes
diff --git a/extensions/amp-story/amp-story-page-outlink.md b/extensions/amp-story/amp-story-page-outlink.md
index b14a78c48ce3..21a7218b60c4 100644
--- a/extensions/amp-story/amp-story-page-outlink.md
+++ b/extensions/amp-story/amp-story-page-outlink.md
@@ -4,6 +4,17 @@ formats:
   - stories
 teaser:
   text: A CTA button for opening external links with one tap in AMP story pages.
+$title: amp-story-page-outlink
+version: '0.1'
+versions:
+  - '0.1'
+latest_version: '0.1'
+is_current: true
+$path: /documentation/components/amp-story-page-outlink.html
+$localization:
+  path: '/{locale}/documentation/components/amp-story-page-outlink.html'
+layouts:
+  - nodisplay
 ---
 
 # amp-story-page-outlink
@@ -38,9 +49,21 @@ It must have the `layout="nodisplay"` attribute.
 The `<amp-story-page-outlink>` element must be the last child of `<amp-story-page>`, and must have the `layout="nodisplay"` attribute.
 
 [tip type="important"]
-Both [`amp-story-page-outlink`](amp-story-page-outlink.md) and [`amp-story-page-attachment`](amp-story-page-attachment.md) must be the last child tag of an [`amp-story-page`](amp-story-page.md). Because of this, you may include neither or one, but not both.
+Both [`amp-story-page-outlink`](amp-story-page-outlink.md) and [`amp-story-page-attachment`](amp-story-page-attachment.md) must be the last child tag of an [`amp-story-page`](https://amp.dev/documentation/components/amp-story-page?format=stories). Because of this, you may include neither or one, but not both.
 [/tip]
 
+## `Custom Text` (optional)
+
+Text within the child anchor element will display in the CTA. The default is "Swipe up".
+
+![amp-story-page-outlink-cta-text](https://github.com/ampproject/amphtml/raw/main/extensions/amp-story/img/amp-story-page-outlink-cta-text.jpg)
+
+```html
+<amp-story-page-outlink layout="nodisplay">
+    <a href="https://www.google.com">Call To Action</a>
+</amp-story-page-outlink>
+```
+
 ## Attributes
 
 When no attributes are set, the default UI will render:
@@ -53,12 +76,6 @@ When no attributes are set, the default UI will render:
 </amp-story-page-outlink>
 ```
 
-### `cta-text` (optional)
-
-String that customizes the button text. The default is "Swipe up".
-
-![amp-story-page-outlink-cta-text](https://github.com/ampproject/amphtml/raw/main/extensions/amp-story/img/amp-story-page-outlink-cta-text.jpg)
-
 ```html
 <amp-story-page-outlink
   layout="nodisplay"
@@ -86,7 +103,7 @@ Contrast protection is automatically applied to ensure readability and a11y comp
 <amp-story-page-outlink
   layout="nodisplay"
   theme="dark">
-    <a href="https://www.google.com">Call To Action</a>
+    <a href="https://www.google.com"></a>
 </amp-story-page-outlink>
 ```
 
@@ -141,5 +158,5 @@ Specifying `cta-image=none` will remove the default link icon.
 ```
 
 [tip type="note"]
-The functionality of `amp-story-page-outlink` used to be supported by [`amp-story-page-attachment`](https://amp.dev/documentation/components/amp-story-page-attachment/?format=stories). Please use `amp-story-page-outlink` for one-tap outlinking UI.
+The functionality of `amp-story-page-outlink` used to be supported by [`amp-story-page-attachment`](amp-story-page-attachment.md). Please use `amp-story-page-outlink` for one-tap outlinking UI.
 [/tip]
diff --git a/extensions/amp-story/amp-story-page.md b/extensions/amp-story/amp-story-page.md
index bfbba622a320..74e917329b5d 100644
--- a/extensions/amp-story/amp-story-page.md
+++ b/extensions/amp-story/amp-story-page.md
@@ -68,6 +68,9 @@ A unique identifier for the page. Can be used for styling the page and its desce
 
 Specifies when to auto-advance to the next page. If omitted, the page will not automatically advance. The value for `auto-advance-after` must be either a specified amount of time, or the `id` of an [HTMLMediaElement](https://developer.mozilla.org/en-US/docs/Web/API/HTMLMediaElement) or video-interface.
 
+**exceptions**
+`auto-advance-after` enables a lean-back user experience. In absence of `auto-advance-after`, the serving platform may decide to auto advance after a specific duration.
+
 #### Time
 
 Auto-advance to the next story page after a specified amount of [time](https://developer.mozilla.org/en-US/docs/Web/CSS/time). The time must be positive.
diff --git a/extensions/amp-story/amp-story.md b/extensions/amp-story/amp-story.md
index 1e2c95dc58ef..5b78d1ab0b2b 100644
--- a/extensions/amp-story/amp-story.md
+++ b/extensions/amp-story/amp-story.md
@@ -20,14 +20,9 @@ teaser:
 
 ## Version notes
 
-| Version | Description                                                                             |
-| ------- | --------------------------------------------------------------------------------------- |
-| 1.0     | Current version, since 2018-07-16.                                                      |
-| 0.1     | Initial implementation. This is no longer valid AMP, and will be deleted on 2019-10-01. |
-
-### Migrating from 0.1 to 1.0
-
-As of 2018-07-16, version 0.1 is considered deprecated, and will be deleted on 2019-10-01. This may cause minor breaking changes, as your stories will automatically be upgraded to use version 1.0. We recommend manually migrating your pages to version 1.0 before this date to ensure functionality and proper design.
+| Version | Description                        |
+| ------- | ---------------------------------- |
+| 1.0     | Current version, since 2018-07-16. |
 
 ## AMP story format
 
@@ -388,7 +383,7 @@ Use 720p videos or higher to take advantage of all the video transcodes and adap
 Example:
 
 ```html
-<amp-video layout="fill" poster="img.png" cache="google">
+<amp-video layout="fill" poster="img.png" cache="google" autoplay>
   <source src="video.mp4" type="video/mp4">
 </amp-video>
 ```
@@ -431,21 +426,12 @@ Example:
 </amp-story-grid-layer>
 ```
 
-#### Interactive components
+#### Embedded components
 
-We support embedding components such as `<amp-twitter>` inside `amp-story-grid-layer`. By default they are not interactive in the story (i.e. tapping on them will not have any effect), but by using the `interactive` attribute, you can make them be fully interactive.
-
-When clicked, the component will be shown in a lightbox-like mode. Here, a user can choose to further interact with the embed, or close the lightbox and go back to the story.
+We support embedding some components such as `<amp-twitter>` inside `amp-story-grid-layer`. By default they are not interactive in the story (i.e. tapping on them will advance to the next page), but by using the `interactive` attribute, you can show a tooltip linking to original source (i.e. opening the tweet on a new tab).
 
 Example:
 
-<figure class="centered-fig">
-  <span class="special-char">Example:</span>
-  <amp-anim alt="Embedded component example" layout="flex-item" src="https://raw.githubusercontent.com/ampproject/amphtml/main/extensions/amp-story/img/amp-story-tooltip.gif" width="300" height="553">
-  <noscript><img width="300"  alt="Embedded component example" src="https://raw.githubusercontent.com/ampproject/amphtml/main/extensions/amp-story/img/amp-story-tooltip.gif" /></noscript>
-  </amp-anim>
-</figure>
-
 ```html
 <amp-twitter
   width="100"
@@ -562,6 +548,10 @@ Disables the [Live story](#Live-story) functionality.
 
 Used with the `live-story` attribute. Time interval (in milliseconds) between checks for new content. If no `data-poll-interval` is provided it with default to the 15000 millisecond minimum. A value under 15000 milliseconds is invalid.
 
+### desktop-aspect-ratio (optional)
+
+The value specifies an aspect ratio in the "horizontal:vertical" format, where both "horizontal" and "vertical" are integer numbers. If this attribute is specified, the layout of the story in desktop one panel mode is set to conform to the specified proportions. The accepted ratio is between 1:2 and 3:4, and any values outside of the range would be clamped.
+
 ## Animations
 
 Every element inside an `<amp-story-page>` can have an entrance animation.
@@ -743,6 +733,27 @@ _Example_: An image panning 50px down over 15 seconds.
 </amp-img>
 ```
 
+#### pan-scaling-factor [optional, only works with `pan-left`, `pan-right`, `pan-up`, & `pan-down` animations]
+
+The target scales automatically in a pan-left/pan-right/pan-up/pan-down animation to ensure it does not go out of the target boundary when panning.
+
+Use this attribute to override the default scaling factor calculation, and specify a static scaling factor. The value must be greater than 0, and decimals are allowed.
+
+_Example_: An image scales 1.3x when panning.
+
+```html
+<amp-img
+  animate-in="pan-left"
+  pan-scaling-factor="1.3"
+  layout="fixed"
+  src="https://picsum.photos/720/320?image=1026"
+  width="720"
+  height="320"
+  alt="..."
+>
+</amp-img>
+```
+
 ### Sequencing animations
 
 To chain animations in sequence, use the `animate-in-after` attribute. All elements in a given chain must be present in the same `<amp-story-page>`. Elements without the `animate-in-after` attribute do not belong to a sequence chain, and will start independently on page entrance.
diff --git a/extensions/amp-story/img/amp-story-tooltip.gif b/extensions/amp-story/img/amp-story-tooltip.gif
deleted file mode 100644
index 3d1aa1b1d7bf..000000000000
Binary files a/extensions/amp-story/img/amp-story-tooltip.gif and /dev/null differ
diff --git a/extensions/amp-story/validator-amp-story.protoascii b/extensions/amp-story/validator-amp-story.protoascii
index 3c83d36ce119..1869b771fc89 100644
--- a/extensions/amp-story/validator-amp-story.protoascii
+++ b/extensions/amp-story/validator-amp-story.protoascii
@@ -17,7 +17,7 @@ tags: {  # <amp-story>
   # TODO(gregable): This global requires/satisfies approach only works because
   # there is only one <amp-story standalone> in a document. We really want this
   # requirement to be expressed on the <amp-story> children, however.
-  requires: "amp-story-page"
+  requires_condition: "amp-story-page"
   attrs: {
     name: "background-audio"
     value_url: {
@@ -97,6 +97,10 @@ tags: {  # <amp-story>
     name: "live-story-disabled"
     value: ""
   }
+  attrs: {
+    name: "desktop-aspect-ratio"
+    value_regex: "\\d+:\\d+"
+  }
   siblings_disallowed: true
   child_tags: {
     mandatory_min_num_child_tags: 1
@@ -110,6 +114,7 @@ tags: {  # <amp-story>
     child_tag_name_oneof: "AMP-STORY-BOOKEND"
     child_tag_name_oneof: "AMP-STORY-PAGE"
     child_tag_name_oneof: "AMP-STORY-SOCIAL-SHARE"
+    child_tag_name_oneof: "AMP-STORY-SUBSCRIPTIONS"
   }
 }
 tags: {  # <amp-story-page>
@@ -117,7 +122,7 @@ tags: {  # <amp-story-page>
   tag_name: "AMP-STORY-PAGE"
   requires_extension: "amp-story"
   mandatory_parent: "AMP-STORY"
-  satisfies: "amp-story-page"
+  satisfies_condition: "amp-story-page"
   attrs: { name: "auto-advance-after" }
   attrs: {
     name: "background-audio"
@@ -131,12 +136,14 @@ tags: {  # <amp-story-page>
   child_tags: {
     child_tag_name_oneof: "AMP-ANALYTICS"
     child_tag_name_oneof: "AMP-PIXEL"
+    child_tag_name_oneof: "AMP-SOCIAL-SHARE"
     child_tag_name_oneof: "AMP-STORY-ANIMATION"
     child_tag_name_oneof: "AMP-STORY-AUTO-ANALYTICS"
     child_tag_name_oneof: "AMP-STORY-CTA-LAYER"
     child_tag_name_oneof: "AMP-STORY-GRID-LAYER"
     child_tag_name_oneof: "AMP-STORY-PAGE-ATTACHMENT"
     child_tag_name_oneof: "AMP-STORY-PAGE-OUTLINK"
+    child_tag_name_oneof: "AMP-STORY-SHOPPING-ATTACHMENT"
     mandatory_min_num_child_tags: 1
   }
 }
@@ -182,6 +189,7 @@ tags: {
   html_format: AMP
   tag_name: "$REFERENCE_POINT"
   spec_name: "AMP-STORY-GRID-LAYER default"
+  descriptive_name: "amp-story-grid-layer child"
   attrs: {
     name: "align-content"
     value: "center"
@@ -266,6 +274,12 @@ tags: {
     name: "translate-y"
     value_regex_casei: "[0-9]+px"
   }
+  attrs: {
+    name: "pan-scaling-factor"
+    # Allow float number such as "12.3", ".1", or "5."
+    # Note that string with only decimal point such as "." is not allowed.
+    value_regex_casei: "^([0-9]*[.]?[0-9]+)|([0-9]+[.]?[0-9]*)$"
+  }
   attrs: {
     name: "justify-content"
     value: "center"
@@ -299,6 +313,7 @@ tags: {
   html_format: AMP
   tag_name: "$REFERENCE_POINT"
   spec_name: "AMP-STORY-GRID-LAYER animate-in"
+  descriptive_name: "amp-story-grid-layer [animate-in] child"
   # Attribute grid-area is not allowed in this tag. That's what makes this
   # reference point different than the grid-area reference point.
   attrs: {
@@ -360,6 +375,12 @@ tags: {
     name: "translate-y"
     value_regex_casei: "[0-9]+px"
   }
+  attrs: {
+    name: "pan-scaling-factor"
+    # Allow float number such as "12.3", ".1", or "5."
+    # Note that string with only decimal point such as "." is not allowed.
+    value_regex_casei: "^([0-9]*[.]?[0-9]+)|([0-9]+[.]?[0-9]*)$"
+  }
   reference_points: {
     tag_spec_name: "AMP-STORY-GRID-LAYER animate-in"
   }
@@ -453,7 +474,7 @@ tags: {  # amp-story-consent (json)
   requires_extension: "amp-story"
   mandatory_parent: "AMP-STORY-CONSENT"
   unique: true
-  satisfies: "amp-story-consent extension .json script"
+  satisfies_condition: "amp-story-consent extension .json script"
   attrs: {
     name: "type"
     mandatory: true
@@ -474,7 +495,7 @@ tags: {  # <amp-story-consent>
   requires_extension: "amp-consent"
   requires_extension: "amp-story"
   mandatory_parent: "AMP-CONSENT"
-  requires: "amp-story-consent extension .json script"
+  requires_condition: "amp-story-consent extension .json script"
   attr_lists: "mandatory-id-attr"
   child_tags: {
     mandatory_num_child_tags: 1
@@ -520,6 +541,7 @@ tags: {
   html_format: AMP
   tag_name: "$REFERENCE_POINT"
   spec_name: "AMP-STORY-CTA-LAYER animate-in"
+  descriptive_name: "amp-story-cta-layer [animate-in] child"
   attrs: {
     name: "animate-in"
     value: "drop"
@@ -563,6 +585,12 @@ tags: {
     name: "translate-y"
     value_regex_casei: "[0-9]+px"
   }
+  attrs: {
+    name: "pan-scaling-factor"
+    # Allow float number such as "12.3", ".1", or "5."
+    # Note that string with only decimal point such as "." is not allowed.
+    value_regex_casei: "^([0-9]*[.]?[0-9]+)|([0-9]+[.]?[0-9]*)$"
+  }
   reference_points: {
     tag_spec_name: "AMP-STORY-CTA-LAYER animate-in"
   }
@@ -689,6 +717,7 @@ descendant_tag_list: {
   tag: "ADDRESS"
   tag: "AMP-ANALYTICS"
   tag: "AMP-AUDIO"
+  tag: "AMP-BODYMOVIN-ANIMATION"
   tag: "AMP-DATE-COUNTDOWN"
   tag: "AMP-DATE-DISPLAY"
   tag: "AMP-EXPERIMENT"
@@ -703,6 +732,9 @@ descendant_tag_list: {
   tag: "AMP-RENDER"
   tag: "AMP-STATE"
   tag: "AMP-STORY-360"
+  tag: "AMP-STORY-AUDIO-STICKER"
+  tag: "AMP-STORY-AUDIO-STICKER-PRETAP"
+  tag: "AMP-STORY-AUDIO-STICKER-POSTTAP"
   tag: "AMP-STORY-AUTO-ANALYTICS"
   tag: "AMP-STORY-CAPTIONS"
   tag: "AMP-STORY-INTERACTIVE-BINARY-POLL"
@@ -711,7 +743,9 @@ descendant_tag_list: {
   tag: "AMP-STORY-INTERACTIVE-POLL"
   tag: "AMP-STORY-INTERACTIVE-QUIZ"
   tag: "AMP-STORY-INTERACTIVE-RESULTS"
+  tag: "AMP-STORY-INTERACTIVE-SLIDER"
   tag: "AMP-STORY-PANNING-MEDIA"
+  tag: "AMP-STORY-SHOPPING-TAG"
   tag: "AMP-TIMEAGO"
   tag: "AMP-TWITTER"
   tag: "AMP-VIDEO"
@@ -949,7 +983,7 @@ tags: {  # <amp-story-animation> <script>
   tag_name: "SCRIPT"
   spec_name: "amp-story-animation json script"
   mandatory_parent: "AMP-STORY-ANIMATION"
-  satisfies: "amp-story-animation json script"
+  satisfies_condition: "amp-story-animation json script"
   attrs: {
     name: "type"
     mandatory: true
@@ -969,7 +1003,7 @@ tags: {  # <amp-story-animation>
   html_format: AMP
   tag_name: "AMP-STORY-ANIMATION"
   requires_extension: "amp-story"
-  requires: "amp-story-animation json script"
+  requires_condition: "amp-story-animation json script"
   mandatory_parent: "AMP-STORY-PAGE"
   attrs: { name: "animate-in-after" }
   attrs: {
diff --git a/extensions/amp-stream-gallery/0.1/amp-stream-gallery.js b/extensions/amp-stream-gallery/0.1/amp-stream-gallery.js
index 5a30ad87cfec..ac102df164fe 100644
--- a/extensions/amp-stream-gallery/0.1/amp-stream-gallery.js
+++ b/extensions/amp-stream-gallery/0.1/amp-stream-gallery.js
@@ -1,29 +1,32 @@
-import {ActionSource} from '../../amp-base-carousel/0.1/action-source';
-import {ActionTrust} from '#core/constants/action-constants';
-import {CSS} from '../../../build/amp-stream-gallery-0.1.css';
-import {Carousel} from '../../amp-base-carousel/0.1/carousel';
-import {CarouselEvents} from '../../amp-base-carousel/0.1/carousel-events';
-import {ChildLayoutManager} from '../../amp-base-carousel/0.1/child-layout-manager';
-import {
-  ResponsiveAttributes,
-  getResponsiveAttributeValue,
-} from '../../amp-base-carousel/0.1/responsive-attributes';
-import {Services} from '#service';
-import {createCustomEvent, getDetail} from '#utils/event-helper';
-import {dev, devAssert, user, userAssert} from '#utils/log';
-import {dict} from '#core/types/object';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
 import {
   dispatchCustomEvent,
   isRTL,
   iterateCursor,
   toggleAttribute,
 } from '#core/dom';
-import {htmlFor} from '#core/dom/static-template';
-import {isExperimentOn} from '#experiments';
 import {isLayoutSizeDefined} from '#core/dom/layout';
+import {htmlFor} from '#core/dom/static-template';
 import {setStyle} from '#core/dom/style';
 import {toArray} from '#core/types/array';
 
+import {isExperimentOn} from '#experiments';
+
+import {Services} from '#service';
+
+import {createCustomEvent, getDetail} from '#utils/event-helper';
+import {dev, devAssert, user, userAssert} from '#utils/log';
+
+import {CSS} from '../../../build/amp-stream-gallery-0.1.css';
+import {ActionSource} from '../../amp-base-carousel/0.1/action-source';
+import {Carousel} from '../../amp-base-carousel/0.1/carousel';
+import {CarouselEvents} from '../../amp-base-carousel/0.1/carousel-events';
+import {ChildLayoutManager} from '../../amp-base-carousel/0.1/child-layout-manager';
+import {
+  ResponsiveAttributes,
+  getResponsiveAttributeValue,
+} from '../../amp-base-carousel/0.1/responsive-attributes';
+
 /** @enum {number} */
 const InsetArrowVisibility = {
   NEVER: 0,
@@ -32,11 +35,11 @@ const InsetArrowVisibility = {
 };
 
 /** Maps attribute values to enum values. */
-const insetArrowVisibilityMapping = dict({
+const insetArrowVisibilityMapping = {
   'never': InsetArrowVisibility.NEVER,
   'auto': InsetArrowVisibility.AUTO,
   'always': InsetArrowVisibility.ALWAYS,
-});
+};
 
 /**
  * @param {!Element} el The Element to check.
@@ -62,7 +65,7 @@ const TAG = 'amp-stream-gallery';
  * - Does not support autoplay
  */
 class AmpStreamGallery extends AMP.BaseElement {
-  /** @override @nocollapse */
+  /** @override  */
   static prerenderAllowed() {
     return true;
   }
@@ -140,7 +143,7 @@ class AmpStreamGallery extends AMP.BaseElement {
 
   /**
    * The configuration for handling attributes on this element.
-   * @return {!Object<string, function(string)>}
+   * @return {!{[key: string]: function(string)}}
    * @private
    */
   getAttributeConfig_() {
@@ -195,7 +198,7 @@ class AmpStreamGallery extends AMP.BaseElement {
         const {trust} = invocation;
         this.carousel_.prev(this.getActionSource_(trust));
       },
-      ActionTrust.LOW
+      ActionTrust_Enum.LOW
     );
     this.registerAction(
       'next',
@@ -203,7 +206,7 @@ class AmpStreamGallery extends AMP.BaseElement {
         const {trust} = invocation;
         this.carousel_.next(this.getActionSource_(trust));
       },
-      ActionTrust.LOW
+      ActionTrust_Enum.LOW
     );
     this.registerAction(
       'goToSlide',
@@ -213,7 +216,7 @@ class AmpStreamGallery extends AMP.BaseElement {
           actionSource: this.getActionSource_(trust),
         });
       },
-      ActionTrust.LOW
+      ActionTrust_Enum.LOW
     );
   }
 
@@ -434,13 +437,13 @@ class AmpStreamGallery extends AMP.BaseElement {
   }
 
   /**
-   * Gets the ActionSource to use for a given ActionTrust.
-   * @param {!ActionTrust} trust
+   * Gets the ActionSource to use for a given ActionTrust_Enum.
+   * @param {!ActionTrust_Enum} trust
    * @return {!ActionSource}
    * @private
    */
   getActionSource_(trust) {
-    return trust == ActionTrust.HIGH
+    return trust == ActionTrust_Enum.HIGH
       ? ActionSource.GENERIC_HIGH_TRUST
       : ActionSource.GENERIC_LOW_TRUST;
   }
@@ -749,10 +752,10 @@ class AmpStreamGallery extends AMP.BaseElement {
       return;
     }
 
-    const data = dict({'index': index});
+    const data = {'index': index};
     const name = 'slideChange';
     const isHighTrust = this.isHighTrustActionSource_(actionSource);
-    const trust = isHighTrust ? ActionTrust.HIGH : ActionTrust.LOW;
+    const trust = isHighTrust ? ActionTrust_Enum.HIGH : ActionTrust_Enum.LOW;
 
     const action = createCustomEvent(this.win, `streamGallery.${name}`, data);
     this.action_.trigger(this.element, name, action, trust);
diff --git a/extensions/amp-stream-gallery/0.1/test/test-amp-stream-gallery.js b/extensions/amp-stream-gallery/0.1/test/test-amp-stream-gallery.js
index c9ae9284c976..dedb3c8d9db6 100644
--- a/extensions/amp-stream-gallery/0.1/test/test-amp-stream-gallery.js
+++ b/extensions/amp-stream-gallery/0.1/test/test-amp-stream-gallery.js
@@ -1,10 +1,13 @@
 import '../amp-stream-gallery';
-import {CarouselEvents} from '../../../amp-base-carousel/0.1/carousel-events';
-import {getDetail, listenOncePromise} from '#utils/event-helper';
 import {setStyle, setStyles} from '#core/dom/style';
 import {toArray} from '#core/types/array';
+
 import {toggleExperiment} from '#experiments';
 
+import {getDetail, listenOncePromise} from '#utils/event-helper';
+
+import {CarouselEvents} from '../../../amp-base-carousel/0.1/carousel-events';
+
 /**
  * @fileoverview Some simple tests for amp-stream-gallery. Most of the
  *    functionality for changing slides, resizing, etc should be handled by
@@ -109,10 +112,10 @@ describes.realWin(
     }
 
     async function getGallery({
-      slideCount = 5,
+      attrs = {},
       customArrows = false,
+      slideCount = 5,
       width,
-      attrs = {},
     } = {}) {
       const el = doc.createElement('amp-stream-gallery');
       el.setAttribute('layout', 'fixed');
diff --git a/extensions/amp-stream-gallery/1.0/README.md b/extensions/amp-stream-gallery/1.0/README.md
index 09433ec25f17..957a504322ac 100644
--- a/extensions/amp-stream-gallery/1.0/README.md
+++ b/extensions/amp-stream-gallery/1.0/README.md
@@ -1,17 +1,14 @@
 # Bento Stream Gallery
 
-Displays multiple similar pieces of content at a time along a horizontal axis. To implement a more customized UX, see
-[`bento-base-carousel`](../../amp-base-carousel/1.0/README.md).
+The Bento Stream Gallery is for displaying multiple similar pieces of content at a time along a horizontal axis.
 
-Use Bento Stream Gallery as a web component ([`<bento-stream-gallery>`](#web-component)), or a Preact/React functional component ([`<BentoStreamGallery>`](#preactreact-component)).
+It is a specialization of Bento Base Carousel and uses [ResizeObservers](https://developer.mozilla.org/en-US/docs/Web/API/ResizeObserver) to adjust dynamically adjust the size and number of displayed slides displayed based on the width of the container. To implement a more customized UX, see [`<bento-base-carousel>`](../../amp-base-carousel/1.0/README.md).
 
 ## Web Component
 
 You must include each Bento component's required CSS library to guarantee proper loading and before adding custom styles. Or use the light-weight pre-upgrade styles available inline. See [Layout and style](#layout-and-style).
 
-The examples below demonstrate use of the `<bento-stream-gallery>` web component.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/stream-gallery
@@ -22,54 +19,63 @@ import {defineElement as defineBentoStreamGallery} from '@bentoproject/stream-ga
 defineBentoStreamGallery();
 ```
 
-### Example: Include via `<script>`
+### Include via `<script>`
+
+```html
+<script type="module" src="https://cdn.ampproject.org/bento.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/bento.js" crossorigin="anonymous"></script>
+<script type="module" src="https://cdn.ampproject.org/v0/bento-stream-gallery-1.0.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/v0/bento-stream-gallery-1.0.js" crossorigin="anonymous"></script>
+<link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-stream-gallery-1.0.css" crossorigin="anonymous">
+```
+
+### Example
 
-The example below contains an `bento-stream-gallery` with three sections. The
-`expanded` attribute on the third section expands it on page load.
+<!--% example %-->
 
 ```html
-<head>
-  <script src="https://cdn.ampproject.org/bento.js"></script>
-  <script
-    async
-    src="https://cdn.ampproject.org/v0/bento-stream-gallery-1.0.js"
-  ></script>
-  <link
-    rel="stylesheet"
-    type="text/css"
-    href="https://cdn.ampproject.org/v0/bento-stream-gallery-1.0.css"
-  />
-</head>
-<body>
-  <bento-stream-gallery>
-    <img src="img1.png" />
-    <img src="img2.png" />
-    <img src="img3.png" />
-    <img src="img4.png" />
-    <img src="img5.png" />
-    <img src="img6.png" />
-    <img src="img7.png" />
-  </bento-stream-gallery>
-  <script>
-    (async () => {
-      const streamGallery = document.querySelector('#my-stream-gallery');
-      await customElements.whenDefined('bento-stream-gallery');
-      const api = await streamGallery.getApi();
-
-      // programatically expand all sections
-      api.next();
-      // programatically collapse all sections
-      api.prev();
-      // programatically go to slide
-      api.goToSlide(4);
-    })();
-  </script>
-</body>
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-stream-gallery-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-stream-gallery-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-stream-gallery-1.0.css"
+    />
+  </head>
+  <body>
+    <bento-stream-gallery id="my-stream-gallery" style="height: 150px;" min-item-width="75" max-item-width="100">
+      <div style="height: 100px; background: red;">A</div>
+      <div style="height: 100px; background: green;">B</div>
+      <div style="height: 100px; background: blue;">C</div>
+      <div style="height: 100px; background: yellow;">D</div>
+      <div style="height: 100px; background: purple;">E</div>
+      <div style="height: 100px; background: orange;">F</div>
+      <div style="height: 100px; background: fuchsia;">G</div>
+    </bento-stream-gallery>
+  </body>
+</html>
 ```
 
 ### Interactivity and API usage
 
-Bento enabled components in standalone use are highly interactive through their API. The `bento-stream-gallery` component API is accessible by including the following script tag in your document:
+Bento components are highly interactive through their API. The `bento-stream-gallery` component API is accessible by including the following script tag in your document:
 
 ```javascript
 await customElements.whenDefined('bento-stream-gallery');
@@ -97,6 +103,7 @@ api.prev();
 ##### goToSlide(index: number)
 
 Moves the carousel to the slide specified by the `index` argument.
+
 Note: `index` will be normalized to a number greater than or equal to `0` and less than the number of slides given.
 
 ```js
@@ -110,8 +117,7 @@ The Bento Stream Gallery component allows you to register and respond to the fol
 
 ##### slideChange
 
-This event is triggered when the index displayed by the carousel has changed.
-The new index is available via `event.data.index`.
+This event is triggered when the index displayed by the carousel has changed. The new index is available via `event.data.index`.
 
 ```js
 streamGallery.addEventListener('slideChange', (e) => console.log(e.data.index));
@@ -141,6 +147,66 @@ Alternatively, you may also make the light-weight pre-upgrade styles available i
 </style>
 ```
 
+#### API Example
+
+This example demonstrates how to programmatically switch to the next/previous slide and jump to specific slides.
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-stream-gallery-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-stream-gallery-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-stream-gallery-1.0.css"
+    />
+  </head>
+  <body>
+    <bento-stream-gallery id="my-stream-gallery" style="height: 150px;" min-item-width="75" max-item-width="100">
+      <div style="height: 100px; background: red;">A</div>
+      <div style="height: 100px; background: green;">B</div>
+      <div style="height: 100px; background: blue;">C</div>
+      <div style="height: 100px; background: yellow;">D</div>
+      <div style="height: 100px; background: purple;">E</div>
+      <div style="height: 100px; background: orange;">F</div>
+      <div style="height: 100px; background: fuchsia;">G</div>
+    </bento-stream-gallery>
+    <script>
+      (async () => {
+        const streamGallery = document.querySelector('#my-stream-gallery');
+        await customElements.whenDefined('bento-stream-gallery');
+        const api = await streamGallery.getApi();
+
+        // programatically go to next slide
+        api.next();
+        // programatically go to prev slide
+        api.prev();
+        // programatically go to slide
+        api.goToSlide(4);
+      })();
+    </script>
+  </body>
+</html>
+```
+
 ### Attributes
 
 #### Behavior
@@ -159,9 +225,7 @@ Either `"around"` or undefined. This determines how extra space is allocated aft
 
 ##### `loop`
 
-Either `true` or `false`, defaults to `true`. When true, the carousel will allow
-the user to move from the first item back to the last item and visa versa. There
-must be at least three slides present for looping to occur.
+Either `true` or `false`, defaults to `true`. When true, the carousel will allow the user to move from the first item back to the last item and visa versa. There must be at least three slides present for looping to occur.
 
 ##### `outset-arrows`
 
@@ -175,8 +239,7 @@ A number, defaults to `0`. This determines how much of an additional slide to sh
 
 ##### `min-visible-count`
 
-A number, defaults to `1`. Determines the minimum number of slides that should be shown at a given time. Fractional values can be used to make part of a(n) additional slide(s)
-visible.
+A number, defaults to `1`. Determines the minimum number of slides that should be shown at a given time. Fractional values can be used to make part of a(n) additional slide(s) visible.
 
 ##### `max-visible-count`
 
@@ -194,28 +257,21 @@ A number, defaults to [`Number.MAX_VALUE`](https://developer.mozilla.org/en-US/d
 
 ##### `slide-align`
 
-Either `start` or `center`. When start aligning, the start of a slide (e.g. the
-left edge, when horizontal aligning) is aligned with the start of a carousel.
-When center aligning, the center of a slide is aligned with the center of a
-carousel.
+Either `start` or `center`. When start aligning, the start of a slide (e.g. the left edge, when horizontal aligning) is aligned with the start of a carousel. When center aligning, the center of a slide is aligned with the center of a carousel.
 
 ##### `snap`
 
-Either `true` or `false`, defaults to `true`. Determines whether or not the
-carousel should snap on slides when scrolling.
+Either `true` or `false`, defaults to `true`. Determines whether or not the carousel should snap on slides when scrolling.
 
 ### Styling
 
-You may use the `bento-stream-gallery` element selector to style the streamGallery
-freely.
+You may use the `bento-stream-gallery` element selector to style the streamGallery freely.
 
 ---
 
 ## Preact/React Component
 
-The examples below demonstrates use of the `<BentoStreamGallery>` as a functional component usable with the Preact or React libraries.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/stream-gallery
@@ -228,7 +284,7 @@ import '@bentoproject/stream-gallery/styles.css';
 
 function App() {
   return (
-    <BentoStreamGallery>
+    <BentoStreamGallery style={{height: 150}} minItemWidth="75" maxItemWidth="100">
       <img src="img1.png" />
       <img src="img2.png" />
       <img src="img3.png" />
@@ -286,8 +342,7 @@ ref.current.prev();
 
 ##### goToSlide(index: number)
 
-Moves the carousel to the slide specified by the `index` argument.
-Note: `index` will be normalized to a number greater than or equal to `0` and less than the number of slides given.
+Moves the carousel to the slide specified by the `index` argument. Note: `index` will be normalized to a number greater than or equal to `0` and less than the number of slides given.
 
 ```javascript
 ref.current.goToSlide(0); // Advance to first slide.
@@ -301,7 +356,7 @@ ref.current.goToSlide(length - 1); // Advance to last slide.
 This event is triggered when the index displayed by the carousel has changed.
 
 ```jsx
-<BentoStreamGallery onSlideChange={(index) => console.log(index)}>
+<BentoStreamGallery style={{height: 150}} onSlideChange={(index) => console.log(index)}>
   <img src="puppies.jpg" />
   <img src="kittens.jpg" />
   <img src="hamsters.jpg" />
@@ -352,9 +407,7 @@ Either `"around"` or undefined. This determines how extra space is allocated aft
 
 ##### `loop`
 
-Either `true` or `false`, defaults to `true`. When true, the carousel will allow
-the user to move from the first item back to the last item and visa versa. There
-must be at least three slides present for looping to occur.
+Either `true` or `false`, defaults to `true`. When true, the carousel will allow the user to move from the first item back to the last item and visa versa. There must be at least three slides present for looping to occur.
 
 ##### `outsetArrows`
 
@@ -368,8 +421,7 @@ A number, defaults to `0`. This determines how much of an additional slide to sh
 
 ##### `minVisibleCount`
 
-A number, defaults to `1`. Determines the minimum number of slides that should be shown at a given time. Fractional values can be used to make part of a(n) additional slide(s)
-visible.
+A number, defaults to `1`. Determines the minimum number of slides that should be shown at a given time. Fractional values can be used to make part of a(n) additional slide(s) visible.
 
 ##### `maxVisibleCount`
 
@@ -387,12 +439,8 @@ A number, defaults to [`Number.MAX_VALUE`](https://developer.mozilla.org/en-US/d
 
 ##### `slideAlign`
 
-Either `start` or `center`. When start aligning, the start of a slide (e.g. the
-left edge, when horizontal aligning) is aligned with the start of a carousel.
-When center aligning, the center of a slide is aligned with the center of a
-carousel.
+Either `start` or `center`. When start aligning, the start of a slide (e.g. the left edge, when horizontal aligning) is aligned with the start of a carousel. When center aligning, the center of a slide is aligned with the center of a carousel.
 
 ##### `snap`
 
-Either `true` or `false`, defaults to `true`. Determines whether or not the
-carousel should snap on slides when scrolling.
+Either `true` or `false`, defaults to `true`. Determines whether or not the carousel should snap on slides when scrolling.
diff --git a/extensions/amp-stream-gallery/1.0/amp-stream-gallery.js b/extensions/amp-stream-gallery/1.0/amp-stream-gallery.js
index bdb8253f9b7e..bba77530ece3 100644
--- a/extensions/amp-stream-gallery/1.0/amp-stream-gallery.js
+++ b/extensions/amp-stream-gallery/1.0/amp-stream-gallery.js
@@ -1,27 +1,37 @@
-import {ActionTrust} from '#core/constants/action-constants';
-import {BaseElement} from './base-element';
-import {CSS} from '../../../build/amp-stream-gallery-1.0.css';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
+import {getWin} from '#core/window';
+
+import {isExperimentOn} from '#experiments';
+
+import {AmpPreactBaseElement, setSuperClass} from '#preact/amp-base-element';
+
 import {Services} from '#service';
+
 import {createCustomEvent} from '#utils/event-helper';
-import {isExperimentOn} from '#experiments';
-import {getWin} from '#core/window';
 import {userAssert} from '#utils/log';
 
+import {BaseElement} from './base-element';
+
+import {CSS} from '../../../build/amp-stream-gallery-1.0.css';
+
 /** @const {string} */
 const TAG = 'amp-stream-gallery';
 
-class AmpStreamGallery extends BaseElement {
+class AmpStreamGallery extends setSuperClass(
+  BaseElement,
+  AmpPreactBaseElement
+) {
   /** @override */
   init() {
-    this.registerApiAction('prev', (api) => api.prev(), ActionTrust.LOW);
-    this.registerApiAction('next', (api) => api.next(), ActionTrust.LOW);
+    this.registerApiAction('prev', (api) => api.prev(), ActionTrust_Enum.LOW);
+    this.registerApiAction('next', (api) => api.next(), ActionTrust_Enum.LOW);
     this.registerApiAction(
       'goToSlide',
       (api, invocation) => {
         const {args} = invocation;
         api.goToSlide(args['index'] || -1);
       },
-      ActionTrust.LOW
+      ActionTrust_Enum.LOW
     );
 
     return super.init();
@@ -48,7 +58,7 @@ class AmpStreamGallery extends BaseElement {
       element,
       eventName,
       event,
-      ActionTrust.HIGH
+      ActionTrust_Enum.HIGH
     );
 
     super.triggerEvent(element, eventName, detail);
diff --git a/extensions/amp-stream-gallery/1.0/base-element.js b/extensions/amp-stream-gallery/1.0/base-element.js
index 2719a7aac9fd..81113e2c5d44 100644
--- a/extensions/amp-stream-gallery/1.0/base-element.js
+++ b/extensions/amp-stream-gallery/1.0/base-element.js
@@ -1,18 +1,19 @@
-import {CSS as CAROUSEL_CSS} from '../../amp-base-carousel/1.0/component.jss';
-import {CSS as GALLERY_CSS} from './component.jss';
+import {CSS as CAROUSEL_CSS} from '#bento/components/bento-base-carousel/1.0/component.jss';
+
 import {PreactBaseElement} from '#preact/base-element';
+
 import {BentoStreamGallery} from './component';
-import {dict} from '#core/types/object';
+import {CSS as GALLERY_CSS} from './component.jss';
 
 export class BaseElement extends PreactBaseElement {
   /** @override */
   init() {
     const {element} = this;
-    return dict({
+    return {
       'onSlideChange': (index) => {
-        this.triggerEvent(element, 'slideChange', dict({'index': index}));
+        this.triggerEvent(element, 'slideChange', {'index': index});
       },
-    });
+    };
   }
 }
 
@@ -34,8 +35,8 @@ BaseElement['props'] = {
     single: true,
     as: true,
   },
-  'controls': {attr: 'controls', type: 'string', media: true},
-  'extraSpace': {attr: 'extra-space', type: 'string', media: true},
+  'controls': {attr: 'controls', media: true},
+  'extraSpace': {attr: 'extra-space', media: true},
   'loop': {attr: 'loop', type: 'boolean', media: true},
   'minItemWidth': {attr: 'min-item-width', type: 'number', media: true},
   'maxItemWidth': {attr: 'max-item-width', type: 'number', media: true},
@@ -43,7 +44,7 @@ BaseElement['props'] = {
   'minVisibleCount': {attr: 'min-visible-count', type: 'number', media: true},
   'outsetArrows': {attr: 'outset-arrows', type: 'boolean', media: true},
   'peek': {attr: 'peek', type: 'number', media: true},
-  'slideAlign': {attr: 'slide-align', type: 'string', media: true},
+  'slideAlign': {attr: 'slide-align', media: true},
   'snap': {attr: 'snap', type: 'boolean', media: true},
   'children': {
     selector: '*', // This should be last as catch-all.
diff --git a/extensions/amp-stream-gallery/1.0/component.js b/extensions/amp-stream-gallery/1.0/component.js
index 56867a1186ac..1b4fe00b43f0 100644
--- a/extensions/amp-stream-gallery/1.0/component.js
+++ b/extensions/amp-stream-gallery/1.0/component.js
@@ -1,8 +1,11 @@
-import * as Preact from '#preact';
-import {BentoBaseCarousel} from '../../amp-base-carousel/1.0/component';
-import {forwardRef, toChildArray} from '#preact/compat';
+import objstr from 'obj-str';
+
+import {BentoBaseCarousel} from '#bento/components/bento-base-carousel/1.0/component';
+
 import {setStyle} from '#core/dom/style';
 import {getWin} from '#core/window';
+
+import * as Preact from '#preact';
 import {
   useCallback,
   useImperativeHandle,
@@ -10,8 +13,10 @@ import {
   useRef,
   useState,
 } from '#preact';
+import {Children, forwardRef} from '#preact/compat';
+import {propName} from '#preact/utils';
+
 import {useStyles} from './component.jss';
-import objstr from 'obj-str';
 
 const DEFAULT_VISIBLE_COUNT = 1;
 const OUTSET_ARROWS_WIDTH = 100;
@@ -23,24 +28,24 @@ const OUTSET_ARROWS_WIDTH = 100;
  */
 function BentoStreamGalleryWithRef(props, ref) {
   const {
-    arrowPrevAs = DefaultArrow,
     arrowNextAs = DefaultArrow,
+    arrowPrevAs = DefaultArrow,
     children,
-    'class': className,
     extraSpace,
     maxItemWidth = Number.MAX_VALUE,
-    minItemWidth = 1,
     maxVisibleCount = Number.MAX_VALUE,
+    minItemWidth = 1,
     minVisibleCount = 1,
     outsetArrows,
     peek = 0,
     slideAlign = 'start',
+    [propName('class')]: className,
     ...rest
   } = props;
   const classes = useStyles();
   const carouselRef = useRef(null);
   const [visibleCount, setVisibleCount] = useState(DEFAULT_VISIBLE_COUNT);
-  const {length} = toChildArray(children);
+  const length = Children.count(children);
   const measure = useCallback(
     (containerWidth) =>
       getVisibleCount(
@@ -130,10 +135,10 @@ export {BentoStreamGallery};
 function DefaultArrow({
   'aria-disabled': ariaDisabled,
   by,
-  'class': className,
   disabled,
   onClick,
   outsetArrows,
+  [propName('class')]: className,
 }) {
   const classes = useStyles();
   return (
diff --git a/extensions/amp-stream-gallery/1.0/example/index.html b/extensions/amp-stream-gallery/1.0/example/index.html
new file mode 100644
index 000000000000..135718895611
--- /dev/null
+++ b/extensions/amp-stream-gallery/1.0/example/index.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-stream-gallery-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-stream-gallery-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-stream-gallery-1.0.css"
+    />
+  </head>
+  <body>
+    <bento-stream-gallery
+      id="my-stream-gallery"
+      style="height: 150px"
+      min-item-width="75"
+      max-item-width="100"
+    >
+      <div style="height: 100px; background: red">A</div>
+      <div style="height: 100px; background: green">B</div>
+      <div style="height: 100px; background: blue">C</div>
+      <div style="height: 100px; background: yellow">D</div>
+      <div style="height: 100px; background: purple">E</div>
+      <div style="height: 100px; background: orange">F</div>
+      <div style="height: 100px; background: fuchsia">G</div>
+    </bento-stream-gallery>
+    <script>
+      (async () => {
+        const streamGallery = document.querySelector('#my-stream-gallery');
+        await customElements.whenDefined('bento-stream-gallery');
+        const api = await streamGallery.getApi();
+
+        // programatically go to next slide
+        api.next();
+        // programatically go to prev slide
+        api.prev();
+        // programatically go to slide
+        api.goToSlide(4);
+      })();
+    </script>
+  </body>
+</html>
diff --git a/extensions/amp-stream-gallery/1.0/storybook/Basic.amp.js b/extensions/amp-stream-gallery/1.0/storybook/Basic.amp.js
index e71b3bc85ec7..83c0120f9edf 100644
--- a/extensions/amp-stream-gallery/1.0/storybook/Basic.amp.js
+++ b/extensions/amp-stream-gallery/1.0/storybook/Basic.amp.js
@@ -1,33 +1,102 @@
-import * as Preact from '#preact';
-import {boolean, number, select, withKnobs} from '@storybook/addon-knobs';
 import {withAmp} from '@ampproject/storybook-addon';
 
+import * as Preact from '#preact';
+
 const CONTROLS = ['auto', 'always', 'never'];
 
 export default {
   title: 'amp-stream-gallery-1_0',
-  decorators: [withKnobs, withAmp],
+  decorators: [withAmp],
 
   parameters: {
-    extensions: [{name: 'amp-stream-gallery', version: '1.0'}],
-
+    extensions: [
+      {name: 'amp-stream-gallery', version: '1.0'},
+      {name: 'amp-base-carousel', version: '1.0'},
+    ],
     experiments: ['bento'],
   },
+
+  argTypes: {
+    slideCount: {
+      name: 'slide count',
+      control: {type: 'number', min: 3, max: 99},
+      defaultValue: 15,
+    },
+    extraSpace: {
+      name: 'extra space around?',
+      control: {type: 'boolean'},
+      defaultValue: true,
+    },
+    controls: {
+      name: 'controls',
+      control: {type: 'select'},
+      defaultValue: CONTROLS,
+    },
+    loop: {
+      name: 'loop',
+      control: {type: 'boolean'},
+      defaultValue: true,
+    },
+    snap: {
+      name: 'snap',
+      control: {type: 'boolean'},
+      defaultValue: true,
+    },
+    slideAlign: {
+      name: 'slide align',
+      control: {type: 'select'},
+      defaultValue: ['start', 'center'],
+    },
+    minItemWidth: {
+      name: 'min item width',
+      control: {type: 'number', min: 1},
+      defaultValue: 130,
+    },
+    maxItemWidth: {
+      name: 'max item width',
+      control: {type: 'number', min: 1},
+      defaultValue: 180,
+    },
+    minVisibleCount: {
+      name: 'min visible count',
+      control: {type: 'number', min: 1},
+      defaultValue: 2.5,
+    },
+    maxVisibleCount: {
+      name: 'max visible count',
+      control: {type: 'number', min: 1},
+      defaultValue: 5,
+    },
+    peek: {
+      name: 'peek',
+      control: {type: 'number', min: 1},
+      defaultValue: 0,
+    },
+    outsetArrows: {
+      name: 'outset arrows',
+      control: {type: 'boolean'},
+      defaultValue: true,
+    },
+    width: {type: 'number'},
+    height: {type: 'number'},
+  },
 };
 
-export const Default = () => {
-  const slideCount = number('slide count', 15, {min: 3, max: 99});
-  const extraSpace = boolean('extra space around?', true);
-  const controls = select('controls', CONTROLS);
-  const loop = boolean('loop', true);
-  const snap = boolean('snap', true);
-  const slideAlign = select('slide align', ['start', 'center']);
-  const minItemWidth = number('min item width', 130, {min: 1});
-  const maxItemWidth = number('max item width', 180, {min: 1});
-  const minVisibleCount = number('min visible count', 2.5, {min: 1});
-  const maxVisibleCount = number('max visible count', 5, {min: 1});
-  const peek = number('peek', 0, {min: 1});
-  const outsetArrows = boolean('outset arrows', true);
+export const Default = ({
+  controls,
+  extraSpace,
+  loop,
+  maxItemWidth,
+  maxVisibleCount,
+  minItemWidth,
+  minVisibleCount,
+  outsetArrows,
+  peek,
+  slideAlign,
+  slideCount,
+  snap,
+  ...args
+}) => {
   const colorIncrement = Math.floor(255 / (slideCount + 1));
   return (
     <>
@@ -47,6 +116,7 @@ export const Default = () => {
         peek={peek}
         slide-align={slideAlign}
         snap={snap}
+        {...args}
       >
         {Array.from({length: slideCount}, (x, i) => {
           const v = colorIncrement * (i + 1);
@@ -74,13 +144,18 @@ export const Default = () => {
   );
 };
 
-export const customArrows = () => {
-  const width = number('width', 400);
-  const height = number('height', 200);
-  const slideCount = number('slide count', 7, {min: 0, max: 99});
+export const CustomArrows = ({height, slideCount, width, ...args}) => {
+  width = width ?? 400;
+  height = height ?? 200;
+
   const colorIncrement = Math.floor(255 / (slideCount + 1));
   return (
-    <amp-stream-gallery max-visible-count={3} width={width} height={height}>
+    <amp-stream-gallery
+      max-visible-count={3}
+      width={width}
+      height={height}
+      {...args}
+    >
       {Array.from({length: slideCount}, (x, i) => {
         const v = colorIncrement * (i + 1);
         return (
diff --git a/extensions/amp-stream-gallery/1.0/storybook/Basic.js b/extensions/amp-stream-gallery/1.0/storybook/Basic.js
index 0e34fa05900f..a8ac5dcf8528 100644
--- a/extensions/amp-stream-gallery/1.0/storybook/Basic.js
+++ b/extensions/amp-stream-gallery/1.0/storybook/Basic.js
@@ -1,13 +1,86 @@
 import * as Preact from '#preact';
+
 import {BentoStreamGallery} from '../component';
-import {boolean, number, select, withKnobs} from '@storybook/addon-knobs';
+
+import '../component.jss';
 
 const CONTROLS = ['auto', 'always', 'never'];
 
 export default {
   title: 'StreamGallery',
   component: BentoStreamGallery,
-  decorators: [withKnobs],
+  argTypes: {
+    width: {
+      name: 'width',
+      control: {type: 'number'},
+      defaultValue: 735,
+    },
+    height: {
+      name: 'height',
+      control: {type: 'number'},
+      defaultValue: 225,
+    },
+    slideCount: {
+      name: 'slide count',
+      control: {type: 'number', min: 0, max: 99},
+      defaultValue: 5,
+    },
+    extraSpace: {
+      name: 'extra space around',
+      control: {type: 'boolean'},
+      defaultValue: true,
+    },
+    controls: {
+      name: 'controls',
+      control: {type: 'select'},
+      defaultValue: CONTROLS,
+    },
+    loop: {
+      name: 'loop',
+      control: {type: 'boolean'},
+      defaultValue: true,
+    },
+    snap: {
+      name: 'snap',
+      control: {type: 'boolean'},
+      defaultValue: true,
+    },
+    slideAlign: {
+      name: 'slide align',
+      control: {type: 'select'},
+      options: ['start', 'center'],
+    },
+    minItemWidth: {
+      name: 'min item width',
+      control: {type: 'number', min: 1},
+      defaultValue: 130,
+    },
+    maxItemWidth: {
+      name: 'max item width',
+      control: {type: 'number', min: 1},
+      defaultValue: 180,
+    },
+    minVisibleCount: {
+      name: 'min visible count',
+      control: {type: 'number', min: 1},
+      defaultValue: 3,
+    },
+    maxVisibleCount: {
+      name: 'max visible count',
+      control: {type: 'number', min: 1},
+      defaultValue: 5,
+    },
+    peek: {
+      name: 'peek',
+      control: {type: 'number', min: 1},
+      defaultValue: 0,
+    },
+    outsetArrows: {
+      name: 'outset arrows',
+      control: {type: 'boolean'},
+      defaultValue: true,
+    },
+  },
 };
 
 /**
@@ -30,21 +103,23 @@ function CarouselWithActions(props) {
   );
 }
 
-export const _default = () => {
-  const width = number('width', 735);
-  const height = number('height', 225);
-  const slideCount = number('slide count', 5, {min: 0, max: 99});
-  const extraSpace = boolean('extra space around?', true);
-  const controls = select('controls', CONTROLS);
-  const loop = boolean('loop', true);
-  const snap = boolean('snap', true);
-  const slideAlign = select('slide align', ['start', 'center']);
-  const minItemWidth = number('min item width', 130, {min: 1});
-  const maxItemWidth = number('max item width', 180, {min: 1});
-  const minVisibleCount = number('min visible count', 3, {min: 1});
-  const maxVisibleCount = number('max visible count', 5, {min: 1});
-  const peek = number('peek', 0, {min: 1});
-  const outsetArrows = boolean('outset arrows', true);
+export const Default = ({
+  controls,
+  extraSpace,
+  height,
+  loop,
+  maxItemWidth,
+  maxVisibleCount,
+  minItemWidth,
+  minVisibleCount,
+  outsetArrows,
+  peek,
+  slideAlign,
+  slideCount,
+  snap,
+  width,
+  ...args
+}) => {
   const colorIncrement = Math.floor(255 / (slideCount + 1));
   return (
     <>
@@ -61,6 +136,7 @@ export const _default = () => {
         maxVisibleCount={maxVisibleCount}
         peek={peek}
         style={{width, height}}
+        {...args}
       >
         {Array.from({length: slideCount}, (_, i) => {
           const v = colorIncrement * (i + 1);
diff --git a/extensions/amp-stream-gallery/1.0/test/test-amp-stream-gallery.js b/extensions/amp-stream-gallery/1.0/test/test-amp-stream-gallery.js
index a380eb50ff2e..47de9beb4692 100644
--- a/extensions/amp-stream-gallery/1.0/test/test-amp-stream-gallery.js
+++ b/extensions/amp-stream-gallery/1.0/test/test-amp-stream-gallery.js
@@ -1,14 +1,18 @@
 import '../../../amp-base-carousel/1.0/amp-base-carousel';
 import '../amp-stream-gallery';
-import {ActionInvocation} from '#service/action-impl';
-import {ActionTrust} from '#core/constants/action-constants';
+import {useStyles} from '#bento/components/bento-base-carousel/1.0/component.jss';
+
+import {ActionTrust_Enum} from '#core/constants/action-constants';
 import {createElementWithAttributes, waitForChildPromise} from '#core/dom';
-import {poll} from '#testing/iframe';
 import {setStyles} from '#core/dom/style';
 import {toArray} from '#core/types/array';
+
 import {toggleExperiment} from '#experiments';
-import {useStyles} from '../../../amp-base-carousel/1.0/component.jss';
+
+import {ActionInvocation} from '#service/action-impl';
+
 import {waitFor} from '#testing/helpers/service';
+import {poll} from '#testing/iframe';
 
 describes.realWin(
   'amp-stream-gallery',
@@ -164,7 +168,7 @@ describes.realWin(
         const source = null;
         const caller = null;
         const event = null;
-        const trust = ActionTrust.DEFAULT;
+        const trust = ActionTrust_Enum.DEFAULT;
         return new ActionInvocation(
           element,
           method,
@@ -176,7 +180,8 @@ describes.realWin(
         );
       }
 
-      it('should execute next and prev actions', async () => {
+      // TODO(#38975): fix skipped test.
+      it.skip('should execute next and prev actions', async () => {
         const eventSpy = env.sandbox.spy();
         element.addEventListener('slideChange', eventSpy);
 
diff --git a/extensions/amp-stream-gallery/1.0/test/test-component.js b/extensions/amp-stream-gallery/1.0/test/test-component.js
index 9541e13a98c8..833bee6ecf8d 100644
--- a/extensions/amp-stream-gallery/1.0/test/test-component.js
+++ b/extensions/amp-stream-gallery/1.0/test/test-component.js
@@ -1,6 +1,8 @@
+import {mount} from 'enzyme';
+
 import * as Preact from '#preact';
+
 import {BentoStreamGallery} from '../component';
-import {mount} from 'enzyme';
 
 describes.sandboxed('StreamGallery preact component', {}, () => {
   it('should render BentoBaseCarousel', () => {
diff --git a/extensions/amp-subscriptions-google/0.1/amp-subscriptions-google.js b/extensions/amp-subscriptions-google/0.1/amp-subscriptions-google.js
index f4dc42422bf8..231e7fdf128b 100644
--- a/extensions/amp-subscriptions-google/0.1/amp-subscriptions-google.js
+++ b/extensions/amp-subscriptions-google/0.1/amp-subscriptions-google.js
@@ -145,7 +145,13 @@ export class GoogleSubscriptionsPlatform {
       )
       .map((exp) => exp.substring(4));
 
-    const swgConfig = {'experiments': ampExperimentsForSwg};
+    // Force skipping the account creation screen in the buyflow
+    const swgConfig = {
+      'experiments': ampExperimentsForSwg,
+    };
+    const clientOptions = {
+      'skipAccountCreationScreen': true,
+    };
     let resolver = null;
     /** @private @const {!ConfiguredRuntime} */
     this.runtime_ = new ConfiguredRuntime(
@@ -155,7 +161,8 @@ export class GoogleSubscriptionsPlatform {
         fetcher: new AmpFetcher(ampdoc.win),
         configPromise: new Promise((resolve) => (resolver = resolve)),
       },
-      swgConfig
+      swgConfig,
+      clientOptions
     );
 
     /** @private @const {!../../../third_party/subscriptions-project/swg.ClientEventManagerApi} */
@@ -492,10 +499,17 @@ export class GoogleSubscriptionsPlatform {
 
   /**
    * Returns URL params - in its own method so we can stub it for testing.
-   * @return {Object<string>}
+   * @return {{[key: string]: string}}
    * @private
    */
   getUrlParams_() {
+    // GAA params should be in the hash for AMP
+    // to avoid being seen as discrete documents
+    // by the AMP cache. However we check for
+    // both just in case.
+    if (/gaa_n=/.test(this.ampdoc_.win.location.hash)) {
+      return parseQueryString(this.ampdoc_.win.location.hash);
+    }
     return parseQueryString(this.ampdoc_.win.location.search);
   }
 
diff --git a/extensions/amp-subscriptions-google/0.1/test-e2e/test-amp-subscriptions-google.js b/extensions/amp-subscriptions-google/0.1/test-e2e/test-amp-subscriptions-google.js
index bd3910508156..143dde4f111e 100644
--- a/extensions/amp-subscriptions-google/0.1/test-e2e/test-amp-subscriptions-google.js
+++ b/extensions/amp-subscriptions-google/0.1/test-e2e/test-amp-subscriptions-google.js
@@ -11,7 +11,8 @@ describes.endtoend(
       controller = env.controller;
     });
 
-    it('Subscription offers should render correctly', async () => {
+    // TODO(#39914): Reliably failed on CI, skip and investigate
+    it.skip('Subscription offers should render correctly', async () => {
       const btn = await controller.findElement('#swg_button');
       // Wait for button to be rendered and ready to click
       await expect(controller.getElementRect(btn)).to.include({
diff --git a/extensions/amp-subscriptions-google/0.1/test/test-amp-subscriptions-google.js b/extensions/amp-subscriptions-google/0.1/test/test-amp-subscriptions-google.js
index 871a22c97fca..c06f164a52e5 100644
--- a/extensions/amp-subscriptions-google/0.1/test/test-amp-subscriptions-google.js
+++ b/extensions/amp-subscriptions-google/0.1/test/test-amp-subscriptions-google.js
@@ -1,3 +1,5 @@
+import {expect} from 'chai';
+
 import {WindowInterface} from '#core/window/interface';
 
 import {toggleExperiment} from '#experiments';
@@ -247,6 +249,38 @@ describes.realWin('amp-subscriptions-google', {amp: true}, (env) => {
     ).to.throw(/enableLAA and enableMetering are mutually exclusive/);
   });
 
+  it('should check the fragment for GAA params first', () => {
+    platform = new GoogleSubscriptionsPlatform(
+      ampdoc,
+      {enableLAA: true},
+      serviceAdapter
+    );
+    ampdoc.win.location.hash = 'gaa_at=la&gaa_sig=fromhash&gaa_n=123456';
+
+    const parsedParams = platform.getUrlParams_();
+
+    expect(parsedParams).to.eql({
+      'gaa_at': 'la',
+      'gaa_sig': 'fromhash',
+      'gaa_n': '123456',
+    });
+  });
+
+  it('should ignore the fragment if does not have have gaa_n', () => {
+    platform = new GoogleSubscriptionsPlatform(
+      ampdoc,
+      {enableLAA: true},
+      serviceAdapter
+    );
+    ampdoc.win.location.hash = 'somthing=not_from_ga';
+
+    const parsedParams = platform.getUrlParams_();
+
+    expect(parsedParams).to.not.eql({
+      'something': 'not_from_gaa',
+    });
+  });
+
   it('should ignore enableLAA and fallback if url params are missing', async () => {
     env.sandbox
       .stub(viewer, 'getReferrerUrl')
diff --git a/extensions/amp-subscriptions-google/OWNERS b/extensions/amp-subscriptions-google/OWNERS
index bca1de28b7c1..5ab764df0487 100644
--- a/extensions/amp-subscriptions-google/OWNERS
+++ b/extensions/amp-subscriptions-google/OWNERS
@@ -5,12 +5,11 @@
   rules: [
     {
       owners: [
-        {name: 'chenshay'},
+        {name: 'alin04'},
         {name: 'chrisantaki'},
-        {name: 'dvoytenko'},
-        {name: 'elijahsoria'},
-        {name: 'jpettitt'},
-        {name: 'qidonna'},
+        {name: 'fikus'},
+        {name: 'hartmannr76'},
+        {name: 'jpettitt', notify: true},
       ],
     },
   ],
diff --git a/extensions/amp-subscriptions/0.1/actions.js b/extensions/amp-subscriptions/0.1/actions.js
index 4f5ba7c0454f..d27117380632 100644
--- a/extensions/amp-subscriptions/0.1/actions.js
+++ b/extensions/amp-subscriptions/0.1/actions.js
@@ -1,9 +1,11 @@
+import {parseQueryString} from '#core/types/string/url';
+
+import {dev, userAssert} from '#utils/log';
+
 import {ActionStatus} from './analytics';
+
 import {assertHttpsUrl} from '../../../src/url';
-import {dev, userAssert} from '#utils/log';
-import {dict} from '#core/types/object';
 import {openLoginDialog} from '../../amp-access/0.1/login-dialog';
-import {parseQueryString} from '#core/types/string/url';
 
 const TAG = 'amp-subscriptions';
 const LOCAL = 'local';
@@ -15,7 +17,7 @@ export class Actions {
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
    * @param {!./url-builder.UrlBuilder} urlBuilder
    * @param {!./analytics.SubscriptionAnalytics} analytics
-   * @param {!Object<string, string>} actionMap
+   * @param {!{[key: string]: string}} actionMap
    */
   constructor(ampdoc, urlBuilder, analytics, actionMap) {
     // Check that all URLs are valid.
@@ -23,10 +25,10 @@ export class Actions {
       assertHttpsUrl(actionMap[k], `action ${k}`);
     }
 
-    /** @private @const {!Object<string, string>} */
+    /** @private @const {!{[key: string]: string}} */
     this.actionsConfig_ = actionMap;
-    /** @private @const {!Object<string, string>} */
-    this.builtActionUrlMap_ = dict();
+    /** @private @const {!{[key: string]: string}} */
+    this.builtActionUrlMap_ = {};
     /** @private @const {!./url-builder.UrlBuilder} */
     this.urlBuilder_ = urlBuilder;
     /** @private @const {!./analytics.SubscriptionAnalytics} */
@@ -43,7 +45,7 @@ export class Actions {
   }
 
   /**
-   * @return {?Promise<!Object<string, string>>}
+   * @return {?Promise<!{[key: string]: string}>}
    */
   build() {
     if (Object.keys(this.actionsConfig_).length == 0) {
diff --git a/extensions/amp-subscriptions/0.1/amp-subscriptions.js b/extensions/amp-subscriptions/0.1/amp-subscriptions.js
index 2bc9557188a5..8314a428c7d2 100644
--- a/extensions/amp-subscriptions/0.1/amp-subscriptions.js
+++ b/extensions/amp-subscriptions/0.1/amp-subscriptions.js
@@ -1,34 +1,39 @@
+import {getValueForExpr} from '#core/types/object';
+import {tryParseJson} from '#core/types/object/json';
+
+import {Services} from '#service';
+
+import {dev, devAssert, user, userAssert} from '#utils/log';
+import {isStoryDocument} from '#utils/story';
+
+import {
+  PageConfig as PageConfigInterface,
+  PageConfigResolver,
+} from '#third_party/subscriptions-project/config';
+
 import {
   ActionStatus,
   SubscriptionAnalytics,
   SubscriptionAnalyticsEvents,
 } from './analytics';
-import {CSS} from '../../../build/amp-subscriptions-0.1.css';
+import {ENTITLEMENTS_REQUEST_TIMEOUT} from './constants';
 import {CryptoHandler} from './crypto-handler';
 import {Dialog} from './dialog';
 import {DocImpl} from './doc-impl';
-import {ENTITLEMENTS_REQUEST_TIMEOUT} from './constants';
 import {Entitlement, GrantReason} from './entitlement';
+import {localSubscriptionPlatformFactory} from './local-subscription-platform';
 import {Metering} from './metering';
-import {
-  PageConfig as PageConfigInterface,
-  PageConfigResolver,
-} from '#third_party/subscriptions-project/config';
 import {PlatformStore} from './platform-store';
 import {Renderer} from './renderer';
 import {ServiceAdapter} from './service-adapter';
-import {Services} from '#service';
 import {SubscriptionPlatform as SubscriptionPlatformInterface} from './subscription-platform';
 import {ViewerSubscriptionPlatform} from './viewer-subscription-platform';
 import {ViewerTracker} from './viewer-tracker';
-import {dev, devAssert, user, userAssert} from '#utils/log';
-import {dict, getValueForExpr} from '#core/types/object';
+
+import {CSS} from '../../../build/amp-subscriptions-0.1.css';
 import {getMode} from '../../../src/mode';
-import {getWinOrigin} from '../../../src/url';
 import {installStylesForDoc} from '../../../src/style-installer';
-import {isStoryDocument} from '#utils/story';
-import {localSubscriptionPlatformFactory} from './local-subscription-platform';
-import {tryParseJson} from '#core/types/object/json';
+import {getWinOrigin} from '../../../src/url';
 
 /** @const */
 const TAG = 'amp-subscriptions';
@@ -110,7 +115,7 @@ export class SubscriptionService {
     /** @private @const {!Promise<!../../../src/service/cid-impl.CidDef>} */
     this.cid_ = Services.cidForDoc(ampdoc);
 
-    /** @private {!Object<string, ?Promise<string>>} */
+    /** @private {!{[key: string]: ?Promise<string>}} */
     this.platformKeyToReaderIdPromiseMap_ = {};
 
     /** @private {!CryptoHandler} */
@@ -161,6 +166,13 @@ export class SubscriptionService {
         });
 
       isStoryDocument(this.ampdoc_).then((isStory) => {
+        if (isStory) {
+          // Make the dialog with round corners for AMP Story.
+          const dialogWrapperEl = this.dialog_.getRoot();
+          dialogWrapperEl.classList.add(
+            'i-amphtml-story-subscriptions-dialog-wrapper'
+          );
+        }
         // Delegates the platform selection and activation call if is story.
         this.startAuthorizationFlow_(!isStory /** shouldActivatePlatform */);
       });
@@ -196,6 +208,36 @@ export class SubscriptionService {
     return this.dialog_;
   }
 
+  /**
+   * Maybe renders and opens the dialog using the cached entitlements. Do nothing if the viewer can authorize the user.
+   * @return {!Promise}
+   */
+  maybeRenderDialogForSelectedPlatform() {
+    return this.initialize_().then(() => {
+      if (this.doesViewerProvideAuth_ || this.platformConfig_['alwaysGrant']) {
+        return;
+      }
+
+      return this.selectAndActivatePlatform_();
+    });
+  }
+
+  /**
+   * @return {!Promise<boolean>}
+   */
+  getGrantStatus() {
+    return this.platformStore_.getGrantStatus();
+  }
+
+  /**
+   * This registers a callback which is called whenever a platform key is resolved
+   * with an entitlement.
+   * @param {function(!EntitlementChangeEventDef):void} callback
+   */
+  addOnEntitlementResolvedCallback(callback) {
+    this.platformStore_.addOnEntitlementResolvedCallback(callback);
+  }
+
   /**
    * Returns encrypted document key if it exists.
    * This key is needed for requesting a different key
@@ -788,14 +830,14 @@ export class SubscriptionService {
         devAssert(platform, 'Platform is not registered');
         this.subscriptionAnalytics_.event(
           SubscriptionAnalyticsEvents.ACTION_DELEGATED,
-          dict({
+          {
             'action': action,
             'serviceId': platformKey,
-          }),
-          dict({
+          },
+          {
             'action': action,
             'status': ActionStatus.STARTED,
-          })
+          }
         );
         resolve(platform.executeAction(action, sourceId));
       });
diff --git a/extensions/amp-subscriptions/0.1/analytics.js b/extensions/amp-subscriptions/0.1/analytics.js
index a8c10bd1baa3..3a26ebf66bb9 100644
--- a/extensions/amp-subscriptions/0.1/analytics.js
+++ b/extensions/amp-subscriptions/0.1/analytics.js
@@ -1,4 +1,3 @@
-import {dict} from '#core/types/object';
 import {triggerAnalyticsEvent} from '#utils/analytics';
 import {user} from '#utils/log';
 
@@ -87,14 +86,10 @@ export class SubscriptionAnalytics {
   serviceEvent(eventType, platformKey, opt_vars, internalVars) {
     this.event(
       eventType,
-      /** @type {!JsonObject} */ (
-        Object.assign(
-          dict({
-            'serviceId': platformKey,
-          }),
-          opt_vars
-        )
-      ),
+      /** @type {!JsonObject} */ ({
+        'serviceId': platformKey,
+        ...opt_vars,
+      }),
       internalVars
     );
   }
@@ -105,7 +100,7 @@ export class SubscriptionAnalytics {
    * @param {!JsonObject=} internalVars
    */
   event(eventType, opt_vars, internalVars) {
-    internalVars = internalVars || dict({});
+    internalVars = internalVars || {};
 
     const loggedString =
       eventType !== SubscriptionAnalyticsEvents.SUBSCRIPTIONS_ACTION
@@ -114,7 +109,7 @@ export class SubscriptionAnalytics {
 
     user().info(TAG, loggedString, opt_vars || '');
 
-    opt_vars = opt_vars || dict({});
+    opt_vars = opt_vars || {};
     triggerAnalyticsEvent(
       this.element_,
       loggedString,
@@ -138,10 +133,10 @@ export class SubscriptionAnalytics {
       SubscriptionAnalyticsEvents.SUBSCRIPTIONS_ACTION,
       platformKey,
       opt_vars,
-      dict({
+      {
         'action': action,
         'status': status,
-      })
+      }
     );
   }
 }
diff --git a/extensions/amp-subscriptions/0.1/crypto-handler.js b/extensions/amp-subscriptions/0.1/crypto-handler.js
index 2bf3bb9ee56f..13acdb667d84 100644
--- a/extensions/amp-subscriptions/0.1/crypto-handler.js
+++ b/extensions/amp-subscriptions/0.1/crypto-handler.js
@@ -1,13 +1,13 @@
+import {toArray} from '#core/types/array';
+import {tryParseJson} from '#core/types/object/json';
+import {padStart} from '#core/types/string';
+import {utf8Encode} from '#core/types/string/bytes';
+
 import {
   base64Decode,
   decryptAesGcmImpl,
   safeAesGcmImportKey,
 } from '#third_party/subscriptions-project/aes_gcm';
-import {iterateCursor} from '#core/dom';
-import {padStart} from '#core/types/string';
-import {toArray} from '#core/types/array';
-import {tryParseJson} from '#core/types/object/json';
-import {utf8Encode} from '#core/types/string/bytes';
 
 export class CryptoHandler {
   /**
@@ -110,7 +110,7 @@ export class CryptoHandler {
           .getRootNode()
           .querySelectorAll('script[ciphertext]');
         const promises = [];
-        iterateCursor(encryptedSections, (encryptedSection) => {
+        encryptedSections.forEach((encryptedSection) => {
           const text = encryptedSection.textContent.replace(/\s+/g, '');
           const contentBuffer = base64Decode(text).buffer;
           const iv = contentBuffer.slice(0, 12);
diff --git a/extensions/amp-subscriptions/0.1/dialog.js b/extensions/amp-subscriptions/0.1/dialog.js
index 71509a0e5db6..3079e96b718f 100644
--- a/extensions/amp-subscriptions/0.1/dialog.js
+++ b/extensions/amp-subscriptions/0.1/dialog.js
@@ -1,7 +1,8 @@
-import {Services} from '#service';
 import {createElementWithAttributes} from '#core/dom';
 import {setImportantStyles, toggle} from '#core/dom/style';
 
+import {Services} from '#service';
+
 export class Dialog {
   /**
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
diff --git a/extensions/amp-subscriptions/0.1/doc-impl.js b/extensions/amp-subscriptions/0.1/doc-impl.js
index 6303cad7bd1d..0f44ae3dad8f 100644
--- a/extensions/amp-subscriptions/0.1/doc-impl.js
+++ b/extensions/amp-subscriptions/0.1/doc-impl.js
@@ -1,7 +1,9 @@
-import {Doc} from '#third_party/subscriptions-project/config';
 import {Services} from '#service';
+
 import {dev} from '#utils/log';
 
+import {Doc} from '#third_party/subscriptions-project/config';
+
 /**
  * Adopts config document to ampdoc.
  * @implements {Doc}
diff --git a/extensions/amp-subscriptions/0.1/entitlement.js b/extensions/amp-subscriptions/0.1/entitlement.js
index 15dbfed52507..6b9ee857f4db 100644
--- a/extensions/amp-subscriptions/0.1/entitlement.js
+++ b/extensions/amp-subscriptions/0.1/entitlement.js
@@ -1,5 +1,3 @@
-import {dict} from '#core/types/object';
-
 /** @enum {string} */
 export const GrantReason = {
   'SUBSCRIBER': 'SUBSCRIBER',
@@ -73,13 +71,13 @@ export class Entitlement {
    * @return {!JsonObject}
    */
   json() {
-    const entitlementJson = dict({
+    const entitlementJson = {
       'source': this.source,
       'service': this.service,
       'granted': this.granted,
       'grantReason': this.grantReason,
       'data': this.data,
-    });
+    };
     return entitlementJson;
   }
 
@@ -99,7 +97,7 @@ export class Entitlement {
    */
   static parseFromJson(json, rawData = null) {
     if (!json) {
-      json = dict();
+      json = {};
     }
     const raw = rawData || JSON.stringify(json);
     const source = json['source'] || '';
diff --git a/extensions/amp-subscriptions/0.1/local-subscription-platform-base.js b/extensions/amp-subscriptions/0.1/local-subscription-platform-base.js
index 20a0f53b7459..40d7a45de461 100644
--- a/extensions/amp-subscriptions/0.1/local-subscription-platform-base.js
+++ b/extensions/amp-subscriptions/0.1/local-subscription-platform-base.js
@@ -1,9 +1,11 @@
-import {Action} from './analytics';
+import {closestAncestorElementBySelector} from '#core/dom/query';
+
+import {dev, userAssert} from '#utils/log';
+
 import {Actions} from './actions';
+import {Action} from './analytics';
 import {LocalSubscriptionPlatformRenderer} from './local-subscription-platform-renderer';
 import {UrlBuilder} from './url-builder';
-import {closestAncestorElementBySelector} from '#core/dom/query';
-import {dev, userAssert} from '#utils/log';
 
 /**
  * Surrogate property added to click events marking them as handled by the
diff --git a/extensions/amp-subscriptions/0.1/local-subscription-platform-iframe.js b/extensions/amp-subscriptions/0.1/local-subscription-platform-iframe.js
index 3a5401cc7ea6..068742ecd0d1 100644
--- a/extensions/amp-subscriptions/0.1/local-subscription-platform-iframe.js
+++ b/extensions/amp-subscriptions/0.1/local-subscription-platform-iframe.js
@@ -1,12 +1,15 @@
 import {Deferred} from '#core/data-structures/promise';
+import {toggle} from '#core/dom/style';
+import {isArray} from '#core/types';
+import {parseJson} from '#core/types/object/json';
+
+import {devAssert, userAssert} from '#utils/log';
+
 import {Entitlement} from './entitlement';
 import {LocalSubscriptionBasePlatform} from './local-subscription-platform-base';
-import {Messenger} from '../../amp-access/0.1/iframe-api/messenger';
+
 import {assertHttpsUrl, parseUrlDeprecated} from '../../../src/url';
-import {devAssert, userAssert} from '#utils/log';
-import {isArray} from '#core/types';
-import {parseJson} from '#core/types/object/json';
-import {toggle} from '#core/dom/style';
+import {Messenger} from '../../amp-access/0.1/iframe-api/messenger';
 
 /**
  * Implments the iframe local subscriptions platform which provides
diff --git a/extensions/amp-subscriptions/0.1/local-subscription-platform-remote.js b/extensions/amp-subscriptions/0.1/local-subscription-platform-remote.js
index c6d96015a53f..c15f9abe6d62 100644
--- a/extensions/amp-subscriptions/0.1/local-subscription-platform-remote.js
+++ b/extensions/amp-subscriptions/0.1/local-subscription-platform-remote.js
@@ -1,10 +1,13 @@
+import {isArray} from '#core/types';
+
+import {Services} from '#service';
+
+import {devAssert, userAssert} from '#utils/log';
+
 import {Entitlement} from './entitlement';
 import {LocalSubscriptionBasePlatform} from './local-subscription-platform-base';
-import {Services} from '#service';
+
 import {addParamToUrl, assertHttpsUrl} from '../../../src/url';
-import {devAssert, userAssert} from '#utils/log';
-import {dict} from '#core/types/object';
-import {isArray} from '#core/types';
 
 /**
  * Implments the remotel local subscriptions platform which uses
@@ -130,9 +133,9 @@ export class LocalSubscriptionRemotePlatform extends LocalSubscriptionBasePlatfo
       return this.xhr_.sendSignal(url, {
         method: 'POST',
         credentials: 'include',
-        headers: dict({
+        headers: {
           'Content-Type': 'text/plain',
-        }),
+        },
         body: this.stringifyPingbackData_(selectedEntitlement),
       });
     });
diff --git a/extensions/amp-subscriptions/0.1/local-subscription-platform-renderer.js b/extensions/amp-subscriptions/0.1/local-subscription-platform-renderer.js
index aa2b04c2dd5a..9b8b23b73fb7 100644
--- a/extensions/amp-subscriptions/0.1/local-subscription-platform-renderer.js
+++ b/extensions/amp-subscriptions/0.1/local-subscription-platform-renderer.js
@@ -1,5 +1,5 @@
 import {Services} from '#service';
-import {dict} from '#core/types/object';
+
 import {evaluateExpr} from './expr';
 
 /**
@@ -49,7 +49,7 @@ export class LocalSubscriptionPlatformRenderer {
     // Close dialog. Ignored if the dialog is not currently open.
     this.dialog_.close();
     // Hide subscriptions sections.
-    return this.renderActionsInNode_(dict(), this.rootNode_, () => false);
+    return this.renderActionsInNode_({}, this.rootNode_, () => false);
   }
 
   /**
diff --git a/extensions/amp-subscriptions/0.1/platform-store.js b/extensions/amp-subscriptions/0.1/platform-store.js
index b22d7a25aed6..6df319dfe2ac 100644
--- a/extensions/amp-subscriptions/0.1/platform-store.js
+++ b/extensions/amp-subscriptions/0.1/platform-store.js
@@ -1,9 +1,11 @@
-import {DEFAULT_SCORE_CONFIG, SubscriptionsScoreFactor} from './constants';
-import {Deferred} from '#core/data-structures/promise';
-import {Entitlement} from './entitlement';
 import {Observable} from '#core/data-structures/observable';
+import {Deferred} from '#core/data-structures/promise';
+import {hasOwn} from '#core/types/object';
+
 import {devAssert, user} from '#utils/log';
-import {dict, hasOwn} from '#core/types/object';
+
+import {DEFAULT_SCORE_CONFIG, SubscriptionsScoreFactor} from './constants';
+import {Entitlement} from './entitlement';
 
 /** @typedef {{platformKey: string, entitlement: (!./entitlement.Entitlement|undefined)}} */
 export let EntitlementChangeEventDef;
@@ -25,23 +27,30 @@ let PlatformWeightDef;
 export class PlatformStore {
   /**
    * @param {!Array<string>} platformKeys
-   * @param {!JsonObject|Object<string, number>} scoreConfig
+   * @param {!JsonObject|{[key: string]: number}} scoreConfig
    * @param {!./entitlement.Entitlement} fallbackEntitlement
-   * @param {Object<string, !./subscription-platform.SubscriptionPlatform>=} opt_Platforms
+   * @param {{[key: string]: !./subscription-platform.SubscriptionPlatform}=} opt_Platforms
+   * @param {!Observable<!EntitlementChangeEventDef>} opt_externalOnEntitlementResolvedCallbacks
    */
-  constructor(platformKeys, scoreConfig, fallbackEntitlement, opt_Platforms) {
-    /** @private @const {!Object<string, !./subscription-platform.SubscriptionPlatform>} */
-    this.subscriptionPlatforms_ = opt_Platforms || dict();
+  constructor(
+    platformKeys,
+    scoreConfig,
+    fallbackEntitlement,
+    opt_Platforms,
+    opt_externalOnEntitlementResolvedCallbacks
+  ) {
+    /** @private @const {!{[key: string]: !./subscription-platform.SubscriptionPlatform}} */
+    this.subscriptionPlatforms_ = opt_Platforms || {};
 
     /** @private @const {!Array<string>} */
     this.platformKeys_ = platformKeys;
 
-    /** @private @const {!Object<string, !./entitlement.Entitlement>} */
+    /** @private @const {!{[key: string]: !./entitlement.Entitlement}} */
     this.entitlements_ = {};
 
     /**
      * @private @const
-     * {!Object<string, !Deferred<!./entitlement.Entitlement>>}
+     * {!{[key: string]: !Deferred<!./entitlement.Entitlement>}}
      */
     this.entitlementDeferredMap_ = {};
     platformKeys.forEach((platformKey) => {
@@ -72,8 +81,14 @@ export class PlatformStore {
     /** @private @const {!./entitlement.Entitlement} */
     this.fallbackEntitlement_ = fallbackEntitlement;
 
-    /** @private @const {!Object<string, number>} */
+    /** @private @const {!{[key: string]: number}} */
     this.scoreConfig_ = Object.assign(DEFAULT_SCORE_CONFIG, scoreConfig);
+
+    /** @private @const {!Observable<!EntitlementChangeEventDef>} */
+    this.externalOnEntitlementResolvedCallbacks_ =
+      opt_externalOnEntitlementResolvedCallbacks
+        ? opt_externalOnEntitlementResolvedCallbacks
+        : new Observable();
   }
 
   /**
@@ -104,7 +119,8 @@ export class PlatformStore {
       this.platformKeys_,
       this.scoreConfig_,
       this.fallbackEntitlement_,
-      this.subscriptionPlatforms_
+      this.subscriptionPlatforms_,
+      this.externalOnEntitlementResolvedCallbacks_
     );
   }
 
@@ -193,6 +209,15 @@ export class PlatformStore {
     this.onEntitlementResolvedCallbacks_.add(callback);
   }
 
+  /**
+   * This registers a callback which is called whenever a platform key is resolved
+   * with an entitlement.
+   * @param {function(!EntitlementChangeEventDef):void} callback
+   */
+  addOnEntitlementResolvedCallback(callback) {
+    this.externalOnEntitlementResolvedCallbacks_.add(callback);
+  }
+
   /**
    * This resolves the entitlement to a platformKey
    * @param {string} platformKey
@@ -222,6 +247,10 @@ export class PlatformStore {
       platformKey,
       entitlement,
     });
+    this.externalOnEntitlementResolvedCallbacks_.fire({
+      platformKey,
+      entitlement,
+    });
   }
 
   /**
@@ -267,10 +296,10 @@ export class PlatformStore {
    * }
    */
   getScoreFactorStates() {
-    const states = dict({});
+    const states = {};
     return Promise.all(
       this.platformKeys_.map((platformId) => {
-        states[platformId] = dict();
+        states[platformId] = {};
         return Promise.all(
           Object.values(SubscriptionsScoreFactor).map((scoreFactor) =>
             this.getScoreFactorPromiseFor_(platformId, scoreFactor).then(
diff --git a/extensions/amp-subscriptions/0.1/renderer.js b/extensions/amp-subscriptions/0.1/renderer.js
index ada41c1cc69a..2812599e3e36 100644
--- a/extensions/amp-subscriptions/0.1/renderer.js
+++ b/extensions/amp-subscriptions/0.1/renderer.js
@@ -1,7 +1,7 @@
-import {Services} from '#service';
-import {childElementByTag} from '#core/dom/query';
 import {createElementWithAttributes} from '#core/dom';
-import {dict} from '#core/types/object';
+import {childElementByTag} from '#core/dom/query';
+
+import {Services} from '#service';
 
 const CSS_PREFIX = 'i-amphtml-subs';
 
@@ -66,10 +66,10 @@ export class Renderer {
         const element = createElementWithAttributes(
           this.ampdoc_.win.document,
           'div',
-          dict({
+          {
             'class': 'i-amphtml-subs-progress',
             'subscriptions-section': 'loading',
-          })
+          }
         );
         // The loading indicator will be either inserted right before the
         // `<footer>` node or appended as the last child.
diff --git a/extensions/amp-subscriptions/0.1/test/test-actions.js b/extensions/amp-subscriptions/0.1/test/test-actions.js
index 8f1583f3901b..76e11e0b144b 100644
--- a/extensions/amp-subscriptions/0.1/test/test-actions.js
+++ b/extensions/amp-subscriptions/0.1/test/test-actions.js
@@ -1,12 +1,12 @@
+import {WebLoginDialog} from '../../../amp-access/0.1/login-dialog';
+import {Actions} from '../actions';
 import {
   Action,
   ActionStatus,
   SubscriptionAnalytics,
   SubscriptionAnalyticsEvents,
 } from '../analytics';
-import {Actions} from '../actions';
 import {UrlBuilder} from '../url-builder';
-import {WebLoginDialog} from '../../../amp-access/0.1/login-dialog';
 
 const LOCAL = 'local';
 const LOCAL_OPTS = {serviceId: LOCAL};
diff --git a/extensions/amp-subscriptions/0.1/test/test-amp-subscriptions.js b/extensions/amp-subscriptions/0.1/test/test-amp-subscriptions.js
index 0ec2240ffd56..bc909e1cb555 100644
--- a/extensions/amp-subscriptions/0.1/test/test-amp-subscriptions.js
+++ b/extensions/amp-subscriptions/0.1/test/test-amp-subscriptions.js
@@ -1,19 +1,24 @@
+import {Services} from '#service';
+
 import * as utilsStory from '#utils/story';
-import {Entitlement, GrantReason} from '../entitlement';
-import {LocalSubscriptionIframePlatform} from '../local-subscription-platform-iframe';
-import {LocalSubscriptionRemotePlatform} from '../local-subscription-platform-remote';
+
+import {sleep} from '#testing/helpers';
+
 import {
   PageConfig,
   PageConfigResolver,
 } from '#third_party/subscriptions-project/config';
+
+import {SubscriptionService} from '../amp-subscriptions';
+import {SubscriptionAnalyticsEvents} from '../analytics';
+import {Entitlement, GrantReason} from '../entitlement';
+import {localSubscriptionPlatformFactory} from '../local-subscription-platform';
+import {LocalSubscriptionIframePlatform} from '../local-subscription-platform-iframe';
+import {LocalSubscriptionRemotePlatform} from '../local-subscription-platform-remote';
 import {PlatformStore} from '../platform-store';
 import {ServiceAdapter} from '../service-adapter';
-import {Services} from '#service';
-import {SubscriptionAnalyticsEvents} from '../analytics';
 import {SubscriptionPlatform} from '../subscription-platform';
-import {SubscriptionService} from '../amp-subscriptions';
 import {ViewerSubscriptionPlatform} from '../viewer-subscription-platform';
-import {localSubscriptionPlatformFactory} from '../local-subscription-platform';
 
 describes.fakeWin('AmpSubscriptions', {amp: true}, (env) => {
   let win;
@@ -545,6 +550,146 @@ describes.fakeWin('AmpSubscriptions', {amp: true}, (env) => {
         }
       );
     });
+
+    describe('maybeRenderDialogForSelectedPlatform', () => {
+      beforeEach(() => {
+        isStory = true;
+
+        env.sandbox.stub(subscriptionService, 'fetchEntitlements_');
+        subscriptionService.start();
+        subscriptionService.viewTrackerPromise_ = Promise.resolve();
+      });
+
+      it('should select and activate platform with granted status if not free and not embedded in the viewer', async () => {
+        await subscriptionService.initialize_();
+        await flush();
+        resolveRequiredPromises({
+          granted: true,
+          grantReason: GrantReason.SUBSCRIBER,
+        });
+
+        const localPlatform =
+          subscriptionService.platformStore_.getLocalPlatform_();
+        expect(localPlatform).to.be.not.null;
+        const selectPlatformStub =
+          subscriptionService.platformStore_.selectPlatform;
+        const activateStub = env.sandbox.stub(localPlatform, 'activate');
+
+        await subscriptionService.maybeRenderDialogForSelectedPlatform();
+
+        expect(activateStub).to.be.calledOnce;
+        expect(activateStub.firstCall.args[0].source).to.equal('local');
+        expect(activateStub.firstCall.args[1].source).to.equal('local');
+        expect(selectPlatformStub).to.be.called;
+        expect(analyticsEventStub).to.be.calledWith(
+          SubscriptionAnalyticsEvents.PLATFORM_ACTIVATED,
+          {
+            'serviceId': 'local',
+          }
+        );
+        expect(analyticsEventStub).to.be.calledWith(
+          SubscriptionAnalyticsEvents.ACCESS_GRANTED,
+          {
+            'serviceId': 'local',
+          }
+        );
+        expect(analyticsEventStub).to.not.be.calledWith(
+          SubscriptionAnalyticsEvents.PAYWALL_ACTIVATED
+        );
+      });
+
+      it('should select and activate platform with non-granted status if not free and not embedded in the viewer', async () => {
+        await subscriptionService.initialize_();
+        await flush();
+        resolveRequiredPromises({
+          granted: false,
+        });
+
+        const localPlatform =
+          subscriptionService.platformStore_.getLocalPlatform_();
+        expect(localPlatform).to.be.not.null;
+        const selectPlatformStub =
+          subscriptionService.platformStore_.selectPlatform;
+        const activateStub = env.sandbox.stub(localPlatform, 'activate');
+
+        await subscriptionService.maybeRenderDialogForSelectedPlatform();
+
+        expect(activateStub).to.be.calledOnce;
+        expect(activateStub.firstCall.args[0].source).to.equal('local');
+        expect(selectPlatformStub).to.be.called;
+        expect(analyticsEventStub).to.be.calledWith(
+          SubscriptionAnalyticsEvents.PLATFORM_ACTIVATED,
+          {
+            'serviceId': 'local',
+          }
+        );
+        expect(analyticsEventStub).to.be.calledWith(
+          SubscriptionAnalyticsEvents.PAYWALL_ACTIVATED,
+          {
+            'serviceId': 'local',
+          }
+        );
+        expect(analyticsEventStub).to.be.calledWith(
+          SubscriptionAnalyticsEvents.ACCESS_DENIED,
+          {
+            'serviceId': 'local',
+          }
+        );
+      });
+
+      it('should not select and activate platform if the viewer does provide auth', async () => {
+        env.sandbox.stub(subscriptionService, 'initialize_').callsFake(() => {
+          subscriptionService.platformConfig_ = platformConfig;
+          subscriptionService.doesViewerProvideAuth_ = true;
+          return Promise.resolve();
+        });
+
+        await subscriptionService.initialize_();
+        await flush();
+        resolveRequiredPromises({
+          granted: true,
+          grantReason: GrantReason.SUBSCRIBER,
+        });
+
+        const localPlatform =
+          subscriptionService.platformStore_.getLocalPlatform_();
+        expect(localPlatform).to.be.not.null;
+        const selectPlatformStub =
+          subscriptionService.platformStore_.selectPlatform;
+        const activateStub = env.sandbox.stub(localPlatform, 'activate');
+
+        await subscriptionService.maybeRenderDialogForSelectedPlatform();
+
+        expect(activateStub).to.not.be.calledOnce;
+        expect(selectPlatformStub).to.not.be.called;
+      });
+
+      it('should not select and activate platform if the platform config is alwaysGrant', async () => {
+        env.sandbox.stub(subscriptionService, 'initialize_').callsFake(() => {
+          subscriptionService.platformConfig_ = freePlatformConfig;
+          return Promise.resolve();
+        });
+
+        await subscriptionService.initialize_();
+        await flush();
+        resolveRequiredPromises({
+          granted: true,
+          grantReason: GrantReason.SUBSCRIBER,
+        });
+
+        const localPlatform =
+          subscriptionService.platformStore_.getLocalPlatform_();
+        expect(localPlatform).to.be.not.null;
+        const selectPlatformStub =
+          subscriptionService.platformStore_.selectPlatform;
+        const activateStub = env.sandbox.stub(localPlatform, 'activate');
+
+        await subscriptionService.maybeRenderDialogForSelectedPlatform();
+
+        expect(activateStub).to.not.be.calledOnce;
+        expect(selectPlatformStub).to.not.be.called;
+      });
+    });
   });
 
   describe('startAuthorizationFlow_', () => {
@@ -774,7 +919,7 @@ describes.fakeWin('AmpSubscriptions', {amp: true}, (env) => {
     it('should report failure if platform timeouts', (done) => {
       env.sandbox
         .stub(platform, 'getEntitlements')
-        .callsFake(() => new Promise((resolve) => setTimeout(resolve, 8000)));
+        .callsFake(() => sleep(8000));
       const failureStub = env.sandbox.stub(
         subscriptionService.platformStore_,
         'reportPlatformFailureAndFallback'
diff --git a/extensions/amp-subscriptions/0.1/test/test-analytics.js b/extensions/amp-subscriptions/0.1/test/test-analytics.js
index 1f5e9e531132..c69a0341d10c 100644
--- a/extensions/amp-subscriptions/0.1/test/test-analytics.js
+++ b/extensions/amp-subscriptions/0.1/test/test-analytics.js
@@ -1,10 +1,11 @@
 import * as AmpAnalytics from '#utils/analytics';
+import {user} from '#utils/log';
+
 import {
   ActionStatus,
   SubscriptionAnalytics,
   SubscriptionAnalyticsEvents,
 } from '../analytics';
-import {user} from '#utils/log';
 
 //--> env.sandbox.stub(ServiceUrl, 'adsUrl', url => serverUrl + url);
 
diff --git a/extensions/amp-subscriptions/0.1/test/test-crypto-handler.js b/extensions/amp-subscriptions/0.1/test/test-crypto-handler.js
index af2756efa47c..3c5f5f8b6edc 100644
--- a/extensions/amp-subscriptions/0.1/test/test-crypto-handler.js
+++ b/extensions/amp-subscriptions/0.1/test/test-crypto-handler.js
@@ -1,6 +1,7 @@
-import {CryptoHandler} from '../crypto-handler';
 import {decryptAesGcm} from '#third_party/subscriptions-project/aes_gcm';
 
+import {CryptoHandler} from '../crypto-handler';
+
 describes.realWin(
   'crypto handler',
   {
diff --git a/extensions/amp-subscriptions/0.1/test/test-dialog.js b/extensions/amp-subscriptions/0.1/test/test-dialog.js
index cf7e4f3625b8..f26c96cee6a1 100644
--- a/extensions/amp-subscriptions/0.1/test/test-dialog.js
+++ b/extensions/amp-subscriptions/0.1/test/test-dialog.js
@@ -1,8 +1,10 @@
-import {CSS} from '../../../../build/amp-subscriptions-0.1.css';
-import {Dialog} from '../dialog';
-import {Services} from '#service';
 import {createElementWithAttributes} from '#core/dom';
+
+import {Services} from '#service';
+
+import {CSS} from '../../../../build/amp-subscriptions-0.1.css';
 import {installStylesForDoc} from '../../../../src/style-installer';
+import {Dialog} from '../dialog';
 
 describes.realWin('AmpSubscriptions Dialog', {amp: true}, (env) => {
   let win, doc, ampdoc;
diff --git a/extensions/amp-subscriptions/0.1/test/test-local-subscription-rendering.js b/extensions/amp-subscriptions/0.1/test/test-local-subscription-rendering.js
index 6ba65bcbdf4d..7a53ccb241bf 100644
--- a/extensions/amp-subscriptions/0.1/test/test-local-subscription-rendering.js
+++ b/extensions/amp-subscriptions/0.1/test/test-local-subscription-rendering.js
@@ -1,10 +1,12 @@
+import {createElementWithAttributes} from '#core/dom';
+
+import {Services} from '#service';
+
 import {Action} from '../analytics';
 import {Dialog} from '../dialog';
 import {Entitlement} from '../entitlement';
 import {LocalSubscriptionPlatformRenderer} from '../local-subscription-platform-renderer';
 import {ServiceAdapter} from '../service-adapter';
-import {Services} from '#service';
-import {createElementWithAttributes} from '#core/dom';
 
 describes.realWin('local-subscriptions-rendering', {amp: true}, (env) => {
   let win, doc, ampdoc;
diff --git a/extensions/amp-subscriptions/0.1/test/test-local-subscriptions-iframe-platform.js b/extensions/amp-subscriptions/0.1/test/test-local-subscriptions-iframe-platform.js
index f972e6a7a46a..bda102797fb1 100644
--- a/extensions/amp-subscriptions/0.1/test/test-local-subscriptions-iframe-platform.js
+++ b/extensions/amp-subscriptions/0.1/test/test-local-subscriptions-iframe-platform.js
@@ -1,12 +1,13 @@
+import {PageConfig} from '#third_party/subscriptions-project/config';
+
+import {Messenger} from '../../../amp-access/0.1/iframe-api/messenger';
 import {Action, SubscriptionAnalytics} from '../analytics';
 import {Dialog} from '../dialog';
 import {Entitlement} from '../entitlement';
+import {localSubscriptionPlatformFactory} from '../local-subscription-platform';
 import {LocalSubscriptionIframePlatform} from '../local-subscription-platform-iframe';
-import {Messenger} from '../../../amp-access/0.1/iframe-api/messenger';
-import {PageConfig} from '#third_party/subscriptions-project/config';
 import {ServiceAdapter} from '../service-adapter';
 import {UrlBuilder} from '../url-builder';
-import {localSubscriptionPlatformFactory} from '../local-subscription-platform';
 
 describes.fakeWin('LocalSubscriptionsIframePlatform', {amp: true}, (env) => {
   let ampdoc;
diff --git a/extensions/amp-subscriptions/0.1/test/test-local-subscriptions.js b/extensions/amp-subscriptions/0.1/test/test-local-subscriptions.js
index 591607744bf5..2f099253f809 100644
--- a/extensions/amp-subscriptions/0.1/test/test-local-subscriptions.js
+++ b/extensions/amp-subscriptions/0.1/test/test-local-subscriptions.js
@@ -1,9 +1,10 @@
+import {PageConfig} from '#third_party/subscriptions-project/config';
+
 import {Action, SubscriptionAnalytics} from '../analytics';
 import {Dialog} from '../dialog';
 import {Entitlement, GrantReason} from '../entitlement';
-import {PageConfig} from '#third_party/subscriptions-project/config';
-import {ServiceAdapter} from '../service-adapter';
 import {localSubscriptionPlatformFactory} from '../local-subscription-platform';
+import {ServiceAdapter} from '../service-adapter';
 
 describes.fakeWin('LocalSubscriptionsPlatform', {amp: true}, (env) => {
   let ampdoc;
diff --git a/extensions/amp-subscriptions/0.1/test/test-platform-store.js b/extensions/amp-subscriptions/0.1/test/test-platform-store.js
index 99280ac2c5a9..2119303026c2 100644
--- a/extensions/amp-subscriptions/0.1/test/test-platform-store.js
+++ b/extensions/amp-subscriptions/0.1/test/test-platform-store.js
@@ -1,8 +1,8 @@
-import {Entitlement, GrantReason} from '../entitlement';
+import {user} from '#utils/log';
 
+import {Entitlement, GrantReason} from '../entitlement';
 import {PlatformStore} from '../platform-store';
 import {SubscriptionPlatform} from '../subscription-platform';
-import {user} from '#utils/log';
 
 describes.realWin('Platform store', {}, (env) => {
   let platformStore;
@@ -1008,4 +1008,22 @@ describes.realWin('Platform store', {}, (env) => {
       expect(platform.reset).to.be.calledOnce;
     });
   });
+
+  describe('resetPlatformStore', () => {
+    it('the entitlement resolvement callback added through public API should persist even after the platform store gets reset', async () => {
+      const callbackSpy = env.sandbox.spy();
+      platformStore.addOnEntitlementResolvedCallback(callbackSpy);
+
+      const newStore = platformStore.resetPlatformStore();
+      const newEntitlement = new Entitlement({
+        service: 'platform1',
+        granted: false,
+      });
+      newStore.resolveEntitlement('platform1', newEntitlement);
+      expect(callbackSpy).to.have.been.calledOnceWithExactly({
+        platformKey: 'platform1',
+        entitlement: newEntitlement,
+      });
+    });
+  });
 });
diff --git a/extensions/amp-subscriptions/0.1/test/test-renderer.js b/extensions/amp-subscriptions/0.1/test/test-renderer.js
index be127b1a60b3..3ec1183dd257 100644
--- a/extensions/amp-subscriptions/0.1/test/test-renderer.js
+++ b/extensions/amp-subscriptions/0.1/test/test-renderer.js
@@ -1,9 +1,11 @@
-import {Action} from '../analytics';
-import {CSS} from '../../../../build/amp-subscriptions-0.1.css';
-import {Renderer} from '../renderer';
-import {Services} from '#service';
 import {createElementWithAttributes} from '#core/dom';
+
+import {Services} from '#service';
+
+import {CSS} from '../../../../build/amp-subscriptions-0.1.css';
 import {installStylesForDoc} from '../../../../src/style-installer';
+import {Action} from '../analytics';
+import {Renderer} from '../renderer';
 
 function isDisplayed(el) {
   const win = el.ownerDocument.defaultView;
diff --git a/extensions/amp-subscriptions/0.1/test/test-service-adapter.js b/extensions/amp-subscriptions/0.1/test/test-service-adapter.js
index ea0c7d5b8247..7d8d333bbf95 100644
--- a/extensions/amp-subscriptions/0.1/test/test-service-adapter.js
+++ b/extensions/amp-subscriptions/0.1/test/test-service-adapter.js
@@ -1,6 +1,7 @@
 import {PageConfig} from '#third_party/subscriptions-project/config';
-import {ServiceAdapter} from '../service-adapter';
+
 import {SubscriptionService} from '../amp-subscriptions';
+import {ServiceAdapter} from '../service-adapter';
 
 describes.realWin(
   'service adapter',
diff --git a/extensions/amp-subscriptions/0.1/test/test-viewer-platform.js b/extensions/amp-subscriptions/0.1/test/test-viewer-platform.js
index caef82b45a5a..d6d91e0225f0 100644
--- a/extensions/amp-subscriptions/0.1/test/test-viewer-platform.js
+++ b/extensions/amp-subscriptions/0.1/test/test-viewer-platform.js
@@ -1,13 +1,14 @@
+import {Services} from '#service';
+
+import {PageConfig} from '#third_party/subscriptions-project/config';
+
+import {getWinOrigin} from '../../../../src/url';
 import {Action, SubscriptionAnalytics} from '../analytics';
-import {Dialog} from '../dialog';
 import {ENTITLEMENTS_REQUEST_TIMEOUT} from '../constants';
+import {Dialog} from '../dialog';
 import {Entitlement, GrantReason} from '../entitlement';
-import {PageConfig} from '#third_party/subscriptions-project/config';
 import {ServiceAdapter} from '../service-adapter';
-import {Services} from '#service';
 import {ViewerSubscriptionPlatform} from '../viewer-subscription-platform';
-import {dict} from '#core/types/object';
-import {getWinOrigin} from '../../../../src/url';
 
 describes.fakeWin('ViewerSubscriptionPlatform', {amp: true}, (env) => {
   let ampdoc;
@@ -158,15 +159,12 @@ describes.fakeWin('ViewerSubscriptionPlatform', {amp: true}, (env) => {
         .callsFake(() => Promise.resolve({}));
 
       await viewerPlatform.getEntitlements();
-      expect(sendMessageStub).to.be.calledWith(
-        'auth',
-        dict({
-          'publicationId': 'example.org',
-          'productId': 'example.org:basic',
-          'origin': 'origin',
-          'encryptedDocumentKey': 'encryptedDocKey',
-        })
-      );
+      expect(sendMessageStub).to.be.calledWith('auth', {
+        'publicationId': 'example.org',
+        'productId': 'example.org:basic',
+        'origin': 'origin',
+        'encryptedDocumentKey': 'encryptedDocKey',
+      });
     });
   });
 
@@ -218,9 +216,8 @@ describes.fakeWin('ViewerSubscriptionPlatform', {amp: true}, (env) => {
         'entitlements': entitlementData,
       }));
 
-      const resolvedEntitlement = await viewerPlatform.verifyAuthToken_(
-        'faketoken'
-      );
+      const resolvedEntitlement =
+        await viewerPlatform.verifyAuthToken_('faketoken');
       expect(resolvedEntitlement).to.be.not.undefined;
       expect(resolvedEntitlement.service).to.equal(entitlementData.service);
       expect(resolvedEntitlement.source).to.equal('viewer');
@@ -243,9 +240,8 @@ describes.fakeWin('ViewerSubscriptionPlatform', {amp: true}, (env) => {
         'entitlements': [entitlementData],
       }));
 
-      const resolvedEntitlement = await viewerPlatform.verifyAuthToken_(
-        'faketoken'
-      );
+      const resolvedEntitlement =
+        await viewerPlatform.verifyAuthToken_('faketoken');
       expect(resolvedEntitlement).to.be.not.undefined;
       expect(resolvedEntitlement.service).to.equal(entitlementData.service);
       expect(resolvedEntitlement.source).to.equal('viewer');
@@ -289,9 +285,8 @@ describes.fakeWin('ViewerSubscriptionPlatform', {amp: true}, (env) => {
           },
         }));
 
-        const resolvedEntitlement = await viewerPlatform.verifyAuthToken_(
-          'faketoken'
-        );
+        const resolvedEntitlement =
+          await viewerPlatform.verifyAuthToken_('faketoken');
         expect(resolvedEntitlement).to.be.not.undefined;
         expect(resolvedEntitlement.service).to.equal('local');
         expect(resolvedEntitlement.granted).to.be.equal(true);
@@ -319,9 +314,8 @@ describes.fakeWin('ViewerSubscriptionPlatform', {amp: true}, (env) => {
           },
         }));
 
-        const resolvedEntitlement = await viewerPlatform.verifyAuthToken_(
-          'faketoken'
-        );
+        const resolvedEntitlement =
+          await viewerPlatform.verifyAuthToken_('faketoken');
         expect(resolvedEntitlement).to.be.not.undefined;
         expect(resolvedEntitlement.service).to.equal('local');
         expect(resolvedEntitlement.granted).to.be.equal(true);
diff --git a/extensions/amp-subscriptions/0.1/test/test-viewer-tracker.js b/extensions/amp-subscriptions/0.1/test/test-viewer-tracker.js
index 3f176535751b..b2f86a740764 100644
--- a/extensions/amp-subscriptions/0.1/test/test-viewer-tracker.js
+++ b/extensions/amp-subscriptions/0.1/test/test-viewer-tracker.js
@@ -1,4 +1,5 @@
 import {Observable} from '#core/data-structures/observable';
+
 import {ViewerTracker} from '../viewer-tracker';
 
 describes.realWin('ViewerTracker', {amp: true}, (env) => {
diff --git a/extensions/amp-subscriptions/0.1/url-builder.js b/extensions/amp-subscriptions/0.1/url-builder.js
index 548fe13d8357..b9b01bc2f32d 100644
--- a/extensions/amp-subscriptions/0.1/url-builder.js
+++ b/extensions/amp-subscriptions/0.1/url-builder.js
@@ -1,6 +1,7 @@
-import {Services} from '#service';
 import {getValueForExpr} from '#core/types/object';
 
+import {Services} from '#service';
+
 export class UrlBuilder {
   /**
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
@@ -40,7 +41,7 @@ export class UrlBuilder {
   /**
    * @param {string} url
    * @param {boolean} useAuthData Allows `AUTH(field)` URL var substitutions.
-   * @return {!Promise<!Object<string, *>>}
+   * @return {!Promise<!{[key: string]: *}>}
    */
   collectUrlVars(url, useAuthData) {
     return this.prepareUrlVars_(useAuthData).then((vars) => {
@@ -50,7 +51,7 @@ export class UrlBuilder {
 
   /**
    * @param {boolean} useAuthData Allows `AUTH(field)` URL var substitutions.
-   * @return {!Promise<!Object<string, *>>}
+   * @return {!Promise<!{[key: string]: *}>}
    * @private
    */
   prepareUrlVars_(useAuthData) {
diff --git a/extensions/amp-subscriptions/0.1/viewer-subscription-platform.js b/extensions/amp-subscriptions/0.1/viewer-subscription-platform.js
index e14465626869..81e6fd120125 100644
--- a/extensions/amp-subscriptions/0.1/viewer-subscription-platform.js
+++ b/extensions/amp-subscriptions/0.1/viewer-subscription-platform.js
@@ -1,13 +1,16 @@
-import {ENTITLEMENTS_REQUEST_TIMEOUT} from './constants';
-import {Entitlement, GrantReason} from './entitlement';
-import {JwtHelper} from '../../amp-access/0.1/jwt';
-import {PageConfig as PageConfigInterface} from '#third_party/subscriptions-project/config';
 import {Services} from '#service';
+
 import {devAssert, user, userAssert} from '#utils/log';
-import {dict} from '#core/types/object';
-import {getSourceOrigin, getWinOrigin} from '../../../src/url';
+
+import {PageConfig as PageConfigInterface} from '#third_party/subscriptions-project/config';
+
+import {ENTITLEMENTS_REQUEST_TIMEOUT} from './constants';
+import {Entitlement, GrantReason} from './entitlement';
 import {localSubscriptionPlatformFactory} from './local-subscription-platform';
 
+import {getSourceOrigin, getWinOrigin} from '../../../src/url';
+import {JwtHelper} from '../../amp-access/0.1/jwt';
+
 /**
  * This implements the methods to interact with viewer subscription platform.
  * @implements {./subscription-platform.SubscriptionPlatform}
@@ -69,11 +72,11 @@ export class ViewerSubscriptionPlatform {
     devAssert(this.currentProductId_, 'Current product is not set');
 
     /** @type {JsonObject} */
-    const authRequest = dict({
+    const authRequest = {
       'publicationId': this.publicationId_,
       'productId': this.currentProductId_,
       'origin': this.origin_,
-    });
+    };
 
     // Defaulting to google.com for now.
     // TODO(@elijahsoria): Remove google.com and only rely on what is returned
@@ -208,12 +211,9 @@ export class ViewerSubscriptionPlatform {
    * @private
    */
   sendAuthTokenErrorToViewer_(errorString) {
-    this.viewer_.sendMessage(
-      'auth-rejected',
-      dict({
-        'reason': errorString,
-      })
-    );
+    this.viewer_.sendMessage('auth-rejected', {
+      'reason': errorString,
+    });
   }
 
   /** @override */
diff --git a/extensions/amp-subscriptions/0.1/viewer-tracker.js b/extensions/amp-subscriptions/0.1/viewer-tracker.js
index fa43d59c0971..4853d9db73e4 100644
--- a/extensions/amp-subscriptions/0.1/viewer-tracker.js
+++ b/extensions/amp-subscriptions/0.1/viewer-tracker.js
@@ -1,7 +1,9 @@
 import {Services} from '#service';
-import {cancellation} from '../../../src/error-reporting';
-import {dev} from '#utils/log';
+
 import {listenOnce} from '#utils/event-helper';
+import {dev} from '#utils/log';
+
+import {cancellation} from '../../../src/error-reporting';
 
 const TAG = 'local-viewer';
 
diff --git a/extensions/amp-subscriptions/OWNERS b/extensions/amp-subscriptions/OWNERS
index bca1de28b7c1..5ab764df0487 100644
--- a/extensions/amp-subscriptions/OWNERS
+++ b/extensions/amp-subscriptions/OWNERS
@@ -5,12 +5,11 @@
   rules: [
     {
       owners: [
-        {name: 'chenshay'},
+        {name: 'alin04'},
         {name: 'chrisantaki'},
-        {name: 'dvoytenko'},
-        {name: 'elijahsoria'},
-        {name: 'jpettitt'},
-        {name: 'qidonna'},
+        {name: 'fikus'},
+        {name: 'hartmannr76'},
+        {name: 'jpettitt', notify: true},
       ],
     },
   ],
diff --git a/extensions/amp-subscriptions/validator-amp-subscriptions.protoascii b/extensions/amp-subscriptions/validator-amp-subscriptions.protoascii
index 7a696b625abd..3d2834f56211 100644
--- a/extensions/amp-subscriptions/validator-amp-subscriptions.protoascii
+++ b/extensions/amp-subscriptions/validator-amp-subscriptions.protoascii
@@ -74,8 +74,8 @@ tags: {  # <section subscriptions-section="content" swg_amp_cache_nonce="NONCE">
   html_format: AMP
   tag_name: "SECTION"
   spec_name: "subscriptions-section content swg_amp_cache_nonce"
-  requires: "span swg_amp_cache_nonce"
-  satisfies: "subscriptions-section content swg_amp_cache_nonce"
+  requires_condition: "span swg_amp_cache_nonce"
+  satisfies_condition: "subscriptions-section content swg_amp_cache_nonce"
   mandatory_ancestor: "BODY"
   attrs: {
     name: "encrypted"
@@ -118,8 +118,8 @@ tags: {  # <span swg_amp_cache_nonce="NONCE">
   html_format: AMP
   tag_name: "SPAN"
   spec_name: "span swg_amp_cache_nonce"
-  requires: "subscriptions-section content swg_amp_cache_nonce"
-  satisfies: "span swg_amp_cache_nonce"
+  requires_condition: "subscriptions-section content swg_amp_cache_nonce"
+  satisfies_condition: "span swg_amp_cache_nonce"
   mandatory_ancestor: "BODY"
   requires_extension: "amp-subscriptions"
   attrs: {
diff --git a/extensions/amp-tiktok/0.1/amp-tiktok.js b/extensions/amp-tiktok/0.1/amp-tiktok.js
index b7182958429a..b8d7605fee1d 100644
--- a/extensions/amp-tiktok/0.1/amp-tiktok.js
+++ b/extensions/amp-tiktok/0.1/amp-tiktok.js
@@ -1,15 +1,18 @@
-import {CSS} from '../../../build/amp-tiktok-0.1.css';
 import {Deferred} from '#core/data-structures/promise';
-import {Services} from '#service';
-import {childElementByAttr, childElementByTag} from '#core/dom/query';
 import {createElementWithAttributes, removeElement} from '#core/dom';
-import {debounce} from '#core/types/function';
-import {getData, listen} from '#utils/event-helper';
-import {htmlFor} from '#core/dom/static-template';
 import {isLayoutSizeDefined} from '#core/dom/layout';
+import {childElementByAttr, childElementByTag} from '#core/dom/query';
+import {htmlFor} from '#core/dom/static-template';
 import {px, resetStyles, setStyles} from '#core/dom/style';
+import {debounce} from '#core/types/function';
 import {tryParseJson} from '#core/types/object/json';
 
+import {Services} from '#service';
+
+import {getData, listen} from '#utils/event-helper';
+
+import {CSS} from '../../../build/amp-tiktok-0.1.css';
+
 let id = 0;
 const NAME_PREFIX = '__tt_embed__v';
 const PLAYER_WIDTH = 325;
@@ -73,7 +76,7 @@ export class AmpTiktok extends AMP.BaseElement {
     );
   }
 
-  /** @override @nocollapse */
+  /** @override  */
   static createLoaderLogoCallback(element) {
     const html = htmlFor(element);
     const placeholder = childElementByAttr(element, 'placeholder');
diff --git a/extensions/amp-tiktok/0.1/test/test-amp-tiktok.js b/extensions/amp-tiktok/0.1/test/test-amp-tiktok.js
index ace9e8e72f53..f0ce032e0d93 100644
--- a/extensions/amp-tiktok/0.1/test/test-amp-tiktok.js
+++ b/extensions/amp-tiktok/0.1/test/test-amp-tiktok.js
@@ -1,8 +1,9 @@
 import '../amp-tiktok';
 import * as dom from '#core/dom';
-import {Services} from '#service';
 import {computedStyle} from '#core/dom/style';
 
+import {Services} from '#service';
+
 const VIDEOID = '6948210747285441798';
 
 describes.realWin(
diff --git a/extensions/amp-timeago/0.1/test/test-amp-timeago.js b/extensions/amp-timeago/0.1/test/test-amp-timeago.js
index 25eea437ef5b..c8632f2c7982 100644
--- a/extensions/amp-timeago/0.1/test/test-amp-timeago.js
+++ b/extensions/amp-timeago/0.1/test/test-amp-timeago.js
@@ -1,3 +1,4 @@
+import {sleep} from '#testing/helpers';
 import '../amp-timeago';
 
 describes.realWin(
@@ -11,8 +12,6 @@ describes.realWin(
     let win;
     let element;
 
-    const timeout = (ms) => new Promise((res) => setTimeout(res, ms));
-
     beforeEach(() => {
       win = env.win;
       element = win.document.createElement('amp-timeago');
@@ -48,7 +47,7 @@ describes.realWin(
       element.setAttribute('datetime', date.toISOString());
       element.textContent = date.toString();
       await element.buildInternal();
-      await timeout(1000);
+      await sleep(1000);
       (await element.getImpl(true)).viewportCallback_(true);
       const timeElement = element.querySelector('time');
       expect(timeElement.textContent).to.equal('11 seconds ago');
@@ -75,7 +74,7 @@ describes.realWin(
       element.setAttribute('datetime', date.toISOString());
       element.textContent = date.toString();
       await element.buildInternal();
-      await timeout(1000);
+      await sleep(1000);
       expect(element.getAttribute('role')).to.equal('text');
     });
 
@@ -86,7 +85,7 @@ describes.realWin(
       element.textContent = date.toString();
       element.setAttribute('role', 'button');
       await element.buildInternal();
-      await timeout(1000);
+      await sleep(1000);
       expect(element.getAttribute('role')).to.equal('button');
     });
 
@@ -96,7 +95,7 @@ describes.realWin(
       element.setAttribute('datetime', date.toISOString());
       element.textContent = date.toString();
       await element.buildInternal();
-      await timeout(1000);
+      await sleep(1000);
       expect(element.hasAttribute('title')).to.be.false;
     });
   }
diff --git a/extensions/amp-timeago/1.0/README.md b/extensions/amp-timeago/1.0/README.md
index 7122120a56f9..7e6170fc3e80 100644
--- a/extensions/amp-timeago/1.0/README.md
+++ b/extensions/amp-timeago/1.0/README.md
@@ -6,9 +6,7 @@ Counts up to, or away from, a specified date and time. It replaces the text node
 
 You must include each Bento component's required CSS library before adding custom styles in order to guarantee proper loading. Or use the lightweight pre-uprgrade styles available inline. See [Layout and Style](#layout-and-style).
 
-The examples below demonstrate use of the `<bento-timeago>` web component.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/timeago
@@ -19,50 +17,93 @@ import {defineElement as defineBentoTimeago} from '@bentoproject/timeago';
 defineBentoTimeago();
 ```
 
-### Example: Import via `<script>`
+### Include via `<script>`
+
+```html
+<script
+  type="module"
+  async
+  src="https://cdn.ampproject.org/bento.mjs"
+></script>
+<script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+<script
+  type="module"
+  async
+  src="https://cdn.ampproject.org/v0/bento-timeago-1.0.mjs"
+></script>
+<script
+  nomodule
+  async
+  src="https://cdn.ampproject.org/v0/bento-timeago-1.0.js"
+></script>
+<link
+  rel="stylesheet"
+  type="text/css"
+  href="https://cdn.ampproject.org/v0/bento-timeago-1.0.css"
+/>
+```
+
+### Example
+
+<!--% example %-->
 
 ```html
-<head>
-  <script src="https://cdn.ampproject.org/bento.js"></script>
-  <script
-    async
-    src="https://cdn.ampproject.org/v0/bento-timeago-1.0.js"
-  ></script>
-  <style>
-    bento-timeago {
-      display: block;
-      overflow: hidden;
-      position: relative;
-    }
-  </style>
-</head>
-<bento-timeago
-  id="my-timeago"
-  datetime="2017-04-11T00:37:33.809Z"
-  locale="en"
-  style="height: 30px">
-    Saturday 11 April 2017 00.37
-</bento-timeago>
-<div class="buttons" style="margin-top: 8px">
-  <button id="ar-button">Change locale to Arabic</button>
-  <button id="en-button">Change locale to English</button>
-  <button id="now-button">Change time to now</button>
-</div>
-
-<script>
-  (async () => {
-    const timeago = document.querySelector('#my-timeago');
-    await customElements.whenDefined('bento-timeago');
-
-    // set up button actions
-    document.querySelector('#ar-button').onclick = () =>
-      timeago.setAttribute('locale', 'ar');
-    document.querySelector('#en-button').onclick = () =>
-      timeago.setAttribute('locale', 'en');
-    document.querySelector('#now-button').onclick = () =>
-      timeago.setAttribute('datetime', 'now');
-  })();
-</script>
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-timeago-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-timeago-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-timeago-1.0.css"
+    />
+  </head>
+  <body>
+    <bento-timeago
+      id="my-timeago"
+      datetime="2017-04-11T00:37:33.809Z"
+      locale="en"
+      style="height: 30px"
+    >
+      Saturday 11 April 2017 00.37
+    </bento-timeago>
+    <div class="buttons" style="margin-top: 8px">
+      <button id="ar-button">Change locale to Arabic</button>
+      <button id="en-button">Change locale to English</button>
+      <button id="now-button">Change time to now</button>
+    </div>
+
+    <script>
+      (async () => {
+        const timeago = document.querySelector('#my-timeago');
+        await customElements.whenDefined('bento-timeago');
+
+        // set up button actions
+        document.querySelector('#ar-button').onclick = () =>
+          timeago.setAttribute('locale', 'ar');
+        document.querySelector('#en-button').onclick = () =>
+          timeago.setAttribute('locale', 'en');
+        document.querySelector('#now-button').onclick = () =>
+          timeago.setAttribute('datetime', 'now');
+      })();
+    </script>
+  </body>
+</html>
 ```
 
 ### Layout and style
@@ -151,13 +192,75 @@ Add the `locale` attribute to specify one of the following values to change the
 
 Add the `cutoff` attribute to display the date specified in the `datatime` attribute after passing the specified date in seconds.
 
+#### API Example
+
+By programmatically changing attribute values, you can dynamically change the text or locale:
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-timeago-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-timeago-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-timeago-1.0.css"
+    />
+  </head>
+  <body>
+    <bento-timeago
+      id="my-timeago"
+      datetime="2017-04-11T00:37:33.809Z"
+      locale="en"
+      style="height: 30px"
+    >
+      Saturday 11 April 2017 00.37
+    </bento-timeago>
+    <div class="buttons" style="margin-top: 8px">
+      <button id="ar-button">Change locale to Arabic</button>
+      <button id="en-button">Change locale to English</button>
+      <button id="now-button">Change time to now</button>
+    </div>
+
+    <script>
+      (async () => {
+        const timeago = document.querySelector('#my-timeago');
+
+        // set up button actions
+        document.querySelector('#ar-button').onclick = () =>
+          timeago.setAttribute('locale', 'ar');
+        document.querySelector('#en-button').onclick = () =>
+          timeago.setAttribute('locale', 'en');
+        document.querySelector('#now-button').onclick = () =>
+          timeago.setAttribute('datetime', 'now');
+      })();
+    </script>
+  </body>
+</html>
+```
+
 ---
 
 ## Preact/React Component
 
-The examples below demonstrates use of the `<BentoTimeago>` as a functional component usable with the Preact or React libraries.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/timeago
diff --git a/extensions/amp-timeago/1.0/amp-timeago.js b/extensions/amp-timeago/1.0/amp-timeago.js
index 81ee8cc06f46..2f89eb250560 100644
--- a/extensions/amp-timeago/1.0/amp-timeago.js
+++ b/extensions/amp-timeago/1.0/amp-timeago.js
@@ -1,5 +1,7 @@
 import {isExperimentOn} from '#experiments';
 
+import {AmpPreactBaseElement, setSuperClass} from '#preact/amp-base-element';
+
 import {userAssert} from '#utils/log';
 
 import {BaseElement} from './base-element';
@@ -7,7 +9,7 @@ import {BaseElement} from './base-element';
 /** @const {string} */
 const TAG = 'amp-timeago';
 
-class AmpTimeago extends BaseElement {
+class AmpTimeago extends setSuperClass(BaseElement, AmpPreactBaseElement) {
   /** @override */
   isLayoutSupported(layout) {
     userAssert(
diff --git a/extensions/amp-timeago/1.0/component.js b/extensions/amp-timeago/1.0/component.js
index 26569ecd5ffd..e6fcc408fc51 100644
--- a/extensions/amp-timeago/1.0/component.js
+++ b/extensions/amp-timeago/1.0/component.js
@@ -4,7 +4,8 @@ import {getWin} from '#core/window';
 
 import * as Preact from '#preact';
 import {useCallback, useRef, useState} from '#preact';
-import {Wrapper, useIntersectionObserver} from '#preact/component';
+import {Wrapper} from '#preact/component';
+import {useIntersectionObserver} from '#preact/component/intersection-observer';
 import {useMergeRefs, useResourcesNotify} from '#preact/utils';
 
 import {format, getLocale} from './locales';
@@ -12,7 +13,7 @@ import {format, getLocale} from './locales';
 /** @const {string} */
 const DEFAULT_LOCALE = 'en_US';
 
-/** @const {!Object<string, *>} */
+/** @const {!{[key: string]: *}} */
 const DEFAULT_DATETIME_OPTIONS = {
   'year': 'numeric',
   'month': 'short',
@@ -21,7 +22,7 @@ const DEFAULT_DATETIME_OPTIONS = {
   'minute': 'numeric',
 };
 
-/** @const {!Object<string, *>} */
+/** @const {!{[key: string]: *}} */
 const DEFAULT_TIME_OPTIONS = {'hour': 'numeric', 'minute': 'numeric'};
 
 /**
diff --git a/extensions/amp-timeago/1.0/example/index.html b/extensions/amp-timeago/1.0/example/index.html
new file mode 100644
index 000000000000..af04efe09b28
--- /dev/null
+++ b/extensions/amp-timeago/1.0/example/index.html
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width" />
+    <title>bento-timeago</title>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-timeago-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-timeago-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-timeago-1.0.css"
+    />
+    <style>
+      body {
+        font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
+          Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
+          'Segoe UI Symbol';
+        margin: 2rem;
+        background: #ecf1f3;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        height: 100vh;
+      }
+      bento-timeago {
+        font-size: 22px;
+      }
+      .buttons {
+        display: flex;
+        flex-direction: column;
+      }
+      button {
+        border: none;
+        padding: 1rem 2rem;
+        border-radius: 8px;
+        color: #269da3;
+        background: white;
+        font-size: 18px;
+        font-weight: bold;
+        margin: 0.5rem auto;
+        width: 300px;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-timeago
+      id="my-timeago"
+      datetime="2017-04-11T00:37:33.809Z"
+      locale="en"
+      style="height: 30px; width: 300px; margin: 0 auto"
+    >
+      Saturday 11 April 2017 00.37
+    </bento-timeago>
+    <div class="buttons" style="margin-top: 8px">
+      <button id="ar-button">Change locale to Arabic</button>
+      <button id="en-button">Change locale to English</button>
+      <button id="now-button">Change time to now</button>
+    </div>
+
+    <script>
+      (async () => {
+        const timeago = document.querySelector('#my-timeago');
+        await customElements.whenDefined('bento-timeago');
+
+        // set up button actions
+        document.querySelector('#ar-button').onclick = () =>
+          timeago.setAttribute('locale', 'ar');
+        document.querySelector('#en-button').onclick = () =>
+          timeago.setAttribute('locale', 'en');
+        document.querySelector('#now-button').onclick = () =>
+          timeago.setAttribute('datetime', 'now');
+      })();
+    </script>
+  </body>
+</html>
diff --git a/extensions/amp-timeago/1.0/storybook/Basic.js b/extensions/amp-timeago/1.0/storybook/Basic.js
index aa1d61e52dfb..f5ea7c28c121 100644
--- a/extensions/amp-timeago/1.0/storybook/Basic.js
+++ b/extensions/amp-timeago/1.0/storybook/Basic.js
@@ -1,15 +1,7 @@
-import {date, number, select, text, withKnobs} from '@storybook/addon-knobs';
-
 import * as Preact from '#preact';
 
 import {BentoTimeago} from '../component';
 
-export default {
-  title: 'Timeago',
-  component: BentoTimeago,
-  decorators: [withKnobs],
-};
-
 const LOCALES = [
   'en-US',
   'en-GB',
@@ -22,15 +14,29 @@ const LOCALES = [
   'zH-Tw',
 ];
 
-export const _default = () => {
-  const dateTime = date('Date/time', new Date());
-  const cutoff = number('Cutoff (seconds)', 0);
-  const placeholder = text('Cutoff placeholder', 'Time passed!');
-  const userLocale = navigator.language || 'en-US';
-  const allLocales = [userLocale].concat(
-    LOCALES.filter((locale) => locale != userLocale)
-  );
-  const locale = select('Locale', allLocales, userLocale);
+export default {
+  title: 'Timeago',
+  component: BentoTimeago,
+  args: {
+    cutoff: 0,
+    placeholder: 'Time passed!',
+    dateTime: Date.now(),
+  },
+  argTypes: {
+    dateTime: {
+      name: 'dateTime',
+      control: {type: 'date'},
+    },
+    locale: {
+      name: 'locale',
+      control: {type: 'select'},
+      options: LOCALES,
+      defaultValue: navigator.language || 'en-US',
+    },
+  },
+};
+
+export const _default = ({cutoff, dateTime, locale, placeholder}) => {
   return (
     <BentoTimeago
       datetime={dateTime}
@@ -41,15 +47,12 @@ export const _default = () => {
   );
 };
 
-export const WithIntersectionObserver = () => {
-  const dateTime = date('Date/time', new Date());
-  const cutoff = number('Cutoff (seconds)', 0);
-  const placeholder = text('Cutoff placeholder', 'Time passed!');
-  const userLocale = navigator.language || 'en-US';
-  const allLocales = [userLocale].concat(
-    LOCALES.filter((locale) => locale != userLocale)
-  );
-  const locale = select('Locale', allLocales, userLocale);
+export const WithIntersectionObserver = ({
+  cutoff,
+  dateTime,
+  locale,
+  placeholder,
+}) => {
   return (
     <div>
       <p>
@@ -174,3 +177,21 @@ export const WithIntersectionObserver = () => {
 };
 
 WithIntersectionObserver.storyName = 'IntersectionObserver';
+
+WithIntersectionObserver.args = {
+  cutoff: 0,
+  placeholder: 'Time passed!',
+};
+
+WithIntersectionObserver.argTypes = {
+  dateTime: {
+    name: 'dateTime',
+    control: {type: 'date'},
+  },
+  locale: {
+    name: 'locale',
+    control: {type: 'select'},
+    options: LOCALES,
+    defaultValue: navigator.language || 'en-US',
+  },
+};
diff --git a/extensions/amp-timeago/1.0/test-e2e/e2e-fixture.js b/extensions/amp-timeago/1.0/test-e2e/e2e-fixture.js
new file mode 100644
index 000000000000..0d9011cb3bd1
--- /dev/null
+++ b/extensions/amp-timeago/1.0/test-e2e/e2e-fixture.js
@@ -0,0 +1,11 @@
+import {getDefaultArgs} from '#bento/util/e2e-helpers';
+
+import * as Preact from '#preact';
+import {render} from '#preact';
+
+import config, {_default as App} from '../storybook/Basic';
+
+render(
+  <App {...getDefaultArgs(config, App)} />,
+  document.querySelector('#bento')
+);
diff --git a/extensions/amp-timeago/1.0/test-e2e/test-bento-timeago.js b/extensions/amp-timeago/1.0/test-e2e/test-bento-timeago.js
deleted file mode 100644
index 636ee3b091a5..000000000000
--- a/extensions/amp-timeago/1.0/test-e2e/test-bento-timeago.js
+++ /dev/null
@@ -1,43 +0,0 @@
-describes.endtoend(
-  'bento-timeago',
-  {
-    version: '1.0',
-    fixture: 'bento/timeago.html',
-    environments: ['single'],
-  },
-  (env) => {
-    let controller;
-
-    beforeEach(() => {
-      controller = env.controller;
-    });
-
-    const setup = async () => {
-      return [
-        await controller.findElement('bento-timeago'),
-        await controller.findElement('#displayTimeInput'),
-        await controller.findElement('#bentoChangeTimeFormSubmit'),
-      ];
-    };
-
-    it('should render how long ago a time was set to', async () => {
-      const [timeago, timeInput, timeSubmit] = await setup();
-
-      await expect(controller.getElementAttribute(timeago, 'class')).to.equal(
-        'i-amphtml-built'
-      );
-      await expect(controller.getElementText(timeago)).to.contain(
-        '3 years ago'
-      );
-
-      const currentTime = new Date();
-      await controller.type(timeInput, currentTime.toISOString());
-      await controller.click(timeSubmit);
-
-      await expect(
-        controller.getElementAttribute(timeago, 'datetime')
-      ).to.equal(currentTime.toISOString());
-      await expect(controller.getElementText(timeago)).to.contain('just now');
-    });
-  }
-);
diff --git a/extensions/amp-truncate-text/0.1/amp-truncate-text.js b/extensions/amp-truncate-text/0.1/amp-truncate-text.js
index 7d5f3d1bbd39..99f7cba85c96 100644
--- a/extensions/amp-truncate-text/0.1/amp-truncate-text.js
+++ b/extensions/amp-truncate-text/0.1/amp-truncate-text.js
@@ -1,4 +1,3 @@
-import {iterateCursor} from '#core/dom';
 import {
   closestAncestorElementBySelector,
   realChildNodes,
@@ -126,18 +125,15 @@ export class AmpTruncateText extends AMP.BaseElement {
       '.i-amphtml-truncate-persistent-slot'
     );
 
-    iterateCursor(this.element.querySelectorAll('[slot="collapsed"]'), (el) => {
+    this.element.querySelectorAll('[slot="collapsed"]').forEach((el) => {
       this.collapsedSlot_.appendChild(el);
     });
-    iterateCursor(this.element.querySelectorAll('[slot="expanded"]'), (el) => {
+    this.element.querySelectorAll('[slot="expanded"]').forEach((el) => {
       this.expandedSlot_.appendChild(el);
     });
-    iterateCursor(
-      this.element.querySelectorAll('[slot="persistent"]'),
-      (el) => {
-        this.persistentSlot_.appendChild(el);
-      }
-    );
+    this.element.querySelectorAll('[slot="persistent"]').forEach((el) => {
+      this.persistentSlot_.appendChild(el);
+    });
     realChildNodes(this.element).forEach((node) => {
       defaultSlot.appendChild(node);
     });
diff --git a/extensions/amp-truncate-text/0.1/binary-search.js b/extensions/amp-truncate-text/0.1/binary-search.js
index 7d888c04e2bf..06f6898953fe 100644
--- a/extensions/amp-truncate-text/0.1/binary-search.js
+++ b/extensions/amp-truncate-text/0.1/binary-search.js
@@ -83,9 +83,9 @@ export function binarySearch(
   const index = !isNaN(prefIndex)
     ? prefIndex
     : // If we stopped, high is either less than or equal to low. So if we have
-    // a high preference, actually return the current value of low.
-    preference == BinarySearchPreference.NEXT
-    ? low
-    : high;
+      // a high preference, actually return the current value of low.
+      preference == BinarySearchPreference.NEXT
+      ? low
+      : high;
   return -(index + 1);
 }
diff --git a/extensions/amp-truncate-text/0.1/test/test-amp-truncate-text.js b/extensions/amp-truncate-text/0.1/test/test-amp-truncate-text.js
index b82acacd26e3..9e356b5225bd 100644
--- a/extensions/amp-truncate-text/0.1/test/test-amp-truncate-text.js
+++ b/extensions/amp-truncate-text/0.1/test/test-amp-truncate-text.js
@@ -4,6 +4,8 @@ import {toArray} from '#core/types/array';
 
 import {toggleExperiment} from '#experiments';
 
+import {macroTask} from '#testing/helpers';
+
 // Lint complains about a template string due to lines being too long.
 const loremText =
   '        \r\n' +
@@ -44,19 +46,9 @@ describes.realWin(
         }
       });
 
-      /**
-       * @return {!Promise} A Promise that resolves after the MutationObserver has
-       *    run and we have re-truncateed.
-       */
-      function afterMutationAndClamp() {
-        return new Promise((resolve) => {
-          setTimeout(resolve);
-        });
-      }
-
       async function createElement(
         content,
-        {width, height, layout = 'fixed', container = doc.body}
+        {container = doc.body, height, layout = 'fixed', width}
       ) {
         const element = win.document.createElement('amp-truncate-text');
         element.setAttribute('layout', layout);
@@ -70,7 +62,7 @@ describes.realWin(
         container.appendChild(element);
         await element.buildInternal();
         await element.layoutCallback();
-        await afterMutationAndClamp();
+        await macroTask();
 
         return element;
       }
@@ -335,7 +327,7 @@ describes.realWin(
               height: '600px',
             });
             element.layoutCallback();
-            await afterMutationAndClamp();
+            await macroTask();
 
             expect(button.offsetHeight).to.equal(0);
             expect(button.offsetWidth).to.equal(0);
@@ -378,7 +370,7 @@ describes.realWin(
             const collapseEl = element.querySelector('[slot="expanded"]');
 
             expandEl.click();
-            await afterMutationAndClamp();
+            await macroTask();
 
             expect(element.scrollHeight).to.be.gt(26);
             expect(element.scrollHeight).to.equal(element.offsetHeight);
@@ -410,7 +402,7 @@ describes.realWin(
             });
 
             expandEl.click();
-            await afterMutationAndClamp();
+            await macroTask();
 
             expect(sizer.getBoundingClientRect()).to.include({
               width: 0,
@@ -436,9 +428,9 @@ describes.realWin(
             const collapseEl = element.querySelector('[slot="expanded"]');
 
             expandEl.click();
-            await afterMutationAndClamp();
+            await macroTask();
             collapseEl.click();
-            await afterMutationAndClamp();
+            await macroTask();
 
             expect(element.offsetHeight).to.equal(26);
             expect(element.scrollHeight).to.equal(26);
@@ -498,7 +490,7 @@ describes.realWin(
             const expandSpan = element.querySelector('[slot="collapsed"] span');
 
             expandSpan.click();
-            await afterMutationAndClamp();
+            await macroTask();
 
             expect(element.offsetHeight).to.equal(26);
           });
@@ -521,7 +513,7 @@ describes.realWin(
             const expandSpan = element.querySelector('[slot="collapsed"]');
 
             expandSpan.click();
-            await afterMutationAndClamp();
+            await macroTask();
 
             expect(element.offsetHeight).to.equal(26);
           });
@@ -541,7 +533,7 @@ describes.realWin(
             const expandSpan = element.querySelector('[slot="collapsed"]');
 
             expandSpan.click();
-            await afterMutationAndClamp();
+            await macroTask();
 
             expect(element.offsetHeight).to.equal(26);
           });
@@ -561,7 +553,7 @@ describes.realWin(
             const expandSpan = element.querySelector('[slot="collapsed"] span');
 
             expandSpan.click();
-            await afterMutationAndClamp();
+            await macroTask();
 
             expect(element.offsetHeight).to.equal(26);
           });
@@ -581,7 +573,7 @@ describes.realWin(
             const expandSpan = element.querySelector('[slot="collapsed"] span');
 
             expandSpan.click();
-            await afterMutationAndClamp();
+            await macroTask();
 
             expect(element.offsetHeight).to.equal(26);
           });
@@ -605,7 +597,7 @@ describes.realWin(
             const expandSpan = element.querySelector('[slot="collapsed"]');
 
             expandSpan.click();
-            await afterMutationAndClamp();
+            await macroTask();
 
             expect(element.offsetHeight).to.equal(26);
           });
diff --git a/extensions/amp-truncate-text/0.1/truncate-text.js b/extensions/amp-truncate-text/0.1/truncate-text.js
index ee2b1aba3e81..a450c631b0d6 100644
--- a/extensions/amp-truncate-text/0.1/truncate-text.js
+++ b/extensions/amp-truncate-text/0.1/truncate-text.js
@@ -290,7 +290,7 @@ function maybeEllipsizeNode(node, container, containerRect) {
     0,
     text.length,
     (offset) => {
-      // Treat whitespace as being the same as the the previous non-whitespace
+      // Treat whitespace as being the same as the previous non-whitespace
       // character in terms of truncation. This is necessary as we will strip
       // trailing whitespace, so we do not to include its width when considering
       // if we overflow. Note this includes non-breaking whitespace.
diff --git a/extensions/amp-twitter/0.1/amp-twitter.js b/extensions/amp-twitter/0.1/amp-twitter.js
index 74bdd7137b3e..a77349ba0f68 100644
--- a/extensions/amp-twitter/0.1/amp-twitter.js
+++ b/extensions/amp-twitter/0.1/amp-twitter.js
@@ -1,15 +1,17 @@
-import {MessageType} from '#core/3p-frame-messaging';
-import {Services} from '#service';
+import {MessageType_Enum} from '#core/3p-frame-messaging';
+import {removeElement} from '#core/dom';
 import {applyFillContent, isLayoutSizeDefined} from '#core/dom/layout';
-import {getIframe, preloadBootstrap} from '../../../src/3p-frame';
 import {htmlFor} from '#core/dom/static-template';
+
+import {Services} from '#service';
+
+import {getIframe, preloadBootstrap} from '../../../src/3p-frame';
 import {listenFor} from '../../../src/iframe-helper';
-import {removeElement} from '#core/dom';
 
 const TYPE = 'twitter';
 
 class AmpTwitter extends AMP.BaseElement {
-  /** @override @nocollapse */
+  /** @override  */
   static createLoaderLogoCallback(element) {
     const html = htmlFor(element);
     return {
@@ -89,7 +91,7 @@ class AmpTwitter extends AMP.BaseElement {
     this.updateForLoadingState_();
     listenFor(
       iframe,
-      MessageType.EMBED_SIZE,
+      MessageType_Enum.EMBED_SIZE,
       (data) => {
         this.updateForSuccessState_(data['height']);
       },
@@ -97,7 +99,7 @@ class AmpTwitter extends AMP.BaseElement {
     );
     listenFor(
       iframe,
-      MessageType.NO_CONTENT,
+      MessageType_Enum.NO_CONTENT,
       () => {
         this.updateForFailureState_();
       },
diff --git a/extensions/amp-twitter/0.1/storybook/Basic.amp.js b/extensions/amp-twitter/0.1/storybook/Basic.amp.js
index 9f32b117c6ba..82b98de3e5f3 100644
--- a/extensions/amp-twitter/0.1/storybook/Basic.amp.js
+++ b/extensions/amp-twitter/0.1/storybook/Basic.amp.js
@@ -1,11 +1,10 @@
-import * as Preact from '#preact';
-import {boolean, number, select, withKnobs} from '@storybook/addon-knobs';
 import {withAmp} from '@ampproject/storybook-addon';
 
+import * as Preact from '#preact';
+
 export default {
   title: 'amp-twitter-0_1',
-  decorators: [withKnobs, withAmp],
-
+  decorators: [withAmp],
   parameters: {
     extensions: [
       {
@@ -20,30 +19,47 @@ export default {
   },
 };
 
-export const Default = () => {
-  const tweetId = select(
-    'tweet id',
-    ['1356304203044499462', '495719809695621121', '463440424141459456'],
-    '1356304203044499462'
-  );
-  const cards = boolean('show cards', true) ? undefined : 'hidden';
-  const conversation = boolean('show conversation', false) ? undefined : 'none';
+export const Default = ({showCards, showConversation, ...args}) => {
+  const cards = showCards ? undefined : 'hidden';
+  const conversation = showConversation ? undefined : 'none';
   return (
     <amp-twitter
       width="300"
       height="200"
-      data-tweetid={tweetId}
+      {...args}
       data-cards={cards}
       data-conversation={conversation}
     />
   );
 };
 
-export const Moments = () => {
-  const limit = number('limit to', 2);
+Default.argTypes = {
+  'data-tweetid': {
+    name: 'tweetId',
+    defaultValue: '1356304203044499462',
+    options: [
+      '1356304203044499462',
+      '495719809695621121',
+      '463440424141459456',
+    ],
+    control: {type: 'select'},
+  },
+  showCards: {
+    name: 'show cards?',
+    defaultValue: true,
+    control: {type: 'boolean'},
+  },
+  showConversation: {
+    name: 'show conversation?',
+    defaultValue: false,
+    control: {type: 'boolean'},
+  },
+};
+
+export const Moments = (args) => {
   return (
     <amp-twitter
-      data-limit={limit}
+      {...args}
       data-momentid="1009149991452135424"
       width="300"
       height="200"
@@ -51,29 +67,38 @@ export const Moments = () => {
   );
 };
 
-export const Timelines = () => {
-  const tweetLimit = number('limit to', 5);
-  const timelineSourceType = select(
-    'source type',
-    ['profile', 'likes', 'list', 'source', 'collection', 'url', 'widget'],
-    'profile'
-  );
-  const timelineScreenName = 'amphtml';
-  const timelineUserId = '3450662892';
-  return (
-    <amp-twitter
-      data-tweet-limit={tweetLimit}
-      data-timeline-source-type={timelineSourceType}
-      data-timeline-scree-name={timelineScreenName}
-      data-timeline-user-id={timelineUserId}
-      width="300"
-      height="200"
-    />
-  );
+Moments.args = {
+  'data-limit': 2,
+};
+
+export const Timelines = (args) => {
+  return <amp-twitter {...args} width="300" height="200" />;
+};
+
+Timelines.args = {
+  'data-tweet-limit': 5,
+  'data-timeline-screen-name': 'amphtml',
+  'data-timeline-user-id': '3450662892',
 };
 
-export const DeletedTweet = () => {
-  const withFallback = boolean('include fallback?', true);
+Timelines.argTypes = {
+  'data-timeline-source-type': {
+    name: 'data-timeline-source-type',
+    defaultValue: 'profile',
+    options: [
+      'profile',
+      'likes',
+      'list',
+      'source',
+      'collection',
+      'url',
+      'widget',
+    ],
+    control: {type: 'select'},
+  },
+};
+
+export const DeletedTweet = ({withFallback}) => {
   return (
     <amp-twitter
       width="390"
@@ -103,6 +128,10 @@ export const DeletedTweet = () => {
   );
 };
 
+DeletedTweet.args = {
+  withFallback: true,
+};
+
 export const InvalidTweet = () => {
   return (
     <amp-twitter
diff --git a/extensions/amp-twitter/1.0/README.md b/extensions/amp-twitter/1.0/README.md
index 232745bcc772..594c06df5cf9 100644
--- a/extensions/amp-twitter/1.0/README.md
+++ b/extensions/amp-twitter/1.0/README.md
@@ -6,9 +6,7 @@ Embeds [Twitter](https://twitter.com) content like a Tweet or a Moment.
 
 You must include each Bento component's required CSS library to guarantee proper loading and before adding custom styles. Or use the light-weight pre-upgrade styles available inline. See [Layout and style](#layout-and-style).
 
-The examples below demonstrate use of the `<bento-twitter>` web component.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/twitter
@@ -19,46 +17,56 @@ import {defineElement as defineBentoTwitters} from '@bentoproject/twitter';
 defineBentoTwitters();
 ```
 
-### Example: Include via `<script>`
+### Include via `<script>`
 
 ```html
-<head>
-  <script src="https://cdn.ampproject.org/bento.js"></script>
-  <!-- These styles prevent Cumulative Layout Shift on the unupgraded custom element -->
-  <style>
-    bento-twitter {
-      display: block;
-      overflow: hidden;
-      position: relative;
-    }
-  </style>
-  <script
-    async
-    src="https://cdn.ampproject.org/v0/bento-twitter-1.0.js"
-  ></script>
-  <style>
-    bento-twitter {
-      width: 375px;
-      height: 472px;
-    }
-  </style>
-</head>
-<bento-twitter id="my-tweet" data-tweetid="885634330868850689"> </bento-twitter>
-<div class="buttons" style="margin-top: 8px">
-  <button id="change-tweet">Change tweet</button>
-</div>
-
-<script>
-  (async () => {
-    const twitter = document.querySelector('#my-tweet');
-    await customElements.whenDefined('bento-twitter');
-
-    // set up button actions
-    document.querySelector('#change-tweet').onclick = () => {
-      twitter.setAttribute('data-tweetid', '495719809695621121');
-    };
-  })();
-</script>
+<script type="module" src="https://cdn.ampproject.org/bento.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/bento.js" crossorigin="anonymous"></script>
+<script type="module" src="https://cdn.ampproject.org/v0/bento-twitter-1.0.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/v0/bento-twitter-1.0.js" crossorigin="anonymous"></script>
+<link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-twitter-1.0.css" crossorigin="anonymous">
+```
+
+### Example
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-twitter-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-twitter-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-twitter-1.0.css"
+    />
+    <style>
+      bento-twitter {
+        width: 375px;
+        height: 472px;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-twitter id="my-tweet" data-tweetid="885634330868850689"></bento-twitter>
+  </body>
+</html>
 ```
 
 ### Layout and style
@@ -122,13 +130,70 @@ For details on the available options, see Twitter's docs <a href="https://develo
   </tr>
 </table>
 
+### Interactivity and API usage
+
+Programmatically changing any of the attribute values will automatically update the element. For example, changing the tweet id via `data-tweetid` will automatically load the new tweet:
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-twitter-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-twitter-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-twitter-1.0.css"
+    />
+    <style>
+      bento-twitter {
+        width: 375px;
+        height: 472px;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-twitter id="my-tweet" data-tweetid="885634330868850689">
+    </bento-twitter>
+    <div class="buttons" style="margin-top: 8px">
+      <button id="change-tweet">Change tweet</button>
+    </div>
+
+    <script>
+      (async () => {
+        const twitter = document.querySelector('#my-tweet');
+
+        // set up button actions
+        document.querySelector('#change-tweet').onclick = () => {
+          twitter.setAttribute('data-tweetid', '495719809695621121');
+        };
+      })();
+    </script>
+  </body>
+</html>
+```
+
 ---
 
 ## Preact/React Component
 
-The examples below demonstrate use of the `<BentoTwitter>` as a functional component usable with the Preact or React libraries.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/twitter
@@ -199,17 +264,15 @@ Valid timeline source types include <code>profile</code>, <code>likes</code>, <c
     <td width="40%"><strong>options (optional)</strong></td>
     <td>You can specify options for the Tweet, Moment, or Timeline appearance by passing in an object to the <code>options</code> prop.
 For details on the available options, see Twitter's docs <a href="https://developer.twitter.com/en/docs/twitter-for-websites/embedded-tweets/guides/embedded-tweet-parameter-reference">for tweets</a>, <a href="https://developer.twitter.com/en/docs/twitter-for-websites/moments/guides/parameter-reference0">for moments</a> and <a href="https://developer.twitter.com/en/docs/twitter-for-websites/timelines/guides/parameter-reference">for timelines</a>. Note: When passing in the `options` prop, make sure to optimize or memoize the object:
-<code>
-const TWITTER_OPTIONS = {
+<pre><code>const TWITTER_OPTIONS = {
   // make sure to define these once globally!
 };
-
 function MyComponent() {
-// etc
-return (
-<Twitter optionsProps={TWITTER_OPTIONS} />
-);
-}</code></td>
+  // etc
+  return (
+    &ltTwitter optionsProps={TWITTER_OPTIONS} /&gt;
+  );
+}</code></pre></td>
 
   </tr>
    <tr>
diff --git a/extensions/amp-twitter/1.0/amp-twitter.js b/extensions/amp-twitter/1.0/amp-twitter.js
index 0b64aace7fe3..c875f5469a8d 100644
--- a/extensions/amp-twitter/1.0/amp-twitter.js
+++ b/extensions/amp-twitter/1.0/amp-twitter.js
@@ -1,21 +1,25 @@
-import {BaseElement} from './base-element';
-import {dict} from '#core/types/object';
-import {getBootstrapBaseUrl, getBootstrapUrl} from '../../../src/3p-frame';
+import {BaseElement} from '#bento/components/bento-twitter/1.0/base-element';
+
+import {userAssert} from '#core/assert';
 import {htmlFor} from '#core/dom/static-template';
+
 import {isExperimentOn} from '#experiments';
-import {userAssert} from '#core/assert';
+
+import {AmpPreactBaseElement, setSuperClass} from '#preact/amp-base-element';
+
+import {getBootstrapBaseUrl, getBootstrapUrl} from '../../../src/3p-frame';
 
 /** @const {string} */
 const TAG = 'amp-twitter';
 const TYPE = 'twitter';
 
-class AmpTwitter extends BaseElement {
+class AmpTwitter extends setSuperClass(BaseElement, AmpPreactBaseElement) {
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
   }
 
-  /** @override @nocollapse */
+  /** @override  */
   static createLoaderLogoCallback(element) {
     const html = htmlFor(element);
     return {
@@ -36,7 +40,7 @@ class AmpTwitter extends BaseElement {
     };
   }
 
-  /** @override @nocollapse */
+  /** @override  */
   static getPreconnects(element) {
     const ampdoc = element.getAmpDoc();
     const {win} = ampdoc;
@@ -57,9 +61,9 @@ class AmpTwitter extends BaseElement {
 
   /** @override */
   init() {
-    return dict({
+    return {
       'requestResize': (height) => this.attemptChangeHeight(height),
-    });
+    };
   }
 
   /** @override */
diff --git a/extensions/amp-twitter/1.0/base-element.js b/extensions/amp-twitter/1.0/base-element.js
deleted file mode 100644
index d9a7703b8892..000000000000
--- a/extensions/amp-twitter/1.0/base-element.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import {PreactBaseElement} from '#preact/base-element';
-import {BentoTwitter} from './component';
-
-export class BaseElement extends PreactBaseElement {}
-
-/** @override */
-BaseElement['Component'] = BentoTwitter;
-
-/** @override */
-BaseElement['props'] = {
-  'title': {attr: 'title'}, // Needed for Preact component
-  'options': {attrPrefix: 'data-'}, // Needed to render componoent upon mutation
-};
-
-/** @override */
-BaseElement['layoutSizeDefined'] = true;
-
-/** @override */
-BaseElement['usesShadowDom'] = true;
diff --git a/extensions/amp-twitter/1.0/component.js b/extensions/amp-twitter/1.0/component.js
deleted file mode 100644
index f3ac78100279..000000000000
--- a/extensions/amp-twitter/1.0/component.js
+++ /dev/null
@@ -1,107 +0,0 @@
-import * as Preact from '#preact';
-import {ProxyIframeEmbed} from '#preact/component/3p-frame';
-import {MessageType, deserializeMessage} from '#core/3p-frame-messaging';
-import {forwardRef} from '#preact/compat';
-import {useCallback, useMemo, useState} from '#preact';
-import {useValueRef} from '#preact/component';
-
-/** @const {string} */
-const TYPE = 'twitter';
-const FULL_HEIGHT = '100%';
-const MATCHES_MESSAGING_ORIGIN = () => true;
-
-/**
- * @param {!BentoTwitterDef.Props} props
- * @param {{current: (!BentoTwitterDef.Api|null)}} ref
- * @return {PreactDef.Renderable}
- */
-function BentoTwitterWithRef(
-  {
-    cards,
-    conversation,
-    limit,
-    momentid,
-    onError,
-    onLoad,
-    options: optionsProps,
-    requestResize,
-    style,
-    timelineScreenName,
-    timelineSourceType,
-    timelineUserId,
-    title,
-    tweetLimit,
-    tweetid,
-    ...rest
-  },
-  ref
-) {
-  const [height, setHeight] = useState(null);
-  const onLoadRef = useValueRef(onLoad);
-  const onErrorRef = useValueRef(onError);
-
-  const messageHandler = useCallback(
-    (event) => {
-      const data = deserializeMessage(event.data);
-      if (data['type'] == MessageType.EMBED_SIZE) {
-        const height = data['height'];
-        if (requestResize) {
-          requestResize(height);
-          setHeight(FULL_HEIGHT);
-        } else {
-          setHeight(height);
-        }
-
-        onLoadRef.current?.();
-      } else if (data['type'] === MessageType.NO_CONTENT) {
-        onErrorRef.current?.();
-      }
-    },
-    [requestResize, onLoadRef, onErrorRef]
-  );
-  const options = useMemo(
-    () => ({
-      cards,
-      conversation,
-      limit,
-      momentid,
-      timelineScreenName,
-      timelineSourceType,
-      timelineUserId,
-      tweetLimit,
-      tweetid,
-      ...optionsProps,
-    }),
-    [
-      cards,
-      conversation,
-      limit,
-      momentid,
-      optionsProps,
-      timelineScreenName,
-      timelineSourceType,
-      timelineUserId,
-      tweetLimit,
-      tweetid,
-    ]
-  );
-
-  return (
-    <ProxyIframeEmbed
-      allowfullscreen
-      ref={ref}
-      title={title}
-      {...rest}
-      // non-overridable props
-      matchesMessagingOrigin={MATCHES_MESSAGING_ORIGIN}
-      messageHandler={messageHandler}
-      options={options}
-      type={TYPE}
-      style={height ? {...style, height} : style}
-    />
-  );
-}
-
-const BentoTwitter = forwardRef(BentoTwitterWithRef);
-BentoTwitter.displayName = 'BentoTwitter'; // Make findable for tests.
-export {BentoTwitter};
diff --git a/extensions/amp-twitter/1.0/example/index.html b/extensions/amp-twitter/1.0/example/index.html
new file mode 100644
index 000000000000..cd100438d703
--- /dev/null
+++ b/extensions/amp-twitter/1.0/example/index.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width" />
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-twitter-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-twitter-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-twitter-1.0.css"
+    />
+    <style>
+      bento-twitter {
+        width: 375px;
+        height: 472px;
+      }
+    </style>
+    <style>
+      body {
+        background: #ecf1f3;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-twitter
+      id="my-tweet"
+      style="width: 375px; height: 720px"
+      data-tweetid="1397995435386679302"
+    >
+    </bento-twitter>
+  </body>
+</html>
diff --git a/extensions/amp-twitter/1.0/storybook/Basic.amp.js b/extensions/amp-twitter/1.0/storybook/Basic.amp.js
index f7480704d580..4a41977d8649 100644
--- a/extensions/amp-twitter/1.0/storybook/Basic.amp.js
+++ b/extensions/amp-twitter/1.0/storybook/Basic.amp.js
@@ -1,11 +1,10 @@
-import * as Preact from '#preact';
-import {boolean, number, select, withKnobs} from '@storybook/addon-knobs';
 import {withAmp} from '@ampproject/storybook-addon';
 
+import * as Preact from '#preact';
+
 export default {
   title: 'amp-twitter-1_0',
-  decorators: [withKnobs, withAmp],
-
+  decorators: [withAmp],
   parameters: {
     extensions: [
       {
@@ -21,30 +20,47 @@ export default {
   },
 };
 
-export const Default = () => {
-  const tweetId = select(
-    'tweet id',
-    ['1356304203044499462', '495719809695621121', '463440424141459456'],
-    '1356304203044499462'
-  );
-  const cards = boolean('show cards', true) ? undefined : 'hidden';
-  const conversation = boolean('show conversation', false) ? undefined : 'none';
+export const Default = ({showCards, showConverstion, ...args}) => {
+  const cards = showCards ? undefined : 'hidden';
+  const conversation = showConverstion ? undefined : 'none';
   return (
     <amp-twitter
       width="300"
       height="200"
-      data-tweetid={tweetId}
       data-cards={cards}
       data-conversation={conversation}
+      {...args}
     />
   );
 };
 
-export const Moments = () => {
-  const limit = number('limit to', 2);
+Default.argTypes = {
+  'data-tweetid': {
+    name: 'tweetId',
+    defaultValue: '1356304203044499462',
+    options: [
+      '1356304203044499462',
+      '495719809695621121',
+      '463440424141459456',
+    ],
+    control: {type: 'select'},
+  },
+  showCards: {
+    name: 'show cards?',
+    defaultValue: true,
+    control: {type: 'boolean'},
+  },
+  showConversation: {
+    name: 'show conversation?',
+    defaultValue: false,
+    control: {type: 'boolean'},
+  },
+};
+
+export const Moments = (args) => {
   return (
     <amp-twitter
-      data-limit={limit}
+      {...args}
       data-momentid="1009149991452135424"
       width="300"
       height="200"
@@ -52,29 +68,38 @@ export const Moments = () => {
   );
 };
 
-export const Timelines = () => {
-  const tweetLimit = number('limit to', 5);
-  const timelineSourceType = select(
-    'source type',
-    ['profile', 'likes', 'list', 'source', 'collection', 'url', 'widget'],
-    'profile'
-  );
-  const timelineScreenName = 'amphtml';
-  const timelineUserId = '3450662892';
-  return (
-    <amp-twitter
-      data-tweet-limit={tweetLimit}
-      data-timeline-source-type={timelineSourceType}
-      data-timeline-scree-name={timelineScreenName}
-      data-timeline-user-id={timelineUserId}
-      width="300"
-      height="200"
-    />
-  );
+Moments.args = {
+  'data-limit': 2,
+};
+
+export const Timelines = (args) => {
+  return <amp-twitter {...args} width="300" height="200" />;
+};
+
+Timelines.args = {
+  'data-tweet-limit': 5,
+  'data-timeline-screen-name': 'amphtml',
+  'data-timeline-user-id': '3450662892',
 };
 
-export const DeletedTweet = () => {
-  const withFallback = boolean('include fallback?', true);
+Timelines.argTypes = {
+  'data-timeline-source-type': {
+    name: 'data-timeline-source-type',
+    defaultValue: 'profile',
+    options: [
+      'profile',
+      'likes',
+      'list',
+      'source',
+      'collection',
+      'url',
+      'widget',
+    ],
+    control: {type: 'select'},
+  },
+};
+
+export const DeletedTweet = ({withFallback}) => {
   return (
     <amp-twitter
       width="390"
@@ -104,6 +129,10 @@ export const DeletedTweet = () => {
   );
 };
 
+DeletedTweet.args = {
+  withFallback: true,
+};
+
 export const InvalidTweet = () => {
   return (
     <amp-twitter
diff --git a/extensions/amp-twitter/1.0/storybook/Basic.js b/extensions/amp-twitter/1.0/storybook/Basic.js
index 64a67c3c9f31..4528501aa9e5 100644
--- a/extensions/amp-twitter/1.0/storybook/Basic.js
+++ b/extensions/amp-twitter/1.0/storybook/Basic.js
@@ -1,58 +1,85 @@
+import {BentoTwitter} from '#bento/components/bento-twitter/1.0/component';
+
 import * as Preact from '#preact';
-import {BentoTwitter} from '../component';
-import {boolean, number, select, withKnobs} from '@storybook/addon-knobs';
 
 export default {
   title: 'Twitter',
   component: BentoTwitter,
-  decorators: [withKnobs],
 };
 
-export const _default = () => {
-  const tweetId = select(
-    'tweet id',
-    ['1356304203044499462', '495719809695621121', '463440424141459456'],
-    '1356304203044499462'
-  );
-  const cards = boolean('show cards', true) ? undefined : 'hidden';
-  const conversation = boolean('show conversation', false) ? undefined : 'none';
+export const _default = ({showCards, showConversation, ...args}) => {
+  const cards = showCards ? undefined : 'hidden';
+  const conversation = showConversation ? undefined : 'none';
   return (
     <BentoTwitter
       cards={cards}
       conversation={conversation}
-      tweetid={tweetId}
       style={{width: '300px', height: '200px'}}
+      {...args}
     />
   );
 };
 
-export const moments = () => {
-  const limit = number('limit to', 2);
+_default.argTypes = {
+  tweetId: {
+    name: 'tweetId',
+    defaultValue: '1356304203044499462',
+    options: [
+      '1356304203044499462',
+      '495719809695621121',
+      '463440424141459456',
+    ],
+    control: {type: 'select'},
+  },
+  showCards: {
+    name: 'show cards?',
+    defaultValue: true,
+    control: {type: 'boolean'},
+  },
+  showConversation: {
+    name: 'show conversation?',
+    defaultValue: false,
+    control: {type: 'boolean'},
+  },
+};
+
+export const moments = (args) => {
   return (
     <BentoTwitter
-      limit={limit}
+      {...args}
       momentid="1009149991452135424"
       style={{width: '300px', height: '200px'}}
     />
   );
 };
 
-export const timelines = () => {
-  const tweetLimit = number('limit to', 5);
-  const timelineSourceType = select(
-    'source type',
-    ['profile', 'likes', 'list', 'source', 'collection', 'url', 'widget'],
-    'profile'
-  );
-  const timelineScreenName = 'amphtml';
-  const timelineUserId = '3450662892';
-  return (
-    <BentoTwitter
-      tweetLimit={tweetLimit}
-      timelineSourceType={timelineSourceType}
-      timelineScreenName={timelineScreenName}
-      timelineUserId={timelineUserId}
-      style={{width: '300px', height: '200px'}}
-    />
-  );
+moments.args = {
+  limit: 2,
+};
+
+export const timelines = (args) => {
+  return <BentoTwitter {...args} style={{width: '300px', height: '200px'}} />;
+};
+
+timelines.args = {
+  tweetLimit: 5,
+  timelineScreenName: 'amphtml',
+  timelineUserId: '3450662892',
+};
+
+timelines.argTypes = {
+  timelineSourceType: {
+    name: 'timelineSourceType',
+    defaultValue: 'profile',
+    options: [
+      'profile',
+      'likes',
+      'list',
+      'source',
+      'collection',
+      'url',
+      'widget',
+    ],
+    control: {type: 'select'},
+  },
 };
diff --git a/extensions/amp-twitter/1.0/test/test-amp-twitter.js b/extensions/amp-twitter/1.0/test/test-amp-twitter.js
index 921d87d3b1b4..1beb55080165 100644
--- a/extensions/amp-twitter/1.0/test/test-amp-twitter.js
+++ b/extensions/amp-twitter/1.0/test/test-amp-twitter.js
@@ -1,9 +1,11 @@
 import '../amp-twitter';
-import {createElementWithAttributes} from '#core/dom';
-import {doNotLoadExternalResourcesInTest} from '#testing/iframe';
 import {serializeMessage} from '#core/3p-frame-messaging';
+import {createElementWithAttributes} from '#core/dom';
+
 import {toggleExperiment} from '#experiments';
+
 import {waitFor} from '#testing/helpers/service';
+import {doNotLoadExternalResourcesInTest} from '#testing/iframe';
 
 describes.realWin(
   'amp-twitter-v1.0',
@@ -150,5 +152,28 @@ describes.realWin(
 
       expect(togglePlaceholderStub).to.be.calledOnce.calledWith(true);
     });
+
+    it('should pass the data-loading attribute to the underlying iframe', async () => {
+      element = createElementWithAttributes(doc, 'amp-twitter', {
+        'data-tweetid': '585110598171631616',
+        'data-loading': 'eager',
+      });
+      doc.body.appendChild(element);
+      await waitForRender();
+
+      const iframe = element.shadowRoot.querySelector('iframe');
+      expect(iframe.getAttribute('loading')).to.equal('eager');
+    });
+
+    it('should set data-loading="auto" if no value is specified', async () => {
+      element = createElementWithAttributes(doc, 'amp-twitter', {
+        'data-tweetid': '585110598171631616',
+      });
+      doc.body.appendChild(element);
+      await waitForRender();
+
+      const iframe = element.shadowRoot.querySelector('iframe');
+      expect(iframe.getAttribute('loading')).to.equal('auto');
+    });
   }
 );
diff --git a/extensions/amp-twitter/1.0/test/test-component.js b/extensions/amp-twitter/1.0/test/test-component.js
deleted file mode 100644
index b251d2cc6de2..000000000000
--- a/extensions/amp-twitter/1.0/test/test-component.js
+++ /dev/null
@@ -1,191 +0,0 @@
-import * as Preact from '#preact';
-import {BentoTwitter} from '../component';
-import {WithAmpContext} from '#preact/context';
-import {createRef} from '#preact';
-import {mount} from 'enzyme';
-import {serializeMessage} from '#core/3p-frame-messaging';
-import {waitFor} from '#testing/helpers/service';
-
-describes.sandboxed('Twitter preact component v1.0', {}, (env) => {
-  it('should render', () => {
-    const wrapper = mount(
-      <BentoTwitter
-        tweetid="1356304203044499462"
-        style={{
-          'width': '500px',
-          'height': '600px',
-        }}
-      />
-    );
-
-    const iframe = wrapper.find('iframe');
-
-    expect(iframe.prop('src')).to.equal(
-      'http://ads.localhost:9876/dist.3p/current/frame.max.html'
-    );
-    expect(wrapper.find('iframe').prop('style').width).to.equal('100%');
-    expect(wrapper.find('iframe').prop('style').height).to.equal('100%');
-  });
-
-  it('should call given requestResize', () => {
-    const requestResizeSpy = env.sandbox.spy();
-    const wrapper = mount(
-      <BentoTwitter
-        tweetid="1356304203044499462"
-        style={{
-          'width': '500px',
-          'height': '600px',
-        }}
-        requestResize={requestResizeSpy}
-      />
-    );
-
-    const iframe = wrapper.find('iframe').getDOMNode();
-    const sentinel = JSON.parse(iframe.getAttribute('name'))['attributes'][
-      'sentinel'
-    ];
-
-    const mockEvent = new CustomEvent('message');
-    mockEvent.data = serializeMessage('embed-size', sentinel, {
-      'height': 1000,
-    });
-    mockEvent.source = wrapper
-      .getDOMNode()
-      .querySelector('iframe').contentWindow;
-    window.dispatchEvent(mockEvent);
-
-    expect(requestResizeSpy).to.have.been.calledOnce;
-  });
-
-  it('should change height', async () => {
-    const wrapper = mount(
-      <BentoTwitter
-        tweetid="1356304203044499462"
-        style={{
-          'width': '500px',
-          'height': '600px',
-        }}
-      />
-    );
-
-    const iframe = wrapper.find('iframe').getDOMNode();
-    const sentinel = JSON.parse(iframe.getAttribute('name'))['attributes'][
-      'sentinel'
-    ];
-
-    const mockEvent = new CustomEvent('message');
-    mockEvent.data = serializeMessage('embed-size', sentinel, {
-      'height': 1000,
-    });
-    mockEvent.source = wrapper
-      .getDOMNode()
-      .querySelector('iframe').contentWindow;
-    window.dispatchEvent(mockEvent);
-
-    wrapper.update();
-
-    await waitFor(
-      () => wrapper.find('div').at(0).prop('style').height == 1000,
-      'Height changes'
-    );
-
-    expect(wrapper.find('div').at(0).prop('style').height).to.equal(1000);
-  });
-
-  it('should dispatch load event', async () => {
-    const ref = createRef();
-    const onReadyState = env.sandbox.spy();
-    const wrapper = mount(
-      <BentoTwitter
-        ref={ref}
-        tweetid="1356304203044499462"
-        style={{
-          'width': '500px',
-          'height': '600px',
-        }}
-        onReadyState={onReadyState}
-      />
-    );
-
-    let api = ref.current;
-    expect(api.readyState).to.equal('loading');
-    expect(onReadyState).to.not.be.called;
-
-    await wrapper.find('iframe').invoke('onLoad')();
-    api = ref.current;
-    expect(api.readyState).to.equal('complete');
-    expect(onReadyState).to.be.calledOnce.calledWith('complete');
-  });
-
-  it('should reset iframe on pause', () => {
-    const ref = createRef();
-    const wrapper = mount(
-      <WithAmpContext playable={true}>
-        <BentoTwitter
-          ref={ref}
-          tweetid="1356304203044499462"
-          style={{
-            'width': '500px',
-            'height': '600px',
-          }}
-        />
-      </WithAmpContext>
-    );
-    expect(wrapper.find('iframe')).to.have.lengthOf(1);
-
-    const iframe = wrapper.find('iframe').getDOMNode();
-    const spy = env.sandbox./*OK*/ spy(iframe, 'src', ['set']);
-    wrapper.setProps({playable: false});
-    expect(spy.set).to.be.calledOnce;
-  });
-
-  it('should call onLoad when loaded', () => {
-    const onLoadSpy = env.sandbox.spy();
-    const onErrorSpy = env.sandbox.spy();
-
-    const wrapper = mount(
-      <BentoTwitter
-        tweetid="1356304203044499462"
-        height="500"
-        width="500"
-        onLoad={onLoadSpy}
-        onError={onErrorSpy}
-      ></BentoTwitter>
-    );
-
-    const iframe = wrapper.find('iframe').getDOMNode();
-    const {sentinel} = JSON.parse(iframe.getAttribute('name')).attributes;
-    const mockEvent = new CustomEvent('message');
-    mockEvent.data = serializeMessage('embed-size', sentinel, {height: '1000'});
-    mockEvent.source = iframe.contentWindow;
-    window.dispatchEvent(mockEvent);
-
-    expect(onLoadSpy).to.have.been.calledOnce;
-    expect(onErrorSpy).not.to.have.been.called;
-  });
-
-  it('should call onError when error', () => {
-    const onErrorSpy = env.sandbox.spy();
-    const onLoadSpy = env.sandbox.spy();
-
-    const wrapper = mount(
-      <BentoTwitter
-        tweetid="00000000111111"
-        height="500"
-        width="500"
-        onError={onErrorSpy}
-        onLoad={onLoadSpy}
-      ></BentoTwitter>
-    );
-
-    const iframe = wrapper.find('iframe').getDOMNode();
-    const {sentinel} = JSON.parse(iframe.getAttribute('name')).attributes;
-    const mockEvent = new CustomEvent('message');
-    mockEvent.data = serializeMessage('no-content', sentinel);
-    mockEvent.source = iframe.contentWindow;
-    window.dispatchEvent(mockEvent);
-
-    expect(onErrorSpy).to.have.been.calledOnce;
-    expect(onLoadSpy).not.to.have.been.called;
-  });
-});
diff --git a/extensions/amp-twitter/validator-amp-twitter.protoascii b/extensions/amp-twitter/validator-amp-twitter.protoascii
index fde96f89abe6..815fa44430f8 100644
--- a/extensions/amp-twitter/validator-amp-twitter.protoascii
+++ b/extensions/amp-twitter/validator-amp-twitter.protoascii
@@ -1,8 +1,8 @@
 tags: {  # amp-twitter 1.0
   html_format: AMP
   tag_name: "SCRIPT"
-  satisfies: "amp-twitter 1.0"
-  excludes: "amp-twitter 0.1"
+  satisfies_condition: "amp-twitter 1.0"
+  excludes_condition: "amp-twitter 0.1"
   extension_spec: {
     name: "amp-twitter"
     version_name: "v1.0"
@@ -14,8 +14,8 @@ tags: {  # amp-twitter 1.0
 tags: {  # amp-twitter 0.1 and latest
   html_format: AMP
   tag_name: "SCRIPT"
-  satisfies: "amp-twitter 0.1"
-  excludes: "amp-twitter 1.0"
+  satisfies_condition: "amp-twitter 0.1"
+  excludes_condition: "amp-twitter 1.0"
   extension_spec: {
     name: "amp-twitter"
     version_name: "v0.1"
diff --git a/extensions/amp-user-notification/0.1/amp-user-notification.js b/extensions/amp-user-notification/0.1/amp-user-notification.js
index 073871c10577..aa02d7d84b7d 100644
--- a/extensions/amp-user-notification/0.1/amp-user-notification.js
+++ b/extensions/amp-user-notification/0.1/amp-user-notification.js
@@ -1,7 +1,6 @@
 import {Deferred} from '#core/data-structures/promise';
 import {toggle} from '#core/dom/style';
 import {rethrowAsync} from '#core/error';
-import {dict} from '#core/types/object';
 
 import {Services} from '#service';
 import {
@@ -274,10 +273,10 @@ export class AmpUserNotification extends AMP.BaseElement {
    * @return {!Object}
    */
   buildPostDismissRequest_(enctype, elementId, ampUserId) {
-    const body = dict({
+    const body = {
       'elementId': elementId,
       'ampUserId': ampUserId,
-    });
+    };
     return {
       method: 'POST',
       credentials: 'include',
@@ -453,10 +452,10 @@ export class UserNotificationManager {
     /** @const */
     this.ampdoc = ampdoc;
 
-    /** @private @const {!Object<string,!NotificationInterface>} */
+    /** @private @const {!{[key: string]: !NotificationInterface}} */
     this.registry_ = Object.create(null);
 
-    /** @private @const {!Object<string,!UserNotificationDeferDef>} */
+    /** @private @const {!{[key: string]: !UserNotificationDeferDef}} */
     this.deferRegistry_ = Object.create(null);
 
     /** @private @const {!Promise} */
diff --git a/extensions/amp-video-docking/0.1/amp-video-docking.css b/extensions/amp-video-docking/0.1/amp-video-docking.css
index 354579b2c035..6198bfb9ba97 100644
--- a/extensions/amp-video-docking/0.1/amp-video-docking.css
+++ b/extensions/amp-video-docking/0.1/amp-video-docking.css
@@ -118,7 +118,7 @@
 }
 
 .amp-video-docked-pause {
-  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24px' height='24px' viewBox='0 0 24 24' fill='%23000000'%3E%3Cpath d='M6 19h4V5H6v14zm8-14v14h4V5h-4z'/%3E%3Cpath d='M0 0h24v24H0z' fill='none'/%3E%3C/svg%3E");
+  background-image: url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' width='24px' height='24px' viewBox='0 0 24 24' fill='%23000000'><path d='M6 19h4V5H6v14zm8-14v14h4V5h-4z'/><path d='M0 0h24v24H0z' fill='none'/></svg>");
 }
 
 .amp-video-docked-play {
diff --git a/extensions/amp-video-docking/0.1/amp-video-docking.js b/extensions/amp-video-docking/0.1/amp-video-docking.js
index 32aba8920a84..35b93d436801 100644
--- a/extensions/amp-video-docking/0.1/amp-video-docking.js
+++ b/extensions/amp-video-docking/0.1/amp-video-docking.js
@@ -1,4 +1,4 @@
-import {ActionTrust} from '#core/constants/action-constants';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
 import {isRTL, removeElement} from '#core/dom';
 import {escapeCssSelectorIdent} from '#core/dom/css-selectors';
 import {applyFillContent} from '#core/dom/layout';
@@ -14,7 +14,6 @@ import {
 } from '#core/dom/style';
 import {getInternalVideoElementFor} from '#core/dom/video';
 import {once} from '#core/types/function';
-import {dict} from '#core/types/object';
 
 import {Services} from '#service';
 
@@ -40,9 +39,9 @@ import {createViewportRect} from './viewport-rect';
 import {CSS} from '../../../build/amp-video-docking-0.1.css';
 import {installStylesForDoc} from '../../../src/style-installer';
 import {
-  PlayingStates,
-  VideoAttributes,
-  VideoEvents,
+  PlayingStates_Enum,
+  VideoAttributes_Enum,
+  VideoEvents_Enum,
   VideoInterface,
   VideoOrBaseElementDef,
   isDockable,
@@ -204,24 +203,24 @@ export function getPosterImageSrc(element) {
  * @return {!Element}
  * @private
  */
-const ShadowLayer = (html) =>
-  html` <div class="amp-video-docked-shadow" hidden></div> `;
+const ShadowLayer = (html) => html`
+  <div class="amp-video-docked-shadow" hidden></div>
+`;
 
 /**
  * @param {!HtmlLiteralTagDef} html
  * @return {!Element}
  * @private
  */
-const PlaceholderBackground = (html) =>
-  html`
-    <div class="amp-video-docked-placeholder-background">
-      <div
-        class="amp-video-docked-placeholder-background-poster"
-        ref="poster"
-      ></div>
-      <div class="amp-video-docked-placeholder-icon" ref="icon"></div>
-    </div>
-  `;
+const PlaceholderBackground = (html) => html`
+  <div class="amp-video-docked-placeholder-background">
+    <div
+      class="amp-video-docked-placeholder-background-poster"
+      ref="poster"
+    ></div>
+    <div class="amp-video-docked-placeholder-icon" ref="icon"></div>
+  </div>
+`;
 
 /**
  * Manages docking (a.k.a. minimize to corner) for videos that satisfy the
@@ -267,7 +266,7 @@ export class VideoDocking {
       this.append_(PlaceholderBackground(html))
     );
 
-    /** @private @const {function():!Object<string, !Element>} */
+    /** @private @const {function():!{[key: string]: !Element}} */
     this.getPlaceholderRefs_ = once(() =>
       htmlRefs(this.getPlaceholderBackground_())
     );
@@ -348,7 +347,7 @@ export class VideoDocking {
     const ampdoc = this.ampdoc_;
 
     const dockableSelector = `[${escapeCssSelectorIdent(
-      VideoAttributes.DOCK
+      VideoAttributes_Enum.DOCK
     )}]`;
 
     const dockableElements = ampdoc
@@ -357,12 +356,15 @@ export class VideoDocking {
 
     for (let i = 0; i < dockableElements.length; i++) {
       const element = dockableElements[i];
-      if (element.signals && element.signals().get(VideoEvents.REGISTERED)) {
+      if (
+        element.signals &&
+        element.signals().get(VideoEvents_Enum.REGISTERED)
+      ) {
         this.registerElement(element);
       }
     }
 
-    listen(ampdoc.getBody(), VideoEvents.REGISTERED, (e) => {
+    listen(ampdoc.getBody(), VideoEvents_Enum.REGISTERED, (e) => {
       const target = dev().assertElement(e.target);
       if (isDockable(target)) {
         this.registerElement(target);
@@ -398,7 +400,7 @@ export class VideoDocking {
     dev().assertElement(video);
 
     userAssert(
-      video.signals().get(VideoEvents.REGISTERED),
+      video.signals().get(VideoEvents_Enum.REGISTERED),
       '`dock` attribute can only be set on video components.'
     );
 
@@ -709,7 +711,8 @@ export class VideoDocking {
       optVideo || this.getDockedVideo_()
     );
     return (
-      this.manager_().getPlayingState(video) == PlayingStates.PLAYING_MANUAL
+      this.manager_().getPlayingState(video) ==
+      PlayingStates_Enum.PLAYING_MANUAL
     );
   }
 
@@ -822,11 +825,11 @@ export class VideoDocking {
         this.getDockedVideo_().element
     );
 
-    const trust = ActionTrust.LOW;
+    const trust = ActionTrust_Enum.LOW;
     const event = createCustomEvent(
       this.ampdoc_.win,
       /** @type {string} */ (action),
-      /* detail */ dict({})
+      {}
     );
     const actions = Services.actionServiceForDoc(element);
     actions.trigger(element, action, event, trust);
diff --git a/extensions/amp-video-docking/0.1/controls.js b/extensions/amp-video-docking/0.1/controls.js
index 4e5bbc8c80d2..59dedd70a554 100644
--- a/extensions/amp-video-docking/0.1/controls.js
+++ b/extensions/amp-video-docking/0.1/controls.js
@@ -21,7 +21,10 @@ import {VideoDockingEvents, pointerCoords} from './events';
 import {HtmlLiteralTagDef} from './html';
 import {Timeout} from './timeout';
 
-import {PlayingStates, VideoEvents} from '../../../src/video-interface';
+import {
+  PlayingStates_Enum,
+  VideoEvents_Enum,
+} from '../../../src/video-interface';
 
 /**
  * A single controls set can be displayed at a time on the controls layer.
@@ -70,75 +73,67 @@ function swap(a, b) {
  * @return {!Element}
  * @private
  */
-const renderDockedOverlay = (html) =>
-  html` <div class="i-amphtml-video-docked-overlay" hidden></div> `;
+const renderDockedOverlay = (html) => html`
+  <div class="i-amphtml-video-docked-overlay" hidden></div>
+`;
 
 /**
  * @param {!HtmlLiteralTagDef} html
  * @return {!Element}
  * @private
  */
-const renderControls = (html) =>
-  html`
-    <div class="amp-video-docked-controls" hidden>
-      <div
-        class="amp-video-docked-main-button-group
+const renderControls = (html) => html`
+  <div class="amp-video-docked-controls" hidden>
+    <div
+      class="amp-video-docked-main-button-group
                amp-video-docked-control-set-playback"
-      >
-        <div class="amp-video-docked-button-group">
-          <div
-            role="button"
-            ref="playButton"
-            class="amp-video-docked-play"
-          ></div>
-          <div
-            role="button"
-            ref="pauseButton"
-            class="amp-video-docked-pause"
-          ></div>
-        </div>
-        <div class="amp-video-docked-button-group">
-          <div
-            role="button"
-            ref="muteButton"
-            class="amp-video-docked-mute"
-          ></div>
-          <div
-            role="button"
-            ref="unmuteButton"
-            class="amp-video-docked-unmute"
-          ></div>
-        </div>
-        <div class="amp-video-docked-button-group">
-          <div
-            role="button"
-            ref="fullscreenButton"
-            class="amp-video-docked-fullscreen"
-          ></div>
-        </div>
+    >
+      <div class="amp-video-docked-button-group">
+        <div role="button" ref="playButton" class="amp-video-docked-play"></div>
+        <div
+          role="button"
+          ref="pauseButton"
+          class="amp-video-docked-pause"
+        ></div>
       </div>
-      <div
-        class="amp-video-docked-main-button-group
-               amp-video-docked-control-set-scroll-back"
-        hidden
-      >
-        <div class="amp-video-docked-button-group">
-          <div
-            role="button"
-            ref="scrollBackButton"
-            class="amp-video-docked-scroll-back"
-          ></div>
-        </div>
+      <div class="amp-video-docked-button-group">
+        <div role="button" ref="muteButton" class="amp-video-docked-mute"></div>
+        <div
+          role="button"
+          ref="unmuteButton"
+          class="amp-video-docked-unmute"
+        ></div>
       </div>
-      <div class="amp-video-docked-button-dismiss-group" ref="dismissContainer">
+      <div class="amp-video-docked-button-group">
         <div
           role="button"
-          ref="dismissButton"
-          class="amp-video-docked-dismiss"
+          ref="fullscreenButton"
+          class="amp-video-docked-fullscreen"
         ></div>
       </div>
     </div>
-  `;
+    <div
+      class="amp-video-docked-main-button-group
+               amp-video-docked-control-set-scroll-back"
+      hidden
+    >
+      <div class="amp-video-docked-button-group">
+        <div
+          role="button"
+          ref="scrollBackButton"
+          class="amp-video-docked-scroll-back"
+        ></div>
+      </div>
+    </div>
+    <div class="amp-video-docked-button-dismiss-group" ref="dismissContainer">
+      <div
+        role="button"
+        ref="dismissButton"
+        class="amp-video-docked-dismiss"
+      ></div>
+    </div>
+  </div>
+`;
 
 export class Controls {
   /** @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc */
@@ -300,16 +295,16 @@ export class Controls {
         this.hideOnTimeout(TIMEOUT_AFTER_INTERACTION)
       ),
 
-      listen(element, VideoEvents.PLAYING, () => this.onPlay_()),
-      listen(element, VideoEvents.PAUSE, () => this.onPause_()),
-      listen(element, VideoEvents.MUTED, () => this.onMute_()),
-      listen(element, VideoEvents.UNMUTED, () => this.onUnmute_()),
+      listen(element, VideoEvents_Enum.PLAYING, () => this.onPlay_()),
+      listen(element, VideoEvents_Enum.PAUSE, () => this.onPause_()),
+      listen(element, VideoEvents_Enum.MUTED, () => this.onMute_()),
+      listen(element, VideoEvents_Enum.UNMUTED, () => this.onUnmute_()),
 
-      listen(element, VideoEvents.AD_START, () =>
+      listen(element, VideoEvents_Enum.AD_START, () =>
         this.useControlSet_(ControlSet.SCROLL_BACK)
       ),
 
-      listen(element, VideoEvents.AD_END, () =>
+      listen(element, VideoEvents_Enum.AD_END, () =>
         this.useControlSet_(ControlSet.PLAYBACK)
       )
     );
@@ -405,7 +400,8 @@ export class Controls {
 
     const isRollingAd = manager.isRollingAd(video);
     const isMuted = manager.isMuted(video);
-    const isPlaying = manager.getPlayingState(video) !== PlayingStates.PAUSED;
+    const isPlaying =
+      manager.getPlayingState(video) !== PlayingStates_Enum.PAUSED;
 
     const {container, overlay} = this;
 
diff --git a/extensions/amp-video-docking/0.1/test/test-amp-video-docking.js b/extensions/amp-video-docking/0.1/test/test-amp-video-docking.js
index f24341d2372d..9b0b013989b7 100644
--- a/extensions/amp-video-docking/0.1/test/test-amp-video-docking.js
+++ b/extensions/amp-video-docking/0.1/test/test-amp-video-docking.js
@@ -5,7 +5,7 @@ import {htmlFor} from '#core/dom/static-template';
 
 import {Services} from '#service';
 
-import {PlayingStates} from '../../../../src/video-interface';
+import {PlayingStates_Enum} from '../../../../src/video-interface';
 import {
   Actions,
   BASE_CLASS_NAME,
@@ -53,7 +53,7 @@ describes.realWin('video docking', {amp: true}, (env) => {
     // VideoDocking.querySlot_() expects this guy:
     querySelectorStub.withArgs('[dock]').returns(video.element);
 
-    // VideoDocking.querySlot_() expects the VideoEvents.REGISTERED signal.
+    // VideoDocking.querySlot_() expects the VideoEvents_Enum.REGISTERED signal.
     // This is normally set by virtue of the Video service, which is not
     // tested here.
     video.signals = () => ({
@@ -154,7 +154,7 @@ describes.realWin('video docking', {amp: true}, (env) => {
 
     manager = {
       getPlayingState() {
-        return PlayingStates.PLAYING_MANUAL;
+        return PlayingStates_Enum.PLAYING_MANUAL;
       },
       isMuted() {
         return false;
@@ -688,9 +688,7 @@ describes.realWin('video docking', {amp: true}, (env) => {
   });
 
   describe('dockInTransferLayerStep_', () => {
-    // Something weird causing this to flake in certain leftover states.
-    // TODO(alanorozco): Unskip.
-    it.skip('should not overflow', async () => {
+    it('should not overflow', async () => {
       const video = {};
       const target = {};
 
diff --git a/extensions/amp-video-docking/0.1/viewport-rect.js b/extensions/amp-video-docking/0.1/viewport-rect.js
index 64c709e1d475..e2290d7dfce8 100644
--- a/extensions/amp-video-docking/0.1/viewport-rect.js
+++ b/extensions/amp-video-docking/0.1/viewport-rect.js
@@ -1,4 +1,4 @@
-import {LayoutRectDef, layoutRectLtwh} from '#core/dom/layout/rect';
+import {layoutRectLtwh} from '#core/dom/layout/rect';
 
 /**
  * @param {function():T} get
@@ -15,7 +15,7 @@ const readonlyGetterProp = (get) => ({
  * Returns a `LayoutRectDef`-like object whose values match the viewport's area
  * accoding to service.
  * @param {!../../../src/service/viewport/viewport-interface.ViewportInterface} viewport
- * @return {!LayoutRectDef} with dynamic getters
+ * @return {import('./rect').LayoutRectDef} with dynamic getters
  */
 export function createViewportRect(viewport) {
   const width = readonlyGetterProp(() => viewport.getSize().width);
diff --git a/extensions/amp-video-docking/amp-video-docking.md b/extensions/amp-video-docking/amp-video-docking.md
index 94497699c908..dd05e594f975 100644
--- a/extensions/amp-video-docking/amp-video-docking.md
+++ b/extensions/amp-video-docking/amp-video-docking.md
@@ -29,6 +29,7 @@ Currently, the supported players are:
 
 -   [`amp-brid-player`](https://amp.dev/documentation/components/amp-brid-player)
 -   [`amp-brightcove`](https://amp.dev/documentation/components/amp-brightcove)
+-   [`amp-connatix-player`](https://amp.dev/documentation/components/amp-connatix-player)
 -   [`amp-dailymotion`](https://amp.dev/documentation/components/amp-dailymotion)
 -   [`amp-delight-player`](https://github.com/ampproject/amphtml/blob/main/extensions/amp-delight-player/amp-delight-player.md)
 -   [`amp-ima-video`](https://amp.dev/documentation/components/amp-ima-video)
diff --git a/extensions/amp-video-iframe/0.1/amp-video-iframe.js b/extensions/amp-video-iframe/0.1/amp-video-iframe.js
index 2eff60828c03..329e87f0820e 100644
--- a/extensions/amp-video-iframe/0.1/amp-video-iframe.js
+++ b/extensions/amp-video-iframe/0.1/amp-video-iframe.js
@@ -1,3 +1,5 @@
+import {BUBBLE_MESSAGE_EVENTS} from '#bento/apis/video-iframe-api';
+
 import {Deferred} from '#core/data-structures/promise';
 import {
   dispatchCustomEvent,
@@ -9,7 +11,6 @@ import {applyFillContent, isLayoutSizeDefined} from '#core/dom/layout';
 import {measureIntersection} from '#core/dom/layout/intersection';
 import {PauseHelper} from '#core/dom/video/pause-helper';
 import {once} from '#core/types/function';
-import {dict} from '#core/types/object';
 import {tryParseJson} from '#core/types/object/json';
 
 import {Services} from '#service';
@@ -24,7 +25,7 @@ import {
   looksLikeTrackingIframe,
 } from '../../../src/iframe-helper';
 import {
-  SandboxOptions,
+  SandboxOptions_Enum,
   createFrameFor,
   isJsonOrObj,
   objOrParseJson,
@@ -33,9 +34,8 @@ import {
 import {addParamsToUrl} from '../../../src/url';
 import {
   MIN_VISIBILITY_RATIO_FOR_AUTOPLAY,
-  VideoEvents,
+  VideoEvents_Enum,
 } from '../../../src/video-interface';
-import {BUBBLE_MESSAGE_EVENTS} from '../amp-video-iframe-api';
 
 /** @private @const */
 const TAG = 'amp-video-iframe';
@@ -45,11 +45,11 @@ const ANALYTICS_EVENT_TYPE_PREFIX = 'video-custom-';
 
 /** @private @const */
 const SANDBOX = [
-  SandboxOptions.ALLOW_SCRIPTS,
-  SandboxOptions.ALLOW_SAME_ORIGIN,
-  SandboxOptions.ALLOW_POPUPS,
-  SandboxOptions.ALLOW_POPUPS_TO_ESCAPE_SANDBOX,
-  SandboxOptions.ALLOW_TOP_NAVIGATION_BY_USER_ACTIVATION,
+  SandboxOptions_Enum.ALLOW_SCRIPTS,
+  SandboxOptions_Enum.ALLOW_SAME_ORIGIN,
+  SandboxOptions_Enum.ALLOW_POPUPS,
+  SandboxOptions_Enum.ALLOW_POPUPS_TO_ESCAPE_SANDBOX,
+  SandboxOptions_Enum.ALLOW_TOP_NAVIGATION_BY_USER_ACTIVATION,
 ];
 
 /**
@@ -173,20 +173,20 @@ class AmpVideoIframe extends AMP.BaseElement {
     const rootNode = this.getAmpDoc().getRootNode();
     const {documentElement, title} = rootNode;
 
-    return dict({
+    return {
       'sourceUrl': sourceUrl,
       'canonicalUrl': canonicalUrl,
       'title': title || null,
       'lang': documentElement?.lang || null,
       'jsonLd': getJsonLd(rootNode),
-    });
+    };
   }
 
   /** @private */
   onReady_() {
     const {element} = this;
     Services.videoManagerForDoc(element).register(this);
-    dispatchCustomEvent(element, VideoEvents.LOAD);
+    dispatchCustomEvent(element, VideoEvents_Enum.LOAD);
   }
 
   /** @override */
@@ -296,7 +296,7 @@ class AmpVideoIframe extends AMP.BaseElement {
     //   event: (undefined|string),
     //   analytics: (undefined|{
     //     eventType: string,
-    //     vars: Object<string, string>,
+    //     vars: {[key: string]: string},
     //   }),
     // }}
 
@@ -356,7 +356,7 @@ class AmpVideoIframe extends AMP.BaseElement {
 
   /**
    * @param {string} eventType
-   * @param {!Object<string, string>=} vars
+   * @param {!{[key: string]: string}=} vars
    */
   dispatchCustomAnalyticsEvent_(eventType, vars = {}) {
     user().assertString(eventType, '`eventType` missing in analytics event');
@@ -367,14 +367,10 @@ class AmpVideoIframe extends AMP.BaseElement {
       ANALYTICS_EVENT_TYPE_PREFIX
     );
 
-    dispatchCustomEvent(
-      this.element,
-      VideoEvents.CUSTOM_TICK,
-      dict({
-        'eventType': eventType,
-        'vars': vars,
-      })
-    );
+    dispatchCustomEvent(this.element, VideoEvents_Enum.CUSTOM_TICK, {
+      'eventType': eventType,
+      'vars': vars,
+    });
   }
 
   /**
@@ -392,15 +388,13 @@ class AmpVideoIframe extends AMP.BaseElement {
         ? 0
         : intersectionRatio;
 
-    this.postMessage_(
-      dict({
-        'id': messageId,
-        'args': {
-          'intersectionRatio': postedRatio,
-          'time': time,
-        },
-      })
-    );
+    this.postMessage_({
+      'id': messageId,
+      'args': {
+        'intersectionRatio': postedRatio,
+        'time': time,
+      },
+    });
   }
 
   /**
@@ -410,7 +404,7 @@ class AmpVideoIframe extends AMP.BaseElement {
   postConsentData_(messageId) {
     getConsentDataToForward(this.element, this.getConsentPolicy()).then(
       (consentData) => {
-        this.postMessage_(dict({'id': messageId, 'args': consentData}));
+        this.postMessage_({'id': messageId, 'args': consentData});
       }
     );
   }
@@ -425,12 +419,10 @@ class AmpVideoIframe extends AMP.BaseElement {
       return;
     }
     promise.then(() => {
-      this.postMessage_(
-        dict({
-          'event': 'method',
-          'method': method,
-        })
-      );
+      this.postMessage_({
+        'event': 'method',
+        'method': method,
+      });
     });
   }
 
diff --git a/extensions/amp-video-iframe/0.1/test/test-amp-video-iframe.js b/extensions/amp-video-iframe/0.1/test/test-amp-video-iframe.js
index 22b69647a680..038d208ae23f 100644
--- a/extensions/amp-video-iframe/0.1/test/test-amp-video-iframe.js
+++ b/extensions/amp-video-iframe/0.1/test/test-amp-video-iframe.js
@@ -9,7 +9,7 @@ import {listenOncePromise} from '#utils/event-helper';
 import {macroTask} from '#testing/helpers';
 import {installResizeObserverStub} from '#testing/resize-observer-stub';
 
-import {VideoEvents} from '../../../../src/video-interface';
+import {VideoEvents_Enum} from '../../../../src/video-interface';
 
 describes.realWin(
   'amp-video-iframe',
@@ -83,7 +83,7 @@ describes.realWin(
         height: Number(element.getAttribute('height')) || 100,
       });
       impl.layoutCallback();
-      return listenOncePromise(element, VideoEvents.LOAD);
+      return listenOncePromise(element, VideoEvents_Enum.LOAD);
     }
 
     async function stubPostMessage(videoIframe) {
@@ -239,7 +239,7 @@ describes.realWin(
       });
 
       it('should auto-pause when playing and no size', async () => {
-        impl.onMessage_({data: {event: VideoEvents.PLAYING}});
+        impl.onMessage_({data: {event: VideoEvents_Enum.PLAYING}});
         // First send "size" event and then "no size".
         resizeObserverStub.notifySync({
           target: player,
@@ -261,8 +261,8 @@ describes.realWin(
       });
 
       it('should NOT auto-pause when not playing', async () => {
-        impl.onMessage_({data: {event: VideoEvents.PLAYING}});
-        impl.onMessage_({data: {event: VideoEvents.PAUSE}});
+        impl.onMessage_({data: {event: VideoEvents_Enum.PLAYING}});
+        impl.onMessage_({data: {event: VideoEvents_Enum.PAUSE}});
         // First send "size" event and then "no size".
         resizeObserverStub.notifySync({
           target: player,
@@ -351,13 +351,13 @@ describes.realWin(
         const impl = await videoIframe.getImpl(false);
 
         const validEvents = [
-          VideoEvents.PLAYING,
-          VideoEvents.PAUSE,
-          VideoEvents.ENDED,
-          VideoEvents.MUTED,
-          VideoEvents.UNMUTED,
-          VideoEvents.AD_START,
-          VideoEvents.AD_END,
+          VideoEvents_Enum.PLAYING,
+          VideoEvents_Enum.PAUSE,
+          VideoEvents_Enum.ENDED,
+          VideoEvents_Enum.MUTED,
+          VideoEvents_Enum.UNMUTED,
+          VideoEvents_Enum.AD_START,
+          VideoEvents_Enum.AD_END,
         ];
 
         for (let i = 0; i < validEvents.length; i++) {
@@ -497,7 +497,7 @@ describes.realWin(
         it(`should ${verb} custom analytics event ${sufix}`, async () => {
           const videoIframe = createVideoIframe();
           const eventSpy = env.sandbox.spy();
-          videoIframe.addEventListener(VideoEvents.CUSTOM_TICK, eventSpy);
+          videoIframe.addEventListener(VideoEvents_Enum.CUSTOM_TICK, eventSpy);
 
           await layoutAndLoad(videoIframe);
 
diff --git a/extensions/amp-video-iframe/1.0/amp-video-iframe.js b/extensions/amp-video-iframe/1.0/amp-video-iframe.js
index ed61dc12daca..bfc1e4aa0ae4 100644
--- a/extensions/amp-video-iframe/1.0/amp-video-iframe.js
+++ b/extensions/amp-video-iframe/1.0/amp-video-iframe.js
@@ -1,17 +1,19 @@
+import {BUBBLE_MESSAGE_EVENTS} from '#bento/apis/video-iframe-api';
+import {AmpVideoBaseElement} from '#bento/components/bento-video/1.0/video-base-element';
+import {BaseElement} from '#bento/components/bento-video-iframe/1.0/base-element';
+
 import {measureIntersection} from '#core/dom/layout/intersection';
-import {dict} from '#core/types/object';
 
 import {isExperimentOn} from '#experiments';
 
+import {setSuperClass} from '#preact/amp-base-element';
+
 import {createCustomEvent} from '#utils/event-helper';
 import {userAssert} from '#utils/log';
 
-import {BaseElement} from './base-element';
-
 import {CSS} from '../../../build/amp-video-iframe-1.0.css';
 import {postMessageWhenAvailable} from '../../../src/iframe-video';
 import {MIN_VISIBILITY_RATIO_FOR_AUTOPLAY} from '../../../src/video-interface';
-import {BUBBLE_MESSAGE_EVENTS} from '../amp-video-iframe-api';
 
 /** @const {string} */
 const TAG = 'amp-video-iframe';
@@ -30,7 +32,7 @@ function getIntersectionRatioMinAutoplay(element) {
   );
 }
 
-class AmpVideoIframe extends BaseElement {
+class AmpVideoIframe extends setSuperClass(BaseElement, AmpVideoBaseElement) {
   /** @override */
   isLayoutSupported(layout) {
     userAssert(
@@ -56,12 +58,10 @@ function onMessage(e) {
         (intersectionRatio) => {
           postMessageWhenAvailable(
             currentTarget,
-            JSON.stringify(
-              dict({
-                'id': messageId,
-                'intersectionRatio': intersectionRatio,
-              })
-            )
+            JSON.stringify({
+              'id': messageId,
+              'intersectionRatio': intersectionRatio,
+            })
           );
         }
       );
@@ -105,10 +105,10 @@ const makeMethodMessage = (method) =>
     'method': method.toLowerCase(),
   });
 
-AmpVideoIframe['staticProps'] = dict({
+AmpVideoIframe['staticProps'] = {
   'onMessage': onMessage,
   'makeMethodMessage': makeMethodMessage,
-});
+};
 
 AMP.extension(TAG, '1.0', (AMP) => {
   AMP.registerElement(TAG, AmpVideoIframe, CSS);
diff --git a/extensions/amp-video-iframe/1.0/base-element.js b/extensions/amp-video-iframe/1.0/base-element.js
deleted file mode 100644
index a1a53259c1ea..000000000000
--- a/extensions/amp-video-iframe/1.0/base-element.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import {BentoVideoIframe} from './component';
-
-import {VideoBaseElement} from '../../amp-video/1.0/video-base-element';
-
-export class BaseElement extends VideoBaseElement {}
-
-/** @override */
-BaseElement['Component'] = BentoVideoIframe;
-
-/** @override */
-BaseElement['props'] = {
-  'autoplay': {attr: 'autoplay', type: 'boolean'},
-  'referrerpolicy': {attr: 'referrerpolicy'},
-  'implements-media-session': {attr: 'mediasession', type: 'boolean'},
-  'poster': {attr: 'poster'},
-  'src': {attr: 'src'},
-  'controls': {attr: 'controls', type: 'boolean'},
-
-  // TODO(alanorozco): These props have no internal implementation yet.
-  'dock': {attr: 'dock'},
-  'rotate-to-fullscreen': {attr: 'rotate-to-fullscreen', type: 'boolean'},
-};
-
-/** @override */
-BaseElement['usesShadowDom'] = true;
diff --git a/extensions/amp-video-iframe/1.0/component.js b/extensions/amp-video-iframe/1.0/component.js
deleted file mode 100644
index 99e1e2655c3c..000000000000
--- a/extensions/amp-video-iframe/1.0/component.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Expose from package as BentoVideoIframe
-export {VideoIframe as BentoVideoIframe} from '../../amp-video/1.0/video-iframe';
diff --git a/extensions/amp-video-iframe/1.0/storybook/Basic.amp.js b/extensions/amp-video-iframe/1.0/storybook/Basic.amp.js
index 14e0c6c54f71..dfcd5c08814c 100644
--- a/extensions/amp-video-iframe/1.0/storybook/Basic.amp.js
+++ b/extensions/amp-video-iframe/1.0/storybook/Basic.amp.js
@@ -1,44 +1,40 @@
 import {withAmp} from '@ampproject/storybook-addon';
-import {boolean, number, text, withKnobs} from '@storybook/addon-knobs';
 
 import * as Preact from '#preact';
 
 export default {
   title: 'amp-video-iframe-1_0',
-  decorators: [withKnobs, withAmp],
+  decorators: [withAmp],
   parameters: {
     extensions: [{name: 'amp-video-iframe', version: '1.0'}],
     experiments: ['bento'],
   },
+  args: {
+    width: '640px',
+    height: '360px',
+
+    ariaLabel: 'Video Player',
+    autoplay: true,
+    controls: true,
+    mediasession: true,
+    noaudio: false,
+    loop: false,
+    poster: 'https://amp.dev/static/inline-examples/images/kitten-playing.png',
+    artist: '',
+    album: '',
+    artwork: '',
+    title: '',
+    src: 'https://amp.dev/static/samples/files/amp-video-iframe-videojs.html',
+  },
 };
 
-const AmpVideoIframeWithKnobs = ({i, withPlaceholder, ...rest}) => {
+const AmpVideoIframeWithControls = ({
+  ariaLabel,
+  i,
+  withPlaceholder,
+  ...args
+}) => {
   const group = i ? `Player ${i + 1}` : undefined;
-
-  const width = text('width', '640px', group);
-  const height = text('height', '360px', group);
-
-  const ariaLabel = text('aria-label', 'Video Player');
-  const autoplay = boolean('autoplay', true);
-  const controls = boolean('controls', true);
-  const mediasession = boolean('mediasession', true);
-  const noaudio = boolean('noaudio', false);
-  const loop = boolean('loop', false);
-  const poster = text(
-    'poster',
-    'https://amp.dev/static/samples/img/amp-video-iframe-sample-placeholder.jpg'
-  );
-
-  const artist = text('artist', '');
-  const album = text('album', '');
-  const artwork = text('artwork', '');
-  const title = text('title', '');
-
-  const src = text(
-    'src',
-    'https://amp.dev/static/samples/files/amp-video-iframe-videojs.html'
-  );
-
   const placeholderAndFallback = withPlaceholder ? (
     <>
       <div placeholder style="background:red">
@@ -52,22 +48,10 @@ const AmpVideoIframeWithKnobs = ({i, withPlaceholder, ...rest}) => {
 
   return (
     <amp-video-iframe
-      {...rest}
+      id={group}
       aria-label={ariaLabel}
-      autoplay={autoplay}
-      controls={controls}
-      mediasession={mediasession}
-      noaudio={noaudio}
-      loop={loop}
-      poster={poster}
-      artist={artist}
-      album={album}
-      artwork={artwork}
-      title={title}
       layout="responsive"
-      width={width}
-      height={height}
-      src={src}
+      {...args}
     >
       {placeholderAndFallback}
     </amp-video-iframe>
@@ -86,15 +70,16 @@ const Spacer = ({height}) => {
   );
 };
 
-export const Default = () => {
-  const amount = number('Amount', 1, {}, 'Page');
-  const spacerHeight = text('Space', '80vh', 'Page');
-  const spaceAbove = boolean('Space above', false, 'Page');
-  const spaceBelow = boolean('Space below', false, 'Page');
-
+export const Default = ({
+  amount,
+  spaceAbove,
+  spaceBelow,
+  spacerHeight,
+  ...args
+}) => {
   const players = [];
   for (let i = 0; i < amount; i++) {
-    players.push(<AmpVideoIframeWithKnobs key={i} i={i} />);
+    players.push(<AmpVideoIframeWithControls key={i} i={i} {...args} />);
     if (i < amount - 1) {
       players.push(<Spacer height={spacerHeight} />);
     }
@@ -109,16 +94,23 @@ export const Default = () => {
   );
 };
 
+Default.args = {
+  amount: 1,
+  spacerHeight: '80vh',
+  spaceAbove: false,
+  spaceBelow: false,
+};
+
 const ActionButton = ({children, ...props}) => (
   <button style={{flex: 1, margin: '0 4px'}} {...props}>
     {children}
   </button>
 );
 
-export const Actions = () => {
+export const Actions = ({...args}) => {
   return (
     <div style="max-width: 800px">
-      <AmpVideoIframeWithKnobs id="player" />
+      <AmpVideoIframeWithControls id="player" {...args} />
       <div
         style={{
           margin: '12px 0',
@@ -135,15 +127,18 @@ export const Actions = () => {
   );
 };
 
-export const WithPlaceholderAndFallback = () => {
-  const amount = number('Amount', 1, {}, 'Page');
-  const spacerHeight = text('Space', '80vh', 'Page');
-  const spaceAbove = boolean('Space above', false, 'Page');
-  const spaceBelow = boolean('Space below', false, 'Page');
-
+export const WithPlaceholderAndFallback = ({
+  amount,
+  spaceAbove,
+  spaceBelow,
+  spacerHeight,
+  ...args
+}) => {
   const players = [];
   for (let i = 0; i < amount; i++) {
-    players.push(<AmpVideoIframeWithKnobs key={i} i={i} placeholder={true} />);
+    players.push(
+      <AmpVideoIframeWithControls key={i} i={i} placeholder={true} {...args} />
+    );
     if (i < amount - 1) {
       players.push(<Spacer height={spacerHeight} />);
     }
@@ -157,3 +152,10 @@ export const WithPlaceholderAndFallback = () => {
     </>
   );
 };
+
+WithPlaceholderAndFallback.args = {
+  amount: 1,
+  spacerHeight: '80vh',
+  spaceAbove: false,
+  spaceBelow: false,
+};
diff --git a/extensions/amp-video-iframe/1.0/test-e2e/test-bento-video-iframe.js b/extensions/amp-video-iframe/1.0/test-e2e/test-bento-video-iframe.js
deleted file mode 100644
index 94acfb921e8f..000000000000
--- a/extensions/amp-video-iframe/1.0/test-e2e/test-bento-video-iframe.js
+++ /dev/null
@@ -1,26 +0,0 @@
-describes.endtoend(
-  'bento-video-iframe',
-  {
-    version: '1.0',
-    fixture: 'bento/video-iframe.html',
-    environments: ['single'],
-  },
-  (env) => {
-    let controller;
-
-    beforeEach(() => {
-      controller = env.controller;
-    });
-
-    it('should render a iframe with a video', async () => {
-      const element = await controller.findElement('bento-video-iframe');
-      await controller.switchToShadowRoot(element);
-
-      const iframe = await controller.findElement('iframe');
-
-      await expect(controller.getElementAttribute(iframe, 'src')).to.equal(
-        '/examples/amp-video-iframe/frame.html'
-      );
-    });
-  }
-);
diff --git a/extensions/amp-video-iframe/1.0/test/test-amp-video-iframe.js b/extensions/amp-video-iframe/1.0/test/test-amp-video-iframe.js
index ad8983a8928f..0f556773f427 100644
--- a/extensions/amp-video-iframe/1.0/test/test-amp-video-iframe.js
+++ b/extensions/amp-video-iframe/1.0/test/test-amp-video-iframe.js
@@ -54,5 +54,40 @@ describes.realWin(
       const iframe = element.shadowRoot.querySelector('iframe');
       expect(iframe).to.not.be.null;
     });
+
+    it('should pass the loading attribute to the underlying iframe', async () => {
+      element = html`
+        <amp-video-iframe
+          layout="responsive"
+          width="16"
+          height="9"
+          data-loading="lazy"
+        ></amp-video-iframe>
+      `;
+
+      env.win.document.body.appendChild(element);
+
+      await waitForRender();
+
+      const iframe = element.shadowRoot.querySelector('iframe');
+      expect(iframe.getAttribute('loading')).to.equal('lazy');
+    });
+
+    it('should set data-loading="auto" if no value is specified', async () => {
+      element = html`
+        <amp-video-iframe
+          layout="responsive"
+          width="16"
+          height="9"
+        ></amp-video-iframe>
+      `;
+
+      env.win.document.body.appendChild(element);
+
+      await waitForRender();
+
+      const iframe = element.shadowRoot.querySelector('iframe');
+      expect(iframe.getAttribute('loading')).to.equal('auto');
+    });
   }
 );
diff --git a/extensions/amp-video-iframe/amp-video-iframe-api.js b/extensions/amp-video-iframe/amp-video-iframe-api.js
deleted file mode 100644
index 18ba06fab28d..000000000000
--- a/extensions/amp-video-iframe/amp-video-iframe-api.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import {VideoEvents} from '../../src/video-interface';
-
-/**
- * @fileoverview
- * Definitions of messages and other utilities to talk to an iframe that embeds
- * the amp-video-iframe integration script.
- * See https://go.amp.dev/c/amp-video-iframe#integration-inside-the-frame
- */
-
-// ⚠️ This module should not have side-effects.
-
-/**
- * Events allowed to be dispatched from messages.
- * @private @const
- */
-export const BUBBLE_MESSAGE_EVENTS = [
-  VideoEvents.PLAYING,
-  VideoEvents.PAUSE,
-  VideoEvents.ENDED,
-  VideoEvents.MUTED,
-  VideoEvents.UNMUTED,
-  VideoEvents.AD_START,
-  VideoEvents.AD_END,
-];
diff --git a/extensions/amp-video-iframe/validator-amp-video-iframe.protoascii b/extensions/amp-video-iframe/validator-amp-video-iframe.protoascii
index a734dce91e06..b6a29a46d80a 100644
--- a/extensions/amp-video-iframe/validator-amp-video-iframe.protoascii
+++ b/extensions/amp-video-iframe/validator-amp-video-iframe.protoascii
@@ -1,8 +1,8 @@
 tags: {  # amp-video-iframe
   html_format: AMP  # Iframes not allowed in ads.
   tag_name: "SCRIPT"
-  satisfies: "amp-video-iframe 1.0"
-  excludes: "amp-video-iframe 0.1"
+  satisfies_condition: "amp-video-iframe 1.0"
+  excludes_condition: "amp-video-iframe 0.1"
   extension_spec: {
     name: "amp-video-iframe"
     version_name: "v1.0"
@@ -15,8 +15,8 @@ tags: {  # amp-video-iframe
 tags: {  # amp-video-iframe
   html_format: AMP  # Iframes not allowed in ads.
   tag_name: "SCRIPT"
-  satisfies: "amp-video-iframe 0.1"
-  excludes: "amp-video-iframe 1.0"
+  satisfies_condition: "amp-video-iframe 0.1"
+  excludes_condition: "amp-video-iframe 1.0"
   extension_spec: {
     name: "amp-video-iframe"
     version_name: "v0.1"
diff --git a/extensions/amp-video/0.1/amp-video.js b/extensions/amp-video/0.1/amp-video.js
index 08fc38fd140d..2ffdeef241aa 100644
--- a/extensions/amp-video/0.1/amp-video.js
+++ b/extensions/amp-video/0.1/amp-video.js
@@ -1,19 +1,4 @@
-import {tryPlay} from '#core/dom/video';
-import {EMPTY_METADATA} from '../../../src/mediasession-helper';
-import {PauseHelper} from '#core/dom/video/pause-helper';
-import {Services} from '#service';
-import {VideoEvents} from '../../../src/video-interface';
-import {VisibilityState} from '#core/constants/visibility-state';
-import {addParamsToUrl} from '../../../src/url';
-import {applyFillContent, isLayoutSizeDefined} from '#core/dom/layout';
-import {
-  childElement,
-  childElementByTag,
-  childElementsByTag,
-  matches,
-} from '#core/dom/query';
-import {descendsFromStory} from '#utils/story';
-import {dev, devAssert, user} from '#utils/log';
+import {VisibilityState_Enum} from '#core/constants/visibility-state';
 import {
   addAttributesToElement,
   dispatchCustomEvent,
@@ -21,28 +6,48 @@ import {
   removeElement,
 } from '#core/dom';
 import {escapeCssSelectorIdent} from '#core/dom/css-selectors';
-import {fetchCachedSources} from './video-cache';
 import {
   fullscreenEnter,
   fullscreenExit,
   isFullscreenElement,
 } from '#core/dom/fullscreen';
-import {getBitrateManager} from './flexible-bitrate';
-import {getMode} from '../../../src/mode';
-import {htmlFor} from '#core/dom/static-template';
-import {installVideoManagerForDoc} from '#service/video-manager-impl';
-import {isExperimentOn} from '#experiments';
-import {listen, listenOncePromise} from '#utils/event-helper';
-import {mutedOrUnmutedEvent} from '../../../src/iframe-video';
+import {applyFillContent, isLayoutSizeDefined} from '#core/dom/layout';
 import {propagateAttributes} from '#core/dom/propagate-attributes';
+import {
+  childElement,
+  childElementByTag,
+  childElementsByTag,
+  matches,
+} from '#core/dom/query';
+import {htmlFor} from '#core/dom/static-template';
 import {
   propagateObjectFitStyles,
   setImportantStyles,
   setInitialDisplay,
   setStyles,
 } from '#core/dom/style';
+import {tryPlay} from '#core/dom/video';
+import {PauseHelper} from '#core/dom/video/pause-helper';
 import {toArray} from '#core/types/array';
 
+import {isExperimentOn} from '#experiments';
+
+import {Services} from '#service';
+import {installVideoManagerForDoc} from '#service/video-manager-impl';
+
+import {listen, listenOncePromise} from '#utils/event-helper';
+import {dev, devAssert, user} from '#utils/log';
+import {descendsFromStory} from '#utils/story';
+
+import {getBitrateManager} from './flexible-bitrate';
+import {fetchCachedSources} from './video-cache';
+
+import {mutedOrUnmutedEvent} from '../../../src/iframe-video';
+import {EMPTY_METADATA} from '../../../src/mediasession-helper';
+import {getMode} from '../../../src/mode';
+import {addParamsToUrl} from '../../../src/url';
+import {VideoEvents_Enum} from '../../../src/video-interface';
+
 const TAG = 'amp-video';
 
 /** @private {!Array<string>} */
@@ -114,7 +119,7 @@ export class AmpVideo extends AMP.BaseElement {
    * dependent on the value of `prerenderAllowed()`.
    *
    * @override
-   * @nocollapse
+   *
    */
   static prerenderAllowed(element) {
     // Only allow prerender if video sources are cached on CDN or remote video
@@ -163,6 +168,9 @@ export class AmpVideo extends AMP.BaseElement {
 
     /** @private @const */
     this.pauseHelper_ = new PauseHelper(this.element);
+
+    /** @private {boolean} whether another element is in charge of the captions. */
+    this.hasCaptionsRenderer_ = false;
   }
 
   /**
@@ -332,7 +340,7 @@ export class AmpVideo extends AMP.BaseElement {
       /* opt_removeMissingAttrs */ true
     );
     if (mutations['src']) {
-      dispatchCustomEvent(element, VideoEvents.RELOAD);
+      dispatchCustomEvent(element, VideoEvents_Enum.RELOAD);
     }
     if (mutations['artwork'] || mutations['poster']) {
       const artwork = element.getAttribute('artwork');
@@ -381,7 +389,10 @@ export class AmpVideo extends AMP.BaseElement {
     // when document becomes visible propagate origin sources and other children
     // If not in prerender mode, propagate everything.
     let pendingOriginPromise;
-    if (this.getAmpDoc().getVisibilityState() == VisibilityState.PRERENDER) {
+    if (
+      this.getAmpDoc().getVisibilityState() == VisibilityState_Enum.PRERENDER ||
+      this.getAmpDoc().getVisibilityState() == VisibilityState_Enum.PREVIEW
+    ) {
       if (!this.element.hasAttribute('preload')) {
         this.video_.setAttribute('preload', 'auto');
       }
@@ -686,12 +697,12 @@ export class AmpVideo extends AMP.BaseElement {
     this.unlisteners_.push(
       this.forwardEvents(
         [
-          VideoEvents.ENDED,
-          VideoEvents.LOADEDMETADATA,
-          VideoEvents.LOADEDDATA,
-          VideoEvents.PAUSE,
-          VideoEvents.PLAYING,
-          VideoEvents.PLAY,
+          VideoEvents_Enum.ENDED,
+          VideoEvents_Enum.LOADEDMETADATA,
+          VideoEvents_Enum.LOADEDDATA,
+          VideoEvents_Enum.PAUSE,
+          VideoEvents_Enum.PLAYING,
+          VideoEvents_Enum.PLAY,
         ],
         video
       )
@@ -766,6 +777,13 @@ export class AmpVideo extends AMP.BaseElement {
     if (!captionsElement) {
       return;
     }
+    const ampdoc = this.getAmpDoc();
+    Services.extensionsFor(ampdoc.win).installExtensionForDoc(
+      ampdoc,
+      'amp-story-captions',
+      '0.1'
+    );
+    this.hasCaptionsRenderer_ = true;
     captionsElement.getImpl().then((impl) => {
       if (impl.setVideoElement) {
         impl.setVideoElement(this.video_);
@@ -775,7 +793,8 @@ export class AmpVideo extends AMP.BaseElement {
 
   /** @private */
   onVideoLoaded_() {
-    dispatchCustomEvent(this.element, VideoEvents.LOAD);
+    dispatchCustomEvent(this.element, VideoEvents_Enum.LOAD);
+    this.removePosterForAndroidBug_();
   }
 
   /** @override */
@@ -965,7 +984,6 @@ export class AmpVideo extends AMP.BaseElement {
     if (!this.hideBlurryPlaceholder_()) {
       this.togglePlaceholder(false);
     }
-    this.removePosterForAndroidBug_();
   }
 
   /**
@@ -1026,6 +1044,23 @@ export class AmpVideo extends AMP.BaseElement {
   seekTo(timeSeconds) {
     this.video_.currentTime = timeSeconds;
   }
+
+  /**
+   * Shows or hides the captions.
+   * @param {boolean} captionsState
+   * @public
+   */
+  toggleCaptions(captionsState) {
+    toArray(this.video_.textTracks).forEach((track) => {
+      if (captionsState) {
+        // If a custom captions renderer is configured (e.g. amp-story-captions),
+        // enable captions but keep them hidden to avoid double rendering.
+        track.mode = this.hasCaptionsRenderer_ ? 'hidden' : 'showing';
+      } else {
+        track.mode = 'disabled';
+      }
+    });
+  }
 }
 
 /**
diff --git a/extensions/amp-video/0.1/amp-video.md b/extensions/amp-video/0.1/amp-video.md
index bb0c7fdca902..c296f72a3fbf 100644
--- a/extensions/amp-video/0.1/amp-video.md
+++ b/extensions/amp-video/0.1/amp-video.md
@@ -103,9 +103,14 @@ when the video has autoplay.
 
 [filter formats="stories"]
 
+On stories, this attribute will effectively mute the video.
+
 ### volume
 
-Sets the current volume of the video, where the value must be in the range [0.1, 1]. The default value is 1.
+Sets the current volume of the video, where the value must be in the range [0, 1]. The default value is 1.
+
+When using the volume attribute, it's possible that other videos in the story fail to play correctly if they don't have the `crossorigin` attribute (if the source is CORS).
+
 [/filter]<!-- formats="stories" -->
 
 ### rotate-to-fullscreen
diff --git a/extensions/amp-video/0.1/flexible-bitrate.js b/extensions/amp-video/0.1/flexible-bitrate.js
index e96f62a93ab5..d57666d84d0e 100644
--- a/extensions/amp-video/0.1/flexible-bitrate.js
+++ b/extensions/amp-video/0.1/flexible-bitrate.js
@@ -1,15 +1,18 @@
-import {tryPlay} from '#core/dom/video';
 import {DomBasedWeakRef} from '#core/data-structures/dom-based-weakref';
-import {Services} from '#service';
 import {childElement, childElementsByTag} from '#core/dom/query';
-import {dev, devAssert} from '#utils/log';
+import {tryPlay} from '#core/dom/video';
+import {toArray} from '#core/types/array';
+
 import {isExperimentOn} from '#experiments';
+
+import {Services} from '#service';
+
 import {listen, listenOnce} from '#utils/event-helper';
-import {toArray} from '#core/types/array';
+import {dev, devAssert} from '#utils/log';
 
 const TAG = 'amp-video';
 
-/** @const {!Object<string, number>} */
+/** @const {!{[key: string]: number}} */
 const BITRATE_BY_EFFECTIVE_TYPE = {
   // We assign low values to 2G in general. None of these will likely be able
   // to stream any bitrates we see in the wild.
diff --git a/extensions/amp-video/0.1/test-e2e/test-amp-video-flexible-bitrate.js b/extensions/amp-video/0.1/test-e2e/test-amp-video-flexible-bitrate.js
index 1c2544bde1ce..4e2b92f883ac 100644
--- a/extensions/amp-video/0.1/test-e2e/test-amp-video-flexible-bitrate.js
+++ b/extensions/amp-video/0.1/test-e2e/test-amp-video-flexible-bitrate.js
@@ -109,8 +109,7 @@ describes.endtoend(
         ).equal('');
       });
 
-      // TODO(#35925): Re-enable this test.
-      it.skip('lowers the quality on close videos that are not already loaded when a video buffers', async () => {
+      it('lowers the quality on close videos that are not already loaded when a video buffers', async () => {
         await forceEventOnVideo(VIDEO_EVENTS.UNLOAD, 2);
         await forceEventOnVideo(VIDEO_EVENTS.DOWNGRADE, 1);
 
@@ -213,7 +212,7 @@ describes.endtoend(
         );
 
         await expect(
-          'https://amp-dev.cdn.ampproject.org/mbv/s/amp.dev/static/samples/video/tokyo.mp4?amp_video_host_url=https%3A%2F%2Famp.dev%2F&__amp_source_origin=http%3A%2F%2Flocalhost%3A8000'
+          'https://amp-dev.cdn.ampproject.org/mbv/s/amp.dev/static/samples/video/tokyo.mp4?amp_video_host_url=https%3A%2F%2Famp.dev%2F&amp_video_require_acao_header=1&__amp_source_origin=http%3A%2F%2Flocalhost%3A8000'
         ).to.have.been.sent;
       });
     });
@@ -235,8 +234,7 @@ describes.endtoend(
         ).contains('#high');
       });
 
-      // TODO(#35966): fix flaky test (disabled in #35967)
-      it.skip('loads a low quality source on a far video when the connection drops and the user advances to that page', async () => {
+      it('loads a low quality source on a far video when the connection drops and the user advances to that page', async () => {
         await forceEventOnVideo(VIDEO_EVENTS.DOWNGRADE, 1);
         await forceEventOnVideo(VIDEO_EVENTS.UNLOAD, 4);
         await controller.click(story);
diff --git a/extensions/amp-video/0.1/test/test-amp-video.js b/extensions/amp-video/0.1/test/test-amp-video.js
index f8bd3943d636..bc710f98491f 100644
--- a/extensions/amp-video/0.1/test/test-amp-video.js
+++ b/extensions/amp-video/0.1/test/test-amp-video.js
@@ -1,15 +1,20 @@
-import {AmpCacheUrlService} from '../../../amp-cache-url/0.1/amp-cache-url';
-import {AmpVideo, isCachedByCdn} from '../amp-video';
-import {Services} from '#service';
-import {VideoEvents} from '../../../../src/video-interface';
-import {VisibilityState} from '#core/constants/visibility-state';
+import {VisibilityState_Enum} from '#core/constants/visibility-state';
 import {dispatchCustomEvent} from '#core/dom';
-import {installPerformanceService} from '#service/performance-impl';
-import {installResizeObserverStub} from '#testing/resize-observer-stub';
-import {listenOncePromise} from '#utils/event-helper';
+
 import {toggleExperiment} from '#experiments';
+
+import {Services} from '#service';
+import {installPerformanceService} from '#service/performance-impl';
 import {xhrServiceForTesting} from '#service/xhr-impl';
 
+import {listenOncePromise} from '#utils/event-helper';
+
+import {installResizeObserverStub} from '#testing/resize-observer-stub';
+
+import {VideoEvents_Enum} from '../../../../src/video-interface';
+import {AmpCacheUrlService} from '../../../amp-cache-url/0.1/amp-cache-url';
+import {AmpVideo, isCachedByCdn} from '../amp-video';
+
 describes.realWin(
   'amp-video',
   {
@@ -678,17 +683,17 @@ describes.realWin(
       const impl = await v.getImpl(false);
       await Promise.resolve();
       impl.mute();
-      await listenOncePromise(v, VideoEvents.MUTED);
+      await listenOncePromise(v, VideoEvents_Enum.MUTED);
       impl.play();
-      const playPromise = listenOncePromise(v, VideoEvents.PLAY);
-      await listenOncePromise(v, VideoEvents.PLAYING);
+      const playPromise = listenOncePromise(v, VideoEvents_Enum.PLAY);
+      await listenOncePromise(v, VideoEvents_Enum.PLAYING);
       await playPromise;
       impl.pause();
-      await listenOncePromise(v, VideoEvents.PAUSE);
+      await listenOncePromise(v, VideoEvents_Enum.PAUSE);
       impl.unmute();
-      await listenOncePromise(v, VideoEvents.UNMUTED);
+      await listenOncePromise(v, VideoEvents_Enum.UNMUTED);
       // Should not send the unmute event twice if already sent once.
-      const p = listenOncePromise(v, VideoEvents.UNMUTED).then(() => {
+      const p = listenOncePromise(v, VideoEvents_Enum.UNMUTED).then(() => {
         assert.fail('Should not have dispatch unmute message twice');
       });
       v.querySelector('video').dispatchEvent(new Event('volumechange'));
@@ -698,8 +703,8 @@ describes.realWin(
       video.currentTime = video.duration - 0.1;
       impl.play();
       // Make sure pause and end are triggered when video ends.
-      const pEnded = listenOncePromise(v, VideoEvents.ENDED);
-      const pPause = listenOncePromise(v, VideoEvents.PAUSE);
+      const pEnded = listenOncePromise(v, VideoEvents_Enum.ENDED);
+      const pPause = listenOncePromise(v, VideoEvents_Enum.PAUSE);
       return Promise.all([pEnded, pPause]);
     });
 
@@ -800,7 +805,9 @@ describes.realWin(
             ),
             whenFirstVisible: env.sandbox.stub(env.ampdoc, 'whenFirstVisible'),
           };
-          visibilityStubs.getVisibilityState.returns(VisibilityState.PRERENDER);
+          visibilityStubs.getVisibilityState.returns(
+            VisibilityState_Enum.PRERENDER
+          );
           const visiblePromise = new Promise((resolve) => {
             makeVisible = resolve;
           });
@@ -1106,7 +1113,9 @@ describes.realWin(
           ),
           whenFirstVisible: env.sandbox.stub(env.ampdoc, 'whenFirstVisible'),
         };
-        visibilityStubs.getVisibilityState.returns(VisibilityState.PRERENDER);
+        visibilityStubs.getVisibilityState.returns(
+          VisibilityState_Enum.PRERENDER
+        );
         visiblePromise = new Promise((resolve) => {
           makeVisible = resolve;
         });
@@ -1121,6 +1130,7 @@ describes.realWin(
         it('with just src', () => {
           video.setAttribute('src', 'video.mp4');
           expect(AmpVideo.prerenderAllowed(video)).to.be.false;
+          expect(AmpVideo.previewAllowed(video)).to.be.false;
         });
 
         it('with just source', () => {
@@ -1128,6 +1138,7 @@ describes.realWin(
           source.setAttribute('src', 'video.mp4');
           video.appendChild(source);
           expect(AmpVideo.prerenderAllowed(video)).to.be.false;
+          expect(AmpVideo.previewAllowed(video)).to.be.false;
         });
 
         it('with both src and source', () => {
@@ -1136,6 +1147,7 @@ describes.realWin(
           source.setAttribute('src', 'video.mp4');
           video.appendChild(source);
           expect(AmpVideo.prerenderAllowed(video)).to.be.false;
+          expect(AmpVideo.previewAllowed(video)).to.be.false;
         });
       });
 
@@ -1147,6 +1159,7 @@ describes.realWin(
           );
           video.setAttribute('amp-orig-src', 'https://example.com/video.mp4');
           expect(AmpVideo.prerenderAllowed(video)).to.be.true;
+          expect(AmpVideo.previewAllowed(video)).to.be.true;
         });
 
         it('with just cached source', () => {
@@ -1158,6 +1171,7 @@ describes.realWin(
           source.setAttribute('amp-orig-src', 'https://example.com/video.mp4');
           video.appendChild(source);
           expect(AmpVideo.prerenderAllowed(video)).to.be.true;
+          expect(AmpVideo.previewAllowed(video)).to.be.true;
         });
 
         it('with a mix or cached and non-cached', () => {
@@ -1177,6 +1191,7 @@ describes.realWin(
           video.appendChild(cachedSource);
 
           expect(AmpVideo.prerenderAllowed(video)).to.be.true;
+          expect(AmpVideo.previewAllowed(video)).to.be.true;
         });
       });
 
@@ -1185,6 +1200,7 @@ describes.realWin(
           video.setAttribute('src', 'https://example.com/video.mp4');
           video.setAttribute('poster', 'https://example.com/poster.jpg');
           expect(AmpVideo.prerenderAllowed(video)).to.be.true;
+          expect(AmpVideo.previewAllowed(video)).to.be.true;
         });
       });
 
@@ -1193,6 +1209,7 @@ describes.realWin(
           video.setAttribute('src', 'https://example.com/video.mp4');
           video.setAttribute('cache', 'google');
           expect(AmpVideo.prerenderAllowed(video)).to.be.true;
+          expect(AmpVideo.previewAllowed(video)).to.be.true;
         });
       });
 
diff --git a/extensions/amp-video/0.1/test/test-flexible-bitrate.js b/extensions/amp-video/0.1/test/test-flexible-bitrate.js
index c2a3acb31f72..6137f90ebb73 100644
--- a/extensions/amp-video/0.1/test/test-flexible-bitrate.js
+++ b/extensions/amp-video/0.1/test/test-flexible-bitrate.js
@@ -1,9 +1,11 @@
 import '../flexible-bitrate';
-import {BitrateManager} from '../flexible-bitrate';
 import {childElementsByTag} from '#core/dom/query';
 import {toArray} from '#core/types/array';
+
 import {toggleExperiment} from '#experiments';
 
+import {BitrateManager} from '../flexible-bitrate';
+
 describes.fakeWin('amp-video flexible-bitrate', {}, (env) => {
   let clock;
   beforeEach(() => {
diff --git a/extensions/amp-video/0.1/test/test-video-cache.js b/extensions/amp-video/0.1/test/test-video-cache.js
index 30db94f5252e..c66b75c2f227 100644
--- a/extensions/amp-video/0.1/test/test-video-cache.js
+++ b/extensions/amp-video/0.1/test/test-video-cache.js
@@ -1,10 +1,15 @@
-import {AmpCacheUrlService} from '../../../amp-cache-url/0.1/amp-cache-url';
-import {Services} from '#service';
 import {createElementWithAttributes} from '#core/dom';
-import {fetchCachedSources} from '../video-cache';
+import * as Preact from '#core/dom/jsx';
+
+import {toggleExperiment} from '#experiments';
+
+import {Services} from '#service';
 import {installPerformanceService} from '#service/performance-impl';
 import {xhrServiceForTesting} from '#service/xhr-impl';
 
+import {AmpCacheUrlService} from '../../../amp-cache-url/0.1/amp-cache-url';
+import {fetchCachedSources} from '../video-cache';
+
 describes.realWin('amp-video cached-sources', {amp: true}, (env) => {
   let cacheUrlService;
   let extensionsService;
@@ -39,7 +44,7 @@ describes.realWin('amp-video cached-sources', {amp: true}, (env) => {
       await fetchCachedSources(videoEl, env.ampdoc);
 
       expect(xhrSpy).to.have.been.calledWith(
-        'https://example-com.cdn.ampproject.org/mbv/s/example.com/video1.mp4?amp_video_host_url=https%3A%2F%2Fcanonical.com'
+        'https://example-com.cdn.ampproject.org/mbv/s/example.com/video1.mp4?amp_video_host_url=https%3A%2F%2Fcanonical.com&amp_video_require_acao_header=1'
       );
     });
 
@@ -50,7 +55,7 @@ describes.realWin('amp-video cached-sources', {amp: true}, (env) => {
       await fetchCachedSources(videoEl, env.ampdoc);
 
       expect(xhrSpy).to.have.been.calledWith(
-        'https://example-com.cdn.ampproject.org/mbv/s/example.com/video1.mp4?amp_video_host_url=https%3A%2F%2Fcanonical.com'
+        'https://example-com.cdn.ampproject.org/mbv/s/example.com/video1.mp4?amp_video_host_url=https%3A%2F%2Fcanonical.com&amp_video_require_acao_header=1'
       );
     });
 
@@ -64,7 +69,7 @@ describes.realWin('amp-video cached-sources', {amp: true}, (env) => {
       await fetchCachedSources(videoEl, env.ampdoc);
 
       expect(xhrSpy).to.have.been.calledWith(
-        'https://example-com.cdn.ampproject.org/mbv/s/example.com/video2.mp4?amp_video_host_url=https%3A%2F%2Fcanonical.com'
+        'https://example-com.cdn.ampproject.org/mbv/s/example.com/video2.mp4?amp_video_host_url=https%3A%2F%2Fcanonical.com&amp_video_require_acao_header=1'
       );
     });
 
@@ -79,7 +84,7 @@ describes.realWin('amp-video cached-sources', {amp: true}, (env) => {
       await fetchCachedSources(videoEl, env.ampdoc);
 
       expect(xhrSpy).to.have.been.calledWith(
-        'https://example-com.cdn.ampproject.org/mbv/s/example.com/video1.mp4?amp_video_host_url=https%3A%2F%2Fcanonical.com'
+        'https://example-com.cdn.ampproject.org/mbv/s/example.com/video1.mp4?amp_video_host_url=https%3A%2F%2Fcanonical.com&amp_video_require_acao_header=1'
       );
     });
   });
@@ -92,7 +97,18 @@ describes.realWin('amp-video cached-sources', {amp: true}, (env) => {
       await fetchCachedSources(videoEl, env.ampdoc);
 
       expect(xhrSpy).to.have.been.calledWith(
-        'https://website-com.cdn.ampproject.org/mbv/s/website.com/video.html?amp_video_host_url=https%3A%2F%2Fcanonical.com'
+        'https://website-com.cdn.ampproject.org/mbv/s/website.com/video.html?amp_video_host_url=https%3A%2F%2Fcanonical.com&amp_video_require_acao_header=1'
+      );
+    });
+
+    it('should always add the ACAO header', async () => {
+      const videoEl = createVideo([{'src': 'https://website.com/video.html'}]);
+      const xhrSpy = env.sandbox.spy(xhrService, 'fetch');
+
+      await fetchCachedSources(videoEl, env.ampdoc);
+
+      expect(xhrSpy).to.have.been.calledWith(
+        'https://website-com.cdn.ampproject.org/mbv/s/website.com/video.html?amp_video_host_url=https%3A%2F%2Fcanonical.com&amp_video_require_acao_header=1'
       );
     });
 
@@ -103,7 +119,7 @@ describes.realWin('amp-video cached-sources', {amp: true}, (env) => {
       await fetchCachedSources(videoEl, env.ampdoc);
 
       expect(xhrSpy).to.have.been.calledWith(
-        'https://example-com.cdn.ampproject.org/mbv/s/example.com/video.html?amp_video_host_url=https%3A%2F%2Fcanonical.com'
+        'https://example-com.cdn.ampproject.org/mbv/s/example.com/video.html?amp_video_host_url=https%3A%2F%2Fcanonical.com&amp_video_require_acao_header=1'
       );
     });
 
@@ -114,7 +130,7 @@ describes.realWin('amp-video cached-sources', {amp: true}, (env) => {
       await fetchCachedSources(videoEl, env.ampdoc);
 
       expect(xhrSpy).to.have.been.calledWith(
-        'https://website-com.cdn.ampproject.org/mbv/s/website.com/video.gif?amp_video_host_url=https%3A%2F%2Fcanonical.com'
+        'https://website-com.cdn.ampproject.org/mbv/s/website.com/video.gif?amp_video_host_url=https%3A%2F%2Fcanonical.com&amp_video_require_acao_header=1'
       );
     });
   });
@@ -382,6 +398,14 @@ describes.realWin('amp-video cached-sources', {amp: true}, (env) => {
       expect(videoEl.querySelector('source[data-bitrate]')).to.not.be.null;
     });
 
+    it('should set the crossorigin attribute to the video', async () => {
+      const videoEl = createVideo([{'src': 'video.html'}]);
+
+      await fetchCachedSources(videoEl, env.ampdoc);
+
+      expect(videoEl.hasAttribute('crossorigin')).to.be.true;
+    });
+
     it('should set an attribute on cached video sources', async () => {
       env.sandbox.stub(xhrService, 'fetch').resolves({
         json: () =>
@@ -431,6 +455,203 @@ describes.realWin('amp-video cached-sources', {amp: true}, (env) => {
     });
   });
 
+  describe('has_audio field', async () => {
+    beforeEach(() => {
+      toggleExperiment(env.win, 'story-video-cache-apply-audio', true);
+    });
+
+    afterEach(() => {
+      toggleExperiment(env.win, 'story-video-cache-apply-audio', false);
+    });
+    it('should set noaudio if the cache responds with has_audio: false', async () => {
+      env.sandbox.stub(xhrService, 'fetch').resolves({
+        json: () =>
+          Promise.resolve({
+            'has_audio': false,
+            'sources': [
+              {'url': 'video.mp4', 'bitrate_kbps': 700, 'type': 'video/mp4'},
+            ],
+          }),
+      });
+      const videoEl = createVideo([{src: 'video.mp4'}]);
+      await fetchCachedSources(videoEl, env.ampdoc);
+
+      expect(videoEl).to.have.attribute('noaudio');
+    });
+
+    it('should not set noaudio if the cache responds with has_audio: true', async () => {
+      env.sandbox.stub(xhrService, 'fetch').resolves({
+        json: () =>
+          Promise.resolve({
+            'has_audio': true,
+            'sources': [
+              {'url': 'video.mp4', 'bitrate_kbps': 700, 'type': 'video/mp4'},
+            ],
+          }),
+      });
+      const videoEl = createVideo([{src: 'video.mp4'}]);
+      await fetchCachedSources(videoEl, env.ampdoc);
+
+      expect(videoEl).to.not.have.attribute('noaudio');
+    });
+
+    it('should not set noaudio if the cache responds without has_audio', async () => {
+      env.sandbox.stub(xhrService, 'fetch').resolves({
+        json: () =>
+          Promise.resolve({
+            'sources': [
+              {'url': 'video.mp4', 'bitrate_kbps': 700, 'type': 'video/mp4'},
+            ],
+          }),
+      });
+      const videoEl = createVideo([{src: 'video.mp4'}]);
+      await fetchCachedSources(videoEl, env.ampdoc);
+
+      expect(videoEl).to.not.have.attribute('noaudio');
+    });
+  });
+
+  function stubSourcesWithCapionsRequest() {
+    env.sandbox.stub(xhrService, 'fetch').resolves({
+      json: () =>
+        Promise.resolve({
+          'captions': {
+            'src': 'captions_src_response.vtt',
+            'srclang': 'en-us',
+          },
+          'sources': [
+            {'url': 'video.mp4', 'bitrate_kbps': 700, 'type': 'video/mp4'},
+          ],
+        }),
+    });
+  }
+  describe('captions field', async () => {
+    it('should append track element if the cache responds with captions', async () => {
+      stubSourcesWithCapionsRequest();
+      const videoEl = createVideo([{src: 'video.mp4'}]);
+      await fetchCachedSources(videoEl, env.ampdoc);
+
+      const trackEl = videoEl.querySelector('track');
+      expect(trackEl).to.exist;
+    });
+    it('should append story-captions element if the cache responds with captions', async () => {
+      stubSourcesWithCapionsRequest();
+      const videoEl = createVideo([{src: 'video.mp4'}]);
+      await fetchCachedSources(videoEl, env.ampdoc);
+
+      const captionsEl = videoEl.querySelector('amp-story-captions');
+      expect(captionsEl).to.exist;
+    });
+    it('should not append track element if video already has a track child', async () => {
+      stubSourcesWithCapionsRequest();
+      const videoEl = createVideo([{src: 'video.mp4'}]);
+      videoEl.appendChild(<track />);
+      await fetchCachedSources(videoEl, env.ampdoc);
+
+      const trackEl = videoEl.querySelector(
+        'track[src="captions_src_response.vtt"]'
+      );
+      expect(trackEl).to.not.exist;
+    });
+    it('should not append track element if captions does not exist', async () => {
+      env.sandbox.stub(xhrService, 'fetch').resolves({
+        json: () =>
+          Promise.resolve({
+            'sources': [
+              {'url': 'video.mp4', 'bitrate_kbps': 700, 'type': 'video/mp4'},
+            ],
+          }),
+      });
+      const videoEl = createVideo([{src: 'video.mp4'}]);
+      await fetchCachedSources(videoEl, env.ampdoc);
+
+      const trackEl = videoEl.querySelector('track');
+      expect(trackEl).to.not.exist;
+    });
+  });
+
+  describe('web stories: inlined video', async () => {
+    it('should use the inlined source for the first video in the story instead of sending an XHR request', async () => {
+      // Set up an inlined source response for the first video in the story
+      const storyEl = createStoryForInlineVideoTesting();
+      env.win.document.body.appendChild(storyEl);
+      setUpInlinedVideoResponse();
+
+      const xhrSpy = env.sandbox.spy(xhrService, 'fetch');
+
+      // Fetch the sources for the first video in the story
+      const videoEl = storyEl.querySelectorAll('amp-video')[0];
+      await fetchCachedSources(videoEl, env.ampdoc);
+
+      expect(xhrSpy).to.have.not.been.called;
+      const inlinedSources = videoEl.querySelectorAll(
+        'source[src="inlined_video_response.mp4"]'
+      );
+      expect(inlinedSources).to.have.lengthOf(1);
+    });
+
+    it('should send an XHR request for any video that is not the very first one within the story', async () => {
+      // Set up an inlined source response for the first video in the story
+      const storyEl = createStoryForInlineVideoTesting();
+      env.win.document.body.appendChild(storyEl);
+      setUpInlinedVideoResponse();
+
+      const xhrSpy = env.sandbox.spy(xhrService, 'fetch');
+
+      // Fetch the sources for video #2: the 2nd video on the first story page
+      const videoEl2 = storyEl.querySelectorAll('amp-video')[1];
+      await fetchCachedSources(videoEl2, env.ampdoc);
+
+      // Fetch the sources for video #3: the 1st video on the 2nd story page
+      const videoEl3 = storyEl.querySelectorAll('amp-video')[2];
+      await fetchCachedSources(videoEl3, env.ampdoc);
+
+      expect(xhrSpy).to.have.been.calledWith(
+        'https://example-com.cdn.ampproject.org/mbv/s/example.com/video2.mp4?amp_video_host_url=https%3A%2F%2Fcanonical.com&amp_video_require_acao_header=1'
+      );
+      expect(xhrSpy).to.have.been.calledWith(
+        'https://example-com.cdn.ampproject.org/mbv/s/example.com/video3.mp4?amp_video_host_url=https%3A%2F%2Fcanonical.com&amp_video_require_acao_header=1'
+      );
+    });
+
+    it('should send XHR request if inline config not provided', async () => {
+      // Create story without setting an inlined source response
+      const storyEl = createStoryForInlineVideoTesting();
+      env.win.document.body.appendChild(storyEl);
+
+      const xhrSpy = env.sandbox.spy(xhrService, 'fetch');
+
+      // Fetch the sources for the first video in the story
+      const videoEl = storyEl.querySelectorAll('amp-video')[0];
+      await fetchCachedSources(videoEl, env.ampdoc);
+
+      expect(xhrSpy).to.have.been.calledWith(
+        'https://example-com.cdn.ampproject.org/mbv/s/example.com/video1.mp4?amp_video_host_url=https%3A%2F%2Fcanonical.com&amp_video_require_acao_header=1'
+      );
+    });
+
+    it('should send XHR request if inlined video response fails to parse', async () => {
+      // Set up an improperly configured response for the first video in the story
+      const storyEl = createStoryForInlineVideoTesting();
+      env.win.document.body.appendChild(storyEl);
+      const scriptEl = createElementWithAttributes(env.win.document, 'script', {
+        'id': 'amp-google-video-cache-response',
+        'type': 'application/json',
+      });
+      scriptEl.textContent = '{"faulty": [{}]}';
+
+      const xhrSpy = env.sandbox.spy(xhrService, 'fetch');
+
+      // Fetch the sources for the first video in the story
+      const videoEl = storyEl.querySelectorAll('amp-video')[0];
+      await fetchCachedSources(videoEl, env.ampdoc);
+
+      expect(xhrSpy).to.have.been.calledWith(
+        'https://example-com.cdn.ampproject.org/mbv/s/example.com/video1.mp4?amp_video_host_url=https%3A%2F%2Fcanonical.com&amp_video_require_acao_header=1'
+      );
+    });
+  });
+
   function createVideo(children) {
     const videoEl = createElementWithAttributes(env.win.document, 'amp-video', {
       'cache': 'google',
@@ -447,4 +668,49 @@ describes.realWin('amp-video cached-sources', {amp: true}, (env) => {
     env.win.document.body.appendChild(videoEl);
     return videoEl;
   }
+
+  function createStoryForInlineVideoTesting() {
+    const storyEl = env.win.document.createElement('amp-story');
+    const storyPageEl1 = env.win.document.createElement('amp-story-page');
+    const storyPageEl2 = env.win.document.createElement('amp-story-page');
+    storyEl.appendChild(storyPageEl1);
+    storyEl.appendChild(storyPageEl2);
+
+    // Place two videos on the first page. video #1 is nested more deeply than
+    // video #2, but it should still be considered the first video on the page.
+    const gridLayerEl = env.win.document.createElement('amp-story-grid-layer');
+    const videoEl1 = createVideo([{src: 'video1.mp4'}]);
+    gridLayerEl.appendChild(videoEl1);
+    storyPageEl1.appendChild(gridLayerEl);
+
+    // Place video #2 on the first page.
+    const videoEl2 = createVideo([{src: 'video2.mp4'}]);
+    storyPageEl1.appendChild(videoEl2);
+
+    // Place video #3 on the second page.
+    const videoEl3 = createVideo([{src: 'video3.mp4'}]);
+    storyPageEl2.appendChild(videoEl3);
+
+    return storyEl;
+  }
+
+  function setUpInlinedVideoResponse() {
+    const scriptEl = createElementWithAttributes(env.win.document, 'script', {
+      'id': 'amp-google-video-cache-response',
+      'type': 'application/json',
+    });
+    scriptEl.textContent = `
+      {
+        "sources": [
+          {
+            "url": "inlined_video_response.mp4",
+            "codec": "h264",
+            "type": "video/mp4",
+            "bitrate_kbps": 400
+          }
+        ],
+        "has_audio": false
+      }`;
+    env.win.document.head.appendChild(scriptEl);
+  }
 });
diff --git a/extensions/amp-video/0.1/video-cache.js b/extensions/amp-video/0.1/video-cache.js
index 2ffd74005b39..867b6724c743 100644
--- a/extensions/amp-video/0.1/video-cache.js
+++ b/extensions/amp-video/0.1/video-cache.js
@@ -1,14 +1,16 @@
-import {Services} from '#service';
-import {addParamsToUrl, resolveRelativeUrl} from '../../../src/url';
-import {
-  createElementWithAttributes,
-  iterateCursor,
-  removeElement,
-} from '#core/dom';
+import {createElementWithAttributes, removeElement} from '#core/dom';
+import * as Preact from '#core/dom/jsx';
 import {matches} from '#core/dom/query';
 import {toArray} from '#core/types/array';
+
+import {isExperimentOn} from '#experiments';
+
+import {Services} from '#service';
+
 import {user} from '#utils/log';
 
+import {addParamsToUrl, resolveRelativeUrl} from '../../../src/url';
+
 /** @const {!Array<string>} */
 const CODECS_IN_ASCENDING_PRIORITY = ['h264', 'vp09'];
 
@@ -32,34 +34,29 @@ export function fetchCachedSources(
   if (Services.platformFor(win).isBot()) {
     return Promise.resolve();
   }
-  if (
-    !(
-      videoEl.getAttribute('src') ||
-      videoEl.querySelector('source[src]')?.getAttribute('src')
-    )
-  ) {
+
+  // Always set crossorigin attribute so captions can be set.
+  if (!videoEl.hasAttribute('crossorigin')) {
+    videoEl.setAttribute('crossorigin', '');
+  }
+
+  const videoSrc = videoEl.getAttribute('src');
+  const sourceSrc = videoEl.querySelector('source[src]')?.getAttribute('src');
+  if (!videoSrc && !sourceSrc) {
     user().error('AMP-VIDEO', 'Video cache not properly configured');
     return Promise.resolve();
   }
 
   Services.performanceFor(ampdoc.win).addEnabledExperiment('video-cache');
 
-  const {canonicalUrl, sourceUrl} = Services.documentInfoForDoc(win.document);
-  maybeReplaceSrcWithSourceElement(videoEl, win);
-  const videoUrl = resolveRelativeUrl(selectVideoSource(videoEl), sourceUrl);
-  return getCacheUrlService(videoEl, ampdoc)
-    .then((service) => service.createCacheUrl(videoUrl))
-    .then((cacheUrl) => {
-      const requestUrl = addParamsToUrl(cacheUrl.replace(/\/[ic]\//, '/mbv/'), {
-        'amp_video_host_url':
-          /* document url that contains the video */ canonicalUrl,
-      });
-      return Services.xhrFor(win).fetch(requestUrl, {prerenderSafe: true});
+  return requestCachedVideoSources(videoEl, ampdoc)
+    .then((response) => {
+      applySourcesToVideo(videoEl, response['sources'], maxBitrate);
+      if (isExperimentOn(win, 'story-video-cache-apply-audio')) {
+        applyAudioInfoToVideo(videoEl, response['has_audio']);
+      }
+      applyCaptionsTrackToVideo(videoEl, response['captions']);
     })
-    .then((response) => response.json())
-    .then((jsonResponse) =>
-      applySourcesToVideo(videoEl, jsonResponse['sources'], maxBitrate)
-    )
     .catch(() => {
       // If cache fails, video should still load properly.
     });
@@ -156,6 +153,56 @@ function applySourcesToVideo(videoEl, sources, maxBitrate) {
     });
 }
 
+/**
+ * @param {!Element} videoEl
+ * @param {boolean|undefined} hasAudio
+ */
+function applyAudioInfoToVideo(videoEl, hasAudio) {
+  if (hasAudio === false) {
+    videoEl.setAttribute('noaudio', '');
+  }
+}
+
+/**
+ * Appends captions track and amp-story-captions to video if captions
+ * url is defined and video element doesn't have a track child
+ * specified in the document.
+ * @param {!Element} videoEl
+ * @param {!Object} captionsResponse
+ */
+function applyCaptionsTrackToVideo(videoEl, captionsResponse) {
+  if (
+    !captionsResponse ||
+    !captionsResponse['src'] ||
+    !captionsResponse['srclang'] ||
+    videoEl.querySelector('track')
+  ) {
+    return;
+  }
+
+  const trackEl = (
+    <track
+      src={captionsResponse['src']}
+      srclang={captionsResponse['srclang']}
+      kind="captions"
+    ></track>
+  );
+
+  const captionsEl = (
+    <amp-story-captions
+      id={captionsResponse['src']}
+      style-preset="default"
+      layout="container"
+      auto-append
+    ></amp-story-captions>
+  );
+  // Set captions-id on video to pass track to story-captions.
+  videoEl.setAttribute('captions-id', captionsResponse['src']);
+
+  videoEl.appendChild(trackEl);
+  videoEl.appendChild(captionsEl);
+}
+
 /**
  * If present, moves the src attribute to a source element to enable playing
  * from multiple sources: the cached ones and the fallback initial src.
@@ -181,8 +228,7 @@ function maybeReplaceSrcWithSourceElement(videoEl, win) {
 
   // Remove all existing sources as they are never supposed to play for a video
   // that has a src, cf https://html.spec.whatwg.org/#concept-media-load-algorithm
-  const sourceEls = videoEl.querySelectorAll('source');
-  iterateCursor(sourceEls, (el) => removeElement(el));
+  videoEl.querySelectorAll('source').forEach(removeElement);
 
   videoEl.insertBefore(sourceEl, videoEl.firstChild);
 }
@@ -198,3 +244,57 @@ function getCacheUrlService(videoEl, ampdoc) {
     .installExtensionForDoc(ampdoc, 'amp-cache-url')
     .then(() => Services.cacheUrlServicePromiseForDoc(videoEl));
 }
+
+/**
+ * Fetch the sources for the given video element.
+ * @param {!Element} videoEl
+ * @param {!AmpDoc} ampdoc
+ * @return {!Promise<!Object>} JSON representing AMP's cached video sources.
+ */
+function requestCachedVideoSources(videoEl, ampdoc) {
+  const {win} = ampdoc;
+  if (shouldUseInlineVideoResponse(videoEl, win)) {
+    const inlineResponseEl = win.document.getElementById(
+      'amp-google-video-cache-response'
+    );
+    try {
+      const inlineResponseJson = JSON.parse(inlineResponseEl.textContent);
+      if (inlineResponseJson['sources']) {
+        return Promise.resolve(inlineResponseJson);
+      }
+    } catch (err) {
+      // If parsing the response fails, an XHR request will be made below.
+    }
+  }
+
+  const {canonicalUrl, sourceUrl} = Services.documentInfoForDoc(win.document);
+  maybeReplaceSrcWithSourceElement(videoEl, win);
+  const videoUrl = resolveRelativeUrl(selectVideoSource(videoEl), sourceUrl);
+  return getCacheUrlService(videoEl, ampdoc)
+    .then((service) => service.createCacheUrl(videoUrl))
+    .then((cacheUrl) => {
+      const requestUrl = addParamsToUrl(cacheUrl.replace(/\/[ic]\//, '/mbv/'), {
+        'amp_video_host_url':
+          /* document url that contains the video */ canonicalUrl,
+        'amp_video_require_acao_header': 1,
+      });
+      return Services.xhrFor(win)
+        .fetch(requestUrl, {prerenderSafe: true})
+        .then((xhrResponse) => xhrResponse.json());
+    });
+}
+
+/**
+ * Returns `true` if the video's inline response should be used instead of
+ * issuing an XHR request.
+ * @param {!Element} videoEl
+ * @param {!Window} win
+ * @return {boolean}
+ */
+function shouldUseInlineVideoResponse(videoEl, win) {
+  // Google video cache inlines the first video of the first web story page.
+  const firstVid = win.document.querySelector(
+    'amp-story-page:first-of-type amp-video'
+  );
+  return videoEl === firstVid;
+}
diff --git a/extensions/amp-video/1.0/amp-video.js b/extensions/amp-video/1.0/amp-video.js
index 3a21e4393a93..c562cf95907b 100644
--- a/extensions/amp-video/1.0/amp-video.js
+++ b/extensions/amp-video/1.0/amp-video.js
@@ -1,12 +1,15 @@
-import {CSS} from '../../../build/amp-video-1.0.css';
-import {VideoBaseElement} from './video-base-element';
+import {AmpVideoBaseElement} from '#bento/components/bento-video/1.0/video-base-element';
+
 import {isExperimentOn} from '#experiments';
+
 import {userAssert} from '#utils/log';
 
+import {CSS} from '../../../build/amp-video-1.0.css';
+
 /** @const {string} */
 const TAG = 'amp-video';
 
-class AmpVideo extends VideoBaseElement {
+class AmpVideo extends AmpVideoBaseElement {
   /** @override */
   isLayoutSupported(layout) {
     userAssert(
diff --git a/extensions/amp-video/1.0/base-element.js b/extensions/amp-video/1.0/base-element.js
deleted file mode 100644
index 2dfe75b8d2b3..000000000000
--- a/extensions/amp-video/1.0/base-element.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import {CSS} from './component.jss';
-import {CSS as CSS_AUTOPLAY} from './autoplay.jss';
-import {PreactBaseElement} from '#preact/base-element';
-import {BentoVideo} from './component';
-
-export class BaseElement extends PreactBaseElement {}
-
-/** @override */
-BaseElement['Component'] = BentoVideo;
-
-/** @override */
-BaseElement['loadable'] = true;
-
-/** @override */
-BaseElement['layoutSizeDefined'] = true;
-
-/**
- * Defaults to `{component: 'video'}` from `BentoVideo` component.
- * Subclasses may set:
- * ```
- *   AmpMyPlayer['staticProps'] = dict({
- *     'component': MyPlayerComponent,
- *   });
- * ```
- * @override
- */
-BaseElement['staticProps'];
-
-/** @override */
-BaseElement['props'] = {
-  'album': {attr: 'album'},
-  'alt': {attr: 'alt'},
-  'artist': {attr: 'artist'},
-  'artwork': {attr: 'artwork'},
-  'attribution': {attr: 'attribution'},
-  'autoplay': {attr: 'autoplay', type: 'boolean'},
-  'controls': {attr: 'controls', type: 'boolean'},
-  'controlslist': {attr: 'controlslist'},
-  'crossorigin': {attr: 'crossorigin'},
-  'disableremoteplayback': {attr: 'disableremoteplayback'},
-  'loop': {attr: 'loop', type: 'boolean'},
-  'noaudio': {attr: 'noaudio', type: 'boolean'},
-  'poster': {attr: 'poster'},
-  'sources': {
-    selector: 'source',
-    single: false,
-    clone: true,
-  },
-  'src': {attr: 'src'},
-  'title': {attr: 'title'},
-
-  // TODO(alanorozco): These props have no internal implementation yet.
-  'dock': {attr: 'dock', media: true},
-  'rotate-to-fullscreen': {
-    attr: 'rotate-to-fullscreen',
-    type: 'boolean',
-    media: true,
-  },
-};
-
-/** @override */
-BaseElement['shadowCss'] = CSS + CSS_AUTOPLAY;
-
-/** @override */
-BaseElement['usesShadowDom'] = true;
diff --git a/extensions/amp-video/1.0/component.js b/extensions/amp-video/1.0/component.js
deleted file mode 100644
index 8bfe73542694..000000000000
--- a/extensions/amp-video/1.0/component.js
+++ /dev/null
@@ -1,391 +0,0 @@
-import * as Preact from '#preact';
-import {ContainWrapper, useValueRef} from '#preact/component';
-import {tryPlay} from '#core/dom/video';
-import {Deferred} from '#core/data-structures/promise';
-import {Loading} from '#core/constants/loading-instructions';
-import {MIN_VISIBILITY_RATIO_FOR_AUTOPLAY} from '../../../src/video-interface';
-import {
-  MetadataDef,
-  parseFavicon,
-  parseOgImage,
-  parseSchemaImage,
-  setMediaSession,
-} from '../../../src/mediasession-helper';
-import {ReadyState} from '#core/constants/ready-state';
-import {dict} from '#core/types/object';
-import {forwardRef} from '#preact/compat';
-import {once} from '#core/types/function';
-import {useAmpContext, useLoading} from '#preact/context';
-import {useStyles as useAutoplayStyles} from './autoplay.jss';
-import {
-  useCallback,
-  useEffect,
-  useImperativeHandle,
-  useLayoutEffect,
-  useMemo,
-  useRef,
-  useState,
-} from '#preact';
-import {useResourcesNotify} from '#preact/utils';
-import {useStyles} from './component.jss';
-import objstr from 'obj-str';
-
-/**
- * @param {?{getMetadata: (function():?JsonObject|undefined)}} player
- * @param {!VideoWrapperDef.Props} props
- * @return {!MetadataDef}
- */
-const getMetadata = (player, props) =>
-  /** @type {!MetadataDef} */ (
-    Object.assign(
-      dict({
-        'title': props.title || props['aria-label'] || document.title,
-        'artist': props.artist || '',
-        'album': props.album || '',
-        'artwork': [
-          {
-            'src':
-              props.artwork ||
-              props.poster ||
-              parseSchemaImage(document) ||
-              parseOgImage(document) ||
-              parseFavicon(document) ||
-              '',
-          },
-        ],
-      }),
-      player && player.getMetadata ? player.getMetadata() : Object.create(null)
-    )
-  );
-
-/**
- * @param {!VideoWrapperDef.Props} props
- * @param {{current: ?T}} ref
- * @return {PreactDef.Renderable}
- * @template T
- */
-function VideoWrapperWithRef(
-  {
-    autoplay = false,
-    'class': className,
-    component: Component = 'video',
-    controls = false,
-    loading: loadingProp,
-    loop = false,
-    mediasession = true,
-    noaudio = false,
-    onPlayingState,
-    onReadyState,
-    poster,
-    sources,
-    src,
-    style,
-    ...rest
-  },
-  ref
-) {
-  useResourcesNotify();
-  const {playable} = useAmpContext();
-  const loading = useLoading(loadingProp);
-  const load = loading !== Loading.UNLOAD;
-
-  const [muted, setMuted] = useState(autoplay);
-  const [playing, setPlaying_] = useState(false);
-  const [metadata, setMetadata] = useState(/** @type {?MetadataDef}*/ (null));
-  const [hasUserInteracted, setHasUserInteracted] = useState(!autoplay);
-
-  const wrapperRef = useRef(null);
-  const playerRef = useRef(null);
-
-  const classes = useStyles();
-
-  // TODO(alanorozco): We might need an API to notify reload, like when
-  // <source>s change.
-  const readyDeferred = useMemo(() => new Deferred(), []);
-
-  const readyStateRef = useRef(ReadyState.LOADING);
-  // The `onReadyStateRef` is passed via a ref to avoid the changed values
-  // of `onReadyState` re-triggering the side effects.
-  const onReadyStateRef = useValueRef(onReadyState);
-  const setReadyState = useCallback(
-    (state, opt_failure) => {
-      if (state !== readyStateRef.current) {
-        readyStateRef.current = state;
-        const onReadyState = onReadyStateRef.current;
-        if (onReadyState) {
-          onReadyState(state, opt_failure);
-        }
-      }
-    },
-    [onReadyStateRef]
-  );
-
-  // The `onPlayingStateRef` is passed via a ref to avoid the changed values
-  // of `onPlayingState` re-triggering the side effects.
-  const onPlayingStateRef = useValueRef(onPlayingState);
-  const setPlayingState = useCallback(
-    (playing) => {
-      setPlaying_(playing);
-      const onPlayingState = onPlayingStateRef.current;
-      if (onPlayingState) {
-        onPlayingState(playing);
-      }
-    },
-    [onPlayingStateRef]
-  );
-
-  // Reset playing state when the video player is unmounted.
-  useLayoutEffect(() => {
-    if (!load) {
-      setPlayingState(false);
-    }
-  }, [load, setPlayingState]);
-
-  const play = useCallback(() => {
-    return readyDeferred.promise.then(() => tryPlay(playerRef.current));
-  }, [readyDeferred]);
-
-  const pause = useCallback(() => {
-    readyDeferred.promise.then(() => playerRef.current?.pause());
-  }, [readyDeferred]);
-
-  const requestFullscreen = useCallback(() => {
-    return readyDeferred.promise.then(() =>
-      playerRef.current.requestFullscreen()
-    );
-  }, [readyDeferred]);
-
-  const userInteracted = useCallback(() => {
-    setMuted(false);
-    setHasUserInteracted(true);
-  }, []);
-
-  // Update the initial readyState. Using `useLayoutEffect` here to avoid
-  // race conditions with possible future events.
-  useLayoutEffect(() => {
-    const readyState = playerRef.current?.readyState;
-    if (readyState != null) {
-      setReadyState(readyState > 0 ? ReadyState.COMPLETE : ReadyState.LOADING);
-    }
-  }, [setReadyState]);
-
-  useLayoutEffect(() => {
-    if (mediasession && playing && metadata) {
-      setMediaSession(window, metadata, play, pause);
-    }
-    return () => {
-      // TODO(alanorozco): Clear media session.
-      // (Tricky because we don't want to clear a different active session.)
-    };
-  }, [mediasession, playing, metadata, play, pause]);
-
-  // Pause if the video goes into a "paused" context.
-  useEffect(() => {
-    if (!playable) {
-      pause();
-    }
-  }, [playable, pause]);
-
-  // We'd like this to be as close as possible to the HTMLMediaElement
-  // interface, preferrably as an extension/superset.
-  useImperativeHandle(
-    ref,
-    () => ({
-      // Standard Bento
-      get readyState() {
-        return readyStateRef.current;
-      },
-
-      // Standard HTMLMediaElement/Element
-      play,
-      pause,
-      requestFullscreen,
-      get currentTime() {
-        if (!playerRef.current) {
-          return 0;
-        }
-        return playerRef.current.currentTime;
-      },
-      get duration() {
-        if (!playerRef.current) {
-          return NaN;
-        }
-        return playerRef.current.duration;
-      },
-      get autoplay() {
-        return autoplay;
-      },
-      get controls() {
-        return controls;
-      },
-      get loop() {
-        return loop;
-      },
-
-      // Non-standard
-      userInteracted,
-      mute: () => setMuted(true),
-      unmute: () => {
-        if (hasUserInteracted) {
-          setMuted(false);
-        }
-      },
-    }),
-    [
-      play,
-      pause,
-      requestFullscreen,
-      userInteracted,
-      hasUserInteracted,
-      autoplay,
-      controls,
-      loop,
-    ]
-  );
-
-  return (
-    <ContainWrapper
-      contentRef={wrapperRef}
-      class={className}
-      style={style}
-      size
-      layout
-      paint
-    >
-      {load && (
-        <Component
-          {...rest}
-          ref={playerRef}
-          loading={loading}
-          muted={muted}
-          loop={loop}
-          controls={controls && (!autoplay || hasUserInteracted)}
-          onCanPlay={() => {
-            readyDeferred.resolve();
-            setReadyState(ReadyState.COMPLETE);
-          }}
-          onLoadedMetadata={() => {
-            if (mediasession) {
-              readyDeferred.promise.then(() => {
-                setMetadata(getMetadata(playerRef.current, rest));
-              });
-            }
-            setReadyState(ReadyState.COMPLETE);
-          }}
-          onPlaying={() => setPlayingState(true)}
-          onPause={() => setPlayingState(false)}
-          onEnded={() => setPlayingState(false)}
-          onError={(e) => {
-            setReadyState(ReadyState.ERROR, e);
-            readyDeferred.reject(e);
-          }}
-          class={classes.fillStretch}
-          src={src}
-          poster={poster}
-        >
-          {sources}
-        </Component>
-      )}
-      {autoplay && !hasUserInteracted && (
-        <Autoplay
-          metadata={metadata}
-          playing={playing}
-          displayIcon={!noaudio && muted}
-          wrapperRef={wrapperRef}
-          play={play}
-          pause={pause}
-          displayOverlay={controls}
-          onOverlayClick={userInteracted}
-        />
-      )}
-    </ContainWrapper>
-  );
-}
-
-/**
- * @param {!VideoWrapperDef.AutoplayProps} props
- * @return {PreactDef.Renderable}
- */
-function Autoplay({
-  displayIcon,
-  displayOverlay,
-  metadata,
-  onOverlayClick,
-  pause,
-  play,
-  playing,
-  wrapperRef,
-}) {
-  const {playable} = useAmpContext();
-  const autoplayClasses = useAutoplayStyles();
-  const classes = useStyles();
-
-  useEffect(() => {
-    if (!playable) {
-      pause();
-      return;
-    }
-
-    const observer = new IntersectionObserver(
-      (entries) => {
-        if (entries[entries.length - 1].isIntersecting) {
-          play().catch(() => {
-            // Empty catch to prevent useless unhandled rejection logging.
-            // play() can fail for benign reasons like pausing.
-          });
-        } else {
-          pause();
-        }
-      },
-      {threshold: MIN_VISIBILITY_RATIO_FOR_AUTOPLAY}
-    );
-
-    observer.observe(wrapperRef.current);
-
-    return () => {
-      observer.disconnect();
-    };
-  }, [wrapperRef, play, pause, playable]);
-
-  return (
-    <>
-      {displayIcon && (
-        <div
-          class={objstr({
-            [autoplayClasses.eq]: true,
-            [autoplayClasses.eqPlaying]: playing,
-          })}
-        >
-          <AutoplayIconContent />
-        </div>
-      )}
-
-      {displayOverlay && (
-        <button
-          aria-label={(metadata && metadata.title) || 'Unmute video'}
-          tabIndex="0"
-          class={objstr({
-            [autoplayClasses.autoplayMaskButton]: true,
-            [classes.fillContentOverlay]: true,
-          })}
-          onClick={onOverlayClick}
-        ></button>
-      )}
-    </>
-  );
-}
-
-const AutoplayIconContent = /** @type {function():!PreactDef.Renderable} */ (
-  once(() => {
-    const classes = useAutoplayStyles();
-    return [1, 2, 3, 4].map((i) => <div class={classes.eqCol} key={i}></div>);
-  })
-);
-
-const VideoWrapper = forwardRef(VideoWrapperWithRef);
-VideoWrapper.displayName = 'VideoWrapper'; // Make findable for tests.
-
-// VideoWrapper is used by many video component implementations, but we also
-// provide it as BentoVideo using default props.
-export {VideoWrapper};
-export {VideoWrapper as BentoVideo};
diff --git a/extensions/amp-video/1.0/storybook/Basic.amp.js b/extensions/amp-video/1.0/storybook/Basic.amp.js
index ba06c4b78ba4..bbc440bf3144 100644
--- a/extensions/amp-video/1.0/storybook/Basic.amp.js
+++ b/extensions/amp-video/1.0/storybook/Basic.amp.js
@@ -1,11 +1,12 @@
+import {withAmp} from '@ampproject/storybook-addon';
+
 import * as Preact from '#preact';
+
 import {VideoElementWithActions} from './_helpers';
-import {boolean, number, object, text, withKnobs} from '@storybook/addon-knobs';
-import {withAmp} from '@ampproject/storybook-addon';
 
 export default {
   title: 'amp-video-1_0',
-  decorators: [withKnobs, withAmp],
+  decorators: [withAmp],
   parameters: {
     extensions: [
       {name: 'amp-video', version: '1.0'},
@@ -13,34 +14,21 @@ export default {
     ],
     experiments: ['bento'],
   },
-};
-
-const AmpVideoWithKnobs = ({i, ...rest}) => {
-  const group = i ? `Player ${i + 1}` : undefined;
-
-  const width = text('width', '640px', group);
-  const height = text('height', '360px', group);
-
-  const ariaLabel = text('aria-label', 'Video Player', group);
-  const autoplay = boolean('autoplay', true, group);
-  const controls = boolean('controls', true, group);
-  const mediasession = boolean('mediasession', true, group);
-  const noaudio = boolean('noaudio', false, group);
-  const loop = boolean('loop', false, group);
-  const poster = text(
-    'poster',
-    'https://amp.dev/static/inline-examples/images/kitten-playing.png',
-    group
-  );
-
-  const artist = text('artist', '', group);
-  const album = text('album', '', group);
-  const artwork = text('artwork', '', group);
-  const title = text('title', '', group);
-
-  const sources = object(
-    'sources',
-    [
+  args: {
+    width: '640px',
+    height: '360px',
+    ariaLabel: 'Video Player',
+    autoplay: true,
+    controls: true,
+    mediasession: true,
+    noaudio: false,
+    loop: false,
+    poster: 'https://amp.dev/static/inline-examples/images/kitten-playing.png',
+    artist: '',
+    album: '',
+    artwork: '',
+    title: '',
+    sources: [
       {
         src: 'https://amp.dev/static/inline-examples/videos/kitten-playing.webm',
         type: 'video/webm',
@@ -50,27 +38,14 @@ const AmpVideoWithKnobs = ({i, ...rest}) => {
         type: 'video/mp4',
       },
     ],
-    group
-  );
+  },
+};
+
+const AmpVideoWithControls = ({ariaLabel, i, sources, ...args}) => {
+  const group = i ? `Player ${i + 1}` : undefined;
 
   return (
-    <amp-video
-      {...rest}
-      aria-label={ariaLabel}
-      autoplay={autoplay}
-      controls={controls}
-      mediasession={mediasession}
-      noaudio={noaudio}
-      loop={loop}
-      poster={poster}
-      artist={artist}
-      album={album}
-      artwork={artwork}
-      title={title}
-      layout="responsive"
-      width={width}
-      height={height}
-    >
+    <amp-video aria-label={ariaLabel} layout="responsive" id={group} {...args}>
       {sources.map((props) => (
         <source {...props}></source>
       ))}
@@ -90,15 +65,16 @@ const Spacer = ({height}) => {
   );
 };
 
-export const Default = () => {
-  const amount = number('Amount', 1, {}, 'Page');
-  const spacerHeight = text('Space', '80vh', 'Page');
-  const spaceAbove = boolean('Space above', false, 'Page');
-  const spaceBelow = boolean('Space below', false, 'Page');
-
+export const Default = ({
+  amount,
+  spaceAbove,
+  spaceBelow,
+  spacerHeight,
+  ...args
+}) => {
   const players = [];
   for (let i = 0; i < amount; i++) {
-    players.push(<AmpVideoWithKnobs key={i} i={i} />);
+    players.push(<AmpVideoWithControls key={i} i={i} {...args} />);
     if (i < amount - 1) {
       players.push(<Spacer height={spacerHeight} />);
     }
@@ -113,32 +89,29 @@ export const Default = () => {
   );
 };
 
-export const Actions = () => {
+Default.args = {
+  amount: 1,
+  spacerHeight: '80vh',
+  spacerAbove: false,
+  spacerBelow: false,
+};
+
+export const Actions = ({...args}) => {
   const id = 'player';
   return (
     <VideoElementWithActions id={id}>
-      <AmpVideoWithKnobs id={id} />
+      <AmpVideoWithControls id={id} {...args} />
     </VideoElementWithActions>
   );
 };
 
-export const InsideAccordion = () => {
-  const width = number('width', 320);
-  const height = number('height', 180);
-  const autoplay = boolean('autoplay', false);
-
+export const InsideAccordion = ({...args}) => {
   return (
     <amp-accordion expand-single-section>
       <section expanded>
         <h2>Video</h2>
         <div>
-          <amp-video
-            autoplay={autoplay}
-            controls
-            loop
-            width={width}
-            height={height}
-          >
+          <amp-video controls loop {...args}>
             <source
               type="video/mp4"
               src="https://amp.dev/static/inline-examples/videos/kitten-playing.mp4"
@@ -150,21 +123,17 @@ export const InsideAccordion = () => {
   );
 };
 
-export const InsideDetails = () => {
-  const width = number('width', 320);
-  const height = number('height', 180);
-  const autoplay = boolean('autoplay', false);
+InsideAccordion.args = {
+  width: 320,
+  height: 180,
+  autoplay: false,
+};
 
+export const InsideDetails = ({...args}) => {
   return (
     <details open>
       <summary>Video</summary>
-      <amp-video
-        autoplay={autoplay}
-        controls
-        loop
-        width={width}
-        height={height}
-      >
+      <amp-video controls loop {...args}>
         <source
           type="video/mp4"
           src="https://amp.dev/static/inline-examples/videos/kitten-playing.mp4"
@@ -173,3 +142,9 @@ export const InsideDetails = () => {
     </details>
   );
 };
+
+InsideDetails.args = {
+  width: 320,
+  height: 180,
+  autoplay: false,
+};
diff --git a/extensions/amp-video/1.0/storybook/Basic.js b/extensions/amp-video/1.0/storybook/Basic.js
index bbf69f19aebd..49d3e264c7e2 100644
--- a/extensions/amp-video/1.0/storybook/Basic.js
+++ b/extensions/amp-video/1.0/storybook/Basic.js
@@ -1,45 +1,33 @@
-import * as Preact from '#preact';
 import {
   BentoAccordion,
   BentoAccordionContent,
   BentoAccordionHeader,
   BentoAccordionSection,
-} from '../../../amp-accordion/1.0/component';
-import {BentoVideo} from '../component';
-import {boolean, number, object, text, withKnobs} from '@storybook/addon-knobs';
+} from '#bento/components/bento-accordion/1.0/component';
+import {BentoVideo} from '#bento/components/bento-video/1.0/component';
+
+import * as Preact from '#preact';
+
+import '#bento/components/bento-video/1.0/component.jss';
 
 export default {
   title: 'Video',
   component: BentoVideo,
-  decorators: [withKnobs],
-};
-
-const VideoTagPlayer = ({i}) => {
-  const group = `Player ${i + 1}`;
-
-  const width = text('width', '640px', group);
-  const height = text('height', '360px', group);
-
-  const ariaLabel = text('aria-label', 'Video Player', group);
-  const autoplay = boolean('autoplay', true, group);
-  const controls = boolean('controls', true, group);
-  const mediasession = boolean('mediasession', true, group);
-  const noaudio = boolean('noaudio', false, group);
-  const loop = boolean('loop', false, group);
-  const poster = text(
-    'poster',
-    'https://amp.dev/static/inline-examples/images/kitten-playing.png',
-    group
-  );
-
-  const artist = text('artist', '', group);
-  const album = text('album', '', group);
-  const artwork = text('artwork', '', group);
-  const title = text('title', '', group);
-
-  const sources = object(
-    'sources',
-    [
+  args: {
+    width: '640px',
+    height: '360px',
+    ariaLabel: 'Video Player',
+    autoplay: true,
+    controls: true,
+    mediasession: true,
+    noaudio: false,
+    loop: false,
+    poster: 'https://amp.dev/static/inline-examples/images/kitten-playing.png',
+    artist: '',
+    album: '',
+    artwork: '',
+    title: '',
+    sources: [
       {
         src: 'https://amp.dev/static/inline-examples/videos/kitten-playing.webm',
         type: 'video/webm',
@@ -49,23 +37,21 @@ const VideoTagPlayer = ({i}) => {
         type: 'video/mp4',
       },
     ],
-    group
-  );
+
+    amount: 1,
+    spaceAbove: false,
+    spaceBelow: false,
+  },
+};
+
+const VideoTagPlayer = ({height, i, sources, width, ...args}) => {
+  const group = `Player ${i + 1}`;
 
   return (
     <BentoVideo
       component="video"
-      aria-label={ariaLabel}
-      autoplay={autoplay}
-      controls={controls}
-      mediasession={mediasession}
-      noaudio={noaudio}
-      loop={loop}
-      poster={poster}
-      artist={artist}
-      album={album}
-      artwork={artwork}
-      title={title}
+      {...args}
+      id={group}
       style={{width, height}}
       sources={sources.map((props) => (
         <source {...props}></source>
@@ -86,15 +72,16 @@ const Spacer = ({height}) => {
   );
 };
 
-export const Default = () => {
-  const amount = number('Amount', 1, {}, 'Page');
-  const spacerHeight = text('Space', '80vh', 'Page');
-  const spaceAbove = boolean('Space above', false, 'Page');
-  const spaceBelow = boolean('Space below', false, 'Page');
-
+export const Default = ({
+  amount,
+  spaceAbove,
+  spaceBelow,
+  spacerHeight,
+  ...args
+}) => {
   const players = [];
   for (let i = 0; i < amount; i++) {
-    players.push(<VideoTagPlayer key={i} i={i} />);
+    players.push(<VideoTagPlayer key={i} i={i} {...args} />);
     if (i < amount - 1) {
       players.push(<Spacer height={spacerHeight} />);
     }
@@ -109,9 +96,14 @@ export const Default = () => {
   );
 };
 
-export const InsideAccordion = () => {
-  const width = text('width', '320px');
-  const height = text('height', '180px');
+Default.args = {
+  amount: 1,
+  spacerHeight: '80vh',
+  spaceAbove: false,
+  spaceBelow: false,
+};
+
+export const InsideAccordion = ({height, width}) => {
   return (
     <BentoAccordion expandSingleSection>
       <BentoAccordionSection key={1} expanded>
@@ -153,3 +145,8 @@ export const InsideAccordion = () => {
     </BentoAccordion>
   );
 };
+
+InsideAccordion.args = {
+  width: '320px',
+  height: '180px',
+};
diff --git a/extensions/amp-video/1.0/storybook/VideoIframe.js b/extensions/amp-video/1.0/storybook/VideoIframe.js
index 0e62a418b42c..ccb4b1250faf 100644
--- a/extensions/amp-video/1.0/storybook/VideoIframe.js
+++ b/extensions/amp-video/1.0/storybook/VideoIframe.js
@@ -13,17 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import * as Preact from '#preact';
 import {
   BentoAccordion,
   BentoAccordionContent,
   BentoAccordionHeader,
   BentoAccordionSection,
-} from '../../../amp-accordion/1.0/component';
-import {VideoIframe} from '../video-iframe';
-import {createCustomEvent} from '#utils/event-helper';
+} from '#bento/components/bento-accordion/1.0/component';
+import {VideoIframe} from '#bento/components/bento-video/1.0/video-iframe';
+
+import * as Preact from '#preact';
 import {useCallback} from '#preact';
 
+import {createCustomEvent} from '#utils/event-helper';
+
 export default {
   title: 'VideoIframe',
   component: VideoIframe,
diff --git a/extensions/amp-video/1.0/storybook/_helpers.js b/extensions/amp-video/1.0/storybook/_helpers.js
index 330a1c0024fc..7252f4ef9c06 100644
--- a/extensions/amp-video/1.0/storybook/_helpers.js
+++ b/extensions/amp-video/1.0/storybook/_helpers.js
@@ -1,9 +1,9 @@
 import * as Preact from '#preact';
 
 export const VideoElementWithActions = ({
-  id,
-  children,
   actions = ['play', 'pause', 'mute', 'unmute', 'fullscreen'],
+  children,
+  id,
 }) => (
   <div style="max-width: 800px">
     <p style={{display: 'flex'}}>
diff --git a/extensions/amp-video/1.0/test/test-amp-video.js b/extensions/amp-video/1.0/test/test-amp-video.js
index 93eb9c41f08d..307384ed921b 100644
--- a/extensions/amp-video/1.0/test/test-amp-video.js
+++ b/extensions/amp-video/1.0/test/test-amp-video.js
@@ -1,7 +1,9 @@
 import '../amp-video';
 import {dispatchCustomEvent} from '#core/dom';
 import {htmlFor} from '#core/dom/static-template';
+
 import {toggleExperiment} from '#experiments';
+
 import {waitFor} from '#testing/helpers/service';
 
 describes.realWin(
diff --git a/extensions/amp-video/1.0/test/test-video-iframe.js b/extensions/amp-video/1.0/test/test-video-iframe.js
index 39b78b216fdb..d66e662ce9d7 100644
--- a/extensions/amp-video/1.0/test/test-video-iframe.js
+++ b/extensions/amp-video/1.0/test/test-video-iframe.js
@@ -1,7 +1,9 @@
+import {mount} from 'enzyme';
+
+import {VideoIframeInternal} from '#bento/components/bento-video/1.0/video-iframe';
+
 import * as Preact from '#preact';
-import {VideoIframeInternal} from '../video-iframe';
 import {createRef} from '#preact';
-import {mount} from 'enzyme';
 
 function dispatchMessage(window, opt_event) {
   const event = window.document.createEvent('Event');
diff --git a/extensions/amp-video/1.0/test/test-video-wrapper.js b/extensions/amp-video/1.0/test/test-video-wrapper.js
index 1a3e6d230188..a25a1a1d1608 100644
--- a/extensions/amp-video/1.0/test/test-video-wrapper.js
+++ b/extensions/amp-video/1.0/test/test-video-wrapper.js
@@ -1,12 +1,14 @@
-import * as Preact from '#preact';
-import {VideoWrapper} from '../component';
-import {WithAmpContext} from '#preact/context';
-import {createRef} from '#preact';
-import {forwardRef} from '#preact/compat';
 import {mount} from 'enzyme';
+
+import {useStyles as useAutoplayStyles} from '#bento/components/bento-video/1.0/autoplay.jss';
+import {VideoWrapper} from '#bento/components/bento-video/1.0/component';
+
 import {omit} from '#core/types/object';
 
-import {useStyles as useAutoplayStyles} from '../autoplay.jss';
+import {createRef} from '#preact';
+import * as Preact from '#preact';
+import {forwardRef} from '#preact/compat';
+import {WithAmpContext} from '#preact/context';
 
 describes.sandboxed('VideoWrapper Preact component', {}, (env) => {
   let intersectionObserverObserved;
diff --git a/extensions/amp-video/amp-video.md b/extensions/amp-video/amp-video.md
index ccb25911f02d..9b94c0fd4515 100644
--- a/extensions/amp-video/amp-video.md
+++ b/extensions/amp-video/amp-video.md
@@ -50,11 +50,9 @@ to commit to fully valid AMP. You can take these components and place them
 in implementations with frameworks and CMSs that don't support AMP. Read
 more in our guide [Use AMP components in non-AMP pages](https://amp.dev/documentation/guides-and-tutorials/start/bento_guide/).
 
-To find the standalone version of `amp-video`, see [**`bento-video`**](./1.0/README.md).
-
 #### Interactivity and API usage
 
-Bento enabled components in standalone use are highly interactive through their API. In Bento standalone use, the element's API replaces AMP Actions and events and [`amp-bind`](https://amp.dev/documentation/components/amp-bind/?format=websites).
+Bento components are highly interactive through their API. In Bento standalone use, the element's API replaces AMP Actions and events and [`amp-bind`](https://amp.dev/documentation/components/amp-bind/?format=websites).
 
 The `amp-video` component API is accessible by including the following script tag in your document:
 
diff --git a/extensions/amp-video/validator-amp-video.protoascii b/extensions/amp-video/validator-amp-video.protoascii
index 601ebd0c61a8..b937dca0c202 100644
--- a/extensions/amp-video/validator-amp-video.protoascii
+++ b/extensions/amp-video/validator-amp-video.protoascii
@@ -1,8 +1,8 @@
 tags: {  # amp-video 1.0
   html_format: AMP
   tag_name: "SCRIPT"
-  satisfies: "amp-video 1.0"
-  excludes: "amp-video 0.1"
+  satisfies_condition: "amp-video 1.0"
+  excludes_condition: "amp-video 0.1"
   extension_spec: {
     name: "amp-video"
     version_name: "v1.0"
@@ -16,8 +16,8 @@ tags: {  # amp-video 0.1
   html_format: AMP
   html_format: AMP4ADS
   tag_name: "SCRIPT"
-  satisfies: "amp-video 0.1"
-  excludes: "amp-video 1.0"
+  satisfies_condition: "amp-video 0.1"
+  excludes_condition: "amp-video 1.0"
   extension_spec: {
     name: "amp-video"
     version: "0.1"
@@ -185,9 +185,8 @@ tags: {  # <amp-video> in amp-story
   }
   attrs: {
     name: "volume"
-    # Disallow 0 to prevent shipping unnecessary audio track when the video is muted.
-    # Volume must be in the range [0.1, 1].
-    value_regex: "^((0?\.[1-9]+)?|1(\.0*)?)$"
+    # Volume must be in the range [0, 1].
+    value_regex: "^(0(\\.0*)?|(0?\\.[0-9]+)?|1(\\.0*)?)$"
   }
   attr_lists: "extended-amp-global"
   attr_lists: "amp-video-common"
diff --git a/extensions/amp-viewer-integration/0.1/amp-viewer-integration.js b/extensions/amp-viewer-integration/0.1/amp-viewer-integration.js
index 1b298b9d51a5..a3923411ffca 100644
--- a/extensions/amp-viewer-integration/0.1/amp-viewer-integration.js
+++ b/extensions/amp-viewer-integration/0.1/amp-viewer-integration.js
@@ -1,5 +1,4 @@
 import {isIframed} from '#core/dom';
-import {dict} from '#core/types/object';
 
 import {Services} from '#service';
 import {FixedLayer} from '#service/fixed-layer';
@@ -175,10 +174,10 @@ export class AmpViewerIntegration {
     return messaging
       .sendRequest(
         RequestNames.CHANNEL_OPEN,
-        dict({
+        {
           'url': ampdocUrl,
           'sourceUrl': srcUrl,
-        }),
+        },
         true /* awaitResponse */
       )
       .then(() => {
@@ -236,7 +235,7 @@ export class AmpViewerIntegration {
    * @private
    */
   handleUnload_(messaging) {
-    return messaging.sendRequest(RequestNames.UNLOADED, dict(), true);
+    return messaging.sendRequest(RequestNames.UNLOADED, {}, true);
   }
 
   /**
diff --git a/extensions/amp-viewer-integration/0.1/focus-handler.js b/extensions/amp-viewer-integration/0.1/focus-handler.js
index 41115184f54c..1072ff46a85b 100644
--- a/extensions/amp-viewer-integration/0.1/focus-handler.js
+++ b/extensions/amp-viewer-integration/0.1/focus-handler.js
@@ -1,5 +1,3 @@
-import {dict} from '#core/types/object';
-
 import {listen} from '#utils/event-helper';
 
 /**
@@ -40,7 +38,7 @@ export class FocusHandler {
     }
     this.messaging_.sendRequest(
       e.type,
-      dict({'focusTargetRect': e.target./*OK*/ getBoundingClientRect()}),
+      {'focusTargetRect': e.target./*OK*/ getBoundingClientRect()},
       /* awaitResponse */ false
     );
   }
diff --git a/extensions/amp-viewer-integration/0.1/highlight-handler.js b/extensions/amp-viewer-integration/0.1/highlight-handler.js
index d6235533db30..37058fa3894d 100644
--- a/extensions/amp-viewer-integration/0.1/highlight-handler.js
+++ b/extensions/amp-viewer-integration/0.1/highlight-handler.js
@@ -2,7 +2,6 @@ import {whenDocumentReady} from '#core/document/ready';
 import {moveLayoutRect} from '#core/dom/layout/rect';
 import {resetStyles, setInitialDisplay, setStyles} from '#core/dom/style';
 import {once} from '#core/types/function';
-import {dict} from '#core/types/object';
 import {parseJson} from '#core/types/object/json';
 import {parseQueryString} from '#core/types/string/url';
 
@@ -204,7 +203,7 @@ export class HighlightHandler {
    * @private
    */
   sendHighlightState_(state, opt_params) {
-    const params = dict({'state': state});
+    const params = {'state': state};
     for (const key in opt_params) {
       params[key] = opt_params[key];
     }
@@ -266,7 +265,7 @@ export class HighlightHandler {
       return;
     }
     const scrollTop = this.calcTopToCenterHighlightedNodes_();
-    this.sendHighlightState_('found', dict({'scroll': scrollTop}));
+    this.sendHighlightState_('found', {'scroll': scrollTop});
     if (highlightInfo.skipRendering) {
       return;
     }
@@ -382,7 +381,7 @@ export class HighlightHandler {
     if (current == newTop && current == oldTop) {
       return null;
     }
-    const shownParam = dict();
+    const shownParam = {};
     if (current != newTop) {
       this.viewport_.setScrollTop(newTop);
       shownParam[PARAM_NEW_TOP_DISCREPANCY] = current - newTop;
diff --git a/extensions/amp-viewer-integration/0.1/keyboard-handler.js b/extensions/amp-viewer-integration/0.1/keyboard-handler.js
index d3668cf4e39b..b756092e9c86 100644
--- a/extensions/amp-viewer-integration/0.1/keyboard-handler.js
+++ b/extensions/amp-viewer-integration/0.1/keyboard-handler.js
@@ -1,5 +1,4 @@
-import {Keys} from '#core/constants/key-codes';
-import {dict} from '#core/types/object';
+import {Keys_Enum} from '#core/constants/key-codes';
 
 import {listen} from '#utils/event-helper';
 
@@ -103,7 +102,7 @@ function isHandledByEventTarget(e) {
     // Various AMP components consume keyboard events by preventing the default.
     return true;
   }
-  if (e.key == Keys.ESCAPE) {
+  if (e.key == Keys_Enum.ESCAPE) {
     // ESC is always a valid key for things like keyboard shortcuts, even if the
     // focus is on an input control, for example.
     return false;
@@ -111,7 +110,7 @@ function isHandledByEventTarget(e) {
   switch (e.target.nodeName) {
     case 'INPUT':
       // For checkboxes, only allow swallowing the space key event.
-      return e.target.type != 'checkbox' || e.key == Keys.SPACE;
+      return e.target.type != 'checkbox' || e.key == Keys_Enum.SPACE;
     case 'TEXTAREA':
     case 'BUTTON':
     case 'SELECT':
@@ -129,7 +128,7 @@ function isHandledByEventTarget(e) {
  * @return {!JsonObject}
  */
 function getKeyboardEventInit(e) {
-  const copiedEvent = dict();
+  const copiedEvent = {};
   eventProperties.forEach((eventProperty) => {
     if (e[eventProperty] !== undefined) {
       copiedEvent[eventProperty] = e[eventProperty];
diff --git a/extensions/amp-viewer-integration/0.1/messaging/messaging.js b/extensions/amp-viewer-integration/0.1/messaging/messaging.js
index 84400df00ef9..f79e2ccebb56 100644
--- a/extensions/amp-viewer-integration/0.1/messaging/messaging.js
+++ b/extensions/amp-viewer-integration/0.1/messaging/messaging.js
@@ -6,7 +6,7 @@ const APP = '__AMPHTML__';
 /**
  * @enum {string}
  */
-const MessageType = {
+const MessageType_Enum = {
   REQUEST: 'q',
   RESPONSE: 's',
 };
@@ -14,7 +14,7 @@ const MessageType = {
 /**
  * @typedef {function(string, *, boolean):(!Promise<*>|undefined)}
  */
-let RequestHandler; // eslint-disable-line no-unused-vars
+let RequestHandler; // eslint-disable-line @typescript-eslint/no-unused-vars
 
 /**
  * @param {*} message
@@ -239,11 +239,11 @@ export class Messaging {
 
     /** @private {number} */
     this.requestIdCounter_ = 0;
-    /** @private {!Object<number, {resolve: function(*), reject: function(!Error)}>} */
+    /** @private {!{[key: number]: {resolve: function(*), reject: function(!Error)}}} */
     this.waitingForResponse_ = {};
     /**
      * A map from message names to request handlers.
-     * @private {!Object<string, !RequestHandler>}
+     * @private {!{[key: string]: !RequestHandler}}
      */
     this.messageHandlers_ = {};
 
@@ -299,9 +299,9 @@ export class Messaging {
       this.logError_(TAG + ': handleMessage_ error: ', 'invalid token');
       return;
     }
-    if (message.type === MessageType.REQUEST) {
+    if (message.type === MessageType_Enum.REQUEST) {
       this.handleRequest_(message);
-    } else if (message.type === MessageType.RESPONSE) {
+    } else if (message.type === MessageType_Enum.RESPONSE) {
       this.handleResponse_(message);
     }
   }
@@ -325,7 +325,7 @@ export class Messaging {
       /** @type {!AmpViewerMessage} */ ({
         app: APP,
         requestid: requestId,
-        type: MessageType.REQUEST,
+        type: MessageType_Enum.REQUEST,
         name: messageName,
         data: messageData,
         rsvp: awaitResponse,
@@ -346,7 +346,7 @@ export class Messaging {
       /** @type {!AmpViewerMessage} */ ({
         app: APP,
         requestid: requestId,
-        type: MessageType.RESPONSE,
+        type: MessageType_Enum.RESPONSE,
         name: messageName,
         data: messageData,
       })
@@ -369,7 +369,7 @@ export class Messaging {
       /** @type {!AmpViewerMessage} */ ({
         app: APP,
         requestid: requestId,
-        type: MessageType.RESPONSE,
+        type: MessageType_Enum.RESPONSE,
         name: messageName,
         data: null,
         error: errString,
@@ -382,7 +382,7 @@ export class Messaging {
    * @private
    */
   sendMessage_(message) {
-    const /** Object<string, *> */ finalMessage = Object.assign(message, {});
+    const /** {[key: string]: *} */ finalMessage = Object.assign(message, {});
     if (this.token_ && !this.verifyToken_) {
       finalMessage.messagingToken = this.token_;
     }
diff --git a/extensions/amp-viewer-integration/0.1/test/integration/test-amp-viewer-integration.js b/extensions/amp-viewer-integration/0.1/test/integration/test-amp-viewer-integration.js
index 870f5f1189ce..1e8ba5d72dd9 100644
--- a/extensions/amp-viewer-integration/0.1/test/integration/test-amp-viewer-integration.js
+++ b/extensions/amp-viewer-integration/0.1/test/integration/test-amp-viewer-integration.js
@@ -28,15 +28,12 @@ describes.sandboxed('amp-viewer-integration', {}, () => {
     document.body.removeChild(viewerEl);
   });
 
-  // TODO: investigate why this fails on Safari on MacOS
-  it.configure()
-    .skipSafari()
-    .run('should confirm the handshake', async () => {
-      await viewer.waitForHandshakeRequest();
-      viewer.confirmHandshake();
-      await viewer.waitForDocumentLoaded();
-      expect(viewer.hasDocumentLoaded_).to.be.true;
-    });
+  it('should confirm the handshake', async () => {
+    await viewer.waitForHandshakeRequest();
+    viewer.confirmHandshake();
+    await viewer.waitForDocumentLoaded();
+    expect(viewer.hasDocumentLoaded_).to.be.true;
+  });
 });
 
 describes.realWin(
diff --git a/extensions/amp-viewer-integration/0.1/test/test-highlight-handler.js b/extensions/amp-viewer-integration/0.1/test/test-highlight-handler.js
index 2addf53285e8..661b03f8f8ac 100644
--- a/extensions/amp-viewer-integration/0.1/test/test-highlight-handler.js
+++ b/extensions/amp-viewer-integration/0.1/test/test-highlight-handler.js
@@ -1,4 +1,4 @@
-import {VisibilityState} from '#core/constants/visibility-state';
+import {VisibilityState_Enum} from '#core/constants/visibility-state';
 import * as docready from '#core/document/ready';
 import {layoutRectLtwh} from '#core/dom/layout/rect';
 
@@ -335,7 +335,7 @@ describes.realWin(
       );
       env.sandbox
         .stub(ampdoc, 'getVisibilityState')
-        .returns(VisibilityState.PRERENDER);
+        .returns(VisibilityState_Enum.PRERENDER);
 
       new HighlightHandler(ampdoc, {sentences: ['amp', 'highlight']});
       initCb();
diff --git a/extensions/amp-viewer-integration/0.1/test/test-keyboard-handler.js b/extensions/amp-viewer-integration/0.1/test/test-keyboard-handler.js
index 1f2190d9c362..97cca99992a4 100644
--- a/extensions/amp-viewer-integration/0.1/test/test-keyboard-handler.js
+++ b/extensions/amp-viewer-integration/0.1/test/test-keyboard-handler.js
@@ -1,4 +1,4 @@
-import {KeyCodes, Keys} from '#core/constants/key-codes';
+import {KeyCodes_Enum, Keys_Enum} from '#core/constants/key-codes';
 
 import {KeyboardHandler} from '../keyboard-handler';
 import {Messaging} from '../messaging/messaging';
@@ -44,8 +44,8 @@ describes.realWin('KeyboardHandler', {}, (env) => {
           env.win.dispatchEvent(
             new KeyboardEvent(eventType, {
               bubbles: true,
-              key: Keys.ESCAPE,
-              keyCode: KeyCodes.ESCAPE,
+              key: Keys_Enum.ESCAPE,
+              keyCode: KeyCodes_Enum.ESCAPE,
             })
           );
 
@@ -53,8 +53,8 @@ describes.realWin('KeyboardHandler', {}, (env) => {
             {
               name: eventType,
               data: createKeyboardEventInitWithKeyCode(
-                Keys.ESCAPE,
-                KeyCodes.ESCAPE
+                Keys_Enum.ESCAPE,
+                KeyCodes_Enum.ESCAPE
               ),
             },
           ]);
@@ -64,8 +64,8 @@ describes.realWin('KeyboardHandler', {}, (env) => {
           env.win.dispatchEvent(
             new KeyboardEvent(eventType, {
               bubbles: true,
-              key: Keys.LEFT_ARROW,
-              keyCode: KeyCodes.LEFT_ARROW,
+              key: Keys_Enum.LEFT_ARROW,
+              keyCode: KeyCodes_Enum.LEFT_ARROW,
             })
           );
 
@@ -73,8 +73,8 @@ describes.realWin('KeyboardHandler', {}, (env) => {
             {
               name: eventType,
               data: createKeyboardEventInitWithKeyCode(
-                Keys.LEFT_ARROW,
-                KeyCodes.LEFT_ARROW
+                Keys_Enum.LEFT_ARROW,
+                KeyCodes_Enum.LEFT_ARROW
               ),
             },
           ]);
@@ -84,8 +84,8 @@ describes.realWin('KeyboardHandler', {}, (env) => {
           const e = new KeyboardEvent(eventType, {
             bubbles: true,
             cancelable: true,
-            key: Keys.ESCAPE,
-            keyCode: KeyCodes.ESCAPE,
+            key: Keys_Enum.ESCAPE,
+            keyCode: KeyCodes_Enum.ESCAPE,
           });
           e.preventDefault();
 
@@ -100,8 +100,8 @@ describes.realWin('KeyboardHandler', {}, (env) => {
           env.win.document.dispatchEvent(
             new KeyboardEvent(eventType, {
               bubbles: true,
-              key: Keys.ESCAPE,
-              keyCode: KeyCodes.ESCAPE,
+              key: Keys_Enum.ESCAPE,
+              keyCode: KeyCodes_Enum.ESCAPE,
             })
           );
 
@@ -109,8 +109,8 @@ describes.realWin('KeyboardHandler', {}, (env) => {
             {
               name: eventType,
               data: createKeyboardEventInitWithKeyCode(
-                Keys.ESCAPE,
-                KeyCodes.ESCAPE
+                Keys_Enum.ESCAPE,
+                KeyCodes_Enum.ESCAPE
               ),
             },
           ]);
@@ -120,8 +120,8 @@ describes.realWin('KeyboardHandler', {}, (env) => {
           env.win.document.dispatchEvent(
             new KeyboardEvent(eventType, {
               bubbles: true,
-              key: Keys.LEFT_ARROW,
-              keyCode: KeyCodes.LEFT_ARROW,
+              key: Keys_Enum.LEFT_ARROW,
+              keyCode: KeyCodes_Enum.LEFT_ARROW,
             })
           );
 
@@ -129,8 +129,8 @@ describes.realWin('KeyboardHandler', {}, (env) => {
             {
               name: eventType,
               data: createKeyboardEventInitWithKeyCode(
-                Keys.LEFT_ARROW,
-                KeyCodes.LEFT_ARROW
+                Keys_Enum.LEFT_ARROW,
+                KeyCodes_Enum.LEFT_ARROW
               ),
             },
           ]);
@@ -140,8 +140,8 @@ describes.realWin('KeyboardHandler', {}, (env) => {
           const e = new KeyboardEvent(eventType, {
             bubbles: true,
             cancelable: true,
-            key: Keys.ESCAPE,
-            keyCode: KeyCodes.ESCAPE,
+            key: Keys_Enum.ESCAPE,
+            keyCode: KeyCodes_Enum.ESCAPE,
           });
           e.preventDefault();
 
@@ -156,8 +156,8 @@ describes.realWin('KeyboardHandler', {}, (env) => {
           env.win.document.documentElement.dispatchEvent(
             new KeyboardEvent(eventType, {
               bubbles: true,
-              key: Keys.ESCAPE,
-              keyCode: KeyCodes.ESCAPE,
+              key: Keys_Enum.ESCAPE,
+              keyCode: KeyCodes_Enum.ESCAPE,
             })
           );
 
@@ -165,8 +165,8 @@ describes.realWin('KeyboardHandler', {}, (env) => {
             {
               name: eventType,
               data: createKeyboardEventInitWithKeyCode(
-                Keys.ESCAPE,
-                KeyCodes.ESCAPE
+                Keys_Enum.ESCAPE,
+                KeyCodes_Enum.ESCAPE
               ),
             },
           ]);
@@ -176,8 +176,8 @@ describes.realWin('KeyboardHandler', {}, (env) => {
           env.win.document.documentElement.dispatchEvent(
             new KeyboardEvent(eventType, {
               bubbles: true,
-              key: Keys.LEFT_ARROW,
-              keyCode: KeyCodes.LEFT_ARROW,
+              key: Keys_Enum.LEFT_ARROW,
+              keyCode: KeyCodes_Enum.LEFT_ARROW,
             })
           );
 
@@ -185,8 +185,8 @@ describes.realWin('KeyboardHandler', {}, (env) => {
             {
               name: eventType,
               data: createKeyboardEventInitWithKeyCode(
-                Keys.LEFT_ARROW,
-                KeyCodes.LEFT_ARROW
+                Keys_Enum.LEFT_ARROW,
+                KeyCodes_Enum.LEFT_ARROW
               ),
             },
           ]);
@@ -196,8 +196,8 @@ describes.realWin('KeyboardHandler', {}, (env) => {
           const e = new KeyboardEvent(eventType, {
             bubbles: true,
             cancelable: true,
-            key: Keys.ESCAPE,
-            keyCode: KeyCodes.ESCAPE,
+            key: Keys_Enum.ESCAPE,
+            keyCode: KeyCodes_Enum.ESCAPE,
           });
           e.preventDefault();
 
@@ -212,8 +212,8 @@ describes.realWin('KeyboardHandler', {}, (env) => {
           env.win.document.body.dispatchEvent(
             new KeyboardEvent(eventType, {
               bubbles: true,
-              key: Keys.ESCAPE,
-              keyCode: KeyCodes.ESCAPE,
+              key: Keys_Enum.ESCAPE,
+              keyCode: KeyCodes_Enum.ESCAPE,
             })
           );
 
@@ -221,8 +221,8 @@ describes.realWin('KeyboardHandler', {}, (env) => {
             {
               name: eventType,
               data: createKeyboardEventInitWithKeyCode(
-                Keys.ESCAPE,
-                KeyCodes.ESCAPE
+                Keys_Enum.ESCAPE,
+                KeyCodes_Enum.ESCAPE
               ),
             },
           ]);
@@ -232,8 +232,8 @@ describes.realWin('KeyboardHandler', {}, (env) => {
           env.win.document.body.dispatchEvent(
             new KeyboardEvent(eventType, {
               bubbles: true,
-              key: Keys.LEFT_ARROW,
-              keyCode: KeyCodes.LEFT_ARROW,
+              key: Keys_Enum.LEFT_ARROW,
+              keyCode: KeyCodes_Enum.LEFT_ARROW,
             })
           );
 
@@ -241,8 +241,8 @@ describes.realWin('KeyboardHandler', {}, (env) => {
             {
               name: eventType,
               data: createKeyboardEventInitWithKeyCode(
-                Keys.LEFT_ARROW,
-                KeyCodes.LEFT_ARROW
+                Keys_Enum.LEFT_ARROW,
+                KeyCodes_Enum.LEFT_ARROW
               ),
             },
           ]);
@@ -252,8 +252,8 @@ describes.realWin('KeyboardHandler', {}, (env) => {
           const e = new KeyboardEvent(eventType, {
             bubbles: true,
             cancelable: true,
-            key: Keys.ESCAPE,
-            keyCode: KeyCodes.ESCAPE,
+            key: Keys_Enum.ESCAPE,
+            keyCode: KeyCodes_Enum.ESCAPE,
           });
           e.preventDefault();
 
@@ -276,8 +276,8 @@ describes.realWin('KeyboardHandler', {}, (env) => {
           checkbox.dispatchEvent(
             new KeyboardEvent(eventType, {
               bubbles: true,
-              key: Keys.ESCAPE,
-              keyCode: KeyCodes.ESCAPE,
+              key: Keys_Enum.ESCAPE,
+              keyCode: KeyCodes_Enum.ESCAPE,
             })
           );
 
@@ -285,8 +285,8 @@ describes.realWin('KeyboardHandler', {}, (env) => {
             {
               name: eventType,
               data: createKeyboardEventInitWithKeyCode(
-                Keys.ESCAPE,
-                KeyCodes.ESCAPE
+                Keys_Enum.ESCAPE,
+                KeyCodes_Enum.ESCAPE
               ),
             },
           ]);
@@ -296,8 +296,8 @@ describes.realWin('KeyboardHandler', {}, (env) => {
           checkbox.dispatchEvent(
             new KeyboardEvent(eventType, {
               bubbles: true,
-              key: Keys.LEFT_ARROW,
-              keyCode: KeyCodes.LEFT_ARROW,
+              key: Keys_Enum.LEFT_ARROW,
+              keyCode: KeyCodes_Enum.LEFT_ARROW,
             })
           );
 
@@ -305,8 +305,8 @@ describes.realWin('KeyboardHandler', {}, (env) => {
             {
               name: eventType,
               data: createKeyboardEventInitWithKeyCode(
-                Keys.LEFT_ARROW,
-                KeyCodes.LEFT_ARROW
+                Keys_Enum.LEFT_ARROW,
+                KeyCodes_Enum.LEFT_ARROW
               ),
             },
           ]);
@@ -316,8 +316,8 @@ describes.realWin('KeyboardHandler', {}, (env) => {
           const e = new KeyboardEvent(eventType, {
             bubbles: true,
             cancelable: true,
-            key: Keys.ESCAPE,
-            keyCode: KeyCodes.ESCAPE,
+            key: Keys_Enum.ESCAPE,
+            keyCode: KeyCodes_Enum.ESCAPE,
           });
           e.preventDefault();
 
@@ -330,8 +330,8 @@ describes.realWin('KeyboardHandler', {}, (env) => {
           checkbox.dispatchEvent(
             new KeyboardEvent(eventType, {
               bubbles: true,
-              key: Keys.SPACE,
-              keyCode: KeyCodes.SPACE,
+              key: Keys_Enum.SPACE,
+              keyCode: KeyCodes_Enum.SPACE,
             })
           );
 
@@ -352,8 +352,8 @@ describes.realWin('KeyboardHandler', {}, (env) => {
             node.dispatchEvent(
               new KeyboardEvent(eventType, {
                 bubbles: true,
-                key: Keys.ESCAPE,
-                keyCode: KeyCodes.ESCAPE,
+                key: Keys_Enum.ESCAPE,
+                keyCode: KeyCodes_Enum.ESCAPE,
               })
             );
 
@@ -361,8 +361,8 @@ describes.realWin('KeyboardHandler', {}, (env) => {
               {
                 name: eventType,
                 data: createKeyboardEventInitWithKeyCode(
-                  Keys.ESCAPE,
-                  KeyCodes.ESCAPE
+                  Keys_Enum.ESCAPE,
+                  KeyCodes_Enum.ESCAPE
                 ),
               },
             ]);
@@ -372,8 +372,8 @@ describes.realWin('KeyboardHandler', {}, (env) => {
             const e = new KeyboardEvent(eventType, {
               bubbles: true,
               cancelable: true,
-              key: Keys.ESCAPE,
-              keyCode: KeyCodes.ESCAPE,
+              key: Keys_Enum.ESCAPE,
+              keyCode: KeyCodes_Enum.ESCAPE,
             });
             e.preventDefault();
 
@@ -386,8 +386,8 @@ describes.realWin('KeyboardHandler', {}, (env) => {
             node.dispatchEvent(
               new KeyboardEvent(eventType, {
                 bubbles: true,
-                key: Keys.SPACE,
-                keyCode: KeyCodes.SPACE,
+                key: Keys_Enum.SPACE,
+                keyCode: KeyCodes_Enum.SPACE,
               })
             );
 
@@ -409,8 +409,8 @@ describes.realWin('KeyboardHandler', {}, (env) => {
           element.dispatchEvent(
             new KeyboardEvent(eventType, {
               bubbles: true,
-              key: Keys.ESCAPE,
-              keyCode: KeyCodes.ESCAPE,
+              key: Keys_Enum.ESCAPE,
+              keyCode: KeyCodes_Enum.ESCAPE,
             })
           );
 
@@ -418,8 +418,8 @@ describes.realWin('KeyboardHandler', {}, (env) => {
             {
               name: eventType,
               data: createKeyboardEventInitWithKeyCode(
-                Keys.ESCAPE,
-                KeyCodes.ESCAPE
+                Keys_Enum.ESCAPE,
+                KeyCodes_Enum.ESCAPE
               ),
             },
           ]);
@@ -429,8 +429,8 @@ describes.realWin('KeyboardHandler', {}, (env) => {
           const e = new KeyboardEvent(eventType, {
             bubbles: true,
             cancelable: true,
-            key: Keys.ESCAPE,
-            keyCode: KeyCodes.ESCAPE,
+            key: Keys_Enum.ESCAPE,
+            keyCode: KeyCodes_Enum.ESCAPE,
           });
           e.preventDefault();
 
@@ -443,8 +443,8 @@ describes.realWin('KeyboardHandler', {}, (env) => {
           element.dispatchEvent(
             new KeyboardEvent(eventType, {
               bubbles: true,
-              key: Keys.SPACE,
-              keyCode: KeyCodes.SPACE,
+              key: Keys_Enum.SPACE,
+              keyCode: KeyCodes_Enum.SPACE,
             })
           );
 
@@ -456,15 +456,15 @@ describes.realWin('KeyboardHandler', {}, (env) => {
         env.win.document.documentElement.dispatchEvent(
           new KeyboardEvent(eventType, {
             bubbles: true,
-            key: Keys.LEFT_ARROW,
-            keyCode: KeyCodes.LEFT_ARROW,
+            key: Keys_Enum.LEFT_ARROW,
+            keyCode: KeyCodes_Enum.LEFT_ARROW,
           })
         );
         env.win.document.body.dispatchEvent(
           new KeyboardEvent(eventType, {
             bubbles: true,
-            key: Keys.RIGHT_ARROW,
-            keyCode: KeyCodes.RIGHT_ARROW,
+            key: Keys_Enum.RIGHT_ARROW,
+            keyCode: KeyCodes_Enum.RIGHT_ARROW,
           })
         );
 
@@ -472,15 +472,15 @@ describes.realWin('KeyboardHandler', {}, (env) => {
           {
             name: eventType,
             data: createKeyboardEventInitWithKeyCode(
-              Keys.LEFT_ARROW,
-              KeyCodes.LEFT_ARROW
+              Keys_Enum.LEFT_ARROW,
+              KeyCodes_Enum.LEFT_ARROW
             ),
           },
           {
             name: eventType,
             data: createKeyboardEventInitWithKeyCode(
-              Keys.RIGHT_ARROW,
-              KeyCodes.RIGHT_ARROW
+              Keys_Enum.RIGHT_ARROW,
+              KeyCodes_Enum.RIGHT_ARROW
             ),
           },
         ]);
diff --git a/extensions/amp-viewer-integration/0.1/touch-handler.js b/extensions/amp-viewer-integration/0.1/touch-handler.js
index b6192dea1eeb..8056ee379a86 100644
--- a/extensions/amp-viewer-integration/0.1/touch-handler.js
+++ b/extensions/amp-viewer-integration/0.1/touch-handler.js
@@ -1,5 +1,3 @@
-import {dict} from '#core/types/object';
-
 import {listen} from '#utils/event-helper';
 
 /**
@@ -177,7 +175,7 @@ export class TouchHandler {
    * @private
    */
   copyProperties_(o, properties) {
-    const copy = dict();
+    const copy = {};
     for (let i = 0; i < properties.length; i++) {
       const p = properties[i];
       if (o[p] !== undefined) {
diff --git a/extensions/amp-viewer-integration/0.1/viewer-initiated-handshake-viewer-for-testing.js b/extensions/amp-viewer-integration/0.1/viewer-initiated-handshake-viewer-for-testing.js
index edd1a4fa4d29..6799a3c26ab8 100644
--- a/extensions/amp-viewer-integration/0.1/viewer-initiated-handshake-viewer-for-testing.js
+++ b/extensions/amp-viewer-integration/0.1/viewer-initiated-handshake-viewer-for-testing.js
@@ -1,7 +1,8 @@
 import {parseUrlDeprecated, serializeQueryString} from '../../../src/url';
 
 const APP = '__AMPHTML__';
-const MessageType = {
+/** @enum {string} */
+const MessageType_Enum = {
   REQUEST: 'q',
   RESPONSE: 's',
 };
@@ -132,7 +133,7 @@ export class WebviewViewerForTesting {
     const message = {
       app: APP,
       requestid: requestId,
-      type: MessageType.RESPONSE,
+      type: MessageType_Enum.RESPONSE,
     };
 
     this.log('############## viewer posting1 Message', message);
@@ -159,7 +160,7 @@ export class WebviewViewerForTesting {
       rsvp: true,
       name: eventType,
       data: payload,
-      type: MessageType.REQUEST,
+      type: MessageType_Enum.REQUEST,
     };
     this.iframe.contentWindow./*OK*/ postMessage(message, this.frameOrigin_);
   }
diff --git a/extensions/amp-viewer-integration/0.1/webview-viewer-for-testing.js b/extensions/amp-viewer-integration/0.1/webview-viewer-for-testing.js
index 4948cf7940fd..7ba53698b9d5 100644
--- a/extensions/amp-viewer-integration/0.1/webview-viewer-for-testing.js
+++ b/extensions/amp-viewer-integration/0.1/webview-viewer-for-testing.js
@@ -3,7 +3,8 @@ import {Messaging} from './messaging/messaging';
 import {parseUrlDeprecated, serializeQueryString} from '../../../src/url';
 
 const APP = '__AMPHTML__';
-const MessageType = {
+/** @enum {string} */
+const MessageType_Enum = {
   REQUEST: 'q',
   RESPONSE: 's',
 };
@@ -141,7 +142,7 @@ export class WebviewViewerForTesting {
     const message = {
       app: APP,
       requestid: requestId,
-      type: MessageType.RESPONSE,
+      type: MessageType_Enum.RESPONSE,
     };
     this.log('############## viewer posting1 Message', message);
     channel.port1./*OK*/ postMessage(JSON.stringify(message));
diff --git a/extensions/amp-vimeo/0.1/amp-vimeo.js b/extensions/amp-vimeo/0.1/amp-vimeo.js
index 4d94456968b5..0717cd48e11c 100644
--- a/extensions/amp-vimeo/0.1/amp-vimeo.js
+++ b/extensions/amp-vimeo/0.1/amp-vimeo.js
@@ -1,3 +1,11 @@
+import {
+  VIMEO_EVENTS,
+  getVimeoIframeSrc,
+  getVimeoOriginRegExp,
+  listenToVimeoEvents,
+  makeVimeoMessage,
+} from '#bento/apis/vimeo-api';
+
 import {dispatchCustomEvent, removeElement} from '#core/dom';
 import {isLayoutSizeDefined} from '#core/dom/layout';
 import {isAutoplaySupported} from '#core/dom/video';
@@ -19,14 +27,10 @@ import {
   postMessageWhenAvailable,
   redispatch,
 } from '../../../src/iframe-video';
-import {VideoAttributes, VideoEvents} from '../../../src/video-interface';
 import {
-  VIMEO_EVENTS,
-  getVimeoIframeSrc,
-  getVimeoOriginRegExp,
-  listenToVimeoEvents,
-  makeVimeoMessage,
-} from '../vimeo-api';
+  VideoAttributes_Enum,
+  VideoEvents_Enum,
+} from '../../../src/video-interface';
 
 const TAG = 'amp-vimeo';
 
@@ -139,7 +143,7 @@ class AmpVimeo extends AMP.BaseElement {
    * @private
    */
   isAutoplay_() {
-    if (!this.element.hasAttribute(VideoAttributes.AUTOPLAY)) {
+    if (!this.element.hasAttribute(VideoAttributes_Enum.AUTOPLAY)) {
       return Promise.resolve(false);
     }
     return isAutoplaySupported(this.win);
@@ -153,7 +157,7 @@ class AmpVimeo extends AMP.BaseElement {
 
     Services.videoManagerForDoc(element).register(this);
 
-    dispatchCustomEvent(element, VideoEvents.LOAD);
+    dispatchCustomEvent(element, VideoEvents_Enum.LOAD);
   }
 
   /**
diff --git a/extensions/amp-vimeo/1.0/amp-vimeo.js b/extensions/amp-vimeo/1.0/amp-vimeo.js
index f5ad9dbe2dab..21b59d820825 100644
--- a/extensions/amp-vimeo/1.0/amp-vimeo.js
+++ b/extensions/amp-vimeo/1.0/amp-vimeo.js
@@ -1,15 +1,18 @@
+import {AmpVideoBaseElement} from '#bento/components/bento-video/1.0/video-base-element';
+import {BaseElement} from '#bento/components/bento-vimeo/1.0/base-element';
+
 import {isExperimentOn} from '#experiments';
 
-import {userAssert} from '#utils/log';
+import {setSuperClass} from '#preact/amp-base-element';
 
-import {BaseElement} from './base-element';
+import {userAssert} from '#utils/log';
 
 import {CSS} from '../../../build/amp-vimeo-1.0.css';
 
 /** @const {string} */
 const TAG = 'amp-vimeo';
 
-class AmpVimeo extends BaseElement {
+class AmpVimeo extends setSuperClass(BaseElement, AmpVideoBaseElement) {
   /** @override */
   isLayoutSupported(layout) {
     userAssert(
diff --git a/extensions/amp-vimeo/1.0/base-element.js b/extensions/amp-vimeo/1.0/base-element.js
deleted file mode 100644
index f3b476c59358..000000000000
--- a/extensions/amp-vimeo/1.0/base-element.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import {BentoVimeo} from './component';
-
-import {VideoBaseElement} from '../../amp-video/1.0/video-base-element';
-
-export class BaseElement extends VideoBaseElement {}
-
-/** @override */
-BaseElement['Component'] = BentoVimeo;
-
-/** @override */
-BaseElement['props'] = {
-  'autoplay': {attr: 'autoplay', type: 'boolean'},
-  'controls': {attr: 'controls', type: 'boolean'},
-  'videoid': {attr: 'data-videoid'},
-  'doNotTrack': {attr: 'do-not-track'},
-};
-
-/** @override */
-BaseElement['layoutSizeDefined'] = true;
-
-/** @override */
-BaseElement['usesShadowDom'] = true;
diff --git a/extensions/amp-vimeo/1.0/component.js b/extensions/amp-vimeo/1.0/component.js
deleted file mode 100644
index e6e88349cbce..000000000000
--- a/extensions/amp-vimeo/1.0/component.js
+++ /dev/null
@@ -1,117 +0,0 @@
-import {dispatchCustomEvent} from '#core/dom';
-
-import * as Preact from '#preact';
-import {useCallback, useMemo, useRef} from '#preact';
-import {forwardRef} from '#preact/compat';
-import {useValueRef} from '#preact/component';
-
-import {
-  objOrParseJson,
-  postMessageWhenAvailable,
-} from '../../../src/iframe-video';
-import {VideoIframe} from '../../amp-video/1.0/video-iframe';
-import {
-  VIMEO_EVENTS,
-  getVimeoIframeSrc,
-  getVimeoOriginRegExp,
-  listenToVimeoEvents,
-  makeVimeoMessage,
-} from '../vimeo-api';
-
-/**
- * @param {!HTMLIframeElement} iframe
- * @param {string} type
- */
-function dispatchEvent(iframe, type) {
-  dispatchCustomEvent(iframe, type, null, {
-    bubbles: true,
-    cancelable: false,
-  });
-}
-
-/**
- * @param {string} method
- * @return {string}
- */
-function makeMethodMessage(method) {
-  if (method === 'mute') {
-    return makeVimeoMessage('setVolume', '0');
-  }
-  if (method === 'unmute') {
-    return makeVimeoMessage('setVolume', '1');
-  }
-  return makeVimeoMessage(method);
-}
-
-/**
- * @param {!VimeoDef.Props} props
- * @param {{current: ?T}} ref
- * @return {PreactDef.Renderable}
- * @template T
- */
-function BentoVimeoWithRef(
-  {autoplay = false, doNotTrack = false, onLoad, videoid, ...rest},
-  ref
-) {
-  const origin = useMemo(getVimeoOriginRegExp, []);
-  const src = useMemo(
-    () => getVimeoIframeSrc(videoid, autoplay, doNotTrack),
-    [videoid, doNotTrack, autoplay]
-  );
-
-  const readyIframeRef = useRef(null);
-  const onLoadRef = useValueRef(onLoad);
-
-  const onReadyMessage = useCallback((iframe) => {
-    if (readyIframeRef.current === iframe) {
-      return;
-    }
-    readyIframeRef.current = iframe;
-    dispatchEvent(iframe, 'canplay');
-    listenToVimeoEvents(iframe);
-  }, []);
-
-  const onMessage = useCallback(
-    (e) => {
-      const {currentTarget} = e;
-      const data = objOrParseJson(e.data);
-      if (!data) {
-        return;
-      }
-      const event = data['event'];
-      if (event == 'ready' || data['method'] == 'ping') {
-        onReadyMessage(currentTarget);
-        return;
-      }
-      if (VIMEO_EVENTS[event]) {
-        dispatchEvent(currentTarget, VIMEO_EVENTS[event]);
-        onLoadRef.current?.();
-        return;
-      }
-    },
-    [onReadyMessage, onLoadRef]
-  );
-
-  const onIframeLoad = useCallback((e) => {
-    postMessageWhenAvailable(e.currentTarget, makeVimeoMessage('ping'));
-  }, []);
-
-  return (
-    <VideoIframe
-      ref={ref}
-      {...rest}
-      origin={origin}
-      autoplay={autoplay}
-      src={src}
-      onMessage={onMessage}
-      makeMethodMessage={makeMethodMessage}
-      onIframeLoad={onIframeLoad}
-      // Vimeo API does not have a way to hide controls, so they're always set
-      controls
-    />
-  );
-}
-
-const BentoVimeo = forwardRef(BentoVimeoWithRef);
-BentoVimeo.displayName = 'BentoVimeo'; // Make findable for tests.
-export {BentoVimeo};
diff --git a/extensions/amp-vimeo/1.0/storybook/Basic.amp.js b/extensions/amp-vimeo/1.0/storybook/Basic.amp.js
index f5fea569c5a6..269104add664 100644
--- a/extensions/amp-vimeo/1.0/storybook/Basic.amp.js
+++ b/extensions/amp-vimeo/1.0/storybook/Basic.amp.js
@@ -1,5 +1,4 @@
 import {withAmp} from '@ampproject/storybook-addon';
-import {boolean, text, withKnobs} from '@storybook/addon-knobs';
 
 import * as Preact from '#preact';
 
@@ -7,44 +6,48 @@ import {VideoElementWithActions} from '../../../amp-video/1.0/storybook/_helpers
 
 export default {
   title: 'amp-vimeo-1_0',
-  decorators: [withKnobs, withAmp],
+  decorators: [withAmp],
 
   parameters: {
     extensions: [{name: 'amp-vimeo', version: '1.0'}],
     experiments: ['bento'],
   },
+  args: {
+    videoid: '27246366',
+    autoplay: true,
+    doNotTrack: false,
+  },
 };
 
-export const Default = ({id}) => {
-  const videoid = text('videoid', '27246366');
-  const autoplay = boolean('autoplay', true);
-  const doNotTrack = boolean('do-not-track', false);
+export const Default = ({doNotTrack, id, videoid, ...args}) => {
   return (
     <amp-vimeo
       id={id}
       width="16"
       height="9"
       layout="responsive"
-      autoplay={autoplay}
       data-videoid={videoid}
       do-not-track={doNotTrack}
+      {...args}
     />
   );
 };
 
-export const WithPlaceholderAndFallback = ({id}) => {
-  const videoid = text('videoid', '27246366');
-  const autoplay = boolean('autoplay', true);
-  const doNotTrack = boolean('do-not-track', false);
+export const WithPlaceholderAndFallback = ({
+  doNotTrack,
+  id,
+  videoid,
+  ...args
+}) => {
   return (
     <amp-vimeo
       id={id}
       width="16"
       height="9"
       layout="responsive"
-      autoplay={autoplay}
       data-videoid={videoid}
       do-not-track={doNotTrack}
+      {...args}
     >
       <div placeholder style="background:red">
         Placeholder. Loading content...
@@ -57,11 +60,11 @@ export const WithPlaceholderAndFallback = ({id}) => {
   );
 };
 
-export const Actions = () => {
+export const Actions = ({...args}) => {
   const id = 'my-vimeo';
   return (
     <VideoElementWithActions id={id}>
-      <Default id={id} />
+      <Default id={id} {...args} />
     </VideoElementWithActions>
   );
 };
diff --git a/extensions/amp-vimeo/1.0/storybook/Basic.js b/extensions/amp-vimeo/1.0/storybook/Basic.js
index 383d8d8da318..0a7aac9e96bb 100644
--- a/extensions/amp-vimeo/1.0/storybook/Basic.js
+++ b/extensions/amp-vimeo/1.0/storybook/Basic.js
@@ -1,27 +1,19 @@
-import {boolean, number, text, withKnobs} from '@storybook/addon-knobs';
+import {BentoVimeo} from '#bento/components/bento-vimeo/1.0/component';
 
 import * as Preact from '#preact';
 
-import {BentoVimeo} from '../component';
-
 export default {
   title: 'Vimeo',
   component: BentoVimeo,
-  decorators: [withKnobs],
+  args: {
+    videoid: '27246366',
+    width: 320,
+    height: 180,
+    autoplay: true,
+    doNotTrack: false,
+  },
 };
 
-export const _default = () => {
-  const videoid = text('videoid', '27246366');
-  const width = number('width', 320);
-  const height = number('height', 180);
-  const autoplay = boolean('autoplay', true);
-  const doNotTrack = boolean('do-not-track', false);
-  return (
-    <BentoVimeo
-      style={{width, height}}
-      autoplay={autoplay}
-      doNotTrack={doNotTrack}
-      videoid={videoid}
-    />
-  );
+export const _default = ({height, width, ...args}) => {
+  return <BentoVimeo style={{width, height}} {...args} />;
 };
diff --git a/extensions/amp-vimeo/1.0/test-e2e/test-bento-vimeo.js b/extensions/amp-vimeo/1.0/test-e2e/test-bento-vimeo.js
deleted file mode 100644
index 0498547cabec..000000000000
--- a/extensions/amp-vimeo/1.0/test-e2e/test-bento-vimeo.js
+++ /dev/null
@@ -1,26 +0,0 @@
-describes.endtoend(
-  'bento-vimeo',
-  {
-    version: '1.0',
-    fixture: 'bento/vimeo.html',
-    environments: ['single'],
-  },
-  (env) => {
-    let controller;
-
-    beforeEach(() => {
-      controller = env.controller;
-    });
-
-    it('should render a vimeo video', async () => {
-      const element = await controller.findElement('bento-vimeo');
-      await controller.switchToShadowRoot(element);
-
-      const iframe = await controller.findElement('iframe');
-
-      await expect(controller.getElementAttribute(iframe, 'src')).to.equal(
-        'https://player.vimeo.com/video/23237102'
-      );
-    });
-  }
-);
diff --git a/extensions/amp-vimeo/1.0/test/test-amp-vimeo.js b/extensions/amp-vimeo/1.0/test/test-amp-vimeo.js
index a38fbd39f2a0..8b6de562336f 100644
--- a/extensions/amp-vimeo/1.0/test/test-amp-vimeo.js
+++ b/extensions/amp-vimeo/1.0/test/test-amp-vimeo.js
@@ -39,5 +39,32 @@ describes.realWin(
       const iframe = element.shadowRoot.querySelector('iframe');
       expect(iframe).to.not.be.null;
     });
+
+    it('should pass the data-loading attribute to the underlying iframe', async () => {
+      const element = html`
+        <amp-vimeo
+          data-loading="lazy"
+          layout="responsive"
+          width="16"
+          height="9"
+        ></amp-vimeo>
+      `;
+      env.win.document.body.appendChild(element);
+      await waitForRender(element);
+
+      const iframe = element.shadowRoot.querySelector('iframe');
+      expect(iframe.getAttribute('loading')).to.equal('lazy');
+    });
+
+    it('should set data-loading="auto" if no value is specified', async () => {
+      const element = html`
+        <amp-vimeo layout="responsive" width="16" height="9"></amp-vimeo>
+      `;
+      env.win.document.body.appendChild(element);
+      await waitForRender(element);
+
+      const iframe = element.shadowRoot.querySelector('iframe');
+      expect(iframe.getAttribute('loading')).to.equal('auto');
+    });
   }
 );
diff --git a/extensions/amp-vimeo/validator-amp-vimeo.protoascii b/extensions/amp-vimeo/validator-amp-vimeo.protoascii
index 4ebd8bf5745e..793513af2c23 100644
--- a/extensions/amp-vimeo/validator-amp-vimeo.protoascii
+++ b/extensions/amp-vimeo/validator-amp-vimeo.protoascii
@@ -1,8 +1,8 @@
 tags: {  # amp-vimeo
   html_format: AMP
   tag_name: "SCRIPT"
-  satisfies: "amp-vimeo 0.1"
-  excludes: "amp-vimeo 1.0"
+  satisfies_condition: "amp-vimeo 0.1"
+  excludes_condition: "amp-vimeo 1.0"
   extension_spec: {
     name: "amp-vimeo"
     version_name: "v0.1"
@@ -17,8 +17,8 @@ tags: {  # amp-vimeo
 tags: {  # amp-vimeo 1.0
   html_format: AMP
   tag_name: "SCRIPT"
-  satisfies: "amp-vimeo 1.0"
-  excludes: "amp-vimeo 0.1"
+  satisfies_condition: "amp-vimeo 1.0"
+  excludes_condition: "amp-vimeo 0.1"
   extension_spec: {
     name: "amp-vimeo"
     version_name: "v1.0"
@@ -34,6 +34,10 @@ tags: {  # <amp-vimeo>
     name: "autoplay"
     value: ""
   }
+  attrs: {
+    name: "do-not-track"
+    value: ""
+  }
   attrs: {
     name: "data-videoid"
     mandatory: true
diff --git a/extensions/amp-viqeo-player/0.1/amp-viqeo-player.js b/extensions/amp-viqeo-player/0.1/amp-viqeo-player.js
index c7104d4c7c57..e0733ea7b92a 100644
--- a/extensions/amp-viqeo-player/0.1/amp-viqeo-player.js
+++ b/extensions/amp-viqeo-player/0.1/amp-viqeo-player.js
@@ -1,4 +1,4 @@
-/* eslint-disable no-unused-vars */
+/* eslint-disable @typescript-eslint/no-unused-vars */
 
 import {Deferred} from '#core/data-structures/promise';
 import {removeElement} from '#core/dom';
@@ -7,7 +7,11 @@ import {
   fullscreenExit,
   isFullscreenElement,
 } from '#core/dom/fullscreen';
-import {Layout, applyFillContent, isLayoutSizeDefined} from '#core/dom/layout';
+import {
+  Layout_Enum,
+  applyFillContent,
+  isLayoutSizeDefined,
+} from '#core/dom/layout';
 import {propagateAttributes} from '#core/dom/propagate-attributes';
 
 import {Services} from '#service';
@@ -18,19 +22,22 @@ import {dev, userAssert} from '#utils/log';
 
 import {getIframe} from '../../../src/3p-frame';
 import {redispatch} from '../../../src/iframe-video';
-import {VideoAttributes, VideoEvents} from '../../../src/video-interface';
+import {
+  VideoAttributes_Enum,
+  VideoEvents_Enum,
+} from '../../../src/video-interface';
 
 const TAG = 'amp-viqeo-player';
 
 const EVENTS = {
-  'ready': VideoEvents.LOAD,
-  'play': VideoEvents.PLAYING,
-  'pause': VideoEvents.PAUSE,
-  'mute': VideoEvents.MUTED,
-  'unmute': VideoEvents.UNMUTED,
-  'end': VideoEvents.ENDED,
-  'startAdvert': VideoEvents.AD_START,
-  'endAdvert': VideoEvents.AD_END,
+  'ready': VideoEvents_Enum.LOAD,
+  'play': VideoEvents_Enum.PLAYING,
+  'pause': VideoEvents_Enum.PAUSE,
+  'mute': VideoEvents_Enum.MUTED,
+  'unmute': VideoEvents_Enum.UNMUTED,
+  'end': VideoEvents_Enum.ENDED,
+  'startAdvert': VideoEvents_Enum.AD_START,
+  'endAdvert': VideoEvents_Enum.AD_END,
 };
 
 /**
@@ -59,7 +66,7 @@ class AmpViqeoPlayer extends AMP.BaseElement {
     /** @private {string} */
     this.videoId_ = '';
 
-    /** @private {Object<string, (number|Array)>} */
+    /** @private {{[key: string]: (number|Array)}} */
     this.meta_ = {};
   }
 
@@ -81,7 +88,7 @@ class AmpViqeoPlayer extends AMP.BaseElement {
   }
 
   /**
-   * @param {!Layout} layout
+   * @param {!Layout_Enum} layout
    * @return {boolean}
    * @override
    */
@@ -103,7 +110,9 @@ class AmpViqeoPlayer extends AMP.BaseElement {
       this.element
     );
 
-    this.hasAutoplay_ = this.element.hasAttribute(VideoAttributes.AUTOPLAY);
+    this.hasAutoplay_ = this.element.hasAttribute(
+      VideoAttributes_Enum.AUTOPLAY
+    );
 
     const deferred = new Deferred();
     this.playerReadyPromise_ = deferred.promise;
diff --git a/extensions/amp-viqeo-player/0.1/test/test-amp-viqeo-player.js b/extensions/amp-viqeo-player/0.1/test/test-amp-viqeo-player.js
index 78986fc103c7..914c73495e6c 100644
--- a/extensions/amp-viqeo-player/0.1/test/test-amp-viqeo-player.js
+++ b/extensions/amp-viqeo-player/0.1/test/test-amp-viqeo-player.js
@@ -2,7 +2,10 @@ import {Services} from '#service';
 
 import {listenOncePromise} from '#utils/event-helper';
 
-import {PlayingStates, VideoEvents} from '../../../../src/video-interface';
+import {
+  PlayingStates_Enum,
+  VideoEvents_Enum,
+} from '../../../../src/video-interface';
 import AmpViqeoPlayer from '../amp-viqeo-player';
 
 describes.realWin(
@@ -30,7 +33,7 @@ describes.realWin(
       });
     }
 
-    it.skip('test-get-data', () => {
+    it('test-get-data', () => {
       return getViqeo().then((p) => {
         const {entry, viqeo, viqeoElement} = p;
         expect(entry.video.element).to.equal(viqeoElement);
@@ -58,7 +61,7 @@ describes.realWin(
       });
     });
 
-    describe.skip('test-playing-actions', () => {
+    describe('test-playing-actions', () => {
       it('renders responsively', () => {
         return getViqeo().then((p) => {
           const iframe = p.viqeoElement.querySelector('iframe');
@@ -94,7 +97,7 @@ describes.realWin(
       it('should paused without autoplay', () => {
         return getViqeo().then((p) => {
           const curState = p.videoManager.getPlayingState(p.viqeo);
-          return expect(curState).to.equal(PlayingStates.PAUSED);
+          return expect(curState).to.equal(PlayingStates_Enum.PAUSED);
         });
       });
     });
@@ -120,42 +123,45 @@ describes.realWin(
       return getViqeo().then(({viqeoElement}) => {
         return Promise.resolve()
           .then(async () => {
-            const p = listenOncePromise(viqeoElement, VideoEvents.LOAD);
+            const p = listenOncePromise(viqeoElement, VideoEvents_Enum.LOAD);
             await fakePostMessage(viqeoElement, {action: 'ready'});
             return p;
           })
           .then(async () => {
-            const p = listenOncePromise(viqeoElement, VideoEvents.PLAYING);
+            const p = listenOncePromise(viqeoElement, VideoEvents_Enum.PLAYING);
             await fakePostMessage(viqeoElement, {action: 'play'});
             return p;
           })
           .then(async () => {
-            const p = listenOncePromise(viqeoElement, VideoEvents.PAUSE);
+            const p = listenOncePromise(viqeoElement, VideoEvents_Enum.PAUSE);
             await fakePostMessage(viqeoElement, {action: 'pause'});
             return p;
           })
           .then(async () => {
-            const p = listenOncePromise(viqeoElement, VideoEvents.MUTED);
+            const p = listenOncePromise(viqeoElement, VideoEvents_Enum.MUTED);
             await fakePostMessage(viqeoElement, {action: 'mute'});
             return p;
           })
           .then(async () => {
-            const p = listenOncePromise(viqeoElement, VideoEvents.UNMUTED);
+            const p = listenOncePromise(viqeoElement, VideoEvents_Enum.UNMUTED);
             await fakePostMessage(viqeoElement, {action: 'unmute'});
             return p;
           })
           .then(async () => {
-            const p = listenOncePromise(viqeoElement, VideoEvents.ENDED);
+            const p = listenOncePromise(viqeoElement, VideoEvents_Enum.ENDED);
             await fakePostMessage(viqeoElement, {action: 'end'});
             return p;
           })
           .then(async () => {
-            const p = listenOncePromise(viqeoElement, VideoEvents.AD_START);
+            const p = listenOncePromise(
+              viqeoElement,
+              VideoEvents_Enum.AD_START
+            );
             await fakePostMessage(viqeoElement, {action: 'startAdvert'});
             return p;
           })
           .then(async () => {
-            const p = listenOncePromise(viqeoElement, VideoEvents.AD_END);
+            const p = listenOncePromise(viqeoElement, VideoEvents_Enum.AD_END);
             await fakePostMessage(viqeoElement, {action: 'endAdvert'});
             return p;
           });
diff --git a/extensions/amp-vk/0.1/amp-vk.js b/extensions/amp-vk/0.1/amp-vk.js
index b696973005a5..f92a0bdab5b9 100644
--- a/extensions/amp-vk/0.1/amp-vk.js
+++ b/extensions/amp-vk/0.1/amp-vk.js
@@ -1,7 +1,6 @@
 import {removeElement} from '#core/dom';
-import {Layout, applyFillContent} from '#core/dom/layout';
+import {Layout_Enum, applyFillContent} from '#core/dom/layout';
 import {isEnumValue} from '#core/types';
-import {dict} from '#core/types/object';
 
 import {Services} from '#service';
 
@@ -94,7 +93,7 @@ export class AmpVk extends AMP.BaseElement {
         const startWidth = this.element./*OK*/ offsetWidth;
         const pageUrl = this.getAmpDoc().getUrl();
         const iframeUrl = 'https://vk.com/widget_post.php';
-        const queryParams = dict({
+        const queryParams = {
           'app': '0',
           'width': '100%',
           '_ver': '1',
@@ -106,7 +105,7 @@ export class AmpVk extends AMP.BaseElement {
           'url': pageUrl,
           'referrer': ref,
           'title': 'AMP Post',
-        });
+        };
 
         return addParamsToUrl(iframeUrl, queryParams);
       });
@@ -122,7 +121,7 @@ export class AmpVk extends AMP.BaseElement {
       .then((ref) => {
         const pageUrl = this.getAmpDoc().getUrl();
         const iframeUrl = 'https://vk.com/al_widget_poll.php';
-        const queryParams = dict({
+        const queryParams = {
           'app': this.apiId_,
           'width': '100%',
           '_ver': '1',
@@ -132,7 +131,7 @@ export class AmpVk extends AMP.BaseElement {
           'title': 'AMP Poll',
           'description': '',
           'referrer': ref,
-        });
+        };
 
         return addParamsToUrl(iframeUrl, queryParams);
       });
@@ -247,9 +246,9 @@ export class AmpVk extends AMP.BaseElement {
   /** @override */
   isLayoutSupported(layout) {
     return (
-      layout === Layout.RESPONSIVE ||
-      layout === Layout.FLEX_ITEM ||
-      layout === Layout.FIXED
+      layout === Layout_Enum.RESPONSIVE ||
+      layout === Layout_Enum.FLEX_ITEM ||
+      layout === Layout_Enum.FIXED
     );
   }
 
diff --git a/extensions/amp-vk/0.1/test/test-amp-vk.js b/extensions/amp-vk/0.1/test/test-amp-vk.js
index d512240ddf90..3aad8bfc80b0 100644
--- a/extensions/amp-vk/0.1/test/test-amp-vk.js
+++ b/extensions/amp-vk/0.1/test/test-amp-vk.js
@@ -1,5 +1,5 @@
 import '../amp-vk';
-import {Layout} from '#core/dom/layout';
+import {Layout_Enum} from '#core/dom/layout';
 
 import {Resource} from '#service/resource';
 
@@ -114,14 +114,20 @@ describes.realWin(
     });
 
     it('post::renders responsively', async () => {
-      const vkPost = await createAmpVkElement(POST_PARAMS, Layout.RESPONSIVE);
+      const vkPost = await createAmpVkElement(
+        POST_PARAMS,
+        Layout_Enum.RESPONSIVE
+      );
       const iframe = vkPost.querySelector('iframe');
       expect(iframe).to.not.be.null;
       expect(iframe.className).to.match(/i-amphtml-fill-content/);
     });
 
     it('post::sets correct src url to the vk iFrame', async () => {
-      const vkPost = await createAmpVkElement(POST_PARAMS, Layout.RESPONSIVE);
+      const vkPost = await createAmpVkElement(
+        POST_PARAMS,
+        Layout_Enum.RESPONSIVE
+      );
       const impl = await vkPost.getImpl(false);
       const iframe = vkPost.querySelector('iframe');
       const referrer = encodeURIComponent(vkPost.ownerDocument.referrer);
@@ -166,14 +172,20 @@ describes.realWin(
     });
 
     it('poll::renders responsively', async () => {
-      const vkPoll = await createAmpVkElement(POLL_PARAMS, Layout.RESPONSIVE);
+      const vkPoll = await createAmpVkElement(
+        POLL_PARAMS,
+        Layout_Enum.RESPONSIVE
+      );
       const iframe = vkPoll.querySelector('iframe');
       expect(iframe).to.not.be.null;
       expect(iframe.className).to.match(/i-amphtml-fill-content/);
     });
 
     it('poll::sets correct src url to the vk iFrame', async () => {
-      const vkPoll = await createAmpVkElement(POLL_PARAMS, Layout.RESPONSIVE);
+      const vkPoll = await createAmpVkElement(
+        POLL_PARAMS,
+        Layout_Enum.RESPONSIVE
+      );
       const iframe = vkPoll.querySelector('iframe');
       const referrer = encodeURIComponent(vkPoll.ownerDocument.referrer);
       const url = encodeURIComponent(
diff --git a/extensions/amp-web-push/0.1/amp-web-push-helper-frame.js b/extensions/amp-web-push/0.1/amp-web-push-helper-frame.js
index f97d16279a5c..8fa170e2857c 100644
--- a/extensions/amp-web-push/0.1/amp-web-push-helper-frame.js
+++ b/extensions/amp-web-push/0.1/amp-web-push-helper-frame.js
@@ -345,7 +345,7 @@ export class AmpWebPushHelperFrame {
   }
 
   /**
-   * Returns a Promise that is resolved when the the page controlling the
+   * Returns a Promise that is resolved when the page controlling the
    * service worker is activated. This Promise never rejects.
    *
    * @return {Promise}
diff --git a/extensions/amp-web-push/0.1/amp-web-push-widget.js b/extensions/amp-web-push/0.1/amp-web-push-widget.js
index 335938e4fc74..efcd0a63d822 100644
--- a/extensions/amp-web-push/0.1/amp-web-push-widget.js
+++ b/extensions/amp-web-push/0.1/amp-web-push-widget.js
@@ -14,7 +14,7 @@
  * the License.
  */
 
-import {Layout} from '#core/dom/layout';
+import {Layout_Enum} from '#core/dom/layout';
 
 /**
  * @fileoverview
@@ -31,7 +31,7 @@ export class WebPushWidget extends AMP.BaseElement {
 
   /** @override */
   isLayoutSupported(layout) {
-    return layout == Layout.FIXED;
+    return layout == Layout_Enum.FIXED;
   }
 
   /** @override */
diff --git a/extensions/amp-web-push/0.1/window-messenger.js b/extensions/amp-web-push/0.1/window-messenger.js
index 89eea5056602..26f65ff6e964 100644
--- a/extensions/amp-web-push/0.1/window-messenger.js
+++ b/extensions/amp-web-push/0.1/window-messenger.js
@@ -72,7 +72,7 @@ export class WindowMessenger {
      * A map of string topic names to callbacks listeners interested in replies
      * to the topic.
      *
-     * @type {(Object<string,Array>|null)}
+     * @type {({[key: string]: Array}|null)}
      */
     this.listeners_ = {};
     this.debug_ = options.debug;
diff --git a/extensions/amp-wistia-player/0.1/amp-wistia-player.js b/extensions/amp-wistia-player/0.1/amp-wistia-player.js
index 9cd213f693e7..805c5f9f2021 100644
--- a/extensions/amp-wistia-player/0.1/amp-wistia-player.js
+++ b/extensions/amp-wistia-player/0.1/amp-wistia-player.js
@@ -21,7 +21,7 @@ import {
   originMatches,
   redispatch,
 } from '../../../src/iframe-video';
-import {VideoEvents} from '../../../src/video-interface';
+import {VideoEvents_Enum} from '../../../src/video-interface';
 
 const TAG = 'amp-wistia-player';
 
@@ -106,7 +106,7 @@ class AmpWistiaPlayer extends AMP.BaseElement {
     const loaded = this.loadPromise(this.iframe_).then(() => {
       // Tell Wistia Player we want to receive messages
       this.listenToFrame_();
-      dispatchCustomEvent(element, VideoEvents.LOAD);
+      dispatchCustomEvent(element, VideoEvents_Enum.LOAD);
     });
 
     this.playerReadyResolver_(loaded);
@@ -167,9 +167,9 @@ class AmpWistiaPlayer extends AMP.BaseElement {
     if (playerEvent === 'statechange') {
       const state = data['args'] ? data['args'][1] : undefined;
       redispatch(element, state, {
-        'playing': VideoEvents.PLAYING,
-        'paused': VideoEvents.PAUSE,
-        'ended': [VideoEvents.PAUSE, VideoEvents.ENDED],
+        'playing': VideoEvents_Enum.PLAYING,
+        'paused': VideoEvents_Enum.PAUSE,
+        'ended': [VideoEvents_Enum.PAUSE, VideoEvents_Enum.ENDED],
       });
       return;
     }
diff --git a/extensions/amp-wordpress-embed/1.0/README.md b/extensions/amp-wordpress-embed/1.0/README.md
index b18a0258a204..4d3997a61740 100644
--- a/extensions/amp-wordpress-embed/1.0/README.md
+++ b/extensions/amp-wordpress-embed/1.0/README.md
@@ -6,9 +6,7 @@ An iframe displaying the [excerpt](https://make.wordpress.org/core/2015/10/28/ne
 
 You must include each Bento component's required CSS library to guarantee proper loading and before adding custom styles. Or use the light-weight pre-upgrade styles available inline. See [Layout and style](#layout-and-style).
 
-The examples below demonstrate use of the `<bento-wordpress-embed>` web component.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/wordpress-embed
@@ -19,45 +17,54 @@ import {defineElement as defineBentoWordpressEmbed} from '@bentoproject/wordpres
 defineBentoWordpressEmbed();
 ```
 
-### Example: Include via `<script>`
+### Include via `<script>`
+
+```html
+<script type="module" src="https://cdn.ampproject.org/bento.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/bento.js" crossorigin="anonymous"></script>
+<script type="module" src="https://cdn.ampproject.org/v0/bento-wordpress-embed-1.0.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/v0/bento-wordpress-embed-1.0.js" crossorigin="anonymous"></script>
+<link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-wordpress-embed-1.0.css" crossorigin="anonymous">
+```
+
+### Example
+
+<!--% example %-->
 
 ```html
-<head>
-  <script src="https://cdn.ampproject.org/bento.js"></script>
-  <!-- These styles prevent Cumulative Layout Shift on the unupgraded custom element -->
-  <style>
-    bento-wordpress-embed {
-      display: block;
-      overflow: hidden;
-      position: relative;
-    }
-  </style>
-  <script
-    async
-    src="https://cdn.ampproject.org/v0/bento-wordpress-embed-1.0.js"
-  ></script>
-</head>
-<bento-wordpress-embed
-  id="my-embed"
-  data-url="https://make.wordpress.org/core/2015/10/28/new-embeds-feature-in-wordpress-4-4/"
-></bento-wordpress-embed>
-<div class="buttons" style="margin-top: 8px">
-  <button id="switch-button">Switch embed</button>
-</div>
-
-<script>
-  (async () => {
-    const embed = document.querySelector('#my-embed');
-    await customElements.whenDefined('bento-wordpress-embed');
-
-    // set up button actions
-    document.querySelector('#switch-button').onclick = () =>
-      embed.setAttribute(
-        'data-url',
-        'https://make.wordpress.org/core/2021/09/09/core-editor-improvement-cascading-impact-of-improvements-to-featured-images/'
-      );
-  })();
-</script>
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-wordpress-embed-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-wordpress-embed-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-wordpress-embed-1.0.css"
+    />
+  </head>
+  <body>
+    <bento-wordpress-embed
+      id="my-embed"
+      style="width: 300px; height: 400px"
+      data-url="https://make.wordpress.org/core/2015/10/28/new-embeds-feature-in-wordpress-4-4/"
+    ></bento-wordpress-embed>
+  </body>
+</html>
 ```
 
 ### Layout and style
@@ -99,15 +106,68 @@ bento-wordpress-embed {
 
 #### data-url (required)
 
-The URL of the post to embed.
+The URL of the post to embed. Programmatically changing the attribute value will automatically update the embedded content.
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-wordpress-embed-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-wordpress-embed-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-wordpress-embed-1.0.css"
+    />
+  </head>
+  <body>
+    <bento-wordpress-embed
+      id="my-embed"
+      style="width: 300px; height: 400px"
+      data-url="https://make.wordpress.org/core/2015/10/28/new-embeds-feature-in-wordpress-4-4/"
+    ></bento-wordpress-embed>
+    <div class="buttons" style="margin-top: 8px">
+      <button id="switch-button">Switch embed</button>
+    </div>
+
+    <script>
+      (async () => {
+        const embed = document.querySelector('#my-embed');
+        await customElements.whenDefined('bento-wordpress-embed');
+
+        // set up button actions
+        document.querySelector('#switch-button').onclick = () =>
+          embed.setAttribute(
+            'data-url',
+            'https://make.wordpress.org/core/2021/09/09/core-editor-improvement-cascading-impact-of-improvements-to-featured-images/'
+          );
+      })();
+    </script>
+  </body>
+</html>
+```
 
 ---
 
 ## Preact/React Component
 
-The examples below demonstrate use of the `<BentoWordPressEmbed>` as a functional component usable with the Preact or React libraries.
-
-### Example: Import via npm
+### Import via npm
 
 ```sh
 npm install @bentoproject/wordpress-embed
diff --git a/extensions/amp-wordpress-embed/1.0/amp-wordpress-embed.js b/extensions/amp-wordpress-embed/1.0/amp-wordpress-embed.js
index 60294f3e9aac..4a9665d168e1 100644
--- a/extensions/amp-wordpress-embed/1.0/amp-wordpress-embed.js
+++ b/extensions/amp-wordpress-embed/1.0/amp-wordpress-embed.js
@@ -1,33 +1,27 @@
-import {dict} from '#core/types/object';
-
-import {isExperimentOn} from '#experiments';
-
-import {userAssert} from '#utils/log';
+import {AmpPreactBaseElement, setSuperClass} from '#preact/amp-base-element';
 
 import {BaseElement} from './base-element';
 
 /** @const {string} */
 const TAG = 'amp-wordpress-embed';
 
-class AmpWordPressEmbed extends BaseElement {
+class AmpWordPressEmbed extends setSuperClass(
+  BaseElement,
+  AmpPreactBaseElement
+) {
   /** @override */
   isLayoutSupported(layout) {
-    userAssert(
-      isExperimentOn(this.win, 'bento') ||
-        isExperimentOn(this.win, 'bento-wordpress-embed'),
-      'expected global "bento" or specific "bento-wordpress-embed" experiment to be enabled'
-    );
     return super.isLayoutSupported(layout);
   }
 
   /** @override */
   init() {
-    return dict({
+    return {
       'requestResize': (height) =>
         this.attemptChangeHeight(height).catch(() => {
           /* ignore failures */
         }),
-    });
+    };
   }
 }
 
diff --git a/extensions/amp-wordpress-embed/1.0/component.js b/extensions/amp-wordpress-embed/1.0/component.js
index 793382146dad..24d5f8925e0e 100644
--- a/extensions/amp-wordpress-embed/1.0/component.js
+++ b/extensions/amp-wordpress-embed/1.0/component.js
@@ -1,5 +1,3 @@
-import {dict} from '#core/types/object';
-
 import * as Preact from '#preact';
 import {forwardRef} from '#preact/compat';
 import {useValueRef} from '#preact/component';
@@ -11,7 +9,7 @@ import {addParamToUrl} from '../../../src/url';
 
 const {useCallback, useEffect, useMemo, useRef, useState} = Preact;
 
-const NO_HEIGHT_STYLE = dict();
+const NO_HEIGHT_STYLE = {};
 
 /**
  * @param {!BentoWordPressEmbedDef.Props} props
@@ -52,7 +50,7 @@ function BentoWordPressEmbedWithRef(
             if (requestResize) {
               requestResize(height);
             }
-            setHeightStyle(dict({'height': height}));
+            setHeightStyle({'height': height});
             setOpacity(1);
           }
 
diff --git a/extensions/amp-wordpress-embed/1.0/example/index.html b/extensions/amp-wordpress-embed/1.0/example/index.html
new file mode 100644
index 000000000000..1e94b6c53a13
--- /dev/null
+++ b/extensions/amp-wordpress-embed/1.0/example/index.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width" />
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-wordpress-embed-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-wordpress-embed-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-wordpress-embed-1.0.css"
+    />
+    <style></style>
+  </head>
+  <body>
+    <bento-wordpress-embed
+      style="width: 300px; height: 400px"
+      data-url="https://make.wordpress.org/core/2015/10/28/new-embeds-feature-in-wordpress-4-4/"
+    ></bento-wordpress-embed>
+  </body>
+</html>
diff --git a/extensions/amp-wordpress-embed/1.0/storybook/Basic.amp.js b/extensions/amp-wordpress-embed/1.0/storybook/Basic.amp.js
index f6aa26ca3116..f688b533a3f7 100644
--- a/extensions/amp-wordpress-embed/1.0/storybook/Basic.amp.js
+++ b/extensions/amp-wordpress-embed/1.0/storybook/Basic.amp.js
@@ -1,35 +1,26 @@
 import {withAmp} from '@ampproject/storybook-addon';
-import {number, text, withKnobs} from '@storybook/addon-knobs';
 
 import * as Preact from '#preact';
 
 export default {
   title: 'amp-wordpress-embed-1_0',
-  decorators: [withKnobs, withAmp],
-
+  decorators: [withAmp],
   parameters: {
     extensions: [{name: 'amp-wordpress-embed', version: '1.0'}],
     experiments: ['bento'],
   },
+  args: {
+    'data-url': 'https://wordpress.org/news/2021/06/gutenberg-highlights',
+    width: 500,
+    height: 200,
+    layout: 'fixed',
+  },
 };
 
-export const BasicEmbedExample = () => {
-  const url = text(
-    'url',
-    'https://wordpress.org/news/2021/06/gutenberg-highlights'
-  );
-  const width = number('width', 500);
-  const height = number('height', 200);
-  const layout = text('layout', 'fixed');
-
+export const BasicEmbedExample = (args) => {
   return (
     <>
-      <amp-wordpress-embed
-        data-url={url}
-        width={width}
-        height={height}
-        layout={layout}
-      >
+      <amp-wordpress-embed {...args}>
         <button overflow>Load more</button>
       </amp-wordpress-embed>
       <p>text below</p>
@@ -37,23 +28,10 @@ export const BasicEmbedExample = () => {
   );
 };
 
-export const WithPlaceholderAndFallback = () => {
-  const url = text(
-    'url',
-    'https://wordpress.org/news/2021/06/gutenberg-highlights'
-  );
-  const width = number('width', 500);
-  const height = number('height', 200);
-  const layout = text('layout', 'fixed');
-
+export const WithPlaceholderAndFallback = (args) => {
   return (
     <>
-      <amp-wordpress-embed
-        data-url={url}
-        width={width}
-        height={height}
-        layout={layout}
-      >
+      <amp-wordpress-embed {...args}>
         <div placeholder style="background:red">
           Placeholder. Loading content...
         </div>
@@ -66,7 +44,3 @@ export const WithPlaceholderAndFallback = () => {
     </>
   );
 };
-
-BasicEmbedExample.story = {
-  name: 'Basic example',
-};
diff --git a/extensions/amp-wordpress-embed/1.0/test-e2e/test-bento-wordpress-embed.js b/extensions/amp-wordpress-embed/1.0/test-e2e/test-bento-wordpress-embed.js
deleted file mode 100644
index e51e51ec7a00..000000000000
--- a/extensions/amp-wordpress-embed/1.0/test-e2e/test-bento-wordpress-embed.js
+++ /dev/null
@@ -1,26 +0,0 @@
-describes.endtoend(
-  'bento-wordpress-embed',
-  {
-    version: '1.0',
-    fixture: 'bento/wordpress-embed.html',
-    environments: ['single'],
-  },
-  (env) => {
-    let controller;
-
-    beforeEach(() => {
-      controller = env.controller;
-    });
-
-    it('should render a content from wordpress', async () => {
-      const element = await controller.findElement('bento-wordpress-embed');
-      await controller.switchToShadowRoot(element);
-
-      const iframe = await controller.findElement('iframe');
-
-      await expect(controller.getElementAttribute(iframe, 'src')).to.equal(
-        'https://wordpress.org/news/2021/10/episode-18-the-economics-of-wordpress/?embed=true'
-      );
-    });
-  }
-);
diff --git a/extensions/amp-wordpress-embed/OWNERS b/extensions/amp-wordpress-embed/OWNERS
index 684d3faef4ae..862aa1cfab15 100644
--- a/extensions/amp-wordpress-embed/OWNERS
+++ b/extensions/amp-wordpress-embed/OWNERS
@@ -5,7 +5,6 @@
   rules: [
     {
       owners: [
-        {name: 'ampproject/wg-bento'},
         {name: 'westonruter', notify: true},
         {name: 'ediamin', notify: true},
       ],
diff --git a/extensions/amp-youtube/0.1/amp-youtube.js b/extensions/amp-youtube/0.1/amp-youtube.js
index 72c4750ca841..44bdb651d438 100644
--- a/extensions/amp-youtube/0.1/amp-youtube.js
+++ b/extensions/amp-youtube/0.1/amp-youtube.js
@@ -14,7 +14,6 @@ import {propagateAttributes} from '#core/dom/propagate-attributes';
 import {htmlFor} from '#core/dom/static-template';
 import {setStyles} from '#core/dom/style';
 import {PauseHelper} from '#core/dom/video/pause-helper';
-import {dict} from '#core/types/object';
 
 import {Services} from '#service';
 import {installVideoManagerForDoc} from '#service/video-manager-impl';
@@ -32,7 +31,7 @@ import {
   redispatch,
 } from '../../../src/iframe-video';
 import {addParamsToUrl} from '../../../src/url';
-import {VideoEvents} from '../../../src/video-interface';
+import {VideoEvents_Enum} from '../../../src/video-interface';
 
 const TAG = 'amp-youtube';
 
@@ -116,8 +115,6 @@ class AmpYoutube extends AMP.BaseElement {
     const preconnect = Services.preconnectFor(this.win);
     const ampdoc = this.getAmpDoc();
     preconnect.url(ampdoc, this.getVideoIframeSrc_());
-    // Host that YT uses to serve JS needed by player.
-    preconnect.url(ampdoc, 'https://s.ytimg.com', opt_onLayout);
     // Load high resolution placeholder images for videos in prerender mode.
     preconnect.url(ampdoc, 'https://i.ytimg.com', opt_onLayout);
   }
@@ -247,7 +244,7 @@ class AmpYoutube extends AMP.BaseElement {
 
     this.iframe_ = iframe;
 
-    // Listening for VideoEvents.LOAD in AutoFullscreenManager.register may
+    // Listening for VideoEvents_Enum.LOAD in AutoFullscreenManager.register may
     // introduce race conditions which may break elements e.g. amp-ima-video
     Services.videoManagerForDoc(this.element).register(this);
 
@@ -260,7 +257,7 @@ class AmpYoutube extends AMP.BaseElement {
     if (this.isLoop_ && !this.isPlaylist_) {
       this.unlistenLooping_ = listen(
         this.element,
-        VideoEvents.ENDED,
+        VideoEvents_Enum.ENDED,
         (unusedEvent) => this.play(false /** unusedIsAutoplay */)
       );
     }
@@ -277,7 +274,7 @@ class AmpYoutube extends AMP.BaseElement {
       .then(() => {
         // Tell YT that we want to receive messages
         this.listenToFrame_();
-        dispatchCustomEvent(this.element, VideoEvents.LOAD);
+        dispatchCustomEvent(this.element, VideoEvents_Enum.LOAD);
       });
     this.playerReadyResolver_(loaded);
     return loaded;
@@ -374,13 +371,11 @@ class AmpYoutube extends AMP.BaseElement {
   sendCommand_(command, opt_args) {
     this.playerReadyPromise_.then(() => {
       if (this.iframe_ && this.iframe_.contentWindow) {
-        const message = JSON.stringify(
-          dict({
-            'event': 'command',
-            'func': command,
-            'args': opt_args || '',
-          })
-        );
+        const message = JSON.stringify({
+          'event': 'command',
+          'func': command,
+          'args': opt_args || '',
+        });
         this.iframe_.contentWindow./*OK*/ postMessage(message, '*');
       }
     });
@@ -422,10 +417,10 @@ class AmpYoutube extends AMP.BaseElement {
       }
 
       redispatch(element, playerState.toString(), {
-        [PlayerStates.PLAYING]: VideoEvents.PLAYING,
-        [PlayerStates.PAUSED]: VideoEvents.PAUSE,
+        [PlayerStates.PLAYING]: VideoEvents_Enum.PLAYING,
+        [PlayerStates.PAUSED]: VideoEvents_Enum.PAUSE,
         // YT does not fire pause and ended together.
-        [PlayerStates.ENDED]: [VideoEvents.ENDED, VideoEvents.PAUSE],
+        [PlayerStates.ENDED]: [VideoEvents_Enum.ENDED, VideoEvents_Enum.PAUSE],
       });
       return;
     }
@@ -442,7 +437,7 @@ class AmpYoutube extends AMP.BaseElement {
 
     if (eventType == 'initialDelivery') {
       this.info_ = info;
-      dispatchCustomEvent(element, VideoEvents.LOADEDMETADATA);
+      dispatchCustomEvent(element, VideoEvents_Enum.LOADEDMETADATA);
       return;
     }
 
@@ -461,11 +456,9 @@ class AmpYoutube extends AMP.BaseElement {
       return;
     }
     this.iframe_.contentWindow./*OK*/ postMessage(
-      JSON.stringify(
-        dict({
-          'event': 'listening',
-        })
-      ),
+      JSON.stringify({
+        'event': 'listening',
+      }),
       '*'
     );
   }
diff --git a/extensions/amp-youtube/0.1/storybook/Basic.amp.js b/extensions/amp-youtube/0.1/storybook/Basic.amp.js
index d8abfc23092f..6571d98f7bdc 100644
--- a/extensions/amp-youtube/0.1/storybook/Basic.amp.js
+++ b/extensions/amp-youtube/0.1/storybook/Basic.amp.js
@@ -1,19 +1,20 @@
 import {withAmp} from '@ampproject/storybook-addon';
-import {text, withKnobs} from '@storybook/addon-knobs';
 
 import * as Preact from '#preact';
 
 export default {
   title: 'amp-youtube-0_1',
-  decorators: [withKnobs, withAmp],
+  decorators: [withAmp],
 
   parameters: {
     extensions: [{name: 'amp-youtube', version: 0.1}],
   },
+  args: {
+    videoId: 'mGENRKrdoGY',
+  },
 };
 
-export const Default = () => {
-  const videoId = text('Video ID', 'mGENRKrdoGY');
+export const Default = ({videoId}) => {
   return (
     <amp-youtube
       data-videoid={videoId}
@@ -26,8 +27,7 @@ export const Default = () => {
 
 Default.storyName = 'default';
 
-export const Responsive = () => {
-  const videoId = text('Video ID', 'mGENRKrdoGY');
+export const Responsive = ({videoId}) => {
   return (
     <amp-youtube
       data-videoid={videoId}
@@ -40,8 +40,7 @@ export const Responsive = () => {
 
 Responsive.storyName = 'responsive';
 
-export const Autoplay = () => {
-  const videoId = text('Video ID', 'mGENRKrdoGY');
+export const Autoplay = ({videoId}) => {
   return (
     <amp-youtube
       data-videoid={videoId}
diff --git a/extensions/amp-youtube/0.1/test/test-amp-youtube.js b/extensions/amp-youtube/0.1/test/test-amp-youtube.js
index eb0b3aad962a..8cb1570af503 100644
--- a/extensions/amp-youtube/0.1/test/test-amp-youtube.js
+++ b/extensions/amp-youtube/0.1/test/test-amp-youtube.js
@@ -5,7 +5,7 @@ import {listenOncePromise} from '#utils/event-helper';
 
 import {installResizeObserverStub} from '#testing/resize-observer-stub';
 
-import {VideoEvents} from '../../../../src/video-interface';
+import {VideoEvents_Enum} from '../../../../src/video-interface';
 
 const EXAMPLE_VIDEOID = 'mGENRKrdoGY';
 const EXAMPLE_LIVE_CHANNELID = 'UCB8Kb4pxYzsDsHxzBfnid4Q';
@@ -169,28 +169,28 @@ describes.realWin(
         const yt = await getYt({'data-videoid': datasource});
         const iframe = yt.querySelector('iframe');
         await Promise.resolve();
-        const p1 = listenOncePromise(yt, VideoEvents.MUTED);
+        const p1 = listenOncePromise(yt, VideoEvents_Enum.MUTED);
         await sendFakeInfoDeliveryMessage(yt, iframe, {muted: true});
         await p1;
-        const p2 = listenOncePromise(yt, VideoEvents.PLAYING);
+        const p2 = listenOncePromise(yt, VideoEvents_Enum.PLAYING);
         await sendFakeInfoDeliveryMessage(yt, iframe, {playerState: 1});
         await p2;
-        const p3 = listenOncePromise(yt, VideoEvents.PAUSE);
+        const p3 = listenOncePromise(yt, VideoEvents_Enum.PAUSE);
         await sendFakeInfoDeliveryMessage(yt, iframe, {playerState: 2});
         await p3;
-        const p4 = listenOncePromise(yt, VideoEvents.UNMUTED);
+        const p4 = listenOncePromise(yt, VideoEvents_Enum.UNMUTED);
         await sendFakeInfoDeliveryMessage(yt, iframe, {muted: false});
         await p4;
         // Should not send the unmute event twice if already sent once.
-        const p5 = listenOncePromise(yt, VideoEvents.UNMUTED).then(() => {
+        const p5 = listenOncePromise(yt, VideoEvents_Enum.UNMUTED).then(() => {
           assert.fail('Should not have dispatch unmute message twice');
         });
         await sendFakeInfoDeliveryMessage(yt, iframe, {muted: false});
         const successTimeout = timer.promise(10);
         await Promise.race([p5, successTimeout]);
         // Make sure pause and end are triggered when video ends.
-        const pEnded = listenOncePromise(yt, VideoEvents.ENDED);
-        const pPause = listenOncePromise(yt, VideoEvents.PAUSE);
+        const pEnded = listenOncePromise(yt, VideoEvents_Enum.ENDED);
+        const pPause = listenOncePromise(yt, VideoEvents_Enum.PAUSE);
         await sendFakeInfoDeliveryMessage(yt, iframe, {playerState: 0});
         return Promise.all([pEnded, pPause]);
       });
diff --git a/extensions/amp-youtube/1.0/README.md b/extensions/amp-youtube/1.0/README.md
new file mode 100644
index 000000000000..2e4296e40feb
--- /dev/null
+++ b/extensions/amp-youtube/1.0/README.md
@@ -0,0 +1,546 @@
+# Bento Youtube
+
+Embeds [Youtube](https://youtube.com) videos.
+
+## Web Component
+
+You must include each Bento component's required CSS library to guarantee proper loading and before adding custom styles. Or use the light-weight pre-upgrade styles available inline. See [Layout and style](#layout-and-style).
+
+### Import via npm
+
+```sh
+npm install @bentoproject/youtube
+```
+
+```javascript
+import {defineElement as defineBentoYoutube} from '@bentoproject/youtube';
+defineBentoYoutube();
+```
+
+### Include via `<script>`
+
+```html
+<script type="module" src="https://cdn.ampproject.org/bento.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/bento.js" crossorigin="anonymous"></script>
+<script type="module" src="https://cdn.ampproject.org/v0/bento-youtube-1.0.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/v0/bento-youtube-1.0.js" crossorigin="anonymous"></script>
+<link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-youtube-1.0.css" crossorigin="anonymous">
+```
+
+### Example
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-youtube-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-youtube-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-youtube-1.0.css"
+    />
+    <style>
+      bento-youtube {
+        width: 320px;
+        height: 180px;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-youtube data-videoid="dQw4w9WgXcQ"></bento-youtube>
+  </body>
+</html>
+```
+
+### Layout and style
+
+Each Bento component has a small CSS library you must include to guarantee proper loading without [content shifts](https://web.dev/cls/). Because of order-based specificity, you must manually ensure that stylesheets are included before any custom styles.
+
+```html
+<link
+  rel="stylesheet"
+  type="text/css"
+  href="https://cdn.ampproject.org/v0/bento-youtube-1.0.css"
+/>
+```
+
+Alternatively, you may also make the light-weight pre-upgrade styles available inline:
+
+```html
+<style>
+  bento-youtube {
+    display: block;
+    overflow: hidden;
+    position: relative;
+  }
+</style>
+```
+
+#### Container type
+
+The `bento-youtube` component has a defined layout size type. To ensure the component renders correctly, be sure to apply a size to the component and its immediate children (slides) via a desired CSS layout (such as one defined with `height`, `width`, `aspect-ratio`, or other such properties):
+
+```css
+bento-youtube {
+  height: 100px;
+  width: 100%;
+}
+```
+
+### Attributes
+
+#### autoplay
+
+If this attribute is present, and the browser supports autoplay:
+
+<ul>
+  <li>
+    the video is automatically muted before autoplay starts
+  </li>
+  <li>
+    when the video is scrolled out of view, the video is paused
+  </li>
+  <li>
+    when the video is scrolled into view, the video resumes playback
+  </li>
+  <li>
+    when the user taps the video, the video is unmuted
+  </li>
+  <li>
+    if the user has interacted with the video (e.g., mutes/unmutes, pauses/resumes, etc.), and the video is scrolled in or out of view, the state of the video remains as how the user left it. For example, if the user pauses the video, then scrolls the video out of view and returns to the video, the video is still paused.
+  </li>
+</ul>
+
+#### loop
+
+If this attribute is present, the video or playlist will play again (from the beginning) once it ends.
+
+#### data-videoid
+
+The YouTube video id found in every YouTube video page URL.
+
+For example, in this URL: `https://www.youtube.com/watch?v=Z1q71gFeRqM`, `Z1q71gFeRqM` is the video id.
+
+#### data-live-channelid
+
+The Youtube channel id that provides a stable livestream url. For example, in this URL: `https://www.youtube.com/embed/live_stream?channel=UCB8Kb4pxYzsDsHxzBfnid4Q`, `UCB8Kb4pxYzsDsHxzBfnid4Q` is the channel id. You can provide a `data-live-channelid` instead of a `data-videoid` attribute to embed a stable url for a live stream instead of a video. Channels do not come with default placeholders. You can provide a placeholder for the video per example 2 above.
+
+#### data-param-\*
+
+All `data-param-*` attributes (with the exception of `data-param-autoplay` and `data-param-loop`) will be added as query parameter to the YouTube iframe src. This may be used to pass custom values through to YouTube plugins, such as whether to show controls.
+
+Keys and values will be URI encoded. Keys will be camel cased.
+
+See [YouTube Embedded Player Parameters](https://developers.google.com/youtube/player_parameters) for more parameter options for YouTube.
+
+#### credentials (optional)
+
+Defines a `credentials` option as specified by the [Fetch API](https://fetch.spec.whatwg.org/) (`omit` or `include`).
+
+If you want to use the [YouTube player in privacy-enhanced mode](http://www.google.com/support/youtube/bin/answer.py?answer=141046), pass the value of `omit`.
+
+Usually YouTube sets its cookies when the player is loaded. In privacy-enhanced mode cookies are set when the user has clicked on the player.
+
+#### title (optional)
+
+Defines a `title` attribute for the component to propagate to the underlying `<iframe>` element. The default value is `"YouTube video"`.
+
+#### Interactivity and API usage
+
+The `bento-youtube` component API is accessible by including the following script tag in your document:
+
+```javascript
+await customElements.whenDefined('bento-youtube');
+const api = await video.getApi();
+```
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-youtube-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-youtube-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-youtube-1.0.css"
+    />
+    <style>
+      bento-youtube {
+        width: 320px;
+        height: 180px;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-youtube id="my-video" data-videoid="dQw4w9WgXcQ">
+    </bento-youtube>
+    <p>
+      <button id="play">Play</button>
+      <button id="pause">Pause</button>
+      <button id="mute">Mute</button>
+      <button id="unmute">Unmute</button>
+    </p>
+    <script>
+      (async () => {
+        await customElements.whenDefined('amp-youtube');
+
+        const video = document.querySelector('#my-video');
+        const api = await video.getApi();
+
+        document.querySelector('#play').onclick = () => {
+          api.play();
+        };
+        document.querySelector('#pause').onclick = () => {
+          api.pause();
+        };
+        document.querySelector('#mute').onclick = () => {
+          api.mute();
+        };
+        document.querySelector('#unmute').onclick = () => {
+          api.unmute();
+        };
+      })();
+    </script>
+  </body>
+</html>
+```
+
+#### Actions
+
+The `bento-youtube` API allows you to perform the following actions:
+
+##### `play()`
+
+Plays the video.
+
+```js
+api.play();
+```
+
+##### `pause()`
+
+Pauses the video.
+
+```js
+api.pause();
+```
+
+##### `mute()`
+
+Mutes the video.
+
+```js
+api.mute();
+```
+
+##### `unmute()`
+
+Unmutes the video.
+
+```js
+api.unmute();
+```
+
+##### `requestFullscreen()`
+
+Expands the video to fullscreen when possible.
+
+```js
+api.requestFullscreen();
+```
+
+#### Properties
+
+It also exposes the following read-only properties:
+
+##### `currentTime` (`number`)
+
+The current playback time in seconds.
+
+```js
+console.log(api.currentTime);
+```
+
+##### `duration` (`number`)
+
+The video's duration in seconds, when it's known (e.g. is not a livestream).
+
+```js
+console.log(api.duration);
+```
+
+##### `autoplay` (`boolean`)
+
+Whether the video autoplays.
+
+```js
+console.log(api.autoplay);
+```
+
+##### `controls` (`boolean`)
+
+Whether the video shows controls.
+
+```js
+console.log(api.controls);
+```
+
+##### `loop` (`boolean`)
+
+Whether the video loops.
+
+```js
+console.log(api.loop);
+```
+
+---
+
+## Preact/React Component
+
+### Import via npm
+
+```sh
+npm install @bentoproject/youtube
+```
+
+```javascript
+import React from 'react';
+import {BentoYoutube} from '@bentoproject/youtube/react';
+import '@bentoproject/youtube/styles.css';
+
+function App() {
+  return <BentoYoutube videoid="dQw4w9WgXcQ" />;
+}
+```
+
+### Layout and style
+
+#### Container type
+
+The `BentoYoutube` component has a defined layout size type. To ensure the component renders correctly, be sure to apply a size to the component and its immediate children (slides) via a desired CSS layout (such as one defined with `height`, `width`, `aspect-ratio`, or other such properties). These can be applied inline:
+
+```jsx
+<BentoYoutube
+  style={{width: 320, height: 180}}
+  videoid="dQw4w9WgXcQ"
+/>
+```
+
+Or via `className`:
+
+```jsx
+<BentoYoutube
+  className="custom-styles"
+  videoid="dQw4w9WgXcQ"
+/>
+```
+
+```css
+.custom-styles {
+  height: 320px;
+  width: 180px;
+}
+```
+
+You may use `aspect-ratio` to size it responsively:
+
+```css
+.custom-styles {
+  aspect-ratio: 16/9;
+}
+```
+
+### Props
+
+#### autoplay
+
+If this prop is true, and the browser supports autoplay:
+
+<ul>
+  <li>
+    the video is automatically muted before autoplay starts
+  </li>
+  <li>
+    when the video is scrolled out of view, the video is paused
+  </li>
+  <li>
+    when the video is scrolled into view, the video resumes playback
+  </li>
+  <li>
+    when the user taps the video, the video is unmuted
+  </li>
+  <li>
+    if the user has interacted with the video (e.g., mutes/unmutes, pauses/resumes, etc.), and the video is scrolled in or out of view, the state of the video remains as how the user left it. For example, if the user pauses the video, then scrolls the video out of view and returns to the video, the video is still paused.
+  </li>
+</ul>
+
+#### loop
+
+If this prop is true, the video or playlist will play again (from the beginning) once it ends.
+
+#### videoid
+
+The YouTube video id found in every YouTube video page URL.
+
+For example, in this URL: `https://www.youtube.com/watch?v=Z1q71gFeRqM`, `Z1q71gFeRqM` is the video id.
+
+#### liveChannelid
+
+The Youtube channel id that provides a stable livestream url. For example, in this URL: `https://www.youtube.com/embed/live_stream?channel=UCB8Kb4pxYzsDsHxzBfnid4Q`, `UCB8Kb4pxYzsDsHxzBfnid4Q` is the channel id. You can provide a `liveChannelid` prop instead of a `videoid` prop to embed a stable url for a live stream instead of a video. Channels do not come with default placeholders. You can provide a placeholder for the video per example 2 above.
+
+#### params
+
+All fields in this object (with the exception of <code>autoplay</code> and <code>loop</code>) will be added as query parameters to the YouTube iframe src. This may be used to pass custom values through to YouTube plugins, such as whether to show controls.
+
+Keys and values will be URI encoded. Keys must be camel cased.
+
+See [YouTube Embedded Player Parameters](https://developers.google.com/youtube/player_parameters) for more parameter options for YouTube.
+
+#### credentials (optional)
+
+Defines a `credentials` option as specified by the [Fetch API](https://fetch.spec.whatwg.org/) (`omit` or `include`).
+
+If you want to use the [YouTube player in privacy-enhanced mode](http://www.google.com/support/youtube/bin/answer.py?answer=141046), pass the value of `omit`.
+
+Usually YouTube sets its cookies when the player is loaded. In privacy-enhanced mode cookies are set when the user has clicked on the player.
+
+#### title (optional)
+
+Defines a `title` attribute for the component to propagate to the underlying `<iframe>` element. The default value is `"YouTube video"`.
+
+### Interactivity and API usage
+
+The `BentoYoutube` component API is accessible by passing a `ref`:
+
+```javascript
+import React, {createRef} from 'react';
+
+function App() {
+  const ref = createRef();
+  return (
+    <BentoYoutube ref={ref} />
+  );
+}
+```
+
+#### Actions
+
+The `BentoYoutube` API allows you to perform the following actions:
+
+##### `play()`
+
+Plays the video.
+
+```js
+ref.current.play();
+```
+
+##### `pause()`
+
+Pauses the video.
+
+```js
+ref.current.pause();
+```
+
+##### `mute()`
+
+Mutes the video.
+
+```js
+ref.current.mute();
+```
+
+##### `unmute()`
+
+Unmutes the video.
+
+```js
+ref.current.unmute();
+```
+
+##### `requestFullscreen()`
+
+Expands the video to fullscreen when possible.
+
+```js
+ref.current.requestFullscreen();
+```
+
+#### Properties
+
+It also exposes the following read-only properties:
+
+##### `currentTime` (`number`)
+
+The current playback time in seconds.
+
+```js
+console.log(ref.current.currentTime);
+```
+
+##### `duration` (`number`)
+
+The video's duration in seconds, when it's known (e.g. is not a livestream).
+
+```js
+console.log(ref.current.duration);
+```
+
+##### `autoplay` (`boolean`)
+
+Whether the video autoplays.
+
+```js
+console.log(ref.current.autoplay);
+```
+
+##### `controls` (`boolean`)
+
+Whether the video shows controls.
+
+```js
+console.log(ref.current.controls);
+```
+
+##### `loop` (`boolean`)
+
+Whether the video loops.
+
+```js
+console.log(ref.current.loop);
+```
diff --git a/extensions/amp-youtube/1.0/amp-youtube.js b/extensions/amp-youtube/1.0/amp-youtube.js
index 8a356f3082be..10dd40fe7abf 100644
--- a/extensions/amp-youtube/1.0/amp-youtube.js
+++ b/extensions/amp-youtube/1.0/amp-youtube.js
@@ -1,15 +1,18 @@
+import {AmpVideoBaseElement} from '#bento/components/bento-video/1.0/video-base-element';
+import {BaseElement} from '#bento/components/bento-youtube/1.0/base-element';
+
 import {isExperimentOn} from '#experiments';
 
-import {userAssert} from '#utils/log';
+import {setSuperClass} from '#preact/amp-base-element';
 
-import {BaseElement} from './base-element';
+import {userAssert} from '#utils/log';
 
 import {CSS} from '../../../build/amp-youtube-1.0.css';
 
 /** @const {string} */
 const TAG = 'amp-youtube';
 
-class AmpYoutube extends BaseElement {
+class AmpYoutube extends setSuperClass(BaseElement, AmpVideoBaseElement) {
   /** @override */
   isLayoutSupported(layout) {
     userAssert(
diff --git a/extensions/amp-youtube/1.0/base-element.js b/extensions/amp-youtube/1.0/base-element.js
deleted file mode 100644
index 17614d90558d..000000000000
--- a/extensions/amp-youtube/1.0/base-element.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import {BentoYoutube} from './component';
-
-import {VideoBaseElement} from '../../amp-video/1.0/video-base-element';
-
-export class BaseElement extends VideoBaseElement {}
-
-/** @override */
-BaseElement['Component'] = BentoYoutube;
-
-/** @override */
-BaseElement['props'] = {
-  'autoplay': {attr: 'autoplay', type: 'boolean'},
-  'loop': {attr: 'loop', type: 'boolean'},
-  'controls': {attr: 'controls', type: 'boolean'},
-  'videoid': {attr: 'data-videoid'},
-  'liveChannelid': {attr: 'data-live-channelid'},
-  'dock': {attr: 'dock', media: true},
-  'credentials': {attr: 'credentials'},
-  'params': {attrPrefix: 'data-param-'},
-};
-
-/** @override */
-BaseElement['usesShadowDom'] = true;
diff --git a/extensions/amp-youtube/1.0/component.js b/extensions/amp-youtube/1.0/component.js
deleted file mode 100644
index 6264f0ad30f1..000000000000
--- a/extensions/amp-youtube/1.0/component.js
+++ /dev/null
@@ -1,252 +0,0 @@
-import {dispatchCustomEvent} from '#core/dom';
-import {dict} from '#core/types/object';
-
-import * as Preact from '#preact';
-import {useRef} from '#preact';
-import {forwardRef} from '#preact/compat';
-
-import {mutedOrUnmutedEvent, objOrParseJson} from '../../../src/iframe-video';
-import {addParamsToUrl} from '../../../src/url';
-import {VideoEvents} from '../../../src/video-interface';
-import {VideoIframe} from '../../amp-video/1.0/video-iframe';
-
-// Correct PlayerStates taken from
-// https://developers.google.com/youtube/iframe_api_reference#Playback_status
-/**
- * @enum {string}
- * @private
- */
-const PlayerStates = {
-  '-1': 'unstarted',
-  '0': 'ended',
-  '1': 'playing',
-  '2': 'pause',
-  '3': 'buffering',
-  '5': 'video_cued',
-};
-
-/**
- * @enum {string}
- * @private
- */
-const methods = {
-  'play': 'playVideo',
-  'pause': 'pauseVideo',
-  'mute': 'mute',
-  'unmute': 'unMute',
-};
-
-/**
- * @enum {number}
- * @private
- */
-const PlayerFlags = {
-  // Config to tell YouTube to hide annotations by default
-  HIDE_ANNOTATION: 3,
-};
-
-/** @const {!../../../src/core/dom.CustomEventOptionsDef} */
-const VIDEO_EVENT_OPTIONS = {bubbles: false, cancelable: false};
-
-/**
- * Created once per component mount.
- * The fields returned can be overridden by `infoDelivery` messages.
- * @return {!JsonObject}
- */
-function createDefaultInfo() {
-  return dict({
-    'currentTime': 0,
-    'duration': NaN,
-  });
-}
-
-/**
- * @param {!YoutubeProps} props
- * @param {{current: ?T}} ref
- * @return {PreactDef.Renderable}
- * @template T
- */
-function BentoYoutubeWithRef(
-  {
-    autoplay,
-    loop,
-    videoid,
-    liveChannelid,
-    onLoad,
-    params = {},
-    credentials,
-    ...rest
-  },
-  ref
-) {
-  const datasourceExists =
-    !(videoid && liveChannelid) && (videoid || liveChannelid);
-
-  if (!datasourceExists) {
-    throw new Error(
-      'Exactly one of data-videoid or data-live-channelid should be present for <amp-youtube>'
-    );
-  }
-
-  let src = getEmbedUrl(credentials, videoid, liveChannelid);
-  if (!('playsinline' in params)) {
-    params['playsinline'] = '1';
-  }
-  if ('autoplay' in params) {
-    delete params['autoplay'];
-    autoplay = true;
-  }
-
-  if (autoplay) {
-    if (!('iv_load_policy' in params)) {
-      params['iv_load_policy'] = `${PlayerFlags.HIDE_ANNOTATION}`;
-    }
-
-    // Inline play must be set for autoplay regardless of original value.
-    params['playsinline'] = '1';
-  }
-
-  if ('loop' in params) {
-    loop = true;
-    delete params['loop'];
-  }
-
-  if (loop) {
-    if ('playlist' in params) {
-      params['loop'] = '1';
-    } else if ('loop' in params) {
-      delete params['loop'];
-    }
-  }
-
-  src = addParamsToUrl(src, params);
-
-  // Player state. Includes `currentTime` and `duration`.
-  const playerStateRef = useRef();
-  if (!playerStateRef.current) {
-    playerStateRef.current = createDefaultInfo();
-  }
-
-  const onMessage = ({currentTarget, data}) => {
-    const parsedData = objOrParseJson(data);
-    if (!parsedData) {
-      return;
-    }
-
-    const {'event': event, 'info': parsedInfo} = parsedData;
-
-    if (event == 'initialDelivery') {
-      dispatchVideoEvent(currentTarget, VideoEvents.LOADEDMETADATA);
-      onLoad?.();
-      return;
-    }
-
-    if (!parsedInfo) {
-      return;
-    }
-
-    const info = playerStateRef.current;
-    for (const key in info) {
-      if (parsedInfo[key] != null) {
-        info[key] = parsedInfo[key];
-      }
-    }
-
-    const playerState = parsedInfo['playerState'];
-    if (event == 'infoDelivery' && playerState == 0 && loop) {
-      currentTarget.contentWindow./*OK*/ postMessage(
-        JSON.stringify(
-          dict({
-            'event': 'command',
-            'func': 'playVideo',
-          })
-        ),
-        '*'
-      );
-    }
-    if (event == 'infoDelivery' && playerState != undefined) {
-      dispatchVideoEvent(currentTarget, PlayerStates[playerState.toString()]);
-    }
-    if (event == 'infoDelivery' && parsedInfo['muted']) {
-      dispatchVideoEvent(
-        currentTarget,
-        mutedOrUnmutedEvent(parsedInfo['muted'])
-      );
-      return;
-    }
-  };
-
-  return (
-    <VideoIframe
-      ref={ref}
-      {...rest}
-      autoplay={autoplay}
-      src={src}
-      onMessage={onMessage}
-      makeMethodMessage={makeMethodMessage}
-      onIframeLoad={(event) => {
-        const {currentTarget} = event;
-        dispatchVideoEvent(currentTarget, 'canplay');
-        currentTarget.contentWindow./*OK*/ postMessage(
-          JSON.stringify(
-            dict({
-              'event': 'listening',
-            })
-          ),
-          '*'
-        );
-      }}
-      sandbox="allow-scripts allow-same-origin allow-presentation"
-      playerStateRef={playerStateRef}
-    />
-  );
-}
-
-/**
- * @param {string} credentials
- * @param {string} videoid
- * @param {string} liveChannelid
- * @return {string}
- * @private
- */
-function getEmbedUrl(credentials, videoid, liveChannelid) {
-  let urlSuffix = '';
-  if (credentials === 'omit') {
-    urlSuffix = '-nocookie';
-  }
-  const baseUrl = `https://www.youtube${urlSuffix}.com/embed/`;
-  let descriptor = '';
-  if (videoid) {
-    descriptor = `${encodeURIComponent(videoid)}?`;
-  } else {
-    descriptor = `live_stream?channel=${encodeURIComponent(
-      liveChannelid || ''
-    )}&`;
-  }
-  return `${baseUrl}${descriptor}enablejsapi=1&amp=1`;
-}
-
-/**
- * @param {!HTMLIFrameElement} currentTarget
- * @param {string} name
- */
-function dispatchVideoEvent(currentTarget, name) {
-  dispatchCustomEvent(currentTarget, name, null, VIDEO_EVENT_OPTIONS);
-}
-
-/**
- * @param {string} method
- * @return {!Object|string}
- */
-function makeMethodMessage(method) {
-  return JSON.stringify(
-    dict({
-      'event': 'command',
-      'func': methods[method],
-    })
-  );
-}
-
-const BentoYoutube = forwardRef(BentoYoutubeWithRef);
-BentoYoutube.displayName = 'BentoYoutube'; // Make findable for tests.
-export {BentoYoutube};
diff --git a/extensions/amp-youtube/1.0/storybook/Basic.amp.js b/extensions/amp-youtube/1.0/storybook/Basic.amp.js
index 02cff9fbaa40..464262b95825 100644
--- a/extensions/amp-youtube/1.0/storybook/Basic.amp.js
+++ b/extensions/amp-youtube/1.0/storybook/Basic.amp.js
@@ -1,5 +1,4 @@
 import {withAmp} from '@ampproject/storybook-addon';
-import {boolean, number, text, withKnobs} from '@storybook/addon-knobs';
 
 import * as Preact from '#preact';
 
@@ -7,7 +6,7 @@ import {VideoElementWithActions} from '../../../amp-video/1.0/storybook/_helpers
 
 export default {
   title: 'amp-youtube-1_0',
-  decorators: [withKnobs, withAmp],
+  decorators: [withAmp],
   parameters: {
     extensions: [
       {name: 'amp-youtube', version: '1.0'},
@@ -15,100 +14,55 @@ export default {
     ],
     experiments: ['bento'],
   },
+  args: {
+    videoid: 'IAvf-rkzNck',
+    layout: 'responsive',
+    autoplay: false,
+    loop: false,
+    width: 300,
+    height: 300,
+    credentials: 'include',
+  },
 };
 
-export const Default = ({id}) => {
-  const videoid = text('videoid', 'IAvf-rkzNck');
-  const layout = text('layout', 'responsive');
-  const autoplay = boolean('autoplay', false);
-  const loop = boolean('loop', false);
-  const width = number('width', 300);
-  const height = number('height', 200);
-  const credentials = text('credentials', 'include');
-  return (
-    <amp-youtube
-      id={id}
-      width={width}
-      height={height}
-      data-videoid={videoid}
-      layout={layout}
-      autoplay={autoplay}
-      loop={loop}
-      credentials={credentials}
-    ></amp-youtube>
-  );
+export const Default = ({id, videoid, ...args}) => {
+  return <amp-youtube id={id} data-videoid={videoid} {...args}></amp-youtube>;
 };
 
-export const Actions = () => {
+export const Actions = ({...args}) => {
   const id = 'my-amp-youtube';
   return (
     <VideoElementWithActions id={id}>
-      <Default id={id} />
+      <Default id={id} {...args} />
     </VideoElementWithActions>
   );
 };
 
-export const InsideAccordion = () => {
-  const videoid = text('videoid', 'IAvf-rkzNck');
-  const width = number('width', 300);
-  const height = number('height', 200);
-  const autoplay = boolean('autoplay', false);
+export const InsideAccordion = ({videoid, ...args}) => {
   return (
     <amp-accordion expand-single-section>
       <section expanded>
         <h2>YouTube Video</h2>
         <div>
-          <amp-youtube
-            width={width}
-            height={height}
-            data-videoid={videoid}
-            autoplay={autoplay}
-            loop
-          ></amp-youtube>
+          <amp-youtube data-videoid={videoid} {...args}></amp-youtube>
         </div>
       </section>
     </amp-accordion>
   );
 };
 
-export const InsideDetails = () => {
-  const videoid = text('videoid', 'IAvf-rkzNck');
-  const width = number('width', 300);
-  const height = number('height', 200);
-  const autoplay = boolean('autoplay', false);
+export const InsideDetails = ({videoid, ...args}) => {
   return (
     <details open>
       <summary>YouTube Video</summary>
-      <amp-youtube
-        width={width}
-        height={height}
-        data-videoid={videoid}
-        autoplay={autoplay}
-        loop
-      ></amp-youtube>
+      <amp-youtube data-videoid={videoid} {...args}></amp-youtube>
     </details>
   );
 };
 
-export const WithPlaceholder = ({id}) => {
-  const videoid = text('videoid', 'IAvf-rkzNck');
-  const layout = text('layout', 'responsive');
-  const autoplay = boolean('autoplay', false);
-  const loop = boolean('loop', false);
-  const width = number('width', 300);
-  const height = number('height', 200);
-  const credentials = text('credentials', 'include');
+export const WithPlaceholder = ({id, videoid, ...args}) => {
   return (
-    <amp-youtube
-      id={id}
-      width={width}
-      height={height}
-      data-videoid={videoid}
-      layout={layout}
-      autoplay={autoplay}
-      loop={loop}
-      credentials={credentials}
-    >
+    <amp-youtube id={id} data-videoid={videoid} {...args}>
       <div placeholder style="background:red">
         Placeholder. Loading content...
       </div>
diff --git a/extensions/amp-youtube/1.0/storybook/Basic.js b/extensions/amp-youtube/1.0/storybook/Basic.js
index c4e58f9ea4f8..fbbee669ac19 100644
--- a/extensions/amp-youtube/1.0/storybook/Basic.js
+++ b/extensions/amp-youtube/1.0/storybook/Basic.js
@@ -1,43 +1,36 @@
-import {boolean, number, object, text, withKnobs} from '@storybook/addon-knobs';
-
-import * as Preact from '#preact';
-import {useRef, useState} from '#preact';
-
 import {
   BentoAccordion,
   BentoAccordionContent,
   BentoAccordionHeader,
   BentoAccordionSection,
-} from '../../../amp-accordion/1.0/component';
-import {BentoYoutube} from '../component';
+} from '#bento/components/bento-accordion/1.0/component';
+import {BentoYoutube} from '#bento/components/bento-youtube/1.0/component';
+
+import * as Preact from '#preact';
+import {useRef, useState} from '#preact';
 
 export default {
   title: 'YouTube',
   component: BentoYoutube,
-  decorators: [withKnobs],
+  args: {
+    width: 300,
+    height: 300,
+    autoplay: false,
+    loop: false,
+    params: {},
+    credentials: 'include',
+  },
 };
 
 const VIDEOID = 'IAvf-rkzNck';
 const LIVE_CHANNEL_ID = 'sKCkM-f2Qk4';
 
-export const _default = () => {
-  const width = number('width', 300);
-  const height = number('height', 200);
-  const videoid = text('videoid', VIDEOID);
-  const autoplay = boolean('autoplay', false);
-  const loop = boolean('loop', false);
-  const params = object('params', {});
-  const credentials = text('credentials', 'include');
-  return (
-    <BentoYoutube
-      autoplay={autoplay}
-      loop={loop}
-      videoid={videoid}
-      params={params}
-      style={{width, height}}
-      credentials={credentials}
-    />
-  );
+export const _default = ({height, width, ...args}) => {
+  return <BentoYoutube style={{width, height}} {...args} />;
+};
+
+_default.args = {
+  videoid: VIDEOID,
 };
 
 /**
@@ -82,54 +75,23 @@ function WithStateTable({autoplay, credentials, loop, params, style, videoid}) {
   );
 }
 
-/**
- * @return {*}
- */
-export function State() {
-  const width = number('width', 300);
-  const height = number('height', 200);
-  const videoid = text('videoid', VIDEOID);
-  const autoplay = boolean('autoplay', false);
-  const loop = boolean('loop', false);
-  const params = object('params', {});
-  const credentials = text('credentials', 'include');
-  return (
-    <WithStateTable
-      autoplay={autoplay}
-      loop={loop}
-      videoid={videoid}
-      params={params}
-      style={{width, height}}
-      credentials={credentials}
-    />
-  );
+export function State({height, width, ...args}) {
+  return <WithStateTable style={{width, height}} {...args} />;
 }
 
-export const liveChannelId = () => {
-  const width = number('width', 300);
-  const height = number('height', 200);
-  const liveChannelid = text('liveChannelid', LIVE_CHANNEL_ID);
-  const autoplay = boolean('autoplay', false);
-  const loop = boolean('loop', false);
-  const params = object('params', {});
-  const credentials = text('credentials', 'include');
-  return (
-    <BentoYoutube
-      autoplay={autoplay}
-      loop={loop}
-      liveChannelid={liveChannelid}
-      params={params}
-      style={{width, height}}
-      credentials={credentials}
-    />
-  );
+State.args = {
+  videoid: VIDEOID,
+};
+
+export const liveChannelId = ({height, width, ...args}) => {
+  return <BentoYoutube style={{width, height}} {...args} />;
+};
+
+liveChannelId.args = {
+  liveChannelid: LIVE_CHANNEL_ID,
 };
 
-export const InsideAccordion = () => {
-  const width = text('width', '320px');
-  const height = text('height', '180px');
-  const videoid = text('videoid', VIDEOID);
-  const params = object('params', {});
+export const InsideAccordion = ({height, width, ...args}) => {
   return (
     <BentoAccordion expandSingleSection>
       <BentoAccordionSection key={1} expanded>
@@ -137,12 +99,7 @@ export const InsideAccordion = () => {
           <h2>Controls</h2>
         </BentoAccordionHeader>
         <BentoAccordionContent>
-          <BentoYoutube
-            loop={true}
-            videoid={videoid}
-            params={params}
-            style={{width, height}}
-          />
+          <BentoYoutube loop={true} {...args} style={{width, height}} />
         </BentoAccordionContent>
       </BentoAccordionSection>
       <BentoAccordionSection key={2}>
@@ -153,8 +110,7 @@ export const InsideAccordion = () => {
           <BentoYoutube
             autoplay={true}
             loop={true}
-            videoid={videoid}
-            params={params}
+            {...args}
             style={{width, height}}
           />
         </BentoAccordionContent>
@@ -162,3 +118,7 @@ export const InsideAccordion = () => {
     </BentoAccordion>
   );
 };
+
+InsideAccordion.args = {
+  videoid: VIDEOID,
+};
diff --git a/extensions/amp-youtube/1.0/test-e2e/test-bento-youtube.js b/extensions/amp-youtube/1.0/test-e2e/test-bento-youtube.js
deleted file mode 100644
index b6b9e8f2fd06..000000000000
--- a/extensions/amp-youtube/1.0/test-e2e/test-bento-youtube.js
+++ /dev/null
@@ -1,26 +0,0 @@
-describes.endtoend(
-  'bento-youtube',
-  {
-    version: '1.0',
-    fixture: 'bento/youtube.html',
-    environments: ['single'],
-  },
-  (env) => {
-    let controller;
-
-    beforeEach(() => {
-      controller = env.controller;
-    });
-
-    it('should render a youtube video', async () => {
-      const element = await controller.findElement('bento-youtube');
-      await controller.switchToShadowRoot(element);
-
-      const iframe = await controller.findElement('iframe');
-
-      await expect(controller.getElementAttribute(iframe, 'src')).to.equal(
-        'https://www.youtube.com/embed/dQw4w9WgXcQ?enablejsapi=1&amp=1&playsinline=1'
-      );
-    });
-  }
-);
diff --git a/extensions/amp-youtube/1.0/test/test-amp-youtube.js b/extensions/amp-youtube/1.0/test/test-amp-youtube.js
index 94560566f5fc..f835cbf134e8 100644
--- a/extensions/amp-youtube/1.0/test/test-amp-youtube.js
+++ b/extensions/amp-youtube/1.0/test/test-amp-youtube.js
@@ -48,5 +48,37 @@ describes.realWin(
         'https://www.youtube.com/embed/IAvf-rkzNck?enablejsapi=1&amp=1&playsinline=1'
       );
     });
+
+    it('should pass the data-loading attribute to the underlying iframe', async () => {
+      element = createElementWithAttributes(win.document, 'amp-youtube', {
+        'data-videoid': 'IAvf-rkzNck',
+        'data-loading': 'lazy',
+        'amp': true,
+        'height': 500,
+        'width': 500,
+        'layout': 'responsive',
+      });
+      doc.body.appendChild(element);
+      await waitForRender();
+
+      const iframe = element.shadowRoot.querySelector('iframe');
+      expect(iframe.getAttribute('loading')).to.equal('lazy');
+    });
+
+    it('should set loading="auto" if no value is specified', async () => {
+      element = createElementWithAttributes(win.document, 'amp-youtube', {
+        'data-videoid': 'IAvf-rkzNck',
+        'amp': true,
+        'height': 500,
+        'width': 500,
+        'layout': 'responsive',
+      });
+      doc.body.appendChild(element);
+      await waitForRender();
+
+      expect(
+        element.shadowRoot.querySelector('iframe').getAttribute('loading')
+      ).to.equal('auto');
+    });
   }
 );
diff --git a/extensions/amp-youtube/1.0/test/test-component.js b/extensions/amp-youtube/1.0/test/test-component.js
deleted file mode 100644
index d3951d9aec3e..000000000000
--- a/extensions/amp-youtube/1.0/test/test-component.js
+++ /dev/null
@@ -1,188 +0,0 @@
-import {mount} from 'enzyme';
-
-import {dispatchCustomEvent} from '#core/dom';
-
-import * as Preact from '#preact';
-import {createRef} from '#preact';
-
-import {useStyles} from 'extensions/amp-video/1.0/component.jss';
-
-import {BentoYoutube} from '../component';
-
-describes.realWin('YouTube preact component v1.0', {}, (env) => {
-  let window, document;
-  let container;
-
-  beforeEach(() => {
-    window = env.win;
-    document = window.document;
-
-    container = document.createElement('div');
-    document.body.appendChild(container);
-  });
-
-  it('Normal render', () => {
-    const wrapper = mount(
-      <BentoYoutube
-        videoid="IAvf-rkzNck"
-        style={{
-          'width': 600,
-          'height': 500,
-        }}
-      />,
-      {attachTo: container}
-    );
-
-    const iframe = wrapper.find('iframe');
-
-    expect(iframe.prop('src')).to.equal(
-      'https://www.youtube.com/embed/IAvf-rkzNck?enablejsapi=1&amp=1&playsinline=1'
-    );
-
-    // Style propagated to container, but not iframe.
-    expect(wrapper.prop('style').width).to.equal(600);
-    expect(wrapper.prop('style').height).to.equal(500);
-
-    // width/height applied via class
-    const classes = useStyles();
-    expect(wrapper.find('iframe').hasClass(classes.fillStretch)).to.be.true;
-  });
-
-  it('Pass correct param attributes to the iframe src', () => {
-    const wrapper = mount(
-      <BentoYoutube
-        videoid="IAvf-rkzNck"
-        autoplay
-        loop
-        style={{
-          'width': 600,
-          'height': 500,
-        }}
-        params={{'myparam': 'hello world', 'loop': '1'}}
-      />,
-      {attachTo: container}
-    );
-
-    const iframe = wrapper.find('iframe');
-
-    expect(iframe.prop('src')).to.contain('&myparam=hello%20world');
-    // data-param-autoplay is disallowed in favor of just autoplay
-    expect(iframe.prop('src')).to.not.contain('autoplay=1');
-    // data-param-loop is disallowed in favor of just loop for single videos
-    expect(iframe.prop('src')).to.not.contain('loop=1');
-    // playsinline should default to 1 if not provided.
-    expect(iframe.prop('src')).to.contain('playsinline=1');
-    expect(iframe.prop('src')).to.contain('iv_load_policy=3');
-  });
-
-  it('Keep data param: loop in iframe src for playlists', () => {
-    const wrapper = mount(
-      <BentoYoutube
-        videoid="IAvf-rkzNck"
-        autoplay
-        loop
-        style={{
-          'width': 600,
-          'height': 500,
-        }}
-        params={{'playlist': 'IAvf-rkzNck', 'loop': '1'}}
-      />,
-      {attachTo: container}
-    );
-
-    const iframe = wrapper.find('iframe');
-
-    expect(iframe.prop('src')).to.contain('loop=1');
-  });
-
-  it('Uses privacy-enhanced mode', () => {
-    const wrapper = mount(
-      <BentoYoutube
-        videoid="IAvf-rkzNck"
-        autoplay
-        loop
-        style={{
-          'width': 600,
-          'height': 500,
-        }}
-        credentials="omit"
-      />,
-      {attachTo: container}
-    );
-
-    const iframe = wrapper.find('iframe');
-
-    expect(iframe.prop('src')).to.equal(
-      'https://www.youtube-nocookie.com/embed/IAvf-rkzNck?enablejsapi=1&amp=1&playsinline=1&iv_load_policy=3'
-    );
-  });
-
-  it('should trigger onCanPlay when youtube iframe is loaded', () => {
-    const wrapper = mount(
-      <BentoYoutube
-        videoid="IAvf-rkzNck"
-        autoplay
-        loop
-        style={{
-          'width': 600,
-          'height': 500,
-        }}
-        credentials="omit"
-      />,
-      {attachTo: container}
-    );
-
-    const iframe = wrapper.find('iframe').getDOMNode();
-    const onCanPlaySpy = env.sandbox.spy();
-    iframe.addEventListener('canplay', onCanPlaySpy);
-    const postMessageSpy = env.sandbox.stub(
-      iframe.contentWindow,
-      'postMessage'
-    );
-
-    dispatchCustomEvent(iframe, 'load', {bubbles: false});
-    expect(onCanPlaySpy).to.be.calledOnce;
-    expect(onCanPlaySpy.firstCall.firstArg).to.contain({bubbles: false});
-    expect(postMessageSpy).to.be.calledOnce;
-    expect(JSON.parse(postMessageSpy.firstCall.firstArg)).to.deep.equal({
-      event: 'listening',
-    });
-  });
-
-  it('exposes properties from info messages', () => {
-    const ref = createRef();
-
-    const wrapper = mount(
-      <BentoYoutube
-        ref={ref}
-        videoid="IAvf-rkzNck"
-        shortcode="B8QaZW4AQY_"
-        style={{width: 500, height: 600}}
-      />,
-      {attachTo: document.body}
-    );
-
-    const {contentWindow} = wrapper.getDOMNode().querySelector('iframe');
-
-    expect(ref.current.currentTime).to.equal(0);
-    expect(ref.current.duration).to.be.NaN;
-
-    mockMessage(window, contentWindow, {info: {duration: 420}});
-
-    expect(ref.current.currentTime).to.equal(0);
-    expect(ref.current.duration).to.equal(420);
-
-    mockMessage(window, contentWindow, {info: {currentTime: 12.3}});
-
-    expect(ref.current.currentTime).to.equal(12.3);
-    expect(ref.current.duration).to.equal(420);
-  });
-});
-
-function mockMessage(win, source, data) {
-  const mockEvent = new CustomEvent('message');
-  mockEvent.data = JSON.stringify(data);
-  mockEvent.source = source;
-  win.dispatchEvent(mockEvent);
-  return mockEvent;
-}
diff --git a/extensions/amp-youtube/amp-youtube.md b/extensions/amp-youtube/amp-youtube.md
index 05db6199d7ba..36dadaf3f4c6 100644
--- a/extensions/amp-youtube/amp-youtube.md
+++ b/extensions/amp-youtube/amp-youtube.md
@@ -89,7 +89,7 @@ Bento AMP allows you to use AMP components in non-AMP pages without needing to c
 
 #### Interactivity and API usage
 
-Bento enabled components in standalone use are highly interactive through their API. In Bento standalone use, the element's API replaces AMP Actions and events and [`amp-bind`](https://amp.dev/documentation/components/amp-bind/?format=websites).
+Bento are highly interactive through their API. In Bento standalone use, the element's API replaces AMP Actions and events and [`amp-bind`](https://amp.dev/documentation/components/amp-bind/?format=websites).
 
 The `amp-youtube` component API is accessible by including the following script tag in your document:
 
diff --git a/extensions/amp-youtube/validator-amp-youtube.protoascii b/extensions/amp-youtube/validator-amp-youtube.protoascii
index bd57af18b870..411cb89b679a 100644
--- a/extensions/amp-youtube/validator-amp-youtube.protoascii
+++ b/extensions/amp-youtube/validator-amp-youtube.protoascii
@@ -1,8 +1,8 @@
 tags: {  # amp-youtube 1.0
   html_format: AMP
   tag_name: "SCRIPT"
-  satisfies: "amp-youtube 1.0"
-  excludes: "amp-youtube 0.1"
+  satisfies_condition: "amp-youtube 1.0"
+  excludes_condition: "amp-youtube 0.1"
   extension_spec: {
     name: "amp-youtube"
     version_name: "v1.0"
@@ -15,8 +15,8 @@ tags: {  # amp-youtube 1.0
 tags: {  # amp-youtube 0.1 and latest
   html_format: AMP
   tag_name: "SCRIPT"
-  satisfies: "amp-youtube 0.1"
-  excludes: "amp-youtube 1.0"
+  satisfies_condition: "amp-youtube 0.1"
+  excludes_condition: "amp-youtube 1.0"
   extension_spec: {
     name: "amp-youtube"
     version_name: "v0.1"
diff --git a/extensions/import-order-excluded.json b/extensions/import-order-excluded.json
deleted file mode 100644
index 16be0d89ca49..000000000000
--- a/extensions/import-order-excluded.json
+++ /dev/null
@@ -1,33 +0,0 @@
-[
-  "amp-ad",
-  "amp-addthis",
-  "amp-analytics",
-  "amp-anim",
-  "amp-apester-media",
-  "amp-autocomplete",
-  "amp-base-carousel",
-  "amp-brightcove",
-  "amp-carousel",
-  "amp-consent",
-  "amp-dailymotion",
-  "amp-facebook-comments",
-  "amp-facebook-like",
-  "amp-facebook-page",
-  "amp-facebook",
-  "amp-fit-text",
-  "amp-iframe",
-  "amp-inline-gallery",
-  "amp-lightbox",
-  "amp-link-rewriter",
-  "amp-mustache",
-  "amp-recaptcha-input",
-  "amp-render",
-  "amp-sidebar",
-  "amp-story-interactive",
-  "amp-story",
-  "amp-stream-gallery",
-  "amp-subscriptions",
-  "amp-tiktok",
-  "amp-twitter",
-  "amp-video"
-]
diff --git a/package-lock.json b/package-lock.json
index 01751072f4ff..8b80b2ba954b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,128 +11,129 @@
       "license": "Apache-2.0",
       "dependencies": {
         "@ampproject/animations": "0.2.2",
-        "@ampproject/bento-compiler": "0.0.11",
-        "@ampproject/toolbox-cache-url": "2.8.0",
+        "@ampproject/bento-compiler": "0.0.14",
+        "@ampproject/toolbox-cache-url": "2.10.1",
         "@ampproject/viewer-messaging": "1.1.2",
-        "@ampproject/worker-dom": "0.32.1",
+        "@ampproject/worker-dom": "0.35.0",
+        "@use-gesture/react": "10.2.10",
         "@webcomponents/webcomponentsjs": "2.6.0",
-        "dompurify": "2.3.3",
-        "google-closure-library": "20210808.0.0",
+        "date-fns": "2.27.0",
+        "dompurify": "3.0.2",
+        "google-closure-library": "20230802.0.0",
         "intersection-observer": "0.12.0",
         "jss": "10.8.2",
         "jss-preset-default": "10.8.2",
-        "moment": "2.29.1",
+        "moment": "2.29.4",
         "obj-str": "1.1.0",
-        "preact": "10.5.15",
-        "react-dates": "21.8.0",
+        "preact": "10.16.0",
+        "react-day-picker": "8.0.0-beta.37",
         "react-jss": "10.8.2",
         "resize-observer-polyfill": "1.5.1",
-        "rrule": "2.6.8",
+        "rrule": "2.7.2",
         "timeago.js": "4.0.2",
         "web-activities": "1.24.0",
         "web-animations-js": "2.3.2"
       },
       "devDependencies": {
         "@ampproject/filesize": "4.3.0",
-        "@ampproject/google-closure-compiler": "20210601.0.0",
-        "@ampproject/remapping": "1.0.1",
+        "@ampproject/remapping": "2.3.0",
+        "@aws-sdk/client-s3": "3.613.0",
         "@babel/core": "7.15.0",
-        "@babel/eslint-parser": "7.15.0",
         "@babel/helper-module-imports": "7.14.5",
         "@babel/helper-plugin-test-runner": "7.14.5",
-        "@babel/plugin-proposal-class-properties": "7.14.5",
         "@babel/plugin-syntax-import-assertions": "7.14.5",
-        "@babel/plugin-transform-classes": "7.14.9",
         "@babel/plugin-transform-react-jsx": "7.14.9",
         "@babel/preset-env": "7.15.0",
+        "@babel/preset-typescript": "7.16.7",
         "@babel/runtime": "7.15.3",
-        "@chiragrupani/karma-chromium-edge-launcher": "2.1.1",
-        "@google-cloud/storage": "5.15.3",
-        "@jest/core": "27.3.1",
+        "@chiragrupani/karma-chromium-edge-launcher": "2.4.1",
+        "@jest/core": "29.7.0",
         "@jridgewell/doctrine": "3.0.2",
-        "@octokit/graphql": "4.8.0",
-        "@octokit/rest": "18.12.0",
-        "@sinonjs/fake-timers": "7.1.2",
-        "@types/chai": "4.2.22",
-        "@types/eslint": "7.28.2",
-        "@types/fs-extra": "9.0.13",
-        "@types/klaw": "3.0.3",
-        "@types/minimist": "1.2.2",
-        "@types/mocha": "8.2.3",
-        "@types/node": "14.17.32",
-        "acorn-globals": "6.0.0",
-        "ajv": "8.6.3",
+        "@jridgewell/resolve-uri": "3.1.2",
+        "@jridgewell/sourcemap-codec": "1.5.0",
+        "@octokit/graphql": "7.1.0",
+        "@octokit/rest": "20.1.1",
+        "@sinonjs/fake-timers": "11.2.2",
+        "@types/chai": "4.3.16",
+        "@types/dompurify": "2.4.0",
+        "@types/eslint": "8.56.12",
+        "@types/estree": "1.0.5",
+        "@types/fs-extra": "11.0.4",
+        "@types/klaw": "3.0.6",
+        "@types/minimist": "1.2.5",
+        "@types/mocha": "10.0.7",
+        "@types/node": "18.19.39",
+        "@types/tar": "6.1.13",
+        "@typescript-eslint/eslint-plugin": "7.18.0",
+        "@typescript-eslint/parser": "7.18.0",
+        "acorn-globals": "7.0.1",
+        "ajv": "8.16.0",
         "ajv-formats": "2.1.1",
-        "amphtml-validator": "1.0.35",
+        "amphtml-validator": "1.0.38",
         "ast-replace": "1.1.3",
         "atob": "2.1.2",
-        "autoprefixer": "10.3.7",
-        "ava": "3.15.0",
+        "autoprefixer": "10.4.19",
+        "ava": "6.1.3",
         "babel-plugin-istanbul": "6.0.0",
         "babel-plugin-minify-replace": "0.5.0",
-        "babel-plugin-module-resolver": "4.1.0",
+        "babel-plugin-module-resolver": "5.0.0",
         "babel-plugin-optimize-objstr": "1.0.0",
         "baconipsum": "0.1.2",
-        "base62": "2.0.1",
-        "body-parser": "1.19.0",
-        "chai": "4.3.4",
-        "chai-as-promised": "7.1.1",
-        "check-dependencies": "1.1.0",
-        "chokidar": "3.5.2",
-        "cli-highlight": "2.1.11",
-        "codecov": "3.8.3",
-        "commander": "7.2.0",
+        "base62": "2.0.2",
+        "body-parser": "1.20.3",
+        "chai": "4.4.1",
+        "chai-as-promised": "7.1.2",
+        "check-dependencies": "2.0.0",
+        "chokidar": "3.6.0",
+        "commander": "11.1.0",
         "connect-header": "0.0.5",
         "css-imports": "0.3.1",
-        "css-selector-tokenizer": "0.8.0",
-        "css-what": "5.1.0",
-        "cssnano": "5.0.8",
-        "dedent": "0.7.0",
-        "del": "6.0.0",
+        "css-what": "6.1.0",
+        "cssnano": "6.1.2",
+        "dedent": "1.5.3",
+        "del": "6.1.1",
         "enzyme": "3.11.0",
-        "enzyme-adapter-preact-pure": "3.1.0",
-        "esbuild": "0.13.9",
-        "escodegen": "2.0.0",
-        "eslint": "7.32.0",
-        "eslint-config-prettier": "8.3.0",
-        "eslint-import-resolver-babel-module": "5.3.1",
-        "eslint-plugin-chai-expect": "2.2.0",
-        "eslint-plugin-eslint-plugin": "3.6.1",
-        "eslint-plugin-import": "2.25.2",
-        "eslint-plugin-jasmine": "4.1.2",
-        "eslint-plugin-jsdoc": "36.1.1",
-        "eslint-plugin-local": "1.0.0",
-        "eslint-plugin-module-resolver": "1.4.0",
-        "eslint-plugin-prettier": "4.0.0",
-        "eslint-plugin-react": "7.26.1",
-        "eslint-plugin-react-hooks": "4.2.0",
-        "eslint-plugin-sort-destructure-keys": "1.4.0",
-        "eslint-plugin-sort-requires": "2.1.0",
+        "enzyme-adapter-preact-pure": "4.1.0",
+        "esbuild": "0.24.2",
+        "escodegen": "2.1.0",
+        "eslint": "8.57.1",
+        "eslint-config-prettier": "9.1.0",
+        "eslint-import-resolver-babel-module": "5.3.2",
+        "eslint-plugin-chai-expect": "3.1.0",
+        "eslint-plugin-eslint-plugin": "5.5.1",
+        "eslint-plugin-import": "2.31.0",
+        "eslint-plugin-jasmine": "4.2.2",
+        "eslint-plugin-jsdoc": "48.11.0",
+        "eslint-plugin-local": "4.2.2",
+        "eslint-plugin-module-resolver": "1.5.0",
+        "eslint-plugin-prettier": "5.2.1",
+        "eslint-plugin-react": "7.37.1",
+        "eslint-plugin-react-hooks": "4.6.2",
+        "eslint-plugin-sort-destructure-keys": "1.6.0",
         "esprima": "4.0.1",
         "event-stream": "4.0.1",
         "events": "3.3.0",
-        "express": "4.17.1",
-        "fast-glob": "3.2.7",
+        "express": "4.20.0",
+        "fast-glob": "3.3.2",
         "fetch-mock": "9.11.0",
-        "formidable": "1.2.2",
-        "fs-extra": "10.0.0",
+        "formidable": "3.5.1",
+        "fs-extra": "11.2.0",
         "gulp-connect": "5.7.0",
         "html-minifier": "4.0.0",
-        "ignore": "5.1.8",
+        "ignore": "5.3.1",
         "istanbul-middleware": "0.2.2",
-        "jest-progress-bar-reporter": "1.0.21",
-        "jest-silent-reporter": "0.5.0",
+        "jest-progress-bar-reporter": "1.0.25",
+        "jest-silent-reporter": "0.6.0",
         "jison": "0.4.18",
-        "jscodeshift": "0.13.0",
-        "jsdom": "16.7.0",
-        "json-stable-stringify": "1.0.1",
-        "json5": "2.2.0",
-        "jsonminify": "0.4.1",
-        "karma": "6.3.6",
-        "karma-chrome-launcher": "3.1.0",
+        "jsdom": "24.1.0",
+        "json-stable-stringify": "1.1.1",
+        "json5": "2.2.3",
+        "jsonminify": "0.4.2",
+        "karma": "6.4.3",
+        "karma-chrome-launcher": "3.2.0",
         "karma-coverage-istanbul-reporter": "3.0.3",
-        "karma-esbuild": "2.2.0",
-        "karma-firefox-launcher": "2.1.1",
+        "karma-esbuild-up": "3.0.0",
+        "karma-firefox-launcher": "2.1.3",
         "karma-fixture": "0.2.6",
         "karma-html2js-preprocessor": "1.1.0",
         "karma-junit-reporter": "2.0.1",
@@ -140,49 +141,41 @@
         "karma-mocha-reporter": "2.2.5",
         "karma-safarinative-launcher": "1.1.0",
         "karma-source-map-support": "1.4.0",
-        "karma-spec-reporter": "0.0.32",
+        "karma-spec-reporter": "0.0.36",
         "karma-structured-json-reporter": "1.0.1",
-        "karma-super-dots-reporter": "0.2.0",
-        "klaw": "3.0.0",
-        "kleur": "4.1.4",
+        "klaw": "4.1.0",
+        "kleur": "4.1.5",
         "list-imports-exports": "0.1.2",
         "lodash.debounce": "4.0.8",
-        "magic-string": "0.25.7",
-        "markdown-link-check": "3.8.7",
+        "markdown-link-check": "3.12.2",
         "markdown-toc": "1.2.0",
-        "marked": "3.0.8",
-        "minimatch": "3.0.4",
-        "minimist": "1.2.5",
-        "mocha": "9.1.3",
-        "mocha-junit-reporter": "2.0.2",
+        "minimatch": "9.0.5",
+        "minimist": "1.2.8",
+        "mocha": "10.6.0",
+        "mocha-junit-reporter": "2.2.1",
         "mocha-silent-reporter": "1.0.0",
         "morgan": "1.10.0",
-        "multer": "1.4.3",
-        "nock": "13.1.4",
-        "node-fetch": "2.6.5",
-        "open": "8.4.0",
-        "plugin-error": "1.0.1",
-        "postcss": "8.3.11",
-        "postcss-import": "14.0.2",
-        "posthtml": "0.16.5",
-        "prettier": "2.4.1",
+        "multer": "1.4.5-lts.1",
+        "open": "8.4.2",
+        "plugin-error": "2.0.1",
+        "postcss": "8.4.39",
+        "postcss-import": "16.1.0",
+        "posthtml": "0.16.6",
+        "prettier": "3.3.3",
         "react": "17.0.2",
         "react-dom": "17.0.2",
         "rocambole": "0.7.0",
-        "semver": "7.3.5",
+        "semver": "7.6.2",
         "sinon": "11.1.2",
         "sinon-chai": "3.7.0",
-        "sourcemap-codec": "1.4.8",
         "stream-browserify": "3.0.0",
         "sync-rpc": "1.3.6",
-        "tar": "6.1.11",
+        "tar": "6.2.1",
         "tempy": "1.0.1",
-        "terser": "5.9.0",
-        "text-table": "0.2.0",
-        "traverse": "0.6.6",
-        "typescript": "4.4.4",
-        "util": "0.12.4",
-        "vinyl-fs": "3.0.3"
+        "terser": "5.14.2",
+        "traverse": "0.6.9",
+        "typescript": "5.5.3",
+        "util": "0.12.5"
       }
     },
     "node_modules/@ampproject/animations": {
@@ -190,11 +183,19 @@
       "license": "Apache-2.0"
     },
     "node_modules/@ampproject/bento-compiler": {
-      "version": "0.0.11",
-      "resolved": "https://registry.npmjs.org/@ampproject/bento-compiler/-/bento-compiler-0.0.11.tgz",
-      "integrity": "sha512-FR6bw/EodR0hHJEw7hwTD+5YhxJQHx43vZxlWYef8Asn1wF5PmRmVV769+ZIMQlSM3leYV4et01YrAyrZL0Keg==",
+      "version": "0.0.14",
+      "resolved": "https://registry.npmjs.org/@ampproject/bento-compiler/-/bento-compiler-0.0.14.tgz",
+      "integrity": "sha512-wIp4Fu4E0qHzm0n08MIzh+GNjfFqHdXunfk/C19gGJs7Zplm62v28p6gtoONcMNfeSDbeip33O4fbG5NuDMC3A==",
       "dependencies": {
-        "@ampproject/worker-dom": "0.32.1"
+        "@ampproject/worker-dom": "0.33.0"
+      }
+    },
+    "node_modules/@ampproject/bento-compiler/node_modules/@ampproject/worker-dom": {
+      "version": "0.33.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/worker-dom/-/worker-dom-0.33.0.tgz",
+      "integrity": "sha512-shTi1UldKehW2FGCr9owu9xiCsNONCyGCXLVWJQGGpioPcFSmwEI4Gvntj+QITxfkIXsmfFqT8si/PvwhwQGtA==",
+      "engines": {
+        "node": ">=10.14"
       }
     },
     "node_modules/@ampproject/filesize": {
@@ -231,87 +232,26 @@
         "node": ">=8"
       }
     },
-    "node_modules/@ampproject/google-closure-compiler": {
-      "version": "20210601.0.0",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@ampproject/google-closure-compiler-java": "20210601.0.0",
-        "kleur": "4.1.4",
-        "vinyl": "2.2.1",
-        "vinyl-sourcemaps-apply": "0.2.1"
-      },
-      "bin": {
-        "google-closure-compiler": "cli.js"
-      },
-      "optionalDependencies": {
-        "@ampproject/google-closure-compiler-linux": "20210601.0.0",
-        "@ampproject/google-closure-compiler-osx": "20210601.0.0",
-        "@ampproject/google-closure-compiler-windows": "20210601.0.0"
-      }
-    },
-    "node_modules/@ampproject/google-closure-compiler-java": {
-      "version": "20210601.0.0",
-      "dev": true,
-      "license": "Apache-2.0"
-    },
-    "node_modules/@ampproject/google-closure-compiler-linux": {
-      "version": "20210601.0.0",
-      "cpu": [
-        "x64",
-        "x86"
-      ],
-      "dev": true,
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@ampproject/google-closure-compiler-osx": {
-      "version": "20210601.0.0",
-      "cpu": [
-        "x64",
-        "x86"
-      ],
-      "dev": true,
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@ampproject/google-closure-compiler-windows": {
-      "version": "20210601.0.0",
-      "cpu": [
-        "x64",
-        "x86"
-      ],
-      "dev": true,
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
     "node_modules/@ampproject/remapping": {
-      "version": "1.0.1",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
-        "@jridgewell/resolve-uri": "1.0.0",
-        "sourcemap-codec": "1.4.8"
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
       },
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@ampproject/toolbox-cache-url": {
-      "version": "2.8.0",
-      "license": "Apache-2.0",
+      "version": "2.10.1",
+      "resolved": "https://registry.npmjs.org/@ampproject/toolbox-cache-url/-/toolbox-cache-url-2.10.1.tgz",
+      "integrity": "sha512-fDtr+0WRGIUEYU6IA6/qCDIS9IMHGmeyVT/Pf18FiorGcpLAQKK+SuuGkh07lF6xRMkkLSGVn2C6ghofWY3XXA==",
       "dependencies": {
         "punycode": "2.1.1",
-        "url-parse": "1.5.1"
+        "url-parse": "^1.5.10"
       }
     },
     "node_modules/@ampproject/viewer-messaging": {
@@ -319,685 +259,1049 @@
       "license": "Apache-2.0"
     },
     "node_modules/@ampproject/worker-dom": {
-      "version": "0.32.1",
-      "license": "Apache-2.0",
+      "version": "0.35.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/worker-dom/-/worker-dom-0.35.0.tgz",
+      "integrity": "sha512-JPGurXC6aGkXZD9sAi1kny48099xD6QKSAZk7DMmAZ9jqMBuIClVL1j+kKBcXZnaIS8m9acXPQ6xu0cOiSujkg==",
       "engines": {
         "node": ">=10.14"
       }
     },
-    "node_modules/@babel/code-frame": {
-      "version": "7.15.8",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz",
-      "integrity": "sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==",
+    "node_modules/@aws-crypto/crc32": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-5.2.0.tgz",
+      "integrity": "sha512-nLbCWqQNgUiwwtFsen1AdzAtvuLRsQS8rYgMuxCrdKf9kOssamGLuPwyTY9wyYblNr9+1XM8v6zoDTPPSIeANg==",
       "dev": true,
       "dependencies": {
-        "@babel/highlight": "^7.14.5"
+        "@aws-crypto/util": "^5.2.0",
+        "@aws-sdk/types": "^3.222.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/compat-data": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz",
-      "integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==",
+    "node_modules/@aws-crypto/crc32c": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@aws-crypto/crc32c/-/crc32c-5.2.0.tgz",
+      "integrity": "sha512-+iWb8qaHLYKrNvGRbiYRHSdKRWhto5XlZUEBwDjYNf+ly5SVYG6zEoYIdxvf5R3zyeP16w4PLBn3rH1xc74Rag==",
       "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
+      "dependencies": {
+        "@aws-crypto/util": "^5.2.0",
+        "@aws-sdk/types": "^3.222.0",
+        "tslib": "^2.6.2"
       }
     },
-    "node_modules/@babel/core": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.0.tgz",
-      "integrity": "sha512-tXtmTminrze5HEUPn/a0JtOzzfp0nk+UEXQ/tqIJo3WDGypl/2OFQEMll/zSFU8f/lfmfLXvTaORHF3cfXIQMw==",
+    "node_modules/@aws-crypto/sha1-browser": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@aws-crypto/sha1-browser/-/sha1-browser-5.2.0.tgz",
+      "integrity": "sha512-OH6lveCFfcDjX4dbAvCFSYUjJZjDr/3XJ3xHtjn3Oj5b9RjojQo8npoLeA/bNwkOkrSQ0wgrHzXk4tDRxGKJeg==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/generator": "^7.15.0",
-        "@babel/helper-compilation-targets": "^7.15.0",
-        "@babel/helper-module-transforms": "^7.15.0",
-        "@babel/helpers": "^7.14.8",
-        "@babel/parser": "^7.15.0",
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.15.0",
-        "@babel/types": "^7.15.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"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
+        "@aws-crypto/supports-web-crypto": "^5.2.0",
+        "@aws-crypto/util": "^5.2.0",
+        "@aws-sdk/types": "^3.222.0",
+        "@aws-sdk/util-locate-window": "^3.0.0",
+        "@smithy/util-utf8": "^2.0.0",
+        "tslib": "^2.6.2"
       }
     },
-    "node_modules/@babel/core/node_modules/@babel/helper-compilation-targets": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz",
-      "integrity": "sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==",
+    "node_modules/@aws-crypto/sha256-browser": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz",
+      "integrity": "sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.15.0",
-        "@babel/helper-validator-option": "^7.14.5",
-        "browserslist": "^4.16.6",
-        "semver": "^6.3.0"
+        "@aws-crypto/sha256-js": "^5.2.0",
+        "@aws-crypto/supports-web-crypto": "^5.2.0",
+        "@aws-crypto/util": "^5.2.0",
+        "@aws-sdk/types": "^3.222.0",
+        "@aws-sdk/util-locate-window": "^3.0.0",
+        "@smithy/util-utf8": "^2.0.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "node_modules/@aws-crypto/sha256-js": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz",
+      "integrity": "sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==",
+      "dev": true,
+      "dependencies": {
+        "@aws-crypto/util": "^5.2.0",
+        "@aws-sdk/types": "^3.222.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/core/node_modules/semver": {
-      "version": "6.3.0",
+    "node_modules/@aws-crypto/supports-web-crypto": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.2.0.tgz",
+      "integrity": "sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==",
       "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
+      "dependencies": {
+        "tslib": "^2.6.2"
       }
     },
-    "node_modules/@babel/eslint-parser": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.15.0.tgz",
-      "integrity": "sha512-+gSPtjSBxOZz4Uh8Ggqu7HbfpB8cT1LwW0DnVVLZEJvzXauiD0Di3zszcBkRmfGGrLdYeHUwcflG7i3tr9kQlw==",
+    "node_modules/@aws-crypto/util": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-5.2.0.tgz",
+      "integrity": "sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==",
+      "dev": true,
+      "dependencies": {
+        "@aws-sdk/types": "^3.222.0",
+        "@smithy/util-utf8": "^2.0.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "node_modules/@aws-sdk/client-s3": {
+      "version": "3.613.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.613.0.tgz",
+      "integrity": "sha512-JK0yjzZFa+/qVZawHasCG4yEEA7ITpBtNsn9ri7qUZDfSWxDDJpKgHI/ZWd4QXw3SLlBG9hoj+eNSroJXuv+hQ==",
+      "dev": true,
+      "dependencies": {
+        "@aws-crypto/sha1-browser": "5.2.0",
+        "@aws-crypto/sha256-browser": "5.2.0",
+        "@aws-crypto/sha256-js": "5.2.0",
+        "@aws-sdk/client-sso-oidc": "3.613.0",
+        "@aws-sdk/client-sts": "3.613.0",
+        "@aws-sdk/core": "3.609.0",
+        "@aws-sdk/credential-provider-node": "3.613.0",
+        "@aws-sdk/middleware-bucket-endpoint": "3.609.0",
+        "@aws-sdk/middleware-expect-continue": "3.609.0",
+        "@aws-sdk/middleware-flexible-checksums": "3.609.0",
+        "@aws-sdk/middleware-host-header": "3.609.0",
+        "@aws-sdk/middleware-location-constraint": "3.609.0",
+        "@aws-sdk/middleware-logger": "3.609.0",
+        "@aws-sdk/middleware-recursion-detection": "3.609.0",
+        "@aws-sdk/middleware-sdk-s3": "3.609.0",
+        "@aws-sdk/middleware-signing": "3.609.0",
+        "@aws-sdk/middleware-ssec": "3.609.0",
+        "@aws-sdk/middleware-user-agent": "3.609.0",
+        "@aws-sdk/region-config-resolver": "3.609.0",
+        "@aws-sdk/signature-v4-multi-region": "3.609.0",
+        "@aws-sdk/types": "3.609.0",
+        "@aws-sdk/util-endpoints": "3.609.0",
+        "@aws-sdk/util-user-agent-browser": "3.609.0",
+        "@aws-sdk/util-user-agent-node": "3.609.0",
+        "@aws-sdk/xml-builder": "3.609.0",
+        "@smithy/config-resolver": "^3.0.4",
+        "@smithy/core": "^2.2.4",
+        "@smithy/eventstream-serde-browser": "^3.0.4",
+        "@smithy/eventstream-serde-config-resolver": "^3.0.3",
+        "@smithy/eventstream-serde-node": "^3.0.4",
+        "@smithy/fetch-http-handler": "^3.2.0",
+        "@smithy/hash-blob-browser": "^3.1.2",
+        "@smithy/hash-node": "^3.0.3",
+        "@smithy/hash-stream-node": "^3.1.2",
+        "@smithy/invalid-dependency": "^3.0.3",
+        "@smithy/md5-js": "^3.0.3",
+        "@smithy/middleware-content-length": "^3.0.3",
+        "@smithy/middleware-endpoint": "^3.0.4",
+        "@smithy/middleware-retry": "^3.0.7",
+        "@smithy/middleware-serde": "^3.0.3",
+        "@smithy/middleware-stack": "^3.0.3",
+        "@smithy/node-config-provider": "^3.1.3",
+        "@smithy/node-http-handler": "^3.1.1",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/smithy-client": "^3.1.5",
+        "@smithy/types": "^3.3.0",
+        "@smithy/url-parser": "^3.0.3",
+        "@smithy/util-base64": "^3.0.0",
+        "@smithy/util-body-length-browser": "^3.0.0",
+        "@smithy/util-body-length-node": "^3.0.0",
+        "@smithy/util-defaults-mode-browser": "^3.0.7",
+        "@smithy/util-defaults-mode-node": "^3.0.7",
+        "@smithy/util-endpoints": "^2.0.4",
+        "@smithy/util-retry": "^3.0.3",
+        "@smithy/util-stream": "^3.0.5",
+        "@smithy/util-utf8": "^3.0.0",
+        "@smithy/util-waiter": "^3.1.2",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/client-s3/node_modules/@smithy/is-array-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz",
+      "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==",
       "dev": true,
       "dependencies": {
-        "eslint-scope": "^5.1.1",
-        "eslint-visitor-keys": "^2.1.0",
-        "semver": "^6.3.0"
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || >=14.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": ">=7.11.0",
-        "eslint": ">=7.5.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/eslint-parser/node_modules/semver": {
-      "version": "6.3.0",
+    "node_modules/@aws-sdk/client-s3/node_modules/@smithy/util-buffer-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz",
+      "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==",
       "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
+      "dependencies": {
+        "@smithy/is-array-buffer": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/generator": {
-      "version": "7.15.8",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.8.tgz",
-      "integrity": "sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g==",
+    "node_modules/@aws-sdk/client-s3/node_modules/@smithy/util-utf8": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz",
+      "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==",
+      "dev": true,
+      "dependencies": {
+        "@smithy/util-buffer-from": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/client-sso": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.609.0.tgz",
+      "integrity": "sha512-gqXGFDkIpKHCKAbeJK4aIDt3tiwJ26Rf5Tqw9JS6BYXsdMeOB8FTzqD9R+Yc1epHd8s5L94sdqXT5PapgxFZrg==",
+      "dev": true,
+      "dependencies": {
+        "@aws-crypto/sha256-browser": "5.2.0",
+        "@aws-crypto/sha256-js": "5.2.0",
+        "@aws-sdk/core": "3.609.0",
+        "@aws-sdk/middleware-host-header": "3.609.0",
+        "@aws-sdk/middleware-logger": "3.609.0",
+        "@aws-sdk/middleware-recursion-detection": "3.609.0",
+        "@aws-sdk/middleware-user-agent": "3.609.0",
+        "@aws-sdk/region-config-resolver": "3.609.0",
+        "@aws-sdk/types": "3.609.0",
+        "@aws-sdk/util-endpoints": "3.609.0",
+        "@aws-sdk/util-user-agent-browser": "3.609.0",
+        "@aws-sdk/util-user-agent-node": "3.609.0",
+        "@smithy/config-resolver": "^3.0.4",
+        "@smithy/core": "^2.2.4",
+        "@smithy/fetch-http-handler": "^3.2.0",
+        "@smithy/hash-node": "^3.0.3",
+        "@smithy/invalid-dependency": "^3.0.3",
+        "@smithy/middleware-content-length": "^3.0.3",
+        "@smithy/middleware-endpoint": "^3.0.4",
+        "@smithy/middleware-retry": "^3.0.7",
+        "@smithy/middleware-serde": "^3.0.3",
+        "@smithy/middleware-stack": "^3.0.3",
+        "@smithy/node-config-provider": "^3.1.3",
+        "@smithy/node-http-handler": "^3.1.1",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/smithy-client": "^3.1.5",
+        "@smithy/types": "^3.3.0",
+        "@smithy/url-parser": "^3.0.3",
+        "@smithy/util-base64": "^3.0.0",
+        "@smithy/util-body-length-browser": "^3.0.0",
+        "@smithy/util-body-length-node": "^3.0.0",
+        "@smithy/util-defaults-mode-browser": "^3.0.7",
+        "@smithy/util-defaults-mode-node": "^3.0.7",
+        "@smithy/util-endpoints": "^2.0.4",
+        "@smithy/util-middleware": "^3.0.3",
+        "@smithy/util-retry": "^3.0.3",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/client-sso-oidc": {
+      "version": "3.613.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.613.0.tgz",
+      "integrity": "sha512-VINgHA30f6Itjtj6ZAxkx86XhyFYa7UBfv2Ju+9QGcAr2Y3HU+Mh9g6QaTwDqIM5QG6Pgss24NaAItWGJHFf5A==",
+      "dev": true,
+      "dependencies": {
+        "@aws-crypto/sha256-browser": "5.2.0",
+        "@aws-crypto/sha256-js": "5.2.0",
+        "@aws-sdk/core": "3.609.0",
+        "@aws-sdk/credential-provider-node": "3.613.0",
+        "@aws-sdk/middleware-host-header": "3.609.0",
+        "@aws-sdk/middleware-logger": "3.609.0",
+        "@aws-sdk/middleware-recursion-detection": "3.609.0",
+        "@aws-sdk/middleware-user-agent": "3.609.0",
+        "@aws-sdk/region-config-resolver": "3.609.0",
+        "@aws-sdk/types": "3.609.0",
+        "@aws-sdk/util-endpoints": "3.609.0",
+        "@aws-sdk/util-user-agent-browser": "3.609.0",
+        "@aws-sdk/util-user-agent-node": "3.609.0",
+        "@smithy/config-resolver": "^3.0.4",
+        "@smithy/core": "^2.2.4",
+        "@smithy/fetch-http-handler": "^3.2.0",
+        "@smithy/hash-node": "^3.0.3",
+        "@smithy/invalid-dependency": "^3.0.3",
+        "@smithy/middleware-content-length": "^3.0.3",
+        "@smithy/middleware-endpoint": "^3.0.4",
+        "@smithy/middleware-retry": "^3.0.7",
+        "@smithy/middleware-serde": "^3.0.3",
+        "@smithy/middleware-stack": "^3.0.3",
+        "@smithy/node-config-provider": "^3.1.3",
+        "@smithy/node-http-handler": "^3.1.1",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/smithy-client": "^3.1.5",
+        "@smithy/types": "^3.3.0",
+        "@smithy/url-parser": "^3.0.3",
+        "@smithy/util-base64": "^3.0.0",
+        "@smithy/util-body-length-browser": "^3.0.0",
+        "@smithy/util-body-length-node": "^3.0.0",
+        "@smithy/util-defaults-mode-browser": "^3.0.7",
+        "@smithy/util-defaults-mode-node": "^3.0.7",
+        "@smithy/util-endpoints": "^2.0.4",
+        "@smithy/util-middleware": "^3.0.3",
+        "@smithy/util-retry": "^3.0.3",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      },
+      "peerDependencies": {
+        "@aws-sdk/client-sts": "^3.613.0"
+      }
+    },
+    "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/is-array-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz",
+      "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.15.6",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.15.4.tgz",
-      "integrity": "sha512-QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA==",
+    "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-buffer-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz",
+      "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.15.4"
+        "@smithy/is-array-buffer": "^3.0.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.14.5",
+    "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-utf8": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz",
+      "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-explode-assignable-expression": "^7.14.5",
-        "@babel/types": "^7.14.5"
+        "@smithy/util-buffer-from": "^3.0.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.14.5",
+    "node_modules/@aws-sdk/client-sso/node_modules/@smithy/is-array-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz",
+      "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.14.5",
-        "@babel/helper-validator-option": "^7.14.5",
-        "browserslist": "^4.16.6",
-        "semver": "^6.3.0"
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
-      "version": "6.3.0",
+    "node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-buffer-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz",
+      "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==",
       "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
+      "dependencies": {
+        "@smithy/is-array-buffer": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.15.0",
+    "node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-utf8": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz",
+      "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==",
+      "dev": true,
+      "dependencies": {
+        "@smithy/util-buffer-from": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/client-sts": {
+      "version": "3.613.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.613.0.tgz",
+      "integrity": "sha512-S+KvQI4XEivY3vyIY+IPY7Fw8vFvX/q3pkNC9qEhnAs+/w7vT6vhVBHsaugYVlsMuNtNvmyc8P+Q/gzOEtLCTw==",
+      "dev": true,
+      "dependencies": {
+        "@aws-crypto/sha256-browser": "5.2.0",
+        "@aws-crypto/sha256-js": "5.2.0",
+        "@aws-sdk/client-sso-oidc": "3.613.0",
+        "@aws-sdk/core": "3.609.0",
+        "@aws-sdk/credential-provider-node": "3.613.0",
+        "@aws-sdk/middleware-host-header": "3.609.0",
+        "@aws-sdk/middleware-logger": "3.609.0",
+        "@aws-sdk/middleware-recursion-detection": "3.609.0",
+        "@aws-sdk/middleware-user-agent": "3.609.0",
+        "@aws-sdk/region-config-resolver": "3.609.0",
+        "@aws-sdk/types": "3.609.0",
+        "@aws-sdk/util-endpoints": "3.609.0",
+        "@aws-sdk/util-user-agent-browser": "3.609.0",
+        "@aws-sdk/util-user-agent-node": "3.609.0",
+        "@smithy/config-resolver": "^3.0.4",
+        "@smithy/core": "^2.2.4",
+        "@smithy/fetch-http-handler": "^3.2.0",
+        "@smithy/hash-node": "^3.0.3",
+        "@smithy/invalid-dependency": "^3.0.3",
+        "@smithy/middleware-content-length": "^3.0.3",
+        "@smithy/middleware-endpoint": "^3.0.4",
+        "@smithy/middleware-retry": "^3.0.7",
+        "@smithy/middleware-serde": "^3.0.3",
+        "@smithy/middleware-stack": "^3.0.3",
+        "@smithy/node-config-provider": "^3.1.3",
+        "@smithy/node-http-handler": "^3.1.1",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/smithy-client": "^3.1.5",
+        "@smithy/types": "^3.3.0",
+        "@smithy/url-parser": "^3.0.3",
+        "@smithy/util-base64": "^3.0.0",
+        "@smithy/util-body-length-browser": "^3.0.0",
+        "@smithy/util-body-length-node": "^3.0.0",
+        "@smithy/util-defaults-mode-browser": "^3.0.7",
+        "@smithy/util-defaults-mode-node": "^3.0.7",
+        "@smithy/util-endpoints": "^2.0.4",
+        "@smithy/util-middleware": "^3.0.3",
+        "@smithy/util-retry": "^3.0.3",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/client-sts/node_modules/@smithy/is-array-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz",
+      "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-member-expression-to-functions": "^7.15.0",
-        "@babel/helper-optimise-call-expression": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.15.0",
-        "@babel/helper-split-export-declaration": "^7.14.5"
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.14.5",
+    "node_modules/@aws-sdk/client-sts/node_modules/@smithy/util-buffer-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz",
+      "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "regexpu-core": "^4.7.1"
+        "@smithy/is-array-buffer": "^3.0.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.2.3",
+    "node_modules/@aws-sdk/client-sts/node_modules/@smithy/util-utf8": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz",
+      "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==",
       "dev": true,
-      "license": "MIT",
       "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"
+        "@smithy/util-buffer-from": "^3.0.0",
+        "tslib": "^2.6.2"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.4.0-0"
+      "engines": {
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/helper-define-polyfill-provider/node_modules/semver": {
-      "version": "6.3.0",
+    "node_modules/@aws-sdk/core": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.609.0.tgz",
+      "integrity": "sha512-ptqw+DTxLr01+pKjDUuo53SEDzI+7nFM3WfQaEo0yhDg8vWw8PER4sWj1Ysx67ksctnZesPUjqxd5SHbtdBxiA==",
       "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
+      "dependencies": {
+        "@smithy/core": "^2.2.4",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/signature-v4": "^3.1.2",
+        "@smithy/smithy-client": "^3.1.5",
+        "@smithy/types": "^3.3.0",
+        "fast-xml-parser": "4.2.5",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/helper-explode-assignable-expression": {
-      "version": "7.14.5",
+    "node_modules/@aws-sdk/credential-provider-env": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.609.0.tgz",
+      "integrity": "sha512-v69ZCWcec2iuV9vLVJMa6fAb5xwkzN4jYIT8yjo2c4Ia/j976Q+TPf35Pnz5My48Xr94EFcaBazrWedF+kwfuQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.14.5"
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/property-provider": "^3.1.3",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/helper-fixtures": {
-      "version": "7.14.5",
+    "node_modules/@aws-sdk/credential-provider-http": {
+      "version": "3.613.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.613.0.tgz",
+      "integrity": "sha512-MCiUFxowFzprzIXFXsqbp/3DViJ7nFmBW+XJkoRQWqNmThbkz/E8sb40WmL9UFdZHJph2KDjzABKYH5f0lHZaA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "semver": "^6.3.0"
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/fetch-http-handler": "^3.2.0",
+        "@smithy/node-http-handler": "^3.1.1",
+        "@smithy/property-provider": "^3.1.3",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/smithy-client": "^3.1.5",
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-stream": "^3.0.5",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/helper-fixtures/node_modules/semver": {
-      "version": "6.3.0",
+    "node_modules/@aws-sdk/credential-provider-ini": {
+      "version": "3.613.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.613.0.tgz",
+      "integrity": "sha512-scHV7K0YpllYMWxPnqxssWU+7S3WNXH1m5Rw8Ax96pfcfnaoatiWXps2XSSdGlChdF9gNVnewjRKFOTLyyzdAw==",
       "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
+      "dependencies": {
+        "@aws-sdk/credential-provider-env": "3.609.0",
+        "@aws-sdk/credential-provider-http": "3.613.0",
+        "@aws-sdk/credential-provider-process": "3.609.0",
+        "@aws-sdk/credential-provider-sso": "3.609.0",
+        "@aws-sdk/credential-provider-web-identity": "3.609.0",
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/credential-provider-imds": "^3.1.3",
+        "@smithy/property-provider": "^3.1.3",
+        "@smithy/shared-ini-file-loader": "^3.1.3",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      },
+      "peerDependencies": {
+        "@aws-sdk/client-sts": "^3.613.0"
       }
     },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz",
-      "integrity": "sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==",
+    "node_modules/@aws-sdk/credential-provider-node": {
+      "version": "3.613.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.613.0.tgz",
+      "integrity": "sha512-n3yd0CDuUKcQFhjRLAQfQpZyZ2ddrHC7QOKQqE+Fkx+Fs5zoG+NRLK1EBkBW/G9zk8Ck4+rG3OOI3CuNpJ2PCw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-get-function-arity": "^7.15.4",
-        "@babel/template": "^7.15.4",
-        "@babel/types": "^7.15.4"
+        "@aws-sdk/credential-provider-env": "3.609.0",
+        "@aws-sdk/credential-provider-http": "3.613.0",
+        "@aws-sdk/credential-provider-ini": "3.613.0",
+        "@aws-sdk/credential-provider-process": "3.609.0",
+        "@aws-sdk/credential-provider-sso": "3.609.0",
+        "@aws-sdk/credential-provider-web-identity": "3.609.0",
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/credential-provider-imds": "^3.1.3",
+        "@smithy/property-provider": "^3.1.3",
+        "@smithy/shared-ini-file-loader": "^3.1.3",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/helper-get-function-arity": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz",
-      "integrity": "sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA==",
+    "node_modules/@aws-sdk/credential-provider-process": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.609.0.tgz",
+      "integrity": "sha512-Ux35nGOSJKZWUIM3Ny0ROZ8cqPRUEkh+tR3X2o9ydEbFiLq3eMMyEnHJqx4EeUjLRchidlm4CCid9GxMe5/gdw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.15.4"
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/property-provider": "^3.1.3",
+        "@smithy/shared-ini-file-loader": "^3.1.3",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz",
-      "integrity": "sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA==",
+    "node_modules/@aws-sdk/credential-provider-sso": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.609.0.tgz",
+      "integrity": "sha512-oQPGDKMMIxjvTcm86g07RPYeC7mCNk+29dPpY15ZAPRpAF7F0tircsC3wT9fHzNaKShEyK5LuI5Kg/uxsdy+Iw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.15.4"
+        "@aws-sdk/client-sso": "3.609.0",
+        "@aws-sdk/token-providers": "3.609.0",
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/property-provider": "^3.1.3",
+        "@smithy/shared-ini-file-loader": "^3.1.3",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.15.0",
+    "node_modules/@aws-sdk/credential-provider-web-identity": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.609.0.tgz",
+      "integrity": "sha512-U+PG8NhlYYF45zbr1km3ROtBMYqyyj/oK8NRp++UHHeuavgrP+4wJ4wQnlEaKvJBjevfo3+dlIBcaeQ7NYejWg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.15.0"
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/property-provider": "^3.1.3",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=16.0.0"
+      },
+      "peerDependencies": {
+        "@aws-sdk/client-sts": "^3.609.0"
       }
     },
-    "node_modules/@babel/helper-module-imports": {
-      "version": "7.14.5",
+    "node_modules/@aws-sdk/middleware-bucket-endpoint": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.609.0.tgz",
+      "integrity": "sha512-QhHRfr4e7FqaMUAnOAFdQVOR3yDLw40i1IZPo+TeiKyev9LEyYEX2l6DbdaIwAztofOpAxfFNj/IJ0V/efzz/w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.14.5"
+        "@aws-sdk/types": "3.609.0",
+        "@aws-sdk/util-arn-parser": "3.568.0",
+        "@smithy/node-config-provider": "^3.1.3",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-config-provider": "^3.0.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/helper-module-transforms": {
-      "version": "7.15.0",
+    "node_modules/@aws-sdk/middleware-expect-continue": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.609.0.tgz",
+      "integrity": "sha512-+zeg//mSer4JZRxOB/4mUOMUJyuYPwATnIC5moBB8P8Xe+mJaVRFy8qlCtzYNj2TycnlsBPzTK0j7P1yvDh97w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.15.0",
-        "@babel/helper-simple-access": "^7.14.8",
-        "@babel/helper-split-export-declaration": "^7.14.5",
-        "@babel/helper-validator-identifier": "^7.14.9",
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.15.0",
-        "@babel/types": "^7.15.0"
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.14.5",
+    "node_modules/@aws-sdk/middleware-flexible-checksums": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.609.0.tgz",
+      "integrity": "sha512-TJ4WE+ehT+qcrhr7/yJCzmJJPmUoPPWIbCnFzqGxauH/dpVBCslmd1vZg3h2VnfRiaDkc6f68dqYVc29CaurhQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.14.5"
+        "@aws-crypto/crc32": "5.2.0",
+        "@aws-crypto/crc32c": "5.2.0",
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/is-array-buffer": "^3.0.0",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/helper-plugin-test-runner": {
-      "version": "7.14.5",
+    "node_modules/@aws-sdk/middleware-flexible-checksums/node_modules/@smithy/is-array-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz",
+      "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-transform-fixture-test-runner": "^7.14.5"
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz",
-      "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.15.4.tgz",
-      "integrity": "sha512-v53MxgvMK/HCwckJ1bZrq6dNKlmwlyRNYM6ypaRTdXWGOE2c1/SCa6dL/HimhPulGhZKw9W0QhREM583F/t0vQ==",
+    "node_modules/@aws-sdk/middleware-flexible-checksums/node_modules/@smithy/util-buffer-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz",
+      "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.15.4",
-        "@babel/helper-wrap-function": "^7.15.4",
-        "@babel/types": "^7.15.4"
+        "@smithy/is-array-buffer": "^3.0.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/helper-replace-supers": {
-      "version": "7.15.0",
+    "node_modules/@aws-sdk/middleware-flexible-checksums/node_modules/@smithy/util-utf8": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz",
+      "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-member-expression-to-functions": "^7.15.0",
-        "@babel/helper-optimise-call-expression": "^7.14.5",
-        "@babel/traverse": "^7.15.0",
-        "@babel/types": "^7.15.0"
+        "@smithy/util-buffer-from": "^3.0.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.14.8",
+    "node_modules/@aws-sdk/middleware-host-header": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.609.0.tgz",
+      "integrity": "sha512-iTKfo158lc4jLDfYeZmYMIBHsn8m6zX+XB6birCSNZ/rrlzAkPbGE43CNdKfvjyWdqgLMRXF+B+OcZRvqhMXPQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.14.8"
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.14.5",
+    "node_modules/@aws-sdk/middleware-location-constraint": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.609.0.tgz",
+      "integrity": "sha512-xzsdoTkszGVqGVPjUmgoP7TORiByLueMHieI1fhQL888WPdqctwAx3ES6d/bA9Q/i8jnc6hs+Fjhy8UvBTkE9A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.14.5"
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz",
-      "integrity": "sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw==",
+    "node_modules/@aws-sdk/middleware-logger": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.609.0.tgz",
+      "integrity": "sha512-S62U2dy4jMDhDFDK5gZ4VxFdWzCtLzwbYyFZx2uvPYTECkepLUfzLic2BHg2Qvtu4QjX+oGE3P/7fwaGIsGNuQ==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.15.4"
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/helper-transform-fixture-test-runner": {
-      "version": "7.14.5",
+    "node_modules/@aws-sdk/middleware-recursion-detection": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.609.0.tgz",
+      "integrity": "sha512-6sewsYB7/o/nbUfA99Aa/LokM+a/u4Wpm/X2o0RxOsDtSB795ObebLJe2BxY5UssbGaWkn7LswyfvrdZNXNj1w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/core": "^7.14.5",
-        "@babel/helper-fixtures": "^7.14.5",
-        "babel-check-duplicated-nodes": "^1.0.0",
-        "quick-lru": "5.1.0",
-        "regenerator-runtime": "^0.13.7",
-        "source-map": "^0.5.0"
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.15.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz",
-      "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==",
+    "node_modules/@aws-sdk/middleware-sdk-s3": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.609.0.tgz",
+      "integrity": "sha512-kvwjL6OJFhAGWoYaIWR7HmILjiVk6xVj6QEU6qZMA7FtGgvlKi4pLfs8Of+hQqo+2TEhUoxG/5t6WqwB8uxjsw==",
       "dev": true,
+      "dependencies": {
+        "@aws-sdk/types": "3.609.0",
+        "@aws-sdk/util-arn-parser": "3.568.0",
+        "@smithy/node-config-provider": "^3.1.3",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/signature-v4": "^3.1.2",
+        "@smithy/smithy-client": "^3.1.5",
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-config-provider": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/helper-validator-option": {
-      "version": "7.14.5",
+    "node_modules/@aws-sdk/middleware-signing": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.609.0.tgz",
+      "integrity": "sha512-2w3dBLjQVKIajYzokO4hduq8/0hSMUYHHmIo1Kdl+MSY8uwRBt12bLL6pyreobTcRMxizvn2ph/CQ9I1ST/WGQ==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/property-provider": "^3.1.3",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/signature-v4": "^3.1.2",
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-middleware": "^3.0.3",
+        "tslib": "^2.6.2"
+      },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/helper-wrap-function": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.15.4.tgz",
-      "integrity": "sha512-Y2o+H/hRV5W8QhIfTpRIBwl57y8PrZt6JM3V8FOo5qarjshHItyH5lXlpMfBfmBefOqSCpKZs/6Dxqp0E/U+uw==",
+    "node_modules/@aws-sdk/middleware-ssec": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.609.0.tgz",
+      "integrity": "sha512-GZSD1s7+JswWOTamVap79QiDaIV7byJFssBW68GYjyRS5EBjNfwA/8s+6uE6g39R3ojyTbYOmvcANoZEhSULXg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-function-name": "^7.15.4",
-        "@babel/template": "^7.15.4",
-        "@babel/traverse": "^7.15.4",
-        "@babel/types": "^7.15.4"
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/helpers": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.4.tgz",
-      "integrity": "sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==",
+    "node_modules/@aws-sdk/middleware-user-agent": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.609.0.tgz",
+      "integrity": "sha512-nbq7MXRmeXm4IDqh+sJRAxGPAq0OfGmGIwKvJcw66hLoG8CmhhVMZmIAEBDFr57S+YajGwnLLRt+eMI05MMeVA==",
       "dev": true,
       "dependencies": {
-        "@babel/template": "^7.15.4",
-        "@babel/traverse": "^7.15.4",
-        "@babel/types": "^7.15.4"
+        "@aws-sdk/types": "3.609.0",
+        "@aws-sdk/util-endpoints": "3.609.0",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/highlight": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
-      "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
+    "node_modules/@aws-sdk/region-config-resolver": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.609.0.tgz",
+      "integrity": "sha512-lMHBG8zg9GWYBc9/XVPKyuAUd7iKqfPP7z04zGta2kGNOKbUTeqmAdc1gJGku75p4kglIPlGBorOxti8DhRmKw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.14.5",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/node-config-provider": "^3.1.3",
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-config-provider": "^3.0.0",
+        "@smithy/util-middleware": "^3.0.3",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/parser": {
-      "version": "7.15.8",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.8.tgz",
-      "integrity": "sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==",
+    "node_modules/@aws-sdk/signature-v4-multi-region": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.609.0.tgz",
+      "integrity": "sha512-FJs0BxVMyYOKNu7nzFI1kehfgWoYmdto5B8BSS29geUACF7jlOoeCfNZWVrnMjvAxVlSQ5O7Mr575932BnsycA==",
       "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
+      "dependencies": {
+        "@aws-sdk/middleware-sdk-s3": "3.609.0",
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/signature-v4": "^3.1.2",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.14.5",
+    "node_modules/@aws-sdk/token-providers": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.609.0.tgz",
+      "integrity": "sha512-WvhW/7XSf+H7YmtiIigQxfDVZVZI7mbKikQ09YpzN7FeN3TmYib1+0tB+EE9TbICkwssjiFc71FEBEh4K9grKQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5",
-        "@babel/plugin-proposal-optional-chaining": "^7.14.5"
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/property-provider": "^3.1.3",
+        "@smithy/shared-ini-file-loader": "^3.1.3",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=16.0.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.13.0"
+        "@aws-sdk/client-sso-oidc": "^3.609.0"
       }
     },
-    "node_modules/@babel/plugin-proposal-class-properties": {
-      "version": "7.14.5",
+    "node_modules/@aws-sdk/types": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.609.0.tgz",
+      "integrity": "sha512-+Tqnh9w0h2LcrUsdXyT1F8mNhXz+tVYBtP19LpeEGntmvHwa2XzvLUCWpoIAIVsHp5+HdB2X9Sn0KAtmbFXc2Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/plugin-proposal-class-static-block": {
-      "version": "7.14.5",
+    "node_modules/@aws-sdk/util-arn-parser": {
+      "version": "3.568.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.568.0.tgz",
+      "integrity": "sha512-XUKJWWo+KOB7fbnPP0+g/o5Ulku/X53t7i/h+sPHr5xxYTJJ9CYnbToo95mzxe7xWvkLrsNtJ8L+MnNn9INs2w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.12.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/plugin-proposal-dynamic-import": {
-      "version": "7.14.5",
+    "node_modules/@aws-sdk/util-endpoints": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.609.0.tgz",
+      "integrity": "sha512-Rh+3V8dOvEeE1aQmUy904DYWtLUEJ7Vf5XBPlQ6At3pBhp+zpXbsnpZzVL33c8lW1xfj6YPwtO6gOeEsl1juCQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-endpoints": "^2.0.4",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.14.5",
+    "node_modules/@aws-sdk/util-locate-window": {
+      "version": "3.310.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.310.0.tgz",
+      "integrity": "sha512-qo2t/vBTnoXpjKxlsC2e1gBrRm80M3bId27r0BRB2VniSSe7bL1mmzM+/HFtujm0iAxtPM+aLEflLJlJeDPg0w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+        "tslib": "^2.5.0"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=14.0.0"
       }
     },
-    "node_modules/@babel/plugin-proposal-json-strings": {
-      "version": "7.14.5",
+    "node_modules/@aws-sdk/util-user-agent-browser": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.609.0.tgz",
+      "integrity": "sha512-fojPU+mNahzQ0YHYBsx0ZIhmMA96H+ZIZ665ObU9tl+SGdbLneVZVikGve+NmHTQwHzwkFsZYYnVKAkreJLAtA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/types": "^3.3.0",
+        "bowser": "^2.11.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "node_modules/@aws-sdk/util-user-agent-node": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.609.0.tgz",
+      "integrity": "sha512-DlZBwQ/HkZyf3pOWc7+wjJRk5R7x9YxHhs2szHwtv1IW30KMabjjjX0GMlGJ9LLkBHkbaaEY/w9Tkj12XRLhRg==",
+      "dev": true,
+      "dependencies": {
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/node-config-provider": "^3.1.3",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=16.0.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "aws-crt": ">=1.0.0"
+      },
+      "peerDependenciesMeta": {
+        "aws-crt": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.14.5",
+    "node_modules/@aws-sdk/xml-builder": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.609.0.tgz",
+      "integrity": "sha512-l9XxNcA4HX98rwCC2/KoiWcmEiRfZe4G+mYwDbCFT87JIMj6GBhLDkAzr/W8KAaA2IDr8Vc6J8fZPgVulxxfMA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.14.5",
+    "node_modules/@babel/code-frame": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
+      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+        "@babel/highlight": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-numeric-separator": {
-      "version": "7.14.5",
+    "node_modules/@babel/compat-data": {
+      "version": "7.15.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz",
+      "integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
-      },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.15.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.15.6.tgz",
-      "integrity": "sha512-qtOHo7A1Vt+O23qEAX+GdBpqaIuD3i9VRrWgCJeq7WO6H2d14EK3q11urj5Te2MAeK97nMiIdRpwd/ST4JFbNg==",
+    "node_modules/@babel/core": {
+      "version": "7.15.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.0.tgz",
+      "integrity": "sha512-tXtmTminrze5HEUPn/a0JtOzzfp0nk+UEXQ/tqIJo3WDGypl/2OFQEMll/zSFU8f/lfmfLXvTaORHF3cfXIQMw==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.15.0",
-        "@babel/helper-compilation-targets": "^7.15.4",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.15.4"
+        "@babel/code-frame": "^7.14.5",
+        "@babel/generator": "^7.15.0",
+        "@babel/helper-compilation-targets": "^7.15.0",
+        "@babel/helper-module-transforms": "^7.15.0",
+        "@babel/helpers": "^7.14.8",
+        "@babel/parser": "^7.15.0",
+        "@babel/template": "^7.14.5",
+        "@babel/traverse": "^7.15.0",
+        "@babel/types": "^7.15.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"
       },
       "engines": {
         "node": ">=6.9.0"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
       }
     },
-    "node_modules/@babel/plugin-proposal-object-rest-spread/node_modules/@babel/helper-compilation-targets": {
+    "node_modules/@babel/core/node_modules/@babel/helper-compilation-targets": {
       "version": "7.15.4",
       "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz",
       "integrity": "sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==",
@@ -1015,455 +1319,477 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/plugin-proposal-object-rest-spread/node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.15.4.tgz",
-      "integrity": "sha512-9WB/GUTO6lvJU3XQsSr6J/WKvBC2hcs4Pew8YxZagi6GkTdniyqp8On5kqdK8MN0LMeu0mGbhPN+O049NV/9FQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-object-rest-spread/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+    "node_modules/@babel/core/node_modules/semver": {
+      "version": "6.3.0",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
     },
-    "node_modules/@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.14.5",
+    "node_modules/@babel/generator": {
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.8.tgz",
+      "integrity": "sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+        "@babel/types": "^7.16.8",
+        "jsesc": "^2.5.1",
+        "source-map": "^0.5.0"
       },
       "engines": {
         "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-annotate-as-pure": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
+      "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.16.7"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/plugin-proposal-optional-chaining": {
+    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
       "version": "7.14.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+        "@babel/helper-explode-assignable-expression": "^7.14.5",
+        "@babel/types": "^7.14.5"
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-private-methods": {
+    "node_modules/@babel/helper-compilation-targets": {
       "version": "7.14.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/compat-data": "^7.14.5",
+        "@babel/helper-validator-option": "^7.14.5",
+        "browserslist": "^4.16.6",
+        "semver": "^6.3.0"
       },
       "engines": {
         "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.14.5",
+    "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
+      "version": "6.3.0",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/helper-create-class-features-plugin": {
+      "version": "7.16.10",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.10.tgz",
+      "integrity": "sha512-wDeej0pu3WN/ffTxMNCPW5UCiOav8IcLRxSIyp/9+IF2xJUM9h/OYjg0IJLHaL6F8oU8kqMz9nc1vryXhMsgXg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-create-class-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+        "@babel/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"
       },
       "engines": {
         "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/plugin-proposal-unicode-property-regex": {
+    "node_modules/@babel/helper-create-regexp-features-plugin": {
       "version": "7.14.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-annotate-as-pure": "^7.14.5",
+        "regexpu-core": "^4.7.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/plugin-syntax-async-generators": {
-      "version": "7.8.4",
+    "node_modules/@babel/helper-define-polyfill-provider": {
+      "version": "0.2.3",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+        "@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.0.0-0"
+        "@babel/core": "^7.4.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-class-properties": {
-      "version": "7.12.13",
+    "node_modules/@babel/helper-define-polyfill-provider/node_modules/semver": {
+      "version": "6.3.0",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/helper-environment-visitor": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz",
+      "integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/types": "^7.16.7"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/plugin-syntax-class-static-block": {
+    "node_modules/@babel/helper-explode-assignable-expression": {
       "version": "7.14.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/types": "^7.14.5"
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-dynamic-import": {
-      "version": "7.8.3",
+    "node_modules/@babel/helper-fixtures": {
+      "version": "7.14.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+        "semver": "^6.3.0"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/plugin-syntax-export-namespace-from": {
-      "version": "7.8.3",
+    "node_modules/@babel/helper-fixtures/node_modules/semver": {
+      "version": "6.3.0",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/helper-function-name": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz",
+      "integrity": "sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
+        "@babel/helper-get-function-arity": "^7.16.7",
+        "@babel/template": "^7.16.7",
+        "@babel/types": "^7.16.7"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/plugin-syntax-flow": {
-      "version": "7.14.5",
+    "node_modules/@babel/helper-get-function-arity": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz",
+      "integrity": "sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/types": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-import-assertions": {
-      "version": "7.14.5",
+    "node_modules/@babel/helper-hoist-variables": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
+      "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/types": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-json-strings": {
-      "version": "7.8.3",
+    "node_modules/@babel/helper-member-expression-to-functions": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz",
+      "integrity": "sha512-VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+        "@babel/types": "^7.16.7"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/plugin-syntax-jsx": {
+    "node_modules/@babel/helper-module-imports": {
       "version": "7.14.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/types": "^7.14.5"
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
-      "version": "7.10.4",
+    "node_modules/@babel/helper-module-transforms": {
+      "version": "7.15.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-module-imports": "^7.14.5",
+        "@babel/helper-replace-supers": "^7.15.0",
+        "@babel/helper-simple-access": "^7.14.8",
+        "@babel/helper-split-export-declaration": "^7.14.5",
+        "@babel/helper-validator-identifier": "^7.14.9",
+        "@babel/template": "^7.14.5",
+        "@babel/traverse": "^7.15.0",
+        "@babel/types": "^7.15.0"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
-      "version": "7.8.3",
+    "node_modules/@babel/helper-optimise-call-expression": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz",
+      "integrity": "sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+        "@babel/types": "^7.16.7"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/plugin-syntax-numeric-separator": {
-      "version": "7.10.4",
+    "node_modules/@babel/helper-plugin-test-runner": {
+      "version": "7.14.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-transform-fixture-test-runner": "^7.14.5"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.8.3",
+    "node_modules/@babel/helper-plugin-utils": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz",
+      "integrity": "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
-      "version": "7.8.3",
+    "node_modules/@babel/helper-remap-async-to-generator": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.15.4.tgz",
+      "integrity": "sha512-v53MxgvMK/HCwckJ1bZrq6dNKlmwlyRNYM6ypaRTdXWGOE2c1/SCa6dL/HimhPulGhZKw9W0QhREM583F/t0vQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+        "@babel/helper-annotate-as-pure": "^7.15.4",
+        "@babel/helper-wrap-function": "^7.15.4",
+        "@babel/types": "^7.15.4"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/plugin-syntax-optional-chaining": {
-      "version": "7.8.3",
+    "node_modules/@babel/helper-replace-supers": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz",
+      "integrity": "sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+        "@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"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/plugin-syntax-private-property-in-object": {
-      "version": "7.14.5",
+    "node_modules/@babel/helper-simple-access": {
+      "version": "7.14.8",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/types": "^7.14.8"
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-top-level-await": {
+    "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
       "version": "7.14.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/types": "^7.14.5"
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-typescript": {
-      "version": "7.14.5",
+    "node_modules/@babel/helper-split-export-declaration": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
+      "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/types": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.14.5",
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
+      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-async-to-generator": {
+    "node_modules/@babel/helper-transform-fixture-test-runner": {
       "version": "7.14.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-remap-async-to-generator": "^7.14.5"
+        "@babel/code-frame": "^7.14.5",
+        "@babel/core": "^7.14.5",
+        "@babel/helper-fixtures": "^7.14.5",
+        "babel-check-duplicated-nodes": "^1.0.0",
+        "quick-lru": "5.1.0",
+        "regenerator-runtime": "^0.13.7",
+        "source-map": "^0.5.0"
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.14.5",
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.14.5",
+    "node_modules/@babel/helper-validator-option": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
+      "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.9.tgz",
-      "integrity": "sha512-NfZpTcxU3foGWbl4wxmZ35mTsYJy8oQocbeIMoDAGGFarAmSQlL+LWMkDx/tj6pNotpbX3rltIA4dprgAPOq5A==",
+    "node_modules/@babel/helper-wrap-function": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.15.4.tgz",
+      "integrity": "sha512-Y2o+H/hRV5W8QhIfTpRIBwl57y8PrZt6JM3V8FOo5qarjshHItyH5lXlpMfBfmBefOqSCpKZs/6Dxqp0E/U+uw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-optimise-call-expression": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.14.5",
-        "@babel/helper-split-export-declaration": "^7.14.5",
-        "globals": "^11.1.0"
+        "@babel/helper-function-name": "^7.15.4",
+        "@babel/template": "^7.15.4",
+        "@babel/traverse": "^7.15.4",
+        "@babel/types": "^7.15.4"
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.14.5",
+    "node_modules/@babel/helpers": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.4.tgz",
+      "integrity": "sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/template": "^7.15.4",
+        "@babel/traverse": "^7.15.4",
+        "@babel/types": "^7.15.4"
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.14.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz",
-      "integrity": "sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw==",
+    "node_modules/@babel/highlight": {
+      "version": "7.16.10",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz",
+      "integrity": "sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-validator-identifier": "^7.16.7",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
       },
       "engines": {
         "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.23.9",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.9.tgz",
+      "integrity": "sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==",
+      "dev": true,
+      "bin": {
+        "parser": "bin/babel-parser.js"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "engines": {
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-dotall-regex": {
+    "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
       "version": "7.14.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5",
+        "@babel/plugin-proposal-optional-chaining": "^7.14.5"
       },
       "engines": {
         "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.13.0"
       }
     },
-    "node_modules/@babel/plugin-transform-duplicate-keys": {
+    "node_modules/@babel/plugin-proposal-class-properties": {
       "version": "7.14.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.14.5",
         "@babel/helper-plugin-utils": "^7.14.5"
       },
       "engines": {
@@ -1473,28 +1799,29 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-exponentiation-operator": {
+    "node_modules/@babel/plugin-proposal-class-static-block": {
       "version": "7.14.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-create-class-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5"
       },
       "engines": {
         "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.12.0"
       }
     },
-    "node_modules/@babel/plugin-transform-flow-strip-types": {
+    "node_modules/@babel/plugin-proposal-dynamic-import": {
       "version": "7.14.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-flow": "^7.14.5"
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1503,12 +1830,13 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-for-of": {
+    "node_modules/@babel/plugin-proposal-export-namespace-from": {
       "version": "7.14.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1517,13 +1845,13 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-function-name": {
+    "node_modules/@babel/plugin-proposal-json-strings": {
       "version": "7.14.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-json-strings": "^7.8.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1532,12 +1860,13 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-literals": {
+    "node_modules/@babel/plugin-proposal-logical-assignment-operators": {
       "version": "7.14.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1546,12 +1875,13 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-member-expression-literals": {
+    "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
       "version": "7.14.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1560,14 +1890,13 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-amd": {
+    "node_modules/@babel/plugin-proposal-numeric-separator": {
       "version": "7.14.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.14.5",
         "@babel/helper-plugin-utils": "^7.14.5",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1576,15 +1905,17 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.15.0",
+    "node_modules/@babel/plugin-proposal-object-rest-spread": {
+      "version": "7.15.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.15.6.tgz",
+      "integrity": "sha512-qtOHo7A1Vt+O23qEAX+GdBpqaIuD3i9VRrWgCJeq7WO6H2d14EK3q11urj5Te2MAeK97nMiIdRpwd/ST4JFbNg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.15.0",
+        "@babel/compat-data": "^7.15.0",
+        "@babel/helper-compilation-targets": "^7.15.4",
         "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-simple-access": "^7.14.8",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.15.4"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1593,30 +1924,30 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.14.5",
+    "node_modules/@babel/plugin-proposal-object-rest-spread/node_modules/@babel/helper-compilation-targets": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz",
+      "integrity": "sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-hoist-variables": "^7.14.5",
-        "@babel/helper-module-transforms": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-validator-identifier": "^7.14.5",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
+        "@babel/compat-data": "^7.15.0",
+        "@babel/helper-validator-option": "^7.14.5",
+        "browserslist": "^4.16.6",
+        "semver": "^6.3.0"
       },
       "engines": {
         "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.14.5",
+    "node_modules/@babel/plugin-proposal-object-rest-spread/node_modules/@babel/plugin-transform-parameters": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.15.4.tgz",
+      "integrity": "sha512-9WB/GUTO6lvJU3XQsSr6J/WKvBC2hcs4Pew8YxZagi6GkTdniyqp8On5kqdK8MN0LMeu0mGbhPN+O049NV/9FQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.14.5",
         "@babel/helper-plugin-utils": "^7.14.5"
       },
       "engines": {
@@ -1626,12 +1957,22 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-new-target": {
+    "node_modules/@babel/plugin-proposal-object-rest-spread/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/@babel/plugin-proposal-optional-catch-binding": {
       "version": "7.14.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1640,13 +1981,14 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-object-super": {
+    "node_modules/@babel/plugin-proposal-optional-chaining": {
       "version": "7.14.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.14.5"
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1655,11 +1997,12 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-property-literals": {
+    "node_modules/@babel/plugin-proposal-private-methods": {
       "version": "7.14.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.14.5",
         "@babel/helper-plugin-utils": "^7.14.5"
       },
       "engines": {
@@ -1669,17 +2012,15 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-react-jsx": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.9.tgz",
-      "integrity": "sha512-30PeETvS+AeD1f58i1OVyoDlVYQhap/K20ZrMjLmmzmC2AYR/G43D4sdJAaDAqCD3MYpSWbmrz3kES158QSLjw==",
+    "node_modules/@babel/plugin-proposal-private-property-in-object": {
+      "version": "7.14.5",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-module-imports": "^7.14.5",
+        "@babel/helper-create-class-features-plugin": "^7.14.5",
         "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-jsx": "^7.14.5",
-        "@babel/types": "^7.14.9"
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1688,64 +2029,56 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-regenerator": {
+    "node_modules/@babel/plugin-proposal-unicode-property-regex": {
       "version": "7.14.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "regenerator-transform": "^0.14.2"
+        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=4"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.14.5",
+    "node_modules/@babel/plugin-syntax-async-generators": {
+      "version": "7.8.4",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.8.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.14.5",
+    "node_modules/@babel/plugin-syntax-bigint": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
+      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.8.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.14.6",
+    "node_modules/@babel/plugin-syntax-class-properties": {
+      "version": "7.12.13",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.12.13"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-sticky-regex": {
+    "node_modules/@babel/plugin-syntax-class-static-block": {
       "version": "7.14.5",
       "dev": true,
       "license": "MIT",
@@ -1759,21 +2092,29 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.14.5",
+    "node_modules/@babel/plugin-syntax-dynamic-import": {
+      "version": "7.8.3",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.8.0"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-export-namespace-from": {
+      "version": "7.8.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.3"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-typeof-symbol": {
+    "node_modules/@babel/plugin-syntax-import-assertions": {
       "version": "7.14.5",
       "dev": true,
       "license": "MIT",
@@ -1787,42 +2128,34 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-typescript": {
-      "version": "7.15.0",
+    "node_modules/@babel/plugin-syntax-import-meta": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.15.0",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-typescript": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.14.5",
+    "node_modules/@babel/plugin-syntax-json-strings": {
+      "version": "7.8.3",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.8.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-unicode-regex": {
+    "node_modules/@babel/plugin-syntax-jsx": {
       "version": "7.14.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
         "@babel/helper-plugin-utils": "^7.14.5"
       },
       "engines": {
@@ -1832,174 +2165,78 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/preset-env": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.0.tgz",
-      "integrity": "sha512-FhEpCNFCcWW3iZLg0L2NPE9UerdtsCR6ZcsGHUX6Om6kbCQeL5QZDqFDmeNHC6/fy6UH3jEge7K4qG5uC9In0Q==",
+    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
+      "version": "7.10.4",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.15.0",
-        "@babel/helper-compilation-targets": "^7.15.0",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-validator-option": "^7.14.5",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.14.5",
-        "@babel/plugin-proposal-async-generator-functions": "^7.14.9",
-        "@babel/plugin-proposal-class-properties": "^7.14.5",
-        "@babel/plugin-proposal-class-static-block": "^7.14.5",
-        "@babel/plugin-proposal-dynamic-import": "^7.14.5",
-        "@babel/plugin-proposal-export-namespace-from": "^7.14.5",
-        "@babel/plugin-proposal-json-strings": "^7.14.5",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.14.5",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5",
-        "@babel/plugin-proposal-numeric-separator": "^7.14.5",
-        "@babel/plugin-proposal-object-rest-spread": "^7.14.7",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.14.5",
-        "@babel/plugin-proposal-optional-chaining": "^7.14.5",
-        "@babel/plugin-proposal-private-methods": "^7.14.5",
-        "@babel/plugin-proposal-private-property-in-object": "^7.14.5",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.14.5",
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-class-properties": "^7.12.13",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@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.14.5",
-        "@babel/plugin-transform-async-to-generator": "^7.14.5",
-        "@babel/plugin-transform-block-scoped-functions": "^7.14.5",
-        "@babel/plugin-transform-block-scoping": "^7.14.5",
-        "@babel/plugin-transform-classes": "^7.14.9",
-        "@babel/plugin-transform-computed-properties": "^7.14.5",
-        "@babel/plugin-transform-destructuring": "^7.14.7",
-        "@babel/plugin-transform-dotall-regex": "^7.14.5",
-        "@babel/plugin-transform-duplicate-keys": "^7.14.5",
-        "@babel/plugin-transform-exponentiation-operator": "^7.14.5",
-        "@babel/plugin-transform-for-of": "^7.14.5",
-        "@babel/plugin-transform-function-name": "^7.14.5",
-        "@babel/plugin-transform-literals": "^7.14.5",
-        "@babel/plugin-transform-member-expression-literals": "^7.14.5",
-        "@babel/plugin-transform-modules-amd": "^7.14.5",
-        "@babel/plugin-transform-modules-commonjs": "^7.15.0",
-        "@babel/plugin-transform-modules-systemjs": "^7.14.5",
-        "@babel/plugin-transform-modules-umd": "^7.14.5",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.14.9",
-        "@babel/plugin-transform-new-target": "^7.14.5",
-        "@babel/plugin-transform-object-super": "^7.14.5",
-        "@babel/plugin-transform-parameters": "^7.14.5",
-        "@babel/plugin-transform-property-literals": "^7.14.5",
-        "@babel/plugin-transform-regenerator": "^7.14.5",
-        "@babel/plugin-transform-reserved-words": "^7.14.5",
-        "@babel/plugin-transform-shorthand-properties": "^7.14.5",
-        "@babel/plugin-transform-spread": "^7.14.6",
-        "@babel/plugin-transform-sticky-regex": "^7.14.5",
-        "@babel/plugin-transform-template-literals": "^7.14.5",
-        "@babel/plugin-transform-typeof-symbol": "^7.14.5",
-        "@babel/plugin-transform-unicode-escapes": "^7.14.5",
-        "@babel/plugin-transform-unicode-regex": "^7.14.5",
-        "@babel/preset-modules": "^0.1.4",
-        "@babel/types": "^7.15.0",
-        "babel-plugin-polyfill-corejs2": "^0.2.2",
-        "babel-plugin-polyfill-corejs3": "^0.2.2",
-        "babel-plugin-polyfill-regenerator": "^0.2.2",
-        "core-js-compat": "^3.16.0",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/preset-env/node_modules/@babel/helper-compilation-targets": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz",
-      "integrity": "sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==",
+    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.15.0",
-        "@babel/helper-validator-option": "^7.14.5",
-        "browserslist": "^4.16.6",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.8.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/preset-env/node_modules/@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.15.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.15.8.tgz",
-      "integrity": "sha512-2Z5F2R2ibINTc63mY7FLqGfEbmofrHU9FitJW1Q7aPaKFhiPvSq6QEt/BoWN5oME3GVyjcRuNNSRbb9LC0CSWA==",
+    "node_modules/@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.4",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-remap-async-to-generator": "^7.15.4",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/preset-env/node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz",
-      "integrity": "sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA==",
+    "node_modules/@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.8.3",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.8.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/preset-env/node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.15.4.tgz",
-      "integrity": "sha512-9WB/GUTO6lvJU3XQsSr6J/WKvBC2hcs4Pew8YxZagi6GkTdniyqp8On5kqdK8MN0LMeu0mGbhPN+O049NV/9FQ==",
+    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.8.3",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.8.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/preset-env/node_modules/semver": {
-      "version": "6.3.0",
+    "node_modules/@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
       "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/preset-flow": {
+    "node_modules/@babel/plugin-syntax-private-property-in-object": {
       "version": "7.14.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-validator-option": "^7.14.5",
-        "@babel/plugin-transform-flow-strip-types": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.14.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2008,29 +2245,27 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/preset-modules": {
-      "version": "0.1.4",
+    "node_modules/@babel/plugin-syntax-top-level-await": {
+      "version": "7.14.5",
       "dev": true,
       "license": "MIT",
       "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/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/preset-typescript": {
-      "version": "7.15.0",
+    "node_modules/@babel/plugin-syntax-typescript": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.7.tgz",
+      "integrity": "sha512-YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-validator-option": "^7.14.5",
-        "@babel/plugin-transform-typescript": "^7.15.0"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2039,16 +2274,12 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/register": {
-      "version": "7.15.3",
+    "node_modules/@babel/plugin-transform-arrow-functions": {
+      "version": "7.14.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "clone-deep": "^4.0.1",
-        "find-cache-dir": "^2.0.0",
-        "make-dir": "^2.1.0",
-        "pirates": "^4.0.0",
-        "source-map-support": "^0.5.16"
+        "@babel/helper-plugin-utils": "^7.14.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2057,1462 +2288,1409 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/register/node_modules/make-dir": {
-      "version": "2.1.0",
+    "node_modules/@babel/plugin-transform-async-to-generator": {
+      "version": "7.14.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "pify": "^4.0.1",
-        "semver": "^5.6.0"
+        "@babel/helper-module-imports": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-remap-async-to-generator": "^7.14.5"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/register/node_modules/pify": {
-      "version": "4.0.1",
+    "node_modules/@babel/plugin-transform-block-scoped-functions": {
+      "version": "7.14.5",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
       "engines": {
-        "node": ">=6"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/register/node_modules/semver": {
-      "version": "5.7.1",
+    "node_modules/@babel/plugin-transform-block-scoping": {
+      "version": "7.14.5",
       "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/@babel/runtime": {
-      "version": "7.15.3",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.3.tgz",
-      "integrity": "sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==",
+      "license": "MIT",
       "dependencies": {
-        "regenerator-runtime": "^0.13.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/template": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.15.4.tgz",
-      "integrity": "sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==",
+    "node_modules/@babel/plugin-transform-classes": {
+      "version": "7.14.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.9.tgz",
+      "integrity": "sha512-NfZpTcxU3foGWbl4wxmZ35mTsYJy8oQocbeIMoDAGGFarAmSQlL+LWMkDx/tj6pNotpbX3rltIA4dprgAPOq5A==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/parser": "^7.15.4",
-        "@babel/types": "^7.15.4"
+        "@babel/helper-annotate-as-pure": "^7.14.5",
+        "@babel/helper-function-name": "^7.14.5",
+        "@babel/helper-optimise-call-expression": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-replace-supers": "^7.14.5",
+        "@babel/helper-split-export-declaration": "^7.14.5",
+        "globals": "^11.1.0"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/traverse": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.4.tgz",
-      "integrity": "sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==",
+    "node_modules/@babel/plugin-transform-computed-properties": {
+      "version": "7.14.5",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/generator": "^7.15.4",
-        "@babel/helper-function-name": "^7.15.4",
-        "@babel/helper-hoist-variables": "^7.15.4",
-        "@babel/helper-split-export-declaration": "^7.15.4",
-        "@babel/parser": "^7.15.4",
-        "@babel/types": "^7.15.4",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
+        "@babel/helper-plugin-utils": "^7.14.5"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/types": {
-      "version": "7.15.6",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.6.tgz",
-      "integrity": "sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==",
+    "node_modules/@babel/plugin-transform-destructuring": {
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz",
+      "integrity": "sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.14.9",
-        "to-fast-properties": "^2.0.0"
+        "@babel/helper-plugin-utils": "^7.14.5"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@bcoe/v8-coverage": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
-      "dev": true
-    },
-    "node_modules/@chiragrupani/karma-chromium-edge-launcher": {
-      "version": "2.1.1",
-      "dev": true,
-      "license": "MIT Based"
-    },
-    "node_modules/@concordance/react": {
-      "version": "2.0.0",
+    "node_modules/@babel/plugin-transform-dotall-regex": {
+      "version": "7.14.5",
       "dev": true,
-      "license": "ISC",
+      "license": "MIT",
       "dependencies": {
-        "arrify": "^1.0.1"
+        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
       },
       "engines": {
-        "node": ">=6.12.3 <7 || >=8.9.4 <9 || >=10.0.0"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@concordance/react/node_modules/arrify": {
-      "version": "1.0.1",
+    "node_modules/@babel/plugin-transform-duplicate-keys": {
+      "version": "7.14.5",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@emotion/is-prop-valid": {
-      "version": "0.7.3",
+    "node_modules/@babel/plugin-transform-exponentiation-operator": {
+      "version": "7.14.5",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@emotion/memoize": "0.7.1"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@emotion/memoize": {
-      "version": "0.7.1",
-      "license": "MIT"
-    },
-    "node_modules/@es-joy/jsdoccomment": {
-      "version": "0.10.8",
+    "node_modules/@babel/plugin-transform-for-of": {
+      "version": "7.14.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "comment-parser": "1.2.4",
-        "esquery": "^1.4.0",
-        "jsdoc-type-pratt-parser": "1.1.1"
+        "@babel/helper-plugin-utils": "^7.14.5"
       },
       "engines": {
-        "node": "^12 || ^14 || ^16"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@eslint/eslintrc": {
-      "version": "0.4.3",
+    "node_modules/@babel/plugin-transform-function-name": {
+      "version": "7.14.5",
       "dev": true,
       "license": "MIT",
       "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"
+        "@babel/helper-function-name": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/ajv": {
-      "version": "6.12.6",
+    "node_modules/@babel/plugin-transform-literals": {
+      "version": "7.14.5",
       "dev": true,
       "license": "MIT",
       "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"
+        "@babel/helper-plugin-utils": "^7.14.5"
       },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.11.0",
+    "node_modules/@babel/plugin-transform-member-expression-literals": {
+      "version": "7.14.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "type-fest": "^0.20.2"
+        "@babel/helper-plugin-utils": "^7.14.5"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=6.9.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/ignore": {
-      "version": "4.0.6",
+    "node_modules/@babel/plugin-transform-modules-amd": {
+      "version": "7.14.5",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      },
       "engines": {
-        "node": ">= 4"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@eslint/eslintrc/node_modules/strip-json-comments": {
-      "version": "3.1.1",
+    "node_modules/@babel/plugin-transform-modules-commonjs": {
+      "version": "7.15.0",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.15.0",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-simple-access": "^7.14.8",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=6.9.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@google-cloud/common": {
-      "version": "3.7.4",
+    "node_modules/@babel/plugin-transform-modules-systemjs": {
+      "version": "7.14.5",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "@google-cloud/projectify": "^2.0.0",
-        "@google-cloud/promisify": "^2.0.0",
-        "arrify": "^2.0.1",
-        "duplexify": "^4.1.1",
-        "ent": "^2.2.0",
-        "extend": "^3.0.2",
-        "google-auth-library": "^7.9.2",
-        "retry-request": "^4.2.2",
-        "teeny-request": "^7.0.0"
+        "@babel/helper-hoist-variables": "^7.14.5",
+        "@babel/helper-module-transforms": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-validator-identifier": "^7.14.5",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@google-cloud/common/node_modules/duplexify": {
-      "version": "4.1.2",
+    "node_modules/@babel/plugin-transform-modules-umd": {
+      "version": "7.14.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "end-of-stream": "^1.4.1",
-        "inherits": "^2.0.3",
-        "readable-stream": "^3.1.1",
-        "stream-shift": "^1.0.0"
+        "@babel/helper-module-transforms": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@google-cloud/common/node_modules/readable-stream": {
-      "version": "3.6.0",
+    "node_modules/@babel/plugin-transform-new-target": {
+      "version": "7.14.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
+        "@babel/helper-plugin-utils": "^7.14.5"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@google-cloud/paginator": {
-      "version": "3.0.6",
+    "node_modules/@babel/plugin-transform-object-super": {
+      "version": "7.14.5",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "arrify": "^2.0.0",
-        "extend": "^3.0.2"
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-replace-supers": "^7.14.5"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@google-cloud/projectify": {
-      "version": "2.1.1",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@google-cloud/promisify": {
-      "version": "2.0.4",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@google-cloud/storage": {
-      "version": "5.15.3",
-      "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-5.15.3.tgz",
-      "integrity": "sha512-a2Y+mvfbzznWorQiv6c+qdPDlBpe47tikV8tpQSnvYXz1Ed/rjin41k2nKUQUcAPGHtYeTzGfKnCNKC+lv8qRg==",
+    "node_modules/@babel/plugin-transform-property-literals": {
+      "version": "7.14.5",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@google-cloud/common": "^3.7.4",
-        "@google-cloud/paginator": "^3.0.0",
-        "@google-cloud/promisify": "^2.0.0",
-        "arrify": "^2.0.0",
-        "async-retry": "^1.3.1",
-        "compressible": "^2.0.12",
-        "date-and-time": "^2.0.0",
-        "duplexify": "^4.0.0",
-        "extend": "^3.0.2",
-        "gcs-resumable-upload": "^3.3.0",
-        "get-stream": "^6.0.0",
-        "hash-stream-validation": "^0.2.2",
-        "mime": "^2.2.0",
-        "mime-types": "^2.0.8",
-        "p-limit": "^3.0.1",
-        "pumpify": "^2.0.0",
-        "snakeize": "^0.1.0",
-        "stream-events": "^1.0.1",
-        "xdg-basedir": "^4.0.0"
+        "@babel/helper-plugin-utils": "^7.14.5"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@google-cloud/storage/node_modules/duplexify": {
-      "version": "4.1.2",
+    "node_modules/@babel/plugin-transform-react-jsx": {
+      "version": "7.14.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.9.tgz",
+      "integrity": "sha512-30PeETvS+AeD1f58i1OVyoDlVYQhap/K20ZrMjLmmzmC2AYR/G43D4sdJAaDAqCD3MYpSWbmrz3kES158QSLjw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "end-of-stream": "^1.4.1",
-        "inherits": "^2.0.3",
-        "readable-stream": "^3.1.1",
-        "stream-shift": "^1.0.0"
-      }
-    },
-    "node_modules/@google-cloud/storage/node_modules/get-stream": {
-      "version": "6.0.1",
-      "dev": true,
-      "license": "MIT",
+        "@babel/helper-annotate-as-pure": "^7.14.5",
+        "@babel/helper-module-imports": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-jsx": "^7.14.5",
+        "@babel/types": "^7.14.9"
+      },
       "engines": {
-        "node": ">=10"
+        "node": ">=6.9.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@google-cloud/storage/node_modules/mime": {
-      "version": "2.5.2",
+    "node_modules/@babel/plugin-transform-regenerator": {
+      "version": "7.14.5",
       "dev": true,
       "license": "MIT",
-      "bin": {
-        "mime": "cli.js"
+      "dependencies": {
+        "regenerator-transform": "^0.14.2"
       },
       "engines": {
-        "node": ">=4.0.0"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@google-cloud/storage/node_modules/p-limit": {
-      "version": "3.1.0",
+    "node_modules/@babel/plugin-transform-reserved-words": {
+      "version": "7.14.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "yocto-queue": "^0.1.0"
+        "@babel/helper-plugin-utils": "^7.14.5"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=6.9.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@google-cloud/storage/node_modules/pumpify": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "duplexify": "^4.1.1",
-        "inherits": "^2.0.3",
-        "pump": "^3.0.0"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@google-cloud/storage/node_modules/readable-stream": {
-      "version": "3.6.0",
+    "node_modules/@babel/plugin-transform-shorthand-properties": {
+      "version": "7.14.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
+        "@babel/helper-plugin-utils": "^7.14.5"
       },
       "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.5.0",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@humanwhocodes/object-schema": "^1.2.0",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.4"
+        "node": ">=6.9.0"
       },
-      "engines": {
-        "node": ">=10.10.0"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "1.2.0",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@istanbuljs/load-nyc-config": {
-      "version": "1.1.0",
+    "node_modules/@babel/plugin-transform-spread": {
+      "version": "7.14.6",
       "dev": true,
-      "license": "ISC",
+      "license": "MIT",
       "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"
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@istanbuljs/schema": {
-      "version": "0.1.3",
+    "node_modules/@babel/plugin-transform-sticky-regex": {
+      "version": "7.14.5",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/console": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.3.1.tgz",
-      "integrity": "sha512-RkFNWmv0iui+qsOr/29q9dyfKTTT5DCuP31kUwg7rmOKPT/ozLeGLKJKVIiOfbiKyleUZKIrHwhmiZWVe8IMdw==",
-      "dev": true,
       "dependencies": {
-        "@jest/types": "^27.2.5",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "jest-message-util": "^27.3.1",
-        "jest-util": "^27.3.1",
-        "slash": "^3.0.0"
+        "@babel/helper-plugin-utils": "^7.14.5"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/console/node_modules/@jest/types": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-      "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
+        "node": ">=6.9.0"
       },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/console/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dev": true,
-      "dependencies": {
-        "@types/yargs-parser": "*"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@jest/console/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/@babel/plugin-transform-template-literals": {
+      "version": "7.14.5",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "@babel/helper-plugin-utils": "^7.14.5"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=6.9.0"
       },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@jest/console/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/@babel/plugin-transform-typeof-symbol": {
+      "version": "7.14.5",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "@babel/helper-plugin-utils": "^7.14.5"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=6.9.0"
       },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@jest/console/node_modules/ci-info": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-      "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
-      "dev": true
-    },
-    "node_modules/@jest/console/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/@babel/plugin-transform-typescript": {
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.8.tgz",
+      "integrity": "sha512-bHdQ9k7YpBDO2d0NVfkj51DpQcvwIzIusJ7mEUaMlbZq3Kt/U47j24inXZHQ5MDiYpCs+oZiwnXyKedE8+q7AQ==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "@babel/helper-create-class-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-typescript": "^7.16.7"
       },
       "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/console/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@jest/console/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@jest/console/node_modules/jest-util": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-      "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+    "node_modules/@babel/plugin-transform-unicode-escapes": {
+      "version": "7.14.5",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jest/types": "^27.2.5",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.4",
-        "picomatch": "^2.2.3"
+        "@babel/helper-plugin-utils": "^7.14.5"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@jest/console/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/@babel/plugin-transform-unicode-regex": {
+      "version": "7.14.5",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@jest/core": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.3.1.tgz",
-      "integrity": "sha512-DMNE90RR5QKx0EA+wqe3/TNEwiRpOkhshKNxtLxd4rt3IZpCt+RSL+FoJsGeblRZmqdK4upHA/mKKGPPRAifhg==",
+    "node_modules/@babel/preset-env": {
+      "version": "7.15.0",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.0.tgz",
+      "integrity": "sha512-FhEpCNFCcWW3iZLg0L2NPE9UerdtsCR6ZcsGHUX6Om6kbCQeL5QZDqFDmeNHC6/fy6UH3jEge7K4qG5uC9In0Q==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^27.3.1",
-        "@jest/reporters": "^27.3.1",
-        "@jest/test-result": "^27.3.1",
-        "@jest/transform": "^27.3.1",
-        "@jest/types": "^27.2.5",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "emittery": "^0.8.1",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.4",
-        "jest-changed-files": "^27.3.0",
-        "jest-config": "^27.3.1",
-        "jest-haste-map": "^27.3.1",
-        "jest-message-util": "^27.3.1",
-        "jest-regex-util": "^27.0.6",
-        "jest-resolve": "^27.3.1",
-        "jest-resolve-dependencies": "^27.3.1",
-        "jest-runner": "^27.3.1",
-        "jest-runtime": "^27.3.1",
-        "jest-snapshot": "^27.3.1",
-        "jest-util": "^27.3.1",
-        "jest-validate": "^27.3.1",
-        "jest-watcher": "^27.3.1",
-        "micromatch": "^4.0.4",
-        "rimraf": "^3.0.0",
-        "slash": "^3.0.0",
-        "strip-ansi": "^6.0.0"
+        "@babel/compat-data": "^7.15.0",
+        "@babel/helper-compilation-targets": "^7.15.0",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-validator-option": "^7.14.5",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.14.5",
+        "@babel/plugin-proposal-async-generator-functions": "^7.14.9",
+        "@babel/plugin-proposal-class-properties": "^7.14.5",
+        "@babel/plugin-proposal-class-static-block": "^7.14.5",
+        "@babel/plugin-proposal-dynamic-import": "^7.14.5",
+        "@babel/plugin-proposal-export-namespace-from": "^7.14.5",
+        "@babel/plugin-proposal-json-strings": "^7.14.5",
+        "@babel/plugin-proposal-logical-assignment-operators": "^7.14.5",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5",
+        "@babel/plugin-proposal-numeric-separator": "^7.14.5",
+        "@babel/plugin-proposal-object-rest-spread": "^7.14.7",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.14.5",
+        "@babel/plugin-proposal-optional-chaining": "^7.14.5",
+        "@babel/plugin-proposal-private-methods": "^7.14.5",
+        "@babel/plugin-proposal-private-property-in-object": "^7.14.5",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.14.5",
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-class-properties": "^7.12.13",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@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.14.5",
+        "@babel/plugin-transform-async-to-generator": "^7.14.5",
+        "@babel/plugin-transform-block-scoped-functions": "^7.14.5",
+        "@babel/plugin-transform-block-scoping": "^7.14.5",
+        "@babel/plugin-transform-classes": "^7.14.9",
+        "@babel/plugin-transform-computed-properties": "^7.14.5",
+        "@babel/plugin-transform-destructuring": "^7.14.7",
+        "@babel/plugin-transform-dotall-regex": "^7.14.5",
+        "@babel/plugin-transform-duplicate-keys": "^7.14.5",
+        "@babel/plugin-transform-exponentiation-operator": "^7.14.5",
+        "@babel/plugin-transform-for-of": "^7.14.5",
+        "@babel/plugin-transform-function-name": "^7.14.5",
+        "@babel/plugin-transform-literals": "^7.14.5",
+        "@babel/plugin-transform-member-expression-literals": "^7.14.5",
+        "@babel/plugin-transform-modules-amd": "^7.14.5",
+        "@babel/plugin-transform-modules-commonjs": "^7.15.0",
+        "@babel/plugin-transform-modules-systemjs": "^7.14.5",
+        "@babel/plugin-transform-modules-umd": "^7.14.5",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.14.9",
+        "@babel/plugin-transform-new-target": "^7.14.5",
+        "@babel/plugin-transform-object-super": "^7.14.5",
+        "@babel/plugin-transform-parameters": "^7.14.5",
+        "@babel/plugin-transform-property-literals": "^7.14.5",
+        "@babel/plugin-transform-regenerator": "^7.14.5",
+        "@babel/plugin-transform-reserved-words": "^7.14.5",
+        "@babel/plugin-transform-shorthand-properties": "^7.14.5",
+        "@babel/plugin-transform-spread": "^7.14.6",
+        "@babel/plugin-transform-sticky-regex": "^7.14.5",
+        "@babel/plugin-transform-template-literals": "^7.14.5",
+        "@babel/plugin-transform-typeof-symbol": "^7.14.5",
+        "@babel/plugin-transform-unicode-escapes": "^7.14.5",
+        "@babel/plugin-transform-unicode-regex": "^7.14.5",
+        "@babel/preset-modules": "^0.1.4",
+        "@babel/types": "^7.15.0",
+        "babel-plugin-polyfill-corejs2": "^0.2.2",
+        "babel-plugin-polyfill-corejs3": "^0.2.2",
+        "babel-plugin-polyfill-regenerator": "^0.2.2",
+        "core-js-compat": "^3.16.0",
+        "semver": "^6.3.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@jest/core/node_modules/@babel/plugin-syntax-bigint": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
-      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+    "node_modules/@babel/preset-env/node_modules/@babel/helper-compilation-targets": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz",
+      "integrity": "sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+        "@babel/compat-data": "^7.15.0",
+        "@babel/helper-validator-option": "^7.14.5",
+        "browserslist": "^4.16.6",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@jest/core/node_modules/@babel/plugin-syntax-import-meta": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
-      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+    "node_modules/@babel/preset-env/node_modules/@babel/plugin-proposal-async-generator-functions": {
+      "version": "7.15.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.15.8.tgz",
+      "integrity": "sha512-2Z5F2R2ibINTc63mY7FLqGfEbmofrHU9FitJW1Q7aPaKFhiPvSq6QEt/BoWN5oME3GVyjcRuNNSRbb9LC0CSWA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-remap-async-to-generator": "^7.15.4",
+        "@babel/plugin-syntax-async-generators": "^7.8.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@jest/core/node_modules/@jest/types": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-      "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+    "node_modules/@babel/preset-env/node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
+      "version": "7.14.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz",
+      "integrity": "sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA==",
       "dev": true,
       "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
+        "@babel/helper-create-regexp-features-plugin": "^7.14.5"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/core/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dev": true,
-      "dependencies": {
-        "@types/yargs-parser": "*"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@jest/core/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/@babel/preset-env/node_modules/@babel/plugin-transform-parameters": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.15.4.tgz",
+      "integrity": "sha512-9WB/GUTO6lvJU3XQsSr6J/WKvBC2hcs4Pew8YxZagi6GkTdniyqp8On5kqdK8MN0LMeu0mGbhPN+O049NV/9FQ==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "@babel/helper-plugin-utils": "^7.14.5"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=6.9.0"
       },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@jest/core/node_modules/babel-jest": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.3.1.tgz",
-      "integrity": "sha512-SjIF8hh/ir0peae2D6S6ZKRhUy7q/DnpH7k/V6fT4Bgs/LXXUztOpX4G2tCgq8mLo5HA9mN6NmlFMeYtKmIsTQ==",
+    "node_modules/@babel/preset-env/node_modules/semver": {
+      "version": "6.3.0",
       "dev": true,
-      "dependencies": {
-        "@jest/transform": "^27.3.1",
-        "@jest/types": "^27.2.5",
-        "@types/babel__core": "^7.1.14",
-        "babel-plugin-istanbul": "^6.0.0",
-        "babel-preset-jest": "^27.2.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.4",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.8.0"
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
       }
     },
-    "node_modules/@jest/core/node_modules/babel-preset-current-node-syntax": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
-      "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
+    "node_modules/@babel/preset-modules": {
+      "version": "0.1.4",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-bigint": "^7.8.3",
-        "@babel/plugin-syntax-class-properties": "^7.8.3",
-        "@babel/plugin-syntax-import-meta": "^7.8.3",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.8.3",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-top-level-await": "^7.8.3"
+        "@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"
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@jest/core/node_modules/babel-preset-jest": {
-      "version": "27.2.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.2.0.tgz",
-      "integrity": "sha512-z7MgQ3peBwN5L5aCqBKnF6iqdlvZvFUQynEhu0J+X9nHLU72jO3iY331lcYrg+AssJ8q7xsv5/3AICzVmJ/wvg==",
+    "node_modules/@babel/preset-typescript": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.16.7.tgz",
+      "integrity": "sha512-WbVEmgXdIyvzB77AQjGBEyYPZx+8tTsO50XtfozQrkW8QB2rLJpH2lgx0TRw5EJrBxOZQ+wCcyPVQvS8tjEHpQ==",
       "dev": true,
       "dependencies": {
-        "babel-plugin-jest-hoist": "^27.2.0",
-        "babel-preset-current-node-syntax": "^1.0.0"
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-validator-option": "^7.16.7",
+        "@babel/plugin-transform-typescript": "^7.16.7"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@jest/core/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
+    "node_modules/@babel/runtime": {
+      "version": "7.15.3",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.3.tgz",
+      "integrity": "sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "regenerator-runtime": "^0.13.4"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/template": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
+      "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.16.7",
+        "@babel/parser": "^7.16.7",
+        "@babel/types": "^7.16.7"
       },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@jest/core/node_modules/ci-info": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-      "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
-      "dev": true
+    "node_modules/@babel/traverse": {
+      "version": "7.16.10",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.10.tgz",
+      "integrity": "sha512-yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.16.7",
+        "@babel/generator": "^7.16.8",
+        "@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.16.10",
+        "@babel/types": "^7.16.8",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
     },
-    "node_modules/@jest/core/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/@babel/types": {
+      "version": "7.23.9",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.9.tgz",
+      "integrity": "sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "@babel/helper-string-parser": "^7.23.4",
+        "@babel/helper-validator-identifier": "^7.22.20",
+        "to-fast-properties": "^2.0.0"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@jest/core/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+    "node_modules/@bcoe/v8-coverage": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
       "dev": true
     },
-    "node_modules/@jest/core/node_modules/deepmerge": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+    "node_modules/@chiragrupani/karma-chromium-edge-launcher": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@chiragrupani/karma-chromium-edge-launcher/-/karma-chromium-edge-launcher-2.4.1.tgz",
+      "integrity": "sha512-HwTlN4dk7dnL9m5nEonq7cI3Wa787wYfGVWeb4oWPMySIEhFpA7/BYQ8zMbpQ4YkSQxVnvY1502aWdbI3w7DeA==",
+      "dev": true
+    },
+    "node_modules/@colors/colors": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
+      "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
       "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=0.1.90"
       }
     },
-    "node_modules/@jest/core/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
+    "node_modules/@emotion/is-prop-valid": {
+      "version": "0.7.3",
+      "license": "MIT",
+      "dependencies": {
+        "@emotion/memoize": "0.7.1"
       }
     },
-    "node_modules/@jest/core/node_modules/jest-config": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.3.1.tgz",
-      "integrity": "sha512-KY8xOIbIACZ/vdYCKSopL44I0xboxC751IX+DXL2+Wx6DKNycyEfV3rryC3BPm5Uq/BBqDoMrKuqLEUNJmMKKg==",
+    "node_modules/@emotion/memoize": {
+      "version": "0.7.1",
+      "license": "MIT"
+    },
+    "node_modules/@es-joy/jsdoccomment": {
+      "version": "0.46.0",
+      "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.46.0.tgz",
+      "integrity": "sha512-C3Axuq1xd/9VqFZpW4YAzOx5O9q/LP46uIQy/iNDpHG3fmPa6TBtvfglMCs3RBiBxAIi0Go97r8+jvTt55XMyQ==",
       "dev": true,
       "dependencies": {
-        "@babel/core": "^7.1.0",
-        "@jest/test-sequencer": "^27.3.1",
-        "@jest/types": "^27.2.5",
-        "babel-jest": "^27.3.1",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "deepmerge": "^4.2.2",
-        "glob": "^7.1.1",
-        "graceful-fs": "^4.2.4",
-        "jest-circus": "^27.3.1",
-        "jest-environment-jsdom": "^27.3.1",
-        "jest-environment-node": "^27.3.1",
-        "jest-get-type": "^27.3.1",
-        "jest-jasmine2": "^27.3.1",
-        "jest-regex-util": "^27.0.6",
-        "jest-resolve": "^27.3.1",
-        "jest-runner": "^27.3.1",
-        "jest-util": "^27.3.1",
-        "jest-validate": "^27.3.1",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^27.3.1"
+        "comment-parser": "1.4.1",
+        "esquery": "^1.6.0",
+        "jsdoc-type-pratt-parser": "~4.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      },
-      "peerDependencies": {
-        "ts-node": ">=9.0.0"
-      },
-      "peerDependenciesMeta": {
-        "ts-node": {
-          "optional": true
-        }
+        "node": ">=16"
       }
     },
-    "node_modules/@jest/core/node_modules/jest-util": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-      "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.2.tgz",
+      "integrity": "sha512-thpVCb/rhxE/BnMLQ7GReQLLN8q9qbHmI55F4489/ByVg2aQaQ6kbcLb6FHkocZzQhxc4gx0sCk0tJkKBFzDhA==",
+      "cpu": [
+        "ppc64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@jest/types": "^27.2.5",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.4",
-        "picomatch": "^2.2.3"
-      },
+      "optional": true,
+      "os": [
+        "aix"
+      ],
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@jest/core/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.24.2.tgz",
+      "integrity": "sha512-tmwl4hJkCfNHwFB3nBa8z1Uy3ypZpxqxfTQOcHX+xRByyYgunVbZ9MzUUfb0RxaHIMnbHagwAxuTL+tnNM+1/Q==",
+      "cpu": [
+        "arm"
+      ],
       "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
+      "optional": true,
+      "os": [
+        "android"
+      ],
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
       }
     },
-    "node_modules/@jest/environment": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.3.1.tgz",
-      "integrity": "sha512-BCKCj4mOVLme6Tanoyc9k0ultp3pnmuyHw73UHRPeeZxirsU/7E3HC4le/VDb/SMzE1JcPnto+XBKFOcoiJzVw==",
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.24.2.tgz",
+      "integrity": "sha512-cNLgeqCqV8WxfcTIOeL4OAtSmL8JjcN6m09XIgro1Wi7cF4t/THaWEa7eL5CMoMBdjoHOTh/vwTO/o2TRXIyzg==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@jest/fake-timers": "^27.3.1",
-        "@jest/types": "^27.2.5",
-        "@types/node": "*",
-        "jest-mock": "^27.3.0"
-      },
+      "optional": true,
+      "os": [
+        "android"
+      ],
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@jest/environment/node_modules/@jest/types": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-      "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.24.2.tgz",
+      "integrity": "sha512-B6Q0YQDqMx9D7rvIcsXfmJfvUYLoP722bgfBlO5cGvNVb5V/+Y7nhBE3mHV9OpxBf4eAS2S68KZztiPaWq4XYw==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
+      "optional": true,
+      "os": [
+        "android"
+      ],
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@jest/environment/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.24.2.tgz",
+      "integrity": "sha512-kj3AnYWc+CekmZnS5IPu9D+HWtUI49hbnyqk0FLEJDbzCIQt7hg7ucF1SQAilhtYpIujfaHr6O0UHlzzSPdOeA==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@types/yargs-parser": "*"
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/@jest/environment/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.24.2.tgz",
+      "integrity": "sha512-WeSrmwwHaPkNR5H3yYfowhZcbriGqooyu3zI/3GGpF8AyUdsrrP0X6KumITGA9WOyiJavnGZUwPGvxvwfWPHIA==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">=18"
       }
     },
-    "node_modules/@jest/environment/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.2.tgz",
+      "integrity": "sha512-UN8HXjtJ0k/Mj6a9+5u6+2eZ2ERD7Edt1Q9IZiB5UZAIdPnVKDoG7mdTVGhHJIeEml60JteamR3qhsr1r8gXvg==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "node": ">=18"
       }
     },
-    "node_modules/@jest/environment/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.24.2.tgz",
+      "integrity": "sha512-TvW7wE/89PYW+IevEJXZ5sF6gJRDY/14hyIGFXdIucxCsbRmLUcjseQu1SyTko+2idmCw94TgyaEZi9HUSOe3Q==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@jest/environment/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@jest/environment/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.24.2.tgz",
+      "integrity": "sha512-n0WRM/gWIdU29J57hJyUdIsk0WarGd6To0s+Y+LwvlC55wt+GT/OgkwoXCXvIue1i1sSNWblHEig00GBWiJgfA==",
+      "cpu": [
+        "arm"
+      ],
       "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
       }
     },
-    "node_modules/@jest/environment/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.2.tgz",
+      "integrity": "sha512-7HnAD6074BW43YvvUmE/35Id9/NB7BeX5EoNkK9obndmZBUk8xmJJeU7DwmUeN7tkysslb2eSl6CTrYz6oEMQg==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
       }
     },
-    "node_modules/@jest/fake-timers": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.3.1.tgz",
-      "integrity": "sha512-M3ZFgwwlqJtWZ+QkBG5NmC23A9w+A6ZxNsO5nJxJsKYt4yguBd3i8TpjQz5NfCX91nEve1KqD9RA2Q+Q1uWqoA==",
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.24.2.tgz",
+      "integrity": "sha512-sfv0tGPQhcZOgTKO3oBE9xpHuUqguHvSo4jl+wjnKwFpapx+vUDcawbwPNuBIAYdRAvIDBfZVvXprIj3HA+Ugw==",
+      "cpu": [
+        "ia32"
+      ],
       "dev": true,
-      "dependencies": {
-        "@jest/types": "^27.2.5",
-        "@sinonjs/fake-timers": "^8.0.1",
-        "@types/node": "*",
-        "jest-message-util": "^27.3.1",
-        "jest-mock": "^27.3.0",
-        "jest-util": "^27.3.1"
-      },
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@jest/fake-timers/node_modules/@jest/types": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-      "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.24.2.tgz",
+      "integrity": "sha512-CN9AZr8kEndGooS35ntToZLTQLHEjtVB5n7dl8ZcTZMonJ7CCfStrYhrzF97eAecqVbVJ7APOEe18RPI4KLhwQ==",
+      "cpu": [
+        "loong64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@jest/fake-timers/node_modules/@sinonjs/fake-timers": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.0.1.tgz",
-      "integrity": "sha512-AU7kwFxreVd6OAXcAFlKSmZquiRUU0FvYm44k1Y1QbK7Co4m0aqfGMhjykIeQp/H6rcl+nFmj0zfdUcGVs9Dew==",
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.24.2.tgz",
+      "integrity": "sha512-iMkk7qr/wl3exJATwkISxI7kTcmHKE+BlymIAbHO8xanq/TjHaaVThFF6ipWzPHryoFsesNQJPE/3wFJw4+huw==",
+      "cpu": [
+        "mips64el"
+      ],
       "dev": true,
-      "dependencies": {
-        "@sinonjs/commons": "^1.7.0"
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/@jest/fake-timers/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.24.2.tgz",
+      "integrity": "sha512-shsVrgCZ57Vr2L8mm39kO5PPIb+843FStGt7sGGoqiiWYconSxwTiuswC1VJZLCjNiMLAMh34jg4VSEQb+iEbw==",
+      "cpu": [
+        "ppc64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@types/yargs-parser": "*"
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/@jest/fake-timers/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.24.2.tgz",
+      "integrity": "sha512-4eSFWnU9Hhd68fW16GD0TINewo1L6dRrB+oLNNbYyMUAeOD2yCK5KXGK1GH4qD/kT+bTEXjsyTCiJGHPZ3eM9Q==",
+      "cpu": [
+        "riscv64"
+      ],
       "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">=18"
       }
     },
-    "node_modules/@jest/fake-timers/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.24.2.tgz",
+      "integrity": "sha512-S0Bh0A53b0YHL2XEXC20bHLuGMOhFDO6GN4b3YjRLK//Ep3ql3erpNcPlEFed93hsQAjAQDNsvcK+hV90FubSw==",
+      "cpu": [
+        "s390x"
+      ],
       "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "node": ">=18"
       }
     },
-    "node_modules/@jest/fake-timers/node_modules/ci-info": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-      "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
-      "dev": true
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.24.2.tgz",
+      "integrity": "sha512-8Qi4nQcCTbLnK9WoMjdC9NiTG6/E38RNICU6sUNqK0QFxCYgoARqVqxdFmWkdonVsvGqWhmm7MO0jyTqLqwj0Q==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
     },
-    "node_modules/@jest/fake-timers/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/@esbuild/netbsd-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.24.2.tgz",
+      "integrity": "sha512-wuLK/VztRRpMt9zyHSazyCVdCXlpHkKm34WUyinD2lzK07FAHTq0KQvZZlXikNWkDGoT6x3TD51jKQ7gMVpopw==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@jest/fake-timers/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.24.2.tgz",
+      "integrity": "sha512-VefFaQUc4FMmJuAxmIHgUmfNiLXY438XrL4GDNV1Y1H/RW3qow68xTwjZKfj/+Plp9NANmzbH5R40Meudu8mmw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
     },
-    "node_modules/@jest/fake-timers/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.2.tgz",
+      "integrity": "sha512-YQbi46SBct6iKnszhSvdluqDmxCJA+Pu280Av9WICNwQmMxV7nLRHZfjQzwbPs3jeWnuAhE9Jy0NrnJ12Oz+0A==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
       }
     },
-    "node_modules/@jest/fake-timers/node_modules/jest-util": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-      "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.24.2.tgz",
+      "integrity": "sha512-+iDS6zpNM6EnJyWv0bMGLWSWeXGN/HTaF/LXHXHwejGsVi+ooqDfMCCTerNFxEkM3wYVcExkeGXNqshc9iMaOA==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@jest/types": "^27.2.5",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.4",
-        "picomatch": "^2.2.3"
-      },
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@jest/fake-timers/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.24.2.tgz",
+      "integrity": "sha512-hTdsW27jcktEvpwNHJU4ZwWFGkz2zRJUz8pvddmXPtXDzVKTTINmlmga3ZzwcuMpUvLw7JkLy9QLKyGpD2Yxig==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
       }
     },
-    "node_modules/@jest/globals": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.3.1.tgz",
-      "integrity": "sha512-Q651FWiWQAIFiN+zS51xqhdZ8g9b88nGCobC87argAxA7nMfNQq0Q0i9zTfQYgLa6qFXk2cGANEqfK051CZ8Pg==",
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.24.2.tgz",
+      "integrity": "sha512-LihEQ2BBKVFLOC9ZItT9iFprsE9tqjDjnbulhHoFxYQtQfai7qfluVODIYxt1PgdoyQkz23+01rzwNwYfutxUQ==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@jest/environment": "^27.3.1",
-        "@jest/types": "^27.2.5",
-        "expect": "^27.3.1"
-      },
+      "optional": true,
+      "os": [
+        "win32"
+      ],
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@jest/globals/node_modules/@jest/types": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-      "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.24.2.tgz",
+      "integrity": "sha512-q+iGUwfs8tncmFC9pcnD5IvRHAzmbwQ3GPS5/ceCyHdjXubwQWI12MKWSNSMYLJMq23/IUCvJMS76PDqXe1fxA==",
+      "cpu": [
+        "ia32"
+      ],
       "dev": true,
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
+      "optional": true,
+      "os": [
+        "win32"
+      ],
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@jest/globals/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.24.2.tgz",
+      "integrity": "sha512-7VTgWzgMGvup6aSqDPLiW5zHaxYJGTO4OokMjIlrCtf+VpEL+cXKtCvg723iguPYI5oaUNdS+/V7OU2gvXVWEg==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@types/yargs-parser": "*"
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/@jest/globals/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/@eslint-community/eslint-utils": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "eslint-visitor-keys": "^3.3.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
       }
     },
-    "node_modules/@jest/globals/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/@eslint-community/regexpp": {
+      "version": "4.10.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz",
+      "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@eslint/eslintrc": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
+      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.6.0",
+        "globals": "^13.19.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"
       },
       "engines": {
-        "node": ">=10"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/@jest/globals/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/@eslint/eslintrc/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": {
-        "color-name": "~1.1.4"
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
       },
-      "engines": {
-        "node": ">=7.0.0"
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/@jest/globals/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+    "node_modules/@eslint/eslintrc/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/@jest/globals/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/@eslint/eslintrc/node_modules/globals": {
+      "version": "13.20.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+      "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
       "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@jest/globals/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/@eslint/eslintrc/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": {
-        "has-flag": "^4.0.0"
+        "argparse": "^2.0.1"
       },
-      "engines": {
-        "node": ">=8"
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/@jest/reporters": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.3.1.tgz",
-      "integrity": "sha512-m2YxPmL9Qn1emFVgZGEiMwDntDxRRQ2D58tiDQlwYTg5GvbFOKseYCcHtn0WsI8CG4vzPglo3nqbOiT8ySBT/w==",
+    "node_modules/@eslint/eslintrc/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/@eslint/eslintrc/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
       "dependencies": {
-        "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^27.3.1",
-        "@jest/test-result": "^27.3.1",
-        "@jest/transform": "^27.3.1",
-        "@jest/types": "^27.2.5",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "exit": "^0.1.2",
-        "glob": "^7.1.2",
-        "graceful-fs": "^4.2.4",
-        "istanbul-lib-coverage": "^3.0.0",
-        "istanbul-lib-instrument": "^4.0.3",
-        "istanbul-lib-report": "^3.0.0",
-        "istanbul-lib-source-maps": "^4.0.0",
-        "istanbul-reports": "^3.0.2",
-        "jest-haste-map": "^27.3.1",
-        "jest-resolve": "^27.3.1",
-        "jest-util": "^27.3.1",
-        "jest-worker": "^27.3.1",
-        "slash": "^3.0.0",
-        "source-map": "^0.6.0",
-        "string-length": "^4.0.1",
-        "terminal-link": "^2.0.0",
-        "v8-to-istanbul": "^8.1.0"
+        "brace-expansion": "^1.1.7"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
+        "node": "*"
       }
     },
-    "node_modules/@jest/reporters/node_modules/@jest/types": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-      "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+    "node_modules/@eslint/js": {
+      "version": "8.57.1",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz",
+      "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==",
       "dev": true,
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
-    "node_modules/@jest/reporters/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz",
+      "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==",
+      "deprecated": "Use @eslint/config-array instead",
       "dev": true,
       "dependencies": {
-        "@types/yargs-parser": "*"
+        "@humanwhocodes/object-schema": "^2.0.3",
+        "debug": "^4.3.1",
+        "minimatch": "^3.0.5"
+      },
+      "engines": {
+        "node": ">=10.10.0"
       }
     },
-    "node_modules/@jest/reporters/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/@humanwhocodes/config-array/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "brace-expansion": "^1.1.7"
       },
       "engines": {
-        "node": ">=8"
+        "node": "*"
+      }
+    },
+    "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": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
       }
     },
-    "node_modules/@jest/reporters/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/ci-info": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-      "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
+    "node_modules/@humanwhocodes/object-schema": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
+      "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
+      "deprecated": "Use @eslint/object-schema instead",
       "dev": true
     },
-    "node_modules/@jest/reporters/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "color-name": "~1.1.4"
+        "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": ">=7.0.0"
+        "node": ">=8"
       }
     },
-    "node_modules/@jest/reporters/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@jest/reporters/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/@istanbuljs/schema": {
+      "version": "0.1.3",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/@jest/reporters/node_modules/jest-util": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-      "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+    "node_modules/@jest/console": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",
+      "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^27.2.5",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.4",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/source-map": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.0.6.tgz",
-      "integrity": "sha512-Fek4mi5KQrqmlY07T23JRi0e7Z9bXTOOD86V/uS0EIW4PClvPDqZOyFlLpNJheS6QI0FNX1CgmPjtJ4EA/2M+g==",
-      "dev": true,
-      "dependencies": {
-        "callsites": "^3.0.0",
-        "graceful-fs": "^4.2.4",
-        "source-map": "^0.6.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/source-map/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@jest/test-result": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.3.1.tgz",
-      "integrity": "sha512-mLn6Thm+w2yl0opM8J/QnPTqrfS4FoXsXF2WIWJb2O/GBSyResL71BRuMYbYRsGt7ELwS5JGcEcGb52BNrumgg==",
-      "dev": true,
-      "dependencies": {
-        "@jest/console": "^27.3.1",
-        "@jest/types": "^27.2.5",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "collect-v8-coverage": "^1.0.0"
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "slash": "^3.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@jest/test-result/node_modules/@jest/types": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-      "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+    "node_modules/@jest/console/node_modules/@jest/types": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
       "dev": true,
       "dependencies": {
+        "@jest/schemas": "^29.6.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
-        "@types/yargs": "^16.0.0",
+        "@types/yargs": "^17.0.8",
         "chalk": "^4.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@jest/test-result/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+    "node_modules/@jest/console/node_modules/@types/yargs": {
+      "version": "17.0.32",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
       "dev": true,
       "dependencies": {
         "@types/yargs-parser": "*"
       }
     },
-    "node_modules/@jest/test-result/node_modules/ansi-styles": {
+    "node_modules/@jest/console/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
@@ -3527,7 +3705,7 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/@jest/test-result/node_modules/chalk": {
+    "node_modules/@jest/console/node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
@@ -3543,7 +3721,22 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@jest/test-result/node_modules/color-convert": {
+    "node_modules/@jest/console/node_modules/ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/console/node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
@@ -3555,13 +3748,13 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/@jest/test-result/node_modules/color-name": {
+    "node_modules/@jest/console/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/@jest/test-result/node_modules/has-flag": {
+    "node_modules/@jest/console/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
@@ -3570,85 +3763,109 @@
         "node": ">=8"
       }
     },
-    "node_modules/@jest/test-result/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/@jest/console/node_modules/jest-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@jest/test-sequencer": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.3.1.tgz",
-      "integrity": "sha512-siySLo07IMEdSjA4fqEnxfIX8lB/lWYsBPwNFtkOvsFQvmBrL3yj3k3uFNZv/JDyApTakRpxbKLJ3CT8UGVCrA==",
+    "node_modules/@jest/console/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
-        "@jest/test-result": "^27.3.1",
-        "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^27.3.1",
-        "jest-runtime": "^27.3.1"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">=8"
       }
     },
-    "node_modules/@jest/transform": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.3.1.tgz",
-      "integrity": "sha512-3fSvQ02kuvjOI1C1ssqMVBKJpZf6nwoCiSu00zAKh5nrp3SptNtZy/8s5deayHnqxhjD9CWDJ+yqQwuQ0ZafXQ==",
+    "node_modules/@jest/core": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz",
+      "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==",
       "dev": true,
       "dependencies": {
-        "@babel/core": "^7.1.0",
-        "@jest/types": "^27.2.5",
-        "babel-plugin-istanbul": "^6.0.0",
+        "@jest/console": "^29.7.0",
+        "@jest/reporters": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
-        "convert-source-map": "^1.4.0",
-        "fast-json-stable-stringify": "^2.0.0",
-        "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^27.3.1",
-        "jest-regex-util": "^27.0.6",
-        "jest-util": "^27.3.1",
+        "ci-info": "^3.2.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "jest-changed-files": "^29.7.0",
+        "jest-config": "^29.7.0",
+        "jest-haste-map": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-resolve-dependencies": "^29.7.0",
+        "jest-runner": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "jest-watcher": "^29.7.0",
         "micromatch": "^4.0.4",
-        "pirates": "^4.0.1",
+        "pretty-format": "^29.7.0",
         "slash": "^3.0.0",
-        "source-map": "^0.6.1",
-        "write-file-atomic": "^3.0.0"
+        "strip-ansi": "^6.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@jest/transform/node_modules/@jest/types": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-      "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+    "node_modules/@jest/core/node_modules/@jest/types": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
       "dev": true,
       "dependencies": {
+        "@jest/schemas": "^29.6.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
-        "@types/yargs": "^16.0.0",
+        "@types/yargs": "^17.0.8",
         "chalk": "^4.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@jest/transform/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+    "node_modules/@jest/core/node_modules/@types/yargs": {
+      "version": "17.0.32",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
       "dev": true,
       "dependencies": {
         "@types/yargs-parser": "*"
       }
     },
-    "node_modules/@jest/transform/node_modules/ansi-styles": {
+    "node_modules/@jest/core/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
@@ -3663,7 +3880,7 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/@jest/transform/node_modules/chalk": {
+    "node_modules/@jest/core/node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
@@ -3679,13 +3896,22 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@jest/transform/node_modules/ci-info": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-      "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
-      "dev": true
+    "node_modules/@jest/core/node_modules/ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/@jest/transform/node_modules/color-convert": {
+    "node_modules/@jest/core/node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
@@ -3697,13 +3923,13 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/@jest/transform/node_modules/color-name": {
+    "node_modules/@jest/core/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/@jest/transform/node_modules/has-flag": {
+    "node_modules/@jest/core/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
@@ -3712,33 +3938,24 @@
         "node": ">=8"
       }
     },
-    "node_modules/@jest/transform/node_modules/jest-util": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-      "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+    "node_modules/@jest/core/node_modules/jest-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^27.2.5",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.4",
+        "graceful-fs": "^4.2.9",
         "picomatch": "^2.2.3"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/transform/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@jest/transform/node_modules/supports-color": {
+    "node_modules/@jest/core/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
@@ -3750,25 +3967,52 @@
         "node": ">=8"
       }
     },
-    "node_modules/@jest/types": {
-      "version": "26.6.2",
+    "node_modules/@jest/environment": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz",
+      "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "jest-mock": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/environment/node_modules/@jest/types": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
+        "@jest/schemas": "^29.6.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
-        "@types/yargs": "^15.0.0",
+        "@types/yargs": "^17.0.8",
         "chalk": "^4.0.0"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@jest/types/node_modules/ansi-styles": {
+    "node_modules/@jest/environment/node_modules/@types/yargs": {
+      "version": "17.0.32",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
+      "dev": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@jest/environment/node_modules/ansi-styles": {
       "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -3779,10 +4023,11 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/@jest/types/node_modules/chalk": {
-      "version": "4.1.0",
+    "node_modules/@jest/environment/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -3794,10 +4039,11 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@jest/types/node_modules/color-convert": {
+    "node_modules/@jest/environment/node_modules/color-convert": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -3805,23 +4051,26 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/@jest/types/node_modules/color-name": {
+    "node_modules/@jest/environment/node_modules/color-name": {
       "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
-    "node_modules/@jest/types/node_modules/has-flag": {
+    "node_modules/@jest/environment/node_modules/has-flag": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/@jest/types/node_modules/supports-color": {
+    "node_modules/@jest/environment/node_modules/supports-color": {
       "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -3829,2764 +4078,3168 @@
         "node": ">=8"
       }
     },
-    "node_modules/@jridgewell/doctrine": {
-      "version": "3.0.2",
+    "node_modules/@jest/expect": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz",
+      "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
-        "esutils": "^2.0.2"
+        "expect": "^29.7.0",
+        "jest-snapshot": "^29.7.0"
       },
       "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/resolve-uri": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@kristoferbaxter/async": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@kristoferbaxter/bytes": {
-      "version": "0.1.2",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/@kristoferbaxter/kleur": {
-      "version": "4.0.2",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@nodelib/fs.scandir": {
-      "version": "2.1.4",
+    "node_modules/@jest/expect-utils": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
+      "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@nodelib/fs.stat": "2.0.4",
-        "run-parallel": "^1.1.9"
+        "jest-get-type": "^29.6.3"
       },
       "engines": {
-        "node": ">= 8"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@nodelib/fs.stat": {
-      "version": "2.0.4",
+    "node_modules/@jest/fake-timers": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz",
+      "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@sinonjs/fake-timers": "^10.0.2",
+        "@types/node": "*",
+        "jest-message-util": "^29.7.0",
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0"
+      },
       "engines": {
-        "node": ">= 8"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.6",
+    "node_modules/@jest/fake-timers/node_modules/@jest/types": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@nodelib/fs.scandir": "2.1.4",
-        "fastq": "^1.6.0"
+        "@jest/schemas": "^29.6.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
       },
       "engines": {
-        "node": ">= 8"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@octokit/auth-token": {
-      "version": "2.5.0",
+    "node_modules/@jest/fake-timers/node_modules/@sinonjs/commons": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
+      "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@octokit/types": "^6.0.3"
+        "type-detect": "4.0.8"
       }
     },
-    "node_modules/@octokit/core": {
-      "version": "3.5.1",
+    "node_modules/@jest/fake-timers/node_modules/@sinonjs/fake-timers": {
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
+      "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@octokit/auth-token": "^2.4.4",
-        "@octokit/graphql": "^4.5.8",
-        "@octokit/request": "^5.6.0",
-        "@octokit/request-error": "^2.0.5",
-        "@octokit/types": "^6.0.3",
-        "before-after-hook": "^2.2.0",
-        "universal-user-agent": "^6.0.0"
+        "@sinonjs/commons": "^3.0.0"
       }
     },
-    "node_modules/@octokit/endpoint": {
-      "version": "6.0.12",
+    "node_modules/@jest/fake-timers/node_modules/@types/yargs": {
+      "version": "17.0.32",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@octokit/types": "^6.0.3",
-        "is-plain-object": "^5.0.0",
-        "universal-user-agent": "^6.0.0"
-      }
-    },
-    "node_modules/@octokit/endpoint/node_modules/is-plain-object": {
-      "version": "5.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+        "@types/yargs-parser": "*"
       }
     },
-    "node_modules/@octokit/graphql": {
-      "version": "4.8.0",
+    "node_modules/@jest/fake-timers/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@octokit/request": "^5.6.0",
-        "@octokit/types": "^6.0.3",
-        "universal-user-agent": "^6.0.0"
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/@octokit/openapi-types": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-11.2.0.tgz",
-      "integrity": "sha512-PBsVO+15KSlGmiI8QAzaqvsNlZlrDlyAJYcrXBCvVUxCp7VnXjkwPoFHgjEJXx3WF9BAwkA6nfCUA7i9sODzKA==",
-      "dev": true
-    },
-    "node_modules/@octokit/plugin-paginate-rest": {
-      "version": "2.17.0",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.17.0.tgz",
-      "integrity": "sha512-tzMbrbnam2Mt4AhuyCHvpRkS0oZ5MvwwcQPYGtMv4tUa5kkzG58SVB0fcsLulOZQeRnOgdkZWkRUiyBlh0Bkyw==",
+    "node_modules/@jest/fake-timers/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
-        "@octokit/types": "^6.34.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
-      "peerDependencies": {
-        "@octokit/core": ">=2"
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@octokit/plugin-request-log": {
-      "version": "1.0.4",
+    "node_modules/@jest/fake-timers/node_modules/ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
       "dev": true,
-      "license": "MIT",
-      "peerDependencies": {
-        "@octokit/core": ">=3"
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@octokit/plugin-rest-endpoint-methods": {
-      "version": "5.13.0",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.13.0.tgz",
-      "integrity": "sha512-uJjMTkN1KaOIgNtUPMtIXDOjx6dGYysdIFhgA52x4xSadQCz3b/zJexvITDVpANnfKPW/+E0xkOvLntqMYpviA==",
+    "node_modules/@jest/fake-timers/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
-        "@octokit/types": "^6.34.0",
-        "deprecation": "^2.3.1"
+        "color-name": "~1.1.4"
       },
-      "peerDependencies": {
-        "@octokit/core": ">=3"
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/@octokit/request": {
-      "version": "5.6.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/endpoint": "^6.0.1",
-        "@octokit/request-error": "^2.1.0",
-        "@octokit/types": "^6.16.1",
-        "is-plain-object": "^5.0.0",
-        "node-fetch": "^2.6.1",
-        "universal-user-agent": "^6.0.0"
-      }
+    "node_modules/@jest/fake-timers/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
-    "node_modules/@octokit/request-error": {
-      "version": "2.1.0",
+    "node_modules/@jest/fake-timers/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/types": "^6.0.3",
-        "deprecation": "^2.0.0",
-        "once": "^1.4.0"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@octokit/request/node_modules/is-plain-object": {
-      "version": "5.0.0",
+    "node_modules/@jest/fake-timers/node_modules/jest-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@octokit/rest": {
-      "version": "18.12.0",
-      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-18.12.0.tgz",
-      "integrity": "sha512-gDPiOHlyGavxr72y0guQEhLsemgVjwRePayJ+FcKc2SJqKUbxbkvf5kAZEWA/MKvsfYlQAMVzNJE3ezQcxMJ2Q==",
+    "node_modules/@jest/fake-timers/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
-        "@octokit/core": "^3.5.1",
-        "@octokit/plugin-paginate-rest": "^2.16.8",
-        "@octokit/plugin-request-log": "^1.0.4",
-        "@octokit/plugin-rest-endpoint-methods": "^5.12.0"
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@octokit/types": {
-      "version": "6.34.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.34.0.tgz",
-      "integrity": "sha512-s1zLBjWhdEI2zwaoSgyOFoKSl109CUcVBCc7biPJ3aAf6LGLU6szDvi31JPU7bxfla2lqfhjbbg/5DdFNxOwHw==",
+    "node_modules/@jest/globals": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz",
+      "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",
       "dev": true,
       "dependencies": {
-        "@octokit/openapi-types": "^11.2.0"
+        "@jest/environment": "^29.7.0",
+        "@jest/expect": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "jest-mock": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@sindresorhus/is": {
-      "version": "0.14.0",
+    "node_modules/@jest/globals/node_modules/@jest/types": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "@jest/schemas": "^29.6.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
       "engines": {
-        "node": ">=6"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@sinonjs/commons": {
-      "version": "1.8.2",
+    "node_modules/@jest/globals/node_modules/@types/yargs": {
+      "version": "17.0.32",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
-        "type-detect": "4.0.8"
+        "@types/yargs-parser": "*"
       }
     },
-    "node_modules/@sinonjs/fake-timers": {
-      "version": "7.1.2",
+    "node_modules/@jest/globals/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
-        "@sinonjs/commons": "^1.7.0"
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/@sinonjs/samsam": {
-      "version": "6.0.2",
+    "node_modules/@jest/globals/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
-        "@sinonjs/commons": "^1.6.0",
-        "lodash.get": "^4.4.2",
-        "type-detect": "^4.0.8"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@sinonjs/text-encoding": {
-      "version": "0.7.1",
-      "dev": true,
-      "license": "(Unlicense OR Apache-2.0)"
-    },
-    "node_modules/@szmarczak/http-timer": {
-      "version": "1.1.2",
+    "node_modules/@jest/globals/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "defer-to-connect": "^1.0.1"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/@tootallnate/once": {
-      "version": "1.1.2",
+    "node_modules/@jest/globals/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/@jest/globals/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">= 6"
+        "node": ">=8"
       }
     },
-    "node_modules/@trysound/sax": {
-      "version": "0.1.1",
+    "node_modules/@jest/globals/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
-      "license": "ISC",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
       "engines": {
-        "node": ">=10.13.0"
+        "node": ">=8"
       }
     },
-    "node_modules/@types/babel__core": {
-      "version": "7.1.16",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.16.tgz",
-      "integrity": "sha512-EAEHtisTMM+KaKwfWdC3oyllIqswlznXCIVCt7/oRNrh+DhgT4UEBNC/jlADNjvw7UnfbcdkGQcPVZ1xYiLcrQ==",
+    "node_modules/@jest/reporters": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz",
+      "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",
       "dev": true,
       "dependencies": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0",
-        "@types/babel__generator": "*",
-        "@types/babel__template": "*",
-        "@types/babel__traverse": "*"
+        "@bcoe/v8-coverage": "^0.2.3",
+        "@jest/console": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-instrument": "^6.0.0",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^4.0.0",
+        "istanbul-reports": "^3.1.3",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-worker": "^29.7.0",
+        "slash": "^3.0.0",
+        "string-length": "^4.0.1",
+        "strip-ansi": "^6.0.0",
+        "v8-to-istanbul": "^9.0.1"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@types/babel__generator": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.3.tgz",
-      "integrity": "sha512-/GWCmzJWqV7diQW54smJZzWbSFf4QYtF71WCKhcx6Ru/tFyQIY2eiiITcCAeuPbNSvT9YCGkVMqqvSk2Z0mXiA==",
+    "node_modules/@jest/reporters/node_modules/@jest/types": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.0.0"
+        "@jest/schemas": "^29.6.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@types/babel__template": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
-      "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
+    "node_modules/@jest/reporters/node_modules/@types/yargs": {
+      "version": "17.0.32",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
       "dev": true,
       "dependencies": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0"
+        "@types/yargs-parser": "*"
       }
     },
-    "node_modules/@types/babel__traverse": {
-      "version": "7.14.2",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.14.2.tgz",
-      "integrity": "sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==",
+    "node_modules/@jest/reporters/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.3.0"
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/@types/chai": {
-      "version": "4.2.22",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/component-emitter": {
-      "version": "1.2.11",
-      "resolved": "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.11.tgz",
-      "integrity": "sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ==",
-      "dev": true
-    },
-    "node_modules/@types/cookie": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
-      "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==",
-      "dev": true
-    },
-    "node_modules/@types/cors": {
-      "version": "2.8.12",
-      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz",
-      "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==",
-      "dev": true
-    },
-    "node_modules/@types/eslint": {
-      "version": "7.28.2",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.28.2.tgz",
-      "integrity": "sha512-KubbADPkfoU75KgKeKLsFHXnU4ipH7wYg0TRT33NK3N3yiu7jlFAAoygIWBV+KbuHx/G+AvuGX6DllnK35gfJA==",
+    "node_modules/@jest/reporters/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
-        "@types/estree": "*",
-        "@types/json-schema": "*"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@types/estree": {
-      "version": "0.0.50",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/fs-extra": {
-      "version": "9.0.13",
+    "node_modules/@jest/reporters/node_modules/ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/node": "*"
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@types/graceful-fs": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
-      "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
+    "node_modules/@jest/reporters/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
-        "@types/node": "*"
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/@types/istanbul-lib-coverage": {
-      "version": "2.0.3",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/@jest/reporters/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
-    "node_modules/@types/istanbul-lib-report": {
-      "version": "3.0.0",
+    "node_modules/@jest/reporters/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "*"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@types/istanbul-reports": {
-      "version": "3.0.0",
+    "node_modules/@jest/reporters/node_modules/istanbul-lib-instrument": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.1.tgz",
+      "integrity": "sha512-EAMEJBsYuyyztxMxW3g7ugGPkrZsV57v0Hmv3mm1uQsmB+QnZuepg731CRaIgeUVSdmsTngOkSnauNF8p7FIhA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@types/istanbul-lib-report": "*"
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^7.5.4"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
-    "node_modules/@types/json-schema": {
-      "version": "7.0.9",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/json5": {
-      "version": "0.0.29",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/klaw": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/klaw/-/klaw-3.0.3.tgz",
-      "integrity": "sha512-mXlRDFbTLpVysvxahXUQav0hFctgu3Fqr2xmSrpf/ptO/FwOp7SFEGsJkEihwshMbof3/BIiVJ/o42cuOOuv6g==",
+    "node_modules/@jest/reporters/node_modules/jest-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
       "dev": true,
       "dependencies": {
-        "@types/node": "*"
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@types/minimist": {
-      "version": "1.2.2",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/mocha": {
-      "version": "8.2.3",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/node": {
-      "version": "14.17.32",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.32.tgz",
-      "integrity": "sha512-JcII3D5/OapPGx+eJ+Ik1SQGyt6WvuqdRfh9jUwL6/iHGjmyOriBDciBUu7lEIBTL2ijxwrR70WUnw5AEDmFvQ==",
-      "dev": true
-    },
-    "node_modules/@types/normalize-package-data": {
-      "version": "2.4.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/prettier": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.1.tgz",
-      "integrity": "sha512-Fo79ojj3vdEZOHg3wR9ksAMRz4P3S5fDB5e/YWZiFnyFQI1WY2Vftu9XoXVVtJfxB7Bpce/QTqWSSntkz2Znrw==",
-      "dev": true
-    },
-    "node_modules/@types/stack-utils": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
-      "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
-      "dev": true
-    },
-    "node_modules/@types/yargs": {
-      "version": "15.0.13",
+    "node_modules/@jest/reporters/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@types/yargs-parser": "*"
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@types/yargs-parser": {
-      "version": "20.2.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@ungap/promise-all-settled": {
-      "version": "1.1.2",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/@webcomponents/webcomponentsjs": {
-      "version": "2.6.0",
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/abab": {
-      "version": "2.0.5",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/abbrev": {
-      "version": "1.0.9",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/abort-controller": {
-      "version": "3.0.0",
+    "node_modules/@jest/schemas": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
+      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "event-target-shim": "^5.0.0"
+        "@sinclair/typebox": "^0.27.8"
       },
       "engines": {
-        "node": ">=6.5"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/accepts": {
-      "version": "1.3.7",
+    "node_modules/@jest/source-map": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz",
+      "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "mime-types": "~2.1.24",
-        "negotiator": "0.6.2"
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "callsites": "^3.0.0",
+        "graceful-fs": "^4.2.9"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/acorn": {
-      "version": "8.1.0",
+    "node_modules/@jest/test-result": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz",
+      "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",
       "dev": true,
-      "license": "MIT",
-      "bin": {
-        "acorn": "bin/acorn"
+      "dependencies": {
+        "@jest/console": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
       },
       "engines": {
-        "node": ">=0.4.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/acorn-globals": {
-      "version": "6.0.0",
+    "node_modules/@jest/test-result/node_modules/@jest/types": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "acorn": "^7.1.1",
-        "acorn-walk": "^7.1.1"
+        "@jest/schemas": "^29.6.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/acorn-globals/node_modules/acorn": {
-      "version": "7.4.1",
+    "node_modules/@jest/test-result/node_modules/@types/yargs": {
+      "version": "17.0.32",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
       "dev": true,
-      "license": "MIT",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
+      "dependencies": {
+        "@types/yargs-parser": "*"
       }
     },
-    "node_modules/acorn-jsx": {
-      "version": "5.3.2",
+    "node_modules/@jest/test-result/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "license": "MIT",
-      "peerDependencies": {
-        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/acorn-walk": {
-      "version": "7.2.0",
+    "node_modules/@jest/test-result/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
       "engines": {
-        "node": ">=0.4.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/agent-base": {
-      "version": "6.0.2",
+    "node_modules/@jest/test-result/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "debug": "4"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">= 6.0.0"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/aggregate-error": {
-      "version": "3.1.0",
+    "node_modules/@jest/test-result/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/@jest/test-result/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
-      },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/airbnb-prop-types": {
-      "version": "2.16.0",
-      "license": "MIT",
+    "node_modules/@jest/test-result/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
       "dependencies": {
-        "array.prototype.find": "^2.1.1",
-        "function.prototype.name": "^1.1.2",
-        "is-regex": "^1.1.0",
-        "object-is": "^1.1.2",
-        "object.assign": "^4.1.0",
-        "object.entries": "^1.1.2",
-        "prop-types": "^15.7.2",
-        "prop-types-exact": "^1.2.0",
-        "react-is": "^16.13.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "has-flag": "^4.0.0"
       },
-      "peerDependencies": {
-        "react": "^0.14 || ^15.0.0 || ^16.0.0-alpha"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/ajv": {
-      "version": "8.6.3",
+    "node_modules/@jest/test-sequencer": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz",
+      "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
+        "@jest/test-result": "^29.7.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "slash": "^3.0.0"
       },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/ajv-formats": {
-      "version": "2.1.1",
+    "node_modules/@jest/transform": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz",
+      "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependencies": {
-        "ajv": "^8.0.0"
+        "@babel/core": "^7.11.6",
+        "@jest/types": "^29.6.3",
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "babel-plugin-istanbul": "^6.1.1",
+        "chalk": "^4.0.0",
+        "convert-source-map": "^2.0.0",
+        "fast-json-stable-stringify": "^2.1.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "jest-regex-util": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "pirates": "^4.0.4",
+        "slash": "^3.0.0",
+        "write-file-atomic": "^4.0.2"
       },
-      "peerDependenciesMeta": {
-        "ajv": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/alphanum-sort": {
-      "version": "1.0.2",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/amdefine": {
-      "version": "1.0.1",
-      "dev": true,
-      "license": "BSD-3-Clause OR MIT",
-      "optional": true,
       "engines": {
-        "node": ">=0.4.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/amphtml-validator": {
-      "version": "1.0.35",
+    "node_modules/@jest/transform/node_modules/@jest/types": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
-        "colors": "1.4.0",
-        "commander": "7.2.0",
-        "promise": "8.1.0"
+        "@jest/schemas": "^29.6.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
       },
-      "bin": {
-        "amphtml-validator": "cli.js"
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/ansi-align": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz",
-      "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==",
+    "node_modules/@jest/transform/node_modules/@types/yargs": {
+      "version": "17.0.32",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
       "dev": true,
       "dependencies": {
-        "string-width": "^4.1.0"
+        "@types/yargs-parser": "*"
       }
     },
-    "node_modules/ansi-colors": {
-      "version": "4.1.1",
+    "node_modules/@jest/transform/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/ansi-escapes": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+    "node_modules/@jest/transform/node_modules/babel-plugin-istanbul": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
       "dev": true,
       "dependencies": {
-        "type-fest": "^0.21.3"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^5.0.4",
+        "test-exclude": "^6.0.0"
       },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/ansi-escapes/node_modules/type-fest": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+    "node_modules/@jest/transform/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
       "engines": {
         "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/ansi-gray": {
-      "version": "0.1.1",
+    "node_modules/@jest/transform/node_modules/ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-wrap": "0.1.0"
-      },
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/ansi-red": {
-      "version": "0.1.1",
+    "node_modules/@jest/transform/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "ansi-wrap": "0.1.0"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+    "node_modules/@jest/transform/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/@jest/transform/node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true
+    },
+    "node_modules/@jest/transform/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/ansi-styles": {
-      "version": "3.2.1",
+    "node_modules/@jest/transform/node_modules/istanbul-lib-instrument": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "color-convert": "^1.9.0"
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^6.3.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
-    "node_modules/ansi-wrap": {
-      "version": "0.1.0",
+    "node_modules/@jest/transform/node_modules/jest-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/any-promise": {
-      "version": "1.3.0",
+    "node_modules/@jest/transform/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
-      "license": "MIT"
+      "bin": {
+        "semver": "bin/semver.js"
+      }
     },
-    "node_modules/anymatch": {
-      "version": "3.1.2",
+    "node_modules/@jest/transform/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">=8"
       }
     },
-    "node_modules/append-buffer": {
-      "version": "1.0.2",
+    "node_modules/@jest/types": {
+      "version": "26.6.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "buffer-equal": "^1.0.0"
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^4.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 10.14.2"
       }
     },
-    "node_modules/append-field": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/archiver": {
-      "version": "0.14.4",
+    "node_modules/@jest/types/node_modules/ansi-styles": {
+      "version": "4.3.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "async": "~0.9.0",
-        "buffer-crc32": "~0.2.1",
-        "glob": "~4.3.0",
-        "lazystream": "~0.1.0",
-        "lodash": "~3.2.0",
-        "readable-stream": "~1.0.26",
-        "tar-stream": "~1.1.0",
-        "zip-stream": "~0.5.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">= 0.10.0"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/archiver/node_modules/glob": {
-      "version": "4.3.5",
+    "node_modules/@jest/types/node_modules/chalk": {
+      "version": "4.1.0",
       "dev": true,
-      "license": "ISC",
+      "license": "MIT",
       "dependencies": {
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^2.0.1",
-        "once": "^1.3.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": "*"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/archiver/node_modules/isarray": {
-      "version": "0.0.1",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/archiver/node_modules/lazystream": {
-      "version": "0.1.0",
+    "node_modules/@jest/types/node_modules/color-convert": {
+      "version": "2.0.1",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "readable-stream": "~1.0.2"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">= 0.6.3"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/archiver/node_modules/lodash": {
-      "version": "3.2.0",
+    "node_modules/@jest/types/node_modules/color-name": {
+      "version": "1.1.4",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/archiver/node_modules/minimatch": {
-      "version": "2.0.10",
+    "node_modules/@jest/types/node_modules/has-flag": {
+      "version": "4.0.0",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^1.0.0"
-      },
+      "license": "MIT",
       "engines": {
-        "node": "*"
+        "node": ">=8"
       }
     },
-    "node_modules/archiver/node_modules/readable-stream": {
-      "version": "1.0.34",
+    "node_modules/@jest/types/node_modules/supports-color": {
+      "version": "7.2.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/archiver/node_modules/string_decoder": {
-      "version": "0.10.31",
+    "node_modules/@jridgewell/doctrine": {
+      "version": "3.0.2",
       "dev": true,
-      "license": "MIT"
+      "license": "Apache-2.0",
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
     },
-    "node_modules/argparse": {
-      "version": "1.0.10",
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "sprintf-js": "~1.0.2"
+        "@jridgewell/set-array": "^1.2.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      },
+      "engines": {
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/argv": {
-      "version": "0.0.2",
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
       "dev": true,
       "engines": {
-        "node": ">=0.6.10"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/arr-diff": {
-      "version": "4.0.0",
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/arr-flatten": {
-      "version": "1.1.0",
+    "node_modules/@jridgewell/source-map": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.3.tgz",
+      "integrity": "sha512-b+fsZXeLYi9fEULmfBrhxn4IrPlINf8fiNarzTof004v3lFdntdwa9PF7vFJqm3mg7s+ScJMxXaE3Acp1irZcg==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
       }
     },
-    "node_modules/arr-union": {
-      "version": "3.1.0",
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+      "dev": true
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
+    "node_modules/@kristoferbaxter/async": {
+      "version": "1.0.0",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=12"
       }
     },
-    "node_modules/array-filter": {
-      "version": "1.0.0",
+    "node_modules/@kristoferbaxter/bytes": {
+      "version": "0.1.2",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14"
+      }
     },
-    "node_modules/array-find-index": {
-      "version": "1.0.2",
+    "node_modules/@kristoferbaxter/kleur": {
+      "version": "4.0.2",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=12"
       }
     },
-    "node_modules/array-includes": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.4.tgz",
-      "integrity": "sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==",
+    "node_modules/@mapbox/node-pre-gyp": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz",
+      "integrity": "sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1",
-        "get-intrinsic": "^1.1.1",
-        "is-string": "^1.0.7"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "detect-libc": "^2.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "make-dir": "^3.1.0",
+        "node-fetch": "^2.6.7",
+        "nopt": "^5.0.0",
+        "npmlog": "^5.0.1",
+        "rimraf": "^3.0.2",
+        "semver": "^7.3.5",
+        "tar": "^6.1.11"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "bin": {
+        "node-pre-gyp": "bin/node-pre-gyp"
       }
     },
-    "node_modules/array-includes/node_modules/get-intrinsic": {
-      "version": "1.1.1",
+    "node_modules/@mapbox/node-pre-gyp/node_modules/nopt": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
+      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1"
+        "abbrev": "1"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "bin": {
+        "nopt": "bin/nopt.js"
+      },
+      "engines": {
+        "node": ">=6"
       }
     },
-    "node_modules/array-union": {
-      "version": "2.1.0",
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">= 8"
       }
     },
-    "node_modules/array-unique": {
-      "version": "0.3.2",
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 8"
       }
     },
-    "node_modules/array.prototype.find": {
-      "version": "2.1.1",
-      "license": "MIT",
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
       "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.4"
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">= 8"
       }
     },
-    "node_modules/array.prototype.flat": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz",
-      "integrity": "sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0"
-      },
+    "node_modules/@octokit/auth-token": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-4.0.0.tgz",
+      "integrity": "sha512-tY/msAuJo6ARbK6SPIxZrPBms3xPbfwBrulZe0Wtr/DIY9lje2HeV1uoebShn6mx7SjCHif6EjMvoREj+gZ+SA==",
+      "dev": true,
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">= 18"
       }
     },
-    "node_modules/array.prototype.flatmap": {
-      "version": "1.2.4",
+    "node_modules/@octokit/core": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-5.1.0.tgz",
+      "integrity": "sha512-BDa2VAMLSh3otEiaMJ/3Y36GU4qf6GI+VivQ/P41NC6GHcdxpKlqV0ikSZ5gdQsmS3ojXeRx5vasgNTinF0Q4g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.1",
-        "function-bind": "^1.1.1"
+        "@octokit/auth-token": "^4.0.0",
+        "@octokit/graphql": "^7.0.0",
+        "@octokit/request": "^8.0.2",
+        "@octokit/request-error": "^5.0.0",
+        "@octokit/types": "^12.0.0",
+        "before-after-hook": "^2.2.0",
+        "universal-user-agent": "^6.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">= 18"
       }
     },
-    "node_modules/arrgv": {
-      "version": "1.0.2",
+    "node_modules/@octokit/endpoint": {
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-9.0.4.tgz",
+      "integrity": "sha512-DWPLtr1Kz3tv8L0UvXTDP1fNwM0S+z6EJpRcvH66orY6Eld4XBMCSYsaWp4xIm61jTWxK68BrR7ibO+vSDnZqw==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^12.0.0",
+        "universal-user-agent": "^6.0.0"
+      },
       "engines": {
-        "node": ">=8.0.0"
+        "node": ">= 18"
       }
     },
-    "node_modules/arrify": {
-      "version": "2.0.1",
+    "node_modules/@octokit/graphql": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-7.1.0.tgz",
+      "integrity": "sha512-r+oZUH7aMFui1ypZnAvZmn0KSqAUgE1/tUXIWaqUCa1758ts/Jio84GZuzsvUkme98kv0WFY8//n0J1Z+vsIsQ==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "@octokit/request": "^8.3.0",
+        "@octokit/types": "^13.0.0",
+        "universal-user-agent": "^6.0.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">= 18"
       }
     },
-    "node_modules/asap": {
-      "version": "2.0.6",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/@octokit/graphql/node_modules/@octokit/openapi-types": {
+      "version": "22.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-22.2.0.tgz",
+      "integrity": "sha512-QBhVjcUa9W7Wwhm6DBFu6ZZ+1/t/oYxqc2tp81Pi41YNuJinbFRx8B133qVOrAaBbF7D/m0Et6f9/pZt9Rc+tg==",
+      "dev": true
     },
-    "node_modules/asn1": {
-      "version": "0.2.4",
+    "node_modules/@octokit/graphql/node_modules/@octokit/types": {
+      "version": "13.5.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.5.0.tgz",
+      "integrity": "sha512-HdqWTf5Z3qwDVlzCrP8UJquMwunpDiMPt5er+QjGzL4hqr/vBVY/MauQgS1xWxCDT1oMx1EULyqxncdCY/NVSQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "safer-buffer": "~2.1.0"
+        "@octokit/openapi-types": "^22.2.0"
       }
     },
-    "node_modules/assert-plus": {
-      "version": "1.0.0",
+    "node_modules/@octokit/openapi-types": {
+      "version": "19.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-19.1.0.tgz",
+      "integrity": "sha512-6G+ywGClliGQwRsjvqVYpklIfa7oRPA0vyhPQG/1Feh+B+wU0vGH1JiJ5T25d3g1JZYBHzR2qefLi9x8Gt+cpw==",
+      "dev": true
+    },
+    "node_modules/@octokit/plugin-paginate-rest": {
+      "version": "11.3.1",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-11.3.1.tgz",
+      "integrity": "sha512-ryqobs26cLtM1kQxqeZui4v8FeznirUsksiA+RYemMPJ7Micju0WSkv50dBksTuZks9O5cg4wp+t8fZ/cLY56g==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^13.5.0"
+      },
       "engines": {
-        "node": ">=0.8"
+        "node": ">= 18"
+      },
+      "peerDependencies": {
+        "@octokit/core": "5"
       }
     },
-    "node_modules/assertion-error": {
-      "version": "1.1.0",
+    "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/openapi-types": {
+      "version": "22.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-22.2.0.tgz",
+      "integrity": "sha512-QBhVjcUa9W7Wwhm6DBFu6ZZ+1/t/oYxqc2tp81Pi41YNuJinbFRx8B133qVOrAaBbF7D/m0Et6f9/pZt9Rc+tg==",
+      "dev": true
+    },
+    "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/types": {
+      "version": "13.5.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.5.0.tgz",
+      "integrity": "sha512-HdqWTf5Z3qwDVlzCrP8UJquMwunpDiMPt5er+QjGzL4hqr/vBVY/MauQgS1xWxCDT1oMx1EULyqxncdCY/NVSQ==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "*"
+      "dependencies": {
+        "@octokit/openapi-types": "^22.2.0"
       }
     },
-    "node_modules/assign-symbols": {
-      "version": "1.0.0",
+    "node_modules/@octokit/plugin-request-log": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-4.0.0.tgz",
+      "integrity": "sha512-2uJI1COtYCq8Z4yNSnM231TgH50bRkheQ9+aH8TnZanB6QilOnx8RMD2qsnamSOXtDj0ilxvevf5fGsBhBBzKA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 18"
+      },
+      "peerDependencies": {
+        "@octokit/core": ">=5"
       }
     },
-    "node_modules/ast-replace": {
-      "version": "1.1.3",
+    "node_modules/@octokit/plugin-rest-endpoint-methods": {
+      "version": "13.2.2",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-13.2.2.tgz",
+      "integrity": "sha512-EI7kXWidkt3Xlok5uN43suK99VWqc8OaIMktY9d9+RNKl69juoTyxmLoWPIZgJYzi41qj/9zU7G/ljnNOJ5AFA==",
       "dev": true,
-      "license": "Unlicensed",
       "dependencies": {
-        "ast-test": "^1.1.1",
-        "ast-types": "^0.6.12",
-        "is-function": "^1.0.1"
+        "@octokit/types": "^13.5.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      },
+      "peerDependencies": {
+        "@octokit/core": "^5"
       }
     },
-    "node_modules/ast-test": {
-      "version": "1.1.1",
+    "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/openapi-types": {
+      "version": "22.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-22.2.0.tgz",
+      "integrity": "sha512-QBhVjcUa9W7Wwhm6DBFu6ZZ+1/t/oYxqc2tp81Pi41YNuJinbFRx8B133qVOrAaBbF7D/m0Et6f9/pZt9Rc+tg==",
+      "dev": true
+    },
+    "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types": {
+      "version": "13.5.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.5.0.tgz",
+      "integrity": "sha512-HdqWTf5Z3qwDVlzCrP8UJquMwunpDiMPt5er+QjGzL4hqr/vBVY/MauQgS1xWxCDT1oMx1EULyqxncdCY/NVSQ==",
       "dev": true,
-      "license": "Unlicensed",
       "dependencies": {
-        "ast-types": "^0.6.14"
+        "@octokit/openapi-types": "^22.2.0"
       }
     },
-    "node_modules/ast-types": {
-      "version": "0.6.16",
+    "node_modules/@octokit/request": {
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-8.4.0.tgz",
+      "integrity": "sha512-9Bb014e+m2TgBeEJGEbdplMVWwPmL1FPtggHQRkV+WVsMggPtEkLKPlcVYm/o8xKLkpJ7B+6N8WfQMtDLX2Dpw==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "@octokit/endpoint": "^9.0.1",
+        "@octokit/request-error": "^5.1.0",
+        "@octokit/types": "^13.1.0",
+        "universal-user-agent": "^6.0.0"
+      },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 18"
       }
     },
-    "node_modules/astral-regex": {
-      "version": "2.0.0",
+    "node_modules/@octokit/request-error": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-5.1.0.tgz",
+      "integrity": "sha512-GETXfE05J0+7H2STzekpKObFe765O5dlAKUTLNGeH+x47z7JjXHfsHKo5z21D/o/IOZTUEI6nyWyR+bZVP/n5Q==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^13.1.0",
+        "deprecation": "^2.0.0",
+        "once": "^1.4.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">= 18"
       }
     },
-    "node_modules/async": {
-      "version": "0.9.2",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/@octokit/request-error/node_modules/@octokit/openapi-types": {
+      "version": "22.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-22.2.0.tgz",
+      "integrity": "sha512-QBhVjcUa9W7Wwhm6DBFu6ZZ+1/t/oYxqc2tp81Pi41YNuJinbFRx8B133qVOrAaBbF7D/m0Et6f9/pZt9Rc+tg==",
+      "dev": true
     },
-    "node_modules/async-retry": {
-      "version": "1.3.3",
+    "node_modules/@octokit/request-error/node_modules/@octokit/types": {
+      "version": "13.5.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.5.0.tgz",
+      "integrity": "sha512-HdqWTf5Z3qwDVlzCrP8UJquMwunpDiMPt5er+QjGzL4hqr/vBVY/MauQgS1xWxCDT1oMx1EULyqxncdCY/NVSQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "retry": "0.13.1"
+        "@octokit/openapi-types": "^22.2.0"
       }
     },
-    "node_modules/asynckit": {
-      "version": "0.4.0",
+    "node_modules/@octokit/request/node_modules/@octokit/openapi-types": {
+      "version": "22.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-22.2.0.tgz",
+      "integrity": "sha512-QBhVjcUa9W7Wwhm6DBFu6ZZ+1/t/oYxqc2tp81Pi41YNuJinbFRx8B133qVOrAaBbF7D/m0Et6f9/pZt9Rc+tg==",
+      "dev": true
+    },
+    "node_modules/@octokit/request/node_modules/@octokit/types": {
+      "version": "13.5.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.5.0.tgz",
+      "integrity": "sha512-HdqWTf5Z3qwDVlzCrP8UJquMwunpDiMPt5er+QjGzL4hqr/vBVY/MauQgS1xWxCDT1oMx1EULyqxncdCY/NVSQ==",
       "dev": true,
-      "license": "MIT"
+      "dependencies": {
+        "@octokit/openapi-types": "^22.2.0"
+      }
     },
-    "node_modules/atob": {
-      "version": "2.1.2",
+    "node_modules/@octokit/rest": {
+      "version": "20.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-20.1.1.tgz",
+      "integrity": "sha512-MB4AYDsM5jhIHro/dq4ix1iWTLGToIGk6cWF5L6vanFaMble5jTX/UBQyiv05HsWnwUtY8JrfHy2LWfKwihqMw==",
       "dev": true,
-      "license": "(MIT OR Apache-2.0)",
-      "bin": {
-        "atob": "bin/atob.js"
+      "dependencies": {
+        "@octokit/core": "^5.0.2",
+        "@octokit/plugin-paginate-rest": "11.3.1",
+        "@octokit/plugin-request-log": "^4.0.0",
+        "@octokit/plugin-rest-endpoint-methods": "13.2.2"
       },
       "engines": {
-        "node": ">= 4.5.0"
+        "node": ">= 18"
       }
     },
-    "node_modules/autolinker": {
-      "version": "0.28.1",
+    "node_modules/@octokit/types": {
+      "version": "12.4.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.4.0.tgz",
+      "integrity": "sha512-FLWs/AvZllw/AGVs+nJ+ELCDZZJk+kY0zMen118xhL2zD0s1etIUHm1odgjP7epxYU1ln7SZxEUWYop5bhsdgQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "gulp-header": "^1.7.1"
+        "@octokit/openapi-types": "^19.1.0"
       }
     },
-    "node_modules/autoprefixer": {
-      "version": "10.3.7",
+    "node_modules/@pkgr/core": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.0.tgz",
+      "integrity": "sha512-Zwq5OCzuwJC2jwqmpEQt7Ds1DTi6BWSwoGkbb1n9pO3hzb35BoJELx7c0T23iDkBGkh2e7tvOtjF3tr3OaQHDQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "browserslist": "^4.17.3",
-        "caniuse-lite": "^1.0.30001264",
-        "fraction.js": "^4.1.1",
-        "normalize-range": "^0.1.2",
-        "picocolors": "^0.2.1",
-        "postcss-value-parser": "^4.1.0"
-      },
-      "bin": {
-        "autoprefixer": "bin/autoprefixer"
-      },
       "engines": {
-        "node": "^10 || ^12 || >=14"
+        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
+        "url": "https://opencollective.com/unts"
+      }
+    },
+    "node_modules/@reach/auto-id": {
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/@reach/auto-id/-/auto-id-0.16.0.tgz",
+      "integrity": "sha512-5ssbeP5bCkM39uVsfQCwBBL+KT8YColdnMN5/Eto6Rj7929ql95R3HZUOkKIvj7mgPtEb60BLQxd1P3o6cjbmg==",
+      "dependencies": {
+        "@reach/utils": "0.16.0",
+        "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "postcss": "^8.1.0"
+        "react": "^16.8.0 || 17.x",
+        "react-dom": "^16.8.0 || 17.x"
       }
     },
-    "node_modules/ava": {
-      "version": "3.15.0",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@reach/utils": {
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/@reach/utils/-/utils-0.16.0.tgz",
+      "integrity": "sha512-PCggBet3qaQmwFNcmQ/GqHSefadAFyNCUekq9RrWoaU9hh/S4iaFgf2MBMdM47eQj5i/Bk0Mm07cP/XPFlkN+Q==",
       "dependencies": {
-        "@concordance/react": "^2.0.0",
-        "acorn": "^8.0.4",
-        "acorn-walk": "^8.0.0",
-        "ansi-styles": "^5.0.0",
-        "arrgv": "^1.0.2",
-        "arrify": "^2.0.1",
-        "callsites": "^3.1.0",
-        "chalk": "^4.1.0",
-        "chokidar": "^3.4.3",
-        "chunkd": "^2.0.1",
-        "ci-info": "^2.0.0",
-        "ci-parallel-vars": "^1.0.1",
-        "clean-yaml-object": "^0.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-truncate": "^2.1.0",
-        "code-excerpt": "^3.0.0",
-        "common-path-prefix": "^3.0.0",
-        "concordance": "^5.0.1",
-        "convert-source-map": "^1.7.0",
-        "currently-unhandled": "^0.4.1",
-        "debug": "^4.3.1",
-        "del": "^6.0.0",
-        "emittery": "^0.8.0",
-        "equal-length": "^1.0.0",
-        "figures": "^3.2.0",
-        "globby": "^11.0.1",
-        "ignore-by-default": "^2.0.0",
-        "import-local": "^3.0.2",
-        "indent-string": "^4.0.0",
-        "is-error": "^2.2.2",
-        "is-plain-object": "^5.0.0",
-        "is-promise": "^4.0.0",
-        "lodash": "^4.17.20",
-        "matcher": "^3.0.0",
-        "md5-hex": "^3.0.1",
-        "mem": "^8.0.0",
-        "ms": "^2.1.3",
-        "ora": "^5.2.0",
-        "p-event": "^4.2.0",
-        "p-map": "^4.0.0",
-        "picomatch": "^2.2.2",
-        "pkg-conf": "^3.1.0",
-        "plur": "^4.0.0",
-        "pretty-ms": "^7.0.1",
-        "read-pkg": "^5.2.0",
-        "resolve-cwd": "^3.0.0",
-        "slash": "^3.0.0",
-        "source-map-support": "^0.5.19",
-        "stack-utils": "^2.0.3",
-        "strip-ansi": "^6.0.0",
-        "supertap": "^2.0.0",
-        "temp-dir": "^2.0.0",
-        "trim-off-newlines": "^1.0.1",
-        "update-notifier": "^5.0.1",
-        "write-file-atomic": "^3.0.3",
-        "yargs": "^16.2.0"
+        "tiny-warning": "^1.0.3",
+        "tslib": "^2.3.0"
       },
-      "bin": {
-        "ava": "cli.js"
-      },
-      "engines": {
-        "node": ">=10.18.0 <11 || >=12.14.0 <12.17.0 || >=12.17.0 <13 || >=14.0.0 <15 || >=15"
+      "peerDependencies": {
+        "react": "^16.8.0 || 17.x",
+        "react-dom": "^16.8.0 || 17.x"
       }
     },
-    "node_modules/ava/node_modules/acorn-walk": {
-      "version": "8.0.2",
+    "node_modules/@rollup/pluginutils": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz",
+      "integrity": "sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "estree-walker": "^2.0.1",
+        "picomatch": "^2.2.2"
+      },
       "engines": {
-        "node": ">=0.4.0"
+        "node": ">= 8.0.0"
       }
     },
-    "node_modules/ava/node_modules/ansi-styles": {
-      "version": "5.1.0",
+    "node_modules/@rtsao/scc": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
+      "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==",
+      "dev": true
+    },
+    "node_modules/@sinclair/typebox": {
+      "version": "0.27.8",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
+      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
+      "dev": true
+    },
+    "node_modules/@sindresorhus/merge-streams": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz",
+      "integrity": "sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/ava/node_modules/chalk": {
-      "version": "4.1.0",
+    "node_modules/@sinonjs/commons": {
+      "version": "1.8.2",
       "dev": true,
-      "license": "MIT",
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "type-detect": "4.0.8"
       }
     },
-    "node_modules/ava/node_modules/chalk/node_modules/ansi-styles": {
-      "version": "4.3.0",
+    "node_modules/@sinonjs/fake-timers": {
+      "version": "11.2.2",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-11.2.2.tgz",
+      "integrity": "sha512-G2piCSxQ7oWOxwGSAyFHfPIsyeJGXYtc6mFbnFA+kRXkiEnTl8c/8jul2S329iFBnDI9HGoeWWAZvuvOkZccgw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "@sinonjs/commons": "^3.0.0"
       }
     },
-    "node_modules/ava/node_modules/color-convert": {
-      "version": "2.0.1",
+    "node_modules/@sinonjs/fake-timers/node_modules/@sinonjs/commons": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
+      "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
+        "type-detect": "4.0.8"
       }
     },
-    "node_modules/ava/node_modules/color-name": {
-      "version": "1.1.4",
+    "node_modules/@sinonjs/samsam": {
+      "version": "6.0.2",
       "dev": true,
-      "license": "MIT"
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@sinonjs/commons": "^1.6.0",
+        "lodash.get": "^4.4.2",
+        "type-detect": "^4.0.8"
+      }
     },
-    "node_modules/ava/node_modules/has-flag": {
-      "version": "4.0.0",
+    "node_modules/@sinonjs/text-encoding": {
+      "version": "0.7.1",
       "dev": true,
-      "license": "MIT",
+      "license": "(Unlicense OR Apache-2.0)"
+    },
+    "node_modules/@smithy/abort-controller": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.1.1.tgz",
+      "integrity": "sha512-MBJBiidoe+0cTFhyxT8g+9g7CeVccLM0IOKKUMCNQ1CNMJ/eIfoo0RTfVrXOONEI1UCN1W+zkiHSbzUNE9dZtQ==",
+      "dev": true,
+      "dependencies": {
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/ava/node_modules/is-plain-object": {
-      "version": "5.0.0",
+    "node_modules/@smithy/chunked-blob-reader": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/chunked-blob-reader/-/chunked-blob-reader-3.0.0.tgz",
+      "integrity": "sha512-sbnURCwjF0gSToGlsBiAmd1lRCmSn72nu9axfJu5lIx6RUEgHu6GwTMbqCdhQSi0Pumcm5vFxsi9XWXb2mTaoA==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "tslib": "^2.6.2"
       }
     },
-    "node_modules/ava/node_modules/ms": {
-      "version": "2.1.3",
+    "node_modules/@smithy/chunked-blob-reader-native": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/chunked-blob-reader-native/-/chunked-blob-reader-native-3.0.0.tgz",
+      "integrity": "sha512-VDkpCYW+peSuM4zJip5WDfqvg2Mo/e8yxOv3VF1m11y7B8KKMKVFtmZWDe36Fvk8rGuWrPZHHXZ7rR7uM5yWyg==",
       "dev": true,
-      "license": "MIT"
+      "dependencies": {
+        "@smithy/util-base64": "^3.0.0",
+        "tslib": "^2.6.2"
+      }
     },
-    "node_modules/ava/node_modules/supports-color": {
-      "version": "7.2.0",
+    "node_modules/@smithy/config-resolver": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-3.0.5.tgz",
+      "integrity": "sha512-SkW5LxfkSI1bUC74OtfBbdz+grQXYiPYolyu8VfpLIjEoN/sHVBlLeGXMQ1vX4ejkgfv6sxVbQJ32yF2cl1veA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "@smithy/node-config-provider": "^3.1.4",
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-config-provider": "^3.0.0",
+        "@smithy/util-middleware": "^3.0.3",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/available-typed-arrays": {
-      "version": "1.0.4",
+    "node_modules/@smithy/core": {
+      "version": "2.2.6",
+      "resolved": "https://registry.npmjs.org/@smithy/core/-/core-2.2.6.tgz",
+      "integrity": "sha512-tBbVIv/ui7/lLTKayYJJvi8JLVL2SwOQTbNFEOrvzSE3ktByvsa1erwBOnAMo8N5Vu30g7lN4lLStrU75oDGuw==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
+      "dependencies": {
+        "@smithy/middleware-endpoint": "^3.0.5",
+        "@smithy/middleware-retry": "^3.0.9",
+        "@smithy/middleware-serde": "^3.0.3",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/smithy-client": "^3.1.7",
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-middleware": "^3.0.3",
+        "tslib": "^2.6.2"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/aws-sign2": {
-      "version": "0.7.0",
+    "node_modules/@smithy/credential-provider-imds": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-3.1.4.tgz",
+      "integrity": "sha512-NKyH01m97Xa5xf3pB2QOF3lnuE8RIK0hTVNU5zvZAwZU8uspYO4DHQVlK+Y5gwSrujTfHvbfd1D9UFJAc0iYKQ==",
       "dev": true,
-      "license": "Apache-2.0",
+      "dependencies": {
+        "@smithy/node-config-provider": "^3.1.4",
+        "@smithy/property-provider": "^3.1.3",
+        "@smithy/types": "^3.3.0",
+        "@smithy/url-parser": "^3.0.3",
+        "tslib": "^2.6.2"
+      },
       "engines": {
-        "node": "*"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/aws4": {
-      "version": "1.11.0",
+    "node_modules/@smithy/eventstream-codec": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-3.1.2.tgz",
+      "integrity": "sha512-0mBcu49JWt4MXhrhRAlxASNy0IjDRFU+aWNDRal9OtUJvJNiwDuyKMUONSOjLjSCeGwZaE0wOErdqULer8r7yw==",
       "dev": true,
-      "license": "MIT"
+      "dependencies": {
+        "@aws-crypto/crc32": "5.2.0",
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-hex-encoding": "^3.0.0",
+        "tslib": "^2.6.2"
+      }
     },
-    "node_modules/babel-check-duplicated-nodes": {
-      "version": "1.0.0",
+    "node_modules/@smithy/eventstream-serde-browser": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-3.0.4.tgz",
+      "integrity": "sha512-Eo4anLZX6ltGJTZ5yJMc80gZPYYwBn44g0h7oFq6et+TYr5dUsTpIcDbz2evsOKIZhZ7zBoFWHtBXQ4QQeb5xA==",
       "dev": true,
-      "license": "MIT"
+      "dependencies": {
+        "@smithy/eventstream-serde-universal": "^3.0.4",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
     },
-    "node_modules/babel-core": {
-      "version": "7.0.0-bridge.0",
+    "node_modules/@smithy/eventstream-serde-config-resolver": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.0.3.tgz",
+      "integrity": "sha512-NVTYjOuYpGfrN/VbRQgn31x73KDLfCXCsFdad8DiIc3IcdxL+dYA9zEQPyOP7Fy2QL8CPy2WE4WCUD+ZsLNfaQ==",
       "dev": true,
-      "license": "MIT",
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "dependencies": {
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/babel-plugin-dynamic-import-node": {
-      "version": "2.3.3",
+    "node_modules/@smithy/eventstream-serde-node": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-3.0.4.tgz",
+      "integrity": "sha512-mjlG0OzGAYuUpdUpflfb9zyLrBGgmQmrobNT8b42ZTsGv/J03+t24uhhtVEKG/b2jFtPIHF74Bq+VUtbzEKOKg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "object.assign": "^4.1.0"
+        "@smithy/eventstream-serde-universal": "^3.0.4",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/babel-plugin-istanbul": {
-      "version": "6.0.0",
+    "node_modules/@smithy/eventstream-serde-universal": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-3.0.4.tgz",
+      "integrity": "sha512-Od9dv8zh3PgOD7Vj4T3HSuox16n0VG8jJIM2gvKASL6aCtcS8CfHZDWe1Ik3ZXW6xBouU+45Q5wgoliWDZiJ0A==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@istanbuljs/load-nyc-config": "^1.0.0",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-instrument": "^4.0.0",
-        "test-exclude": "^6.0.0"
+        "@smithy/eventstream-codec": "^3.1.2",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/babel-plugin-jest-hoist": {
-      "version": "27.2.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.2.0.tgz",
-      "integrity": "sha512-TOux9khNKdi64mW+0OIhcmbAn75tTlzKhxmiNXevQaPbrBYK7YKjP1jl6NHTJ6XR5UgUrJbCnWlKVnJn29dfjw==",
+    "node_modules/@smithy/fetch-http-handler": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-3.2.1.tgz",
+      "integrity": "sha512-0w0bgUvZmfa0vHN8a+moByhCJT07WN6AHKEhFSOLsDpnszm+5dLVv5utGaqbhOrZ/aF5x3xuPMs/oMCd+4O5xg==",
       "dev": true,
       "dependencies": {
-        "@babel/template": "^7.3.3",
-        "@babel/types": "^7.3.3",
-        "@types/babel__core": "^7.0.0",
-        "@types/babel__traverse": "^7.0.6"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/querystring-builder": "^3.0.3",
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-base64": "^3.0.0",
+        "tslib": "^2.6.2"
       }
     },
-    "node_modules/babel-plugin-minify-replace": {
-      "version": "0.5.0",
+    "node_modules/@smithy/hash-blob-browser": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-3.1.2.tgz",
+      "integrity": "sha512-hAbfqN2UbISltakCC2TP0kx4LqXBttEv2MqSPE98gVuDFMf05lU+TpC41QtqGP3Ff5A3GwZMPfKnEy0VmEUpmg==",
       "dev": true,
-      "license": "MIT"
+      "dependencies": {
+        "@smithy/chunked-blob-reader": "^3.0.0",
+        "@smithy/chunked-blob-reader-native": "^3.0.0",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
+      }
     },
-    "node_modules/babel-plugin-module-resolver": {
-      "version": "4.1.0",
+    "node_modules/@smithy/hash-node": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-3.0.3.tgz",
+      "integrity": "sha512-2ctBXpPMG+B3BtWSGNnKELJ7SH9e4TNefJS0cd2eSkOOROeBnnVBnAy9LtJ8tY4vUEoe55N4CNPxzbWvR39iBw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "find-babel-config": "^1.2.0",
-        "glob": "^7.1.6",
-        "pkg-up": "^3.1.0",
-        "reselect": "^4.0.0",
-        "resolve": "^1.13.1"
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-buffer-from": "^3.0.0",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">= 8.0.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/babel-plugin-optimize-objstr": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.2.2",
+    "node_modules/@smithy/hash-node/node_modules/@smithy/is-array-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz",
+      "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.13.11",
-        "@babel/helper-define-polyfill-provider": "^0.2.2",
-        "semver": "^6.1.1"
+        "tslib": "^2.6.2"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "engines": {
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": {
-      "version": "6.3.0",
+    "node_modules/@smithy/hash-node/node_modules/@smithy/util-buffer-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz",
+      "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==",
       "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
+      "dependencies": {
+        "@smithy/is-array-buffer": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.2.3",
+    "node_modules/@smithy/hash-node/node_modules/@smithy/util-utf8": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz",
+      "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.2.2",
-        "core-js-compat": "^3.14.0"
+        "@smithy/util-buffer-from": "^3.0.0",
+        "tslib": "^2.6.2"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "engines": {
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.2.2",
+    "node_modules/@smithy/hash-stream-node": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-3.1.2.tgz",
+      "integrity": "sha512-PBgDMeEdDzi6JxKwbfBtwQG9eT9cVwsf0dZzLXoJF4sHKHs5HEo/3lJWpn6jibfJwT34I1EBXpBnZE8AxAft6g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.2.2"
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "engines": {
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/baconipsum": {
-      "version": "0.1.2",
+    "node_modules/@smithy/hash-stream-node/node_modules/@smithy/is-array-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz",
+      "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==",
       "dev": true,
-      "license": "BSD-2-Clause"
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
     },
-    "node_modules/balanced-match": {
-      "version": "1.0.0",
+    "node_modules/@smithy/hash-stream-node/node_modules/@smithy/util-buffer-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz",
+      "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==",
       "dev": true,
-      "license": "MIT"
+      "dependencies": {
+        "@smithy/is-array-buffer": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
     },
-    "node_modules/base": {
-      "version": "0.11.2",
+    "node_modules/@smithy/hash-stream-node/node_modules/@smithy/util-utf8": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz",
+      "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==",
       "dev": true,
-      "license": "MIT",
       "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"
+        "@smithy/util-buffer-from": "^3.0.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/base/node_modules/define-property": {
-      "version": "1.0.0",
+    "node_modules/@smithy/invalid-dependency": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-3.0.3.tgz",
+      "integrity": "sha512-ID1eL/zpDULmHJbflb864k72/SNOZCADRc9i7Exq3RUNJw6raWUSlFEQ+3PX3EYs++bTxZB2dE9mEHTQLv61tw==",
+      "dev": true,
+      "dependencies": {
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "node_modules/@smithy/is-array-buffer": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.1.1.tgz",
+      "integrity": "sha512-xozSQrcUinPpNPNPds4S7z/FakDTh1MZWtRP/2vQtYB/u3HYrX2UXuZs+VhaKBd6Vc7g2XPr2ZtwGBNDN6fNKQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "is-descriptor": "^1.0.0"
+        "tslib": "^2.5.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=14.0.0"
       }
     },
-    "node_modules/base/node_modules/is-accessor-descriptor": {
-      "version": "1.0.0",
+    "node_modules/@smithy/md5-js": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-3.0.3.tgz",
+      "integrity": "sha512-O/SAkGVwpWmelpj/8yDtsaVe6sINHLB1q8YE/+ZQbDxIw3SRLbTZuRaI10K12sVoENdnHqzPp5i3/H+BcZ3m3Q==",
+      "dev": true,
+      "dependencies": {
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "node_modules/@smithy/md5-js/node_modules/@smithy/is-array-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz",
+      "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "kind-of": "^6.0.0"
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/base/node_modules/is-data-descriptor": {
-      "version": "1.0.0",
+    "node_modules/@smithy/md5-js/node_modules/@smithy/util-buffer-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz",
+      "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "kind-of": "^6.0.0"
+        "@smithy/is-array-buffer": "^3.0.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/base/node_modules/is-descriptor": {
-      "version": "1.0.2",
+    "node_modules/@smithy/md5-js/node_modules/@smithy/util-utf8": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz",
+      "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
+        "@smithy/util-buffer-from": "^3.0.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/base62": {
-      "version": "2.0.1",
+    "node_modules/@smithy/middleware-content-length": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-3.0.3.tgz",
+      "integrity": "sha512-Dbz2bzexReYIQDWMr+gZhpwBetNXzbhnEMhYKA6urqmojO14CsXjnsoPYO8UL/xxcawn8ZsuVU61ElkLSltIUQ==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
+      },
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/base64-arraybuffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.1.tgz",
-      "integrity": "sha512-vFIUq7FdLtjZMhATwDul5RZWv2jpXQ09Pd6jcVEOvIsqCWTRFD/ONHNfyOS8dA/Ippi5dsIgpyKWKZaAKZltbA==",
+    "node_modules/@smithy/middleware-endpoint": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-3.0.5.tgz",
+      "integrity": "sha512-V4acqqrh5tDxUEGVTOgf2lYMZqPQsoGntCrjrJZEeBzEzDry2d2vcI1QCXhGltXPPY+BMc6eksZMguA9fIY8vA==",
       "dev": true,
+      "dependencies": {
+        "@smithy/middleware-serde": "^3.0.3",
+        "@smithy/node-config-provider": "^3.1.4",
+        "@smithy/shared-ini-file-loader": "^3.1.4",
+        "@smithy/types": "^3.3.0",
+        "@smithy/url-parser": "^3.0.3",
+        "@smithy/util-middleware": "^3.0.3",
+        "tslib": "^2.6.2"
+      },
       "engines": {
-        "node": ">= 0.6.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/base64-js": {
-      "version": "1.5.1",
+    "node_modules/@smithy/middleware-retry": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.9.tgz",
+      "integrity": "sha512-Mrv9omExU1gA7Y0VEJG2LieGfPYtwwcEiOnVGZ54a37NEMr66TJ0glFslOJFuKWG6izg5DpKIUmDV9rRxjm47Q==",
       "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"
-        }
-      ],
-      "license": "MIT"
+      "dependencies": {
+        "@smithy/node-config-provider": "^3.1.4",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/service-error-classification": "^3.0.3",
+        "@smithy/smithy-client": "^3.1.7",
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-middleware": "^3.0.3",
+        "@smithy/util-retry": "^3.0.3",
+        "tslib": "^2.6.2",
+        "uuid": "^9.0.1"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
     },
-    "node_modules/base64id": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz",
-      "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==",
+    "node_modules/@smithy/middleware-serde": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.3.tgz",
+      "integrity": "sha512-puUbyJQBcg9eSErFXjKNiGILJGtiqmuuNKEYNYfUD57fUl4i9+mfmThtQhvFXU0hCVG0iEJhvQUipUf+/SsFdA==",
       "dev": true,
+      "dependencies": {
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
+      },
       "engines": {
-        "node": "^4.5.0 || >= 5.9"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/basic-auth": {
-      "version": "2.0.1",
+    "node_modules/@smithy/middleware-stack": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-3.0.3.tgz",
+      "integrity": "sha512-r4klY9nFudB0r9UdSMaGSyjyQK5adUyPnQN/ZM6M75phTxOdnc/AhpvGD1fQUvgmqjQEBGCwpnPbDm8pH5PapA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "safe-buffer": "5.1.2"
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/batch": {
-      "version": "0.6.1",
+    "node_modules/@smithy/node-config-provider": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.4.tgz",
+      "integrity": "sha512-YvnElQy8HR4vDcAjoy7Xkx9YT8xZP4cBXcbJSgm/kxmiQu08DwUwj8rkGnyoJTpfl/3xYHH+d8zE+eHqoDCSdQ==",
       "dev": true,
-      "license": "MIT"
+      "dependencies": {
+        "@smithy/property-provider": "^3.1.3",
+        "@smithy/shared-ini-file-loader": "^3.1.4",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
     },
-    "node_modules/bcrypt-pbkdf": {
-      "version": "1.0.2",
+    "node_modules/@smithy/node-http-handler": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.1.2.tgz",
+      "integrity": "sha512-Td3rUNI7qqtoSLTsJBtsyfoG4cF/XMFmJr6Z2dX8QNzIi6tIW6YmuyFml8mJ2cNpyWNqITKbROMOFrvQjmsOvw==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
-        "tweetnacl": "^0.14.3"
+        "@smithy/abort-controller": "^3.1.1",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/querystring-builder": "^3.0.3",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/before-after-hook": {
-      "version": "2.2.2",
+    "node_modules/@smithy/property-provider": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.3.tgz",
+      "integrity": "sha512-zahyOVR9Q4PEoguJ/NrFP4O7SMAfYO1HLhB18M+q+Z4KFd4V2obiMnlVoUFzFLSPeVt1POyNWneHHrZaTMoc/g==",
       "dev": true,
-      "license": "Apache-2.0"
+      "dependencies": {
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
     },
-    "node_modules/bignumber.js": {
-      "version": "9.0.1",
+    "node_modules/@smithy/protocol-http": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.0.3.tgz",
+      "integrity": "sha512-x5jmrCWwQlx+Zv4jAtc33ijJ+vqqYN+c/ZkrnpvEe/uDas7AT7A/4Rc2CdfxgWv4WFGmEqODIrrUToPN6DDkGw==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
+      },
       "engines": {
-        "node": "*"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/binary-extensions": {
-      "version": "2.2.0",
+    "node_modules/@smithy/querystring-builder": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.3.tgz",
+      "integrity": "sha512-vyWckeUeesFKzCDaRwWLUA1Xym9McaA6XpFfAK5qI9DKJ4M33ooQGqvM4J+LalH4u/Dq9nFiC8U6Qn1qi0+9zw==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-uri-escape": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/bl": {
-      "version": "4.1.0",
+    "node_modules/@smithy/querystring-parser": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.3.tgz",
+      "integrity": "sha512-zahM1lQv2YjmznnfQsWbYojFe55l0SLG/988brlLv1i8z3dubloLF+75ATRsqPBboUXsW6I9CPGE5rQgLfY0vQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/bl/node_modules/buffer": {
-      "version": "5.7.1",
+    "node_modules/@smithy/service-error-classification": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.3.tgz",
+      "integrity": "sha512-Jn39sSl8cim/VlkLsUhRFq/dKDnRUFlfRkvhOJaUbLBXUsLRLNf9WaxDv/z9BjuQ3A6k/qE8af1lsqcwm7+DaQ==",
       "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"
-        }
-      ],
-      "license": "MIT",
       "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
+        "@smithy/types": "^3.3.0"
+      },
+      "engines": {
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/bl/node_modules/readable-stream": {
-      "version": "3.6.0",
+    "node_modules/@smithy/shared-ini-file-loader": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.4.tgz",
+      "integrity": "sha512-qMxS4hBGB8FY2GQqshcRUy1K6k8aBWP5vwm8qKkCT3A9K2dawUwOIJfqh9Yste/Bl0J2lzosVyrXDj68kLcHXQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/blueimp-md5": {
-      "version": "2.18.0",
+    "node_modules/@smithy/signature-v4": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-3.1.2.tgz",
+      "integrity": "sha512-3BcPylEsYtD0esM4Hoyml/+s7WP2LFhcM3J2AGdcL2vx9O60TtfpDOL72gjb4lU8NeRPeKAwR77YNyyGvMbuEA==",
       "dev": true,
-      "license": "MIT"
+      "dependencies": {
+        "@smithy/is-array-buffer": "^3.0.0",
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-hex-encoding": "^3.0.0",
+        "@smithy/util-middleware": "^3.0.3",
+        "@smithy/util-uri-escape": "^3.0.0",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
     },
-    "node_modules/body": {
-      "version": "5.1.0",
+    "node_modules/@smithy/signature-v4/node_modules/@smithy/is-array-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz",
+      "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==",
       "dev": true,
       "dependencies": {
-        "continuable-cache": "^0.3.1",
-        "error": "^7.0.0",
-        "raw-body": "~1.1.0",
-        "safe-json-parse": "~1.0.1"
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/body-parser": {
-      "version": "1.19.0",
+    "node_modules/@smithy/signature-v4/node_modules/@smithy/util-buffer-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz",
+      "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==",
       "dev": true,
-      "license": "MIT",
       "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"
+        "@smithy/is-array-buffer": "^3.0.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/body-parser/node_modules/debug": {
-      "version": "2.6.9",
+    "node_modules/@smithy/signature-v4/node_modules/@smithy/util-utf8": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz",
+      "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "ms": "2.0.0"
+        "@smithy/util-buffer-from": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/body-parser/node_modules/ms": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/body-parser/node_modules/qs": {
-      "version": "6.7.0",
+    "node_modules/@smithy/smithy-client": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.1.7.tgz",
+      "integrity": "sha512-nZbJZB0XI3YnaFBWGDBr7kjaew6O0oNYNmopyIz6gKZEbxzrtH7rwvU1GcVxcSFoOwWecLJEe79fxEMljHopFQ==",
       "dev": true,
-      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@smithy/middleware-endpoint": "^3.0.5",
+        "@smithy/middleware-stack": "^3.0.3",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-stream": "^3.0.6",
+        "tslib": "^2.6.2"
+      },
       "engines": {
-        "node": ">=0.6"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/body/node_modules/bytes": {
-      "version": "1.0.0",
-      "dev": true
-    },
-    "node_modules/body/node_modules/raw-body": {
-      "version": "1.1.7",
+    "node_modules/@smithy/types": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.3.0.tgz",
+      "integrity": "sha512-IxvBBCTFDHbVoK7zIxqA1ZOdc4QfM5HM7rGleCuHi7L1wnKv5Pn69xXJQ9hgxH60ZVygH9/JG0jRgtUncE3QUA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "bytes": "1",
-        "string_decoder": "0.10"
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/body/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/boolbase": {
-      "version": "1.0.0",
+    "node_modules/@smithy/url-parser": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.3.tgz",
+      "integrity": "sha512-pw3VtZtX2rg+s6HMs6/+u9+hu6oY6U7IohGhVNnjbgKy86wcIsSZwgHrFR+t67Uyxvp4Xz3p3kGXXIpTNisq8A==",
       "dev": true,
-      "license": "ISC"
+      "dependencies": {
+        "@smithy/querystring-parser": "^3.0.3",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
+      }
     },
-    "node_modules/bower-config": {
-      "version": "1.4.3",
+    "node_modules/@smithy/util-base64": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-3.0.0.tgz",
+      "integrity": "sha512-Kxvoh5Qtt0CDsfajiZOCpJxgtPHXOKwmM+Zy4waD43UoEMA+qPxxa98aE/7ZhdnBFZFXMOiBR5xbcaMhLtznQQ==",
       "dev": true,
-      "license": "MIT",
       "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"
+        "@smithy/util-buffer-from": "^3.0.0",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/bower-config/node_modules/minimist": {
-      "version": "0.2.1",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/boxen": {
-      "version": "5.0.0",
+    "node_modules/@smithy/util-base64/node_modules/@smithy/is-array-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz",
+      "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "ansi-align": "^3.0.0",
-        "camelcase": "^6.2.0",
-        "chalk": "^4.1.0",
-        "cli-boxes": "^2.2.1",
-        "string-width": "^4.2.0",
-        "type-fest": "^0.20.2",
-        "widest-line": "^3.1.0",
-        "wrap-ansi": "^7.0.0"
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/boxen/node_modules/ansi-styles": {
-      "version": "4.3.0",
+    "node_modules/@smithy/util-base64/node_modules/@smithy/util-buffer-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz",
+      "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "@smithy/is-array-buffer": "^3.0.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/boxen/node_modules/camelcase": {
-      "version": "6.2.0",
+    "node_modules/@smithy/util-base64/node_modules/@smithy/util-utf8": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz",
+      "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
+      "dependencies": {
+        "@smithy/util-buffer-from": "^3.0.0",
+        "tslib": "^2.6.2"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "engines": {
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/boxen/node_modules/chalk": {
-      "version": "4.1.0",
+    "node_modules/@smithy/util-body-length-browser": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-3.0.0.tgz",
+      "integrity": "sha512-cbjJs2A1mLYmqmyVl80uoLTJhAcfzMOyPgjwAYusWKMdLeNtzmMz9YxNl3/jRLoxSS3wkqkf0jwNdtXWtyEBaQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "tslib": "^2.6.2"
       }
     },
-    "node_modules/boxen/node_modules/color-convert": {
-      "version": "2.0.1",
+    "node_modules/@smithy/util-body-length-node": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-3.0.0.tgz",
+      "integrity": "sha512-Tj7pZ4bUloNUP6PzwhN7K386tmSmEET9QtQg0TgdNOnxhZvCssHji+oZTUIuzxECRfG8rdm2PMw2WCFs6eIYkA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "color-name": "~1.1.4"
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/boxen/node_modules/color-name": {
-      "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/boxen/node_modules/has-flag": {
-      "version": "4.0.0",
+    "node_modules/@smithy/util-buffer-from": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.1.1.tgz",
+      "integrity": "sha512-clhNjbyfqIv9Md2Mg6FffGVrJxw7bgK7s3Iax36xnfVj6cg0fUG7I4RH0XgXJF8bxi+saY5HR21g2UPKSxVCXg==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "@smithy/is-array-buffer": "^2.1.1",
+        "tslib": "^2.5.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=14.0.0"
       }
     },
-    "node_modules/boxen/node_modules/supports-color": {
-      "version": "7.2.0",
+    "node_modules/@smithy/util-config-provider": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-3.0.0.tgz",
+      "integrity": "sha512-pbjk4s0fwq3Di/ANL+rCvJMKM5bzAQdE5S/6RL5NXgMExFAi6UgQMPOm5yPaIWPpr+EOXKXRonJ3FoxKf4mCJQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
+    "node_modules/@smithy/util-defaults-mode-browser": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.9.tgz",
+      "integrity": "sha512-WKPcElz92MAQG09miBdb0GxEH/MwD5GfE8g07WokITq5g6J1ROQfYCKC1wNnkqAGfrSywT7L0rdvvqlBplqiyA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+        "@smithy/property-provider": "^3.1.3",
+        "@smithy/smithy-client": "^3.1.7",
+        "@smithy/types": "^3.3.0",
+        "bowser": "^2.11.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
       }
     },
-    "node_modules/braces": {
-      "version": "3.0.2",
+    "node_modules/@smithy/util-defaults-mode-node": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.9.tgz",
+      "integrity": "sha512-dQLrUqFxqpf0GvEKEuFdgXcdZwz6oFm752h4d6C7lQz+RLddf761L2r7dSwGWzESMMB3wKj0jL+skRhEGlecjw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "fill-range": "^7.0.1"
+        "@smithy/config-resolver": "^3.0.5",
+        "@smithy/credential-provider-imds": "^3.1.4",
+        "@smithy/node-config-provider": "^3.1.4",
+        "@smithy/property-provider": "^3.1.3",
+        "@smithy/smithy-client": "^3.1.7",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 10.0.0"
       }
     },
-    "node_modules/brcast": {
-      "version": "2.0.2",
-      "license": "MIT"
-    },
-    "node_modules/browser-process-hrtime": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "BSD-2-Clause"
-    },
-    "node_modules/browser-stdout": {
-      "version": "1.3.1",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/browserslist": {
-      "version": "4.17.5",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.5.tgz",
-      "integrity": "sha512-I3ekeB92mmpctWBoLXe0d5wPS2cBuRvvW0JyyJHMrk9/HmP2ZjrTboNAZ8iuGqaEIlKguljbQY32OkOJIRrgoA==",
+    "node_modules/@smithy/util-endpoints": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-2.0.5.tgz",
+      "integrity": "sha512-ReQP0BWihIE68OAblC/WQmDD40Gx+QY1Ez8mTdFMXpmjfxSyz2fVQu3A4zXRfQU9sZXtewk3GmhfOHswvX+eNg==",
       "dev": true,
       "dependencies": {
-        "caniuse-lite": "^1.0.30001271",
-        "electron-to-chromium": "^1.3.878",
-        "escalade": "^3.1.1",
-        "node-releases": "^2.0.1",
-        "picocolors": "^1.0.0"
-      },
-      "bin": {
-        "browserslist": "cli.js"
+        "@smithy/node-config-provider": "^3.1.4",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/browserslist"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/browserslist/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/bser": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
-      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+    "node_modules/@smithy/util-hex-encoding": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-3.0.0.tgz",
+      "integrity": "sha512-eFndh1WEK5YMUYvy3lPlVmYY/fZcQE1D8oSf41Id2vCeIkKJXPcYDCZD+4+xViI6b1XSd7tE+s5AmXzz5ilabQ==",
       "dev": true,
       "dependencies": {
-        "node-int64": "^0.4.0"
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/buffer-crc32": {
-      "version": "0.2.13",
+    "node_modules/@smithy/util-middleware": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.3.tgz",
+      "integrity": "sha512-l+StyYYK/eO3DlVPbU+4Bi06Jjal+PFLSMmlWM1BEwyLxZ3aKkf1ROnoIakfaA7mC6uw3ny7JBkau4Yc+5zfWw==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
+      },
       "engines": {
-        "node": "*"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/buffer-equal": {
-      "version": "1.0.0",
+    "node_modules/@smithy/util-retry": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.3.tgz",
+      "integrity": "sha512-AFw+hjpbtVApzpNDhbjNG5NA3kyoMs7vx0gsgmlJF4s+yz1Zlepde7J58zpIRIsdjc+emhpAITxA88qLkPF26w==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "@smithy/service-error-classification": "^3.0.3",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
+      },
       "engines": {
-        "node": ">=0.4.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/buffer-equal-constant-time": {
-      "version": "1.0.1",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/buffer-from": {
-      "version": "1.1.1",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/busboy": {
-      "version": "0.2.14",
+    "node_modules/@smithy/util-stream": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.0.6.tgz",
+      "integrity": "sha512-w9i//7egejAIvplX821rPWWgaiY1dxsQUw0hXX7qwa/uZ9U3zplqTQ871jWadkcVB9gFDhkPWYVZf4yfFbZ0xA==",
       "dev": true,
       "dependencies": {
-        "dicer": "0.2.5",
-        "readable-stream": "1.1.x"
+        "@smithy/fetch-http-handler": "^3.2.1",
+        "@smithy/node-http-handler": "^3.1.2",
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-base64": "^3.0.0",
+        "@smithy/util-buffer-from": "^3.0.0",
+        "@smithy/util-hex-encoding": "^3.0.0",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/busboy/node_modules/isarray": {
-      "version": "0.0.1",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/busboy/node_modules/readable-stream": {
-      "version": "1.1.14",
+    "node_modules/@smithy/util-stream/node_modules/@smithy/is-array-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz",
+      "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/busboy/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/bytes": {
-      "version": "3.1.0",
+    "node_modules/@smithy/util-stream/node_modules/@smithy/util-buffer-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz",
+      "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "@smithy/is-array-buffer": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/cache-base": {
-      "version": "1.0.1",
+    "node_modules/@smithy/util-stream/node_modules/@smithy/util-utf8": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz",
+      "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==",
       "dev": true,
-      "license": "MIT",
       "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"
+        "@smithy/util-buffer-from": "^3.0.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/cacheable-request": {
-      "version": "6.1.0",
+    "node_modules/@smithy/util-uri-escape": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-3.0.0.tgz",
+      "integrity": "sha512-LqR7qYLgZTD7nWLBecUi4aqolw8Mhza9ArpNEQ881MJJIU2sE5iHCK6TdyqqzcDLy0OPe10IY4T8ctVdtynubg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "clone-response": "^1.0.2",
-        "get-stream": "^5.1.0",
-        "http-cache-semantics": "^4.0.0",
-        "keyv": "^3.0.0",
-        "lowercase-keys": "^2.0.0",
-        "normalize-url": "^4.1.0",
-        "responselike": "^1.0.2"
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/cacheable-request/node_modules/get-stream": {
-      "version": "5.2.0",
+    "node_modules/@smithy/util-utf8": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.1.1.tgz",
+      "integrity": "sha512-BqTpzYEcUMDwAKr7/mVRUtHDhs6ZoXDi9NypMvMfOr/+u1NW7JgqodPDECiiLboEm6bobcPcECxzjtQh865e9A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "pump": "^3.0.0"
+        "@smithy/util-buffer-from": "^2.1.1",
+        "tslib": "^2.5.0"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=14.0.0"
       }
     },
-    "node_modules/cacheable-request/node_modules/lowercase-keys": {
-      "version": "2.0.0",
+    "node_modules/@smithy/util-waiter": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-3.1.2.tgz",
+      "integrity": "sha512-4pP0EV3iTsexDx+8PPGAKCQpd/6hsQBaQhqWzU4hqKPHN5epPsxKbvUTIiYIHTxaKt6/kEaqPBpu/ufvfbrRzw==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "@smithy/abort-controller": "^3.1.1",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/call-bind": {
-      "version": "1.0.2",
-      "license": "MIT",
+    "node_modules/@socket.io/component-emitter": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
+      "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==",
+      "dev": true
+    },
+    "node_modules/@thisismanta/pessimist": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@thisismanta/pessimist/-/pessimist-1.2.0.tgz",
+      "integrity": "sha512-rm8/zjNMuO9hPYhEMavVIIxmvawJJB8mthvbVXd74XUW7V/SbgmtDBQjICbCWKjluvA+gh+cqi7dv85/jexknA==",
+      "dev": true,
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
+        "lodash": "^4.17.21"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/callsites": {
-      "version": "3.1.0",
+    "node_modules/@tootallnate/quickjs-emscripten": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz",
+      "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==",
+      "dev": true
+    },
+    "node_modules/@trysound/sax": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
+      "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=6"
+        "node": ">=10.13.0"
       }
     },
-    "node_modules/camel-case": {
-      "version": "3.0.0",
+    "node_modules/@types/babel__core": {
+      "version": "7.20.5",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
+      "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "no-case": "^2.2.0",
-        "upper-case": "^1.1.1"
+        "@babel/parser": "^7.20.7",
+        "@babel/types": "^7.20.7",
+        "@types/babel__generator": "*",
+        "@types/babel__template": "*",
+        "@types/babel__traverse": "*"
       }
     },
-    "node_modules/camelcase": {
-      "version": "5.3.1",
+    "node_modules/@types/babel__generator": {
+      "version": "7.6.8",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
+      "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
+      "dependencies": {
+        "@babel/types": "^7.0.0"
       }
     },
-    "node_modules/caniuse-api": {
-      "version": "3.0.0",
+    "node_modules/@types/babel__template": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
+      "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.0.0",
-        "caniuse-lite": "^1.0.0",
-        "lodash.memoize": "^4.1.2",
-        "lodash.uniq": "^4.5.0"
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0"
       }
     },
-    "node_modules/caniuse-lite": {
-      "version": "1.0.30001271",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001271.tgz",
-      "integrity": "sha512-BBruZFWmt3HFdVPS8kceTBIguKxu4f99n5JNp06OlPD/luoAMIaIK5ieV5YjnBLH3Nysai9sxj9rpJj4ZisXOA==",
+    "node_modules/@types/babel__traverse": {
+      "version": "7.20.5",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.5.tgz",
+      "integrity": "sha512-WXCyOcRtH37HAUkpXhUduaxdm82b4GSlyTqajXviN4EfiuPgNYR109xMCKvpl6zPIpua0DGlMEDCq+g8EdoheQ==",
       "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/browserslist"
+      "dependencies": {
+        "@babel/types": "^7.20.7"
       }
     },
-    "node_modules/caseless": {
-      "version": "0.12.0",
-      "dev": true,
-      "license": "Apache-2.0"
+    "node_modules/@types/chai": {
+      "version": "4.3.16",
+      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.16.tgz",
+      "integrity": "sha512-PatH4iOdyh3MyWtmHVFXLWCCIhUbopaltqddG9BzB+gMIzee2MJrvd+jouii9Z3wzQJruGWAm7WOMjgfG8hQlQ==",
+      "dev": true
     },
-    "node_modules/chai": {
-      "version": "4.3.4",
+    "node_modules/@types/cookie": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
+      "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==",
+      "dev": true
+    },
+    "node_modules/@types/cors": {
+      "version": "2.8.17",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.17.tgz",
+      "integrity": "sha512-8CGDvrBj1zgo2qE+oS3pOCyYNqCPryMWY2bGfwA0dcfopWGgxs+78df0Rs3rc9THP4JkOhLsAa+15VdpAqkcUA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "assertion-error": "^1.1.0",
-        "check-error": "^1.0.2",
-        "deep-eql": "^3.0.1",
-        "get-func-name": "^2.0.0",
-        "pathval": "^1.1.1",
-        "type-detect": "^4.0.5"
-      },
-      "engines": {
-        "node": ">=4"
+        "@types/node": "*"
       }
     },
-    "node_modules/chai-as-promised": {
-      "version": "7.1.1",
+    "node_modules/@types/dompurify": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/@types/dompurify/-/dompurify-2.4.0.tgz",
+      "integrity": "sha512-IDBwO5IZhrKvHFUl+clZxgf3hn2b/lU6H1KaBShPkQyGJUQ0xwebezIPSuiyGwfz1UzJWQl4M7BDxtHtCCPlTg==",
       "dev": true,
-      "license": "WTFPL",
       "dependencies": {
-        "check-error": "^1.0.2"
-      },
-      "peerDependencies": {
-        "chai": ">= 2.1.2 < 5"
+        "@types/trusted-types": "*"
       }
     },
-    "node_modules/chalk": {
-      "version": "2.4.2",
+    "node_modules/@types/eslint": {
+      "version": "8.56.12",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.12.tgz",
+      "integrity": "sha512-03ruubjWyOHlmljCVoxSuNDdmfZDzsrrz0P2LeJsOXr+ZwFQ+0yQIwNCwt/GYhV7Z31fgtXJTAEs+FYlEL851g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
+        "@types/estree": "*",
+        "@types/json-schema": "*"
       }
     },
-    "node_modules/char-regex": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
-      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
+    "node_modules/@types/estree": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
+      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+      "dev": true
+    },
+    "node_modules/@types/fs-extra": {
+      "version": "11.0.4",
+      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-11.0.4.tgz",
+      "integrity": "sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ==",
       "dev": true,
-      "engines": {
-        "node": ">=10"
+      "dependencies": {
+        "@types/jsonfile": "*",
+        "@types/node": "*"
       }
     },
-    "node_modules/charenc": {
-      "version": "0.0.2",
+    "node_modules/@types/graceful-fs": {
+      "version": "4.1.9",
+      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
+      "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
       "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": "*"
+      "dependencies": {
+        "@types/node": "*"
       }
     },
-    "node_modules/check-dependencies": {
-      "version": "1.1.0",
+    "node_modules/@types/istanbul-lib-coverage": {
+      "version": "2.0.3",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/istanbul-lib-report": {
+      "version": "3.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "bower-config": "^1.4.0",
-        "chalk": "^2.1.0",
-        "findup-sync": "^2.0.0",
-        "lodash.camelcase": "^4.3.0",
-        "minimist": "^1.2.0",
-        "semver": "^5.4.1"
-      },
-      "bin": {
-        "check-dependencies": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=4.4 <6 || >=6.9"
+        "@types/istanbul-lib-coverage": "*"
       }
     },
-    "node_modules/check-dependencies/node_modules/semver": {
-      "version": "5.7.1",
+    "node_modules/@types/istanbul-reports": {
+      "version": "3.0.0",
       "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver"
+      "license": "MIT",
+      "dependencies": {
+        "@types/istanbul-lib-report": "*"
       }
     },
-    "node_modules/check-error": {
-      "version": "1.0.2",
+    "node_modules/@types/json-schema": {
+      "version": "7.0.15",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+      "dev": true
+    },
+    "node_modules/@types/json5": {
+      "version": "0.0.29",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "*"
+      "license": "MIT"
+    },
+    "node_modules/@types/jsonfile": {
+      "version": "6.1.4",
+      "resolved": "https://registry.npmjs.org/@types/jsonfile/-/jsonfile-6.1.4.tgz",
+      "integrity": "sha512-D5qGUYwjvnNNextdU59/+fI+spnwtTFmyQP0h+PfIOSkNfpU6AOICUOkm4i0OnSk+NyjdPJrxCDro0sJsWlRpQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
       }
     },
-    "node_modules/cheerio": {
-      "version": "1.0.0-rc.10",
-      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.10.tgz",
-      "integrity": "sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw==",
+    "node_modules/@types/klaw": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@types/klaw/-/klaw-3.0.6.tgz",
+      "integrity": "sha512-BErW5TrTz4nzt/c3VRGf0Bug4JyQJ1o807F4mAfXfvOzFZ8SKgFeHJ0T28Y1KtqlMEB+cUgN7S7CsyQDQ/qxqg==",
       "dev": true,
       "dependencies": {
-        "cheerio-select": "^1.5.0",
-        "dom-serializer": "^1.3.2",
-        "domhandler": "^4.2.0",
-        "htmlparser2": "^6.1.0",
-        "parse5": "^6.0.1",
-        "parse5-htmlparser2-tree-adapter": "^6.0.1",
-        "tslib": "^2.2.0"
-      },
-      "engines": {
-        "node": ">= 6"
-      },
-      "funding": {
-        "url": "https://github.com/cheeriojs/cheerio?sponsor=1"
+        "@types/node": "*"
       }
     },
-    "node_modules/cheerio-select": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.5.0.tgz",
-      "integrity": "sha512-qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg==",
+    "node_modules/@types/minimist": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==",
+      "dev": true
+    },
+    "node_modules/@types/mocha": {
+      "version": "10.0.7",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.7.tgz",
+      "integrity": "sha512-GN8yJ1mNTcFcah/wKEFIJckJx9iJLoMSzWcfRRuxz/Jk+U6KQNnml+etbtxFK8lPjzOw3zp4Ha/kjSst9fsHYw==",
+      "dev": true
+    },
+    "node_modules/@types/node": {
+      "version": "18.19.39",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.39.tgz",
+      "integrity": "sha512-nPwTRDKUctxw3di5b4TfT3I0sWDiWoPQCZjXhvdkINntwr8lcoVCKsTgnXeRubKIlfnV+eN/HYk6Jb40tbcEAQ==",
       "dev": true,
       "dependencies": {
-        "css-select": "^4.1.3",
-        "css-what": "^5.0.1",
-        "domelementtype": "^2.2.0",
-        "domhandler": "^4.2.0",
-        "domutils": "^2.7.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
+        "undici-types": "~5.26.4"
       }
     },
-    "node_modules/cheerio/node_modules/tslib": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-      "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
+    "node_modules/@types/stack-utils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
+      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
       "dev": true
     },
-    "node_modules/chokidar": {
-      "version": "3.5.2",
+    "node_modules/@types/tar": {
+      "version": "6.1.13",
+      "resolved": "https://registry.npmjs.org/@types/tar/-/tar-6.1.13.tgz",
+      "integrity": "sha512-IznnlmU5f4WcGTh2ltRu/Ijpmk8wiWXfF0VA4s+HPjHZgvFggk1YaIkbo5krX/zUCzWF8N/l4+W/LNxnvAJ8nw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.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"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
+        "@types/node": "*",
+        "minipass": "^4.0.0"
       }
     },
-    "node_modules/chownr": {
-      "version": "2.0.0",
+    "node_modules/@types/tar/node_modules/minipass": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz",
+      "integrity": "sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==",
       "dev": true,
-      "license": "ISC",
       "engines": {
-        "node": ">=10"
+        "node": ">=8"
       }
     },
-    "node_modules/chunkd": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/@types/trusted-types": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.2.tgz",
+      "integrity": "sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg==",
+      "dev": true
     },
-    "node_modules/ci-info": {
-      "version": "2.0.0",
+    "node_modules/@types/yargs": {
+      "version": "15.0.13",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
     },
-    "node_modules/ci-parallel-vars": {
-      "version": "1.0.1",
+    "node_modules/@types/yargs-parser": {
+      "version": "20.2.0",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/cjs-module-lexer": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz",
-      "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==",
-      "dev": true
-    },
-    "node_modules/cjson": {
-      "version": "0.3.0",
+    "node_modules/@typescript-eslint/eslint-plugin": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.18.0.tgz",
+      "integrity": "sha512-94EQTWZ40mzBc42ATNIBimBEDltSJ9RQHCC8vc/PDbxi4k8dVwUAv4o98dk50M1zB+JGFxp43FP7f8+FP8R6Sw==",
       "dev": true,
       "dependencies": {
-        "jsonlint": "1.6.0"
+        "@eslint-community/regexpp": "^4.10.0",
+        "@typescript-eslint/scope-manager": "7.18.0",
+        "@typescript-eslint/type-utils": "7.18.0",
+        "@typescript-eslint/utils": "7.18.0",
+        "@typescript-eslint/visitor-keys": "7.18.0",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.3.1",
+        "natural-compare": "^1.4.0",
+        "ts-api-utils": "^1.3.0"
       },
       "engines": {
-        "node": ">= 0.3.0"
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/parser": "^7.0.0",
+        "eslint": "^8.56.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/class-utils": {
-      "version": "0.3.6",
+    "node_modules/@typescript-eslint/parser": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.18.0.tgz",
+      "integrity": "sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "arr-union": "^3.1.0",
-        "define-property": "^0.2.5",
-        "isobject": "^3.0.0",
-        "static-extend": "^0.1.1"
+        "@typescript-eslint/scope-manager": "7.18.0",
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/typescript-estree": "7.18.0",
+        "@typescript-eslint/visitor-keys": "7.18.0",
+        "debug": "^4.3.4"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.56.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/class-utils/node_modules/define-property": {
-      "version": "0.2.5",
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz",
+      "integrity": "sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "is-descriptor": "^0.1.0"
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/visitor-keys": "7.18.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/clean-css": {
-      "version": "4.2.3",
+    "node_modules/@typescript-eslint/type-utils": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz",
+      "integrity": "sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "source-map": "~0.6.0"
+        "@typescript-eslint/typescript-estree": "7.18.0",
+        "@typescript-eslint/utils": "7.18.0",
+        "debug": "^4.3.4",
+        "ts-api-utils": "^1.3.0"
       },
       "engines": {
-        "node": ">= 4.0"
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.56.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/clean-css/node_modules/source-map": {
-      "version": "0.6.1",
+    "node_modules/@typescript-eslint/types": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
+      "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/clean-stack": {
-      "version": "2.2.0",
+    "node_modules/@typescript-eslint/typescript-estree": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz",
+      "integrity": "sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/visitor-keys": "7.18.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^1.3.0"
+      },
       "engines": {
-        "node": ">=6"
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/clean-yaml-object": {
-      "version": "0.1.0",
+    "node_modules/@typescript-eslint/utils": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.18.0.tgz",
+      "integrity": "sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "@typescript-eslint/scope-manager": "7.18.0",
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/typescript-estree": "7.18.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.56.0"
       }
     },
-    "node_modules/cli-boxes": {
-      "version": "2.2.1",
+    "node_modules/@typescript-eslint/visitor-keys": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz",
+      "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "7.18.0",
+        "eslint-visitor-keys": "^3.4.3"
+      },
       "engines": {
-        "node": ">=6"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/cli-cursor": {
-      "version": "3.1.0",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@ungap/structured-clone": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
+      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
+      "dev": true
+    },
+    "node_modules/@use-gesture/core": {
+      "version": "10.2.10",
+      "resolved": "https://registry.npmjs.org/@use-gesture/core/-/core-10.2.10.tgz",
+      "integrity": "sha512-7WFIDfeTB+7RBui8YOrB2xbgmvMsvaCDjyzrdvECKkgOpIynNSdhlLXjiFuqQMtnK71IL/9WNZNU0P8xuaLuUQ=="
+    },
+    "node_modules/@use-gesture/react": {
+      "version": "10.2.10",
+      "resolved": "https://registry.npmjs.org/@use-gesture/react/-/react-10.2.10.tgz",
+      "integrity": "sha512-znChnKVAMMGXD9J7fCKN686BJNBlUJaRtCu92IQXVWdcxg4MqS0SgsBslGnTWXTlsHVkg5zcGjKYf7qYkOf0Rg==",
       "dependencies": {
-        "restore-cursor": "^3.1.0"
+        "@use-gesture/core": "10.2.10"
       },
-      "engines": {
-        "node": ">=8"
+      "peerDependencies": {
+        "react": ">= 16.8.0"
       }
     },
-    "node_modules/cli-highlight": {
-      "version": "2.1.11",
+    "node_modules/@vercel/nft": {
+      "version": "0.26.5",
+      "resolved": "https://registry.npmjs.org/@vercel/nft/-/nft-0.26.5.tgz",
+      "integrity": "sha512-NHxohEqad6Ra/r4lGknO52uc/GrWILXAMs1BB4401GTqww0fw1bAqzpG1XHuDO+dprg4GvsD9ZLLSsdo78p9hQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "chalk": "^4.0.0",
-        "highlight.js": "^10.7.1",
-        "mz": "^2.4.0",
-        "parse5": "^5.1.1",
-        "parse5-htmlparser2-tree-adapter": "^6.0.0",
-        "yargs": "^16.0.0"
+        "@mapbox/node-pre-gyp": "^1.0.5",
+        "@rollup/pluginutils": "^4.0.0",
+        "acorn": "^8.6.0",
+        "acorn-import-attributes": "^1.9.2",
+        "async-sema": "^3.1.1",
+        "bindings": "^1.4.0",
+        "estree-walker": "2.0.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.2",
+        "node-gyp-build": "^4.2.2",
+        "resolve-from": "^5.0.0"
       },
       "bin": {
-        "highlight": "bin/highlight"
+        "nft": "out/cli.js"
       },
       "engines": {
-        "node": ">=8.0.0",
-        "npm": ">=5.0.0"
+        "node": ">=16"
       }
     },
-    "node_modules/cli-highlight/node_modules/ansi-styles": {
-      "version": "4.3.0",
+    "node_modules/@webcomponents/webcomponentsjs": {
+      "version": "2.6.0",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/abbrev": {
+      "version": "1.0.9",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
+      "license": "ISC"
     },
-    "node_modules/cli-highlight/node_modules/chalk": {
-      "version": "4.1.0",
+    "node_modules/accepts": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/cli-highlight/node_modules/color-convert": {
-      "version": "2.0.1",
+    "node_modules/acorn": {
+      "version": "8.12.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
+      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
+      "bin": {
+        "acorn": "bin/acorn"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=0.4.0"
       }
     },
-    "node_modules/cli-highlight/node_modules/color-name": {
-      "version": "1.1.4",
+    "node_modules/acorn-globals": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-7.0.1.tgz",
+      "integrity": "sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==",
       "dev": true,
-      "license": "MIT"
+      "dependencies": {
+        "acorn": "^8.1.0",
+        "acorn-walk": "^8.0.2"
+      }
     },
-    "node_modules/cli-highlight/node_modules/has-flag": {
-      "version": "4.0.0",
+    "node_modules/acorn-import-attributes": {
+      "version": "1.9.5",
+      "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
+      "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
+      "peerDependencies": {
+        "acorn": "^8"
       }
     },
-    "node_modules/cli-highlight/node_modules/parse5": {
-      "version": "5.1.1",
+    "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,
-      "license": "MIT"
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
     },
-    "node_modules/cli-highlight/node_modules/supports-color": {
-      "version": "7.2.0",
+    "node_modules/acorn-walk": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz",
+      "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.4.0"
       }
     },
-    "node_modules/cli-spinners": {
-      "version": "2.5.0",
+    "node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
+      "dependencies": {
+        "debug": "4"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "engines": {
+        "node": ">= 6.0.0"
       }
     },
-    "node_modules/cli-truncate": {
-      "version": "2.1.0",
+    "node_modules/aggregate-error": {
+      "version": "3.1.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "slice-ansi": "^3.0.0",
-        "string-width": "^4.2.0"
+        "clean-stack": "^2.0.0",
+        "indent-string": "^4.0.0"
       },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/cliui": {
-      "version": "7.0.4",
+    "node_modules/ajv": {
+      "version": "8.16.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.16.0.tgz",
+      "integrity": "sha512-F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^7.0.0"
+        "fast-deep-equal": "^3.1.3",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.4.1"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/clone": {
-      "version": "2.1.2",
+    "node_modules/ajv-formats": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.8"
+      "dependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
       }
     },
-    "node_modules/clone-buffer": {
-      "version": "1.0.0",
+    "node_modules/amdefine": {
+      "version": "1.0.1",
       "dev": true,
-      "license": "MIT",
+      "license": "BSD-3-Clause OR MIT",
+      "optional": true,
       "engines": {
-        "node": ">= 0.10"
+        "node": ">=0.4.2"
       }
     },
-    "node_modules/clone-deep": {
-      "version": "4.0.1",
+    "node_modules/amphtml-validator": {
+      "version": "1.0.38",
+      "resolved": "https://registry.npmjs.org/amphtml-validator/-/amphtml-validator-1.0.38.tgz",
+      "integrity": "sha512-TqGeHVRUEsMiJoaRvMhzZBv8oljLhhJgzkaPX/zT2eJFG5FLeaMehd6riNwsuMmi9e/5xsI0pocbTgN/u2sonQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "is-plain-object": "^2.0.4",
-        "kind-of": "^6.0.2",
-        "shallow-clone": "^3.0.0"
+        "colors": "1.4.0",
+        "commander": "12.0.0",
+        "promise": "8.3.0"
       },
-      "engines": {
-        "node": ">=6"
+      "bin": {
+        "amphtml-validator": "cli.js"
       }
     },
-    "node_modules/clone-response": {
-      "version": "1.0.2",
+    "node_modules/amphtml-validator/node_modules/commander": {
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-12.0.0.tgz",
+      "integrity": "sha512-MwVNWlYjDTtOjX5PiD7o5pK0UrFU/OYgcJfjjK4RaHZETNtjJqrZa9Y9ds88+A+f+d5lv+561eZ+yCKoS3gbAA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "mimic-response": "^1.0.0"
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/clone-stats": {
-      "version": "1.0.0",
+    "node_modules/ansi-colors": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
+      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
       "dev": true,
-      "license": "MIT"
+      "engines": {
+        "node": ">=6"
+      }
     },
-    "node_modules/cloneable-readable": {
-      "version": "1.1.3",
+    "node_modules/ansi-escapes": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "inherits": "^2.0.1",
-        "process-nextick-args": "^2.0.0",
-        "readable-stream": "^2.3.5"
+        "type-fest": "^0.21.3"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/co": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+    "node_modules/ansi-escapes/node_modules/type-fest": {
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
       "dev": true,
       "engines": {
-        "iojs": ">= 1.0.0",
-        "node": ">= 0.12.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/code-excerpt": {
-      "version": "3.0.0",
+    "node_modules/ansi-gray": {
+      "version": "0.1.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "convert-to-spaces": "^1.0.1"
+        "ansi-wrap": "0.1.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/codecov": {
-      "version": "3.8.3",
+    "node_modules/ansi-red": {
+      "version": "0.1.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "argv": "0.0.2",
-        "ignore-walk": "3.0.4",
-        "js-yaml": "3.14.1",
-        "teeny-request": "7.1.1",
-        "urlgrey": "1.0.0"
-      },
-      "bin": {
-        "codecov": "bin/codecov"
+        "ansi-wrap": "0.1.0"
       },
       "engines": {
-        "node": ">=4.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/coffee-script": {
-      "version": "1.12.7",
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true,
-      "license": "MIT",
-      "bin": {
-        "cake": "bin/cake",
-        "coffee": "bin/coffee"
-      },
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">=8"
       }
     },
-    "node_modules/collect-v8-coverage": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
-      "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
-      "dev": true
-    },
-    "node_modules/collection-visit": {
-      "version": "1.0.0",
+    "node_modules/ansi-styles": {
+      "version": "3.2.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "map-visit": "^1.0.0",
-        "object-visit": "^1.0.0"
+        "color-convert": "^1.9.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=4"
       }
     },
-    "node_modules/color-convert": {
-      "version": "1.9.3",
+    "node_modules/ansi-wrap": {
+      "version": "0.1.0",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "color-name": "1.1.3"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/color-name": {
-      "version": "1.1.3",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/color-support": {
-      "version": "1.1.3",
+    "node_modules/anymatch": {
+      "version": "3.1.2",
       "dev": true,
       "license": "ISC",
-      "bin": {
-        "color-support": "bin.js"
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
       }
     },
-    "node_modules/colord": {
-      "version": "2.7.0",
+    "node_modules/append-field": {
+      "version": "1.0.0",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/colorette": {
-      "version": "1.2.2",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/aproba": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
+      "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==",
+      "dev": true
     },
-    "node_modules/colors": {
-      "version": "1.4.0",
+    "node_modules/archiver": {
+      "version": "0.14.4",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "async": "~0.9.0",
+        "buffer-crc32": "~0.2.1",
+        "glob": "~4.3.0",
+        "lazystream": "~0.1.0",
+        "lodash": "~3.2.0",
+        "readable-stream": "~1.0.26",
+        "tar-stream": "~1.1.0",
+        "zip-stream": "~0.5.0"
+      },
       "engines": {
-        "node": ">=0.1.90"
+        "node": ">= 0.10.0"
       }
     },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
+    "node_modules/archiver/node_modules/glob": {
+      "version": "4.3.5",
       "dev": true,
-      "license": "MIT",
+      "license": "ISC",
       "dependencies": {
-        "delayed-stream": "~1.0.0"
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^2.0.1",
+        "once": "^1.3.0"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": "*"
       }
     },
-    "node_modules/commander": {
-      "version": "7.2.0",
+    "node_modules/archiver/node_modules/isarray": {
+      "version": "0.0.1",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 10"
-      }
+      "license": "MIT"
     },
-    "node_modules/comment-parser": {
-      "version": "1.2.4",
+    "node_modules/archiver/node_modules/lazystream": {
+      "version": "0.1.0",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "readable-stream": "~1.0.2"
+      },
       "engines": {
-        "node": ">= 12.0.0"
+        "node": ">= 0.6.3"
       }
     },
-    "node_modules/common-path-prefix": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/commondir": {
-      "version": "1.0.1",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/component-emitter": {
-      "version": "1.3.0",
+    "node_modules/archiver/node_modules/lodash": {
+      "version": "3.2.0",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/compress-commons": {
-      "version": "0.2.9",
+    "node_modules/archiver/node_modules/minimatch": {
+      "version": "2.0.10",
       "dev": true,
-      "license": "MIT",
+      "license": "ISC",
       "dependencies": {
-        "buffer-crc32": "~0.2.1",
-        "crc32-stream": "~0.3.1",
-        "node-int64": "~0.3.0",
-        "readable-stream": "~1.0.26"
+        "brace-expansion": "^1.0.0"
       },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": "*"
       }
     },
-    "node_modules/compress-commons/node_modules/isarray": {
-      "version": "0.0.1",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/compress-commons/node_modules/node-int64": {
-      "version": "0.3.3",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/compress-commons/node_modules/readable-stream": {
+    "node_modules/archiver/node_modules/readable-stream": {
       "version": "1.0.34",
       "dev": true,
       "license": "MIT",
@@ -6597,2533 +7250,2703 @@
         "string_decoder": "~0.10.x"
       }
     },
-    "node_modules/compress-commons/node_modules/string_decoder": {
+    "node_modules/archiver/node_modules/string_decoder": {
       "version": "0.10.31",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/compressible": {
-      "version": "2.0.18",
+    "node_modules/are-docs-informative": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/are-docs-informative/-/are-docs-informative-0.0.2.tgz",
+      "integrity": "sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/are-we-there-yet": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
+      "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "mime-db": ">= 1.43.0 < 2"
+        "delegates": "^1.0.0",
+        "readable-stream": "^3.6.0"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=10"
       }
     },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
+    "node_modules/are-we-there-yet/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
       "dev": true,
-      "license": "MIT"
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
     },
-    "node_modules/concat-stream": {
-      "version": "1.6.2",
+    "node_modules/argparse": {
+      "version": "1.0.10",
       "dev": true,
-      "engines": [
-        "node >= 0.8"
-      ],
       "license": "MIT",
       "dependencies": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
+        "sprintf-js": "~1.0.2"
       }
     },
-    "node_modules/concat-with-sourcemaps": {
-      "version": "1.1.0",
+    "node_modules/array-buffer-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
+      "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "source-map": "^0.6.1"
+        "call-bind": "^1.0.5",
+        "is-array-buffer": "^3.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/concat-with-sourcemaps/node_modules/source-map": {
-      "version": "0.6.1",
+    "node_modules/array-filter": {
+      "version": "1.0.0",
       "dev": true,
-      "license": "BSD-3-Clause",
+      "license": "MIT"
+    },
+    "node_modules/array-find-index": {
+      "version": "1.0.2",
+      "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/concordance": {
-      "version": "5.0.3",
+    "node_modules/array-flatten": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
+      "dev": true
+    },
+    "node_modules/array-includes": {
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz",
+      "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "date-time": "^3.1.0",
-        "esutils": "^2.0.3",
-        "fast-diff": "^1.2.0",
-        "js-string-escape": "^1.0.1",
-        "lodash": "^4.17.15",
-        "md5-hex": "^3.0.1",
-        "semver": "^7.3.2",
-        "well-known-symbols": "^2.0.0"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
+        "is-string": "^1.0.7"
       },
       "engines": {
-        "node": ">=10.18.0 <11 || >=12.14.0 <13 || >=14"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/configstore": {
-      "version": "5.0.1",
+    "node_modules/array-union": {
+      "version": "2.1.0",
       "dev": true,
-      "license": "BSD-2-Clause",
-      "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"
-      },
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/connect": {
-      "version": "3.7.0",
+    "node_modules/array.prototype.findlast": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz",
+      "integrity": "sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "debug": "2.6.9",
-        "finalhandler": "1.1.2",
-        "parseurl": "~1.3.3",
-        "utils-merge": "1.0.1"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-shim-unscopables": "^1.0.2"
       },
       "engines": {
-        "node": ">= 0.10.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/connect-header": {
-      "version": "0.0.5",
+    "node_modules/array.prototype.findlastindex": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz",
+      "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==",
       "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-shim-unscopables": "^1.0.2"
+      },
       "engines": {
-        "node": ">= 0.4.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/connect-livereload": {
-      "version": "0.6.1",
+    "node_modules/array.prototype.flat": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
+      "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "es-shim-unscopables": "^1.0.0"
+      },
       "engines": {
-        "node": "*"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/connect/node_modules/debug": {
-      "version": "2.6.9",
+    "node_modules/array.prototype.flatmap": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
+      "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "ms": "2.0.0"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "es-shim-unscopables": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/connect/node_modules/ms": {
-      "version": "2.0.0",
+    "node_modules/array.prototype.tosorted": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz",
+      "integrity": "sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==",
       "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/consolidated-events": {
-      "version": "2.0.2",
-      "license": "MIT"
-    },
-    "node_modules/content-disposition": {
-      "version": "0.5.3",
-      "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "safe-buffer": "5.1.2"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.3",
+        "es-errors": "^1.3.0",
+        "es-shim-unscopables": "^1.0.2"
       },
       "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/content-type": {
-      "version": "1.0.4",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/continuable-cache": {
-      "version": "0.3.1",
-      "dev": true
-    },
-    "node_modules/convert-source-map": {
-      "version": "1.7.0",
+    "node_modules/arraybuffer.prototype.slice": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz",
+      "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "safe-buffer": "~5.1.1"
+        "array-buffer-byte-length": "^1.0.1",
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.22.3",
+        "es-errors": "^1.2.1",
+        "get-intrinsic": "^1.2.3",
+        "is-array-buffer": "^3.0.4",
+        "is-shared-array-buffer": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/convert-to-spaces": {
+    "node_modules/arrgv": {
       "version": "1.0.2",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 4"
+        "node": ">=8.0.0"
       }
     },
-    "node_modules/cookie": {
-      "version": "0.4.0",
+    "node_modules/arrify": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-3.0.0.tgz",
+      "integrity": "sha512-tLkvA81vQG/XqE2mjDkGQHoOINtMHtysSnemrmoGe6PydDPMRbVugqyk4A6V/WDWEfm3l+0d8anA9r8cv/5Jaw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/cookie-signature": {
-      "version": "1.0.6",
+    "node_modules/asap": {
+      "version": "2.0.6",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/copy-descriptor": {
-      "version": "0.1.1",
+    "node_modules/assertion-error": {
+      "version": "1.1.0",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": "*"
       }
     },
-    "node_modules/core-js": {
-      "version": "3.9.1",
+    "node_modules/ast-replace": {
+      "version": "1.1.3",
       "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
+      "license": "Unlicensed",
+      "dependencies": {
+        "ast-test": "^1.1.1",
+        "ast-types": "^0.6.12",
+        "is-function": "^1.0.1"
       }
     },
-    "node_modules/core-js-compat": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.19.0.tgz",
-      "integrity": "sha512-R09rKZ56ccGBebjTLZHvzDxhz93YPT37gBm6qUhnwj3Kt7aCjjZWD1injyNbyeFHxNKfeZBSyds6O9n3MKq1sw==",
+    "node_modules/ast-test": {
+      "version": "1.1.1",
       "dev": true,
+      "license": "Unlicensed",
       "dependencies": {
-        "browserslist": "^4.17.5",
-        "semver": "7.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
+        "ast-types": "^0.6.14"
       }
     },
-    "node_modules/core-js-compat/node_modules/semver": {
-      "version": "7.0.0",
+    "node_modules/ast-types": {
+      "version": "0.6.16",
       "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
       }
     },
-    "node_modules/core-util-is": {
-      "version": "1.0.2",
+    "node_modules/async": {
+      "version": "0.9.2",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/cors": {
-      "version": "2.8.5",
-      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
-      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
-      "dev": true,
-      "dependencies": {
-        "object-assign": "^4",
-        "vary": "^1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
+    "node_modules/async-sema": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/async-sema/-/async-sema-3.1.1.tgz",
+      "integrity": "sha512-tLRNUXati5MFePdAk8dw7Qt7DpxPB60ofAgn8WRhW6a2rcimZnYBP9oxHiv0OHy+Wz7kPMG+t4LGdt31+4EmGg==",
+      "dev": true
     },
-    "node_modules/crc32-stream": {
-      "version": "0.3.4",
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "dev": true
+    },
+    "node_modules/atob": {
+      "version": "2.1.2",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "buffer-crc32": "~0.2.1",
-        "readable-stream": "~1.0.24"
+      "license": "(MIT OR Apache-2.0)",
+      "bin": {
+        "atob": "bin/atob.js"
       },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">= 4.5.0"
       }
     },
-    "node_modules/crc32-stream/node_modules/isarray": {
-      "version": "0.0.1",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/crc32-stream/node_modules/readable-stream": {
-      "version": "1.0.34",
+    "node_modules/autolinker": {
+      "version": "0.28.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
+        "gulp-header": "^1.7.1"
       }
     },
-    "node_modules/crc32-stream/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/cross-spawn": {
-      "version": "7.0.3",
+    "node_modules/autoprefixer": {
+      "version": "10.4.19",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.19.tgz",
+      "integrity": "sha512-BaENR2+zBZ8xXhM4pUaKUxlVdxZ0EZhjvbopwnXmxRUfqDmwSpC2lAi/QXvx7NRdPCo1WKEcEF6mV64si1z4Ew==",
       "dev": true,
-      "license": "MIT",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/autoprefixer"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
       "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
+        "browserslist": "^4.23.0",
+        "caniuse-lite": "^1.0.30001599",
+        "fraction.js": "^4.3.7",
+        "normalize-range": "^0.1.2",
+        "picocolors": "^1.0.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "bin": {
+        "autoprefixer": "bin/autoprefixer"
       },
       "engines": {
-        "node": ">= 8"
+        "node": "^10 || ^12 || >=14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
-    "node_modules/cross-spawn/node_modules/which": {
-      "version": "2.0.2",
+    "node_modules/ava": {
+      "version": "6.1.3",
+      "resolved": "https://registry.npmjs.org/ava/-/ava-6.1.3.tgz",
+      "integrity": "sha512-tkKbpF1pIiC+q09wNU9OfyTDYZa8yuWvU2up3+lFJ3lr1RmnYh2GBpPwzYUEB0wvTPIUysGjcZLNZr7STDviRA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "isexe": "^2.0.0"
+        "@vercel/nft": "^0.26.2",
+        "acorn": "^8.11.3",
+        "acorn-walk": "^8.3.2",
+        "ansi-styles": "^6.2.1",
+        "arrgv": "^1.0.2",
+        "arrify": "^3.0.0",
+        "callsites": "^4.1.0",
+        "cbor": "^9.0.1",
+        "chalk": "^5.3.0",
+        "chunkd": "^2.0.1",
+        "ci-info": "^4.0.0",
+        "ci-parallel-vars": "^1.0.1",
+        "cli-truncate": "^4.0.0",
+        "code-excerpt": "^4.0.0",
+        "common-path-prefix": "^3.0.0",
+        "concordance": "^5.0.4",
+        "currently-unhandled": "^0.4.1",
+        "debug": "^4.3.4",
+        "emittery": "^1.0.1",
+        "figures": "^6.0.1",
+        "globby": "^14.0.0",
+        "ignore-by-default": "^2.1.0",
+        "indent-string": "^5.0.0",
+        "is-plain-object": "^5.0.0",
+        "is-promise": "^4.0.0",
+        "matcher": "^5.0.0",
+        "memoize": "^10.0.0",
+        "ms": "^2.1.3",
+        "p-map": "^7.0.1",
+        "package-config": "^5.0.0",
+        "picomatch": "^3.0.1",
+        "plur": "^5.1.0",
+        "pretty-ms": "^9.0.0",
+        "resolve-cwd": "^3.0.0",
+        "stack-utils": "^2.0.6",
+        "strip-ansi": "^7.1.0",
+        "supertap": "^3.0.1",
+        "temp-dir": "^3.0.0",
+        "write-file-atomic": "^5.0.1",
+        "yargs": "^17.7.2"
       },
       "bin": {
-        "node-which": "bin/node-which"
+        "ava": "entrypoints/cli.mjs"
       },
       "engines": {
-        "node": ">= 8"
+        "node": "^18.18 || ^20.8 || ^21 || ^22"
+      },
+      "peerDependencies": {
+        "@ava/typescript": "*"
+      },
+      "peerDependenciesMeta": {
+        "@ava/typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/crypt": {
-      "version": "0.0.2",
+    "node_modules/ava/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==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "engines": {
-        "node": "*"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
       }
     },
-    "node_modules/crypto-random-string": {
-      "version": "2.0.0",
+    "node_modules/ava/node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/css-color-names": {
-      "version": "1.0.1",
+    "node_modules/ava/node_modules/callsites": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-4.2.0.tgz",
+      "integrity": "sha512-kfzR4zzQtAE9PC7CzZsjl3aBNbXWuXiSeOCdLcPpBfGW8YuCqQHcRPFDbr/BPVmd3EEPVpuFzLyuT/cUhPr4OQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": "*"
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/css-declaration-sorter": {
-      "version": "6.1.1",
+    "node_modules/ava/node_modules/chalk": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "timsort": "^0.3.0"
-      },
       "engines": {
-        "node": ">= 10"
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
       },
-      "peerDependencies": {
-        "postcss": "^8.0.9"
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/css-imports": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/css-imports/-/css-imports-0.3.1.tgz",
-      "integrity": "sha1-Xd4qUbwggtcymbFHvVvgPj9Jisw=",
+    "node_modules/ava/node_modules/ci-info": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.0.0.tgz",
+      "integrity": "sha512-TdHqgGf9odd8SXNuxtUBVx8Nv+qZOejE6qyqiy5NtbYYQOeFa6zmHkxlPzmaLxWWHsU6nJmB7AETdVPi+2NBUg==",
       "dev": true,
-      "dependencies": {
-        "strip-comments": "~0.1.6"
-      }
-    },
-    "node_modules/css-jss": {
-      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/css-jss/-/css-jss-10.8.2.tgz",
-      "integrity": "sha512-KjsoKnBV4C9p+F+zW9jNXCai0UYU5K+3eyo+lJX/fY8UBEQd/yNREnHsLD1VMMzBwHRvrA8eQHvqmAL+XNLYcw==",
-      "dependencies": {
-        "@babel/runtime": "^7.3.1",
-        "jss": "10.8.2",
-        "jss-preset-default": "10.8.2"
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/css-select": {
-      "version": "4.1.3",
+    "node_modules/ava/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==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
-        "boolbase": "^1.0.0",
-        "css-what": "^5.0.0",
-        "domhandler": "^4.2.0",
-        "domutils": "^2.6.0",
-        "nth-check": "^2.0.0"
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/ava/node_modules/cliui/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/css-selector-tokenizer": {
-      "version": "0.8.0",
+    "node_modules/ava/node_modules/cliui/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "cssesc": "^3.0.0",
-        "fastparse": "^1.1.2"
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/css-tree": {
-      "version": "1.1.3",
+    "node_modules/ava/node_modules/globby": {
+      "version": "14.0.2",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.2.tgz",
+      "integrity": "sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "mdn-data": "2.0.14",
-        "source-map": "^0.6.1"
+        "@sindresorhus/merge-streams": "^2.1.0",
+        "fast-glob": "^3.3.2",
+        "ignore": "^5.2.4",
+        "path-type": "^5.0.0",
+        "slash": "^5.1.0",
+        "unicorn-magic": "^0.1.0"
       },
       "engines": {
-        "node": ">=8.0.0"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/css-tree/node_modules/source-map": {
-      "version": "0.6.1",
+    "node_modules/ava/node_modules/indent-string": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-5.0.0.tgz",
+      "integrity": "sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/css-vendor": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/css-vendor/-/css-vendor-2.0.8.tgz",
-      "integrity": "sha512-x9Aq0XTInxrkuFeHKbYC7zWY8ai7qJ04Kxd9MnvbC1uO5DagxoHQjm4JvG+vCdXOoFtCjbL2XSZfxmoYa9uQVQ==",
-      "dependencies": {
-        "@babel/runtime": "^7.8.3",
-        "is-in-browser": "^1.0.2"
+    "node_modules/ava/node_modules/is-plain-object": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/css-what": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz",
-      "integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==",
+    "node_modules/ava/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true
+    },
+    "node_modules/ava/node_modules/p-map": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.2.tgz",
+      "integrity": "sha512-z4cYYMMdKHzw4O5UkWJImbZynVIo0lSGTXc7bzB1e/rrDqkgGUNysK/o4bTr+0+xKvvLoTyGqYC4Fgljy9qe1Q==",
       "dev": true,
       "engines": {
-        "node": ">= 6"
+        "node": ">=18"
       },
       "funding": {
-        "url": "https://github.com/sponsors/fb55"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/cssesc": {
-      "version": "3.0.0",
+    "node_modules/ava/node_modules/path-type": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz",
+      "integrity": "sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==",
       "dev": true,
-      "license": "MIT",
-      "bin": {
-        "cssesc": "bin/cssesc"
-      },
       "engines": {
-        "node": ">=4"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/cssnano": {
-      "version": "5.0.8",
+    "node_modules/ava/node_modules/picomatch": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-3.0.1.tgz",
+      "integrity": "sha512-I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "cssnano-preset-default": "^5.1.4",
-        "is-resolvable": "^1.1.0",
-        "lilconfig": "^2.0.3",
-        "yaml": "^1.10.2"
-      },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": ">=10"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/cssnano"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+        "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/cssnano-preset-default": {
-      "version": "5.1.4",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "css-declaration-sorter": "^6.0.3",
-        "cssnano-utils": "^2.0.1",
-        "postcss-calc": "^8.0.0",
-        "postcss-colormin": "^5.2.0",
-        "postcss-convert-values": "^5.0.1",
-        "postcss-discard-comments": "^5.0.1",
-        "postcss-discard-duplicates": "^5.0.1",
-        "postcss-discard-empty": "^5.0.1",
-        "postcss-discard-overridden": "^5.0.1",
-        "postcss-merge-longhand": "^5.0.2",
-        "postcss-merge-rules": "^5.0.2",
-        "postcss-minify-font-values": "^5.0.1",
-        "postcss-minify-gradients": "^5.0.2",
-        "postcss-minify-params": "^5.0.1",
-        "postcss-minify-selectors": "^5.1.0",
-        "postcss-normalize-charset": "^5.0.1",
-        "postcss-normalize-display-values": "^5.0.1",
-        "postcss-normalize-positions": "^5.0.1",
-        "postcss-normalize-repeat-style": "^5.0.1",
-        "postcss-normalize-string": "^5.0.1",
-        "postcss-normalize-timing-functions": "^5.0.1",
-        "postcss-normalize-unicode": "^5.0.1",
-        "postcss-normalize-url": "^5.0.2",
-        "postcss-normalize-whitespace": "^5.0.1",
-        "postcss-ordered-values": "^5.0.2",
-        "postcss-reduce-initial": "^5.0.1",
-        "postcss-reduce-transforms": "^5.0.1",
-        "postcss-svgo": "^5.0.2",
-        "postcss-unique-selectors": "^5.0.1"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
+    "node_modules/ava/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
       },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/cssnano-utils": {
-      "version": "2.0.1",
+    "node_modules/ava/node_modules/slash": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
+      "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": ">=14.16"
       },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/csso": {
-      "version": "4.2.0",
+    "node_modules/ava/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "css-tree": "^1.1.2"
+        "ansi-regex": "^6.0.1"
       },
       "engines": {
-        "node": ">=8.0.0"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
-    "node_modules/cssom": {
-      "version": "0.4.4",
+    "node_modules/ava/node_modules/temp-dir": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-3.0.0.tgz",
+      "integrity": "sha512-nHc6S/bwIilKHNRgK/3jlhDoIHcp45YgyiwcAk46Tr0LfEqGBVpmiAyuiuxeVE44m3mXnEeVhaipLOEWmH+Njw==",
       "dev": true,
-      "license": "MIT"
+      "engines": {
+        "node": ">=14.16"
+      }
     },
-    "node_modules/cssstyle": {
-      "version": "2.3.0",
+    "node_modules/ava/node_modules/write-file-atomic": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
+      "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "cssom": "~0.3.6"
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^4.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/cssstyle/node_modules/cssom": {
-      "version": "0.3.8",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/csstype": {
-      "version": "3.0.9",
-      "license": "MIT"
-    },
-    "node_modules/currently-unhandled": {
-      "version": "0.4.1",
+    "node_modules/ava/node_modules/yargs": {
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "array-find-index": "^1.0.1"
+        "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": ">=0.10.0"
+        "node": ">=12"
       }
     },
-    "node_modules/custom-event": {
-      "version": "1.0.1",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/dashdash": {
-      "version": "1.14.1",
+    "node_modules/ava/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,
-      "license": "MIT",
-      "dependencies": {
-        "assert-plus": "^1.0.0"
-      },
       "engines": {
-        "node": ">=0.10"
+        "node": ">=12"
       }
     },
-    "node_modules/data-urls": {
-      "version": "2.0.0",
+    "node_modules/available-typed-arrays": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
+      "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "abab": "^2.0.3",
-        "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^8.0.0"
+        "possible-typed-array-names": "^1.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/date-and-time": {
-      "version": "2.0.1",
+    "node_modules/babel-check-duplicated-nodes": {
+      "version": "1.0.0",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/date-format": {
-      "version": "3.0.0",
+    "node_modules/babel-jest": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
+      "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "@jest/transform": "^29.7.0",
+        "@types/babel__core": "^7.1.14",
+        "babel-plugin-istanbul": "^6.1.1",
+        "babel-preset-jest": "^29.6.3",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "slash": "^3.0.0"
+      },
       "engines": {
-        "node": ">=4.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.8.0"
       }
     },
-    "node_modules/date-time": {
-      "version": "3.1.0",
+    "node_modules/babel-jest/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "time-zone": "^1.0.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+    "node_modules/babel-jest/node_modules/babel-plugin-istanbul": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
       "dev": true,
       "dependencies": {
-        "ms": "2.1.2"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^5.0.4",
+        "test-exclude": "^6.0.0"
       },
       "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+        "node": ">=8"
       }
     },
-    "node_modules/decamelize": {
-      "version": "4.0.0",
+    "node_modules/babel-jest/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
       "engines": {
         "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/decimal.js": {
-      "version": "10.3.1",
+    "node_modules/babel-jest/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "license": "MIT"
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
     },
-    "node_modules/decode-uri-component": {
-      "version": "0.2.0",
+    "node_modules/babel-jest/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/babel-jest/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=0.10"
+        "node": ">=8"
       }
     },
-    "node_modules/decompress-response": {
-      "version": "3.3.0",
+    "node_modules/babel-jest/node_modules/istanbul-lib-instrument": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "mimic-response": "^1.0.0"
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^6.3.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
-    "node_modules/dedent": {
-      "version": "0.7.0",
+    "node_modules/babel-jest/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
-      "license": "MIT"
+      "bin": {
+        "semver": "bin/semver.js"
+      }
     },
-    "node_modules/deep-eql": {
-      "version": "3.0.1",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/babel-jest/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
       "dependencies": {
-        "type-detect": "^4.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=0.12"
+        "node": ">=8"
       }
     },
-    "node_modules/deep-extend": {
-      "version": "0.6.0",
+    "node_modules/babel-plugin-dynamic-import-node": {
+      "version": "2.3.3",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=4.0.0"
+      "dependencies": {
+        "object.assign": "^4.1.0"
       }
     },
-    "node_modules/deep-is": {
-      "version": "0.1.3",
+    "node_modules/babel-plugin-istanbul": {
+      "version": "6.0.0",
       "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/deepmerge": {
-      "version": "1.5.2",
-      "license": "MIT",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^4.0.0",
+        "test-exclude": "^6.0.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/defaults": {
-      "version": "1.0.3",
+    "node_modules/babel-plugin-jest-hoist": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz",
+      "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "clone": "^1.0.2"
-      }
-    },
-    "node_modules/defaults/node_modules/clone": {
-      "version": "1.0.4",
-      "dev": true,
-      "license": "MIT",
+        "@babel/template": "^7.3.3",
+        "@babel/types": "^7.3.3",
+        "@types/babel__core": "^7.1.14",
+        "@types/babel__traverse": "^7.0.6"
+      },
       "engines": {
-        "node": ">=0.8"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/defer-to-connect": {
-      "version": "1.1.3",
+    "node_modules/babel-plugin-minify-replace": {
+      "version": "0.5.0",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/define-lazy-prop": {
-      "version": "2.0.0",
+    "node_modules/babel-plugin-module-resolver": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-module-resolver/-/babel-plugin-module-resolver-5.0.0.tgz",
+      "integrity": "sha512-g0u+/ChLSJ5+PzYwLwP8Rp8Rcfowz58TJNCe+L/ui4rpzE/mg//JVX0EWBUYoxaextqnwuGHzfGp2hh0PPV25Q==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "find-babel-config": "^2.0.0",
+        "glob": "^8.0.3",
+        "pkg-up": "^3.1.0",
+        "reselect": "^4.1.7",
+        "resolve": "^1.22.1"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">= 16"
       }
     },
-    "node_modules/define-properties": {
-      "version": "1.1.3",
-      "license": "MIT",
+    "node_modules/babel-plugin-module-resolver/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
       "dependencies": {
-        "object-keys": "^1.0.12"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/define-property": {
-      "version": "2.0.2",
+    "node_modules/babel-plugin-module-resolver/node_modules/glob": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
+      "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "is-descriptor": "^1.0.2",
-        "isobject": "^3.0.1"
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^5.0.1",
+        "once": "^1.3.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/define-property/node_modules/is-accessor-descriptor": {
-      "version": "1.0.0",
+    "node_modules/babel-plugin-module-resolver/node_modules/minimatch": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "kind-of": "^6.0.0"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
       }
     },
-    "node_modules/define-property/node_modules/is-data-descriptor": {
+    "node_modules/babel-plugin-optimize-objstr": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-optimize-objstr/-/babel-plugin-optimize-objstr-1.0.0.tgz",
+      "integrity": "sha512-0AMyPrN4s6Nh3PhNIo5C/xqOGacJJQkLzZbfgAZ05nSvp/WJYr+UWgRsNOdAmFtlJArBqEoLAtD0w97nJtA3+w==",
+      "dev": true
+    },
+    "node_modules/babel-plugin-polyfill-corejs2": {
+      "version": "0.2.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "kind-of": "^6.0.0"
+        "@babel/compat-data": "^7.13.11",
+        "@babel/helper-define-polyfill-provider": "^0.2.2",
+        "semver": "^6.1.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/define-property/node_modules/is-descriptor": {
-      "version": "1.0.2",
+    "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": {
+      "version": "6.3.0",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-corejs3": {
+      "version": "0.2.3",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
+        "@babel/helper-define-polyfill-provider": "^0.2.2",
+        "core-js-compat": "^3.14.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/del": {
-      "version": "6.0.0",
+    "node_modules/babel-plugin-polyfill-regenerator": {
+      "version": "0.2.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "globby": "^11.0.1",
-        "graceful-fs": "^4.2.4",
-        "is-glob": "^4.0.1",
-        "is-path-cwd": "^2.2.0",
-        "is-path-inside": "^3.0.2",
-        "p-map": "^4.0.0",
-        "rimraf": "^3.0.2",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "@babel/helper-define-polyfill-provider": "^0.2.2"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/delayed-stream": {
-      "version": "1.0.0",
+    "node_modules/babel-preset-current-node-syntax": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
+      "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.4.0"
+      "dependencies": {
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-bigint": "^7.8.3",
+        "@babel/plugin-syntax-class-properties": "^7.8.3",
+        "@babel/plugin-syntax-import-meta": "^7.8.3",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.8.3",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-top-level-await": "^7.8.3"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/depd": {
-      "version": "1.1.2",
+    "node_modules/babel-preset-jest": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz",
+      "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "babel-plugin-jest-hoist": "^29.6.3",
+        "babel-preset-current-node-syntax": "^1.0.0"
+      },
       "engines": {
-        "node": ">= 0.6"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/deprecation": {
-      "version": "2.3.1",
+    "node_modules/baconipsum": {
+      "version": "0.1.2",
       "dev": true,
-      "license": "ISC"
+      "license": "BSD-2-Clause"
     },
-    "node_modules/destroy": {
-      "version": "1.0.4",
+    "node_modules/balanced-match": {
+      "version": "1.0.0",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/detect-file": {
-      "version": "1.0.0",
+    "node_modules/base62": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/base62/-/base62-2.0.2.tgz",
+      "integrity": "sha512-FLoAQzMpmdDBei0u7fUAQzVCxoH6g4pueCIuGDoCZVZCiCeW4qTKpEGB79jkS15VB8b/5EIHc4R+WSKTByM+dw==",
       "dev": true,
-      "license": "MIT",
+      "funding": [
+        "https://github.com/sponsors/andrew",
+        "https://ko-fi.com/andrewnez",
+        "https://polar.sh/andrew",
+        "https://buymeacoffee.com/andrewnez"
+      ],
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/detect-newline": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
-      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+    "node_modules/base64id": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz",
+      "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": "^4.5.0 || >= 5.9"
       }
     },
-    "node_modules/di": {
-      "version": "0.0.1",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/diacritics-map": {
-      "version": "0.1.0",
+    "node_modules/basic-auth": {
+      "version": "2.0.1",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "5.1.2"
+      },
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/dicer": {
-      "version": "0.2.5",
+    "node_modules/basic-ftp": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.5.tgz",
+      "integrity": "sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==",
       "dev": true,
-      "dependencies": {
-        "readable-stream": "1.1.x",
-        "streamsearch": "0.1.2"
-      },
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">=10.0.0"
       }
     },
-    "node_modules/dicer/node_modules/isarray": {
-      "version": "0.0.1",
+    "node_modules/batch": {
+      "version": "0.6.1",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/dicer/node_modules/readable-stream": {
-      "version": "1.1.14",
+    "node_modules/before-after-hook": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz",
+      "integrity": "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==",
+      "dev": true
+    },
+    "node_modules/binary-extensions": {
+      "version": "2.2.0",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/dicer/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/diff": {
-      "version": "5.0.0",
+    "node_modules/bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
       "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=0.3.1"
+      "dependencies": {
+        "file-uri-to-path": "1.0.0"
       }
     },
-    "node_modules/diff-sequences": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.0.6.tgz",
-      "integrity": "sha512-ag6wfpBFyNXZ0p8pcuIDS//D8H062ZQJ3fzYxjpmeKjnz8W4pekL3AI8VohmyZmsWW2PWaHgjsmqR6L13101VQ==",
+    "node_modules/blueimp-md5": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.19.0.tgz",
+      "integrity": "sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w==",
+      "dev": true
+    },
+    "node_modules/body": {
+      "version": "5.1.0",
       "dev": true,
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      "dependencies": {
+        "continuable-cache": "^0.3.1",
+        "error": "^7.0.0",
+        "raw-body": "~1.1.0",
+        "safe-json-parse": "~1.0.1"
       }
     },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
+    "node_modules/body-parser": {
+      "version": "1.20.3",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
+      "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "path-type": "^4.0.0"
+        "bytes": "3.1.2",
+        "content-type": "~1.0.5",
+        "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.13.0",
+        "raw-body": "2.5.2",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
       }
     },
-    "node_modules/direction": {
-      "version": "1.0.4",
-      "license": "MIT",
-      "bin": {
-        "direction": "cli.js"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
+    "node_modules/body-parser/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
       }
     },
-    "node_modules/discontinuous-range": {
-      "version": "1.0.0",
+    "node_modules/body-parser/node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
       "dev": true,
-      "license": "MIT"
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
+    "node_modules/body-parser/node_modules/destroy": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
       "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
       }
     },
-    "node_modules/document.contains": {
-      "version": "1.0.2",
-      "license": "MIT",
-      "dependencies": {
-        "define-properties": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+    "node_modules/body-parser/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
     },
-    "node_modules/dom-serialize": {
-      "version": "2.2.1",
+    "node_modules/body-parser/node_modules/on-finished": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "custom-event": "~1.0.0",
-        "ent": "~2.2.0",
-        "extend": "^3.0.0",
-        "void-elements": "^2.0.0"
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
       }
     },
-    "node_modules/dom-serializer": {
-      "version": "1.3.2",
+    "node_modules/body-parser/node_modules/qs": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.0",
-        "entities": "^2.0.0"
+        "side-channel": "^1.0.6"
+      },
+      "engines": {
+        "node": ">=0.6"
       },
       "funding": {
-        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/domelementtype": {
-      "version": "2.2.0",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ],
-      "license": "BSD-2-Clause"
+    "node_modules/body/node_modules/bytes": {
+      "version": "1.0.0",
+      "dev": true
     },
-    "node_modules/domexception": {
-      "version": "2.0.1",
+    "node_modules/body/node_modules/raw-body": {
+      "version": "1.1.7",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "webidl-conversions": "^5.0.0"
+        "bytes": "1",
+        "string_decoder": "0.10"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/domexception/node_modules/webidl-conversions": {
-      "version": "5.0.0",
+    "node_modules/body/node_modules/string_decoder": {
+      "version": "0.10.31",
       "dev": true,
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=8"
-      }
+      "license": "MIT"
     },
-    "node_modules/domhandler": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.2.tgz",
-      "integrity": "sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w==",
+    "node_modules/boolbase": {
+      "version": "1.0.0",
       "dev": true,
-      "dependencies": {
-        "domelementtype": "^2.2.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domhandler?sponsor=1"
-      }
+      "license": "ISC"
     },
-    "node_modules/dompurify": {
-      "version": "2.3.3",
-      "license": "(MPL-2.0 OR Apache-2.0)"
+    "node_modules/bowser": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.11.0.tgz",
+      "integrity": "sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA==",
+      "dev": true
     },
-    "node_modules/domutils": {
-      "version": "2.7.0",
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
       "dev": true,
-      "license": "BSD-2-Clause",
+      "license": "MIT",
       "dependencies": {
-        "dom-serializer": "^1.0.1",
-        "domelementtype": "^2.2.0",
-        "domhandler": "^4.2.0"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domutils?sponsor=1"
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
       }
     },
-    "node_modules/dot-prop": {
-      "version": "5.3.0",
+    "node_modules/braces": {
+      "version": "3.0.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "is-obj": "^2.0.0"
+        "fill-range": "^7.0.1"
       },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/duplexer": {
-      "version": "0.1.2",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/duplexer3": {
-      "version": "0.1.4",
+    "node_modules/browser-stdout": {
+      "version": "1.3.1",
       "dev": true,
-      "license": "BSD-3-Clause"
+      "license": "ISC"
     },
-    "node_modules/duplexify": {
-      "version": "3.7.1",
+    "node_modules/browserslist": {
+      "version": "4.23.2",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.2.tgz",
+      "integrity": "sha512-qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA==",
       "dev": true,
-      "license": "MIT",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
       "dependencies": {
-        "end-of-stream": "^1.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0",
-        "stream-shift": "^1.0.0"
+        "caniuse-lite": "^1.0.30001640",
+        "electron-to-chromium": "^1.4.820",
+        "node-releases": "^2.0.14",
+        "update-browserslist-db": "^1.1.0"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
       }
     },
-    "node_modules/ebnf-parser": {
-      "version": "0.1.10",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/ecc-jsbn": {
-      "version": "0.1.2",
+    "node_modules/bser": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
+      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
+        "node-int64": "^0.4.0"
       }
     },
-    "node_modules/ecdsa-sig-formatter": {
-      "version": "1.0.11",
+    "node_modules/buffer-crc32": {
+      "version": "0.2.13",
       "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "safe-buffer": "^5.0.1"
+      "license": "MIT",
+      "engines": {
+        "node": "*"
       }
     },
-    "node_modules/ee-first": {
+    "node_modules/buffer-from": {
       "version": "1.1.1",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/electron-to-chromium": {
-      "version": "1.3.879",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.879.tgz",
-      "integrity": "sha512-zJo+D9GwbJvM31IdFmwcGvychhk4KKbKYo2GWlsn+C/dxz2NwmbhGJjWwTfFSF2+eFH7VvfA8MCZ8SOqTrlnpw==",
-      "dev": true
-    },
-    "node_modules/emittery": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz",
-      "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==",
+    "node_modules/busboy": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz",
+      "integrity": "sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==",
       "dev": true,
-      "engines": {
-        "node": ">=10"
+      "dependencies": {
+        "streamsearch": "^1.1.0"
       },
-      "funding": {
-        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
+      "engines": {
+        "node": ">=10.16.0"
       }
     },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/encodeurl": {
-      "version": "1.0.2",
+    "node_modules/bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
     },
-    "node_modules/end-of-stream": {
-      "version": "1.4.4",
+    "node_modules/call-bind": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "once": "^1.4.0"
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/engine.io": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.0.0.tgz",
-      "integrity": "sha512-Ui7yl3JajEIaACg8MOUwWvuuwU7jepZqX3BKs1ho7NQRuP4LhN4XIykXhp8bEy+x/DhA0LBZZXYSCkZDqrwMMg==",
+    "node_modules/callsites": {
+      "version": "3.1.0",
       "dev": true,
-      "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.0",
-        "ws": "~8.2.3"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=6"
       }
     },
-    "node_modules/engine.io-parser": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.1.tgz",
-      "integrity": "sha512-j4p3WwJrG2k92VISM0op7wiq60vO92MlF3CRGxhKHy9ywG1/Dkc72g0dXeDQ+//hrcDn8gqQzoEkdO9FN0d9AA==",
+    "node_modules/camel-case": {
+      "version": "3.0.0",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "base64-arraybuffer": "~1.0.1"
-      },
-      "engines": {
-        "node": ">=10.0.0"
+        "no-case": "^2.2.0",
+        "upper-case": "^1.1.1"
       }
     },
-    "node_modules/engine.io/node_modules/cookie": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz",
-      "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==",
+    "node_modules/camelcase": {
+      "version": "5.3.1",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=6"
       }
     },
-    "node_modules/engine.io/node_modules/ws": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
-      "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
+    "node_modules/caniuse-api": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
+      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
       "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
+      "dependencies": {
+        "browserslist": "^4.0.0",
+        "caniuse-lite": "^1.0.0",
+        "lodash.memoize": "^4.1.2",
+        "lodash.uniq": "^4.5.0"
+      }
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001641",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001641.tgz",
+      "integrity": "sha512-Phv5thgl67bHYo1TtMY/MurjkHhV4EDaCosezRXgZ8jzA/Ub+wjxAvbGvjoFENStinwi5kCyOYV3mi5tOGykwA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
         },
-        "utf-8-validate": {
-          "optional": true
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
         }
-      }
+      ]
     },
-    "node_modules/enquirer": {
-      "version": "2.3.6",
+    "node_modules/cbor": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/cbor/-/cbor-9.0.1.tgz",
+      "integrity": "sha512-/TQOWyamDxvVIv+DY9cOLNuABkoyz8K/F3QE56539pGVYohx0+MEA1f4lChFTX79dBTBS7R1PF6ovH7G+VtBfQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "ansi-colors": "^4.1.1"
+        "nofilter": "^3.1.0"
       },
       "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/ent": {
-      "version": "2.2.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/entities": {
-      "version": "2.2.0",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
+        "node": ">=16"
       }
     },
-    "node_modules/enzyme": {
-      "version": "3.11.0",
+    "node_modules/chai": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.4.1.tgz",
+      "integrity": "sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "array.prototype.flat": "^1.2.3",
-        "cheerio": "^1.0.0-rc.3",
-        "enzyme-shallow-equal": "^1.0.1",
-        "function.prototype.name": "^1.1.2",
-        "has": "^1.0.3",
-        "html-element-map": "^1.2.0",
-        "is-boolean-object": "^1.0.1",
-        "is-callable": "^1.1.5",
-        "is-number-object": "^1.0.4",
-        "is-regex": "^1.0.5",
-        "is-string": "^1.0.5",
-        "is-subset": "^0.1.1",
-        "lodash.escape": "^4.0.1",
-        "lodash.isequal": "^4.5.0",
-        "object-inspect": "^1.7.0",
-        "object-is": "^1.0.2",
-        "object.assign": "^4.1.0",
-        "object.entries": "^1.1.1",
-        "object.values": "^1.1.1",
-        "raf": "^3.4.1",
-        "rst-selector-parser": "^2.2.3",
-        "string.prototype.trim": "^1.2.1"
+        "assertion-error": "^1.1.0",
+        "check-error": "^1.0.3",
+        "deep-eql": "^4.1.3",
+        "get-func-name": "^2.0.2",
+        "loupe": "^2.3.6",
+        "pathval": "^1.1.1",
+        "type-detect": "^4.0.8"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/enzyme-adapter-preact-pure": {
-      "version": "3.1.0",
+    "node_modules/chai-as-promised": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.2.tgz",
+      "integrity": "sha512-aBDHZxRzYnUYuIAIPBH2s511DjlKPzXNlXSGFC8CwmroWQLfrW0LtE1nK3MAwwNhJPa9raEjNCmRoFpG0Hurdw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "array.prototype.flatmap": "^1.2.1"
+        "check-error": "^1.0.2"
       },
       "peerDependencies": {
-        "enzyme": "^3.8.0",
-        "preact": "^10.0.0"
+        "chai": ">= 2.1.2 < 6"
       }
     },
-    "node_modules/enzyme-shallow-equal": {
-      "version": "1.0.4",
+    "node_modules/chalk": {
+      "version": "2.4.2",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "has": "^1.0.3",
-        "object-is": "^1.1.2"
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/equal-length": {
-      "version": "1.0.1",
+    "node_modules/char-regex": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
       }
     },
-    "node_modules/error": {
-      "version": "7.2.1",
+    "node_modules/charenc": {
+      "version": "0.0.2",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/check-dependencies": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/check-dependencies/-/check-dependencies-2.0.0.tgz",
+      "integrity": "sha512-ui/u085SyYlRhaYShUDyS0fpTrfBBpz5bS0m+A1AW8HbsQefxrqLBKNzKAllIgdFZvKu0UHjrpzdobvGQ6khdg==",
       "dev": true,
       "dependencies": {
-        "string-template": "~0.2.1"
+        "picocolors": "^1.0.0",
+        "semver": "^7.5.4"
+      },
+      "bin": {
+        "check-dependencies": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=18.3"
       }
     },
-    "node_modules/error-ex": {
-      "version": "1.3.2",
+    "node_modules/check-error": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz",
+      "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "is-arrayish": "^0.2.1"
+        "get-func-name": "^2.0.2"
+      },
+      "engines": {
+        "node": "*"
       }
     },
-    "node_modules/es-abstract": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
-      "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
+    "node_modules/cheerio": {
+      "version": "1.0.0-rc.10",
+      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.10.tgz",
+      "integrity": "sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw==",
+      "dev": true,
       "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"
+        "cheerio-select": "^1.5.0",
+        "dom-serializer": "^1.3.2",
+        "domhandler": "^4.2.0",
+        "htmlparser2": "^6.1.0",
+        "parse5": "^6.0.1",
+        "parse5-htmlparser2-tree-adapter": "^6.0.1",
+        "tslib": "^2.2.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">= 6"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/cheeriojs/cheerio?sponsor=1"
       }
     },
-    "node_modules/es-abstract/node_modules/get-intrinsic": {
-      "version": "1.1.1",
-      "license": "MIT",
+    "node_modules/cheerio-select": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.5.0.tgz",
+      "integrity": "sha512-qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg==",
+      "dev": true,
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1"
+        "css-select": "^4.1.3",
+        "css-what": "^5.0.1",
+        "domelementtype": "^2.2.0",
+        "domhandler": "^4.2.0",
+        "domutils": "^2.7.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/fb55"
       }
     },
-    "node_modules/es-abstract/node_modules/is-negative-zero": {
-      "version": "2.0.1",
-      "license": "MIT",
+    "node_modules/cheerio-select/node_modules/css-what": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz",
+      "integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==",
+      "dev": true,
       "engines": {
-        "node": ">= 0.4"
+        "node": ">= 6"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/fb55"
       }
     },
-    "node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "license": "MIT",
+    "node_modules/chokidar": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+      "dev": true,
       "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.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"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">= 8.10.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/esbuild": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.13.9.tgz",
-      "integrity": "sha512-8bYcckmisXjGvBMeylp1PRtu21uOoCDFAgXGGF2BR241zYQDN6ZLNvcmQlnQ7olG0p6PRWmJI8WVH3ca8viPuw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "bin": {
-        "esbuild": "bin/esbuild"
+        "url": "https://paulmillr.com/funding/"
       },
       "optionalDependencies": {
-        "esbuild-android-arm64": "0.13.9",
-        "esbuild-darwin-64": "0.13.9",
-        "esbuild-darwin-arm64": "0.13.9",
-        "esbuild-freebsd-64": "0.13.9",
-        "esbuild-freebsd-arm64": "0.13.9",
-        "esbuild-linux-32": "0.13.9",
-        "esbuild-linux-64": "0.13.9",
-        "esbuild-linux-arm": "0.13.9",
-        "esbuild-linux-arm64": "0.13.9",
-        "esbuild-linux-mips64le": "0.13.9",
-        "esbuild-linux-ppc64le": "0.13.9",
-        "esbuild-netbsd-64": "0.13.9",
-        "esbuild-openbsd-64": "0.13.9",
-        "esbuild-sunos-64": "0.13.9",
-        "esbuild-windows-32": "0.13.9",
-        "esbuild-windows-64": "0.13.9",
-        "esbuild-windows-arm64": "0.13.9"
-      }
-    },
-    "node_modules/esbuild-android-arm64": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.13.9.tgz",
-      "integrity": "sha512-Ty0hKldtjJVLHwUwbKR4GFPiXBo5iQ3aE1OLBar9lh3myaRkUGEb+Ypl74LEKa0+t/9lS3Ev1N5+5P2Sq6UvNQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ]
+        "fsevents": "~2.3.2"
+      }
     },
-    "node_modules/esbuild-darwin-64": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.13.9.tgz",
-      "integrity": "sha512-Ay0/b98v0oYp3ApXNQ7QPbaSkCT9WjBU6h8bMB1SYrQ/PmHgwph91fb9V0pfOLKK1rYWypfrNbI0MyT2tWN+rQ==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/chownr": {
+      "version": "2.0.0",
       "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
+      "license": "ISC",
+      "engines": {
+        "node": ">=10"
+      }
     },
-    "node_modules/esbuild-darwin-arm64": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.13.9.tgz",
-      "integrity": "sha512-nJB8chaJdWathCe6EyIiMIqfyEzbuXPyNsPlL3bYRB1zFCF8feXT874D4IHbJ/w8B6BpY3sM1Clr/I/DK8E4ow==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/chunkd": {
+      "version": "2.0.1",
       "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
+      "license": "MIT"
     },
-    "node_modules/esbuild-freebsd-64": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.13.9.tgz",
-      "integrity": "sha512-ktaBujf12XLkVXLGx7WjFcmh1tt34tm7gP4pHkhvbzbHrq+BbXwcl4EsW+5JT9VNKl7slOGf4Qnua/VW7ZcnIw==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/ci-info": {
+      "version": "2.0.0",
       "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
+      "license": "MIT"
     },
-    "node_modules/esbuild-freebsd-arm64": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.13.9.tgz",
-      "integrity": "sha512-vVa5zps4dmwpXwv/amxVpIWvFJuUPWQkpV+PYtZUW9lqjXsQ3LBHP51Q1cXZZBIrqwszLsEyJPa5GuDOY15hzQ==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/ci-parallel-vars": {
+      "version": "1.0.1",
       "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
+      "license": "MIT"
     },
-    "node_modules/esbuild-linux-32": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.13.9.tgz",
-      "integrity": "sha512-HxoW9QNqhO8VW1l7aBiYQH4lobeHq85+blZ4nlZ7sg5CNhGRRwnMlV6S08VYKz6V0YKnHb5OqJxx2HZuTZ7tgQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
+    "node_modules/cjs-module-lexer": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz",
+      "integrity": "sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==",
+      "dev": true
     },
-    "node_modules/esbuild-linux-64": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.13.9.tgz",
-      "integrity": "sha512-L+eAR8o1lAUr9g64RXnBLuWZjAItAOWSUpvkchpa6QvSnXFA/nG6PgGsOBEqhDXl9qYEpGI0ReDrFkf8ByapvQ==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/cjson": {
+      "version": "0.3.0",
       "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
+      "dependencies": {
+        "jsonlint": "1.6.0"
+      },
+      "engines": {
+        "node": ">= 0.3.0"
+      }
     },
-    "node_modules/esbuild-linux-arm": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.13.9.tgz",
-      "integrity": "sha512-DT0S+ufCVXatPZHjkCaBgZSFIV8FzY4GEHz/BlkitTWzUvT1dIUXjPIRPnqBUVa+0AyS1bZSfHzv9hTT4LHz7A==",
-      "cpu": [
-        "arm"
-      ],
+    "node_modules/clean-css": {
+      "version": "4.2.3",
       "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
+      "license": "MIT",
+      "dependencies": {
+        "source-map": "~0.6.0"
+      },
+      "engines": {
+        "node": ">= 4.0"
+      }
     },
-    "node_modules/esbuild-linux-arm64": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.13.9.tgz",
-      "integrity": "sha512-IjbhZpW5VQYK4nVI4dj/mLvH5oXAIf57OI8BYVkCqrdVXJwR8nVrSqux3zJSY+ElrkOK3DtG9iTPpmqvBXaU0g==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/clean-css/node_modules/source-map": {
+      "version": "0.6.1",
       "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "node_modules/esbuild-linux-mips64le": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.13.9.tgz",
-      "integrity": "sha512-ec9RgAM4r+fe1ZmG16qeMwEHdcIvqeW8tpnpkfSQu9T4487KtQF6lg3TQasTarrLLEe7Qpy+E+r4VwC8eeZySQ==",
-      "cpu": [
-        "mips64el"
-      ],
+    "node_modules/clean-stack": {
+      "version": "2.2.0",
       "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
     },
-    "node_modules/esbuild-linux-ppc64le": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.13.9.tgz",
-      "integrity": "sha512-7b2/wg8T1n/L1BgCWlMSez0aXfGkNjFuOqMBQdnTti3LRuUwzGJcrhRf/FdZGJ5/evML9mqu60vLRuXW1TdXCg==",
-      "cpu": [
-        "ppc64"
-      ],
+    "node_modules/cli-truncate": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz",
+      "integrity": "sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
+      "dependencies": {
+        "slice-ansi": "^5.0.0",
+        "string-width": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
-    "node_modules/esbuild-netbsd-64": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.13.9.tgz",
-      "integrity": "sha512-PiZu3h4+Szj0iZPgvuD2Y0isOXnlNetmF6jMcOwW54BScwynW24/baE+z7PfDyNFgjV04Ga2THdcpbKBDhgWQw==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/cli-truncate/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==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "netbsd"
-      ]
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
     },
-    "node_modules/esbuild-openbsd-64": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.13.9.tgz",
-      "integrity": "sha512-SJKN4Ez+ilY7mu+1gAdGQ9N6dktBfbEkiOAvw+hT7xHrNnTnrTGH0FT4qx9dazB9HX6D04L4PXmVOyynqi+oEQ==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/cli-truncate/node_modules/emoji-regex": {
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz",
+      "integrity": "sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==",
+      "dev": true
+    },
+    "node_modules/cli-truncate/node_modules/string-width": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.1.0.tgz",
+      "integrity": "sha512-SEIJCWiX7Kg4c129n48aDRwLbFb2LJmXXFrWBG4NGaRtMQ3myKPKbwrD1BKqQn74oCoNMBVrfDEr5M9YxCsrkw==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "openbsd"
-      ]
+      "dependencies": {
+        "emoji-regex": "^10.3.0",
+        "get-east-asian-width": "^1.0.0",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
-    "node_modules/esbuild-sunos-64": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.13.9.tgz",
-      "integrity": "sha512-9N0RjZ7cElE8ifrS0nBrLQgBMQNPiIIKO2GzLXy7Ms8AM3KjfLiV2G2+9O0B9paXjRAHchIwazTeOyeWb1vyWA==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/cli-truncate/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "sunos"
-      ]
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
     },
-    "node_modules/esbuild-windows-32": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.13.9.tgz",
-      "integrity": "sha512-awxWs1kns+RfjhqBbTbdlePjqZrAE2XMaAQJNg9dtu+C7ghC3QKsqXbu0C26OuF5YeAdJcq9q+IdG6WPLjvj9w==",
-      "cpu": [
-        "ia32"
-      ],
+    "node_modules/cliui": {
+      "version": "7.0.4",
       "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ]
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
     },
-    "node_modules/esbuild-windows-64": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.13.9.tgz",
-      "integrity": "sha512-VmA9GQMCzOr8rFfD72Dum1+AWhJui7ZO6sYwp6rBHYu4vLmWITTSUsd/zgXXmZuHBPkkvxLJLF8XsKFCRKflJA==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ]
+      "engines": {
+        "iojs": ">= 1.0.0",
+        "node": ">= 0.12.0"
+      }
     },
-    "node_modules/esbuild-windows-arm64": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.13.9.tgz",
-      "integrity": "sha512-P/jPY2JwmTpgEPh9BkXpCe690tcDSSo0K9BHTniSeEAEz26kPpqldVa4XDm0R+hNnFA7ecEgNskr4QAxE1ry0w==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/code-excerpt": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/code-excerpt/-/code-excerpt-4.0.0.tgz",
+      "integrity": "sha512-xxodCmBen3iy2i0WtAK8FlFNrRzjUqjRsMfho58xT/wvZU1YTM3fCnRjcy1gJPMepaRlgm/0e6w8SpWHpn3/cA==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ]
+      "dependencies": {
+        "convert-to-spaces": "^2.0.1"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      }
     },
-    "node_modules/escalade": {
-      "version": "3.1.1",
+    "node_modules/coffee-script": {
+      "version": "1.12.7",
       "dev": true,
       "license": "MIT",
+      "bin": {
+        "cake": "bin/cake",
+        "coffee": "bin/coffee"
+      },
       "engines": {
-        "node": ">=6"
+        "node": ">=0.8.0"
       }
     },
-    "node_modules/escape-goat": {
-      "version": "2.1.1",
+    "node_modules/collect-v8-coverage": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
+      "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",
+      "dev": true
+    },
+    "node_modules/color-convert": {
+      "version": "1.9.3",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=8"
+      "dependencies": {
+        "color-name": "1.1.3"
       }
     },
-    "node_modules/escape-html": {
-      "version": "1.0.3",
+    "node_modules/color-name": {
+      "version": "1.1.3",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
+    "node_modules/color-support": {
+      "version": "1.1.3",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "color-support": "bin.js"
+      }
+    },
+    "node_modules/colord": {
+      "version": "2.9.3",
+      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
+      "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
+      "dev": true
+    },
+    "node_modules/colors": {
+      "version": "1.4.0",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">=0.1.90"
       }
     },
-    "node_modules/escodegen": {
-      "version": "2.0.0",
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
-        "esprima": "^4.0.1",
-        "estraverse": "^5.2.0",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1"
-      },
-      "bin": {
-        "escodegen": "bin/escodegen.js",
-        "esgenerate": "bin/esgenerate.js"
+        "delayed-stream": "~1.0.0"
       },
       "engines": {
-        "node": ">=6.0"
-      },
-      "optionalDependencies": {
-        "source-map": "~0.6.1"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/escodegen/node_modules/estraverse": {
-      "version": "5.2.0",
+    "node_modules/commander": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz",
+      "integrity": "sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "engines": {
-        "node": ">=4.0"
+        "node": ">=16"
       }
     },
-    "node_modules/escodegen/node_modules/source-map": {
-      "version": "0.6.1",
+    "node_modules/comment-parser": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.4.1.tgz",
+      "integrity": "sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg==",
       "dev": true,
-      "license": "BSD-3-Clause",
-      "optional": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 12.0.0"
       }
     },
-    "node_modules/eslint": {
-      "version": "7.32.0",
+    "node_modules/common-path-prefix": {
+      "version": "3.0.0",
       "dev": true,
-      "license": "MIT",
-      "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"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-config-prettier": {
-      "version": "8.3.0",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "eslint-config-prettier": "bin/cli.js"
-      },
-      "peerDependencies": {
-        "eslint": ">=7.0.0"
-      }
+      "license": "ISC"
     },
-    "node_modules/eslint-import-resolver-babel-module": {
-      "version": "5.3.1",
+    "node_modules/compress-commons": {
+      "version": "0.2.9",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "pkg-up": "^3.1.0",
-        "resolve": "^1.20.0"
+        "buffer-crc32": "~0.2.1",
+        "crc32-stream": "~0.3.1",
+        "node-int64": "~0.3.0",
+        "readable-stream": "~1.0.26"
       },
       "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0",
-        "babel-plugin-module-resolver": "^3.0.0 || ^4.0.0"
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/eslint-import-resolver-node": {
-      "version": "0.3.6",
+    "node_modules/compress-commons/node_modules/isarray": {
+      "version": "0.0.1",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "debug": "^3.2.7",
-        "resolve": "^1.20.0"
-      }
+      "license": "MIT"
     },
-    "node_modules/eslint-import-resolver-node/node_modules/debug": {
-      "version": "3.2.7",
+    "node_modules/compress-commons/node_modules/node-int64": {
+      "version": "0.3.3",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/compress-commons/node_modules/readable-stream": {
+      "version": "1.0.34",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "^2.1.1"
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
       }
     },
-    "node_modules/eslint-module-utils": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.1.tgz",
-      "integrity": "sha512-fjoetBXQZq2tSTWZ9yWVl2KuFrTZZH3V+9iD1V1RfpDgxzJR+mPd/KZmMiA8gbPqdBzpNiEHOuT7IYEWxrH0zQ==",
+    "node_modules/compress-commons/node_modules/string_decoder": {
+      "version": "0.10.31",
       "dev": true,
-      "dependencies": {
-        "debug": "^3.2.7",
-        "find-up": "^2.1.0",
-        "pkg-dir": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
+      "license": "MIT"
     },
-    "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==",
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/concat-stream": {
+      "version": "1.6.2",
       "dev": true,
+      "engines": [
+        "node >= 0.8"
+      ],
+      "license": "MIT",
       "dependencies": {
-        "ms": "^2.1.1"
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
       }
     },
-    "node_modules/eslint-module-utils/node_modules/find-up": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+    "node_modules/concat-with-sourcemaps": {
+      "version": "1.1.0",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "locate-path": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
+        "source-map": "^0.6.1"
       }
     },
-    "node_modules/eslint-module-utils/node_modules/locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+    "node_modules/concat-with-sourcemaps/node_modules/source-map": {
+      "version": "0.6.1",
       "dev": true,
-      "dependencies": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
-      },
+      "license": "BSD-3-Clause",
       "engines": {
-        "node": ">=4"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/eslint-module-utils/node_modules/p-limit": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+    "node_modules/concordance": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/concordance/-/concordance-5.0.4.tgz",
+      "integrity": "sha512-OAcsnTEYu1ARJqWVGwf4zh4JDfHZEaSNlNccFmt8YjB2l/n19/PF2viLINHc57vO4FKIAFl2FWASIGZZWZ2Kxw==",
       "dev": true,
       "dependencies": {
-        "p-try": "^1.0.0"
+        "date-time": "^3.1.0",
+        "esutils": "^2.0.3",
+        "fast-diff": "^1.2.0",
+        "js-string-escape": "^1.0.1",
+        "lodash": "^4.17.15",
+        "md5-hex": "^3.0.1",
+        "semver": "^7.3.2",
+        "well-known-symbols": "^2.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=10.18.0 <11 || >=12.14.0 <13 || >=14"
       }
     },
-    "node_modules/eslint-module-utils/node_modules/p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+    "node_modules/connect": {
+      "version": "3.7.0",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "p-limit": "^1.1.0"
+        "debug": "2.6.9",
+        "finalhandler": "1.1.2",
+        "parseurl": "~1.3.3",
+        "utils-merge": "1.0.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">= 0.10.0"
       }
     },
-    "node_modules/eslint-module-utils/node_modules/p-try": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+    "node_modules/connect-header": {
+      "version": "0.0.5",
       "dev": true,
       "engines": {
-        "node": ">=4"
+        "node": ">= 0.4.0"
       }
     },
-    "node_modules/eslint-module-utils/node_modules/pkg-dir": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
-      "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+    "node_modules/connect-livereload": {
+      "version": "0.6.1",
       "dev": true,
-      "dependencies": {
-        "find-up": "^2.1.0"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=4"
+        "node": "*"
       }
     },
-    "node_modules/eslint-plugin-chai-expect": {
-      "version": "2.2.0",
+    "node_modules/connect/node_modules/debug": {
+      "version": "2.6.9",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      },
-      "peerDependencies": {
-        "eslint": ">=2.0.0 <= 7.x"
+      "dependencies": {
+        "ms": "2.0.0"
       }
     },
-    "node_modules/eslint-plugin-eslint-plugin": {
-      "version": "3.6.1",
+    "node_modules/connect/node_modules/ms": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/console-control-strings": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
+      "dev": true
+    },
+    "node_modules/content-disposition": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "eslint-utils": "^2.1.0"
+        "safe-buffer": "5.2.1"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "peerDependencies": {
-        "eslint": ">=6.0.0"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/eslint-plugin-import": {
-      "version": "2.25.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.2.tgz",
-      "integrity": "sha512-qCwQr9TYfoBHOFcVGKY9C9unq05uOxxdklmBXLVvcwo68y5Hta6/GzCZEMx2zQiu0woKNEER0LE7ZgaOfBU14g==",
+    "node_modules/content-disposition/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "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"
+        }
+      ]
+    },
+    "node_modules/content-type": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
       "dev": true,
-      "dependencies": {
-        "array-includes": "^3.1.4",
-        "array.prototype.flat": "^1.2.5",
-        "debug": "^2.6.9",
-        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.6",
-        "eslint-module-utils": "^2.7.0",
-        "has": "^1.0.3",
-        "is-core-module": "^2.7.0",
-        "is-glob": "^4.0.3",
-        "minimatch": "^3.0.4",
-        "object.values": "^1.1.5",
-        "resolve": "^1.20.0",
-        "tsconfig-paths": "^3.11.0"
-      },
       "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/debug": {
-      "version": "2.6.9",
+    "node_modules/continuable-cache": {
+      "version": "0.3.1",
+      "dev": true
+    },
+    "node_modules/convert-source-map": {
+      "version": "1.7.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.0.0"
+        "safe-buffer": "~5.1.1"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/doctrine": {
-      "version": "2.1.0",
+    "node_modules/convert-to-spaces": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/convert-to-spaces/-/convert-to-spaces-2.0.1.tgz",
+      "integrity": "sha512-rcQ1bsQO9799wq24uE5AM2tAILy4gXGIK/njFWcVQkGNZ96edlpY+A7bjwvzjYvLDyzmG1MmMLZhpcsb+klNMQ==",
       "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/ms": {
-      "version": "2.0.0",
+    "node_modules/cookie": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/cookie-signature": {
+      "version": "1.0.6",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/eslint-plugin-jasmine": {
-      "version": "4.1.2",
+    "node_modules/core-js": {
+      "version": "3.9.1",
       "dev": true,
+      "hasInstallScript": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=8",
-        "npm": ">=6"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
       }
     },
-    "node_modules/eslint-plugin-jsdoc": {
-      "version": "36.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-36.1.1.tgz",
-      "integrity": "sha512-nuLDvH1EJaKx0PCa9oeQIxH6pACIhZd1gkalTUxZbaxxwokjs7TplqY0Q8Ew3CoZaf5aowm0g/Z3JGHCatt+gQ==",
+    "node_modules/core-js-compat": {
+      "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.21.0.tgz",
+      "integrity": "sha512-OSXseNPSK2OPJa6GdtkMz/XxeXx8/CJvfhQWTqd6neuUraujcL4jVsjkLQz1OWnax8xVQJnRPe0V2jqNWORA+A==",
       "dev": true,
       "dependencies": {
-        "@es-joy/jsdoccomment": "0.10.8",
-        "comment-parser": "1.2.4",
-        "debug": "^4.3.2",
-        "esquery": "^1.4.0",
-        "jsdoc-type-pratt-parser": "^1.1.1",
-        "lodash": "^4.17.21",
-        "regextras": "^0.8.0",
-        "semver": "^7.3.5",
-        "spdx-expression-parse": "^3.0.1"
-      },
-      "engines": {
-        "node": "^12 || ^14 || ^16"
+        "browserslist": "^4.19.1",
+        "semver": "7.0.0"
       },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
       }
     },
-    "node_modules/eslint-plugin-local": {
-      "version": "1.0.0",
+    "node_modules/core-js-compat/node_modules/semver": {
+      "version": "7.0.0",
       "dev": true,
-      "license": "MIT"
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
     },
-    "node_modules/eslint-plugin-module-resolver": {
-      "version": "1.4.0",
+    "node_modules/core-util-is": {
+      "version": "1.0.2",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/eslint-plugin-prettier": {
-      "version": "4.0.0",
+    "node_modules/cors": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
+      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "prettier-linter-helpers": "^1.0.0"
+        "object-assign": "^4",
+        "vary": "^1"
       },
       "engines": {
-        "node": ">=6.0.0"
-      },
-      "peerDependencies": {
-        "eslint": ">=7.28.0",
-        "prettier": ">=2.0.0"
-      },
-      "peerDependenciesMeta": {
-        "eslint-config-prettier": {
-          "optional": true
-        }
+        "node": ">= 0.10"
       }
     },
-    "node_modules/eslint-plugin-react": {
-      "version": "7.26.1",
+    "node_modules/crc32-stream": {
+      "version": "0.3.4",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "array-includes": "^3.1.3",
-        "array.prototype.flatmap": "^1.2.4",
-        "doctrine": "^2.1.0",
-        "estraverse": "^5.2.0",
-        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
-        "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.5"
+        "buffer-crc32": "~0.2.1",
+        "readable-stream": "~1.0.24"
       },
       "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^3 || ^4 || ^5 || ^6 || ^7"
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/eslint-plugin-react-hooks": {
-      "version": "4.2.0",
+    "node_modules/crc32-stream/node_modules/isarray": {
+      "version": "0.0.1",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0"
-      }
+      "license": "MIT"
     },
-    "node_modules/eslint-plugin-react/node_modules/doctrine": {
-      "version": "2.1.0",
+    "node_modules/crc32-stream/node_modules/readable-stream": {
+      "version": "1.0.34",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
       }
     },
-    "node_modules/eslint-plugin-react/node_modules/estraverse": {
-      "version": "5.2.0",
+    "node_modules/crc32-stream/node_modules/string_decoder": {
+      "version": "0.10.31",
       "dev": true,
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=4.0"
-      }
+      "license": "MIT"
     },
-    "node_modules/eslint-plugin-react/node_modules/object.entries": {
-      "version": "1.1.4",
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.2"
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">= 8"
       }
     },
-    "node_modules/eslint-plugin-react/node_modules/resolve": {
-      "version": "2.0.0-next.3",
+    "node_modules/cross-spawn/node_modules/which": {
+      "version": "2.0.2",
       "dev": true,
-      "license": "MIT",
+      "license": "ISC",
       "dependencies": {
-        "is-core-module": "^2.2.0",
-        "path-parse": "^1.0.6"
+        "isexe": "^2.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-plugin-react/node_modules/semver": {
-      "version": "6.3.0",
-      "dev": true,
-      "license": "ISC",
       "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/eslint-plugin-sort-destructure-keys": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-sort-destructure-keys/-/eslint-plugin-sort-destructure-keys-1.4.0.tgz",
-      "integrity": "sha512-txU9l22mblz7YpyjJNYFy4wb5PVXiRMbc9lqFPPhvY4wKyBBYQvb31TIcduf7iRb4Bv01aiXcJiuCkOOrVY48Q==",
-      "dev": true,
-      "dependencies": {
-        "natural-compare-lite": "^1.4.0"
+        "node-which": "bin/node-which"
       },
       "engines": {
-        "node": ">=6.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "3 - 8"
+        "node": ">= 8"
       }
     },
-    "node_modules/eslint-plugin-sort-requires": {
-      "version": "2.1.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/eslint-scope": {
-      "version": "5.1.1",
+    "node_modules/crypt": {
+      "version": "0.0.2",
       "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
+      "license": "BSD-3-Clause",
       "engines": {
-        "node": ">=8.0.0"
+        "node": "*"
       }
     },
-    "node_modules/eslint-utils": {
-      "version": "2.1.0",
+    "node_modules/crypto-random-string": {
+      "version": "2.0.0",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "eslint-visitor-keys": "^1.1.0"
-      },
       "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
+        "node": ">=8"
       }
     },
-    "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
-      "version": "1.3.0",
+    "node_modules/css-declaration-sorter": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-7.2.0.tgz",
+      "integrity": "sha512-h70rUM+3PNFuaBDTLe8wF/cdWu+dOZmb7pJt8Z2sedYbAcQVQV/tEchueg3GWxwqS0cxtbxmaHEdkNACqcvsow==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
-        "node": ">=4"
+        "node": "^14 || ^16 || >=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.0.9"
       }
     },
-    "node_modules/eslint-visitor-keys": {
-      "version": "2.1.0",
+    "node_modules/css-imports": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/css-imports/-/css-imports-0.3.1.tgz",
+      "integrity": "sha1-Xd4qUbwggtcymbFHvVvgPj9Jisw=",
       "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=10"
+      "dependencies": {
+        "strip-comments": "~0.1.6"
       }
     },
-    "node_modules/eslint/node_modules/@babel/code-frame": {
-      "version": "7.12.11",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/css-jss": {
+      "version": "10.8.2",
+      "resolved": "https://registry.npmjs.org/css-jss/-/css-jss-10.8.2.tgz",
+      "integrity": "sha512-KjsoKnBV4C9p+F+zW9jNXCai0UYU5K+3eyo+lJX/fY8UBEQd/yNREnHsLD1VMMzBwHRvrA8eQHvqmAL+XNLYcw==",
       "dependencies": {
-        "@babel/highlight": "^7.10.4"
+        "@babel/runtime": "^7.3.1",
+        "jss": "10.8.2",
+        "jss-preset-default": "10.8.2"
       }
     },
-    "node_modules/eslint/node_modules/ajv": {
-      "version": "6.12.6",
+    "node_modules/css-select": {
+      "version": "4.1.3",
       "dev": true,
-      "license": "MIT",
+      "license": "BSD-2-Clause",
       "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"
+        "boolbase": "^1.0.0",
+        "css-what": "^5.0.0",
+        "domhandler": "^4.2.0",
+        "domutils": "^2.6.0",
+        "nth-check": "^2.0.0"
       },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
+        "url": "https://github.com/sponsors/fb55"
       }
     },
-    "node_modules/eslint/node_modules/ansi-styles": {
-      "version": "4.3.0",
+    "node_modules/css-select/node_modules/css-what": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz",
+      "integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">= 6"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "url": "https://github.com/sponsors/fb55"
       }
     },
-    "node_modules/eslint/node_modules/chalk": {
-      "version": "4.1.2",
+    "node_modules/css-tree": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz",
+      "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "mdn-data": "2.0.30",
+        "source-map-js": "^1.0.1"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
       }
     },
-    "node_modules/eslint/node_modules/color-convert": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/css-vendor": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/css-vendor/-/css-vendor-2.0.8.tgz",
+      "integrity": "sha512-x9Aq0XTInxrkuFeHKbYC7zWY8ai7qJ04Kxd9MnvbC1uO5DagxoHQjm4JvG+vCdXOoFtCjbL2XSZfxmoYa9uQVQ==",
       "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
+        "@babel/runtime": "^7.8.3",
+        "is-in-browser": "^1.0.2"
       }
     },
-    "node_modules/eslint/node_modules/color-name": {
-      "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/eslint/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
+    "node_modules/css-what": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
+      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=10"
+        "node": ">= 6"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/fb55"
       }
     },
-    "node_modules/eslint/node_modules/globals": {
-      "version": "13.11.0",
+    "node_modules/cssesc": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+      "dev": true,
+      "bin": {
+        "cssesc": "bin/cssesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/cssnano": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-6.1.2.tgz",
+      "integrity": "sha512-rYk5UeX7VAM/u0lNqewCdasdtPK81CgX8wJFLEIXHbV2oldWRgJAsZrdhRXkV1NJzA2g850KiFm9mMU2HxNxMA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "type-fest": "^0.20.2"
+        "cssnano-preset-default": "^6.1.2",
+        "lilconfig": "^3.1.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^14 || ^16 || >=18.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "type": "opencollective",
+        "url": "https://opencollective.com/cssnano"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
       }
     },
-    "node_modules/eslint/node_modules/has-flag": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
+    "node_modules/cssnano-preset-default": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-6.1.2.tgz",
+      "integrity": "sha512-1C0C+eNaeN8OcHQa193aRgYexyJtU8XwbdieEjClw+J9d94E41LwT6ivKH0WT+fYwYWB0Zp3I3IZ7tI/BbUbrg==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.23.0",
+        "css-declaration-sorter": "^7.2.0",
+        "cssnano-utils": "^4.0.2",
+        "postcss-calc": "^9.0.1",
+        "postcss-colormin": "^6.1.0",
+        "postcss-convert-values": "^6.1.0",
+        "postcss-discard-comments": "^6.0.2",
+        "postcss-discard-duplicates": "^6.0.3",
+        "postcss-discard-empty": "^6.0.3",
+        "postcss-discard-overridden": "^6.0.2",
+        "postcss-merge-longhand": "^6.0.5",
+        "postcss-merge-rules": "^6.1.1",
+        "postcss-minify-font-values": "^6.1.0",
+        "postcss-minify-gradients": "^6.0.3",
+        "postcss-minify-params": "^6.1.0",
+        "postcss-minify-selectors": "^6.0.4",
+        "postcss-normalize-charset": "^6.0.2",
+        "postcss-normalize-display-values": "^6.0.2",
+        "postcss-normalize-positions": "^6.0.2",
+        "postcss-normalize-repeat-style": "^6.0.2",
+        "postcss-normalize-string": "^6.0.2",
+        "postcss-normalize-timing-functions": "^6.0.2",
+        "postcss-normalize-unicode": "^6.1.0",
+        "postcss-normalize-url": "^6.0.2",
+        "postcss-normalize-whitespace": "^6.0.2",
+        "postcss-ordered-values": "^6.0.2",
+        "postcss-reduce-initial": "^6.1.0",
+        "postcss-reduce-transforms": "^6.0.2",
+        "postcss-svgo": "^6.0.3",
+        "postcss-unique-selectors": "^6.0.4"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
       }
     },
-    "node_modules/eslint/node_modules/ignore": {
-      "version": "4.0.6",
+    "node_modules/cssnano-utils": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-4.0.2.tgz",
+      "integrity": "sha512-ZR1jHg+wZ8o4c3zqf1SIUSTIvm/9mU343FMR6Obe/unskbvpGhZOo1J6d/r8D1pzkRQYuwbcH3hToOuoA2G7oQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">= 4"
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
       }
     },
-    "node_modules/eslint/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
+    "node_modules/csso": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-5.0.5.tgz",
+      "integrity": "sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==",
       "dev": true,
-      "license": "MIT"
+      "dependencies": {
+        "css-tree": "~2.2.0"
+      },
+      "engines": {
+        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",
+        "npm": ">=7.0.0"
+      }
     },
-    "node_modules/eslint/node_modules/levn": {
-      "version": "0.4.1",
+    "node_modules/csso/node_modules/css-tree": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.2.1.tgz",
+      "integrity": "sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
+        "mdn-data": "2.0.28",
+        "source-map-js": "^1.0.1"
       },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",
+        "npm": ">=7.0.0"
       }
     },
-    "node_modules/eslint/node_modules/optionator": {
-      "version": "0.9.1",
+    "node_modules/csso/node_modules/mdn-data": {
+      "version": "2.0.28",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.28.tgz",
+      "integrity": "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==",
+      "dev": true
+    },
+    "node_modules/cssstyle": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.0.1.tgz",
+      "integrity": "sha512-8ZYiJ3A/3OkDd093CBT/0UKDWry7ak4BdPTFP2+QEP7cmhouyq/Up709ASSj2cK02BbZiMgk7kYjZNS4QP5qrQ==",
       "dev": true,
-      "license": "MIT",
       "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"
+        "rrweb-cssom": "^0.6.0"
       },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">=18"
       }
     },
-    "node_modules/eslint/node_modules/prelude-ls": {
-      "version": "1.2.1",
+    "node_modules/csstype": {
+      "version": "3.0.9",
+      "license": "MIT"
+    },
+    "node_modules/currently-unhandled": {
+      "version": "0.4.1",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "array-find-index": "^1.0.1"
+      },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/eslint/node_modules/strip-json-comments": {
-      "version": "3.1.1",
+    "node_modules/custom-event": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/data-uri-to-buffer": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz",
+      "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">= 14"
       }
     },
-    "node_modules/eslint/node_modules/supports-color": {
-      "version": "7.2.0",
+    "node_modules/data-urls": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-5.0.0.tgz",
+      "integrity": "sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "whatwg-mimetype": "^4.0.0",
+        "whatwg-url": "^14.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
       }
     },
-    "node_modules/eslint/node_modules/type-check": {
-      "version": "0.4.0",
+    "node_modules/data-view-buffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz",
+      "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "prelude-ls": "^1.2.1"
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
       },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/espree": {
-      "version": "7.3.1",
+    "node_modules/data-view-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz",
+      "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
-        "acorn": "^7.4.0",
-        "acorn-jsx": "^5.3.1",
-        "eslint-visitor-keys": "^1.3.0"
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/espree/node_modules/acorn": {
-      "version": "7.4.1",
+    "node_modules/data-view-byte-offset": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz",
+      "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==",
       "dev": true,
-      "license": "MIT",
-      "bin": {
-        "acorn": "bin/acorn"
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
       },
       "engines": {
-        "node": ">=0.4.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/espree/node_modules/eslint-visitor-keys": {
-      "version": "1.3.0",
+    "node_modules/date-fns": {
+      "version": "2.27.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.27.0.tgz",
+      "integrity": "sha512-sj+J0Mo2p2X1e306MHq282WS4/A8Pz/95GIFcsPNMPMZVI3EUrAdSv90al1k+p74WGLCruMXk23bfEDZa71X9Q==",
+      "engines": {
+        "node": ">=0.11"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/date-fns"
+      }
+    },
+    "node_modules/date-format": {
+      "version": "4.0.14",
+      "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.14.tgz",
+      "integrity": "sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
-        "node": ">=4"
+        "node": ">=4.0"
       }
     },
-    "node_modules/esprima": {
-      "version": "4.0.1",
+    "node_modules/date-time": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/date-time/-/date-time-3.1.0.tgz",
+      "integrity": "sha512-uqCUKXE5q1PNBXjPqvwhwJf9SwMoAHBgWJ6DcrnS5o+W2JOiIILl0JEdVD8SGujrNS02GGxgwAg2PN2zONgtjg==",
       "dev": true,
-      "license": "BSD-2-Clause",
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
+      "dependencies": {
+        "time-zone": "^1.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=6"
       }
     },
-    "node_modules/esquery": {
-      "version": "1.4.0",
+    "node_modules/debug": {
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
+      "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
-        "estraverse": "^5.1.0"
+        "ms": "2.1.2"
       },
       "engines": {
-        "node": ">=0.10"
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
-    "node_modules/esquery/node_modules/estraverse": {
-      "version": "5.2.0",
+    "node_modules/decamelize": {
+      "version": "4.0.0",
       "dev": true,
-      "license": "BSD-2-Clause",
+      "license": "MIT",
       "engines": {
-        "node": ">=4.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/esrecurse": {
-      "version": "4.3.0",
+    "node_modules/decimal.js": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
+      "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
+      "dev": true
+    },
+    "node_modules/dedent": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz",
+      "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==",
       "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "estraverse": "^5.2.0"
+      "peerDependencies": {
+        "babel-plugin-macros": "^3.1.0"
       },
-      "engines": {
-        "node": ">=4.0"
+      "peerDependenciesMeta": {
+        "babel-plugin-macros": {
+          "optional": true
+        }
       }
     },
-    "node_modules/esrecurse/node_modules/estraverse": {
-      "version": "5.2.0",
+    "node_modules/deep-eql": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.4.tgz",
+      "integrity": "sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==",
       "dev": true,
-      "license": "BSD-2-Clause",
+      "dependencies": {
+        "type-detect": "^4.0.0"
+      },
       "engines": {
-        "node": ">=4.0"
+        "node": ">=6"
       }
     },
-    "node_modules/estraverse": {
-      "version": "4.3.0",
+    "node_modules/deep-is": {
+      "version": "0.1.3",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/deepmerge": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "engines": {
-        "node": ">=4.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/esutils": {
-      "version": "2.0.3",
+    "node_modules/define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
       "dev": true,
-      "license": "BSD-2-Clause",
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/etag": {
-      "version": "1.8.1",
+    "node_modules/define-lazy-prop": {
+      "version": "2.0.0",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=8"
       }
     },
-    "node_modules/event-stream": {
-      "version": "4.0.1",
+    "node_modules/define-properties": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "duplexer": "^0.1.1",
-        "from": "^0.1.7",
-        "map-stream": "0.0.7",
-        "pause-stream": "^0.0.11",
-        "split": "^1.0.1",
-        "stream-combiner": "^0.2.2",
-        "through": "^2.3.8"
+        "define-data-property": "^1.0.1",
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/event-target-shim": {
+    "node_modules/degenerator": {
       "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz",
+      "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "ast-types": "^0.13.4",
+        "escodegen": "^2.1.0",
+        "esprima": "^4.0.1"
+      },
       "engines": {
-        "node": ">=6"
+        "node": ">= 14"
       }
     },
-    "node_modules/eventemitter3": {
-      "version": "4.0.7",
+    "node_modules/degenerator/node_modules/ast-types": {
+      "version": "0.13.4",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
+      "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==",
       "dev": true,
-      "license": "MIT"
+      "dependencies": {
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "node_modules/events": {
-      "version": "3.3.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.8.x"
-      }
-    },
-    "node_modules/execa": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+    "node_modules/del": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/del/-/del-6.1.1.tgz",
+      "integrity": "sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==",
       "dev": true,
       "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"
-      },
-      "engines": {
-        "node": ">=10"
+        "globby": "^11.0.1",
+        "graceful-fs": "^4.2.4",
+        "is-glob": "^4.0.1",
+        "is-path-cwd": "^2.2.0",
+        "is-path-inside": "^3.0.2",
+        "p-map": "^4.0.0",
+        "rimraf": "^3.0.2",
+        "slash": "^3.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
-      }
-    },
-    "node_modules/execa/node_modules/get-stream": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -9131,2391 +9954,2790 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/exit": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-      "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
       "dev": true,
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">=0.4.0"
       }
     },
-    "node_modules/expand-brackets": {
-      "version": "2.1.4",
+    "node_modules/delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
+      "dev": true
+    },
+    "node_modules/depd": {
+      "version": "1.1.2",
       "dev": true,
       "license": "MIT",
-      "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"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/expand-brackets/node_modules/debug": {
-      "version": "2.6.9",
+    "node_modules/deprecation": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
+      "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==",
+      "dev": true
+    },
+    "node_modules/destroy": {
+      "version": "1.0.4",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ms": "2.0.0"
+      "license": "MIT"
+    },
+    "node_modules/detect-libc": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.2.tgz",
+      "integrity": "sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/expand-brackets/node_modules/define-property": {
-      "version": "0.2.5",
+    "node_modules/detect-newline": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/expand-brackets/node_modules/extend-shallow": {
-      "version": "2.0.1",
+    "node_modules/dezalgo": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz",
+      "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "asap": "^2.0.0",
+        "wrappy": "1"
       }
     },
-    "node_modules/expand-brackets/node_modules/ms": {
-      "version": "2.0.0",
+    "node_modules/di": {
+      "version": "0.0.1",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/expand-range": {
-      "version": "1.8.2",
+    "node_modules/diacritics-map": {
+      "version": "0.1.0",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "fill-range": "^2.1.0"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=0.8.0"
       }
     },
-    "node_modules/expand-range/node_modules/fill-range": {
-      "version": "2.2.4",
+    "node_modules/diff": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz",
+      "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-number": "^2.1.0",
-        "isobject": "^2.0.0",
-        "randomatic": "^3.0.0",
-        "repeat-element": "^1.1.2",
-        "repeat-string": "^1.5.2"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=0.3.1"
       }
     },
-    "node_modules/expand-range/node_modules/is-number": {
-      "version": "2.1.0",
+    "node_modules/diff-sequences": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
+      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/expand-range/node_modules/isobject": {
-      "version": "2.1.0",
+    "node_modules/dir-glob": {
+      "version": "3.0.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "isarray": "1.0.0"
+        "path-type": "^4.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/expand-range/node_modules/kind-of": {
-      "version": "3.2.2",
+    "node_modules/discontinuous-range": {
+      "version": "1.0.0",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "license": "MIT"
     },
-    "node_modules/expand-tilde": {
-      "version": "2.0.2",
+    "node_modules/doctrine": {
+      "version": "3.0.0",
       "dev": true,
-      "license": "MIT",
+      "license": "Apache-2.0",
       "dependencies": {
-        "homedir-polyfill": "^1.0.1"
+        "esutils": "^2.0.2"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/expect": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-27.3.1.tgz",
-      "integrity": "sha512-MrNXV2sL9iDRebWPGOGFdPQRl2eDQNu/uhxIMShjjx74T6kC6jFIkmQ6OqXDtevjGUkyB2IT56RzDBqXf/QPCg==",
+    "node_modules/dom-serialize": {
+      "version": "2.2.1",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jest/types": "^27.2.5",
-        "ansi-styles": "^5.0.0",
-        "jest-get-type": "^27.3.1",
-        "jest-matcher-utils": "^27.3.1",
-        "jest-message-util": "^27.3.1",
-        "jest-regex-util": "^27.0.6"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "custom-event": "~1.0.0",
+        "ent": "~2.2.0",
+        "extend": "^3.0.0",
+        "void-elements": "^2.0.0"
       }
     },
-    "node_modules/expect/node_modules/@jest/types": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-      "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+    "node_modules/dom-serializer": {
+      "version": "1.3.2",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.2.0",
+        "entities": "^2.0.0"
       },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
       }
     },
-    "node_modules/expect/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+    "node_modules/domelementtype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
       "dev": true,
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ]
     },
-    "node_modules/expect/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+    "node_modules/domhandler": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.2.tgz",
+      "integrity": "sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w==",
       "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.2.0"
+      },
       "engines": {
-        "node": ">=10"
+        "node": ">= 4"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
       }
     },
-    "node_modules/expect/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/dompurify": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.0.2.tgz",
+      "integrity": "sha512-B8c6JdiEpxAKnd8Dm++QQxJL4lfuc757scZtcapj6qjTjrQzyq5iAyznLKVvK+77eYNiFblHBlt7MM0fOeqoKw=="
+    },
+    "node_modules/domutils": {
+      "version": "2.7.0",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "dom-serializer": "^1.0.1",
+        "domelementtype": "^2.2.0",
+        "domhandler": "^4.2.0"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "url": "https://github.com/fb55/domutils?sponsor=1"
       }
     },
-    "node_modules/expect/node_modules/chalk/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/duplexer": {
+      "version": "0.1.2",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/ebnf-parser": {
+      "version": "0.1.10",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/ee-first": {
+      "version": "1.1.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/electron-to-chromium": {
+      "version": "1.4.823",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.823.tgz",
+      "integrity": "sha512-4h+oPeAiGQOHFyUJOqpoEcPj/xxlicxBzOErVeYVMMmAiXUXsGpsFd0QXBMaUUbnD8hhSfLf9uw+MlsoIA7j5w==",
+      "dev": true
+    },
+    "node_modules/emittery": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-1.0.1.tgz",
+      "integrity": "sha512-2ID6FdrMD9KDLldGesP6317G78K7km/kMcwItRtVFva7I/cSEOIaLpewaUb+YLXVwdAp3Ctfxh/V5zIl1sj7dQ==",
       "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=14.16"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
       }
     },
-    "node_modules/expect/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
       "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/expect/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "license": "MIT"
     },
-    "node_modules/expect/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/encodeurl": {
+      "version": "1.0.2",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/expect/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/end-of-stream": {
+      "version": "1.4.4",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "once": "^1.4.0"
       }
     },
-    "node_modules/express": {
-      "version": "4.17.1",
+    "node_modules/engine.io": {
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.5.4.tgz",
+      "integrity": "sha512-KdVSDKhVKyOi+r5uEabrDLZw2qXStVvCsEB/LN3mw4WFi6Gx50jTyuxYVCwAAC0U46FdnzP/ScKRBTXb/NiEOg==",
       "dev": true,
-      "license": "MIT",
       "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"
+        "@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.2.1",
+        "ws": "~8.11.0"
       },
       "engines": {
-        "node": ">= 0.10.0"
+        "node": ">=10.2.0"
       }
     },
-    "node_modules/express/node_modules/array-flatten": {
-      "version": "1.1.1",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/express/node_modules/debug": {
-      "version": "2.6.9",
+    "node_modules/engine.io-parser": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.1.tgz",
+      "integrity": "sha512-9JktcM3u18nU9N2Lz3bWeBgxVgOKpw7yhRaoxQA3FUDZzzw+9WlA6p4G4u0RixNkg14fH7EfEc/RhpurtiROTQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ms": "2.0.0"
+      "engines": {
+        "node": ">=10.0.0"
       }
     },
-    "node_modules/express/node_modules/ms": {
-      "version": "2.0.0",
+    "node_modules/engine.io/node_modules/cookie": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
+      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
       "dev": true,
-      "license": "MIT"
+      "engines": {
+        "node": ">= 0.6"
+      }
     },
-    "node_modules/express/node_modules/qs": {
-      "version": "6.7.0",
+    "node_modules/engine.io/node_modules/ws": {
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
+      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "engines": {
-        "node": ">=0.6"
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
       }
     },
-    "node_modules/extend": {
-      "version": "3.0.2",
+    "node_modules/ent": {
+      "version": "2.2.0",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/extend-shallow": {
-      "version": "3.0.2",
+    "node_modules/entities": {
+      "version": "2.2.0",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/enzyme": {
+      "version": "3.11.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
+        "array.prototype.flat": "^1.2.3",
+        "cheerio": "^1.0.0-rc.3",
+        "enzyme-shallow-equal": "^1.0.1",
+        "function.prototype.name": "^1.1.2",
+        "has": "^1.0.3",
+        "html-element-map": "^1.2.0",
+        "is-boolean-object": "^1.0.1",
+        "is-callable": "^1.1.5",
+        "is-number-object": "^1.0.4",
+        "is-regex": "^1.0.5",
+        "is-string": "^1.0.5",
+        "is-subset": "^0.1.1",
+        "lodash.escape": "^4.0.1",
+        "lodash.isequal": "^4.5.0",
+        "object-inspect": "^1.7.0",
+        "object-is": "^1.0.2",
+        "object.assign": "^4.1.0",
+        "object.entries": "^1.1.1",
+        "object.values": "^1.1.1",
+        "raf": "^3.4.1",
+        "rst-selector-parser": "^2.2.3",
+        "string.prototype.trim": "^1.2.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/extend-shallow/node_modules/is-extendable": {
-      "version": "1.0.1",
+    "node_modules/enzyme-adapter-preact-pure": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/enzyme-adapter-preact-pure/-/enzyme-adapter-preact-pure-4.1.0.tgz",
+      "integrity": "sha512-SifzvBGf1qUEs0FfCAOiKgDppb1wg/R+rmX8D7jFVpQ/Q2L3/xuyc1V575zoi8QAhIBDUB/8QUWvI4KZc50trw==",
+      "dev": true,
+      "peerDependencies": {
+        "enzyme": "^3.11.0",
+        "preact": "^10.0.0"
+      }
+    },
+    "node_modules/enzyme-shallow-equal": {
+      "version": "1.0.4",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "is-plain-object": "^2.0.4"
+        "has": "^1.0.3",
+        "object-is": "^1.1.2"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/extglob": {
-      "version": "2.0.4",
+    "node_modules/error": {
+      "version": "7.2.1",
       "dev": true,
-      "license": "MIT",
       "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"
+        "string-template": "~0.2.1"
+      }
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/es-abstract": {
+      "version": "1.23.3",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz",
+      "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==",
+      "dev": true,
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.1",
+        "arraybuffer.prototype.slice": "^1.0.3",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "data-view-buffer": "^1.0.1",
+        "data-view-byte-length": "^1.0.1",
+        "data-view-byte-offset": "^1.0.0",
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-set-tostringtag": "^2.0.3",
+        "es-to-primitive": "^1.2.1",
+        "function.prototype.name": "^1.1.6",
+        "get-intrinsic": "^1.2.4",
+        "get-symbol-description": "^1.0.2",
+        "globalthis": "^1.0.3",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2",
+        "has-proto": "^1.0.3",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.2",
+        "internal-slot": "^1.0.7",
+        "is-array-buffer": "^3.0.4",
+        "is-callable": "^1.2.7",
+        "is-data-view": "^1.0.1",
+        "is-negative-zero": "^2.0.3",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.3",
+        "is-string": "^1.0.7",
+        "is-typed-array": "^1.1.13",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.13.1",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.5",
+        "regexp.prototype.flags": "^1.5.2",
+        "safe-array-concat": "^1.1.2",
+        "safe-regex-test": "^1.0.3",
+        "string.prototype.trim": "^1.2.9",
+        "string.prototype.trimend": "^1.0.8",
+        "string.prototype.trimstart": "^1.0.8",
+        "typed-array-buffer": "^1.0.2",
+        "typed-array-byte-length": "^1.0.1",
+        "typed-array-byte-offset": "^1.0.2",
+        "typed-array-length": "^1.0.6",
+        "unbox-primitive": "^1.0.2",
+        "which-typed-array": "^1.1.15"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/extglob/node_modules/define-property": {
+    "node_modules/es-define-property": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "is-descriptor": "^1.0.0"
+        "get-intrinsic": "^1.2.4"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/extglob/node_modules/extend-shallow": {
-      "version": "2.0.1",
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/extglob/node_modules/is-accessor-descriptor": {
-      "version": "1.0.0",
+    "node_modules/es-iterator-helpers": {
+      "version": "1.0.19",
+      "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.19.tgz",
+      "integrity": "sha512-zoMwbCcH5hwUkKJkT8kDIBZSz9I6mVG//+lDCinLCGov4+r7NIy0ld8o03M0cJxl2spVf6ESYVS6/gpIfq1FFw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "kind-of": "^6.0.0"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.3",
+        "es-errors": "^1.3.0",
+        "es-set-tostringtag": "^2.0.3",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "globalthis": "^1.0.3",
+        "has-property-descriptors": "^1.0.2",
+        "has-proto": "^1.0.3",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.7",
+        "iterator.prototype": "^1.1.2",
+        "safe-array-concat": "^1.1.2"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/extglob/node_modules/is-data-descriptor": {
+    "node_modules/es-module-lexer": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz",
+      "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==",
+      "dev": true
+    },
+    "node_modules/es-object-atoms": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
+      "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "kind-of": "^6.0.0"
+        "es-errors": "^1.3.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/extglob/node_modules/is-descriptor": {
-      "version": "1.0.2",
+    "node_modules/es-set-tostringtag": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz",
+      "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
+        "get-intrinsic": "^1.2.4",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/extsprintf": {
-      "version": "1.3.0",
+    "node_modules/es-shim-unscopables": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
+      "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
       "dev": true,
-      "engines": [
-        "node >=0.6.0"
-      ],
-      "license": "MIT"
+      "dependencies": {
+        "hasown": "^2.0.0"
+      }
     },
-    "node_modules/fancy-log": {
-      "version": "1.3.3",
+    "node_modules/es-to-primitive": {
+      "version": "1.2.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-gray": "^0.1.1",
-        "color-support": "^1.1.3",
-        "parse-node-version": "^1.0.0",
-        "time-stamp": "^1.0.0"
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
       },
       "engines": {
-        "node": ">= 0.10"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
+    "node_modules/esbuild": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.24.2.tgz",
+      "integrity": "sha512-+9egpBW8I3CD5XPe0n6BfT5fxLzxrlDzqydF3aviG+9ni1lDC/OvMHcxqEFV0+LANZG5R1bFMWfUrjVsdwxJvA==",
       "dev": true,
-      "license": "MIT"
+      "hasInstallScript": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.24.2",
+        "@esbuild/android-arm": "0.24.2",
+        "@esbuild/android-arm64": "0.24.2",
+        "@esbuild/android-x64": "0.24.2",
+        "@esbuild/darwin-arm64": "0.24.2",
+        "@esbuild/darwin-x64": "0.24.2",
+        "@esbuild/freebsd-arm64": "0.24.2",
+        "@esbuild/freebsd-x64": "0.24.2",
+        "@esbuild/linux-arm": "0.24.2",
+        "@esbuild/linux-arm64": "0.24.2",
+        "@esbuild/linux-ia32": "0.24.2",
+        "@esbuild/linux-loong64": "0.24.2",
+        "@esbuild/linux-mips64el": "0.24.2",
+        "@esbuild/linux-ppc64": "0.24.2",
+        "@esbuild/linux-riscv64": "0.24.2",
+        "@esbuild/linux-s390x": "0.24.2",
+        "@esbuild/linux-x64": "0.24.2",
+        "@esbuild/netbsd-arm64": "0.24.2",
+        "@esbuild/netbsd-x64": "0.24.2",
+        "@esbuild/openbsd-arm64": "0.24.2",
+        "@esbuild/openbsd-x64": "0.24.2",
+        "@esbuild/sunos-x64": "0.24.2",
+        "@esbuild/win32-arm64": "0.24.2",
+        "@esbuild/win32-ia32": "0.24.2",
+        "@esbuild/win32-x64": "0.24.2"
+      }
     },
-    "node_modules/fast-diff": {
-      "version": "1.2.0",
+    "node_modules/escalade": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
+      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
       "dev": true,
-      "license": "Apache-2.0"
+      "engines": {
+        "node": ">=6"
+      }
     },
-    "node_modules/fast-glob": {
-      "version": "3.2.7",
+    "node_modules/escape-html": {
+      "version": "1.0.3",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
       "dev": true,
       "license": "MIT",
-      "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"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.8.0"
       }
     },
-    "node_modules/fast-json-stable-stringify": {
+    "node_modules/escodegen": {
       "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
+      "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
       "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/fast-levenshtein": {
-      "version": "2.0.6",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/fast-text-encoding": {
-      "version": "1.0.3",
-      "dev": true,
-      "license": "Apache-2.0"
-    },
-    "node_modules/fast-url-parser": {
-      "version": "1.1.3",
-      "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "punycode": "^1.3.2"
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
+        "esutils": "^2.0.2"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
       }
     },
-    "node_modules/fast-url-parser/node_modules/punycode": {
-      "version": "1.4.1",
+    "node_modules/escodegen/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
-      "license": "MIT"
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "node_modules/fastparse": {
-      "version": "1.1.2",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/eslint": {
+      "version": "8.57.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz",
+      "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.6.1",
+        "@eslint/eslintrc": "^2.1.4",
+        "@eslint/js": "8.57.1",
+        "@humanwhocodes/config-array": "^0.13.0",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
+        "@ungap/structured-clone": "^1.2.0",
+        "ajv": "^6.12.4",
+        "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.2.2",
+        "eslint-visitor-keys": "^3.4.3",
+        "espree": "^9.6.1",
+        "esquery": "^1.4.2",
+        "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",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.2.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
+        "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.3",
+        "strip-ansi": "^6.0.1",
+        "text-table": "^0.2.0"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
     },
-    "node_modules/fastq": {
-      "version": "1.8.0",
+    "node_modules/eslint-config-prettier": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz",
+      "integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "reusify": "^1.0.4"
+      "bin": {
+        "eslint-config-prettier": "bin/cli.js"
+      },
+      "peerDependencies": {
+        "eslint": ">=7.0.0"
       }
     },
-    "node_modules/faye-websocket": {
-      "version": "0.10.0",
+    "node_modules/eslint-import-resolver-babel-module": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-babel-module/-/eslint-import-resolver-babel-module-5.3.2.tgz",
+      "integrity": "sha512-K7D8n0O6p/JJncPote8yiuB7chJfu26Yn/Q3gzT53cNzJNS0NUCkI0iuimj4/vWVRHVQvPnYWeq07V8RvKjz/A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "websocket-driver": ">=0.5.1"
+        "pkg-up": "^3.1.0",
+        "resolve": "^1.20.0"
       },
       "engines": {
-        "node": ">=0.4.0"
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0",
+        "babel-plugin-module-resolver": "^3.0.0 || ^4.0.0 || ^5.0.0"
       }
     },
-    "node_modules/fb-watchman": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
-      "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
+    "node_modules/eslint-import-resolver-node": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
+      "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
       "dev": true,
       "dependencies": {
-        "bser": "2.1.1"
+        "debug": "^3.2.7",
+        "is-core-module": "^2.13.0",
+        "resolve": "^1.22.4"
       }
     },
-    "node_modules/fetch-mock": {
-      "version": "9.11.0",
+    "node_modules/eslint-import-resolver-node/node_modules/debug": {
+      "version": "3.2.7",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/core": "^7.0.0",
-        "@babel/runtime": "^7.0.0",
-        "core-js": "^3.0.0",
-        "debug": "^4.1.1",
-        "glob-to-regexp": "^0.4.0",
-        "is-subset": "^0.1.1",
-        "lodash.isequal": "^4.5.0",
-        "path-to-regexp": "^2.2.1",
-        "querystring": "^0.2.0",
-        "whatwg-url": "^6.5.0"
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-module-utils": {
+      "version": "2.12.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz",
+      "integrity": "sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.7"
       },
       "engines": {
-        "node": ">=4.0.0"
-      },
-      "funding": {
-        "type": "charity",
-        "url": "https://www.justgiving.com/refugee-support-europe"
-      },
-      "peerDependencies": {
-        "node-fetch": "*"
+        "node": ">=4"
       },
       "peerDependenciesMeta": {
-        "node-fetch": {
+        "eslint": {
           "optional": true
         }
       }
     },
-    "node_modules/fetch-mock/node_modules/path-to-regexp": {
-      "version": "2.4.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/fetch-mock/node_modules/tr46": {
-      "version": "1.0.1",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "punycode": "^2.1.0"
+        "ms": "^2.1.1"
       }
     },
-    "node_modules/fetch-mock/node_modules/webidl-conversions": {
-      "version": "4.0.2",
+    "node_modules/eslint-plugin-chai-expect": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-chai-expect/-/eslint-plugin-chai-expect-3.1.0.tgz",
+      "integrity": "sha512-a9F8b38hhJsR7fgDEfyMxppZXCnCW6OOHj7cQfygsm9guXqdSzfpwrHX5FT93gSExDqD71HQglF1lLkGBwhJ+g==",
       "dev": true,
-      "license": "BSD-2-Clause"
+      "engines": {
+        "node": "10.* || 12.* || || 14.* || 16.* || >= 18.*"
+      },
+      "peerDependencies": {
+        "eslint": ">=2.0.0 <= 9.x"
+      }
     },
-    "node_modules/fetch-mock/node_modules/whatwg-url": {
-      "version": "6.5.0",
+    "node_modules/eslint-plugin-eslint-plugin": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-eslint-plugin/-/eslint-plugin-eslint-plugin-5.5.1.tgz",
+      "integrity": "sha512-9AmfZzcQ7QHwpzfAQpZ7xdtwHYViylmlnruCH0aV64/tuoH3igGXg91vr0e6ShLf/mrAYGqLw5LZ/gOxJeRXnw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "lodash.sortby": "^4.7.0",
-        "tr46": "^1.0.1",
-        "webidl-conversions": "^4.0.2"
+        "eslint-utils": "^3.0.0",
+        "estraverse": "^5.3.0"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.0.0 || >= 18.0.0"
+      },
+      "peerDependencies": {
+        "eslint": ">=7.0.0"
       }
     },
-    "node_modules/figures": {
-      "version": "3.2.0",
+    "node_modules/eslint-plugin-import": {
+      "version": "2.31.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz",
+      "integrity": "sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "escape-string-regexp": "^1.0.5"
+        "@rtsao/scc": "^1.1.0",
+        "array-includes": "^3.1.8",
+        "array.prototype.findlastindex": "^1.2.5",
+        "array.prototype.flat": "^1.3.2",
+        "array.prototype.flatmap": "^1.3.2",
+        "debug": "^3.2.7",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.9",
+        "eslint-module-utils": "^2.12.0",
+        "hasown": "^2.0.2",
+        "is-core-module": "^2.15.1",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.fromentries": "^2.0.8",
+        "object.groupby": "^1.0.3",
+        "object.values": "^1.2.0",
+        "semver": "^6.3.1",
+        "string.prototype.trimend": "^1.0.8",
+        "tsconfig-paths": "^3.15.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "peerDependencies": {
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9"
       }
     },
-    "node_modules/file-entry-cache": {
-      "version": "6.0.1",
+    "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==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "flat-cache": "^3.0.4"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "ms": "^2.1.1"
       }
     },
-    "node_modules/fill-range": {
-      "version": "7.0.1",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "to-regex-range": "^5.0.1"
+        "esutils": "^2.0.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/finalhandler": {
-      "version": "1.1.2",
+    "node_modules/eslint-plugin-import/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
-      "license": "MIT",
       "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"
+        "brace-expansion": "^1.1.7"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": "*"
       }
     },
-    "node_modules/finalhandler/node_modules/debug": {
-      "version": "2.6.9",
+    "node_modules/eslint-plugin-import/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ms": "2.0.0"
+      "bin": {
+        "semver": "bin/semver.js"
       }
     },
-    "node_modules/finalhandler/node_modules/ms": {
-      "version": "2.0.0",
+    "node_modules/eslint-plugin-jasmine": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jasmine/-/eslint-plugin-jasmine-4.2.2.tgz",
+      "integrity": "sha512-nALbewRk63uz28UGNhUTJyd6GofXxVNFpWFNAwr9ySc6kpSRIoO4suwZqIYz3cfJmCacilmjp7+1Ocjr7zRagA==",
       "dev": true,
-      "license": "MIT"
+      "engines": {
+        "node": ">=8",
+        "npm": ">=6"
+      }
     },
-    "node_modules/find-babel-config": {
-      "version": "1.2.0",
+    "node_modules/eslint-plugin-jsdoc": {
+      "version": "48.11.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-48.11.0.tgz",
+      "integrity": "sha512-d12JHJDPNo7IFwTOAItCeJY1hcqoIxE0lHA8infQByLilQ9xkqrRa6laWCnsuCrf+8rUnvxXY1XuTbibRBNylA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "json5": "^0.5.1",
-        "path-exists": "^3.0.0"
+        "@es-joy/jsdoccomment": "~0.46.0",
+        "are-docs-informative": "^0.0.2",
+        "comment-parser": "1.4.1",
+        "debug": "^4.3.5",
+        "escape-string-regexp": "^4.0.0",
+        "espree": "^10.1.0",
+        "esquery": "^1.6.0",
+        "parse-imports": "^2.1.1",
+        "semver": "^7.6.3",
+        "spdx-expression-parse": "^4.0.0",
+        "synckit": "^0.9.1"
       },
       "engines": {
-        "node": ">=4.0.0"
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0"
       }
     },
-    "node_modules/find-babel-config/node_modules/json5": {
-      "version": "0.5.1",
+    "node_modules/eslint-plugin-jsdoc/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==",
       "dev": true,
-      "license": "MIT",
-      "bin": {
-        "json5": "lib/cli.js"
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/find-cache-dir": {
-      "version": "2.1.0",
+    "node_modules/eslint-plugin-jsdoc/node_modules/eslint-visitor-keys": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz",
+      "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "commondir": "^1.0.1",
-        "make-dir": "^2.0.0",
-        "pkg-dir": "^3.0.0"
-      },
       "engines": {
-        "node": ">=6"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/find-cache-dir/node_modules/find-up": {
-      "version": "3.0.0",
+    "node_modules/eslint-plugin-jsdoc/node_modules/espree": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-10.1.0.tgz",
+      "integrity": "sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "locate-path": "^3.0.0"
+        "acorn": "^8.12.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^4.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/find-cache-dir/node_modules/locate-path": {
-      "version": "3.0.0",
+    "node_modules/eslint-plugin-jsdoc/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
+      "bin": {
+        "semver": "bin/semver.js"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=10"
       }
     },
-    "node_modules/find-cache-dir/node_modules/make-dir": {
-      "version": "2.1.0",
+    "node_modules/eslint-plugin-local": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-local/-/eslint-plugin-local-4.2.2.tgz",
+      "integrity": "sha512-9yNacxuEAVw2nYGCAj+ofx74cWODq7N7jcajlq1tzz6xuJS0WFhp72s/WSvIyJG6b/75+n63SKxUFVrt1UHmfQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "pify": "^4.0.1",
-        "semver": "^5.6.0"
+        "@thisismanta/pessimist": "^1.2.0",
+        "chalk": "^4.0.0"
       },
-      "engines": {
-        "node": ">=6"
+      "bin": {
+        "eslint-plugin-local": "executable.js"
+      },
+      "peerDependencies": {
+        "eslint": ">=6.0.0"
       }
     },
-    "node_modules/find-cache-dir/node_modules/p-locate": {
-      "version": "3.0.0",
+    "node_modules/eslint-plugin-local/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "p-limit": "^2.0.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/find-cache-dir/node_modules/pify": {
-      "version": "4.0.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/find-cache-dir/node_modules/pkg-dir": {
-      "version": "3.0.0",
+    "node_modules/eslint-plugin-local/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "find-up": "^3.0.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/find-cache-dir/node_modules/semver": {
-      "version": "5.7.1",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/find-up": {
-      "version": "4.1.0",
+    "node_modules/eslint-plugin-local/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/find-up/node_modules/path-exists": {
+    "node_modules/eslint-plugin-local/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/eslint-plugin-local/node_modules/has-flag": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/findup-sync": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
-      "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
+    "node_modules/eslint-plugin-local/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
-        "detect-file": "^1.0.0",
-        "is-glob": "^3.1.0",
-        "micromatch": "^3.0.4",
-        "resolve-dir": "^1.0.1"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">= 0.10"
+        "node": ">=8"
       }
     },
-    "node_modules/findup-sync/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+    "node_modules/eslint-plugin-module-resolver": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-module-resolver/-/eslint-plugin-module-resolver-1.5.0.tgz",
+      "integrity": "sha512-fz8oVazFk5jfZRCBgURDIM955QufKePsGNgpu+z/HWedy9HII6jir1PGts+p27rCWWwSw2LXoxS4xll2WH17fw==",
+      "dev": true
+    },
+    "node_modules/eslint-plugin-prettier": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.2.1.tgz",
+      "integrity": "sha512-gH3iR3g4JfF+yYPaJYkN7jEl9QbweL/YfkoRlNnuIEHEz1vHVlCmWOS+eGGiRuzHQXdJFCOTxRgvju9b8VUmrw==",
       "dev": true,
       "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"
+        "prettier-linter-helpers": "^1.0.0",
+        "synckit": "^0.9.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint-plugin-prettier"
+      },
+      "peerDependencies": {
+        "@types/eslint": ">=8.0.0",
+        "eslint": ">=8.0.0",
+        "eslint-config-prettier": "*",
+        "prettier": ">=3.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/eslint": {
+          "optional": true
+        },
+        "eslint-config-prettier": {
+          "optional": true
+        }
       }
     },
-    "node_modules/findup-sync/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+    "node_modules/eslint-plugin-react": {
+      "version": "7.37.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.1.tgz",
+      "integrity": "sha512-xwTnwDqzbDRA8uJ7BMxPs/EXRB3i8ZfnOIp8BsxEQkT0nHPp+WWceqGgo6rKb9ctNi8GJLDT4Go5HAWELa/WMg==",
       "dev": true,
       "dependencies": {
-        "is-extendable": "^0.1.0"
+        "array-includes": "^3.1.8",
+        "array.prototype.findlast": "^1.2.5",
+        "array.prototype.flatmap": "^1.3.2",
+        "array.prototype.tosorted": "^1.1.4",
+        "doctrine": "^2.1.0",
+        "es-iterator-helpers": "^1.0.19",
+        "estraverse": "^5.3.0",
+        "hasown": "^2.0.2",
+        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
+        "minimatch": "^3.1.2",
+        "object.entries": "^1.1.8",
+        "object.fromentries": "^2.0.8",
+        "object.values": "^1.2.0",
+        "prop-types": "^15.8.1",
+        "resolve": "^2.0.0-next.5",
+        "semver": "^6.3.1",
+        "string.prototype.matchall": "^4.0.11",
+        "string.prototype.repeat": "^1.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7"
       }
     },
-    "node_modules/findup-sync/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+    "node_modules/eslint-plugin-react-hooks": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz",
+      "integrity": "sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==",
       "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0"
       }
     },
-    "node_modules/findup-sync/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+    "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": {
-        "is-extendable": "^0.1.0"
+        "esutils": "^2.0.2"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/findup-sync/node_modules/is-glob": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+    "node_modules/eslint-plugin-react/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
       "dependencies": {
-        "is-extglob": "^2.1.0"
+        "brace-expansion": "^1.1.7"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "*"
       }
     },
-    "node_modules/findup-sync/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+    "node_modules/eslint-plugin-react/node_modules/resolve": {
+      "version": "2.0.0-next.5",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz",
+      "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==",
       "dev": true,
       "dependencies": {
-        "kind-of": "^3.0.2"
+        "is-core-module": "^2.13.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/findup-sync/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+    "node_modules/eslint-plugin-react/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+      "bin": {
+        "semver": "bin/semver.js"
       }
     },
-    "node_modules/findup-sync/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+    "node_modules/eslint-plugin-sort-destructure-keys": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-sort-destructure-keys/-/eslint-plugin-sort-destructure-keys-1.6.0.tgz",
+      "integrity": "sha512-cdjR/+D6RlMSgOcDA48nXOF5S+fMKhVFgJs9n59PZVH7dv5xzeCReujM9Qkwcz4jiHt5GPti5wjCJpM58CMmkg==",
       "dev": 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"
+        "natural-compare-lite": "^1.4.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "eslint": "3 - 9"
       }
     },
-    "node_modules/findup-sync/node_modules/to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+    "node_modules/eslint-scope": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
       "dev": true,
       "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/flat": {
-      "version": "5.0.2",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "bin": {
-        "flat": "cli.js"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/flat-cache": {
-      "version": "3.0.4",
+    "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==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
+        "eslint-visitor-keys": "^2.0.0"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      },
+      "peerDependencies": {
+        "eslint": ">=5"
       }
     },
-    "node_modules/flat-cache/node_modules/flatted": {
-      "version": "3.2.2",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/flatted": {
-      "version": "2.0.2",
+    "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==",
       "dev": true,
-      "license": "ISC"
+      "engines": {
+        "node": ">=10"
+      }
     },
-    "node_modules/flow-parser": {
-      "version": "0.158.0",
+    "node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=0.4.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/flush-write-stream": {
-      "version": "1.1.1",
+    "node_modules/eslint/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,
-      "license": "MIT",
       "dependencies": {
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.3.6"
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/follow-redirects": {
-      "version": "1.14.2",
+    "node_modules/eslint/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/RubenVerborgh"
-        }
-      ],
-      "license": "MIT",
-      "engines": {
-        "node": ">=4.0"
+      "dependencies": {
+        "color-convert": "^2.0.1"
       },
-      "peerDependenciesMeta": {
-        "debug": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/for-in": {
-      "version": "1.0.2",
-      "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/foreach": {
-      "version": "2.0.5",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/eslint/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/forever-agent": {
-      "version": "0.6.1",
+    "node_modules/eslint/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
-      "license": "Apache-2.0",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
       "engines": {
-        "node": "*"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/form-data": {
-      "version": "2.3.3",
+    "node_modules/eslint/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">= 0.12"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/formidable": {
-      "version": "1.2.2",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "url": "https://ko-fi.com/tunnckoCore/commissions"
-      }
+    "node_modules/eslint/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
-    "node_modules/forwarded": {
-      "version": "0.1.2",
+    "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==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/fraction.js": {
-      "version": "4.1.1",
+    "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==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      },
       "engines": {
-        "node": "*"
+        "node": ">=10"
       },
       "funding": {
-        "type": "patreon",
-        "url": "https://www.patreon.com/infusion"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/fragment-cache": {
-      "version": "0.2.1",
+    "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==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "map-cache": "^0.2.2"
+        "is-glob": "^4.0.3"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10.13.0"
       }
     },
-    "node_modules/fresh": {
-      "version": "0.5.2",
+    "node_modules/eslint/node_modules/globals": {
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/from": {
-      "version": "0.1.7",
+    "node_modules/eslint/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "license": "MIT"
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/fs-extra": {
-      "version": "10.0.0",
+    "node_modules/eslint/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,
-      "license": "MIT",
       "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
+        "argparse": "^2.0.1"
       },
-      "engines": {
-        "node": ">=12"
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/fs-extra/node_modules/universalify": {
-      "version": "2.0.0",
+    "node_modules/eslint/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/eslint/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,
-      "license": "MIT",
+      "dependencies": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      },
       "engines": {
-        "node": ">= 10.0.0"
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/fs-minipass": {
-      "version": "2.1.0",
+    "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,
-      "license": "ISC",
       "dependencies": {
-        "minipass": "^3.0.0"
+        "p-locate": "^5.0.0"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/fs-mkdirp-stream": {
-      "version": "1.0.0",
+    "node_modules/eslint/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "graceful-fs": "^4.1.11",
-        "through2": "^2.0.3"
+        "brace-expansion": "^1.1.7"
       },
       "engines": {
-        "node": ">= 0.10"
+        "node": "*"
       }
     },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
+    "node_modules/eslint/node_modules/optionator": {
+      "version": "0.9.4",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+      "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
       "dev": true,
-      "license": "ISC"
+      "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.5"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
     },
-    "node_modules/fsevents": {
-      "version": "2.3.2",
+    "node_modules/eslint/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,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
       "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/function-bind": {
-      "version": "1.1.1",
-      "license": "MIT"
-    },
-    "node_modules/function.prototype.name": {
-      "version": "1.1.2",
-      "license": "MIT",
+    "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==",
+      "dev": true,
       "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1",
-        "functions-have-names": "^1.2.0"
+        "p-limit": "^3.0.2"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/functional-red-black-tree": {
-      "version": "1.0.1",
+    "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,
-      "license": "MIT"
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/functions-have-names": {
+    "node_modules/eslint/node_modules/prelude-ls": {
       "version": "1.2.1",
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/gaxios": {
-      "version": "4.3.2",
+    "node_modules/eslint/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
-        "abort-controller": "^3.0.0",
-        "extend": "^3.0.2",
-        "https-proxy-agent": "^5.0.0",
-        "is-stream": "^2.0.0",
-        "node-fetch": "^2.6.1"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=8"
       }
     },
-    "node_modules/gcp-metadata": {
-      "version": "4.3.1",
+    "node_modules/eslint/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,
-      "license": "Apache-2.0",
       "dependencies": {
-        "gaxios": "^4.0.0",
-        "json-bigint": "^1.0.0"
+        "prelude-ls": "^1.2.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/gcs-resumable-upload": {
-      "version": "3.3.1",
+    "node_modules/espree": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "abort-controller": "^3.0.0",
-        "configstore": "^5.0.0",
-        "extend": "^3.0.2",
-        "gaxios": "^4.0.0",
-        "google-auth-library": "^7.0.0",
-        "pumpify": "^2.0.0",
-        "stream-events": "^1.0.4"
+        "acorn": "^8.9.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.4.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "dev": true,
+      "license": "BSD-2-Clause",
       "bin": {
-        "gcs-upload": "build/src/cli.js"
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=4"
       }
     },
-    "node_modules/gcs-resumable-upload/node_modules/duplexify": {
-      "version": "4.1.2",
+    "node_modules/esquery": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
+      "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "end-of-stream": "^1.4.1",
-        "inherits": "^2.0.3",
-        "readable-stream": "^3.1.1",
-        "stream-shift": "^1.0.0"
-      }
-    },
-    "node_modules/gcs-resumable-upload/node_modules/pumpify": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "duplexify": "^4.1.1",
-        "inherits": "^2.0.3",
-        "pump": "^3.0.0"
+        "estraverse": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
       }
     },
-    "node_modules/gcs-resumable-upload/node_modules/readable-stream": {
-      "version": "3.6.0",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
+        "estraverse": "^5.2.0"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">=4.0"
       }
     },
-    "node_modules/gensync": {
-      "version": "1.0.0-beta.2",
+    "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,
-      "license": "MIT",
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=4.0"
       }
     },
-    "node_modules/get-caller-file": {
-      "version": "2.0.5",
+    "node_modules/estree-walker": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+      "dev": true
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
       "dev": true,
-      "license": "ISC",
+      "license": "BSD-2-Clause",
       "engines": {
-        "node": "6.* || 8.* || >= 10.*"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/get-func-name": {
-      "version": "2.0.0",
+    "node_modules/etag": {
+      "version": "1.8.1",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": "*"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/get-intrinsic": {
-      "version": "1.0.2",
+    "node_modules/event-stream": {
+      "version": "4.0.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "duplexer": "^0.1.1",
+        "from": "^0.1.7",
+        "map-stream": "0.0.7",
+        "pause-stream": "^0.0.11",
+        "split": "^1.0.1",
+        "stream-combiner": "^0.2.2",
+        "through": "^2.3.8"
       }
     },
-    "node_modules/get-package-type": {
-      "version": "0.1.0",
+    "node_modules/eventemitter3": {
+      "version": "4.0.7",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8.0.0"
-      }
+      "license": "MIT"
     },
-    "node_modules/get-port": {
-      "version": "3.2.0",
+    "node_modules/events": {
+      "version": "3.3.0",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=4"
+        "node": ">=0.8.x"
       }
     },
-    "node_modules/get-stream": {
-      "version": "4.1.0",
+    "node_modules/execa": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/get-symbol-description": {
-      "version": "1.0.0",
-      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
+        "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"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
       }
     },
-    "node_modules/get-symbol-description/node_modules/get-intrinsic": {
-      "version": "1.1.1",
-      "license": "MIT",
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "node_modules/exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/get-value": {
-      "version": "2.0.6",
+    "node_modules/expand-range": {
+      "version": "1.8.2",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "fill-range": "^2.1.0"
+      },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/getpass": {
-      "version": "0.1.7",
+    "node_modules/expand-range/node_modules/fill-range": {
+      "version": "2.2.4",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "assert-plus": "^1.0.0"
+        "is-number": "^2.1.0",
+        "isobject": "^2.0.0",
+        "randomatic": "^3.0.0",
+        "repeat-element": "^1.1.2",
+        "repeat-string": "^1.5.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/glob": {
-      "version": "7.1.6",
+    "node_modules/expand-range/node_modules/is-number": {
+      "version": "2.1.0",
       "dev": true,
-      "license": "ISC",
+      "license": "MIT",
       "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"
+        "kind-of": "^3.0.2"
       },
       "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/glob-parent": {
-      "version": "5.1.2",
+    "node_modules/expand-range/node_modules/isobject": {
+      "version": "2.1.0",
       "dev": true,
-      "license": "ISC",
+      "license": "MIT",
       "dependencies": {
-        "is-glob": "^4.0.1"
+        "isarray": "1.0.0"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/glob-stream": {
-      "version": "6.1.0",
+    "node_modules/expand-range/node_modules/kind-of": {
+      "version": "3.2.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "extend": "^3.0.0",
-        "glob": "^7.1.1",
-        "glob-parent": "^3.1.0",
-        "is-negated-glob": "^1.0.0",
-        "ordered-read-streams": "^1.0.0",
-        "pumpify": "^1.3.5",
-        "readable-stream": "^2.1.5",
-        "remove-trailing-separator": "^1.0.1",
-        "to-absolute-glob": "^2.0.0",
-        "unique-stream": "^2.0.2"
+        "is-buffer": "^1.1.5"
       },
       "engines": {
-        "node": ">= 0.10"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/glob-stream/node_modules/glob-parent": {
-      "version": "3.1.0",
+    "node_modules/expect": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
+      "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
+        "@jest/expect-utils": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/glob-stream/node_modules/is-glob": {
-      "version": "3.1.0",
+    "node_modules/expect/node_modules/@jest/types": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "is-extglob": "^2.1.0"
+        "@jest/schemas": "^29.6.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/glob-to-regexp": {
-      "version": "0.4.1",
+    "node_modules/expect/node_modules/@types/yargs": {
+      "version": "17.0.32",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
       "dev": true,
-      "license": "BSD-2-Clause"
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
     },
-    "node_modules/global-cache": {
-      "version": "1.2.1",
-      "license": "MIT",
+    "node_modules/expect/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
       "dependencies": {
-        "define-properties": "^1.1.2",
-        "is-symbol": "^1.0.1"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/global-dirs": {
-      "version": "3.0.0",
+    "node_modules/expect/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "ini": "2.0.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
         "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/global-dirs/node_modules/ini": {
-      "version": "2.0.0",
+    "node_modules/expect/node_modules/ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
       "dev": true,
-      "license": "ISC",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
       "engines": {
-        "node": ">=10"
+        "node": ">=8"
       }
     },
-    "node_modules/global-modules": {
-      "version": "1.0.0",
+    "node_modules/expect/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "global-prefix": "^1.0.1",
-        "is-windows": "^1.0.1",
-        "resolve-dir": "^1.0.0"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/global-prefix": {
-      "version": "1.0.2",
+    "node_modules/expect/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/expect/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/expect/node_modules/jest-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "expand-tilde": "^2.0.2",
-        "homedir-polyfill": "^1.0.1",
-        "ini": "^1.3.4",
-        "is-windows": "^1.0.1",
-        "which": "^1.2.14"
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/globals": {
-      "version": "11.12.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/globby": {
-      "version": "11.0.4",
+    "node_modules/expect/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
-      "license": "MIT",
       "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"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=8"
       }
     },
-    "node_modules/google-auth-library": {
-      "version": "7.10.0",
+    "node_modules/express": {
+      "version": "4.20.0",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.20.0.tgz",
+      "integrity": "sha512-pLdae7I6QqShF5PnNTCVn4hI91Dx0Grkn2+IAsMTgMIKuQVte2dN9PeGSSAME2FR8anOhVA62QDIUaWVfEXVLw==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
-        "arrify": "^2.0.0",
-        "base64-js": "^1.3.0",
-        "ecdsa-sig-formatter": "^1.0.11",
-        "fast-text-encoding": "^1.0.0",
-        "gaxios": "^4.0.0",
-        "gcp-metadata": "^4.2.0",
-        "gtoken": "^5.0.4",
-        "jws": "^4.0.0",
-        "lru-cache": "^6.0.0"
+        "accepts": "~1.3.8",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.20.3",
+        "content-disposition": "0.5.4",
+        "content-type": "~1.0.4",
+        "cookie": "0.6.0",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "encodeurl": "~2.0.0",
+        "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.3",
+        "methods": "~1.1.2",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "0.1.10",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.11.0",
+        "range-parser": "~1.2.1",
+        "safe-buffer": "5.2.1",
+        "send": "0.19.0",
+        "serve-static": "1.16.0",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "type-is": "~1.6.18",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">= 0.10.0"
       }
     },
-    "node_modules/google-closure-library": {
-      "version": "20210808.0.0",
-      "license": "Apache-2.0"
-    },
-    "node_modules/google-p12-pem": {
-      "version": "3.1.2",
+    "node_modules/express/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "node-forge": "^0.10.0"
-      },
-      "bin": {
-        "gp12-pem": "build/src/bin/gp12-pem.js"
-      },
-      "engines": {
-        "node": ">=10"
+        "ms": "2.0.0"
       }
     },
-    "node_modules/got": {
-      "version": "9.6.0",
+    "node_modules/express/node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@sindresorhus/is": "^0.14.0",
-        "@szmarczak/http-timer": "^1.1.2",
-        "cacheable-request": "^6.0.0",
-        "decompress-response": "^3.3.0",
-        "duplexer3": "^0.1.4",
-        "get-stream": "^4.1.0",
-        "lowercase-keys": "^1.0.1",
-        "mimic-response": "^1.0.1",
-        "p-cancelable": "^1.0.0",
-        "to-readable-stream": "^1.0.0",
-        "url-parse-lax": "^3.0.0"
-      },
       "engines": {
-        "node": ">=8.6"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/graceful-fs": {
-      "version": "4.2.4",
+    "node_modules/express/node_modules/destroy": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
       "dev": true,
-      "license": "ISC"
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
     },
-    "node_modules/gray-matter": {
-      "version": "2.1.1",
+    "node_modules/express/node_modules/encodeurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-red": "^0.1.1",
-        "coffee-script": "^1.12.4",
-        "extend-shallow": "^2.0.1",
-        "js-yaml": "^3.8.1",
-        "toml": "^2.3.2"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/gray-matter/node_modules/extend-shallow": {
-      "version": "2.0.1",
+    "node_modules/express/node_modules/finalhandler": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "is-extendable": "^0.1.0"
+        "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"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/growl": {
-      "version": "1.10.5",
+    "node_modules/express/node_modules/finalhandler/node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=4.x"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/gtoken": {
-      "version": "5.3.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "gaxios": "^4.0.0",
-        "google-p12-pem": "^3.0.3",
-        "jws": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
+    "node_modules/express/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
     },
-    "node_modules/gulp-connect": {
-      "version": "5.7.0",
+    "node_modules/express/node_modules/on-finished": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "ansi-colors": "^2.0.5",
-        "connect": "^3.6.6",
-        "connect-livereload": "^0.6.0",
-        "fancy-log": "^1.3.2",
-        "map-stream": "^0.0.7",
-        "send": "^0.16.2",
-        "serve-index": "^1.9.1",
-        "serve-static": "^1.13.2",
-        "tiny-lr": "^1.1.1"
+        "ee-first": "1.1.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/gulp-connect/node_modules/ansi-colors": {
-      "version": "2.0.5",
+    "node_modules/express/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
     },
-    "node_modules/gulp-connect/node_modules/debug": {
-      "version": "2.6.9",
+    "node_modules/express/node_modules/send": {
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
+      "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "ms": "2.0.0"
+        "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"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/gulp-connect/node_modules/http-errors": {
-      "version": "1.6.3",
+    "node_modules/express/node_modules/send/node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.0",
-        "statuses": ">= 1.4.0 < 2"
-      },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/gulp-connect/node_modules/inherits": {
-      "version": "2.0.3",
-      "dev": true,
-      "license": "ISC"
+    "node_modules/express/node_modules/send/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true
     },
-    "node_modules/gulp-connect/node_modules/mime": {
-      "version": "1.4.1",
+    "node_modules/express/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
       "dev": true,
-      "license": "MIT",
-      "bin": {
-        "mime": "cli.js"
+      "engines": {
+        "node": ">= 0.8"
       }
     },
-    "node_modules/gulp-connect/node_modules/ms": {
-      "version": "2.0.0",
+    "node_modules/extend": {
+      "version": "3.0.2",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/gulp-connect/node_modules/send": {
-      "version": "0.16.2",
+    "node_modules/fancy-log": {
+      "version": "1.3.3",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "~1.6.2",
-        "mime": "1.4.1",
-        "ms": "2.0.0",
-        "on-finished": "~2.3.0",
-        "range-parser": "~1.2.0",
-        "statuses": "~1.4.0"
+        "ansi-gray": "^0.1.1",
+        "color-support": "^1.1.3",
+        "parse-node-version": "^1.0.0",
+        "time-stamp": "^1.0.0"
       },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">= 0.10"
       }
     },
-    "node_modules/gulp-connect/node_modules/setprototypeof": {
-      "version": "1.1.0",
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
       "dev": true,
-      "license": "ISC"
+      "license": "MIT"
     },
-    "node_modules/gulp-connect/node_modules/statuses": {
-      "version": "1.4.0",
+    "node_modules/fast-diff": {
+      "version": "1.2.0",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
-      }
+      "license": "Apache-2.0"
     },
-    "node_modules/gulp-header": {
-      "version": "1.8.12",
+    "node_modules/fast-glob": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "concat-with-sourcemaps": "*",
-        "lodash.template": "^4.4.0",
-        "through2": "^2.0.0"
+        "@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"
+      },
+      "engines": {
+        "node": ">=8.6.0"
       }
     },
-    "node_modules/gulp-header/node_modules/lodash._reinterpolate": {
-      "version": "3.0.0",
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/gulp-header/node_modules/lodash.template": {
-      "version": "4.5.0",
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.templatesettings": "^4.0.0"
-      }
+      "license": "MIT"
     },
-    "node_modules/gulp-header/node_modules/lodash.templatesettings": {
-      "version": "4.2.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "lodash._reinterpolate": "^3.0.0"
-      }
-    },
-    "node_modules/handlebars": {
-      "version": "4.7.7",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz",
-      "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==",
+    "node_modules/fast-xml-parser": {
+      "version": "4.2.5",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.5.tgz",
+      "integrity": "sha512-B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g==",
       "dev": true,
+      "funding": [
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/naturalintelligence"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
       "dependencies": {
-        "minimist": "^1.2.5",
-        "neo-async": "^2.6.0",
-        "source-map": "^0.6.1",
-        "wordwrap": "^1.0.0"
+        "strnum": "^1.0.5"
       },
       "bin": {
-        "handlebars": "bin/handlebars"
-      },
-      "engines": {
-        "node": ">=0.4.7"
-      },
-      "optionalDependencies": {
-        "uglify-js": "^3.1.4"
-      }
-    },
-    "node_modules/handlebars/node_modules/source-map": {
-      "version": "0.6.1",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=0.10.0"
+        "fxparser": "src/cli/cli.js"
       }
     },
-    "node_modules/handlebars/node_modules/wordwrap": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/har-schema": {
-      "version": "2.0.0",
+    "node_modules/fastq": {
+      "version": "1.8.0",
       "dev": true,
       "license": "ISC",
-      "engines": {
-        "node": ">=4"
+      "dependencies": {
+        "reusify": "^1.0.4"
       }
     },
-    "node_modules/har-validator": {
-      "version": "5.1.5",
+    "node_modules/faye-websocket": {
+      "version": "0.10.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ajv": "^6.12.3",
-        "har-schema": "^2.0.0"
+        "websocket-driver": ">=0.5.1"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=0.4.0"
       }
     },
-    "node_modules/har-validator/node_modules/ajv": {
-      "version": "6.12.6",
+    "node_modules/fb-watchman": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
+      "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
+      "dev": true,
+      "dependencies": {
+        "bser": "2.1.1"
+      }
+    },
+    "node_modules/fetch-mock": {
+      "version": "9.11.0",
       "dev": true,
       "license": "MIT",
       "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"
+        "@babel/core": "^7.0.0",
+        "@babel/runtime": "^7.0.0",
+        "core-js": "^3.0.0",
+        "debug": "^4.1.1",
+        "glob-to-regexp": "^0.4.0",
+        "is-subset": "^0.1.1",
+        "lodash.isequal": "^4.5.0",
+        "path-to-regexp": "^2.2.1",
+        "querystring": "^0.2.0",
+        "whatwg-url": "^6.5.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
       },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
+        "type": "charity",
+        "url": "https://www.justgiving.com/refugee-support-europe"
+      },
+      "peerDependencies": {
+        "node-fetch": "*"
+      },
+      "peerDependenciesMeta": {
+        "node-fetch": {
+          "optional": true
+        }
       }
     },
-    "node_modules/har-validator/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
+    "node_modules/fetch-mock/node_modules/path-to-regexp": {
+      "version": "2.4.0",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/has": {
-      "version": "1.0.3",
+    "node_modules/fetch-mock/node_modules/tr46": {
+      "version": "1.0.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
+        "punycode": "^2.1.0"
       }
     },
-    "node_modules/has-bigints": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
-      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+    "node_modules/fetch-mock/node_modules/webidl-conversions": {
+      "version": "4.0.2",
+      "dev": true,
+      "license": "BSD-2-Clause"
     },
-    "node_modules/has-flag": {
-      "version": "3.0.0",
+    "node_modules/fetch-mock/node_modules/whatwg-url": {
+      "version": "6.5.0",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=4"
+      "dependencies": {
+        "lodash.sortby": "^4.7.0",
+        "tr46": "^1.0.1",
+        "webidl-conversions": "^4.0.2"
       }
     },
-    "node_modules/has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+    "node_modules/figures": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-6.0.1.tgz",
+      "integrity": "sha512-0oY/olScYD4IhQ8u//gCPA4F3mlTn2dacYmiDm/mbDQvpmLjV4uH+zhsQ5IyXRyvqkvtUkXkNdGvg5OFJTCsuQ==",
+      "dev": true,
+      "dependencies": {
+        "is-unicode-supported": "^2.0.0"
+      },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=18"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "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==",
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
+    "node_modules/figures/node_modules/is-unicode-supported": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-2.0.0.tgz",
+      "integrity": "sha512-FRdAyx5lusK1iHG0TWpVtk9+1i+GjrzRffhDg4ovQ7mcidMQ6mj+MhKPmvh7Xwyv5gIS06ns49CA7Sqg7lC22Q==",
+      "dev": true,
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=18"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/has-value": {
-      "version": "1.0.0",
+    "node_modules/file-entry-cache": {
+      "version": "6.0.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "get-value": "^2.0.6",
-        "has-values": "^1.0.0",
-        "isobject": "^3.0.0"
+        "flat-cache": "^3.0.4"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^10.12.0 || >=12.0.0"
       }
     },
-    "node_modules/has-values": {
+    "node_modules/file-uri-to-path": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true
+    },
+    "node_modules/fill-range": {
+      "version": "7.0.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
+        "to-regex-range": "^5.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/has-values/node_modules/is-number": {
-      "version": "3.0.0",
+    "node_modules/finalhandler": {
+      "version": "1.1.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "kind-of": "^3.0.2"
+        "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"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/has-values/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
+    "node_modules/finalhandler/node_modules/debug": {
+      "version": "2.6.9",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "ms": "2.0.0"
       }
     },
-    "node_modules/has-values/node_modules/kind-of": {
-      "version": "4.0.0",
+    "node_modules/finalhandler/node_modules/ms": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/find-babel-config": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/find-babel-config/-/find-babel-config-2.0.0.tgz",
+      "integrity": "sha512-dOKT7jvF3hGzlW60Gc3ONox/0rRZ/tz7WCil0bqA1In/3I8f1BctpXahRnEKDySZqci7u+dqq93sZST9fOJpFw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "is-buffer": "^1.1.5"
+        "json5": "^2.1.1",
+        "path-exists": "^4.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/has-yarn": {
-      "version": "2.1.0",
+    "node_modules/find-babel-config/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,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/hash-stream-validation": {
-      "version": "0.2.4",
+    "node_modules/find-up": {
+      "version": "4.1.0",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/he": {
-      "version": "1.2.0",
+    "node_modules/find-up-simple": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/find-up-simple/-/find-up-simple-1.0.0.tgz",
+      "integrity": "sha512-q7Us7kcjj2VMePAa02hDAF6d+MzsdsAWEwYyOpwUtlerRBkOEPBCRZrAV4XfcSN8fHAgaD0hP7miwoay6DCprw==",
       "dev": true,
-      "license": "MIT",
-      "bin": {
-        "he": "bin/he"
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/highlight.js": {
-      "version": "10.7.2",
+    "node_modules/find-up/node_modules/path-exists": {
+      "version": "4.0.0",
       "dev": true,
-      "license": "BSD-3-Clause",
+      "license": "MIT",
       "engines": {
-        "node": "*"
+        "node": ">=8"
       }
     },
-    "node_modules/hoist-non-react-statics": {
-      "version": "3.3.2",
+    "node_modules/flat": {
+      "version": "5.0.2",
+      "dev": true,
       "license": "BSD-3-Clause",
-      "dependencies": {
-        "react-is": "^16.7.0"
+      "bin": {
+        "flat": "cli.js"
       }
     },
-    "node_modules/homedir-polyfill": {
-      "version": "1.0.3",
+    "node_modules/flat-cache": {
+      "version": "3.0.4",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "parse-passwd": "^1.0.0"
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^10.12.0 || >=12.0.0"
       }
     },
-    "node_modules/hosted-git-info": {
-      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+    "node_modules/flatted": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
       "dev": true
     },
-    "node_modules/html-element-map": {
-      "version": "1.2.0",
+    "node_modules/follow-redirects": {
+      "version": "1.14.2",
       "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
       "license": "MIT",
-      "dependencies": {
-        "array-filter": "^1.0.0"
+      "engines": {
+        "node": ">=4.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/html-encoding-sniffer": {
-      "version": "2.0.1",
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": 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==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "whatwg-encoding": "^1.0.5"
-      },
-      "engines": {
-        "node": ">=10"
+        "is-callable": "^1.1.3"
       }
     },
-    "node_modules/html-escaper": {
-      "version": "2.0.2",
+    "node_modules/for-in": {
+      "version": "1.0.2",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "node_modules/html-minifier": {
+    "node_modules/form-data": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "camel-case": "^3.0.0",
-        "clean-css": "^4.2.1",
-        "commander": "^2.19.0",
-        "he": "^1.2.0",
-        "param-case": "^2.1.1",
-        "relateurl": "^0.2.7",
-        "uglify-js": "^3.5.1"
-      },
-      "bin": {
-        "html-minifier": "cli.js"
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">= 6"
       }
     },
-    "node_modules/html-minifier/node_modules/commander": {
-      "version": "2.20.3",
+    "node_modules/formidable": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.1.tgz",
+      "integrity": "sha512-WJWKelbRHN41m5dumb0/k8TeAx7Id/y3a+Z7QfhxP/htI9Js5zYaEDtG8uMgG0vM0lOlqnmjE99/kfpOYi/0Og==",
       "dev": true,
-      "license": "MIT"
+      "dependencies": {
+        "dezalgo": "^1.0.4",
+        "hexoid": "^1.0.0",
+        "once": "^1.4.0"
+      },
+      "funding": {
+        "url": "https://ko-fi.com/tunnckoCore/commissions"
+      }
     },
-    "node_modules/htmlparser2": {
-      "version": "6.1.0",
+    "node_modules/forwarded": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
       "dev": true,
-      "funding": [
-        "https://github.com/fb55/htmlparser2?sponsor=1",
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.0.0",
-        "domutils": "^2.5.2",
-        "entities": "^2.0.0"
+      "engines": {
+        "node": ">= 0.6"
       }
     },
-    "node_modules/http-cache-semantics": {
-      "version": "4.1.0",
+    "node_modules/fraction.js": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz",
+      "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==",
       "dev": true,
-      "license": "BSD-2-Clause"
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "type": "patreon",
+        "url": "https://github.com/sponsors/rawify"
+      }
     },
-    "node_modules/http-errors": {
-      "version": "1.7.2",
+    "node_modules/fresh": {
+      "version": "0.5.2",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.1",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
-      },
       "engines": {
         "node": ">= 0.6"
       }
     },
-    "node_modules/http-errors/node_modules/inherits": {
-      "version": "2.0.3",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/http-parser-js": {
-      "version": "0.5.2",
+    "node_modules/from": {
+      "version": "0.1.7",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/http-proxy": {
-      "version": "1.18.1",
+    "node_modules/fs-extra": {
+      "version": "11.2.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "eventemitter3": "^4.0.0",
-        "follow-redirects": "^1.0.0",
-        "requires-port": "^1.0.0"
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
       },
       "engines": {
-        "node": ">=8.0.0"
+        "node": ">=14.14"
       }
     },
-    "node_modules/http-proxy-agent": {
-      "version": "4.0.1",
+    "node_modules/fs-extra/node_modules/universalify": {
+      "version": "2.0.0",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@tootallnate/once": "1",
-        "agent-base": "6",
-        "debug": "4"
-      },
       "engines": {
-        "node": ">= 6"
+        "node": ">= 10.0.0"
       }
     },
-    "node_modules/http-signature": {
-      "version": "1.2.0",
+    "node_modules/fs-minipass": {
+      "version": "2.1.0",
       "dev": true,
-      "license": "MIT",
+      "license": "ISC",
       "dependencies": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
+        "minipass": "^3.0.0"
       },
       "engines": {
-        "node": ">=0.8",
-        "npm": ">=1.3.7"
+        "node": ">= 8"
       }
     },
-    "node_modules/https-proxy-agent": {
-      "version": "5.0.0",
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
+      "license": "ISC"
     },
-    "node_modules/human-signals": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
       "engines": {
-        "node": ">=10.17.0"
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
       }
     },
-    "node_modules/hyphenate-style-name": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz",
-      "integrity": "sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ=="
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
-    "node_modules/iconv-lite": {
-      "version": "0.4.24",
+    "node_modules/function.prototype.name": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
+      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "functions-have-names": "^1.2.3"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/ieee754": {
-      "version": "1.1.13",
+    "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,
-      "license": "BSD-3-Clause"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
-    "node_modules/ignore": {
-      "version": "5.1.8",
+    "node_modules/gauge": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
+      "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "aproba": "^1.0.3 || ^2.0.0",
+        "color-support": "^1.1.2",
+        "console-control-strings": "^1.0.0",
+        "has-unicode": "^2.0.1",
+        "object-assign": "^4.1.1",
+        "signal-exit": "^3.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
+        "wide-align": "^1.1.2"
+      },
       "engines": {
-        "node": ">= 4"
+        "node": ">=10"
       }
     },
-    "node_modules/ignore-by-default": {
-      "version": "2.0.0",
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.2",
       "dev": true,
-      "license": "ISC",
+      "license": "MIT",
       "engines": {
-        "node": ">=10 <11 || >=12 <13 || >=14"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/ignore-walk": {
-      "version": "3.0.4",
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
       "dev": true,
       "license": "ISC",
-      "dependencies": {
-        "minimatch": "^3.0.4"
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
       }
     },
-    "node_modules/import-fresh": {
-      "version": "3.3.0",
+    "node_modules/get-east-asian-width": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.2.0.tgz",
+      "integrity": "sha512-2nk+7SIVb14QrgXFHcm84tD4bKQz0RxPuMT8Ag5KPOq7J5fEmAg0UbXdTOSHqNuHSU28k55qnceesxXRZGzKWA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
       "engines": {
-        "node": ">=6"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/import-fresh/node_modules/resolve-from": {
-      "version": "4.0.0",
+    "node_modules/get-func-name": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
+      "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=4"
+        "node": "*"
       }
     },
-    "node_modules/import-lazy": {
-      "version": "2.1.0",
+    "node_modules/get-intrinsic": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
+      },
       "engines": {
-        "node": ">=4"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/import-local": {
-      "version": "3.0.2",
+    "node_modules/get-package-type": {
+      "version": "0.1.0",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "pkg-dir": "^4.2.0",
-        "resolve-cwd": "^3.0.0"
-      },
-      "bin": {
-        "import-local-fixture": "fixtures/cli.js"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=8.0.0"
       }
     },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
+    "node_modules/get-port": {
+      "version": "3.2.0",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=0.8.19"
+        "node": ">=4"
       }
     },
-    "node_modules/indent-string": {
-      "version": "4.0.0",
+    "node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/ini": {
-      "version": "1.3.8",
+    "node_modules/get-symbol-description": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz",
+      "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==",
       "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/internal-slot": {
-      "version": "1.0.3",
-      "license": "MIT",
       "dependencies": {
-        "get-intrinsic": "^1.1.0",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
+        "call-bind": "^1.0.5",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4"
       },
       "engines": {
         "node": ">= 0.4"
-      }
-    },
-    "node_modules/internal-slot/node_modules/get-intrinsic": {
-      "version": "1.1.1",
-      "license": "MIT",
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/intersection-observer": {
-      "version": "0.12.0",
-      "license": "W3C-20150513"
-    },
-    "node_modules/ipaddr.js": {
-      "version": "1.9.1",
+    "node_modules/get-uri": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.3.tgz",
+      "integrity": "sha512-BzUrJBS9EcUb4cFol8r4W3v1cPsSyajLSthNkz5BxbpDcHN5tIrM10E2eNvfnvBn3DaT3DUgx0OpsBKkaOpanw==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "basic-ftp": "^5.0.2",
+        "data-uri-to-buffer": "^6.0.2",
+        "debug": "^4.3.4",
+        "fs-extra": "^11.2.0"
+      },
       "engines": {
-        "node": ">= 0.10"
+        "node": ">= 14"
       }
     },
-    "node_modules/irregular-plurals": {
-      "version": "3.2.0",
+    "node_modules/glob": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
       "dev": true,
-      "license": "MIT",
+      "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"
+      },
       "engines": {
-        "node": ">=8"
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/is-absolute": {
-      "version": "1.0.0",
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
       "dev": true,
-      "license": "MIT",
+      "license": "ISC",
       "dependencies": {
-        "is-relative": "^1.0.0",
-        "is-windows": "^1.0.1"
+        "is-glob": "^4.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 6"
       }
     },
-    "node_modules/is-absolute-url": {
-      "version": "3.0.3",
+    "node_modules/glob-to-regexp": {
+      "version": "0.4.1",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
+      "license": "BSD-2-Clause"
     },
-    "node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
+    "node_modules/glob/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "kind-of": "^3.0.2"
+        "brace-expansion": "^1.1.7"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "*"
       }
     },
-    "node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
+    "node_modules/globals": {
+      "version": "11.12.0",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=4"
       }
     },
-    "node_modules/is-arguments": {
-      "version": "1.1.0",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.0"
+        "define-properties": "^1.1.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -11524,341 +12746,321 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-arrayish": {
-      "version": "0.2.1",
+    "node_modules/globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
       "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
       "dependencies": {
-        "has-bigints": "^1.0.1"
+        "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"
+      },
+      "engines": {
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "binary-extensions": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
+    "node_modules/google-closure-library": {
+      "version": "20230802.0.0",
+      "resolved": "https://registry.npmjs.org/google-closure-library/-/google-closure-library-20230802.0.0.tgz",
+      "integrity": "sha512-h2lBEX2tjWwfR+dhFukGER15vKY+4cA3nRqwKSOsBdyizlOxTAHOWbEYiGnMoom3/SrVeQ5uG0eKsbxQ3wbsxA=="
     },
-    "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==",
+    "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": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "get-intrinsic": "^1.1.3"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-buffer": {
-      "version": "1.1.6",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "dev": true
     },
-    "node_modules/is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+    "node_modules/graphemer": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
+      "dev": true
     },
-    "node_modules/is-ci": {
-      "version": "2.0.0",
+    "node_modules/gray-matter": {
+      "version": "2.1.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ci-info": "^2.0.0"
-      },
-      "bin": {
-        "is-ci": "bin.js"
-      }
-    },
-    "node_modules/is-core-module": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz",
-      "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==",
-      "dev": true,
-      "dependencies": {
-        "has": "^1.0.3"
+        "ansi-red": "^0.1.1",
+        "coffee-script": "^1.12.4",
+        "extend-shallow": "^2.0.1",
+        "js-yaml": "^3.8.1",
+        "toml": "^2.3.2"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/is-data-descriptor": {
-      "version": "0.1.4",
+    "node_modules/gray-matter/node_modules/extend-shallow": {
+      "version": "2.0.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "kind-of": "^3.0.2"
+        "is-extendable": "^0.1.0"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
+    "node_modules/gulp-connect": {
+      "version": "5.7.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "is-buffer": "^1.1.5"
+        "ansi-colors": "^2.0.5",
+        "connect": "^3.6.6",
+        "connect-livereload": "^0.6.0",
+        "fancy-log": "^1.3.2",
+        "map-stream": "^0.0.7",
+        "send": "^0.16.2",
+        "serve-index": "^1.9.1",
+        "serve-static": "^1.13.2",
+        "tiny-lr": "^1.1.1"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-date-object": {
-      "version": "1.0.2",
+    "node_modules/gulp-connect/node_modules/ansi-colors": {
+      "version": "2.0.5",
+      "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=6"
       }
     },
-    "node_modules/is-descriptor": {
-      "version": "0.1.6",
+    "node_modules/gulp-connect/node_modules/debug": {
+      "version": "2.6.9",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "ms": "2.0.0"
       }
     },
-    "node_modules/is-descriptor/node_modules/kind-of": {
-      "version": "5.1.0",
+    "node_modules/gulp-connect/node_modules/http-errors": {
+      "version": "1.6.3",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.0",
+        "statuses": ">= 1.4.0 < 2"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/is-docker": {
-      "version": "2.1.1",
+    "node_modules/gulp-connect/node_modules/inherits": {
+      "version": "2.0.3",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/gulp-connect/node_modules/mime": {
+      "version": "1.4.1",
       "dev": true,
       "license": "MIT",
       "bin": {
-        "is-docker": "cli.js"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "mime": "cli.js"
       }
     },
-    "node_modules/is-error": {
-      "version": "2.2.2",
+    "node_modules/gulp-connect/node_modules/ms": {
+      "version": "2.0.0",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/is-extendable": {
-      "version": "0.1.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
+    "node_modules/gulp-connect/node_modules/send": {
+      "version": "0.16.2",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "destroy": "~1.0.4",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "~1.6.2",
+        "mime": "1.4.1",
+        "ms": "2.0.0",
+        "on-finished": "~2.3.0",
+        "range-parser": "~1.2.0",
+        "statuses": "~1.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/is-function": {
-      "version": "1.0.2",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/is-generator-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
-      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
+    "node_modules/gulp-connect/node_modules/setprototypeof": {
+      "version": "1.1.0",
       "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
+      "license": "ISC"
     },
-    "node_modules/is-generator-function": {
-      "version": "1.0.9",
+    "node_modules/gulp-connect/node_modules/statuses": {
+      "version": "1.4.0",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+    "node_modules/gulp-header": {
+      "version": "1.8.12",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "concat-with-sourcemaps": "*",
+        "lodash.template": "^4.4.0",
+        "through2": "^2.0.0"
       }
     },
-    "node_modules/is-in-browser": {
-      "version": "1.1.3",
+    "node_modules/gulp-header/node_modules/lodash._reinterpolate": {
+      "version": "3.0.0",
+      "dev": true,
       "license": "MIT"
     },
-    "node_modules/is-installed-globally": {
-      "version": "0.4.0",
+    "node_modules/gulp-header/node_modules/lodash.template": {
+      "version": "4.5.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "global-dirs": "^3.0.0",
-        "is-path-inside": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "lodash._reinterpolate": "^3.0.0",
+        "lodash.templatesettings": "^4.0.0"
       }
     },
-    "node_modules/is-interactive": {
-      "version": "1.0.0",
+    "node_modules/gulp-header/node_modules/lodash.templatesettings": {
+      "version": "4.2.0",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=8"
+      "dependencies": {
+        "lodash._reinterpolate": "^3.0.0"
       }
     },
-    "node_modules/is-json": {
-      "version": "2.0.1",
+    "node_modules/handlebars": {
+      "version": "4.7.7",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz",
+      "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==",
       "dev": true,
-      "license": "ISC"
+      "dependencies": {
+        "minimist": "^1.2.5",
+        "neo-async": "^2.6.0",
+        "source-map": "^0.6.1",
+        "wordwrap": "^1.0.0"
+      },
+      "bin": {
+        "handlebars": "bin/handlebars"
+      },
+      "engines": {
+        "node": ">=0.4.7"
+      },
+      "optionalDependencies": {
+        "uglify-js": "^3.1.4"
+      }
     },
-    "node_modules/is-negated-glob": {
-      "version": "1.0.0",
+    "node_modules/handlebars/node_modules/source-map": {
+      "version": "0.6.1",
       "dev": true,
-      "license": "MIT",
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-npm": {
-      "version": "5.0.0",
+    "node_modules/handlebars/node_modules/wordwrap": {
+      "version": "1.0.0",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
+      "license": "MIT"
     },
-    "node_modules/is-number": {
-      "version": "7.0.0",
+    "node_modules/has": {
+      "version": "1.0.3",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
       "engines": {
-        "node": ">=0.12.0"
+        "node": ">= 0.4.0"
       }
     },
-    "node_modules/is-number-object": {
-      "version": "1.0.4",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
+    "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==",
+      "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-obj": {
-      "version": "2.0.0",
+    "node_modules/has-flag": {
+      "version": "3.0.0",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
-    "node_modules/is-path-cwd": {
-      "version": "2.2.0",
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
+      "dependencies": {
+        "es-define-property": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-path-inside": {
-      "version": "3.0.3",
+    "node_modules/has-proto": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-plain-obj": {
-      "version": "2.1.0",
+    "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,
-      "license": "MIT",
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "isobject": "^3.0.1"
+        "node": ">= 0.4"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-potential-custom-element-name": {
-      "version": "1.0.1",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/is-promise": {
-      "version": "4.0.0",
+    "node_modules/has-tostringtag": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
       "dev": true,
-      "license": "MIT"
-    },
-    "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==",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "has-symbols": "^1.0.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -11867,1216 +13069,1336 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-relative": {
-      "version": "1.0.0",
+    "node_modules/has-unicode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
+      "dev": true
+    },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "is-unc-path": "^1.0.0"
+        "function-bind": "^1.1.2"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/is-relative-url": {
-      "version": "3.0.0",
+    "node_modules/he": {
+      "version": "1.2.0",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "is-absolute-url": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+      "bin": {
+        "he": "bin/he"
       }
     },
-    "node_modules/is-resolvable": {
-      "version": "1.1.0",
+    "node_modules/hexoid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-1.0.0.tgz",
+      "integrity": "sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==",
       "dev": true,
-      "license": "ISC"
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/is-shared-array-buffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz",
-      "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "node_modules/hoist-non-react-statics": {
+      "version": "3.3.2",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "react-is": "^16.7.0"
       }
     },
-    "node_modules/is-stream": {
-      "version": "2.0.1",
+    "node_modules/html-element-map": {
+      "version": "1.2.0",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=8"
+      "dependencies": {
+        "array-filter": "^1.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+    "node_modules/html-encoding-sniffer": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz",
+      "integrity": "sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==",
+      "dev": true,
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "whatwg-encoding": "^3.1.1"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=18"
       }
     },
-    "node_modules/is-subset": {
-      "version": "0.1.1",
+    "node_modules/html-escaper": {
+      "version": "2.0.2",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/is-symbol": {
-      "version": "1.0.3",
-      "license": "MIT",
+    "node_modules/html-link-extractor": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/html-link-extractor/-/html-link-extractor-1.0.5.tgz",
+      "integrity": "sha512-ADd49pudM157uWHwHQPUSX4ssMsvR/yHIswOR5CUfBdK9g9ZYGMhVSE6KZVHJ6kCkR0gH4htsfzU6zECDNVwyw==",
+      "dev": true,
       "dependencies": {
-        "has-symbols": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "cheerio": "^1.0.0-rc.10"
       }
     },
-    "node_modules/is-touch-device": {
-      "version": "1.0.1",
-      "license": "MIT"
-    },
-    "node_modules/is-typed-array": {
-      "version": "1.1.5",
+    "node_modules/html-minifier": {
+      "version": "4.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "available-typed-arrays": "^1.0.2",
-        "call-bind": "^1.0.2",
-        "es-abstract": "^1.18.0-next.2",
-        "foreach": "^2.0.5",
-        "has-symbols": "^1.0.1"
+        "camel-case": "^3.0.0",
+        "clean-css": "^4.2.1",
+        "commander": "^2.19.0",
+        "he": "^1.2.0",
+        "param-case": "^2.1.1",
+        "relateurl": "^0.2.7",
+        "uglify-js": "^3.5.1"
       },
-      "engines": {
-        "node": ">= 0.4"
+      "bin": {
+        "html-minifier": "cli.js"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=6"
       }
     },
-    "node_modules/is-typedarray": {
-      "version": "1.0.0",
+    "node_modules/html-minifier/node_modules/commander": {
+      "version": "2.20.3",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/is-unc-path": {
-      "version": "1.0.0",
+    "node_modules/htmlparser2": {
+      "version": "6.1.0",
       "dev": true,
+      "funding": [
+        "https://github.com/fb55/htmlparser2?sponsor=1",
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
       "license": "MIT",
       "dependencies": {
-        "unc-path-regex": "^0.1.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.0.0",
+        "domutils": "^2.5.2",
+        "entities": "^2.0.0"
       }
     },
-    "node_modules/is-unicode-supported": {
-      "version": "0.1.0",
+    "node_modules/http-errors": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
+      "dependencies": {
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "engines": {
+        "node": ">= 0.8"
       }
     },
-    "node_modules/is-utf8": {
-      "version": "0.2.1",
+    "node_modules/http-errors/node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
       "dev": true,
-      "license": "MIT"
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
-    "node_modules/is-valid-glob": {
-      "version": "1.0.0",
+    "node_modules/http-errors/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/is-weakref": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.1.tgz",
-      "integrity": "sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==",
-      "dependencies": {
-        "call-bind": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+    "node_modules/http-parser-js": {
+      "version": "0.5.2",
+      "dev": true,
+      "license": "MIT"
     },
-    "node_modules/is-windows": {
-      "version": "1.0.2",
+    "node_modules/http-proxy": {
+      "version": "1.18.1",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "eventemitter3": "^4.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8.0.0"
       }
     },
-    "node_modules/is-wsl": {
-      "version": "2.2.0",
+    "node_modules/http-proxy-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "is-docker": "^2.0.0"
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 14"
       }
     },
-    "node_modules/is-yarn-global": {
-      "version": "0.3.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/isarray": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/isbinaryfile": {
-      "version": "4.0.8",
+    "node_modules/http-proxy-agent/node_modules/agent-base": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
+      "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 8.0.0"
+      "dependencies": {
+        "debug": "^4.3.4"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/gjtorikian/"
+      "engines": {
+        "node": ">= 14"
       }
     },
-    "node_modules/isemail": {
-      "version": "3.2.0",
+    "node_modules/https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
-        "punycode": "2.x.x"
+        "agent-base": "6",
+        "debug": "4"
       },
       "engines": {
-        "node": ">=4.0.0"
+        "node": ">= 6"
       }
     },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/isobject": {
-      "version": "3.0.1",
+    "node_modules/human-signals": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10.17.0"
       }
     },
-    "node_modules/isstream": {
-      "version": "0.1.2",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/hyphenate-style-name": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz",
+      "integrity": "sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ=="
     },
-    "node_modules/istanbul": {
-      "version": "0.4.5",
+    "node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
-        "abbrev": "1.0.x",
-        "async": "1.x",
-        "escodegen": "1.8.x",
-        "esprima": "2.7.x",
-        "glob": "^5.0.15",
-        "handlebars": "^4.0.1",
-        "js-yaml": "3.x",
-        "mkdirp": "0.5.x",
-        "nopt": "3.x",
-        "once": "1.x",
-        "resolve": "1.1.x",
-        "supports-color": "^3.1.0",
-        "which": "^1.1.1",
-        "wordwrap": "^1.0.0"
+        "safer-buffer": ">= 2.1.2 < 3"
       },
-      "bin": {
-        "istanbul": "lib/cli.js"
-      }
-    },
-    "node_modules/istanbul-lib-coverage": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "BSD-3-Clause",
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/istanbul-lib-instrument": {
-      "version": "4.0.3",
+    "node_modules/ignore": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
+      "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
       "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "@babel/core": "^7.7.5",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.0.0",
-        "semver": "^6.3.0"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">= 4"
       }
     },
-    "node_modules/istanbul-lib-instrument/node_modules/semver": {
-      "version": "6.3.0",
+    "node_modules/ignore-by-default": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-2.1.0.tgz",
+      "integrity": "sha512-yiWd4GVmJp0Q6ghmM2B/V3oZGRmjrKLXvHR3TE1nfoXsmoggllfZUQe74EN0fJdPFZu2NIvNdrMMLm3OsV7Ohw==",
       "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
+      "engines": {
+        "node": ">=10 <11 || >=12 <13 || >=14"
       }
     },
-    "node_modules/istanbul-lib-report": {
-      "version": "3.0.0",
+    "node_modules/import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
-        "istanbul-lib-coverage": "^3.0.0",
-        "make-dir": "^3.0.0",
-        "supports-color": "^7.1.0"
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/istanbul-lib-report/node_modules/has-flag": {
+    "node_modules/import-fresh/node_modules/resolve-from": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=0.8.19"
       }
     },
-    "node_modules/istanbul-lib-report/node_modules/supports-color": {
-      "version": "7.2.0",
+    "node_modules/indent-string": {
+      "version": "4.0.0",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/istanbul-lib-source-maps": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
-      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+    "node_modules/inflight": {
+      "version": "1.0.6",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "debug": "^4.1.1",
-        "istanbul-lib-coverage": "^3.0.0",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=10"
+        "once": "^1.3.0",
+        "wrappy": "1"
       }
     },
-    "node_modules/istanbul-lib-source-maps/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+    "node_modules/inherits": {
+      "version": "2.0.4",
       "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "license": "ISC"
     },
-    "node_modules/istanbul-middleware": {
-      "version": "0.2.2",
+    "node_modules/internal-slot": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
+      "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==",
       "dev": true,
-      "license": "BSD",
       "dependencies": {
-        "archiver": "0.14.x",
-        "body-parser": "~1.12.3",
-        "express": "4.x",
-        "istanbul": "0.4.x"
+        "es-errors": "^1.3.0",
+        "hasown": "^2.0.0",
+        "side-channel": "^1.0.4"
       },
       "engines": {
-        "node": ">=0.6.x"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/istanbul-middleware/node_modules/body-parser": {
-      "version": "1.12.4",
+    "node_modules/intersection-observer": {
+      "version": "0.12.0",
+      "license": "W3C-20150513"
+    },
+    "node_modules/ip-address": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
+      "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "bytes": "1.0.0",
-        "content-type": "~1.0.1",
-        "debug": "~2.2.0",
-        "depd": "~1.0.1",
-        "iconv-lite": "0.4.8",
-        "on-finished": "~2.2.1",
-        "qs": "2.4.2",
-        "raw-body": "~2.0.1",
-        "type-is": "~1.6.2"
+        "jsbn": "1.1.0",
+        "sprintf-js": "^1.1.3"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">= 12"
       }
     },
-    "node_modules/istanbul-middleware/node_modules/bytes": {
-      "version": "1.0.0",
+    "node_modules/ip-address/node_modules/sprintf-js": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
       "dev": true
     },
-    "node_modules/istanbul-middleware/node_modules/debug": {
-      "version": "2.2.0",
+    "node_modules/ipaddr.js": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ms": "0.7.1"
+      "engines": {
+        "node": ">= 0.10"
       }
     },
-    "node_modules/istanbul-middleware/node_modules/depd": {
-      "version": "1.0.1",
+    "node_modules/irregular-plurals": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.5.0.tgz",
+      "integrity": "sha512-1ANGLZ+Nkv1ptFb2pa8oG8Lem4krflKuX/gINiHJHjJUKaJHk/SXk5x6K3J+39/p0h1RQ2saROclJJ+QLvETCQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=8"
       }
     },
-    "node_modules/istanbul-middleware/node_modules/ee-first": {
-      "version": "1.1.0",
+    "node_modules/is-absolute-url": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-4.0.1.tgz",
+      "integrity": "sha512-/51/TKE88Lmm7Gc4/8btclNXWS+g50wXhYJq8HWIBAGUBnoAdRu1aXeh364t/O7wXDAcTJDP8PNuNKWUDWie+A==",
       "dev": true,
-      "license": "MIT"
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
-    "node_modules/istanbul-middleware/node_modules/iconv-lite": {
-      "version": "0.4.8",
+    "node_modules/is-arguments": {
+      "version": "1.1.0",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.0"
+      },
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/istanbul-middleware/node_modules/ms": {
-      "version": "0.7.1",
-      "dev": true
-    },
-    "node_modules/istanbul-middleware/node_modules/on-finished": {
-      "version": "2.2.1",
+    "node_modules/is-array-buffer": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
+      "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "ee-first": "1.1.0"
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.1"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/istanbul-middleware/node_modules/qs": {
-      "version": "2.4.2",
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
       "dev": true
     },
-    "node_modules/istanbul-middleware/node_modules/raw-body": {
-      "version": "2.0.2",
+    "node_modules/is-async-function": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz",
+      "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "bytes": "2.1.0",
-        "iconv-lite": "0.4.8"
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/istanbul-middleware/node_modules/raw-body/node_modules/bytes": {
-      "version": "2.1.0",
+    "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,
-      "license": "MIT"
+      "dependencies": {
+        "has-bigints": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
-    "node_modules/istanbul-reports": {
-      "version": "3.0.2",
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
       "dev": true,
-      "license": "BSD-3-Clause",
+      "license": "MIT",
       "dependencies": {
-        "html-escaper": "^2.0.0",
-        "istanbul-lib-report": "^3.0.0"
+        "binary-extensions": "^2.0.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/istanbul/node_modules/async": {
-      "version": "1.5.2",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/istanbul/node_modules/escodegen": {
-      "version": "1.8.1",
+    "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,
-      "license": "BSD-2-Clause",
       "dependencies": {
-        "esprima": "^2.7.1",
-        "estraverse": "^1.9.1",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1"
-      },
-      "bin": {
-        "escodegen": "bin/escodegen.js",
-        "esgenerate": "bin/esgenerate.js"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
-        "node": ">=0.12.0"
+        "node": ">= 0.4"
       },
-      "optionalDependencies": {
-        "source-map": "~0.2.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/istanbul/node_modules/esprima": {
-      "version": "2.7.3",
+    "node_modules/is-buffer": {
+      "version": "1.1.6",
       "dev": true,
-      "license": "BSD-2-Clause",
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "license": "MIT"
     },
-    "node_modules/istanbul/node_modules/estraverse": {
-      "version": "1.9.3",
+    "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==",
       "dev": true,
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/istanbul/node_modules/glob": {
-      "version": "5.0.15",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "2 || 3",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "node": ">= 0.4"
       },
-      "engines": {
-        "node": "*"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/istanbul/node_modules/has-flag": {
-      "version": "1.0.0",
+    "node_modules/is-ci": {
+      "version": "2.0.0",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/istanbul/node_modules/resolve": {
-      "version": "1.1.7",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/istanbul/node_modules/source-map": {
-      "version": "0.2.0",
-      "dev": true,
-      "optional": true,
       "dependencies": {
-        "amdefine": ">=0.0.4"
+        "ci-info": "^2.0.0"
       },
-      "engines": {
-        "node": ">=0.8.0"
+      "bin": {
+        "is-ci": "bin.js"
       }
     },
-    "node_modules/istanbul/node_modules/supports-color": {
-      "version": "3.2.3",
+    "node_modules/is-core-module": {
+      "version": "2.15.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
+      "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "has-flag": "^1.0.0"
+        "hasown": "^2.0.2"
       },
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/istanbul/node_modules/wordwrap": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/jest-changed-files": {
-      "version": "27.3.0",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.3.0.tgz",
-      "integrity": "sha512-9DJs9garMHv4RhylUMZgbdCJ3+jHSkpL9aaVKp13xtXAD80qLTLrqcDZL1PHA9dYA0bCI86Nv2BhkLpLhrBcPg==",
+    "node_modules/is-data-view": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz",
+      "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^27.2.5",
-        "execa": "^5.0.0",
-        "throat": "^6.0.1"
+        "is-typed-array": "^1.1.13"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/jest-changed-files/node_modules/@jest/types": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-      "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+    "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": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/jest-changed-files/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+    "node_modules/is-docker": {
+      "version": "2.1.1",
       "dev": true,
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/jest-changed-files/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
+      "license": "MIT",
+      "bin": {
+        "is-docker": "cli.js"
       },
       "engines": {
         "node": ">=8"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/jest-changed-files/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/is-extendable": {
+      "version": "0.1.1",
       "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/jest-changed-files/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
       "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/jest-changed-files/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+    "node_modules/is-finalizationregistry": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz",
+      "integrity": "sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
-    "node_modules/jest-changed-files/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest-changed-files/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/is-function": {
+      "version": "1.0.2",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/is-generator-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
       "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=6"
       }
     },
-    "node_modules/jest-circus": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.3.1.tgz",
-      "integrity": "sha512-v1dsM9II6gvXokgqq6Yh2jHCpfg7ZqV4jWY66u7npz24JnhP3NHxI0sKT7+ZMQ7IrOWHYAaeEllOySbDbWsiXw==",
+    "node_modules/is-generator-function": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
+      "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^27.3.1",
-        "@jest/test-result": "^27.3.1",
-        "@jest/types": "^27.2.5",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "co": "^4.6.0",
-        "dedent": "^0.7.0",
-        "expect": "^27.3.1",
-        "is-generator-fn": "^2.0.0",
-        "jest-each": "^27.3.1",
-        "jest-matcher-utils": "^27.3.1",
-        "jest-message-util": "^27.3.1",
-        "jest-runtime": "^27.3.1",
-        "jest-snapshot": "^27.3.1",
-        "jest-util": "^27.3.1",
-        "pretty-format": "^27.3.1",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3",
-        "throat": "^6.0.1"
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/jest-circus/node_modules/@jest/types": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-      "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "dev": true,
       "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
+        "is-extglob": "^2.1.1"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/jest-circus/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+    "node_modules/is-in-browser": {
+      "version": "1.1.3",
+      "license": "MIT"
+    },
+    "node_modules/is-json": {
+      "version": "2.0.1",
       "dev": true,
-      "dependencies": {
-        "@types/yargs-parser": "*"
+      "license": "ISC"
+    },
+    "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==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/jest-circus/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/is-negative-zero": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
+      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
       "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/jest-circus/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/is-number": {
+      "version": "7.0.0",
       "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=10"
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-number-object": {
+      "version": "1.0.4",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/jest-circus/node_modules/ci-info": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-      "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
-      "dev": true
-    },
-    "node_modules/jest-circus/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/is-path-cwd": {
+      "version": "2.2.0",
       "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=6"
       }
     },
-    "node_modules/jest-circus/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-circus/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/is-path-inside": {
+      "version": "3.0.3",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest-circus/node_modules/jest-util": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-      "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+    "node_modules/is-plain-obj": {
+      "version": "2.1.0",
       "dev": true,
-      "dependencies": {
-        "@jest/types": "^27.2.5",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.4",
-        "picomatch": "^2.2.3"
-      },
+      "license": "MIT",
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">=8"
       }
     },
-    "node_modules/jest-circus/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/is-plain-object": {
+      "version": "2.0.4",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "isobject": "^3.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/jest-diff": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.3.1.tgz",
-      "integrity": "sha512-PCeuAH4AWUo2O5+ksW4pL9v5xJAcIKPUPfIhZBcG1RKv/0+dvaWTQK1Nrau8d67dp65fOqbeMdoil+6PedyEPQ==",
+    "node_modules/is-potential-custom-element-name": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/is-promise": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "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": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^27.0.6",
-        "jest-get-type": "^27.3.1",
-        "pretty-format": "^27.3.1"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/jest-diff/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/is-relative-url": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-relative-url/-/is-relative-url-4.0.0.tgz",
+      "integrity": "sha512-PkzoL1qKAYXNFct5IKdKRH/iBQou/oCC85QhXj6WKtUQBliZ4Yfd3Zk27RHu9KQG8r6zgvAA2AQKC9p+rqTszg==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "is-absolute-url": "^4.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=14.16"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/jest-diff/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "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.3",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz",
+      "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "call-bind": "^1.0.7"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/jest-diff/node_modules/color-convert": {
+    "node_modules/is-stream": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/jest-diff/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-diff/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "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": {
+        "has-tostringtag": "^1.0.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/jest-diff/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/is-subset": {
+      "version": "0.1.1",
       "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/is-symbol": {
+      "version": "1.0.3",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "has-symbols": "^1.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/jest-docblock": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.0.6.tgz",
-      "integrity": "sha512-Fid6dPcjwepTFraz0YxIMCi7dejjJ/KL9FBjPYhBp4Sv1Y9PdhImlKZqYU555BlN4TQKaTc+F2Av1z+anVyGkA==",
+    "node_modules/is-typed-array": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
+      "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
       "dev": true,
       "dependencies": {
-        "detect-newline": "^3.0.0"
+        "which-typed-array": "^1.1.14"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/jest-each": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.3.1.tgz",
-      "integrity": "sha512-E4SwfzKJWYcvOYCjOxhZcxwL+AY0uFMvdCOwvzgutJiaiodFjkxQQDxHm8FQBeTqDnSmKsQWn7ldMRzTn2zJaQ==",
+    "node_modules/is-unicode-supported": {
+      "version": "0.1.0",
       "dev": true,
-      "dependencies": {
-        "@jest/types": "^27.2.5",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^27.3.1",
-        "jest-util": "^27.3.1",
-        "pretty-format": "^27.3.1"
-      },
+      "license": "MIT",
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/jest-each/node_modules/@jest/types": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-      "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+    "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": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
+        "call-bind": "^1.0.2"
       },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/jest-each/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+    "node_modules/is-weakset": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz",
+      "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==",
       "dev": true,
       "dependencies": {
-        "@types/yargs-parser": "*"
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/jest-each/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/is-wsl": {
+      "version": "2.2.0",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "is-docker": "^2.0.0"
       },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-each/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/isarray": {
+      "version": "1.0.0",
       "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
+      "license": "MIT"
+    },
+    "node_modules/isbinaryfile": {
+      "version": "4.0.8",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=10"
+        "node": ">= 8.0.0"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "url": "https://github.com/sponsors/gjtorikian/"
       }
     },
-    "node_modules/jest-each/node_modules/ci-info": {
+    "node_modules/isemail": {
       "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-      "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
-      "dev": true
-    },
-    "node_modules/jest-each/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "resolved": "https://registry.npmjs.org/isemail/-/isemail-3.2.0.tgz",
+      "integrity": "sha512-zKqkK+O+dGqevc93KNsbZ/TqTUFd46MwWjYOoMrjIMZ51eU7DtQG3Wmd9SQQT7i7RVnuTPEiYEWHU3MSbxC1Tg==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "punycode": "2.x.x"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=4.0.0"
       }
     },
-    "node_modules/jest-each/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "ISC"
     },
-    "node_modules/jest-each/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/isobject": {
+      "version": "3.0.1",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/jest-each/node_modules/jest-util": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-      "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+    "node_modules/istanbul": {
+      "version": "0.4.5",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "@jest/types": "^27.2.5",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.4",
-        "picomatch": "^2.2.3"
+        "abbrev": "1.0.x",
+        "async": "1.x",
+        "escodegen": "1.8.x",
+        "esprima": "2.7.x",
+        "glob": "^5.0.15",
+        "handlebars": "^4.0.1",
+        "js-yaml": "3.x",
+        "mkdirp": "0.5.x",
+        "nopt": "3.x",
+        "once": "1.x",
+        "resolve": "1.1.x",
+        "supports-color": "^3.1.0",
+        "which": "^1.1.1",
+        "wordwrap": "^1.0.0"
       },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      "bin": {
+        "istanbul": "lib/cli.js"
       }
     },
-    "node_modules/jest-each/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/istanbul-lib-coverage": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
       "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest-environment-jsdom": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.3.1.tgz",
-      "integrity": "sha512-3MOy8qMzIkQlfb3W1TfrD7uZHj+xx8Olix5vMENkj5djPmRqndMaXtpnaZkxmxM+Qc3lo+yVzJjzuXbCcZjAlg==",
+    "node_modules/istanbul-lib-instrument": {
+      "version": "4.0.3",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "@jest/environment": "^27.3.1",
-        "@jest/fake-timers": "^27.3.1",
-        "@jest/types": "^27.2.5",
-        "@types/node": "*",
-        "jest-mock": "^27.3.0",
-        "jest-util": "^27.3.1",
-        "jsdom": "^16.6.0"
+        "@babel/core": "^7.7.5",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.0.0",
+        "semver": "^6.3.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-instrument/node_modules/semver": {
+      "version": "6.3.0",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/@jest/types": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-      "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+    "node_modules/istanbul-lib-report": {
+      "version": "3.0.0",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^3.0.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">=8"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+    "node_modules/istanbul-lib-report/node_modules/has-flag": {
+      "version": "4.0.0",
       "dev": true,
-      "dependencies": {
-        "@types/yargs-parser": "*"
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/istanbul-lib-report/node_modules/supports-color": {
+      "version": "7.2.0",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "has-flag": "^4.0.0"
       },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/istanbul-lib-source-maps": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
       },
       "engines": {
         "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/ci-info": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-      "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
-      "dev": true
+    "node_modules/istanbul-lib-source-maps/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "node_modules/jest-environment-jsdom/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/istanbul-middleware": {
+      "version": "0.2.2",
       "dev": true,
+      "license": "BSD",
       "dependencies": {
-        "color-name": "~1.1.4"
+        "archiver": "0.14.x",
+        "body-parser": "~1.12.3",
+        "express": "4.x",
+        "istanbul": "0.4.x"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=0.6.x"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+    "node_modules/istanbul-middleware/node_modules/body-parser": {
+      "version": "1.12.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "bytes": "1.0.0",
+        "content-type": "~1.0.1",
+        "debug": "~2.2.0",
+        "depd": "~1.0.1",
+        "iconv-lite": "0.4.8",
+        "on-finished": "~2.2.1",
+        "qs": "2.4.2",
+        "raw-body": "~2.0.1",
+        "type-is": "~1.6.2"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/istanbul-middleware/node_modules/bytes": {
+      "version": "1.0.0",
       "dev": true
     },
-    "node_modules/jest-environment-jsdom/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/istanbul-middleware/node_modules/debug": {
+      "version": "2.2.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "0.7.1"
+      }
+    },
+    "node_modules/istanbul-middleware/node_modules/depd": {
+      "version": "1.0.1",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/istanbul-middleware/node_modules/ee-first": {
+      "version": "1.1.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/istanbul-middleware/node_modules/iconv-lite": {
+      "version": "0.4.8",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.0"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/jest-util": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-      "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+    "node_modules/istanbul-middleware/node_modules/ms": {
+      "version": "0.7.1",
+      "dev": true
+    },
+    "node_modules/istanbul-middleware/node_modules/on-finished": {
+      "version": "2.2.1",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jest/types": "^27.2.5",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.4",
-        "picomatch": "^2.2.3"
+        "ee-first": "1.1.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/istanbul-middleware/node_modules/qs": {
+      "version": "2.4.2",
+      "dev": true
+    },
+    "node_modules/istanbul-middleware/node_modules/raw-body": {
+      "version": "2.0.2",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "bytes": "2.1.0",
+        "iconv-lite": "0.4.8"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/istanbul-middleware/node_modules/raw-body/node_modules/bytes": {
+      "version": "2.1.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/istanbul-reports": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz",
+      "integrity": "sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==",
+      "dev": true,
+      "dependencies": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest-environment-node": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.3.1.tgz",
-      "integrity": "sha512-T89F/FgkE8waqrTSA7/ydMkcc52uYPgZZ6q8OaZgyiZkJb5QNNCF6oPZjH9IfPFfcc9uBWh1574N0kY0pSvTXw==",
+    "node_modules/istanbul/node_modules/async": {
+      "version": "1.5.2",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/istanbul/node_modules/escodegen": {
+      "version": "1.8.1",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "@jest/environment": "^27.3.1",
-        "@jest/fake-timers": "^27.3.1",
-        "@jest/types": "^27.2.5",
-        "@types/node": "*",
-        "jest-mock": "^27.3.0",
-        "jest-util": "^27.3.1"
+        "esprima": "^2.7.1",
+        "estraverse": "^1.9.1",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">=0.12.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.2.0"
       }
     },
-    "node_modules/jest-environment-node/node_modules/@jest/types": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-      "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+    "node_modules/istanbul/node_modules/esprima": {
+      "version": "2.7.3",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/istanbul/node_modules/estraverse": {
+      "version": "1.9.3",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/istanbul/node_modules/glob": {
+      "version": "5.0.15",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "2 || 3",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/istanbul/node_modules/has-flag": {
+      "version": "1.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/istanbul/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/istanbul/node_modules/resolve": {
+      "version": "1.1.7",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/istanbul/node_modules/source-map": {
+      "version": "0.2.0",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "amdefine": ">=0.0.4"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/istanbul/node_modules/supports-color": {
+      "version": "3.2.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/istanbul/node_modules/wordwrap": {
+      "version": "1.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/iterator.prototype": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.2.tgz",
+      "integrity": "sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.2.1",
+        "get-intrinsic": "^1.2.1",
+        "has-symbols": "^1.0.3",
+        "reflect.getprototypeof": "^1.0.4",
+        "set-function-name": "^2.0.1"
+      }
+    },
+    "node_modules/jest-changed-files": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
+      "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
+      "dev": true,
+      "dependencies": {
+        "execa": "^5.0.0",
+        "jest-util": "^29.7.0",
+        "p-limit": "^3.1.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-changed-files/node_modules/@jest/types": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
       "dev": true,
       "dependencies": {
+        "@jest/schemas": "^29.6.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
-        "@types/yargs": "^16.0.0",
+        "@types/yargs": "^17.0.8",
         "chalk": "^4.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-environment-node/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+    "node_modules/jest-changed-files/node_modules/@types/yargs": {
+      "version": "17.0.32",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
       "dev": true,
       "dependencies": {
         "@types/yargs-parser": "*"
       }
     },
-    "node_modules/jest-environment-node/node_modules/ansi-styles": {
+    "node_modules/jest-changed-files/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
@@ -13091,7 +14413,7 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-environment-node/node_modules/chalk": {
+    "node_modules/jest-changed-files/node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
@@ -13107,13 +14429,22 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-environment-node/node_modules/ci-info": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-      "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
-      "dev": true
+    "node_modules/jest-changed-files/node_modules/ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/jest-environment-node/node_modules/color-convert": {
+    "node_modules/jest-changed-files/node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
@@ -13125,13 +14456,13 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-environment-node/node_modules/color-name": {
+    "node_modules/jest-changed-files/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/jest-environment-node/node_modules/has-flag": {
+    "node_modules/jest-changed-files/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
@@ -13140,24 +14471,39 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-environment-node/node_modules/jest-util": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-      "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+    "node_modules/jest-changed-files/node_modules/jest-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^27.2.5",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.4",
+        "graceful-fs": "^4.2.9",
         "picomatch": "^2.2.3"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-environment-node/node_modules/supports-color": {
+    "node_modules/jest-changed-files/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,
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-changed-files/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
@@ -13169,67 +14515,64 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-get-type": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.3.1.tgz",
-      "integrity": "sha512-+Ilqi8hgHSAdhlQ3s12CAVNd8H96ZkQBfYoXmArzZnOfAtVAJEiPDBirjByEblvG/4LPJmkL+nBqPO3A1YJAEg==",
-      "dev": true,
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-haste-map": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.3.1.tgz",
-      "integrity": "sha512-lYfNZIzwPccDJZIyk9Iz5iQMM/MH56NIIcGj7AFU1YyA4ewWFBl8z+YPJuSCRML/ee2cCt2y3W4K3VXPT6Nhzg==",
+    "node_modules/jest-circus": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
+      "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^27.2.5",
-        "@types/graceful-fs": "^4.1.2",
+        "@jest/environment": "^29.7.0",
+        "@jest/expect": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
-        "anymatch": "^3.0.3",
-        "fb-watchman": "^2.0.0",
-        "graceful-fs": "^4.2.4",
-        "jest-regex-util": "^27.0.6",
-        "jest-serializer": "^27.0.6",
-        "jest-util": "^27.3.1",
-        "jest-worker": "^27.3.1",
-        "micromatch": "^4.0.4",
-        "walker": "^1.0.7"
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "dedent": "^1.0.0",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^29.7.0",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "p-limit": "^3.1.0",
+        "pretty-format": "^29.7.0",
+        "pure-rand": "^6.0.0",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "^2.3.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-haste-map/node_modules/@jest/types": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-      "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+    "node_modules/jest-circus/node_modules/@jest/types": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
       "dev": true,
       "dependencies": {
+        "@jest/schemas": "^29.6.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
-        "@types/yargs": "^16.0.0",
+        "@types/yargs": "^17.0.8",
         "chalk": "^4.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-haste-map/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+    "node_modules/jest-circus/node_modules/@types/yargs": {
+      "version": "17.0.32",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
       "dev": true,
       "dependencies": {
         "@types/yargs-parser": "*"
       }
     },
-    "node_modules/jest-haste-map/node_modules/ansi-styles": {
+    "node_modules/jest-circus/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
@@ -13244,7 +14587,7 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-haste-map/node_modules/chalk": {
+    "node_modules/jest-circus/node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
@@ -13260,13 +14603,22 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-haste-map/node_modules/ci-info": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-      "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
-      "dev": true
+    "node_modules/jest-circus/node_modules/ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/jest-haste-map/node_modules/color-convert": {
+    "node_modules/jest-circus/node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
@@ -13278,13 +14630,13 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-haste-map/node_modules/color-name": {
+    "node_modules/jest-circus/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/jest-haste-map/node_modules/has-flag": {
+    "node_modules/jest-circus/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
@@ -13293,24 +14645,39 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-haste-map/node_modules/jest-util": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-      "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+    "node_modules/jest-circus/node_modules/jest-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^27.2.5",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.4",
+        "graceful-fs": "^4.2.9",
         "picomatch": "^2.2.3"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-haste-map/node_modules/supports-color": {
+    "node_modules/jest-circus/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,
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-circus/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
@@ -13322,61 +14689,78 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-jasmine2": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.3.1.tgz",
-      "integrity": "sha512-WK11ZUetDQaC09w4/j7o4FZDUIp+4iYWH/Lik34Pv7ukL+DuXFGdnmmi7dT58J2ZYKFB5r13GyE0z3NPeyJmsg==",
+    "node_modules/jest-config": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
+      "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
       "dev": true,
       "dependencies": {
-        "@babel/traverse": "^7.1.0",
-        "@jest/environment": "^27.3.1",
-        "@jest/source-map": "^27.0.6",
-        "@jest/test-result": "^27.3.1",
-        "@jest/types": "^27.2.5",
-        "@types/node": "*",
+        "@babel/core": "^7.11.6",
+        "@jest/test-sequencer": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "babel-jest": "^29.7.0",
         "chalk": "^4.0.0",
-        "co": "^4.6.0",
-        "expect": "^27.3.1",
-        "is-generator-fn": "^2.0.0",
-        "jest-each": "^27.3.1",
-        "jest-matcher-utils": "^27.3.1",
-        "jest-message-util": "^27.3.1",
-        "jest-runtime": "^27.3.1",
-        "jest-snapshot": "^27.3.1",
-        "jest-util": "^27.3.1",
-        "pretty-format": "^27.3.1",
-        "throat": "^6.0.1"
+        "ci-info": "^3.2.0",
+        "deepmerge": "^4.2.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-circus": "^29.7.0",
+        "jest-environment-node": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-runner": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "parse-json": "^5.2.0",
+        "pretty-format": "^29.7.0",
+        "slash": "^3.0.0",
+        "strip-json-comments": "^3.1.1"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@types/node": "*",
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "ts-node": {
+          "optional": true
+        }
       }
     },
-    "node_modules/jest-jasmine2/node_modules/@jest/types": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-      "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+    "node_modules/jest-config/node_modules/@jest/types": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
       "dev": true,
       "dependencies": {
+        "@jest/schemas": "^29.6.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
-        "@types/yargs": "^16.0.0",
+        "@types/yargs": "^17.0.8",
         "chalk": "^4.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+    "node_modules/jest-config/node_modules/@types/yargs": {
+      "version": "17.0.32",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
       "dev": true,
       "dependencies": {
         "@types/yargs-parser": "*"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/ansi-styles": {
+    "node_modules/jest-config/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
@@ -13391,7 +14775,7 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/chalk": {
+    "node_modules/jest-config/node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
@@ -13407,13 +14791,22 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/ci-info": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-      "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
-      "dev": true
+    "node_modules/jest-config/node_modules/ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/jest-jasmine2/node_modules/color-convert": {
+    "node_modules/jest-config/node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
@@ -13425,13 +14818,13 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/color-name": {
+    "node_modules/jest-config/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/jest-jasmine2/node_modules/has-flag": {
+    "node_modules/jest-config/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
@@ -13440,24 +14833,24 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/jest-util": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-      "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+    "node_modules/jest-config/node_modules/jest-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^27.2.5",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.4",
+        "graceful-fs": "^4.2.9",
         "picomatch": "^2.2.3"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/supports-color": {
+    "node_modules/jest-config/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
@@ -13469,35 +14862,22 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-leak-detector": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.3.1.tgz",
-      "integrity": "sha512-78QstU9tXbaHzwlRlKmTpjP9k4Pvre5l0r8Spo4SbFFVy/4Abg9I6ZjHwjg2QyKEAMg020XcjP+UgLZIY50yEg==",
-      "dev": true,
-      "dependencies": {
-        "jest-get-type": "^27.3.1",
-        "pretty-format": "^27.3.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-matcher-utils": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.3.1.tgz",
-      "integrity": "sha512-hX8N7zXS4k+8bC1Aj0OWpGb7D3gIXxYvPNK1inP5xvE4ztbz3rc4AkI6jGVaerepBnfWB17FL5lWFJT3s7qo8w==",
+    "node_modules/jest-diff": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
+      "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
-        "jest-diff": "^27.3.1",
-        "jest-get-type": "^27.3.1",
-        "pretty-format": "^27.3.1"
+        "diff-sequences": "^29.6.3",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-matcher-utils/node_modules/ansi-styles": {
+    "node_modules/jest-diff/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
@@ -13512,7 +14892,7 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-matcher-utils/node_modules/chalk": {
+    "node_modules/jest-diff/node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
@@ -13528,7 +14908,7 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-matcher-utils/node_modules/color-convert": {
+    "node_modules/jest-diff/node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
@@ -13540,13 +14920,13 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-matcher-utils/node_modules/color-name": {
+    "node_modules/jest-diff/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/jest-matcher-utils/node_modules/has-flag": {
+    "node_modules/jest-diff/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
@@ -13555,7 +14935,7 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-matcher-utils/node_modules/supports-color": {
+    "node_modules/jest-diff/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
@@ -13567,52 +14947,61 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-message-util": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.3.1.tgz",
-      "integrity": "sha512-bh3JEmxsTZ/9rTm0jQrPElbY2+y48Rw2t47uMfByNyUVR+OfPh4anuyKsGqsNkXk/TI4JbLRZx+7p7Hdt6q1yg==",
+    "node_modules/jest-docblock": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
+      "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^27.2.5",
-        "@types/stack-utils": "^2.0.0",
+        "detect-newline": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-each": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
+      "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^29.6.3",
         "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.4",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^27.3.1",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
+        "jest-get-type": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "pretty-format": "^29.7.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-message-util/node_modules/@jest/types": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-      "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+    "node_modules/jest-each/node_modules/@jest/types": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
       "dev": true,
       "dependencies": {
+        "@jest/schemas": "^29.6.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
-        "@types/yargs": "^16.0.0",
+        "@types/yargs": "^17.0.8",
         "chalk": "^4.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-message-util/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+    "node_modules/jest-each/node_modules/@types/yargs": {
+      "version": "17.0.32",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
       "dev": true,
       "dependencies": {
         "@types/yargs-parser": "*"
       }
     },
-    "node_modules/jest-message-util/node_modules/ansi-styles": {
+    "node_modules/jest-each/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
@@ -13627,7 +15016,7 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-message-util/node_modules/chalk": {
+    "node_modules/jest-each/node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
@@ -13643,7 +15032,22 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-message-util/node_modules/color-convert": {
+    "node_modules/jest-each/node_modules/ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-each/node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
@@ -13655,13 +15059,13 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-message-util/node_modules/color-name": {
+    "node_modules/jest-each/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/jest-message-util/node_modules/has-flag": {
+    "node_modules/jest-each/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
@@ -13670,7 +15074,24 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-message-util/node_modules/supports-color": {
+    "node_modules/jest-each/node_modules/jest-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-each/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
@@ -13682,45 +15103,50 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-mock": {
-      "version": "27.3.0",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.3.0.tgz",
-      "integrity": "sha512-ziZiLk0elZOQjD08bLkegBzv5hCABu/c8Ytx45nJKkysQwGaonvmTxwjLqEA4qGdasq9o2I8/HtdGMNnVsMTGw==",
+    "node_modules/jest-environment-node": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
+      "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^27.2.5",
-        "@types/node": "*"
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-mock/node_modules/@jest/types": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-      "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+    "node_modules/jest-environment-node/node_modules/@jest/types": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
       "dev": true,
       "dependencies": {
+        "@jest/schemas": "^29.6.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
-        "@types/yargs": "^16.0.0",
+        "@types/yargs": "^17.0.8",
         "chalk": "^4.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-mock/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+    "node_modules/jest-environment-node/node_modules/@types/yargs": {
+      "version": "17.0.32",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
       "dev": true,
       "dependencies": {
         "@types/yargs-parser": "*"
       }
     },
-    "node_modules/jest-mock/node_modules/ansi-styles": {
+    "node_modules/jest-environment-node/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
@@ -13735,7 +15161,7 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-mock/node_modules/chalk": {
+    "node_modules/jest-environment-node/node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
@@ -13751,7 +15177,22 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-mock/node_modules/color-convert": {
+    "node_modules/jest-environment-node/node_modules/ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-environment-node/node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
@@ -13763,13 +15204,13 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-mock/node_modules/color-name": {
+    "node_modules/jest-environment-node/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/jest-mock/node_modules/has-flag": {
+    "node_modules/jest-environment-node/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
@@ -13778,7 +15219,24 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-mock/node_modules/supports-color": {
+    "node_modules/jest-environment-node/node_modules/jest-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-environment-node/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
@@ -13790,37 +15248,71 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-pnp-resolver": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
-      "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
+    "node_modules/jest-get-type": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
+      "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
       "dev": true,
       "engines": {
-        "node": ">=6"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-haste-map": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
+      "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@types/graceful-fs": "^4.1.3",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-regex-util": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "jest-worker": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "walker": "^1.0.8"
       },
-      "peerDependencies": {
-        "jest-resolve": "*"
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       },
-      "peerDependenciesMeta": {
-        "jest-resolve": {
-          "optional": true
-        }
+      "optionalDependencies": {
+        "fsevents": "^2.3.2"
       }
     },
-    "node_modules/jest-progress-bar-reporter": {
-      "version": "1.0.21",
+    "node_modules/jest-haste-map/node_modules/@jest/types": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "chalk": "4.1.1",
-        "moment": "2.29.1",
-        "progress": "2.0.3"
+        "@jest/schemas": "^29.6.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-progress-bar-reporter/node_modules/ansi-styles": {
+    "node_modules/jest-haste-map/node_modules/@types/yargs": {
+      "version": "17.0.32",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
+      "dev": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/jest-haste-map/node_modules/ansi-styles": {
       "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -13831,10 +15323,11 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-progress-bar-reporter/node_modules/chalk": {
-      "version": "4.1.1",
+    "node_modules/jest-haste-map/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -13846,10 +15339,26 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-progress-bar-reporter/node_modules/color-convert": {
+    "node_modules/jest-haste-map/node_modules/ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-haste-map/node_modules/color-convert": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -13857,100 +15366,79 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-progress-bar-reporter/node_modules/color-name": {
+    "node_modules/jest-haste-map/node_modules/color-name": {
       "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
-    "node_modules/jest-progress-bar-reporter/node_modules/has-flag": {
+    "node_modules/jest-haste-map/node_modules/has-flag": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest-progress-bar-reporter/node_modules/supports-color": {
-      "version": "7.2.0",
+    "node_modules/jest-haste-map/node_modules/jest-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
       },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-regex-util": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.0.6.tgz",
-      "integrity": "sha512-SUhPzBsGa1IKm8hx2F4NfTGGp+r7BXJ4CulsZ1k2kI+mGLG+lxGrs76veN2LF/aUdGosJBzKgXmNCw+BzFqBDQ==",
-      "dev": true,
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-resolve": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.3.1.tgz",
-      "integrity": "sha512-Dfzt25CFSPo3Y3GCbxynRBZzxq9AdyNN+x/v2IqYx6KVT5Z6me2Z/PsSGFSv3cOSUZqJ9pHxilao/I/m9FouLw==",
+    "node_modules/jest-haste-map/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^27.2.5",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^27.3.1",
-        "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^27.3.1",
-        "jest-validate": "^27.3.1",
-        "resolve": "^1.20.0",
-        "resolve.exports": "^1.1.0",
-        "slash": "^3.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">=8"
       }
     },
-    "node_modules/jest-resolve-dependencies": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.3.1.tgz",
-      "integrity": "sha512-X7iLzY8pCiYOnvYo2YrK3P9oSE8/3N2f4pUZMJ8IUcZnT81vlSonya1KTO9ZfKGuC+svE6FHK/XOb8SsoRUV1A==",
+    "node_modules/jest-leak-detector": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
+      "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^27.2.5",
-        "jest-regex-util": "^27.0.6",
-        "jest-snapshot": "^27.3.1"
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-resolve-dependencies/node_modules/@jest/types": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-      "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+    "node_modules/jest-matcher-utils": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
+      "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
       "dev": true,
       "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
+        "chalk": "^4.0.0",
+        "jest-diff": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-resolve-dependencies/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dev": true,
-      "dependencies": {
-        "@types/yargs-parser": "*"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-resolve-dependencies/node_modules/ansi-styles": {
+    "node_modules/jest-matcher-utils/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
@@ -13965,7 +15453,7 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-resolve-dependencies/node_modules/chalk": {
+    "node_modules/jest-matcher-utils/node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
@@ -13981,7 +15469,7 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-resolve-dependencies/node_modules/color-convert": {
+    "node_modules/jest-matcher-utils/node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
@@ -13993,13 +15481,13 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-resolve-dependencies/node_modules/color-name": {
+    "node_modules/jest-matcher-utils/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/jest-resolve-dependencies/node_modules/has-flag": {
+    "node_modules/jest-matcher-utils/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
@@ -14008,7 +15496,7 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-resolve-dependencies/node_modules/supports-color": {
+    "node_modules/jest-matcher-utils/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
@@ -14020,32 +15508,53 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-resolve/node_modules/@jest/types": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-      "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+    "node_modules/jest-message-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
+      "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^29.6.3",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^29.7.0",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-message-util/node_modules/@jest/types": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
       "dev": true,
       "dependencies": {
+        "@jest/schemas": "^29.6.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
-        "@types/yargs": "^16.0.0",
+        "@types/yargs": "^17.0.8",
         "chalk": "^4.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-resolve/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+    "node_modules/jest-message-util/node_modules/@types/yargs": {
+      "version": "17.0.32",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
       "dev": true,
       "dependencies": {
         "@types/yargs-parser": "*"
       }
     },
-    "node_modules/jest-resolve/node_modules/ansi-styles": {
+    "node_modules/jest-message-util/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
@@ -14060,7 +15569,7 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-resolve/node_modules/chalk": {
+    "node_modules/jest-message-util/node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
@@ -14076,13 +15585,7 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-resolve/node_modules/ci-info": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-      "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
-      "dev": true
-    },
-    "node_modules/jest-resolve/node_modules/color-convert": {
+    "node_modules/jest-message-util/node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
@@ -14094,13 +15597,13 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-resolve/node_modules/color-name": {
+    "node_modules/jest-message-util/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/jest-resolve/node_modules/has-flag": {
+    "node_modules/jest-message-util/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
@@ -14109,24 +15612,7 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-resolve/node_modules/jest-util": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-      "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^27.2.5",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.4",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/supports-color": {
+    "node_modules/jest-message-util/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
@@ -14138,65 +15624,47 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-runner": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.3.1.tgz",
-      "integrity": "sha512-r4W6kBn6sPr3TBwQNmqE94mPlYVn7fLBseeJfo4E2uCTmAyDFm2O5DYAQAFP7Q3YfiA/bMwg8TVsciP7k0xOww==",
+    "node_modules/jest-mock": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
+      "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^27.3.1",
-        "@jest/environment": "^27.3.1",
-        "@jest/test-result": "^27.3.1",
-        "@jest/transform": "^27.3.1",
-        "@jest/types": "^27.2.5",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
-        "chalk": "^4.0.0",
-        "emittery": "^0.8.1",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.4",
-        "jest-docblock": "^27.0.6",
-        "jest-environment-jsdom": "^27.3.1",
-        "jest-environment-node": "^27.3.1",
-        "jest-haste-map": "^27.3.1",
-        "jest-leak-detector": "^27.3.1",
-        "jest-message-util": "^27.3.1",
-        "jest-resolve": "^27.3.1",
-        "jest-runtime": "^27.3.1",
-        "jest-util": "^27.3.1",
-        "jest-worker": "^27.3.1",
-        "source-map-support": "^0.5.6",
-        "throat": "^6.0.1"
+        "jest-util": "^29.7.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-runner/node_modules/@jest/types": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-      "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+    "node_modules/jest-mock/node_modules/@jest/types": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
       "dev": true,
       "dependencies": {
+        "@jest/schemas": "^29.6.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
-        "@types/yargs": "^16.0.0",
+        "@types/yargs": "^17.0.8",
         "chalk": "^4.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-runner/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+    "node_modules/jest-mock/node_modules/@types/yargs": {
+      "version": "17.0.32",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
       "dev": true,
       "dependencies": {
         "@types/yargs-parser": "*"
       }
     },
-    "node_modules/jest-runner/node_modules/ansi-styles": {
+    "node_modules/jest-mock/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
@@ -14211,7 +15679,7 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-runner/node_modules/chalk": {
+    "node_modules/jest-mock/node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
@@ -14227,13 +15695,22 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-runner/node_modules/ci-info": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-      "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
-      "dev": true
+    "node_modules/jest-mock/node_modules/ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/jest-runner/node_modules/color-convert": {
+    "node_modules/jest-mock/node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
@@ -14245,13 +15722,13 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-runner/node_modules/color-name": {
+    "node_modules/jest-mock/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/jest-runner/node_modules/has-flag": {
+    "node_modules/jest-mock/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
@@ -14260,24 +15737,24 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-runner/node_modules/jest-util": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-      "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+    "node_modules/jest-mock/node_modules/jest-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^27.2.5",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.4",
+        "graceful-fs": "^4.2.9",
         "picomatch": "^2.2.3"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-runner/node_modules/supports-color": {
+    "node_modules/jest-mock/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
@@ -14289,73 +15766,38 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-runtime": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.3.1.tgz",
-      "integrity": "sha512-qtO6VxPbS8umqhEDpjA4pqTkKQ1Hy4ZSi9mDVeE9Za7LKBo2LdW2jmT+Iod3XFaJqINikZQsn2wEi0j9wPRbLg==",
-      "dev": true,
-      "dependencies": {
-        "@jest/console": "^27.3.1",
-        "@jest/environment": "^27.3.1",
-        "@jest/globals": "^27.3.1",
-        "@jest/source-map": "^27.0.6",
-        "@jest/test-result": "^27.3.1",
-        "@jest/transform": "^27.3.1",
-        "@jest/types": "^27.2.5",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0",
-        "cjs-module-lexer": "^1.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "execa": "^5.0.0",
-        "exit": "^0.1.2",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^27.3.1",
-        "jest-message-util": "^27.3.1",
-        "jest-mock": "^27.3.0",
-        "jest-regex-util": "^27.0.6",
-        "jest-resolve": "^27.3.1",
-        "jest-snapshot": "^27.3.1",
-        "jest-util": "^27.3.1",
-        "jest-validate": "^27.3.1",
-        "slash": "^3.0.0",
-        "strip-bom": "^4.0.0",
-        "yargs": "^16.2.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/@jest/types": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-      "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+    "node_modules/jest-pnp-resolver": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
+      "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
       "dev": true,
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">=6"
+      },
+      "peerDependencies": {
+        "jest-resolve": "*"
+      },
+      "peerDependenciesMeta": {
+        "jest-resolve": {
+          "optional": true
+        }
       }
     },
-    "node_modules/jest-runtime/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+    "node_modules/jest-progress-bar-reporter": {
+      "version": "1.0.25",
+      "resolved": "https://registry.npmjs.org/jest-progress-bar-reporter/-/jest-progress-bar-reporter-1.0.25.tgz",
+      "integrity": "sha512-iFWtsl0j+OeHeMCu5fXL8pSN3h06NQlG/UPpcuO2PP2C+hr81K397+Mh34rU3GgA9kQga6ctu7gfOEOgUlKFug==",
       "dev": true,
       "dependencies": {
-        "@types/yargs-parser": "*"
+        "chalk": "4.1.1",
+        "moment": "^2.29.4",
+        "progress": "2.0.3"
       }
     },
-    "node_modules/jest-runtime/node_modules/ansi-styles": {
+    "node_modules/jest-progress-bar-reporter/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -14366,11 +15808,10 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-runtime/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/jest-progress-bar-reporter/node_modules/chalk": {
+      "version": "4.1.1",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -14382,17 +15823,10 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-runtime/node_modules/ci-info": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-      "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
-      "dev": true
-    },
-    "node_modules/jest-runtime/node_modules/color-convert": {
+    "node_modules/jest-progress-bar-reporter/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -14400,76 +15834,103 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-runtime/node_modules/color-name": {
+    "node_modules/jest-progress-bar-reporter/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
-    "node_modules/jest-runtime/node_modules/has-flag": {
+    "node_modules/jest-progress-bar-reporter/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest-runtime/node_modules/jest-util": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-      "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+    "node_modules/jest-progress-bar-reporter/node_modules/supports-color": {
+      "version": "7.2.0",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jest/types": "^27.2.5",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.4",
-        "picomatch": "^2.2.3"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">=8"
       }
     },
-    "node_modules/jest-runtime/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/jest-regex-util": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
+      "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
+      "dev": true,
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-resolve": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
+      "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "resolve": "^1.20.0",
+        "resolve.exports": "^2.0.0",
+        "slash": "^3.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-resolve-dependencies": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
+      "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
+      "dev": true,
+      "dependencies": {
+        "jest-regex-util": "^29.6.3",
+        "jest-snapshot": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-serializer": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.0.6.tgz",
-      "integrity": "sha512-PtGdVK9EGC7dsaziskfqaAPib6wTViY3G8E5wz9tLVPhHyiDNTZn/xjZ4khAw+09QkoOVpn7vF5nPSN6dtBexA==",
+    "node_modules/jest-resolve/node_modules/@jest/types": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
       "dev": true,
       "dependencies": {
+        "@jest/schemas": "^29.6.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
-        "graceful-fs": "^4.2.4"
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-silent-reporter": {
-      "version": "0.5.0",
+    "node_modules/jest-resolve/node_modules/@types/yargs": {
+      "version": "17.0.32",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "chalk": "^4.0.0",
-        "jest-util": "^26.0.0"
+        "@types/yargs-parser": "*"
       }
     },
-    "node_modules/jest-silent-reporter/node_modules/ansi-styles": {
+    "node_modules/jest-resolve/node_modules/ansi-styles": {
       "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -14480,10 +15941,11 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-silent-reporter/node_modules/chalk": {
-      "version": "4.1.0",
+    "node_modules/jest-resolve/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -14495,10 +15957,26 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-silent-reporter/node_modules/color-convert": {
+    "node_modules/jest-resolve/node_modules/ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-resolve/node_modules/color-convert": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -14506,115 +15984,109 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-silent-reporter/node_modules/color-name": {
+    "node_modules/jest-resolve/node_modules/color-name": {
       "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
-    "node_modules/jest-silent-reporter/node_modules/has-flag": {
+    "node_modules/jest-resolve/node_modules/has-flag": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-silent-reporter/node_modules/supports-color": {
-      "version": "7.2.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest-snapshot": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.3.1.tgz",
-      "integrity": "sha512-APZyBvSgQgOT0XumwfFu7X3G5elj6TGhCBLbBdn3R1IzYustPGPE38F51dBWMQ8hRXa9je0vAdeVDtqHLvB6lg==",
+    "node_modules/jest-resolve/node_modules/jest-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
       "dev": true,
       "dependencies": {
-        "@babel/core": "^7.7.2",
-        "@babel/generator": "^7.7.2",
-        "@babel/parser": "^7.7.2",
-        "@babel/plugin-syntax-typescript": "^7.7.2",
-        "@babel/traverse": "^7.7.2",
-        "@babel/types": "^7.0.0",
-        "@jest/transform": "^27.3.1",
-        "@jest/types": "^27.2.5",
-        "@types/babel__traverse": "^7.0.4",
-        "@types/prettier": "^2.1.5",
-        "babel-preset-current-node-syntax": "^1.0.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
         "chalk": "^4.0.0",
-        "expect": "^27.3.1",
-        "graceful-fs": "^4.2.4",
-        "jest-diff": "^27.3.1",
-        "jest-get-type": "^27.3.1",
-        "jest-haste-map": "^27.3.1",
-        "jest-matcher-utils": "^27.3.1",
-        "jest-message-util": "^27.3.1",
-        "jest-resolve": "^27.3.1",
-        "jest-util": "^27.3.1",
-        "natural-compare": "^1.4.0",
-        "pretty-format": "^27.3.1",
-        "semver": "^7.3.2"
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-snapshot/node_modules/@babel/plugin-syntax-bigint": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
-      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+    "node_modules/jest-resolve/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+        "has-flag": "^4.0.0"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/jest-snapshot/node_modules/@babel/plugin-syntax-import-meta": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
-      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+    "node_modules/jest-runner": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
+      "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@jest/console": "^29.7.0",
+        "@jest/environment": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "emittery": "^0.13.1",
+        "graceful-fs": "^4.2.9",
+        "jest-docblock": "^29.7.0",
+        "jest-environment-node": "^29.7.0",
+        "jest-haste-map": "^29.7.0",
+        "jest-leak-detector": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-resolve": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-watcher": "^29.7.0",
+        "jest-worker": "^29.7.0",
+        "p-limit": "^3.1.0",
+        "source-map-support": "0.5.13"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-snapshot/node_modules/@jest/types": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-      "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+    "node_modules/jest-runner/node_modules/@jest/types": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
       "dev": true,
       "dependencies": {
+        "@jest/schemas": "^29.6.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
-        "@types/yargs": "^16.0.0",
+        "@types/yargs": "^17.0.8",
         "chalk": "^4.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-snapshot/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+    "node_modules/jest-runner/node_modules/@types/yargs": {
+      "version": "17.0.32",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
       "dev": true,
       "dependencies": {
         "@types/yargs-parser": "*"
       }
     },
-    "node_modules/jest-snapshot/node_modules/ansi-styles": {
+    "node_modules/jest-runner/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
@@ -14629,30 +16101,7 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-snapshot/node_modules/babel-preset-current-node-syntax": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
-      "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-bigint": "^7.8.3",
-        "@babel/plugin-syntax-class-properties": "^7.8.3",
-        "@babel/plugin-syntax-import-meta": "^7.8.3",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.8.3",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-top-level-await": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/chalk": {
+    "node_modules/jest-runner/node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
@@ -14668,13 +16117,22 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-snapshot/node_modules/ci-info": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-      "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
-      "dev": true
+    "node_modules/jest-runner/node_modules/ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/jest-snapshot/node_modules/color-convert": {
+    "node_modules/jest-runner/node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
@@ -14686,13 +16144,25 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-snapshot/node_modules/color-name": {
+    "node_modules/jest-runner/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/jest-snapshot/node_modules/has-flag": {
+    "node_modules/jest-runner/node_modules/emittery": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
+      "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
+      }
+    },
+    "node_modules/jest-runner/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
@@ -14701,24 +16171,58 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-snapshot/node_modules/jest-util": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-      "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+    "node_modules/jest-runner/node_modules/jest-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^27.2.5",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.4",
+        "graceful-fs": "^4.2.9",
         "picomatch": "^2.2.3"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-snapshot/node_modules/supports-color": {
+    "node_modules/jest-runner/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,
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-runner/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/jest-runner/node_modules/source-map-support": {
+      "version": "0.5.13",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
+      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
+      "dev": true,
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/jest-runner/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
@@ -14730,26 +16234,70 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-util": {
-      "version": "26.6.2",
+    "node_modules/jest-runtime": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
+      "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/globals": "^29.7.0",
+        "@jest/source-map": "^29.6.3",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "cjs-module-lexer": "^1.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-mock": "^29.7.0",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/@jest/types": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@jest/types": "^26.6.2",
+        "@jest/schemas": "^29.6.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.4",
-        "is-ci": "^2.0.0",
-        "micromatch": "^4.0.2"
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-util/node_modules/ansi-styles": {
+    "node_modules/jest-runtime/node_modules/@types/yargs": {
+      "version": "17.0.32",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
+      "dev": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/ansi-styles": {
       "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -14760,10 +16308,11 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-util/node_modules/chalk": {
-      "version": "4.1.0",
+    "node_modules/jest-runtime/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -14775,10 +16324,26 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-util/node_modules/color-convert": {
-      "version": "2.0.1",
+    "node_modules/jest-runtime/node_modules/ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -14786,73 +16351,61 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-util/node_modules/color-name": {
+    "node_modules/jest-runtime/node_modules/color-name": {
       "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
-    "node_modules/jest-util/node_modules/has-flag": {
+    "node_modules/jest-runtime/node_modules/has-flag": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-util/node_modules/supports-color": {
-      "version": "7.2.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest-validate": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.3.1.tgz",
-      "integrity": "sha512-3H0XCHDFLA9uDII67Bwi1Vy7AqwA5HqEEjyy934lgVhtJ3eisw6ShOF1MDmRPspyikef5MyExvIm0/TuLzZ86Q==",
+    "node_modules/jest-runtime/node_modules/jest-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^27.2.5",
-        "camelcase": "^6.2.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
         "chalk": "^4.0.0",
-        "jest-get-type": "^27.3.1",
-        "leven": "^3.1.0",
-        "pretty-format": "^27.3.1"
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-validate/node_modules/@jest/types": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-      "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+    "node_modules/jest-runtime/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">=8"
       }
     },
-    "node_modules/jest-validate/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+    "node_modules/jest-silent-reporter": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/jest-silent-reporter/-/jest-silent-reporter-0.6.0.tgz",
+      "integrity": "sha512-4nmS+5o7ycVlvbQOTx7CnGdbBtP2646hnDgQpQLaVhjHcQNHD+gqBAetyjRDlgpZ8+8N82MWI59K+EX2LsVk7g==",
       "dev": true,
       "dependencies": {
-        "@types/yargs-parser": "*"
+        "chalk": "^4.0.0",
+        "jest-util": "^26.0.0"
       }
     },
-    "node_modules/jest-validate/node_modules/ansi-styles": {
+    "node_modules/jest-silent-reporter/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
@@ -14867,19 +16420,7 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-validate/node_modules/camelcase": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
-      "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/jest-validate/node_modules/chalk": {
+    "node_modules/jest-silent-reporter/node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
@@ -14895,7 +16436,7 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-validate/node_modules/color-convert": {
+    "node_modules/jest-silent-reporter/node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
@@ -14907,13 +16448,13 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-validate/node_modules/color-name": {
+    "node_modules/jest-silent-reporter/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/jest-validate/node_modules/has-flag": {
+    "node_modules/jest-silent-reporter/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
@@ -14922,7 +16463,7 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-validate/node_modules/supports-color": {
+    "node_modules/jest-silent-reporter/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
@@ -14934,50 +16475,64 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-watcher": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.3.1.tgz",
-      "integrity": "sha512-9/xbV6chABsGHWh9yPaAGYVVKurWoP3ZMCv6h+O1v9/+pkOroigs6WzZ0e9gLP/njokUwM7yQhr01LKJVMkaZA==",
+    "node_modules/jest-snapshot": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
+      "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
       "dev": true,
       "dependencies": {
-        "@jest/test-result": "^27.3.1",
-        "@jest/types": "^27.2.5",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
+        "@babel/core": "^7.11.6",
+        "@babel/generator": "^7.7.2",
+        "@babel/plugin-syntax-jsx": "^7.7.2",
+        "@babel/plugin-syntax-typescript": "^7.7.2",
+        "@babel/types": "^7.3.3",
+        "@jest/expect-utils": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "babel-preset-current-node-syntax": "^1.0.0",
         "chalk": "^4.0.0",
-        "jest-util": "^27.3.1",
-        "string-length": "^4.0.1"
+        "expect": "^29.7.0",
+        "graceful-fs": "^4.2.9",
+        "jest-diff": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^29.7.0",
+        "semver": "^7.5.3"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-watcher/node_modules/@jest/types": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-      "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+    "node_modules/jest-snapshot/node_modules/@jest/types": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
       "dev": true,
       "dependencies": {
+        "@jest/schemas": "^29.6.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
-        "@types/yargs": "^16.0.0",
+        "@types/yargs": "^17.0.8",
         "chalk": "^4.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-watcher/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+    "node_modules/jest-snapshot/node_modules/@types/yargs": {
+      "version": "17.0.32",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
       "dev": true,
       "dependencies": {
         "@types/yargs-parser": "*"
       }
     },
-    "node_modules/jest-watcher/node_modules/ansi-styles": {
+    "node_modules/jest-snapshot/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
@@ -14992,7 +16547,7 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-watcher/node_modules/chalk": {
+    "node_modules/jest-snapshot/node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
@@ -15008,13 +16563,22 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-watcher/node_modules/ci-info": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-      "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
-      "dev": true
+    "node_modules/jest-snapshot/node_modules/ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/jest-watcher/node_modules/color-convert": {
+    "node_modules/jest-snapshot/node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
@@ -15026,13 +16590,13 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-watcher/node_modules/color-name": {
+    "node_modules/jest-snapshot/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/jest-watcher/node_modules/has-flag": {
+    "node_modules/jest-snapshot/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
@@ -15041,24 +16605,24 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-watcher/node_modules/jest-util": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-      "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+    "node_modules/jest-snapshot/node_modules/jest-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^27.2.5",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.4",
+        "graceful-fs": "^4.2.9",
         "picomatch": "^2.2.3"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-watcher/node_modules/supports-color": {
+    "node_modules/jest-snapshot/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
@@ -15070,596 +16634,934 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-worker": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.3.1.tgz",
-      "integrity": "sha512-ks3WCzsiZaOPJl/oMsDjaf0TRiSv7ctNgs0FqRr2nARsovz6AWWy4oLElwcquGSz692DzgZQrCLScPNs5YlC4g==",
+    "node_modules/jest-util": {
+      "version": "26.6.2",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "is-ci": "^2.0.0",
+        "micromatch": "^4.0.2"
       },
       "engines": {
-        "node": ">= 10.13.0"
+        "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-worker/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/jest-util/node_modules/ansi-styles": {
+      "version": "4.3.0",
       "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-worker/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+    "node_modules/jest-util/node_modules/chalk": {
+      "version": "4.1.0",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
         "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jison": {
-      "version": "0.4.18",
+    "node_modules/jest-util/node_modules/color-convert": {
+      "version": "2.0.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "cjson": "0.3.0",
-        "ebnf-parser": "0.1.10",
-        "escodegen": "1.3.x",
-        "esprima": "1.1.x",
-        "jison-lex": "0.3.x",
-        "JSONSelect": "0.4.0",
-        "lex-parser": "~0.1.3",
-        "nomnom": "1.5.2"
-      },
-      "bin": {
-        "jison": "lib/cli.js"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">=0.4"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/jison-lex": {
-      "version": "0.3.4",
+    "node_modules/jest-util/node_modules/color-name": {
+      "version": "1.1.4",
       "dev": true,
-      "dependencies": {
-        "lex-parser": "0.1.x",
-        "nomnom": "1.5.2"
-      },
-      "bin": {
-        "jison-lex": "cli.js"
-      },
+      "license": "MIT"
+    },
+    "node_modules/jest-util/node_modules/has-flag": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=0.4"
+        "node": ">=8"
       }
     },
-    "node_modules/jison/node_modules/escodegen": {
-      "version": "1.3.3",
+    "node_modules/jest-util/node_modules/supports-color": {
+      "version": "7.2.0",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "esprima": "~1.1.1",
-        "estraverse": "~1.5.0",
-        "esutils": "~1.0.0"
-      },
-      "bin": {
-        "escodegen": "bin/escodegen.js",
-        "esgenerate": "bin/esgenerate.js"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
-      },
-      "optionalDependencies": {
-        "source-map": "~0.1.33"
+        "node": ">=8"
       }
     },
-    "node_modules/jison/node_modules/esprima": {
-      "version": "1.1.1",
+    "node_modules/jest-validate": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
+      "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
       "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "camelcase": "^6.2.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^29.6.3",
+        "leven": "^3.1.0",
+        "pretty-format": "^29.7.0"
       },
       "engines": {
-        "node": ">=0.4.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jison/node_modules/estraverse": {
-      "version": "1.5.1",
+    "node_modules/jest-validate/node_modules/@jest/types": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
       "dev": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
       "engines": {
-        "node": ">=0.4.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jison/node_modules/esutils": {
-      "version": "1.0.0",
+    "node_modules/jest-validate/node_modules/@types/yargs": {
+      "version": "17.0.32",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
       "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "@types/yargs-parser": "*"
       }
     },
-    "node_modules/jison/node_modules/source-map": {
-      "version": "0.1.43",
+    "node_modules/jest-validate/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "optional": true,
       "dependencies": {
-        "amdefine": ">=0.0.4"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/js-string-escape": {
-      "version": "1.0.1",
+    "node_modules/jest-validate/node_modules/camelcase": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "license": "MIT"
-    },
-    "node_modules/js-yaml": {
-      "version": "3.14.1",
+    "node_modules/jest-validate/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jsbn": {
-      "version": "0.1.1",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/jscodeshift": {
-      "version": "0.13.0",
+    "node_modules/jest-validate/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/core": "^7.13.16",
-        "@babel/parser": "^7.13.16",
-        "@babel/plugin-proposal-class-properties": "^7.13.0",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8",
-        "@babel/plugin-proposal-optional-chaining": "^7.13.12",
-        "@babel/plugin-transform-modules-commonjs": "^7.13.8",
-        "@babel/preset-flow": "^7.13.13",
-        "@babel/preset-typescript": "^7.13.0",
-        "@babel/register": "^7.13.16",
-        "babel-core": "^7.0.0-bridge.0",
-        "colors": "^1.1.2",
-        "flow-parser": "0.*",
-        "graceful-fs": "^4.2.4",
-        "micromatch": "^3.1.10",
-        "neo-async": "^2.5.0",
-        "node-dir": "^0.1.17",
-        "recast": "^0.20.4",
-        "temp": "^0.8.4",
-        "write-file-atomic": "^2.3.0"
-      },
-      "bin": {
-        "jscodeshift": "bin/jscodeshift.js"
+        "color-name": "~1.1.4"
       },
-      "peerDependencies": {
-        "@babel/preset-env": "^7.1.6"
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/jscodeshift/node_modules/braces": {
-      "version": "2.3.2",
+    "node_modules/jest-validate/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/jest-validate/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "license": "MIT",
-      "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"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/jscodeshift/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
+    "node_modules/jest-validate/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "is-extendable": "^0.1.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/jscodeshift/node_modules/fill-range": {
-      "version": "4.0.0",
+    "node_modules/jest-watcher": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
+      "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
+        "@jest/test-result": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "emittery": "^0.13.1",
+        "jest-util": "^29.7.0",
+        "string-length": "^4.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jscodeshift/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
+    "node_modules/jest-watcher/node_modules/@jest/types": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "is-extendable": "^0.1.0"
+        "@jest/schemas": "^29.6.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jscodeshift/node_modules/is-number": {
-      "version": "3.0.0",
+    "node_modules/jest-watcher/node_modules/@types/yargs": {
+      "version": "17.0.32",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "@types/yargs-parser": "*"
       }
     },
-    "node_modules/jscodeshift/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
+    "node_modules/jest-watcher/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "is-buffer": "^1.1.5"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jscodeshift/node_modules/micromatch": {
-      "version": "3.1.10",
+    "node_modules/jest-watcher/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
-      "license": "MIT",
       "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"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jscodeshift/node_modules/to-regex-range": {
-      "version": "2.1.1",
+    "node_modules/jest-watcher/node_modules/ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      },
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/jscodeshift/node_modules/write-file-atomic": {
-      "version": "2.4.3",
+    "node_modules/jest-watcher/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "graceful-fs": "^4.1.11",
-        "imurmurhash": "^0.1.4",
-        "signal-exit": "^3.0.2"
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/jsdoc-type-pratt-parser": {
-      "version": "1.1.1",
+    "node_modules/jest-watcher/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/jest-watcher/node_modules/emittery": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
+      "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
       }
     },
-    "node_modules/jsdom": {
-      "version": "16.7.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "abab": "^2.0.5",
-        "acorn": "^8.2.4",
-        "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",
-        "form-data": "^3.0.0",
-        "html-encoding-sniffer": "^2.0.1",
-        "http-proxy-agent": "^4.0.1",
-        "https-proxy-agent": "^5.0.0",
-        "is-potential-custom-element-name": "^1.0.1",
-        "nwsapi": "^2.2.0",
-        "parse5": "6.0.1",
-        "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.6",
-        "xml-name-validator": "^3.0.0"
-      },
+    "node_modules/jest-watcher/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
       "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "canvas": "^2.5.0"
-      },
-      "peerDependenciesMeta": {
-        "canvas": {
-          "optional": true
-        }
+        "node": ">=8"
       }
     },
-    "node_modules/jsdom/node_modules/acorn": {
-      "version": "8.4.1",
+    "node_modules/jest-watcher/node_modules/jest-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
       "dev": true,
-      "license": "MIT",
-      "bin": {
-        "acorn": "bin/acorn"
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
       },
       "engines": {
-        "node": ">=0.4.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jsdom/node_modules/form-data": {
-      "version": "3.0.1",
+    "node_modules/jest-watcher/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">=8"
       }
     },
-    "node_modules/jsesc": {
-      "version": "2.5.2",
+    "node_modules/jest-worker": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
+      "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
       "dev": true,
-      "license": "MIT",
-      "bin": {
-        "jsesc": "bin/jsesc"
+      "dependencies": {
+        "@types/node": "*",
+        "jest-util": "^29.7.0",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/json-bigint": {
-      "version": "1.0.0",
+    "node_modules/jest-worker/node_modules/@jest/types": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "bignumber.js": "^9.0.0"
+        "@jest/schemas": "^29.6.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/json-buffer": {
-      "version": "3.0.0",
+    "node_modules/jest-worker/node_modules/@types/yargs": {
+      "version": "17.0.32",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
       "dev": true,
-      "license": "MIT"
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
     },
-    "node_modules/json-parse-better-errors": {
-      "version": "1.0.2",
+    "node_modules/jest-worker/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "license": "MIT"
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
     },
-    "node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
+    "node_modules/jest-worker/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
-      "license": "MIT"
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
     },
-    "node_modules/json-schema": {
-      "version": "0.2.3",
-      "dev": true
+    "node_modules/jest-worker/node_modules/chalk/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/json-schema-traverse": {
-      "version": "1.0.0",
+    "node_modules/jest-worker/node_modules/ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
       "dev": true,
-      "license": "MIT"
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/json-stable-stringify": {
-      "version": "1.0.1",
+    "node_modules/jest-worker/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "jsonify": "~0.0.0"
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/jest-worker/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
-    "node_modules/json-stringify-safe": {
-      "version": "5.0.1",
+    "node_modules/jest-worker/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "license": "ISC"
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/json5": {
-      "version": "2.2.0",
+    "node_modules/jest-worker/node_modules/jest-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
       },
       "engines": {
-        "node": ">=6"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jsonfile": {
-      "version": "6.1.0",
+    "node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "universalify": "^2.0.0"
+        "has-flag": "^4.0.0"
       },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
-    "node_modules/jsonfile/node_modules/universalify": {
-      "version": "2.0.0",
+    "node_modules/jison": {
+      "version": "0.4.18",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "cjson": "0.3.0",
+        "ebnf-parser": "0.1.10",
+        "escodegen": "1.3.x",
+        "esprima": "1.1.x",
+        "jison-lex": "0.3.x",
+        "JSONSelect": "0.4.0",
+        "lex-parser": "~0.1.3",
+        "nomnom": "1.5.2"
+      },
+      "bin": {
+        "jison": "lib/cli.js"
+      },
       "engines": {
-        "node": ">= 10.0.0"
+        "node": ">=0.4"
       }
     },
-    "node_modules/jsonify": {
-      "version": "0.0.0",
+    "node_modules/jison-lex": {
+      "version": "0.3.4",
       "dev": true,
-      "license": "Public Domain"
+      "dependencies": {
+        "lex-parser": "0.1.x",
+        "nomnom": "1.5.2"
+      },
+      "bin": {
+        "jison-lex": "cli.js"
+      },
+      "engines": {
+        "node": ">=0.4"
+      }
     },
-    "node_modules/jsonlint": {
-      "version": "1.6.0",
+    "node_modules/jison/node_modules/escodegen": {
+      "version": "1.3.3",
       "dev": true,
       "dependencies": {
-        "JSV": ">= 4.0.x",
-        "nomnom": ">= 1.5.x"
+        "esprima": "~1.1.1",
+        "estraverse": "~1.5.0",
+        "esutils": "~1.0.0"
       },
       "bin": {
-        "jsonlint": "lib/cli.js"
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=0.10.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.1.33"
       }
     },
-    "node_modules/jsonminify": {
-      "version": "0.4.1",
+    "node_modules/jison/node_modules/esprima": {
+      "version": "1.1.1",
       "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
       "engines": {
-        "node": ">=0.8.0",
-        "npm": ">=1.1.0"
+        "node": ">=0.4.0"
       }
     },
-    "node_modules/JSONSelect": {
-      "version": "0.4.0",
+    "node_modules/jison/node_modules/estraverse": {
+      "version": "1.5.1",
       "dev": true,
       "engines": {
-        "node": ">=0.4.7"
+        "node": ">=0.4.0"
       }
     },
-    "node_modules/jsprim": {
-      "version": "1.4.1",
+    "node_modules/jison/node_modules/esutils": {
+      "version": "1.0.0",
       "dev": true,
-      "engines": [
-        "node >=0.6.0"
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/jss": {
-      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/jss/-/jss-10.8.2.tgz",
-      "integrity": "sha512-FkoUNxI329CKQ9OQC8L72MBF9KPf5q8mIupAJ5twU7G7XREW7ahb+7jFfrjZ4iy1qvhx1HwIWUIvkZBDnKkEdQ==",
+    "node_modules/jison/node_modules/source-map": {
+      "version": "0.1.43",
+      "dev": true,
+      "optional": true,
       "dependencies": {
-        "@babel/runtime": "^7.3.1",
-        "csstype": "^3.0.2",
-        "is-in-browser": "^1.1.3",
-        "tiny-warning": "^1.0.2"
+        "amdefine": ">=0.0.4"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/jss"
+      "engines": {
+        "node": ">=0.8.0"
       }
     },
-    "node_modules/jss-plugin-camel-case": {
-      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/jss-plugin-camel-case/-/jss-plugin-camel-case-10.8.2.tgz",
-      "integrity": "sha512-2INyxR+1UdNuKf4v9It3tNfPvf7IPrtkiwzofeKuMd5D58/dxDJVUQYRVg/n460rTlHUfsEQx43hDrcxi9dSPA==",
-      "dependencies": {
-        "@babel/runtime": "^7.3.1",
-        "hyphenate-style-name": "^1.0.3",
-        "jss": "10.8.2"
+    "node_modules/js-string-escape": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/js-string-escape/-/js-string-escape-1.0.1.tgz",
+      "integrity": "sha512-Smw4xcfIQ5LVjAOuJCvN/zIodzA/BBSsluuoSykP+lUvScIi4U6RJLfwHet5cxFnCswUjISV8oAXaqaJDY3chg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
       }
     },
-    "node_modules/jss-plugin-compose": {
-      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/jss-plugin-compose/-/jss-plugin-compose-10.8.2.tgz",
-      "integrity": "sha512-X7fDQJ6IlIJoT8A3zc++LuC1hmSGKVudb3LyXp+vHv8r2hzzfXEEZty3y2CaC5CGrWcLlYquXENjqLNmLYMgMA==",
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "license": "MIT"
+    },
+    "node_modules/js-yaml": {
+      "version": "3.14.1",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.3.1",
-        "jss": "10.8.2",
-        "tiny-warning": "^1.0.2"
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/jss-plugin-default-unit": {
-      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/jss-plugin-default-unit/-/jss-plugin-default-unit-10.8.2.tgz",
-      "integrity": "sha512-UZ7cwT9NFYSG+SEy7noRU50s4zifulFdjkUNKE+u6mW7vFP960+RglWjTgMfh79G6OENZmaYnjHV/gcKV4nSxg==",
-      "dependencies": {
-        "@babel/runtime": "^7.3.1",
-        "jss": "10.8.2"
+    "node_modules/jsbn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
+      "dev": true
+    },
+    "node_modules/jsdoc-type-pratt-parser": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz",
+      "integrity": "sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.0.0"
       }
     },
-    "node_modules/jss-plugin-expand": {
-      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/jss-plugin-expand/-/jss-plugin-expand-10.8.2.tgz",
-      "integrity": "sha512-Iy4qsZbEcomXz5aBZJYGwnzK23vK3hqlwGleqmd19fY3L+WbqTmUnW8W0fWeXSuCkw2NknBTAJuEpFcgm3b0Pw==",
-      "dependencies": {
-        "@babel/runtime": "^7.3.1",
-        "jss": "10.8.2"
+    "node_modules/jsdom": {
+      "version": "24.1.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-24.1.0.tgz",
+      "integrity": "sha512-6gpM7pRXCwIOKxX47cgOyvyQDN/Eh0f1MeKySBV2xGdKtqJBLj8P25eY3EVCWo2mglDDzozR2r2MW4T+JiNUZA==",
+      "dev": true,
+      "dependencies": {
+        "cssstyle": "^4.0.1",
+        "data-urls": "^5.0.0",
+        "decimal.js": "^10.4.3",
+        "form-data": "^4.0.0",
+        "html-encoding-sniffer": "^4.0.0",
+        "http-proxy-agent": "^7.0.2",
+        "https-proxy-agent": "^7.0.4",
+        "is-potential-custom-element-name": "^1.0.1",
+        "nwsapi": "^2.2.10",
+        "parse5": "^7.1.2",
+        "rrweb-cssom": "^0.7.0",
+        "saxes": "^6.0.0",
+        "symbol-tree": "^3.2.4",
+        "tough-cookie": "^4.1.4",
+        "w3c-xmlserializer": "^5.0.0",
+        "webidl-conversions": "^7.0.0",
+        "whatwg-encoding": "^3.1.1",
+        "whatwg-mimetype": "^4.0.0",
+        "whatwg-url": "^14.0.0",
+        "ws": "^8.17.0",
+        "xml-name-validator": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "canvas": "^2.11.2"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
       }
     },
-    "node_modules/jss-plugin-extend": {
-      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/jss-plugin-extend/-/jss-plugin-extend-10.8.2.tgz",
-      "integrity": "sha512-NYu0cJ/Zb50ySPkegzbXQQfhXza0VpaRVXdXDex30yXqZpGcAdmhSg4HTv8vzHiL1v3uIOm641FYQX9WvLgSWw==",
+    "node_modules/jsdom/node_modules/agent-base": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
+      "dev": true,
       "dependencies": {
-        "@babel/runtime": "^7.3.1",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/jsdom/node_modules/entities": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/jsdom/node_modules/https-proxy-agent": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+      "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^7.0.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/jsdom/node_modules/parse5": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
+      "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
+      "dev": true,
+      "dependencies": {
+        "entities": "^4.4.0"
+      },
+      "funding": {
+        "url": "https://github.com/inikulin/parse5?sponsor=1"
+      }
+    },
+    "node_modules/jsdom/node_modules/rrweb-cssom": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.7.1.tgz",
+      "integrity": "sha512-TrEMa7JGdVm0UThDJSx7ddw5nVm3UJS9o9CCIZ72B1vSyEZoziDqBYP3XIoi/12lKrJR8rE3jeFHMok2F/Mnsg==",
+      "dev": true
+    },
+    "node_modules/jsesc": {
+      "version": "2.5.2",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/json-stable-stringify": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.1.1.tgz",
+      "integrity": "sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.5",
+        "isarray": "^2.0.5",
+        "jsonify": "^0.0.1",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/json-stable-stringify/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/json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true,
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jsonfile": {
+      "version": "6.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/jsonfile/node_modules/universalify": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/jsonify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz",
+      "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/jsonlint": {
+      "version": "1.6.0",
+      "dev": true,
+      "dependencies": {
+        "JSV": ">= 4.0.x",
+        "nomnom": ">= 1.5.x"
+      },
+      "bin": {
+        "jsonlint": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/jsonminify": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/jsonminify/-/jsonminify-0.4.2.tgz",
+      "integrity": "sha512-mEtP5ECD0293D+s45JhDutqF5mFCkWY8ClrPFxjSFR2KUoantofky7noSzyKnAnD9Gd8pXHZSUd5bgzLDUBbfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0",
+        "npm": ">=1.1.0"
+      }
+    },
+    "node_modules/JSONSelect": {
+      "version": "0.4.0",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.7"
+      }
+    },
+    "node_modules/jss": {
+      "version": "10.8.2",
+      "resolved": "https://registry.npmjs.org/jss/-/jss-10.8.2.tgz",
+      "integrity": "sha512-FkoUNxI329CKQ9OQC8L72MBF9KPf5q8mIupAJ5twU7G7XREW7ahb+7jFfrjZ4iy1qvhx1HwIWUIvkZBDnKkEdQ==",
+      "dependencies": {
+        "@babel/runtime": "^7.3.1",
+        "csstype": "^3.0.2",
+        "is-in-browser": "^1.1.3",
+        "tiny-warning": "^1.0.2"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/jss"
+      }
+    },
+    "node_modules/jss-plugin-camel-case": {
+      "version": "10.8.2",
+      "resolved": "https://registry.npmjs.org/jss-plugin-camel-case/-/jss-plugin-camel-case-10.8.2.tgz",
+      "integrity": "sha512-2INyxR+1UdNuKf4v9It3tNfPvf7IPrtkiwzofeKuMd5D58/dxDJVUQYRVg/n460rTlHUfsEQx43hDrcxi9dSPA==",
+      "dependencies": {
+        "@babel/runtime": "^7.3.1",
+        "hyphenate-style-name": "^1.0.3",
+        "jss": "10.8.2"
+      }
+    },
+    "node_modules/jss-plugin-compose": {
+      "version": "10.8.2",
+      "resolved": "https://registry.npmjs.org/jss-plugin-compose/-/jss-plugin-compose-10.8.2.tgz",
+      "integrity": "sha512-X7fDQJ6IlIJoT8A3zc++LuC1hmSGKVudb3LyXp+vHv8r2hzzfXEEZty3y2CaC5CGrWcLlYquXENjqLNmLYMgMA==",
+      "dependencies": {
+        "@babel/runtime": "^7.3.1",
+        "jss": "10.8.2",
+        "tiny-warning": "^1.0.2"
+      }
+    },
+    "node_modules/jss-plugin-default-unit": {
+      "version": "10.8.2",
+      "resolved": "https://registry.npmjs.org/jss-plugin-default-unit/-/jss-plugin-default-unit-10.8.2.tgz",
+      "integrity": "sha512-UZ7cwT9NFYSG+SEy7noRU50s4zifulFdjkUNKE+u6mW7vFP960+RglWjTgMfh79G6OENZmaYnjHV/gcKV4nSxg==",
+      "dependencies": {
+        "@babel/runtime": "^7.3.1",
+        "jss": "10.8.2"
+      }
+    },
+    "node_modules/jss-plugin-expand": {
+      "version": "10.8.2",
+      "resolved": "https://registry.npmjs.org/jss-plugin-expand/-/jss-plugin-expand-10.8.2.tgz",
+      "integrity": "sha512-Iy4qsZbEcomXz5aBZJYGwnzK23vK3hqlwGleqmd19fY3L+WbqTmUnW8W0fWeXSuCkw2NknBTAJuEpFcgm3b0Pw==",
+      "dependencies": {
+        "@babel/runtime": "^7.3.1",
+        "jss": "10.8.2"
+      }
+    },
+    "node_modules/jss-plugin-extend": {
+      "version": "10.8.2",
+      "resolved": "https://registry.npmjs.org/jss-plugin-extend/-/jss-plugin-extend-10.8.2.tgz",
+      "integrity": "sha512-NYu0cJ/Zb50ySPkegzbXQQfhXza0VpaRVXdXDex30yXqZpGcAdmhSg4HTv8vzHiL1v3uIOm641FYQX9WvLgSWw==",
+      "dependencies": {
+        "@babel/runtime": "^7.3.1",
         "jss": "10.8.2",
         "tiny-warning": "^1.0.2"
       }
@@ -15774,35 +17676,16 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/jwa": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "buffer-equal-constant-time": "1.0.1",
-        "ecdsa-sig-formatter": "1.0.11",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/jws": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "jwa": "^2.0.0",
-        "safe-buffer": "^5.0.1"
-      }
-    },
     "node_modules/karma": {
-      "version": "6.3.6",
-      "resolved": "https://registry.npmjs.org/karma/-/karma-6.3.6.tgz",
-      "integrity": "sha512-xsiu3D6AjCv6Uq0YKXJgC6TvXX2WloQ5+XtHXmC1lwiLVG617DDV3W2DdM4BxCMKHlmz6l3qESZHFQGHAKvrew==",
+      "version": "6.4.3",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-6.4.3.tgz",
+      "integrity": "sha512-LuucC/RE92tJ8mlCwqEoRWXP38UMAqpnq98vktmS9SznSoUPPUJQbc91dHcxcunROvfQjdORVA/YFviH+Xci9Q==",
       "dev": true,
       "dependencies": {
+        "@colors/colors": "1.5.0",
         "body-parser": "^1.19.0",
         "braces": "^3.0.2",
         "chokidar": "^3.5.1",
-        "colors": "^1.4.0",
         "connect": "^3.7.0",
         "di": "^0.0.1",
         "dom-serialize": "^2.2.1",
@@ -15811,13 +17694,14 @@
         "http-proxy": "^1.18.1",
         "isbinaryfile": "^4.0.8",
         "lodash": "^4.17.21",
-        "log4js": "^6.3.0",
+        "log4js": "^6.4.1",
         "mime": "^2.5.2",
         "minimatch": "^3.0.4",
+        "mkdirp": "^0.5.5",
         "qjobs": "^1.2.0",
         "range-parser": "^1.2.1",
         "rimraf": "^3.0.2",
-        "socket.io": "^4.2.0",
+        "socket.io": "^4.7.2",
         "source-map": "^0.6.1",
         "tmp": "^0.2.1",
         "ua-parser-js": "^0.7.30",
@@ -15831,9 +17715,10 @@
       }
     },
     "node_modules/karma-chrome-launcher": {
-      "version": "3.1.0",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-3.2.0.tgz",
+      "integrity": "sha512-rE9RkUPI7I9mAxByQWkGJFXfFD6lE4gC5nPuZdobf/QdTEJI6EU4yIay/cfU/xV4ZxlM5JiTv7zWYgA64NpS5Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "which": "^1.2.1"
       }
@@ -15888,6 +17773,18 @@
         "node": ">=6"
       }
     },
+    "node_modules/karma-coverage-istanbul-reporter/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/karma-coverage-istanbul-reporter/node_modules/pify": {
       "version": "4.0.1",
       "dev": true,
@@ -15923,47 +17820,55 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/karma-esbuild": {
-      "version": "2.2.0",
+    "node_modules/karma-esbuild-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/karma-esbuild-up/-/karma-esbuild-up-3.0.0.tgz",
+      "integrity": "sha512-XxHrjHL83ZHQbxzDVSXefcOBaH7dMnDDVETLnXHHAJQeZIODA8PxdzpaCqUHg3PuPiCrh5jSTdzpxSrLEALK5g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "chokidar": "^3.5.1",
         "source-map": "0.6.1"
       },
+      "engines": {
+        "node": ">= 16"
+      },
       "peerDependencies": {
-        "esbuild": ">=0.8.45"
+        "esbuild": ">=0.17.0",
+        "karma": ">=6.0.0"
       }
     },
-    "node_modules/karma-esbuild/node_modules/source-map": {
+    "node_modules/karma-esbuild-up/node_modules/source-map": {
       "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/karma-firefox-launcher": {
-      "version": "2.1.1",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-2.1.3.tgz",
+      "integrity": "sha512-LMM2bseebLbYjODBOVt7TCPP9OI2vZIXCavIXhkO9m+10Uj5l7u/SKoeRmYx8FYHTVGZSpk6peX+3BMHC1WwNw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "is-wsl": "^2.2.0",
-        "which": "^2.0.1"
+        "which": "^3.0.0"
       }
     },
     "node_modules/karma-firefox-launcher/node_modules/which": {
-      "version": "2.0.2",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz",
+      "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
       },
       "bin": {
-        "node-which": "bin/node-which"
+        "node-which": "bin/which.js"
       },
       "engines": {
-        "node": ">= 8"
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
     "node_modules/karma-fixture": {
@@ -16062,11 +17967,12 @@
       }
     },
     "node_modules/karma-spec-reporter": {
-      "version": "0.0.32",
+      "version": "0.0.36",
+      "resolved": "https://registry.npmjs.org/karma-spec-reporter/-/karma-spec-reporter-0.0.36.tgz",
+      "integrity": "sha512-11bvOl1x6ryKZph7kmbmMpbi8vsngEGxGOoeTlIcDaH3ab3j8aPJnZ+r+K/SS0sBSGy5VGkGYO2+hLct7hw/6w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "colors": "^1.1.2"
+        "colors": "1.4.0"
       },
       "peerDependencies": {
         "karma": ">=0.9"
@@ -16077,211 +17983,39 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/karma-super-dots-reporter": {
-      "version": "0.2.0",
+    "node_modules/karma/node_modules/mime": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
+      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
       "dev": true,
-      "license": "The MIT License (MIT)",
-      "dependencies": {
-        "chalk": "^0.5.1",
-        "log-symbols": "^1.0.1"
+      "bin": {
+        "mime": "cli.js"
       },
-      "peerDependencies": {
-        "karma": ">=0.9"
+      "engines": {
+        "node": ">=4.0.0"
       }
     },
-    "node_modules/karma-super-dots-reporter/node_modules/ansi-regex": {
-      "version": "0.2.1",
+    "node_modules/karma/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/karma-super-dots-reporter/node_modules/ansi-styles": {
-      "version": "1.1.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/karma-super-dots-reporter/node_modules/chalk": {
-      "version": "0.5.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^1.1.0",
-        "escape-string-regexp": "^1.0.0",
-        "has-ansi": "^0.1.0",
-        "strip-ansi": "^0.3.0",
-        "supports-color": "^0.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/karma-super-dots-reporter/node_modules/has-ansi": {
-      "version": "0.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^0.2.0"
-      },
-      "bin": {
-        "has-ansi": "cli.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/karma-super-dots-reporter/node_modules/log-symbols": {
-      "version": "1.0.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "chalk": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/karma-super-dots-reporter/node_modules/log-symbols/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/karma-super-dots-reporter/node_modules/log-symbols/node_modules/ansi-styles": {
-      "version": "2.2.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/karma-super-dots-reporter/node_modules/log-symbols/node_modules/chalk": {
-      "version": "1.1.3",
-      "dev": true,
-      "license": "MIT",
-      "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"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/karma-super-dots-reporter/node_modules/log-symbols/node_modules/has-ansi": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/karma-super-dots-reporter/node_modules/log-symbols/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/karma-super-dots-reporter/node_modules/log-symbols/node_modules/supports-color": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/karma-super-dots-reporter/node_modules/strip-ansi": {
-      "version": "0.3.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^0.2.1"
-      },
-      "bin": {
-        "strip-ansi": "cli.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/karma-super-dots-reporter/node_modules/supports-color": {
-      "version": "0.2.0",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "supports-color": "cli.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/karma/node_modules/glob": {
-      "version": "7.1.7",
-      "dev": true,
-      "license": "ISC",
-      "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"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/karma/node_modules/graceful-fs": {
-      "version": "4.2.8",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/karma/node_modules/mime": {
-      "version": "2.5.2",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4.0.0"
+        "node": "*"
       }
     },
     "node_modules/karma/node_modules/source-map": {
       "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/keyv": {
-      "version": "3.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "json-buffer": "3.0.0"
-      }
-    },
     "node_modules/kind-of": {
       "version": "6.0.3",
       "dev": true,
@@ -16291,32 +18025,23 @@
       }
     },
     "node_modules/klaw": {
-      "version": "3.0.0",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-4.1.0.tgz",
+      "integrity": "sha512-1zGZ9MF9H22UnkpVeuaGKOjfA2t6WrfdrJmGjy16ykcjnKQDmHVX+KI477rpbGevz/5FD4MC3xf1oxylBgcaQw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "graceful-fs": "^4.1.9"
+      "engines": {
+        "node": ">=14.14.0"
       }
     },
     "node_modules/kleur": {
-      "version": "4.1.4",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz",
+      "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
-    "node_modules/latest-version": {
-      "version": "5.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "package-json": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/lazy-cache": {
       "version": "2.0.2",
       "dev": true,
@@ -16328,28 +18053,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/lazystream": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "readable-stream": "^2.0.5"
-      },
-      "engines": {
-        "node": ">= 0.6.3"
-      }
-    },
-    "node_modules/lead": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "flush-write-stream": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
     "node_modules/leven": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
@@ -16377,29 +18080,42 @@
       "license": "MIT"
     },
     "node_modules/lilconfig": {
-      "version": "2.0.3",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.2.tgz",
+      "integrity": "sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=10"
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antonk52"
       }
     },
     "node_modules/lines-and-columns": {
-      "version": "1.1.6",
-      "dev": true,
-      "license": "MIT"
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "dev": true
     },
     "node_modules/link-check": {
-      "version": "4.5.4",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/link-check/-/link-check-5.3.0.tgz",
+      "integrity": "sha512-Jhb7xueDgQgBaZzkfOtAyOZEZAIMJQIjUpYD2QY/zEB+LKTY1tWiBwZg8QIDbzQdPBOcqzg7oLQDNcES/tQmXg==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "is-relative-url": "^3.0.0",
+        "is-relative-url": "^4.0.0",
         "isemail": "^3.2.0",
-        "ms": "^2.1.2",
-        "request": "^2.88.2"
+        "ms": "^2.1.3",
+        "needle": "^3.3.1",
+        "proxy-agent": "^6.4.0"
       }
     },
+    "node_modules/link-check/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true
+    },
     "node_modules/list-imports-exports": {
       "version": "0.1.2",
       "dev": true,
@@ -16463,54 +18179,15 @@
       "license": "MIT"
     },
     "node_modules/load-json-file": {
-      "version": "5.3.0",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-7.0.1.tgz",
+      "integrity": "sha512-Gnxj3ev3mB5TkVBGad0JM6dmLiQL+o0t23JPBZ9sd+yvSLk05mFoqKBw5N8gbbkU4TNXyqCgIrl/VM17OgUIgQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "graceful-fs": "^4.1.15",
-        "parse-json": "^4.0.0",
-        "pify": "^4.0.1",
-        "strip-bom": "^3.0.0",
-        "type-fest": "^0.3.0"
-      },
       "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/load-json-file/node_modules/parse-json": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/load-json-file/node_modules/pify": {
-      "version": "4.0.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/load-json-file/node_modules/strip-bom": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/load-json-file/node_modules/type-fest": {
-      "version": "0.3.1",
-      "dev": true,
-      "license": "(MIT OR CC0-1.0)",
-      "engines": {
-        "node": ">=6"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/locate-path": {
@@ -16526,15 +18203,6 @@
     },
     "node_modules/lodash": {
       "version": "4.17.21",
-      "license": "MIT"
-    },
-    "node_modules/lodash.camelcase": {
-      "version": "4.3.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/lodash.clonedeep": {
-      "version": "4.5.0",
       "dev": true,
       "license": "MIT"
     },
@@ -16565,49 +18233,47 @@
     },
     "node_modules/lodash.memoize": {
       "version": "4.1.2",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
+      "dev": true
     },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/lodash.set": {
-      "version": "4.3.2",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/lodash.sortby": {
       "version": "4.7.0",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/lodash.truncate": {
-      "version": "4.4.2",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/lodash.uniq": {
       "version": "4.5.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+      "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
+      "dev": true
     },
     "node_modules/log-symbols": {
-      "version": "4.0.0",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "chalk": "^4.0.0"
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
       },
       "engines": {
         "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/log-symbols/node_modules/ansi-styles": {
       "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -16619,9 +18285,10 @@
       }
     },
     "node_modules/log-symbols/node_modules/chalk": {
-      "version": "4.1.0",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -16635,8 +18302,9 @@
     },
     "node_modules/log-symbols/node_modules/color-convert": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -16646,21 +18314,24 @@
     },
     "node_modules/log-symbols/node_modules/color-name": {
       "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
     "node_modules/log-symbols/node_modules/has-flag": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/log-symbols/node_modules/supports-color": {
       "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -16669,15 +18340,16 @@
       }
     },
     "node_modules/log4js": {
-      "version": "6.3.0",
+      "version": "6.9.1",
+      "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.9.1.tgz",
+      "integrity": "sha512-1somDdy9sChrr9/f4UlzhdaGfDR2c/SaD2a4T7qEkG4jTS57/B3qmnjLYePwQ8cqWnUHZI0iAKxMBpCZICiZ2g==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
-        "date-format": "^3.0.0",
-        "debug": "^4.1.1",
-        "flatted": "^2.0.1",
-        "rfdc": "^1.1.4",
-        "streamroller": "^2.2.4"
+        "date-format": "^4.0.14",
+        "debug": "^4.3.4",
+        "flatted": "^3.2.7",
+        "rfdc": "^1.3.0",
+        "streamroller": "^3.1.5"
       },
       "engines": {
         "node": ">=8.0"
@@ -16693,45 +18365,19 @@
         "loose-envify": "cli.js"
       }
     },
-    "node_modules/lower-case": {
-      "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/lowercase-keys": {
-      "version": "1.0.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/lru-cache": {
-      "version": "6.0.0",
+    "node_modules/loupe": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz",
+      "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "get-func-name": "^2.0.1"
       }
     },
-    "node_modules/luxon": {
-      "version": "1.26.0",
-      "license": "MIT",
-      "optional": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/magic-string": {
-      "version": "0.25.7",
+    "node_modules/lower-case": {
+      "version": "1.1.4",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "sourcemap-codec": "^1.4.4"
-      }
+      "license": "MIT"
     },
     "node_modules/make-dir": {
       "version": "3.1.0",
@@ -16764,41 +18410,11 @@
         "tmpl": "1.0.5"
       }
     },
-    "node_modules/map-age-cleaner": {
-      "version": "0.1.3",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "p-defer": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/map-cache": {
-      "version": "0.2.2",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/map-stream": {
       "version": "0.0.7",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/map-visit": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "object-visit": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/markdown-link": {
       "version": "0.1.1",
       "dev": true,
@@ -16808,118 +18424,60 @@
       }
     },
     "node_modules/markdown-link-check": {
-      "version": "3.8.7",
+      "version": "3.12.2",
+      "resolved": "https://registry.npmjs.org/markdown-link-check/-/markdown-link-check-3.12.2.tgz",
+      "integrity": "sha512-GWMwSvxuZn+uGGydi5yywnnDZy08SGps4I/63xqvWT7lxtH4cVLnhgZZYtEcPz/QvgPg9vbH2rvWpa29owMtHA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "async": "^3.2.0",
-        "chalk": "^4.1.0",
-        "commander": "^6.2.0",
-        "link-check": "^4.5.4",
+        "async": "^3.2.5",
+        "chalk": "^5.3.0",
+        "commander": "^12.1.0",
+        "link-check": "^5.3.0",
         "lodash": "^4.17.21",
-        "markdown-link-extractor": "^1.2.7",
+        "markdown-link-extractor": "^4.0.2",
+        "needle": "^3.3.1",
         "progress": "^2.0.3",
-        "request": "^2.88.2"
+        "proxy-agent": "^6.4.0"
       },
       "bin": {
         "markdown-link-check": "markdown-link-check"
       }
     },
-    "node_modules/markdown-link-check/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/markdown-link-check/node_modules/async": {
-      "version": "3.2.0",
-      "dev": true,
-      "license": "MIT"
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz",
+      "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==",
+      "dev": true
     },
     "node_modules/markdown-link-check/node_modules/chalk": {
-      "version": "4.1.0",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
       "engines": {
-        "node": ">=10"
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
       },
       "funding": {
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/markdown-link-check/node_modules/color-convert": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/markdown-link-check/node_modules/color-name": {
-      "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/markdown-link-check/node_modules/commander": {
-      "version": "6.2.1",
+      "version": "12.1.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz",
+      "integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/markdown-link-check/node_modules/has-flag": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/markdown-link-check/node_modules/supports-color": {
-      "version": "7.2.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
       }
     },
     "node_modules/markdown-link-extractor": {
-      "version": "1.2.7",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/markdown-link-extractor/-/markdown-link-extractor-4.0.2.tgz",
+      "integrity": "sha512-5cUOu4Vwx1wenJgxaudsJ8xwLUMN7747yDJX3V/L7+gi3e4MsCm7w5nbrDQQy8nEfnl4r5NV3pDXMAjhGXYXAw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "marked": "^2.0.1"
-      }
-    },
-    "node_modules/markdown-link-extractor/node_modules/marked": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-2.1.3.tgz",
-      "integrity": "sha512-/Q+7MGzaETqifOMWYEA7HVMaZb4XbcRfaOzcSsHZEith83KGlvaSG33u0SKu89Mj5h+T8V2hM+8O45Qc5XTgwA==",
-      "dev": true,
-      "bin": {
-        "marked": "bin/marked"
-      },
-      "engines": {
-        "node": ">= 10"
+        "html-link-extractor": "^1.0.5",
+        "marked": "^12.0.1"
       }
     },
     "node_modules/markdown-toc": {
@@ -16948,34 +18506,39 @@
       }
     },
     "node_modules/marked": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-3.0.8.tgz",
-      "integrity": "sha512-0gVrAjo5m0VZSJb4rpL59K1unJAMb/hm8HRXqasD8VeC8m91ytDPMritgFSlKonfdt+rRYYpP/JfLxgIX8yoSw==",
+      "version": "12.0.1",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-12.0.1.tgz",
+      "integrity": "sha512-Y1/V2yafOcOdWQCX0XpAKXzDakPOpn6U0YLxTJs3cww6VxOzZV1BTOOYWLvH3gX38cq+iLwljHHTnMtlDfg01Q==",
       "dev": true,
       "bin": {
-        "marked": "bin/marked"
+        "marked": "bin/marked.js"
       },
       "engines": {
-        "node": ">= 12"
+        "node": ">= 18"
       }
     },
     "node_modules/matcher": {
-      "version": "3.0.0",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/matcher/-/matcher-5.0.0.tgz",
+      "integrity": "sha512-s2EMBOWtXFc8dgqvoAzKJXxNHibcdJMV0gwqKUaw9E2JBJuGUK7DrNKrA6g/i+v72TT16+6sVm5mS3thaMLQUw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "escape-string-regexp": "^4.0.0"
+        "escape-string-regexp": "^5.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/matcher/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
+      "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -16998,8 +18561,9 @@
     },
     "node_modules/md5-hex": {
       "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/md5-hex/-/md5-hex-3.0.1.tgz",
+      "integrity": "sha512-BUiRtTtV39LIJwinWBjqVsU9xhdnz7/i889V859IBFpuqGAj6LuOvHv5XLbgZ2R7ptJoJaEcxkv88/h25T7Ciw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "blueimp-md5": "^2.10.0"
       },
@@ -17008,9 +18572,10 @@
       }
     },
     "node_modules/mdn-data": {
-      "version": "2.0.14",
-      "dev": true,
-      "license": "CC0-1.0"
+      "version": "2.0.30",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",
+      "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==",
+      "dev": true
     },
     "node_modules/media-typer": {
       "version": "0.3.0",
@@ -17020,33 +18585,29 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/mem": {
-      "version": "8.0.0",
+    "node_modules/memoize": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/memoize/-/memoize-10.0.0.tgz",
+      "integrity": "sha512-H6cBLgsi6vMWOcCpvVCdFFnl3kerEXbrYh9q+lY6VXvQSmM6CkmV08VOwT+WE2tzIEqRPFfAq3fm4v/UIW6mSA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "map-age-cleaner": "^0.1.3",
-        "mimic-fn": "^3.1.0"
+        "mimic-function": "^5.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       },
       "funding": {
-        "url": "https://github.com/sindresorhus/mem?sponsor=1"
-      }
-    },
-    "node_modules/mem/node_modules/mimic-fn": {
-      "version": "3.1.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
+        "url": "https://github.com/sindresorhus/memoize?sponsor=1"
       }
     },
     "node_modules/merge-descriptors": {
-      "version": "1.0.1",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
+      "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
       "dev": true,
-      "license": "MIT"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
     "node_modules/merge-stream": {
       "version": "2.0.0",
@@ -17095,19 +18656,21 @@
       }
     },
     "node_modules/mime-db": {
-      "version": "1.46.0",
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/mime-types": {
-      "version": "2.1.29",
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "mime-db": "1.46.0"
+        "mime-db": "1.52.0"
       },
       "engines": {
         "node": ">= 0.6"
@@ -17115,35 +18678,57 @@
     },
     "node_modules/mimic-fn": {
       "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
-    "node_modules/mimic-response": {
-      "version": "1.0.1",
+    "node_modules/mimic-function": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/mimic-function/-/mimic-function-5.0.0.tgz",
+      "integrity": "sha512-RBfQ+9X9DpXdEoK7Bu+KeEU6vFhumEIiXKWECPzRBmDserEq4uR2b/VCm0LwpMSosoq2k+Zuxj/GzOr0Fn6h/g==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=4"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/minimatch": {
-      "version": "3.0.4",
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "brace-expansion": "^1.1.7"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": "*"
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/minimatch/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
       }
     },
     "node_modules/minimist": {
-      "version": "1.2.5",
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
       "dev": true,
-      "license": "MIT"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/minipass": {
       "version": "3.1.5",
@@ -17203,76 +18788,70 @@
       }
     },
     "node_modules/mocha": {
-      "version": "9.1.3",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.1.3.tgz",
-      "integrity": "sha512-Xcpl9FqXOAYqI3j79pEtHBBnQgVXIhpULjGQa7DVb0Po+VzmSIK9kanAiWLHoRR/dbZ2qpdPshuXr8l1VaHCzw==",
-      "dev": true,
-      "dependencies": {
-        "@ungap/promise-all-settled": "1.1.2",
-        "ansi-colors": "4.1.1",
-        "browser-stdout": "1.3.1",
-        "chokidar": "3.5.2",
-        "debug": "4.3.2",
-        "diff": "5.0.0",
-        "escape-string-regexp": "4.0.0",
-        "find-up": "5.0.0",
-        "glob": "7.1.7",
-        "growl": "1.10.5",
-        "he": "1.2.0",
-        "js-yaml": "4.1.0",
-        "log-symbols": "4.1.0",
-        "minimatch": "3.0.4",
-        "ms": "2.1.3",
-        "nanoid": "3.1.25",
-        "serialize-javascript": "6.0.0",
-        "strip-json-comments": "3.1.1",
-        "supports-color": "8.1.1",
-        "which": "2.0.2",
-        "workerpool": "6.1.5",
-        "yargs": "16.2.0",
-        "yargs-parser": "20.2.4",
-        "yargs-unparser": "2.0.0"
+      "version": "10.6.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.6.0.tgz",
+      "integrity": "sha512-hxjt4+EEB0SA0ZDygSS015t65lJw/I2yRCS3Ae+SJ5FrbzrXgfYwJr96f0OvIXdj7h4lv/vLCrH3rkiuizFSvw==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "^4.1.3",
+        "browser-stdout": "^1.3.1",
+        "chokidar": "^3.5.3",
+        "debug": "^4.3.5",
+        "diff": "^5.2.0",
+        "escape-string-regexp": "^4.0.0",
+        "find-up": "^5.0.0",
+        "glob": "^8.1.0",
+        "he": "^1.2.0",
+        "js-yaml": "^4.1.0",
+        "log-symbols": "^4.1.0",
+        "minimatch": "^5.1.6",
+        "ms": "^2.1.3",
+        "serialize-javascript": "^6.0.2",
+        "strip-json-comments": "^3.1.1",
+        "supports-color": "^8.1.1",
+        "workerpool": "^6.5.1",
+        "yargs": "^16.2.0",
+        "yargs-parser": "^20.2.9",
+        "yargs-unparser": "^2.0.0"
       },
       "bin": {
         "_mocha": "bin/_mocha",
-        "mocha": "bin/mocha"
+        "mocha": "bin/mocha.js"
       },
       "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mochajs"
+        "node": ">= 14.0.0"
       }
     },
     "node_modules/mocha-junit-reporter": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/mocha-junit-reporter/-/mocha-junit-reporter-2.0.2.tgz",
-      "integrity": "sha512-vYwWq5hh3v1lG0gdQCBxwNipBfvDiAM1PHroQRNp96+2l72e9wEUTw+mzoK+O0SudgfQ7WvTQZ9Nh3qkAYAjfg==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/mocha-junit-reporter/-/mocha-junit-reporter-2.2.1.tgz",
+      "integrity": "sha512-iDn2tlKHn8Vh8o4nCzcUVW4q7iXp7cC4EB78N0cDHIobLymyHNwe0XG8HEHHjc3hJlXm0Vy6zcrxaIhnI2fWmw==",
       "dev": true,
       "dependencies": {
-        "debug": "^2.2.0",
-        "md5": "^2.1.0",
-        "mkdirp": "~0.5.1",
+        "debug": "^4.3.4",
+        "md5": "^2.3.0",
+        "mkdirp": "^3.0.0",
         "strip-ansi": "^6.0.1",
-        "xml": "^1.0.0"
+        "xml": "^1.0.1"
       },
       "peerDependencies": {
         "mocha": ">=2.2.5"
       }
     },
-    "node_modules/mocha-junit-reporter/node_modules/debug": {
-      "version": "2.6.9",
+    "node_modules/mocha-junit-reporter/node_modules/mkdirp": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
+      "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/mocha-junit-reporter/node_modules/ms": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT"
+      "bin": {
+        "mkdirp": "dist/cjs/src/bin.js"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
     },
     "node_modules/mocha-silent-reporter": {
       "version": "1.0.0",
@@ -17352,71 +18931,26 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/mocha/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/mocha/node_modules/argparse": {
       "version": "2.0.1",
-      "dev": true,
-      "license": "Python-2.0"
-    },
-    "node_modules/mocha/node_modules/chalk": {
-      "version": "4.1.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/mocha/node_modules/chalk/node_modules/supports-color": {
-      "version": "7.2.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
     },
-    "node_modules/mocha/node_modules/color-convert": {
+    "node_modules/mocha/node_modules/brace-expansion": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
+        "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/mocha/node_modules/color-name": {
-      "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/mocha/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==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -17426,8 +18960,9 @@
     },
     "node_modules/mocha/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==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "locate-path": "^6.0.0",
         "path-exists": "^4.0.0"
@@ -17440,19 +18975,20 @@
       }
     },
     "node_modules/mocha/node_modules/glob": {
-      "version": "7.1.7",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
+      "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
-      "license": "ISC",
       "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"
+        "minimatch": "^5.0.1",
+        "once": "^1.3.0"
       },
       "engines": {
-        "node": "*"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
@@ -17460,16 +18996,18 @@
     },
     "node_modules/mocha/node_modules/has-flag": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/mocha/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,
-      "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1"
       },
@@ -17479,8 +19017,9 @@
     },
     "node_modules/mocha/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,
-      "license": "MIT",
       "dependencies": {
         "p-locate": "^5.0.0"
       },
@@ -17491,30 +19030,29 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/mocha/node_modules/log-symbols": {
-      "version": "4.1.0",
+    "node_modules/mocha/node_modules/minimatch": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
         "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/mocha/node_modules/ms": {
       "version": "2.1.3",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true
     },
     "node_modules/mocha/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,
-      "license": "MIT",
       "dependencies": {
         "yocto-queue": "^0.1.0"
       },
@@ -17527,8 +19065,9 @@
     },
     "node_modules/mocha/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==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "p-limit": "^3.0.2"
       },
@@ -17541,27 +19080,18 @@
     },
     "node_modules/mocha/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,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/mocha/node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/mocha/node_modules/supports-color": {
       "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -17572,31 +19102,10 @@
         "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
-    "node_modules/mocha/node_modules/which": {
-      "version": "2.0.2",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/mocha/node_modules/yargs-parser": {
-      "version": "20.2.4",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/moment": {
-      "version": "2.29.1",
-      "license": "MIT",
+      "version": "2.29.4",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
+      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
       "engines": {
         "node": "*"
       }
@@ -17642,11 +19151,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/mout": {
-      "version": "1.2.2",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/mri": {
       "version": "1.1.6",
       "dev": true,
@@ -17661,37 +19165,34 @@
       "license": "MIT"
     },
     "node_modules/multer": {
-      "version": "1.4.3",
+      "version": "1.4.5-lts.1",
+      "resolved": "https://registry.npmjs.org/multer/-/multer-1.4.5-lts.1.tgz",
+      "integrity": "sha512-ywPWvcDMeH+z9gQq5qYHCCy+ethsk4goepZ45GLD63fOu0YcNecQxi64nDs3qluZB+murG3/D4dJ7+dGctcCQQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "append-field": "^1.0.0",
-        "busboy": "^0.2.11",
+        "busboy": "^1.0.0",
         "concat-stream": "^1.5.2",
         "mkdirp": "^0.5.4",
         "object-assign": "^4.1.1",
-        "on-finished": "^2.3.0",
         "type-is": "^1.6.4",
         "xtend": "^4.0.0"
       },
       "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/mz": {
-      "version": "2.7.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "any-promise": "^1.0.0",
-        "object-assign": "^4.0.1",
-        "thenify-all": "^1.0.0"
+        "node": ">= 6.0.0"
       }
     },
     "node_modules/nanoid": {
-      "version": "3.1.25",
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
       "dev": true,
-      "license": "MIT",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -17699,27 +19200,6 @@
         "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
       }
     },
-    "node_modules/nanomatch": {
-      "version": "1.2.13",
-      "dev": true,
-      "license": "MIT",
-      "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"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "dev": true,
@@ -17756,10 +19236,39 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/needle": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/needle/-/needle-3.3.1.tgz",
+      "integrity": "sha512-6k0YULvhpw+RoLNiQCRKOl09Rv1dPLr8hHnVjHqdolKwDrdNyk+Hmrthi4lIGPPz3r39dLx0hsF5s40sZ3Us4Q==",
+      "dev": true,
+      "dependencies": {
+        "iconv-lite": "^0.6.3",
+        "sax": "^1.2.4"
+      },
+      "bin": {
+        "needle": "bin/needle"
+      },
+      "engines": {
+        "node": ">= 4.4.x"
+      }
+    },
+    "node_modules/needle/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dev": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/negotiator": {
-      "version": "0.6.2",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -17769,6 +19278,15 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/netmask": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
+      "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
     "node_modules/nise": {
       "version": "5.1.0",
       "dev": true,
@@ -17781,6 +19299,15 @@
         "path-to-regexp": "^1.7.0"
       }
     },
+    "node_modules/nise/node_modules/@sinonjs/fake-timers": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz",
+      "integrity": "sha512-iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg==",
+      "dev": true,
+      "dependencies": {
+        "@sinonjs/commons": "^1.7.0"
+      }
+    },
     "node_modules/nise/node_modules/isarray": {
       "version": "0.0.1",
       "dev": true,
@@ -17802,41 +19329,24 @@
         "lower-case": "^1.1.1"
       }
     },
-    "node_modules/nock": {
-      "version": "13.1.4",
-      "resolved": "https://registry.npmjs.org/nock/-/nock-13.1.4.tgz",
-      "integrity": "sha512-hr5+mknLpIbTOXifB13lx9mAKF1zQPUCMh53Galx79ic5opvNOd55jiB0iGCp2xqh+hwnFbNE/ddBKHsJNQrbw==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.1.0",
-        "json-stringify-safe": "^5.0.1",
-        "lodash.set": "^4.3.2",
-        "propagate": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 10.13"
-      }
-    },
-    "node_modules/node-dir": {
-      "version": "0.1.17",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "minimatch": "^3.0.2"
-      },
-      "engines": {
-        "node": ">= 0.10.5"
-      }
-    },
     "node_modules/node-fetch": {
-      "version": "2.6.5",
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "whatwg-url": "^5.0.0"
       },
       "engines": {
         "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
       }
     },
     "node_modules/node-fetch/node_modules/tr46": {
@@ -17858,34 +19368,38 @@
         "webidl-conversions": "^3.0.0"
       }
     },
-    "node_modules/node-forge": {
-      "version": "0.10.0",
+    "node_modules/node-gyp-build": {
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.0.tgz",
+      "integrity": "sha512-u6fs2AEUljNho3EYTJNBfImO5QTo/J/1Etd+NVdCj7qWKUSN/bSLkZwhDv7I+w/MSC6qJ4cknepkAYykDdK8og==",
       "dev": true,
-      "license": "(BSD-3-Clause OR GPL-2.0)",
-      "engines": {
-        "node": ">= 6.0.0"
+      "bin": {
+        "node-gyp-build": "bin.js",
+        "node-gyp-build-optional": "optional.js",
+        "node-gyp-build-test": "build-test.js"
       }
     },
     "node_modules/node-int64": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
+      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
       "dev": true
     },
-    "node_modules/node-modules-regexp": {
-      "version": "1.0.0",
+    "node_modules/node-releases": {
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
+      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==",
+      "dev": true
+    },
+    "node_modules/nofilter": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/nofilter/-/nofilter-3.1.0.tgz",
+      "integrity": "sha512-l2NNj07e9afPnhAhvgVrCD/oy2Ai1yfLpuo3EpiO1jFTsB4sFz6oIfAfSZyQzVpkZQ9xS8ZS5g1jCBgq4Hwo0g==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=12.19"
       }
     },
-    "node_modules/node-releases": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz",
-      "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==",
-      "dev": true
-    },
     "node_modules/nomnom": {
       "version": "1.5.2",
       "dev": true,
@@ -17912,25 +19426,6 @@
         "nopt": "bin/nopt.js"
       }
     },
-    "node_modules/normalize-package-data": {
-      "version": "2.5.0",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "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",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
     "node_modules/normalize-path": {
       "version": "3.0.0",
       "dev": true,
@@ -17947,26 +19442,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/normalize-url": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
-      "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/now-and-later": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "once": "^1.3.2"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
     "node_modules/npm-run-path": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
@@ -17979,6 +19454,18 @@
         "node": ">=8"
       }
     },
+    "node_modules/npmlog": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
+      "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
+      "dev": true,
+      "dependencies": {
+        "are-we-there-yet": "^2.0.0",
+        "console-control-strings": "^1.1.0",
+        "gauge": "^3.0.0",
+        "set-blocking": "^2.0.0"
+      }
+    },
     "node_modules/nth-check": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",
@@ -17992,17 +19479,10 @@
       }
     },
     "node_modules/nwsapi": {
-      "version": "2.2.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/oauth-sign": {
-      "version": "0.9.0",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "*"
-      }
+      "version": "2.2.12",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.12.tgz",
+      "integrity": "sha512-qXDmcVlZV4XRtKFzddidpfVP4oMSGhga+xdMc25mv8kaLUHtgzCDhUxkrN8exkGdTlLNaXj7CV3GtON7zuGZ+w==",
+      "dev": true
     },
     "node_modules/obj-str": {
       "version": "1.1.0",
@@ -18018,51 +19498,18 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/object-copy": {
-      "version": "0.1.0",
+    "node_modules/object-inspect": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "copy-descriptor": "^0.1.0",
-        "define-property": "^0.2.5",
-        "kind-of": "^3.0.3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/define-property": {
-      "version": "0.2.5",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/kind-of": {
-      "version": "3.2.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-inspect": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
-      "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/object-is": {
       "version": "1.1.5",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
@@ -18077,29 +19524,21 @@
     },
     "node_modules/object-keys": {
       "version": "1.1.1",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object-visit": {
-      "version": "1.0.1",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "isobject": "^3.0.0"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
     "node_modules/object.assign": {
-      "version": "4.1.2",
-      "license": "MIT",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
+      "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
+      "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "has-symbols": "^1.0.1",
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "has-symbols": "^1.0.3",
         "object-keys": "^1.1.1"
       },
       "engines": {
@@ -18110,27 +19549,29 @@
       }
     },
     "node_modules/object.entries": {
-      "version": "1.1.3",
-      "license": "MIT",
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz",
+      "integrity": "sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==",
+      "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.1",
-        "has": "^1.0.3"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/object.fromentries": {
-      "version": "2.0.4",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz",
+      "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.2",
-        "has": "^1.0.3"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -18139,16 +19580,18 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/object.hasown": {
-      "version": "1.0.0",
+    "node_modules/object.groupby": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz",
+      "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.1"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/object.pick": {
@@ -18163,13 +19606,14 @@
       }
     },
     "node_modules/object.values": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
-      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz",
+      "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==",
+      "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -18207,8 +19651,9 @@
     },
     "node_modules/onetime": {
       "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "mimic-fn": "^2.1.0"
       },
@@ -18220,9 +19665,9 @@
       }
     },
     "node_modules/open": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
-      "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
+      "version": "8.4.2",
+      "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
+      "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
       "dev": true,
       "dependencies": {
         "define-lazy-prop": "^2.0.0",
@@ -18252,242 +19697,126 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/ora": {
-      "version": "5.3.0",
+    "node_modules/p-limit": {
+      "version": "2.3.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "bl": "^4.0.3",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-spinners": "^2.5.0",
-        "is-interactive": "^1.0.0",
-        "log-symbols": "^4.0.0",
-        "strip-ansi": "^6.0.0",
-        "wcwidth": "^1.0.1"
+        "p-try": "^2.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=6"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/ora/node_modules/ansi-styles": {
-      "version": "4.3.0",
+    "node_modules/p-locate": {
+      "version": "4.1.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "p-limit": "^2.2.0"
       },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/ora/node_modules/chalk": {
-      "version": "4.1.0",
+    "node_modules/p-map": {
+      "version": "4.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "aggregate-error": "^3.0.0"
       },
       "engines": {
         "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/ora/node_modules/color-convert": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/ora/node_modules/color-name": {
-      "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/ora/node_modules/has-flag": {
-      "version": "4.0.0",
+    "node_modules/p-try": {
+      "version": "2.2.0",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=6"
       }
     },
-    "node_modules/ora/node_modules/supports-color": {
-      "version": "7.2.0",
+    "node_modules/pac-proxy-agent": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.1.tgz",
+      "integrity": "sha512-ASV8yU4LLKBAjqIPMbrgtaKIvxQri/yh2OpI+S6hVa9JRkUI3Y3NPFbfngDtY7oFtSMD3w31Xns89mDa3Feo5A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "@tootallnate/quickjs-emscripten": "^0.23.0",
+        "agent-base": "^7.0.2",
+        "debug": "^4.3.4",
+        "get-uri": "^6.0.1",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.2",
+        "pac-resolver": "^7.0.0",
+        "socks-proxy-agent": "^8.0.2"
       },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ordered-read-streams": {
-      "version": "1.0.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "readable-stream": "^2.0.1"
-      }
-    },
-    "node_modules/os-homedir": {
-      "version": "1.0.2",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/os-tmpdir": {
-      "version": "1.0.2",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/osenv": {
-      "version": "0.1.5",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.0"
-      }
-    },
-    "node_modules/p-cancelable": {
-      "version": "1.1.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/p-defer": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
+        "node": ">= 14"
       }
     },
-    "node_modules/p-event": {
-      "version": "4.2.0",
+    "node_modules/pac-proxy-agent/node_modules/agent-base": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
+      "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "p-timeout": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "debug": "^4.3.4"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-finally": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=4"
+        "node": ">= 14"
       }
     },
-    "node_modules/p-limit": {
-      "version": "2.3.0",
+    "node_modules/pac-proxy-agent/node_modules/https-proxy-agent": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz",
+      "integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "p-try": "^2.0.0"
+        "agent-base": "^7.0.2",
+        "debug": "4"
       },
       "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">= 14"
       }
     },
-    "node_modules/p-locate": {
-      "version": "4.1.0",
+    "node_modules/pac-resolver": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz",
+      "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "p-limit": "^2.2.0"
+        "degenerator": "^5.0.0",
+        "netmask": "^2.0.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 14"
       }
     },
-    "node_modules/p-map": {
-      "version": "4.0.0",
+    "node_modules/package-config": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/package-config/-/package-config-5.0.0.tgz",
+      "integrity": "sha512-GYTTew2slBcYdvRHqjhwaaydVMvn/qrGC323+nKclYioNSLTDUM/lGgtGTgyHVtYcozb+XkE8CNhwcraOmZ9Mg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "aggregate-error": "^3.0.0"
+        "find-up-simple": "^1.0.0",
+        "load-json-file": "^7.0.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/p-timeout": {
-      "version": "3.2.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "p-finally": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/p-try": {
-      "version": "2.2.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/package-json": {
-      "version": "6.5.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "got": "^9.6.0",
-        "registry-auth-token": "^4.0.0",
-        "registry-url": "^5.0.0",
-        "semver": "^6.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/package-json/node_modules/semver": {
-      "version": "6.3.0",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/param-case": {
       "version": "2.1.1",
       "dev": true,
@@ -18498,8 +19827,9 @@
     },
     "node_modules/parent-module": {
       "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "callsites": "^3.0.0"
       },
@@ -18507,10 +19837,24 @@
         "node": ">=6"
       }
     },
+    "node_modules/parse-imports": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/parse-imports/-/parse-imports-2.1.1.tgz",
+      "integrity": "sha512-TDT4HqzUiTMO1wJRwg/t/hYk8Wdp3iF/ToMIlAoVQfL1Xs/sTxq1dKWSMjMbQmIarfWKymOyly40+zmPHXMqCA==",
+      "dev": true,
+      "dependencies": {
+        "es-module-lexer": "^1.5.3",
+        "slashes": "^3.0.12"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
     "node_modules/parse-json": {
       "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.0.0",
         "error-ex": "^1.3.1",
@@ -18525,11 +19869,15 @@
       }
     },
     "node_modules/parse-ms": {
-      "version": "2.1.0",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-4.0.0.tgz",
+      "integrity": "sha512-TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=6"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/parse-node-version": {
@@ -18540,14 +19888,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/parse-passwd": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/parse5": {
       "version": "6.0.1",
       "dev": true,
@@ -18569,25 +19909,12 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/pascalcase": {
-      "version": "0.1.1",
+    "node_modules/path-exists": {
+      "version": "3.0.0",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-dirname": {
-      "version": "1.0.2",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/path-exists": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
+        "node": ">=4"
       }
     },
     "node_modules/path-is-absolute": {
@@ -18613,9 +19940,10 @@
       "dev": true
     },
     "node_modules/path-to-regexp": {
-      "version": "0.1.7",
-      "dev": true,
-      "license": "MIT"
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
+      "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==",
+      "dev": true
     },
     "node_modules/path-type": {
       "version": "4.0.0",
@@ -18646,12 +19974,14 @@
     },
     "node_modules/performance-now": {
       "version": "2.1.0",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/picocolors": {
-      "version": "0.2.1",
-      "dev": true,
-      "license": "ISC"
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
+      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
+      "dev": true
     },
     "node_modules/picomatch": {
       "version": "2.3.0",
@@ -18674,73 +20004,14 @@
       }
     },
     "node_modules/pirates": {
-      "version": "4.0.1",
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
+      "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "node-modules-regexp": "^1.0.0"
-      },
       "engines": {
         "node": ">= 6"
       }
     },
-    "node_modules/pkg-conf": {
-      "version": "3.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "find-up": "^3.0.0",
-        "load-json-file": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-conf/node_modules/find-up": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "locate-path": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-conf/node_modules/locate-path": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-conf/node_modules/p-locate": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "find-up": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/pkg-up": {
       "version": "3.1.0",
       "dev": true,
@@ -18787,17 +20058,15 @@
       }
     },
     "node_modules/plugin-error": {
-      "version": "1.0.1",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-2.0.1.tgz",
+      "integrity": "sha512-zMakqvIDyY40xHOvzXka0kUvf40nYIuwRE8dWhti2WtjQZ31xAgBZBhxsK7vK3QbRXS1Xms/LO7B5cuAsfB2Gg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "ansi-colors": "^1.0.1",
-        "arr-diff": "^4.0.0",
-        "arr-union": "^3.1.0",
-        "extend-shallow": "^3.0.2"
+        "ansi-colors": "^1.0.1"
       },
       "engines": {
-        "node": ">= 0.10"
+        "node": ">=10.13.0"
       }
     },
     "node_modules/plugin-error/node_modules/ansi-colors": {
@@ -18812,434 +20081,455 @@
       }
     },
     "node_modules/plur": {
-      "version": "4.0.0",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/plur/-/plur-5.1.0.tgz",
+      "integrity": "sha512-VP/72JeXqak2KiOzjgKtQen5y3IZHn+9GOuLDafPv0eXa47xq0At93XahYBs26MsifCQ4enGKwbjBTKgb9QJXg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "irregular-plurals": "^3.2.0"
+        "irregular-plurals": "^3.3.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/posix-character-classes": {
-      "version": "0.1.1",
+    "node_modules/possible-typed-array-names": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
+      "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
     "node_modules/postcss": {
-      "version": "8.3.11",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.11.tgz",
-      "integrity": "sha512-hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA==",
+      "version": "8.4.39",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.39.tgz",
+      "integrity": "sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==",
       "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
       "dependencies": {
-        "nanoid": "^3.1.30",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^0.6.2"
+        "nanoid": "^3.3.7",
+        "picocolors": "^1.0.1",
+        "source-map-js": "^1.2.0"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
       }
     },
     "node_modules/postcss-calc": {
-      "version": "8.0.0",
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-9.0.1.tgz",
+      "integrity": "sha512-TipgjGyzP5QzEhsOZUaIkeO5mKeMFpebWzRogWG/ysonUlnHcq5aJe0jOjpfzUU8PeSaBQnrE8ehR0QA5vs8PQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.0.2"
+        "postcss-selector-parser": "^6.0.11",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
       },
       "peerDependencies": {
         "postcss": "^8.2.2"
       }
     },
     "node_modules/postcss-colormin": {
-      "version": "5.2.0",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-6.1.0.tgz",
+      "integrity": "sha512-x9yX7DOxeMAR+BgGVnNSAxmAj98NX/YxEMNFP+SDCEeNLb2r3i6Hh1ksMsnW8Ub5SLCpbescQqn9YEbE9554Sw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.16.6",
+        "browserslist": "^4.23.0",
         "caniuse-api": "^3.0.0",
-        "colord": "^2.0.1",
-        "postcss-value-parser": "^4.1.0"
+        "colord": "^2.9.3",
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": "^14 || ^16 || >=18.0"
       },
       "peerDependencies": {
-        "postcss": "^8.2.15"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-convert-values": {
-      "version": "5.0.1",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-6.1.0.tgz",
+      "integrity": "sha512-zx8IwP/ts9WvUM6NkVSkiU902QZL1bwPhaVaLynPtCsOTqp+ZKbNi+s6XJg3rfqpKGA/oc7Oxk5t8pOQJcwl/w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "postcss-value-parser": "^4.1.0"
+        "browserslist": "^4.23.0",
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": "^14 || ^16 || >=18.0"
       },
       "peerDependencies": {
-        "postcss": "^8.2.15"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-discard-comments": {
-      "version": "5.0.1",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-6.0.2.tgz",
+      "integrity": "sha512-65w/uIqhSBBfQmYnG92FO1mWZjJ4GL5b8atm5Yw2UgrwD7HiNiSSNwJor1eCFGzUgYnN/iIknhNRVqjrrpuglw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": "^14 || ^16 || >=18.0"
       },
       "peerDependencies": {
-        "postcss": "^8.2.15"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-discard-duplicates": {
-      "version": "5.0.1",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.3.tgz",
+      "integrity": "sha512-+JA0DCvc5XvFAxwx6f/e68gQu/7Z9ud584VLmcgto28eB8FqSFZwtrLwB5Kcp70eIoWP/HXqz4wpo8rD8gpsTw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": "^14 || ^16 || >=18.0"
       },
       "peerDependencies": {
-        "postcss": "^8.2.15"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-discard-empty": {
-      "version": "5.0.1",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-6.0.3.tgz",
+      "integrity": "sha512-znyno9cHKQsK6PtxL5D19Fj9uwSzC2mB74cpT66fhgOadEUPyXFkbgwm5tvc3bt3NAy8ltE5MrghxovZRVnOjQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": "^14 || ^16 || >=18.0"
       },
       "peerDependencies": {
-        "postcss": "^8.2.15"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-discard-overridden": {
-      "version": "5.0.1",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-6.0.2.tgz",
+      "integrity": "sha512-j87xzI4LUggC5zND7KdjsI25APtyMuynXZSujByMaav2roV6OZX+8AaCUcZSWqckZpjAjRyFDdpqybgjFO0HJQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": "^14 || ^16 || >=18.0"
       },
       "peerDependencies": {
-        "postcss": "^8.2.15"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-import": {
-      "version": "14.0.2",
+      "version": "16.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-16.1.0.tgz",
+      "integrity": "sha512-7hsAZ4xGXl4MW+OKEWCnF6T5jqBw80/EE9aXg1r2yyn1RsVEU8EtKXbijEODa+rg7iih4bKf7vlvTGYR4CnPNg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.0.0",
         "read-cache": "^1.0.0",
         "resolve": "^1.1.7"
       },
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=18.0.0"
       },
       "peerDependencies": {
         "postcss": "^8.0.0"
       }
     },
     "node_modules/postcss-merge-longhand": {
-      "version": "5.0.2",
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-6.0.5.tgz",
+      "integrity": "sha512-5LOiordeTfi64QhICp07nzzuTDjNSO8g5Ksdibt44d+uvIIAE1oZdRn8y/W5ZtYgRH/lnLDlvi9F8btZcVzu3w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "css-color-names": "^1.0.1",
-        "postcss-value-parser": "^4.1.0",
-        "stylehacks": "^5.0.1"
+        "postcss-value-parser": "^4.2.0",
+        "stylehacks": "^6.1.1"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": "^14 || ^16 || >=18.0"
       },
       "peerDependencies": {
-        "postcss": "^8.2.15"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-merge-rules": {
-      "version": "5.0.2",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-6.1.1.tgz",
+      "integrity": "sha512-KOdWF0gju31AQPZiD+2Ar9Qjowz1LTChSjFFbS+e2sFgc4uHOp3ZvVX4sNeTlk0w2O31ecFGgrFzhO0RSWbWwQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.16.6",
+        "browserslist": "^4.23.0",
         "caniuse-api": "^3.0.0",
-        "cssnano-utils": "^2.0.1",
-        "postcss-selector-parser": "^6.0.5",
-        "vendors": "^1.0.3"
+        "cssnano-utils": "^4.0.2",
+        "postcss-selector-parser": "^6.0.16"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": "^14 || ^16 || >=18.0"
       },
       "peerDependencies": {
-        "postcss": "^8.2.15"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-minify-font-values": {
-      "version": "5.0.1",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-6.1.0.tgz",
+      "integrity": "sha512-gklfI/n+9rTh8nYaSJXlCo3nOKqMNkxuGpTn/Qm0gstL3ywTr9/WRKznE+oy6fvfolH6dF+QM4nCo8yPLdvGJg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "postcss-value-parser": "^4.1.0"
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": "^14 || ^16 || >=18.0"
       },
       "peerDependencies": {
-        "postcss": "^8.2.15"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-minify-gradients": {
-      "version": "5.0.2",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-6.0.3.tgz",
+      "integrity": "sha512-4KXAHrYlzF0Rr7uc4VrfwDJ2ajrtNEpNEuLxFgwkhFZ56/7gaE4Nr49nLsQDZyUe+ds+kEhf+YAUolJiYXF8+Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "colord": "^2.6",
-        "cssnano-utils": "^2.0.1",
-        "postcss-value-parser": "^4.1.0"
+        "colord": "^2.9.3",
+        "cssnano-utils": "^4.0.2",
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": "^14 || ^16 || >=18.0"
       },
       "peerDependencies": {
-        "postcss": "^8.2.15"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-minify-params": {
-      "version": "5.0.1",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-6.1.0.tgz",
+      "integrity": "sha512-bmSKnDtyyE8ujHQK0RQJDIKhQ20Jq1LYiez54WiaOoBtcSuflfK3Nm596LvbtlFcpipMjgClQGyGr7GAs+H1uA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "alphanum-sort": "^1.0.2",
-        "browserslist": "^4.16.0",
-        "cssnano-utils": "^2.0.1",
-        "postcss-value-parser": "^4.1.0",
-        "uniqs": "^2.0.0"
+        "browserslist": "^4.23.0",
+        "cssnano-utils": "^4.0.2",
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": "^14 || ^16 || >=18.0"
       },
       "peerDependencies": {
-        "postcss": "^8.2.15"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-minify-selectors": {
-      "version": "5.1.0",
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-6.0.4.tgz",
+      "integrity": "sha512-L8dZSwNLgK7pjTto9PzWRoMbnLq5vsZSTu8+j1P/2GB8qdtGQfn+K1uSvFgYvgh83cbyxT5m43ZZhUMTJDSClQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "alphanum-sort": "^1.0.2",
-        "postcss-selector-parser": "^6.0.5"
+        "postcss-selector-parser": "^6.0.16"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": "^14 || ^16 || >=18.0"
       },
       "peerDependencies": {
-        "postcss": "^8.2.15"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-normalize-charset": {
-      "version": "5.0.1",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-6.0.2.tgz",
+      "integrity": "sha512-a8N9czmdnrjPHa3DeFlwqst5eaL5W8jYu3EBbTTkI5FHkfMhFZh1EGbku6jhHhIzTA6tquI2P42NtZ59M/H/kQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": "^14 || ^16 || >=18.0"
       },
       "peerDependencies": {
-        "postcss": "^8.2.15"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-normalize-display-values": {
-      "version": "5.0.1",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-6.0.2.tgz",
+      "integrity": "sha512-8H04Mxsb82ON/aAkPeq8kcBbAtI5Q2a64X/mnRRfPXBq7XeogoQvReqxEfc0B4WPq1KimjezNC8flUtC3Qz6jg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "cssnano-utils": "^2.0.1",
-        "postcss-value-parser": "^4.1.0"
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": "^14 || ^16 || >=18.0"
       },
       "peerDependencies": {
-        "postcss": "^8.2.15"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-normalize-positions": {
-      "version": "5.0.1",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-6.0.2.tgz",
+      "integrity": "sha512-/JFzI441OAB9O7VnLA+RtSNZvQ0NCFZDOtp6QPFo1iIyawyXg0YI3CYM9HBy1WvwCRHnPep/BvI1+dGPKoXx/Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "postcss-value-parser": "^4.1.0"
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": "^14 || ^16 || >=18.0"
       },
       "peerDependencies": {
-        "postcss": "^8.2.15"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-normalize-repeat-style": {
-      "version": "5.0.1",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-6.0.2.tgz",
+      "integrity": "sha512-YdCgsfHkJ2jEXwR4RR3Tm/iOxSfdRt7jplS6XRh9Js9PyCR/aka/FCb6TuHT2U8gQubbm/mPmF6L7FY9d79VwQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "cssnano-utils": "^2.0.1",
-        "postcss-value-parser": "^4.1.0"
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": "^14 || ^16 || >=18.0"
       },
       "peerDependencies": {
-        "postcss": "^8.2.15"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-normalize-string": {
-      "version": "5.0.1",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-6.0.2.tgz",
+      "integrity": "sha512-vQZIivlxlfqqMp4L9PZsFE4YUkWniziKjQWUtsxUiVsSSPelQydwS8Wwcuw0+83ZjPWNTl02oxlIvXsmmG+CiQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "postcss-value-parser": "^4.1.0"
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": "^14 || ^16 || >=18.0"
       },
       "peerDependencies": {
-        "postcss": "^8.2.15"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-normalize-timing-functions": {
-      "version": "5.0.1",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-6.0.2.tgz",
+      "integrity": "sha512-a+YrtMox4TBtId/AEwbA03VcJgtyW4dGBizPl7e88cTFULYsprgHWTbfyjSLyHeBcK/Q9JhXkt2ZXiwaVHoMzA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "cssnano-utils": "^2.0.1",
-        "postcss-value-parser": "^4.1.0"
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": "^14 || ^16 || >=18.0"
       },
       "peerDependencies": {
-        "postcss": "^8.2.15"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-normalize-unicode": {
-      "version": "5.0.1",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-6.1.0.tgz",
+      "integrity": "sha512-QVC5TQHsVj33otj8/JD869Ndr5Xcc/+fwRh4HAsFsAeygQQXm+0PySrKbr/8tkDKzW+EVT3QkqZMfFrGiossDg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.16.0",
-        "postcss-value-parser": "^4.1.0"
+        "browserslist": "^4.23.0",
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": "^14 || ^16 || >=18.0"
       },
       "peerDependencies": {
-        "postcss": "^8.2.15"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-normalize-url": {
-      "version": "5.0.2",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-6.0.2.tgz",
+      "integrity": "sha512-kVNcWhCeKAzZ8B4pv/DnrU1wNh458zBNp8dh4y5hhxih5RZQ12QWMuQrDgPRw3LRl8mN9vOVfHl7uhvHYMoXsQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "is-absolute-url": "^3.0.3",
-        "normalize-url": "^6.0.1",
-        "postcss-value-parser": "^4.1.0"
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": "^14 || ^16 || >=18.0"
       },
       "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-normalize-url/node_modules/normalize-url": {
-      "version": "6.1.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-normalize-whitespace": {
-      "version": "5.0.1",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-6.0.2.tgz",
+      "integrity": "sha512-sXZ2Nj1icbJOKmdjXVT9pnyHQKiSAyuNQHSgRCUgThn2388Y9cGVDR+E9J9iAYbSbLHI+UUwLVl1Wzco/zgv0Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "postcss-value-parser": "^4.1.0"
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": "^14 || ^16 || >=18.0"
       },
       "peerDependencies": {
-        "postcss": "^8.2.15"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-ordered-values": {
-      "version": "5.0.2",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-6.0.2.tgz",
+      "integrity": "sha512-VRZSOB+JU32RsEAQrO94QPkClGPKJEL/Z9PCBImXMhIeK5KAYo6slP/hBYlLgrCjFxyqvn5VC81tycFEDBLG1Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "cssnano-utils": "^2.0.1",
-        "postcss-value-parser": "^4.1.0"
+        "cssnano-utils": "^4.0.2",
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": "^14 || ^16 || >=18.0"
       },
       "peerDependencies": {
-        "postcss": "^8.2.15"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-reduce-initial": {
-      "version": "5.0.1",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-6.1.0.tgz",
+      "integrity": "sha512-RarLgBK/CrL1qZags04oKbVbrrVK2wcxhvta3GCxrZO4zveibqbRPmm2VI8sSgCXwoUHEliRSbOfpR0b/VIoiw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.16.0",
+        "browserslist": "^4.23.0",
         "caniuse-api": "^3.0.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": "^14 || ^16 || >=18.0"
       },
       "peerDependencies": {
-        "postcss": "^8.2.15"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-reduce-transforms": {
-      "version": "5.0.1",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-6.0.2.tgz",
+      "integrity": "sha512-sB+Ya++3Xj1WaT9+5LOOdirAxP7dJZms3GRcYheSPi1PiTMigsxHAdkrbItHxwYHr4kt1zL7mmcHstgMYT+aiA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "cssnano-utils": "^2.0.1",
-        "postcss-value-parser": "^4.1.0"
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": "^14 || ^16 || >=18.0"
       },
       "peerDependencies": {
-        "postcss": "^8.2.15"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-selector-parser": {
-      "version": "6.0.6",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.0.tgz",
+      "integrity": "sha512-UMz42UD0UY0EApS0ZL9o1XnLhSTtvvvLe5Dc2H2O56fvRZi+KulDyf5ctDhhtYJBGKStV2FL1fy6253cmLgqVQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -19249,65 +20539,49 @@
       }
     },
     "node_modules/postcss-svgo": {
-      "version": "5.0.2",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-6.0.3.tgz",
+      "integrity": "sha512-dlrahRmxP22bX6iKEjOM+c8/1p+81asjKT+V5lrgOH944ryx/OHpclnIbGsKVd3uWOXFLYJwCVf0eEkJGvO96g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "postcss-value-parser": "^4.1.0",
-        "svgo": "^2.3.0"
+        "postcss-value-parser": "^4.2.0",
+        "svgo": "^3.2.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": "^14 || ^16 || >= 18"
       },
       "peerDependencies": {
-        "postcss": "^8.2.15"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-unique-selectors": {
-      "version": "5.0.1",
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-6.0.4.tgz",
+      "integrity": "sha512-K38OCaIrO8+PzpArzkLKB42dSARtC2tmG6PvD4b1o1Q2E9Os8jzfWFfSy/rixsHwohtsDdFtAWGjFVFUdwYaMg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "alphanum-sort": "^1.0.2",
-        "postcss-selector-parser": "^6.0.5",
-        "uniqs": "^2.0.0"
+        "postcss-selector-parser": "^6.0.16"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": "^14 || ^16 || >=18.0"
       },
       "peerDependencies": {
-        "postcss": "^8.2.15"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/postcss-value-parser": {
-      "version": "4.1.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/postcss/node_modules/nanoid": {
-      "version": "3.1.30",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz",
-      "integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==",
-      "dev": true,
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
-    "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==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
       "dev": true
     },
     "node_modules/posthtml": {
-      "version": "0.16.5",
+      "version": "0.16.6",
+      "resolved": "https://registry.npmjs.org/posthtml/-/posthtml-0.16.6.tgz",
+      "integrity": "sha512-JcEmHlyLK/o0uGAlj65vgg+7LIms0xKXe60lcDOTU7oVX/3LuEuLwrQpW3VJ7de5TaFKiW4kWkaIpJL42FEgxQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "posthtml-parser": "^0.10.0",
+        "posthtml-parser": "^0.11.0",
         "posthtml-render": "^3.0.0"
       },
       "engines": {
@@ -19315,16 +20589,62 @@
       }
     },
     "node_modules/posthtml-parser": {
-      "version": "0.10.0",
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.11.0.tgz",
+      "integrity": "sha512-QecJtfLekJbWVo/dMAA+OSwY79wpRmbqS5TeXvXSX+f0c6pW4/SE6inzZ2qkU7oAMCPqIDkZDvd/bQsSFUnKyw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "htmlparser2": "^6.0.0"
+        "htmlparser2": "^7.1.1"
       },
       "engines": {
         "node": ">=12"
       }
     },
+    "node_modules/posthtml-parser/node_modules/domutils": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+      "dev": true,
+      "dependencies": {
+        "dom-serializer": "^1.0.1",
+        "domelementtype": "^2.2.0",
+        "domhandler": "^4.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
+      }
+    },
+    "node_modules/posthtml-parser/node_modules/entities": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",
+      "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/posthtml-parser/node_modules/htmlparser2": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz",
+      "integrity": "sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==",
+      "dev": true,
+      "funding": [
+        "https://github.com/fb55/htmlparser2?sponsor=1",
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.2.2",
+        "domutils": "^2.8.0",
+        "entities": "^3.0.1"
+      }
+    },
     "node_modules/posthtml-render": {
       "version": "3.0.0",
       "dev": true,
@@ -19337,9 +20657,9 @@
       }
     },
     "node_modules/preact": {
-      "version": "10.5.15",
-      "resolved": "https://registry.npmjs.org/preact/-/preact-10.5.15.tgz",
-      "integrity": "sha512-5chK29n6QcJc3m1lVrKQSQ+V7K1Gb8HeQY6FViQ5AxCAEGu3DaHffWNDkC9+miZgsLvbvU9rxbV1qinGHMHzqA==",
+      "version": "10.16.0",
+      "resolved": "https://registry.npmjs.org/preact/-/preact-10.16.0.tgz",
+      "integrity": "sha512-XTSj3dJ4roKIC93pald6rWuB2qQJO9gO2iLLyTe87MrjQN+HklueLsmskbywEWqCHlclgz3/M4YLL2iBr9UmMA==",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/preact"
@@ -19352,23 +20672,19 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/prepend-http": {
-      "version": "2.0.0",
+    "node_modules/prettier": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
+      "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
       "dev": true,
-      "license": "MIT",
+      "bin": {
+        "prettier": "bin/prettier.cjs"
+      },
       "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/prettier": {
-      "version": "2.4.1",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "prettier": "bin-prettier.js"
+        "node": ">=14"
       },
-      "engines": {
-        "node": ">=10.13.0"
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
       }
     },
     "node_modules/prettier-linter-helpers": {
@@ -19383,43 +20699,17 @@
       }
     },
     "node_modules/pretty-format": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.3.1.tgz",
-      "integrity": "sha512-DR/c+pvFc52nLimLROYjnXPtolawm+uWDxr4FjuLDLUn+ktWnSN851KoHwHzzqq6rfCOjkzN8FLgDrSub6UDuA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^27.2.5",
-        "ansi-regex": "^5.0.1",
+        "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
-        "react-is": "^17.0.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/pretty-format/node_modules/@jest/types": {
-      "version": "27.2.5",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-      "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
+        "react-is": "^18.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/pretty-format/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dev": true,
-      "dependencies": {
-        "@types/yargs-parser": "*"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/pretty-format/node_modules/ansi-styles": {
@@ -19434,91 +20724,22 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/pretty-format/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/pretty-format/node_modules/chalk/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/pretty-format/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/pretty-format/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/pretty-format/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/pretty-format/node_modules/react-is": {
-      "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
       "dev": true
     },
-    "node_modules/pretty-format/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/pretty-ms": {
-      "version": "7.0.1",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-9.0.0.tgz",
+      "integrity": "sha512-E9e9HJ9R9NasGOgPaPE8VMeiPKAyWR5jcFpNnwIejslIhWqdqOrb2wShBsncMPUb+BcCd2OPYfh7p2W6oemTng==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "parse-ms": "^2.1.0"
+        "parse-ms": "^4.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -19538,84 +20759,102 @@
       }
     },
     "node_modules/promise": {
-      "version": "8.1.0",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/promise/-/promise-8.3.0.tgz",
+      "integrity": "sha512-rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "asap": "~2.0.6"
       }
     },
     "node_modules/prop-types": {
-      "version": "15.7.2",
-      "license": "MIT",
+      "version": "15.8.1",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
+      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
       "dependencies": {
         "loose-envify": "^1.4.0",
         "object-assign": "^4.1.1",
-        "react-is": "^16.8.1"
-      }
-    },
-    "node_modules/prop-types-exact": {
-      "version": "1.2.0",
-      "license": "MIT",
-      "dependencies": {
-        "has": "^1.0.3",
-        "object.assign": "^4.1.0",
-        "reflect.ownkeys": "^0.2.0"
-      }
-    },
-    "node_modules/propagate": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 8"
+        "react-is": "^16.13.1"
       }
     },
     "node_modules/proxy-addr": {
-      "version": "2.0.6",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "forwarded": "~0.1.2",
+        "forwarded": "0.2.0",
         "ipaddr.js": "1.9.1"
       },
       "engines": {
         "node": ">= 0.10"
       }
     },
-    "node_modules/psl": {
-      "version": "1.8.0",
+    "node_modules/proxy-agent": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.4.0.tgz",
+      "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==",
       "dev": true,
-      "license": "MIT"
+      "dependencies": {
+        "agent-base": "^7.0.2",
+        "debug": "^4.3.4",
+        "http-proxy-agent": "^7.0.1",
+        "https-proxy-agent": "^7.0.3",
+        "lru-cache": "^7.14.1",
+        "pac-proxy-agent": "^7.0.1",
+        "proxy-from-env": "^1.1.0",
+        "socks-proxy-agent": "^8.0.2"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
     },
-    "node_modules/pump": {
-      "version": "3.0.0",
+    "node_modules/proxy-agent/node_modules/agent-base": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
+      "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
       }
     },
-    "node_modules/pumpify": {
-      "version": "1.5.1",
+    "node_modules/proxy-agent/node_modules/https-proxy-agent": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz",
+      "integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "duplexify": "^3.6.0",
-        "inherits": "^2.0.3",
-        "pump": "^2.0.0"
+        "agent-base": "^7.0.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
       }
     },
-    "node_modules/pumpify/node_modules/pump": {
-      "version": "2.0.1",
+    "node_modules/proxy-agent/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
+      "engines": {
+        "node": ">=12"
       }
     },
+    "node_modules/proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+      "dev": true
+    },
+    "node_modules/psl": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
+      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
+      "dev": true
+    },
     "node_modules/punycode": {
       "version": "2.1.1",
       "license": "MIT",
@@ -19623,16 +20862,21 @@
         "node": ">=6"
       }
     },
-    "node_modules/pupa": {
-      "version": "2.1.1",
+    "node_modules/pure-rand": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.4.tgz",
+      "integrity": "sha512-LA0Y9kxMYv47GIPJy6MI84fqTd2HmYZI83W/kM/SkKfDlajnZYfmXFTxkbY+xSBPkLJxltMa9hIkmdc29eguMA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "escape-goat": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/dubzzz"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fast-check"
+        }
+      ]
     },
     "node_modules/qjobs": {
       "version": "1.2.0",
@@ -19643,11 +20887,18 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.5.2",
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
       "dev": true,
-      "license": "BSD-3-Clause",
+      "dependencies": {
+        "side-channel": "^1.0.4"
+      },
       "engines": {
         "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/querystring": {
@@ -19659,10 +20910,13 @@
     },
     "node_modules/querystringify": {
       "version": "2.2.0",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
     },
     "node_modules/queue-microtask": {
-      "version": "1.2.2",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
       "dev": true,
       "funding": [
         {
@@ -19677,8 +20931,7 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ],
-      "license": "MIT"
+      ]
     },
     "node_modules/quick-lru": {
       "version": "5.1.0",
@@ -19693,6 +20946,7 @@
     },
     "node_modules/raf": {
       "version": "3.4.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "performance-now": "^2.1.0"
@@ -19753,12 +21007,13 @@
       }
     },
     "node_modules/raw-body": {
-      "version": "2.4.0",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+      "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "bytes": "3.1.0",
-        "http-errors": "1.7.2",
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "unpipe": "1.0.0"
       },
@@ -19766,20 +21021,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/rc": {
-      "version": "1.2.8",
-      "dev": true,
-      "license": "(BSD-2-Clause OR MIT OR Apache-2.0)",
-      "dependencies": {
-        "deep-extend": "^0.6.0",
-        "ini": "~1.3.0",
-        "minimist": "^1.2.0",
-        "strip-json-comments": "~2.0.1"
-      },
-      "bin": {
-        "rc": "cli.js"
-      }
-    },
     "node_modules/react": {
       "version": "17.0.2",
       "license": "MIT",
@@ -19791,32 +21032,20 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/react-dates": {
-      "version": "21.8.0",
-      "license": "MIT",
+    "node_modules/react-day-picker": {
+      "version": "8.0.0-beta.37",
+      "resolved": "https://registry.npmjs.org/react-day-picker/-/react-day-picker-8.0.0-beta.37.tgz",
+      "integrity": "sha512-PO7SZjMTdYkvvEnESj08ITpgFItdU5Bx5aH+uGbah8Yv4ilFrSYHDebsBIw6jnZd9HPCapxyz5t/fSq9ZENlPw==",
       "dependencies": {
-        "airbnb-prop-types": "^2.15.0",
-        "consolidated-events": "^1.1.1 || ^2.0.0",
-        "enzyme-shallow-equal": "^1.0.0",
-        "is-touch-device": "^1.0.1",
-        "lodash": "^4.1.1",
-        "object.assign": "^4.1.0",
-        "object.values": "^1.1.0",
-        "prop-types": "^15.7.2",
-        "raf": "^3.4.1",
-        "react-moment-proptypes": "^1.6.0",
-        "react-outside-click-handler": "^1.2.4",
-        "react-portal": "^4.2.0",
-        "react-with-direction": "^1.3.1",
-        "react-with-styles": "^4.1.0",
-        "react-with-styles-interface-css": "^6.0.0"
+        "@reach/auto-id": "^0.16.0"
+      },
+      "funding": {
+        "type": "individual",
+        "url": "https://github.com/sponsors/gpbl"
       },
       "peerDependencies": {
-        "@babel/runtime": "^7.0.0",
-        "moment": "^2.18.1",
-        "react": "^0.14 || ^15.5.4 || ^16.1.1",
-        "react-dom": "^0.14 || ^15.5.4 || ^16.1.1",
-        "react-with-direction": "^1.3.1"
+        "date-fns": "^2.10.0",
+        "react": "^16.8.0 || ^17.0.0"
       }
     },
     "node_modules/react-display-name": {
@@ -19860,87 +21089,6 @@
         "react": ">=16.8.6"
       }
     },
-    "node_modules/react-moment-proptypes": {
-      "version": "1.8.1",
-      "license": "MIT",
-      "dependencies": {
-        "moment": ">=1.6.0"
-      },
-      "peerDependencies": {
-        "moment": ">=1.6.0"
-      }
-    },
-    "node_modules/react-outside-click-handler": {
-      "version": "1.3.0",
-      "license": "MIT",
-      "dependencies": {
-        "airbnb-prop-types": "^2.15.0",
-        "consolidated-events": "^1.1.1 || ^2.0.0",
-        "document.contains": "^1.0.1",
-        "object.values": "^1.1.0",
-        "prop-types": "^15.7.2"
-      },
-      "peerDependencies": {
-        "react": "^0.14 || >=15",
-        "react-dom": "^0.14 || >=15"
-      }
-    },
-    "node_modules/react-portal": {
-      "version": "4.2.1",
-      "license": "MIT",
-      "dependencies": {
-        "prop-types": "^15.5.8"
-      },
-      "peerDependencies": {
-        "react": "^15.0.0-0 || ^16.0.0-0 || ^17.0.0-0"
-      }
-    },
-    "node_modules/react-with-direction": {
-      "version": "1.3.1",
-      "license": "MIT",
-      "dependencies": {
-        "airbnb-prop-types": "^2.10.0",
-        "brcast": "^2.0.2",
-        "deepmerge": "^1.5.2",
-        "direction": "^1.0.2",
-        "hoist-non-react-statics": "^3.3.0",
-        "object.assign": "^4.1.0",
-        "object.values": "^1.0.4",
-        "prop-types": "^15.6.2"
-      },
-      "peerDependencies": {
-        "react": "^0.14 || ^15 || ^16",
-        "react-dom": "^0.14 || ^15 || ^16"
-      }
-    },
-    "node_modules/react-with-styles": {
-      "version": "4.2.0",
-      "license": "MIT",
-      "dependencies": {
-        "airbnb-prop-types": "^2.14.0",
-        "hoist-non-react-statics": "^3.2.1",
-        "object.assign": "^4.1.0",
-        "prop-types": "^15.7.2",
-        "react-with-direction": "^1.3.1"
-      },
-      "peerDependencies": {
-        "@babel/runtime": "^7.0.0",
-        "react": ">=0.14",
-        "react-with-direction": "^1.3.1"
-      }
-    },
-    "node_modules/react-with-styles-interface-css": {
-      "version": "6.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "array.prototype.flat": "^1.2.1",
-        "global-cache": "^1.2.1"
-      },
-      "peerDependencies": {
-        "@babel/runtime": "^7.0.0",
-        "react-with-styles": "^3.0.0 || ^4.0.0"
-      }
-    },
     "node_modules/read-cache": {
       "version": "1.0.0",
       "dev": true,
@@ -19949,28 +21097,6 @@
         "pify": "^2.3.0"
       }
     },
-    "node_modules/read-pkg": {
-      "version": "5.2.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/normalize-package-data": "^2.4.0",
-        "normalize-package-data": "^2.5.0",
-        "parse-json": "^5.0.0",
-        "type-fest": "^0.6.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg/node_modules/type-fest": {
-      "version": "0.6.0",
-      "dev": true,
-      "license": "(MIT OR CC0-1.0)",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/readable-stream": {
       "version": "2.3.7",
       "dev": true,
@@ -19996,48 +21122,27 @@
         "node": ">=8.10.0"
       }
     },
-    "node_modules/recast": {
-      "version": "0.20.5",
+    "node_modules/reflect.getprototypeof": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.5.tgz",
+      "integrity": "sha512-62wgfC8dJWrmxv44CA36pLDnP6KKl3Vhxb7PL+8+qrrFMMoJij4vgiMP8zV4O8+CBMXY1mHxI5fITGHXFHVmQQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "ast-types": "0.14.2",
-        "esprima": "~4.0.0",
-        "source-map": "~0.6.1",
-        "tslib": "^2.0.1"
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.22.3",
+        "es-errors": "^1.0.0",
+        "get-intrinsic": "^1.2.3",
+        "globalthis": "^1.0.3",
+        "which-builtin-type": "^1.1.3"
       },
       "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/recast/node_modules/ast-types": {
-      "version": "0.14.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "tslib": "^2.0.1"
+        "node": ">= 0.4"
       },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/recast/node_modules/source-map": {
-      "version": "0.6.1",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=0.10.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/recast/node_modules/tslib": {
-      "version": "2.3.1",
-      "dev": true,
-      "license": "0BSD"
-    },
-    "node_modules/reflect.ownkeys": {
-      "version": "0.2.0",
-      "license": "MIT"
-    },
     "node_modules/regenerate": {
       "version": "1.4.2",
       "dev": true,
@@ -20066,25 +21171,16 @@
         "@babel/runtime": "^7.8.4"
       }
     },
-    "node_modules/regex-not": {
-      "version": "1.0.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "extend-shallow": "^3.0.2",
-        "safe-regex": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.3.1",
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz",
+      "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
+        "call-bind": "^1.0.6",
+        "define-properties": "^1.2.1",
+        "es-errors": "^1.3.0",
+        "set-function-name": "^2.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -20093,17 +21189,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/regexpp": {
-      "version": "3.2.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      }
-    },
     "node_modules/regexpu-core": {
       "version": "4.7.1",
       "dev": true,
@@ -20120,36 +21205,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/regextras": {
-      "version": "0.8.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.1.14"
-      }
-    },
-    "node_modules/registry-auth-token": {
-      "version": "4.2.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "rc": "^1.2.8"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/registry-url": {
-      "version": "5.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "rc": "^1.2.8"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/regjsgen": {
       "version": "0.5.2",
       "dev": true,
@@ -20196,36 +21251,6 @@
         "node": ">= 0.10.0"
       }
     },
-    "node_modules/remove-bom-buffer": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-buffer": "^1.1.5",
-        "is-utf8": "^0.2.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/remove-bom-stream": {
-      "version": "1.2.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "remove-bom-buffer": "^3.0.0",
-        "safe-buffer": "^5.1.0",
-        "through2": "^2.0.3"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/remove-trailing-separator": {
-      "version": "1.1.0",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/repeat-element": {
       "version": "1.1.3",
       "dev": true,
@@ -20242,64 +21267,6 @@
         "node": ">=0.10"
       }
     },
-    "node_modules/replace-ext": {
-      "version": "1.0.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/request": {
-      "version": "2.88.2",
-      "dev": true,
-      "license": "Apache-2.0",
-      "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"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/request/node_modules/tough-cookie": {
-      "version": "2.5.0",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/request/node_modules/uuid": {
-      "version": "3.4.0",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "uuid": "bin/uuid"
-      }
-    },
     "node_modules/require-directory": {
       "version": "2.1.1",
       "dev": true,
@@ -20321,21 +21288,27 @@
       "license": "MIT"
     },
     "node_modules/reselect": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT"
+      "version": "4.1.8",
+      "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.8.tgz",
+      "integrity": "sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==",
+      "dev": true
     },
     "node_modules/resize-observer-polyfill": {
       "version": "1.5.1",
       "license": "MIT"
     },
     "node_modules/resolve": {
-      "version": "1.20.0",
+      "version": "1.22.8",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "is-core-module": "^2.2.0",
-        "path-parse": "^1.0.6"
+        "is-core-module": "^2.13.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -20343,8 +21316,9 @@
     },
     "node_modules/resolve-cwd": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "resolve-from": "^5.0.0"
       },
@@ -20352,18 +21326,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/resolve-dir": {
-      "version": "1.0.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "expand-tilde": "^2.0.0",
-        "global-modules": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/resolve-from": {
       "version": "5.0.0",
       "dev": true,
@@ -20372,51 +21334,15 @@
         "node": ">=8"
       }
     },
-    "node_modules/resolve-options": {
-      "version": "1.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "value-or-function": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/resolve-url": {
-      "version": "0.2.1",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/resolve.exports": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz",
-      "integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
+      "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
       "dev": true,
       "engines": {
         "node": ">=10"
       }
     },
-    "node_modules/responselike": {
-      "version": "1.0.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "lowercase-keys": "^1.0.0"
-      }
-    },
-    "node_modules/restore-cursor": {
-      "version": "3.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/ret": {
       "version": "0.1.15",
       "dev": true,
@@ -20425,26 +21351,6 @@
         "node": ">=0.12"
       }
     },
-    "node_modules/retry": {
-      "version": "0.13.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/retry-request": {
-      "version": "4.2.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "debug": "^4.1.1",
-        "extend": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
     "node_modules/reusify": {
       "version": "1.0.4",
       "dev": true,
@@ -20456,8 +21362,9 @@
     },
     "node_modules/rfdc": {
       "version": "1.3.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
+      "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==",
+      "dev": true
     },
     "node_modules/rimraf": {
       "version": "3.0.2",
@@ -20494,15 +21401,19 @@
       }
     },
     "node_modules/rrule": {
-      "version": "2.6.8",
-      "license": "BSD-3-Clause",
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/rrule/-/rrule-2.7.2.tgz",
+      "integrity": "sha512-NkBsEEB6FIZOZ3T8frvEBOB243dm46SPufpDckY/Ap/YH24V1zLeMmDY8OA10lk452NdrF621+ynDThE7FQU2A==",
       "dependencies": {
-        "tslib": "^1.10.0"
-      },
-      "optionalDependencies": {
-        "luxon": "^1.21.3"
+        "tslib": "^2.4.0"
       }
     },
+    "node_modules/rrweb-cssom": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz",
+      "integrity": "sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==",
+      "dev": true
+    },
     "node_modules/rst-selector-parser": {
       "version": "2.2.3",
       "dev": true,
@@ -20514,6 +21425,8 @@
     },
     "node_modules/run-parallel": {
       "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
       "dev": true,
       "funding": [
         {
@@ -20529,11 +21442,34 @@
           "url": "https://feross.org/support"
         }
       ],
-      "license": "MIT",
       "dependencies": {
         "queue-microtask": "^1.2.2"
       }
     },
+    "node_modules/safe-array-concat": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz",
+      "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "get-intrinsic": "^1.2.4",
+        "has-symbols": "^1.0.3",
+        "isarray": "^2.0.5"
+      },
+      "engines": {
+        "node": ">=0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/safe-array-concat/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/safe-buffer": {
       "version": "5.1.2",
       "dev": true,
@@ -20543,12 +21479,21 @@
       "version": "1.0.1",
       "dev": true
     },
-    "node_modules/safe-regex": {
-      "version": "1.1.0",
+    "node_modules/safe-regex-test": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz",
+      "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "ret": "~0.1.10"
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-regex": "^1.1.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/safer-buffer": {
@@ -20556,15 +21501,22 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/sax": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz",
+      "integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==",
+      "dev": true
+    },
     "node_modules/saxes": {
-      "version": "5.0.1",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
+      "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "xmlchars": "^2.2.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=v12.22.7"
       }
     },
     "node_modules/scheduler": {
@@ -20576,12 +21528,10 @@
       }
     },
     "node_modules/semver": {
-      "version": "7.3.5",
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
+      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -20589,43 +21539,25 @@
         "node": ">=10"
       }
     },
-    "node_modules/semver-diff": {
-      "version": "3.1.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/semver-diff/node_modules/semver": {
-      "version": "6.3.0",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/send": {
-      "version": "0.17.1",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
+        "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": "~1.7.2",
+        "http-errors": "2.0.0",
         "mime": "1.6.0",
-        "ms": "2.1.1",
-        "on-finished": "~2.3.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
         "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
+        "statuses": "2.0.1"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -20633,26 +21565,70 @@
     },
     "node_modules/send/node_modules/debug": {
       "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
     },
     "node_modules/send/node_modules/debug/node_modules/ms": {
       "version": "2.0.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/send/node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/send/node_modules/destroy": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
     },
     "node_modules/send/node_modules/ms": {
-      "version": "2.1.1",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true
+    },
+    "node_modules/send/node_modules/on-finished": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
       "dev": true,
-      "license": "MIT"
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/send/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
     "node_modules/serialize-error": {
       "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz",
+      "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "type-fest": "^0.13.1"
       },
@@ -20665,8 +21641,9 @@
     },
     "node_modules/serialize-error/node_modules/type-fest": {
       "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
+      "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
       "dev": true,
-      "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=10"
       },
@@ -20675,9 +21652,10 @@
       }
     },
     "node_modules/serialize-javascript": {
-      "version": "6.0.0",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "randombytes": "^2.1.0"
       }
@@ -20737,71 +21715,75 @@
       "license": "ISC"
     },
     "node_modules/serve-static": {
-      "version": "1.14.1",
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.0.tgz",
+      "integrity": "sha512-pDLK8zwl2eKaYrs8mrPZBJua4hMplRWJ1tIFksVC3FtBEBnl8dxgeHtsaMS8DhS9i4fLObaon6ABoc4/hQGdPA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.17.1"
+        "send": "0.18.0"
       },
       "engines": {
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/set-getter": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/set-getter/-/set-getter-0.1.1.tgz",
-      "integrity": "sha512-9sVWOy+gthr+0G9DzqqLaYNA7+5OKkSmcqjL9cBpDEaZrr3ShQlyX2cZ/O/ozE41oxn/Tt0LGEM/w4Rub3A3gw==",
+    "node_modules/set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+      "dev": true
+    },
+    "node_modules/set-function-length": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.1.tgz",
+      "integrity": "sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g==",
       "dev": true,
       "dependencies": {
-        "to-object-path": "^0.3.0"
+        "define-data-property": "^1.1.2",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.3",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/set-value": {
-      "version": "2.0.1",
+    "node_modules/set-function-name": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
+      "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-extendable": "^0.1.1",
-        "is-plain-object": "^2.0.3",
-        "split-string": "^3.0.1"
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "functions-have-names": "^1.2.3",
+        "has-property-descriptors": "^1.0.2"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/set-value/node_modules/extend-shallow": {
-      "version": "2.0.1",
+    "node_modules/set-getter": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/set-getter/-/set-getter-0.1.1.tgz",
+      "integrity": "sha512-9sVWOy+gthr+0G9DzqqLaYNA7+5OKkSmcqjL9cBpDEaZrr3ShQlyX2cZ/O/ozE41oxn/Tt0LGEM/w4Rub3A3gw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "is-extendable": "^0.1.0"
+        "to-object-path": "^0.3.0"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/setprototypeof": {
-      "version": "1.1.1",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/shallow-clone": {
-      "version": "3.0.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+      "dev": true
     },
     "node_modules/shallow-equal": {
       "version": "1.2.1",
@@ -20827,21 +21809,28 @@
       }
     },
     "node_modules/side-channel": {
-      "version": "1.0.4",
-      "license": "MIT",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
+      "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4",
+        "object-inspect": "^1.13.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/signal-exit": {
-      "version": "3.0.3",
-      "dev": true,
-      "license": "ISC"
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true
     },
     "node_modules/sinon": {
       "version": "11.1.2",
@@ -20877,6 +21866,15 @@
         "type-detect": "4.0.8"
       }
     },
+    "node_modules/sinon/node_modules/@sinonjs/fake-timers": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz",
+      "integrity": "sha512-iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg==",
+      "dev": true,
+      "dependencies": {
+        "@sinonjs/commons": "^1.7.0"
+      }
+    },
     "node_modules/sinon/node_modules/has-flag": {
       "version": "4.0.0",
       "dev": true,
@@ -20904,231 +21902,161 @@
         "node": ">=8"
       }
     },
+    "node_modules/slashes": {
+      "version": "3.0.12",
+      "resolved": "https://registry.npmjs.org/slashes/-/slashes-3.0.12.tgz",
+      "integrity": "sha512-Q9VME8WyGkc7pJf6QEkj3wE+2CnvZMI+XJhwdTPR8Z/kWQRXi7boAWLDibRPyHRTUTPx5FaU7MsyrjI3yLB4HA==",
+      "dev": true
+    },
     "node_modules/slice-ansi": {
-      "version": "3.0.0",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
+      "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
+        "ansi-styles": "^6.0.0",
+        "is-fullwidth-code-point": "^4.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
       }
     },
     "node_modules/slice-ansi/node_modules/ansi-styles": {
-      "version": "4.3.0",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/slice-ansi/node_modules/color-convert": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/slice-ansi/node_modules/color-name": {
-      "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/slice-ansi/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/snakeize": {
-      "version": "0.1.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/snapdragon": {
-      "version": "0.8.2",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
+      "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==",
       "dev": true,
-      "license": "MIT",
-      "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"
-      },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-node": {
-      "version": "2.1.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.0",
-        "snapdragon-util": "^3.0.1"
+        "node": ">=12"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/snapdragon-node/node_modules/define-property": {
-      "version": "1.0.0",
+    "node_modules/smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 6.0.0",
+        "npm": ">= 3.0.0"
       }
     },
-    "node_modules/snapdragon-node/node_modules/is-accessor-descriptor": {
-      "version": "1.0.0",
+    "node_modules/socket.io": {
+      "version": "4.7.4",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.7.4.tgz",
+      "integrity": "sha512-DcotgfP1Zg9iP/dH9zvAQcWrE0TtbMVwXmlV4T4mqsvY+gw+LqUGPfx2AoVyRk0FLME+GQhufDMyacFmw7ksqw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "kind-of": "^6.0.0"
+        "accepts": "~1.3.4",
+        "base64id": "~2.0.0",
+        "cors": "~2.8.5",
+        "debug": "~4.3.2",
+        "engine.io": "~6.5.2",
+        "socket.io-adapter": "~2.5.2",
+        "socket.io-parser": "~4.2.4"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10.2.0"
       }
     },
-    "node_modules/snapdragon-node/node_modules/is-data-descriptor": {
-      "version": "1.0.0",
+    "node_modules/socket.io-adapter": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.2.tgz",
+      "integrity": "sha512-87C3LO/NOMc+eMcpcxUBebGjkpMDkNBS9tf7KJqcDsmL936EChtVva71Dw2q4tQcuVC+hAUy4an2NO/sYXmwRA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "ws": "~8.11.0"
       }
     },
-    "node_modules/snapdragon-node/node_modules/is-descriptor": {
-      "version": "1.0.2",
+    "node_modules/socket.io-adapter/node_modules/ws": {
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
+      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
-      },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-util": {
-      "version": "3.0.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "kind-of": "^3.2.0"
+        "node": ">=10.0.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-util/node_modules/kind-of": {
-      "version": "3.2.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-buffer": "^1.1.5"
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/debug": {
-      "version": "2.6.9",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ms": "2.0.0"
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
       }
     },
-    "node_modules/snapdragon/node_modules/define-property": {
-      "version": "0.2.5",
+    "node_modules/socket.io-parser": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz",
+      "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "is-descriptor": "^0.1.0"
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10.0.0"
       }
     },
-    "node_modules/snapdragon/node_modules/extend-shallow": {
-      "version": "2.0.1",
+    "node_modules/socks": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.1.tgz",
+      "integrity": "sha512-B6w7tkwNid7ToxjZ08rQMT8M9BJAf8DKx8Ft4NivzH0zBUfd6jldGcisJn/RLgxcX3FPNDdNQCUEMMT79b+oCQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "is-extendable": "^0.1.0"
+        "ip-address": "^9.0.5",
+        "smart-buffer": "^4.2.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 10.0.0",
+        "npm": ">= 3.0.0"
       }
     },
-    "node_modules/snapdragon/node_modules/ms": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/socket.io": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.3.1.tgz",
-      "integrity": "sha512-HC5w5Olv2XZ0XJ4gOLGzzHEuOCfj3G0SmoW3jLHYYh34EVsIr3EkW9h6kgfW+K3TFEcmYy8JcPWe//KUkBp5jA==",
+    "node_modules/socks-proxy-agent": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.2.tgz",
+      "integrity": "sha512-8zuqoLv1aP/66PHF5TqwJ7Czm3Yv32urJQHrVyhD7mmA6d61Zv8cIXQYPTWwmg6qlupnPvs/QKDmfa4P/qct2g==",
       "dev": true,
       "dependencies": {
-        "accepts": "~1.3.4",
-        "base64id": "~2.0.0",
-        "debug": "~4.3.2",
-        "engine.io": "~6.0.0",
-        "socket.io-adapter": "~2.3.2",
-        "socket.io-parser": "~4.0.4"
+        "agent-base": "^7.0.2",
+        "debug": "^4.3.4",
+        "socks": "^2.7.1"
       },
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">= 14"
       }
     },
-    "node_modules/socket.io-adapter": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.2.tgz",
-      "integrity": "sha512-PBZpxUPYjmoogY0aoaTmo1643JelsaS1CiAwNjRVdrI0X9Seuc19Y2Wife8k88avW6haG8cznvwbubAZwH4Mtg==",
-      "dev": true
-    },
-    "node_modules/socket.io-parser": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz",
-      "integrity": "sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==",
+    "node_modules/socks-proxy-agent/node_modules/agent-base": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
+      "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==",
       "dev": true,
       "dependencies": {
-        "@types/component-emitter": "^1.2.10",
-        "component-emitter": "~1.3.0",
-        "debug": "~4.3.1"
+        "debug": "^4.3.4"
       },
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">= 14"
       }
     },
     "node_modules/source-map": {
@@ -21140,29 +22068,19 @@
       }
     },
     "node_modules/source-map-js": {
-      "version": "0.6.2",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
+      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/source-map-resolve": {
-      "version": "0.5.3",
-      "dev": true,
-      "license": "MIT",
-      "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"
-      }
-    },
     "node_modules/source-map-support": {
-      "version": "0.5.19",
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -21176,34 +22094,16 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/source-map-url": {
-      "version": "0.4.1",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/sourcemap-codec": {
-      "version": "1.4.8",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/spdx-correct": {
-      "version": "3.1.1",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
     "node_modules/spdx-exceptions": {
       "version": "2.3.0",
       "dev": true,
       "license": "CC-BY-3.0"
     },
     "node_modules/spdx-expression-parse": {
-      "version": "3.0.1",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-4.0.0.tgz",
+      "integrity": "sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "spdx-exceptions": "^2.1.0",
         "spdx-license-ids": "^3.0.0"
@@ -21225,55 +22125,16 @@
         "node": "*"
       }
     },
-    "node_modules/split-string": {
-      "version": "3.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "extend-shallow": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/sprintf-js": {
       "version": "1.0.3",
       "dev": true,
       "license": "BSD-3-Clause"
     },
-    "node_modules/sshpk": {
-      "version": "1.16.1",
-      "dev": true,
-      "license": "MIT",
-      "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"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/stable": {
-      "version": "0.1.8",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/stack-utils": {
-      "version": "2.0.3",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
+      "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "escape-string-regexp": "^2.0.0"
       },
@@ -21289,29 +22150,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/static-extend": {
-      "version": "0.1.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "define-property": "^0.2.5",
-        "object-copy": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/define-property": {
-      "version": "0.2.5",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/statuses": {
       "version": "1.5.0",
       "dev": true,
@@ -21351,44 +22189,25 @@
         "through": "~2.3.4"
       }
     },
-    "node_modules/stream-events": {
-      "version": "1.0.5",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "stubs": "^3.0.0"
-      }
-    },
-    "node_modules/stream-shift": {
-      "version": "1.0.1",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/streamroller": {
-      "version": "2.2.4",
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.1.5.tgz",
+      "integrity": "sha512-KFxaM7XT+irxvdqSP1LGLgNWbYN7ay5owZ3r/8t77p+EtSUAfUgtl7be3xtqtOmGUl9K9YPO2ca8133RlTjvKw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "date-format": "^2.1.0",
-        "debug": "^4.1.1",
+        "date-format": "^4.0.14",
+        "debug": "^4.3.4",
         "fs-extra": "^8.1.0"
       },
       "engines": {
         "node": ">=8.0"
       }
     },
-    "node_modules/streamroller/node_modules/date-format": {
-      "version": "2.1.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
     "node_modules/streamroller/node_modules/fs-extra": {
       "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.0",
         "jsonfile": "^4.0.0",
@@ -21400,17 +22219,20 @@
     },
     "node_modules/streamroller/node_modules/jsonfile": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
       "dev": true,
-      "license": "MIT",
       "optionalDependencies": {
         "graceful-fs": "^4.1.6"
       }
     },
     "node_modules/streamsearch": {
-      "version": "0.1.2",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz",
+      "integrity": "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==",
       "dev": true,
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">=10.0.0"
       }
     },
     "node_modules/string_decoder": {
@@ -21439,65 +22261,65 @@
       "dev": true
     },
     "node_modules/string-width": {
-      "version": "4.2.2",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
+        "strip-ansi": "^6.0.1"
       },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/string-width/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/string.prototype.matchall": {
-      "version": "4.0.5",
+      "version": "4.0.11",
+      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz",
+      "integrity": "sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.2",
-        "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"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.7",
+        "regexp.prototype.flags": "^1.5.2",
+        "set-function-name": "^2.0.2",
+        "side-channel": "^1.0.6"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/string.prototype.matchall/node_modules/get-intrinsic": {
-      "version": "1.1.1",
+    "node_modules/string.prototype.repeat": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz",
+      "integrity": "sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
       }
     },
     "node_modules/string.prototype.trim": {
-      "version": "1.2.4",
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz",
+      "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.2"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.0",
+        "es-object-atoms": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -21507,22 +22329,31 @@
       }
     },
     "node_modules/string.prototype.trimend": {
-      "version": "1.0.4",
-      "license": "MIT",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz",
+      "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==",
+      "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/string.prototype.trimstart": {
-      "version": "1.0.4",
-      "license": "MIT",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
+      "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
+      "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -21573,46 +22404,91 @@
       }
     },
     "node_modules/strip-json-comments": {
-      "version": "2.0.1",
+      "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,
-      "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/stubs": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/strnum": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz",
+      "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==",
+      "dev": true
     },
     "node_modules/stylehacks": {
-      "version": "5.0.1",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-6.1.1.tgz",
+      "integrity": "sha512-gSTTEQ670cJNoaeIp9KX6lZmm8LJ3jPB5yJmX8Zq/wQxOsAFXV3qjWzHas3YYk1qesuVIyYWWUpZ0vSE/dTSGg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.16.0",
-        "postcss-selector-parser": "^6.0.4"
+        "browserslist": "^4.23.0",
+        "postcss-selector-parser": "^6.0.16"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": "^14 || ^16 || >=18.0"
       },
       "peerDependencies": {
-        "postcss": "^8.2.15"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/supertap": {
-      "version": "2.0.0",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/supertap/-/supertap-3.0.1.tgz",
+      "integrity": "sha512-u1ZpIBCawJnO+0QePsEiOknOfCRq0yERxiAchT0i4li0WHNUJbf0evXXSXOcCAR4M8iMDoajXYmstm/qO81Isw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "arrify": "^2.0.1",
-        "indent-string": "^4.0.0",
-        "js-yaml": "^3.14.0",
+        "indent-string": "^5.0.0",
+        "js-yaml": "^3.14.1",
         "serialize-error": "^7.0.1",
-        "strip-ansi": "^6.0.0"
+        "strip-ansi": "^7.0.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      }
+    },
+    "node_modules/supertap/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==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/supertap/node_modules/indent-string": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-5.0.0.tgz",
+      "integrity": "sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/supertap/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
     "node_modules/supports-color": {
@@ -21626,58 +22502,121 @@
         "node": ">=4"
       }
     },
-    "node_modules/supports-hyperlinks": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
-      "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
+    "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/svgo": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-3.3.2.tgz",
+      "integrity": "sha512-OoohrmuUlBs8B8o6MB2Aevn+pRIH9zDALSR+6hhqVfa6fRwG/Qw9VUMSMW9VNg2CFc/MTIfabtdOVl9ODIJjpw==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0",
-        "supports-color": "^7.0.0"
+        "@trysound/sax": "0.2.0",
+        "commander": "^7.2.0",
+        "css-select": "^5.1.0",
+        "css-tree": "^2.3.1",
+        "css-what": "^6.1.0",
+        "csso": "^5.0.5",
+        "picocolors": "^1.0.0"
+      },
+      "bin": {
+        "svgo": "bin/svgo"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=14.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/svgo"
       }
     },
-    "node_modules/supports-hyperlinks/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/svgo/node_modules/commander": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">= 10"
       }
     },
-    "node_modules/supports-hyperlinks/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/svgo/node_modules/css-select": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
+      "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "boolbase": "^1.0.0",
+        "css-what": "^6.1.0",
+        "domhandler": "^5.0.2",
+        "domutils": "^3.0.1",
+        "nth-check": "^2.0.1"
       },
-      "engines": {
-        "node": ">=8"
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
       }
     },
-    "node_modules/svgo": {
-      "version": "2.4.0",
+    "node_modules/svgo/node_modules/dom-serializer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
+      "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@trysound/sax": "0.1.1",
-        "colorette": "^1.2.2",
-        "commander": "^7.1.0",
-        "css-select": "^4.1.3",
-        "css-tree": "^1.1.2",
-        "csso": "^4.2.0",
-        "stable": "^0.1.8"
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.2",
+        "entities": "^4.2.0"
       },
-      "bin": {
-        "svgo": "bin/svgo"
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+      }
+    },
+    "node_modules/svgo/node_modules/domhandler": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
+      "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.3.0"
       },
       "engines": {
-        "node": ">=10.13.0"
+        "node": ">= 4"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
+      }
+    },
+    "node_modules/svgo/node_modules/domutils": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
+      "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
+      "dev": true,
+      "dependencies": {
+        "dom-serializer": "^2.0.0",
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
+      }
+    },
+    "node_modules/svgo/node_modules/entities": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
     "node_modules/symbol-observable": {
@@ -21701,90 +22640,37 @@
         "get-port": "^3.1.0"
       }
     },
-    "node_modules/table": {
-      "version": "6.7.1",
+    "node_modules/synckit": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.1.tgz",
+      "integrity": "sha512-7gr8p9TQP6RAHusBOSLs46F4564ZrjV8xFmw5zCmgmhGUcw2hxsShhJ6CEiHQMgPDwAQ1fWHPM0ypc4RMAig4A==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
-        "ajv": "^8.0.1",
-        "lodash.clonedeep": "^4.5.0",
-        "lodash.truncate": "^4.4.2",
-        "slice-ansi": "^4.0.0",
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0"
+        "@pkgr/core": "^0.1.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/table/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/table/node_modules/color-convert": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/table/node_modules/color-name": {
-      "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/table/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/table/node_modules/slice-ansi": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "node": "^14.18.0 || >=16.0.0"
       },
       "funding": {
-        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+        "url": "https://opencollective.com/unts"
       }
     },
     "node_modules/tar": {
-      "version": "6.1.11",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
+      "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
-        "minipass": "^3.0.0",
+        "minipass": "^5.0.0",
         "minizlib": "^2.1.1",
         "mkdirp": "^1.0.3",
         "yallist": "^4.0.0"
       },
       "engines": {
-        "node": ">= 10"
+        "node": ">=10"
       }
     },
     "node_modules/tar-stream": {
@@ -21830,43 +22716,27 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/tar/node_modules/mkdirp": {
-      "version": "1.0.4",
+    "node_modules/tar/node_modules/minipass": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
+      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
       "dev": true,
-      "license": "MIT",
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
       "engines": {
-        "node": ">=10"
+        "node": ">=8"
       }
     },
-    "node_modules/teeny-request": {
-      "version": "7.1.1",
+    "node_modules/tar/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
       "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "http-proxy-agent": "^4.0.0",
-        "https-proxy-agent": "^5.0.0",
-        "node-fetch": "^2.6.1",
-        "stream-events": "^1.0.5",
-        "uuid": "^8.0.0"
+      "bin": {
+        "mkdirp": "bin/cmd.js"
       },
       "engines": {
         "node": ">=10"
       }
     },
-    "node_modules/temp": {
-      "version": "0.8.4",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "rimraf": "~2.6.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
     "node_modules/temp-dir": {
       "version": "2.0.0",
       "dev": true,
@@ -21875,17 +22745,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/temp/node_modules/rimraf": {
-      "version": "2.6.3",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
     "node_modules/tempy": {
       "version": "1.0.1",
       "dev": true,
@@ -21915,29 +22774,16 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/terminal-link": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
-      "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-escapes": "^4.2.1",
-        "supports-hyperlinks": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/terser": {
-      "version": "5.9.0",
+      "version": "5.14.2",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz",
+      "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
+        "@jridgewell/source-map": "^0.3.2",
+        "acorn": "^8.5.0",
         "commander": "^2.20.0",
-        "source-map": "~0.7.2",
         "source-map-support": "~0.5.20"
       },
       "bin": {
@@ -21949,33 +22795,9 @@
     },
     "node_modules/terser/node_modules/commander": {
       "version": "2.20.3",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/terser/node_modules/source-map": {
-      "version": "0.7.3",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/terser/node_modules/source-map-support": {
-      "version": "0.5.20",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
-    "node_modules/terser/node_modules/source-map-support/node_modules/source-map": {
-      "version": "0.6.1",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
     },
     "node_modules/test-exclude": {
       "version": "6.0.0",
@@ -21990,6 +22812,18 @@
         "node": ">=8"
       }
     },
+    "node_modules/test-exclude/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/text-table": {
       "version": "0.2.0",
       "dev": true,
@@ -22011,31 +22845,6 @@
         "react": ">=16.3"
       }
     },
-    "node_modules/thenify": {
-      "version": "3.3.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "any-promise": "^1.0.0"
-      }
-    },
-    "node_modules/thenify-all": {
-      "version": "1.6.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "thenify": ">= 3.1.0 < 4"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/throat": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz",
-      "integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==",
-      "dev": true
-    },
     "node_modules/through": {
       "version": "2.3.8",
       "dev": true,
@@ -22050,15 +22859,6 @@
         "xtend": "~4.0.1"
       }
     },
-    "node_modules/through2-filter": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "through2": "~2.0.0",
-        "xtend": "~4.0.0"
-      }
-    },
     "node_modules/time-stamp": {
       "version": "1.1.0",
       "dev": true,
@@ -22069,8 +22869,9 @@
     },
     "node_modules/time-zone": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/time-zone/-/time-zone-1.0.0.tgz",
+      "integrity": "sha512-TIsDdtKo6+XrPtiTm1ssmMngN1sAhyKnTO2kunQWqNPWIVvCm15Wmw4SWInwTVgJ5u/Tr04+8Ei9TNcw4x4ONA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -22079,11 +22880,6 @@
       "version": "4.0.2",
       "license": "MIT"
     },
-    "node_modules/timsort": {
-      "version": "0.3.0",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/tiny-lr": {
       "version": "1.1.1",
       "dev": true,
@@ -22126,18 +22922,6 @@
       "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
       "dev": true
     },
-    "node_modules/to-absolute-glob": {
-      "version": "2.0.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-absolute": "^1.0.0",
-        "is-negated-glob": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/to-fast-properties": {
       "version": "2.0.0",
       "dev": true,
@@ -22168,28 +22952,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/to-readable-stream": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/to-regex": {
-      "version": "3.0.2",
-      "dev": true,
-      "license": "MIT",
-      "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",
       "dev": true,
@@ -22201,21 +22963,11 @@
         "node": ">=8.0"
       }
     },
-    "node_modules/to-through": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "through2": "^2.0.3"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
     "node_modules/toidentifier": {
-      "version": "1.0.0",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.6"
       }
@@ -22226,58 +22978,96 @@
       "license": "MIT"
     },
     "node_modules/tough-cookie": {
-      "version": "4.0.0",
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz",
+      "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "psl": "^1.1.33",
         "punycode": "^2.1.1",
-        "universalify": "^0.1.2"
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
       },
       "engines": {
         "node": ">=6"
       }
     },
+    "node_modules/tough-cookie/node_modules/universalify": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
     "node_modules/tr46": {
-      "version": "2.1.0",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.0.0.tgz",
+      "integrity": "sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "punycode": "^2.1.1"
+        "punycode": "^2.3.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
+      }
+    },
+    "node_modules/tr46/node_modules/punycode": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
       }
     },
     "node_modules/traverse": {
-      "version": "0.6.6",
+      "version": "0.6.9",
+      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.9.tgz",
+      "integrity": "sha512-7bBrcF+/LQzSgFmT0X5YclVqQxtv7TDJ1f8Wj7ibBu/U6BMLeOpUxuZjV7rMc44UtKxlnMFigdhFAIszSX1DMg==",
       "dev": true,
-      "license": "MIT"
+      "dependencies": {
+        "gopd": "^1.0.1",
+        "typedarray.prototype.slice": "^1.0.3",
+        "which-typed-array": "^1.1.15"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
-    "node_modules/trim-off-newlines": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.3.tgz",
-      "integrity": "sha512-kh6Tu6GbeSNMGfrrZh6Bb/4ZEHV1QlB4xNDBeog8Y9/QwFlKTRyWvY3Fs9tRDAMZliVUwieMgEdIeL/FtqjkJg==",
+    "node_modules/ts-api-utils": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz",
+      "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==",
       "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=16"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.2.0"
       }
     },
     "node_modules/tsconfig-paths": {
-      "version": "3.11.0",
+      "version": "3.15.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
+      "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
-        "minimist": "^1.2.0",
+        "json5": "^1.0.2",
+        "minimist": "^1.2.6",
         "strip-bom": "^3.0.0"
       }
     },
     "node_modules/tsconfig-paths/node_modules/json5": {
-      "version": "1.0.1",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "minimist": "^1.2.0"
       },
@@ -22294,24 +23084,9 @@
       }
     },
     "node_modules/tslib": {
-      "version": "1.14.1",
-      "license": "0BSD"
-    },
-    "node_modules/tunnel-agent": {
-      "version": "0.6.0",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "safe-buffer": "^5.0.1"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/tweetnacl": {
-      "version": "0.14.5",
-      "dev": true,
-      "license": "Unlicense"
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "node_modules/type-check": {
       "version": "0.3.2",
@@ -22334,8 +23109,9 @@
     },
     "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,
-      "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=10"
       },
@@ -22355,30 +23131,115 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/typedarray": {
-      "version": "0.0.6",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/typedarray-to-buffer": {
-      "version": "3.1.5",
+    "node_modules/typed-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/typed-array-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz",
+      "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typed-array-byte-offset": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz",
+      "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==",
+      "dev": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typed-array-length": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz",
+      "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13",
+        "possible-typed-array-names": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typedarray": {
+      "version": "0.0.6",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/typedarray.prototype.slice": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/typedarray.prototype.slice/-/typedarray.prototype.slice-1.0.3.tgz",
+      "integrity": "sha512-8WbVAQAUlENo1q3c3zZYuy5k9VzBQvp8AX9WOtbvyWlLM1v5JaSRmjubLjzHF4JFtptjH/5c/i95yaElvcjC0A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "is-typedarray": "^1.0.0"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.0",
+        "es-errors": "^1.3.0",
+        "typed-array-buffer": "^1.0.2",
+        "typed-array-byte-offset": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/typescript": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz",
-      "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==",
+      "version": "5.5.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz",
+      "integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
       },
       "engines": {
-        "node": ">=4.2.0"
+        "node": ">=14.17"
       }
     },
     "node_modules/ua-parser-js": {
@@ -22412,31 +23273,30 @@
       }
     },
     "node_modules/unbox-primitive": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
-      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "dev": true,
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "has-bigints": "^1.0.1",
-        "has-symbols": "^1.0.2",
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
         "which-boxed-primitive": "^1.0.2"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/unc-path-regex": {
-      "version": "0.1.2",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/underscore": {
       "version": "1.1.7",
       "dev": true
     },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    },
     "node_modules/unicode-canonical-property-names-ecmascript": {
       "version": "1.0.4",
       "dev": true,
@@ -22473,32 +23333,16 @@
         "node": ">=4"
       }
     },
-    "node_modules/union-value": {
-      "version": "1.0.1",
+    "node_modules/unicorn-magic": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz",
+      "integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "arr-union": "^3.1.0",
-        "get-value": "^2.0.6",
-        "is-extendable": "^0.1.1",
-        "set-value": "^2.0.1"
-      },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/uniqs": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/unique-stream": {
-      "version": "2.3.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "through2-filter": "^3.0.0"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/unique-string": {
@@ -22533,150 +23377,34 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/unset-value": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-value": "^0.3.1",
-        "isobject": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-value": {
-      "version": "0.3.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "get-value": "^2.0.3",
-        "has-values": "^0.1.4",
-        "isobject": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
-      "version": "2.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "isarray": "1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-values": {
-      "version": "0.1.4",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/untildify": {
-      "version": "2.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "os-homedir": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/update-notifier": {
-      "version": "5.1.0",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "boxen": "^5.0.0",
-        "chalk": "^4.1.0",
-        "configstore": "^5.0.1",
-        "has-yarn": "^2.1.0",
-        "import-lazy": "^2.1.0",
-        "is-ci": "^2.0.0",
-        "is-installed-globally": "^0.4.0",
-        "is-npm": "^5.0.0",
-        "is-yarn-global": "^0.3.0",
-        "latest-version": "^5.1.0",
-        "pupa": "^2.1.1",
-        "semver": "^7.3.4",
-        "semver-diff": "^3.1.1",
-        "xdg-basedir": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/yeoman/update-notifier?sponsor=1"
-      }
-    },
-    "node_modules/update-notifier/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/update-notifier/node_modules/chalk": {
-      "version": "4.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/update-notifier/node_modules/color-convert": {
-      "version": "2.0.1",
+    "node_modules/update-browserslist-db": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
+      "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
       "dev": true,
-      "license": "MIT",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
       "dependencies": {
-        "color-name": "~1.1.4"
+        "escalade": "^3.1.2",
+        "picocolors": "^1.0.1"
       },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/update-notifier/node_modules/color-name": {
-      "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/update-notifier/node_modules/has-flag": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/update-notifier/node_modules/supports-color": {
-      "version": "7.2.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
+      "bin": {
+        "update-browserslist-db": "cli.js"
       },
-      "engines": {
-        "node": ">=8"
+      "peerDependencies": {
+        "browserslist": ">= 4.21.0"
       }
     },
     "node_modules/upper-case": {
@@ -22692,56 +23420,25 @@
         "punycode": "^2.1.0"
       }
     },
-    "node_modules/urix": {
-      "version": "0.1.0",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/url-parse": {
-      "version": "1.5.1",
-      "license": "MIT",
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
       "dependencies": {
         "querystringify": "^2.1.1",
         "requires-port": "^1.0.0"
       }
     },
-    "node_modules/url-parse-lax": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "prepend-http": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/urlgrey": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "fast-url-parser": "^1.1.3"
-      }
-    },
-    "node_modules/use": {
-      "version": "3.1.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/util": {
-      "version": "0.12.4",
+      "version": "0.12.5",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
+      "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
       "dev": true,
-      "license": "MIT",
       "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"
       }
     },
@@ -22759,165 +23456,44 @@
       }
     },
     "node_modules/uuid": {
-      "version": "8.3.2",
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
       "dev": true,
-      "license": "MIT",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
       "bin": {
         "uuid": "dist/bin/uuid"
       }
     },
-    "node_modules/v8-compile-cache": {
-      "version": "2.3.0",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/v8-to-istanbul": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.0.tgz",
-      "integrity": "sha512-/PRhfd8aTNp9Ggr62HPzXg2XasNFGy5PBt0Rp04du7/8GNNSgxFL6WBTkgMKSL9bFjH+8kKEG3f37FmxiTqUUA==",
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.2.0.tgz",
+      "integrity": "sha512-/EH/sDgxU2eGxajKdwLCDmQ4FWq+kpi3uCmBGpw1xJtnAxEjlD8j8PEiGWpCIMIs3ciNAgH0d3TTJiUkYzyZjA==",
       "dev": true,
       "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.12",
         "@types/istanbul-lib-coverage": "^2.0.1",
-        "convert-source-map": "^1.6.0",
-        "source-map": "^0.7.3"
+        "convert-source-map": "^2.0.0"
       },
       "engines": {
         "node": ">=10.12.0"
       }
     },
-    "node_modules/v8-to-istanbul/node_modules/source-map": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+    "node_modules/v8-to-istanbul/node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true
+    },
+    "node_modules/vary": {
+      "version": "1.1.2",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/validate-npm-package-license": {
-      "version": "3.0.4",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "node_modules/value-or-function": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/vary": {
-      "version": "1.1.2",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/vendors": {
-      "version": "1.0.4",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/verror": {
-      "version": "1.10.0",
-      "dev": true,
-      "engines": [
-        "node >=0.6.0"
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      }
-    },
-    "node_modules/vinyl": {
-      "version": "2.2.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "clone": "^2.1.1",
-        "clone-buffer": "^1.0.0",
-        "clone-stats": "^1.0.0",
-        "cloneable-readable": "^1.0.0",
-        "remove-trailing-separator": "^1.0.1",
-        "replace-ext": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/vinyl-fs": {
-      "version": "3.0.3",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fs-mkdirp-stream": "^1.0.0",
-        "glob-stream": "^6.1.0",
-        "graceful-fs": "^4.0.0",
-        "is-valid-glob": "^1.0.0",
-        "lazystream": "^1.0.0",
-        "lead": "^1.0.0",
-        "object.assign": "^4.0.4",
-        "pumpify": "^1.3.5",
-        "readable-stream": "^2.3.3",
-        "remove-bom-buffer": "^3.0.0",
-        "remove-bom-stream": "^1.2.0",
-        "resolve-options": "^1.1.0",
-        "through2": "^2.0.0",
-        "to-through": "^2.0.0",
-        "value-or-function": "^3.0.0",
-        "vinyl": "^2.0.0",
-        "vinyl-sourcemap": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/vinyl-sourcemap": {
-      "version": "1.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "append-buffer": "^1.0.2",
-        "convert-source-map": "^1.5.0",
-        "graceful-fs": "^4.1.6",
-        "normalize-path": "^2.1.1",
-        "now-and-later": "^2.0.0",
-        "remove-bom-buffer": "^3.0.0",
-        "vinyl": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/vinyl-sourcemap/node_modules/normalize-path": {
-      "version": "2.1.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/vinyl-sourcemaps-apply": {
-      "version": "0.2.1",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "source-map": "^0.5.1"
+        "node": ">= 0.8"
       }
     },
     "node_modules/void-elements": {
@@ -22928,23 +23504,16 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/w3c-hr-time": {
-      "version": "1.0.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "browser-process-hrtime": "^1.0.0"
-      }
-    },
     "node_modules/w3c-xmlserializer": {
-      "version": "2.0.0",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz",
+      "integrity": "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "xml-name-validator": "^3.0.0"
+        "xml-name-validator": "^5.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       }
     },
     "node_modules/walker": {
@@ -22956,14 +23525,6 @@
         "makeerror": "1.0.12"
       }
     },
-    "node_modules/wcwidth": {
-      "version": "1.0.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "defaults": "^1.0.3"
-      }
-    },
     "node_modules/web-activities": {
       "version": "1.24.0",
       "license": "Apache-2.0",
@@ -22984,11 +23545,12 @@
       "license": "Apache-2.0"
     },
     "node_modules/webidl-conversions": {
-      "version": "6.1.0",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "engines": {
-        "node": ">=10.4"
+        "node": ">=12"
       }
     },
     "node_modules/websocket-driver": {
@@ -23014,36 +23576,57 @@
     },
     "node_modules/well-known-symbols": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/well-known-symbols/-/well-known-symbols-2.0.0.tgz",
+      "integrity": "sha512-ZMjC3ho+KXo0BfJb7JgtQ5IBuvnShdlACNkKkdsqBmYw3bPAaJfPeYUo6tLUaT5tG/Gkh7xkpBhKRQ9e7pyg9Q==",
       "dev": true,
-      "license": "ISC",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/whatwg-encoding": {
-      "version": "1.0.5",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz",
+      "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==",
+      "dev": true,
+      "dependencies": {
+        "iconv-lite": "0.6.3"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/whatwg-encoding/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "iconv-lite": "0.4.24"
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
     "node_modules/whatwg-mimetype": {
-      "version": "2.3.0",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz",
+      "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==",
       "dev": true,
-      "license": "MIT"
+      "engines": {
+        "node": ">=18"
+      }
     },
     "node_modules/whatwg-url": {
-      "version": "8.7.0",
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.0.0.tgz",
+      "integrity": "sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "lodash": "^4.7.0",
-        "tr46": "^2.1.0",
-        "webidl-conversions": "^6.1.0"
+        "tr46": "^5.0.0",
+        "webidl-conversions": "^7.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       }
     },
     "node_modules/which": {
@@ -23061,6 +23644,7 @@
       "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": {
         "is-bigint": "^1.0.1",
         "is-boolean-object": "^1.1.0",
@@ -23072,18 +23656,24 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/which-typed-array": {
-      "version": "1.1.4",
+    "node_modules/which-builtin-type": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.3.tgz",
+      "integrity": "sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "available-typed-arrays": "^1.0.2",
-        "call-bind": "^1.0.0",
-        "es-abstract": "^1.18.0-next.1",
-        "foreach": "^2.0.5",
-        "function-bind": "^1.1.1",
-        "has-symbols": "^1.0.1",
-        "is-typed-array": "^1.1.3"
+        "function.prototype.name": "^1.1.5",
+        "has-tostringtag": "^1.0.0",
+        "is-async-function": "^2.0.0",
+        "is-date-object": "^1.0.5",
+        "is-finalizationregistry": "^1.0.2",
+        "is-generator-function": "^1.0.10",
+        "is-regex": "^1.1.4",
+        "is-weakref": "^1.0.2",
+        "isarray": "^2.0.5",
+        "which-boxed-primitive": "^1.0.2",
+        "which-collection": "^1.0.1",
+        "which-typed-array": "^1.1.9"
       },
       "engines": {
         "node": ">= 0.4"
@@ -23092,37 +23682,69 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/widest-line": {
-      "version": "3.1.0",
+    "node_modules/which-builtin-type/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/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,
-      "license": "MIT",
       "dependencies": {
-        "string-width": "^4.0.0"
+        "is-map": "^2.0.1",
+        "is-set": "^2.0.1",
+        "is-weakmap": "^2.0.1",
+        "is-weakset": "^2.0.1"
       },
-      "engines": {
-        "node": ">=8"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/word-wrap": {
-      "version": "1.2.3",
+    "node_modules/which-typed-array": {
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz",
+      "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-tostringtag": "^1.0.2"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/wordwrap": {
-      "version": "0.0.3",
+    "node_modules/wide-align": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
+      "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^1.0.2 || 2 || 3 || 4"
+      }
+    },
+    "node_modules/word-wrap": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=0.4.0"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/workerpool": {
-      "version": "6.1.5",
-      "dev": true,
-      "license": "Apache-2.0"
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz",
+      "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==",
+      "dev": true
     },
     "node_modules/wrap-ansi": {
       "version": "7.0.0",
@@ -23176,26 +23798,29 @@
       "license": "ISC"
     },
     "node_modules/write-file-atomic": {
-      "version": "3.0.3",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "imurmurhash": "^0.1.4",
-        "is-typedarray": "^1.0.0",
-        "signal-exit": "^3.0.2",
-        "typedarray-to-buffer": "^3.1.5"
+        "signal-exit": "^3.0.7"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
     },
     "node_modules/ws": {
-      "version": "7.5.3",
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=8.3.0"
+        "node": ">=10.0.0"
       },
       "peerDependencies": {
         "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
+        "utf-8-validate": ">=5.0.2"
       },
       "peerDependenciesMeta": {
         "bufferutil": {
@@ -23206,23 +23831,19 @@
         }
       }
     },
-    "node_modules/xdg-basedir": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/xml": {
       "version": "1.0.1",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/xml-name-validator": {
-      "version": "3.0.0",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz",
+      "integrity": "sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==",
       "dev": true,
-      "license": "Apache-2.0"
+      "engines": {
+        "node": ">=18"
+      }
     },
     "node_modules/xmlbuilder": {
       "version": "12.0.0",
@@ -23234,8 +23855,9 @@
     },
     "node_modules/xmlchars": {
       "version": "2.2.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+      "dev": true
     },
     "node_modules/xtend": {
       "version": "4.0.2",
@@ -23258,14 +23880,6 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/yaml": {
-      "version": "1.10.2",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/yargs": {
       "version": "16.2.0",
       "dev": true,
@@ -23372,11 +23986,18 @@
       "version": "0.2.2"
     },
     "@ampproject/bento-compiler": {
-      "version": "0.0.11",
-      "resolved": "https://registry.npmjs.org/@ampproject/bento-compiler/-/bento-compiler-0.0.11.tgz",
-      "integrity": "sha512-FR6bw/EodR0hHJEw7hwTD+5YhxJQHx43vZxlWYef8Asn1wF5PmRmVV769+ZIMQlSM3leYV4et01YrAyrZL0Keg==",
+      "version": "0.0.14",
+      "resolved": "https://registry.npmjs.org/@ampproject/bento-compiler/-/bento-compiler-0.0.14.tgz",
+      "integrity": "sha512-wIp4Fu4E0qHzm0n08MIzh+GNjfFqHdXunfk/C19gGJs7Zplm62v28p6gtoONcMNfeSDbeip33O4fbG5NuDMC3A==",
       "requires": {
-        "@ampproject/worker-dom": "0.32.1"
+        "@ampproject/worker-dom": "0.33.0"
+      },
+      "dependencies": {
+        "@ampproject/worker-dom": {
+          "version": "0.33.0",
+          "resolved": "https://registry.npmjs.org/@ampproject/worker-dom/-/worker-dom-0.33.0.tgz",
+          "integrity": "sha512-shTi1UldKehW2FGCr9owu9xiCsNONCyGCXLVWJQGGpioPcFSmwEI4Gvntj+QITxfkIXsmfFqT8si/PvwhwQGtA=="
+        }
       }
     },
     "@ampproject/filesize": {
@@ -23404,915 +24025,1731 @@
         }
       }
     },
-    "@ampproject/google-closure-compiler": {
-      "version": "20210601.0.0",
+    "@ampproject/remapping": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
       "dev": true,
       "requires": {
-        "@ampproject/google-closure-compiler-java": "20210601.0.0",
-        "@ampproject/google-closure-compiler-linux": "20210601.0.0",
-        "@ampproject/google-closure-compiler-osx": "20210601.0.0",
-        "@ampproject/google-closure-compiler-windows": "20210601.0.0",
-        "kleur": "4.1.4",
-        "vinyl": "2.2.1",
-        "vinyl-sourcemaps-apply": "0.2.1"
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
       }
     },
-    "@ampproject/google-closure-compiler-java": {
-      "version": "20210601.0.0",
-      "dev": true
+    "@ampproject/toolbox-cache-url": {
+      "version": "2.10.1",
+      "resolved": "https://registry.npmjs.org/@ampproject/toolbox-cache-url/-/toolbox-cache-url-2.10.1.tgz",
+      "integrity": "sha512-fDtr+0WRGIUEYU6IA6/qCDIS9IMHGmeyVT/Pf18FiorGcpLAQKK+SuuGkh07lF6xRMkkLSGVn2C6ghofWY3XXA==",
+      "requires": {
+        "punycode": "2.1.1",
+        "url-parse": "^1.5.10"
+      }
     },
-    "@ampproject/google-closure-compiler-linux": {
-      "version": "20210601.0.0",
-      "dev": true,
-      "optional": true
+    "@ampproject/viewer-messaging": {
+      "version": "1.1.2"
     },
-    "@ampproject/google-closure-compiler-osx": {
-      "version": "20210601.0.0",
-      "dev": true,
-      "optional": true
+    "@ampproject/worker-dom": {
+      "version": "0.35.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/worker-dom/-/worker-dom-0.35.0.tgz",
+      "integrity": "sha512-JPGurXC6aGkXZD9sAi1kny48099xD6QKSAZk7DMmAZ9jqMBuIClVL1j+kKBcXZnaIS8m9acXPQ6xu0cOiSujkg=="
     },
-    "@ampproject/google-closure-compiler-windows": {
-      "version": "20210601.0.0",
+    "@aws-crypto/crc32": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-5.2.0.tgz",
+      "integrity": "sha512-nLbCWqQNgUiwwtFsen1AdzAtvuLRsQS8rYgMuxCrdKf9kOssamGLuPwyTY9wyYblNr9+1XM8v6zoDTPPSIeANg==",
       "dev": true,
-      "optional": true
+      "requires": {
+        "@aws-crypto/util": "^5.2.0",
+        "@aws-sdk/types": "^3.222.0",
+        "tslib": "^2.6.2"
+      }
     },
-    "@ampproject/remapping": {
-      "version": "1.0.1",
+    "@aws-crypto/crc32c": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@aws-crypto/crc32c/-/crc32c-5.2.0.tgz",
+      "integrity": "sha512-+iWb8qaHLYKrNvGRbiYRHSdKRWhto5XlZUEBwDjYNf+ly5SVYG6zEoYIdxvf5R3zyeP16w4PLBn3rH1xc74Rag==",
       "dev": true,
       "requires": {
-        "@jridgewell/resolve-uri": "1.0.0",
-        "sourcemap-codec": "1.4.8"
+        "@aws-crypto/util": "^5.2.0",
+        "@aws-sdk/types": "^3.222.0",
+        "tslib": "^2.6.2"
       }
     },
-    "@ampproject/toolbox-cache-url": {
-      "version": "2.8.0",
+    "@aws-crypto/sha1-browser": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@aws-crypto/sha1-browser/-/sha1-browser-5.2.0.tgz",
+      "integrity": "sha512-OH6lveCFfcDjX4dbAvCFSYUjJZjDr/3XJ3xHtjn3Oj5b9RjojQo8npoLeA/bNwkOkrSQ0wgrHzXk4tDRxGKJeg==",
+      "dev": true,
       "requires": {
-        "punycode": "2.1.1",
-        "url-parse": "1.5.1"
+        "@aws-crypto/supports-web-crypto": "^5.2.0",
+        "@aws-crypto/util": "^5.2.0",
+        "@aws-sdk/types": "^3.222.0",
+        "@aws-sdk/util-locate-window": "^3.0.0",
+        "@smithy/util-utf8": "^2.0.0",
+        "tslib": "^2.6.2"
       }
     },
-    "@ampproject/viewer-messaging": {
-      "version": "1.1.2"
-    },
-    "@ampproject/worker-dom": {
-      "version": "0.32.1"
-    },
-    "@babel/code-frame": {
-      "version": "7.15.8",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz",
-      "integrity": "sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==",
+    "@aws-crypto/sha256-browser": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz",
+      "integrity": "sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==",
       "dev": true,
       "requires": {
-        "@babel/highlight": "^7.14.5"
+        "@aws-crypto/sha256-js": "^5.2.0",
+        "@aws-crypto/supports-web-crypto": "^5.2.0",
+        "@aws-crypto/util": "^5.2.0",
+        "@aws-sdk/types": "^3.222.0",
+        "@aws-sdk/util-locate-window": "^3.0.0",
+        "@smithy/util-utf8": "^2.0.0",
+        "tslib": "^2.6.2"
       }
     },
-    "@babel/compat-data": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz",
-      "integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==",
-      "dev": true
+    "@aws-crypto/sha256-js": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz",
+      "integrity": "sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==",
+      "dev": true,
+      "requires": {
+        "@aws-crypto/util": "^5.2.0",
+        "@aws-sdk/types": "^3.222.0",
+        "tslib": "^2.6.2"
+      }
     },
-    "@babel/core": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.0.tgz",
-      "integrity": "sha512-tXtmTminrze5HEUPn/a0JtOzzfp0nk+UEXQ/tqIJo3WDGypl/2OFQEMll/zSFU8f/lfmfLXvTaORHF3cfXIQMw==",
+    "@aws-crypto/supports-web-crypto": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.2.0.tgz",
+      "integrity": "sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/generator": "^7.15.0",
-        "@babel/helper-compilation-targets": "^7.15.0",
-        "@babel/helper-module-transforms": "^7.15.0",
-        "@babel/helpers": "^7.14.8",
-        "@babel/parser": "^7.15.0",
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.15.0",
-        "@babel/types": "^7.15.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"
-      },
-      "dependencies": {
-        "@babel/helper-compilation-targets": {
-          "version": "7.15.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz",
-          "integrity": "sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==",
+        "tslib": "^2.6.2"
+      }
+    },
+    "@aws-crypto/util": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-5.2.0.tgz",
+      "integrity": "sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==",
+      "dev": true,
+      "requires": {
+        "@aws-sdk/types": "^3.222.0",
+        "@smithy/util-utf8": "^2.0.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "@aws-sdk/client-s3": {
+      "version": "3.613.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.613.0.tgz",
+      "integrity": "sha512-JK0yjzZFa+/qVZawHasCG4yEEA7ITpBtNsn9ri7qUZDfSWxDDJpKgHI/ZWd4QXw3SLlBG9hoj+eNSroJXuv+hQ==",
+      "dev": true,
+      "requires": {
+        "@aws-crypto/sha1-browser": "5.2.0",
+        "@aws-crypto/sha256-browser": "5.2.0",
+        "@aws-crypto/sha256-js": "5.2.0",
+        "@aws-sdk/client-sso-oidc": "3.613.0",
+        "@aws-sdk/client-sts": "3.613.0",
+        "@aws-sdk/core": "3.609.0",
+        "@aws-sdk/credential-provider-node": "3.613.0",
+        "@aws-sdk/middleware-bucket-endpoint": "3.609.0",
+        "@aws-sdk/middleware-expect-continue": "3.609.0",
+        "@aws-sdk/middleware-flexible-checksums": "3.609.0",
+        "@aws-sdk/middleware-host-header": "3.609.0",
+        "@aws-sdk/middleware-location-constraint": "3.609.0",
+        "@aws-sdk/middleware-logger": "3.609.0",
+        "@aws-sdk/middleware-recursion-detection": "3.609.0",
+        "@aws-sdk/middleware-sdk-s3": "3.609.0",
+        "@aws-sdk/middleware-signing": "3.609.0",
+        "@aws-sdk/middleware-ssec": "3.609.0",
+        "@aws-sdk/middleware-user-agent": "3.609.0",
+        "@aws-sdk/region-config-resolver": "3.609.0",
+        "@aws-sdk/signature-v4-multi-region": "3.609.0",
+        "@aws-sdk/types": "3.609.0",
+        "@aws-sdk/util-endpoints": "3.609.0",
+        "@aws-sdk/util-user-agent-browser": "3.609.0",
+        "@aws-sdk/util-user-agent-node": "3.609.0",
+        "@aws-sdk/xml-builder": "3.609.0",
+        "@smithy/config-resolver": "^3.0.4",
+        "@smithy/core": "^2.2.4",
+        "@smithy/eventstream-serde-browser": "^3.0.4",
+        "@smithy/eventstream-serde-config-resolver": "^3.0.3",
+        "@smithy/eventstream-serde-node": "^3.0.4",
+        "@smithy/fetch-http-handler": "^3.2.0",
+        "@smithy/hash-blob-browser": "^3.1.2",
+        "@smithy/hash-node": "^3.0.3",
+        "@smithy/hash-stream-node": "^3.1.2",
+        "@smithy/invalid-dependency": "^3.0.3",
+        "@smithy/md5-js": "^3.0.3",
+        "@smithy/middleware-content-length": "^3.0.3",
+        "@smithy/middleware-endpoint": "^3.0.4",
+        "@smithy/middleware-retry": "^3.0.7",
+        "@smithy/middleware-serde": "^3.0.3",
+        "@smithy/middleware-stack": "^3.0.3",
+        "@smithy/node-config-provider": "^3.1.3",
+        "@smithy/node-http-handler": "^3.1.1",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/smithy-client": "^3.1.5",
+        "@smithy/types": "^3.3.0",
+        "@smithy/url-parser": "^3.0.3",
+        "@smithy/util-base64": "^3.0.0",
+        "@smithy/util-body-length-browser": "^3.0.0",
+        "@smithy/util-body-length-node": "^3.0.0",
+        "@smithy/util-defaults-mode-browser": "^3.0.7",
+        "@smithy/util-defaults-mode-node": "^3.0.7",
+        "@smithy/util-endpoints": "^2.0.4",
+        "@smithy/util-retry": "^3.0.3",
+        "@smithy/util-stream": "^3.0.5",
+        "@smithy/util-utf8": "^3.0.0",
+        "@smithy/util-waiter": "^3.1.2",
+        "tslib": "^2.6.2"
+      },
+      "dependencies": {
+        "@smithy/is-array-buffer": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz",
+          "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==",
           "dev": true,
           "requires": {
-            "@babel/compat-data": "^7.15.0",
-            "@babel/helper-validator-option": "^7.14.5",
-            "browserslist": "^4.16.6",
-            "semver": "^6.3.0"
+            "tslib": "^2.6.2"
           }
         },
-        "semver": {
-          "version": "6.3.0",
-          "dev": true
+        "@smithy/util-buffer-from": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz",
+          "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==",
+          "dev": true,
+          "requires": {
+            "@smithy/is-array-buffer": "^3.0.0",
+            "tslib": "^2.6.2"
+          }
+        },
+        "@smithy/util-utf8": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz",
+          "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==",
+          "dev": true,
+          "requires": {
+            "@smithy/util-buffer-from": "^3.0.0",
+            "tslib": "^2.6.2"
+          }
         }
       }
     },
-    "@babel/eslint-parser": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.15.0.tgz",
-      "integrity": "sha512-+gSPtjSBxOZz4Uh8Ggqu7HbfpB8cT1LwW0DnVVLZEJvzXauiD0Di3zszcBkRmfGGrLdYeHUwcflG7i3tr9kQlw==",
+    "@aws-sdk/client-sso": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.609.0.tgz",
+      "integrity": "sha512-gqXGFDkIpKHCKAbeJK4aIDt3tiwJ26Rf5Tqw9JS6BYXsdMeOB8FTzqD9R+Yc1epHd8s5L94sdqXT5PapgxFZrg==",
+      "dev": true,
+      "requires": {
+        "@aws-crypto/sha256-browser": "5.2.0",
+        "@aws-crypto/sha256-js": "5.2.0",
+        "@aws-sdk/core": "3.609.0",
+        "@aws-sdk/middleware-host-header": "3.609.0",
+        "@aws-sdk/middleware-logger": "3.609.0",
+        "@aws-sdk/middleware-recursion-detection": "3.609.0",
+        "@aws-sdk/middleware-user-agent": "3.609.0",
+        "@aws-sdk/region-config-resolver": "3.609.0",
+        "@aws-sdk/types": "3.609.0",
+        "@aws-sdk/util-endpoints": "3.609.0",
+        "@aws-sdk/util-user-agent-browser": "3.609.0",
+        "@aws-sdk/util-user-agent-node": "3.609.0",
+        "@smithy/config-resolver": "^3.0.4",
+        "@smithy/core": "^2.2.4",
+        "@smithy/fetch-http-handler": "^3.2.0",
+        "@smithy/hash-node": "^3.0.3",
+        "@smithy/invalid-dependency": "^3.0.3",
+        "@smithy/middleware-content-length": "^3.0.3",
+        "@smithy/middleware-endpoint": "^3.0.4",
+        "@smithy/middleware-retry": "^3.0.7",
+        "@smithy/middleware-serde": "^3.0.3",
+        "@smithy/middleware-stack": "^3.0.3",
+        "@smithy/node-config-provider": "^3.1.3",
+        "@smithy/node-http-handler": "^3.1.1",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/smithy-client": "^3.1.5",
+        "@smithy/types": "^3.3.0",
+        "@smithy/url-parser": "^3.0.3",
+        "@smithy/util-base64": "^3.0.0",
+        "@smithy/util-body-length-browser": "^3.0.0",
+        "@smithy/util-body-length-node": "^3.0.0",
+        "@smithy/util-defaults-mode-browser": "^3.0.7",
+        "@smithy/util-defaults-mode-node": "^3.0.7",
+        "@smithy/util-endpoints": "^2.0.4",
+        "@smithy/util-middleware": "^3.0.3",
+        "@smithy/util-retry": "^3.0.3",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "dependencies": {
+        "@smithy/is-array-buffer": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz",
+          "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==",
+          "dev": true,
+          "requires": {
+            "tslib": "^2.6.2"
+          }
+        },
+        "@smithy/util-buffer-from": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz",
+          "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==",
+          "dev": true,
+          "requires": {
+            "@smithy/is-array-buffer": "^3.0.0",
+            "tslib": "^2.6.2"
+          }
+        },
+        "@smithy/util-utf8": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz",
+          "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==",
+          "dev": true,
+          "requires": {
+            "@smithy/util-buffer-from": "^3.0.0",
+            "tslib": "^2.6.2"
+          }
+        }
+      }
+    },
+    "@aws-sdk/client-sso-oidc": {
+      "version": "3.613.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.613.0.tgz",
+      "integrity": "sha512-VINgHA30f6Itjtj6ZAxkx86XhyFYa7UBfv2Ju+9QGcAr2Y3HU+Mh9g6QaTwDqIM5QG6Pgss24NaAItWGJHFf5A==",
+      "dev": true,
+      "requires": {
+        "@aws-crypto/sha256-browser": "5.2.0",
+        "@aws-crypto/sha256-js": "5.2.0",
+        "@aws-sdk/core": "3.609.0",
+        "@aws-sdk/credential-provider-node": "3.613.0",
+        "@aws-sdk/middleware-host-header": "3.609.0",
+        "@aws-sdk/middleware-logger": "3.609.0",
+        "@aws-sdk/middleware-recursion-detection": "3.609.0",
+        "@aws-sdk/middleware-user-agent": "3.609.0",
+        "@aws-sdk/region-config-resolver": "3.609.0",
+        "@aws-sdk/types": "3.609.0",
+        "@aws-sdk/util-endpoints": "3.609.0",
+        "@aws-sdk/util-user-agent-browser": "3.609.0",
+        "@aws-sdk/util-user-agent-node": "3.609.0",
+        "@smithy/config-resolver": "^3.0.4",
+        "@smithy/core": "^2.2.4",
+        "@smithy/fetch-http-handler": "^3.2.0",
+        "@smithy/hash-node": "^3.0.3",
+        "@smithy/invalid-dependency": "^3.0.3",
+        "@smithy/middleware-content-length": "^3.0.3",
+        "@smithy/middleware-endpoint": "^3.0.4",
+        "@smithy/middleware-retry": "^3.0.7",
+        "@smithy/middleware-serde": "^3.0.3",
+        "@smithy/middleware-stack": "^3.0.3",
+        "@smithy/node-config-provider": "^3.1.3",
+        "@smithy/node-http-handler": "^3.1.1",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/smithy-client": "^3.1.5",
+        "@smithy/types": "^3.3.0",
+        "@smithy/url-parser": "^3.0.3",
+        "@smithy/util-base64": "^3.0.0",
+        "@smithy/util-body-length-browser": "^3.0.0",
+        "@smithy/util-body-length-node": "^3.0.0",
+        "@smithy/util-defaults-mode-browser": "^3.0.7",
+        "@smithy/util-defaults-mode-node": "^3.0.7",
+        "@smithy/util-endpoints": "^2.0.4",
+        "@smithy/util-middleware": "^3.0.3",
+        "@smithy/util-retry": "^3.0.3",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "dependencies": {
+        "@smithy/is-array-buffer": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz",
+          "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==",
+          "dev": true,
+          "requires": {
+            "tslib": "^2.6.2"
+          }
+        },
+        "@smithy/util-buffer-from": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz",
+          "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==",
+          "dev": true,
+          "requires": {
+            "@smithy/is-array-buffer": "^3.0.0",
+            "tslib": "^2.6.2"
+          }
+        },
+        "@smithy/util-utf8": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz",
+          "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==",
+          "dev": true,
+          "requires": {
+            "@smithy/util-buffer-from": "^3.0.0",
+            "tslib": "^2.6.2"
+          }
+        }
+      }
+    },
+    "@aws-sdk/client-sts": {
+      "version": "3.613.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.613.0.tgz",
+      "integrity": "sha512-S+KvQI4XEivY3vyIY+IPY7Fw8vFvX/q3pkNC9qEhnAs+/w7vT6vhVBHsaugYVlsMuNtNvmyc8P+Q/gzOEtLCTw==",
+      "dev": true,
+      "requires": {
+        "@aws-crypto/sha256-browser": "5.2.0",
+        "@aws-crypto/sha256-js": "5.2.0",
+        "@aws-sdk/client-sso-oidc": "3.613.0",
+        "@aws-sdk/core": "3.609.0",
+        "@aws-sdk/credential-provider-node": "3.613.0",
+        "@aws-sdk/middleware-host-header": "3.609.0",
+        "@aws-sdk/middleware-logger": "3.609.0",
+        "@aws-sdk/middleware-recursion-detection": "3.609.0",
+        "@aws-sdk/middleware-user-agent": "3.609.0",
+        "@aws-sdk/region-config-resolver": "3.609.0",
+        "@aws-sdk/types": "3.609.0",
+        "@aws-sdk/util-endpoints": "3.609.0",
+        "@aws-sdk/util-user-agent-browser": "3.609.0",
+        "@aws-sdk/util-user-agent-node": "3.609.0",
+        "@smithy/config-resolver": "^3.0.4",
+        "@smithy/core": "^2.2.4",
+        "@smithy/fetch-http-handler": "^3.2.0",
+        "@smithy/hash-node": "^3.0.3",
+        "@smithy/invalid-dependency": "^3.0.3",
+        "@smithy/middleware-content-length": "^3.0.3",
+        "@smithy/middleware-endpoint": "^3.0.4",
+        "@smithy/middleware-retry": "^3.0.7",
+        "@smithy/middleware-serde": "^3.0.3",
+        "@smithy/middleware-stack": "^3.0.3",
+        "@smithy/node-config-provider": "^3.1.3",
+        "@smithy/node-http-handler": "^3.1.1",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/smithy-client": "^3.1.5",
+        "@smithy/types": "^3.3.0",
+        "@smithy/url-parser": "^3.0.3",
+        "@smithy/util-base64": "^3.0.0",
+        "@smithy/util-body-length-browser": "^3.0.0",
+        "@smithy/util-body-length-node": "^3.0.0",
+        "@smithy/util-defaults-mode-browser": "^3.0.7",
+        "@smithy/util-defaults-mode-node": "^3.0.7",
+        "@smithy/util-endpoints": "^2.0.4",
+        "@smithy/util-middleware": "^3.0.3",
+        "@smithy/util-retry": "^3.0.3",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "dependencies": {
+        "@smithy/is-array-buffer": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz",
+          "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==",
+          "dev": true,
+          "requires": {
+            "tslib": "^2.6.2"
+          }
+        },
+        "@smithy/util-buffer-from": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz",
+          "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==",
+          "dev": true,
+          "requires": {
+            "@smithy/is-array-buffer": "^3.0.0",
+            "tslib": "^2.6.2"
+          }
+        },
+        "@smithy/util-utf8": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz",
+          "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==",
+          "dev": true,
+          "requires": {
+            "@smithy/util-buffer-from": "^3.0.0",
+            "tslib": "^2.6.2"
+          }
+        }
+      }
+    },
+    "@aws-sdk/core": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.609.0.tgz",
+      "integrity": "sha512-ptqw+DTxLr01+pKjDUuo53SEDzI+7nFM3WfQaEo0yhDg8vWw8PER4sWj1Ysx67ksctnZesPUjqxd5SHbtdBxiA==",
       "dev": true,
       "requires": {
-        "eslint-scope": "^5.1.1",
-        "eslint-visitor-keys": "^2.1.0",
-        "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "dev": true
-        }
+        "@smithy/core": "^2.2.4",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/signature-v4": "^3.1.2",
+        "@smithy/smithy-client": "^3.1.5",
+        "@smithy/types": "^3.3.0",
+        "fast-xml-parser": "4.2.5",
+        "tslib": "^2.6.2"
       }
     },
-    "@babel/generator": {
-      "version": "7.15.8",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.8.tgz",
-      "integrity": "sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g==",
+    "@aws-sdk/credential-provider-env": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.609.0.tgz",
+      "integrity": "sha512-v69ZCWcec2iuV9vLVJMa6fAb5xwkzN4jYIT8yjo2c4Ia/j976Q+TPf35Pnz5My48Xr94EFcaBazrWedF+kwfuQ==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.15.6",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/property-provider": "^3.1.3",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       }
     },
-    "@babel/helper-annotate-as-pure": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.15.4.tgz",
-      "integrity": "sha512-QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA==",
+    "@aws-sdk/credential-provider-http": {
+      "version": "3.613.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.613.0.tgz",
+      "integrity": "sha512-MCiUFxowFzprzIXFXsqbp/3DViJ7nFmBW+XJkoRQWqNmThbkz/E8sb40WmL9UFdZHJph2KDjzABKYH5f0lHZaA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.15.4"
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/fetch-http-handler": "^3.2.0",
+        "@smithy/node-http-handler": "^3.1.1",
+        "@smithy/property-provider": "^3.1.3",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/smithy-client": "^3.1.5",
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-stream": "^3.0.5",
+        "tslib": "^2.6.2"
       }
     },
-    "@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.14.5",
+    "@aws-sdk/credential-provider-ini": {
+      "version": "3.613.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.613.0.tgz",
+      "integrity": "sha512-scHV7K0YpllYMWxPnqxssWU+7S3WNXH1m5Rw8Ax96pfcfnaoatiWXps2XSSdGlChdF9gNVnewjRKFOTLyyzdAw==",
       "dev": true,
       "requires": {
-        "@babel/helper-explode-assignable-expression": "^7.14.5",
-        "@babel/types": "^7.14.5"
+        "@aws-sdk/credential-provider-env": "3.609.0",
+        "@aws-sdk/credential-provider-http": "3.613.0",
+        "@aws-sdk/credential-provider-process": "3.609.0",
+        "@aws-sdk/credential-provider-sso": "3.609.0",
+        "@aws-sdk/credential-provider-web-identity": "3.609.0",
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/credential-provider-imds": "^3.1.3",
+        "@smithy/property-provider": "^3.1.3",
+        "@smithy/shared-ini-file-loader": "^3.1.3",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       }
     },
-    "@babel/helper-compilation-targets": {
-      "version": "7.14.5",
+    "@aws-sdk/credential-provider-node": {
+      "version": "3.613.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.613.0.tgz",
+      "integrity": "sha512-n3yd0CDuUKcQFhjRLAQfQpZyZ2ddrHC7QOKQqE+Fkx+Fs5zoG+NRLK1EBkBW/G9zk8Ck4+rG3OOI3CuNpJ2PCw==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.14.5",
-        "@babel/helper-validator-option": "^7.14.5",
-        "browserslist": "^4.16.6",
-        "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "dev": true
-        }
+        "@aws-sdk/credential-provider-env": "3.609.0",
+        "@aws-sdk/credential-provider-http": "3.613.0",
+        "@aws-sdk/credential-provider-ini": "3.613.0",
+        "@aws-sdk/credential-provider-process": "3.609.0",
+        "@aws-sdk/credential-provider-sso": "3.609.0",
+        "@aws-sdk/credential-provider-web-identity": "3.609.0",
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/credential-provider-imds": "^3.1.3",
+        "@smithy/property-provider": "^3.1.3",
+        "@smithy/shared-ini-file-loader": "^3.1.3",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       }
     },
-    "@babel/helper-create-class-features-plugin": {
-      "version": "7.15.0",
+    "@aws-sdk/credential-provider-process": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.609.0.tgz",
+      "integrity": "sha512-Ux35nGOSJKZWUIM3Ny0ROZ8cqPRUEkh+tR3X2o9ydEbFiLq3eMMyEnHJqx4EeUjLRchidlm4CCid9GxMe5/gdw==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-member-expression-to-functions": "^7.15.0",
-        "@babel/helper-optimise-call-expression": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.15.0",
-        "@babel/helper-split-export-declaration": "^7.14.5"
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/property-provider": "^3.1.3",
+        "@smithy/shared-ini-file-loader": "^3.1.3",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       }
     },
-    "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.14.5",
+    "@aws-sdk/credential-provider-sso": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.609.0.tgz",
+      "integrity": "sha512-oQPGDKMMIxjvTcm86g07RPYeC7mCNk+29dPpY15ZAPRpAF7F0tircsC3wT9fHzNaKShEyK5LuI5Kg/uxsdy+Iw==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "regexpu-core": "^4.7.1"
+        "@aws-sdk/client-sso": "3.609.0",
+        "@aws-sdk/token-providers": "3.609.0",
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/property-provider": "^3.1.3",
+        "@smithy/shared-ini-file-loader": "^3.1.3",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       }
     },
-    "@babel/helper-define-polyfill-provider": {
-      "version": "0.2.3",
+    "@aws-sdk/credential-provider-web-identity": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.609.0.tgz",
+      "integrity": "sha512-U+PG8NhlYYF45zbr1km3ROtBMYqyyj/oK8NRp++UHHeuavgrP+4wJ4wQnlEaKvJBjevfo3+dlIBcaeQ7NYejWg==",
       "dev": true,
       "requires": {
-        "@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"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "dev": true
-        }
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/property-provider": "^3.1.3",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       }
     },
-    "@babel/helper-explode-assignable-expression": {
-      "version": "7.14.5",
+    "@aws-sdk/middleware-bucket-endpoint": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.609.0.tgz",
+      "integrity": "sha512-QhHRfr4e7FqaMUAnOAFdQVOR3yDLw40i1IZPo+TeiKyev9LEyYEX2l6DbdaIwAztofOpAxfFNj/IJ0V/efzz/w==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.14.5"
+        "@aws-sdk/types": "3.609.0",
+        "@aws-sdk/util-arn-parser": "3.568.0",
+        "@smithy/node-config-provider": "^3.1.3",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-config-provider": "^3.0.0",
+        "tslib": "^2.6.2"
       }
     },
-    "@babel/helper-fixtures": {
-      "version": "7.14.5",
+    "@aws-sdk/middleware-expect-continue": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.609.0.tgz",
+      "integrity": "sha512-+zeg//mSer4JZRxOB/4mUOMUJyuYPwATnIC5moBB8P8Xe+mJaVRFy8qlCtzYNj2TycnlsBPzTK0j7P1yvDh97w==",
       "dev": true,
       "requires": {
-        "semver": "^6.3.0"
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "@aws-sdk/middleware-flexible-checksums": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.609.0.tgz",
+      "integrity": "sha512-TJ4WE+ehT+qcrhr7/yJCzmJJPmUoPPWIbCnFzqGxauH/dpVBCslmd1vZg3h2VnfRiaDkc6f68dqYVc29CaurhQ==",
+      "dev": true,
+      "requires": {
+        "@aws-crypto/crc32": "5.2.0",
+        "@aws-crypto/crc32c": "5.2.0",
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/is-array-buffer": "^3.0.0",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
       },
       "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "dev": true
+        "@smithy/is-array-buffer": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz",
+          "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==",
+          "dev": true,
+          "requires": {
+            "tslib": "^2.6.2"
+          }
+        },
+        "@smithy/util-buffer-from": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz",
+          "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==",
+          "dev": true,
+          "requires": {
+            "@smithy/is-array-buffer": "^3.0.0",
+            "tslib": "^2.6.2"
+          }
+        },
+        "@smithy/util-utf8": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz",
+          "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==",
+          "dev": true,
+          "requires": {
+            "@smithy/util-buffer-from": "^3.0.0",
+            "tslib": "^2.6.2"
+          }
         }
       }
     },
-    "@babel/helper-function-name": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz",
-      "integrity": "sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==",
+    "@aws-sdk/middleware-host-header": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.609.0.tgz",
+      "integrity": "sha512-iTKfo158lc4jLDfYeZmYMIBHsn8m6zX+XB6birCSNZ/rrlzAkPbGE43CNdKfvjyWdqgLMRXF+B+OcZRvqhMXPQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-get-function-arity": "^7.15.4",
-        "@babel/template": "^7.15.4",
-        "@babel/types": "^7.15.4"
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       }
     },
-    "@babel/helper-get-function-arity": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz",
-      "integrity": "sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA==",
+    "@aws-sdk/middleware-location-constraint": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.609.0.tgz",
+      "integrity": "sha512-xzsdoTkszGVqGVPjUmgoP7TORiByLueMHieI1fhQL888WPdqctwAx3ES6d/bA9Q/i8jnc6hs+Fjhy8UvBTkE9A==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.15.4"
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       }
     },
-    "@babel/helper-hoist-variables": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz",
-      "integrity": "sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA==",
+    "@aws-sdk/middleware-logger": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.609.0.tgz",
+      "integrity": "sha512-S62U2dy4jMDhDFDK5gZ4VxFdWzCtLzwbYyFZx2uvPYTECkepLUfzLic2BHg2Qvtu4QjX+oGE3P/7fwaGIsGNuQ==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.15.4"
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       }
     },
-    "@babel/helper-member-expression-to-functions": {
-      "version": "7.15.0",
+    "@aws-sdk/middleware-recursion-detection": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.609.0.tgz",
+      "integrity": "sha512-6sewsYB7/o/nbUfA99Aa/LokM+a/u4Wpm/X2o0RxOsDtSB795ObebLJe2BxY5UssbGaWkn7LswyfvrdZNXNj1w==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.15.0"
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       }
     },
-    "@babel/helper-module-imports": {
-      "version": "7.14.5",
+    "@aws-sdk/middleware-sdk-s3": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.609.0.tgz",
+      "integrity": "sha512-kvwjL6OJFhAGWoYaIWR7HmILjiVk6xVj6QEU6qZMA7FtGgvlKi4pLfs8Of+hQqo+2TEhUoxG/5t6WqwB8uxjsw==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.14.5"
+        "@aws-sdk/types": "3.609.0",
+        "@aws-sdk/util-arn-parser": "3.568.0",
+        "@smithy/node-config-provider": "^3.1.3",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/signature-v4": "^3.1.2",
+        "@smithy/smithy-client": "^3.1.5",
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-config-provider": "^3.0.0",
+        "tslib": "^2.6.2"
       }
     },
-    "@babel/helper-module-transforms": {
-      "version": "7.15.0",
+    "@aws-sdk/middleware-signing": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.609.0.tgz",
+      "integrity": "sha512-2w3dBLjQVKIajYzokO4hduq8/0hSMUYHHmIo1Kdl+MSY8uwRBt12bLL6pyreobTcRMxizvn2ph/CQ9I1ST/WGQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.15.0",
-        "@babel/helper-simple-access": "^7.14.8",
-        "@babel/helper-split-export-declaration": "^7.14.5",
-        "@babel/helper-validator-identifier": "^7.14.9",
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.15.0",
-        "@babel/types": "^7.15.0"
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/property-provider": "^3.1.3",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/signature-v4": "^3.1.2",
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-middleware": "^3.0.3",
+        "tslib": "^2.6.2"
       }
     },
-    "@babel/helper-optimise-call-expression": {
-      "version": "7.14.5",
+    "@aws-sdk/middleware-ssec": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.609.0.tgz",
+      "integrity": "sha512-GZSD1s7+JswWOTamVap79QiDaIV7byJFssBW68GYjyRS5EBjNfwA/8s+6uE6g39R3ojyTbYOmvcANoZEhSULXg==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.14.5"
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       }
     },
-    "@babel/helper-plugin-test-runner": {
-      "version": "7.14.5",
+    "@aws-sdk/middleware-user-agent": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.609.0.tgz",
+      "integrity": "sha512-nbq7MXRmeXm4IDqh+sJRAxGPAq0OfGmGIwKvJcw66hLoG8CmhhVMZmIAEBDFr57S+YajGwnLLRt+eMI05MMeVA==",
       "dev": true,
       "requires": {
-        "@babel/helper-transform-fixture-test-runner": "^7.14.5"
+        "@aws-sdk/types": "3.609.0",
+        "@aws-sdk/util-endpoints": "3.609.0",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       }
     },
-    "@babel/helper-plugin-utils": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz",
-      "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==",
-      "dev": true
-    },
-    "@babel/helper-remap-async-to-generator": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.15.4.tgz",
-      "integrity": "sha512-v53MxgvMK/HCwckJ1bZrq6dNKlmwlyRNYM6ypaRTdXWGOE2c1/SCa6dL/HimhPulGhZKw9W0QhREM583F/t0vQ==",
+    "@aws-sdk/region-config-resolver": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.609.0.tgz",
+      "integrity": "sha512-lMHBG8zg9GWYBc9/XVPKyuAUd7iKqfPP7z04zGta2kGNOKbUTeqmAdc1gJGku75p4kglIPlGBorOxti8DhRmKw==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.15.4",
-        "@babel/helper-wrap-function": "^7.15.4",
-        "@babel/types": "^7.15.4"
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/node-config-provider": "^3.1.3",
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-config-provider": "^3.0.0",
+        "@smithy/util-middleware": "^3.0.3",
+        "tslib": "^2.6.2"
       }
     },
-    "@babel/helper-replace-supers": {
-      "version": "7.15.0",
+    "@aws-sdk/signature-v4-multi-region": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.609.0.tgz",
+      "integrity": "sha512-FJs0BxVMyYOKNu7nzFI1kehfgWoYmdto5B8BSS29geUACF7jlOoeCfNZWVrnMjvAxVlSQ5O7Mr575932BnsycA==",
       "dev": true,
       "requires": {
-        "@babel/helper-member-expression-to-functions": "^7.15.0",
-        "@babel/helper-optimise-call-expression": "^7.14.5",
-        "@babel/traverse": "^7.15.0",
-        "@babel/types": "^7.15.0"
+        "@aws-sdk/middleware-sdk-s3": "3.609.0",
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/signature-v4": "^3.1.2",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       }
     },
-    "@babel/helper-simple-access": {
-      "version": "7.14.8",
+    "@aws-sdk/token-providers": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.609.0.tgz",
+      "integrity": "sha512-WvhW/7XSf+H7YmtiIigQxfDVZVZI7mbKikQ09YpzN7FeN3TmYib1+0tB+EE9TbICkwssjiFc71FEBEh4K9grKQ==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.14.8"
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/property-provider": "^3.1.3",
+        "@smithy/shared-ini-file-loader": "^3.1.3",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       }
     },
-    "@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.14.5",
+    "@aws-sdk/types": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.609.0.tgz",
+      "integrity": "sha512-+Tqnh9w0h2LcrUsdXyT1F8mNhXz+tVYBtP19LpeEGntmvHwa2XzvLUCWpoIAIVsHp5+HdB2X9Sn0KAtmbFXc2Q==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.14.5"
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       }
     },
-    "@babel/helper-split-export-declaration": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz",
-      "integrity": "sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw==",
+    "@aws-sdk/util-arn-parser": {
+      "version": "3.568.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.568.0.tgz",
+      "integrity": "sha512-XUKJWWo+KOB7fbnPP0+g/o5Ulku/X53t7i/h+sPHr5xxYTJJ9CYnbToo95mzxe7xWvkLrsNtJ8L+MnNn9INs2w==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.15.4"
+        "tslib": "^2.6.2"
       }
     },
-    "@babel/helper-transform-fixture-test-runner": {
-      "version": "7.14.5",
+    "@aws-sdk/util-endpoints": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.609.0.tgz",
+      "integrity": "sha512-Rh+3V8dOvEeE1aQmUy904DYWtLUEJ7Vf5XBPlQ6At3pBhp+zpXbsnpZzVL33c8lW1xfj6YPwtO6gOeEsl1juCQ==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/core": "^7.14.5",
-        "@babel/helper-fixtures": "^7.14.5",
-        "babel-check-duplicated-nodes": "^1.0.0",
-        "quick-lru": "5.1.0",
-        "regenerator-runtime": "^0.13.7",
-        "source-map": "^0.5.0"
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-endpoints": "^2.0.4",
+        "tslib": "^2.6.2"
       }
     },
-    "@babel/helper-validator-identifier": {
-      "version": "7.15.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz",
-      "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==",
-      "dev": true
-    },
-    "@babel/helper-validator-option": {
-      "version": "7.14.5",
-      "dev": true
+    "@aws-sdk/util-locate-window": {
+      "version": "3.310.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.310.0.tgz",
+      "integrity": "sha512-qo2t/vBTnoXpjKxlsC2e1gBrRm80M3bId27r0BRB2VniSSe7bL1mmzM+/HFtujm0iAxtPM+aLEflLJlJeDPg0w==",
+      "dev": true,
+      "requires": {
+        "tslib": "^2.5.0"
+      }
     },
-    "@babel/helper-wrap-function": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.15.4.tgz",
-      "integrity": "sha512-Y2o+H/hRV5W8QhIfTpRIBwl57y8PrZt6JM3V8FOo5qarjshHItyH5lXlpMfBfmBefOqSCpKZs/6Dxqp0E/U+uw==",
+    "@aws-sdk/util-user-agent-browser": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.609.0.tgz",
+      "integrity": "sha512-fojPU+mNahzQ0YHYBsx0ZIhmMA96H+ZIZ665ObU9tl+SGdbLneVZVikGve+NmHTQwHzwkFsZYYnVKAkreJLAtA==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.15.4",
-        "@babel/template": "^7.15.4",
-        "@babel/traverse": "^7.15.4",
-        "@babel/types": "^7.15.4"
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/types": "^3.3.0",
+        "bowser": "^2.11.0",
+        "tslib": "^2.6.2"
       }
     },
-    "@babel/helpers": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.4.tgz",
-      "integrity": "sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==",
+    "@aws-sdk/util-user-agent-node": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.609.0.tgz",
+      "integrity": "sha512-DlZBwQ/HkZyf3pOWc7+wjJRk5R7x9YxHhs2szHwtv1IW30KMabjjjX0GMlGJ9LLkBHkbaaEY/w9Tkj12XRLhRg==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.15.4",
-        "@babel/traverse": "^7.15.4",
-        "@babel/types": "^7.15.4"
+        "@aws-sdk/types": "3.609.0",
+        "@smithy/node-config-provider": "^3.1.3",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       }
     },
-    "@babel/highlight": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
-      "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
+    "@aws-sdk/xml-builder": {
+      "version": "3.609.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.609.0.tgz",
+      "integrity": "sha512-l9XxNcA4HX98rwCC2/KoiWcmEiRfZe4G+mYwDbCFT87JIMj6GBhLDkAzr/W8KAaA2IDr8Vc6J8fZPgVulxxfMA==",
       "dev": true,
       "requires": {
-        "@babel/helper-validator-identifier": "^7.14.5",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       }
     },
-    "@babel/parser": {
-      "version": "7.15.8",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.8.tgz",
-      "integrity": "sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==",
-      "dev": true
-    },
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.14.5",
+    "@babel/code-frame": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
+      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5",
-        "@babel/plugin-proposal-optional-chaining": "^7.14.5"
+        "@babel/highlight": "^7.16.7"
       }
     },
-    "@babel/plugin-proposal-class-properties": {
-      "version": "7.14.5",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
+    "@babel/compat-data": {
+      "version": "7.15.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz",
+      "integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==",
+      "dev": true
     },
-    "@babel/plugin-proposal-class-static-block": {
-      "version": "7.14.5",
+    "@babel/core": {
+      "version": "7.15.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.0.tgz",
+      "integrity": "sha512-tXtmTminrze5HEUPn/a0JtOzzfp0nk+UEXQ/tqIJo3WDGypl/2OFQEMll/zSFU8f/lfmfLXvTaORHF3cfXIQMw==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
+        "@babel/code-frame": "^7.14.5",
+        "@babel/generator": "^7.15.0",
+        "@babel/helper-compilation-targets": "^7.15.0",
+        "@babel/helper-module-transforms": "^7.15.0",
+        "@babel/helpers": "^7.14.8",
+        "@babel/parser": "^7.15.0",
+        "@babel/template": "^7.14.5",
+        "@babel/traverse": "^7.15.0",
+        "@babel/types": "^7.15.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"
+      },
+      "dependencies": {
+        "@babel/helper-compilation-targets": {
+          "version": "7.15.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz",
+          "integrity": "sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==",
+          "dev": true,
+          "requires": {
+            "@babel/compat-data": "^7.15.0",
+            "@babel/helper-validator-option": "^7.14.5",
+            "browserslist": "^4.16.6",
+            "semver": "^6.3.0"
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "dev": true
+        }
       }
     },
-    "@babel/plugin-proposal-dynamic-import": {
-      "version": "7.14.5",
+    "@babel/generator": {
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.8.tgz",
+      "integrity": "sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+        "@babel/types": "^7.16.8",
+        "jsesc": "^2.5.1",
+        "source-map": "^0.5.0"
       }
     },
-    "@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.14.5",
+    "@babel/helper-annotate-as-pure": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
+      "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+        "@babel/types": "^7.16.7"
       }
     },
-    "@babel/plugin-proposal-json-strings": {
+    "@babel/helper-builder-binary-assignment-operator-visitor": {
       "version": "7.14.5",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
+        "@babel/helper-explode-assignable-expression": "^7.14.5",
+        "@babel/types": "^7.14.5"
       }
     },
-    "@babel/plugin-proposal-logical-assignment-operators": {
+    "@babel/helper-compilation-targets": {
       "version": "7.14.5",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+        "@babel/compat-data": "^7.14.5",
+        "@babel/helper-validator-option": "^7.14.5",
+        "browserslist": "^4.16.6",
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "dev": true
+        }
       }
     },
-    "@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.14.5",
+    "@babel/helper-create-class-features-plugin": {
+      "version": "7.16.10",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.10.tgz",
+      "integrity": "sha512-wDeej0pu3WN/ffTxMNCPW5UCiOav8IcLRxSIyp/9+IF2xJUM9h/OYjg0IJLHaL6F8oU8kqMz9nc1vryXhMsgXg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+        "@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/plugin-proposal-numeric-separator": {
+    "@babel/helper-create-regexp-features-plugin": {
       "version": "7.14.5",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+        "@babel/helper-annotate-as-pure": "^7.14.5",
+        "regexpu-core": "^4.7.1"
       }
     },
-    "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.15.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.15.6.tgz",
-      "integrity": "sha512-qtOHo7A1Vt+O23qEAX+GdBpqaIuD3i9VRrWgCJeq7WO6H2d14EK3q11urj5Te2MAeK97nMiIdRpwd/ST4JFbNg==",
+    "@babel/helper-define-polyfill-provider": {
+      "version": "0.2.3",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.15.0",
-        "@babel/helper-compilation-targets": "^7.15.4",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.15.4"
+        "@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"
       },
       "dependencies": {
-        "@babel/helper-compilation-targets": {
-          "version": "7.15.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz",
-          "integrity": "sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==",
-          "dev": true,
-          "requires": {
-            "@babel/compat-data": "^7.15.0",
-            "@babel/helper-validator-option": "^7.14.5",
-            "browserslist": "^4.16.6",
-            "semver": "^6.3.0"
-          }
-        },
-        "@babel/plugin-transform-parameters": {
-          "version": "7.15.4",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.15.4.tgz",
-          "integrity": "sha512-9WB/GUTO6lvJU3XQsSr6J/WKvBC2hcs4Pew8YxZagi6GkTdniyqp8On5kqdK8MN0LMeu0mGbhPN+O049NV/9FQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.14.5"
-          }
-        },
         "semver": {
           "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
         }
       }
     },
-    "@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.14.5",
+    "@babel/helper-environment-visitor": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz",
+      "integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+        "@babel/types": "^7.16.7"
       }
     },
-    "@babel/plugin-proposal-optional-chaining": {
+    "@babel/helper-explode-assignable-expression": {
       "version": "7.14.5",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+        "@babel/types": "^7.14.5"
       }
     },
-    "@babel/plugin-proposal-private-methods": {
+    "@babel/helper-fixtures": {
       "version": "7.14.5",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "dev": true
+        }
       }
     },
-    "@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.14.5",
+    "@babel/helper-function-name": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz",
+      "integrity": "sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-create-class-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+        "@babel/helper-get-function-arity": "^7.16.7",
+        "@babel/template": "^7.16.7",
+        "@babel/types": "^7.16.7"
       }
     },
-    "@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.14.5",
+    "@babel/helper-get-function-arity": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz",
+      "integrity": "sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/types": "^7.16.7"
       }
     },
-    "@babel/plugin-syntax-async-generators": {
-      "version": "7.8.4",
+    "@babel/helper-hoist-variables": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
+      "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+        "@babel/types": "^7.16.7"
       }
     },
-    "@babel/plugin-syntax-class-properties": {
-      "version": "7.12.13",
+    "@babel/helper-member-expression-to-functions": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz",
+      "integrity": "sha512-VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/types": "^7.16.7"
       }
     },
-    "@babel/plugin-syntax-class-static-block": {
+    "@babel/helper-module-imports": {
       "version": "7.14.5",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/types": "^7.14.5"
       }
     },
-    "@babel/plugin-syntax-dynamic-import": {
-      "version": "7.8.3",
+    "@babel/helper-module-transforms": {
+      "version": "7.15.0",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+        "@babel/helper-module-imports": "^7.14.5",
+        "@babel/helper-replace-supers": "^7.15.0",
+        "@babel/helper-simple-access": "^7.14.8",
+        "@babel/helper-split-export-declaration": "^7.14.5",
+        "@babel/helper-validator-identifier": "^7.14.9",
+        "@babel/template": "^7.14.5",
+        "@babel/traverse": "^7.15.0",
+        "@babel/types": "^7.15.0"
       }
     },
-    "@babel/plugin-syntax-export-namespace-from": {
-      "version": "7.8.3",
+    "@babel/helper-optimise-call-expression": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz",
+      "integrity": "sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
+        "@babel/types": "^7.16.7"
       }
     },
-    "@babel/plugin-syntax-flow": {
+    "@babel/helper-plugin-test-runner": {
       "version": "7.14.5",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-transform-fixture-test-runner": "^7.14.5"
       }
     },
-    "@babel/plugin-syntax-import-assertions": {
-      "version": "7.14.5",
+    "@babel/helper-plugin-utils": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz",
+      "integrity": "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==",
+      "dev": true
+    },
+    "@babel/helper-remap-async-to-generator": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.15.4.tgz",
+      "integrity": "sha512-v53MxgvMK/HCwckJ1bZrq6dNKlmwlyRNYM6ypaRTdXWGOE2c1/SCa6dL/HimhPulGhZKw9W0QhREM583F/t0vQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-annotate-as-pure": "^7.15.4",
+        "@babel/helper-wrap-function": "^7.15.4",
+        "@babel/types": "^7.15.4"
       }
     },
-    "@babel/plugin-syntax-json-strings": {
-      "version": "7.8.3",
+    "@babel/helper-replace-supers": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz",
+      "integrity": "sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+        "@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/plugin-syntax-jsx": {
-      "version": "7.14.5",
+    "@babel/helper-simple-access": {
+      "version": "7.14.8",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/types": "^7.14.8"
       }
     },
-    "@babel/plugin-syntax-logical-assignment-operators": {
-      "version": "7.10.4",
+    "@babel/helper-skip-transparent-expression-wrappers": {
+      "version": "7.14.5",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/types": "^7.14.5"
       }
     },
-    "@babel/plugin-syntax-nullish-coalescing-operator": {
-      "version": "7.8.3",
+    "@babel/helper-split-export-declaration": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
+      "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+        "@babel/types": "^7.16.7"
       }
     },
-    "@babel/plugin-syntax-numeric-separator": {
-      "version": "7.10.4",
+    "@babel/helper-string-parser": {
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
+      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
+      "dev": true
+    },
+    "@babel/helper-transform-fixture-test-runner": {
+      "version": "7.14.5",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
-    "@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.8.3",
+        "@babel/code-frame": "^7.14.5",
+        "@babel/core": "^7.14.5",
+        "@babel/helper-fixtures": "^7.14.5",
+        "babel-check-duplicated-nodes": "^1.0.0",
+        "quick-lru": "5.1.0",
+        "regenerator-runtime": "^0.13.7",
+        "source-map": "^0.5.0"
+      }
+    },
+    "@babel/helper-validator-identifier": {
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+      "dev": true
+    },
+    "@babel/helper-validator-option": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
+      "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
+      "dev": true
+    },
+    "@babel/helper-wrap-function": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.15.4.tgz",
+      "integrity": "sha512-Y2o+H/hRV5W8QhIfTpRIBwl57y8PrZt6JM3V8FOo5qarjshHItyH5lXlpMfBfmBefOqSCpKZs/6Dxqp0E/U+uw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+        "@babel/helper-function-name": "^7.15.4",
+        "@babel/template": "^7.15.4",
+        "@babel/traverse": "^7.15.4",
+        "@babel/types": "^7.15.4"
       }
     },
-    "@babel/plugin-syntax-optional-catch-binding": {
-      "version": "7.8.3",
+    "@babel/helpers": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.4.tgz",
+      "integrity": "sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+        "@babel/template": "^7.15.4",
+        "@babel/traverse": "^7.15.4",
+        "@babel/types": "^7.15.4"
       }
     },
-    "@babel/plugin-syntax-optional-chaining": {
-      "version": "7.8.3",
+    "@babel/highlight": {
+      "version": "7.16.10",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz",
+      "integrity": "sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+        "@babel/helper-validator-identifier": "^7.16.7",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
       }
     },
-    "@babel/plugin-syntax-private-property-in-object": {
+    "@babel/parser": {
+      "version": "7.23.9",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.9.tgz",
+      "integrity": "sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==",
+      "dev": true
+    },
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
       "version": "7.14.5",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5",
+        "@babel/plugin-proposal-optional-chaining": "^7.14.5"
       }
     },
-    "@babel/plugin-syntax-top-level-await": {
+    "@babel/plugin-proposal-class-properties": {
       "version": "7.14.5",
       "dev": true,
       "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.14.5",
         "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
-    "@babel/plugin-syntax-typescript": {
+    "@babel/plugin-proposal-class-static-block": {
       "version": "7.14.5",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-create-class-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5"
       }
     },
-    "@babel/plugin-transform-arrow-functions": {
+    "@babel/plugin-proposal-dynamic-import": {
       "version": "7.14.5",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
       }
     },
-    "@babel/plugin-transform-async-to-generator": {
+    "@babel/plugin-proposal-export-namespace-from": {
       "version": "7.14.5",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.14.5",
         "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-remap-async-to-generator": "^7.14.5"
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
       }
     },
-    "@babel/plugin-transform-block-scoped-functions": {
+    "@babel/plugin-proposal-json-strings": {
       "version": "7.14.5",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-json-strings": "^7.8.3"
       }
     },
-    "@babel/plugin-transform-block-scoping": {
+    "@babel/plugin-proposal-logical-assignment-operators": {
       "version": "7.14.5",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
       }
     },
-    "@babel/plugin-transform-classes": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.9.tgz",
-      "integrity": "sha512-NfZpTcxU3foGWbl4wxmZ35mTsYJy8oQocbeIMoDAGGFarAmSQlL+LWMkDx/tj6pNotpbX3rltIA4dprgAPOq5A==",
+    "@babel/plugin-proposal-nullish-coalescing-operator": {
+      "version": "7.14.5",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-optimise-call-expression": "^7.14.5",
         "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.14.5",
-        "@babel/helper-split-export-declaration": "^7.14.5",
-        "globals": "^11.1.0"
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
       }
     },
-    "@babel/plugin-transform-computed-properties": {
+    "@babel/plugin-proposal-numeric-separator": {
       "version": "7.14.5",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
       }
     },
-    "@babel/plugin-transform-destructuring": {
-      "version": "7.14.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz",
-      "integrity": "sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw==",
+    "@babel/plugin-proposal-object-rest-spread": {
+      "version": "7.15.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.15.6.tgz",
+      "integrity": "sha512-qtOHo7A1Vt+O23qEAX+GdBpqaIuD3i9VRrWgCJeq7WO6H2d14EK3q11urj5Te2MAeK97nMiIdRpwd/ST4JFbNg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/compat-data": "^7.15.0",
+        "@babel/helper-compilation-targets": "^7.15.4",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.15.4"
+      },
+      "dependencies": {
+        "@babel/helper-compilation-targets": {
+          "version": "7.15.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz",
+          "integrity": "sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==",
+          "dev": true,
+          "requires": {
+            "@babel/compat-data": "^7.15.0",
+            "@babel/helper-validator-option": "^7.14.5",
+            "browserslist": "^4.16.6",
+            "semver": "^6.3.0"
+          }
+        },
+        "@babel/plugin-transform-parameters": {
+          "version": "7.15.4",
+          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.15.4.tgz",
+          "integrity": "sha512-9WB/GUTO6lvJU3XQsSr6J/WKvBC2hcs4Pew8YxZagi6GkTdniyqp8On5kqdK8MN0LMeu0mGbhPN+O049NV/9FQ==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-plugin-utils": "^7.14.5"
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
       }
     },
-    "@babel/plugin-transform-dotall-regex": {
+    "@babel/plugin-proposal-optional-catch-binding": {
       "version": "7.14.5",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
       }
     },
-    "@babel/plugin-transform-duplicate-keys": {
+    "@babel/plugin-proposal-optional-chaining": {
       "version": "7.14.5",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
       }
     },
-    "@babel/plugin-transform-exponentiation-operator": {
+    "@babel/plugin-proposal-private-methods": {
       "version": "7.14.5",
       "dev": true,
       "requires": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.14.5",
+        "@babel/helper-create-class-features-plugin": "^7.14.5",
         "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
-    "@babel/plugin-transform-flow-strip-types": {
+    "@babel/plugin-proposal-private-property-in-object": {
       "version": "7.14.5",
       "dev": true,
       "requires": {
+        "@babel/helper-annotate-as-pure": "^7.14.5",
+        "@babel/helper-create-class-features-plugin": "^7.14.5",
         "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-flow": "^7.14.5"
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
       }
     },
-    "@babel/plugin-transform-for-of": {
+    "@babel/plugin-proposal-unicode-property-regex": {
       "version": "7.14.5",
       "dev": true,
       "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
         "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
-    "@babel/plugin-transform-function-name": {
-      "version": "7.14.5",
+    "@babel/plugin-syntax-async-generators": {
+      "version": "7.8.4",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
-    "@babel/plugin-transform-literals": {
-      "version": "7.14.5",
+    "@babel/plugin-syntax-bigint": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
+      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
-    "@babel/plugin-transform-member-expression-literals": {
-      "version": "7.14.5",
+    "@babel/plugin-syntax-class-properties": {
+      "version": "7.12.13",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.12.13"
       }
     },
-    "@babel/plugin-transform-modules-amd": {
+    "@babel/plugin-syntax-class-static-block": {
       "version": "7.14.5",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
-    "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.15.0",
+    "@babel/plugin-syntax-dynamic-import": {
+      "version": "7.8.3",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.15.0",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-simple-access": "^7.14.8",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
+        "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
-    "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.14.5",
+    "@babel/plugin-syntax-export-namespace-from": {
+      "version": "7.8.3",
       "dev": true,
       "requires": {
-        "@babel/helper-hoist-variables": "^7.14.5",
-        "@babel/helper-module-transforms": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-validator-identifier": "^7.14.5",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
-    "@babel/plugin-transform-modules-umd": {
+    "@babel/plugin-syntax-import-assertions": {
       "version": "7.14.5",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.14.5",
         "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
-    "@babel/plugin-transform-new-target": {
-      "version": "7.14.5",
+    "@babel/plugin-syntax-import-meta": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
-    "@babel/plugin-transform-object-super": {
-      "version": "7.14.5",
+    "@babel/plugin-syntax-json-strings": {
+      "version": "7.8.3",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
-    "@babel/plugin-transform-property-literals": {
+    "@babel/plugin-syntax-jsx": {
       "version": "7.14.5",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
-    "@babel/plugin-transform-react-jsx": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.9.tgz",
-      "integrity": "sha512-30PeETvS+AeD1f58i1OVyoDlVYQhap/K20ZrMjLmmzmC2AYR/G43D4sdJAaDAqCD3MYpSWbmrz3kES158QSLjw==",
+    "@babel/plugin-syntax-logical-assignment-operators": {
+      "version": "7.10.4",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-module-imports": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-jsx": "^7.14.5",
-        "@babel/types": "^7.14.9"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
-    "@babel/plugin-transform-regenerator": {
-      "version": "7.14.5",
+    "@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
       "dev": true,
       "requires": {
-        "regenerator-transform": "^0.14.2"
+        "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
-    "@babel/plugin-transform-reserved-words": {
-      "version": "7.14.5",
+    "@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.4",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
-    "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.14.5",
+    "@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.8.3",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.8.3",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-private-property-in-object": {
+      "version": "7.14.5",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-syntax-top-level-await": {
+      "version": "7.14.5",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-syntax-typescript": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.7.tgz",
+      "integrity": "sha512-YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-arrow-functions": {
+      "version": "7.14.5",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-async-to-generator": {
+      "version": "7.14.5",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-imports": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-remap-async-to-generator": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-block-scoped-functions": {
+      "version": "7.14.5",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-block-scoping": {
+      "version": "7.14.5",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-classes": {
+      "version": "7.14.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.9.tgz",
+      "integrity": "sha512-NfZpTcxU3foGWbl4wxmZ35mTsYJy8oQocbeIMoDAGGFarAmSQlL+LWMkDx/tj6pNotpbX3rltIA4dprgAPOq5A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.14.5",
+        "@babel/helper-function-name": "^7.14.5",
+        "@babel/helper-optimise-call-expression": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-replace-supers": "^7.14.5",
+        "@babel/helper-split-export-declaration": "^7.14.5",
+        "globals": "^11.1.0"
+      }
+    },
+    "@babel/plugin-transform-computed-properties": {
+      "version": "7.14.5",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-destructuring": {
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz",
+      "integrity": "sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-dotall-regex": {
+      "version": "7.14.5",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-duplicate-keys": {
+      "version": "7.14.5",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-exponentiation-operator": {
+      "version": "7.14.5",
+      "dev": true,
+      "requires": {
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-for-of": {
+      "version": "7.14.5",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-function-name": {
+      "version": "7.14.5",
+      "dev": true,
+      "requires": {
+        "@babel/helper-function-name": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-literals": {
+      "version": "7.14.5",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-member-expression-literals": {
+      "version": "7.14.5",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-modules-amd": {
+      "version": "7.14.5",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-transforms": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      }
+    },
+    "@babel/plugin-transform-modules-commonjs": {
+      "version": "7.15.0",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-transforms": "^7.15.0",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-simple-access": "^7.14.8",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      }
+    },
+    "@babel/plugin-transform-modules-systemjs": {
+      "version": "7.14.5",
+      "dev": true,
+      "requires": {
+        "@babel/helper-hoist-variables": "^7.14.5",
+        "@babel/helper-module-transforms": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-validator-identifier": "^7.14.5",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      }
+    },
+    "@babel/plugin-transform-modules-umd": {
+      "version": "7.14.5",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-transforms": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-new-target": {
+      "version": "7.14.5",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-object-super": {
+      "version": "7.14.5",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-replace-supers": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-property-literals": {
+      "version": "7.14.5",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-react-jsx": {
+      "version": "7.14.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.9.tgz",
+      "integrity": "sha512-30PeETvS+AeD1f58i1OVyoDlVYQhap/K20ZrMjLmmzmC2AYR/G43D4sdJAaDAqCD3MYpSWbmrz3kES158QSLjw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.14.5",
+        "@babel/helper-module-imports": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-jsx": "^7.14.5",
+        "@babel/types": "^7.14.9"
+      }
+    },
+    "@babel/plugin-transform-regenerator": {
+      "version": "7.14.5",
+      "dev": true,
+      "requires": {
+        "regenerator-transform": "^0.14.2"
+      }
+    },
+    "@babel/plugin-transform-reserved-words": {
+      "version": "7.14.5",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-shorthand-properties": {
+      "version": "7.14.5",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.14.5"
@@ -24348,12 +25785,14 @@
       }
     },
     "@babel/plugin-transform-typescript": {
-      "version": "7.15.0",
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.8.tgz",
+      "integrity": "sha512-bHdQ9k7YpBDO2d0NVfkj51DpQcvwIzIusJ7mEUaMlbZq3Kt/U47j24inXZHQ5MDiYpCs+oZiwnXyKedE8+q7AQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.15.0",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-typescript": "^7.14.5"
+        "@babel/helper-create-class-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-typescript": "^7.16.7"
       }
     },
     "@babel/plugin-transform-unicode-escapes": {
@@ -24499,15 +25938,6 @@
         }
       }
     },
-    "@babel/preset-flow": {
-      "version": "7.14.5",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-validator-option": "^7.14.5",
-        "@babel/plugin-transform-flow-strip-types": "^7.14.5"
-      }
-    },
     "@babel/preset-modules": {
       "version": "0.1.4",
       "dev": true,
@@ -24520,86 +25950,61 @@
       }
     },
     "@babel/preset-typescript": {
-      "version": "7.15.0",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.16.7.tgz",
+      "integrity": "sha512-WbVEmgXdIyvzB77AQjGBEyYPZx+8tTsO50XtfozQrkW8QB2rLJpH2lgx0TRw5EJrBxOZQ+wCcyPVQvS8tjEHpQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-validator-option": "^7.14.5",
-        "@babel/plugin-transform-typescript": "^7.15.0"
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-validator-option": "^7.16.7",
+        "@babel/plugin-transform-typescript": "^7.16.7"
       }
     },
-    "@babel/register": {
+    "@babel/runtime": {
       "version": "7.15.3",
-      "dev": true,
-      "requires": {
-        "clone-deep": "^4.0.1",
-        "find-cache-dir": "^2.0.0",
-        "make-dir": "^2.1.0",
-        "pirates": "^4.0.0",
-        "source-map-support": "^0.5.16"
-      },
-      "dependencies": {
-        "make-dir": {
-          "version": "2.1.0",
-          "dev": true,
-          "requires": {
-            "pify": "^4.0.1",
-            "semver": "^5.6.0"
-          }
-        },
-        "pify": {
-          "version": "4.0.1",
-          "dev": true
-        },
-        "semver": {
-          "version": "5.7.1",
-          "dev": true
-        }
-      }
-    },
-    "@babel/runtime": {
-      "version": "7.15.3",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.3.tgz",
-      "integrity": "sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.3.tgz",
+      "integrity": "sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==",
       "requires": {
         "regenerator-runtime": "^0.13.4"
       }
     },
     "@babel/template": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.15.4.tgz",
-      "integrity": "sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
+      "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/parser": "^7.15.4",
-        "@babel/types": "^7.15.4"
+        "@babel/code-frame": "^7.16.7",
+        "@babel/parser": "^7.16.7",
+        "@babel/types": "^7.16.7"
       }
     },
     "@babel/traverse": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.4.tgz",
-      "integrity": "sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/generator": "^7.15.4",
-        "@babel/helper-function-name": "^7.15.4",
-        "@babel/helper-hoist-variables": "^7.15.4",
-        "@babel/helper-split-export-declaration": "^7.15.4",
-        "@babel/parser": "^7.15.4",
-        "@babel/types": "^7.15.4",
+      "version": "7.16.10",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.10.tgz",
+      "integrity": "sha512-yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.16.7",
+        "@babel/generator": "^7.16.8",
+        "@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.16.10",
+        "@babel/types": "^7.16.8",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       }
     },
     "@babel/types": {
-      "version": "7.15.6",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.6.tgz",
-      "integrity": "sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==",
+      "version": "7.23.9",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.9.tgz",
+      "integrity": "sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-validator-identifier": "^7.14.9",
+        "@babel/helper-string-parser": "^7.23.4",
+        "@babel/helper-validator-identifier": "^7.22.20",
         "to-fast-properties": "^2.0.0"
       }
     },
@@ -24610,21 +26015,16 @@
       "dev": true
     },
     "@chiragrupani/karma-chromium-edge-launcher": {
-      "version": "2.1.1",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@chiragrupani/karma-chromium-edge-launcher/-/karma-chromium-edge-launcher-2.4.1.tgz",
+      "integrity": "sha512-HwTlN4dk7dnL9m5nEonq7cI3Wa787wYfGVWeb4oWPMySIEhFpA7/BYQ8zMbpQ4YkSQxVnvY1502aWdbI3w7DeA==",
       "dev": true
     },
-    "@concordance/react": {
-      "version": "2.0.0",
-      "dev": true,
-      "requires": {
-        "arrify": "^1.0.1"
-      },
-      "dependencies": {
-        "arrify": {
-          "version": "1.0.1",
-          "dev": true
-        }
-      }
+    "@colors/colors": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
+      "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
+      "dev": true
     },
     "@emotion/is-prop-valid": {
       "version": "0.7.3",
@@ -24636,31 +26036,227 @@
       "version": "0.7.1"
     },
     "@es-joy/jsdoccomment": {
-      "version": "0.10.8",
+      "version": "0.46.0",
+      "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.46.0.tgz",
+      "integrity": "sha512-C3Axuq1xd/9VqFZpW4YAzOx5O9q/LP46uIQy/iNDpHG3fmPa6TBtvfglMCs3RBiBxAIi0Go97r8+jvTt55XMyQ==",
+      "dev": true,
+      "requires": {
+        "comment-parser": "1.4.1",
+        "esquery": "^1.6.0",
+        "jsdoc-type-pratt-parser": "~4.0.0"
+      }
+    },
+    "@esbuild/aix-ppc64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.2.tgz",
+      "integrity": "sha512-thpVCb/rhxE/BnMLQ7GReQLLN8q9qbHmI55F4489/ByVg2aQaQ6kbcLb6FHkocZzQhxc4gx0sCk0tJkKBFzDhA==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/android-arm": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.24.2.tgz",
+      "integrity": "sha512-tmwl4hJkCfNHwFB3nBa8z1Uy3ypZpxqxfTQOcHX+xRByyYgunVbZ9MzUUfb0RxaHIMnbHagwAxuTL+tnNM+1/Q==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/android-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.24.2.tgz",
+      "integrity": "sha512-cNLgeqCqV8WxfcTIOeL4OAtSmL8JjcN6m09XIgro1Wi7cF4t/THaWEa7eL5CMoMBdjoHOTh/vwTO/o2TRXIyzg==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/android-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.24.2.tgz",
+      "integrity": "sha512-B6Q0YQDqMx9D7rvIcsXfmJfvUYLoP722bgfBlO5cGvNVb5V/+Y7nhBE3mHV9OpxBf4eAS2S68KZztiPaWq4XYw==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/darwin-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.24.2.tgz",
+      "integrity": "sha512-kj3AnYWc+CekmZnS5IPu9D+HWtUI49hbnyqk0FLEJDbzCIQt7hg7ucF1SQAilhtYpIujfaHr6O0UHlzzSPdOeA==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/darwin-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.24.2.tgz",
+      "integrity": "sha512-WeSrmwwHaPkNR5H3yYfowhZcbriGqooyu3zI/3GGpF8AyUdsrrP0X6KumITGA9WOyiJavnGZUwPGvxvwfWPHIA==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/freebsd-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.2.tgz",
+      "integrity": "sha512-UN8HXjtJ0k/Mj6a9+5u6+2eZ2ERD7Edt1Q9IZiB5UZAIdPnVKDoG7mdTVGhHJIeEml60JteamR3qhsr1r8gXvg==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/freebsd-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.24.2.tgz",
+      "integrity": "sha512-TvW7wE/89PYW+IevEJXZ5sF6gJRDY/14hyIGFXdIucxCsbRmLUcjseQu1SyTko+2idmCw94TgyaEZi9HUSOe3Q==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-arm": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.24.2.tgz",
+      "integrity": "sha512-n0WRM/gWIdU29J57hJyUdIsk0WarGd6To0s+Y+LwvlC55wt+GT/OgkwoXCXvIue1i1sSNWblHEig00GBWiJgfA==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.2.tgz",
+      "integrity": "sha512-7HnAD6074BW43YvvUmE/35Id9/NB7BeX5EoNkK9obndmZBUk8xmJJeU7DwmUeN7tkysslb2eSl6CTrYz6oEMQg==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-ia32": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.24.2.tgz",
+      "integrity": "sha512-sfv0tGPQhcZOgTKO3oBE9xpHuUqguHvSo4jl+wjnKwFpapx+vUDcawbwPNuBIAYdRAvIDBfZVvXprIj3HA+Ugw==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-loong64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.24.2.tgz",
+      "integrity": "sha512-CN9AZr8kEndGooS35ntToZLTQLHEjtVB5n7dl8ZcTZMonJ7CCfStrYhrzF97eAecqVbVJ7APOEe18RPI4KLhwQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-mips64el": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.24.2.tgz",
+      "integrity": "sha512-iMkk7qr/wl3exJATwkISxI7kTcmHKE+BlymIAbHO8xanq/TjHaaVThFF6ipWzPHryoFsesNQJPE/3wFJw4+huw==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-ppc64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.24.2.tgz",
+      "integrity": "sha512-shsVrgCZ57Vr2L8mm39kO5PPIb+843FStGt7sGGoqiiWYconSxwTiuswC1VJZLCjNiMLAMh34jg4VSEQb+iEbw==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-riscv64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.24.2.tgz",
+      "integrity": "sha512-4eSFWnU9Hhd68fW16GD0TINewo1L6dRrB+oLNNbYyMUAeOD2yCK5KXGK1GH4qD/kT+bTEXjsyTCiJGHPZ3eM9Q==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-s390x": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.24.2.tgz",
+      "integrity": "sha512-S0Bh0A53b0YHL2XEXC20bHLuGMOhFDO6GN4b3YjRLK//Ep3ql3erpNcPlEFed93hsQAjAQDNsvcK+hV90FubSw==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.24.2.tgz",
+      "integrity": "sha512-8Qi4nQcCTbLnK9WoMjdC9NiTG6/E38RNICU6sUNqK0QFxCYgoARqVqxdFmWkdonVsvGqWhmm7MO0jyTqLqwj0Q==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/netbsd-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.24.2.tgz",
+      "integrity": "sha512-wuLK/VztRRpMt9zyHSazyCVdCXlpHkKm34WUyinD2lzK07FAHTq0KQvZZlXikNWkDGoT6x3TD51jKQ7gMVpopw==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/netbsd-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.24.2.tgz",
+      "integrity": "sha512-VefFaQUc4FMmJuAxmIHgUmfNiLXY438XrL4GDNV1Y1H/RW3qow68xTwjZKfj/+Plp9NANmzbH5R40Meudu8mmw==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/openbsd-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.2.tgz",
+      "integrity": "sha512-YQbi46SBct6iKnszhSvdluqDmxCJA+Pu280Av9WICNwQmMxV7nLRHZfjQzwbPs3jeWnuAhE9Jy0NrnJ12Oz+0A==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/openbsd-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.24.2.tgz",
+      "integrity": "sha512-+iDS6zpNM6EnJyWv0bMGLWSWeXGN/HTaF/LXHXHwejGsVi+ooqDfMCCTerNFxEkM3wYVcExkeGXNqshc9iMaOA==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/sunos-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.24.2.tgz",
+      "integrity": "sha512-hTdsW27jcktEvpwNHJU4ZwWFGkz2zRJUz8pvddmXPtXDzVKTTINmlmga3ZzwcuMpUvLw7JkLy9QLKyGpD2Yxig==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/win32-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.24.2.tgz",
+      "integrity": "sha512-LihEQ2BBKVFLOC9ZItT9iFprsE9tqjDjnbulhHoFxYQtQfai7qfluVODIYxt1PgdoyQkz23+01rzwNwYfutxUQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/win32-ia32": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.24.2.tgz",
+      "integrity": "sha512-q+iGUwfs8tncmFC9pcnD5IvRHAzmbwQ3GPS5/ceCyHdjXubwQWI12MKWSNSMYLJMq23/IUCvJMS76PDqXe1fxA==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/win32-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.24.2.tgz",
+      "integrity": "sha512-7VTgWzgMGvup6aSqDPLiW5zHaxYJGTO4OokMjIlrCtf+VpEL+cXKtCvg723iguPYI5oaUNdS+/V7OU2gvXVWEg==",
+      "dev": true,
+      "optional": true
+    },
+    "@eslint-community/eslint-utils": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
       "dev": true,
       "requires": {
-        "comment-parser": "1.2.4",
-        "esquery": "^1.4.0",
-        "jsdoc-type-pratt-parser": "1.1.1"
+        "eslint-visitor-keys": "^3.3.0"
       }
     },
+    "@eslint-community/regexpp": {
+      "version": "4.10.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz",
+      "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==",
+      "dev": true
+    },
     "@eslint/eslintrc": {
-      "version": "0.4.3",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
+      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
       "dev": true,
       "requires": {
         "ajv": "^6.12.4",
-        "debug": "^4.1.1",
-        "espree": "^7.3.0",
-        "globals": "^13.9.0",
-        "ignore": "^4.0.6",
+        "debug": "^4.3.2",
+        "espree": "^9.6.0",
+        "globals": "^13.19.0",
+        "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
-        "js-yaml": "^3.13.1",
-        "minimatch": "^3.0.4",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
         "strip-json-comments": "^3.1.1"
       },
       "dependencies": {
         "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": {
             "fast-deep-equal": "^3.1.1",
@@ -24669,162 +26265,85 @@
             "uri-js": "^4.2.2"
           }
         },
+        "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
+        },
         "globals": {
-          "version": "13.11.0",
+          "version": "13.20.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+          "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
           "dev": true,
           "requires": {
             "type-fest": "^0.20.2"
           }
         },
-        "ignore": {
-          "version": "4.0.6",
-          "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"
+          }
         },
         "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
         },
-        "strip-json-comments": {
-          "version": "3.1.1",
-          "dev": true
-        }
-      }
-    },
-    "@google-cloud/common": {
-      "version": "3.7.4",
-      "dev": true,
-      "requires": {
-        "@google-cloud/projectify": "^2.0.0",
-        "@google-cloud/promisify": "^2.0.0",
-        "arrify": "^2.0.1",
-        "duplexify": "^4.1.1",
-        "ent": "^2.2.0",
-        "extend": "^3.0.2",
-        "google-auth-library": "^7.9.2",
-        "retry-request": "^4.2.2",
-        "teeny-request": "^7.0.0"
-      },
-      "dependencies": {
-        "duplexify": {
-          "version": "4.1.2",
-          "dev": true,
-          "requires": {
-            "end-of-stream": "^1.4.1",
-            "inherits": "^2.0.3",
-            "readable-stream": "^3.1.1",
-            "stream-shift": "^1.0.0"
-          }
-        },
-        "readable-stream": {
-          "version": "3.6.0",
+        "minimatch": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+          "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
           "dev": true,
           "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
+            "brace-expansion": "^1.1.7"
           }
         }
       }
     },
-    "@google-cloud/paginator": {
-      "version": "3.0.6",
-      "dev": true,
-      "requires": {
-        "arrify": "^2.0.0",
-        "extend": "^3.0.2"
-      }
-    },
-    "@google-cloud/projectify": {
-      "version": "2.1.1",
-      "dev": true
-    },
-    "@google-cloud/promisify": {
-      "version": "2.0.4",
+    "@eslint/js": {
+      "version": "8.57.1",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz",
+      "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==",
       "dev": true
     },
-    "@google-cloud/storage": {
-      "version": "5.15.3",
-      "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-5.15.3.tgz",
-      "integrity": "sha512-a2Y+mvfbzznWorQiv6c+qdPDlBpe47tikV8tpQSnvYXz1Ed/rjin41k2nKUQUcAPGHtYeTzGfKnCNKC+lv8qRg==",
+    "@humanwhocodes/config-array": {
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz",
+      "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==",
       "dev": true,
       "requires": {
-        "@google-cloud/common": "^3.7.4",
-        "@google-cloud/paginator": "^3.0.0",
-        "@google-cloud/promisify": "^2.0.0",
-        "arrify": "^2.0.0",
-        "async-retry": "^1.3.1",
-        "compressible": "^2.0.12",
-        "date-and-time": "^2.0.0",
-        "duplexify": "^4.0.0",
-        "extend": "^3.0.2",
-        "gcs-resumable-upload": "^3.3.0",
-        "get-stream": "^6.0.0",
-        "hash-stream-validation": "^0.2.2",
-        "mime": "^2.2.0",
-        "mime-types": "^2.0.8",
-        "p-limit": "^3.0.1",
-        "pumpify": "^2.0.0",
-        "snakeize": "^0.1.0",
-        "stream-events": "^1.0.1",
-        "xdg-basedir": "^4.0.0"
+        "@humanwhocodes/object-schema": "^2.0.3",
+        "debug": "^4.3.1",
+        "minimatch": "^3.0.5"
       },
       "dependencies": {
-        "duplexify": {
-          "version": "4.1.2",
-          "dev": true,
-          "requires": {
-            "end-of-stream": "^1.4.1",
-            "inherits": "^2.0.3",
-            "readable-stream": "^3.1.1",
-            "stream-shift": "^1.0.0"
-          }
-        },
-        "get-stream": {
-          "version": "6.0.1",
-          "dev": true
-        },
-        "mime": {
-          "version": "2.5.2",
-          "dev": true
-        },
-        "p-limit": {
-          "version": "3.1.0",
-          "dev": true,
-          "requires": {
-            "yocto-queue": "^0.1.0"
-          }
-        },
-        "pumpify": {
-          "version": "2.0.1",
-          "dev": true,
-          "requires": {
-            "duplexify": "^4.1.1",
-            "inherits": "^2.0.3",
-            "pump": "^3.0.0"
-          }
-        },
-        "readable-stream": {
-          "version": "3.6.0",
+        "minimatch": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+          "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
           "dev": true,
           "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
+            "brace-expansion": "^1.1.7"
           }
         }
       }
     },
-    "@humanwhocodes/config-array": {
-      "version": "0.5.0",
-      "dev": true,
-      "requires": {
-        "@humanwhocodes/object-schema": "^1.2.0",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.4"
-      }
+    "@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.0",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
+      "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
       "dev": true
     },
     "@istanbuljs/load-nyc-config": {
@@ -24843,36 +26362,37 @@
       "dev": true
     },
     "@jest/console": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.3.1.tgz",
-      "integrity": "sha512-RkFNWmv0iui+qsOr/29q9dyfKTTT5DCuP31kUwg7rmOKPT/ozLeGLKJKVIiOfbiKyleUZKIrHwhmiZWVe8IMdw==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",
+      "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
       "dev": true,
       "requires": {
-        "@jest/types": "^27.2.5",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "jest-message-util": "^27.3.1",
-        "jest-util": "^27.3.1",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
         "slash": "^3.0.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "27.2.5",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-          "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+          "version": "29.6.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+          "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
           "dev": true,
           "requires": {
+            "@jest/schemas": "^29.6.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
-            "@types/yargs": "^16.0.0",
+            "@types/yargs": "^17.0.8",
             "chalk": "^4.0.0"
           }
         },
         "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "version": "17.0.32",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+          "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -24898,9 +26418,9 @@
           }
         },
         "ci-info": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-          "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
+          "version": "3.9.0",
+          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+          "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
           "dev": true
         },
         "color-convert": {
@@ -24925,16 +26445,16 @@
           "dev": true
         },
         "jest-util": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-          "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+          "version": "29.7.0",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+          "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
           "dev": true,
           "requires": {
-            "@jest/types": "^27.2.5",
+            "@jest/types": "^29.6.3",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.4",
+            "graceful-fs": "^4.2.9",
             "picomatch": "^2.2.3"
           }
         },
@@ -24950,76 +26470,59 @@
       }
     },
     "@jest/core": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.3.1.tgz",
-      "integrity": "sha512-DMNE90RR5QKx0EA+wqe3/TNEwiRpOkhshKNxtLxd4rt3IZpCt+RSL+FoJsGeblRZmqdK4upHA/mKKGPPRAifhg==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz",
+      "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==",
       "dev": true,
       "requires": {
-        "@jest/console": "^27.3.1",
-        "@jest/reporters": "^27.3.1",
-        "@jest/test-result": "^27.3.1",
-        "@jest/transform": "^27.3.1",
-        "@jest/types": "^27.2.5",
+        "@jest/console": "^29.7.0",
+        "@jest/reporters": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
-        "emittery": "^0.8.1",
+        "ci-info": "^3.2.0",
         "exit": "^0.1.2",
-        "graceful-fs": "^4.2.4",
-        "jest-changed-files": "^27.3.0",
-        "jest-config": "^27.3.1",
-        "jest-haste-map": "^27.3.1",
-        "jest-message-util": "^27.3.1",
-        "jest-regex-util": "^27.0.6",
-        "jest-resolve": "^27.3.1",
-        "jest-resolve-dependencies": "^27.3.1",
-        "jest-runner": "^27.3.1",
-        "jest-runtime": "^27.3.1",
-        "jest-snapshot": "^27.3.1",
-        "jest-util": "^27.3.1",
-        "jest-validate": "^27.3.1",
-        "jest-watcher": "^27.3.1",
+        "graceful-fs": "^4.2.9",
+        "jest-changed-files": "^29.7.0",
+        "jest-config": "^29.7.0",
+        "jest-haste-map": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-resolve-dependencies": "^29.7.0",
+        "jest-runner": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "jest-watcher": "^29.7.0",
         "micromatch": "^4.0.4",
-        "rimraf": "^3.0.0",
+        "pretty-format": "^29.7.0",
         "slash": "^3.0.0",
         "strip-ansi": "^6.0.0"
       },
       "dependencies": {
-        "@babel/plugin-syntax-bigint": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
-          "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.8.0"
-          }
-        },
-        "@babel/plugin-syntax-import-meta": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
-          "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.10.4"
-          }
-        },
         "@jest/types": {
-          "version": "27.2.5",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-          "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+          "version": "29.6.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+          "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
           "dev": true,
           "requires": {
+            "@jest/schemas": "^29.6.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
-            "@types/yargs": "^16.0.0",
+            "@types/yargs": "^17.0.8",
             "chalk": "^4.0.0"
           }
         },
         "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "version": "17.0.32",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+          "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -25034,52 +26537,6 @@
             "color-convert": "^2.0.1"
           }
         },
-        "babel-jest": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.3.1.tgz",
-          "integrity": "sha512-SjIF8hh/ir0peae2D6S6ZKRhUy7q/DnpH7k/V6fT4Bgs/LXXUztOpX4G2tCgq8mLo5HA9mN6NmlFMeYtKmIsTQ==",
-          "dev": true,
-          "requires": {
-            "@jest/transform": "^27.3.1",
-            "@jest/types": "^27.2.5",
-            "@types/babel__core": "^7.1.14",
-            "babel-plugin-istanbul": "^6.0.0",
-            "babel-preset-jest": "^27.2.0",
-            "chalk": "^4.0.0",
-            "graceful-fs": "^4.2.4",
-            "slash": "^3.0.0"
-          }
-        },
-        "babel-preset-current-node-syntax": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
-          "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
-          "dev": true,
-          "requires": {
-            "@babel/plugin-syntax-async-generators": "^7.8.4",
-            "@babel/plugin-syntax-bigint": "^7.8.3",
-            "@babel/plugin-syntax-class-properties": "^7.8.3",
-            "@babel/plugin-syntax-import-meta": "^7.8.3",
-            "@babel/plugin-syntax-json-strings": "^7.8.3",
-            "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
-            "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-            "@babel/plugin-syntax-numeric-separator": "^7.8.3",
-            "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-            "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-            "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-            "@babel/plugin-syntax-top-level-await": "^7.8.3"
-          }
-        },
-        "babel-preset-jest": {
-          "version": "27.2.0",
-          "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.2.0.tgz",
-          "integrity": "sha512-z7MgQ3peBwN5L5aCqBKnF6iqdlvZvFUQynEhu0J+X9nHLU72jO3iY331lcYrg+AssJ8q7xsv5/3AICzVmJ/wvg==",
-          "dev": true,
-          "requires": {
-            "babel-plugin-jest-hoist": "^27.2.0",
-            "babel-preset-current-node-syntax": "^1.0.0"
-          }
-        },
         "chalk": {
           "version": "4.1.2",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -25091,9 +26548,9 @@
           }
         },
         "ci-info": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-          "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
+          "version": "3.9.0",
+          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+          "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
           "dev": true
         },
         "color-convert": {
@@ -25111,58 +26568,23 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
-        "deepmerge": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-          "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
-          "dev": true
-        },
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "jest-config": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.3.1.tgz",
-          "integrity": "sha512-KY8xOIbIACZ/vdYCKSopL44I0xboxC751IX+DXL2+Wx6DKNycyEfV3rryC3BPm5Uq/BBqDoMrKuqLEUNJmMKKg==",
-          "dev": true,
-          "requires": {
-            "@babel/core": "^7.1.0",
-            "@jest/test-sequencer": "^27.3.1",
-            "@jest/types": "^27.2.5",
-            "babel-jest": "^27.3.1",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "deepmerge": "^4.2.2",
-            "glob": "^7.1.1",
-            "graceful-fs": "^4.2.4",
-            "jest-circus": "^27.3.1",
-            "jest-environment-jsdom": "^27.3.1",
-            "jest-environment-node": "^27.3.1",
-            "jest-get-type": "^27.3.1",
-            "jest-jasmine2": "^27.3.1",
-            "jest-regex-util": "^27.0.6",
-            "jest-resolve": "^27.3.1",
-            "jest-runner": "^27.3.1",
-            "jest-util": "^27.3.1",
-            "jest-validate": "^27.3.1",
-            "micromatch": "^4.0.4",
-            "pretty-format": "^27.3.1"
-          }
-        },
         "jest-util": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-          "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+          "version": "29.7.0",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+          "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
           "dev": true,
           "requires": {
-            "@jest/types": "^27.2.5",
+            "@jest/types": "^29.6.3",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.4",
+            "graceful-fs": "^4.2.9",
             "picomatch": "^2.2.3"
           }
         },
@@ -25178,34 +26600,35 @@
       }
     },
     "@jest/environment": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.3.1.tgz",
-      "integrity": "sha512-BCKCj4mOVLme6Tanoyc9k0ultp3pnmuyHw73UHRPeeZxirsU/7E3HC4le/VDb/SMzE1JcPnto+XBKFOcoiJzVw==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz",
+      "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==",
       "dev": true,
       "requires": {
-        "@jest/fake-timers": "^27.3.1",
-        "@jest/types": "^27.2.5",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
-        "jest-mock": "^27.3.0"
+        "jest-mock": "^29.7.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "27.2.5",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-          "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+          "version": "29.6.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+          "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
           "dev": true,
           "requires": {
+            "@jest/schemas": "^29.6.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
-            "@types/yargs": "^16.0.0",
+            "@types/yargs": "^17.0.8",
             "chalk": "^4.0.0"
           }
         },
         "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "version": "17.0.32",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+          "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -25262,46 +26685,75 @@
         }
       }
     },
+    "@jest/expect": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz",
+      "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==",
+      "dev": true,
+      "requires": {
+        "expect": "^29.7.0",
+        "jest-snapshot": "^29.7.0"
+      }
+    },
+    "@jest/expect-utils": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
+      "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
+      "dev": true,
+      "requires": {
+        "jest-get-type": "^29.6.3"
+      }
+    },
     "@jest/fake-timers": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.3.1.tgz",
-      "integrity": "sha512-M3ZFgwwlqJtWZ+QkBG5NmC23A9w+A6ZxNsO5nJxJsKYt4yguBd3i8TpjQz5NfCX91nEve1KqD9RA2Q+Q1uWqoA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz",
+      "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==",
       "dev": true,
       "requires": {
-        "@jest/types": "^27.2.5",
-        "@sinonjs/fake-timers": "^8.0.1",
+        "@jest/types": "^29.6.3",
+        "@sinonjs/fake-timers": "^10.0.2",
         "@types/node": "*",
-        "jest-message-util": "^27.3.1",
-        "jest-mock": "^27.3.0",
-        "jest-util": "^27.3.1"
+        "jest-message-util": "^29.7.0",
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "27.2.5",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-          "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+          "version": "29.6.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+          "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
           "dev": true,
           "requires": {
+            "@jest/schemas": "^29.6.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
-            "@types/yargs": "^16.0.0",
+            "@types/yargs": "^17.0.8",
             "chalk": "^4.0.0"
           }
         },
+        "@sinonjs/commons": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
+          "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
+          "dev": true,
+          "requires": {
+            "type-detect": "4.0.8"
+          }
+        },
         "@sinonjs/fake-timers": {
-          "version": "8.0.1",
-          "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.0.1.tgz",
-          "integrity": "sha512-AU7kwFxreVd6OAXcAFlKSmZquiRUU0FvYm44k1Y1QbK7Co4m0aqfGMhjykIeQp/H6rcl+nFmj0zfdUcGVs9Dew==",
+          "version": "10.3.0",
+          "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
+          "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
           "dev": true,
           "requires": {
-            "@sinonjs/commons": "^1.7.0"
+            "@sinonjs/commons": "^3.0.0"
           }
         },
         "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "version": "17.0.32",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+          "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -25327,9 +26779,9 @@
           }
         },
         "ci-info": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-          "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
+          "version": "3.9.0",
+          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+          "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
           "dev": true
         },
         "color-convert": {
@@ -25354,16 +26806,16 @@
           "dev": true
         },
         "jest-util": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-          "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+          "version": "29.7.0",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+          "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
           "dev": true,
           "requires": {
-            "@jest/types": "^27.2.5",
+            "@jest/types": "^29.6.3",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.4",
+            "graceful-fs": "^4.2.9",
             "picomatch": "^2.2.3"
           }
         },
@@ -25379,33 +26831,35 @@
       }
     },
     "@jest/globals": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.3.1.tgz",
-      "integrity": "sha512-Q651FWiWQAIFiN+zS51xqhdZ8g9b88nGCobC87argAxA7nMfNQq0Q0i9zTfQYgLa6qFXk2cGANEqfK051CZ8Pg==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz",
+      "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^27.3.1",
-        "@jest/types": "^27.2.5",
-        "expect": "^27.3.1"
+        "@jest/environment": "^29.7.0",
+        "@jest/expect": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "jest-mock": "^29.7.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "27.2.5",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-          "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+          "version": "29.6.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+          "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
           "dev": true,
           "requires": {
+            "@jest/schemas": "^29.6.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
-            "@types/yargs": "^16.0.0",
+            "@types/yargs": "^17.0.8",
             "chalk": "^4.0.0"
           }
         },
         "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "version": "17.0.32",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+          "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -25463,55 +26917,55 @@
       }
     },
     "@jest/reporters": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.3.1.tgz",
-      "integrity": "sha512-m2YxPmL9Qn1emFVgZGEiMwDntDxRRQ2D58tiDQlwYTg5GvbFOKseYCcHtn0WsI8CG4vzPglo3nqbOiT8ySBT/w==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz",
+      "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",
       "dev": true,
       "requires": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^27.3.1",
-        "@jest/test-result": "^27.3.1",
-        "@jest/transform": "^27.3.1",
-        "@jest/types": "^27.2.5",
+        "@jest/console": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@jridgewell/trace-mapping": "^0.3.18",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "collect-v8-coverage": "^1.0.0",
         "exit": "^0.1.2",
-        "glob": "^7.1.2",
-        "graceful-fs": "^4.2.4",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
         "istanbul-lib-coverage": "^3.0.0",
-        "istanbul-lib-instrument": "^4.0.3",
+        "istanbul-lib-instrument": "^6.0.0",
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^4.0.0",
-        "istanbul-reports": "^3.0.2",
-        "jest-haste-map": "^27.3.1",
-        "jest-resolve": "^27.3.1",
-        "jest-util": "^27.3.1",
-        "jest-worker": "^27.3.1",
+        "istanbul-reports": "^3.1.3",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-worker": "^29.7.0",
         "slash": "^3.0.0",
-        "source-map": "^0.6.0",
         "string-length": "^4.0.1",
-        "terminal-link": "^2.0.0",
-        "v8-to-istanbul": "^8.1.0"
+        "strip-ansi": "^6.0.0",
+        "v8-to-istanbul": "^9.0.1"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "27.2.5",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-          "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+          "version": "29.6.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+          "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
           "dev": true,
           "requires": {
+            "@jest/schemas": "^29.6.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
-            "@types/yargs": "^16.0.0",
+            "@types/yargs": "^17.0.8",
             "chalk": "^4.0.0"
           }
         },
         "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "version": "17.0.32",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+          "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -25537,9 +26991,9 @@
           }
         },
         "ci-info": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-          "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
+          "version": "3.9.0",
+          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+          "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
           "dev": true
         },
         "color-convert": {
@@ -25563,26 +27017,33 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "istanbul-lib-instrument": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.1.tgz",
+          "integrity": "sha512-EAMEJBsYuyyztxMxW3g7ugGPkrZsV57v0Hmv3mm1uQsmB+QnZuepg731CRaIgeUVSdmsTngOkSnauNF8p7FIhA==",
+          "dev": true,
+          "requires": {
+            "@babel/core": "^7.12.3",
+            "@babel/parser": "^7.14.7",
+            "@istanbuljs/schema": "^0.1.2",
+            "istanbul-lib-coverage": "^3.2.0",
+            "semver": "^7.5.4"
+          }
+        },
         "jest-util": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-          "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+          "version": "29.7.0",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+          "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
           "dev": true,
           "requires": {
-            "@jest/types": "^27.2.5",
+            "@jest/types": "^29.6.3",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.4",
+            "graceful-fs": "^4.2.9",
             "picomatch": "^2.2.3"
           }
         },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -25594,54 +27055,56 @@
         }
       }
     },
+    "@jest/schemas": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
+      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
+      "dev": true,
+      "requires": {
+        "@sinclair/typebox": "^0.27.8"
+      }
+    },
     "@jest/source-map": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.0.6.tgz",
-      "integrity": "sha512-Fek4mi5KQrqmlY07T23JRi0e7Z9bXTOOD86V/uS0EIW4PClvPDqZOyFlLpNJheS6QI0FNX1CgmPjtJ4EA/2M+g==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz",
+      "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==",
       "dev": true,
       "requires": {
+        "@jridgewell/trace-mapping": "^0.3.18",
         "callsites": "^3.0.0",
-        "graceful-fs": "^4.2.4",
-        "source-map": "^0.6.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
+        "graceful-fs": "^4.2.9"
       }
     },
     "@jest/test-result": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.3.1.tgz",
-      "integrity": "sha512-mLn6Thm+w2yl0opM8J/QnPTqrfS4FoXsXF2WIWJb2O/GBSyResL71BRuMYbYRsGt7ELwS5JGcEcGb52BNrumgg==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz",
+      "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",
       "dev": true,
       "requires": {
-        "@jest/console": "^27.3.1",
-        "@jest/types": "^27.2.5",
+        "@jest/console": "^29.7.0",
+        "@jest/types": "^29.6.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "collect-v8-coverage": "^1.0.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "27.2.5",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-          "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+          "version": "29.6.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+          "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
           "dev": true,
           "requires": {
+            "@jest/schemas": "^29.6.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
-            "@types/yargs": "^16.0.0",
+            "@types/yargs": "^17.0.8",
             "chalk": "^4.0.0"
           }
         },
         "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "version": "17.0.32",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+          "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -25699,57 +27162,58 @@
       }
     },
     "@jest/test-sequencer": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.3.1.tgz",
-      "integrity": "sha512-siySLo07IMEdSjA4fqEnxfIX8lB/lWYsBPwNFtkOvsFQvmBrL3yj3k3uFNZv/JDyApTakRpxbKLJ3CT8UGVCrA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz",
+      "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",
       "dev": true,
       "requires": {
-        "@jest/test-result": "^27.3.1",
-        "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^27.3.1",
-        "jest-runtime": "^27.3.1"
+        "@jest/test-result": "^29.7.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "slash": "^3.0.0"
       }
     },
     "@jest/transform": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.3.1.tgz",
-      "integrity": "sha512-3fSvQ02kuvjOI1C1ssqMVBKJpZf6nwoCiSu00zAKh5nrp3SptNtZy/8s5deayHnqxhjD9CWDJ+yqQwuQ0ZafXQ==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz",
+      "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==",
       "dev": true,
       "requires": {
-        "@babel/core": "^7.1.0",
-        "@jest/types": "^27.2.5",
-        "babel-plugin-istanbul": "^6.0.0",
+        "@babel/core": "^7.11.6",
+        "@jest/types": "^29.6.3",
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "babel-plugin-istanbul": "^6.1.1",
         "chalk": "^4.0.0",
-        "convert-source-map": "^1.4.0",
-        "fast-json-stable-stringify": "^2.0.0",
-        "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^27.3.1",
-        "jest-regex-util": "^27.0.6",
-        "jest-util": "^27.3.1",
+        "convert-source-map": "^2.0.0",
+        "fast-json-stable-stringify": "^2.1.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "jest-regex-util": "^29.6.3",
+        "jest-util": "^29.7.0",
         "micromatch": "^4.0.4",
-        "pirates": "^4.0.1",
+        "pirates": "^4.0.4",
         "slash": "^3.0.0",
-        "source-map": "^0.6.1",
-        "write-file-atomic": "^3.0.0"
+        "write-file-atomic": "^4.0.2"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "27.2.5",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-          "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+          "version": "29.6.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+          "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
           "dev": true,
           "requires": {
+            "@jest/schemas": "^29.6.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
-            "@types/yargs": "^16.0.0",
+            "@types/yargs": "^17.0.8",
             "chalk": "^4.0.0"
           }
         },
         "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "version": "17.0.32",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+          "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -25764,6 +27228,19 @@
             "color-convert": "^2.0.1"
           }
         },
+        "babel-plugin-istanbul": {
+          "version": "6.1.1",
+          "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+          "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-plugin-utils": "^7.0.0",
+            "@istanbuljs/load-nyc-config": "^1.0.0",
+            "@istanbuljs/schema": "^0.1.2",
+            "istanbul-lib-instrument": "^5.0.4",
+            "test-exclude": "^6.0.0"
+          }
+        },
         "chalk": {
           "version": "4.1.2",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -25775,9 +27252,9 @@
           }
         },
         "ci-info": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-          "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
+          "version": "3.9.0",
+          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+          "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
           "dev": true
         },
         "color-convert": {
@@ -25795,30 +27272,49 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
+        "convert-source-map": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+          "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+          "dev": true
+        },
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "istanbul-lib-instrument": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+          "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+          "dev": true,
+          "requires": {
+            "@babel/core": "^7.12.3",
+            "@babel/parser": "^7.14.7",
+            "@istanbuljs/schema": "^0.1.2",
+            "istanbul-lib-coverage": "^3.2.0",
+            "semver": "^6.3.0"
+          }
+        },
         "jest-util": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-          "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+          "version": "29.7.0",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+          "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
           "dev": true,
           "requires": {
-            "@jest/types": "^27.2.5",
+            "@jest/types": "^29.6.3",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.4",
+            "graceful-fs": "^4.2.9",
             "picomatch": "^2.2.3"
           }
         },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+        "semver": {
+          "version": "6.3.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
           "dev": true
         },
         "supports-color": {
@@ -25832,293 +27328,1275 @@
         }
       }
     },
-    "@jest/types": {
-      "version": "26.6.2",
+    "@jest/types": {
+      "version": "26.6.2",
+      "dev": true,
+      "requires": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.0",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
+    "@jridgewell/doctrine": {
+      "version": "3.0.2",
+      "dev": true,
+      "requires": {
+        "esutils": "^2.0.2"
+      }
+    },
+    "@jridgewell/gen-mapping": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/set-array": "^1.2.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      }
+    },
+    "@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+      "dev": true
+    },
+    "@jridgewell/set-array": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+      "dev": true
+    },
+    "@jridgewell/source-map": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.3.tgz",
+      "integrity": "sha512-b+fsZXeLYi9fEULmfBrhxn4IrPlINf8fiNarzTof004v3lFdntdwa9PF7vFJqm3mg7s+ScJMxXaE3Acp1irZcg==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/gen-mapping": "^0.3.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      }
+    },
+    "@jridgewell/sourcemap-codec": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+      "dev": true
+    },
+    "@jridgewell/trace-mapping": {
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
+    "@kristoferbaxter/async": {
+      "version": "1.0.0",
+      "dev": true
+    },
+    "@kristoferbaxter/bytes": {
+      "version": "0.1.2",
+      "dev": true
+    },
+    "@kristoferbaxter/kleur": {
+      "version": "4.0.2",
+      "dev": true
+    },
+    "@mapbox/node-pre-gyp": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz",
+      "integrity": "sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==",
+      "dev": true,
+      "requires": {
+        "detect-libc": "^2.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "make-dir": "^3.1.0",
+        "node-fetch": "^2.6.7",
+        "nopt": "^5.0.0",
+        "npmlog": "^5.0.1",
+        "rimraf": "^3.0.2",
+        "semver": "^7.3.5",
+        "tar": "^6.1.11"
+      },
+      "dependencies": {
+        "nopt": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
+          "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+          "dev": true,
+          "requires": {
+            "abbrev": "1"
+          }
+        }
+      }
+    },
+    "@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      }
+    },
+    "@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true
+    },
+    "@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      }
+    },
+    "@octokit/auth-token": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-4.0.0.tgz",
+      "integrity": "sha512-tY/msAuJo6ARbK6SPIxZrPBms3xPbfwBrulZe0Wtr/DIY9lje2HeV1uoebShn6mx7SjCHif6EjMvoREj+gZ+SA==",
+      "dev": true
+    },
+    "@octokit/core": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-5.1.0.tgz",
+      "integrity": "sha512-BDa2VAMLSh3otEiaMJ/3Y36GU4qf6GI+VivQ/P41NC6GHcdxpKlqV0ikSZ5gdQsmS3ojXeRx5vasgNTinF0Q4g==",
+      "dev": true,
+      "requires": {
+        "@octokit/auth-token": "^4.0.0",
+        "@octokit/graphql": "^7.0.0",
+        "@octokit/request": "^8.0.2",
+        "@octokit/request-error": "^5.0.0",
+        "@octokit/types": "^12.0.0",
+        "before-after-hook": "^2.2.0",
+        "universal-user-agent": "^6.0.0"
+      }
+    },
+    "@octokit/endpoint": {
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-9.0.4.tgz",
+      "integrity": "sha512-DWPLtr1Kz3tv8L0UvXTDP1fNwM0S+z6EJpRcvH66orY6Eld4XBMCSYsaWp4xIm61jTWxK68BrR7ibO+vSDnZqw==",
+      "dev": true,
+      "requires": {
+        "@octokit/types": "^12.0.0",
+        "universal-user-agent": "^6.0.0"
+      }
+    },
+    "@octokit/graphql": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-7.1.0.tgz",
+      "integrity": "sha512-r+oZUH7aMFui1ypZnAvZmn0KSqAUgE1/tUXIWaqUCa1758ts/Jio84GZuzsvUkme98kv0WFY8//n0J1Z+vsIsQ==",
+      "dev": true,
+      "requires": {
+        "@octokit/request": "^8.3.0",
+        "@octokit/types": "^13.0.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "dependencies": {
+        "@octokit/openapi-types": {
+          "version": "22.2.0",
+          "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-22.2.0.tgz",
+          "integrity": "sha512-QBhVjcUa9W7Wwhm6DBFu6ZZ+1/t/oYxqc2tp81Pi41YNuJinbFRx8B133qVOrAaBbF7D/m0Et6f9/pZt9Rc+tg==",
+          "dev": true
+        },
+        "@octokit/types": {
+          "version": "13.5.0",
+          "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.5.0.tgz",
+          "integrity": "sha512-HdqWTf5Z3qwDVlzCrP8UJquMwunpDiMPt5er+QjGzL4hqr/vBVY/MauQgS1xWxCDT1oMx1EULyqxncdCY/NVSQ==",
+          "dev": true,
+          "requires": {
+            "@octokit/openapi-types": "^22.2.0"
+          }
+        }
+      }
+    },
+    "@octokit/openapi-types": {
+      "version": "19.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-19.1.0.tgz",
+      "integrity": "sha512-6G+ywGClliGQwRsjvqVYpklIfa7oRPA0vyhPQG/1Feh+B+wU0vGH1JiJ5T25d3g1JZYBHzR2qefLi9x8Gt+cpw==",
+      "dev": true
+    },
+    "@octokit/plugin-paginate-rest": {
+      "version": "11.3.1",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-11.3.1.tgz",
+      "integrity": "sha512-ryqobs26cLtM1kQxqeZui4v8FeznirUsksiA+RYemMPJ7Micju0WSkv50dBksTuZks9O5cg4wp+t8fZ/cLY56g==",
+      "dev": true,
+      "requires": {
+        "@octokit/types": "^13.5.0"
+      },
+      "dependencies": {
+        "@octokit/openapi-types": {
+          "version": "22.2.0",
+          "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-22.2.0.tgz",
+          "integrity": "sha512-QBhVjcUa9W7Wwhm6DBFu6ZZ+1/t/oYxqc2tp81Pi41YNuJinbFRx8B133qVOrAaBbF7D/m0Et6f9/pZt9Rc+tg==",
+          "dev": true
+        },
+        "@octokit/types": {
+          "version": "13.5.0",
+          "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.5.0.tgz",
+          "integrity": "sha512-HdqWTf5Z3qwDVlzCrP8UJquMwunpDiMPt5er+QjGzL4hqr/vBVY/MauQgS1xWxCDT1oMx1EULyqxncdCY/NVSQ==",
+          "dev": true,
+          "requires": {
+            "@octokit/openapi-types": "^22.2.0"
+          }
+        }
+      }
+    },
+    "@octokit/plugin-request-log": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-4.0.0.tgz",
+      "integrity": "sha512-2uJI1COtYCq8Z4yNSnM231TgH50bRkheQ9+aH8TnZanB6QilOnx8RMD2qsnamSOXtDj0ilxvevf5fGsBhBBzKA==",
+      "dev": true,
+      "requires": {}
+    },
+    "@octokit/plugin-rest-endpoint-methods": {
+      "version": "13.2.2",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-13.2.2.tgz",
+      "integrity": "sha512-EI7kXWidkt3Xlok5uN43suK99VWqc8OaIMktY9d9+RNKl69juoTyxmLoWPIZgJYzi41qj/9zU7G/ljnNOJ5AFA==",
+      "dev": true,
+      "requires": {
+        "@octokit/types": "^13.5.0"
+      },
+      "dependencies": {
+        "@octokit/openapi-types": {
+          "version": "22.2.0",
+          "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-22.2.0.tgz",
+          "integrity": "sha512-QBhVjcUa9W7Wwhm6DBFu6ZZ+1/t/oYxqc2tp81Pi41YNuJinbFRx8B133qVOrAaBbF7D/m0Et6f9/pZt9Rc+tg==",
+          "dev": true
+        },
+        "@octokit/types": {
+          "version": "13.5.0",
+          "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.5.0.tgz",
+          "integrity": "sha512-HdqWTf5Z3qwDVlzCrP8UJquMwunpDiMPt5er+QjGzL4hqr/vBVY/MauQgS1xWxCDT1oMx1EULyqxncdCY/NVSQ==",
+          "dev": true,
+          "requires": {
+            "@octokit/openapi-types": "^22.2.0"
+          }
+        }
+      }
+    },
+    "@octokit/request": {
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-8.4.0.tgz",
+      "integrity": "sha512-9Bb014e+m2TgBeEJGEbdplMVWwPmL1FPtggHQRkV+WVsMggPtEkLKPlcVYm/o8xKLkpJ7B+6N8WfQMtDLX2Dpw==",
+      "dev": true,
+      "requires": {
+        "@octokit/endpoint": "^9.0.1",
+        "@octokit/request-error": "^5.1.0",
+        "@octokit/types": "^13.1.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "dependencies": {
+        "@octokit/openapi-types": {
+          "version": "22.2.0",
+          "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-22.2.0.tgz",
+          "integrity": "sha512-QBhVjcUa9W7Wwhm6DBFu6ZZ+1/t/oYxqc2tp81Pi41YNuJinbFRx8B133qVOrAaBbF7D/m0Et6f9/pZt9Rc+tg==",
+          "dev": true
+        },
+        "@octokit/types": {
+          "version": "13.5.0",
+          "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.5.0.tgz",
+          "integrity": "sha512-HdqWTf5Z3qwDVlzCrP8UJquMwunpDiMPt5er+QjGzL4hqr/vBVY/MauQgS1xWxCDT1oMx1EULyqxncdCY/NVSQ==",
+          "dev": true,
+          "requires": {
+            "@octokit/openapi-types": "^22.2.0"
+          }
+        }
+      }
+    },
+    "@octokit/request-error": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-5.1.0.tgz",
+      "integrity": "sha512-GETXfE05J0+7H2STzekpKObFe765O5dlAKUTLNGeH+x47z7JjXHfsHKo5z21D/o/IOZTUEI6nyWyR+bZVP/n5Q==",
+      "dev": true,
+      "requires": {
+        "@octokit/types": "^13.1.0",
+        "deprecation": "^2.0.0",
+        "once": "^1.4.0"
+      },
+      "dependencies": {
+        "@octokit/openapi-types": {
+          "version": "22.2.0",
+          "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-22.2.0.tgz",
+          "integrity": "sha512-QBhVjcUa9W7Wwhm6DBFu6ZZ+1/t/oYxqc2tp81Pi41YNuJinbFRx8B133qVOrAaBbF7D/m0Et6f9/pZt9Rc+tg==",
+          "dev": true
+        },
+        "@octokit/types": {
+          "version": "13.5.0",
+          "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.5.0.tgz",
+          "integrity": "sha512-HdqWTf5Z3qwDVlzCrP8UJquMwunpDiMPt5er+QjGzL4hqr/vBVY/MauQgS1xWxCDT1oMx1EULyqxncdCY/NVSQ==",
+          "dev": true,
+          "requires": {
+            "@octokit/openapi-types": "^22.2.0"
+          }
+        }
+      }
+    },
+    "@octokit/rest": {
+      "version": "20.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-20.1.1.tgz",
+      "integrity": "sha512-MB4AYDsM5jhIHro/dq4ix1iWTLGToIGk6cWF5L6vanFaMble5jTX/UBQyiv05HsWnwUtY8JrfHy2LWfKwihqMw==",
+      "dev": true,
+      "requires": {
+        "@octokit/core": "^5.0.2",
+        "@octokit/plugin-paginate-rest": "11.3.1",
+        "@octokit/plugin-request-log": "^4.0.0",
+        "@octokit/plugin-rest-endpoint-methods": "13.2.2"
+      }
+    },
+    "@octokit/types": {
+      "version": "12.4.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.4.0.tgz",
+      "integrity": "sha512-FLWs/AvZllw/AGVs+nJ+ELCDZZJk+kY0zMen118xhL2zD0s1etIUHm1odgjP7epxYU1ln7SZxEUWYop5bhsdgQ==",
+      "dev": true,
+      "requires": {
+        "@octokit/openapi-types": "^19.1.0"
+      }
+    },
+    "@pkgr/core": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.0.tgz",
+      "integrity": "sha512-Zwq5OCzuwJC2jwqmpEQt7Ds1DTi6BWSwoGkbb1n9pO3hzb35BoJELx7c0T23iDkBGkh2e7tvOtjF3tr3OaQHDQ==",
+      "dev": true
+    },
+    "@reach/auto-id": {
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/@reach/auto-id/-/auto-id-0.16.0.tgz",
+      "integrity": "sha512-5ssbeP5bCkM39uVsfQCwBBL+KT8YColdnMN5/Eto6Rj7929ql95R3HZUOkKIvj7mgPtEb60BLQxd1P3o6cjbmg==",
+      "requires": {
+        "@reach/utils": "0.16.0",
+        "tslib": "^2.3.0"
+      }
+    },
+    "@reach/utils": {
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/@reach/utils/-/utils-0.16.0.tgz",
+      "integrity": "sha512-PCggBet3qaQmwFNcmQ/GqHSefadAFyNCUekq9RrWoaU9hh/S4iaFgf2MBMdM47eQj5i/Bk0Mm07cP/XPFlkN+Q==",
+      "requires": {
+        "tiny-warning": "^1.0.3",
+        "tslib": "^2.3.0"
+      }
+    },
+    "@rollup/pluginutils": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz",
+      "integrity": "sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==",
+      "dev": true,
+      "requires": {
+        "estree-walker": "^2.0.1",
+        "picomatch": "^2.2.2"
+      }
+    },
+    "@rtsao/scc": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
+      "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==",
+      "dev": true
+    },
+    "@sinclair/typebox": {
+      "version": "0.27.8",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
+      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
+      "dev": true
+    },
+    "@sindresorhus/merge-streams": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz",
+      "integrity": "sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==",
+      "dev": true
+    },
+    "@sinonjs/commons": {
+      "version": "1.8.2",
+      "dev": true,
+      "requires": {
+        "type-detect": "4.0.8"
+      }
+    },
+    "@sinonjs/fake-timers": {
+      "version": "11.2.2",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-11.2.2.tgz",
+      "integrity": "sha512-G2piCSxQ7oWOxwGSAyFHfPIsyeJGXYtc6mFbnFA+kRXkiEnTl8c/8jul2S329iFBnDI9HGoeWWAZvuvOkZccgw==",
+      "dev": true,
+      "requires": {
+        "@sinonjs/commons": "^3.0.0"
+      },
+      "dependencies": {
+        "@sinonjs/commons": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
+          "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
+          "dev": true,
+          "requires": {
+            "type-detect": "4.0.8"
+          }
+        }
+      }
+    },
+    "@sinonjs/samsam": {
+      "version": "6.0.2",
+      "dev": true,
+      "requires": {
+        "@sinonjs/commons": "^1.6.0",
+        "lodash.get": "^4.4.2",
+        "type-detect": "^4.0.8"
+      }
+    },
+    "@sinonjs/text-encoding": {
+      "version": "0.7.1",
+      "dev": true
+    },
+    "@smithy/abort-controller": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.1.1.tgz",
+      "integrity": "sha512-MBJBiidoe+0cTFhyxT8g+9g7CeVccLM0IOKKUMCNQ1CNMJ/eIfoo0RTfVrXOONEI1UCN1W+zkiHSbzUNE9dZtQ==",
+      "dev": true,
+      "requires": {
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "@smithy/chunked-blob-reader": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/chunked-blob-reader/-/chunked-blob-reader-3.0.0.tgz",
+      "integrity": "sha512-sbnURCwjF0gSToGlsBiAmd1lRCmSn72nu9axfJu5lIx6RUEgHu6GwTMbqCdhQSi0Pumcm5vFxsi9XWXb2mTaoA==",
+      "dev": true,
+      "requires": {
+        "tslib": "^2.6.2"
+      }
+    },
+    "@smithy/chunked-blob-reader-native": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/chunked-blob-reader-native/-/chunked-blob-reader-native-3.0.0.tgz",
+      "integrity": "sha512-VDkpCYW+peSuM4zJip5WDfqvg2Mo/e8yxOv3VF1m11y7B8KKMKVFtmZWDe36Fvk8rGuWrPZHHXZ7rR7uM5yWyg==",
+      "dev": true,
+      "requires": {
+        "@smithy/util-base64": "^3.0.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "@smithy/config-resolver": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-3.0.5.tgz",
+      "integrity": "sha512-SkW5LxfkSI1bUC74OtfBbdz+grQXYiPYolyu8VfpLIjEoN/sHVBlLeGXMQ1vX4ejkgfv6sxVbQJ32yF2cl1veA==",
+      "dev": true,
+      "requires": {
+        "@smithy/node-config-provider": "^3.1.4",
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-config-provider": "^3.0.0",
+        "@smithy/util-middleware": "^3.0.3",
+        "tslib": "^2.6.2"
+      }
+    },
+    "@smithy/core": {
+      "version": "2.2.6",
+      "resolved": "https://registry.npmjs.org/@smithy/core/-/core-2.2.6.tgz",
+      "integrity": "sha512-tBbVIv/ui7/lLTKayYJJvi8JLVL2SwOQTbNFEOrvzSE3ktByvsa1erwBOnAMo8N5Vu30g7lN4lLStrU75oDGuw==",
+      "dev": true,
+      "requires": {
+        "@smithy/middleware-endpoint": "^3.0.5",
+        "@smithy/middleware-retry": "^3.0.9",
+        "@smithy/middleware-serde": "^3.0.3",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/smithy-client": "^3.1.7",
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-middleware": "^3.0.3",
+        "tslib": "^2.6.2"
+      }
+    },
+    "@smithy/credential-provider-imds": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-3.1.4.tgz",
+      "integrity": "sha512-NKyH01m97Xa5xf3pB2QOF3lnuE8RIK0hTVNU5zvZAwZU8uspYO4DHQVlK+Y5gwSrujTfHvbfd1D9UFJAc0iYKQ==",
+      "dev": true,
+      "requires": {
+        "@smithy/node-config-provider": "^3.1.4",
+        "@smithy/property-provider": "^3.1.3",
+        "@smithy/types": "^3.3.0",
+        "@smithy/url-parser": "^3.0.3",
+        "tslib": "^2.6.2"
+      }
+    },
+    "@smithy/eventstream-codec": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-3.1.2.tgz",
+      "integrity": "sha512-0mBcu49JWt4MXhrhRAlxASNy0IjDRFU+aWNDRal9OtUJvJNiwDuyKMUONSOjLjSCeGwZaE0wOErdqULer8r7yw==",
+      "dev": true,
+      "requires": {
+        "@aws-crypto/crc32": "5.2.0",
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-hex-encoding": "^3.0.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "@smithy/eventstream-serde-browser": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-3.0.4.tgz",
+      "integrity": "sha512-Eo4anLZX6ltGJTZ5yJMc80gZPYYwBn44g0h7oFq6et+TYr5dUsTpIcDbz2evsOKIZhZ7zBoFWHtBXQ4QQeb5xA==",
+      "dev": true,
+      "requires": {
+        "@smithy/eventstream-serde-universal": "^3.0.4",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "@smithy/eventstream-serde-config-resolver": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.0.3.tgz",
+      "integrity": "sha512-NVTYjOuYpGfrN/VbRQgn31x73KDLfCXCsFdad8DiIc3IcdxL+dYA9zEQPyOP7Fy2QL8CPy2WE4WCUD+ZsLNfaQ==",
+      "dev": true,
+      "requires": {
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "@smithy/eventstream-serde-node": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-3.0.4.tgz",
+      "integrity": "sha512-mjlG0OzGAYuUpdUpflfb9zyLrBGgmQmrobNT8b42ZTsGv/J03+t24uhhtVEKG/b2jFtPIHF74Bq+VUtbzEKOKg==",
+      "dev": true,
+      "requires": {
+        "@smithy/eventstream-serde-universal": "^3.0.4",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "@smithy/eventstream-serde-universal": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-3.0.4.tgz",
+      "integrity": "sha512-Od9dv8zh3PgOD7Vj4T3HSuox16n0VG8jJIM2gvKASL6aCtcS8CfHZDWe1Ik3ZXW6xBouU+45Q5wgoliWDZiJ0A==",
+      "dev": true,
+      "requires": {
+        "@smithy/eventstream-codec": "^3.1.2",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "@smithy/fetch-http-handler": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-3.2.1.tgz",
+      "integrity": "sha512-0w0bgUvZmfa0vHN8a+moByhCJT07WN6AHKEhFSOLsDpnszm+5dLVv5utGaqbhOrZ/aF5x3xuPMs/oMCd+4O5xg==",
+      "dev": true,
+      "requires": {
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/querystring-builder": "^3.0.3",
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-base64": "^3.0.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "@smithy/hash-blob-browser": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-3.1.2.tgz",
+      "integrity": "sha512-hAbfqN2UbISltakCC2TP0kx4LqXBttEv2MqSPE98gVuDFMf05lU+TpC41QtqGP3Ff5A3GwZMPfKnEy0VmEUpmg==",
+      "dev": true,
+      "requires": {
+        "@smithy/chunked-blob-reader": "^3.0.0",
+        "@smithy/chunked-blob-reader-native": "^3.0.0",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "@smithy/hash-node": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-3.0.3.tgz",
+      "integrity": "sha512-2ctBXpPMG+B3BtWSGNnKELJ7SH9e4TNefJS0cd2eSkOOROeBnnVBnAy9LtJ8tY4vUEoe55N4CNPxzbWvR39iBw==",
+      "dev": true,
+      "requires": {
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-buffer-from": "^3.0.0",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "dependencies": {
+        "@smithy/is-array-buffer": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz",
+          "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==",
+          "dev": true,
+          "requires": {
+            "tslib": "^2.6.2"
+          }
+        },
+        "@smithy/util-buffer-from": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz",
+          "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==",
+          "dev": true,
+          "requires": {
+            "@smithy/is-array-buffer": "^3.0.0",
+            "tslib": "^2.6.2"
+          }
+        },
+        "@smithy/util-utf8": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz",
+          "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==",
+          "dev": true,
+          "requires": {
+            "@smithy/util-buffer-from": "^3.0.0",
+            "tslib": "^2.6.2"
+          }
+        }
+      }
+    },
+    "@smithy/hash-stream-node": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-3.1.2.tgz",
+      "integrity": "sha512-PBgDMeEdDzi6JxKwbfBtwQG9eT9cVwsf0dZzLXoJF4sHKHs5HEo/3lJWpn6jibfJwT34I1EBXpBnZE8AxAft6g==",
       "dev": true,
       "requires": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^15.0.0",
-        "chalk": "^4.0.0"
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
+        "@smithy/is-array-buffer": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz",
+          "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==",
           "dev": true,
           "requires": {
-            "color-convert": "^2.0.1"
+            "tslib": "^2.6.2"
           }
         },
-        "chalk": {
-          "version": "4.1.0",
+        "@smithy/util-buffer-from": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz",
+          "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
+            "@smithy/is-array-buffer": "^3.0.0",
+            "tslib": "^2.6.2"
           }
         },
-        "color-convert": {
-          "version": "2.0.1",
+        "@smithy/util-utf8": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz",
+          "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==",
           "dev": true,
           "requires": {
-            "color-name": "~1.1.4"
+            "@smithy/util-buffer-from": "^3.0.0",
+            "tslib": "^2.6.2"
+          }
+        }
+      }
+    },
+    "@smithy/invalid-dependency": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-3.0.3.tgz",
+      "integrity": "sha512-ID1eL/zpDULmHJbflb864k72/SNOZCADRc9i7Exq3RUNJw6raWUSlFEQ+3PX3EYs++bTxZB2dE9mEHTQLv61tw==",
+      "dev": true,
+      "requires": {
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "@smithy/is-array-buffer": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.1.1.tgz",
+      "integrity": "sha512-xozSQrcUinPpNPNPds4S7z/FakDTh1MZWtRP/2vQtYB/u3HYrX2UXuZs+VhaKBd6Vc7g2XPr2ZtwGBNDN6fNKQ==",
+      "dev": true,
+      "requires": {
+        "tslib": "^2.5.0"
+      }
+    },
+    "@smithy/md5-js": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-3.0.3.tgz",
+      "integrity": "sha512-O/SAkGVwpWmelpj/8yDtsaVe6sINHLB1q8YE/+ZQbDxIw3SRLbTZuRaI10K12sVoENdnHqzPp5i3/H+BcZ3m3Q==",
+      "dev": true,
+      "requires": {
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "dependencies": {
+        "@smithy/is-array-buffer": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz",
+          "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==",
+          "dev": true,
+          "requires": {
+            "tslib": "^2.6.2"
           }
         },
-        "color-name": {
-          "version": "1.1.4",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "dev": true
+        "@smithy/util-buffer-from": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz",
+          "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==",
+          "dev": true,
+          "requires": {
+            "@smithy/is-array-buffer": "^3.0.0",
+            "tslib": "^2.6.2"
+          }
         },
-        "supports-color": {
-          "version": "7.2.0",
+        "@smithy/util-utf8": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz",
+          "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "@smithy/util-buffer-from": "^3.0.0",
+            "tslib": "^2.6.2"
           }
         }
       }
     },
-    "@jridgewell/doctrine": {
-      "version": "3.0.2",
+    "@smithy/middleware-content-length": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-3.0.3.tgz",
+      "integrity": "sha512-Dbz2bzexReYIQDWMr+gZhpwBetNXzbhnEMhYKA6urqmojO14CsXjnsoPYO8UL/xxcawn8ZsuVU61ElkLSltIUQ==",
       "dev": true,
       "requires": {
-        "esutils": "^2.0.2"
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       }
     },
-    "@jridgewell/resolve-uri": {
-      "version": "1.0.0",
-      "dev": true
+    "@smithy/middleware-endpoint": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-3.0.5.tgz",
+      "integrity": "sha512-V4acqqrh5tDxUEGVTOgf2lYMZqPQsoGntCrjrJZEeBzEzDry2d2vcI1QCXhGltXPPY+BMc6eksZMguA9fIY8vA==",
+      "dev": true,
+      "requires": {
+        "@smithy/middleware-serde": "^3.0.3",
+        "@smithy/node-config-provider": "^3.1.4",
+        "@smithy/shared-ini-file-loader": "^3.1.4",
+        "@smithy/types": "^3.3.0",
+        "@smithy/url-parser": "^3.0.3",
+        "@smithy/util-middleware": "^3.0.3",
+        "tslib": "^2.6.2"
+      }
     },
-    "@kristoferbaxter/async": {
-      "version": "1.0.0",
-      "dev": true
+    "@smithy/middleware-retry": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.9.tgz",
+      "integrity": "sha512-Mrv9omExU1gA7Y0VEJG2LieGfPYtwwcEiOnVGZ54a37NEMr66TJ0glFslOJFuKWG6izg5DpKIUmDV9rRxjm47Q==",
+      "dev": true,
+      "requires": {
+        "@smithy/node-config-provider": "^3.1.4",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/service-error-classification": "^3.0.3",
+        "@smithy/smithy-client": "^3.1.7",
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-middleware": "^3.0.3",
+        "@smithy/util-retry": "^3.0.3",
+        "tslib": "^2.6.2",
+        "uuid": "^9.0.1"
+      }
     },
-    "@kristoferbaxter/bytes": {
-      "version": "0.1.2",
-      "dev": true
+    "@smithy/middleware-serde": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.3.tgz",
+      "integrity": "sha512-puUbyJQBcg9eSErFXjKNiGILJGtiqmuuNKEYNYfUD57fUl4i9+mfmThtQhvFXU0hCVG0iEJhvQUipUf+/SsFdA==",
+      "dev": true,
+      "requires": {
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
+      }
     },
-    "@kristoferbaxter/kleur": {
-      "version": "4.0.2",
-      "dev": true
+    "@smithy/middleware-stack": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-3.0.3.tgz",
+      "integrity": "sha512-r4klY9nFudB0r9UdSMaGSyjyQK5adUyPnQN/ZM6M75phTxOdnc/AhpvGD1fQUvgmqjQEBGCwpnPbDm8pH5PapA==",
+      "dev": true,
+      "requires": {
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
+      }
     },
-    "@nodelib/fs.scandir": {
-      "version": "2.1.4",
+    "@smithy/node-config-provider": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.4.tgz",
+      "integrity": "sha512-YvnElQy8HR4vDcAjoy7Xkx9YT8xZP4cBXcbJSgm/kxmiQu08DwUwj8rkGnyoJTpfl/3xYHH+d8zE+eHqoDCSdQ==",
       "dev": true,
       "requires": {
-        "@nodelib/fs.stat": "2.0.4",
-        "run-parallel": "^1.1.9"
+        "@smithy/property-provider": "^3.1.3",
+        "@smithy/shared-ini-file-loader": "^3.1.4",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       }
     },
-    "@nodelib/fs.stat": {
-      "version": "2.0.4",
-      "dev": true
+    "@smithy/node-http-handler": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.1.2.tgz",
+      "integrity": "sha512-Td3rUNI7qqtoSLTsJBtsyfoG4cF/XMFmJr6Z2dX8QNzIi6tIW6YmuyFml8mJ2cNpyWNqITKbROMOFrvQjmsOvw==",
+      "dev": true,
+      "requires": {
+        "@smithy/abort-controller": "^3.1.1",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/querystring-builder": "^3.0.3",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
+      }
     },
-    "@nodelib/fs.walk": {
-      "version": "1.2.6",
+    "@smithy/property-provider": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.3.tgz",
+      "integrity": "sha512-zahyOVR9Q4PEoguJ/NrFP4O7SMAfYO1HLhB18M+q+Z4KFd4V2obiMnlVoUFzFLSPeVt1POyNWneHHrZaTMoc/g==",
       "dev": true,
       "requires": {
-        "@nodelib/fs.scandir": "2.1.4",
-        "fastq": "^1.6.0"
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       }
     },
-    "@octokit/auth-token": {
-      "version": "2.5.0",
+    "@smithy/protocol-http": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.0.3.tgz",
+      "integrity": "sha512-x5jmrCWwQlx+Zv4jAtc33ijJ+vqqYN+c/ZkrnpvEe/uDas7AT7A/4Rc2CdfxgWv4WFGmEqODIrrUToPN6DDkGw==",
       "dev": true,
       "requires": {
-        "@octokit/types": "^6.0.3"
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       }
     },
-    "@octokit/core": {
-      "version": "3.5.1",
+    "@smithy/querystring-builder": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.3.tgz",
+      "integrity": "sha512-vyWckeUeesFKzCDaRwWLUA1Xym9McaA6XpFfAK5qI9DKJ4M33ooQGqvM4J+LalH4u/Dq9nFiC8U6Qn1qi0+9zw==",
       "dev": true,
       "requires": {
-        "@octokit/auth-token": "^2.4.4",
-        "@octokit/graphql": "^4.5.8",
-        "@octokit/request": "^5.6.0",
-        "@octokit/request-error": "^2.0.5",
-        "@octokit/types": "^6.0.3",
-        "before-after-hook": "^2.2.0",
-        "universal-user-agent": "^6.0.0"
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-uri-escape": "^3.0.0",
+        "tslib": "^2.6.2"
       }
     },
-    "@octokit/endpoint": {
-      "version": "6.0.12",
+    "@smithy/querystring-parser": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.3.tgz",
+      "integrity": "sha512-zahM1lQv2YjmznnfQsWbYojFe55l0SLG/988brlLv1i8z3dubloLF+75ATRsqPBboUXsW6I9CPGE5rQgLfY0vQ==",
       "dev": true,
       "requires": {
-        "@octokit/types": "^6.0.3",
-        "is-plain-object": "^5.0.0",
-        "universal-user-agent": "^6.0.0"
-      },
-      "dependencies": {
-        "is-plain-object": {
-          "version": "5.0.0",
-          "dev": true
-        }
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       }
     },
-    "@octokit/graphql": {
-      "version": "4.8.0",
+    "@smithy/service-error-classification": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.3.tgz",
+      "integrity": "sha512-Jn39sSl8cim/VlkLsUhRFq/dKDnRUFlfRkvhOJaUbLBXUsLRLNf9WaxDv/z9BjuQ3A6k/qE8af1lsqcwm7+DaQ==",
       "dev": true,
       "requires": {
-        "@octokit/request": "^5.6.0",
-        "@octokit/types": "^6.0.3",
-        "universal-user-agent": "^6.0.0"
+        "@smithy/types": "^3.3.0"
       }
     },
-    "@octokit/openapi-types": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-11.2.0.tgz",
-      "integrity": "sha512-PBsVO+15KSlGmiI8QAzaqvsNlZlrDlyAJYcrXBCvVUxCp7VnXjkwPoFHgjEJXx3WF9BAwkA6nfCUA7i9sODzKA==",
-      "dev": true
+    "@smithy/shared-ini-file-loader": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.4.tgz",
+      "integrity": "sha512-qMxS4hBGB8FY2GQqshcRUy1K6k8aBWP5vwm8qKkCT3A9K2dawUwOIJfqh9Yste/Bl0J2lzosVyrXDj68kLcHXQ==",
+      "dev": true,
+      "requires": {
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
+      }
     },
-    "@octokit/plugin-paginate-rest": {
-      "version": "2.17.0",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.17.0.tgz",
-      "integrity": "sha512-tzMbrbnam2Mt4AhuyCHvpRkS0oZ5MvwwcQPYGtMv4tUa5kkzG58SVB0fcsLulOZQeRnOgdkZWkRUiyBlh0Bkyw==",
+    "@smithy/signature-v4": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-3.1.2.tgz",
+      "integrity": "sha512-3BcPylEsYtD0esM4Hoyml/+s7WP2LFhcM3J2AGdcL2vx9O60TtfpDOL72gjb4lU8NeRPeKAwR77YNyyGvMbuEA==",
       "dev": true,
       "requires": {
-        "@octokit/types": "^6.34.0"
+        "@smithy/is-array-buffer": "^3.0.0",
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-hex-encoding": "^3.0.0",
+        "@smithy/util-middleware": "^3.0.3",
+        "@smithy/util-uri-escape": "^3.0.0",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "dependencies": {
+        "@smithy/is-array-buffer": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz",
+          "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==",
+          "dev": true,
+          "requires": {
+            "tslib": "^2.6.2"
+          }
+        },
+        "@smithy/util-buffer-from": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz",
+          "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==",
+          "dev": true,
+          "requires": {
+            "@smithy/is-array-buffer": "^3.0.0",
+            "tslib": "^2.6.2"
+          }
+        },
+        "@smithy/util-utf8": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz",
+          "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==",
+          "dev": true,
+          "requires": {
+            "@smithy/util-buffer-from": "^3.0.0",
+            "tslib": "^2.6.2"
+          }
+        }
       }
     },
-    "@octokit/plugin-request-log": {
-      "version": "1.0.4",
+    "@smithy/smithy-client": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.1.7.tgz",
+      "integrity": "sha512-nZbJZB0XI3YnaFBWGDBr7kjaew6O0oNYNmopyIz6gKZEbxzrtH7rwvU1GcVxcSFoOwWecLJEe79fxEMljHopFQ==",
       "dev": true,
-      "requires": {}
+      "requires": {
+        "@smithy/middleware-endpoint": "^3.0.5",
+        "@smithy/middleware-stack": "^3.0.3",
+        "@smithy/protocol-http": "^4.0.3",
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-stream": "^3.0.6",
+        "tslib": "^2.6.2"
+      }
     },
-    "@octokit/plugin-rest-endpoint-methods": {
-      "version": "5.13.0",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.13.0.tgz",
-      "integrity": "sha512-uJjMTkN1KaOIgNtUPMtIXDOjx6dGYysdIFhgA52x4xSadQCz3b/zJexvITDVpANnfKPW/+E0xkOvLntqMYpviA==",
+    "@smithy/types": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.3.0.tgz",
+      "integrity": "sha512-IxvBBCTFDHbVoK7zIxqA1ZOdc4QfM5HM7rGleCuHi7L1wnKv5Pn69xXJQ9hgxH60ZVygH9/JG0jRgtUncE3QUA==",
       "dev": true,
       "requires": {
-        "@octokit/types": "^6.34.0",
-        "deprecation": "^2.3.1"
+        "tslib": "^2.6.2"
       }
     },
-    "@octokit/request": {
-      "version": "5.6.1",
+    "@smithy/url-parser": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.3.tgz",
+      "integrity": "sha512-pw3VtZtX2rg+s6HMs6/+u9+hu6oY6U7IohGhVNnjbgKy86wcIsSZwgHrFR+t67Uyxvp4Xz3p3kGXXIpTNisq8A==",
       "dev": true,
       "requires": {
-        "@octokit/endpoint": "^6.0.1",
-        "@octokit/request-error": "^2.1.0",
-        "@octokit/types": "^6.16.1",
-        "is-plain-object": "^5.0.0",
-        "node-fetch": "^2.6.1",
-        "universal-user-agent": "^6.0.0"
+        "@smithy/querystring-parser": "^3.0.3",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "@smithy/util-base64": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-3.0.0.tgz",
+      "integrity": "sha512-Kxvoh5Qtt0CDsfajiZOCpJxgtPHXOKwmM+Zy4waD43UoEMA+qPxxa98aE/7ZhdnBFZFXMOiBR5xbcaMhLtznQQ==",
+      "dev": true,
+      "requires": {
+        "@smithy/util-buffer-from": "^3.0.0",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
       },
       "dependencies": {
-        "is-plain-object": {
-          "version": "5.0.0",
-          "dev": true
+        "@smithy/is-array-buffer": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz",
+          "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==",
+          "dev": true,
+          "requires": {
+            "tslib": "^2.6.2"
+          }
+        },
+        "@smithy/util-buffer-from": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz",
+          "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==",
+          "dev": true,
+          "requires": {
+            "@smithy/is-array-buffer": "^3.0.0",
+            "tslib": "^2.6.2"
+          }
+        },
+        "@smithy/util-utf8": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz",
+          "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==",
+          "dev": true,
+          "requires": {
+            "@smithy/util-buffer-from": "^3.0.0",
+            "tslib": "^2.6.2"
+          }
         }
       }
     },
-    "@octokit/request-error": {
-      "version": "2.1.0",
+    "@smithy/util-body-length-browser": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-3.0.0.tgz",
+      "integrity": "sha512-cbjJs2A1mLYmqmyVl80uoLTJhAcfzMOyPgjwAYusWKMdLeNtzmMz9YxNl3/jRLoxSS3wkqkf0jwNdtXWtyEBaQ==",
       "dev": true,
       "requires": {
-        "@octokit/types": "^6.0.3",
-        "deprecation": "^2.0.0",
-        "once": "^1.4.0"
+        "tslib": "^2.6.2"
       }
     },
-    "@octokit/rest": {
-      "version": "18.12.0",
-      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-18.12.0.tgz",
-      "integrity": "sha512-gDPiOHlyGavxr72y0guQEhLsemgVjwRePayJ+FcKc2SJqKUbxbkvf5kAZEWA/MKvsfYlQAMVzNJE3ezQcxMJ2Q==",
+    "@smithy/util-body-length-node": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-3.0.0.tgz",
+      "integrity": "sha512-Tj7pZ4bUloNUP6PzwhN7K386tmSmEET9QtQg0TgdNOnxhZvCssHji+oZTUIuzxECRfG8rdm2PMw2WCFs6eIYkA==",
       "dev": true,
       "requires": {
-        "@octokit/core": "^3.5.1",
-        "@octokit/plugin-paginate-rest": "^2.16.8",
-        "@octokit/plugin-request-log": "^1.0.4",
-        "@octokit/plugin-rest-endpoint-methods": "^5.12.0"
+        "tslib": "^2.6.2"
       }
     },
-    "@octokit/types": {
-      "version": "6.34.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.34.0.tgz",
-      "integrity": "sha512-s1zLBjWhdEI2zwaoSgyOFoKSl109CUcVBCc7biPJ3aAf6LGLU6szDvi31JPU7bxfla2lqfhjbbg/5DdFNxOwHw==",
+    "@smithy/util-buffer-from": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.1.1.tgz",
+      "integrity": "sha512-clhNjbyfqIv9Md2Mg6FffGVrJxw7bgK7s3Iax36xnfVj6cg0fUG7I4RH0XgXJF8bxi+saY5HR21g2UPKSxVCXg==",
       "dev": true,
       "requires": {
-        "@octokit/openapi-types": "^11.2.0"
+        "@smithy/is-array-buffer": "^2.1.1",
+        "tslib": "^2.5.0"
       }
     },
-    "@sindresorhus/is": {
-      "version": "0.14.0",
-      "dev": true
+    "@smithy/util-config-provider": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-3.0.0.tgz",
+      "integrity": "sha512-pbjk4s0fwq3Di/ANL+rCvJMKM5bzAQdE5S/6RL5NXgMExFAi6UgQMPOm5yPaIWPpr+EOXKXRonJ3FoxKf4mCJQ==",
+      "dev": true,
+      "requires": {
+        "tslib": "^2.6.2"
+      }
     },
-    "@sinonjs/commons": {
-      "version": "1.8.2",
+    "@smithy/util-defaults-mode-browser": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.9.tgz",
+      "integrity": "sha512-WKPcElz92MAQG09miBdb0GxEH/MwD5GfE8g07WokITq5g6J1ROQfYCKC1wNnkqAGfrSywT7L0rdvvqlBplqiyA==",
       "dev": true,
       "requires": {
-        "type-detect": "4.0.8"
+        "@smithy/property-provider": "^3.1.3",
+        "@smithy/smithy-client": "^3.1.7",
+        "@smithy/types": "^3.3.0",
+        "bowser": "^2.11.0",
+        "tslib": "^2.6.2"
       }
     },
-    "@sinonjs/fake-timers": {
-      "version": "7.1.2",
+    "@smithy/util-defaults-mode-node": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.9.tgz",
+      "integrity": "sha512-dQLrUqFxqpf0GvEKEuFdgXcdZwz6oFm752h4d6C7lQz+RLddf761L2r7dSwGWzESMMB3wKj0jL+skRhEGlecjw==",
+      "dev": true,
+      "requires": {
+        "@smithy/config-resolver": "^3.0.5",
+        "@smithy/credential-provider-imds": "^3.1.4",
+        "@smithy/node-config-provider": "^3.1.4",
+        "@smithy/property-provider": "^3.1.3",
+        "@smithy/smithy-client": "^3.1.7",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "@smithy/util-endpoints": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-2.0.5.tgz",
+      "integrity": "sha512-ReQP0BWihIE68OAblC/WQmDD40Gx+QY1Ez8mTdFMXpmjfxSyz2fVQu3A4zXRfQU9sZXtewk3GmhfOHswvX+eNg==",
+      "dev": true,
+      "requires": {
+        "@smithy/node-config-provider": "^3.1.4",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "@smithy/util-hex-encoding": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-3.0.0.tgz",
+      "integrity": "sha512-eFndh1WEK5YMUYvy3lPlVmYY/fZcQE1D8oSf41Id2vCeIkKJXPcYDCZD+4+xViI6b1XSd7tE+s5AmXzz5ilabQ==",
+      "dev": true,
+      "requires": {
+        "tslib": "^2.6.2"
+      }
+    },
+    "@smithy/util-middleware": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.3.tgz",
+      "integrity": "sha512-l+StyYYK/eO3DlVPbU+4Bi06Jjal+PFLSMmlWM1BEwyLxZ3aKkf1ROnoIakfaA7mC6uw3ny7JBkau4Yc+5zfWw==",
+      "dev": true,
+      "requires": {
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "@smithy/util-retry": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.3.tgz",
+      "integrity": "sha512-AFw+hjpbtVApzpNDhbjNG5NA3kyoMs7vx0gsgmlJF4s+yz1Zlepde7J58zpIRIsdjc+emhpAITxA88qLkPF26w==",
+      "dev": true,
+      "requires": {
+        "@smithy/service-error-classification": "^3.0.3",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "@smithy/util-stream": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.0.6.tgz",
+      "integrity": "sha512-w9i//7egejAIvplX821rPWWgaiY1dxsQUw0hXX7qwa/uZ9U3zplqTQ871jWadkcVB9gFDhkPWYVZf4yfFbZ0xA==",
+      "dev": true,
+      "requires": {
+        "@smithy/fetch-http-handler": "^3.2.1",
+        "@smithy/node-http-handler": "^3.1.2",
+        "@smithy/types": "^3.3.0",
+        "@smithy/util-base64": "^3.0.0",
+        "@smithy/util-buffer-from": "^3.0.0",
+        "@smithy/util-hex-encoding": "^3.0.0",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "dependencies": {
+        "@smithy/is-array-buffer": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz",
+          "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==",
+          "dev": true,
+          "requires": {
+            "tslib": "^2.6.2"
+          }
+        },
+        "@smithy/util-buffer-from": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz",
+          "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==",
+          "dev": true,
+          "requires": {
+            "@smithy/is-array-buffer": "^3.0.0",
+            "tslib": "^2.6.2"
+          }
+        },
+        "@smithy/util-utf8": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz",
+          "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==",
+          "dev": true,
+          "requires": {
+            "@smithy/util-buffer-from": "^3.0.0",
+            "tslib": "^2.6.2"
+          }
+        }
+      }
+    },
+    "@smithy/util-uri-escape": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-3.0.0.tgz",
+      "integrity": "sha512-LqR7qYLgZTD7nWLBecUi4aqolw8Mhza9ArpNEQ881MJJIU2sE5iHCK6TdyqqzcDLy0OPe10IY4T8ctVdtynubg==",
+      "dev": true,
+      "requires": {
+        "tslib": "^2.6.2"
+      }
+    },
+    "@smithy/util-utf8": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.1.1.tgz",
+      "integrity": "sha512-BqTpzYEcUMDwAKr7/mVRUtHDhs6ZoXDi9NypMvMfOr/+u1NW7JgqodPDECiiLboEm6bobcPcECxzjtQh865e9A==",
       "dev": true,
       "requires": {
-        "@sinonjs/commons": "^1.7.0"
+        "@smithy/util-buffer-from": "^2.1.1",
+        "tslib": "^2.5.0"
       }
     },
-    "@sinonjs/samsam": {
-      "version": "6.0.2",
+    "@smithy/util-waiter": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-3.1.2.tgz",
+      "integrity": "sha512-4pP0EV3iTsexDx+8PPGAKCQpd/6hsQBaQhqWzU4hqKPHN5epPsxKbvUTIiYIHTxaKt6/kEaqPBpu/ufvfbrRzw==",
       "dev": true,
       "requires": {
-        "@sinonjs/commons": "^1.6.0",
-        "lodash.get": "^4.4.2",
-        "type-detect": "^4.0.8"
+        "@smithy/abort-controller": "^3.1.1",
+        "@smithy/types": "^3.3.0",
+        "tslib": "^2.6.2"
       }
     },
-    "@sinonjs/text-encoding": {
-      "version": "0.7.1",
+    "@socket.io/component-emitter": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
+      "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==",
       "dev": true
     },
-    "@szmarczak/http-timer": {
-      "version": "1.1.2",
+    "@thisismanta/pessimist": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@thisismanta/pessimist/-/pessimist-1.2.0.tgz",
+      "integrity": "sha512-rm8/zjNMuO9hPYhEMavVIIxmvawJJB8mthvbVXd74XUW7V/SbgmtDBQjICbCWKjluvA+gh+cqi7dv85/jexknA==",
       "dev": true,
       "requires": {
-        "defer-to-connect": "^1.0.1"
+        "lodash": "^4.17.21"
       }
     },
-    "@tootallnate/once": {
-      "version": "1.1.2",
+    "@tootallnate/quickjs-emscripten": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz",
+      "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==",
       "dev": true
     },
     "@trysound/sax": {
-      "version": "0.1.1",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
+      "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
       "dev": true
     },
     "@types/babel__core": {
-      "version": "7.1.16",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.16.tgz",
-      "integrity": "sha512-EAEHtisTMM+KaKwfWdC3oyllIqswlznXCIVCt7/oRNrh+DhgT4UEBNC/jlADNjvw7UnfbcdkGQcPVZ1xYiLcrQ==",
+      "version": "7.20.5",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
+      "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
       "dev": true,
       "requires": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0",
+        "@babel/parser": "^7.20.7",
+        "@babel/types": "^7.20.7",
         "@types/babel__generator": "*",
         "@types/babel__template": "*",
         "@types/babel__traverse": "*"
       }
     },
     "@types/babel__generator": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.3.tgz",
-      "integrity": "sha512-/GWCmzJWqV7diQW54smJZzWbSFf4QYtF71WCKhcx6Ru/tFyQIY2eiiITcCAeuPbNSvT9YCGkVMqqvSk2Z0mXiA==",
+      "version": "7.6.8",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
+      "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
       "dev": true,
       "requires": {
         "@babel/types": "^7.0.0"
       }
     },
     "@types/babel__template": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
-      "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
+      "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
       "dev": true,
       "requires": {
         "@babel/parser": "^7.1.0",
@@ -26126,22 +28604,18 @@
       }
     },
     "@types/babel__traverse": {
-      "version": "7.14.2",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.14.2.tgz",
-      "integrity": "sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==",
+      "version": "7.20.5",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.5.tgz",
+      "integrity": "sha512-WXCyOcRtH37HAUkpXhUduaxdm82b4GSlyTqajXviN4EfiuPgNYR109xMCKvpl6zPIpua0DGlMEDCq+g8EdoheQ==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.3.0"
+        "@babel/types": "^7.20.7"
       }
     },
     "@types/chai": {
-      "version": "4.2.22",
-      "dev": true
-    },
-    "@types/component-emitter": {
-      "version": "1.2.11",
-      "resolved": "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.11.tgz",
-      "integrity": "sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ==",
+      "version": "4.3.16",
+      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.16.tgz",
+      "integrity": "sha512-PatH4iOdyh3MyWtmHVFXLWCCIhUbopaltqddG9BzB+gMIzee2MJrvd+jouii9Z3wzQJruGWAm7WOMjgfG8hQlQ==",
       "dev": true
     },
     "@types/cookie": {
@@ -26151,15 +28625,27 @@
       "dev": true
     },
     "@types/cors": {
-      "version": "2.8.12",
-      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz",
-      "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==",
-      "dev": true
+      "version": "2.8.17",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.17.tgz",
+      "integrity": "sha512-8CGDvrBj1zgo2qE+oS3pOCyYNqCPryMWY2bGfwA0dcfopWGgxs+78df0Rs3rc9THP4JkOhLsAa+15VdpAqkcUA==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/dompurify": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/@types/dompurify/-/dompurify-2.4.0.tgz",
+      "integrity": "sha512-IDBwO5IZhrKvHFUl+clZxgf3hn2b/lU6H1KaBShPkQyGJUQ0xwebezIPSuiyGwfz1UzJWQl4M7BDxtHtCCPlTg==",
+      "dev": true,
+      "requires": {
+        "@types/trusted-types": "*"
+      }
     },
     "@types/eslint": {
-      "version": "7.28.2",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.28.2.tgz",
-      "integrity": "sha512-KubbADPkfoU75KgKeKLsFHXnU4ipH7wYg0TRT33NK3N3yiu7jlFAAoygIWBV+KbuHx/G+AvuGX6DllnK35gfJA==",
+      "version": "8.56.12",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.12.tgz",
+      "integrity": "sha512-03ruubjWyOHlmljCVoxSuNDdmfZDzsrrz0P2LeJsOXr+ZwFQ+0yQIwNCwt/GYhV7Z31fgtXJTAEs+FYlEL851g==",
       "dev": true,
       "requires": {
         "@types/estree": "*",
@@ -26167,20 +28653,25 @@
       }
     },
     "@types/estree": {
-      "version": "0.0.50",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
+      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
       "dev": true
     },
     "@types/fs-extra": {
-      "version": "9.0.13",
+      "version": "11.0.4",
+      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-11.0.4.tgz",
+      "integrity": "sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ==",
       "dev": true,
       "requires": {
+        "@types/jsonfile": "*",
         "@types/node": "*"
       }
     },
     "@types/graceful-fs": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
-      "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
+      "version": "4.1.9",
+      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
+      "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
       "dev": true,
       "requires": {
         "@types/node": "*"
@@ -26205,50 +28696,82 @@
       }
     },
     "@types/json-schema": {
-      "version": "7.0.9",
+      "version": "7.0.15",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
       "dev": true
     },
     "@types/json5": {
       "version": "0.0.29",
       "dev": true
     },
+    "@types/jsonfile": {
+      "version": "6.1.4",
+      "resolved": "https://registry.npmjs.org/@types/jsonfile/-/jsonfile-6.1.4.tgz",
+      "integrity": "sha512-D5qGUYwjvnNNextdU59/+fI+spnwtTFmyQP0h+PfIOSkNfpU6AOICUOkm4i0OnSk+NyjdPJrxCDro0sJsWlRpQ==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
     "@types/klaw": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/klaw/-/klaw-3.0.3.tgz",
-      "integrity": "sha512-mXlRDFbTLpVysvxahXUQav0hFctgu3Fqr2xmSrpf/ptO/FwOp7SFEGsJkEihwshMbof3/BIiVJ/o42cuOOuv6g==",
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@types/klaw/-/klaw-3.0.6.tgz",
+      "integrity": "sha512-BErW5TrTz4nzt/c3VRGf0Bug4JyQJ1o807F4mAfXfvOzFZ8SKgFeHJ0T28Y1KtqlMEB+cUgN7S7CsyQDQ/qxqg==",
       "dev": true,
       "requires": {
         "@types/node": "*"
       }
     },
     "@types/minimist": {
-      "version": "1.2.2",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==",
       "dev": true
     },
     "@types/mocha": {
-      "version": "8.2.3",
+      "version": "10.0.7",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.7.tgz",
+      "integrity": "sha512-GN8yJ1mNTcFcah/wKEFIJckJx9iJLoMSzWcfRRuxz/Jk+U6KQNnml+etbtxFK8lPjzOw3zp4Ha/kjSst9fsHYw==",
       "dev": true
     },
     "@types/node": {
-      "version": "14.17.32",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.32.tgz",
-      "integrity": "sha512-JcII3D5/OapPGx+eJ+Ik1SQGyt6WvuqdRfh9jUwL6/iHGjmyOriBDciBUu7lEIBTL2ijxwrR70WUnw5AEDmFvQ==",
-      "dev": true
+      "version": "18.19.39",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.39.tgz",
+      "integrity": "sha512-nPwTRDKUctxw3di5b4TfT3I0sWDiWoPQCZjXhvdkINntwr8lcoVCKsTgnXeRubKIlfnV+eN/HYk6Jb40tbcEAQ==",
+      "dev": true,
+      "requires": {
+        "undici-types": "~5.26.4"
+      }
     },
-    "@types/normalize-package-data": {
-      "version": "2.4.0",
+    "@types/stack-utils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
+      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
       "dev": true
     },
-    "@types/prettier": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.1.tgz",
-      "integrity": "sha512-Fo79ojj3vdEZOHg3wR9ksAMRz4P3S5fDB5e/YWZiFnyFQI1WY2Vftu9XoXVVtJfxB7Bpce/QTqWSSntkz2Znrw==",
-      "dev": true
+    "@types/tar": {
+      "version": "6.1.13",
+      "resolved": "https://registry.npmjs.org/@types/tar/-/tar-6.1.13.tgz",
+      "integrity": "sha512-IznnlmU5f4WcGTh2ltRu/Ijpmk8wiWXfF0VA4s+HPjHZgvFggk1YaIkbo5krX/zUCzWF8N/l4+W/LNxnvAJ8nw==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*",
+        "minipass": "^4.0.0"
+      },
+      "dependencies": {
+        "minipass": {
+          "version": "4.2.8",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz",
+          "integrity": "sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==",
+          "dev": true
+        }
+      }
     },
-    "@types/stack-utils": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
-      "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
+    "@types/trusted-types": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.2.tgz",
+      "integrity": "sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg==",
       "dev": true
     },
     "@types/yargs": {
@@ -26262,65 +28785,198 @@
       "version": "20.2.0",
       "dev": true
     },
-    "@ungap/promise-all-settled": {
-      "version": "1.1.2",
-      "dev": true
+    "@typescript-eslint/eslint-plugin": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.18.0.tgz",
+      "integrity": "sha512-94EQTWZ40mzBc42ATNIBimBEDltSJ9RQHCC8vc/PDbxi4k8dVwUAv4o98dk50M1zB+JGFxp43FP7f8+FP8R6Sw==",
+      "dev": true,
+      "requires": {
+        "@eslint-community/regexpp": "^4.10.0",
+        "@typescript-eslint/scope-manager": "7.18.0",
+        "@typescript-eslint/type-utils": "7.18.0",
+        "@typescript-eslint/utils": "7.18.0",
+        "@typescript-eslint/visitor-keys": "7.18.0",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.3.1",
+        "natural-compare": "^1.4.0",
+        "ts-api-utils": "^1.3.0"
+      }
     },
-    "@webcomponents/webcomponentsjs": {
-      "version": "2.6.0"
+    "@typescript-eslint/parser": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.18.0.tgz",
+      "integrity": "sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/scope-manager": "7.18.0",
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/typescript-estree": "7.18.0",
+        "@typescript-eslint/visitor-keys": "7.18.0",
+        "debug": "^4.3.4"
+      }
     },
-    "abab": {
-      "version": "2.0.5",
+    "@typescript-eslint/scope-manager": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz",
+      "integrity": "sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/visitor-keys": "7.18.0"
+      }
+    },
+    "@typescript-eslint/type-utils": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz",
+      "integrity": "sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/typescript-estree": "7.18.0",
+        "@typescript-eslint/utils": "7.18.0",
+        "debug": "^4.3.4",
+        "ts-api-utils": "^1.3.0"
+      }
+    },
+    "@typescript-eslint/types": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
+      "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",
       "dev": true
     },
-    "abbrev": {
-      "version": "1.0.9",
+    "@typescript-eslint/typescript-estree": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz",
+      "integrity": "sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/visitor-keys": "7.18.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^1.3.0"
+      }
+    },
+    "@typescript-eslint/utils": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.18.0.tgz",
+      "integrity": "sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==",
+      "dev": true,
+      "requires": {
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "@typescript-eslint/scope-manager": "7.18.0",
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/typescript-estree": "7.18.0"
+      }
+    },
+    "@typescript-eslint/visitor-keys": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz",
+      "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/types": "7.18.0",
+        "eslint-visitor-keys": "^3.4.3"
+      }
+    },
+    "@ungap/structured-clone": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
+      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
       "dev": true
     },
-    "abort-controller": {
-      "version": "3.0.0",
+    "@use-gesture/core": {
+      "version": "10.2.10",
+      "resolved": "https://registry.npmjs.org/@use-gesture/core/-/core-10.2.10.tgz",
+      "integrity": "sha512-7WFIDfeTB+7RBui8YOrB2xbgmvMsvaCDjyzrdvECKkgOpIynNSdhlLXjiFuqQMtnK71IL/9WNZNU0P8xuaLuUQ=="
+    },
+    "@use-gesture/react": {
+      "version": "10.2.10",
+      "resolved": "https://registry.npmjs.org/@use-gesture/react/-/react-10.2.10.tgz",
+      "integrity": "sha512-znChnKVAMMGXD9J7fCKN686BJNBlUJaRtCu92IQXVWdcxg4MqS0SgsBslGnTWXTlsHVkg5zcGjKYf7qYkOf0Rg==",
+      "requires": {
+        "@use-gesture/core": "10.2.10"
+      }
+    },
+    "@vercel/nft": {
+      "version": "0.26.5",
+      "resolved": "https://registry.npmjs.org/@vercel/nft/-/nft-0.26.5.tgz",
+      "integrity": "sha512-NHxohEqad6Ra/r4lGknO52uc/GrWILXAMs1BB4401GTqww0fw1bAqzpG1XHuDO+dprg4GvsD9ZLLSsdo78p9hQ==",
       "dev": true,
       "requires": {
-        "event-target-shim": "^5.0.0"
+        "@mapbox/node-pre-gyp": "^1.0.5",
+        "@rollup/pluginutils": "^4.0.0",
+        "acorn": "^8.6.0",
+        "acorn-import-attributes": "^1.9.2",
+        "async-sema": "^3.1.1",
+        "bindings": "^1.4.0",
+        "estree-walker": "2.0.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.2",
+        "node-gyp-build": "^4.2.2",
+        "resolve-from": "^5.0.0"
       }
     },
+    "@webcomponents/webcomponentsjs": {
+      "version": "2.6.0"
+    },
+    "abbrev": {
+      "version": "1.0.9",
+      "dev": true
+    },
     "accepts": {
-      "version": "1.3.7",
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
       "dev": true,
       "requires": {
-        "mime-types": "~2.1.24",
-        "negotiator": "0.6.2"
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
       }
     },
     "acorn": {
-      "version": "8.1.0",
+      "version": "8.12.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
+      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
       "dev": true
     },
     "acorn-globals": {
-      "version": "6.0.0",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-7.0.1.tgz",
+      "integrity": "sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==",
       "dev": true,
       "requires": {
-        "acorn": "^7.1.1",
-        "acorn-walk": "^7.1.1"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "7.4.1",
-          "dev": true
-        }
+        "acorn": "^8.1.0",
+        "acorn-walk": "^8.0.2"
       }
     },
+    "acorn-import-attributes": {
+      "version": "1.9.5",
+      "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
+      "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
+      "dev": true,
+      "requires": {}
+    },
     "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": {}
     },
     "acorn-walk": {
-      "version": "7.2.0",
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz",
+      "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==",
       "dev": true
     },
     "agent-base": {
       "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
       "dev": true,
       "requires": {
         "debug": "4"
@@ -26334,66 +28990,55 @@
         "indent-string": "^4.0.0"
       }
     },
-    "airbnb-prop-types": {
-      "version": "2.16.0",
-      "requires": {
-        "array.prototype.find": "^2.1.1",
-        "function.prototype.name": "^1.1.2",
-        "is-regex": "^1.1.0",
-        "object-is": "^1.1.2",
-        "object.assign": "^4.1.0",
-        "object.entries": "^1.1.2",
-        "prop-types": "^15.7.2",
-        "prop-types-exact": "^1.2.0",
-        "react-is": "^16.13.1"
-      }
-    },
     "ajv": {
-      "version": "8.6.3",
+      "version": "8.16.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.16.0.tgz",
+      "integrity": "sha512-F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw==",
       "dev": true,
       "requires": {
-        "fast-deep-equal": "^3.1.1",
+        "fast-deep-equal": "^3.1.3",
         "json-schema-traverse": "^1.0.0",
         "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
+        "uri-js": "^4.4.1"
       }
     },
     "ajv-formats": {
       "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
       "dev": true,
       "requires": {
         "ajv": "^8.0.0"
       }
     },
-    "alphanum-sort": {
-      "version": "1.0.2",
-      "dev": true
-    },
     "amdefine": {
       "version": "1.0.1",
       "dev": true,
       "optional": true
     },
     "amphtml-validator": {
-      "version": "1.0.35",
+      "version": "1.0.38",
+      "resolved": "https://registry.npmjs.org/amphtml-validator/-/amphtml-validator-1.0.38.tgz",
+      "integrity": "sha512-TqGeHVRUEsMiJoaRvMhzZBv8oljLhhJgzkaPX/zT2eJFG5FLeaMehd6riNwsuMmi9e/5xsI0pocbTgN/u2sonQ==",
       "dev": true,
       "requires": {
         "colors": "1.4.0",
-        "commander": "7.2.0",
-        "promise": "8.1.0"
-      }
-    },
-    "ansi-align": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz",
-      "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==",
-      "dev": true,
-      "requires": {
-        "string-width": "^4.1.0"
+        "commander": "12.0.0",
+        "promise": "8.3.0"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "12.0.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-12.0.0.tgz",
+          "integrity": "sha512-MwVNWlYjDTtOjX5PiD7o5pK0UrFU/OYgcJfjjK4RaHZETNtjJqrZa9Y9ds88+A+f+d5lv+561eZ+yCKoS3gbAA==",
+          "dev": true
+        }
       }
     },
     "ansi-colors": {
-      "version": "4.1.1",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
+      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
       "dev": true
     },
     "ansi-escapes": {
@@ -26444,10 +29089,6 @@
       "version": "0.1.0",
       "dev": true
     },
-    "any-promise": {
-      "version": "1.3.0",
-      "dev": true
-    },
     "anymatch": {
       "version": "3.1.2",
       "dev": true,
@@ -26456,17 +29097,16 @@
         "picomatch": "^2.0.4"
       }
     },
-    "append-buffer": {
-      "version": "1.0.2",
-      "dev": true,
-      "requires": {
-        "buffer-equal": "^1.0.0"
-      }
-    },
     "append-field": {
       "version": "1.0.0",
       "dev": true
     },
+    "aproba": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
+      "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==",
+      "dev": true
+    },
     "archiver": {
       "version": "0.14.4",
       "dev": true,
@@ -26529,6 +29169,35 @@
         }
       }
     },
+    "are-docs-informative": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/are-docs-informative/-/are-docs-informative-0.0.2.tgz",
+      "integrity": "sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==",
+      "dev": true
+    },
+    "are-we-there-yet": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
+      "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
+      "dev": true,
+      "requires": {
+        "delegates": "^1.0.0",
+        "readable-stream": "^3.6.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.2",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+          "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
+      }
+    },
     "argparse": {
       "version": "1.0.10",
       "dev": true,
@@ -26536,21 +29205,15 @@
         "sprintf-js": "~1.0.2"
       }
     },
-    "argv": {
-      "version": "0.0.2",
-      "dev": true
-    },
-    "arr-diff": {
-      "version": "4.0.0",
-      "dev": true
-    },
-    "arr-flatten": {
-      "version": "1.1.0",
-      "dev": true
-    },
-    "arr-union": {
-      "version": "3.1.0",
-      "dev": true
+    "array-buffer-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
+      "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.5",
+        "is-array-buffer": "^3.0.4"
+      }
     },
     "array-filter": {
       "version": "1.0.0",
@@ -26560,63 +29223,109 @@
       "version": "1.0.2",
       "dev": true
     },
+    "array-flatten": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
+      "dev": true
+    },
     "array-includes": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.4.tgz",
-      "integrity": "sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==",
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz",
+      "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1",
-        "get-intrinsic": "^1.1.1",
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
         "is-string": "^1.0.7"
-      },
-      "dependencies": {
-        "get-intrinsic": {
-          "version": "1.1.1",
-          "dev": true,
-          "requires": {
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1"
-          }
-        }
       }
     },
     "array-union": {
       "version": "2.1.0",
       "dev": true
     },
-    "array-unique": {
-      "version": "0.3.2",
-      "dev": true
+    "array.prototype.findlast": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz",
+      "integrity": "sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-shim-unscopables": "^1.0.2"
+      }
     },
-    "array.prototype.find": {
-      "version": "2.1.1",
+    "array.prototype.findlastindex": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz",
+      "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==",
+      "dev": true,
       "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.4"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-shim-unscopables": "^1.0.2"
       }
     },
     "array.prototype.flat": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz",
-      "integrity": "sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
+      "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==",
+      "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "es-shim-unscopables": "^1.0.0"
       }
     },
     "array.prototype.flatmap": {
-      "version": "1.2.4",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
+      "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.1",
-        "function-bind": "^1.1.1"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "es-shim-unscopables": "^1.0.0"
+      }
+    },
+    "array.prototype.tosorted": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz",
+      "integrity": "sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.3",
+        "es-errors": "^1.3.0",
+        "es-shim-unscopables": "^1.0.2"
+      }
+    },
+    "arraybuffer.prototype.slice": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz",
+      "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==",
+      "dev": true,
+      "requires": {
+        "array-buffer-byte-length": "^1.0.1",
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.22.3",
+        "es-errors": "^1.2.1",
+        "get-intrinsic": "^1.2.3",
+        "is-array-buffer": "^3.0.4",
+        "is-shared-array-buffer": "^1.0.2"
       }
     },
     "arrgv": {
@@ -26624,32 +29333,19 @@
       "dev": true
     },
     "arrify": {
-      "version": "2.0.1",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-3.0.0.tgz",
+      "integrity": "sha512-tLkvA81vQG/XqE2mjDkGQHoOINtMHtysSnemrmoGe6PydDPMRbVugqyk4A6V/WDWEfm3l+0d8anA9r8cv/5Jaw==",
       "dev": true
     },
     "asap": {
       "version": "2.0.6",
       "dev": true
     },
-    "asn1": {
-      "version": "0.2.4",
-      "dev": true,
-      "requires": {
-        "safer-buffer": "~2.1.0"
-      }
-    },
-    "assert-plus": {
-      "version": "1.0.0",
-      "dev": true
-    },
     "assertion-error": {
       "version": "1.1.0",
       "dev": true
     },
-    "assign-symbols": {
-      "version": "1.0.0",
-      "dev": true
-    },
     "ast-replace": {
       "version": "1.1.3",
       "dev": true,
@@ -26670,23 +29366,20 @@
       "version": "0.6.16",
       "dev": true
     },
-    "astral-regex": {
-      "version": "2.0.0",
-      "dev": true
-    },
     "async": {
       "version": "0.9.2",
-      "dev": true
-    },
-    "async-retry": {
-      "version": "1.3.3",
-      "dev": true,
-      "requires": {
-        "retry": "0.13.1"
-      }
+      "dev": true
+    },
+    "async-sema": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/async-sema/-/async-sema-3.1.1.tgz",
+      "integrity": "sha512-tLRNUXati5MFePdAk8dw7Qt7DpxPB60ofAgn8WRhW6a2rcimZnYBP9oxHiv0OHy+Wz7kPMG+t4LGdt31+4EmGg==",
+      "dev": true
     },
     "asynckit": {
       "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
       "dev": true
     },
     "atob": {
@@ -26701,156 +29394,345 @@
       }
     },
     "autoprefixer": {
-      "version": "10.3.7",
+      "version": "10.4.19",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.19.tgz",
+      "integrity": "sha512-BaENR2+zBZ8xXhM4pUaKUxlVdxZ0EZhjvbopwnXmxRUfqDmwSpC2lAi/QXvx7NRdPCo1WKEcEF6mV64si1z4Ew==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.17.3",
-        "caniuse-lite": "^1.0.30001264",
-        "fraction.js": "^4.1.1",
+        "browserslist": "^4.23.0",
+        "caniuse-lite": "^1.0.30001599",
+        "fraction.js": "^4.3.7",
         "normalize-range": "^0.1.2",
-        "picocolors": "^0.2.1",
-        "postcss-value-parser": "^4.1.0"
+        "picocolors": "^1.0.0",
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "ava": {
-      "version": "3.15.0",
+      "version": "6.1.3",
+      "resolved": "https://registry.npmjs.org/ava/-/ava-6.1.3.tgz",
+      "integrity": "sha512-tkKbpF1pIiC+q09wNU9OfyTDYZa8yuWvU2up3+lFJ3lr1RmnYh2GBpPwzYUEB0wvTPIUysGjcZLNZr7STDviRA==",
       "dev": true,
       "requires": {
-        "@concordance/react": "^2.0.0",
-        "acorn": "^8.0.4",
-        "acorn-walk": "^8.0.0",
-        "ansi-styles": "^5.0.0",
+        "@vercel/nft": "^0.26.2",
+        "acorn": "^8.11.3",
+        "acorn-walk": "^8.3.2",
+        "ansi-styles": "^6.2.1",
         "arrgv": "^1.0.2",
-        "arrify": "^2.0.1",
-        "callsites": "^3.1.0",
-        "chalk": "^4.1.0",
-        "chokidar": "^3.4.3",
+        "arrify": "^3.0.0",
+        "callsites": "^4.1.0",
+        "cbor": "^9.0.1",
+        "chalk": "^5.3.0",
         "chunkd": "^2.0.1",
-        "ci-info": "^2.0.0",
+        "ci-info": "^4.0.0",
         "ci-parallel-vars": "^1.0.1",
-        "clean-yaml-object": "^0.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-truncate": "^2.1.0",
-        "code-excerpt": "^3.0.0",
+        "cli-truncate": "^4.0.0",
+        "code-excerpt": "^4.0.0",
         "common-path-prefix": "^3.0.0",
-        "concordance": "^5.0.1",
-        "convert-source-map": "^1.7.0",
+        "concordance": "^5.0.4",
         "currently-unhandled": "^0.4.1",
-        "debug": "^4.3.1",
-        "del": "^6.0.0",
-        "emittery": "^0.8.0",
-        "equal-length": "^1.0.0",
-        "figures": "^3.2.0",
-        "globby": "^11.0.1",
-        "ignore-by-default": "^2.0.0",
-        "import-local": "^3.0.2",
-        "indent-string": "^4.0.0",
-        "is-error": "^2.2.2",
+        "debug": "^4.3.4",
+        "emittery": "^1.0.1",
+        "figures": "^6.0.1",
+        "globby": "^14.0.0",
+        "ignore-by-default": "^2.1.0",
+        "indent-string": "^5.0.0",
         "is-plain-object": "^5.0.0",
         "is-promise": "^4.0.0",
-        "lodash": "^4.17.20",
-        "matcher": "^3.0.0",
-        "md5-hex": "^3.0.1",
-        "mem": "^8.0.0",
+        "matcher": "^5.0.0",
+        "memoize": "^10.0.0",
         "ms": "^2.1.3",
-        "ora": "^5.2.0",
-        "p-event": "^4.2.0",
-        "p-map": "^4.0.0",
-        "picomatch": "^2.2.2",
-        "pkg-conf": "^3.1.0",
-        "plur": "^4.0.0",
-        "pretty-ms": "^7.0.1",
-        "read-pkg": "^5.2.0",
+        "p-map": "^7.0.1",
+        "package-config": "^5.0.0",
+        "picomatch": "^3.0.1",
+        "plur": "^5.1.0",
+        "pretty-ms": "^9.0.0",
         "resolve-cwd": "^3.0.0",
-        "slash": "^3.0.0",
-        "source-map-support": "^0.5.19",
-        "stack-utils": "^2.0.3",
-        "strip-ansi": "^6.0.0",
-        "supertap": "^2.0.0",
-        "temp-dir": "^2.0.0",
-        "trim-off-newlines": "^1.0.1",
-        "update-notifier": "^5.0.1",
-        "write-file-atomic": "^3.0.3",
-        "yargs": "^16.2.0"
+        "stack-utils": "^2.0.6",
+        "strip-ansi": "^7.1.0",
+        "supertap": "^3.0.1",
+        "temp-dir": "^3.0.0",
+        "write-file-atomic": "^5.0.1",
+        "yargs": "^17.7.2"
       },
       "dependencies": {
-        "acorn-walk": {
-          "version": "8.0.2",
+        "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
         },
         "ansi-styles": {
-          "version": "5.1.0",
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+          "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+          "dev": true
+        },
+        "callsites": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/callsites/-/callsites-4.2.0.tgz",
+          "integrity": "sha512-kfzR4zzQtAE9PC7CzZsjl3aBNbXWuXiSeOCdLcPpBfGW8YuCqQHcRPFDbr/BPVmd3EEPVpuFzLyuT/cUhPr4OQ==",
           "dev": true
         },
         "chalk": {
-          "version": "4.1.0",
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+          "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+          "dev": true
+        },
+        "ci-info": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.0.0.tgz",
+          "integrity": "sha512-TdHqgGf9odd8SXNuxtUBVx8Nv+qZOejE6qyqiy5NtbYYQOeFa6zmHkxlPzmaLxWWHsU6nJmB7AETdVPi+2NBUg==",
+          "dev": true
+        },
+        "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": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.1",
+            "wrap-ansi": "^7.0.0"
           },
           "dependencies": {
-            "ansi-styles": {
-              "version": "4.3.0",
+            "ansi-regex": {
+              "version": "5.0.1",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+              "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+              "dev": true
+            },
+            "strip-ansi": {
+              "version": "6.0.1",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+              "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
               "dev": true,
               "requires": {
-                "color-convert": "^2.0.1"
+                "ansi-regex": "^5.0.1"
               }
             }
           }
         },
-        "color-convert": {
-          "version": "2.0.1",
+        "globby": {
+          "version": "14.0.2",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.2.tgz",
+          "integrity": "sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw==",
           "dev": true,
           "requires": {
-            "color-name": "~1.1.4"
+            "@sindresorhus/merge-streams": "^2.1.0",
+            "fast-glob": "^3.3.2",
+            "ignore": "^5.2.4",
+            "path-type": "^5.0.0",
+            "slash": "^5.1.0",
+            "unicorn-magic": "^0.1.0"
           }
         },
-        "color-name": {
-          "version": "1.1.4",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
+        "indent-string": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-5.0.0.tgz",
+          "integrity": "sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==",
           "dev": true
         },
         "is-plain-object": {
           "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+          "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
           "dev": true
         },
         "ms": {
           "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
           "dev": true
         },
-        "supports-color": {
-          "version": "7.2.0",
+        "p-map": {
+          "version": "7.0.2",
+          "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.2.tgz",
+          "integrity": "sha512-z4cYYMMdKHzw4O5UkWJImbZynVIo0lSGTXc7bzB1e/rrDqkgGUNysK/o4bTr+0+xKvvLoTyGqYC4Fgljy9qe1Q==",
+          "dev": true
+        },
+        "path-type": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz",
+          "integrity": "sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==",
+          "dev": true
+        },
+        "picomatch": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-3.0.1.tgz",
+          "integrity": "sha512-I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag==",
+          "dev": true
+        },
+        "signal-exit": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+          "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+          "dev": true
+        },
+        "slash": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
+          "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+          "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "ansi-regex": "^6.0.1"
+          }
+        },
+        "temp-dir": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-3.0.0.tgz",
+          "integrity": "sha512-nHc6S/bwIilKHNRgK/3jlhDoIHcp45YgyiwcAk46Tr0LfEqGBVpmiAyuiuxeVE44m3mXnEeVhaipLOEWmH+Njw==",
+          "dev": true
+        },
+        "write-file-atomic": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
+          "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
+          "dev": true,
+          "requires": {
+            "imurmurhash": "^0.1.4",
+            "signal-exit": "^4.0.1"
+          }
+        },
+        "yargs": {
+          "version": "17.7.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+          "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+          "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
         }
       }
     },
     "available-typed-arrays": {
-      "version": "1.0.4",
-      "dev": true
-    },
-    "aws-sign2": {
-      "version": "0.7.0",
-      "dev": true
-    },
-    "aws4": {
-      "version": "1.11.0",
-      "dev": true
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
+      "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
+      "dev": true,
+      "requires": {
+        "possible-typed-array-names": "^1.0.0"
+      }
     },
     "babel-check-duplicated-nodes": {
       "version": "1.0.0",
       "dev": true
     },
-    "babel-core": {
-      "version": "7.0.0-bridge.0",
+    "babel-jest": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
+      "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",
       "dev": true,
-      "requires": {}
+      "requires": {
+        "@jest/transform": "^29.7.0",
+        "@types/babel__core": "^7.1.14",
+        "babel-plugin-istanbul": "^6.1.1",
+        "babel-preset-jest": "^29.6.3",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "slash": "^3.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "babel-plugin-istanbul": {
+          "version": "6.1.1",
+          "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+          "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-plugin-utils": "^7.0.0",
+            "@istanbuljs/load-nyc-config": "^1.0.0",
+            "@istanbuljs/schema": "^0.1.2",
+            "istanbul-lib-instrument": "^5.0.4",
+            "test-exclude": "^6.0.0"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "istanbul-lib-instrument": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+          "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+          "dev": true,
+          "requires": {
+            "@babel/core": "^7.12.3",
+            "@babel/parser": "^7.14.7",
+            "@istanbuljs/schema": "^0.1.2",
+            "istanbul-lib-coverage": "^3.2.0",
+            "semver": "^6.3.0"
+          }
+        },
+        "semver": {
+          "version": "6.3.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
     },
     "babel-plugin-dynamic-import-node": {
       "version": "2.3.3",
@@ -26871,14 +29753,14 @@
       }
     },
     "babel-plugin-jest-hoist": {
-      "version": "27.2.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.2.0.tgz",
-      "integrity": "sha512-TOux9khNKdi64mW+0OIhcmbAn75tTlzKhxmiNXevQaPbrBYK7YKjP1jl6NHTJ6XR5UgUrJbCnWlKVnJn29dfjw==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz",
+      "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==",
       "dev": true,
       "requires": {
         "@babel/template": "^7.3.3",
         "@babel/types": "^7.3.3",
-        "@types/babel__core": "^7.0.0",
+        "@types/babel__core": "^7.1.14",
         "@types/babel__traverse": "^7.0.6"
       }
     },
@@ -26887,18 +29769,55 @@
       "dev": true
     },
     "babel-plugin-module-resolver": {
-      "version": "4.1.0",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-module-resolver/-/babel-plugin-module-resolver-5.0.0.tgz",
+      "integrity": "sha512-g0u+/ChLSJ5+PzYwLwP8Rp8Rcfowz58TJNCe+L/ui4rpzE/mg//JVX0EWBUYoxaextqnwuGHzfGp2hh0PPV25Q==",
       "dev": true,
       "requires": {
-        "find-babel-config": "^1.2.0",
-        "glob": "^7.1.6",
+        "find-babel-config": "^2.0.0",
+        "glob": "^8.0.3",
         "pkg-up": "^3.1.0",
-        "reselect": "^4.0.0",
-        "resolve": "^1.13.1"
+        "reselect": "^4.1.7",
+        "resolve": "^1.22.1"
+      },
+      "dependencies": {
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+          "dev": true,
+          "requires": {
+            "balanced-match": "^1.0.0"
+          }
+        },
+        "glob": {
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
+          "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^5.0.1",
+            "once": "^1.3.0"
+          }
+        },
+        "minimatch": {
+          "version": "5.1.6",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+          "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^2.0.1"
+          }
+        }
       }
     },
     "babel-plugin-optimize-objstr": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-optimize-objstr/-/babel-plugin-optimize-objstr-1.0.0.tgz",
+      "integrity": "sha512-0AMyPrN4s6Nh3PhNIo5C/xqOGacJJQkLzZbfgAZ05nSvp/WJYr+UWgRsNOdAmFtlJArBqEoLAtD0w97nJtA3+w==",
       "dev": true
     },
     "babel-plugin-polyfill-corejs2": {
@@ -26931,71 +29850,48 @@
         "@babel/helper-define-polyfill-provider": "^0.2.2"
       }
     },
-    "baconipsum": {
-      "version": "0.1.2",
-      "dev": true
-    },
-    "balanced-match": {
-      "version": "1.0.0",
-      "dev": true
+    "babel-preset-current-node-syntax": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
+      "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
+      "dev": true,
+      "requires": {
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-bigint": "^7.8.3",
+        "@babel/plugin-syntax-class-properties": "^7.8.3",
+        "@babel/plugin-syntax-import-meta": "^7.8.3",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.8.3",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-top-level-await": "^7.8.3"
+      }
     },
-    "base": {
-      "version": "0.11.2",
+    "babel-preset-jest": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz",
+      "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==",
       "dev": true,
       "requires": {
-        "cache-base": "^1.0.1",
-        "class-utils": "^0.3.5",
-        "component-emitter": "^1.2.1",
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.1",
-        "mixin-deep": "^1.2.0",
-        "pascalcase": "^0.1.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
+        "babel-plugin-jest-hoist": "^29.6.3",
+        "babel-preset-current-node-syntax": "^1.0.0"
       }
     },
-    "base62": {
-      "version": "2.0.1",
+    "baconipsum": {
+      "version": "0.1.2",
       "dev": true
     },
-    "base64-arraybuffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.1.tgz",
-      "integrity": "sha512-vFIUq7FdLtjZMhATwDul5RZWv2jpXQ09Pd6jcVEOvIsqCWTRFD/ONHNfyOS8dA/Ippi5dsIgpyKWKZaAKZltbA==",
+    "balanced-match": {
+      "version": "1.0.0",
       "dev": true
     },
-    "base64-js": {
-      "version": "1.5.1",
+    "base62": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/base62/-/base62-2.0.2.tgz",
+      "integrity": "sha512-FLoAQzMpmdDBei0u7fUAQzVCxoH6g4pueCIuGDoCZVZCiCeW4qTKpEGB79jkS15VB8b/5EIHc4R+WSKTByM+dw==",
       "dev": true
     },
     "base64id": {
@@ -27005,65 +29901,45 @@
       "dev": true
     },
     "basic-auth": {
-      "version": "2.0.1",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "5.1.2"
-      }
-    },
-    "batch": {
-      "version": "0.6.1",
-      "dev": true
-    },
-    "bcrypt-pbkdf": {
-      "version": "1.0.2",
+      "version": "2.0.1",
       "dev": true,
       "requires": {
-        "tweetnacl": "^0.14.3"
+        "safe-buffer": "5.1.2"
       }
     },
-    "before-after-hook": {
-      "version": "2.2.2",
+    "basic-ftp": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.5.tgz",
+      "integrity": "sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==",
       "dev": true
     },
-    "bignumber.js": {
-      "version": "9.0.1",
+    "batch": {
+      "version": "0.6.1",
+      "dev": true
+    },
+    "before-after-hook": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz",
+      "integrity": "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==",
       "dev": true
     },
     "binary-extensions": {
       "version": "2.2.0",
       "dev": true
     },
-    "bl": {
-      "version": "4.1.0",
+    "bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
       "dev": true,
       "requires": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
-      },
-      "dependencies": {
-        "buffer": {
-          "version": "5.7.1",
-          "dev": true,
-          "requires": {
-            "base64-js": "^1.3.1",
-            "ieee754": "^1.1.13"
-          }
-        },
-        "readable-stream": {
-          "version": "3.6.0",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
+        "file-uri-to-path": "1.0.0"
       }
     },
     "blueimp-md5": {
-      "version": "2.18.0",
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.19.0.tgz",
+      "integrity": "sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w==",
       "dev": true
     },
     "body": {
@@ -27095,117 +29971,82 @@
       }
     },
     "body-parser": {
-      "version": "1.19.0",
+      "version": "1.20.3",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
+      "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
       "dev": true,
       "requires": {
-        "bytes": "3.1.0",
-        "content-type": "~1.0.4",
+        "bytes": "3.1.2",
+        "content-type": "~1.0.5",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.7.2",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.7.0",
-        "raw-body": "2.4.0",
-        "type-is": "~1.6.17"
+        "on-finished": "2.4.1",
+        "qs": "6.13.0",
+        "raw-body": "2.5.2",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
       },
       "dependencies": {
         "debug": {
           "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
           }
         },
-        "ms": {
+        "depd": {
           "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
           "dev": true
         },
-        "qs": {
-          "version": "6.7.0",
-          "dev": true
-        }
-      }
-    },
-    "boolbase": {
-      "version": "1.0.0",
-      "dev": true
-    },
-    "bower-config": {
-      "version": "1.4.3",
-      "dev": true,
-      "requires": {
-        "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"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.2.1",
+        "destroy": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+          "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
           "dev": true
-        }
-      }
-    },
-    "boxen": {
-      "version": "5.0.0",
-      "dev": true,
-      "requires": {
-        "ansi-align": "^3.0.0",
-        "camelcase": "^6.2.0",
-        "chalk": "^4.1.0",
-        "cli-boxes": "^2.2.1",
-        "string-width": "^4.2.0",
-        "type-fest": "^0.20.2",
-        "widest-line": "^3.1.0",
-        "wrap-ansi": "^7.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
         },
-        "camelcase": {
-          "version": "6.2.0",
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
           "dev": true
         },
-        "chalk": {
-          "version": "4.1.0",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
+        "on-finished": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+          "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
           "dev": true,
           "requires": {
-            "color-name": "~1.1.4"
+            "ee-first": "1.1.1"
           }
         },
-        "color-name": {
-          "version": "1.1.4",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
+        "qs": {
+          "version": "6.13.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+          "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "side-channel": "^1.0.6"
           }
         }
       }
     },
+    "boolbase": {
+      "version": "1.0.0",
+      "dev": true
+    },
+    "bowser": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.11.0.tgz",
+      "integrity": "sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA==",
+      "dev": true
+    },
     "brace-expansion": {
       "version": "1.1.11",
       "dev": true,
@@ -27221,36 +30062,20 @@
         "fill-range": "^7.0.1"
       }
     },
-    "brcast": {
-      "version": "2.0.2"
-    },
-    "browser-process-hrtime": {
-      "version": "1.0.0",
-      "dev": true
-    },
     "browser-stdout": {
       "version": "1.3.1",
       "dev": true
     },
     "browserslist": {
-      "version": "4.17.5",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.5.tgz",
-      "integrity": "sha512-I3ekeB92mmpctWBoLXe0d5wPS2cBuRvvW0JyyJHMrk9/HmP2ZjrTboNAZ8iuGqaEIlKguljbQY32OkOJIRrgoA==",
+      "version": "4.23.2",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.2.tgz",
+      "integrity": "sha512-qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30001271",
-        "electron-to-chromium": "^1.3.878",
-        "escalade": "^3.1.1",
-        "node-releases": "^2.0.1",
-        "picocolors": "^1.0.0"
-      },
-      "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
-        }
+        "caniuse-lite": "^1.0.30001640",
+        "electron-to-chromium": "^1.4.820",
+        "node-releases": "^2.0.14",
+        "update-browserslist-db": "^1.1.0"
       }
     },
     "bser": {
@@ -27266,96 +30091,36 @@
       "version": "0.2.13",
       "dev": true
     },
-    "buffer-equal": {
-      "version": "1.0.0",
-      "dev": true
-    },
-    "buffer-equal-constant-time": {
-      "version": "1.0.1",
-      "dev": true
-    },
     "buffer-from": {
       "version": "1.1.1",
       "dev": true
     },
     "busboy": {
-      "version": "0.2.14",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz",
+      "integrity": "sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==",
       "dev": true,
       "requires": {
-        "dicer": "0.2.5",
-        "readable-stream": "1.1.x"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.1.14",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "dev": true
-        }
+        "streamsearch": "^1.1.0"
       }
     },
     "bytes": {
-      "version": "3.1.0",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
       "dev": true
     },
-    "cache-base": {
-      "version": "1.0.1",
-      "dev": true,
-      "requires": {
-        "collection-visit": "^1.0.0",
-        "component-emitter": "^1.2.1",
-        "get-value": "^2.0.6",
-        "has-value": "^1.0.0",
-        "isobject": "^3.0.1",
-        "set-value": "^2.0.0",
-        "to-object-path": "^0.3.0",
-        "union-value": "^1.0.0",
-        "unset-value": "^1.0.0"
-      }
-    },
-    "cacheable-request": {
-      "version": "6.1.0",
-      "dev": true,
-      "requires": {
-        "clone-response": "^1.0.2",
-        "get-stream": "^5.1.0",
-        "http-cache-semantics": "^4.0.0",
-        "keyv": "^3.0.0",
-        "lowercase-keys": "^2.0.0",
-        "normalize-url": "^4.1.0",
-        "responselike": "^1.0.2"
-      },
-      "dependencies": {
-        "get-stream": {
-          "version": "5.2.0",
-          "dev": true,
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        },
-        "lowercase-keys": {
-          "version": "2.0.0",
-          "dev": true
-        }
-      }
-    },
     "call-bind": {
-      "version": "1.0.2",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+      "dev": true,
       "requires": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
       }
     },
     "callsites": {
@@ -27376,6 +30141,8 @@
     },
     "caniuse-api": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
+      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
       "dev": true,
       "requires": {
         "browserslist": "^4.0.0",
@@ -27385,29 +30152,39 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001271",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001271.tgz",
-      "integrity": "sha512-BBruZFWmt3HFdVPS8kceTBIguKxu4f99n5JNp06OlPD/luoAMIaIK5ieV5YjnBLH3Nysai9sxj9rpJj4ZisXOA==",
+      "version": "1.0.30001641",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001641.tgz",
+      "integrity": "sha512-Phv5thgl67bHYo1TtMY/MurjkHhV4EDaCosezRXgZ8jzA/Ub+wjxAvbGvjoFENStinwi5kCyOYV3mi5tOGykwA==",
       "dev": true
     },
-    "caseless": {
-      "version": "0.12.0",
-      "dev": true
+    "cbor": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/cbor/-/cbor-9.0.1.tgz",
+      "integrity": "sha512-/TQOWyamDxvVIv+DY9cOLNuABkoyz8K/F3QE56539pGVYohx0+MEA1f4lChFTX79dBTBS7R1PF6ovH7G+VtBfQ==",
+      "dev": true,
+      "requires": {
+        "nofilter": "^3.1.0"
+      }
     },
     "chai": {
-      "version": "4.3.4",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.4.1.tgz",
+      "integrity": "sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==",
       "dev": true,
       "requires": {
         "assertion-error": "^1.1.0",
-        "check-error": "^1.0.2",
-        "deep-eql": "^3.0.1",
-        "get-func-name": "^2.0.0",
+        "check-error": "^1.0.3",
+        "deep-eql": "^4.1.3",
+        "get-func-name": "^2.0.2",
+        "loupe": "^2.3.6",
         "pathval": "^1.1.1",
-        "type-detect": "^4.0.5"
+        "type-detect": "^4.0.8"
       }
     },
     "chai-as-promised": {
-      "version": "7.1.1",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.2.tgz",
+      "integrity": "sha512-aBDHZxRzYnUYuIAIPBH2s511DjlKPzXNlXSGFC8CwmroWQLfrW0LtE1nK3MAwwNhJPa9raEjNCmRoFpG0Hurdw==",
       "dev": true,
       "requires": {
         "check-error": "^1.0.2"
@@ -27433,26 +30210,23 @@
       "dev": true
     },
     "check-dependencies": {
-      "version": "1.1.0",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/check-dependencies/-/check-dependencies-2.0.0.tgz",
+      "integrity": "sha512-ui/u085SyYlRhaYShUDyS0fpTrfBBpz5bS0m+A1AW8HbsQefxrqLBKNzKAllIgdFZvKu0UHjrpzdobvGQ6khdg==",
       "dev": true,
       "requires": {
-        "bower-config": "^1.4.0",
-        "chalk": "^2.1.0",
-        "findup-sync": "^2.0.0",
-        "lodash.camelcase": "^4.3.0",
-        "minimist": "^1.2.0",
-        "semver": "^5.4.1"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "5.7.1",
-          "dev": true
-        }
+        "picocolors": "^1.0.0",
+        "semver": "^7.5.4"
       }
     },
     "check-error": {
-      "version": "1.0.2",
-      "dev": true
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz",
+      "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==",
+      "dev": true,
+      "requires": {
+        "get-func-name": "^2.0.2"
+      }
     },
     "cheerio": {
       "version": "1.0.0-rc.10",
@@ -27467,14 +30241,6 @@
         "parse5": "^6.0.1",
         "parse5-htmlparser2-tree-adapter": "^6.0.1",
         "tslib": "^2.2.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-          "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
-          "dev": true
-        }
       }
     },
     "cheerio-select": {
@@ -27488,10 +30254,20 @@
         "domelementtype": "^2.2.0",
         "domhandler": "^4.2.0",
         "domutils": "^2.7.0"
+      },
+      "dependencies": {
+        "css-what": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz",
+          "integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==",
+          "dev": true
+        }
       }
     },
     "chokidar": {
-      "version": "3.5.2",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
       "dev": true,
       "requires": {
         "anymatch": "~3.1.2",
@@ -27521,9 +30297,9 @@
       "dev": true
     },
     "cjs-module-lexer": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz",
-      "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz",
+      "integrity": "sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==",
       "dev": true
     },
     "cjson": {
@@ -27533,25 +30309,6 @@
         "jsonlint": "1.6.0"
       }
     },
-    "class-utils": {
-      "version": "0.3.6",
-      "dev": true,
-      "requires": {
-        "arr-union": "^3.1.0",
-        "define-property": "^0.2.5",
-        "isobject": "^3.0.0",
-        "static-extend": "^0.1.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        }
-      }
-    },
     "clean-css": {
       "version": "4.2.3",
       "dev": true,
@@ -27569,88 +30326,50 @@
       "version": "2.2.0",
       "dev": true
     },
-    "clean-yaml-object": {
-      "version": "0.1.0",
-      "dev": true
-    },
-    "cli-boxes": {
-      "version": "2.2.1",
-      "dev": true
-    },
-    "cli-cursor": {
-      "version": "3.1.0",
-      "dev": true,
-      "requires": {
-        "restore-cursor": "^3.1.0"
-      }
-    },
-    "cli-highlight": {
-      "version": "2.1.11",
+    "cli-truncate": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz",
+      "integrity": "sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==",
       "dev": true,
       "requires": {
-        "chalk": "^4.0.0",
-        "highlight.js": "^10.7.1",
-        "mz": "^2.4.0",
-        "parse5": "^5.1.1",
-        "parse5-htmlparser2-tree-adapter": "^6.0.0",
-        "yargs": "^16.0.0"
+        "slice-ansi": "^5.0.0",
+        "string-width": "^7.0.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
+        "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
         },
-        "parse5": {
-          "version": "5.1.1",
+        "emoji-regex": {
+          "version": "10.3.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz",
+          "integrity": "sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==",
           "dev": true
         },
-        "supports-color": {
-          "version": "7.2.0",
+        "string-width": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.1.0.tgz",
+          "integrity": "sha512-SEIJCWiX7Kg4c129n48aDRwLbFb2LJmXXFrWBG4NGaRtMQ3myKPKbwrD1BKqQn74oCoNMBVrfDEr5M9YxCsrkw==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "emoji-regex": "^10.3.0",
+            "get-east-asian-width": "^1.0.0",
+            "strip-ansi": "^7.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+          "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^6.0.1"
           }
         }
       }
     },
-    "cli-spinners": {
-      "version": "2.5.0",
-      "dev": true
-    },
-    "cli-truncate": {
-      "version": "2.1.0",
-      "dev": true,
-      "requires": {
-        "slice-ansi": "^3.0.0",
-        "string-width": "^4.2.0"
-      }
-    },
     "cliui": {
       "version": "7.0.4",
       "dev": true,
@@ -27660,65 +30379,19 @@
         "wrap-ansi": "^7.0.0"
       }
     },
-    "clone": {
-      "version": "2.1.2",
-      "dev": true
-    },
-    "clone-buffer": {
-      "version": "1.0.0",
-      "dev": true
-    },
-    "clone-deep": {
-      "version": "4.0.1",
-      "dev": true,
-      "requires": {
-        "is-plain-object": "^2.0.4",
-        "kind-of": "^6.0.2",
-        "shallow-clone": "^3.0.0"
-      }
-    },
-    "clone-response": {
-      "version": "1.0.2",
-      "dev": true,
-      "requires": {
-        "mimic-response": "^1.0.0"
-      }
-    },
-    "clone-stats": {
-      "version": "1.0.0",
-      "dev": true
-    },
-    "cloneable-readable": {
-      "version": "1.1.3",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "process-nextick-args": "^2.0.0",
-        "readable-stream": "^2.3.5"
-      }
-    },
     "co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
       "dev": true
     },
     "code-excerpt": {
-      "version": "3.0.0",
-      "dev": true,
-      "requires": {
-        "convert-to-spaces": "^1.0.1"
-      }
-    },
-    "codecov": {
-      "version": "3.8.3",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/code-excerpt/-/code-excerpt-4.0.0.tgz",
+      "integrity": "sha512-xxodCmBen3iy2i0WtAK8FlFNrRzjUqjRsMfho58xT/wvZU1YTM3fCnRjcy1gJPMepaRlgm/0e6w8SpWHpn3/cA==",
       "dev": true,
       "requires": {
-        "argv": "0.0.2",
-        "ignore-walk": "3.0.4",
-        "js-yaml": "3.14.1",
-        "teeny-request": "7.1.1",
-        "urlgrey": "1.0.0"
+        "convert-to-spaces": "^2.0.1"
       }
     },
     "coffee-script": {
@@ -27726,19 +30399,11 @@
       "dev": true
     },
     "collect-v8-coverage": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
-      "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
+      "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",
       "dev": true
     },
-    "collection-visit": {
-      "version": "1.0.0",
-      "dev": true,
-      "requires": {
-        "map-visit": "^1.0.0",
-        "object-visit": "^1.0.0"
-      }
-    },
     "color-convert": {
       "version": "1.9.3",
       "dev": true,
@@ -27755,11 +30420,9 @@
       "dev": true
     },
     "colord": {
-      "version": "2.7.0",
-      "dev": true
-    },
-    "colorette": {
-      "version": "1.2.2",
+      "version": "2.9.3",
+      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
+      "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
       "dev": true
     },
     "colors": {
@@ -27768,31 +30431,29 @@
     },
     "combined-stream": {
       "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
       "dev": true,
       "requires": {
         "delayed-stream": "~1.0.0"
       }
     },
     "commander": {
-      "version": "7.2.0",
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz",
+      "integrity": "sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==",
       "dev": true
     },
     "comment-parser": {
-      "version": "1.2.4",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.4.1.tgz",
+      "integrity": "sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg==",
       "dev": true
     },
     "common-path-prefix": {
       "version": "3.0.0",
       "dev": true
     },
-    "commondir": {
-      "version": "1.0.1",
-      "dev": true
-    },
-    "component-emitter": {
-      "version": "1.3.0",
-      "dev": true
-    },
     "compress-commons": {
       "version": "0.2.9",
       "dev": true,
@@ -27827,13 +30488,6 @@
         }
       }
     },
-    "compressible": {
-      "version": "2.0.18",
-      "dev": true,
-      "requires": {
-        "mime-db": ">= 1.43.0 < 2"
-      }
-    },
     "concat-map": {
       "version": "0.0.1",
       "dev": true
@@ -27862,7 +30516,9 @@
       }
     },
     "concordance": {
-      "version": "5.0.3",
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/concordance/-/concordance-5.0.4.tgz",
+      "integrity": "sha512-OAcsnTEYu1ARJqWVGwf4zh4JDfHZEaSNlNccFmt8YjB2l/n19/PF2viLINHc57vO4FKIAFl2FWASIGZZWZ2Kxw==",
       "dev": true,
       "requires": {
         "date-time": "^3.1.0",
@@ -27875,18 +30531,6 @@
         "well-known-symbols": "^2.0.0"
       }
     },
-    "configstore": {
-      "version": "5.0.1",
-      "dev": true,
-      "requires": {
-        "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": {
       "version": "3.7.0",
       "dev": true,
@@ -27918,18 +30562,33 @@
       "version": "0.6.1",
       "dev": true
     },
-    "consolidated-events": {
-      "version": "2.0.2"
+    "console-control-strings": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
+      "dev": true
     },
     "content-disposition": {
-      "version": "0.5.3",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
       "dev": true,
       "requires": {
-        "safe-buffer": "5.1.2"
+        "safe-buffer": "5.2.1"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
+        }
       }
     },
     "content-type": {
-      "version": "1.0.4",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
       "dev": true
     },
     "continuable-cache": {
@@ -27944,32 +30603,32 @@
       }
     },
     "convert-to-spaces": {
-      "version": "1.0.2",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/convert-to-spaces/-/convert-to-spaces-2.0.1.tgz",
+      "integrity": "sha512-rcQ1bsQO9799wq24uE5AM2tAILy4gXGIK/njFWcVQkGNZ96edlpY+A7bjwvzjYvLDyzmG1MmMLZhpcsb+klNMQ==",
       "dev": true
     },
     "cookie": {
-      "version": "0.4.0",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
       "dev": true
     },
     "cookie-signature": {
       "version": "1.0.6",
       "dev": true
     },
-    "copy-descriptor": {
-      "version": "0.1.1",
-      "dev": true
-    },
     "core-js": {
       "version": "3.9.1",
       "dev": true
     },
     "core-js-compat": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.19.0.tgz",
-      "integrity": "sha512-R09rKZ56ccGBebjTLZHvzDxhz93YPT37gBm6qUhnwj3Kt7aCjjZWD1injyNbyeFHxNKfeZBSyds6O9n3MKq1sw==",
+      "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.21.0.tgz",
+      "integrity": "sha512-OSXseNPSK2OPJa6GdtkMz/XxeXx8/CJvfhQWTqd6neuUraujcL4jVsjkLQz1OWnax8xVQJnRPe0V2jqNWORA+A==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.17.5",
+        "browserslist": "^4.19.1",
         "semver": "7.0.0"
       },
       "dependencies": {
@@ -28047,16 +30706,12 @@
       "version": "2.0.0",
       "dev": true
     },
-    "css-color-names": {
-      "version": "1.0.1",
-      "dev": true
-    },
     "css-declaration-sorter": {
-      "version": "6.1.1",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-7.2.0.tgz",
+      "integrity": "sha512-h70rUM+3PNFuaBDTLe8wF/cdWu+dOZmb7pJt8Z2sedYbAcQVQV/tEchueg3GWxwqS0cxtbxmaHEdkNACqcvsow==",
       "dev": true,
-      "requires": {
-        "timsort": "^0.3.0"
-      }
+      "requires": {}
     },
     "css-imports": {
       "version": "0.3.1",
@@ -28086,28 +30741,24 @@
         "domhandler": "^4.2.0",
         "domutils": "^2.6.0",
         "nth-check": "^2.0.0"
-      }
-    },
-    "css-selector-tokenizer": {
-      "version": "0.8.0",
-      "dev": true,
-      "requires": {
-        "cssesc": "^3.0.0",
-        "fastparse": "^1.1.2"
+      },
+      "dependencies": {
+        "css-what": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz",
+          "integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==",
+          "dev": true
+        }
       }
     },
     "css-tree": {
-      "version": "1.1.3",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz",
+      "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==",
       "dev": true,
       "requires": {
-        "mdn-data": "2.0.14",
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "dev": true
-        }
+        "mdn-data": "2.0.30",
+        "source-map-js": "^1.0.1"
       }
     },
     "css-vendor": {
@@ -28120,87 +30771,106 @@
       }
     },
     "css-what": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz",
-      "integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
+      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
       "dev": true
     },
     "cssesc": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
       "dev": true
     },
     "cssnano": {
-      "version": "5.0.8",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-6.1.2.tgz",
+      "integrity": "sha512-rYk5UeX7VAM/u0lNqewCdasdtPK81CgX8wJFLEIXHbV2oldWRgJAsZrdhRXkV1NJzA2g850KiFm9mMU2HxNxMA==",
       "dev": true,
       "requires": {
-        "cssnano-preset-default": "^5.1.4",
-        "is-resolvable": "^1.1.0",
-        "lilconfig": "^2.0.3",
-        "yaml": "^1.10.2"
+        "cssnano-preset-default": "^6.1.2",
+        "lilconfig": "^3.1.1"
       }
     },
     "cssnano-preset-default": {
-      "version": "5.1.4",
-      "dev": true,
-      "requires": {
-        "css-declaration-sorter": "^6.0.3",
-        "cssnano-utils": "^2.0.1",
-        "postcss-calc": "^8.0.0",
-        "postcss-colormin": "^5.2.0",
-        "postcss-convert-values": "^5.0.1",
-        "postcss-discard-comments": "^5.0.1",
-        "postcss-discard-duplicates": "^5.0.1",
-        "postcss-discard-empty": "^5.0.1",
-        "postcss-discard-overridden": "^5.0.1",
-        "postcss-merge-longhand": "^5.0.2",
-        "postcss-merge-rules": "^5.0.2",
-        "postcss-minify-font-values": "^5.0.1",
-        "postcss-minify-gradients": "^5.0.2",
-        "postcss-minify-params": "^5.0.1",
-        "postcss-minify-selectors": "^5.1.0",
-        "postcss-normalize-charset": "^5.0.1",
-        "postcss-normalize-display-values": "^5.0.1",
-        "postcss-normalize-positions": "^5.0.1",
-        "postcss-normalize-repeat-style": "^5.0.1",
-        "postcss-normalize-string": "^5.0.1",
-        "postcss-normalize-timing-functions": "^5.0.1",
-        "postcss-normalize-unicode": "^5.0.1",
-        "postcss-normalize-url": "^5.0.2",
-        "postcss-normalize-whitespace": "^5.0.1",
-        "postcss-ordered-values": "^5.0.2",
-        "postcss-reduce-initial": "^5.0.1",
-        "postcss-reduce-transforms": "^5.0.1",
-        "postcss-svgo": "^5.0.2",
-        "postcss-unique-selectors": "^5.0.1"
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-6.1.2.tgz",
+      "integrity": "sha512-1C0C+eNaeN8OcHQa193aRgYexyJtU8XwbdieEjClw+J9d94E41LwT6ivKH0WT+fYwYWB0Zp3I3IZ7tI/BbUbrg==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.23.0",
+        "css-declaration-sorter": "^7.2.0",
+        "cssnano-utils": "^4.0.2",
+        "postcss-calc": "^9.0.1",
+        "postcss-colormin": "^6.1.0",
+        "postcss-convert-values": "^6.1.0",
+        "postcss-discard-comments": "^6.0.2",
+        "postcss-discard-duplicates": "^6.0.3",
+        "postcss-discard-empty": "^6.0.3",
+        "postcss-discard-overridden": "^6.0.2",
+        "postcss-merge-longhand": "^6.0.5",
+        "postcss-merge-rules": "^6.1.1",
+        "postcss-minify-font-values": "^6.1.0",
+        "postcss-minify-gradients": "^6.0.3",
+        "postcss-minify-params": "^6.1.0",
+        "postcss-minify-selectors": "^6.0.4",
+        "postcss-normalize-charset": "^6.0.2",
+        "postcss-normalize-display-values": "^6.0.2",
+        "postcss-normalize-positions": "^6.0.2",
+        "postcss-normalize-repeat-style": "^6.0.2",
+        "postcss-normalize-string": "^6.0.2",
+        "postcss-normalize-timing-functions": "^6.0.2",
+        "postcss-normalize-unicode": "^6.1.0",
+        "postcss-normalize-url": "^6.0.2",
+        "postcss-normalize-whitespace": "^6.0.2",
+        "postcss-ordered-values": "^6.0.2",
+        "postcss-reduce-initial": "^6.1.0",
+        "postcss-reduce-transforms": "^6.0.2",
+        "postcss-svgo": "^6.0.3",
+        "postcss-unique-selectors": "^6.0.4"
       }
     },
     "cssnano-utils": {
-      "version": "2.0.1",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-4.0.2.tgz",
+      "integrity": "sha512-ZR1jHg+wZ8o4c3zqf1SIUSTIvm/9mU343FMR6Obe/unskbvpGhZOo1J6d/r8D1pzkRQYuwbcH3hToOuoA2G7oQ==",
       "dev": true,
       "requires": {}
     },
     "csso": {
-      "version": "4.2.0",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-5.0.5.tgz",
+      "integrity": "sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==",
       "dev": true,
       "requires": {
-        "css-tree": "^1.1.2"
+        "css-tree": "~2.2.0"
+      },
+      "dependencies": {
+        "css-tree": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.2.1.tgz",
+          "integrity": "sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==",
+          "dev": true,
+          "requires": {
+            "mdn-data": "2.0.28",
+            "source-map-js": "^1.0.1"
+          }
+        },
+        "mdn-data": {
+          "version": "2.0.28",
+          "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.28.tgz",
+          "integrity": "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==",
+          "dev": true
+        }
       }
     },
-    "cssom": {
-      "version": "0.4.4",
-      "dev": true
-    },
     "cssstyle": {
-      "version": "2.3.0",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.0.1.tgz",
+      "integrity": "sha512-8ZYiJ3A/3OkDd093CBT/0UKDWry7ak4BdPTFP2+QEP7cmhouyq/Up709ASSj2cK02BbZiMgk7kYjZNS4QP5qrQ==",
       "dev": true,
       "requires": {
-        "cssom": "~0.3.6"
-      },
-      "dependencies": {
-        "cssom": {
-          "version": "0.3.8",
-          "dev": true
-        }
+        "rrweb-cssom": "^0.6.0"
       }
     },
     "csstype": {
@@ -28217,41 +30887,79 @@
       "version": "1.0.1",
       "dev": true
     },
-    "dashdash": {
-      "version": "1.14.1",
+    "data-uri-to-buffer": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz",
+      "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==",
+      "dev": true
+    },
+    "data-urls": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-5.0.0.tgz",
+      "integrity": "sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==",
       "dev": true,
       "requires": {
-        "assert-plus": "^1.0.0"
+        "whatwg-mimetype": "^4.0.0",
+        "whatwg-url": "^14.0.0"
       }
     },
-    "data-urls": {
-      "version": "2.0.0",
+    "data-view-buffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz",
+      "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==",
       "dev": true,
       "requires": {
-        "abab": "^2.0.3",
-        "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^8.0.0"
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
       }
     },
-    "date-and-time": {
-      "version": "2.0.1",
-      "dev": true
+    "data-view-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz",
+      "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      }
+    },
+    "data-view-byte-offset": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz",
+      "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      }
+    },
+    "date-fns": {
+      "version": "2.27.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.27.0.tgz",
+      "integrity": "sha512-sj+J0Mo2p2X1e306MHq282WS4/A8Pz/95GIFcsPNMPMZVI3EUrAdSv90al1k+p74WGLCruMXk23bfEDZa71X9Q=="
     },
     "date-format": {
-      "version": "3.0.0",
+      "version": "4.0.14",
+      "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.14.tgz",
+      "integrity": "sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg==",
       "dev": true
     },
     "date-time": {
       "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/date-time/-/date-time-3.1.0.tgz",
+      "integrity": "sha512-uqCUKXE5q1PNBXjPqvwhwJf9SwMoAHBgWJ6DcrnS5o+W2JOiIILl0JEdVD8SGujrNS02GGxgwAg2PN2zONgtjg==",
       "dev": true,
       "requires": {
         "time-zone": "^1.0.0"
       }
     },
     "debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
+      "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
       "dev": true,
       "requires": {
         "ms": "2.1.2"
@@ -28262,104 +30970,89 @@
       "dev": true
     },
     "decimal.js": {
-      "version": "10.3.1",
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
+      "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
       "dev": true
     },
-    "decode-uri-component": {
-      "version": "0.2.0",
-      "dev": true
-    },
-    "decompress-response": {
-      "version": "3.3.0",
-      "dev": true,
-      "requires": {
-        "mimic-response": "^1.0.0"
-      }
-    },
     "dedent": {
-      "version": "0.7.0",
-      "dev": true
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz",
+      "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==",
+      "dev": true,
+      "requires": {}
     },
     "deep-eql": {
-      "version": "3.0.1",
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.4.tgz",
+      "integrity": "sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==",
       "dev": true,
       "requires": {
         "type-detect": "^4.0.0"
       }
     },
-    "deep-extend": {
-      "version": "0.6.0",
-      "dev": true
-    },
     "deep-is": {
       "version": "0.1.3",
       "dev": true
     },
     "deepmerge": {
-      "version": "1.5.2"
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+      "dev": true
     },
-    "defaults": {
-      "version": "1.0.3",
+    "define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
       "dev": true,
       "requires": {
-        "clone": "^1.0.2"
-      },
-      "dependencies": {
-        "clone": {
-          "version": "1.0.4",
-          "dev": true
-        }
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
       }
     },
-    "defer-to-connect": {
-      "version": "1.1.3",
-      "dev": true
-    },
     "define-lazy-prop": {
       "version": "2.0.0",
       "dev": true
     },
     "define-properties": {
-      "version": "1.1.3",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+      "dev": true,
       "requires": {
-        "object-keys": "^1.0.12"
+        "define-data-property": "^1.0.1",
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
       }
     },
-    "define-property": {
-      "version": "2.0.2",
+    "degenerator": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz",
+      "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==",
       "dev": true,
       "requires": {
-        "is-descriptor": "^1.0.2",
-        "isobject": "^3.0.1"
+        "ast-types": "^0.13.4",
+        "escodegen": "^2.1.0",
+        "esprima": "^4.0.1"
       },
       "dependencies": {
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
+        "ast-types": {
+          "version": "0.13.4",
+          "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
+          "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "tslib": "^2.0.1"
           }
         }
       }
     },
     "del": {
-      "version": "6.0.0",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/del/-/del-6.1.1.tgz",
+      "integrity": "sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==",
       "dev": true,
       "requires": {
         "globby": "^11.0.1",
@@ -28374,6 +31067,14 @@
     },
     "delayed-stream": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "dev": true
+    },
+    "delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
       "dev": true
     },
     "depd": {
@@ -28382,66 +31083,54 @@
     },
     "deprecation": {
       "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
+      "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==",
       "dev": true
     },
     "destroy": {
       "version": "1.0.4",
       "dev": true
     },
-    "detect-file": {
-      "version": "1.0.0",
+    "detect-libc": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.2.tgz",
+      "integrity": "sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==",
       "dev": true
     },
     "detect-newline": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
       "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
-      "dev": true
-    },
-    "di": {
-      "version": "0.0.1",
-      "dev": true
-    },
-    "diacritics-map": {
-      "version": "0.1.0",
-      "dev": true
-    },
-    "dicer": {
-      "version": "0.2.5",
-      "dev": true,
-      "requires": {
-        "readable-stream": "1.1.x",
-        "streamsearch": "0.1.2"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.1.14",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "dev": true
-        }
+      "dev": true
+    },
+    "dezalgo": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz",
+      "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==",
+      "dev": true,
+      "requires": {
+        "asap": "^2.0.0",
+        "wrappy": "1"
       }
     },
+    "di": {
+      "version": "0.0.1",
+      "dev": true
+    },
+    "diacritics-map": {
+      "version": "0.1.0",
+      "dev": true
+    },
     "diff": {
-      "version": "5.0.0",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz",
+      "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==",
       "dev": true
     },
     "diff-sequences": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.0.6.tgz",
-      "integrity": "sha512-ag6wfpBFyNXZ0p8pcuIDS//D8H062ZQJ3fzYxjpmeKjnz8W4pekL3AI8VohmyZmsWW2PWaHgjsmqR6L13101VQ==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
+      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
       "dev": true
     },
     "dir-glob": {
@@ -28451,9 +31140,6 @@
         "path-type": "^4.0.0"
       }
     },
-    "direction": {
-      "version": "1.0.4"
-    },
     "discontinuous-range": {
       "version": "1.0.0",
       "dev": true
@@ -28465,12 +31151,6 @@
         "esutils": "^2.0.2"
       }
     },
-    "document.contains": {
-      "version": "1.0.2",
-      "requires": {
-        "define-properties": "^1.1.3"
-      }
-    },
     "dom-serialize": {
       "version": "2.2.1",
       "dev": true,
@@ -28491,22 +31171,11 @@
       }
     },
     "domelementtype": {
-      "version": "2.2.0",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
       "dev": true
     },
-    "domexception": {
-      "version": "2.0.1",
-      "dev": true,
-      "requires": {
-        "webidl-conversions": "^5.0.0"
-      },
-      "dependencies": {
-        "webidl-conversions": {
-          "version": "5.0.0",
-          "dev": true
-        }
-      }
-    },
     "domhandler": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.2.tgz",
@@ -28517,7 +31186,9 @@
       }
     },
     "dompurify": {
-      "version": "2.3.3"
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.0.2.tgz",
+      "integrity": "sha512-B8c6JdiEpxAKnd8Dm++QQxJL4lfuc757scZtcapj6qjTjrQzyq5iAyznLKVvK+77eYNiFblHBlt7MM0fOeqoKw=="
     },
     "domutils": {
       "version": "2.7.0",
@@ -28528,64 +31199,28 @@
         "domhandler": "^4.2.0"
       }
     },
-    "dot-prop": {
-      "version": "5.3.0",
-      "dev": true,
-      "requires": {
-        "is-obj": "^2.0.0"
-      }
-    },
     "duplexer": {
       "version": "0.1.2",
       "dev": true
     },
-    "duplexer3": {
-      "version": "0.1.4",
-      "dev": true
-    },
-    "duplexify": {
-      "version": "3.7.1",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0",
-        "stream-shift": "^1.0.0"
-      }
-    },
     "ebnf-parser": {
       "version": "0.1.10",
       "dev": true
     },
-    "ecc-jsbn": {
-      "version": "0.1.2",
-      "dev": true,
-      "requires": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
-    "ecdsa-sig-formatter": {
-      "version": "1.0.11",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
     "ee-first": {
       "version": "1.1.1",
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.879",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.879.tgz",
-      "integrity": "sha512-zJo+D9GwbJvM31IdFmwcGvychhk4KKbKYo2GWlsn+C/dxz2NwmbhGJjWwTfFSF2+eFH7VvfA8MCZ8SOqTrlnpw==",
+      "version": "1.4.823",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.823.tgz",
+      "integrity": "sha512-4h+oPeAiGQOHFyUJOqpoEcPj/xxlicxBzOErVeYVMMmAiXUXsGpsFd0QXBMaUUbnD8hhSfLf9uw+MlsoIA7j5w==",
       "dev": true
     },
     "emittery": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz",
-      "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-1.0.1.tgz",
+      "integrity": "sha512-2ID6FdrMD9KDLldGesP6317G78K7km/kMcwItRtVFva7I/cSEOIaLpewaUb+YLXVwdAp3Ctfxh/V5zIl1sj7dQ==",
       "dev": true
     },
     "emoji-regex": {
@@ -28604,9 +31239,9 @@
       }
     },
     "engine.io": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.0.0.tgz",
-      "integrity": "sha512-Ui7yl3JajEIaACg8MOUwWvuuwU7jepZqX3BKs1ho7NQRuP4LhN4XIykXhp8bEy+x/DhA0LBZZXYSCkZDqrwMMg==",
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.5.4.tgz",
+      "integrity": "sha512-KdVSDKhVKyOi+r5uEabrDLZw2qXStVvCsEB/LN3mw4WFi6Gx50jTyuxYVCwAAC0U46FdnzP/ScKRBTXb/NiEOg==",
       "dev": true,
       "requires": {
         "@types/cookie": "^0.4.1",
@@ -28617,40 +31252,30 @@
         "cookie": "~0.4.1",
         "cors": "~2.8.5",
         "debug": "~4.3.1",
-        "engine.io-parser": "~5.0.0",
-        "ws": "~8.2.3"
+        "engine.io-parser": "~5.2.1",
+        "ws": "~8.11.0"
       },
       "dependencies": {
         "cookie": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz",
-          "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==",
+          "version": "0.4.2",
+          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
+          "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
           "dev": true
         },
         "ws": {
-          "version": "8.2.3",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
-          "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
+          "version": "8.11.0",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
+          "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
           "dev": true,
           "requires": {}
         }
       }
     },
     "engine.io-parser": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.1.tgz",
-      "integrity": "sha512-j4p3WwJrG2k92VISM0op7wiq60vO92MlF3CRGxhKHy9ywG1/Dkc72g0dXeDQ+//hrcDn8gqQzoEkdO9FN0d9AA==",
-      "dev": true,
-      "requires": {
-        "base64-arraybuffer": "~1.0.1"
-      }
-    },
-    "enquirer": {
-      "version": "2.3.6",
-      "dev": true,
-      "requires": {
-        "ansi-colors": "^4.1.1"
-      }
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.1.tgz",
+      "integrity": "sha512-9JktcM3u18nU9N2Lz3bWeBgxVgOKpw7yhRaoxQA3FUDZzzw+9WlA6p4G4u0RixNkg14fH7EfEc/RhpurtiROTQ==",
+      "dev": true
     },
     "ent": {
       "version": "2.2.0",
@@ -28689,23 +31314,20 @@
       }
     },
     "enzyme-adapter-preact-pure": {
-      "version": "3.1.0",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/enzyme-adapter-preact-pure/-/enzyme-adapter-preact-pure-4.1.0.tgz",
+      "integrity": "sha512-SifzvBGf1qUEs0FfCAOiKgDppb1wg/R+rmX8D7jFVpQ/Q2L3/xuyc1V575zoi8QAhIBDUB/8QUWvI4KZc50trw==",
       "dev": true,
-      "requires": {
-        "array.prototype.flatmap": "^1.2.1"
-      }
+      "requires": {}
     },
     "enzyme-shallow-equal": {
       "version": "1.0.4",
+      "dev": true,
       "requires": {
         "has": "^1.0.3",
         "object-is": "^1.1.2"
       }
     },
-    "equal-length": {
-      "version": "1.0.1",
-      "dev": true
-    },
     "error": {
       "version": "7.2.1",
       "dev": true,
@@ -28715,209 +31337,185 @@
     },
     "error-ex": {
       "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
       "dev": true,
       "requires": {
         "is-arrayish": "^0.2.1"
       }
     },
     "es-abstract": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
-      "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
-      "requires": {
-        "call-bind": "^1.0.2",
+      "version": "1.23.3",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz",
+      "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==",
+      "dev": true,
+      "requires": {
+        "array-buffer-byte-length": "^1.0.1",
+        "arraybuffer.prototype.slice": "^1.0.3",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "data-view-buffer": "^1.0.1",
+        "data-view-byte-length": "^1.0.1",
+        "data-view-byte-offset": "^1.0.0",
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-set-tostringtag": "^2.0.3",
         "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",
+        "function.prototype.name": "^1.1.6",
+        "get-intrinsic": "^1.2.4",
+        "get-symbol-description": "^1.0.2",
+        "globalthis": "^1.0.3",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2",
+        "has-proto": "^1.0.3",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.2",
+        "internal-slot": "^1.0.7",
+        "is-array-buffer": "^3.0.4",
+        "is-callable": "^1.2.7",
+        "is-data-view": "^1.0.1",
+        "is-negative-zero": "^2.0.3",
         "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.1",
+        "is-shared-array-buffer": "^1.0.3",
         "is-string": "^1.0.7",
-        "is-weakref": "^1.0.1",
-        "object-inspect": "^1.11.0",
+        "is-typed-array": "^1.1.13",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.13.1",
         "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"
-      },
-      "dependencies": {
-        "get-intrinsic": {
-          "version": "1.1.1",
-          "requires": {
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1"
-          }
-        },
-        "is-negative-zero": {
-          "version": "2.0.1"
-        }
-      }
-    },
-    "es-to-primitive": {
-      "version": "1.2.1",
+        "object.assign": "^4.1.5",
+        "regexp.prototype.flags": "^1.5.2",
+        "safe-array-concat": "^1.1.2",
+        "safe-regex-test": "^1.0.3",
+        "string.prototype.trim": "^1.2.9",
+        "string.prototype.trimend": "^1.0.8",
+        "string.prototype.trimstart": "^1.0.8",
+        "typed-array-buffer": "^1.0.2",
+        "typed-array-byte-length": "^1.0.1",
+        "typed-array-byte-offset": "^1.0.2",
+        "typed-array-length": "^1.0.6",
+        "unbox-primitive": "^1.0.2",
+        "which-typed-array": "^1.1.15"
+      }
+    },
+    "es-define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "dev": true,
       "requires": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
+        "get-intrinsic": "^1.2.4"
       }
     },
-    "esbuild": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.13.9.tgz",
-      "integrity": "sha512-8bYcckmisXjGvBMeylp1PRtu21uOoCDFAgXGGF2BR241zYQDN6ZLNvcmQlnQ7olG0p6PRWmJI8WVH3ca8viPuw==",
-      "dev": true,
-      "requires": {
-        "esbuild-android-arm64": "0.13.9",
-        "esbuild-darwin-64": "0.13.9",
-        "esbuild-darwin-arm64": "0.13.9",
-        "esbuild-freebsd-64": "0.13.9",
-        "esbuild-freebsd-arm64": "0.13.9",
-        "esbuild-linux-32": "0.13.9",
-        "esbuild-linux-64": "0.13.9",
-        "esbuild-linux-arm": "0.13.9",
-        "esbuild-linux-arm64": "0.13.9",
-        "esbuild-linux-mips64le": "0.13.9",
-        "esbuild-linux-ppc64le": "0.13.9",
-        "esbuild-netbsd-64": "0.13.9",
-        "esbuild-openbsd-64": "0.13.9",
-        "esbuild-sunos-64": "0.13.9",
-        "esbuild-windows-32": "0.13.9",
-        "esbuild-windows-64": "0.13.9",
-        "esbuild-windows-arm64": "0.13.9"
-      }
-    },
-    "esbuild-android-arm64": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.13.9.tgz",
-      "integrity": "sha512-Ty0hKldtjJVLHwUwbKR4GFPiXBo5iQ3aE1OLBar9lh3myaRkUGEb+Ypl74LEKa0+t/9lS3Ev1N5+5P2Sq6UvNQ==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-darwin-64": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.13.9.tgz",
-      "integrity": "sha512-Ay0/b98v0oYp3ApXNQ7QPbaSkCT9WjBU6h8bMB1SYrQ/PmHgwph91fb9V0pfOLKK1rYWypfrNbI0MyT2tWN+rQ==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-darwin-arm64": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.13.9.tgz",
-      "integrity": "sha512-nJB8chaJdWathCe6EyIiMIqfyEzbuXPyNsPlL3bYRB1zFCF8feXT874D4IHbJ/w8B6BpY3sM1Clr/I/DK8E4ow==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-freebsd-64": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.13.9.tgz",
-      "integrity": "sha512-ktaBujf12XLkVXLGx7WjFcmh1tt34tm7gP4pHkhvbzbHrq+BbXwcl4EsW+5JT9VNKl7slOGf4Qnua/VW7ZcnIw==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-freebsd-arm64": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.13.9.tgz",
-      "integrity": "sha512-vVa5zps4dmwpXwv/amxVpIWvFJuUPWQkpV+PYtZUW9lqjXsQ3LBHP51Q1cXZZBIrqwszLsEyJPa5GuDOY15hzQ==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-32": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.13.9.tgz",
-      "integrity": "sha512-HxoW9QNqhO8VW1l7aBiYQH4lobeHq85+blZ4nlZ7sg5CNhGRRwnMlV6S08VYKz6V0YKnHb5OqJxx2HZuTZ7tgQ==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-64": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.13.9.tgz",
-      "integrity": "sha512-L+eAR8o1lAUr9g64RXnBLuWZjAItAOWSUpvkchpa6QvSnXFA/nG6PgGsOBEqhDXl9qYEpGI0ReDrFkf8ByapvQ==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-arm": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.13.9.tgz",
-      "integrity": "sha512-DT0S+ufCVXatPZHjkCaBgZSFIV8FzY4GEHz/BlkitTWzUvT1dIUXjPIRPnqBUVa+0AyS1bZSfHzv9hTT4LHz7A==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-arm64": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.13.9.tgz",
-      "integrity": "sha512-IjbhZpW5VQYK4nVI4dj/mLvH5oXAIf57OI8BYVkCqrdVXJwR8nVrSqux3zJSY+ElrkOK3DtG9iTPpmqvBXaU0g==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-mips64le": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.13.9.tgz",
-      "integrity": "sha512-ec9RgAM4r+fe1ZmG16qeMwEHdcIvqeW8tpnpkfSQu9T4487KtQF6lg3TQasTarrLLEe7Qpy+E+r4VwC8eeZySQ==",
-      "dev": true,
-      "optional": true
+    "es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "dev": true
     },
-    "esbuild-linux-ppc64le": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.13.9.tgz",
-      "integrity": "sha512-7b2/wg8T1n/L1BgCWlMSez0aXfGkNjFuOqMBQdnTti3LRuUwzGJcrhRf/FdZGJ5/evML9mqu60vLRuXW1TdXCg==",
+    "es-iterator-helpers": {
+      "version": "1.0.19",
+      "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.19.tgz",
+      "integrity": "sha512-zoMwbCcH5hwUkKJkT8kDIBZSz9I6mVG//+lDCinLCGov4+r7NIy0ld8o03M0cJxl2spVf6ESYVS6/gpIfq1FFw==",
       "dev": true,
-      "optional": true
+      "requires": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.3",
+        "es-errors": "^1.3.0",
+        "es-set-tostringtag": "^2.0.3",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "globalthis": "^1.0.3",
+        "has-property-descriptors": "^1.0.2",
+        "has-proto": "^1.0.3",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.7",
+        "iterator.prototype": "^1.1.2",
+        "safe-array-concat": "^1.1.2"
+      }
     },
-    "esbuild-netbsd-64": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.13.9.tgz",
-      "integrity": "sha512-PiZu3h4+Szj0iZPgvuD2Y0isOXnlNetmF6jMcOwW54BScwynW24/baE+z7PfDyNFgjV04Ga2THdcpbKBDhgWQw==",
-      "dev": true,
-      "optional": true
+    "es-module-lexer": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz",
+      "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==",
+      "dev": true
     },
-    "esbuild-openbsd-64": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.13.9.tgz",
-      "integrity": "sha512-SJKN4Ez+ilY7mu+1gAdGQ9N6dktBfbEkiOAvw+hT7xHrNnTnrTGH0FT4qx9dazB9HX6D04L4PXmVOyynqi+oEQ==",
+    "es-object-atoms": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
+      "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
       "dev": true,
-      "optional": true
+      "requires": {
+        "es-errors": "^1.3.0"
+      }
     },
-    "esbuild-sunos-64": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.13.9.tgz",
-      "integrity": "sha512-9N0RjZ7cElE8ifrS0nBrLQgBMQNPiIIKO2GzLXy7Ms8AM3KjfLiV2G2+9O0B9paXjRAHchIwazTeOyeWb1vyWA==",
+    "es-set-tostringtag": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz",
+      "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==",
       "dev": true,
-      "optional": true
+      "requires": {
+        "get-intrinsic": "^1.2.4",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.1"
+      }
     },
-    "esbuild-windows-32": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.13.9.tgz",
-      "integrity": "sha512-awxWs1kns+RfjhqBbTbdlePjqZrAE2XMaAQJNg9dtu+C7ghC3QKsqXbu0C26OuF5YeAdJcq9q+IdG6WPLjvj9w==",
+    "es-shim-unscopables": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
+      "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
       "dev": true,
-      "optional": true
+      "requires": {
+        "hasown": "^2.0.0"
+      }
     },
-    "esbuild-windows-64": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.13.9.tgz",
-      "integrity": "sha512-VmA9GQMCzOr8rFfD72Dum1+AWhJui7ZO6sYwp6rBHYu4vLmWITTSUsd/zgXXmZuHBPkkvxLJLF8XsKFCRKflJA==",
+    "es-to-primitive": {
+      "version": "1.2.1",
       "dev": true,
-      "optional": true
+      "requires": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      }
     },
-    "esbuild-windows-arm64": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.13.9.tgz",
-      "integrity": "sha512-P/jPY2JwmTpgEPh9BkXpCe690tcDSSo0K9BHTniSeEAEz26kPpqldVa4XDm0R+hNnFA7ecEgNskr4QAxE1ry0w==",
-      "dev": true,
-      "optional": true
+    "esbuild": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.24.2.tgz",
+      "integrity": "sha512-+9egpBW8I3CD5XPe0n6BfT5fxLzxrlDzqydF3aviG+9ni1lDC/OvMHcxqEFV0+LANZG5R1bFMWfUrjVsdwxJvA==",
+      "dev": true,
+      "requires": {
+        "@esbuild/aix-ppc64": "0.24.2",
+        "@esbuild/android-arm": "0.24.2",
+        "@esbuild/android-arm64": "0.24.2",
+        "@esbuild/android-x64": "0.24.2",
+        "@esbuild/darwin-arm64": "0.24.2",
+        "@esbuild/darwin-x64": "0.24.2",
+        "@esbuild/freebsd-arm64": "0.24.2",
+        "@esbuild/freebsd-x64": "0.24.2",
+        "@esbuild/linux-arm": "0.24.2",
+        "@esbuild/linux-arm64": "0.24.2",
+        "@esbuild/linux-ia32": "0.24.2",
+        "@esbuild/linux-loong64": "0.24.2",
+        "@esbuild/linux-mips64el": "0.24.2",
+        "@esbuild/linux-ppc64": "0.24.2",
+        "@esbuild/linux-riscv64": "0.24.2",
+        "@esbuild/linux-s390x": "0.24.2",
+        "@esbuild/linux-x64": "0.24.2",
+        "@esbuild/netbsd-arm64": "0.24.2",
+        "@esbuild/netbsd-x64": "0.24.2",
+        "@esbuild/openbsd-arm64": "0.24.2",
+        "@esbuild/openbsd-x64": "0.24.2",
+        "@esbuild/sunos-x64": "0.24.2",
+        "@esbuild/win32-arm64": "0.24.2",
+        "@esbuild/win32-ia32": "0.24.2",
+        "@esbuild/win32-x64": "0.24.2"
+      }
     },
     "escalade": {
-      "version": "3.1.1",
-      "dev": true
-    },
-    "escape-goat": {
-      "version": "2.1.1",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
+      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
       "dev": true
     },
     "escape-html": {
@@ -28929,82 +31527,76 @@
       "dev": true
     },
     "escodegen": {
-      "version": "2.0.0",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
+      "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
       "dev": true,
       "requires": {
         "esprima": "^4.0.1",
         "estraverse": "^5.2.0",
         "esutils": "^2.0.2",
-        "optionator": "^0.8.1",
         "source-map": "~0.6.1"
       },
       "dependencies": {
-        "estraverse": {
-          "version": "5.2.0",
-          "dev": true
-        },
         "source-map": {
           "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true,
           "optional": true
         }
       }
     },
     "eslint": {
-      "version": "7.32.0",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "7.12.11",
-        "@eslint/eslintrc": "^0.4.3",
-        "@humanwhocodes/config-array": "^0.5.0",
-        "ajv": "^6.10.0",
+      "version": "8.57.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz",
+      "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",
+      "dev": true,
+      "requires": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.6.1",
+        "@eslint/eslintrc": "^2.1.4",
+        "@eslint/js": "8.57.1",
+        "@humanwhocodes/config-array": "^0.13.0",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
+        "@ungap/structured-clone": "^1.2.0",
+        "ajv": "^6.12.4",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
-        "debug": "^4.0.1",
+        "debug": "^4.3.2",
         "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",
+        "eslint-scope": "^7.2.2",
+        "eslint-visitor-keys": "^3.4.3",
+        "espree": "^9.6.1",
+        "esquery": "^1.4.2",
         "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",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.19.0",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.2.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
-        "js-yaml": "^3.13.1",
+        "is-path-inside": "^3.0.3",
+        "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.4.1",
         "lodash.merge": "^4.6.2",
-        "minimatch": "^3.0.4",
+        "minimatch": "^3.1.2",
         "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"
+        "optionator": "^0.9.3",
+        "strip-ansi": "^6.0.1",
+        "text-table": "^0.2.0"
       },
       "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.12.11",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.10.4"
-          }
-        },
         "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": {
             "fast-deep-equal": "^3.1.1",
@@ -29015,13 +31607,23 @@
         },
         "ansi-styles": {
           "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
             "color-convert": "^2.0.1"
           }
         },
+        "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
+        },
         "chalk": {
           "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -29030,6 +31632,8 @@
         },
         "color-convert": {
           "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
             "color-name": "~1.1.4"
@@ -29037,14 +31641,39 @@
         },
         "color-name": {
           "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "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
         },
+        "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==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^6.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "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==",
+          "dev": true,
+          "requires": {
+            "is-glob": "^4.0.3"
+          }
+        },
         "globals": {
-          "version": "13.11.0",
+          "version": "13.24.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+          "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
           "dev": true,
           "requires": {
             "type-fest": "^0.20.2"
@@ -29052,26 +31681,57 @@
         },
         "has-flag": {
           "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "ignore": {
-          "version": "4.0.6",
-          "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"
+          }
         },
         "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
         },
         "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": {
             "prelude-ls": "^1.2.1",
             "type-check": "~0.4.0"
           }
         },
+        "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"
+          }
+        },
+        "minimatch": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+          "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        },
         "optionator": {
-          "version": "0.9.1",
+          "version": "0.9.4",
+          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+          "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
           "dev": true,
           "requires": {
             "deep-is": "^0.1.3",
@@ -29079,19 +31739,43 @@
             "levn": "^0.4.1",
             "prelude-ls": "^1.2.1",
             "type-check": "^0.4.0",
-            "word-wrap": "^1.2.3"
+            "word-wrap": "^1.2.5"
           }
         },
-        "prelude-ls": {
-          "version": "1.2.1",
+        "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,
+          "requires": {
+            "yocto-queue": "^0.1.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==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^3.0.2"
+          }
+        },
+        "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
         },
-        "strip-json-comments": {
-          "version": "3.1.1",
+        "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
         },
         "supports-color": {
           "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -29099,6 +31783,8 @@
         },
         "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": {
             "prelude-ls": "^1.2.1"
@@ -29107,12 +31793,16 @@
       }
     },
     "eslint-config-prettier": {
-      "version": "8.3.0",
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz",
+      "integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==",
       "dev": true,
       "requires": {}
     },
     "eslint-import-resolver-babel-module": {
-      "version": "5.3.1",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-babel-module/-/eslint-import-resolver-babel-module-5.3.2.tgz",
+      "integrity": "sha512-K7D8n0O6p/JJncPote8yiuB7chJfu26Yn/Q3gzT53cNzJNS0NUCkI0iuimj4/vWVRHVQvPnYWeq07V8RvKjz/A==",
       "dev": true,
       "requires": {
         "pkg-up": "^3.1.0",
@@ -29120,11 +31810,14 @@
       }
     },
     "eslint-import-resolver-node": {
-      "version": "0.3.6",
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
+      "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
       "dev": true,
       "requires": {
         "debug": "^3.2.7",
-        "resolve": "^1.20.0"
+        "is-core-module": "^2.13.0",
+        "resolve": "^1.22.4"
       },
       "dependencies": {
         "debug": {
@@ -29137,14 +31830,12 @@
       }
     },
     "eslint-module-utils": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.1.tgz",
-      "integrity": "sha512-fjoetBXQZq2tSTWZ9yWVl2KuFrTZZH3V+9iD1V1RfpDgxzJR+mPd/KZmMiA8gbPqdBzpNiEHOuT7IYEWxrH0zQ==",
+      "version": "2.12.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz",
+      "integrity": "sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==",
       "dev": true,
       "requires": {
-        "debug": "^3.2.7",
-        "find-up": "^2.1.0",
-        "pkg-dir": "^2.0.0"
+        "debug": "^3.2.7"
       },
       "dependencies": {
         "debug": {
@@ -29155,264 +31846,342 @@
           "requires": {
             "ms": "^2.1.1"
           }
-        },
-        "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-          "dev": true,
-          "requires": {
-            "locate-path": "^2.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-          "dev": true,
-          "requires": {
-            "p-locate": "^2.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-          "dev": true,
-          "requires": {
-            "p-try": "^1.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-          "dev": true,
-          "requires": {
-            "p-limit": "^1.1.0"
-          }
-        },
-        "p-try": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-          "dev": true
-        },
-        "pkg-dir": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
-          "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
-          "dev": true,
-          "requires": {
-            "find-up": "^2.1.0"
-          }
         }
       }
     },
     "eslint-plugin-chai-expect": {
-      "version": "2.2.0",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-chai-expect/-/eslint-plugin-chai-expect-3.1.0.tgz",
+      "integrity": "sha512-a9F8b38hhJsR7fgDEfyMxppZXCnCW6OOHj7cQfygsm9guXqdSzfpwrHX5FT93gSExDqD71HQglF1lLkGBwhJ+g==",
       "dev": true,
       "requires": {}
     },
     "eslint-plugin-eslint-plugin": {
-      "version": "3.6.1",
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-eslint-plugin/-/eslint-plugin-eslint-plugin-5.5.1.tgz",
+      "integrity": "sha512-9AmfZzcQ7QHwpzfAQpZ7xdtwHYViylmlnruCH0aV64/tuoH3igGXg91vr0e6ShLf/mrAYGqLw5LZ/gOxJeRXnw==",
       "dev": true,
       "requires": {
-        "eslint-utils": "^2.1.0"
+        "eslint-utils": "^3.0.0",
+        "estraverse": "^5.3.0"
       }
     },
     "eslint-plugin-import": {
-      "version": "2.25.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.2.tgz",
-      "integrity": "sha512-qCwQr9TYfoBHOFcVGKY9C9unq05uOxxdklmBXLVvcwo68y5Hta6/GzCZEMx2zQiu0woKNEER0LE7ZgaOfBU14g==",
+      "version": "2.31.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz",
+      "integrity": "sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==",
       "dev": true,
       "requires": {
-        "array-includes": "^3.1.4",
-        "array.prototype.flat": "^1.2.5",
-        "debug": "^2.6.9",
+        "@rtsao/scc": "^1.1.0",
+        "array-includes": "^3.1.8",
+        "array.prototype.findlastindex": "^1.2.5",
+        "array.prototype.flat": "^1.3.2",
+        "array.prototype.flatmap": "^1.3.2",
+        "debug": "^3.2.7",
         "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.6",
-        "eslint-module-utils": "^2.7.0",
-        "has": "^1.0.3",
-        "is-core-module": "^2.7.0",
+        "eslint-import-resolver-node": "^0.3.9",
+        "eslint-module-utils": "^2.12.0",
+        "hasown": "^2.0.2",
+        "is-core-module": "^2.15.1",
         "is-glob": "^4.0.3",
-        "minimatch": "^3.0.4",
-        "object.values": "^1.1.5",
-        "resolve": "^1.20.0",
-        "tsconfig-paths": "^3.11.0"
+        "minimatch": "^3.1.2",
+        "object.fromentries": "^2.0.8",
+        "object.groupby": "^1.0.3",
+        "object.values": "^1.2.0",
+        "semver": "^6.3.1",
+        "string.prototype.trimend": "^1.0.8",
+        "tsconfig-paths": "^3.15.0"
       },
       "dependencies": {
         "debug": {
-          "version": "2.6.9",
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "dev": true,
           "requires": {
-            "ms": "2.0.0"
+            "ms": "^2.1.1"
           }
         },
         "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"
           }
         },
-        "ms": {
-          "version": "2.0.0",
+        "minimatch": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+          "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        },
+        "semver": {
+          "version": "6.3.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
           "dev": true
         }
       }
     },
     "eslint-plugin-jasmine": {
-      "version": "4.1.2",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jasmine/-/eslint-plugin-jasmine-4.2.2.tgz",
+      "integrity": "sha512-nALbewRk63uz28UGNhUTJyd6GofXxVNFpWFNAwr9ySc6kpSRIoO4suwZqIYz3cfJmCacilmjp7+1Ocjr7zRagA==",
       "dev": true
     },
     "eslint-plugin-jsdoc": {
-      "version": "36.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-36.1.1.tgz",
-      "integrity": "sha512-nuLDvH1EJaKx0PCa9oeQIxH6pACIhZd1gkalTUxZbaxxwokjs7TplqY0Q8Ew3CoZaf5aowm0g/Z3JGHCatt+gQ==",
+      "version": "48.11.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-48.11.0.tgz",
+      "integrity": "sha512-d12JHJDPNo7IFwTOAItCeJY1hcqoIxE0lHA8infQByLilQ9xkqrRa6laWCnsuCrf+8rUnvxXY1XuTbibRBNylA==",
       "dev": true,
       "requires": {
-        "@es-joy/jsdoccomment": "0.10.8",
-        "comment-parser": "1.2.4",
-        "debug": "^4.3.2",
-        "esquery": "^1.4.0",
-        "jsdoc-type-pratt-parser": "^1.1.1",
-        "lodash": "^4.17.21",
-        "regextras": "^0.8.0",
-        "semver": "^7.3.5",
-        "spdx-expression-parse": "^3.0.1"
+        "@es-joy/jsdoccomment": "~0.46.0",
+        "are-docs-informative": "^0.0.2",
+        "comment-parser": "1.4.1",
+        "debug": "^4.3.5",
+        "escape-string-regexp": "^4.0.0",
+        "espree": "^10.1.0",
+        "esquery": "^1.6.0",
+        "parse-imports": "^2.1.1",
+        "semver": "^7.6.3",
+        "spdx-expression-parse": "^4.0.0",
+        "synckit": "^0.9.1"
+      },
+      "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-visitor-keys": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz",
+          "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==",
+          "dev": true
+        },
+        "espree": {
+          "version": "10.1.0",
+          "resolved": "https://registry.npmjs.org/espree/-/espree-10.1.0.tgz",
+          "integrity": "sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==",
+          "dev": true,
+          "requires": {
+            "acorn": "^8.12.0",
+            "acorn-jsx": "^5.3.2",
+            "eslint-visitor-keys": "^4.0.0"
+          }
+        },
+        "semver": {
+          "version": "7.6.3",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+          "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+          "dev": true
+        }
       }
     },
     "eslint-plugin-local": {
-      "version": "1.0.0",
-      "dev": true
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-local/-/eslint-plugin-local-4.2.2.tgz",
+      "integrity": "sha512-9yNacxuEAVw2nYGCAj+ofx74cWODq7N7jcajlq1tzz6xuJS0WFhp72s/WSvIyJG6b/75+n63SKxUFVrt1UHmfQ==",
+      "dev": true,
+      "requires": {
+        "@thisismanta/pessimist": "^1.2.0",
+        "chalk": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
     },
     "eslint-plugin-module-resolver": {
-      "version": "1.4.0",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-module-resolver/-/eslint-plugin-module-resolver-1.5.0.tgz",
+      "integrity": "sha512-fz8oVazFk5jfZRCBgURDIM955QufKePsGNgpu+z/HWedy9HII6jir1PGts+p27rCWWwSw2LXoxS4xll2WH17fw==",
       "dev": true
     },
     "eslint-plugin-prettier": {
-      "version": "4.0.0",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.2.1.tgz",
+      "integrity": "sha512-gH3iR3g4JfF+yYPaJYkN7jEl9QbweL/YfkoRlNnuIEHEz1vHVlCmWOS+eGGiRuzHQXdJFCOTxRgvju9b8VUmrw==",
       "dev": true,
       "requires": {
-        "prettier-linter-helpers": "^1.0.0"
+        "prettier-linter-helpers": "^1.0.0",
+        "synckit": "^0.9.1"
       }
     },
     "eslint-plugin-react": {
-      "version": "7.26.1",
+      "version": "7.37.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.1.tgz",
+      "integrity": "sha512-xwTnwDqzbDRA8uJ7BMxPs/EXRB3i8ZfnOIp8BsxEQkT0nHPp+WWceqGgo6rKb9ctNi8GJLDT4Go5HAWELa/WMg==",
       "dev": true,
       "requires": {
-        "array-includes": "^3.1.3",
-        "array.prototype.flatmap": "^1.2.4",
+        "array-includes": "^3.1.8",
+        "array.prototype.findlast": "^1.2.5",
+        "array.prototype.flatmap": "^1.3.2",
+        "array.prototype.tosorted": "^1.1.4",
         "doctrine": "^2.1.0",
-        "estraverse": "^5.2.0",
+        "es-iterator-helpers": "^1.0.19",
+        "estraverse": "^5.3.0",
+        "hasown": "^2.0.2",
         "jsx-ast-utils": "^2.4.1 || ^3.0.0",
-        "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.5"
+        "minimatch": "^3.1.2",
+        "object.entries": "^1.1.8",
+        "object.fromentries": "^2.0.8",
+        "object.values": "^1.2.0",
+        "prop-types": "^15.8.1",
+        "resolve": "^2.0.0-next.5",
+        "semver": "^6.3.1",
+        "string.prototype.matchall": "^4.0.11",
+        "string.prototype.repeat": "^1.0.0"
       },
       "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.2.0",
-          "dev": true
-        },
-        "object.entries": {
-          "version": "1.1.4",
+        "minimatch": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+          "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
           "dev": true,
           "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.3",
-            "es-abstract": "^1.18.2"
+            "brace-expansion": "^1.1.7"
           }
         },
         "resolve": {
-          "version": "2.0.0-next.3",
+          "version": "2.0.0-next.5",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz",
+          "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==",
           "dev": true,
           "requires": {
-            "is-core-module": "^2.2.0",
-            "path-parse": "^1.0.6"
+            "is-core-module": "^2.13.0",
+            "path-parse": "^1.0.7",
+            "supports-preserve-symlinks-flag": "^1.0.0"
           }
         },
         "semver": {
-          "version": "6.3.0",
+          "version": "6.3.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
           "dev": true
         }
       }
     },
     "eslint-plugin-react-hooks": {
-      "version": "4.2.0",
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz",
+      "integrity": "sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==",
       "dev": true,
       "requires": {}
     },
     "eslint-plugin-sort-destructure-keys": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-sort-destructure-keys/-/eslint-plugin-sort-destructure-keys-1.4.0.tgz",
-      "integrity": "sha512-txU9l22mblz7YpyjJNYFy4wb5PVXiRMbc9lqFPPhvY4wKyBBYQvb31TIcduf7iRb4Bv01aiXcJiuCkOOrVY48Q==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-sort-destructure-keys/-/eslint-plugin-sort-destructure-keys-1.6.0.tgz",
+      "integrity": "sha512-cdjR/+D6RlMSgOcDA48nXOF5S+fMKhVFgJs9n59PZVH7dv5xzeCReujM9Qkwcz4jiHt5GPti5wjCJpM58CMmkg==",
       "dev": true,
       "requires": {
         "natural-compare-lite": "^1.4.0"
       }
     },
-    "eslint-plugin-sort-requires": {
-      "version": "2.1.0",
-      "dev": true
-    },
     "eslint-scope": {
-      "version": "5.1.1",
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
       "dev": true,
       "requires": {
         "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
+        "estraverse": "^5.2.0"
       }
     },
     "eslint-utils": {
-      "version": "2.1.0",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
       "dev": true,
       "requires": {
-        "eslint-visitor-keys": "^1.1.0"
+        "eslint-visitor-keys": "^2.0.0"
       },
       "dependencies": {
         "eslint-visitor-keys": {
-          "version": "1.3.0",
+          "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==",
           "dev": true
         }
       }
     },
     "eslint-visitor-keys": {
-      "version": "2.1.0",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
       "dev": true
     },
     "espree": {
-      "version": "7.3.1",
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
       "dev": true,
       "requires": {
-        "acorn": "^7.4.0",
-        "acorn-jsx": "^5.3.1",
-        "eslint-visitor-keys": "^1.3.0"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "7.4.1",
-          "dev": true
-        },
-        "eslint-visitor-keys": {
-          "version": "1.3.0",
-          "dev": true
-        }
+        "acorn": "^8.9.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.4.1"
       }
     },
     "esprima": {
@@ -29420,33 +32189,33 @@
       "dev": true
     },
     "esquery": {
-      "version": "1.4.0",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
+      "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
       "dev": true,
       "requires": {
         "estraverse": "^5.1.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.2.0",
-          "dev": true
-        }
       }
     },
     "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": {
         "estraverse": "^5.2.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.2.0",
-          "dev": true
-        }
       }
     },
     "estraverse": {
-      "version": "4.3.0",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true
+    },
+    "estree-walker": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
       "dev": true
     },
     "esutils": {
@@ -29470,89 +32239,37 @@
         "through": "^2.3.8"
       }
     },
-    "event-target-shim": {
-      "version": "5.0.1",
-      "dev": true
-    },
     "eventemitter3": {
       "version": "4.0.7",
-      "dev": true
-    },
-    "events": {
-      "version": "3.3.0",
-      "dev": true
-    },
-    "execa": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-      "dev": true,
-      "requires": {
-        "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"
-      },
-      "dependencies": {
-        "get-stream": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-          "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-          "dev": true
-        }
-      }
-    },
-    "exit": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-      "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
-      "dev": true
-    },
-    "expand-brackets": {
-      "version": "2.1.4",
-      "dev": true,
-      "requires": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "define-property": {
-          "version": "0.2.5",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "dev": true
-        }
+      "dev": true
+    },
+    "events": {
+      "version": "3.3.0",
+      "dev": true
+    },
+    "execa": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+      "dev": true,
+      "requires": {
+        "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"
       }
     },
+    "exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
+      "dev": true
+    },
     "expand-range": {
       "version": "1.8.2",
       "dev": true,
@@ -29594,54 +32311,50 @@
         }
       }
     },
-    "expand-tilde": {
-      "version": "2.0.2",
-      "dev": true,
-      "requires": {
-        "homedir-polyfill": "^1.0.1"
-      }
-    },
     "expect": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-27.3.1.tgz",
-      "integrity": "sha512-MrNXV2sL9iDRebWPGOGFdPQRl2eDQNu/uhxIMShjjx74T6kC6jFIkmQ6OqXDtevjGUkyB2IT56RzDBqXf/QPCg==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
+      "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
       "dev": true,
       "requires": {
-        "@jest/types": "^27.2.5",
-        "ansi-styles": "^5.0.0",
-        "jest-get-type": "^27.3.1",
-        "jest-matcher-utils": "^27.3.1",
-        "jest-message-util": "^27.3.1",
-        "jest-regex-util": "^27.0.6"
+        "@jest/expect-utils": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "27.2.5",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-          "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+          "version": "29.6.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+          "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
           "dev": true,
           "requires": {
+            "@jest/schemas": "^29.6.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
-            "@types/yargs": "^16.0.0",
+            "@types/yargs": "^17.0.8",
             "chalk": "^4.0.0"
           }
         },
         "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "version": "17.0.32",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+          "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
           }
         },
         "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-          "dev": true
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
         },
         "chalk": {
           "version": "4.1.2",
@@ -29651,19 +32364,14 @@
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
-          },
-          "dependencies": {
-            "ansi-styles": {
-              "version": "4.3.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-              "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-              "dev": true,
-              "requires": {
-                "color-convert": "^2.0.1"
-              }
-            }
           }
         },
+        "ci-info": {
+          "version": "3.9.0",
+          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+          "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+          "dev": true
+        },
         "color-convert": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -29685,6 +32393,20 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "jest-util": {
+          "version": "29.7.0",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+          "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^29.6.3",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          }
+        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -29697,138 +32419,160 @@
       }
     },
     "express": {
-      "version": "4.17.1",
+      "version": "4.20.0",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.20.0.tgz",
+      "integrity": "sha512-pLdae7I6QqShF5PnNTCVn4hI91Dx0Grkn2+IAsMTgMIKuQVte2dN9PeGSSAME2FR8anOhVA62QDIUaWVfEXVLw==",
       "dev": true,
       "requires": {
-        "accepts": "~1.3.7",
+        "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.19.0",
-        "content-disposition": "0.5.3",
+        "body-parser": "1.20.3",
+        "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.4.0",
+        "cookie": "0.6.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "encodeurl": "~1.0.2",
+        "depd": "2.0.0",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
+        "finalhandler": "1.2.0",
         "fresh": "0.5.2",
-        "merge-descriptors": "1.0.1",
+        "http-errors": "2.0.0",
+        "merge-descriptors": "1.0.3",
         "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.5",
-        "qs": "6.7.0",
+        "path-to-regexp": "0.1.10",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.11.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",
+        "safe-buffer": "5.2.1",
+        "send": "0.19.0",
+        "serve-static": "1.16.0",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
       },
       "dependencies": {
-        "array-flatten": {
-          "version": "1.1.1",
-          "dev": true
-        },
         "debug": {
           "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
           }
         },
-        "ms": {
+        "depd": {
           "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
           "dev": true
         },
-        "qs": {
-          "version": "6.7.0",
+        "destroy": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+          "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
           "dev": true
-        }
-      }
-    },
-    "extend": {
-      "version": "3.0.2",
-      "dev": true
-    },
-    "extend-shallow": {
-      "version": "3.0.2",
-      "dev": true,
-      "requires": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
-      }
-    },
-    "extglob": {
-      "version": "2.0.4",
-      "dev": true,
-      "requires": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
         },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
+        "encodeurl": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+          "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
+          "dev": true
         },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
+        "finalhandler": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+          "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "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"
+          },
+          "dependencies": {
+            "encodeurl": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+              "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+              "dev": true
+            }
           }
         },
-        "is-data-descriptor": {
-          "version": "1.0.0",
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+          "dev": true
+        },
+        "on-finished": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+          "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "ee-first": "1.1.1"
           }
         },
-        "is-descriptor": {
-          "version": "1.0.2",
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
+        },
+        "send": {
+          "version": "0.19.0",
+          "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
+          "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "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"
+          },
+          "dependencies": {
+            "encodeurl": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+              "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+              "dev": true
+            },
+            "ms": {
+              "version": "2.1.3",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+              "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+              "dev": true
+            }
           }
+        },
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+          "dev": true
         }
       }
     },
-    "extsprintf": {
-      "version": "1.3.0",
+    "extend": {
+      "version": "3.0.2",
       "dev": true
     },
     "fancy-log": {
@@ -29850,7 +32594,9 @@
       "dev": true
     },
     "fast-glob": {
-      "version": "3.2.7",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
       "dev": true,
       "requires": {
         "@nodelib/fs.stat": "^2.0.2",
@@ -29868,27 +32614,15 @@
       "version": "2.0.6",
       "dev": true
     },
-    "fast-text-encoding": {
-      "version": "1.0.3",
-      "dev": true
-    },
-    "fast-url-parser": {
-      "version": "1.1.3",
+    "fast-xml-parser": {
+      "version": "4.2.5",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.5.tgz",
+      "integrity": "sha512-B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g==",
       "dev": true,
       "requires": {
-        "punycode": "^1.3.2"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.4.1",
-          "dev": true
-        }
+        "strnum": "^1.0.5"
       }
     },
-    "fastparse": {
-      "version": "1.1.2",
-      "dev": true
-    },
     "fastq": {
       "version": "1.8.0",
       "dev": true,
@@ -29904,9 +32638,9 @@
       }
     },
     "fb-watchman": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
-      "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
+      "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
       "dev": true,
       "requires": {
         "bser": "2.1.1"
@@ -29955,262 +32689,106 @@
       }
     },
     "figures": {
-      "version": "3.2.0",
-      "dev": true,
-      "requires": {
-        "escape-string-regexp": "^1.0.5"
-      }
-    },
-    "file-entry-cache": {
       "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-6.0.1.tgz",
+      "integrity": "sha512-0oY/olScYD4IhQ8u//gCPA4F3mlTn2dacYmiDm/mbDQvpmLjV4uH+zhsQ5IyXRyvqkvtUkXkNdGvg5OFJTCsuQ==",
       "dev": true,
       "requires": {
-        "flat-cache": "^3.0.4"
-      }
-    },
-    "fill-range": {
-      "version": "7.0.1",
-      "dev": true,
-      "requires": {
-        "to-regex-range": "^5.0.1"
-      }
-    },
-    "finalhandler": {
-      "version": "1.1.2",
-      "dev": true,
-      "requires": {
-        "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"
+        "is-unicode-supported": "^2.0.0"
       },
       "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
+        "is-unicode-supported": {
           "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-2.0.0.tgz",
+          "integrity": "sha512-FRdAyx5lusK1iHG0TWpVtk9+1i+GjrzRffhDg4ovQ7mcidMQ6mj+MhKPmvh7Xwyv5gIS06ns49CA7Sqg7lC22Q==",
           "dev": true
         }
       }
     },
-    "find-babel-config": {
-      "version": "1.2.0",
+    "file-entry-cache": {
+      "version": "6.0.1",
       "dev": true,
       "requires": {
-        "json5": "^0.5.1",
-        "path-exists": "^3.0.0"
-      },
-      "dependencies": {
-        "json5": {
-          "version": "0.5.1",
-          "dev": true
-        }
+        "flat-cache": "^3.0.4"
       }
     },
-    "find-cache-dir": {
-      "version": "2.1.0",
+    "file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true
+    },
+    "fill-range": {
+      "version": "7.0.1",
       "dev": true,
-      "requires": {
-        "commondir": "^1.0.1",
-        "make-dir": "^2.0.0",
-        "pkg-dir": "^3.0.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "3.0.0",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "make-dir": {
-          "version": "2.1.0",
-          "dev": true,
-          "requires": {
-            "pify": "^4.0.1",
-            "semver": "^5.6.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "pify": {
-          "version": "4.0.1",
-          "dev": true
-        },
-        "pkg-dir": {
-          "version": "3.0.0",
+      "requires": {
+        "to-regex-range": "^5.0.1"
+      }
+    },
+    "finalhandler": {
+      "version": "1.1.2",
+      "dev": true,
+      "requires": {
+        "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"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
           "dev": true,
           "requires": {
-            "find-up": "^3.0.0"
+            "ms": "2.0.0"
           }
         },
-        "semver": {
-          "version": "5.7.1",
+        "ms": {
+          "version": "2.0.0",
           "dev": true
         }
       }
     },
-    "find-up": {
-      "version": "4.1.0",
+    "find-babel-config": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/find-babel-config/-/find-babel-config-2.0.0.tgz",
+      "integrity": "sha512-dOKT7jvF3hGzlW60Gc3ONox/0rRZ/tz7WCil0bqA1In/3I8f1BctpXahRnEKDySZqci7u+dqq93sZST9fOJpFw==",
       "dev": true,
       "requires": {
-        "locate-path": "^5.0.0",
+        "json5": "^2.1.1",
         "path-exists": "^4.0.0"
       },
       "dependencies": {
         "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
         }
       }
     },
-    "findup-sync": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
-      "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
+    "find-up": {
+      "version": "4.1.0",
       "dev": true,
       "requires": {
-        "detect-file": "^1.0.0",
-        "is-glob": "^3.1.0",
-        "micromatch": "^3.0.4",
-        "resolve-dir": "^1.0.1"
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
       },
       "dependencies": {
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
+        "path-exists": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "is-glob": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^2.1.0"
-          }
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        },
-        "to-regex-range": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-          "dev": true,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
+          "dev": true
         }
       }
     },
+    "find-up-simple": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/find-up-simple/-/find-up-simple-1.0.0.tgz",
+      "integrity": "sha512-q7Us7kcjj2VMePAa02hDAF6d+MzsdsAWEwYyOpwUtlerRBkOEPBCRZrAV4XfcSN8fHAgaD0hP7miwoay6DCprw==",
+      "dev": true
+    },
     "flat": {
       "version": "5.0.2",
       "dev": true
@@ -30221,74 +32799,65 @@
       "requires": {
         "flatted": "^3.1.0",
         "rimraf": "^3.0.2"
-      },
-      "dependencies": {
-        "flatted": {
-          "version": "3.2.2",
-          "dev": true
-        }
       }
     },
     "flatted": {
-      "version": "2.0.2",
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
       "dev": true
     },
-    "flow-parser": {
-      "version": "0.158.0",
+    "follow-redirects": {
+      "version": "1.14.2",
       "dev": true
     },
-    "flush-write-stream": {
-      "version": "1.1.1",
+    "for-each": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.3.6"
+        "is-callable": "^1.1.3"
       }
     },
-    "follow-redirects": {
-      "version": "1.14.2",
-      "dev": true
-    },
     "for-in": {
       "version": "1.0.2",
       "dev": true
     },
-    "foreach": {
-      "version": "2.0.5",
-      "dev": true
-    },
-    "forever-agent": {
-      "version": "0.6.1",
-      "dev": true
-    },
     "form-data": {
-      "version": "2.3.3",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
       "dev": true,
       "requires": {
         "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
+        "combined-stream": "^1.0.8",
         "mime-types": "^2.1.12"
       }
     },
     "formidable": {
-      "version": "1.2.2",
-      "dev": true
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.1.tgz",
+      "integrity": "sha512-WJWKelbRHN41m5dumb0/k8TeAx7Id/y3a+Z7QfhxP/htI9Js5zYaEDtG8uMgG0vM0lOlqnmjE99/kfpOYi/0Og==",
+      "dev": true,
+      "requires": {
+        "dezalgo": "^1.0.4",
+        "hexoid": "^1.0.0",
+        "once": "^1.4.0"
+      }
     },
     "forwarded": {
-      "version": "0.1.2",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
       "dev": true
     },
     "fraction.js": {
-      "version": "4.1.1",
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz",
+      "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==",
       "dev": true
     },
-    "fragment-cache": {
-      "version": "0.2.1",
-      "dev": true,
-      "requires": {
-        "map-cache": "^0.2.2"
-      }
-    },
     "fresh": {
       "version": "0.5.2",
       "dev": true
@@ -30298,7 +32867,9 @@
       "dev": true
     },
     "fs-extra": {
-      "version": "10.0.0",
+      "version": "11.2.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.2.0",
@@ -30319,101 +32890,56 @@
         "minipass": "^3.0.0"
       }
     },
-    "fs-mkdirp-stream": {
-      "version": "1.0.0",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.11",
-        "through2": "^2.0.3"
-      }
-    },
     "fs.realpath": {
       "version": "1.0.0",
       "dev": true
     },
     "fsevents": {
-      "version": "2.3.2",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "dev": true,
       "optional": true
     },
     "function-bind": {
-      "version": "1.1.1"
-    },
-    "function.prototype.name": {
       "version": "1.1.2",
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1",
-        "functions-have-names": "^1.2.0"
-      }
-    },
-    "functional-red-black-tree": {
-      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
       "dev": true
     },
-    "functions-have-names": {
-      "version": "1.2.1"
-    },
-    "gaxios": {
-      "version": "4.3.2",
+    "function.prototype.name": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
+      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
       "dev": true,
       "requires": {
-        "abort-controller": "^3.0.0",
-        "extend": "^3.0.2",
-        "https-proxy-agent": "^5.0.0",
-        "is-stream": "^2.0.0",
-        "node-fetch": "^2.6.1"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "functions-have-names": "^1.2.3"
       }
     },
-    "gcp-metadata": {
-      "version": "4.3.1",
-      "dev": true,
-      "requires": {
-        "gaxios": "^4.0.0",
-        "json-bigint": "^1.0.0"
-      }
+    "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
     },
-    "gcs-resumable-upload": {
-      "version": "3.3.1",
+    "gauge": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
+      "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
       "dev": true,
       "requires": {
-        "abort-controller": "^3.0.0",
-        "configstore": "^5.0.0",
-        "extend": "^3.0.2",
-        "gaxios": "^4.0.0",
-        "google-auth-library": "^7.0.0",
-        "pumpify": "^2.0.0",
-        "stream-events": "^1.0.4"
-      },
-      "dependencies": {
-        "duplexify": {
-          "version": "4.1.2",
-          "dev": true,
-          "requires": {
-            "end-of-stream": "^1.4.1",
-            "inherits": "^2.0.3",
-            "readable-stream": "^3.1.1",
-            "stream-shift": "^1.0.0"
-          }
-        },
-        "pumpify": {
-          "version": "2.0.1",
-          "dev": true,
-          "requires": {
-            "duplexify": "^4.1.1",
-            "inherits": "^2.0.3",
-            "pump": "^3.0.0"
-          }
-        },
-        "readable-stream": {
-          "version": "3.6.0",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
+        "aproba": "^1.0.3 || ^2.0.0",
+        "color-support": "^1.1.2",
+        "console-control-strings": "^1.0.0",
+        "has-unicode": "^2.0.1",
+        "object-assign": "^4.1.1",
+        "signal-exit": "^3.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
+        "wide-align": "^1.1.2"
       }
     },
     "gensync": {
@@ -30424,16 +32950,29 @@
       "version": "2.0.5",
       "dev": true
     },
+    "get-east-asian-width": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.2.0.tgz",
+      "integrity": "sha512-2nk+7SIVb14QrgXFHcm84tD4bKQz0RxPuMT8Ag5KPOq7J5fEmAg0UbXdTOSHqNuHSU28k55qnceesxXRZGzKWA==",
+      "dev": true
+    },
     "get-func-name": {
-      "version": "2.0.0",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
+      "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
       "dev": true
     },
     "get-intrinsic": {
-      "version": "1.0.2",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+      "dev": true,
       "requires": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1"
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
       }
     },
     "get-package-type": {
@@ -30445,196 +32984,121 @@
       "dev": true
     },
     "get-stream": {
-      "version": "4.1.0",
-      "dev": true,
-      "requires": {
-        "pump": "^3.0.0"
-      }
-    },
-    "get-symbol-description": {
-      "version": "1.0.0",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
-      },
-      "dependencies": {
-        "get-intrinsic": {
-          "version": "1.1.1",
-          "requires": {
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1"
-          }
-        }
-      }
-    },
-    "get-value": {
-      "version": "2.0.6",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
       "dev": true
     },
-    "getpass": {
-      "version": "0.1.7",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
-    "glob": {
-      "version": "7.1.6",
-      "dev": true,
-      "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "glob-parent": {
-      "version": "5.1.2",
-      "dev": true,
-      "requires": {
-        "is-glob": "^4.0.1"
-      }
-    },
-    "glob-stream": {
-      "version": "6.1.0",
+    "get-symbol-description": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz",
+      "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==",
       "dev": true,
       "requires": {
-        "extend": "^3.0.0",
-        "glob": "^7.1.1",
-        "glob-parent": "^3.1.0",
-        "is-negated-glob": "^1.0.0",
-        "ordered-read-streams": "^1.0.0",
-        "pumpify": "^1.3.5",
-        "readable-stream": "^2.1.5",
-        "remove-trailing-separator": "^1.0.1",
-        "to-absolute-glob": "^2.0.0",
-        "unique-stream": "^2.0.2"
-      },
-      "dependencies": {
-        "glob-parent": {
-          "version": "3.1.0",
-          "dev": true,
-          "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
-          }
-        },
-        "is-glob": {
-          "version": "3.1.0",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^2.1.0"
-          }
-        }
+        "call-bind": "^1.0.5",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4"
       }
     },
-    "glob-to-regexp": {
-      "version": "0.4.1",
-      "dev": true
-    },
-    "global-cache": {
-      "version": "1.2.1",
+    "get-uri": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.3.tgz",
+      "integrity": "sha512-BzUrJBS9EcUb4cFol8r4W3v1cPsSyajLSthNkz5BxbpDcHN5tIrM10E2eNvfnvBn3DaT3DUgx0OpsBKkaOpanw==",
+      "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "is-symbol": "^1.0.1"
+        "basic-ftp": "^5.0.2",
+        "data-uri-to-buffer": "^6.0.2",
+        "debug": "^4.3.4",
+        "fs-extra": "^11.2.0"
       }
     },
-    "global-dirs": {
-      "version": "3.0.0",
+    "glob": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
       "dev": true,
       "requires": {
-        "ini": "2.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"
       },
       "dependencies": {
-        "ini": {
-          "version": "2.0.0",
-          "dev": true
+        "minimatch": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+          "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
         }
       }
     },
-    "global-modules": {
-      "version": "1.0.0",
+    "glob-parent": {
+      "version": "5.1.2",
       "dev": true,
       "requires": {
-        "global-prefix": "^1.0.1",
-        "is-windows": "^1.0.1",
-        "resolve-dir": "^1.0.0"
+        "is-glob": "^4.0.1"
       }
     },
-    "global-prefix": {
-      "version": "1.0.2",
-      "dev": true,
-      "requires": {
-        "expand-tilde": "^2.0.2",
-        "homedir-polyfill": "^1.0.1",
-        "ini": "^1.3.4",
-        "is-windows": "^1.0.1",
-        "which": "^1.2.14"
-      }
+    "glob-to-regexp": {
+      "version": "0.4.1",
+      "dev": true
     },
     "globals": {
       "version": "11.12.0",
       "dev": true
     },
-    "globby": {
-      "version": "11.0.4",
+    "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": {
-        "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"
+        "define-properties": "^1.1.3"
       }
     },
-    "google-auth-library": {
-      "version": "7.10.0",
+    "globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
       "dev": true,
       "requires": {
-        "arrify": "^2.0.0",
-        "base64-js": "^1.3.0",
-        "ecdsa-sig-formatter": "^1.0.11",
-        "fast-text-encoding": "^1.0.0",
-        "gaxios": "^4.0.0",
-        "gcp-metadata": "^4.2.0",
-        "gtoken": "^5.0.4",
-        "jws": "^4.0.0",
-        "lru-cache": "^6.0.0"
+        "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"
       }
     },
     "google-closure-library": {
-      "version": "20210808.0.0"
-    },
-    "google-p12-pem": {
-      "version": "3.1.2",
-      "dev": true,
-      "requires": {
-        "node-forge": "^0.10.0"
-      }
+      "version": "20230802.0.0",
+      "resolved": "https://registry.npmjs.org/google-closure-library/-/google-closure-library-20230802.0.0.tgz",
+      "integrity": "sha512-h2lBEX2tjWwfR+dhFukGER15vKY+4cA3nRqwKSOsBdyizlOxTAHOWbEYiGnMoom3/SrVeQ5uG0eKsbxQ3wbsxA=="
     },
-    "got": {
-      "version": "9.6.0",
+    "gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
       "dev": true,
       "requires": {
-        "@sindresorhus/is": "^0.14.0",
-        "@szmarczak/http-timer": "^1.1.2",
-        "cacheable-request": "^6.0.0",
-        "decompress-response": "^3.3.0",
-        "duplexer3": "^0.1.4",
-        "get-stream": "^4.1.0",
-        "lowercase-keys": "^1.0.1",
-        "mimic-response": "^1.0.1",
-        "p-cancelable": "^1.0.0",
-        "to-readable-stream": "^1.0.0",
-        "url-parse-lax": "^3.0.0"
+        "get-intrinsic": "^1.1.3"
       }
     },
     "graceful-fs": {
-      "version": "4.2.4",
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "dev": true
+    },
+    "graphemer": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
       "dev": true
     },
     "gray-matter": {
@@ -30657,19 +33121,6 @@
         }
       }
     },
-    "growl": {
-      "version": "1.10.5",
-      "dev": true
-    },
-    "gtoken": {
-      "version": "5.3.1",
-      "dev": true,
-      "requires": {
-        "gaxios": "^4.0.0",
-        "google-p12-pem": "^3.0.3",
-        "jws": "^4.0.0"
-      }
-    },
     "gulp-connect": {
       "version": "5.7.0",
       "dev": true,
@@ -30800,118 +33251,76 @@
         }
       }
     },
-    "har-schema": {
-      "version": "2.0.0",
-      "dev": true
-    },
-    "har-validator": {
-      "version": "5.1.5",
-      "dev": true,
-      "requires": {
-        "ajv": "^6.12.3",
-        "har-schema": "^2.0.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "dev": true
-        }
-      }
-    },
     "has": {
       "version": "1.0.3",
+      "dev": true,
       "requires": {
         "function-bind": "^1.1.1"
       }
     },
     "has-bigints": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
-      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA=="
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "dev": true
     },
     "has-flag": {
       "version": "3.0.0",
       "dev": true
     },
-    "has-symbols": {
+    "has-property-descriptors": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="
-    },
-    "has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-      "requires": {
-        "has-symbols": "^1.0.2"
-      }
-    },
-    "has-value": {
-      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
       "dev": true,
       "requires": {
-        "get-value": "^2.0.6",
-        "has-values": "^1.0.0",
-        "isobject": "^3.0.0"
+        "es-define-property": "^1.0.0"
       }
     },
-    "has-values": {
-      "version": "1.0.0",
+    "has-proto": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
+      "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==",
+      "dev": true
+    },
+    "has-tostringtag": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
       "dev": true,
       "requires": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
-      },
-      "dependencies": {
-        "is-number": {
-          "version": "3.0.0",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "kind-of": {
-          "version": "4.0.0",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
+        "has-symbols": "^1.0.3"
       }
     },
-    "has-yarn": {
-      "version": "2.1.0",
+    "has-unicode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
       "dev": true
     },
-    "hash-stream-validation": {
-      "version": "0.2.4",
-      "dev": true
+    "hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.2"
+      }
     },
     "he": {
       "version": "1.2.0",
       "dev": true
     },
-    "highlight.js": {
-      "version": "10.7.2",
+    "hexoid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-1.0.0.tgz",
+      "integrity": "sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==",
       "dev": true
     },
     "hoist-non-react-statics": {
@@ -30920,19 +33329,6 @@
         "react-is": "^16.7.0"
       }
     },
-    "homedir-polyfill": {
-      "version": "1.0.3",
-      "dev": true,
-      "requires": {
-        "parse-passwd": "^1.0.0"
-      }
-    },
-    "hosted-git-info": {
-      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-      "dev": true
-    },
     "html-element-map": {
       "version": "1.2.0",
       "dev": true,
@@ -30941,16 +33337,27 @@
       }
     },
     "html-encoding-sniffer": {
-      "version": "2.0.1",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz",
+      "integrity": "sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==",
       "dev": true,
       "requires": {
-        "whatwg-encoding": "^1.0.5"
+        "whatwg-encoding": "^3.1.1"
       }
     },
     "html-escaper": {
       "version": "2.0.2",
       "dev": true
     },
+    "html-link-extractor": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/html-link-extractor/-/html-link-extractor-1.0.5.tgz",
+      "integrity": "sha512-ADd49pudM157uWHwHQPUSX4ssMsvR/yHIswOR5CUfBdK9g9ZYGMhVSE6KZVHJ6kCkR0gH4htsfzU6zECDNVwyw==",
+      "dev": true,
+      "requires": {
+        "cheerio": "^1.0.0-rc.10"
+      }
+    },
     "html-minifier": {
       "version": "4.0.0",
       "dev": true,
@@ -30980,23 +33387,29 @@
         "entities": "^2.0.0"
       }
     },
-    "http-cache-semantics": {
-      "version": "4.1.0",
-      "dev": true
-    },
     "http-errors": {
-      "version": "1.7.2",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
       "dev": true,
       "requires": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.1",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
       },
       "dependencies": {
-        "inherits": {
-          "version": "2.0.3",
+        "depd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+          "dev": true
+        },
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
           "dev": true
         }
       }
@@ -31015,25 +33428,30 @@
       }
     },
     "http-proxy-agent": {
-      "version": "4.0.1",
-      "dev": true,
-      "requires": {
-        "@tootallnate/once": "1",
-        "agent-base": "6",
-        "debug": "4"
-      }
-    },
-    "http-signature": {
-      "version": "1.2.0",
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
       "dev": true,
       "requires": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
+      },
+      "dependencies": {
+        "agent-base": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
+          "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==",
+          "dev": true,
+          "requires": {
+            "debug": "^4.3.4"
+          }
+        }
       }
     },
     "https-proxy-agent": {
-      "version": "5.0.0",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
       "dev": true,
       "requires": {
         "agent-base": "6",
@@ -31053,32 +33471,29 @@
     },
     "iconv-lite": {
       "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
       "dev": true,
       "requires": {
         "safer-buffer": ">= 2.1.2 < 3"
       }
     },
-    "ieee754": {
-      "version": "1.1.13",
-      "dev": true
-    },
     "ignore": {
-      "version": "5.1.8",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
+      "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
       "dev": true
     },
     "ignore-by-default": {
-      "version": "2.0.0",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-2.1.0.tgz",
+      "integrity": "sha512-yiWd4GVmJp0Q6ghmM2B/V3oZGRmjrKLXvHR3TE1nfoXsmoggllfZUQe74EN0fJdPFZu2NIvNdrMMLm3OsV7Ohw==",
       "dev": true
     },
-    "ignore-walk": {
-      "version": "3.0.4",
-      "dev": true,
-      "requires": {
-        "minimatch": "^3.0.4"
-      }
-    },
     "import-fresh": {
       "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
       "dev": true,
       "requires": {
         "parent-module": "^1.0.0",
@@ -31087,22 +33502,12 @@
       "dependencies": {
         "resolve-from": {
           "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
           "dev": true
         }
       }
     },
-    "import-lazy": {
-      "version": "2.1.0",
-      "dev": true
-    },
-    "import-local": {
-      "version": "3.0.2",
-      "dev": true,
-      "requires": {
-        "pkg-dir": "^4.2.0",
-        "resolve-cwd": "^3.0.0"
-      }
-    },
     "imurmurhash": {
       "version": "0.1.4",
       "dev": true
@@ -31123,82 +33528,93 @@
       "version": "2.0.4",
       "dev": true
     },
-    "ini": {
-      "version": "1.3.8",
-      "dev": true
-    },
     "internal-slot": {
-      "version": "1.0.3",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
+      "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==",
+      "dev": true,
       "requires": {
-        "get-intrinsic": "^1.1.0",
-        "has": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "hasown": "^2.0.0",
         "side-channel": "^1.0.4"
-      },
-      "dependencies": {
-        "get-intrinsic": {
-          "version": "1.1.1",
-          "requires": {
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1"
-          }
-        }
       }
     },
     "intersection-observer": {
       "version": "0.12.0"
     },
+    "ip-address": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
+      "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
+      "dev": true,
+      "requires": {
+        "jsbn": "1.1.0",
+        "sprintf-js": "^1.1.3"
+      },
+      "dependencies": {
+        "sprintf-js": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+          "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
+          "dev": true
+        }
+      }
+    },
     "ipaddr.js": {
       "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
       "dev": true
     },
     "irregular-plurals": {
-      "version": "3.2.0",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.5.0.tgz",
+      "integrity": "sha512-1ANGLZ+Nkv1ptFb2pa8oG8Lem4krflKuX/gINiHJHjJUKaJHk/SXk5x6K3J+39/p0h1RQ2saROclJJ+QLvETCQ==",
       "dev": true
     },
-    "is-absolute": {
-      "version": "1.0.0",
+    "is-absolute-url": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-4.0.1.tgz",
+      "integrity": "sha512-/51/TKE88Lmm7Gc4/8btclNXWS+g50wXhYJq8HWIBAGUBnoAdRu1aXeh364t/O7wXDAcTJDP8PNuNKWUDWie+A==",
+      "dev": true
+    },
+    "is-arguments": {
+      "version": "1.1.0",
       "dev": true,
       "requires": {
-        "is-relative": "^1.0.0",
-        "is-windows": "^1.0.1"
+        "call-bind": "^1.0.0"
       }
     },
-    "is-absolute-url": {
-      "version": "3.0.3",
-      "dev": true
-    },
-    "is-accessor-descriptor": {
-      "version": "0.1.6",
+    "is-array-buffer": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
+      "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==",
       "dev": true,
       "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.1"
       }
     },
-    "is-arguments": {
-      "version": "1.1.0",
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "dev": true
+    },
+    "is-async-function": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz",
+      "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.0"
+        "has-tostringtag": "^1.0.0"
       }
     },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "dev": true
-    },
     "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"
       }
@@ -31214,6 +33630,7 @@
       "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": {
         "call-bind": "^1.0.2",
         "has-tostringtag": "^1.0.0"
@@ -31224,9 +33641,10 @@
       "dev": true
     },
     "is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "dev": true
     },
     "is-ci": {
       "version": "2.0.0",
@@ -31236,56 +33654,36 @@
       }
     },
     "is-core-module": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz",
-      "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==",
+      "version": "2.15.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
+      "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
       "dev": true,
       "requires": {
-        "has": "^1.0.3"
+        "hasown": "^2.0.2"
       }
     },
-    "is-data-descriptor": {
-      "version": "0.1.4",
+    "is-data-view": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz",
+      "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==",
       "dev": true,
       "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
+        "is-typed-array": "^1.1.13"
       }
     },
     "is-date-object": {
-      "version": "1.0.2"
-    },
-    "is-descriptor": {
-      "version": "0.1.6",
+      "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": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "5.1.0",
-          "dev": true
-        }
+        "has-tostringtag": "^1.0.0"
       }
     },
     "is-docker": {
       "version": "2.1.1",
       "dev": true
     },
-    "is-error": {
-      "version": "2.2.2",
-      "dev": true
-    },
     "is-extendable": {
       "version": "0.1.1",
       "dev": true
@@ -31294,6 +33692,21 @@
       "version": "2.1.1",
       "dev": true
     },
+    "is-finalizationregistry": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz",
+      "integrity": "sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2"
+      }
+    },
+    "is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true
+    },
     "is-function": {
       "version": "1.0.2",
       "dev": true
@@ -31305,8 +33718,13 @@
       "dev": true
     },
     "is-generator-function": {
-      "version": "1.0.9",
-      "dev": true
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
+      "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
+      "dev": true,
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
     },
     "is-glob": {
       "version": "4.0.3",
@@ -31320,28 +33738,20 @@
     "is-in-browser": {
       "version": "1.1.3"
     },
-    "is-installed-globally": {
-      "version": "0.4.0",
-      "dev": true,
-      "requires": {
-        "global-dirs": "^3.0.0",
-        "is-path-inside": "^3.0.2"
-      }
-    },
-    "is-interactive": {
-      "version": "1.0.0",
-      "dev": true
-    },
     "is-json": {
       "version": "2.0.1",
       "dev": true
     },
-    "is-negated-glob": {
-      "version": "1.0.0",
+    "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-npm": {
-      "version": "5.0.0",
+    "is-negative-zero": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
+      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
       "dev": true
     },
     "is-number": {
@@ -31349,10 +33759,7 @@
       "dev": true
     },
     "is-number-object": {
-      "version": "1.0.4"
-    },
-    "is-obj": {
-      "version": "2.0.0",
+      "version": "1.0.4",
       "dev": true
     },
     "is-path-cwd": {
@@ -31386,33 +33793,35 @@
       "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": {
         "call-bind": "^1.0.2",
         "has-tostringtag": "^1.0.0"
       }
     },
-    "is-relative": {
-      "version": "1.0.0",
-      "dev": true,
-      "requires": {
-        "is-unc-path": "^1.0.0"
-      }
-    },
     "is-relative-url": {
-      "version": "3.0.0",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-relative-url/-/is-relative-url-4.0.0.tgz",
+      "integrity": "sha512-PkzoL1qKAYXNFct5IKdKRH/iBQou/oCC85QhXj6WKtUQBliZ4Yfd3Zk27RHu9KQG8r6zgvAA2AQKC9p+rqTszg==",
       "dev": true,
       "requires": {
-        "is-absolute-url": "^3.0.0"
+        "is-absolute-url": "^4.0.1"
       }
     },
-    "is-resolvable": {
-      "version": "1.1.0",
+    "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.1",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz",
-      "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA=="
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz",
+      "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.7"
+      }
     },
     "is-stream": {
       "version": "2.0.1",
@@ -31422,6 +33831,7 @@
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
       "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dev": true,
       "requires": {
         "has-tostringtag": "^1.0.0"
       }
@@ -31432,58 +33842,48 @@
     },
     "is-symbol": {
       "version": "1.0.3",
-      "requires": {
-        "has-symbols": "^1.0.1"
-      }
-    },
-    "is-touch-device": {
-      "version": "1.0.1"
-    },
-    "is-typed-array": {
-      "version": "1.1.5",
       "dev": true,
       "requires": {
-        "available-typed-arrays": "^1.0.2",
-        "call-bind": "^1.0.2",
-        "es-abstract": "^1.18.0-next.2",
-        "foreach": "^2.0.5",
         "has-symbols": "^1.0.1"
       }
     },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "dev": true
-    },
-    "is-unc-path": {
-      "version": "1.0.0",
+    "is-typed-array": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
+      "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
       "dev": true,
       "requires": {
-        "unc-path-regex": "^0.1.2"
+        "which-typed-array": "^1.1.14"
       }
     },
     "is-unicode-supported": {
       "version": "0.1.0",
       "dev": true
     },
-    "is-utf8": {
-      "version": "0.2.1",
-      "dev": true
-    },
-    "is-valid-glob": {
-      "version": "1.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.1",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.1.tgz",
-      "integrity": "sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==",
+      "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.0"
+        "call-bind": "^1.0.2"
       }
     },
-    "is-windows": {
-      "version": "1.0.2",
-      "dev": true
+    "is-weakset": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz",
+      "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      }
     },
     "is-wsl": {
       "version": "2.2.0",
@@ -31492,10 +33892,6 @@
         "is-docker": "^2.0.0"
       }
     },
-    "is-yarn-global": {
-      "version": "0.3.0",
-      "dev": true
-    },
     "isarray": {
       "version": "1.0.0",
       "dev": true
@@ -31506,6 +33902,8 @@
     },
     "isemail": {
       "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/isemail/-/isemail-3.2.0.tgz",
+      "integrity": "sha512-zKqkK+O+dGqevc93KNsbZ/TqTUFd46MwWjYOoMrjIMZ51eU7DtQG3Wmd9SQQT7i7RVnuTPEiYEWHU3MSbxC1Tg==",
       "dev": true,
       "requires": {
         "punycode": "2.x.x"
@@ -31519,10 +33917,6 @@
       "version": "3.0.1",
       "dev": true
     },
-    "isstream": {
-      "version": "0.1.2",
-      "dev": true
-    },
     "istanbul": {
       "version": "0.4.5",
       "dev": true,
@@ -31581,6 +33975,15 @@
           "version": "1.0.0",
           "dev": true
         },
+        "minimatch": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+          "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        },
         "resolve": {
           "version": "1.1.7",
           "dev": true
@@ -31607,7 +34010,9 @@
       }
     },
     "istanbul-lib-coverage": {
-      "version": "3.0.0",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
       "dev": true
     },
     "istanbul-lib-instrument": {
@@ -31747,41 +34152,57 @@
       }
     },
     "istanbul-reports": {
-      "version": "3.0.2",
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz",
+      "integrity": "sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==",
       "dev": true,
       "requires": {
         "html-escaper": "^2.0.0",
         "istanbul-lib-report": "^3.0.0"
       }
     },
+    "iterator.prototype": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.2.tgz",
+      "integrity": "sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.2.1",
+        "get-intrinsic": "^1.2.1",
+        "has-symbols": "^1.0.3",
+        "reflect.getprototypeof": "^1.0.4",
+        "set-function-name": "^2.0.1"
+      }
+    },
     "jest-changed-files": {
-      "version": "27.3.0",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.3.0.tgz",
-      "integrity": "sha512-9DJs9garMHv4RhylUMZgbdCJ3+jHSkpL9aaVKp13xtXAD80qLTLrqcDZL1PHA9dYA0bCI86Nv2BhkLpLhrBcPg==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
+      "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
       "dev": true,
       "requires": {
-        "@jest/types": "^27.2.5",
         "execa": "^5.0.0",
-        "throat": "^6.0.1"
+        "jest-util": "^29.7.0",
+        "p-limit": "^3.1.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "27.2.5",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-          "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+          "version": "29.6.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+          "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
           "dev": true,
           "requires": {
+            "@jest/schemas": "^29.6.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
-            "@types/yargs": "^16.0.0",
+            "@types/yargs": "^17.0.8",
             "chalk": "^4.0.0"
           }
         },
         "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "version": "17.0.32",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+          "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -31806,6 +34227,12 @@
             "supports-color": "^7.1.0"
           }
         },
+        "ci-info": {
+          "version": "3.9.0",
+          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+          "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+          "dev": true
+        },
         "color-convert": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -31827,6 +34254,29 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "jest-util": {
+          "version": "29.7.0",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+          "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^29.6.3",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          }
+        },
+        "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,
+          "requires": {
+            "yocto-queue": "^0.1.0"
+          }
+        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -31839,49 +34289,51 @@
       }
     },
     "jest-circus": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.3.1.tgz",
-      "integrity": "sha512-v1dsM9II6gvXokgqq6Yh2jHCpfg7ZqV4jWY66u7npz24JnhP3NHxI0sKT7+ZMQ7IrOWHYAaeEllOySbDbWsiXw==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
+      "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^27.3.1",
-        "@jest/test-result": "^27.3.1",
-        "@jest/types": "^27.2.5",
+        "@jest/environment": "^29.7.0",
+        "@jest/expect": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "co": "^4.6.0",
-        "dedent": "^0.7.0",
-        "expect": "^27.3.1",
+        "dedent": "^1.0.0",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^27.3.1",
-        "jest-matcher-utils": "^27.3.1",
-        "jest-message-util": "^27.3.1",
-        "jest-runtime": "^27.3.1",
-        "jest-snapshot": "^27.3.1",
-        "jest-util": "^27.3.1",
-        "pretty-format": "^27.3.1",
+        "jest-each": "^29.7.0",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "p-limit": "^3.1.0",
+        "pretty-format": "^29.7.0",
+        "pure-rand": "^6.0.0",
         "slash": "^3.0.0",
-        "stack-utils": "^2.0.3",
-        "throat": "^6.0.1"
+        "stack-utils": "^2.0.3"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "27.2.5",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-          "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+          "version": "29.6.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+          "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
           "dev": true,
           "requires": {
+            "@jest/schemas": "^29.6.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
-            "@types/yargs": "^16.0.0",
+            "@types/yargs": "^17.0.8",
             "chalk": "^4.0.0"
           }
         },
         "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "version": "17.0.32",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+          "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -31907,9 +34359,9 @@
           }
         },
         "ci-info": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-          "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
+          "version": "3.9.0",
+          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+          "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
           "dev": true
         },
         "color-convert": {
@@ -31934,82 +34386,28 @@
           "dev": true
         },
         "jest-util": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-          "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+          "version": "29.7.0",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+          "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
           "dev": true,
           "requires": {
-            "@jest/types": "^27.2.5",
+            "@jest/types": "^29.6.3",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.4",
+            "graceful-fs": "^4.2.9",
             "picomatch": "^2.2.3"
           }
         },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "jest-diff": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.3.1.tgz",
-      "integrity": "sha512-PCeuAH4AWUo2O5+ksW4pL9v5xJAcIKPUPfIhZBcG1RKv/0+dvaWTQK1Nrau8d67dp65fOqbeMdoil+6PedyEPQ==",
-      "dev": true,
-      "requires": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^27.0.6",
-        "jest-get-type": "^27.3.1",
-        "pretty-format": "^27.3.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+        "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,
           "requires": {
-            "color-name": "~1.1.4"
+            "yocto-queue": "^0.1.0"
           }
         },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -32021,45 +34419,54 @@
         }
       }
     },
-    "jest-docblock": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.0.6.tgz",
-      "integrity": "sha512-Fid6dPcjwepTFraz0YxIMCi7dejjJ/KL9FBjPYhBp4Sv1Y9PdhImlKZqYU555BlN4TQKaTc+F2Av1z+anVyGkA==",
-      "dev": true,
-      "requires": {
-        "detect-newline": "^3.0.0"
-      }
-    },
-    "jest-each": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.3.1.tgz",
-      "integrity": "sha512-E4SwfzKJWYcvOYCjOxhZcxwL+AY0uFMvdCOwvzgutJiaiodFjkxQQDxHm8FQBeTqDnSmKsQWn7ldMRzTn2zJaQ==",
+    "jest-config": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
+      "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
       "dev": true,
       "requires": {
-        "@jest/types": "^27.2.5",
+        "@babel/core": "^7.11.6",
+        "@jest/test-sequencer": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "babel-jest": "^29.7.0",
         "chalk": "^4.0.0",
-        "jest-get-type": "^27.3.1",
-        "jest-util": "^27.3.1",
-        "pretty-format": "^27.3.1"
+        "ci-info": "^3.2.0",
+        "deepmerge": "^4.2.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-circus": "^29.7.0",
+        "jest-environment-node": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-runner": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "parse-json": "^5.2.0",
+        "pretty-format": "^29.7.0",
+        "slash": "^3.0.0",
+        "strip-json-comments": "^3.1.1"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "27.2.5",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-          "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+          "version": "29.6.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+          "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
           "dev": true,
           "requires": {
+            "@jest/schemas": "^29.6.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
-            "@types/yargs": "^16.0.0",
+            "@types/yargs": "^17.0.8",
             "chalk": "^4.0.0"
           }
         },
         "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "version": "17.0.32",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+          "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -32085,9 +34492,9 @@
           }
         },
         "ci-info": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-          "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
+          "version": "3.9.0",
+          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+          "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
           "dev": true
         },
         "color-convert": {
@@ -32112,16 +34519,16 @@
           "dev": true
         },
         "jest-util": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-          "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+          "version": "29.7.0",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+          "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
           "dev": true,
           "requires": {
-            "@jest/types": "^27.2.5",
+            "@jest/types": "^29.6.3",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.4",
+            "graceful-fs": "^4.2.9",
             "picomatch": "^2.2.3"
           }
         },
@@ -32136,43 +34543,18 @@
         }
       }
     },
-    "jest-environment-jsdom": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.3.1.tgz",
-      "integrity": "sha512-3MOy8qMzIkQlfb3W1TfrD7uZHj+xx8Olix5vMENkj5djPmRqndMaXtpnaZkxmxM+Qc3lo+yVzJjzuXbCcZjAlg==",
+    "jest-diff": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
+      "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^27.3.1",
-        "@jest/fake-timers": "^27.3.1",
-        "@jest/types": "^27.2.5",
-        "@types/node": "*",
-        "jest-mock": "^27.3.0",
-        "jest-util": "^27.3.1",
-        "jsdom": "^16.6.0"
+        "chalk": "^4.0.0",
+        "diff-sequences": "^29.6.3",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
       },
       "dependencies": {
-        "@jest/types": {
-          "version": "27.2.5",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-          "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "dev": true,
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -32192,12 +34574,6 @@
             "supports-color": "^7.1.0"
           }
         },
-        "ci-info": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-          "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
-          "dev": true
-        },
         "color-convert": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -32215,23 +34591,9 @@
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "jest-util": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-          "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
-          "dev": true,
-          "requires": {
-            "@jest/types": "^27.2.5",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.4",
-            "picomatch": "^2.2.3"
-          }
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
@@ -32244,37 +34606,46 @@
         }
       }
     },
-    "jest-environment-node": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.3.1.tgz",
-      "integrity": "sha512-T89F/FgkE8waqrTSA7/ydMkcc52uYPgZZ6q8OaZgyiZkJb5QNNCF6oPZjH9IfPFfcc9uBWh1574N0kY0pSvTXw==",
+    "jest-docblock": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
+      "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^27.3.1",
-        "@jest/fake-timers": "^27.3.1",
-        "@jest/types": "^27.2.5",
-        "@types/node": "*",
-        "jest-mock": "^27.3.0",
-        "jest-util": "^27.3.1"
+        "detect-newline": "^3.0.0"
+      }
+    },
+    "jest-each": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
+      "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^29.6.3",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "pretty-format": "^29.7.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "27.2.5",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-          "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+          "version": "29.6.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+          "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
           "dev": true,
           "requires": {
+            "@jest/schemas": "^29.6.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
-            "@types/yargs": "^16.0.0",
+            "@types/yargs": "^17.0.8",
             "chalk": "^4.0.0"
           }
         },
         "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "version": "17.0.32",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+          "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -32300,9 +34671,9 @@
           }
         },
         "ci-info": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-          "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
+          "version": "3.9.0",
+          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+          "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
           "dev": true
         },
         "color-convert": {
@@ -32327,16 +34698,16 @@
           "dev": true
         },
         "jest-util": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-          "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+          "version": "29.7.0",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+          "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
           "dev": true,
           "requires": {
-            "@jest/types": "^27.2.5",
+            "@jest/types": "^29.6.3",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.4",
+            "graceful-fs": "^4.2.9",
             "picomatch": "^2.2.3"
           }
         },
@@ -32351,50 +34722,38 @@
         }
       }
     },
-    "jest-get-type": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.3.1.tgz",
-      "integrity": "sha512-+Ilqi8hgHSAdhlQ3s12CAVNd8H96ZkQBfYoXmArzZnOfAtVAJEiPDBirjByEblvG/4LPJmkL+nBqPO3A1YJAEg==",
-      "dev": true
-    },
-    "jest-haste-map": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.3.1.tgz",
-      "integrity": "sha512-lYfNZIzwPccDJZIyk9Iz5iQMM/MH56NIIcGj7AFU1YyA4ewWFBl8z+YPJuSCRML/ee2cCt2y3W4K3VXPT6Nhzg==",
+    "jest-environment-node": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
+      "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
       "dev": true,
       "requires": {
-        "@jest/types": "^27.2.5",
-        "@types/graceful-fs": "^4.1.2",
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
-        "anymatch": "^3.0.3",
-        "fb-watchman": "^2.0.0",
-        "fsevents": "^2.3.2",
-        "graceful-fs": "^4.2.4",
-        "jest-regex-util": "^27.0.6",
-        "jest-serializer": "^27.0.6",
-        "jest-util": "^27.3.1",
-        "jest-worker": "^27.3.1",
-        "micromatch": "^4.0.4",
-        "walker": "^1.0.7"
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "27.2.5",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-          "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+          "version": "29.6.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+          "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
           "dev": true,
           "requires": {
+            "@jest/schemas": "^29.6.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
-            "@types/yargs": "^16.0.0",
+            "@types/yargs": "^17.0.8",
             "chalk": "^4.0.0"
           }
         },
         "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "version": "17.0.32",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+          "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -32420,9 +34779,9 @@
           }
         },
         "ci-info": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-          "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
+          "version": "3.9.0",
+          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+          "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
           "dev": true
         },
         "color-convert": {
@@ -32447,16 +34806,16 @@
           "dev": true
         },
         "jest-util": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-          "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+          "version": "29.7.0",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+          "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
           "dev": true,
           "requires": {
-            "@jest/types": "^27.2.5",
+            "@jest/types": "^29.6.3",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.4",
+            "graceful-fs": "^4.2.9",
             "picomatch": "^2.2.3"
           }
         },
@@ -32471,49 +34830,50 @@
         }
       }
     },
-    "jest-jasmine2": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.3.1.tgz",
-      "integrity": "sha512-WK11ZUetDQaC09w4/j7o4FZDUIp+4iYWH/Lik34Pv7ukL+DuXFGdnmmi7dT58J2ZYKFB5r13GyE0z3NPeyJmsg==",
+    "jest-get-type": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
+      "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
+      "dev": true
+    },
+    "jest-haste-map": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
+      "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
       "dev": true,
       "requires": {
-        "@babel/traverse": "^7.1.0",
-        "@jest/environment": "^27.3.1",
-        "@jest/source-map": "^27.0.6",
-        "@jest/test-result": "^27.3.1",
-        "@jest/types": "^27.2.5",
+        "@jest/types": "^29.6.3",
+        "@types/graceful-fs": "^4.1.3",
         "@types/node": "*",
-        "chalk": "^4.0.0",
-        "co": "^4.6.0",
-        "expect": "^27.3.1",
-        "is-generator-fn": "^2.0.0",
-        "jest-each": "^27.3.1",
-        "jest-matcher-utils": "^27.3.1",
-        "jest-message-util": "^27.3.1",
-        "jest-runtime": "^27.3.1",
-        "jest-snapshot": "^27.3.1",
-        "jest-util": "^27.3.1",
-        "pretty-format": "^27.3.1",
-        "throat": "^6.0.1"
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "fsevents": "^2.3.2",
+        "graceful-fs": "^4.2.9",
+        "jest-regex-util": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "jest-worker": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "walker": "^1.0.8"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "27.2.5",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-          "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+          "version": "29.6.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+          "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
           "dev": true,
           "requires": {
+            "@jest/schemas": "^29.6.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
-            "@types/yargs": "^16.0.0",
+            "@types/yargs": "^17.0.8",
             "chalk": "^4.0.0"
           }
         },
         "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "version": "17.0.32",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+          "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -32539,9 +34899,9 @@
           }
         },
         "ci-info": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-          "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
+          "version": "3.9.0",
+          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+          "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
           "dev": true
         },
         "color-convert": {
@@ -32566,16 +34926,16 @@
           "dev": true
         },
         "jest-util": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-          "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+          "version": "29.7.0",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+          "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
           "dev": true,
           "requires": {
-            "@jest/types": "^27.2.5",
+            "@jest/types": "^29.6.3",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.4",
+            "graceful-fs": "^4.2.9",
             "picomatch": "^2.2.3"
           }
         },
@@ -32591,25 +34951,25 @@
       }
     },
     "jest-leak-detector": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.3.1.tgz",
-      "integrity": "sha512-78QstU9tXbaHzwlRlKmTpjP9k4Pvre5l0r8Spo4SbFFVy/4Abg9I6ZjHwjg2QyKEAMg020XcjP+UgLZIY50yEg==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
+      "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
       "dev": true,
       "requires": {
-        "jest-get-type": "^27.3.1",
-        "pretty-format": "^27.3.1"
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
       }
     },
     "jest-matcher-utils": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.3.1.tgz",
-      "integrity": "sha512-hX8N7zXS4k+8bC1Aj0OWpGb7D3gIXxYvPNK1inP5xvE4ztbz3rc4AkI6jGVaerepBnfWB17FL5lWFJT3s7qo8w==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
+      "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
-        "jest-diff": "^27.3.1",
-        "jest-get-type": "^27.3.1",
-        "pretty-format": "^27.3.1"
+        "jest-diff": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -32664,39 +35024,40 @@
       }
     },
     "jest-message-util": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.3.1.tgz",
-      "integrity": "sha512-bh3JEmxsTZ/9rTm0jQrPElbY2+y48Rw2t47uMfByNyUVR+OfPh4anuyKsGqsNkXk/TI4JbLRZx+7p7Hdt6q1yg==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
+      "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^27.2.5",
+        "@jest/types": "^29.6.3",
         "@types/stack-utils": "^2.0.0",
         "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.4",
+        "graceful-fs": "^4.2.9",
         "micromatch": "^4.0.4",
-        "pretty-format": "^27.3.1",
+        "pretty-format": "^29.7.0",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "27.2.5",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-          "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+          "version": "29.6.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+          "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
           "dev": true,
           "requires": {
+            "@jest/schemas": "^29.6.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
-            "@types/yargs": "^16.0.0",
+            "@types/yargs": "^17.0.8",
             "chalk": "^4.0.0"
           }
         },
         "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "version": "17.0.32",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+          "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -32754,32 +35115,34 @@
       }
     },
     "jest-mock": {
-      "version": "27.3.0",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.3.0.tgz",
-      "integrity": "sha512-ziZiLk0elZOQjD08bLkegBzv5hCABu/c8Ytx45nJKkysQwGaonvmTxwjLqEA4qGdasq9o2I8/HtdGMNnVsMTGw==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
+      "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
       "dev": true,
       "requires": {
-        "@jest/types": "^27.2.5",
-        "@types/node": "*"
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "jest-util": "^29.7.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "27.2.5",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-          "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+          "version": "29.6.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+          "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
           "dev": true,
           "requires": {
+            "@jest/schemas": "^29.6.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
-            "@types/yargs": "^16.0.0",
+            "@types/yargs": "^17.0.8",
             "chalk": "^4.0.0"
           }
         },
         "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "version": "17.0.32",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+          "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -32804,6 +35167,12 @@
             "supports-color": "^7.1.0"
           }
         },
+        "ci-info": {
+          "version": "3.9.0",
+          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+          "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+          "dev": true
+        },
         "color-convert": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -32825,6 +35194,20 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "jest-util": {
+          "version": "29.7.0",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+          "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^29.6.3",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          }
+        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -32837,18 +35220,20 @@
       }
     },
     "jest-pnp-resolver": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
-      "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
+      "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
       "dev": true,
       "requires": {}
     },
     "jest-progress-bar-reporter": {
-      "version": "1.0.21",
+      "version": "1.0.25",
+      "resolved": "https://registry.npmjs.org/jest-progress-bar-reporter/-/jest-progress-bar-reporter-1.0.25.tgz",
+      "integrity": "sha512-iFWtsl0j+OeHeMCu5fXL8pSN3h06NQlG/UPpcuO2PP2C+hr81K397+Mh34rU3GgA9kQga6ctu7gfOEOgUlKFug==",
       "dev": true,
       "requires": {
         "chalk": "4.1.1",
-        "moment": "2.29.1",
+        "moment": "^2.29.4",
         "progress": "2.0.3"
       },
       "dependencies": {
@@ -32892,46 +35277,46 @@
       }
     },
     "jest-regex-util": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.0.6.tgz",
-      "integrity": "sha512-SUhPzBsGa1IKm8hx2F4NfTGGp+r7BXJ4CulsZ1k2kI+mGLG+lxGrs76veN2LF/aUdGosJBzKgXmNCw+BzFqBDQ==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
+      "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
       "dev": true
     },
     "jest-resolve": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.3.1.tgz",
-      "integrity": "sha512-Dfzt25CFSPo3Y3GCbxynRBZzxq9AdyNN+x/v2IqYx6KVT5Z6me2Z/PsSGFSv3cOSUZqJ9pHxilao/I/m9FouLw==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
+      "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
       "dev": true,
       "requires": {
-        "@jest/types": "^27.2.5",
         "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^27.3.1",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
         "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^27.3.1",
-        "jest-validate": "^27.3.1",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
         "resolve": "^1.20.0",
-        "resolve.exports": "^1.1.0",
+        "resolve.exports": "^2.0.0",
         "slash": "^3.0.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "27.2.5",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-          "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+          "version": "29.6.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+          "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
           "dev": true,
           "requires": {
+            "@jest/schemas": "^29.6.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
-            "@types/yargs": "^16.0.0",
+            "@types/yargs": "^17.0.8",
             "chalk": "^4.0.0"
           }
         },
         "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "version": "17.0.32",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+          "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -32957,9 +35342,9 @@
           }
         },
         "ci-info": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-          "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
+          "version": "3.9.0",
+          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+          "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
           "dev": true
         },
         "color-convert": {
@@ -32984,16 +35369,16 @@
           "dev": true
         },
         "jest-util": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-          "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+          "version": "29.7.0",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+          "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
           "dev": true,
           "requires": {
-            "@jest/types": "^27.2.5",
+            "@jest/types": "^29.6.3",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.4",
+            "graceful-fs": "^4.2.9",
             "picomatch": "^2.2.3"
           }
         },
@@ -33009,136 +35394,62 @@
       }
     },
     "jest-resolve-dependencies": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.3.1.tgz",
-      "integrity": "sha512-X7iLzY8pCiYOnvYo2YrK3P9oSE8/3N2f4pUZMJ8IUcZnT81vlSonya1KTO9ZfKGuC+svE6FHK/XOb8SsoRUV1A==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
+      "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
       "dev": true,
       "requires": {
-        "@jest/types": "^27.2.5",
-        "jest-regex-util": "^27.0.6",
-        "jest-snapshot": "^27.3.1"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.2.5",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-          "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "dev": true,
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
+        "jest-regex-util": "^29.6.3",
+        "jest-snapshot": "^29.7.0"
       }
     },
     "jest-runner": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.3.1.tgz",
-      "integrity": "sha512-r4W6kBn6sPr3TBwQNmqE94mPlYVn7fLBseeJfo4E2uCTmAyDFm2O5DYAQAFP7Q3YfiA/bMwg8TVsciP7k0xOww==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
+      "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
       "dev": true,
       "requires": {
-        "@jest/console": "^27.3.1",
-        "@jest/environment": "^27.3.1",
-        "@jest/test-result": "^27.3.1",
-        "@jest/transform": "^27.3.1",
-        "@jest/types": "^27.2.5",
+        "@jest/console": "^29.7.0",
+        "@jest/environment": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "emittery": "^0.8.1",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.4",
-        "jest-docblock": "^27.0.6",
-        "jest-environment-jsdom": "^27.3.1",
-        "jest-environment-node": "^27.3.1",
-        "jest-haste-map": "^27.3.1",
-        "jest-leak-detector": "^27.3.1",
-        "jest-message-util": "^27.3.1",
-        "jest-resolve": "^27.3.1",
-        "jest-runtime": "^27.3.1",
-        "jest-util": "^27.3.1",
-        "jest-worker": "^27.3.1",
-        "source-map-support": "^0.5.6",
-        "throat": "^6.0.1"
+        "emittery": "^0.13.1",
+        "graceful-fs": "^4.2.9",
+        "jest-docblock": "^29.7.0",
+        "jest-environment-node": "^29.7.0",
+        "jest-haste-map": "^29.7.0",
+        "jest-leak-detector": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-resolve": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-watcher": "^29.7.0",
+        "jest-worker": "^29.7.0",
+        "p-limit": "^3.1.0",
+        "source-map-support": "0.5.13"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "27.2.5",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-          "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+          "version": "29.6.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+          "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
           "dev": true,
           "requires": {
+            "@jest/schemas": "^29.6.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
-            "@types/yargs": "^16.0.0",
+            "@types/yargs": "^17.0.8",
             "chalk": "^4.0.0"
           }
         },
         "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "version": "17.0.32",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+          "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -33164,9 +35475,9 @@
           }
         },
         "ci-info": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-          "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
+          "version": "3.9.0",
+          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+          "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
           "dev": true
         },
         "color-convert": {
@@ -33184,6 +35495,12 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
+        "emittery": {
+          "version": "0.13.1",
+          "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
+          "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
+          "dev": true
+        },
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -33191,19 +35508,44 @@
           "dev": true
         },
         "jest-util": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-          "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+          "version": "29.7.0",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+          "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
           "dev": true,
           "requires": {
-            "@jest/types": "^27.2.5",
+            "@jest/types": "^29.6.3",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.4",
+            "graceful-fs": "^4.2.9",
             "picomatch": "^2.2.3"
           }
         },
+        "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,
+          "requires": {
+            "yocto-queue": "^0.1.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "source-map-support": {
+          "version": "0.5.13",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
+          "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
+          "dev": true,
+          "requires": {
+            "buffer-from": "^1.0.0",
+            "source-map": "^0.6.0"
+          }
+        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -33216,56 +35558,53 @@
       }
     },
     "jest-runtime": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.3.1.tgz",
-      "integrity": "sha512-qtO6VxPbS8umqhEDpjA4pqTkKQ1Hy4ZSi9mDVeE9Za7LKBo2LdW2jmT+Iod3XFaJqINikZQsn2wEi0j9wPRbLg==",
-      "dev": true,
-      "requires": {
-        "@jest/console": "^27.3.1",
-        "@jest/environment": "^27.3.1",
-        "@jest/globals": "^27.3.1",
-        "@jest/source-map": "^27.0.6",
-        "@jest/test-result": "^27.3.1",
-        "@jest/transform": "^27.3.1",
-        "@jest/types": "^27.2.5",
-        "@types/yargs": "^16.0.0",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
+      "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
+      "dev": true,
+      "requires": {
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/globals": "^29.7.0",
+        "@jest/source-map": "^29.6.3",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
         "chalk": "^4.0.0",
         "cjs-module-lexer": "^1.0.0",
         "collect-v8-coverage": "^1.0.0",
-        "execa": "^5.0.0",
-        "exit": "^0.1.2",
         "glob": "^7.1.3",
-        "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^27.3.1",
-        "jest-message-util": "^27.3.1",
-        "jest-mock": "^27.3.0",
-        "jest-regex-util": "^27.0.6",
-        "jest-resolve": "^27.3.1",
-        "jest-snapshot": "^27.3.1",
-        "jest-util": "^27.3.1",
-        "jest-validate": "^27.3.1",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-mock": "^29.7.0",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
         "slash": "^3.0.0",
-        "strip-bom": "^4.0.0",
-        "yargs": "^16.2.0"
+        "strip-bom": "^4.0.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "27.2.5",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-          "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+          "version": "29.6.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+          "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
           "dev": true,
           "requires": {
+            "@jest/schemas": "^29.6.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
-            "@types/yargs": "^16.0.0",
+            "@types/yargs": "^17.0.8",
             "chalk": "^4.0.0"
           }
         },
         "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "version": "17.0.32",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+          "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -33291,9 +35630,9 @@
           }
         },
         "ci-info": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-          "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
+          "version": "3.9.0",
+          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+          "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
           "dev": true
         },
         "color-convert": {
@@ -33318,16 +35657,16 @@
           "dev": true
         },
         "jest-util": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-          "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+          "version": "29.7.0",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+          "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
           "dev": true,
           "requires": {
-            "@jest/types": "^27.2.5",
+            "@jest/types": "^29.6.3",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.4",
+            "graceful-fs": "^4.2.9",
             "picomatch": "^2.2.3"
           }
         },
@@ -33342,18 +35681,10 @@
         }
       }
     },
-    "jest-serializer": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.0.6.tgz",
-      "integrity": "sha512-PtGdVK9EGC7dsaziskfqaAPib6wTViY3G8E5wz9tLVPhHyiDNTZn/xjZ4khAw+09QkoOVpn7vF5nPSN6dtBexA==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*",
-        "graceful-fs": "^4.2.4"
-      }
-    },
     "jest-silent-reporter": {
-      "version": "0.5.0",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/jest-silent-reporter/-/jest-silent-reporter-0.6.0.tgz",
+      "integrity": "sha512-4nmS+5o7ycVlvbQOTx7CnGdbBtP2646hnDgQpQLaVhjHcQNHD+gqBAetyjRDlgpZ8+8N82MWI59K+EX2LsVk7g==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
@@ -33362,13 +35693,17 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
             "color-convert": "^2.0.1"
           }
         },
         "chalk": {
-          "version": "4.1.0",
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -33377,6 +35712,8 @@
         },
         "color-convert": {
           "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
             "color-name": "~1.1.4"
@@ -33384,14 +35721,20 @@
         },
         "color-name": {
           "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -33400,72 +35743,51 @@
       }
     },
     "jest-snapshot": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.3.1.tgz",
-      "integrity": "sha512-APZyBvSgQgOT0XumwfFu7X3G5elj6TGhCBLbBdn3R1IzYustPGPE38F51dBWMQ8hRXa9je0vAdeVDtqHLvB6lg==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
+      "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
       "dev": true,
       "requires": {
-        "@babel/core": "^7.7.2",
+        "@babel/core": "^7.11.6",
         "@babel/generator": "^7.7.2",
-        "@babel/parser": "^7.7.2",
+        "@babel/plugin-syntax-jsx": "^7.7.2",
         "@babel/plugin-syntax-typescript": "^7.7.2",
-        "@babel/traverse": "^7.7.2",
-        "@babel/types": "^7.0.0",
-        "@jest/transform": "^27.3.1",
-        "@jest/types": "^27.2.5",
-        "@types/babel__traverse": "^7.0.4",
-        "@types/prettier": "^2.1.5",
+        "@babel/types": "^7.3.3",
+        "@jest/expect-utils": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
         "babel-preset-current-node-syntax": "^1.0.0",
         "chalk": "^4.0.0",
-        "expect": "^27.3.1",
-        "graceful-fs": "^4.2.4",
-        "jest-diff": "^27.3.1",
-        "jest-get-type": "^27.3.1",
-        "jest-haste-map": "^27.3.1",
-        "jest-matcher-utils": "^27.3.1",
-        "jest-message-util": "^27.3.1",
-        "jest-resolve": "^27.3.1",
-        "jest-util": "^27.3.1",
+        "expect": "^29.7.0",
+        "graceful-fs": "^4.2.9",
+        "jest-diff": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
         "natural-compare": "^1.4.0",
-        "pretty-format": "^27.3.1",
-        "semver": "^7.3.2"
+        "pretty-format": "^29.7.0",
+        "semver": "^7.5.3"
       },
       "dependencies": {
-        "@babel/plugin-syntax-bigint": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
-          "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.8.0"
-          }
-        },
-        "@babel/plugin-syntax-import-meta": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
-          "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.10.4"
-          }
-        },
         "@jest/types": {
-          "version": "27.2.5",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-          "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+          "version": "29.6.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+          "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
           "dev": true,
           "requires": {
+            "@jest/schemas": "^29.6.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
-            "@types/yargs": "^16.0.0",
+            "@types/yargs": "^17.0.8",
             "chalk": "^4.0.0"
           }
         },
         "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "version": "17.0.32",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+          "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -33480,26 +35802,6 @@
             "color-convert": "^2.0.1"
           }
         },
-        "babel-preset-current-node-syntax": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
-          "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
-          "dev": true,
-          "requires": {
-            "@babel/plugin-syntax-async-generators": "^7.8.4",
-            "@babel/plugin-syntax-bigint": "^7.8.3",
-            "@babel/plugin-syntax-class-properties": "^7.8.3",
-            "@babel/plugin-syntax-import-meta": "^7.8.3",
-            "@babel/plugin-syntax-json-strings": "^7.8.3",
-            "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
-            "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-            "@babel/plugin-syntax-numeric-separator": "^7.8.3",
-            "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-            "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-            "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-            "@babel/plugin-syntax-top-level-await": "^7.8.3"
-          }
-        },
         "chalk": {
           "version": "4.1.2",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -33511,9 +35813,9 @@
           }
         },
         "ci-info": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-          "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
+          "version": "3.9.0",
+          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+          "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
           "dev": true
         },
         "color-convert": {
@@ -33538,16 +35840,16 @@
           "dev": true
         },
         "jest-util": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-          "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+          "version": "29.7.0",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+          "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
           "dev": true,
           "requires": {
-            "@jest/types": "^27.2.5",
+            "@jest/types": "^29.6.3",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.4",
+            "graceful-fs": "^4.2.9",
             "picomatch": "^2.2.3"
           }
         },
@@ -33614,36 +35916,37 @@
       }
     },
     "jest-validate": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.3.1.tgz",
-      "integrity": "sha512-3H0XCHDFLA9uDII67Bwi1Vy7AqwA5HqEEjyy934lgVhtJ3eisw6ShOF1MDmRPspyikef5MyExvIm0/TuLzZ86Q==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
+      "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
       "dev": true,
       "requires": {
-        "@jest/types": "^27.2.5",
+        "@jest/types": "^29.6.3",
         "camelcase": "^6.2.0",
         "chalk": "^4.0.0",
-        "jest-get-type": "^27.3.1",
+        "jest-get-type": "^29.6.3",
         "leven": "^3.1.0",
-        "pretty-format": "^27.3.1"
+        "pretty-format": "^29.7.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "27.2.5",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-          "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+          "version": "29.6.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+          "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
           "dev": true,
           "requires": {
+            "@jest/schemas": "^29.6.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
-            "@types/yargs": "^16.0.0",
+            "@types/yargs": "^17.0.8",
             "chalk": "^4.0.0"
           }
         },
         "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "version": "17.0.32",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+          "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -33659,9 +35962,9 @@
           }
         },
         "camelcase": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
-          "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+          "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
           "dev": true
         },
         "chalk": {
@@ -33707,37 +36010,39 @@
       }
     },
     "jest-watcher": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.3.1.tgz",
-      "integrity": "sha512-9/xbV6chABsGHWh9yPaAGYVVKurWoP3ZMCv6h+O1v9/+pkOroigs6WzZ0e9gLP/njokUwM7yQhr01LKJVMkaZA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
+      "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
       "dev": true,
       "requires": {
-        "@jest/test-result": "^27.3.1",
-        "@jest/types": "^27.2.5",
+        "@jest/test-result": "^29.7.0",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
-        "jest-util": "^27.3.1",
+        "emittery": "^0.13.1",
+        "jest-util": "^29.7.0",
         "string-length": "^4.0.1"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "27.2.5",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-          "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
+          "version": "29.6.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+          "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
           "dev": true,
           "requires": {
+            "@jest/schemas": "^29.6.3",
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
             "@types/node": "*",
-            "@types/yargs": "^16.0.0",
+            "@types/yargs": "^17.0.8",
             "chalk": "^4.0.0"
           }
         },
         "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "version": "17.0.32",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+          "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -33763,9 +36068,9 @@
           }
         },
         "ci-info": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-          "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
+          "version": "3.9.0",
+          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+          "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
           "dev": true
         },
         "color-convert": {
@@ -33783,6 +36088,12 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
+        "emittery": {
+          "version": "0.13.1",
+          "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
+          "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
+          "dev": true
+        },
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -33790,16 +36101,16 @@
           "dev": true
         },
         "jest-util": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-          "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+          "version": "29.7.0",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+          "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
           "dev": true,
           "requires": {
-            "@jest/types": "^27.2.5",
+            "@jest/types": "^29.6.3",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.4",
+            "graceful-fs": "^4.2.9",
             "picomatch": "^2.2.3"
           }
         },
@@ -33815,22 +36126,111 @@
       }
     },
     "jest-worker": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.3.1.tgz",
-      "integrity": "sha512-ks3WCzsiZaOPJl/oMsDjaf0TRiSv7ctNgs0FqRr2nARsovz6AWWy4oLElwcquGSz692DzgZQrCLScPNs5YlC4g==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
+      "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
       "dev": true,
       "requires": {
         "@types/node": "*",
+        "jest-util": "^29.7.0",
         "merge-stream": "^2.0.0",
         "supports-color": "^8.0.0"
       },
       "dependencies": {
+        "@jest/types": {
+          "version": "29.6.3",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+          "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
+          "dev": true,
+          "requires": {
+            "@jest/schemas": "^29.6.3",
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^17.0.8",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "17.0.32",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+          "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
+          "dev": true,
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "7.2.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+              "dev": true,
+              "requires": {
+                "has-flag": "^4.0.0"
+              }
+            }
+          }
+        },
+        "ci-info": {
+          "version": "3.9.0",
+          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+          "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+          "dev": true
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "jest-util": {
+          "version": "29.7.0",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+          "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^29.6.3",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          }
+        },
         "supports-color": {
           "version": "8.1.1",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
@@ -33898,6 +36298,8 @@
     },
     "js-string-escape": {
       "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/js-string-escape/-/js-string-escape-1.0.1.tgz",
+      "integrity": "sha512-Smw4xcfIQ5LVjAOuJCvN/zIodzA/BBSsluuoSykP+lUvScIi4U6RJLfwHet5cxFnCswUjISV8oAXaqaJDY3chg==",
       "dev": true
     },
     "js-tokens": {
@@ -33912,181 +36314,85 @@
       }
     },
     "jsbn": {
-      "version": "0.1.1",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
       "dev": true
     },
-    "jscodeshift": {
-      "version": "0.13.0",
-      "dev": true,
-      "requires": {
-        "@babel/core": "^7.13.16",
-        "@babel/parser": "^7.13.16",
-        "@babel/plugin-proposal-class-properties": "^7.13.0",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8",
-        "@babel/plugin-proposal-optional-chaining": "^7.13.12",
-        "@babel/plugin-transform-modules-commonjs": "^7.13.8",
-        "@babel/preset-flow": "^7.13.13",
-        "@babel/preset-typescript": "^7.13.0",
-        "@babel/register": "^7.13.16",
-        "babel-core": "^7.0.0-bridge.0",
-        "colors": "^1.1.2",
-        "flow-parser": "0.*",
-        "graceful-fs": "^4.2.4",
-        "micromatch": "^3.1.10",
-        "neo-async": "^2.5.0",
-        "node-dir": "^0.1.17",
-        "recast": "^0.20.4",
-        "temp": "^0.8.4",
-        "write-file-atomic": "^2.3.0"
+    "jsdoc-type-pratt-parser": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz",
+      "integrity": "sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==",
+      "dev": true
+    },
+    "jsdom": {
+      "version": "24.1.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-24.1.0.tgz",
+      "integrity": "sha512-6gpM7pRXCwIOKxX47cgOyvyQDN/Eh0f1MeKySBV2xGdKtqJBLj8P25eY3EVCWo2mglDDzozR2r2MW4T+JiNUZA==",
+      "dev": true,
+      "requires": {
+        "cssstyle": "^4.0.1",
+        "data-urls": "^5.0.0",
+        "decimal.js": "^10.4.3",
+        "form-data": "^4.0.0",
+        "html-encoding-sniffer": "^4.0.0",
+        "http-proxy-agent": "^7.0.2",
+        "https-proxy-agent": "^7.0.4",
+        "is-potential-custom-element-name": "^1.0.1",
+        "nwsapi": "^2.2.10",
+        "parse5": "^7.1.2",
+        "rrweb-cssom": "^0.7.0",
+        "saxes": "^6.0.0",
+        "symbol-tree": "^3.2.4",
+        "tough-cookie": "^4.1.4",
+        "w3c-xmlserializer": "^5.0.0",
+        "webidl-conversions": "^7.0.0",
+        "whatwg-encoding": "^3.1.1",
+        "whatwg-mimetype": "^4.0.0",
+        "whatwg-url": "^14.0.0",
+        "ws": "^8.17.0",
+        "xml-name-validator": "^5.0.0"
       },
       "dependencies": {
-        "braces": {
-          "version": "2.3.2",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
+        "agent-base": {
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+          "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
           "dev": true,
           "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
+            "debug": "^4.3.4"
           }
         },
-        "is-number": {
-          "version": "3.0.0",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
+        "entities": {
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+          "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+          "dev": true
         },
-        "micromatch": {
-          "version": "3.1.10",
+        "https-proxy-agent": {
+          "version": "7.0.5",
+          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+          "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
           "dev": true,
           "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
+            "agent-base": "^7.0.2",
+            "debug": "4"
           }
         },
-        "to-regex-range": {
-          "version": "2.1.1",
+        "parse5": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
+          "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
           "dev": true,
           "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
+            "entities": "^4.4.0"
           }
         },
-        "write-file-atomic": {
-          "version": "2.4.3",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.11",
-            "imurmurhash": "^0.1.4",
-            "signal-exit": "^3.0.2"
-          }
-        }
-      }
-    },
-    "jsdoc-type-pratt-parser": {
-      "version": "1.1.1",
-      "dev": true
-    },
-    "jsdom": {
-      "version": "16.7.0",
-      "dev": true,
-      "requires": {
-        "abab": "^2.0.5",
-        "acorn": "^8.2.4",
-        "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",
-        "form-data": "^3.0.0",
-        "html-encoding-sniffer": "^2.0.1",
-        "http-proxy-agent": "^4.0.1",
-        "https-proxy-agent": "^5.0.0",
-        "is-potential-custom-element-name": "^1.0.1",
-        "nwsapi": "^2.2.0",
-        "parse5": "6.0.1",
-        "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.6",
-        "xml-name-validator": "^3.0.0"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "8.4.1",
+        "rrweb-cssom": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.7.1.tgz",
+          "integrity": "sha512-TrEMa7JGdVm0UThDJSx7ddw5nVm3UJS9o9CCIZ72B1vSyEZoziDqBYP3XIoi/12lKrJR8rE3jeFHMok2F/Mnsg==",
           "dev": true
-        },
-        "form-data": {
-          "version": "3.0.1",
-          "dev": true,
-          "requires": {
-            "asynckit": "^0.4.0",
-            "combined-stream": "^1.0.8",
-            "mime-types": "^2.1.12"
-          }
         }
       }
     },
@@ -34094,27 +36400,10 @@
       "version": "2.5.2",
       "dev": true
     },
-    "json-bigint": {
-      "version": "1.0.0",
-      "dev": true,
-      "requires": {
-        "bignumber.js": "^9.0.0"
-      }
-    },
-    "json-buffer": {
-      "version": "3.0.0",
-      "dev": true
-    },
-    "json-parse-better-errors": {
-      "version": "1.0.2",
-      "dev": true
-    },
     "json-parse-even-better-errors": {
       "version": "2.3.1",
-      "dev": true
-    },
-    "json-schema": {
-      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
       "dev": true
     },
     "json-schema-traverse": {
@@ -34122,26 +36411,34 @@
       "dev": true
     },
     "json-stable-stringify": {
-      "version": "1.0.1",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.1.1.tgz",
+      "integrity": "sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==",
       "dev": true,
       "requires": {
-        "jsonify": "~0.0.0"
+        "call-bind": "^1.0.5",
+        "isarray": "^2.0.5",
+        "jsonify": "^0.0.1",
+        "object-keys": "^1.1.1"
+      },
+      "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
+        }
       }
     },
     "json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "dev": true
     },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "dev": true
-    },
     "json5": {
-      "version": "2.2.0",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.2.5"
-      }
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true
     },
     "jsonfile": {
       "version": "6.1.0",
@@ -34158,7 +36455,9 @@
       }
     },
     "jsonify": {
-      "version": "0.0.0",
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz",
+      "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==",
       "dev": true
     },
     "jsonlint": {
@@ -34170,23 +36469,15 @@
       }
     },
     "jsonminify": {
-      "version": "0.4.1",
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/jsonminify/-/jsonminify-0.4.2.tgz",
+      "integrity": "sha512-mEtP5ECD0293D+s45JhDutqF5mFCkWY8ClrPFxjSFR2KUoantofky7noSzyKnAnD9Gd8pXHZSUd5bgzLDUBbfA==",
       "dev": true
     },
     "JSONSelect": {
       "version": "0.4.0",
       "dev": true
     },
-    "jsprim": {
-      "version": "1.4.1",
-      "dev": true,
-      "requires": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
-      }
-    },
     "jss": {
       "version": "10.8.2",
       "resolved": "https://registry.npmjs.org/jss/-/jss-10.8.2.tgz",
@@ -34351,33 +36642,16 @@
       "version": "4.2.1",
       "dev": true
     },
-    "jwa": {
-      "version": "2.0.0",
-      "dev": true,
-      "requires": {
-        "buffer-equal-constant-time": "1.0.1",
-        "ecdsa-sig-formatter": "1.0.11",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "jws": {
-      "version": "4.0.0",
-      "dev": true,
-      "requires": {
-        "jwa": "^2.0.0",
-        "safe-buffer": "^5.0.1"
-      }
-    },
     "karma": {
-      "version": "6.3.6",
-      "resolved": "https://registry.npmjs.org/karma/-/karma-6.3.6.tgz",
-      "integrity": "sha512-xsiu3D6AjCv6Uq0YKXJgC6TvXX2WloQ5+XtHXmC1lwiLVG617DDV3W2DdM4BxCMKHlmz6l3qESZHFQGHAKvrew==",
+      "version": "6.4.3",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-6.4.3.tgz",
+      "integrity": "sha512-LuucC/RE92tJ8mlCwqEoRWXP38UMAqpnq98vktmS9SznSoUPPUJQbc91dHcxcunROvfQjdORVA/YFviH+Xci9Q==",
       "dev": true,
       "requires": {
+        "@colors/colors": "1.5.0",
         "body-parser": "^1.19.0",
         "braces": "^3.0.2",
         "chokidar": "^3.5.1",
-        "colors": "^1.4.0",
         "connect": "^3.7.0",
         "di": "^0.0.1",
         "dom-serialize": "^2.2.1",
@@ -34386,47 +36660,47 @@
         "http-proxy": "^1.18.1",
         "isbinaryfile": "^4.0.8",
         "lodash": "^4.17.21",
-        "log4js": "^6.3.0",
+        "log4js": "^6.4.1",
         "mime": "^2.5.2",
         "minimatch": "^3.0.4",
+        "mkdirp": "^0.5.5",
         "qjobs": "^1.2.0",
         "range-parser": "^1.2.1",
         "rimraf": "^3.0.2",
-        "socket.io": "^4.2.0",
+        "socket.io": "^4.7.2",
         "source-map": "^0.6.1",
         "tmp": "^0.2.1",
         "ua-parser-js": "^0.7.30",
         "yargs": "^16.1.1"
       },
       "dependencies": {
-        "glob": {
-          "version": "7.1.7",
+        "mime": {
+          "version": "2.6.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
+          "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
+          "dev": true
+        },
+        "minimatch": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+          "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
           "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"
+            "brace-expansion": "^1.1.7"
           }
         },
-        "graceful-fs": {
-          "version": "4.2.8",
-          "dev": true
-        },
-        "mime": {
-          "version": "2.5.2",
-          "dev": true
-        },
         "source-map": {
           "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         }
       }
     },
     "karma-chrome-launcher": {
-      "version": "3.1.0",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-3.2.0.tgz",
+      "integrity": "sha512-rE9RkUPI7I9mAxByQWkGJFXfFD6lE4gC5nPuZdobf/QdTEJI6EU4yIay/cfU/xV4ZxlM5JiTv7zWYgA64NpS5Q==",
       "dev": true,
       "requires": {
         "which": "^1.2.1"
@@ -34468,6 +36742,15 @@
             "semver": "^5.6.0"
           }
         },
+        "minimatch": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+          "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        },
         "pify": {
           "version": "4.0.1",
           "dev": true
@@ -34489,8 +36772,10 @@
         }
       }
     },
-    "karma-esbuild": {
-      "version": "2.2.0",
+    "karma-esbuild-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/karma-esbuild-up/-/karma-esbuild-up-3.0.0.tgz",
+      "integrity": "sha512-XxHrjHL83ZHQbxzDVSXefcOBaH7dMnDDVETLnXHHAJQeZIODA8PxdzpaCqUHg3PuPiCrh5jSTdzpxSrLEALK5g==",
       "dev": true,
       "requires": {
         "chokidar": "^3.5.1",
@@ -34499,20 +36784,26 @@
       "dependencies": {
         "source-map": {
           "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         }
       }
     },
     "karma-firefox-launcher": {
-      "version": "2.1.1",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-2.1.3.tgz",
+      "integrity": "sha512-LMM2bseebLbYjODBOVt7TCPP9OI2vZIXCavIXhkO9m+10Uj5l7u/SKoeRmYx8FYHTVGZSpk6peX+3BMHC1WwNw==",
       "dev": true,
       "requires": {
         "is-wsl": "^2.2.0",
-        "which": "^2.0.1"
+        "which": "^3.0.0"
       },
       "dependencies": {
         "which": {
-          "version": "2.0.2",
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz",
+          "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==",
           "dev": true,
           "requires": {
             "isexe": "^2.0.0"
@@ -34568,156 +36859,52 @@
           "version": "4.0.0",
           "dev": true,
           "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        }
-      }
-    },
-    "karma-safarinative-launcher": {
-      "version": "1.1.0",
-      "dev": true,
-      "requires": {}
-    },
-    "karma-source-map-support": {
-      "version": "1.4.0",
-      "dev": true,
-      "requires": {
-        "source-map-support": "^0.5.5"
-      }
-    },
-    "karma-spec-reporter": {
-      "version": "0.0.32",
-      "dev": true,
-      "requires": {
-        "colors": "^1.1.2"
-      }
-    },
-    "karma-structured-json-reporter": {
-      "version": "1.0.1",
-      "dev": true
-    },
-    "karma-super-dots-reporter": {
-      "version": "0.2.0",
-      "dev": true,
-      "requires": {
-        "chalk": "^0.5.1",
-        "log-symbols": "^1.0.1"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "0.2.1",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "1.1.0",
-          "dev": true
-        },
-        "chalk": {
-          "version": "0.5.1",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^1.1.0",
-            "escape-string-regexp": "^1.0.0",
-            "has-ansi": "^0.1.0",
-            "strip-ansi": "^0.3.0",
-            "supports-color": "^0.2.0"
-          }
-        },
-        "has-ansi": {
-          "version": "0.1.0",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^0.2.0"
-          }
-        },
-        "log-symbols": {
-          "version": "1.0.2",
-          "dev": true,
-          "requires": {
-            "chalk": "^1.0.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "2.1.1",
-              "dev": true
-            },
-            "ansi-styles": {
-              "version": "2.2.1",
-              "dev": true
-            },
-            "chalk": {
-              "version": "1.1.3",
-              "dev": true,
-              "requires": {
-                "ansi-styles": "^2.2.1",
-                "escape-string-regexp": "^1.0.2",
-                "has-ansi": "^2.0.0",
-                "strip-ansi": "^3.0.0",
-                "supports-color": "^2.0.0"
-              }
-            },
-            "has-ansi": {
-              "version": "2.0.0",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^2.0.0"
-              }
-            },
-            "strip-ansi": {
-              "version": "3.0.1",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^2.0.0"
-              }
-            },
-            "supports-color": {
-              "version": "2.0.0",
-              "dev": true
-            }
-          }
-        },
-        "strip-ansi": {
-          "version": "0.3.0",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^0.2.1"
+            "ansi-regex": "^3.0.0"
           }
-        },
-        "supports-color": {
-          "version": "0.2.0",
-          "dev": true
         }
       }
     },
-    "keyv": {
-      "version": "3.1.0",
+    "karma-safarinative-launcher": {
+      "version": "1.1.0",
+      "dev": true,
+      "requires": {}
+    },
+    "karma-source-map-support": {
+      "version": "1.4.0",
+      "dev": true,
+      "requires": {
+        "source-map-support": "^0.5.5"
+      }
+    },
+    "karma-spec-reporter": {
+      "version": "0.0.36",
+      "resolved": "https://registry.npmjs.org/karma-spec-reporter/-/karma-spec-reporter-0.0.36.tgz",
+      "integrity": "sha512-11bvOl1x6ryKZph7kmbmMpbi8vsngEGxGOoeTlIcDaH3ab3j8aPJnZ+r+K/SS0sBSGy5VGkGYO2+hLct7hw/6w==",
       "dev": true,
       "requires": {
-        "json-buffer": "3.0.0"
+        "colors": "1.4.0"
       }
     },
+    "karma-structured-json-reporter": {
+      "version": "1.0.1",
+      "dev": true
+    },
     "kind-of": {
       "version": "6.0.3",
       "dev": true
     },
     "klaw": {
-      "version": "3.0.0",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.9"
-      }
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-4.1.0.tgz",
+      "integrity": "sha512-1zGZ9MF9H22UnkpVeuaGKOjfA2t6WrfdrJmGjy16ykcjnKQDmHVX+KI477rpbGevz/5FD4MC3xf1oxylBgcaQw==",
+      "dev": true
     },
     "kleur": {
-      "version": "4.1.4",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz",
+      "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==",
       "dev": true
     },
-    "latest-version": {
-      "version": "5.1.0",
-      "dev": true,
-      "requires": {
-        "package-json": "^6.3.0"
-      }
-    },
     "lazy-cache": {
       "version": "2.0.2",
       "dev": true,
@@ -34725,20 +36912,6 @@
         "set-getter": "^0.1.0"
       }
     },
-    "lazystream": {
-      "version": "1.0.0",
-      "dev": true,
-      "requires": {
-        "readable-stream": "^2.0.5"
-      }
-    },
-    "lead": {
-      "version": "1.0.0",
-      "dev": true,
-      "requires": {
-        "flush-write-stream": "^1.0.2"
-      }
-    },
     "leven": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
@@ -34758,21 +36931,36 @@
       "dev": true
     },
     "lilconfig": {
-      "version": "2.0.3",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.2.tgz",
+      "integrity": "sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==",
       "dev": true
     },
     "lines-and-columns": {
-      "version": "1.1.6",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
       "dev": true
     },
     "link-check": {
-      "version": "4.5.4",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/link-check/-/link-check-5.3.0.tgz",
+      "integrity": "sha512-Jhb7xueDgQgBaZzkfOtAyOZEZAIMJQIjUpYD2QY/zEB+LKTY1tWiBwZg8QIDbzQdPBOcqzg7oLQDNcES/tQmXg==",
       "dev": true,
       "requires": {
-        "is-relative-url": "^3.0.0",
+        "is-relative-url": "^4.0.0",
         "isemail": "^3.2.0",
-        "ms": "^2.1.2",
-        "request": "^2.88.2"
+        "ms": "^2.1.3",
+        "needle": "^3.3.1",
+        "proxy-agent": "^6.4.0"
+      },
+      "dependencies": {
+        "ms": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+          "dev": true
+        }
       }
     },
     "list-imports-exports": {
@@ -34822,37 +37010,10 @@
       "dev": true
     },
     "load-json-file": {
-      "version": "5.3.0",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.15",
-        "parse-json": "^4.0.0",
-        "pify": "^4.0.1",
-        "strip-bom": "^3.0.0",
-        "type-fest": "^0.3.0"
-      },
-      "dependencies": {
-        "parse-json": {
-          "version": "4.0.0",
-          "dev": true,
-          "requires": {
-            "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1"
-          }
-        },
-        "pify": {
-          "version": "4.0.1",
-          "dev": true
-        },
-        "strip-bom": {
-          "version": "3.0.0",
-          "dev": true
-        },
-        "type-fest": {
-          "version": "0.3.1",
-          "dev": true
-        }
-      }
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-7.0.1.tgz",
+      "integrity": "sha512-Gnxj3ev3mB5TkVBGad0JM6dmLiQL+o0t23JPBZ9sd+yvSLk05mFoqKBw5N8gbbkU4TNXyqCgIrl/VM17OgUIgQ==",
+      "dev": true
     },
     "locate-path": {
       "version": "5.0.0",
@@ -34862,14 +37023,7 @@
       }
     },
     "lodash": {
-      "version": "4.17.21"
-    },
-    "lodash.camelcase": {
-      "version": "4.3.0",
-      "dev": true
-    },
-    "lodash.clonedeep": {
-      "version": "4.5.0",
+      "version": "4.17.21",
       "dev": true
     },
     "lodash.debounce": {
@@ -34894,44 +37048,47 @@
     },
     "lodash.memoize": {
       "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
       "dev": true
     },
     "lodash.merge": {
       "version": "4.6.2",
       "dev": true
     },
-    "lodash.set": {
-      "version": "4.3.2",
-      "dev": true
-    },
     "lodash.sortby": {
       "version": "4.7.0",
       "dev": true
     },
-    "lodash.truncate": {
-      "version": "4.4.2",
-      "dev": true
-    },
     "lodash.uniq": {
       "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+      "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
       "dev": true
     },
     "log-symbols": {
-      "version": "4.0.0",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
       "dev": true,
       "requires": {
-        "chalk": "^4.0.0"
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
       },
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
             "color-convert": "^2.0.1"
           }
         },
         "chalk": {
-          "version": "4.1.0",
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -34940,6 +37097,8 @@
         },
         "color-convert": {
           "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
             "color-name": "~1.1.4"
@@ -34947,14 +37106,20 @@
         },
         "color-name": {
           "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -34963,14 +37128,16 @@
       }
     },
     "log4js": {
-      "version": "6.3.0",
+      "version": "6.9.1",
+      "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.9.1.tgz",
+      "integrity": "sha512-1somDdy9sChrr9/f4UlzhdaGfDR2c/SaD2a4T7qEkG4jTS57/B3qmnjLYePwQ8cqWnUHZI0iAKxMBpCZICiZ2g==",
       "dev": true,
       "requires": {
-        "date-format": "^3.0.0",
-        "debug": "^4.1.1",
-        "flatted": "^2.0.1",
-        "rfdc": "^1.1.4",
-        "streamroller": "^2.2.4"
+        "date-format": "^4.0.14",
+        "debug": "^4.3.4",
+        "flatted": "^3.2.7",
+        "rfdc": "^1.3.0",
+        "streamroller": "^3.1.5"
       }
     },
     "loose-envify": {
@@ -34979,31 +37146,18 @@
         "js-tokens": "^3.0.0 || ^4.0.0"
       }
     },
-    "lower-case": {
-      "version": "1.1.4",
-      "dev": true
-    },
-    "lowercase-keys": {
-      "version": "1.0.1",
-      "dev": true
-    },
-    "lru-cache": {
-      "version": "6.0.0",
+    "loupe": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz",
+      "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==",
       "dev": true,
       "requires": {
-        "yallist": "^4.0.0"
+        "get-func-name": "^2.0.1"
       }
     },
-    "luxon": {
-      "version": "1.26.0",
-      "optional": true
-    },
-    "magic-string": {
-      "version": "0.25.7",
-      "dev": true,
-      "requires": {
-        "sourcemap-codec": "^1.4.4"
-      }
+    "lower-case": {
+      "version": "1.1.4",
+      "dev": true
     },
     "make-dir": {
       "version": "3.1.0",
@@ -35027,106 +37181,59 @@
         "tmpl": "1.0.5"
       }
     },
-    "map-age-cleaner": {
-      "version": "0.1.3",
-      "dev": true,
-      "requires": {
-        "p-defer": "^1.0.0"
-      }
-    },
-    "map-cache": {
-      "version": "0.2.2",
-      "dev": true
-    },
     "map-stream": {
       "version": "0.0.7",
       "dev": true
     },
-    "map-visit": {
-      "version": "1.0.0",
-      "dev": true,
-      "requires": {
-        "object-visit": "^1.0.0"
-      }
-    },
     "markdown-link": {
       "version": "0.1.1",
       "dev": true
     },
     "markdown-link-check": {
-      "version": "3.8.7",
+      "version": "3.12.2",
+      "resolved": "https://registry.npmjs.org/markdown-link-check/-/markdown-link-check-3.12.2.tgz",
+      "integrity": "sha512-GWMwSvxuZn+uGGydi5yywnnDZy08SGps4I/63xqvWT7lxtH4cVLnhgZZYtEcPz/QvgPg9vbH2rvWpa29owMtHA==",
       "dev": true,
       "requires": {
-        "async": "^3.2.0",
-        "chalk": "^4.1.0",
-        "commander": "^6.2.0",
-        "link-check": "^4.5.4",
+        "async": "^3.2.5",
+        "chalk": "^5.3.0",
+        "commander": "^12.1.0",
+        "link-check": "^5.3.0",
         "lodash": "^4.17.21",
-        "markdown-link-extractor": "^1.2.7",
+        "markdown-link-extractor": "^4.0.2",
+        "needle": "^3.3.1",
         "progress": "^2.0.3",
-        "request": "^2.88.2"
+        "proxy-agent": "^6.4.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
         "async": {
-          "version": "3.2.0",
+          "version": "3.2.5",
+          "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz",
+          "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==",
           "dev": true
         },
         "chalk": {
-          "version": "4.1.0",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+          "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
           "dev": true
         },
         "commander": {
-          "version": "6.2.1",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
+          "version": "12.1.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz",
+          "integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
         }
       }
     },
     "markdown-link-extractor": {
-      "version": "1.2.7",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/markdown-link-extractor/-/markdown-link-extractor-4.0.2.tgz",
+      "integrity": "sha512-5cUOu4Vwx1wenJgxaudsJ8xwLUMN7747yDJX3V/L7+gi3e4MsCm7w5nbrDQQy8nEfnl4r5NV3pDXMAjhGXYXAw==",
       "dev": true,
       "requires": {
-        "marked": "^2.0.1"
-      },
-      "dependencies": {
-        "marked": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/marked/-/marked-2.1.3.tgz",
-          "integrity": "sha512-/Q+7MGzaETqifOMWYEA7HVMaZb4XbcRfaOzcSsHZEith83KGlvaSG33u0SKu89Mj5h+T8V2hM+8O45Qc5XTgwA==",
-          "dev": true
-        }
+        "html-link-extractor": "^1.0.5",
+        "marked": "^12.0.1"
       }
     },
     "markdown-toc": {
@@ -35148,20 +37255,24 @@
       }
     },
     "marked": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-3.0.8.tgz",
-      "integrity": "sha512-0gVrAjo5m0VZSJb4rpL59K1unJAMb/hm8HRXqasD8VeC8m91ytDPMritgFSlKonfdt+rRYYpP/JfLxgIX8yoSw==",
+      "version": "12.0.1",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-12.0.1.tgz",
+      "integrity": "sha512-Y1/V2yafOcOdWQCX0XpAKXzDakPOpn6U0YLxTJs3cww6VxOzZV1BTOOYWLvH3gX38cq+iLwljHHTnMtlDfg01Q==",
       "dev": true
     },
     "matcher": {
-      "version": "3.0.0",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/matcher/-/matcher-5.0.0.tgz",
+      "integrity": "sha512-s2EMBOWtXFc8dgqvoAzKJXxNHibcdJMV0gwqKUaw9E2JBJuGUK7DrNKrA6g/i+v72TT16+6sVm5mS3thaMLQUw==",
       "dev": true,
       "requires": {
-        "escape-string-regexp": "^4.0.0"
+        "escape-string-regexp": "^5.0.0"
       },
       "dependencies": {
         "escape-string-regexp": {
-          "version": "4.0.0",
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
+          "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
           "dev": true
         }
       }
@@ -35181,35 +37292,36 @@
     },
     "md5-hex": {
       "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/md5-hex/-/md5-hex-3.0.1.tgz",
+      "integrity": "sha512-BUiRtTtV39LIJwinWBjqVsU9xhdnz7/i889V859IBFpuqGAj6LuOvHv5XLbgZ2R7ptJoJaEcxkv88/h25T7Ciw==",
       "dev": true,
       "requires": {
         "blueimp-md5": "^2.10.0"
       }
     },
     "mdn-data": {
-      "version": "2.0.14",
+      "version": "2.0.30",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",
+      "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==",
       "dev": true
     },
     "media-typer": {
       "version": "0.3.0",
       "dev": true
     },
-    "mem": {
-      "version": "8.0.0",
+    "memoize": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/memoize/-/memoize-10.0.0.tgz",
+      "integrity": "sha512-H6cBLgsi6vMWOcCpvVCdFFnl3kerEXbrYh9q+lY6VXvQSmM6CkmV08VOwT+WE2tzIEqRPFfAq3fm4v/UIW6mSA==",
       "dev": true,
       "requires": {
-        "map-age-cleaner": "^0.1.3",
-        "mimic-fn": "^3.1.0"
-      },
-      "dependencies": {
-        "mimic-fn": {
-          "version": "3.1.0",
-          "dev": true
-        }
+        "mimic-function": "^5.0.0"
       }
     },
     "merge-descriptors": {
-      "version": "1.0.1",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
+      "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
       "dev": true
     },
     "merge-stream": {
@@ -35241,33 +37353,56 @@
       "dev": true
     },
     "mime-db": {
-      "version": "1.46.0",
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
       "dev": true
     },
     "mime-types": {
-      "version": "2.1.29",
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dev": true,
       "requires": {
-        "mime-db": "1.46.0"
+        "mime-db": "1.52.0"
       }
     },
     "mimic-fn": {
       "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
       "dev": true
     },
-    "mimic-response": {
-      "version": "1.0.1",
+    "mimic-function": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/mimic-function/-/mimic-function-5.0.0.tgz",
+      "integrity": "sha512-RBfQ+9X9DpXdEoK7Bu+KeEU6vFhumEIiXKWECPzRBmDserEq4uR2b/VCm0LwpMSosoq2k+Zuxj/GzOr0Fn6h/g==",
       "dev": true
     },
     "minimatch": {
-      "version": "3.0.4",
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
       "requires": {
-        "brace-expansion": "^1.1.7"
+        "brace-expansion": "^2.0.1"
+      },
+      "dependencies": {
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+          "dev": true,
+          "requires": {
+            "balanced-match": "^1.0.0"
+          }
+        }
       }
     },
     "minimist": {
-      "version": "1.2.5",
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
       "dev": true
     },
     "minipass": {
@@ -35304,88 +37439,64 @@
     },
     "mkdirp": {
       "version": "0.5.5",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.2.5"
-      }
-    },
-    "mocha": {
-      "version": "9.1.3",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.1.3.tgz",
-      "integrity": "sha512-Xcpl9FqXOAYqI3j79pEtHBBnQgVXIhpULjGQa7DVb0Po+VzmSIK9kanAiWLHoRR/dbZ2qpdPshuXr8l1VaHCzw==",
-      "dev": true,
-      "requires": {
-        "@ungap/promise-all-settled": "1.1.2",
-        "ansi-colors": "4.1.1",
-        "browser-stdout": "1.3.1",
-        "chokidar": "3.5.2",
-        "debug": "4.3.2",
-        "diff": "5.0.0",
-        "escape-string-regexp": "4.0.0",
-        "find-up": "5.0.0",
-        "glob": "7.1.7",
-        "growl": "1.10.5",
-        "he": "1.2.0",
-        "js-yaml": "4.1.0",
-        "log-symbols": "4.1.0",
-        "minimatch": "3.0.4",
-        "ms": "2.1.3",
-        "nanoid": "3.1.25",
-        "serialize-javascript": "6.0.0",
-        "strip-json-comments": "3.1.1",
-        "supports-color": "8.1.1",
-        "which": "2.0.2",
-        "workerpool": "6.1.5",
-        "yargs": "16.2.0",
-        "yargs-parser": "20.2.4",
-        "yargs-unparser": "2.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "argparse": {
-          "version": "2.0.1",
-          "dev": true
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "7.2.0",
-              "dev": true,
-              "requires": {
-                "has-flag": "^4.0.0"
-              }
-            }
-          }
+      "dev": true,
+      "requires": {
+        "minimist": "^1.2.5"
+      }
+    },
+    "mocha": {
+      "version": "10.6.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.6.0.tgz",
+      "integrity": "sha512-hxjt4+EEB0SA0ZDygSS015t65lJw/I2yRCS3Ae+SJ5FrbzrXgfYwJr96f0OvIXdj7h4lv/vLCrH3rkiuizFSvw==",
+      "dev": true,
+      "requires": {
+        "ansi-colors": "^4.1.3",
+        "browser-stdout": "^1.3.1",
+        "chokidar": "^3.5.3",
+        "debug": "^4.3.5",
+        "diff": "^5.2.0",
+        "escape-string-regexp": "^4.0.0",
+        "find-up": "^5.0.0",
+        "glob": "^8.1.0",
+        "he": "^1.2.0",
+        "js-yaml": "^4.1.0",
+        "log-symbols": "^4.1.0",
+        "minimatch": "^5.1.6",
+        "ms": "^2.1.3",
+        "serialize-javascript": "^6.0.2",
+        "strip-json-comments": "^3.1.1",
+        "supports-color": "^8.1.1",
+        "workerpool": "^6.5.1",
+        "yargs": "^16.2.0",
+        "yargs-parser": "^20.2.9",
+        "yargs-unparser": "^2.0.0"
+      },
+      "dependencies": {
+        "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
         },
-        "color-convert": {
+        "brace-expansion": {
           "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
           "dev": true,
           "requires": {
-            "color-name": "~1.1.4"
+            "balanced-match": "^1.0.0"
           }
         },
-        "color-name": {
-          "version": "1.1.4",
-          "dev": true
-        },
         "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
         },
         "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==",
           "dev": true,
           "requires": {
             "locate-path": "^6.0.0",
@@ -35393,23 +37504,28 @@
           }
         },
         "glob": {
-          "version": "7.1.7",
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
+          "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
           "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"
+            "minimatch": "^5.0.1",
+            "once": "^1.3.0"
           }
         },
         "has-flag": {
           "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "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"
@@ -35417,25 +37533,32 @@
         },
         "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"
           }
         },
-        "log-symbols": {
-          "version": "4.1.0",
+        "minimatch": {
+          "version": "5.1.6",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+          "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
           "dev": true,
           "requires": {
-            "chalk": "^4.1.0",
-            "is-unicode-supported": "^0.1.0"
+            "brace-expansion": "^2.0.1"
           }
         },
         "ms": {
           "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
           "dev": true
         },
         "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,
           "requires": {
             "yocto-queue": "^0.1.0"
@@ -35443,6 +37566,8 @@
         },
         "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==",
           "dev": true,
           "requires": {
             "p-limit": "^3.0.2"
@@ -35450,54 +37575,38 @@
         },
         "path-exists": {
           "version": "4.0.0",
-          "dev": true
-        },
-        "strip-json-comments": {
-          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
           "dev": true
         },
         "supports-color": {
           "version": "8.1.1",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
           }
-        },
-        "which": {
-          "version": "2.0.2",
-          "dev": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        },
-        "yargs-parser": {
-          "version": "20.2.4",
-          "dev": true
         }
       }
     },
     "mocha-junit-reporter": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/mocha-junit-reporter/-/mocha-junit-reporter-2.0.2.tgz",
-      "integrity": "sha512-vYwWq5hh3v1lG0gdQCBxwNipBfvDiAM1PHroQRNp96+2l72e9wEUTw+mzoK+O0SudgfQ7WvTQZ9Nh3qkAYAjfg==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/mocha-junit-reporter/-/mocha-junit-reporter-2.2.1.tgz",
+      "integrity": "sha512-iDn2tlKHn8Vh8o4nCzcUVW4q7iXp7cC4EB78N0cDHIobLymyHNwe0XG8HEHHjc3hJlXm0Vy6zcrxaIhnI2fWmw==",
       "dev": true,
       "requires": {
-        "debug": "^2.2.0",
-        "md5": "^2.1.0",
-        "mkdirp": "~0.5.1",
+        "debug": "^4.3.4",
+        "md5": "^2.3.0",
+        "mkdirp": "^3.0.0",
         "strip-ansi": "^6.0.1",
-        "xml": "^1.0.0"
+        "xml": "^1.0.1"
       },
       "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
+        "mkdirp": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
+          "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
           "dev": true
         }
       }
@@ -35549,7 +37658,9 @@
       }
     },
     "moment": {
-      "version": "2.29.1"
+      "version": "2.29.4",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
+      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
     },
     "moo": {
       "version": "0.5.1",
@@ -35583,10 +37694,6 @@
         }
       }
     },
-    "mout": {
-      "version": "1.2.2",
-      "dev": true
-    },
     "mri": {
       "version": "1.1.6",
       "dev": true
@@ -35596,49 +37703,26 @@
       "dev": true
     },
     "multer": {
-      "version": "1.4.3",
+      "version": "1.4.5-lts.1",
+      "resolved": "https://registry.npmjs.org/multer/-/multer-1.4.5-lts.1.tgz",
+      "integrity": "sha512-ywPWvcDMeH+z9gQq5qYHCCy+ethsk4goepZ45GLD63fOu0YcNecQxi64nDs3qluZB+murG3/D4dJ7+dGctcCQQ==",
       "dev": true,
       "requires": {
         "append-field": "^1.0.0",
-        "busboy": "^0.2.11",
+        "busboy": "^1.0.0",
         "concat-stream": "^1.5.2",
         "mkdirp": "^0.5.4",
         "object-assign": "^4.1.1",
-        "on-finished": "^2.3.0",
         "type-is": "^1.6.4",
         "xtend": "^4.0.0"
       }
     },
-    "mz": {
-      "version": "2.7.0",
-      "dev": true,
-      "requires": {
-        "any-promise": "^1.0.0",
-        "object-assign": "^4.0.1",
-        "thenify-all": "^1.0.0"
-      }
-    },
     "nanoid": {
-      "version": "3.1.25",
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
       "dev": true
     },
-    "nanomatch": {
-      "version": "1.2.13",
-      "dev": true,
-      "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "fragment-cache": "^0.2.1",
-        "is-windows": "^1.0.2",
-        "kind-of": "^6.0.2",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      }
-    },
     "natural-compare": {
       "version": "1.4.0",
       "dev": true
@@ -35663,14 +37747,43 @@
         }
       }
     },
+    "needle": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/needle/-/needle-3.3.1.tgz",
+      "integrity": "sha512-6k0YULvhpw+RoLNiQCRKOl09Rv1dPLr8hHnVjHqdolKwDrdNyk+Hmrthi4lIGPPz3r39dLx0hsF5s40sZ3Us4Q==",
+      "dev": true,
+      "requires": {
+        "iconv-lite": "^0.6.3",
+        "sax": "^1.2.4"
+      },
+      "dependencies": {
+        "iconv-lite": {
+          "version": "0.6.3",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+          "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+          "dev": true,
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3.0.0"
+          }
+        }
+      }
+    },
     "negotiator": {
-      "version": "0.6.2",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
       "dev": true
     },
     "neo-async": {
       "version": "2.6.2",
       "dev": true
     },
+    "netmask": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
+      "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==",
+      "dev": true
+    },
     "nise": {
       "version": "5.1.0",
       "dev": true,
@@ -35682,6 +37795,15 @@
         "path-to-regexp": "^1.7.0"
       },
       "dependencies": {
+        "@sinonjs/fake-timers": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz",
+          "integrity": "sha512-iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg==",
+          "dev": true,
+          "requires": {
+            "@sinonjs/commons": "^1.7.0"
+          }
+        },
         "isarray": {
           "version": "0.0.1",
           "dev": true
@@ -35702,27 +37824,10 @@
         "lower-case": "^1.1.1"
       }
     },
-    "nock": {
-      "version": "13.1.4",
-      "resolved": "https://registry.npmjs.org/nock/-/nock-13.1.4.tgz",
-      "integrity": "sha512-hr5+mknLpIbTOXifB13lx9mAKF1zQPUCMh53Galx79ic5opvNOd55jiB0iGCp2xqh+hwnFbNE/ddBKHsJNQrbw==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.1.0",
-        "json-stringify-safe": "^5.0.1",
-        "lodash.set": "^4.3.2",
-        "propagate": "^2.0.0"
-      }
-    },
-    "node-dir": {
-      "version": "0.1.17",
-      "dev": true,
-      "requires": {
-        "minimatch": "^3.0.2"
-      }
-    },
     "node-fetch": {
-      "version": "2.6.5",
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
       "dev": true,
       "requires": {
         "whatwg-url": "^5.0.0"
@@ -35746,24 +37851,28 @@
         }
       }
     },
-    "node-forge": {
-      "version": "0.10.0",
+    "node-gyp-build": {
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.0.tgz",
+      "integrity": "sha512-u6fs2AEUljNho3EYTJNBfImO5QTo/J/1Etd+NVdCj7qWKUSN/bSLkZwhDv7I+w/MSC6qJ4cknepkAYykDdK8og==",
       "dev": true
     },
     "node-int64": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
+      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
       "dev": true
     },
-    "node-modules-regexp": {
-      "version": "1.0.0",
+    "node-releases": {
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
+      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==",
       "dev": true
     },
-    "node-releases": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz",
-      "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==",
+    "nofilter": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/nofilter/-/nofilter-3.1.0.tgz",
+      "integrity": "sha512-l2NNj07e9afPnhAhvgVrCD/oy2Ai1yfLpuo3EpiO1jFTsB4sFz6oIfAfSZyQzVpkZQ9xS8ZS5g1jCBgq4Hwo0g==",
       "dev": true
     },
     "nomnom": {
@@ -35787,22 +37896,6 @@
         "abbrev": "1"
       }
     },
-    "normalize-package-data": {
-      "version": "2.5.0",
-      "dev": true,
-      "requires": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "5.7.1",
-          "dev": true
-        }
-      }
-    },
     "normalize-path": {
       "version": "3.0.0",
       "dev": true
@@ -35811,19 +37904,6 @@
       "version": "0.1.2",
       "dev": true
     },
-    "normalize-url": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
-      "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==",
-      "dev": true
-    },
-    "now-and-later": {
-      "version": "2.0.1",
-      "dev": true,
-      "requires": {
-        "once": "^1.3.2"
-      }
-    },
     "npm-run-path": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
@@ -35833,6 +37913,18 @@
         "path-key": "^3.0.0"
       }
     },
+    "npmlog": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
+      "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
+      "dev": true,
+      "requires": {
+        "are-we-there-yet": "^2.0.0",
+        "console-control-strings": "^1.1.0",
+        "gauge": "^3.0.0",
+        "set-blocking": "^2.0.0"
+      }
+    },
     "nth-check": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",
@@ -35843,11 +37935,9 @@
       }
     },
     "nwsapi": {
-      "version": "2.2.0",
-      "dev": true
-    },
-    "oauth-sign": {
-      "version": "0.9.0",
+      "version": "2.2.12",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.12.tgz",
+      "integrity": "sha512-qXDmcVlZV4XRtKFzddidpfVP4oMSGhga+xdMc25mv8kaLUHtgzCDhUxkrN8exkGdTlLNaXj7CV3GtON7zuGZ+w==",
       "dev": true
     },
     "obj-str": {
@@ -35856,87 +37946,68 @@
     "object-assign": {
       "version": "4.1.1"
     },
-    "object-copy": {
-      "version": "0.1.0",
-      "dev": true,
-      "requires": {
-        "copy-descriptor": "^0.1.0",
-        "define-property": "^0.2.5",
-        "kind-of": "^3.0.3"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
     "object-inspect": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
-      "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg=="
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
+      "dev": true
     },
     "object-is": {
       "version": "1.1.5",
+      "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3"
       }
     },
     "object-keys": {
-      "version": "1.1.1"
-    },
-    "object-visit": {
-      "version": "1.0.1",
-      "dev": true,
-      "requires": {
-        "isobject": "^3.0.0"
-      }
+      "version": "1.1.1",
+      "dev": true
     },
     "object.assign": {
-      "version": "4.1.2",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
+      "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
+      "dev": true,
       "requires": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "has-symbols": "^1.0.1",
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "has-symbols": "^1.0.3",
         "object-keys": "^1.1.1"
       }
     },
     "object.entries": {
-      "version": "1.1.3",
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz",
+      "integrity": "sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==",
+      "dev": true,
       "requires": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.1",
-        "has": "^1.0.3"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
       }
     },
     "object.fromentries": {
-      "version": "2.0.4",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz",
+      "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.2",
-        "has": "^1.0.3"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0"
       }
     },
-    "object.hasown": {
-      "version": "1.0.0",
+    "object.groupby": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz",
+      "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.1"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2"
       }
     },
     "object.pick": {
@@ -35947,13 +38018,14 @@
       }
     },
     "object.values": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
-      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz",
+      "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==",
+      "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
       }
     },
     "on-finished": {
@@ -35976,15 +38048,17 @@
     },
     "onetime": {
       "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
       "dev": true,
       "requires": {
         "mimic-fn": "^2.1.0"
       }
     },
     "open": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
-      "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
+      "version": "8.4.2",
+      "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
+      "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
       "dev": true,
       "requires": {
         "define-lazy-prop": "^2.0.0",
@@ -36001,103 +38075,8 @@
         "levn": "~0.3.0",
         "prelude-ls": "~1.1.2",
         "type-check": "~0.3.2",
-        "word-wrap": "~1.2.3"
-      }
-    },
-    "ora": {
-      "version": "5.3.0",
-      "dev": true,
-      "requires": {
-        "bl": "^4.0.3",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-spinners": "^2.5.0",
-        "is-interactive": "^1.0.0",
-        "log-symbols": "^4.0.0",
-        "strip-ansi": "^6.0.0",
-        "wcwidth": "^1.0.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "ordered-read-streams": {
-      "version": "1.0.1",
-      "dev": true,
-      "requires": {
-        "readable-stream": "^2.0.1"
-      }
-    },
-    "os-homedir": {
-      "version": "1.0.2",
-      "dev": true
-    },
-    "os-tmpdir": {
-      "version": "1.0.2",
-      "dev": true
-    },
-    "osenv": {
-      "version": "0.1.5",
-      "dev": true,
-      "requires": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.0"
-      }
-    },
-    "p-cancelable": {
-      "version": "1.1.0",
-      "dev": true
-    },
-    "p-defer": {
-      "version": "1.0.0",
-      "dev": true
-    },
-    "p-event": {
-      "version": "4.2.0",
-      "dev": true,
-      "requires": {
-        "p-timeout": "^3.1.0"
-      }
-    },
-    "p-finally": {
-      "version": "1.0.0",
-      "dev": true
+        "word-wrap": "~1.2.3"
+      }
     },
     "p-limit": {
       "version": "2.3.0",
@@ -36120,33 +38099,67 @@
         "aggregate-error": "^3.0.0"
       }
     },
-    "p-timeout": {
-      "version": "3.2.0",
-      "dev": true,
-      "requires": {
-        "p-finally": "^1.0.0"
-      }
-    },
     "p-try": {
       "version": "2.2.0",
       "dev": true
     },
-    "package-json": {
-      "version": "6.5.0",
+    "pac-proxy-agent": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.1.tgz",
+      "integrity": "sha512-ASV8yU4LLKBAjqIPMbrgtaKIvxQri/yh2OpI+S6hVa9JRkUI3Y3NPFbfngDtY7oFtSMD3w31Xns89mDa3Feo5A==",
       "dev": true,
       "requires": {
-        "got": "^9.6.0",
-        "registry-auth-token": "^4.0.0",
-        "registry-url": "^5.0.0",
-        "semver": "^6.2.0"
+        "@tootallnate/quickjs-emscripten": "^0.23.0",
+        "agent-base": "^7.0.2",
+        "debug": "^4.3.4",
+        "get-uri": "^6.0.1",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.2",
+        "pac-resolver": "^7.0.0",
+        "socks-proxy-agent": "^8.0.2"
       },
       "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "dev": true
+        "agent-base": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
+          "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==",
+          "dev": true,
+          "requires": {
+            "debug": "^4.3.4"
+          }
+        },
+        "https-proxy-agent": {
+          "version": "7.0.4",
+          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz",
+          "integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==",
+          "dev": true,
+          "requires": {
+            "agent-base": "^7.0.2",
+            "debug": "4"
+          }
         }
       }
     },
+    "pac-resolver": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz",
+      "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==",
+      "dev": true,
+      "requires": {
+        "degenerator": "^5.0.0",
+        "netmask": "^2.0.2"
+      }
+    },
+    "package-config": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/package-config/-/package-config-5.0.0.tgz",
+      "integrity": "sha512-GYTTew2slBcYdvRHqjhwaaydVMvn/qrGC323+nKclYioNSLTDUM/lGgtGTgyHVtYcozb+XkE8CNhwcraOmZ9Mg==",
+      "dev": true,
+      "requires": {
+        "find-up-simple": "^1.0.0",
+        "load-json-file": "^7.0.1"
+      }
+    },
     "param-case": {
       "version": "2.1.1",
       "dev": true,
@@ -36156,13 +38169,27 @@
     },
     "parent-module": {
       "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
       "dev": true,
       "requires": {
         "callsites": "^3.0.0"
       }
     },
+    "parse-imports": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/parse-imports/-/parse-imports-2.1.1.tgz",
+      "integrity": "sha512-TDT4HqzUiTMO1wJRwg/t/hYk8Wdp3iF/ToMIlAoVQfL1Xs/sTxq1dKWSMjMbQmIarfWKymOyly40+zmPHXMqCA==",
+      "dev": true,
+      "requires": {
+        "es-module-lexer": "^1.5.3",
+        "slashes": "^3.0.12"
+      }
+    },
     "parse-json": {
       "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
@@ -36172,17 +38199,15 @@
       }
     },
     "parse-ms": {
-      "version": "2.1.0",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-4.0.0.tgz",
+      "integrity": "sha512-TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw==",
       "dev": true
     },
     "parse-node-version": {
       "version": "1.0.1",
       "dev": true
     },
-    "parse-passwd": {
-      "version": "1.0.0",
-      "dev": true
-    },
     "parse5": {
       "version": "6.0.1",
       "dev": true
@@ -36198,14 +38223,6 @@
       "version": "1.3.3",
       "dev": true
     },
-    "pascalcase": {
-      "version": "0.1.1",
-      "dev": true
-    },
-    "path-dirname": {
-      "version": "1.0.2",
-      "dev": true
-    },
     "path-exists": {
       "version": "3.0.0",
       "dev": true
@@ -36225,7 +38242,9 @@
       "dev": true
     },
     "path-to-regexp": {
-      "version": "0.1.7",
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
+      "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==",
       "dev": true
     },
     "path-type": {
@@ -36244,10 +38263,13 @@
       }
     },
     "performance-now": {
-      "version": "2.1.0"
+      "version": "2.1.0",
+      "dev": true
     },
     "picocolors": {
-      "version": "0.2.1",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
+      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
       "dev": true
     },
     "picomatch": {
@@ -36261,50 +38283,10 @@
       "dev": true
     },
     "pirates": {
-      "version": "4.0.1",
-      "dev": true,
-      "requires": {
-        "node-modules-regexp": "^1.0.0"
-      }
-    },
-    "pkg-conf": {
-      "version": "3.1.0",
-      "dev": true,
-      "requires": {
-        "find-up": "^3.0.0",
-        "load-json-file": "^5.2.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "3.0.0",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        }
-      }
-    },
-    "pkg-dir": {
-      "version": "4.2.0",
-      "dev": true,
-      "requires": {
-        "find-up": "^4.0.0"
-      }
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
+      "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
+      "dev": true
     },
     "pkg-up": {
       "version": "3.1.0",
@@ -36338,13 +38320,12 @@
       }
     },
     "plugin-error": {
-      "version": "1.0.1",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-2.0.1.tgz",
+      "integrity": "sha512-zMakqvIDyY40xHOvzXka0kUvf40nYIuwRE8dWhti2WtjQZ31xAgBZBhxsK7vK3QbRXS1Xms/LO7B5cuAsfB2Gg==",
       "dev": true,
       "requires": {
-        "ansi-colors": "^1.0.1",
-        "arr-diff": "^4.0.0",
-        "arr-union": "^3.1.0",
-        "extend-shallow": "^3.0.2"
+        "ansi-colors": "^1.0.1"
       },
       "dependencies": {
         "ansi-colors": {
@@ -36357,88 +38338,95 @@
       }
     },
     "plur": {
-      "version": "4.0.0",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/plur/-/plur-5.1.0.tgz",
+      "integrity": "sha512-VP/72JeXqak2KiOzjgKtQen5y3IZHn+9GOuLDafPv0eXa47xq0At93XahYBs26MsifCQ4enGKwbjBTKgb9QJXg==",
       "dev": true,
       "requires": {
-        "irregular-plurals": "^3.2.0"
+        "irregular-plurals": "^3.3.0"
       }
     },
-    "posix-character-classes": {
-      "version": "0.1.1",
+    "possible-typed-array-names": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
+      "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
       "dev": true
     },
     "postcss": {
-      "version": "8.3.11",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.11.tgz",
-      "integrity": "sha512-hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA==",
+      "version": "8.4.39",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.39.tgz",
+      "integrity": "sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==",
       "dev": true,
       "requires": {
-        "nanoid": "^3.1.30",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^0.6.2"
-      },
-      "dependencies": {
-        "nanoid": {
-          "version": "3.1.30",
-          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz",
-          "integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==",
-          "dev": true
-        },
-        "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.3.7",
+        "picocolors": "^1.0.1",
+        "source-map-js": "^1.2.0"
       }
     },
     "postcss-calc": {
-      "version": "8.0.0",
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-9.0.1.tgz",
+      "integrity": "sha512-TipgjGyzP5QzEhsOZUaIkeO5mKeMFpebWzRogWG/ysonUlnHcq5aJe0jOjpfzUU8PeSaBQnrE8ehR0QA5vs8PQ==",
       "dev": true,
       "requires": {
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.0.2"
+        "postcss-selector-parser": "^6.0.11",
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-colormin": {
-      "version": "5.2.0",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-6.1.0.tgz",
+      "integrity": "sha512-x9yX7DOxeMAR+BgGVnNSAxmAj98NX/YxEMNFP+SDCEeNLb2r3i6Hh1ksMsnW8Ub5SLCpbescQqn9YEbE9554Sw==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.16.6",
+        "browserslist": "^4.23.0",
         "caniuse-api": "^3.0.0",
-        "colord": "^2.0.1",
-        "postcss-value-parser": "^4.1.0"
+        "colord": "^2.9.3",
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-convert-values": {
-      "version": "5.0.1",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-6.1.0.tgz",
+      "integrity": "sha512-zx8IwP/ts9WvUM6NkVSkiU902QZL1bwPhaVaLynPtCsOTqp+ZKbNi+s6XJg3rfqpKGA/oc7Oxk5t8pOQJcwl/w==",
       "dev": true,
       "requires": {
-        "postcss-value-parser": "^4.1.0"
+        "browserslist": "^4.23.0",
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-discard-comments": {
-      "version": "5.0.1",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-6.0.2.tgz",
+      "integrity": "sha512-65w/uIqhSBBfQmYnG92FO1mWZjJ4GL5b8atm5Yw2UgrwD7HiNiSSNwJor1eCFGzUgYnN/iIknhNRVqjrrpuglw==",
       "dev": true,
       "requires": {}
     },
     "postcss-discard-duplicates": {
-      "version": "5.0.1",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.3.tgz",
+      "integrity": "sha512-+JA0DCvc5XvFAxwx6f/e68gQu/7Z9ud584VLmcgto28eB8FqSFZwtrLwB5Kcp70eIoWP/HXqz4wpo8rD8gpsTw==",
       "dev": true,
       "requires": {}
     },
     "postcss-discard-empty": {
-      "version": "5.0.1",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-6.0.3.tgz",
+      "integrity": "sha512-znyno9cHKQsK6PtxL5D19Fj9uwSzC2mB74cpT66fhgOadEUPyXFkbgwm5tvc3bt3NAy8ltE5MrghxovZRVnOjQ==",
       "dev": true,
       "requires": {}
     },
     "postcss-discard-overridden": {
-      "version": "5.0.1",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-6.0.2.tgz",
+      "integrity": "sha512-j87xzI4LUggC5zND7KdjsI25APtyMuynXZSujByMaav2roV6OZX+8AaCUcZSWqckZpjAjRyFDdpqybgjFO0HJQ==",
       "dev": true,
       "requires": {}
     },
     "postcss-import": {
-      "version": "14.0.2",
+      "version": "16.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-16.1.0.tgz",
+      "integrity": "sha512-7hsAZ4xGXl4MW+OKEWCnF6T5jqBw80/EE9aXg1r2yyn1RsVEU8EtKXbijEODa+rg7iih4bKf7vlvTGYR4CnPNg==",
       "dev": true,
       "requires": {
         "postcss-value-parser": "^4.0.0",
@@ -36447,159 +38435,180 @@
       }
     },
     "postcss-merge-longhand": {
-      "version": "5.0.2",
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-6.0.5.tgz",
+      "integrity": "sha512-5LOiordeTfi64QhICp07nzzuTDjNSO8g5Ksdibt44d+uvIIAE1oZdRn8y/W5ZtYgRH/lnLDlvi9F8btZcVzu3w==",
       "dev": true,
       "requires": {
-        "css-color-names": "^1.0.1",
-        "postcss-value-parser": "^4.1.0",
-        "stylehacks": "^5.0.1"
+        "postcss-value-parser": "^4.2.0",
+        "stylehacks": "^6.1.1"
       }
     },
     "postcss-merge-rules": {
-      "version": "5.0.2",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-6.1.1.tgz",
+      "integrity": "sha512-KOdWF0gju31AQPZiD+2Ar9Qjowz1LTChSjFFbS+e2sFgc4uHOp3ZvVX4sNeTlk0w2O31ecFGgrFzhO0RSWbWwQ==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.16.6",
+        "browserslist": "^4.23.0",
         "caniuse-api": "^3.0.0",
-        "cssnano-utils": "^2.0.1",
-        "postcss-selector-parser": "^6.0.5",
-        "vendors": "^1.0.3"
+        "cssnano-utils": "^4.0.2",
+        "postcss-selector-parser": "^6.0.16"
       }
     },
     "postcss-minify-font-values": {
-      "version": "5.0.1",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-6.1.0.tgz",
+      "integrity": "sha512-gklfI/n+9rTh8nYaSJXlCo3nOKqMNkxuGpTn/Qm0gstL3ywTr9/WRKznE+oy6fvfolH6dF+QM4nCo8yPLdvGJg==",
       "dev": true,
       "requires": {
-        "postcss-value-parser": "^4.1.0"
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-minify-gradients": {
-      "version": "5.0.2",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-6.0.3.tgz",
+      "integrity": "sha512-4KXAHrYlzF0Rr7uc4VrfwDJ2ajrtNEpNEuLxFgwkhFZ56/7gaE4Nr49nLsQDZyUe+ds+kEhf+YAUolJiYXF8+Q==",
       "dev": true,
       "requires": {
-        "colord": "^2.6",
-        "cssnano-utils": "^2.0.1",
-        "postcss-value-parser": "^4.1.0"
+        "colord": "^2.9.3",
+        "cssnano-utils": "^4.0.2",
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-minify-params": {
-      "version": "5.0.1",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-6.1.0.tgz",
+      "integrity": "sha512-bmSKnDtyyE8ujHQK0RQJDIKhQ20Jq1LYiez54WiaOoBtcSuflfK3Nm596LvbtlFcpipMjgClQGyGr7GAs+H1uA==",
       "dev": true,
       "requires": {
-        "alphanum-sort": "^1.0.2",
-        "browserslist": "^4.16.0",
-        "cssnano-utils": "^2.0.1",
-        "postcss-value-parser": "^4.1.0",
-        "uniqs": "^2.0.0"
+        "browserslist": "^4.23.0",
+        "cssnano-utils": "^4.0.2",
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-minify-selectors": {
-      "version": "5.1.0",
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-6.0.4.tgz",
+      "integrity": "sha512-L8dZSwNLgK7pjTto9PzWRoMbnLq5vsZSTu8+j1P/2GB8qdtGQfn+K1uSvFgYvgh83cbyxT5m43ZZhUMTJDSClQ==",
       "dev": true,
       "requires": {
-        "alphanum-sort": "^1.0.2",
-        "postcss-selector-parser": "^6.0.5"
+        "postcss-selector-parser": "^6.0.16"
       }
     },
     "postcss-normalize-charset": {
-      "version": "5.0.1",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-6.0.2.tgz",
+      "integrity": "sha512-a8N9czmdnrjPHa3DeFlwqst5eaL5W8jYu3EBbTTkI5FHkfMhFZh1EGbku6jhHhIzTA6tquI2P42NtZ59M/H/kQ==",
       "dev": true,
       "requires": {}
     },
     "postcss-normalize-display-values": {
-      "version": "5.0.1",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-6.0.2.tgz",
+      "integrity": "sha512-8H04Mxsb82ON/aAkPeq8kcBbAtI5Q2a64X/mnRRfPXBq7XeogoQvReqxEfc0B4WPq1KimjezNC8flUtC3Qz6jg==",
       "dev": true,
       "requires": {
-        "cssnano-utils": "^2.0.1",
-        "postcss-value-parser": "^4.1.0"
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-normalize-positions": {
-      "version": "5.0.1",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-6.0.2.tgz",
+      "integrity": "sha512-/JFzI441OAB9O7VnLA+RtSNZvQ0NCFZDOtp6QPFo1iIyawyXg0YI3CYM9HBy1WvwCRHnPep/BvI1+dGPKoXx/Q==",
       "dev": true,
       "requires": {
-        "postcss-value-parser": "^4.1.0"
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-normalize-repeat-style": {
-      "version": "5.0.1",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-6.0.2.tgz",
+      "integrity": "sha512-YdCgsfHkJ2jEXwR4RR3Tm/iOxSfdRt7jplS6XRh9Js9PyCR/aka/FCb6TuHT2U8gQubbm/mPmF6L7FY9d79VwQ==",
       "dev": true,
       "requires": {
-        "cssnano-utils": "^2.0.1",
-        "postcss-value-parser": "^4.1.0"
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-normalize-string": {
-      "version": "5.0.1",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-6.0.2.tgz",
+      "integrity": "sha512-vQZIivlxlfqqMp4L9PZsFE4YUkWniziKjQWUtsxUiVsSSPelQydwS8Wwcuw0+83ZjPWNTl02oxlIvXsmmG+CiQ==",
       "dev": true,
       "requires": {
-        "postcss-value-parser": "^4.1.0"
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-normalize-timing-functions": {
-      "version": "5.0.1",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-6.0.2.tgz",
+      "integrity": "sha512-a+YrtMox4TBtId/AEwbA03VcJgtyW4dGBizPl7e88cTFULYsprgHWTbfyjSLyHeBcK/Q9JhXkt2ZXiwaVHoMzA==",
       "dev": true,
       "requires": {
-        "cssnano-utils": "^2.0.1",
-        "postcss-value-parser": "^4.1.0"
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-normalize-unicode": {
-      "version": "5.0.1",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-6.1.0.tgz",
+      "integrity": "sha512-QVC5TQHsVj33otj8/JD869Ndr5Xcc/+fwRh4HAsFsAeygQQXm+0PySrKbr/8tkDKzW+EVT3QkqZMfFrGiossDg==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.16.0",
-        "postcss-value-parser": "^4.1.0"
+        "browserslist": "^4.23.0",
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-normalize-url": {
-      "version": "5.0.2",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-6.0.2.tgz",
+      "integrity": "sha512-kVNcWhCeKAzZ8B4pv/DnrU1wNh458zBNp8dh4y5hhxih5RZQ12QWMuQrDgPRw3LRl8mN9vOVfHl7uhvHYMoXsQ==",
       "dev": true,
       "requires": {
-        "is-absolute-url": "^3.0.3",
-        "normalize-url": "^6.0.1",
-        "postcss-value-parser": "^4.1.0"
-      },
-      "dependencies": {
-        "normalize-url": {
-          "version": "6.1.0",
-          "dev": true
-        }
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-normalize-whitespace": {
-      "version": "5.0.1",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-6.0.2.tgz",
+      "integrity": "sha512-sXZ2Nj1icbJOKmdjXVT9pnyHQKiSAyuNQHSgRCUgThn2388Y9cGVDR+E9J9iAYbSbLHI+UUwLVl1Wzco/zgv0Q==",
       "dev": true,
       "requires": {
-        "postcss-value-parser": "^4.1.0"
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-ordered-values": {
-      "version": "5.0.2",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-6.0.2.tgz",
+      "integrity": "sha512-VRZSOB+JU32RsEAQrO94QPkClGPKJEL/Z9PCBImXMhIeK5KAYo6slP/hBYlLgrCjFxyqvn5VC81tycFEDBLG1Q==",
       "dev": true,
       "requires": {
-        "cssnano-utils": "^2.0.1",
-        "postcss-value-parser": "^4.1.0"
+        "cssnano-utils": "^4.0.2",
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-reduce-initial": {
-      "version": "5.0.1",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-6.1.0.tgz",
+      "integrity": "sha512-RarLgBK/CrL1qZags04oKbVbrrVK2wcxhvta3GCxrZO4zveibqbRPmm2VI8sSgCXwoUHEliRSbOfpR0b/VIoiw==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.16.0",
+        "browserslist": "^4.23.0",
         "caniuse-api": "^3.0.0"
       }
     },
     "postcss-reduce-transforms": {
-      "version": "5.0.1",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-6.0.2.tgz",
+      "integrity": "sha512-sB+Ya++3Xj1WaT9+5LOOdirAxP7dJZms3GRcYheSPi1PiTMigsxHAdkrbItHxwYHr4kt1zL7mmcHstgMYT+aiA==",
       "dev": true,
       "requires": {
-        "cssnano-utils": "^2.0.1",
-        "postcss-value-parser": "^4.1.0"
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-selector-parser": {
-      "version": "6.0.6",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.0.tgz",
+      "integrity": "sha512-UMz42UD0UY0EApS0ZL9o1XnLhSTtvvvLe5Dc2H2O56fvRZi+KulDyf5ctDhhtYJBGKStV2FL1fy6253cmLgqVQ==",
       "dev": true,
       "requires": {
         "cssesc": "^3.0.0",
@@ -36607,176 +38616,141 @@
       }
     },
     "postcss-svgo": {
-      "version": "5.0.2",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-6.0.3.tgz",
+      "integrity": "sha512-dlrahRmxP22bX6iKEjOM+c8/1p+81asjKT+V5lrgOH944ryx/OHpclnIbGsKVd3uWOXFLYJwCVf0eEkJGvO96g==",
       "dev": true,
       "requires": {
-        "postcss-value-parser": "^4.1.0",
-        "svgo": "^2.3.0"
+        "postcss-value-parser": "^4.2.0",
+        "svgo": "^3.2.0"
       }
     },
     "postcss-unique-selectors": {
-      "version": "5.0.1",
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-6.0.4.tgz",
+      "integrity": "sha512-K38OCaIrO8+PzpArzkLKB42dSARtC2tmG6PvD4b1o1Q2E9Os8jzfWFfSy/rixsHwohtsDdFtAWGjFVFUdwYaMg==",
       "dev": true,
       "requires": {
-        "alphanum-sort": "^1.0.2",
-        "postcss-selector-parser": "^6.0.5",
-        "uniqs": "^2.0.0"
+        "postcss-selector-parser": "^6.0.16"
       }
     },
     "postcss-value-parser": {
-      "version": "4.1.0",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
       "dev": true
     },
     "posthtml": {
-      "version": "0.16.5",
+      "version": "0.16.6",
+      "resolved": "https://registry.npmjs.org/posthtml/-/posthtml-0.16.6.tgz",
+      "integrity": "sha512-JcEmHlyLK/o0uGAlj65vgg+7LIms0xKXe60lcDOTU7oVX/3LuEuLwrQpW3VJ7de5TaFKiW4kWkaIpJL42FEgxQ==",
       "dev": true,
       "requires": {
-        "posthtml-parser": "^0.10.0",
+        "posthtml-parser": "^0.11.0",
         "posthtml-render": "^3.0.0"
       }
     },
     "posthtml-parser": {
-      "version": "0.10.0",
-      "dev": true,
-      "requires": {
-        "htmlparser2": "^6.0.0"
-      }
-    },
-    "posthtml-render": {
-      "version": "3.0.0",
-      "dev": true,
-      "requires": {
-        "is-json": "^2.0.1"
-      }
-    },
-    "preact": {
-      "version": "10.5.15",
-      "resolved": "https://registry.npmjs.org/preact/-/preact-10.5.15.tgz",
-      "integrity": "sha512-5chK29n6QcJc3m1lVrKQSQ+V7K1Gb8HeQY6FViQ5AxCAEGu3DaHffWNDkC9+miZgsLvbvU9rxbV1qinGHMHzqA=="
-    },
-    "prelude-ls": {
-      "version": "1.1.2",
-      "dev": true
-    },
-    "prepend-http": {
-      "version": "2.0.0",
-      "dev": true
-    },
-    "prettier": {
-      "version": "2.4.1",
-      "dev": true
-    },
-    "prettier-linter-helpers": {
-      "version": "1.0.0",
-      "dev": true,
-      "requires": {
-        "fast-diff": "^1.1.2"
-      }
-    },
-    "pretty-format": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.3.1.tgz",
-      "integrity": "sha512-DR/c+pvFc52nLimLROYjnXPtolawm+uWDxr4FjuLDLUn+ktWnSN851KoHwHzzqq6rfCOjkzN8FLgDrSub6UDuA==",
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.11.0.tgz",
+      "integrity": "sha512-QecJtfLekJbWVo/dMAA+OSwY79wpRmbqS5TeXvXSX+f0c6pW4/SE6inzZ2qkU7oAMCPqIDkZDvd/bQsSFUnKyw==",
       "dev": true,
       "requires": {
-        "@jest/types": "^27.2.5",
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^17.0.1"
+        "htmlparser2": "^7.1.1"
       },
       "dependencies": {
-        "@jest/types": {
-          "version": "27.2.5",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
-          "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "dev": true,
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-          "dev": true
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          },
-          "dependencies": {
-            "ansi-styles": {
-              "version": "4.3.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-              "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-              "dev": true,
-              "requires": {
-                "color-convert": "^2.0.1"
-              }
-            }
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+        "domutils": {
+          "version": "2.8.0",
+          "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+          "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
           "dev": true,
           "requires": {
-            "color-name": "~1.1.4"
+            "dom-serializer": "^1.0.1",
+            "domelementtype": "^2.2.0",
+            "domhandler": "^4.2.0"
           }
         },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "react-is": {
-          "version": "17.0.2",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-          "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+        "entities": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",
+          "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",
           "dev": true
         },
-        "supports-color": {
+        "htmlparser2": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz",
+          "integrity": "sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "domelementtype": "^2.0.1",
+            "domhandler": "^4.2.2",
+            "domutils": "^2.8.0",
+            "entities": "^3.0.1"
           }
         }
       }
     },
+    "posthtml-render": {
+      "version": "3.0.0",
+      "dev": true,
+      "requires": {
+        "is-json": "^2.0.1"
+      }
+    },
+    "preact": {
+      "version": "10.16.0",
+      "resolved": "https://registry.npmjs.org/preact/-/preact-10.16.0.tgz",
+      "integrity": "sha512-XTSj3dJ4roKIC93pald6rWuB2qQJO9gO2iLLyTe87MrjQN+HklueLsmskbywEWqCHlclgz3/M4YLL2iBr9UmMA=="
+    },
+    "prelude-ls": {
+      "version": "1.1.2",
+      "dev": true
+    },
+    "prettier": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
+      "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
+      "dev": true
+    },
+    "prettier-linter-helpers": {
+      "version": "1.0.0",
+      "dev": true,
+      "requires": {
+        "fast-diff": "^1.1.2"
+      }
+    },
+    "pretty-format": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
+      "dev": true,
+      "requires": {
+        "@jest/schemas": "^29.6.3",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+          "dev": true
+        },
+        "react-is": {
+          "version": "18.2.0",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+          "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
+          "dev": true
+        }
+      }
+    },
     "pretty-ms": {
-      "version": "7.0.1",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-9.0.0.tgz",
+      "integrity": "sha512-E9e9HJ9R9NasGOgPaPE8VMeiPKAyWR5jcFpNnwIejslIhWqdqOrb2wShBsncMPUb+BcCd2OPYfh7p2W6oemTng==",
       "dev": true,
       "requires": {
-        "parse-ms": "^2.1.0"
+        "parse-ms": "^4.0.0"
       }
     },
     "process-nextick-args": {
@@ -36788,98 +38762,124 @@
       "dev": true
     },
     "promise": {
-      "version": "8.1.0",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/promise/-/promise-8.3.0.tgz",
+      "integrity": "sha512-rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg==",
       "dev": true,
       "requires": {
         "asap": "~2.0.6"
       }
     },
     "prop-types": {
-      "version": "15.7.2",
+      "version": "15.8.1",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
+      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
       "requires": {
         "loose-envify": "^1.4.0",
         "object-assign": "^4.1.1",
-        "react-is": "^16.8.1"
-      }
-    },
-    "prop-types-exact": {
-      "version": "1.2.0",
-      "requires": {
-        "has": "^1.0.3",
-        "object.assign": "^4.1.0",
-        "reflect.ownkeys": "^0.2.0"
+        "react-is": "^16.13.1"
       }
     },
-    "propagate": {
-      "version": "2.0.1",
-      "dev": true
-    },
     "proxy-addr": {
-      "version": "2.0.6",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
       "dev": true,
       "requires": {
-        "forwarded": "~0.1.2",
+        "forwarded": "0.2.0",
         "ipaddr.js": "1.9.1"
       }
     },
-    "psl": {
-      "version": "1.8.0",
-      "dev": true
-    },
-    "pump": {
-      "version": "3.0.0",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "pumpify": {
-      "version": "1.5.1",
+    "proxy-agent": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.4.0.tgz",
+      "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==",
       "dev": true,
       "requires": {
-        "duplexify": "^3.6.0",
-        "inherits": "^2.0.3",
-        "pump": "^2.0.0"
+        "agent-base": "^7.0.2",
+        "debug": "^4.3.4",
+        "http-proxy-agent": "^7.0.1",
+        "https-proxy-agent": "^7.0.3",
+        "lru-cache": "^7.14.1",
+        "pac-proxy-agent": "^7.0.1",
+        "proxy-from-env": "^1.1.0",
+        "socks-proxy-agent": "^8.0.2"
       },
       "dependencies": {
-        "pump": {
-          "version": "2.0.1",
+        "agent-base": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
+          "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==",
+          "dev": true,
+          "requires": {
+            "debug": "^4.3.4"
+          }
+        },
+        "https-proxy-agent": {
+          "version": "7.0.4",
+          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz",
+          "integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==",
           "dev": true,
           "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
+            "agent-base": "^7.0.2",
+            "debug": "4"
           }
+        },
+        "lru-cache": {
+          "version": "7.18.3",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+          "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+          "dev": true
         }
       }
     },
+    "proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+      "dev": true
+    },
+    "psl": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
+      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
+      "dev": true
+    },
     "punycode": {
       "version": "2.1.1"
     },
-    "pupa": {
-      "version": "2.1.1",
-      "dev": true,
-      "requires": {
-        "escape-goat": "^2.0.0"
-      }
+    "pure-rand": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.4.tgz",
+      "integrity": "sha512-LA0Y9kxMYv47GIPJy6MI84fqTd2HmYZI83W/kM/SkKfDlajnZYfmXFTxkbY+xSBPkLJxltMa9hIkmdc29eguMA==",
+      "dev": true
     },
     "qjobs": {
       "version": "1.2.0",
       "dev": true
     },
     "qs": {
-      "version": "6.5.2",
-      "dev": true
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "dev": true,
+      "requires": {
+        "side-channel": "^1.0.4"
+      }
     },
     "querystring": {
       "version": "0.2.0",
       "dev": true
     },
     "querystringify": {
-      "version": "2.2.0"
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
     },
     "queue-microtask": {
-      "version": "1.2.2",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
       "dev": true
     },
     "quick-lru": {
@@ -36888,6 +38888,7 @@
     },
     "raf": {
       "version": "3.4.1",
+      "dev": true,
       "requires": {
         "performance-now": "^2.1.0"
       }
@@ -36931,25 +38932,17 @@
       "dev": true
     },
     "raw-body": {
-      "version": "2.4.0",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+      "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
       "dev": true,
       "requires": {
-        "bytes": "3.1.0",
-        "http-errors": "1.7.2",
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "unpipe": "1.0.0"
       }
     },
-    "rc": {
-      "version": "1.2.8",
-      "dev": true,
-      "requires": {
-        "deep-extend": "^0.6.0",
-        "ini": "~1.3.0",
-        "minimist": "^1.2.0",
-        "strip-json-comments": "~2.0.1"
-      }
-    },
     "react": {
       "version": "17.0.2",
       "requires": {
@@ -36957,24 +38950,12 @@
         "object-assign": "^4.1.1"
       }
     },
-    "react-dates": {
-      "version": "21.8.0",
+    "react-day-picker": {
+      "version": "8.0.0-beta.37",
+      "resolved": "https://registry.npmjs.org/react-day-picker/-/react-day-picker-8.0.0-beta.37.tgz",
+      "integrity": "sha512-PO7SZjMTdYkvvEnESj08ITpgFItdU5Bx5aH+uGbah8Yv4ilFrSYHDebsBIw6jnZd9HPCapxyz5t/fSq9ZENlPw==",
       "requires": {
-        "airbnb-prop-types": "^2.15.0",
-        "consolidated-events": "^1.1.1 || ^2.0.0",
-        "enzyme-shallow-equal": "^1.0.0",
-        "is-touch-device": "^1.0.1",
-        "lodash": "^4.1.1",
-        "object.assign": "^4.1.0",
-        "object.values": "^1.1.0",
-        "prop-types": "^15.7.2",
-        "raf": "^3.4.1",
-        "react-moment-proptypes": "^1.6.0",
-        "react-outside-click-handler": "^1.2.4",
-        "react-portal": "^4.2.0",
-        "react-with-direction": "^1.3.1",
-        "react-with-styles": "^4.1.0",
-        "react-with-styles-interface-css": "^6.0.0"
+        "@reach/auto-id": "^0.16.0"
       }
     },
     "react-display-name": {
@@ -37009,58 +38990,6 @@
         "tiny-warning": "^1.0.2"
       }
     },
-    "react-moment-proptypes": {
-      "version": "1.8.1",
-      "requires": {
-        "moment": ">=1.6.0"
-      }
-    },
-    "react-outside-click-handler": {
-      "version": "1.3.0",
-      "requires": {
-        "airbnb-prop-types": "^2.15.0",
-        "consolidated-events": "^1.1.1 || ^2.0.0",
-        "document.contains": "^1.0.1",
-        "object.values": "^1.1.0",
-        "prop-types": "^15.7.2"
-      }
-    },
-    "react-portal": {
-      "version": "4.2.1",
-      "requires": {
-        "prop-types": "^15.5.8"
-      }
-    },
-    "react-with-direction": {
-      "version": "1.3.1",
-      "requires": {
-        "airbnb-prop-types": "^2.10.0",
-        "brcast": "^2.0.2",
-        "deepmerge": "^1.5.2",
-        "direction": "^1.0.2",
-        "hoist-non-react-statics": "^3.3.0",
-        "object.assign": "^4.1.0",
-        "object.values": "^1.0.4",
-        "prop-types": "^15.6.2"
-      }
-    },
-    "react-with-styles": {
-      "version": "4.2.0",
-      "requires": {
-        "airbnb-prop-types": "^2.14.0",
-        "hoist-non-react-statics": "^3.2.1",
-        "object.assign": "^4.1.0",
-        "prop-types": "^15.7.2",
-        "react-with-direction": "^1.3.1"
-      }
-    },
-    "react-with-styles-interface-css": {
-      "version": "6.0.0",
-      "requires": {
-        "array.prototype.flat": "^1.2.1",
-        "global-cache": "^1.2.1"
-      }
-    },
     "read-cache": {
       "version": "1.0.0",
       "dev": true,
@@ -37068,22 +38997,6 @@
         "pify": "^2.3.0"
       }
     },
-    "read-pkg": {
-      "version": "5.2.0",
-      "dev": true,
-      "requires": {
-        "@types/normalize-package-data": "^2.4.0",
-        "normalize-package-data": "^2.5.0",
-        "parse-json": "^5.0.0",
-        "type-fest": "^0.6.0"
-      },
-      "dependencies": {
-        "type-fest": {
-          "version": "0.6.0",
-          "dev": true
-        }
-      }
-    },
     "readable-stream": {
       "version": "2.3.7",
       "dev": true,
@@ -37104,36 +39017,21 @@
         "picomatch": "^2.2.1"
       }
     },
-    "recast": {
-      "version": "0.20.5",
+    "reflect.getprototypeof": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.5.tgz",
+      "integrity": "sha512-62wgfC8dJWrmxv44CA36pLDnP6KKl3Vhxb7PL+8+qrrFMMoJij4vgiMP8zV4O8+CBMXY1mHxI5fITGHXFHVmQQ==",
       "dev": true,
       "requires": {
-        "ast-types": "0.14.2",
-        "esprima": "~4.0.0",
-        "source-map": "~0.6.1",
-        "tslib": "^2.0.1"
-      },
-      "dependencies": {
-        "ast-types": {
-          "version": "0.14.2",
-          "dev": true,
-          "requires": {
-            "tslib": "^2.0.1"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "dev": true
-        },
-        "tslib": {
-          "version": "2.3.1",
-          "dev": true
-        }
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.22.3",
+        "es-errors": "^1.0.0",
+        "get-intrinsic": "^1.2.3",
+        "globalthis": "^1.0.3",
+        "which-builtin-type": "^1.1.3"
       }
     },
-    "reflect.ownkeys": {
-      "version": "0.2.0"
-    },
     "regenerate": {
       "version": "1.4.2",
       "dev": true
@@ -37155,26 +39053,18 @@
         "@babel/runtime": "^7.8.4"
       }
     },
-    "regex-not": {
-      "version": "1.0.2",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^3.0.2",
-        "safe-regex": "^1.1.0"
-      }
-    },
     "regexp.prototype.flags": {
-      "version": "1.3.1",
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz",
+      "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
+        "call-bind": "^1.0.6",
+        "define-properties": "^1.2.1",
+        "es-errors": "^1.3.0",
+        "set-function-name": "^2.0.1"
       }
     },
-    "regexpp": {
-      "version": "3.2.0",
-      "dev": true
-    },
     "regexpu-core": {
       "version": "4.7.1",
       "dev": true,
@@ -37187,24 +39077,6 @@
         "unicode-match-property-value-ecmascript": "^1.2.0"
       }
     },
-    "regextras": {
-      "version": "0.8.0",
-      "dev": true
-    },
-    "registry-auth-token": {
-      "version": "4.2.1",
-      "dev": true,
-      "requires": {
-        "rc": "^1.2.8"
-      }
-    },
-    "registry-url": {
-      "version": "5.1.0",
-      "dev": true,
-      "requires": {
-        "rc": "^1.2.8"
-      }
-    },
     "regjsgen": {
       "version": "0.5.2",
       "dev": true
@@ -37234,27 +39106,6 @@
         "autolinker": "~0.28.0"
       }
     },
-    "remove-bom-buffer": {
-      "version": "3.0.0",
-      "dev": true,
-      "requires": {
-        "is-buffer": "^1.1.5",
-        "is-utf8": "^0.2.1"
-      }
-    },
-    "remove-bom-stream": {
-      "version": "1.2.0",
-      "dev": true,
-      "requires": {
-        "remove-bom-buffer": "^3.0.0",
-        "safe-buffer": "^5.1.0",
-        "through2": "^2.0.3"
-      }
-    },
-    "remove-trailing-separator": {
-      "version": "1.1.0",
-      "dev": true
-    },
     "repeat-element": {
       "version": "1.1.3",
       "dev": true
@@ -37263,50 +39114,6 @@
       "version": "1.6.1",
       "dev": true
     },
-    "replace-ext": {
-      "version": "1.0.1",
-      "dev": true
-    },
-    "request": {
-      "version": "2.88.2",
-      "dev": true,
-      "requires": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.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"
-      },
-      "dependencies": {
-        "tough-cookie": {
-          "version": "2.5.0",
-          "dev": true,
-          "requires": {
-            "psl": "^1.1.28",
-            "punycode": "^2.1.1"
-          }
-        },
-        "uuid": {
-          "version": "3.4.0",
-          "dev": true
-        }
-      }
-    },
     "require-directory": {
       "version": "2.1.1",
       "dev": true
@@ -37319,93 +39126,56 @@
       "version": "1.0.0"
     },
     "reselect": {
-      "version": "4.0.0",
+      "version": "4.1.8",
+      "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.8.tgz",
+      "integrity": "sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==",
       "dev": true
     },
     "resize-observer-polyfill": {
       "version": "1.5.1"
     },
     "resolve": {
-      "version": "1.20.0",
+      "version": "1.22.8",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
       "dev": true,
       "requires": {
-        "is-core-module": "^2.2.0",
-        "path-parse": "^1.0.6"
+        "is-core-module": "^2.13.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
       }
     },
     "resolve-cwd": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
       "dev": true,
       "requires": {
         "resolve-from": "^5.0.0"
       }
     },
-    "resolve-dir": {
-      "version": "1.0.1",
-      "dev": true,
-      "requires": {
-        "expand-tilde": "^2.0.0",
-        "global-modules": "^1.0.0"
-      }
-    },
     "resolve-from": {
       "version": "5.0.0",
       "dev": true
     },
-    "resolve-options": {
-      "version": "1.1.0",
-      "dev": true,
-      "requires": {
-        "value-or-function": "^3.0.0"
-      }
-    },
-    "resolve-url": {
-      "version": "0.2.1",
-      "dev": true
-    },
     "resolve.exports": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz",
-      "integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
+      "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
       "dev": true
     },
-    "responselike": {
-      "version": "1.0.2",
-      "dev": true,
-      "requires": {
-        "lowercase-keys": "^1.0.0"
-      }
-    },
-    "restore-cursor": {
-      "version": "3.1.0",
-      "dev": true,
-      "requires": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      }
-    },
     "ret": {
       "version": "0.1.15",
       "dev": true
     },
-    "retry": {
-      "version": "0.13.1",
-      "dev": true
-    },
-    "retry-request": {
-      "version": "4.2.2",
-      "dev": true,
-      "requires": {
-        "debug": "^4.1.1",
-        "extend": "^3.0.2"
-      }
-    },
     "reusify": {
       "version": "1.0.4",
       "dev": true
     },
     "rfdc": {
       "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
+      "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==",
       "dev": true
     },
     "rimraf": {
@@ -37429,12 +39199,19 @@
       }
     },
     "rrule": {
-      "version": "2.6.8",
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/rrule/-/rrule-2.7.2.tgz",
+      "integrity": "sha512-NkBsEEB6FIZOZ3T8frvEBOB243dm46SPufpDckY/Ap/YH24V1zLeMmDY8OA10lk452NdrF621+ynDThE7FQU2A==",
       "requires": {
-        "luxon": "^1.21.3",
-        "tslib": "^1.10.0"
+        "tslib": "^2.4.0"
       }
     },
+    "rrweb-cssom": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz",
+      "integrity": "sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==",
+      "dev": true
+    },
     "rst-selector-parser": {
       "version": "2.2.3",
       "dev": true,
@@ -37445,9 +39222,31 @@
     },
     "run-parallel": {
       "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
+      "requires": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "safe-array-concat": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz",
+      "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==",
       "dev": true,
       "requires": {
-        "queue-microtask": "^1.2.2"
+        "call-bind": "^1.0.7",
+        "get-intrinsic": "^1.2.4",
+        "has-symbols": "^1.0.3",
+        "isarray": "^2.0.5"
+      },
+      "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
+        }
       }
     },
     "safe-buffer": {
@@ -37458,19 +39257,31 @@
       "version": "1.0.1",
       "dev": true
     },
-    "safe-regex": {
-      "version": "1.1.0",
+    "safe-regex-test": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz",
+      "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==",
       "dev": true,
       "requires": {
-        "ret": "~0.1.10"
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-regex": "^1.1.4"
       }
     },
     "safer-buffer": {
       "version": "2.1.2",
       "dev": true
     },
+    "sax": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz",
+      "integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==",
+      "dev": true
+    },
     "saxes": {
-      "version": "5.0.1",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
+      "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==",
       "dev": true,
       "requires": {
         "xmlchars": "^2.2.0"
@@ -37484,46 +39295,36 @@
       }
     },
     "semver": {
-      "version": "7.3.5",
-      "dev": true,
-      "requires": {
-        "lru-cache": "^6.0.0"
-      }
-    },
-    "semver-diff": {
-      "version": "3.1.1",
-      "dev": true,
-      "requires": {
-        "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "dev": true
-        }
-      }
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
+      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
+      "dev": true
     },
     "send": {
-      "version": "0.17.1",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "dev": true,
       "requires": {
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
+        "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": "~1.7.2",
+        "http-errors": "2.0.0",
         "mime": "1.6.0",
-        "ms": "2.1.1",
-        "on-finished": "~2.3.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
         "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
+        "statuses": "2.0.1"
       },
       "dependencies": {
         "debug": {
           "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -37531,18 +39332,51 @@
           "dependencies": {
             "ms": {
               "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+              "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
               "dev": true
             }
           }
         },
+        "depd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+          "dev": true
+        },
+        "destroy": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+          "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+          "dev": true
+        },
         "ms": {
-          "version": "2.1.1",
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+          "dev": true
+        },
+        "on-finished": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+          "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+          "dev": true,
+          "requires": {
+            "ee-first": "1.1.1"
+          }
+        },
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
           "dev": true
         }
       }
     },
     "serialize-error": {
       "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz",
+      "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==",
       "dev": true,
       "requires": {
         "type-fest": "^0.13.1"
@@ -37550,12 +39384,16 @@
       "dependencies": {
         "type-fest": {
           "version": "0.13.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
+          "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
           "dev": true
         }
       }
     },
     "serialize-javascript": {
-      "version": "6.0.0",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
       "dev": true,
       "requires": {
         "randombytes": "^2.1.0"
@@ -37606,54 +39444,64 @@
       }
     },
     "serve-static": {
-      "version": "1.14.1",
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.0.tgz",
+      "integrity": "sha512-pDLK8zwl2eKaYrs8mrPZBJua4hMplRWJ1tIFksVC3FtBEBnl8dxgeHtsaMS8DhS9i4fLObaon6ABoc4/hQGdPA==",
       "dev": true,
       "requires": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.17.1"
+        "send": "0.18.0"
       }
     },
-    "set-getter": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/set-getter/-/set-getter-0.1.1.tgz",
-      "integrity": "sha512-9sVWOy+gthr+0G9DzqqLaYNA7+5OKkSmcqjL9cBpDEaZrr3ShQlyX2cZ/O/ozE41oxn/Tt0LGEM/w4Rub3A3gw==",
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+      "dev": true
+    },
+    "set-function-length": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.1.tgz",
+      "integrity": "sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g==",
       "dev": true,
       "requires": {
-        "to-object-path": "^0.3.0"
+        "define-data-property": "^1.1.2",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.3",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.1"
       }
     },
-    "set-value": {
-      "version": "2.0.1",
+    "set-function-name": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
+      "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
       "dev": true,
       "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-extendable": "^0.1.1",
-        "is-plain-object": "^2.0.3",
-        "split-string": "^3.0.1"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "functions-have-names": "^1.2.3",
+        "has-property-descriptors": "^1.0.2"
       }
     },
-    "setprototypeof": {
-      "version": "1.1.1",
-      "dev": true
-    },
-    "shallow-clone": {
-      "version": "3.0.1",
+    "set-getter": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/set-getter/-/set-getter-0.1.1.tgz",
+      "integrity": "sha512-9sVWOy+gthr+0G9DzqqLaYNA7+5OKkSmcqjL9cBpDEaZrr3ShQlyX2cZ/O/ozE41oxn/Tt0LGEM/w4Rub3A3gw==",
       "dev": true,
       "requires": {
-        "kind-of": "^6.0.2"
+        "to-object-path": "^0.3.0"
       }
     },
+    "setprototypeof": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+      "dev": true
+    },
     "shallow-equal": {
       "version": "1.2.1"
     },
@@ -37669,15 +39517,21 @@
       "dev": true
     },
     "side-channel": {
-      "version": "1.0.4",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
+      "dev": true,
       "requires": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4",
+        "object-inspect": "^1.13.1"
       }
     },
     "signal-exit": {
-      "version": "3.0.3",
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
       "dev": true
     },
     "sinon": {
@@ -37699,6 +39553,15 @@
             "type-detect": "4.0.8"
           }
         },
+        "@sinonjs/fake-timers": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz",
+          "integrity": "sha512-iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg==",
+          "dev": true,
+          "requires": {
+            "@sinonjs/commons": "^1.7.0"
+          }
+        },
         "has-flag": {
           "version": "4.0.0",
           "dev": true
@@ -37721,170 +39584,115 @@
       "version": "3.0.0",
       "dev": true
     },
+    "slashes": {
+      "version": "3.0.12",
+      "resolved": "https://registry.npmjs.org/slashes/-/slashes-3.0.12.tgz",
+      "integrity": "sha512-Q9VME8WyGkc7pJf6QEkj3wE+2CnvZMI+XJhwdTPR8Z/kWQRXi7boAWLDibRPyHRTUTPx5FaU7MsyrjI3yLB4HA==",
+      "dev": true
+    },
     "slice-ansi": {
-      "version": "3.0.0",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
+      "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
       "dev": true,
       "requires": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
+        "ansi-styles": "^6.0.0",
+        "is-fullwidth-code-point": "^4.0.0"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.3.0",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+          "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
           "dev": true
         },
         "is-fullwidth-code-point": {
-          "version": "3.0.0",
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
+          "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==",
           "dev": true
         }
       }
     },
-    "snakeize": {
-      "version": "0.1.0",
+    "smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
       "dev": true
     },
-    "snapdragon": {
-      "version": "0.8.2",
+    "socket.io": {
+      "version": "4.7.4",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.7.4.tgz",
+      "integrity": "sha512-DcotgfP1Zg9iP/dH9zvAQcWrE0TtbMVwXmlV4T4mqsvY+gw+LqUGPfx2AoVyRk0FLME+GQhufDMyacFmw7ksqw==",
       "dev": true,
       "requires": {
-        "base": "^0.11.1",
-        "debug": "^2.2.0",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "map-cache": "^0.2.2",
-        "source-map": "^0.5.6",
-        "source-map-resolve": "^0.5.0",
-        "use": "^3.1.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "define-property": {
-          "version": "0.2.5",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "dev": true
-        }
+        "accepts": "~1.3.4",
+        "base64id": "~2.0.0",
+        "cors": "~2.8.5",
+        "debug": "~4.3.2",
+        "engine.io": "~6.5.2",
+        "socket.io-adapter": "~2.5.2",
+        "socket.io-parser": "~4.2.4"
       }
     },
-    "snapdragon-node": {
-      "version": "2.1.1",
+    "socket.io-adapter": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.2.tgz",
+      "integrity": "sha512-87C3LO/NOMc+eMcpcxUBebGjkpMDkNBS9tf7KJqcDsmL936EChtVva71Dw2q4tQcuVC+hAUy4an2NO/sYXmwRA==",
       "dev": true,
       "requires": {
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.0",
-        "snapdragon-util": "^3.0.1"
+        "ws": "~8.11.0"
       },
       "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
+        "ws": {
+          "version": "8.11.0",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
+          "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
           "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
+          "requires": {}
         }
       }
     },
-    "snapdragon-util": {
-      "version": "3.0.1",
+    "socket.io-parser": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz",
+      "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==",
       "dev": true,
       "requires": {
-        "kind-of": "^3.2.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.1"
       }
     },
-    "socket.io": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.3.1.tgz",
-      "integrity": "sha512-HC5w5Olv2XZ0XJ4gOLGzzHEuOCfj3G0SmoW3jLHYYh34EVsIr3EkW9h6kgfW+K3TFEcmYy8JcPWe//KUkBp5jA==",
+    "socks": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.1.tgz",
+      "integrity": "sha512-B6w7tkwNid7ToxjZ08rQMT8M9BJAf8DKx8Ft4NivzH0zBUfd6jldGcisJn/RLgxcX3FPNDdNQCUEMMT79b+oCQ==",
       "dev": true,
       "requires": {
-        "accepts": "~1.3.4",
-        "base64id": "~2.0.0",
-        "debug": "~4.3.2",
-        "engine.io": "~6.0.0",
-        "socket.io-adapter": "~2.3.2",
-        "socket.io-parser": "~4.0.4"
+        "ip-address": "^9.0.5",
+        "smart-buffer": "^4.2.0"
       }
     },
-    "socket.io-adapter": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.2.tgz",
-      "integrity": "sha512-PBZpxUPYjmoogY0aoaTmo1643JelsaS1CiAwNjRVdrI0X9Seuc19Y2Wife8k88avW6haG8cznvwbubAZwH4Mtg==",
-      "dev": true
-    },
-    "socket.io-parser": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz",
-      "integrity": "sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==",
+    "socks-proxy-agent": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.2.tgz",
+      "integrity": "sha512-8zuqoLv1aP/66PHF5TqwJ7Czm3Yv32urJQHrVyhD7mmA6d61Zv8cIXQYPTWwmg6qlupnPvs/QKDmfa4P/qct2g==",
       "dev": true,
       "requires": {
-        "@types/component-emitter": "^1.2.10",
-        "component-emitter": "~1.3.0",
-        "debug": "~4.3.1"
+        "agent-base": "^7.0.2",
+        "debug": "^4.3.4",
+        "socks": "^2.7.1"
+      },
+      "dependencies": {
+        "agent-base": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
+          "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==",
+          "dev": true,
+          "requires": {
+            "debug": "^4.3.4"
+          }
+        }
       }
     },
     "source-map": {
@@ -37892,22 +39700,15 @@
       "dev": true
     },
     "source-map-js": {
-      "version": "0.6.2",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
+      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
       "dev": true
     },
-    "source-map-resolve": {
-      "version": "0.5.3",
-      "dev": true,
-      "requires": {
-        "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": {
-      "version": "0.5.19",
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
       "dev": true,
       "requires": {
         "buffer-from": "^1.0.0",
@@ -37920,28 +39721,14 @@
         }
       }
     },
-    "source-map-url": {
-      "version": "0.4.1",
-      "dev": true
-    },
-    "sourcemap-codec": {
-      "version": "1.4.8",
-      "dev": true
-    },
-    "spdx-correct": {
-      "version": "3.1.1",
-      "dev": true,
-      "requires": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
     "spdx-exceptions": {
       "version": "2.3.0",
       "dev": true
     },
     "spdx-expression-parse": {
-      "version": "3.0.1",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-4.0.0.tgz",
+      "integrity": "sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==",
       "dev": true,
       "requires": {
         "spdx-exceptions": "^2.1.0",
@@ -37959,38 +39746,14 @@
         "through": "2"
       }
     },
-    "split-string": {
-      "version": "3.1.0",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^3.0.0"
-      }
-    },
     "sprintf-js": {
       "version": "1.0.3",
       "dev": true
     },
-    "sshpk": {
-      "version": "1.16.1",
-      "dev": true,
-      "requires": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
-      }
-    },
-    "stable": {
-      "version": "0.1.8",
-      "dev": true
-    },
     "stack-utils": {
-      "version": "2.0.3",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
+      "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
       "dev": true,
       "requires": {
         "escape-string-regexp": "^2.0.0"
@@ -38002,23 +39765,6 @@
         }
       }
     },
-    "static-extend": {
-      "version": "0.1.2",
-      "dev": true,
-      "requires": {
-        "define-property": "^0.2.5",
-        "object-copy": "^0.1.0"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        }
-      }
-    },
     "statuses": {
       "version": "1.5.0",
       "dev": true
@@ -38050,32 +39796,21 @@
         "through": "~2.3.4"
       }
     },
-    "stream-events": {
-      "version": "1.0.5",
-      "dev": true,
-      "requires": {
-        "stubs": "^3.0.0"
-      }
-    },
-    "stream-shift": {
-      "version": "1.0.1",
-      "dev": true
-    },
     "streamroller": {
-      "version": "2.2.4",
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.1.5.tgz",
+      "integrity": "sha512-KFxaM7XT+irxvdqSP1LGLgNWbYN7ay5owZ3r/8t77p+EtSUAfUgtl7be3xtqtOmGUl9K9YPO2ca8133RlTjvKw==",
       "dev": true,
       "requires": {
-        "date-format": "^2.1.0",
-        "debug": "^4.1.1",
+        "date-format": "^4.0.14",
+        "debug": "^4.3.4",
         "fs-extra": "^8.1.0"
       },
       "dependencies": {
-        "date-format": {
-          "version": "2.1.0",
-          "dev": true
-        },
         "fs-extra": {
           "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+          "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
           "dev": true,
           "requires": {
             "graceful-fs": "^4.2.0",
@@ -38085,6 +39820,8 @@
         },
         "jsonfile": {
           "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+          "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
           "dev": true,
           "requires": {
             "graceful-fs": "^4.1.6"
@@ -38093,7 +39830,9 @@
       }
     },
     "streamsearch": {
-      "version": "0.1.2",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz",
+      "integrity": "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==",
       "dev": true
     },
     "string_decoder": {
@@ -38118,66 +39857,78 @@
       "dev": true
     },
     "string-width": {
-      "version": "4.2.2",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dev": true,
       "requires": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "dependencies": {
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "dev": true
-        }
+        "strip-ansi": "^6.0.1"
       }
     },
     "string.prototype.matchall": {
-      "version": "4.0.5",
+      "version": "4.0.11",
+      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz",
+      "integrity": "sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.7",
+        "regexp.prototype.flags": "^1.5.2",
+        "set-function-name": "^2.0.2",
+        "side-channel": "^1.0.6"
+      }
+    },
+    "string.prototype.repeat": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz",
+      "integrity": "sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.2",
-        "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"
-      },
-      "dependencies": {
-        "get-intrinsic": {
-          "version": "1.1.1",
-          "dev": true,
-          "requires": {
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1"
-          }
-        }
+        "es-abstract": "^1.17.5"
       }
     },
     "string.prototype.trim": {
-      "version": "1.2.4",
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz",
+      "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.2"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.0",
+        "es-object-atoms": "^1.0.0"
       }
     },
     "string.prototype.trimend": {
-      "version": "1.0.4",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz",
+      "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==",
+      "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
       }
     },
     "string.prototype.trimstart": {
-      "version": "1.0.4",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
+      "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
+      "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
       }
     },
     "strip-ansi": {
@@ -38212,30 +39963,60 @@
       "dev": true
     },
     "strip-json-comments": {
-      "version": "2.0.1",
+      "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
     },
-    "stubs": {
-      "version": "3.0.0",
+    "strnum": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz",
+      "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==",
       "dev": true
     },
     "stylehacks": {
-      "version": "5.0.1",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-6.1.1.tgz",
+      "integrity": "sha512-gSTTEQ670cJNoaeIp9KX6lZmm8LJ3jPB5yJmX8Zq/wQxOsAFXV3qjWzHas3YYk1qesuVIyYWWUpZ0vSE/dTSGg==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.16.0",
-        "postcss-selector-parser": "^6.0.4"
+        "browserslist": "^4.23.0",
+        "postcss-selector-parser": "^6.0.16"
       }
     },
     "supertap": {
-      "version": "2.0.0",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/supertap/-/supertap-3.0.1.tgz",
+      "integrity": "sha512-u1ZpIBCawJnO+0QePsEiOknOfCRq0yERxiAchT0i4li0WHNUJbf0evXXSXOcCAR4M8iMDoajXYmstm/qO81Isw==",
       "dev": true,
       "requires": {
-        "arrify": "^2.0.1",
-        "indent-string": "^4.0.0",
-        "js-yaml": "^3.14.0",
+        "indent-string": "^5.0.0",
+        "js-yaml": "^3.14.1",
         "serialize-error": "^7.0.1",
-        "strip-ansi": "^6.0.0"
+        "strip-ansi": "^7.0.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
+        },
+        "indent-string": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-5.0.0.tgz",
+          "integrity": "sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+          "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^6.0.1"
+          }
+        }
       }
     },
     "supports-color": {
@@ -38245,46 +40026,85 @@
         "has-flag": "^3.0.0"
       }
     },
-    "supports-hyperlinks": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
-      "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
+    "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
+    },
+    "svgo": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-3.3.2.tgz",
+      "integrity": "sha512-OoohrmuUlBs8B8o6MB2Aevn+pRIH9zDALSR+6hhqVfa6fRwG/Qw9VUMSMW9VNg2CFc/MTIfabtdOVl9ODIJjpw==",
       "dev": true,
       "requires": {
-        "has-flag": "^4.0.0",
-        "supports-color": "^7.0.0"
+        "@trysound/sax": "0.2.0",
+        "commander": "^7.2.0",
+        "css-select": "^5.1.0",
+        "css-tree": "^2.3.1",
+        "css-what": "^6.1.0",
+        "csso": "^5.0.5",
+        "picocolors": "^1.0.0"
       },
       "dependencies": {
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+        "commander": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+          "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
           "dev": true
         },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+        "css-select": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
+          "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "boolbase": "^1.0.0",
+            "css-what": "^6.1.0",
+            "domhandler": "^5.0.2",
+            "domutils": "^3.0.1",
+            "nth-check": "^2.0.1"
+          }
+        },
+        "dom-serializer": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
+          "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
+          "dev": true,
+          "requires": {
+            "domelementtype": "^2.3.0",
+            "domhandler": "^5.0.2",
+            "entities": "^4.2.0"
+          }
+        },
+        "domhandler": {
+          "version": "5.0.3",
+          "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
+          "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
+          "dev": true,
+          "requires": {
+            "domelementtype": "^2.3.0"
+          }
+        },
+        "domutils": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
+          "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
+          "dev": true,
+          "requires": {
+            "dom-serializer": "^2.0.0",
+            "domelementtype": "^2.3.0",
+            "domhandler": "^5.0.3"
           }
+        },
+        "entities": {
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+          "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+          "dev": true
         }
       }
     },
-    "svgo": {
-      "version": "2.4.0",
-      "dev": true,
-      "requires": {
-        "@trysound/sax": "0.1.1",
-        "colorette": "^1.2.2",
-        "commander": "^7.1.0",
-        "css-select": "^4.1.3",
-        "css-tree": "^1.1.2",
-        "csso": "^4.2.0",
-        "stable": "^0.1.8"
-      }
-    },
     "symbol-observable": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
@@ -38301,65 +40121,40 @@
         "get-port": "^3.1.0"
       }
     },
-    "table": {
-      "version": "6.7.1",
+    "synckit": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.1.tgz",
+      "integrity": "sha512-7gr8p9TQP6RAHusBOSLs46F4564ZrjV8xFmw5zCmgmhGUcw2hxsShhJ6CEiHQMgPDwAQ1fWHPM0ypc4RMAig4A==",
       "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.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "dev": true
-        },
-        "slice-ansi": {
-          "version": "4.0.0",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.0.0",
-            "astral-regex": "^2.0.0",
-            "is-fullwidth-code-point": "^3.0.0"
-          }
-        }
+        "@pkgr/core": "^0.1.0",
+        "tslib": "^2.6.2"
       }
     },
     "tar": {
-      "version": "6.1.11",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
+      "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
       "dev": true,
       "requires": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
-        "minipass": "^3.0.0",
+        "minipass": "^5.0.0",
         "minizlib": "^2.1.1",
         "mkdirp": "^1.0.3",
         "yallist": "^4.0.0"
       },
       "dependencies": {
+        "minipass": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
+          "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
+          "dev": true
+        },
         "mkdirp": {
           "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
           "dev": true
         }
       }
@@ -38401,33 +40196,6 @@
         }
       }
     },
-    "teeny-request": {
-      "version": "7.1.1",
-      "dev": true,
-      "requires": {
-        "http-proxy-agent": "^4.0.0",
-        "https-proxy-agent": "^5.0.0",
-        "node-fetch": "^2.6.1",
-        "stream-events": "^1.0.5",
-        "uuid": "^8.0.0"
-      }
-    },
-    "temp": {
-      "version": "0.8.4",
-      "dev": true,
-      "requires": {
-        "rimraf": "~2.6.2"
-      },
-      "dependencies": {
-        "rimraf": {
-          "version": "2.6.3",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
-      }
-    },
     "temp-dir": {
       "version": "2.0.0",
       "dev": true
@@ -38449,46 +40217,23 @@
         }
       }
     },
-    "terminal-link": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
-      "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
-      "dev": true,
-      "requires": {
-        "ansi-escapes": "^4.2.1",
-        "supports-hyperlinks": "^2.0.0"
-      }
-    },
     "terser": {
-      "version": "5.9.0",
+      "version": "5.14.2",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz",
+      "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==",
       "dev": true,
       "requires": {
+        "@jridgewell/source-map": "^0.3.2",
+        "acorn": "^8.5.0",
         "commander": "^2.20.0",
-        "source-map": "~0.7.2",
         "source-map-support": "~0.5.20"
       },
       "dependencies": {
         "commander": {
           "version": "2.20.3",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
           "dev": true
-        },
-        "source-map": {
-          "version": "0.7.3",
-          "dev": true
-        },
-        "source-map-support": {
-          "version": "0.5.20",
-          "dev": true,
-          "requires": {
-            "buffer-from": "^1.0.0",
-            "source-map": "^0.6.0"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.6.1",
-              "dev": true
-            }
-          }
         }
       }
     },
@@ -38499,6 +40244,17 @@
         "@istanbuljs/schema": "^0.1.2",
         "glob": "^7.1.4",
         "minimatch": "^3.0.4"
+      },
+      "dependencies": {
+        "minimatch": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+          "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        }
       }
     },
     "text-table": {
@@ -38514,26 +40270,6 @@
         "tiny-warning": "^1.0.2"
       }
     },
-    "thenify": {
-      "version": "3.3.1",
-      "dev": true,
-      "requires": {
-        "any-promise": "^1.0.0"
-      }
-    },
-    "thenify-all": {
-      "version": "1.6.0",
-      "dev": true,
-      "requires": {
-        "thenify": ">= 3.1.0 < 4"
-      }
-    },
-    "throat": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz",
-      "integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==",
-      "dev": true
-    },
     "through": {
       "version": "2.3.8",
       "dev": true
@@ -38546,29 +40282,19 @@
         "xtend": "~4.0.1"
       }
     },
-    "through2-filter": {
-      "version": "3.0.0",
-      "dev": true,
-      "requires": {
-        "through2": "~2.0.0",
-        "xtend": "~4.0.0"
-      }
-    },
     "time-stamp": {
       "version": "1.1.0",
       "dev": true
     },
     "time-zone": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/time-zone/-/time-zone-1.0.0.tgz",
+      "integrity": "sha512-TIsDdtKo6+XrPtiTm1ssmMngN1sAhyKnTO2kunQWqNPWIVvCm15Wmw4SWInwTVgJ5u/Tr04+8Ei9TNcw4x4ONA==",
       "dev": true
     },
     "timeago.js": {
       "version": "4.0.2"
     },
-    "timsort": {
-      "version": "0.3.0",
-      "dev": true
-    },
     "tiny-lr": {
       "version": "1.1.1",
       "dev": true,
@@ -38606,14 +40332,6 @@
       "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
       "dev": true
     },
-    "to-absolute-glob": {
-      "version": "2.0.2",
-      "dev": true,
-      "requires": {
-        "is-absolute": "^1.0.0",
-        "is-negated-glob": "^1.0.0"
-      }
-    },
     "to-fast-properties": {
       "version": "2.0.0",
       "dev": true
@@ -38634,20 +40352,6 @@
         }
       }
     },
-    "to-readable-stream": {
-      "version": "1.0.0",
-      "dev": true
-    },
-    "to-regex": {
-      "version": "3.0.2",
-      "dev": true,
-      "requires": {
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "regex-not": "^1.0.2",
-        "safe-regex": "^1.1.0"
-      }
-    },
     "to-regex-range": {
       "version": "5.0.1",
       "dev": true,
@@ -38655,15 +40359,10 @@
         "is-number": "^7.0.0"
       }
     },
-    "to-through": {
-      "version": "2.0.0",
-      "dev": true,
-      "requires": {
-        "through2": "^2.0.3"
-      }
-    },
     "toidentifier": {
-      "version": "1.0.0",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
       "dev": true
     },
     "toml": {
@@ -38671,43 +40370,76 @@
       "dev": true
     },
     "tough-cookie": {
-      "version": "4.0.0",
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz",
+      "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==",
       "dev": true,
       "requires": {
         "psl": "^1.1.33",
         "punycode": "^2.1.1",
-        "universalify": "^0.1.2"
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
+      },
+      "dependencies": {
+        "universalify": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+          "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+          "dev": true
+        }
       }
     },
     "tr46": {
-      "version": "2.1.0",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.0.0.tgz",
+      "integrity": "sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==",
       "dev": true,
       "requires": {
-        "punycode": "^2.1.1"
+        "punycode": "^2.3.1"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+          "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+          "dev": true
+        }
       }
     },
     "traverse": {
-      "version": "0.6.6",
-      "dev": true
-    },
-    "trim-off-newlines": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.3.tgz",
-      "integrity": "sha512-kh6Tu6GbeSNMGfrrZh6Bb/4ZEHV1QlB4xNDBeog8Y9/QwFlKTRyWvY3Fs9tRDAMZliVUwieMgEdIeL/FtqjkJg==",
-      "dev": true
+      "version": "0.6.9",
+      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.9.tgz",
+      "integrity": "sha512-7bBrcF+/LQzSgFmT0X5YclVqQxtv7TDJ1f8Wj7ibBu/U6BMLeOpUxuZjV7rMc44UtKxlnMFigdhFAIszSX1DMg==",
+      "dev": true,
+      "requires": {
+        "gopd": "^1.0.1",
+        "typedarray.prototype.slice": "^1.0.3",
+        "which-typed-array": "^1.1.15"
+      }
+    },
+    "ts-api-utils": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz",
+      "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==",
+      "dev": true,
+      "requires": {}
     },
     "tsconfig-paths": {
-      "version": "3.11.0",
+      "version": "3.15.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
+      "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
       "dev": true,
       "requires": {
         "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
-        "minimist": "^1.2.0",
+        "json5": "^1.0.2",
+        "minimist": "^1.2.6",
         "strip-bom": "^3.0.0"
       },
       "dependencies": {
         "json5": {
-          "version": "1.0.1",
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
           "dev": true,
           "requires": {
             "minimist": "^1.2.0"
@@ -38720,18 +40452,9 @@
       }
     },
     "tslib": {
-      "version": "1.14.1"
-    },
-    "tunnel-agent": {
-      "version": "0.6.0",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "tweetnacl": {
-      "version": "0.14.5",
-      "dev": true
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "type-check": {
       "version": "0.3.2",
@@ -38746,6 +40469,8 @@
     },
     "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
     },
     "type-is": {
@@ -38756,21 +40481,80 @@
         "mime-types": "~2.1.24"
       }
     },
+    "typed-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "is-typed-array": "^1.1.13"
+      }
+    },
+    "typed-array-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz",
+      "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13"
+      }
+    },
+    "typed-array-byte-offset": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz",
+      "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==",
+      "dev": true,
+      "requires": {
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13"
+      }
+    },
+    "typed-array-length": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz",
+      "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13",
+        "possible-typed-array-names": "^1.0.0"
+      }
+    },
     "typedarray": {
       "version": "0.0.6",
       "dev": true
     },
-    "typedarray-to-buffer": {
-      "version": "3.1.5",
+    "typedarray.prototype.slice": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/typedarray.prototype.slice/-/typedarray.prototype.slice-1.0.3.tgz",
+      "integrity": "sha512-8WbVAQAUlENo1q3c3zZYuy5k9VzBQvp8AX9WOtbvyWlLM1v5JaSRmjubLjzHF4JFtptjH/5c/i95yaElvcjC0A==",
       "dev": true,
       "requires": {
-        "is-typedarray": "^1.0.0"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.0",
+        "es-errors": "^1.3.0",
+        "typed-array-buffer": "^1.0.2",
+        "typed-array-byte-offset": "^1.0.2"
       }
     },
     "typescript": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz",
-      "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==",
+      "version": "5.5.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz",
+      "integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==",
       "dev": true
     },
     "ua-parser-js": {
@@ -38784,24 +40568,27 @@
       "dev": true
     },
     "unbox-primitive": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
-      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "dev": true,
       "requires": {
-        "function-bind": "^1.1.1",
-        "has-bigints": "^1.0.1",
-        "has-symbols": "^1.0.2",
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
         "which-boxed-primitive": "^1.0.2"
       }
     },
-    "unc-path-regex": {
-      "version": "0.1.2",
-      "dev": true
-    },
     "underscore": {
       "version": "1.1.7",
       "dev": true
     },
+    "undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    },
     "unicode-canonical-property-names-ecmascript": {
       "version": "1.0.4",
       "dev": true
@@ -38822,28 +40609,12 @@
       "version": "1.1.0",
       "dev": true
     },
-    "union-value": {
-      "version": "1.0.1",
-      "dev": true,
-      "requires": {
-        "arr-union": "^3.1.0",
-        "get-value": "^2.0.6",
-        "is-extendable": "^0.1.1",
-        "set-value": "^2.0.1"
-      }
-    },
-    "uniqs": {
-      "version": "2.0.0",
+    "unicorn-magic": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz",
+      "integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==",
       "dev": true
     },
-    "unique-stream": {
-      "version": "2.3.1",
-      "dev": true,
-      "requires": {
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "through2-filter": "^3.0.0"
-      }
-    },
     "unique-string": {
       "version": "2.0.0",
       "dev": true,
@@ -38863,102 +40634,14 @@
       "version": "1.0.0",
       "dev": true
     },
-    "unset-value": {
-      "version": "1.0.0",
-      "dev": true,
-      "requires": {
-        "has-value": "^0.3.1",
-        "isobject": "^3.0.0"
-      },
-      "dependencies": {
-        "has-value": {
-          "version": "0.3.1",
-          "dev": true,
-          "requires": {
-            "get-value": "^2.0.3",
-            "has-values": "^0.1.4",
-            "isobject": "^2.0.0"
-          },
-          "dependencies": {
-            "isobject": {
-              "version": "2.1.0",
-              "dev": true,
-              "requires": {
-                "isarray": "1.0.0"
-              }
-            }
-          }
-        },
-        "has-values": {
-          "version": "0.1.4",
-          "dev": true
-        }
-      }
-    },
-    "untildify": {
-      "version": "2.1.0",
-      "dev": true,
-      "requires": {
-        "os-homedir": "^1.0.0"
-      }
-    },
-    "update-notifier": {
-      "version": "5.1.0",
+    "update-browserslist-db": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
+      "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
       "dev": true,
       "requires": {
-        "boxen": "^5.0.0",
-        "chalk": "^4.1.0",
-        "configstore": "^5.0.1",
-        "has-yarn": "^2.1.0",
-        "import-lazy": "^2.1.0",
-        "is-ci": "^2.0.0",
-        "is-installed-globally": "^0.4.0",
-        "is-npm": "^5.0.0",
-        "is-yarn-global": "^0.3.0",
-        "latest-version": "^5.1.0",
-        "pupa": "^2.1.1",
-        "semver": "^7.3.4",
-        "semver-diff": "^3.1.1",
-        "xdg-basedir": "^4.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
+        "escalade": "^3.1.2",
+        "picocolors": "^1.0.1"
       }
     },
     "upper-case": {
@@ -38972,44 +40655,25 @@
         "punycode": "^2.1.0"
       }
     },
-    "urix": {
-      "version": "0.1.0",
-      "dev": true
-    },
     "url-parse": {
-      "version": "1.5.1",
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
       "requires": {
         "querystringify": "^2.1.1",
         "requires-port": "^1.0.0"
       }
     },
-    "url-parse-lax": {
-      "version": "3.0.0",
-      "dev": true,
-      "requires": {
-        "prepend-http": "^2.0.0"
-      }
-    },
-    "urlgrey": {
-      "version": "1.0.0",
-      "dev": true,
-      "requires": {
-        "fast-url-parser": "^1.1.3"
-      }
-    },
-    "use": {
-      "version": "3.1.1",
-      "dev": true
-    },
     "util": {
-      "version": "0.12.4",
+      "version": "0.12.5",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
+      "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
       "dev": 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"
       }
     },
@@ -39022,141 +40686,45 @@
       "dev": true
     },
     "uuid": {
-      "version": "8.3.2",
-      "dev": true
-    },
-    "v8-compile-cache": {
-      "version": "2.3.0",
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
       "dev": true
     },
     "v8-to-istanbul": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.0.tgz",
-      "integrity": "sha512-/PRhfd8aTNp9Ggr62HPzXg2XasNFGy5PBt0Rp04du7/8GNNSgxFL6WBTkgMKSL9bFjH+8kKEG3f37FmxiTqUUA==",
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.2.0.tgz",
+      "integrity": "sha512-/EH/sDgxU2eGxajKdwLCDmQ4FWq+kpi3uCmBGpw1xJtnAxEjlD8j8PEiGWpCIMIs3ciNAgH0d3TTJiUkYzyZjA==",
       "dev": true,
       "requires": {
+        "@jridgewell/trace-mapping": "^0.3.12",
         "@types/istanbul-lib-coverage": "^2.0.1",
-        "convert-source-map": "^1.6.0",
-        "source-map": "^0.7.3"
+        "convert-source-map": "^2.0.0"
       },
       "dependencies": {
-        "source-map": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+        "convert-source-map": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+          "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
           "dev": true
         }
       }
     },
-    "validate-npm-package-license": {
-      "version": "3.0.4",
-      "dev": true,
-      "requires": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "value-or-function": {
-      "version": "3.0.0",
-      "dev": true
-    },
     "vary": {
       "version": "1.1.2",
       "dev": true
     },
-    "vendors": {
-      "version": "1.0.4",
-      "dev": true
-    },
-    "verror": {
-      "version": "1.10.0",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      }
-    },
-    "vinyl": {
-      "version": "2.2.1",
-      "dev": true,
-      "requires": {
-        "clone": "^2.1.1",
-        "clone-buffer": "^1.0.0",
-        "clone-stats": "^1.0.0",
-        "cloneable-readable": "^1.0.0",
-        "remove-trailing-separator": "^1.0.1",
-        "replace-ext": "^1.0.0"
-      }
-    },
-    "vinyl-fs": {
-      "version": "3.0.3",
-      "dev": true,
-      "requires": {
-        "fs-mkdirp-stream": "^1.0.0",
-        "glob-stream": "^6.1.0",
-        "graceful-fs": "^4.0.0",
-        "is-valid-glob": "^1.0.0",
-        "lazystream": "^1.0.0",
-        "lead": "^1.0.0",
-        "object.assign": "^4.0.4",
-        "pumpify": "^1.3.5",
-        "readable-stream": "^2.3.3",
-        "remove-bom-buffer": "^3.0.0",
-        "remove-bom-stream": "^1.2.0",
-        "resolve-options": "^1.1.0",
-        "through2": "^2.0.0",
-        "to-through": "^2.0.0",
-        "value-or-function": "^3.0.0",
-        "vinyl": "^2.0.0",
-        "vinyl-sourcemap": "^1.1.0"
-      }
-    },
-    "vinyl-sourcemap": {
-      "version": "1.1.0",
-      "dev": true,
-      "requires": {
-        "append-buffer": "^1.0.2",
-        "convert-source-map": "^1.5.0",
-        "graceful-fs": "^4.1.6",
-        "normalize-path": "^2.1.1",
-        "now-and-later": "^2.0.0",
-        "remove-bom-buffer": "^3.0.0",
-        "vinyl": "^2.0.0"
-      },
-      "dependencies": {
-        "normalize-path": {
-          "version": "2.1.1",
-          "dev": true,
-          "requires": {
-            "remove-trailing-separator": "^1.0.1"
-          }
-        }
-      }
-    },
-    "vinyl-sourcemaps-apply": {
-      "version": "0.2.1",
-      "dev": true,
-      "requires": {
-        "source-map": "^0.5.1"
-      }
-    },
     "void-elements": {
       "version": "2.0.1",
       "dev": true
     },
-    "w3c-hr-time": {
-      "version": "1.0.2",
-      "dev": true,
-      "requires": {
-        "browser-process-hrtime": "^1.0.0"
-      }
-    },
     "w3c-xmlserializer": {
-      "version": "2.0.0",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz",
+      "integrity": "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==",
       "dev": true,
       "requires": {
-        "xml-name-validator": "^3.0.0"
+        "xml-name-validator": "^5.0.0"
       }
     },
     "walker": {
@@ -39168,13 +40736,6 @@
         "makeerror": "1.0.12"
       }
     },
-    "wcwidth": {
-      "version": "1.0.1",
-      "dev": true,
-      "requires": {
-        "defaults": "^1.0.3"
-      }
-    },
     "web-activities": {
       "version": "1.24.0",
       "requires": {
@@ -39190,7 +40751,9 @@
       "version": "2.3.2"
     },
     "webidl-conversions": {
-      "version": "6.1.0",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
       "dev": true
     },
     "websocket-driver": {
@@ -39208,26 +40771,44 @@
     },
     "well-known-symbols": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/well-known-symbols/-/well-known-symbols-2.0.0.tgz",
+      "integrity": "sha512-ZMjC3ho+KXo0BfJb7JgtQ5IBuvnShdlACNkKkdsqBmYw3bPAaJfPeYUo6tLUaT5tG/Gkh7xkpBhKRQ9e7pyg9Q==",
       "dev": true
     },
     "whatwg-encoding": {
-      "version": "1.0.5",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz",
+      "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==",
       "dev": true,
       "requires": {
-        "iconv-lite": "0.4.24"
+        "iconv-lite": "0.6.3"
+      },
+      "dependencies": {
+        "iconv-lite": {
+          "version": "0.6.3",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+          "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+          "dev": true,
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3.0.0"
+          }
+        }
       }
     },
     "whatwg-mimetype": {
-      "version": "2.3.0",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz",
+      "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==",
       "dev": true
     },
     "whatwg-url": {
-      "version": "8.7.0",
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.0.0.tgz",
+      "integrity": "sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==",
       "dev": true,
       "requires": {
-        "lodash": "^4.7.0",
-        "tr46": "^2.1.0",
-        "webidl-conversions": "^6.1.0"
+        "tr46": "^5.0.0",
+        "webidl-conversions": "^7.0.0"
       }
     },
     "which": {
@@ -39241,6 +40822,7 @@
       "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": {
         "is-bigint": "^1.0.1",
         "is-boolean-object": "^1.1.0",
@@ -39249,36 +40831,78 @@
         "is-symbol": "^1.0.3"
       }
     },
+    "which-builtin-type": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.3.tgz",
+      "integrity": "sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==",
+      "dev": true,
+      "requires": {
+        "function.prototype.name": "^1.1.5",
+        "has-tostringtag": "^1.0.0",
+        "is-async-function": "^2.0.0",
+        "is-date-object": "^1.0.5",
+        "is-finalizationregistry": "^1.0.2",
+        "is-generator-function": "^1.0.10",
+        "is-regex": "^1.1.4",
+        "is-weakref": "^1.0.2",
+        "isarray": "^2.0.5",
+        "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
+        }
+      }
+    },
+    "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-typed-array": {
-      "version": "1.1.4",
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz",
+      "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==",
       "dev": true,
       "requires": {
-        "available-typed-arrays": "^1.0.2",
-        "call-bind": "^1.0.0",
-        "es-abstract": "^1.18.0-next.1",
-        "foreach": "^2.0.5",
-        "function-bind": "^1.1.1",
-        "has-symbols": "^1.0.1",
-        "is-typed-array": "^1.1.3"
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-tostringtag": "^1.0.2"
       }
     },
-    "widest-line": {
-      "version": "3.1.0",
+    "wide-align": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
+      "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
       "dev": true,
       "requires": {
-        "string-width": "^4.0.0"
+        "string-width": "^1.0.2 || 2 || 3 || 4"
       }
     },
     "word-wrap": {
-      "version": "1.2.3",
-      "dev": true
-    },
-    "wordwrap": {
-      "version": "0.0.3",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
       "dev": true
     },
     "workerpool": {
-      "version": "6.1.5",
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz",
+      "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==",
       "dev": true
     },
     "wrap-ansi": {
@@ -39315,30 +40939,30 @@
       "dev": true
     },
     "write-file-atomic": {
-      "version": "3.0.3",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
       "dev": true,
       "requires": {
         "imurmurhash": "^0.1.4",
-        "is-typedarray": "^1.0.0",
-        "signal-exit": "^3.0.2",
-        "typedarray-to-buffer": "^3.1.5"
+        "signal-exit": "^3.0.7"
       }
     },
     "ws": {
-      "version": "7.5.3",
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "dev": true,
       "requires": {}
     },
-    "xdg-basedir": {
-      "version": "4.0.0",
-      "dev": true
-    },
     "xml": {
       "version": "1.0.1",
       "dev": true
     },
     "xml-name-validator": {
-      "version": "3.0.0",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz",
+      "integrity": "sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==",
       "dev": true
     },
     "xmlbuilder": {
@@ -39347,6 +40971,8 @@
     },
     "xmlchars": {
       "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
       "dev": true
     },
     "xtend": {
@@ -39361,10 +40987,6 @@
       "version": "4.0.0",
       "dev": true
     },
-    "yaml": {
-      "version": "1.10.2",
-      "dev": true
-    },
     "yargs": {
       "version": "16.2.0",
       "dev": true,
diff --git a/package.json b/package.json
index fe6072e72a3c..4592476ae996 100644
--- a/package.json
+++ b/package.json
@@ -16,128 +16,129 @@
   },
   "dependencies": {
     "@ampproject/animations": "0.2.2",
-    "@ampproject/bento-compiler": "0.0.11",
-    "@ampproject/toolbox-cache-url": "2.8.0",
+    "@ampproject/bento-compiler": "0.0.14",
+    "@ampproject/toolbox-cache-url": "2.10.1",
     "@ampproject/viewer-messaging": "1.1.2",
-    "@ampproject/worker-dom": "0.32.1",
+    "@ampproject/worker-dom": "0.35.0",
+    "@use-gesture/react": "10.2.10",
     "@webcomponents/webcomponentsjs": "2.6.0",
-    "dompurify": "2.3.3",
-    "google-closure-library": "20210808.0.0",
+    "date-fns": "2.27.0",
+    "dompurify": "3.0.2",
+    "google-closure-library": "20230802.0.0",
     "intersection-observer": "0.12.0",
     "jss": "10.8.2",
     "jss-preset-default": "10.8.2",
-    "moment": "2.29.1",
+    "moment": "2.29.4",
     "obj-str": "1.1.0",
-    "preact": "10.5.15",
-    "react-dates": "21.8.0",
+    "preact": "10.16.0",
+    "react-day-picker": "8.0.0-beta.37",
     "react-jss": "10.8.2",
     "resize-observer-polyfill": "1.5.1",
-    "rrule": "2.6.8",
+    "rrule": "2.7.2",
     "timeago.js": "4.0.2",
     "web-activities": "1.24.0",
     "web-animations-js": "2.3.2"
   },
   "devDependencies": {
     "@ampproject/filesize": "4.3.0",
-    "@ampproject/google-closure-compiler": "20210601.0.0",
-    "@ampproject/remapping": "1.0.1",
+    "@ampproject/remapping": "2.3.0",
+    "@aws-sdk/client-s3": "3.613.0",
     "@babel/core": "7.15.0",
-    "@babel/eslint-parser": "7.15.0",
     "@babel/helper-module-imports": "7.14.5",
     "@babel/helper-plugin-test-runner": "7.14.5",
-    "@babel/plugin-proposal-class-properties": "7.14.5",
     "@babel/plugin-syntax-import-assertions": "7.14.5",
-    "@babel/plugin-transform-classes": "7.14.9",
     "@babel/plugin-transform-react-jsx": "7.14.9",
     "@babel/preset-env": "7.15.0",
+    "@babel/preset-typescript": "7.16.7",
     "@babel/runtime": "7.15.3",
-    "@chiragrupani/karma-chromium-edge-launcher": "2.1.1",
-    "@google-cloud/storage": "5.15.3",
-    "@jest/core": "27.3.1",
+    "@chiragrupani/karma-chromium-edge-launcher": "2.4.1",
+    "@jest/core": "29.7.0",
     "@jridgewell/doctrine": "3.0.2",
-    "@octokit/graphql": "4.8.0",
-    "@octokit/rest": "18.12.0",
-    "@sinonjs/fake-timers": "7.1.2",
-    "@types/chai": "4.2.22",
-    "@types/eslint": "7.28.2",
-    "@types/fs-extra": "9.0.13",
-    "@types/klaw": "3.0.3",
-    "@types/minimist": "1.2.2",
-    "@types/mocha": "8.2.3",
-    "@types/node": "14.17.32",
-    "acorn-globals": "6.0.0",
-    "ajv": "8.6.3",
+    "@jridgewell/resolve-uri": "3.1.2",
+    "@jridgewell/sourcemap-codec": "1.5.0",
+    "@octokit/graphql": "7.1.0",
+    "@octokit/rest": "20.1.1",
+    "@sinonjs/fake-timers": "11.2.2",
+    "@types/chai": "4.3.16",
+    "@types/dompurify": "2.4.0",
+    "@types/eslint": "8.56.12",
+    "@types/estree": "1.0.5",
+    "@types/fs-extra": "11.0.4",
+    "@types/klaw": "3.0.6",
+    "@types/minimist": "1.2.5",
+    "@types/mocha": "10.0.7",
+    "@types/node": "18.19.39",
+    "@types/tar": "6.1.13",
+    "@typescript-eslint/eslint-plugin": "7.18.0",
+    "@typescript-eslint/parser": "7.18.0",
+    "acorn-globals": "7.0.1",
+    "ajv": "8.16.0",
     "ajv-formats": "2.1.1",
-    "amphtml-validator": "1.0.35",
+    "amphtml-validator": "1.0.38",
     "ast-replace": "1.1.3",
     "atob": "2.1.2",
-    "autoprefixer": "10.3.7",
-    "ava": "3.15.0",
+    "autoprefixer": "10.4.19",
+    "ava": "6.1.3",
     "babel-plugin-istanbul": "6.0.0",
     "babel-plugin-minify-replace": "0.5.0",
-    "babel-plugin-module-resolver": "4.1.0",
+    "babel-plugin-module-resolver": "5.0.0",
     "babel-plugin-optimize-objstr": "1.0.0",
     "baconipsum": "0.1.2",
-    "base62": "2.0.1",
-    "body-parser": "1.19.0",
-    "chai": "4.3.4",
-    "chai-as-promised": "7.1.1",
-    "check-dependencies": "1.1.0",
-    "chokidar": "3.5.2",
-    "cli-highlight": "2.1.11",
-    "codecov": "3.8.3",
-    "commander": "7.2.0",
+    "base62": "2.0.2",
+    "body-parser": "1.20.3",
+    "chai": "4.4.1",
+    "chai-as-promised": "7.1.2",
+    "check-dependencies": "2.0.0",
+    "chokidar": "3.6.0",
+    "commander": "11.1.0",
     "connect-header": "0.0.5",
     "css-imports": "0.3.1",
-    "css-selector-tokenizer": "0.8.0",
-    "css-what": "5.1.0",
-    "cssnano": "5.0.8",
-    "dedent": "0.7.0",
-    "del": "6.0.0",
+    "css-what": "6.1.0",
+    "cssnano": "6.1.2",
+    "dedent": "1.5.3",
+    "del": "6.1.1",
     "enzyme": "3.11.0",
-    "enzyme-adapter-preact-pure": "3.1.0",
-    "esbuild": "0.13.9",
-    "escodegen": "2.0.0",
-    "eslint": "7.32.0",
-    "eslint-config-prettier": "8.3.0",
-    "eslint-import-resolver-babel-module": "5.3.1",
-    "eslint-plugin-chai-expect": "2.2.0",
-    "eslint-plugin-eslint-plugin": "3.6.1",
-    "eslint-plugin-import": "2.25.2",
-    "eslint-plugin-jasmine": "4.1.2",
-    "eslint-plugin-jsdoc": "36.1.1",
-    "eslint-plugin-local": "1.0.0",
-    "eslint-plugin-module-resolver": "1.4.0",
-    "eslint-plugin-prettier": "4.0.0",
-    "eslint-plugin-react": "7.26.1",
-    "eslint-plugin-react-hooks": "4.2.0",
-    "eslint-plugin-sort-destructure-keys": "1.4.0",
-    "eslint-plugin-sort-requires": "2.1.0",
+    "enzyme-adapter-preact-pure": "4.1.0",
+    "esbuild": "0.24.2",
+    "escodegen": "2.1.0",
+    "eslint": "8.57.1",
+    "eslint-config-prettier": "9.1.0",
+    "eslint-import-resolver-babel-module": "5.3.2",
+    "eslint-plugin-chai-expect": "3.1.0",
+    "eslint-plugin-eslint-plugin": "5.5.1",
+    "eslint-plugin-import": "2.31.0",
+    "eslint-plugin-jasmine": "4.2.2",
+    "eslint-plugin-jsdoc": "48.11.0",
+    "eslint-plugin-local": "4.2.2",
+    "eslint-plugin-module-resolver": "1.5.0",
+    "eslint-plugin-prettier": "5.2.1",
+    "eslint-plugin-react": "7.37.1",
+    "eslint-plugin-react-hooks": "4.6.2",
+    "eslint-plugin-sort-destructure-keys": "1.6.0",
     "esprima": "4.0.1",
     "event-stream": "4.0.1",
     "events": "3.3.0",
-    "express": "4.17.1",
-    "fast-glob": "3.2.7",
+    "express": "4.20.0",
+    "fast-glob": "3.3.2",
     "fetch-mock": "9.11.0",
-    "formidable": "1.2.2",
-    "fs-extra": "10.0.0",
+    "formidable": "3.5.1",
+    "fs-extra": "11.2.0",
     "gulp-connect": "5.7.0",
     "html-minifier": "4.0.0",
-    "ignore": "5.1.8",
+    "ignore": "5.3.1",
     "istanbul-middleware": "0.2.2",
-    "jest-progress-bar-reporter": "1.0.21",
-    "jest-silent-reporter": "0.5.0",
+    "jest-progress-bar-reporter": "1.0.25",
+    "jest-silent-reporter": "0.6.0",
     "jison": "0.4.18",
-    "jscodeshift": "0.13.0",
-    "jsdom": "16.7.0",
-    "json-stable-stringify": "1.0.1",
-    "json5": "2.2.0",
-    "jsonminify": "0.4.1",
-    "karma": "6.3.6",
-    "karma-chrome-launcher": "3.1.0",
+    "jsdom": "24.1.0",
+    "json-stable-stringify": "1.1.1",
+    "json5": "2.2.3",
+    "jsonminify": "0.4.2",
+    "karma": "6.4.3",
+    "karma-chrome-launcher": "3.2.0",
     "karma-coverage-istanbul-reporter": "3.0.3",
-    "karma-esbuild": "2.2.0",
-    "karma-firefox-launcher": "2.1.1",
+    "karma-esbuild-up": "3.0.0",
+    "karma-firefox-launcher": "2.1.3",
     "karma-fixture": "0.2.6",
     "karma-html2js-preprocessor": "1.1.0",
     "karma-junit-reporter": "2.0.1",
@@ -145,48 +146,40 @@
     "karma-mocha-reporter": "2.2.5",
     "karma-safarinative-launcher": "1.1.0",
     "karma-source-map-support": "1.4.0",
-    "karma-spec-reporter": "0.0.32",
+    "karma-spec-reporter": "0.0.36",
     "karma-structured-json-reporter": "1.0.1",
-    "karma-super-dots-reporter": "0.2.0",
-    "klaw": "3.0.0",
-    "kleur": "4.1.4",
+    "klaw": "4.1.0",
+    "kleur": "4.1.5",
     "list-imports-exports": "0.1.2",
     "lodash.debounce": "4.0.8",
-    "magic-string": "0.25.7",
-    "markdown-link-check": "3.8.7",
+    "markdown-link-check": "3.12.2",
     "markdown-toc": "1.2.0",
-    "marked": "3.0.8",
-    "minimatch": "3.0.4",
-    "minimist": "1.2.5",
-    "mocha": "9.1.3",
-    "mocha-junit-reporter": "2.0.2",
+    "minimatch": "9.0.5",
+    "minimist": "1.2.8",
+    "mocha": "10.6.0",
+    "mocha-junit-reporter": "2.2.1",
     "mocha-silent-reporter": "1.0.0",
     "morgan": "1.10.0",
-    "multer": "1.4.3",
-    "nock": "13.1.4",
-    "node-fetch": "2.6.5",
-    "open": "8.4.0",
-    "plugin-error": "1.0.1",
-    "postcss": "8.3.11",
-    "postcss-import": "14.0.2",
-    "posthtml": "0.16.5",
-    "prettier": "2.4.1",
+    "multer": "1.4.5-lts.1",
+    "open": "8.4.2",
+    "plugin-error": "2.0.1",
+    "postcss": "8.4.39",
+    "postcss-import": "16.1.0",
+    "posthtml": "0.16.6",
+    "prettier": "3.3.3",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "rocambole": "0.7.0",
-    "semver": "7.3.5",
+    "semver": "7.6.2",
     "sinon": "11.1.2",
     "sinon-chai": "3.7.0",
-    "sourcemap-codec": "1.4.8",
     "stream-browserify": "3.0.0",
     "sync-rpc": "1.3.6",
-    "tar": "6.1.11",
+    "tar": "6.2.1",
     "tempy": "1.0.1",
-    "terser": "5.9.0",
-    "text-table": "0.2.0",
-    "traverse": "0.6.6",
-    "typescript": "4.4.4",
-    "util": "0.12.4",
-    "vinyl-fs": "3.0.3"
+    "terser": "5.14.2",
+    "traverse": "0.6.9",
+    "typescript": "5.5.3",
+    "util": "0.12.5"
   }
 }
diff --git a/src/.eslintrc.js b/src/.eslintrc.js
index baf9d0f17172..f0013b45dbda 100644
--- a/src/.eslintrc.js
+++ b/src/.eslintrc.js
@@ -1,4 +1,3 @@
-
 const {isCiBuild} = require('../build-system/common/ci');
 
 module.exports = {
@@ -45,7 +44,6 @@ module.exports = {
   'overrides': [
     {
       'files': [
-        './preact/base-element.js',
         './polyfills/fetch.js',
         // TEMPORARY, follow tracking issue #33631
         './preact/component/3p-frame.js',
@@ -54,10 +52,9 @@ module.exports = {
     },
     {
       'files': [
-        './core/window/window.extern.js',
         './polyfills/custom-elements.extern.js',
-        './experiments/experiments.extern.js',
         './experiments/shame.extern.js',
+        './bento/components/**/*.js',
       ],
       'rules': {'local/no-global': 0},
     },
diff --git a/src/3p-frame.d.ts b/src/3p-frame.d.ts
new file mode 100644
index 000000000000..173885b94ac9
--- /dev/null
+++ b/src/3p-frame.d.ts
@@ -0,0 +1,16 @@
+/**
+ * Returns a randomized sentinel value for 3p iframes.
+ * The format is "%d-%d" with the first value being the depth of current
+ * window in the window hierarchy and the second a random integer.
+ */
+export const generateSentinel: (win: Window) => string;
+
+/** Returns the base URL for 3p bootstrap iframes. */
+export const getDefaultBootstrapBaseUrl: (
+  parentWin: Window,
+  ampdoc?: any,
+  strictForUnitTest?: boolean
+) => string;
+
+/** Get the bootstrap script URL for iframe. */
+export const getBootstrapUrl: (type: string) => string;
diff --git a/src/3p-frame.js b/src/3p-frame.js
index eedccce8f627..549d72006d0d 100644
--- a/src/3p-frame.js
+++ b/src/3p-frame.js
@@ -1,16 +1,15 @@
 import {getOptionalSandboxFlags, getRequiredSandboxFlags} from '#core/3p-frame';
 import {setStyle} from '#core/dom/style';
 import * as mode from '#core/mode';
-import {dict} from '#core/types/object';
 import {tryParseJson} from '#core/types/object/json';
 
 import {dev, devAssert, user, userAssert} from '#utils/log';
 
-import {urls} from './config';
+import * as urls from './config/urls';
 import {getContextMetadata} from './iframe-attributes';
 import {assertHttpsUrl, parseUrlDeprecated} from './url';
 
-/** @type {!Object<string,number>} Number of 3p frames on the for that type. */
+/** @type {!{[key: string]: number}} Number of 3p frames on the for that type. */
 let count = {};
 
 /** @type {string} */
@@ -35,7 +34,7 @@ function getFrameAttributes(parentWindow, element, opt_type, opt_context) {
   const type = opt_type || element.getAttribute('type');
   userAssert(type, 'Attribute type required for <amp-ad>: %s', element);
   const sentinel = generateSentinel(parentWindow);
-  let attributes = dict();
+  let attributes = {};
   // Do these first, as the other attributes have precedence.
   addDataAndJsonAttributes_(element, attributes);
   attributes = getContextMetadata(parentWindow, element, sentinel, attributes);
@@ -98,16 +97,14 @@ export function getIframe(
   // be the master frame. That is ok, as we will read the name off
   // for our uses before that would occur.
   // @see https://github.com/ampproject/amphtml/blob/main/3p/integration.js
-  const name = JSON.stringify(
-    dict({
-      'host': host,
-      'bootstrap': getBootstrapUrl(attributes['type']),
-      'type': attributes['type'],
-      // https://github.com/ampproject/amphtml/pull/2955
-      'count': count[attributes['type']],
-      'attributes': attributes,
-    })
-  );
+  const name = JSON.stringify({
+    'host': host,
+    'bootstrap': getBootstrapUrl(attributes['type']),
+    'type': attributes['type'],
+    // https://github.com/ampproject/amphtml/pull/2955
+    'count': count[attributes['type']],
+    'attributes': attributes,
+  });
 
   iframe.src = baseUrl;
   iframe.ampLocation = parseUrlDeprecated(baseUrl);
@@ -292,6 +289,7 @@ export function getDevelopmentBootstrapBaseUrl(parentWindow, srcFileBasename) {
  */
 function getAdsLocalhost(win) {
   let adsUrl = urls.thirdParty; // local dev with a non-localhost server
+  // eslint-disable-next-line local/no-forbidden-terms
   if (adsUrl == 'https://3p.ampproject.net') {
     adsUrl = 'http://ads.localhost'; // local dev with a localhost server
   }
diff --git a/src/ad-helper.js b/src/ad-helper.js
index 44701ae9c8e3..8d90a88e9ff2 100644
--- a/src/ad-helper.js
+++ b/src/ad-helper.js
@@ -8,7 +8,7 @@ const AD_CONTAINER_PROP = '__AMP__AD_CONTAINER';
 
 /**
  * Tags that are allowed to have fixed positioning
- * @const {!Object<string, boolean>}
+ * @const {!{[key: string]: boolean}}
  */
 const CONTAINERS = {
   'AMP-FX-FLYING-CARPET': true,
diff --git a/src/amp-story-player/amp-story-player-impl.js b/src/amp-story-player/amp-story-player-impl.js
index 7cdedc5c3120..32e0aecb515b 100644
--- a/src/amp-story-player/amp-story-player-impl.js
+++ b/src/amp-story-player/amp-story-player-impl.js
@@ -3,24 +3,25 @@ import {Messaging} from '@ampproject/viewer-messaging';
 
 // Source for this constant is css/amp-story-player-shadow.css
 import {devAssertElement} from '#core/assert';
-import {VisibilityState} from '#core/constants/visibility-state';
+import {VisibilityState_Enum} from '#core/constants/visibility-state';
 import {Deferred} from '#core/data-structures/promise';
-import {isJsonScriptTag, tryFocus} from '#core/dom';
+import {isJsonScriptTag, toggleAttribute, tryFocus} from '#core/dom';
 import {resetStyles, setStyle, setStyles} from '#core/dom/style';
 import {findIndex, toArray} from '#core/types/array';
 import {isEnumValue} from '#core/types/enum';
-import {dict} from '#core/types/object';
 import {parseJson} from '#core/types/object/json';
 import {parseQueryString} from '#core/types/string/url';
+import {copyTextToClipboard} from '#core/window/clipboard';
 
 import {createCustomEvent, listenOnce} from '#utils/event-helper';
 
 import {AmpStoryPlayerViewportObserver} from './amp-story-player-viewport-observer';
+import {AMP_STORY_COPY_URL, AMP_STORY_PLAYER_EVENT} from './event';
 import {PageScroller} from './page-scroller';
 
 import {cssText} from '../../build/amp-story-player-shadow.css';
 import {applySandbox} from '../3p-frame';
-import {urls} from '../config';
+import * as urls from '../config/urls';
 import {getMode} from '../mode';
 import {
   addParamsToUrl,
@@ -48,7 +49,7 @@ const STORY_POSITION_ENUM = {
 };
 
 /** @const @type {!Array<string>} */
-const SUPPORTED_CACHES = ['cdn.ampproject.org', 'www.bing-amp.com'];
+const SUPPORTED_CACHES = ['cdn.ampproject.org', 'www.bing-amp.com']; // eslint-disable-line local/no-forbidden-terms
 
 /** @const @type {!Array<string>} */
 const SANDBOX_MIN_LIST = ['allow-top-navigation'];
@@ -101,11 +102,9 @@ const STORY_MESSAGE_STATE_TYPE_ENUM = {
   MUTED_STATE: 'MUTED_STATE',
   CURRENT_PAGE_ID: 'CURRENT_PAGE_ID',
   STORY_PROGRESS: 'STORY_PROGRESS',
+  DESKTOP_ASPECT_RATIO: 'DESKTOP_ASPECT_RATIO',
 };
 
-/** @const {string} */
-export const AMP_STORY_PLAYER_EVENT = 'AMP_STORY_PLAYER_EVENT';
-
 /** @const {string} */
 const CLASS_NO_NAVIGATION_TRANSITION =
   'i-amphtml-story-player-no-navigation-transition';
@@ -123,7 +122,8 @@ let DocumentStateTypeDef;
  *   title: (?string),
  *   posterImage: (?string),
  *   storyContentLoaded: ?boolean,
- *   connectedDeferred: !Deferred
+ *   connectedDeferred: !Deferred,
+ *   desktopAspectRatio: ?number,
  * }}
  */
 let StoryDef;
@@ -179,7 +179,7 @@ const LOG_TYPE_ENUM = {
  * NOTE: If udpated here, update in amp-story.js
  * @private @const {number}
  */
-const PANEL_ASPECT_RATIO_THRESHOLD = 3 / 4;
+const PANEL_ASPECT_RATIO_THRESHOLD = 31 / 40;
 
 /**
  * Note that this is a vanilla JavaScript class and should not depend on AMP
@@ -255,6 +255,9 @@ export class AmpStoryPlayer {
     /** @private {?Element} */
     this.nextButton_ = null;
 
+    /** @private {boolean} */
+    this.pageAttachmentOpen_ = false;
+
     return this.element_;
   }
 
@@ -366,7 +369,7 @@ export class AmpStoryPlayer {
 
     this.updateVisibilityState_(
       currentStory,
-      paused ? VisibilityState.PAUSED : VisibilityState.VISIBLE
+      paused ? VisibilityState_Enum.PAUSED : VisibilityState_Enum.VISIBLE
     );
   }
 
@@ -433,9 +436,7 @@ export class AmpStoryPlayer {
 
   /** @private */
   signalReady_() {
-    this.element_.dispatchEvent(
-      createCustomEvent(this.win_, 'ready', dict({}))
-    );
+    this.element_.dispatchEvent(createCustomEvent(this.win_, 'ready', {}));
     this.element_.isReady = true;
   }
 
@@ -502,7 +503,7 @@ export class AmpStoryPlayer {
           isBack
             ? DEPRECATED_EVENT_NAMES_ENUM.BACK
             : DEPRECATED_EVENT_NAMES_ENUM.CLOSE,
-          dict({})
+          {}
         )
       );
     });
@@ -558,7 +559,7 @@ export class AmpStoryPlayer {
       setStyle(iframeEl, 'backgroundImage', story.posterImage);
     }
     iframeEl.classList.add('story-player-iframe');
-    iframeEl.setAttribute('allow', 'autoplay');
+    iframeEl.setAttribute('allow', 'autoplay; web-share');
 
     applySandbox(iframeEl);
     this.addSandboxFlags_(iframeEl);
@@ -619,29 +620,34 @@ export class AmpStoryPlayer {
             this.onSelectDocument_(/** @type {!Object} */ (data));
           });
 
+          messaging.registerHandler('storyContentLoaded', () => {
+            story.storyContentLoaded = true;
+
+            // Store aspect ratio so that it can be updated when the story becomes active.
+            this.storeAndMaybeUpdateAspectRatio_(story);
+          });
+
           messaging.sendRequest(
             'onDocumentState',
-            dict({
+            {
               'state': STORY_MESSAGE_STATE_TYPE_ENUM.PAGE_ATTACHMENT_STATE,
-            }),
+            },
             false
           );
 
           messaging.sendRequest(
             'onDocumentState',
-            dict({'state': STORY_MESSAGE_STATE_TYPE_ENUM.CURRENT_PAGE_ID}),
+            {'state': STORY_MESSAGE_STATE_TYPE_ENUM.CURRENT_PAGE_ID},
             false
           );
 
-          messaging.sendRequest(
-            'onDocumentState',
-            dict({'state': STORY_MESSAGE_STATE_TYPE_ENUM.MUTED_STATE})
-          );
+          messaging.sendRequest('onDocumentState', {
+            'state': STORY_MESSAGE_STATE_TYPE_ENUM.MUTED_STATE,
+          });
 
-          messaging.sendRequest(
-            'onDocumentState',
-            dict({'state': STORY_MESSAGE_STATE_TYPE_ENUM.UI_STATE})
-          );
+          messaging.sendRequest('onDocumentState', {
+            'state': STORY_MESSAGE_STATE_TYPE_ENUM.UI_STATE,
+          });
 
           messaging.registerHandler('documentStateUpdate', (event, data) => {
             this.onDocumentStateUpdate_(
@@ -655,7 +661,7 @@ export class AmpStoryPlayer {
 
             messaging.sendRequest(
               'customDocumentUI',
-              dict({'controls': this.playerConfig_.controls}),
+              {'controls': this.playerConfig_.controls},
               false
             );
           }
@@ -780,12 +786,14 @@ export class AmpStoryPlayer {
    * @private
    */
   checkButtonsDisabled_() {
-    this.prevButton_.toggleAttribute(
+    toggleAttribute(
+      this.prevButton_,
       'disabled',
       this.isIndexOutofBounds_(this.currentIdx_ - 1) &&
         !this.isCircularWrappingEnabled_
     );
-    this.nextButton_.toggleAttribute(
+    toggleAttribute(
+      this.nextButton_,
       'disabled',
       this.isIndexOutofBounds_(this.currentIdx_ + 1) &&
         !this.isCircularWrappingEnabled_
@@ -848,25 +856,6 @@ export class AmpStoryPlayer {
       });
   }
 
-  /**
-   * Resolves currentStoryLoadDeferred_ when given story's content is finished
-   * loading.
-   * @param {!StoryDef} story
-   * @private
-   */
-  initStoryContentLoadedPromise_(story) {
-    this.currentStoryLoadDeferred_ = new Deferred();
-
-    story.messagingPromise.then((messaging) =>
-      messaging.registerHandler('storyContentLoaded', () => {
-        // Stories that already loaded won't dispatch a `storyContentLoaded`
-        // event anymore, which is why we need this sync property.
-        story.storyContentLoaded = true;
-        this.currentStoryLoadDeferred_.resolve();
-      })
-    );
-  }
-
   /**
    * Shows the story provided by the URL in the player and go to the page if provided.
    * @param {?string} storyUrl
@@ -1153,8 +1142,8 @@ export class AmpStoryPlayer {
       story.distance === 0
         ? STORY_POSITION_ENUM.CURRENT
         : story.idx > this.currentIdx_
-        ? STORY_POSITION_ENUM.NEXT
-        : STORY_POSITION_ENUM.PREVIOUS;
+          ? STORY_POSITION_ENUM.NEXT
+          : STORY_POSITION_ENUM.PREVIOUS;
 
     requestAnimationFrame(() => {
       const {iframe} = story;
@@ -1164,14 +1153,51 @@ export class AmpStoryPlayer {
   }
 
   /**
-   * Returns a promise that makes sure current story gets loaded first before
-   * others.
+   * Store aspect ratio of the loaded story and and maybe update the active aspect ratio.
+   * @param {!StoryDef} story
+   * @private
+   */
+  storeAndMaybeUpdateAspectRatio_(story) {
+    story.messagingPromise.then((messaging) => {
+      messaging
+        .sendRequest(
+          'getDocumentState',
+          {state: STORY_MESSAGE_STATE_TYPE_ENUM.DESKTOP_ASPECT_RATIO},
+          true
+        )
+        .then((event) => {
+          story.desktopAspectRatio = event.value;
+          this.maybeUpdateAspectRatio_();
+        });
+    });
+  }
+
+  /**
+   * Update player aspect ratio based on the active story aspect ratio.
+   * @private
+   */
+  maybeUpdateAspectRatio_() {
+    if (this.stories_[this.currentIdx_].desktopAspectRatio) {
+      setStyles(this.rootEl_, {
+        '--i-amphtml-story-player-panel-ratio':
+          this.stories_[this.currentIdx_].desktopAspectRatio,
+      });
+    }
+  }
+
+  /**
+   * Returns a promise that makes sure that the current story gets loaded first
+   * before any others. When the given story is not the current story, it will
+   * block until the current story has finished loading. When the given story
+   * is the current story, then this method will not block.
    * @param {!StoryDef} story
    * @return {!Promise}
    * @private
    */
   currentStoryPromise_(story) {
     if (this.stories_[this.currentIdx_].storyContentLoaded) {
+      this.maybeUpdateAspectRatio_();
+
       return Promise.resolve();
     }
 
@@ -1179,14 +1205,24 @@ export class AmpStoryPlayer {
       return this.currentStoryLoadDeferred_.promise;
     }
 
-    if (this.currentStoryLoadDeferred_) {
-      // Cancel previous story load promise.
-      this.currentStoryLoadDeferred_.reject(
-        `[${LOG_TYPE_ENUM.DEV}] Cancelling previous story load promise.`
-      );
-    }
+    // Cancel previous story load promise.
+    this.currentStoryLoadDeferred_?.reject(
+      `[${LOG_TYPE_ENUM.DEV}] Cancelling previous story load promise.`
+    );
+
+    this.currentStoryLoadDeferred_ = new Deferred();
+    story.messagingPromise.then((messaging) =>
+      messaging.registerHandler('storyContentLoaded', () => {
+        // Stories that already loaded won't dispatch a `storyContentLoaded`
+        // event anymore, which is why we need this sync property.
+        story.storyContentLoaded = true;
+        this.currentStoryLoadDeferred_.resolve();
+
+        // Store and update the player aspect ratio based on the active story aspect ratio.
+        this.storeAndMaybeUpdateAspectRatio_(story);
+      })
+    );
 
-    this.initStoryContentLoadedPromise_(story);
     return Promise.resolve();
   }
 
@@ -1239,11 +1275,11 @@ export class AmpStoryPlayer {
           // 4. Update the visibility state of the story.
           .then(() => {
             if (story.distance === 0 && this.playing_) {
-              this.updateVisibilityState_(story, VisibilityState.VISIBLE);
+              this.updateVisibilityState_(story, VisibilityState_Enum.VISIBLE);
             }
 
             if (oldDistance === 0 && story.distance === 1) {
-              this.updateVisibilityState_(story, VisibilityState.INACTIVE);
+              this.updateVisibilityState_(story, VisibilityState_Enum.INACTIVE);
             }
           })
           // 5. Finally update the story position.
@@ -1251,7 +1287,10 @@ export class AmpStoryPlayer {
             this.updatePosition_(story);
 
             if (story.distance === 0) {
-              tryFocus(story.iframe);
+              // Focus on the current story iframe after the animation ends.
+              story.iframe.addEventListener('animationend', () => {
+                tryFocus(story.iframe);
+              });
             }
           })
           .catch((err) => {
@@ -1297,7 +1336,10 @@ export class AmpStoryPlayer {
    */
   setSrc_(story, url) {
     const {iframe} = story;
-    const {href} = this.getEncodedLocation_(url, VisibilityState.PRERENDER);
+    const {href} = this.getEncodedLocation_(
+      url,
+      VisibilityState_Enum.PRERENDER
+    );
 
     iframe.setAttribute('src', href);
     if (story.title) {
@@ -1356,11 +1398,11 @@ export class AmpStoryPlayer {
   /**
    * Gets encoded url for player usage.
    * @param {string} href
-   * @param {VisibilityState=} visibilityState
+   * @param {VisibilityState_Enum=} visibilityState
    * @return {!Location}
    * @private
    */
-  getEncodedLocation_(href, visibilityState = VisibilityState.INACTIVE) {
+  getEncodedLocation_(href, visibilityState = VisibilityState_Enum.INACTIVE) {
     const playerFragmentParams = {
       'visibilityState': visibilityState,
       'origin': this.win_.origin,
@@ -1383,9 +1425,9 @@ export class AmpStoryPlayer {
 
     let noFragmentUrl = removeFragment(href);
     if (isProxyOrigin(href)) {
-      const ampJsQueryParam = dict({
+      const ampJsQueryParam = {
         'amp_js_v': '0.1',
-      });
+      };
       noFragmentUrl = addParamsToUrl(noFragmentUrl, ampJsQueryParam);
     }
     const inputUrl = noFragmentUrl + '#' + serializeQueryString(fragmentParams);
@@ -1399,7 +1441,7 @@ export class AmpStoryPlayer {
   /**
    * Updates the visibility state of the story inside the iframe.
    * @param {!StoryDef} story
-   * @param {!VisibilityState} visibilityState
+   * @param {!VisibilityState_Enum} visibilityState
    * @private
    */
   updateVisibilityState_(story, visibilityState) {
@@ -1561,6 +1603,9 @@ export class AmpStoryPlayer {
       case AMP_STORY_PLAYER_EVENT:
         this.onPlayerEvent_(/** @type {string} */ (data.value));
         break;
+      case AMP_STORY_COPY_URL:
+        this.onCopyUrl_(/** @type {string} */ (data.value), messaging);
+        break;
       default:
         break;
     }
@@ -1578,13 +1623,43 @@ export class AmpStoryPlayer {
         this.next_();
         break;
       default:
-        this.element_.dispatchEvent(
-          createCustomEvent(this.win_, value, dict({}))
-        );
+        this.element_.dispatchEvent(createCustomEvent(this.win_, value, {}));
         break;
     }
   }
 
+  /**
+   * Reacts to the copy url request coming from the story.
+   * @private
+   * @param {string} value
+   * @param {Messaging} messaging
+   */
+  onCopyUrl_(value, messaging) {
+    copyTextToClipboard(
+      this.win_,
+      value,
+      () => {
+        messaging.sendRequest(
+          'copyComplete',
+          {
+            'success': true,
+            'url': value,
+          },
+          false
+        );
+      },
+      () => {
+        messaging.sendRequest(
+          'copyComplete',
+          {
+            'success': false,
+          },
+          false
+        );
+      }
+    );
+  }
+
   /**
    * Reacts to mute/unmute events coming from the story.
    * @param {string} muted
@@ -1606,19 +1681,15 @@ export class AmpStoryPlayer {
     messaging
       .sendRequest(
         'getDocumentState',
-        dict({'state': STORY_MESSAGE_STATE_TYPE_ENUM.STORY_PROGRESS}),
+        {'state': STORY_MESSAGE_STATE_TYPE_ENUM.STORY_PROGRESS},
         true
       )
       .then((progress) => {
         this.element_.dispatchEvent(
-          createCustomEvent(
-            this.win_,
-            'storyNavigation',
-            dict({
-              'pageId': pageId,
-              'progress': progress.value,
-            })
-          )
+          createCustomEvent(this.win_, 'storyNavigation', {
+            'pageId': pageId,
+            'progress': progress.value,
+          })
         );
       });
   }
@@ -1630,6 +1701,7 @@ export class AmpStoryPlayer {
    */
   onPageAttachmentStateUpdate_(pageAttachmentOpen) {
     this.updateButtonVisibility_(!pageAttachmentOpen);
+    this.pageAttachmentOpen_ = pageAttachmentOpen;
     this.dispatchPageAttachmentEvent_(pageAttachmentOpen);
   }
 
@@ -1662,7 +1734,7 @@ export class AmpStoryPlayer {
       createCustomEvent(
         this.win_,
         isPageAttachmentOpen ? 'page-attachment-open' : 'page-attachment-close',
-        dict({})
+        {}
       )
     );
   }
@@ -1701,7 +1773,7 @@ export class AmpStoryPlayer {
     }
 
     if (endOfStories) {
-      this.element_.dispatchEvent(createCustomEvent(this.win_, name, dict({})));
+      this.element_.dispatchEvent(createCustomEvent(this.win_, name, {}));
     }
   }
 
@@ -1723,13 +1795,9 @@ export class AmpStoryPlayer {
       this.pageScroller_.onTouchStart(event.timeStamp, coordinates.clientY);
 
     this.element_.dispatchEvent(
-      createCustomEvent(
-        this.win_,
-        'amp-story-player-touchstart',
-        dict({
-          'touches': event.touches,
-        })
-      )
+      createCustomEvent(this.win_, 'amp-story-player-touchstart', {
+        'touches': event.touches,
+      })
     );
   }
 
@@ -1745,14 +1813,10 @@ export class AmpStoryPlayer {
     }
 
     this.element_.dispatchEvent(
-      createCustomEvent(
-        this.win_,
-        'amp-story-player-touchmove',
-        dict({
-          'touches': event.touches,
-          'isNavigationalSwipe': this.touchEventState_.isSwipeX,
-        })
-      )
+      createCustomEvent(this.win_, 'amp-story-player-touchmove', {
+        'touches': event.touches,
+        'isNavigationalSwipe': this.touchEventState_.isSwipeX,
+      })
     );
 
     if (this.touchEventState_.isSwipeX === false) {
@@ -1786,14 +1850,10 @@ export class AmpStoryPlayer {
    */
   onTouchEnd_(event) {
     this.element_.dispatchEvent(
-      createCustomEvent(
-        this.win_,
-        'amp-story-player-touchend',
-        dict({
-          'touches': event.touches,
-          'isNavigationalSwipe': this.touchEventState_.isSwipeX,
-        })
-      )
+      createCustomEvent(this.win_, 'amp-story-player-touchend', {
+        'touches': event.touches,
+        'isNavigationalSwipe': this.touchEventState_.isSwipeX,
+      })
     );
 
     if (this.touchEventState_.isSwipeX === true) {
@@ -1817,7 +1877,7 @@ export class AmpStoryPlayer {
    * @param {!Object} gesture
    */
   onSwipeX_(gesture) {
-    if (this.stories_.length <= 1) {
+    if (this.stories_.length <= 1 || this.pageAttachmentOpen_) {
       return;
     }
 
diff --git a/src/amp-story-player/event.js b/src/amp-story-player/event.js
new file mode 100644
index 000000000000..8e8c0e15c1b7
--- /dev/null
+++ b/src/amp-story-player/event.js
@@ -0,0 +1,3 @@
+/** @const {string} */
+export const AMP_STORY_PLAYER_EVENT = 'AMP_STORY_PLAYER_EVENT';
+export const AMP_STORY_COPY_URL = 'AMP_STORY_COPY_URL';
diff --git a/src/amp.js b/src/amp.js
index 7e8a6ee7b222..c04b08d770ff 100644
--- a/src/amp.js
+++ b/src/amp.js
@@ -5,7 +5,7 @@
 // src/polyfills.js must be the first import.
 import './polyfills';
 
-import {TickLabel} from '#core/constants/enums';
+import {TickLabel_Enum} from '#core/constants/enums';
 import {whenDocumentComplete} from '#core/document/ready';
 import * as mode from '#core/mode';
 
@@ -82,7 +82,7 @@ function bootstrap(ampdoc, perf) {
     /* makes the body visible */ true
   );
   startupChunk(self.document, function finalTick() {
-    perf.tick(TickLabel.END_INSTALL_STYLES);
+    perf.tick(TickLabel_Enum.END_INSTALL_STYLES);
     Services.resourcesForDoc(ampdoc).ampInitComplete();
     // TODO(erwinm): move invocation of the `flush` method when we have the
     // new ticks in place to batch the ticks properly.
@@ -125,7 +125,7 @@ startupChunk(self.document, function initial() {
     perf.addEnabledExperiment('esm');
   }
   fontStylesheetTimeout(self);
-  perf.tick(TickLabel.INSTALL_STYLES);
+  perf.tick(TickLabel_Enum.INSTALL_STYLES);
   if (mode.isEsm()) {
     bootstrap(ampdoc, perf);
     return;
diff --git a/src/auto-lightbox.js b/src/auto-lightbox.js
index 433c9aa67b5c..82220fcbe786 100644
--- a/src/auto-lightbox.js
+++ b/src/auto-lightbox.js
@@ -4,7 +4,7 @@ import {Services} from '#service';
 
 import {dev} from '#utils/log';
 
-import {ChunkPriority, chunk} from './chunk';
+import {ChunkPriority_Enum, chunk} from './chunk';
 import {isStoryDocument} from './utils/story';
 
 /** @const @enum {string} */
@@ -27,7 +27,13 @@ export const AutoLightboxEvents_Enum = {
 export function installAutoLightboxExtension(ampdoc) {
   const {win} = ampdoc;
   // Only enabled on single documents tagged as <html amp> or <html ⚡>.
-  if (!isAmphtml(win.document) || !ampdoc.isSingleDoc()) {
+  if (
+    !isAmphtml(win.document) ||
+    !ampdoc.isSingleDoc() ||
+    // Prevent loading auto lightbox when disabled using 'data-amp-auto-lightbox-disable' attribute (#37854)
+    // Check if HTML Tag has 'data-amp-auto-lightbox-disable' attribute
+    win.document.documentElement.hasAttribute('data-amp-auto-lightbox-disable')
+  ) {
     return;
   }
   chunk(
@@ -44,7 +50,7 @@ export function installAutoLightboxExtension(ampdoc) {
         );
       });
     },
-    ChunkPriority.LOW
+    ChunkPriority_Enum.LOW
   );
 }
 
diff --git a/src/base-element.d.ts b/src/base-element.d.ts
index eeddc30d46e3..ad91d64e6391 100644
--- a/src/base-element.d.ts
+++ b/src/base-element.d.ts
@@ -1,9 +1,15 @@
 // See src/base-element.js for method documentation.
+
+type Layout_Enum = import('#core/dom/layout').Layout_Enum;
+type LayoutSize = import('#core/dom/layout/rect').LayoutSizeDef;
+type LayoutRect = import('#core/dom/layout/rect').LayoutRectDef;
+
 declare namespace AMP {
   class BaseElement {
     static R1(): boolean;
     static deferredMount(el?: AmpElement): boolean;
     static prerenderAllowed(el?: AmpElement): boolean;
+    static previewAllowed(el?: AmpElement): boolean;
     static usesLoading(el?: AmpElement): boolean;
     static createLoaderLogoCallback(el?: AmpElement): {
       content?: Element;
@@ -23,18 +29,18 @@ declare namespace AMP {
     getDefaultActionAlias(): string | undefined;
     getLayoutPriority(): number;
     updateLayoutPriority(pri: number): void;
-    getLayout(): Layout;
+    getLayout(): Layout_Enum;
     getLayoutBox(): LayoutRect;
     getLayoutSize(): LayoutSize;
     getWin(): Window;
     getAmpDoc(): any;
     getVsync(): any;
     getConsentPolicy(): string | undefined;
-    isLayoutSupported(layout: Layout): boolean;
+    isLayoutSupported(layout: Layout_Enum): boolean;
     isAlwaysFixed(): boolean;
     upgradeCallback(): null | BaseElement | Promise<BaseElement>;
     buildCallback(): void | Promise<void>;
-    preconnectCallback(onLayout?: boolean);
+    preconnectCallback(onLayout?: boolean): void;
     attachedCallback(): void;
     detachedCallback(): void;
     setAsContainer(scroller?: Element): void;
@@ -56,14 +62,14 @@ declare namespace AMP {
     unlayoutOnPause(): boolean;
     reconstructWhenReparented(): boolean;
     loadPromise<T>(element: T): Promise<T>;
-    registerAction(alias: string, handler: any, minTrust: any);
-    registerDefaultAction(handler: any, alias: string, minTrust: any);
+    registerAction(alias: string, handler: any, minTrust: any): void;
+    registerDefaultAction(handler: any, alias: string, minTrust: any): void;
     executeAction(invocation: any, deferred?: boolean): any;
     forwardEvents(events: string | string[], element: Element): any;
     getPlaceholder(): Element;
     togglePlaceholder(state: boolean): void;
     getFallback(): Element | undefined;
-    toggleFallback(state: boolean);
+    toggleFallback(state: boolean): void;
     toggleLoading(state: boolean, force?: boolean): void;
     getOverflowElement(): Element | undefined;
     renderStarted(): void;
@@ -107,35 +113,6 @@ declare namespace AMP {
   ) => void;
 }
 
-// TODO(samouri): Move the types below to better locations.
-declare type AmpElement = HTMLElement;
-
-declare type Layout =
-  | 'nodisplay'
-  | 'fixed'
-  | 'fixed-height'
-  | 'responsive'
-  | 'container'
-  | 'fill'
-  | 'flex-item'
-  | 'fluid'
-  | 'intrinsic';
-
-declare type LayoutSize = {height: number; width: number};
-declare type LayoutRect = {
-  top: number;
-  bottom: number;
-  left: number;
-  right: number;
-  width: number;
-  height: number;
-  x: number;
-  y: number;
-};
-
 type Mutations = {
   [key: string]: null | boolean | string | number | Array<any> | Object;
 };
-
-// TODO:(samouri): correctly type this within src/core/types/object/json
-declare type JsonObject = any;
diff --git a/src/base-element.js b/src/base-element.js
index 47245956968e..c2f1d68889ef 100644
--- a/src/base-element.js
+++ b/src/base-element.js
@@ -1,6 +1,9 @@
-import {ActionTrust, DEFAULT_ACTION} from '#core/constants/action-constants';
+import {
+  ActionTrust_Enum,
+  DEFAULT_ACTION,
+} from '#core/constants/action-constants';
 import {dispatchCustomEvent} from '#core/dom';
-import {Layout, LayoutPriority} from '#core/dom/layout';
+import {LayoutPriority_Enum, Layout_Enum} from '#core/dom/layout';
 import {isArray} from '#core/types';
 import {getWin} from '#core/window';
 
@@ -104,7 +107,7 @@ export class BaseElement {
    * independently handle each of these states internally.
    *
    * @return {boolean}
-   * @nocollapse
+   *
    */
   static R1() {
     return false;
@@ -119,7 +122,7 @@ export class BaseElement {
    *
    * @param {!AmpElement} unusedElement
    * @return {boolean}
-   * @nocollapse
+   *
    */
   static deferredMount(unusedElement) {
     return true;
@@ -135,12 +138,29 @@ export class BaseElement {
    *
    * @param {!AmpElement} unusedElement
    * @return {boolean}
-   * @nocollapse
+   *
    */
   static prerenderAllowed(unusedElement) {
     return false;
   }
 
+  /**
+   * Subclasses can override this method to opt-in into being called to
+   * render when document itself is in preview mode.
+   *
+   * The return value of this function is used to determine whether or not the
+   * element will be built _and_ laid out during preview mode. Therefore, any
+   * changes to the return value _after_ buildCallback() will have no affect.
+   *
+   * Defaults to prerender behavior for most elements.
+   *
+   * @param {!AmpElement} element
+   * @return {boolean}
+   */
+  static previewAllowed(element) {
+    return this.prerenderAllowed(element);
+  }
+
   /**
    * Subclasses can override this method to indicate that an element can load
    * network resources.
@@ -149,7 +169,7 @@ export class BaseElement {
    *
    * @param {!AmpElement} unusedElement
    * @return {boolean}
-   * @nocollapse
+   *
    */
   static usesLoading(unusedElement) {
     return false;
@@ -164,7 +184,7 @@ export class BaseElement {
    *  content: (!Element|undefined),
    *  color: (string|undefined),
    * }}
-   * @nocollapse
+   *
    */
   static createLoaderLogoCallback(unusedElement) {
     return {};
@@ -175,14 +195,14 @@ export class BaseElement {
    *
    * The lower the number, the higher the priority.
    *
-   * The default priority for base elements is LayoutPriority.CONTENT.
+   * The default priority for base elements is LayoutPriority_Enum.CONTENT.
    *
    * @param {!AmpElement} unusedElement
    * @return {number}
-   * @nocollapse
+   *
    */
   static getBuildPriority(unusedElement) {
-    return LayoutPriority.CONTENT;
+    return LayoutPriority_Enum.CONTENT;
   }
 
   /**
@@ -194,7 +214,7 @@ export class BaseElement {
    *
    * @param {!AmpElement} unusedElement
    * @return {?Array<string>}
-   * @nocollapse
+   *
    */
   static getPreconnects(unusedElement) {
     return null;
@@ -206,7 +226,7 @@ export class BaseElement {
    * installed before upgrading and building this class.
    *
    * @return {boolean}
-   * @nocollapse
+   *
    */
   static requiresShadowDom() {
     return false;
@@ -238,7 +258,7 @@ export class BaseElement {
      * trust required to invoke the handler.
      * @private {?Object<string, {
      *   handler: function(!./service/action-impl.ActionInvocation),
-     *   minTrust: ActionTrust,
+     *   minTrust: ActionTrust_Enum,
      * }>} */
     this['actionMap_'] = null;
 
@@ -269,12 +289,12 @@ export class BaseElement {
    *
    * The lower the number, the higher the priority.
    *
-   * The default priority for base elements is LayoutPriority.CONTENT.
+   * The default priority for base elements is LayoutPriority_Enum.CONTENT.
    * @return {number}
    * TODO(#31915): remove once R1 migration is complete.
    */
   getLayoutPriority() {
-    return LayoutPriority.CONTENT;
+    return LayoutPriority_Enum.CONTENT;
   }
 
   /**
@@ -294,7 +314,7 @@ export class BaseElement {
       .updateLayoutPriority(this.element, newLayoutPriority);
   }
 
-  /** @return {!Layout} */
+  /** @return {!Layout_Enum} */
   getLayout() {
     return this.element.getLayout();
   }
@@ -354,14 +374,14 @@ export class BaseElement {
 
   /**
    * Intended to be implemented by subclasses. Tests whether the element
-   * supports the specified layout. By default only Layout.NODISPLAY is
+   * supports the specified layout. By default only Layout_Enum.NODISPLAY is
    * supported.
-   * @param {!Layout} layout
+   * @param {!Layout_Enum} layout
    * @return {boolean}
    * @public
    */
   isLayoutSupported(layout) {
-    return layout == Layout.NODISPLAY;
+    return layout == Layout_Enum.NODISPLAY;
   }
 
   /**
@@ -520,7 +540,7 @@ export class BaseElement {
    *
    * Only used for R1 elements.
    *
-   * @param {!./ready-state.ReadyState} state
+   * @param {!./ready-state.ReadyState_Enum} state
    * @param {*=} opt_failure
    * @final
    */
@@ -664,10 +684,10 @@ export class BaseElement {
    *
    * @param {string} alias
    * @param {function(!./service/action-impl.ActionInvocation)} handler
-   * @param {ActionTrust} minTrust
+   * @param {ActionTrust_Enum} minTrust
    * @public
    */
-  registerAction(alias, handler, minTrust = ActionTrust.DEFAULT) {
+  registerAction(alias, handler, minTrust = ActionTrust_Enum.DEFAULT) {
     initActionMap(this);
     this['actionMap_'][alias] = {handler, minTrust};
   }
@@ -676,13 +696,13 @@ export class BaseElement {
    * Registers the default action for this component.
    * @param {function(!./service/action-impl.ActionInvocation)} handler
    * @param {string=} alias
-   * @param {ActionTrust=} minTrust
+   * @param {ActionTrust_Enum=} minTrust
    * @public
    */
   registerDefaultAction(
     handler,
     alias = DEFAULT_ACTION,
-    minTrust = ActionTrust.DEFAULT
+    minTrust = ActionTrust_Enum.DEFAULT
   ) {
     devAssert(
       !this['defaultActionAlias_'],
diff --git a/src/batched-json.js b/src/batched-json.js
index 548da8b65cdb..54624ff6d2cd 100644
--- a/src/batched-json.js
+++ b/src/batched-json.js
@@ -10,6 +10,7 @@ import {assertHttpsUrl} from './url';
  * Detail of each `options` property:
  * expr - Dot-syntax reference to subdata of JSON result to return. If not specified,
  *     entire JSON result is returned.
+ * url - Url to fetch; defaults to element's `src` attribute
  * urlReplacement - If ALL, replaces all URL vars. If OPT_IN, replaces allowlisted
  *     URL vars. Otherwise, don't expand.
  * refresh - Forces refresh of browser cache.
@@ -20,6 +21,7 @@ import {assertHttpsUrl} from './url';
  *  urlReplacement: (UrlReplacementPolicy_Enum|undefined),
  *  refresh: (boolean|undefined),
  *  xssiPrefix: (string|undefined),
+ *  url: (string|undefined),
  * }}
  */
 export let BatchFetchOptionsDef;
@@ -47,13 +49,14 @@ export const UrlReplacementPolicy_Enum = {
 export function batchFetchJsonFor(ampdoc, element, options = {}) {
   const {
     expr = '.',
-    urlReplacement = UrlReplacementPolicy_Enum.NONE,
     refresh = false,
+    url = element.getAttribute('src'),
+    urlReplacement = UrlReplacementPolicy_Enum.NONE,
     xssiPrefix = undefined,
   } = options;
-  assertHttpsUrl(element.getAttribute('src'), element);
+  assertHttpsUrl(url, element);
   const xhr = Services.batchedXhrFor(ampdoc.win);
-  return requestForBatchFetch(element, urlReplacement, refresh)
+  return requestForBatchFetch(element, url, urlReplacement, refresh)
     .then((data) => {
       return xhr.fetchJson(data.xhrUrl, data.fetchOpt);
     })
@@ -73,14 +76,13 @@ export function batchFetchJsonFor(ampdoc, element, options = {}) {
  * Handles url replacement and constructs the FetchInitJsonDef required for a
  * fetch.
  * @param {!Element} element
+ * @param {string} url
  * @param {!UrlReplacementPolicy_Enum} replacement If ALL, replaces all URL
  *     vars. If OPT_IN, replaces allowlisted URL vars. Otherwise, don't expand.
  * @param {boolean} refresh Forces refresh of browser cache.
  * @return {!Promise<!FetchRequestDef>}
  */
-export function requestForBatchFetch(element, replacement, refresh) {
-  const url = element.getAttribute('src');
-
+export function requestForBatchFetch(element, url, replacement, refresh) {
   // Replace vars in URL if desired.
   const urlReplacements = Services.urlReplacementsForDoc(element);
   const promise =
@@ -91,7 +93,7 @@ export function requestForBatchFetch(element, replacement, refresh) {
   return promise.then((xhrUrl) => {
     // Throw user error if this element is performing URL substitutions
     // without the soon-to-be-required opt-in (#12498).
-    if (replacement == UrlReplacementPolicy_Enum.OPT_IN) {
+    if (replacement === UrlReplacementPolicy_Enum.OPT_IN) {
       const invalid = urlReplacements.collectDisallowedVarsSync(element);
       if (invalid.length > 0) {
         throw user().createError(
diff --git a/src/bento.js b/src/bento.js
deleted file mode 100644
index 525a11a71008..000000000000
--- a/src/bento.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @fileoverview
- * Entry point for `bento.js`
- */
-
-import {install as installCustomElements} from './polyfills/custom-elements';
-
-installCustomElements(self);
-
-const BENTO = self.BENTO || [];
-
-BENTO.push = (fn) => {
-  fn();
-};
-
-// eslint-disable-next-line local/window-property-name
-self.BENTO = BENTO;
-
-for (let i = 0; i < BENTO.length; i++) {
-  BENTO.push(BENTO[i]);
-}
diff --git a/src/bento/OWNERS b/src/bento/OWNERS
new file mode 100644
index 000000000000..63d5b73fcf08
--- /dev/null
+++ b/src/bento/OWNERS
@@ -0,0 +1,13 @@
+// For an explanation of the OWNERS rules and syntax, see:
+// https://github.com/ampproject/amp-github-apps/blob/main/owners/OWNERS.example
+
+{
+  rules: [
+    {
+      owners: [
+        {name: 'ampproject/wg-components'},
+        {name: 'ampproject/wg-infra'},
+      ],
+    },
+  ],
+}
diff --git a/extensions/amp-brightcove/brightcove-api.js b/src/bento/apis/brightcove-api.js
similarity index 80%
rename from extensions/amp-brightcove/brightcove-api.js
rename to src/bento/apis/brightcove-api.js
index 79c5af260245..25ace4b935d0 100644
--- a/extensions/amp-brightcove/brightcove-api.js
+++ b/src/bento/apis/brightcove-api.js
@@ -1,5 +1,5 @@
-import {addParamsToUrl} from '../../src/url';
-import {VideoEvents} from '../../src/video-interface';
+import {addParamsToUrl} from '../../url';
+import {VideoEvents_Enum} from '../../video-interface';
 
 /**
  * Maps events coming from the Brightcove frame to events to be dispatched from the
@@ -8,15 +8,15 @@ import {VideoEvents} from '../../src/video-interface';
  * If the item does not have a value, the event will not be forwarded 1:1, but
  * it will be listened to.
  *
- * @const {!Object<string, ?string>}
+ * @const {!{[key: string]: ?string}}
  */
 export const BRIGHTCOVE_EVENTS = {
-  'playing': VideoEvents.PLAYING,
-  'pause': VideoEvents.PAUSE,
-  'ended': VideoEvents.ENDED,
-  'ads-ad-started': VideoEvents.AD_START,
-  'ads-ad-ended': VideoEvents.AD_END,
-  'loadedmetadata': VideoEvents.LOADEDMETADATA,
+  'playing': VideoEvents_Enum.PLAYING,
+  'pause': VideoEvents_Enum.PAUSE,
+  'ended': VideoEvents_Enum.ENDED,
+  'ads-ad-started': VideoEvents_Enum.AD_START,
+  'ads-ad-ended': VideoEvents_Enum.AD_END,
+  'loadedmetadata': VideoEvents_Enum.LOADEDMETADATA,
 };
 
 /**
diff --git a/src/bento/apis/dailymotion-api.js b/src/bento/apis/dailymotion-api.js
new file mode 100644
index 000000000000..a5c0478a0129
--- /dev/null
+++ b/src/bento/apis/dailymotion-api.js
@@ -0,0 +1,89 @@
+import {isAutoplaySupported} from '#core/dom/video';
+
+import {addParamsToUrl} from '../../url';
+
+/**
+ *
+ * @param {!Window} win
+ * @param {string} videoId
+ * @param {boolean|undefined} autoplay
+ * @param {boolean|undefined} endscreenEnable
+ * @param {boolean|undefined} info
+ * @param {boolean|undefined} mute
+ * @param {boolean|undefined} sharingEnable
+ * @param {string|undefined} start
+ * @param {string|undefined} uiHighlight
+ * @param {boolean|undefined} uiLogo
+ * @param {!JsonObject} implicitParams
+ * @return {string}
+ */
+export function getDailymotionIframeSrc(
+  win,
+  videoId,
+  autoplay = false,
+  endscreenEnable = true,
+  info = true,
+  mute = false,
+  sharingEnable = true,
+  start,
+  uiHighlight,
+  uiLogo = true,
+  implicitParams
+) {
+  return addParamsToUrl(
+    `https://www.dailymotion.com/embed/video/${encodeURIComponent(
+      videoId
+    )}?api=1&html=1&app=amp`,
+    {
+      'endscreen-enable': !endscreenEnable ? endscreenEnable : undefined,
+      'info': !info ? info : undefined,
+      'mute': mute || (autoplay && isAutoplaySupported(win)) ? 1 : undefined,
+      'sharing-enable': !sharingEnable ? sharingEnable : undefined,
+      'start': start,
+      'ui-highlight': uiHighlight,
+      'ui-logo': !uiLogo ? uiLogo : undefined,
+      ...implicitParams,
+    }
+  );
+}
+
+/**
+ * @param {string} command
+ * @param {?boolean} param
+ * @return {string}
+ */
+export function makeDailymotionMessage(command, param) {
+  return JSON.stringify({
+    'command': command,
+    'parameters': param,
+  });
+}
+
+/**
+ * Player events reverse-engineered from the Dailymotion API
+ * NOTE: 'unstarted' isn't part of the API, just a placeholder
+ * as an initial state
+ *
+ * @enum {string}
+ */
+export const DailymotionEvents = {
+  UNSTARTED: 'unstarted',
+  API_READY: 'apiready',
+  // Events fired for both the original content or ads
+  START: 'start',
+  PLAY: 'play',
+  PAUSE: 'pause',
+  END: 'end',
+  // Events fired only for ads
+  AD_START: 'ad_start',
+  AD_PLAY: 'ad_play',
+  AD_PAUSE: 'ad_pause',
+  AD_END: 'ad_end',
+  // Events fired only for the original content
+  VIDEO_START: 'video_start',
+  VIDEO_END: 'video_end',
+  // Other events
+  VOLUMECHANGE: 'volumechange',
+  STARTED_BUFFERING: 'progress',
+  FULLSCREEN_CHANGE: 'fullscreenchange',
+};
diff --git a/extensions/amp-jwplayer/1.0/jwplayer-api.js b/src/bento/apis/jwplayer-api.js
similarity index 95%
rename from extensions/amp-jwplayer/1.0/jwplayer-api.js
rename to src/bento/apis/jwplayer-api.js
index 2f8b975f83a1..dfc20c89f4db 100644
--- a/extensions/amp-jwplayer/1.0/jwplayer-api.js
+++ b/src/bento/apis/jwplayer-api.js
@@ -1,4 +1,4 @@
-import {addParamsToUrl} from '../../../src/url';
+import {addParamsToUrl} from '../../url';
 
 /**
  * Makes iframe src url
@@ -8,7 +8,7 @@ import {addParamsToUrl} from '../../../src/url';
  * @param {string} contentSearch
  * @param {string} contentRecency
  * @param {boolean} contentBackfill
- * @param {Object} queryParams
+ * @param {object} queryParams
  * @param {{policyInfo, policyMetadata, policyState}} consentParams
  * @return {string} iframe src
  */
diff --git a/src/bento/apis/video-iframe-api.js b/src/bento/apis/video-iframe-api.js
new file mode 100644
index 000000000000..a62343b39210
--- /dev/null
+++ b/src/bento/apis/video-iframe-api.js
@@ -0,0 +1,24 @@
+import {VideoEvents_Enum} from '../../video-interface';
+
+/**
+ * @fileoverview
+ * Definitions of messages and other utilities to talk to an iframe that embeds
+ * the amp-video-iframe integration script.
+ * See https://go.amp.dev/c/amp-video-iframe#integration-inside-the-frame
+ */
+
+// ⚠️ This module should not have side-effects.
+
+/**
+ * Events allowed to be dispatched from messages.
+ * @private @const
+ */
+export const BUBBLE_MESSAGE_EVENTS = [
+  VideoEvents_Enum.PLAYING,
+  VideoEvents_Enum.PAUSE,
+  VideoEvents_Enum.ENDED,
+  VideoEvents_Enum.MUTED,
+  VideoEvents_Enum.UNMUTED,
+  VideoEvents_Enum.AD_START,
+  VideoEvents_Enum.AD_END,
+];
diff --git a/extensions/amp-vimeo/vimeo-api.js b/src/bento/apis/vimeo-api.js
similarity index 77%
rename from extensions/amp-vimeo/vimeo-api.js
rename to src/bento/apis/vimeo-api.js
index abf2aa80e666..d6507e592b35 100644
--- a/extensions/amp-vimeo/vimeo-api.js
+++ b/src/bento/apis/vimeo-api.js
@@ -1,8 +1,6 @@
-import {dict} from '#core/types/object';
-
-import {postMessageWhenAvailable} from '../../src/iframe-video';
-import {addParamsToUrl} from '../../src/url';
-import {VideoEvents} from '../../src/video-interface';
+import {postMessageWhenAvailable} from '../../iframe-video';
+import {addParamsToUrl} from '../../url';
+import {VideoEvents_Enum} from '../../video-interface';
 
 /**
  * @fileoverview
@@ -22,12 +20,12 @@ export const getVimeoOriginRegExp = () =>
  * If the item does not have a value, the event will not be forwarded 1:1, but
  * it will be listened to.
  *
- * @const {!Object<string, ?string>}
+ * @const {!{[key: string]: ?string}}
  */
 export const VIMEO_EVENTS = {
-  'play': VideoEvents.PLAYING,
-  'pause': VideoEvents.PAUSE,
-  'ended': VideoEvents.ENDED,
+  'play': VideoEvents_Enum.PLAYING,
+  'pause': VideoEvents_Enum.PAUSE,
+  'ended': VideoEvents_Enum.ENDED,
   'volumechange': null,
 };
 
@@ -40,10 +38,10 @@ export const VIMEO_EVENTS = {
 export function getVimeoIframeSrc(videoid, autoplay, doNotTrack) {
   return addParamsToUrl(
     `https://player.vimeo.com/video/${encodeURIComponent(videoid)}`,
-    dict({
+    {
       'dnt': doNotTrack ? '1' : undefined,
       'muted': autoplay ? '1' : undefined,
-    })
+    }
   );
 }
 
@@ -53,12 +51,10 @@ export function getVimeoIframeSrc(videoid, autoplay, doNotTrack) {
  * @return {string}
  */
 export function makeVimeoMessage(method, params = '') {
-  return JSON.stringify(
-    dict({
-      'method': method,
-      'value': params,
-    })
-  );
+  return JSON.stringify({
+    'method': method,
+    'value': params,
+  });
 }
 
 /**
diff --git a/src/bento/bento.js b/src/bento/bento.js
new file mode 100644
index 000000000000..43fe1e215f9d
--- /dev/null
+++ b/src/bento/bento.js
@@ -0,0 +1,21 @@
+/**
+ * @fileoverview
+ * Entry point for `bento.js`
+ */
+
+import {isEsm} from '#core/mode';
+
+import {install as installCustomElements} from '#polyfills/custom-elements';
+
+if (!isEsm()) {
+  installCustomElements(self, class {});
+}
+
+export * from '#core/context';
+export * from '#preact';
+export * from '#preact/base-element';
+export * from '#preact/bento-ce';
+export * from '#preact/compat';
+export * from '#preact/component';
+export * from '#preact/context';
+export * from '#preact/slot';
diff --git a/src/bento/components/bento-accordion/1.0/README.md b/src/bento/components/bento-accordion/1.0/README.md
new file mode 100644
index 000000000000..c5f633fe5eb1
--- /dev/null
+++ b/src/bento/components/bento-accordion/1.0/README.md
@@ -0,0 +1,746 @@
+# Bento Accordion
+
+Displays content sections that can be collapsed and expanded. This component provides a way for viewers to glance at the content outline and jump to any section. Effective use reduces scrolling needs on mobile devices.
+
+-   A Bento Accordion accepts one or more `<section>` elements as its direct children.
+-   Each `<section>` must contain exactly two direct children.
+-   The first child in a `<section>` is the heading for that section of the Bento Accordion. It must be a heading element such as `<h1>-<h6>` or `<header>`.
+-   The second child in a `<section>` is the expandable/collapsible content.
+    -   It can be any tag allowed in [AMP HTML](https://github.com/ampproject/amphtml/blob/main/docs/spec/amp-html-format.md).
+-   A click or tap on a `<section>` heading expands or collapses the section.
+-   A Bento Accordion with a defined `id` preserves the collapsed or expanded state of each section while the user remains on your domain.
+
+## Web Component
+
+You must include each Bento component's required CSS library to guarantee proper loading and before adding custom styles. Or use the light-weight pre-upgrade styles available inline. See [Layout and style](#layout-and-style).
+
+### Import via npm
+
+```sh
+npm install @bentoproject/accordion
+```
+
+```javascript
+import {defineElement as defineBentoAccordion} from '@bentoproject/accordion';
+defineBentoAccordion();
+```
+
+### Include via `<script>`
+
+```html
+<script type="module" src="https://cdn.ampproject.org/bento.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/bento.js" crossorigin="anonymous"></script>
+<script type="module" src="https://cdn.ampproject.org/v0/bento-accordion-1.0.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/v0/bento-accordion-1.0.js" crossorigin="anonymous"></script>
+<link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-accordion-1.0.css" crossorigin="anonymous">
+```
+
+### Example
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-accordion-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-accordion-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-accordion-1.0.css"
+    />
+  </head>
+  <body>
+    <bento-accordion id="my-accordion">
+      <section>
+        <h2>Section 1</h2>
+        <div>Content in section 1.</div>
+      </section>
+      <section>
+        <h2>Section 2</h2>
+        <div>Content in section 2.</div>
+      </section>
+       <!-- Expanded on page load due to attribute: -->
+      <section expanded>
+        <h2>Section 3</h2>
+        <div>Content in section 3.</div>
+      </section>
+    </bento-accordion>
+  </body>
+</html>
+```
+
+### Interactivity and API usage
+
+Bento components are highly interactive through their API. The `bento-accordion` component API is accessible by including the following script tag in your document:
+
+```javascript
+await customElements.whenDefined('bento-accordion');
+const api = await accordion.getApi();
+```
+
+#### API Example
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-accordion-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-accordion-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-accordion-1.0.css"
+    />
+  </head>
+  <body>
+    <bento-accordion id="my-accordion">
+      <section>
+        <h2>Section 1</h2>
+        <div>Content in section 1.</div>
+      </section>
+      <section>
+        <h2>Section 2</h2>
+        <div>Content in section 2.</div>
+      </section>
+       <!-- Expanded on page load due to attribute: -->
+      <section expanded>
+        <h2>Section 3</h2>
+        <div>Content in section 3.</div>
+      </section>
+    </bento-accordion>
+    <script>
+      (async () => {
+        const accordion = document.querySelector('#my-accordion');
+        await customElements.whenDefined('bento-accordion');
+        const api = await accordion.getApi();
+
+        // programatically expand all sections
+        api.expand();
+        // programatically collapse all sections
+        api.collapse();
+      })();
+    </script>
+  </body>
+</html>
+```
+
+#### Actions
+
+##### toggle()
+
+The `toggle` action switches the `expanded` and `collapsed` states of `bento-accordion` sections. When called with no arguments, it toggles all sections of the accordion. To specify a specific section, add the `section` argument and use its corresponding `id` as the value.
+
+```html
+<bento-accordion id="myAccordion">
+  <section id="section1">
+    <h2>Section 1</h2>
+    <div>Bunch of awesome content</div>
+  </section>
+  <section>
+    <h2>Section 2</h2>
+    <div>Bunch of awesome content</div>
+  </section>
+  <section>
+    <h2>Section 3</h2>
+    <div>Bunch of awesome content</div>
+  </section>
+</bento-accordion>
+<button id="button1">Toggle All Sections</button>
+<button id="button2">Toggle Section 1</button>
+<script>
+  (async () => {
+    const accordion = document.querySelector('#myAccordion');
+    await customElements.whenDefined('bento-accordion');
+    const api = await accordion.getApi();
+
+    // set up button actions
+    document.querySelector('#button1').onclick = () => {
+      api.toggle();
+    };
+    document.querySelector('#button2').onclick = () => {
+      api.toggle('section1');
+    };
+  })();
+</script>
+```
+
+##### expand()
+
+The `expand` action expands the sections of the `bento-accordion`. If a section is already expanded, it stays expanded. When called with no arguments, it expands all sections of the accordion. To specify a section, add the `section` argument, and use its corresponding `id` as the value.
+
+```html
+<bento-accordion id="myAccordion">
+  <section id="section1">
+    <h2>Section 1</h2>
+    <div>Bunch of awesome content</div>
+  </section>
+  <section>
+    <h2>Section 2</h2>
+    <div>Bunch of awesome content</div>
+  </section>
+  <section>
+    <h2>Section 3</h2>
+    <div>Bunch of awesome content</div>
+  </section>
+</bento-accordion>
+<button id="button1">Expand All Sections</button>
+<button id="button2">Expand Section 1</button>
+<script>
+  (async () => {
+    const accordion = document.querySelector('#myAccordion');
+    await customElements.whenDefined('bento-accordion');
+    const api = await accordion.getApi();
+
+    // set up button actions
+    document.querySelector('#button1').onclick = () => {
+      api.expand();
+    };
+    document.querySelector('#button2').onclick = () => {
+      api.expand('section1');
+    };
+  })();
+</script>
+```
+
+##### collapse()
+
+The `collapse` action collapses the sections of the `bento-accordion`. If a section is already collapsed, it stays collapsed. When called with no arguments, it collapses all sections of the accordion. To specify a section, add the `section` argument, and use its corresponding `id` as the value.
+
+```html
+<bento-accordion id="myAccordion">
+  <section id="section1">
+    <h2>Section 1</h2>
+    <div>Bunch of awesome content</div>
+  </section>
+  <section>
+    <h2>Section 2</h2>
+    <div>Bunch of awesome content</div>
+  </section>
+  <section>
+    <h2>Section 3</h2>
+    <div>Bunch of awesome content</div>
+  </section>
+</bento-accordion>
+<button id="button1">Collapse All Sections</button>
+<button id="button2">Collapse Section 1</button>
+<script>
+  (async () => {
+    const accordion = document.querySelector('#myAccordion');
+    await customElements.whenDefined('bento-accordion');
+    const api = await accordion.getApi();
+
+    // set up button actions
+    document.querySelector('#button1').onclick = () => {
+      api.collapse();
+    };
+    document.querySelector('#button2').onclick = () => {
+      api.collapse('section1');
+    };
+  })();
+</script>
+```
+
+#### Events
+
+The `bento-accordion` API allows you to register and respond to the following events:
+
+##### expand
+
+This event is triggered when an accordion section is expanded and is dispatched from the expanded section.
+
+See below for example.
+
+##### collapse
+
+This event is triggered when an accordion section is collapsed and is dispatched from the collapsed section.
+
+In the example below, `section 1` listens for the `expand` event and expands `section 2` when it is expanded. `section 2` listens for the `collapse` event and collapses `section 1` when it is collapsed.
+
+See below for example.
+
+##### Events Example
+
+```html
+<bento-accordion id="eventsAccordion" animate>
+  <section id="section1">
+    <h2>Section 1</h2>
+    <div>Puppies are cute.</div>
+  </section>
+  <section id="section2">
+    <h2>Section 2</h2>
+    <div>Kittens are furry.</div>
+  </section>
+</bento-accordion>
+
+<script>
+  (async () => {
+    const accordion = document.querySelector('#eventsAccordion');
+    await customElements.whenDefined('bento-accordion');
+    const api = await accordion.getApi();
+
+    // when section 1 expands, section 2 also expands
+    // when section 2 collapses, section 1 also collapses
+    const section1 = document.querySelector('#section1');
+    const section2 = document.querySelector('#section2');
+    section1.addEventListener('expand', () => {
+      api.expand('section2');
+    });
+    section2.addEventListener('collapse', () => {
+      api.collapse('section1');
+    });
+  })();
+</script>
+```
+
+### Layout and style
+
+Each Bento component has a small CSS library you must include to guarantee proper loading without [content shifts](https://web.dev/cls/). Because of order-based specificity, you must manually ensure that stylesheets are included before any custom styles.
+
+```html
+<link
+  rel="stylesheet"
+  type="text/css"
+  href="https://cdn.ampproject.org/v0/bento-accordion-1.0.css"
+/>
+```
+
+Alternatively, you may also make the light-weight pre-upgrade styles available inline:
+
+```html
+<style>
+  bento-accordion {
+    display: block;
+    contain: layout;
+  }
+
+  bento-accordion,
+  bento-accordion > section,
+  bento-accordion > section > :first-child {
+    margin: 0;
+  }
+
+  bento-accordion > section > * {
+    display: block;
+    float: none;
+    overflow: hidden; /* clearfix */
+    position: relative;
+  }
+
+  @media (min-width: 1px) {
+    :where(bento-accordion > section) > :first-child {
+      cursor: pointer;
+      background-color: #efefef;
+      padding-right: 20px;
+      border: 1px solid #dfdfdf;
+    }
+  }
+
+  .i-amphtml-accordion-header {
+    cursor: pointer;
+    background-color: #efefef;
+    padding-right: 20px;
+    border: 1px solid #dfdfdf;
+  }
+
+  bento-accordion
+    > section:not([expanded])
+    > :last-child:not(.i-amphtml-animating),
+  bento-accordion
+    > section:not([expanded])
+    > :last-child:not(.i-amphtml-animating)
+    * {
+    display: none !important;
+  }
+</style>
+```
+
+### Attributes
+
+#### animate
+
+Include the `animate` attribute in `<bento-accordion>` to add a "roll down" animation when the content is expanded and "roll up" animation when collapsed.
+
+This attribute can be configured to based on a [media query](./../../../../../docs/spec/amp-html-responsive-attributes.md).
+
+```html
+<bento-accordion animate>
+  <section>
+    <h2>Section 1</h2>
+    <div>Content in section 1.</div>
+  </section>
+  <section>
+    <h2>Section 2</h2>
+    <div>Content in section 2.</div>
+  </section>
+  <section>
+    <h2>Section 3</h2>
+    <div>Content in section 2.</div>
+  </section>
+</bento-accordion>
+```
+
+#### expanded
+
+Apply the `expanded` attribute to a nested `<section>` to expand that section when the page loads.
+
+```html
+<bento-accordion>
+  <section id="section1">
+    <h2>Section 1</h2>
+    <div>Bunch of awesome content</div>
+  </section>
+  <section id="section2">
+    <h2>Section 2</h2>
+    <div>Bunch of awesome content</div>
+  </section>
+  <section id="section3" expanded>
+    <h2>Section 3</h2>
+    <div>Bunch of awesome expanded content</div>
+  </section>
+</bento-accordion>
+```
+
+#### expand-single-section
+
+Allow only one section to expand at a time by applying the `expand-single-section` attribute to the `<bento-accordion>` element. This means if a user taps on a collapsed `<section>`, it will expand and collapse other expanded `<section>`'s.
+
+```html
+<bento-accordion expand-single-section>
+  <section>
+    <h2>Section 1</h2>
+    <div>Content in section 1.</div>
+  </section>
+  <section>
+    <h2>Section 2</h2>
+    <div>Content in section 2.</div>
+  </section>
+  <section>
+    <h2>Section 3</h2>
+    <img
+      src="https://source.unsplash.com/random/320x256"
+      width="320"
+      height="256"
+    />
+  </section>
+</bento-accordion>
+```
+
+### Styling
+
+You may use the `bento-accordion` element selector to style the accordion freely.
+
+Keep the following points in mind when you style an accordion:
+
+-   `bento-accordion` elements are always `display: block`.
+-   `float` cannot style a `<section>`, heading, nor content elements.
+-   An expanded section applies the `expanded` attribute to the `<section>` element.
+-   The content element is clear-fixed with `overflow: hidden` and hence cannot have scrollbars.
+-   Margins of the `<bento-accordion>`, `<section>`, heading, and content elements are set to `0`, but can be overridden in custom styles.
+-   Both the header and content elements are `position: relative`.
+
+---
+
+## Preact/React Component
+
+### Import via npm
+
+```sh
+npm install @bentoproject/accordion
+```
+
+### Example
+
+<!--% example %-->
+
+```jsx
+import React from 'react';
+import {
+  BentoAccordion,
+  BentoAccordionSection,
+  BentoAccordionHeader,
+  BentoAccordionContent
+} from '@bentoproject/accordion/react';
+import '@bentoproject/accordion/styles.css';
+
+function App() {
+  return (
+    <BentoAccordion>
+      <BentoAccordionSection key={1}>
+        <BentoAccordionHeader>
+          <h1>Section 1</h1>
+        </BentoAccordionHeader>
+        <BentoAccordionContent>Content 1</BentoAccordionContent>
+      </BentoAccordionSection>
+
+      <BentoAccordionSection key={2}>
+        <BentoAccordionHeader>
+          <h1>Section 2</h1>
+        </BentoAccordionHeader>
+        <BentoAccordionContent>Content 2</BentoAccordionContent>
+      </BentoAccordionSection>
+
+      <BentoAccordionSection key={3}>
+        <BentoAccordionHeader>
+          <h1>Section 3</h1>
+        </BentoAccordionHeader>
+        <BentoAccordionContent>Content 3</BentoAccordionContent>
+      </BentoAccordionSection>
+    </BentoAccordion>
+  );
+}
+```
+
+### Interactivity and API usage
+
+Bento components are highly interactive through their API. The `BentoAccordion` component API is accessible by passing a `ref`:
+
+```jsx
+import React, {createRef} from 'react';
+const ref = createRef();
+
+function App() {
+  return (
+    <BentoAccordion ref={ref}>
+      <BentoAccordionSection id="section1" key={1}>
+        <BentoAccordionHeader>
+          <h1>Section 1</h1>
+        </BentoAccordionHeader>
+        <BentoAccordionContent>Content 1</BentoAccordionContent>
+      </BentoAccordionSection>
+
+      <BentoAccordionSection id="section2" key={2}>
+        <BentoAccordionHeader>
+          <h1>Section 2</h1>
+        </BentoAccordionHeader>
+        <BentoAccordionContent>Content 2</BentoAccordionContent>
+      </BentoAccordionSection>
+
+      <BentoAccordionSection id="section3" key={3}>
+        <BentoAccordionHeader>
+          <h1>Section 3</h1>
+        </BentoAccordionHeader>
+        <BentoAccordionContent>Content 3</BentoAccordionContent>
+      </BentoAccordionSection>
+    </BentoAccordion>
+  );
+}
+```
+
+#### Actions
+
+The `BentoAccordion` API allows you to perform the following actions:
+
+##### toggle()
+
+The `toggle` action switches the `expanded` and `collapsed` states of `bento-accordion` sections. When called with no arguments, it toggles all sections of the accordion. To specify a specific section, add the `section` argument and use its corresponding `id` as the value.
+
+```javascript
+ref.current.toggle();
+ref.current.toggle('section1');
+```
+
+##### expand()
+
+The `expand` action expands the sections of the `bento-accordion`. If a section is already expanded, it stays expanded. When called with no arguments, it expands all sections of the accordion. To specify a section, add the `section` argument, and use its corresponding `id` as the value.
+
+```javascript
+ref.current.expand();
+ref.current.expand('section1');
+```
+
+##### collapse()
+
+The `collapse` action collapses the sections of the `bento-accordion`. If a section is already collapsed, it stays collapsed. When called with no arguments, it collapses all sections of the accordion. To specify a section, add the `section` argument, and use its corresponding `id` as the value.
+
+```javascript
+ref.current.collapse();
+ref.current.collapse('section1');
+```
+
+#### Events
+
+The Bento Accordion API allows you to respond to the following events:
+
+##### onExpandStateChange
+
+This event is triggered on a section when an accordion section is expanded or collpased and is dispatched from the expanded section.
+
+See [example](#events-example) below for example.
+
+##### onCollapse
+
+This event is triggered on a section when an accordion section is collapsed and is dispatched from the collapsed section.
+
+In the example below, `section 1` listens for the `expand` event and expands `section 2` when it is expanded. `section 2` listens for the `collapse` event and collapses `section 1` when it is collapsed.
+
+See [example](#events-example) below for example.
+
+##### Events Example
+
+<!--% example %-->
+
+```jsx
+import React, {createRef} from 'react';
+import {
+  BentoAccordion,
+  BentoAccordionSection,
+  BentoAccordionHeader,
+  BentoAccordionContent
+} from '@bentoproject/accordion/react';
+import '@bentoproject/accordion/styles.css';
+
+
+function App() {
+  const ref = createRef();
+  return (
+    <BentoAccordion ref={ref}>
+      <BentoAccordionSection
+        id="section1"
+        key={1}
+        onExpandStateChange={(expanded) => {
+          alert(expanded ?  'section1 expanded' : 'section1 collapsed');
+        }}
+      >
+        <BentoAccordionHeader>
+          <h1>Section 1</h1>
+        </BentoAccordionHeader>
+        <BentoAccordionContent>Content 1</BentoAccordionContent>
+      </BentoAccordionSection>
+
+      <BentoAccordionSection
+        id="section2"
+        key={2}
+        onExpandStateChange={(expanded) => {
+          alert(expanded ?  'section2 expanded' : 'section2 collapsed');
+        }}
+      >
+        <BentoAccordionHeader>
+          <h1>Section 2</h1>
+        </BentoAccordionHeader>
+        <BentoAccordionContent>Content 2</BentoAccordionContent>
+      </BentoAccordionSection>
+
+      <BentoAccordionSection
+        id="section3"
+        key={3}
+        onExpandStateChange={(expanded) => {
+          alert(expanded ?  'section3 expanded' : 'section3 collapsed');
+        }}
+      >
+        <BentoAccordionHeader>
+          <h1>Section 3</h1>
+        </BentoAccordionHeader>
+        <BentoAccordionContent>Content 3</BentoAccordionContent>
+      </BentoAccordionSection>
+    </BentoAccordion>
+  )
+}
+```
+
+### Layout and style
+
+#### Container type
+
+The `BentoAccordion` component has a defined layout size type. To ensure the component renders correctly, be sure to apply a size to the component and its immediate children via a desired CSS layout (such as one defined with `height`, `width`, `aspect-ratio`, or other such properties). These can be applied inline:
+
+```jsx
+<BentoAccordion style={{width: 300, height: 100}}>...</BentoAccordion>
+```
+
+Or via `className`:
+
+```jsx
+<BentoAccordion className="custom-styles">...</BentoAccordion>
+```
+
+```css
+.custom-styles {
+  background-color: red;
+}
+```
+
+### Props
+
+#### BentoAccordion
+
+##### animate
+
+If true, then uses "roll-down" / "roll-up" animation during the expansion and collapse of each section.
+
+Default: `false`
+
+##### expandSingleSection
+
+If true, then expanding 1 section will automatically collapse all other sections.
+
+Default: `false`
+
+#### BentoAccordionSection
+
+##### animate
+
+If true, then uses "roll-down" / "roll-up" animation during the expansion and collapse the section.
+
+Default: `false`
+
+##### expanded
+
+If true, expands the section.
+
+Default: `false`
+
+##### onExpandStateChange
+
+```typescript
+(expanded: boolean): void
+```
+
+Callback to listen for expand state changes. Takes a boolean flag as parameter indicating whether the section was just expanded (`false` indicates it was collapsed)
+
+#### BentoAccordionHeader
+
+#### Common props
+
+This component supports the [common props](../../../../../docs/spec/bento-common-props.md) for React and Preact components.
+
+BentoAccordionHeader does not yet support any custom props
+
+#### BentoAccordionContent
+
+#### Common props
+
+This component supports the [common props](../../../../../docs/spec/bento-common-props.md) for React and Preact components.
+
+BentoAccordionContent does not yet support any custom props
diff --git a/extensions/amp-accordion/1.0/animations.js b/src/bento/components/bento-accordion/1.0/animations.js
similarity index 100%
rename from extensions/amp-accordion/1.0/animations.js
rename to src/bento/components/bento-accordion/1.0/animations.js
diff --git a/src/bento/components/bento-accordion/1.0/base-element.js b/src/bento/components/bento-accordion/1.0/base-element.js
new file mode 100644
index 000000000000..d73bd91541d2
--- /dev/null
+++ b/src/bento/components/bento-accordion/1.0/base-element.js
@@ -0,0 +1,221 @@
+import {devAssert} from '#core/assert';
+import {toggleAttribute} from '#core/dom';
+import {childElementsByTag} from '#core/dom/query';
+import {toArray} from '#core/types/array';
+import {memo} from '#core/types/object';
+
+import * as Preact from '#preact';
+import {useLayoutEffect, useRef} from '#preact';
+import {PreactBaseElement} from '#preact/base-element';
+import {forwardRef} from '#preact/compat';
+import {useDOMHandle} from '#preact/component';
+import {useSlotContext} from '#preact/slot';
+
+import {
+  BentoAccordion,
+  BentoAccordionContent,
+  BentoAccordionHeader,
+  BentoAccordionSection,
+} from './component';
+
+const HEADER_SHIM_PROP = '__AMP_H_SHIM';
+const CONTENT_SHIM_PROP = '__AMP_C_SHIM';
+const SECTION_POST_RENDER = '__AMP_PR';
+const EXPAND_STATE_SHIM_PROP = '__AMP_EXPAND_STATE_SHIM';
+
+/** @extends {PreactBaseElement<BentoAccordionDef.AccordionApi>} */
+export class BaseElement extends PreactBaseElement {
+  /** @override */
+  init() {
+    const getExpandStateTrigger = (section) => (expanded) => {
+      toggleAttribute(section, 'expanded', expanded);
+      section[SECTION_POST_RENDER]?.();
+      this.triggerEvent(section, expanded ? 'expand' : 'collapse');
+    };
+
+    const {element} = this;
+    const mu = new MutationObserver(() => {
+      this.mutateProps(getState(element, mu, getExpandStateTrigger));
+    });
+    mu.observe(element, {
+      attributeFilter: ['expanded', 'id'],
+      subtree: true,
+      childList: true,
+    });
+
+    const {'children': children} = getState(element, mu, getExpandStateTrigger);
+    return {
+      'children': children,
+    };
+  }
+}
+
+/**
+ * @param {!Element} element
+ * @param {MutationObserver} mu
+ * @param {!Function} getExpandStateTrigger
+ * @return {!JsonObject}
+ */
+function getState(element, mu, getExpandStateTrigger) {
+  const sections = toArray(childElementsByTag(element, 'section'));
+
+  const children = sections.map((section) => {
+    // TODO(wg-bento): This implementation causes infinite loops on DOM mutation.
+    // See https://github.com/ampproject/amp-react-prototype/issues/40.
+    if (!section[SECTION_POST_RENDER]) {
+      section[SECTION_POST_RENDER] = () => mu.takeRecords();
+    }
+
+    const headerShim = memo(section, HEADER_SHIM_PROP, bindHeaderShimToElement);
+    const contentShim = memo(
+      section,
+      CONTENT_SHIM_PROP,
+      bindContentShimToElement
+    );
+    const expandStateShim = memo(
+      section,
+      EXPAND_STATE_SHIM_PROP,
+      getExpandStateTrigger
+    );
+    const sectionProps = {
+      'key': section,
+      'expanded': section.hasAttribute('expanded'),
+      'id': section.getAttribute('id'),
+      'onExpandStateChange': expandStateShim,
+    };
+    // For headerProps and contentProps:
+    // || undefined needed for the `role` attribute since an element w/o
+    // role results in `null`.  When `null` is passed into Preact, the
+    // default prop value is not used.  `undefined` triggers default prop
+    // value.  This is not needed for `id` since this is handled with
+    // explicit logic (not default prop value) and all falsy values are
+    // handled the same.
+    const headerProps = {
+      'as': headerShim,
+      'id': section.firstElementChild.getAttribute('id'),
+      'role': section.firstElementChild.getAttribute('role') || undefined,
+    };
+    const contentProps = {
+      'as': contentShim,
+      'id': section.lastElementChild.getAttribute('id'),
+      'role': section.lastElementChild.getAttribute('role') || undefined,
+    };
+    return (
+      <BentoAccordionSection {...sectionProps}>
+        <BentoAccordionHeader {...headerProps}></BentoAccordionHeader>
+        <BentoAccordionContent {...contentProps}></BentoAccordionContent>
+      </BentoAccordionSection>
+    );
+  });
+  return {'children': children};
+}
+
+/**
+ * @param {!Element} sectionElement
+ * @param {!BentoAccordionDef.HeaderShimProps} props
+ * @return {PreactDef.Renderable}
+ */
+function HeaderShim(
+  sectionElement,
+  {
+    'aria-controls': ariaControls,
+    'aria-expanded': ariaExpanded,
+    id,
+    onClick,
+    role,
+  }
+) {
+  const headerElement = sectionElement.firstElementChild;
+  useLayoutEffect(() => {
+    if (!headerElement || !onClick) {
+      return;
+    }
+    headerElement.setAttribute('id', id);
+    headerElement.classList.add('i-amphtml-accordion-header');
+    headerElement.addEventListener('click', onClick);
+    if (!headerElement.hasAttribute('tabindex')) {
+      headerElement.setAttribute('tabindex', 0);
+    }
+    headerElement.setAttribute('aria-expanded', ariaExpanded);
+    headerElement.setAttribute('aria-controls', ariaControls);
+    headerElement.setAttribute('role', role);
+    if (sectionElement[SECTION_POST_RENDER]) {
+      sectionElement[SECTION_POST_RENDER]();
+    }
+    return () => {
+      headerElement.removeEventListener('click', devAssert(onClick));
+    };
+  }, [
+    sectionElement,
+    headerElement,
+    id,
+    role,
+    onClick,
+    ariaControls,
+    ariaExpanded,
+  ]);
+  return <header />;
+}
+
+/**
+ * @param {!Element} element
+ * @return {function(!BentoAccordionDef.HeaderProps):PreactDef.Renderable}
+ */
+const bindHeaderShimToElement = (element) => HeaderShim.bind(null, element);
+
+/**
+ * @param {!Element} sectionElement
+ * @param {!BentoAccordionDef.ContentShimProps} props
+ * @param {{current: ?}} ref
+ * @return {PreactDef.Renderable}
+ */
+function ContentShimWithRef(
+  sectionElement,
+  {'aria-labelledby': ariaLabelledBy, id, role},
+  ref
+) {
+  const contentElement = sectionElement.lastElementChild;
+  const contentRef = useRef();
+  contentRef.current = contentElement;
+  useSlotContext(contentRef);
+  useDOMHandle(ref, contentElement);
+  useLayoutEffect(() => {
+    if (!contentElement) {
+      return;
+    }
+    contentElement.classList.add('i-amphtml-accordion-content');
+    contentElement.setAttribute('id', id);
+    contentElement.setAttribute('role', role);
+    contentElement.setAttribute('aria-labelledby', ariaLabelledBy);
+    if (sectionElement[SECTION_POST_RENDER]) {
+      sectionElement[SECTION_POST_RENDER]();
+    }
+  }, [sectionElement, contentElement, id, role, ariaLabelledBy]);
+  return <div />;
+}
+
+/**
+ * @param {!Element} element
+ * @return {function(!BentoAccordionDef.ContentProps):PreactDef.Renderable}
+ */
+const bindContentShimToElement = (element) =>
+  forwardRef(
+    /** @type {function(?, {current:?}):PreactDef.Renderable} */ (
+      ContentShimWithRef.bind(null, element)
+    )
+  );
+
+/** @override */
+BaseElement['Component'] = BentoAccordion;
+
+/** @override */
+BaseElement['detached'] = true;
+
+/** @override */
+BaseElement['props'] = {
+  'animate': {attr: 'animate', type: 'boolean', media: true},
+  'expandSingleSection': {
+    attr: 'expand-single-section',
+    type: 'boolean',
+  },
+};
diff --git a/src/bento/components/bento-accordion/1.0/bento-accordion.css b/src/bento/components/bento-accordion/1.0/bento-accordion.css
new file mode 100644
index 000000000000..ad6b20e5b921
--- /dev/null
+++ b/src/bento/components/bento-accordion/1.0/bento-accordion.css
@@ -0,0 +1,61 @@
+
+
+/*
+ * Pre-upgrade:
+ * - display:block element
+ * - contain:layout element
+ */
+bento-accordion {
+  display: block;
+  contain: layout;
+}
+
+bento-accordion,
+bento-accordion > section,
+bento-accordion > section > :first-child {
+  margin: 0;
+}
+
+/* Display the first 2 elements (heading and content) */
+bento-accordion > section > * {
+  display: block;
+  float: none;
+  overflow: hidden; /* clearfix */
+  position: relative;
+}
+
+/**
+ * This media query is used instead of @supports due to low compatibility.
+ * At the time of this change (4/6/2021) no version of Webkit support @supports queries.
+ *
+ * Note! This is a new CSS incompatible with older browsers. It provides
+ * low-specificity UI styles. The same styles are later set for older browsers
+ * via the `i-amphtml-accordion-header` class.
+ */
+@media (min-width: 1px) {
+  :where(bento-accordion > section) > :first-child {
+    cursor: pointer;
+    background-color: #efefef;
+    padding-right: 20px;
+    border: 1px solid #dfdfdf;
+  }
+}
+
+/* heading
+ * TODO(#30445): update these styles after team agrees on styling
+ */
+.i-amphtml-accordion-header {
+  cursor: pointer;
+  background-color: #efefef;
+  padding-right: 20px;
+  border: 1px solid #dfdfdf;
+}
+
+/* Collapse content by default. */
+bento-accordion > section:not([expanded]) > :last-child:not(.i-amphtml-animating),
+bento-accordion
+  > section:not([expanded])
+  > :last-child:not(.i-amphtml-animating)
+  * {
+  display: none !important;
+}
diff --git a/src/bento/components/bento-accordion/1.0/component.js b/src/bento/components/bento-accordion/1.0/component.js
new file mode 100644
index 000000000000..0aa7299cfcd3
--- /dev/null
+++ b/src/bento/components/bento-accordion/1.0/component.js
@@ -0,0 +1,430 @@
+import objstr from 'obj-str';
+
+import {
+  randomIdGenerator,
+  sequentialIdGenerator,
+} from '#core/data-structures/id-generator';
+import {omit} from '#core/types/object';
+
+import * as Preact from '#preact';
+import {
+  useCallback,
+  useContext,
+  useEffect,
+  useImperativeHandle,
+  useLayoutEffect,
+  useMemo,
+  useRef,
+  useState,
+} from '#preact';
+import {forwardRef} from '#preact/compat';
+import {WithAmpContext} from '#preact/context';
+import {propName, tabindexFromProps} from '#preact/utils';
+
+import {animateCollapse, animateExpand} from './animations';
+import {useStyles} from './component.jss';
+
+const AccordionContext = Preact.createContext(
+  /** @type {BentoAccordionDef.AccordionContext} */ ({})
+);
+
+const SectionContext = Preact.createContext(
+  /** @type {BentoAccordionDef.SectionContext} */ ({})
+);
+
+/** @type {!{[key: string]: boolean}} */
+const EMPTY_EXPANDED_MAP = {};
+
+/** @type {!{[key: string]: function(boolean):undefined|undefined}} */
+const EMPTY_EVENT_MAP = {};
+
+const generateSectionId = sequentialIdGenerator();
+const generateRandomId = randomIdGenerator(100000);
+
+/**
+ * @param {!BentoAccordionDef.BentoAccordionProps} props
+ * @param {{current: ?BentoAccordionDef.AccordionApi}} ref
+ * @return {PreactDef.Renderable}
+ */
+function BentoAccordionWithRef(
+  {
+    animate = false,
+    as: Comp = 'section',
+    children,
+    expandSingleSection = false,
+    id,
+    ...rest
+  },
+  ref
+) {
+  const [expandedMap, setExpandedMap] = useState(EMPTY_EXPANDED_MAP);
+  const eventMapRef = useRef(EMPTY_EVENT_MAP);
+  const [randomPrefix] = useState(generateRandomId);
+  const prefix = id || `a${randomPrefix}`;
+
+  useEffect(() => {
+    if (!expandSingleSection) {
+      return;
+    }
+    setExpandedMap((expandedMap) => {
+      const newExpandedMap = {};
+      let expanded = 0;
+      for (const k in expandedMap) {
+        newExpandedMap[k] = expandedMap[k] && expanded++ == 0;
+      }
+      return newExpandedMap;
+    });
+  }, [expandSingleSection]);
+
+  const registerSection = useCallback(
+    (id, defaultExpanded, {current: onExpandStateChange}) => {
+      setExpandedMap((expandedMap) => {
+        return setExpanded(
+          id,
+          defaultExpanded,
+          expandedMap,
+          expandSingleSection
+        );
+      });
+      eventMapRef.current = {...eventMapRef.current, [id]: onExpandStateChange};
+      return () => {
+        setExpandedMap((expandedMap) => omit(expandedMap, id));
+        eventMapRef.current = omit(
+          /** @type {!Object} */ (eventMapRef.current),
+          id
+        );
+      };
+    },
+    [expandSingleSection]
+  );
+
+  const toggleExpanded = useCallback(
+    (id, opt_expand) => {
+      setExpandedMap((expandedMap) => {
+        const newExpanded = opt_expand ?? !expandedMap[id];
+        const newExpandedMap = setExpanded(
+          id,
+          newExpanded,
+          expandedMap,
+          expandSingleSection
+        );
+
+        // Schedule a single microtask to fire events for
+        // all changed sections (order not defined)
+        Promise.resolve().then(() => {
+          for (const k in expandedMap) {
+            const onExpandStateChange = eventMapRef.current[k];
+            if (onExpandStateChange && expandedMap[k] != newExpandedMap[k]) {
+              onExpandStateChange(newExpandedMap[k]);
+            }
+          }
+        });
+        return newExpandedMap;
+      });
+    },
+    [expandSingleSection]
+  );
+
+  const isExpanded = useCallback(
+    (id, defaultExpanded) => expandedMap[id] ?? defaultExpanded,
+    [expandedMap]
+  );
+
+  const toggle = useCallback(
+    (id) => {
+      if (id) {
+        if (id in expandedMap) {
+          toggleExpanded(id);
+        }
+      } else {
+        // Toggle all should do nothing when expandSingleSection is true
+        if (!expandSingleSection) {
+          for (const k in expandedMap) {
+            toggleExpanded(k);
+          }
+        }
+      }
+    },
+    [expandedMap, toggleExpanded, expandSingleSection]
+  );
+
+  const expand = useCallback(
+    (id) => {
+      if (id) {
+        if (!isExpanded(id, true)) {
+          toggleExpanded(id);
+        }
+      } else {
+        // Expand all should do nothing when expandSingleSection is true
+        if (!expandSingleSection) {
+          for (const k in expandedMap) {
+            if (!isExpanded(k, true)) {
+              toggleExpanded(k);
+            }
+          }
+        }
+      }
+    },
+    [expandedMap, toggleExpanded, isExpanded, expandSingleSection]
+  );
+
+  const collapse = useCallback(
+    (id) => {
+      if (id) {
+        if (isExpanded(id, false)) {
+          toggleExpanded(id);
+        }
+      } else {
+        for (const k in expandedMap) {
+          if (isExpanded(k, false)) {
+            toggleExpanded(k);
+          }
+        }
+      }
+    },
+    [expandedMap, toggleExpanded, isExpanded]
+  );
+
+  useImperativeHandle(
+    ref,
+    () =>
+      /** @type {!BentoAccordionDef.AccordionApi} */ ({
+        toggle,
+        expand,
+        collapse,
+      }),
+    [toggle, collapse, expand]
+  );
+
+  const context = useMemo(
+    () =>
+      /** @type {!BentoAccordionDef.AccordionContext} */ ({
+        registerSection,
+        toggleExpanded,
+        isExpanded,
+        animate,
+        prefix,
+      }),
+    [registerSection, toggleExpanded, isExpanded, animate, prefix]
+  );
+
+  return (
+    <Comp id={id} {...rest}>
+      <AccordionContext.Provider value={context}>
+        {children}
+      </AccordionContext.Provider>
+    </Comp>
+  );
+}
+
+const BentoAccordion = forwardRef(BentoAccordionWithRef);
+BentoAccordion.displayName = 'Accordion'; // Make findable for tests.
+export {BentoAccordion};
+
+/**
+ * @param {string} id
+ * @param {boolean} value
+ * @param {!{[key: string]: boolean}} expandedMap
+ * @param {boolean} expandSingleSection
+ * @return {!{[key: string]: boolean}}
+ */
+function setExpanded(id, value, expandedMap, expandSingleSection) {
+  let newExpandedMap;
+  if (expandSingleSection && value) {
+    newExpandedMap = {[id]: value};
+    for (const k in expandedMap) {
+      if (k != id) {
+        newExpandedMap[k] = false;
+      }
+    }
+  } else {
+    newExpandedMap = {...expandedMap, [id]: value};
+  }
+  return newExpandedMap;
+}
+
+/**
+ * @param {!BentoAccordionDef.BentoAccordionSectionProps} props
+ * @return {PreactDef.Renderable}
+ */
+export function BentoAccordionSection({
+  animate: defaultAnimate = false,
+  as: Comp = 'section',
+  children,
+  expanded: defaultExpanded = false,
+  id: propId,
+  onExpandStateChange,
+  ...rest
+}) {
+  const [genId] = useState(generateSectionId);
+  const id = propId || genId;
+  const [suffix] = useState(generateRandomId);
+  const [expandedState, setExpandedState] = useState(defaultExpanded);
+  const [contentIdState, setContentIdState] = useState(null);
+  const [headerIdState, setHeaderIdState] = useState(null);
+
+  const {
+    animate: contextAnimate,
+    isExpanded,
+    prefix,
+    registerSection,
+    toggleExpanded,
+  } = useContext(AccordionContext);
+
+  const expanded = isExpanded ? isExpanded(id, defaultExpanded) : expandedState;
+  const animate = contextAnimate ?? defaultAnimate;
+  const contentId =
+    contentIdState || `${prefix || 'a'}-content-${id}-${suffix}`;
+  const headerId = headerIdState || `${prefix || 'a'}-header-${id}-${suffix}`;
+
+  // Storing this state change callback in a ref because this may change
+  // frequently and we do not want to trigger a re-register of the section
+  // each time  the callback is updated
+  const onExpandStateChangeRef = useRef(
+    /** @type {?function(boolean):undefined|undefined} */ (null)
+  );
+  onExpandStateChangeRef.current = onExpandStateChange;
+  useLayoutEffect(() => {
+    if (registerSection) {
+      return registerSection(id, defaultExpanded, onExpandStateChangeRef);
+    }
+  }, [registerSection, id, defaultExpanded]);
+
+  const toggleHandler = useCallback(
+    (opt_expand) => {
+      if (toggleExpanded) {
+        toggleExpanded(id, opt_expand);
+      } else {
+        setExpandedState((prev) => {
+          const newValue = opt_expand ?? !prev;
+          Promise.resolve().then(() => {
+            const onExpandStateChange = onExpandStateChangeRef.current;
+            if (onExpandStateChange) {
+              onExpandStateChange(newValue);
+            }
+          });
+          return newValue;
+        });
+      }
+    },
+    [id, toggleExpanded]
+  );
+
+  const context = useMemo(
+    () =>
+      /** @type {BentoAccordionDef.SectionContext} */ ({
+        animate,
+        contentId,
+        headerId,
+        expanded,
+        toggleHandler,
+        setContentId: setContentIdState,
+        setHeaderId: setHeaderIdState,
+      }),
+    [animate, contentId, headerId, expanded, toggleHandler]
+  );
+
+  return (
+    <Comp {...rest}>
+      <SectionContext.Provider value={context}>
+        {children}
+      </SectionContext.Provider>
+    </Comp>
+  );
+}
+
+/**
+ * @param {!BentoAccordionDef.BentoAccordionHeaderProps} props
+ * @return {PreactDef.Renderable}
+ */
+export function BentoAccordionHeader({
+  as: Comp = 'div',
+  children,
+  id,
+  role = 'button',
+  [propName('class')]: className = '',
+  ...rest
+}) {
+  const {contentId, expanded, headerId, setHeaderId, toggleHandler} =
+    useContext(SectionContext);
+  const classes = useStyles();
+
+  useLayoutEffect(() => {
+    if (setHeaderId) {
+      setHeaderId(id);
+    }
+  }, [setHeaderId, id]);
+
+  return (
+    <Comp
+      {...rest}
+      id={headerId}
+      role={role}
+      class={`${className} ${classes.sectionChild} ${classes.header}`}
+      tabindex={tabindexFromProps(rest)}
+      aria-controls={contentId}
+      onClick={() => toggleHandler()}
+      aria-expanded={String(expanded)}
+    >
+      {children}
+    </Comp>
+  );
+}
+
+/**
+ * @param {!BentoAccordionDef.BentoAccordionContentProps} props
+ * @return {PreactDef.Renderable}
+ */
+export function BentoAccordionContent({
+  as: Comp = 'div',
+  children,
+  id,
+  role = 'region',
+  [propName('class')]: className = '',
+  ...rest
+}) {
+  const ref = useRef(null);
+  const hasMountedRef = useRef(false);
+  const {animate, contentId, expanded, headerId, setContentId} =
+    useContext(SectionContext);
+  const classes = useStyles();
+
+  useEffect(() => {
+    hasMountedRef.current = true;
+    return () => (hasMountedRef.current = false);
+  }, []);
+
+  useLayoutEffect(() => {
+    if (setContentId) {
+      setContentId(id);
+    }
+  }, [setContentId, id]);
+
+  useLayoutEffect(() => {
+    const hasMounted = hasMountedRef.current;
+    const content = ref.current;
+    if (!animate || !hasMounted || !content || !content.animate) {
+      return;
+    }
+    return expanded ? animateExpand(content) : animateCollapse(content);
+  }, [expanded, animate]);
+
+  return (
+    <WithAmpContext renderable={expanded}>
+      <Comp
+        {...rest}
+        ref={ref}
+        class={objstr({
+          [className]: true,
+          [classes.sectionChild]: true,
+          [classes.contentHidden]: !expanded,
+        })}
+        id={contentId}
+        aria-labelledby={headerId}
+        role={role}
+      >
+        {children}
+      </Comp>
+    </WithAmpContext>
+  );
+}
diff --git a/extensions/amp-accordion/1.0/component.jss.js b/src/bento/components/bento-accordion/1.0/component.jss.js
similarity index 100%
rename from extensions/amp-accordion/1.0/component.jss.js
rename to src/bento/components/bento-accordion/1.0/component.jss.js
diff --git a/src/bento/components/bento-accordion/1.0/component.type.js b/src/bento/components/bento-accordion/1.0/component.type.js
new file mode 100644
index 000000000000..e6676bb44a57
--- /dev/null
+++ b/src/bento/components/bento-accordion/1.0/component.type.js
@@ -0,0 +1,120 @@
+/** @externs */
+
+/** @const */
+var BentoAccordionDef = {};
+
+/**
+ * @typedef {{
+ *   as: (string|PreactDef.FunctionalComponent|undefined),
+ *   expandSingleSection: (boolean|undefined),
+ *   animate: (boolean|undefined),
+ *   id: (string|undefined),
+ *   children: (?PreactDef.Renderable|undefined),
+ * }}
+ */
+BentoAccordionDef.BentoAccordionProps;
+
+/**
+ * @typedef {{
+ *   as: (string|PreactDef.FunctionalComponent|undefined),
+ *   expanded: (boolean|undefined),
+ *   animate: (boolean|undefined),
+ *   id: (string|undefined),
+ *   children: (?PreactDef.Renderable|undefined),
+ *   onExpandStateChange: (function(boolean):undefined|undefined),
+ * }}
+ */
+BentoAccordionDef.BentoAccordionSectionProps;
+
+/**
+ * @typedef {{
+ *   as: (string|PreactDef.FunctionalComponent|undefined),
+ *   role: (string|undefined),
+ *   class: (string|undefined),
+ *   tabindex: (number|string|undefined),
+ *   tabIndex: (number|string|undefined),
+ *   id: (string|undefined),
+ *   children: (?PreactDef.Renderable|undefined),
+ * }}
+ * (We support tabindex and tabIndex equally, see tabindexFromProps())
+ */
+BentoAccordionDef.BentoAccordionHeaderProps;
+
+/**
+ * @typedef {{
+ *   as: (string|PreactDef.FunctionalComponent|undefined),
+ *   role: (string|undefined),
+ *   class: (string|undefined),
+ *   id: (string|undefined),
+ *   children: (?PreactDef.Renderable|undefined),
+ * }}
+ */
+BentoAccordionDef.BentoAccordionContentProps;
+
+/**
+ * This is not a public API, it exists to define properties for reference
+ * that are used in the HeaderShim defined in amp-accordion
+ * @typedef {{
+ *   id: (string),
+ *   role: (string),
+ *   onClick: (function()|undefined),
+ *   aria-controls: (string),
+ *   aria-expanded: (string),
+ *   children: (?PreactDef.Renderable|undefined),
+ * }}
+ */
+BentoAccordionDef.HeaderShimProps;
+
+/**
+ * This is not a public API, it exists to define properties for reference
+ * that are used in the ContentShim defined in amp-accordion
+ * @typedef {{
+ *   id: (string),
+ *   role: (string),
+ *   aria-labelledby: (string),
+ *   children: (?PreactDef.Renderable|undefined),
+ * }}
+ */
+BentoAccordionDef.ContentShimProps;
+
+/**
+ * @typedef {{
+ *   registerSection: (function(string)|undefined),
+ *   isExpanded: (function(string, boolean):boolean),
+ *   toggleExpanded: (function(string)|undefined),
+ *   animate: (boolean|undefined),
+ *   prefix: (string),
+ * }}
+ */
+BentoAccordionDef.AccordionContext;
+
+/**
+ * @typedef {{
+ *   animate: (boolean),
+ *   contentId: (string),
+ *   headerId: (string),
+ *   expanded: (boolean),
+ *   expandHandler: (function()),
+ *   setContentId: (function(string)),
+ *   setHeaderId: (function(string)),
+ * }}
+ */
+BentoAccordionDef.SectionContext;
+
+/** @interface */
+BentoAccordionDef.BentoAccordionApi = class {
+  /**
+   * @param {string|undefined} section
+   */
+  toggle(section) {}
+
+  /**
+   * @param {string|undefined} section
+   */
+  expand(section) {}
+
+  /**
+   * @param {string|undefined} section
+   */
+  collapse(section) {}
+};
diff --git a/src/bento/components/bento-accordion/1.0/storybook/Basic.amp.js b/src/bento/components/bento-accordion/1.0/storybook/Basic.amp.js
new file mode 100644
index 000000000000..55bb4f446b64
--- /dev/null
+++ b/src/bento/components/bento-accordion/1.0/storybook/Basic.amp.js
@@ -0,0 +1,86 @@
+import {withAmp} from '@ampproject/storybook-addon';
+
+import * as Preact from '#preact';
+
+export default {
+  title: 'amp-accordion-1_0',
+  decorators: [withAmp],
+  parameters: {
+    extensions: [{name: 'amp-accordion', version: '1.0'}],
+    experiments: ['bento'],
+  },
+  args: {
+    'expand-single-section': false,
+    animate: false,
+  },
+};
+
+export const _default = (args) => {
+  return (
+    <main>
+      <amp-accordion style={{background: 'red'}} id="accordion" {...args}>
+        <section id="section1">
+          <h2>Section 1</h2>
+          <div>Puppies are cute.</div>
+        </section>
+        <section>
+          <h2>Section 2</h2>
+          <div>Kittens are furry.</div>
+        </section>
+        <section expanded>
+          <h2>Section 3</h2>
+          <div>Elephants have great memory.</div>
+        </section>
+      </amp-accordion>
+
+      <div class="buttons" style={{marginTop: 8}}>
+        <button on="tap:accordion.toggle(section='section1')">
+          toggle(section1)
+        </button>
+        <button on="tap:accordion.toggle()">toggle all</button>
+        <button on="tap:accordion.expand(section='section1')">
+          expand(section1)
+        </button>
+        <button on="tap:accordion.expand()">expand all</button>
+        <button on="tap:accordion.collapse(section='section1')">
+          collapse(section1)
+        </button>
+        <button on="tap:accordion.collapse()">collapse all</button>
+      </div>
+    </main>
+  );
+};
+
+export const events = (args) => {
+  return (
+    <main>
+      <amp-accordion id="accordion" {...args}>
+        <section id="section1">
+          <h2>Section 1</h2>
+          <div>Puppies are cute.</div>
+        </section>
+        <section id="section2" on="expand:accordion.expand(section='section3')">
+          <h2>Section 2</h2>
+          <div>Kittens are furry.</div>
+        </section>
+        <section
+          id="section3"
+          on="collapse:accordion.collapse(section='section2')"
+        >
+          <h2>Section 3</h2>
+          <div>Elephants have great memory.</div>
+        </section>
+      </amp-accordion>
+
+      <div class="buttons" style={{marginTop: 8}}>
+        <button on="tap:accordion.expand(section='section2')">
+          expand(section2)
+        </button>
+        <button on="tap:accordion.collapse(section='section3')">
+          collapse(section3)
+        </button>
+        <button on="tap:accordion.toggle()">toggle all</button>
+      </div>
+    </main>
+  );
+};
diff --git a/src/bento/components/bento-accordion/1.0/storybook/Basic.js b/src/bento/components/bento-accordion/1.0/storybook/Basic.js
new file mode 100644
index 000000000000..61476c51ab16
--- /dev/null
+++ b/src/bento/components/bento-accordion/1.0/storybook/Basic.js
@@ -0,0 +1,146 @@
+import {
+  BentoAccordion,
+  BentoAccordionContent,
+  BentoAccordionHeader,
+  BentoAccordionSection,
+} from '#bento/components/bento-accordion/1.0/component';
+
+import * as Preact from '#preact';
+
+import '../component.jss';
+
+export default {
+  title: 'Accordion',
+  component: BentoAccordion,
+  args: {
+    expandSingleSection: false,
+    animate: false,
+  },
+};
+
+/**
+ * @param {!Object} props
+ * @return {*}
+ */
+function AccordionWithActions(props) {
+  // TODO(#30447): replace imperative calls with "button" knobs when the
+  // Storybook 6.1 is released.
+  const ref = Preact.useRef();
+  return (
+    <section>
+      <BentoAccordion ref={ref} {...props} />
+      <div style={{marginTop: 8}}>
+        <button onClick={() => ref.current.toggle('section1')}>
+          toggle(section1)
+        </button>
+        <button onClick={() => ref.current.toggle()}>toggle all</button>
+        <button onClick={() => ref.current.expand('section1')}>
+          expand(section1)
+        </button>
+        <button onClick={() => ref.current.expand()}>expand all</button>
+        <button onClick={() => ref.current.collapse('section1')}>
+          collapse(section1)
+        </button>
+        <button onClick={() => ref.current.collapse()}>collapse all</button>
+      </div>
+    </section>
+  );
+}
+
+export const _default = (args) => {
+  return (
+    <main>
+      <AccordionWithActions {...args}>
+        <BentoAccordionSection id="section1" key={1}>
+          <BentoAccordionHeader>
+            <h2>Section 1</h2>
+          </BentoAccordionHeader>
+          <BentoAccordionContent>Puppies are cute.</BentoAccordionContent>
+        </BentoAccordionSection>
+        <BentoAccordionSection key={2}>
+          <BentoAccordionHeader>
+            <h2>Section 2</h2>
+          </BentoAccordionHeader>
+          <BentoAccordionContent>Kittens are furry.</BentoAccordionContent>
+        </BentoAccordionSection>
+        <BentoAccordionSection key={3} expanded>
+          <BentoAccordionHeader>
+            <h2>Section 3</h2>
+          </BentoAccordionHeader>
+          <BentoAccordionContent>
+            Elephants have great memory.
+          </BentoAccordionContent>
+        </BentoAccordionSection>
+      </AccordionWithActions>
+    </main>
+  );
+};
+
+/**
+ * @param {!Object} props
+ * @return {*}
+ */
+function AccordionWithEvents(props) {
+  // TODO(#30447): replace imperative calls with "button" knobs when the
+  // Storybook 6.1 is released.
+  const ref = Preact.useRef();
+  return (
+    <section>
+      <BentoAccordion ref={ref} {...props}>
+        <BentoAccordionSection id="section1" key={1} expanded>
+          <BentoAccordionHeader>
+            <h2>Section 1</h2>
+          </BentoAccordionHeader>
+          <BentoAccordionContent>Puppies are cute.</BentoAccordionContent>
+        </BentoAccordionSection>
+        <BentoAccordionSection
+          id="section2"
+          key={2}
+          onExpandStateChange={(expanded) => {
+            if (expanded) {
+              ref.current.expand('section3');
+            }
+          }}
+        >
+          <BentoAccordionHeader>
+            <h2>Section 2</h2>
+          </BentoAccordionHeader>
+          <BentoAccordionContent>Kittens are furry.</BentoAccordionContent>
+        </BentoAccordionSection>
+        <BentoAccordionSection
+          id="section3"
+          key={3}
+          onExpandStateChange={(expanded) => {
+            if (!expanded) {
+              ref.current.collapse('section2');
+            }
+          }}
+        >
+          <BentoAccordionHeader>
+            <h2>Section 3</h2>
+          </BentoAccordionHeader>
+          <BentoAccordionContent>
+            Elephants have great memory.
+          </BentoAccordionContent>
+        </BentoAccordionSection>
+      </BentoAccordion>
+      <div style={{marginTop: 8}}>
+        <button onClick={() => ref.current.expand('section2')}>
+          expand(section2)
+        </button>
+        <button onClick={() => ref.current.collapse('section3')}>
+          collapse(section3)
+        </button>
+        <button onClick={() => ref.current.toggle()}>toggle all</button>
+      </div>
+    </section>
+  );
+}
+
+export const events = (args) => {
+  return (
+    <main>
+      <AccordionWithEvents {...args}></AccordionWithEvents>
+    </main>
+  );
+};
diff --git a/src/bento/components/bento-accordion/1.0/storybook/Bind.amp.js b/src/bento/components/bento-accordion/1.0/storybook/Bind.amp.js
new file mode 100644
index 000000000000..6cd16c7b7e9b
--- /dev/null
+++ b/src/bento/components/bento-accordion/1.0/storybook/Bind.amp.js
@@ -0,0 +1,61 @@
+import {withAmp} from '@ampproject/storybook-addon';
+
+import * as Preact from '#preact';
+
+export default {
+  title: 'amp-accordion-1_0',
+  decorators: [withAmp],
+  parameters: {
+    extensions: [
+      {name: 'amp-bind', version: '0.1'},
+      {name: 'amp-accordion', version: '1.0'},
+    ],
+    experiments: ['bento'],
+  },
+  args: {
+    'expand-single-section': false,
+    animate: false,
+  },
+};
+
+export const withAmpBind = (args) => {
+  return (
+    <main>
+      <amp-accordion {...args}>
+        <section data-amp-bind-expanded="section1">
+          <h2>Section 1</h2>
+          <div>Puppies are cute.</div>
+        </section>
+        <section data-amp-bind-expanded="section2">
+          <h2>Section 2</h2>
+          <div>Kittens are furry.</div>
+        </section>
+        <section data-amp-bind-expanded="section3">
+          <h2>Section 3</h2>
+          <div>Elephants have great memory.</div>
+        </section>
+      </amp-accordion>
+
+      <div class="buttons" style={{marginTop: 8}}>
+        <button on="tap:AMP.setState({section1: true})">
+          Expand Section 1
+        </button>
+        <button on="tap:AMP.setState({section1: false})">
+          Collapse Section 1
+        </button>
+        <button on="tap:AMP.setState({section2: true})">
+          Expand Section 2
+        </button>
+        <button on="tap:AMP.setState({section2: false})">
+          Collapse Section 2
+        </button>
+        <button on="tap:AMP.setState({section3: true})">
+          Expand Section 3
+        </button>
+        <button on="tap:AMP.setState({section3: false})">
+          Collapse Section 3
+        </button>
+      </div>
+    </main>
+  );
+};
diff --git a/src/bento/components/bento-accordion/OWNERS b/src/bento/components/bento-accordion/OWNERS
new file mode 100644
index 000000000000..627364887fa8
--- /dev/null
+++ b/src/bento/components/bento-accordion/OWNERS
@@ -0,0 +1,14 @@
+// For an explanation of the OWNERS rules and syntax, see:
+// https://github.com/ampproject/amp-github-apps/blob/main/owners/OWNERS.example
+
+{
+  rules: [
+    {
+      owners: [{name: 'ampproject/wg-components'}],
+    },
+    {
+      pattern: 'validator-*.protoascii',
+      owners: [{name: 'ampproject/wg-amp4email', notify: true}],
+    },
+  ],
+}
diff --git a/src/bento/components/bento-accordion/bento-accordion.md b/src/bento/components/bento-accordion/bento-accordion.md
new file mode 100644
index 000000000000..1feb1874965c
--- /dev/null
+++ b/src/bento/components/bento-accordion/bento-accordion.md
@@ -0,0 +1,225 @@
+---
+$category@: layout
+formats:
+  - websites
+teaser:
+  text: A stacked list of headers that collapse or expand content sections with user interaction.
+experimental: true
+bento: true
+---
+
+# bento-accordion
+
+Provides a way for viewers to glance at the content outline and jump to any section. This is helpful for mobile devices where even a couple of sentences into a section requires scrolling.
+
+## Usage
+
+The `bento-accordion` component allows you to display collapsible and expandable
+content sections. This component provides a way for viewers to glance at the
+content outline and jump to any section. Effective use reduces scrolling needs
+on mobile devices.
+
+[filter formats="websites, ads"]
+
+-   An `bento-accordion` accepts one or more `<section>` elements as its direct
+    children.
+-   Each `<section>` must contain exactly two direct children.
+-   The first child in a `<section>` is the heading for that section of the
+    `bento-accordion`. It must be a heading element such as `<h1>-<h6>` or
+    `<header>`.
+-   The second child in a `<section>` is the expandable/collapsible content. It
+    can be any tag allowed in [AMP HTML](https://github.com/ampproject/amphtml/blob/main/docs/spec/amp-html-format.md).
+-   A click or tap on a `<section>` heading expands or collapses the section.
+-   An `bento-accordion` with a defined `id` preserves the collapsed or expanded
+    state of each section while the user remains on your domain.
+
+[/filter] <!-- formats="websites, ads" -->
+
+[filter formats="email"]
+
+-   An `bento-accordion` accepts one or more `<section>` elements as its direct
+    children.
+-   Each `<section>` must contain exactly two direct children.
+-   The first child in a `<section>` is the heading for that section of the
+    `bento-accordion`. It must be a heading element such as `<h1>-<h6>` or
+    `<header>`.
+-   The second child in a `<section>` is the expandable/collapsible content. It
+    can be any tag allowed in [AMP for Email](https://github.com/ampproject/amphtml/blob/main/docs/spec/email/amp-email-html.md).
+-   A click or tap on a `<section>` heading expands or collapses the section.
+
+[/filter]
+
+## Example
+
+The example below contains an `bento-accordion` with three sections. The
+`expanded` attribute on the third section expands it on page load.
+
+[example preview="top-frame" playground="true" imports="bento-accordion:1.0"]
+
+```html
+<bento-accordion id="my-accordion"{% if not format=='email'%} disable-session-states{% endif %}>
+  <section>
+    <h2>Section 1</h2>
+    <p>Content in section 1.</p>
+  </section>
+  <section>
+    <h2>Section 2</h2>
+    <div>Content in section 2.</div>
+  </section>
+  <section expanded>
+    <h2>Section 3</h2>
+    <amp-img src="{{server_for_email}}/static/inline-examples/images/squirrel.jpg"
+      width="320"
+      height="256"></amp-img>
+  </section>
+</bento-accordion>
+```
+
+[/example]
+
+### Standalone use outside valid AMP documents
+
+Bento allows you to use AMP components in non-AMP pages without needing
+to commit to fully valid AMP. You can take these components and place them
+in implementations with frameworks and CMSs that don't support AMP. Read
+more in our guide [Use AMP components in non-AMP pages](https://amp.dev/documentation/guides-and-tutorials/start/bento_guide/).
+
+To find the standalone version of `bento-accordion`, see [**`bento-accordion`**](./1.0/README.md).
+
+## Attributes
+
+### animate
+
+Include the `animate` attribute in `<bento-accordion>` to add a "roll down"
+animation when the content is expanded and "roll up" animation when collapsed.
+
+This attribute can be configured to based on a [media query](./../../../../docs/spec/amp-html-responsive-attributes.md).
+
+[example preview="top-frame" playground="true" imports="bento-accordion:1.0"]
+
+```html
+<bento-accordion animate>
+  <section>
+    <h2>Section 1</h2>
+    <p>Content in section 1.</p>
+  </section>
+  <section>
+    <h2>Section 2</h2>
+    <div>Content in section 2.</div>
+  </section>
+  <section>
+    <h2>Section 3</h2>
+    <amp-img
+      src="{{server_for_email}}/static/inline-examples/images/squirrel.jpg"
+      width="320"
+      height="256"
+    ></amp-img>
+  </section>
+</bento-accordion>
+```
+
+[/example]
+
+### expanded
+
+Apply the `expanded` attribute to a nested `<section>` to expand that section when the page loads.
+
+Use `amp-bind` to bind the `[expanded]` attribute to programmatically expand or collapse a `<section>` element. An expanded section collapses when the expression evaluates as `false`. A collapsed section expands if the expression evaluates to anything other than `false`.
+
+[example preview="top-frame" playground="true" imports="bento-accordion:1.0"]
+
+```html
+<bento-accordion>
+  <section
+    [expanded]="sectionOne"
+    on="expand:AMP.setState({sectionOne: true});collapse:AMP.setState({sectionOne: false})"
+  >
+    <h2>Section 1</h2>
+    <p>Bunch of awesome content</p>
+  </section>
+  <section>
+    <h2>Section 2</h2>
+    <div>Bunch of awesome content</div>
+  </section>
+  <section expanded>
+    <h2>Section 3</h2>
+    <div>Bunch of awesome content</div>
+  </section>
+</bento-accordion>
+<button on="tap:AMP.setState({sectionOne: true})">Expand section 1</button>
+<button on="tap:AMP.setState({sectionOne: false})">Collapse section 1</button>
+```
+
+[/example]
+
+### expand-single-section
+
+Allow only one section to expand at a time by applying the `expand-single-section` attribute to the `<bento-accordion>` element. This means if a user taps on a collapsed `<section>`, it will expand and collapse other expanded `<section>`'s.
+
+[example preview="top-frame" playground="true" imports="bento-accordion:1.0"]
+
+```html
+<bento-accordion expand-single-section>
+  <section>
+    <h2>Section 1</h2>
+    <p>Content in section 1.</p>
+  </section>
+  <section>
+    <h2>Section 2</h2>
+    <div>Content in section 2.</div>
+  </section>
+  <section>
+    <h2>Section 3</h2>
+    <amp-img
+      src="{{server_for_email}}/static/inline-examples/images/squirrel.jpg"
+      width="320"
+      height="256"
+    ></amp-img>
+  </section>
+</bento-accordion>
+```
+
+[/example]
+
+## Styling
+
+The `bento-accordion` element selector styles an `bento-accordion` according to your
+specifications. The following example changes the background color to green:
+
+```css
+bento-accordion {
+  background-color: green;
+}
+```
+
+Keep the following points in mind when you style an bento-accordion:
+
+-   `bento-accordion` elements are always `display: block`.
+-   `float` cannot style a `<section>`, heading, nor content elements.
+-   An expanded section applies the `expanded` attribute to the `<section>`
+    element.
+-   The content element is clear-fixed with `overflow: hidden` and hence cannot
+    have scrollbars.
+-   Margins of the `<bento-accordion>`, `<section>`, heading, and content elements
+    are set to `0`, but can be overridden in custom styles.
+-   Both the header and content elements are `position: relative`.
+
+## Accessibility
+
+`bento-accordion` automatically adds the following [ARIA attributes](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA):
+
+-   `aria-controls`: Applied to the header element of each `bento-accordion` section.
+-   `aria-expanded (state)`: Applied to the header element of each `bento-accordion` section.
+-   `aria-labelledby`: Applied to the content element of each `bento-accordion` section.
+
+`bento-accordion` also automatically adds the following accessibility attributes:
+
+-   `tabindex`: Applied to the header element of each `bento-accordion` section.
+-   `role=button`: Applied to the header element of each `bento-accordion` section.
+-   `role=region`: Applied to the content element of each `bento-accordion` section.
+
+## Version notes
+
+The experimental `1.0` version of `bento-accordion` does not support session states. It behaves as if the `disable-session-states` attribute is always applied.
+
+Version `0.1` and `1.0` are compatible with `amp-bind`, but some binding syntax is different. You may bind directly with the `expanded` attribute in version `1.0`. The `data-expand` binding is not supported in version `1.0`. See the [`expanded` attribute](#expanded) for further information.
diff --git a/src/bento/components/bento-autocomplete/1.0/base-element.js b/src/bento/components/bento-autocomplete/1.0/base-element.js
new file mode 100644
index 000000000000..307a7535ee24
--- /dev/null
+++ b/src/bento/components/bento-autocomplete/1.0/base-element.js
@@ -0,0 +1,110 @@
+import mustache from '#bento/components/bento-mustache/1.0/bento-mustache';
+import {getTemplate} from '#bento/util/template';
+
+import {isArray} from '#core/types';
+import {getValueForExpr} from '#core/types/object';
+import {tryParseJson} from '#core/types/object/json';
+
+import * as Preact from '#preact';
+import {PreactBaseElement} from '#preact/base-element';
+
+import {BentoAutocomplete} from './component';
+import {CSS as COMPONENT_CSS} from './component.jss';
+
+export class BaseElement extends PreactBaseElement {
+  /**
+   * Reads the 'items' data from the child <script> element.
+   * For use with static local data.
+   * @param {!Element} script
+   * @return {!Array<!JsonObject|string>}
+   * @private
+   */
+  getInlineData_(script) {
+    const json = tryParseJson(script.textContent, (error) => {
+      throw error;
+    });
+    const itemsExpr = this.element.getAttribute('items') || 'items';
+    const items = getValueForExpr(/**@type {!JsonObject}*/ (json), itemsExpr);
+    if (!items) {
+      this.win.console /* OK */
+        .warn(
+          `Expected key "${itemsExpr}" in data but found nothing. Rendering empty results.`
+        );
+      return [];
+    }
+    if (!isArray(items)) {
+      throw new Error('Items must be array type');
+    }
+    return items;
+  }
+
+  /**
+   * Gets JSON props from optional script tag.
+   * Example:
+   * <script type="application/json">{"items": ["one", "two", "three"]}</script>
+   * @override
+   * */
+  getDefaultProps() {
+    const defaultProps = super.getDefaultProps();
+    const jsonScript = this.element.querySelector(
+      'script[type="application/json"]'
+    );
+    if (jsonScript) {
+      const items = this.getInlineData_(jsonScript);
+      return {
+        ...defaultProps,
+        items,
+      };
+    } else if (!this.element.hasAttribute('src')) {
+      this.win.console /*OK*/
+        .warn(
+          `Expected a <script type="application/json"> child or a URL specified in "src"`
+        );
+    }
+    return defaultProps;
+  }
+
+  /** @override */
+  checkPropsPostMutations() {
+    const template = getTemplate(this.element);
+    if (!template) {
+      return;
+    }
+
+    this.mutateProps({
+      'itemTemplate': (data) => {
+        const html = mustache.render(template./*OK*/ innerHTML, data);
+        return <div dangerouslySetInnerHTML={{__html: html}} />;
+      },
+    });
+  }
+}
+
+/** @override */
+BaseElement['Component'] = BentoAutocomplete;
+
+/** @override */
+BaseElement['props'] = {
+  'children': {passthrough: true},
+  'filter': {attr: 'filter'},
+  'filterValue': {attr: 'filter-value'},
+  'highlightUserEntry': {attr: 'highlight-user-entry', type: 'boolean'},
+  'id': {attr: 'id'},
+  'inline': {attr: 'inline'},
+  'maxItems': {attr: 'max-items', type: 'number'},
+  'minChars': {attr: 'min-chars', type: 'number'},
+  'prefetch': {attr: 'prefetch', type: 'boolean'},
+  'src': {attr: 'src'},
+  'submitOnEnter': {attr: 'submit-on-enter', type: 'boolean'},
+  'suggestFirst': {attr: 'suggest-first', type: 'boolean'},
+  'query': {attr: 'query', type: 'string'},
+};
+
+/** @override */
+BaseElement['layoutSizeDefined'] = true;
+
+/** @override */
+BaseElement['usesShadowDom'] = true;
+
+/** @override */
+BaseElement['shadowCss'] = COMPONENT_CSS;
diff --git a/src/bento/components/bento-autocomplete/1.0/bento-autocomplete.css b/src/bento/components/bento-autocomplete/1.0/bento-autocomplete.css
new file mode 100644
index 000000000000..e4763bbe6a1f
--- /dev/null
+++ b/src/bento/components/bento-autocomplete/1.0/bento-autocomplete.css
@@ -0,0 +1,11 @@
+bento-autocomplete,
+bento-autocomplete > input,
+bento-autocomplete > textarea {
+  font-family: sans-serif; /* default-ui-font-stack */
+}
+
+bento-autocomplete > input,
+bento-autocomplete > textarea {
+  border-radius: 4px; /* default-ui-border-radius */
+  box-sizing: border-box;
+}
\ No newline at end of file
diff --git a/src/bento/components/bento-autocomplete/1.0/component.js b/src/bento/components/bento-autocomplete/1.0/component.js
new file mode 100644
index 000000000000..76f51bd99a09
--- /dev/null
+++ b/src/bento/components/bento-autocomplete/1.0/component.js
@@ -0,0 +1 @@
+export * from './component/component';
diff --git a/src/bento/components/bento-autocomplete/1.0/component.jss.js b/src/bento/components/bento-autocomplete/1.0/component.jss.js
new file mode 100644
index 000000000000..5b35d478fc60
--- /dev/null
+++ b/src/bento/components/bento-autocomplete/1.0/component.jss.js
@@ -0,0 +1,72 @@
+import {createUseStyles} from 'react-jss';
+
+const autocomplete = {
+  fontFamily: 'sans-serif',
+};
+
+const input = {
+  borderRadius: '4px',
+  boxSizing: 'border-box',
+};
+
+const autocompleteResults = {
+  position: 'absolute',
+  // top: '100%',
+  width: 'calc(100% - 1rem)',
+  minWidth: 'calc(2em + 2rem)',
+  maxHeight: '40vh',
+  marginTop: '.5rem',
+  marginLeft: '-.5rem',
+  borderRadius: '4px',
+
+  overflowY: 'auto',
+  overflowX: 'hidden',
+
+  backgroundColor: 'white',
+  boxShadow: '0px 2px 4px 0px rgba(0,0,0,0.5)',
+  zIndex: '10',
+};
+
+const autocompleteItem = {
+  position: 'relative',
+  padding: '.5rem 1rem',
+  cursor: 'pointer',
+
+  '&:first-child': {
+    borderRadius: '4px 4px 0 0',
+  },
+
+  '&:nth-last-child(2)': {
+    borderRadius: '0 0 4px 4px',
+  },
+
+  '&:hover:not([data-disabled])': {
+    backgroundColor: 'rgba(0,0,0,0.15)',
+  },
+
+  '&[data-disabled]': {
+    color: 'rgba(0,0,0,0.33)',
+  },
+
+  '& > .autocomplete-partial': {
+    fontWeight: 'bold',
+  },
+};
+
+const autocompleteItemActive = {
+  '&:not([data-disabled])': {
+    backgroundColor: 'rgba(0,0,0,0.15)',
+  },
+};
+
+const JSS = {
+  autocomplete,
+  input,
+  autocompleteResults,
+  autocompleteItem,
+  autocompleteItemActive,
+};
+
+// useStyles gets replaced for AMP builds via `babel-plugin-transform-jss`.
+// eslint-disable-next-line local/no-export-side-effect
+export const useStyles = createUseStyles(JSS);
diff --git a/src/bento/components/bento-autocomplete/1.0/component/autocomplete-binding-inline.ts b/src/bento/components/bento-autocomplete/1.0/component/autocomplete-binding-inline.ts
new file mode 100644
index 000000000000..b9e5a0927117
--- /dev/null
+++ b/src/bento/components/bento-autocomplete/1.0/component/autocomplete-binding-inline.ts
@@ -0,0 +1,76 @@
+import {ownProperty} from '#core/types/object';
+
+import {AutocompleteBinding, InputElement} from '../types';
+
+export class AutocompleteBindingInline implements AutocompleteBinding {
+  trigger_: string = '';
+  regex_: RegExp = new RegExp('');
+  match_: RegExpExecArray | null = null;
+
+  constructor(trigger: string) {
+    this.trigger_ = trigger;
+
+    const delimiter = this.trigger_.replace(/([()[{*+.$^\\|?])/g, '\\$1');
+    const pattern = `((${delimiter}|^${delimiter})(\\w+)?)`;
+    this.regex_ = new RegExp(pattern, 'gm');
+  }
+
+  get shouldShowOnFocus() {
+    return false;
+  }
+
+  /**
+   * Finds the closest string in the user input prior to the cursor
+   * to display suggestions.
+   */
+  private getClosestPriorMatch_(inputEl: InputElement) {
+    const regex = this.regex_;
+
+    const {selectionStart: cursor, value} = inputEl;
+    let match, lastMatch;
+
+    while ((match = regex.exec(value)) !== null) {
+      if (match[0].length + ownProperty(match, 'index') > cursor!) {
+        break;
+      }
+      lastMatch = match;
+    }
+
+    if (
+      !lastMatch ||
+      lastMatch[0].length + ownProperty(lastMatch, 'index') < cursor!
+    ) {
+      return null;
+    }
+    return lastMatch;
+  }
+
+  /**
+   * Returns true if a match on the publisher-provided trigger is found in the input element value.
+   * Otherwise, should not display any suggestions.
+   */
+  shouldAutocomplete(inputEl: InputElement): boolean {
+    const match = this.getClosestPriorMatch_(inputEl);
+    this.match_ = match;
+    return !!match;
+  }
+
+  /**
+   * Display suggestions based on the partial string following the trigger
+   * in the input element value.
+   */
+  getUserInputForUpdate(): string {
+    if (!this.match_ || !this.match_[0]) {
+      return '';
+    }
+    return this.match_[0].slice(this.trigger_.length);
+  }
+
+  /**
+   * If results are not showing or there is no actively navigated-to suggestion item,
+   * the user should be able to 'Enter' to add a new line.
+   */
+  shouldPreventDefaultOnEnter(activeElement: boolean) {
+    return activeElement;
+  }
+}
diff --git a/src/bento/components/bento-autocomplete/1.0/component/autocomplete-binding-single.ts b/src/bento/components/bento-autocomplete/1.0/component/autocomplete-binding-single.ts
new file mode 100644
index 000000000000..b749bf4f04c4
--- /dev/null
+++ b/src/bento/components/bento-autocomplete/1.0/component/autocomplete-binding-single.ts
@@ -0,0 +1,22 @@
+import {AutocompleteBinding, InputElement} from '../types';
+
+export class AutocompleteBindingSingle implements AutocompleteBinding {
+  get shouldShowOnFocus() {
+    return true;
+  }
+
+  shouldAutocomplete(): boolean {
+    return true;
+  }
+
+  getUserInputForUpdate(inputEl: InputElement): string {
+    return inputEl.value || '';
+  }
+
+  shouldPreventDefaultOnEnter(
+    unusedActiveElement: boolean,
+    submitOnEnter: boolean
+  ): boolean {
+    return !submitOnEnter;
+  }
+}
diff --git a/src/bento/components/bento-autocomplete/1.0/component/autocomplete-item.tsx b/src/bento/components/bento-autocomplete/1.0/component/autocomplete-item.tsx
new file mode 100644
index 000000000000..992e074d7b94
--- /dev/null
+++ b/src/bento/components/bento-autocomplete/1.0/component/autocomplete-item.tsx
@@ -0,0 +1,45 @@
+import objStr from 'obj-str';
+
+import {cloneElement, isValidElement} from '#preact';
+
+import {useStyles} from '../component.jss';
+import {AutocompleteItemProps, ItemNode, ItemTemplateProps} from '../types';
+
+export function AutocompleteItem({
+  id,
+  item,
+  itemTemplate,
+  onError = () => {},
+  onMouseDown = () => {},
+  selected = false,
+}: AutocompleteItemProps) {
+  const classes = useStyles();
+
+  const component: ItemNode = itemTemplate(item);
+
+  if (!isValidElement<ItemTemplateProps>(component)) {
+    return component;
+  }
+  const isDisabled = component.props['data-disabled'];
+  if (!component.props['data-value'] && !isDisabled) {
+    onError(
+      `expected a "data-value" or "data-disabled" attribute on the rendered template item.`
+    );
+  }
+  return cloneElement(component, {
+    'aria-disabled': isDisabled,
+    'aria-selected': selected,
+    class: objStr({
+      'autocomplete-item': true,
+      [classes.autocompleteItem]: true,
+      [classes.autocompleteItemActive]: selected,
+    }),
+    dir: 'auto',
+    id,
+    key: id,
+    onMouseDown,
+    part: 'option',
+    role: 'option',
+    ...component.props,
+  });
+}
diff --git a/src/bento/components/bento-autocomplete/1.0/component/component.tsx b/src/bento/components/bento-autocomplete/1.0/component/component.tsx
new file mode 100644
index 000000000000..246cb751176e
--- /dev/null
+++ b/src/bento/components/bento-autocomplete/1.0/component/component.tsx
@@ -0,0 +1,516 @@
+import {Keys_Enum} from '#core/constants/key-codes';
+import {querySelectorAllInSlot, scopedQuerySelectorAll} from '#core/dom/query';
+import {mod} from '#core/math';
+import {getValueForExpr} from '#core/types/object';
+import {includes} from '#core/types/string';
+
+import * as Preact from '#preact';
+import {useCallback, useEffect, useMemo, useRef, useState} from '#preact';
+import {ContainWrapper, useValueRef} from '#preact/component';
+import {useQuery} from '#preact/hooks/useQuery';
+import {xhrUtils} from '#preact/utils/xhr';
+
+import fuzzysearch from '#third_party/fuzzysearch';
+
+import {AutocompleteItem} from './autocomplete-item';
+import {
+  getEnabledResults,
+  getItemElement,
+  getSelectedObjectValue,
+  getSelectedTextValue,
+} from './helpers';
+import {HighlightedText} from './highlighted-text';
+import {tokenPrefixMatch} from './token-prefix-match';
+import {useAutocompleteBinding} from './use-autocomplete-binding';
+
+// @ts-ignore
+import {addParamToUrl} from '../../../../../url';
+import {useStyles} from '../component.jss';
+import {
+  BentoAutocompleteProps,
+  InputElement,
+  Item,
+  ItemTemplateFn,
+  OnSelectData,
+  isValidFilterType,
+} from '../types';
+
+const INITIAL_ACTIVE_INDEX = -1;
+
+const getItems = (response: {items: Item[]}) =>
+  getValueForExpr(response, 'items');
+
+export function BentoAutocomplete({
+  children,
+  filter = 'none',
+  filterValue = 'value',
+  highlightUserEntry = false,
+  id,
+  inline: inlineTrigger,
+  itemTemplate,
+  items = [],
+  maxItems,
+  minChars = 1,
+  onError = () => {},
+  onSelect = () => {},
+  parseJson = getItems,
+  prefetch = false,
+  query,
+  src,
+  submitOnEnter = false,
+  suggestFirst = false,
+}: BentoAutocompleteProps) {
+  const elementRef = useRef<HTMLElement>(null);
+  const containerId = useValueRef<string>(
+    id || `${Math.floor(Math.random() * 100)}_AMP_content_`
+  );
+  const inputRef = useRef<HTMLInputElement>(null);
+  const containerRef = useRef<HTMLDivElement>(null);
+
+  const [substring, setSubstring] = useState<string>('');
+  const [activeIndex, setActiveIndex] = useState<number>(INITIAL_ACTIVE_INDEX);
+  const [areResultsDisplayed, setAreResultsDisplayed] =
+    useState<boolean>(false);
+  const [shouldSuggestFirst, setShouldSuggestFirst] =
+    useState<boolean>(suggestFirst);
+  const classes = useStyles();
+  const [hasFetchedInitialData, setHasFetchedInitialData] = useState(false);
+  // In order to enable refetching, we currently have to disable the request between
+  // and re-enable it on user input.
+  const [hasFetchedData, setHasFetchedData] = useState(false);
+
+  const binding = useAutocompleteBinding(inlineTrigger);
+
+  const url = useMemo(() => {
+    if (src && query) {
+      // Don't create an invalid URL if there is a query key but not a value
+      return substring ? addParamToUrl(src, query, substring) : null;
+    }
+    return src;
+  }, [src, substring, query]);
+
+  const isFetchEnabled = useMemo(() => {
+    if (url) {
+      if (query) {
+        return !hasFetchedData;
+      }
+      if (!hasFetchedInitialData) {
+        return prefetch || areResultsDisplayed;
+      }
+    }
+    return false;
+  }, [
+    url,
+    hasFetchedInitialData,
+    hasFetchedData,
+    query,
+    prefetch,
+    areResultsDisplayed,
+  ]);
+
+  const shouldRefetch = useMemo(() => {
+    return !!query;
+  }, [query]);
+
+  const {data} = useQuery<Item[]>(
+    () => {
+      return xhrUtils.fetchJson(url!).then((response) => parseJson(response));
+    },
+    {
+      enabled: isFetchEnabled,
+      initialData: items,
+      onSettled: () => {
+        setHasFetchedInitialData(true);
+        setHasFetchedData(true);
+      },
+      onError: (error) => {
+        onError(error.message);
+      },
+    }
+  );
+
+  const setInputValue = useCallback(
+    (value: string) => {
+      inputRef.current!.value = value;
+    },
+    [inputRef]
+  );
+
+  const toggleResults = useCallback((shouldDisplay: boolean) => {
+    inputRef.current?.setAttribute('aria-expanded', shouldDisplay.toString());
+    setAreResultsDisplayed(shouldDisplay);
+  }, []);
+
+  const resetActiveItem = useCallback(() => {
+    setActiveIndex(INITIAL_ACTIVE_INDEX);
+    inputRef.current?.removeAttribute('aria-activedescendant');
+  }, [inputRef]);
+
+  const displayResults = useCallback(() => {
+    toggleResults(true);
+  }, [toggleResults]);
+
+  const hideResults = useCallback(() => {
+    resetActiveItem();
+    toggleResults(false);
+  }, [toggleResults, resetActiveItem]);
+
+  const resetUserInput = useCallback(() => {
+    setInputValue(substring);
+  }, [substring, setInputValue]);
+
+  const selectItem = useCallback(
+    (value: string, valueAsObject?: object | null) => {
+      setInputValue(value);
+      // Set the substring value to the user input value so
+      // it can no longer be reset on ESCAPE.
+      setSubstring(value);
+      const selectData: OnSelectData = {
+        value,
+        ...(valueAsObject ? {valueAsObject} : {}),
+      };
+      onSelect(selectData);
+      hideResults();
+    },
+    [onSelect, setInputValue, hideResults]
+  );
+
+  const getItemId = useCallback(
+    (index: number) => {
+      return `${containerId.current}-${index}`;
+    },
+    [containerId]
+  );
+
+  const getSingleInputOrTextarea = useCallback(
+    (element: HTMLElement) => {
+      const inputSelector = 'input,textarea';
+      let possibleElements: NodeList | HTMLElement[] = scopedQuerySelectorAll(
+        element,
+        inputSelector
+      );
+      if (possibleElements.length === 0) {
+        const slot = element.querySelector('slot');
+        if (slot) {
+          possibleElements = querySelectorAllInSlot(slot, inputSelector);
+        }
+      }
+      if (possibleElements.length !== 1) {
+        onError(`should contain exactly one <input> or <textarea> descendant.`);
+        return;
+      }
+      return possibleElements[0] as HTMLElement;
+    },
+    [onError]
+  );
+
+  const setupInputElement = useCallback(
+    (element: HTMLElement) => {
+      const inputElement = getSingleInputOrTextarea(element);
+      if (inputElement) {
+        if (inputElement.hasAttribute('type')) {
+          const inputType = inputElement.getAttribute('type');
+          if (inputType !== 'text' && inputType !== 'search') {
+            onError(
+              `requires the "type" attribute to be "text" or "search" if present on <input>.`
+            );
+          }
+        }
+        inputElement.classList.add(classes.input);
+        inputElement.setAttribute('dir', 'auto');
+        inputElement.setAttribute('aria-autocomplete', 'both');
+        inputElement.setAttribute('aria-controls', containerId.current!);
+        inputElement.setAttribute('aria-expanded', 'false');
+        if (inputElement.tagName === 'INPUT') {
+          inputElement.setAttribute('role', 'combobox');
+        } else {
+          inputElement.setAttribute('role', 'textbox');
+        }
+
+        inputRef.current = inputElement as HTMLInputElement;
+      }
+    },
+    [getSingleInputOrTextarea, onError, classes.input, containerId]
+  );
+
+  const validateProps = useCallback(() => {
+    if (!isValidFilterType(filter)) {
+      onError(`Unexpected filter: ${filter}.`);
+    }
+    if (!inlineTrigger && suggestFirst && filter !== 'prefix') {
+      onError(`"suggest-first" expected "filter" type "prefix".`);
+      setShouldSuggestFirst(false);
+    }
+  }, [filter, onError, inlineTrigger, suggestFirst]);
+
+  const showAutocompleteResults = useMemo(() => {
+    if (!areResultsDisplayed || data?.length === 0) {
+      return false;
+    }
+    return substring.length >= minChars;
+  }, [data, substring, minChars, areResultsDisplayed]);
+
+  const truncateToMaxItems = useCallback(
+    (data: Item[] = []) => {
+      if (maxItems && maxItems < data.length) {
+        return data.slice(0, maxItems);
+      }
+      return data;
+    },
+    [maxItems]
+  );
+
+  const filteredData = useMemo(() => {
+    const normalizedValue = substring.toLocaleLowerCase();
+
+    const allFilteredData = data?.filter((item: Item) => {
+      if (typeof item === 'object') {
+        item = getValueForExpr(item, filterValue);
+      }
+      if (typeof item !== 'string') {
+        onError(`data property "${filterValue}" must map to string type.`);
+        return;
+      }
+      item = item.toLocaleLowerCase();
+
+      switch (filter) {
+        case 'none':
+          return true;
+        case 'substring':
+          return includes(item, normalizedValue);
+        case 'prefix':
+          return item.startsWith(normalizedValue);
+        case 'token-prefix':
+          return tokenPrefixMatch(item, normalizedValue);
+        case 'fuzzy':
+          return fuzzysearch(normalizedValue, item);
+        case 'custom':
+          throw new Error(`Filter not yet supported: ${filter}`);
+        default:
+          throw new Error(`Unexpected filter: ${filter}`);
+      }
+    });
+
+    return truncateToMaxItems(allFilteredData);
+  }, [data, filter, substring, filterValue, onError, truncateToMaxItems]);
+
+  const updateActiveItem = useCallback(
+    (delta: number) => {
+      const keyUpWhenNoneActive =
+        activeIndex === INITIAL_ACTIVE_INDEX && delta < 0;
+      const index = keyUpWhenNoneActive ? delta : activeIndex + delta;
+      const enabledResults = getEnabledResults(elementRef.current);
+      if (delta === 0 || !showAutocompleteResults) {
+        return;
+      }
+      const modifiedIndex = mod(index, enabledResults?.length || 0);
+      const activeResult = enabledResults?.item(modifiedIndex);
+
+      setActiveIndex(modifiedIndex);
+      inputRef.current?.setAttribute('aria-activedescendant', getItemId(index));
+
+      setInputValue(getSelectedTextValue(activeResult as HTMLElement));
+    },
+    [activeIndex, getItemId, showAutocompleteResults, setInputValue]
+  );
+
+  const maybeFetchAndAutocomplete = useCallback(
+    (element: InputElement) => {
+      if (shouldRefetch) {
+        setHasFetchedData(false);
+      }
+      setSubstring(binding.getUserInputForUpdate(element));
+      displayResults();
+    },
+    [shouldRefetch, displayResults, binding]
+  );
+
+  const handleInput = useCallback(
+    (event: Event) => {
+      const element = event.target as InputElement;
+      if (binding.shouldAutocomplete(element)) {
+        maybeFetchAndAutocomplete(element);
+      }
+    },
+    [binding, maybeFetchAndAutocomplete]
+  );
+
+  const handleFocus = useCallback(() => {
+    if (binding.shouldShowOnFocus) {
+      displayResults();
+    }
+  }, [displayResults, binding]);
+
+  const handleKeyDown = useCallback(
+    (event: KeyboardEvent) => {
+      const hasActiveItem = activeIndex > INITIAL_ACTIVE_INDEX;
+
+      switch (event.key) {
+        case Keys_Enum.DOWN_ARROW: {
+          event.preventDefault();
+          const results = getEnabledResults(elementRef.current) || [];
+          if (activeIndex === results.length - 1) {
+            resetUserInput();
+            resetActiveItem();
+            return;
+          }
+          updateActiveItem(1);
+          break;
+        }
+        case Keys_Enum.UP_ARROW: {
+          event.preventDefault();
+          if (activeIndex === 0) {
+            resetUserInput();
+            resetActiveItem();
+            return;
+          }
+          updateActiveItem(-1);
+          break;
+        }
+        case Keys_Enum.ENTER: {
+          const hasActiveItem = activeIndex > INITIAL_ACTIVE_INDEX;
+          if (
+            binding.shouldPreventDefaultOnEnter(hasActiveItem, submitOnEnter)
+          ) {
+            event.preventDefault();
+          }
+          selectItem(inputRef.current!.value);
+          break;
+        }
+        case Keys_Enum.ESCAPE: {
+          resetUserInput();
+          hideResults();
+          break;
+        }
+        case Keys_Enum.TAB: {
+          if (areResultsDisplayed && hasActiveItem) {
+            event.preventDefault();
+            selectItem(inputRef.current!.value);
+          }
+          break;
+        }
+      }
+    },
+    [
+      activeIndex,
+      updateActiveItem,
+      resetUserInput,
+      hideResults,
+      resetActiveItem,
+      selectItem,
+      binding,
+      submitOnEnter,
+      areResultsDisplayed,
+    ]
+  );
+
+  const handleMousedown = useCallback(
+    (event: MouseEvent) => {
+      const element = getItemElement(event.target as HTMLElement);
+      if (!element?.hasAttribute('data-disabled')) {
+        const value = getSelectedTextValue(element);
+        const objectValue = getSelectedObjectValue(element);
+        selectItem(value, objectValue);
+      }
+    },
+    [selectItem]
+  );
+
+  const getTextForStringItem = useCallback(
+    (item: string) => {
+      if (highlightUserEntry && substring.length > 0) {
+        if (includes(item.toLocaleLowerCase(), substring.toLocaleLowerCase())) {
+          return <HighlightedText text={item} substring={substring} />;
+        }
+        if (filter === 'fuzzy') {
+          return <HighlightedText text={item} substring={substring} fuzzy />;
+        }
+      }
+      return item;
+    },
+    [highlightUserEntry, substring, filter]
+  );
+
+  const getItemTemplate = useCallback<(item: Item) => ItemTemplateFn>(
+    (item: Item) => {
+      if (typeof item === 'object') {
+        if (!itemTemplate) {
+          onError(`data must provide template for non-string items.`);
+          return () => null;
+        }
+        return itemTemplate;
+      } else {
+        return (item: string) => {
+          return <div data-value={item}>{getTextForStringItem(item)}</div>;
+        };
+      }
+    },
+    [itemTemplate, getTextForStringItem, onError]
+  );
+
+  useEffect(() => {
+    if (shouldSuggestFirst && activeIndex === INITIAL_ACTIVE_INDEX) {
+      updateActiveItem(1);
+    }
+  }, [activeIndex, updateActiveItem, shouldSuggestFirst]);
+
+  useEffect(() => {
+    setupInputElement(elementRef.current!);
+    validateProps();
+
+    inputRef.current?.addEventListener('input', handleInput);
+    inputRef.current?.addEventListener('keydown', handleKeyDown);
+    inputRef.current?.addEventListener('focus', handleFocus);
+    inputRef.current?.addEventListener('blur', hideResults);
+
+    return () => {
+      inputRef.current?.removeEventListener('input', handleInput);
+      inputRef.current?.removeEventListener('keydown', handleKeyDown);
+      inputRef.current?.removeEventListener('focus', handleFocus);
+      inputRef.current?.removeEventListener('blur', hideResults);
+    };
+  }, [
+    setupInputElement,
+    validateProps,
+    handleInput,
+    handleKeyDown,
+    handleFocus,
+    hideResults,
+    inputRef,
+  ]);
+
+  return (
+    <ContainWrapper
+      ref={elementRef}
+      class={classes.autocomplete}
+      // @ts-ignore
+      part="autocomplete"
+    >
+      {children}
+      <div
+        ref={containerRef}
+        id={containerId.current!}
+        class={classes.autocompleteResults}
+        role="listbox"
+        hidden={!showAutocompleteResults}
+        // @ts-ignore
+        part="results"
+      >
+        {filteredData.map((item: Item, index: number) => {
+          const id = getItemId(index);
+          return (
+            <AutocompleteItem
+              key={id}
+              item={item}
+              itemTemplate={getItemTemplate(item)}
+              id={id}
+              selected={activeIndex === index}
+              onError={onError}
+              onMouseDown={handleMousedown}
+            />
+          );
+        })}
+      </div>
+    </ContainWrapper>
+  );
+}
diff --git a/src/bento/components/bento-autocomplete/1.0/component/helpers.ts b/src/bento/components/bento-autocomplete/1.0/component/helpers.ts
new file mode 100644
index 000000000000..eb72842dbe6f
--- /dev/null
+++ b/src/bento/components/bento-autocomplete/1.0/component/helpers.ts
@@ -0,0 +1,39 @@
+import {tryParseJson} from '#core/types/object/json';
+
+export function getItemElement(
+  element: HTMLElement | null
+): HTMLElement | null {
+  if (!element) {
+    return null;
+  }
+  if (element.getAttribute('role') === 'option') {
+    return element as HTMLDivElement;
+  }
+  return getItemElement(element.parentElement);
+}
+
+export function getSelectedTextValue(element: HTMLElement | null): string {
+  return (
+    element?.getAttribute('data-value') ||
+    element?.firstElementChild?.getAttribute('data-value') ||
+    element?.textContent?.trim() ||
+    ''
+  );
+}
+
+export function getSelectedObjectValue(
+  element: HTMLElement | null
+): object | null {
+  if (!element?.hasAttribute('data-json')) {
+    return null;
+  }
+  return tryParseJson(element.getAttribute('data-json')!, (error) => {
+    throw error;
+  });
+}
+
+export function getEnabledResults(
+  element: HTMLElement | null
+): NodeListOf<Element> | undefined {
+  return element?.querySelectorAll('[role="option"]:not([data-disabled=true])');
+}
diff --git a/src/bento/components/bento-autocomplete/1.0/component/highlighted-text.tsx b/src/bento/components/bento-autocomplete/1.0/component/highlighted-text.tsx
new file mode 100644
index 000000000000..7bcfcd326614
--- /dev/null
+++ b/src/bento/components/bento-autocomplete/1.0/component/highlighted-text.tsx
@@ -0,0 +1,41 @@
+import * as Preact from '#preact';
+
+type HighlightedTextProps = {
+  substring: string;
+  text: string;
+  fuzzy?: boolean;
+};
+
+export function HighlightedText({
+  fuzzy,
+  substring,
+  text,
+}: HighlightedTextProps) {
+  const lowerCaseSubstring = substring.toLocaleLowerCase();
+  const lowerCaseText = text.toLocaleLowerCase();
+
+  if (fuzzy) {
+    return (
+      <>
+        {text.split('').map((char) => {
+          if (lowerCaseSubstring.includes(char.toLocaleLowerCase())) {
+            return <span class="autocomplete-partial">{char}</span>;
+          }
+          return char;
+        })}
+      </>
+    );
+  }
+
+  const substringStart = lowerCaseText.indexOf(lowerCaseSubstring);
+  const substringEnd = substringStart + substring.length;
+  return (
+    <>
+      {text.slice(0, substringStart)}
+      <span class="autocomplete-partial">
+        {text.slice(substringStart, substringEnd)}
+      </span>
+      {text.slice(substringEnd, text.length)}
+    </>
+  );
+}
diff --git a/src/bento/components/bento-autocomplete/1.0/component/token-prefix-match.ts b/src/bento/components/bento-autocomplete/1.0/component/token-prefix-match.ts
new file mode 100644
index 000000000000..294724ce8da9
--- /dev/null
+++ b/src/bento/components/bento-autocomplete/1.0/component/token-prefix-match.ts
@@ -0,0 +1,81 @@
+import {hasOwn, map, ownProperty} from '#core/types/object';
+
+/**
+ * Takes a string, removes '.', and splits by special characters.
+ * Returns the resulting array of tokens.
+ */
+function tokenizeString(inputStr: string) {
+  inputStr = inputStr.replace(/[\.]+/g, '');
+  return inputStr.split(/[`~(){}_|+\-;:\'",\[\]\\\/ ]+/g);
+}
+
+/**
+ * Returns the given tokens array as a dictionary of key: token (str) and
+ * value: number of occurrences.
+ */
+function mapFromTokensArray(tokens: string[]) {
+  const tokensMap: {[key: string]: number} = map();
+  tokens.forEach((token) => {
+    const count = hasOwn(tokensMap, token)
+      ? ownProperty(tokensMap, token) + 1
+      : 1;
+    tokensMap[token] = count;
+  });
+  return tokensMap;
+}
+
+/**
+ * Returns true if the given input string is a token-prefix match on the
+ * given item string. Assumes toLocaleLowerCase() has been performed on both
+ * parameters.
+ *
+ * Matches:
+ * washington dc, dc
+ * washington dc, wash
+ * washington dc, dc washington
+ * new york ny, new york
+ *
+ * Non-matches:
+ * washington dc, district of columbia
+ * washington dc, washington d c
+ * washington dc, ashington dc
+ */
+export function tokenPrefixMatch(item: string, input: string) {
+  if (input === '') {
+    return true;
+  }
+
+  const itemTokens = tokenizeString(item);
+  const inputTokens = tokenizeString(input);
+
+  const itemTokensMap = mapFromTokensArray(itemTokens);
+  const lastInputToken = inputTokens[inputTokens.length - 1];
+  inputTokens.splice(inputTokens.length - 1, 1);
+  let match = true;
+  for (let i = 0; i < inputTokens.length; i++) {
+    const token = inputTokens[i];
+    if (token === '') {
+      continue;
+    }
+    if (!hasOwn(itemTokensMap, token)) {
+      match = false;
+      break;
+    }
+    const count = Number(ownProperty(itemTokensMap, token));
+    if (count > 1) {
+      itemTokensMap[token] = count - 1;
+    } else {
+      delete itemTokensMap[token];
+    }
+  }
+
+  // Return that the last input token is a prefix of one of the item tokens
+  const remainingItemTokens = Object.keys(itemTokensMap);
+  return (
+    match &&
+    (lastInputToken === '' ||
+      remainingItemTokens.some((itemToken) => {
+        return itemToken.startsWith(lastInputToken);
+      }))
+  );
+}
diff --git a/src/bento/components/bento-autocomplete/1.0/component/use-autocomplete-binding.ts b/src/bento/components/bento-autocomplete/1.0/component/use-autocomplete-binding.ts
new file mode 100644
index 000000000000..919baa088427
--- /dev/null
+++ b/src/bento/components/bento-autocomplete/1.0/component/use-autocomplete-binding.ts
@@ -0,0 +1,13 @@
+import {AutocompleteBindingInline} from './autocomplete-binding-inline';
+import {AutocompleteBindingSingle} from './autocomplete-binding-single';
+
+import {AutocompleteBinding} from '../types';
+
+export const useAutocompleteBinding: (
+  trigger?: string
+) => AutocompleteBinding = (trigger) => {
+  if (!!trigger) {
+    return new AutocompleteBindingInline(trigger);
+  }
+  return new AutocompleteBindingSingle();
+};
diff --git a/src/bento/components/bento-autocomplete/1.0/storybook/Basic.js b/src/bento/components/bento-autocomplete/1.0/storybook/Basic.js
new file mode 100644
index 000000000000..8835f062d8ca
--- /dev/null
+++ b/src/bento/components/bento-autocomplete/1.0/storybook/Basic.js
@@ -0,0 +1,109 @@
+import {BentoAutocomplete} from '#bento/components/bento-autocomplete/1.0/component';
+
+import * as Preact from '#preact';
+import {xhrUtils} from '#preact/utils/xhr';
+
+import '../component.jss';
+
+export default {
+  title: 'Autocomplete',
+  component: BentoAutocomplete,
+  args: {
+    items: [
+      'apple',
+      'banana',
+      'cherry',
+      'orange',
+      'pear',
+      'pineapple',
+      'strawberry',
+      'watermelon',
+      'lemon',
+      'lime',
+    ],
+    filter: 'prefix',
+    minChars: 1,
+    highlightUserEntry: true,
+    suggestFirst: false,
+    onError: console.error,
+  },
+  argTypes: {
+    filter: {
+      control: {
+        type: 'select',
+        options: ['none', 'prefix', 'fuzzy', 'substring', 'token-prefix'],
+      },
+    },
+  },
+};
+
+export const _default = (args) => {
+  return (
+    <BentoAutocomplete {...args}>
+      <input type="text"></input>
+    </BentoAutocomplete>
+  );
+};
+
+export const inline = (args) => {
+  return (
+    <BentoAutocomplete {...args}>
+      <textarea></textarea>
+    </BentoAutocomplete>
+  );
+};
+
+inline.args = {
+  inline: ':',
+};
+
+// eslint-disable-next-line local/no-export-side-effect
+export const withCustomItems = _default.bind();
+
+withCustomItems.args = {
+  items: [
+    {
+      city: 'Seattle',
+      state: 'WA',
+      emoji: '🦦',
+    },
+    {
+      city: 'San Francisco',
+      state: 'CA',
+      emoji: '🌉',
+    },
+    {
+      city: 'New York',
+      state: 'NY',
+      emoji: '🌇',
+    },
+  ],
+  filterValue: 'city',
+  itemTemplate: ({city, emoji, state}) => {
+    return (
+      <div data-value={`${city}, ${state}`}>
+        {emoji} {city}, {state}
+      </div>
+    );
+  },
+};
+
+// eslint-disable-next-line local/no-export-side-effect
+export const withDataFromApi = _default.bind({});
+
+withDataFromApi.args = {
+  items: null,
+  src: 'https://datausa.io/api/data?drilldowns=State&measures=Population&year=latest',
+  fetchJson: (src) => xhrUtils.fetchJson(src),
+  parseJson: (json) => {
+    return json.data.map((v) => ({state: v.State, population: v.Population}));
+  },
+  filterValue: 'state',
+  itemTemplate: ({population, state}) => {
+    return (
+      <div data-value={state}>
+        {state} - <span style={{color: 'gray'}}>{population}</span>
+      </div>
+    );
+  },
+};
diff --git a/src/bento/components/bento-autocomplete/1.0/types.ts b/src/bento/components/bento-autocomplete/1.0/types.ts
new file mode 100644
index 000000000000..6b781232d7f0
--- /dev/null
+++ b/src/bento/components/bento-autocomplete/1.0/types.ts
@@ -0,0 +1,68 @@
+import {ComponentChildren, ComponentProps, VNode} from '#preact/types';
+
+const filterTypes = [
+  'substring',
+  'prefix',
+  'token-prefix',
+  'fuzzy',
+  'custom',
+  'none',
+] as const;
+
+export type FilterType = (typeof filterTypes)[number];
+
+export function isValidFilterType(filterType: any): filterType is FilterType {
+  return filterTypes.includes(filterType);
+}
+
+export type Item = string | object;
+
+export type OnSelectData = {value: string; valueAsObject?: object};
+
+export type InputElement = HTMLInputElement | HTMLTextAreaElement;
+
+export type ItemTemplateProps = {
+  'data-value'?: string;
+  'data-disabled'?: boolean;
+};
+
+export type ItemNode = VNode<ItemTemplateProps> | null;
+
+export type ItemTemplateFn = (item: Item) => ItemNode;
+export interface BentoAutocompleteProps {
+  id?: string;
+  onError?: (message: string) => void;
+  onSelect?: (data: OnSelectData) => void;
+  children?: ComponentChildren;
+  filter?: FilterType;
+  minChars?: number;
+  items?: Item[];
+  filterValue?: string;
+  maxItems?: number;
+  highlightUserEntry?: boolean;
+  inline?: string;
+  itemTemplate?: ItemTemplateFn;
+  prefetch?: boolean;
+  submitOnEnter?: boolean;
+  suggestFirst?: boolean;
+  src?: string;
+  parseJson?: (response: any) => Item[];
+  query?: string;
+}
+
+export interface AutocompleteItemProps extends ComponentProps<any> {
+  item: Item;
+  itemTemplate: ItemTemplateFn;
+  onError?: (message: string) => void;
+  selected?: boolean;
+}
+
+export interface AutocompleteBinding {
+  shouldAutocomplete(inputEl: InputElement): boolean;
+  getUserInputForUpdate(inputEl: InputElement): string;
+  shouldShowOnFocus: boolean;
+  shouldPreventDefaultOnEnter(
+    activeElement: boolean,
+    submitOnEnter: boolean
+  ): boolean;
+}
diff --git a/src/bento/components/bento-base-carousel/1.0/README.md b/src/bento/components/bento-base-carousel/1.0/README.md
new file mode 100644
index 000000000000..bbc033178bb9
--- /dev/null
+++ b/src/bento/components/bento-base-carousel/1.0/README.md
@@ -0,0 +1,680 @@
+# Bento Carousel
+
+A generic carousel for displaying multiple similar pieces of content along a horizontal or vertical axis. Each of the component’s immediate children is considered an item in the carousel. Each of these nodes may also have arbitrary children. The carousel consists of an arbitrary number of items, as well as optional navigational arrows to go forward or backwards a single item. The carousel advances between items if the user swipes or uses the customizable arrow buttons.
+
+## Web Component
+
+You must include each Bento component's required CSS library to guarantee proper loading and before adding custom styles. Or use the light-weight pre-upgrade styles available inline. See [Layout and style](#layout-and-style).
+
+### Import via npm
+
+```sh
+npm install @bentoproject/base-carousel
+```
+
+```javascript
+import {defineElement as defineBentoBaseCarousel} from '@bentoproject/base-carousel';
+defineBentoBaseCarousel();
+```
+
+### Include via `<script>`
+
+```html
+<script type="module" src="https://cdn.ampproject.org/bento.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/bento.js" crossorigin="anonymous"></script>
+<script type="module" src="https://cdn.ampproject.org/v0/bento-base-carousel-1.0.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/v0/bento-base-carousel-1.0.js" crossorigin="anonymous"></script>
+<link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-base-carousel-1.0.css" crossorigin="anonymous">
+```
+
+### Example
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-base-carousel-1.0.css"
+    />
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-base-carousel-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-base-carousel-1.0.js"
+    ></script>
+    <style>
+      bento-base-carousel,
+      bento-base-carousel > div {
+        aspect-ratio: 4/1;
+      }
+      .red {
+        background: darkred;
+      }
+      .blue {
+        background: steelblue;
+      }
+      .green {
+        background: seagreen;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-base-carousel id="my-carousel">
+      <div class="red"></div>
+      <div class="blue"></div>
+      <div class="green"></div>
+    </bento-base-carousel>
+  </body>
+</html>
+```
+
+### Interactivity and API usage
+
+Bento components are highly interactive through their API. The `bento-base-carousel` component API is accessible by including the following script tag in your document:
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-base-carousel-1.0.css"
+    />
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-base-carousel-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-base-carousel-1.0.js"
+    ></script>
+    <style>
+      bento-base-carousel,
+      bento-base-carousel > div {
+        aspect-ratio: 4/1;
+      }
+      .red {
+        background: darkred;
+      }
+      .blue {
+        background: steelblue;
+      }
+      .green {
+        background: seagreen;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-base-carousel id="my-carousel">
+      <div class="red"></div>
+      <div class="blue"></div>
+      <div class="green"></div>
+    </bento-base-carousel>
+    <div class="buttons" style="margin-top: 8px">
+      <button id="prev-button">Go to previous slide</button>
+      <button id="next-button">Go to next slide</button>
+      <button id="go-to-button">Go to slide with green gradient</button>
+    </div>
+
+    <script>
+      (async () => {
+        const carousel = document.querySelector('#my-carousel');
+        await customElements.whenDefined('bento-base-carousel');
+        const api = await carousel.getApi();
+
+        // programatically advance to next slide
+        api.next();
+
+        // set up button actions
+        document.querySelector('#prev-button').onclick = () => api.prev();
+        document.querySelector('#next-button').onclick = () => api.next();
+        document.querySelector('#go-to-button').onclick = () =>
+          api.goToSlide(2);
+      })();
+    </script>
+  </body>
+</html>
+```
+
+```javascript
+await customElements.whenDefined('bento-base-carousel');
+const api = await carousel.getApi();
+```
+
+#### Actions
+
+The `bento-base-carousel` API allows you to perform the following actions:
+
+##### next()
+
+Moves the carousel forwards by `advance-count` slides.
+
+```javascript
+api.next();
+```
+
+##### prev()
+
+Moves the carousel backwards by `advance-count` slides.
+
+```javascript
+api.prev();
+```
+
+##### goToSlide(index: number)
+
+Moves the carousel to the slide specified by the `index` argument. Note: `index` will be normalized to a number greater than or equal to `0` and less than the number of slides given.
+
+```javascript
+api.goToSlide(0); // Advance to first slide.
+api.goToSlide(length - 1); // Advance to last slide.
+```
+
+#### Events
+
+The `bento-base-carousel` API allows you to register and respond to the following events:
+
+##### slideChange
+
+This event is triggered when the index displayed by the carousel has changed. The new index is available via `event.data.index`.
+
+```javascript
+carousel.addEventListener('slideChange', (e) => console.log(e.data.index));
+```
+
+### Layout and style
+
+Each Bento component has a small CSS library you must include to guarantee proper loading without [content shifts](https://web.dev/cls/). Because of order-based specificity, you must manually ensure that stylesheets are included before any custom styles.
+
+```html
+<link
+  rel="stylesheet"
+  type="text/css"
+  href="https://cdn.ampproject.org/v0/bento-base-carousel-1.0.css"
+/>
+```
+
+Alternatively, you may also make the light-weight pre-upgrade styles available inline:
+
+```html
+<style>
+  bento-base-carousel {
+    display: block;
+    overflow: hidden;
+    position: relative;
+  }
+</style>
+```
+
+#### Container type
+
+The `bento-base-carousel` component has a defined layout size type. To ensure the component renders correctly, be sure to apply a size to the component and its immediate children (slides) via a desired CSS layout (such as one defined with `height`, `width`, `aspect-ratio`, or other such properties):
+
+```css
+bento-base-carousel {
+  height: 100px;
+  width: 100%;
+}
+
+bento-base-carousel > * {
+  aspect-ratio: 4/1;
+}
+```
+
+### Right-to-left slide change
+
+`<bento-base-carousel>` requires that you define when it is in an right-to-left (rtl) context (e.g. Arabic, Hebrew pages). While the carousel will generally work without this, there may be a few bugs. You can let the carousel know that it should operate as `rtl` as follows:
+
+```html
+<bento-base-carousel dir="rtl" …> … </bento-base-carousel>
+```
+
+If the carousel is in a RTL context, and you want the carousel to operate as LTR, you can explicitly set the `dir="ltr"` on the carousel.
+
+### Slide layout
+
+Slides are automatically sized by the carousel when **not** specifying `mixed-lengths`.
+
+```html
+<bento-base-carousel …>
+  <img style="height: 100%; width: 100%" src="…" />
+</bento-base-carousel>
+```
+
+The slides have implicit height when the carousel is laid out. This can easily be changed with CSS. When specifying the height, the slide will be vertically centered within the carousel.
+
+If you want to horizontally center your slide content, you will want to create a wrapping element, and use that to center the content.
+
+### Number of visible slides
+
+When changing the number of visible slides using `visible-slides`, in response to a media query, you will likely want to change the aspect ratio of the carousel itself to match the new number of visible slides. For example, if you want to show three slides at a time with a one by one aspect ratio, you would want an aspect ratio of three by one for the carousel itself. Similiarly, with four slides at a time you would want an aspect ratio of four by one. In addition, when changing `visible-slides`, you likely want to change `advance-count`.
+
+```html
+<!-- Using an aspect ratio of 3:2 for the slides in this example. -->
+<bento-base-carousel
+  visible-count="(min-width: 600px) 4, 3"
+  advance-count="(min-width: 600px) 4, 3"
+>
+  <img style="height: 100%; width: 100%" src="…" />
+  …
+</bento-base-carousel>
+```
+
+### Attributes
+
+#### Media Queries
+
+The attributes for `<bento-base-carousel>` can be configured to use different options based on a [media query](./../../../../../docs/spec/amp-html-responsive-attributes.md).
+
+#### Number of visible slides
+
+##### mixed-length
+
+Either `true` or `false`, defaults to `false`. When true, uses the existing width (or height when horizontal) for each of the slides. This allows for a carousel with slides of different widths to be used.
+
+##### visible-count
+
+A number, defaults to `1`. Determines how many slides should be shown at a given time. Fractional values can be used to make part of a(n) additional slide(s) visible. This option is ignored when `mixed-length` is `true`.
+
+##### advance-count
+
+A number, defaults to `1`. Determines how many slides the carousel will advance when advancing using the previous or next arrows. This is useful when specifying the `visible-count` attribute.
+
+#### Auto advance
+
+##### auto-advance
+
+Either `true` or `false`, defaults to `false`. Automatically advances the carousel to the next slide based on a delay. If the user manually changes slides, then the auto advance is stopped. Note that if `loop` is not enabled, when reaching the last item, the auto advance will move backwards to the first item.
+
+##### auto-advance-count
+
+A number, defaults to `1`. Determines how many slides the carousel will advance when automatically advancing. This is useful when specifying the `visible-count` attribute.
+
+##### auto-advance-interval
+
+A number, defaults to `1000`. Specifies the amount of time, in milliseconds, between subsequent automatic advances of the carousel.
+
+##### auto-advance-loops
+
+A number, defaults to `∞`. The number of times the carousel should advance through the slides before stopping.
+
+#### Snapping
+
+##### snap
+
+Either `true` or `false`, defaults to `true`. Determines whether or not the carousel should snap on slides when scrolling.
+
+##### snap-align
+
+Either `start` or `center`. When start aligning, the start of a slide (e.g. the left edge, when horizontal aligning) is aligned with the start of a carousel. When center aligning, the center of a slide is aligned with the center of a carousel.
+
+##### snap-by
+
+A number, defaults to `1`. This determines the granularity of snapping and is useful when using `visible-count`.
+
+#### Miscellaneous
+
+##### controls
+
+Either `"always"`, `"auto"`, or `"never"`, defaults to `"auto"`. This determines if and when prev/next navigational arrows are displayed. Note: When `outset-arrows` is `true`, the arrows are shown `"always"`.
+
+-   `always`: Arrows are always displayed.
+-   `auto`: Arrows are displayed when the carousel has most recently received interaction via mouse, and not displayed when the carousel has most recently received interaction via touch. On first load for touch devices, arrows are displayed until first interaction.
+-   `never`: Arrows are never displayed.
+
+##### slide
+
+A number, defaults to `0`. This determines the initial slide shown in the carousel. This may be mutated with `Element.setAttribute` to control which slide is currently showing.
+
+##### loop
+
+Either `true` or `false`, defaults to `false` when omitted. When true, the carousel will allow the user to move from the first item back to the last item and visa versa. There must be at least three times the `visible-count` of slides present for looping to occur.
+
+##### orientation
+
+Either `horizontal` or `vertical`, defaults to `horizontal`. When `horizontal` the carousel will lay out horizontally, with the user being able to swipe left and right. When `vertical`, the carousel lays out vertically, with the user being able to swipe up and down.
+
+### Styling
+
+You may use the `bento-base-carousel` element selector to style the carousel freely.
+
+#### Customizing arrow buttons
+
+Arrow buttons can be customized by passing in your own custom markup. For example, you can recreate the default styling with the following HTML and CSS:
+
+```css
+.carousel-prev,
+.carousel-next {
+  filter: drop-shadow(0px 1px 2px #4a4a4a);
+  width: 40px;
+  height: 40px;
+  padding: 20px;
+  background-color: transparent;
+  border: none;
+  outline: none;
+}
+
+.carousel-prev {
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path  d="M14,7.4 L9.4,12 L14,16.6" fill="none" stroke="#fff" stroke-width="2px" stroke-linejoin="round" stroke-linecap="round" /></svg>');
+}
+
+.carousel-next {
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path  d="M10,7.4 L14.6,12 L10,16.6" fill="none" stroke="#fff" stroke-width="2px" stroke-linejoin="round" stroke-linecap="round" /></svg>');
+}
+```
+
+```html
+<bento-base-carousel …>
+  <div>first slide</div>
+  …
+  <button slot="next-arrow" class="carousel-next" aria-label="Next"></button>
+  <button
+    slot="prev-arrow"
+    class="carousel-prev"
+    aria-label="Previous"
+  ></button>
+</bento-base-carousel>
+```
+
+---
+
+## Preact/React Component
+
+### Import via npm
+
+```sh
+npm install @bentoproject/base-carousel
+```
+
+```javascript
+import React from 'react';
+import {BentoBaseCarousel} from '@bentoproject/base-carousel/react';
+import '@bentoproject/base-carousel/styles.css';
+
+function App() {
+  return (
+    <BentoBaseCarousel>
+      <img src="puppies.jpg" />
+      <img src="kittens.jpg" />
+      <img src="hamsters.jpg" />
+    </BentoBaseCarousel>
+  );
+}
+```
+
+### Interactivity and API usage
+
+Bento components are highly interactive through their API. The `BentoBaseCarousel` component API is accessible by passing a `ref`:
+
+```javascript
+import React, {createRef} from 'react';
+const ref = createRef();
+
+function App() {
+  return (
+    <BentoBaseCarousel ref={ref}>
+      <img src="puppies.jpg" />
+      <img src="kittens.jpg" />
+      <img src="hamsters.jpg" />
+    </BentoBaseCarousel>
+  );
+}
+```
+
+#### Actions
+
+The `BentoBaseCarousel` API allows you to perform the following actions:
+
+##### next()
+
+Moves the carousel forwards by `advanceCount` slides.
+
+```javascript
+ref.current.next();
+```
+
+##### prev()
+
+Moves the carousel backwards by `advanceCount` slides.
+
+```javascript
+ref.current.prev();
+```
+
+##### goToSlide(index: number)
+
+Moves the carousel to the slide specified by the `index` argument. Note: `index` will be normalized to a number greater than or equal to `0` and less than the number of slides given.
+
+```javascript
+ref.current.goToSlide(0); // Advance to first slide.
+ref.current.goToSlide(length - 1); // Advance to last slide.
+```
+
+#### Events
+
+The `BentoBaseCarousel` API allows you to register and respond to the following events:
+
+##### onSlideChange
+
+This event is triggered when the index displayed by the carousel has changed.
+
+```jsx
+<BentoBaseCarousel onSlideChange={(index) => console.log(index)}>
+  <img src="puppies.jpg" />
+  <img src="kittens.jpg" />
+  <img src="hamsters.jpg" />
+</BentoBaseCarousel>
+```
+
+### Layout and style
+
+#### Container type
+
+The `BentoBaseCarousel` component has a defined layout size type. To ensure the component renders correctly, be sure to apply a size to the component and its immediate children (slides) via a desired CSS layout (such as one defined with `height`, `width`, `aspect-ratio`, or other such properties). These can be applied inline:
+
+```jsx
+<BentoBaseCarousel style={{width: 300, height: 100}}>
+  <img src="puppies.jpg" />
+  <img src="kittens.jpg" />
+  <img src="hamsters.jpg" />
+</BentoBaseCarousel>
+```
+
+Or via `className`:
+
+```jsx
+<BentoBaseCarousel className="custom-styles">
+  <img src="puppies.jpg" />
+  <img src="kittens.jpg" />
+  <img src="hamsters.jpg" />
+</BentoBaseCarousel>
+```
+
+```css
+.custom-styles {
+  height: 100px;
+  width: 100%;
+}
+
+.custom-styles > * {
+  aspect-ratio: 4/1;
+}
+```
+
+### Right-to-left slide change
+
+`<BentoBaseCarousel>` requires that you define when it is in an right-to-left (rtl) context (e.g. Arabic, Hebrew pages). While the carousel will generally work without this, there may be a few bugs. You can let the carousel know that it should operate as `rtl` as follows:
+
+```jsx
+<BentoBaseCarousel dir="rtl">…</BentoBaseCarousel>
+```
+
+If the carousel is in a RTL context, and you want the carousel to operate as LTR, you can explicitly set the `dir="ltr"` on the carousel.
+
+### Slide layout
+
+Slides are automatically sized by the carousel when **not** specifying `mixedLengths`.
+
+```jsx
+<BentoBaseCarousel>
+  <img style={{height: '100%', width: '100%'}} src="…" />
+</BentoBaseCarousel>
+```
+
+The slides have implicit height when the carousel is laid out. This can easily be changed with CSS. When specifying the height, the slide will be vertically centered within the carousel.
+
+If you want to horizontally center your slide content, you will want to create a wrapping element, and use that to center the content.
+
+### Number of visible slides
+
+When changing the number of visible slides using `visibleSlides`, in response to a media query, you will likely want to change the aspect ratio of the carousel itself to match the new number of visible slides. For example, if you want to show three slides at a time with a one by one aspect ratio, you would want an aspect ratio of three by one for the carousel itself. Similiarly, with four slides at a time you would want an aspect ratio of four by one. In addition, when changing `visibleSlides`, you likely want to change `advanceCount`.
+
+```jsx
+const count = window.matchMedia('(max-width: 600px)').matches ? 4 : 3;
+
+<BentoBaseCarousel visibleCount={count} advanceCount={count}>
+  <img style={{height: '100%', width: '100%'}} src="…" />…
+</BentoBaseCarousel>
+```
+
+### Props
+
+#### Number of visible slides
+
+##### mixedLength
+
+Either `true` or `false`, defaults to `false`. When true, uses the existing width (or height when horizontal) for each of the slides. This allows for a carousel with slides of different widths to be used.
+
+##### visibleCount
+
+A number, defaults to `1`. Determines how many slides should be shown at a given time. Fractional values can be used to make part of a(n) additional slide(s) visible. This option is ignored when `mixedLength` is `true`.
+
+##### advanceCount
+
+A number, defaults to `1`. Determines how many slides the carousel will advance when advancing using the previous or next arrows. This is useful when specifying the `visibleCount` attribute.
+
+#### Auto advance
+
+##### autoAdvance
+
+Either `true` or `false`, defaults to `false`. Automatically advances the carousel to the next slide based on a delay. If the user manually changes slides, then the auto advance is stopped. Note that if `loop` is not enabled, when reaching the last item, the auto advance will move backwards to the first item.
+
+##### autoAdvanceCount
+
+A number, defaults to `1`. Determines how many slides the carousel will advance when automatically advancing. This is useful when specifying the `visible-count` attribute.
+
+##### autoAdvanceInterval
+
+A number, defaults to `1000`. Specifies the amount of time, in milliseconds, between subsequent automatic advances of the carousel.
+
+##### autoAdvanceLoops
+
+A number, defaults to `∞`. The number of times the carousel should advance through the slides before stopping.
+
+#### Snapping
+
+##### snap
+
+Either `true` or `false`, defaults to `true`. Determines whether or not the carousel should snap on slides when scrolling.
+
+##### snapAlign
+
+Either `start` or `center`. When start aligning, the start of a slide (e.g. the left edge, when horizontal aligning) is aligned with the start of a carousel. When center aligning, the center of a slide is aligned with the center of a carousel.
+
+##### snapBy
+
+A number, defaults to `1`. This determines the granularity of snapping and is useful when using `visible-count`.
+
+#### Miscellaneous
+
+##### controls
+
+Either `"always"`, `"auto"`, or `"never"`, defaults to `"auto"`. This determines if and when prev/next navigational arrows are displayed. Note: When `outset-arrows` is `true`, the arrows are shown `"always"`.
+
+-   `always`: Arrows are always displayed.
+-   `auto`: Arrows are displayed when the carousel has most recently received interaction via mouse, and not displayed when the carousel has most recently received interaction via touch. On first load for touch devices, arrows are displayed until first interaction.
+-   `never`: Arrows are never displayed.
+
+##### defaultSlide
+
+A number, defaults to `0`. This determines the initial slide shown in the carousel.
+
+##### loop
+
+Either `true` or `false`, defaults to `false` when omitted. When true, the carousel will allow the user to move from the first item back to the last item and visa versa. There must be at least three times the `visible-count` of slides present for looping to occur.
+
+##### orientation
+
+Either `horizontal` or `vertical`, defaults to `horizontal`. When `horizontal` the carousel will lay out horizontally, with the user being able to swipe left and right. When `vertical`, the carousel lays out vertically, with the user being able to swipe up and down.
+
+### Styling
+
+You may use the `BentoBaseCarousel` element selector to style the carousel freely.
+
+#### Customizing arrow buttons
+
+Arrow buttons can be customized by passing in your own custom markup. For example, you can recreate the default styling with the following HTML and CSS:
+
+```css
+.carousel-prev,
+.carousel-next {
+  filter: drop-shadow(0px 1px 2px #4a4a4a);
+  width: 40px;
+  height: 40px;
+  padding: 20px;
+  background-color: transparent;
+  border: none;
+  outline: none;
+}
+
+.carousel-prev {
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path  d="M14,7.4 L9.4,12 L14,16.6" fill="none" stroke="#fff" stroke-width="2px" stroke-linejoin="round" stroke-linecap="round" /></svg>');
+}
+
+.carousel-next {
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path  d="M10,7.4 L14.6,12 L10,16.6" fill="none" stroke="#fff" stroke-width="2px" stroke-linejoin="round" stroke-linecap="round" /></svg>');
+}
+```
+
+```jsx
+function CustomPrevButton(props) {
+  return <button {...props} className="carousel-prev" />;
+}
+
+function CustomNextButton(props) {
+  return <button {...props} className="carousel-prev" />;
+}
+
+<BentoBaseCarousel
+  arrowPrevAs={CustomPrevButton}
+  arrowNextAs={CustomNextButton}
+>
+  <div>first slide</div>
+  // …
+</BentoBaseCarousel>
+```
diff --git a/extensions/amp-base-carousel/1.0/arrow.js b/src/bento/components/bento-base-carousel/1.0/arrow.js
similarity index 96%
rename from extensions/amp-base-carousel/1.0/arrow.js
rename to src/bento/components/bento-base-carousel/1.0/arrow.js
index 274fd04b9b42..107f85ddf573 100644
--- a/extensions/amp-base-carousel/1.0/arrow.js
+++ b/src/bento/components/bento-base-carousel/1.0/arrow.js
@@ -1,7 +1,10 @@
+import objstr from 'obj-str';
+
 import * as Preact from '#preact';
 import {useCallback} from '#preact';
+import {propName} from '#preact/utils';
+
 import {useStyles} from './component.jss';
-import objstr from 'obj-str';
 
 /**
  * @param {!BentoBaseCarouselDef.ArrowProps} props
@@ -50,9 +53,9 @@ export function Arrow({
 function DefaultArrow({
   'aria-disabled': ariaDisabled,
   by,
-  'class': className,
   disabled,
   onClick,
+  [propName('class')]: className,
 }) {
   const classes = useStyles();
   return (
diff --git a/src/bento/components/bento-base-carousel/1.0/base-element.js b/src/bento/components/bento-base-carousel/1.0/base-element.js
new file mode 100644
index 000000000000..b7a54ccfe887
--- /dev/null
+++ b/src/bento/components/bento-base-carousel/1.0/base-element.js
@@ -0,0 +1,93 @@
+import {PreactBaseElement} from '#preact/base-element';
+
+import {CarouselContextProp} from './carousel-props';
+import {BentoBaseCarousel} from './component';
+import {CSS as COMPONENT_CSS} from './component.jss';
+
+export class BaseElement extends PreactBaseElement {
+  /** @param {!AmpElement} element */
+  constructor(element) {
+    super(element);
+
+    /** @private {?number} */
+    this.slide_ = null;
+  }
+
+  /** @override */
+  init() {
+    const {element} = this;
+    this.slide_ = parseInt(element.getAttribute('slide'), 10);
+    return {
+      'defaultSlide': this.slide_ || 0,
+      'onSlideChange': (index) => {
+        this.triggerEvent(element, 'slideChange', {'index': index});
+      },
+    };
+  }
+
+  /** @override */
+  mutationObserverCallback() {
+    const slide = parseInt(this.element.getAttribute('slide'), 10);
+    if (slide === this.slide_) {
+      return;
+    }
+    this.slide_ = slide;
+    if (!isNaN(slide)) {
+      this.api().goToSlide(slide);
+    }
+  }
+}
+
+/** @override */
+BaseElement['Component'] = BentoBaseCarousel;
+
+/** @override */
+BaseElement['layoutSizeDefined'] = true;
+
+/** @override */
+BaseElement['props'] = {
+  'advanceCount': {attr: 'advance-count', type: 'number', media: true},
+  'arrowPrevAs': {
+    selector: '[slot="prev-arrow"]',
+    single: true,
+    as: true,
+  },
+  'arrowNextAs': {
+    selector: '[slot="next-arrow"]',
+    single: true,
+    as: true,
+  },
+  'autoAdvance': {attr: 'auto-advance', type: 'boolean', media: true},
+  'autoAdvanceCount': {attr: 'auto-advance-count', type: 'number', media: true},
+  'autoAdvanceInterval': {
+    attr: 'auto-advance-interval',
+    type: 'number',
+    media: true,
+  },
+  'autoAdvanceLoops': {attr: 'auto-advance-loops', type: 'number', media: true},
+  'controls': {attr: 'controls', media: true},
+  'orientation': {attr: 'orientation', media: true, default: 'horizontal'},
+  'loop': {attr: 'loop', type: 'boolean', media: true},
+  'mixedLength': {attr: 'mixed-length', type: 'boolean', media: true},
+  'outsetArrows': {attr: 'outset-arrows', type: 'boolean', media: true},
+  'snap': {attr: 'snap', type: 'boolean', media: true, default: true},
+  'snapBy': {attr: 'snap-by', type: 'number', media: true},
+  'snapAlign': {attr: 'snap-align', media: true},
+  'visibleCount': {attr: 'visible-count', type: 'number', media: true},
+  'children': {
+    props: {
+      'thumbnailSrc': {attr: 'data-thumbnail-src'},
+    },
+    selector: '*', // This should be last as catch-all.
+    single: false,
+  },
+};
+
+/** @override */
+BaseElement['usesShadowDom'] = true;
+
+/** @override */
+BaseElement['shadowCss'] = COMPONENT_CSS;
+
+/** @override */
+BaseElement['useContexts'] = [CarouselContextProp];
diff --git a/src/bento/components/bento-base-carousel/1.0/bento-base-carousel.css b/src/bento/components/bento-base-carousel/1.0/bento-base-carousel.css
new file mode 100644
index 000000000000..135826bc0aa6
--- /dev/null
+++ b/src/bento/components/bento-base-carousel/1.0/bento-base-carousel.css
@@ -0,0 +1,17 @@
+/*
+ * Pre-upgrade:
+ * - display:block element
+ * - size-defined element
+ */
+bento-base-carousel {
+  display: block;
+  overflow: hidden;
+  position: relative;
+}
+
+/* Pre-upgrade: size-defining element - hide children. */
+bento-base-carousel:not(.i-amphtml-built)
+  > :not([placeholder]):not([slot='i-amphtml-svc']) {
+  display: none;
+  content-visibility: hidden;
+}
diff --git a/extensions/amp-base-carousel/1.0/carousel-context.js b/src/bento/components/bento-base-carousel/1.0/carousel-context.js
similarity index 100%
rename from extensions/amp-base-carousel/1.0/carousel-context.js
rename to src/bento/components/bento-base-carousel/1.0/carousel-context.js
diff --git a/extensions/amp-base-carousel/1.0/carousel-props.js b/src/bento/components/bento-base-carousel/1.0/carousel-props.js
similarity index 99%
rename from extensions/amp-base-carousel/1.0/carousel-props.js
rename to src/bento/components/bento-base-carousel/1.0/carousel-props.js
index cff3ad7467b5..4b4e8c2a0332 100644
--- a/extensions/amp-base-carousel/1.0/carousel-props.js
+++ b/src/bento/components/bento-base-carousel/1.0/carousel-props.js
@@ -1,6 +1,7 @@
-import {CarouselContext} from './carousel-context';
 import {contextProp} from '#core/context';
 
+import {CarouselContext} from './carousel-context';
+
 const CarouselContextProp = contextProp('base-carousel:1.0:context', {
   type: CarouselContext,
   recursive: true,
diff --git a/src/bento/components/bento-base-carousel/1.0/component.js b/src/bento/components/bento-base-carousel/1.0/component.js
new file mode 100644
index 000000000000..4632a55db04d
--- /dev/null
+++ b/src/bento/components/bento-base-carousel/1.0/component.js
@@ -0,0 +1,375 @@
+import {sequentialIdGenerator} from '#core/data-structures/id-generator';
+import {isRTL} from '#core/dom';
+import {mod} from '#core/math';
+import {getWin} from '#core/window';
+
+import * as Preact from '#preact';
+import {
+  cloneElement,
+  useCallback,
+  useContext,
+  useEffect,
+  useImperativeHandle,
+  useLayoutEffect,
+  useMemo,
+  useRef,
+  useState,
+} from '#preact';
+import {Children, forwardRef} from '#preact/compat';
+import {ContainWrapper} from '#preact/component';
+import {WithAmpContext} from '#preact/context';
+
+import {Arrow} from './arrow';
+import {CarouselContext} from './carousel-context';
+import {useStyles} from './component.jss';
+import {
+  Alignment,
+  Axis,
+  Orientation,
+  getDimension,
+  getOffsetPosition,
+  getScrollEnd,
+} from './dimensions';
+import {Scroller} from './scroller';
+
+/**
+ * @enum {string}
+ */
+const Controls = {
+  ALWAYS: 'always',
+  NEVER: 'never',
+  AUTO: 'auto',
+};
+
+/**
+ * @enum {string}
+ */
+const Interaction = {
+  GENERIC: 0,
+  FOCUS: 1,
+  MOUSE: 2,
+  TOUCH: 3,
+  NONE: 4,
+};
+
+/**
+ * @enum {string}
+ */
+const Direction = {
+  LTR: 'ltr',
+  RTL: 'rtl',
+  AUTO: 'auto',
+};
+
+const MIN_AUTO_ADVANCE_INTERVAL = 1000;
+
+const generateCarouselKey = sequentialIdGenerator();
+
+/**
+ * @param {!BaseCarouselDef.Props} props
+ * @param {{current: ?BaseCarouselDef.CarouselApi}} ref
+ * @return {PreactDef.Renderable}
+ */
+function BentoBaseCarouselWithRef(
+  {
+    _thumbnails = false,
+    advanceCount = 1,
+    arrowNextAs,
+    arrowPrevAs,
+    autoAdvance: shouldAutoAdvance = false,
+    autoAdvanceCount = 1,
+    autoAdvanceInterval: customAutoAdvanceInterval = MIN_AUTO_ADVANCE_INTERVAL,
+    autoAdvanceLoops = Number.POSITIVE_INFINITY,
+    children,
+    controls = Controls.AUTO,
+    defaultSlide = 0,
+    dir = Direction.AUTO,
+    lightbox = false,
+    loop,
+    mixedLength = false,
+    onClick,
+    onFocus,
+    onMouseEnter,
+    onSlideChange,
+    onTouchStart,
+    orientation = Orientation.HORIZONTAL,
+    outsetArrows = false,
+    snap = true,
+    snapAlign = Alignment.START,
+    snapBy = 1,
+    visibleCount = 1,
+    ...rest
+  },
+  ref
+) {
+  const classes = useStyles();
+  const childrenArray = useMemo(() => Children.toArray(children), [children]);
+  const {length} = childrenArray;
+  const carouselContext = useContext(CarouselContext);
+  const [currentSlideState, setCurrentSlideState] = useState(
+    Math.min(Math.max(defaultSlide, 0), length)
+  );
+  const globalCurrentSlide = carouselContext.currentSlide ?? currentSlideState;
+  const setGlobalCurrentSlide =
+    carouselContext.setCurrentSlide ?? setCurrentSlideState;
+  const currentSlide = _thumbnails ? currentSlideState : globalCurrentSlide;
+  const setCurrentSlide = _thumbnails
+    ? setCurrentSlideState
+    : setGlobalCurrentSlide;
+  const currentSlideRef = useRef(currentSlide);
+  const axis = orientation == Orientation.HORIZONTAL ? Axis.X : Axis.Y;
+  const [id] = useState(generateCarouselKey);
+
+  useLayoutEffect(() => {
+    // noop if !_thumbnails || !carouselContext.
+    setCurrentSlide(globalCurrentSlide);
+  }, [globalCurrentSlide, setCurrentSlide]);
+
+  const {setSlides, slides} = carouselContext;
+
+  const scrollRef = useRef(null);
+  const containRef = useRef(null);
+  const contentRef = useRef(null);
+
+  const autoAdvanceTimesRef = useRef(0);
+  const autoAdvanceInterval = useMemo(
+    () => Math.max(customAutoAdvanceInterval, MIN_AUTO_ADVANCE_INTERVAL),
+    [customAutoAdvanceInterval]
+  );
+
+  const autoAdvance = useCallback(() => {
+    if (
+      autoAdvanceTimesRef.current + visibleCount / length >= autoAdvanceLoops ||
+      interaction.current !== Interaction.NONE
+    ) {
+      return false;
+    }
+    if (loop || currentSlideRef.current + visibleCount < length) {
+      scrollRef.current.advance(autoAdvanceCount); // Advance forward by specified count
+      // Count autoadvance loops as proportions of the carousel we have advanced through.
+      autoAdvanceTimesRef.current += autoAdvanceCount / length;
+    } else {
+      scrollRef.current.advance(-currentSlideRef.current); // Advance in reverse to first slide
+      autoAdvanceTimesRef.current = Math.ceil(autoAdvanceTimesRef.current);
+    }
+    return true;
+  }, [autoAdvanceCount, autoAdvanceLoops, length, loop, visibleCount]);
+  const next = useCallback(() => scrollRef.current.next(), []);
+  const prev = useCallback(() => scrollRef.current.prev(), []);
+
+  useEffect(() => {
+    if (!shouldAutoAdvance || !containRef.current) {
+      return;
+    }
+    const win = getWin(containRef.current);
+    const interval = win.setInterval(() => {
+      const autoAdvanced = autoAdvance();
+      if (!autoAdvanced) {
+        win.clearInterval(interval);
+      }
+    }, autoAdvanceInterval);
+    return () => win.clearInterval(interval);
+  }, [autoAdvance, autoAdvanceInterval, shouldAutoAdvance]);
+
+  const setRestingIndex = useCallback(
+    (index) => {
+      if (length <= 0 || isNaN(index)) {
+        return;
+      }
+      index = loop
+        ? mod(index, length)
+        : Math.min(Math.max(index, 0), length - 1);
+      setCurrentSlide(index);
+      if (currentSlideRef.current !== index) {
+        currentSlideRef.current = index;
+        if (onSlideChange) {
+          onSlideChange(index);
+        }
+      }
+    },
+    [length, loop, setCurrentSlide, onSlideChange]
+  );
+
+  useImperativeHandle(
+    ref,
+    () =>
+      /** @type {!BaseCarouselDef.CarouselApi} */ ({
+        goToSlide: (index) => {
+          interaction.current = Interaction.GENERIC;
+          setRestingIndex(index);
+        },
+        next: () => {
+          interaction.current = Interaction.GENERIC;
+          next();
+        },
+        prev: () => {
+          interaction.current = Interaction.GENERIC;
+          prev();
+        },
+        get root() {
+          return containRef.current;
+        },
+        get node() {
+          return contentRef.current;
+        },
+      }),
+    [next, prev, setRestingIndex]
+  );
+
+  useEffect(() => {
+    // For now, do not update slides if they are the same length as before.
+    // Otherwise this causes an infinite loop when updating the AMP Context.
+    if (!_thumbnails && slides && slides.length !== childrenArray.length) {
+      setSlides(childrenArray);
+    }
+  }, [_thumbnails, childrenArray, setSlides, slides]);
+
+  const disableForDir = (dir) => {
+    if (loop) {
+      // Arrows always available when looping.
+      return false;
+    }
+    if (currentSlide + dir < 0) {
+      // Can no longer advance backwards.
+      return true;
+    }
+    if (currentSlide + visibleCount + dir > length) {
+      // Can no longer advance forwards.
+      return true;
+    }
+    if (mixedLength && dir > 0) {
+      // Measure container to see if we have reached the end.
+      if (!scrollRef.current) {
+        return false;
+      }
+      const container = scrollRef.current.node;
+      if (!container || !container.children.length) {
+        return false;
+      }
+      const scrollEnd = getScrollEnd(axis, container);
+      const scrollStart = getOffsetPosition(
+        axis,
+        container.children[currentSlide]
+      );
+      const {length} = getDimension(axis, container);
+      if (length !== scrollEnd && length + scrollStart >= scrollEnd) {
+        // Can no longer scroll forwards.
+        return true;
+      }
+    }
+    return false;
+  };
+
+  const interaction = useRef(Interaction.NONE);
+  const hideControls = useMemo(() => {
+    if (controls === Controls.ALWAYS || outsetArrows) {
+      return false;
+    }
+    if (controls === Controls.NEVER) {
+      return true;
+    }
+    return interaction.current === Interaction.TOUCH;
+  }, [controls, outsetArrows]);
+
+  const [rtl, setRtl] = useState(dir === Direction.RTL);
+  useLayoutEffect(() => {
+    if (!containRef.current || dir !== Direction.AUTO) {
+      return;
+    }
+    const doc = containRef.current.ownerDocument;
+    if (!doc) {
+      return;
+    }
+    setRtl(isRTL(doc));
+  }, [dir, setRtl]);
+
+  return (
+    <ContainWrapper
+      size={true}
+      layout={true}
+      paint={true}
+      contentStyle={{
+        display: 'flex',
+        direction: rtl ? Direction.RTL : Direction.LTR,
+      }}
+      ref={containRef}
+      onFocus={(e) => {
+        if (onFocus) {
+          onFocus(e);
+        }
+        interaction.current = Interaction.FOCUS;
+      }}
+      onMouseEnter={(e) => {
+        if (onMouseEnter) {
+          onMouseEnter(e);
+        }
+        interaction.current = Interaction.MOUSE;
+      }}
+      onTouchStart={(e) => {
+        if (onTouchStart) {
+          onTouchStart(e);
+        }
+        interaction.current = Interaction.TOUCH;
+      }}
+      tabindex="0"
+      wrapperClassName={classes.carousel}
+      contentRef={contentRef}
+      {...rest}
+    >
+      {!hideControls && (
+        <Arrow
+          advance={prev}
+          as={arrowPrevAs}
+          by={-advanceCount}
+          disabled={disableForDir(-1)}
+          outsetArrows={outsetArrows}
+          rtl={rtl}
+        />
+      )}
+      <Scroller
+        advanceCount={advanceCount}
+        alignment={snapAlign}
+        axis={axis}
+        lightboxGroup={lightbox && 'carousel' + id}
+        loop={loop}
+        mixedLength={mixedLength}
+        onClick={onClick}
+        restingIndex={currentSlide}
+        setRestingIndex={setRestingIndex}
+        snap={snap}
+        snapBy={snapBy}
+        ref={scrollRef}
+        visibleCount={mixedLength ? 1 : visibleCount}
+        _thumbnails={_thumbnails}
+      >
+        {childrenArray.map((child, index) => {
+          const {alt, 'aria-label': ariaLabel} = child.props;
+          return (
+            <WithAmpContext
+              caption={alt || ariaLabel}
+              key={index}
+              renderable={index == currentSlide}
+              playable={index == currentSlide}
+            >
+              {cloneElement(child, {...child.props, thumbnailSrc: undefined})}
+            </WithAmpContext>
+          );
+        })}
+      </Scroller>
+      {!hideControls && (
+        <Arrow
+          advance={next}
+          by={advanceCount}
+          as={arrowNextAs}
+          disabled={disableForDir(1)}
+          outsetArrows={outsetArrows}
+          rtl={rtl}
+        />
+      )}
+    </ContainWrapper>
+  );
+}
+
+const BentoBaseCarousel = forwardRef(BentoBaseCarouselWithRef);
+BentoBaseCarousel.displayName = 'BentoBaseCarousel'; // Make findable for tests.
+export {BentoBaseCarousel};
diff --git a/extensions/amp-base-carousel/1.0/component.jss.js b/src/bento/components/bento-base-carousel/1.0/component.jss.js
similarity index 100%
rename from extensions/amp-base-carousel/1.0/component.jss.js
rename to src/bento/components/bento-base-carousel/1.0/component.jss.js
diff --git a/extensions/amp-base-carousel/1.0/component.type.js b/src/bento/components/bento-base-carousel/1.0/component.type.js
similarity index 100%
rename from extensions/amp-base-carousel/1.0/component.type.js
rename to src/bento/components/bento-base-carousel/1.0/component.type.js
diff --git a/extensions/amp-base-carousel/1.0/dimensions.js b/src/bento/components/bento-base-carousel/1.0/dimensions.js
similarity index 100%
rename from extensions/amp-base-carousel/1.0/dimensions.js
rename to src/bento/components/bento-base-carousel/1.0/dimensions.js
diff --git a/extensions/amp-base-carousel/1.0/scroller.js b/src/bento/components/bento-base-carousel/1.0/scroller.js
similarity index 98%
rename from extensions/amp-base-carousel/1.0/scroller.js
rename to src/bento/components/bento-base-carousel/1.0/scroller.js
index 7f3b2cd638a6..95480eaeb607 100644
--- a/extensions/amp-base-carousel/1.0/scroller.js
+++ b/src/bento/components/bento-base-carousel/1.0/scroller.js
@@ -1,17 +1,11 @@
-import * as Preact from '#preact';
-import {
-  Alignment,
-  Axis,
-  findOverlappingIndex,
-  getPercentageOffsetFromAlignment,
-  scrollContainerToElement,
-} from './dimensions';
-import {WithBentoLightboxGallery} from '../../amp-lightbox-gallery/1.0/component';
-import {debounce} from '#core/types/function';
-import {forwardRef} from '#preact/compat';
-import {mod} from '#core/math';
+import {WithBentoLightboxGallery} from '#bento/components/bento-lightbox-gallery/1.0/component';
+
 import {setStyle} from '#core/dom/style';
+import {mod} from '#core/math';
+import {debounce} from '#core/types/function';
 import {getWin} from '#core/window';
+
+import * as Preact from '#preact';
 import {
   useCallback,
   useImperativeHandle,
@@ -19,7 +13,16 @@ import {
   useMemo,
   useRef,
 } from '#preact';
+import {forwardRef} from '#preact/compat';
+
 import {useStyles} from './component.jss';
+import {
+  Alignment,
+  Axis,
+  findOverlappingIndex,
+  getPercentageOffsetFromAlignment,
+  scrollContainerToElement,
+} from './dimensions';
 
 /**
  * How long to wait prior to resetting the scrolling position after the last
@@ -256,7 +259,7 @@ function ScrollerWithRef(
       class={`${classes.scrollContainer} ${classes.hideScrollbar} ${
         axis === Axis.X ? classes.horizontalScroll : classes.verticalScroll
       }`}
-      tabIndex={0}
+      tabindex={0}
     >
       {slides}
     </div>
diff --git a/src/bento/components/bento-base-carousel/OWNERS b/src/bento/components/bento-base-carousel/OWNERS
new file mode 100644
index 000000000000..77a55ee52b28
--- /dev/null
+++ b/src/bento/components/bento-base-carousel/OWNERS
@@ -0,0 +1,10 @@
+// For an explanation of the OWNERS rules and syntax, see:
+// https://github.com/ampproject/amp-github-apps/blob/main/owners/OWNERS.example
+
+{
+  rules: [
+    {
+      owners: [{name: 'ampproject/wg-components'}],
+    },
+  ],
+}
diff --git a/src/bento/components/bento-base-carousel/bento-base-carousel.md b/src/bento/components/bento-base-carousel/bento-base-carousel.md
new file mode 100644
index 000000000000..ef494c7a0251
--- /dev/null
+++ b/src/bento/components/bento-base-carousel/bento-base-carousel.md
@@ -0,0 +1,285 @@
+---
+$category@: layout
+formats:
+  - websites
+teaser:
+  text: Displays multiple similar pieces of content along a horizontal axis or vertical axis.
+experimental: true
+bento: true
+---
+
+# bento-base-carousel
+
+## Usage
+
+A generic carousel for displaying multiple similar pieces of content along a
+horizontal or vertical axis.
+
+Each of the `bento-base-carousel` component’s immediate children is considered an
+item in the carousel. Each of these nodes may also have arbitrary HTML children.
+
+The carousel consists of an arbitrary number of items, as well as optional
+navigational arrows to go forward or backwards a single item.
+
+The carousel advances between items if the user swipes or uses the customizable
+arrow buttons.
+
+### Standalone use outside valid AMP documents
+
+Bento allows you to use AMP components in non-AMP pages without needing
+to commit to fully valid AMP. You can take these components and place them
+in implementations with frameworks and CMSs that don't support AMP. Read
+more in our guide [Use AMP components in non-AMP pages](https://amp.dev/documentation/guides-and-tutorials/start/bento_guide/).
+
+To find the standalone version of `bento-base-carousel`, see [**`bento-base-carousel`**](./1.0/README.md).
+
+### Behavior users should be aware of
+
+#### Right-to-left slide change
+
+`<bento-base-carousel>` requires that you define when it is in an
+right-to-left (rtl) context (e.g. Arabic, Hebrew pages). While the carousel will
+generally work without this, there may be a few bugs. You can let the carousel
+know that it should operate as `rtl` as follows:
+
+```html
+<bento-base-carousel dir="rtl" …>
+  …
+</bento-base-carousel>
+```
+
+If the carousel is in a RTL context, and you want the carousel to operate as
+LTR, you can explicitly set the `dir="ltr"` on the carousel.
+
+#### Slide layout
+
+Slides are automatically sized by the carousel when **not** specifying
+`mixed-lengths`. You should give the slides `layout="flex-item"`:
+
+```html
+<bento-base-carousel …>
+  <amp-img layout="flex-item" src="…"></amp-img>
+</bento-base-carousel>
+```
+
+The slides have a default height of `100%` when the carousel is laid out
+horizontally. This can easily be changed with CSS or by using
+`layout="fixed-height"`. When specifying the height, the slide will be
+vertically centered within the carousel.
+
+If you want to horizontally center your slide content, you will want to create a
+wrapping element, and use that to center the content.
+
+#### Number of visible slides
+
+When changing the number of visible slides using `visible-slides`, in response
+to a media query, you will likely want to change the aspect ratio of the
+carousel itself to match the new number of visible slides. For example, if you
+want to show three slides at a time with a one by one aspect ratio, you would
+want an aspect ratio of three by one for the carousel itself. Similiarly, with
+four slides at a time you would want an aspect ratio of four by one. In
+addition, when changing `visible-slides`, you likely want to change
+`advance-count`.
+
+```html
+<!-- Using an aspect ratio of 3:2 for the slides in this example. -->
+<bento-base-carousel
+  layout="responsive"
+  width="3"
+  height="1"
+  heights="(min-width: 600px) calc(100% * 4 * 3 / 2), calc(100% * 3 * 3 / 2)"
+  visible-count="(min-width: 600px) 4, 3"
+  advance-count="(min-width: 600px) 4, 3"
+>
+  <amp-img layout="flex-item" src="…"></amp-img>
+  …
+</bento-base-carousel>
+```
+
+## Attributes
+
+### Media Queries
+
+The attributes for `<bento-base-carousel>` can be configured to use different
+options based on a [media query](./../../../../docs/spec/amp-html-responsive-attributes.md).
+
+### Configuration Options
+
+#### Number of Visible Slides
+
+##### mixed-length
+
+Either `true` or `false`, defaults to `false`. When true, uses the existing
+width (or height when horizontal) for each of the slides. This allows for a
+carousel with slides of different widths to be used.
+
+##### visible-count
+
+A number, defaults to `1`. Determines how many slides should be shown at a given
+time. Fractional values can be used to make part of a(n) additional slide(s)
+visible. This option is ignored when `mixed-length` is `true`.
+
+##### advance-count
+
+A number, defaults to `1`. Determines how many slides the carousel will advance
+when advancing using the previous or next arrows. This is useful when specifying
+the `visible-count` attribute.
+
+#### Auto Advance
+
+##### auto-advance
+
+Either `true` or `false`, defaults to `false`. Automatically advances the
+carousel to the next slide based on a delay. If the user manually changes
+slides, then the auto advance is stopped. Note that if `loop` is not enabled,
+when reaching the last item, the auto advance will move backwards to the first
+item.
+
+##### auto-advance-count
+
+A number, defaults to `1`. Determines how many slides the carousel will advance
+when automatically advancing. This is useful when specifying the `visible-count`
+attribute.
+
+##### auto-advance-interval
+
+A number, defaults to `1000`. Specifies the amount of time, in milliseconds,
+between subsequent automatic advances of the carousel.
+
+##### auto-advance-loops
+
+A number, defaults to `∞`. The number of times the carousel should advance
+through the slides before stopping.
+
+#### Snapping
+
+##### snap
+
+Either `true` or `false`, defaults to `true`. Determines whether or not the
+carousel should snap on slides when scrolling.
+
+##### snap-align
+
+Either `start` or `center`. When start aligning, the start of a slide (e.g. the
+left edge, when horizontal aligning) is aligned with the start of a carousel.
+When center aligning, the center of a slide is aligned with the center of a
+carousel.
+
+##### snap-by
+
+A number, defaults to `1`. This determines the granularity of snapping and is
+useful when using `visible-count`.
+
+#### Miscellaneous
+
+##### controls
+
+Either `"always"`, `"auto"`, or `"never"`, defaults to `"auto"`. This determines if and when prev/next navigational arrows are displayed. Note: When `outset-arrows` is `true`, the arrows are shown `"always"`.
+
+-   `always`: Arrows are always displayed.
+-   `auto`: Arrows are displayed when the carousel has most recently received interaction via mouse, and not displayed when the carousel has most recently received interaction via touch. On first load for touch devices, arrows are displayed until first interaction.
+-   `never`: Arrows are never displayed.
+
+##### slide
+
+A number, defaults to `0`. This determines the initial slide shown in the
+carousel. This may be used with `amp-bind` to control which slide is currently
+showing.
+
+##### loop
+
+Either `true` or `false`, defaults to `false` when omitted. When true, the carousel will allow the user to move from the first item back to the last item and visa versa. There must be at least three times the `visible-count` of slides present for looping to occur.
+
+##### orientation
+
+Either `horizontal` or `vertical`, defaults to `horizontal`. When `horizontal` the carousel will lay out horizontally, with the user being able to swipe left and right. When `vertical`, the carousel lays out vertically, with the user being able to swipe up and down.
+
+##### common attributes
+
+This element includes
+[common attributes](https://amp.dev/documentation/guides-and-tutorials/learn/common_attributes)
+extended to AMP components.
+
+## Actions
+
+### next
+
+Moves the carousel forwards by `advance-count` slides.
+
+### prev
+
+Moves the carousel backwards by `advance-count` slides.
+
+### goToSlide
+
+Moves the carousel to the slide specified by the `index` argument.
+
+## Events
+
+### slideChange
+
+This event is triggered when the index displayed by the carousel has changed.
+The new index is available via `event.index`.
+
+## Styling
+
+You may use the `bento-base-carousel` element selector to style the carousel
+freely.
+
+### Customizing Arrow Buttons
+
+Arrow buttons can be customized by passing in your own custom markup. For
+example, you can recreate the default styling with the following HTML and CSS:
+
+```css
+.carousel-prev,
+.carousel-next {
+  filter: drop-shadow(0px 1px 2px #4a4a4a);
+  width: 40px;
+  height: 40px;
+  padding: 20px;
+  background-color: transparent;
+  border: none;
+  outline: none;
+}
+
+.carousel-prev {
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path  d="M14,7.4 L9.4,12 L14,16.6" fill="none" stroke="#fff" stroke-width="2px" stroke-linejoin="round" stroke-linecap="round" /></svg>');
+}
+
+.carousel-next {
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path  d="M10,7.4 L14.6,12 L10,16.6" fill="none" stroke="#fff" stroke-width="2px" stroke-linejoin="round" stroke-linecap="round" /></svg>');
+}
+```
+
+```html
+<bento-base-carousel …>
+  <div>first slide</div>
+  …
+  <button slot="next-arrow" class="carousel-next" aria-label="Next"></button>
+  <button
+    slot="prev-arrow"
+    class="carousel-prev"
+    aria-label="Previous"
+  ></button>
+</bento-base-carousel>
+```
+
+If you want more customization for the arrow buttons, you can use the `next` and
+`prev` actions. For example, if you want to place buttons under the carousel and
+use the words "Previous" and "Next" instead of having them in the default
+location, you can use the following HTML:
+
+```html
+  <bento-base-carousel id="carousel-1" …>
+    …
+    <div slot="next-arrow"></div>
+    <div slot="prev-arrow"></div>
+  </amp-carousel>
+  <button on="tap:carousel-1.prev()">Previous</button>
+  <button on="tap:carousel-1.next()">Next</button>
+```
+
+## Version notes
+
+Unlike `0.1`, the experimental `1.0` version of `bento-base-carousel` allows configuring the carousel slide orientation via `"orientation"="horizontal"|"vertical"` attributes instead of `"horizontal"="true"|"false"` attributes.
diff --git a/src/bento/components/bento-brightcove/1.0/base-element.js b/src/bento/components/bento-brightcove/1.0/base-element.js
new file mode 100644
index 000000000000..49024a97c13c
--- /dev/null
+++ b/src/bento/components/bento-brightcove/1.0/base-element.js
@@ -0,0 +1,36 @@
+import {BentoVideoBaseElement} from '#bento/components/bento-video/1.0/base-element';
+
+import {createParseAttrsWithPrefix} from '#preact/parse-props';
+
+import {BentoBrightcove} from './component';
+
+export class BaseElement extends BentoVideoBaseElement {}
+
+/** @override */
+BaseElement['Component'] = BentoBrightcove;
+
+/** @override */
+BaseElement['props'] = {
+  'account': {attr: 'data-account'},
+  'autoplay': {attr: 'autoplay', type: 'boolean'},
+  'embed': {attr: 'data-embed', default: 'default'},
+  'player': {
+    attrs: ['data-player', 'data-player-id'],
+    parseAttrs(element) {
+      const {'player': player, 'playerId': playerId} = element.dataset;
+      return player || playerId || 'default';
+    },
+  },
+  'playlistId': {attr: 'data-playlist-id'},
+  'referrer': {attr: 'data-referrer'},
+  'urlParams': createParseAttrsWithPrefix('data-param-'),
+  'videoId': {attr: 'data-video-id'},
+  // TODO(wg-bento): These props have no internal implementation yet.
+  'dock': {attr: 'dock', media: true},
+};
+
+/** @override */
+BaseElement['layoutSizeDefined'] = true;
+
+/** @override */
+BaseElement['usesShadowDom'] = true;
diff --git a/src/bento/components/bento-brightcove/1.0/bento-brightcove.css b/src/bento/components/bento-brightcove/1.0/bento-brightcove.css
new file mode 100644
index 000000000000..d07fd6c88932
--- /dev/null
+++ b/src/bento/components/bento-brightcove/1.0/bento-brightcove.css
@@ -0,0 +1,17 @@
+/*
+ * Pre-upgrade:
+ * - display:block element
+ * - size-defined element
+ */
+bento-brightcove {
+  display: block;
+  overflow: hidden;
+  position: relative;
+}
+
+/* Pre-upgrade: size-defining element - hide children. */
+bento-brightcove:not(.i-amphtml-built)
+  > :not([placeholder]):not([slot='i-amphtml-svc']) {
+  display: none;
+  content-visibility: hidden;
+}
diff --git a/src/bento/components/bento-brightcove/1.0/component.js b/src/bento/components/bento-brightcove/1.0/component.js
new file mode 100644
index 000000000000..8af0bd1b9587
--- /dev/null
+++ b/src/bento/components/bento-brightcove/1.0/component.js
@@ -0,0 +1,173 @@
+import {
+  BRIGHTCOVE_EVENTS,
+  getBrightcoveIframeSrc,
+} from '#bento/apis/brightcove-api';
+import {VideoIframe} from '#bento/components/bento-video/1.0/video-iframe';
+
+import {dispatchCustomEvent} from '#core/dom';
+
+import * as Preact from '#preact';
+import {useCallback, useMemo, useRef, useState} from '#preact';
+import {forwardRef} from '#preact/compat';
+import {useValueRef} from '#preact/component';
+
+import {mutedOrUnmutedEvent} from '../../../../iframe-video';
+
+/** @const {string} */
+const DEFAULT = 'default';
+
+/**
+ * @enum {string}
+ * @private
+ */
+const methods = {
+  'mute': 'muted',
+  'unmute': 'muted',
+  'showControls': 'controls',
+  'hideControls': 'controls',
+};
+
+/**
+ * @param {!BrightcoveDef.Props} props
+ * @param {{current: ?VideoWrapperDef.Api}} ref
+ * @return {PreactDef.Renderable}
+ */
+function BentoBrightcoveWithRef(props, ref) {
+  const {
+    account,
+    autoplay,
+    embed = DEFAULT,
+    muted: mutedProp,
+    onLoad,
+    onPlayingState,
+    player = DEFAULT,
+    playlistId,
+    referrer,
+    urlParams,
+    videoId,
+    ...rest
+  } = props;
+
+  const playerStateRef = useRef({});
+  const onLoadRef = useValueRef(onLoad);
+  const [muted, setMuted] = useState(mutedProp);
+  const src = useMemo(
+    () =>
+      getBrightcoveIframeSrc(
+        account,
+        player,
+        embed,
+        playlistId,
+        videoId,
+        referrer,
+        urlParams
+      ),
+    [account, embed, player, playlistId, referrer, urlParams, videoId]
+  );
+
+  const onMessage = useCallback(
+    ({currentTarget, data}) => {
+      const eventType = data?.event;
+      switch (eventType) {
+        case 'ready':
+          dispatchCustomEvent(currentTarget, 'canplay');
+          onLoadRef.current?.();
+          break;
+        case 'playing':
+          onPlayingState?.(true);
+          break;
+        case 'pause':
+        case 'ended':
+          onPlayingState?.(false);
+          break;
+      }
+
+      if (data?.['ct']) {
+        playerStateRef.current['currentTime'] = data['ct'];
+      }
+      if (data?.['pr']) {
+        playerStateRef.current['playedRanges'] = data['pr'];
+      }
+      if (data?.['dur']) {
+        playerStateRef.current['duration'] = data['dur'];
+      }
+
+      if (BRIGHTCOVE_EVENTS[eventType]) {
+        dispatchCustomEvent(currentTarget, BRIGHTCOVE_EVENTS[eventType]);
+        return;
+      }
+
+      if (eventType === 'volumechange') {
+        const isMuted = data['muted'];
+        if (isMuted == null || isMuted == muted) {
+          return;
+        }
+        setMuted(isMuted);
+        dispatchCustomEvent(currentTarget, mutedOrUnmutedEvent(isMuted));
+      }
+    },
+    [muted, onPlayingState, onLoadRef]
+  );
+
+  // Check for valid props
+  if (!checkProps(props)) {
+    return null;
+  }
+
+  return (
+    <VideoIframe
+      ref={ref}
+      {...rest}
+      autoplay={autoplay}
+      controls={true}
+      makeMethodMessage={makeMessage}
+      muted={muted}
+      onMessage={onMessage}
+      playerStateRef={playerStateRef}
+      src={src}
+    />
+  );
+}
+
+/**
+ * @param {string} method
+ * @return {string}
+ */
+function makeMessage(method) {
+  let arg;
+  switch (method) {
+    case 'showControls':
+    case 'mute':
+      arg = true;
+      break;
+    case 'hideControls':
+    case 'unmute':
+      arg = false;
+      break;
+    default:
+      break;
+  }
+  return JSON.stringify({
+    'command': methods[method] ?? method,
+    'args': arg,
+  });
+}
+
+/**
+ * Verify required props and throw error if necessary.
+ * @param {!BrightcoveDef.Props} props
+ * @return {boolean} true on valid
+ */
+function checkProps({account}) {
+  // Perform manual checking as assertion is not available for Bento: Issue #32739
+  if (!account) {
+    console /*OK*/
+      .warn('account is required for <Brightcove>');
+    return false;
+  }
+  return true;
+}
+
+const BentoBrightcove = forwardRef(BentoBrightcoveWithRef);
+BentoBrightcove.displayName = 'BentoBrightcove'; // Make findable for tests.
+export {BentoBrightcove};
diff --git a/extensions/amp-brightcove/1.0/component.type.js b/src/bento/components/bento-brightcove/1.0/component.type.js
similarity index 100%
rename from extensions/amp-brightcove/1.0/component.type.js
rename to src/bento/components/bento-brightcove/1.0/component.type.js
diff --git a/src/bento/components/bento-brightcove/OWNERS b/src/bento/components/bento-brightcove/OWNERS
new file mode 100644
index 000000000000..c9a78e3ab214
--- /dev/null
+++ b/src/bento/components/bento-brightcove/OWNERS
@@ -0,0 +1,10 @@
+// For an explanation of the OWNERS rules and syntax, see:
+// https://github.com/ampproject/amp-github-apps/blob/main/owners/OWNERS.example
+
+{
+  rules: [
+    {
+      owners: [{name: 'mister-ben'}, {name: 'ampproject/wg-components'}],
+    },
+  ],
+}
diff --git a/src/bento/components/bento-brightcove/bento-brightcove.md b/src/bento/components/bento-brightcove/bento-brightcove.md
new file mode 100644
index 000000000000..2b0fabcfcdec
--- /dev/null
+++ b/src/bento/components/bento-brightcove/bento-brightcove.md
@@ -0,0 +1,130 @@
+---
+$category@: media
+formats:
+  - websites
+teaser:
+  text: Displays a Brightcove Video Cloud or Perform player.
+---
+
+<!---
+Copyright 2015 Brightcove. 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.
+-->
+
+# bento-brightcove
+
+## Usage
+
+An `bento-brightcove` component displays the Brightcove Player as used in Brightcove's [Video Cloud](https://www.brightcove.com/en/online-video-platform) or [Brightcove Player](https://www.brightcove.com/en/player).
+
+The `width` and `height` attributes determine the aspect ratio of the player embedded in responsive layouts.
+
+```html
+<bento-brightcove
+  data-account="12345"
+  data-player="default"
+  data-embed="default"
+  data-video-id="1234"
+  layout="responsive"
+  width="480"
+  height="270"
+>
+</bento-brightcove>
+```
+
+### Player Configuration
+
+Make sure you configure players used with the AMP Support plugin to support AMP's video interface. See [Brightcove's support documentation](https://support.brightcove.com/amp) for player configuration instructions.
+
+## Component Attributes
+
+### `data-account`
+
+The Brightcove Video Cloud or Perform account id.
+
+### `data-player` or `data-player-id`
+
+The Brightcove player id. This is a GUID, shortid or "default". The default
+value is "default".
+
+`data-player` is preferred. `data-player-id` is also supported for
+backwards-compatibility.
+
+### `data-embed`
+
+The Brightcove player id. This is a GUID or "default". The default value and
+most common value is "default".
+
+### `data-video-id`
+
+The Video Cloud video id. Most Video Cloud players will need this.
+
+This is not used for Perform players by default; use it if you have added a
+plugin that expects a `videoId` param in the query string.
+
+### `data-playlist-id`
+
+The Video Cloud playlist id. For AMP HTML uses a video id will normally be used
+instead. If both a playlist and a video are specified, the playlist takes
+precedence.
+
+This is not used for Perform players by default; use it if you have added a
+plugin that expects a `playlistId` param in the query string.
+
+### `data-referrer`
+
+Sets the referrer to be used for the Video Cloud analytics within the player.
+Requires Brightcove Player version v6.25.0+. This supports AMP variables such as
+`EXTERNAL_REFERRER`.
+
+### `data-param-*`
+
+All `data-param-*` attributes will be added as query parameters to the player
+iframe src. This may be used to pass custom values through to player plugins,
+such as ad parameters or video ids for Perform players.
+
+Keys and values will be URI encoded. Keys will be camel cased.
+
+-   `data-param-language="de"` becomes `&language=de`
+-   `data-param-custom-ad-data="key:value;key2:value2"` becomes
+    `&customAdData=key%3Avalue%3Bkey2%3Avalue2`
+
+### `autoplay`
+
+If this attribute is present, and the browser supports autoplay, the video will
+be automatically played as soon as it becomes visible. There are some conditions
+that the component needs to meet to be played, [which are outlined in the Video
+in AMP spec](https://github.com/ampproject/amphtml/blob/main/docs/spec/amp-video-interface.md#autoplay).
+
+### `dock`
+
+**Requires `amp-video-docking` extension.** If this attribute is present and the
+video is playing manually, the video will be "minimized" and fixed to a corner
+or an element when the user scrolls out of the video component's visual area.
+
+For more details, see
+[documentation on the docking extension itself](https://amp.dev/documentation/components/amp-video-docking).
+
+### `data-block-on-consent`
+
+If [amp-consent](https://amp.dev/documentation/components/amp-consent/) is used, adding `data-block-on-consent="_till_responded"` will delay player load until the consent state is resolved. The consent state is passed to the player's iframe as query parameters for customisation of advertising implementations in the player. See [Brightcove's support documentation](https://support.brightcove.com/amp) for player configuration instructions.
+
+### Common attributes
+
+This element includes [common attributes](https://amp.dev/documentation/guides-and-tutorials/learn/common_attributes)
+extended to AMP components.
+
+## Validation
+
+See [bento-brightcove rules](https://github.com/ampproject/amphtml/blob/main/extensions/amp-brightcove/validator-amp-brightcove.protoascii) in the AMP validator specification.
diff --git a/src/bento/components/bento-dailymotion/1.0/base-element.js b/src/bento/components/bento-dailymotion/1.0/base-element.js
new file mode 100644
index 000000000000..b1d98711b19f
--- /dev/null
+++ b/src/bento/components/bento-dailymotion/1.0/base-element.js
@@ -0,0 +1,23 @@
+import {BentoVideoBaseElement} from '#bento/components/bento-video/1.0/base-element';
+
+import {BentoDailymotion} from './component';
+
+export class BaseElement extends BentoVideoBaseElement {}
+
+/** @override */
+BaseElement['Component'] = BentoDailymotion;
+
+/** @override */
+BaseElement['props'] = {
+  'autoplay': {attr: 'autoplay', type: 'boolean'},
+  'videoId': {attr: 'data-videoid'},
+  'start': {attr: 'data-start'},
+  'uiHighlight': {attr: 'data-ui-highlight'},
+  'implicitParams': {attrPrefix: 'data-param-'},
+};
+
+/** @override */
+BaseElement['layoutSizeDefined'] = true;
+
+/** @override */
+BaseElement['usesShadowDom'] = true;
diff --git a/src/bento/components/bento-dailymotion/1.0/bento-dailymotion.css b/src/bento/components/bento-dailymotion/1.0/bento-dailymotion.css
new file mode 100644
index 000000000000..427a807a499a
--- /dev/null
+++ b/src/bento/components/bento-dailymotion/1.0/bento-dailymotion.css
@@ -0,0 +1,16 @@
+/*
+ * Pre-upgrade:
+ * - display:block element
+ * - size-defined element
+ */
+ bento-dailymotion {
+  display: block;
+  overflow: hidden;
+  position: relative;
+}
+
+/* Pre-upgrade: size-defining element - hide children. */
+bento-dailymotion:not(.i-amphtml-built) > :not([placeholder]):not([slot="i-amphtml-svc"]) {
+  display: none;
+  content-visibility: hidden;
+}
diff --git a/src/bento/components/bento-dailymotion/1.0/component.js b/src/bento/components/bento-dailymotion/1.0/component.js
new file mode 100644
index 000000000000..921f8585de1e
--- /dev/null
+++ b/src/bento/components/bento-dailymotion/1.0/component.js
@@ -0,0 +1,114 @@
+import {
+  DailymotionEvents,
+  getDailymotionIframeSrc,
+  makeDailymotionMessage,
+} from '#bento/apis/dailymotion-api';
+import {VideoIframe} from '#bento/components/bento-video/1.0/video-iframe';
+
+import {dispatchCustomEvent} from '#core/dom';
+import {parseQueryString} from '#core/types/string/url';
+
+import * as Preact from '#preact';
+import {useMemo} from '#preact';
+import {forwardRef} from '#preact/compat';
+
+/**
+ * @param {string} method
+ * @return {string}
+ */
+function makeMethodMessage(method) {
+  switch (method) {
+    case 'mute':
+      return makeDailymotionMessage('muted', [true]);
+    case 'unmute':
+      return makeDailymotionMessage('muted', [false]);
+    case 'showControls':
+      return makeDailymotionMessage('controls', [true]);
+    case 'hideControls':
+      return makeDailymotionMessage('controls', [false]);
+    default:
+      return makeDailymotionMessage(method);
+  }
+}
+
+/**
+ * @param {MessageEvent} event
+ */
+function onMessage({currentTarget, data}) {
+  const parsedData = parseQueryString(/** @type {string} */ (data));
+  const event = parsedData?.['event'];
+  if (event === DailymotionEvents.PAUSE) {
+    dispatchCustomEvent(currentTarget, 'pause');
+  } else if (event === DailymotionEvents.PLAY) {
+    dispatchCustomEvent(currentTarget, 'playing');
+  } else if (event === DailymotionEvents.END) {
+    dispatchCustomEvent(currentTarget, 'pause');
+    dispatchCustomEvent(currentTarget, 'end');
+  } else if (event === DailymotionEvents.API_READY) {
+    dispatchCustomEvent(currentTarget, 'canplay');
+  }
+}
+
+/**
+ * @param {!BentoDailymotionDef.Props} props
+ * @param {{current: ?VideoWrapperDef.Api}} ref
+ * @return {PreactDef.Renderable}
+ */
+export function BentoDailymotionWithRef(
+  {
+    autoplay,
+    endscreenEnable,
+    info,
+    mute,
+    sharingEnable,
+    start,
+    uiHighlight,
+    uiLogo,
+    videoId,
+    ...rest
+  },
+  ref
+) {
+  const src = useMemo(
+    () =>
+      getDailymotionIframeSrc(
+        window,
+        videoId,
+        autoplay,
+        endscreenEnable,
+        info,
+        mute,
+        sharingEnable,
+        start,
+        uiHighlight,
+        uiLogo
+      ),
+    [
+      videoId,
+      autoplay,
+      endscreenEnable,
+      info,
+      mute,
+      sharingEnable,
+      start,
+      uiHighlight,
+      uiLogo,
+    ]
+  );
+
+  return (
+    <VideoIframe
+      autoplay={autoplay}
+      controls
+      ref={ref}
+      {...rest}
+      src={src}
+      makeMethodMessage={makeMethodMessage}
+      onMessage={onMessage}
+    />
+  );
+}
+
+const BentoDailymotion = forwardRef(BentoDailymotionWithRef);
+BentoDailymotion.displayName = 'BentoDailymotion';
+export {BentoDailymotion};
diff --git a/extensions/amp-dailymotion/1.0/component.type.js b/src/bento/components/bento-dailymotion/1.0/component.type.js
similarity index 100%
rename from extensions/amp-dailymotion/1.0/component.type.js
rename to src/bento/components/bento-dailymotion/1.0/component.type.js
diff --git a/src/bento/components/bento-dailymotion/OWNERS b/src/bento/components/bento-dailymotion/OWNERS
new file mode 100644
index 000000000000..ac69460c7fd1
--- /dev/null
+++ b/src/bento/components/bento-dailymotion/OWNERS
@@ -0,0 +1,10 @@
+// For an explanation of the OWNERS rules and syntax, see:
+// https://github.com/ampproject/amp-github-apps/blob/main/owners/OWNERS.example
+
+{
+  rules: [
+    {
+      owners: [{name: 'zeno'}, {name: 'ampproject/wg-components'}],
+    },
+  ],
+}
diff --git a/src/bento/components/bento-dailymotion/bento-dailymotion.md b/src/bento/components/bento-dailymotion/bento-dailymotion.md
new file mode 100644
index 000000000000..0370fa900ff3
--- /dev/null
+++ b/src/bento/components/bento-dailymotion/bento-dailymotion.md
@@ -0,0 +1,148 @@
+---
+$category@: media
+formats:
+  - websites
+teaser:
+  text: Displays a Dailymotion video.
+experimental: true
+bento: true
+---
+
+# bento-dailymotion
+
+## Usage
+
+Displays a [Dailymotion](https://www.dailymotion.com/) video.
+
+With responsive layout, the width and height from the example should yield correct layouts for 16:9 aspect ratio videos.
+
+```html
+<bento-dailymotion
+  data-videoid="x2m8jpp"
+  layout="responsive"
+  width="480"
+  height="270"
+></bento-dailymotion>
+```
+
+### `autoplay`
+
+If this attribute is present, and the browser supports autoplay:
+
+-   the video is automatically muted before autoplay starts
+-   when the video is scrolled out of view, the video is paused
+-   when the video is scrolled into view, the video resumes playback
+-   when the user taps the video, the video is unmuted
+-   if the user has interacted with the video (e.g., mutes/unmutes,
+    pauses/resumes, etc.), and the video is scrolled in or out of view, the
+    state of the video remains as how the user left it. For example, if the user
+    pauses the video, then scrolls the video out of view and returns to the
+    video, the video is still paused.
+
+### `data-videoid`
+
+The Dailymotion video id found in every video page URL. For example, `"x2m8jpp"`
+is the video id for
+`https://www.dailymotion.com/video/x2m8jpp_dailymotion-spirit-movie_creation`.
+
+### `data-mute` (optional)
+
+Indicates whether to mute the video.
+
+-   Value: `"true"` or `"false"`
+-   Default value: `"false"`
+
+### `data-endscreen-enable` (optional)
+
+Indicates whether to enable the end screen.
+
+-   Value: `"true"` or `"false"`
+-   Default value: `"true"`
+
+### `data-sharing-enable` (optional)
+
+Indicates whether to display the sharing button.
+
+-   Value: `"true"` or `"false"`
+-   Default value: `"true"`
+
+### `data-start` (optional)
+
+Specifies the time (in seconds) from which the video should start playing.
+
+-   Value: integer (number of seconds). For example, `data-start=45`.
+-   Default value: `0`
+
+### `data-ui-highlight` (optional)
+
+Change the default highlight color used in the controls.
+
+-   Value: Hexadecimal color value (without the leading #). For example,
+    `data-ui-highlight="e540ff"`.
+
+### `data-ui-logo` (optional)
+
+Indicates whether to display the Dailymotion logo.
+
+-   Value: `"true"` or `"false"`
+-   Default value: `"true"`
+
+### `data-info` (optional)
+
+Indicates whether to show video information (title and owner) on the start
+screen.
+
+-   Value: `"true"` or `"false"`
+-   Default value: `"true"`
+
+### `data-param-*` (optional)
+
+All `data-param-*` attributes are added as query parameters to the `src` value
+of the embedded Dailymotion iframe. You can use this attribute to pass custom
+values not explicitly declared.
+
+Keys and values will be URI encoded.
+
+-   `data-param-origin="example.com"`
+
+Please read [Dailymotion's video player documentation](https://developer.dailymotion.com/player#player-parameters)
+to know more about parameters and options.
+
+### `dock`
+
+**Requires `amp-video-docking` extension.** If this attribute is present and the
+video is playing manually, the video will be "minimized" and fixed to a corner
+or an element when the user scrolls out of the video component's visual area.
+
+For more details, see [documentation on the docking extension itself](https://amp.dev/documentation/components/amp-video-docking).
+
+### Common attributes
+
+This element includes [common attributes](https://amp.dev/documentation/guides-and-tutorials/learn/common_attributes)
+extended to AMP components.
+
+## Actions
+
+### `play`
+
+Plays the video.
+
+### `pause`
+
+Pauses the video.
+
+### `mute`
+
+Mutes the video.
+
+### `unmute`
+
+Unmutes the video.
+
+### `fullscreenenter`
+
+Takes the video to fullscreen.
+
+## Validation
+
+See [bento-dailymotion rules](../../../../extensions/amp-dailymotion/validator-amp-dailymotion.protoascii) in the AMP validator specification.
diff --git a/src/bento/components/bento-facebook/1.0/README.md b/src/bento/components/bento-facebook/1.0/README.md
new file mode 100644
index 000000000000..04020b361d3a
--- /dev/null
+++ b/src/bento/components/bento-facebook/1.0/README.md
@@ -0,0 +1,568 @@
+# Bento Facebook
+
+Embeds a [Facebook](https://facebook.com) post, a Facebook video, or a comment on a Facebook post.
+
+## Web Component
+
+You must include each Bento component's required CSS library before adding custom styles in order to guarantee proper loading. Or use the lightweight pre-uprgrade styles available inline. See [Layout and Style](#layout-and-style).
+
+### Import via npm
+
+```sh
+npm install @bentoproject/facebook
+```
+
+```javascript
+import {defineElement as defineBentoFacebook} from '@bentoproject/facebook';
+defineBentoFacebook();
+```
+
+### Include via `<script>`
+
+```html
+<script type="module" src="https://cdn.ampproject.org/bento.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/bento.js" crossorigin="anonymous"></script>
+<script type="module" src="https://cdn.ampproject.org/v0/bento-facebook-1.0.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/v0/bento-facebook-1.0.js" crossorigin="anonymous"></script>
+<link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-facebook-1.0.css" crossorigin="anonymous">
+```
+
+### Example
+
+##### Embed a Facebook Post
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-facebook-1.0.css"
+    />
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-facebook-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-facebook-1.0.js"
+    ></script>
+    <style>
+      bento-facebook {
+        width: 375px;
+        height: 472px;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-facebook
+      id="facebook-post"
+      data-href="https://www.facebook.com/ParksCanada/posts/1712989015384373"
+    >
+    </bento-facebook>
+    <div class="buttons" style="margin-top: 8px">
+      <button id="change-facebook-post">Change Facebook post</button>
+    </div>
+
+    <script>
+      (async () => {
+        const facebookPost = document.querySelector('#facebook-post');
+        await customElements.whenDefined('bento-facebook');
+        // set up button actions
+        document.querySelector('#change-facebook-post').onclick = () => {
+          facebookPost.setAttribute(
+            'data-href',
+            'https://www.facebook.com/NASA/photos/a.67899501771/10159193669016772/'
+          );
+        };
+      })();
+    </script>
+  </body>
+</html>
+```
+
+##### Embed a Facebook Video
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-facebook-1.0.css"
+    />
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-facebook-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-facebook-1.0.js"
+    ></script>
+    <style>
+      bento-facebook {
+        width: 375px;
+        height: 472px;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-facebook
+      id="facebook-video"
+      data-embed-as="video"
+      data-href="https://www.facebook.com/nasaearth/videos/10155187938052139"
+    >
+    </bento-facebook>
+    <div class="buttons" style="margin-top: 8px">
+      <button id="change-facebook-video">Change Facebook video</button>
+    </div>
+
+    <script>
+      (async () => {
+        const facebookVideo = document.querySelector('#facebook-video');
+        await customElements.whenDefined('bento-facebook');
+        // set up button actions
+        document.querySelector('#change-facebook-video').onclick = () => {
+          facebookVideo.setAttribute(
+            'data-href',
+            'https://www.facebook.com/NASA/videos/846648316199961/'
+          );
+        };
+      })();
+    </script>
+  </body>
+</html>
+```
+
+##### Embed a Facebook Page
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-facebook-1.0.css"
+    />
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-facebook-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-facebook-1.0.js"
+    ></script>
+    <style>
+      bento-facebook {
+        width: 375px;
+        height: 472px;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-facebook
+      id="facebook-video"
+      data-embed-as="video"
+      data-href="https://www.facebook.com/nasaearth/videos/10155187938052139"
+    >
+    </bento-facebook>
+    <div class="buttons" style="margin-top: 8px">
+      <button id="change-facebook-video">Change Facebook video</button>
+    </div>
+
+    <script>
+      (async () => {
+        const facebookVideo = document.querySelector('#facebook-video');
+        await customElements.whenDefined('bento-facebook');
+        // set up button actions
+        document.querySelector('#change-facebook-video').onclick = () => {
+          facebookVideo.setAttribute(
+            'data-href',
+            'https://www.facebook.com/NASA/videos/846648316199961/'
+          );
+        };
+      })();
+    </script>
+  </body>
+</html>
+```
+
+##### Embed a Facebook Like Button
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-facebook-1.0.css"
+    />
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-facebook-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-facebook-1.0.js"
+    ></script>
+    <style>
+      bento-facebook {
+        width: 375px;
+        height: 472px;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-facebook
+      id="facebook-video"
+      data-embed-as="like"
+      data-href="https://www.facebook.com/nasaearth/videos/10155187938052139"
+    >
+    </bento-facebook>
+  </body>
+</html>
+```
+
+##### Embed a Facebook Comment Section
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-facebook-1.0.css"
+    />
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-facebook-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-facebook-1.0.js"
+    ></script>
+    <style>
+      bento-facebook {
+        width: 375px;
+        height: 472px;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-facebook
+      id="facebook-comments"
+      data-embed-as="comments"
+      data-href="https://www.facebook.com/zuck/posts/10102735452532991?comment_id=1070233703036185"
+    >
+    </bento-facebook>
+  </body>
+</html>
+```
+
+### Layout and Style
+
+Each Bento component has a small CSS library you must include to guarantee proper loading without [content shifts](https://web.dev/cls/). Because of order-based specificity, you must manually ensure that stylesheets are included before any custom styles.
+
+```html
+<link
+  rel="stylesheet"
+  type="text/css"
+  href="https://cdn.ampproject.org/v0/bento-facebook-1.0.css"
+/>
+```
+
+Alternatively, you may also make the light-weight pre-upgrade styles available inline:
+
+```html
+<style>
+  bento-facebook {
+    display: block;
+    overflow: hidden;
+    position: relative;
+  }
+</style>
+```
+
+### Attributes
+
+#### `data-href`
+
+The URL of the Facebook post/video/comment. For example, a post or video will look like `https://www.facebook.com/zuck/posts/10102593740125791`. A comment or comment reply will look like `https://www.facebook.com/zuck/posts/10102735452532991?comment_id=1070233703036185`.
+
+#### `data-embed-as`
+
+The value can be either `post`, `video`, `comments`, `like`, or `page`. The default value is `post`.
+
+Both posts and videos can be embedded as a post. Setting `data-embed-as="video"` for Facebook videos embeds the player of the video, and adds the accompanying post card with it. Setting `data-embed-as="post"` ignores the caption card. This is done to make sure we are zooming in on videos correctly.
+
+The `comments` value embeds a comment section which allows people to comment on content using their Facebook account.
+
+The `like` value embeds a like button which, when clicked, triggers the like to be logged on Facebook. The `page` value embeds any public facebook page.
+
+Check out the documentation for differences between [post embeds](https://developers.facebook.com/docs/plugins/embedded-posts), [video embeds](https://developers.facebook.com/docs/plugins/embedded-video-player), [like embeds](https://developers.facebook.com/docs/plugins/like-button), and [page embeds](https://developers.facebook.com/docs/plugins/page-plugin).
+
+The `comment` value is deprecated but previously was used to embed a single comment (or reply to a comment) on a post. This is not to be confused with [`amp-facebook-comments`](https://amp.dev/documentation/examples/components/amp-facebook-comments/).
+
+#### `data-align-center`
+
+The value is either `true` or `false`. The default is `false`.
+
+For posts and videos, having this attribute set to true would align the post/video container to center.
+
+#### `data-allowfullscreen`
+
+The value is either set or omitted. The default is omitted (no fullscreen).
+
+When embedding a video, set this value to allow for a fullscreen experience.
+
+#### `data-include-comment-parent`
+
+The value is either `true` or `false`. The default is `false`.
+
+When you are embedding a comment reply, you can optionally also include the parent comment of the reply.
+
+#### `data-action` (optional)
+
+The verb to display on the button. Can be either `like` or `recommend`. The default is `like`.
+
+#### `data-hide-cover` (optional)
+
+Hides the cover photo in the header. Default value is `false`.
+
+#### `data-hide-cta` (optional)
+
+Hides the custom call to action button (if available). Default value is `false`.
+
+#### `data-kd_site` (optional)
+
+This attribute is also known as `data-kid_directed_site` in the Facebook SDK. If your web site or online service, or a portion of your service, is directed to children under 13 you must enable this attribute. The default is `false`.
+
+#### `data-layout` (optional)
+
+Selects one of the different layouts that are available for the plugin. Can be one of `standard`, `button_count`, `button` or `box_count`. The default is `standard`.
+
+#### `data-locale` (optional)
+
+By default, the locale is set to user's system language; however, you can specify a locale as well.
+
+For details on strings accepted here please visit the [Facebook API Localization page](https://developers.facebook.com/docs/internationalization).
+
+#### `data-numposts` (optional)
+
+The number of comments to show. Currently Facebook SDK limits this to max 100. For details, see the [Facebook comments documentation](https://developers.facebook.com/docs/plugins/comments).
+
+#### `data-order-by` (optional)
+
+The order to use when displaying comments. For details, see the [Facebook comments documentation](https://developers.facebook.com/docs/plugins/comments).
+
+#### `data-ref` (optional)
+
+A label for tracking referrals which must be less than 50 characters and can contain alphanumeric characters and some punctuation.
+
+#### `data-share` (optional)
+
+Specifies whether to include a share button beside the Like button. This only works with the XFBML version. The default is `false`.
+
+#### `data-show-facepile` (optional)
+
+Shows profile photos of friends who like the page. Default value is `true`.
+
+#### `data-size` (optional)
+
+The size of the button, which can be one of two sizes, `large` or `small`. The default is `small`.
+
+For details, see the [Facebook comments documentation](https://developers.facebook.com/docs/plugins/like-button#settings).
+
+#### `data-small-header` (optional)
+
+Uses the small header instead. Default value is `false`.
+
+#### `data-tabs` (optional)
+
+Specifies the tabs to render (i.e., `timeline`, `events`, `messages`). Use a comma-separated list to add multiple tabs (e.g., `timeline, events`). By default, the Facebook page plugin shows the timeline activity.
+
+#### title (optional)
+
+Define a `title` attribute for the component to propagate to the underlying `<iframe>` element. The default value is `"Facebook"`.
+
+---
+
+## Preact/React Component
+
+### Import via npm
+
+```sh
+npm install @bentoproject/facebook
+```
+
+```javascript
+import React from 'react';
+import {BentoFacebook} from '@bentoproject/facebook/react';
+import '@bentoproject/facebook/styles.css';
+
+function App() {
+  return (
+    <BentoFacebook
+      embedAs="post"
+      href="https://www.facebook.com/NASA/photos/a.67899501771/10159193669016772/"
+    ></BentoFacebook>
+  );
+}
+```
+
+### Props
+
+#### `href`
+
+The URL of the Facebook post/video/comment. For example, a post or video will look like `https://www.facebook.com/zuck/posts/10102593740125791`. A comment or comment reply will look like `https://www.facebook.com/zuck/posts/10102735452532991?comment_id=1070233703036185`.
+
+#### `embedAs`
+
+The value can be either `post`, `video`, `comments`, `like`, or `page`. The default value is `post`.
+
+Both posts and videos can be embedded as a post. Setting `data-embed-as="video"` for Facebook videos embeds the player of the video, and adds the accompanying post card with it. Setting `data-embed-as="post"` ignores the caption card. This is done to make sure we are zooming in on videos correctly.
+
+The `comments` value embeds a comment section which allows people to comment on content using their Facebook account.
+
+The `like` value embeds a like button which, when clicked, triggers the like to be logged on Facebook. The `page` value embeds any public facebook page.
+
+Check out the documentation for differences between [post embeds](https://developers.facebook.com/docs/plugins/embedded-posts), [video embeds](https://developers.facebook.com/docs/plugins/embedded-video-player), [like embeds](https://developers.facebook.com/docs/plugins/like-button), and [page embeds](https://developers.facebook.com/docs/plugins/page-plugin).
+
+The `comment` value is deprecated but previously was used to embed a single comment (or reply to a comment) on a post. This is not to be confused with [`amp-facebook-comments`](https://amp.dev/documentation/examples/components/amp-facebook-comments/).
+
+#### `alignCenter`
+
+The value is either `true` or `false`. The default is `false`.
+
+For posts and videos, having this attribute set to true would align the post/video container to center.
+
+#### `allowFullScreen`
+
+The value is either set or omitted. The default is omitted (no fullscreen).
+
+When embedding a video, set this value to allow for a fullscreen experience.
+
+#### `includeCommentParent`
+
+The value is either `true` or `false`. The default is `false`.
+
+When you are embedding a comment reply, you can optionally also include the parent comment of the reply.
+
+#### `action` (optional)
+
+The verb to display on the button. Can be either `like` or `recommend`. The default is `like`.
+
+#### `dataLayout` (optional)
+
+Selects one of the different layouts that are available for the plugin. Can be one of `standard`, `button_count`, `button` or `box_count`. The default is `standard`.
+
+#### `hideCover` (optional)
+
+Hides the cover photo in the header. Default value is `false`.
+
+#### `hideCta` (optional)
+
+Hides the custom call to action button (if available). Default value is `false`.
+
+#### `kdSite` (optional)
+
+This attribute is also known as `data-kid_directed_site` in the Facebook SDK. If your web site or online service, or a portion of your service, is directed to children under 13 you must enable this attribute. The default is `false`.
+
+#### `locale` (optional)
+
+By default, the locale is set to user's system language; however, you can specify a locale as well.
+
+For details on strings accepted here please visit the [Facebook API Localization page](https://developers.facebook.com/docs/internationalization).
+
+#### `numposts` (optional)
+
+The number of comments to show. Currently Facebook SDK limits this to max 100. For details, see the [Facebook comments documentation](https://developers.facebook.com/docs/plugins/comments).
+
+#### `orderBy` (optional)
+
+The order to use when displaying comments. For details, see the [Facebook comments documentation](https://developers.facebook.com/docs/plugins/comments).
+
+#### `refLabel` (optional)
+
+A label for tracking referrals which must be less than 50 characters and can contain alphanumeric characters and some punctuation.
+
+#### `share` (optional)
+
+Specifies whether to include a share button beside the Like button. This only works with the XFBML version. The default is `false`.
+
+#### `showFacepile` (optional)
+
+Shows profile photos of friends who like the page. Default value is `true`.
+
+#### `size` (optional)
+
+The size of the button, which can be one of two sizes, `large` or `small`. The default is `small`.
+
+For details, see the [Facebook comments documentation](https://developers.facebook.com/docs/plugins/like-button#settings).
+
+#### `smallHeader` (optional)
+
+Uses the small header instead. Default value is `false`.
+
+#### `tabs` (optional)
+
+Specifies the tabs to render (i.e., `timeline`, `events`, `messages`). Use a comma-separated list to add multiple tabs (e.g., `timeline, events`). By default, the Facebook page plugin shows the timeline activity.
+
+#### title (optional)
+
+Define a `title` attribute for the component to propagate to the underlying `<iframe>` element. The default value is `"Facebook"`.
diff --git a/src/bento/components/bento-facebook/1.0/base-element.js b/src/bento/components/bento-facebook/1.0/base-element.js
new file mode 100644
index 000000000000..77f1c8ab1054
--- /dev/null
+++ b/src/bento/components/bento-facebook/1.0/base-element.js
@@ -0,0 +1,93 @@
+import {userAssert} from '#core/assert';
+import {dashToUnderline} from '#core/types/string';
+
+import {PreactBaseElement} from '#preact/base-element';
+
+import {BentoFacebook} from './component';
+
+/** @const {string} */
+export const TAG = 'bento-facebook';
+export const COMMENTS_TAG = 'bento-facebook-comments';
+export const LIKE_TAG = 'bento-facebook-like';
+export const PAGE_TAG = 'bento-facebook-page';
+
+export class BaseElement extends PreactBaseElement {}
+
+/** @override */
+BaseElement['Component'] = BentoFacebook;
+
+/** @override */
+BaseElement['loadable'] = true;
+
+/** @override */
+BaseElement['props'] = {
+  // common attributes
+  'title': {attr: 'title'}, // Needed for Preact component
+  'href': {attr: 'data-href'},
+  'locale': {
+    attr: 'data-locale',
+    default: dashToUnderline(window.navigator.language),
+  },
+  // TODO(wg-components): Current behavior defaults to loading="auto".
+  // Refactor to make loading="lazy" as the default.
+  'loading': {attr: 'data-loading'},
+  // amp-facebook
+  'allowFullScreen': {attr: 'data-allowfullscreen'},
+  'embedAs': {attrs: ['data-embed-as'], parseAttrs: parseEmbed},
+  'includeCommentParent': {
+    attr: 'data-include-comment-parent',
+    type: 'boolean',
+    default: false,
+  },
+  'showText': {attr: 'data-show-text'},
+  // -comments
+  'numPosts': {attr: 'data-numposts'},
+  'orderBy': {attr: 'data-order-by'},
+  // -comments & -like
+  'colorscheme': {attr: 'data-colorscheme'},
+  // -like
+  'action': {attr: 'data-action'},
+  'kdSite': {attr: 'data-kd_site'},
+  'layout': {attr: 'data-layout'},
+  'refLabel': {attr: 'data-ref'},
+  'share': {attr: 'data-share'},
+  'size': {attr: 'data-size'},
+  // -page
+  'hideCover': {attr: 'data-hide-cover'},
+  'hideCta': {attr: 'data-hide-cta'},
+  'showFacepile': {attr: 'data-show-facepile'},
+  'smallHeader': {attr: 'data-small-header'},
+  'tabs': {attr: 'data-tabs'},
+};
+
+/**
+ * Checks for valid data-embed-as attribute when given.
+ * @param {!Element} element
+ * @return {string}
+ */
+function parseEmbed(element) {
+  const embedAs = element.getAttribute('data-embed-as');
+  userAssert(
+    !embedAs ||
+      ['post', 'video', 'comments', 'like', 'page'].indexOf(embedAs) !== -1,
+    'Attribute data-embed-as for <amp-facebook> value is wrong, should be' +
+      ' "post", "video", "comments", "like", or "page", but was: %s',
+    embedAs
+  );
+  return embedAs;
+}
+
+/** @override */
+BaseElement['layoutSizeDefined'] = true;
+
+/** @override */
+BaseElement['usesShadowDom'] = true;
+
+export class CommentsBaseElement extends BaseElement {}
+CommentsBaseElement['staticProps'] = {'embedAs': 'comments'};
+
+export class LikeBaseElement extends BaseElement {}
+LikeBaseElement['staticProps'] = {'embedAs': 'like'};
+
+export class PageBaseElement extends BaseElement {}
+PageBaseElement['staticProps'] = {'embedAs': 'page'};
diff --git a/src/bento/components/bento-facebook/1.0/bento-facebook.css b/src/bento/components/bento-facebook/1.0/bento-facebook.css
new file mode 100644
index 000000000000..e2f914a97b90
--- /dev/null
+++ b/src/bento/components/bento-facebook/1.0/bento-facebook.css
@@ -0,0 +1,34 @@
+/*
+ * Pre-upgrade:
+ * - display:block element
+ * - size-defined element
+ */
+bento-facebook,
+bento-facebook-comments,
+bento-facebook-like,
+bento-facebook-page {
+  display: block;
+  overflow: hidden;
+  position: relative;
+}
+
+/* Pre-upgrade: size-defining element - hide text. */
+bento-facebook:not(.i-amphtml-built),
+bento-facebook-comments:not(.i-amphtml-built),
+bento-facebook-like:not(.i-amphtml-built),
+bento-facebook-page:not(.i-amphtml-built) {
+  color: transparent !important;
+}
+
+/* Pre-upgrade: size-defining element - hide children. */
+bento-facebook:not(.i-amphtml-built)
+  > :not([placeholder]):not([slot='i-amphtml-svc']),
+bento-facebook-comments:not(.i-amphtml-built)
+  > :not([placeholder]):not([slot='i-amphtml-svc']),
+bento-facebook-like:not(.i-amphtml-built)
+  > :not([placeholder]):not([slot='i-amphtml-svc']),
+bento-facebook-pagee:not(.i-amphtml-built)
+  > :not([placeholder]):not([slot='i-amphtml-svc']) {
+  display: none;
+  content-visibility: hidden;
+}
diff --git a/src/bento/components/bento-facebook/1.0/bento-facebook.js b/src/bento/components/bento-facebook/1.0/bento-facebook.js
new file mode 100644
index 000000000000..fe1b4b82d9d4
--- /dev/null
+++ b/src/bento/components/bento-facebook/1.0/bento-facebook.js
@@ -0,0 +1,3 @@
+import {defineElement} from './web-component';
+
+defineElement();
diff --git a/src/bento/components/bento-facebook/1.0/component.js b/src/bento/components/bento-facebook/1.0/component.js
new file mode 100644
index 000000000000..86c619dbdf1e
--- /dev/null
+++ b/src/bento/components/bento-facebook/1.0/component.js
@@ -0,0 +1,151 @@
+import {MessageType_Enum, deserializeMessage} from '#core/3p-frame-messaging';
+import {tryParseJson} from '#core/types/object/json';
+import {dashToUnderline} from '#core/types/string';
+
+import * as Preact from '#preact';
+import {useCallback, useLayoutEffect, useMemo, useState} from '#preact';
+import {forwardRef} from '#preact/compat';
+import {useValueRef} from '#preact/component';
+import {ProxyIframeEmbed} from '#preact/component/3p-frame';
+
+/** @const {string} */
+const TYPE = 'facebook';
+const FULL_HEIGHT = '100%';
+const MATCHES_MESSAGING_ORIGIN = () => true;
+const DEFAULT_TITLE = 'Facebook comments';
+
+/**
+ * @param {!BentoFacebookDef.Props} props
+ * @param {{current: ?BentoFacebookDef.Api}} ref
+ * @return {PreactDef.Renderable}
+ */
+function BentoFacebookWithRef(
+  {
+    action,
+    colorscheme,
+    embedAs,
+    hideCover,
+    hideCta,
+    href,
+    includeCommentParent,
+    kdSite,
+    layout,
+    locale: localeProp,
+    numPosts,
+    onLoad,
+    orderBy,
+    refLabel,
+    requestResize,
+    share,
+    showFacepile,
+    showText,
+    size,
+    smallHeader,
+    style,
+    tabs,
+    title = DEFAULT_TITLE,
+    ...rest
+  },
+  ref
+) {
+  const [height, setHeight] = useState(null);
+  const onLoadRef = useValueRef(onLoad);
+  const messageHandler = useCallback(
+    (event) => {
+      const data = tryParseJson(event.data) ?? deserializeMessage(event.data);
+      if (data['action'] == 'ready') {
+        onLoadRef.current?.();
+      }
+      if (data['type'] == MessageType_Enum.EMBED_SIZE) {
+        const height = data['height'];
+        if (requestResize) {
+          requestResize(height);
+          setHeight(FULL_HEIGHT);
+        } else {
+          setHeight(height);
+        }
+      }
+    },
+    [requestResize, onLoadRef]
+  );
+
+  const [locale, setLocale] = useState(localeProp);
+  useLayoutEffect(() => {
+    if (localeProp) {
+      setLocale(localeProp);
+      return;
+    }
+    const win = ref?.current?.ownerDocument?.defaultView;
+    if (!win) {
+      return;
+    }
+    setLocale(dashToUnderline(win.navigator.language));
+  }, [localeProp, ref]);
+
+  const options = useMemo(
+    () => ({
+      action,
+      colorscheme,
+      embedAs,
+      hideCover,
+      hideCta,
+      href,
+      includeCommentParent,
+      'kd_site': kdSite,
+      layout,
+      locale,
+      numPosts,
+      orderBy,
+      ref: refLabel,
+      share,
+      showFacepile,
+      showText,
+      size,
+      smallHeader,
+      tabs,
+    }),
+    [
+      action,
+      colorscheme,
+      embedAs,
+      hideCover,
+      hideCta,
+      href,
+      includeCommentParent,
+      kdSite,
+      layout,
+      locale,
+      numPosts,
+      orderBy,
+      refLabel,
+      share,
+      showFacepile,
+      showText,
+      size,
+      smallHeader,
+      tabs,
+    ]
+  );
+
+  return (
+    <ProxyIframeEmbed
+      options={options}
+      ref={ref}
+      title={title}
+      {...rest}
+      /* non-overridable props */
+      // We sandbox all 3P iframes however facebook embeds completely break in
+      // sandbox mode since they need access to document.domain, so we
+      // exclude facebook.
+      excludeSandbox
+      matchesMessagingOrigin={MATCHES_MESSAGING_ORIGIN}
+      messageHandler={messageHandler}
+      type={TYPE}
+      style={height ? {...style, height} : style}
+    />
+  );
+}
+
+const BentoFacebook = forwardRef(BentoFacebookWithRef);
+BentoFacebook.displayName = 'BentoFacebook'; // Make findable for tests.
+export {BentoFacebook};
diff --git a/extensions/amp-facebook/1.0/component.type.js b/src/bento/components/bento-facebook/1.0/component.type.js
similarity index 100%
rename from extensions/amp-facebook/1.0/component.type.js
rename to src/bento/components/bento-facebook/1.0/component.type.js
diff --git a/src/bento/components/bento-facebook/1.0/web-component.js b/src/bento/components/bento-facebook/1.0/web-component.js
new file mode 100644
index 000000000000..98fbe1a9bd8a
--- /dev/null
+++ b/src/bento/components/bento-facebook/1.0/web-component.js
@@ -0,0 +1,48 @@
+import {defineBentoElement} from '#preact/bento-ce';
+
+import {
+  BaseElement,
+  COMMENTS_TAG,
+  CommentsBaseElement,
+  LIKE_TAG,
+  LikeBaseElement,
+  PAGE_TAG,
+  PageBaseElement,
+  TAG,
+} from './base-element';
+
+/**
+ *Register BentoFacebook component to CustomElements registry
+ * @param {typeof globalThis=} win
+ */
+export function defineElement(win) {
+  defineBentoElement(TAG, BaseElement, win);
+
+  defineCommentsElement(win);
+  defineLikeElement(win);
+  definePageElement(win);
+}
+
+/**
+ * Register BentoFacebookComments component to CustomElements registry
+ * @param {typeof globalThis=} win
+ */
+export function defineCommentsElement(win) {
+  defineBentoElement(COMMENTS_TAG, CommentsBaseElement, win);
+}
+
+/**
+ * Register BentoFacebook component to CustomElements registry
+ * @param {typeof globalThis=} win
+ */
+export function defineLikeElement(win) {
+  defineBentoElement(LIKE_TAG, LikeBaseElement, win);
+}
+
+/**
+ * Register BentoFacebook component to CustomElements registry
+ * @param {typeof globalThis=} win
+ */
+export function definePageElement(win) {
+  defineBentoElement(PAGE_TAG, PageBaseElement, win);
+}
diff --git a/src/bento/components/bento-facebook/OWNERS b/src/bento/components/bento-facebook/OWNERS
new file mode 100644
index 000000000000..77a55ee52b28
--- /dev/null
+++ b/src/bento/components/bento-facebook/OWNERS
@@ -0,0 +1,10 @@
+// For an explanation of the OWNERS rules and syntax, see:
+// https://github.com/ampproject/amp-github-apps/blob/main/owners/OWNERS.example
+
+{
+  rules: [
+    {
+      owners: [{name: 'ampproject/wg-components'}],
+    },
+  ],
+}
diff --git a/src/bento/components/bento-facebook/bento-facebook.md b/src/bento/components/bento-facebook/bento-facebook.md
new file mode 100644
index 000000000000..6e3c8a92c2bb
--- /dev/null
+++ b/src/bento/components/bento-facebook/bento-facebook.md
@@ -0,0 +1,194 @@
+---
+$category@: social
+formats:
+  - websites
+teaser:
+  text: Displays a Facebook post, video or comment.
+experimental: true
+bento: true
+---
+
+# bento-facebook
+
+## Usage
+
+You can use the `bento-facebook` component to embed a Facebook post, a Facebook video or a comment on a Facebook post.
+
+The following example shows how to embed a post:
+
+[example preview="inline" playground="true" imports="bento-facebook"][sourcecode:html]
+<bento-facebook width="552" height="310"
+    layout="responsive"
+    data-href="https://www.facebook.com/ParksCanada/posts/1712989015384373">
+</bento-facebook>
+[/sourcecode][/example]
+
+The following example shows how to embed a video:
+
+[example preview="inline" playground="true" imports="bento-facebook"][sourcecode:html]
+<bento-facebook width="476" height="316"
+    layout="responsive"
+    data-embed-as="video"
+    data-href="https://www.facebook.com/nasaearth/videos/10155187938052139">
+</bento-facebook>
+[/sourcecode][/example]
+
+The following example shows how to embed a comment on a post:
+
+[example preview="inline" playground="true" imports="bento-facebook"][sourcecode:html]
+<bento-facebook width="552" height="500"
+    layout="responsive"
+    data-embed-type="comment"
+    data-href="https://www.facebook.com/zuck/posts/10102735452532991?comment_id=1070233703036185">
+</bento-facebook>
+[/sourcecode][/example]
+
+### Standalone use outside valid AMP documents
+
+Bento allows you to use AMP components in non-AMP pages without needing
+to commit to fully valid AMP. You can take these components and place them
+in implementations with frameworks and CMSs that don't support AMP. Read
+more in our guide [Use AMP components in non-AMP pages](https://amp.dev/documentation/guides-and-tutorials/start/bento_guide/).
+
+To find the standalone version of `bento-facebook`, see [**`bento-facebook`**](./1.0/README.md).
+
+## Attributes
+
+### `data-href`
+
+The URL of the Facebook post/video/comment. For example, a post or video will
+look like `https://www.facebook.com/zuck/posts/10102593740125791`. A comment or
+comment reply will look like
+`https://www.facebook.com/zuck/posts/10102735452532991?comment_id=1070233703036185`.
+
+### `data-embed-as`
+
+The value is either `post`, `video` or `comment`. The default is `post`.
+
+Both posts and videos can be embedded as a post. Setting `data-embed-as="video"`
+for Facebook videos embeds the player of the video, and adds the accompanying
+post card with it. Setting `data-embed-as="post"` ignores the caption card. This
+is done to make sure we are zooming in on videos correctly.
+
+The `comment` value embeds a single comment (or reply to a comment) on a post.
+This is not to be confused with
+[`bento-facebook-comments`](https://amp.dev/documentation/examples/components/amp-facebook-comments/).
+
+Check out the documentation for differences between
+[post embeds](https://developers.facebook.com/docs/plugins/embedded-posts) and
+[video embeds](https://developers.facebook.com/docs/plugins/embedded-video-player).
+
+### `data-include-comment-parent`
+
+The value is either `true` or `false`. The default is `false`.
+
+When you are embedding a comment reply, you can optionally also include the
+parent comment of the reply.
+
+### `data-allowfullscreen`
+
+The value is either set or omitted. The default is omitted (no fullscreen).
+
+When embedding a video, set this value to allow for a fullscreen experience.
+
+### `data-align-center`
+
+The value is either `true` or `false`. The default is `false`.
+
+For posts and videos, having this attribute set to true would align the
+post/video container to center.
+
+### `data-locale` (optional)
+
+By default, the locale is set to user's system language; however, you can
+specify a locale as well.
+
+For details on strings accepted here please visit the
+[Facebook API Localization page](https://developers.facebook.com/docs/internationalization).
+
+### title (optional)
+
+Define a `title` attribute for the component to propagate to the underlying `<iframe>` element. The default value is `"Facebook"`.
+
+### `data-numposts` (optional)
+
+The number of comments to show. Currently Facebook SDK limits this to max 100.
+For details, see the
+[Facebook comments documentation](https://developers.facebook.com/docs/plugins/comments).
+
+### `data-order-by` (optional)
+
+The order to use when displaying comments. For details, see the
+[Facebook comments documentation](https://developers.facebook.com/docs/plugins/comments).
+
+### `data-action` (optional)
+
+The verb to display on the button. Can be either `like` or `recommend`. The
+default is `like`.
+
+### `data-kd_site` (optional)
+
+This attribute is also known as `data-kid_directed_site` in the Facebook SDK.
+If your web site or online service, or a portion of your service, is directed to
+children under 13 you must enable this attribute. The default is `false`.
+
+### `data-layout` (optional)
+
+Selects one of the different layouts that are available for the plugin. Can be
+one of `standard`, `button_count`, `button` or `box_count`. The default is
+`standard`.
+
+### `data-ref` (optional)
+
+A label for tracking referrals which must be less than 50 characters and can
+contain alphanumeric characters and some punctuation.
+
+### `data-share` (optional)
+
+Specifies whether to include a share button beside the Like button. This only
+works with the XFBML version. The default is `false`.
+
+### `data-size` (optional)
+
+The size of the button, which can be one of two sizes, `large` or `small`. The
+default is `small`.
+
+For details, see the
+[Facebook comments documentation](https://developers.facebook.com/docs/plugins/like-button#settings).
+
+### `data-tabs` (optional)
+
+Specifies the tabs to render (i.e., `timeline`, `events`, `messages`). Use a
+comma-separated list to add multiple tabs (e.g., `timeline, events`). By
+default, the Facebook page plugin shows the timeline activity.
+
+### `data-hide-cover` (optional)
+
+Hides the cover photo in the header. Default value is `false`.
+
+### `data-show-facepile` (optional)
+
+Shows profile photos of friends who like the page. Default value is `true`.
+
+### `data-hide-cta` (optional)
+
+Hides the custom call to action button (if available). Default value is `false`.
+
+### `data-small-header` (optional)
+
+Uses the small header instead. Default value is `false`.
+
+### Common attributes
+
+This element includes [common attributes](https://amp.dev/documentation/guides-and-tutorials/learn/common_attributes)
+extended to AMP components.
+
+### Deprecated attributes
+
+**`data-colorscheme` (optional)**
+
+The color scheme. For details, see the <a href="https://developers.facebook.com/docs/plugins/comments">Facebook comments documentation</a>.<br><br><em>Note: This is no longer supported by Facebook. For more details, follow our <a href="https://github.com/ampproject/amphtml/issues/29980">our tracking issue</a> and <a href="https://developers.facebook.com/support/bugs/1759174414250782/">Facebook's bug report</a>.</em>
+
+## Validation
+
+See [bento-facebook rules](../../../../extensions/amp-facebook/validator-amp-facebook.protoascii) in the AMP validator specification.
diff --git a/src/bento/components/bento-imgur/1.0/base-element.js b/src/bento/components/bento-imgur/1.0/base-element.js
new file mode 100644
index 000000000000..0769ab8c990d
--- /dev/null
+++ b/src/bento/components/bento-imgur/1.0/base-element.js
@@ -0,0 +1,19 @@
+import {PreactBaseElement} from '#preact/base-element';
+
+import {BentoImgur} from './component';
+
+export class BaseElement extends PreactBaseElement {}
+
+/** @override */
+BaseElement['Component'] = BentoImgur;
+
+/** @override */
+BaseElement['props'] = {
+  'imgurId': {attr: 'data-imgur-id'},
+};
+
+/** @override */
+BaseElement['layoutSizeDefined'] = true;
+
+/** @override */
+BaseElement['usesShadowDom'] = true;
diff --git a/src/bento/components/bento-imgur/1.0/bento-imgur.css b/src/bento/components/bento-imgur/1.0/bento-imgur.css
new file mode 100644
index 000000000000..562b488de3ef
--- /dev/null
+++ b/src/bento/components/bento-imgur/1.0/bento-imgur.css
@@ -0,0 +1,17 @@
+/*
+ * Pre-upgrade:
+ * - display:block element
+ * - size-defined element
+ */
+bento-imgur {
+  display: block;
+  overflow: hidden;
+  position: relative;
+}
+
+/* Pre-upgrade: size-defining element - hide children. */
+bento-imgur:not(.i-amphtml-built)
+> :not([placeholder]):not([slot='i-amphtml-svc']) {
+  display: none;
+  content-visibility: hidden;
+}
diff --git a/src/bento/components/bento-imgur/1.0/component.js b/src/bento/components/bento-imgur/1.0/component.js
new file mode 100644
index 000000000000..1b964b25799c
--- /dev/null
+++ b/src/bento/components/bento-imgur/1.0/component.js
@@ -0,0 +1,101 @@
+import {ReadyState_Enum} from '#core/constants/ready-state';
+import {isObject} from '#core/types';
+import {tryParseJson} from '#core/types/object/json';
+
+import * as Preact from '#preact';
+import {useEffect, useRef, useState} from '#preact';
+import {forwardRef} from '#preact/compat';
+import {IframeEmbed} from '#preact/component/iframe';
+import {logger} from '#preact/logger';
+
+const TAG = 'bento-imgur';
+const MATCHES_MESSAGING_ORIGIN = (origin) => origin === 'https://imgur.com';
+
+/**
+ * @param {!BentoImgurDef.Props} props
+ * @param {{current: ?BentoInstagramDef.Api}} ref
+ * @return {PreactDef.Renderable}
+ */
+export function BentoImgurWithRef(
+  {imgurId, title = 'imgur post', ...rest},
+  ref
+) {
+  const [readyState, setReadyState] = useState(ReadyState_Enum.LOADING);
+  const [heightStyle, setHeightStyle] = useState({});
+
+  const messageReceived = useRef(false);
+  const messageHandler = (ev) => {
+    messageReceived.current = true;
+    const data = getEventData(ev) || {};
+    if (data.message === 'resize_imgur') {
+      setHeightStyle({height: Number(data.height)});
+    }
+  };
+
+  useEffect(() => {
+    // Once we're loaded, ensure a message is received soon.
+    // Otherwise, report an error:
+    if (readyState === ReadyState_Enum.LOADING) {
+      messageReceived.current = false;
+    }
+    if (readyState === ReadyState_Enum.COMPLETE) {
+      const id = setTimeout(() => {
+        if (!messageReceived.current) {
+          logger.error(TAG, `Failed to load.  Is "${imgurId}" a correct id?`);
+        }
+      }, 500);
+      return () => clearTimeout(id);
+    }
+  }, [readyState, imgurId]);
+
+  const src = getImgurSrc(imgurId);
+
+  return (
+    <IframeEmbed
+      ref={ref}
+      allowFullScreen
+      onReadyState={setReadyState}
+      title={title}
+      src={src}
+      matchesMessagingOrigin={MATCHES_MESSAGING_ORIGIN}
+      messageHandler={messageHandler}
+      wrapperStyle={heightStyle}
+      {...rest}
+    />
+  );
+}
+
+const BentoImgur = forwardRef(BentoImgurWithRef);
+BentoImgur.displayName = 'Imgur';
+export {BentoImgur};
+
+/**
+ * Returns the event data as an object, or null
+ * @param {{ data: object | string }} ev
+ * @return {object|null}
+ */
+function getEventData(ev) {
+  return isObject(ev.data) ? ev.data : tryParseJson(ev.data);
+}
+
+/**
+ * Ensures the imgurId is properly encoded
+ * @param {string} imgurId
+ * @return {string}
+ */
+function sanitizeId(imgurId) {
+  return imgurId.replace(
+    /^(a\/)?(.*)/,
+    (unusedMatch, aSlash, rest) => (aSlash || '') + encodeURIComponent(rest)
+  );
+}
+
+/**
+ * Returns the imgur URL
+ * @param {string} imgurId
+ * @return {string}
+ */
+function getImgurSrc(imgurId) {
+  const id = sanitizeId(imgurId);
+  return `https://imgur.com/${id}/embed?pub=true`;
+}
diff --git a/src/bento/components/bento-imgur/1.0/component.type.js b/src/bento/components/bento-imgur/1.0/component.type.js
new file mode 100644
index 000000000000..16444b14512c
--- /dev/null
+++ b/src/bento/components/bento-imgur/1.0/component.type.js
@@ -0,0 +1,14 @@
+/** @externs */
+
+/** @const */
+var BentoImgurDef = {};
+
+/**
+ * @typedef {{
+ *   imgurId: string,
+ * }}
+ */
+BentoImgurDef.Props;
+
+/** @interface */
+BentoImgurDef.BentoImgurApi = class {};
diff --git a/src/bento/components/bento-imgur/1.0/storybook/Basic.js b/src/bento/components/bento-imgur/1.0/storybook/Basic.js
new file mode 100644
index 000000000000..0de867ef0271
--- /dev/null
+++ b/src/bento/components/bento-imgur/1.0/storybook/Basic.js
@@ -0,0 +1,41 @@
+import {BentoImgur} from '#bento/components/bento-imgur/1.0/component';
+
+import * as Preact from '#preact';
+
+export default {
+  title: 'Imgur',
+  component: BentoImgur,
+  args: {
+    style: {
+      width: 300,
+      height: 200,
+    },
+  },
+};
+
+const shipTraffic = 'a/Jz6KlaV';
+const fancyCatGallery = 'a/4lyX4Uu';
+const fancyCat3 = 'HmZxgDE';
+const starWarsAtAt = 'a/JQlTKVh';
+
+const medium = {width: 600, height: 200};
+const small = {width: 300, height: 200};
+
+export const Medium = (args) => {
+  return <BentoImgur {...args} imgurId={shipTraffic} style={medium} />;
+};
+export const Small = (args) => {
+  return <BentoImgur {...args} imgurId={shipTraffic} style={small} />;
+};
+export const InvalidID = (args) => {
+  return <BentoImgur {...args} imgurId="a/INVALID" />;
+};
+export const Single = (args) => {
+  return <BentoImgur {...args} imgurId={fancyCat3} />;
+};
+export const ImageGallery = (args) => {
+  return <BentoImgur {...args} imgurId={fancyCatGallery} />;
+};
+export const VideoGallery = (args) => {
+  return <BentoImgur {...args} imgurId={starWarsAtAt} />;
+};
diff --git a/src/bento/components/bento-imgur/OWNERS b/src/bento/components/bento-imgur/OWNERS
new file mode 100644
index 000000000000..70bdffe622ab
--- /dev/null
+++ b/src/bento/components/bento-imgur/OWNERS
@@ -0,0 +1,10 @@
+// For an explanation of the OWNERS rules and syntax, see:
+// https://github.com/ampproject/amp-github-apps/blob/main/owners/OWNERS.example
+
+{
+  rules: [
+    {
+      owners: [{name: 'techhtml'}, {name: 'ampproject/wg-components'}],
+    },
+  ],
+}
diff --git a/src/bento/components/bento-imgur/bento-imgur.md b/src/bento/components/bento-imgur/bento-imgur.md
new file mode 100644
index 000000000000..8e2c07155842
--- /dev/null
+++ b/src/bento/components/bento-imgur/bento-imgur.md
@@ -0,0 +1,42 @@
+---
+$category@: media
+formats:
+  - websites
+teaser:
+  text: Displays an Imgur post.
+---
+
+# bento-imgur
+
+## Usage
+
+This extension creates an iframe and displays an [imgur](http://imgur.com) post.
+
+```html
+<bento-imgur
+  data-imgur-id="f462IUj"
+  layout="responsive"
+  width="540"
+  height="663"
+></bento-imgur>
+```
+
+## Attributes
+
+### data-imgur-id (required)
+
+The id of the Imgur post.
+
+[tip type="important"]
+Album ids should be prefixed with `a/` like `a/ZF7NS3V`.
+
+You can confirm this in the post's url. It should include `a/` or `gallery/` before the rest of the id, like on: `https://imgur.com/a/ZF7NS3V` or `https://imgur.com/gallery/ZF7NS3V`.
+[/tip]
+
+### width (required)
+
+The width of the Imgur post.
+
+### height (required)
+
+The height of the Imgur post.
diff --git a/src/bento/components/bento-inline-gallery/1.0/README.md b/src/bento/components/bento-inline-gallery/1.0/README.md
new file mode 100644
index 000000000000..e854fcfdc603
--- /dev/null
+++ b/src/bento/components/bento-inline-gallery/1.0/README.md
@@ -0,0 +1,226 @@
+# Bento Inline Gallery
+
+Displays slides, with optional pagination dots and thumbnails. Its implementation uses a [Bento Base Carousel](https://www.npmjs.com/package/@bentoproject/base-carousel). Both components must be properly installed for the environment (Web Component vs Preact).
+
+## Web Component
+
+You must include each Bento component's required CSS library to guarantee proper loading and before adding custom styles. Or use the light-weight pre-upgrade styles available inline. See [Layout and style](#layout-and-style).
+
+### Import via npm
+
+```sh
+npm install @bentoproject/inline-gallery
+```
+
+```javascript
+import {defineElement as defineBentoInlineGallery} from '@bentoproject/inline-gallery';
+defineBentoInlineGallery();
+```
+
+### Include via `<script>`
+
+```html
+<script type="module" src="https://cdn.ampproject.org/bento.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/bento.js" crossorigin="anonymous"></script>
+<script type="module" src="https://cdn.ampproject.org/v0/bento-inline-gallery-1.0.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/v0/bento-inline-gallery-1.0.js" crossorigin="anonymous"></script>
+<link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-inline-gallery-1.0.css" crossorigin="anonymous">
+```
+
+### Example
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-inline-gallery-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-inline-gallery-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      href="https://cdn.ampproject.org/v0/bento-inline-gallery-1.0.css"
+    />
+
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-base-carousel-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-base-carousel-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      href="https://cdn.ampproject.org/v0/bento-base-carousel-1.0.css"
+    />
+  </head>
+  <body>
+    <bento-inline-gallery id="inline-gallery">
+      <bento-inline-gallery-thumbnails
+        style="height: 100px"
+        loop
+      ></bento-inline-gallery-thumbnails>
+
+      <bento-base-carousel
+        style="height: 200px"
+        snap-align="center"
+        visible-count="3"
+        loop
+      >
+        <img src="img1.jpeg" data-thumbnail-src="img1-thumbnail.jpeg" />
+        <img src="img2.jpeg" data-thumbnail-src="img2-thumbnail.jpeg" />
+        <img src="img3.jpeg" data-thumbnail-src="img3-thumbnail.jpeg" />
+        <img src="img4.jpeg" data-thumbnail-src="img4-thumbnail.jpeg" />
+        <img src="img5.jpeg" data-thumbnail-src="img5-thumbnail.jpeg" />
+        <img src="img6.jpeg" data-thumbnail-src="img6-thumbnail.jpeg" />
+      </bento-base-carousel>
+
+      <bento-inline-gallery-pagination
+        style="height: 20px"
+      ></bento-inline-gallery-pagination>
+    </bento-inline-gallery>
+  </body>
+</html>
+```
+
+### Layout and style
+
+Each Bento component has a small CSS library you must include to guarantee proper loading without [content shifts](https://web.dev/cls/). Because of order-based specificity, you must manually ensure that stylesheets are included before any custom styles.
+
+```html
+<link
+  rel="stylesheet"
+  type="text/css"
+  href="https://cdn.ampproject.org/v0/bento-inline-gallery-1.0.css"
+/>
+```
+
+Alternatively, you may also make the light-weight pre-upgrade styles available inline:
+
+```html
+<style>
+  bento-inline-gallery,
+  bento-inline-gallery-pagination,
+  bento-inline-gallery-thumbnails {
+    display: block;
+  }
+  bento-inline-gallery {
+    contain: layout;
+  }
+  bento-inline-gallery-pagination,
+  bento-inline-gallery-thumbnails {
+    overflow: hidden;
+    position: relative;
+  }
+</style>
+```
+
+### Attributes on `<bento-inline-gallery-pagination>`
+
+#### `inset`
+
+Boolean attribute indicating whether to display the pagination indicator as inset (overlaying the carousel itself). Default is `false`.
+
+### Attributes on `<bento-inline-gallery-thumbnails>`
+
+#### `aspect-ratio`
+
+A Number defining the ratio of width to height that slides should be displayed in. This value is optional.
+
+#### `loop`
+
+Boolean attribute indicating whether thumbnails should loop. The default is `false`.
+
+### Styling
+
+You may use the `bento-inline-gallery`, `bento-inline-gallery-pagination`, `bento-inline-gallery-thumbnails`, and `bento-base-carousel` element selectors to style the pagination indicator, thumbnails, and carousel freely.
+
+---
+
+## Preact/React Component
+
+### Import via npm
+
+```sh
+npm install @bentoproject/inline-gallery
+```
+
+```javascript
+import React from 'react';
+import {BentoInlineGallery} from '@bentoproject/inline-gallery/react';
+import '@bentoproject/inline-gallery/styles.css';
+
+function App() {
+  return (
+    <BentoInlineGallery id="inline-gallery">
+      <BentoInlineGalleryThumbnails aspect-ratio="1.5" loop />
+      <BentoBaseCarousel snap-align="center" visible-count="1.2" loop>
+        <img src="server.com/static/inline-examples/images/image1.jpg" />
+        <img src="server.com/static/inline-examples/images/image2.jpg" />
+        <img src="server.com/static/inline-examples/images/image3.jpg" />
+      </BentoBaseCarousel>
+      <BentoInlineGalleryPagination inset />
+    </BentoInlineGallery>
+  );
+}
+```
+
+### Layout and style
+
+#### Container type
+
+The `BentoInlineGallery` component has a defined layout size type. To ensure the component renders correctly, be sure to apply a size to the component and its immediate children via a desired CSS layout (such as one defined with `width`). These can be applied inline:
+
+```jsx
+<BentoInlineGallery style={{width: 300}}>...</BentoInlineGallery>
+```
+
+Or via `className`:
+
+```jsx
+<BentoInlineGallery className="custom-styles">...</BentoInlineGallery>
+```
+
+```css
+.custom-styles {
+  background-color: red;
+}
+```
+
+### Props for `BentoInlineGalleryPagination`
+
+In addition to the [common props](../../../../../docs/spec/bento-common-props.md), BentoInlineGalleryPagination supports the props below:
+
+#### `inset`
+
+Boolean attribute indicating whether to display the pagination indicator as inset (overlaying the carousel itself). Default is `false`.
+
+### Props for `BentoInlineGalleryThumbnails`
+
+In addition to the [common props](../../../../../docs/spec/bento-common-props.md), BentoInlineGalleryThumbnails supports the props below:
+
+#### `aspectRatio`
+
+A Number defining the ratio of width to height that slides should be displayed in (this is optional).
+
+#### `loop`
+
+Boolean attribute indicating whether thumbnails should loop. Default is `false`.
diff --git a/src/bento/components/bento-inline-gallery/1.0/base-element.js b/src/bento/components/bento-inline-gallery/1.0/base-element.js
new file mode 100644
index 000000000000..4718e5806ac2
--- /dev/null
+++ b/src/bento/components/bento-inline-gallery/1.0/base-element.js
@@ -0,0 +1,45 @@
+import {CarouselContextProp} from '#bento/components/bento-base-carousel/1.0/carousel-props';
+
+import {setProp} from '#core/context';
+
+import * as Preact from '#preact';
+import {useContext, useLayoutEffect} from '#preact';
+import {PreactBaseElement} from '#preact/base-element';
+
+import {BentoInlineGallery} from './component';
+
+export const TAG = 'bento-inline-gallery';
+
+export class BaseElement extends PreactBaseElement {
+  /** @override */
+  init() {
+    return {
+      'children': <ContextExporter shimDomElement={this.element} />,
+    };
+  }
+}
+
+/** @override */
+BaseElement['Component'] = BentoInlineGallery;
+
+/** @override */
+BaseElement['detached'] = true;
+
+/** @override */
+BaseElement['props'] = {
+  'loop': {attr: 'loop', type: 'boolean'},
+};
+
+/**
+ * @param {!SelectorDef.OptionProps} props
+ * @return {PreactDef.Renderable}
+ */
+function ContextExporter({shimDomElement}) {
+  // Consume the `CarouselContext` produced by the `InlineGallery` component
+  // and propagate it as a context prop.
+  const context = useContext(CarouselContextProp.type);
+  useLayoutEffect(() => {
+    setProp(shimDomElement, CarouselContextProp, ContextExporter, context);
+  }, [shimDomElement, context]);
+  return <></>;
+}
diff --git a/src/bento/components/bento-inline-gallery/1.0/bento-inline-gallery-pagination.css b/src/bento/components/bento-inline-gallery/1.0/bento-inline-gallery-pagination.css
new file mode 100644
index 000000000000..40820d2cc691
--- /dev/null
+++ b/src/bento/components/bento-inline-gallery/1.0/bento-inline-gallery-pagination.css
@@ -0,0 +1,9 @@
+
+
+bento-inline-gallery-pagination[inset] {
+  display: block !important;
+  height: 20px; /* Default height. */
+  width: 100%;
+  position: absolute;
+  bottom: 0;
+}
diff --git a/src/bento/components/bento-inline-gallery/1.0/bento-inline-gallery.css b/src/bento/components/bento-inline-gallery/1.0/bento-inline-gallery.css
new file mode 100644
index 000000000000..10310a6b44e8
--- /dev/null
+++ b/src/bento/components/bento-inline-gallery/1.0/bento-inline-gallery.css
@@ -0,0 +1,27 @@
+/* Pre-upgrade: display:block element */
+amp-inline-gallery,
+amp-inline-gallery-pagination,
+amp-inline-gallery-thumbnails {
+  display: block;
+}
+
+/* Pre-upgrade: contain:layout element */
+amp-inline-gallery {
+  contain: layout;
+}
+
+/* Pre-upgrade: size-defined element */
+amp-inline-gallery-pagination,
+amp-inline-gallery-thumbnails {
+  overflow: hidden;
+  position: relative;
+}
+
+/* Pre-upgrade: size-defining element - hide children. */
+amp-inline-gallery-pagination:not(.i-amphtml-built)
+  > :not([placeholder]):not([slot='i-amphtml-svc']),
+amp-inline-gallery-thumbnails:not(.i-amphtml-built)
+  > :not([placeholder]):not([slot='i-amphtml-svc']) {
+  display: none;
+  content-visibility: hidden;
+}
diff --git a/src/bento/components/bento-inline-gallery/1.0/bento-inline-gallery.js b/src/bento/components/bento-inline-gallery/1.0/bento-inline-gallery.js
new file mode 100644
index 000000000000..fe1b4b82d9d4
--- /dev/null
+++ b/src/bento/components/bento-inline-gallery/1.0/bento-inline-gallery.js
@@ -0,0 +1,3 @@
+import {defineElement} from './web-component';
+
+defineElement();
diff --git a/src/bento/components/bento-inline-gallery/1.0/component.js b/src/bento/components/bento-inline-gallery/1.0/component.js
new file mode 100644
index 000000000000..ec20e110db3c
--- /dev/null
+++ b/src/bento/components/bento-inline-gallery/1.0/component.js
@@ -0,0 +1,33 @@
+import {CarouselContext} from '#bento/components/bento-base-carousel/1.0/carousel-context';
+
+import * as Preact from '#preact';
+import {useMemo, useState} from '#preact';
+import {ContainWrapper} from '#preact/component';
+
+/**
+ * @param {!BentoInlineGalleryDef.Props} props
+ * @return {PreactDef.Renderable}
+ */
+export function BentoInlineGallery({children, ...rest}) {
+  const [currentSlide, setCurrentSlide] = useState(0);
+  const [slides, setSlides] = useState([]);
+  const carouselContext = useMemo(
+    () => ({
+      currentSlide,
+      setCurrentSlide,
+      slides,
+      setSlides,
+    }),
+    [currentSlide, slides]
+  );
+  return (
+    <ContainWrapper size={false} layout={true} {...rest}>
+      <CarouselContext.Provider value={carouselContext}>
+        {children}
+      </CarouselContext.Provider>
+    </ContainWrapper>
+  );
+}
+
+export * from './pagination';
+export * from './thumbnails';
diff --git a/extensions/amp-inline-gallery/1.0/component.type.js b/src/bento/components/bento-inline-gallery/1.0/component.type.js
similarity index 100%
rename from extensions/amp-inline-gallery/1.0/component.type.js
rename to src/bento/components/bento-inline-gallery/1.0/component.type.js
diff --git a/extensions/amp-inline-gallery/1.0/pagination-base-element.js b/src/bento/components/bento-inline-gallery/1.0/pagination-base-element.js
similarity index 89%
rename from extensions/amp-inline-gallery/1.0/pagination-base-element.js
rename to src/bento/components/bento-inline-gallery/1.0/pagination-base-element.js
index 7cecf4fb9dd6..0103491fe6cd 100644
--- a/extensions/amp-inline-gallery/1.0/pagination-base-element.js
+++ b/src/bento/components/bento-inline-gallery/1.0/pagination-base-element.js
@@ -1,8 +1,10 @@
-import {CSS} from './pagination.jss';
-import {CarouselContextProp} from '../../amp-base-carousel/1.0/carousel-props';
-import {BentoInlineGalleryPagination} from './pagination';
+import {CarouselContextProp} from '#bento/components/bento-base-carousel/1.0/carousel-props';
+
 import {PreactBaseElement} from '#preact/base-element';
 
+import {BentoInlineGalleryPagination} from './pagination';
+import {CSS} from './pagination.jss';
+
 export const TAG = 'bento-inline-gallery-pagination';
 
 /** @extends {PreactBaseElement<BaseCarouselDef.CarouselApi>} */
diff --git a/extensions/amp-inline-gallery/1.0/pagination.js b/src/bento/components/bento-inline-gallery/1.0/pagination.js
similarity index 96%
rename from extensions/amp-inline-gallery/1.0/pagination.js
rename to src/bento/components/bento-inline-gallery/1.0/pagination.js
index 16d5c8f49781..7f16b2bebc80 100644
--- a/extensions/amp-inline-gallery/1.0/pagination.js
+++ b/src/bento/components/bento-inline-gallery/1.0/pagination.js
@@ -1,7 +1,9 @@
+import {CarouselContext} from '#bento/components/bento-base-carousel/1.0/carousel-context';
+
 import * as Preact from '#preact';
-import {CarouselContext} from '../../amp-base-carousel/1.0/carousel-context';
-import {Wrapper} from '#preact/component';
 import {useContext} from '#preact';
+import {Wrapper} from '#preact/component';
+
 import {useStyles} from './pagination.jss';
 
 /**
diff --git a/extensions/amp-inline-gallery/1.0/pagination.jss.js b/src/bento/components/bento-inline-gallery/1.0/pagination.jss.js
similarity index 100%
rename from extensions/amp-inline-gallery/1.0/pagination.jss.js
rename to src/bento/components/bento-inline-gallery/1.0/pagination.jss.js
diff --git a/extensions/amp-inline-gallery/1.0/thumbnails-base-element.js b/src/bento/components/bento-inline-gallery/1.0/thumbnails-base-element.js
similarity index 83%
rename from extensions/amp-inline-gallery/1.0/thumbnails-base-element.js
rename to src/bento/components/bento-inline-gallery/1.0/thumbnails-base-element.js
index 5489b6f83104..f2af72f31ba0 100644
--- a/extensions/amp-inline-gallery/1.0/thumbnails-base-element.js
+++ b/src/bento/components/bento-inline-gallery/1.0/thumbnails-base-element.js
@@ -1,8 +1,10 @@
-import {CSS as CAROUSEL_CSS} from '../../amp-base-carousel/1.0/component.jss';
-import {CarouselContextProp} from '../../amp-base-carousel/1.0/carousel-props';
+import {CarouselContextProp} from '#bento/components/bento-base-carousel/1.0/carousel-props';
+import {CSS as CAROUSEL_CSS} from '#bento/components/bento-base-carousel/1.0/component.jss';
+
 import {PreactBaseElement} from '#preact/base-element';
-import {CSS as THUMBNAIL_CSS} from './thumbnails.jss';
+
 import {BentoInlineGalleryThumbnails} from './thumbnails';
+import {CSS as THUMBNAIL_CSS} from './thumbnails.jss';
 
 export const TAG = 'bento-inline-gallery-thumbnails';
 
diff --git a/extensions/amp-inline-gallery/1.0/thumbnails.js b/src/bento/components/bento-inline-gallery/1.0/thumbnails.js
similarity index 89%
rename from extensions/amp-inline-gallery/1.0/thumbnails.js
rename to src/bento/components/bento-inline-gallery/1.0/thumbnails.js
index f7ddd48621ce..e32e92231b59 100644
--- a/extensions/amp-inline-gallery/1.0/thumbnails.js
+++ b/src/bento/components/bento-inline-gallery/1.0/thumbnails.js
@@ -1,7 +1,9 @@
-import * as Preact from '#preact';
-import {BentoBaseCarousel} from '../../amp-base-carousel/1.0/component';
-import {CarouselContext} from '../../amp-base-carousel/1.0/carousel-context';
+import {CarouselContext} from '#bento/components/bento-base-carousel/1.0/carousel-context';
+import {BentoBaseCarousel} from '#bento/components/bento-base-carousel/1.0/component';
+
 import {px} from '#core/dom/style';
+
+import * as Preact from '#preact';
 import {
   useContext,
   useEffect,
@@ -9,6 +11,8 @@ import {
   useRef,
   useState,
 } from '#preact';
+import {propName} from '#preact/utils';
+
 import {useStyles} from './thumbnails.jss';
 
 /**
@@ -18,8 +22,8 @@ import {useStyles} from './thumbnails.jss';
 export function BentoInlineGalleryThumbnails({
   aspectRatio,
   children,
-  'class': className = '',
   loop = false,
+  [propName('class')]: className = '',
   ...rest
 }) {
   const classes = useStyles();
@@ -78,7 +82,7 @@ export function BentoInlineGalleryThumbnails({
                 height: px(height),
                 width: aspectRatio ? px(aspectRatio * height) : '',
               }}
-              tabIndex="0"
+              tabindex="0"
             />
           );
         })}
diff --git a/extensions/amp-inline-gallery/1.0/thumbnails.jss.js b/src/bento/components/bento-inline-gallery/1.0/thumbnails.jss.js
similarity index 100%
rename from extensions/amp-inline-gallery/1.0/thumbnails.jss.js
rename to src/bento/components/bento-inline-gallery/1.0/thumbnails.jss.js
diff --git a/src/bento/components/bento-inline-gallery/1.0/web-component.js b/src/bento/components/bento-inline-gallery/1.0/web-component.js
new file mode 100644
index 000000000000..16e3daa4b230
--- /dev/null
+++ b/src/bento/components/bento-inline-gallery/1.0/web-component.js
@@ -0,0 +1,37 @@
+import {defineBentoElement} from '#preact/bento-ce';
+
+import {BaseElement, TAG} from './base-element';
+import {
+  TAG as PAGINATION_TAG,
+  PaginationBaseElement,
+} from './pagination-base-element';
+import {
+  TAG as THUMBNAIL_TAG,
+  ThumbnailsBaseElement,
+} from './thumbnails-base-element';
+
+/**
+ * Registers `<bento-inline-gallery> component to CustomElements registry
+ * @param {typeof globalThis=} win
+ */
+export function defineElement(win) {
+  defineBentoElement(TAG, BaseElement, win);
+  defineThumbnailsElement(win);
+  definePaginationElement(win);
+}
+
+/**
+ * Registers `<bento-inline-gallery-pagination> component to CustomElements registry
+ * @param {typeof globalThis=} win
+ */
+export function definePaginationElement(win) {
+  defineBentoElement(PAGINATION_TAG, PaginationBaseElement, win);
+}
+
+/**
+ * Registers `<bento-inline-gallery-thumbnails> component to CustomElements registry
+ * @param {typeof globalThis=} win
+ */
+export function defineThumbnailsElement(win) {
+  defineBentoElement(THUMBNAIL_TAG, ThumbnailsBaseElement, win);
+}
diff --git a/src/bento/components/bento-inline-gallery/bento-inline-gallery.md b/src/bento/components/bento-inline-gallery/bento-inline-gallery.md
new file mode 100644
index 000000000000..09d542dad7ec
--- /dev/null
+++ b/src/bento/components/bento-inline-gallery/bento-inline-gallery.md
@@ -0,0 +1,275 @@
+---
+$category@: layout
+formats:
+  - websites
+teaser:
+  text: Displays multiple similar pieces of content along a horizontal axis, with optional pagination dots and thumbnails.
+experimental: true
+bento: true
+---
+
+# bento-inline-gallery
+
+## Usage
+
+The `<bento-inline-gallery>` component uses an `<amp-base-carousel>` to display slides. The page must have the required scripts for both components in the document head. Typical usage might look like:
+
+[example preview="inline" playground="true" imports="bento-inline-gallery:1.0,amp-base-carousel:1.0"]
+
+```html
+<bento-inline-gallery layout="container">
+  <amp-base-carousel
+    class="gallery"
+    layout="responsive"
+    width="3.6"
+    height="2"
+    snap-align="center"
+    loop
+    visible-count="1.2"
+  >
+    <amp-img
+      src="{{server_for_email}}/static/inline-examples/images/image1.jpg"
+      layout="responsive"
+      width="450"
+      height="300"
+    ></amp-img>
+    <amp-img
+      src="{{server_for_email}}/static/inline-examples/images/image2.jpg"
+      layout="responsive"
+      width="450"
+      height="300"
+    ></amp-img>
+    <amp-img
+      src="{{server_for_email}}/static/inline-examples/images/image3.jpg"
+      layout="responsive"
+      width="450"
+      height="300"
+    ></amp-img>
+  </amp-base-carousel>
+  <bento-inline-gallery-pagination layout="nodisplay" inset>
+  </bento-inline-gallery-pagination>
+</bento-inline-gallery>
+```
+
+[/example]
+
+The above example shows slides using an aspect ratio of 3:2, with 10% of a slide peeking on either side. An aspect ratio of 3.6:2 is used on the `amp-base-carousel` to show 1.2 slides at a time.
+
+### Standalone use outside valid AMP documents
+
+Bento allows you to use AMP components in non-AMP pages without needing
+to commit to fully valid AMP. You can take these components and place them
+in implementations with frameworks and CMSs that don't support AMP. Read
+more in our guide [Use AMP components in non-AMP pages](https://amp.dev/documentation/guides-and-tutorials/start/bento_guide/).
+
+To find the standalone version of `bento-inline-gallery`, see [**`bento-inline-gallery`**](./1.0/README.md).
+
+### Include pagination indicators
+
+The `<bento-inline-gallery-pagination>` component determines how a pagination idicator should be displayed. By default, no pagination indicator is displayed.
+
+The pagination indicator renders as dots when there are eight or fewer slides in the `amp-base-carousel`. For nine or more slides, the pagination indicator renders the current slide number and total number of slides, aligned to the right.
+
+The pagination indicator location defaults to underneath the carousel. Adding the inset attribute to the `<bento-inline-gallery-pagination>` tag will overlay the pagination indicator on the carousel. To use different styles for different screen sizes, use the [media attribute](./../../../../docs/spec/amp-html-responsive-attributes.md):
+
+```html
+<bento-inline-gallery layout="container">
+  <amp-base-carousel>…</amp-base-carousel>
+  <bento-inline-gallery-pagination
+    media="(max-width: 599px)"
+    layout="nodisplay"
+    inset
+  >
+  </bento-inline-gallery-pagination>
+  <bento-inline-gallery-pagination
+    media="(min-width: 600px)"
+    layout="fixed-height"
+    height="24"
+  >
+  </bento-inline-gallery-pagination>
+</bento-inline-gallery>
+```
+
+#### `bento-inline-gallery-pagination` attributes
+
+##### `inset` (optional)
+
+Displays the pagination indicator as inset, overlaying the carousel itself. When using `inset`, you should give the `<bento-inline-gallery-pagination>` element `layout="nodisplay"`.
+
+The default CSS for an `<bento-inline-gallery-pagination>` element with `inset` specifies it at `bottom: 0` with respect to its parent element. You may overwrite this to position the element over the carousel if there are other elements, such as `<bento-inline-gallery-thumbnails>`, directly below it.
+
+##### common attributes
+
+The `<bento-inline-gallery-pagination>` element includes <a href="https://amp.dev/documentation/guides-and-tutorials/learn/common_attributes">common attributes</a> extended to AMP components.
+
+### Include thumbnails
+
+The `bento-inline-gallery` component can display thumbnail preview in addition to, or instead of, the pagination indicators. By default, no thumbnails are shown in the gallery. Keep in mind the following best practices when using thumbnails:
+
+-   Avoid using both pagination indicators and thumbnails with less than eight slides. The indicator dots are redundant in smaller galleries.
+-   When using both pagination indicators and thumbnails, inset the pagination indicators to overlap the slides. View the code sample below to see an example.
+-   Use the `media` attribute to show pagination indicators on smaller mobile devices and thumbnails on larger screens.
+-   Load lower resolution images at thumbnails by using `data-thumbnail-src` on your slide elements.
+
+The example below demonstrates a gallery with thumbnails visible at larger resolutions.
+
+[example preview="inline" playground="true" imports="bento-inline-gallery:1.0,amp-base-carousel:1.0"]
+
+```html
+<bento-inline-gallery layout="container">
+  <!--
+    The amp-layout with layout="container" is used to display the pagination on
+    top of the carousel instead of the thumbnails. You can also use a div with
+    `position: relative;`
+  -->
+  <amp-layout layout="container">
+    <amp-base-carousel
+      class="gallery"
+      layout="responsive"
+      width="3"
+      height="2"
+      snap-align="center"
+      loop
+    >
+      <amp-img
+        class="slide"
+        layout="flex-item"
+        src="https://picsum.photos/id/779/600/400"
+        srcset="https://picsum.photos/id/779/150/100 150w,
+                https://picsum.photos/id/779/600/400 600w,
+                https://picsum.photos/id/779/1200/800 1200w"
+        data-thumbnail-src="https://picsum.photos/id/779/150/100"
+      >
+      </amp-img>
+      <amp-img
+        class="slide"
+        layout="flex-item"
+        src="https://picsum.photos/id/1048/600/400"
+        srcset="https://picsum.photos/id/1048/150/100 150w,
+                https://picsum.photos/id/1048/600/400 600w,
+                https://picsum.photos/id/1048/1200/800 1200w"
+        data-thumbnail-src="https://picsum.photos/id/1048/150/100"
+      >
+      </amp-img>
+      <amp-img
+        class="slide"
+        layout="flex-item"
+        src="https://picsum.photos/id/108/600/400"
+        srcset="https://picsum.photos/id/108/150/100 150w,
+                https://picsum.photos/id/108/600/400 600w,
+                https://picsum.photos/id/108/1200/800 1200w"
+        data-thumbnail-src="https://picsum.photos/id/108/150/100"
+      >
+      </amp-img>
+      <amp-img
+        class="slide"
+        layout="flex-item"
+        src="https://picsum.photos/id/130/600/400"
+        srcset="https://picsum.photos/id/130/150/100 150w,
+                https://picsum.photos/id/130/600/400 600w,
+                https://picsum.photos/id/130/1200/800 1200w"
+        data-thumbnail-src="https://picsum.photos/id/130/150/100"
+      >
+      </amp-img>
+      <amp-img
+        class="slide"
+        layout="flex-item"
+        src="https://picsum.photos/id/14/600/400"
+        srcset="https://picsum.photos/id/14/150/100 150w,
+                https://picsum.photos/id/14/600/400 600w,
+                https://picsum.photos/id/14/1200/800 1200w"
+        data-thumbnail-src="https://picsum.photos/id/14/150/100"
+      >
+      </amp-img>
+      <amp-img
+        class="slide"
+        layout="flex-item"
+        src="https://picsum.photos/id/165/600/400"
+        srcset="https://picsum.photos/id/165/150/100 150w,
+                https://picsum.photos/id/165/600/400 600w,
+                https://picsum.photos/id/165/1200/800 1200w"
+        data-thumbnail-src="https://picsum.photos/id/165/150/100"
+      >
+      </amp-img>
+      <amp-img
+        class="slide"
+        layout="flex-item"
+        src="https://picsum.photos/id/179/600/400"
+        srcset="https://picsum.photos/id/179/150/100 150w,
+                https://picsum.photos/id/179/600/400 600w,
+                https://picsum.photos/id/179/1200/800 1200w"
+        data-thumbnail-src="https://picsum.photos/id/179/150/100"
+      >
+      </amp-img>
+      <amp-img
+        class="slide"
+        layout="flex-item"
+        src="https://picsum.photos/id/392/600/400"
+        srcset="https://picsum.photos/id/392/150/100 150w,
+                https://picsum.photos/id/392/600/400 600w,
+                https://picsum.photos/id/392/1200/800 1200w"
+        data-thumbnail-src="https://picsum.photos/id/392/150/100"
+      >
+      </amp-img>
+      <amp-img
+        class="slide"
+        layout="flex-item"
+        src="https://picsum.photos/id/468/600/400"
+        srcset="https://picsum.photos/id/468/150/100 150w,
+                https://picsum.photos/id/468/600/400 600w,
+                https://picsum.photos/id/468/1200/800 1200w"
+        data-thumbnail-src="https://picsum.photos/id/468/150/100"
+      >
+      </amp-img>
+    </amp-base-carousel>
+    <!--
+        If using fewer than 8 slides, consider adding something
+        like media="(max-width: 799px)".
+      -->
+    <bento-inline-gallery-pagination layout="nodisplay" inset>
+    </bento-inline-gallery-pagination>
+  </amp-layout>
+  <bento-inline-gallery-thumbnails
+    media="(min-width: 800px)"
+    layout="fixed-height"
+    height="96"
+  >
+  </bento-inline-gallery-thumbnails>
+</bento-inline-gallery>
+```
+
+[/example]
+
+#### `bento-inline-gallery-thumbnails` attributes
+
+##### Media Queries
+
+The attributes for `<bento-inline-gallery-thumbnails>` can be configured to use different
+options based on a [media query](./../../../../docs/spec/amp-html-responsive-attributes.md).
+
+##### `aspect-ratio` (optional)
+
+Specifies the aspect ratio expressed as `width / height`. The aspect radio defaults to match the slides in `<amp-base-carousel>`.
+
+##### `loop` (optional)
+
+Loops thumbnails. Takes a value of `"true"` or `"false"`. Defaults to `"false"`.
+
+##### common attributes
+
+The `<bento-inline-gallery-thumbnails>` element includes <a href="https://amp.dev/documentation/guides-and-tutorials/learn/common_attributes">common attributes</a> extended to AMP components.
+
+## Attributes
+
+### common attributes
+
+This element includes <a href="https://amp.dev/documentation/guides-and-tutorials/learn/common_attributes">common attributes</a> extended to AMP components.
+
+## Version notes
+
+Unlike `0.1`, the experimental `1.0` version of `bento-inline-gallery` includes the following changes:
+
+-   `bento-inline-gallery-pagination` with `inset` attribute positions the element with an overwritable `bottom: 0`.
+-   `bento-inline-gallery-thumbnails` takes `data-thumbnail-src` from slide elements (children of the `amp-base-carousel`) instead of `srcset`.
+-   `bento-inline-gallery-thumbnails` takes `aspect-ratio` as expressed by `width / height` instead of two separate attributes, `aspect-ratio-width` and `aspect-ratio-height`.
+-   `bento-inline-gallery-thumbnails` configuration for `loop` defaults to `"false"`.
diff --git a/src/bento/components/bento-instagram/1.0/README.md b/src/bento/components/bento-instagram/1.0/README.md
new file mode 100644
index 000000000000..0cf9dfabcce3
--- /dev/null
+++ b/src/bento/components/bento-instagram/1.0/README.md
@@ -0,0 +1,238 @@
+# Bento Instagram
+
+Embeds an Instagram post.
+
+## Web Component
+
+You must include each Bento component's required CSS library before adding custom styles in order to guarantee proper loading. Or use the lightweight pre-uprgrade styles available inline. See [Layout and Style](#layout-and-style).
+
+### Import via npm
+
+```sh
+npm install @bentoproject/instagram
+```
+
+```javascript
+import {defineElement as defineBentoInstagram} from '@bentoproject/instagram';
+defineBentoInstagram();
+```
+
+### Include via `<script>`
+
+```html
+<script type="module" src="https://cdn.ampproject.org/bento.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/bento.js" crossorigin="anonymous"></script>
+<script type="module" src="https://cdn.ampproject.org/v0/bento-instagram-1.0.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/v0/bento-instagram-1.0.js" crossorigin="anonymous"></script>
+<link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-instagram-1.0.css" crossorigin="anonymous">
+```
+
+### Example
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-instagram-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-instagram-1.0.js"
+    ></script>
+    <style>
+      bento-instagram {
+        display: block;
+        overflow: hidden;
+        position: relative;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-instagram
+      id="my-instagram"
+      data-shortcode="CKXYAzuj7TE"
+      data-captioned
+      style="height: 800px; width: 400px"
+    >
+    </bento-instagram>
+  </body>
+</html>
+```
+
+### Layout and style
+
+Each Bento component has a small CSS library you must include to guarantee proper loading without [content shifts](https://web.dev/cls/). Because of order-based specificity, you must manually ensure that stylesheets are included before any custom styles.
+
+```html
+<link
+  rel="stylesheet"
+  type="text/css"
+  href="https://cdn.ampproject.org/v0/bento-instagram-1.0.css"
+/>
+```
+
+Alternatively, you may also make the light-weight pre-upgrade styles available inline:
+
+```html
+<style>
+  bento-instagram {
+    display: block;
+    overflow: hidden;
+    position: relative;
+  }
+</style>
+```
+
+#### Container type
+
+The `bento-instagram` component has a defined layout size type. To ensure the component renders correctly, be sure to apply a size to the component and its immediate children (slides) via a desired CSS layout (such as one defined with `height`, `width`, `aspect-ratio`, or other such properties):
+
+```css
+bento-instagram {
+  height: 500px;
+  width: 100px;
+}
+```
+
+### Attributes
+
+#### `data-shortcode`
+
+The instagram data-shortcode is found in every instagram photo URL. For example, in https://instagram.com/p/fBwFP, <code>fBwFP</code> is the data-shortcode.
+
+#### `data-captioned`
+
+Include the Instagram caption. `bento-instagram` will attempt to resize to the correct height including the caption.
+
+#### API Example
+
+By programmatically changing the `data-shortcode` attribute value, you can dynamically switch to a different post:
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-instagram-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-instagram-1.0.js"
+    ></script>
+    <style>
+      bento-instagram {
+        display: block;
+        overflow: hidden;
+        position: relative;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-instagram
+      id="my-instagram"
+      data-shortcode="CKXYAzuj7TE"
+      data-captioned
+      style="height: 800px; width: 400px"
+    >
+    </bento-instagram>
+    <button id="change-shortcode">Change shortcode</button>
+
+    <script>
+      (async () => {
+        const instagram = document.querySelector('#my-instagram');
+        await customElements.whenDefined('bento-instagram');
+
+        // set up button actions
+        document.querySelector('#change-shortcode').onclick = () => {
+          instagram.dataset.shortcode = '1totVhIFXl';
+        };
+      })();
+    </script>
+  </body>
+</html>
+```
+
+### Styling
+
+You may use the `bento-instagram` element selector to style the component.
+
+---
+
+## Preact/React Component
+
+### Import via npm
+
+```sh
+npm install @bentoproject/instagram
+```
+
+```javascript
+import React from 'react';
+import {BentoInstagram} from '@bentoproject/instagram/react';
+import '@bentoproject/instagram/styles.css';
+function App() {
+  return <BentoInstagram shortcode="CKXYAzuj7TE" captioned />;
+}
+```
+
+### Layout and style
+
+#### Container type
+
+The `BentoInstagram` component has a defined layout size type. To ensure the component renders correctly, be sure to apply a size to the component and its immediate children (slides) via a desired CSS layout (such as one defined with `height`, `width`, `aspect-ratio`, or other such properties). These can be applied inline:
+
+```jsx
+<BentoInstagram
+  style={{width: 300, height: 200}}
+  shortcode="CKXYAzuj7TE"
+></BentoInstagram>
+```
+
+Or via `className`:
+
+```jsx
+<BentoInstagram
+  className="custom-styles"
+  shortcode="CKXYAzuj7TE"
+></BentoInstagram>
+```
+
+```css
+.custom-styles {
+  height: 100px;
+  width: 100%;
+}
+```
+
+### Props
+
+#### `shortcode`
+
+The instagram shortcode is found in every instagram photo URL. For example, in https://instagram.com/p/fBwFP, <code>fBwFP</code> is the shortcode.
+
+#### `captioned`
+
+Include the Instagram caption. `bento-instagram` will attempt to resize to the correct height including the caption.
diff --git a/extensions/amp-instagram/1.0/base-element.js b/src/bento/components/bento-instagram/1.0/base-element.js
similarity index 100%
rename from extensions/amp-instagram/1.0/base-element.js
rename to src/bento/components/bento-instagram/1.0/base-element.js
diff --git a/src/bento/components/bento-instagram/1.0/bento-instagram.css b/src/bento/components/bento-instagram/1.0/bento-instagram.css
new file mode 100644
index 000000000000..74d7f0d6606a
--- /dev/null
+++ b/src/bento/components/bento-instagram/1.0/bento-instagram.css
@@ -0,0 +1,17 @@
+/*
+ * Pre-upgrade:
+ * - display:block element
+ * - size-defined element
+ */
+bento-instagram {
+  display: block;
+  overflow: hidden;
+  position: relative;
+}
+
+/* Pre-upgrade: size-defining element - hide children. */
+bento-instagram:not(.i-amphtml-built)
+  > :not([placeholder]):not([slot='i-amphtml-svc']) {
+  display: none;
+  content-visibility: hidden;
+}
diff --git a/src/bento/components/bento-instagram/1.0/component.js b/src/bento/components/bento-instagram/1.0/component.js
new file mode 100644
index 000000000000..dcc450f755f3
--- /dev/null
+++ b/src/bento/components/bento-instagram/1.0/component.js
@@ -0,0 +1,67 @@
+import {parseJson} from '#core/types/object/json';
+
+import * as Preact from '#preact';
+import {useCallback, useState} from '#preact';
+import {forwardRef} from '#preact/compat';
+import {useValueRef} from '#preact/component';
+import {IframeEmbed} from '#preact/component/iframe';
+
+import {getData} from '#utils/event-helper';
+
+const NO_HEIGHT_STYLE = {};
+const MATCHES_MESSAGING_ORIGIN = (origin) =>
+  origin === 'https://www.instagram.com';
+
+/**
+ * @param {!BentoInstagramDef.Props} props
+ * @param {{current: ?BentoInstagramDef.Api}} ref
+ * @return {PreactDef.Renderable}
+ */
+function BentoInstagramWithRef(
+  {captioned, onLoad, requestResize, shortcode, title = 'Instagram', ...rest},
+  ref
+) {
+  const [heightStyle, setHeightStyle] = useState(NO_HEIGHT_STYLE);
+  const [opacity, setOpacity] = useState(0);
+  const onLoadRef = useValueRef(onLoad);
+
+  const messageHandler = useCallback(
+    (event) => {
+      const data = parseJson(getData(event));
+      if (data['type'] == 'MEASURE' && data['details']) {
+        const height = data['details']['height'];
+        if (requestResize) {
+          requestResize(height);
+        }
+        setHeightStyle({'height': height});
+        setOpacity(1);
+
+        onLoadRef.current?.();
+      }
+    },
+    [requestResize, onLoadRef]
+  );
+
+  return (
+    <IframeEmbed
+      iframeStyle={{opacity}}
+      matchesMessagingOrigin={MATCHES_MESSAGING_ORIGIN}
+      messageHandler={messageHandler}
+      ref={ref}
+      src={
+        'https://www.instagram.com/p/' +
+        encodeURIComponent(shortcode) +
+        '/embed/' +
+        (captioned ? 'captioned/' : '') +
+        '?cr=1&v=12'
+      }
+      title={title}
+      wrapperStyle={heightStyle}
+      {...rest}
+    />
+  );
+}
+
+const BentoInstagram = forwardRef(BentoInstagramWithRef);
+BentoInstagram.displayName = 'Instagram'; // Make findable for tests.
+export {BentoInstagram};
diff --git a/extensions/amp-instagram/1.0/component.type.js b/src/bento/components/bento-instagram/1.0/component.type.js
similarity index 100%
rename from extensions/amp-instagram/1.0/component.type.js
rename to src/bento/components/bento-instagram/1.0/component.type.js
diff --git a/src/bento/components/bento-instagram/OWNERS b/src/bento/components/bento-instagram/OWNERS
new file mode 100644
index 000000000000..277cef29f295
--- /dev/null
+++ b/src/bento/components/bento-instagram/OWNERS
@@ -0,0 +1,10 @@
+// For an explanation of the OWNERS rules and syntax, see:
+// https://github.com/ampproject/amp-github-apps/blob/main/owners/OWNERS.example
+
+{
+  rules: [
+    {
+      owners: [{name: 'ampproject/wg-components'}, {name: 'src-code'}],
+    },
+  ],
+}
diff --git a/src/bento/components/bento-instagram/bento-instagram.md b/src/bento/components/bento-instagram/bento-instagram.md
new file mode 100644
index 000000000000..6ca4e4c153b7
--- /dev/null
+++ b/src/bento/components/bento-instagram/bento-instagram.md
@@ -0,0 +1,64 @@
+---
+$category@: social
+formats:
+  - websites
+teaser:
+  text: Displays an Instagram embed.
+experimental: true
+bento: true
+---
+
+# bento-instagram
+
+## Behavior
+
+The `width` and `height` attributes are special for the Instagram embed.
+These should be the actual width and height of the Instagram image.
+The system automatically adds space for the "chrome" that Instagram adds around the image.
+
+Many Instagrams are square. When you set `layout="responsive"` any value where `width` and `height` are the same will work.
+
+Example:
+
+```html
+<bento-instagram
+  data-shortcode="fBwFP"
+  data-captioned
+  width="400"
+  height="400"
+  layout="responsive"
+>
+</bento-instagram>
+```
+
+If the Instagram is not square you will need to enter the actual dimensions of the image.
+
+When using non-responsive layout you will need to account for the extra space added for the "instagram chrome" around the image. This is currently 48px above and below the image and 8px on the sides.
+
+### Standalone use outside valid AMP documents
+
+Bento allows you to use AMP components in non-AMP pages without needing
+to commit to fully valid AMP. You can take these components and place them
+in implementations with frameworks and CMSs that don't support AMP. Read
+more in our guide [Use AMP components in non-AMP pages](https://amp.dev/documentation/guides-and-tutorials/start/bento_guide/).
+
+To find the standalone version of `bento-instagram`, see [**`bento-instagram`**](./1.0/README.md).
+
+## Attributes
+
+<table>
+  <tr>
+    <td width="40%"><strong>data-shortcode</strong></td>
+    <td>The instagram data-shortcode is found in every instagram photo URL.
+<br>
+For example, in https://instagram.com/p/fBwFP, <code>fBwFP</code> is the data-shortcode.</td>
+  </tr>
+  <tr>
+    <td width="40%"><strong>data-captioned</strong></td>
+    <td>Include the Instagram caption. <code>bento-instagram</code> will attempt to resize to the correct height including the caption.</td>
+  </tr>
+  <tr>
+    <td width="40%"><strong>common attributes</strong></td>
+    <td>This element includes <a href="https://amp.dev/documentation/guides-and-tutorials/learn/common_attributes">common attributes</a> extended to AMP components.</td>
+  </tr>
+</table>
diff --git a/src/bento/components/bento-jwplayer/1.0/base-element.js b/src/bento/components/bento-jwplayer/1.0/base-element.js
new file mode 100644
index 000000000000..b269aac81a64
--- /dev/null
+++ b/src/bento/components/bento-jwplayer/1.0/base-element.js
@@ -0,0 +1,92 @@
+import {BentoVideoBaseElement} from '#bento/components/bento-video/1.0/base-element';
+
+import {getDataParamsFromAttributes} from '#core/dom';
+
+import {createParseAttrsWithPrefix} from '#preact/parse-props';
+
+import {BentoJwplayer} from './component';
+
+export class BaseElement extends BentoVideoBaseElement {
+  /** @override */
+  init() {
+    super.init();
+
+    return {
+      'queryParams': this.mergeQueryParams(
+        getDataParamsFromAttributes(this.element, null, /^playerParam(.+)/),
+        this.element.getAttribute('data-player-querystring')
+      ),
+      'contentSearch': this.getContextualSearch(
+        this.element.getAttribute('data-content-search')
+      ),
+    };
+  }
+
+  /**
+   * Gets contextual search value
+   * @param {string} searchVal
+   * @return {string} contextual search value
+   */
+  getContextualSearch(searchVal) {
+    if (searchVal !== '__CONTEXTUAL__') {
+      return searchVal;
+    }
+
+    const {head, title} = this.element.ownerDocument;
+    const ogTitleElement = head.querySelector('meta[property="og:title"]');
+    const ogTitle = ogTitleElement
+      ? ogTitleElement.getAttribute('content')
+      : null;
+    return ogTitle || title || '';
+  }
+
+  /**
+   * Merges query params from multiple sources into 1 string
+   * @param {object} playerParams
+   * @param {string} playerQueryString
+   * @return {string}
+   */
+  mergeQueryParams(playerParams, playerQueryString) {
+    const addEntries = (acc, entries) => {
+      for (const entry of entries) {
+        acc[entry[0]] = entry[1];
+      }
+    };
+    const p1 = new URLSearchParams(playerParams || '');
+    const p2 = new URLSearchParams(playerQueryString || '');
+    const params = {};
+    addEntries(params, p1.entries());
+    addEntries(params, p2.entries());
+    return params;
+  }
+}
+
+/** @override */
+BaseElement['Component'] = BentoJwplayer;
+
+/** @override */
+BaseElement['props'] = {
+  'playerId': {attr: 'data-player-id'},
+  'mediaId': {attr: 'data-media-id'},
+  'playlistId': {attr: 'data-playlist-id'},
+  'contentRecency': {attr: 'data-content-recency'},
+  'contentBackfill': {attr: 'data-content-backfill', type: 'boolean'},
+  'adCustParams': {attr: 'data-ad-cust-params'},
+  'adMacros': createParseAttrsWithPrefix('data-ad-macro-'),
+  'config': createParseAttrsWithPrefix('data-config-'),
+  'autoplay': {attr: 'autoplay', type: 'boolean'},
+  // TODO(wg-components): Current behavior defaults to loading="auto".
+  // Refactor to make loading="lazy" as the default.
+  'loading': {attr: 'data-loading'},
+  // TODO(wg-bento): These props have no internal implementation yet.
+  'dock': {attr: 'dock', media: true},
+};
+
+/** @override */
+BaseElement['layoutSizeDefined'] = true;
+
+/** @override */
+BaseElement['usesShadowDom'] = true;
+
+/** @override */
+BaseElement['loadable'] = true;
diff --git a/src/bento/components/bento-jwplayer/1.0/bento-jwplayer.css b/src/bento/components/bento-jwplayer/1.0/bento-jwplayer.css
new file mode 100644
index 000000000000..d14f9fbe77fe
--- /dev/null
+++ b/src/bento/components/bento-jwplayer/1.0/bento-jwplayer.css
@@ -0,0 +1,17 @@
+/*
+ * Pre-upgrade:
+ * - display:block element
+ * - size-defined element
+ */
+ bento-jwplayer {
+  display: block;
+  overflow: hidden;
+  position: relative;
+}
+
+/* Pre-upgrade: size-defining element - hide children. */
+bento-jwplayer:not(.i-amphtml-built)
+  > :not([placeholder]):not([slot='i-amphtml-svc']) {
+  display: none;
+  content-visibility: hidden;
+}
diff --git a/src/bento/components/bento-jwplayer/1.0/component.js b/src/bento/components/bento-jwplayer/1.0/component.js
new file mode 100644
index 000000000000..1a5e7f5e4896
--- /dev/null
+++ b/src/bento/components/bento-jwplayer/1.0/component.js
@@ -0,0 +1,309 @@
+import {JwplayerToDom, makeJwplayerIframeSrc} from '#bento/apis/jwplayer-api';
+import {VideoIframe} from '#bento/components/bento-video/1.0/video-iframe';
+
+import {dispatchCustomEvent} from '#core/dom';
+import {tryParseJson} from '#core/types/object/json';
+
+import * as Preact from '#preact';
+import {useCallback, useMemo, useRef} from '#preact';
+import {forwardRef} from '#preact/compat';
+
+import {isJsonOrObj, objOrParseJson} from '../../../../iframe-video';
+
+const JWPLAYER_ORIGIN = /https:\/\/content\.jwplatform\.com/;
+
+/**
+ * Checks if the current browser supports requesting fullscreen
+ * @param {Window} win
+ * @return {boolean}
+ */
+function hasFullScreenApi(win) {
+  return !!win.document.body.requestFullscreen;
+}
+
+/**
+ * @param {!BentoJwplayerDef.Props} props
+ * @param {{current: ?VideoWrapperDef.Api}} ref
+ * @return {PreactDef.Renderable}
+ */
+export function BentoJwplayerWithRef(props, ref) {
+  const {
+    adCustParams,
+    adMacros,
+    autoplay,
+    config,
+    consentParams = {},
+    contentBackfill = true,
+    contentRecency,
+    contentSearch,
+    mediaId,
+    onLoad,
+    onPlayingState,
+    playerId,
+    playlistId,
+    queryParams,
+    ...rest
+  } = props;
+  const playerStateRef = useRef({});
+  const src = useMemo(() => {
+    return makeJwplayerIframeSrc(
+      playerId,
+      playlistId,
+      mediaId,
+      contentSearch,
+      contentRecency,
+      contentBackfill,
+      queryParams,
+      consentParams
+    );
+  }, [
+    playerId,
+    playlistId,
+    mediaId,
+    contentSearch,
+    contentRecency,
+    contentBackfill,
+    queryParams,
+    consentParams,
+  ]);
+
+  const onMessage = useCallback(
+    (e) =>
+      onMessage_(e, {
+        config,
+        adCustParams,
+        adMacros,
+        onPlayingState,
+        onLoad,
+        playerStateRef,
+      }),
+    [config, adCustParams, adMacros, onPlayingState, onLoad]
+  );
+
+  const makeMethodMessage = useCallback(
+    (method) => makeMessage(method, {autoplay}),
+    [autoplay]
+  );
+  const makeFullscreenMessage = useMemo(
+    () =>
+      !hasFullScreenApi(window)
+        ? () =>
+            JSON.stringify({
+              method: 'setFullscreen',
+              optParams: true,
+            })
+        : null,
+    []
+  );
+
+  if (!checkProps(props)) {
+    return false;
+  }
+
+  return (
+    <VideoIframe
+      ref={ref}
+      playerStateRef={playerStateRef}
+      src={src}
+      makeMethodMessage={makeMethodMessage}
+      makeFullscreenMessage={makeFullscreenMessage}
+      onMessage={onMessage}
+      origin={JWPLAYER_ORIGIN}
+      controls
+      {...rest}
+    />
+  );
+}
+
+const BentoJwplayer = forwardRef(BentoJwplayerWithRef);
+BentoJwplayer.displayName = 'BentoJwPlayer'; // Make findable for tests.
+export {BentoJwplayer};
+
+/**
+ * Makes message to handle different media methods
+ * @param {string} apiMethod
+ * @param {*} options
+ * @return {string} message to post to video iframe
+ */
+function makeMessage(apiMethod, options) {
+  let jwplayerMethod, optParams;
+  switch (apiMethod) {
+    case 'play': {
+      const {autoplay} = options;
+      if (autoplay) {
+        optParams = true;
+      }
+      jwplayerMethod = 'play';
+      break;
+    }
+    case 'pause': {
+      jwplayerMethod = 'pause';
+      break;
+    }
+    case 'mute': {
+      jwplayerMethod = 'setMute';
+      optParams = true;
+      break;
+    }
+    case 'unmute': {
+      jwplayerMethod = 'setMute';
+      optParams = false;
+      break;
+    }
+    case 'showControls': {
+      jwplayerMethod = 'setControls';
+      optParams = true;
+      break;
+    }
+    case 'hideControls': {
+      jwplayerMethod = 'setControls';
+      optParams = false;
+      break;
+    }
+  }
+  const message = {method: jwplayerMethod, optParams};
+  return JSON.stringify(message);
+}
+
+/**
+ *
+ * @param {Oject} event
+ * @param {{adCustParams: string, adMacros: Object, config: Object, onLoad: OnLoadCb, onPlayingState: OnPlayingStateCb, playerStateRef: {current: Object}}} options
+ */
+function onMessage_(event, options) {
+  const {currentTarget, data: messageData} = event;
+  const {
+    adCustParams,
+    adMacros,
+    config,
+    onLoad,
+    onPlayingState,
+    playerStateRef,
+  } = options;
+  if (!isJsonOrObj(messageData)) {
+    return;
+  }
+
+  const data = objOrParseJson(messageData);
+  const {detail: eventDetail, event: eventType} = data;
+
+  if (eventType === 'setup') {
+    onSetup(currentTarget, config, adCustParams, adMacros);
+    return;
+  }
+
+  if (eventType === 'ready' && eventDetail) {
+    onReady(currentTarget, eventDetail, onLoad);
+    return;
+  }
+
+  /** update playing state */
+  switch (eventType) {
+    case 'play':
+    case 'adPlay': {
+      onPlayingState?.(true);
+      break;
+    }
+    case 'pause':
+    case 'complete': {
+      onPlayingState?.(false);
+      break;
+    }
+  }
+
+  /**
+   * sync player state to propagate values to videowrapper handle
+   */
+  if (eventDetail.currentTime) {
+    playerStateRef.current.currentTime = eventDetail.currentTime;
+  }
+  if (eventDetail.duration) {
+    playerStateRef.current.duration = eventDetail.duration;
+  }
+
+  /** redispatch jwplayer events */
+  if (eventType in JwplayerToDom) {
+    dispatchCustomEvent(currentTarget, JwplayerToDom[eventType]);
+  }
+}
+
+/**
+ * @param {HTMLIFrameElement} iframe
+ * @param {{json: string}} config
+ * @param {string} adCustParamsJson
+ * @param {object} adMacros
+ */
+function onSetup(iframe, config, adCustParamsJson, adMacros) {
+  /** get all data-config-* */
+  const {json: jsonConfig, ...restConfig} = config || {};
+  const config_ = {
+    ...(tryParseJson(jsonConfig) || {}),
+    ...restConfig,
+  };
+
+  /** get data-ad-macro-* */
+  if (adMacros && Object.keys(adMacros).length !== 0) {
+    config_.adMacros = adMacros;
+  }
+
+  /** get data-ad-cust-params as json */
+  if (adCustParamsJson) {
+    config_.adCustParams = tryParseJson(adCustParamsJson);
+  }
+
+  postCommandMessage(iframe, 'setupConfig', config_);
+}
+
+/**
+ * @param {object} currentTarget
+ * @param {{muted: boolean, playlistItem: Object}} readyOptions
+ * @param {OnLoadCallback} onLoad
+ */
+function onReady(currentTarget, readyOptions, onLoad) {
+  const {muted} = readyOptions;
+  dispatchCustomEvent(currentTarget, 'canplay');
+  onLoad?.();
+  if (muted) {
+    dispatchCustomEvent(currentTarget, 'muted');
+  }
+  dispatchCustomEvent(currentTarget, 'load');
+}
+
+/**
+ * @param {HTMLIFrameElement} iframe
+ * @param {string} method
+ * @param {*} [optParams]
+ * @private
+ */
+function postCommandMessage(iframe, method, optParams) {
+  if (!iframe || !iframe.contentWindow) {
+    return;
+  }
+
+  iframe.contentWindow./*OK*/ postMessage(
+    JSON.stringify({
+      'method': method,
+      'optParams': optParams,
+    }),
+    '*'
+  );
+}
+
+/**
+ * @param {!BentoJwplayerDef.Props} props
+ * @return {boolean}
+ */
+function checkProps(props) {
+  const {mediaId, playerId, playlistId} = props;
+  const requiredProps = playerId && (mediaId || playlistId);
+  if (!requiredProps) {
+    console /*OK*/
+      .warn(
+        'playerId and one of: mediaId or playlistId are required for <Jwplayer>'
+      );
+
+    return false;
+  }
+
+  return true;
+}
diff --git a/src/bento/components/bento-jwplayer/1.0/component.type.js b/src/bento/components/bento-jwplayer/1.0/component.type.js
new file mode 100644
index 000000000000..a46cd5700036
--- /dev/null
+++ b/src/bento/components/bento-jwplayer/1.0/component.type.js
@@ -0,0 +1,25 @@
+/** @externs */
+
+/** @const */
+var BentoJwplayerDef = {};
+
+/**
+ * @typedef {{
+ *   adCustParams: (string),
+ *   adMacros: (Object),
+ *   autoplay: (boolean),
+ *   config: ({json: (string|undefined), pluginUrl: (string|undefined), skinUrl: (string|undefined)}),
+ *   consentParams: ({policyInfo: *, policyMetadata: *, policyState: *}|undefined),
+ *   contentBackfill: (boolean|undefined),
+ *   contentRecency: (string),
+ *   contentSearch: (string),
+ *   mediaId: (string|undefined),
+ *   onLoad: (string|ndefined),
+ *   onPlayingState: (string|undefined),
+ *   playerId: (string),
+ *   playerParams: (string|undefined),
+ *   playerQuerystring: (string|undefined),
+ *   playlistId: (string|undefined),
+ * }}
+ */
+BentoJwplayerDef.Props;
diff --git a/extensions/amp-jwplayer/1.0/storybook/Basic.amp.js b/src/bento/components/bento-jwplayer/1.0/storybook/Basic.amp.js
similarity index 100%
rename from extensions/amp-jwplayer/1.0/storybook/Basic.amp.js
rename to src/bento/components/bento-jwplayer/1.0/storybook/Basic.amp.js
diff --git a/src/bento/components/bento-jwplayer/1.0/storybook/Basic.js b/src/bento/components/bento-jwplayer/1.0/storybook/Basic.js
new file mode 100644
index 000000000000..21a77d4e916c
--- /dev/null
+++ b/src/bento/components/bento-jwplayer/1.0/storybook/Basic.js
@@ -0,0 +1,232 @@
+import {BentoJwplayer} from '#bento/components/bento-jwplayer/1.0/component';
+
+import * as Preact from '#preact';
+import {useRef} from '#preact';
+
+export default {
+  title: 'Jwplayer',
+  component: BentoJwplayer,
+  args: {},
+};
+
+export const Default = (args) => {
+  return (
+    <>
+      <h3>Player & Media IDs</h3>
+      <BentoJwplayer
+        playerId={'uoIbMPm3'}
+        mediaId={'BZ6tc0gy'}
+        style={{width: 480, height: 270}}
+        {...args}
+      ></BentoJwplayer>
+
+      <h3>Player & Playlist IDs</h3>
+      <BentoJwplayer
+        playerId={'uoIbMPm3'}
+        playlistId={'482jsTAr'}
+        style={{width: 480, height: 270}}
+        {...args}
+      ></BentoJwplayer>
+    </>
+  );
+};
+export const WithApi = (args) => {
+  const ref = useRef();
+
+  return (
+    <>
+      <h3>Programmatic control</h3>
+      <BentoJwplayer
+        ref={ref}
+        mediaId={'CtaIzmFs'}
+        playerId={'BjcwyK37'}
+        style={{width: 480, height: 270}}
+        {...args}
+      ></BentoJwplayer>
+      <button onClick={() => ref.current?.pause()}>pause</button>
+      <button onClick={() => ref.current?.play()}>play</button>
+      <button onClick={() => ref.current?.mute()}>mute</button>
+      <button onClick={() => ref.current?.unmute()}>unmute</button>
+      <button onClick={() => ref.current?.requestFullscreen()}>FS</button>
+    </>
+  );
+};
+
+export const WithContextual = (args) => {
+  return (
+    <>
+      <h3>Contextual</h3>
+      <BentoJwplayer
+        playerId={'BjcwyK37'}
+        mediaId={'CtaIzmFs'}
+        contentSearch={'contentSearchVal'}
+        contentBackfill={'true'}
+        contentRecency={'9D'}
+        style={{width: 480, height: 270}}
+        {...args}
+      ></BentoJwplayer>
+    </>
+  );
+};
+
+export const WithAds = (args) => {
+  return (
+    <>
+      <h3>IMA Ad</h3>
+      <BentoJwplayer
+        mediaId={'3h8NHAIV'}
+        playerId={'n6vw37Z7'}
+        {...args}
+        style={{width: 480, height: 270}}
+      ></BentoJwplayer>
+
+      <h3>VAST Ad</h3>
+      <BentoJwplayer
+        mediaId={'NsdRZqng'}
+        playerId={'WmASC9FK'}
+        {...args}
+        style={{width: 480, height: 270}}
+      ></BentoJwplayer>
+    </>
+  );
+};
+
+export const WithConfig = (args) => {
+  return (
+    <>
+      <h3>Custom Skin</h3>
+      <BentoJwplayer
+        mediaId={'CtaIzmFs'}
+        playerId={'BjcwyK37'}
+        config={{
+          skinUrl: 'https://playertest.longtailvideo.com/skins/ethan.css',
+        }}
+        style={{width: 640, height: 360}}
+        {...args}
+      ></BentoJwplayer>
+
+      <h3>Custom Plugin</h3>
+      <BentoJwplayer
+        mediaId={'CtaIzmFs'}
+        playerId={'BjcwyK37'}
+        config={{
+          pluginUrl:
+            'https://playertest.longtailvideo.com/plugins/newsticker.js',
+        }}
+        style={{width: 640, height: 360}}
+        {...args}
+      ></BentoJwplayer>
+
+      <h3>Custom JSON Ad Config</h3>
+      <BentoJwplayer
+        mediaId={'NsdRZqng'}
+        playerId={'WmASC9FK'}
+        config={{
+          json: JSON.stringify({
+            advertising: {
+              client: 'vast',
+              schedule: [
+                {
+                  tag: 'http://playertest.longtailvideo.com/pre.xml',
+                  offset: 'pre',
+                },
+                {
+                  tag: 'http://playertest.longtailvideo.com/mid.xml',
+                  offset: '5',
+                },
+                {
+                  tag: 'http://playertest.longtailvideo.com/post.xml',
+                  offset: 'post',
+                },
+              ],
+            },
+          }),
+        }}
+        style={{width: 640, height: 360}}
+        {...args}
+      ></BentoJwplayer>
+
+      <h3>Custom JSON Config</h3>
+      <BentoJwplayer
+        mediaId={'CtaIzmFs'}
+        playerId={'BjcwyK37'}
+        config={{
+          json: JSON.stringify({
+            playbackRateControls: true,
+            displaytitle: false,
+            horizontalVolumeSlider: true,
+          }),
+        }}
+        style={{width: 640, height: 360}}
+        {...args}
+      ></BentoJwplayer>
+
+      <h3>Custom IMA Ad Params</h3>
+      <BentoJwplayer
+        mediaId={'BZ6tc0gy'}
+        playerId={'4MCKXmfU'}
+        adCustParams={JSON.stringify({
+          key1: 'value1',
+          keyTest: 'value2',
+        })}
+        style={{width: 640, height: 360}}
+        {...args}
+      ></BentoJwplayer>
+
+      <h3>Custom VAST Ad Params</h3>
+      <BentoJwplayer
+        mediaId={'NsdRZqng'}
+        playerId={'WmASC9FK'}
+        adCustParams={JSON.stringify({key1: 'value1', keyTest: 'value2'})}
+        style={{width: 480, height: 270}}
+        {...args}
+      ></BentoJwplayer>
+
+      <h3>Custom VAST Ad Macros</h3>
+      <BentoJwplayer
+        mediaId={'CtaIzmFs'}
+        playerId={'BjcwyK37'}
+        adMacros={{
+          itemTest: 'val',
+          itemParamList: 'one,two,three',
+        }}
+        config={{
+          json: JSON.stringify({
+            advertising: {
+              client: 'vast',
+              schedule: [
+                {
+                  tag: 'http://playertest.longtailvideo.com/pre.xml?domain=__domain__&test=__item-test__&param=__item-param-list__',
+                  offset: 'pre',
+                },
+              ],
+            },
+          }),
+        }}
+        style={{width: 480, height: 270}}
+        {...args}
+      ></BentoJwplayer>
+    </>
+  );
+};
+
+export const WithQueryParams = (args) => {
+  return (
+    <>
+      <h3>Query String and Data Params</h3>
+      <BentoJwplayer
+        mediaId={'BZ6tc0gy'}
+        playerId={'uoIbMPm3'}
+        queryParams={{
+          language: 'de',
+          customAdData: 'key:value;key2:value2',
+          name1: 'abc',
+          name2: 'xyz',
+          name3: '123',
+        }}
+        style={{width: 480, height: 270}}
+        {...args}
+      ></BentoJwplayer>
+    </>
+  );
+};
diff --git a/src/bento/components/bento-jwplayer/OWNERS b/src/bento/components/bento-jwplayer/OWNERS
new file mode 100644
index 000000000000..3b1a322c220a
--- /dev/null
+++ b/src/bento/components/bento-jwplayer/OWNERS
@@ -0,0 +1,10 @@
+// For an explanation of the OWNERS rules and syntax, see:
+// https://github.com/ampproject/amp-github-apps/blob/main/owners/OWNERS.example
+
+{
+  rules: [
+    {
+      owners: [{name: 'ampproject/wg-components'}, {name: 'pablos1'}],
+    },
+  ],
+}
diff --git a/src/bento/components/bento-lightbox-gallery/1.0/README.md b/src/bento/components/bento-lightbox-gallery/1.0/README.md
new file mode 100644
index 000000000000..541ff1bbf4af
--- /dev/null
+++ b/src/bento/components/bento-lightbox-gallery/1.0/README.md
@@ -0,0 +1,262 @@
+# Bento Lightbox Gallery
+
+Provides a modal "lightbox" experience for images.
+
+When the user interacts with the element, a modal expands to fill the viewport until it is closed by the user.
+
+## Web Component
+
+You must include each Bento component's required CSS library to guarantee proper loading and before adding custom styles. As a web component
+
+### Import via npm
+
+```sh
+npm install @bentoproject/lightbox-gallery
+```
+
+```javascript
+import {defineElement as defineBentoLightboxGallery} from '@bentoproject/lightbox-gallery';
+defineBentoLightboxGallery();
+```
+
+### Import via `<script>`
+
+```html
+<script type="module" async src="https://cdn.ampproject.org/bento.mjs"></script>
+<script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+<link rel="stylesheet" type="text/css" href="https://cdn.ampproject.org/v0/bento-lightbox-gallery-1.0.css"
+>
+<script type="module" async src="https://cdn.ampproject.org/v0/bento-lightbox-gallery-1.0.mjs"></script>
+<script nomodule async src="https://cdn.ampproject.org/v0/bento-lightbox-gallery-1.0.js"></script>
+```
+
+### Example
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-lightbox-gallery-1.0.css"
+    />
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-lightbox-gallery-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-lightbox-gallery-1.0.js"
+    ></script>
+  </head>
+  <body>
+    <bento-lightbox-gallery></bento-lightbox-gallery>
+    <figure>
+      <img id="my-img" src="img1.jpwg" lightbox />
+      <figcaption>dog wearing yellow shirt.</figcaption>
+    </figure>
+    <figure>
+      <img src="img2.jpeg" lightbox/>
+    </figure>
+    <figure>
+      <img src="img2.jpeg" lightbox/>
+    </figure>
+  </body>
+</html>
+```
+
+To use `bento-liightbox-gallery`, ensure the required script is included in your `<head>` section, then add the `lightbox` attribute on an `<img>` or `<bento-carousel>` element.
+
+### Add Captions
+
+Optionally, you can specify a caption for each element in the lightbox. these fields are automatically read and displayed by the `<bento-lightbox-gallery>` in the following order of priority:
+
+-   `figcaption` (if the lightboxed element is the child of a figure)
+-   `aria-describedby`
+-   `alt`
+-   `aria-label`
+-   `aria-labelledby`
+
+In the following example, `<bento-lightbox-gallery>` displays the `figcaption` value as its description, showing "toront's cn tower was ....".
+
+```html
+<figure>
+  <img
+    id="hero-img"
+    lightbox="toronto"
+    src="https://picsum.photos/1600/900?image=1075"
+    alt="picture of cn tower."
+  />
+  <figcaption class="image">
+    toronto's cn tower was built in 1976 and was the tallest free-standing
+    structure until 2007.
+  </figcaption>
+</figure>
+```
+
+In the following example, `<bento-lightbox-gallery>` displays the `alt` value as its description, showing "picture of cn tower".
+
+```html
+<img
+  id="hero-img"
+  lightbox="toronto"
+  src="https://picsum.photos/1600/900?image=1075"
+  alt="picture of cn tower"
+/>
+```
+
+## Interactivity and API usage
+
+Bento components are highly interactive through their API. The `bento-lightbox-gallery` component API is accessible by including the following script tag in your document:
+
+```javascript
+await customElements.whenDefined('bento-lightbox-gallery');
+const api = await lightboxGallery.getApi();
+```
+
+### Actions
+
+The `bento-lightbox-gallery` API allows you to perform the following action:
+
+#### `open`
+
+Opens the lightbox gallery.
+
+```javascript
+api.open();
+```
+
+You can open a specific lightbox gallery group to a specific slide by passing in extra arguments:
+
+```javascript
+api.open(1, 'toronto') // opens gallery with images in the "toronto" group to the 2nd image
+api.open(null, 'toronto') // opens gallery with images in the "toronto" group to the 1st image
+```
+
+### Attributes
+
+#### lightbox
+
+Set `lightbox` attribute to an id to assign different images to different groups. For example, in the example below, clicking any of the `group1` images will only show `img1.jpeg`, `img3.jpeg`, and `img5.jpeg` and clicking any of the `group2` images will only show `img2.jpeg`, `img4.jpeg`, `img6.jpeg`
+
+```html
+<img src="img1.jpeg" lightbox="group1">
+<img src="img2.jpeg" lightbox="group2">
+<img src="img3.jpeg" lightbox="group1">
+<img src="img4.jpeg" lightbox="group2">
+<img src="img5.jpeg" lightbox="group1">
+<img src="img6.jpeg" lightbox="group2">
+```
+
+### Layout And Style
+
+Each bento component has a small css library you must include to guarantee proper loading without [content shifts](https://web.dev/cls/). Because of order-based specificity, you must manually ensure that stylesheets are included before any custom styles.
+
+```html
+<link
+  rel="stylesheet"
+  type="text/css"
+  href="https://cdn.ampproject.org/v0/bento-lightbox-gallery-1.0.css"
+/>
+```
+
+---
+
+## Preact/React Component
+
+The preact/react version of the bentolightboxgallery functions differently than the web component version. The following example will demonstrate the use of `<BentoLightboxGallery>` as a functional component.
+
+### Import via npm
+
+```sh
+npm install @bentoproject/lightbox-gallery
+```
+
+```javascript
+import React from 'react';
+import {
+  BentoLightboxGalleryProvider,
+  WithBentoLightboxGallery,
+} from '@bentoproject/lightbox-gallery/react';
+
+function App() {
+  return (
+    <BentoLightboxGalleryProvider>
+      <WithBentoLightboxGallery>
+        <img src="https://images.unsplash.com/photo-1562907550-096d3bf9b25c" />
+      </WithBentoLightboxGallery>
+    </BentoLightboxGalleryProvider>
+  );
+}
+```
+
+### Example Using BentoBaseCarousel
+
+`<BentoLightboxGallery>` can be used with a `<BentoBaseCarousel>` child in order to lightbox all of the carousel's children. As you navigate throught the carousel items in the lightbox, the original carousel slides are synchronised so that when the lightbox is closed, the user ends up on the same slide as they were originally on.
+
+```javascript
+import React from 'react';
+import {BentoBaseCarousel} from '../../../bento-base-carousel/1.0/component';
+import {
+  BentoLightboxGalleryProvider,
+  WithBentoLightboxGallery,
+} from '@bentoproject/lightbox-gallery/react';
+
+function App() {
+  return (
+    <BentoLightboxGalleryProvider>
+      <BentoBaseCarousel lightbox style={{width: 240, height: 160}}>
+        <img
+          src="https://images.unsplash.com/photo-1562907550-096d3bf9b25c"
+          thumbnailSrc="https://images.unsplash.com/photo-1562907550-096d3bf9b25c"
+        />
+      </BentoBaseCarousel>
+    </BentoLightboxGalleryProvider>
+  );
+}
+```
+
+For further examples of how to use the BentoLightboxGallery please check the storybook example found in (Basic.js)[./storybook/Basic.js].
+
+### Props for `BentoLightboxGalleryProvider`
+
+#### onBeforeOpen
+
+A prop which takes a function which is executed before the lightbox is opened.
+
+#### onAfterOpen
+
+A prop which takes a function which is executed after the lightbox is opened.
+
+#### onAfterClose
+
+A prop which takes a function which is executed after the lightbox is closed.
+
+##### onViewGrid
+
+A prop which takes a function which is executed when the user enters the grid view.
+
+#### onToggleCaption
+
+A prop which takes a function which is executed when the captions are toggled.
+
+### Props for `WithBentoLightboxGallery`
+
+#### enableActivation
+
+A boolean prop which defaults to true which lets the child image activate the lightbox experience.
+
+#### onClick
+
+A prop which takes a functhion which is executed when the image is clicked.
diff --git a/src/bento/components/bento-lightbox-gallery/1.0/base-element.js b/src/bento/components/bento-lightbox-gallery/1.0/base-element.js
new file mode 100644
index 000000000000..795d42bd4d0c
--- /dev/null
+++ b/src/bento/components/bento-lightbox-gallery/1.0/base-element.js
@@ -0,0 +1,240 @@
+import {CSS as CAROUSEL_CSS} from '#bento/components/bento-base-carousel/1.0/component.jss';
+import {CSS as LIGHTBOX_CSS} from '#bento/components/bento-lightbox/1.0/component.jss';
+
+import {toggleAttribute} from '#core/dom';
+import {
+  childElement,
+  closestAncestorElementBySelector,
+  elementByTag,
+} from '#core/dom/query';
+import {srcsetFromElement} from '#core/dom/srcset';
+import {toggle} from '#core/dom/style';
+import {toArray} from '#core/types/array';
+
+import * as Preact from '#preact';
+import {PreactBaseElement} from '#preact/base-element';
+
+import {
+  BentoLightboxGalleryProvider,
+  WithBentoLightboxGallery,
+} from './component';
+import {CSS as COMPONENT_CSS} from './component.jss';
+
+/** @const {!Array<string>} */
+const LIGHTBOX_ELIGIBLE_TAGS = ['AMP-IMG', 'IMG'];
+
+/** @const {!Array<string>} */
+const LIGHTBOX_ELIGIBLE_GROUP_SELECTORS = [
+  'AMP-BASE-CAROUSEL[lightbox]',
+  'AMP-STREAM-GALLERY[lightbox]',
+  'BENTO-BASE-CAROUSEL[lightbox]',
+  'BENTO-STREAM-GALLERY[lightbox]',
+];
+
+/** @const {string} */
+const LIGHTBOX_ATTR = 'lightbox';
+
+/** @const {string} */
+const DEFAULT_GROUP = 'default';
+
+/** @const {string} */
+const DEFAULT_CAROUSEL_PREFIX = 'carousel';
+
+/** @const {number} */
+let count = 0;
+
+export class BaseElement extends PreactBaseElement {
+  /** @param {!AmpElement} element */
+  constructor(element) {
+    super(element);
+
+    /** @private {boolean} */
+    this.open_ = false;
+  }
+
+  /** @override */
+  mountCallback() {
+    // There should only be one instance of `amp-lightbox-gallery` in a document.
+    if (count++) {
+      console /*OK */
+        .warn(
+          `${this.element.tagName} already exists in the document. Removing additional instance: ${this.element}`
+        );
+      this.element.parentNode?.removeChild(this.element);
+    }
+  }
+
+  /** @override */
+  init() {
+    const lightboxElements = getLightboxElements(
+      this.element.ownerDocument,
+      (opt_index, opt_group) => this.api().open(opt_index, opt_group)
+    );
+    return {
+      'onBeforeOpen': () => this.beforeOpen(),
+      'onAfterOpen': () => this.afterOpen(),
+      'onAfterClose': () => this.afterClose(),
+      'onViewGrid': () => this.onViewGrid(),
+      'onToggleCaption': () => this.onToggleCaption(),
+      'render': () => lightboxElements,
+    };
+  }
+
+  /** @override */
+  unmountCallback() {
+    count--;
+  }
+
+  /** @protected */
+  beforeOpen() {
+    this.open_ = true;
+    toggleAttribute(this.element, 'open', true);
+    toggle(this.element, true);
+  }
+
+  /** @protected */
+  afterOpen() {}
+
+  /** @protected */
+  afterClose() {
+    this.open_ = false;
+    toggleAttribute(this.element, 'open', false);
+    toggle(this.element, false);
+  }
+
+  /** @protected */
+  onViewGrid() {}
+
+  /** @protected */
+  onToggleCaption() {}
+
+  /** @override */
+  mutationObserverCallback() {
+    const open = this.element.hasAttribute('open');
+    if (open === this.open_) {
+      return;
+    }
+    this.open_ = open;
+    open ? this.api().open() : this.api().close();
+  }
+}
+
+/**
+ * @param {!Document} document
+ * @param {function(number)} open
+ * @return {!Array<PreactDef.Renderable>}
+ */
+function getLightboxElements(document, open) {
+  const lightboxElements = [];
+
+  // Process all standalone elements into a lightbox.
+  toArray(document.querySelectorAll(LIGHTBOX_ELIGIBLE_TAGS)).forEach(
+    (element) => {
+      if (element.hasAttribute(LIGHTBOX_ATTR)) {
+        lightboxElements.push(
+          processLightboxElement(DEFAULT_GROUP, document, element, open)
+        );
+      }
+    }
+  );
+
+  // Process all lightboxed carousel elements into separate lightbox groups.
+  toArray(document.querySelectorAll(LIGHTBOX_ELIGIBLE_GROUP_SELECTORS)).forEach(
+    (element, index) => {
+      const group =
+        element.getAttribute(LIGHTBOX_ATTR) || DEFAULT_CAROUSEL_PREFIX + index;
+      toArray(element.children).forEach((child, index) =>
+        lightboxElements.push(
+          processLightboxElement(group, document, child, open, index)
+        )
+      );
+    }
+  );
+
+  return lightboxElements;
+}
+
+/**
+ * @param {string} defaultGroup
+ * @param {!Document} document
+ * @param {Element} element
+ * @param {function(number)} open
+ * @param {number} opt_index
+ * @return {PreactDef.Renderable}
+ */
+function processLightboxElement(
+  defaultGroup,
+  document,
+  element,
+  open,
+  opt_index
+) {
+  const group = element.getAttribute(LIGHTBOX_ATTR) || defaultGroup;
+  const img = isLightboxEligible(element)
+    ? element
+    : childElement(element, isLightboxEligible);
+  return (
+    <WithBentoLightboxGallery
+      group={group}
+      as="img"
+      caption={getDescriptionForElement(document, img)}
+      onMount={(index) => {
+        const onClick = () => open(opt_index ?? index, group);
+        element.addEventListener('click', onClick);
+        return () => {
+          element.removeEventListener('click', onClick);
+        };
+      }}
+      srcset={srcsetFromElement(img).stringify()}
+    />
+  );
+}
+
+/**
+ * @param {Element} element
+ * @return {boolean}
+ */
+function isLightboxEligible(element) {
+  return LIGHTBOX_ELIGIBLE_TAGS.indexOf(element.tagName) !== -1;
+}
+
+/**
+ * @param {!Document} document
+ * @param {Element} element
+ * @return {string}
+ */
+function getDescriptionForElement(document, element) {
+  // If the element in question is the descendant of a figure element
+  // try using the figure caption as the lightbox description.
+  const figureParent = closestAncestorElementBySelector(element, 'figure');
+  if (figureParent) {
+    const figCaption = elementByTag(figureParent, 'figcaption');
+    if (figCaption) {
+      return figCaption./*OK*/ textContent;
+    }
+  }
+  const ariaDescribedBy = element.getAttribute('aria-describedby');
+  if (ariaDescribedBy) {
+    const descriptionElement = document.getElementById(ariaDescribedBy);
+    if (descriptionElement) {
+      return descriptionElement./*OK*/ textContent;
+    }
+  }
+  const ariaLabelledBy = element.getAttribute('aria-labelledby');
+  if (ariaLabelledBy) {
+    const descriptionElement = document.getElementById(ariaLabelledBy);
+    if (descriptionElement) {
+      return descriptionElement./*OK*/ innerText;
+    }
+  }
+  return element.getAttribute('alt') ?? element.getAttribute('aria-label');
+}
+
+/** @override */
+BaseElement['Component'] = BentoLightboxGalleryProvider;
+
+/** @override */
+BaseElement['usesShadowDom'] = true;
+
+/** @override */
+BaseElement['shadowCss'] = COMPONENT_CSS + LIGHTBOX_CSS + CAROUSEL_CSS;
diff --git a/src/bento/components/bento-lightbox-gallery/1.0/bento-lightbox-gallery.css b/src/bento/components/bento-lightbox-gallery/1.0/bento-lightbox-gallery.css
new file mode 100644
index 000000000000..e82e348dabfd
--- /dev/null
+++ b/src/bento/components/bento-lightbox-gallery/1.0/bento-lightbox-gallery.css
@@ -0,0 +1,18 @@
+
+
+/* Pre-upgrade: not displayed */
+bento-lightbox-gallery[hidden] {
+  display: none !important;
+}
+
+bento-lightbox-gallery {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  box-sizing: border-box;
+  background-color: rgba(0, 0, 0, 0.9);
+  color: white;
+  /* Note: visibility: hidden is applied to this layer to allow the
+     Preact layer to fully control animation transitions. */
+  visibility: hidden;
+}
diff --git a/extensions/amp-lightbox-gallery/1.0/component.js b/src/bento/components/bento-lightbox-gallery/1.0/component.js
similarity index 100%
rename from extensions/amp-lightbox-gallery/1.0/component.js
rename to src/bento/components/bento-lightbox-gallery/1.0/component.js
diff --git a/extensions/amp-lightbox-gallery/1.0/component.jss.js b/src/bento/components/bento-lightbox-gallery/1.0/component.jss.js
similarity index 100%
rename from extensions/amp-lightbox-gallery/1.0/component.jss.js
rename to src/bento/components/bento-lightbox-gallery/1.0/component.jss.js
diff --git a/extensions/amp-lightbox-gallery/1.0/component.type.js b/src/bento/components/bento-lightbox-gallery/1.0/component.type.js
similarity index 100%
rename from extensions/amp-lightbox-gallery/1.0/component.type.js
rename to src/bento/components/bento-lightbox-gallery/1.0/component.type.js
diff --git a/extensions/amp-lightbox-gallery/1.0/consumer.js b/src/bento/components/bento-lightbox-gallery/1.0/consumer.js
similarity index 92%
rename from extensions/amp-lightbox-gallery/1.0/consumer.js
rename to src/bento/components/bento-lightbox-gallery/1.0/consumer.js
index 52483fb58014..56a985c44a14 100644
--- a/extensions/amp-lightbox-gallery/1.0/consumer.js
+++ b/src/bento/components/bento-lightbox-gallery/1.0/consumer.js
@@ -9,7 +9,7 @@ import {
   useMemo,
   useState,
 } from '#preact';
-import {toChildArray} from '#preact/compat';
+import {Children} from '#preact/compat';
 
 import {BentoLightboxGalleryContext} from './context';
 
@@ -18,7 +18,7 @@ const generateLightboxItemKey = sequentialIdGenerator();
 /** @const {string} */
 const DEFAULT_ARIA_LABEL = 'Open content in a lightbox view.';
 
-/** @const {!Object<string, *>} */
+/** @const {!{[key: string]: *}} */
 const DEFAULT_ACTIVATION_PROPS = {
   'aria-label': DEFAULT_ARIA_LABEL,
   role: 'button',
@@ -56,10 +56,10 @@ export function WithBentoLightboxGallery({
       return renderProp();
     }
     if (children) {
-      return toChildArray(children).map(CLONE_CHILD);
+      return Children.map(children, CLONE_CHILD);
     }
     return <Comp srcset={srcset} />;
-  }, [children, renderProp, srcset]);
+  }, [children, renderProp, srcset, Comp]);
 
   const caption = useMemo(
     () => captionProp || alt || ariaLabel,
diff --git a/extensions/amp-lightbox-gallery/1.0/context.js b/src/bento/components/bento-lightbox-gallery/1.0/context.js
similarity index 100%
rename from extensions/amp-lightbox-gallery/1.0/context.js
rename to src/bento/components/bento-lightbox-gallery/1.0/context.js
diff --git a/extensions/amp-lightbox-gallery/1.0/provider.js b/src/bento/components/bento-lightbox-gallery/1.0/provider.js
similarity index 97%
rename from extensions/amp-lightbox-gallery/1.0/provider.js
rename to src/bento/components/bento-lightbox-gallery/1.0/provider.js
index 704c03f131b3..31dab1ebb291 100644
--- a/extensions/amp-lightbox-gallery/1.0/provider.js
+++ b/src/bento/components/bento-lightbox-gallery/1.0/provider.js
@@ -1,5 +1,8 @@
 import objstr from 'obj-str';
 
+import {BentoBaseCarousel} from '#bento/components/bento-base-carousel/1.0/component';
+import {BentoLightbox} from '#bento/components/bento-lightbox/1.0/component';
+
 import {mod} from '#core/math';
 
 import * as Preact from '#preact';
@@ -15,9 +18,6 @@ import {forwardRef} from '#preact/compat';
 import {PADDING_ALLOWANCE, useStyles} from './component.jss';
 import {BentoLightboxGalleryContext} from './context';
 
-import {BentoBaseCarousel} from '../../amp-base-carousel/1.0/component';
-import {BentoLightbox} from '../../amp-lightbox/1.0/component';
-
 /** @const {string} */
 const DEFAULT_GROUP = 'default';
 
@@ -283,7 +283,7 @@ function CloseButtonIcon({onClick}) {
       })}
       onClick={onClick}
       role="button"
-      tabIndex="0"
+      tabindex="0"
       viewBox="0 0 24 24"
       xmlns="http://www.w3.org/2000/svg"
     >
@@ -315,7 +315,7 @@ function NavButtonIcon({'aria-disabled': ariaDisabled, by, disabled, onClick}) {
       disabled={disabled}
       onClick={onClick}
       role="button"
-      tabIndex="0"
+      tabindex="0"
       viewBox="0 0 24 24"
       xmlns="http://www.w3.org/2000/svg"
     >
@@ -348,7 +348,7 @@ function ToggleViewIcon({onClick, showCarousel}) {
       })}
       onClick={onClick}
       role="button"
-      tabIndex="0"
+      tabindex="0"
       viewBox="0 0 24 24"
       xmlns="http://www.w3.org/2000/svg"
     >
@@ -394,7 +394,7 @@ function Thumbnail({onClick, render}) {
       class={classes.thumbnail}
       onClick={onClick}
       role="button"
-      tabIndex="0"
+      tabindex="0"
     >
       {render()}
     </div>
diff --git a/src/bento/components/bento-lightbox-gallery/OWNERS b/src/bento/components/bento-lightbox-gallery/OWNERS
new file mode 100644
index 000000000000..77a55ee52b28
--- /dev/null
+++ b/src/bento/components/bento-lightbox-gallery/OWNERS
@@ -0,0 +1,10 @@
+// For an explanation of the OWNERS rules and syntax, see:
+// https://github.com/ampproject/amp-github-apps/blob/main/owners/OWNERS.example
+
+{
+  rules: [
+    {
+      owners: [{name: 'ampproject/wg-components'}],
+    },
+  ],
+}
diff --git a/src/bento/components/bento-lightbox-gallery/bento-lightbox-gallery.md b/src/bento/components/bento-lightbox-gallery/bento-lightbox-gallery.md
new file mode 100644
index 000000000000..461a35bb49da
--- /dev/null
+++ b/src/bento/components/bento-lightbox-gallery/bento-lightbox-gallery.md
@@ -0,0 +1,257 @@
+---
+$category@: layout
+formats:
+  - websites
+teaser:
+  text: Provides a "lightbox” experience. Upon user interaction, a UI component expands to fill the viewport until it is closed by the user.
+experimental: true
+bento: true
+---
+
+# bento-lightbox-gallery
+
+## Usage
+
+The `bento-lightbox-gallery` component provides a "lightbox" experience for AMP
+components (e.g., `amp-img`, `amp-carousel`). When the user interacts with the
+AMP element, a UI component expands to fill the viewport until it is closed by
+the user. Currently, only images are supported.
+
+To use `bento-lightbox-gallery`, ensure the required script is included in your
+`<head>` section, then add the `lightbox` attribute on an `<amp-img>` or
+`<amp-carousel>` element.
+
+[tip type="read-on"]
+
+For showing individual images in a lightbox, there's also the
+[`<amp-image-lightbox>`](../../../../extensions/amp-image-lightbox/amp-image-lightbox.md)
+component. To display other types of elements in a lightbox, use
+[`<amp-lightbox>`](../bento-lightbox/bento-lightbox.md).
+
+[/tip]
+
+### Display a lightbox with `<amp-img>`
+
+Tapping on any `<amp-img>` opens the image in a lightbox gallery. The lightbox
+gallery does image-handling (e.g., zoom and pan), enables swiping to navigate
+between images, and offers a thumbnail gallery view for browsing all picture
+thumbnails in a grid.
+
+```html
+<amp-img src="cat.jpg" width="100" height="100" lightbox></amp-img>
+<amp-img src="dog.jpg" width="100" height="100" lightbox></amp-img>
+<amp-img src="bird.jpg" width="100" height="100" lightbox></amp-img>
+```
+
+### Display a lightbox with `<amp-carousel>`
+
+You can add the `lightbox` attribute on an `<amp-carousel>` to lightbox all of
+its children. Currently, the `<bento-lightbox-gallery>` component only supports
+carousels containing `<amp-img>` as children. As you navigate through the
+carousel items in the lightbox, the original carousel slides are synchronized so
+that when the lightbox is closed, the user ends up on the same slide as they
+were originally on. Currently, only the `type='slides'` carousel is supported.
+
+```html
+<amp-carousel
+  lightbox
+  width="1600"
+  height="900"
+  layout="responsive"
+  type="slides"
+>
+  <amp-img src="image1" width="200" height="100"></amp-img>
+  <amp-img src="image1" width="200" height="100"></amp-img>
+  <amp-img src="image1" width="200" height="100"></amp-img>
+</amp-carousel>
+```
+
+### Add captions
+
+Optionally, you can specify a caption for each element in the lightbox. These
+fields are automatically read and displayed by the `<bento-lightbox-gallery>` in
+the following order of priority:
+
+-   `figcaption` (if the lightboxed element is the child of a figure)
+-   `aria-describedby`
+-   `alt`
+-   `aria-label`
+-   `aria-labelledby`
+
+In the following example, `<bento-lightbox-gallery>` displays the `figcaption`
+value as its description, showing "Toront's CN tower was ....".
+
+```html
+<figure>
+  <amp-img
+    id="hero-img"
+    lightbox="toronto"
+    src="https://picsum.photos/1600/900?image=1075"
+    layout="responsive"
+    width="1600"
+    height="900"
+    alt="Picture of CN tower."
+  >
+  </amp-img>
+  <figcaption class="image">
+    Toronto's CN tower was built in 1976 and was the tallest free-standing
+    structure until 2007.
+  </figcaption>
+</figure>
+```
+
+In the following example, `<bento-lightbox-gallery>` displays the `alt` value as
+its description, showing "Picture of CN tower".
+
+```html
+<amp-img
+  id="hero-img"
+  lightbox="toronto"
+  src="https://picsum.photos/1600/900?image=1075"
+  layout="responsive"
+  width="1600"
+  height="900"
+  alt="Picture of CN tower"
+>
+</amp-img>
+```
+
+### Implement thumbnail previews
+
+Lightboxed items have a thumbnail gallery view. You can optionally specify a
+thumbnail item for your lightboxed element via the attribute
+`lightbox-thumbnail-id` that references the `id` of an `<amp-img>` element with
+`layout="nodisplay"`.
+
+```html
+<amp-youtube
+  width="480"
+  height="270"
+  layout="responsive"
+  data-videoid="lBTCB7yLs8Y"
+  lightbox-thumbnail-id="my-thumbnail-img"
+>
+</amp-youtube>
+
+<amp-img
+  id="my-thumbnail-img"
+  width="200"
+  height="200"
+  layout="nodisplay"
+  src="https://picsum.photos/200/200?image=1074"
+>
+</amp-img>
+```
+
+If no thumbnail is specified, `<amp-img>` elements will be cropped per
+`object-fit: cover`, `<amp-video>` will use the image `src` specified in its
+`poster` attribute, and placeholder images will be used for lightboxed elements
+that have one.
+
+## Styling
+
+You can style the caption of a `bento-lightbox-gallery` component
+by targeting the `bento-lightbox-gallery-caption` class with standard CSS.
+Some of the properties that can be styled are `font-size` and `color`.
+
+## Actions
+
+### `open`
+
+Opens the lightbox gallery. Can be triggered by tapping another element, if you
+specify the image `id`: `on="tap:bento-lightbox-gallery.open(id='image-id')"`.
+
+## Analytics
+
+To track usage of `bento-lightbox-gallery`, please use one of the following
+analytics events:
+
+### `lightboxOpened`
+
+This event tracks when the lightbox is opened when the user clicks on a
+lightboxed `<amp-img>`.
+
+You can track this event using the following code snippet:
+
+```html
+<amp-analytics>
+  <script type="application/json">
+    {
+      "requests": {
+        "open": "https://foo.com/open"
+      },
+      "triggers": {
+        "trackLightboxOpened": {
+          "on": "lightboxOpened",
+          "request": "open"
+        }
+      }
+    }
+  </script>
+</amp-analytics>
+```
+
+### `thumbnailsViewToggled`
+
+This event tracks when the thumbnails view is triggered by clicking on the
+trigger when the user is in the lightbox view.
+
+You can track this event using the following code snippet:
+
+```html
+<amp-analytics>
+  <script type="application/json">
+    {
+      "requests": {
+        "thumb": "https://foo.com/thumb"
+      },
+      "triggers": {
+        "trackThumbnailsViewToggled": {
+          "on": "thumbnailsViewToggled",
+          "request": "thumb"
+        }
+      }
+    }
+  </script>
+</amp-analytics>
+```
+
+### `descriptionOverflowToggled`
+
+This event tracks when the user toggles the description by clicking on the
+description to expand/collapse it, tracking engagement with the description for
+the lightboxed image.
+
+You can track this event using the following code snippet:
+
+```html
+<amp-analytics>
+  <script type="application/json">
+    {
+      "requests": {
+        "descOverflow": "https://foo.com/descOverflow"
+      },
+      "triggers": {
+        "trackDescriptionOverflowed": {
+          "on": "descriptionOverflowToggled",
+          "request": "descOverflow"
+        }
+      }
+    }
+  </script>
+</amp-analytics>
+```
+
+### Standalone use outside valid AMP documents
+
+Bento allows you to use AMP components in non-AMP pages without needing
+to commit to fully valid AMP. You can take these components and place them
+in implementations with frameworks and CMSs that don't support AMP. Read
+more in our guide [Use AMP components in non-AMP pages](https://amp.dev/documentation/guides-and-tutorials/start/bento_guide/).
+
+To find the standalone version of `bento-lightbox-gallery`, see [**`bento-lightbox-gallery`**](./1.0/README.md).
+
+## Validation
+
+See [`amp-image-lightbox-gallery` rules](../../../../extensions/amp-lightbox-gallery/validator-amp-lightbox-gallery.protoascii)
+in the AMP validator specification.
diff --git a/src/bento/components/bento-lightbox/1.0/README.md b/src/bento/components/bento-lightbox/1.0/README.md
new file mode 100644
index 000000000000..76f5782124c5
--- /dev/null
+++ b/src/bento/components/bento-lightbox/1.0/README.md
@@ -0,0 +1,298 @@
+# Bento Lightbox
+
+Displays any content in a full-viewport "lightbox" modal.
+
+## Web Component
+
+You must include each Bento component's required CSS library before adding custom styles in order to guarantee proper loading. Or use the lightweight pre-uprgrade styles available inline. See [Layout and Style](#layout-and-style).
+
+### Import via npm
+
+```sh
+npm install @bentoproject/lightbox
+```
+
+```javascript
+import {defineElement as defineBentoLightbox} from '@bentoproject/lightbox';
+defineBentoLightbox();
+```
+
+### Import via `<script>`
+
+```html
+<script type="module" async src="https://cdn.ampproject.org/bento.mjs"></script>
+<script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+<script type="module" async src="https://cdn.ampproject.org/v0/bento-lightbox-1.0.mjs"></script>
+<script nomodule async src="https://cdn.ampproject.org/v0/bento-lightbox-1.0.js"></script>
+<link rel="stylesheet" type="text/css" href="https://cdn.ampproject.org/v0/bento-lightbox-1.0.css">
+```
+
+### Example
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-lightbox-1.0.css"
+    />
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-lightbox-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-lightbox-1.0.js"
+    ></script>
+  </head>
+  <body>
+    <bento-lightbox id="my-lightbox" hidden>
+      Lightboxed content
+      <button id="close-button">Close lightbox</button>
+    </bento-lightbox>
+    <button id="open-button">Open lightbox</button>
+    <script>
+      (async () => {
+        const lightbox = document.querySelector('#my-lightbox');
+        await customElements.whenDefined('bento-lightbox');
+        const api = await lightbox.getApi();
+
+        // set up button actions
+        document.querySelector('#open-button').onclick = () => api.open();
+        document.querySelector('#close-button').onclick = () => api.close();
+      })();
+    </script>
+  </body>
+</html>
+```
+
+### Interactivity and API usage
+
+Bento components are highly interactive through their API. The `bento-lightbox` component API is accessible by including the following script tag in your document:
+
+```js
+await customElements.whenDefined('bento-lightbox');
+const api = await lightbox.getApi();
+```
+
+#### Actions
+
+The `amp-lightbox` API allows you to perform the following actions:
+
+##### open()
+
+Opens the lightbox.
+
+```js
+api.open();
+```
+
+##### close()
+
+Closes the lightbox.
+
+```js
+api.close();
+```
+
+#### Events
+
+The `amp-lightbox` API allows you to register and respond to the following events:
+
+##### open
+
+This event is triggered when the lightbox is opened.
+
+```js
+lightbox.addEventListener('open', (e) => console.log(e));
+```
+
+##### close
+
+This event is triggered when the lightbox is closed.
+
+```js
+lightbox.addEventListener('close', (e) => console.log(e));
+```
+
+### Layout and style
+
+Each Bento component has a small CSS library you must include to guarantee proper loading without [content shifts](https://web.dev/cls/). Because of order-based specificity, you must manually ensure that stylesheets are included before any custom styles.
+
+```html
+<link
+  rel="stylesheet"
+  type="text/css"
+  href="https://cdn.ampproject.org/v0/bento-lightbox-1.0.css"
+/>
+```
+
+Alternatively, you may also make the light-weight pre-upgrade styles available inline:
+
+```html
+<style>
+  bento-lightbox {
+    display: none !important;
+  }
+</style>
+```
+
+### Attributes
+
+#### `id`
+
+A unique identifier for the lightbox.
+
+#### `hidden`
+
+Must be present when the lightbox is closed and the contents should not be displayed, such as on first layout.
+
+#### `animation`
+
+Defines the style of animation for opening the lightbox. By default, this will be set to `fade-in`. Valid values are `fade-in`, `fly-in-bottom`, and `fly-in-top`.
+
+#### `scrollable`
+
+When the `scrollable` attribute is present, the content of the lightbox can scroll when overflowing the height of the lightbox.
+
+#### API Example
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-lightbox-1.0.css"
+    />
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-lightbox-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-lightbox-1.0.js"
+    ></script>
+  </head>
+  <body>
+    <bento-lightbox id="my-lightbox" hidden>
+      Lightboxed content
+      <button id="close-button">Close lightbox</button>
+    </bento-lightbox>
+    <button id="open-button">Open lightbox</button>
+    <script>
+      (async () => {
+        const lightbox = document.querySelector('#my-lightbox');
+        await customElements.whenDefined('bento-lightbox');
+        const api = await lightbox.getApi();
+
+        // set up button actions
+        document.querySelector('#open-button').onclick = () => api.open();
+        document.querySelector('#close-button').onclick = () => api.close();
+      })();
+    </script>
+  </body>
+</html>
+```
+
+---
+
+## Preact/React Component
+
+### Import via npm
+
+```sh
+npm install @bentoproject/lightbox
+```
+
+```javascript
+import React from 'react';
+import {BentoLightbox} from '@bentoproject/lightbox/react';
+import '@bentoproject/lightbox/styles.css';
+function App() {
+  return (
+    <BentoLightbox
+      id="lightbox"
+      closeButtonAs={(props) => (
+        <button {...props} aria-label="Close my fancy lightbox">
+          Close!
+        </button>
+      )}
+    >
+      <p>Hello World</p>
+    </BentoLightbox>
+  );
+}
+```
+
+### Layout and style
+
+#### Container type
+
+The `BentoLightbox` component has a defined layout size type. To ensure the component renders correctly, be sure to apply a size to the component and its immediate children (slides) via a desired CSS layout (such as one defined with `height`, `width`, `aspect-ratio`, or other such properties). These can be applied inline:
+
+```jsx
+<BentoLightbox style={{width: 300, height: 200}}></BentoLightbox>
+```
+
+Or via `className`:
+
+```jsx
+<BentoLightbox className="custom-styles"></BentoLightbox>
+```
+
+```css
+.custom-styles {
+  height: 100px;
+  width: 100%;
+}
+```
+
+### Props
+
+#### animation
+
+Animation used to display the lightbox. Options are `fade-in`, `fly-in-top` or `fly-in-bottom`, Default is `fade-in`.
+
+#### children
+
+The content to show within this lightbox.
+
+#### closeButtonAs
+
+A prop which takes a function (as a render prop) to specify a custom close button.
+
+#### onBeforeOpen
+
+A prop which takes a function which is executed before the lightbox is opened.
+
+#### onAfterOpen
+
+A prop which takes a function which is executed after the lightbox is opened.
+
+#### onAfterClose
+
+A prop which takes a function which is executed after the lightbox is closed.
diff --git a/src/bento/components/bento-lightbox/1.0/base-element.js b/src/bento/components/bento-lightbox/1.0/base-element.js
new file mode 100644
index 000000000000..5050bba68822
--- /dev/null
+++ b/src/bento/components/bento-lightbox/1.0/base-element.js
@@ -0,0 +1,76 @@
+import {toggleAttribute} from '#core/dom';
+import {unmountAll} from '#core/dom/resource-container-helper';
+import {toggle} from '#core/dom/style';
+
+import {PreactBaseElement} from '#preact/base-element';
+
+import {BentoLightbox} from './component';
+import {CSS as COMPONENT_CSS} from './component.jss';
+
+export class BaseElement extends PreactBaseElement {
+  /** @param {!AmpElement} element */
+  constructor(element) {
+    super(element);
+
+    /** @private {boolean} */
+    this.open_ = false;
+  }
+
+  /** @override */
+  init() {
+    return {
+      'onBeforeOpen': () => this.beforeOpen(),
+      'onAfterOpen': () => this.afterOpen(),
+      'onAfterClose': () => this.afterClose(),
+    };
+  }
+
+  /** @protected */
+  beforeOpen() {
+    this.open_ = true;
+    toggleAttribute(this.element, 'open', true);
+    toggle(this.element, true);
+    this.triggerEvent(this.element, 'open');
+  }
+
+  /** @protected */
+  afterOpen() {}
+
+  /** @protected */
+  afterClose() {
+    this.open_ = false;
+    toggleAttribute(this.element, 'open', false);
+    toggle(this.element, false);
+    this.triggerEvent(this.element, 'close');
+
+    // Unmount all children when the lightbox is closed. They will automatically
+    // remount when the lightbox is opened again.
+    unmountAll(this.element, /* includeSelf */ false);
+  }
+
+  /** @override */
+  mutationObserverCallback() {
+    const open = this.element.hasAttribute('open');
+    if (open === this.open_) {
+      return;
+    }
+    this.open_ = open;
+    open ? this.api().open() : this.api().close();
+  }
+}
+
+/** @override */
+BaseElement['Component'] = BentoLightbox;
+
+/** @override */
+BaseElement['props'] = {
+  'animation': {attr: 'animation', media: true, default: 'fade-in'},
+  'closeButtonAs': {selector: '[slot="close-button"]', single: true, as: true},
+  'children': {passthrough: true},
+};
+
+/** @override */
+BaseElement['usesShadowDom'] = true;
+
+/** @override */
+BaseElement['shadowCss'] = COMPONENT_CSS;
diff --git a/src/bento/components/bento-lightbox/1.0/bento-lightbox.css b/src/bento/components/bento-lightbox/1.0/bento-lightbox.css
new file mode 100644
index 000000000000..ec15e3091273
--- /dev/null
+++ b/src/bento/components/bento-lightbox/1.0/bento-lightbox.css
@@ -0,0 +1,28 @@
+
+
+/* Pre-upgrade: not displayed */
+bento-lightbox[hidden] {
+  display: none !important;
+}
+
+bento-lightbox {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  box-sizing: border-box;
+  background-color: rgba(0, 0, 0, 0.9);
+  color: white;
+  /* Note: visibility: hidden is applied to this layer to allow the
+     Preact layer to fully control animation transitions. */
+  visibility: hidden;
+}
+
+bento-lightbox::part(lightbox) {
+  /* Note: background should be applied/inherited by all elements
+    in amp-lightbox > c > [part=lightbox] because:
+     - amp-lightbox does not show a background due to visibility: hidden
+     - c does not paint a background due to display: contents
+     - therefore only [part] visibly applies the background value */
+  background: inherit;
+  color: inherit;
+}
diff --git a/src/bento/components/bento-lightbox/1.0/component.js b/src/bento/components/bento-lightbox/1.0/component.js
new file mode 100644
index 000000000000..9bb6593af8bc
--- /dev/null
+++ b/src/bento/components/bento-lightbox/1.0/component.js
@@ -0,0 +1,198 @@
+import {Keys_Enum} from '#core/constants/key-codes';
+import {tryFocus} from '#core/dom';
+import {setStyle} from '#core/dom/style';
+
+import * as Preact from '#preact';
+import {useImperativeHandle, useLayoutEffect, useRef, useState} from '#preact';
+import {forwardRef} from '#preact/compat';
+import {ContainWrapper, useValueRef} from '#preact/component';
+
+import {useStyles} from './component.jss';
+
+const ANIMATION_DURATION = 200;
+const ANIMATION_PRESETS = {
+  'fade-in': [
+    {opacity: 0, visibility: 'visible'},
+    {opacity: 1, visibility: 'visible'},
+  ],
+  'fly-in-top': [
+    {opacity: 0, transform: 'translate(0,-100%)', visibility: 'visible'},
+    {opacity: 1, transform: 'translate(0, 0)', visibility: 'visible'},
+  ],
+  'fly-in-bottom': [
+    {opacity: 0, transform: 'translate(0, 100%)', visibility: 'visible'},
+    {opacity: 1, transform: 'translate(0, 0)', visibility: 'visible'},
+  ],
+};
+
+const DEFAULT_CLOSE_LABEL = 'Close the modal';
+
+const CONTENT_PROPS = {'part': 'scroller'};
+
+/**
+ * @param {!BentoLightboxDef.Props} props
+ * @param {{current: ?BentoLightboxDef.LightboxApi}} ref
+ * @return {PreactDef.Renderable}
+ */
+function BentoLightboxWithRef(
+  {
+    animation = 'fade-in',
+    children,
+    closeButtonAs,
+    onAfterClose,
+    onAfterOpen,
+    onBeforeOpen,
+    ...rest
+  },
+  ref
+) {
+  // There are two phases to open and close.
+  // To open, we mount and render the contents (invisible), then animate the display (visible).
+  // To close, it's the reverse.
+  // `mounted` mounts the component. `visible` plays the animation.
+  const [mounted, setMounted] = useState(false);
+  const [visible, setVisible] = useState(false);
+  const classes = useStyles();
+  const lightboxRef = useRef();
+
+  // We are using refs here to refer to common strings, objects, and functions used.
+  // This is because they are needed within `useEffect` calls below (but are not depended for triggering)
+  // We use `useValueRef` for props that might change (user-controlled)
+  const animationRef = useValueRef(animation);
+  const onBeforeOpenRef = useValueRef(onBeforeOpen);
+  const onAfterCloseRef = useValueRef(onAfterClose);
+  const onAfterOpenRef = useValueRef(onAfterOpen);
+
+  useImperativeHandle(
+    ref,
+    () => ({
+      open: () => {
+        onBeforeOpenRef.current?.();
+        setMounted(true);
+        setVisible(true);
+      },
+      close: () => setVisible(false),
+    }),
+    [onBeforeOpenRef]
+  );
+
+  useLayoutEffect(() => {
+    const element = lightboxRef.current;
+    if (!element) {
+      return;
+    }
+    let animation;
+    // Set pre-animation visibility state, to be flipped post-animation.
+    setStyle(element, 'visibility', visible ? 'hidden' : 'visible');
+
+    // "Make Visible" Animation
+    if (visible) {
+      const postVisibleAnim = () => {
+        setStyle(element, 'opacity', 1);
+        setStyle(element, 'visibility', 'visible');
+        tryFocus(element);
+        onAfterOpenRef.current?.();
+      };
+      if (!element.animate) {
+        postVisibleAnim();
+        return;
+      }
+      animation = element.animate(ANIMATION_PRESETS[animationRef.current], {
+        duration: ANIMATION_DURATION,
+        fill: 'both',
+        easing: 'ease-in',
+      });
+      animation.onfinish = postVisibleAnim;
+    } else {
+      // "Make Invisible" Animation
+      const postInvisibleAnim = () => {
+        setStyle(element, 'opacity', 0);
+        setStyle(element, 'visibility', 'hidden');
+        if (onAfterCloseRef.current) {
+          onAfterCloseRef.current();
+        }
+        animation = null;
+        setMounted(false);
+      };
+      if (!element.animate) {
+        postInvisibleAnim();
+        return;
+      }
+      animation = element.animate(ANIMATION_PRESETS[animationRef.current], {
+        duration: ANIMATION_DURATION,
+        direction: 'reverse',
+        fill: 'both',
+        easing: 'ease-in',
+      });
+      animation.onfinish = postInvisibleAnim;
+    }
+    return () => {
+      if (animation) {
+        animation.cancel();
+      }
+    };
+  }, [visible, animationRef, onAfterCloseRef, onAfterOpenRef]);
+
+  return (
+    mounted && (
+      <ContainWrapper
+        ref={lightboxRef}
+        size={true}
+        layout={true}
+        paint={true}
+        part="lightbox"
+        contentClassName={classes.content}
+        wrapperClassName={classes.wrapper}
+        contentProps={CONTENT_PROPS}
+        role="dialog"
+        tabindex="0"
+        onKeyDown={(event) => {
+          if (event.key === Keys_Enum.ESCAPE) {
+            setVisible(false);
+          }
+        }}
+        {...rest}
+      >
+        <CloseButton as={closeButtonAs} onClick={() => setVisible(false)} />
+        {children}
+      </ContainWrapper>
+    )
+  );
+}
+
+const BentoLightbox = forwardRef(BentoLightboxWithRef);
+BentoLightbox.displayName = 'Lightbox';
+export {BentoLightbox};
+
+/**
+ *
+ * @param {!BentoLightboxDef.CloseButtonProps} props
+ * @return {PreactDef.Renderable}
+ */
+function CloseButton({as: Comp = ScreenReaderCloseButton, onClick}) {
+  return <Comp aria-label={DEFAULT_CLOSE_LABEL} onClick={onClick} />;
+}
+
+/**
+ * This is for screen-readers only, should not get a tab stop. Note that
+ * screen readers can still swipe / navigate to this element, it just will
+ * not be reachable via the tab button. Note that for desktop, hitting esc
+ * to close is also an option.
+ *
+ * We do not want this in the tab order since it is not really "visible"
+ * and would be confusing to tab to if not using a screen reader.
+ *
+ * @param {!BentoLightboxDef.CloseButtonProps} props
+ * @return {PreactDef.Renderable}
+ */
+function ScreenReaderCloseButton({'aria-label': ariaLabel, onClick}) {
+  const classes = useStyles();
+  return (
+    <button
+      aria-label={ariaLabel}
+      class={classes.closeButton}
+      onClick={onClick}
+      tabindex={-1}
+    />
+  );
+}
diff --git a/extensions/amp-lightbox/1.0/component.jss.js b/src/bento/components/bento-lightbox/1.0/component.jss.js
similarity index 100%
rename from extensions/amp-lightbox/1.0/component.jss.js
rename to src/bento/components/bento-lightbox/1.0/component.jss.js
diff --git a/extensions/amp-lightbox/1.0/component.type.js b/src/bento/components/bento-lightbox/1.0/component.type.js
similarity index 100%
rename from extensions/amp-lightbox/1.0/component.type.js
rename to src/bento/components/bento-lightbox/1.0/component.type.js
diff --git a/src/bento/components/bento-lightbox/OWNERS b/src/bento/components/bento-lightbox/OWNERS
new file mode 100644
index 000000000000..627364887fa8
--- /dev/null
+++ b/src/bento/components/bento-lightbox/OWNERS
@@ -0,0 +1,14 @@
+// For an explanation of the OWNERS rules and syntax, see:
+// https://github.com/ampproject/amp-github-apps/blob/main/owners/OWNERS.example
+
+{
+  rules: [
+    {
+      owners: [{name: 'ampproject/wg-components'}],
+    },
+    {
+      pattern: 'validator-*.protoascii',
+      owners: [{name: 'ampproject/wg-amp4email', notify: true}],
+    },
+  ],
+}
diff --git a/src/bento/components/bento-lightbox/bento-lightbox.md b/src/bento/components/bento-lightbox/bento-lightbox.md
new file mode 100644
index 000000000000..3548302a192b
--- /dev/null
+++ b/src/bento/components/bento-lightbox/bento-lightbox.md
@@ -0,0 +1,107 @@
+---
+$category@: layout
+formats:
+  - websites
+teaser:
+  text: Displays elements in a full-viewport “lightbox” modal.
+experimental: true
+bento: true
+---
+
+# bento-lightbox
+
+## Usage
+
+The `bento-lightbox` component defines child elements that display in a
+full-viewport overlay/modal. When the user taps or clicks an element (e.g., a
+button), the `bento-lightbox` ID referenced in the clicked element's `on`
+attribute triggers the lightbox to take up the full viewport and displays the
+child elements of the `bento-lightbox`.
+
+[tip type="read-on"]
+
+For showing images in a lightbox, there's also the
+[`<amp-image-lightbox>`](../../../../extensions/amp-image-lightbox/amp-image-lightbox.md)
+component. To show a gallery of images in a lightbox, you can use
+[`<bento-lightbox-gallery>`](../bento-lightbox-gallery/bento-lightbox-gallery.md).
+
+[/tip]
+
+### Standalone use outside valid AMP documents
+
+Bento allows you to use AMP components in non-AMP pages without needing
+to commit to fully valid AMP. You can take these components and place them
+in implementations with frameworks and CMSs that don't support AMP. Read
+more in our guide [Use AMP components in non-AMP pages](https://amp.dev/documentation/guides-and-tutorials/start/bento_guide/).
+
+To find the standalone version of `bento-lightbox`, see [**`bento-lightbox`**](./1.0/README.md).
+
+## Attributes
+
+### `id`
+
+A unique identifier for the lightbox.
+
+### `layout` (required)
+
+Must be set to `nodisplay`.
+
+### `animation`
+
+Defines the style of animation for opening the lightbox. By default, this will
+be set to `fade-in`. Valid values are `fade-in`, `fly-in-bottom`, and
+`fly-in-top`.
+
+This attribute can be configured to use different
+options based on a [media query](./../../../../docs/spec/amp-html-responsive-attributes.md).
+
+### `scrollable`
+
+When the `scrollable` attribute is present, the content of the lightbox can
+scroll when overflowing the height of the lightbox.
+
+## Actions
+
+### `open` (default)
+
+Opens the lightbox.
+
+### `close`
+
+Closes the lightbox.
+
+## Styling
+
+You can style the `bento-lightbox` with standard CSS.
+
+## Accessibility
+
+Pressing the escape key on the keyboard or setting focus on an element outside
+the lightbox closes the lightbox. Alternatively, setting the `on` attribute on
+one or more elements within the lightbox and setting its method to `close`
+closes the lightbox when the element is tapped or clicked. Once closed, the
+focus will be sent back to the trigger element.
+
+For accessibility reasons, if the user does not provide a focus in the lightbox
+on open (using `autofocus` attribute or forcing focus on open), the focus will
+be set on the first element using `on:tap`. Otherwise, a close button only
+visible to screen readers, optionally using `data-close-button-aria-label`
+attribute value, will be created and focused on.
+
+```html
+<button on="tap:quote-lb">See Quote</button>
+<bento-lightbox id="quote-lb" layout="nodisplay">
+  <blockquote>
+    "Don't talk to me about JavaScript fatigue" - Horse JS
+  </blockquote>
+  <button on="tap:quote-lb.close">Nice!</button>
+</bento-lightbox>
+```
+
+## Version notes
+
+The experimental `1.0` version of `bento-lightbox` employs the following differences from version `0.1`:
+
+-   This component does not currently support modifying browser history state.
+-   `data-close-button-aria-label` is not supported and will soon be replaced with support for `slot="close-button"`.
+-   `animate-in` has been renamed to `animation`.
diff --git a/src/bento/components/bento-mega-menu/1.0/base-element.js b/src/bento/components/bento-mega-menu/1.0/base-element.js
new file mode 100644
index 000000000000..1c054f6e221c
--- /dev/null
+++ b/src/bento/components/bento-mega-menu/1.0/base-element.js
@@ -0,0 +1,30 @@
+import {PreactBaseElement} from '#preact/base-element';
+
+import {BentoMegaMenu} from './component';
+import {BentoItem} from './component/BentoItem';
+import {CSS as COMPONENT_CSS} from './component.jss';
+
+export class BaseElement extends PreactBaseElement {
+  /** @override */
+  init() {
+    super.init();
+    return {ItemWrapper: BentoItem};
+  }
+}
+
+/** @override */
+BaseElement['Component'] = BentoMegaMenu;
+
+/** @override */
+BaseElement['props'] = {
+  'children': {
+    selector: '*',
+    single: false,
+  },
+};
+
+/** @override */
+BaseElement['usesShadowDom'] = true;
+
+/** @override */
+BaseElement['shadowCss'] = COMPONENT_CSS;
diff --git a/src/bento/components/bento-mega-menu/1.0/bento-mega-menu.css b/src/bento/components/bento-mega-menu/1.0/bento-mega-menu.css
new file mode 100644
index 000000000000..cb3a6c6cf203
--- /dev/null
+++ b/src/bento/components/bento-mega-menu/1.0/bento-mega-menu.css
@@ -0,0 +1,42 @@
+/*
+ * Pre-upgrade:
+ * - display:block element
+ * - contain:layout element
+ */
+bento-mega-menu {
+  background: white;
+  position: relative;
+  z-index: 1000;
+
+  /* Before built, display the contents correctly: */
+  display: flex;
+  flex-wrap: wrap;
+  gap: 0.5em;
+}
+
+bento-mega-menu.i-amphtml-built {
+  display: block;
+}
+
+bento-mega-menu > section > :first-child {
+  /* Title */
+  cursor: pointer;
+}
+bento-mega-menu > section > :last-child {
+  /* Content */
+  position: absolute;
+  left: 0;
+  width: 100%;
+  background: white;
+  opacity: 0;
+  visibility: hidden;
+  transition: opacity 200ms, visibility 0ms 200ms;
+  transition-timing-function: ease-in;
+}
+bento-mega-menu > section[expanded] > :last-child {
+  /* Content (expanded) */
+  opacity: 1;
+  visibility: visible;
+  transition-delay: 0ms;
+  transition-timing-function: ease-out;
+}
diff --git a/src/bento/components/bento-mega-menu/1.0/component.js b/src/bento/components/bento-mega-menu/1.0/component.js
new file mode 100644
index 000000000000..356178626092
--- /dev/null
+++ b/src/bento/components/bento-mega-menu/1.0/component.js
@@ -0,0 +1 @@
+export * from './component/BentoMegaMenu';
diff --git a/src/bento/components/bento-mega-menu/1.0/component.jss.js b/src/bento/components/bento-mega-menu/1.0/component.jss.js
new file mode 100644
index 000000000000..2edbee9a42f0
--- /dev/null
+++ b/src/bento/components/bento-mega-menu/1.0/component.jss.js
@@ -0,0 +1,73 @@
+import {createUseStyles} from 'react-jss';
+
+const mainNav = {
+  whiteSpace: 'nowrap',
+  background: 'white',
+  position: 'relative',
+  zIndex: 1000,
+
+  '& > ul': {
+    display: 'flex',
+    listStyleType: 'none',
+    padding: 0,
+    margin: 0,
+    flexWrap: 'wrap',
+
+    gap: '0.5em',
+  },
+};
+
+const title = {
+  cursor: 'pointer',
+};
+const content = {
+  position: 'absolute',
+  left: '0',
+  width: '100vw',
+  background: 'white',
+  opacity: 0,
+  visibility: 'hidden',
+  transition: 'opacity 200ms, visibility 0s 200ms',
+  transitionTimingFunction: 'ease-in',
+
+  '&.open': {
+    opacity: 1,
+    visibility: 'visible',
+    transitionDelay: 0,
+    transitionTimingFunction: 'ease-out',
+  },
+};
+
+const mask = {
+  position: 'fixed',
+  zIndex: 999,
+  visibility: 'hidden',
+  opacity: 0,
+
+  top: 0,
+  bottom: 0,
+  left: 0,
+  right: 0,
+
+  background: 'black',
+  transition: 'opacity 200ms, visibility 0s 200ms',
+  transitionTimingFunction: 'ease-in',
+
+  '&.open': {
+    opacity: 0.5,
+    visibility: 'visible',
+    transitionDelay: 0,
+    transitionTimingFunction: 'ease-out',
+  },
+};
+
+const JSS = {
+  mainNav,
+  title,
+  content,
+  mask,
+};
+
+// useStyles gets replaced for AMP builds via `babel-plugin-transform-jss`.
+// eslint-disable-next-line local/no-export-side-effect
+export const useStyles = createUseStyles(JSS);
diff --git a/src/bento/components/bento-mega-menu/1.0/component.type.js b/src/bento/components/bento-mega-menu/1.0/component.type.js
new file mode 100644
index 000000000000..d06e54486d9a
--- /dev/null
+++ b/src/bento/components/bento-mega-menu/1.0/component.type.js
@@ -0,0 +1,10 @@
+/** @externs */
+
+/** @const */
+var BentoMegaMenuDef = {};
+
+/** @type {BentoMegaMenuProps} */
+BentoMegaMenuDef.Props;
+
+/** @type {BentoMegaMenuApi} */
+BentoMegaMenuDef.BentoMegaMenuApi = class {};
diff --git a/src/bento/components/bento-mega-menu/1.0/component/BentoItem.tsx b/src/bento/components/bento-mega-menu/1.0/component/BentoItem.tsx
new file mode 100644
index 000000000000..85bb926b9b4b
--- /dev/null
+++ b/src/bento/components/bento-mega-menu/1.0/component/BentoItem.tsx
@@ -0,0 +1,63 @@
+import {Shim} from '#bento/components/bento-mega-menu/1.0/component/Shim';
+
+import * as Preact from '#preact';
+import {useLayoutEffect, useRef} from '#preact';
+import {useAttributeObserver} from '#preact/hooks/useMutationObserver';
+import {FC} from '#preact/types';
+
+import {Content} from './Content';
+import {Item, useMegaMenuItem} from './Item';
+import {Title} from './Title';
+
+export const BentoItem: FC = ({children}) => {
+  return (
+    <Item>
+      <SlottedDomWrapper>{children}</SlottedDomWrapper>
+    </Item>
+  );
+};
+
+/**
+ * Renders the slot, and uses a bunch of shims to control the slotted (light DOM) elements
+ */
+const SlottedDomWrapper: FC = ({children}) => {
+  const {actions, isOpen} = useMegaMenuItem();
+
+  const ref = useRef<HTMLDivElement>(null);
+
+  // Capture all the Light DOM elements:
+  const sectionRef = useRef<HTMLElement>(null);
+  const titleRef = useRef<HTMLElement>(null);
+  const contentsRef = useRef<HTMLElement>(null);
+  useLayoutEffect(() => {
+    const slot = ref.current!.querySelector('slot')!;
+    const section = slot.assignedElements()[0];
+    const {firstElementChild: header, lastElementChild: contents} = section;
+    sectionRef.current = section as HTMLElement;
+    contentsRef.current = contents as HTMLElement;
+    titleRef.current = header as HTMLElement;
+  }, []);
+
+  // Watch the section's 'expanded' attribute:
+  useAttributeObserver(sectionRef, 'expanded', (attrValue) => {
+    const expanded = attrValue !== null;
+    const shouldToggle = (expanded && !isOpen) || (!expanded && isOpen);
+    if (shouldToggle) {
+      actions.toggle();
+    }
+  });
+
+  const sectionAttributes = {
+    expanded: isOpen,
+  };
+  // Render the slot, Title, and Content elements.
+  // Render these using Shims, to control the Light DOM elements
+  return (
+    <div ref={ref}>
+      {children}
+      <Shim elementRef={sectionRef} {...sectionAttributes} />
+      <Title as={Shim} elementRef={titleRef} />
+      <Content as={Shim} elementRef={contentsRef} />
+    </div>
+  );
+};
diff --git a/src/bento/components/bento-mega-menu/1.0/component/BentoMegaMenu.tsx b/src/bento/components/bento-mega-menu/1.0/component/BentoMegaMenu.tsx
new file mode 100644
index 000000000000..2fc755912d5a
--- /dev/null
+++ b/src/bento/components/bento-mega-menu/1.0/component/BentoMegaMenu.tsx
@@ -0,0 +1,81 @@
+import objStr from 'obj-str';
+
+import * as Preact from '#preact';
+import {useImperativeHandle, useRef} from '#preact';
+import {Children, forwardRef} from '#preact/compat';
+import {ContainWrapper} from '#preact/component';
+import {useClickOutside} from '#preact/hooks/useClickOutside';
+import type {ComponentChildren, ComponentType, Ref} from '#preact/types';
+
+import {Content} from './Content';
+import {Item} from './Item';
+import {Title} from './Title';
+import {MegaMenuContext, useMegaMenu} from './useMegaMenu';
+
+import {useStyles} from '../component.jss';
+
+export type BentoMegaMenuProps = {
+  children?: ComponentChildren;
+  /**
+   * Used for Bento web-component mode
+   */
+  ItemWrapper?: ComponentType;
+};
+
+export type BentoMegaMenuApi = ReturnType<typeof useMegaMenu>;
+
+/**
+ * @return {PreactDef.Renderable}
+ */
+function BentoMegaMenuWithRef(
+  {ItemWrapper, children, ...rest}: BentoMegaMenuProps,
+  ref: Ref<BentoMegaMenuApi>
+) {
+  const megaMenu = useMegaMenu();
+
+  const isAnyOpen = megaMenu.openId !== null;
+
+  const navRef = useRef<HTMLDivElement>(null);
+  useClickOutside(navRef, (ev: MouseEvent) => {
+    if (megaMenu.isAnyOpen) {
+      megaMenu.actions.closeMenu();
+
+      ev.preventDefault();
+      ev.stopPropagation();
+    }
+  });
+
+  useImperativeHandle(ref, () => megaMenu, [megaMenu]);
+  const classes = useStyles();
+  return (
+    <ContainWrapper {...rest}>
+      <MegaMenuContext.Provider value={megaMenu}>
+        <nav class={classes.mainNav} ref={navRef}>
+          <ul>
+            {Children.map(children, (child, index) => {
+              if (ItemWrapper) {
+                child = <ItemWrapper>{child}</ItemWrapper>;
+              }
+              return <li key={index}>{child}</li>;
+            })}
+          </ul>
+        </nav>
+        <div
+          class={objStr({
+            [classes.mask]: true,
+            'open': isAnyOpen,
+          })}
+          aria-hidden
+        />
+      </MegaMenuContext.Provider>
+    </ContainWrapper>
+  );
+}
+
+const BentoMegaMenuFwd = forwardRef(BentoMegaMenuWithRef);
+const BentoMegaMenu = Object.assign(BentoMegaMenuFwd, {
+  Title,
+  Content,
+  Item,
+});
+export {BentoMegaMenu};
diff --git a/src/bento/components/bento-mega-menu/1.0/component/Content.tsx b/src/bento/components/bento-mega-menu/1.0/component/Content.tsx
new file mode 100644
index 000000000000..859d7f58e7ab
--- /dev/null
+++ b/src/bento/components/bento-mega-menu/1.0/component/Content.tsx
@@ -0,0 +1,55 @@
+import objStr from 'obj-str';
+
+import * as Preact from '#preact';
+import {useLayoutEffect} from '#preact';
+import {ComponentChildren} from '#preact/types';
+import {propName} from '#preact/utils';
+
+import {useMegaMenuItem} from './Item';
+import {AriaAttributes, AsComponent, AsProps} from './types';
+
+import {useStyles} from '../component.jss';
+
+type ContentProps<TAs extends AsComponent> = AsProps<TAs> & {
+  children?: ComponentChildren;
+  class?: string;
+  id?: string;
+};
+
+export function Content<TAs extends AsComponent = 'div'>({
+  as: As = 'div',
+  children,
+  id: idProp,
+  [propName('class')]: className,
+  ...rest
+}: ContentProps<TAs>) {
+  const classes = useStyles();
+  const {actions, isOpen, itemId} = useMegaMenuItem();
+
+  // If this ID is set, pass it to the parent:
+  useLayoutEffect(() => {
+    if (idProp) {
+      actions.overrideItemId(idProp);
+    }
+  }, [actions, idProp]);
+
+  const ariaAttrs: AriaAttributes = {
+    'aria-modal': isOpen,
+  };
+
+  return (
+    <As
+      role="dialog"
+      id={itemId}
+      {...ariaAttrs}
+      {...rest}
+      class={objStr({
+        [className!]: !!className,
+        [classes.content]: true,
+        ['open']: isOpen,
+      })}
+    >
+      {children}
+    </As>
+  );
+}
diff --git a/src/bento/components/bento-mega-menu/1.0/component/Item.tsx b/src/bento/components/bento-mega-menu/1.0/component/Item.tsx
new file mode 100644
index 000000000000..4b7c1a47d715
--- /dev/null
+++ b/src/bento/components/bento-mega-menu/1.0/component/Item.tsx
@@ -0,0 +1,66 @@
+import * as Preact from '#preact';
+import {
+  createContext,
+  useContext,
+  useLayoutEffect,
+  useMemo,
+  useState,
+} from '#preact';
+import useEvent from '#preact/hooks/useEvent';
+import {FC} from '#preact/types';
+
+import {useMegaMenuContext} from './useMegaMenu';
+
+const MegaMenuItemContext = createContext<ReturnType<
+  typeof useMegaMenuItemState
+> | null>(null);
+
+export const Item: FC<{id?: string}> = ({children, id = ''}) => {
+  const megaMenuItem = useMegaMenuItemState(id);
+  return (
+    <MegaMenuItemContext.Provider value={megaMenuItem}>
+      {children}
+    </MegaMenuItemContext.Provider>
+  );
+};
+
+function useMegaMenuItemState(propId?: string) {
+  const megaMenu = useMegaMenuContext();
+
+  const [itemId, overrideItemId] = useState(megaMenu.actions.generateItemId);
+
+  // Sync the itemId:
+  useLayoutEffect(() => {
+    overrideItemId(propId || megaMenu.actions.generateItemId());
+  }, [propId, megaMenu.actions]);
+
+  const toggle = useEvent(() => {
+    if (megaMenu.openId === itemId) {
+      megaMenu.actions.closeMenu();
+    } else {
+      megaMenu.actions.setOpenId(itemId);
+    }
+  });
+
+  const actions = useMemo(
+    () => ({
+      overrideItemId,
+      toggle,
+    }),
+    [toggle]
+  );
+
+  return {
+    itemId,
+    isOpen: megaMenu.openId === itemId,
+    actions,
+  };
+}
+
+export function useMegaMenuItem() {
+  const megaMenuItem = useContext(MegaMenuItemContext);
+  if (!megaMenuItem) {
+    throw new Error("Missing 'ItemProvider'");
+  }
+  return megaMenuItem;
+}
diff --git a/src/bento/components/bento-mega-menu/1.0/component/Shim.tsx b/src/bento/components/bento-mega-menu/1.0/component/Shim.tsx
new file mode 100644
index 000000000000..b660ed3b967a
--- /dev/null
+++ b/src/bento/components/bento-mega-menu/1.0/component/Shim.tsx
@@ -0,0 +1,95 @@
+import {useEffect} from '#preact';
+import {memo} from '#preact/compat/external';
+import type {
+  EventHandler,
+  FunctionalComponent,
+  HTMLAttributes,
+  RefObject,
+} from '#preact/types';
+
+export type ShimProps = {
+  elementRef: RefObject<HTMLElement>;
+};
+/**
+ * This Shim takes a DOM element,
+ * and manually applies the props to it,
+ * using setAttribute and addEventListener.
+ */
+const Shim: FunctionalComponent<ShimProps> = memo(
+  ({elementRef, ...props}: ShimProps) => {
+    useEffect(() => {
+      const element = elementRef.current;
+      if (!element) {
+        return;
+      }
+
+      setAttributes(element, props);
+      return () => unsetAttributes(element, props);
+    });
+
+    return null;
+  }
+);
+
+export {Shim};
+
+/**
+ * It doesn't make sense for shadowDom to set lightDom classes, so let's skip that
+ */
+const ignoreClasses = true;
+
+function setAttributes(element: HTMLElement, props: HTMLAttributes) {
+  updateAttributes(element, props, false);
+}
+function unsetAttributes(element: HTMLElement, props: HTMLAttributes) {
+  updateAttributes(element, props, true);
+}
+function updateAttributes(
+  element: HTMLElement,
+  props: HTMLAttributes,
+  unset: boolean
+) {
+  Object.keys(props).forEach((prop: keyof typeof props) => {
+    const value = props[prop];
+
+    if (typeof value === 'boolean' || value === null || value === undefined) {
+      if (unset || !value) {
+        element.removeAttribute(prop);
+      } else {
+        element.setAttribute(prop, '');
+      }
+    } else if (prop === 'class' || prop === 'className') {
+      if (!ignoreClasses) {
+        const classes = value.split(' ');
+        if (!unset) {
+          element.classList.add(...classes);
+        } else {
+          element.classList.remove(...classes);
+        }
+      }
+    } else if (typeof value === 'string') {
+      if (!unset) {
+        element.setAttribute(prop, value);
+      } else {
+        element.removeAttribute(prop);
+      }
+    } else if (typeof value === 'function') {
+      const eventName = prop === 'onClick' ? 'click' : null;
+      if (!eventName) {
+        throw new Error(
+          `Only 'click' events are supported; Unsupported event name "${prop}"`
+        );
+      }
+      const handler = value as EventHandler<any>;
+      if (!unset) {
+        element.addEventListener(eventName, handler);
+      } else {
+        element.removeEventListener(eventName, handler);
+      }
+    } else {
+      throw new Error(
+        `Unexpected prop; cannot set "${prop}" to a "${typeof value}"`
+      );
+    }
+  });
+}
diff --git a/src/bento/components/bento-mega-menu/1.0/component/Title.tsx b/src/bento/components/bento-mega-menu/1.0/component/Title.tsx
new file mode 100644
index 000000000000..eb5f8eb038cb
--- /dev/null
+++ b/src/bento/components/bento-mega-menu/1.0/component/Title.tsx
@@ -0,0 +1,57 @@
+import objStr from 'obj-str';
+
+import * as Preact from '#preact';
+import useEvent from '#preact/hooks/useEvent';
+import type {ComponentChildren} from '#preact/types';
+import {propName} from '#preact/utils';
+
+import {useMegaMenuItem} from './Item';
+import {AriaAttributes, AsComponent, AsProps} from './types';
+
+import {useStyles} from '../component.jss';
+
+type TitleProps<TAs extends AsComponent> = AsProps<TAs> & {
+  children?: ComponentChildren;
+  class?: string;
+};
+
+export function Title<TAs extends AsComponent = 'span'>({
+  as: As = 'span',
+  children,
+  [propName('class')]: className,
+  ...props
+}: TitleProps<TAs>) {
+  const classes = useStyles();
+  const {actions, isOpen, itemId} = useMegaMenuItem();
+
+  const ariaAttrs: AriaAttributes = {
+    'aria-controls': itemId,
+    'aria-expanded': isOpen,
+    'aria-haspopup': 'dialog',
+  };
+
+  const handleClick = useEvent((ev: MouseEvent) => {
+    (props as any).onClick?.(ev);
+    if (!ev.defaultPrevented) {
+      actions.toggle();
+    }
+  });
+
+  return (
+    <>
+      <As
+        role="button"
+        {...ariaAttrs}
+        {...props}
+        class={objStr({
+          [className!]: !!className,
+          [classes.title]: true,
+          ['open']: isOpen,
+        })}
+        onClick={handleClick}
+      >
+        {children}
+      </As>
+    </>
+  );
+}
diff --git a/src/bento/components/bento-mega-menu/1.0/component/types.ts b/src/bento/components/bento-mega-menu/1.0/component/types.ts
new file mode 100644
index 000000000000..6318e9ebf506
--- /dev/null
+++ b/src/bento/components/bento-mega-menu/1.0/component/types.ts
@@ -0,0 +1,16 @@
+import {ComponentType, IntrinsicElements} from '#preact/types';
+
+export type AsComponent = ComponentType | keyof IntrinsicElements;
+export type AsProps<TAs extends AsComponent> =
+  TAs extends keyof IntrinsicElements
+    ? {as?: TAs} & IntrinsicElements[TAs]
+    : TAs extends ComponentType<infer TProps>
+      ? {as?: TAs} & TProps
+      : never;
+
+export type AriaAttributes = {
+  'aria-expanded'?: boolean;
+  'aria-controls'?: string;
+  'aria-haspopup'?: 'dialog';
+  'aria-modal'?: boolean;
+};
diff --git a/src/bento/components/bento-mega-menu/1.0/component/useMegaMenu.tsx b/src/bento/components/bento-mega-menu/1.0/component/useMegaMenu.tsx
new file mode 100644
index 000000000000..b27b7d361bde
--- /dev/null
+++ b/src/bento/components/bento-mega-menu/1.0/component/useMegaMenu.tsx
@@ -0,0 +1,44 @@
+import {
+  randomIdGenerator,
+  sequentialIdGenerator,
+} from '#core/data-structures/id-generator';
+
+import {createContext, useContext, useMemo, useState} from '#preact';
+
+const MegaMenuContext = createContext<ReturnType<typeof useMegaMenu> | null>(
+  null
+);
+export {MegaMenuContext};
+
+const generateMenuId = randomIdGenerator(10_000);
+const generateItemId = sequentialIdGenerator();
+
+export function useMegaMenu() {
+  const [openId, setOpenId] = useState<string | null>(null);
+  const [menuId] = useState(generateMenuId);
+  const actions = useMemo(
+    () => ({
+      setOpenId,
+      closeMenu() {
+        setOpenId(null);
+      },
+      generateItemId() {
+        return `bento_mega_menu-${menuId}-item-${generateItemId()}`;
+      },
+    }),
+    [menuId /* (immutable) */]
+  );
+  return {
+    openId,
+    isAnyOpen: openId !== null,
+    actions,
+  };
+}
+
+export function useMegaMenuContext() {
+  const megaMenu = useContext(MegaMenuContext);
+  if (!megaMenu) {
+    throw new Error(`Missing Provider`);
+  }
+  return megaMenu;
+}
diff --git a/src/bento/components/bento-mega-menu/1.0/storybook/Basic.js b/src/bento/components/bento-mega-menu/1.0/storybook/Basic.js
new file mode 100644
index 000000000000..807af919e1a1
--- /dev/null
+++ b/src/bento/components/bento-mega-menu/1.0/storybook/Basic.js
@@ -0,0 +1,408 @@
+import * as Preact from '#preact';
+import '../component.jss';
+
+import {BentoMegaMenu} from '../component/BentoMegaMenu';
+
+export default {
+  title: 'MegaMenu',
+  component: BentoMegaMenu,
+  args: {},
+};
+
+function PageLayout({children: megaMenu}) {
+  const css = String.raw;
+  const loremIpsum = (
+    <p>
+      Lorem ipsum dolor sit amet, consectetur adipisicing elit. Cupiditate
+      doloremque eius enim expedita illo iusto quidem rem voluptas? Animi,
+      assumenda cumque, cupiditate dicta dignissimos eaque earum eveniet
+      excepturi inventore libero maxime modi natus neque officia, officiis quam
+      quia quibusdam quis suscipit unde vero voluptatibus voluptatum? Debitis,
+      eum fugiat id impedit natus saepe tempora tempore. Culpa dicta doloribus
+      inventore numquam optio rerum tempore. Aperiam architecto consectetur
+      cumque est ex explicabo incidunt natus nulla omnis porro quia quisquam
+      quod, repellat repellendus reprehenderit tempore ullam. Debitis et
+      explicabo nemo officia repellendus! Ad atque commodi cupiditate dolor
+      dolore doloribus illo, quis quisquam quo repellat.
+    </p>
+  );
+
+  return (
+    <>
+      <style>{css`
+        body {
+          padding: 0 !important;
+        }
+      `}</style>
+
+      <header>
+        <h1>This is the page header</h1>
+      </header>
+
+      {megaMenu}
+
+      <h1>Page Contents</h1>
+      {loremIpsum}
+      {loremIpsum}
+      {loremIpsum}
+      {loremIpsum}
+      {loremIpsum}
+      {loremIpsum}
+      {loremIpsum}
+      {loremIpsum}
+      {loremIpsum}
+    </>
+  );
+}
+
+export const _default = (args) => {
+  return (
+    <PageLayout>
+      <BentoMegaMenu {...args}>
+        This is the mega menu:
+        <BentoMegaMenu.Item>
+          <BentoMegaMenu.Title>Form</BentoMegaMenu.Title>
+          <BentoMegaMenu.Content>
+            <p>
+              Use the form below to subscribe to our{' '}
+              <a href="#">weekly newsletter.</a>
+            </p>
+            <form method="get" target="_top">
+              <fieldset>
+                <label>
+                  <span>Name:</span>
+                  <input type="text" name="name" required />
+                </label>
+                <br />
+                <label>
+                  <span>Email:</span>
+                  <input type="email" name="email" required />
+                </label>
+                <br />
+                <input type="submit" value="Subscribe" />
+              </fieldset>
+              <div>Subscription successful!</div>
+              <div>Subscription failed!</div>
+            </form>
+          </BentoMegaMenu.Content>
+        </BentoMegaMenu.Item>
+        <BentoMegaMenu.Item>
+          <BentoMegaMenu.Title>Images</BentoMegaMenu.Title>
+          <BentoMegaMenu.Content>
+            <div>
+              <img
+                src="https://picsum.photos/id/469/367/267"
+                width="400"
+                height="250"
+                alt="a sample image"
+              />
+              <img
+                src="https://picsum.photos/id/491/367/267"
+                width="400"
+                height="250"
+                alt="another sample image"
+              />
+              <img
+                src="https://picsum.photos/id/452/367/267"
+                width="400"
+                height="250"
+                alt="and another sample image"
+              />
+            </div>
+          </BentoMegaMenu.Content>
+        </BentoMegaMenu.Item>
+        <BentoMegaMenu.Item>
+          <BentoMegaMenu.Title>Video</BentoMegaMenu.Title>
+          <BentoMegaMenu.Content>
+            <video
+              width="400"
+              height="250"
+              src="https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4"
+              poster="https://peach.blender.org/wp-content/uploads/bbb-splash.png"
+              controls
+            >
+              <div fallback>
+                <p>Your browser doesn't support HTML5 video.</p>
+              </div>
+            </video>
+          </BentoMegaMenu.Content>
+        </BentoMegaMenu.Item>
+        <a href="#">Regular link</a>
+      </BentoMegaMenu>
+    </PageLayout>
+  );
+};
+
+export const Simple = (args) => {
+  return (
+    <PageLayout>
+      <BentoMegaMenu {...args}>
+        <BentoMegaMenu.Item>
+          <BentoMegaMenu.Title>Menu Item 1</BentoMegaMenu.Title>
+          <BentoMegaMenu.Content>
+            These are the menu contents
+          </BentoMegaMenu.Content>
+        </BentoMegaMenu.Item>
+        <BentoMegaMenu.Item>
+          <BentoMegaMenu.Title>Menu Item 2</BentoMegaMenu.Title>
+          <BentoMegaMenu.Content>
+            Alias aspernatur beatae deserunt error esse eveniet excepturi quia
+            suscipit totam vero.
+          </BentoMegaMenu.Content>
+        </BentoMegaMenu.Item>
+        <BentoMegaMenu.Item>
+          <BentoMegaMenu.Title>Menu Item 3</BentoMegaMenu.Title>
+          <BentoMegaMenu.Content>
+            <p>
+              Hic impedit iste iure maiores minus necessitatibus nihil non
+              numquam obcaecati pariatur perferendis quisquam quos recusandae
+              saepe similique tempora ullam velit voluptatibus.
+            </p>
+            <p>
+              Hic impedit iste iure maiores minus necessitatibus nihil non
+              numquam obcaecati pariatur perferendis quisquam quos recusandae
+              saepe similique tempora ullam velit voluptatibus.
+            </p>
+            <p>
+              Hic impedit iste iure maiores minus necessitatibus nihil non
+              numquam obcaecati pariatur perferendis quisquam quos recusandae
+              saepe similique tempora ullam velit voluptatibus.
+            </p>
+            <p>
+              Hic impedit iste iure maiores minus necessitatibus nihil non
+              numquam obcaecati pariatur perferendis quisquam quos recusandae
+              saepe similique tempora ullam velit voluptatibus.
+            </p>
+          </BentoMegaMenu.Content>
+        </BentoMegaMenu.Item>
+      </BentoMegaMenu>
+    </PageLayout>
+  );
+};
+
+const css = String.raw;
+
+export const Detailed = (args) => {
+  return (
+    <>
+      <style>
+        {css`
+          .menu-title {
+            margin-right: 2em;
+          }
+          .menu-content {
+            display: flex;
+          }
+        `}
+      </style>
+      <PageLayout>
+        <BentoMegaMenu {...args}>
+          <BentoMegaMenu.Item>
+            <BentoMegaMenu.Title class="menu-title">
+              Clothing, Shoes, Jewelry &amp; Watches
+            </BentoMegaMenu.Title>
+            <BentoMegaMenu.Content class="menu-content">
+              <img
+                alt="Clothing, Shoes, Jewelry &amp; Watches"
+                src="https://picsum.photos/id/535/367/267"
+                height="250"
+                width="300"
+              />
+              <div>
+                <h4>Clothing, Shoes, Jewelry &amp; Watches</h4>
+                <ul>
+                  <li>
+                    <a href="#">Women</a>
+                  </li>
+                  <li>
+                    <a href="#">Men</a>
+                  </li>
+                  <li>
+                    <a href="#">Girls</a>
+                  </li>
+                  <li>
+                    <a href="#">Boys</a>
+                  </li>
+                  <li>
+                    <a href="#">Baby</a>
+                  </li>
+                  <li>
+                    <a href="#">Luggage</a>
+                  </li>
+                  <li>
+                    <a href="#">Accessories</a>
+                  </li>
+                </ul>
+              </div>
+              <div>
+                <h4>More to Explore</h4>
+                <ul>
+                  <li>
+                    <a href="#">Our Brands</a>
+                  </li>
+                </ul>
+              </div>
+            </BentoMegaMenu.Content>
+          </BentoMegaMenu.Item>
+          <BentoMegaMenu.Item>
+            <BentoMegaMenu.Title class="menu-title">
+              Movies, Music &amp; Games
+            </BentoMegaMenu.Title>
+            <BentoMegaMenu.Content class="menu-content">
+              <img
+                alt="Movies, Music &amp; Games"
+                src="https://picsum.photos/id/452/367/267"
+                height="250"
+                width="300"
+              />
+              <div>
+                <h4>Movies, Music &amp; Games</h4>
+                <ul>
+                  <li>
+                    <a href="#">Movies &amp; TV</a>
+                  </li>
+                  <li>
+                    <a href="#">Blue-ray</a>
+                  </li>
+                  <li>
+                    <a href="#">CDs &amp; Vinyl</a>
+                  </li>
+                  <li>
+                    <a href="#">Digital Music</a>
+                  </li>
+                  <li>
+                    <a href="#">Video Games</a>
+                  </li>
+                  <li>
+                    <a href="#">Headphones</a>
+                  </li>
+                  <li>
+                    <a href="#">Musical Instruments</a>
+                  </li>
+                  <li>
+                    <a href="#">Entertainment Collectibles</a>
+                  </li>
+                </ul>
+              </div>
+            </BentoMegaMenu.Content>
+          </BentoMegaMenu.Item>
+          <BentoMegaMenu.Item>
+            <BentoMegaMenu.Title class="menu-title">
+              Sports &amp; Outdoors
+            </BentoMegaMenu.Title>
+            <BentoMegaMenu.Content class="menu-content">
+              <img
+                alt="Sports &amp; Outdoors"
+                src="https://picsum.photos/id/469/367/267"
+                height="250"
+                width="300"
+              />
+              <div>
+                <h4>Sports</h4>
+                <ul>
+                  <li>
+                    <a href="#">Athletic Clothing</a>
+                  </li>
+                  <li>
+                    <a href="#">Exercise &amp; Fitness</a>
+                  </li>
+                  <li>
+                    <a href="#">Hunting &amp; Fishing</a>
+                  </li>
+                  <li>
+                    <a href="#">Team Sports</a>
+                  </li>
+                  <li>
+                    <a href="#">Sports Collectibles</a>
+                  </li>
+                </ul>
+              </div>
+              <div>
+                <h4>Outdoors</h4>
+                <ul>
+                  <li>
+                    <a href="#">Camping &amp; Hiking</a>
+                  </li>
+                  <li>
+                    <a href="#">Cycling</a>
+                  </li>
+                  <li>
+                    <a href="#">Outdoor Clothing</a>
+                  </li>
+                  <li>
+                    <a href="#">Climbing</a>
+                  </li>
+                  <li>
+                    <a href="#">Accessories</a>
+                  </li>
+                </ul>
+              </div>
+            </BentoMegaMenu.Content>
+          </BentoMegaMenu.Item>
+          <BentoMegaMenu.Item>
+            <BentoMegaMenu.Title class="menu-title">
+              Home, Garden &amp; Tools
+            </BentoMegaMenu.Title>
+            <BentoMegaMenu.Content class="menu-content">
+              <img
+                alt="Home, Garden &amp; Tools"
+                src="https://picsum.photos/id/491/367/267"
+                height="250"
+                width="300"
+              />
+              <div>
+                <h4>Home, Garden &amp; Pets</h4>
+                <ul>
+                  <li>
+                    <a href="#">Furniture</a>
+                  </li>
+                  <li>
+                    <a href="#">Kitchen &amp; Dining</a>
+                  </li>
+                  <li>
+                    <a href="#">Bed &amp; Bath</a>
+                  </li>
+                  <li>
+                    <a href="#">Garden &amp; Outdoor</a>
+                  </li>
+                  <li>
+                    <a href="#">Mattresses</a>
+                  </li>
+                  <li>
+                    <a href="#">Lighting</a>
+                  </li>
+                  <li>
+                    <a href="#">Appliances</a>
+                  </li>
+                  <li>
+                    <a href="#">Pet Supplies</a>
+                  </li>
+                </ul>
+              </div>
+              <div>
+                <h4>Tools, Home Improvement</h4>
+                <ul>
+                  <li>
+                    <a href="#">Home Improvment</a>
+                  </li>
+                  <li>
+                    <a href="#">Power &amp; Hand Tools</a>
+                  </li>
+                  <li>
+                    <a href="#">Cookware</a>
+                  </li>
+                  <li>
+                    <a href="#">Hardware</a>
+                  </li>
+                  <li>
+                    <a href="#">Smart Home</a>
+                  </li>
+                </ul>
+              </div>
+            </BentoMegaMenu.Content>
+          </BentoMegaMenu.Item>
+        </BentoMegaMenu>
+      </PageLayout>
+    </>
+  );
+};
diff --git a/src/bento/components/bento-mega-menu/OWNERS b/src/bento/components/bento-mega-menu/OWNERS
new file mode 100644
index 000000000000..77a55ee52b28
--- /dev/null
+++ b/src/bento/components/bento-mega-menu/OWNERS
@@ -0,0 +1,10 @@
+// For an explanation of the OWNERS rules and syntax, see:
+// https://github.com/ampproject/amp-github-apps/blob/main/owners/OWNERS.example
+
+{
+  rules: [
+    {
+      owners: [{name: 'ampproject/wg-components'}],
+    },
+  ],
+}
diff --git a/src/bento/components/bento-mustache/1.0/bento-mustache.js b/src/bento/components/bento-mustache/1.0/bento-mustache.js
new file mode 100644
index 000000000000..7944b63a02b5
--- /dev/null
+++ b/src/bento/components/bento-mustache/1.0/bento-mustache.js
@@ -0,0 +1,5 @@
+// Bento components must import `bento-mustache.js` instead of `mustache` directly.
+// This is so that the bundler links it to the external `bento-mustache.js` binary.
+import mustache from '#bento/third_party/mustache/mustache';
+
+export default mustache;
diff --git a/src/bento/components/bento-reddit/1.0/README.md b/src/bento/components/bento-reddit/1.0/README.md
new file mode 100644
index 000000000000..3a74886d78d4
--- /dev/null
+++ b/src/bento/components/bento-reddit/1.0/README.md
@@ -0,0 +1,212 @@
+# Bento Reddit
+
+Embeds a [Reddit](https://reddit.com) post or a comment on a Reddit post.
+
+## Web Component
+
+You must include each Bento component's required CSS library before adding custom styles in order to guarantee proper loading. Or use the lightweight pre-uprgrade styles available inline. See [Layout and Style](#layout-and-style).
+
+### Import via npm
+
+```sh
+npm install @bentoproject/reddit
+```
+
+```javascript
+import {defineElement as defineBentoReddit} from '@bentoproject/reddit';
+defineBentoReddit();
+```
+
+### Include via `<script>`
+
+```html
+<script type="module" src="https://cdn.ampproject.org/bento.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/bento.js" crossorigin="anonymous"></script>
+<script type="module" src="https://cdn.ampproject.org/v0/bento-reddit-1.0.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/v0/bento-reddit-1.0.js" crossorigin="anonymous"></script>
+<link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-reddit-1.0.css" crossorigin="anonymous">
+```
+
+#### Example
+
+##### Embed a Reddit Post
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+    <head>
+      <script type="module" src="https://cdn.ampproject.org/bento.mjs" crossorigin="anonymous"></script>
+      <script nomodule src="https://cdn.ampproject.org/bento.js" crossorigin="anonymous"></script>
+      <script type="module" src="https://cdn.ampproject.org/v0/bento-reddit-1.0.mjs" crossorigin="anonymous"></script>
+      <script nomodule src="https://cdn.ampproject.org/v0/bento-reddit-1.0.js" crossorigin="anonymous"></script>
+      <link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-reddit-1.0.css" crossorigin="anonymous">
+      <style>
+          bento-reddit {
+              width: 300px;
+              height: 400px;
+          }
+      </style>
+    </head>
+    <body>
+      <bento-reddit
+        style="width: 300; height: 400;"
+        data-embed-type="post"
+        data-src="https://www.reddit.com/r/me_irl/comments/52rmir/me_irl/?ref=share&amp;ref_source=embed"
+      >
+      </bento-reddit>
+    </body>
+</html>
+```
+
+##### Embed a Reddit Comment
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+    <head>
+      <script type="module" src="https://cdn.ampproject.org/bento.mjs" crossorigin="anonymous"></script>
+      <script nomodule src="https://cdn.ampproject.org/bento.js" crossorigin="anonymous"></script>
+      <script type="module" src="https://cdn.ampproject.org/v0/bento-reddit-1.0.mjs" crossorigin="anonymous"></script>
+      <script nomodule src="https://cdn.ampproject.org/v0/bento-reddit-1.0.js" crossorigin="anonymous"></script>
+      <link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-reddit-1.0.css" crossorigin="anonymous">
+      <style>
+          bento-reddit {
+              width: 300px;
+              height: 400px;
+          }
+      </style>
+    </head>
+    <body>
+      <bento-reddit
+        style="width: 300; height: 400;"
+        data-embed-type="comment"
+        data-src="https://www.reddit.com/r/sports/comments/54loj1/50_cents_awful_1st_pitch_given_a_historical/d8306kw"
+        data-uuid="b1246282-bd7b-4778-8c5b-5b08ac0e175e"
+        data-embed-created="2016-09-26T21:26:17.823Z"
+        data-embed-parent="true"
+        data-embed-live="true"
+      >
+      </bento-reddit>
+    </body>
+</html>
+```
+
+### Layout and Style
+
+Each Bento component has a small CSS library you must include to guarantee proper loading without [content shifts](https://web.dev/cls/). Because of order-based specificity, you must manually ensure that stylesheets are included before any custom styles.
+
+```html
+<link
+  rel="stylesheet"
+  type="text/css"
+  href="https://cdn.ampproject.org/v0/bento-reddit-1.0.css"
+/>
+```
+
+Alternatively, you may also make the light-weight pre-upgrade styles available inline:
+
+```html
+<style>
+  bento-reddit{
+    display: block;
+    overflow: hidden;
+    position: relative;
+  }
+</style>
+```
+
+### Attributes
+
+#### `data-embedtype`
+
+The type of the embed, either `post` or `comment`.
+
+#### `data-src`
+
+The permalink uri for the post or comment.
+
+#### `data-uuid`(optional)
+
+The provided UUID for the comment embed.
+Supported when `data-embedtype` is `comment`.
+
+#### `data-embedcreated` (optional)
+
+The datetime string for the comment embed.
+Supported when `data-embedtype` is `comment`.
+
+#### `data-embedparent` (optional)
+
+Indicates whether the parent comment for the embedded comment should be displayed.
+Supported when `data-embedtype` is `comment`.
+
+#### `data-embedlive` (optional)
+
+Indicates whether the embedded comment should update if the original comment is updated.
+Supported when `data-embedtype` is `comment`.
+
+#### title (optional)
+
+Define a `title` attribute for the component. The default is `Reddit`.
+
+## Preact/React Component
+
+### Import via npm
+
+```sh
+npm install @bentoproject/reddit
+```
+
+```javascript
+import React from 'react';
+import {BentoReddit} from '@bentoproject/reddit/react';
+import '@bentoproject/reddit/styles.css';
+
+function App() {
+  return (
+      <BentoReddit
+        style={{width: 300, height: 200, border: '8px solid red'}}
+        embedType="post"
+        src="https://www.reddit.com/r/me_irl/comments/52rmir/me_irl/?ref=share&amp;ref_source=embed"
+      ></BentoReddit>
+  );
+}
+```
+
+### Props
+
+#### `embedType`
+
+The type of the embed, either `post` or `comment`.
+
+#### `src`
+
+The permalink uri for the post or comment.
+
+#### `uuid`(optional)
+
+The provided UUID for the comment embed.
+Supported when `data-embedtype` is `comment`.
+
+#### `embedCreated` (optional)
+
+The datetime string for the comment embed.
+Supported when `data-embedtype` is `comment`.
+
+#### `embedParent` (optional)
+
+Indicates whether the parent comment for the embedded comment should be displayed.
+Supported when `data-embedtype` is `comment`.
+
+#### `embedLive` (optional)
+
+Indicates whether the embedded comment should update if the original comment is updated.
+Supported when `data-embedtype` is `comment`.
+
+#### title (optional)
+
+Define a `title` attribute for the component. The default is `"Reddit"`.
diff --git a/src/bento/components/bento-reddit/1.0/base-element.js b/src/bento/components/bento-reddit/1.0/base-element.js
new file mode 100644
index 000000000000..e6a7fd54be75
--- /dev/null
+++ b/src/bento/components/bento-reddit/1.0/base-element.js
@@ -0,0 +1,25 @@
+import {BentoReddit} from '#bento/components/bento-reddit/1.0/component';
+
+import {PreactBaseElement} from '#preact/base-element';
+
+export class BaseElement extends PreactBaseElement {}
+
+/** @override */
+BaseElement['Component'] = BentoReddit;
+
+/** @override */
+BaseElement['props'] = {
+  'src': {attr: 'data-src'},
+  'embedType': {attr: 'data-embedtype'},
+  'uuid': {attr: 'data-uuid'},
+  'embedCreated': {attr: 'data-embedcreated'},
+  'embedParent': {attr: 'data-embedparent'},
+  'embedLive': {attr: 'data-embedlive'},
+  'title': {attr: 'title'},
+};
+
+/** @override */
+BaseElement['layoutSizeDefined'] = true;
+
+/** @override */
+BaseElement['usesShadowDom'] = true;
diff --git a/src/bento/components/bento-reddit/1.0/bento-reddit.css b/src/bento/components/bento-reddit/1.0/bento-reddit.css
new file mode 100644
index 000000000000..c1abcc9ff7eb
--- /dev/null
+++ b/src/bento/components/bento-reddit/1.0/bento-reddit.css
@@ -0,0 +1,22 @@
+/*
+ * Pre-upgrade:
+ * - display:block element
+ * - size-defined element
+ */
+ bento-reddit{
+  display: block;
+  overflow: hidden;
+  position: relative;
+}
+
+/* Pre-upgrade: size-defining element - hide text. */
+bento-reddit:not(.i-amphtml-built) {
+  color: transparent !important;
+}
+
+/* Pre-upgrade: size-defining element - hide children. */
+bento-reddit:not(.i-amphtml-built)
+  > :not([placeholder]):not([slot='i-amphtml-svc']) {
+  display: none;
+  content-visibility: hidden;
+}
diff --git a/src/bento/components/bento-reddit/1.0/component.js b/src/bento/components/bento-reddit/1.0/component.js
new file mode 100644
index 000000000000..74efde5a6162
--- /dev/null
+++ b/src/bento/components/bento-reddit/1.0/component.js
@@ -0,0 +1,89 @@
+import {MessageType_Enum, deserializeMessage} from '#core/3p-frame-messaging';
+
+import * as Preact from '#preact';
+import {useCallback, useMemo, useState} from '#preact';
+import {forwardRef} from '#preact/compat';
+import {ProxyIframeEmbed} from '#preact/component/3p-frame';
+
+/** @const {string} */
+const TYPE = 'reddit';
+const FULL_HEIGHT = '100%';
+const MATCHES_MESSAGING_ORIGIN = () => true;
+
+/**
+ * @param {!BentoRedditDef.Props} props
+ * @param {{current: (!BentoRedditDef.Api|null)}} ref
+ * @return {PreactDef.Renderable}
+ */
+export function RedditWithRef(
+  {
+    embedCreated,
+    embedLive,
+    embedParent,
+    embedType,
+    requestResize,
+    src,
+    style,
+    title = 'Reddit',
+    uuid,
+    ...rest
+  },
+  ref
+) {
+  const [height, setHeight] = useState(FULL_HEIGHT);
+  const messageHandler = useCallback(
+    (event) => {
+      const data = deserializeMessage(event.data);
+      if (data['type'] == MessageType_Enum.EMBED_SIZE) {
+        const height = data['height'];
+        if (requestResize) {
+          requestResize(height);
+          setHeight(FULL_HEIGHT);
+        } else {
+          setHeight(height);
+        }
+      }
+    },
+    [requestResize]
+  );
+
+  const options = useMemo(
+    () => ({
+      embedCreated,
+      embedLive,
+      embedParent,
+      embedType,
+      requestResize,
+      src,
+      title,
+      uuid,
+    }),
+    [
+      embedCreated,
+      embedLive,
+      embedParent,
+      embedType,
+      requestResize,
+      src,
+      title,
+      uuid,
+    ]
+  );
+
+  return (
+    <ProxyIframeEmbed
+      ref={ref}
+      title={title}
+      {...rest}
+      // non-overridable props
+      options={options}
+      type={TYPE}
+      matchesMessagingOrigin={MATCHES_MESSAGING_ORIGIN}
+      messageHandler={messageHandler}
+      style={height ? {...style, height} : style}
+    />
+  );
+}
+const BentoReddit = forwardRef(RedditWithRef);
+BentoReddit.displayName = 'BentoReddit';
+export {BentoReddit};
diff --git a/src/bento/components/bento-reddit/1.0/component.type.js b/src/bento/components/bento-reddit/1.0/component.type.js
new file mode 100644
index 000000000000..4076cb69c0ad
--- /dev/null
+++ b/src/bento/components/bento-reddit/1.0/component.type.js
@@ -0,0 +1,15 @@
+/** @externs */
+
+/** @const */
+var BentoRedditDef = {};
+
+/**
+ * @typedef {{
+ *   embedCreated: (string|undefined),
+ *   embedLive: (string|undefined),
+ *   embedParent: (string|undefined),
+ *   uuid: (string|undefined),
+ *   title: (string|undefined)
+ * }}
+ */
+BentoRedditDef.Props;
diff --git a/src/bento/components/bento-reddit/1.0/example/index.html b/src/bento/components/bento-reddit/1.0/example/index.html
new file mode 100644
index 000000000000..51e01fe34665
--- /dev/null
+++ b/src/bento/components/bento-reddit/1.0/example/index.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+    <headcarousel>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width" />
+    <title>bento-reddit</title>
+      <script type="module" src="https://cdn.ampproject.org/bento.mjs" crossorigin="anonymous"></script>
+      <script nomodule src="https://cdn.ampproject.org/bento.js" crossorigin="anonymous"></script>
+      <script type="module" src="https://cdn.ampproject.org/v0/bento-reddit-1.0.mjs" crossorigin="anonymous"></script>
+      <script nomodule src="https://cdn.ampproject.org/v0/bento-reddit-1.0.js" crossorigin="anonymous"></script>
+      <link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-reddit-1.0.css" crossorigin="anonymous">
+      <style>
+          bento-reddit {
+              width: 300px;
+              height: 400px;
+          }
+      </style>
+    </head>
+    <body>
+        <bento-reddit
+          style="width: 300; height: 400;"
+          data-embed-type="post"
+          data-src="https://www.reddit.com/r/me_irl/comments/52rmir/me_irl/?ref=share&amp;ref_source=embed"
+        >
+        </bento-reddit>
+        <bento-reddit
+          style="width: 300; height: 400;"
+          data-embed-type="comment"
+          data-src="https://www.reddit.com/r/sports/comments/54loj1/50_cents_awful_1st_pitch_given_a_historical/d8306kw"
+          data-uuid="b1246282-bd7b-4778-8c5b-5b08ac0e175e"
+          data-embed-created="2016-09-26T21:26:17.823Z"
+          data-embed-parent="true"
+          data-embed-live="true"
+        >
+        </bento-reddit>
+    </body>
+</html>
diff --git a/src/bento/components/bento-reddit/1.0/storybook/Basic.js b/src/bento/components/bento-reddit/1.0/storybook/Basic.js
new file mode 100644
index 000000000000..655b4773f5b8
--- /dev/null
+++ b/src/bento/components/bento-reddit/1.0/storybook/Basic.js
@@ -0,0 +1,36 @@
+import {BentoReddit} from '#bento/components/bento-reddit/1.0/component';
+
+import * as Preact from '#preact';
+
+export default {
+  title: 'Reddit',
+  component: BentoReddit,
+};
+
+export const _default = () => {
+  return (
+    <div>
+      <BentoReddit
+        style={{width: 300, height: 200}}
+        embedType="post"
+        src="https://www.reddit.com/r/me_irl/comments/52rmir/me_irl/?ref=share&amp;ref_source=embed"
+      ></BentoReddit>
+    </div>
+  );
+};
+
+export const comments = () => {
+  return (
+    <div>
+      <BentoReddit
+        style={{width: 300, height: 400}}
+        embedType="comment"
+        src="https://www.reddit.com/r/sports/comments/54loj1/50_cents_awful_1st_pitch_given_a_historical/d8306kw"
+        uuid="b1246282-bd7b-4778-8c5b-5b08ac0e175e"
+        embedCreated="2016-09-26T21:26:17.823Z"
+        embedParent="true"
+        embedLive="true"
+      ></BentoReddit>
+    </div>
+  );
+};
diff --git a/src/bento/components/bento-reddit/OWNERS b/src/bento/components/bento-reddit/OWNERS
new file mode 100644
index 000000000000..77a55ee52b28
--- /dev/null
+++ b/src/bento/components/bento-reddit/OWNERS
@@ -0,0 +1,10 @@
+// For an explanation of the OWNERS rules and syntax, see:
+// https://github.com/ampproject/amp-github-apps/blob/main/owners/OWNERS.example
+
+{
+  rules: [
+    {
+      owners: [{name: 'ampproject/wg-components'}],
+    },
+  ],
+}
diff --git a/src/bento/components/bento-social-share/1.0/README.md b/src/bento/components/bento-social-share/1.0/README.md
new file mode 100644
index 000000000000..8b14aa3875d9
--- /dev/null
+++ b/src/bento/components/bento-social-share/1.0/README.md
@@ -0,0 +1,653 @@
+# Bento Social Share
+
+Displays a sharing button for social platforms or system share.
+
+Currently, none of the buttons generated by Bento Social Share (including those for the pre-configured providers) have a label or accessible name that is exposed to assistive technologies (such as screen readers). Make sure to include an `aria-label` with a descriptive label, as otherwise these controls will just be announced as unlabelled "button" elements.
+
+## Web Component
+
+You must include each Bento component's required CSS library to guarantee proper loading and before adding custom styles. Or use the light-weight pre-upgrade styles available inline. See [Layout and style](#layout-and-style).
+
+### Import via npm
+
+```sh
+npm install @bentoproject/social-share
+```
+
+```javascript
+import {defineElement as defineBentoSocialShare} from '@bentoproject/social-share';
+defineBentoSocialShare();
+```
+
+### Include via `<script>`
+
+```html
+<script type="module" src="https://cdn.ampproject.org/bento.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/bento.js" crossorigin="anonymous"></script>
+<script type="module" src="https://cdn.ampproject.org/v0/bento-social-share-1.0.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/v0/bento-social-share-1.0.js" crossorigin="anonymous"></script>
+<link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-social-share-1.0.css" crossorigin="anonymous">
+```
+
+### Example
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-social-share-1.0.css"
+    />
+    <script
+      async
+      src="https://cdn.ampproject.org/v0/bento-social-share-1.0.js"
+    ></script>
+    <style>
+      bento-social-share {
+        width: 375px;
+        height: 472px;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-social-share
+      id="my-share"
+      type="twitter"
+      aria-label="Share on Twitter"
+    ></bento-social-share>
+
+    <div class="buttons" style="margin-top: 8px">
+      <button id="change-share">Change share button</button>
+    </div>
+
+    <script>
+      (async () => {
+        const socialShare = document.querySelector('#my-share');
+        await customElements.whenDefined('bento-social-share');
+
+        // set up button actions
+        document.querySelector('#change-share').onclick = () => {
+          socialShare.setAttribute('type', 'linkedin');
+          socialShare.setAttribute('aria-label', 'Share on LinkedIn');
+        };
+      })();
+    </script>
+  </body>
+</html>
+```
+
+### Layout and style
+
+Each Bento component has a small CSS library you must include to guarantee proper loading without [content shifts](https://web.dev/cls/). Because of order-based specificity, you must manually ensure that stylesheets are included before any custom styles.
+
+```html
+<link
+  rel="stylesheet"
+  type="text/css"
+  href="https://cdn.ampproject.org/v0/bento-social-share-1.0.css"
+/>
+```
+
+Alternatively, you may also make the light-weight pre-upgrade styles available inline:
+
+```html
+<style>
+  bento-social-share {
+    display: inline-block;
+    overflow: hidden;
+    position: relative;
+    box-sizing: border-box;
+    width: 60px;
+    height: 44px;
+  }
+</style>
+```
+
+#### Container type
+
+The `bento-social-share` component has a defined layout size type. To ensure the component renders correctly, be sure to apply a size to the component and its immediate children (slides) via a desired CSS layout (such as one defined with `height`, `width`, `aspect-ratio`, or other such properties):
+
+```css
+bento-social-share {
+  height: 100px;
+  width: 100px;
+}
+```
+
+#### Default Styles
+
+By default, `bento-social-share` includes some popular pre-configured providers. Buttons for these providers are styled with the provider's official color and logo. The default width is 60px, and the default height is 44px.
+
+#### Custom Styles
+
+Sometimes you want to provide your own style. You can simply override the provided styles like the following:
+
+```css
+bento-social-share[type='twitter'] {
+  color: blue;
+  background: red;
+}
+```
+
+When customizing the style of an `bento-social-share` icon please ensure that the customized icon meets the branding guidelines set out by the provider (e.g Twitter, Facebook, etc.)
+
+### Accessibility
+
+#### Indication of focus
+
+The `bento-social-share` element defaults to a blue outline as a visible focus indicator. It also defaults `tabindex=0` making it easy for a user to follow along as they tab through multiple `bento-social-share` elements used together on a page.
+
+The default focus indicator is achieved with the following CSS rule-set.
+
+```css
+bento-social-share:focus {
+  outline: #0389ff solid 2px;
+  outline-offset: 2px;
+}
+```
+
+The default focus indicator can be overwritten by defining CSS styles for focus and including them within a `style` tag. In the example below, the first CSS rule-set removes the focus indicator on all `bento-social-share` elements by setting the `outline` property to `none`. The second rule-set specifies a red outline (instead of the default blue) and also sets the `outline-offset` to be `3px` for all `bento-social-share` elements with the class `custom-focus`.
+
+```css
+bento-social-share:focus {
+  outline: none;
+}
+
+bento-social-share.custom-focus:focus {
+  outline: red solid 2px;
+  outline-offset: 3px;
+}
+```
+
+With these CSS rules, `bento-social-share` elements would not show the visible focus indicator unless they included the class `custom-focus` in which case they would have the red outlined indicator.
+
+#### Color contrast
+
+Note that `bento-social-share` with a `type` value of `twitter`, `whatsapp`, or `line` will display a button with a foreground/background color combination that falls below the 3:1 threshold recommended for non-text content defined in [WCAG 2.1 SC 1.4.11 Non-text Contrast](https://www.w3.org/WAI/WCAG21/Understanding/non-text-contrast.html).
+
+Without sufficient contrast, content can be difficult to perceive and therefore difficult to identify. In extreme cases, content with low contrast may not be visible at all to people with colour perception impairments. In the case of the above share buttons, users may not be able to appropriately perceive/understand what the share controls are, what service they relate to.
+
+### Pre-configured providers
+
+The `bento-social-share` component provides [some pre-configured providers](./social-share-config.js) that know their sharing endpoints as well as some default parameters.
+
+<table>
+  <tr>
+    <th class="col-twenty">Provider</th>
+    <th class="col-twenty">Type</th>
+    <th>Parameters</th>
+  </tr>
+  <tr>
+    <td><a href="https://developers.google.com/web/updates/2016/10/navigator-share">Web Share API</a> (triggers OS share dialog)</td>
+    <td><code>system</code></td>
+    <td>
+      <ul>
+        <li><code>data-param-text</code>: optional</li>
+      </ul>
+    </td>
+  </tr>
+  <tr>
+    <td>Email</td>
+    <td><code>email</code></td>
+    <td>
+      <ul>
+        <li><code>data-param-subject</code>: optional</li>
+        <li><code>data-param-body</code>: optional</li>
+        <li><code>data-param-recipient</code>: optional</li>
+      </ul>
+    </td>
+  </tr>
+  <tr>
+    <td>Facebook</td>
+    <td><code>facebook</code></td>
+    <td>
+      <ul>
+       <li><code>data-param-app_id</code>: <strong>required</strong>, defaults to: none. This parameter is the Facebook <code>app_id</code> that's required for the <a href="https://developers.facebook.com/docs/sharing/reference/share-dialog">Facebook Share dialog</a>.</li>
+        <li><code>data-param-href</code>: optional</li>
+        <li><code>data-param-quote</code>: optional, can be used to share a quote or text.</li>
+        </ul>
+    </td>
+  </tr>
+  <tr>
+    <td>LinkedIn</td>
+    <td><code>linkedin</code></td>
+    <td>
+      <ul>
+        <li><code>data-param-url</code>: optional</li>
+      </ul>
+    </td>
+  </tr>
+  </tr>
+  <tr>
+    <td>Pinterest</td>
+    <td><code>pinterest</code></td>
+    <td>
+      <ul>
+        <li><code>data-param-media</code>: optional (but highly recommended to be set). Url for the media to be shared on Pinterest. If not set, the end user will be requested to upload a media by Pinterest.</li>
+        <li><code>data-param-url</code>: optional</li>
+        <li><code>data-param-description</code>: optional</li>
+      </ul>
+    </td>
+  </tr>
+  </tr>
+  <tr>
+    <td>Tumblr</td>
+    <td><code>tumblr</code></td>
+    <td>
+      <ul>
+        <li><code>data-param-url</code>: optional</li>
+        <li><code>data-param-text</code>: optional</li>
+      </ul>
+    </td>
+  </tr>
+  <tr>
+    <td>Twitter</td>
+    <td><code>twitter</code></td>
+    <td>
+      <ul>
+        <li><code>data-param-url</code>: optional</li>
+        <li><code>data-param-text</code>: optional</li>
+      </ul>
+    </td>
+  </tr>
+  <tr>
+    <td>Whatsapp</td>
+    <td><code>whatsapp</code></td>
+    <td>
+      <ul>
+        <li><code>data-param-text</code>: optional</li>
+      </ul>
+    </td>
+  </tr>
+  <tr>
+    <td>LINE</td>
+    <td><code>line</code></td>
+    <td>
+      <ul>
+        <li><code>data-param-url</code>: optional</li>
+        <li><code>data-param-text</code>: optional</li>
+      </ul>
+    </td>
+  </tr>
+  <tr>
+    <td>SMS</td>
+    <td><code>sms</code></td>
+    <td>
+      <ul>
+        <li><code>data-param-body</code>: optional</li></ul>
+    </td>
+  </tr>
+</table>
+
+### Non-configured providers
+
+In addition to pre-configured providers, you can use non-configured providers by specifying additional attributes in the `bento-social-share` component.
+
+#### Example: Creating a share button for a non-configured provider
+
+The following example creates a share button through Facebook Messenger by setting the `data-share-endpoint` attribute to the correct endpoint for the Facebook Messenger custom protocol.
+
+```html
+<bento-social-share
+  type="facebookmessenger"
+  data-share-endpoint="fb-messenger://share"
+  data-param-text="Check out this article: TITLE - CANONICAL_URL"
+  aria-label="Share on Facebook Messenger"
+>
+</bento-social-share>
+```
+
+As these providers are not pre-configured, you'll need to create the appropriate button image and styles for the provider.
+
+### Attributes
+
+#### type (required)
+
+Selects a provider type. This is required for both pre-configured and non-configured providers.
+
+#### data-target
+
+Specifies the target in which to open the target. The default is `_blank` for all cases other than email/SMS on iOS, in which case the target is set to `_top`.
+
+#### data-share-endpoint
+
+This attribute is required for non-configured providers.
+
+Some popular providers have pre-configured share endpoints. For details, see the Pre-configured Providers section. For non-configured providers, you'll need to specify the share endpoint.
+
+#### data-param-\*
+
+All `data-param-*` prefixed attributes are turned into URL parameters and passed to the share endpoint.
+
+#### aria-label
+
+The description of the button for accessibility. A recommended label is "Share on \<type>".
+
+#### API Example
+
+Programmatically changing any of the attribute values will automatically update the element. For example, by changing the `type` attribute, you can switch between different share providers.
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-social-share-1.0.css"
+    />
+    <script
+      async
+      src="https://cdn.ampproject.org/v0/bento-social-share-1.0.js"
+    ></script>
+    <style>
+      bento-social-share {
+        width: 375px;
+        height: 472px;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-social-share
+      id="my-share"
+      type="twitter"
+      aria-label="Share on Twitter"
+    ></bento-social-share>
+
+    <div class="buttons" style="margin-top: 8px">
+      <button id="change-share">Change share button</button>
+    </div>
+
+    <script>
+      (async () => {
+        const socialShare = document.querySelector('#my-share');
+        await customElements.whenDefined('bento-social-share');
+
+        // set up button actions
+        document.querySelector('#change-share').onclick = () => {
+          socialShare.setAttribute('type', 'linkedin');
+          socialShare.setAttribute('aria-label', 'Share on LinkedIn');
+        };
+      })();
+    </script>
+  </body>
+</html>
+```
+
+---
+
+## Preact/React Component
+
+### Import via npm
+
+```sh
+npm install @bentoproject/social-share
+```
+
+```javascript
+import React from 'react';
+import {BentoSocialShare} from '@bentoproject/social-share/react';
+import '@bentoproject/social-share/styles.css';
+
+function App() {
+  return (
+    <BentoSocialShare
+      type="twitter"
+      aria-label="Share on Twitter"
+    ></BentoSocialShare>
+  );
+}
+```
+
+### Layout and style
+
+#### Container type
+
+The `BentoSocialShare` component has a defined layout size type. To ensure the component renders correctly, be sure to apply a size to the component and its immediate children (slides) via a desired CSS layout (such as one defined with `height`, `width`, `aspect-ratio`, or other such properties). These can be applied inline:
+
+```jsx
+<BentoSocialShare
+  style={{width: 50, height: 50}}
+  type="twitter"
+  aria-label="Share on Twitter"
+></BentoSocialShare>
+```
+
+Or via `className`:
+
+```jsx
+<BentoSocialShare
+  className="custom-styles"
+  type="twitter"
+  aria-label="Share on Twitter"
+></BentoSocialShare>
+```
+
+```css
+.custom-styles {
+  height: 50px;
+  width: 50px;
+}
+```
+
+### Accessibility
+
+#### Indication of focus
+
+The `BentoSocialShare` element defaults to a blue outline as a visible focus indicator. It also defaults `tabindex=0` making it easy for a user to follow along as he or she tabs through multiple `BentoSocialShare` elements used together on a page.
+
+The default focus indicator is achieved with the following CSS rule-set.
+
+```css
+BentoSocialShare:focus {
+  outline: #0389ff solid 2px;
+  outline-offset: 2px;
+}
+```
+
+The default focus indicator can be overwritten by defining CSS styles for focus and including them within a `style` tag on an AMP HTML page. In the example below, the first CSS rule-set removes the focus indicator on all `BentoSocialShare` elements by setting the `outline` property to `none`. The second rule-set specifies a red outline (instead of the default blue) and also sets the `outline-offset` to be `3px` for all `BentoSocialShare` elements with the class `custom-focus`.
+
+```css
+BentoSocialShare:focus {
+  outline: none;
+}
+
+BentoSocialShare.custom-focus:focus {
+  outline: red solid 2px;
+  outline-offset: 3px;
+}
+```
+
+With these CSS rules, `BentoSocialShare` elements would not show the visible focus indicator unless they included the class `custom-focus` in which case they would have the red outlined indicator.
+
+#### Color contrast
+
+Note that `BentoSocialShare` with a `type` value of `twitter`, `whatsapp`, or `line` will display a button with a foreground/background color combination that falls below the 3:1 threshold recommended for non-text content defined in [WCAG 2.1 SC 1.4.11 Non-text Contrast](https://www.w3.org/WAI/WCAG21/Understanding/non-text-contrast.html).
+
+Without sufficient contrast, content can be difficult to perceive and therefore difficult to identify. In extreme cases, content with low contrast may not be visible at all to people with colour perception impairments. In the case of the above share buttons, users may not be able to appropriately perceive/understand what the share controls are, what service they relate to.
+
+### Pre-configured providers
+
+The `BentoSocialShare` component provides [some pre-configured providers](./social-share-config.js) that know their sharing endpoints as well as some default parameters.
+
+<table>
+  <tr>
+    <th class="col-twenty">Provider</th>
+    <th class="col-twenty">Type</th>
+    <th>Parameters via <code>param</code> prop</th>
+  </tr>
+  <tr>
+    <td><a href="https://developers.google.com/web/updates/2016/10/navigator-share">Web Share API</a> (triggers OS share dialog)</td>
+    <td><code>system</code></td>
+    <td>
+      <ul>
+        <li><code>text</code>: optional</li>
+      </ul>
+    </td>
+  </tr>
+  <tr>
+    <td>Email</td>
+    <td><code>email</code></td>
+    <td>
+      <ul>
+        <li><code>subject</code>: optional</li>
+        <li><code>body</code>: optional</li>
+        <li><code>recipient</code>: optional</li>
+      </ul>
+    </td>
+  </tr>
+  <tr>
+    <td>Facebook</td>
+    <td><code>facebook</code></td>
+    <td>
+      <ul>
+       <li><code>app_id</code>: <strong>required</strong>, defaults to: none. This parameter is the Facebook <code>app_id</code> that's required for the <a href="https://developers.facebook.com/docs/sharing/reference/share-dialog">Facebook Share dialog</a>.</li>
+        <li><code>href</code>: optional</li>
+        <li><code>quote</code>: optional, can be used to share a quote or text.</li>
+        </ul>
+    </td>
+  </tr>
+  <tr>
+    <td>LinkedIn</td>
+    <td><code>linkedin</code></td>
+    <td>
+      <ul>
+        <li><code>url</code>: optional</li>
+      </ul>
+    </td>
+  </tr>
+  </tr>
+  <tr>
+    <td>Pinterest</td>
+    <td><code>pinterest</code></td>
+    <td>
+      <ul>
+        <li><code>media</code>: optional (but highly recommended to be set). Url for the media to be shared on Pinterest. If not set, the end user will be requested to upload a media by Pinterest.</li>
+        <li><code>url</code>: optional</li>
+        <li><code>description</code>: optional</li>
+      </ul>
+    </td>
+  </tr>
+  </tr>
+  <tr>
+    <td>Tumblr</td>
+    <td><code>tumblr</code></td>
+    <td>
+      <ul>
+        <li><code>url</code>: optional</li>
+        <li><code>text</code>: optional</li>
+      </ul>
+    </td>
+  </tr>
+  <tr>
+    <td>Twitter</td>
+    <td><code>twitter</code></td>
+    <td>
+      <ul>
+        <li><code>url</code>: optional</li>
+        <li><code>text</code>: optional</li>
+      </ul>
+    </td>
+  </tr>
+  <tr>
+    <td>Whatsapp</td>
+    <td><code>whatsapp</code></td>
+    <td>
+      <ul>
+        <li><code>text</code>: optional</li>
+      </ul>
+    </td>
+  </tr>
+  <tr>
+    <td>LINE</td>
+    <td><code>line</code></td>
+    <td>
+      <ul>
+        <li><code>url</code>: optional</li>
+        <li><code>text</code>: optional</li>
+      </ul>
+    </td>
+  </tr>
+  <tr>
+    <td>SMS</td>
+    <td><code>sms</code></td>
+    <td>
+      <ul>
+        <li><code>body</code>: optional</li></ul>
+    </td>
+  </tr>
+</table>
+
+### Non-configured providers
+
+In addition to pre-configured providers, you can use non-configured providers by specifying additional attributes in the `BentoSocialShare` component.
+
+#### Example: Creating a share button for a non-configured provider
+
+The following example creates a share button through Facebook Messenger by setting the `data-share-endpoint` attribute to the correct endpoint for the Facebook Messenger custom protocol.
+
+```html
+<BentoSocialShare
+  type="facebookmessenger"
+  data-share-endpoint="fb-messenger://share"
+  data-param-text="Check out this article: TITLE - CANONICAL_URL"
+  aria-label="Share on Facebook Messenger"
+>
+</BentoSocialShare>
+```
+
+As these providers are not pre-configured, you'll need to create the appropriate button image and styles for the provider.
+
+### Props
+
+#### type (required)
+
+Selects a provider type. This is required for both pre-configured and non-configured providers.
+
+#### background
+
+Sometimes you want to provide your own style. You can simply override the provided styles by giving a color for the background.
+
+When customizing the style of an `BentoSocialShare` icon please ensure that the customized icon meets the branding guidelines set out by the provider (e.g Twitter, Facebook, etc.)
+
+#### color
+
+Sometimes you want to provide your own style. You can simply override the provided styles by giving a color for the fill.
+
+When customizing the style of an `BentoSocialShare` icon please ensure that the customized icon meets the branding guidelines set out by the provider (e.g Twitter, Facebook, etc.)
+
+#### target
+
+Specifies the target in which to open the target. The default is `_blank` for all cases other than email/SMS on iOS, in which case the target is set to `_top`.
+
+#### endpoint
+
+This prop is required for non-configured providers.
+
+Some popular providers have pre-configured share endpoints. For details, see the Pre-configured Providers section. For non-configured providers, you'll need to specify the share endpoint.
+
+#### params
+
+All `param` properties are passed as URL parameters and passed to the share endpoint.
+
+#### aria-label
+
+The description of the button for accessibility. A recommended label is "Share on \<type>".
diff --git a/src/bento/components/bento-social-share/1.0/amp-social-share.css b/src/bento/components/bento-social-share/1.0/amp-social-share.css
new file mode 100644
index 000000000000..1427f4bd457c
--- /dev/null
+++ b/src/bento/components/bento-social-share/1.0/amp-social-share.css
@@ -0,0 +1,97 @@
+/*
+ * Pre-upgrade:
+ * - display:inline-block element
+ * - size-defined element
+ * - predefined default size
+ */
+bento-social-share {
+  display: inline-block;
+  overflow: hidden;
+  position: relative;
+  box-sizing: border-box;
+  width: 60px;
+  height: 44px;
+}
+
+/* Pre-upgrade: size-defining element - hide children until build. */
+bento-social-share:not(.i-amphtml-built)
+  > :not([placeholder]):not([slot='i-amphtml-svc']) {
+  display: none;
+  content-visibility: hidden;
+}
+
+/**
+  * Note: Attribute selectors were used initially here but we switched to using
+  * class-based selector to style each type because of a bug on iOS Safari 8.
+  * See https://github.com/ampproject/amphtml/issues/4277 for more details.
+  */
+
+bento-social-share:focus {
+  outline: #0389ff solid 2px;
+  outline-offset: 2px;
+}
+
+bento-social-share::part(button):focus {
+  outline: none !important;
+  outline-offset: 0 !important;
+}
+
+/* Twitter Styling */
+.bento-social-share-twitter {
+  color: #fff;
+  background-color: #1da1f2;
+}
+
+/* Facebook Styling */
+.bento-social-share-facebook {
+  color: #1877f2;
+  background-color: #fff;
+}
+
+/* Pinterest Styling */
+.bento-social-share-pinterest {
+  color: #e60023;
+  background-color: #fff;
+}
+
+/* LinkedIn Styling */
+.bento-social-share-linkedin {
+  color: #fff;
+  background-color: #0a66c2;
+}
+
+/* Tumblr Styling */
+.bento-social-share-tumblr {
+  color: #fff;
+  background-color: #001935;
+}
+
+/* Email Styling */
+.bento-social-share-email {
+  color: #fff;
+  background-color: #000000;
+}
+
+/* Whatsapp Styling */
+.bento-social-share-whatsapp {
+  color: #fff;
+  background-color: #25d366;
+}
+
+/* line Styling */
+.bento-social-share-line {
+  color: #fff;
+  background-color: #00b900;
+}
+
+/* SMS Styling */
+.bento-social-share-sms {
+  color: #fff;
+  background-color: #000000;
+}
+
+/* "system" styling */
+.bento-social-share-system {
+  color: #fff;
+  background-color: #000000;
+}
diff --git a/src/bento/components/bento-social-share/1.0/base-element.js b/src/bento/components/bento-social-share/1.0/base-element.js
new file mode 100644
index 000000000000..659431b7c2b9
--- /dev/null
+++ b/src/bento/components/bento-social-share/1.0/base-element.js
@@ -0,0 +1,36 @@
+import {PreactBaseElement} from '#preact/base-element';
+
+import {BentoSocialShare} from './component';
+import {CSS as COMPONENT_CSS} from './component.jss';
+
+export class BaseElement extends PreactBaseElement {}
+
+/** @override */
+BaseElement['Component'] = BentoSocialShare;
+
+/** @override */
+BaseElement['layoutSizeDefined'] = true;
+
+/** @override */
+BaseElement['delegatesFocus'] = true;
+
+/** @override */
+BaseElement['props'] = {
+  'children': {passthroughNonEmpty: true},
+  'height': {attr: 'height'},
+  'tabindex': {attr: 'tabindex'},
+  'type': {attr: 'type'},
+  'width': {attr: 'width'},
+};
+
+/** @override */
+BaseElement['staticProps'] = {
+  'color': 'currentColor',
+  'background': 'inherit',
+};
+
+/** @override */
+BaseElement['usesShadowDom'] = true;
+
+/** @override */
+BaseElement['shadowCss'] = COMPONENT_CSS;
diff --git a/src/bento/components/bento-social-share/1.0/component.js b/src/bento/components/bento-social-share/1.0/component.js
new file mode 100644
index 000000000000..6cfc558358e5
--- /dev/null
+++ b/src/bento/components/bento-social-share/1.0/component.js
@@ -0,0 +1,267 @@
+import {Keys_Enum} from '#core/constants/key-codes';
+import {parseQueryString} from '#core/types/string/url';
+
+import * as Preact from '#preact';
+import {Wrapper} from '#preact/component';
+import {tabindexFromProps, useResourcesNotify} from '#preact/utils';
+
+import {useStyles} from './component.jss';
+import {getSocialConfig} from './social-share-config';
+import {BentoSocialShareIcon} from './social-share-svgs';
+
+import {openWindowDialog} from '../../../../open-window-dialog';
+import {addParamsToUrl} from '../../../../url';
+
+const NAME = 'BentoSocialShare';
+const DEFAULT_WIDTH = 60;
+const DEFAULT_HEIGHT = 44;
+const DEFAULT_TARGET = '_blank';
+const WINDOW_FEATURES = 'resizable,scrollbars,width=640,height=480';
+
+/**
+ * @param {!BentoSocialShareDef.Props} props
+ * @return {PreactDef.Renderable}
+ */
+export function BentoSocialShare({
+  background,
+  children,
+  color,
+  endpoint,
+  height,
+  params,
+  style,
+  target,
+  type,
+  width,
+  ...rest
+}) {
+  useResourcesNotify();
+  const classes = useStyles();
+  const checkPropsReturnValue = checkProps(
+    type,
+    endpoint,
+    target,
+    width,
+    height,
+    params
+  );
+
+  // Early exit if checkProps did not pass
+  if (!checkPropsReturnValue) {
+    return null;
+  }
+
+  const {checkedHeight, checkedTarget, checkedWidth, finalEndpoint} =
+    checkPropsReturnValue;
+
+  return (
+    <Wrapper
+      {...rest}
+      role="button"
+      tabindex={tabindexFromProps(rest)}
+      onKeyDown={(e) => handleKeyPress(e, finalEndpoint, checkedTarget)}
+      onClick={() => handleActivation(finalEndpoint, checkedTarget)}
+      wrapperStyle={{
+        width: checkedWidth,
+        height: checkedHeight,
+        ...style,
+      }}
+      part="button"
+      wrapperClassName={classes.button}
+    >
+      {processChildren(
+        /** @type {string} */ (type),
+        children,
+        color,
+        background
+      )}
+    </Wrapper>
+  );
+}
+
+/**
+ * If children exist, render the children instead of the icon.  Otherwise,
+ * render the icon associated with the specified type with specified color
+ * and background (or defaults if not specified).
+ * @param {string} type
+ * @param {?PreactDef.Renderable|undefined} children
+ * @param {string|undefined} color
+ * @param {string|undefined} background
+ * @return {PreactDef.Renderable}
+ */
+function processChildren(type, children, color, background) {
+  if (children) {
+    return children;
+  } else {
+    const typeConfig = getSocialConfig(type) || {};
+    const iconStyle = {
+      'color': color || typeConfig.defaultColor,
+      'backgroundColor': background || typeConfig.defaultBackgroundColor,
+    };
+    return (
+      <BentoSocialShareIcon
+        style={{
+          ...iconStyle,
+          width: '100%',
+          height: '100%',
+        }}
+        type={type.toUpperCase()}
+      />
+    );
+  }
+}
+
+/**
+ * Verify required props and throw error if necessary.  Set default values
+ * for optional props if no value specified.
+ * @param {string|undefined} type
+ * @param {string|undefined} endpoint
+ * @param {string|undefined} target
+ * @param {number|string|undefined} width
+ * @param {number|string|undefined} height
+ * @param {JsonObject|Object|undefined} params
+ * @return {?{
+ *   finalEndpoint: string,
+ *   checkedWidth: (number|string),
+ *   checkedHeight: (number|string),
+ *   checkedTarget: string,
+ * }}
+ */
+function checkProps(type, endpoint, target, width, height, params) {
+  // User must provide endpoint if they choose a type that is not
+  // pre-configured, early exit if not provided
+  const typeConfig = getSocialConfig(/** @type {string} */ (type)) || {};
+  let baseEndpoint = endpoint || typeConfig.shareEndpoint;
+  if (baseEndpoint === undefined) {
+    displayWarning(
+      `An endpoint is required if not using a pre-configured type. ${NAME}`
+    );
+    return null;
+  }
+
+  // TODO: This logic might be duplicated in the AMP component
+  // https://github.com/ampproject/amphtml/issues/36777
+  const currentParams = Object.entries(typeConfig.defaultParams || {}).reduce(
+    (newParams, [key, value]) => {
+      if (newParams[key]) {
+        return newParams;
+      }
+      return {
+        ...newParams,
+        [key]: value
+          .replace('TITLE', document.title)
+          .replace(
+            'CANONICAL_URL',
+            document.querySelector("link[rel='canonical']")?.href ||
+              location.href
+          ),
+      };
+    },
+    params || {}
+  );
+
+  // Special case when type is 'email'
+  if (type === 'email' && !endpoint) {
+    baseEndpoint = `mailto:${currentParams['recipient'] || ''}`;
+  }
+
+  // Add params to baseEndpoint
+  const finalEndpoint = addParamsToUrl(
+    /** @type {string} */ (baseEndpoint),
+    /** @type {!JsonObject} */ (currentParams)
+  );
+
+  // Defaults
+  const checkedWidth = width || DEFAULT_WIDTH;
+  const checkedHeight = height || DEFAULT_HEIGHT;
+  const checkedTarget = target || DEFAULT_TARGET;
+
+  return {
+    finalEndpoint,
+    checkedWidth,
+    checkedHeight,
+    checkedTarget,
+  };
+}
+
+/**
+ * @param {?string} message
+ */
+function displayWarning(message) {
+  console /*OK*/
+    .warn(message);
+}
+
+/**
+ * Opens a new window with the fully processed endpoint
+ * @param {?string} finalEndpoint
+ * @param {string} target
+ */
+function handleActivation(finalEndpoint, target) {
+  const protocol = finalEndpoint.split(':', 1)[0];
+
+  if (protocol === 'navigator-share') {
+    if (window && window.navigator && window.navigator.share) {
+      const data = parseQueryString(
+        /** @type {string} */ (getQueryString(finalEndpoint))
+      );
+      window.navigator.share(data).catch((e) => {
+        displayWarning(`${e.message}. ${NAME}`);
+      });
+    } else {
+      displayWarning(
+        `Could not complete system share.  Navigator unavailable. ${NAME}`
+      );
+    }
+  } else if (protocol === 'sms' || protocol === 'mailto') {
+    openWindowDialog(
+      window,
+      protocol === 'sms' ? finalEndpoint.replace('?', '?&') : finalEndpoint,
+      isIos() ? '_top' : target,
+      WINDOW_FEATURES
+    );
+  } else {
+    openWindowDialog(window, finalEndpoint, target, WINDOW_FEATURES);
+  }
+}
+
+/**
+ * Returns the Query String of a full url, will not include # parameters
+ * @param {?string} endpoint
+ * @return {?string}
+ */
+function getQueryString(endpoint) {
+  let q = endpoint.indexOf('?');
+  let h = endpoint.indexOf('#');
+  q = q === -1 ? endpoint.length : q;
+  h = h === -1 ? endpoint.length : h;
+  return endpoint.slice(q, h);
+}
+
+/**
+ * Checks whether or not the userAgent of the current device indicates that
+ * this is an Ios device.  Checked for 'mailto:' and 'sms:' protocols which
+ * break when opened in _blank on iOS Safari.
+ * @return {boolean}
+ */
+function isIos() {
+  return (
+    /** @type {boolean} */ window &&
+    window.navigator &&
+    window.navigator.userAgent &&
+    window.navigator.userAgent.search(/iPhone|iPad|iPod/i) >= 0
+  );
+}
+
+/**
+ * @param {!Event} event
+ * @param {?string} finalEndpoint
+ * @param {string} target
+ */
+function handleKeyPress(event, finalEndpoint, target) {
+  const {key} = event;
+  if (key == Keys_Enum.SPACE || key == Keys_Enum.ENTER) {
+    event.preventDefault();
+    handleActivation(finalEndpoint, target);
+  }
+}
diff --git a/extensions/amp-social-share/1.0/component.jss.js b/src/bento/components/bento-social-share/1.0/component.jss.js
similarity index 100%
rename from extensions/amp-social-share/1.0/component.jss.js
rename to src/bento/components/bento-social-share/1.0/component.jss.js
diff --git a/src/bento/components/bento-social-share/1.0/component.type.js b/src/bento/components/bento-social-share/1.0/component.type.js
new file mode 100644
index 000000000000..c11a8af16ec1
--- /dev/null
+++ b/src/bento/components/bento-social-share/1.0/component.type.js
@@ -0,0 +1,23 @@
+/** @externs */
+
+/** @const */
+var BentoSocialShareDef = {};
+
+/**
+ * @typedef {{
+ *   type: (string),
+ *   endpoint: (string|undefined),
+ *   params: (JsonObject|Object|undefined),
+ *   target: (string|undefined),
+ *   width: (number|string|undefined),
+ *   height: (number|string|undefined),
+ *   color: (string|undefined),
+ *   background: (string|undefined),
+ *   tabindex: (number|string|undefined),
+ *   tabIndex: (number|string|undefined),
+ *   style: (string|undefined),
+ *   children: (?PreactDef.Renderable|undefined),
+ * }}
+ * (We support tabindex and tabIndex equally, see tabindexFromProps())
+ */
+BentoSocialShareDef.Props;
diff --git a/extensions/amp-social-share/1.0/social-share-config.js b/src/bento/components/bento-social-share/1.0/social-share-config.js
similarity index 87%
rename from extensions/amp-social-share/1.0/social-share-config.js
rename to src/bento/components/bento-social-share/1.0/social-share-config.js
index b8c9eccda187..fc216a9300ff 100644
--- a/extensions/amp-social-share/1.0/social-share-config.js
+++ b/src/bento/components/bento-social-share/1.0/social-share-config.js
@@ -1,5 +1,3 @@
-import {dict} from '#core/types/object';
-
 /**
  * Get social share configurations by supported type.
  * @param  {string} type
@@ -26,7 +24,7 @@ export function getSocialConfig(type) {
  *
  * @typedef {{
  *   shareEndpont: string,
- *   defaultParams: Object<string, string>,
+ *   defaultParams: {[key: string]: string},
  *   defaultColor: string,
  *   defaultBackgroundColor: string,
  *   bindings: (!Array<string>|undefined),
@@ -35,95 +33,95 @@ export function getSocialConfig(type) {
 let BentoSocialShareConfigDef;
 
 /**
- * @type {Object<string, BentoSocialShareConfigDef>}
+ * @type {{[key: string]: BentoSocialShareConfigDef}}
  */
 const BUILTINS = {
   'twitter': {
     shareEndpoint: 'https://twitter.com/intent/tweet',
-    defaultParams: dict({
+    defaultParams: {
       'text': 'TITLE',
       'url': 'CANONICAL_URL',
-    }),
+    },
     defaultColor: 'ffffff',
     defaultBackgroundColor: '1da1f2',
   },
   'facebook': {
     shareEndpoint: 'https://www.facebook.com/dialog/share',
-    defaultParams: dict({
+    defaultParams: {
       'href': 'CANONICAL_URL',
-    }),
+    },
     defaultColor: '1877f2',
     defaultBackgroundColor: 'ffffff',
   },
   'pinterest': {
     shareEndpoint: 'https://www.pinterest.com/pin/create/button/',
-    defaultParams: dict({
+    defaultParams: {
       'url': 'CANONICAL_URL',
       'description': 'TITLE',
-    }),
+    },
     defaultColor: 'e60023',
     defaultBackgroundColor: 'ffffff',
   },
   'linkedin': {
     shareEndpoint: 'https://www.linkedin.com/shareArticle',
-    defaultParams: dict({
+    defaultParams: {
       'url': 'CANONICAL_URL',
       'mini': 'true',
-    }),
+    },
     'defaultColor': 'ffffff',
     'defaultBackgroundColor': '0a66c2',
   },
   'email': {
     shareEndpoint: 'mailto:RECIPIENT',
-    defaultParams: dict({
+    defaultParams: {
       'subject': 'TITLE',
       'body': 'CANONICAL_URL',
       'recipient': '',
-    }),
+    },
     defaultColor: 'ffffff',
     defaultBackgroundColor: '000000',
     bindings: ['recipient'],
   },
   'tumblr': {
     shareEndpoint: 'https://www.tumblr.com/share/link',
-    defaultParams: dict({
+    defaultParams: {
       'name': 'TITLE',
       'url': 'CANONICAL_URL',
-    }),
+    },
     defaultColor: 'ffffff',
     defaultBackgroundColor: '001935',
   },
   'whatsapp': {
     shareEndpoint: 'https://api.whatsapp.com/send',
-    defaultParams: dict({
+    defaultParams: {
       'text': 'TITLE - CANONICAL_URL',
-    }),
+    },
     defaultColor: 'ffffff',
     defaultBackgroundColor: '25d366',
   },
   'line': {
     shareEndpoint: 'https://social-plugins.line.me/lineit/share',
-    defaultParams: dict({
+    defaultParams: {
       'text': 'TITLE',
       'url': 'CANONICAL_URL',
-    }),
+    },
     defaultColor: 'ffffff',
     defaultBackgroundColor: '00b900',
   },
   'sms': {
     shareEndpoint: 'sms:',
-    defaultParams: dict({
+    defaultParams: {
       'body': 'TITLE - CANONICAL_URL',
-    }),
+    },
     defaultColor: 'ffffff',
     defaultBackgroundColor: '000000',
   },
   'system': {
     shareEndpoint: 'navigator-share:',
-    defaultParams: dict({
+    defaultParams: {
       'text': 'TITLE',
       'url': 'CANONICAL_URL',
-    }),
+    },
     defaultColor: 'ffffff',
     defaultBackgroundColor: '000000',
   },
diff --git a/extensions/amp-social-share/1.0/social-share-svgs.js b/src/bento/components/bento-social-share/1.0/social-share-svgs.js
similarity index 100%
rename from extensions/amp-social-share/1.0/social-share-svgs.js
rename to src/bento/components/bento-social-share/1.0/social-share-svgs.js
diff --git a/src/bento/components/bento-social-share/OWNERS b/src/bento/components/bento-social-share/OWNERS
new file mode 100644
index 000000000000..5262d5cd2069
--- /dev/null
+++ b/src/bento/components/bento-social-share/OWNERS
@@ -0,0 +1,14 @@
+// For an explanation of the OWNERS rules and syntax, see:
+// https://github.com/ampproject/amp-github-apps/blob/main/owners/OWNERS.example
+
+{
+  rules: [
+    {
+      owners: [
+        {name: 'ampproject/wg-components'},
+        {name: 'ithinkihaveacat'},
+        {name: 'ryancopley'},
+      ],
+    },
+  ],
+}
diff --git a/src/bento/components/bento-social-share/bento-social-share.md b/src/bento/components/bento-social-share/bento-social-share.md
new file mode 100644
index 000000000000..d12ed5ae5396
--- /dev/null
+++ b/src/bento/components/bento-social-share/bento-social-share.md
@@ -0,0 +1,299 @@
+---
+$category@: ads-analytics
+formats:
+  - websites
+experimental: true
+bento: true
+---
+
+# bento-social-share
+
+## Usage
+
+The `bento-social-share` component displays a social share button for social platforms.
+
+{% call callout('Important', type='caution') %}
+Currently, none of the buttons generated by `bento-social-share` (including those for the pre-configured providers) have a label/accessible name that is exposed to assistive technologies (such as screen readers). Make sure to include an `aria-label` with a descriptive label, as otherwise these controls will just be announced as unlabelled "button" elements.
+{% endcall %}
+
+**Example: Basic social share button**
+
+The share button guesses some defaults for you for some pre-configured providers. It assumes that the current document canonical url is the URL you want to share and the page title is the text you want to share.
+
+```html
+<bento-social-share
+  type="twitter"
+  aria-label="Share on Twitter"
+></bento-social-share>
+```
+
+**Example: Passing parameters**
+
+When you want to pass parameters to the share endpoint, you can specify `data-param-<attribute>` that will be appended to the share endpoint.
+
+```html
+<bento-social-share
+  type="linkedin"
+  width="60"
+  height="44"
+  data-param-text="Hello world"
+  data-param-url="https://example.com/"
+  aria-label="Share on LinkedIn"
+>
+</bento-social-share>
+```
+
+Linkedin is one of the pre-configured providers, so you do not need to provide the `data-share-endpoint` attribute.
+
+### Standalone use outside valid AMP documents
+
+Bento allows you to use AMP components in non-AMP pages without needing
+to commit to fully valid AMP. You can take these components and place them
+in implementations with frameworks and CMSs that don't support AMP. Read
+more in our guide [Use AMP components in non-AMP pages](https://amp.dev/documentation/guides-and-tutorials/start/bento_guide/).
+
+To find the standalone version of `bento-social-share`, see [**`bento-social-share`**](./1.0/README.md).
+
+### Pre-configured providers
+
+The `amp-social-share` component provides [some pre-configured providers](../../../../extensions/amp-social-share/0.1/amp-social-share-config.js) that know their sharing endpoints as well as some default parameters.
+
+<table>
+  <tr>
+    <th class="col-twenty">Provider</th>
+    <th class="col-twenty">Type</th>
+    <th>Parameters</th>
+  </tr>
+  <tr>
+    <td><a href="https://developers.google.com/web/updates/2016/10/navigator-share">Web Share API</a> (triggers OS share dialog)</td>
+    <td><code>system</code></td>
+    <td>
+      <ul>
+        <li><code>data-param-text</code>: optional, defaults to: "Current page title"</li>
+        <li><code>data-mode</code>: optional, if set to <code>replace</code>, all other share options are removed.</li>
+      </ul>
+    </td>
+  </tr>
+  <tr>
+    <td>Email</td>
+    <td><code>email</code></td>
+    <td>
+      <ul>
+        <li><code>data-param-subject</code>: optional, defaults to: Current page title</li>
+        <li><code>data-param-body</code>: optional, defaults to: <code>rel=canonical</code> URL</li>
+        <li><code>data-param-recipient</code>: optional, defaults to: '' (empty string)</li>
+      </ul>
+    </td>
+  </tr>
+  <tr>
+    <td>Facebook</td>
+    <td><code>facebook</code></td>
+    <td>
+      <ul>
+       <li><code>data-param-app_id</code>: <strong>required</strong>, defaults to: none. This parameter is the Facebook <code>app_id</code> that's required for the <a href="https://developers.facebook.com/docs/sharing/reference/share-dialog">Facebook Share dialog</a>.</li>
+        <li><code>data-param-href</code>: optional, defaults to: <code>rel=canonical</code> URL</li>
+        <li><code>data-param-quote</code>: optional. Can be used to share a quote or text.</li>
+        </ul>
+    </td>
+  </tr>
+  <tr>
+    <td>LinkedIn</td>
+    <td><code>linkedin</code></td>
+    <td>
+      <ul>
+        <li><code>data-param-url</code>: optional, defaults to: <code>rel=canonical</code> URL</li>
+      </ul>
+    </td>
+  </tr>
+  </tr>
+  <tr>
+    <td>Pinterest</td>
+    <td><code>pinterest</code></td>
+    <td>
+      <ul>
+        <li><code>data-param-media</code>: optional (but highly recommended to be set), defaults to: none. Url for the media to be shared on Pinterest. If not set, the end user will be requested to upload a media by Pinterest.</li>
+        <li><code>data-param-url</code>: optional, defaults to: <code>rel=canonical</code> URL</li>
+        <li><code>data-param-description</code>: optional, defaults to: Current page title</li>
+      </ul>
+    </td>
+  </tr>
+  </tr>
+  <tr>
+    <td>Tumblr</td>
+    <td><code>tumblr</code></td>
+    <td>
+      <ul>
+        <li><code>data-param-url</code>: optional, defaults to: <code>rel=canonical</code> URL</li>
+        <li><code>data-param-text</code>: optional, defaults to: Current page title</li>
+      </ul>
+    </td>
+  </tr>
+  <tr>
+    <td>Twitter</td>
+    <td><code>twitter</code></td>
+    <td>
+      <ul>
+        <li><code>data-param-url</code>: optional, defaults to: <code>rel=canonical</code> URL</li>
+        <li><code>data-param-text</code>: optional, defaults to: Current page title</li>
+      </ul>
+    </td>
+  </tr>
+  <tr>
+    <td>Whatsapp</td>
+    <td><code>whatsapp</code></td>
+    <td>
+      <ul>
+        <li><code>data-param-text</code>: optional, defaults to: "Current page title - current page URL"</li>
+      </ul>
+    </td>
+  </tr>
+  <tr>
+    <td>LINE</td>
+    <td><code>line</code></td>
+    <td>
+      <ul>
+        <li><code>data-param-url</code>: optional, defaults to: <code>rel=canonical</code> URL</li>
+        <li><code>data-param-text</code>: optional, defaults to: Current page title</li>
+      </ul>
+    </td>
+  </tr>
+  <tr>
+    <td>SMS</td>
+    <td><code>sms</code></td>
+    <td>
+      <ul>
+        <li><code>data-param-body</code>: optional, defaults to: <code>rel=title - rel=canonical</code> URL</li></ul>
+    </td>
+  </tr>
+</table>
+
+### Non-configured providers
+
+In addition to pre-configured providers, you can use non-configured providers by specifying additional attributes in the `bento-social-share` component.
+
+**Example: Creating a share button for a non-configured provider**
+
+The following example creates a share button through Facebook Messenger by setting the `data-share-endpoint` attribute to the correct endpoint for the Facebook Messenger custom protocol.
+
+```html
+<bento-social-share
+  type="facebookmessenger"
+  data-share-endpoint="fb-messenger://share"
+  data-param-text="Check out this article: TITLE - CANONICAL_URL"
+  aria-label="Share on Facebook Messenger"
+>
+</bento-social-share>
+```
+
+As these providers are not pre-configured, you'll need to create the appropriate button image and styles for the provider.
+
+### Variable Substitution
+
+You can use [global AMP variables substitution](https://github.com/ampproject/amphtml/blob/main/docs/spec/amp-var-substitutions.md) in the `<bento-social-share>` element. In the example below, `TITLE` is substituted with the page title and `CANONICAL_URL` with the document's canonical URL.
+
+```html
+<bento-social-share
+  type="whatsapp"
+  data-param-text="Check out this article: TITLE - CANONICAL_URL"
+>
+</bento-social-share>
+```
+
+## Attributes
+
+### type (required)
+
+Selects a provider type. This is required for both pre-configured and non-configured providers.
+
+### data-target
+
+Specifies the target in which to open the target. The default is `_blank` for all cases other than email/SMS on iOS, in which case the target is set to `_top`.
+
+Please note that we only suggest using this override for email.
+
+### data-share-endpoint
+
+This attribute is required for non-configured providers.
+
+Some popular providers have pre-configured share endpoints. For details, see the Pre-configured Providers section. For non-configured providers, you'll need to specify the share endpoint.
+
+### data-param-\*
+
+All `data-param-*` prefixed attributes are turned into URL parameters and passed to the share endpoint.
+
+### aria-label
+
+By default, the `aria-label` attribute will be populated with `Share by type` where 'type' is the `type` attribute provided to the component. If a non-empty value is passed in to `aria-label` it will overwrite the default value.
+
+## Styling
+
+### Default Styles
+
+By default, `bento-social-share` includes some popular pre-configured providers. Buttons for these providers are styled with the provider's official color and logo. The default width is 60px, and the default height is 44px.
+
+{% call callout('Tip', type='success') %}
+Visit [AMP Start](https://ampstart.com/components#links-and-sharing) for responsive, pre-styled share links that you can use in your AMP pages.
+{% endcall %}
+
+### Custom Styles
+
+Sometimes you want to provide your own style. You can simply override the provided styles like the following:
+
+```css
+bento-social-share[type='twitter'] {
+  color: blue;
+  background: red;
+}
+```
+
+When customizing the style of an `bento-social-share` icon please ensure that the customized icon meets the branding guidelines set out by the provider (e.g Twitter, Facebook, etc.)
+
+## Accessibility
+
+### Indication of focus
+
+The `bento-social-share` element defaults to a blue outline as a visible focus indicator. It also defaults `tabindex=0` making it easy for a user to follow along as he or she tabs through multiple `bento-social-share` elements used together on a page.
+
+The default focus indicator is achieved with the following CSS rule-set.
+
+```css
+bento-social-share:focus {
+  outline: #0389ff solid 2px;
+  outline-offset: 2px;
+}
+```
+
+The default focus indicator can be overwritten by defining CSS styles for focus and including them within a `style` tag on an AMP HTML page. In the example below, the first CSS rule-set removes the focus indicator on all `bento-social-share` elements by setting the `outline` property to `none`. The second rule-set specifies a red outline (instead of the default blue) and also sets the `outline-offset` to be `3px` for all `bento-social-share` elements with the class `custom-focus`.
+
+```css
+bento-social-share:focus{
+  outline: none;
+}
+
+bento-social-share.custom-focus:focus {
+  outline: red solid 2px;
+  outline-offset: 3px;
+}
+```
+
+With these CSS rules, `bento-social-share` elements would not show the visible focus indicator unless they included the class `custom-focus` in which case they would have the red outlined indicator.
+
+### Color contrast
+
+Note that `bento-social-share` with a `type` value of `twitter`, `whatsapp`, or `line` will display a button with a foreground/background color combination that falls below the 3:1 threshold recommended for non-text content defined in [WCAG 2.1 SC 1.4.11 Non-text Contrast](https://www.w3.org/WAI/WCAG21/Understanding/non-text-contrast.html).
+
+Without sufficient contrast, content can be difficult to perceive and therefore difficult to identify. In extreme cases, content with low contrast may not be visible at all to people with colour perception impairments. In the case of the above share buttons, users may not be able to appropriately perceive/understand what the share controls are, what service they relate to.
+
+## Version notes
+
+The `1.0` version of `bento-social-share` has a few additional features that differentiate it from the `0.1` version.
+
+1. The default icons for pre-configured providers have been updated to reflect the
+   most up-to-date logos and colors from their associated companies so expect a new
+   set of logos when migrating to `1.0`.
+2. Both the foreground and background colors of the default icons can now be styled
+   with CSS. See the `Styling` section above for more information.
+3. Support for custom logos or text on the default icons is now included. If the
+   `bento-social-share` component has any children elements, they will now be displayed
+   instead of the default icon. (In `0.1` they would be overlaid on the existing
+   icon.)
diff --git a/src/bento/components/bento-soundcloud/1.0/README.md b/src/bento/components/bento-soundcloud/1.0/README.md
new file mode 100644
index 000000000000..5ef5a0818a4d
--- /dev/null
+++ b/src/bento/components/bento-soundcloud/1.0/README.md
@@ -0,0 +1,269 @@
+# Bento Soundcloud
+
+Embeds a [Soundcloud](https://soundcloud.com) clip.
+
+## Web Component
+
+You must include each Bento component's required CSS library to guarantee proper loading and before adding custom styles. Or use the light-weight pre-upgrade styles available inline. See [Layout and style](#layout-and-style).
+
+### Import via npm
+
+```sh
+npm install @bentoproject/soundcloud
+```
+
+```javascript
+import {defineElement as defineBentoSoundcloud} from '@bentoproject/soundcloud';
+defineBentoSoundcloud();
+```
+
+### Include via `<script>`
+
+```html
+<script type="module" src="https://cdn.ampproject.org/bento.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/bento.js" crossorigin="anonymous"></script>
+<script type="module" src="https://cdn.ampproject.org/v0/bento-soundcloud-1.0.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/v0/bento-soundcloud-1.0.js" crossorigin="anonymous"></script>
+<link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-soundcloud-1.0.css" crossorigin="anonymous">
+```
+
+### Example
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-soundcloud-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-soundcloud-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-soundcloud-1.0.css"
+    />
+    <style>
+      bento-soundcloud {
+        width: 300px;
+        height: 300px;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-soundcloud
+      id="my-track"
+      data-trackid="89299804"
+      data-visual="true"
+    ></bento-soundcloud>
+  </body>
+</html>
+```
+
+### Layout and style
+
+Each Bento component has a small CSS library you must include to guarantee proper loading without [content shifts](https://web.dev/cls/). Because of order-based specificity, you must manually ensure that stylesheets are included before any custom styles.
+
+```html
+<link
+  rel="stylesheet"
+  type="text/css"
+  href="https://cdn.ampproject.org/v0/bento-soundcloud-1.0.css"
+/>
+```
+
+Alternatively, you may also make the light-weight pre-upgrade styles available inline:
+
+```html
+<style>
+  bento-soundcloud {
+    display: block;
+    overflow: hidden;
+    position: relative;
+  }
+</style>
+```
+
+#### Container type
+
+The `bento-soundcloud` component has a defined layout size type. To ensure the component renders correctly, be sure to apply a size to the component and its immediate children (slides) via a desired CSS layout (such as one defined with `height`, `width`, `aspect-ratio`, or other such properties):
+
+```css
+bento-soundcloud {
+  height: 100px;
+  width: 100%;
+}
+```
+
+### Attributes
+
+Programmatically changing one of the attributes will result in the player being automatically updated.
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-soundcloud-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-soundcloud-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-soundcloud-1.0.css"
+    />
+    <style>
+      bento-soundcloud {
+        width: 300px;
+        height: 300px;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-soundcloud
+      id="my-track"
+      data-trackid="89299804"
+      data-visual="true"
+    ></bento-soundcloud>
+    <div class="buttons" style="margin-top: 8px">
+      <button id="change-track">Change track</button>
+    </div>
+
+    <script>
+      (async () => {
+        const soundcloud = document.querySelector('#my-track');
+        await customElements.whenDefined('bento-soundcloud');
+
+        // set up button actions
+        document.querySelector('#change-track').onclick = () => {
+          soundcloud.setAttribute('data-trackid', '243169232');
+          soundcloud.setAttribute('data-color', 'ff5500');
+          soundcloud.removeAttribute('data-visual');
+        };
+      })();
+    </script>
+  </body>
+</html>
+```
+
+##### data-track
+
+This attribute is required if <code>data-playlistid</code> is not defined. The value for this attribute is the ID of a track, an integer.
+
+##### data-playlistid
+
+This attribute is required if <code>data-trackid</code> is not defined. The value for this attribute is the ID of a playlist, an integer.
+
+##### data-secret-token (optional)
+
+The secret token of the track, if it is private.
+
+##### data-visual (optional)
+
+If set to <code>true</code>, displays full-width "Visual" mode; otherwise, it displays as "Classic" mode. The default value is <code>false</code>.
+
+##### data-color (optional)
+
+This attribute is a custom color override for the "Classic" mode. The attribute is ignored in "Visual" mode. Specify a hexadecimal color value, without the leading # (e.g., <code>data-color="e540ff"</code>).
+
+---
+
+## Preact/React Component
+
+### Import via npm
+
+```sh
+npm install @bentoproject/soundcloud
+```
+
+```javascript
+import React from 'react';
+import {BentoSoundcloud} from '@bentoproject/soundcloud/react';
+import '@bentoproject/soundcloud/styles.css';
+
+function App() {
+  return <BentoSoundcloud trackId="243169232" visual={true}></BentoSoundcloud>;
+}
+```
+
+### Layout and style
+
+#### Container type
+
+The `BentoSoundcloud` component has a defined layout size type. To ensure the component renders correctly, be sure to apply a size to the component and its immediate children (slides) via a desired CSS layout (such as one defined with `height`, `width`, `aspect-ratio`, or other such properties). These can be applied inline:
+
+```jsx
+<BentoSoundcloud
+  style={{width: 300, height: 100}}
+  trackId="243169232"
+  visual={true}
+></BentoSoundcloud>
+```
+
+Or via `className`:
+
+```jsx
+<BentoSoundcloud
+  className="custom-styles"
+  trackId="243169232"
+  visual={true}
+></BentoSoundcloud>
+```
+
+```css
+.custom-styles {
+  height: 100px;
+  width: 100%;
+}
+```
+
+### Props
+
+##### trackId
+
+This attribute is required if <code>data-playlistid</code> is not defined.
+The value for this attribute is the ID of a track, an integer.
+
+##### playlistId
+
+This attribute is required if <code>data-trackid</code> is not defined.
+The value for this attribute is the ID of a playlist, an integer.
+
+##### secretToken (optional)
+
+The secret token of the track, if it is private.
+
+##### visual (optional)
+
+If set to <code>true</code>, displays full-width "Visual" mode; otherwise, it displays as "Classic" mode. The default value is <code>false</code>.
+
+##### color (optional)
+
+This attribute is a custom color override for the "Classic" mode. The attribute is ignored in "Visual" mode. Specify a hexadecimal color value, without the leading # (e.g., <code>data-color="e540ff"</code>).
diff --git a/extensions/amp-soundcloud/1.0/base-element.js b/src/bento/components/bento-soundcloud/1.0/base-element.js
similarity index 100%
rename from extensions/amp-soundcloud/1.0/base-element.js
rename to src/bento/components/bento-soundcloud/1.0/base-element.js
diff --git a/src/bento/components/bento-soundcloud/1.0/bento-soundcloud.css b/src/bento/components/bento-soundcloud/1.0/bento-soundcloud.css
new file mode 100644
index 000000000000..69313b9c6765
--- /dev/null
+++ b/src/bento/components/bento-soundcloud/1.0/bento-soundcloud.css
@@ -0,0 +1,17 @@
+/*
+ * Pre-upgrade:
+ * - display:block element
+ * - size-defined element
+ */
+bento-soundcloud {
+  display: block;
+  overflow: hidden;
+  position: relative;
+}
+
+/* Pre-upgrade: size-defining element - hide children. */
+bento-soundcloud:not(.i-amphtml-built)
+  > :not([placeholder]):not([slot='i-amphtml-svc']) {
+  display: none;
+  content-visibility: hidden;
+}
diff --git a/src/bento/components/bento-soundcloud/1.0/component.js b/src/bento/components/bento-soundcloud/1.0/component.js
new file mode 100644
index 000000000000..1117c47c8503
--- /dev/null
+++ b/src/bento/components/bento-soundcloud/1.0/component.js
@@ -0,0 +1,125 @@
+import {parseJson} from '#core/types/object/json';
+
+import * as Preact from '#preact';
+import {useCallback, useEffect, useRef} from '#preact';
+import {useValueRef} from '#preact/component';
+import {IframeEmbed} from '#preact/component/iframe';
+
+import {getData} from '#utils/event-helper';
+
+const MATCHES_MESSAGING_ORIGIN = (origin) => {
+  return origin === 'https://w.soundcloud.com';
+};
+
+/**
+ * @param {!BentoSoundcloudDef.Props} props
+ * @return {PreactDef.Renderable}
+ */
+export function BentoSoundcloud({
+  color,
+  onLoad,
+  playlistId,
+  secretToken,
+  trackId,
+  visual = false,
+  ...rest
+}) {
+  // Property and Reference Variables
+  const iframeRef = useRef(null);
+  const onLoadRef = useValueRef(onLoad);
+
+  useEffect(() => {
+    /** Unmount Procedure */
+    return () => {
+      // Pause widget
+      iframeRef.current?.contentWindow?./*OK*/ postMessage(
+        JSON.stringify({'method': 'pause'}),
+        'https://w.soundcloud.com'
+      );
+
+      // Release iframe resources
+      iframeRef.current = null;
+    };
+  }, []);
+
+  const messageHandler = useCallback(
+    (event) => {
+      const data = parseJson(getData(event));
+      if (data.method === 'ready') {
+        onLoadRef.current?.();
+      }
+    },
+    [onLoadRef]
+  );
+
+  // Checking for valid props
+  if (!checkProps(trackId, playlistId)) {
+    return null;
+  }
+
+  // Build Base URL
+  const url =
+    'https://api.soundcloud.com/' +
+    (trackId != undefined ? 'tracks' : 'playlists') +
+    '/';
+
+  // Extract Media ID
+  const mediaId = trackId ?? playlistId;
+
+  // Prepare BentoSoundcloud Widget URL for iFrame
+  let iframeSrc =
+    'https://w.soundcloud.com/player/?' +
+    'url=' +
+    encodeURIComponent(url + mediaId);
+
+  if (secretToken) {
+    // It's very important the entire thing is encoded, since it's part of
+    // the `url` query param added above.
+    iframeSrc += encodeURIComponent('?secret_token=' + secretToken);
+  }
+
+  if (visual) {
+    iframeSrc += '&visual=true';
+  } else if (color) {
+    iframeSrc += '&color=' + encodeURIComponent(color);
+  }
+
+  return (
+    <IframeEmbed
+      allow="autoplay"
+      frameborder="no"
+      ref={iframeRef}
+      scrolling="no"
+      src={iframeSrc}
+      title={'Soundcloud Widget - ' + mediaId}
+      messageHandler={messageHandler}
+      matchesMessagingOrigin={MATCHES_MESSAGING_ORIGIN}
+      {...rest}
+    />
+  );
+}
+
+/**
+ * Verify required props and throw error if necessary.
+ * @param {string|undefined} trackId
+ * @param {string|undefined} playlistId
+ * @return {boolean} true on valid
+ */
+function checkProps(trackId, playlistId) {
+  // Perform manual checking as assertion is not available for Bento: Issue #32739
+  if (playlistId == undefined && trackId === undefined) {
+    displayWarning(
+      'data-trackid or data-playlistid is required for <amp-soundcloud>'
+    );
+    return false;
+  }
+  return true;
+}
+
+/**
+ * @param {?string} message
+ */
+function displayWarning(message) {
+  console /*OK*/
+    .warn(message);
+}
diff --git a/extensions/amp-soundcloud/1.0/component.type.js b/src/bento/components/bento-soundcloud/1.0/component.type.js
similarity index 100%
rename from extensions/amp-soundcloud/1.0/component.type.js
rename to src/bento/components/bento-soundcloud/1.0/component.type.js
diff --git a/src/bento/components/bento-soundcloud/OWNERS b/src/bento/components/bento-soundcloud/OWNERS
new file mode 100644
index 000000000000..9031855618d4
--- /dev/null
+++ b/src/bento/components/bento-soundcloud/OWNERS
@@ -0,0 +1,10 @@
+// For an explanation of the OWNERS rules and syntax, see:
+// https://github.com/ampproject/amp-github-apps/blob/main/owners/OWNERS.example
+
+{
+  rules: [
+    {
+      owners: [{name: 'asap'}, {name: 'ampproject/wg-components'}],
+    },
+  ],
+}
diff --git a/src/bento/components/bento-soundcloud/bento-soundcloud.md b/src/bento/components/bento-soundcloud/bento-soundcloud.md
new file mode 100644
index 000000000000..c8b5da2082c0
--- /dev/null
+++ b/src/bento/components/bento-soundcloud/bento-soundcloud.md
@@ -0,0 +1,87 @@
+---
+$category@: media
+formats:
+  - websites
+teaser:
+  text: Displays a Soundcloud clip.
+experimental: true
+bento: true
+---
+
+# bento-soundcloud
+
+## Usage
+
+Display a Soundcloud clip.
+
+### Standalone use outside valid AMP documents
+
+Bento allows you to use AMP components in non-AMP pages without needing
+to commit to fully valid AMP. You can take these components and place them
+in implementations with frameworks and CMSs that don't support AMP. Read
+more in our guide [Use AMP components in non-AMP pages](https://amp.dev/documentation/guides-and-tutorials/start/bento_guide/).
+
+To find the standalone version of `bento-soundcloud`, see [**`bento-soundcloud`**](./1.0/README.md).
+
+## Examples
+
+With the responsive layout, the `width` and `height` from the example should yield correct layouts for 1:1 aspect ratio embeds:
+
+Visual Mode:
+
+```html
+<bento-soundcloud
+  width="480"
+  height="480"
+  layout="responsive"
+  data-trackid="243169232"
+  data-visual="true"
+></bento-soundcloud>
+```
+
+Classic Mode:
+
+```html
+<bento-soundcloud
+  width="480"
+  height="480"
+  layout="responsive"
+  data-trackid="243169232"
+  data-color="ff5500"
+></bento-soundcloud>
+```
+
+## Attributes
+
+<table>
+  <tr>
+    <td width="40%"><strong>data-trackid</strong></td>
+    <td>This attribute is required if <code>data-playlistid</code> is not defined.<br />
+The value for this attribute is the ID of a track, an integer.</td>
+  </tr>
+  <tr>
+    <td width="40%"><strong>data-playlistid</strong></td>
+    <td>This attribute is required if <code>data-trackid</code> is not defined.
+The value for this attribute is the ID of a playlist, an integer.</td>
+  </tr>
+  <tr>
+    <td width="40%"><strong>data-secret-token (optional)</strong></td>
+    <td>The secret token of the track, if it is private.</td>
+  </tr>
+  <tr>
+    <td width="40%"><strong>data-visual (optional)</strong></td>
+    <td>If set to <code>true</code>, displays full-width "Visual" mode; otherwise, it displays as "Classic" mode. The default value is <code>false</code>.</td>
+  </tr>
+  <tr>
+    <td width="40%"><strong>data-color (optional)</strong></td>
+    <td>This attribute is a custom color override for the "Classic" mode. The attribute is ignored in "Visual" mode. Specify a hexadecimal color value, without the leading # (e.g., <code>data-color="e540ff"</code>).</td>
+  </tr>
+  <tr>
+    <td width="40%"><strong>width and height</strong></td>
+    <td>The layout for <code>bento-soundcloud</code> is set to <code>fixed-height</code> and it fills all of the available horizontal space. This is ideal for the "Classic" mode, but for "Visual" mode, it's recommended that the height is 300px, 450px or 600px, as per Soundcloud embed code. This will allow the clip's internal elements to resize properly on mobile.</td>
+  </tr>
+</table>
+
+## Validation
+
+See [bento-soundcloud rules](https://github.com/ampproject/amphtml/blob/main/extensions/amp-soundcloud/validator-amp-soundcloud.protoascii) in the AMP validator specification.
diff --git a/src/bento/components/bento-twitter/1.0/README.md b/src/bento/components/bento-twitter/1.0/README.md
new file mode 100644
index 000000000000..594c06df5cf9
--- /dev/null
+++ b/src/bento/components/bento-twitter/1.0/README.md
@@ -0,0 +1,282 @@
+# Bento Twitter
+
+Embeds [Twitter](https://twitter.com) content like a Tweet or a Moment.
+
+## Web Component
+
+You must include each Bento component's required CSS library to guarantee proper loading and before adding custom styles. Or use the light-weight pre-upgrade styles available inline. See [Layout and style](#layout-and-style).
+
+### Import via npm
+
+```sh
+npm install @bentoproject/twitter
+```
+
+```javascript
+import {defineElement as defineBentoTwitters} from '@bentoproject/twitter';
+defineBentoTwitters();
+```
+
+### Include via `<script>`
+
+```html
+<script type="module" src="https://cdn.ampproject.org/bento.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/bento.js" crossorigin="anonymous"></script>
+<script type="module" src="https://cdn.ampproject.org/v0/bento-twitter-1.0.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/v0/bento-twitter-1.0.js" crossorigin="anonymous"></script>
+<link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-twitter-1.0.css" crossorigin="anonymous">
+```
+
+### Example
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-twitter-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-twitter-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-twitter-1.0.css"
+    />
+    <style>
+      bento-twitter {
+        width: 375px;
+        height: 472px;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-twitter id="my-tweet" data-tweetid="885634330868850689"></bento-twitter>
+  </body>
+</html>
+```
+
+### Layout and style
+
+Each Bento component has a small CSS library you must include to guarantee proper loading without [content shifts](https://web.dev/cls/). Because of order-based specificity, you must manually ensure that stylesheets are included before any custom styles.
+
+```html
+<link
+  rel="stylesheet"
+  type="text/css"
+  href="https://cdn.ampproject.org/v0/bento-twitter-1.0.css"
+/>
+```
+
+Alternatively, you may also make the light-weight pre-upgrade styles available inline:
+
+```html
+<style>
+  bento-twitter {
+    display: block;
+    overflow: hidden;
+    position: relative;
+  }
+</style>
+```
+
+#### Container type
+
+The `bento-twitter` component has a defined layout size type. To ensure the component renders correctly, be sure to apply a size to the component and its immediate children (slides) via a desired CSS layout (such as one defined with `height`, `width`, `aspect-ratio`, or other such properties):
+
+```css
+bento-twitter {
+  height: 100px;
+  width: 100%;
+}
+```
+
+### Attributes
+
+<table>
+  <tr>
+    <td width="40%"><strong>data-tweetid / data-momentid / data-timeline-source-type (required)</strong></td>
+    <td>The ID of the Tweet or Moment, or the source type if a Timeline should be displayed.
+In a URL like https://twitter.com/joemccann/status/640300967154597888, <code>640300967154597888</code> is the tweet id.
+In a URL like https://twitter.com/i/moments/1009149991452135424, <code>1009149991452135424</code> is the moment id.
+Valid timeline source types include <code>profile</code>, <code>likes</code>, <code>list</code>, <code>collection</code>, <code>url</code>, and <code>widget</code>.</td>
+  </tr>
+  <tr>
+    <td width="40%"><strong>data-timeline-* (optional)</strong></td>
+    <td>When displaying a timeline, further arguments need to be provided in addition to <code>timeline-source-type</code>. For example, <code>data-timeline-screen-name="amphtml"</code> in combination with <code>data-timeline-source-type="profile"</code> will display a timeline of the AMP Twitter account.
+For details on the available arguments, see the "Timelines" section in <a href="https://developer.twitter.com/en/docs/twitter-for-websites/javascript-api/guides/scripting-factory-functions">Twitter's JavaScript Factory Functions Guide</a>.</td>
+  </tr>
+  <tr>
+    <td width="40%"><strong>data-* (optional)</strong></td>
+    <td>You can specify options for the Tweet, Moment, or Timeline appearance by setting <code>data-</code> attributes. For example, <code>data-cards="hidden"</code> deactivates Twitter cards.
+For details on the available options, see Twitter's docs <a href="https://developer.twitter.com/en/docs/twitter-for-websites/embedded-tweets/guides/embedded-tweet-parameter-reference">for tweets</a>, <a href="https://developer.twitter.com/en/docs/twitter-for-websites/moments/guides/parameter-reference0">for moments</a> and <a href="https://developer.twitter.com/en/docs/twitter-for-websites/timelines/guides/parameter-reference">for timelines</a>.</td>
+  </tr>
+   <tr>
+    <td width="40%"><strong>title (optional)</strong></td>
+    <td>Define a <code>title</code> attribute for the component. The default is <code>Twitter</code>.</td>
+  </tr>
+</table>
+
+### Interactivity and API usage
+
+Programmatically changing any of the attribute values will automatically update the element. For example, changing the tweet id via `data-tweetid` will automatically load the new tweet:
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-twitter-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-twitter-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-twitter-1.0.css"
+    />
+    <style>
+      bento-twitter {
+        width: 375px;
+        height: 472px;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-twitter id="my-tweet" data-tweetid="885634330868850689">
+    </bento-twitter>
+    <div class="buttons" style="margin-top: 8px">
+      <button id="change-tweet">Change tweet</button>
+    </div>
+
+    <script>
+      (async () => {
+        const twitter = document.querySelector('#my-tweet');
+
+        // set up button actions
+        document.querySelector('#change-tweet').onclick = () => {
+          twitter.setAttribute('data-tweetid', '495719809695621121');
+        };
+      })();
+    </script>
+  </body>
+</html>
+```
+
+---
+
+## Preact/React Component
+
+### Import via npm
+
+```sh
+npm install @bentoproject/twitter
+```
+
+```javascript
+import React from 'react';
+import {BentoTwitter} from '@bentoproject/twitter/react';
+import '@bentoproject/twitter/styles.css';
+
+function App() {
+  return <BentoTwitter tweetid="1356304203044499462"></BentoTwitter>;
+}
+```
+
+### Layout and style
+
+#### Container type
+
+The `BentoTwitter` component has a defined layout size type. To ensure the component renders correctly, be sure to apply a size to the component and its immediate children (slides) via a desired CSS layout (such as one defined with `height`, `width`, `aspect-ratio`, or other such properties). These can be applied inline:
+
+```jsx
+<BentoTwitter
+  style={{width: 300, height: 100}}
+  tweetid="1356304203044499462"
+></BentoTwitter>
+```
+
+Or via `className`:
+
+```jsx
+<BentoTwitter
+  className="custom-styles"
+  tweetid="1356304203044499462"
+></BentoTwitter>
+```
+
+```css
+.custom-styles {
+  height: 100px;
+  width: 100%;
+}
+```
+
+## Props
+
+<table>
+  <tr>
+    <td width="40%"><strong>tweetid / momentid / timelineSourceType (required)</strong></td>
+    <td>The ID of the Tweet or Moment, or the source type if a Timeline should be displayed.
+In a URL like https://twitter.com/joemccann/status/640300967154597888, <code>640300967154597888</code> is the tweet id.
+In a URL like https://twitter.com/i/moments/1009149991452135424, <code>1009149991452135424</code> is the moment id.
+Valid timeline source types include <code>profile</code>, <code>likes</code>, <code>list</code>, <code>collection</code>, <code>url</code>, and <code>widget</code>.</td>
+  </tr>
+  <tr>
+    <td width="40%"><strong>card / conversations (optional)</strong></td>
+    <td>When displaying a tweet, further arguments can be provided in addition to <code>tweetid</code>. For example, <code>cards="hidden"</code> in combination with <code>conversation="none"</code> will display a tweet without additional thumbnails or comments.</td>
+  </tr>
+  <tr>
+    <td width="40%"><strong>limit (optional)</strong></td>
+    <td>When displaying a moment, further arguments can be provided in addition to <code>moment</code>. For example, <code>limit="5"</code> will display an embedded moment with up to five cards.</td>
+  </tr>
+  <tr>
+    <td width="40%"><strong>timelineScreenName / timelineUserId (optional)</strong></td>
+    <td>When displaying a timeline, further arguments can be provided in addition to <code>timelineSourceType</code>. For example, <code>timelineScreenName="amphtml"</code> in combination with <code>timelineSourceType="profile"</code> will display a timeline of the AMP Twitter account.</td>
+  </tr>
+  <tr>
+    <td width="40%"><strong>options (optional)</strong></td>
+    <td>You can specify options for the Tweet, Moment, or Timeline appearance by passing in an object to the <code>options</code> prop.
+For details on the available options, see Twitter's docs <a href="https://developer.twitter.com/en/docs/twitter-for-websites/embedded-tweets/guides/embedded-tweet-parameter-reference">for tweets</a>, <a href="https://developer.twitter.com/en/docs/twitter-for-websites/moments/guides/parameter-reference0">for moments</a> and <a href="https://developer.twitter.com/en/docs/twitter-for-websites/timelines/guides/parameter-reference">for timelines</a>. Note: When passing in the `options` prop, make sure to optimize or memoize the object:
+<pre><code>const TWITTER_OPTIONS = {
+  // make sure to define these once globally!
+};
+function MyComponent() {
+  // etc
+  return (
+    &ltTwitter optionsProps={TWITTER_OPTIONS} /&gt;
+  );
+}</code></pre></td>
+
+  </tr>
+   <tr>
+    <td width="40%"><strong>title (optional)</strong></td>
+    <td>Define a <code>title</code> for the component iframe. The default is <code>Twitter</code>.</td>
+  </tr>
+</table>
diff --git a/src/bento/components/bento-twitter/1.0/base-element.js b/src/bento/components/bento-twitter/1.0/base-element.js
new file mode 100644
index 000000000000..0cf5193b048b
--- /dev/null
+++ b/src/bento/components/bento-twitter/1.0/base-element.js
@@ -0,0 +1,27 @@
+import {PreactBaseElement} from '#preact/base-element';
+import {createParseAttrsWithPrefix} from '#preact/parse-props';
+
+import {BentoTwitter} from './component';
+
+export class BaseElement extends PreactBaseElement {}
+
+/** @override */
+BaseElement['Component'] = BentoTwitter;
+
+/** @override */
+BaseElement['props'] = {
+  'title': {attr: 'title'}, // Needed for Preact component
+  // TODO(wg-components): Current behavior defaults to loading="auto".
+  // Refactor to make loading="lazy" as the default.
+  'loading': {attr: 'data-loading'},
+  'options': createParseAttrsWithPrefix('data-'), // Needed to render componoent upon mutation
+};
+
+/** @override */
+BaseElement['layoutSizeDefined'] = true;
+
+/** @override */
+BaseElement['usesShadowDom'] = true;
+
+/** @override */
+BaseElement['loadable'] = true;
diff --git a/src/bento/components/bento-twitter/1.0/bento-twitter.css b/src/bento/components/bento-twitter/1.0/bento-twitter.css
new file mode 100644
index 000000000000..9cb589817aab
--- /dev/null
+++ b/src/bento/components/bento-twitter/1.0/bento-twitter.css
@@ -0,0 +1,22 @@
+/*
+ * Pre-upgrade:
+ * - display:block element
+ * - size-defined element
+ */
+bento-twitter {
+  display: block;
+  overflow: hidden;
+  position: relative;
+}
+
+/* Pre-upgrade: size-defining element - hide text. */
+bento-twitter:not(.i-amphtml-built) {
+  color: transparent !important;
+}
+
+/* Pre-upgrade: size-defining element - hide children. */
+bento-twitter:not(.i-amphtml-built)
+  > :not([placeholder]):not([slot='i-amphtml-svc']) {
+  display: none;
+  content-visibility: hidden;
+}
diff --git a/src/bento/components/bento-twitter/1.0/component.js b/src/bento/components/bento-twitter/1.0/component.js
new file mode 100644
index 000000000000..2c2548932055
--- /dev/null
+++ b/src/bento/components/bento-twitter/1.0/component.js
@@ -0,0 +1,108 @@
+import {MessageType_Enum, deserializeMessage} from '#core/3p-frame-messaging';
+
+import * as Preact from '#preact';
+import {useCallback, useMemo, useState} from '#preact';
+import {forwardRef} from '#preact/compat';
+import {useValueRef} from '#preact/component';
+import {ProxyIframeEmbed} from '#preact/component/3p-frame';
+
+/** @const {string} */
+const TYPE = 'twitter';
+const FULL_HEIGHT = '100%';
+const MATCHES_MESSAGING_ORIGIN = () => true;
+
+/**
+ * @param {!BentoTwitterDef.Props} props
+ * @param {{current: (!BentoTwitterDef.Api|null)}} ref
+ * @return {PreactDef.Renderable}
+ */
+function BentoTwitterWithRef(
+  {
+    cards,
+    conversation,
+    limit,
+    momentid,
+    onError,
+    onLoad,
+    options: optionsProps,
+    requestResize,
+    style,
+    timelineScreenName,
+    timelineSourceType,
+    timelineUserId,
+    title,
+    tweetLimit,
+    tweetid,
+    ...rest
+  },
+  ref
+) {
+  const [height, setHeight] = useState(null);
+  const onLoadRef = useValueRef(onLoad);
+  const onErrorRef = useValueRef(onError);
+
+  const messageHandler = useCallback(
+    (event) => {
+      const data = deserializeMessage(event.data);
+      if (data['type'] == MessageType_Enum.EMBED_SIZE) {
+        const height = data['height'];
+        if (requestResize) {
+          requestResize(height);
+          setHeight(FULL_HEIGHT);
+        } else {
+          setHeight(height);
+        }
+
+        onLoadRef.current?.();
+      } else if (data['type'] === MessageType_Enum.NO_CONTENT) {
+        onErrorRef.current?.();
+      }
+    },
+    [requestResize, onLoadRef, onErrorRef]
+  );
+  const options = useMemo(
+    () => ({
+      cards,
+      conversation,
+      limit,
+      momentid,
+      timelineScreenName,
+      timelineSourceType,
+      timelineUserId,
+      tweetLimit,
+      tweetid,
+      ...optionsProps,
+    }),
+    [
+      cards,
+      conversation,
+      limit,
+      momentid,
+      optionsProps,
+      timelineScreenName,
+      timelineSourceType,
+      timelineUserId,
+      tweetLimit,
+      tweetid,
+    ]
+  );
+
+  return (
+    <ProxyIframeEmbed
+      allowfullscreen
+      ref={ref}
+      title={title}
+      {...rest}
+      // non-overridable props
+      matchesMessagingOrigin={MATCHES_MESSAGING_ORIGIN}
+      messageHandler={messageHandler}
+      options={options}
+      type={TYPE}
+      style={height ? {...style, height} : style}
+    />
+  );
+}
+
+const BentoTwitter = forwardRef(BentoTwitterWithRef);
+BentoTwitter.displayName = 'BentoTwitter'; // Make findable for tests.
+export {BentoTwitter};
diff --git a/extensions/amp-twitter/1.0/component.type.js b/src/bento/components/bento-twitter/1.0/component.type.js
similarity index 100%
rename from extensions/amp-twitter/1.0/component.type.js
rename to src/bento/components/bento-twitter/1.0/component.type.js
diff --git a/src/bento/components/bento-twitter/OWNERS b/src/bento/components/bento-twitter/OWNERS
new file mode 100644
index 000000000000..77a55ee52b28
--- /dev/null
+++ b/src/bento/components/bento-twitter/OWNERS
@@ -0,0 +1,10 @@
+// For an explanation of the OWNERS rules and syntax, see:
+// https://github.com/ampproject/amp-github-apps/blob/main/owners/OWNERS.example
+
+{
+  rules: [
+    {
+      owners: [{name: 'ampproject/wg-components'}],
+    },
+  ],
+}
diff --git a/src/bento/components/bento-twitter/bento-twitter.md b/src/bento/components/bento-twitter/bento-twitter.md
new file mode 100644
index 000000000000..e1ba56bd51c2
--- /dev/null
+++ b/src/bento/components/bento-twitter/bento-twitter.md
@@ -0,0 +1,141 @@
+---
+$category@: social
+formats:
+  - websites
+teaser:
+  text: Displays a Twitter Tweet or Moment.
+experimental: true
+bento: true
+---
+
+# bento-twitter
+
+## Behavior
+
+The `bento-twitter` component allows you to embed a Tweet or Moment.
+
+Here's an example of a basic embedded Tweet:
+
+[example preview="inline" playground="true" imports="bento-twitter" imports="bento-twitter"]
+
+```html
+<bento-twitter
+  width="375"
+  height="472"
+  layout="responsive"
+  data-tweetid="885634330868850689"
+>
+</bento-twitter>
+```
+
+[/example]
+
+### Standalone use outside valid AMP documents
+
+Bento allows you to use AMP components in non-AMP pages without needing
+to commit to fully valid AMP. You can take these components and place them
+in implementations with frameworks and CMSs that don't support AMP. Read
+more in our guide [Use AMP components in non-AMP pages](https://amp.dev/documentation/guides-and-tutorials/start/bento_guide/).
+
+To find the standalone version of `bento-twitter`, see [**`bento-twitter`**](./1.0/README.md).
+
+## Appearance
+
+Twitter does not currently provide an API that yields fixed aspect ratio for embedded Tweets or Moments. Currently, AMP automatically proportionally scales the Tweet or Moment to fit the provided size, but this may yield less than ideal appearance. You might need to manually tweak the provided width and height. Also, you can use the `media` attribute to select the aspect ratio based on the screen width.
+
+## Placeholders & fallbacks
+
+An element marked with a `placeholder` attribute displays while the content for the Tweet or Moment is loading or initializing. Placeholders are hidden once the AMP component's content displays. An element marked with a `fallback` attribute displays if `bento-twitter` isn't supported by the browser or if the Tweet or Moment doesn't exist or has been deleted.
+
+Visit the [Placeholders & fallbacks](https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/placeholders) guide to learn more about how placeholders and fallbacks interact for the `bento-twitter` component.
+
+_Example: Specifying a placeholder_
+
+[example preview="inline" playground="true" imports="bento-twitter" imports="bento-twitter"]
+
+```html
+<bento-twitter
+  width="375"
+  height="472"
+  layout="responsive"
+  data-tweetid="638793490521001985"
+>
+  <blockquote placeholder>
+    <p>
+      I only needed to change some CSS.
+      <a href="http://t.co/LvjLbjgY9F">pic.twitter.com/LvjLbjgY9F</a>
+    </p>
+    &mdash; Malte Ubl (@cramforce)
+    <a href="https://twitter.com/cramforce/status/638793490521001985"
+      >September 1, 2015</a
+    >
+  </blockquote>
+</bento-twitter>
+```
+
+[/example]
+
+_Example: Specifying a placeholder and a fallback_
+
+[example preview="inline" playground="true" imports="bento-twitter" imports="bento-twitter"]
+
+```html
+<bento-twitter
+  width="390"
+  height="330"
+  layout="responsive"
+  data-tweetid="855178606556856320"
+>
+  <blockquote placeholder>
+    <p>
+      What are 5 common misconceptions people often have about AMP? Find out on
+      today&#39;s installment of Amplify:
+      <a href="https://t.co/kaSvV8SQtI">https://t.co/kaSvV8SQtI</a>
+      <a href="https://t.co/Cu9VYOmiKV">pic.twitter.com/Cu9VYOmiKV</a>
+    </p>
+    &mdash; AMP Project (@AMPhtml)
+    <a href="https://twitter.com/AMPhtml/status/855178606556856320"
+      >April 20, 2017</a
+    >
+  </blockquote>
+  <div fallback>
+    An error occurred while retrieving the Tweet. It might have been deleted.
+  </div>
+</bento-twitter>
+```
+
+[/example]
+
+## Attributes
+
+<table>
+  <tr>
+    <td width="40%"><strong>data-tweetid / data-momentid / data-timeline-source-type (required)</strong></td>
+    <td>The ID of the Tweet or Moment, or the source type if a Timeline should be displayed.
+In a URL like https://twitter.com/joemccann/status/640300967154597888, <code>640300967154597888</code> is the tweet id.
+In a URL like https://twitter.com/i/moments/1009149991452135424, <code>1009149991452135424</code> is the moment id.
+Valid timeline source types include <code>profile</code>, <code>likes</code>, <code>list</code>, <code>collection</code>, <code>url</code>, and <code>widget</code>.</td>
+  </tr>
+  <tr>
+    <td width="40%"><strong>data-timeline-* (optional)</strong></td>
+    <td>When displaying a timeline, further arguments need to be provided in addition to <code>timeline-source-type</code>. For example, <code>data-timeline-screen-name="amphtml"</code> in combination with <code>data-timeline-source-type="profile"</code> will display a timeline of the AMP Twitter account.
+For details on the available arguments, see the "Timelines" section in <a href="https://developer.twitter.com/en/docs/twitter-for-websites/javascript-api/guides/scripting-factory-functions">Twitter's JavaScript Factory Functions Guide</a>.</td>
+  </tr>
+  <tr>
+    <td width="40%"><strong>data-* (optional)</strong></td>
+    <td>You can specify options for the Tweet, Moment, or Timeline appearance by setting <code>data-</code> attributes. For example, <code>data-cards="hidden"</code> deactivates Twitter cards.
+For details on the available options, see Twitter's docs <a href="https://developer.twitter.com/en/docs/twitter-for-websites/embedded-tweets/guides/embedded-tweet-parameter-reference">for tweets</a>, <a href="https://developer.twitter.com/en/docs/twitter-for-websites/moments/guides/parameter-reference0">for moments</a> and <a href="https://developer.twitter.com/en/docs/twitter-for-websites/timelines/guides/parameter-reference">for timelines</a>.</td>
+  </tr>
+   <tr>
+    <td width="40%"><strong>title (optional)</strong></td>
+    <td>Define a <code>title</code> attribute for the component. The default is <code>Twitter</code>.</td>
+  </tr>
+  <tr>
+    <td width="40%"><strong>common attributes</strong></td>
+    <td>This element includes <a href="https://amp.dev/documentation/guides-and-tutorials/learn/common_attributes">common attributes</a> extended to AMP components.</td>
+  </tr>
+</table>
+
+## Validation
+
+See [bento-twitter rules](https://github.com/ampproject/amphtml/blob/main/extensions/amp-twitter/validator-amp-twitter.protoascii) in the AMP validator specification.
diff --git a/src/bento/components/bento-video-iframe/1.0/amp-video-iframe.css b/src/bento/components/bento-video-iframe/1.0/amp-video-iframe.css
new file mode 100644
index 000000000000..8167e9b15e4c
--- /dev/null
+++ b/src/bento/components/bento-video-iframe/1.0/amp-video-iframe.css
@@ -0,0 +1,17 @@
+/*
+ * Pre-upgrade:
+ * - display:block element
+ * - size-defined element
+ */
+bento-video-iframe {
+  display: block;
+  overflow: hidden;
+  position: relative;
+}
+
+/* Pre-upgrade: size-defining element - hide children. */
+bento-video-iframe:not(.i-amphtml-built)
+  > :not([placeholder]):not([slot='i-amphtml-svc']) {
+  display: none;
+  content-visibility: hidden;
+}
diff --git a/src/bento/components/bento-video-iframe/1.0/base-element.js b/src/bento/components/bento-video-iframe/1.0/base-element.js
new file mode 100644
index 000000000000..68816ff8ee20
--- /dev/null
+++ b/src/bento/components/bento-video-iframe/1.0/base-element.js
@@ -0,0 +1,31 @@
+import {BentoVideoBaseElement} from '#bento/components/bento-video/1.0/base-element';
+
+import {BentoVideoIframe} from './component';
+
+export class BaseElement extends BentoVideoBaseElement {}
+
+/** @override */
+BaseElement['Component'] = BentoVideoIframe;
+
+/** @override */
+BaseElement['props'] = {
+  'autoplay': {attr: 'autoplay', type: 'boolean'},
+  'referrerpolicy': {attr: 'referrerpolicy'},
+  'implements-media-session': {attr: 'mediasession', type: 'boolean'},
+  'poster': {attr: 'poster'},
+  'src': {attr: 'src'},
+  'controls': {attr: 'controls', type: 'boolean'},
+  // TODO(wg-components): Current behavior defaults to loading="auto".
+  // Refactor to make loading="lazy" as the default.
+  'loading': {attr: 'data-loading'},
+
+  // TODO(alanorozco): These props have no internal implementation yet.
+  'dock': {attr: 'dock'},
+  'rotate-to-fullscreen': {attr: 'rotate-to-fullscreen', type: 'boolean'},
+};
+
+/** @override */
+BaseElement['usesShadowDom'] = true;
+
+/** @override */
+BaseElement['loadable'] = true;
diff --git a/src/bento/components/bento-video-iframe/1.0/component.js b/src/bento/components/bento-video-iframe/1.0/component.js
new file mode 100644
index 000000000000..152cedf80309
--- /dev/null
+++ b/src/bento/components/bento-video-iframe/1.0/component.js
@@ -0,0 +1,2 @@
+// Expose from package as BentoVideoIframe
+export {VideoIframe as BentoVideoIframe} from '#bento/components/bento-video/1.0/video-iframe';
diff --git a/src/bento/components/bento-video-iframe/OWNERS b/src/bento/components/bento-video-iframe/OWNERS
new file mode 100644
index 000000000000..77a55ee52b28
--- /dev/null
+++ b/src/bento/components/bento-video-iframe/OWNERS
@@ -0,0 +1,10 @@
+// For an explanation of the OWNERS rules and syntax, see:
+// https://github.com/ampproject/amp-github-apps/blob/main/owners/OWNERS.example
+
+{
+  rules: [
+    {
+      owners: [{name: 'ampproject/wg-components'}],
+    },
+  ],
+}
diff --git a/src/bento/components/bento-video-iframe/bento-video-iframe.md b/src/bento/components/bento-video-iframe/bento-video-iframe.md
new file mode 100644
index 000000000000..e73ded339b3b
--- /dev/null
+++ b/src/bento/components/bento-video-iframe/bento-video-iframe.md
@@ -0,0 +1,520 @@
+---
+$category@: media
+formats:
+  - websites
+teaser:
+  text: Embeds an iframe containing a video player.
+---
+
+# bento-video-iframe
+
+## When should I use this?
+
+This component is useful if you've built your own Javascript-based
+video player and would like to embed it in an AMP document, or if your player is provided by a third party not
+supported by the AMP component library.
+
+1. If you'd like to **include a video directly on the AMP document**, you should use [`amp-video`](https://amp.dev/documentation/components/amp-video).
+
+2. If you're using a **common 3rd party** like Youtube, Vimeo or [others supported in AMP](../../../../docs/spec/amp-video-interface.md), you should use their supported component (e.g. [`amp-youtube`](https://amp.dev/documentation/components/amp-youtube), [`amp-vimeo`](https://amp.dev/documentation/components/amp-vimeo)).
+
+3. If you've built a **custom player** or are using one provided by an **unsupported 3rd party**, **you should use `bento-video-iframe`**. This is different from using [`amp-iframe`](https://amp.dev/documentation/components/amp-iframe) in that it enables
+   [Video Features on AMP](../../../../docs/spec/amp-video-interface.md). See [behavior](#behavior) below for more details.
+
+4. If you're a **3rd party video vendor**, **you can use `bento-video-iframe`** to [provide a simple way for authors to embed video.](#third-party-video-vendors)
+
+## Behavior
+
+`bento-video-iframe` has several important differences from vanilla iframes and `amp-iframe`.
+
+-   By default, an `bento-video-iframe` is sandboxed.
+
+-   `bento-video-iframe` implements all [Video Features](../../../../docs/spec/amp-video-interface.md), like autoplay, minimize-to-corner and rotate-to-fullscreen.
+
+-   `bento-video-iframe` must only request resources via HTTPS.
+
+-   `bento-video-iframe` is not scrollable.
+
+In short, `bento-video-iframe` plugs AMP video features into an embedded document that hosts a video player.
+
+## Usage of bento-video-iframe for advertising
+
+`bento-video-iframe` **must not** be used for the primary purpose of displaying advertising. It is OK to use `bento-video-iframe` for the purpose of displaying videos, where part of the videos are advertising. This AMP policy may be enforced by not rendering the respective iframes.
+
+Advertising use cases should use [`amp-ad`](https://amp.dev/documentation/components/amp-ad) instead.
+
+The reasons for this policy are that:
+
+-   `bento-video-iframe` enforces sandboxing and the sandbox is also applied to child iframes. This means landing pages may be broken, even if the ad itself appears to work.
+
+-   `bento-video-iframe` has no controlled resize mechanism.
+
+## Attributes
+
+<table>
+  <tr>
+    <td width="40%"><strong>src (required)</strong></td>
+    <td>The <code>src</code> attribute behaves mainly like on a standard iframe with one exception: the <code>#amp=1</code> fragment is added to the URL to allow
+source documents to know that they are embedded in the AMP context. This fragment is only added if the URL specified by <code>src</code> does
+not already have a fragment.</td>
+  </tr>
+  <tr>
+    <td width="40%"><strong>poster</strong></td>
+    <td>URL to an image displayed while the video loads. <strong>It's recommended to always set this attribute for best perceived performance.</strong></td>
+  </tr>
+  <tr>
+    <td width="40%"><strong>autoplay</strong></td>
+    <td>If this attribute is present, and the browser supports autoplay, the video will be automatically
+played as soon as it becomes visible. There are some conditions that the component needs to meet
+to be played, <a href="https://github.com/ampproject/amphtml/blob/main/docs/spec/amp-video-interface.md#autoplay">which are outlined in the Video in AMP spec</a>.</td>
+  </tr>
+  <tr>
+    <td width="40%"><strong>common attributes</strong></td>
+    <td>This element includes <a href="https://amp.dev/documentation/guides-and-tutorials/learn/common_attributes">common attributes</a> extended to AMP components.</td>
+  </tr>
+  <tr>
+    <td width="40%"><strong>dock</strong></td>
+    <td><strong>Requires <code>amp-video-docking</code> extension.</strong> If this attribute is present and the video is playing manually, the video will be "minimized" and fixed to a corner or an element when the user scrolls out of the video component's visual area.
+    For more details, see <a href="https://amp.dev/documentation/components/amp-video-docking">documentation on the docking extension itself.</a></td>
+  </tr>
+  <tr>
+    <td width="40%"><strong>implements-media-session</strong></td>
+    <td>Set this attribute if the document inside the iframe implements the <a href="https://developer.mozilla.org/en-US/docs/Web/API/Media_Session_API">MediaSession API</a> independently.</td>
+  </tr>
+  <tr>
+    <td width="40%"><strong>implements-rotate-to-fullscreen</strong></td>
+    <td>Set this attribute if the document inside the iframe implements rotate-to-fullscreen independently.</td>
+  </tr>
+  <tr>
+    <td width="40%"><strong>referrerpolicy</strong></td>
+    <td>The <a href="https://developer.mozilla.org/en-US/docs/Web/API/HTMLIFrameElement/referrerPolicy"><code>referrerpolicy</code></a> to be set on the iframe element.</td>
+  </tr>
+  <tr>
+    <td width="40%"><a id="data-param"></a><strong>data-param-*</strong></td>
+    <td>
+      All <code>data-param-*</code> attributes are added as query parameters
+      to the iframe's <code>src</code>. They may be used to pass custom values
+      through to the player document.<br />
+      Keys and values will be URI encoded. Keys will be camel cased.
+      <ul>
+        <li><code>data-param-foo="bar"</code> becomes <code>&foo=bar</code></li>
+        <li>
+          <code>data-param-channel-id="SOME_VALUE"</code> becomes
+          <code>&channelId=SOME_VALUE</code>
+        </li>
+      </ul>
+    </td>
+  </tr>
+</table>
+
+## Usage
+
+Include an `bento-video-iframe` on your AMP document:
+
+```html
+<bento-video-iframe
+  layout="responsive"
+  width="16"
+  height="9"
+  src="/my-video-player.html"
+  poster="/my-video-poster.jpg"
+>
+</bento-video-iframe>
+```
+
+`my-video-player.html` is the inner document loaded inside the frame that plays the video. This document must include and bootstrap [an integration script](#integration-inside-the-frame) so that the AMP document including the `<bento-video-iframe>` can coordinate the video's playback.
+
+### Third-party video vendors
+
+If you're a vendor that does _not_ provide a [custom video player component](../../../../docs/spec/amp-video-interface.md), you can integrate with AMP in the form of an `bento-video-iframe` configuration, so authors can embed video provided through your service.
+
+Note: For most video providers, `bento-video-iframe` provides enough tools for common playback actions (see [methods](#method) and [events](#postEvent)). Refer to the [vendor player spec](../../../../docs/spec/amp-3p-video.md) for more details on whether you can use `bento-video-iframe` or you should build a third-party player component instead.
+
+As a vendor, you can serve a generic [integration document](#integration-inside-the-frame) that references provided videos via URL parameters. AMP authors who use your video service only need to include an `<bento-video-iframe>` tag in their documents:
+
+```html
+<!--
+  data-param-* attributes are added to src and poster, so this would use the
+  following composed urls:
+
+  src: https://vendor.example/bento-video-iframe
+      ?videoid=MY_VIDEO_ID
+      &channelid=MY_CHANNEL_ID
+
+  poster: https://vendor.example/poster.jpg
+      ?videoid=MY_VIDEO_ID
+      &channelid=MY_CHANNEL_ID
+-->
+<bento-video-iframe
+  layout="responsive"
+  width="16"
+  height="9"
+  src="https://vendor.example/bento-video-iframe"
+  poster="https://vendor.example/poster.jpg"
+  data-param-videoid="MY_VIDEO_ID"
+  data-param-channelid="MY_CHANNEL_ID"
+>
+</bento-video-iframe>
+```
+
+The `src` and `poster` URLs are appended with [`data-param-*` attributes as query string](#data-param).
+
+The `/bento-video-iframe` document bootstraps the [integration script](#integration-inside-the-frame) so that the AMP document can coordinate with the player.
+
+Note: If you're a vendor hosting an integration document, feel free to [contribute a code sample to this page,](https://github.com/ampproject/amphtml/blob/main/extensions/amp-video-iframe/amp-video-iframe.md) specifying your provided
+`src` and usable `data-param-*` attributes.
+
+## Integration inside the frame
+
+In order for the video integration to work, the embedded document (e.g. `my-video-player.html`) must include a small library:
+
+```html
+<script
+  async
+  src="https://cdn.ampproject.org/video-iframe-integration-v0.js"
+></script>
+
+<!-- Wait for API to initialize -->
+<script>
+  (window.AmpVideoIframe = window.AmpVideoIframe || []).push(
+    onAmpIntegrationReady
+  );
+
+  function onAmpIntegrationReady(ampIntegration) {
+    // `ampIntegration` is an object containing the tools required to integrate.
+    // This callback specifies how the AMP document and the iframed video document
+    // talk to each other.
+    // YOU NEED TO IMPLEMENT THIS. See below.
+  }
+</script>
+```
+
+Note that this library is separate from the extension code (`bento-video-iframe-0.1.js`), because
+it lives on the non-AMP document that is iframed.
+
+The provided callback specifies how the AMP document and the iframed video document talk to each other. You need to implement a set of
+playback methods and event dispatchers to plug these together. For common video frameworks, the integration script
+[provides readymade playback support](#readymade-integrations), but you can also [write a custom integration yourself](#custom-integrations) if you don't use any of the tools for which support is available.
+
+{% call callout('Do not autoplay yourself', type='caution') %}
+**Never play the video inside the frame automatically.** Instead, you should support the integration script and use the `bento-video-iframe` tag with the `autoplay` attribute. The AMP component will automatically send the necessary signals to your iframe to autoplay for a better user experience.
+{% endcall %}
+
+### Readymade integrations
+
+If you're using a common video framework like [JW Player](https://www.jwplayer.com/) or [Video.js](http://videojs.com/), you can call **`listenTo()`** for a basic, readymade integration. These integrations support all playback and UI controls when the framework provides them, see each for supported methods.
+
+{% call callout('Framework APIs', type='note') %}
+Depending on which video framework you use, you'll call the `listenTo` method differently. Read on the specific APIs below.
+{% endcall %}
+
+{% call callout('Expanded support', type='note') %}
+You can additionally use [custom integration methods](#custom-integrations) if you require a feature not available in readymade implementations.
+{% endcall %}
+
+##### For JW Player
+
+**Default supported events:** `ad_end`/`ad_start`, `canplay`, `error`, `muted`/`unmuted`, `pause`/`playing`
+
+**Default supported methods:** `pause`/`play`, `mute`/`unmute`, `hidecontrols`/`showcontrols`, `fullscreenenter`/`fullscreenexit`
+
+The `amp` object knows how to setup a JwPlayer instance by using `listenTo('jwplayer')`.
+If you're embedding your player [using a video-specific script](https://support.jwplayer.com/articles/how-to-embed-a-jwplayer), you only need to register Jwplayer usage:
+
+```html
+<script src="https://cdn.jwplayer.com/players/UVQWMA4o-kGWxh33Q.js"></script>
+<script>
+  (window.AmpVideoIframe = window.AmpVideoIframe || []).push(function (
+    ampIntegration
+  ) {
+    ampIntegration.listenTo('jwplayer');
+  });
+</script>
+```
+
+Otherwise, pass in your [JwPlayer instance](https://developer.jwplayer.com/jwplayer/docs/jw8-javascript-api-reference)
+through the signature `amp.listenTo('jwplayer', instance)`:
+
+```js
+(window.AmpVideoIframe = window.AmpVideoIframe || []).push(function (
+  ampIntegration
+) {
+  ampIntegration.listenTo('jwplayer', jwplayer('my-video'));
+});
+```
+
+##### For Video.js
+
+**Default supported events:** `canplay`, `ended`, `muted`/`unmuted`, `pause`/`playing`
+
+**Default supported methods:** `pause`/`play`, `mute`/`unmute`, `hidecontrols`/`showcontrols`, `fullscreenenter`/`fullscreenexit`
+
+Pass in your [`<video>` element](https://docs.videojs.com/docs/api/player.html)
+through the signature `ampIntegration.listenTo('videojs', myVideo)`. Video.js overloads this element to provide methods
+that the `ampIntegration` object uses to setup the player.
+
+```js
+function onAmpIntegrationReady(ampIntegration) {
+  var myVideo = document.querySelector('#my-video');
+  ampIntegration.listenTo('videojs', myVideo);
+}
+```
+
+`listenTo` initializes the Video.js instance on the `<video>` element if required. This uses the global `videojs` function by default. If your page provides the initializer differently, you must pass it in as the third argument:
+
+```js
+function onAmpIntegrationReady(ampIntegration) {
+  var myVideo = document.querySelector('#my-video');
+
+  // ampIntegration initializes player with `myVideojsInitializer(myVideo)`
+  ampIntegration.listenTo('videojs', myVideo, myVideojsInitializer);
+}
+```
+
+### Custom integrations
+
+If you don't use any of the [video frameworks supported by default](#readymade-integrations), you must write a custom implementation to talk to AMP's video management.
+
+These are the communication methods available:
+
+-   [`method`](#method) to control playback.
+-   [`postEvent`](#postEvent) to inform the host document about playback events.
+-   [`getIntersection`](#getIntersection) to get video's viewability on the host document.
+-   [`getMetadata`](#getMetadata) to get information about the host document.
+
+If you use a supported framework, it's possible to have more fine-grained control over the default implementation by using these same methods.
+
+#### <a name="method"></a> `method(name, callback)`
+
+Implements a method that calls playback functions on the video. For example:
+
+```js
+ampIntegration.method('play', function () {
+  myVideo.play();
+});
+```
+
+These are methods that should be implemented:
+
+-   `play`
+-   `pause`
+-   `mute`
+-   `unmute`
+-   `showcontrols`
+-   `hidecontrols`
+-   `fullscreenenter`
+-   `fullscreenexit`
+
+You can choose to only implement this interface partially, with a few caveats:
+
+-   `play` and `pause` are required for either/both of playback [actions](https://amp.dev/documentation/guides-and-tutorials/learn/amp-actions-and-events/) or autoplay.
+
+-   `mute` and `unmute` are required for autoplay.
+
+-   `showcontrols` and `hidecontrols` are required for the best possible UX. For
+    example, when minimizing the video to the corner, a custom controls overlay is
+    shown. If you don't provide methods to hide and show controls, two sets of
+    controls could be displayed at the same time, which is a poor user experience.
+
+-   `fullscreenenter` and `fullscreenexit` are required for best possible UX. For
+    example, for `rotate-to-fullscreen` or the fullscreen button on minimized
+    video.
+
+#### <a name="postEvent"></a> `postEvent(name)`
+
+Posts a playback event to the frame. For example:
+
+```js
+myVideoElement.addEventListener('pause', function () {
+  ampIntegration.postEvent('pause');
+});
+```
+
+The valid events are as follows.
+
+<table>
+  <thead>
+    <tr>
+      <td>Event</td>
+      <td>Description</td>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td><code>canplay</code></td>
+      <td>
+        Triggered when your player is ready. This event must be posted before
+        the player can become interactive.
+      </td>
+    </tr>
+    <tr>
+      <td><code>playing</code></td>
+      <td>
+        Triggered when your player has started playing a video after load or
+        pause.
+      </td>
+    </tr>
+    <tr>
+      <td><code>pause</code></td>
+      <td>
+        Triggered when your video has been paused.
+      </td>
+    </tr>
+    <tr>
+      <td><code>ended</code></td>
+      <td>
+        Triggered when your video has ended playback. Note that you must also
+        post a <code>pause</code> event alongside the <code>ended</code> event.
+      </td>
+    </tr>
+    <tr>
+      <td><code>muted</code></td>
+      <td>
+        Triggered when your video has been muted.
+      </td>
+    </tr>
+    <tr>
+      <td><code>unmuted</code></td>
+      <td>
+        Triggered when your video has been unmuted.
+      </td>
+    </tr>
+    <tr>
+      <td><code>ad_start</code></td>
+      <td>
+        Triggered when a pre/mid/post-roll ad is playing. This hides the
+        autoplay shim displayed on the video.
+      </td>
+    </tr>
+    <tr>
+      <td><code>ad_end</code></td>
+      <td>
+        Triggered when a pre/mid/post-roll ad has ended. This re-displays the
+        autoplay shim if the user has not yet interacted with the video.
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+#### <a name="postAnalyticsEvent"></a> `postAnalyticsEvent(eventType[, vars])`
+
+Posts a custom analytics event to be consumed by `amp-analytics`. The
+`eventType` must be prefixed with `video-custom-` to prevent naming collisions
+with other analytics event types.
+
+This method takes an optional `vars` param that should define an object with
+custom variables to log. These are available as `VIDEO_STATE`, keyed by name
+prefixed with `custom_`, i.e. the object `{myVar: 'foo'}` will be available as
+`{'custom_myVar': 'foo}`.
+
+#### <a name="getConsentData"></a> `getConsentData(callback)`
+
+The iframe document can request user consent data when the host document uses
+[`amp-consent`](https://amp.dev/documentation/components/amp-consent/).
+
+Note: If you only require to block the iframe from loading when consent is not given, it's preferable to [set the `data-block-on-consent` attribute](https://amp.dev/documentation/components/amp-consent/#basic-blocking-behaviors) instead of calling `getConsentData()`
+
+The `callback` passed to the function will be executed with an object containing the following properties:
+
+-   [**`consentMetadata`**](https://github.com/ampproject/amphtml/blob/main/extensions/amp-consent/customizing-extension-behaviors-on-consent.md#on-consent-metadata)
+-   [**`consentString`**](https://github.com/ampproject/amphtml/blob/main/extensions/amp-consent/customizing-extension-behaviors-on-consent.md#on-consent-string)
+-   [**`consentPolicyState`**](https://github.com/ampproject/amphtml/blob/main/extensions/amp-consent/customizing-extension-behaviors-on-consent.md#on-consent-state)
+-   [**`consentPolicySharedData`**](https://github.com/ampproject/amphtml/blob/main/extensions/amp-consent/customizing-extension-behaviors-on-consent.md#on-related-information)
+
+```json
+{
+  "consentMetadata": {
+    "consentStringType": 2,
+    "additionalConsent": "additional-consent-string",
+    "gdprApplies": true,
+    "purposeOne": true
+  },
+  "consentString": "accept-string",
+  "consentPolicyState": 1,
+  "consentPolicySharedData": {
+    "tfua": true,
+    "coppa": true
+  }
+}
+```
+
+For example, a video could be blocked from loading until `consentPolicyState` is
+available:
+
+```js
+// Create and listen to video once consent is given on the parent page:
+integration.getConsentData(function(consent) {
+  if (
+    consent.consentPolicyState !== /* SUFFICIENT */ 1 &&
+    consent.consentPolicyState !== /* UNKNOWN_NOT_REQUIRED */ 3
+  ) {
+    integration.postEvent('error');
+    return;
+  }
+
+  // You can use other consent values to map video consent logic as well.
+  console.log(consent);
+
+  // Initialize video and integration once consent is available.
+  var video = document.createElement(video);
+  video.style = "width: 100vw; height: 100vh";
+  video.src = document.body.getAttribute('data-videoid');
+  document.body.appendChild(video);
+
+  integration.method('play', function() {
+    video.play();
+  });
+
+  // etc...
+});
+```
+
+A complete [example using `getConsentData` is available as well.](../../../../examples/amp-video-iframe/frame-consent.html)
+
+#### <a name="getIntersection"></a> `getIntersection(callback)`
+
+Gets the intersection ratio (between 0 and 1) for the video element. This is useful for viewability information, e.g.
+
+```js
+// Will log intersection every 2 seconds
+setInterval(function () {
+  integration.getIntersection(function (intersection) {
+    console.log('Intersection ratio:', intersection.intersectionRatio);
+  });
+}, 2000);
+```
+
+The `callback` passed to the function will be executed with an object that looks
+like this:
+
+```json
+{"time": 33333.33, "intersectionRatio": 0.761}
+```
+
+⚠ This should be considered a low-fidelity reading. Currently, the value for
+`intersectionRatio` will be 0 as long as the video is under 50% visible. This
+value is bound to change at any time, and the callbacks may be delayed or
+debounced.
+
+#### <a name="getMetadata"></a> `getMetadata()`
+
+Returns an object containing metadata about the host document:
+
+```json
+{
+  "canonicalUrl": "https://example.com/canonical.html",
+  "sourceUrl": "https://example.com/amp.html",
+  "title": "My host document's title",
+  "lang": "en"
+}
+```
+
+-   `canonicalUrl` is the canonical URL.
+
+-   `sourceUrl` is the AMPHTML URL.
+
+-   `title` is the source URL's document title at the time the `<bento-video-iframe>` is initialized. `null` when the component is loaded in a shadow root.
+
+-   `lang` is the source URL's language specified in `<html ⚡️ lang="en">`. `null` when the component is loaded in a shadow root.
+
+-   `jsonLd` includes the parsed content of a [JSON-LD](https://json-ld.org/) tag, if present.
diff --git a/extensions/amp-video/1.0/autoplay.jss.js b/src/bento/components/bento-video/1.0/autoplay.jss.js
similarity index 100%
rename from extensions/amp-video/1.0/autoplay.jss.js
rename to src/bento/components/bento-video/1.0/autoplay.jss.js
diff --git a/src/bento/components/bento-video/1.0/base-element.js b/src/bento/components/bento-video/1.0/base-element.js
new file mode 100644
index 000000000000..39bac447db6f
--- /dev/null
+++ b/src/bento/components/bento-video/1.0/base-element.js
@@ -0,0 +1,68 @@
+import {PreactBaseElement} from '#preact/base-element';
+
+import {CSS as CSS_AUTOPLAY} from './autoplay.jss';
+import {BentoVideo} from './component';
+import {CSS} from './component.jss';
+
+export class BentoVideoBaseElement extends PreactBaseElement {}
+// export with alias for bento builds
+export {BentoVideoBaseElement as BaseElement};
+
+/** @override */
+BentoVideoBaseElement['Component'] = BentoVideo;
+
+/** @override */
+BentoVideoBaseElement['loadable'] = true;
+
+/** @override */
+BentoVideoBaseElement['layoutSizeDefined'] = true;
+
+/**
+ * Defaults to `{component: 'video'}` from `BentoVideo` component.
+ * Subclasses may set:
+ * ```
+ *   AmpMyPlayer['staticProps'] = {
+ *     'component': MyPlayerComponent,
+ *   };
+ * ```
+ * @override
+ */
+BentoVideoBaseElement['staticProps'];
+
+/** @override */
+BentoVideoBaseElement['props'] = {
+  'album': {attr: 'album'},
+  'alt': {attr: 'alt'},
+  'artist': {attr: 'artist'},
+  'artwork': {attr: 'artwork'},
+  'attribution': {attr: 'attribution'},
+  'autoplay': {attr: 'autoplay', type: 'boolean'},
+  'controls': {attr: 'controls', type: 'boolean'},
+  'controlslist': {attr: 'controlslist'},
+  'crossorigin': {attr: 'crossorigin'},
+  'disableremoteplayback': {attr: 'disableremoteplayback'},
+  'loop': {attr: 'loop', type: 'boolean'},
+  'noaudio': {attr: 'noaudio', type: 'boolean'},
+  'poster': {attr: 'poster'},
+  'sources': {
+    selector: 'source',
+    single: false,
+    clone: true,
+  },
+  'src': {attr: 'src'},
+  'title': {attr: 'title'},
+
+  // TODO(alanorozco): These props have no internal implementation yet.
+  'dock': {attr: 'dock', media: true},
+  'rotate-to-fullscreen': {
+    attr: 'rotate-to-fullscreen',
+    type: 'boolean',
+    media: true,
+  },
+};
+
+/** @override */
+BentoVideoBaseElement['shadowCss'] = CSS + CSS_AUTOPLAY;
+
+/** @override */
+BentoVideoBaseElement['usesShadowDom'] = true;
diff --git a/src/bento/components/bento-video/1.0/bento-video.css b/src/bento/components/bento-video/1.0/bento-video.css
new file mode 100644
index 000000000000..dbe2ed5a583a
--- /dev/null
+++ b/src/bento/components/bento-video/1.0/bento-video.css
@@ -0,0 +1,17 @@
+/*
+ * Pre-upgrade:
+ * - display:block element
+ * - size-defined element
+ */
+bento-video {
+  display: block;
+  overflow: hidden;
+  position: relative;
+}
+
+/* Pre-upgrade: size-defining element - hide children. */
+bento-video:not(.i-amphtml-built)
+  > :not([placeholder]):not([slot='i-amphtml-svc']) {
+  display: none;
+  content-visibility: hidden;
+}
diff --git a/src/bento/components/bento-video/1.0/component.js b/src/bento/components/bento-video/1.0/component.js
new file mode 100644
index 000000000000..93999a480480
--- /dev/null
+++ b/src/bento/components/bento-video/1.0/component.js
@@ -0,0 +1,394 @@
+import objstr from 'obj-str';
+
+import {Loading_Enum} from '#core/constants/loading-instructions';
+import {ReadyState_Enum} from '#core/constants/ready-state';
+import {Deferred} from '#core/data-structures/promise';
+import {tryPlay} from '#core/dom/video';
+import {once} from '#core/types/function';
+
+import * as Preact from '#preact';
+import {
+  useCallback,
+  useEffect,
+  useImperativeHandle,
+  useLayoutEffect,
+  useMemo,
+  useRef,
+  useState,
+} from '#preact';
+import {forwardRef} from '#preact/compat';
+import {ContainWrapper, useValueRef} from '#preact/component';
+import {useAmpContext, useLoading} from '#preact/context';
+import {propName, useResourcesNotify} from '#preact/utils';
+
+import {useStyles as useAutoplayStyles} from './autoplay.jss';
+import {useStyles} from './component.jss';
+
+import {
+  MetadataDef,
+  parseFavicon,
+  parseOgImage,
+  parseSchemaImage,
+  setMediaSession,
+} from '../../../../mediasession-helper';
+import {MIN_VISIBILITY_RATIO_FOR_AUTOPLAY} from '../../../../video-interface';
+
+/**
+ * @param {?{getMetadata: (function():?JsonObject|undefined)}} player
+ * @param {!VideoWrapperDef.Props} props
+ * @return {!MetadataDef}
+ */
+const getMetadata = (player, props) =>
+  /** @type {!MetadataDef} */ ({
+    'title': props.title || props['aria-label'] || document.title,
+    'artist': props.artist || '',
+    'album': props.album || '',
+    'artwork': [
+      {
+        'src':
+          props.artwork ||
+          props.poster ||
+          parseSchemaImage(document) ||
+          parseOgImage(document) ||
+          parseFavicon(document) ||
+          '',
+      },
+    ],
+    ...(player && player.getMetadata
+      ? player.getMetadata()
+      : Object.create(null)),
+  });
+
+/**
+ * @param {!VideoWrapperDef.Props} props
+ * @param {{current: ?T}} ref
+ * @return {PreactDef.Renderable}
+ * @template T
+ */
+function VideoWrapperWithRef(
+  {
+    autoplay = false,
+    component: Component = 'video',
+    controls = false,
+    loading: loadingProp,
+    loop = false,
+    mediasession = true,
+    noaudio = false,
+    onPlayingState,
+    onReadyState,
+    poster,
+    sources,
+    src,
+    style,
+    [propName('class')]: className,
+    ...rest
+  },
+  ref
+) {
+  useResourcesNotify();
+  const {playable} = useAmpContext();
+  const loading = useLoading(loadingProp);
+  const load = loading !== Loading_Enum.UNLOAD;
+
+  const [muted, setMuted] = useState(autoplay);
+  const [playing, setPlaying_] = useState(false);
+  const [metadata, setMetadata] = useState(/** @type {?MetadataDef}*/ (null));
+  const [hasUserInteracted, setHasUserInteracted] = useState(!autoplay);
+
+  const wrapperRef = useRef(null);
+  const playerRef = useRef(null);
+
+  const classes = useStyles();
+
+  // TODO(alanorozco): We might need an API to notify reload, like when
+  // <source>s change.
+  const readyDeferred = useMemo(() => new Deferred(), []);
+
+  const readyStateRef = useRef(ReadyState_Enum.LOADING);
+  // The `onReadyStateRef` is passed via a ref to avoid the changed values
+  // of `onReadyState` re-triggering the side effects.
+  const onReadyStateRef = useValueRef(onReadyState);
+  const setReadyState = useCallback(
+    (state, opt_failure) => {
+      if (state !== readyStateRef.current) {
+        readyStateRef.current = state;
+        const onReadyState = onReadyStateRef.current;
+        if (onReadyState) {
+          onReadyState(state, opt_failure);
+        }
+      }
+    },
+    [onReadyStateRef]
+  );
+
+  // The `onPlayingStateRef` is passed via a ref to avoid the changed values
+  // of `onPlayingState` re-triggering the side effects.
+  const onPlayingStateRef = useValueRef(onPlayingState);
+  const setPlayingState = useCallback(
+    (playing) => {
+      setPlaying_(playing);
+      const onPlayingState = onPlayingStateRef.current;
+      if (onPlayingState) {
+        onPlayingState(playing);
+      }
+    },
+    [onPlayingStateRef]
+  );
+
+  // Reset playing state when the video player is unmounted.
+  useLayoutEffect(() => {
+    if (!load) {
+      setPlayingState(false);
+    }
+  }, [load, setPlayingState]);
+
+  const play = useCallback(() => {
+    return readyDeferred.promise.then(() => tryPlay(playerRef.current));
+  }, [readyDeferred]);
+
+  const pause = useCallback(() => {
+    readyDeferred.promise.then(() => playerRef.current?.pause());
+  }, [readyDeferred]);
+
+  const requestFullscreen = useCallback(() => {
+    return readyDeferred.promise.then(() =>
+      playerRef.current.requestFullscreen()
+    );
+  }, [readyDeferred]);
+
+  const userInteracted = useCallback(() => {
+    setMuted(false);
+    setHasUserInteracted(true);
+  }, []);
+
+  // Update the initial readyState. Using `useLayoutEffect` here to avoid
+  // race conditions with possible future events.
+  useLayoutEffect(() => {
+    const readyState = playerRef.current?.readyState;
+    if (readyState != null) {
+      setReadyState(
+        readyState > 0 ? ReadyState_Enum.COMPLETE : ReadyState_Enum.LOADING
+      );
+    }
+  }, [setReadyState]);
+
+  useLayoutEffect(() => {
+    if (mediasession && playing && metadata) {
+      setMediaSession(window, metadata, play, pause);
+    }
+    return () => {
+      // TODO(alanorozco): Clear media session.
+      // (Tricky because we don't want to clear a different active session.)
+    };
+  }, [mediasession, playing, metadata, play, pause]);
+
+  // Pause if the video goes into a "paused" context.
+  useEffect(() => {
+    if (!playable) {
+      pause();
+    }
+  }, [playable, pause]);
+
+  // We'd like this to be as close as possible to the HTMLMediaElement
+  // interface, preferrably as an extension/superset.
+  useImperativeHandle(
+    ref,
+    () => ({
+      // Standard Bento
+      get readyState() {
+        return readyStateRef.current;
+      },
+
+      // Standard HTMLMediaElement/Element
+      play,
+      pause,
+      requestFullscreen,
+      get currentTime() {
+        if (!playerRef.current) {
+          return 0;
+        }
+        return playerRef.current.currentTime;
+      },
+      get duration() {
+        if (!playerRef.current) {
+          return NaN;
+        }
+        return playerRef.current.duration;
+      },
+      get autoplay() {
+        return autoplay;
+      },
+      get controls() {
+        return controls;
+      },
+      get loop() {
+        return loop;
+      },
+
+      // Non-standard
+      userInteracted,
+      mute: () => setMuted(true),
+      unmute: () => {
+        if (hasUserInteracted) {
+          setMuted(false);
+        }
+      },
+    }),
+    [
+      play,
+      pause,
+      requestFullscreen,
+      userInteracted,
+      hasUserInteracted,
+      autoplay,
+      controls,
+      loop,
+    ]
+  );
+
+  return (
+    <ContainWrapper
+      contentRef={wrapperRef}
+      class={className}
+      style={style}
+      size
+      layout
+      paint
+    >
+      {load && (
+        <Component
+          {...rest}
+          ref={playerRef}
+          loading={loading}
+          muted={muted}
+          loop={loop}
+          controls={controls && (!autoplay || hasUserInteracted)}
+          onCanPlay={() => {
+            readyDeferred.resolve();
+            setReadyState(ReadyState_Enum.COMPLETE);
+          }}
+          onLoadedMetadata={() => {
+            if (mediasession) {
+              readyDeferred.promise.then(() => {
+                setMetadata(getMetadata(playerRef.current, rest));
+              });
+            }
+            setReadyState(ReadyState_Enum.COMPLETE);
+          }}
+          onPlaying={() => setPlayingState(true)}
+          onPause={() => setPlayingState(false)}
+          onEnded={() => setPlayingState(false)}
+          onError={(e) => {
+            setReadyState(ReadyState_Enum.ERROR, e);
+            readyDeferred.reject(e);
+          }}
+          class={classes.fillStretch}
+          src={src}
+          poster={poster}
+        >
+          {sources}
+        </Component>
+      )}
+      {autoplay && !hasUserInteracted && (
+        <Autoplay
+          metadata={metadata}
+          playing={playing}
+          displayIcon={!noaudio && muted}
+          wrapperRef={wrapperRef}
+          play={play}
+          pause={pause}
+          displayOverlay={controls}
+          onOverlayClick={userInteracted}
+        />
+      )}
+    </ContainWrapper>
+  );
+}
+
+/**
+ * @param {!VideoWrapperDef.AutoplayProps} props
+ * @return {PreactDef.Renderable}
+ */
+function Autoplay({
+  displayIcon,
+  displayOverlay,
+  metadata,
+  onOverlayClick,
+  pause,
+  play,
+  playing,
+  wrapperRef,
+}) {
+  const {playable} = useAmpContext();
+  const autoplayClasses = useAutoplayStyles();
+  const classes = useStyles();
+
+  useEffect(() => {
+    if (!playable) {
+      pause();
+      return;
+    }
+
+    const observer = new IntersectionObserver(
+      (entries) => {
+        if (entries[entries.length - 1].isIntersecting) {
+          play().catch(() => {
+            // Empty catch to prevent useless unhandled rejection logging.
+            // play() can fail for benign reasons like pausing.
+          });
+        } else {
+          pause();
+        }
+      },
+      {threshold: MIN_VISIBILITY_RATIO_FOR_AUTOPLAY}
+    );
+
+    observer.observe(wrapperRef.current);
+
+    return () => {
+      observer.disconnect();
+    };
+  }, [wrapperRef, play, pause, playable]);
+
+  return (
+    <>
+      {displayIcon && (
+        <div
+          class={objstr({
+            [autoplayClasses.eq]: true,
+            [autoplayClasses.eqPlaying]: playing,
+          })}
+        >
+          <AutoplayIconContent />
+        </div>
+      )}
+
+      {displayOverlay && (
+        <button
+          aria-label={(metadata && metadata.title) || 'Unmute video'}
+          tabindex="0"
+          class={objstr({
+            [autoplayClasses.autoplayMaskButton]: true,
+            [classes.fillContentOverlay]: true,
+          })}
+          onClick={onOverlayClick}
+        ></button>
+      )}
+    </>
+  );
+}
+
+const AutoplayIconContent = /** @type {function():!PreactDef.Renderable} */ (
+  once(() => {
+    const classes = useAutoplayStyles();
+    return [1, 2, 3, 4].map((i) => <div class={classes.eqCol} key={i}></div>);
+  })
+);
+
+const VideoWrapper = forwardRef(VideoWrapperWithRef);
+VideoWrapper.displayName = 'VideoWrapper'; // Make findable for tests.
+
+// VideoWrapper is used by many video component implementations, but we also
+// provide it as BentoVideo using default props.
+export {VideoWrapper};
+export {VideoWrapper as BentoVideo};
diff --git a/extensions/amp-video/1.0/component.jss.js b/src/bento/components/bento-video/1.0/component.jss.js
similarity index 100%
rename from extensions/amp-video/1.0/component.jss.js
rename to src/bento/components/bento-video/1.0/component.jss.js
diff --git a/extensions/amp-video/1.0/component.type.js b/src/bento/components/bento-video/1.0/component.type.js
similarity index 100%
rename from extensions/amp-video/1.0/component.type.js
rename to src/bento/components/bento-video/1.0/component.type.js
diff --git a/extensions/amp-video/1.0/video-base-element.js b/src/bento/components/bento-video/1.0/video-base-element.js
similarity index 75%
rename from extensions/amp-video/1.0/video-base-element.js
rename to src/bento/components/bento-video/1.0/video-base-element.js
index 5af188ebbba2..9bb4de6b3fc4 100644
--- a/extensions/amp-video/1.0/video-base-element.js
+++ b/src/bento/components/bento-video/1.0/video-base-element.js
@@ -1,8 +1,14 @@
-import {ActionTrust} from '#core/constants/action-constants';
-import {BaseElement} from './base-element';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
+
+import {AmpPreactBaseElement, setSuperClass} from '#preact/amp-base-element';
+
+import {BentoVideoBaseElement} from './base-element';
 
 /** @extends {PreactBaseElement<VideoWrapperDef.Api>} */
-export class VideoBaseElement extends BaseElement {
+export class AmpVideoBaseElement extends setSuperClass(
+  BentoVideoBaseElement,
+  AmpPreactBaseElement
+) {
   /** @override */
   init() {
     this.registerApiAction_('play', (api) => api.play());
@@ -22,14 +28,14 @@ export class VideoBaseElement extends BaseElement {
   /**
    * @param {string} alias
    * @param {function(!VideoWrapperDef.Api, !../../../src/service/action-impl.ActionInvocation)} handler
-   * @param {!../../../src/core/constants/action-constants.ActionTrust=} minTrust
+   * @param {!../../../src/core/constants/action-constants.ActionTrust_Enum=} minTrust
    * @private
    */
-  registerApiAction_(alias, handler, minTrust = ActionTrust.HIGH) {
+  registerApiAction_(alias, handler, minTrust = ActionTrust_Enum.HIGH) {
     this.registerApiAction(
       alias,
       (api, invocation) => {
-        if (invocation.trust >= ActionTrust.HIGH) {
+        if (invocation.trust >= ActionTrust_Enum.HIGH) {
           // TODO(alanorozco): There may be a better solution that doesn't
           // require this method which is not standard in HTMLMediaElement, like
           // potentially toggling `autoplay` instead.
diff --git a/extensions/amp-video/1.0/video-iframe.js b/src/bento/components/bento-video/1.0/video-iframe.js
similarity index 97%
rename from extensions/amp-video/1.0/video-iframe.js
rename to src/bento/components/bento-video/1.0/video-iframe.js
index efd54ccd2b30..08a963f67328 100644
--- a/extensions/amp-video/1.0/video-iframe.js
+++ b/src/bento/components/bento-video/1.0/video-iframe.js
@@ -1,7 +1,6 @@
-import * as Preact from '#preact';
 import {Deferred} from '#core/data-structures/promise';
-import {VideoWrapper} from './component';
-import {forwardRef} from '#preact/compat';
+
+import * as Preact from '#preact';
 import {
   useCallback,
   useImperativeHandle,
@@ -9,6 +8,9 @@ import {
   useMemo,
   useRef,
 } from '#preact';
+import {forwardRef} from '#preact/compat';
+
+import {VideoWrapper} from './component';
 
 const DEFAULT_SANDBOX = [
   'allow-scripts',
@@ -52,18 +54,18 @@ function postWhenReady(iframe, ready, makeMessageCb) {
  */
 function VideoIframeInternalWithRef(
   {
+    controls = false,
     loading,
-    unloadOnPause = false,
-    sandbox = DEFAULT_SANDBOX,
+    makeFullscreenMessage: makeFullscreenMessageProp,
+    makeMethodMessage: makeMethodMessageProp,
     muted = false,
-    controls = false,
-    origin,
     onCanPlay,
+    onIframeLoad,
     onMessage,
+    origin,
     playerStateRef,
-    makeMethodMessage: makeMethodMessageProp,
-    makeFullscreenMessage: makeFullscreenMessageProp,
-    onIframeLoad,
+    sandbox = DEFAULT_SANDBOX,
+    unloadOnPause = false,
     ...rest
   },
   ref
@@ -196,9 +198,7 @@ function VideoIframeInternalWithRef(
         readyDeferred.resolve();
       }}
       onLoad={(event) => {
-        if (onIframeLoad) {
-          onIframeLoad(event);
-        }
+        onIframeLoad?.(event);
       }}
     />
   );
@@ -211,7 +211,7 @@ export {VideoIframeInternal};
 
 /**
  * VideoWrapper using an <iframe> for implementation.
- * Usable on the AMP layer through VideoBaseElement.
+ * Usable on the AMP layer through AmpVideoBaseElement.
  * @param {VideoIframeDef.Props} props
  * @param {{current: (?T)}} ref
  * @return {PreactDef.Renderable}
@@ -223,7 +223,7 @@ function VideoIframeWithRef(props, ref) {
 
 /**
  * VideoWrapper using an <iframe> for implementation.
- * Usable on the AMP layer through VideoBaseElement.
+ * Usable on the AMP layer through AmpVideoBaseElement.
  * @param {VideoIframeDef.Props} props
  * @return {PreactDef.Renderable}=
  */
diff --git a/extensions/amp-video/1.0/video-iframe.type.js b/src/bento/components/bento-video/1.0/video-iframe.type.js
similarity index 100%
rename from extensions/amp-video/1.0/video-iframe.type.js
rename to src/bento/components/bento-video/1.0/video-iframe.type.js
diff --git a/src/bento/components/bento-video/OWNERS b/src/bento/components/bento-video/OWNERS
new file mode 100644
index 000000000000..bdea384f5ee1
--- /dev/null
+++ b/src/bento/components/bento-video/OWNERS
@@ -0,0 +1,20 @@
+// For an explanation of the OWNERS rules and syntax, see:
+// https://github.com/ampproject/amp-github-apps/blob/main/owners/OWNERS.example
+
+{
+  rules: [
+    {
+      owners: [
+        {
+          name: 'ampproject/wg-components',
+        },
+        {
+          name: 'alanorozco',
+        },
+        {
+          name: 'gmajoulet',
+        },
+      ],
+    },
+  ],
+}
diff --git a/src/bento/components/bento-video/bento-video.md b/src/bento/components/bento-video/bento-video.md
new file mode 100644
index 000000000000..2f5c9c1e1999
--- /dev/null
+++ b/src/bento/components/bento-video/bento-video.md
@@ -0,0 +1,258 @@
+---
+$category@: media
+formats:
+  - websites
+teaser:
+  text: Replaces the HTML5 video tag.
+experimental: true
+bento: true
+---
+
+# bento-video
+
+## Usage
+
+A replacement for the HTML5 `video` tag; only to be used for direct HTML5 video file embeds.
+
+The `bento-video` component loads the video resource specified by its `src` attribute lazily, at a time determined by the runtime. You can control an `bento-video` component much the same way as a standard HTML5 `<video>` tag.
+
+The `bento-video` component accepts up to four unique types of HTML nodes as children:
+
+-   `source` tags: Just like in the HTML `<video>` tag, you can add `<source>` tag children to specify different source media files to play.
+-   `track` tags to enable subtitles in the video. If the track is hosted on a different origin than the document, you must add the `crossorigin` attribute to the `<bento-video>` tag. Whenever the video has narration or important audio information, make sure to include subtitles/captions for users who may not be able to hear it or have their sound turned off.
+-   a placeholder for before the video starts
+-   a fallback if the browser doesn’t support HTML5 video: One or zero immediate child nodes can have the `fallback` attribute. If present, this node and its children form the content that displays if HTML5 video is not supported on the user’s browser.
+
+[example preview="inline" playground="true" imports="bento-video:1.0"]
+
+```html
+<bento-video {% if format=='stories'%}autoplay {% endif %}controls
+  width="640"
+  height="360"
+  layout="responsive"
+  poster="{{server_for_email}}/static/inline-examples/images/kitten-playing.png">
+  <source src="{{server_for_email}}/static/inline-examples/videos/kitten-playing.webm"
+    type="video/webm" />
+  <source src="{{server_for_email}}/static/inline-examples/videos/kitten-playing.mp4"
+    type="video/mp4" />
+  <div fallback>
+    <p>This browser does not support the video element.</p>
+  </div>
+</bento-video>
+```
+
+[/example]
+
+#### Standalone use outside valid AMP documents
+
+Bento allows you to use AMP components in non-AMP pages without needing
+to commit to fully valid AMP. You can take these components and place them
+in implementations with frameworks and CMSs that don't support AMP. Read
+more in our guide [Use AMP components in non-AMP pages](https://amp.dev/documentation/guides-and-tutorials/start/bento_guide/).
+
+#### Interactivity and API usage
+
+Bento components are highly interactive through their API. In Bento standalone use, the element's API replaces AMP Actions and events and [`amp-bind`](https://amp.dev/documentation/components/amp-bind/?format=websites).
+
+The `bento-video` component API is accessible by including the following script tag in your document:
+
+```js
+await customElements.whenDefined('bento-video');
+const videoHandle = await video.getApi();
+```
+
+##### Actions
+
+The `bento-video` API allows you to perform the following actions:
+
+##### `play()`
+
+Plays the video.
+
+```js
+videoHandle.play();
+```
+
+##### `pause()`
+
+Pauses the video.
+
+```js
+videoHandle.pause();
+```
+
+##### `mute()`
+
+Mutes the video.
+
+```js
+videoHandle.mute();
+```
+
+##### `unmute()`
+
+Unmutes the video.
+
+```js
+videoHandle.unmute();
+```
+
+##### `requestFullscreen()`
+
+Expands the video to fullscreen when possible.
+
+```js
+videoHandle.requestFullscreen();
+```
+
+#### Properties
+
+It also exposes the following read-only properties:
+
+##### `currentTime` (`number`)
+
+The current playback time in seconds.
+
+```js
+console.log(videoHandle.currentTime);
+```
+
+##### `duration` (`number`)
+
+The video's duration in seconds, when it's known (e.g. is not a livestream).
+
+```js
+console.log(videoHandle.duration);
+```
+
+##### `autoplay` (`boolean`)
+
+Whether the video autoplays.
+
+```js
+console.log(videoHandle.autoplay);
+```
+
+##### `controls` (`boolean`)
+
+Whether the video shows controls.
+
+```js
+console.log(videoHandle.controls);
+```
+
+##### `loop` (`boolean`)
+
+Whether the video loops.
+
+```js
+console.log(videoHandle.loop);
+```
+
+## Attributes
+
+### src
+
+Required if no `<source>` children are present. Must be HTTPS.
+
+### poster
+
+The image for the frame to be displayed before video playback has started. By
+default, the first frame is displayed.
+
+Alternatively, you can present a click-to-play overlay.
+
+### autoplay
+
+If this attribute is present, and the browser supports autoplay, the video will be automatically
+played as soon as it becomes visible. There are some conditions that the component needs to meet
+to be played, [which are outlined in the Video in AMP spec](../../../../docs/spec/amp-video-interface.md#autoplay).
+
+### controls
+
+This attribute is similar to the `controls` attribute in the HTML5 `video`. If this attribute is present, the browser offers controls to allow the user to control video playback.
+
+### controlsList
+
+Same as [controlsList](https://developer.mozilla.org/en-US/docs/Web/API/HTMLMediaElement/controlsList) attribute of HTML5 video element. Only supported by certain browsers.
+
+### loop
+
+If present, the video will automatically loop back to the start upon reaching the end.
+
+### crossorigin
+
+Required if a `track` resource is hosted on a different origin than the document.
+
+### disableremoteplayback
+
+Determines whether the media element is allowed to have a remote playback UI such as Chromecast or AirPlay.
+
+### muted (deprecated)
+
+The `muted` attribute is deprecated and no longer has any effect. The `autoplay` attribute automatically controls the mute behavior.
+
+### noaudio
+
+Annotates the video as having no audio. This has the following effects:
+
+-   An equalizer icon will **not** be drawn when setting [`autoplay`](#autoplay).
+
+-   An `<amp-story>` that includes this video will **not** draw an unnecessary mute button.
+
+### rotate-to-fullscreen
+
+If the video is visible, the video displays fullscreen after the user rotates their device into landscape mode. For more details, see the [Video in AMP spec](../../../../docs/spec/amp-video-interface.md#rotate-to-fullscreen).
+
+This attribute can be configured to based on a [media query](./../../../../docs/spec/amp-html-responsive-attributes.md).
+
+### common attributes
+
+This element includes [common attributes](https://amp.dev/documentation/guides-and-tutorials/learn/common_attributes) extended to AMP components.
+
+### Media Session API attributes
+
+The `amp-video` component implements the [Media Session API](https://developers.google.com/web/updates/2017/02/media-session), which enables developers to specify more information about the video file. The additional information for the video displays in the notification center of the user's device (along with the play/pause controls).
+
+This example contains both the `poster` and `artwork` attributes. The `poster` serves as the placeholder image before the video plays, while `artwork` is the image that displays in the notification via the MediaSession API.
+
+```html
+<bento-video
+  width="720"
+  height="305"
+  layout="responsive"
+  src="https://yourhost.com/videos/myvideo.mp4"
+  poster="https://yourhost.com/posters/poster.png"
+  artwork="https://yourhost.com/artworks/artwork.png"
+  title="Awesome video"
+  artist="Awesome artist"
+  album="Amazing album"
+>
+</bento-video>
+```
+
+#### artwork
+
+Specifies a URL to a PNG/JPG/ICO image serving as the video's artwork. If `artwork` is not present, the Media Session API helper uses either the `image` field in the `schema.org` definition, the `og:image`, or the website's `favicon`.
+
+#### artist
+
+Indicates the author of the video file, specified as a string.
+
+#### album
+
+Indicates the album/collection the video was taken from, specified as a string.
+
+#### title
+
+Indicates the name/title of the video, specified as a string. If not provided, the Media Session API helper uses either the `aria-label` attribute or falls back to the page's title.
+
+## Analytics
+
+`bento-video` supports analytics out of the box. See [video analytics](../../../../extensions/amp-analytics/amp-video-analytics.md) for more information.
+
+## Styling
+
+### Click-to-Play overlay
+
+Providing a click-to-play overlay is a common UX feature for video players on the web. For example, you could display a custom play icon that the user can click, as well as include the title of the video, different sized poster images, and so on. Because the `bento-video` component supports the standard `play` AMP action, you can easily implement click-to-play.
diff --git a/src/bento/components/bento-vimeo/1.0/base-element.js b/src/bento/components/bento-vimeo/1.0/base-element.js
new file mode 100644
index 000000000000..be0a81d22b23
--- /dev/null
+++ b/src/bento/components/bento-vimeo/1.0/base-element.js
@@ -0,0 +1,28 @@
+import {BentoVideoBaseElement} from '#bento/components/bento-video/1.0/base-element';
+
+import {BentoVimeo} from './component';
+
+export class BaseElement extends BentoVideoBaseElement {}
+
+/** @override */
+BaseElement['Component'] = BentoVimeo;
+
+/** @override */
+BaseElement['props'] = {
+  'autoplay': {attr: 'autoplay', type: 'boolean'},
+  'controls': {attr: 'controls', type: 'boolean'},
+  'videoid': {attr: 'data-videoid'},
+  'doNotTrack': {attr: 'do-not-track'},
+  // TODO(wg-components): Current behavior defaults to loading="auto".
+  // Refactor to make loading="lazy" as the default.
+  'loading': {attr: 'data-loading'},
+};
+
+/** @override */
+BaseElement['layoutSizeDefined'] = true;
+
+/** @override */
+BaseElement['usesShadowDom'] = true;
+
+/** @override */
+BaseElement['loadable'] = true;
diff --git a/src/bento/components/bento-vimeo/1.0/bento-vimeo.css b/src/bento/components/bento-vimeo/1.0/bento-vimeo.css
new file mode 100644
index 000000000000..69191ec6864a
--- /dev/null
+++ b/src/bento/components/bento-vimeo/1.0/bento-vimeo.css
@@ -0,0 +1,17 @@
+/*
+ * Pre-upgrade:
+ * - display:block element
+ * - size-defined element
+ */
+bento-vimeo {
+  display: block;
+  overflow: hidden;
+  position: relative;
+}
+
+/* Pre-upgrade: size-defining element - hide children. */
+bento-vimeo:not(.i-amphtml-built)
+  > :not([placeholder]):not([slot='i-amphtml-svc']) {
+  display: none;
+  content-visibility: hidden;
+}
diff --git a/src/bento/components/bento-vimeo/1.0/component.js b/src/bento/components/bento-vimeo/1.0/component.js
new file mode 100644
index 000000000000..33b89e5da05f
--- /dev/null
+++ b/src/bento/components/bento-vimeo/1.0/component.js
@@ -0,0 +1,118 @@
+import {
+  VIMEO_EVENTS,
+  getVimeoIframeSrc,
+  getVimeoOriginRegExp,
+  listenToVimeoEvents,
+  makeVimeoMessage,
+} from '#bento/apis/vimeo-api';
+import {VideoIframe} from '#bento/components/bento-video/1.0/video-iframe';
+
+import {dispatchCustomEvent} from '#core/dom';
+
+import * as Preact from '#preact';
+import {useCallback, useMemo, useRef} from '#preact';
+import {forwardRef} from '#preact/compat';
+import {useValueRef} from '#preact/component';
+
+import {
+  objOrParseJson,
+  postMessageWhenAvailable,
+} from '../../../../iframe-video';
+
+/**
+ * @param {!HTMLIframeElement} iframe
+ * @param {string} type
+ */
+function dispatchEvent(iframe, type) {
+  dispatchCustomEvent(iframe, type, null, {
+    bubbles: true,
+    cancelable: false,
+  });
+}
+
+/**
+ * @param {string} method
+ * @return {string}
+ */
+function makeMethodMessage(method) {
+  if (method === 'mute') {
+    return makeVimeoMessage('setVolume', '0');
+  }
+  if (method === 'unmute') {
+    return makeVimeoMessage('setVolume', '1');
+  }
+  return makeVimeoMessage(method);
+}
+
+/**
+ * @param {!VimeoDef.Props} props
+ * @param {{current: ?T}} ref
+ * @return {PreactDef.Renderable}
+ * @template T
+ */
+function BentoVimeoWithRef(
+  {autoplay = false, doNotTrack = false, onLoad, videoid, ...rest},
+  ref
+) {
+  const origin = useMemo(getVimeoOriginRegExp, []);
+  const src = useMemo(
+    () => getVimeoIframeSrc(videoid, autoplay, doNotTrack),
+    [videoid, doNotTrack, autoplay]
+  );
+
+  const readyIframeRef = useRef(null);
+  const onLoadRef = useValueRef(onLoad);
+
+  const onReadyMessage = useCallback((iframe) => {
+    if (readyIframeRef.current === iframe) {
+      return;
+    }
+    readyIframeRef.current = iframe;
+    dispatchEvent(iframe, 'canplay');
+    listenToVimeoEvents(iframe);
+  }, []);
+
+  const onMessage = useCallback(
+    (e) => {
+      const {currentTarget} = e;
+      const data = objOrParseJson(e.data);
+      if (!data) {
+        return;
+      }
+      const event = data['event'];
+      if (event == 'ready' || data['method'] == 'ping') {
+        onReadyMessage(currentTarget);
+        return;
+      }
+      if (VIMEO_EVENTS[event]) {
+        dispatchEvent(currentTarget, VIMEO_EVENTS[event]);
+        onLoadRef.current?.();
+        return;
+      }
+    },
+    [onReadyMessage, onLoadRef]
+  );
+
+  const onIframeLoad = useCallback((e) => {
+    postMessageWhenAvailable(e.currentTarget, makeVimeoMessage('ping'));
+  }, []);
+
+  return (
+    <VideoIframe
+      ref={ref}
+      {...rest}
+      origin={origin}
+      autoplay={autoplay}
+      src={src}
+      onMessage={onMessage}
+      makeMethodMessage={makeMethodMessage}
+      onIframeLoad={onIframeLoad}
+      // Vimeo API does not have a way to hide controls, so they're always set
+      controls
+    />
+  );
+}
+
+const BentoVimeo = forwardRef(BentoVimeoWithRef);
+BentoVimeo.displayName = 'BentoVimeo'; // Make findable for tests.
+export {BentoVimeo};
diff --git a/extensions/amp-vimeo/1.0/component.type.js b/src/bento/components/bento-vimeo/1.0/component.type.js
similarity index 100%
rename from extensions/amp-vimeo/1.0/component.type.js
rename to src/bento/components/bento-vimeo/1.0/component.type.js
diff --git a/src/bento/components/bento-vimeo/OWNERS b/src/bento/components/bento-vimeo/OWNERS
new file mode 100644
index 000000000000..77a55ee52b28
--- /dev/null
+++ b/src/bento/components/bento-vimeo/OWNERS
@@ -0,0 +1,10 @@
+// For an explanation of the OWNERS rules and syntax, see:
+// https://github.com/ampproject/amp-github-apps/blob/main/owners/OWNERS.example
+
+{
+  rules: [
+    {
+      owners: [{name: 'ampproject/wg-components'}],
+    },
+  ],
+}
diff --git a/src/bento/components/bento-vimeo/bento-vimeo.md b/src/bento/components/bento-vimeo/bento-vimeo.md
new file mode 100644
index 000000000000..f19a16ab4593
--- /dev/null
+++ b/src/bento/components/bento-vimeo/bento-vimeo.md
@@ -0,0 +1,51 @@
+---
+$category@: media
+formats:
+  - websites
+teaser:
+  text: Displays a Vimeo video.
+---
+
+# bento-vimeo
+
+## Example
+
+With responsive layout, the width and height from the example should yield correct layouts for 16:9 aspect ratio videos:
+
+```html
+<bento-vimeo
+  data-videoid="27246366"
+  layout="responsive"
+  width="500"
+  height="281"
+></bento-vimeo>
+```
+
+## Attributes
+
+<table>
+  <tr>
+    <td width="40%"><strong>data-videoid (required)</strong></td>
+    <td>The Vimeo video id found in every Vimeo video page URL For example, <code>27246366</code> is the video id for the following url: <code>https://vimeo.com/27246366</code>.</td>
+  </tr>
+  <tr>
+    <td width="40%"><strong>autoplay</strong></td>
+    <td>If this attribute is present, and the browser supports autoplay, the video will be automatically
+played as soon as it becomes visible. There are some conditions that the component needs to meet
+to be played, <a href="https://github.com/ampproject/amphtml/blob/main/docs/spec/amp-video-interface.md#autoplay">which are outlined in the Video in AMP spec</a>.</td>
+  </tr>
+  <tr>
+    <td width="40%"><strong>do-not-track</strong></td>
+    <td>If this attribute is present the player will be blocked from tracking any session data, including all cookies and
+    <a href="https://vimeo.com/stats">stats</a>. (It has the same effect as enabling a Do Not Track setting in your browser).
+    See the 'dnt' parameter in the <a href="https://developer.vimeo.com/api/oembed/videos">Vimeo oEmbed Documentation</a></td>
+  </tr>
+  <tr>
+    <td width="40%"><strong>common attributes</strong></td>
+    <td>This element includes <a href="https://amp.dev/documentation/guides-and-tutorials/learn/common_attributes">common attributes</a> extended to AMP components.</td>
+  </tr>
+</table>
+
+## Validation
+
+See [bento-vimeo rules](https://github.com/ampproject/amphtml/blob/main/extensions/amp-vimeo/validator-amp-vimeo.protoascii) in the AMP validator specification.
diff --git a/src/bento/components/bento-youtube/1.0/README.md b/src/bento/components/bento-youtube/1.0/README.md
new file mode 100644
index 000000000000..6d2adc80f5dc
--- /dev/null
+++ b/src/bento/components/bento-youtube/1.0/README.md
@@ -0,0 +1,546 @@
+# Bento Youtube
+
+Embeds [Youtube](https://youtube.com) videos.
+
+## Web Component
+
+You must include each Bento component's required CSS library to guarantee proper loading and before adding custom styles. Or use the light-weight pre-upgrade styles available inline. See [Layout and style](#layout-and-style).
+
+### Import via npm
+
+```sh
+npm install @bentoproject/youtube
+```
+
+```javascript
+import {defineElement as defineBentoYoutube} from '@bentoproject/youtube';
+defineBentoYoutube();
+```
+
+### Include via `<script>`
+
+```html
+<script type="module" src="https://cdn.ampproject.org/bento.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/bento.js" crossorigin="anonymous"></script>
+<script type="module" src="https://cdn.ampproject.org/v0/bento-youtube-1.0.mjs" crossorigin="anonymous"></script>
+<script nomodule src="https://cdn.ampproject.org/v0/bento-youtube-1.0.js" crossorigin="anonymous"></script>
+<link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-youtube-1.0.css" crossorigin="anonymous">
+```
+
+### Example
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-youtube-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-youtube-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-youtube-1.0.css"
+    />
+    <style>
+      bento-youtube {
+        width: 320px;
+        height: 180px;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-youtube data-videoid="dQw4w9WgXcQ"></bento-youtube>
+  </body>
+</html>
+```
+
+### Layout and style
+
+Each Bento component has a small CSS library you must include to guarantee proper loading without [content shifts](https://web.dev/cls/). Because of order-based specificity, you must manually ensure that stylesheets are included before any custom styles.
+
+```html
+<link
+  rel="stylesheet"
+  type="text/css"
+  href="https://cdn.ampproject.org/v0/bento-youtube-1.0.css"
+/>
+```
+
+Alternatively, you may also make the light-weight pre-upgrade styles available inline:
+
+```html
+<style>
+  bento-youtube {
+    display: block;
+    overflow: hidden;
+    position: relative;
+  }
+</style>
+```
+
+#### Container type
+
+The `bento-youtube` component has a defined layout size type. To ensure the component renders correctly, be sure to apply a size to the component and its immediate children (slides) via a desired CSS layout (such as one defined with `height`, `width`, `aspect-ratio`, or other such properties):
+
+```css
+bento-youtube {
+  height: 100px;
+  width: 100%;
+}
+```
+
+### Attributes
+
+#### autoplay
+
+If this attribute is present, and the browser supports autoplay:
+
+<ul>
+  <li>
+    the video is automatically muted before autoplay starts
+  </li>
+  <li>
+    when the video is scrolled out of view, the video is paused
+  </li>
+  <li>
+    when the video is scrolled into view, the video resumes playback
+  </li>
+  <li>
+    when the user taps the video, the video is unmuted
+  </li>
+  <li>
+    if the user has interacted with the video (e.g., mutes/unmutes, pauses/resumes, etc.), and the video is scrolled in or out of view, the state of the video remains as how the user left it. For example, if the user pauses the video, then scrolls the video out of view and returns to the video, the video is still paused.
+  </li>
+</ul>
+
+#### loop
+
+If this attribute is present, the video or playlist will play again (from the beginning) once it ends.
+
+#### data-videoid
+
+The YouTube video id found in every YouTube video page URL.
+
+For example, in this URL: `https://www.youtube.com/watch?v=Z1q71gFeRqM`, `Z1q71gFeRqM` is the video id.
+
+#### data-live-channelid
+
+The Youtube channel id that provides a stable livestream url. For example, in this URL: `https://www.youtube.com/embed/live_stream?channel=UCB8Kb4pxYzsDsHxzBfnid4Q`, `UCB8Kb4pxYzsDsHxzBfnid4Q` is the channel id. You can provide a `data-live-channelid` instead of a `data-videoid` attribute to embed a stable url for a live stream instead of a video. Channels do not come with default placeholders. You can provide a placeholder for the video per example 2 above.
+
+#### data-param-\*
+
+All `data-param-*` attributes (with the exception of `data-param-autoplay` and `data-param-loop`) will be added as query parameter to the YouTube iframe src. This may be used to pass custom values through to YouTube plugins, such as whether to show controls.
+
+Keys and values will be URI encoded. Keys will be camel cased.
+
+See [YouTube Embedded Player Parameters](https://developers.google.com/youtube/player_parameters) for more parameter options for YouTube.
+
+#### credentials (optional)
+
+Defines a `credentials` option as specified by the [Fetch API](https://fetch.spec.whatwg.org/) (`omit` or `include`).
+
+If you want to use the [YouTube player in privacy-enhanced mode](http://www.google.com/support/youtube/bin/answer.py?answer=141046), pass the value of `omit`.
+
+Usually YouTube sets its cookies when the player is loaded. In privacy-enhanced mode cookies are set when the user has clicked on the player.
+
+#### title (optional)
+
+Defines a `title` attribute for the component to propagate to the underlying `<iframe>` element. The default value is `"YouTube video"`.
+
+#### Interactivity and API usage
+
+The `bento-youtube` component API is accessible by including the following script tag in your document:
+
+```javascript
+await customElements.whenDefined('bento-youtube');
+const api = await video.getApi();
+```
+
+<!--% example %-->
+
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/bento.mjs"
+    ></script>
+    <script nomodule src="https://cdn.ampproject.org/bento.js"></script>
+    <script
+      type="module"
+      async
+      src="https://cdn.ampproject.org/v0/bento-youtube-1.0.mjs"
+    ></script>
+    <script
+      nomodule
+      async
+      src="https://cdn.ampproject.org/v0/bento-youtube-1.0.js"
+    ></script>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://cdn.ampproject.org/v0/bento-youtube-1.0.css"
+    />
+    <style>
+      bento-youtube {
+        width: 320px;
+        height: 180px;
+      }
+    </style>
+  </head>
+  <body>
+    <bento-youtube id="my-video" data-videoid="dQw4w9WgXcQ">
+    </bento-youtube>
+    <p>
+      <button id="play">Play</button>
+      <button id="pause">Pause</button>
+      <button id="mute">Mute</button>
+      <button id="unmute">Unmute</button>
+    </p>
+    <script>
+      (async () => {
+        await customElements.whenDefined('youtube');
+
+        const video = document.querySelector('#my-video');
+        const api = await video.getApi();
+
+        document.querySelector('#play').onclick = () => {
+          api.play();
+        };
+        document.querySelector('#pause').onclick = () => {
+          api.pause();
+        };
+        document.querySelector('#mute').onclick = () => {
+          api.mute();
+        };
+        document.querySelector('#unmute').onclick = () => {
+          api.unmute();
+        };
+      })();
+    </script>
+  </body>
+</html>
+```
+
+#### Actions
+
+The `bento-youtube` API allows you to perform the following actions:
+
+##### `play()`
+
+Plays the video.
+
+```js
+api.play();
+```
+
+##### `pause()`
+
+Pauses the video.
+
+```js
+api.pause();
+```
+
+##### `mute()`
+
+Mutes the video.
+
+```js
+api.mute();
+```
+
+##### `unmute()`
+
+Unmutes the video.
+
+```js
+api.unmute();
+```
+
+##### `requestFullscreen()`
+
+Expands the video to fullscreen when possible.
+
+```js
+api.requestFullscreen();
+```
+
+#### Properties
+
+It also exposes the following read-only properties:
+
+##### `currentTime` (`number`)
+
+The current playback time in seconds.
+
+```js
+console.log(api.currentTime);
+```
+
+##### `duration` (`number`)
+
+The video's duration in seconds, when it's known (e.g. is not a livestream).
+
+```js
+console.log(api.duration);
+```
+
+##### `autoplay` (`boolean`)
+
+Whether the video autoplays.
+
+```js
+console.log(api.autoplay);
+```
+
+##### `controls` (`boolean`)
+
+Whether the video shows controls.
+
+```js
+console.log(api.controls);
+```
+
+##### `loop` (`boolean`)
+
+Whether the video loops.
+
+```js
+console.log(api.loop);
+```
+
+---
+
+## Preact/React Component
+
+### Import via npm
+
+```sh
+npm install @bentoproject/youtube
+```
+
+```javascript
+import React from 'react';
+import {BentoYoutube} from '@bentoproject/youtube/react';
+import '@bentoproject/youtube/styles.css';
+
+function App() {
+  return <BentoYoutube videoid="dQw4w9WgXcQ" />;
+}
+```
+
+### Layout and style
+
+#### Container type
+
+The `BentoYoutube` component has a defined layout size type. To ensure the component renders correctly, be sure to apply a size to the component and its immediate children (slides) via a desired CSS layout (such as one defined with `height`, `width`, `aspect-ratio`, or other such properties). These can be applied inline:
+
+```jsx
+<BentoYoutube
+  style={{width: 320, height: 180}}
+  videoid="dQw4w9WgXcQ"
+/>
+```
+
+Or via `className`:
+
+```jsx
+<BentoYoutube
+  className="custom-styles"
+  videoid="dQw4w9WgXcQ"
+/>
+```
+
+```css
+.custom-styles {
+  height: 320px;
+  width: 180px;
+}
+```
+
+You may use `aspect-ratio` to size it responsively:
+
+```css
+.custom-styles {
+  aspect-ratio: 16/9;
+}
+```
+
+### Props
+
+#### autoplay
+
+If this prop is true, and the browser supports autoplay:
+
+<ul>
+  <li>
+    the video is automatically muted before autoplay starts
+  </li>
+  <li>
+    when the video is scrolled out of view, the video is paused
+  </li>
+  <li>
+    when the video is scrolled into view, the video resumes playback
+  </li>
+  <li>
+    when the user taps the video, the video is unmuted
+  </li>
+  <li>
+    if the user has interacted with the video (e.g., mutes/unmutes, pauses/resumes, etc.), and the video is scrolled in or out of view, the state of the video remains as how the user left it. For example, if the user pauses the video, then scrolls the video out of view and returns to the video, the video is still paused.
+  </li>
+</ul>
+
+#### loop
+
+If this prop is true, the video or playlist will play again (from the beginning) once it ends.
+
+#### videoid
+
+The YouTube video id found in every YouTube video page URL.
+
+For example, in this URL: `https://www.youtube.com/watch?v=Z1q71gFeRqM`, `Z1q71gFeRqM` is the video id.
+
+#### liveChannelid
+
+The Youtube channel id that provides a stable livestream url. For example, in this URL: `https://www.youtube.com/embed/live_stream?channel=UCB8Kb4pxYzsDsHxzBfnid4Q`, `UCB8Kb4pxYzsDsHxzBfnid4Q` is the channel id. You can provide a `liveChannelid` prop instead of a `videoid` prop to embed a stable url for a live stream instead of a video. Channels do not come with default placeholders. You can provide a placeholder for the video per example 2 above.
+
+#### params
+
+All fields in this object (with the exception of <code>autoplay</code> and <code>loop</code>) will be added as query parameters to the YouTube iframe src. This may be used to pass custom values through to YouTube plugins, such as whether to show controls.
+
+Keys and values will be URI encoded. Keys must be camel cased.
+
+See [YouTube Embedded Player Parameters](https://developers.google.com/youtube/player_parameters) for more parameter options for YouTube.
+
+#### credentials (optional)
+
+Defines a `credentials` option as specified by the [Fetch API](https://fetch.spec.whatwg.org/) (`omit` or `include`).
+
+If you want to use the [YouTube player in privacy-enhanced mode](http://www.google.com/support/youtube/bin/answer.py?answer=141046), pass the value of `omit`.
+
+Usually YouTube sets its cookies when the player is loaded. In privacy-enhanced mode cookies are set when the user has clicked on the player.
+
+#### title (optional)
+
+Defines a `title` attribute for the component to propagate to the underlying `<iframe>` element. The default value is `"YouTube video"`.
+
+### Interactivity and API usage
+
+The `BentoYoutube` component API is accessible by passing a `ref`:
+
+```javascript
+import React, {createRef} from 'react';
+
+function App() {
+  const ref = createRef();
+  return (
+    <BentoYoutube ref={ref} />
+  );
+}
+```
+
+#### Actions
+
+The `BentoYoutube` API allows you to perform the following actions:
+
+##### `play()`
+
+Plays the video.
+
+```js
+ref.current.play();
+```
+
+##### `pause()`
+
+Pauses the video.
+
+```js
+ref.current.pause();
+```
+
+##### `mute()`
+
+Mutes the video.
+
+```js
+ref.current.mute();
+```
+
+##### `unmute()`
+
+Unmutes the video.
+
+```js
+ref.current.unmute();
+```
+
+##### `requestFullscreen()`
+
+Expands the video to fullscreen when possible.
+
+```js
+ref.current.requestFullscreen();
+```
+
+#### Properties
+
+It also exposes the following read-only properties:
+
+##### `currentTime` (`number`)
+
+The current playback time in seconds.
+
+```js
+console.log(ref.current.currentTime);
+```
+
+##### `duration` (`number`)
+
+The video's duration in seconds, when it's known (e.g. is not a livestream).
+
+```js
+console.log(ref.current.duration);
+```
+
+##### `autoplay` (`boolean`)
+
+Whether the video autoplays.
+
+```js
+console.log(ref.current.autoplay);
+```
+
+##### `controls` (`boolean`)
+
+Whether the video shows controls.
+
+```js
+console.log(ref.current.controls);
+```
+
+##### `loop` (`boolean`)
+
+Whether the video loops.
+
+```js
+console.log(ref.current.loop);
+```
diff --git a/src/bento/components/bento-youtube/1.0/base-element.js b/src/bento/components/bento-youtube/1.0/base-element.js
new file mode 100644
index 000000000000..e3b2af7bacd2
--- /dev/null
+++ b/src/bento/components/bento-youtube/1.0/base-element.js
@@ -0,0 +1,31 @@
+import {BentoVideoBaseElement} from '#bento/components/bento-video/1.0/base-element';
+
+import {createParseAttrsWithPrefix} from '#preact/parse-props';
+
+import {BentoYoutube} from './component';
+
+export class BaseElement extends BentoVideoBaseElement {}
+
+/** @override */
+BaseElement['Component'] = BentoYoutube;
+
+/** @override */
+BaseElement['loadable'] = true;
+
+/** @override */
+BaseElement['props'] = {
+  'autoplay': {attr: 'autoplay', type: 'boolean'},
+  'loop': {attr: 'loop', type: 'boolean'},
+  'controls': {attr: 'controls', type: 'boolean'},
+  'videoid': {attr: 'data-videoid'},
+  'liveChannelid': {attr: 'data-live-channelid'},
+  'dock': {attr: 'dock', media: true},
+  'credentials': {attr: 'credentials'},
+  // TODO(wg-components): Current behavior defaults to loading="auto".
+  // Refactor to make loading="lazy" as the default.
+  'loading': {attr: 'data-loading'},
+  'params': createParseAttrsWithPrefix('data-param-'),
+};
+
+/** @override */
+BaseElement['usesShadowDom'] = true;
diff --git a/src/bento/components/bento-youtube/1.0/bento-youtube.css b/src/bento/components/bento-youtube/1.0/bento-youtube.css
new file mode 100644
index 000000000000..b036552b284b
--- /dev/null
+++ b/src/bento/components/bento-youtube/1.0/bento-youtube.css
@@ -0,0 +1,17 @@
+/*
+ * Pre-upgrade:
+ * - display:block element
+ * - size-defined element
+ */
+bento-youtube {
+  display: block;
+  overflow: hidden;
+  position: relative;
+}
+
+/* Pre-upgrade: size-defining element - hide children. */
+bento-youtube:not(.i-amphtml-built)
+  > :not([placeholder]):not([slot='i-amphtml-svc']) {
+  display: none;
+  content-visibility: hidden;
+}
diff --git a/src/bento/components/bento-youtube/1.0/component.js b/src/bento/components/bento-youtube/1.0/component.js
new file mode 100644
index 000000000000..46d71467a392
--- /dev/null
+++ b/src/bento/components/bento-youtube/1.0/component.js
@@ -0,0 +1,246 @@
+import {VideoIframe} from '#bento/components/bento-video/1.0/video-iframe';
+
+import {dispatchCustomEvent} from '#core/dom';
+
+import * as Preact from '#preact';
+import {useRef} from '#preact';
+import {forwardRef} from '#preact/compat';
+
+import {mutedOrUnmutedEvent, objOrParseJson} from '../../../../iframe-video';
+import {addParamsToUrl} from '../../../../url';
+import {VideoEvents_Enum} from '../../../../video-interface';
+
+// Correct PlayerStates taken from
+// https://developers.google.com/youtube/iframe_api_reference#Playback_status
+/**
+ * @enum {string}
+ * @private
+ */
+const PlayerStates = {
+  '-1': 'unstarted',
+  '0': 'ended',
+  '1': 'playing',
+  '2': 'pause',
+  '3': 'buffering',
+  '5': 'video_cued',
+};
+
+/**
+ * @enum {string}
+ * @private
+ */
+const methods = {
+  'play': 'playVideo',
+  'pause': 'pauseVideo',
+  'mute': 'mute',
+  'unmute': 'unMute',
+};
+
+/**
+ * @enum {number}
+ * @private
+ */
+const PlayerFlags = {
+  // Config to tell YouTube to hide annotations by default
+  HIDE_ANNOTATION: 3,
+};
+
+/** @const {!../../../src/core/dom.CustomEventOptionsDef} */
+const VIDEO_EVENT_OPTIONS = {bubbles: false, cancelable: false};
+
+/**
+ * Created once per component mount.
+ * The fields returned can be overridden by `infoDelivery` messages.
+ * @return {!JsonObject}
+ */
+function createDefaultInfo() {
+  return {
+    'currentTime': 0,
+    'duration': NaN,
+  };
+}
+
+/**
+ * @param {!YoutubeProps} props
+ * @param {{current: ?T}} ref
+ * @return {PreactDef.Renderable}
+ * @template T
+ */
+function BentoYoutubeWithRef(
+  {
+    autoplay,
+    credentials,
+    liveChannelid,
+    loop,
+    onLoad,
+    params = {},
+    videoid,
+    ...rest
+  },
+  ref
+) {
+  const datasourceExists =
+    !(videoid && liveChannelid) && (videoid || liveChannelid);
+
+  if (!datasourceExists) {
+    throw new Error(
+      'Exactly one of data-videoid or data-live-channelid should be present for <amp-youtube>'
+    );
+  }
+
+  let src = getEmbedUrl(credentials, videoid, liveChannelid);
+  if (!('playsinline' in params)) {
+    params['playsinline'] = '1';
+  }
+  if ('autoplay' in params) {
+    delete params['autoplay'];
+    autoplay = true;
+  }
+
+  if (autoplay) {
+    if (!('iv_load_policy' in params)) {
+      params['iv_load_policy'] = `${PlayerFlags.HIDE_ANNOTATION}`;
+    }
+
+    // Inline play must be set for autoplay regardless of original value.
+    params['playsinline'] = '1';
+  }
+
+  if ('loop' in params) {
+    loop = true;
+    delete params['loop'];
+  }
+
+  if (loop) {
+    if ('playlist' in params) {
+      params['loop'] = '1';
+    } else if ('loop' in params) {
+      delete params['loop'];
+    }
+  }
+
+  src = addParamsToUrl(src, params);
+
+  // Player state. Includes `currentTime` and `duration`.
+  const playerStateRef = useRef();
+  if (!playerStateRef.current) {
+    playerStateRef.current = createDefaultInfo();
+  }
+
+  const onMessage = ({currentTarget, data}) => {
+    const parsedData = objOrParseJson(data);
+    if (!parsedData) {
+      return;
+    }
+
+    const {'event': event, 'info': parsedInfo} = parsedData;
+
+    if (event == 'initialDelivery') {
+      dispatchVideoEvent(currentTarget, VideoEvents_Enum.LOADEDMETADATA);
+      onLoad?.();
+      return;
+    }
+
+    if (!parsedInfo) {
+      return;
+    }
+
+    const info = playerStateRef.current;
+    for (const key in info) {
+      if (parsedInfo[key] != null) {
+        info[key] = parsedInfo[key];
+      }
+    }
+
+    const playerState = parsedInfo['playerState'];
+    if (event == 'infoDelivery' && playerState == 0 && loop) {
+      currentTarget.contentWindow./*OK*/ postMessage(
+        JSON.stringify({
+          'event': 'command',
+          'func': 'playVideo',
+        }),
+        '*'
+      );
+    }
+    if (event == 'infoDelivery' && playerState != undefined) {
+      dispatchVideoEvent(currentTarget, PlayerStates[playerState.toString()]);
+    }
+    if (event == 'infoDelivery' && parsedInfo['muted']) {
+      dispatchVideoEvent(
+        currentTarget,
+        mutedOrUnmutedEvent(parsedInfo['muted'])
+      );
+      return;
+    }
+  };
+
+  return (
+    <VideoIframe
+      ref={ref}
+      {...rest}
+      autoplay={autoplay}
+      src={src}
+      onMessage={onMessage}
+      makeMethodMessage={makeMethodMessage}
+      onIframeLoad={(event) => {
+        const {currentTarget} = event;
+        dispatchVideoEvent(currentTarget, 'canplay');
+        currentTarget.contentWindow./*OK*/ postMessage(
+          JSON.stringify({
+            'event': 'listening',
+          }),
+          '*'
+        );
+      }}
+      sandbox="allow-scripts allow-same-origin allow-presentation"
+      playerStateRef={playerStateRef}
+    />
+  );
+}
+
+/**
+ * @param {string} credentials
+ * @param {string} videoid
+ * @param {string} liveChannelid
+ * @return {string}
+ * @private
+ */
+function getEmbedUrl(credentials, videoid, liveChannelid) {
+  let urlSuffix = '';
+  if (credentials === 'omit') {
+    urlSuffix = '-nocookie';
+  }
+  const baseUrl = `https://www.youtube${urlSuffix}.com/embed/`;
+  let descriptor = '';
+  if (videoid) {
+    descriptor = `${encodeURIComponent(videoid)}?`;
+  } else {
+    descriptor = `live_stream?channel=${encodeURIComponent(
+      liveChannelid || ''
+    )}&`;
+  }
+  return `${baseUrl}${descriptor}enablejsapi=1&amp=1`;
+}
+
+/**
+ * @param {!HTMLIFrameElement} currentTarget
+ * @param {string} name
+ */
+function dispatchVideoEvent(currentTarget, name) {
+  dispatchCustomEvent(currentTarget, name, null, VIDEO_EVENT_OPTIONS);
+}
+
+/**
+ * @param {string} method
+ * @return {!Object|string}
+ */
+function makeMethodMessage(method) {
+  return JSON.stringify({
+    'event': 'command',
+    'func': methods[method],
+  });
+}
+
+const BentoYoutube = forwardRef(BentoYoutubeWithRef);
+BentoYoutube.displayName = 'BentoYoutube'; // Make findable for tests.
+export {BentoYoutube};
diff --git a/extensions/amp-youtube/1.0/component.type.js b/src/bento/components/bento-youtube/1.0/component.type.js
similarity index 100%
rename from extensions/amp-youtube/1.0/component.type.js
rename to src/bento/components/bento-youtube/1.0/component.type.js
diff --git a/src/bento/components/bento-youtube/OWNERS b/src/bento/components/bento-youtube/OWNERS
new file mode 100644
index 000000000000..77a55ee52b28
--- /dev/null
+++ b/src/bento/components/bento-youtube/OWNERS
@@ -0,0 +1,10 @@
+// For an explanation of the OWNERS rules and syntax, see:
+// https://github.com/ampproject/amp-github-apps/blob/main/owners/OWNERS.example
+
+{
+  rules: [
+    {
+      owners: [{name: 'ampproject/wg-components'}],
+    },
+  ],
+}
diff --git a/src/bento/components/bento-youtube/bento-youtube.md b/src/bento/components/bento-youtube/bento-youtube.md
new file mode 100644
index 000000000000..d965311ba6d4
--- /dev/null
+++ b/src/bento/components/bento-youtube/bento-youtube.md
@@ -0,0 +1,257 @@
+---
+$category@: media
+formats:
+  - websites
+teaser:
+  text: Displays a YouTube video.
+experimental: true
+bento: true
+---
+
+# bento-youtube
+
+## Usage
+
+Displays a YouTube video.
+
+With the responsive layout, the width and height from the example should yield correct layouts for 16:9 aspect ratio videos:
+
+```html
+<bento-youtube
+  data-videoid="mGENRKrdoGY"
+  layout="responsive"
+  width="480"
+  height="270"
+></bento-youtube>
+```
+
+```html
+<bento-youtube
+  id="myLiveChannel"
+  data-live-channelid="UCB8Kb4pxYzsDsHxzBfnid4Q"
+  width="358"
+  height="204"
+  layout="responsive"
+>
+  <amp-img
+    src="https://i.ytimg.com/vi/Wm1fWz-7nLQ/hqdefault_live.jpg"
+    placeholder
+    layout="fill"
+  />
+</bento-youtube>
+```
+
+#### Standalone use outside valid AMP documents
+
+Bento AMP allows you to use AMP components in non-AMP pages without needing to commit to fully valid AMP. You can take these components and place them in implementations with frameworks and CMSs that don't support AMP. Read more in our guide [Use AMP components in non-AMP pages](https://amp.dev/documentation/guides-and-tutorials/start/bento_guide/).
+
+[example preview="top-frame" playground="false"]
+
+```html
+<head>
+  <script async src="https://cdn.ampproject.org/v0.js"></script>
+  <link rel="stylesheet" type="text/css" href="https://cdn.ampproject.org/v0/bento-youtube-1.0.css">
+  <script async custom-element="bento-youtube" src="https://cdn.ampproject.org/v0/bento-youtube-1.0.js"></script>
+</head>
+<body>
+  <bento-youtube
+    style="aspect-ratio: 16/9"
+    id="my-youtube-video"
+    data-videoid="mGENRKrdoGY"
+  ></bento-youtube>
+  <script>
+    (async () => {
+      const video = document.querySelector('#my-youtube-video');
+      await customElements.whenDefined('bento-youtube');
+      const videoHandle = await video.getApi();
+
+      // programatically call playback actions
+      videoHandle.play();
+      videoHandle.pause();
+      videoHandle.requestFullscreen();
+      videoHandle.mute();
+      videoHandle.unmute();
+
+      // get video state
+      console.log({
+        autoplay: videoHandle.autoplay,
+        controls: videoHandle.controls,
+        duration: videoHandle.duration,
+        currentTime: videoHandle.currentTime,
+        loop: videoHandle.loop,
+      })
+    })();
+  </script>
+</body>
+```
+
+[/example]
+
+#### Interactivity and API usage
+
+Bento are highly interactive through their API. In Bento standalone use, the element's API replaces AMP Actions and events and [`amp-bind`](https://amp.dev/documentation/components/amp-bind/?format=websites).
+
+The `bento-youtube` component API is accessible by including the following script tag in your document:
+
+```js
+await customElements.whenDefined('bento-youtube');
+const videoHandle = await video.getApi();
+```
+
+##### Actions
+
+The `bento-youtube` API allows you to perform the following actions:
+
+##### `play()`
+
+Plays the video.
+
+```js
+videoHandle.play();
+```
+
+##### `pause()`
+
+Pauses the video.
+
+```js
+videoHandle.pause();
+```
+
+##### `mute()`
+
+Mutes the video.
+
+```js
+videoHandle.mute();
+```
+
+##### `unmute()`
+
+Unmutes the video.
+
+```js
+videoHandle.unmute();
+```
+
+##### `requestFullscreen()`
+
+Expands the video to fullscreen when possible.
+
+```js
+videoHandle.requestFullscreen();
+```
+
+#### Properties
+
+It also exposes the following read-only properties:
+
+##### `currentTime` (`number`)
+
+The current playback time in seconds.
+
+```js
+console.log(videoHandle.currentTime);
+```
+
+##### `duration` (`number`)
+
+The video's duration in seconds, when it's known (e.g. is not a livestream).
+
+```js
+console.log(videoHandle.duration);
+```
+
+##### `autoplay` (`boolean`)
+
+Whether the video autoplays.
+
+```js
+console.log(videoHandle.autoplay);
+```
+
+##### `controls` (`boolean`)
+
+Whether the video shows controls.
+
+```js
+console.log(videoHandle.controls);
+```
+
+##### `loop` (`boolean`)
+
+Whether the video loops.
+
+```js
+console.log(videoHandle.loop);
+```
+
+### Migrating from 0.1
+
+The experimental `1.0` version of `bento-youtube` does not automatically convert `data-param-controls` to `controls`. Instead it takes `controls` directly as an attribute.
+
+## Attributes
+
+### autoplay
+
+If this attribute is present, and the browser supports autoplay:
+
+<ul>
+  <li>the video is automatically muted before autoplay starts
+  </li>
+  <li>when the video is scrolled out of view, the video is paused
+  </li>
+  <li>when the video is scrolled into view, the video resumes playback
+  </li>
+  <li>when the user taps the video, the video is unmuted
+  </li>
+  <li>if the user has interacted with the video (e.g., mutes/unmutes, pauses/resumes, etc.), and the video is scrolled in or out of view, the state of the video remains as how the user left it. For example, if the user pauses the video, then scrolls the video out of view and returns to the video, the video is still paused.
+  </li>
+</ul>
+
+### loop
+
+If this attribute is present, the video or playlist will play again (from the beginning) once it ends.
+
+### data-videoid
+
+The YouTube video id found in every YouTube video page URL.
+
+For example, in this URL: `https://www.youtube.com/watch?v=Z1q71gFeRqM`, `Z1q71gFeRqM` is the video id.
+
+### data-live-channelid
+
+The Youtube channel id that provides a stable livestream url. For example, in this URL: `https://www.youtube.com/embed/live_stream?channel=UCB8Kb4pxYzsDsHxzBfnid4Q`, `UCB8Kb4pxYzsDsHxzBfnid4Q` is the channel id. You can provide a `data-live-channelid` instead of a `data-videoid` attribute to embed a stable url for a live stream instead of a video. Channels do not come with default placeholders. You can provide a placeholder for the video per example 2 above.
+
+### data-param-\*
+
+All `data-param-*` attributes (with the exception of `data-param-autoplay` and `data-param-loop`) will be added as query parameter to the YouTube iframe src. This may be used to pass custom values through to YouTube plugins, such as whether to show controls.
+
+Keys and values will be URI encoded. Keys will be camel cased
+
+### controls
+
+See [YouTube Embedded Player Parameters](https://developers.google.com/youtube/player_parameters) for more parameter options for YouTube.
+
+[tip type="note"]
+Use the `autoplay` attribute instead of `data-param-autoplay` and the `loop` attribute instead of `data-param-loop` since both the autoplay and looping behaviors are handled internally by AMP instead of the Youtube player.
+[/tip]
+
+### credentials (optional)
+
+Defines a `credentials` option as specified by the [Fetch API](https://fetch.spec.whatwg.org/).
+
+-   Supported values: `omit`, `include`
+-   Default: `include`
+
+If you want to use the [YouTube player in privacy-enhanced mode](http://www.google.com/support/youtube/bin/answer.py?answer=141046), pass the value of `omit`.
+
+Usually YouTube sets its cookies when the player is loaded. In privacy-enhanced mode cookies are set when the user has clicked on the player.
+
+### title (optional)
+
+Define a `title` attribute for the component to propagate to the underlying `<iframe>` element. The default value is `"YouTube video"`.
+
+### common attributes
+
+This element includes [common attributes](https://amp.dev/documentation/guides-and-tutorials/learn/common_attributes) extended to AMP components.
diff --git a/src/bento/third_party/mustache/LICENSE b/src/bento/third_party/mustache/LICENSE
new file mode 100644
index 000000000000..4df7d1aae6fb
--- /dev/null
+++ b/src/bento/third_party/mustache/LICENSE
@@ -0,0 +1,11 @@
+The MIT License
+
+Copyright (c) 2009 Chris Wanstrath (Ruby)
+Copyright (c) 2010-2014 Jan Lehnardt (JavaScript)
+Copyright (c) 2010-2015 The mustache.js community
+
+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/src/bento/third_party/mustache/mustache.js b/src/bento/third_party/mustache/mustache.js
new file mode 100644
index 000000000000..d5449991f5a9
--- /dev/null
+++ b/src/bento/third_party/mustache/mustache.js
@@ -0,0 +1,923 @@
+/* eslint-disable */
+
+/*!
+ * mustache.js - Logic-less {{mustache}} templates with JavaScript
+ * http://github.com/janl/mustache.js
+ */
+
+const objectToString = Object.prototype.toString;
+const isArray =
+  Array.isArray ||
+  function isArrayPolyfill(object) {
+    return objectToString.call(object) === '[object Array]';
+  };
+
+function isFunction(object) {
+  return typeof object === 'function';
+}
+
+/**
+ * More correct typeof string handling array
+ * which normally returns typeof 'object'
+ * @param obj
+ */
+function typeStr(obj) {
+  return isArray(obj) ? 'array' : typeof obj;
+}
+
+function escapeRegExp(string) {
+  return string.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, '\\$&');
+}
+
+/**
+ * Null safe way of checking whether or not an object,
+ * including its prototype, has a given property
+ * @param obj
+ * @param propName
+ */
+function hasProperty(obj, propName) {
+  return obj != null && typeof obj === 'object' && propName in obj;
+}
+
+/**
+ * Safe way of detecting whether or not the given thing is a primitive and
+ * whether it has the given property
+ * @param primitive
+ * @param propName
+ */
+function primitiveHasOwnProperty(primitive, propName) {
+  return (
+    primitive != null &&
+    typeof primitive !== 'object' &&
+    primitive.hasOwnProperty &&
+    primitive.hasOwnProperty(propName)
+  );
+}
+
+// Workaround for https://issues.apache.org/jira/browse/COUCHDB-577
+// See https://github.com/janl/mustache.js/issues/189
+const regExpTest = RegExp.prototype.test;
+function testRegExp(re, string) {
+  return regExpTest.call(re, string);
+}
+
+const nonSpaceRe = /\S/;
+function isWhitespace(string) {
+  return !testRegExp(nonSpaceRe, string);
+}
+
+const entityMap = {
+  '&': '&amp;',
+  '<': '&lt;',
+  '>': '&gt;',
+  '"': '&quot;',
+  "'": '&#39;',
+  '/': '&#x2F;',
+  '`': '&#x60;',
+  '=': '&#x3D;',
+};
+
+function escapeHtml(string) {
+  return String(string).replace(/[&<>"'`=\/]/g, function fromEntityMap(s) {
+    return entityMap[s];
+  });
+}
+
+const whiteRe = /\s*/;
+const spaceRe = /\s+/;
+const equalsRe = /\s*=/;
+const curlyRe = /\s*\}/;
+const tagRe = /#|\^|\/|>|\{|&|=|!/;
+
+/**
+ * Breaks up the given `template` string into a tree of tokens. If the `tags`
+ * argument is given here it must be an array with two string values: the
+ * opening and closing tags used in the template (e.g. [ "<%", "%>" ]). Of
+ * course, the default is to use mustaches (i.e. mustache.tags).
+ *
+ * A token is an array with at least 4 elements. The first element is the
+ * mustache symbol that was used inside the tag, e.g. "#" or "&". If the tag
+ * did not contain a symbol (i.e. {{myValue}}) this element is "name". For
+ * all text that appears outside a symbol this element is "text".
+ *
+ * The second element of a token is its "value". For mustache tags this is
+ * whatever else was inside the tag besides the opening symbol. For text tokens
+ * this is the text itself.
+ *
+ * The third and fourth elements of the token are the start and end indices,
+ * respectively, of the token in the original template.
+ *
+ * Tokens that are the root node of a subtree contain two more elements: 1) an
+ * array of tokens in the subtree and 2) the index in the original template at
+ * which the closing tag for that section begins.
+ *
+ * Tokens for partials also contain two more elements: 1) a string value of
+ * indendation prior to that tag and 2) the index of that tag on that line -
+ * eg a value of 2 indicates the partial is the third tag on this line.
+ * @param template
+ * @param tags
+ */
+function parseTemplate(template, tags) {
+  if (!template) {
+    return [];
+  }
+  let lineHasNonSpace = false;
+  const sections = []; // Stack to hold section tokens
+  const tokens = []; // Buffer to hold the tokens
+  let spaces = []; // Indices of whitespace tokens on the current line
+  let hasTag = false; // Is there a {{tag}} on the current line?
+  let nonSpace = false; // Is there a non-space char on the current line?
+  let indentation = ''; // Tracks indentation for tags that use it
+  let tagIndex = 0; // Stores a count of number of tags encountered on a line
+
+  // Strips all whitespace tokens array for the current line
+  // if there was a {{#tag}} on it and otherwise only space.
+  function stripSpace() {
+    if (hasTag && !nonSpace) {
+      while (spaces.length) {
+        delete tokens[spaces.pop()];
+      }
+    } else {
+      spaces = [];
+    }
+
+    hasTag = false;
+    nonSpace = false;
+  }
+
+  let openingTagRe, closingTagRe, closingCurlyRe;
+  function compileTags(tagsToCompile) {
+    if (typeof tagsToCompile === 'string') {
+      tagsToCompile = tagsToCompile.split(spaceRe, 2);
+    }
+
+    if (!isArray(tagsToCompile) || tagsToCompile.length !== 2) {
+      throw new Error('Invalid tags: ' + tagsToCompile);
+    }
+
+    openingTagRe = new RegExp(escapeRegExp(tagsToCompile[0]) + '\\s*');
+    closingTagRe = new RegExp('\\s*' + escapeRegExp(tagsToCompile[1]));
+    closingCurlyRe = new RegExp('\\s*' + escapeRegExp('}' + tagsToCompile[1]));
+  }
+
+  compileTags(tags || mustache.tags);
+
+  const scanner = new Scanner(template);
+
+  let start, type, value, chr, token, openSection;
+  while (!scanner.eos()) {
+    start = scanner.pos;
+
+    // Match any text between tags.
+    value = scanner.scanUntil(openingTagRe);
+
+    if (value) {
+      for (let i = 0, valueLength = value.length; i < valueLength; ++i) {
+        chr = value.charAt(i);
+
+        if (isWhitespace(chr)) {
+          spaces.push(tokens.length);
+          indentation += chr;
+        } else {
+          nonSpace = true;
+          lineHasNonSpace = true;
+          indentation += ' ';
+        }
+
+        tokens.push(['text', chr, start, start + 1]);
+        start += 1;
+
+        // Check for whitespace on the current line.
+        if (chr === '\n') {
+          stripSpace();
+          indentation = '';
+          tagIndex = 0;
+          lineHasNonSpace = false;
+        }
+      }
+    }
+
+    // Match the opening tag.
+    if (!scanner.scan(openingTagRe)) {
+      break;
+    }
+
+    hasTag = true;
+
+    // Get the tag type.
+    type = scanner.scan(tagRe) || 'name';
+    scanner.scan(whiteRe);
+
+    // Get the tag value.
+    if (type === '=') {
+      value = scanner.scanUntil(equalsRe);
+      scanner.scan(equalsRe);
+      scanner.scanUntil(closingTagRe);
+    } else if (type === '{') {
+      value = scanner.scanUntil(closingCurlyRe);
+      scanner.scan(curlyRe);
+      scanner.scanUntil(closingTagRe);
+      type = '&';
+    } else {
+      value = scanner.scanUntil(closingTagRe);
+    }
+
+    // Match the closing tag.
+    if (!scanner.scan(closingTagRe)) {
+      throw new Error('Unclosed tag at ' + scanner.pos);
+    }
+
+    if (type == '>') {
+      token = [
+        type,
+        value,
+        start,
+        scanner.pos,
+        indentation,
+        tagIndex,
+        lineHasNonSpace,
+      ];
+    } else {
+      token = [type, value, start, scanner.pos];
+    }
+    tagIndex++;
+    tokens.push(token);
+
+    if (type === '#' || type === '^') {
+      sections.push(token);
+    } else if (type === '/') {
+      // Check section nesting.
+      openSection = sections.pop();
+
+      if (!openSection) {
+        throw new Error('Unopened section "' + value + '" at ' + start);
+      }
+
+      if (openSection[1] !== value) {
+        throw new Error(
+          'Unclosed section "' + openSection[1] + '" at ' + start
+        );
+      }
+    } else if (type === 'name' || type === '{' || type === '&') {
+      nonSpace = true;
+    } else if (type === '=') {
+      // Set the tags for the next time around.
+      compileTags(value);
+    }
+  }
+
+  stripSpace();
+
+  // Make sure there are no open sections when we're done.
+  openSection = sections.pop();
+
+  if (openSection) {
+    throw new Error(
+      'Unclosed section "' + openSection[1] + '" at ' + scanner.pos
+    );
+  }
+
+  return nestTokens(squashTokens(tokens));
+}
+
+/**
+ * Combines the values of consecutive text tokens in the given `tokens` array
+ * to a single token.
+ * @param tokens
+ */
+function squashTokens(tokens) {
+  const squashedTokens = [];
+
+  let token, lastToken;
+  for (let i = 0, numTokens = tokens.length; i < numTokens; ++i) {
+    token = tokens[i];
+
+    if (token) {
+      if (token[0] === 'text' && lastToken && lastToken[0] === 'text') {
+        lastToken[1] += token[1];
+        lastToken[3] = token[3];
+      } else {
+        squashedTokens.push(token);
+        lastToken = token;
+      }
+    }
+  }
+
+  return squashedTokens;
+}
+
+/**
+ * Forms the given array of `tokens` into a nested tree structure where
+ * tokens that represent a section have two additional items: 1) an array of
+ * all tokens that appear in that section and 2) the index in the original
+ * template that represents the end of that section.
+ * @param tokens
+ */
+function nestTokens(tokens) {
+  const nestedTokens = [];
+  let collector = nestedTokens;
+  const sections = [];
+
+  let token, section;
+  for (let i = 0, numTokens = tokens.length; i < numTokens; ++i) {
+    token = tokens[i];
+
+    switch (token[0]) {
+      case '#':
+      case '^':
+        collector.push(token);
+        sections.push(token);
+        collector = token[4] = [];
+        break;
+      case '/':
+        section = sections.pop();
+        section[5] = token[2];
+        collector =
+          sections.length > 0 ? sections[sections.length - 1][4] : nestedTokens;
+        break;
+      default:
+        collector.push(token);
+    }
+  }
+
+  return nestedTokens;
+}
+
+/**
+ * A simple string scanner that is used by the template parser to find
+ * tokens in template strings.
+ * @param string
+ */
+function Scanner(string) {
+  this.string = string;
+  this.tail = string;
+  this.pos = 0;
+}
+
+/**
+ * Returns `true` if the tail is empty (end of string).
+ */
+Scanner.prototype.eos = function eos() {
+  return this.tail === '';
+};
+
+/**
+ * Tries to match the given regular expression at the current position.
+ * Returns the matched text if it can match, the empty string otherwise.
+ * @param re
+ */
+Scanner.prototype.scan = function scan(re) {
+  const match = this.tail.match(re);
+
+  if (!match || match.index !== 0) {
+    return '';
+  }
+
+  const string = match[0];
+
+  this.tail = this.tail.substring(string.length);
+  this.pos += string.length;
+
+  return string;
+};
+
+/**
+ * Skips all text until the given regular expression can be matched. Returns
+ * the skipped string, which is the entire tail if no match can be made.
+ * @param re
+ */
+Scanner.prototype.scanUntil = function scanUntil(re) {
+  let index = this.tail.search(re),
+    match;
+
+  switch (index) {
+    case -1:
+      match = this.tail;
+      this.tail = '';
+      break;
+    case 0:
+      match = '';
+      break;
+    default:
+      match = this.tail.substring(0, index);
+      this.tail = this.tail.substring(index);
+  }
+
+  this.pos += match.length;
+
+  return match;
+};
+
+/**
+ * Represents a rendering context by wrapping a view object and
+ * maintaining a reference to the parent context.
+ * @param view
+ * @param parentContext
+ */
+function Context(view, parentContext) {
+  this.view = view;
+  this.cache = {'.': this.view};
+  this.parent = parentContext;
+}
+
+/**
+ * Creates a new context using the given view with this context
+ * as the parent.
+ * @param view
+ */
+Context.prototype.push = function push(view) {
+  return new Context(view, this);
+};
+
+/**
+ * Returns the value of the given name in this context, traversing
+ * up the context hierarchy if the value is absent in this context's view.
+ * @param name
+ */
+Context.prototype.lookup = function lookup(name) {
+  const {cache} = this;
+
+  let value;
+  if (cache.hasOwnProperty(name)) {
+    value = cache[name];
+  } else {
+    let context = this,
+      intermediateValue,
+      names,
+      index,
+      lookupHit = false;
+
+    while (context) {
+      if (name.indexOf('.') > 0) {
+        intermediateValue = context.view;
+        names = name.split('.');
+        index = 0;
+
+        /**
+         * Using the dot notion path in `name`, we descend through the
+         * nested objects.
+         *
+         * To be certain that the lookup has been successful, we have to
+         * check if the last object in the path actually has the property
+         * we are looking for. We store the result in `lookupHit`.
+         *
+         * This is specially necessary for when the value has been set to
+         * `undefined` and we want to avoid looking up parent contexts.
+         *
+         * In the case where dot notation is used, we consider the lookup
+         * to be successful even if the last "object" in the path is
+         * not actually an object but a primitive (e.g., a string, or an
+         * integer), because it is sometimes useful to access a property
+         * of an autoboxed primitive, such as the length of a string.
+         **/
+        while (intermediateValue != null && index < names.length) {
+          if (index === names.length - 1) {
+            lookupHit =
+              hasProperty(intermediateValue, names[index]) ||
+              primitiveHasOwnProperty(intermediateValue, names[index]);
+          }
+
+          intermediateValue = intermediateValue[names[index++]];
+        }
+      } else {
+        intermediateValue = context.view[name];
+
+        /**
+         * Only checking against `hasProperty`, which always returns `false` if
+         * `context.view` is not an object. Deliberately omitting the check
+         * against `primitiveHasOwnProperty` if dot notation is not used.
+         *
+         * Consider this example:
+         * ```
+         * Mustache.render("The length of a football field is {{#length}}{{length}}{{/length}}.", {length: "100 yards"})
+         * ```
+         *
+         * If we were to check also against `primitiveHasOwnProperty`, as we do
+         * in the dot notation case, then render call would return:
+         *
+         * "The length of a football field is 9."
+         *
+         * rather than the expected:
+         *
+         * "The length of a football field is 100 yards."
+         **/
+        lookupHit = hasProperty(context.view, name);
+      }
+
+      if (lookupHit) {
+        value = intermediateValue;
+        break;
+      }
+
+      context = context.parent;
+    }
+
+    cache[name] = value;
+  }
+
+  if (isFunction(value)) {
+    value = value.call(this.view);
+  }
+
+  return value;
+};
+
+/**
+ * A Writer knows how to take a stream of tokens and render them to a
+ * string, given a context. It also maintains a cache of templates to
+ * avoid the need to parse the same template twice.
+ */
+function Writer() {
+  this.templateCache = {
+    _cache: {},
+    set: function set(key, value) {
+      this._cache[key] = value;
+    },
+    get: function get(key) {
+      return this._cache[key];
+    },
+    clear: function clear() {
+      this._cache = {};
+    },
+  };
+}
+
+/**
+ * Clears all cached templates in this writer.
+ */
+Writer.prototype.clearCache = function clearCache() {
+  if (typeof this.templateCache !== 'undefined') {
+    this.templateCache.clear();
+  }
+};
+
+/**
+ * Parses and caches the given `template` according to the given `tags` or
+ * `mustache.tags` if `tags` is omitted,  and returns the array of tokens
+ * that is generated from the parse.
+ * @param template
+ * @param tags
+ */
+Writer.prototype.parse = function parse(template, tags) {
+  const cache = this.templateCache;
+  const cacheKey = template + ':' + (tags || mustache.tags).join(':');
+  const isCacheEnabled = typeof cache !== 'undefined';
+  let tokens = isCacheEnabled ? cache.get(cacheKey) : undefined;
+
+  if (tokens == undefined) {
+    tokens = parseTemplate(template, tags);
+    isCacheEnabled && cache.set(cacheKey, tokens);
+  }
+  return tokens;
+};
+
+/**
+ * High-level method that is used to render the given `template` with
+ * the given `view`.
+ *
+ * The optional `partials` argument may be an object that contains the
+ * names and templates of partials that are used in the template. It may
+ * also be a function that is used to load partial templates on the fly
+ * that takes a single argument: the name of the partial.
+ *
+ * If the optional `config` argument is given here, then it should be an
+ * object with a `tags` attribute or an `escape` attribute or both.
+ * If an array is passed, then it will be interpreted the same way as
+ * a `tags` attribute on a `config` object.
+ *
+ * The `tags` attribute of a `config` object must be an array with two
+ * string values: the opening and closing tags used in the template (e.g.
+ * [ "<%", "%>" ]). The default is to mustache.tags.
+ *
+ * The `escape` attribute of a `config` object must be a function which
+ * accepts a string as input and outputs a safely escaped string.
+ * If an `escape` function is not provided, then an HTML-safe string
+ * escaping function is used as the default.
+ * @param template
+ * @param view
+ * @param partials
+ * @param config
+ */
+Writer.prototype.render = function render(template, view, partials, config) {
+  const tags = this.getConfigTags(config);
+  const tokens = this.parse(template, tags);
+  const context = view instanceof Context ? view : new Context(view, undefined);
+  return this.renderTokens(tokens, context, partials, template, config);
+};
+
+/**
+ * Low-level method that renders the given array of `tokens` using
+ * the given `context` and `partials`.
+ *
+ * Note: The `originalTemplate` is only ever used to extract the portion
+ * of the original template that was contained in a higher-order section.
+ * If the template doesn't use higher-order sections, this argument may
+ * be omitted.
+ * @param tokens
+ * @param context
+ * @param partials
+ * @param originalTemplate
+ * @param config
+ */
+Writer.prototype.renderTokens = function renderTokens(
+  tokens,
+  context,
+  partials,
+  originalTemplate,
+  config
+) {
+  let buffer = '';
+
+  let token, symbol, value;
+  for (let i = 0, numTokens = tokens.length; i < numTokens; ++i) {
+    value = undefined;
+    token = tokens[i];
+    symbol = token[0];
+
+    if (symbol === '#') {
+      value = this.renderSection(
+        token,
+        context,
+        partials,
+        originalTemplate,
+        config
+      );
+    } else if (symbol === '^') {
+      value = this.renderInverted(
+        token,
+        context,
+        partials,
+        originalTemplate,
+        config
+      );
+    } else if (symbol === '>') {
+      value = this.renderPartial(token, context, partials, config);
+    } else if (symbol === '&') {
+      value = this.unescapedValue(token, context);
+    } else if (symbol === 'name') {
+      value = this.escapedValue(token, context, config);
+    } else if (symbol === 'text') {
+      value = this.rawValue(token);
+    }
+
+    if (value !== undefined) {
+      buffer += value;
+    }
+  }
+
+  return buffer;
+};
+
+Writer.prototype.renderSection = function renderSection(
+  token,
+  context,
+  partials,
+  originalTemplate,
+  config
+) {
+  const self = this;
+  let buffer = '';
+  let value = context.lookup(token[1]);
+
+  // This function is used to render an arbitrary template
+  // in the current context by higher-order sections.
+  function subRender(template) {
+    return self.render(template, context, partials, config);
+  }
+
+  if (!value) {
+    return;
+  }
+
+  if (isArray(value)) {
+    for (let j = 0, valueLength = value.length; j < valueLength; ++j) {
+      buffer += this.renderTokens(
+        token[4],
+        context.push(value[j]),
+        partials,
+        originalTemplate,
+        config
+      );
+    }
+  } else if (
+    typeof value === 'object' ||
+    typeof value === 'string' ||
+    typeof value === 'number'
+  ) {
+    buffer += this.renderTokens(
+      token[4],
+      context.push(value),
+      partials,
+      originalTemplate,
+      config
+    );
+  } else if (isFunction(value)) {
+    if (typeof originalTemplate !== 'string') {
+      throw new Error(
+        'Cannot use higher-order sections without the original template'
+      );
+    }
+
+    // Extract the portion of the original template that the section contains.
+    value = value.call(
+      context.view,
+      originalTemplate.slice(token[3], token[5]),
+      subRender
+    );
+
+    if (value != null) {
+      buffer += value;
+    }
+  } else {
+    buffer += this.renderTokens(
+      token[4],
+      context,
+      partials,
+      originalTemplate,
+      config
+    );
+  }
+  return buffer;
+};
+
+Writer.prototype.renderInverted = function renderInverted(
+  token,
+  context,
+  partials,
+  originalTemplate,
+  config
+) {
+  const value = context.lookup(token[1]);
+
+  // Use JavaScript's definition of falsy. Include empty arrays.
+  // See https://github.com/janl/mustache.js/issues/186
+  if (!value || (isArray(value) && value.length === 0)) {
+    return this.renderTokens(
+      token[4],
+      context,
+      partials,
+      originalTemplate,
+      config
+    );
+  }
+};
+
+Writer.prototype.indentPartial = function indentPartial(
+  partial,
+  indentation,
+  lineHasNonSpace
+) {
+  const filteredIndentation = indentation.replace(/[^ \t]/g, '');
+  const partialByNl = partial.split('\n');
+  for (let i = 0; i < partialByNl.length; i++) {
+    if (partialByNl[i].length && (i > 0 || !lineHasNonSpace)) {
+      partialByNl[i] = filteredIndentation + partialByNl[i];
+    }
+  }
+  return partialByNl.join('\n');
+};
+
+Writer.prototype.renderPartial = function renderPartial(
+  token,
+  context,
+  partials,
+  config
+) {
+  if (!partials) {
+    return;
+  }
+  const tags = this.getConfigTags(config);
+
+  const value = isFunction(partials) ? partials(token[1]) : partials[token[1]];
+  if (value != null) {
+    const lineHasNonSpace = token[6];
+    const tagIndex = token[5];
+    const indentation = token[4];
+    let indentedValue = value;
+    if (tagIndex == 0 && indentation) {
+      indentedValue = this.indentPartial(value, indentation, lineHasNonSpace);
+    }
+    const tokens = this.parse(indentedValue, tags);
+    return this.renderTokens(tokens, context, partials, indentedValue, config);
+  }
+};
+
+Writer.prototype.unescapedValue = function unescapedValue(token, context) {
+  const value = context.lookup(token[1]);
+  if (value != null) {
+    return value;
+  }
+};
+
+Writer.prototype.escapedValue = function escapedValue(token, context, config) {
+  const escape = this.getConfigEscape(config) || mustache.escape;
+  const value = context.lookup(token[1]);
+  if (value != null) {
+    return typeof value === 'number' && escape === mustache.escape
+      ? String(value)
+      : escape(value);
+  }
+};
+
+Writer.prototype.rawValue = function rawValue(token) {
+  return token[1];
+};
+
+Writer.prototype.getConfigTags = function getConfigTags(config) {
+  if (isArray(config)) {
+    return config;
+  } else if (config && typeof config === 'object') {
+    return config.tags;
+  } else {
+    return undefined;
+  }
+};
+
+Writer.prototype.getConfigEscape = function getConfigEscape(config) {
+  if (config && typeof config === 'object' && !isArray(config)) {
+    return config.escape;
+  } else {
+    return undefined;
+  }
+};
+
+var mustache = {
+  name: 'mustache.js',
+  version: '4.2.0',
+  tags: ['{{', '}}'],
+  clearCache: undefined,
+  escape: undefined,
+  parse: undefined,
+  render: undefined,
+  Scanner: undefined,
+  Context: undefined,
+  Writer: undefined,
+  /**
+   * Allows a user to override the default caching strategy, by providing an
+   * object with set, get and clear methods. This can also be used to disable
+   * the cache by setting it to the literal `undefined`.
+   */
+  set templateCache(cache) {
+    defaultWriter.templateCache = cache;
+  },
+  /**
+   * Gets the default or overridden caching object from the default writer.
+   */
+  get templateCache() {
+    return defaultWriter.templateCache;
+  },
+};
+
+// All high-level mustache.* functions use this writer.
+var defaultWriter = new Writer();
+
+/**
+ * Clears all cached templates in the default writer.
+ */
+mustache.clearCache = function clearCache() {
+  return defaultWriter.clearCache();
+};
+
+/**
+ * Parses and caches the given template in the default writer and returns the
+ * array of tokens it contains. Doing this ahead of time avoids the need to
+ * parse templates on the fly as they are rendered.
+ * @param template
+ * @param tags
+ */
+mustache.parse = function parse(template, tags) {
+  return defaultWriter.parse(template, tags);
+};
+
+/**
+ * Renders the `template` with the given `view`, `partials`, and `config`
+ * using the default writer.
+ * @param template
+ * @param view
+ * @param partials
+ * @param config
+ */
+mustache.render = function render(template, view, partials, config) {
+  if (typeof template !== 'string') {
+    throw new TypeError(
+      'Invalid template! Template should be a "string" ' +
+        'but "' +
+        typeStr(template) +
+        '" was given as the first ' +
+        'argument for mustache#render(template, view, partials)'
+    );
+  }
+
+  return defaultWriter.render(template, view, partials, config);
+};
+
+// Export the escaping function so that the user may override it.
+// See https://github.com/janl/mustache.js/issues/244
+mustache.escape = escapeHtml;
+
+// Export these mainly for testing, but also for advanced usage.
+mustache.Scanner = Scanner;
+mustache.Context = Context;
+mustache.Writer = Writer;
+
+export default mustache;
diff --git a/src/bento/util/e2e-helpers.js b/src/bento/util/e2e-helpers.js
new file mode 100644
index 000000000000..5dcf55bef961
--- /dev/null
+++ b/src/bento/util/e2e-helpers.js
@@ -0,0 +1,13 @@
+/**
+ * @param {!Object} config
+ * @param {!Object} fn
+ * @return {!Object}
+ */
+export function getDefaultArgs(config, fn) {
+  const args = {...config.args, ...fn.args};
+  const argTypes = {...config.argTypes, ...fn.argTypes};
+  for (const [name, argType] of Object.entries(argTypes)) {
+    args[name] = argType.defaultValue || args[name];
+  }
+  return args;
+}
diff --git a/src/bento/util/template.js b/src/bento/util/template.js
new file mode 100644
index 000000000000..acc49833c477
--- /dev/null
+++ b/src/bento/util/template.js
@@ -0,0 +1,18 @@
+import {escapeCssSelectorIdent} from '#core/dom/css-selectors';
+
+/**
+ * @param {HTMLElement} element
+ * @param {string} attribute
+ * @return {HTMLTemplateElement|null}
+ */
+export function getTemplate(element, attribute = 'template') {
+  if (element.hasAttribute(attribute)) {
+    const id = element.getAttribute(attribute);
+    return Boolean(id)
+      ? element.ownerDocument.querySelector(
+          `template#${escapeCssSelectorIdent(id)}`
+        )
+      : null;
+  }
+  return element.querySelector('template');
+}
diff --git a/src/bento/util/unit-helpers.js b/src/bento/util/unit-helpers.js
new file mode 100644
index 000000000000..7f5348ddd63b
--- /dev/null
+++ b/src/bento/util/unit-helpers.js
@@ -0,0 +1,9 @@
+/**
+ * @param {Window} win
+ * @param {string} css
+ */
+export function adoptStyles(win, css) {
+  const style = win.document.createElement('style');
+  style.textContent = css;
+  win.document.head.appendChild(style);
+}
diff --git a/src/builtins/amp-img/amp-img.js b/src/builtins/amp-img/amp-img.js
index d924637cd526..05d2ae5c06c0 100644
--- a/src/builtins/amp-img/amp-img.js
+++ b/src/builtins/amp-img/amp-img.js
@@ -1,7 +1,11 @@
-import {ReadyState} from '#core/constants/ready-state';
+import {ReadyState_Enum} from '#core/constants/ready-state';
 import {isServerRendered, removeElement} from '#core/dom';
 import {guaranteeSrcForSrcsetUnsupportedBrowsers} from '#core/dom/img';
-import {Layout, applyFillContent, isLayoutSizeDefined} from '#core/dom/layout';
+import {
+  Layout_Enum,
+  applyFillContent,
+  isLayoutSizeDefined,
+} from '#core/dom/layout';
 import {propagateAttributes} from '#core/dom/propagate-attributes';
 import {scopedQuerySelector} from '#core/dom/query';
 import {propagateObjectFitStyles, setImportantStyles} from '#core/dom/style';
@@ -37,22 +41,22 @@ export const ATTRIBUTES_TO_PROPAGATE = [
 ];
 
 export class AmpImg extends BaseElement {
-  /** @override @nocollapse */
+  /** @override  */
   static R1() {
     return R1_IMG_DEFERRED_BUILD;
   }
 
-  /** @override @nocollapse */
+  /** @override  */
   static prerenderAllowed() {
     return true;
   }
 
-  /** @override @nocollapse */
+  /** @override  */
   static usesLoading() {
     return true;
   }
 
-  /** @override @nocollapse */
+  /** @override  */
   static getPreconnects(element) {
     const src = element.getAttribute('src');
     if (src) {
@@ -134,7 +138,7 @@ export class AmpImg extends BaseElement {
       }
 
       if (AmpImg.R1() && !this.img_.complete) {
-        this.setReadyState(ReadyState.LOADING);
+        this.setReadyState(ReadyState_Enum.LOADING);
       }
     }
   }
@@ -266,7 +270,7 @@ export class AmpImg extends BaseElement {
     const entry = `(max-width: ${viewportWidth}px) ${width}px, `;
     let defaultSize = width + 'px';
 
-    if (this.getLayout() !== Layout.FIXED) {
+    if (this.getLayout() !== Layout_Enum.FIXED) {
       const ratio = Math.round((width * 100) / viewportWidth);
       defaultSize = Math.max(ratio, 100) + 'vw';
     }
@@ -306,21 +310,21 @@ export class AmpImg extends BaseElement {
     const img = this.initialize_();
     if (!initialized) {
       listen(img, 'load', () => {
-        this.setReadyState(ReadyState.COMPLETE);
+        this.setReadyState(ReadyState_Enum.COMPLETE);
         this.firstLayoutCompleted();
         this.hideFallbackImg_();
       });
       listen(img, 'error', (reason) => {
-        this.setReadyState(ReadyState.ERROR, reason);
+        this.setReadyState(ReadyState_Enum.ERROR, reason);
         this.onImgLoadingError_();
       });
     }
     if (img.complete) {
-      this.setReadyState(ReadyState.COMPLETE);
+      this.setReadyState(ReadyState_Enum.COMPLETE);
       this.firstLayoutCompleted();
       this.hideFallbackImg_();
     } else {
-      this.setReadyState(ReadyState.LOADING);
+      this.setReadyState(ReadyState_Enum.LOADING);
     }
   }
 
diff --git a/src/builtins/amp-layout/amp-layout.js b/src/builtins/amp-layout/amp-layout.js
index a57aa809cfb6..3f2657f1c184 100644
--- a/src/builtins/amp-layout/amp-layout.js
+++ b/src/builtins/amp-layout/amp-layout.js
@@ -1,4 +1,4 @@
-import {Layout, isLayoutSizeDefined} from '#core/dom/layout';
+import {Layout_Enum, isLayoutSizeDefined} from '#core/dom/layout';
 
 import {registerElement} from '#service/custom-element-registry';
 
@@ -7,14 +7,14 @@ import {buildDom} from './build-dom';
 import {BaseElement} from '../../base-element';
 
 export class AmpLayout extends BaseElement {
-  /** @override @nocollapse */
+  /** @override  */
   static prerenderAllowed() {
     return true;
   }
 
   /** @override */
   isLayoutSupported(layout) {
-    return layout == Layout.CONTAINER || isLayoutSizeDefined(layout);
+    return layout == Layout_Enum.CONTAINER || isLayoutSizeDefined(layout);
   }
 
   /** @override */
diff --git a/src/builtins/amp-layout/build-dom.d.ts b/src/builtins/amp-layout/build-dom.d.ts
new file mode 100644
index 000000000000..cb4cc9836e00
--- /dev/null
+++ b/src/builtins/amp-layout/build-dom.d.ts
@@ -0,0 +1 @@
+export const buildDom: import('#compiler/types').BuildDom;
diff --git a/src/builtins/amp-layout/build-dom.js b/src/builtins/amp-layout/build-dom.js
index 0696b94edaa3..b6f4e4180482 100644
--- a/src/builtins/amp-layout/build-dom.js
+++ b/src/builtins/amp-layout/build-dom.js
@@ -1,12 +1,12 @@
 import {isServerRendered} from '#core/dom';
-import {Layout, applyFillContent} from '#core/dom/layout';
+import {Layout_Enum, applyFillContent} from '#core/dom/layout';
 import {realChildNodes} from '#core/dom/query';
 import {getEffectiveLayout} from '#core/static-layout';
 
 /**
  * @see amphtml/compiler/types.js for full description
  *
- * @param {!Element} element
+ * @param {HTMLElement} element
  */
 export function buildDom(element) {
   if (isServerRendered(element)) {
@@ -14,7 +14,7 @@ export function buildDom(element) {
   }
 
   const layout = getEffectiveLayout(element);
-  if (layout == Layout.CONTAINER) {
+  if (layout == Layout_Enum.CONTAINER) {
     return;
   }
 
diff --git a/src/builtins/amp-pixel/amp-pixel.js b/src/builtins/amp-pixel/amp-pixel.js
index f7b85bf697ec..d9457d03a70b 100644
--- a/src/builtins/amp-pixel/amp-pixel.js
+++ b/src/builtins/amp-pixel/amp-pixel.js
@@ -80,7 +80,14 @@ export class AmpPixel extends BaseElement {
             if (!this.win) {
               return;
             }
-            const pixel = createPixel(this.win, src, this.referrerPolicy_);
+
+            const pixel = createPixel(
+              this.win,
+              src,
+              this.referrerPolicy_,
+              this.element.getAttribute('attributionsrc'),
+              this.element
+            );
             dev().info(TAG, 'pixel triggered: ', src);
             return pixel;
           });
diff --git a/src/builtins/storybook/amp-layout.amp.js b/src/builtins/storybook/amp-layout.amp.js
index 643d7009054f..60a9dbc085fe 100644
--- a/src/builtins/storybook/amp-layout.amp.js
+++ b/src/builtins/storybook/amp-layout.amp.js
@@ -1,16 +1,13 @@
 import {withAmp} from '@ampproject/storybook-addon';
-import {number, withKnobs} from '@storybook/addon-knobs';
 
 import * as Preact from '#preact';
 
 export default {
   title: '0/amp-layout',
-  decorators: [withKnobs, withAmp],
+  decorators: [withAmp],
 };
 
-export const responsive = () => {
-  const width = number('width', 400);
-  const height = number('height', 300);
+export const responsive = ({height, width}) => {
   return (
     <main>
       <style jsx global>
@@ -34,10 +31,12 @@ export const responsive = () => {
   );
 };
 
-export const intrinsic = () => {
-  const width = number('width', 800);
-  const height = number('height', 600);
-  const maxWidth = number('maxWidth', 400);
+responsive.args = {
+  width: 400,
+  height: 300,
+};
+
+export const intrinsic = ({height, maxWidth, width}) => {
   return (
     <main>
       <style jsx global>
@@ -69,3 +68,9 @@ export const intrinsic = () => {
     </main>
   );
 };
+
+intrinsic.args = {
+  width: 800,
+  height: 600,
+  maxWidth: 400,
+};
diff --git a/src/chunk.js b/src/chunk.js
index f336d9c8b984..7805ec52c4cd 100644
--- a/src/chunk.js
+++ b/src/chunk.js
@@ -76,7 +76,7 @@ export function startupChunk(doc, fn, opt_makesBodyVisible) {
  *
  * @param {!Element|!ShadowRoot|!./service/ampdoc-impl.AmpDoc} elementOrAmpDoc
  * @param {function(?IdleDeadline)} fn
- * @param {ChunkPriority} priority
+ * @param {ChunkPriority_Enum} priority
  */
 export function chunk(elementOrAmpDoc, fn, priority) {
   if (deactivated) {
@@ -147,14 +147,14 @@ export function runChunksForTesting(elementOrAmpDoc) {
  * The priority of a chunk task. Higher priority tasks have higher values.
  * @enum {number}
  */
-export const ChunkPriority = {
+export const ChunkPriority_Enum = {
   HIGH: 20,
   LOW: 10,
   BACKGROUND: 0,
 };
 
 /** @enum {string} */
-const TaskState = {
+const TaskState_Enum = {
   NOT_RUN: 'not_run',
   RUN: 'run',
 };
@@ -168,8 +168,8 @@ class Task {
    * @param {function(?IdleDeadline)} fn
    */
   constructor(fn) {
-    /** @public {TaskState} */
-    this.state = TaskState.NOT_RUN;
+    /** @public {TaskState_Enum} */
+    this.state = TaskState_Enum.NOT_RUN;
 
     /** @private @const {!function(?IdleDeadline)} */
     this.fn_ = fn;
@@ -182,10 +182,10 @@ class Task {
    * @protected
    */
   runTask_(idleDeadline) {
-    if (this.state == TaskState.RUN) {
+    if (this.state == TaskState_Enum.RUN) {
       return;
     }
-    this.state = TaskState.RUN;
+    this.state = TaskState_Enum.RUN;
     try {
       this.fn_(idleDeadline);
     } catch (e) {
@@ -378,7 +378,7 @@ class Chunks {
   nextTask_(opt_dequeue) {
     let t = this.tasks_.peek();
     // Dequeue tasks until we find one that hasn't been run yet.
-    while (t && t.state !== TaskState.NOT_RUN) {
+    while (t && t.state !== TaskState_Enum.NOT_RUN) {
       this.tasks_.dequeue();
       t = this.tasks_.peek();
     }
diff --git a/src/compiler/OWNERS b/src/compiler/OWNERS
new file mode 100644
index 000000000000..04c3c75bfccd
--- /dev/null
+++ b/src/compiler/OWNERS
@@ -0,0 +1,10 @@
+// For an explanation of the OWNERS rules and syntax, see:
+// https://github.com/ampproject/amp-github-apps/blob/main/owners/OWNERS.example
+
+{
+  rules: [
+    {
+      owners: [{name: 'ampproject/wg-performance'}],
+    },
+  ],
+}
diff --git a/src/compiler/README.md b/src/compiler/README.md
index 031942cf6e8c..bf4b53f8bb4c 100644
--- a/src/compiler/README.md
+++ b/src/compiler/README.md
@@ -35,6 +35,6 @@ function buildDom(element) {
 }
 ```
 
-Check out [<amp-layout>](../builtins/amp-layout/amp-layout.js) to see a simple example.
+Check out [`<amp-layout>`](../builtins/amp-layout/amp-layout.js) to see a simple example.
 
 <!-- TODO(samouri): Create Bento section when the details finalize. -->
diff --git a/src/compiler/builders.js b/src/compiler/builders.js
deleted file mode 100644
index 09dcfae03c58..000000000000
--- a/src/compiler/builders.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import {buildDom as ampLayoutClassic} from '#builtins/amp-layout/build-dom';
-
-import {applyStaticLayout} from '#core/static-layout';
-
-import {buildDom as ampFitTextClassic} from '../../extensions/amp-fit-text/0.1/build-dom';
-
-const versionedBuilderMap = {
-  'v0': {
-    'amp-layout': ampLayoutClassic,
-  },
-  '0.1': {
-    'amp-fit-text': ampFitTextClassic,
-  },
-};
-
-/**
- * Wraps a buildDom function with functionality that every component needs.
- *
- * @param {import('./types').BuildDom} buildDom
- * @return {import('./types').BuildDom}
- */
-function wrap(buildDom) {
-  return function wrapper(element) {
-    applyStaticLayout(element);
-    buildDom(element);
-    element.setAttribute('i-amphtml-ssr', '');
-  };
-}
-
-/**
- * Returns the set of component builders needed to server-render an AMP Document.
- * @param {import('./types').Versions} versions
- * @param {{[version: string]: import('./types').BuilderMap}} builderMap
- * @return {import('./types').BuilderMap}
- */
-export function getBuilders(versions, builderMap = versionedBuilderMap) {
-  /** @type {import('./types').BuilderMap} */
-  const builders = {};
-
-  for (const {component, version} of versions) {
-    const builder = builderMap?.[version]?.[component];
-    if (builder) {
-      builders[component] = wrap(builder);
-    }
-  }
-
-  return builders;
-}
diff --git a/src/compiler/builders.ts b/src/compiler/builders.ts
new file mode 100644
index 000000000000..2fa0e897b96d
--- /dev/null
+++ b/src/compiler/builders.ts
@@ -0,0 +1,50 @@
+import {buildDom as ampLayoutClassic} from '#builtins/amp-layout/build-dom';
+
+import {applyStaticLayout} from '#core/static-layout';
+
+import type {BuildDom, BuilderMap, Versions} from './types';
+
+import {buildDom as ampCarouselClassic1} from '../../extensions/amp-carousel/0.1/build-dom';
+import {buildDom as ampFitTextClassic} from '../../extensions/amp-fit-text/0.1/build-dom';
+
+type VersionedBuilderMap = {[version: string]: BuilderMap};
+const versionedBuilderMap: VersionedBuilderMap = {
+  'v0': {
+    'amp-layout': ampLayoutClassic,
+  },
+  '0.1': {
+    'amp-fit-text': ampFitTextClassic,
+    'amp-carousel': ampCarouselClassic1,
+  },
+};
+
+/**
+ * Wraps a buildDom function with functionality that every component needs.
+ */
+function wrap(buildDom: BuildDom): BuildDom {
+  return function wrapper(element) {
+    applyStaticLayout(element as AmpElement);
+    buildDom(element);
+    element.setAttribute('i-amphtml-ssr', '');
+    element.classList.add('i-amphtml-element');
+  };
+}
+
+/**
+ * Returns the set of component builders needed to server-render an AMP Document.
+ */
+export function getBuilders(
+  versions: Versions,
+  builderMap: VersionedBuilderMap = versionedBuilderMap
+): BuilderMap {
+  const builders: BuilderMap = {};
+
+  for (const {component, version} of versions) {
+    const builder = builderMap?.[version]?.[component];
+    if (builder) {
+      builders[component] = wrap(builder);
+    }
+  }
+
+  return builders;
+}
diff --git a/src/compiler/compile.js b/src/compiler/compile.js
deleted file mode 100644
index c47b808330f7..000000000000
--- a/src/compiler/compile.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import * as compiler from '@ampproject/bento-compiler';
-
-import {getBuilders} from './builders';
-
-/**
- * Returns the AST for an AMP Document with eligible components server-rendered.
- *
- * @param {import('./types').CompilerRequest} request
- * @return {import('./types').CompilerResponse}
- */
-export function compile(request) {
-  const {document, nodes, versions} = request ?? {};
-  if (!versions || !(document || nodes)) {
-    throw new Error('Must provide versions and either document or nodes');
-  }
-
-  if (document) {
-    return {
-      document: compiler.renderAstDocument(document, getBuilders(versions)),
-    };
-  }
-  return {nodes: compiler.renderAstNodes(nodes, getBuilders(versions))};
-}
diff --git a/src/compiler/compile.ts b/src/compiler/compile.ts
new file mode 100644
index 000000000000..bec6e1f958f4
--- /dev/null
+++ b/src/compiler/compile.ts
@@ -0,0 +1,26 @@
+import * as compiler from '@ampproject/bento-compiler';
+
+import {getBuilders} from './builders';
+import type {CompilerRequest, CompilerResponse} from './types';
+
+const missingPropErrorMsg =
+  'Must provide component_versions and either document or nodes';
+
+/**
+ * Returns the AST for an AMP Document with eligible components server-rendered.
+ */
+export function compile(request: CompilerRequest): CompilerResponse {
+  const {component_versions: versions, document, nodes} = request ?? {};
+  if (!versions) {
+    throw new Error(missingPropErrorMsg);
+  }
+  const builders = getBuilders(versions);
+
+  if (document) {
+    return {document: compiler.renderAstDocument(document, builders)};
+  } else if (nodes) {
+    return {nodes: compiler.renderAstNodes(nodes, builders)};
+  } else {
+    throw new Error(missingPropErrorMsg);
+  }
+}
diff --git a/src/compiler/global.d.ts b/src/compiler/global.d.ts
new file mode 100644
index 000000000000..6bc105325206
--- /dev/null
+++ b/src/compiler/global.d.ts
@@ -0,0 +1,10 @@
+export {};
+
+declare global {
+  // Primary export
+  var compile: typeof import('./compile').compile;
+
+  // Needed for worker-dom
+  var self: Window & typeof globalThis;
+  var Node: typeof window.Node;
+}
diff --git a/src/compiler/index.js b/src/compiler/index.js
deleted file mode 100644
index e78fc28dabe0..000000000000
--- a/src/compiler/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import './polyfills';
-import {compile} from './compile';
-
-globalThis['compile'] = compile;
diff --git a/src/compiler/index.ts b/src/compiler/index.ts
new file mode 100644
index 000000000000..0433a00d990d
--- /dev/null
+++ b/src/compiler/index.ts
@@ -0,0 +1,4 @@
+import './polyfills';
+import {compile} from './compile';
+
+globalThis.compile = compile;
diff --git a/src/compiler/polyfills.js b/src/compiler/polyfills.js
deleted file mode 100644
index 3c7e423c1307..000000000000
--- a/src/compiler/polyfills.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Polyfills for the compiler.js binary.
- * It is meant to run in a barebones v8 environment.
- * That means no builtins provided by either Node.js or Browsers.
- * This includes: setTimeout, Node, self, etc.
- *
- * @fileoverview
- */
-
-const globalObject = /** @type {any} */ (globalThis);
-
-globalObject['self'] = globalThis;
-
-globalObject['Node'] = {
-  ELEMENT_NODE: 1,
-  ATTRIBUTE_NODE: 2,
-  TEXT_NODE: 3,
-  CDATA_SECTION_NODE: 4,
-  PROCESSING_INSTRUCTION_NODE: 7,
-  COMMENT_NODE: 8,
-  DOCUMENT_NODE: 9,
-  DOCUMENT_TYPE_NODE: 10,
-  DOCUMENT_FRAGMENT_NODE: 11,
-};
diff --git a/src/compiler/polyfills.ts b/src/compiler/polyfills.ts
new file mode 100644
index 000000000000..723156e0e938
--- /dev/null
+++ b/src/compiler/polyfills.ts
@@ -0,0 +1,24 @@
+/**
+ * Polyfills for the compiler.js binary.
+ * It is meant to run in a barebones v8 environment.
+ * That means no builtins provided by either Node.js or Browsers.
+ * This includes: setTimeout, Node, self, etc.
+ *
+ * @fileoverview
+ */
+
+globalThis.self = globalThis as any;
+
+globalThis.Node = {
+  ELEMENT_NODE: 1,
+  ATTRIBUTE_NODE: 2,
+  TEXT_NODE: 3,
+  CDATA_SECTION_NODE: 4,
+  PROCESSING_INSTRUCTION_NODE: 7,
+  COMMENT_NODE: 8,
+  DOCUMENT_NODE: 9,
+  DOCUMENT_TYPE_NODE: 10,
+  DOCUMENT_FRAGMENT_NODE: 11,
+} as any;
+
+export {};
diff --git a/src/compiler/shame.d.ts b/src/compiler/shame.d.ts
deleted file mode 100644
index 7b0dec8c3376..000000000000
--- a/src/compiler/shame.d.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * @fileoverview The junk-drawer of type definitions for files that do not pass type checking yet.
- * Shame! Shame! Shame! Avoid adding to this.
- */
-
-declare module '#builtins/amp-layout/build-dom' {
-  import {BuildDom} from '#compiler/types';
-  export const buildDom: BuildDom;
-}
-
-declare module 'extensions/amp-fit-text/0.1/build-dom' {
-  import {BuildDom} from '#compiler/types';
-  export const buildDom: BuildDom;
-}
-
-declare module '#core/dom' {
-  export const copyChildren: (from: Node, to: Node) => void;
-  export const removeChildren: (node: Node) => void;
-  export const isServerRendered: (node: Node) => boolean;
-}
-
-declare module '#core/dom/query' {
-  export const realChildNodes: (node: Node) => Element[];
-}
-
-declare module '#core/dom/layout' {
-  export const applyFillContent: (
-    node: Node,
-    replacedContent?: boolean
-  ) => void;
-}
-
-declare module '#core/static-layout' {
-  export const applyStaticLayout: (node: Node) => void;
-}
-
-declare module '#core/dom/css-selectors' {
-  export const escapeCssSelectorIdent: (ident: string) => string;
-}
diff --git a/src/compiler/tsconfig.json b/src/compiler/tsconfig.json
index 48d9a12ebe34..e7340429b3ff 100644
--- a/src/compiler/tsconfig.json
+++ b/src/compiler/tsconfig.json
@@ -1,13 +1,4 @@
 {
-  "compilerOptions": {
-    "allowJs": true,
-    "checkJs": true,
-    "noEmit": true,
-    "paths": {
-      "#compiler": ["./"],
-      "#compiler/*": ["./*"]
-    }
-  },
-  "include": ["**/*.js", "**/*.ts"],
-  "exclude": ["node_modules"]
+  "extends": "../../tsconfig.base.json",
+  "include": ["**/*.ts", "../core/**/globals.d.ts"]
 }
diff --git a/src/compiler/types.d.ts b/src/compiler/types.d.ts
index 500d48ad2623..17d939a21704 100644
--- a/src/compiler/types.d.ts
+++ b/src/compiler/types.d.ts
@@ -1,4 +1,4 @@
-import {TreeProto, NodeProto} from '@ampproject/bento-compiler';
+import {NodeProto, TreeProto} from '@ampproject/bento-compiler';
 
 /**
  * AMP Components must implement this "buildDom" function in order to be server-rendered.
@@ -11,7 +11,7 @@ import {TreeProto, NodeProto} from '@ampproject/bento-compiler';
  * The return value is set to *, so that we may optionally return any DOM nodes
  * created during a client-side render. These nodes are often needed for ivars.
  */
-export type BuildDom = (Element) => void;
+export type BuildDom = (el: Element) => void;
 
 /**
  * Contains component versioning data via a map from tagName --> version.
@@ -21,7 +21,7 @@ export type Versions = Array<{component: string; version: string}>;
 export type CompilerRequest = {
   document?: TreeProto;
   nodes?: NodeProto[];
-  versions: Versions;
+  component_versions: Versions;
 };
 
 export type CompilerResponse = {document: TreeProto} | {nodes: NodeProto[]};
diff --git a/src/config.js b/src/config.js
deleted file mode 100644
index c33d90e859a9..000000000000
--- a/src/config.js
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * Allows for runtime configuration. Internally, the runtime should
- * use the src/config.js module for various constants. We can use the
- * AMP_CONFIG global to translate user-defined configurations to this
- * module.
- * @type {!Object<string, string>}
- */
-const env = self.AMP_CONFIG || {};
-
-const thirdPartyFrameRegex =
-  (typeof env['thirdPartyFrameRegex'] == 'string'
-    ? new RegExp(env['thirdPartyFrameRegex'])
-    : env['thirdPartyFrameRegex']) || /^d-\d+\.ampproject\.net$/;
-
-const cdnProxyRegex =
-  (typeof env['cdnProxyRegex'] == 'string'
-    ? new RegExp(env['cdnProxyRegex'])
-    : env['cdnProxyRegex']) ||
-  /^https:\/\/([a-zA-Z0-9_-]+\.)?cdn\.ampproject\.org$/;
-
-/**
- * Check for a custom URL definition in special <meta> tags. Note that this does
- * not allow for distinct custom URLs in AmpDocShadow instances. The shell is
- * allowed to define one set of custom URLs via AMP_CONFIG (recommended) or by
- * including <meta> tags in the shell <head>. Those custom URLs then apply to
- * all AMP documents loaded in the shell.
- * @param {string} name
- * @return {?string}
- * @private
- */
-function getMetaUrl(name) {
-  // Avoid exceptions in unit tests
-  if (!self.document || !self.document.head) {
-    return null;
-  }
-
-  // Disallow on proxy origins
-  if (self.location && cdnProxyRegex.test(self.location.origin)) {
-    return null;
-  }
-
-  const metaEl = self.document.head./*OK*/ querySelector(
-    `meta[name="${name}"]`
-  );
-  return (metaEl && metaEl.getAttribute('content')) || null;
-}
-
-/**
- * @typedef {{
- *   thirdParty: string,
- *   thirdPartyFrameHost: string,
- *   thirdPartyFrameRegex: !RegExp,
- *   cdn: string,
- *   cdnProxyRegex: !RegExp,
- *   localhostRegex: !RegExp,
- *   errorReporting: string,
- *   betaErrorReporting: string,
- *   localDev: boolean,
- *   trustedViewerHosts: !Array<!RegExp>,
- *   geoApi: ?string,
- * }}
- */
-export const urls = {
-  thirdParty: env['thirdPartyUrl'] || 'https://3p.ampproject.net',
-  thirdPartyFrameHost: env['thirdPartyFrameHost'] || 'ampproject.net',
-  thirdPartyFrameRegex,
-  cdn:
-    env['cdnUrl'] || getMetaUrl('runtime-host') || 'https://cdn.ampproject.org',
-  /* Note that cdnProxyRegex is only ever checked against origins
-   * (proto://host[:port]) so does not need to consider path
-   */
-  cdnProxyRegex,
-  localhostRegex: /^https?:\/\/localhost(:\d+)?$/,
-  errorReporting:
-    env['errorReportingUrl'] ||
-    'https://us-central1-amp-error-reporting.cloudfunctions.net/r',
-  betaErrorReporting:
-    env['betaErrorReportingUrl'] ||
-    'https://us-central1-amp-error-reporting.cloudfunctions.net/r-beta',
-  localDev: env['localDev'] || false,
-  /**
-   * These domains are trusted with more sensitive viewer operations such as
-   * propagating the referrer. If you believe your domain should be here,
-   * file the issue on GitHub to discuss. The process will be similar
-   * (but somewhat more stringent) to the one described in the [3p/README.md](
-   * https://github.com/ampproject/amphtml/blob/main/3p/README.md)
-   *
-   * {!Array<!RegExp>}
-   */
-  trustedViewerHosts: [
-    /(^|\.)google\.(com?|[a-z]{2}|com?\.[a-z]{2}|cat)$/,
-    /(^|\.)gmail\.(com|dev)$/,
-  ],
-  // Optional fallback API if amp-geo is left unpatched
-  geoApi: env['geoApiUrl'] || getMetaUrl('amp-geo-api'),
-};
-
-export const config = {
-  urls,
-};
diff --git a/src/config/urls.js b/src/config/urls.js
new file mode 100644
index 000000000000..a9c0d8b45fb4
--- /dev/null
+++ b/src/config/urls.js
@@ -0,0 +1,102 @@
+import {pure} from '#core/types/pure';
+
+/**
+ * Allows for runtime configuration. Internally, the runtime should import this
+ * module for various constants. We can use the AMP_CONFIG global to translate
+ * user-defined configurations to this module.
+ * @param {string} key
+ * @return {any}
+ */
+const env = (key) => (self.AMP_CONFIG ? self.AMP_CONFIG[key] : null);
+
+// Important: Make sure that every exported symbol has the same name as in
+// `global.AMP.config.urls` (see runtime.js for reference)
+
+// Important: Make sure to wrap every exported symbol with `pure()`. This allows
+// this module to be dead-code-eliminated.
+
+/* Note that cdnProxyRegex is only ever checked against origins
+ * (proto://host[:port]) so does not need to consider path
+ */
+export const cdnProxyRegex = pure(
+  (typeof env('cdnProxyRegex') == 'string'
+    ? new RegExp(env('cdnProxyRegex'))
+    : env('cdnProxyRegex')) ||
+    /^https:\/\/([a-zA-Z0-9_-]+\.)?cdn\.ampproject\.org$/
+);
+
+/**
+ * Check for a custom URL definition in special <meta> tags. Note that this does
+ * not allow for distinct custom URLs in AmpDocShadow instances. The shell is
+ * allowed to define one set of custom URLs via AMP_CONFIG (recommended) or by
+ * including <meta> tags in the shell <head>. Those custom URLs then apply to
+ * all AMP documents loaded in the shell.
+ * @param {string} name
+ * @return {?string}
+ * @private
+ */
+function getMetaUrl(name) {
+  // Avoid exceptions in unit tests
+  if (!self.document || !self.document.head) {
+    return null;
+  }
+
+  // Disallow on proxy origins
+  if (self.location && cdnProxyRegex.test(self.location.origin)) {
+    return null;
+  }
+
+  const metaEl = self.document.head./*OK*/ querySelector(
+    `meta[name="${name}"]`
+  );
+  return (metaEl && metaEl.getAttribute('content')) || null;
+}
+
+export const thirdParty = pure(
+  env('thirdPartyUrl') || 'https://3p.ampproject.net'
+);
+
+export const thirdPartyFrameHost = pure(
+  env('thirdPartyFrameHost') || 'ampproject.net'
+);
+
+export const thirdPartyFrameRegex = pure(
+  (typeof env('thirdPartyFrameRegex') == 'string'
+    ? new RegExp(env('thirdPartyFrameRegex'))
+    : env('thirdPartyFrameRegex')) || /^d-\d+\.ampproject\.net$/
+);
+
+export const cdn = pure(
+  env('cdnUrl') || getMetaUrl('runtime-host') || 'https://cdn.ampproject.org'
+);
+
+export const localhostRegex = pure(/^https?:\/\/localhost(:\d+)?$/);
+
+export const errorReporting = pure(
+  env('errorReportingUrl') ||
+    'https://us-central1-amp-error-reporting.cloudfunctions.net/r'
+);
+
+export const betaErrorReporting = pure(
+  env('betaErrorReportingUrl') ||
+    'https://us-central1-amp-error-reporting.cloudfunctions.net/r-beta'
+);
+
+export const localDev = pure(env('localDev') || false);
+
+/**
+ * These domains are trusted with more sensitive viewer operations such as
+ * propagating the referrer. If you believe your domain should be here,
+ * file the issue on GitHub to discuss. The process will be similar
+ * (but somewhat more stringent) to the one described in the [3p/README.md](
+ * https://github.com/ampproject/amphtml/blob/main/3p/README.md)
+ *
+ * @type {!Array<!RegExp>}
+ */
+export const trustedViewerHosts = pure([
+  /(^|\.)google\.(com?|[a-z]{2}|com?\.[a-z]{2}|cat)$/,
+  /(^|\.)gmail\.(com|dev)$/,
+]);
+
+// Optional fallback API if amp-geo is left unpatched
+export const geoApi = pure(env('geoApiUrl') || getMetaUrl('amp-geo-api'));
diff --git a/src/consent.js b/src/consent.js
index d39cd63234f3..bf0b6c337051 100644
--- a/src/consent.js
+++ b/src/consent.js
@@ -1,8 +1,3 @@
-import {
-  CONSENT_POLICY_STATE, // eslint-disable-line no-unused-vars
-} from '#core/constants/consent-state';
-import {dict} from '#core/types/object';
-
 import {Services} from '#service';
 
 /**
@@ -10,7 +5,7 @@ import {Services} from '#service';
  * for resolve. Or if consent service is not available.
  * @param {!Element|!ShadowRoot} element
  * @param {string=} policyId
- * @return {!Promise<?CONSENT_POLICY_STATE>}
+ * @return {!Promise<import('#core/constants/consent-state').CONSENT_POLICY_STATE|null>}
  */
 export function getConsentPolicyState(element, policyId = 'default') {
   return Services.consentPolicyServiceForDocOrNull(element).then(
@@ -94,12 +89,12 @@ export function getConsentMetadata(element, policyId = 'default') {
  */
 export function getConsentDataToForward(element, opt_policyId) {
   return Services.consentPolicyServiceForDocOrNull(element).then((policy) => {
-    const gettersOrNull = dict({
+    const gettersOrNull = {
       'consentMetadata': policy && policy.getConsentMetadataInfo,
       'consentString': policy && policy.getConsentStringInfo,
       'consentPolicyState': policy && policy.whenPolicyResolved,
       'consentPolicySharedData': policy && policy.getMergedSharedData,
-    });
+    };
     if (!policy) {
       return gettersOrNull;
     }
diff --git a/src/cookies.js b/src/cookies.js
index 2fd8521983e9..f096b247fe91 100644
--- a/src/cookies.js
+++ b/src/cookies.js
@@ -3,13 +3,13 @@ import {tryDecodeUriComponent} from '#core/types/string/url';
 
 import {userAssert} from '#utils/log';
 
-import {urls} from './config';
+import * as urls from './config/urls';
 import {getSourceOrigin, isProxyOrigin, parseUrlDeprecated} from './url';
 
 const TEST_COOKIE_NAME = '-test-amp-cookie-tmp';
 
 /** @enum {string} */
-export const SameSite = {
+export const SameSite_Enum = {
   LAX: 'Lax',
   STRICT: 'Strict',
   NONE: 'None',
@@ -74,7 +74,7 @@ function tryGetDocumentCookie_(win) {
  * @param {{
  *   highestAvailableDomain:(boolean|undefined),
  *   domain:(string|undefined),
- *   sameSite: (!SameSite|undefined),
+ *   sameSite: (!SameSite_Enum|undefined),
  *   secure: (boolean|undefined),
  * }=} options
  *     - highestAvailableDomain: If true, set the cookie at the widest domain
@@ -82,7 +82,7 @@ function tryGetDocumentCookie_(win) {
  *       on www.example.com.
  *     - domain: Explicit domain to set. domain overrides HigestAvailableDomain
  *     - allowOnProxyOrigin: Allow setting a cookie on the AMP Cache.
- *     - sameSite: The SameSite value to use when setting the cookie.
+ *     - sameSite: The SameSite_Enum value to use when setting the cookie.
  *     - secure: Whether the cookie should contain Secure (only sent over https).
  */
 export function setCookie(win, name, value, expirationTime, options = {}) {
@@ -171,7 +171,7 @@ export function getHighestAvailableDomain(win) {
  * @param {string} value
  * @param {time} expirationTime
  * @param {string|undefined} domain
- * @param {!SameSite=} sameSite
+ * @param {!SameSite_Enum=} sameSite
  * @param {boolean|undefined=} secure
  */
 function trySetCookie(
@@ -186,6 +186,7 @@ function trySetCookie(
   // We do not allow setting cookies on the domain that contains both
   // the cdn. and www. hosts.
   // Note: we need to allow cdn.ampproject.org in order to optin to experiments
+  // eslint-disable-next-line local/no-forbidden-terms
   if (domain == 'ampproject.org') {
     // Actively delete them.
     value = 'delete';
@@ -213,13 +214,13 @@ function trySetCookie(
 /**
  * Gets the cookie string to use for SameSite. This only sets the SameSite
  * value if specified, falling back to the browser default. The default value
- * is equivalent to SameSite.NONE, but is planned to be set to SameSite.LAX in
+ * is equivalent to SameSite_Enum.NONE, but is planned to be set to SameSite_Enum.LAX in
  * Chrome 80.
  *
- * Note: In Safari 12, if the value is set to SameSite.NONE, it is treated by
- * the browser as SameSite.STRICT.
+ * Note: In Safari 12, if the value is set to SameSite_Enum.NONE, it is treated by
+ * the browser as SameSite_Enum.STRICT.
  * @param {Window} win
- * @param {!SameSite|undefined} sameSite
+ * @param {!SameSite_Enum|undefined} sameSite
  * @return {string} The string to use when setting the cookie.
  */
 function getSameSiteString(win, sameSite) {
@@ -267,10 +268,24 @@ function checkOriginForSettingCookie(win, options, name) {
  */
 function getTempCookieName(win) {
   let testCookieName = TEST_COOKIE_NAME;
-  const counter = 0;
+  let counter = 0;
   while (getCookie(win, testCookieName)) {
     // test cookie name conflict, append counter to test cookie name
-    testCookieName = TEST_COOKIE_NAME + counter;
+    testCookieName = TEST_COOKIE_NAME + counter++;
   }
   return testCookieName;
 }
+
+/**
+ * @param {!Window} win
+ * @return {boolean}
+ */
+export function canSetCookie(win) {
+  const testCookieName = getTempCookieName(win);
+  const testCookieValue = 'TESTCOOKIEVALUE';
+  try {
+    setCookie(win, testCookieName, testCookieValue, Date.now() + 1000);
+    return getCookie(win, testCookieName) === testCookieValue;
+  } catch {}
+  return false;
+}
diff --git a/src/core/3p-frame-messaging.js b/src/core/3p-frame-messaging.js
index ede0a71dfb1d..3487cf56ddd5 100644
--- a/src/core/3p-frame-messaging.js
+++ b/src/core/3p-frame-messaging.js
@@ -1,7 +1,6 @@
 import {devAssert, devAssertString} from '#core/assert';
 import {internalListenImplementation} from '#core/dom/event-helper-listen';
 import {rethrowAsync} from '#core/error';
-import {dict} from '#core/types/object';
 import {tryParseJson} from '#core/types/object/json';
 
 /** @const */
@@ -14,7 +13,7 @@ export const CONSTANTS = {
 };
 
 /** @enum {string} */
-export const MessageType = {
+export const MessageType_Enum = {
   // For amp-ad
   SEND_EMBED_STATE: 'send-embed-state',
   EMBED_STATE: 'embed-state',
@@ -55,11 +54,11 @@ export const MessageType = {
 
 /**
  * Listens for the specified event on the element.
- * @param {!EventTarget} element
+ * @param {EventTarget} element
  * @param {string} eventType
- * @param {function(!Event)} listener
+ * @param {function(Event):void} listener
  * @param {Object=} opt_evtListenerOpts
- * @return {!UnlistenDef}
+ * @return {import('#core/types/function/types').UnlistenCallback}
  */
 export function listen(element, eventType, listener, opt_evtListenerOpts) {
   return internalListenImplementation(
@@ -79,12 +78,7 @@ export function listen(element, eventType, listener, opt_evtListenerOpts) {
  * @param {?string=} rtvVersion
  * @return {string}
  */
-export function serializeMessage(
-  type,
-  sentinel,
-  data = dict(),
-  rtvVersion = null
-) {
+export function serializeMessage(type, sentinel, data = {}, rtvVersion = null) {
   // TODO: consider wrap the data in a "data" field. { type, sentinal, data }
   const message = data;
   message['type'] = type;
@@ -103,9 +97,12 @@ export function deserializeMessage(message) {
   if (!isAmpMessage(message)) {
     return null;
   }
-  const startPos = devAssertString(message).indexOf('{');
+
+  devAssertString(message);
+
+  const startPos = message.indexOf('{');
   devAssert(startPos != -1, 'JSON missing in %s', message);
-  return tryParseJson(devAssertString(message).substr(startPos), (e) => {
+  return tryParseJson(message.substr(startPos), (e) => {
     rethrowAsync(
       new Error(`MESSAGING: Failed to parse message: ${message}\n${e.message}`)
     );
@@ -125,8 +122,7 @@ export function isAmpMessage(message) {
   );
 }
 
-/** @typedef {{creativeId: string, message: string}} */
-export let IframeTransportEventDef;
+/** @typedef {{creativeId: string, message: string}} IframeTransportEventDef */
 // An event, and the transport ID of the amp-analytics tags that
 // generated it. For instance if the creative with transport
 // ID 2 sends "hi", then an IframeTransportEventDef would look like:
diff --git a/src/core/OWNERS b/src/core/OWNERS
index 5d04df0630d2..27e24add9619 100644
--- a/src/core/OWNERS
+++ b/src/core/OWNERS
@@ -4,11 +4,7 @@
 {
   rules: [
     {
-      owners: [
-        {name: 'dvoytenko'},
-        {name: 'jridgewell', notify: true},
-        {name: 'ampproject/wg-performance'},
-      ],
+      owners: [{name: 'dvoytenko'}, {name: 'ampproject/wg-performance'}],
     },
   ],
 }
diff --git a/src/core/amp-config.extern.js b/src/core/amp-config.extern.js
deleted file mode 100644
index d093bfe22fdd..000000000000
--- a/src/core/amp-config.extern.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * @fileoverview Externs for properties on global AMP_CONFIG.
- * @externs
- */
-
-/**
- * AMP configuration and runtime settings structure.
- * @typedef {{
- *   test: (boolean|undefined),
- *   localDev: (boolean|undefined),
- * }}
- */
-let AmpConfigDef;
diff --git a/src/core/amp-globals.d.ts b/src/core/amp-globals.d.ts
new file mode 100644
index 000000000000..e172c6ccb9fc
--- /dev/null
+++ b/src/core/amp-globals.d.ts
@@ -0,0 +1,32 @@
+export {};
+
+declare global {
+  interface Window {
+    // Global property set by test some harnesses to signal a testing environment.
+    __AMP_TEST?: boolean;
+
+    // AMP Mode, used to force an override in tests.
+    __AMP_MODE: AmpModeObject;
+
+    // AMP Runtime settings, configuration, and environment/build constants.
+    AMP_CONFIG?: AmpConfig & {[key: string]: boolean | string};
+  }
+
+  interface Document {
+    AMP?: {
+      canonicalUrl?: string;
+    };
+  }
+
+  interface AmpConfig {
+    test?: boolean;
+    localDev?: boolean;
+    canary?: boolean;
+    type?: string;
+  }
+
+  interface AmpModeObject {
+    esm: boolean;
+    noCssBinary: boolean;
+  }
+}
diff --git a/src/core/assert/amp-globals.d.ts b/src/core/assert/amp-globals.d.ts
new file mode 100644
index 000000000000..e8494f6a5688
--- /dev/null
+++ b/src/core/assert/amp-globals.d.ts
@@ -0,0 +1,11 @@
+export {};
+
+declare global {
+  interface Window {
+    // Never exists; used as part of post-compilation checks to verify DCE.
+    __AMP_ASSERTION_CHECK: undefined;
+
+    // Global error reporting handler; only present in AMP pages.
+    __AMP_REPORT_ERROR?: (this: Window, err: Error, opt_el?: Element) => void;
+  }
+}
diff --git a/src/core/assert/base.js b/src/core/assert/base.js
index a09fe1974af0..7e63bb34155b 100644
--- a/src/core/assert/base.js
+++ b/src/core/assert/base.js
@@ -8,11 +8,13 @@ import {remove} from '#core/types/array';
  * `dev` or `user`. It is also used by the Log class for its assertions.
  */
 
+/** @typedef {function(*, string, ...*):*} AssertionFunctionStringDef */
+/** @typedef {function(*, Array<*>):*} AssertionFunctionArrayDef */
+
 /**
  * A base assertion function, provided to various assertion helpers.
- * @typedef {function(?, string=, ...*):?|function(?, !Array<*>)}
+ * @typedef {AssertionFunctionStringDef|AssertionFunctionArrayDef} AssertionFunctionDef
  */
-export let AssertionFunctionDef;
 
 /**
  * Throws an error if the second argument isn't trueish.
@@ -24,11 +26,10 @@ export let AssertionFunctionDef;
  *   elements in an array. When e.g. passed to console.error this yields
  *   native displays of things like HTML elements.
  * @param {?string} sentinel
- * @param {T} shouldBeTruthy
+ * @param {*} shouldBeTruthy
  * @param {string} opt_message
  * @param {...*} var_args Arguments substituted into %s in the message
- * @return {T}
- * @template T
+ * @return {asserts shouldBeTruthy}
  * @throws {Error} when shouldBeTruthy is not truthy.
  */
 export function assert(
@@ -38,7 +39,7 @@ export function assert(
   var_args
 ) {
   if (shouldBeTruthy) {
-    return shouldBeTruthy;
+    return /** @type {void} */ (shouldBeTruthy);
   }
 
   // Include the sentinel string if provided and not already present
@@ -58,7 +59,7 @@ export function assert(
 
   while (splitMessage.length) {
     const subValue = arguments[i++];
-    const nextConstant = splitMessage.shift();
+    const nextConstant = /** @type {NonNullable<*>} */ (splitMessage.shift());
 
     message += elementStringOrPassThru(subValue) + nextConstant;
     messageArray.push(subValue, nextConstant.trim());
@@ -81,13 +82,12 @@ export function assert(
  * Otherwise creates a sprintf syntax string containing the optional message or the
  * default. The `subject` of the assertion is added at the end.
  *
- * @param {!AssertionFunctionDef} assertFn underlying assertion function to call
- * @param {T} subject
+ * @param {AssertionFunctionDef} assertFn underlying assertion function to call
+ * @param {*} subject
  * @param {*} shouldBeTruthy
  * @param {string} defaultMessage
- * @param {!Array<*>|string=} opt_message
- * @return {T}
- * @template T
+ * @param {Array<*>|string=} opt_message
+ * @return {asserts shouldBeTruthy}
  * @private
  */
 function assertType_(
@@ -98,15 +98,19 @@ function assertType_(
   opt_message
 ) {
   if (isArray(opt_message)) {
-    assertFn(
+    /** @type {AssertionFunctionArrayDef} */ (assertFn)(
       shouldBeTruthy,
-      /** @type {!Array} */ (opt_message).concat([subject])
+      /** @type {Array<*>} */ (opt_message).concat([subject])
     );
   } else {
-    assertFn(shouldBeTruthy, `${opt_message || defaultMessage}: %s`, subject);
+    /** @type {AssertionFunctionStringDef} */ (assertFn)(
+      shouldBeTruthy,
+      `${opt_message || defaultMessage}: %s`,
+      subject
+    );
   }
 
-  return subject;
+  return /** @type {void} */ (subject);
 }
 
 /**
@@ -114,22 +118,19 @@ function assertType_(
  *
  * For more details see `assert`.
  *
- * @param {!AssertionFunctionDef} assertFn underlying assertion function to call
+ * @param {AssertionFunctionDef} assertFn underlying assertion function to call
  * @param {*} shouldBeElement
- * @param {!Array<*>|string=} opt_message The assertion message
- * @return {!Element} The value of shouldBeTrueish.
+ * @param {Array<*>|string=} opt_message The assertion message
+ * @return {asserts shouldBeElement is Element}
  * @throws {Error} when shouldBeElement is not an Element
- * @closurePrimitive {asserts.matchesReturn}
  */
 export function assertElement(assertFn, shouldBeElement, opt_message) {
-  return /** @type {!Element} */ (
-    assertType_(
-      assertFn,
-      shouldBeElement,
-      isElement(shouldBeElement),
-      'Element expected',
-      opt_message
-    )
+  return assertType_(
+    assertFn,
+    shouldBeElement,
+    isElement(shouldBeElement),
+    'Element expected',
+    opt_message
   );
 }
 
@@ -139,22 +140,19 @@ export function assertElement(assertFn, shouldBeElement, opt_message) {
  *
  * For more details see `assert`.
  *
- * @param {!AssertionFunctionDef} assertFn underlying assertion function to call
+ * @param {AssertionFunctionDef} assertFn underlying assertion function to call
  * @param {*} shouldBeString
- * @param {!Array<*>|string=} opt_message The assertion message
- * @return {string} The string value. Can be an empty string.
+ * @param {Array<*>|string=} opt_message The assertion message
+ * @return {asserts shouldBeString is string}
  * @throws {Error} when shouldBeString is not an String
- * @closurePrimitive {asserts.matchesReturn}
  */
 export function assertString(assertFn, shouldBeString, opt_message) {
-  return /** @type {string} */ (
-    assertType_(
-      assertFn,
-      shouldBeString,
-      isString(shouldBeString),
-      'String expected',
-      opt_message
-    )
+  return assertType_(
+    assertFn,
+    shouldBeString,
+    isString(shouldBeString),
+    'String expected',
+    opt_message
   );
 }
 
@@ -164,23 +162,19 @@ export function assertString(assertFn, shouldBeString, opt_message) {
  *
  * For more details see `assert`.
  *
- * @param {!AssertionFunctionDef} assertFn underlying assertion function to call
+ * @param {AssertionFunctionDef} assertFn underlying assertion function to call
  * @param {*} shouldBeNumber
- * @param {!Array<*>|string=} opt_message The assertion message
- * @return {number} The number value. The allowed values include `0`
- *   and `NaN`.
+ * @param {Array<*>|string=} opt_message The assertion message
+ * @return {asserts shouldBeNumber is number}
  * @throws {Error} when shouldBeNumber is not an Number
- * @closurePrimitive {asserts.matchesReturn}
  */
 export function assertNumber(assertFn, shouldBeNumber, opt_message) {
-  return /** @type {number} */ (
-    assertType_(
-      assertFn,
-      shouldBeNumber,
-      typeof shouldBeNumber == 'number',
-      'Number expected',
-      opt_message
-    )
+  return assertType_(
+    assertFn,
+    shouldBeNumber,
+    typeof shouldBeNumber == 'number',
+    'Number expected',
+    opt_message
   );
 }
 
@@ -190,22 +184,19 @@ export function assertNumber(assertFn, shouldBeNumber, opt_message) {
  *
  * For more details see `assert`.
  *
- * @param {!AssertionFunctionDef} assertFn underlying assertion function to call
+ * @param {AssertionFunctionDef} assertFn underlying assertion function to call
  * @param {*} shouldBeArray
- * @param {!Array<*>|string=} opt_message The assertion message
- * @return {!Array} The array value
+ * @param {Array<*>|string=} opt_message The assertion message
+ * @return {asserts shouldBeArray is Array} The array value
  * @throws {Error} when shouldBeArray is not an Array
- * @closurePrimitive {asserts.matchesReturn}
  */
 export function assertArray(assertFn, shouldBeArray, opt_message) {
-  return /** @type {!Array} */ (
-    assertType_(
-      assertFn,
-      shouldBeArray,
-      isArray(shouldBeArray),
-      'Array expected',
-      opt_message
-    )
+  return assertType_(
+    assertFn,
+    shouldBeArray,
+    isArray(shouldBeArray),
+    'Array expected',
+    opt_message
   );
 }
 
@@ -214,21 +205,18 @@ export function assertArray(assertFn, shouldBeArray, opt_message) {
  *
  * For more details see `assert`.
  *
- * @param {!AssertionFunctionDef} assertFn underlying assertion function to call
+ * @param {AssertionFunctionDef} assertFn underlying assertion function to call
  * @param {*} shouldBeBoolean
- * @param {!Array<*>|string=} opt_message The assertion message
- * @return {boolean} The boolean value.
+ * @param {Array<*>|string=} opt_message The assertion message
+ * @return {asserts shouldBeBoolean is boolean} The boolean value.
  * @throws {Error} when shouldBeBoolean is not an Boolean
- * @closurePrimitive {asserts.matchesReturn}
  */
 export function assertBoolean(assertFn, shouldBeBoolean, opt_message) {
-  return /** @type {boolean} */ (
-    assertType_(
-      assertFn,
-      shouldBeBoolean,
-      !!shouldBeBoolean === shouldBeBoolean,
-      'Boolean expected',
-      opt_message
-    )
+  return assertType_(
+    assertFn,
+    shouldBeBoolean,
+    !!shouldBeBoolean === shouldBeBoolean,
+    'Boolean expected',
+    opt_message
   );
 }
diff --git a/src/core/assert/dev.js b/src/core/assert/dev.js
index 3b16a1b769a8..14fd58226d08 100644
--- a/src/core/assert/dev.js
+++ b/src/core/assert/dev.js
@@ -23,7 +23,7 @@ function devAssertDceCheck() {
 /**
  * Throws an error if the first argument isn't trueish. Mirrors devAssert in
  * src/log.js.
- * @param {T} shouldBeTruthy
+ * @param {*} shouldBeTruthy
  * @param {string=} opt_message
  * @param {*=} opt_1 Optional argument (var arg as individual params for better
  * @param {*=} opt_2 Optional argument inlining)
@@ -34,10 +34,8 @@ function devAssertDceCheck() {
  * @param {*=} opt_7 Optional argument
  * @param {*=} opt_8 Optional argument
  * @param {*=} opt_9 Optional argument
- * @return {T}
- * @template T
+ * @return {asserts shouldBeTruthy}
  * @throws {Error} when shouldBeTruthy is not truthy.
- * @closurePrimitive {asserts.truthy}
  */
 export function devAssert(
   shouldBeTruthy,
@@ -53,7 +51,7 @@ export function devAssert(
   opt_9
 ) {
   if (mode.isMinified()) {
-    return shouldBeTruthy;
+    return /** @type {void} */ (shouldBeTruthy);
   }
   devAssertDceCheck();
 
@@ -79,19 +77,18 @@ export function devAssert(
  * For more details see `assert`.
  *
  * @param {*} shouldBeElement
- * @param {!Array<*>|string=} opt_message The assertion message
- * @return {!Element} The value of shouldBeTrueish.
+ * @param {Array<*>|string=} opt_message The assertion message
+ * @return {asserts shouldBeElement is Element}
  * @throws {Error} when shouldBeElement is not an Element
- * @closurePrimitive {asserts.matchesReturn}
  */
 export function devAssertElement(shouldBeElement, opt_message) {
   if (mode.isMinified()) {
-    return /** @type {!Element} */ (shouldBeElement);
+    return /** @type {void} */ (shouldBeElement);
   }
   devAssertDceCheck();
 
   return assertions.assertElement(
-    /** @type {!assertions.AssertionFunctionDef} */ (devAssert),
+    /** @type {import('./base').AssertionFunctionDef} */ (devAssert),
     shouldBeElement,
     opt_message
   );
@@ -104,19 +101,18 @@ export function devAssertElement(shouldBeElement, opt_message) {
  * For more details see `assert`.
  *
  * @param {*} shouldBeString
- * @param {!Array<*>|string=} opt_message The assertion message
- * @return {string} The string value. Can be an empty string.
+ * @param {Array<*>|string=} opt_message The assertion message
+ * @return {asserts shouldBeString is string}
  * @throws {Error} when shouldBeString is not an String
- * @closurePrimitive {asserts.matchesReturn}
  */
 export function devAssertString(shouldBeString, opt_message) {
   if (mode.isMinified()) {
-    return /** @type {string} */ (shouldBeString);
+    return /** @type {void} */ (shouldBeString);
   }
   devAssertDceCheck();
 
   return assertions.assertString(
-    /** @type {!assertions.AssertionFunctionDef} */ (devAssert),
+    /** @type {import('./base').AssertionFunctionDef} */ (devAssert),
     shouldBeString,
     opt_message
   );
@@ -129,20 +125,18 @@ export function devAssertString(shouldBeString, opt_message) {
  * For more details see `assert`.
  *
  * @param {*} shouldBeNumber
- * @param {!Array<*>|string=} opt_message The assertion message
- * @return {number} The number value. The allowed values include `0`
- *   and `NaN`.
+ * @param {Array<*>|string=} opt_message The assertion message
+ * @return {asserts shouldBeNumber is number}
  * @throws {Error} when shouldBeNumber is not an Number
- * @closurePrimitive {asserts.matchesReturn}
  */
 export function devAssertNumber(shouldBeNumber, opt_message) {
   if (mode.isMinified()) {
-    return /** @type {number} */ (shouldBeNumber);
+    return /** @type {void} */ (shouldBeNumber);
   }
   devAssertDceCheck();
 
   return assertions.assertNumber(
-    /** @type {!assertions.AssertionFunctionDef} */ (devAssert),
+    /** @type {import('./base').AssertionFunctionDef} */ (devAssert),
     shouldBeNumber,
     opt_message
   );
@@ -155,19 +149,18 @@ export function devAssertNumber(shouldBeNumber, opt_message) {
  * For more details see `assert`.
  *
  * @param {*} shouldBeArray
- * @param {!Array<*>|string=} opt_message The assertion message
- * @return {!Array} The array value
+ * @param {Array<*>|string=} opt_message The assertion message
+ * @return {asserts shouldBeArray is Array}
  * @throws {Error} when shouldBeArray is not an Array
- * @closurePrimitive {asserts.matchesReturn}
  */
 export function devAssertArray(shouldBeArray, opt_message) {
   if (mode.isMinified()) {
-    return /** @type {!Array} */ (shouldBeArray);
+    return /** @type {void} */ (shouldBeArray);
   }
   devAssertDceCheck();
 
   return assertions.assertArray(
-    /** @type {!assertions.AssertionFunctionDef} */ (devAssert),
+    /** @type {import('./base').AssertionFunctionDef} */ (devAssert),
     shouldBeArray,
     opt_message
   );
@@ -179,19 +172,18 @@ export function devAssertArray(shouldBeArray, opt_message) {
  * For more details see `assert`.
  *
  * @param {*} shouldBeBoolean
- * @param {!Array<*>|string=} opt_message The assertion message
- * @return {boolean} The boolean value.
+ * @param {Array<*>|string=} opt_message The assertion message
+ * @return {asserts shouldBeBoolean is boolean}
  * @throws {Error} when shouldBeBoolean is not an Boolean
- * @closurePrimitive {asserts.matchesReturn}
  */
 export function devAssertBoolean(shouldBeBoolean, opt_message) {
   if (mode.isMinified()) {
-    return /** @type {boolean} */ (shouldBeBoolean);
+    return /** @type {void} */ (shouldBeBoolean);
   }
   devAssertDceCheck();
 
   return assertions.assertBoolean(
-    /** @type {!assertions.AssertionFunctionDef} */ (devAssert),
+    /** @type {import('./base').AssertionFunctionDef} */ (devAssert),
     shouldBeBoolean,
     opt_message
   );
diff --git a/src/core/assert/globals.d.ts b/src/core/assert/globals.d.ts
new file mode 100644
index 000000000000..adff6d9fb88f
--- /dev/null
+++ b/src/core/assert/globals.d.ts
@@ -0,0 +1,8 @@
+import './amp-globals.d';
+
+declare global {
+  interface Error {
+    // Allows error handlers to display errors with console-interactive values.
+    messageArray?: any[];
+  }
+}
diff --git a/src/core/assert/user.js b/src/core/assert/user.js
index 241b528fcb1d..c9cafa89a00b 100644
--- a/src/core/assert/user.js
+++ b/src/core/assert/user.js
@@ -21,10 +21,9 @@ import * as assertions from './base';
  * @param {*=} opt_7 Optional argument
  * @param {*=} opt_8 Optional argument
  * @param {*=} opt_9 Optional argument
- * @return {T}
+ * @return {asserts shouldBeTruthy}
  * @template T
  * @throws {UserError} when shouldBeTruthy is not truthy.
- * @closurePrimitive {asserts.truthy}
  */
 export function userAssert(
   shouldBeTruthy,
@@ -61,14 +60,13 @@ export function userAssert(
  * For more details see `assert`.
  *
  * @param {*} shouldBeElement
- * @param {!Array<*>|string=} opt_message The assertion message
- * @return {!Element} The value of shouldBeTrueish.
+ * @param {Array<*>|string=} opt_message The assertion message
+ * @return {asserts shouldBeElement is Element}
  * @throws {Error} when shouldBeElement is not an Element
- * @closurePrimitive {asserts.matchesReturn}
  */
 export function userAssertElement(shouldBeElement, opt_message) {
   return assertions.assertElement(
-    /** @type {!assertions.AssertionFunctionDef} */ (userAssert),
+    /** @type {import('./base').AssertionFunctionDef} */ (userAssert),
     shouldBeElement,
     opt_message
   );
@@ -81,14 +79,13 @@ export function userAssertElement(shouldBeElement, opt_message) {
  * For more details see `assert`.
  *
  * @param {*} shouldBeString
- * @param {!Array<*>|string=} opt_message The assertion message
- * @return {string} The string value. Can be an empty string.
+ * @param {Array<*>|string=} opt_message The assertion message
+ * @return {asserts shouldBeString is string}
  * @throws {Error} when shouldBeString is not an String
- * @closurePrimitive {asserts.matchesReturn}
  */
 export function userAssertString(shouldBeString, opt_message) {
   return assertions.assertString(
-    /** @type {!assertions.AssertionFunctionDef} */ (userAssert),
+    /** @type {import('./base').AssertionFunctionDef} */ (userAssert),
     shouldBeString,
     opt_message
   );
@@ -101,15 +98,13 @@ export function userAssertString(shouldBeString, opt_message) {
  * For more details see `assert`.
  *
  * @param {*} shouldBeNumber
- * @param {!Array<*>|string=} opt_message The assertion message
- * @return {number} The number value. The allowed values include `0`
- *   and `NaN`.
+ * @param {Array<*>|string=} opt_message The assertion message
+ * @return {asserts shouldBeNumber is number}
  * @throws {Error} when shouldBeNumber is not an Number
- * @closurePrimitive {asserts.matchesReturn}
  */
 export function userAssertNumber(shouldBeNumber, opt_message) {
   return assertions.assertNumber(
-    /** @type {!assertions.AssertionFunctionDef} */ (userAssert),
+    /** @type {import('./base').AssertionFunctionDef} */ (userAssert),
     shouldBeNumber,
     opt_message
   );
@@ -122,14 +117,13 @@ export function userAssertNumber(shouldBeNumber, opt_message) {
  * For more details see `assert`.
  *
  * @param {*} shouldBeArray
- * @param {!Array<*>|string=} opt_message The assertion message
- * @return {!Array} The array value
+ * @param {Array<*>|string=} opt_message The assertion message
+ * @return {asserts shouldBeArray is Array} The array value
  * @throws {Error} when shouldBeArray is not an Array
- * @closurePrimitive {asserts.matchesReturn}
  */
 export function userAssertArray(shouldBeArray, opt_message) {
   return assertions.assertArray(
-    /** @type {!assertions.AssertionFunctionDef} */ (userAssert),
+    /** @type {import('./base').AssertionFunctionDef} */ (userAssert),
     shouldBeArray,
     opt_message
   );
@@ -141,14 +135,13 @@ export function userAssertArray(shouldBeArray, opt_message) {
  * For more details see `assert`.
  *
  * @param {*} shouldBeBoolean
- * @param {!Array<*>|string=} opt_message The assertion message
- * @return {boolean} The boolean value.
+ * @param {Array<*>|string=} opt_message The assertion message
+ * @return {asserts shouldBeBoolean is boolean} The boolean value.
  * @throws {Error} when shouldBeBoolean is not an Boolean
- * @closurePrimitive {asserts.matchesReturn}
  */
 export function userAssertBoolean(shouldBeBoolean, opt_message) {
   return assertions.assertBoolean(
-    /** @type {!assertions.AssertionFunctionDef} */ (userAssert),
+    /** @type {import('./base').AssertionFunctionDef} */ (userAssert),
     shouldBeBoolean,
     opt_message
   );
diff --git a/src/core/constants/action-constants.js b/src/core/constants/action-constants.js
index 33c2314164be..16ed1499dd16 100644
--- a/src/core/constants/action-constants.js
+++ b/src/core/constants/action-constants.js
@@ -9,15 +9,19 @@ import {devAssert} from '#core/assert';
  * The action service delegates parsing of object literals to the corresponding
  * extension (in the example above, amp-bind).
  *
- * @see ./service/action-impl.ActionInfoDef
- * @const {string}
+ * See ./service/action-impl.ActionInfoDef
+ * TODO(rcebulko): Revert to @see once type is available
+ *
+ * @type {string}
+ * @const
  */
 export const RAW_OBJECT_ARGS_KEY = '__AMP_OBJECT_STRING__';
 
 /**
  * Identifier for an element's default action.
  *
- * @const {string}
+ * @type {string}
+ * @const
  */
 export const DEFAULT_ACTION = 'activate';
 
@@ -27,7 +31,7 @@ export const DEFAULT_ACTION = 'activate';
  *
  * @enum {number}
  */
-export const ActionTrust = {
+export const ActionTrust_Enum = {
   /**
    * Events that are triggered without a user gesture, or triggered by a user
    * gesture with weak intent (e.g. scroll) are "low trust".
@@ -55,17 +59,17 @@ export const ActionTrust = {
 };
 
 /**
- * @param {!ActionTrust} actionTrust
+ * @param {ActionTrust_Enum} actionTrust
  * @return {string}
  */
 export function actionTrustToString(actionTrust) {
   switch (actionTrust) {
-    case ActionTrust.LOW:
+    case ActionTrust_Enum.LOW:
       return 'low';
-    case ActionTrust.HIGH:
+    case ActionTrust_Enum.HIGH:
       return 'high';
     default:
-      devAssert(actionTrust === ActionTrust.DEFAULT);
+      devAssert(actionTrust === ActionTrust_Enum.DEFAULT);
       return 'default';
   }
 }
diff --git a/src/core/constants/amp-events.js b/src/core/constants/amp-events.js
index da569e647b2a..4fa629cc9a98 100644
--- a/src/core/constants/amp-events.js
+++ b/src/core/constants/amp-events.js
@@ -2,7 +2,7 @@
  * Common AMP events.
  * @enum {string}
  */
-export const AmpEvents = {
+export const AmpEvents_Enum = {
   DOM_UPDATE: 'amp:dom-update',
   FORM_DIRTINESS_CHANGE: 'amp:form-dirtiness-change',
   FORM_VALUE_CHANGE: 'amp:form-value-change',
diff --git a/src/core/constants/async-input.d.ts b/src/core/constants/async-input.d.ts
new file mode 100644
index 000000000000..f27199d7730b
--- /dev/null
+++ b/src/core/constants/async-input.d.ts
@@ -0,0 +1,19 @@
+/**
+ * Interface for all AMP Async Input Elements.
+ * enforces the overridable function, getValue().
+ * Async Input should be implemented
+ * by components like AMP form, to async request
+ * a value from a component, and then be used for
+ * some other action. For examples, this can be used
+ * by reCAPTCHA to request tokens for the form.
+ *
+ * NOTE: Elements that implemented AsyncInput must
+ * Also add and follow the other exported constants.
+ * See amp-recaptcha-input as an example.
+ */
+export interface AsyncInput {
+  // Called to get the asynchronous value of an AsyncInput field.
+  getValue: () => Promise<string>;
+}
+
+export * from './async-input.js';
diff --git a/src/core/constants/async-input.js b/src/core/constants/async-input.js
index 59d6cbd36008..9618e1978dad 100644
--- a/src/core/constants/async-input.js
+++ b/src/core/constants/async-input.js
@@ -1,27 +1,3 @@
-/**
- * Interface for all AMP Async Input Elements.
- * enforces the overridable function, getValue().
- * Async Input should be implemented
- * by components like AMP form, to async request
- * a value from a component, and then be used for
- * some other action. For examples, this can be used
- * by reCAPTCHA to request tokens for the form.
- *
- * NOTE: Elements that implemented AsyncInput must
- * Also add and follow the other exported constants.
- * See amp-recaptcha-input as an example.
- *
- * @interface
- */
-export class AsyncInput {
-  /**
-   * Called to get the asynchronous value of an
-   * AsyncInput field.
-   * @return {!Promise<string>}
-   */
-  getValue() {}
-}
-
 /**
  * Attributes
  *
@@ -31,7 +7,7 @@ export class AsyncInput {
  *
  * @enum {string}
  */
-export const AsyncInputAttributes = {
+export const AsyncInputAttributes_Enum = {
   /**
    * data-name
    *
@@ -51,7 +27,7 @@ export const AsyncInputAttributes = {
  *
  * @enum {string}
  */
-export const AsyncInputClasses = {
+export const AsyncInputClasses_Enum = {
   /**
    * i-amphtml-async-input
    *
@@ -60,7 +36,7 @@ export const AsyncInputClasses = {
    * This will be used by other amp components to find
    * and use async-input elements.
    */
-  'ASYNC_INPUT': 'i-amphtml-async-input',
+  ASYNC_INPUT: 'i-amphtml-async-input',
   /**
    * i-async-require-action
    *
@@ -68,5 +44,5 @@ export const AsyncInputClasses = {
    * as a required action for the form. These calls will be
    * executed before the presubmit calls of all async inputs.
    */
-  'ASYNC_REQUIRED_ACTION': 'i-async-require-action',
+  ASYNC_REQUIRED_ACTION: 'i-async-require-action',
 };
diff --git a/src/core/constants/common-signals.js b/src/core/constants/common-signals.js
index 6ce2105a1988..2f1a123769fc 100644
--- a/src/core/constants/common-signals.js
+++ b/src/core/constants/common-signals.js
@@ -2,7 +2,7 @@
  * Commonly used signals across different elements and documents.
  * @enum {string}
  */
-export const CommonSignals = {
+export const CommonSignals_Enum = {
   /**
    * The element's implementation has been registered and ready for upgrade.
    */
diff --git a/src/core/constants/consent-state.js b/src/core/constants/consent-state.js
index 5826592c53ed..710af8ecb626 100644
--- a/src/core/constants/consent-state.js
+++ b/src/core/constants/consent-state.js
@@ -25,4 +25,5 @@ export const CONSENT_STRING_TYPE = {
   TCF_V1: 1,
   TCF_V2: 2,
   US_PRIVACY_STRING: 3,
+  GLOBAL_PRIVACY_PLATFORM: 4,
 };
diff --git a/src/core/constants/enums.js b/src/core/constants/enums.js
index 751d67fc870a..f2ad5647aa4b 100644
--- a/src/core/constants/enums.js
+++ b/src/core/constants/enums.js
@@ -11,7 +11,7 @@ export const AMPDOC_SINGLETON_NAME_ENUM = {
  * Enum for tick labels (used by Performance service)
  * @enum {string}
  */
-export const TickLabel = {
+export const TickLabel_Enum = {
   ACCESS_AUTHORIZATION: 'aaa',
   ACCESS_AUTHORIZATION_VISIBLE: 'aaav',
   CUMULATIVE_LAYOUT_SHIFT: 'cls',
@@ -27,6 +27,7 @@ export const TickLabel = {
   FIRST_INPUT_DELAY: 'fid',
   FIRST_VIEWPORT_READY: 'pc',
   INSTALL_STYLES: 'is',
+  INTERACTION_TO_NEXT_PAINT: 'inp',
   LARGEST_CONTENTFUL_PAINT: 'lcp',
   LARGEST_CONTENTFUL_PAINT_TYPE: 'lcpt',
   LARGEST_CONTENTFUL_PAINT_VISIBLE: 'lcpv',
diff --git a/src/core/constants/key-codes.js b/src/core/constants/key-codes.js
index 964a76999499..326a037a4f53 100644
--- a/src/core/constants/key-codes.js
+++ b/src/core/constants/key-codes.js
@@ -1,7 +1,7 @@
 /**
  * @enum {number}
  */
-export const KeyCodes = {
+export const KeyCodes_Enum = {
   ENTER: 13,
   ESCAPE: 27,
   SPACE: 32,
@@ -14,7 +14,7 @@ export const KeyCodes = {
 /**
  * @enum {string}
  */
-export const Keys = {
+export const Keys_Enum = {
   ENTER: 'Enter',
   ESCAPE: 'Escape',
   SPACE: ' ',
diff --git a/src/core/constants/loading-instructions.js b/src/core/constants/loading-instructions.js
index 568be866819c..592549449ef9 100644
--- a/src/core/constants/loading-instructions.js
+++ b/src/core/constants/loading-instructions.js
@@ -5,54 +5,65 @@
  * Only `UNLOAD` is not defined by the "Lazy loading" spec at this time. It's
  * added here because it supersedes all other loading instructions in AMP.
  *
- * @enum {string}
+ * @enum {"auto" | "lazy" | "eager" | "unload"}
  */
-export const Loading = {
+export const Loading_Enum = {
   /**
    * If parent is available, fallback to its loading strategy (e.g. based on
    * whether the document is visible or not).
    * If parent is not available, proceed with loading at your own discretion.
    */
-  AUTO: 'auto',
+  AUTO: /** @type {"auto"} */ ('auto'),
 
   /**
    * Do not load independently. Wait for the caller to start loading manually.
    */
-  LAZY: 'lazy',
+  LAZY: /** @type {"lazy"} */ ('lazy'),
 
   /**
    * Proceed with loading at the earliest convenience.
    */
-  EAGER: 'eager',
+  EAGER: /** @type {"eager"} */ ('eager'),
 
   /**
    * Force unload if possible.
    */
-  UNLOAD: 'unload',
+  UNLOAD: /** @type {"unload"} */ ('unload'),
 };
 
-/** @const {!Array<!Loading>} */
-const ORDER = [Loading.AUTO, Loading.LAZY, Loading.EAGER, Loading.UNLOAD];
+/**
+ * @type {Array<Loading_Enum>}
+ * @const
+ */
+const ORDER = [
+  Loading_Enum.AUTO,
+  Loading_Enum.LAZY,
+  Loading_Enum.EAGER,
+  Loading_Enum.UNLOAD,
+];
 
-/** @const {!Object<string, number>} */
+/**
+ * @type {{[key: string]: number}}
+ * @const
+ */
 const MAP = {
-  [Loading.AUTO]: 0,
-  [Loading.LAZY]: 1,
-  [Loading.EAGER]: 2,
-  [Loading.UNLOAD]: 3,
+  [Loading_Enum.AUTO]: 0,
+  [Loading_Enum.LAZY]: 1,
+  [Loading_Enum.EAGER]: 2,
+  [Loading_Enum.UNLOAD]: 3,
 };
 
 /**
  * Returns the loading instruction with a higher priority. The priority
  * order is auto -> lazy -> eager -> unload.
  *
- * @param {!Loading|string} v1
- * @param {!Loading|string} v2
- * @return {!Loading}
+ * @param {Loading_Enum|string|undefined} v1
+ * @param {Loading_Enum|string|undefined} v2
+ * @return {Loading_Enum}
  */
 export function reducer(v1, v2) {
-  const ordinal1 = MAP[v1] || 0;
-  const ordinal2 = MAP[v2] || 0;
+  const ordinal1 = MAP[v1 ?? Loading_Enum.AUTO] || 0;
+  const ordinal2 = MAP[v2 ?? Loading_Enum.AUTO] || 0;
   const ordinal = Math.max(ordinal1, ordinal2);
   return ORDER[ordinal];
 }
diff --git a/src/core/constants/ready-state.js b/src/core/constants/ready-state.js
index b0468225e27b..019e6657a301 100644
--- a/src/core/constants/ready-state.js
+++ b/src/core/constants/ready-state.js
@@ -3,7 +3,7 @@
  *
  * @enum {string}
  */
-export const ReadyState = {
+export const ReadyState_Enum = {
   /**
    * The element has not been upgraded yet.
    */
diff --git a/src/core/constants/visibility-state.js b/src/core/constants/visibility-state.js
index e85dfed64e45..10b8019a69a6 100644
--- a/src/core/constants/visibility-state.js
+++ b/src/core/constants/visibility-state.js
@@ -2,12 +2,18 @@
  * Visibility state of the AMP document.
  * @enum {string}
  */
-export const VisibilityState = {
+export const VisibilityState_Enum = {
   /**
    * The AMP document is being pre-rendered before being shown.
    */
   PRERENDER: 'prerender',
 
+  /**
+   * The AMP document is being displayed in a preview mode before being shown.
+   * External resources should not be loaded, to preserve privacy.
+   */
+  PREVIEW: 'preview',
+
   /**
    * The AMP document is currently active and visible.
    */
diff --git a/src/core/context/index.js b/src/core/context/index.js
index 8a004721bf3d..a931b6556f9d 100644
--- a/src/core/context/index.js
+++ b/src/core/context/index.js
@@ -1,5 +1,9 @@
 import {ContextNode} from './node';
-import {ContextPropDef} from './prop.type';
+
+/**
+ * @template T, DEP
+ * @typedef {import('./types.d').IContextProp<T, DEP>} IContextProp
+ */
 
 export {contextProp} from './prop';
 export {subscribe, unsubscribe} from './subscriber';
@@ -11,8 +15,8 @@ export {subscribe, unsubscribe} from './subscriber';
  *
  * See `Element.assignedSlot` API.
  *
- * @param {!Node} node The target node.
- * @param {!Node} slot The slot to which the target node is assigned.
+ * @param {Node} node The target node.
+ * @param {Node} slot The slot to which the target node is assigned.
  */
 export function assignSlot(node, slot) {
   ContextNode.assignSlot(node, slot);
@@ -22,8 +26,8 @@ export function assignSlot(node, slot) {
  * Unassigns the direct slot previously done by the `assignSlot` call.
  * Automatically starts the discovery phase for the affected nodes.
  *
- * @param {!Node} node The target node.
- * @param {!Node} slot The slot from which the target node is assigned.
+ * @param {Node} node The target node.
+ * @param {Node} slot The slot from which the target node is assigned.
  */
 export function unassignSlot(node, slot) {
   ContextNode.unassignSlot(node, slot);
@@ -33,7 +37,7 @@ export function unassignSlot(node, slot) {
  * Sets (or unsets) the direct parent. If the parent is set, the node will no
  * longer try to discover itself.
  *
- * @param {!Node} node
+ * @param {Node|ShadowRoot} node
  * @param {?Node} parent
  */
 export function setParent(node, parent) {
@@ -41,7 +45,7 @@ export function setParent(node, parent) {
 }
 
 /**
- * @param {!Node} node
+ * @param {Node} node
  */
 export function discover(node) {
   ContextNode.get(node).discover();
@@ -51,7 +55,7 @@ export function discover(node) {
  * Designates (or undesignates) the node as a root node. If the node is
  * designated as a root, it will no longer discover itself.
  *
- * @param {!Node} node
+ * @param {Node} node
  * @param {boolean} isRoot
  */
 export function setIsRoot(node, isRoot) {
@@ -61,7 +65,7 @@ export function setIsRoot(node, isRoot) {
 /**
  * Reruns discovery on the children of the specified node, if any.
  *
- * @param {!Node} node
+ * @param {Node} node
  */
 export function rediscoverChildren(node) {
   ContextNode.rediscoverChildren(node);
@@ -81,9 +85,9 @@ export function rediscoverChildren(node) {
  * Once the input is set, the recalculation is rescheduled asynchronously.
  * All dependent properties are also recalculated.
  *
- * @param {!Node} node The target node.
- * @param {!ContextPropDef<T>} prop
- * @param {function(T)} setter
+ * @param {Node} node The target node.
+ * @param {IContextProp<T, ?>} prop
+ * @param {function(*):void} setter
  * @param {T} value
  * @template T
  */
@@ -95,9 +99,9 @@ export function setProp(node, prop, setter, value) {
  * Unsets the input value for the specified property and setter.
  * See `setProp()` for more info.
  *
- * @param {!Node} node The target node.
- * @param {!ContextPropDef<T>} prop
- * @param {function(T)} setter
+ * @param {Node} node The target node.
+ * @param {IContextProp<T, ?>} prop
+ * @param {function(*):void} setter
  * @template T
  */
 export function removeProp(node, prop, setter) {
@@ -105,9 +109,9 @@ export function removeProp(node, prop, setter) {
 }
 
 /**
- * @param {!Node} node
+ * @param {Node} node
  * @param {string} name
- * @param {function(!Node):boolean} match
+ * @param {function(Node):boolean} match
  * @param {number=} weight
  */
 export function addGroup(node, name, match, weight = 0) {
@@ -115,24 +119,24 @@ export function addGroup(node, name, match, weight = 0) {
 }
 
 /**
- * @param {!Node} node
+ * @param {Node} node
  * @param {string} groupName
- * @param {!ContextPropDef<T>} prop
- * @param {function(T)} setter
+ * @param {IContextProp<T, ?>} prop
+ * @param {function(T):void} setter
  * @param {T} value
  * @template T
  */
 export function setGroupProp(node, groupName, prop, setter, value) {
-  ContextNode.get(node).group(groupName).values.set(prop, setter, value);
+  ContextNode.get(node).group(groupName)?.values.set(prop, setter, value);
 }
 
 /**
- * @param {!Node} node
+ * @param {Node} node
  * @param {string} groupName
- * @param {!ContextPropDef<T>} prop
- * @param {function(T)} setter
+ * @param {IContextProp<T, ?>} prop
+ * @param {function(T):void} setter
  * @template T
  */
 export function removeGroupProp(node, groupName, prop, setter) {
-  ContextNode.get(node).group(groupName).values.remove(prop, setter);
+  ContextNode.get(node).group(groupName)?.values.remove(prop, setter);
 }
diff --git a/src/core/context/node.js b/src/core/context/node.js
index a8181bd79f67..b9fb88d7bab7 100644
--- a/src/core/context/node.js
+++ b/src/core/context/node.js
@@ -1,11 +1,16 @@
-import {devAssert, devAssertElement} from '#core/assert';
+import {devAssert} from '#core/assert';
 import * as mode from '#core/mode';
+import {isElement} from '#core/types';
 import {pushIfNotExist, removeItem} from '#core/types/array';
 
-import {ContextPropDef} from './prop.type';
 import {throttleTail} from './scheduler';
 import {Values} from './values';
 
+/**
+ * @template T, DEP
+ * @typedef {import('./types.d').IContextProp<T, DEP>} IContextProp
+ */
+
 // Properties set on the DOM nodes to track the context state.
 const NODE_PROP = '__AMP_NODE';
 const ASSIGNED_SLOT_PROP = '__AMP_ASSIGNED_SLOT';
@@ -13,7 +18,6 @@ const AMP_PREFIX = 'AMP-';
 
 // Relevant node types.
 // See https://developer.mozilla.org/en-US/docs/Web/API/Node/nodeType.
-const ELEMENT_NODE = 1;
 const DOCUMENT_NODE = 9;
 // Includes shadow root, template, etc.
 const FRAGMENT_NODE = 11;
@@ -22,12 +26,11 @@ const FRAGMENT_NODE = 11;
  * The structure for a group of nodes.
  *
  * @typedef {{
- *   cn: !ContextNode,
- *   match: function(!Node, !Node):boolean,
+ *   cn: ContextNode<?>,
+ *   match: function(Node, Node):boolean,
  *   weight: number,
- * }}
+ * }} GroupDef
  */
-let GroupDef;
 
 /**
  * The context node is a sparse tree over the DOM tree. Any node that needs
@@ -42,11 +45,11 @@ export class ContextNode {
   /**
    * Returns the existing context node or creates a new one.
    *
-   * @param {!Node} node
-   * @return {!ContextNode}
+   * @param {Node} node
+   * @return {ContextNode<?>}
    */
   static get(node) {
-    let contextNode = /** @type {!ContextNode|undefined} */ (node[NODE_PROP]);
+    let contextNode = /** @type {ContextNode<?>|undefined} */ (node[NODE_PROP]);
     if (!contextNode) {
       contextNode = new ContextNode(node, null);
       if (mode.isLocalDev() || mode.isTest()) {
@@ -77,19 +80,20 @@ export class ContextNode {
    * Root nodes (document or shadow root) and AMP elements are auto-created
    * during the traversal.
    *
-   * @param {!Node} node The node from which to perform the search.
+   * @param {Node} node The node from which to perform the search.
    * @param {boolean=} includeSelf Whether the specified node itself should
    * be included in the search. Defaults to `true`.
-   * @return {?ContextNode}
+   * @return {?ContextNode<?>}
    */
   static closest(node, includeSelf = true) {
+    /** @type {?Node} */
     let n = node;
     while (n) {
       // Check if a node is a candidate to be returned.
       if (n != node || includeSelf) {
         if (n[NODE_PROP]) {
           // Already a discovered node.
-          return /** @type {!ContextNode} */ (n[NODE_PROP]);
+          return /** @type {ContextNode<?>} */ (n[NODE_PROP]);
         }
         const {nodeType} = n;
         if (
@@ -101,21 +105,21 @@ export class ContextNode {
           nodeType == FRAGMENT_NODE ||
           // An AMP node will always have a context node backing it at some
           // point.
-          (nodeType == ELEMENT_NODE &&
-            devAssertElement(n).tagName.startsWith(AMP_PREFIX))
+          (isElement(n) && n.tagName.startsWith(AMP_PREFIX))
         ) {
           return ContextNode.get(n);
         }
       }
       // Navigate up the DOM tree. Notice that we do not automatically go over
       // a root node boundary.
+      /** @type {Node|Element|undefined|null} */
       const assignedSlot =
         /** @type {?Node|undefined} */ (n[ASSIGNED_SLOT_PROP]) ||
-        n.assignedSlot;
+        /** @type {Element} */ (n).assignedSlot;
       if (assignedSlot) {
         n = assignedSlot;
       } else {
-        n = n.parentNode;
+        n = /** @type {?Node} */ (n.parentNode);
       }
     }
     // Only disconnected nodes will return `null` here.
@@ -129,8 +133,8 @@ export class ContextNode {
    *
    * See `Element.assignedSlot` API.
    *
-   * @param {!Node} node The target node.
-   * @param {!Node} slot The slot to which the target node is assigned.
+   * @param {Node} node The target node.
+   * @param {Node} slot The slot to which the target node is assigned.
    */
   static assignSlot(node, slot) {
     if (node[ASSIGNED_SLOT_PROP] == slot) {
@@ -144,8 +148,8 @@ export class ContextNode {
    * Unassigns the direct slot previously done by the `assignSlot` call.
    * Automatically starts the discovery phase for the affected nodes.
    *
-   * @param {!Node} node The target node.
-   * @param {!Node} slot The slot from which the target node is assigned.
+   * @param {Node} node The target node.
+   * @param {Node} slot The slot from which the target node is assigned.
    */
   static unassignSlot(node, slot) {
     if (node[ASSIGNED_SLOT_PROP] != slot) {
@@ -158,24 +162,33 @@ export class ContextNode {
   /**
    * Reruns discovery on the children of the specified node, if any.
    *
-   * @param {!Node} node
+   * @param {Node} node
    */
   static rediscoverChildren(node) {
-    const contextNode = /** @type {!ContextNode|undefined} */ (node[NODE_PROP]);
+    const contextNode = /** @type {ContextNode<?>|undefined} */ (
+      node[NODE_PROP]
+    );
     contextNode?.children?.forEach(discoverContextNode);
   }
 
   /**
    * Creates the context node and automatically starts the discovery process.
    *
-   * @param {!Node} node
+   * @param {Node} node
    * @param {?string} name
    */
   constructor(node, name) {
-    /** @const {!Node} */
+    /**
+     * @const
+     * @type {Node}
+     */
     this.node = node;
 
-    /** @const @package {?string} */
+    /**
+     * @const
+     * @package
+     * @type {?string}
+     */
     this.name = name;
 
     /**
@@ -183,7 +196,8 @@ export class ContextNode {
      * considered as roots. But other nodes can become roots as well
      * (e.g. shadow roots) via `setIsRoot()` API.
      *
-     * @package {boolean}
+     * @package
+     * @type {boolean}
      */
     this.isRoot = node.nodeType == DOCUMENT_NODE;
 
@@ -191,7 +205,8 @@ export class ContextNode {
      * The root context node. Always available for a DOM node connected to a
      * root node after the discovery phase.
      *
-     * @package {?ContextNode}
+     * @package
+     * @type {?ContextNode<?>}
      */
     this.root = this.isRoot ? this : null;
 
@@ -202,30 +217,48 @@ export class ContextNode {
      * why the API is declared as package-private. However, it needs to be
      * unobfuscated to avoid cross-binary issues.
      *
-     * @package {?ContextNode}
+     * @package
+     * @type {?ContextNode<?>}
      */
     this.parent = null;
 
     /**
      * See `parent` description.
      *
-     * @package {?Array<!ContextNode>}
+     * @package
+     * @type {?ContextNode<?>[]}
      */
     this.children = null;
 
-    /** @package {?Map<string, !GroupDef>} */
+    /**
+     * @package
+     * @type {?Map<string, GroupDef>}
+     */
     this.groups = null;
 
-    /** @package {!Values} */
+    /**
+     * @package
+     * @type {Values}
+     */
     this.values = new Values(this);
 
-    /** @private {?Map<!SID, !./subscriber.Subscriber>} */
+    /**
+     * @private
+     * @type {?Map<SID, import('./subscriber').Subscriber<?>>}
+     */
     this.subscribers_ = null;
 
-    /** @private {boolean} */
+    /**
+     * @private
+     * @type {boolean}
+     */
     this.parentOverridden_ = false;
 
-    /** @const @private {function()} */
+    /**
+     * @const
+     * @private
+     * @type {function():void}
+     */
     this.scheduleDiscover_ = throttleTail(
       this.discover_.bind(this),
       setTimeout
@@ -234,7 +267,7 @@ export class ContextNode {
     // Shadow root: track slot changes.
     if (node.nodeType == FRAGMENT_NODE) {
       node.addEventListener('slotchange', (e) => {
-        const slot = /** @type {!HTMLSlotElement} */ (e.target);
+        const slot = /** @type {HTMLSlotElement} */ (e.target);
         // Rediscover newly assigned nodes.
         slot.assignedNodes().forEach(discoverContained);
         // Rediscover unassigned nodes.
@@ -271,12 +304,12 @@ export class ContextNode {
    * Sets (or unsets) the direct parent. If the parent is set, the node will no
    * longer try to discover itself.
    *
-   * @param {!ContextNode|!Node|null} parent
+   * @param {?(ContextNode<?>|Node)} parent
    */
   setParent(parent) {
-    const parentContext = parent?.nodeType
-      ? ContextNode.get(/** @type {!Node} */ (parent))
-      : /** @type {?ContextNode} */ (parent);
+    const parentContext = /** @type {*} */ (parent)?.nodeType
+      ? ContextNode.get(/** @type {Node} */ (parent))
+      : /** @type {?ContextNode<?>} */ (parent);
     this.updateTree_(parentContext, /* parentOverridden */ parent != null);
   }
 
@@ -288,12 +321,12 @@ export class ContextNode {
    */
   setIsRoot(isRoot) {
     this.isRoot = isRoot;
-    const newRoot = isRoot ? this : this.parent?.root ?? null;
+    const newRoot = isRoot ? this : (this.parent?.root ?? null);
     this.updateRoot(newRoot);
   }
 
   /**
-   * @param {?ContextNode} root
+   * @param {?ContextNode<?>} root
    * @protected Used cross-binary.
    */
   updateRoot(root) {
@@ -316,9 +349,9 @@ export class ContextNode {
 
   /**
    * @param {string} name
-   * @param {function(!Node):boolean} match
+   * @param {function(Node):boolean} match
    * @param {number} weight
-   * @return {!ContextNode}
+   * @return {ContextNode<?>}
    */
   addGroup(name, match, weight) {
     const groups = this.groups || (this.groups = new Map());
@@ -332,15 +365,15 @@ export class ContextNode {
 
   /**
    * @param {string} name
-   * @return {?ContextNode}
+   * @return {?ContextNode<?>}
    */
   group(name) {
     return this.groups?.get(name)?.cn || null;
   }
 
   /**
-   * @param {!Node} node
-   * @return {?ContextNode}
+   * @param {Node} node
+   * @return {?ContextNode<?>}
    * @protected
    */
   findGroup(node) {
@@ -363,17 +396,25 @@ export class ContextNode {
    * Add or update a subscriber with a specified ID. If subscriber doesn't
    * yet exist, it will be created using the specified factory. The use
    * of factory is important to reduce bundling costs for context node.
+   * If `func` returns a function, that function is called on cleanup.
    *
-   * @param {!SID} id
-   * @param {typeof ./subscriber.Subscriber} Ctor
-   * @param {!Function} func
-   * @param {!Array<!ContextPropDef>} deps
+   * @param {SID} id
+   * @param {typeof import('./subscriber').Subscriber} Ctor
+   * @param {import('./subscriber').SubscribeCallback<DEP>} func
+   * @param {IContextProp<DEP, ?>[]} deps
+   * @template DEP
    */
   subscribe(id, Ctor, func, deps) {
     const subscribers = this.subscribers_ || (this.subscribers_ = new Map());
     let subscriber = subscribers.get(id);
     if (!subscriber) {
-      subscriber = new Ctor(this, func, deps);
+      subscriber = new Ctor(
+        /** @type {ContextNode<function(...DEP):void>} */ (
+          /** @type {?} */ (this)
+        ),
+        func,
+        deps
+      );
       subscribers.set(id, subscriber);
     }
   }
@@ -381,13 +422,14 @@ export class ContextNode {
   /**
    * Removes the subscriber previously set with `subscribe`.
    *
-   * @param {!SID} id
+   * @param {SID} id
    */
   unsubscribe(id) {
     const subscribers = this.subscribers_;
     const subscriber = subscribers?.get(id);
     if (subscriber) {
       subscriber.dispose();
+      devAssert(subscribers);
       subscribers.delete(id);
     }
   }
@@ -408,7 +450,7 @@ export class ContextNode {
   }
 
   /**
-   * @param {?ContextNode} parent
+   * @param {?ContextNode<?>} parent
    * @param {boolean} parentOverridden
    * @private
    */
@@ -422,7 +464,8 @@ export class ContextNode {
 
       // Remove from the old parent.
       if (oldParent?.children) {
-        removeItem(devAssert(oldParent.children), this);
+        devAssert(oldParent.children);
+        removeItem(oldParent.children, this);
       }
 
       // Add to the new parent.
@@ -453,8 +496,8 @@ export class ContextNode {
  * Iterates over all context nodes that are contained within the specified
  * `node`. Only iterates over known context nodes.
  *
- * @param {!Node} node
- * @param {function(!ContextNode)} callback
+ * @param {Node} node
+ * @param {function(ContextNode<?>):void} callback
  * @param {boolean=} includeSelf
  */
 function forEachContained(node, callback, includeSelf = true) {
@@ -474,14 +517,14 @@ function forEachContained(node, callback, includeSelf = true) {
 }
 
 /**
- * @param {!Node} node
+ * @param {Node} node
  */
 function discoverContained(node) {
   forEachContained(node, discoverContextNode);
 }
 
 /**
- * @param {!ContextNode} cn
+ * @param {ContextNode<?>} cn
  */
 function discoverContextNode(cn) {
   cn.discover();
diff --git a/src/core/context/prop.js b/src/core/context/prop.js
index 7b4b2f8e8f11..295d98db1fe1 100644
--- a/src/core/context/prop.js
+++ b/src/core/context/prop.js
@@ -1,33 +1,33 @@
 import {devAssert} from '#core/assert';
 
-import {ContextPropDef} from './prop.type';
+/**
+ * @template T, DEP
+ * @typedef {import('./types.d').IContextProp<T, DEP>} IContextProp
+ */
 
+/** @type {IContextProp<*, *>[]} */
 const EMPTY_DEPS = [];
 
 /**
- * Creates the `ContextPropDef` type.
+ * Creates the `IContextProp` type.
  *
  * @param {string} key
  * @param {{
- *   type: (!Object|undefined),
- *   deps: (!Array<!ContextPropDef<DEP>>|undefined),
- *   recursive: (boolean|(function(!Array<T>):boolean)|undefined),
- *   compute: (function(!Node, !Array<T>, ...DEP):(T|undefined)),
- *   defaultValue: (T|undefined),
- * }=} opt_spec
- * @return {!ContextPropDef<T, DEP>}
- * @template T
- * @template DEP
+ *   type?: Object,
+ *   deps?: IContextProp<DEP, *>[],
+ *   recursive?: boolean | (function(T[]):boolean),
+ *   compute?: function(Node, T[], ...T):(T | undefined),
+ *   defaultValue?: T,
+ * }} opt_spec
+ * @return {IContextProp<T, DEP>}
+ * @template T, DEP
  */
 export function contextProp(key, opt_spec) {
-  const prop = /** @type {!ContextPropDef<T, DEP>} */ ({
+  const prop = /** @type {IContextProp<T, DEP>} */ ({
     key,
     // Default values.
-    type: null,
     deps: EMPTY_DEPS,
     recursive: false,
-    compute: null,
-    defaultValue: undefined,
     // Overrides.
     ...opt_spec,
   });
diff --git a/src/core/context/prop.type.js b/src/core/context/prop.type.js
deleted file mode 100644
index e8cf48e12931..000000000000
--- a/src/core/context/prop.type.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * A context property.
- *
- * @interface
- * @template T
- * @template DEP
- */
-export function ContextPropDef() {}
-
-/**
- * A globally unique key. Extensions must use a fully qualified name such
- * as "amp-extension:key" or "amp-extension:version:key".
- *
- * @type {string}
- */
-ContextPropDef.prototype.key;
-
-/**
- * An optional type object that can be used for a using system. E.g.
- * this could be a Preact's Context object.
- *
- * @type {?Object}
- */
-ContextPropDef.prototype.type;
-
-/**
- * An array of dependencies that are required for the `compute` callback.
- *
- * @type {!Array<!ContextPropDef<DEP>>}
- */
-ContextPropDef.prototype.deps;
-
-/**
- * Whether the value needs a recursive resolution of the parent value. The
- * following values are allowed:
- * - `false`: the parent value is never needed. It's a non-recursive
- * property, such as `Loaded`.
- * - `true`: the parent value is always needed. It's a recursive property.
- * It could be a simple "find first" recursive property. Or it could be a
- * computable property, such as `score` where all values of the score are
- * compounded.
- * - a function: the parent value may or may not be needed. This function
- * will be called with all of the property inputs. It should return `true`
- * if the parent value is needed for the provided inputs. For instance,
- * a recursive property based on AND (e.g. `renderable`), can immediately
- * determine that the resulting value will be `false` because some inputs
- * are `false` and thus a more resource-sensitive parent resolution is not
- * necessary.
- *
- * @type {boolean|function(!Array<T>):boolean}
- */
-ContextPropDef.prototype.recursive;
-
-/**
- * Computes the property value. This callback is passed the following
- * arguments:
- * 1. The DOM Node.
- * 2. An array of all inputs set on this DOM node for this property.
- * 3. If it's a recursive property, the parent value.
- * 4. If `deps` are specified - the dep values.
- *
- * @type {function(!Node, !Array<T>, ...DEP):(T|undefined)}
- */
-ContextPropDef.prototype.compute;
-
-/**
- * The default value of a recursive property.
- *
- * @type {T|undefined}
- */
-ContextPropDef.prototype.defaultValue;
diff --git a/src/core/context/scan.js b/src/core/context/scan.js
index a7d69316c702..78c49856f7b9 100644
--- a/src/core/context/scan.js
+++ b/src/core/context/scan.js
@@ -1,12 +1,14 @@
+/** @typedef {import('./node').ContextNode<?>} ContextNode */
+
 /**
  * Performs the `closest()` scan through context nodes to find the one that
  * matches the predicate with an optional argument.
  *
- * @param {!./node.ContextNode} startNode
- * @param {function(!./node.ContextNode, T):boolean} predicate
+ * @param {ContextNode} startNode
+ * @param {function(ContextNode, T|undefined):boolean} predicate
  * @param {T=} arg
  * @param {boolean=} includeSelf
- * @return {?./node.ContextNode}
+ * @return {?ContextNode}
  * @template T
  */
 export function findParent(
@@ -29,8 +31,8 @@ export function findParent(
  * subtree by returning a falsy result. Otherwise, the subtree will be scanned
  * and the result value will be passed to the children callbacks.
  *
- * @param {!./node.ContextNode} startNode
- * @param {function(!./node.ContextNode, T, S):S} callback
+ * @param {ContextNode} startNode
+ * @param {function(ContextNode, T|undefined, S):S} callback
  * @param {T=} arg
  * @param {S=} state
  * @param {boolean=} includeSelf
@@ -41,7 +43,7 @@ export function deepScan(
   startNode,
   callback,
   arg = undefined,
-  state = true,
+  state = /** @type {S} */ (/** @type {?} */ (true)),
   includeSelf = true
 ) {
   if (includeSelf) {
diff --git a/src/core/context/scheduler.js b/src/core/context/scheduler.js
index 5d48c19025e6..6f0e0e18df92 100644
--- a/src/core/context/scheduler.js
+++ b/src/core/context/scheduler.js
@@ -1,20 +1,20 @@
-/** @typedef {function(function())} */
-let SchedulerDef;
+/** @typedef {function(function():*):void} SchedulerDef */
+
 /**
  * Creates a scheduling function that executes the callback based on the
  * scheduler, but only one task at a time.
  *
- * @param {function()} handler
- * @param {?SchedulerDef} defaultScheduler
- * @return {function(!SchedulerDef=)}
+ * @param {function():*} handler
+ * @param {SchedulerDef} defaultScheduler
+ * @return {function(SchedulerDef=):void}
  */
-export function throttleTail(handler, defaultScheduler = null) {
+export function throttleTail(handler, defaultScheduler) {
   let scheduled = false;
   const handleAndUnschedule = () => {
     scheduled = false;
     handler();
   };
-  /** @param {!SchedulerDef=} opt_scheduler */
+  /** @param {SchedulerDef=} opt_scheduler */
   const scheduleIfNotScheduled = (opt_scheduler) => {
     if (!scheduled) {
       scheduled = true;
diff --git a/src/core/context/subscriber.js b/src/core/context/subscriber.js
index db18f093b80f..a4e7b6c46bfc 100644
--- a/src/core/context/subscriber.js
+++ b/src/core/context/subscriber.js
@@ -2,10 +2,22 @@ import {tryCallback} from '#core/error';
 import {arrayOrSingleItemToArray} from '#core/types/array';
 
 import {ContextNode} from './node';
-import {ContextPropDef} from './prop.type';
 import {throttleTail} from './scheduler';
 
+/**
+ * @template T, DEP
+ * @typedef {import('./types.d').IContextProp<T, DEP>} IContextProp
+ */
+/**
+ * @template DEP
+ * @typedef {(function(...DEP):void)
+ *          |(function(...DEP):(function():void))} SubscribeCallback
+ */
+
+/** @type {Array<*>} */
 const EMPTY_ARRAY = [];
+
+/** @type {function():void} */
 const EMPTY_FUNC = () => {};
 
 /**
@@ -16,9 +28,9 @@ const EMPTY_FUNC = () => {};
  * - The subscriber is called whenever any of its dependencies change.
  * - A subscriber can optionally return a cleanup function.
  *
- * @param {!Node} node
- * @param {!ContextPropDef<DEP>|!Array<!ContextPropDef<DEP>>} deps
- * @param {function(...DEP)} callback
+ * @param {Node} node
+ * @param {IContextProp<DEP, ?>|IContextProp<DEP, ?>[]} deps
+ * @param {SubscribeCallback<DEP>} callback
  * @template DEP
  */
 export function subscribe(node, deps, callback) {
@@ -31,8 +43,8 @@ export function subscribe(node, deps, callback) {
 /**
  * Removes the subscriber prevoiously registered with `subscribe` API.
  *
- * @param {!Node} node
- * @param {function(...DEP)} callback
+ * @param {Node} node
+ * @param {SubscribeCallback<DEP>} callback
  * @template DEP
  */
 export function unsubscribe(node, callback) {
@@ -50,29 +62,47 @@ export function unsubscribe(node, callback) {
  */
 export class Subscriber {
   /**
-   * @param {!ContextNode} contextNode
-   * @param {function(...DEP)} func
-   * @param {!Array<!ContextPropDef<DEP>>} deps
+   * @param {ContextNode<SubscribeCallback<DEP>>} contextNode
+   * @param {SubscribeCallback<DEP>} func
+   * @param {IContextProp<DEP, ?>[]} deps
    */
   constructor(contextNode, func, deps) {
-    /** @package @const {!ContextNode} */
+    /**
+     * @package
+     * @const
+     * @type {ContextNode<SubscribeCallback<DEP>>}
+     */
     this.contextNode = contextNode;
 
-    /** @private @const {function(DEP)} */
+    /**
+     * @private
+     * @const
+     * @type {function(DEP):void}
+     */
     this.func_ = func;
 
-    /** @private @const {!Array<!ContextPropDef<DEP>>} */
+    /**
+     * @private
+     * @const
+     * @type {IContextProp<DEP, ?>[]}
+     */
     this.deps_ = deps;
 
     /**
-     * @private @const {!Array<DEP|undefined>}
+     * @private
+     * @const
+     * @type {(DEP|undefined)[]}
      *
      * Start with a pre-allocated array filled with `undefined`. The filling
      * is important to ensure the correct `Array.every` execution.
      */
     this.depValues_ = deps.length > 0 ? deps.map(EMPTY_FUNC) : EMPTY_ARRAY;
 
-    /** @private @const {!Array<function(DEP)>} */
+    /**
+     * @private
+     * @const
+     * @type {(function(DEP):void)[]}
+     */
     this.depSubscribers_ =
       deps.length > 0
         ? deps.map((unusedDep, index) => (value) => {
@@ -81,14 +111,24 @@ export class Subscriber {
           })
         : EMPTY_ARRAY;
 
-    /** @private {boolean} */
+    /**
+     * @private
+     * @type {boolean}
+     */
     this.running_ = false;
 
-    /** @private {?function()} */
+    /**
+     * @private
+     * @type {null|void|function():void}
+     */
     this.runCleanup_ = null;
 
     // Schedulers.
-    /** @private @const {function()} */
+    /**
+     * @private
+     * @const
+     * @type {function():void}
+     */
     this.update_ = throttleTail(this.update_.bind(this), setTimeout);
 
     // Subscribe to all dependencies.
@@ -159,12 +199,7 @@ export class Subscriber {
 
   /** @private */
   run_() {
-    // Cleanup the previous run.
-    if (this.runCleanup_) {
-      tryCallback(this.runCleanup_);
-      this.runCleanup_ = null;
-    }
-
+    this.cleanup_();
     // Run the subscriber.
     const func = this.func_;
     this.runCleanup_ = callHandler(func, this.depValues_);
@@ -196,9 +231,9 @@ function isDefined(v) {
 /**
  * Creates a subscriber.
  *
- * @param {function(...DEP)} callback
- * @param {!Array<DEP>} deps
- * @return {?function()}
+ * @param {SubscribeCallback<DEP>} callback
+ * @param {DEP[]} deps
+ * @return {ReturnType<SubscribeCallback<DEP>>}
  * @template DEP
  */
 function callHandler(callback, deps) {
diff --git a/src/core/context/types.d.ts b/src/core/context/types.d.ts
new file mode 100644
index 000000000000..931c829535cc
--- /dev/null
+++ b/src/core/context/types.d.ts
@@ -0,0 +1,96 @@
+import {ContextNode} from './node';
+export interface IContextProp<T, DEP> {
+  /**
+   * A globally unique key. Extensions must use a fully qualified name such
+   * as "amp-extension:key" or "amp-extension:version:key".
+   */
+  key: string;
+
+  /**
+   * A type object that can be used for a using system. E.g.
+   * this could be a Preact's Context object.
+   */
+  type: import('preact').Context<T>;
+
+  /**
+   * An array of dependencies that are required for the `compute` callback.
+   */
+  deps: IContextProp<DEP, any>[];
+
+  /**
+   * Whether the value needs a recursive resolution of the parent value. The
+   * following values are allowed:
+   * - `false`: the parent value is never needed. It's a non-recursive
+   * property, such as `Loaded`.
+   * - `true`: the parent value is always needed. It's a recursive property.
+   * It could be a simple "find first" recursive property. Or it could be a
+   * computable property, such as `score` where all values of the score are
+   * compounded.
+   * - a function: the parent value may or may not be needed. This function
+   * will be called with all of the property inputs. It should return `true`
+   * if the parent value is needed for the provided inputs. For instance,
+   * a recursive property based on AND (e.g. `renderable`), can immediately
+   * determine that the resulting value will be `false` because some inputs
+   * are `false` and thus a more resource-sensitive parent resolution is not
+   * necessary.
+   */
+  recursive: boolean | ((inputs: T[]) => boolean);
+
+  /**
+   * Computes the property value. This callback is passed the following
+   * arguments:
+   * 1. The DOM Node.
+   * 2. An array of all inputs set on this DOM node for this property.
+   * 3. If it's a recursive property, the parent value.
+   * 4. If `deps` are specified - the dep values.
+   */
+  compute(node: Node, inputs: T[], ...deps: T[]): T | undefined;
+  compute(
+    node: Node,
+    inputs: T[],
+    parentValue: T,
+    ...deps: DEP[]
+  ): T | undefined;
+
+  /**
+   * The default value of a recursive property.
+   */
+  defaultValue?: T;
+}
+
+/**
+ * The structure for a property's inputs. It's important that `values` are
+ * easily available as an array to pass them to the `recursive` and
+ * `compute` callbacks without reallocation.
+ */
+export interface IContextPropInput<T> {
+  values: T[];
+  setters: ((value: T) => void)[];
+}
+
+// TODO(rcebulko): Solve enum challenge bridging JS/TS
+export type PendingEnumValue = number;
+
+/** The structure for a property's computed values and subscribers. */
+export interface IContextPropUsed<T, DEP> {
+  prop: IContextProp<T, DEP>;
+  subscribers: ((value: T) => void)[];
+  value: T;
+  pending: PendingEnumValue;
+  counter: number;
+  depValues: DEP[];
+  parentValue: T;
+  parentContextNode: null | import('./node').ContextNode<?>;
+  ping: (refreshParent: boolean) => void;
+  pingDep: ((dep: DEP) => void)[];
+  pingParent: null | ((parentValue: T) => void);
+}
+declare global {
+  interface Node {
+    // Used to assign a ContextNode to a DOM Node.
+    __AMP_NODE?: ContextNode<any>;
+
+    // Used to map a Node to its assigned slot.
+    __AMP_ASSIGNED_SLOT?: Node;
+  }
+}
diff --git a/src/core/context/values.js b/src/core/context/values.js
index 4f96548b68c8..da68b3f86a53 100644
--- a/src/core/context/values.js
+++ b/src/core/context/values.js
@@ -1,86 +1,72 @@
-import {devAssert} from '#core/assert';
+import {devAssert, devAssertNumber} from '#core/assert';
 import {rethrowAsync} from '#core/error';
 import {pushIfNotExist, removeItem} from '#core/types/array';
 
-import {ContextPropDef} from './prop.type';
 import {deepScan, findParent} from './scan';
 import {throttleTail} from './scheduler';
 
+/** @type {Array<*>} */
 const EMPTY_ARRAY = [];
-const EMPTY_FUNC = () => {};
 
-/** @enum {number} */
-const Pending = {
-  NOT_PENDING: 0,
-  PENDING: 1,
-  PENDING_REFRESH_PARENT: 2,
-};
+/** @type {function():void} */
+const EMPTY_FUNC = () => {};
 
+/** @typedef {import('./node').ContextNode<?>} ContextNode */
 /**
- * The structure for a property's inputs. It's important that `values` are
- * easily available as an array to pass them to the `recursive` and
- * `compute` callbacks without reallocation.
- *
- * @interface
- * @template T
+ * @template T, DEP
+ * @typedef {import('./types.d').IContextProp<T, DEP>} IContextProp
  */
-function InputDef() {}
-/** @type {!Array<T>} */
-InputDef.prototype.values;
-/** @type {!Array<function(T)>} */
-InputDef.prototype.setters;
-
 /**
- * The structure for a property's computed values and subscribers.
- * @interface
  * @template T
- * @template DEP
+ * @typedef {import('./types.d').IContextPropInput<T>} IContextPropInput
+ */
+/**
+ * @template T, DEP
+ * @typedef {import('./types.d').IContextPropUsed<T, DEP>} IContextPropUsed
  */
-function UsedDef() {}
-/** @type {!ContextPropDef<T, DEP>} */
-UsedDef.prototype.prop;
-/** @type {!Array<function(!T)>} */
-UsedDef.prototype.subscribers;
-/** @type {T} */
-UsedDef.prototype.value;
-/** @type {!Pending} */
-UsedDef.prototype.pending;
-/** @type {number} */
-UsedDef.prototype.counter;
-/** @type {!Array<DEP>} */
-UsedDef.prototype.depValues;
-/** @type {!T} */
-UsedDef.prototype.parentValue;
-/** @type {?./node.ContextNode} */
-UsedDef.prototype.parentContextNode;
-/** @type {function(boolean)} */
-UsedDef.prototype.ping;
-/** @type {!Array<function(DEP)>} */
-UsedDef.prototype.pingDep;
-/** @type {?function(T)} */
-UsedDef.prototype.pingParent;
+
+/** @enum {import('./types.d').PendingEnumValue} */
+const Pending_Enum = {
+  NOT_PENDING: 0,
+  PENDING: 1,
+  PENDING_REFRESH_PARENT: 2,
+};
 
 /**
  * Propagates context property values in the context tree. The key APIs are
- * `set()` and `subscribe()`. See `ContextPropDef` type for details on how
+ * `set()` and `subscribe()`. See `IContextProp` type for details on how
  * values are declared and propagated.
  */
 export class Values {
   /**
-   * @param {!./node.ContextNode} contextNode
+   * @param {ContextNode} contextNode
    */
   constructor(contextNode) {
-    /** @private @const {!./node.ContextNode} */
+    /**
+     * @private
+     * @const
+     * @type {ContextNode}
+     */
     this.contextNode_ = contextNode;
 
-    /** @private {?Map<string, !InputDef>} */
+    /**
+     * @private
+     * @type {?Map<string, IContextPropInput<?>>}}
+     */
     this.inputsByKey_ = null;
 
-    /** @private {?Map<string, !UsedDef>} */
+    /**
+     * @private
+     * @type {?Map<string, IContextPropUsed<?, ?>>}}
+     */
     this.usedByKey_ = null;
 
     // Schedulers.
-    /** @private @const {function()} */
+    /**
+     * @private
+     * @const
+     * @type {function():void}
+     */
     this.checkUpdates_ = throttleTail(
       this.checkUpdates_.bind(this),
       setTimeout
@@ -101,8 +87,8 @@ export class Values {
    * Once the input is set, the recalculation is rescheduled asynchronously.
    * All dependent properties are also recalculated.
    *
-   * @param {!ContextPropDef<T>} prop
-   * @param {function(T)} setter
+   * @param {IContextProp<T, ?>} prop
+   * @param {function(T):void} setter
    * @param {T} value
    * @template T
    */
@@ -152,8 +138,8 @@ export class Values {
   /**
    * Unsets the input value for the specified property and setter.
    * See `set()` for more info.
-   * @param {!ContextPropDef<T>} prop
-   * @param {function(T)} setter
+   * @param {IContextProp<T, ?>} prop
+   * @param {function(T):void} setter
    * @template T
    */
   remove(prop, setter) {
@@ -163,6 +149,8 @@ export class Values {
     const inputsByKey = this.inputsByKey_;
     const inputs = inputsByKey?.get(key);
     if (inputs) {
+      devAssert(inputsByKey);
+
       const index = inputs.setters.indexOf(setter);
       if (index != -1) {
         inputs.setters.splice(index, 1);
@@ -178,7 +166,7 @@ export class Values {
   /**
    * Whether this node has inputs for the specified property.
    *
-   * @param {!ContextPropDef} prop
+   * @param {IContextProp<?, ?>} prop
    * @return {boolean}
    */
   has(prop) {
@@ -192,8 +180,8 @@ export class Values {
    * only called if a valid used value is available and only if this value
    * has changed since the last handler call.
    *
-   * @param {!ContextPropDef<T>} prop
-   * @param {function(T)} handler
+   * @param {IContextProp<T, ?>} prop
+   * @param {function(T):void} handler
    * @template T
    */
   subscribe(prop, handler) {
@@ -215,8 +203,8 @@ export class Values {
    * Unsubscribes a previously added handler. If there are no other subscribers
    * the property tracking is stopped and the used value is removed.
    *
-   * @param {!ContextPropDef<T>} prop
-   * @param {function(T)} handler
+   * @param {IContextProp<T, ?>} prop
+   * @param {function(T):void} handler
    * @template T
    */
   unsubscribe(prop, handler) {
@@ -234,7 +222,7 @@ export class Values {
    * Schedules a recalculation of the specified property, but only if this
    * property is tracked by this node.
    *
-   * @param {!ContextPropDef} prop
+   * @param {IContextProp<?, ?>} prop
    * @param {boolean} refreshParent Whether the parent node needs to be looked
    * up again.
    * @protected
@@ -302,7 +290,7 @@ export class Values {
    * Scans are relatively common and this method exists (as opposed to be
    * inlined) only to avoid frequent function allocation.
    *
-   * @param {!ContextPropDef} prop
+   * @param {IContextProp<?, ?>} prop
    * @return {boolean}
    * @protected Necessary for cross-binary access.
    */
@@ -326,11 +314,12 @@ export class Values {
    * Scans are relatively common and this method exists (as opposed to be
    * inlined) only to avoid frequent function allocation.
    *
-   * @param {!Array<string>} scheduled The already scheduled props.
-   * @return {!Array<string>} The new scheduled props.
+   * @param {string[]} scheduled The already scheduled props.
+   * @return {string[]} The new scheduled props.
    * @protected
    */
   scanAll(scheduled) {
+    /** @type {string[]?} */
     let newScheduled = null;
     const usedByKey = this.usedByKey_;
     if (usedByKey) {
@@ -366,11 +355,10 @@ export class Values {
   /**
    * Start the used value tracker if it hasn't started yet.
    *
-   * @param {!ContextPropDef<T, DEF>} prop
-   * @return {!UsedDef<T, DEF>}
+   * @param {IContextProp<T, DEP>} prop
+   * @return {IContextPropUsed<T, DEP>}
    * @private
-   * @template T
-   * @template DEF
+   * @template T, DEP
    */
   startUsed_(prop) {
     const {deps, key} = prop;
@@ -381,18 +369,19 @@ export class Values {
         prop,
         subscribers: [],
         value: undefined,
-        pending: Pending.NOT_PENDING,
+        pending: Pending_Enum.NOT_PENDING,
         counter: 0,
         depValues: deps.length > 0 ? deps.map(EMPTY_FUNC) : EMPTY_ARRAY,
         parentValue: undefined,
         parentContextNode: null,
         // Schedule the value recalculation, optionally with the parent
         // refresh.
+        /** @type {function(boolean):void} */
         ping: (refreshParent) => {
           if (this.isConnected_()) {
             const pending = refreshParent
-              ? Pending.PENDING_REFRESH_PARENT
-              : Pending.PENDING;
+              ? Pending_Enum.PENDING_REFRESH_PARENT
+              : Pending_Enum.PENDING;
             used.pending = Math.max(used.pending, pending);
             this.checkUpdates_();
           }
@@ -400,14 +389,18 @@ export class Values {
         // Schedule the value recalculation due to the dependency change.
         pingDep:
           deps.length > 0
-            ? deps.map((dep, index) => (value) => {
-                used.depValues[index] = value;
-                used.ping();
+            ? deps.map((dep, index) => {
+                /** @param {DEP} value*/
+                return (value) => {
+                  used.depValues[index] = value;
+                  used.ping();
+                };
               })
             : EMPTY_ARRAY,
         // Schedule the value recalculation due to the parent value change.
         pingParent: isRecursive(prop)
-          ? (parentValue) => {
+          ? /** @param {T} parentValue */
+            (parentValue) => {
               used.parentValue = parentValue;
               used.ping();
             }
@@ -427,8 +420,9 @@ export class Values {
   /**
    * Stop calculating the used value if there are no more subscribers left.
    *
-   * @param {!UsedDef} used
+   * @param {IContextPropUsed<?, DEP>} used
    * @private
+   * @template DEP
    */
   stopUsed_(used) {
     if (used.subscribers.length > 0) {
@@ -438,7 +432,7 @@ export class Values {
     const {pingDep, prop} = used;
     const {deps, key} = prop;
 
-    this.usedByKey_.delete(key);
+    this.usedByKey_?.delete(key);
 
     // Unsubscribe itself.
     this.updateParentContextNode_(used, null);
@@ -472,19 +466,21 @@ export class Values {
 
     // Recompute all "pinged" values for this node. It checks if dependencies
     // are satisfied and recomputes values accordingly.
+    /** @type {number?} */
     let updated;
     do {
       updated = 0;
       usedByKey.forEach((used) => {
-        if (used.pending != Pending.NOT_PENDING) {
+        if (used.pending != Pending_Enum.NOT_PENDING) {
           const {key} = used.prop;
           used.counter++;
           if (used.counter > 5) {
             // A simple protection from infinte loops.
             rethrowAsync(`cyclical prop: ${key}`);
-            used.pending = Pending.NOT_PENDING;
+            used.pending = Pending_Enum.NOT_PENDING;
             return;
           }
+          devAssertNumber(updated);
           updated++;
           this.tryUpdate_(used);
         }
@@ -493,13 +489,14 @@ export class Values {
   }
 
   /**
-   * @param {!UsedDef} used
+   * @param {IContextPropUsed<T, DEP>} used
    * @private
+   * @template T, DEP
    */
   tryUpdate_(used) {
     // The value is not pending anymore. If any of the dependencies will remain
     // unresolved, we will simply need to recomputed it.
-    const refreshParent = used.pending == Pending.PENDING_REFRESH_PARENT;
+    const refreshParent = used.pending == Pending_Enum.PENDING_REFRESH_PARENT;
 
     let newValue;
     try {
@@ -507,20 +504,20 @@ export class Values {
     } catch (e) {
       // This is the narrowest catch to avoid unrelated values breaking each
       // other. The only exposure to the user-code are `recursive` and
-      // `compute` methods in the `ContextPropDef`.
+      // `compute` methods in the `IContextProp`.
       rethrowAsync(e);
     }
 
     // Reset pending flag. It's good to reset it after the calculation to
     // ensure that deps are automatically covered.
-    used.pending = Pending.NOT_PENDING;
+    used.pending = Pending_Enum.NOT_PENDING;
 
     // Check if the value has been updated.
     this.maybeUpdated_(used, newValue);
   }
 
   /**
-   * @param {!UsedDef<T>} used
+   * @param {IContextPropUsed<T, ?>} used
    * @param {T} value
    * @private
    * @template T
@@ -550,7 +547,7 @@ export class Values {
   /**
    * The used value calculation algorithm.
    *
-   * @param {!UsedDef<T>} used
+   * @param {IContextPropUsed<T, ?>} used
    * @param {boolean} refreshParent
    * @return {T|undefined} The used value.
    * @private
@@ -579,8 +576,8 @@ export class Values {
     const parentValue = isDefined(used.parentValue)
       ? used.parentValue
       : recursive && !used.parentContextNode
-      ? defaultValue
-      : undefined;
+        ? defaultValue
+        : undefined;
 
     // Calculate the "used" value.
     let newValue = undefined;
@@ -622,8 +619,8 @@ export class Values {
   /**
    * Update the node from which the parent value is used.
    *
-   * @param {!UsedDef} used
-   * @param {?./node.ContextNode} newParentContextNode
+   * @param {IContextPropUsed<?, ?>} used
+   * @param {?ContextNode} newParentContextNode
    * @private
    */
   updateParentContextNode_(used, newParentContextNode) {
@@ -632,12 +629,14 @@ export class Values {
       used.parentContextNode = newParentContextNode;
       used.parentValue = undefined;
 
+      devAssert(pingParent);
       if (oldParentContextNode) {
-        oldParentContextNode.values.unsubscribe(prop, devAssert(pingParent));
+        oldParentContextNode.values.unsubscribe(prop, pingParent);
       }
 
       if (newParentContextNode) {
-        newParentContextNode.values.subscribe(prop, devAssert(pingParent));
+        devAssert(pingParent);
+        newParentContextNode.values.subscribe(prop, pingParent);
       }
     }
   }
@@ -646,31 +645,33 @@ export class Values {
 /**
  * See `Values.scan()` method.
  *
- * @param {!./node.ContextNode} contextNode
- * @param {!ContextPropDef} prop
+ * @param {ContextNode} contextNode
+ * @param {IContextProp<?, ?>} prop
  * @return {boolean}
  */
 function scan(contextNode, prop) {
+  // @ts-ignore private access
   return contextNode.values.scan(prop);
 }
 
 /**
  * See `Values.scanAll()` method.
  *
- * @param {!./node.ContextNode} contextNode
+ * @param {ContextNode} contextNode
  * @param {?} unusedArg
- * @param {!Array<string>} state
- * @return {!Array<string>}
+ * @param {string[]} state
+ * @return {string[]}
  */
 function scanAll(contextNode, unusedArg, state) {
+  // @ts-ignore private access
   return contextNode.values.scanAll(state);
 }
 
 /**
  * See `Values.has()` method.
  *
- * @param {!./node.ContextNode} contextNode
- * @param {!ContextPropDef} prop
+ * @param {ContextNode} contextNode
+ * @param {IContextProp<?, ?>} prop
  * @return {boolean}
  */
 function hasInput(contextNode, prop) {
@@ -680,7 +681,7 @@ function hasInput(contextNode, prop) {
 /**
  * Whether the property is recursive.
  *
- * @param {!ContextPropDef} prop
+ * @param {IContextProp<?, ?>} prop
  * @return {boolean}
  */
 function isRecursive(prop) {
@@ -692,8 +693,8 @@ function isRecursive(prop) {
 /**
  * Whether the parent value is required to calculate the used value.
  *
- * @param {!ContextPropDef<T>} prop
- * @param {?Array<T>} inputs
+ * @param {IContextProp<T, ?>} prop
+ * @param {T[]|undefined} inputs
  * @return {boolean}
  * @template T
  */
@@ -714,13 +715,12 @@ function calcRecursive(prop, inputs) {
 /**
  * A substitute for `compute(...deps)`, but faster.
  *
- * @param {function(!Node, !Array<T>, ...DEP):T} compute See `ContextPropDef.compute()`.
- * @param {!Node} node
- * @param {!Array<T>} inputValues
- * @param {!Array<DEP>} deps
+ * @param {function(Node, T[], ...DEP):T} compute See `IContextProp.compute()`.
+ * @param {Node} node
+ * @param {T[]} inputValues
+ * @param {DEP[]} deps
  * @return {T}
- * @template T
- * @template DEP
+ * @template T, DEP
  */
 function callCompute(compute, node, inputValues, deps) {
   switch (deps.length) {
@@ -733,21 +733,23 @@ function callCompute(compute, node, inputValues, deps) {
     case 3:
       return compute(node, inputValues, deps[0], deps[1], deps[2]);
     default:
-      return compute.apply(null, [node, inputValues].concat(deps));
+      return compute.apply(
+        null,
+        /** @type {*[]} */ ([node, inputValues]).concat(deps)
+      );
   }
 }
 
 /**
  * A substitute for `compute(parentValue, ...deps)`, but faster.
  *
- * @param {function(!Node, !Array<T>, ...DEP):T} compute See `ContextPropDef.compute()`.
- * @param {!Node} node
- * @param {!Array<T>} inputValues
- * @param {T} parentValue
- * @param {!Array<DEP>} deps
+ * @param {function(Node, T[], ...DEP):T} compute See `IContextProp.compute()`.
+ * @param {Node} node
+ * @param {T[]} inputValues
+ * @param {DEP} parentValue
+ * @param {DEP[]} deps
  * @return {T}
- * @template T
- * @template DEP
+ * @template T, DEP
  */
 function callRecursiveCompute(compute, node, inputValues, parentValue, deps) {
   switch (deps.length) {
diff --git a/src/core/data-structures/amp-globals.d.ts b/src/core/data-structures/amp-globals.d.ts
new file mode 100644
index 000000000000..c2429ca8953e
--- /dev/null
+++ b/src/core/data-structures/amp-globals.d.ts
@@ -0,0 +1,8 @@
+export {};
+
+declare global {
+  interface Window {
+    // Counter for the DomBaseWeakRef polyfill.
+    __AMP_WEAKREF_ID?: number;
+  }
+}
diff --git a/src/core/data-structures/curve.js b/src/core/data-structures/curve.js
index 30c5b934f878..6bc71c16e160 100644
--- a/src/core/data-structures/curve.js
+++ b/src/core/data-structures/curve.js
@@ -3,16 +3,14 @@ import {isString} from '#core/types';
 /**
  * Number between 0 and 1 that designates normalized time, as in "from start to
  * end".
- * @typedef {number}
+ * @typedef {number} NormTimeDef
  */
-export let NormTimeDef;
 
 /**
  * A CurveDef is a function that returns a normtime value (0 to 1) for another
  * normtime value.
- * @typedef {function(NormTimeDef): NormTimeDef}
+ * @typedef {function(NormTimeDef): NormTimeDef} CurveDef
  */
-export let CurveDef;
 
 /**
  * Returns a cubic bezier curve.
@@ -20,7 +18,7 @@ export let CurveDef;
  * @param {number} y1 Y coordinate of the first control point.
  * @param {number} x2 X coordinate of the second control point.
  * @param {number} y2 Y coordinate of the second control point.
- * @return {!CurveDef}
+ * @return {CurveDef}
  */
 export function bezierCurve(x1, y1, x2, y2) {
   return (xVal) =>
@@ -198,13 +196,13 @@ class Bezier {
 /**
  * A collection of common curves.
  * See https://developer.mozilla.org/en-US/docs/Web/CSS/timing-function
- * @enum {!CurveDef}
+ * @enum {CurveDef}
  */
-export const Curves = {
+export const Curves_Enum = {
   /**
    * linear
-   * @param {!NormTimeDef} xVal
-   * @return {!NormTimeDef}
+   * @param {NormTimeDef} xVal
+   * @return {NormTimeDef}
    */
   LINEAR(xVal) {
     return xVal;
@@ -212,8 +210,8 @@ export const Curves = {
 
   /**
    * ease
-   * @param {!NormTimeDef} xVal
-   * @return {!NormTimeDef}
+   * @param {NormTimeDef} xVal
+   * @return {NormTimeDef}
    */
   EASE(xVal) {
     return Bezier.solveYValueFromXValue(xVal, 0, 0, 0.25, 0.1, 0.25, 1.0, 1, 1);
@@ -221,8 +219,8 @@ export const Curves = {
 
   /**
    * ease-in: slow out, fast in
-   * @param {!NormTimeDef} xVal
-   * @return {!NormTimeDef}
+   * @param {NormTimeDef} xVal
+   * @return {NormTimeDef}
    */
   EASE_IN(xVal) {
     return Bezier.solveYValueFromXValue(xVal, 0, 0, 0.42, 0.0, 1.0, 1.0, 1, 1);
@@ -230,8 +228,8 @@ export const Curves = {
 
   /**
    * ease-out: fast out, slow in
-   * @param {!NormTimeDef} xVal
-   * @return {!NormTimeDef}
+   * @param {NormTimeDef} xVal
+   * @return {NormTimeDef}
    */
   EASE_OUT(xVal) {
     return Bezier.solveYValueFromXValue(xVal, 0, 0, 0.0, 0.0, 0.58, 1.0, 1, 1);
@@ -239,8 +237,8 @@ export const Curves = {
 
   /**
    * ease-in-out
-   * @param {!NormTimeDef} xVal
-   * @return {!NormTimeDef}
+   * @param {NormTimeDef} xVal
+   * @return {NormTimeDef}
    */
   EASE_IN_OUT(xVal) {
     return Bezier.solveYValueFromXValue(xVal, 0, 0, 0.42, 0.0, 0.58, 1.0, 1, 1);
@@ -248,14 +246,15 @@ export const Curves = {
 };
 
 /**
- * @const {!Object<string, !CurveDef>}
+ * @type {{[key: string]: CurveDef}}
+ * @const
  */
 const NAME_MAP = {
-  'linear': Curves.LINEAR,
-  'ease': Curves.EASE,
-  'ease-in': Curves.EASE_IN,
-  'ease-out': Curves.EASE_OUT,
-  'ease-in-out': Curves.EASE_IN_OUT,
+  'linear': Curves_Enum.LINEAR,
+  'ease': Curves_Enum.EASE,
+  'ease-in': Curves_Enum.EASE_IN,
+  'ease-out': Curves_Enum.EASE_OUT,
+  'ease-in-out': Curves_Enum.EASE_IN_OUT,
 };
 
 /**
@@ -287,5 +286,5 @@ export function getCurve(curve) {
     }
     return NAME_MAP[curve];
   }
-  return /** @type {!CurveDef} */ (curve);
+  return /** @type {CurveDef} */ (curve);
 }
diff --git a/src/core/data-structures/dom-based-weakref.js b/src/core/data-structures/dom-based-weakref.js
index 268202b1797d..6d5983836583 100644
--- a/src/core/data-structures/dom-based-weakref.js
+++ b/src/core/data-structures/dom-based-weakref.js
@@ -8,7 +8,7 @@
  */
 export class DomBasedWeakRef {
   /**
-   * @param {!Window} win
+   * @param {Window} win
    * @param {string} id
    * @package
    */
@@ -21,9 +21,9 @@ export class DomBasedWeakRef {
   /**
    * Returns a WeakRef. Uses this implementation if the real WeakRef class
    * is not available.
-   * @param {!Window} win
-   * @param {!Element} element
-   * @return {!WeakRef<!Element>|!DomBasedWeakRef<!Element>}
+   * @param {Window} win
+   * @param {Element} element
+   * @return {WeakRef<Element>|DomBasedWeakRef}
    */
   static make(win, element) {
     if (win.WeakRef) {
@@ -36,7 +36,7 @@ export class DomBasedWeakRef {
     return new DomBasedWeakRef(win, element.id);
   }
 
-  /** @return {!Element|undefined} */
+  /** @return {Element|undefined} */
   deref() {
     return this.win.document.getElementById(this.id_) || undefined;
   }
diff --git a/src/core/data-structures/finite-state-machine.js b/src/core/data-structures/finite-state-machine.js
index e1ada7d61ee7..eba4a5628270 100644
--- a/src/core/data-structures/finite-state-machine.js
+++ b/src/core/data-structures/finite-state-machine.js
@@ -18,7 +18,7 @@ export class FiniteStateMachine {
     /**
      * Callbacks that are invoked when transitioning from an old state
      * to the new.
-     * @private {Object<string, function()>}
+     * @private {{[key: string]: function():void}}
      */
     this.transitions_ = map();
   }
@@ -28,7 +28,7 @@ export class FiniteStateMachine {
    * transitions to the newState.
    * @param {STATE} oldState
    * @param {STATE} newState
-   * @param {function()} callback
+   * @param {function():void} callback
    */
   addTransition(oldState, newState, callback) {
     const transition = this.statesToTransition_(oldState, newState);
diff --git a/src/core/data-structures/globals.d.ts b/src/core/data-structures/globals.d.ts
new file mode 100644
index 000000000000..3ff4c4bfdb30
--- /dev/null
+++ b/src/core/data-structures/globals.d.ts
@@ -0,0 +1,7 @@
+import './amp-globals.d';
+
+declare global {
+  interface Window {
+    WeakRef?: typeof WeakRef;
+  }
+}
diff --git a/src/core/data-structures/lru-cache.js b/src/core/data-structures/lru-cache.js
index 57f687f2ab65..3ccf279d89cc 100644
--- a/src/core/data-structures/lru-cache.js
+++ b/src/core/data-structures/lru-cache.js
@@ -20,7 +20,7 @@ export class LruCache {
      */
     this.access_ = 0;
 
-    /** @private {!Object<(number|string), {payload: T, access: number}>} */
+    /** @private {{[key: (number|string)]: {payload: T, access: number}}} */
     this.cache_ = map();
   }
 
@@ -36,7 +36,7 @@ export class LruCache {
 
   /**
    * @param {number|string} key
-   * @return {T} The cached payload.
+   * @return {T|undefined} The cached payload.
    */
   get(key) {
     const cacheable = this.cache_[key];
diff --git a/src/core/data-structures/observable.js b/src/core/data-structures/observable.js
index a8f11e8c9c83..b2cd5a0c1a9b 100644
--- a/src/core/data-structures/observable.js
+++ b/src/core/data-structures/observable.js
@@ -10,14 +10,14 @@ export class Observable {
    * Creates an instance of Observable.
    */
   constructor() {
-    /** @type {?Array<function(TYPE)>} */
+    /** @type {?Array<function(TYPE=):void>} */
     this.handlers_ = null;
   }
 
   /**
    * Adds the observer to this instance.
-   * @param {function(TYPE)} handler Observer's handler.
-   * @return {!UnlistenDef}
+   * @param {function(TYPE=):void} handler Observer's handler.
+   * @return {import('#core/types/function/types').UnlistenCallback}
    */
   add(handler) {
     if (!this.handlers_) {
@@ -31,7 +31,7 @@ export class Observable {
 
   /**
    * Removes the observer from this instance.
-   * @param {function(TYPE)} handler Observer's instance.
+   * @param {function(TYPE=):void} handler Observer's instance.
    */
   remove(handler) {
     if (!this.handlers_) {
@@ -58,7 +58,8 @@ export class Observable {
     if (!this.handlers_) {
       return;
     }
-    for (const handler of this.handlers_) {
+    // Iterate over copy of handlers_ in case handlers are removed inside.
+    for (const handler of this.handlers_.slice()) {
       handler(opt_event);
     }
   }
diff --git a/src/core/data-structures/priority-queue.js b/src/core/data-structures/priority-queue.js
index df6e8fe21b04..182ec3bfeb0b 100644
--- a/src/core/data-structures/priority-queue.js
+++ b/src/core/data-structures/priority-queue.js
@@ -7,13 +7,16 @@ export class PriorityQueue {
    * Creates an instance of PriorityQueue.
    */
   constructor() {
-    /** @private @const {Array<{item: T, priority: number}>} */
+    /**
+     * @type {Array<{item: T, priority: number}>}
+     * @private
+     */
     this.queue_ = [];
   }
 
   /**
    * Returns the max priority item without dequeueing it.
-   * @return {T}
+   * @return {?T}
    */
   peek() {
     const l = this.length;
@@ -67,7 +70,7 @@ export class PriorityQueue {
   }
 
   /**
-   * @param {function(T)} callback
+   * @param {function(T):*} callback
    */
   forEach(callback) {
     let index = this.length;
@@ -79,13 +82,14 @@ export class PriorityQueue {
   /**
    * Dequeues the max priority item.
    * Items with the same priority are dequeued in FIFO order.
-   * @return {T}
+   * @return {?T}
    */
   dequeue() {
-    if (!this.length) {
+    const lastItem = this.queue_.pop();
+    if (!lastItem) {
       return null;
     }
-    return this.queue_.pop().item;
+    return lastItem.item;
   }
 
   /**
diff --git a/src/core/data-structures/promise.js b/src/core/data-structures/promise.js
index c5d05b382f03..3747fdf74014 100644
--- a/src/core/data-structures/promise.js
+++ b/src/core/data-structures/promise.js
@@ -1,3 +1,4 @@
+/** @type {undefined|Promise<void>}| */
 let resolved;
 
 /**
@@ -5,7 +6,7 @@ let resolved;
  * Babel converts direct calls to Promise.resolve() (with no arguments) into
  * calls to this.
  *
- * @return {!Promise<undefined>}
+ * @return {Promise<void>}
  */
 export function resolvedPromise() {
   if (resolved) {
@@ -43,7 +44,7 @@ export function resolvedPromise() {
 export class Deferred {
   /** Constructor. */
   constructor() {
-    /** @const {!Promise<T>} */
+    /** @const {Promise<T>} */
     this.promise = new /*OK*/ Promise((res, rej) => {
       /** @const {function(T=)} */
       this.resolve = res;
@@ -57,8 +58,8 @@ export class Deferred {
  * Creates a promise resolved to the return value of fn.
  * If fn sync throws, it will cause the promise to reject.
  *
- * @param {function():T} fn
- * @return {!Promise<T>}
+ * @param {function():(T|Promise<T>)} fn
+ * @return {Promise<T>}
  * @template T
  */
 export function tryResolve(fn) {
@@ -69,14 +70,15 @@ export function tryResolve(fn) {
 
 /**
  * Resolves with the result of the last promise added.
- * @implements {IThenable}
+ * @implements {PromiseLike<T>}
+ * @template T
  */
 export class LastAddedResolver {
   /**
-   * @param {!Array<!IThenable>=} opt_promises
+   * @param {Array<PromiseLike<T>>=} opt_promises
    */
   constructor(opt_promises) {
-    /** @private @const {!Deferred} */
+    /** @private @const {Deferred<T>} */
     this.deferred_ = new Deferred();
 
     /** @private */
@@ -91,8 +93,8 @@ export class LastAddedResolver {
 
   /**
    * Add a promise to possibly be resolved.
-   * @param {!IThenable} promise
-   * @return {!Promise}
+   * @param {PromiseLike<T>} promise
+   * @return {Promise<T>}
    */
   add(promise) {
     const countAtAdd = ++this.count_;
@@ -113,7 +115,12 @@ export class LastAddedResolver {
     return this.deferred_.promise;
   }
 
-  /** @override */
+  /**
+   * Bind handlers for when the last added promise resolves/rejects.
+   * @param {function(T):?} [opt_resolve]
+   * @param {function(?):?} [opt_reject]
+   * @return {Promise<?>}
+   */
   then(opt_resolve, opt_reject) {
     return this.deferred_.promise.then(opt_resolve, opt_reject);
   }
diff --git a/src/core/data-structures/signals.js b/src/core/data-structures/signals.js
index 9311dcc72744..286b31a78b2a 100644
--- a/src/core/data-structures/signals.js
+++ b/src/core/data-structures/signals.js
@@ -1,8 +1,9 @@
-import {TimestampDef} from '#core/types/date';
 import {map} from '#core/types/object';
 
 import {Deferred} from './promise';
 
+/** @typedef {import('#core/types/date').TimestampDef} TimestampDef */
+
 /**
  * This object tracts signals and allows blocking until a signal has been
  * received.
@@ -15,7 +16,7 @@ export class Signals {
     /**
      * A mapping from a signal name to the signal response: either time or
      * an error.
-     * @private @const {!Object<string, (!TimestampDef|!Error)>}
+     * @private @const {{[key: string]: (TimestampDef|Error)}}
      */
     this.map_ = map();
 
@@ -35,7 +36,7 @@ export class Signals {
    * Returns the current known value of the signal. If signal is not yet
    * available, `null` is returned.
    * @param {string} name
-   * @return {number|!Error|null}
+   * @return {number|Error|null}
    */
   get(name) {
     const v = this.map_[name];
@@ -46,7 +47,7 @@ export class Signals {
    * Returns the promise that's resolved when the signal is triggered. The
    * resolved value is the time of the signal.
    * @param {string} name
-   * @return {!Promise<!TimestampDef>}
+   * @return {Promise<TimestampDef>}
    */
   whenSignal(name) {
     let promiseStruct = this.promiseMap_?.[name];
@@ -77,7 +78,7 @@ export class Signals {
    * optional; if not provided, the current time is used. The associated
    * promise is resolved with the resulting TimestampDef.
    * @param {string} name
-   * @param {!TimestampDef=} opt_time
+   * @param {TimestampDef=} opt_time
    */
   signal(name, opt_time) {
     if (this.map_[name] != null) {
@@ -98,7 +99,7 @@ export class Signals {
    * Rejects the signal. Indicates that the signal will never succeed. The
    * associated signal is rejected.
    * @param {string} name
-   * @param {!Error} error
+   * @param {Error} error
    */
   rejectSignal(name, error) {
     if (this.map_[name] != null) {
diff --git a/src/core/document/format.js b/src/core/document/format.js
index 5d5d09d8a97c..caf846810a8f 100644
--- a/src/core/document/format.js
+++ b/src/core/document/format.js
@@ -1,7 +1,7 @@
 /**
  * Checks that the document is of an AMP format type.
- * @param {!Array<string>} formats
- * @param {!Document} doc
+ * @param {Array<string>} formats
+ * @param {Document} doc
  * @return {boolean}
  */
 function isAmpFormatType(formats, doc) {
@@ -11,7 +11,7 @@ function isAmpFormatType(formats, doc) {
 }
 
 /**
- * @param {!Document} doc
+ * @param {Document} doc
  * @return {boolean}
  */
 export function isAmp4Email(doc) {
@@ -19,7 +19,7 @@ export function isAmp4Email(doc) {
 }
 
 /**
- * @param {!Document} doc
+ * @param {Document} doc
  * @return {boolean}
  */
 export function isAmphtml(doc) {
diff --git a/src/core/document/ready.js b/src/core/document/ready.js
index f6c05c07a10e..256bdea9d890 100644
--- a/src/core/document/ready.js
+++ b/src/core/document/ready.js
@@ -1,25 +1,31 @@
+import {ReadyState_Enum} from '#core/constants/ready-state';
+
 /**
  * Whether the document is ready.
- * @param {!Document} doc
+ * @param {Document} doc
  * @return {boolean}
  */
 export function isDocumentReady(doc) {
-  return doc.readyState != 'loading' && doc.readyState != 'uninitialized';
+  return (
+    doc.readyState != ReadyState_Enum.LOADING &&
+    // IE11-only
+    /** @type {string} */ (doc.readyState) != 'uninitialized'
+  );
 }
 
 /**
  * Whether the document has loaded all the css and sub-resources.
- * @param {!Document} doc
+ * @param {Document} doc
  * @return {boolean}
  */
 function isDocumentComplete(doc) {
-  return doc.readyState == 'complete';
+  return doc.readyState == ReadyState_Enum.COMPLETE;
 }
 
 /**
  * Calls the callback when document is ready.
- * @param {!Document} doc
- * @param {function(!Document)} callback
+ * @param {Document} doc
+ * @param {function(Document):void} callback
  */
 export function onDocumentReady(doc, callback) {
   onDocumentState(doc, isDocumentReady, callback);
@@ -27,9 +33,9 @@ export function onDocumentReady(doc, callback) {
 
 /**
  * Calls the callback when document's state satisfies the stateFn.
- * @param {!Document} doc
- * @param {function(!Document):boolean} stateFn
- * @param {function(!Document)} callback
+ * @param {Document} doc
+ * @param {function(Document):boolean} stateFn
+ * @param {function(Document):void} callback
  */
 function onDocumentState(doc, stateFn, callback) {
   let ready = stateFn(doc);
@@ -51,8 +57,8 @@ function onDocumentState(doc, stateFn, callback) {
 
 /**
  * Returns a promise that is resolved when document is ready.
- * @param {!Document} doc
- * @return {!Promise<!Document>}
+ * @param {Document} doc
+ * @return {Promise<Document>}
  */
 export function whenDocumentReady(doc) {
   return new Promise((resolve) => {
@@ -62,8 +68,8 @@ export function whenDocumentReady(doc) {
 
 /**
  * Returns a promise that is resolved when document is complete.
- * @param {!Document} doc
- * @return {!Promise<!Document>}
+ * @param {Document} doc
+ * @return {Promise<Document>}
  */
 export function whenDocumentComplete(doc) {
   return new Promise((resolve) => {
diff --git a/src/core/document/visibility.js b/src/core/document/visibility.js
index 408606fbabd1..f014879f5b84 100644
--- a/src/core/document/visibility.js
+++ b/src/core/document/visibility.js
@@ -1,9 +1,9 @@
-import {VisibilityState} from '#core/constants/visibility-state';
+import {VisibilityState_Enum} from '#core/constants/visibility-state';
 import {getVendorJsPropertyName} from '#core/dom/style';
 
 /**
- * @param {!Document} doc
- * @return {!VisibilityState}
+ * @param {Document} doc
+ * @return {VisibilityState_Enum}
  */
 export function getDocumentVisibilityState(doc) {
   // New API: `document.visibilityState` property.
@@ -12,33 +12,37 @@ export function getDocumentVisibilityState(doc) {
     'visibilityState',
     true
   );
-  if (doc[visibilityStateProp]) {
-    return doc[visibilityStateProp];
+  const visibilityStateValue = /** @type {*} */ (doc)[visibilityStateProp];
+  if (visibilityStateValue) {
+    return visibilityStateValue;
   }
 
   // Old API: `document.hidden` property.
   const hiddenProp = getVendorJsPropertyName(doc, 'hidden', true);
-  if (doc[hiddenProp]) {
-    return doc[hiddenProp] ? VisibilityState.HIDDEN : VisibilityState.VISIBLE;
+  if (hiddenProp in doc) {
+    const hiddenValue = /** @type {*} */ (doc)[hiddenProp];
+    return hiddenValue
+      ? VisibilityState_Enum.HIDDEN
+      : VisibilityState_Enum.VISIBLE;
   }
 
-  return VisibilityState.VISIBLE;
+  return VisibilityState_Enum.VISIBLE;
 }
 
 /**
  * Returns the value of "document.hidden" property. The reasons why it may
  * not be visible include document in a non-active tab or when the document
  * is being pre-rendered via link with rel="prerender".
- * @param {!Document} doc
+ * @param {Document} doc
  * @return {boolean}
  */
 export function isDocumentHidden(doc) {
-  return getDocumentVisibilityState(doc) != VisibilityState.VISIBLE;
+  return getDocumentVisibilityState(doc) != VisibilityState_Enum.VISIBLE;
 }
 
 /**
- * @param {!Document} doc
- * @param {function()} handler
+ * @param {Document} doc
+ * @param {function():void} handler
  */
 export function addDocumentVisibilityChangeListener(doc, handler) {
   if (!doc.addEventListener) {
@@ -51,8 +55,8 @@ export function addDocumentVisibilityChangeListener(doc, handler) {
 }
 
 /**
- * @param {!Document} doc
- * @param {function()} handler
+ * @param {Document} doc
+ * @param {function():void} handler
  */
 export function removeDocumentVisibilityChangeListener(doc, handler) {
   if (!doc.removeEventListener) {
@@ -65,7 +69,7 @@ export function removeDocumentVisibilityChangeListener(doc, handler) {
 }
 
 /**
- * @param {!Document} doc
+ * @param {Document} doc
  * @return {?string}
  */
 function getVisibilityChangeEvent(doc) {
diff --git a/src/core/dom/amp-element-helpers.js b/src/core/dom/amp-element-helpers.js
index a393b23bf8c5..9af41935e81d 100644
--- a/src/core/dom/amp-element-helpers.js
+++ b/src/core/dom/amp-element-helpers.js
@@ -1,15 +1,12 @@
 import {devAssert} from '#core/assert';
 import {Deferred} from '#core/data-structures/promise';
 
-/** @const {string} */
 export const UPGRADE_TO_CUSTOMELEMENT_PROMISE = '__AMP_UPG_PRM';
-
-/** @const {string} */
 export const UPGRADE_TO_CUSTOMELEMENT_RESOLVER = '__AMP_UPG_RES';
 
 /**
  * Determines if this element is an AMP element
- * @param {!Element} element
+ * @param {Element} element
  * @return {boolean}
  */
 export function isAmpElement(element) {
@@ -26,12 +23,12 @@ export function isAmpElement(element) {
 /**
  * Return a promise that resolve when an AMP element upgrade from HTMLElement
  * to CustomElement
- * @param {!HTMLElement} element
- * @return {!Promise<!AmpElement>}
+ * @param {HTMLElement} element
+ * @return {Promise<AmpElement>}
  */
 export function whenUpgradedToCustomElement(element) {
   devAssert(isAmpElement(element), 'element is not AmpElement');
-  if (element.createdCallback) {
+  if (/** @type {*} */ (element).createdCallback) {
     // Element already is CustomElement;
     return Promise.resolve(/**@type {!AmpElement} */ (element));
   }
@@ -43,5 +40,7 @@ export function whenUpgradedToCustomElement(element) {
     element[UPGRADE_TO_CUSTOMELEMENT_RESOLVER] = deferred.resolve;
   }
 
-  return element[UPGRADE_TO_CUSTOMELEMENT_PROMISE];
+  const upgradedPromise = element[UPGRADE_TO_CUSTOMELEMENT_PROMISE];
+  devAssert(upgradedPromise);
+  return upgradedPromise;
 }
diff --git a/src/core/dom/amp-element.extern.js b/src/core/dom/amp-element.extern.js
deleted file mode 100644
index 7c6b7281f630..000000000000
--- a/src/core/dom/amp-element.extern.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * @fileoverview Provides AmpElement interface for typechecking. Includes
- * smaller interfaces that modules can type-check against to keep expected
- * API surfaces narrow, so it's clear what properties and methods are
- * expected/required.
- *
- * @externs
- */
-
-/**
- * An interface for elements with pause functionality.
- * @interface
- */
-class PausableInterface {
-  /** @function */
-  pause() {}
-}
-
-/**
- * Just an element, but used with AMP custom elements..
- * @constructor
- * @extends {HTMLElement}
- * @implements {PausableInterface}
- */
-let AmpElement = function () {};
-
-/** @type {function(number=):!Promise}  */
-AmpElement.prototype.ensureLoaded;
-/** @type {function():Promise} */
-AmpElement.prototype.unmount;
-
-/** @type {function():?Element} */
-AmpElement.prototype.getPlaceholder;
-
-/** @type {!Element | undefined} */
-AmpElement.prototype.sizerElement;
diff --git a/src/core/dom/amp-globals.d.ts b/src/core/dom/amp-globals.d.ts
new file mode 100644
index 000000000000..9bc0b9f86490
--- /dev/null
+++ b/src/core/dom/amp-globals.d.ts
@@ -0,0 +1,46 @@
+import { ReadyState_Enum } from "#core/constants/ready-state";
+
+export {};
+
+declare global {
+  interface Window {
+    __AMP_SHADOW_CSS?: null | {[key: string]: CSSStyleSheet};
+  }
+
+  // An interface for elements with pause functionality, such as media players.
+  interface IPausable {
+    pause: () => void;
+  }
+
+  // AMP element skeleton interface to support type-checking core code which
+  // depends upon it.
+  // TODO(wg-performance, wg-infra): Consider either a) splitting anything
+  // dependent on the `AmpElement`` type out of #core or b) splitting the
+  // `AmpElement` interface into a collection of independent interfaces (ex.
+  // `Pausable`, `Scrollable`, `IdkAble``) so #core code can operate around those
+  // expectations rather than the catch-all AMP-specific `AmpElement` class. This
+  // is already done with the `IPausable` interface.
+  interface AmpElement extends HTMLElement, IPausable {
+    readyState: ReadyState_Enum;
+    sizerElement?: HTMLElement;
+
+    getPlaceholder: () => null | Element;
+
+    unmount: () => Promise<void>;
+    ensureLoaded: () => Promise<void>;
+  }
+
+  interface AmpForm {}
+
+  interface HTMLElement {
+    __AMP_UPG_PRM?: Promise<AmpElement>;
+    __AMP_UPG_RES?: (res: Function) => void;
+
+    // Used by modal.js to keep track of the saved tab on an element.
+    __AMP_MODAL_SAVED_TAB_INDEX?: string | null;
+
+    // Used by extensions/amp-form/0.1 and src/core/form.js.
+    // TODO(wg-performance): move to extensions/amp-form, as it is the only consumer.
+    __AMP_FORM: AmpForm;
+  }
+}
diff --git a/src/core/dom/css-selectors.js b/src/core/dom/css-selectors.js
index f3aec22d21a7..714d60ffba79 100644
--- a/src/core/dom/css-selectors.js
+++ b/src/core/dom/css-selectors.js
@@ -18,7 +18,7 @@ export function setScopeSelectorSupportedForTesting(val) {
 
 /**
  * Test that the :scope selector is supported and behaves correctly.
- * @param {!Element|!ShadowRoot} el
+ * @param {Element|ShadowRoot} el
  * @return {boolean}
  */
 export function isScopeSelectorSupported(el) {
@@ -31,7 +31,7 @@ export function isScopeSelectorSupported(el) {
 
 /**
  * Test that the :scope selector is supported and behaves correctly.
- * @param {!Element|!ShadowRoot} el
+ * @param {Element|ShadowRoot} el
  * @return {boolean}
  */
 function testScopeSelector(el) {
diff --git a/src/core/dom/event-helper-listen.js b/src/core/dom/event-helper-listen.js
index 69579113ade3..e6fcc389e86d 100644
--- a/src/core/dom/event-helper-listen.js
+++ b/src/core/dom/event-helper-listen.js
@@ -17,10 +17,9 @@ let passiveSupported;
  * @property {undefined|boolean} [capture]
  * @property {undefined|boolean} [once]
  * @property {undefined|boolean} [passive]
- * @property {undefined|!AbortSignal} [signal]
- * }}
+ * @property {undefined|AbortSignal} [signal]
+ * }} AddEventListenerOptsDef;
  */
-let AddEventListenerOptsDef;
 
 /**
  * Listens for the specified event on the element.
@@ -29,11 +28,11 @@ let AddEventListenerOptsDef;
  * dependency. Use `listen()` in either `event-helper` or
  * `#core/3p-frame-messaging`, depending on your use case.
  *
- * @param {!EventTarget} element
+ * @param {EventTarget} element
  * @param {string} eventType
- * @param {function(!Event)} listener
- * @param {!AddEventListenerOptsDef=} opt_evtListenerOpts
- * @return {!UnlistenDef}
+ * @param {function(Event):void} listener
+ * @param {AddEventListenerOptsDef=} opt_evtListenerOpts
+ * @return {import('#core/types/function/types').UnlistenCallback}
  */
 export function internalListenImplementation(
   element,
@@ -43,7 +42,7 @@ export function internalListenImplementation(
 ) {
   let localElement = element;
   let localListener = listener;
-  /** @type {?function(!Event)} */
+  /** @type {?function(Event):void} */
   let wrapped = (event) => {
     try {
       return localListener(event);
@@ -68,8 +67,8 @@ export function internalListenImplementation(
       optsSupported ? opt_evtListenerOpts : capture
     );
     // Ensure these are GC'd
-    localListener = null;
-    localElement = null;
+    /** @type {?} */ (localListener) = null;
+    /** @type {?} */ (localElement) = null;
     wrapped = null;
   };
 }
@@ -92,10 +91,23 @@ export function detectEvtListenerOptsSupport() {
     const options = {
       get capture() {
         optsSupported = true;
+        return false;
       },
     };
-    self.addEventListener('test-options', null, options);
-    self.removeEventListener('test-options', null, options);
+    self.addEventListener(
+      'test-options',
+      /** @type {EventListenerOrEventListenerObject} */ (
+        /** @type {?} */ (null)
+      ),
+      options
+    );
+    self.removeEventListener(
+      'test-options',
+      /** @type {EventListenerOrEventListenerObject} */ (
+        /** @type {?} */ (null)
+      ),
+      options
+    );
   } catch (err) {
     // EventListenerOptions are not supported
   }
@@ -112,7 +124,7 @@ export function resetEvtListenerOptsSupportForTesting() {
 /**
  * Return boolean. if listener option is supported, return `true`.
  * if not supported, return `false`
- * @param {!Window} win
+ * @param {Window} win
  * @return {boolean}
  */
 export function supportsPassiveEventListener(win) {
@@ -122,17 +134,29 @@ export function supportsPassiveEventListener(win) {
 
   passiveSupported = false;
   try {
-    const options = {
+    const options = /** @type {EventListenerOptions} */ ({
       get passive() {
         // This function will be called when the browser
         // attempts to access the passive property.
         passiveSupported = true;
         return false;
       },
-    };
+    });
 
-    win.addEventListener('test-options', null, options);
-    win.removeEventListener('test-options', null, options);
+    win.addEventListener(
+      'test-options',
+      /** @type {EventListenerOrEventListenerObject} */ (
+        /** @type {?} */ (null)
+      ),
+      options
+    );
+    win.removeEventListener(
+      'test-options',
+      /** @type {EventListenerOrEventListenerObject} */ (
+        /** @type {?} */ (null)
+      ),
+      options
+    );
   } catch (err) {
     // EventListenerOptions are not supported
   }
diff --git a/src/core/dom/event.extern.js b/src/core/dom/event.extern.js
deleted file mode 100644
index ed742e8c3abd..000000000000
--- a/src/core/dom/event.extern.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * @fileoverview Externs for properties that might be seen/added to Events.
- * @externs
- */
-
-/** @type {undefined|!Object} */
-Event.prototype.data;
diff --git a/src/core/dom/fingerprint.js b/src/core/dom/fingerprint.js
index e9e209fd68ad..377700823a99 100644
--- a/src/core/dom/fingerprint.js
+++ b/src/core/dom/fingerprint.js
@@ -67,7 +67,7 @@ export class DomFingerprint {
  * Gets a string showing the index of an element within
  * the children of its parent, counting only nodes with the same tag.
  * Stop at 25, just to have a limit.
- * @param {!Element} element DOM node to get index of.
+ * @param {Element} element DOM node to get index of.
  * @return {string} '.<index>' or ''.
  */
 function indexWithinParent(element) {
diff --git a/src/core/dom/form.js b/src/core/dom/form.js
index efe023268a24..0aad6e7aef18 100644
--- a/src/core/dom/form.js
+++ b/src/core/dom/form.js
@@ -1,29 +1,20 @@
 import {iterateCursor} from '#core/dom';
 import {ancestorElementsByTag} from '#core/dom/query';
 import {toArray} from '#core/types/array';
-import {dict} from '#core/types/object';
 
-/**
- * Stub type until an AmpForm interface is available in typechecked-land.
- * Should be satisfied by `#extensions/amp-form/0.1/amp-form.AmpForm`
- * @typedef {?}
- */
-let AmpFormDef;
-
-/** @const {string} */
 const FORM_PROP_ = '__AMP_FORM';
 
 /**
- * @param {!Element} element
- * @return {AmpFormDef}
+ * @param {HTMLElement} element
+ * @return {AmpForm}
  */
 export function formOrNullForElement(element) {
   return element[FORM_PROP_] || null;
 }
 
 /**
- * @param {!Element} element
- * @param {!AmpFormDef} form
+ * @param {HTMLElement} element
+ * @param {AmpForm} form
  */
 export function setFormForElement(element, form) {
   element[FORM_PROP_] = form;
@@ -32,12 +23,12 @@ export function setFormForElement(element, form) {
 /**
  * Returns form data in the passed-in form as an object.
  * Includes focused submit buttons.
- * @param {!HTMLFormElement} form
- * @return {!JsonObject}
+ * @param {HTMLFormElement} form
+ * @return {JsonObject}
  */
 export function getFormAsObject(form) {
   const {elements} = form;
-  const data = dict();
+  const data = /** @type {!JsonObject} */ ({});
   // <button> is handled separately
   const submittableTagsRegex = /^(?:input|select|textarea)$/i;
   // type=submit is handled separately
@@ -108,14 +99,14 @@ export function getFormAsObject(form) {
  * 1. The first submit button element OR
  * 2. a focused submit button, indicating it was specifically used to submit.
  * 3. null, if neither of the above is found.
- * @param {!HTMLFormElement} form
+ * @param {HTMLFormElement} form
  * @return {?HTMLButtonElement}
  */
 export function getSubmitButtonUsed(form) {
   const {elements} = form;
   const {activeElement} = form.ownerDocument;
 
-  const submitBtns = /** @type {!Array<!HTMLButtonElement>} */ (
+  const submitBtns = /** @type {Array<HTMLButtonElement>} */ (
     toArray(elements).filter(isSubmitButton)
   );
   return submitBtns.includes(/** @type {?} */ (activeElement))
@@ -125,52 +116,56 @@ export function getSubmitButtonUsed(form) {
 
 /**
  * True if the given button can submit a form.
- * @param {!Element} element
+ * @param {Element} element
  * @return {boolean}
  */
 function isSubmitButton(element) {
-  const {tagName, type} = /** @type {!HTMLButtonElement} */ (element);
+  const {tagName, type} = /** @type {HTMLButtonElement} */ (element);
   return tagName == 'BUTTON' || type == 'submit';
 }
 
 /**
  * Checks if a field is disabled.
- * @param {!HTMLInputElement} element
+ * @param {HTMLInputElement} element
  * @return {boolean}
  */
 export function isDisabled(element) {
   return (
     element.disabled ||
     ancestorElementsByTag(element, 'fieldset').some(
-      (el) => /** @type {!HTMLFieldSetElement} */ (el).disabled
+      (el) => /** @type {HTMLFieldSetElement} */ (el).disabled
     )
   );
 }
 
 /**
  * Checks if a form field is in its default state.
- * @param {!HTMLInputElement|!HTMLSelectElement} field
+ * @param {HTMLInputElement|HTMLSelectElement} field
  * @return {boolean}
  */
 export function isFieldDefault(field) {
+  const fieldAsSelect = /** @type {HTMLSelectElement} */ (field);
+  const fieldAsInput = /** @type {HTMLInputElement} */ (field);
   switch (field.type) {
     case 'select-multiple':
     case 'select-one':
-      return toArray(/** @type {!HTMLSelectElement} */ (field).options).every(
+      return toArray(fieldAsSelect.options).every(
         ({defaultSelected, selected}) => selected === defaultSelected
       );
     case 'checkbox':
     case 'radio':
-      return field.checked === field.defaultChecked;
+      const {checked, defaultChecked} = fieldAsInput;
+      return checked === defaultChecked;
     default:
-      return field.value === field.defaultValue;
+      const {defaultValue, value} = fieldAsInput;
+      return value === defaultValue;
   }
 }
 
 /**
  * Checks if a form field is empty. It expects a form field element,
  * i.e. `<input>`, `<textarea>`, or `<select>`.
- * @param {!HTMLInputElement} field
+ * @param {HTMLInputElement} field
  * @throws {Error}
  * @return {boolean}
  */
diff --git a/src/core/dom/fullscreen.extern.js b/src/core/dom/fullscreen.extern.js
deleted file mode 100644
index 2989c51e32ef..000000000000
--- a/src/core/dom/fullscreen.extern.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @fileoverview Externs for possible fullscreen properties browsers may attach
- * to Elements.
- * @externs
- */
-
-Element.prototype.requestFullScreen;
-Element.prototype.exitFullscreen;
-Element.prototype.cancelFullScreen;
-Element.prototype.webkitExitFullscreen;
-Element.prototype.webkitEnterFullscreen;
-Element.prototype.webkitCancelFullScreen;
-Element.prototype.webkitDisplayingFullscreen;
-Element.prototype.mozCancelFullScreen;
-Element.prototype.msExitFullscreen;
-
-Document.prototype.cancelFullScreen;
-Document.prototype.webkitExitFullscreen;
diff --git a/src/core/dom/fullscreen.js b/src/core/dom/fullscreen.js
index 651a13c31df8..c94bb7165aa8 100644
--- a/src/core/dom/fullscreen.js
+++ b/src/core/dom/fullscreen.js
@@ -1,7 +1,7 @@
 /**
  * Replacement for `Element.requestFullscreen()` method.
  * https://developer.mozilla.org/en-US/docs/Web/API/Element/requestFullscreen
- * @param {!Element} element
+ * @param {Element} element
  */
 export function fullscreenEnter(element) {
   const requestFs =
@@ -19,7 +19,7 @@ export function fullscreenEnter(element) {
 /**
  * Replacement for `Document.exitFullscreen()` method.
  * https://developer.mozilla.org/en-US/docs/Web/API/Document/exitFullscreen
- * @param {!Element} element
+ * @param {Element} element
  */
 export function fullscreenExit(element) {
   const elementBoundExit =
@@ -52,7 +52,7 @@ export function fullscreenExit(element) {
 /**
  * Replacement for `Document.fullscreenElement`.
  * https://developer.mozilla.org/en-US/docs/Web/API/Document/fullscreenElement
- * @param {!Element} element
+ * @param {Element} element
  * @return {boolean}
  */
 export function isFullscreenElement(element) {
diff --git a/src/core/dom/get-html.js b/src/core/dom/get-html.js
index 9e5219451efe..6edf041d6ce4 100644
--- a/src/core/dom/get-html.js
+++ b/src/core/dom/get-html.js
@@ -1,9 +1,9 @@
 import {isElement, isString} from '#core/types';
 
-/** @type {!Array<string>} */
+/** @type {Array<string>} */
 const excludedTags = ['script', 'style'];
 
-/** @type {!Array<string>} */
+/** @type {Array<string>} */
 const allowedAmpTags = [
   'amp-accordion',
   'amp-app-banner',
@@ -14,7 +14,7 @@ const allowedAmpTags = [
   'amp-sidebar',
 ];
 
-/** @type {!Array<string>} */
+/** @type {Array<string>} */
 const allowedAttributes = [
   'action',
   'alt',
@@ -36,14 +36,15 @@ const allowedAttributes = [
 
 /**
  * Returns content of HTML node
- * @param {!Window} win
+ * @param {Window} win
  * @param {string} selector - CSS selector of the node to take content from
- * @param {!Array<string>} attrs - tag attributes to be left in the stringified
+ * @param {Array<string>} attrs - tag attributes to be left in the stringified
  * HTML
  * @return {string}
  */
 export function getHtml(win, selector, attrs) {
   const root = win.document.querySelector(selector);
+  /** @type {string[]} */
   const result = [];
 
   if (root) {
@@ -54,27 +55,28 @@ export function getHtml(win, selector, attrs) {
 }
 
 /**
- * @param {!Element} node - node to take content from
- * @param {!Array<string>} attrs - tag attributes to be left in the stringified HTML
- * @param {!Array<string>} result
+ * @param {Element} rootNode - node to take content from
+ * @param {Array<string>} attrs - tag attributes to be left in the stringified HTML
+ * @param {Array<string>} result
  */
-function appendToResult(node, attrs, result) {
-  const stack = [node];
+function appendToResult(rootNode, attrs, result) {
+  /** @type {Array<string|Element>} */
+  const stack = [rootNode];
   const allowedAttrs = attrs.filter((attr) => allowedAttributes.includes(attr));
 
   while (stack.length > 0) {
-    node = stack.pop();
+    const node = /** @type {string|Element} */ (stack.pop());
 
     if (isString(node)) {
       result.push(node);
     } else if (node.nodeType === Node.TEXT_NODE) {
-      result.push(node.textContent);
+      result.push(node.textContent ?? '');
     } else if (isElement(node) && isApplicableNode(node)) {
       appendOpenTag(node, allowedAttrs, result);
       stack.push(`</${node.tagName.toLowerCase()}>`);
 
       for (let child = node.lastChild; child; child = child.previousSibling) {
-        stack.push(child);
+        stack.push(/** @type {Element} */ (child));
       }
     }
   }
@@ -82,7 +84,7 @@ function appendToResult(node, attrs, result) {
 
 /**
  * Returns true for allowed AMP tags and non-AMP tags except <script>/<style>
- * @param {!Element} node
+ * @param {Element} node
  * @return {boolean}
  */
 function isApplicableNode(node) {
@@ -97,8 +99,8 @@ function isApplicableNode(node) {
 
 /**
  * Constructs an open-tag with the provided attributes.
- * @param {!Element} node
- * @param {!Array<string>} attrs
+ * @param {Element} node
+ * @param {Array<string>} attrs
  * @param {Array<string>} result
  */
 function appendOpenTag(node, attrs, result) {
diff --git a/src/core/dom/globals.d.ts b/src/core/dom/globals.d.ts
new file mode 100644
index 000000000000..c90c6450ed94
--- /dev/null
+++ b/src/core/dom/globals.d.ts
@@ -0,0 +1,54 @@
+import './amp-globals.d';
+
+declare global {
+  interface Window {
+    CSSStyleSheet: typeof CSSStyleSheet;
+  }
+
+  interface HTMLElement {
+    nonce?: string;
+
+    mozMatchesSelector?: (s: string) => boolean;
+    msMatchesSelector?: (s: string) => boolean;
+    oMatchesSelector?: (s: string) => boolean;
+  }
+
+  interface Element {
+    createShadowRoot: () => ShadowRoot;
+  }
+
+  interface ShadowRoot {
+    adoptedStyleSheets: CSSStyleSheet[];
+  }
+
+  interface CSSStyleSheet {
+    replaceSync: (text: string) => void;
+  }
+
+  // Fullscreen proprties
+  interface Element {
+    requestFullScreen: any;
+    exitFullscreen: any;
+    cancelFullScreen: any;
+    webkitRequestFullscreen: any;
+    webkitExitFullscreen: any;
+    webkitEnterFullscreen: any;
+    webkitCancelFullScreen: any;
+    webkitDisplayingFullscreen: any;
+    mozRequestFullScreen: any;
+    mozCancelFullScreen: any;
+    msRequestFullscreen: any;
+    msExitFullscreen: any;
+  }
+
+  interface Document {
+    cancelFullScreen: any;
+    webkitCancelFullScreen: any;
+    webkitExitFullscreen: any;
+    webkitFullscreenElement: any;
+    webkitCurrentFullScreenElement: any;
+    msExitFullscreen: any;
+    mozFullScreenElement: any;
+    mozCancelFullScreen: any;
+  }
+}
diff --git a/src/core/dom/img.js b/src/core/dom/img.js
index a435f065922f..10649f686d6a 100644
--- a/src/core/dom/img.js
+++ b/src/core/dom/img.js
@@ -1,12 +1,12 @@
 /**
  * Sets the img src to the first url in the srcset if srcset is defined but
  * src is not for browsers that do not support srcset.
- * @param {!Element} img
+ * @param {Element} img
  */
 export function guaranteeSrcForSrcsetUnsupportedBrowsers(img) {
   // The <img> tag does not have a src and does not support srcset
   if (!img.hasAttribute('src') && 'srcset' in img == false) {
-    const srcset = img.getAttribute('srcset');
+    const srcset = img.getAttribute('srcset') || '';
     const matches = /\S+/.exec(srcset);
     if (matches == null) {
       return;
diff --git a/src/core/dom/index.js b/src/core/dom/index.js
index da0d30d12aa8..a7618ccf5d9e 100644
--- a/src/core/dom/index.js
+++ b/src/core/dom/index.js
@@ -1,5 +1,5 @@
+import {devAssert} from '#core/assert';
 import * as mode from '#core/mode';
-import {dict} from '#core/types/object';
 import {parseJson} from '#core/types/object/json';
 import {getWin} from '#core/window';
 
@@ -19,19 +19,18 @@ const HTML_ESCAPE_REGEX = /(&|<|>|"|'|`)/g;
  * @typedef {{
  *   bubbles: (boolean|undefined),
  *   cancelable: (boolean|undefined),
- * }}
+ * }} CustomEventOptionsDef;
  */
-export let CustomEventOptionsDef;
 
-/** @const {!CustomEventOptionsDef} */
+/** @const {CustomEventOptionsDef} */
 const DEFAULT_CUSTOM_EVENT_OPTIONS = {bubbles: true, cancelable: true};
 
 /**
  * Waits until the child element is constructed. Once the child is found, the
  * callback is executed.
- * @param {!Element} parent
- * @param {function(!Element):boolean} checkFunc
- * @param {function()} callback
+ * @param {Element} parent
+ * @param {function(Element):boolean} checkFunc
+ * @param {function():void} callback
  */
 export function waitForChild(parent, checkFunc, callback) {
   if (checkFunc(parent)) {
@@ -60,20 +59,20 @@ export function waitForChild(parent, checkFunc, callback) {
 /**
  * Waits until the child element is constructed. Once the child is found, the
  * promise is resolved.
- * @param {!Element} parent
- * @param {function(!Element):boolean} checkFunc
- * @return {!Promise}
+ * @param {Element} parent
+ * @param {function(Element):boolean} checkFunc
+ * @return {Promise<void>}
  */
 export function waitForChildPromise(parent, checkFunc) {
   return new Promise((resolve) => {
-    waitForChild(parent, checkFunc, resolve);
+    waitForChild(parent, checkFunc, /** @type {function():void} */ (resolve));
   });
 }
 
 /**
  * Waits for document's body to be available and ready.
- * @param {!Document} doc
- * @param {function()} callback
+ * @param {Document} doc
+ * @param {function():void} callback
  */
 export function waitForBodyOpen(doc, callback) {
   waitForChild(doc.documentElement, () => !!doc.body, callback);
@@ -81,16 +80,18 @@ export function waitForBodyOpen(doc, callback) {
 
 /**
  * Waits for document's body to be available.
- * @param {!Document} doc
- * @return {!Promise}
+ * @param {Document} doc
+ * @return {Promise<void>}
  */
 export function waitForBodyOpenPromise(doc) {
-  return new Promise((resolve) => waitForBodyOpen(doc, resolve));
+  return new Promise((resolve) =>
+    waitForBodyOpen(doc, /** @type {function():void} */ (resolve))
+  );
 }
 
 /**
  * Removes the element.
- * @param {!Element} element
+ * @param {Element} element
  */
 export function removeElement(element) {
   element.parentElement?.removeChild(element);
@@ -98,7 +99,7 @@ export function removeElement(element) {
 
 /**
  * Removes all child nodes of the specified element.
- * @param {!Element|!DocumentFragment} parent
+ * @param {Element|DocumentFragment} parent
  */
 export function removeChildren(parent) {
   while (parent.firstChild) {
@@ -110,8 +111,8 @@ export function removeChildren(parent) {
  * Copies all children nodes of element "from" to element "to". Child nodes
  * are deeply cloned. Notice, that this method should be used with care and
  * preferably on smaller subtrees.
- * @param {!Element} from
- * @param {!Element|!DocumentFragment} to
+ * @param {Element} from
+ * @param {Element|DocumentFragment} to
  */
 export function copyChildren(from, to) {
   const frag = to.ownerDocument.createDocumentFragment();
@@ -124,8 +125,8 @@ export function copyChildren(from, to) {
 /**
  * Insert the element in the root after the element named after or
  * if that is null at the beginning.
- * @param {!Element|!ShadowRoot} root
- * @param {!Element} element
+ * @param {Element|ShadowRoot} root
+ * @param {Element} element
  * @param {?Node=} after
  */
 export function insertAfterOrAtStart(root, element, after = null) {
@@ -140,8 +141,8 @@ export function insertAfterOrAtStart(root, element, after = null) {
 /**
  * Insert the element in the root after the element named after or
  * if that is null at the beginning.
- * @param {!Element|!ShadowRoot} root
- * @param {!Element} element
+ * @param {Element|ShadowRoot} root
+ * @param {Element} element
  */
 export function insertAtStart(root, element) {
   root.insertBefore(element, root.firstChild);
@@ -149,9 +150,9 @@ export function insertAtStart(root, element) {
 
 /**
  * Add attributes to an element.
- * @param {!Element} element
- * @param {!JsonObject<string, string>} attributes
- * @return {!Element} created element
+ * @param {Element} element
+ * @param {Record<string, string>} attributes
+ * @return {Element} created element
  */
 export function addAttributesToElement(element, attributes) {
   for (const attr in attributes) {
@@ -162,10 +163,10 @@ export function addAttributesToElement(element, attributes) {
 
 /**
  * Create a new element on document with specified tagName and attributes.
- * @param {!Document} doc
+ * @param {Document} doc
  * @param {string} tagName
- * @param {!JsonObject<string, string>} attributes
- * @return {!Element} created element
+ * @param {Record<string, string>} attributes
+ * @return {Element} created element
  */
 export function createElementWithAttributes(doc, tagName, attributes) {
   const element = doc.createElement(tagName);
@@ -174,7 +175,7 @@ export function createElementWithAttributes(doc, tagName, attributes) {
 
 /**
  * Returns true if node is connected (attached).
- * @param {!Node} node
+ * @param {Node} node
  * @return {boolean}
  * @see https://dom.spec.whatwg.org/#connected
  */
@@ -188,8 +189,8 @@ export function isConnectedNode(node) {
   let n = node;
   do {
     n = rootNodeFor(n);
-    if (n.host) {
-      n = n.host;
+    if (/** @type {ShadowRoot} */ (n).host) {
+      n = /** @type {ShadowRoot} */ (n).host;
     } else {
       break;
     }
@@ -199,13 +200,15 @@ export function isConnectedNode(node) {
 
 /**
  * Returns the root for a given node. Does not cross shadow DOM boundary.
- * @param {!Node} node
- * @return {!Node}
+ * @param {Node} node
+ * @return {ShadowRoot|Document}
  */
 export function rootNodeFor(node) {
+  // https://developer.mozilla.org/en-US/docs/Web/API/Node/getRootNode
+  // @ts-ignore this always is truthy according to TS, but isn't in IE 11.
   if (Node.prototype.getRootNode) {
     // Type checker says `getRootNode` may return null.
-    return node.getRootNode() || node;
+    return /** @type {ShadowRoot|Document} */ (node.getRootNode());
   }
   let n;
   // Check isShadowRoot() is only needed for the polyfill case.
@@ -214,7 +217,7 @@ export function rootNodeFor(node) {
     !!n.parentNode && !isShadowRoot(/** @type {HTMLElement} */ (n));
     n = n.parentNode
   ) {}
-  return n;
+  return /** @type {ShadowRoot|Document} */ (n);
 }
 
 /**
@@ -240,11 +243,11 @@ export function isShadowRoot(value) {
 /**
  * Returns element data-param- attributes as url parameters key-value pairs.
  * e.g. data-param-some-attr=value -> {someAttr: value}.
- * @param {!HTMLElement} element
+ * @param {HTMLElement} element
  * @param {function(string):string=} opt_computeParamNameFunc to compute the
  *    parameter name, get passed the camel-case parameter name.
- * @param {!RegExp=} opt_paramPattern Regex pattern to match data attributes.
- * @return {!JsonObject}
+ * @param {RegExp=} opt_paramPattern Regex pattern to match data attributes.
+ * @return {JsonObject}
  */
 export function getDataParamsFromAttributes(
   element,
@@ -253,7 +256,7 @@ export function getDataParamsFromAttributes(
 ) {
   const computeParamNameFunc = opt_computeParamNameFunc || ((key) => key);
   const {dataset} = element;
-  const params = dict();
+  const params = /** @type {!JsonObject} */ ({});
   const paramPattern = opt_paramPattern || /^param(.+)/;
   for (const key in dataset) {
     const matches = key.match(paramPattern);
@@ -270,18 +273,19 @@ export function getDataParamsFromAttributes(
  * This means either:
  *  a. The element itself has a nextSibling.
  *  b. Any of the element ancestors has a nextSibling.
- * @param {!Element} element
+ * @param {Element} element
  * @param {?Node} opt_stopNode
  * @return {boolean}
  */
 export function hasNextNodeInDocumentOrder(element, opt_stopNode) {
+  /** @type {?Element} */
   let currentElement = element;
   do {
     if (currentElement.nextSibling) {
       return true;
     }
   } while (
-    (currentElement = currentElement.parentNode) &&
+    (currentElement = /** @type {?Element} */ (currentElement.parentNode)) &&
     currentElement != opt_stopNode
   );
   return false;
@@ -293,12 +297,12 @@ export function hasNextNodeInDocumentOrder(element, opt_stopNode) {
  * Polyfill to replace .content access for browsers that do not support
  * HTMLTemplateElements natively.
  *
- * @param {!HTMLTemplateElement|!Element} template
- * @return {!DocumentFragment}
+ * @param {HTMLTemplateElement|Element} template
+ * @return {DocumentFragment}
  */
 export function templateContentClone(template) {
   if ('content' in template) {
-    return template.content.cloneNode(true);
+    return /** @type {DocumentFragment} */ (template.content.cloneNode(true));
   } else {
     const content = template.ownerDocument.createDocumentFragment();
     copyChildren(template, content);
@@ -309,8 +313,8 @@ export function templateContentClone(template) {
 /**
  * Iterate over an array-like.
  * Test cases: https://jsbench.github.io/#f638cacc866a1b2d6e517e6cfa900d6b
- * @param {!IArrayLike<T>} iterable
- * @param {function(T, number)} cb
+ * @param {ArrayLike<T>} iterable
+ * @param {function(T, number):void} cb
  * @template T
  */
 export function iterateCursor(iterable, cb) {
@@ -322,7 +326,7 @@ export function iterateCursor(iterable, cb) {
 
 /**
  * Whether the element is a script tag with application/json type.
- * @param {!Element} element
+ * @param {Element} element
  * @return {boolean}
  */
 export function isJsonScriptTag(element) {
@@ -334,7 +338,7 @@ export function isJsonScriptTag(element) {
 
 /**
  * Whether the element is a script tag with application/json type.
- * @param {!Element} element
+ * @param {Element} element
  * @return {boolean}
  */
 export function isJsonLdScriptTag(element) {
@@ -346,7 +350,7 @@ export function isJsonLdScriptTag(element) {
 
 /**
  * Whether the page's direction is right to left or not.
- * @param {!Document} doc
+ * @param {Document} doc
  * @return {boolean}
  */
 export function isRTL(doc) {
@@ -370,7 +374,7 @@ export function escapeHtml(text) {
 }
 
 /**
- * @param {string} c
+ * @param {keyof HTML_ESCAPE_CHARS} c
  * @return {string}
  */
 function escapeHtmlChar(c) {
@@ -380,7 +384,7 @@ function escapeHtmlChar(c) {
 /**
  * Tries to focus on the given element; fails silently if browser throws an
  * exception.
- * @param {!Element} element
+ * @param {HTMLElement} element
  */
 export function tryFocus(element) {
   try {
@@ -392,7 +396,7 @@ export function tryFocus(element) {
 
 /**
  * Whether the given window is in an iframe or not.
- * @param {!Window} win
+ * @param {Window} win
  * @return {boolean}
  */
 export function isIframed(win) {
@@ -403,7 +407,7 @@ export function isIframed(win) {
  * Returns true if node is not disabled.
  *
  * IE8 can return false positives, see {@link matches}.
- * @param {!HTMLInputElement} element
+ * @param {HTMLInputElement} element
  * @return {boolean}
  * @see https://www.w3.org/TR/html5/forms.html#concept-fe-disabled
  */
@@ -417,8 +421,8 @@ export function isEnabled(element) {
  * A parent node is sorted to be before a child.
  * See https://developer.mozilla.org/en-US/docs/Web/API/Node/compareDocumentPosition
  *
- * @param {!Element} element1
- * @param {!Element} element2
+ * @param {Element} element1
+ * @param {Element} element2
  * @return {number}
  */
 export function domOrderComparator(element1, element2) {
@@ -444,7 +448,7 @@ export function domOrderComparator(element1, element2) {
  * on by adding an attribute with an empty value, or toggles it off by removing
  * the attribute. This does not mutate the element if the new state matches
  * the existing state.
- * @param {!Element} element An element to toggle the attribute for.
+ * @param {Element} element An element to toggle the attribute for.
  * @param {string} name The name of the attribute.
  * @param {boolean=} forced Whether the attribute should be forced on/off. If
  *    not specified, it will be toggled from the current state.
@@ -481,7 +485,7 @@ export function parseBooleanAttribute(s) {
 }
 
 /**
- * @param {!Window} win
+ * @param {Window} win
  * @return {number} The width of the vertical scrollbar, in pixels.
  */
 export function getVerticalScrollbarWidth(win) {
@@ -494,29 +498,26 @@ export function getVerticalScrollbarWidth(win) {
 /**
  * Dispatches a custom event.
  *
- * @param {!Node} node
+ * @param {Node} node
  * @param {string} name
- * @param {!Object=} opt_data Event data.
- * @param {!CustomEventOptionsDef=} opt_options
+ * @param {Object=} opt_data Event data.
+ * @param {CustomEventOptionsDef=} opt_options
  */
 export function dispatchCustomEvent(node, name, opt_data, opt_options) {
   const data = opt_data || {};
   // Constructors of events need to come from the correct window. Sigh.
-  const event = node.ownerDocument.createEvent('Event');
-
-  // Technically .data is not a property of Event.
-  event.data = data;
+  devAssert(node.ownerDocument);
 
   const {bubbles, cancelable} = opt_options || DEFAULT_CUSTOM_EVENT_OPTIONS;
-  event.initEvent(name, bubbles, cancelable);
+  const event = new MessageEvent(name, {data, bubbles, cancelable});
   node.dispatchEvent(event);
 }
 
 /**
  * Ensures the child is contained by the parent, but not the parent itself.
  *
- * @param {!Node} parent
- * @param {!Node} child
+ * @param {Node} parent
+ * @param {Node} child
  * @return {boolean}
  */
 export function containsNotSelf(parent, child) {
@@ -525,9 +526,9 @@ export function containsNotSelf(parent, child) {
 
 /**
  * Helper method to get the json config from an element <script> tag
- * @param {!Element} element
+ * @param {HTMLElement} element
  * @return {?JsonObject}
- * @throws {!Error} If element does not have exactly one <script> child
+ * @throws {Error} If element does not have exactly one <script> child
  * with type="application/json", or if the <script> contents are not valid JSON.
  */
 export function getChildJsonConfig(element) {
@@ -537,13 +538,13 @@ export function getChildJsonConfig(element) {
     throw new Error(`Found ${length} <script> children. Expected 1.`);
   }
 
-  const script = scripts[0];
+  const script = /** @type {HTMLScriptElement} */ (scripts[0]);
   if (!isJsonScriptTag(script)) {
     throw new Error('<script> child must have type="application/json"');
   }
 
   try {
-    return parseJson(script.textContent);
+    return parseJson(script.textContent ?? '');
   } catch {
     throw new Error('Failed to parse <script> contents. Is it valid JSON?');
   }
@@ -551,9 +552,25 @@ export function getChildJsonConfig(element) {
 
 /**
  * Returns true if an element was server rendered.
- * @param {!Element} element
+ * @param {Element} element
  * @return {boolean}
  */
 export function isServerRendered(element) {
   return element.hasAttribute('i-amphtml-ssr');
 }
+
+/**
+ * Propagate the nonce found in <head> to a new script element.
+ * Recent browsers force nonce to be accessed via property instead of attribute.
+ *
+ * @param {Document} doc
+ * @param {HTMLScriptElement} scriptEl
+ */
+export function propagateNonce(doc, scriptEl) {
+  /** @type {?HTMLScriptElement} */
+  const currentScript = doc.head.querySelector('script[nonce]');
+  if (currentScript) {
+    const nonce = currentScript.nonce || currentScript.getAttribute('nonce');
+    scriptEl.setAttribute('nonce', nonce ?? '');
+  }
+}
diff --git a/src/core/dom/jsx.js b/src/core/dom/jsx.js
deleted file mode 100644
index 2c8bd1a16c97..000000000000
--- a/src/core/dom/jsx.js
+++ /dev/null
@@ -1,117 +0,0 @@
-/**
- * @fileoverview
- * Minimal implementation of JSX that outputs DOM nodes.
- *
- * Usage:
- *   import * as Preact from '#core/dom/jsx';
- *
- * This library is nicer than templates in bundles that do not include Preact,
- * but it does not attempt to implement JSX fully.
- *
- * These features are omitted for the sake of bundle size:
- *
- * 🚫 Attribute names are not re-mapped.
- *   - Use standard HTML attribute names on elements (`class`, not `className`).
- *   - Dashes are ok, like `data-foo="bar"`.
- *
- * 🚫 No objects in attribute values, like `style={{width: 40}}`
- *   - For `style`, use strings instead.
- *   - For `class`, call `objstr()` or use strings instead.
- *
- * 🚫 No Fragments
- *   - Instead use a root node, or split into an array of nodes.
- *
- * 🚫 No dangerouslySetInnerHTML
- *   - You should not do this anyway.
- *
- * 🚫 No SVG <foreignObject>
- *   - This tag is rather obscure. You should be able to restructure your tree.
- *     If you absolutely need it, get in touch with `@alanorozco` to consider
- *     enabling support.
- *
- * TODO(https://go.amp.dev/issue/36679): Lint these unsupported features.
- */
-import {devAssert} from '#core/assert';
-
-/**
- * @typedef {Node|Object|string|number|bigint|boolean|null|undefined}
- */
-let DomJsxChildDef;
-
-/**
- * @param {!Element} parent
- * @param {!DomJsxChildDef|Array<!DomJsxChildDef>} child
- */
-function appendChild(parent, child) {
-  if (!!child === child || child == null) {
-    return;
-  }
-  if (Array.isArray(child)) {
-    const children = /** @type {!Array<!DomJsxChildDef>} */ (child);
-    children.forEach((child) => {
-      appendChild(parent, child);
-    });
-    return;
-  }
-  const maybeNode = /** @type {!Node} */ (child);
-  parent.appendChild(
-    maybeNode.nodeType ? maybeNode : self.document.createTextNode(String(child))
-  );
-}
-
-/**
- * @param {!Element} element
- * @param {string} name
- * @param {*} value
- */
-function setAttribute(element, name, value) {
-  if (value === false || value == null) {
-    return;
-  }
-  if (typeof value === 'function' && name[0] === 'o' && name[1] === 'n') {
-    const eventName = name.toLowerCase().substr(2);
-    element.addEventListener(eventName, value);
-    return;
-  }
-  element.setAttribute(name, value === true ? '' : String(value));
-}
-
-/**
- * @param {string|function(T):!Element} tag
- * @param {T} props
- * @param {...*} children
- * @return {!Element}
- * @template T
- */
-export function createElement(tag, props, ...children) {
-  if (typeof tag !== 'string') {
-    return tag({...props, children});
-  }
-  // We expect all SVG-related tags to have `xmlns` set during build time.
-  // See babel-plugin-dom-jsx-svg-namespace
-  const xmlns = props?.['xmlns'];
-  if (xmlns) {
-    delete props['xmlns'];
-  }
-  const element = xmlns
-    ? self.document.createElementNS(xmlns, tag)
-    : self.document.createElement(tag);
-  appendChild(element, children);
-  if (props) {
-    Object.keys(props).forEach((name) => {
-      setAttribute(element, name, props[name]);
-    });
-  }
-  return element;
-}
-
-/**
- * @return {null}
- */
-export function Fragment() {
-  return devAssert(
-    null,
-    "Don't use Fragment (<></>) with #core/dom/jsx. " +
-      'Use a root node or an array of nodes instead.'
-  );
-}
diff --git a/src/core/dom/jsx/OWNERS b/src/core/dom/jsx/OWNERS
new file mode 100644
index 000000000000..92f8c3d51604
--- /dev/null
+++ b/src/core/dom/jsx/OWNERS
@@ -0,0 +1,14 @@
+// For an explanation of the OWNERS rules and syntax, see:
+// https://github.com/ampproject/amp-github-apps/blob/main/owners/OWNERS.example
+
+{
+  rules: [
+    {
+      owners: [
+        {name: 'ampproject/wg-components'},
+        {name: 'ampproject/wg-stories'},
+        {name: 'alanorozco', notify: true},
+      ],
+    },
+  ],
+}
diff --git a/src/core/dom/jsx/index.ts b/src/core/dom/jsx/index.ts
new file mode 100644
index 000000000000..a8345afd4d9a
--- /dev/null
+++ b/src/core/dom/jsx/index.ts
@@ -0,0 +1,108 @@
+/**
+ * @fileoverview
+ * Minimal implementation of JSX that outputs DOM nodes.
+ *
+ * Usage:
+ *   import * as Preact from '#core/dom/jsx';
+ *
+ * This library is nicer than templates in bundles that do not include Preact,
+ * but it does not attempt to implement JSX fully.
+ *
+ * These features are omitted for the sake of bundle size:
+ *
+ * 🚫 Attribute names are not re-mapped.
+ *   - Use standard HTML attribute names on elements (`class`, not `className`).
+ *   - Dashes are ok, like `data-foo="bar"`.
+ *
+ * 🚫 No objects in attribute values, like `class={{foo: true, bar: false}}`
+ *   - Objects in `style` are ok. They're converted to strings during build time.
+ *   - For `class`, call `objstr()` or use strings instead.
+ *
+ * 🚫 No Fragments
+ *   - Instead use a root node, or split into an array of nodes.
+ *
+ * 🚫 No dangerouslySetInnerHTML
+ *   - You should not do this anyway.
+ *
+ * 🚫 No SVG <foreignObject>
+ *   - This tag is rather obscure. You should be able to restructure your tree.
+ *     If you absolutely need it, get in touch with `@alanorozco` to consider
+ *     enabling support.
+ */
+import {devAssert} from '#core/assert';
+
+type Tag = string | ((props: Props) => Element);
+type Props = {[string: string]: any} | null | undefined;
+type Child =
+  | Child[]
+  | Node
+  | Object
+  | string
+  | number
+  | bigint
+  | boolean
+  | null
+  | undefined;
+
+function appendChild(parent: Element, child: Child) {
+  if (!!child === child || child == null) {
+    return;
+  }
+  if (Array.isArray(child)) {
+    child.forEach((child) => {
+      appendChild(parent, child);
+    });
+    return;
+  }
+  const maybeNode = child as Node;
+  parent.appendChild(
+    maybeNode.nodeType ? maybeNode : self.document.createTextNode(String(child))
+  );
+}
+
+function setAttribute(element: Element, name: string, value: any) {
+  if (value === false || value == null) {
+    return;
+  }
+  if (typeof value === 'function' && name[0] === 'o' && name[1] === 'n') {
+    const eventName = name.toLowerCase().substring(2);
+    element.addEventListener(eventName, value);
+    return;
+  }
+  element.setAttribute(name, value === true ? '' : String(value));
+}
+
+export function createElement(
+  tag: Tag,
+  props: Props,
+  ...children: Child[]
+): Element {
+  if (typeof tag !== 'string') {
+    return tag({...props, children});
+  }
+  // We expect all SVG-related tags to have `xmlns` set during build time.
+  // See babel-plugin-dom-jsx-svg-namespace
+  const xmlns = props?.xmlns;
+  if (xmlns) {
+    delete props.xmlns;
+  }
+  const element = xmlns
+    ? self.document.createElementNS(xmlns, tag)
+    : self.document.createElement(tag);
+  appendChild(element, children);
+  if (props) {
+    Object.keys(props).forEach((name) => {
+      setAttribute(element, name, props[name]);
+    });
+  }
+  return element;
+}
+
+export function Fragment() {
+  devAssert(
+    null,
+    "Don't use Fragment (<></>) with #core/dom/jsx. " +
+      'Use a root node or an array of nodes instead.'
+  );
+  return null;
+}
diff --git a/src/core/dom/jsx/style-property-string.ts b/src/core/dom/jsx/style-property-string.ts
new file mode 100644
index 000000000000..df39f49c401f
--- /dev/null
+++ b/src/core/dom/jsx/style-property-string.ts
@@ -0,0 +1,16 @@
+/**
+ * Output helper for babel-plugin-jsx-style-object.
+ * You should not use this directly.
+ */
+export function jsxStylePropertyString(
+  property: string,
+  value: any,
+  isDimensional?: boolean
+) {
+  if (value == null || value === '') {
+    return '';
+  }
+  const withUnit =
+    isDimensional && typeof value === 'number' ? `${value}px` : value;
+  return `${property}:${withUnit};`;
+}
diff --git a/src/core/dom/layout/globals.d.ts b/src/core/dom/layout/globals.d.ts
new file mode 100644
index 000000000000..3734704fadb8
--- /dev/null
+++ b/src/core/dom/layout/globals.d.ts
@@ -0,0 +1,11 @@
+export {};
+
+declare global {
+  interface Window {
+    // These observers exists globally, but TS doesn't know they are available
+    // through the `Window` object (which we may rely on for polyfilling).
+    IntersectionObserver: typeof IntersectionObserver;
+    MutationObserver: typeof MutationObserver;
+    ResizeObserver: typeof ResizeObserver;
+  }
+}
diff --git a/src/core/dom/layout/index.js b/src/core/dom/layout/index.js
index 4f7fca520986..1885bee5ce59 100644
--- a/src/core/dom/layout/index.js
+++ b/src/core/dom/layout/index.js
@@ -5,11 +5,12 @@
 
 import {userAssert} from '#core/assert';
 import {isFiniteNumber} from '#core/types';
+import {isEnumValue} from '#core/types/enum';
 
 /**
  * @enum {string}
  */
-export const Layout = {
+export const Layout_Enum = {
   NODISPLAY: 'nodisplay',
   FIXED: 'fixed',
   FIXED_HEIGHT: 'fixed-height',
@@ -26,7 +27,7 @@ export const Layout = {
  * BaseElement#updateLayoutPriority().
  * @enum {number}
  */
-export const LayoutPriority = {
+export const LayoutPriority_Enum = {
   CONTENT: 0,
   METADATA: 1,
   ADS: 2,
@@ -35,68 +36,64 @@ export const LayoutPriority = {
 
 /**
  * CSS Length type. E.g. "1px" or "20vh".
- * @typedef {string}
+ * @typedef {string} LengthDef;
  */
-export let LengthDef;
 
 /**
  * @typedef {{
  *   width: string,
  *   height: string
- * }}
+ * }} DimensionsDef;
  */
-export let DimensionsDef;
 
 /**
  * Elements that the progress can be shown for. This set has to be externalized
  * since the element's implementation may not be downloaded yet.
  * This list does not include video players which are found via regex later.
- * @enum {boolean}
- * @private  Visible for testing only!
- */
-export const LOADING_ELEMENTS_ENABLED = {
-  'AMP-AD': true,
-  'AMP-ANIM': true,
-  'AMP-EMBED': true,
-  'AMP-FACEBOOK': true,
-  'AMP-FACEBOOK-COMMENTS': true,
-  'AMP-FACEBOOK-PAGE': true,
-  'AMP-GOOGLE-DOCUMENT-EMBED': true,
-  'AMP-IFRAME': true,
-  'AMP-IMG': true,
-  'AMP-INSTAGRAM': true,
-  'AMP-LIST': true,
-  'AMP-PINTEREST': true,
-  'AMP-PLAYBUZZ': true,
-  'AMP-RENDER': true,
-  'AMP-TIKTOK': true,
-  'AMP-TWITTER': true,
+ * @enum {string}
+ * @private Visible for testing only
+ */
+export const LOADING_ELEMENTS_ENUM = {
+  AMP_AD: 'AMP-AD',
+  AMP_ANIM: 'AMP-ANIM',
+  AMP_EMBED: 'AMP-EMBED',
+  AMP_FACEBOOK: 'AMP-FACEBOOK',
+  AMP_FACEBOOK_COMMENTS: 'AMP-FACEBOOK-COMMENTS',
+  AMP_FACEBOOK_PAGE: 'AMP-FACEBOOK-PAGE',
+  AMP_GOOGLE_DOCUMENT_EMBED: 'AMP-GOOGLE-DOCUMENT-EMBED',
+  AMP_IFRAME: 'AMP-IFRAME',
+  AMP_IMG: 'AMP-IMG',
+  AMP_INSTAGRAM: 'AMP-INSTAGRAM',
+  AMP_LIST: 'AMP-LIST',
+  AMP_PINTEREST: 'AMP-PINTEREST',
+  AMP_PLAYBUZZ: 'AMP-PLAYBUZZ',
+  AMP_RENDER: 'AMP-RENDER',
+  AMP_TIKTOK: 'AMP-TIKTOK',
+  AMP_TWITTER: 'AMP-TWITTER',
 };
 /**
  * All video player components must either have a) "video" or b) "player" in
  * their name. A few components don't follow this convention for historical
  * reasons, so they are listed individually.
- * @private @const {!RegExp}
+ * @private @const {RegExp}
  */
 const videoPlayerTagNameRe =
   /^amp\-(video|.+player)|AMP-BRIGHTCOVE|AMP-DAILYMOTION|AMP-YOUTUBE|AMP-VIMEO|AMP-IMA-VIDEO/i;
 
 /**
  * @param {string} s
- * @return {!Layout|undefined} Returns undefined in case of failure to parse
+ * @return {Layout_Enum|undefined} Returns undefined in case of failure to parse
  *   the layout string.
  */
 export function parseLayout(s) {
-  for (const k in Layout) {
-    if (Layout[k] == s) {
-      return Layout[k];
-    }
+  if (isEnumValue(Layout_Enum, s)) {
+    return /** @type {Layout_Enum} */ (s);
   }
   return undefined;
 }
 
 /**
- * @param {!Layout} layout
+ * @param {Layout_Enum} layout
  * @return {string}
  */
 export function getLayoutClass(layout) {
@@ -105,35 +102,35 @@ export function getLayoutClass(layout) {
 
 /**
  * Whether an element with this layout inherently defines the size.
- * @param {!Layout} layout
+ * @param {Layout_Enum} layout
  * @return {boolean}
  */
 export function isLayoutSizeDefined(layout) {
   return (
-    layout == Layout.FIXED ||
-    layout == Layout.FIXED_HEIGHT ||
-    layout == Layout.RESPONSIVE ||
-    layout == Layout.FILL ||
-    layout == Layout.FLEX_ITEM ||
-    layout == Layout.FLUID ||
-    layout == Layout.INTRINSIC
+    layout == Layout_Enum.FIXED ||
+    layout == Layout_Enum.FIXED_HEIGHT ||
+    layout == Layout_Enum.RESPONSIVE ||
+    layout == Layout_Enum.FILL ||
+    layout == Layout_Enum.FLEX_ITEM ||
+    layout == Layout_Enum.FLUID ||
+    layout == Layout_Enum.INTRINSIC
   );
 }
 
 /**
  * Whether an element with this layout has a fixed dimension.
- * @param {!Layout} layout
+ * @param {Layout_Enum} layout
  * @return {boolean}
  */
 export function isLayoutSizeFixed(layout) {
-  return layout == Layout.FIXED || layout == Layout.FIXED_HEIGHT;
+  return layout == Layout_Enum.FIXED || layout == Layout_Enum.FIXED_HEIGHT;
 }
 
 /**
  * Parses the CSS length value. If no units specified, the assumed value is
  * "px". Returns undefined in case of parsing error.
  * @param {string|undefined|null} s
- * @return {!LengthDef|undefined}
+ * @return {LengthDef|undefined}
  */
 export function parseLength(s) {
   if (typeof s == 'number') {
@@ -153,24 +150,26 @@ export function parseLength(s) {
 
 /**
  * Asserts that the supplied value is a non-percent CSS Length value.
- * @param {!LengthDef|string|null|undefined} length
- * @return {!LengthDef}
+ * @param {LengthDef|string|null|undefined} length
+ * @return {LengthDef}
  * @closurePrimitive {asserts.matchesReturn}
  */
 export function assertLength(length) {
   userAssert(
-    /^\d+(\.\d+)?(px|em|rem|vh|vw|vmin|vmax|cm|mm|q|in|pc|pt)$/.test(length),
+    /^\d+(\.\d+)?(px|em|rem|vh|vw|vmin|vmax|cm|mm|q|in|pc|pt)$/.test(
+      length ?? ''
+    ),
     'Invalid length value: %s',
     length
   );
-  return /** @type {!LengthDef} */ (length);
+  return /** @type {LengthDef} */ (length);
 }
 
 /**
  * Asserts that the supplied value is a CSS Length value
  * (including percent unit).
- * @param {!LengthDef|string} length
- * @return {!LengthDef}
+ * @param {LengthDef|string} length
+ * @return {LengthDef}
  * @closurePrimitive {asserts.matchesReturn}
  */
 export function assertLengthOrPercent(length) {
@@ -184,26 +183,25 @@ export function assertLengthOrPercent(length) {
 
 /**
  * Returns units from the CSS length value.
- * @param {!LengthDef|string|null|undefined} length
+ * @param {LengthDef|string|null|undefined} length
  * @return {string}
  */
 export function getLengthUnits(length) {
   assertLength(length);
-  const m = userAssert(
-    /[a-z]+/i.exec(length),
-    'Failed to read units from %s',
-    length
-  );
+  const m = /[a-z]+/i.exec(length ?? '');
+  userAssert(m, 'Failed to read units from %s', length);
   return m[0];
 }
 
 /**
  * Returns the numeric value of a CSS length value.
- * @param {!LengthDef|string|null|undefined|number} length
+ * @param {LengthDef|string|null|undefined|number} length
  * @return {number|undefined}
  */
 export function getLengthNumeral(length) {
-  const res = parseFloat(length);
+  // TS demands that we only pass a string to `parseFloat`, even though the spec
+  // allows anything.
+  const res = parseFloat(/** @type {?} */ (length));
   return isFiniteNumber(res) ? res : undefined;
 }
 
@@ -211,20 +209,21 @@ export function getLengthNumeral(length) {
  * Whether the loading can be shown for the specified element. This set has
  * to be externalized since the element's implementation may not be
  * downloaded yet.
- * @param {!Element} element
+ * @param {Element} element
  * @return {boolean}
  */
 export function isLoadingAllowed(element) {
   const tagName = element.tagName.toUpperCase();
   return (
-    LOADING_ELEMENTS_ENABLED[tagName] || isIframeVideoPlayerComponent(tagName)
+    isEnumValue(LOADING_ELEMENTS_ENUM, tagName) ||
+    isIframeVideoPlayerComponent(tagName)
   );
 }
 
 /**
  * All video player components must either have a) "video" or b) "player" in
  * their name. A few components don't follow this convention for historical
- * reasons, so they're present in the LOADING_ELEMENTS_ENABLED allowlist.
+ * reasons, so they're present in the LOADING_ELEMENTS_ENUM allowlist.
  * @param {string} tagName
  * @return {boolean}
  */
@@ -243,7 +242,7 @@ export function isIframeVideoPlayerComponent(tagName) {
  * content" styling should be applied. Replaced content is not allowed to
  * have its own paddings or border.
  *
- * @param {!Element} element
+ * @param {Element} element
  * @param {boolean=} opt_replacedContent
  */
 export function applyFillContent(element, opt_replacedContent) {
diff --git a/src/core/dom/layout/intersection-no-root.js b/src/core/dom/layout/intersection-no-root.js
index e88c54ba5bcc..4b5fe9f44e54 100644
--- a/src/core/dom/layout/intersection-no-root.js
+++ b/src/core/dom/layout/intersection-no-root.js
@@ -1,3 +1,4 @@
+import {devAssert} from '#core/assert';
 import {Deferred} from '#core/data-structures/promise';
 import {createViewportObserver} from '#core/dom/layout/viewport-observer';
 import {getWin} from '#core/window';
@@ -12,15 +13,15 @@ import {getWin} from '#core/window';
  * support is better.
  */
 
-/** @type {WeakMap<!Element, !Deferred<!IntersectionObserverEntry>>} */
+/** @type {undefined|WeakMap<Element, Deferred<IntersectionObserverEntry>>} */
 let intersectionDeferreds;
 
-/** @type {WeakMap<!Window, !IntersectionObserver>} */
+/** @type {undefined|WeakMap<Window, IntersectionObserver>} */
 let intersectionObservers;
 
 /**
- * @param {!Window} win
- * @return {!IntersectionObserver}
+ * @param {Window} win
+ * @return {IntersectionObserver}
  */
 function getInOb(win) {
   if (!intersectionDeferreds) {
@@ -28,6 +29,7 @@ function getInOb(win) {
     intersectionObservers = new WeakMap();
   }
 
+  devAssert(intersectionObservers);
   let observer = intersectionObservers.get(win);
   if (!observer) {
     observer = createViewportObserver(
@@ -40,8 +42,10 @@ function getInOb(win) {
           }
           seen.add(target);
 
+          devAssert(observer);
           observer.unobserve(target);
-          intersectionDeferreds.get(target).resolve(entries[i]);
+          devAssert(intersectionDeferreds);
+          intersectionDeferreds.get(target)?.resolve(entries[i]);
           intersectionDeferreds.delete(target);
         }
       },
@@ -59,18 +63,19 @@ function getInOb(win) {
  * If multiple measures for the same element occur very quickly, they will
  * dedupe to the same promise.
  *
- * @param {!Element} el
- * @return {!Promise<!IntersectionObserverEntry>}
+ * @param {Element} el
+ * @return {Promise<IntersectionObserverEntry>}
  */
 export function measureIntersectionNoRoot(el) {
-  if (intersectionDeferreds?.has(el)) {
-    return intersectionDeferreds.get(el).promise;
-  }
+  let deferred = intersectionDeferreds?.get(el);
+  if (!deferred) {
+    const inOb = getInOb(getWin(el));
+    devAssert(intersectionDeferreds);
+    inOb.observe(el);
 
-  const inOb = getInOb(getWin(el));
-  inOb.observe(el);
+    deferred = new Deferred();
+    intersectionDeferreds.set(el, deferred);
+  }
 
-  const deferred = new Deferred();
-  intersectionDeferreds.set(el, deferred);
   return deferred.promise;
 }
diff --git a/src/core/dom/layout/intersection.js b/src/core/dom/layout/intersection.js
index 401a0abebec8..70ee5b8bc441 100644
--- a/src/core/dom/layout/intersection.js
+++ b/src/core/dom/layout/intersection.js
@@ -1,19 +1,19 @@
+import {devAssert} from '#core/assert';
 import {Deferred} from '#core/data-structures/promise';
-import {dict} from '#core/types/object';
 import {getWin} from '#core/window';
 
-import {LayoutRectDef, layoutRectFromDomRect} from './rect';
+import {layoutRectFromDomRect} from './rect';
 import {createViewportObserver} from './viewport-observer';
 
-/** @type {!WeakMap<!Element, !Deferred<!IntersectionObserverEntry>>|undefined} */
+/** @type {undefined|WeakMap<Element, Deferred<IntersectionObserverEntry>>|undefined} */
 let intersectionDeferreds;
 
-/** @type {!WeakMap<!Window, !IntersectionObserver>|undefined} */
+/** @type {undefined|WeakMap<Window, IntersectionObserver>|undefined} */
 let intersectionObservers;
 
 /**
- * @param {!Window} win
- * @return {!IntersectionObserver}
+ * @param {Window} win
+ * @return {IntersectionObserver}
  */
 function getInOb(win) {
   if (!intersectionDeferreds) {
@@ -21,6 +21,7 @@ function getInOb(win) {
     intersectionObservers = new WeakMap();
   }
 
+  devAssert(intersectionObservers);
   let observer = intersectionObservers.get(win);
   if (!observer) {
     observer = createViewportObserver(
@@ -33,8 +34,10 @@ function getInOb(win) {
           }
           seen.add(target);
 
+          devAssert(observer);
           observer.unobserve(target);
-          intersectionDeferreds.get(target).resolve(entries[i]);
+          devAssert(intersectionDeferreds);
+          intersectionDeferreds.get(target)?.resolve(entries[i]);
           intersectionDeferreds.delete(target);
         }
       },
@@ -52,45 +55,46 @@ function getInOb(win) {
  * If multiple measures for the same element occur very quickly, they will
  * dedupe to the same promise.
  *
- * @param {!Element} el
- * @return {!Promise<!IntersectionObserverEntry>}
+ * @param {Element} el
+ * @return {Promise<IntersectionObserverEntry>}
  */
 export function measureIntersection(el) {
-  if (intersectionDeferreds && intersectionDeferreds.has(el)) {
-    return intersectionDeferreds.get(el).promise;
-  }
+  let deferred = intersectionDeferreds?.get(el);
+  if (!deferred) {
+    const inOb = getInOb(getWin(el));
+    devAssert(intersectionDeferreds);
+    inOb.observe(el);
 
-  const inOb = getInOb(getWin(el));
-  inOb.observe(el);
+    deferred = new Deferred();
+    intersectionDeferreds.set(el, deferred);
+  }
 
-  const deferred = new Deferred();
-  intersectionDeferreds.set(el, deferred);
   return deferred.promise;
 }
 
 /**
  * Convert an IntersectionObserverEntry to a regular object to make it serializable.
  *
- * @param {!IntersectionObserverEntry} entry
- * @return {!JsonObject}
+ * @param {IntersectionObserverEntry} entry
+ * @return {JsonObject}
  */
 export function intersectionEntryToJson(entry) {
-  return dict({
+  return {
     'time': entry.time,
     'rootBounds': safeLayoutRectFromDomRect(entry.rootBounds),
     'boundingClientRect': safeLayoutRectFromDomRect(entry.boundingClientRect),
     'intersectionRect': safeLayoutRectFromDomRect(entry.intersectionRect),
     'intersectionRatio': entry.intersectionRatio,
-  });
+  };
 }
 
 /**
  * @param {?} rect
- * @return {?LayoutRectDef}
+ * @return {?import('./rect').LayoutRectDef}
  */
 function safeLayoutRectFromDomRect(rect) {
   if (rect === null) {
     return null;
   }
-  return layoutRectFromDomRect(/** @type {!ClientRect} */ (rect));
+  return layoutRectFromDomRect(/** @type {ClientRect} */ (rect));
 }
diff --git a/src/core/dom/layout/page-layout-box.js b/src/core/dom/layout/page-layout-box.js
index e5a48e5f51e7..d5852bdd0481 100644
--- a/src/core/dom/layout/page-layout-box.js
+++ b/src/core/dom/layout/page-layout-box.js
@@ -1,17 +1,21 @@
-import {LayoutRectDef, layoutRectLtwh} from './rect';
+import {layoutRectLtwh} from './rect';
 
 /**
- * @param {!Element} element
- * @return {!LayoutRectDef}
+ * @param {HTMLElement} element
+ * @return {import('./rect').LayoutRectDef}
  */
 export function getPageLayoutBoxBlocking(element) {
   const stop = element.ownerDocument.body;
   let left = 0;
   let top = 0;
-  for (let n = element; n && n != stop; n = n./*OK*/ offsetParent) {
+  for (
+    let n = element;
+    n && n != stop;
+    n = /** @type {HTMLElement} */ (n./*OK*/ offsetParent)
+  ) {
     left += n./*OK*/ offsetLeft;
     top += n./*OK*/ offsetTop;
   }
-  const {offsetHeight, offsetWidth} = /** @type {!HTMLElement} */ (element);
+  const {offsetHeight, offsetWidth} = element;
   return layoutRectLtwh(left, top, offsetWidth, offsetHeight);
 }
diff --git a/src/core/dom/layout/rect.js b/src/core/dom/layout/rect.js
index edac21b6dad7..2be235f5ee53 100644
--- a/src/core/dom/layout/rect.js
+++ b/src/core/dom/layout/rect.js
@@ -20,9 +20,8 @@ let ViewportInterfaceDef;
  *   height: number,
  *   x: number,
  *   y: number
- * }}
+ * }} LayoutRectDef;
  */
-export let LayoutRectDef;
 
 /**
  * The structure that contains the size for an element. The exact
@@ -31,9 +30,8 @@ export let LayoutRectDef;
  * @typedef {{
  *   width: number,
  *   height: number,
- * }}
+ * }} LayoutSizeDef;
  */
-export let LayoutSizeDef;
 
 /**
  * The structure that represents the margins of an Element.
@@ -43,9 +41,8 @@ export let LayoutSizeDef;
  *   right: number,
  *   bottom: number,
  *   left: number
- * }}
+ * }} LayoutMarginsDef;
  */
-export let LayoutMarginsDef;
 
 /**
  * The structure that represents a requested change to the margins of an
@@ -57,18 +54,17 @@ export let LayoutMarginsDef;
  *   right: (number|undefined),
  *   bottom: (number|undefined),
  *   left: (number|undefined)
- * }}
+ * }} LayoutMarginsChangeDef;
  */
-export let LayoutMarginsChangeDef;
 
 /**
- * RelativePositions
+ * RelativePositions_Enum
  *
  * Describes the relative position of an element to another (whether the
  * first is inside the second, on top of the second or on the bottom
  * @enum {string}
  */
-export const RelativePositions = {
+export const RelativePositions_Enum = {
   INSIDE: 'inside',
   TOP: 'top',
   BOTTOM: 'bottom',
@@ -81,7 +77,7 @@ export const RelativePositions = {
  * @param {number} top
  * @param {number} width
  * @param {number} height
- * @return {!LayoutRectDef}
+ * @return {LayoutRectDef}
  */
 export function layoutRectLtwh(left, top, width, height) {
   return {
@@ -99,8 +95,8 @@ export function layoutRectLtwh(left, top, width, height) {
 /**
  * Creates a layout rect based on the DOMRect, e.g. obtained from calling
  * getBoundingClientRect.
- * @param {!ClientRect} rect
- * @return {!LayoutRectDef}
+ * @param {ClientRect} rect
+ * @return {LayoutRectDef}
  */
 export function layoutRectFromDomRect(rect) {
   return layoutRectLtwh(
@@ -113,8 +109,8 @@ export function layoutRectFromDomRect(rect) {
 
 /**
  * Returns true if the specified two rects overlap by a single pixel.
- * @param {!LayoutRectDef|!ClientRect} r1
- * @param {!LayoutRectDef|!ClientRect} r2
+ * @param {LayoutRectDef|ClientRect} r1
+ * @param {LayoutRectDef|ClientRect} r2
  * @return {boolean}
  */
 export function rectsOverlap(r1, r2) {
@@ -157,27 +153,27 @@ export function rectIntersection(var_args) {
 
 /**
  * Returns the position of r2 relative to r1
- * @param {!LayoutRectDef} r1
- * @param {!LayoutRectDef} r2
- * @return {!RelativePositions}
+ * @param {LayoutRectDef} r1
+ * @param {LayoutRectDef} r2
+ * @return {RelativePositions_Enum}
  */
 export function layoutRectsRelativePos(r1, r2) {
   if (r1.top < r2.top) {
-    return RelativePositions.TOP;
+    return RelativePositions_Enum.TOP;
   } else if (r1.bottom > r2.bottom) {
-    return RelativePositions.BOTTOM;
+    return RelativePositions_Enum.BOTTOM;
   } else {
-    return RelativePositions.INSIDE;
+    return RelativePositions_Enum.INSIDE;
   }
 }
 
 /**
  * Determines if any portion of a layoutBox would be onscreen in the given
  * viewport, when scrolled to the specified position.
- * @param {!LayoutRectDef} layoutBox
- * @param {!ViewportInterfaceDef} viewport
+ * @param {LayoutRectDef} layoutBox
+ * @param {ViewportInterfaceDef} viewport
  * @param {number} scrollPos
- * @return {!RelativePositions}
+ * @return {RelativePositions_Enum}
  */
 export function layoutPositionRelativeToScrolledViewport(
   layoutBox,
@@ -185,7 +181,7 @@ export function layoutPositionRelativeToScrolledViewport(
   scrollPos
 ) {
   const scrollLayoutBox = layoutRectFromDomRect(
-    /** @type {!ClientRect} */ ({
+    /** @type {ClientRect} */ ({
       top: scrollPos,
       bottom: scrollPos + viewport.getHeight(),
       left: 0,
@@ -193,7 +189,7 @@ export function layoutPositionRelativeToScrolledViewport(
     })
   );
   if (rectsOverlap(layoutBox, scrollLayoutBox)) {
-    return RelativePositions.INSIDE;
+    return RelativePositions_Enum.INSIDE;
   } else {
     return layoutRectsRelativePos(layoutBox, scrollLayoutBox);
   }
@@ -201,10 +197,10 @@ export function layoutPositionRelativeToScrolledViewport(
 
 /**
  * Expand the layout rect using multiples of width and height.
- * @param {!LayoutRectDef} rect Original rect.
+ * @param {LayoutRectDef} rect Original rect.
  * @param {number} dw Expansion in width, specified as a multiple of width.
  * @param {number} dh Expansion in height, specified as a multiple of height.
- * @return {!LayoutRectDef}
+ * @return {LayoutRectDef}
  */
 export function expandLayoutRect(rect, dw, dh) {
   return layoutRectLtwh(
@@ -217,10 +213,10 @@ export function expandLayoutRect(rect, dw, dh) {
 
 /**
  * Moves the layout rect using dx and dy.
- * @param {!LayoutRectDef} rect Original rect.
+ * @param {LayoutRectDef} rect Original rect.
  * @param {number} dx Move horizontally with this value.
  * @param {number} dy Move vertically with this value.
- * @return {!LayoutRectDef}
+ * @return {LayoutRectDef}
  */
 export function moveLayoutRect(rect, dx, dy) {
   if ((dx == 0 && dy == 0) || (rect.width == 0 && rect.height == 0)) {
@@ -230,8 +226,8 @@ export function moveLayoutRect(rect, dx, dy) {
 }
 
 /**
- * @param {!LayoutMarginsDef} margins
- * @param {!LayoutMarginsChangeDef} change
+ * @param {LayoutMarginsDef} margins
+ * @param {LayoutMarginsChangeDef} change
  * @return {boolean}
  */
 export function areMarginsChanged(margins, change) {
@@ -244,8 +240,8 @@ export function areMarginsChanged(margins, change) {
 }
 
 /**
- * @param {!LayoutRectDef} from
- * @param {!LayoutRectDef} to
+ * @param {LayoutRectDef} from
+ * @param {LayoutRectDef} to
  * @return {boolean}
  */
 export function layoutRectSizeEquals(from, to) {
@@ -286,8 +282,8 @@ export function cloneLayoutMarginsChangeDef(marginsChange) {
 }
 
 /**
- * @param {!LayoutRectDef|!ClientRect|!DOMRect} rect
- * @return {!LayoutSizeDef}
+ * @param {LayoutRectDef|ClientRect|DOMRect} rect
+ * @return {LayoutSizeDef}
  */
 export function layoutSizeFromRect(rect) {
   const {height, width} = rect;
diff --git a/src/core/dom/layout/size-observer.js b/src/core/dom/layout/size-observer.js
index 73cfd27eeca2..61747e9aad46 100644
--- a/src/core/dom/layout/size-observer.js
+++ b/src/core/dom/layout/size-observer.js
@@ -3,12 +3,15 @@ import {tryCallback} from '#core/error';
 import {remove} from '#core/types/array';
 import {getWin} from '#core/window';
 
-import {LayoutSizeDef} from './rect';
-
-/** @typedef {!LayoutSizeDef|!ResizeObserverSize} TargetSize */
+/** @typedef {import('./rect').LayoutSizeDef} LayoutSizeDef */
+/** @typedef {LayoutSizeDef|ResizeObserverSize} TargetSize */
+/**
+ * @typedef {function(Size): void} SizeCallback
+ * @template {TargetSize} Size
+ */
 
 /** @enum {number} */
-const Type = {
+const Type_Enum = {
   /**
    * Mapped to the `ResizeObserverEntry.contentRect` and returns a
    * `LayoutSizeDef` value.
@@ -23,42 +26,45 @@ const Type = {
 
 const VERTICAL_RE = /vertical/;
 
-/** @const {!WeakMap<!Window, !ResizeObserver>} */
+/** @const {WeakMap<Window, ResizeObserver>} */
 const observers = /* #__PURE__ */ new WeakMap();
 
 /**
- * @const {!WeakMap<!Element, !Array<{
- *   type: !Type,
- *   callback: (function(!LayoutSizeDef)|function(!ResizeObserverSize))
+ * @type {WeakMap<Element, Array<{
+ *   type: Type_Enum,
+ *   callback: SizeCallback<TargetSize>
  * }>>}
+ *
+ * @const
  */
 const targetObserverMultimap = /* #__PURE__ */ new WeakMap();
 
-/** @const {!WeakMap<!Element, !ResizeObserverEntry>} */
+/** @const {WeakMap<Element, ResizeObserverEntry>} */
 const targetEntryMap = /* #__PURE__ */ new WeakMap();
 
 /**
- * @param {!Element} element
- * @param {function(!LayoutSizeDef)} callback
+ * @param {Element} element
+ * @param {SizeCallback<LayoutSizeDef>} callback
  */
 export function observeContentSize(element, callback) {
-  observeSize(element, Type.CONTENT, callback);
+  observeSize(element, Type_Enum.CONTENT, callback);
 }
 
 /**
- * @param {!Element} element
- * @param {function(!LayoutSizeDef)} callback
+ * @param {Element} element
+ * @param {SizeCallback<LayoutSizeDef>} callback
  */
 export function unobserveContentSize(element, callback) {
-  unobserveSize(element, Type.CONTENT, callback);
+  unobserveSize(element, Type_Enum.CONTENT, callback);
 }
 
 /**
- * @param {!Element} element
- * @return {!Promise<!LayoutSizeDef>}
+ * @param {Element} element
+ * @return {Promise<LayoutSizeDef>}
  */
 export function measureContentSize(element) {
   return new Promise((resolve) => {
+    /** @param {LayoutSizeDef} size */
     const onSize = (size) => {
       resolve(size);
       unobserveContentSize(element, onSize);
@@ -69,29 +75,30 @@ export function measureContentSize(element) {
 
 /**
  * Note: this method doesn't support multi-fragment border boxes.
- * @param {!Element} element
- * @param {function(!ResizeObserverSize)} callback
+ * @param {Element} element
+ * @param {SizeCallback<ResizeObserverSize>} callback
  */
 export function observeBorderBoxSize(element, callback) {
-  observeSize(element, Type.BORDER_BOX, callback);
+  observeSize(element, Type_Enum.BORDER_BOX, callback);
 }
 
 /**
  * Note: this method doesn't support multi-fragment border boxes.
- * @param {!Element} element
- * @param {function(!ResizeObserverSize)} callback
+ * @param {Element} element
+ * @param {SizeCallback<ResizeObserverSize>} callback
  */
 export function unobserveBorderBoxSize(element, callback) {
-  unobserveSize(element, Type.BORDER_BOX, callback);
+  unobserveSize(element, Type_Enum.BORDER_BOX, callback);
 }
 
 /**
  * Note: this method doesn't support multi-fragment border boxes.
- * @param {!Element} element
- * @return {!Promise<!ResizeObserverSize>}
+ * @param {Element} element
+ * @return {Promise<ResizeObserverSize>}
  */
 export function measureBorderBoxSize(element) {
   return new Promise((resolve) => {
+    /** @param {ResizeObserverSize} size */
     const onSize = (size) => {
       resolve(size);
       unobserveBorderBoxSize(element, onSize);
@@ -101,9 +108,9 @@ export function measureBorderBoxSize(element) {
 }
 
 /**
- * @param {!Element} element
- * @param {!Type} type
- * @param {function(!LayoutSizeDef)|function(!ResizeObserverSize)} callback
+ * @param {Element} element
+ * @param {Type_Enum} type
+ * @param {SizeCallback<TargetSize>} callback
  */
 function observeSize(element, type, callback) {
   const win = element.ownerDocument.defaultView;
@@ -129,9 +136,9 @@ function observeSize(element, type, callback) {
 }
 
 /**
- * @param {!Element} element
- * @param {!Type} type
- * @param {function(!LayoutSizeDef)|function(!ResizeObserverSize)} callback
+ * @param {Element} element
+ * @param {Type_Enum} type
+ * @param {SizeCallback<TargetSize>} callback
  */
 function unobserveSize(element, type, callback) {
   const callbacks = targetObserverMultimap.get(element);
@@ -150,8 +157,8 @@ function unobserveSize(element, type, callback) {
 }
 
 /**
- * @param {!Window} win
- * @return {!ResizeObserver}
+ * @param {Window} win
+ * @return {ResizeObserver}
  */
 function getObserver(win) {
   let observer = observers.get(win);
@@ -163,7 +170,7 @@ function getObserver(win) {
 }
 
 /**
- * @param {!Array<!ResizeObserverEntry>} entries
+ * @param {Array<ResizeObserverEntry>} entries
  */
 function processEntries(entries) {
   const seen = new Set();
@@ -187,20 +194,20 @@ function processEntries(entries) {
 }
 
 /**
- * @param {Type} type
- * @param {function(!LayoutSizeDef)|function(!ResizeObserverSize)} callback
- * @param {!ResizeObserverEntry} entry
+ * @param {Type_Enum} type
+ * @param {SizeCallback<TargetSize>} callback
+ * @param {ResizeObserverEntry} entry
  */
 function computeAndCall(type, callback, entry) {
-  if (type == Type.CONTENT) {
+  if (type == Type_Enum.CONTENT) {
     const {contentRect} = entry;
     const {height, width} = contentRect;
-    /** @type {!LayoutSizeDef} */
+    /** @type {LayoutSizeDef} */
     const size = {width, height};
-    tryCallback(callback, size);
-  } else if (type == Type.BORDER_BOX) {
+    tryCallback(/** @type {SizeCallback<LayoutSizeDef>} */ (callback), size);
+  } else if (type == Type_Enum.BORDER_BOX) {
     const {borderBoxSize: borderBoxSizeArray} = entry;
-    /** @type {!ResizeObserverSize} */
+    /** @type {ResizeObserverSize} */
     let borderBoxSize;
     if (borderBoxSizeArray) {
       // `borderBoxSize` is supported. Only single-fragment border boxes are
@@ -208,7 +215,7 @@ function computeAndCall(type, callback, entry) {
       if (borderBoxSizeArray.length > 0) {
         borderBoxSize = borderBoxSizeArray[0];
       } else {
-        borderBoxSize = /** @type {!ResizeObserverSize} */ ({
+        borderBoxSize = /** @type {ResizeObserverSize} */ ({
           inlineSize: 0,
           blockSize: 0,
         });
@@ -218,9 +225,9 @@ function computeAndCall(type, callback, entry) {
       const {target} = entry;
       const win = getWin(target);
       const isVertical = VERTICAL_RE.test(
-        computedStyle(win, target)['writing-mode']
+        computedStyle(win, /** @type {HTMLElement} */ (target)).writingMode
       );
-      const {offsetHeight, offsetWidth} = /** @type {!HTMLElement} */ (target);
+      const {offsetHeight, offsetWidth} = /** @type {HTMLElement} */ (target);
       let inlineSize, blockSize;
       if (isVertical) {
         blockSize = offsetWidth;
@@ -231,6 +238,9 @@ function computeAndCall(type, callback, entry) {
       }
       borderBoxSize = {inlineSize, blockSize};
     }
-    tryCallback(callback, borderBoxSize);
+    tryCallback(
+      /** @type {SizeCallback<ResizeObserverSize>} */ (callback),
+      borderBoxSize
+    );
   }
 }
diff --git a/src/core/dom/layout/types.d.ts b/src/core/dom/layout/types.d.ts
new file mode 100644
index 000000000000..3fdcd3a09199
--- /dev/null
+++ b/src/core/dom/layout/types.d.ts
@@ -0,0 +1,5 @@
+export type IOOptions = {
+  threshold?: number | Array<number>;
+  needsRootBounds?: boolean;
+  rootMargin?: string;
+};
diff --git a/src/core/dom/layout/viewport-observer.js b/src/core/dom/layout/viewport-observer.js
index 2ec9fe2331e5..69c7b6b4d95f 100644
--- a/src/core/dom/layout/viewport-observer.js
+++ b/src/core/dom/layout/viewport-observer.js
@@ -5,44 +5,61 @@ import {getWin} from '#core/window';
 /**
  * Returns an IntersectionObserver tracking the Viewport.
  *
- * @param {function(!Array<!IntersectionObserverEntry>)} ioCallback
- * @param {!Window} win
- * @param {{
- *   threshold: (number|!Array<number>|undefined),
- *   needsRootBounds: (boolean|undefined),
- * }=} opts
- * @return {!IntersectionObserver}
+ * @param {function(Array<IntersectionObserverEntry>):void} ioCallback
+ * @param {Window} win
+ * @param {import('./types').IOOptions} [opts]
+ * @return {IntersectionObserver}
  */
 export function createViewportObserver(ioCallback, win, opts = {}) {
-  const {needsRootBounds, threshold} = opts;
-  // The Document -> Element type conversion is necessary to satisfy the
-  // `IntersectionObserver` constructor extern that only accepts `Element`.
+  const {needsRootBounds, rootMargin, threshold} = opts;
   const root =
-    isIframed(win) && needsRootBounds
-      ? /** @type {?} */ (win.document)
+    // When in an iFrame, we must specify `root = document`
+    // to ensure rootBounds / rootMargin works correctly
+    isIframed(win) && (needsRootBounds || rootMargin)
+      ? // The Document -> Element type conversion is necessary to satisfy the
+        // `IntersectionObserver` constructor extern that only accepts `Element`.
+        /** @type {?} */ (win.document)
       : undefined;
   return new win.IntersectionObserver(ioCallback, {
     threshold,
     root,
+    rootMargin,
   });
 }
 
-/** @type {!WeakMap<!Window, !IntersectionObserver>} */
+/** @type {WeakMap<Window, IntersectionObserver>} */
 const viewportObservers = new WeakMap();
 
-/** @type {!WeakMap<!Element, !Array<function(IntersectionObserverEntry)>>} */
+/** @type {WeakMap<Element, Array<function(IntersectionObserverEntry):void>>} */
 const viewportCallbacks = new WeakMap();
 
 /**
  * Lazily creates an IntersectionObserver per Window to track when elements
  * enter and exit the viewport. Fires viewportCallback when this happens.
  *
- * @param {!Element} element
- * @param {function(IntersectionObserverEntry)} callback
- * @return {!UnlistenDef} clean up closure to unobserve the element
+ * @param {Element} element
+ * @param {function(IntersectionObserverEntry):void} callback
+ * @param {import('./types').IOOptions} [opts]
+ * @return {import('#core/types/function/types').UnlistenCallback} clean up closure to unobserve the element
  */
-export function observeIntersections(element, callback) {
+export function observeIntersections(element, callback, opts) {
   const win = getWin(element);
+
+  if (opts) {
+    // If there are opts, the IntersectionObserver isn't reusable
+    const viewportObserverNoCache = createViewportObserver(
+      (entries) => {
+        callback(entries[entries.length - 1]);
+      },
+      win,
+      opts
+    );
+    viewportObserverNoCache.observe(element);
+    return () => {
+      viewportObserverNoCache.unobserve(element);
+    };
+  }
+
   let viewportObserver = viewportObservers.get(win);
   if (!viewportObserver) {
     viewportObservers.set(
@@ -65,8 +82,8 @@ export function observeIntersections(element, callback) {
 /**
  * Unsubscribes a callback from receiving IntersectionObserver updates for an element.
  *
- * @param {!Element} element
- * @param {function(IntersectionObserverEntry)} callback
+ * @param {Element} element
+ * @param {function(IntersectionObserverEntry):void} callback
  */
 function unobserveIntersections(element, callback) {
   const callbacks = viewportCallbacks.get(element);
@@ -90,7 +107,7 @@ function unobserveIntersections(element, callback) {
  * Call the registered callbacks for each element that has crossed the
  * viewport boundary.
  *
- * @param {!Array<!IntersectionObserverEntry>} entries
+ * @param {Array<IntersectionObserverEntry>} entries
  */
 function ioCallback(entries) {
   const seen = new Set();
diff --git a/src/core/dom/media-query-props.extern.js b/src/core/dom/media-query-props.extern.js
deleted file mode 100644
index e2afcdbb114f..000000000000
--- a/src/core/dom/media-query-props.extern.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * @fileoverview Externs for properties expected to be on MediaQueryList in some
- * browsers.
- * @externs
- */
-
-MediaQueryList.prototype.onchange;
diff --git a/src/core/dom/media-query-props.js b/src/core/dom/media-query-props.js
index 49c46488d06e..899ef2fbd99e 100644
--- a/src/core/dom/media-query-props.js
+++ b/src/core/dom/media-query-props.js
@@ -1,12 +1,13 @@
-/** @typedef {!Array<{query: ?MediaQueryList, value: string}>} */
-let ExprDef;
+import {devAssert} from '#core/assert';
+
+/** @typedef {Array<{query: ?MediaQueryList, value: string}>} ExprDef */
 
 const TRUE_VALUE = '1';
 
 export class MediaQueryProps {
   /**
-   * @param {!Window} win
-   * @param {function()} callback
+   * @param {Window} win
+   * @param {function():void} callback
    */
   constructor(win, callback) {
     /** @private @const */
@@ -15,10 +16,16 @@ export class MediaQueryProps {
     /** @private @const */
     this.callback_ = callback;
 
-    /** @private {!Object<string, !ExprDef>} */
+    /**
+     * @type {{[key: string]: ExprDef}}
+     * @private
+     */
     this.exprMap_ = {};
 
-    /** @private {?Object<string, !ExprDef>} */
+    /**
+     * @type {?{[key: string]: ExprDef}}
+     * @private
+     */
     this.prevExprMap_ = null;
   }
 
@@ -37,7 +44,7 @@ export class MediaQueryProps {
    */
   resolveMatchQuery(queryString) {
     // This will create a list query like this:
-    // `[{query: matchMedia(queryString), value: true}, {query: null, value: false}]`
+    // `[{query: matchMedia(queryHeadString), value: true}, {query: null, value: false}]`
     return (
       this.resolve_(queryString, parseMediaQueryMatchExpr, TRUE_VALUE) ===
       TRUE_VALUE
@@ -77,7 +84,7 @@ export class MediaQueryProps {
 
   /**
    * @param {string} exprString
-   * @param {function(!Window, string):!ExprDef} parser
+   * @param {function(Window, string):ExprDef} parser
    * @param {string} emptyExprValue
    * @return {string} value
    */
@@ -85,7 +92,11 @@ export class MediaQueryProps {
     if (!exprString.trim()) {
       return emptyExprValue;
     }
-    let expr = this.exprMap_[exprString] || this.prevExprMap_[exprString];
+    let expr = this.exprMap_[exprString];
+    if (!expr) {
+      devAssert(this.prevExprMap_);
+      expr = this.prevExprMap_[exprString];
+    }
     if (!expr) {
       expr = parser(this.win_, exprString);
       toggleOnChange(expr, this.callback_, true);
@@ -96,9 +107,9 @@ export class MediaQueryProps {
 }
 
 /**
- * @param {!Window} win
+ * @param {Window} win
  * @param {string} queryString
- * @return {!ExprDef}
+ * @return {ExprDef}
  */
 function parseMediaQueryMatchExpr(win, queryString) {
   const query = win.matchMedia(queryString);
@@ -109,12 +120,12 @@ function parseMediaQueryMatchExpr(win, queryString) {
 }
 
 /**
- * @param {!Window} win
+ * @param {Window} win
  * @param {string} exprString
- * @return {!ExprDef}
+ * @return {ExprDef}
  */
 function parseMediaQueryListExpr(win, exprString) {
-  return (
+  return /** @type {ExprDef} */ (
     exprString
       .split(',')
       .map((part) => {
@@ -213,7 +224,7 @@ function parseMediaQueryListExpr(win, exprString) {
 }
 
 /**
- * @param {!ExprDef} expr
+ * @param {ExprDef} expr
  * @return {string} value
  */
 function resolveMediaQueryListExpr(expr) {
@@ -227,8 +238,8 @@ function resolveMediaQueryListExpr(expr) {
 }
 
 /**
- * @param {!ExprDef} expr
- * @param {function()} callback
+ * @param {ExprDef} expr
+ * @param {function():void} callback
  * @param {boolean} on
  */
 function toggleOnChange(expr, callback, on) {
@@ -255,7 +266,7 @@ function toggleOnChange(expr, callback, on) {
  * Native animations will not run when a device is set up to reduced motion.
  * In that case, we need to disable all animation treatment, and whatever
  * setup changes that depend on an animation running later on.
- * @param {!Window} win
+ * @param {Window} win
  * @return {boolean}
  */
 export function prefersReducedMotion(win) {
diff --git a/src/core/dom/modal.js b/src/core/dom/modal.js
index ce2ad07bc957..363efb457238 100644
--- a/src/core/dom/modal.js
+++ b/src/core/dom/modal.js
@@ -11,24 +11,22 @@ import {toArray} from '#core/types/array';
 
 /**
  * @typedef {{
- *   element: !Element,
+ *   element: !HTMLElement,
  *   prevValue: ?string,
- * }}
+ * }} HTMLElementAttributeInfoDef
  */
-let ElementAttributeInfoDef;
 
 /**
  * @typedef {{
- *   element: !Element,
- *   hiddenElementInfos: !Array<!ElementAttributeInfoDef>,
- *   focusableExternalElements: !Array<!Element>,
- *   focusableInternalElements: !Array<!Element>,
- * }}
+ *   element: !HTMLElement,
+ *   hiddenElementInfos: !Array<!HTMLElementAttributeInfoDef>,
+ *   focusableExternalElements: !Array<!HTMLElement>,
+ *   focusableInternalElements: !Array<!HTMLElement>,
+ * }} ModalEntryDef
  */
-let ModalEntryDef;
 
 /**
- * @type {!Array<!ModalEntryDef>}
+ * @type {Array<ModalEntryDef>}
  */
 const modalEntryStack = [];
 
@@ -39,11 +37,12 @@ const SAVED_TAB_INDEX = '__AMP_MODAL_SAVED_TAB_INDEX';
 
 /**
  * Given a target element, finds the Elements to hide for accessibility.
- * @param {!Element} element The target Element.
- * @return {!Array<!Element>} The Elements to add hide from accessibiluty.
+ * @param {HTMLElement} element The target Element.
+ * @return {Array<HTMLElement>} The Elements to add hide from accessibiluty.
  * @package Visible for testing
  */
 export function getElementsToAriaHide(element) {
+  /** @type {HTMLElement[]} */
   const arr = [];
   const ancestors = getAncestors(element);
 
@@ -54,9 +53,9 @@ export function getElementsToAriaHide(element) {
       continue;
     }
 
-    toArray(/** @type {!HTMLDocument|!HTMLElement} */ (cur.parentNode).children)
+    toArray(/** @type {HTMLDocument|HTMLElement} */ (cur.parentNode).children)
       .filter((c) => c != cur)
-      .forEach((c) => arr.push(c));
+      .forEach((c) => arr.push(/** @type {HTMLElement} */ (c)));
   }
 
   return arr;
@@ -65,16 +64,22 @@ export function getElementsToAriaHide(element) {
 /**
  * Gets all ancestors of an Element, including ancestors of any ShadowRoot
  * hosts.
- * @param {!Element} element
- * @return {!Array<!Element>}
+ * @param {Element} element
+ * @return {Array<Element>}
  */
 function getAncestors(element) {
   const ancestry = [];
 
-  for (let cur = element; cur; cur = cur.parentNode || cur.host) {
+  for (
+    let cur = element;
+    cur;
+    cur = cur.parentNode || /** @type {?} */ (cur).host
+  ) {
     ancestry.push(cur);
   }
 
+  // TODO(#37136): This typing is incorrect and may mask a bug. If `cur`
+  // can sometimes be a `ShadowRoot`, `ancestors` can contain non-elements.
   return ancestry;
 }
 
@@ -85,10 +90,11 @@ function getAncestors(element) {
  *
  * Note that some of these Elements may not be focusable (e.g. is a button
  * that is `disabled` or has an ancestor that is `display: none`).
- * @param {!Element} element
- * @return {!Array<!Element>}
+ * @param {HTMLElement} element
+ * @return {HTMLElement[]}
  */
 function getPotentiallyFocusableElements(element) {
+  /** @type {HTMLElement[]} */
   const arr = [];
   let cur = element;
 
@@ -119,7 +125,7 @@ function getPotentiallyFocusableElements(element) {
     );
     Array.prototype.push.apply(arr, potentiallyFocusable);
 
-    cur = /** @type {!ShadowRoot|?} */ (root).host;
+    cur = /** @type {ShadowRoot|?} */ (root).host;
   }
 
   return arr;
@@ -127,12 +133,12 @@ function getPotentiallyFocusableElements(element) {
 
 /**
  *
- * @param {!Element} element The Element top operate on.
+ * @param {HTMLElement} element The Element top operate on.
  * @param {string} attribute  The name of the attribute.
- * @param {?string} value The value of the attribute.
+ * @param {?string=} value The value of the attribute.
  */
 function restoreAttributeValue(element, attribute, value) {
-  if (value === null) {
+  if (value === null || value == undefined) {
     element.removeAttribute(attribute);
   } else {
     element.setAttribute(attribute, value);
@@ -150,7 +156,7 @@ function restoreAttributeValue(element, attribute, value) {
  *
  * Note: this does not block click events on things outside of the modal. It is
  * assumed that a backdrop Element blocking clicks is present.
- * @param {!Element} element
+ * @param {HTMLElement} element
  */
 export function setModalAsOpen(element) {
   devAssert(modalEntryStack.every((info) => info.element !== element));
@@ -169,10 +175,12 @@ export function setModalAsOpen(element) {
   const focusableExternalElements = focusableElements.filter((e) => {
     return !element.contains(e) && e[SAVED_TAB_INDEX] === undefined;
   });
-  const hiddenElementInfos = elements.concat(ancestry).map((element) => ({
-    element,
-    prevValue: element.getAttribute('aria-hidden'),
-  }));
+  const hiddenElementInfos = elements
+    .concat(/** @type {Array<HTMLElement>} */ (ancestry))
+    .map((element) => ({
+      element,
+      prevValue: element.getAttribute('aria-hidden'),
+    }));
 
   // Unhide the ancestry, in case it was hidden from another modal.
   ancestry.forEach((e) => e.removeAttribute('aria-hidden'));
@@ -201,15 +209,17 @@ export function setModalAsOpen(element) {
 /**
  * Undoes the effectsof `setModalAsOpen`. This should only be called with the
  * currently open modal.
- * @param {!Element} element
+ * @param {HTMLElement} element
  */
 export function setModalAsClosed(element) {
+  const next = modalEntryStack.pop();
+  devAssert(next);
   const {
     element: topModalElement,
     focusableExternalElements,
     focusableInternalElements,
     hiddenElementInfos,
-  } = modalEntryStack.pop();
+  } = next;
 
   devAssert(isConnectedNode(element));
   devAssert(topModalElement === element);
diff --git a/src/core/dom/parse-date-attributes.js b/src/core/dom/parse-date-attributes.js
index c96a5051a106..34b5a58cb0c6 100644
--- a/src/core/dom/parse-date-attributes.js
+++ b/src/core/dom/parse-date-attributes.js
@@ -1,34 +1,37 @@
 import {devAssert, userAssert} from '#core/assert';
-import {TimestampDef, parseDate} from '#core/types/date';
+import {parseDate} from '#core/types/date';
 
-/** @typedef {function(string):!TimestampDef} */
-let DateParserDef;
+/** @typedef {import('#core/types/date').TimestampDef} TimestampDef */
+/** @typedef {function(string): TimestampDef} DateParserDef */
 
 /**
  * Map from attribute names to their parsers.
- * @type {Object<string, !DateParserDef>}
+ * @type {{[key: string]: DateParserDef}}
  */
 const dateAttrParsers = {
-  'datetime': (datetime) =>
-    userAssert(parseDate(datetime), 'Invalid date: %s', datetime),
-  'end-date': (datetime) =>
-    userAssert(parseDate(datetime), 'Invalid date: %s', datetime),
+  'datetime': (datetime) => {
+    const d = parseDate(datetime);
+    userAssert(d, 'Invalid date: %s', datetime);
+    return d;
+  },
+  'end-date': (datetime) => {
+    const d = parseDate(datetime);
+    userAssert(d, 'Invalid date: %s', datetime);
+    return d;
+  },
   'timeleft-ms': (timeleftMs) => Date.now() + Number(timeleftMs),
   'timestamp-ms': (ms) => Number(ms),
   'timestamp-seconds': (timestampSeconds) => 1000 * Number(timestampSeconds),
 };
 
 /**
- * @param {!Element} element
- * @param {!Array<string>} dateAttrs list of attribute names
+ * @param {Element} element
+ * @param {Array<string>} dateAttrs list of attribute names
  * @return {?TimestampDef}
  */
 export function parseDateAttrs(element, dateAttrs) {
-  const epoch = userAssert(
-    parseEpoch(element, dateAttrs),
-    'One of attributes [%s] is required',
-    dateAttrs.join(', ')
-  );
+  const epoch = parseEpoch(element, dateAttrs);
+  userAssert(epoch, 'One of attributes [%s] is required', dateAttrs.join(', '));
 
   const offsetSeconds =
     (Number(element.getAttribute('offset-seconds')) || 0) * 1000;
@@ -38,22 +41,23 @@ export function parseDateAttrs(element, dateAttrs) {
 /**
  * Parse epoch from list of possible element attributes, returning the first one
  * that is truthy.
- * @param {!Element} element
- * @param {!Array<string>} dateAttrs list of attribute names
+ * @param {Element} element
+ * @param {Array<string>} dateAttrs list of attribute names
  * @return {?TimestampDef}
  */
 function parseEpoch(element, dateAttrs) {
   // Validate provided dateAttrs outside the loop so it will fail when an
   // invalid attr is provided, even if that attribute isn't present on the
   // element.
-  /** @type {!Array<!DateParserDef>} */
-  const parsers = dateAttrs.map((attrName) =>
+  /** @type {Array<DateParserDef>} */
+  const parsers = dateAttrs.map((attrName) => {
     devAssert(
       dateAttrParsers[attrName],
       'Invalid date attribute "%s"',
       attrName
-    )
-  );
+    );
+    return dateAttrParsers[attrName];
+  });
 
   for (let i = 0; i < dateAttrs.length; ++i) {
     const attrVal = element.getAttribute(dateAttrs[i]);
diff --git a/src/core/dom/propagate-attributes.js b/src/core/dom/propagate-attributes.js
index 66a7945bfc4d..5bddc307d5d1 100644
--- a/src/core/dom/propagate-attributes.js
+++ b/src/core/dom/propagate-attributes.js
@@ -5,9 +5,9 @@ import {arrayOrSingleItemToArray} from '#core/types/array';
  * to an updateable element.
  * If `opt_removeMissingAttrs` is true, then also removes any specified
  * attributes that are missing on the source element from the updateable element.
- * @param {string|!Array<string>} attributes
- * @param {!Element} sourceElement
- * @param {!Element} updateElement
+ * @param {string|Array<string>} attributes
+ * @param {Element} sourceElement
+ * @param {Element} updateElement
  * @param {boolean=} opt_removeMissingAttrs
  */
 export function propagateAttributes(
diff --git a/src/core/dom/query.js b/src/core/dom/query.js
index bd222ddf1348..6bf45995a668 100644
--- a/src/core/dom/query.js
+++ b/src/core/dom/query.js
@@ -1,5 +1,6 @@
 import {devAssert, devAssertElement} from '#core/assert';
 import * as mode from '#core/mode';
+import {isElement, isString} from '#core/types';
 
 import {isScopeSelectorSupported, prependSelectorsWith} from './css-selectors';
 
@@ -23,26 +24,29 @@ function assertIsName(name) {
  * for user-agents that do not support native scoping.
  *
  * This method isn't required for modern builds, can be removed.
+ * TODO(#37136): This will fail if `root` is a `ShadowRoot`.
  *
- * @param {!Element|!ShadowRoot} root
+ * @param {Element|ShadowRoot} root
  * @param {string} selector
- * @return {!NodeList<!Element>}
+ * @return {NodeList}
  */
 function scopedQuerySelectionFallback(root, selector) {
+  const {classList} = /** @type {Element} */ (root);
+
   const unique = 'i-amphtml-scoped';
-  root.classList.add(unique);
+  classList.add(unique);
   const scopedSelector = prependSelectorsWith(selector, `.${unique}`);
   const elements = root./*OK*/ querySelectorAll(scopedSelector);
-  root.classList.remove(unique);
+  classList.remove(unique);
   return elements;
 }
 
 /**
  * Finds the first element that matches `selector`, scoped inside `root`.
  * Note: in IE, this causes a quick mutation of the element's class list.
- * @param {!Element|!ShadowRoot} root
+ * @param {Element|ShadowRoot} root
  * @param {string} selector
- * @return {?Element}
+ * @return {?HTMLElement}
  *
  * @suppress {suspiciousCode}
  */
@@ -52,16 +56,18 @@ export function scopedQuerySelector(root, selector) {
   }
 
   // Only IE.
-  const fallbackResult = scopedQuerySelectionFallback(root, selector);
-  return fallbackResult[0] === undefined ? null : fallbackResult[0];
+  const fallbackResult = /** @type {?HTMLElement} */ (
+    scopedQuerySelectionFallback(root, selector)[0]
+  );
+  return fallbackResult === undefined ? null : fallbackResult;
 }
 
 /**
  * Finds every element that matches `selector`, scoped inside `root`.
  * Note: in IE, this causes a quick mutation of the element's class list.
- * @param {!Element|!ShadowRoot} root
+ * @param {HTMLElement|ShadowRoot} root
  * @param {string} selector
- * @return {!NodeList<!Element>}
+ * @return {NodeList}
  *
  * @suppress {suspiciousCode}
  */
@@ -78,11 +84,14 @@ export function scopedQuerySelectorAll(root, selector) {
 
 /**
  * Checks if the given element matches the selector
- * @param  {!Element} el The element to verify
+ * @param  {HTMLElement} el The element to verify
  * @param  {string} selector The selector to check against
  * @return {boolean} True if the element matched the selector. False otherwise.
  */
 export function matches(el, selector) {
+  if (mode.isEsm()) {
+    return el./*OK*/ matches(selector);
+  }
   const matcher =
     el.matches ||
     el.webkitMatchesSelector ||
@@ -98,13 +107,14 @@ export function matches(el, selector) {
 /**
  * Finds the closest element that satisfies the callback from this element
  * up the DOM subtree.
- * @param {!Element} element
- * @param {function(!Element):boolean} callback
- * @param {Element=} opt_stopAt optional elemnt to stop the search at.
- * @return {?Element}
+ * @param {HTMLElement} element
+ * @param {function(HTMLElement):boolean} callback
+ * @param {HTMLElement=} opt_stopAt optional elemnt to stop the search at.
+ * @return {?HTMLElement}
  */
 export function closest(element, callback, opt_stopAt) {
-  for (let el = element; el && el !== opt_stopAt; el = el.parentElement) {
+  /** @type {?HTMLElement} */ let el;
+  for (el = element; el && el !== opt_stopAt; el = el.parentElement) {
     if (callback(el)) {
       return el;
     }
@@ -115,12 +125,14 @@ export function closest(element, callback, opt_stopAt) {
 /**
  * Finds the closest node that satisfies the callback from this node
  * up the DOM subtree.
- * @param {!Node} node
- * @param {function(!Node):boolean} callback
+ * @param {Node} node
+ * @param {function(Node):boolean} callback
  * @return {?Node}
  */
 export function closestNode(node, callback) {
-  for (let n = node; n; n = n.parentNode) {
+  /** @type {?Node} */
+  let n;
+  for (n = node; n; n = /** @type {?Node} */ (n.parentNode)) {
     if (callback(n)) {
       return n;
     }
@@ -131,21 +143,21 @@ export function closestNode(node, callback) {
 /**
  * Finds the closest ancestor element with the specified selector from this
  * element.
- * @param {!Element} element
+ * @param {HTMLElement} element
  * @param {string} selector
- * @return {?Element} closest ancestor if found.
+ * @return {?HTMLElement} closest ancestor if found.
  */
 export function closestAncestorElementBySelector(element, selector) {
-  return element.closest
+  return mode.isEsm() || element.closest
     ? element.closest(selector)
     : closest(element, (el) => matches(el, selector));
 }
 
 /**
  * Finds all ancestor elements that satisfy predicate.
- * @param {!Element} child
- * @param {function(!Element):boolean} predicate
- * @return {!Array<!Element>}
+ * @param {Element} child
+ * @param {function(Element):boolean} predicate
+ * @return {Array<Element>}
  */
 export function ancestorElements(child, predicate) {
   const ancestors = [];
@@ -163,9 +175,9 @@ export function ancestorElements(child, predicate) {
 
 /**
  * Finds all ancestor elements that has the specified tag name.
- * @param {!Element} child
+ * @param {Element} child
  * @param {string} tagName
- * @return {!Array<!Element>}
+ * @return {Array<Element>}
  */
 export function ancestorElementsByTag(child, tagName) {
   assertIsName(tagName);
@@ -177,9 +189,10 @@ export function ancestorElementsByTag(child, tagName) {
  * Finds the first child element that satisfies the callback.
  * TODO(rcebulko): Can we start using generators in childElements and defer to
  * that here?
- * @param {!Element} parent
- * @param {function(!Element):boolean} callback
- * @return {?Element}
+ * @template {Element} El
+ * @param {El} parent
+ * @param {function(El):boolean} callback
+ * @return {?El}
  */
 export function childElement(parent, callback) {
   for (
@@ -187,8 +200,8 @@ export function childElement(parent, callback) {
     child;
     child = child.nextElementSibling
   ) {
-    if (callback(child)) {
-      return child;
+    if (callback(/** @type {El} */ (child))) {
+      return /** @type {El} */ (child);
     }
   }
   return null;
@@ -196,8 +209,8 @@ export function childElement(parent, callback) {
 
 /**
  * Finds the last child element that satisfies the callback.
- * @param {!Element} parent
- * @param {function(!Element):boolean} callback
+ * @param {Element} parent
+ * @param {function(Element):boolean} callback
  * @return {?Element}
  */
 export function lastChildElement(parent, callback) {
@@ -215,9 +228,10 @@ export function lastChildElement(parent, callback) {
 
 /**
  * Finds all child elements that satisfy the callback.
- * @param {!Element} parent
- * @param {function(!Element):boolean} callback
- * @return {!Array<!Element>}
+ * @template {Element} El
+ * @param {El} parent
+ * @param {function(El):boolean} callback
+ * @return {Array<El>}
  */
 export function childElements(parent, callback) {
   const children = [];
@@ -226,19 +240,19 @@ export function childElements(parent, callback) {
     child;
     child = child.nextElementSibling
   ) {
-    if (callback(child)) {
+    if (callback(/** @type {El} */ (child))) {
       children.push(child);
     }
   }
-  return children;
+  return /** @type {Array<El>} */ (children);
 }
 
 /**
  * Finds all child nodes that satisfy the callback.
  * These nodes can include Text, Comment and other child nodes.
- * @param {!Node} parent
- * @param {function(!Node):boolean} callback
- * @return {!Array<!Node>}
+ * @param {Node} parent
+ * @param {function(Node):boolean} callback
+ * @return {Array<Node>}
  */
 export function childNodes(parent, callback) {
   const nodes = [];
@@ -252,7 +266,7 @@ export function childNodes(parent, callback) {
 
 /**
  * Finds the first child element that has the specified attribute.
- * @param {!Element|!ShadowRoot} parent
+ * @param {Element|ShadowRoot} parent
  * @param {string} attr
  * @return {?Element}
  */
@@ -263,7 +277,7 @@ export function childElementByAttr(parent, attr) {
 
 /**
  * Finds the last child element that has the specified attribute.
- * @param {!Element} parent
+ * @param {HTMLElement} parent
  * @param {string} attr
  * @return {?Element}
  */
@@ -276,9 +290,9 @@ export function lastChildElementByAttr(parent, attr) {
 
 /**
  * Finds all child elements that has the specified attribute.
- * @param {!Element|!ShadowRoot} parent
+ * @param {HTMLElement|ShadowRoot} parent
  * @param {string} attr
- * @return {!NodeList<!Element>}
+ * @return {NodeList}
  */
 export function childElementsByAttr(parent, attr) {
   assertIsName(attr);
@@ -287,7 +301,7 @@ export function childElementsByAttr(parent, attr) {
 
 /**
  * Finds the first child element that has the specified tag name.
- * @param {!Element|!ShadowRoot} parent
+ * @param {HTMLElement|ShadowRoot} parent
  * @param {string} tagName
  * @return {?Element}
  */
@@ -298,9 +312,9 @@ export function childElementByTag(parent, tagName) {
 
 /**
  * Finds all child elements with the specified tag name.
- * @param {!Element|!ShadowRoot} parent
+ * @param {HTMLElement|ShadowRoot} parent
  * @param {string} tagName
- * @return {!NodeList<!Element>}
+ * @return {NodeList}
  */
 export function childElementsByTag(parent, tagName) {
   assertIsName(tagName);
@@ -309,7 +323,7 @@ export function childElementsByTag(parent, tagName) {
 
 /**
  * Finds the first descendant element with the specified name.
- * @param {!Element|!Document|!ShadowRoot} element
+ * @param {HTMLElement|Document|ShadowRoot} element
  * @param {string} tagName
  * @return {?Element}
  */
@@ -323,8 +337,8 @@ export function elementByTag(element, tagName) {
  * nodes that could have been added for markup. These nodes can include
  * Text, Comment and other child nodes.
  *
- * @param {!Node} element
- * @return {!Array<!Node>}
+ * @param {Node} element
+ * @return {Array<Node>}
  */
 export function realChildNodes(element) {
   return childNodes(element, (node) => !isInternalOrServiceNode(node));
@@ -334,8 +348,9 @@ export function realChildNodes(element) {
  * Returns the original children of the custom element without any service
  * nodes that could have been added for markup.
  *
- * @param {!Element} element
- * @return {!Array<!Element>}
+ * @template {Element} El
+ * @param {El} element
+ * @return {Array<El>}
  */
 export function realChildElements(element) {
   return childElements(element, (element) => !isInternalOrServiceNode(element));
@@ -343,7 +358,7 @@ export function realChildElements(element) {
 
 /**
  * Returns "true" for internal AMP nodes or for placeholder elements.
- * @param {!Node} node
+ * @param {Node} node
  * @return {boolean}
  */
 export function isInternalOrServiceNode(node) {
@@ -353,8 +368,8 @@ export function isInternalOrServiceNode(node) {
   if (node.nodeType !== Node.ELEMENT_NODE) {
     return false;
   }
-  devAssertElement(node);
 
+  devAssertElement(node);
   return (
     node.hasAttribute('placeholder') ||
     node.hasAttribute('fallback') ||
@@ -364,17 +379,59 @@ export function isInternalOrServiceNode(node) {
 
 /**
  * Whether the tag is an internal (service) AMP tag.
- * @param {!Node|string} nodeOrTagName
+ * @param {Node|string} nodeOrTagName
  * @return {boolean}
  */
 function isInternalElement(nodeOrTagName) {
-  /** @type string */
+  /** @type {undefined|string} */
   let tagName;
-  if (typeof nodeOrTagName == 'string') {
+  if (isString(nodeOrTagName)) {
     tagName = nodeOrTagName;
-  } else if (nodeOrTagName.nodeType === Node.ELEMENT_NODE) {
-    tagName = devAssertElement(nodeOrTagName).tagName;
+  } else if (isElement(nodeOrTagName)) {
+    tagName = nodeOrTagName.tagName;
   }
 
   return !!tagName && tagName.toLowerCase().startsWith('i-');
 }
+
+/**
+ * Finds a matching node inside an HTML template slot's children
+ * @param {HTMLSlotElement} slot
+ * @param {string} selector
+ * @return {HTMLElement|null}
+ */
+export function querySelectorInSlot(slot, selector) {
+  const nodes = /** @type {HTMLElement[]} */ (slot.assignedElements());
+  for (let i = 0; i < nodes.length; i++) {
+    const node = nodes[i];
+    if (matches(node, selector)) {
+      return node;
+    }
+    const child = scopedQuerySelector(node, selector);
+    if (child) {
+      return child;
+    }
+  }
+  return null;
+}
+
+/**
+ * Finds a matching node inside an HTML template slot's children
+ * @param {HTMLSlotElement} slot
+ * @param {string} selector
+ * @return {HTMLElement[]}
+ */
+export function querySelectorAllInSlot(slot, selector) {
+  const nodes = /** @type {HTMLElement[] } */ (slot.assignedElements());
+
+  const list = [];
+  for (let i = 0; i < nodes.length; i++) {
+    const node = nodes[i];
+    if (matches(node, selector)) {
+      list.push(node);
+    }
+    const children = scopedQuerySelectorAll(node, selector);
+    children.forEach((child) => list.push(child));
+  }
+  return list;
+}
diff --git a/src/core/dom/resource-container-helper.js b/src/core/dom/resource-container-helper.js
index b1cab04c353f..941de0a37fb8 100644
--- a/src/core/dom/resource-container-helper.js
+++ b/src/core/dom/resource-container-helper.js
@@ -4,14 +4,19 @@ import {arrayOrSingleItemToArray} from '#core/types/array';
 const AMP_CLASS = 'i-amphtml-element';
 const DEEP = true;
 
+/** @type {function(AmpElement): Promise<void>} */
 const ensureLoaded = (element) => element.ensureLoaded();
+
+/** @type {function(AmpElement): void} */
 const pause = (element) => element.pause();
+
+/** @type {function(AmpElement): Promise<void>} */
 const unmount = (element) => element.unmount();
 
 /**
  * Ensure all elements within this container are scheduled to load.
  *
- * @param {!Element|!Array<!Element>} containerOrContainers
+ * @param {Element|Array<Element>} containerOrContainers
  * @param {boolean=} includeSelf
  */
 export function loadAll(containerOrContainers, includeSelf = true) {
@@ -21,7 +26,7 @@ export function loadAll(containerOrContainers, includeSelf = true) {
 /**
  * Pause all elements within this container.
  *
- * @param {!Element|!Array<!Element>} containerOrContainers
+ * @param {Element|Array<Element>} containerOrContainers
  * @param {boolean=} includeSelf
  */
 export function pauseAll(containerOrContainers, includeSelf = true) {
@@ -31,7 +36,7 @@ export function pauseAll(containerOrContainers, includeSelf = true) {
 /**
  * Unmount all elements within this container.
  *
- * @param {!Element|!Array<!Element>} containerOrContainers
+ * @param {Element|Array<Element>} containerOrContainers
  * @param {boolean=} includeSelf
  */
 export function unmountAll(containerOrContainers, includeSelf = true) {
@@ -41,10 +46,10 @@ export function unmountAll(containerOrContainers, includeSelf = true) {
 /**
  * Execute a callback for all elements within the container.
  *
- * @param {!Element|!Array<!Element>} containerOrContainers
+ * @param {Element|Array<Element>} containerOrContainers
  * @param {boolean} includeSelf
  * @param {boolean} deep
- * @param {function(!AmpElement)} callback
+ * @param {function(AmpElement):void} callback
  */
 export function forAllWithin(
   containerOrContainers,
@@ -61,14 +66,14 @@ export function forAllWithin(
 /**
  * Execute a callback for all elements within the container.
  *
- * @param {!Element} container
+ * @param {Element} container
  * @param {boolean} includeSelf
  * @param {boolean} deep
- * @param {function(!AmpElement)} callback
+ * @param {function(AmpElement):void} callback
  */
 function forAllWithinInternal(container, includeSelf, deep, callback) {
   if (includeSelf && container.classList.contains(AMP_CLASS)) {
-    const ampContainer = /** @type {!AmpElement} */ (container);
+    const ampContainer = /** @type {AmpElement} */ (container);
     tryCallback(callback, ampContainer);
     if (!deep) {
       // Also schedule amp-element that is a placeholder for the element.
@@ -86,12 +91,12 @@ function forAllWithinInternal(container, includeSelf, deep, callback) {
   }
 
   const descendants =
-    /** @type {!HTMLCollection<!AmpElement>} */
+    /** @type {HTMLCollection} */
     (container.getElementsByClassName(AMP_CLASS));
   /** @type {?Array<Element>} */
   let seen = null;
   for (let i = 0; i < descendants.length; i++) {
-    const descendant = descendants[i];
+    const descendant = /** @type {AmpElement} */ (descendants[i]);
     if (deep) {
       // In deep search all elements will be covered.
       tryCallback(callback, descendant);
diff --git a/src/core/dom/shadow-embed.js b/src/core/dom/shadow-embed.js
new file mode 100644
index 000000000000..074d3acff5fc
--- /dev/null
+++ b/src/core/dom/shadow-embed.js
@@ -0,0 +1,42 @@
+import {devAssert} from '#core/assert';
+import {toWin} from '#core/window';
+
+const SHADOW_CSS_CACHE = '__AMP_SHADOW_CSS';
+
+/**
+ * @param {ShadowRoot} shadowRoot
+ * @param {string} name
+ * @param {string} cssText
+ */
+export function installShadowStyle(shadowRoot, name, cssText) {
+  const doc = shadowRoot.ownerDocument;
+  const win = toWin(doc.defaultView);
+  if (
+    shadowRoot.adoptedStyleSheets !== undefined &&
+    win.CSSStyleSheet.prototype.replaceSync !== undefined
+  ) {
+    const cache = win[SHADOW_CSS_CACHE] || (win[SHADOW_CSS_CACHE] = {});
+    let styleSheet = cache[name];
+    if (!styleSheet) {
+      styleSheet = new win.CSSStyleSheet();
+      devAssert(styleSheet.replaceSync);
+      styleSheet.replaceSync(cssText);
+      cache[name] = styleSheet;
+    }
+    shadowRoot.adoptedStyleSheets =
+      shadowRoot.adoptedStyleSheets.concat(styleSheet);
+  } else {
+    const styleEl = doc.createElement('style');
+    styleEl.setAttribute('data-name', name);
+    styleEl.textContent = cssText;
+    shadowRoot.appendChild(styleEl);
+  }
+}
+
+/**
+ * @param {!Window} win
+ * @visibleForTesting
+ */
+export function resetShadowStyleCacheForTesting(win) {
+  win[SHADOW_CSS_CACHE] = null;
+}
diff --git a/src/core/dom/srcset.js b/src/core/dom/srcset.js
index 4ef7812e6e10..f2df038dd9ec 100644
--- a/src/core/dom/srcset.js
+++ b/src/core/dom/srcset.js
@@ -1,15 +1,12 @@
 import {devAssert, userAssert} from '#core/assert';
 
+/** @typedef {{url: string, dpr?: undefined, width: number}} WidthSourceDef */
+/** @typedef {{url: string, dpr: number, width?: undefined}} DprSourceDef */
 /**
  * A single source within a srcset. Only one: width or DPR can be specified at
  * a time.
- * @typedef {{
- *   url: string,
- *   width: (number|undefined),
- *   dpr: (number|undefined)
- * }}
+ * @typedef {WidthSourceDef|DprSourceDef} SrcsetSourceDef
  */
-let SrcsetSourceDef;
 
 /**
  * General grammar: (URL [NUM[w|x]],)*
@@ -21,8 +18,8 @@ const srcsetRegex = /(\S+)(?:\s+(?:(-?\d+(?:\.\d+)?)([a-zA-Z]*)))?\s*(?:,|$)/g;
 
 /**
  * Extracts `srcset` and fallbacks to `src` if not available.
- * @param {!Element} element
- * @return {!Srcset}
+ * @param {Element} element
+ * @return {Srcset<SrcsetSourceDef>}
  */
 export function srcsetFromElement(element) {
   const srcsetAttr = element.getAttribute('srcset');
@@ -32,8 +29,9 @@ export function srcsetFromElement(element) {
   // We can't push `src` via `parseSrcset` because URLs in `src` are not always
   // RFC compliant and can't be easily parsed as an `srcset`. For instance,
   // they sometimes contain space characters.
-  const srcAttr = userAssert(
-    element.getAttribute('src'),
+  const srcAttr = element.getAttribute('src');
+  userAssert(
+    srcAttr,
     'Either non-empty "srcset" or "src" attribute must be specified: %s',
     element
   );
@@ -43,7 +41,7 @@ export function srcsetFromElement(element) {
 /**
  * Creates a Srcset from a `src` attribute value.
  * @param {string} src
- * @return {!Srcset}
+ * @return {Srcset<SrcsetSourceDef>}
  */
 export function srcsetFromSrc(src) {
   return new Srcset([{url: src, width: undefined, dpr: 1}]);
@@ -54,7 +52,7 @@ export function srcsetFromSrc(src) {
  * See https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img#Attributes.
  * See http://www.w3.org/html/wg/drafts/html/master/semantics.html#attr-img-srcset.
  * @param {string} s
- * @return {!Srcset}
+ * @return {Srcset<SrcsetSourceDef>}
  */
 export function parseSrcset(s) {
   const sources = [];
@@ -75,7 +73,7 @@ export function parseSrcset(s) {
       // If no "w" or "x" specified, we assume it's "1x".
       dpr = 1;
     }
-    sources.push({url, width, dpr});
+    sources.push(/** @type {SrcsetSourceDef} */ ({url, width, dpr}));
   }
   return new Srcset(sources);
 }
@@ -90,31 +88,37 @@ export function parseSrcset(s) {
  * "select" method for details on how this selection is performed.
  *
  * See https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img#Attributes
+ * @template {SrcsetSourceDef} SourceDef
  */
 export class Srcset {
   /**
-   * @param {!Array<!SrcsetSourceDef>} sources
+   * @param {Array<SourceDef>} sources
    */
   constructor(sources) {
     userAssert(sources.length > 0, 'Srcset must have at least one source');
-    /** @private @const {!Array<!SrcsetSourceDef>} */
+    /** @private @const {Array<SourceDef>} */
     this.sources_ = sources;
 
     // Only one type of source specified can be used - width or DPR.
     let hasWidth = false;
     let hasDpr = false;
     for (let i = 0; i < sources.length; i++) {
+      /** @type {?} */
       const source = sources[i];
       hasWidth = hasWidth || !!source.width;
       hasDpr = hasDpr || !!source.dpr;
     }
     userAssert(
-      !!(hasWidth ^ hasDpr),
+      !!(hasWidth !== hasDpr),
       'Srcset must have width or dpr sources, but not both'
     );
 
     // Source and assert duplicates.
-    sources.sort(hasWidth ? sortByWidth : sortByDpr);
+    sources.sort(
+      /** @type {function(SourceDef, SourceDef):number} */ (
+        /** @type {?} */ (hasWidth ? sortByWidth : sortByDpr)
+      )
+    );
 
     /** @private @const {boolean} */
     this.widthBased_ = hasWidth;
@@ -166,13 +170,13 @@ export class Srcset {
    * @private
    */
   selectByWidth_(width) {
-    const sources = this.sources_;
+    const sources = /** @type {Array<WidthSourceDef>} */ (this.sources_);
     let minIndex = 0;
     let minScore = Infinity;
     let minWidth = Infinity;
 
     for (let i = 0; i < sources.length; i++) {
-      const sWidth = sources[i].width;
+      const sWidth = sources[i].width ?? 0;
       const score = Math.abs(sWidth - width);
 
       // Select the one that is closer with a slight preference toward larger
@@ -195,7 +199,7 @@ export class Srcset {
    * @private
    */
   selectByDpr_(dpr) {
-    const sources = this.sources_;
+    const sources = /** @type {Array<DprSourceDef>} */ (this.sources_);
     let minIndex = 0;
     let minScore = Infinity;
 
@@ -213,7 +217,7 @@ export class Srcset {
 
   /**
    * Returns all URLs in the srcset.
-   * @return {!Array<string>}
+   * @return {Array<string>}
    */
   getUrls() {
     return this.sources_.map((s) => s.url);
@@ -234,9 +238,9 @@ export class Srcset {
         src = opt_mapper(src);
       }
       if (this.widthBased_) {
-        src += ` ${source.width}w`;
+        src += ` ${/** @type {WidthSourceDef} */ (source).width}w`;
       } else {
-        src += ` ${source.dpr}x`;
+        src += ` ${/** @type {DprSourceDef} */ (source).dpr}x`;
       }
       res.push(src);
     }
@@ -247,8 +251,8 @@ export class Srcset {
 /**
  * Sorts by width
  *
- * @param {!SrcsetSourceDef} s1
- * @param {!SrcsetSourceDef} s2
+ * @param {WidthSourceDef} s1
+ * @param {WidthSourceDef} s2
  * @return {number}
  */
 function sortByWidth(s1, s2) {
@@ -259,8 +263,8 @@ function sortByWidth(s1, s2) {
 /**
  * Sorts by dpr
  *
- * @param {!SrcsetSourceDef} s1
- * @param {!SrcsetSourceDef} s2
+ * @param {DprSourceDef} s1
+ * @param {DprSourceDef} s2
  * @return {number}
  */
 function sortByDpr(s1, s2) {
diff --git a/src/core/dom/static-template.js b/src/core/dom/static-template.js
index 487079f99369..32dd91cf5f22 100644
--- a/src/core/dom/static-template.js
+++ b/src/core/dom/static-template.js
@@ -1,17 +1,20 @@
 import {devAssert} from '#core/assert';
-import {map} from '#core/types/object';
+import {hasOwn, map} from '#core/types/object';
 
+/** @type {HTMLElement} */
 let htmlContainer;
+
+/** @type {SVGSVGElement} */
 let svgContainer;
 
 /**
  * Creates the html helper for the doc.
  *
- * @param {!Element|!Document} nodeOrDoc
- * @return {function(!Array<string>):!Element}
+ * @param {HTMLElement|Document} nodeOrDoc
+ * @return {function(readonly string[]):HTMLElement}
  */
 export function htmlFor(nodeOrDoc) {
-  const doc = nodeOrDoc.ownerDocument || nodeOrDoc;
+  const doc = nodeOrDoc.ownerDocument || /** @type {Document} */ (nodeOrDoc);
   if (!htmlContainer || htmlContainer.ownerDocument !== doc) {
     htmlContainer = doc.createElement('div');
   }
@@ -22,12 +25,12 @@ export function htmlFor(nodeOrDoc) {
 /**
  * Creates the svg helper for the doc.
  *
- * @param {!Element|!Document} nodeOrDoc
- * @return {function(!Array<string>):!Element}
+ * @param {HTMLElement|Document} nodeOrDoc
+ * @return {function(readonly string[]):HTMLElement}
  */
 export function svgFor(nodeOrDoc) {
-  const doc = nodeOrDoc.ownerDocument || nodeOrDoc;
-  if (!svgContainer || svgContainer.ownerDocument !== svgContainer) {
+  const doc = nodeOrDoc.ownerDocument || /** @type {Document} */ (nodeOrDoc);
+  if (!svgContainer || svgContainer.ownerDocument !== doc) {
     svgContainer = doc.createElementNS('http://www.w3.org/2000/svg', 'svg');
   }
 
@@ -45,8 +48,8 @@ export function svgFor(nodeOrDoc) {
  * Only the root element and its subtree will be returned. DO NOT use this to
  * render subtree's with dynamic content, it WILL result in an error!
  *
- * @param {!Array<string>} strings
- * @return {!Element}
+ * @param {readonly string[]} strings
+ * @return {HTMLElement}
  */
 function svg(strings) {
   return createNode(svgContainer, strings);
@@ -63,8 +66,8 @@ function svg(strings) {
  * Only the root element and its subtree will be returned. DO NOT use this to
  * render subtree's with dynamic content, it WILL result in an error!
  *
- * @param {!Array<string>} strings
- * @return {!Element}
+ * @param {readonly string[]} strings
+ * @return {HTMLElement}
  */
 function html(strings) {
   return createNode(htmlContainer, strings);
@@ -72,15 +75,33 @@ function html(strings) {
 
 /**
  * Helper used by html and svg string literal functions.
- * @param {!Element} container
- * @param {!Array<string>} strings
- * @return {!Element}
+ * @param {HTMLElement | SVGSVGElement} container
+ * @param {readonly string[]} strings
+ * @return {HTMLElement}
  */
 function createNode(container, strings) {
   devAssert(strings.length === 1, 'Improper html template tag usage.');
-  container./*OK*/ innerHTML = strings[0];
+  devAssert(
+    Array.isArray(strings) || hasOwn(strings, 'raw'),
+    'Invalid template strings array'
+  );
+
+  if (self.trustedTypes && self.trustedTypes.createPolicy) {
+    const policy = self.trustedTypes.createPolicy(
+      'static-template#createNode',
+      {
+        createHTML: function (unused) {
+          return strings[0];
+        },
+      }
+    );
+    // @ts-ignore
+    container./*OK*/ innerHTML = policy.createHTML('ignored');
+  } else {
+    container./*OK*/ innerHTML = strings[0];
+  }
 
-  const el = container.firstElementChild;
+  const el = /** @type {HTMLElement} */ (container.firstElementChild);
   devAssert(el, 'No elements in template');
   devAssert(!el.nextElementSibling, 'Too many root elements in template');
 
@@ -95,8 +116,8 @@ function createNode(container, strings) {
  * the attribute afterwards.
  * Returns a named map of all ref elements.
  *
- * @param {!Element} root
- * @return {!Object<string, !Element>}
+ * @param {HTMLElement} root
+ * @return {{[key: string]: HTMLElement}}
  */
 export function htmlRefs(root) {
   const elements = root.querySelectorAll('[ref]');
@@ -104,7 +125,8 @@ export function htmlRefs(root) {
 
   for (let i = 0; i < elements.length; i++) {
     const element = elements[i];
-    const ref = devAssert(element.getAttribute('ref'), 'Empty ref attr');
+    const ref = element.getAttribute('ref');
+    devAssert(ref, 'Empty ref attr');
     element.removeAttribute('ref');
     devAssert(refs[ref] === undefined, 'Duplicate ref');
     refs[ref] = element;
diff --git a/src/core/dom/stream/detached.js b/src/core/dom/stream/detached.js
index de44840fed00..852497dbc63b 100644
--- a/src/core/dom/stream/detached.js
+++ b/src/core/dom/stream/detached.js
@@ -2,18 +2,18 @@ import {devAssert} from '#core/assert';
 
 export class DetachedDomStream {
   /**
-   * @param {!Window} win
-   * @param {function(!Document):void} onChunk
-   * @param {function(!Document):void} onEnd
+   * @param {Window} win
+   * @param {function(Document):void} onChunk
+   * @param {function(Document):void} onEnd
    */
   constructor(win, onChunk, onEnd) {
-    /** @const @private {function(!Document):void} */
+    /** @const @private {function(Document):void} */
     this.onChunk_ = onChunk;
 
-    /** @const @private {function(!Document):void} */
+    /** @const @private {function(Document):void} */
     this.onEnd_ = onEnd;
 
-    /** @const @private {!Document} */
+    /** @const @private {Document} */
     this.detachedDoc_ = win.document.implementation.createHTMLDocument('');
     this.detachedDoc_.open();
 
diff --git a/src/core/dom/stream/response.js b/src/core/dom/stream/response.js
index c1a275502b0b..7a3ec85fb7db 100644
--- a/src/core/dom/stream/response.js
+++ b/src/core/dom/stream/response.js
@@ -1,3 +1,4 @@
+import {devAssert} from '#core/assert';
 import {Deferred} from '#core/data-structures/promise';
 
 /**
@@ -5,17 +6,21 @@ import {Deferred} from '#core/data-structures/promise';
  * Returns a promise that resolves when first bytes are received from the
  * response, or we learn that the response is empty.
  * This function should be replaced with transform stream when well supported.
- * @param {!Window} win
- * @param {!Response} response
- * @param {!./detached.DetachedDomStream} writer
- * @return {!Promise<boolean>} true if response has content, false if
+ * @param {Window} win
+ * @param {Response} response
+ * @param {import('./detached').DetachedDomStream} writer
+ * @return {Promise<boolean>} true if response has content, false if
  * the response is empty.
  */
 export function streamResponseToWriter(win, response, writer) {
   const hasContentDeferred = new Deferred();
   // Try native streaming first.
-  if (win.TextDecoder && win.ReadableStream) {
+  if (
+    /** @type {?} */ (win).TextDecoder &&
+    /** @type {?} */ (win).ReadableStream
+  ) {
     let firstRead = true;
+    devAssert(response.body);
     const reader = response.body.getReader();
     const decoder = new TextDecoder();
 
@@ -36,7 +41,8 @@ export function streamResponseToWriter(win, response, writer) {
       }
 
       if (!done) {
-        return reader.read().then(handleChunk);
+        reader.read().then(handleChunk);
+        return;
       }
 
       writer.close();
diff --git a/src/core/dom/style.js b/src/core/dom/style.js
index 16f219664ce8..f92c6238a870 100644
--- a/src/core/dom/style.js
+++ b/src/core/dom/style.js
@@ -3,19 +3,21 @@ import {devAssert} from '#core/assert';
 import {devError} from '#core/error';
 import {map} from '#core/types/object';
 
-/** @type {Object<string, string>} */
+/** @type {{[key: string]: string}} */
 let propertyNameCache;
 
-/** @const {!Array<string>} */
+/** @const {Array<string>} */
 const vendorPrefixes = ['Webkit', 'webkit', 'Moz', 'moz', 'ms', 'O', 'o'];
 
 const DISPLAY_STYLE_MESSAGE =
   '`display` style detected. You must use toggle instead.';
 
-const EMPTY_CSS_DECLARATION = /** @type {!CSSStyleDeclaration} */ ({
-  'getPropertyPriority': () => '',
-  'getPropertyValue': () => '',
-});
+const EMPTY_CSS_DECLARATION = /** @type {CSSStyleDeclaration} */ (
+  /** @type {?} */ ({
+    'getPropertyPriority': () => '',
+    'getPropertyValue': () => '',
+  })
+);
 
 /**
  * @param {string} camelCase camel cased string
@@ -25,11 +27,28 @@ export function camelCaseToTitleCase(camelCase) {
   return camelCase.charAt(0).toUpperCase() + camelCase.slice(1);
 }
 
+/**
+ * @param {string} camelCase camel cased string
+ * @return {string} hyphen-cased string
+ */
+export function camelCaseToHyphenCase(camelCase) {
+  const hyphenated = camelCase.replace(
+    /[A-Z]/g,
+    (match) => '-' + match.toLowerCase()
+  );
+
+  // For o-foo or ms-foo, we need to convert to -o-foo and ms-foo
+  if (vendorPrefixes.some((prefix) => hyphenated.startsWith(prefix + '-'))) {
+    return `-${hyphenated}`;
+  }
+  return hyphenated;
+}
+
 /**
   Checks the style if a prefixed version of a property exists and returns
  * it or returns an empty string.
  * @private
- * @param {!Object} style
+ * @param {{[key: string]: *}} style
  * @param {string} titleCase the title case version of a css property name
  * @return {string} the prefixed property name or null.
  */
@@ -47,7 +66,7 @@ function getVendorJsPropertyName_(style, titleCase) {
  * Returns the possibly prefixed JavaScript property name of a style property
  * (ex. WebkitTransitionDuration) given a camelCase'd version of the property
  * (ex. transitionDuration).
- * @param {!Object} style
+ * @param {*} style
  * @param {string} camelCase the camel cased version of a css property name
  * @param {boolean=} opt_bypassCache bypass the memoized cache of property
  *   mapping
@@ -58,6 +77,7 @@ export function getVendorJsPropertyName(style, camelCase, opt_bypassCache) {
     // CSS vars are returned as is.
     return camelCase;
   }
+
   if (!propertyNameCache) {
     propertyNameCache = map();
   }
@@ -82,14 +102,14 @@ export function getVendorJsPropertyName(style, camelCase, opt_bypassCache) {
 /**
  * Sets the CSS styles of the specified element with !important. The styles
  * are specified as a map from CSS property names to their values.
- * @param {!Element} element
- * @param {!Object<string, *>} styles
+ * @param {HTMLElement} element
+ * @param {{[key: string]: *}} styles
  */
 export function setImportantStyles(element, styles) {
   const {style} = element;
   for (const k in styles) {
     style.setProperty(
-      getVendorJsPropertyName(style, k),
+      camelCaseToHyphenCase(getVendorJsPropertyName(style, k)),
       String(styles[k]),
       'important'
     );
@@ -98,7 +118,7 @@ export function setImportantStyles(element, styles) {
 
 /**
  * Sets the CSS style of the specified element with optional units, e.g. "px".
- * @param {?Element} element
+ * @param {HTMLElement} element
  * @param {string} property
  * @param {*} value
  * @param {string=} opt_units
@@ -113,19 +133,13 @@ export function setStyle(element, property, value, opt_units, opt_bypassCache) {
   if (!propertyName) {
     return;
   }
-  const styleValue = /** @type {string} */ (
-    opt_units ? value + opt_units : value
-  );
-  if (isVar(propertyName)) {
-    element.style.setProperty(propertyName, styleValue);
-  } else {
-    element.style[propertyName] = styleValue;
-  }
+  const styleValue = opt_units ? value + opt_units : value;
+  element.style.setProperty(camelCaseToHyphenCase(propertyName), styleValue);
 }
 
 /**
  * Returns the value of the CSS style of the specified element.
- * @param {!Element} element
+ * @param {HTMLElement} element
  * @param {string} property
  * @param {boolean=} opt_bypassCache
  * @return {*}
@@ -142,14 +156,14 @@ export function getStyle(element, property, opt_bypassCache) {
   if (isVar(propertyName)) {
     return element.style.getPropertyValue(propertyName);
   }
-  return element.style[propertyName];
+  return /** @type {*} */ (element.style)[propertyName];
 }
 
 /**
  * Sets the CSS styles of the specified element. The styles
  * a specified as a map from CSS property names to their values.
- * @param {!Element} element
- * @param {!Object<string, *>} styles
+ * @param {HTMLElement} element
+ * @param {{[key: string]: *}} styles
  */
 export function setStyles(element, styles) {
   for (const k in styles) {
@@ -162,7 +176,7 @@ export function setStyles(element, styles) {
  * can set the initial display using CSS, YOU MUST.
  * DO NOT USE THIS TO ARBITRARILY SET THE DISPLAY STYLE AFTER INITIAL SETUP.
  *
- * @param {!Element} el
+ * @param {HTMLElement} el
  * @param {string} value
  */
 export function setInitialDisplay(el, value) {
@@ -182,7 +196,7 @@ export function setInitialDisplay(el, value) {
 
 /**
  * Shows or hides the specified element.
- * @param {!Element} element
+ * @param {HTMLElement} element
  * @param {boolean=} opt_display
  */
 export function toggle(element, opt_display) {
@@ -281,19 +295,19 @@ export function removeAlphaFromColor(rgbaColor) {
  * Gets the computed style of the element. The helper is necessary to enforce
  * the possible `null` value returned by a buggy Firefox.
  *
- * @param {!Window} win
- * @param {!Element} el
- * @return {!CSSStyleDeclaration}
+ * @param {Window} win
+ * @param {HTMLElement} el
+ * @return {CSSStyleDeclaration}
  */
 export function computedStyle(win, el) {
-  const style = /** @type {?CSSStyleDeclaration} */ (win.getComputedStyle(el));
+  const style = win.getComputedStyle(el);
   return style || EMPTY_CSS_DECLARATION;
 }
 
 /**
  * Resets styles that were set dynamically (i.e. inline)
- * @param {!Element} element
- * @param {!Array<string>} properties
+ * @param {HTMLElement} element
+ * @param {Array<string>} properties
  */
 export function resetStyles(element, properties) {
   for (let i = 0; i < properties.length; i++) {
@@ -303,8 +317,8 @@ export function resetStyles(element, properties) {
 
 /**
  * Propagates the object-fit/position element attributes as styles.
- * @param {!Element} fromEl ie: amp-img
- * @param {!Element} toEl ie: the img within amp-img
+ * @param {HTMLElement} fromEl ie: amp-img
+ * @param {HTMLElement} toEl ie: the img within amp-img
  */
 export function propagateObjectFitStyles(fromEl, toEl) {
   if (fromEl.hasAttribute('object-fit')) {
@@ -352,8 +366,8 @@ export function assertNotDisplay(style) {
  * If you wish to set `display`, use the `toggle` helper instead. This is so
  * changes to display can trigger necessary updates. See #17475.
  *
- * @param {!Object<string, *>} styles
- * @return {!Object<string, *>}
+ * @param {{[key: string]: *}} styles
+ * @return {{[key: string]: *}}
  */
 export function assertDoesNotContainDisplay(styles) {
   if ('display' in styles) {
diff --git a/src/core/dom/transition.js b/src/core/dom/transition.js
index 35f9774d24f7..3e7a5b49af90 100644
--- a/src/core/dom/transition.js
+++ b/src/core/dom/transition.js
@@ -14,19 +14,19 @@ import {
  * dip above 1 or below 0. This is an acceptable case for some curves. The
  * second argument is a boolean value that equals "true" for the completed
  * transition and "false" for ongoing.
- * @typedef {function(number, boolean):?|function(number):?}
+ * @template T
+ * @typedef {function(number, boolean=):T} TransitionDef
  */
-let TransitionDef;
 
-/** @type {!TransitionDef<null>} */
+/** @type {TransitionDef<null>} */
 export const NOOP = (unusedTime) => null;
 
 /**
  * Returns a transition that combines the string result of other string-based
  * transitions such as transform and scale using the given opt_delimiter.
- * @param {!Array<!TransitionDef<string>>} transitions
+ * @param {Array<TransitionDef<string>>} transitions
  * @param {string=} opt_delimiter Defaults to a single whitespace.
- * @return {!TransitionDef<string>}
+ * @return {TransitionDef<string>}
  */
 export function concat(transitions, opt_delimiter = ' ') {
   return (time, complete) =>
@@ -40,9 +40,9 @@ export function concat(transitions, opt_delimiter = ' ') {
  * A transition that sets the CSS style of the specified element. The styles
  * a specified as a map from CSS property names to transition functions for
  * each of these properties.
- * @param {!Element} element
- * @param {!Object<string, !TransitionDef>} styles
- * @return {!TransitionDef<void>}
+ * @param {HTMLElement} element
+ * @param {{[key:string]: TransitionDef<?>}} styles
+ * @return {TransitionDef<void>}
  */
 export function setStyles(element, styles) {
   return (time, complete) => {
@@ -56,7 +56,7 @@ export function setStyles(element, styles) {
  * A basic numeric interpolation.
  * @param {number} start
  * @param {number} end
- * @return {!TransitionDef<number>}
+ * @return {TransitionDef<number>}
  */
 export function numeric(start, end) {
   return (time) => start + (end - start) * time;
@@ -64,8 +64,8 @@ export function numeric(start, end) {
 
 /**
  * Adds "px" units.
- * @param {!TransitionDef<number>} transition
- * @return {!TransitionDef<string>}
+ * @param {TransitionDef<number>} transition
+ * @return {TransitionDef<string>}
  */
 export function px(transition) {
   return (time) => stylePx(transition(time));
@@ -73,9 +73,9 @@ export function px(transition) {
 
 /**
  * A transition for "translate(x, y)" of CSS "transform" property.
- * @param {!TransitionDef<number|string>} transitionX
- * @param {!TransitionDef<number|string>|undefined} opt_transitionY
- * @return {!TransitionDef<string>}
+ * @param {TransitionDef<number|string>} transitionX
+ * @param {TransitionDef<number|string>|undefined} opt_transitionY
+ * @return {TransitionDef<string>}
  */
 export function translate(transitionX, opt_transitionY) {
   return (time) => styleTranslate(transitionX(time), opt_transitionY?.(time));
@@ -83,8 +83,8 @@ export function translate(transitionX, opt_transitionY) {
 
 /**
  * A transition for "scale" of CSS "transform" property.
- * @param {!TransitionDef<number|string>} transition
- * @return {!TransitionDef<string>}
+ * @param {TransitionDef<number|string>} transition
+ * @return {TransitionDef<string>}
  */
 export function scale(transition) {
   return (time) => styleScale(transition(time));
diff --git a/src/core/dom/video/globals.d.ts b/src/core/dom/video/globals.d.ts
new file mode 100644
index 000000000000..697fa7bbdda7
--- /dev/null
+++ b/src/core/dom/video/globals.d.ts
@@ -0,0 +1,8 @@
+export {};
+
+declare global {
+  interface Window {
+    // Used for storing whether or not the browser supports autoplay.
+    __AMP_AUTOPLAY?: Promise<boolean>;
+  }
+}
diff --git a/src/core/dom/video/index.js b/src/core/dom/video/index.js
index 29115ade5969..eae73cdb931b 100644
--- a/src/core/dom/video/index.js
+++ b/src/core/dom/video/index.js
@@ -4,15 +4,15 @@ import {setStyles} from '#core/dom/style';
 import {devExpectedError} from '#core/error';
 
 /**
- * @param {!Window} win
- * @return {!Promise<boolean>}
+ * @param {Window} win
+ * @return {Promise<boolean>}
  */
 export function detectIsAutoplaySupported(win) {
   // To detect autoplay, we create a video element and call play on it, if
   // `paused` is true after `play()` call, autoplay is supported. Although
   // this is unintuitive, it works across browsers and is currently the lightest
   // way to detect autoplay without using a data source.
-  const detectionElement = /** @type {!HTMLVideoElement} */ (
+  const detectionElement = /** @type {HTMLVideoElement} */ (
     win.document.createElement('video')
   );
 
@@ -26,8 +26,8 @@ export function detectIsAutoplaySupported(win) {
 
   detectionElement.muted = true;
   detectionElement.playsInline = true;
-  detectionElement['playsinline'] = true;
-  detectionElement['webkitPlaysinline'] = true;
+  /** @type {*} */ (detectionElement)['playsinline'] = true;
+  /** @type {*} */ (detectionElement)['webkitPlaysinline'] = true;
 
   setStyles(detectionElement, {
     position: 'fixed',
@@ -52,18 +52,18 @@ const AUTOPLAY_SUPPORTED_WIN_PROP = '__AMP_AUTOPLAY';
  * autoplay to save data / battery. This detects both platfrom support and
  * when autoplay has been disabled by the user.
  *
- * @param {!Window} win
- * @return {!Promise<boolean>}
+ * @param {Window} win
+ * @return {Promise<boolean>}
  */
 export function isAutoplaySupported(win) {
   if (win[AUTOPLAY_SUPPORTED_WIN_PROP] == null) {
     win[AUTOPLAY_SUPPORTED_WIN_PROP] = detectIsAutoplaySupported(win);
   }
-  return win[AUTOPLAY_SUPPORTED_WIN_PROP];
+  return /** @type {Promise<boolean>} */ (win[AUTOPLAY_SUPPORTED_WIN_PROP]);
 }
 
 /**
- * @param {!Window} win
+ * @param {Window} win
  * @visibleForTesting
  */
 export function resetIsAutoplaySupported(win) {
@@ -71,11 +71,13 @@ export function resetIsAutoplaySupported(win) {
 }
 
 /**
- * @param {!Element} element
- * @return {!Element}
+ * @param {Element} element
+ * @return {Element}
  */
 export function getInternalVideoElementFor(element) {
-  return devAssertElement(element.querySelector('video, iframe'));
+  const el = element.querySelector('video, iframe');
+  devAssertElement(el);
+  return el;
 }
 
 /**
@@ -89,9 +91,9 @@ let VideoOrBaseElementPlayableDef;
  * Tries to play the media element, marking any rejected error as an expected
  * error for reproting.
  *
- * @param {!HTMLMediaElement|VideoOrBaseElementPlayableDef} element
+ * @param {HTMLMediaElement|VideoOrBaseElementPlayableDef} element
  * @param {boolean=} isAutoplay
- * @return {Promise<undefined>}
+ * @return {Promise<void>}
  */
 export function tryPlay(element, isAutoplay) {
   // Some browsers return undefined, some a boolean, and some a real promise.
@@ -109,7 +111,7 @@ export function tryPlay(element, isAutoplay) {
 /**
  * Plays the media element, discarding any error without reporting it.
  *
- * @param {!HTMLMediaElement} element
+ * @param {HTMLMediaElement} element
  */
 export function playIgnoringError(element) {
   // Some browsers return undefined, some a boolean, and some a real promise.
diff --git a/src/core/dom/video/pause-helper.js b/src/core/dom/video/pause-helper.js
index 2d84922c6269..0047a91f12f0 100644
--- a/src/core/dom/video/pause-helper.js
+++ b/src/core/dom/video/pause-helper.js
@@ -5,13 +5,13 @@ import {
 
 export class PauseHelper {
   /**
-   * @param {!AmpElement} element
+   * @param {HTMLElement & IPausable} element
    */
   constructor(element) {
     /**
      * @private
      * @const
-     * @type {!AmpElement}
+     * @type {HTMLElement & IPausable}
      */
     this.element_ = element;
 
@@ -44,7 +44,7 @@ export class PauseHelper {
   }
 
   /**
-   * @param {!ResizeObserverSize} size
+   * @param {ResizeObserverSize} size
    * @private
    */
   pauseWhenNoSize_({blockSize, inlineSize}) {
@@ -54,7 +54,6 @@ export class PauseHelper {
     }
     this.hasSize_ = hasSize;
 
-    /** @type {!PausableInterface} */
     const element = this.element_;
     if (!hasSize) {
       element.pause();
diff --git a/src/core/dom/video/video.extern.js b/src/core/dom/video/video.extern.js
deleted file mode 100644
index 85e5e7bacbff..000000000000
--- a/src/core/dom/video/video.extern.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * @fileoverview Expected types and properties for handling video-related
- * components and features
- * @externs
- */
-
-/** @type {undefined|boolean} */
-HTMLVideoElement.prototype.playsInline;
diff --git a/src/core/dom/web-components.extern.js b/src/core/dom/web-components.extern.js
deleted file mode 100644
index 712f1d643d92..000000000000
--- a/src/core/dom/web-components.extern.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * @fileoverview Externs for values expected to be on elements when Shadow DOM
- * is supported.
- * @externs
- */
-
-Element.prototype.attachShadow;
-Element.prototype.createShadowRoot;
diff --git a/src/core/dom/web-components.js b/src/core/dom/web-components.js
index b77a9ead1402..8546754ad530 100644
--- a/src/core/dom/web-components.js
+++ b/src/core/dom/web-components.js
@@ -2,14 +2,14 @@
  * Possible versions of Shadow DOM spec
  * @enum {string}
  */
-export const ShadowDomVersion = {
+export const ShadowDomVersion_Enum = {
   NONE: 'none',
   V0: 'v0',
   V1: 'v1',
 };
 
 /**
- * @type {!ShadowDomVersion|undefined}
+ * @type {ShadowDomVersion_Enum|undefined}
  * @visibleForTesting
  */
 let shadowDomSupportedVersion;
@@ -21,7 +21,7 @@ let shadowDomSupportedVersion;
 let shadowCssSupported;
 
 /**
- * @param {!ShadowDomVersion|undefined} val
+ * @param {ShadowDomVersion_Enum|undefined} val
  * @visibleForTesting
  */
 export function setShadowDomSupportedVersionForTesting(val) {
@@ -41,7 +41,7 @@ export function setShadowCssSupportedForTesting(val) {
  * @return {boolean}
  */
 export function isShadowDomSupported() {
-  return getShadowDomSupportedVersion() != ShadowDomVersion.NONE;
+  return getShadowDomSupportedVersion() != ShadowDomVersion_Enum.NONE;
 }
 
 /**
@@ -49,12 +49,22 @@ export function isShadowDomSupported() {
  * @return {boolean}
  */
 export function isShadowCssSupported() {
-  if (shadowCssSupported === undefined) {
+  if (shadowCssSupported !== undefined) {
+    return shadowCssSupported;
+  }
+
+  if (!isShadowDomSupported()) {
+    shadowCssSupported = false;
+  } else {
+    const shadowRoot =
+      getShadowDomSupportedVersion() === ShadowDomVersion_Enum.V0
+        ? self.document.createElement('div').createShadowRoot()
+        : self.document.createElement('div').attachShadow({mode: 'open'});
+
     shadowCssSupported =
-      isShadowDomSupported() &&
-      (isNative(Element.prototype.attachShadow) ||
-        isNative(Element.prototype.createShadowRoot));
+      isNative(ShadowRoot) && shadowRoot instanceof ShadowRoot;
   }
+
   return shadowCssSupported;
 }
 
@@ -72,7 +82,7 @@ function isNative(func) {
 /**
  * Returns the supported version of Shadow DOM spec.
  * @param {typeof Element=} opt_elementClass optional for testing
- * @return {!ShadowDomVersion}
+ * @return {ShadowDomVersion_Enum}
  */
 export function getShadowDomSupportedVersion(opt_elementClass) {
   if (shadowDomSupportedVersion === undefined) {
@@ -86,14 +96,14 @@ export function getShadowDomSupportedVersion(opt_elementClass) {
 /**
  * Returns shadow dom version.
  *
- * @param {!typeof Element} element
- * @return {!ShadowDomVersion}
+ * @param {typeof Element} element
+ * @return {ShadowDomVersion_Enum}
  */
 function getShadowDomVersion(element) {
   if (!!element.prototype.attachShadow) {
-    return ShadowDomVersion.V1;
+    return ShadowDomVersion_Enum.V1;
   } else if (!!element.prototype.createShadowRoot) {
-    return ShadowDomVersion.V0;
+    return ShadowDomVersion_Enum.V0;
   }
-  return ShadowDomVersion.NONE;
+  return ShadowDomVersion_Enum.NONE;
 }
diff --git a/src/core/error/error.extern.js b/src/core/error/error.extern.js
deleted file mode 100644
index ca56c9749179..000000000000
--- a/src/core/error/error.extern.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @fileoverview Externs for extra properties expected on errors.
- * @externs
- */
-
-/**
- * Array of strings and values used to construct an error message, so that when
- * it's logged to the console the output can be inspected.
- * @type {undefined|Array<*>}
- */
-Error.prototype.messageArray;
-
-/**
- * Flag to mark "expected" failure cases (ex. an operation failing due to a
- * known browser setting blocking access to `localStorage`).
- * @type {undefined|boolean}
- */
-Error.prototype.expected;
diff --git a/src/core/error/index.js b/src/core/error/index.js
index 40bfae5970e8..0d862527e19b 100644
--- a/src/core/error/index.js
+++ b/src/core/error/index.js
@@ -1,7 +1,7 @@
 /**
  * Some exceptions (DOMException, namely) have read-only message.
- * @param {!Error} error
- * @return {!Error}
+ * @param {Error} error
+ * @return {Error}
  */
 export function duplicateErrorIfNecessary(error) {
   const messageProperty = Object.getOwnPropertyDescriptor(error, 'message');
@@ -13,7 +13,7 @@ export function duplicateErrorIfNecessary(error) {
   const e = new Error(message);
   // Copy all the extraneous things we attach.
   for (const prop in error) {
-    e[prop] = error[prop];
+    /** @type {*} */ (e)[prop] = /** @type {*} */ (error)[prop];
   }
   // Ensure these are copied.
   e.stack = stack;
@@ -23,7 +23,7 @@ export function duplicateErrorIfNecessary(error) {
 /**
  * Creates an error object.
  * @param {...*} var_args
- * @return {!Error}
+ * @return {Error}
  */
 export function createError(var_args) {
   let error = null;
@@ -49,7 +49,7 @@ export function createError(var_args) {
 
 /**
  * Reports an error, if the global error reporting function is defined.
- * @param {!Error} error
+ * @param {Error} error
  */
 function maybeReportError(error) {
   self.__AMP_REPORT_ERROR?.(error);
@@ -76,8 +76,8 @@ export function rethrowAsync(var_args) {
  * asynchronously.
  *
  * @param {function(S):T} callback
- * @param {S} args
- * @return {T}
+ * @param {...S} args
+ * @return {T|undefined}
  * @template T
  * @template S
  */
@@ -92,7 +92,7 @@ export function tryCallback(callback, ...args) {
 /**
  * Creates an error object with its expected property set to true.
  * @param {...*} var_args
- * @return {!Error}
+ * @return {Error}
  */
 export function createExpectedError(var_args) {
   const error = createError.apply(null, arguments);
diff --git a/src/core/error/message-helpers.js b/src/core/error/message-helpers.js
index 7139239b0dd9..7daa748e9bdc 100644
--- a/src/core/error/message-helpers.js
+++ b/src/core/error/message-helpers.js
@@ -6,14 +6,10 @@ import {isElement} from '#core/types';
  * This is added to user error messages, so that we can later identify
  * them, when the only thing that we have is the message. This is the
  * case in many browsers when the global exception handler is invoked.
- *
- * @const {string}
  */
 export const USER_ERROR_SENTINEL = '\u200B\u200B\u200B';
 /**
  * Four zero width space.
- *
- * @const {string}
  */
 export const USER_ERROR_EMBED_SENTINEL = '\u200B\u200B\u200B\u200B';
 
diff --git a/src/core/globals.d.ts b/src/core/globals.d.ts
new file mode 100644
index 000000000000..b1e958664451
--- /dev/null
+++ b/src/core/globals.d.ts
@@ -0,0 +1,8 @@
+import './amp-globals.d';
+
+declare global {
+  interface Window {
+    // Global property set by test some harnesses to signal karma testing environment.
+    __karma__?: boolean;
+  }
+}
diff --git a/src/core/json-schema.ts b/src/core/json-schema.ts
new file mode 100644
index 000000000000..d3d06df1a323
--- /dev/null
+++ b/src/core/json-schema.ts
@@ -0,0 +1,14 @@
+/**
+ * Validates that a string value is a currency code listed in
+ * ISO 4217.
+ * To use in imported JSON Schemas, see instructions on
+ * build-system/compile/json-schema/README.md
+ */
+export function isIso4217CurrencyCode(data: any): boolean {
+  try {
+    Intl.NumberFormat('en-EN', {currency: data}).format(0);
+    return true;
+  } catch {
+    return false;
+  }
+}
diff --git a/src/core/mode/globals.d.ts b/src/core/mode/globals.d.ts
new file mode 100644
index 000000000000..004da1eb33de
--- /dev/null
+++ b/src/core/mode/globals.d.ts
@@ -0,0 +1,11 @@
+/* eslint-disable local/no-forbidden-terms */
+export {};
+
+declare global {
+  var IS_ESM: boolean;
+  var IS_MINIFIED: boolean;
+  var IS_PROD: boolean;
+  var INTERNAL_RUNTIME_VERSION: string;
+  var AMP_STORY_SUPPORTED_LANGUAGES: string[];
+  var IS_SSR_CSS: boolean;
+}
diff --git a/src/core/mode/index.js b/src/core/mode/index.js
index 5b893df377fe..ae51b4903b78 100644
--- a/src/core/mode/index.js
+++ b/src/core/mode/index.js
@@ -4,3 +4,4 @@ export {isMinified} from './minified';
 export {isTest} from './test';
 export {version} from './version';
 export {isEsm} from './esm';
+export {isSsrCss} from './ssr-css';
diff --git a/src/core/mode/local-dev.js b/src/core/mode/local-dev.js
index 14f166f69220..653b9870b85e 100644
--- a/src/core/mode/local-dev.js
+++ b/src/core/mode/local-dev.js
@@ -5,7 +5,7 @@ import {isTest} from './test';
  * Returns true if executing in a local development or testing environment.
  * Calls may be DCE'd when compiled based on isForDistribution and isTest.
  *
- * @param {!Window=} opt_win
+ * @param {Window=} opt_win
  * @return {boolean}
  */
 export function isLocalDev(opt_win) {
diff --git a/src/core/mode/ssr-css.js b/src/core/mode/ssr-css.js
new file mode 100644
index 000000000000..04e6f55b0142
--- /dev/null
+++ b/src/core/mode/ssr-css.js
@@ -0,0 +1,10 @@
+/**
+ * Returns true when compiling a binary that is optimized for Server Side
+ * Rendering with out CSS strings.
+ * This is a magic constant that is replaced by babel.
+ *
+ * @return {boolean}
+ */
+export function isSsrCss() {
+  return IS_SSR_CSS;
+}
diff --git a/src/core/mode/test.js b/src/core/mode/test.js
index 883268532637..b23125870e61 100644
--- a/src/core/mode/test.js
+++ b/src/core/mode/test.js
@@ -3,7 +3,7 @@ import {isProd} from './prod';
 /**
  * Returns true if executing in a testing environment. Calls may be DCE'd when
  * compiled based on isForDistribution.
- * @param {!Window=} opt_win
+ * @param {Window=} opt_win
  * @return {boolean}
  */
 export function isTest(opt_win) {
diff --git a/src/core/static-layout.js b/src/core/static-layout.js
index 658895dcc17f..be1c9e8c226d 100644
--- a/src/core/static-layout.js
+++ b/src/core/static-layout.js
@@ -1,6 +1,12 @@
-import {devAssert, devAssertString, userAssert} from '#core/assert';
 import {
-  Layout,
+  devAssert,
+  devAssertElement,
+  devAssertNumber,
+  devAssertString,
+  userAssert,
+} from '#core/assert';
+import {
+  Layout_Enum,
   getLayoutClass,
   getLengthNumeral,
   getLengthUnits,
@@ -18,13 +24,12 @@ import {setStyle, setStyles, toggle} from '#core/dom/style';
  * `hasNaturalDimensions` checks for membership in this set.
  * `getNaturalDimensions` determines the dimensions for an element in the
  *    set and caches it.
- * @type {!Object<string, ?./dom/layout/index.DimensionsDef>}
- * @private  Visible for testing only!
+ * @type {{[key: string]: ?import('./dom/layout').DimensionsDef}}
+ * @private  Visible for testing only
  */
 export const naturalDimensions_ = {
   'AMP-PIXEL': {width: '0px', height: '0px'},
   'AMP-ANALYTICS': {width: '1px', height: '1px'},
-  // TODO(dvoytenko): audio should have width:auto.
   'AMP-AUDIO': null,
   'AMP-SOCIAL-SHARE': {width: '60px', height: '44px'},
 };
@@ -45,8 +50,8 @@ export function hasNaturalDimensions(tagName) {
  * different browser implementations, like <audio> for instance.
  * This operation can only be completed for an element allowlisted by
  * `hasNaturalDimensions`.
- * @param {!Element} element
- * @return {./dom/layout/index.DimensionsDef}
+ * @param {Element} element
+ * @return {import('./dom/layout').DimensionsDef}
  */
 export function getNaturalDimensions(element) {
   const tagName = element.tagName.toUpperCase();
@@ -54,9 +59,7 @@ export function getNaturalDimensions(element) {
   if (!naturalDimensions_[tagName]) {
     const doc = element.ownerDocument;
     const naturalTagName = tagName.replace(/^AMP\-/, '');
-    const temp = /** @type {!HTMLElement} */ (
-      doc.createElement(naturalTagName)
-    );
+    const temp = /** @type {HTMLElement} */ (doc.createElement(naturalTagName));
 
     // For audio, should no-op elsewhere.
     /** @type {HTMLAudioElement} */ (temp).controls = true;
@@ -72,7 +75,8 @@ export function getNaturalDimensions(element) {
     };
     doc.body.removeChild(temp);
   }
-  return /** @type {./dom/layout/index.DimensionsDef} */ (
+
+  return /** @type {import('./dom/layout').DimensionsDef} */ (
     naturalDimensions_[tagName]
   );
 }
@@ -90,8 +94,8 @@ export function getNaturalDimensions(element) {
  * any changes made to it must be made in coordination with caches that
  * implement SSR. For more information on SSR see bit.ly/amp-ssr.
  *
- * @param {!AmpElement} element
- * @return {!Layout}
+ * @param {AmpElement} element
+ * @return {Layout_Enum}
  */
 export function applyStaticLayout(element) {
   // Check if the layout has already been done by server-side rendering or
@@ -100,18 +104,20 @@ export function applyStaticLayout(element) {
   // making changes here.
   const completedLayoutAttr = element.getAttribute('i-amphtml-layout');
   if (completedLayoutAttr) {
-    const layout = /** @type {!Layout} */ (
-      devAssert(parseLayout(completedLayoutAttr))
-    );
+    const layout = parseLayout(completedLayoutAttr);
+    devAssert(layout);
+
     if (
-      (layout == Layout.RESPONSIVE || layout == Layout.INTRINSIC) &&
+      (layout == Layout_Enum.RESPONSIVE || layout == Layout_Enum.INTRINSIC) &&
       element.firstElementChild
     ) {
       // Find sizer, but assume that it might not have been parsed yet.
       element.sizerElement =
-        element.querySelector('i-amphtml-sizer') || undefined;
+        /** @type {?HTMLElement} */ (
+          element.querySelector('i-amphtml-sizer')
+        ) || undefined;
       element.sizerElement?.setAttribute('slot', 'i-amphtml-svc');
-    } else if (layout == Layout.NODISPLAY) {
+    } else if (layout == Layout_Enum.NODISPLAY) {
       toggle(element, false);
     }
     return layout;
@@ -127,27 +133,30 @@ export function applyStaticLayout(element) {
   if (isLayoutSizeDefined(layout)) {
     element.classList.add('i-amphtml-layout-size-defined');
   }
-  if (layout == Layout.NODISPLAY) {
+  if (layout == Layout_Enum.NODISPLAY) {
     // CSS defines layout=nodisplay automatically with `display:none`. Thus
     // no additional styling is needed.
     toggle(element, false);
-  } else if (layout == Layout.FIXED) {
+  } else if (layout == Layout_Enum.FIXED) {
     setStyles(element, {
       width: devAssertString(width),
       height: devAssertString(height),
     });
-  } else if (layout == Layout.FIXED_HEIGHT) {
+  } else if (layout == Layout_Enum.FIXED_HEIGHT) {
     setStyle(element, 'height', devAssertString(height));
-  } else if (layout == Layout.RESPONSIVE) {
+  } else if (layout == Layout_Enum.RESPONSIVE) {
     const sizer = element.ownerDocument.createElement('i-amphtml-sizer');
     sizer.setAttribute('slot', 'i-amphtml-svc');
+    const heightNumeral = getLengthNumeral(height);
+    const widthNumeral = getLengthNumeral(width);
+    devAssertNumber(heightNumeral);
+    devAssertNumber(widthNumeral);
     setStyles(sizer, {
-      paddingTop:
-        (getLengthNumeral(height) / getLengthNumeral(width)) * 100 + '%',
+      paddingTop: (heightNumeral / widthNumeral) * 100 + '%',
     });
     element.insertBefore(sizer, element.firstChild);
     element.sizerElement = sizer;
-  } else if (layout == Layout.INTRINSIC) {
+  } else if (layout == Layout_Enum.INTRINSIC) {
     // Intrinsic uses an svg inside the sizer element rather than the padding
     // trick Note a naked svg won't work because other things expect the
     // i-amphtml-sizer element
@@ -157,19 +166,20 @@ export function applyStaticLayout(element) {
              class="i-amphtml-intrinsic-sizer" />
       </i-amphtml-sizer>`;
     const intrinsicSizer = sizer.firstElementChild;
+    devAssertElement(intrinsicSizer);
     intrinsicSizer.setAttribute(
       'src',
       `data:image/svg+xml;charset=utf-8,<svg height="${height}" width="${width}" xmlns="http://www.w3.org/2000/svg" version="1.1"/>`
     );
     element.insertBefore(sizer, element.firstChild);
     element.sizerElement = sizer;
-  } else if (layout == Layout.FILL) {
+  } else if (layout == Layout_Enum.FILL) {
     // Do nothing.
-  } else if (layout == Layout.CONTAINER) {
+  } else if (layout == Layout_Enum.CONTAINER) {
     // Do nothing. Elements themselves will check whether the supplied
     // layout value is acceptable. In particular container is only OK
     // sometimes.
-  } else if (layout == Layout.FLEX_ITEM) {
+  } else if (layout == Layout_Enum.FLEX_ITEM) {
     // Set height and width to a flex item if they exist.
     // The size set to a flex item could be overridden by `display: flex` later.
     if (width) {
@@ -178,7 +188,7 @@ export function applyStaticLayout(element) {
     if (height) {
       setStyle(element, 'height', height);
     }
-  } else if (layout == Layout.FLUID) {
+  } else if (layout == Layout_Enum.FLUID) {
     element.classList.add('i-amphtml-layout-awaiting-size');
     if (width) {
       setStyle(element, 'width', width);
@@ -194,12 +204,12 @@ export function applyStaticLayout(element) {
 /**
  * Gets the effective layout for an element.
  *
- * @param {!Element} element
- * @return {!Layout}
+ * @param {Element} element
+ * @return {Layout_Enum}
  */
 export function getEffectiveLayout(element) {
   // Return the pre-existing value if layout has already been applied.
-  const completedLayout = parseLayout(element.getAttribute('layout'));
+  const completedLayout = parseLayout(element.getAttribute('layout') ?? '');
   if (completedLayout) {
     return completedLayout;
   }
@@ -209,9 +219,9 @@ export function getEffectiveLayout(element) {
 
 /**
  * @typedef {{
- *  layout: !Layout,
- *  height: (string|number|null),
- *  width: (string|number|null)
+ *  layout: !Layout_Enum,
+ *  height: (string|number|null|undefined),
+ *  width: (string|number|null|undefined)
  * }}
  */
 let InternalEffectiveLayoutDef;
@@ -222,7 +232,7 @@ let InternalEffectiveLayoutDef;
  * If class 'i-amphtml-layout' is present, then directly use its value.
  * Else calculate layout based on element attributes and return the width/height.
  *
- * @param {!Element} element
+ * @param {Element} element
  * @return {InternalEffectiveLayoutDef}
  */
 function getEffectiveLayoutInternal(element) {
@@ -241,7 +251,10 @@ function getEffectiveLayoutInternal(element) {
     layoutAttr,
     element
   );
-  /** @const {string|null|undefined} */
+  /**
+   * @type {string|null|undefined}
+   * @const
+   */
   const inputWidth =
     widthAttr && widthAttr != 'auto' ? parseLength(widthAttr) : widthAttr;
   userAssert(
@@ -250,7 +263,10 @@ function getEffectiveLayoutInternal(element) {
     widthAttr,
     element
   );
-  /** @const {string|null|undefined} */
+  /**
+   * @type {string|null|undefined}
+   * @const
+   */
   const inputHeight =
     heightAttr && heightAttr != 'fluid' ? parseLength(heightAttr) : heightAttr;
   userAssert(
@@ -268,8 +284,8 @@ function getEffectiveLayoutInternal(element) {
   // Calculate effective width and height.
   if (
     (!inputLayout ||
-      inputLayout == Layout.FIXED ||
-      inputLayout == Layout.FIXED_HEIGHT) &&
+      inputLayout == Layout_Enum.FIXED ||
+      inputLayout == Layout_Enum.FIXED_HEIGHT) &&
     (!inputWidth || !inputHeight) &&
     hasNaturalDimensions(element.tagName)
   ) {
@@ -277,7 +293,7 @@ function getEffectiveLayoutInternal(element) {
     // width/height and are defined to have natural browser dimensions.
     const dimensions = getNaturalDimensions(element);
     width =
-      inputWidth || inputLayout == Layout.FIXED_HEIGHT
+      inputWidth || inputLayout == Layout_Enum.FIXED_HEIGHT
         ? inputWidth
         : dimensions.width;
     height = inputHeight || dimensions.height;
@@ -290,26 +306,26 @@ function getEffectiveLayoutInternal(element) {
   if (inputLayout) {
     layout = inputLayout;
   } else if (!width && !height) {
-    layout = Layout.CONTAINER;
+    layout = Layout_Enum.CONTAINER;
   } else if (height == 'fluid') {
-    layout = Layout.FLUID;
+    layout = Layout_Enum.FLUID;
   } else if (height && (!width || width == 'auto')) {
-    layout = Layout.FIXED_HEIGHT;
+    layout = Layout_Enum.FIXED_HEIGHT;
   } else if (height && width && (sizesAttr || heightsAttr)) {
-    layout = Layout.RESPONSIVE;
+    layout = Layout_Enum.RESPONSIVE;
   } else {
-    layout = Layout.FIXED;
+    layout = Layout_Enum.FIXED;
   }
 
   if (
-    layout == Layout.FIXED ||
-    layout == Layout.FIXED_HEIGHT ||
-    layout == Layout.RESPONSIVE ||
-    layout == Layout.INTRINSIC
+    layout == Layout_Enum.FIXED ||
+    layout == Layout_Enum.FIXED_HEIGHT ||
+    layout == Layout_Enum.RESPONSIVE ||
+    layout == Layout_Enum.INTRINSIC
   ) {
     userAssert(height, 'The "height" attribute is missing: %s', element);
   }
-  if (layout == Layout.FIXED_HEIGHT) {
+  if (layout == Layout_Enum.FIXED_HEIGHT) {
     userAssert(
       !width || width == 'auto',
       'The "width" attribute must be missing or "auto": %s',
@@ -317,9 +333,9 @@ function getEffectiveLayoutInternal(element) {
     );
   }
   if (
-    layout == Layout.FIXED ||
-    layout == Layout.RESPONSIVE ||
-    layout == Layout.INTRINSIC
+    layout == Layout_Enum.FIXED ||
+    layout == Layout_Enum.RESPONSIVE ||
+    layout == Layout_Enum.INTRINSIC
   ) {
     userAssert(
       width && width != 'auto',
@@ -328,7 +344,7 @@ function getEffectiveLayoutInternal(element) {
     );
   }
 
-  if (layout == Layout.RESPONSIVE || layout == Layout.INTRINSIC) {
+  if (layout == Layout_Enum.RESPONSIVE || layout == Layout_Enum.INTRINSIC) {
     userAssert(
       getLengthUnits(width) == getLengthUnits(height),
       'Length units should be the same for "width" and "height": %s, %s, %s',
diff --git a/src/core/tsconfig.json b/src/core/tsconfig.json
new file mode 100644
index 000000000000..d2f6cd4ee8cd
--- /dev/null
+++ b/src/core/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "include": ["**/*.js", "**/*.d.ts"]
+}
diff --git a/src/core/types/array.js b/src/core/types/array.js
index 1a66325d027d..3c88c4fe4648 100644
--- a/src/core/types/array.js
+++ b/src/core/types/array.js
@@ -1,7 +1,7 @@
 /**
  * Converts an array-like object to an array.
- * @param {?IArrayLike<T>|string} arrayLike
- * @return {!Array<T>}
+ * @param {?ArrayLike<T>|string} arrayLike
+ * @return {Array<T>}
  * @template T
  */
 export function toArray(arrayLike) {
@@ -11,7 +11,7 @@ export function toArray(arrayLike) {
 /**
  * Determines if value is actually an Array.
  * @param {*} value
- * @return {boolean}
+ * @return {value is Array}
  */
 export const {isArray} = Array;
 
@@ -23,23 +23,23 @@ export const {isArray} = Array;
  * with declared type {string|!Array<string>} and return a value with a type of
  * {!Array<string|Array<string>>}.
  *
- * @param {!Array<T>|S} arrayOrSingleItem
- * @return {!Array<T>|!Array<S>}
+ * @param {Array<T>|S} arrayOrSingleItem
+ * @return {Array<T>|Array<S>}
  * @template S
  * @template T
  */
 export function arrayOrSingleItemToArray(arrayOrSingleItem) {
   return isArray(arrayOrSingleItem)
-    ? /** @type {!Array<T>} */ (arrayOrSingleItem)
-    : [/** @type {!S} */ (arrayOrSingleItem)];
+    ? /** @type {Array<T>} */ (arrayOrSingleItem)
+    : [/** @type {S} */ (arrayOrSingleItem)];
 }
 
 /**
  * Compares if two arrays contains exactly same elements of same number
  * of same order. Note that it does NOT handle NaN case as expected.
  *
- * @param {!Array<T>} arr1
- * @param {!Array<T>} arr2
+ * @param {Array<T>} arr1
+ * @param {Array<T>} arr2
  * @return {boolean}
  * @template T
  */
@@ -58,9 +58,9 @@ export function areEqualOrdered(arr1, arr2) {
 /**
  * Removes elements that shouldRemove returns true for from the array.
  *
- * @param {!Array<T>} array
- * @param {function(T, number, !Array<T>):boolean} shouldRemove
- * @return {!Array<T>}
+ * @param {Array<T>} array
+ * @param {function(T, number, Array<T>):boolean} shouldRemove
+ * @return {Array<T>}
  * @template T
  */
 export function remove(array, shouldRemove) {
@@ -87,8 +87,8 @@ export function remove(array, shouldRemove) {
  * Returns the index of the first element matching the predicate.
  * Like Array#findIndex.
  *
- * @param {!Array<T>} array
- * @param {function(T, number, !Array<T>):boolean} predicate
+ * @param {Array<T>} array
+ * @param {function(T, number, Array<T>):boolean} predicate
  * @return {number}
  * @template T
  */
@@ -104,7 +104,7 @@ export function findIndex(array, predicate) {
 /**
  * Converts the given iterator to an array.
  *
- * @param {!Iterator<T>} iterator
+ * @param {Iterator<T>} iterator
  * @return {Array<T>}
  * @template T
  */
@@ -136,7 +136,7 @@ export function pushIfNotExist(array, item) {
  * Removes the first matching item in the array. Returns `true` if the array
  * has changed.
  *
- * @param {!Array<T>} array
+ * @param {Array<T>} array
  * @param {T} item
  * @return {boolean}
  * @template T
diff --git a/src/core/types/date.js b/src/core/types/date.js
index 2997ed0238b8..3ec02fd7170a 100644
--- a/src/core/types/date.js
+++ b/src/core/types/date.js
@@ -4,9 +4,8 @@ import {isString} from './string';
 
 /**
  * Absolute time in milliseconds.
- * @typedef {number}
+ * @typedef {number} TimestampDef
  */
-export let TimestampDef;
 
 /**
  * Parses the date using the `Date.parse()` rules. Additionally supports the
@@ -29,7 +28,7 @@ export function parseDate(s) {
 
 /**
  * Converts various date formats into a timestamp in ms.
- * @param {!Date|number|string} value
+ * @param {Date|number|string} value
  * @return {?TimestampDef}
  */
 export function getDate(value) {
@@ -42,6 +41,6 @@ export function getDate(value) {
   if (isString(value)) {
     return parseDate(/** @type {string} */ (value));
   }
-  value = /** @type {!Date} */ (value);
+  value = /** @type {Date} */ (value);
   return value.getTime();
 }
diff --git a/src/core/types/enum.js b/src/core/types/enum.js
index 0beffe3e0ee8..ce9ff92ae60b 100644
--- a/src/core/types/enum.js
+++ b/src/core/types/enum.js
@@ -3,7 +3,7 @@ import {isProd} from '#core/mode/prod';
 /**
  * Checks whether `val` is a valid value of `enumObj`.
  *
- * @param {!Object<T>} enumObj
+ * @param {Record<string, T>} enumObj
  * @param {T} val
  * @return {boolean}
  * @template T
@@ -20,8 +20,8 @@ export function isEnumValue(enumObj, val) {
 /**
  * Returns all enum values of `enumObj`.
  *
- * @param {!Object<T>} enumObj
- * @return {!Array<T>}
+ * @param {object} enumObj
+ * @return {readonly T[]}
  * @template T
  */
 export function enumValues(enumObj) {
@@ -30,3 +30,13 @@ export function enumValues(enumObj) {
   }
   return Object.freeze(Object.values(enumObj));
 }
+
+/**
+ * No effect on runtime. Merely an annotation for the compiler to shorten the
+ * property values of large, common enums during production.
+ * See babel-plugin-mangle-object-values.
+ * @param {T} obj
+ * @return {T}
+ * @template T
+ */
+export const mangleObjectValues = (obj) => obj;
diff --git a/src/core/types/function.extern.js b/src/core/types/function.extern.js
deleted file mode 100644
index 23929ad6487f..000000000000
--- a/src/core/types/function.extern.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * @fileoverview Global type definitions related to functions.
- * @externs
- */
-
-/**
- * This type signifies a callback that can be called to remove a listener.
- * @typedef {function()}
- */
-let UnlistenDef;
diff --git a/src/core/types/function/exponential-backoff.js b/src/core/types/function/exponential-backoff.js
index b8637c6ee894..26a1f16917d5 100644
--- a/src/core/types/function/exponential-backoff.js
+++ b/src/core/types/function/exponential-backoff.js
@@ -1,15 +1,13 @@
 /**
  * @param {number=} opt_base Exponential base. Defaults to 2.
- * @return {function(function()): number} Function that when invoked will
+ * @return {function(function()): ReturnType<typeof setTimeout>} Function that when invoked will
  *     call the passed in function. On every invocation the next
  *     invocation of the passed in function will be exponentially
  *     later. Returned function returns timeout id.
  */
 export function exponentialBackoff(opt_base) {
   const getTimeout = exponentialBackoffClock(opt_base);
-  return (work) => {
-    return setTimeout(work, getTimeout());
-  };
+  return (work) => setTimeout(work, getTimeout());
 }
 
 /**
diff --git a/src/core/types/function/index.js b/src/core/types/function/index.js
index 884c32ff76fd..76fdc8fb268a 100644
--- a/src/core/types/function/index.js
+++ b/src/core/types/function/index.js
@@ -8,19 +8,21 @@
  * so it will return the same cached value even when the arguments are
  * different.
  *
- * @param {function(...):T} fn
- * @return {function(...):T}
  * @template T
+ * @param {(function(...any):T?)} fn
+ * @return {(function(...any):T?)}
  */
 export function once(fn) {
   let evaluated = false;
+  /** @type {T?} */
   let retValue = null;
   let callback = fn;
+
   return (...args) => {
     if (!evaluated) {
       retValue = callback.apply(self, args);
       evaluated = true;
-      callback = null; // GC
+      /** @type {?} */ (callback) = null; // GC
     }
     return retValue;
   };
@@ -31,7 +33,7 @@ export function once(fn) {
  * It throttles the calls so that no consequent calls have time interval
  * smaller than the given minimal interval.
  *
- * @param {!Window} win
+ * @param {Window} win
  * @param {function(...T):R} callback
  * @param {number} minInterval the minimum time interval in millisecond
  * @return {function(...T)}
@@ -40,10 +42,12 @@ export function once(fn) {
  */
 export function throttle(win, callback, minInterval) {
   let locker = 0;
+
+  /** @type {T[]?} */
   let nextCallArgs = null;
 
   /**
-   * @param {!Object} args
+   * @param {T[]} args
    */
   function fire(args) {
     nextCallArgs = null;
@@ -78,7 +82,7 @@ export function throttle(win, callback, minInterval) {
  * milliseconds must pass since the last call before the callback is actually
  * invoked.
  *
- * @param {!Window} win
+ * @param {Window} win
  * @param {function(...T):R} callback
  * @param {number} minInterval the minimum time interval in millisecond
  * @return {function(...T)}
@@ -88,10 +92,12 @@ export function throttle(win, callback, minInterval) {
 export function debounce(win, callback, minInterval) {
   let locker = 0;
   let timestamp = 0;
+
+  /** @type {T[]?} */
   let nextCallArgs = null;
 
   /**
-   * @param {?Array} args
+   * @param {T[]?} args
    */
   function fire(args) {
     nextCallArgs = null;
diff --git a/src/core/types/function/types.d.ts b/src/core/types/function/types.d.ts
new file mode 100644
index 000000000000..aa6d46a75807
--- /dev/null
+++ b/src/core/types/function/types.d.ts
@@ -0,0 +1,2 @@
+// This type signifies a callback that can be called to remove a listener.
+export type UnlistenCallback = () => void;
diff --git a/src/core/types/globals.d.ts b/src/core/types/globals.d.ts
new file mode 100644
index 000000000000..98e3d2d8237d
--- /dev/null
+++ b/src/core/types/globals.d.ts
@@ -0,0 +1,7 @@
+export {};
+
+declare global {
+  interface Window {
+    Date: typeof Date;
+  }
+}
diff --git a/src/core/types/index.js b/src/core/types/index.js
index 6c0285f8694e..48280a5430e9 100644
--- a/src/core/types/index.js
+++ b/src/core/types/index.js
@@ -7,7 +7,7 @@ export {isObject} from './object';
 /**
  * Determines if value is an ELement
  * @param {*} value
- * @return {boolean}
+ * @return {value is Element}
  */
 export function isElement(value) {
   return value?.nodeType == /* Node.ELEMENT_NODE */ 1;
@@ -23,3 +23,13 @@ export function isElement(value) {
 export function isFiniteNumber(value) {
   return typeof value === 'number' && isFinite(value);
 }
+
+/**
+ * Returns true if obj is a PromiseLike.
+ *
+ * @param {*} obj
+ * @return {obj is Promise<*>}
+ */
+export function isPromise(obj) {
+  return typeof obj?.then === 'function';
+}
diff --git a/src/core/types/object/globals.d.ts b/src/core/types/object/globals.d.ts
new file mode 100644
index 000000000000..2ef62a2e53b7
--- /dev/null
+++ b/src/core/types/object/globals.d.ts
@@ -0,0 +1,14 @@
+export {};
+
+declare global {
+  // A type for Objects that can be JSON serialized or that come from
+  // JSON serialization. Requires the objects fields to be accessed with
+  // bracket notation object['name'] to make sure the fields do not get
+  // obfuscated.
+  // TODO(rcebulko): Closure Compiler used this and the @dict annotation to check
+  // that properties are only accessed using bracket notation. We need to
+  // verify this works with TypeScript/esbuild.
+  interface JsonObject {
+    [key: string]: any;
+  }
+}
diff --git a/src/core/types/object/index.js b/src/core/types/object/index.js
index 841176a1945f..f6cc8ae12b3e 100644
--- a/src/core/types/object/index.js
+++ b/src/core/types/object/index.js
@@ -4,7 +4,7 @@ const {hasOwnProperty: hasOwn_, toString: toString_} = Object.prototype;
 /**
  * Determines if value is actually an Object.
  * @param {*} value
- * @return {boolean}
+ * @return {value is Object}
  */
 export function isObject(value) {
   return toString_.call(value) === '[object Object]';
@@ -26,23 +26,6 @@ export function map(opt_initial) {
   return obj;
 }
 
-/**
- * Return an empty JsonObject or makes the passed in object literal
- * an JsonObject.
- * The JsonObject type is just a simple object that is at-dict.
- * See
- * https://github.com/google/closure-compiler/wiki/@struct-and-@dict-Annotations
- * for what a dict is type-wise.
- * The linter enforces that the argument is, in fact, at-dict like.
- * @param {!Object=} opt_initial
- * @return {!JsonObject}
- */
-export function dict(opt_initial) {
-  // We do not copy. The linter enforces that the passed in object is a literal
-  // and thus the caller cannot have a reference to it.
-  return /** @type {!JsonObject} */ (opt_initial || {});
-}
-
 /**
  * Checks if the given key is a property in the map.
  *
@@ -59,7 +42,7 @@ export function hasOwn(obj, key) {
  * Returns obj[key] iff key is obj's own property (is not inherited).
  * Otherwise, returns undefined.
  *
- * @param {Object} obj
+ * @param {{[key: string]: *}} obj
  * @param {string} key
  * @return {*}
  */
@@ -71,28 +54,31 @@ export function ownProperty(obj, key) {
   }
 }
 
+/** @typedef {{t: Object, s: Object, d: number}} DeepMergeTuple */
+
 /**
  * Deep merges source into target.
  *
- * @param {!Object} target
- * @param {!Object} source
+ * @param {object} target
+ * @param {object} source
  * @param {number} depth The maximum merge depth. If exceeded, Object.assign
  *                       will be used instead.
- * @return {!Object}
+ * @return {object}
  * @throws {Error} If source contains a circular reference.
  * Note: Only nested objects are deep-merged, primitives and arrays are not.
  */
 export function deepMerge(target, source, depth = 10) {
   // Keep track of seen objects to detect recursive references.
+  /** @type {Object[]} */
   const seen = [];
 
-  /** @type {!Array<{t: !Object, s: !Object, d: number}>} */
+  /** @type {DeepMergeTuple[]} */
   const queue = [];
   queue.push({t: target, s: source, d: 0});
 
   // BFS to ensure objects don't have recursive references at shallower depths.
   while (queue.length > 0) {
-    const {d, s, t} = queue.shift();
+    const {d, s, t} = /** @type {DeepMergeTuple} */ (queue.shift());
     if (seen.includes(s)) {
       throw new Error('Source object has a circular reference.');
     }
@@ -105,39 +91,39 @@ export function deepMerge(target, source, depth = 10) {
       continue;
     }
     for (const key of Object.keys(s)) {
-      const newValue = s[key];
+      const newValue = /** @type {*} */ (s)[key];
       // Perform a deep merge IFF both target and source have the same key
       // whose corresponding values are objects.
       if (hasOwn(t, key)) {
-        const oldValue = t[key];
+        const oldValue = /** @type {*} */ (t)[key];
         if (isObject(newValue) && isObject(oldValue)) {
           queue.push({t: oldValue, s: newValue, d: d + 1});
           continue;
         }
       }
-      t[key] = newValue;
+      /** @type {*} */ (t)[key] = newValue;
     }
   }
   return target;
 }
 
 /**
- * @param {!Object} o An object to remove properties from
- * @param {!Array<string>} props A list of properties to remove from the Object
- * @return {!Object} An object with the given properties removed
+ * @param {{[key: string]: *}} o An object to remove properties from
+ * @param {Array<string>} props A list of properties to remove from the Object
+ * @return {{[key: string]: *}} An object with the given properties removed
  */
 export function omit(o, props) {
   return Object.keys(o).reduce((acc, key) => {
     if (!props.includes(key)) {
-      acc[key] = o[key];
+      /** @type {*} */ (acc)[key] = o[key];
     }
     return acc;
   }, {});
 }
 
 /**
- * @param {!Object|null|undefined} o1
- * @param {!Object|null|undefined} o2
+ * @param {*} o1
+ * @param {*} o2
  * @return {boolean}
  */
 export function objectsEqualShallow(o1, o2) {
@@ -161,14 +147,47 @@ export function objectsEqualShallow(o1, o2) {
 }
 
 /**
- * @param {T} obj
+ * Deeply compares 2 objects, and returns `true` if they match.
+ * @param {*} o1
+ * @param {*} o2
+ * @return {boolean}
+ */
+export function objectsEqualDeep(o1, o2) {
+  if (o1 === o2) {
+    return true;
+  }
+  if (o1 && o2 && typeof o1 === 'object' && typeof o2 === 'object') {
+    // Deep array compare:
+    if (Array.isArray(o1)) {
+      return (
+        Array.isArray(o2) &&
+        o1.length === o2.length &&
+        o1.every((value, i) => objectsEqualDeep(value, o2[i]))
+      );
+    }
+
+    // Deep object compare:
+    const o1Keys = Object.keys(o1);
+    const o2Keys = Object.keys(o2);
+    return (
+      o1Keys.length === o2Keys.length &&
+      o1Keys.every((key) => o2Keys.includes(key)) &&
+      o1Keys.every((key) => objectsEqualDeep(o1[key], o2[key]))
+    );
+  }
+  return false;
+}
+
+/**
+ * @param {{[key: string]: R|undefined}} obj
  * @param {string} prop
- * @param {function(T, string):R} factory
+ * @param {function({[key: string]: R|undefined}, string): R} factory
  * @return {R}
- * @template T,R
+ *
+ * @template R
  */
 export function memo(obj, prop, factory) {
-  let result = /** @type {?R} */ (obj[prop]);
+  let result = obj[prop];
   if (result === undefined) {
     result = factory(obj, prop);
     obj[prop] = result;
@@ -178,8 +197,8 @@ export function memo(obj, prop, factory) {
 
 /**
  * Recreates objects with prototype-less copies.
- * @param {!JsonObject} obj
- * @return {!JsonObject}
+ * @param {JsonObject} obj
+ * @return {JsonObject}
  */
 export function recreateNonProtoObject(obj) {
   const copy = map();
@@ -190,7 +209,7 @@ export function recreateNonProtoObject(obj) {
     const v = obj[k];
     copy[k] = isObject(v) ? recreateNonProtoObject(v) : v;
   }
-  return /** @type {!JsonObject} */ (copy);
+  return /** @type {JsonObject} */ (copy);
 }
 
 /**
@@ -199,7 +218,7 @@ export function recreateNonProtoObject(obj) {
  * field in a chain does not exist or is not an object or array, the returned
  * value will be `undefined`.
  *
- * @param {!JsonObject} obj
+ * @param {JsonObject} obj
  * @param {string} expr
  * @return {*}
  */
@@ -210,6 +229,7 @@ export function getValueForExpr(obj, expr) {
   }
   // Otherwise, navigate via properties.
   const parts = expr.split('.');
+  /** @type {*} */
   let value = obj;
   for (const part of parts) {
     if (
diff --git a/src/core/types/object/json.extern.js b/src/core/types/object/json.extern.js
deleted file mode 100644
index 9c6984737c50..000000000000
--- a/src/core/types/object/json.extern.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @fileoverview Externs for JSON types and helpers
- * @externs
- */
-
-/**
- * A type for Objects that can be JSON serialized or that come from
- * JSON serialization. Requires the objects fields to be accessed with
- * bracket notation object['name'] to make sure the fields do not get
- * obfuscated.
- *
- * Marking this as a constructor allows other types to extend it.
- * Marking this as a dict tells the compiler to check that properties are only
- * accessed using bracket notation.
- * @constructor
- * @dict
- */
-let JsonObject;
diff --git a/src/core/types/object/json.js b/src/core/types/object/json.js
index d43f6f4abbbe..a61682d4b143 100644
--- a/src/core/types/object/json.js
+++ b/src/core/types/object/json.js
@@ -16,30 +16,29 @@ let JSONScalarDef;
 
 /**
  * JSON object. It's a map with string keys and JSON values.
- * @typedef {!Object<string, ?*>} (* should be JSONValueDef)
+ * @typedef {{[key: string]: ?*}} (* should be JSONValueDef)
  */
 let JSONObjectDef;
 
 /**
  * JSON array. It's an array with JSON values.
- * @typedef {!Array<?*>} (* should be JSONValueDef)
+ * @typedef {Array<?*>} (* should be JSONValueDef)
  */
 let JSONArrayDef;
 
 /**
  * JSON value. It's either a scalar, an object or an array.
- * @typedef {!JSONScalarDef|!JSONObjectDef|!JSONArrayDef}
+ * @typedef {JSONScalarDef|JSONObjectDef|JSONArrayDef}
  */
 let JSONValueDef;
 
 /**
  * @typedef {{
  *   YOU_MUST_USE: string,
- *   jsonLiteral: function(),
+ *   jsonLiteral: function():InternalJsonLiteralTypeDef,
  *   TO_MAKE_THIS_TYPE: string,
- * }}
+ * }} InternalJsonLiteralTypeDef
  */
-let InternalJsonLiteralTypeDef;
 
 /**
  * Simple wrapper around JSON.parse that casts the return value
@@ -57,7 +56,7 @@ export function parseJson(json) {
  * Returns `undefined` if parsing fails.
  * Returns the `Object` corresponding to the JSON string when parsing succeeds.
  * @param {string} json JSON string to parse
- * @param {function(!Error)=} opt_onFailed Optional function that will be called
+ * @param {function(Error)=} opt_onFailed Optional function that will be called
  *     with the error if parsing fails.
  * @return {?JsonObject} May be extend to parse arrays.
  */
@@ -70,6 +69,8 @@ export function tryParseJson(json, opt_onFailed) {
   }
 }
 
+/** @typedef {{a: JSONValueDef, b: JSONValueDef, depth: number}} DeepEqTuple */
+
 /**
  * Deeply checks strict equality of items in nested arrays and objects.
  *
@@ -86,10 +87,11 @@ export function deepEquals(a, b, depth = 5) {
   if (a === b) {
     return true;
   }
-  /** @type {!Array<{a: JSONValueDef, b: JSONValueDef, depth: number}>} */
+
+  /** @type {DeepEqTuple[]} */
   const queue = [{a, b, depth}];
   while (queue.length > 0) {
-    const {a, b, depth} = queue.shift();
+    const {a, b, depth} = /** @type {DeepEqTuple} */ (queue.shift());
     // Only check deep equality if depth > 0.
     if (depth > 0) {
       if (typeof a !== typeof b) {
@@ -109,7 +111,11 @@ export function deepEquals(a, b, depth = 5) {
           return false;
         }
         for (const k of keysA) {
-          queue.push({a: a[k], b: b[k], depth: depth - 1});
+          queue.push({
+            a: /** @type {*} */ (a)[k],
+            b: /** @type {*} */ (b)[k],
+            depth: depth - 1,
+          });
         }
         continue;
       }
@@ -130,11 +136,11 @@ export function deepEquals(a, b, depth = 5) {
  * configuration to be transformed into an efficient JSON-parsed representation
  * in the dist build. See https://v8.dev/blog/cost-of-javascript-2019#json
  *
- * @param {!Object} obj
- * @return {!JsonObject}
+ * @param {object} obj
+ * @return {JsonObject}
  */
 export function jsonConfiguration(obj) {
-  return /** @type {!JsonObject} */ (obj);
+  return /** @type {JsonObject} */ (obj);
 }
 
 /**
@@ -142,17 +148,17 @@ export function jsonConfiguration(obj) {
  * This doesn't actually do any conversion, it only changes the closure type.
  *
  * @param {?JSONValueDef} value
- * @return {!InternalJsonLiteralTypeDef}
+ * @return {InternalJsonLiteralTypeDef}
  */
 export function jsonLiteral(value) {
-  return /** @type {!InternalJsonLiteralTypeDef} */ (value);
+  return /** @type {InternalJsonLiteralTypeDef} */ (value);
 }
 
 /**
  * Allows inclusion of a variable (that's wrapped in a jsonLiteral
  * call) to be included inside a jsonConfiguration.
  *
- * @param {!InternalJsonLiteralTypeDef} value
+ * @param {InternalJsonLiteralTypeDef} value
  * @return {*}
  */
 export function includeJsonLiteral(value) {
diff --git a/src/core/types/pure.js b/src/core/types/pure.js
new file mode 100644
index 000000000000..f323c1202be0
--- /dev/null
+++ b/src/core/types/pure.js
@@ -0,0 +1,9 @@
+/**
+ * No effect on runtime. Merely an annotation for the compiler to deeply add
+ * #__PURE__ comments to an expression
+ * See babel-plugin-deep-pure
+ * @param {T} value
+ * @return {T}
+ * @template T
+ */
+export const pure = (value) => value;
diff --git a/src/core/types/string/amp-globals.d.ts b/src/core/types/string/amp-globals.d.ts
new file mode 100644
index 000000000000..5316a0703b1f
--- /dev/null
+++ b/src/core/types/string/amp-globals.d.ts
@@ -0,0 +1,8 @@
+export {};
+
+declare global {
+  interface Location {
+    // Set by a viewer when it removes the fragment.
+    originalHash?: string;
+  }
+}
diff --git a/src/core/types/string/base64.js b/src/core/types/string/base64.js
index ffadf014bf32..600aed757eb6 100644
--- a/src/core/types/string/base64.js
+++ b/src/core/types/string/base64.js
@@ -2,13 +2,15 @@ import {bytesToString, stringToBytes, utf8Decode, utf8Encode} from './bytes';
 
 /**
  * Character mapping from base64url to base64.
- * @const {!Object<string, string>}
+ * @type {{[key: string]: string}}
+ * @const
  */
 const base64UrlDecodeSubs = {'-': '+', '_': '/', '.': '='};
 
 /**
  * Character mapping from base64 to base64url.
- * @const {!Object<string, string>}
+ * @type {{[key: string]: string}}
+ * @const
  */
 const base64UrlEncodeSubs = {'+': '-', '/': '_', '=': '.'};
 
@@ -16,7 +18,7 @@ const base64UrlEncodeSubs = {'+': '-', '/': '_', '=': '.'};
  * Converts a string which is in base64url encoding into a Uint8Array
  * containing the decoded value.
  * @param {string} str
- * @return {!Uint8Array}
+ * @return {Uint8Array}
  */
 export function base64UrlDecodeToBytes(str) {
   const encoded = atob(str.replace(/[-_.]/g, (ch) => base64UrlDecodeSubs[ch]));
@@ -27,7 +29,7 @@ export function base64UrlDecodeToBytes(str) {
  * Converts a string which is in base64 encoding into a Uint8Array
  * containing the decoded value.
  * @param {string} str
- * @return {!Uint8Array}
+ * @return {Uint8Array}
  */
 export function base64DecodeToBytes(str) {
   return stringToBytes(atob(str));
@@ -36,7 +38,7 @@ export function base64DecodeToBytes(str) {
 /**
  * Converts a bytes array into base64url encoded string.
  * base64url is defined in RFC 4648. It is sometimes referred to as "web safe".
- * @param {!Uint8Array} bytes
+ * @param {Uint8Array} bytes
  * @return {string}
  */
 export function base64UrlEncodeFromBytes(bytes) {
@@ -67,7 +69,7 @@ export function base64UrlDecodeFromString(str) {
 
 /**
  * Converts a bytes array into base64 encoded string.
- * @param {!Uint8Array} bytes
+ * @param {Uint8Array} bytes
  * @return {string}
  */
 export function base64EncodeFromBytes(bytes) {
diff --git a/src/core/types/string/bytes.js b/src/core/types/string/bytes.js
index 8330b01de9b1..ff1d390f8792 100644
--- a/src/core/types/string/bytes.js
+++ b/src/core/types/string/bytes.js
@@ -3,25 +3,32 @@ import * as mode from '#core/mode';
 
 /**
  * Interpret a byte array as a UTF-8 string.
- * @param {!BufferSource} bytes
+ * See https://developer.mozilla.org/en-US/docs/Web/API/BufferSource for more
+ * details on this data-type.
+ * @param {BufferSource} bytes
  * @return {string}
  */
 export function utf8Decode(bytes) {
   if (typeof TextDecoder !== 'undefined') {
     return new TextDecoder('utf-8').decode(bytes);
   }
-  const asciiString = bytesToString(new Uint8Array(bytes.buffer || bytes));
+  const asciiString = bytesToString(
+    new Uint8Array(
+      /** @type {{buffer: ArrayBuffer}} */ (bytes).buffer ||
+        /** @type {ArrayBuffer} */ (bytes)
+    )
+  );
   return decodeURIComponent(escape(asciiString));
 }
 
 /**
  * Turn a string into UTF-8 bytes.
  * @param {string} string
- * @return {!Uint8Array}
+ * @return {Uint8Array}
  */
 export function utf8Encode(string) {
   if (typeof TextEncoder !== 'undefined') {
-    return new TextEncoder('utf-8').encode(string);
+    return new TextEncoder().encode(string);
   }
   return stringToBytes(unescape(encodeURIComponent(string)));
 }
@@ -31,7 +38,7 @@ export function utf8Encode(string) {
  * into a Uint8Array with the corresponding bytes.
  * If you have a string of characters, you probably want to be using utf8Encode.
  * @param {string} str
- * @return {!Uint8Array}
+ * @return {Uint8Array}
  */
 export function stringToBytes(str) {
   const bytes = new Uint8Array(str.length);
@@ -45,7 +52,7 @@ export function stringToBytes(str) {
 
 /**
  * Converts a 8-bit bytes array into a string
- * @param {!Uint8Array} bytes
+ * @param {Uint8Array} bytes
  * @return {string}
  */
 export function bytesToString(bytes) {
@@ -61,7 +68,7 @@ export function bytesToString(bytes) {
 /**
  * Converts a 4-item byte array to an unsigned integer.
  * Assumes bytes are big endian.
- * @param {!Uint8Array} bytes
+ * @param {Uint8Array} bytes
  * @return {number}
  */
 export function bytesToUInt32(bytes) {
@@ -80,7 +87,7 @@ export function bytesToUInt32(bytes) {
 /**
  * Generate a random bytes array with specific length using
  * win.crypto.getRandomValues. Return null if it is not available.
- * @param {!Window} win
+ * @param {Window} win
  * @param {number} length
  * @return {?Uint8Array}
  */
@@ -89,9 +96,7 @@ export function getCryptoRandomBytesArray(win, length) {
 
   // Support IE 11
   if (!mode.isEsm()) {
-    crypto = /** @type {!webCrypto.Crypto|undefined} */ (
-      crypto || win.msCrypto
-    );
+    crypto = crypto || win.msCrypto;
     if (!crypto || !crypto.getRandomValues) {
       return null;
     }
diff --git a/src/core/types/string/globals.d.ts b/src/core/types/string/globals.d.ts
new file mode 100644
index 000000000000..c866e1e29a59
--- /dev/null
+++ b/src/core/types/string/globals.d.ts
@@ -0,0 +1,7 @@
+import './amp-globals.d';
+
+declare global {
+  interface Window {
+    msCrypto?: Crypto;
+  }
+}
diff --git a/src/core/types/string/index.js b/src/core/types/string/index.js
index c207a47c5d8b..e4ce03e36167 100644
--- a/src/core/types/string/index.js
+++ b/src/core/types/string/index.js
@@ -89,7 +89,7 @@ export function expandTemplate(template, getter, opt_maxIterations) {
   const maxIterations = opt_maxIterations || 1;
   for (let i = 0; i < maxIterations; i++) {
     let matches = 0;
-    template = template.replace(/\${([^}]*)}/g, (_a, b) => {
+    template = template.replace(/\${([^{}]*)}/g, (_a, b) => {
       matches++;
       return getter(b);
     });
@@ -149,7 +149,7 @@ export function trimStart(str) {
  * @param {string} str
  * @param {RegExp} regex
  * @param {Function|string} replacer
- * @return {!Promise<string>}
+ * @return {Promise<string>}
  */
 export function asyncStringReplace(str, regex, replacer) {
   if (isString(replacer)) {
@@ -170,6 +170,7 @@ export function asyncStringReplace(str, regex, replacer) {
     // Store the promise in it's eventual string position.
     const replacementPromise = replacer.apply(null, arguments);
     stringBuilder.push(replacementPromise);
+    return ''; // returned for tsc
   });
   stringBuilder.push(str.slice(lastIndex));
 
@@ -198,7 +199,7 @@ export function padStart(s, targetLength, padString) {
 /**
  * Tests if a value is a string.
  * @param {?} s
- * @return {boolean}
+ * @return {s is string}
  */
 export function isString(s) {
   return typeof s == 'string';
diff --git a/src/core/types/string/url.js b/src/core/types/string/url.js
index 422df9bfa62c..57314da8c7bb 100644
--- a/src/core/types/string/url.js
+++ b/src/core/types/string/url.js
@@ -1,5 +1,8 @@
 import {map} from '#core/types/object';
 
+// eslint-disable-next-line no-script-url
+export const INVALID_PROTOCOLS = ['javascript:', 'data:', 'vbscript:'];
+
 const QUERY_STRING_REGEX = /(?:^[#?]?|&)([^=&]+)(?:=([^&]*))?/g;
 
 /**
@@ -23,7 +26,7 @@ export function tryDecodeUriComponent(component, fallback = '') {
  * map. If there are duplicate keys the latest value is returned.
  *
  * @param {string} queryString
- * @return {!JsonObject}
+ * @return {JsonObject}
  */
 export function parseQueryString(queryString) {
   const params = map();
@@ -44,8 +47,8 @@ export function parseQueryString(queryString) {
 
 /**
  * Parses the query # params.
- * @param {!Window=} opt_win
- * @return {!JsonObject}
+ * @param {Window=} opt_win
+ * @return {JsonObject}
  */
 export function getHashParams(opt_win) {
   const {location} = opt_win || self;
diff --git a/src/core/window/clipboard.js b/src/core/window/clipboard.js
index 8b59e9382652..db087cdc76b8 100644
--- a/src/core/window/clipboard.js
+++ b/src/core/window/clipboard.js
@@ -2,16 +2,17 @@ import {removeElement} from '#core/dom';
 import {setStyles} from '#core/dom/style';
 
 /**
- * @param {!Window} win
- * @param {string} text
- * @return {boolean}
+ * Copies provided text to clipboard using deprecated API: document.execCommand('copy')
+ * @param {Window} win Window context
+ * @param {string} text Text to copy
+ * @return {boolean} Return true on copy-success
  */
-export function copyTextToClipboard(win, text) {
+export function deprecatedCopyTextToClipboard(win, text) {
   let copySuccessful = false;
   const doc = win.document;
 
   const textarea =
-    /** @type {!HTMLTextAreaElement} */
+    /** @type {HTMLTextAreaElement} */
     (doc.createElement('textarea'));
 
   setStyles(textarea, {
@@ -28,10 +29,10 @@ export function copyTextToClipboard(win, text) {
 
   textarea.value = text;
   textarea.readOnly = true;
-  textarea.contentEditable = true;
+  textarea.contentEditable = 'true';
 
   doc.body.appendChild(textarea);
-  win.getSelection().removeAllRanges();
+  win.getSelection()?.removeAllRanges();
 
   textarea./*OK*/ focus();
   textarea.setSelectionRange(0, text.length);
@@ -48,9 +49,44 @@ export function copyTextToClipboard(win, text) {
 }
 
 /**
- * @param {!Document} doc
- * @return {boolean}
+ * @param {Document} doc Document context
+ * @return {boolean} Returns true if copying support is available with deprecated API
  */
-export function isCopyingToClipboardSupported(doc) {
+export function isDeprecatedCopyingToClipboardSupported(doc) {
   return doc.queryCommandSupported('copy');
 }
+
+/**
+ * Copies provided text to clipboard using 'navigator.clipboard' API.
+ * It will try to use deprecated API if 'navigator.clipboard' is not supported.
+ * @param {Window} win Window context
+ * @param {string} text Text to copy
+ * @param {function():void} successCallback Executes when copying is successful
+ * @param {function():void} failCallback Executes when copying is failed
+ */
+export function copyTextToClipboard(win, text, successCallback, failCallback) {
+  // Check which method is supported for the browser
+  if (win.navigator?.clipboard) {
+    // Try copying with `navigator.clipboard` API
+    win.navigator.clipboard.writeText(text).then(successCallback, failCallback);
+  } else if (
+    // Try copying with deprecated API as a fallback support
+    isDeprecatedCopyingToClipboardSupported(win.document) &&
+    deprecatedCopyTextToClipboard(win, text)
+  ) {
+    successCallback();
+  } else {
+    failCallback();
+  }
+}
+
+/**
+ * @param {Document} doc Document context
+ * @return {boolean} Returns true if copying support is available with new (or with deprecated) API
+ */
+export function isCopyingToClipboardSupported(doc) {
+  return (
+    !!doc.defaultView?.navigator?.clipboard ||
+    isDeprecatedCopyingToClipboardSupported(doc)
+  );
+}
diff --git a/src/core/window/history.js b/src/core/window/history.js
index e8e6d8939e07..c3b2390faa0a 100644
--- a/src/core/window/history.js
+++ b/src/core/window/history.js
@@ -2,7 +2,7 @@
  * Gets state from History.
  * But IE11 throws if there is no state.
  *
- * @param {!History} history
+ * @param {History} history
  * @return {*}
  */
 export function getHistoryState(history) {
diff --git a/src/core/window/index.js b/src/core/window/index.js
index 1e86133ba727..704ffd6e1ec2 100644
--- a/src/core/window/index.js
+++ b/src/core/window/index.js
@@ -6,20 +6,20 @@
  * This helper function casts it into just a simple Window return type.
  *
  * @param {?Window} winOrNull
- * @return {!Window}
+ * @return {Window}
  */
 export function toWin(winOrNull) {
-  return /** @type {!Window} */ (winOrNull);
+  return /** @type {Window} */ (winOrNull);
 }
 
 /**
  * Returns the associated Window for a node.
  *
- * @param {!Node} node
- * @return {!Window}
+ * @param {Node} node
+ * @return {Window}
  */
 export function getWin(node) {
   return toWin(
-    (node.ownerDocument || /** @type {!Document} */ (node)).defaultView
+    (node.ownerDocument || /** @type {Document} */ (node)).defaultView
   );
 }
diff --git a/src/core/window/interface.js b/src/core/window/interface.js
index fe87f814ebe2..2c3fb1c07334 100644
--- a/src/core/window/interface.js
+++ b/src/core/window/interface.js
@@ -6,8 +6,8 @@
 export class WindowInterface {
   /**
    * @static
-   * @param {!Window} win
-   * @return {!Window}
+   * @param {Window} win
+   * @return {?Window}
    */
   static getTop(win) {
     return win.top;
@@ -15,8 +15,8 @@ export class WindowInterface {
 
   /**
    * @static
-   * @param {!Window} win
-   * @return {!Location}
+   * @param {Window} win
+   * @return {Location}
    */
   static getLocation(win) {
     return win.location;
@@ -24,7 +24,7 @@ export class WindowInterface {
 
   /**
    * @static
-   * @param {!Window} win
+   * @param {Window} win
    * @return {string}
    */
   static getDocumentReferrer(win) {
@@ -33,7 +33,7 @@ export class WindowInterface {
 
   /**
    * @static
-   * @param {!Window} win
+   * @param {Window} win
    * @return {string}
    */
   static getHostname(win) {
@@ -42,7 +42,7 @@ export class WindowInterface {
 
   /**
    * @static
-   * @param {!Window} win
+   * @param {Window} win
    * @return {string}
    */
   static getUserAgent(win) {
@@ -51,13 +51,13 @@ export class WindowInterface {
 
   /**
    * @static
-   * @param {!Window} win
+   * @param {Window} win
    * @return {string}
    */
   static getUserLanguage(win) {
-    // The `navigator.userLanguage` is only supported by IE. The standard is
-    // the `navigator.language`.
-    return win.navigator['userLanguage'] || win.navigator.language;
+    return (
+      /** @type {*} */ (win.navigator)['userLanguage'] || win.navigator.language
+    );
   }
 
   /**
@@ -71,8 +71,8 @@ export class WindowInterface {
 
   /**
    * @static
-   * @param {!Window} win
-   * @return {function(string,(ArrayBufferView|Blob|FormData|null|string)=):boolean|undefined}
+   * @param {Window} win
+   * @return {undefined|function(string,(ArrayBufferView|Blob|FormData|null|string)=):boolean}
    */
   static getSendBeacon(win) {
     if (!win.navigator.sendBeacon) {
@@ -83,19 +83,19 @@ export class WindowInterface {
 
   /**
    * @static
-   * @param {!Window} win
+   * @param {Window} win
    * @return {typeof XMLHttpRequest}
    */
   static getXMLHttpRequest(win) {
-    return win.XMLHttpRequest;
+    return /** @type {*} */ (win).XMLHttpRequest;
   }
 
   /**
    * @static
-   * @param {!Window} win
+   * @param {Window} win
    * @return {typeof Image}
    */
   static getImage(win) {
-    return win.Image;
+    return /** @type {*} */ (win).Image;
   }
 }
diff --git a/src/core/window/window.extern.js b/src/core/window/window.extern.js
deleted file mode 100644
index 59d4157074e8..000000000000
--- a/src/core/window/window.extern.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * @fileoverview Externs for values expected to be on global self/window.
- * @externs
- */
-
-/**
- * Never exists; used as part of post-compilation checks to verify DCE.
- * @type {undefined}
- */
-window.__AMP_ASSERTION_CHECK;
-
-/**
- * Global error reporting handler; only present in AMP pages.
- * @type {undefined|function(this:Window,!Error,Element=)}
- */
-window.__AMP_REPORT_ERROR;
-
-/**
- * Global property set by test some harnesses to signal a testing environment.
- * @type {undefined|boolean}
- */
-window.__AMP_TEST;
-
-/**
- * Counter for the DomBaseWeakRef polyfill.
- * @type {undefined|number}
- */
-window.__AMP_WEAKREF_ID;
-
-/**
- * AMP Runtime settings, configuration, and environment/build constants.
- * @type {!AmpConfigDef|undefined}
- */
-window.AMP_CONFIG;
-
-/**
- * AMP Mode, used to force an override in tests.
- * @type {{esm: boolean}}
- */
-window.__AMP_MODE;
diff --git a/src/custom-element.js b/src/custom-element.js
index 2f888435e994..934019619abf 100644
--- a/src/custom-element.js
+++ b/src/custom-element.js
@@ -1,6 +1,6 @@
-import {AmpEvents} from '#core/constants/amp-events';
-import {CommonSignals} from '#core/constants/common-signals';
-import {ReadyState} from '#core/constants/ready-state';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
+import {CommonSignals_Enum} from '#core/constants/common-signals';
+import {ReadyState_Enum} from '#core/constants/ready-state';
 import {tryResolve} from '#core/data-structures/promise';
 import {Signals} from '#core/data-structures/signals';
 import * as dom from '#core/dom';
@@ -8,7 +8,11 @@ import {
   UPGRADE_TO_CUSTOMELEMENT_PROMISE,
   UPGRADE_TO_CUSTOMELEMENT_RESOLVER,
 } from '#core/dom/amp-element-helpers';
-import {Layout, LayoutPriority, isLoadingAllowed} from '#core/dom/layout';
+import {
+  LayoutPriority_Enum,
+  Layout_Enum,
+  isLoadingAllowed,
+} from '#core/dom/layout';
 import {MediaQueryProps} from '#core/dom/media-query-props';
 import * as query from '#core/dom/query';
 import {setStyle} from '#core/dom/style';
@@ -17,7 +21,7 @@ import {applyStaticLayout} from '#core/static-layout';
 import {getWin} from '#core/window';
 
 import {Services} from '#service';
-import {ResourceState} from '#service/resource';
+import {ResourceState_Enum} from '#service/resource';
 import {getSchedulerForDoc} from '#service/scheduler';
 
 import {dev, devAssert, user, userAssert} from '#utils/log';
@@ -40,7 +44,7 @@ const TAG = 'CustomElement';
 /**
  * @enum {number}
  */
-const UpgradeState = {
+const UpgradeState_Enum = {
   NOT_UPGRADED: 1,
   UPGRADED: 2,
   UPGRADE_FAILED: 3,
@@ -168,8 +172,8 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
       /** @private {?AbortController} */
       this.mountAbortController_ = null;
 
-      /** @private {!ReadyState} */
-      this.readyState_ = ReadyState.UPGRADING;
+      /** @private {!ReadyState_Enum} */
+      this.readyState_ = ReadyState_Enum.UPGRADING;
 
       /** @type {boolean} */
       this.everAttached = false;
@@ -186,8 +190,8 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
        */
       this.resources_ = null;
 
-      /** @private {!Layout} */
-      this.layout_ = Layout.NODISPLAY;
+      /** @private {!Layout_Enum} */
+      this.layout_ = Layout_Enum.NODISPLAY;
 
       /** @private {number} */
       this.layoutCount_ = 0;
@@ -245,9 +249,9 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
        * An element always starts in a unupgraded state until it's added to DOM
        * for the first time in which case it can be upgraded immediately or wait
        * for script download or `upgradeCallback`.
-       * @private {!UpgradeState}
+       * @private {!UpgradeState_Enum}
        */
-      this.upgradeState_ = UpgradeState.NOT_UPGRADED;
+      this.upgradeState_ = UpgradeState_Enum.NOT_UPGRADED;
 
       /**
        * Time delay imposed by baseElement upgradeCallback.  If no
@@ -276,7 +280,7 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
       this.signals_ = new Signals();
 
       if (this.implClass_) {
-        this.signals_.signal(CommonSignals.READY_TO_UPGRADE);
+        this.signals_.signal(CommonSignals_Enum.READY_TO_UPGRADE);
       }
 
       const perf = Services.performanceForOrNull(win);
@@ -293,7 +297,7 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
       }
     }
 
-    /** @return {!ReadyState} */
+    /** @return {!ReadyState_Enum} */
     get readyState() {
       return this.readyState_;
     }
@@ -341,12 +345,12 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
      * @final
      */
     isUpgraded() {
-      return this.upgradeState_ == UpgradeState.UPGRADED;
+      return this.upgradeState_ == UpgradeState_Enum.UPGRADED;
     }
 
     /** @return {!Promise} */
     whenUpgraded() {
-      return this.signals_.whenSignal(CommonSignals.UPGRADED);
+      return this.signals_.whenSignal(CommonSignals_Enum.UPGRADED);
     }
 
     /**
@@ -360,13 +364,13 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
       if (this.isInTemplate_) {
         return;
       }
-      if (this.upgradeState_ != UpgradeState.NOT_UPGRADED) {
+      if (this.upgradeState_ != UpgradeState_Enum.NOT_UPGRADED) {
         // Already upgraded or in progress or failed.
         return;
       }
 
       this.implClass_ = newImplClass;
-      this.signals_.signal(CommonSignals.READY_TO_UPGRADE);
+      this.signals_.signal(CommonSignals_Enum.READY_TO_UPGRADE);
       if (this.everAttached) {
         // Usually, we do an implementation upgrade when the element is
         // attached to the DOM. But, if it hadn't yet upgraded from
@@ -406,21 +410,21 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
     completeUpgrade_(newImpl, upgradeStartTime) {
       this.impl_ = newImpl;
       this.upgradeDelayMs_ = win.Date.now() - upgradeStartTime;
-      this.upgradeState_ = UpgradeState.UPGRADED;
-      this.setReadyStateInternal(ReadyState.BUILDING);
+      this.upgradeState_ = UpgradeState_Enum.UPGRADED;
+      this.setReadyStateInternal(ReadyState_Enum.BUILDING);
       this.classList.remove('amp-unresolved', 'i-amphtml-unresolved');
       this.assertLayout_();
-      this.dispatchCustomEventForTesting(AmpEvents.ATTACHED);
+      this.dispatchCustomEventForTesting(AmpEvents_Enum.ATTACHED);
       if (!this.R1()) {
         this.getResources().upgraded(this);
       }
-      this.signals_.signal(CommonSignals.UPGRADED);
+      this.signals_.signal(CommonSignals_Enum.UPGRADED);
     }
 
     /** @private */
     assertLayout_() {
       if (
-        this.layout_ != Layout.NODISPLAY &&
+        this.layout_ != Layout_Enum.NODISPLAY &&
         this.impl_ &&
         !this.impl_.isLayoutSupported(this.layout_)
       ) {
@@ -442,7 +446,7 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
     getBuildPriority() {
       return this.implClass_
         ? this.implClass_.getBuildPriority(this)
-        : LayoutPriority.BACKGROUND;
+        : LayoutPriority_Enum.BACKGROUND;
     }
 
     /**
@@ -453,7 +457,7 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
     getLayoutPriority() {
       return this.impl_
         ? this.impl_.getLayoutPriority()
-        : LayoutPriority.BACKGROUND;
+        : LayoutPriority_Enum.BACKGROUND;
     }
 
     /**
@@ -489,7 +493,7 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
      * @return {!Promise}
      */
     whenBuilt() {
-      return this.signals_.whenSignal(CommonSignals.BUILT);
+      return this.signals_.whenSignal(CommonSignals_Enum.BUILT);
     }
 
     /**
@@ -510,7 +514,7 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
         return this.buildingPromise_;
       }
 
-      this.setReadyStateInternal(ReadyState.BUILDING);
+      this.setReadyStateInternal(ReadyState_Enum.BUILDING);
 
       // Create the instance.
       const implPromise = this.createImpl_();
@@ -551,16 +555,16 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
           this.built_ = true;
           this.classList.add('i-amphtml-built');
           this.classList.remove('i-amphtml-notbuilt', 'amp-notbuilt');
-          this.signals_.signal(CommonSignals.BUILT);
+          this.signals_.signal(CommonSignals_Enum.BUILT);
 
           if (this.R1()) {
             this.setReadyStateInternal(
-              this.readyState_ != ReadyState.BUILDING
+              this.readyState_ != ReadyState_Enum.BUILDING
                 ? this.readyState_
-                : ReadyState.MOUNTING
+                : ReadyState_Enum.MOUNTING
             );
           } else {
-            this.setReadyStateInternal(ReadyState.LOADING);
+            this.setReadyStateInternal(ReadyState_Enum.LOADING);
             this.preconnect(/* onLayout */ false);
           }
 
@@ -585,12 +589,12 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
         },
         (reason) => {
           this.signals_.rejectSignal(
-            CommonSignals.BUILT,
+            CommonSignals_Enum.BUILT,
             /** @type {!Error} */ (reason)
           );
 
           if (this.R1()) {
-            this.setReadyStateInternal(ReadyState.ERROR, reason);
+            this.setReadyStateInternal(ReadyState_Enum.ERROR, reason);
           }
 
           if (!isBlockedByConsent(reason)) {
@@ -610,7 +614,7 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
       }
 
       const readyPromise = this.signals_.whenSignal(
-        CommonSignals.READY_TO_UPGRADE
+        CommonSignals_Enum.READY_TO_UPGRADE
       );
       return readyPromise.then(() => {
         if (this.R1()) {
@@ -646,11 +650,11 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
             return;
           }
           this.setReadyStateInternal(
-            this.readyState_ != ReadyState.MOUNTING
+            this.readyState_ != ReadyState_Enum.MOUNTING
               ? this.readyState_
               : this.implClass_.usesLoading(this)
-              ? ReadyState.LOADING
-              : ReadyState.MOUNTING
+                ? ReadyState_Enum.LOADING
+                : ReadyState_Enum.MOUNTING
           );
           this.mounted_ = true;
           const result = this.impl_.mountCallback(signal);
@@ -664,9 +668,9 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
           if (signal.aborted) {
             throw cancellation();
           }
-          this.signals_.signal(CommonSignals.MOUNTED);
+          this.signals_.signal(CommonSignals_Enum.MOUNTED);
           if (!this.implClass_.usesLoading(this) || hasLoaded) {
-            this.setReadyStateInternal(ReadyState.COMPLETE);
+            this.setReadyStateInternal(ReadyState_Enum.COMPLETE);
           }
         })
         .catch((reason) => {
@@ -675,10 +679,10 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
             this.mountPromise_ = null;
           } else {
             this.signals_.rejectSignal(
-              CommonSignals.MOUNTED,
+              CommonSignals_Enum.MOUNTED,
               /** @type {!Error} */ (reason)
             );
-            this.setReadyStateInternal(ReadyState.ERROR, reason);
+            this.setReadyStateInternal(ReadyState_Enum.ERROR, reason);
           }
           throw reason;
         }));
@@ -701,7 +705,7 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
       const {signal} = this.mountAbortController_;
 
       const readyPromise = this.signals_.whenSignal(
-        CommonSignals.READY_TO_UPGRADE
+        CommonSignals_Enum.READY_TO_UPGRADE
       );
       return readyPromise.then(() => {
         if (!this.R1()) {
@@ -765,7 +769,7 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
      * @return {!Promise}
      */
     whenMounted() {
-      return this.signals_.whenSignal(CommonSignals.MOUNTED);
+      return this.signals_.whenSignal(CommonSignals_Enum.MOUNTED);
     }
 
     /**
@@ -773,7 +777,7 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
      * @final
      */
     whenLoaded() {
-      return this.signals_.whenSignal(CommonSignals.LOAD_END);
+      return this.signals_.whenSignal(CommonSignals_Enum.LOAD_END);
     }
 
     /**
@@ -797,11 +801,11 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
         // set its state for the downstream to process it correctly.
         const resource = this.getResource_();
         return resource.whenBuilt().then(() => {
-          if (resource.getState() == ResourceState.LAYOUT_COMPLETE) {
+          if (resource.getState() == ResourceState_Enum.LAYOUT_COMPLETE) {
             return;
           }
           if (
-            resource.getState() != ResourceState.LAYOUT_SCHEDULED ||
+            resource.getState() != ResourceState_Enum.LAYOUT_SCHEDULED ||
             resource.isMeasureRequested()
           ) {
             resource.measure();
@@ -846,7 +850,7 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
     /**
      * Update the internal ready state.
      *
-     * @param {!ReadyState} state
+     * @param {!ReadyState_Enum} state
      * @param {*=} opt_failure
      * @protected
      * @final
@@ -863,29 +867,29 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
       }
 
       switch (state) {
-        case ReadyState.LOADING:
-          this.signals_.signal(CommonSignals.LOAD_START);
-          this.signals_.reset(CommonSignals.UNLOAD);
-          this.signals_.reset(CommonSignals.LOAD_END);
+        case ReadyState_Enum.LOADING:
+          this.signals_.signal(CommonSignals_Enum.LOAD_START);
+          this.signals_.reset(CommonSignals_Enum.UNLOAD);
+          this.signals_.reset(CommonSignals_Enum.LOAD_END);
           this.classList.add('i-amphtml-layout');
           // Potentially start the loading indicator.
           this.toggleLoading(true);
-          this.dispatchCustomEventForTesting(AmpEvents.LOAD_START);
+          this.dispatchCustomEventForTesting(AmpEvents_Enum.LOAD_START);
           return;
-        case ReadyState.COMPLETE:
+        case ReadyState_Enum.COMPLETE:
           // LOAD_START is set just in case. It won't be overwritten if
           // it had been set before.
-          this.signals_.signal(CommonSignals.LOAD_START);
-          this.signals_.signal(CommonSignals.LOAD_END);
-          this.signals_.reset(CommonSignals.UNLOAD);
+          this.signals_.signal(CommonSignals_Enum.LOAD_START);
+          this.signals_.signal(CommonSignals_Enum.LOAD_END);
+          this.signals_.reset(CommonSignals_Enum.UNLOAD);
           this.classList.add('i-amphtml-layout');
           this.toggleLoading(false);
           dom.dispatchCustomEvent(this, 'load', null, NO_BUBBLES);
-          this.dispatchCustomEventForTesting(AmpEvents.LOAD_END);
+          this.dispatchCustomEventForTesting(AmpEvents_Enum.LOAD_END);
           return;
-        case ReadyState.ERROR:
+        case ReadyState_Enum.ERROR:
           this.signals_.rejectSignal(
-            CommonSignals.LOAD_END,
+            CommonSignals_Enum.LOAD_END,
             /** @type {!Error} */ (opt_failure)
           );
           this.toggleLoading(false);
@@ -977,8 +981,8 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
     getSizer_() {
       if (
         this.sizerElement === undefined &&
-        (this.layout_ === Layout.RESPONSIVE ||
-          this.layout_ === Layout.INTRINSIC)
+        (this.layout_ === Layout_Enum.RESPONSIVE ||
+          this.layout_ === Layout_Enum.INTRINSIC)
       ) {
         // Expect sizer to exist, just not yet discovered.
         this.sizerElement = this.querySelector('i-amphtml-sizer');
@@ -992,11 +996,11 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
      * @private
      */
     resetSizer_(sizer) {
-      if (this.layout_ === Layout.RESPONSIVE) {
+      if (this.layout_ === Layout_Enum.RESPONSIVE) {
         setStyle(sizer, 'paddingTop', '0');
         return;
       }
-      if (this.layout_ === Layout.INTRINSIC) {
+      if (this.layout_ === Layout_Enum.INTRINSIC) {
         const intrinsicSizerImg = sizer.querySelector(
           '.i-amphtml-intrinsic-sizer'
         );
@@ -1063,7 +1067,7 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
 
       // Heights.
       const heightsAttr =
-        this.layout_ === Layout.RESPONSIVE
+        this.layout_ === Layout_Enum.RESPONSIVE
           ? this.getAttribute('heights')
           : null;
       if (heightsAttr) {
@@ -1126,7 +1130,7 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
       if (this.isAwaitingSize_()) {
         this.sizeProvided_();
       }
-      dom.dispatchCustomEvent(this, AmpEvents.SIZE_CHANGED);
+      dom.dispatchCustomEvent(this, AmpEvents_Enum.SIZE_CHANGED);
     }
 
     /**
@@ -1189,7 +1193,7 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
             this.getResources().upgraded(this);
           }
           this.connected_();
-          this.dispatchCustomEventForTesting(AmpEvents.ATTACHED);
+          this.dispatchCustomEventForTesting(AmpEvents_Enum.ATTACHED);
         }
         if (this.implClass_ && this.R1()) {
           this.upgradeOrSchedule_();
@@ -1214,7 +1218,7 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
         }
 
         if (!this.isUpgraded()) {
-          this.dispatchCustomEventForTesting(AmpEvents.STUBBED);
+          this.dispatchCustomEventForTesting(AmpEvents_Enum.STUBBED);
         }
       }
 
@@ -1261,12 +1265,12 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
         // Already built or building: just needs to be mounted.
         this.setReadyStateInternal(
           this.implClass_ && this.implClass_.usesLoading(this)
-            ? ReadyState.LOADING
-            : ReadyState.MOUNTING
+            ? ReadyState_Enum.LOADING
+            : ReadyState_Enum.MOUNTING
         );
       } else {
         // Not built yet: execute prebuild steps.
-        this.setReadyStateInternal(ReadyState.BUILDING);
+        this.setReadyStateInternal(ReadyState_Enum.BUILDING);
 
         // Schedule preconnects.
         if (!opt_disablePreload) {
@@ -1300,7 +1304,7 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
       if (this.isInTemplate_) {
         return;
       }
-      if (this.upgradeState_ != UpgradeState.NOT_UPGRADED) {
+      if (this.upgradeState_ != UpgradeState_Enum.NOT_UPGRADED) {
         // Already upgraded or in progress or failed.
         return;
       }
@@ -1315,7 +1319,7 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
       // The `upgradeCallback` only allows redirect once for the top-level
       // non-stub class. We may allow nested upgrades later, but they will
       // certainly be bad for performance.
-      this.upgradeState_ = UpgradeState.UPGRADE_IN_PROGRESS;
+      this.upgradeState_ = UpgradeState_Enum.UPGRADE_IN_PROGRESS;
       const startTime = win.Date.now();
       const res = impl.upgradeCallback();
       if (!res) {
@@ -1328,7 +1332,7 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
             this.completeUpgrade_(upgrade || impl, startTime);
           })
           .catch((reason) => {
-            this.upgradeState_ = UpgradeState.UPGRADE_FAILED;
+            this.upgradeState_ = UpgradeState_Enum.UPGRADE_FAILED;
             rethrowAsync(reason);
           });
       } else {
@@ -1423,6 +1427,15 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
       return this.implClass_ ? this.implClass_.prerenderAllowed(this) : false;
     }
 
+    /**
+     * Whether the element can preview.
+     * @return {boolean}
+     * @final
+     */
+    previewAllowed() {
+      return this.implClass_ ? this.implClass_.previewAllowed(this) : false;
+    }
+
     /**
      * Whether the element has render-blocking service.
      * @return {boolean}
@@ -1565,7 +1578,7 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
      */
     createImpl_() {
       return this.signals_
-        .whenSignal(CommonSignals.READY_TO_UPGRADE)
+        .whenSignal(CommonSignals_Enum.READY_TO_UPGRADE)
         .then(() => {
           this.tryUpgrade_();
           return this.whenUpgraded();
@@ -1585,7 +1598,7 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
 
     /**
      * Returns the layout of the element.
-     * @return {!Layout}
+     * @return {!Layout_Enum}
      */
     getLayout() {
       return this.layout_;
@@ -1615,11 +1628,11 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
         return Promise.reject(cancellation());
       }
 
-      this.dispatchCustomEventForTesting(AmpEvents.LOAD_START);
+      this.dispatchCustomEventForTesting(AmpEvents_Enum.LOAD_START);
       const isLoadEvent = this.layoutCount_ == 0; // First layout is "load".
-      this.signals_.reset(CommonSignals.UNLOAD);
+      this.signals_.reset(CommonSignals_Enum.UNLOAD);
       if (isLoadEvent) {
-        this.signals_.signal(CommonSignals.LOAD_START);
+        this.signals_.signal(CommonSignals_Enum.LOAD_START);
       }
 
       // Potentially start the loading indicator.
@@ -1635,9 +1648,9 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
             throw cancellation();
           }
           if (isLoadEvent) {
-            this.signals_.signal(CommonSignals.LOAD_END);
+            this.signals_.signal(CommonSignals_Enum.LOAD_END);
           }
-          this.setReadyStateInternal(ReadyState.COMPLETE);
+          this.setReadyStateInternal(ReadyState_Enum.COMPLETE);
           this.layoutCount_++;
           this.toggleLoading(false);
           // Check if this is the first success layout that needs
@@ -1645,7 +1658,7 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
           if (!this.isFirstLayoutCompleted_) {
             this.impl_.firstLayoutCompleted();
             this.isFirstLayoutCompleted_ = true;
-            this.dispatchCustomEventForTesting(AmpEvents.LOAD_END);
+            this.dispatchCustomEventForTesting(AmpEvents_Enum.LOAD_END);
           }
         },
         (reason) => {
@@ -1655,11 +1668,11 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
           // add layoutCount_ by 1 despite load fails or not
           if (isLoadEvent) {
             this.signals_.rejectSignal(
-              CommonSignals.LOAD_END,
+              CommonSignals_Enum.LOAD_END,
               /** @type {!Error} */ (reason)
             );
           }
-          this.setReadyStateInternal(ReadyState.ERROR, reason);
+          this.setReadyStateInternal(ReadyState_Enum.ERROR, reason);
           this.layoutCount_++;
           this.toggleLoading(false);
           throw reason;
@@ -1716,12 +1729,12 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
       if (!this.isBuilt()) {
         return false;
       }
-      this.signals_.signal(CommonSignals.UNLOAD);
+      this.signals_.signal(CommonSignals_Enum.UNLOAD);
       const isReLayoutNeeded = this.impl_.unlayoutCallback();
       if (isReLayoutNeeded) {
         this.reset_();
       }
-      this.dispatchCustomEventForTesting(AmpEvents.UNLOAD);
+      this.dispatchCustomEventForTesting(AmpEvents_Enum.UNLOAD);
       return isReLayoutNeeded;
     }
 
@@ -1737,11 +1750,11 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
     reset_() {
       this.layoutCount_ = 0;
       this.isFirstLayoutCompleted_ = false;
-      this.signals_.reset(CommonSignals.MOUNTED);
-      this.signals_.reset(CommonSignals.RENDER_START);
-      this.signals_.reset(CommonSignals.LOAD_START);
-      this.signals_.reset(CommonSignals.LOAD_END);
-      this.signals_.reset(CommonSignals.INI_LOAD);
+      this.signals_.reset(CommonSignals_Enum.MOUNTED);
+      this.signals_.reset(CommonSignals_Enum.RENDER_START);
+      this.signals_.reset(CommonSignals_Enum.LOAD_START);
+      this.signals_.reset(CommonSignals_Enum.LOAD_END);
+      this.signals_.reset(CommonSignals_Enum.INI_LOAD);
     }
 
     /**
@@ -1796,6 +1809,11 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
     mutatedAttributesCallback(mutations) {
       if (this.impl_) {
         this.impl_.mutatedAttributesCallback(mutations);
+      } else if (this.R1()) {
+        // If amp-bind is trying to mutate an uninitialized BaseElement, it is probably about time
+        // to initialize it.
+        const scheduler = getSchedulerForDoc(this);
+        scheduler.scheduleAsap(this);
       }
     }
 
@@ -1958,9 +1976,9 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
       if (
         !this.R1() &&
         show &&
-        (resourceState == ResourceState.NOT_BUILT ||
-          resourceState == ResourceState.NOT_LAID_OUT ||
-          resourceState == ResourceState.READY_FOR_LAYOUT)
+        (resourceState == ResourceState_Enum.NOT_BUILT ||
+          resourceState == ResourceState_Enum.NOT_LAID_OUT ||
+          resourceState == ResourceState_Enum.READY_FOR_LAYOUT)
       ) {
         return;
       }
@@ -1986,7 +2004,7 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
      * @package @final
      */
     renderStarted() {
-      this.signals_.signal(CommonSignals.RENDER_START);
+      this.signals_.signal(CommonSignals_Enum.RENDER_START);
       this.togglePlaceholder(false);
       this.toggleLoading(false);
     }
@@ -2010,9 +2028,10 @@ function createBaseCustomElementClass(win, elementConnectedCallback) {
       // 7. The element's layout is not nodisplay.
 
       const laidOut =
-        this.layoutCount_ > 0 || this.signals_.get(CommonSignals.RENDER_START);
+        this.layoutCount_ > 0 ||
+        this.signals_.get(CommonSignals_Enum.RENDER_START);
       if (
-        this.layout_ == Layout.NODISPLAY ||
+        this.layout_ == Layout_Enum.NODISPLAY ||
         this.hasAttribute('noloading') ||
         (laidOut && !force) ||
         !isLoadingAllowed(this) ||
diff --git a/src/document-fetcher.js b/src/document-fetcher.js
index 03e16ecf8496..383e8788352f 100644
--- a/src/document-fetcher.js
+++ b/src/document-fetcher.js
@@ -1,5 +1,3 @@
-import {dict} from '#core/types/object';
-
 import {Services} from '#service';
 
 import {user} from '#utils/log';
@@ -114,7 +112,7 @@ function xhrRequest(input, init) {
  * @return {!JsonObject}
  */
 function parseHeaders(rawHeaders) {
-  const headers = dict({});
+  const headers = {};
   // Replace instances of \r\n and \n followed by at least one space or
   // horizontal tab with a space.
   const preProcessedHeaders = rawHeaders.replace(/\r?\n[\t ]+/g, ' ');
diff --git a/src/document-submit.js b/src/document-submit.js
index 4c359a2099cd..0c2fc56f7431 100644
--- a/src/document-submit.js
+++ b/src/document-submit.js
@@ -1,4 +1,4 @@
-import {ActionTrust} from '#core/constants/action-constants';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
 
 import {Services} from '#service';
 
@@ -152,7 +152,7 @@ export function onDocumentFormSubmit_(e) {
       /*source*/ form,
       /*caller*/ form,
       e,
-      ActionTrust.HIGH
+      ActionTrust_Enum.HIGH
     );
   }
 }
diff --git a/src/element-service.js b/src/element-service.js
index aeb4f119285e..9a9dc3ede87c 100644
--- a/src/element-service.js
+++ b/src/element-service.js
@@ -139,7 +139,7 @@ export function getElementServiceIfAvailableForDocInEmbedScope(
 
 /**
  * Throws user error if `service` is null.
- * @param {Object} service
+ * @param {object} service
  * @param {string} id
  * @param {string} extension
  * @return {!Object}
diff --git a/src/error-reporting.js b/src/error-reporting.js
index 19c521b1fcf9..d93367d91d8f 100644
--- a/src/error-reporting.js
+++ b/src/error-reporting.js
@@ -1,4 +1,4 @@
-import {AmpEvents} from '#core/constants/amp-events';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
 import {duplicateErrorIfNecessary} from '#core/error';
 import {
   USER_ERROR_SENTINEL,
@@ -8,7 +8,6 @@ import {
 import * as mode from '#core/mode';
 import {findIndex} from '#core/types/array';
 import {exponentialBackoff} from '#core/types/function/exponential-backoff';
-import {dict} from '#core/types/object';
 
 import {experimentTogglesOrNull, getBinaryType, isCanary} from '#experiments';
 
@@ -18,7 +17,7 @@ import {triggerAnalyticsEvent} from '#utils/analytics';
 import {isLoadErrorMessage} from '#utils/event-helper';
 import {dev, setReportError} from '#utils/log';
 
-import {urls} from './config';
+import * as urls from './config/urls';
 import {getMode} from './mode';
 import {makeBodyVisibleRecovery} from './style-installer';
 import {isProxyOrigin} from './url';
@@ -45,20 +44,35 @@ const ABORTED = 'AbortError';
  * them, but we'd still like to report the rough number.
  * @const {number}
  */
-const NON_ACTIONABLE_ERROR_THROTTLE_THRESHOLD = 0.001;
+const NON_ACTIONABLE_ERROR_THROTTLE_THRESHOLD = 0.9999;
 
 /**
  * The threshold for errors throttled because nothing can be done about
  * them, but we'd still like to report the rough number.
  * @const {number}
  */
-const USER_ERROR_THROTTLE_THRESHOLD = 0.1;
+const USER_ERROR_THROTTLE_THRESHOLD = 0.99;
 
 /**
- * Chance to post to the new error reporting endpoint.
+ * The threshold for reporting errors to the beta error reporting endpoint
+ * instead of the production endpoint.
  * @const {number}
  */
-const BETA_ERROR_REPORT_URL_FREQ = 0.1;
+const REPORT_ERROR_TO_BETA_ENDPOINT_THRESHOLD = 0.1;
+
+/**
+ * The threshold for errors on pages with non-AMP JS. These errors can almost
+ * never be acted upon, but spikes such as due to buggy browser extensions may
+ * be helpful to notify authors.
+ * @const {number}
+ */
+const NON_AMP_JS_ERROR_THRESHOLD = 0.99;
+
+/**
+ * Throttles reports for the Stable version.
+ * @const {number}
+ */
+const THROTTLE_STABLE_THRESHOLD = 0.9;
 
 /**
  * Collects error messages, so they can be included in subsequent reports.
@@ -208,7 +222,10 @@ export function reportError(error, opt_associatedElement) {
       }
     }
     if (element && element.dispatchCustomEventForTesting) {
-      element.dispatchCustomEventForTesting(AmpEvents.ERROR, error.message);
+      element.dispatchCustomEventForTesting(
+        AmpEvents_Enum.ERROR,
+        error.message
+      );
     }
 
     // 'call' to make linter happy. And .call to make compiler happy
@@ -317,10 +334,7 @@ function onError(message, filename, line, col, error) {
   } catch (ignore) {
     // Ignore errors during error report generation.
   }
-  if (hasNonAmpJs && Math.random() > 0.01) {
-    // Only report 1% of errors on pages with non-AMP JS.
-    // These errors can almost never be acted upon, but spikes such as
-    // due to buggy browser extensions may be helpful to notify authors.
+  if (hasNonAmpJs && Math.random() < NON_AMP_JS_ERROR_THRESHOLD) {
     return;
   }
   const data = getErrorReportData(
@@ -355,7 +369,7 @@ function onError(message, filename, line, col, error) {
  * @return {string} error reporting endpoint URL.
  */
 function chooseReportingUrl_() {
-  return Math.random() < BETA_ERROR_REPORT_URL_FREQ
+  return Math.random() < REPORT_ERROR_TO_BETA_ENDPOINT_THRESHOLD
     ? urls.betaErrorReporting
     : urls.errorReporting;
 }
@@ -371,8 +385,7 @@ export function reportErrorToServerOrViewer(win, data) {
   // to the viewer is exactly the same as the data passed to the server
   // below.
 
-  // Throttle reports from Stable by 90%.
-  if (data['pt'] && Math.random() < 0.9) {
+  if (data['pt'] && Math.random() < THROTTLE_STABLE_THRESHOLD) {
     return Promise.resolve();
   }
 
@@ -431,7 +444,7 @@ export function maybeReportErrorToViewer(win, data) {
  * @visibleForTesting
  */
 export function errorReportingDataForViewer(errorReportData) {
-  return dict({
+  return {
     'm': errorReportData['m'], // message
     'a': errorReportData['a'], // isUserError
     's': errorReportData['s'], // error stack
@@ -439,7 +452,7 @@ export function errorReportingDataForViewer(errorReportData) {
     'ex': errorReportData['ex'], // expected error?
     'v': errorReportData['v'], // runtime
     'pt': errorReportData['pt'], // is pre-throttled
-  });
+  };
 }
 
 /**
@@ -513,7 +526,7 @@ export function getErrorReportData(
   ) {
     expected = true;
 
-    if (throttleBase > NON_ACTIONABLE_ERROR_THROTTLE_THRESHOLD) {
+    if (throttleBase < NON_ACTIONABLE_ERROR_THROTTLE_THRESHOLD) {
       return;
     }
   }
@@ -521,7 +534,7 @@ export function getErrorReportData(
   const isUserError = isUserErrorMessage(message);
 
   // Only report a subset of user errors.
-  if (isUserError && throttleBase > USER_ERROR_THROTTLE_THRESHOLD) {
+  if (isUserError && throttleBase < USER_ERROR_THROTTLE_THRESHOLD) {
     return;
   }
 
@@ -548,14 +561,17 @@ export function getErrorReportData(
     runtime = 'esm';
     data['esm'] = '1';
   } else if (self.context && self.context.location) {
-    data['3p'] = '1';
     runtime = '3p';
+    data['3p'] = '1';
   } else if (getMode().runtime) {
     runtime = getMode().runtime;
   }
 
   data['rt'] = runtime;
 
+  // The value of urls.cdn.
+  data['cdn'] = urls.cdn;
+
   // Add our a4a id if we are inabox
   if (runtime === 'inabox') {
     data['adid'] = getMode().a4aId;
@@ -671,10 +687,10 @@ export function reportErrorToAnalytics(error, win) {
   // Currently this can only be executed in a single-doc mode. Otherwise,
   // it's not clear which ampdoc the event would belong too.
   if (Services.ampdocServiceFor(win).isSingleDoc()) {
-    const vars = dict({
+    const vars = {
       'errorName': error.name,
       'errorMessage': error.message,
-    });
+    };
     triggerAnalyticsEvent(
       getRootElement_(win),
       'user-error',
diff --git a/src/experiments/amp-globals.d.ts b/src/experiments/amp-globals.d.ts
new file mode 100644
index 000000000000..ea3866873ddb
--- /dev/null
+++ b/src/experiments/amp-globals.d.ts
@@ -0,0 +1,10 @@
+export {};
+
+declare global {
+  interface Window {
+    __AMP_EXPERIMENT_BRANCHES?: import('./types.d').ExperimentBranchMap;
+    __AMP__EXPERIMENT_TOGGLES?: {[key: string]: boolean};
+    __AMP_EXP?: HTMLScriptElement;
+    AMP_EXP?: {[key: string]: number};
+  }
+}
diff --git a/src/experiments/attribution-reporting.js b/src/experiments/attribution-reporting.js
new file mode 100644
index 000000000000..88853a167e19
--- /dev/null
+++ b/src/experiments/attribution-reporting.js
@@ -0,0 +1,11 @@
+/**
+ * @const
+ * @type {{[key: string]: string}}
+ */
+export const AttributionReporting = {
+  ID: 'attribution-reporting',
+  DISABLE: '42531928',
+  ENABLE: '42531929',
+  DISABLE_NO_ASYNC: '42531930',
+  ENABLE_NO_ASYNC: '42531931',
+};
diff --git a/src/experiments/experiments.extern.js b/src/experiments/experiments.extern.js
deleted file mode 100644
index a6168cc9292b..000000000000
--- a/src/experiments/experiments.extern.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * @fileoverview global externs for the experiment system.
- * @externs
- */
-
-/** @type {undefined|Object<string, ?string>} */
-window.__AMP_EXPERIMENT_BRANCHES;
-
-/** @type {undefined|HTMLScriptElement} */
-window.__AMP_EXP;
-/** @type {undefined|!Object<string, number>} */
-window.AMP_EXP;
diff --git a/src/experiments/experiments.type.js b/src/experiments/experiments.type.js
deleted file mode 100644
index cbadb8c9a198..000000000000
--- a/src/experiments/experiments.type.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * @typedef {{
- *   experimentId: string,
- *   isTrafficEligible: function(!Window):boolean,
- *   branches: !Array<string>
- * }}
- */
-export let ExperimentInfoDef;
diff --git a/src/experiments/globals.d.ts b/src/experiments/globals.d.ts
new file mode 100644
index 000000000000..2f79293802b7
--- /dev/null
+++ b/src/experiments/globals.d.ts
@@ -0,0 +1 @@
+import './amp-globals.d';
diff --git a/src/experiments/index.js b/src/experiments/index.js
index fde96f791ef4..ad9cb5441f88 100644
--- a/src/experiments/index.js
+++ b/src/experiments/index.js
@@ -2,9 +2,10 @@
  * @fileoverview Experiments system allows a developer to opt-in to test
  * features that are not yet fully tested.
  *
- * Experiments page: https://cdn.ampproject.org/experiments.html *
+ * Experiments page: https://cdn.ampproject.org/experiments.html
  */
 
+import {devAssert} from '#core/assert';
 import {isArray} from '#core/types';
 import {hasOwn, map} from '#core/types/object';
 import {parseJson} from '#core/types/object/json';
@@ -12,23 +13,29 @@ import {parseQueryString} from '#core/types/string/url';
 
 import {dev, user} from '#utils/log';
 
-import {ExperimentInfoDef} from './experiments.type';
-
 import {getMode} from '../mode';
 import {getTopWindow} from '../service-helpers';
 
-/** @const {string} */
+/** @typedef {import('./types.d').ExperimentBranchMap} ExperimentBranchMap */
+/** @typedef {{[key: string]: boolean}} ExperimentTogglesMap */
+
+/**
+ * @const
+ * @type {string}
+ */
 const TAG = 'EXPERIMENTS';
 
-/** @const {string} */
+/**
+ * @const
+ * @type {string}
+ */
 const LOCAL_STORAGE_KEY = 'amp-experiment-toggles';
 
-/** @const {string} */
 const TOGGLES_WINDOW_PROPERTY = '__AMP__EXPERIMENT_TOGGLES';
 
 /**
  * Whether we are in canary.
- * @param {!Window} win
+ * @param {Window} win
  * @return {boolean}
  */
 export function isCanary(win) {
@@ -37,7 +44,7 @@ export function isCanary(win) {
 
 /**
  * Returns binary type, e.g., canary, production, control, or rc.
- * @param {!Window} win
+ * @param {Window} win
  * @return {string}
  */
 export function getBinaryType(win) {
@@ -46,7 +53,7 @@ export function getBinaryType(win) {
 
 /**
  * Whether the specified experiment is on or off.
- * @param {!Window} win
+ * @param {Window} win
  * @param {string} experimentId
  * @return {boolean}
  */
@@ -58,7 +65,7 @@ export function isExperimentOn(win, experimentId) {
 /**
  * Toggles the experiment on or off. Returns the actual value of the experiment
  * after toggling is done.
- * @param {!Window} win
+ * @param {Window} win
  * @param {string} experimentId
  * @param {boolean=} opt_on
  * @param {boolean=} opt_transientExperiment  Whether to toggle the
@@ -101,15 +108,16 @@ export function toggleExperiment(
 /**
  * Calculate whether the experiment is on or off based off of its default value,
  * stored overriden value, or the global config frequency given.
- * @param {!Window} win
- * @return {!Object<string, boolean>}
+ * @param {Window} win
+ * @return {ExperimentTogglesMap}
  */
 export function experimentToggles(win) {
   if (win[TOGGLES_WINDOW_PROPERTY]) {
-    return win[TOGGLES_WINDOW_PROPERTY];
+    return /** @type {ExperimentTogglesMap} */ (win[TOGGLES_WINDOW_PROPERTY]);
   }
-  win[TOGGLES_WINDOW_PROPERTY] = map();
+  win[TOGGLES_WINDOW_PROPERTY] = /** @type {ExperimentTogglesMap} */ (map());
   const toggles = win[TOGGLES_WINDOW_PROPERTY];
+  devAssert(toggles);
 
   // Read default and injected configs of this build.
   const buildExperimentConfigs = {
@@ -129,9 +137,9 @@ export function experimentToggles(win) {
       'meta[name="amp-experiments-opt-in"]'
     );
     if (meta) {
-      const optedInExperiments = meta.getAttribute('content').split(',');
+      const optedInExperiments = meta.getAttribute('content')?.split(',') || [];
       for (const experiment of optedInExperiments) {
-        if (dev().assertArray(allowedDocOptIn).includes(experiment)) {
+        if (allowedDocOptIn.includes(experiment)) {
           toggles[experiment] = true;
         }
       }
@@ -160,8 +168,8 @@ export function experimentToggles(win) {
 /**
  * Returns the cached experiments toggles, or null if they have not been
  * computed yet.
- * @param {!Window} win
- * @return {?Object<string, boolean>}
+ * @param {Window} win
+ * @return {?ExperimentTogglesMap}
  */
 export function experimentTogglesOrNull(win) {
   return win[TOGGLES_WINDOW_PROPERTY] || null;
@@ -169,14 +177,14 @@ export function experimentTogglesOrNull(win) {
 
 /**
  * Returns a set of experiment IDs currently on.
- * @param {!Window} win
- * @return {!Object<string, boolean>}
+ * @param {Window} win
+ * @return {ExperimentTogglesMap}
  */
 function getExperimentToggles(win) {
   let experimentsString = '';
   try {
     if ('localStorage' in win) {
-      experimentsString = win.localStorage.getItem(LOCAL_STORAGE_KEY);
+      experimentsString = win.localStorage.getItem(LOCAL_STORAGE_KEY) ?? '';
     }
   } catch {
     dev().warn(TAG, 'Failed to retrieve experiments from localStorage.');
@@ -199,8 +207,8 @@ function getExperimentToggles(win) {
 
 /**
  * Saves a set of experiment IDs currently on.
- * @param {!Window} win
- * @param {!Object<string, boolean>} toggles
+ * @param {Window} win
+ * @param {ExperimentTogglesMap} toggles
  */
 function saveExperimentToggles(win, toggles) {
   const experimentIds = [];
@@ -216,8 +224,8 @@ function saveExperimentToggles(win, toggles) {
 
 /**
  * See getExperimentToggles().
- * @param {!Window} win
- * @return {!Object<string, boolean>}
+ * @param {Window} win
+ * @return {ExperimentTogglesMap}
  * @visibleForTesting
  */
 export function getExperimentTogglesForTesting(win) {
@@ -226,12 +234,12 @@ export function getExperimentTogglesForTesting(win) {
 
 /**
  * Resets the experimentsToggle cache for testing purposes.
- * @param {!Window} win
+ * @param {Window} win
  * @visibleForTesting
  */
 export function resetExperimentTogglesForTesting(win) {
   saveExperimentToggles(win, {});
-  win[TOGGLES_WINDOW_PROPERTY] = null;
+  win[TOGGLES_WINDOW_PROPERTY] = undefined;
 }
 
 /**
@@ -255,7 +263,8 @@ function slowButAccuratePrng() {
  * out easily in tests.
  *
  * @visibleForTesting
- * @const {!{accuratePrng: function():number}}
+ * @const
+ * @type {{accuratePrng: function():number}}
  */
 export const RANDOM_NUMBER_GENERATORS = {
   accuratePrng: slowButAccuratePrng,
@@ -263,12 +272,12 @@ export const RANDOM_NUMBER_GENERATORS = {
 
 /**
  * Selects, uniformly at random, a single item from the array.
- * @param {!Array<string>} arr Object to select from.
+ * @param {string[]} arr Object to select from.
  * @return {?string} Single item from arr or null if arr was empty.
  */
 function selectRandomItem(arr) {
   const rn = RANDOM_NUMBER_GENERATORS.accuratePrng();
-  return dev().assertString(arr[Math.floor(rn * arr.length)]) || null;
+  return arr[Math.floor(rn * arr.length)] || null;
 }
 
 /**
@@ -280,15 +289,16 @@ function selectRandomItem(arr) {
  * experimentName) and, if it is on, look for which branch is selected in
  * win.__AMP_EXPERIMENT_BRANCHES[experimentName].
  *
- * @param {!Window} win Window context on which to save experiment
+ * @param {Window} win Window context on which to save experiment
  *     selection state.
- * @param {!Array<!ExperimentInfoDef>} experiments  Set of experiments to
- *     configure for this page load.
- * @return {!Object<string, string>} Map of experiment names to selected
+ * @param {import('./types.d').ExperimentInfo[]} experiments Set of experiments
+ *     to configure for this page load.
+ * @return {ExperimentBranchMap} Map of experiment names to selected
  *     branches.
  */
 export function randomlySelectUnsetExperiments(win, experiments) {
   win.__AMP_EXPERIMENT_BRANCHES = win.__AMP_EXPERIMENT_BRANCHES || {};
+  /** @type {ExperimentBranchMap} */
   const selectedExperiments = {};
   for (const experiment of experiments) {
     const experimentName = experiment.experimentId;
@@ -324,7 +334,7 @@ export function randomlySelectUnsetExperiments(win, experiments) {
  * Returns the experiment branch enabled for the given experiment ID.
  * For example, 'control' or 'experiment'.
  *
- * @param {!Window} win Window context to check for experiment state.
+ * @param {Window} win Window context to check for experiment state.
  * @param {string} experimentName Name of the experiment to check.
  * @return {?string} Active experiment branch ID for experimentName (possibly
  *     null if experimentName has been tested but no branch was enabled).
@@ -339,8 +349,8 @@ export function getExperimentBranch(win, experimentName) {
  * Returns an object containing all active experiment branches on the
  * top Window.
  *
- * @param {!Window} win Window context to check for experiment state.
- * @return {!Object} contains all experiment branches and their ids.
+ * @param {Window} win Window context to check for experiment state.
+ * @return {object} contains all experiment branches and their ids.
  */
 export function getActiveExperimentBranches(win) {
   const topWin = getTopWindow(win);
@@ -354,7 +364,7 @@ export function getActiveExperimentBranches(win) {
  * Force enable (or disable) a specific branch of a given experiment name.
  * Disables the experiment name altogether if branchId is falseish.
  *
- * @param {!Window} win Window context to check for experiment state.
+ * @param {Window} win Window context to check for experiment state.
  * @param {string} experimentName Name of the experiment to check.
  * @param {?string} branchId ID of branch to force or null to disable
  *     altogether.
diff --git a/src/experiments/shame.extern.js b/src/experiments/shame.extern.js
deleted file mode 100644
index 43ae41c74fcd..000000000000
--- a/src/experiments/shame.extern.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * @fileoverview The junk-drawer of externs that haven't yet been sorted well.
- * Shame! Shame! Shame! Avoid adding to this.
- *
- * It's okay for some things to start off here, since moving them doesn't
- * require any other file changes (unlike real code, which requires updating)
- * imports throughout the repo).
- *
- * @externs
- */
-
-/** @interface */
-function Logger() {}
-/** @type {function(...?)} */
-Logger.prototype.warn;
-/** @type {function(...?)} */
-Logger.prototype.error;
-/** @type {function(...?)} */
-Logger.prototype.assertString;
-/** @type {function():!Logger} */
-let user$$module$src$utils$log;
-/** @type {function():!Logger} */
-let dev$$module$src$utils$log;
-
-/** @type {function():!{test:boolean}} */
-let getMode$$module$src$mode;
-
-/** @type {function(!Window):!Window} */
-let getTopWindow$$module$src$service_helpers;
-
-/** @type {function(string):!JsonObject} */
-let parseQueryString$$module$src$url;
-
-/** @type {?} */
-window.AMP_CONFIG;
-/** @type {boolean|undefined} */
-window.AMP_CONFIG.canary;
-/** @type {string|undefined} */
-window.AMP_CONFIG.type;
diff --git a/src/experiments/story-ad-auto-advance.js b/src/experiments/story-ad-auto-advance.js
deleted file mode 100644
index 35c942889eef..000000000000
--- a/src/experiments/story-ad-auto-advance.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import {randomlySelectUnsetExperiments} from '#experiments';
-
-import {ExperimentInfoDef} from './experiments.type';
-
-/** @const {!Object<string, string>} */
-export const AdvanceExpToTime = {
-  '31060905': '6s',
-  '31060906': '8s',
-  '31060907': '10s',
-};
-
-/** @const */
-export const StoryAdAutoAdvance = {
-  ID: 'story-ad-auto-advance',
-  CONTROL: '31060904',
-  SIX_SECONDS: '31060905',
-  EIGHT_SECONDS: '31060906',
-  TEN_SECONDS: '31060907',
-};
-
-/**
- * Choose what time value to auto advance story ads.
- * @param {!Window} win
- */
-export function divertStoryAdAutoAdvance(win) {
-  /** @type {!ExperimentInfoDef} */
-  const experimentInfo = {
-    experimentId: StoryAdAutoAdvance.ID,
-    isTrafficEligible: () => true,
-    branches: [
-      StoryAdAutoAdvance.CONTROL,
-      StoryAdAutoAdvance.SIX_SECONDS,
-      StoryAdAutoAdvance.EIGHT_SECONDS,
-      StoryAdAutoAdvance.TEN_SECONDS,
-    ],
-  };
-  randomlySelectUnsetExperiments(win, [experimentInfo]);
-}
diff --git a/src/experiments/story-ad-placements.js b/src/experiments/story-ad-placements.js
index 7f31c192c842..9a5eead90bd4 100644
--- a/src/experiments/story-ad-placements.js
+++ b/src/experiments/story-ad-placements.js
@@ -1,8 +1,9 @@
 import {randomlySelectUnsetExperiments} from '#experiments';
 
-import {ExperimentInfoDef} from './experiments.type';
-
-/** @const */
+/**
+ * @const
+ * @type {{[key: string]: string}}
+ */
 export const StoryAdPlacements = {
   ID: 'story-ad-placements',
   CONTROL: '31060567',
@@ -13,10 +14,10 @@ export const StoryAdPlacements = {
 
 /**
  * Choose which placement algorithm and density for given win.
- * @param {!Window} win
+ * @param {Window} win
  */
 export function divertStoryAdPlacements(win) {
-  /** @type {!ExperimentInfoDef} */
+  /** @type {import('./types.d').ExperimentInfo} */
   const experimentInfo = {
     experimentId: StoryAdPlacements.ID,
     isTrafficEligible: () => true,
diff --git a/src/experiments/story-ad-progress-segment.js b/src/experiments/story-ad-progress-segment.js
index d8cb62809e63..39871aa83217 100644
--- a/src/experiments/story-ad-progress-segment.js
+++ b/src/experiments/story-ad-progress-segment.js
@@ -1,25 +1,11 @@
-/** @const */
+/**
+ * @const
+ * @type {{[key: string]: string}}
+ */
 export const StoryAdSegmentExp = {
-  ID: 'story-ad-progress-segment',
-  CONTROL: '31063379', // No ad advance, no page advance, no new cta.
-  NO_ADVANCE_BOTH: '31063380', // No ad advance, no page advance, new cta.
-  NO_ADVANCE_AD: '31063381', // No ad advance, page=10s, new cta.
-  TEN_SECONDS: '31063382', // Advance ad with new cta for the rest, page=10s.
-  TWELVE_SECONDS: '31063383',
-  FOURTEEN_SECONDS: '31063384',
-};
-
-/** @const */
-export const StoryAdSegmentTimes = {
-  SENTINEL: '999999ms',
-  TEN_SECONDS: '10000ms',
-  TWELVE_SECONDS: '12000ms',
-  FOURTEEN_SECONDS: '14000ms',
-};
-
-/** @const */
-export const BranchToTimeValues = {
-  [StoryAdSegmentExp.TEN_SECONDS]: StoryAdSegmentTimes.TEN_SECONDS,
-  [StoryAdSegmentExp.TWELVE_SECONDS]: StoryAdSegmentTimes.TWELVE_SECONDS,
-  [StoryAdSegmentExp.FOURTEEN_SECONDS]: StoryAdSegmentTimes.FOURTEEN_SECONDS,
+  ID: 'story-ad-auto-advance',
+  CONTROL: '31067116', // No change
+  AUTO_ADVANCE_OLD_CTA: '31067117', // Auto advance, old CTA button
+  AUTO_ADVANCE_NEW_CTA: '31067118', // Auto advance, new CTA button
+  AUTO_ADVANCE_NEW_CTA_NOT_ANIMATED: '31067119', // Auto advance, new CTA button but not animated
 };
diff --git a/src/experiments/tsconfig.json b/src/experiments/tsconfig.json
new file mode 100644
index 000000000000..51084ee172c1
--- /dev/null
+++ b/src/experiments/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "include": ["**/*.js", "**/*.d.ts", "../core/**/globals.d.ts"]
+}
diff --git a/src/experiments/types.d.ts b/src/experiments/types.d.ts
new file mode 100644
index 000000000000..fbfe985406c0
--- /dev/null
+++ b/src/experiments/types.d.ts
@@ -0,0 +1,8 @@
+export type ExperimentInfo = {
+ experimentId: string;
+ isTrafficEligible: (win: Window) => boolean;
+ branches: string[];
+};
+
+// Map from experiment ID to one of its branches (or null, if ineligible)
+export type ExperimentBranchMap = {[key: string]: (string|null)};
diff --git a/src/extension-analytics.js b/src/extension-analytics.js
index 57e65cce61cd..b7ef0e700002 100644
--- a/src/extension-analytics.js
+++ b/src/extension-analytics.js
@@ -1,7 +1,6 @@
-import {CommonSignals} from '#core/constants/common-signals';
+import {CommonSignals_Enum} from '#core/constants/common-signals';
 import {createElementWithAttributes, removeElement} from '#core/dom';
 import {isArray} from '#core/types';
-import {dict} from '#core/types/object';
 import {getWin} from '#core/window';
 
 import {Services} from '#service';
@@ -25,21 +24,13 @@ export function insertAnalyticsElement(
   disableImmediate = false
 ) {
   const doc = /** @type {!Document} */ (parentElement.ownerDocument);
-  const analyticsElem = createElementWithAttributes(
-    doc,
-    'amp-analytics',
-    dict({
-      'sandbox': 'true',
-      'trigger': disableImmediate ? '' : 'immediate',
-    })
-  );
-  const scriptElem = createElementWithAttributes(
-    doc,
-    'script',
-    dict({
-      'type': 'application/json',
-    })
-  );
+  const analyticsElem = createElementWithAttributes(doc, 'amp-analytics', {
+    'sandbox': 'true',
+    'trigger': disableImmediate ? '' : 'immediate',
+  });
+  const scriptElem = createElementWithAttributes(doc, 'script', {
+    'type': 'application/json',
+  });
   scriptElem.textContent = JSON.stringify(config);
   analyticsElem.appendChild(scriptElem);
   analyticsElem.CONFIG = config;
@@ -93,7 +84,7 @@ class CustomEventReporter {
 
     this.parent_
       .signals()
-      .whenSignal(CommonSignals.LOAD_START)
+      .whenSignal(CommonSignals_Enum.LOAD_START)
       .then(() => {
         insertAnalyticsElement(this.parent_, config, true);
       });
@@ -215,7 +206,7 @@ export function useAnalyticsInSandbox(element, promise) {
   // Listener to LOAD_START signal. Insert analytics element on LOAD_START
   element
     .signals()
-    .whenSignal(CommonSignals.LOAD_START)
+    .whenSignal(CommonSignals_Enum.LOAD_START)
     .then(() => {
       if (analyticsElement || !configPromise) {
         return;
@@ -233,7 +224,7 @@ export function useAnalyticsInSandbox(element, promise) {
   // Listener to UNLOAD signal. Destroy remove element on UNLOAD
   element
     .signals()
-    .whenSignal(CommonSignals.UNLOAD)
+    .whenSignal(CommonSignals_Enum.UNLOAD)
     .then(() => {
       configPromise = null;
       if (analyticsElement) {
diff --git a/src/font-stylesheet-timeout.js b/src/font-stylesheet-timeout.js
index 94213ce64949..a8a9ca3ad744 100644
--- a/src/font-stylesheet-timeout.js
+++ b/src/font-stylesheet-timeout.js
@@ -1,7 +1,7 @@
 import {onDocumentReady} from '#core/document/ready';
 import {escapeCssSelectorIdent} from '#core/dom/css-selectors';
 
-import {urls} from './config';
+import * as urls from './config/urls';
 
 /**
  * While browsers put a timeout on font downloads (3s by default,
@@ -54,7 +54,7 @@ function maybeTimeoutFonts(win) {
     // Find all stylesheets that aren't loaded from the AMP CDN (those are
     // critical if they are present).
     const styleLinkElements = win.document.querySelectorAll(
-      `link[rel~="stylesheet"]:not([href^="${escapeCssSelectorIdent(
+      `link[rel~="stylesheet"]:not([href^="https://translate.googleapis.com/translate_static/css/"]):not([href^="${escapeCssSelectorIdent(
         urls.cdn
       )}"])`
     );
diff --git a/src/form-data-wrapper.js b/src/form-data-wrapper.js
index 6bed6a0ac2b6..8f5720efb302 100644
--- a/src/form-data-wrapper.js
+++ b/src/form-data-wrapper.js
@@ -52,7 +52,7 @@ export function isFormDataWrapper(o) {
 export class PolyfillFormDataWrapper {
   /** @override */
   constructor(opt_form = undefined) {
-    /** @private @const {!Object<string, !Array<string>>} */
+    /** @private @const {!{[key: string]: !Array<string>}} */
     this.fieldValues_ = opt_form ? getFormAsObject(opt_form) : map();
   }
 
diff --git a/src/friendly-iframe-embed.js b/src/friendly-iframe-embed.js
index 9cd8583911c0..c5acd03ed5ed 100644
--- a/src/friendly-iframe-embed.js
+++ b/src/friendly-iframe-embed.js
@@ -1,5 +1,5 @@
-import {CommonSignals} from '#core/constants/common-signals';
-import {VisibilityState} from '#core/constants/visibility-state';
+import {CommonSignals_Enum} from '#core/constants/common-signals';
+import {VisibilityState_Enum} from '#core/constants/visibility-state';
 import {Deferred} from '#core/data-structures/promise';
 import {Signals} from '#core/data-structures/signals';
 import {isDocumentReady} from '#core/document/ready';
@@ -29,7 +29,7 @@ import {installTimerInEmbedWindow} from '#service/timer-impl';
 import {loadPromise} from '#utils/event-helper';
 import {dev, devAssert, userAssert} from '#utils/log';
 
-import {urls} from './config';
+import * as urls from './config/urls';
 import {FIE_EMBED_PROP} from './iframe-helper';
 import {whenContentIniLoad} from './ini-load';
 import {getMode} from './mode';
@@ -382,8 +382,8 @@ export class FriendlyIframeEmbed {
     this.signals_ = this.ampdoc
       ? this.ampdoc.signals()
       : this.host
-      ? this.host.signals()
-      : new Signals();
+        ? this.host.signals()
+        : new Signals();
 
     /** @private @const {!Deferred} */
     this.renderComplete_ = new Deferred();
@@ -436,7 +436,7 @@ export class FriendlyIframeEmbed {
    * @return {!Promise}
    */
   whenRenderStarted() {
-    return this.signals_.whenSignal(CommonSignals.RENDER_START);
+    return this.signals_.whenSignal(CommonSignals_Enum.RENDER_START);
   }
 
   /**
@@ -455,7 +455,7 @@ export class FriendlyIframeEmbed {
    * @return {!Promise}
    */
   whenIniLoaded() {
-    return this.signals_.whenSignal(CommonSignals.INI_LOAD);
+    return this.signals_.whenSignal(CommonSignals_Enum.INI_LOAD);
   }
 
   /**
@@ -480,7 +480,7 @@ export class FriendlyIframeEmbed {
    */
   pause() {
     if (this.ampdoc) {
-      this.ampdoc.overrideVisibilityState(VisibilityState.PAUSED);
+      this.ampdoc.overrideVisibilityState(VisibilityState_Enum.PAUSED);
     }
   }
 
@@ -489,7 +489,7 @@ export class FriendlyIframeEmbed {
    */
   resume() {
     if (this.ampdoc) {
-      this.ampdoc.overrideVisibilityState(VisibilityState.VISIBLE);
+      this.ampdoc.overrideVisibilityState(VisibilityState_Enum.VISIBLE);
     }
   }
 
@@ -501,7 +501,7 @@ export class FriendlyIframeEmbed {
     if (this.host) {
       this.host.renderStarted();
     } else {
-      this.signals_.signal(CommonSignals.RENDER_START);
+      this.signals_.signal(CommonSignals_Enum.RENDER_START);
     }
 
     // TODO(ccordry): remove when no-signing launched.
@@ -537,7 +537,7 @@ export class FriendlyIframeEmbed {
       this.whenRenderComplete(),
       whenContentIniLoad(this.ampdoc, this.win, rect),
     ]).then(() => {
-      this.signals_.signal(CommonSignals.INI_LOAD);
+      this.signals_.signal(CommonSignals_Enum.INI_LOAD);
     });
   }
 
@@ -686,11 +686,11 @@ export class FriendlyIframeEmbed {
 function installPolyfillsInChildWindow(parentWin, childWin) {
   if (!mode.isEsm()) {
     installDocContains(childWin);
+    installCustomElements(childWin, class {});
   }
   // The anonymous class parameter allows us to detect native classes vs
   // transpiled classes.
   if (!IS_SXG) {
-    installCustomElements(childWin, class {});
     installIntersectionObserver(parentWin, childWin);
     installResizeObserver(parentWin, childWin);
     installAbortController(childWin);
diff --git a/src/gesture-recognizers.d.ts b/src/gesture-recognizers.d.ts
new file mode 100644
index 000000000000..f2352f5680a7
--- /dev/null
+++ b/src/gesture-recognizers.d.ts
@@ -0,0 +1,71 @@
+export declare abstract class GestureRecognizer<TGestureData> {}
+
+/**
+ * A "tap" gesture.
+ */
+export type TapDef = {
+  clientX: number;
+  clientY: number;
+};
+export declare class TapRecognizer extends GestureRecognizer<TapDef> {}
+
+/**
+ * A "doubletap" gesture.
+ */
+export type DoubletapDef = {
+  clientX: number;
+  clientY: number;
+};
+export declare class DoubletapRecognizer extends GestureRecognizer<DoubletapDef> {}
+
+/**
+ * A "swipe-xy", "swipe-x" or "swipe-y" gesture. A number of these gestures
+ * may be emitted for a single touch series.
+ */
+export type SwipeDef = {
+  first: boolean;
+  last: boolean;
+  deltaX: number;
+  deltaY: number;
+  velocityX: number;
+  velocityY: number;
+};
+export declare class SwipeRecognizer extends GestureRecognizer<SwipeDef> {}
+
+export declare class SwipeXYRecognizer extends SwipeRecognizer {}
+
+export declare class SwipeXRecognizer extends SwipeRecognizer {}
+
+export declare class SwipeYRecognizer extends SwipeRecognizer {}
+
+export type TapzoomDef = {
+  first: boolean;
+  last: boolean;
+  centerClientX: number;
+  centerClientY: number;
+  deltaX: number;
+  deltaY: number;
+  velocityX: number;
+  velocityY: number;
+};
+export declare class TapzoomRecognizer extends GestureRecognizer<TapzoomDef> {}
+
+/**
+ * A "pinch" gesture. It has a center, delta off the center center and
+ * the velocity of moving away from the center. "dir" component of `1`
+ * indicates that it's a expand motion and `-1` indicates pinch motion.
+ */
+export type PinchDef = {
+  first: boolean;
+  last: boolean;
+  centerClientX: number;
+  centerClientY: number;
+  dir: number;
+  distance: number;
+  deltaX: number;
+  deltaY: number;
+  velocityX: number;
+  velocityY: number;
+};
+
+export declare class PinchRecognizer extends GestureRecognizer<PinchDef> {}
diff --git a/src/gesture-recognizers.js b/src/gesture-recognizers.js
index bc319886dca7..68c87bce63ba 100644
--- a/src/gesture-recognizers.js
+++ b/src/gesture-recognizers.js
@@ -462,7 +462,7 @@ export class SwipeYRecognizer extends SwipeRecognizer {
  *   velocityY: number
  * }}
  */
-let TapzoomDef;
+export let TapzoomDef;
 
 /**
  * Recognizes a "tapzoom" gesture. This gesture will block other gestures
@@ -647,6 +647,7 @@ export class TapzoomRecognizer extends GestureRecognizer {
  *   centerClientX: number,
  *   centerClientY: number,
  *   dir: number,
+ *   distance: number,
  *   deltaX: number,
  *   deltaY: number,
  *   velocityX: number,
@@ -875,18 +876,19 @@ export class PinchRecognizer extends GestureRecognizer {
       this.prevTime_ = this.lastTime_;
     }
 
-    const startSq = this.sqDist_(
+    const startDist = this.dist_(
       this.startX1_,
       this.startX2_,
       this.startY1_,
       this.startY2_
     );
-    const lastSq = this.sqDist_(
+    const lastDist = this.dist_(
       this.lastX1_,
       this.lastX2_,
       this.lastY1_,
       this.lastY2_
     );
+    const distance = lastDist - startDist;
     this.signalEmit(
       {
         first,
@@ -894,7 +896,8 @@ export class PinchRecognizer extends GestureRecognizer {
         time: this.lastTime_,
         centerClientX: this.centerClientX_,
         centerClientY: this.centerClientY_,
-        dir: Math.sign(lastSq - startSq),
+        dir: Math.sign(distance),
+        distance,
         deltaX: deltaX * 0.5,
         deltaY: deltaY * 0.5,
         velocityX: this.velocityX_ * 0.5,
@@ -924,8 +927,10 @@ export class PinchRecognizer extends GestureRecognizer {
    * @return {number}
    * @private
    */
-  sqDist_(x1, x2, y1, y2) {
-    return (x1 - x2) * (x1 - x2) + (y1 - y2) * (y1 - y2);
+  dist_(x1, x2, y1, y2) {
+    const dx = x1 - x2;
+    const dy = y1 - y2;
+    return Math.sqrt(dx * dx + dy * dy);
   }
 
   /**
diff --git a/src/gesture.js b/src/gesture.js
index 32146078408e..920eba05bef7 100644
--- a/src/gesture.js
+++ b/src/gesture.js
@@ -1,10 +1,9 @@
+import {devAssert} from '#core/assert/dev';
 import {Observable} from '#core/data-structures/observable';
 import {supportsPassiveEventListener} from '#core/dom/event-helper-listen';
 import {findIndex} from '#core/types/array';
 import {getWin, toWin} from '#core/window';
 
-import {devAssert} from '#utils/log';
-
 import {Pass} from './pass';
 
 const PROP_ = '__AMP_Gestures';
@@ -75,7 +74,11 @@ export class Gestures {
    * @param {boolean} shouldNotPreventDefault
    * @param {boolean} shouldStopPropagation
    */
-  constructor(element, shouldNotPreventDefault, shouldStopPropagation) {
+  constructor(
+    element,
+    shouldNotPreventDefault = false,
+    shouldStopPropagation = false
+  ) {
     /** @private {!Element} */
     this.element_ = element;
 
@@ -94,8 +97,11 @@ export class Gestures {
     /** @private {?GestureRecognizer} */
     this.eventing_ = null;
 
+    const win = element.ownerDocument.defaultView;
+    const passiveSupported = supportsPassiveEventListener(toWin(win));
+
     /** @private {boolean} */
-    this.shouldNotPreventDefault_ = shouldNotPreventDefault;
+    this.shouldNotPreventDefault_ = shouldNotPreventDefault || passiveSupported;
 
     /** @private {boolean} */
     this.shouldStopPropagation_ = shouldStopPropagation;
@@ -115,7 +121,7 @@ export class Gestures {
 
     /**
      * Observers for each type of registered gesture types.
-     * @private {!Object<string, !Observable<!Gesture>>}
+     * @private {!{[key: string]: !Observable<!Gesture>}}
      */
     this.overservers_ = Object.create(null);
 
@@ -128,8 +134,6 @@ export class Gestures {
     /** @private @const {function(!Event)} */
     this.boundOnTouchCancel_ = this.onTouchCancel_.bind(this);
 
-    const win = element.ownerDocument.defaultView;
-    const passiveSupported = supportsPassiveEventListener(toWin(win));
     this.element_.addEventListener(
       'touchstart',
       this.boundOnTouchStart_,
diff --git a/src/iframe-attributes.js b/src/iframe-attributes.js
index 9c5666fecc3c..dd03f47fbeaf 100644
--- a/src/iframe-attributes.js
+++ b/src/iframe-attributes.js
@@ -2,13 +2,12 @@ import {DomFingerprint} from '#core/dom/fingerprint';
 import {getLengthNumeral} from '#core/dom/layout';
 import {getPageLayoutBoxBlocking} from '#core/dom/layout/page-layout-box';
 import * as mode from '#core/mode';
-import {dict} from '#core/types/object';
 
 import {experimentToggles, isCanary} from '#experiments';
 
 import {Services} from '#service';
 
-import {urls} from './config';
+import * as urls from './config/urls';
 import {getModeObject} from './mode-object';
 
 /**
@@ -28,7 +27,7 @@ export function getContextMetadata(
   const startTime = Date.now();
   const width = element.getAttribute('width');
   const height = element.getAttribute('height');
-  attributes = attributes ? attributes : dict();
+  attributes = attributes ? attributes : {};
   attributes['width'] = getLengthNumeral(width);
   attributes['height'] = getLengthNumeral(height);
   if (element.getAttribute('title')) {
@@ -57,7 +56,7 @@ export function getContextMetadata(
   // perserved name to extern. We are doing both right now.
   // Please also add new introduced variable
   // name to the extern list.
-  attributes['_context'] = dict({
+  attributes['_context'] = {
     'ampcontextVersion': mode.version(),
     'ampcontextFilepath': `${
       urls.thirdParty
@@ -85,7 +84,7 @@ export function getContextMetadata(
     'domFingerprint': DomFingerprint.generate(element),
     'experimentToggles': experimentToggles(parentWindow),
     'sentinel': sentinel,
-  });
+  };
   const adSrc = element.getAttribute('src');
   if (adSrc) {
     attributes['src'] = adSrc;
diff --git a/src/iframe-helper.js b/src/iframe-helper.js
index dbf65a94ab43..275cf80add48 100644
--- a/src/iframe-helper.js
+++ b/src/iframe-helper.js
@@ -3,7 +3,6 @@ import {addAttributesToElement} from '#core/dom';
 import {closestAncestorElementBySelector} from '#core/dom/query';
 import {setStyle} from '#core/dom/style';
 import {remove} from '#core/types/array';
-import {dict} from '#core/types/object';
 import {tryParseJson} from '#core/types/object/json';
 
 import {getData} from '#utils/event-helper';
@@ -20,7 +19,7 @@ const UNLISTEN_SENTINEL = 'unlisten';
 /**
  * @typedef {{
  *   frame: !Element,
- *   events: !Object<string, !Array<function(!JsonObject)>>
+ *   events: !{[key: string]: !Array<function(!JsonObject)}>
  * }}
  */
 let WindowEventsDef;
@@ -30,7 +29,7 @@ let WindowEventsDef;
  * listenFor listeners.
  * @param {?Window} parentWin the window that created the iframe
  * @param {boolean=} opt_create create the mapping if it does not exist
- * @return {?Object<string, !Array<!WindowEventsDef>>}
+ * @return {?{[key: string]: !Array<!WindowEventsDef>}}
  */
 function getListenFors(parentWin, opt_create) {
   let {listeningFors} = parentWin;
@@ -68,7 +67,7 @@ function getListenForSentinel(parentWin, sentinel, opt_create) {
  * @param {!Element} iframe the iframe element who's context will trigger the
  *     event
  * @param {boolean=} opt_is3P set to true if the iframe is 3p.
- * @return {?Object<string, !Array<function(!JsonObject, !Window, string, !MessageEvent)>>}
+ * @return {?{[key: string]: !Array<function(!JsonObject, !Window, string, !MessageEvent)>}}
  */
 function getOrCreateListenForEvents(parentWin, iframe, opt_is3P) {
   const sentinel = getSentinel_(iframe, opt_is3P);
@@ -100,7 +99,7 @@ function getOrCreateListenForEvents(parentWin, iframe, opt_is3P) {
  * @param {string} sentinel the sentinel of the message
  * @param {string} origin the source window's origin
  * @param {?Window} triggerWin the window that triggered the event
- * @return {?Object<string, !Array<function(!JsonObject, !Window, string, !MessageEvent)>>}
+ * @return {?{[key: string]: !Array<function(!JsonObject, !Window, string, !MessageEvent)>}}
  */
 function getListenForEvents(parentWin, sentinel, origin, triggerWin) {
   const listenSentinel = getListenForSentinel(parentWin, sentinel);
@@ -153,7 +152,7 @@ function isDescendantWindow(ancestor, descendant) {
  * @param {!Array<!WindowEventsDef>} listenSentinel
  */
 function dropListenSentinel(listenSentinel) {
-  const noopData = dict({'sentinel': UNLISTEN_SENTINEL});
+  const noopData = {'sentinel': UNLISTEN_SENTINEL};
 
   for (let i = listenSentinel.length - 1; i >= 0; i--) {
     const windowEvents = listenSentinel[i];
@@ -546,7 +545,7 @@ export function isAdLike(element) {
  * @return {!Element}
  */
 export function disableScrollingOnIframe(iframe) {
-  addAttributesToElement(iframe, dict({'scrolling': 'no'}));
+  addAttributesToElement(iframe, {'scrolling': 'no'});
 
   // This shouldn't work, but it does on Firefox.
   // https://stackoverflow.com/a/15494969
diff --git a/src/iframe-video.js b/src/iframe-video.js
index d99f86ed70cc..72ad4a2e5085 100644
--- a/src/iframe-video.js
+++ b/src/iframe-video.js
@@ -9,10 +9,10 @@ import {Services} from '#service';
 
 import {dev} from '#utils/log';
 
-import {VideoEvents} from './video-interface';
+import {VideoEvents_Enum} from './video-interface';
 
 /** @enum {string} */
-export const SandboxOptions = {
+export const SandboxOptions_Enum = {
   ALLOW_SCRIPTS: 'allow-scripts',
   ALLOW_SAME_ORIGIN: 'allow-same-origin',
   ALLOW_POPUPS: 'allow-popups',
@@ -43,7 +43,7 @@ export function originMatches(event, iframe, host) {
  *
  * @param {!AmpElement} element
  * @param {string} event
- * @param {!Object<string, (string|?Array<string>)>} events
+ * @param {!{[key: string]: (string|?Array<string>)}} events
  * @return {boolean}
  */
 export function redispatch(element, event, events) {
@@ -61,7 +61,7 @@ export function redispatch(element, event, events) {
  * @param {!./base-element.BaseElement} video
  * @param {string} src
  * @param {string=} opt_name
- * @param {!Array<!SandboxOptions>=} opt_sandbox
+ * @param {!Array<!SandboxOptions_Enum>=} opt_sandbox
  * @return {!Element}
  */
 export function createFrameFor(video, src, opt_name, opt_sandbox) {
@@ -117,7 +117,7 @@ export function objOrParseJson(objOrStr) {
  * @return {string}
  */
 export function mutedOrUnmutedEvent(isMuted) {
-  return isMuted ? VideoEvents.MUTED : VideoEvents.UNMUTED;
+  return isMuted ? VideoEvents_Enum.MUTED : VideoEvents_Enum.UNMUTED;
 }
 
 /**
diff --git a/src/inabox/amp-inabox.js b/src/inabox/amp-inabox.js
index 09c98fd64635..90d2c7cb2c21 100644
--- a/src/inabox/amp-inabox.js
+++ b/src/inabox/amp-inabox.js
@@ -3,7 +3,8 @@
  */
 
 import '#polyfills';
-import {TickLabel} from '#core/constants/enums';
+
+import {TickLabel_Enum} from '#core/constants/enums';
 import * as mode from '#core/mode';
 
 import {Services} from '#service';
@@ -66,7 +67,7 @@ startupChunk(self.document, function initial() {
   installPerformanceService(self);
   /** @const {!../service/performance-impl.Performance} */
   const perf = Services.performanceFor(self);
-  perf.tick(TickLabel.INSTALL_STYLES);
+  perf.tick(TickLabel_Enum.INSTALL_STYLES);
 
   self.document.documentElement.classList.add('i-amphtml-inabox');
   installStylesForDoc(
@@ -107,7 +108,7 @@ startupChunk(self.document, function initial() {
         /* makes the body visible */ true
       );
       startupChunk(self.document, function finalTick() {
-        perf.tick(TickLabel.END_INSTALL_STYLES);
+        perf.tick(TickLabel_Enum.END_INSTALL_STYLES);
         Services.resourcesForDoc(ampdoc).ampInitComplete();
         // TODO(erwinm): move invocation of the `flush` method when we have the
         // new ticks in place to batch the ticks properly.
diff --git a/src/inabox/inabox-resources.js b/src/inabox/inabox-resources.js
index fddd5feaf005..b8278d0ef7da 100644
--- a/src/inabox/inabox-resources.js
+++ b/src/inabox/inabox-resources.js
@@ -1,10 +1,10 @@
-import {VisibilityState} from '#core/constants/visibility-state';
+import {VisibilityState_Enum} from '#core/constants/visibility-state';
 import {Observable} from '#core/data-structures/observable';
 import {Deferred} from '#core/data-structures/promise';
 import {hasNextNodeInDocumentOrder} from '#core/dom';
 
 import {Services} from '#service';
-import {Resource, ResourceState} from '#service/resource';
+import {Resource, ResourceState_Enum} from '#service/resource';
 import {READY_SCAN_SIGNAL} from '#service/resources-interface';
 
 import {dev} from '#utils/log';
@@ -57,10 +57,10 @@ export class InaboxResources {
     if (getMode(this.win).runtime != 'inabox') {
       ampdoc.onVisibilityChanged(() => {
         switch (ampdoc.getVisibilityState()) {
-          case VisibilityState.PAUSED:
+          case VisibilityState_Enum.PAUSED:
             this.resources_.forEach((r) => r.pause());
             break;
-          case VisibilityState.VISIBLE:
+          case VisibilityState_Enum.VISIBLE:
             this.resources_.forEach((r) => r.resume());
             this./*OK*/ schedulePass();
             break;
@@ -205,7 +205,7 @@ export class InaboxResources {
     this.resources_.forEach((resource) => {
       if (
         !resource.element.R1() &&
-        resource.getState() === ResourceState.READY_FOR_LAYOUT &&
+        resource.getState() === ResourceState_Enum.READY_FOR_LAYOUT &&
         resource.isDisplayed()
       ) {
         resource.layoutScheduled(now);
@@ -231,7 +231,9 @@ export class InaboxResources {
         hasNextNodeInDocumentOrder(resource.element, this.ampdoc_.getRootNode())
       ) {
         this.pendingBuildResources_.splice(i, 1);
-        resource.build().then(() => this./*OK*/ schedulePass());
+        (resource.build() || Promise.resolve()).then(() =>
+          this./*OK*/ schedulePass()
+        );
         dev().fine(TAG, 'resource upgraded:', resource.debugid);
       }
     }
diff --git a/src/inabox/inabox-story-ad.js b/src/inabox/inabox-story-ad.js
index f1cad7f7ce58..32a1d0f94b21 100644
--- a/src/inabox/inabox-story-ad.js
+++ b/src/inabox/inabox-story-ad.js
@@ -4,6 +4,7 @@ import {ButtonTextFitter} from '../../extensions/amp-story-auto-ads/0.1/story-ad
 import {
   START_CTA_ANIMATION_ATTR,
   createCta,
+  getStoryAdMetaTags,
   getStoryAdMetadataFromDoc,
   maybeCreateAttribution,
   validateCtaMetadata,
@@ -17,7 +18,7 @@ import {installStylesForDoc} from '../style-installer';
 export function maybeRenderInaboxAsStoryAd(ampdoc) {
   const {win} = ampdoc;
   const doc = win.document;
-  const storyAdMetadata = getStoryAdMetadataFromDoc(doc);
+  const storyAdMetadata = getStoryAdMetadataFromDoc(getStoryAdMetaTags(doc));
   if (!validateCtaMetadata(storyAdMetadata, true /* opt_inabox */)) {
     return;
   }
diff --git a/src/inabox/inabox-viewport.js b/src/inabox/inabox-viewport.js
index 6165b9635939..c779151a9219 100644
--- a/src/inabox/inabox-viewport.js
+++ b/src/inabox/inabox-viewport.js
@@ -1,7 +1,7 @@
 import {getFrameOverlayManager} from '#ads/inabox/frame-overlay-manager';
 import {getPositionObserver} from '#ads/inabox/position-observer';
 
-import {MessageType} from '#core/3p-frame-messaging';
+import {MessageType_Enum} from '#core/3p-frame-messaging';
 import {devAssert, devAssertElement} from '#core/assert';
 import {Observable} from '#core/data-structures/observable';
 import {isIframed} from '#core/dom';
@@ -502,8 +502,8 @@ export class ViewportBindingInabox {
   /** @private */
   listenForPosition_() {
     this.iframeClient_.makeRequest(
-      MessageType.SEND_POSITIONS,
-      MessageType.POSITION,
+      MessageType_Enum.SEND_POSITIONS,
+      MessageType_Enum.POSITION,
       (data) => {
         dev().fine(TAG, 'Position changed: ', data);
         this.updateLayoutRects_(data['viewportRect'], data['targetRect']);
@@ -670,8 +670,8 @@ export class ViewportBindingInabox {
     if (!this.requestPositionPromise_) {
       this.requestPositionPromise_ = new Promise((resolve) => {
         this.iframeClient_.requestOnce(
-          MessageType.SEND_POSITIONS,
-          MessageType.POSITION,
+          MessageType_Enum.SEND_POSITIONS,
+          MessageType_Enum.POSITION,
           (data) => {
             this.requestPositionPromise_ = null;
             devAssert(data['targetRect'], 'Host should send targetRect');
@@ -739,8 +739,8 @@ export class ViewportBindingInabox {
         }
       } else {
         this.iframeClient_.requestOnce(
-          MessageType.FULL_OVERLAY_FRAME,
-          MessageType.FULL_OVERLAY_FRAME_RESPONSE,
+          MessageType_Enum.FULL_OVERLAY_FRAME,
+          MessageType_Enum.FULL_OVERLAY_FRAME_RESPONSE,
           (response) => {
             if (response['success']) {
               this.updateBoxRect_(response['boxRect']);
@@ -775,8 +775,8 @@ export class ViewportBindingInabox {
         }
       } else {
         this.iframeClient_.requestOnce(
-          MessageType.CANCEL_FULL_OVERLAY_FRAME,
-          MessageType.CANCEL_FULL_OVERLAY_FRAME_RESPONSE,
+          MessageType_Enum.CANCEL_FULL_OVERLAY_FRAME,
+          MessageType_Enum.CANCEL_FULL_OVERLAY_FRAME_RESPONSE,
           (response) => {
             this.updateBoxRect_(response['boxRect']);
             resolve();
diff --git a/src/mode.js b/src/mode.js
index b07f5bc68fdf..23979546d7f3 100644
--- a/src/mode.js
+++ b/src/mode.js
@@ -1,3 +1,5 @@
+// @ts-nocheck
+
 import * as coreMode from '#core/mode';
 import {getHashParams} from '#core/types/string/url';
 
@@ -7,6 +9,7 @@ import {getHashParams} from '#core/types/string/url';
  *   development: boolean,
  *   esm: boolean,
  *   test: boolean,
+ *   ssrCss: boolean,
  *   rtvVersion: string,
  *   runtime: (null|string|undefined),
  *   a4aId: (null|string|undefined)
@@ -52,6 +55,7 @@ function getMode_(win) {
     esm: coreMode.isEsm(),
     test: coreMode.isTest(win),
     rtvVersion: getRtvVersion(win),
+    ssrReady: coreMode.isSsrCss(),
   };
 }
 
diff --git a/src/multidoc-manager.js b/src/multidoc-manager.js
index 056dbe67b0fa..0f930c66a7f2 100644
--- a/src/multidoc-manager.js
+++ b/src/multidoc-manager.js
@@ -1,5 +1,5 @@
-import {CommonSignals} from '#core/constants/common-signals';
-import {VisibilityState} from '#core/constants/visibility-state';
+import {CommonSignals_Enum} from '#core/constants/common-signals';
+import {VisibilityState_Enum} from '#core/constants/visibility-state';
 import {isConnectedNode} from '#core/dom';
 import {childElementsByTag} from '#core/dom/query';
 import {setStyle} from '#core/dom/style';
@@ -54,7 +54,7 @@ export class MultidocManager {
    * Attaches the shadow root and calls the supplied DOM builder.
    * @param {!Element} hostElement
    * @param {string} url
-   * @param {!Object<string, string>|undefined} params
+   * @param {!{[key: string]: string}|undefined} params
    * @param {function(!Object, !ShadowRoot,
    * !./service/ampdoc-impl.AmpDocShadow):!Promise} builder
    * @return {!./runtime.ShadowDoc}
@@ -101,7 +101,7 @@ export class MultidocManager {
 
     /**
      * Sets the document's visibility state.
-     * @param {!VisibilityState} state
+     * @param {!VisibilityState_Enum} state
      */
     amp['setVisibilityState'] = function (state) {
       ampdoc.overrideVisibilityState(state);
@@ -194,7 +194,7 @@ export class MultidocManager {
     builder(amp, shadowRoot, ampdoc).then(() => {
       // Document is ready.
       ampdoc.setReady();
-      ampdoc.signals().signal(CommonSignals.RENDER_START);
+      ampdoc.signals().signal(CommonSignals_Enum.RENDER_START);
       setStyle(hostElement, 'visibility', 'visible');
     });
 
@@ -213,7 +213,7 @@ export class MultidocManager {
    * @param {!Element} hostElement
    * @param {!Document} doc
    * @param {string} url
-   * @param {!Object<string, string>=} opt_initParams
+   * @param {!{[key: string]: string}=} opt_initParams
    * @return {!./runtime.ShadowDoc}
    */
   attachShadowDoc(hostElement, doc, url, opt_initParams) {
@@ -241,7 +241,7 @@ export class MultidocManager {
         // specifically, we have to wait for stubbing to complete, which may
         // take awhile due to importNode.
         setTimeout(() => {
-          ampdoc.signals().signal(CommonSignals.RENDER_START);
+          ampdoc.signals().signal(CommonSignals_Enum.RENDER_START);
           setStyle(hostElement, 'visibility', 'visible');
         }, 50);
 
@@ -255,7 +255,7 @@ export class MultidocManager {
    * doc and configures ampdoc for it.
    * @param {!Element} hostElement
    * @param {string} url
-   * @param {!Object<string, string>=} opt_initParams
+   * @param {!{[key: string]: string}=} opt_initParams
    * @return {!Object}
    */
   attachShadowDocAsStream(hostElement, url, opt_initParams) {
@@ -292,7 +292,7 @@ export class MultidocManager {
           if (!renderStarted) {
             renderStarted = true;
             setTimeout(() => {
-              ampdoc.signals().signal(CommonSignals.RENDER_START);
+              ampdoc.signals().signal(CommonSignals_Enum.RENDER_START);
               setStyle(hostElement, 'visibility', 'visible');
             }, 50);
           }
@@ -489,7 +489,7 @@ export class MultidocManager {
     const amp = shadowRoot.AMP;
     delete shadowRoot.AMP;
     const {ampdoc} = amp;
-    ampdoc.overrideVisibilityState(VisibilityState.INACTIVE);
+    ampdoc.overrideVisibilityState(VisibilityState_Enum.INACTIVE);
     disposeServicesForDoc(ampdoc);
 
     // There is a race between the visibility state change finishing and
diff --git a/src/pixel.js b/src/pixel.js
index cb77446b18ef..16ec556ef870 100644
--- a/src/pixel.js
+++ b/src/pixel.js
@@ -1,9 +1,15 @@
 import {createElementWithAttributes} from '#core/dom';
-import {dict} from '#core/types/object';
 import {WindowInterface} from '#core/window/interface';
 
+import {Services} from '#service';
+
 import {user} from '#utils/log';
 
+import {
+  AttributionReportingStatus,
+  isAttributionReportingAllowed,
+} from './utils/privacy-sandbox-utils';
+
 /** @const {string} */
 const TAG = 'pixel';
 
@@ -11,40 +17,64 @@ const TAG = 'pixel';
  * @param {!Window} win
  * @param {string} src
  * @param {?string=} referrerPolicy
+ * @param {string=} attributionSrc
+ * @param {(Element|./service/ampdoc-impl.AmpDoc)=} opt_elementOrAmpDoc Whether services are provided by an
+ *     element.
  * @return {!Element}
  */
-export function createPixel(win, src, referrerPolicy) {
+export function createPixel(
+  win,
+  src,
+  referrerPolicy,
+  attributionSrc,
+  opt_elementOrAmpDoc
+) {
   // Caller need to verify window is not destroyed when creating pixel
   if (referrerPolicy && referrerPolicy !== 'no-referrer') {
     user().error(TAG, 'Unsupported referrerPolicy: %s', referrerPolicy);
   }
 
   return referrerPolicy === 'no-referrer'
-    ? createNoReferrerPixel(win, src)
-    : createImagePixel(win, src);
+    ? createNoReferrerPixel(win, src, attributionSrc, opt_elementOrAmpDoc)
+    : createImagePixel(win, src, false, attributionSrc, opt_elementOrAmpDoc);
 }
 
 /**
  * @param {!Window} win
  * @param {string} src
+ * @param {string=} attributionSrc
+ * @param {(Element|./service/ampdoc-impl.AmpDoc)=} opt_elementOrAmpDoc Whether services are provided by an
+ *     element.
  * @return {!Element}
  */
-function createNoReferrerPixel(win, src) {
+function createNoReferrerPixel(win, src, attributionSrc, opt_elementOrAmpDoc) {
   if (isReferrerPolicySupported()) {
-    return createImagePixel(win, src, true);
+    return createImagePixel(
+      win,
+      src,
+      true,
+      attributionSrc,
+      opt_elementOrAmpDoc
+    );
   } else {
     // if "referrerPolicy" is not supported, use iframe wrapper
     // to scrub the referrer.
     const iframe = createElementWithAttributes(
       /** @type {!Document} */ (win.document),
       'iframe',
-      dict({
+      {
         'src': 'about:blank',
         'style': 'display:none',
-      })
+      }
     );
     iframe.onload = () => {
-      createImagePixel(iframe.contentWindow, src);
+      createImagePixel(
+        iframe.contentWindow,
+        src,
+        undefined,
+        undefined,
+        opt_elementOrAmpDoc
+      );
     };
     win.document.body.appendChild(iframe);
     return iframe;
@@ -55,14 +85,49 @@ function createNoReferrerPixel(win, src) {
  * @param {!Window} win
  * @param {string} src
  * @param {boolean=} noReferrer
+ * @param {string=} attributionSrc
+ * @param {(Element|./service/ampdoc-impl.AmpDoc)=} opt_elementOrAmpDoc Whether services are provided by an
+ *     element.
  * @return {!Image}
  */
-function createImagePixel(win, src, noReferrer = false) {
+function createImagePixel(
+  win,
+  src,
+  noReferrer = false,
+  attributionSrc,
+  opt_elementOrAmpDoc
+) {
   const Image = WindowInterface.getImage(win);
   const image = new Image();
   if (noReferrer) {
     image.referrerPolicy = 'no-referrer';
   }
+
+  let attributionReportingStatus =
+    AttributionReportingStatus.ATTRIBUTION_DATA_UNSPECIFIED;
+  if (attributionSrc != null) {
+    if (isAttributionReportingAllowed(win.document)) {
+      attributionReportingStatus =
+        AttributionReportingStatus.ATTRIBUTION_DATA_PRESENT_AND_POLICY_ENABLED;
+      const substituteVariables =
+        getAttributionReportingStatusUrlVariableRewriter(
+          win,
+          attributionReportingStatus,
+          opt_elementOrAmpDoc
+        );
+      attributionSrc = substituteVariables(attributionSrc);
+      image.attributionSrc = attributionSrc;
+    } else {
+      attributionReportingStatus =
+        AttributionReportingStatus.ATTRIBUTION_DATA_PRESENT;
+    }
+  }
+  const substituteVariables = getAttributionReportingStatusUrlVariableRewriter(
+    win,
+    attributionReportingStatus,
+    opt_elementOrAmpDoc
+  );
+  src = substituteVariables(src);
   image.src = src;
   return image;
 }
@@ -76,3 +141,29 @@ function createImagePixel(win, src, noReferrer = false) {
 function isReferrerPolicySupported() {
   return 'referrerPolicy' in Image.prototype;
 }
+
+/**
+ * @param {!Window} win
+ * @param {string=} status
+ * @param {(Element|./service/ampdoc-impl.AmpDoc)=} opt_elementOrAmpDoc Whether services are provided by an
+ *     element.
+ * @return {function(string): string}
+ */
+function getAttributionReportingStatusUrlVariableRewriter(
+  win,
+  status,
+  opt_elementOrAmpDoc
+) {
+  const substitutionFunctions = {
+    'ATTRIBUTION_REPORTING_STATUS': () => status,
+  };
+  const replacements = Services.urlReplacementsForDoc(
+    opt_elementOrAmpDoc || win.document
+  );
+  const allowlist = {
+    'ATTRIBUTION_REPORTING_STATUS': true,
+  };
+
+  return (url) =>
+    replacements.expandUrlSync(url, substitutionFunctions, allowlist);
+}
diff --git a/src/polyfills/custom-elements.js b/src/polyfills/custom-elements.js
index 9c0746f3237f..b4b1ed10944e 100644
--- a/src/polyfills/custom-elements.js
+++ b/src/polyfills/custom-elements.js
@@ -100,7 +100,7 @@ class CustomElementRegistry {
     /** @const @private */
     this.registry_ = registry;
 
-    /** @private @const @type {!Object<string, !Deferred>} */
+    /** @private @const @type {!{[key: string]: !Deferred}} */
     this.pendingDefines_ = map();
   }
 
@@ -185,7 +185,7 @@ class Registry {
     /** @private @const */
     this.win_ = win;
 
-    /** @private @const @type {!Object<string, !CustomElementDef>} */
+    /** @private @const @type {!{[key: string]: !CustomElementDef}} */
     this.definitions_ = map();
 
     /**
diff --git a/src/polyfills/fetch.js b/src/polyfills/fetch.js
index b6bb997cae0f..44ea8543fa85 100644
--- a/src/polyfills/fetch.js
+++ b/src/polyfills/fetch.js
@@ -6,12 +6,6 @@ import {utf8Encode} from '#core/types/string/bytes';
 
 import {dev, user} from '#utils/log';
 
-/** @enum {number} Allowed fetch responses. */
-const allowedFetchTypes = {
-  document: 1,
-  text: 2,
-};
-
 /** @const {!Array<string>} */
 const allowedMethods = ['GET', 'POST'];
 
@@ -49,7 +43,7 @@ export function fetchPolyfill(input, init = {}) {
       xhr.withCredentials = true;
     }
 
-    if (init.responseType in allowedFetchTypes) {
+    if (init.responseType === 'document' || init.responseType === 'text') {
       xhr.responseType = init.responseType;
     }
 
diff --git a/src/polyfills/get-bounding-client-rect.js b/src/polyfills/get-bounding-client-rect.js
index b3f270f86111..02485c6f3972 100644
--- a/src/polyfills/get-bounding-client-rect.js
+++ b/src/polyfills/get-bounding-client-rect.js
@@ -6,7 +6,7 @@
  */
 
 import {isConnectedNode} from '#core/dom';
-import {LayoutRectDef, layoutRectLtwh} from '#core/dom/layout/rect';
+import {layoutRectLtwh} from '#core/dom/layout/rect';
 import * as mode from '#core/mode';
 
 /**
@@ -17,8 +17,8 @@ let nativeClientRect;
 
 /**
  * Polyfill for Node.getBoundingClientRect API.
- * @this {!Element}
- * @return {!ClientRect|!LayoutRectDef}
+ * @this {Element}
+ * @return {ClientRect|LayoutRectDef}
  */
 function getBoundingClientRect() {
   // eslint-disable-next-line local/no-invalid-this
diff --git a/src/polyfills/index.js b/src/polyfills/index.js
index 734602530d84..fa29816e885f 100644
--- a/src/polyfills/index.js
+++ b/src/polyfills/index.js
@@ -35,11 +35,11 @@ if (self.document) {
   if (!mode.isEsm()) {
     installDocContains(self);
     installGetBoundingClientRect(self);
+    installCustomElements(self, class {});
   }
   // The anonymous class parameter allows us to detect native classes vs
   // transpiled classes.
   if (!IS_SXG) {
-    installCustomElements(self, class {});
     installIntersectionObserver(self);
     installResizeObserver(self);
     installAbortController(self);
diff --git a/src/preact/OWNERS b/src/preact/OWNERS
index a5875f7b09a1..ccb953549fee 100644
--- a/src/preact/OWNERS
+++ b/src/preact/OWNERS
@@ -4,7 +4,7 @@
 {
   rules: [
     {
-      owners: [{name: 'alanorozco'}, {name: 'caroqliu'}, {name: 'jridgewell'}],
+      owners: [{name: 'alanorozco'}, {name: 'kvchari'}],
     },
   ],
 }
diff --git a/src/preact/amp-base-element.js b/src/preact/amp-base-element.js
new file mode 100644
index 000000000000..45900ddf4893
--- /dev/null
+++ b/src/preact/amp-base-element.js
@@ -0,0 +1,135 @@
+/* eslint-disable local/restrict-this-access */
+
+import {ActionTrust_Enum} from '#core/constants/action-constants';
+
+import {PreactBaseElement} from './base-element';
+
+/**
+ * @template {{
+ *  readyState?: import('#core/constants/ready-state').ReadyState_Enum,
+ *  pause?: function():void
+ * }} API_TYPE
+ * @extends PreactBaseElement<API_TYPE>
+ */
+export class AmpPreactBaseElement extends PreactBaseElement {
+  /**
+   * todo(kvchari): confirm this can be safely moved
+   * @override
+   */
+  mutatedAttributesCallback() {
+    if (this.container_) {
+      this.scheduleRender_();
+    }
+  }
+
+  /**
+   * todo(kvchari): confirm this can be safely moved
+   * @param {number} newHeight
+   * @override
+   */
+  attemptChangeHeight(newHeight) {
+    return super.attemptChangeHeight(newHeight).catch((e) => {
+      // It's okay to disable this lint rule since we check that the restricted
+      // method exists.
+
+      if (this.getOverflowElement && !this.getOverflowElement()) {
+        console./* OK */ warn(
+          '[overflow] element not found. Provide one to enable resizing to full contents.',
+          this.element
+        );
+      }
+      throw e;
+    });
+  }
+
+  /** @override */
+  getDefaultProps() {
+    return {
+      ...super.getDefaultProps(),
+      'onLoading': () => {
+        this.handleOnLoading();
+      },
+      'onLoad': () => {
+        this.handleOnLoad();
+      },
+      'onError': () => {
+        this.handleOnError();
+      },
+    };
+  }
+
+  /**
+   * Default handler for onLoad event
+   * Displays loader. Override to customize.
+   * @protected
+   */
+  handleOnLoad() {
+    this.toggleLoading?.(false);
+    this.toggleFallback?.(false);
+    this.togglePlaceholder?.(false);
+  }
+
+  /**
+   * Default handler for onLoading event
+   * Reveals loader. Override to customize.
+   * @protected
+   */
+  handleOnLoading() {
+    this.toggleLoading?.(true);
+  }
+
+  /**
+   * Default handler for onError event
+   * Displays Fallback / Placeholder. Override to customize.
+   * @protected
+   */
+  handleOnError() {
+    this.toggleLoading?.(false);
+    // If the content fails to load and there's a fallback element, display the fallback.
+    // Otherwise, continue displaying the placeholder.
+    if (this.getFallback?.()) {
+      this.toggleFallback?.(true);
+      this.togglePlaceholder?.(false);
+    } else {
+      this.togglePlaceholder?.(true);
+    }
+  }
+
+  /**
+   * Register an action for AMP documents to execute an API handler.
+   *
+   * This has no effect on Bento documents, since they lack an Actions system.
+   * Instead, they should use `(await element.getApi()).action()`
+   * @param {string} alias
+   * @param {function(API_TYPE, *):void} handler
+   * @param {ActionTrust_Enum} minTrust
+   * @protected
+   */
+  registerApiAction(alias, handler, minTrust = ActionTrust_Enum.DEFAULT) {
+    this.registerAction?.(
+      alias,
+      /**
+       * @param {*} invocation
+       * @return {*}
+       */
+      (invocation) => {
+        return handler(this.api(), invocation);
+      },
+      minTrust
+    );
+  }
+}
+
+/**
+ * Changes the inheritance hierarchy of clazz such that it now extends from superClazz.
+ * If clazz previously inherited from a previousSuperClazz, it now no longer does so.
+ * Dangerous, use sparingly!
+ * @param {*} clazz
+ * @param {*} superClazz
+ * @return {*}
+ */
+export function setSuperClass(clazz, superClazz) {
+  Object.setPrototypeOf(clazz, superClazz);
+  Object.setPrototypeOf(clazz.prototype, superClazz.prototype);
+  return clazz;
+}
diff --git a/src/preact/base-element.js b/src/preact/base-element.js
index 924f669ddc59..024ce8c55f00 100644
--- a/src/preact/base-element.js
+++ b/src/preact/base-element.js
@@ -1,8 +1,7 @@
 import {devAssert} from '#core/assert';
-import {ActionTrust} from '#core/constants/action-constants';
-import {AmpEvents} from '#core/constants/amp-events';
-import {Loading} from '#core/constants/loading-instructions';
-import {ReadyState} from '#core/constants/ready-state';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
+import {Loading_Enum} from '#core/constants/loading-instructions';
+import {ReadyState_Enum} from '#core/constants/ready-state';
 import {
   addGroup,
   discover,
@@ -12,13 +11,18 @@ import {
 } from '#core/context';
 import {Deferred} from '#core/data-structures/promise';
 import {createElementWithAttributes, dispatchCustomEvent} from '#core/dom';
-import {Layout, applyFillContent, isLayoutSizeDefined} from '#core/dom/layout';
+import {
+  Layout_Enum,
+  applyFillContent,
+  isLayoutSizeDefined,
+} from '#core/dom/layout';
 import {MediaQueryProps} from '#core/dom/media-query-props';
 import {childElementByAttr, childElementByTag} from '#core/dom/query';
+import {installShadowStyle} from '#core/dom/shadow-embed';
 import {PauseHelper} from '#core/dom/video/pause-helper';
 import * as mode from '#core/mode';
 import {isElement} from '#core/types';
-import {dict, hasOwn, map} from '#core/types/object';
+import {hasOwn, map} from '#core/types/object';
 
 import * as Preact from '#preact';
 import {hydrate, render} from '#preact';
@@ -26,43 +30,43 @@ import {BaseElement} from '#preact/bento-ce';
 
 import {WithAmpContext} from './context';
 import {CanPlay, CanRender, LoadingProp} from './contextprops';
-import {AmpElementPropDef, collectProps} from './parse-props';
+import {HAS_SELECTOR, checkPropsFor, collectProps} from './parse-props';
 
-import {installShadowStyle} from '../shadow-embed';
+/** @typedef {import('./parse-props').AmpElementProp} AmpElementProp */
 
-/** @const {!MutationObserverInit} */
+/** @const {MutationObserverInit} */
 const CHILDREN_MUTATION_INIT = {
   childList: true,
 };
 
-/** @const {!MutationObserverInit} */
+/** @const {MutationObserverInit} */
 const PASSTHROUGH_MUTATION_INIT = {
   childList: true,
   characterData: true,
 };
 
-/** @const {!MutationObserverInit} */
+/** @const {MutationObserverInit} */
 const TEMPLATES_MUTATION_INIT = {
   childList: true,
 };
 
-/** @const {!JsonObject<string, string>} */
-const SHADOW_CONTAINER_ATTRS = dict({
+/** @const {JsonObject<string, string>} */
+const SHADOW_CONTAINER_ATTRS = {
   'style': 'display: contents; background: inherit;',
   'part': 'c',
-});
+};
 
 /** @const {string} */
 const SERVICE_SLOT_NAME = 'i-amphtml-svc';
 
-/** @const {!JsonObject<string, string>} */
-const SERVICE_SLOT_ATTRS = dict({'name': SERVICE_SLOT_NAME});
+/** @const {JsonObject<string, string>} */
+const SERVICE_SLOT_ATTRS = {'name': SERVICE_SLOT_NAME};
 
 /** @const {string} */
 const RENDERED_ATTR = 'i-amphtml-rendered';
 
-/** @const {!JsonObject<string, string>} */
-const RENDERED_ATTRS = dict({'i-amphtml-rendered': ''});
+/** @const {JsonObject<string, string>} */
+const RENDERED_ATTRS = {'i-amphtml-rendered': ''};
 
 /**
  * This is an internal property that marks light DOM nodes that were rendered
@@ -77,28 +81,13 @@ const UNSLOTTED_GROUP = 'unslotted';
 const MATCH_ANY = () => true;
 
 /**
- * @param {!Object<string, !AmpElementPropDef>} propDefs
- * @param {function(!AmpElementPropDef):boolean} cb
- * @return {boolean}
- */
-function checkPropsFor(propDefs, cb) {
-  return Object.values(propDefs).some(cb);
-}
-
-/**
- * @param {!AmpElementPropDef} def
+ * @param {AmpElementProp} def
  * @return {boolean}
  */
 const HAS_MEDIA = (def) => !!def.media;
 
 /**
- * @param {!AmpElementPropDef} def
- * @return {boolean}
- */
-const HAS_SELECTOR = (def) => typeof def === 'string' || !!def.selector;
-
-/**
- * @param {!AmpElementPropDef} def
+ * @param {AmpElementProp} def
  * @return {boolean}
  */
 const HAS_PASSTHROUGH = (def) => !!(def.passthrough || def.passthroughNonEmpty);
@@ -111,74 +100,194 @@ const HAS_PASSTHROUGH = (def) => !!(def.passthrough || def.passthroughNonEmpty);
  * be very few exceptions, which is why we allow options to configure the
  * class.
  *
- * @template API_TYPE
+ * @template {{
+ *  readyState?: ReadyState_Enum,
+ *  pause?: function():void
+ * }} API_TYPE
  */
 export class PreactBaseElement extends BaseElement {
-  /** @override @nocollapse */
+  /** @override  */
   static R1() {
     return true;
   }
 
-  /** @override @nocollapse */
+  /** @override  */
   static requiresShadowDom() {
-    // eslint-disable-next-line local/no-static-this
     return this['usesShadowDom'];
   }
 
-  /** @override @nocollapse */
+  /** @override  */
   static usesLoading() {
-    // eslint-disable-next-line local/no-static-this
     return this['loadable'];
   }
 
-  /** @override @nocollapse */
+  /** @override  */
   static prerenderAllowed() {
-    // eslint-disable-next-line local/no-static-this
     return !this.usesLoading();
   }
 
-  /** @param {!Element} element */
-  constructor(element) {
-    super(element);
+  /** @override */
+  static previewAllowed() {
+    return false;
+  }
+
+  /**
+   * Override to provide the Component definition.
+   *
+   * @type {import('preact').FunctionComponent}
+   * @return {ReturnType<import('preact').FunctionComponent>}
+   */
+  static Component() {
+    devAssert(false, 'Must provide Component');
+  }
+
+  /**
+   * If default props are static, this can be used instead of init().
+   * @type {JsonObject|undefined}
+   */
+  static staticProps = undefined;
+
+  /**
+   * @type {import('#core/context').IContextProp<*,*>[]}
+   */
+  static useContexts = mode.isLocalDev()
+    ? Object.freeze([])
+    : /** @type {?} */ ([]);
+
+  /**
+   * Whether the component implements a loading protocol.
+   *
+   * @type {boolean}
+   */
+  static loadable = false;
+
+  /**
+   * Whether a component should be unloaded for `pauseCallback`.
+   *
+   * @type {boolean}
+   */
+  static unloadOnPause = false;
+
+  /**
+   * An override to specify that the component requires `layoutSizeDefined`.
+   * This typically means that the element's `isLayoutSupported()` is
+   * implemented via `isLayoutSizeDefined()`, and this is how the default
+   * `isLayoutSupported()` is implemented when this flag is set.
+   *
+   * @type {boolean}
+   */
+  static layoutSizeDefined = false;
+
+  /**
+   * The tag name, e.g. "div", "span", time" that should be used as a replacement
+   * node for Preact rendering. This is the node that Preact will diff with
+   * with specified, instead of rendering a new node. Only applicable to light-DOM
+   * mapping styles.
+   *
+   * @type {string}
+   */
+  static lightDomTag = '';
+
+  /**
+   * Whether this element uses "templates" system.
+   *
+   * @type {boolean}
+   */
+  static usesTemplate = false;
+
+  /**
+   * The CSS for shadow stylesheets.
+   *
+   * @type {?string}
+   */
+  static shadowCss = null;
+
+  /**
+   * Whether this element uses Shadow DOM.
+   *
+   * @type {boolean}
+   */
+  static usesShadowDom = false;
+
+  /**
+   * Enabling detached mode alters the children to be rendered in an
+   * unappended container. By default the children will be attached to the DOM.
+   *
+   * @type {boolean}
+   */
+  static detached = false;
+
+  /**
+   * This enables the 'delegatesFocus' option when creating the shadow DOM for
+   * this component.  A key feature of 'delegatesFocus' set to true is that
+   * when elements within the shadow DOM gain focus, the focus is also applied
+   * to the host element.
+   */
+  static delegatesFocus = false;
+
+  /**
+   * Provides a mapping of Preact prop to AmpElement DOM attributes.
+   *
+   * @type {{[key: string]: AmpElementProp}}
+   */
+  static props = {};
 
-    /** @private {!JsonObject} */
-    this.defaultProps_ = dict({
-      'loading': Loading.AUTO,
+  /**
+   * Returns default props
+   * @return {JsonObject}
+   */
+  getDefaultProps() {
+    return {
+      'loading': Loading_Enum.AUTO,
+
+      /**
+       * @param {import('#core/constants/ready-state').ReadyState_Enum} state
+       * @param {Error=} opt_failure
+       */
       'onReadyState': (state, opt_failure) => {
         this.onReadyState_(state, opt_failure);
       },
+
+      /**
+       * @param {boolean} isPlaying
+       */
       'onPlayingState': (isPlaying) => {
         this.updateIsPlaying_(isPlaying);
       },
-      'onLoading': () => {
-        this.handleOnLoading();
-      },
-      'onLoad': () => {
-        this.handleOnLoad();
-      },
-      'onError': () => {
-        this.handleOnError();
-      },
-    });
+    };
+  }
+
+  /** @param {AmpElement} element */
+  constructor(element) {
+    super(element);
 
-    /** @private {!AmpContextDef.ContextType} */
+    /** @protected {JsonObject} */
+    this.defaultProps_ = this.getDefaultProps();
+
+    /**
+     * @type {import('./context').AmpContext}
+     * @private
+     */
     this.context_ = {
       renderable: false,
       playable: true,
-      loading: Loading.AUTO,
+      loading: Loading_Enum.AUTO,
       notify: () => this.mutateElement(() => {}),
     };
 
     /** @private {boolean} */
     this.resetLoading_ = false;
 
-    /** @private {?API_TYPE} */
+    /** @private {API_TYPE|null} */
     this.apiWrapper_ = null;
 
-    /** @private {?API_TYPE} */
+    /**
+     * @type {API_TYPE|null}
+     * @private
+     */
     this.currentRef_ = null;
 
-    /** @param {?API_TYPE|null} current */
+    /** @type {function(API_TYPE):void} current */
     this.refSetter_ = (current) => {
       // The API shape **must** be consistent.
       if (current !== null) {
@@ -192,13 +301,13 @@ export class PreactBaseElement extends BaseElement {
       this.maybeUpdateReadyState_();
     };
 
-    /** @type {?Deferred<!API_TYPE>} */
+    /** @type {?Deferred<API_TYPE>} */
     this.deferredApi_ = null;
 
     /** @private {?Array} */
     this.contextValues_ = null;
 
-    /** @private {?Node} */
+    /** @protected {Element | null} */
     this.container_ = null;
 
     /** @private {boolean} */
@@ -222,7 +331,7 @@ export class PreactBaseElement extends BaseElement {
     /** @protected {?MutationObserver} */
     this.observer = null;
 
-    /** @private {!PauseHelper} */
+    /** @private {PauseHelper} */
     this.pauseHelper_ = new PauseHelper(element);
 
     /** @protected {?MediaQueryProps} */
@@ -232,14 +341,19 @@ export class PreactBaseElement extends BaseElement {
   /**
    * A chance to initialize default Preact props for the element.
    *
-   * @return {!JsonObject|undefined}
+   * @return {JsonObject|void}
    */
   init() {}
 
-  /** @override */
+  /**
+   * @override
+   * @param {import('#core/dom/layout').Layout_Enum} layout
+   */
   isLayoutSupported(layout) {
-    const Ctor = this.constructor;
-    if (Ctor['layoutSizeDefined']) {
+    const Ctor = /** @type {typeof PreactBaseElement} */ (
+      /** @type {?} */ (this.constructor)
+    );
+    if (Ctor.layoutSizeDefined) {
       return (
         isLayoutSizeDefined(layout) ||
         // This allows a developer to specify the component's size using the
@@ -252,7 +366,7 @@ export class PreactBaseElement extends BaseElement {
         // Besides normal benefits of using plain CSS, an important feature of
         // using this layout is that AMP does not add "sizer" elements thus
         // keeping the user DOM clean.
-        layout == Layout.CONTAINER
+        layout == Layout_Enum.CONTAINER
       );
     }
     return super.isLayoutSupported(layout);
@@ -260,17 +374,19 @@ export class PreactBaseElement extends BaseElement {
 
   /** @override */
   buildCallback() {
-    const Ctor = this.constructor;
+    const Ctor = /** @type {typeof PreactBaseElement} */ (
+      /** @type {?} */ (this.constructor)
+    );
 
     this.observer = new MutationObserver((rs) => this.checkMutations_(rs));
-    const props = Ctor['props'];
+    const {props} = Ctor;
     const childrenInit = checkPropsFor(props, HAS_SELECTOR)
       ? CHILDREN_MUTATION_INIT
       : null;
     const passthroughInit = checkPropsFor(props, HAS_PASSTHROUGH)
       ? PASSTHROUGH_MUTATION_INIT
       : null;
-    const templatesInit = Ctor['usesTemplate'] ? TEMPLATES_MUTATION_INIT : null;
+    const templatesInit = Ctor.usesTemplate ? TEMPLATES_MUTATION_INIT : null;
     this.observer.observe(this.element, {
       attributes: true,
       ...childrenInit,
@@ -282,13 +398,9 @@ export class PreactBaseElement extends BaseElement {
       ? new MediaQueryProps(this.win, () => this.scheduleRender_())
       : null;
 
-    const staticProps = Ctor['staticProps'];
+    const {staticProps} = Ctor;
     const initProps = this.init();
-    Object.assign(
-      /** @type {!Object} */ (this.defaultProps_),
-      staticProps,
-      initProps
-    );
+    Object.assign(this.defaultProps_, staticProps, initProps);
 
     this.checkPropsPostMutations();
 
@@ -311,7 +423,11 @@ export class PreactBaseElement extends BaseElement {
     // in-sync.
     subscribe(
       this.element,
-      [CanRender, CanPlay, LoadingProp],
+      /** @type {import('#core/context').IContextProp<*, boolean>[]} */ ([
+        CanRender,
+        CanPlay,
+        LoadingProp,
+      ]),
       (canRender, canPlay, loading) => {
         this.context_.renderable = canRender;
         this.context_.playable = canPlay;
@@ -321,7 +437,7 @@ export class PreactBaseElement extends BaseElement {
       }
     );
 
-    const useContexts = Ctor['useContexts'];
+    const {useContexts} = Ctor;
     if (useContexts.length != 0) {
       subscribe(this.element, useContexts, (...contexts) => {
         this.contextValues_ = contexts;
@@ -332,8 +448,8 @@ export class PreactBaseElement extends BaseElement {
     this.renderDeferred_ = new Deferred();
     this.scheduleRender_();
 
-    if (Ctor['loadable']) {
-      this.setReadyState?.(ReadyState.LOADING);
+    if (Ctor.loadable) {
+      this.setReadyState?.(ReadyState_Enum.LOADING);
     }
     this.maybeUpdateReadyState_();
 
@@ -342,20 +458,24 @@ export class PreactBaseElement extends BaseElement {
 
   /** @override */
   ensureLoaded() {
-    const Ctor = this.constructor;
-    if (!Ctor['loadable']) {
+    const Ctor = /** @type {typeof PreactBaseElement} */ (
+      /** @type {?} */ (this.constructor)
+    );
+    if (!Ctor.loadable) {
       return;
     }
-    this.mutateProps(dict({'loading': Loading.EAGER}));
+    this.mutateProps({'loading': Loading_Enum.EAGER});
     this.resetLoading_ = true;
   }
 
   /** @override */
   mountCallback() {
     discover(this.element);
-    const Ctor = this.constructor;
-    if (Ctor['loadable'] && this.getProp('loading') != Loading.AUTO) {
-      this.mutateProps({'loading': Loading.AUTO});
+    const Ctor = /** @type {typeof PreactBaseElement} */ (
+      /** @type {?} */ (this.constructor)
+    );
+    if (Ctor.loadable && this.getProp('loading') != Loading_Enum.AUTO) {
+      this.mutateProps({'loading': Loading_Enum.AUTO});
       this.resetLoading_ = false;
     }
   }
@@ -363,77 +483,40 @@ export class PreactBaseElement extends BaseElement {
   /** @override */
   unmountCallback() {
     discover(this.element);
-    const Ctor = this.constructor;
-    if (Ctor['loadable']) {
-      this.mutateProps({'loading': Loading.UNLOAD});
+    const Ctor = /** @type {typeof PreactBaseElement} */ (
+      /** @type {?} */ (this.constructor)
+    );
+    if (Ctor.loadable) {
+      this.mutateProps({'loading': Loading_Enum.UNLOAD});
     }
     this.updateIsPlaying_(false);
     this.mediaQueryProps_?.dispose();
   }
 
-  /** @override */
-  mutatedAttributesCallback() {
-    if (this.container_) {
-      this.scheduleRender_();
-    }
-  }
-
-  /** @override */
-  attemptChangeHeight(newHeight) {
-    return super.attemptChangeHeight(newHeight).catch((e) => {
-      // It's okay to disable this lint rule since we check that the restricted
-      // method exists.
-      // eslint-disable-next-line local/restrict-this-access
-      if (this.getOverflowElement && !this.getOverflowElement()) {
-        console./* OK */ warn(
-          '[overflow] element not found. Provide one to enable resizing to full contents.',
-          this.element
-        );
-      }
-      throw e;
-    });
-  }
-
   /**
    * @protected
-   * @param {!JsonObject} props
+   * @param {JsonObject} props
    */
   mutateProps(props) {
-    Object.assign(/** @type {!Object} */ (this.defaultProps_), props);
+    Object.assign(/** @type {object} */ (this.defaultProps_), props);
     this.scheduleRender_();
   }
 
   /**
-   * @return {!API_TYPE}
+   * @return {API_TYPE}
    * @protected
    */
   api() {
-    return devAssert(this.currentRef_);
-  }
-
-  /**
-   * Register an action for AMP documents to execute an API handler.
-   *
-   * This has no effect on Bento documents, since they lack an Actions system.
-   * Instead, they should use `(await element.getApi()).action()`
-   * @param {string} alias
-   * @param {function(!API_TYPE, !../service/action-impl.ActionInvocation)} handler
-   * @param {../action-constants.ActionTrust} minTrust
-   * @protected
-   */
-  registerApiAction(alias, handler, minTrust = ActionTrust.DEFAULT) {
-    this.registerAction?.(
-      alias,
-      (invocation) => handler(this.api(), invocation),
-      minTrust
-    );
+    const ref = this.currentRef_;
+    devAssert(ref);
+    return ref;
   }
 
   /**
    * A callback called immediately after mutations have been observed on a
    * component. This differs from `checkPropsPostMutations` in that it is
    * called in all cases of mutation.
-   * @param {!Array<MutationRecord>} unusedRecords
+   * @param {Array<MutationRecord>} unusedRecords
    * @protected
    */
   mutationObserverCallback(unusedRecords) {}
@@ -450,14 +533,14 @@ export class PreactBaseElement extends BaseElement {
    * A callback called to compute props before rendering is run. The properties
    * computed here and ephemeral and thus should not be persisted via a
    * `mutateProps()` method.
-   * @param {!JsonObject} unusedProps
+   * @param {JsonObject} unusedProps
    * @protected
    */
   updatePropsForRendering(unusedProps) {}
 
   /**
    * A callback called to check whether the element is ready for rendering.
-   * @param {!JsonObject} unusedProps
+   * @param {JsonObject} unusedProps
    * @return {boolean}
    * @protected
    */
@@ -466,11 +549,13 @@ export class PreactBaseElement extends BaseElement {
   }
 
   /**
-   * @param {!Array<!MutationRecord>} records
+   * @param {Array<MutationRecord>} records
    * @private
    */
   checkMutations_(records) {
-    const Ctor = this.constructor;
+    const Ctor = /** @type {typeof PreactBaseElement} */ (
+      /** @type {?} */ (this.constructor)
+    );
     this.mutationObserverCallback(records);
     const rerender = records.some((m) => shouldMutationBeRerendered(Ctor, m));
     if (rerender) {
@@ -479,7 +564,7 @@ export class PreactBaseElement extends BaseElement {
     }
   }
 
-  /** @private */
+  /** @protected */
   scheduleRender_() {
     if (!this.scheduledRender_) {
       this.scheduledRender_ = true;
@@ -498,62 +583,27 @@ export class PreactBaseElement extends BaseElement {
   }
 
   /**
-   * @param {!ReadyState} state
+   * @param {ReadyState_Enum} state
    * @param {*=} opt_failure
    * @private
    */
   onReadyState_(state, opt_failure) {
     this.setReadyState?.(state, opt_failure);
 
-    const Ctor = this.constructor;
-    if (Ctor['unloadOnPause']) {
+    const Ctor = /** @type {typeof PreactBaseElement} */ (
+      /** @type {?} */ (this.constructor)
+    );
+    if (Ctor.unloadOnPause) {
       // These are typically iframe-based elements where we don't know
       // whether a media is currently playing. So we have to assume that
       // it is whenever the element is loaded.
-      this.updateIsPlaying_(state == ReadyState.COMPLETE);
+      this.updateIsPlaying_(state == ReadyState_Enum.COMPLETE);
     }
 
     // Reset "loading" property back to "auto".
     if (this.resetLoading_) {
       this.resetLoading_ = false;
-      this.mutateProps({'loading': Loading.AUTO});
-    }
-  }
-
-  /**
-   * Default handler for onLoad event
-   * Displays loader. Override to customize.
-   * @protected
-   */
-  handleOnLoad() {
-    this.toggleLoading?.(false);
-    this.toggleFallback?.(false);
-    this.togglePlaceholder?.(false);
-  }
-
-  /**
-   * Default handler for onLoading event
-   * Reveals loader. Override to customize.
-   * @protected
-   */
-  handleOnLoading() {
-    this.toggleLoading?.(true);
-  }
-
-  /**
-   * Default handler for onError event
-   * Displays Fallback / Placeholder. Override to customize.
-   * @protected
-   */
-  handleOnError() {
-    this.toggleLoading?.(false);
-    // If the content fails to load and there's a fallback element, display the fallback.
-    // Otherwise, continue displaying the placeholder.
-    if (this.getFallback?.()) {
-      this.toggleFallback?.(true);
-      this.togglePlaceholder?.(false);
-    } else {
-      this.togglePlaceholder?.(true);
+      this.mutateProps({'loading': Loading_Enum.AUTO});
     }
   }
 
@@ -565,10 +615,11 @@ export class PreactBaseElement extends BaseElement {
       return;
     }
 
-    const Ctor = this.constructor;
-    const isShadow = Ctor['usesShadowDom'];
-    const lightDomTag = isShadow ? null : Ctor['lightDomTag'];
-    const isDetached = Ctor['detached'];
+    const Ctor = /** @type {typeof PreactBaseElement} */ (
+      /** @type {?} */ (this.constructor)
+    );
+    const {detached: isDetached, usesShadowDom: isShadow} = Ctor;
+    const lightDomTag = isShadow ? null : Ctor.lightDomTag;
 
     if (!this.container_) {
       const doc = this.win.document;
@@ -587,12 +638,12 @@ export class PreactBaseElement extends BaseElement {
           // Create new shadow root.
           shadowRoot = this.element.attachShadow({
             mode: 'open',
-            delegatesFocus: Ctor['delegatesFocus'],
+            delegatesFocus: Ctor.delegatesFocus,
           });
 
           // The pre-constructed shadow root is required to have the stylesheet
           // inline. Thus, only the new shadow roots share the stylesheets.
-          const shadowCss = Ctor['shadowCss'];
+          const {shadowCss} = Ctor;
           if (shadowCss) {
             installShadowStyle(shadowRoot, this.element.tagName, shadowCss);
           }
@@ -621,21 +672,31 @@ export class PreactBaseElement extends BaseElement {
         this.container_ = container;
 
         // Connect shadow root to the element's context.
+        devAssert(shadowRoot);
         setParent(shadowRoot, this.element);
         // In Shadow DOM, only the children distributed in
         // slots are displayed. All other children are undisplayed. We need
         // to create a simple mechanism that would automatically compute
         // `CanRender = false` on undistributed children.
         addGroup(this.element, UNSLOTTED_GROUP, MATCH_ANY, /* weight */ -1);
-        // eslint-disable-next-line local/restrict-this-access
-        setGroupProp(this.element, UNSLOTTED_GROUP, CanRender, this, false);
+
+        setGroupProp(
+          this.element,
+          UNSLOTTED_GROUP,
+          CanRender,
+          // TODO: is `this` correct as the setter arg for setGroupProp
+          // eslint-disable-next-line local/restrict-this-access
+          /** @type {*} */ (this),
+          false
+        );
       } else if (lightDomTag) {
-        this.container_ = this.element;
+        const container = this.element;
+        this.container_ = container;
         const replacement =
-          childElementByAttr(this.container_, RENDERED_ATTR) ||
+          childElementByAttr(container, RENDERED_ATTR) ||
           createElementWithAttributes(doc, lightDomTag, RENDERED_ATTRS);
         replacement[RENDERED_PROP] = true;
-        if (Ctor['layoutSizeDefined']) {
+        if (Ctor.layoutSizeDefined) {
           replacement.classList.add('i-amphtml-fill-content');
         }
         this.container_.appendChild(replacement);
@@ -648,11 +709,13 @@ export class PreactBaseElement extends BaseElement {
         }
       }
     }
+    const container = this.container_;
+    devAssert(container);
 
     // Exit early if contexts are not ready. Optional contexts will yield
     // right away, even when `null`. The required contexts will block the
     // `contextValues` until available.
-    const useContexts = Ctor['useContexts'];
+    const {useContexts} = Ctor;
     const contextValues = this.contextValues_;
     const isContextReady = useContexts.length == 0 || contextValues != null;
     if (!isContextReady) {
@@ -676,10 +739,11 @@ export class PreactBaseElement extends BaseElement {
     // While this "creates" a new element, diffing will not create a second
     // instance of Component. Instead, the existing one already rendered into
     // this element will be reused.
-    let comp = Preact.createElement(Ctor['Component'], props);
+    let comp = Preact.createElement(Ctor.Component, props);
 
     // Add contexts.
     for (let i = 0; i < useContexts.length; i++) {
+      devAssert(contextValues);
       const Context = useContexts[i].type;
       const value = contextValues[i];
       if (value) {
@@ -690,28 +754,33 @@ export class PreactBaseElement extends BaseElement {
     // Add AmpContext with renderable/playable proeprties.
     const v = <WithAmpContext {...this.context_}>{comp}</WithAmpContext>;
 
-    if (this.hydrationPending_) {
-      this.hydrationPending_ = false;
-      hydrate(v, this.container_);
-    } else {
-      const replacement = lightDomTag
-        ? childElementByAttr(this.container_, RENDERED_ATTR)
-        : null;
-      if (replacement) {
-        replacement[RENDERED_PROP] = true;
+    try {
+      if (this.hydrationPending_) {
+        this.hydrationPending_ = false;
+        hydrate(v, container);
+      } else {
+        const replacement = lightDomTag
+          ? childElementByAttr(container, RENDERED_ATTR)
+          : null;
+        if (replacement) {
+          replacement[RENDERED_PROP] = true;
+        }
+        render(v, container, replacement ?? undefined);
       }
-      render(v, this.container_, replacement);
+    } catch (err) {
+      this.renderDeferred_?.reject(err);
+      throw err;
     }
 
     // Dispatch the DOM_UPDATE event when rendered in the light DOM.
     if (!isShadow && !isDetached) {
       this.mutateElement(() =>
-        dispatchCustomEvent(this.element, AmpEvents.DOM_UPDATE, null)
+        dispatchCustomEvent(this.element, AmpEvents_Enum.DOM_UPDATE, undefined)
       );
     }
 
     if (this.renderDeferred_) {
-      this.renderDeferred_.resolve();
+      this.renderDeferred_.resolve(undefined);
       this.renderDeferred_ = null;
     }
   }
@@ -719,7 +788,7 @@ export class PreactBaseElement extends BaseElement {
   /**
    * @protected
    * @param {string} prop
-   * @param {*} opt_fallback
+   * @param {*=} opt_fallback
    * @return {*}
    */
   getProp(prop, opt_fallback) {
@@ -733,7 +802,7 @@ export class PreactBaseElement extends BaseElement {
    * Returns reference to upgraded imperative API object, as in React's
    * useImperativeHandle.
    *
-   * @return {!Promise<!API_TYPE>}
+   * @return {Promise<API_TYPE>}
    * @override
    */
   getApi() {
@@ -756,16 +825,15 @@ export class PreactBaseElement extends BaseElement {
    * `ref.current`. So if we ever returned `ref.current` directly, it could go
    * stale by the time its actually used.
    *
-   * @param {!API_TYPE} current
+   * @param {API_TYPE} current
    * @private
    */
   initApiWrapper_(current) {
     const api = map();
-    const keys = Object.keys(current);
+    const keys = /** @type Array<keyof API_TYPE> */ (Object.keys(current));
     for (let i = 0; i < keys.length; i++) {
       const key = keys[i];
-      // eslint-disable-next-line local/restrict-this-access
-      wrapRefProperty(this, api, key);
+      this.wrapRefProperty_(api, key);
     }
     this.apiWrapper_ = api;
     if (this.deferredApi_) {
@@ -778,7 +846,7 @@ export class PreactBaseElement extends BaseElement {
    * Verifies that every Preact render exposes the same API surface as the previous render.
    * If it does not, the API wrapper is syncrhonized.
    *
-   * @param {!API_TYPE} current
+   * @param {API_TYPE} current
    * @private
    */
   checkApiWrapper_(current) {
@@ -815,10 +883,9 @@ export class PreactBaseElement extends BaseElement {
   /**
    * Dispatches an error event. Provided as a method so Preact components can
    * call into it, while AMP components can override to trigger action services.
-   * @param {!Element} element
+   * @param {Element} element
    * @param {string} eventName
-   * @param {!JSONObject|string|undefined|null} detail
-   * @return {!Object}
+   * @param {JsonObject} detail
    */
   triggerEvent(element, eventName, detail) {
     dispatchCustomEvent(element, eventName, detail);
@@ -826,9 +893,11 @@ export class PreactBaseElement extends BaseElement {
 
   /** @override */
   pauseCallback() {
-    const Ctor = this.constructor;
-    if (Ctor['unloadOnPause']) {
-      this.mutateProps(dict({'loading': Loading.UNLOAD}));
+    const Ctor = /** @type {typeof PreactBaseElement} */ (
+      /** @type {?} */ (this.constructor)
+    );
+    if (Ctor.unloadOnPause) {
+      this.mutateProps({'loading': Loading_Enum.UNLOAD});
       this.resetLoading_ = true;
     } else {
       const {currentRef_: api} = this;
@@ -843,159 +912,32 @@ export class PreactBaseElement extends BaseElement {
   updateIsPlaying_(isPlaying) {
     this.pauseHelper_.updatePlaying(isPlaying);
   }
-}
-
-/**
- * @param {typeof PreactBaseElement} baseElement
- * @param {!Object} api
- * @param {string} key
- */
-function wrapRefProperty(baseElement, api, key) {
-  Object.defineProperty(api, key, {
-    configurable: true,
-
-    get() {
-      return baseElement.currentRef_[key];
-    },
-
-    set(v) {
-      baseElement.currentRef_[key] = v;
-    },
-  });
-}
-
-/**
- * Returns the upgraded imperative API object, once Preact has actually mounted.
- *
- * This technically works with both Bento and Legacy components, returning the
- * BaseElement instance in the later case.
- *
- * @param {!Element} el
- * @return {!Promise<!Object>}
- */
-export function whenUpgraded(el) {
-  return el.ownerDocument.defaultView.customElements
-    .whenDefined(el.localName)
-    .then(() => el.getImpl())
-    .then((impl) => impl.getApi());
-}
-
-// Ideally, these would be Static Class Fields. But Closure can't even.
-
-/**
- * Override to provide the Component definition.
- *
- * @protected {!PreactDef.FunctionalComponent}
- */
-PreactBaseElement['Component'] = function () {
-  devAssert(false, 'Must provide Component');
-};
-
-/**
- * If default props are static, this can be used instead of init().
- * @protected {!JsonObject|undefined}
- */
-PreactBaseElement['staticProps'] = undefined;
 
-/**
- * @protected {!Array<!ContextProp>}
- */
-PreactBaseElement['useContexts'] = mode.isLocalDev() ? Object.freeze([]) : [];
-
-/**
- * Whether the component implements a loading protocol.
- *
- * @protected {boolean}
- */
-PreactBaseElement['loadable'] = false;
-
-/**
- * Whether a component should be unloaded for `pauseCallback`.
- *
- * @protected {boolean}
- */
-PreactBaseElement['unloadOnPause'] = false;
-
-/**
- * An override to specify that the component requires `layoutSizeDefined`.
- * This typically means that the element's `isLayoutSupported()` is
- * implemented via `isLayoutSizeDefined()`, and this is how the default
- * `isLayoutSupported()` is implemented when this flag is set.
- *
- * @protected {string}
- */
-PreactBaseElement['layoutSizeDefined'] = false;
-
-/**
- * The tag name, e.g. "div", "span", time" that should be used as a replacement
- * node for Preact rendering. This is the node that Preact will diff with
- * with specified, instead of rendering a new node. Only applicable to light-DOM
- * mapping styles.
- *
- * @protected {string}
- */
-PreactBaseElement['lightDomTag'] = '';
-
-/**
- * Whether this element uses "templates" system.
- *
- * @protected {boolean}
- */
-PreactBaseElement['usesTemplate'] = false;
-
-/**
- * The CSS for shadow stylesheets.
- *
- * @protected {?string}
- */
-PreactBaseElement['shadowCss'] = null;
-
-/**
- * Whether this element uses Shadow DOM.
- *
- * @protected {boolean}
- */
-PreactBaseElement['usesShadowDom'] = false;
-
-/**
- * Enabling detached mode alters the children to be rendered in an
- * unappended container. By default the children will be attached to the DOM.
- *
- * @protected {boolean}
- */
-PreactBaseElement['detached'] = false;
-
-/**
- * This enables the 'delegatesFocus' option when creating the shadow DOM for
- * this component.  A key feature of 'delegatesFocus' set to true is that
- * when elements within the shadow DOM gain focus, the focus is also applied
- * to the host element.
- */
-PreactBaseElement['delegatesFocus'] = false;
-
-/**
- * Provides a mapping of Preact prop to AmpElement DOM attributes.
- *
- * @protected {!Object<string, !AmpElementPropDef>}
- */
-PreactBaseElement['props'] = {};
-
-/**
- * @param {null|string} attributeName
- * @param {string|undefined} attributePrefix
- * @return {boolean}
- */
-function matchesAttrPrefix(attributeName, attributePrefix) {
-  return (
-    attributeName !== null &&
-    attributePrefix !== undefined &&
-    attributeName.startsWith(attributePrefix) &&
-    attributeName !== attributePrefix
-  );
+  /**
+   * @param {object} api
+   * @param {keyof API_TYPE} key
+   * @private
+   */
+  wrapRefProperty_(api, key) {
+    Object.defineProperty(api, key, {
+      configurable: true,
+
+      get: () => {
+        const ref = this.currentRef_;
+        devAssert(ref);
+        return ref[key];
+      },
+      set: (v) => {
+        const ref = this.currentRef_;
+        devAssert(ref);
+        ref[key] = v;
+      },
+    });
+  }
 }
 
 /**
- * @param {!NodeList} nodeList
+ * @param {NodeList} nodeList
  * @return {boolean}
  */
 function shouldMutationForNodeListBeRerendered(nodeList) {
@@ -1022,24 +964,26 @@ function shouldMutationForNodeListBeRerendered(nodeList) {
 
 /**
  * @param {typeof PreactBaseElement} Ctor
- * @param {!MutationRecord} m
+ * @param {MutationRecord} m
  * @return {boolean}
  */
 function shouldMutationBeRerendered(Ctor, m) {
   const {type} = m;
   if (type == 'attributes') {
     // Check whether this is a templates attribute.
-    if (Ctor['usesTemplate'] && m.attributeName == 'template') {
+    if (Ctor.usesTemplate && m.attributeName == 'template') {
       return true;
     }
     // Check if the attribute is mapped to one of the properties.
-    const props = Ctor['props'];
+    const {props} = Ctor;
     for (const name in props) {
-      const def = /** @type {!AmpElementPropDef} */ (props[name]);
+      const def = /** @type {AmpElementProp} */ (props[name]);
+      const attrName = m.attributeName;
+      devAssert(attrName);
       if (
-        m.attributeName == def.attr ||
-        (def.attrs && def.attrs.includes(devAssert(m.attributeName))) ||
-        matchesAttrPrefix(m.attributeName, def.attrPrefix)
+        attrName == def.attr ||
+        def.attrs?.includes(attrName) ||
+        def.attrMatches?.(attrName)
       ) {
         return true;
       }
diff --git a/src/preact/bento-ce.js b/src/preact/bento-ce.js
index 98ce2d870be5..fc75aafc1e96 100644
--- a/src/preact/bento-ce.js
+++ b/src/preact/bento-ce.js
@@ -4,7 +4,7 @@ import {getWin} from '#core/window';
 /**
  * @param {T} klass
  * @return {T}
- * @template T
+ * @template {Function} T
  */
 function maybeWrapNativeSuper(klass) {
   if (isEsm() || typeof Reflect !== 'object' || !Reflect.construct) {
@@ -33,52 +33,17 @@ let BaseElement;
 if (typeof AMP !== 'undefined' && AMP.BaseElement) {
   BaseElement = AMP.BaseElement;
 } else {
-  const ExtendableHTMLElement = maybeWrapNativeSuper(HTMLElement);
   class CeBaseElement {
     /**
-     * @param {!Element} element
+     * @param {Element} element
      */
     constructor(element) {
-      /** @const {!Element} */
       this.element = element;
 
-      /** @const {!Window} */
+      /** @type {Window} */
       this.win = getWin(element);
     }
 
-    /**
-     * @param {typeof CeBaseElement} BaseElement
-     * @return {typeof HTMLElement}
-     */
-    static 'CustomElement'(BaseElement) {
-      return class CustomElement extends ExtendableHTMLElement {
-        /** */
-        constructor() {
-          super();
-
-          /** @const {!CeBaseElement} */
-          this.implementation = new BaseElement(this);
-        }
-
-        /** */
-        connectedCallback() {
-          this.classList.add('i-amphtml-built');
-          this.implementation.mountCallback();
-          this.implementation.buildCallback();
-        }
-
-        /** */
-        disconnectedCallback() {
-          this.implementation.unmountCallback();
-        }
-
-        /** @return {Promise<*>} */
-        getApi() {
-          return this.implementation.getApi();
-        }
-      };
-    }
-
     /**
      * @param {function():undefined} cb
      */
@@ -101,7 +66,69 @@ if (typeof AMP !== 'undefined' && AMP.BaseElement) {
     buildCallback() {}
   }
 
-  BaseElement = /** @type {typeof AMP.BaseElement} */ (CeBaseElement);
+  BaseElement = /** @type {typeof AMP.BaseElement} */ (
+    /** @type {?} */ (CeBaseElement)
+  );
 }
 
 export {BaseElement};
+
+/** @type {typeof HTMLElement} */
+let ExtendableHTMLElement;
+/** @type {typeof globalThis} */
+let win;
+
+/**
+ * @param {typeof import('./base-element').PreactBaseElement} BaseElement
+ * @param {typeof globalThis} _win
+ * @return {typeof HTMLElement}
+ * @template {{
+ *   readyState?: string | undefined;
+ *   pause?: (() => void) | undefined;
+ * }} T */
+function createBentoElementClass(BaseElement, _win = self) {
+  if (!ExtendableHTMLElement || win !== _win) {
+    win = _win;
+    ExtendableHTMLElement = maybeWrapNativeSuper(win.HTMLElement);
+  }
+
+  return class CustomElement extends ExtendableHTMLElement {
+    /** @override */
+    constructor() {
+      super();
+
+      /**
+       * @type {import('./base-element').PreactBaseElement<T>}
+       */
+      this.implementation = new BaseElement(
+        /** @type {AmpElement} */ (/** @type {?} */ (this))
+      );
+    }
+
+    /** */
+    connectedCallback() {
+      this.classList.add('i-amphtml-built');
+      this.implementation.mountCallback();
+      this.implementation.buildCallback();
+    }
+
+    /** */
+    disconnectedCallback() {
+      this.implementation.unmountCallback();
+    }
+
+    /** @return {Promise<*>} */
+    getApi() {
+      return this.implementation.getApi();
+    }
+  };
+}
+
+/**
+ * @param {string} tag
+ * @param {typeof import('./base-element').PreactBaseElement} BaseElement
+ * @param {typeof globalThis} _win
+ */
+export function defineBentoElement(tag, BaseElement, _win = self) {
+  _win.customElements.define(tag, createBentoElementClass(BaseElement, _win));
+}
diff --git a/src/preact/compat.js b/src/preact/compat.js
deleted file mode 100644
index 7a41a80cda7b..000000000000
--- a/src/preact/compat.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import * as compat from /*OK*/ 'preact/compat';
-
-/**
- * @param {function(T, {current: (R|null)}):PreactDef.Renderable} fn
- * @return {function(T):PreactDef.Renderable}
- * @template T, R
- */
-export function forwardRef(fn) {
-  return compat.forwardRef(fn);
-}
-
-/**
- * @param {PreactDef.VNode} vnode
- * @param {HTMLElement} container
- * @return {PreactDef.VNode}
- */
-export function createPortal(vnode, container) {
-  return compat.createPortal(vnode, container);
-}
-
-/**
- * @param {...PreactDef.Renderable} unusedChildren
- * @return {!Array<PreactDef.Renderable>}
- */
-export function toChildArray(unusedChildren) {
-  return compat.Children.toArray.apply(undefined, arguments);
-}
diff --git a/src/preact/compat/external.js b/src/preact/compat/external.js
new file mode 100644
index 000000000000..f1c47c881b53
--- /dev/null
+++ b/src/preact/compat/external.js
@@ -0,0 +1 @@
+export {forwardRef, Children, memo} from 'preact/compat';
diff --git a/src/preact/compat/index.js b/src/preact/compat/index.js
new file mode 100644
index 000000000000..d4ae9b14ece6
--- /dev/null
+++ b/src/preact/compat/index.js
@@ -0,0 +1 @@
+export * from './internal';
diff --git a/src/preact/compat/internal.js b/src/preact/compat/internal.js
new file mode 100644
index 000000000000..8af314b699ba
--- /dev/null
+++ b/src/preact/compat/internal.js
@@ -0,0 +1,105 @@
+import {options, toChildArray} from /*OK*/ 'preact';
+
+import * as mode from '#core/mode';
+
+export {memo} from './memo';
+
+const REACT_FORWARD_SYMBOL =
+  (typeof Symbol !== 'undefined' && Symbol.for?.('react.forward_ref')) || 0xf47;
+
+/**
+ * @type {*}
+ * `__b` is the known mangled name exported by preact. This is called during
+ * the diffing algorithm with the constructed VNode, before the vnode is
+ * actually used to diff.
+ *
+ */
+const diffKey = '__b';
+const oldDiff = /** @type {*} */ (options)[diffKey];
+/** @type {*} */ (options)[diffKey] = newDiff;
+
+/**
+ * Checks if our VNode type has a `forwardRef_` sigil, in which case it was created by our forwardRef implementation.
+ * If so, we move the VNode's ref to it's props, which will be passed to the Component as its props.
+ *
+ * See VNode type at https://github.com/preactjs/preact/blob/55ee4bc069f84cf5e3af8f2e2f338f4e74aca4d8/src/create-element.js#L58-L76
+ *
+ * @param {*} vnode
+ */
+function newDiff(vnode) {
+  if (vnode['type']?.forwardRef_ && vnode['ref']) {
+    vnode['props']['ref'] = vnode['ref'];
+    vnode['ref'] = null;
+  }
+  oldDiff?.(vnode);
+}
+
+/**
+ * Reimplements forwardRef without dragging in everything from preact/compat.
+ * See https://github.com/preactjs/preact/issues/3295
+ *
+ * @type {import('preact/compat').forwardRef}
+ */
+export const forwardRef = function (Component) {
+  /**
+   * @param {*} props
+   * @return {*}
+   */
+  function Forward(props) {
+    const {ref, ...clone} = props;
+    return Component(clone, ref);
+  }
+
+  // Is faithful react support necessary? This file should only be used in Preact mode,
+  // importers will directly import `React.forwardRef` in React builds.
+  Forward.$$typeof = REACT_FORWARD_SYMBOL;
+
+  // Preact pretends functional components are classical component instances,
+  // which are expected to have a render method.
+  Forward.render = Forward;
+
+  // https://github.com/preactjs/preact/blob/d78746c96245b70a83514a69ba4047e5dd0c7f54/compat/src/render.js#L26-L27
+  // Some libraries like `react-virtualized` explicitly check for this.
+  Forward.prototype.isReactComponent = true;
+
+  Forward.forwardRef_ = true;
+
+  if (!mode.isProd()) {
+    Forward.displayName = `ForwardRef(${
+      Component.displayName || Component.name
+    })`;
+  }
+
+  return /** @type {*} */ (Forward);
+};
+
+/**
+ * @type {typeof import('preact').toChildArray} children
+ */
+function toArray(children) {
+  return toChildArray(children);
+}
+
+/**
+ * @param {import('preact').ComponentChildren} children
+ * @param {function(import('preact').ComponentChildren, number):R} fn
+ * @return {Array<R>}
+ * @template R
+ */
+function map(children, fn) {
+  return toChildArray(children).map(fn);
+}
+
+/**
+ * @param {import('preact').ComponentChildren} children
+ * @return {number}
+ */
+function count(children) {
+  return toChildArray(children).length;
+}
+
+export const Children = {
+  toArray,
+  map,
+  count,
+};
diff --git a/src/preact/compat/memo.js b/src/preact/compat/memo.js
new file mode 100644
index 000000000000..9b53eb8e1df5
--- /dev/null
+++ b/src/preact/compat/memo.js
@@ -0,0 +1,63 @@
+/*
+ * This file was copied from Preact's source code,
+ * so we're going to disable TS/lint/codecov:
+ */
+/* istanbul ignore file */
+/* eslint-disable */
+// @ts-nocheck
+import {createElement} from '#preact';
+
+// Copied from preact/compat/src/utils.js:
+/**
+ * Check if two objects have a different shape
+ * @param {any} a
+ * @param {any} b
+ * @return {boolean}
+ */
+export function shallowDiffers(a, b) {
+  for (const i in a) {
+    if (i !== '__source' && !(i in b)) {
+      return true;
+    }
+  }
+  for (const i in b) {
+    if (i !== '__source' && a[i] !== b[i]) {
+      return true;
+    }
+  }
+  return false;
+}
+
+// Copied from preact/compat/src/memo.js:
+/**
+ * Memoize a component, so that it only updates when the props actually have
+ * changed. This was previously known as `React.pure`.
+ * @param {import('../types').FC} c functional component
+ * @param {(prev: object, next: object) => boolean} [comparer] Custom equality function
+ * @return {import('../types').FC}
+ */
+export function memo(c, comparer) {
+  function shouldUpdate(nextProps) {
+    const {ref} = this.props;
+    const updateRef = ref == nextProps.ref;
+    if (!updateRef && ref) {
+      ref.call ? ref(null) : (ref.current = null);
+    }
+
+    if (!comparer) {
+      return shallowDiffers(this.props, nextProps);
+    }
+
+    return !comparer(this.props, nextProps) || !updateRef;
+  }
+
+  function Memoed(props) {
+    this.shouldComponentUpdate = shouldUpdate;
+    return createElement(c, props);
+  }
+  Memoed.displayName = 'Memo(' + (c.displayName || c.name) + ')';
+  Memoed.prototype.isReactComponent = true;
+  Memoed._forwarded = true;
+  // @ts-ignore
+  return Memoed;
+}
diff --git a/src/preact/component/3p-frame.js b/src/preact/component/3p-frame.js
index d745b19fd9e6..a36af067119b 100644
--- a/src/preact/component/3p-frame.js
+++ b/src/preact/component/3p-frame.js
@@ -1,6 +1,5 @@
 import {getOptionalSandboxFlags, getRequiredSandboxFlags} from '#core/3p-frame';
 import {sequentialIdGenerator} from '#core/data-structures/id-generator';
-import {dict} from '#core/types/object';
 import {includes} from '#core/types/string';
 
 import * as Preact from '#preact';
@@ -23,7 +22,7 @@ import {
 } from '../../3p-frame';
 import {parseUrlDeprecated} from '../../url';
 
-/** @type {!Object<string,function():void>} 3p frames for that type. */
+/** @type {{[key: string]: function():void}} 3p frames for that type. */
 export const countGenerators = {};
 
 // Block synchronous XHR in ad. These are very rare, but super bad for UX
@@ -40,9 +39,9 @@ const DEFAULT_SANDBOX =
 /**
  * Creates the iframe for the embed. Applies correct size and passes the embed
  * attributes to the frame via JSON inside the fragment.
- * @param {!IframeEmbedDef.Props} props
- * @param {{current: (!IframeEmbedDef.Api|null)}} ref
- * @return {PreactDef.Renderable}
+ * @param {import('./types').IframeEmbedProps} props
+ * @param {import('preact').RefObject<import('./types').IframeEmbedApi>} ref
+ * @return {import('preact').VNode}
  */
 function ProxyIframeEmbedWithRef(
   {
@@ -65,7 +64,10 @@ function ProxyIframeEmbedWithRef(
     );
   }
 
+  /** @type {import('preact/hooks').MutableRef<any>} */
   const contentRef = useRef(null);
+  // TODO: this should be IFrameEmbedApi, but it causes some minor type issues.
+  /** @type {import('preact/hooks').MutableRef<any>} */
   const iframeRef = useRef(null);
   const count = useMemo(() => {
     if (!countGenerators[type]) {
@@ -76,6 +78,7 @@ function ProxyIframeEmbedWithRef(
 
   const [nameAndSrc, setNameAndSrc] = useState({name: nameProp, src: srcProp});
   const {name, src} = nameAndSrc;
+  /** @type {import('preact/hooks').MutableRef<string?>} */
   const sentinelRef = useRef(null);
 
   useLayoutEffect(() => {
@@ -92,34 +95,28 @@ function ProxyIframeEmbedWithRef(
     if (!sentinelRef.current) {
       sentinelRef.current = generateSentinel(win);
     }
-    const context = Object.assign(
-      dict({
-        'location': {
-          'href': win.location.href,
-        },
-        'sentinel': sentinelRef.current,
-      })
-    );
-    const attrs = Object.assign(
-      dict({
-        'title': title,
+    const context = Object.assign({
+      'location': {
+        'href': win.location.href,
+      },
+      'sentinel': sentinelRef.current,
+    });
+    const attrs = {
+      'title': title,
+      'type': type,
+      '_context': context,
+      ...options,
+    };
+    setNameAndSrc({
+      name: JSON.stringify({
+        'host': parseUrlDeprecated(src).hostname,
+        'bootstrap': getBootstrapUrl(type),
         'type': type,
-        '_context': context,
+        // "name" must be unique across iframes, so we add a count.
+        // See: https://github.com/ampproject/amphtml/pull/2955
+        'count': count,
+        'attributes': attrs,
       }),
-      options
-    );
-    setNameAndSrc({
-      name: JSON.stringify(
-        dict({
-          'host': parseUrlDeprecated(src).hostname,
-          'bootstrap': getBootstrapUrl(type),
-          'type': type,
-          // "name" must be unique across iframes, so we add a count.
-          // See: https://github.com/ampproject/amphtml/pull/2955
-          'count': count,
-          'attributes': attrs,
-        })
-      ),
       src,
     });
   }, [count, nameProp, options, srcProp, title, type]);
@@ -150,6 +147,7 @@ function ProxyIframeEmbedWithRef(
 
   return (
     <IframeEmbed
+      {...rest}
       allow={allow}
       contentRef={contentRef}
       messageHandler={messageHandler}
@@ -159,7 +157,6 @@ function ProxyIframeEmbedWithRef(
       sandbox={excludeSandbox ? undefined : sandbox}
       src={src}
       title={title}
-      {...rest}
     />
   );
 }
diff --git a/src/preact/component/component.type.js b/src/preact/component/component.type.js
deleted file mode 100644
index 917c68fa0786..000000000000
--- a/src/preact/component/component.type.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/** @externs */
-
-/**
- * @typedef {{
- *   as: (string|!Function|undefined),
- *   wrapperClassName: (?string|undefined),
- *   wrapperStyle: (?Object|undefined),
- *   children: (?PreactDef.Renderable|undefined),
- * }}
- */
-var WrapperComponentProps;
-
-/**
- * See https://developer.mozilla.org/en-US/docs/Web/CSS/contain
- *
- * @typedef {{
- *   as: (string|!Function|undefined),
- *   size: (boolean|undefined),
- *   layout: (boolean|undefined),
- *   paint: (boolean|undefined),
- *   wrapperClassName: (?string|undefined),
- *   wrapperStyle: (?Object|undefined),
- *   contentRef: ({current: ?}|function(!Element)|undefined),
- *   contentClassName: (?string|undefined),
- *   contentStyle: (?Object|undefined),
- *   children: (?PreactDef.Renderable|undefined),
- * }}
- */
-var ContainWrapperComponentProps;
-
-/**
- * @typedef {!PreactDef.Renderable|!PreactDef.InnerHTML|null}
- */
-var RendererFunctionResponseType;
-
-/**
- * @typedef {function(!JsonObject):(?RendererFunctionResponseType|!Promise<?RendererFunctionResponseType>)}
- */
-var RendererFunctionType;
-
-/** @const */
-var IframeEmbedDef = {};
-
-/**
- * @typedef {{
- *   allow: (string|undefined),
- *   allowFullScreen: (boolean|undefined),
- *   loading: (string),
- *   manageMessageHandler: (function({current: HTMLIFrameElement}, function():void):function():void|undefined),
- *   name: (string|undefined),
- *   onReadyState: (function(string)|undefined),
- *   ready: (boolean|undefined),
- *   sandbox: (string|undefined),
- *   src: (string|undefined),
- *   title: (string|undefined),
- * }}
- */
-IframeEmbedDef.Props;
-
-/** @constructor */
-IframeEmbedDef.Api = function () {};
-
-/** @type {string} */
-IframeEmbedDef.Api.prototype.readyState;
diff --git a/src/preact/component/contain.js b/src/preact/component/contain.js
deleted file mode 100644
index ebfc6950c859..000000000000
--- a/src/preact/component/contain.js
+++ /dev/null
@@ -1,88 +0,0 @@
-import * as Preact from '#preact';
-import {forwardRef} from '#preact/compat';
-
-const CONTAIN = [
-  null, // 0: none
-  'paint', // 1: paint
-  'layout', // 2: layout
-  'content', // 3: content = layout + paint
-  'size', // 4: size
-  'size paint', // 5: size + paint
-  'size layout', // 6: size + layout
-  'strict', // 7: strict = size + layout + paint
-];
-
-const SIZE_CONTENT_STYLE = {
-  'position': 'relative',
-  'width': '100%',
-  'height': '100%',
-};
-
-/**
- * The wrapper component that implements different "contain" parameters. This
- * most often indicates that the element's size doesn't depend on its children
- * (e.g. `contain:size`), but there might be other variances as well.
- *
- * See https://developer.mozilla.org/en-US/docs/Web/CSS/contain
- *
- * Contain parameters:
- * - size: the element's size does not depend on its content.
- * - layout: nothing outside the element may affect its internal layout and
- * vice versa.
- * - paint: the element's content doesn't display outside the element's bounds.
- * @param {!ContainWrapperComponentProps} props
- * @param {{current: ?Element}} ref
- * @return {PreactDef.Renderable}
- */
-function ContainWrapperWithRef(
-  {
-    as: Comp = 'div',
-    children,
-    'class': className,
-    contentAs: ContentComp = 'div',
-    contentClassName,
-    contentProps,
-    contentRef,
-    contentStyle,
-    layout = false,
-    paint = false,
-    size = false,
-    'style': style,
-    wrapperClassName,
-    wrapperStyle,
-    ...rest
-  },
-  ref
-) {
-  // The formula: `size << 2 | layout << 1 | paint`.
-  const containIndex = (size ? 4 : 0) + (layout ? 2 : 0) + (paint ? 1 : 0);
-  return (
-    <Comp
-      {...rest}
-      ref={ref}
-      class={`${className || ''} ${wrapperClassName || ''}`.trim() || null}
-      style={{
-        ...style,
-        ...wrapperStyle,
-        contain: CONTAIN[containIndex],
-      }}
-    >
-      <ContentComp
-        {...contentProps}
-        ref={contentRef}
-        class={contentClassName}
-        style={{
-          ...(size && SIZE_CONTENT_STYLE),
-          'overflow': paint ? 'hidden' : 'visible',
-          ...contentStyle,
-        }}
-      >
-        {children}
-      </ContentComp>
-    </Comp>
-  );
-}
-
-const ContainWrapper = forwardRef(ContainWrapperWithRef);
-
-export {ContainWrapper};
diff --git a/src/preact/component/contain.jsx b/src/preact/component/contain.jsx
new file mode 100644
index 000000000000..a7f6fc9ca62c
--- /dev/null
+++ b/src/preact/component/contain.jsx
@@ -0,0 +1,89 @@
+import * as Preact from '#preact';
+import {forwardRef} from '#preact/compat';
+import {propName} from '#preact/utils';
+
+const CONTAIN = [
+  null, // 0: none
+  'paint', // 1: paint
+  'layout', // 2: layout
+  'content', // 3: content = layout + paint
+  'size', // 4: size
+  'size paint', // 5: size + paint
+  'size layout', // 6: size + layout
+  'strict', // 7: strict = size + layout + paint
+];
+
+const SIZE_CONTENT_STYLE = {
+  'position': 'relative',
+  'width': '100%',
+  'height': '100%',
+};
+
+/**
+ * The wrapper component that implements different "contain" parameters. This
+ * most often indicates that the element's size doesn't depend on its children
+ * (e.g. `contain:size`), but there might be other variances as well.
+ *
+ * See https://developer.mozilla.org/en-US/docs/Web/CSS/contain
+ *
+ * Contain parameters:
+ * - size: the element's size does not depend on its content.
+ * - layout: nothing outside the element may affect its internal layout and
+ * vice versa.
+ * - paint: the element's content doesn't display outside the element's bounds.
+ * @param {import('./types').ContainerWrapperComponentProps} props
+ * @param {import('preact').RefObject<Element>} ref
+ * @return {import('preact').VNode}
+ */
+function ContainWrapperWithRef(
+  {
+    as: Comp = 'div',
+    children,
+    contentAs: ContentComp = 'div',
+    contentClassName,
+    contentProps,
+    contentRef,
+    contentStyle,
+    layout = false,
+    paint = false,
+    size = false,
+    'style': style,
+    wrapperClassName,
+    wrapperStyle,
+    [propName('class')]: className,
+    ...rest
+  },
+  ref
+) {
+  // The formula: `size << 2 | layout << 1 | paint`.
+  const containIndex = (size ? 4 : 0) + (layout ? 2 : 0) + (paint ? 1 : 0);
+  return (
+    <Comp
+      {...rest}
+      ref={ref}
+      class={`${className || ''} ${wrapperClassName || ''}`.trim() || null}
+      style={{
+        ...style,
+        ...wrapperStyle,
+        contain: CONTAIN[containIndex],
+      }}
+    >
+      <ContentComp
+        {...contentProps}
+        ref={contentRef}
+        class={contentClassName}
+        style={{
+          ...(size && SIZE_CONTENT_STYLE),
+          'overflow': paint ? 'hidden' : 'visible',
+          ...contentStyle,
+        }}
+      >
+        {children}
+      </ContentComp>
+    </Comp>
+  );
+}
+
+const ContainWrapper = forwardRef(ContainWrapperWithRef);
+
+export {ContainWrapper};
diff --git a/src/preact/component/iframe.js b/src/preact/component/iframe.js
index 6e39857cdb87..f2cd70791cd9 100644
--- a/src/preact/component/iframe.js
+++ b/src/preact/component/iframe.js
@@ -1,5 +1,5 @@
-import {Loading} from '#core/constants/loading-instructions';
-import {ReadyState} from '#core/constants/ready-state';
+import {Loading_Enum} from '#core/constants/loading-instructions';
+import {ReadyState_Enum} from '#core/constants/ready-state';
 
 import * as Preact from '#preact';
 import {
@@ -23,50 +23,55 @@ const ABOUT_BLANK = 'about:blank';
  * @param {string} src
  * @return {boolean}
  * */
-const canResetSrc = (src) => src && src != ABOUT_BLANK && !src.includes('#');
+const canResetSrc = (src) =>
+  !!(src && src != ABOUT_BLANK && !src.includes('#'));
 
 /**
- * @param {!IframeEmbedDef.Props} props
- * @param {{current: ?IframeEmbedDef.Api}} ref
- * @return {PreactDef.Renderable}
+ * @param {import('./types').IframeEmbedProps} props
+ * @param {import('preact').RefObject<import('./types').IframeEmbedApi>} ref
+ * @return {import('preact').VNode}
  */
 export function IframeEmbedWithRef(
   {
     allow,
     allowFullScreen,
     iframeStyle,
-    name,
-    title,
+    loading: loadingProp,
     matchesMessagingOrigin = DEFAULT_MATCHES_MESSAGING_ORIGIN,
     messageHandler,
-    ready = true,
-    loading: loadingProp,
+    name,
     onReadyState,
+    ready = true,
     sandbox,
     src,
+    title,
     ...rest
   },
   ref
 ) {
   const {playable} = useAmpContext();
   const loading = useLoading(loadingProp);
-  const mount = loading !== Loading.UNLOAD;
+  const mount = loading !== Loading_Enum.UNLOAD;
 
   const loadedRef = useRef(false);
   // The `onReadyStateRef` is passed via a ref to avoid the changed values
   // of `onReadyState` re-triggering the side effects.
   const onReadyStateRef = useValueRef(onReadyState);
   const setLoaded = useCallback(
+    /** @param {boolean} value */
     (value) => {
       if (value !== loadedRef.current) {
         loadedRef.current = value;
         const onReadyState = onReadyStateRef.current;
-        onReadyState?.(value ? ReadyState.COMPLETE : ReadyState.LOADING);
+        onReadyState?.(
+          value ? ReadyState_Enum.COMPLETE : ReadyState_Enum.LOADING
+        );
       }
     },
     [onReadyStateRef]
   );
 
+  /** @type {import('preact/hooks').MutableRef<HTMLIFrameElement?>} */
   const iframeRef = useRef(null);
 
   // Component API: IframeEmbedDef.Api.
@@ -75,7 +80,9 @@ export function IframeEmbedWithRef(
     () => ({
       // Standard Bento
       get readyState() {
-        return loadedRef.current ? ReadyState.COMPLETE : ReadyState.LOADING;
+        return loadedRef.current
+          ? ReadyState_Enum.COMPLETE
+          : ReadyState_Enum.LOADING;
       },
       get node() {
         return iframeRef.current;
@@ -106,7 +113,7 @@ export function IframeEmbedWithRef(
         iframe.src = iframe.src;
       } else {
         const parent = iframe.parentNode;
-        parent.insertBefore(iframe, iframe.nextSibling);
+        parent?.insertBefore(iframe, iframe.nextSibling);
       }
     }
   }, [playable]);
@@ -117,6 +124,7 @@ export function IframeEmbedWithRef(
       return;
     }
 
+    /** @param {MessageEvent} event */
     const handler = (event) => {
       const iframe = iframeRef.current;
       if (
@@ -130,8 +138,8 @@ export function IframeEmbedWithRef(
     };
 
     const {defaultView} = iframe.ownerDocument;
-    defaultView.addEventListener('message', handler);
-    return () => defaultView.removeEventListener('message', handler);
+    defaultView?.addEventListener('message', handler);
+    return () => defaultView?.removeEventListener('message', handler);
   }, [matchesMessagingOrigin, messageHandler, mount, ready]);
 
   return (
@@ -140,10 +148,14 @@ export function IframeEmbedWithRef(
         <iframe
           allow={allow}
           allowFullScreen={allowFullScreen}
-          frameborder="0"
-          loading={loading}
+          // TODO: is it frameborder or frameBorder?
+          frameBorder="0"
+          // TODO: ensure loading is not "auto" or "unload".
+          loading={/** @type {*} */ (loading)}
           name={name}
           onLoad={() => setLoaded(true)}
+          // TODO: what should be here?
+          // @ts-ignore
           part="iframe"
           ref={iframeRef}
           sandbox={sandbox}
diff --git a/src/preact/component/index.js b/src/preact/component/index.js
index 14493c658974..46617bfbdc50 100644
--- a/src/preact/component/index.js
+++ b/src/preact/component/index.js
@@ -1,6 +1,7 @@
+// ⚠️ Be mindful of what's exported from this file.
+// All exported symbols end up in the shared bento.js file.
+
 export {ContainWrapper} from './contain';
 export {Wrapper} from './wrapper';
-export {useRenderer} from './renderer';
 export {useValueRef} from './value-ref';
 export {useDOMHandle} from './dom-handle';
-export {useIntersectionObserver} from './intersection-observer';
diff --git a/src/preact/component/intersection-observer.js b/src/preact/component/intersection-observer.js
index 6d52e004df58..739aff284399 100644
--- a/src/preact/component/intersection-observer.js
+++ b/src/preact/component/intersection-observer.js
@@ -1,16 +1,19 @@
 import {observeIntersections} from '#core/dom/layout/viewport-observer';
 
-import {useCallback, useRef} from '#preact';
+import {useCallback, useEffect, useRef, useState} from '#preact';
 
 /**
  * Uses a shared IntersectionObserver per window instance to observe the given `ref`.
  *
- * @param {function(IntersectionObserverEntry)} callback
- * @return {function(Element)}
+ * @param {function(IntersectionObserverEntry):void} callback
+ * @param {import('#core/dom/layout/types').IOOptions} [ioOptions]
+ * @return {function(Element):void}
  */
-export function useIntersectionObserver(callback) {
+export function useIntersectionObserver(callback, ioOptions) {
+  /** @type {import('preact/hooks').MutableRef<import('#core/types/function/types').UnlistenCallback?>} */
   const unobserveRef = useRef(null);
   const refCb = useCallback(
+    /** @param {Element} node */
     (node) => {
       const cleanup = unobserveRef.current;
       if (cleanup) {
@@ -21,10 +24,40 @@ export function useIntersectionObserver(callback) {
       if (!node) {
         return;
       }
-      unobserveRef.current = observeIntersections(node, callback);
+
+      unobserveRef.current = observeIntersections(node, callback, ioOptions);
     },
-    [callback]
+    [callback, ioOptions]
   );
 
   return refCb;
 }
+
+/**
+ * Returns whether an element is within the viewport.
+ *
+ * @param {{current: ?Element}} ref
+ * @param {import('#core/dom/layout/types').IOOptions} [ioOptions]
+ * @return {boolean}
+ */
+export function useIsInViewport(ref, ioOptions) {
+  const [isInViewport, setIsInViewport] = useState(false);
+
+  useEffect(() => {
+    const node = ref.current;
+    if (!node) {
+      return;
+    }
+
+    const unobserve = observeIntersections(
+      node,
+      (entry) => {
+        setIsInViewport(entry.isIntersecting);
+      },
+      ioOptions
+    );
+    return unobserve;
+  }, [ref, ioOptions]);
+
+  return isInViewport;
+}
diff --git a/src/preact/component/renderer.js b/src/preact/component/renderer.js
index c2d4d3999b6a..74b44497a679 100644
--- a/src/preact/component/renderer.js
+++ b/src/preact/component/renderer.js
@@ -1,22 +1,25 @@
+import {isPromise} from '#core/types';
+
 import {useLayoutEffect, useState} from '#preact';
 
+/** @typedef {import('./types').RendererFunction} RendererFunction */
+/** @typedef {import('preact').VNode<*>} VNode */
+
 /**
  * Runs the renderer. It's critical that the `data` argument is stable - it
  * only changes when the actual data changes. The renderer itself is resolved
  * in a layout effect and allows the result to be a promise.
  *
- * @param {?RendererFunctionType|undefined} renderer
- * @param {!JsonObject} data
- * @return {?RendererFunctionResponseType}
+ * @param {RendererFunction} renderer
+ * @param {JsonObject} data
+ * @return {VNode|null}
  */
 export function useRenderer(renderer, data) {
-  const [value, setValue] = useState(
-    /** @type {?RendererFunctionResponseType} */ (null)
-  );
+  const [value, setValue] = useState(/** @type {VNode|null} */ (null));
 
   useLayoutEffect(() => {
     const rendered = (renderer && renderer(data)) || null;
-    if (rendered && typeof rendered['then'] == 'function') {
+    if (isPromise(rendered)) {
       let canceled = false;
       rendered.then((result) => {
         if (!canceled) {
@@ -27,7 +30,7 @@ export function useRenderer(renderer, data) {
         canceled = true;
       };
     } else {
-      setValue(/** @type {?RendererFunctionResponseType} */ (rendered));
+      setValue(/** @type {VNode} */ (rendered));
     }
   }, [renderer, data]);
 
diff --git a/src/preact/component/types.d.ts b/src/preact/component/types.d.ts
new file mode 100644
index 000000000000..750517b6a984
--- /dev/null
+++ b/src/preact/component/types.d.ts
@@ -0,0 +1,60 @@
+import * as Preact from 'preact';
+import {ComponentChildren, FunctionComponent, Ref, VNode} from 'preact';
+
+import {ReadyState_Enum} from '#core/constants/ready-state';
+
+// TODO: figure out the proper type for all of the 'as' types.
+
+export interface WrapperComponentProps {
+  style: Preact.JSX.CSSProperties;
+  class: string;
+  as: FunctionComponent | any;
+  wrapperClassName?: string | null;
+  wrapperStyle?: Object | null;
+  children?: ComponentChildren;
+}
+
+/**
+ * See https://developer.mozilla.org/en-US/docs/Web/CSS/contain
+ */
+export interface ContainerWrapperComponentProps {
+  as?: FunctionComponent | any;
+  contentAs?: FunctionComponent | any;
+  contentProps?: any;
+  style?: Preact.JSX.CSSProperties;
+  size?: boolean;
+  layout?: boolean;
+  paint?: boolean;
+  wrapperClassName?: string | null;
+  wrapperStyle?: Object | null;
+  contentRef?: null | Ref<any>;
+  contentClassName?: string | null;
+  contentStyle?: Object | null;
+  children?: ComponentChildren | null;
+  class?: string | null;
+}
+
+export type RendererFunction = (obj: JsonObject) => VNode | Promise<VNode>;
+
+export interface IframeEmbedProps {
+  allow?: string;
+  allowFullScreen?: boolean;
+  loading?: string;
+  messageHandler: (ref: MessageEvent) => void;
+  matchesMessagingOrigin: (a: any) => boolean;
+  name?: string;
+  onReadyState: (str: string) => void | undefined;
+  ready?: boolean;
+  sandbox?: string;
+  src?: string;
+  title?: string;
+  excludeSandbox?: boolean;
+  options?: any;
+  type?: any;
+  iframeStyle: Preact.JSX.CSSProperties;
+  contentRef?: Ref<any>;
+}
+
+export interface IframeEmbedApi {
+  readyState: ReadyState_Enum;
+}
diff --git a/src/preact/component/value-ref.js b/src/preact/component/value-ref.js
deleted file mode 100644
index 7500a9b0a8ee..000000000000
--- a/src/preact/component/value-ref.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import {useRef} from '#preact';
-
-/**
- * @param {T} current
- * @return {{current: T}}
- * @template T
- */
-export function useValueRef(current) {
-  const valueRef = useRef(null);
-  valueRef.current = current;
-  return valueRef;
-}
diff --git a/src/preact/component/value-ref.ts b/src/preact/component/value-ref.ts
new file mode 100644
index 000000000000..60d90b050228
--- /dev/null
+++ b/src/preact/component/value-ref.ts
@@ -0,0 +1,10 @@
+import {useRef} from '#preact';
+
+/**
+ * Returns a ref that always references the latest value
+ */
+export function useValueRef<T>(latest: T): {current: T} {
+  const valueRef = useRef<T>(latest);
+  valueRef.current = latest;
+  return valueRef;
+}
diff --git a/src/preact/component/wrapper.js b/src/preact/component/wrapper.js
index b2202e8ed8cd..d355187ef5a0 100644
--- a/src/preact/component/wrapper.js
+++ b/src/preact/component/wrapper.js
@@ -1,22 +1,23 @@
 import * as Preact from '#preact';
 import {forwardRef} from '#preact/compat';
+import {propName} from '#preact/utils';
 
 /**
  * The wrapper component provides the canonical wrapper for components whose
  * size depends on the children. This is often the opposite of the
  * `ContainWrapper`.
- * @param {!WrapperComponentProps} props
- * @param {{current: ?Element}} ref
- * @return {PreactDef.Renderable}
+ * @param {import('./types').WrapperComponentProps} props
+ * @param {import('preact').RefObject<Element>} ref
+ * @return {import('preact').VNode}
  */
 function WrapperWithRef(
   {
     as: Comp = 'div',
     children,
-    'class': className,
     'style': style,
     wrapperClassName,
     wrapperStyle,
+    [propName('class')]: className,
     ...rest
   },
   ref
diff --git a/src/preact/context.js b/src/preact/context.js
deleted file mode 100644
index 08666117546f..000000000000
--- a/src/preact/context.js
+++ /dev/null
@@ -1,86 +0,0 @@
-import {
-  Loading,
-  reducer as loadingReducer,
-} from '#core/constants/loading-instructions';
-
-import * as Preact from '#preact';
-import {createContext, useContext, useMemo} from '#preact';
-
-/** @type {PreactDef.Context} */
-let context;
-
-/**
- * The external context given to React components to control whether they can
- * render/play/etc.
- *
- * - renderable: whether this vDOM area is renderable. Analogous to
- *   `display-locking` CSS.
- * - playable: whether the playback is allowed in this vDOM area. If playback
- *   is not allow, the component must immediately stop the playback.
- *
- * @return {!PreactDef.Context<AmpContextDef.ContextType>}
- */
-function getAmpContext() {
-  return (
-    context ||
-    (context = createContext({
-      renderable: true,
-      playable: true,
-      loading: Loading.AUTO,
-    }))
-  );
-}
-
-/**
- * A wrapper-component that recalculates and propagates AmpContext properties.
- *
- * @param {!AmpContextDef.ProviderProps} props
- * @return {!PreactDef.VNode}
- */
-export function WithAmpContext({
-  children,
-  loading: loadingProp = 'auto',
-  notify: notifyProp,
-  playable: playableProp = true,
-  renderable: renderableProp = true,
-}) {
-  const parent = useAmpContext();
-  const renderable = renderableProp && parent.renderable;
-  const playable = renderable && playableProp && parent.playable;
-  const loading = loadingReducer(
-    renderable ? Loading.AUTO : Loading.LAZY,
-    loadingReducer(loadingProp, parent.loading)
-  );
-  const notify = notifyProp || parent.notify;
-  const current = useMemo(
-    () =>
-      /** @type {!AmpContextDef.ContextType} */ ({
-        renderable,
-        playable,
-        loading,
-        notify,
-      }),
-    [renderable, playable, loading, notify]
-  );
-  const AmpContext = getAmpContext();
-  return <AmpContext.Provider children={children} value={current} />;
-}
-
-/**
- * @return {!AmpContextDef.ContextType}
- */
-export function useAmpContext() {
-  const AmpContext = getAmpContext();
-  return useContext(AmpContext);
-}
-
-/**
- * Whether the calling component should currently be in the loaded state.
- *
- * @param {!Loading|string} loadingProp
- * @return {boolean}
- */
-export function useLoading(loadingProp) {
-  const {loading: loadingContext} = useAmpContext();
-  return loadingReducer(loadingProp, loadingContext);
-}
diff --git a/src/preact/context.tsx b/src/preact/context.tsx
new file mode 100644
index 000000000000..04af64e4550c
--- /dev/null
+++ b/src/preact/context.tsx
@@ -0,0 +1,91 @@
+import type {ComponentChildren, Context, VNode} from 'preact';
+
+import {
+  Loading_Enum,
+  reducer as loadingReducer,
+} from '#core/constants/loading-instructions';
+
+import * as Preact from '#preact';
+import {createContext, useContext, useMemo} from '#preact';
+
+export interface AmpContext {
+  renderable: boolean;
+  playable: boolean;
+  loading: Loading_Enum;
+  notify?: () => {};
+}
+
+export interface ProviderProps {
+  renderable?: boolean;
+  playable?: boolean;
+  loading?: string;
+  notify?: () => {};
+  children?: ComponentChildren;
+}
+
+let context: Context<AmpContext>;
+
+/**
+ * The external context given to React components to control whether they can
+ * render/play/etc.
+ *
+ * - renderable: whether this vDOM area is renderable. Analogous to
+ *   `display-locking` CSS.
+ * - playable: whether the playback is allowed in this vDOM area. If playback
+ *   is not allow, the component must immediately stop the playback.
+ */
+function getAmpContext(): Context<AmpContext> {
+  return (
+    context ||
+    (context = createContext({
+      renderable: true,
+      playable: true,
+      loading: Loading_Enum.AUTO,
+    }))
+  );
+}
+
+/**
+ * A wrapper-component that recalculates and propagates AmpContext properties.
+ */
+export function WithAmpContext({
+  children,
+  loading: loadingProp = 'auto',
+  notify: notifyProp,
+  playable: playableProp = true,
+  renderable: renderableProp = true,
+}: ProviderProps): VNode {
+  const parent = useAmpContext();
+  const renderable = renderableProp && parent.renderable;
+  const playable = renderable && playableProp && parent.playable;
+  const loading = loadingReducer(
+    renderable ? Loading_Enum.AUTO : Loading_Enum.LAZY,
+    loadingReducer(loadingProp, parent.loading)
+  );
+  const notify = notifyProp || parent.notify;
+  const current = useMemo(
+    () =>
+      ({
+        renderable,
+        playable,
+        loading,
+        notify,
+      }) as AmpContext,
+    [renderable, playable, loading, notify]
+  );
+  const AmpContext = getAmpContext();
+  return <AmpContext.Provider children={children} value={current} />;
+}
+
+export function useAmpContext(): AmpContext {
+  const AmpContext = getAmpContext();
+  return useContext(AmpContext);
+}
+
+/**
+ * Whether the calling component should currently be in the loaded state.
+ */
+export function useLoading(loadingProp?: Loading_Enum | string): Loading_Enum {
+  const {loading: loadingContext} = useAmpContext();
+  return loadingReducer(loadingProp, loadingContext);
+}
diff --git a/src/preact/context.type.js b/src/preact/context.type.js
deleted file mode 100644
index f16d8c3abab2..000000000000
--- a/src/preact/context.type.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/** @externs */
-
-/** @const */
-var AmpContextDef = {};
-
-/**
- * @typedef {{
- *   renderable: boolean,
- *   playable: boolean,
- *   loading: string,
- *   notify: (function()|undefined),
- * }}
- */
-AmpContextDef.ContextType;
-
-/**
- * @typedef {{
- *   renderable: (boolean|undefined),
- *   playable: (boolean|undefined),
- *   loading: (string|undefined),
- *   notify: (function()|undefined),
- *   children: (?PreactDef.Renderable|undefined),
- * }}
- */
-AmpContextDef.ProviderProps;
diff --git a/src/preact/contextprops.js b/src/preact/contextprops.js
index 97ec144b92b8..5a515c4e6efc 100644
--- a/src/preact/contextprops.js
+++ b/src/preact/contextprops.js
@@ -1,9 +1,8 @@
 import {
-  Loading,
+  Loading_Enum,
   reducer as loadingReducer,
 } from '#core/constants/loading-instructions';
 import {contextProp} from '#core/context/prop';
-import {ContextPropDef} from '#core/context/prop.type';
 
 /**
  * Defines whether a DOM subtree can be currently seen by the user. A subtree
@@ -13,10 +12,11 @@ import {ContextPropDef} from '#core/context/prop.type';
  *
  * Default is `true`.
  *
- * @const {!ContextPropDef<boolean>}
+ * @type {import('#core/context/prop').IContextProp<boolean, boolean>}
+ * @const
  */
 const CanRender = contextProp('CanRender', {
-  defaultValue: true,
+  defaultValue: /** @type {boolean} */ (true),
   recursive: (inputs) => inputs.reduce(andReducer),
   compute: (contextNode, inputs, parentValue) =>
     (parentValue && inputs.reduce(andReducer, true)) || false,
@@ -30,10 +30,11 @@ const CanRender = contextProp('CanRender', {
  *
  * Default is `true`.
  *
- * @const {!ContextPropDef<boolean, boolean>}
+ * @type {import('#core/context/prop').IContextProp<boolean, boolean>}
+ * @const
  */
 const CanPlay = contextProp('CanPlay', {
-  defaultValue: true,
+  defaultValue: /** @type {boolean} */ (true),
   recursive: (inputs) => inputs.reduce(andReducer),
   deps: [CanRender],
   compute: (contextNode, inputs, parentValue, canRender) =>
@@ -41,24 +42,25 @@ const CanPlay = contextProp('CanPlay', {
 });
 
 /**
- * The default `Loading` instruction for a subtree. See `Loading` for the set
+ * The default `Loading_Enum` instruction for a subtree. See `Loading_Enum` for the set
  * of possible values. Non-renderable subtrees automatically get a value of
  * "lazy".
  *
  * Default is "auto".
  *
- * @const {!ContextPropDef<!Loading, boolean>}
+ * @type {import('#core/context/prop').IContextProp<Loading_Enum, boolean>}
+ * @const
  */
 const LoadingProp = contextProp('Loading', {
-  defaultValue: Loading.AUTO,
+  defaultValue: /** @type {Loading_Enum} */ (Loading_Enum.AUTO),
   recursive: true,
   deps: [CanRender],
   compute: (contextNode, inputs, parentValue, canRender) =>
     loadingReducer(
-      canRender ? Loading.AUTO : Loading.LAZY,
+      canRender ? Loading_Enum.AUTO : Loading_Enum.LAZY,
       loadingReducer(
-        parentValue || Loading.AUTO,
-        inputs.reduce(loadingReducer, Loading.AUTO)
+        parentValue || Loading_Enum.AUTO,
+        inputs.reduce(loadingReducer, Loading_Enum.AUTO)
       )
     ),
 });
diff --git a/src/preact/globals.d.ts b/src/preact/globals.d.ts
new file mode 100644
index 000000000000..36a7c0954c45
--- /dev/null
+++ b/src/preact/globals.d.ts
@@ -0,0 +1,7 @@
+export {};
+
+declare global {
+  interface Node {
+    __AMP_RENDERED?: boolean;
+  }
+}
diff --git a/src/preact/hooks/useClickOutside.tsx b/src/preact/hooks/useClickOutside.tsx
new file mode 100644
index 000000000000..738538ab863f
--- /dev/null
+++ b/src/preact/hooks/useClickOutside.tsx
@@ -0,0 +1,57 @@
+import type {RefObject} from 'preact';
+
+import {useEffect} from '#preact';
+import useEvent from '#preact/hooks/useEvent';
+
+/**
+ * Triggers the callback if a click occurs outside the element.
+ * Works with any combination of Light DOM and Shadow DOM.
+ */
+export function useClickOutside(
+  elementRef: RefObject<HTMLElement>,
+  callback: (ev: MouseEvent) => void
+) {
+  const cb = useEvent(callback);
+
+  useEffect(() => {
+    if (!elementRef.current) {
+      return;
+    }
+
+    const handler = (ev: MouseEvent) => {
+      const element = elementRef.current;
+      if (element && !shadowContains(element, ev.target as Element)) {
+        cb(ev);
+      }
+    };
+    const document = elementRef.current.ownerDocument;
+    document.addEventListener('click', handler, {capture: true});
+    return () => {
+      document.removeEventListener('click', handler, {capture: true});
+    };
+  }, [elementRef, cb]);
+}
+
+/**
+ * Same as Element.contains, except it traverses shadow DOM too.
+ * @param element - The element that might contain the target
+ * @param target - The element that might be contained
+ */
+function shadowContains(element: HTMLElement, target: Element | null) {
+  let parent: Node | null = target;
+  while (parent) {
+    if (parent === element) {
+      return true;
+    }
+
+    // Traverse "into" the shadowDOM, if possible:
+    parent = (parent as Element).assignedSlot || parent.parentNode;
+
+    // Traverse "out" of the shadowDOM:
+    if (parent instanceof ShadowRoot) {
+      parent = parent.host;
+    }
+  }
+
+  return false;
+}
diff --git a/src/preact/hooks/useDeepValue.ts b/src/preact/hooks/useDeepValue.ts
new file mode 100644
index 000000000000..490cc9dc3607
--- /dev/null
+++ b/src/preact/hooks/useDeepValue.ts
@@ -0,0 +1,24 @@
+import {objectsEqualDeep} from '#core/types/object';
+
+import {useRef} from '#preact';
+
+export type Comparer<T> = (a: T, b: T) => boolean;
+
+/**
+ * Deep-compares the value against the previous value.
+ * If they're the same, the previous value is returned.
+ * Especially useful for dependency arrays.
+ *
+ * @param value - Any object, array, or value, which will be deep-compared
+ * @param [compare] - Should return `true` if the values are the same
+ */
+export function useDeepValue<TObj>(
+  value: TObj,
+  compare: Comparer<TObj> = objectsEqualDeep
+): TObj {
+  const previousValue = useRef(value);
+  if (!compare(previousValue.current, value)) {
+    previousValue.current = value;
+  }
+  return previousValue.current;
+}
diff --git a/src/preact/hooks/useEvent.ts b/src/preact/hooks/useEvent.ts
new file mode 100644
index 000000000000..c39e89efe3c5
--- /dev/null
+++ b/src/preact/hooks/useEvent.ts
@@ -0,0 +1,44 @@
+// Copied from react-use-event-hook
+import {useLayoutEffect, useRef} from '#preact';
+
+type AnyFunction = (...args: any[]) => any;
+
+/**
+ * Similar to useCallback, with a few subtle differences:
+ * - The returned function is a stable reference, and will always be the same between renders
+ * - No dependency lists required
+ * - Properties or state accessed within the callback will always be "current"
+ */
+export function useEvent<TCallback extends AnyFunction>(
+  callback: TCallback
+): TCallback {
+  // Keep track of the latest callback:
+  const latestRef = useRef<TCallback>(
+    useEventResultShouldNotBeCalledDuringRender as TCallback
+  );
+  useLayoutEffect(() => {
+    latestRef.current = callback;
+  }, [callback]);
+
+  // Create a stable callback that always calls the latest callback:
+  const stableRef = useRef<TCallback>(null as any);
+  if (!stableRef.current) {
+    stableRef.current = function (this: any) {
+      return latestRef.current.apply(this, arguments as any);
+    } as TCallback;
+  }
+
+  return stableRef.current;
+}
+
+/**
+ * Render methods should be pure, especially when concurrency is used,
+ * so we will throw this error if the callback is called while rendering.
+ */
+function useEventResultShouldNotBeCalledDuringRender() {
+  throw new Error(
+    'The callback from useEvent cannot be called while rendering; it should be wrapped in `useEffect` or `useLayoutEffect`.'
+  );
+}
+
+export default useEvent;
diff --git a/src/preact/hooks/useInfiniteQuery.ts b/src/preact/hooks/useInfiniteQuery.ts
new file mode 100644
index 000000000000..4d6ee494c314
--- /dev/null
+++ b/src/preact/hooks/useInfiniteQuery.ts
@@ -0,0 +1,119 @@
+import {useCallback, useRef} from '#preact';
+import {useValueRef} from '#preact/component';
+
+import {useStateSafe} from './useStateSafe';
+
+const initialState = {
+  loading: false,
+  error: null,
+  pages: [],
+  hasMore: true,
+};
+
+export type InfiniteQueryConfig<TPage, TPageParam> = {
+  // Fetches a page of data.  The pageParam is not provided for the first page.
+  fetchPage(pageInfo: {pageParam?: TPageParam}): Promise<TPage>;
+  // Get the pageParam for fetching the next page.  If returns falsy, then "hasMore' will be false.
+  getNextPageParam(page: TPage): TPageParam;
+};
+
+export type InfiniteQueryState<TPage> = {
+  // An array of all pages of data
+  pages: TPage[];
+  // true if there is more data that can be loaded
+  hasMore: boolean;
+  // true if data is loading
+  loading: boolean;
+  // Holds any request errors.  Clears if 'loadMore' or 'reset' is called.
+  error: Error | null;
+};
+
+export type InfiniteQueryResponse<TPage> = InfiniteQueryState<TPage> & {
+  // A method to load more data.  If already loading, ignored.
+  loadMore(): Promise<void>;
+  // Resets all data and loads the first page.  Old data remains available while loading.
+  reset(): Promise<void>;
+};
+
+/**
+ * Loads multiple pages of data.
+ * The async `fetchPage` method determines how a page is fetched.
+ * The `getNextPageParam` method determines if there is a next page.  The result is passed to `fetchPage`.
+ *
+ * @example
+ * const query = useInfiniteQuery({
+ *   async fetchPage({ pageParam: cursor = '' }) {
+ *     return window.fetch(`https://example.com/items?cursor=${cursor}`).then(res => res.json());
+ *   },
+ *   getNextPageParam(pageData) {
+ *     return pageData.nextCursor;
+ *   }
+ * });
+ */
+export function useInfiniteQuery<TPage, TPageParam>({
+  fetchPage,
+  getNextPageParam,
+}: InfiniteQueryConfig<TPage, TPageParam>): InfiniteQueryResponse<TPage> {
+  const [state, setState] =
+    useStateSafe<InfiniteQueryState<TPage>>(initialState);
+
+  // Use a ref to keep these current:
+  const ref = useValueRef({fetchPage, getNextPageParam, state});
+
+  // Used for ignoring outdated requests:
+  const fetchIndexRef = useRef(0);
+
+  // Loads the next page of data
+  const loadMore = useCallback(
+    async (resetting = false) => {
+      const {fetchPage, getNextPageParam, state} = ref.current;
+
+      if (!resetting && state.loading) {
+        return;
+      }
+
+      const fetchIndex = ++fetchIndexRef.current;
+
+      setState((s) => ({...s, loading: true}));
+
+      const pages: TPage[] = resetting ? [] : state.pages;
+      const lastPage = pages.length ? pages[pages.length - 1] : undefined;
+
+      try {
+        const newPage = await fetchPage({
+          pageParam: lastPage ? getNextPageParam(lastPage) : undefined,
+        });
+
+        if (fetchIndex !== fetchIndexRef.current) {
+          // A new request has been started; cancel this one:
+          return;
+        }
+
+        const nextPageParam = getNextPageParam(newPage);
+
+        setState({
+          loading: false,
+          error: null,
+          pages: [...pages, newPage],
+          hasMore: nextPageParam !== undefined && nextPageParam !== null,
+        });
+      } catch (error) {
+        if (fetchIndex !== fetchIndexRef.current) {
+          // A new request has been started; cancel this one:
+          return;
+        }
+
+        setState((s) => ({...s, loading: false, error}));
+      }
+    },
+    [ref, setState]
+  );
+
+  const reset = useCallback(() => loadMore(true), [loadMore]);
+
+  return {
+    ...state,
+    loadMore,
+    reset,
+  };
+}
diff --git a/src/preact/hooks/useLocalStorage.ts b/src/preact/hooks/useLocalStorage.ts
new file mode 100644
index 000000000000..9965d566f700
--- /dev/null
+++ b/src/preact/hooks/useLocalStorage.ts
@@ -0,0 +1,38 @@
+import {useCallback, useState} from '#preact';
+import {logger} from '#preact/logger';
+
+export function useLocalStorage<T>(
+  key: string,
+  defaultValue: T
+): readonly [T, (newValue: T) => void] {
+  // Keep track of the state locally:
+  const [value, setValue] = useState(() => {
+    try {
+      const json = self.localStorage?.getItem(key);
+      return json ? JSON.parse(json) : defaultValue;
+    } catch (err) {
+      // warning: could not read from local storage
+      return defaultValue;
+    }
+  });
+
+  const storeValue = useCallback(
+    (newValue: T) => {
+      try {
+        const json = JSON.stringify(newValue);
+        self.localStorage?.setItem(key, json);
+      } catch (err) {
+        logger.warn(
+          'useLocalStorage',
+          'Could not write value to local storage',
+          key,
+          err
+        );
+      }
+      setValue(newValue);
+    },
+    [key]
+  );
+
+  return [value, storeValue] as const;
+}
diff --git a/src/preact/hooks/useMutationObserver.tsx b/src/preact/hooks/useMutationObserver.tsx
new file mode 100644
index 000000000000..1b6b530ffa1a
--- /dev/null
+++ b/src/preact/hooks/useMutationObserver.tsx
@@ -0,0 +1,49 @@
+import {useEffect, useMemo} from '#preact';
+import {useDeepValue} from '#preact/hooks/useDeepValue';
+import useEvent from '#preact/hooks/useEvent';
+import {RefObject} from '#preact/types';
+
+/**
+ * Subscribes to an element's DOM mutations
+ */
+export function useMutationObserver(
+  elementRef: RefObject<HTMLElement>,
+  config: MutationObserverInit,
+  onMutation: (record: MutationRecord) => void
+) {
+  const configValues = useDeepValue(config);
+
+  const onMutationHandler = useEvent(onMutation);
+  useEffect(() => {
+    if (elementRef.current) {
+      const mo = new MutationObserver((records) => {
+        records.forEach((record) => {
+          onMutationHandler(record);
+        });
+      });
+      mo.observe(elementRef.current, configValues);
+      return () => mo.disconnect();
+    }
+  }, [configValues, /** These are stable: */ elementRef, onMutationHandler]);
+}
+
+/**
+ * Watches a DOM element's attribute for changes
+ */
+export function useAttributeObserver(
+  elementRef: RefObject<HTMLElement>,
+  attributeName: string,
+  onChange: (value: string | null) => void
+) {
+  const config = useMemo<MutationObserverInit>(
+    () => ({
+      attributes: true,
+      attributeFilter: [attributeName],
+    }),
+    [attributeName]
+  );
+  return useMutationObserver(elementRef, config, () => {
+    const newValue = elementRef.current!.getAttribute(attributeName);
+    onChange(newValue);
+  });
+}
diff --git a/src/preact/hooks/useQuery.ts b/src/preact/hooks/useQuery.ts
new file mode 100644
index 000000000000..44283063f214
--- /dev/null
+++ b/src/preact/hooks/useQuery.ts
@@ -0,0 +1,118 @@
+import {useCallback, useEffect} from '#preact';
+import {useValueRef} from '#preact/component';
+
+import {useStateSafe} from './useStateSafe';
+
+const noop = () => {};
+
+type SuccessState<TData> = {
+  loading: false;
+  data: TData;
+  error: null;
+};
+
+type ErrorState = {
+  loading: false;
+  data: null;
+  error: Error;
+};
+
+type LoadingState<TData> = {
+  loading: true;
+  data: TData | null;
+  error: null;
+};
+
+type InitialState<TData> = {
+  loading: false;
+  data: TData;
+  error: null;
+};
+
+export type QueryState<TData = unknown> =
+  | SuccessState<TData>
+  | ErrorState
+  | LoadingState<TData>
+  | InitialState<TData>;
+
+export type QueryConfig<TData = unknown> = {
+  initialData: TData;
+  enabled?: boolean;
+  onSettled?: (data: TData | null, error: Error | null) => void;
+  onError?: (error: Error) => void;
+  onSuccess?: (data: TData) => void;
+};
+
+const DEFAULT_STATE_VALUES = {
+  loading: false,
+  error: null,
+};
+
+/**
+ * Loads data asynchronously.
+ * If `enabled` is true (default), then the `fetch` method is called
+ * when the component is mounted.
+ * Note: This API mimics react-query, but does not include any caching.
+ *
+ * @example
+ * const {data, error, loading} = useQuery(
+ *  () => fetchJson('https://example.com/items').then(data => data.items),
+ *  {
+ *   enabled: shouldFetchItems,
+ *   initialData: [],
+ *   onSettled: () => setShouldFetchItems(false)
+ *  }
+ * )
+ */
+export function useQuery<TData>(
+  queryFn: () => Promise<TData>,
+  {
+    enabled,
+    initialData,
+    onError = noop,
+    onSettled = noop,
+    onSuccess = noop,
+  }: QueryConfig<TData>
+) {
+  const [state, setState] = useStateSafe<QueryState<TData>>({
+    ...DEFAULT_STATE_VALUES,
+    data: initialData,
+  });
+
+  // This ref ensures that the fetch function is not called more than once with the same props.
+  const ref = useValueRef({
+    initialData,
+    onSettled,
+    onError,
+    onSuccess,
+    state,
+    queryFn,
+  });
+
+  const fetchQueryData = useCallback(() => {
+    const {onError, onSettled, onSuccess, queryFn, state} = ref.current!;
+    setState((s) => ({...s, error: null, loading: true}));
+    // This function intentionally does not use async/await in order to avoid
+    // issues with regenerator-runtime in bento components.
+    queryFn().then(
+      (data) => {
+        setState((s) => ({...s, error: null, loading: false, data}));
+        onSuccess(data);
+        onSettled(state.data, state.error);
+      },
+      (error) => {
+        setState((s) => ({...s, data: null, loading: false, error}));
+        onError(error);
+        onSettled(state.data, state.error);
+      }
+    );
+  }, [ref, setState]);
+
+  useEffect(() => {
+    if (enabled) {
+      fetchQueryData();
+    }
+  }, [enabled, fetchQueryData]);
+
+  return {...state, refetch: fetchQueryData};
+}
diff --git a/src/preact/hooks/useResizeObserver.ts b/src/preact/hooks/useResizeObserver.ts
new file mode 100644
index 000000000000..b96f9762f440
--- /dev/null
+++ b/src/preact/hooks/useResizeObserver.ts
@@ -0,0 +1,29 @@
+import type {RefObject} from 'preact';
+
+import {useEffect} from '#preact';
+import {useValueRef} from '#preact/component';
+
+/**
+ * Callback is called on initial render,
+ * and again whenever the element's size changes.
+ */
+export function useResizeObserver(
+  elementRef: RefObject<HTMLElement>,
+  callback: (entry: ResizeObserverEntry) => void
+) {
+  const callbackRef = useValueRef(callback);
+  useEffect(() => {
+    const el = elementRef.current;
+    if (!el) {
+      return;
+    }
+    const ro = new ResizeObserver((entries) => {
+      callbackRef.current(entries[0]);
+    });
+    ro.observe(el);
+    return () => {
+      ro.unobserve(el);
+      ro.disconnect();
+    };
+  }, [elementRef, callbackRef]);
+}
diff --git a/src/preact/hooks/useStateSafe.ts b/src/preact/hooks/useStateSafe.ts
new file mode 100644
index 000000000000..c3b5a75ab69f
--- /dev/null
+++ b/src/preact/hooks/useStateSafe.ts
@@ -0,0 +1,34 @@
+import type {StateUpdater} from 'preact/compat';
+
+import {useCallback, useEffect, useRef, useState} from '#preact';
+
+/**
+ * Same as useState, but ignores setState once the component is unmounted.
+ *
+ * This avoids React's "Can't perform a React state update on an unmounted component" console error
+ */
+export function useStateSafe<S>(
+  initialState: S | (() => S)
+): readonly [S, StateUpdater<S>] {
+  const isMounted = useRef(false);
+  useEffect(() => {
+    isMounted.current = true;
+
+    return () => {
+      isMounted.current = false;
+    };
+  }, []);
+
+  const [state, setState] = useState(initialState);
+  const setStateSafe = useCallback<StateUpdater<S>>(
+    (newState) => {
+      if (!isMounted.current) {
+        return;
+      }
+      setState(newState);
+    },
+    [setState]
+  );
+
+  return [state, setStateSafe] as const;
+}
diff --git a/src/preact/index.js b/src/preact/index.js
index 20ca38f64641..811c367b251f 100644
--- a/src/preact/index.js
+++ b/src/preact/index.js
@@ -1,147 +1,39 @@
-import * as preact from /*OK*/ 'preact';
-// The preactDOM name is explicit, so we can remap to react-dom.
-import * as preactDOM from /*OK*/ 'preact/dom';
-import * as hooks from /*OK*/ 'preact/hooks';
-
-// Defines the type interfaces for the approved Preact APIs.
-// TODO: isValidElement, Component
-
-/**
- * @param {!PreactDef.FunctionalComponent|string} unusedType
- * @param {?Object=} unusedProps
- * @param {...*} var_args
- * @return {!PreactDef.VNode}
- */
-export function createElement(unusedType, unusedProps, var_args) {
-  return preact.createElement.apply(undefined, arguments);
-}
-
-/**
- * @param {!PreactDef.VNode} unusedElement
- * @param {?Object=} unusedProps
- * @param {...PreactDef.Renderable} unusedChildren
- * @return {!PreactDef.VNode}
- */
-export function cloneElement(unusedElement, unusedProps, unusedChildren) {
-  return preact.cloneElement.apply(undefined, arguments);
-}
-
-/**
- * @param {?PreactDef.VNode} vnode
- * @param {Node} container
- * @param {?Node=} opt_replaceNode
- */
-export function render(vnode, container, opt_replaceNode) {
-  preactDOM.render(vnode, container, opt_replaceNode);
-}
-
-/**
- * @param {!PreactDef.VNode} vnode
- * @param {Node} container
- */
-export function hydrate(vnode, container) {
-  preactDOM.hydrate(vnode, container);
-}
-
 /**
- * @param {?Object=} props
- * @return {PreactDef.Renderable}
+ * Papers over the little differences in API surface between React and Preact.
+ * In particular:
+ *  - Fragment behaves differently.
+ *  - React provides hydrate/render from a separate package, ReactDOM.
+ *
+ * @fileoverview
+ */
+
+// Importing directly from preact/dom is a hack to allow us to mimic the structure of react.
+export {hydrate, render} from 'preact/dom';
+
+export {
+  createElement,
+  cloneElement,
+  createRef,
+  createContext,
+  isValidElement,
+} from 'preact';
+
+export {
+  useState,
+  useRef,
+  useEffect,
+  useLayoutEffect,
+  useContext,
+  useMemo,
+  useCallback,
+  useImperativeHandle,
+  useReducer,
+} from 'preact/hooks';
+
+/**
+ * @param {*} props
+ * @return {import('preact').ComponentChildren}
  */
 export function Fragment(props) {
   return props.children;
 }
-
-/**
- * @return {{current: ?T}}
- * @template T
- */
-export function createRef() {
-  return preact.createRef();
-}
-
-/**
- * @param {T} value
- * @return {!PreactDef.Context<T>}
- * @template T
- */
-export function createContext(value) {
-  // TODO(preactjs/preact#2736): Remove once Preact's API is fixed.
-  return preact.createContext(value, undefined);
-}
-
-// Defines the type interfaces for the approved Preact Hooks APIs.
-// TODO: useReducer, useDebugValue, useErrorBoundary
-
-/**
- * @param {S|function():S} initial
- * @return {{0: S, 1: function((S|function(S):S)):undefined}}
- * @template S
- */
-export function useState(initial) {
-  return hooks.useState(initial);
-}
-
-/**
- * @param {?T} initial
- * @return {{current: ?T}}
- * @template T
- */
-export function useRef(initial) {
-  return hooks.useRef(initial);
-}
-
-/**
- * @param {function():(function():undefined|undefined)} effect
- * @param {!Array<*>=} opt_deps
- */
-export function useEffect(effect, opt_deps) {
-  hooks.useEffect(effect, opt_deps);
-}
-
-/**
- * @param {function():(function():undefined|undefined)} effect
- * @param {!Array<*>=} opt_deps
- */
-export function useLayoutEffect(effect, opt_deps) {
-  hooks.useLayoutEffect(effect, opt_deps);
-}
-
-/**
- * @param {PreactDef.Context<T>} context
- * @return {T}
- * @template T
- */
-export function useContext(context) {
-  return hooks.useContext(context);
-}
-
-/**
- * @param {function():T} cb
- * @param {!Array<*>=} opt_deps
- * @return {T}
- * @template T
- */
-export function useMemo(cb, opt_deps) {
-  return hooks.useMemo(cb, opt_deps);
-}
-
-/**
- * @param {T} cb
- * @param {!Array<*>=} opt_deps
- * @return {T}
- * @template T
- */
-export function useCallback(cb, opt_deps) {
-  return hooks.useCallback(cb, opt_deps);
-}
-
-/**
- * @param {{current: ?T}} ref
- * @param {function():T} create
- * @param {!Array<*>=} opt_deps
- * @return {undefined}
- * @template T
- */
-export function useImperativeHandle(ref, create, opt_deps) {
-  return hooks.useImperativeHandle(ref, create, opt_deps);
-}
diff --git a/src/preact/logger.js b/src/preact/logger.js
new file mode 100644
index 000000000000..56eece2fbac7
--- /dev/null
+++ b/src/preact/logger.js
@@ -0,0 +1,8 @@
+/**
+ * Use logger for intentionally logging messages in production code.
+ */
+export const logger = {
+  info: console.info,
+  warn: console.warn,
+  error: console.error,
+};
diff --git a/src/preact/parse-props.js b/src/preact/parse-props.js
index e01bcadbed74..fb16d5468f54 100644
--- a/src/preact/parse-props.js
+++ b/src/preact/parse-props.js
@@ -1,8 +1,8 @@
 import {devAssert} from '#core/assert';
-import {Loading} from '#core/constants/loading-instructions';
+import {Loading_Enum} from '#core/constants/loading-instructions';
 import {sequentialIdGenerator} from '#core/data-structures/id-generator';
 import {parseBooleanAttribute} from '#core/dom';
-import {matches, realChildNodes} from '#core/dom/query';
+import {matches, realChildElements, realChildNodes} from '#core/dom/query';
 import {getDate} from '#core/types/date';
 import {dashToCamelCase} from '#core/types/string';
 
@@ -10,14 +10,20 @@ import * as Preact from '#preact';
 
 import {Slot, createSlot} from './slot';
 
+/** @typedef {import('#core/dom/media-query-props').MediaQueryProps} MediaQueryProps */
+
+/** @typedef {{[key: string]: AmpElementProp}} AmpElementProps */
+
 /**
  * The following combinations are allowed.
  * - `attr`, (optionally) `type`, and (optionally) `media` can be specified when
  *   an attribute maps to a component prop 1:1.
+ * - `parseAttr` can be specified to parse the `attr` value before passing it
+ *   into the component.
  * - `attrs` and `parseAttrs` can be specified when multiple attributes map
  *   to a single prop.
- * - `attrPrefix` can be specified when multiple attributes with the same prefix
- *   map to a single prop object. The prefix cannot equal the attribute name.
+ * - `attrMatches` and `parseAttrs` can be specified when multiple attributes
+ *   map to a single prop.
  * - `selector` can be specified for children of a certain shape and structure
  *   according to ChildDef.
  * - `passthrough` can be specified to slot children using a single
@@ -29,34 +35,29 @@ import {Slot, createSlot} from './slot';
  *   behavior depending on whether or not there are children.
  *
  * @typedef {{
- *   attr: (string|undefined),
- *   type: (string|undefined),
- *   attrPrefix: (string|undefined),
- *   attrs: (!Array<string>|undefined),
- *   parseAttrs: ((function(!Element):*)|undefined),
- *   media: (boolean|undefined),
+ *   attr?: string,
+ *   type?: string,
+ *   attrMatches?: function(string):boolean,
+ *   attrs: string[],
+ *   parseAttr?: function(string):*,
+ *   parseAttrs?: function(Element):*,
+ *   passthrough: boolean,
+ *   passthroughNonEmpty: boolean,
+ *   media?: boolean,
  *   default: *,
- * }|string}
+ *   name?: string,
+ *   as?: boolean,
+ *   selector?: string,
+ *   single?: boolean,
+ *   clone?: boolean,
+ *   props?: JsonObject,
+ * }} AmpElementProp
  */
-export let AmpElementPropDef;
 
-/**
- * @typedef {{
- *   name: string,
- *   selector: string,
- *   single: (boolean|undefined),
- *   clone: (boolean|undefined),
- *   props: (!JsonObject|undefined),
- * }}
- */
-let ChildDef;
-
-/** @const {string} */
 const RENDERED_ATTR = 'i-amphtml-rendered';
 
 /**
  * The same as `applyFillContent`, but inside the shadow.
- * @const {!Object}
  */
 const SIZE_DEFINED_STYLE = {
   'position': 'absolute',
@@ -66,7 +67,6 @@ const SIZE_DEFINED_STYLE = {
   'height': '100%',
 };
 
-/** @const {string} */
 const FILL_CONTENT_CLASS = 'i-amphtml-fill-content';
 
 /**
@@ -79,52 +79,38 @@ const RENDERED_PROP = '__AMP_RENDERED';
 const childIdGenerator = sequentialIdGenerator();
 
 const ONE_OF_ERROR_MESSAGE =
-  'Only one of "attr", "attrs", "attrPrefix", "passthrough", ' +
-  '"passthroughNonEmpty", or "selector" must be given';
+  'Only one of "attr", "attrs", "attrMatches", "passthrough", "passthroughNonEmpty", or "selector" must be given';
 
 /**
- * @param {!Object<string, !AmpElementPropDef>} propDefs
- * @param {function(!AmpElementPropDef):boolean} cb
+ * @param {AmpElementProps} propDefs
+ * @param {function(AmpElementProp):boolean} cb
  * @return {boolean}
  */
-function checkPropsFor(propDefs, cb) {
+export function checkPropsFor(propDefs, cb) {
   return Object.values(propDefs).some(cb);
 }
 
 /**
- * @param {!AmpElementPropDef} def
+ * @param {AmpElementProp} def
  * @return {boolean}
  */
-const HAS_SELECTOR = (def) => typeof def === 'string' || !!def.selector;
+export const HAS_SELECTOR = (def) => typeof def === 'string' || !!def.selector;
 
 /**
  * @param {Node} node
  * @return {boolean}
  */
 const IS_EMPTY_TEXT_NODE = (node) =>
-  node.nodeType === /* TEXT_NODE */ 3 && node.nodeValue.trim().length === 0;
-
-/**
- * @param {null|string} attributeName
- * @param {string|undefined} attributePrefix
- * @return {boolean}
- */
-function matchesAttrPrefix(attributeName, attributePrefix) {
-  return (
-    attributeName !== null &&
-    attributePrefix !== undefined &&
-    attributeName.startsWith(attributePrefix) &&
-    attributeName !== attributePrefix
-  );
-}
+  node.nodeType === /* TEXT_NODE */ 3 && node.nodeValue?.trim().length === 0;
 
 /**
- * @param {typeof PreactBaseElement} Ctor
- * @param {!AmpElement} element
- * @param {{current: ?}} ref
- * @param {!JsonObject|null|undefined} defaultProps
+ * @param {typeof import('./base-element').PreactBaseElement} Ctor
+ * @param {AmpElement} element
+ * @param {import('preact').Ref<T>} ref
+ * @param {JsonObject|null|undefined} defaultProps
  * @param {?MediaQueryProps} mediaQueryProps
- * @return {!JsonObject}
+ * @return {JsonObject}
+ * @template T
  */
 export function collectProps(
   Ctor,
@@ -143,7 +129,7 @@ export function collectProps(
     mediaQueryProps.start();
   }
 
-  const props = /** @type {!JsonObject} */ ({...defaultProps, ref});
+  const props = /** @type {JsonObject} */ ({...defaultProps, ref});
 
   // Light DOM.
   if (lightDomTag) {
@@ -172,10 +158,10 @@ export function collectProps(
 }
 
 /**
- * @param {typeof PreactBaseElement} Ctor
- * @param {!Object} props
- * @param {!Object} propDefs
- * @param {!Element} element
+ * @param {typeof import('./base-element').PreactBaseElement} Ctor
+ * @param {JsonObject} props
+ * @param {AmpElementProps} propDefs
+ * @param {Element} element
  * @param {?MediaQueryProps} mediaQueryProps
  */
 function parsePropDefs(Ctor, props, propDefs, element, mediaQueryProps) {
@@ -185,9 +171,9 @@ function parsePropDefs(Ctor, props, propDefs, element, mediaQueryProps) {
     // as separate properties. Thus in a carousel the plain "children" are
     // slides, and the "arrowNext" children are passed via a "arrowNext"
     // property.
-    const nodes = realChildNodes(element);
-    for (let i = 0; i < nodes.length; i++) {
-      const childElement = nodes[i];
+    const elements = realChildElements(element);
+    for (let i = 0; i < elements.length; i++) {
+      const childElement = /** @type {HTMLElement} */ (elements[i]);
       const match = matchChild(childElement, propDefs);
       if (!match) {
         continue;
@@ -195,10 +181,10 @@ function parsePropDefs(Ctor, props, propDefs, element, mediaQueryProps) {
       const def = propDefs[match];
       const {
         as = false,
-        single,
-        name = match,
         clone,
+        name = match,
         props: slotProps = {},
+        single,
       } = def;
       devAssert(clone || Ctor['usesShadowDom']);
       const parsedSlotProps = {};
@@ -236,15 +222,16 @@ function parsePropDefs(Ctor, props, propDefs, element, mediaQueryProps) {
   }
 
   for (const name in propDefs) {
-    const def = /** @type {!AmpElementPropDef} */ (propDefs[name]);
+    const def = /** @type {AmpElementProp} */ (propDefs[name]);
     devAssert(
-      !!def.attr +
-        !!def.attrs +
-        !!def.attrPrefix +
-        !!def.selector +
-        !!def.passthrough +
-        !!def.passthroughNonEmpty <=
-        1,
+      [
+        def.attr,
+        def.attrs,
+        def.attrMatches,
+        def.selector,
+        def.passthrough,
+        def.passthroughNonEmpty,
+      ].filter(Boolean).length <= 1,
       ONE_OF_ERROR_MESSAGE
     );
     let value;
@@ -252,37 +239,28 @@ function parsePropDefs(Ctor, props, propDefs, element, mediaQueryProps) {
       devAssert(Ctor['usesShadowDom']);
       // Use lazy loading inside the passthrough by default due to too many
       // elements.
-      value = [<Slot loading={Loading.LAZY} />];
+      value = [<Slot loading={Loading_Enum.LAZY} />];
     } else if (def.passthroughNonEmpty) {
       devAssert(Ctor['usesShadowDom']);
       // Use lazy loading inside the passthrough by default due to too many
       // elements.
       value = realChildNodes(element).every(IS_EMPTY_TEXT_NODE)
         ? null
-        : [<Slot loading={Loading.LAZY} />];
+        : [<Slot loading={Loading_Enum.LAZY} />];
     } else if (def.attr) {
-      value = element.getAttribute(def.attr);
+      const attr = element.getAttribute(def.attr);
+      if (attr && def.parseAttr) {
+        value = def.parseAttr(attr);
+      } else {
+        value = attr;
+      }
       if (def.media && value != null) {
+        devAssert(mediaQueryProps);
         value = mediaQueryProps.resolveListQuery(String(value));
       }
     } else if (def.parseAttrs) {
-      devAssert(def.attrs);
+      devAssert(def.attrs || def.attrMatches);
       value = def.parseAttrs(element);
-    } else if (def.attrPrefix) {
-      const currObj = {};
-      let objContains = false;
-      const attrs = element.attributes;
-      for (let i = 0; i < attrs.length; i++) {
-        const attrib = attrs[i];
-        if (matchesAttrPrefix(attrib.name, def.attrPrefix)) {
-          currObj[dashToCamelCase(attrib.name.slice(def.attrPrefix.length))] =
-            attrib.value;
-          objContains = true;
-        }
-      }
-      if (objContains) {
-        value = currObj;
-      }
     }
     if (value == null) {
       if (def.default != null) {
@@ -293,10 +271,8 @@ function parsePropDefs(Ctor, props, propDefs, element, mediaQueryProps) {
         def.type == 'number'
           ? parseFloat(value)
           : def.type == 'boolean'
-          ? parseBooleanAttribute(/** @type {string} */ (value))
-          : def.type == 'date'
-          ? getDate(value)
-          : value;
+            ? parseBooleanAttribute(/** @type {string} */ (value))
+            : value;
       props[name] = v;
     }
   }
@@ -305,10 +281,11 @@ function parsePropDefs(Ctor, props, propDefs, element, mediaQueryProps) {
 /**
  * Copies an Element into a VNode representation.
  * (Interpretation into VNode is not recursive, so it excludes children.)
- * @param {!Element} element
- * @return {!PreactDef.Renderable}
+ * @param {Element} element
+ * @return {import('preact').VNode}
  */
 function createShallowVNodeCopy(element) {
+  /** @type {JsonObject} */
   const props = {
     // Setting `key` to an object is fine in Preact, but not React.
     'key': element,
@@ -325,18 +302,91 @@ function createShallowVNodeCopy(element) {
 }
 
 /**
- * @param {!Element} element
- * @param {!Object} defs
- * @return {?ChildDef}
+ * @param {HTMLElement} element
+ * @param {{[key: string]: AmpElementProp}} defs
+ * @return {string|null}
  */
 function matchChild(element, defs) {
   // TODO: a little slow to do this repeatedly.
   for (const match in defs) {
     const def = defs[match];
     const selector = typeof def == 'string' ? def : def.selector;
-    if (matches(element, selector)) {
+    if (selector && matches(element, selector)) {
       return match;
     }
   }
   return null;
 }
+
+/**
+ * @param {string} name
+ * @param {function(string): T} parse
+ * @return {{
+ *   attrs: Array<string>,
+ *   parseAttrs: function(Element):(T|''|null)
+ * }}
+ * @template T
+ */
+export function createParseAttr(name, parse) {
+  const attrs = [name];
+  /** @type {function(Element):T|''|null} */
+  const parseAttrs = (element) => {
+    const attr = element.getAttribute(name);
+    return attr && parse(attr);
+  };
+  return {
+    'attrs': attrs,
+    'parseAttrs': parseAttrs,
+  };
+}
+
+/**
+ * @param {string} name
+ * @return {ReturnType<typeof createParseAttr>}
+ */
+export function createParseDateAttr(name) {
+  return createParseAttr(name, getDate);
+}
+
+/**
+ * Maps multiple attributes with the same prefix to a single prop object.
+ * The prefix cannot equal the attribute name.
+ * @param {string} prefix
+ * @return {{
+ *   attrMatches: function(?string=):boolean,
+ *   parseAttrs: function(Element):(undefined|{[key: string]: string})
+ * }}
+ */
+export function createParseAttrsWithPrefix(prefix) {
+  /**
+   * @param {string} name
+   * @return {boolean}
+   */
+  const attrMatches = (name) => name?.startsWith(prefix) && name !== prefix;
+
+  /**
+   * @param {Element} element
+   * @return {JsonObject|undefined}
+   */
+  const parseAttrs = (element) => {
+    /** @type {JsonObject|undefined} */
+    let currObj = undefined;
+    const attrs = element.attributes;
+    for (let i = 0; i < attrs.length; i++) {
+      const attrib = attrs[i];
+      if (attrMatches(attrib.name)) {
+        if (!currObj) {
+          currObj = {};
+        }
+        currObj[dashToCamelCase(attrib.name.slice(prefix.length))] =
+          attrib.value;
+      }
+    }
+    return currObj;
+  };
+
+  return {
+    'attrMatches': attrMatches,
+    'parseAttrs': parseAttrs,
+  };
+}
diff --git a/src/preact/preact-dom.ts b/src/preact/preact-dom.ts
new file mode 100644
index 000000000000..1bdd1208fad6
--- /dev/null
+++ b/src/preact/preact-dom.ts
@@ -0,0 +1,8 @@
+/**
+ * Re-export the `render`/`hydrate` functions from 'preact' as 'preact/dom' (via
+ * ../../tsconfig.base.json) to make it more consistent with React. This makes
+ * remapping the imports for React builds simple (preact/dom --> react-dom).
+ *
+ * @fileoverview
+ */
+export {hydrate, render} from 'preact';
diff --git a/src/preact/slot.js b/src/preact/slot.js
index d2b7e4070077..67dc44b61e0f 100644
--- a/src/preact/slot.js
+++ b/src/preact/slot.js
@@ -1,5 +1,5 @@
 import {devAssert} from '#core/assert';
-import {Loading} from '#core/constants/loading-instructions';
+import {Loading_Enum} from '#core/constants/loading-instructions';
 import {rediscoverChildren, removeProp, setProp} from '#core/context';
 import {
   loadAll,
@@ -17,15 +17,18 @@ import {CanPlay, CanRender, LoadingProp} from './contextprops';
 
 const EMPTY = {};
 
-/** @const {WeakMap<Element, {oldDefauls: (!Object|undefined), component: Component}>} */
+/** @const {WeakMap<Element, {oldDefaults: (Object|undefined), component: Component}>} */
 const cache = new WeakMap();
 
+/** @typedef {import('preact').VNode} VNode */
+/** @typedef {import('preact').FunctionComponent} FunctionComponent */
+
 /**
- * @param {!Element} element
+ * @param {Element} element
  * @param {string} name
- * @param {!Object|undefined} defaultProps
- * @param {boolean|undefined} as
- * @return {!PreactDef.VNode|!PreactDef.FunctionalComponent}
+ * @param {Object=} defaultProps
+ * @param {boolean=} as
+ * @return {VNode|FunctionComponent}
  */
 export function createSlot(element, name, defaultProps, as = false) {
   element.setAttribute('slot', name);
@@ -39,8 +42,8 @@ export function createSlot(element, name, defaultProps, as = false) {
   }
 
   /**
-   * @param {!Object|undefined} props
-   * @return {!PreactDef.VNode}
+   * @param {Object=} props
+   * @return {VNode}
    */
   function SlotWithProps(props) {
     return <Slot {...(defaultProps || EMPTY)} name={name} {...props} />;
@@ -53,11 +56,11 @@ export function createSlot(element, name, defaultProps, as = false) {
 /**
  * Slot component.
  *
- * @param {!JsonObject} props
- * @return {!PreactDef.VNode}
+ * @param {JsonObject} props
+ * @return {VNode}
  */
 export function Slot(props) {
-  const ref = useRef(/** @type {?Element} */ (null));
+  const ref = useRef(/** @type {HTMLSlotElement|null} */ (null));
 
   useSlotContext(ref, props);
 
@@ -72,11 +75,11 @@ export function Slot(props) {
 }
 
 /**
- * @param {{current:?}} ref
- * @param {!JsonObject=} opt_props
+ * @param {{current: HTMLSlotElement?}} ref
+ * @param {JsonObject=} opt_props
  */
 export function useSlotContext(ref, opt_props) {
-  const {'loading': loading} = opt_props || EMPTY;
+  const loading = opt_props?.loading;
   const context = useAmpContext();
 
   // Context changes.
@@ -90,7 +93,7 @@ export function useSlotContext(ref, opt_props) {
       slot,
       LoadingProp,
       Slot,
-      /** @type {!./core/constants/loading-instructions.Loading} */ (
+      /** @type {import('#core/constants/loading-instructions').Loading_Enum} */ (
         context.loading
       )
     );
@@ -117,7 +120,7 @@ export function useSlotContext(ref, opt_props) {
 
     // Mount children, unless lazy loading requested. If so the element should
     // use `BaseElement.setAsContainer`.
-    if (loading != Loading.LAZY) {
+    if (loading != Loading_Enum.LAZY) {
       // TODO(#31915): switch to `mount`.
       execute(slot, loadAll, true);
     }
@@ -129,8 +132,8 @@ export function useSlotContext(ref, opt_props) {
 }
 
 /**
- * @param {!Element} slot
- * @param {function(!AmpElement):void|function(!Array<!AmpElement>):void} action
+ * @param {HTMLSlotElement} slot
+ * @param {function(Element|Element[]):void} action
  * @param {boolean} schedule
  */
 function execute(slot, action, schedule) {
diff --git a/src/preact/storybook/Context.js b/src/preact/storybook/Context.js
index d5499dfe8f31..e134fade9c33 100644
--- a/src/preact/storybook/Context.js
+++ b/src/preact/storybook/Context.js
@@ -1,35 +1,39 @@
-import {boolean, select, withKnobs} from '@storybook/addon-knobs';
+import {Loading_Enum} from '#core/constants/loading-instructions';
 
 import * as Preact from '#preact';
 import {WithAmpContext, useAmpContext, useLoading} from '#preact/context';
 
 export default {
   title: '0/Context',
-  decorators: [withKnobs],
 };
 
 const IMG_SRC =
   "data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24px' height='24px' viewBox='0 0 24 24' fill='%23000000'%3E%3Cpath d='M0 0h24v24H0z' fill='none'/%3E%3Cpath d='M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41z'/%3E%3C/svg%3E";
 
-const LOADING_OPTIONS = ['auto', 'lazy', 'eager', 'unload'];
-
-export const _default = () => {
-  const renderable = boolean('top renderable', true);
-  const playable = boolean('top playable', true);
-  const loading = select('top loading', LOADING_OPTIONS, LOADING_OPTIONS[0]);
+export const _default = ({...args}) => {
   return (
-    <WithAmpContext
-      renderable={renderable}
-      playable={playable}
-      loading={loading}
-    >
+    <WithAmpContext {...args}>
       <Composite />
     </WithAmpContext>
   );
 };
 
+_default.args = {
+  renderable: true,
+  playable: true,
+};
+
+_default.argTypes = {
+  loading: {
+    name: 'loading',
+    defaultValue: 'auto',
+    options: ['auto', 'lazy', 'eager', 'unload'],
+    control: {type: 'select'},
+  },
+};
+
 /**
- * @return {PreactDef.Renderable}
+ * @return {import('preact').VNode}
  */
 function Composite() {
   return (
@@ -47,12 +51,12 @@ function Composite() {
 }
 
 /**
- * @param {{title: string, loading: string}} props
- * @return {PreactDef.Renderable}
+ * @param {{title: string, loading?: string}} props
+ * @return {import('preact').VNode}
  */
 function Info({loading: loadingProp, title, ...rest}) {
   const {loading: loadingContext, playable, renderable} = useAmpContext();
-  const loading = useLoading(loadingProp);
+  const loading = useLoading(loadingProp ?? Loading_Enum.AUTO);
   const load = loading != 'unload';
   const infoStyle = {border: '1px dotted gray', margin: 8};
   const imgStyle = {
diff --git a/src/preact/storybook/Hooks.js b/src/preact/storybook/Hooks.js
index 7e11407b58a7..55ecdc4a600d 100644
--- a/src/preact/storybook/Hooks.js
+++ b/src/preact/storybook/Hooks.js
@@ -1,15 +1,20 @@
 import * as Preact from '#preact';
 import {useCallback, useState} from '#preact';
-import {useIntersectionObserver} from '#preact/component';
+import {useIntersectionObserver} from '#preact/component/intersection-observer';
 import {useMergeRefs} from '#preact/utils';
 
 export default {
   title: '0/Hooks',
 };
 
+/**
+ * @param {{prop: *}} param0
+ * @return {import('preact').VNode}
+ */
 function Component({prop}) {
   const [text, setText] = useState('initial render');
   const ioCallback = useCallback(
+    /** @param {{isIntersecting: boolean}} param0 */
     ({isIntersecting}) => {
       setText(`is intersecting for ${prop}: ${isIntersecting}`);
     },
@@ -17,6 +22,7 @@ function Component({prop}) {
   );
 
   const anotherIoCallback = useCallback(
+    /** @param {{isIntersecting: boolean}} param0 */
     ({isIntersecting}) => {
       // TODO(dmanek): Look into using Storybook actions instead of console.log below
       // eslint-disable-next-line local/no-forbidden-terms
diff --git a/src/preact/storybook/Wrappers.js b/src/preact/storybook/Wrappers.js
index 1bb9b5d627f4..8a788939424a 100644
--- a/src/preact/storybook/Wrappers.js
+++ b/src/preact/storybook/Wrappers.js
@@ -1,61 +1,76 @@
-import {boolean, object, text, withKnobs} from '@storybook/addon-knobs';
-
+// @ts-nocheck
 import * as Preact from '#preact';
 import {ContainWrapper, Wrapper} from '#preact/component';
 
 export default {
   title: '0/Wrappers',
-  decorators: [withKnobs],
 };
 
-export const wrapper = () => {
-  const asProp = text('As', 'span');
-  const className = text('className', '');
-  const style = object('style', {border: '1px solid'});
-  const wrapperClassName = text('wrapperClassName', '');
-  const wrapperStyle = object('wrapperStyle', {});
-  const ariaLabel = text('ariaLabel', 'aria label');
+export const wrapper = ({ariaLabel, asProp, className, ...args}) => {
   return (
-    <Wrapper
-      as={asProp}
-      class={className}
-      style={style}
-      wrapperClassName={wrapperClassName}
-      wrapperStyle={wrapperStyle}
-      aria-label={ariaLabel}
-    >
+    <Wrapper {...args} as={asProp} class={className} aria-label={ariaLabel}>
       content
     </Wrapper>
   );
 };
 
-export const containWrapper = () => {
-  const asProp = text('As', 'div');
-  const className = text('className', '');
-  const style = object('style', {border: '1px solid', width: 200, height: 50});
-  const wrapperClassName = text('wrapperClassName', '');
-  const wrapperStyle = object('wrapperStyle', {padding: 4});
-  const contentClassName = text('contentClassName', 'content');
-  const contentStyle = object('contentStyle', {border: '1px dotted'});
-  const size = boolean('size', true);
-  const layout = boolean('layout', true);
-  const paint = boolean('paint', true);
-  const ariaLabel = text('ariaLabel', 'aria label');
+wrapper.args = {
+  asProp: 'span',
+  ariaLabel: 'aria Label',
+  className: '',
+  wrapperClassName: '',
+};
+
+wrapper.argTypes = {
+  style: {
+    name: 'style',
+    defaultValue: {border: '1px solid'},
+    control: {type: 'object'},
+  },
+  wrapperStyle: {
+    name: 'wrapperStyle',
+    control: {type: 'object'},
+  },
+};
+
+export const containWrapper = ({ariaLabel, asProp, className, ...args}) => {
   return (
     <ContainWrapper
+      {...args}
       as={asProp}
       class={className}
-      style={style}
-      wrapperClassName={wrapperClassName}
-      wrapperStyle={wrapperStyle}
-      contentClassName={contentClassName}
-      contentStyle={contentStyle}
-      size={size}
-      layout={layout}
-      paint={paint}
       aria-label={ariaLabel}
     >
       content
     </ContainWrapper>
   );
 };
+
+containWrapper.args = {
+  asProp: 'div',
+  ariaLabel: 'aria Label',
+  className: '',
+  contentClassName: 'content',
+  wrapperClassName: '',
+  size: true,
+  layout: true,
+  paint: true,
+};
+
+containWrapper.argTypes = {
+  style: {
+    name: 'style',
+    defaultValue: {border: '1px solid', width: 200, height: 50},
+    control: {type: 'object'},
+  },
+  wrapperStyle: {
+    name: 'wrapperStyle',
+    defaultValue: {padding: 4},
+    control: {type: 'object'},
+  },
+  contentStyle: {
+    name: 'contentStyle',
+    defaultValue: {border: '1px dotted'},
+    control: {type: 'object'},
+  },
+};
diff --git a/src/preact/tsconfig.json b/src/preact/tsconfig.json
new file mode 100644
index 000000000000..cb5eba77ec88
--- /dev/null
+++ b/src/preact/tsconfig.json
@@ -0,0 +1,10 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "include": [
+    "**/*.js",
+    "**/*.jsx",
+    "**/*.d.ts",
+    "../core/**/globals.d.ts",
+    "../**/base-element.d.ts"
+  ]
+}
diff --git a/src/preact/types.ts b/src/preact/types.ts
new file mode 100644
index 000000000000..1c054b94cd39
--- /dev/null
+++ b/src/preact/types.ts
@@ -0,0 +1,26 @@
+import type {ComponentChildren, FunctionalComponent} from 'preact';
+import {JSXInternal} from 'preact/src/jsx';
+
+export type {
+  Component,
+  ComponentChildren,
+  ComponentChild,
+  ComponentProps,
+  ComponentType,
+  FunctionalComponent,
+  Ref,
+  RefObject,
+  RenderableProps,
+  VNode,
+} from 'preact';
+
+export type FC<P = {}> = FunctionalComponent<P>;
+
+export type EventHandler<E extends JSXInternal.TargetedEvent> =
+  JSXInternal.EventHandler<E>;
+export type HTMLAttributes<RefType extends EventTarget = EventTarget> =
+  JSXInternal.HTMLAttributes<RefType>;
+export type IntrinsicElements = JSXInternal.IntrinsicElements;
+export type PropsWithChildren<TProps = {}> = TProps & {
+  children?: ComponentChildren;
+};
diff --git a/src/preact/utils.js b/src/preact/utils.js
index 79391df2f224..1f28894c532e 100644
--- a/src/preact/utils.js
+++ b/src/preact/utils.js
@@ -16,8 +16,9 @@ export function useResourcesNotify() {
 }
 
 /**
- * @param {{current: ?}|function()} ref
- * @param {!Element} value
+ * @param {import('preact').Ref<T>} ref
+ * @param {T} value
+ * @template T
  */
 function setRef(ref, value) {
   if (typeof ref === 'function') {
@@ -29,11 +30,12 @@ function setRef(ref, value) {
 
 /**
  * Combines refs to pass into `ref` prop.
- * @param {!Array<*>} refs
- * @return {function(Element):function()}
+ * @param {import('preact').Ref<*>[]} refs
+ * @return {import('preact').Ref<*>}
  */
 export function useMergeRefs(refs) {
   return useCallback(
+    /** @param {Element} element */
     (element) => {
       for (let i = 0; i < refs.length; i++) {
         setRef(refs[i], element);
@@ -44,3 +46,33 @@ export function useMergeRefs(refs) {
     refs
   );
 }
+
+/**
+ * Required to use `props` whose name would be usually be mapped in
+ * Preact-to-React style.
+ * This passes through the value during development, because we render on Preact.
+ * It's an annotation so that we can convert these values when we transform the
+ * React build.
+ *
+ * @param {T} name
+ * @return {T}
+ * @template {string} T
+ */
+export function propName(name) {
+  return name;
+}
+
+/**
+ * Required to consume `tabindex` from props.
+ * We support taking both `tabIndex` and `tabindex` for backwards compatibility,
+ * so this takes either form.
+ * @param {{tabindex: string|number, tabIndex: string|number}} props
+ * @param {number=} fallback
+ * @return {string|number}
+ */
+export function tabindexFromProps(props, fallback = 0) {
+  // This tabindex property access is okay. Tabindex property access elsewhere
+  //  must use this function.
+  // eslint-disable-next-line local/preact-preferred-props
+  return props.tabindex ?? props.tabIndex ?? fallback;
+}
diff --git a/src/preact/utils/README.md b/src/preact/utils/README.md
new file mode 100644
index 000000000000..527205dcd715
--- /dev/null
+++ b/src/preact/utils/README.md
@@ -0,0 +1,37 @@
+# Bento Services
+
+Most of the AMP Classic components depend on the various services in the `src/service` folder.
+
+Bento components, however, cannot rely on those services.
+
+So this folder contains standalone versions of these services, designed to make it easier to convert Classic components
+to Bento components.
+
+For example:
+
+Using AMP Classic services:
+
+```js
+import {Services} from '#service';
+///...
+
+const platform = Services.platformFor(this.win);
+if (platform.isIos()) {
+  // do iOS stuff
+} else if (platform.isAndroid()) {
+  // do Android stuff
+}
+```
+
+Using Bento services:
+
+```js
+import {platformUtils} from '#preact/utils/platform';
+///...
+
+if (platformUtils.isIos()) {
+  // do iOS stuff
+} else if (platformUtils.isAndroid()) {
+  // do Android stuff
+}
+```
diff --git a/src/preact/utils/docInfo.js b/src/preact/utils/docInfo.js
new file mode 100644
index 000000000000..68e5ee54d5b5
--- /dev/null
+++ b/src/preact/utils/docInfo.js
@@ -0,0 +1,47 @@
+import {urlUtils} from './url';
+
+export const docInfo = {
+  /**
+   * @param {string} metaName
+   * @return {string|null}
+   */
+  getMetaByName(metaName) {
+    const metas = self.document.head.querySelectorAll('meta[name]');
+    return (
+      Array.from(metas)
+        .find(
+          (meta) =>
+            meta.getAttribute('name') === metaName &&
+            meta.getAttribute('content')
+        )
+        ?.getAttribute('content') || null
+    );
+  },
+
+  /**
+   * @return {string}
+   */
+  get sourceUrl() {
+    return self.location.href;
+  },
+
+  /**
+   * @return {string}
+   */
+  get canonicalUrl() {
+    const rootNode = self.document;
+
+    const canonicalUrl = rootNode?.AMP?.canonicalUrl;
+    if (canonicalUrl) {
+      return canonicalUrl;
+    }
+
+    /** @type {HTMLLinkElement | null} */
+    const canonicalTag = rootNode.querySelector('link[rel=canonical]');
+    if (canonicalTag) {
+      return urlUtils.parse(canonicalTag.href).href;
+    }
+
+    return this.sourceUrl;
+  },
+};
diff --git a/src/preact/utils/platform.js b/src/preact/utils/platform.js
new file mode 100644
index 000000000000..84cbfc4ccaee
--- /dev/null
+++ b/src/preact/utils/platform.js
@@ -0,0 +1,177 @@
+export const platformUtils = {
+  /**
+   * Whether the current platform is an Android device.
+   * @return {boolean}
+   */
+  isAndroid() {
+    return /Android/i.test(self.navigator.userAgent);
+  },
+
+  /**
+   * Whether the current platform is an iOS device.
+   * @return {boolean}
+   */
+  isIos() {
+    return /iPhone|iPad|iPod/i.test(self.navigator.userAgent);
+  },
+
+  /**
+   * Whether the current browser is Safari.
+   * @return {boolean}
+   */
+  isSafari() {
+    return (
+      /Safari/i.test(self.navigator.userAgent) &&
+      !this.isChrome() &&
+      !this.isEdge() &&
+      !this.isFirefox() &&
+      !this.isOpera()
+    );
+  },
+
+  /**
+   * Whether the current browser is a Chrome browser.
+   * @return {boolean}
+   */
+  isChrome() {
+    // Also true for MS Edge :)
+    return (
+      /Chrome|CriOS/i.test(self.navigator.userAgent) &&
+      !this.isEdge() &&
+      !this.isOpera()
+    );
+  },
+
+  /**
+   * Whether the current browser is a Firefox browser.
+   * @return {boolean}
+   */
+  isFirefox() {
+    return /Firefox|FxiOS/i.test(self.navigator.userAgent) && !this.isEdge();
+  },
+
+  /**
+   * Whether the current browser is an Opera browser.
+   * @return {boolean}
+   */
+  isOpera() {
+    // Chrome UA on Android may include OPR<v> (build code referring to Oreo),
+    // however real Opera puts put a / after OPR and that's the only tell, so
+    // we check for OPR/ instead of OPR
+    return /OPR\/|Opera|OPiOS/i.test(self.navigator.userAgent);
+  },
+
+  /**
+   * Whether the current browser is an Edge browser.
+   * @return {boolean}
+   */
+  isEdge() {
+    return /Edge/i.test(self.navigator.userAgent);
+  },
+
+  /**
+   * Whether the current browser is based on the WebKit engine.
+   * @return {boolean}
+   */
+  isWebKit() {
+    return /WebKit/i.test(self.navigator.userAgent) && !this.isEdge();
+  },
+
+  /**
+   * Whether the current browser is running on Windows.
+   * @return {boolean}
+   */
+  isWindows() {
+    return /Windows/i.test(self.navigator.userAgent);
+  },
+
+  /**
+   * Whether the current browser is standalone.
+   * @return {boolean}
+   */
+  isStandalone() {
+    return (
+      (this.isIos() && /** @type {*} */ (self.navigator).standalone) ||
+      (this.isChrome() && self.matchMedia('(display-mode: standalone)').matches)
+    );
+  },
+
+  /**
+   * Whether the current platform matches a bot user agent.
+   * @return {boolean}
+   */
+  isBot() {
+    return /bot/i.test(self.navigator.userAgent);
+  },
+
+  /**
+   * Returns the major version of the browser.
+   * @return {number}
+   */
+  getMajorVersion() {
+    if (this.isSafari()) {
+      return this.isIos()
+        ? this.getIosMajorVersion() || 0
+        : this.evalMajorVersion_(/\sVersion\/(\d+)/, 1);
+    }
+    if (this.isChrome()) {
+      return this.evalMajorVersion_(/(Chrome|CriOS)\/(\d+)/, 2);
+    }
+    if (this.isFirefox()) {
+      return this.evalMajorVersion_(/(Firefox|FxiOS)\/(\d+)/, 2);
+    }
+    if (this.isOpera()) {
+      return this.evalMajorVersion_(/(OPR|Opera|OPiOS)\/(\d+)/, 2);
+    }
+    if (this.isEdge()) {
+      return this.evalMajorVersion_(/Edge\/(\d+)/, 1);
+    }
+    return 0;
+  },
+
+  /**
+   * @param {!RegExp} expr
+   * @param {number} index The index in the result that's interpreted as the
+   *   major version (integer).
+   * @return {number}
+   */
+  evalMajorVersion_(expr, index) {
+    if (!self.navigator.userAgent) {
+      return 0;
+    }
+    const res = self.navigator.userAgent.match(expr);
+    if (!res || index >= res.length) {
+      return 0;
+    }
+    return parseInt(res[index], 10);
+  },
+
+  /**
+   * Returns the minor ios version in string.
+   * The ios version can contain two numbers (10.2) or three numbers (10.2.1).
+   * Direct string equality check is not suggested, use startWith instead.
+   * @return {string}
+   */
+  getIosVersionString() {
+    if (!this.isIos()) {
+      return '';
+    }
+    return (
+      self.navigator.userAgent
+        ?.match(/OS ([0-9]+[_.][0-9]+([_.][0-9]+)?)\b/)?.[1]
+        ?.replace(/_/g, '.') || ''
+    );
+  },
+
+  /**
+   * Returns the major ios version in number.
+   * @return {?number}
+   */
+  getIosMajorVersion() {
+    const currentIosVersion = this.getIosVersionString();
+    if (currentIosVersion === '') {
+      return null;
+    }
+    return Number(currentIosVersion.split('.')[0]);
+  },
+};
diff --git a/src/preact/utils/url.js b/src/preact/utils/url.js
new file mode 100644
index 000000000000..e910bb953294
--- /dev/null
+++ b/src/preact/utils/url.js
@@ -0,0 +1,76 @@
+import {INVALID_PROTOCOLS} from '#core/types/string/url';
+
+/**
+ * @type {{
+ *   anchor_?: HTMLAnchorElement,
+ *   getAnchor_: function(): HTMLAnchorElement
+ *   parse: function(string|URL): URL
+ *   isProtocolValid: function(URL|string): boolean
+ *   assertHttpsUrl: function(URL|string, string=): void
+ *   isSecureUrl: function(URL|string): boolean
+ * }}
+ */
+export const urlUtils = {
+  /**
+   * @return {HTMLAnchorElement}
+   * @private
+   */
+  getAnchor_() {
+    if (!this.anchor_) {
+      this.anchor_ = self.document.createElement('a');
+    }
+    return this.anchor_;
+  },
+
+  /**
+   * @param {string} url
+   * @return {!URL}
+   */
+  parse(url) {
+    const anchor = this.getAnchor_();
+    anchor.href = '';
+    return new URL(url, anchor.href);
+  },
+
+  /**
+   * Returns whether the URL has valid protocol.
+   * Deep link protocol is valid, but not javascript etc.
+   * @param {string|!URL} url
+   * @return {boolean}
+   */
+  isProtocolValid(url) {
+    const parsed = this.parse(url);
+    return !INVALID_PROTOCOLS.includes(parsed.protocol);
+  },
+
+  /**
+   * Asserts that a given url is HTTPS or protocol relative.
+   *
+   * @param {string|URL} url
+   * @param {string=} sourceName Used for error messages.
+   * @return {void}
+   */
+  assertHttpsUrl(url, sourceName = 'url') {
+    if (!this.isSecureUrl(url)) {
+      throw new Error(
+        `${sourceName} must start with "https://" or "//" or be relative and served from either https or from localhost. Invalid value: ${url}`
+      );
+    }
+  },
+
+  /**
+   * Returns `true` if the URL is secure: either HTTPS or localhost (for testing).
+   * @param {string|!URL} url
+   * @return {boolean}
+   */
+  isSecureUrl(url) {
+    const parsed = this.parse(url);
+
+    return (
+      parsed.protocol === 'https:' ||
+      parsed.hostname === 'localhost' ||
+      parsed.hostname === '127.0.0.1' ||
+      parsed.hostname?.endsWith('.localhost')
+    );
+  },
+};
diff --git a/src/preact/utils/xhr.js b/src/preact/utils/xhr.js
new file mode 100644
index 000000000000..38fe9bf7e3fc
--- /dev/null
+++ b/src/preact/utils/xhr.js
@@ -0,0 +1,27 @@
+export const xhrUtils = {
+  /**
+   * Wrapper around `fetch` that returns the parsed JSON result
+   *
+   * @param {RequestInfo} url
+   * @param {RequestInit} [init]
+   * @return {Promise<*>}
+   */
+  fetchJson(url, init) {
+    return this.fetch(url, init).then((res) => res.json());
+  },
+
+  /**
+   * Wrapper around `fetch` that checks the status code
+   *
+   * @param {RequestInfo} url
+   * @param {RequestInit} [init]
+   * @return {Promise<Response>}
+   */
+  async fetch(url, init) {
+    const response = await self.fetch(url, init);
+    if (!response.ok) {
+      throw new Error(response.statusText);
+    }
+    return response;
+  },
+};
diff --git a/src/preconnect.js b/src/preconnect.js
index 978f72ac9b15..f13d178dd077 100644
--- a/src/preconnect.js
+++ b/src/preconnect.js
@@ -70,12 +70,12 @@ export class PreconnectService {
     /**
      * Origin we've preconnected to and when that connection
      * expires as a timestamp in MS.
-     * @private @const {!Object<string, number>}
+     * @private @const {!{[key: string]: number}}
      */
     this.origins_ = {};
     /**
      * Urls we've prefetched.
-     * @private @const {!Object<string, boolean>}
+     * @private @const {!{[key: string]: boolean}}
      */
     this.urls_ = {};
     /** @private @const {!./service/platform-impl.Platform}  */
diff --git a/src/purifier/index.d.ts b/src/purifier/index.d.ts
index 1d12eeee36b5..d33bdbc39200 100644
--- a/src/purifier/index.d.ts
+++ b/src/purifier/index.d.ts
@@ -1,7 +1,3 @@
-
-
-/// <reference types="dompurify"/>
-
 export type AttributeRewriterDef = (
   tagName: string,
   attrName: string,
diff --git a/src/purifier/index.js b/src/purifier/index.js
index b13a9109ae1d..86c93c720077 100644
--- a/src/purifier/index.js
+++ b/src/purifier/index.js
@@ -13,6 +13,7 @@ import {
   BIND_PREFIX,
   DENYLISTED_TAGS,
   EMAIL_ALLOWLISTED_AMP_TAGS,
+  EMAIL_TRIPLE_MUSTACHE_ALLOWLISTED_TAGS,
   TRIPLE_MUSTACHE_ALLOWLISTED_TAGS,
   isValidAttr,
   markElementForDiffing,
@@ -23,7 +24,7 @@ const TAG = 'purifier';
 
 /**
  * Tags that are only allowlisted for specific values of given attributes.
- * @private @const {!Object<string, {attribute: string, values: !Array<string>}>}
+ * @private @const {!{[key: string]: {attribute: string, values: !Array<string}}>}
  */
 const ALLOWLISTED_TAGS_BY_ATTRS = {
   'script': {
@@ -103,7 +104,9 @@ export class Purifier {
     // RETURN_DOM_FRAGMENT to keep the <template> and FORCE_BODY to prevent
     // reparenting. See https://github.com/cure53/DOMPurify/issues/285#issuecomment-397810671
     const fragment = this.domPurifyTriple_.sanitize(dirty, {
-      'ALLOWED_TAGS': TRIPLE_MUSTACHE_ALLOWLISTED_TAGS,
+      'ALLOWED_TAGS': isAmp4Email(this.doc_)
+        ? EMAIL_TRIPLE_MUSTACHE_ALLOWLISTED_TAGS
+        : TRIPLE_MUSTACHE_ALLOWLISTED_TAGS,
       'FORCE_BODY': true,
       'RETURN_DOM_FRAGMENT': true,
     });
@@ -116,7 +119,7 @@ export class Purifier {
 
   /**
    * Gets a copy of the map of allowed tag names (standard DOMPurify config).
-   * @return {!Object<string, boolean>}
+   * @return {!{[key: string]: boolean}}
    */
   getAllowedTags() {
     const allowedTags = {};
@@ -171,7 +174,7 @@ export class Purifier {
       return true;
     }
     // Don't allow binding attributes for now.
-    if (bindingTypeForAttr(attr) !== BindingType.NONE) {
+    if (bindingTypeForAttr(attr) !== BindingType_Enum.NONE) {
       return false;
     }
     const pure = this.domPurify_.isValidAttribute(tag, attr, value);
@@ -219,7 +222,7 @@ export class Purifier {
 
     /**
      * @param {!Node} node
-     * @param {{tagName: string, allowedTags: !Object<string, boolean>}} data
+     * @param {{tagName: string, allowedTags: !{[key: string]: boolean}}} data
      */
     const uponSanitizeElement = (node, data) => {
       const {tagName} = data;
@@ -267,7 +270,7 @@ export class Purifier {
 
     /**
      * @param {!Element} element
-     * @param {{attrName: string, attrValue: string, allowedAttributes: !Object<string, boolean>}} data
+     * @param {{attrName: string, attrValue: string, allowedAttributes: !{[key: string]: boolean}}} data
      */
     const uponSanitizeAttribute = (element, data) => {
       // Beware of DOM Clobbering when using properties or functions on `element`.
@@ -321,11 +324,11 @@ export class Purifier {
       // Rewrite classic bindings e.g. [foo]="bar" -> data-amp-bind-foo="bar".
       // This is because DOMPurify eagerly removes attributes and re-adds them
       // after sanitization, which fails because `[]` are not valid attr chars.
-      if (bindingType === BindingType.CLASSIC) {
+      if (bindingType === BindingType_Enum.CLASSIC) {
         const property = attrName.substring(1, attrName.length - 1);
         element.setAttribute(`${BIND_PREFIX}${property}`, attrValue);
       }
-      if (bindingType !== BindingType.NONE) {
+      if (bindingType !== BindingType_Enum.NONE) {
         // Set a custom attribute to mark this element as containing a binding.
         // This is an optimization that obviates the need for DOM scan later.
         element.setAttribute('i-amphtml-binding', '');
@@ -456,7 +459,7 @@ function standardPurifyConfig() {
 /**
  * @enum {number}
  */
-const BindingType = {
+const BindingType_Enum = {
   NONE: 0,
   CLASSIC: 1,
   ALTERNATIVE: 2,
@@ -464,14 +467,14 @@ const BindingType = {
 
 /**
  * @param {string} attrName
- * @return {BindingType}
+ * @return {BindingType_Enum}
  */
 function bindingTypeForAttr(attrName) {
   if (attrName[0] == '[' && attrName[attrName.length - 1] == ']') {
-    return BindingType.CLASSIC;
+    return BindingType_Enum.CLASSIC;
   }
   if (attrName.startsWith(BIND_PREFIX)) {
-    return BindingType.ALTERNATIVE;
+    return BindingType_Enum.ALTERNATIVE;
   }
-  return BindingType.NONE;
+  return BindingType_Enum.NONE;
 }
diff --git a/src/purifier/sanitation.js b/src/purifier/sanitation.js
index c680a56e6ece..6ecb2fd4d969 100644
--- a/src/purifier/sanitation.js
+++ b/src/purifier/sanitation.js
@@ -1,5 +1,5 @@
 import {isAmp4Email} from '#core/document/format';
-import {dict, map} from '#core/types/object';
+import {map} from '#core/types/object';
 
 import {isUrlAttribute} from '../url-rewrite';
 
@@ -15,7 +15,7 @@ export const DIFF_IGNORE = 'i-amphtml-ignore';
 /**
  * Map of AMP element tag name to attributes that, if changed, require
  * replacement of the original element.
- * @const {!Object<string, !Array<string>>}
+ * @const {!{[key: string]: !Array<string>}}
  */
 export const DIFFABLE_AMP_ELEMENTS = {
   'AMP-IMG': ['src', 'srcset', 'layout', 'width', 'height'],
@@ -56,7 +56,7 @@ export function markElementForDiffing(element, generateKey) {
 }
 
 /**
- * @const {!Object<string, boolean>}
+ * @const {!{[key: string]: boolean}}
  * @see https://github.com/ampproject/amphtml/blob/main/docs/spec/amp-html-format.md
  */
 export const DENYLISTED_TAGS = {
@@ -79,7 +79,7 @@ export const DENYLISTED_TAGS = {
  * AMP elements allowed in AMP4EMAIL, modulo:
  * - amp-list and amp-state, which cannot be nested.
  * - amp-lightbox and amp-image-lightbox, which are deprecated.
- * @const {!Object<string, boolean>}
+ * @const {!{[key: string]: boolean}}
  * @see https://github.com/ampproject/amphtml/blob/main/docs/spec/email/amp-email-components.md
  */
 export const EMAIL_ALLOWLISTED_AMP_TAGS = {
@@ -96,7 +96,8 @@ export const EMAIL_ALLOWLISTED_AMP_TAGS = {
 };
 
 /**
- * Allowlist of tags allowed in triple mustache e.g. {{{name}}}.
+ * Allowlist of tags allowed in triple mustache in non-email format, e.g.
+ * {{{name}}}.
  * Very restrictive by design since the triple mustache renders unescaped HTML
  * which, unlike double mustache, won't be processed by the AMP Validator.
  * @const {!Array<string>}
@@ -158,6 +159,68 @@ export const TRIPLE_MUSTACHE_ALLOWLISTED_TAGS = [
   'ul',
 ];
 
+/**
+ * Same as `TRIPLE_MUSTACHE_ALLOWLISTED_TAGS` except for the email format. The
+ * email format has a different threat model and needs to evolve the allowlist
+ * independently from other formats, as certain tags can be considered safe in
+ * other formats but not in the email format.
+ * @const {!Array<string>}
+ */
+export const EMAIL_TRIPLE_MUSTACHE_ALLOWLISTED_TAGS = [
+  'a',
+  'article',
+  'aside',
+  'b',
+  'blockquote',
+  'br',
+  'caption',
+  'code',
+  'col',
+  'colgroup',
+  'dd',
+  'del',
+  'details',
+  'div',
+  'dl',
+  'dt',
+  'em',
+  'figcaption',
+  'figure',
+  'footer',
+  'h1',
+  'h2',
+  'h3',
+  'header',
+  'hr',
+  'i',
+  'ins',
+  'li',
+  'main',
+  'mark',
+  'nav',
+  'ol',
+  'p',
+  'pre',
+  'q',
+  's',
+  'section',
+  'small',
+  'span',
+  'strong',
+  'sub',
+  'summary',
+  'sup',
+  'table',
+  'tbody',
+  'td',
+  'tfoot',
+  'th',
+  'thead',
+  'time',
+  'tr',
+  'u',
+  'ul',
+];
 /**
  * Tag-agnostic attribute allowlisted used by both Caja and DOMPurify.
  * @const {!Array<string>}
@@ -206,7 +269,7 @@ export const ALLOWLISTED_ATTRS = [
 
 /**
  * Attributes that are only allowlisted for specific, non-AMP elements.
- * @const {!Object<string, !Array<string>>}
+ * @const {!{[key: string]: !Array<string>}}
  */
 export const ALLOWLISTED_ATTRS_BY_TAGS = {
   'a': ['rel', 'target'],
@@ -230,26 +293,22 @@ const EXTENDED_DENYLISTED_PROTOCOLS = /^(?:blob):/i;
 const ATTR_WHITESPACE =
   /[\u0000-\u0020\u00A0\u1680\u180E\u2000-\u2029\u205f\u3000]/g;
 
-/** @const {!Object<string, !Object<string, !RegExp>>} */
-const DENYLISTED_TAG_SPECIFIC_ATTR_VALUES = Object.freeze(
-  dict({
-    'input': {
-      'type': /(?:image|button)/i,
-    },
-  })
-);
+/** @const {!{[key: string]: !{[key: string]: !RegExp}}} */
+const DENYLISTED_TAG_SPECIFIC_ATTR_VALUES = Object.freeze({
+  'input': {
+    'type': /(?:image|button)/i,
+  },
+});
 
 /**
  * Rules in addition to DENYLISTED_TAG_SPECIFIC_ATTR_VALUES for AMP4EMAIL.
- * @const {!Object<string, !Object<string, !RegExp>>}
+ * @const {!{[key: string]: !{[key: string]: !RegExp}}}
  */
-const EMAIL_DENYLISTED_TAG_SPECIFIC_ATTR_VALUES = Object.freeze(
-  dict({
-    'input': {
-      'type': /(?:button|file|image|password)/i,
-    },
-  })
-);
+const EMAIL_DENYLISTED_TAG_SPECIFIC_ATTR_VALUES = Object.freeze({
+  'input': {
+    'type': /(?:button|file|image|password)/i,
+  },
+});
 
 /** @const {!Array<string>} */
 const DENYLISTED_FIELDS_ATTR = Object.freeze([
@@ -261,25 +320,21 @@ const DENYLISTED_FIELDS_ATTR = Object.freeze([
   'formenctype',
 ]);
 
-/** @const {!Object<string, !Array<string>>} */
-const DENYLISTED_TAG_SPECIFIC_ATTRS = Object.freeze(
-  dict({
-    'input': DENYLISTED_FIELDS_ATTR,
-    'textarea': DENYLISTED_FIELDS_ATTR,
-    'select': DENYLISTED_FIELDS_ATTR,
-  })
-);
+/** @const {!{[key: string]: !Array<string>}} */
+const DENYLISTED_TAG_SPECIFIC_ATTRS = Object.freeze({
+  'input': DENYLISTED_FIELDS_ATTR,
+  'textarea': DENYLISTED_FIELDS_ATTR,
+  'select': DENYLISTED_FIELDS_ATTR,
+});
 
 /**
  * Rules in addition to denylistED_TAG_SPECIFIC_ATTRS for AMP4EMAIL.
- * @const {!Object<string, !Array<string>>}
+ * @const {!{[key: string]: !Array<string>}}
  */
-const EMAIL_DENYLISTED_TAG_SPECIFIC_ATTRS = Object.freeze(
-  dict({
-    'amp-anim': ['controls'],
-    'form': ['name'],
-  })
-);
+const EMAIL_DENYLISTED_TAG_SPECIFIC_ATTRS = Object.freeze({
+  'amp-anim': ['controls'],
+  'form': ['name'],
+});
 
 /**
  * Test for invalid `style` attribute values.
diff --git a/src/react/dom.js b/src/react/dom.js
new file mode 100644
index 000000000000..c1ae17e82385
--- /dev/null
+++ b/src/react/dom.js
@@ -0,0 +1,5 @@
+import {hydrate, render} from '#preact';
+
+export {hydrate, render};
+
+export default {hydrate, render};
diff --git a/src/react/index.js b/src/react/index.js
new file mode 100644
index 000000000000..7c3a12545f1e
--- /dev/null
+++ b/src/react/index.js
@@ -0,0 +1,11 @@
+import * as Preact from '#preact';
+import * as PreactCompat from '#preact/compat';
+
+export * from '#preact';
+export * from '#preact/compat';
+
+// This file allows us to remap react imports from external libraries to
+// our internal preact exports. This file uses a default export in order to
+// be compatible with libraries that use react default import syntax.
+
+export default {...Preact, ...PreactCompat};
diff --git a/src/render-delaying-services.js b/src/render-delaying-services.js
index dd97baf88d54..1962f0961c80 100644
--- a/src/render-delaying-services.js
+++ b/src/render-delaying-services.js
@@ -20,12 +20,11 @@ import {getServicePromise} from './service-helpers';
  * changes made to it must be made in coordination with caches that implement
  * SSR. For more information on SSR see bit.ly/amp-ssr.
  *
- * @const {!Object<string, string>}
+ * @const {!{[key: string]: string}}
  */
 const SERVICES = {
   'amp-dynamic-css-classes': '[custom-element=amp-dynamic-css-classes]',
   'variant': 'amp-experiment',
-  'amp-story-render': 'amp-story[standalone]',
 };
 
 /**
diff --git a/src/runtime.js b/src/runtime.js
index 3e66671ef338..ceb07cae597b 100644
--- a/src/runtime.js
+++ b/src/runtime.js
@@ -19,7 +19,6 @@ import {
 } from '#service/extensions-impl';
 
 import {
-  LogLevel, // eslint-disable-line no-unused-vars
   dev,
   initLogConstructor,
   overrideLogLevel,
@@ -28,7 +27,7 @@ import {
 
 import {BaseElement} from './base-element';
 import {startupChunk} from './chunk';
-import {config} from './config';
+import * as urls from './config/urls';
 import {reportErrorForWin} from './error-reporting';
 import {getMode} from './mode';
 import {MultidocManager} from './multidoc-manager';
@@ -50,7 +49,7 @@ const TAG = 'runtime';
  *  canonicalUrl: (string|undefined),
  *  head: (Element|undefined),
  *  ampdoc: (!./service/ampdoc-impl.AmpDoc | undefined),
- *  setVisibilityState: (function(!VisibilityState)|undefined),
+ *  setVisibilityState: (function(!VisibilityState_Enum)|undefined),
  *  postMessage: (function()|undefined),
  *  onMessage: (function()|undefined),
  *  close: (function()|undefined),
@@ -107,8 +106,49 @@ function adoptShared(global, callback) {
     };
   }
 
-  /** @const */
-  global.AMP.config = config;
+  /**
+   * @const {{
+   *   urls: {
+   *     thirdParty: string,
+   *     thirdPartyFrameHost: string,
+   *     thirdPartyFrameRegex: !RegExp,
+   *     cdn: string,
+   *     cdnProxyRegex: !RegExp,
+   *     localhostRegex: !RegExp,
+   *     errorReporting: string,
+   *     betaErrorReporting: string,
+   *     localDev: boolean,
+   *     trustedViewerHosts: !Array<!RegExp>,
+   *     geoApi: ?string,
+   *   }
+   * }}
+   */
+  global.AMP.config = {
+    urls: {
+      thirdParty: urls.thirdParty,
+      thirdPartyFrameHost: urls.thirdPartyFrameHost,
+      thirdPartyFrameRegex: urls.thirdPartyFrameRegex,
+      cdn: urls.cdn,
+      cdnProxyRegex: urls.cdnProxyRegex,
+      localhostRegex: urls.localhostRegex,
+      errorReporting: urls.errorReporting,
+      betaErrorReporting: urls.betaErrorReporting,
+      localDev: urls.localDev,
+      trustedViewerHosts: urls.trustedViewerHosts,
+      geoApi: urls.geoApi,
+    },
+  };
+
+  /**
+   *
+   * NOTE(erwinm, #38644): placeholder for global consent listeners.
+   */
+  global.AMP.addGlobalConsentListener = function () {};
+
+  /**
+   * NOTE(erwinm, #38644): placeholder for global consent listeners.
+   */
+  global.AMP.addGranularConsentListener = function () {};
 
   global.AMP.BaseElement = BaseElement;
 
@@ -149,7 +189,7 @@ function adoptShared(global, callback) {
   global.AMP.toggleExperiment = toggleExperiment.bind(null, global);
 
   /**
-   * @param {!LogLevel} level
+   * @param {import('#utils/log').LogLevel_Enum} level
    */
   global.AMP.setLogLevel = overrideLogLevel.bind(null);
 
@@ -393,7 +433,7 @@ export function adoptShadowMode(global) {
      * @param {!Element} hostElement
      * @param {!Document} doc
      * @param {string} url
-     * @param {!Object<string, string>=} opt_initParams
+     * @param {!{[key: string]: string}=} opt_initParams
      * @return {!Object}
      */
     global.AMP.attachShadowDoc = manager.attachShadowDoc.bind(manager);
@@ -402,7 +442,7 @@ export function adoptShadowMode(global) {
      * Registers a shadow root document via a stream.
      * @param {!Element} hostElement
      * @param {string} url
-     * @param {!Object<string, string>=} opt_initParams
+     * @param {!{[key: string]: string}=} opt_initParams
      * @return {!Object}
      */
     global.AMP.attachShadowDocAsStream =
diff --git a/src/sanitizer.js b/src/sanitizer.js
index 7979282a705b..1f8195441e9e 100644
--- a/src/sanitizer.js
+++ b/src/sanitizer.js
@@ -1,5 +1,4 @@
 import {isAmp4Email} from '#core/document/format';
-import {dict} from '#core/types/object';
 
 import {
   ALLOWLISTED_ATTRS,
@@ -8,6 +7,7 @@ import {
   BIND_PREFIX,
   DENYLISTED_TAGS,
   EMAIL_ALLOWLISTED_AMP_TAGS,
+  EMAIL_TRIPLE_MUSTACHE_ALLOWLISTED_TAGS,
   TRIPLE_MUSTACHE_ALLOWLISTED_TAGS,
   isValidAttr,
 } from '#purifier/sanitation';
@@ -25,9 +25,9 @@ const TAG = 'sanitizer';
  * Allowlist of supported self-closing tags for Caja. These are used for
  * correct parsing on Caja and are not necessary for DOMPurify which uses
  * the browser's HTML parser.
- * @const {!Object<string, boolean>}
+ * @const {!{[key: string]: boolean}}
  */
-const SELF_CLOSING_TAGS = dict({
+const SELF_CLOSING_TAGS = {
   'br': true,
   'col': true,
   'hr': true,
@@ -44,7 +44,7 @@ const SELF_CLOSING_TAGS = dict({
   'link': true,
   'meta': true,
   'param': true,
-});
+};
 
 /**
  * Regex to allow data-*, aria-* and role attributes.
@@ -243,19 +243,23 @@ export function sanitizeHtml(html, doc) {
  * We do so in sanitizeHtml which occurs after this initial sanitizing.
  *
  * @param {string} html
+ * @param {!Document} doc
  * @return {string}
  */
-export function sanitizeTagsForTripleMustache(html) {
-  return htmlSanitizer.sanitizeWithPolicy(html, tripleMustacheTagPolicy);
+export function sanitizeTagsForTripleMustache(html, doc) {
+  return htmlSanitizer.sanitizeWithPolicy(html, (tagName, attribs) =>
+    tripleMustacheTagPolicy(tagName, attribs, doc)
+  );
 }
 
 /**
  * Tag policy for handling what is valid html in templates.
  * @param {string} tagName
  * @param {!Array<string>} attribs
+ * @param {!Document} doc
  * @return {?{tagName: string, attribs: !Array<string>}}
  */
-function tripleMustacheTagPolicy(tagName, attribs) {
+function tripleMustacheTagPolicy(tagName, attribs, doc) {
   if (tagName == 'template') {
     for (let i = 0; i < attribs.length; i += 2) {
       if (attribs[i] == 'type' && attribs[i + 1] == 'amp-mustache') {
@@ -266,7 +270,11 @@ function tripleMustacheTagPolicy(tagName, attribs) {
       }
     }
   }
-  if (!TRIPLE_MUSTACHE_ALLOWLISTED_TAGS.includes(tagName)) {
+  if (isAmp4Email(doc)) {
+    if (!EMAIL_TRIPLE_MUSTACHE_ALLOWLISTED_TAGS.includes(tagName)) {
+      return null;
+    }
+  } else if (!TRIPLE_MUSTACHE_ALLOWLISTED_TAGS.includes(tagName)) {
     return null;
   }
   return {
diff --git a/src/service-helpers.js b/src/service-helpers.js
index 84032ac767dd..cc0ad38087f0 100644
--- a/src/service-helpers.js
+++ b/src/service-helpers.js
@@ -1,3 +1,5 @@
+// @ts-nocheck
+
 /**
  * @fileoverview Registration and getter functions for AMP services.
  *
@@ -333,7 +335,7 @@ function getAmpdocService(win) {
  * has already been registered.
  * @param {!Object} holder Object holding the service instance.
  * @param {string} id of the service.
- * @return {Object}
+ * @return {object}
  */
 function getServiceInternal(holder, id) {
   devAssert(
@@ -468,7 +470,7 @@ function getServicePromiseOrNullInternal(holder, id) {
 /**
  * Returns the object that holds the services registered in a holder.
  * @param {!Object} holder
- * @return {!Object<string,!ServiceHolderDef>}
+ * @return {!{[key: string]: !ServiceHolderDef}}
  */
 function getServices(holder) {
   let services = holder.__AMP_SERVICES;
diff --git a/src/service/action-impl.js b/src/service/action-impl.js
index 5a57ae8a65ec..3f5737242f9e 100644
--- a/src/service/action-impl.js
+++ b/src/service/action-impl.js
@@ -1,16 +1,16 @@
 import {
-  ActionTrust,
+  ActionTrust_Enum,
   DEFAULT_ACTION,
   RAW_OBJECT_ARGS_KEY,
   actionTrustToString,
 } from '#core/constants/action-constants';
-import {Keys} from '#core/constants/key-codes';
+import {Keys_Enum} from '#core/constants/key-codes';
 import {isAmp4Email} from '#core/document/format';
 import {isEnabled} from '#core/dom';
 import {isFiniteNumber} from '#core/types';
 import {isArray, toArray} from '#core/types/array';
 import {debounce, throttle} from '#core/types/function';
-import {dict, getValueForExpr, hasOwn, map} from '#core/types/object';
+import {getValueForExpr, hasOwn, map} from '#core/types/object';
 import {getWin} from '#core/window';
 
 import {Services} from '#service';
@@ -40,7 +40,7 @@ const DEFAULT_DEBOUNCE_WAIT = 300; // ms
 /** @const {number} */
 const DEFAULT_THROTTLE_INTERVAL = 100; // ms
 
-/** @const {!Object<string,!Array<string>>} */
+/** @const {!{[key: string]: !Array<string}>} */
 const NON_AMP_ELEMENTS_ACTIONS_ = {
   'form': ['submit', 'clear'],
 };
@@ -61,7 +61,7 @@ const DEFAULT_EMAIL_ALLOWLIST = [
  * since they are text inputs, readonly, or composite widgets that shouldn't
  * need to trigger tap events from spacebar or enter on their own.
  * See https://www.w3.org/TR/wai-aria-1.1/#widget_roles
- * @const {!Object<boolean>}
+ * @const {!{[key: string]: boolean}}
  */
 export const TAPPABLE_ARIA_ROLES = {
   'button': true,
@@ -95,7 +95,7 @@ let ActionInfoArgValueDef;
 
 /**
  * Map of arg names to their values, e.g. {arg: 123} in `e:t.m(arg=123)`.
- * @typedef {Object<string, ActionInfoArgValueDef>}
+ * @typedef {{[key: string]: ActionInfoArgValueDef}}
  */
 let ActionInfoArgsDef;
 
@@ -157,7 +157,7 @@ export class ActionInvocation {
    * @param {?Element} source Element that generated the `event`.
    * @param {?Element} caller Element containing the on="..." action handler.
    * @param {?ActionEventDef} event The event object that triggered this action.
-   * @param {!ActionTrust} trust The trust level of this invocation's trigger.
+   * @param {!ActionTrust_Enum} trust The trust level of this invocation's trigger.
    * @param {?string} actionEventType The AMP event name that triggered this.
    * @param {?string} tagOrTarget The global target name or the element tagName.
    * @param {number} sequenceId An identifier for this action's sequence (all
@@ -187,7 +187,7 @@ export class ActionInvocation {
     this.caller = caller;
     /** @const {?ActionEventDef} */
     this.event = event;
-    /** @const {!ActionTrust} */
+    /** @const {!ActionTrust_Enum} */
     this.trust = trust;
     /** @const {?string} */
     this.actionEventType = actionEventType;
@@ -200,7 +200,7 @@ export class ActionInvocation {
   /**
    * Returns true if the trigger event has a trust equal to or greater than
    * `minimumTrust`. Otherwise, logs a user error and returns false.
-   * @param {ActionTrust} minimumTrust
+   * @param {ActionTrust_Enum} minimumTrust
    * @return {boolean}
    */
   satisfiesTrust(minimumTrust) {
@@ -264,11 +264,11 @@ export class ActionService {
      */
     this.allowlist_ = this.isEmail_ ? DEFAULT_EMAIL_ALLOWLIST : null;
 
-    /** @const @private {!Object<string, ActionHandlerDef>} */
+    /** @const @private {!{[key: string]: ActionHandlerDef}} */
     this.globalTargets_ = map();
 
     /**
-     * @const @private {!Object<string, {handler: ActionHandlerDef, minTrust: ActionTrust}>}
+     * @const @private {!{[key: string]: {handler: ActionHandlerDef, minTrust: ActionTrust_Enum}}}
      */
     this.globalMethodHandlers_ = map();
 
@@ -294,13 +294,13 @@ export class ActionService {
       this.root_.addEventListener('click', (event) => {
         if (!event.defaultPrevented) {
           const element = dev().assertElement(event.target);
-          this.trigger(element, name, event, ActionTrust.HIGH);
+          this.trigger(element, name, event, ActionTrust_Enum.HIGH);
         }
       });
       this.root_.addEventListener('keydown', (event) => {
         const {key, target} = event;
         const element = dev().assertElement(target);
-        if (key == Keys.ENTER || key == Keys.SPACE) {
+        if (key == Keys_Enum.ENTER || key == Keys_Enum.SPACE) {
           const role = element.getAttribute('role');
           const isTapEventRole =
             role && hasOwn(TAPPABLE_ARIA_ROLES, role.toLowerCase());
@@ -309,7 +309,7 @@ export class ActionService {
               element,
               name,
               event,
-              ActionTrust.HIGH
+              ActionTrust_Enum.HIGH
             );
             // Only if the element has an action do we prevent the default.
             // In the absence of an action, e.g. on="[event].method", we do not
@@ -325,13 +325,13 @@ export class ActionService {
         const element = dev().assertElement(event.target);
         // For get requests, the delegating to the viewer needs to happen
         // before this.
-        this.trigger(element, name, event, ActionTrust.HIGH);
+        this.trigger(element, name, event, ActionTrust_Enum.HIGH);
       });
     } else if (name == 'change') {
       this.root_.addEventListener(name, (event) => {
         const element = dev().assertElement(event.target);
         this.addTargetPropertiesAsDetail_(event);
-        this.trigger(element, name, event, ActionTrust.HIGH);
+        this.trigger(element, name, event, ActionTrust_Enum.HIGH);
       });
     } else if (name == 'input-debounced') {
       const debouncedInput = debounce(
@@ -342,7 +342,7 @@ export class ActionService {
             target,
             name,
             /** @type {!ActionEventDef} */ (event),
-            ActionTrust.HIGH
+            ActionTrust_Enum.HIGH
           );
         },
         DEFAULT_DEBOUNCE_WAIT
@@ -364,7 +364,7 @@ export class ActionService {
             target,
             name,
             /** @type {!ActionEventDef} */ (event),
-            ActionTrust.HIGH
+            ActionTrust_Enum.HIGH
           );
         },
         DEFAULT_THROTTLE_INTERVAL
@@ -378,7 +378,7 @@ export class ActionService {
     } else if (name == 'valid' || name == 'invalid') {
       this.root_.addEventListener(name, (event) => {
         const element = dev().assertElement(event.target);
-        this.trigger(element, name, event, ActionTrust.HIGH);
+        this.trigger(element, name, event, ActionTrust_Enum.HIGH);
       });
     }
   }
@@ -396,9 +396,9 @@ export class ActionService {
    * Registers the action handler for a common method.
    * @param {string} name
    * @param {ActionHandlerDef} handler
-   * @param {ActionTrust} minTrust
+   * @param {ActionTrust_Enum} minTrust
    */
-  addGlobalMethodHandler(name, handler, minTrust = ActionTrust.DEFAULT) {
+  addGlobalMethodHandler(name, handler, minTrust = ActionTrust_Enum.DEFAULT) {
     this.globalMethodHandlers_[name] = {handler, minTrust};
   }
 
@@ -407,7 +407,7 @@ export class ActionService {
    * @param {!Element} target
    * @param {string} eventType
    * @param {?ActionEventDef} event
-   * @param {!ActionTrust} trust
+   * @param {!ActionTrust_Enum} trust
    * @param {?JsonObject=} opt_args
    * @return {boolean} true if the target has an action.
    */
@@ -423,7 +423,7 @@ export class ActionService {
    * @param {?Element} source
    * @param {?Element} caller
    * @param {?ActionEventDef} event
-   * @param {ActionTrust} trust
+   * @param {ActionTrust_Enum} trust
    */
   execute(target, method, args, source, caller, event, trust) {
     const invocation = new ActionInvocation(
@@ -598,7 +598,7 @@ export class ActionService {
    * @param {!Element} source
    * @param {string} actionEventType
    * @param {?ActionEventDef} event
-   * @param {!ActionTrust} trust
+   * @param {!ActionTrust_Enum} trust
    * @param {?JsonObject=} opt_args
    * @return {boolean} True if the element has an action.
    * @private
@@ -774,7 +774,7 @@ export class ActionService {
   /**
    * @param {!Element} node
    * @param {string} actionEventType
-   * @return {?Object<string, !Array<!ActionInfoDef>>}
+   * @return {?{[key: string]: !Array<!ActionInfoDef>}}
    */
   getActionMap_(node, actionEventType) {
     let actionMap = node[ACTION_MAP_];
@@ -943,7 +943,7 @@ function notImplemented() {
 /**
  * @param {string} action
  * @param {!Element} context
- * @return {?Object<string, !Array<!ActionInfoDef>>}
+ * @return {?{[key: string]: !Array<!ActionInfoDef>}}
  * @private Visible for testing only.
  */
 export function parseActionMap(action, context) {
@@ -958,26 +958,29 @@ export function parseActionMap(action, context) {
   do {
     tok = toks.next();
     if (
-      tok.type == TokenType.EOF ||
-      (tok.type == TokenType.SEPARATOR && tok.value == ';')
+      tok.type == TokenType_Enum.EOF ||
+      (tok.type == TokenType_Enum.SEPARATOR && tok.value == ';')
     ) {
       // Expected, ignore.
-    } else if (tok.type == TokenType.LITERAL || tok.type == TokenType.ID) {
+    } else if (
+      tok.type == TokenType_Enum.LITERAL ||
+      tok.type == TokenType_Enum.ID
+    ) {
       // Format: event:target.method
 
       // Event: "event:"
       const event = tok.value;
 
       // Target: ":target." separator
-      assertToken(toks.next(), [TokenType.SEPARATOR], ':');
+      assertToken(toks.next(), [TokenType_Enum.SEPARATOR], ':');
 
       const actions = [];
 
       // Handlers for event.
       do {
         const target = assertToken(toks.next(), [
-          TokenType.LITERAL,
-          TokenType.ID,
+          TokenType_Enum.LITERAL,
+          TokenType_Enum.ID,
         ]).value;
 
         // Method: ".method". Method is optional.
@@ -985,15 +988,17 @@ export function parseActionMap(action, context) {
         let args = null;
 
         peek = toks.peek();
-        if (peek.type == TokenType.SEPARATOR && peek.value == '.') {
+        if (peek.type == TokenType_Enum.SEPARATOR && peek.value == '.') {
           toks.next(); // Skip '.'
           method =
-            assertToken(toks.next(), [TokenType.LITERAL, TokenType.ID]).value ||
-            method;
+            assertToken(toks.next(), [
+              TokenType_Enum.LITERAL,
+              TokenType_Enum.ID,
+            ]).value || method;
 
           // Optionally, there may be arguments: "(key = value, key = value)".
           peek = toks.peek();
-          if (peek.type == TokenType.SEPARATOR && peek.value == '(') {
+          if (peek.type == TokenType_Enum.SEPARATOR && peek.value == '(') {
             toks.next(); // Skip '('
             args = tokenizeMethodArguments(toks, assertToken, assertAction);
           }
@@ -1012,7 +1017,7 @@ export function parseActionMap(action, context) {
 
         peek = toks.peek();
       } while (
-        peek.type == TokenType.SEPARATOR &&
+        peek.type == TokenType_Enum.SEPARATOR &&
         peek.value == ',' &&
         toks.next()
       ); // skip "," when found
@@ -1026,7 +1031,7 @@ export function parseActionMap(action, context) {
       // Unexpected token.
       assertAction(false, `; unexpected token [${tok.value || ''}]`);
     }
-  } while (tok.type != TokenType.EOF);
+  } while (tok.type != TokenType_Enum.EOF);
 
   return actionMap;
 }
@@ -1044,38 +1049,38 @@ function tokenizeMethodArguments(toks, assertToken, assertAction) {
   let tok;
   let args = null;
   // Object literal. Format: {...}
-  if (peek.type == TokenType.OBJECT) {
+  if (peek.type == TokenType_Enum.OBJECT) {
     // Don't parse object literals. Tokenize as a single expression
     // fragment and delegate to specific action handler.
     args = map();
     const {value} = toks.next();
     args[RAW_OBJECT_ARGS_KEY] = value;
-    assertToken(toks.next(), [TokenType.SEPARATOR], ')');
+    assertToken(toks.next(), [TokenType_Enum.SEPARATOR], ')');
   } else {
     // Key-value pairs. Format: key = value, ....
     do {
       tok = toks.next();
       const {type, value} = tok;
-      if (type == TokenType.SEPARATOR && (value == ',' || value == ')')) {
+      if (type == TokenType_Enum.SEPARATOR && (value == ',' || value == ')')) {
         // Expected: ignore.
-      } else if (type == TokenType.LITERAL || type == TokenType.ID) {
+      } else if (type == TokenType_Enum.LITERAL || type == TokenType_Enum.ID) {
         // Key: "key = "
-        assertToken(toks.next(), [TokenType.SEPARATOR], '=');
+        assertToken(toks.next(), [TokenType_Enum.SEPARATOR], '=');
         // Value is either a literal or an expression: "foo.bar.baz"
         tok = assertToken(toks.next(/* convertValue */ true), [
-          TokenType.LITERAL,
-          TokenType.ID,
+          TokenType_Enum.LITERAL,
+          TokenType_Enum.ID,
         ]);
         const argValueTokens = [tok];
         // Expressions have one or more dereferences: ".identifier"
-        if (tok.type == TokenType.ID) {
+        if (tok.type == TokenType_Enum.ID) {
           for (
             peek = toks.peek();
-            peek.type == TokenType.SEPARATOR && peek.value == '.';
+            peek.type == TokenType_Enum.SEPARATOR && peek.value == '.';
             peek = toks.peek()
           ) {
             toks.next(); // Skip '.'.
-            tok = assertToken(toks.next(false), [TokenType.ID]);
+            tok = assertToken(toks.next(false), [TokenType_Enum.ID]);
             argValueTokens.push(tok);
           }
         }
@@ -1086,7 +1091,7 @@ function tokenizeMethodArguments(toks, assertToken, assertAction) {
         args[value] = argValue;
         peek = toks.peek();
         assertAction(
-          peek.type == TokenType.SEPARATOR &&
+          peek.type == TokenType_Enum.SEPARATOR &&
             (peek.value == ',' || peek.value == ')'),
           'Expected either [,] or [)]'
         );
@@ -1094,7 +1099,7 @@ function tokenizeMethodArguments(toks, assertToken, assertAction) {
         // Unexpected token.
         assertAction(false, `; unexpected token [${tok.value || ''}]`);
       }
-    } while (!(tok.type == TokenType.SEPARATOR && tok.value == ')'));
+    } while (!(tok.type == TokenType_Enum.SEPARATOR && tok.value == ')'));
   }
   return args;
 }
@@ -1128,7 +1133,7 @@ export function dereferenceArgsVariables(args, event, opt_args) {
   if (!args) {
     return args;
   }
-  const data = opt_args || dict({});
+  const data = opt_args || {};
   if (event) {
     const detail = getDetail(/** @type {!Event} */ (event));
     if (detail) {
@@ -1180,7 +1185,7 @@ function assertActionForParser(s, context, condition, opt_message) {
  * @param {string} s
  * @param {!Element} context
  * @param {!TokenDef} tok
- * @param {Array<TokenType>} types
+ * @param {Array<TokenType_Enum>} types
  * @param {*=} opt_value
  * @return {!TokenDef}
  * @private
@@ -1202,7 +1207,7 @@ function assertTokenForParser(s, context, tok, types, opt_value) {
 /**
  * @enum {number}
  */
-const TokenType = {
+const TokenType_Enum = {
   INVALID: 0,
   EOF: 1,
   SEPARATOR: 2,
@@ -1212,7 +1217,7 @@ const TokenType = {
 };
 
 /**
- * @typedef {{type: TokenType, value: *}}
+ * @typedef {{type: TokenType_Enum, value: *}}
  */
 let TokenDef;
 
@@ -1266,12 +1271,12 @@ class ParserTokenizer {
 
   /**
    * @param {boolean} convertValues
-   * @return {!{type: TokenType, value: *, index: number}}
+   * @return {!{type: TokenType_Enum, value: *, index: number}}
    */
   next_(convertValues) {
     let newIndex = this.index_ + 1;
     if (newIndex >= this.str_.length) {
-      return {type: TokenType.EOF, index: this.index_};
+      return {type: TokenType_Enum.EOF, index: this.index_};
     }
 
     let c = this.str_.charAt(newIndex);
@@ -1285,7 +1290,7 @@ class ParserTokenizer {
         }
       }
       if (newIndex >= this.str_.length) {
-        return {type: TokenType.EOF, index: newIndex};
+        return {type: TokenType_Enum.EOF, index: newIndex};
       }
       c = this.str_.charAt(newIndex);
     }
@@ -1313,12 +1318,12 @@ class ParserTokenizer {
       const s = this.str_.substring(newIndex, end);
       const value = hasFraction ? parseFloat(s) : parseInt(s, 10);
       newIndex = end - 1;
-      return {type: TokenType.LITERAL, value, index: newIndex};
+      return {type: TokenType_Enum.LITERAL, value, index: newIndex};
     }
 
     // Different separators.
     if (SEPARATOR_SET.indexOf(c) != -1) {
-      return {type: TokenType.SEPARATOR, value: c, index: newIndex};
+      return {type: TokenType_Enum.SEPARATOR, value: c, index: newIndex};
     }
 
     // String literal.
@@ -1331,11 +1336,11 @@ class ParserTokenizer {
         }
       }
       if (end == -1) {
-        return {type: TokenType.INVALID, index: newIndex};
+        return {type: TokenType_Enum.INVALID, index: newIndex};
       }
       const value = this.str_.substring(newIndex + 1, end);
       newIndex = end;
-      return {type: TokenType.LITERAL, value, index: newIndex};
+      return {type: TokenType_Enum.LITERAL, value, index: newIndex};
     }
 
     // Object literal.
@@ -1355,11 +1360,11 @@ class ParserTokenizer {
         }
       }
       if (end == -1) {
-        return {type: TokenType.INVALID, index: newIndex};
+        return {type: TokenType_Enum.INVALID, index: newIndex};
       }
       const value = this.str_.substring(newIndex, end + 1);
       newIndex = end;
-      return {type: TokenType.OBJECT, value, index: newIndex};
+      return {type: TokenType_Enum.OBJECT, value, index: newIndex};
     }
 
     // Advance until next special character.
@@ -1375,16 +1380,16 @@ class ParserTokenizer {
     // Boolean literal.
     if (convertValues && (s == 'true' || s == 'false')) {
       const value = s == 'true';
-      return {type: TokenType.LITERAL, value, index: newIndex};
+      return {type: TokenType_Enum.LITERAL, value, index: newIndex};
     }
 
     // Identifier.
     if (!isNum(s.charAt(0))) {
-      return {type: TokenType.ID, value: s, index: newIndex};
+      return {type: TokenType_Enum.ID, value: s, index: newIndex};
     }
 
     // Key.
-    return {type: TokenType.LITERAL, value: s, index: newIndex};
+    return {type: TokenType_Enum.LITERAL, value: s, index: newIndex};
   }
 }
 
diff --git a/src/service/ampdoc-impl.js b/src/service/ampdoc-impl.js
index 28d0805aa343..ffa48f0749e5 100644
--- a/src/service/ampdoc-impl.js
+++ b/src/service/ampdoc-impl.js
@@ -1,4 +1,4 @@
-import {VisibilityState} from '#core/constants/visibility-state';
+import {VisibilityState_Enum} from '#core/constants/visibility-state';
 import {Observable} from '#core/data-structures/observable';
 import {Deferred} from '#core/data-structures/promise';
 import {Signals} from '#core/data-structures/signals';
@@ -8,7 +8,7 @@ import {
   getDocumentVisibilityState,
   removeDocumentVisibilityChangeListener,
 } from '#core/document/visibility';
-import {iterateCursor, rootNodeFor, waitForBodyOpenPromise} from '#core/dom';
+import {rootNodeFor, waitForBodyOpenPromise} from '#core/dom';
 import {isEnumValue} from '#core/types';
 import {map} from '#core/types/object';
 import {parseQueryString} from '#core/types/string/url';
@@ -30,9 +30,9 @@ const PARAMS_SENTINEL = '__AMP__';
 
 /**
  * @typedef {{
- *   params: (!Object<string, string>|undefined),
+ *   params: (!{[key: string]: string}|undefined),
  *   signals: (?Signals|undefined),
- *   visibilityState: (?VisibilityState|undefined),
+ *   visibilityState: (?VisibilityState_Enum|undefined),
  * }}
  */
 export let AmpDocOptions;
@@ -41,13 +41,15 @@ export let AmpDocOptions;
  * Private ampdoc signals.
  * @enum {string}
  */
-const AmpDocSignals = {
+const AmpDocSignals_Enum = {
   // A complete preinstalled list of extensions is known.
   EXTENSIONS_KNOWN: '-ampdoc-ext-known',
   // Signals the document has become visible for the first time.
   FIRST_VISIBLE: '-ampdoc-first-visible',
   // Signals when the document becomes visible the next time.
   NEXT_VISIBLE: '-ampdoc-next-visible',
+  // Signals the document has been previewed for the first time.
+  FIRST_PREVIEWED: '-ampdoc-first-previewed',
 };
 
 /**
@@ -64,7 +66,7 @@ export class AmpDocService {
   /**
    * @param {!Window} win
    * @param {boolean} isSingleDoc
-   * @param {!Object<string, string>=} opt_initParams
+   * @param {!{[key: string]: string}=} opt_initParams
    */
   constructor(win, isSingleDoc, opt_initParams) {
     /** @const {!Window} */
@@ -237,7 +239,7 @@ export class AmpDoc {
     /** @public @const {!Window} */
     this.win = win;
 
-    /** @private {!Object<../enums.AMPDOC_SINGLETON_NAME_ENUM, boolean>} */
+    /** @private {!{[key: ../enums.AMPDOC_SINGLETON_NAME_ENUM]: boolean}} */
     this.registeredSingleton_ = map();
 
     /** @public @const {?AmpDoc} */
@@ -246,22 +248,22 @@ export class AmpDoc {
     /** @private @const */
     this.signals_ = (opt_options && opt_options.signals) || new Signals();
 
-    /** @private {!Object<string, string>} */
+    /** @private {!{[key: string]: string}} */
     this.params_ = (opt_options && opt_options.params) || map();
 
-    /** @protected {?Object<string, string>} */
+    /** @protected {?{[key: string]: string}} */
     this.meta_ = null;
 
-    /** @private @const {!Object<string, string>} */
+    /** @private @const {!{[key: string]: string}} */
     this.declaredExtensions_ = {};
 
     const paramsVisibilityState = this.params_['visibilityState'];
     devAssert(
       !paramsVisibilityState ||
-        isEnumValue(VisibilityState, paramsVisibilityState)
+        isEnumValue(VisibilityState_Enum, paramsVisibilityState)
     );
 
-    /** @private {?VisibilityState} */
+    /** @private {?VisibilityState_Enum} */
     this.visibilityStateOverride_ =
       (opt_options && opt_options.visibilityState) ||
       paramsVisibilityState ||
@@ -270,10 +272,10 @@ export class AmpDoc {
     // Start with `null` to be updated by updateVisibilityState_ in the end
     // of the constructor to ensure the correct "update" logic and promise
     // resolution.
-    /** @private {?VisibilityState} */
+    /** @private {?VisibilityState_Enum} */
     this.visibilityState_ = null;
 
-    /** @private @const {!Observable<!VisibilityState>} */
+    /** @private @const {!Observable<!VisibilityState_Enum>} */
     this.visibilityStateHandlers_ = new Observable();
 
     /** @private {?time} */
@@ -345,7 +347,7 @@ export class AmpDoc {
   /**
    * Initializes (if necessary) cached map of an ampdoc's meta name values to
    * their associated content values and returns the map.
-   * @return {!Object<string, string>}
+   * @return {!{[key: string]: string}}
    */
   getMeta() {
     if (this.meta_) {
@@ -356,7 +358,7 @@ export class AmpDoc {
     const metaEls = dev()
       .assertElement(this.win.document.head)
       .querySelectorAll('meta[name]');
-    iterateCursor(metaEls, (metaEl) => {
+    metaEls.forEach((metaEl) => {
       const name = metaEl.getAttribute('name');
       const content = metaEl.getAttribute('content');
       if (!name || content === null) {
@@ -443,7 +445,7 @@ export class AmpDoc {
    * @restricted
    */
   setExtensionsKnown() {
-    this.signals_.signal(AmpDocSignals.EXTENSIONS_KNOWN);
+    this.signals_.signal(AmpDocSignals_Enum.EXTENSIONS_KNOWN);
   }
 
   /**
@@ -451,7 +453,7 @@ export class AmpDoc {
    * @return {!Promise}
    */
   whenExtensionsKnown() {
-    return this.signals_.whenSignal(AmpDocSignals.EXTENSIONS_KNOWN);
+    return this.signals_.whenSignal(AmpDocSignals_Enum.EXTENSIONS_KNOWN);
   }
 
   /**
@@ -551,7 +553,7 @@ export class AmpDoc {
   }
 
   /**
-   * @param {!VisibilityState} visibilityState
+   * @param {!VisibilityState_Enum} visibilityState
    * @restricted
    */
   overrideVisibilityState(visibilityState) {
@@ -569,9 +571,9 @@ export class AmpDoc {
     );
 
     // Parent visibility: pick the first non-visible state.
-    let parentVisibilityState = VisibilityState.VISIBLE;
+    let parentVisibilityState = VisibilityState_Enum.VISIBLE;
     for (let p = this.parent_; p; p = p.getParent()) {
-      if (p.getVisibilityState() != VisibilityState.VISIBLE) {
+      if (p.getVisibilityState() != VisibilityState_Enum.VISIBLE) {
         parentVisibilityState = p.getVisibilityState();
         break;
       }
@@ -580,52 +582,100 @@ export class AmpDoc {
     // Pick the most restricted visibility state.
     let visibilityState;
     const visibilityStateOverride =
-      this.visibilityStateOverride_ || VisibilityState.VISIBLE;
+      this.visibilityStateOverride_ || VisibilityState_Enum.VISIBLE;
     if (
-      visibilityStateOverride == VisibilityState.VISIBLE &&
-      parentVisibilityState == VisibilityState.VISIBLE &&
-      naturalVisibilityState == VisibilityState.VISIBLE
+      visibilityStateOverride == VisibilityState_Enum.VISIBLE &&
+      parentVisibilityState == VisibilityState_Enum.VISIBLE &&
+      naturalVisibilityState == VisibilityState_Enum.VISIBLE
     ) {
-      visibilityState = VisibilityState.VISIBLE;
+      visibilityState = VisibilityState_Enum.VISIBLE;
     } else if (
-      naturalVisibilityState == VisibilityState.HIDDEN &&
-      visibilityStateOverride == VisibilityState.PAUSED
+      naturalVisibilityState == VisibilityState_Enum.HIDDEN &&
+      visibilityStateOverride == VisibilityState_Enum.PAUSED
     ) {
       // Hidden document state overrides "paused".
       visibilityState = naturalVisibilityState;
     } else if (
-      visibilityStateOverride == VisibilityState.PAUSED ||
-      visibilityStateOverride == VisibilityState.INACTIVE
+      visibilityStateOverride == VisibilityState_Enum.PAUSED ||
+      visibilityStateOverride == VisibilityState_Enum.INACTIVE
     ) {
       visibilityState = visibilityStateOverride;
     } else if (
-      parentVisibilityState == VisibilityState.PAUSED ||
-      parentVisibilityState == VisibilityState.INACTIVE
+      parentVisibilityState == VisibilityState_Enum.PAUSED ||
+      parentVisibilityState == VisibilityState_Enum.INACTIVE
     ) {
       visibilityState = parentVisibilityState;
     } else if (
-      visibilityStateOverride == VisibilityState.PRERENDER ||
-      naturalVisibilityState == VisibilityState.PRERENDER ||
-      parentVisibilityState == VisibilityState.PRERENDER
+      visibilityStateOverride == VisibilityState_Enum.PREVIEW ||
+      naturalVisibilityState == VisibilityState_Enum.PREVIEW ||
+      parentVisibilityState == VisibilityState_Enum.PREVIEW
     ) {
-      visibilityState = VisibilityState.PRERENDER;
+      visibilityState = VisibilityState_Enum.PREVIEW;
+    } else if (
+      visibilityStateOverride == VisibilityState_Enum.PRERENDER ||
+      naturalVisibilityState == VisibilityState_Enum.PRERENDER ||
+      parentVisibilityState == VisibilityState_Enum.PRERENDER
+    ) {
+      visibilityState = VisibilityState_Enum.PRERENDER;
     } else {
-      visibilityState = VisibilityState.HIDDEN;
+      visibilityState = VisibilityState_Enum.HIDDEN;
     }
 
     if (this.visibilityState_ != visibilityState) {
-      this.visibilityState_ = visibilityState;
-      if (visibilityState == VisibilityState.VISIBLE) {
-        this.lastVisibleTime_ = Date.now();
-        this.signals_.signal(AmpDocSignals.FIRST_VISIBLE);
-        this.signals_.signal(AmpDocSignals.NEXT_VISIBLE);
+      if (visibilityState == VisibilityState_Enum.VISIBLE) {
+        const {performance} = this.win;
+        // We use the initial loading time of the document as the base
+        // visibleTime. If we are initialized in visible mode, then this is
+        // accounts for the time that user saw a blank page waiting for JS
+        // execution.
+        let visibleTime = Math.floor(
+          performance.timeOrigin ?? performance.timing.navigationStart
+        );
+        if (this.visibilityState_ != null) {
+          // We're transitioning into visible mode (instead of being
+          // initialized in it). In this case, we want to adjust the
+          // visibleTime to the current timestamp, because the user hasn't
+          // actually been waiting for the page to load. Remember that
+          // performance.now() is relative to the load time of the document, so
+          // the current timestamp is actually load+now.
+          visibleTime += Math.floor(performance.now());
+        }
+        this.lastVisibleTime_ = visibleTime;
+        this.signals_.signal(AmpDocSignals_Enum.FIRST_VISIBLE, visibleTime);
+        this.signals_.signal(AmpDocSignals_Enum.NEXT_VISIBLE, visibleTime);
       } else {
-        this.signals_.reset(AmpDocSignals.NEXT_VISIBLE);
+        this.signals_.reset(AmpDocSignals_Enum.NEXT_VISIBLE);
       }
+
+      if (visibilityState == VisibilityState_Enum.PREVIEW) {
+        this.signals_.signal(AmpDocSignals_Enum.FIRST_PREVIEWED);
+      }
+
+      this.visibilityState_ = visibilityState;
       this.visibilityStateHandlers_.fire();
     }
   }
 
+  /**
+   * Returns a Promise that only ever resolved when the current
+   * AMP document first reaches the `PREVIEW` visibility state.
+   * @return {!Promise}
+   */
+  whenFirstPreviewedOrVisible() {
+    return Promise.race([this.whenFirstPreviewed(), this.whenFirstVisible()]);
+  }
+
+  /**
+   * Returns a Promise that only ever resolved when the current
+   * AMP document first reaches the `PREVIEW` visibility state.
+   * @return {!Promise}
+   */
+  whenFirstPreviewed() {
+    return this.signals_
+      .whenSignal(AmpDocSignals_Enum.FIRST_PREVIEWED)
+      .then(() => undefined);
+  }
+
   /**
    * Returns a Promise that only ever resolved when the current
    * AMP document first becomes visible.
@@ -633,7 +683,7 @@ export class AmpDoc {
    */
   whenFirstVisible() {
     return this.signals_
-      .whenSignal(AmpDocSignals.FIRST_VISIBLE)
+      .whenSignal(AmpDocSignals_Enum.FIRST_VISIBLE)
       .then(() => undefined);
   }
 
@@ -644,7 +694,7 @@ export class AmpDoc {
    */
   whenNextVisible() {
     return this.signals_
-      .whenSignal(AmpDocSignals.NEXT_VISIBLE)
+      .whenSignal(AmpDocSignals_Enum.NEXT_VISIBLE)
       .then(() => undefined);
   }
 
@@ -655,7 +705,7 @@ export class AmpDoc {
    */
   getFirstVisibleTime() {
     return /** @type {?number} */ (
-      this.signals_.get(AmpDocSignals.FIRST_VISIBLE)
+      this.signals_.get(AmpDocSignals_Enum.FIRST_VISIBLE)
     );
   }
 
@@ -671,12 +721,20 @@ export class AmpDoc {
   /**
    * Returns visibility state configured by the viewer.
    * See {@link isVisible}.
-   * @return {!VisibilityState}
+   * @return {!VisibilityState_Enum}
    */
   getVisibilityState() {
     return devAssert(this.visibilityState_);
   }
 
+  /**
+   * Whether the AMP document currently being previewed.
+   * @return {boolean}
+   */
+  isPreview() {
+    return this.visibilityState_ == VisibilityState_Enum.PREVIEW;
+  }
+
   /**
    * Whether the AMP document currently visible. The reasons why it might not
    * be visible include user switching to another tab, browser running the
@@ -685,7 +743,7 @@ export class AmpDoc {
    * @return {boolean}
    */
   isVisible() {
-    return this.visibilityState_ == VisibilityState.VISIBLE;
+    return this.visibilityState_ == VisibilityState_Enum.VISIBLE;
   }
 
   /**
@@ -702,7 +760,7 @@ export class AmpDoc {
    * Adds a "visibilitychange" event listener for viewer events. The
    * callback can check {@link isVisible} and {@link getPrefetchCount}
    * methods for more info.
-   * @param {function(!VisibilityState)} handler
+   * @param {function(!VisibilityState_Enum)} handler
    * @return {!UnlistenDef}
    */
   onVisibilityChanged(handler) {
@@ -904,7 +962,7 @@ export class AmpDocShadow extends AmpDoc {
 
   /** @override */
   getMeta() {
-    return /** @type {!Object<string,string>} */ (map(this.meta_));
+    return /** @type {!{[key: string]: string}} */ (map(this.meta_));
   }
 
   /** @override */
@@ -1008,8 +1066,8 @@ export class AmpDocFie extends AmpDoc {
 
 /**
  * @param {!Window} win
- * @param {!Object<string, string>|undefined} initParams
- * @return {!Object<string, string>}
+ * @param {!{[key: string]: string}|undefined} initParams
+ * @return {!{[key: string]: string}}
  */
 function extractSingleDocParams(win, initParams) {
   const params = map();
@@ -1037,7 +1095,7 @@ function extractSingleDocParams(win, initParams) {
  * initial configuration.
  * @param {!Window} win
  * @param {boolean} isSingleDoc
- * @param {!Object<string, string>=} opt_initParams
+ * @param {!{[key: string]: string}=} opt_initParams
  */
 export function installDocService(win, isSingleDoc, opt_initParams) {
   registerServiceBuilder(win, 'ampdoc', function () {
diff --git a/src/service/batched-xhr-impl.js b/src/service/batched-xhr-impl.js
index 093f7a4c7f3c..660a7aa3c3ff 100644
--- a/src/service/batched-xhr-impl.js
+++ b/src/service/batched-xhr-impl.js
@@ -18,7 +18,7 @@ export class BatchedXhr extends Xhr {
   constructor(win) {
     super(win);
 
-    /** @const {!Object<!Promise<!Response>>} */
+    /** @const {!{[key: string]: !Promise<!Response>}} */
     this.fetchPromises_ = map();
   }
 
diff --git a/src/service/cache-cid-api.js b/src/service/cache-cid-api.js
index 7c6075303c56..43ec00f10156 100644
--- a/src/service/cache-cid-api.js
+++ b/src/service/cache-cid-api.js
@@ -1,5 +1,3 @@
-import {dict} from '#core/types/object';
-
 import {Services} from '#service';
 
 import {dev} from '#utils/log';
@@ -84,9 +82,9 @@ export class CacheCidApi {
    * @return {!Promise<?string>}
    */
   fetchCid_(url, useAlternate = true) {
-    const payload = dict({
+    const payload = {
       'publisherOrigin': getSourceOrigin(this.ampdoc_.win.location),
-    });
+    };
 
     // Make the XHR request to the cache endpoint.
     const timeoutMessage = 'fetchCidTimeout';
diff --git a/src/service/cid-api.js b/src/service/cid-api.js
index dd21554a851a..0dc44a4c1e82 100644
--- a/src/service/cid-api.js
+++ b/src/service/cid-api.js
@@ -1,4 +1,3 @@
-import {dict} from '#core/types/object';
 import {WindowInterface} from '#core/window/interface';
 
 import {Services} from '#service';
@@ -15,7 +14,7 @@ const TAG = 'GoogleCidApi';
 const AMP_TOKEN = 'AMP_TOKEN';
 
 /** @enum {string} */
-export const TokenStatus = {
+export const TokenStatus_Enum = {
   RETRIEVING: '$RETRIEVING',
   OPT_OUT: '$OPT_OUT',
   NOT_FOUND: '$NOT_FOUND',
@@ -43,7 +42,7 @@ export class GoogleCidApi {
     this.timer_ = Services.timerFor(this.win_);
 
     /**
-     * @private {!Object<string, !Promise<?string>>}
+     * @private {!{[key: string]: !Promise<?string>}}
      */
     this.cidPromise_ = {};
 
@@ -70,16 +69,16 @@ export class GoogleCidApi {
     return (this.cidPromise_[scope] = this.timer_
       .poll(200, () => {
         token = getCookie(this.win_, AMP_TOKEN);
-        return token !== TokenStatus.RETRIEVING;
+        return token !== TokenStatus_Enum.RETRIEVING;
       })
       .then(() => {
-        if (token === TokenStatus.OPT_OUT) {
-          return TokenStatus.OPT_OUT;
+        if (token === TokenStatus_Enum.OPT_OUT) {
+          return TokenStatus_Enum.OPT_OUT;
         }
         // If the page referrer is proxy origin, we force to use API even the
         // token indicates a previous fetch returned nothing
         const forceFetch =
-          token === TokenStatus.NOT_FOUND && this.isReferrerProxyOrigin_();
+          token === TokenStatus_Enum.NOT_FOUND && this.isReferrerProxyOrigin_();
 
         // Token is in a special state, fallback to existing cookie
         if (!forceFetch && this.isStatusToken_(token)) {
@@ -87,7 +86,7 @@ export class GoogleCidApi {
         }
 
         if (!token || this.isStatusToken_(token)) {
-          this.persistToken_(TokenStatus.RETRIEVING, TIMEOUT);
+          this.persistToken_(TokenStatus_Enum.RETRIEVING, TIMEOUT);
         }
 
         const url = GOOGLE_API_URL + apiKey;
@@ -108,7 +107,7 @@ export class GoogleCidApi {
             return cid;
           })
           .catch((e) => {
-            this.persistToken_(TokenStatus.ERROR, TIMEOUT);
+            this.persistToken_(TokenStatus_Enum.ERROR, TIMEOUT);
             if (e && e.response) {
               e.response.json().then((res) => {
                 dev().error(TAG, JSON.stringify(res));
@@ -128,10 +127,10 @@ export class GoogleCidApi {
    * @return {!Promise<!JsonObject>}
    */
   fetchCid_(url, scope, token) {
-    const payload = dict({
+    const payload = {
       'originScope': scope,
       'canonicalOrigin': this.canonicalOrigin_,
-    });
+    };
     if (token) {
       payload['securityToken'] = token;
     }
@@ -155,8 +154,8 @@ export class GoogleCidApi {
    */
   handleResponse_(res) {
     if (res['optOut']) {
-      this.persistToken_(TokenStatus.OPT_OUT, YEAR);
-      return TokenStatus.OPT_OUT;
+      this.persistToken_(TokenStatus_Enum.OPT_OUT, YEAR);
+      return TokenStatus_Enum.OPT_OUT;
     }
     if (res['clientId']) {
       this.persistToken_(res['securityToken'], YEAR);
@@ -165,7 +164,7 @@ export class GoogleCidApi {
     if (res['alternateUrl']) {
       return null;
     }
-    this.persistToken_(TokenStatus.NOT_FOUND, HOUR);
+    this.persistToken_(TokenStatus_Enum.NOT_FOUND, HOUR);
     return null;
   }
 
diff --git a/src/service/cid-impl.js b/src/service/cid-impl.js
index 490fcf7d515a..fa13e95a2873 100644
--- a/src/service/cid-impl.js
+++ b/src/service/cid-impl.js
@@ -9,19 +9,16 @@
 import {tryResolve} from '#core/data-structures/promise';
 import {isIframed} from '#core/dom';
 import {rethrowAsync} from '#core/error';
-import {dict} from '#core/types/object';
 import {parseJson, tryParseJson} from '#core/types/object/json';
 import {base64UrlEncodeFromBytes} from '#core/types/string/base64';
 import {getCryptoRandomBytesArray} from '#core/types/string/bytes';
 
-import {isExperimentOn} from '#experiments';
-
 import {Services} from '#service';
 
 import {dev, user, userAssert} from '#utils/log';
 
 import {CacheCidApi} from './cache-cid-api';
-import {GoogleCidApi, TokenStatus} from './cid-api';
+import {GoogleCidApi, TokenStatus_Enum} from './cid-api';
 import {ViewerCidApi} from './viewer-cid-api';
 
 import {getCookie, setCookie} from '../cookies';
@@ -60,7 +57,7 @@ const GOOGLE_CID_API_META_NAME = 'amp-google-client-id-api';
 
 /**
  * The mapping from analytics providers to CID scopes.
- * @const @private {Object<string, string>}
+ * @const @private {{[key: string]: string}}
  */
 const CID_API_SCOPE_ALLOWLIST = {
   'googleanalytics': 'AMP_ECID_GOOGLE',
@@ -68,7 +65,7 @@ const CID_API_SCOPE_ALLOWLIST = {
 
 /**
  * The mapping from analytics providers to their CID API service keys.
- * @const @private {Object<string, string>}
+ * @const @private {{[key: string]: string}}
  */
 const API_KEYS = {
   'googleanalytics': 'AIzaSyA65lEHUEizIsNtlbNo-l2K18dT680nsaM',
@@ -153,7 +150,7 @@ class Cid {
     /**
      * Cache to store external cids. Scope is used as the key and cookie value
      * is the value.
-     * @private {!Object<string, !Promise<string>>}
+     * @private {!{[key: string]: !Promise<string>}}
      * @restricted
      */
     this.externalCidCache_ = Object.create(null);
@@ -170,11 +167,8 @@ class Cid {
 
     this.cidApi_ = new GoogleCidApi(ampdoc);
 
-    /** @private {?Object<string, string>} */
+    /** @private {?{[key: string]: string}} */
     this.apiKeyMap_ = null;
-
-    /** @const {boolean} */
-    this.isBackupCidExpOn = isExperimentOn(this.ampdoc.win, 'amp-cid-backup');
   }
 
   /** @override */
@@ -237,7 +231,7 @@ class Cid {
       const apiKey = this.isScopeOptedIn_(scope);
       if (apiKey) {
         return this.cidApi_.getScopedCid(apiKey, scope).then((scopedCid) => {
-          if (scopedCid == TokenStatus.OPT_OUT) {
+          if (scopedCid == TokenStatus_Enum.OPT_OUT) {
             return null;
           }
           if (scopedCid) {
@@ -301,7 +295,7 @@ class Cid {
   /**
    * Reads meta tags for opted in scopes.  Meta tags will have the form
    * <meta name="provider-api-name" content="provider-name">
-   * @return {!Object<string, string>}
+   * @return {!{[key: string]: string}}
    */
   getOptedInScopes_() {
     const apiKeyMap = {};
@@ -344,7 +338,7 @@ export function optOutOfCid(ampdoc) {
   // Tell the viewer that user has opted out.
   Services.viewerForDoc(ampdoc)./*OK*/ sendMessage(
     CID_OPTOUT_VIEWER_MESSAGE,
-    dict()
+    {}
   );
 
   // Store the optout bit in storage
@@ -416,7 +410,7 @@ function getStorageKey(cookieName) {
  * @return {!Promise<?string>}
  */
 function maybeGetCidFromCookieOrBackup(cid, getCidStruct) {
-  const {ampdoc, isBackupCidExpOn} = cid;
+  const {ampdoc} = cid;
   const {win} = ampdoc;
   const {disableBackup, scope} = getCidStruct;
   const cookieName = getCidStruct.cookieName || scope;
@@ -425,7 +419,7 @@ function maybeGetCidFromCookieOrBackup(cid, getCidStruct) {
   if (existingCookie) {
     return Promise.resolve(existingCookie);
   }
-  if (isBackupCidExpOn && !disableBackup) {
+  if (!disableBackup) {
     return Services.storageForDoc(ampdoc)
       .then((storage) => {
         const key = getStorageKey(cookieName);
@@ -450,7 +444,7 @@ function maybeGetCidFromCookieOrBackup(cid, getCidStruct) {
  * @return {!Promise<?string>}
  */
 function getOrCreateCookie(cid, getCidStruct, persistenceConsent) {
-  const {ampdoc, isBackupCidExpOn} = cid;
+  const {ampdoc} = cid;
   const {win} = ampdoc;
   const {disableBackup, scope} = getCidStruct;
   const cookieName = getCidStruct.cookieName || scope;
@@ -465,7 +459,7 @@ function getOrCreateCookie(cid, getCidStruct, persistenceConsent) {
         // If we created the cookie, update it's expiration time.
         if (/^amp-/.test(existingCookie)) {
           setCidCookie(win, cookieName, existingCookie);
-          if (isBackupCidExpOn && !disableBackup) {
+          if (!disableBackup) {
             setCidBackup(ampdoc, cookieName, existingCookie);
           }
         }
@@ -491,7 +485,7 @@ function getOrCreateCookie(cid, getCidStruct, persistenceConsent) {
         const relookup = getCookie(win, cookieName);
         if (!relookup) {
           setCidCookie(win, cookieName, newCookie);
-          if (isBackupCidExpOn && !disableBackup) {
+          if (!disableBackup) {
             setCidBackup(ampdoc, cookieName, newCookie);
           }
         }
@@ -603,12 +597,10 @@ export function viewerBaseCid(ampdoc, opt_data) {
       if (data && !tryParseJson(data)) {
         // TODO(lannka, #11060): clean up when all Viewers get migrated
         dev().expectedError('CID', 'invalid cid format');
-        return JSON.stringify(
-          dict({
-            'time': Date.now(), // CID returned from old API is always fresh
-            'cid': data,
-          })
-        );
+        return JSON.stringify({
+          'time': Date.now(), // CID returned from old API is always fresh
+          'cid': data,
+        });
       }
       return data;
     });
@@ -622,12 +614,10 @@ export function viewerBaseCid(ampdoc, opt_data) {
  * @return {string}
  */
 function createCidData(cidString) {
-  return JSON.stringify(
-    dict({
-      'time': Date.now(),
-      'cid': cidString,
-    })
-  );
+  return JSON.stringify({
+    'time': Date.now(),
+    'cid': cidString,
+  });
 }
 
 /**
diff --git a/src/service/custom-element-registry.js b/src/service/custom-element-registry.js
index 8a4e8b2ed2ab..f02dd717a724 100644
--- a/src/service/custom-element-registry.js
+++ b/src/service/custom-element-registry.js
@@ -17,7 +17,7 @@ const docInitializedMap = new WeakMap();
 
 /**
  * @param {!Window} win
- * @return {!Object<string, typeof ../base-element.BaseElement>}
+ * @return {!{[key: string]: typeof ../base-element.BaseElement}}
  */
 function getExtendedElements(win) {
   if (!win.__AMP_EXTENDED_ELEMENTS) {
diff --git a/src/service/document-info-impl.js b/src/service/document-info-impl.js
index 16b6f4a39fb1..700478f2880a 100644
--- a/src/service/document-info-impl.js
+++ b/src/service/document-info-impl.js
@@ -29,9 +29,9 @@ const filteredLinkRels = ['prefetch', 'preload', 'preconnect', 'dns-prefetch'];
  *   canonicalUrl: string,
  *   pageViewId: string,
  *   pageViewId64: !Promise<string>,
- *   linkRels: !Object<string, string|!Array<string>>,
+ *   linkRels: !{[key: string]: string|!Array<string>},
  *   viewport: ?string,
- *   replaceParams: ?Object<string, string|!Array<string>>
+ *   replaceParams: ?{[key: string]: string|!Array<string>}
  * }}
  */
 export let DocumentInfoDef;
diff --git a/src/service/extension-script.js b/src/service/extension-script.js
index 325a135d6688..4eceece3dd8b 100644
--- a/src/service/extension-script.js
+++ b/src/service/extension-script.js
@@ -1,11 +1,15 @@
+import {propagateNonce} from '#core/dom';
 import * as mode from '#core/mode';
 
-import {urls} from '../config';
+import * as urls from '../config/urls';
 import {getMode} from '../mode';
 
 const CUSTOM_TEMPLATES = ['amp-mustache'];
 const LATEST_VERSION = 'latest';
 
+const regexURL = /^https:\/\/([a-zA-Z0-9_-]+\.)?cdn\.ampproject\.org(\/.*)?$/;
+const testRegexURL = /^([a-zA-Z0-9_-]+\.)?localhost$/;
+
 /**
  * Calculate the base url for any scripts.
  * @param {!Location} location The window's location
@@ -48,6 +52,25 @@ export function calculateExtensionScriptUrl(
   return `${base}/rtv/${rtv}/v0/${extensionId}${extensionVersion}${fileExtension}`;
 }
 
+/**
+ * Calculate url for a file in the v0/ extension directory.
+ * @param {!Window} win The window
+ * @param {!Location} location The window's location
+ * @param {string} filename
+ * @param {boolean=} opt_isLocalDev
+ * @return {string}
+ */
+export function calculateExtensionFileUrl(
+  win,
+  location,
+  filename,
+  opt_isLocalDev
+) {
+  const base = calculateScriptBaseUrl(location, opt_isLocalDev);
+  const rtv = getMode(win).rtvVersion;
+  return `${base}/rtv/${rtv}/v0/${filename}`;
+}
+
 /**
  * Calculate script url for an entry point.
  * If `opt_rtv` is true, returns the URL matching the current RTV.
@@ -85,7 +108,7 @@ export function parseExtensionUrl(scriptUrl) {
   }
   // Note that the "(\.max)?" group only applies to local dev.
   const matches = scriptUrl.match(
-    /^(.*)\/(.*)-([0-9.]+|latest)(\.max)?\.(?:js|mjs)$/i
+    /^(.*)\/(.*)-([0-9.]+|latest)(\.max)?\.(?:js|mjs)(?:\?ssr-css=[0|1])?$/i
   );
   const extensionId = matches ? matches[2] : undefined;
   const extensionVersion = matches ? matches[3] : undefined;
@@ -120,12 +143,7 @@ export function createExtensionScript(win, extensionId, version) {
   if (mode.isEsm()) {
     scriptElement.setAttribute('type', 'module');
   }
-
-  // Propagate nonce to all generated script tags.
-  const currentScript = win.document.head.querySelector('script[nonce]');
-  if (currentScript) {
-    scriptElement.setAttribute('nonce', currentScript.getAttribute('nonce'));
-  }
+  propagateNonce(win.document, scriptElement);
 
   // Allow error information to be collected
   // https://github.com/ampproject/amphtml/issues/7353
@@ -140,7 +158,31 @@ export function createExtensionScript(win, extensionId, version) {
     version,
     getMode(win).localDev
   );
-  scriptElement.src = scriptSrc;
+
+  let policy = {
+    createScriptURL: function (url) {
+      // Only allow trusted URLs
+      if (
+        regexURL.test(url) ||
+        ((getMode().test || getMode().localDev) &&
+          testRegexURL.test(new URL(url).hostname)) ||
+        new URL(url).host === 'fonts.googleapis.com'
+      ) {
+        return url;
+      } else {
+        return '';
+      }
+    },
+  };
+
+  if (self.trustedTypes && self.trustedTypes.createPolicy) {
+    policy = self.trustedTypes.createPolicy(
+      'extension-script#createExtensionScript',
+      policy
+    );
+  }
+
+  scriptElement.src = policy.createScriptURL(scriptSrc);
   return scriptElement;
 }
 
diff --git a/src/service/extensions-impl.js b/src/service/extensions-impl.js
index 7eaed9a3a067..049e79272dd0 100644
--- a/src/service/extensions-impl.js
+++ b/src/service/extensions-impl.js
@@ -51,8 +51,8 @@ let ExtensionServiceDef;
  * The structure that contains the resources declared by an extension.
  *
  * @typedef {{
- *   elements: !Object<string, !ExtensionElementDef>,
- *   services: !Object<string, !ExtensionServiceDef>,
+ *   elements: !{[key: string]: !ExtensionElementDef},
+ *   services: !{[key: string]: !ExtensionServiceDef},
  * }}
  */
 let ExtensionDef;
@@ -101,7 +101,7 @@ export class Extensions {
     /** @const @private */
     this.ampdocService_ = Services.ampdocServiceFor(win);
 
-    /** @private @const {!Object<string, !ExtensionHolderDef>} */
+    /** @private @const {!{[key: string]: !ExtensionHolderDef}} */
     this.extensions_ = {};
 
     /** @private {?string} */
diff --git a/src/service/history-impl.js b/src/service/history-impl.js
index ebf66b044e09..390a685fa56f 100644
--- a/src/service/history-impl.js
+++ b/src/service/history-impl.js
@@ -1,5 +1,5 @@
 import {Deferred, tryResolve} from '#core/data-structures/promise';
-import {dict, map} from '#core/types/object';
+import {map} from '#core/types/object';
 import {getHistoryState} from '#core/window/history';
 
 import {Services} from '#service';
@@ -413,22 +413,30 @@ export class HistoryBindingNatural_ {
         history.originalReplaceState || history.replaceState.bind(history);
       pushState = (state, opt_title, opt_url) => {
         this.unsupportedState_ = state;
-        this.origPushState_(
-          state,
-          opt_title,
-          // A bug in edge causes paths to become undefined if URL is
-          // undefined, filed here: https://goo.gl/KlImZu
-          opt_url || null
-        );
+        try {
+          this.origPushState_(
+            state,
+            opt_title,
+            // A bug in edge causes paths to become undefined if URL is
+            // undefined, filed here: https://goo.gl/KlImZu
+            opt_url || null
+          );
+        } catch (e) {
+          dev().error(TAG_, 'pushState failed: ' + e.message);
+        }
       };
       replaceState = (state, opt_title, opt_url) => {
         this.unsupportedState_ = state;
         // NOTE: check for `undefined` since IE11 and Edge
         // unexpectedly coerces it into a `string`.
-        if (opt_url !== undefined) {
-          this.origReplaceState_(state, opt_title, opt_url);
-        } else {
-          this.origReplaceState_(state, opt_title);
+        try {
+          if (opt_url !== undefined) {
+            this.origReplaceState_(state, opt_title, opt_url);
+          } else {
+            this.origReplaceState_(state, opt_title);
+          }
+        } catch (e) {
+          dev().error(TAG_, 'replaceState failed: ' + e.message);
         }
       };
       if (!history.originalPushState) {
@@ -947,16 +955,14 @@ export class HistoryBindingVirtual_ {
     if (stackIndex > this.stackIndex_) {
       return this.get();
     }
-    const message = dict({'stackIndex': this.stackIndex_});
+    const message = {'stackIndex': this.stackIndex_};
     const pop = 'popHistory';
     return this.viewer_
       .sendMessageAwaitResponse(pop, message)
       .then((response) => {
-        const fallbackState = /** @type {!HistoryStateDef} */ (
-          dict({
-            'stackIndex': this.stackIndex_ - 1,
-          })
-        );
+        const fallbackState = /** @type {!HistoryStateDef} */ ({
+          'stackIndex': this.stackIndex_ - 1,
+        });
         const newState = this.toHistoryState_(response, fallbackState, pop);
         this.updateHistoryState_(newState);
         return newState;
@@ -976,11 +982,9 @@ export class HistoryBindingVirtual_ {
       if (!this.viewer_.hasCapability('fullReplaceHistory')) {
         // Full URL replacement requested, but not supported by the viewer.
         // Don't update, and return the current state.
-        const curState = /** @type {!HistoryStateDef} */ (
-          dict({
-            'stackIndex': this.stackIndex_,
-          })
-        );
+        const curState = /** @type {!HistoryStateDef} */ ({
+          'stackIndex': this.stackIndex_,
+        });
         return Promise.resolve(curState);
       }
 
@@ -1098,12 +1102,10 @@ export class HistoryBindingVirtual_ {
     if (!this.viewer_.hasCapability('fragment')) {
       return Promise.resolve();
     }
-    return /** @type {!Promise} */ (
-      this.viewer_.sendMessageAwaitResponse(
-        'replaceHistory',
-        dict({'fragment': fragment}),
-        /* cancelUnsent */ true
-      )
+    return /** @type {!Promise} */ this.viewer_.sendMessageAwaitResponse(
+      'replaceHistory',
+      {'fragment': fragment},
+      /* cancelUnsent */ true
     );
   }
 }
diff --git a/src/service/index.js b/src/service/index.js
index 968e2cc3f280..ca831dc4f803 100644
--- a/src/service/index.js
+++ b/src/service/index.js
@@ -1,3 +1,8 @@
+// This lint rule must be enabled on this file only.
+// It checks that all Services properties are arrow function expressions.
+// This allows unused getters to be stripped out from the bundle.
+/* eslint local/service-getters: 2 */
+
 import {
   getElementServiceForDoc,
   getElementServiceIfAvailable,
@@ -492,29 +497,6 @@ export const Services = {
     );
   },
 
-  /**
-   * Get promise with story request service
-   * @param {!Window} win
-   * @return {?Promise<?../extensions/amp-story/1.0/amp-story-request-service.AmpStoryRequestService>}
-   */
-  storyRequestServiceForOrNull: (win) => {
-    return (
-      /** @type {!Promise<?../extensions/amp-story/1.0/amp-story-request-service.AmpStoryRequestService>} */
-      (getElementServiceIfAvailable(win, 'story-request', 'amp-story', '1.0'))
-    );
-  },
-
-  /**
-   * @param {!Window} win
-   * @return {?../extensions/amp-story/1.0/amp-story-request-service.AmpStoryRequestService}
-   */
-  storyRequestService: (win) => {
-    return (
-      /** @type {?../extensions/amp-story/1.0/amp-story-request-service.AmpStoryRequestService} */
-      (getExistingServiceOrNull(win, 'story-request'))
-    );
-  },
-
   /**
    * @param {!Window} win
    * @return {?../extensions/amp-story/1.0/media-performance-metrics-service.MediaPerformanceMetricsService}
@@ -530,7 +512,7 @@ export const Services = {
    * @param {!Element} el
    * @return {!Promise<./service/localization.LocalizationService>}
    */
-  localizationServiceForOrNull(el) {
+  localizationServiceForOrNull: (el) => {
     return /** @type {!Promise<?./service/localization.LocalizationService>} */ (
       getServicePromiseForDoc(el, 'localization')
     );
diff --git a/src/service/localization/index.js b/src/service/localization/index.js
index ab05fb89b115..44a7c4379fff 100644
--- a/src/service/localization/index.js
+++ b/src/service/localization/index.js
@@ -1,14 +1,15 @@
+import {Observable} from '#core/data-structures/observable';
 import {closest} from '#core/dom/query';
 
 import {Services} from '#service';
 
 import {
   LocalizedStringBundleDef,
-  // The LocalizedStringId type is imported even though it is not used because
+  // The LocalizedStringId_Enum type is imported even though it is not used because
   // the compiler does not output types for enums, but we want to distinguish
-  // between LocalizedStringId enum values and any other strings.
-  // eslint-disable-next-line no-unused-vars
-  LocalizedStringId,
+  // between LocalizedStringId_Enum enum values and any other strings.
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  LocalizedStringId_Enum,
 } from './strings';
 
 /**
@@ -25,9 +26,9 @@ const LANGUAGE_CODE_CHUNK_REGEX = /\w+/gi;
 /**
  * Gets the string matching the specified localized string ID in the language
  * specified.
- * @param {!Object<string, !LocalizedStringBundleDef>} localizedStringBundles
+ * @param {!{[key: string]: !LocalizedStringBundleDef}} localizedStringBundles
  * @param {!Array<string>} languageCodes
- * @param {!LocalizedStringId} localizedStringId
+ * @param {!LocalizedStringId_Enum} localizedStringId
  * @return {?string}
  */
 function findLocalizedString(
@@ -86,17 +87,21 @@ export class LocalizationService {
 
     /**
      * A mapping of language code to localized string bundle.
-     * @private @const {!Object<string, !LocalizedStringBundleDef>}
+     * @private @const {!{[key: string]: !LocalizedStringBundleDef}}
      */
     this.localizedStringBundles_ = {};
+
+    /** Fires when new language bundles are added.
+     * @private @const {!Observable<string>}
+     * */
+    this.bundleObserver_ = new Observable();
   }
 
   /**
    * @param {!Element} element
    * @return {!Array<string>}
-   * @private
    */
-  getLanguageCodesForElement_(element) {
+  getLanguageCodesForElement(element) {
     const languageEl = closest(element, (el) => el.hasAttribute('lang'));
     const languageCode = languageEl ? languageEl.getAttribute('lang') : null;
     const languageCodesToUse = getLanguageCodesFromString(languageCode || '');
@@ -109,27 +114,29 @@ export class LocalizationService {
   }
 
   /**
-   * @param {string} languageCode The language code to associate with the
-   *     specified localized string bundle.
-   * @param {!LocalizedStringBundleDef} localizedStringBundle
+   * @param {!{[key: string]: !LocalizedStringBundleDef}} localizedStringBundles
    *     The localized string bundle to register.
-   * @return {!LocalizationService} For chaining.
+   * @public
    */
-  registerLocalizedStringBundle(languageCode, localizedStringBundle) {
-    const normalizedLangCode = languageCode.toLowerCase();
-    if (!this.localizedStringBundles_[normalizedLangCode]) {
-      this.localizedStringBundles_[normalizedLangCode] = {};
-    }
-
-    Object.assign(
-      this.localizedStringBundles_[normalizedLangCode],
-      localizedStringBundle
-    );
-    return this;
+  registerLocalizedStringBundles(localizedStringBundles) {
+    Object.keys(localizedStringBundles).forEach((languageCode) => {
+      const normalizedLangCode = languageCode.toLowerCase();
+      if (!this.localizedStringBundles_[normalizedLangCode]) {
+        this.localizedStringBundles_[normalizedLangCode] = {};
+      }
+      Object.assign(
+        this.localizedStringBundles_[normalizedLangCode],
+        localizedStringBundles[languageCode]
+      );
+    });
+
+    this.bundleObserver_.fire();
   }
 
   /**
-   * @param {!LocalizedStringId} localizedStringId
+   * Retrieves the localized string synchronously, useful for strings bundled with a given extension.
+   *
+   * @param {!LocalizedStringId_Enum} localizedStringId
    * @param {!Element=} elementToUse The element where the string will be
    *     used.  The language is based on the language at that part of the
    *     document.  If unspecified, will use the document-level language, if
@@ -137,7 +144,7 @@ export class LocalizationService {
    * @return {?string}
    */
   getLocalizedString(localizedStringId, elementToUse = this.element_) {
-    const languageCodes = this.getLanguageCodesForElement_(elementToUse);
+    const languageCodes = this.getLanguageCodesForElement(elementToUse);
 
     return findLocalizedString(
       this.localizedStringBundles_,
@@ -145,4 +152,36 @@ export class LocalizationService {
       localizedStringId
     );
   }
+
+  /**
+   * Resolves with the localized string when the registered bundles contain them.
+   * @param {!LocalizedStringId_Enum} localizedStringId
+   * @return {!Promise{?string}}
+   * @public
+   */
+  getLocalizedStringAsync(localizedStringId) {
+    const languageCodes = this.getLanguageCodesForElement(this.element_);
+
+    const localizedString = findLocalizedString(
+      this.localizedStringBundles_,
+      languageCodes,
+      localizedStringId
+    );
+    if (localizedString !== null) {
+      return Promise.resolve(localizedString);
+    }
+    return new Promise((res) => {
+      const remove = this.bundleObserver_.add(() => {
+        const localizedString = findLocalizedString(
+          this.localizedStringBundles_,
+          languageCodes,
+          localizedStringId
+        );
+        if (localizedString) {
+          remove();
+          res(localizedString);
+        }
+      });
+    });
+  }
 }
diff --git a/src/service/localization/strings.js b/src/service/localization/strings.js
index b151416f8e9e..19566105d05a 100644
--- a/src/service/localization/strings.js
+++ b/src/service/localization/strings.js
@@ -9,18 +9,15 @@ import {parseJson} from '#core/types/object/json';
  *   - NOT be reused; to deprecate an ID, comment it out and prefix its key with
  *     the string "DEPRECATED_"
  *
- * Next ID: 101
+ * Next ID: 113
  *
  * @const @enum {string}
  */
-export const LocalizedStringId = {
+export const LocalizedStringId_Enum = {
   // amp-story
   AMP_STORY_ACTIVATE_BUTTON_TEXT: '83',
   AMP_STORY_AUDIO_MUTE_BUTTON_LABEL: '66',
-  AMP_STORY_AUDIO_MUTE_BUTTON_TEXT: '31',
   AMP_STORY_AUDIO_UNMUTE_BUTTON_LABEL: '67',
-  AMP_STORY_AUDIO_UNMUTE_NO_SOUND_TEXT: '33',
-  AMP_STORY_AUDIO_UNMUTE_SOUND_TEXT: '32',
   AMP_STORY_CLOSE_BUTTON_LABEL: '87',
   AMP_STORY_CONSENT_ACCEPT_BUTTON_LABEL: '22',
   AMP_STORY_CONSENT_DECLINE_BUTTON_LABEL: '23',
@@ -45,38 +42,29 @@ export const LocalizedStringId = {
   AMP_STORY_NEXT_STORY: '90',
   AMP_STORY_OPEN_OUTLINK_TEXT: '97',
   AMP_STORY_PAGE_ATTACHMENT_OPEN_LABEL: '35',
-  AMP_STORY_PAGINATION_BUTTON_PREVIOUS_PAGE_LABEL: '82',
   AMP_STORY_PAGE_ERROR_VIDEO: '65',
   AMP_STORY_PAGE_PLAY_VIDEO: '34',
   AMP_STORY_PAUSE_BUTTON_LABEL: '85',
   AMP_STORY_PLAY_BUTTON_LABEL: '86',
+  AMP_STORY_CAPTIONS_ON_LABEL: '111',
+  AMP_STORY_CAPTIONS_OFF_LABEL: '112',
   AMP_STORY_PREVIOUS_PAGE: '93',
-  AMP_STORY_READ_MORE: '100',
+  AMP_STORY_READ_MORE_LABEL: '106',
   AMP_STORY_REPLAY: '92',
   AMP_STORY_SHARE_BUTTON_LABEL: '69',
   AMP_STORY_SHARING_CLIPBOARD_FAILURE_TEXT: '4',
   AMP_STORY_SHARING_CLIPBOARD_SUCCESS_TEXT: '5',
-  AMP_STORY_SHARING_PAGE_LABEL: '62',
   AMP_STORY_SHARING_PROVIDER_NAME_EMAIL: '6',
   AMP_STORY_SHARING_PROVIDER_NAME_FACEBOOK: '7',
-  AMP_STORY_SHARING_PROVIDER_NAME_GOOGLE_PLUS: '8',
   AMP_STORY_SHARING_PROVIDER_NAME_LINE: '63',
   AMP_STORY_SHARING_PROVIDER_NAME_LINK: '9',
   AMP_STORY_SHARING_PROVIDER_NAME_LINKEDIN: '10',
   AMP_STORY_SHARING_PROVIDER_NAME_PINTEREST: '11',
   AMP_STORY_SHARING_PROVIDER_NAME_SMS: '12',
-  AMP_STORY_SHARING_PROVIDER_NAME_SYSTEM: '13',
   AMP_STORY_SHARING_PROVIDER_NAME_TUMBLR: '14',
   AMP_STORY_SHARING_PROVIDER_NAME_TWITTER: '15',
   AMP_STORY_SHARING_PROVIDER_NAME_WHATSAPP: '16',
-  AMP_STORY_SIDEBAR_BUTTON_LABEL: '70',
   AMP_STORY_SKIP_TO_NEXT_BUTTON_LABEL: '88',
-  AMP_STORY_TOOLTIP_EXPAND_TWEET: '36',
-  AMP_STORY_WARNING_DESKTOP_HEIGHT_SIZE_TEXT: '37',
-  AMP_STORY_WARNING_DESKTOP_SIZE_TEXT: '18',
-  AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT: '38',
-  AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT: '19',
-  AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT: '20',
   AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT: '21',
 
   // amp-story-auto-ads
@@ -112,10 +100,39 @@ export const LocalizedStringId = {
   AMP_STORY_INTERACTIVE_QUIZ_ANSWER_CHOICE_C: '73',
   AMP_STORY_INTERACTIVE_QUIZ_ANSWER_CHOICE_D: '74',
 
+  // amp-story-shopping
+  AMP_STORY_SHOPPING_CTA_LABEL: '101',
+  AMP_STORY_SHOPPING_PLP_HEADER: '102',
+  AMP_STORY_SHOPPING_ATTACHMENT_CTA_LABEL: '103',
+  // DEPRECATED_AMP_STORY_SHOPPING_ATTACHMENT_REVIEWS_LABEL: '104',
+  AMP_STORY_SHOPPING_ATTACHMENT_DETAILS: '105',
+
+  // amp-story-subscriptions
+  AMP_STORY_SUBSCRIPTIONS_SUBSCRIBER_QUESTION: '107',
+  AMP_STORY_SUBSCRIPTIONS_SIGN_IN: '108',
+  AMP_STORY_SUBSCRIPTIONS_CTA: '109',
+  AMP_STORY_SUBSCRIPTIONS_SWG: '110',
+  AMP_STORY_SUBSCRIPTIONS_SKIP: '113',
+
   // DEPRECATED_AMP_STORY_EXPERIMENT_ENABLE_BUTTON_LABEL: '0',
   // DEPRECATED_AMP_STORY_EXPERIMENT_ENABLED_TEXT: '1',
   // DEPRECATED_AMP_STORY_CONSENT_DISMISS_DIALOG_BUTTON_LABEL: '24',
   // DEPRECATED_AMP_STORY_SYSTEM_LAYER_SHARE_WIDGET_LABEL: '17',
+  // DEPRECATED_AMP_STORY_SHARING_PROVIDER_NAME_GOOGLE_PLUS: '8',
+  // DEPRECATED_AMP_STORY_AUDIO_MUTE_BUTTON_TEXT: '31',
+  // DEPRECATED_AMP_STORY_AUDIO_UNMUTE_SOUND_TEXT: '32',
+  // DEPRECATED_AMP_STORY_AUDIO_UNMUTE_NO_SOUND_TEXT: '33',
+  // DEPRECATED_AMP_STORY_PAGINATION_BUTTON_PREVIOUS_PAGE_LABEL: '82',
+  // DEPRECATED_AMP_STORY_READ_MORE: '100',
+  // DEPRECATED_AMP_STORY_SHARING_PAGE_LABEL: '62',
+  // DEPRECATED_AMP_STORY_SHARING_PROVIDER_NAME_SYSTEM: '13',
+  // DEPRECATED_AMP_STORY_TOOLTIP_EXPAND_TWEET: '36',
+  // DEPRECATED_AMP_STORY_WARNING_DESKTOP_HEIGHT_SIZE_TEXT: '37',
+  // DEPRECATED_AMP_STORY_WARNING_DESKTOP_SIZE_TEXT: '18',
+  // DEPRECATED_AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT: '38',
+  // DEPRECATED_AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT: '19',
+  // DEPRECATED_AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT: '20',
+  // DEPRECATED_AMP_STORY_SIDEBAR_BUTTON_LABEL: '70',
 };
 
 /**
@@ -127,7 +144,7 @@ export const LocalizedStringId = {
 export let LocalizedStringDef;
 
 /**
- * @typedef {!Object<!LocalizedStringId, !LocalizedStringDef>}
+ * @typedef {!{[key: !LocalizedStringId_Enum]: !LocalizedStringDef}}
  */
 export let LocalizedStringBundleDef;
 
@@ -160,7 +177,7 @@ export function createPseudoLocale(localizedStringBundle, localizationFn) {
   );
 
   Object.keys(pseudoLocaleStringBundle).forEach((localizedStringIdAsStr) => {
-    const localizedStringId = /** @type {!LocalizedStringId} */ (
+    const localizedStringId = /** @type {!LocalizedStringId_Enum} */ (
       localizedStringIdAsStr
     );
     const entry = localizedStringBundle[localizedStringId];
diff --git a/src/service/mutator-interface.js b/src/service/mutator-interface.js
index a43e03fcf71e..943bf3432ec2 100644
--- a/src/service/mutator-interface.js
+++ b/src/service/mutator-interface.js
@@ -1,4 +1,4 @@
-/* eslint-disable no-unused-vars */
+/* eslint-disable @typescript-eslint/no-unused-vars */
 /**
  * @interface
  */
@@ -104,4 +104,3 @@ export class MutatorInterface {
    */
   measureMutateElement(element, measurer, mutator) {}
 }
-/* eslint-enable no-unused-vars */
diff --git a/src/service/navigation.js b/src/service/navigation.js
index 08c0b73d9bcc..9004372020c7 100644
--- a/src/service/navigation.js
+++ b/src/service/navigation.js
@@ -2,7 +2,6 @@ import {PriorityQueue} from '#core/data-structures/priority-queue';
 import {isIframed} from '#core/dom';
 import {escapeCssSelectorIdent} from '#core/dom/css-selectors';
 import {closestAncestorElementBySelector} from '#core/dom/query';
-import {dict} from '#core/types/object';
 import {getWin} from '#core/window';
 
 import {Services} from '#service';
@@ -38,7 +37,7 @@ const AMP_CUSTOM_LINKER_TARGET = '__AMP_CUSTOM_LINKER_TARGET__';
  * @enum {number} Priority reserved for extensions in anchor mutations.
  * The higher the priority, the sooner it's invoked.
  */
-export const Priority = {
+export const Priority_Enum = {
   LINK_REWRITER_MANAGER: 0,
   ANALYTICS_LINKER: 2,
 };
@@ -287,13 +286,10 @@ export class Navigation {
    */
   navigateToAmpUrl(url, requestedBy) {
     if (this.viewer_.hasCapability('a2a')) {
-      this.viewer_.sendMessage(
-        'a2aNavigate',
-        dict({
-          'url': url,
-          'requestedBy': requestedBy,
-        })
-      );
+      this.viewer_.sendMessage('a2aNavigate', {
+        'url': url,
+        'requestedBy': requestedBy,
+      });
       return true;
     }
     return false;
@@ -734,13 +730,10 @@ export class Navigation {
       return false;
     }
 
-    this.viewer_.sendMessage(
-      'navigateTo',
-      dict({
-        'url': url,
-        'requestedBy': requestedBy,
-      })
-    );
+    this.viewer_.sendMessage('navigateTo', {
+      'url': url,
+      'requestedBy': requestedBy,
+    });
     return true;
   }
 }
diff --git a/src/service/owners-interface.js b/src/service/owners-interface.js
index 2313e4dfeaf3..7b492e4ffd3a 100644
--- a/src/service/owners-interface.js
+++ b/src/service/owners-interface.js
@@ -1,4 +1,4 @@
-/* eslint-disable no-unused-vars */
+/* eslint-disable @typescript-eslint/no-unused-vars */
 /**
  * @interface
  */
@@ -69,4 +69,3 @@ export class OwnersInterface {
    */
   requireLayout(element, opt_parentPriority) {}
 }
-/* eslint-enable no-unused-vars */
diff --git a/src/service/performance-impl.js b/src/service/performance-impl.js
index 8e52a2404add..eb1f38a83d2e 100644
--- a/src/service/performance-impl.js
+++ b/src/service/performance-impl.js
@@ -1,14 +1,16 @@
-import {TickLabel} from '#core/constants/enums';
-import {VisibilityState} from '#core/constants/visibility-state';
+import {TickLabel_Enum} from '#core/constants/enums';
+import {VisibilityState_Enum} from '#core/constants/visibility-state';
 import {Signals} from '#core/data-structures/signals';
 import {whenDocumentComplete, whenDocumentReady} from '#core/document/ready';
 import {layoutRectLtwh} from '#core/dom/layout/rect';
 import {computedStyle} from '#core/dom/style';
 import {debounce} from '#core/types/function';
-import {dict, map} from '#core/types/object';
+import {map} from '#core/types/object';
 import {base64UrlEncodeFromBytes} from '#core/types/string/base64';
 import {getCryptoRandomBytesArray} from '#core/types/string/bytes';
 
+import {isExperimentOn} from '#experiments';
+
 import {Services} from '#service';
 
 import {createCustomEvent} from '#utils/event-helper';
@@ -29,6 +31,8 @@ const QUEUE_LIMIT = 50;
 const CLS_SESSION_GAP = 1000;
 const CLS_SESSION_MAX = 5000;
 
+const INP_REPORTING_THRESHOLD = 40;
+
 const TAG = 'Performance';
 
 /**
@@ -129,7 +133,7 @@ export class Performance {
     /** @private {boolean} */
     this.isPerformanceTrackingOn_ = false;
 
-    /** @private {!Object<string,boolean>} */
+    /** @private {!{[key: string]: boolean}} */
     this.enabledExperiments_ = map();
 
     /** @private {string|undefined} */
@@ -169,7 +173,7 @@ export class Performance {
     // If Paint Timing API is not supported, cannot determine first contentful paint
     if (!supportedEntryTypes.includes('paint')) {
       this.metrics_.rejectSignal(
-        TickLabel.FIRST_CONTENTFUL_PAINT,
+        TickLabel_Enum.FIRST_CONTENTFUL_PAINT,
         dev().createExpectedError('First Contentful Paint not supported')
       );
     }
@@ -186,8 +190,8 @@ export class Performance {
       const e = dev().createExpectedError(
         'Cumulative Layout Shift not supported'
       );
-      this.metrics_.rejectSignal(TickLabel.CUMULATIVE_LAYOUT_SHIFT, e);
-      this.metrics_.rejectSignal(TickLabel.CUMULATIVE_LAYOUT_SHIFT_1, e);
+      this.metrics_.rejectSignal(TickLabel_Enum.CUMULATIVE_LAYOUT_SHIFT, e);
+      this.metrics_.rejectSignal(TickLabel_Enum.CUMULATIVE_LAYOUT_SHIFT_1, e);
     }
 
     /**
@@ -200,7 +204,7 @@ export class Performance {
 
     if (!this.supportsEventTiming_) {
       this.metrics_.rejectSignal(
-        TickLabel.FIRST_INPUT_DELAY,
+        TickLabel_Enum.FIRST_INPUT_DELAY,
         dev().createExpectedError('First Input Delay not supported')
       );
     }
@@ -216,7 +220,7 @@ export class Performance {
 
     if (!this.supportsLargestContentfulPaint_) {
       this.metrics_.rejectSignal(
-        TickLabel.LARGEST_CONTENTFUL_PAINT,
+        TickLabel_Enum.LARGEST_CONTENTFUL_PAINT,
         dev().createExpectedError('Largest Contentful Paint not supported')
       );
     }
@@ -229,21 +233,18 @@ export class Performance {
     this.supportsNavigation_ = supportedEntryTypes.includes('navigation');
 
     /**
-     * The latest reported largest contentful paint time. Uses entry.startTime,
-     * which equates to: renderTime ?? loadTime. We can't always use one or the other
-     * because:
-     * - loadTime is 0 for non-remote resources (text)
-     * - renderTime is undefined for crossorigin resources
-     *
-     * @private {?number}
+     * Whether the user agent supports the interaction to next paint metric.
      */
-    this.largestContentfulPaint_ = null;
+    this.supportsEvents_ =
+      supportedEntryTypes.includes('event') &&
+      isExperimentOn(win, 'interaction-to-next-paint');
 
-    /**
-     * Which type of element was chosen as the LCP.
-     * @private {ELEMENT_TYPE_ENUM}
-     */
-    this.largestContentfulPaintType_ = null;
+    if (!this.supportsEvents_) {
+      this.metrics_.rejectSignal(
+        TickLabel_Enum.INTERACTION_TO_NEXT_PAINT,
+        dev().createExpectedError('Interaction to next paint not supported')
+      );
+    }
 
     this.onAmpDocVisibilityChange_ = this.onAmpDocVisibilityChange_.bind(this);
 
@@ -252,12 +253,16 @@ export class Performance {
 
     // Tick document ready event.
     whenDocumentReady(win.document).then(() => {
-      this.tick(TickLabel.DOCUMENT_READY);
+      this.tick(TickLabel_Enum.DOCUMENT_READY);
       this.flush();
     });
 
     // Tick window.onload event.
     whenDocumentComplete(win.document).then(() => this.onload_());
+
+    whenDocumentComplete(win.document).then(() =>
+      this.tickInteractionToNextPaint_(INP_REPORTING_THRESHOLD)
+    );
     this.registerPerformanceObserver_();
 
     /**
@@ -307,7 +312,7 @@ export class Performance {
     const channelPromise = this.viewer_.whenMessagingReady();
 
     this.ampdoc_.whenFirstVisible().then(() => {
-      this.tick(TickLabel.ON_FIRST_VISIBLE);
+      this.tick(TickLabel_Enum.ON_FIRST_VISIBLE);
       this.flush();
     });
 
@@ -330,10 +335,13 @@ export class Performance {
     return channelPromise
       .then(() => {
         // Tick the "messaging ready" signal.
-        this.tickDelta(TickLabel.MESSAGING_READY, this.win.performance.now());
+        this.tickDelta(
+          TickLabel_Enum.MESSAGING_READY,
+          this.win.performance.now()
+        );
 
         // Tick timeOrigin so that epoch time can be calculated by consumers.
-        this.tick(TickLabel.TIME_ORIGIN, undefined, this.timeOrigin_);
+        this.tick(TickLabel_Enum.TIME_ORIGIN, undefined, this.timeOrigin_);
 
         const usqp = this.ampdoc_.getMetaByName('amp-usqp');
         if (usqp) {
@@ -374,7 +382,7 @@ export class Performance {
    * Callback for onload.
    */
   onload_() {
-    this.tick(TickLabel.ON_LOAD);
+    this.tick(TickLabel_Enum.ON_LOAD);
     this.flush();
   }
 
@@ -400,22 +408,28 @@ export class Performance {
     let recordedNavigation = false;
     const processEntry = (entry) => {
       if (entry.name == 'first-paint' && !recordedFirstPaint) {
-        this.tickDelta(TickLabel.FIRST_PAINT, entry.startTime + entry.duration);
+        this.tickDelta(
+          TickLabel_Enum.FIRST_PAINT,
+          entry.startTime + entry.duration
+        );
         recordedFirstPaint = true;
       } else if (
         entry.name == 'first-contentful-paint' &&
         !recordedFirstContentfulPaint
       ) {
         const value = entry.startTime + entry.duration;
-        this.tickDelta(TickLabel.FIRST_CONTENTFUL_PAINT, value);
-        this.tickSinceVisible(TickLabel.FIRST_CONTENTFUL_PAINT_VISIBLE, value);
+        this.tickDelta(TickLabel_Enum.FIRST_CONTENTFUL_PAINT, value);
+        this.tickSinceVisible(
+          TickLabel_Enum.FIRST_CONTENTFUL_PAINT_VISIBLE,
+          value
+        );
         recordedFirstContentfulPaint = true;
       } else if (
         entry.entryType === 'first-input' &&
         !recordedFirstInputDelay
       ) {
         const value = entry.processingStart - entry.startTime;
-        this.tickDelta(TickLabel.FIRST_INPUT_DELAY, value);
+        this.tickDelta(TickLabel_Enum.FIRST_INPUT_DELAY, value);
         recordedFirstInputDelay = true;
       } else if (entry.entryType === 'layout-shift') {
         // Ignore layout shift that occurs within 500ms of user input, as it is
@@ -425,8 +439,7 @@ export class Performance {
           this.layoutShiftSum_ += entry.value;
         }
       } else if (entry.entryType === 'largest-contentful-paint') {
-        this.largestContentfulPaint_ = entry.startTime;
-        this.largestContentfulPaintType_ = getElementType(entry.element);
+        this.tickLargestContentfulPaint_(entry);
       } else if (entry.entryType == 'navigation' && !recordedNavigation) {
         [
           'domComplete',
@@ -439,6 +452,8 @@ export class Performance {
           'responseStart',
         ].forEach((label) => this.tick(label, entry[label]));
         recordedNavigation = true;
+      } else if (entry.entryType == 'event' && entry.interactionId) {
+        this.tickInteractionToNextPaint_(entry.duration);
       }
     };
 
@@ -482,6 +497,14 @@ export class Performance {
       });
     }
 
+    if (this.supportsEvents_) {
+      this.createPerformanceObserver_(processEntry, {
+        type: 'event',
+        durationThreshold: INP_REPORTING_THRESHOLD, // Minimim duration of 40ms, as implemented in Chrome web-vitals
+        buffered: true,
+      });
+    }
+
     if (entryTypesToObserve.length > 0) {
       this.createPerformanceObserver_(processEntry, {
         entryTypes: entryTypesToObserve,
@@ -514,7 +537,8 @@ export class Performance {
   isVisibilityHidden_() {
     const state = this.ampdoc_.getVisibilityState();
     return (
-      state === VisibilityState.INACTIVE || state === VisibilityState.HIDDEN
+      state === VisibilityState_Enum.INACTIVE ||
+      state === VisibilityState_Enum.HIDDEN
     );
   }
 
@@ -556,9 +580,6 @@ export class Performance {
       this.recordGoogleFontExp_();
       this.tickCumulativeLayoutShiftScore_();
     }
-    if (this.supportsLargestContentfulPaint_) {
-      this.tickLargestContentfulPaint_();
-    }
   }
 
   /**
@@ -605,7 +626,7 @@ export class Performance {
    */
   flushLayoutShiftScore_() {
     const entries = this.layoutShiftEntries_;
-    const old = this.metrics_.get(TickLabel.CUMULATIVE_LAYOUT_SHIFT);
+    const old = this.metrics_.get(TickLabel_Enum.CUMULATIVE_LAYOUT_SHIFT);
     let union = 0;
     let sum = 0;
     for (const entry of entries) {
@@ -620,10 +641,29 @@ export class Performance {
     this.recordGoogleFontExp_();
     if (old == null || sum > old) {
       // We'll record the largest windowed CLS.
-      this.metrics_.reset(TickLabel.CUMULATIVE_LAYOUT_SHIFT);
-      this.metrics_.reset(TickLabel.CUMULATIVE_LAYOUT_SHIFT_TYPE_UNION);
-      this.tickDelta(TickLabel.CUMULATIVE_LAYOUT_SHIFT, sum);
-      this.tickDelta(TickLabel.CUMULATIVE_LAYOUT_SHIFT_TYPE_UNION, union);
+      this.metrics_.reset(TickLabel_Enum.CUMULATIVE_LAYOUT_SHIFT);
+      this.metrics_.reset(TickLabel_Enum.CUMULATIVE_LAYOUT_SHIFT_TYPE_UNION);
+      this.tickDelta(TickLabel_Enum.CUMULATIVE_LAYOUT_SHIFT, sum);
+      this.tickDelta(TickLabel_Enum.CUMULATIVE_LAYOUT_SHIFT_TYPE_UNION, union);
+      this.flush();
+    }
+  }
+
+  /**
+   * Record the interaction to next paint score.
+   * @param {number=} duration
+   */
+  tickInteractionToNextPaint_(duration) {
+    if (!this.ampdoc_) {
+      return;
+    }
+
+    const old = this.metrics_.get(TickLabel_Enum.INTERACTION_TO_NEXT_PAINT);
+    if (old == null || duration > old) {
+      this.tickDelta(
+        TickLabel_Enum.INTERACTION_TO_NEXT_PAINT,
+        duration - (old ?? 0)
+      );
       this.flush();
     }
   }
@@ -642,11 +682,17 @@ export class Performance {
    */
   tickCumulativeLayoutShiftScore_() {
     if (this.shiftScoresTicked_ === 0) {
-      this.tickDelta(TickLabel.CUMULATIVE_LAYOUT_SHIFT_1, this.layoutShiftSum_);
+      this.tickDelta(
+        TickLabel_Enum.CUMULATIVE_LAYOUT_SHIFT_1,
+        this.layoutShiftSum_
+      );
       this.flush();
       this.shiftScoresTicked_ = 1;
     } else if (this.shiftScoresTicked_ === 1) {
-      this.tickDelta(TickLabel.CUMULATIVE_LAYOUT_SHIFT_2, this.layoutShiftSum_);
+      this.tickDelta(
+        TickLabel_Enum.CUMULATIVE_LAYOUT_SHIFT_2,
+        this.layoutShiftSum_
+      );
       this.flush();
       this.shiftScoresTicked_ = 2;
     }
@@ -654,23 +700,22 @@ export class Performance {
 
   /**
    * Tick the largest contentful paint metrics.
+   * Uses entry.startTime, which equates to: `renderTime ?? loadTime`. We can't
+   * always use one or the other because:
+   * - loadTime is 0 for non-remote resources (text)
+   * - renderTime is undefined for crossorigin resources
+   *
+   * @param {!LargestContentfulPaint} entry
    */
-  tickLargestContentfulPaint_() {
-    if (this.largestContentfulPaint_ == null) {
-      return;
-    }
+  tickLargestContentfulPaint_(entry) {
+    const {element, startTime} = entry;
+    const type = getElementType(element);
 
-    this.tickDelta(
-      TickLabel.LARGEST_CONTENTFUL_PAINT_TYPE,
-      this.largestContentfulPaintType_
-    );
-    this.tickDelta(
-      TickLabel.LARGEST_CONTENTFUL_PAINT,
-      this.largestContentfulPaint_
-    );
+    this.tickDelta(TickLabel_Enum.LARGEST_CONTENTFUL_PAINT_TYPE, type);
+    this.tickDelta(TickLabel_Enum.LARGEST_CONTENTFUL_PAINT, startTime);
     this.tickSinceVisible(
-      TickLabel.LARGEST_CONTENTFUL_PAINT_VISIBLE,
-      this.largestContentfulPaint_
+      TickLabel_Enum.LARGEST_CONTENTFUL_PAINT_VISIBLE,
+      startTime
     );
     this.flush();
   }
@@ -703,18 +748,18 @@ export class Performance {
           // 0 case, since pre-renders that are never used are highly
           // likely to fully load before they are never used :)
           this.tickDelta(
-            TickLabel.FIRST_VIEWPORT_READY,
+            TickLabel_Enum.FIRST_VIEWPORT_READY,
             userPerceivedVisualCompletenesssTime
           );
         });
         this.prerenderComplete_(userPerceivedVisualCompletenesssTime);
         // Mark this instance in the browser timeline.
-        this.mark(TickLabel.FIRST_VIEWPORT_READY);
+        this.mark(TickLabel_Enum.FIRST_VIEWPORT_READY);
       } else {
         // If it didnt start in prerender, no need to calculate anything
         // and we just need to tick `pc`. (it will give us the relative
         // time since the viewer initialized the timer)
-        this.tick(TickLabel.FIRST_VIEWPORT_READY);
+        this.tick(TickLabel_Enum.FIRST_VIEWPORT_READY);
         this.prerenderComplete_(this.win.performance.now() - docVisibleTime);
       }
       this.flush();
@@ -744,7 +789,7 @@ export class Performance {
   /**
    * Ticks a timing event.
    *
-   * @param {TickLabel} label The variable name as it will be reported.
+   * @param {TickLabel_Enum} label The variable name as it will be reported.
    *     See TICKEVENTS.md for available metrics, and edit this file
    *     when adding a new metric.
    * @param {number=} opt_delta The delta. Call tickDelta instead of setting
@@ -757,7 +802,7 @@ export class Performance {
       'You may not set both opt_delta and opt_value.'
     );
 
-    const data = dict({'label': label});
+    const data = {'label': label};
     let delta;
 
     if (opt_delta != undefined) {
@@ -796,19 +841,13 @@ export class Performance {
    * @param {string} label
    */
   mark(label) {
-    if (
-      this.win.performance &&
-      this.win.performance.mark &&
-      arguments.length == 1
-    ) {
-      this.win.performance.mark(label);
-    }
+    this.win.performance.mark?.(label);
   }
 
   /**
    * Tick a very specific value for the label. Use this method if you
    * measure the time it took to do something yourself.
-   * @param {TickLabel} label The variable name as it will be reported.
+   * @param {TickLabel_Enum} label The variable name as it will be reported.
    * @param {number} value The value in milliseconds that should be ticked.
    */
   tickDelta(label, value) {
@@ -817,7 +856,7 @@ export class Performance {
 
   /**
    * Tick time delta since the document has become visible.
-   * @param {TickLabel} label The variable name as it will be reported.
+   * @param {TickLabel_Enum} label The variable name as it will be reported.
    * @param {number=} opt_delta The optional delta value in milliseconds.
    */
   tickSinceVisible(label, opt_delta) {
@@ -844,11 +883,11 @@ export class Performance {
       }
       this.viewer_.sendMessage(
         'sendCsi',
-        dict({
+        {
           'ampexp': this.ampexp_,
           'canonicalUrl': this.documentInfo_.canonicalUrl,
           'eventid': this.eventid_,
-        }),
+        },
         /* cancelUnsent */ true
       );
     }
@@ -907,7 +946,7 @@ export class Performance {
     if (this.viewer_) {
       this.viewer_.sendMessage(
         'prerenderComplete',
-        dict({'value': value}),
+        {'value': value},
         /* cancelUnsent */ true
       );
     }
@@ -926,7 +965,7 @@ export class Performance {
   /**
    * Retrieve a promise for tick label, resolved with metric. Used by amp-analytics
    *
-   * @param {TickLabel} label
+   * @param {TickLabel_Enum} label
    * @return {!Promise<time>}
    */
   getMetric(label) {
diff --git a/src/service/platform-impl.js b/src/service/platform-impl.js
index 10d5b446ab7e..f73b47abbb06 100644
--- a/src/service/platform-impl.js
+++ b/src/service/platform-impl.js
@@ -17,7 +17,7 @@ export class Platform {
   }
 
   /**
-   * Whether the current platform an Android device.
+   * Whether the current platform is an Android device.
    * @return {boolean}
    */
   isAndroid() {
@@ -25,7 +25,7 @@ export class Platform {
   }
 
   /**
-   * Whether the current platform an iOS device.
+   * Whether the current platform is an iOS device.
    * @return {boolean}
    */
   isIos() {
@@ -103,7 +103,7 @@ export class Platform {
   }
 
   /**
-   * Whether the current browser is isStandalone.
+   * Whether the current browser is standalone.
    * @return {boolean}
    */
   isStandalone() {
@@ -171,20 +171,14 @@ export class Platform {
    * @return {string}
    */
   getIosVersionString() {
-    if (!this.navigator_.userAgent) {
-      return '';
-    }
     if (!this.isIos()) {
       return '';
     }
-    let version = this.navigator_.userAgent.match(
-      /OS ([0-9]+[_.][0-9]+([_.][0-9]+)?)\b/
+    return (
+      this.navigator_.userAgent
+        ?.match(/OS ([0-9]+[_.][0-9]+([_.][0-9]+)?)\b/)?.[1]
+        ?.replace(/_/g, '.') || ''
     );
-    if (!version) {
-      return '';
-    }
-    version = version[1].replace(/_/g, '.');
-    return version;
   }
 
   /**
diff --git a/src/service/position-observer/position-observer-impl.js b/src/service/position-observer/position-observer-impl.js
index 235cd2807ba7..abb496f54a38 100644
--- a/src/service/position-observer/position-observer-impl.js
+++ b/src/service/position-observer/position-observer-impl.js
@@ -5,7 +5,7 @@ import {Services} from '#service';
 import {dev} from '#utils/log';
 
 import {
-  PositionObserverFidelity, // eslint-disable-line no-unused-vars
+  PositionObserverFidelity_Enum, // eslint-disable-line @typescript-eslint/no-unused-vars
   PositionObserverWorker,
 } from './position-observer-worker';
 
@@ -61,7 +61,7 @@ export class PositionObserver {
 
   /**
    * @param {!Element} element
-   * @param {!PositionObserverFidelity} fidelity
+   * @param {!PositionObserverFidelity_Enum} fidelity
    * @param {function(?./position-observer-worker.PositionInViewportEntryDef)} handler
    * @return {!UnlistenDef}
    */
diff --git a/src/service/position-observer/position-observer-worker.js b/src/service/position-observer/position-observer-worker.js
index d71ad5f32347..ffdbf5e23f33 100644
--- a/src/service/position-observer/position-observer-worker.js
+++ b/src/service/position-observer/position-observer-worker.js
@@ -10,7 +10,7 @@ import {Services} from '#service';
 import {devAssert} from '#utils/log';
 
 /** @enum {number} */
-export const PositionObserverFidelity = {
+export const PositionObserverFidelity_Enum = {
   HIGH: 1,
   LOW: 0,
 };
@@ -26,7 +26,7 @@ const LOW_FIDELITY_FRAME_COUNT = 4;
  * @typedef {{
  *  positionRect: ?../../layout-rect.LayoutRectDef,
  *  viewportRect: !../../layout-rect.LayoutRectDef,
- *  relativePos: ?../../layout-rect.RelativePositions,
+ *  relativePos: ?../../layout-rect.RelativePositions_Enum,
  * }}
  */
 export let PositionInViewportEntryDef;
@@ -35,7 +35,7 @@ export class PositionObserverWorker {
   /**
    * @param {!../ampdoc-impl.AmpDoc} ampdoc
    * @param {!Element} element
-   * @param {!PositionObserverFidelity} fidelity
+   * @param {!PositionObserverFidelity_Enum} fidelity
    * @param {function(?PositionInViewportEntryDef)} handler
    */
   constructor(ampdoc, element, fidelity, handler) {
@@ -45,12 +45,12 @@ export class PositionObserverWorker {
     /** @const {function(?PositionInViewportEntryDef)} */
     this.handler_ = handler;
 
-    /** @type {!PositionObserverFidelity} */
+    /** @type {!PositionObserverFidelity_Enum} */
     this.fidelity = fidelity;
 
     /** @type {number} */
     this.turn =
-      fidelity == PositionObserverFidelity.LOW
+      fidelity == PositionObserverFidelity_Enum.LOW
         ? Math.floor(Math.random() * LOW_FIDELITY_FRAME_COUNT)
         : 0;
 
@@ -116,7 +116,7 @@ export class PositionObserverWorker {
         return;
       }
 
-      if (this.fidelity == PositionObserverFidelity.LOW) {
+      if (this.fidelity == PositionObserverFidelity_Enum.LOW) {
         this.turn = LOW_FIDELITY_FRAME_COUNT;
       }
     }
diff --git a/src/service/real-time-config/callout-vendors.js b/src/service/real-time-config/callout-vendors.js
index ace8f73f6be7..afc56e19baaf 100644
--- a/src/service/real-time-config/callout-vendors.js
+++ b/src/service/real-time-config/callout-vendors.js
@@ -22,7 +22,7 @@ import {getMode} from '../../mode';
     disableKeyAppend: boolean}} */
 let RtcVendorDef;
 
-/** @const {!Object<string, RtcVendorDef>} */
+/** @const {!{[key: string]: RtcVendorDef}} */
 const RTC_VENDORS = jsonConfiguration({
   ////////////////////////////////////////////////////////////////////
   //                                                                //
@@ -69,7 +69,7 @@ const RTC_VENDORS = jsonConfiguration({
     disableKeyAppend: true,
   },
   criteo: {
-    url: 'https://bidder.criteo.com/amp/rtc?zid=ZONE_ID&nid=NETWORK_ID&psubid=PUBLISHER_SUB_ID&lir=LINE_ITEM_RANGES&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&slot=ATTR(data-slot)&timeout=TIMEOUT&curl=CANONICAL_URL&href=HREF&cst=CONSENT_STATE&cst_str=CONSENT_STRING&cst_type=CONSENT_METADATA(consentStringType)',
+    url: 'https://bidder.criteo.com/amp/rtc?zid=ZONE_ID&nid=NETWORK_ID&uid=ADUNIT_ID&pid=PUBLISHER_ID&psubid=PUBLISHER_SUB_ID&lir=LINE_ITEM_RANGES&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&slot=ATTR(data-slot)&timeout=TIMEOUT&curl=CANONICAL_URL&href=HREF&cst=CONSENT_STATE&cst_str=CONSENT_STRING&cst_type=CONSENT_METADATA(consentStringType)&cst_gdpr_applies=CONSENT_METADATA(gdprApplies)',
     macros: [
       'ZONE_ID',
       'NETWORK_ID',
@@ -77,9 +77,16 @@ const RTC_VENDORS = jsonConfiguration({
       'LINE_ITEM_RANGES',
       'CONSENT_STATE',
       'CONSENT_STRING',
+      'ADUNIT_ID',
+      'PUBLISHER_ID',
     ],
     disableKeyAppend: true,
   },
+  denakop: {
+    url: 'https://ib.adnxs.com/prebid/amp?tag_id=PLACEMENT_ID&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&slot=ATTR(data-slot)&targeting=TGT&curl=CANONICAL_URL&timeout=TIMEOUT&adcid=ADCID&purl=HREF&gdpr_consent=CONSENT_STRING&account=ACCOUNT_ID&gdpr_applies=CONSENT_METADATA(gdprApplies)&addtl_consent=CONSENT_METADATA(additionalConsent)&consent_type=CONSENT_METADATA(consentStringType)',
+    macros: ['PLACEMENT_ID', 'CONSENT_STRING', 'ACCOUNT_ID'],
+    disableKeyAppend: true,
+  },
   freestar: {
     url: 'https://prebid-amp.pub.network/openrtb2/amp?tag_id=TAG_ID&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&slot=ATTR(data-slot)&targeting=TGT&curl=CANONICAL_URL&timeout=TIMEOUT&adc=ADCID&purl=HREF&gdpr_consent=CONSENT_STRING&account=ACCOUNT_ID',
     macros: ['TAG_ID', 'CONSENT_STRING', 'ACCOUNT_ID'],
@@ -105,6 +112,11 @@ const RTC_VENDORS = jsonConfiguration({
     macros: ['PLACEMENT_ID', 'CONSENT_STRING'],
     disableKeyAppend: true,
   },
+  improvedigital: {
+    url: 'https://pbs.360yield.com/openrtb2/amp?tag_id=TAG_ID&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&slot=ATTR(data-slot)&targeting=TGT&curl=CANONICAL_URL&timeout=TIMEOUT&adc=ADCID&purl=HREF&consent_string=CONSENT_STRING&account=ACCOUNT_ID&gdpr_applies=CONSENT_METADATA(gdprApplies)&addtl_consent=CONSENT_METADATA(additionalConsent)&consent_type=CONSENT_METADATA(consentStringType)',
+    macros: ['TAG_ID', 'CONSENT_STRING', 'ACCOUNT_ID'],
+    disableKeyAppend: true,
+  },
   indexexchange: {
     url: 'https://amp.casalemedia.com/amprtc?v=1&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&s=SITE_ID&p=CANONICAL_URL&consent_state=CONSENT_STATE&consent_string=CONSENT_STRING',
     macros: ['SITE_ID', 'CONSENT_STATE', 'CONSENT_STRING'],
@@ -118,25 +130,25 @@ const RTC_VENDORS = jsonConfiguration({
     disableKeyAppend: true,
   },
   lotame: {
-    url: 'https://ad.crwdcntrl.net/5/pe=y/c=CLIENT_ID/an=AD_NETWORK/ma=MAX_AUDIENCES',
+    url: 'https://ad.crwdcntrl.net/5/pe=y/c=CLIENT_ID/an=AD_NETWORK/ma=MAX_AUDIENCE/gdpr_consent=CONSENT_STRING/gdpr=CONSENT_METADATA(gdprApplies)',
     macros: ['CLIENT_ID', 'AD_NETWORK', 'MAX_AUDIENCES'],
     disableKeyAppend: true,
   },
   medianet: {
-    url: 'https://amprtc.media.net/rtb/getrtc?cid=CID&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&slot=ATTR(data-slot)&tgt=TGT&curl=CANONICAL_URL&to=TIMEOUT&purl=HREF&cste=CONSENT_STATE&cstr=CONSENT_STRING&adcid=ADCID&dmsv=ATTR(data-multi-size-validation)&ep=ELEMENT_POS&st=SCROLL_TOP&ph=PAGE_HEIGHT&bks=BKG_STATE&ref=REFERRER&dj=ATTR(data-json)',
+    url: 'https://amprtc.media.net/rtb/getrtc?cid=CID&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&slot=ATTR(data-slot)&tgt=TGT&curl=CANONICAL_URL&to=TIMEOUT&purl=HREF&cste=CONSENT_STATE&cstr=CONSENT_STRING&adcid=ADCID&dmsv=ATTR(data-multi-size-validation)&ep=ELEMENT_POS&st=SCROLL_TOP&ph=PAGE_HEIGHT&bks=BKG_STATE&ref=REFERRER&dj=ATTR(data-json)&cst_type=CONSENT_METADATA(consentStringType)&gdpr_applies=CONSENT_METADATA(gdprApplies)',
     macros: ['CID'],
     errorReportingUrl:
       'https://qsearch-a.akamaihd.net/log?logid=kfk&evtid=projectevents&project=amprtc_error&error=ERROR_TYPE&rd=HREF',
     disableKeyAppend: true,
   },
   mediasquare: {
-    url: 'https://pbs-front.mediasquare.fr/msq_prebid?owner=OWNER&code=CODE&sizes=ATTR(data-multi-size)&adunit=ATTR(data-slot)&referer=HREF&gdpr_consent=CONSENT_STRING',
+    url: 'https://pbs-front.mediasquare.fr/msq_prebid?owner=OWNER&code=CODE&w=ATTR(width)&h=ATTR(height)&sizes=ATTR(data-multi-size)&adunit=ATTR(data-slot)&referer=HREF&gdpr_consent=CONSENT_STRING',
     macros: ['OWNER', 'CODE', 'CONSENT_STRING'],
     disableKeyAppend: true,
   },
   navegg: {
-    url: 'https://usr.navdmp.com/usr?acc=NVG_ACC&wst=0&v=10',
-    macros: ['NVG_ACC'],
+    url: 'https://usr.navdmp.com/usr?acc=NVG_ACC&wst=WST&wct=WCT&wla=WLA&v=10',
+    macros: ['NVG_ACC', 'WST', 'WCT', 'WLA'],
     disableKeyAppend: true,
   },
   newspassid: {
@@ -160,7 +172,7 @@ const RTC_VENDORS = jsonConfiguration({
   },
   openwrap: {
     // PubMatic OpenWrap
-    url: 'https://ow.pubmatic.com/amp?v=1&w=ATTR(width)&h=ATTR(height)&ms=ATTR(data-multi-size)&auId=ATTR(data-slot)&purl=HREF&pubId=PUB_ID&profId=PROFILE_ID&consent_string=CONSENT_STRING&gdpr_applies=CONSENT_METADATA(gdprApplies)&addtl_consent=CONSENT_METADATA(additionalConsent)&consent_type=CONSENT_METADATA(consentStringType)',
+    url: 'https://ow.pubmatic.com/amp?v=1&w=ATTR(width)&h=ATTR(height)&ms=ATTR(data-multi-size)&auId=ATTR(data-slot)&targeting=TGT&purl=HREF&pubId=PUB_ID&profId=PROFILE_ID&consent_string=CONSENT_STRING&gdpr_applies=CONSENT_METADATA(gdprApplies)&addtl_consent=CONSENT_METADATA(additionalConsent)&curl=CANONICAL_URL&consent_type=CONSENT_METADATA(consentStringType)',
     macros: ['PUB_ID', 'PROFILE_ID', 'CONSENT_STRING'],
     errorReportingUrl: 'https://ow.pubmatic.com/amp_error?e=ERROR_TYPE&h=HREF',
     disableKeyAppend: true,
@@ -179,14 +191,14 @@ const RTC_VENDORS = jsonConfiguration({
       'https://elb.the-ozone-project.com/amp_error?err=ERROR_TYPE&url=HREF',
     disableKeyAppend: true,
   },
-  prebidappnexus: {
-    url: 'https://prebid.adnxs.com/pbs/v1/openrtb2/amp?tag_id=PLACEMENT_ID&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&slot=ATTR(data-slot)&targeting=TGT&curl=CANONICAL_URL&timeout=TIMEOUT&adcid=ADCID&purl=HREF&gdpr_consent=CONSENT_STRING&account=ACCOUNT_ID&gdpr_applies=CONSENT_METADATA(gdprApplies)&addtl_consent=CONSENT_METADATA(additionalConsent)&consent_type=CONSENT_METADATA(consentStringType)',
+  prebidappnexuspsp: {
+    url: 'https://ib.adnxs.com/prebid/amp?tag_id=PLACEMENT_ID&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&slot=ATTR(data-slot)&targeting=TGT&curl=CANONICAL_URL&timeout=TIMEOUT&adcid=ADCID&purl=HREF&consent_string=CONSENT_STRING&account=ACCOUNT_ID&gdpr_applies=CONSENT_METADATA(gdprApplies)&addtl_consent=CONSENT_METADATA(additionalConsent)&consent_type=CONSENT_METADATA(consentStringType)&pvid=PAGEVIEWID',
     macros: ['PLACEMENT_ID', 'CONSENT_STRING', 'ACCOUNT_ID'],
     disableKeyAppend: true,
   },
-  prebidappnexuspsp: {
-    url: 'https://ib.adnxs.com/prebid/amp?tag_id=PLACEMENT_ID&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&slot=ATTR(data-slot)&targeting=TGT&curl=CANONICAL_URL&timeout=TIMEOUT&adcid=ADCID&purl=HREF&gdpr_consent=CONSENT_STRING&account=ACCOUNT_ID&gdpr_applies=CONSENT_METADATA(gdprApplies)&addtl_consent=CONSENT_METADATA(additionalConsent)&consent_type=CONSENT_METADATA(consentStringType)',
-    macros: ['PLACEMENT_ID', 'CONSENT_STRING', 'ACCOUNT_ID'],
+  pubwise: {
+    url: 'https://pbs.pubwise.io/openrtb2/amp?tag_id=TAG_ID&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&slot=ATTR(data-slot)&targeting=TGT&curl=CANONICAL_URL&timeout=TIMEOUT&adc=ADCID&purl=HREF&gdpr_consent=CONSENT_STRING&account=ACCOUNT_ID',
+    macros: ['TAG_ID', 'CONSENT_STRING', 'ACCOUNT_ID'],
     disableKeyAppend: true,
   },
   prebidflux: {
@@ -200,7 +212,7 @@ const RTC_VENDORS = jsonConfiguration({
     disableKeyAppend: true,
   },
   prebidrubicon: {
-    url: 'https://prebid-server.rubiconproject.com/openrtb2/amp?tag_id=REQUEST_ID&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&slot=ATTR(data-slot)&targeting=TGT&curl=CANONICAL_URL&timeout=TIMEOUT&adc=ADCID&purl=HREF&gdpr_consent=CONSENT_STRING&account=ACCOUNT_ID&gdpr_applies=CONSENT_METADATA(gdprApplies)&addtl_consent=CONSENT_METADATA(additionalConsent)&consent_type=CONSENT_METADATA(consentStringType)',
+    url: 'https://prebid-server.rubiconproject.com/openrtb2/amp?tag_id=REQUEST_ID&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&slot=ATTR(data-slot)&targeting=TGT&curl=CANONICAL_URL&timeout=TIMEOUT&adc=ADCID&purl=HREF&consent_string=CONSENT_STRING&account=ACCOUNT_ID&gdpr_applies=CONSENT_METADATA(gdprApplies)&addtl_consent=CONSENT_METADATA(additionalConsent)&consent_type=CONSENT_METADATA(consentStringType)&gpp_sid=CONSENT_METADATA(gppSectionId)&pvid=PAGEVIEWID',
     macros: ['REQUEST_ID', 'CONSENT_STRING', 'ACCOUNT_ID'],
     disableKeyAppend: true,
   },
@@ -209,18 +221,28 @@ const RTC_VENDORS = jsonConfiguration({
     macros: ['PLACEMENT_ID', 'DIV_ID'],
     disableKeyAppend: true,
   },
+  richaudience: {
+    url: 'https://shb.richaudience.com/amp?p=PLACEMENT_ID&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&slot=ATTR(data-slot)&mref=CANONICAL_URL&timeout=TIMEOUT&adcid=ADCID&purl=HREF&targeting=TGT&consentString=CONSENT_STRING&gdpr=CONSENT_METADATA(gdprApplies)&addtl_consent=CONSENT_METADATA(additionalConsent)&consent_type=CONSENT_METADATA(consentStringType)',
+    macros: ['PLACEMENT_ID', 'CONSENT_STRING'],
+    disableKeyAppend: true,
+  },
   salesforcedmp: {
     url: 'https://cdn.krxd.net/userdata/v2/amp/ORGANIZATION_ID?segments_key=SEGMENTS_KEY&kuid_key=USER_KEY',
     macros: ['ORGANIZATION_ID', 'SEGMENTS_KEY', 'USER_KEY'],
     disableKeyAppend: true,
   },
+  snigel: {
+    url: 'https://adserv.snigelweb.com/bp/v1/openrtb2/amp?tag_id=PLACEMENT_ID&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&slot=ATTR(data-slot)&targeting=TGT&curl=CANONICAL_URL&timeout=TIMEOUT&adcid=ADCID&purl=HREF&consent_string=CONSENT_STRING&account=ACCOUNT_ID&gdpr_applies=CONSENT_METADATA(gdprApplies)&addtl_consent=CONSENT_METADATA(additionalConsent)&consent_type=CONSENT_METADATA(consentStringType)',
+    macros: ['PLACEMENT_ID', 'CONSENT_STRING', 'ACCOUNT_ID'],
+    disableKeyAppend: true,
+  },
   sonobi: {
     url: 'https://apex.go.sonobi.com/trinity.json?key_maker=%7B%22_DIVIDER_ATTR(data-slot)%7C1%22%3A%22PLACEMENT_ID_DIVIDER_ATTR(width)xATTR(height)%2CATTR(data-multi-size)%22%7D&ref=CANONICAL_URL&lib_name=amp&lib_v=0.1&pv=PAGEVIEWID&amp=1',
     disableKeyAppend: true,
     macros: ['PLACEMENT_ID', '_DIVIDER_'],
   },
   t13: {
-    url: 'https://s2s.t13.io/openrtb2/amp?tag_id=TAG_ID&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&slot=ATTR(data-slot)&targeting=TGT&curl=CANONICAL_URL&timeout=TIMEOUT&adc=ADCID&purl=HREF&gdpr_consent=CONSENT_STRING&account=ACCOUNT_ID',
+    url: 'https://s2s.t13.io/openrtb2/amp?tag_id=TAG_ID&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&slot=ATTR(data-slot)&targeting=TGT&curl=CANONICAL_URL&timeout=TIMEOUT&adc=ADCID&purl=HREF&consent_string=CONSENT_STRING&account=ACCOUNT_ID&gdpr_applies=CONSENT_METADATA(gdprApplies)&addtl_consent=CONSENT_METADATA(additionalConsent)&consent_type=CONSENT_METADATA(consentStringType)',
     macros: ['TAG_ID', 'CONSENT_STRING', 'ACCOUNT_ID'],
     disableKeyAppend: true,
   },
@@ -235,15 +257,10 @@ const RTC_VENDORS = jsonConfiguration({
     disableKeyAppend: true,
   },
   yieldlab: {
-    url: 'https://ad.yieldlab.net/yp/ADSLOT_ID?content=amp&consent=CONSENT_STRING&t=amp%3D1',
+    url: 'https://ad.yieldlab.net/yp/ADSLOT_ID?content=amp&consent=CONSENT_STRING&t=amp%3D1&pubref=HREF',
     macros: ['ADSLOT_ID', 'CONSENT_STRING'],
     disableKeyAppend: true,
   },
-  snigel: {
-    url: 'https://adserv.snigelweb.com/bp/v1/openrtb2/amp?tag_id=PLACEMENT_ID&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&slot=ATTR(data-slot)&targeting=TGT&curl=CANONICAL_URL&timeout=TIMEOUT&adcid=ADCID&purl=HREF&consent_string=CONSENT_STRING&account=ACCOUNT_ID&gdpr_applies=CONSENT_METADATA(gdprApplies)&addtl_consent=CONSENT_METADATA(additionalConsent)&consent_type=CONSENT_METADATA(consentStringType)',
-    macros: ['PLACEMENT_ID', 'CONSENT_STRING', 'ACCOUNT_ID'],
-    disableKeyAppend: true,
-  },
 });
 
 // DO NOT MODIFY: Setup for tests
diff --git a/src/service/real-time-config/real-time-config-impl.js b/src/service/real-time-config/real-time-config-impl.js
index 6f0f28f0098e..75b780fb935f 100644
--- a/src/service/real-time-config/real-time-config-impl.js
+++ b/src/service/real-time-config/real-time-config-impl.js
@@ -62,8 +62,12 @@ export const RTC_ERROR_ENUM = {
   MACRO_EXPAND_TIMEOUT: '11',
 };
 
-/** @const {!Object<string, boolean>} */
-const GLOBAL_MACRO_ALLOWLIST = {CLIENT_ID: true};
+/** @const {!{[key: string]: boolean}} */
+const GLOBAL_MACRO_ALLOWLIST = {
+  CLIENT_ID: true,
+  TITLE: true,
+  SOURCE_URL: true,
+};
 
 export class RealTimeConfigService {
   /**
@@ -78,11 +82,11 @@ export class RealTimeConfigService {
    * For a given A4A Element, sends out Real Time Config requests to
    * any urls or vendors specified by the publisher.
    * @param {!Element} element
-   * @param {!Object<string, !../../../src/service/variable-source.AsyncResolverDef>} customMacros The ad-network specified macro
+   * @param {!{[key: string]: !../../../src/service/variable-source.AsyncResolverDef}} customMacros The ad-network specified macro
    *   substitutions available to use.
    * @param {?CONSENT_POLICY_STATE} consentState
    * @param {?string} consentString
-   * @param {?Object<string, string|number|boolean|undefined>} consentMetadata
+   * @param {?{[key: string]: string|number|boolean|undefined}} consentMetadata
    * @param {!Function} checkStillCurrent
    * @return {Promise<!Array<!rtcResponseDef>>|undefined}
    * @visibleForTesting
@@ -117,7 +121,7 @@ export class RealTimeConfigManager {
     /** @private {!Window} */
     this.win_ = ampDoc.win;
 
-    /** @private {!Object<string, boolean>} */
+    /** @private {!{[key: string]: boolean}} */
     this.seenUrls_ = {};
 
     /** @private {?number} */
@@ -135,7 +139,7 @@ export class RealTimeConfigManager {
     /** @private {?string} */
     this.consentString_ = null;
 
-    /** @private {?Object<string, string|number|boolean|undefined>} */
+    /** @private {?{[key: string]: string|number|boolean|undefined}} */
     this.consentMetadata_ = null;
   }
 
@@ -280,8 +284,8 @@ export class RealTimeConfigManager {
   /**
    * Assigns constant macros that should exist for all RTC to object of custom
    * per-network macros.
-   * @param {!Object<string, !../../../src/service/variable-source.AsyncResolverDef>} macros
-   * @return {!Object<string, !../../../src/service/variable-source.AsyncResolverDef>}
+   * @param {!{[key: string]: !../../../src/service/variable-source.AsyncResolverDef}} macros
+   * @return {!{[key: string]: !../../../src/service/variable-source.AsyncResolverDef}}
    */
   assignMacros(macros) {
     macros['TIMEOUT'] = () => this.rtcConfig_.timeoutMillis;
@@ -299,7 +303,7 @@ export class RealTimeConfigManager {
 
   /**
    * Manages sending the RTC callouts for the Custom URLs.
-   * @param {!Object<string, !../../../src/service/variable-source.AsyncResolverDef>} customMacros The ad-network specified macro
+   * @param {!{[key: string]: !../../../src/service/variable-source.AsyncResolverDef}} customMacros The ad-network specified macro
    * @param {!Function} checkStillCurrent
    * @param {!Element} element
    */
@@ -329,7 +333,7 @@ export class RealTimeConfigManager {
 
   /**
    * Manages sending the RTC callouts for all specified vendors.
-   * @param {!Object<string, !../../../src/service/variable-source.AsyncResolverDef>} customMacros The ad-network specified macro
+   * @param {!{[key: string]: !../../../src/service/variable-source.AsyncResolverDef}} customMacros The ad-network specified macro
    * @param {!Function} checkStillCurrent
    */
   handleRtcForVendorUrls(customMacros, checkStillCurrent) {
@@ -382,7 +386,7 @@ export class RealTimeConfigManager {
 
   /**
    * @param {string} url
-   * @param {!Object<string, !../../../src/service/variable-source.AsyncResolverDef>} macros
+   * @param {!{[key: string]: !../../../src/service/variable-source.AsyncResolverDef}} macros
    * @param {string} errorReportingUrl
    * @param {!Function} checkStillCurrent
    * @param {string=} opt_vendor
@@ -584,11 +588,11 @@ export class RealTimeConfigManager {
    * For a given A4A Element, sends out Real Time Config requests to
    * any urls or vendors specified by the publisher.
    * @param {!Element} element
-   * @param {!Object<string, !../../../src/service/variable-source.AsyncResolverDef>} customMacros The ad-network specified macro
+   * @param {!{[key: string]: !../../../src/service/variable-source.AsyncResolverDef}} customMacros The ad-network specified macro
    *   substitutions available to use.
    * @param {?CONSENT_POLICY_STATE} consentState
    * @param {?string} consentString
-   * @param {?Object<string, string|number|boolean|undefined>} consentMetadata
+   * @param {?{[key: string]: string|number|boolean|undefined}} consentMetadata
    * @param {!Function} checkStillCurrent
    * @return {Promise<!Array<!rtcResponseDef>>|undefined}
    * @visibleForTesting
diff --git a/src/service/resource.js b/src/service/resource.js
index f24ddfc4e0c2..c55e3a54e265 100644
--- a/src/service/resource.js
+++ b/src/service/resource.js
@@ -1,5 +1,5 @@
 import {Deferred} from '#core/data-structures/promise';
-import {Layout} from '#core/dom/layout';
+import {Layout_Enum} from '#core/dom/layout';
 import {
   layoutRectLtwh,
   layoutRectSizeEquals,
@@ -29,7 +29,7 @@ const OWNER_PROP_ = '__AMP__OWNER';
  *
  * @enum {number}
  */
-export const ResourceState = {
+export const ResourceState_Enum = {
   /**
    * The resource has not been built yet. Measures, layouts, preloads or
    * viewport signals are not allowed.
@@ -151,15 +151,15 @@ export class Resource {
     /** @private {!AmpElement|undefined|null} */
     this.owner_ = undefined;
 
-    /** @private {!ResourceState} */
+    /** @private {!ResourceState_Enum} */
     this.state_ = element.isBuilt()
-      ? ResourceState.NOT_LAID_OUT
-      : ResourceState.NOT_BUILT;
+      ? ResourceState_Enum.NOT_LAID_OUT
+      : ResourceState_Enum.NOT_BUILT;
 
     // Race condition: if an element is reparented while building, it'll
     // receive a newly constructed Resource. Make sure this Resource's
     // internal state is also "building".
-    if (this.state_ == ResourceState.NOT_BUILT && element.isBuilding()) {
+    if (this.state_ == ResourceState_Enum.NOT_BUILT && element.isBuilding()) {
       this.build();
     }
 
@@ -194,7 +194,7 @@ export class Resource {
     /**
      * Really, this is a <number, !Deferred> map,
      * but CC's type system can't handle it.
-     * @private {?Object<string, !Deferred>}
+     * @private {?{[key: string]: !Deferred}}
      */
     this.withViewportDeferreds_ = null;
 
@@ -283,8 +283,8 @@ export class Resource {
   }
 
   /**
-   * Returns the resource's state. See {@link ResourceState} for details.
-   * @return {!ResourceState}
+   * Returns the resource's state. See {@link ResourceState_Enum} for details.
+   * @return {!ResourceState_Enum}
    */
   getState() {
     return this.state_;
@@ -328,7 +328,7 @@ export class Resource {
     return this.element.buildInternal().then(
       () => {
         this.isBuilding_ = false;
-        this.state_ = ResourceState.NOT_LAID_OUT;
+        this.state_ = ResourceState_Enum.NOT_LAID_OUT;
         // TODO(dvoytenko): merge with the standard BUILT signal.
         this.element.signals().signal('res-built');
       },
@@ -442,7 +442,7 @@ export class Resource {
       // Most likely this is an element who's window has just been destroyed.
       // This is an issue with FIE embeds destruction. Such elements will be
       // considered "not displayable" until they are GC'ed.
-      this.state_ = ResourceState.NOT_LAID_OUT;
+      this.state_ = ResourceState_Enum.NOT_LAID_OUT;
       return;
     }
 
@@ -455,22 +455,22 @@ export class Resource {
     // Note that "left" doesn't affect readiness for the layout.
     const sizeChanges = !layoutRectSizeEquals(oldBox, newBox);
     if (
-      this.state_ == ResourceState.NOT_LAID_OUT ||
+      this.state_ == ResourceState_Enum.NOT_LAID_OUT ||
       oldBox.top != newBox.top ||
       sizeChanges
     ) {
       if (this.element.isUpgraded()) {
-        if (this.state_ == ResourceState.NOT_LAID_OUT) {
+        if (this.state_ == ResourceState_Enum.NOT_LAID_OUT) {
           // If the element isn't laid out yet, then we're now ready for layout.
-          this.state_ = ResourceState.READY_FOR_LAYOUT;
+          this.state_ = ResourceState_Enum.READY_FOR_LAYOUT;
         } else if (
-          (this.state_ == ResourceState.LAYOUT_COMPLETE ||
-            this.state_ == ResourceState.LAYOUT_FAILED) &&
+          (this.state_ == ResourceState_Enum.LAYOUT_COMPLETE ||
+            this.state_ == ResourceState_Enum.LAYOUT_FAILED) &&
           this.element.isRelayoutNeeded()
         ) {
           // If the element was already laid out and we need to relayout, then
           // go back to ready for layout.
-          this.state_ = ResourceState.READY_FOR_LAYOUT;
+          this.state_ = ResourceState_Enum.READY_FOR_LAYOUT;
         }
       }
     }
@@ -636,7 +636,7 @@ export class Resource {
     if (!isConnected) {
       return false;
     }
-    const isFluid = this.element.getLayout() == Layout.FLUID;
+    const isFluid = this.element.getLayout() == Layout_Enum.FLUID;
     const box = this.getLayoutBox();
     const hasNonZeroSize = box.height > 0 && box.width > 0;
     return isFluid || hasNonZeroSize;
@@ -667,6 +667,14 @@ export class Resource {
     return this.element.prerenderAllowed();
   }
 
+  /**
+   * Whether this element can be previewed.
+   * @return {boolean}
+   */
+  previewAllowed() {
+    return this.element.previewAllowed();
+  }
+
   /**
    * Whether this element has render-blocking service.
    * @return {boolean}
@@ -811,7 +819,7 @@ export class Resource {
    * @param {number} scheduleTime The time at which layout was scheduled.
    */
   layoutScheduled(scheduleTime) {
-    this.state_ = ResourceState.LAYOUT_SCHEDULED;
+    this.state_ = ResourceState_Enum.LAYOUT_SCHEDULED;
     this.element.layoutScheduleTime = scheduleTime;
   }
 
@@ -820,8 +828,8 @@ export class Resource {
    */
   layoutCanceled() {
     this.state_ = this.hasBeenMeasured()
-      ? ResourceState.READY_FOR_LAYOUT
-      : ResourceState.NOT_LAID_OUT;
+      ? ResourceState_Enum.READY_FOR_LAYOUT
+      : ResourceState_Enum.NOT_LAID_OUT;
   }
 
   /**
@@ -834,23 +842,23 @@ export class Resource {
     if (this.layoutPromise_) {
       return this.layoutPromise_;
     }
-    if (this.state_ == ResourceState.LAYOUT_COMPLETE) {
+    if (this.state_ == ResourceState_Enum.LAYOUT_COMPLETE) {
       return Promise.resolve();
     }
-    if (this.state_ == ResourceState.LAYOUT_FAILED) {
+    if (this.state_ == ResourceState_Enum.LAYOUT_FAILED) {
       return Promise.reject(this.lastLayoutError_);
     }
 
     devAssert(
-      this.state_ != ResourceState.NOT_BUILT,
+      this.state_ != ResourceState_Enum.NOT_BUILT,
       'Not ready to start layout: %s (%s)',
       this.debugid,
       this.state_
     );
     devAssert(this.isDisplayed(), 'Not displayed for layout: %s', this.debugid);
 
-    if (this.state_ != ResourceState.LAYOUT_SCHEDULED) {
-      const err = dev().createError(
+    if (this.state_ != ResourceState_Enum.LAYOUT_SCHEDULED) {
+      const err = dev().createExpectedError(
         'startLayout called but not LAYOUT_SCHEDULED',
         'currently: ',
         this.state_
@@ -867,13 +875,13 @@ export class Resource {
         this.debugid,
         this.state_
       );
-      this.state_ = ResourceState.LAYOUT_COMPLETE;
+      this.state_ = ResourceState_Enum.LAYOUT_COMPLETE;
       return Promise.resolve();
     }
 
     dev().fine(TAG, 'start layout:', this.debugid, 'count:', this.layoutCount_);
     this.layoutCount_++;
-    this.state_ = ResourceState.LAYOUT_SCHEDULED;
+    this.state_ = ResourceState_Enum.LAYOUT_SCHEDULED;
     this.abortController_ = new AbortController();
     const {signal} = this.abortController_;
 
@@ -919,8 +927,8 @@ export class Resource {
     }
     this.layoutPromise_ = null;
     this.state_ = success
-      ? ResourceState.LAYOUT_COMPLETE
-      : ResourceState.LAYOUT_FAILED;
+      ? ResourceState_Enum.LAYOUT_COMPLETE
+      : ResourceState_Enum.LAYOUT_FAILED;
     this.lastLayoutError_ = opt_reason;
     if (success) {
       dev().fine(TAG, 'layout complete:', this.debugid);
@@ -936,8 +944,8 @@ export class Resource {
    */
   isLayoutPending() {
     return (
-      this.state_ != ResourceState.LAYOUT_COMPLETE &&
-      this.state_ != ResourceState.LAYOUT_FAILED
+      this.state_ != ResourceState_Enum.LAYOUT_COMPLETE &&
+      this.state_ != ResourceState_Enum.LAYOUT_FAILED
     );
   }
 
@@ -980,9 +988,9 @@ export class Resource {
    */
   unlayout() {
     if (
-      this.state_ == ResourceState.NOT_BUILT ||
-      this.state_ == ResourceState.NOT_LAID_OUT ||
-      this.state_ == ResourceState.READY_FOR_LAYOUT
+      this.state_ == ResourceState_Enum.NOT_BUILT ||
+      this.state_ == ResourceState_Enum.NOT_LAID_OUT ||
+      this.state_ == ResourceState_Enum.READY_FOR_LAYOUT
     ) {
       return;
     }
@@ -993,7 +1001,7 @@ export class Resource {
     this.setInViewport(false);
     if (this.element.unlayoutCallback()) {
       this.element.togglePlaceholder(true);
-      this.state_ = ResourceState.NOT_LAID_OUT;
+      this.state_ = ResourceState_Enum.NOT_LAID_OUT;
       this.layoutCount_ = 0;
       this.layoutPromise_ = null;
     }
diff --git a/src/service/resources-impl.js b/src/service/resources-impl.js
index 63bd9e0e852b..e0735a7ce839 100644
--- a/src/service/resources-impl.js
+++ b/src/service/resources-impl.js
@@ -1,4 +1,4 @@
-import {VisibilityState} from '#core/constants/visibility-state';
+import {VisibilityState_Enum} from '#core/constants/visibility-state';
 import {FiniteStateMachine} from '#core/data-structures/finite-state-machine';
 import {Deferred} from '#core/data-structures/promise';
 import {hasNextNodeInDocumentOrder} from '#core/dom';
@@ -6,14 +6,13 @@ import {expandLayoutRect} from '#core/dom/layout/rect';
 import * as mode from '#core/mode';
 import {remove} from '#core/types/array';
 import {throttle} from '#core/types/function';
-import {dict} from '#core/types/object';
 
 import {Services} from '#service';
 
 import {listen, loadPromise} from '#utils/event-helper';
 import {dev, devAssert} from '#utils/log';
 
-import {Resource, ResourceState} from './resource';
+import {Resource, ResourceState_Enum} from './resource';
 import {READY_SCAN_SIGNAL, ResourcesInterface} from './resources-interface';
 import {TaskQueue} from './task-queue';
 
@@ -172,7 +171,7 @@ export class ResourcesImpl {
     /** @const @private {!Deferred} */
     this.firstPassDone_ = new Deferred();
 
-    /** @private @const {!FiniteStateMachine<!VisibilityState>} */
+    /** @private @const {!FiniteStateMachine<!VisibilityState_Enum>} */
     this.visibilityStateMachine_ = new FiniteStateMachine(
       this.ampdoc.getVisibilityState()
     );
@@ -305,7 +304,7 @@ export class ResourcesImpl {
     let resource = Resource.forElementOptional(element);
     if (
       resource &&
-      resource.getState() != ResourceState.NOT_BUILT &&
+      resource.getState() != ResourceState_Enum.NOT_BUILT &&
       !element.reconstructWhenReparented()
     ) {
       resource.requestMeasure();
@@ -333,7 +332,12 @@ export class ResourcesImpl {
     // Most documents have 10 or less AMP tags. By building 20 we should not
     // change the behavior for the vast majority of docs, and almost always
     // catch everything in the first viewport.
-    return this.buildAttemptsCount_ < 20 || this.ampdoc.hasBeenVisible();
+    return (
+      this.buildAttemptsCount_ < 20 ||
+      // Ignore build quota for previews.
+      this.ampdoc.getVisibilityState() == VisibilityState_Enum.PREVIEW ||
+      this.ampdoc.hasBeenVisible()
+    );
   }
 
   /**
@@ -354,13 +358,17 @@ export class ResourcesImpl {
       return;
     }
 
-    // During prerender mode, don't build elements that aren't allowed to be
-    // prerendered. This avoids wasting our prerender build quota.
+    // During prerender/preview mode, don't build elements that aren't allowed
+    // to be prerendered. This avoids wasting our prerender build quota.
     // See isUnderBuildQuota_() for more details.
-    const shouldBuildResource =
-      this.ampdoc.getVisibilityState() != VisibilityState.PRERENDER ||
-      resource.prerenderAllowed();
-    if (!shouldBuildResource) {
+    const visibilityState = this.ampdoc.getVisibilityState();
+    const shouldSkipForPrerender =
+      visibilityState == VisibilityState_Enum.PRERENDER &&
+      !resource.prerenderAllowed();
+    const shouldSkipForPreview =
+      visibilityState == VisibilityState_Enum.PREVIEW &&
+      !resource.previewAllowed();
+    if (shouldSkipForPrerender || shouldSkipForPreview) {
       return;
     }
 
@@ -473,7 +481,7 @@ export class ResourcesImpl {
       resource.pauseOnRemove();
     }
 
-    if (resource.getState() === ResourceState.LAYOUT_SCHEDULED) {
+    if (resource.getState() === ResourceState_Enum.LAYOUT_SCHEDULED) {
       resource.layoutCanceled();
     }
     this.cleanupTasks_(resource, /* opt_removePending */ true);
@@ -591,7 +599,7 @@ export class ResourcesImpl {
       // data.metaTags.viewport from 'documentLoaded' message.
       this.viewer_.sendMessage(
         'documentLoaded',
-        dict({
+        {
           'title': doc.title,
           'sourceUrl': getSourceUrl(this.ampdoc.getUrl()),
           'isStory': doc.body.firstElementChild?.tagName === 'AMP-STORY',
@@ -599,14 +607,14 @@ export class ResourcesImpl {
           'linkRels': documentInfo.linkRels,
           'metaTags': {'viewport': documentInfo.viewport} /* deprecated */,
           'viewport': documentInfo.viewport,
-        }),
+        },
         /* cancelUnsent */ true
       );
 
       this.contentHeight_ = this.viewport_.getContentHeight();
       this.viewer_.sendMessage(
         'documentHeight',
-        dict({'height': this.contentHeight_}),
+        {'height': this.contentHeight_},
         /* cancelUnsent */ true
       );
       dev().fine(TAG_, 'document height on load: %s', this.contentHeight_);
@@ -651,7 +659,7 @@ export class ResourcesImpl {
         if (measuredContentHeight != this.contentHeight_) {
           this.viewer_.sendMessage(
             'documentHeight',
-            dict({'height': measuredContentHeight}),
+            {'height': measuredContentHeight},
             /* cancelUnsent */ true
           );
           this.contentHeight_ = measuredContentHeight;
@@ -1058,7 +1066,7 @@ export class ResourcesImpl {
     for (let i = 0; i < this.resources_.length; i++) {
       const r = this.resources_[i];
       if (
-        r.getState() == ResourceState.NOT_BUILT &&
+        r.getState() == ResourceState_Enum.NOT_BUILT &&
         !r.isBuilding() &&
         !r.element.R1()
       ) {
@@ -1069,7 +1077,7 @@ export class ResourcesImpl {
         relayoutAll ||
         !r.hasBeenMeasured() ||
         // NOT_LAID_OUT is the state after build() but before measure().
-        r.getState() == ResourceState.NOT_LAID_OUT
+        r.getState() == ResourceState_Enum.NOT_LAID_OUT
       ) {
         relayoutCount++;
       }
@@ -1096,7 +1104,7 @@ export class ResourcesImpl {
         }
         let needsMeasure =
           relayoutAll ||
-          r.getState() == ResourceState.NOT_LAID_OUT ||
+          r.getState() == ResourceState_Enum.NOT_LAID_OUT ||
           !r.hasBeenMeasured() ||
           r.isMeasureRequested() ||
           (relayoutTop != -1 && r.getLayoutBox().bottom >= relayoutTop);
@@ -1152,7 +1160,7 @@ export class ResourcesImpl {
     for (let i = 0; i < this.resources_.length; i++) {
       const r = this.resources_[i];
       if (
-        r.getState() == ResourceState.NOT_BUILT ||
+        r.getState() == ResourceState_Enum.NOT_BUILT ||
         r.hasOwner() ||
         r.element.R1()
       ) {
@@ -1191,7 +1199,10 @@ export class ResourcesImpl {
             /* ignoreQuota */ true
           );
         }
-        if (r.getState() != ResourceState.READY_FOR_LAYOUT || r.hasOwner()) {
+        if (
+          r.getState() != ResourceState_Enum.READY_FOR_LAYOUT ||
+          r.hasOwner()
+        ) {
           continue;
         }
         // TODO(dvoytenko, #3434): Reimplement the use of `isFixed` with
@@ -1214,7 +1225,7 @@ export class ResourcesImpl {
       ) {
         const r = this.resources_[i];
         if (
-          r.getState() == ResourceState.READY_FOR_LAYOUT &&
+          r.getState() == ResourceState_Enum.READY_FOR_LAYOUT &&
           !r.hasOwner() &&
           !r.element.R1() &&
           r.isDisplayed() &&
@@ -1234,7 +1245,7 @@ export class ResourcesImpl {
       ) {
         const r = this.resources_[i];
         if (
-          r.getState() == ResourceState.READY_FOR_LAYOUT &&
+          r.getState() == ResourceState_Enum.READY_FOR_LAYOUT &&
           !r.hasOwner() &&
           !r.element.R1() &&
           r.isDisplayed()
@@ -1489,7 +1500,7 @@ export class ResourcesImpl {
   isLayoutAllowed_(resource, forceOutsideViewport) {
     // Only built and displayed elements can be loaded.
     if (
-      resource.getState() == ResourceState.NOT_BUILT ||
+      resource.getState() == ResourceState_Enum.NOT_BUILT ||
       !resource.isDisplayed()
     ) {
       return false;
@@ -1497,13 +1508,16 @@ export class ResourcesImpl {
 
     // Don't schedule elements when we're not visible, or in prerender mode
     // (and they can't prerender).
-    if (!this.visible_) {
-      if (
-        this.ampdoc.getVisibilityState() != VisibilityState.PRERENDER ||
-        !resource.prerenderAllowed()
-      ) {
-        return false;
-      }
+    const visibilityState = this.ampdoc.getVisibilityState();
+    const shouldPrerender =
+      visibilityState == VisibilityState_Enum.PRERENDER &&
+      resource.prerenderAllowed();
+    const shouldPreview =
+      visibilityState == VisibilityState_Enum.PREVIEW &&
+      resource.previewAllowed();
+    const shouldBuild = this.visible_ || shouldPrerender || shouldPreview;
+    if (!shouldBuild) {
+      return false;
     }
 
     // The element has to be in its rendering corridor.
@@ -1529,7 +1543,7 @@ export class ResourcesImpl {
     if (resource.element.R1()) {
       return;
     }
-    const isBuilt = resource.getState() != ResourceState.NOT_BUILT;
+    const isBuilt = resource.getState() != ResourceState_Enum.NOT_BUILT;
     const isDisplayed = resource.isDisplayed();
     if (!isBuilt || !isDisplayed) {
       devAssert(
@@ -1620,7 +1634,7 @@ export class ResourcesImpl {
 
   /**
    * Calls iterator on each sub-resource
-   * @param {!FiniteStateMachine<!VisibilityState>} vsm
+   * @param {!FiniteStateMachine<!VisibilityState_Enum>} vsm
    */
   setupVisibilityStateMachine_(vsm) {
     const {
@@ -1628,8 +1642,9 @@ export class ResourcesImpl {
       INACTIVE: inactive,
       PAUSED: paused,
       PRERENDER: prerender,
+      PREVIEW: preview,
       VISIBLE: visible,
-    } = VisibilityState;
+    } = VisibilityState_Enum;
     const doWork = () => {
       // If viewport size is 0, the manager will wait for the resize event.
       const viewportSize = this.viewport_.getSize();
@@ -1676,11 +1691,18 @@ export class ResourcesImpl {
     };
 
     vsm.addTransition(prerender, prerender, doWork);
+    vsm.addTransition(prerender, preview, doWork);
     vsm.addTransition(prerender, visible, doWork);
     vsm.addTransition(prerender, hidden, doWork);
     vsm.addTransition(prerender, inactive, doWork);
     vsm.addTransition(prerender, paused, doWork);
 
+    vsm.addTransition(preview, preview, doWork);
+    vsm.addTransition(preview, visible, doWork);
+    vsm.addTransition(preview, hidden, doWork);
+    vsm.addTransition(preview, inactive, doWork);
+    vsm.addTransition(preview, paused, doWork);
+
     vsm.addTransition(visible, visible, doWork);
     vsm.addTransition(visible, hidden, doWork);
     vsm.addTransition(visible, inactive, unload);
@@ -1723,8 +1745,8 @@ export class ResourcesImpl {
    */
   cleanupTasks_(resource, opt_removePending) {
     if (
-      resource.getState() == ResourceState.NOT_LAID_OUT ||
-      resource.getState() == ResourceState.READY_FOR_LAYOUT
+      resource.getState() == ResourceState_Enum.NOT_LAID_OUT ||
+      resource.getState() == ResourceState_Enum.READY_FOR_LAYOUT
     ) {
       // If the layout promise for this resource has not resolved yet, remove
       // it from the task queues to make sure this resource can be rescheduled
@@ -1743,7 +1765,7 @@ export class ResourcesImpl {
     }
 
     if (
-      resource.getState() == ResourceState.NOT_BUILT &&
+      resource.getState() == ResourceState_Enum.NOT_BUILT &&
       opt_removePending &&
       this.pendingBuildResources_
     ) {
diff --git a/src/service/resources-interface.js b/src/service/resources-interface.js
index 8ee3a4dbc195..43bde1d580d7 100644
--- a/src/service/resources-interface.js
+++ b/src/service/resources-interface.js
@@ -24,7 +24,7 @@ export let MarginChangeDef;
  */
 export let ChangeSizeRequestDef;
 
-/* eslint-disable no-unused-vars */
+/* eslint-disable @typescript-eslint/no-unused-vars */
 /**
  * @interface
  */
@@ -160,4 +160,3 @@ export class ResourcesInterface {
    */
   updateLayoutPriority(element, newLayoutPriority) {}
 }
-/* eslint-enable no-unused-vars */
diff --git a/src/service/scheduler.js b/src/service/scheduler.js
index e62223608c6c..017d819c3975 100644
--- a/src/service/scheduler.js
+++ b/src/service/scheduler.js
@@ -1,10 +1,10 @@
-import {VisibilityState} from '#core/constants/visibility-state';
+import {VisibilityState_Enum} from '#core/constants/visibility-state';
 import {
   containsNotSelf,
   hasNextNodeInDocumentOrder,
   isIframed,
 } from '#core/dom';
-import {LayoutPriority} from '#core/dom/layout';
+import {LayoutPriority_Enum} from '#core/dom/layout';
 import {removeItem} from '#core/types/array';
 
 import {READY_SCAN_SIGNAL} from './resources-interface';
@@ -184,9 +184,10 @@ export class Scheduler {
   docVisibilityChanged_() {
     const vs = this.ampdoc_.getVisibilityState();
     if (
-      vs == VisibilityState.VISIBLE ||
-      vs == VisibilityState.HIDDEN ||
-      vs == VisibilityState.PRERENDER
+      vs == VisibilityState_Enum.VISIBLE ||
+      vs == VisibilityState_Enum.HIDDEN ||
+      vs == VisibilityState_Enum.PRERENDER ||
+      vs == VisibilityState_Enum.PREVIEW
     ) {
       this.targets_.forEach((_, target) => this.maybeBuild_(target));
     }
@@ -270,11 +271,13 @@ export class Scheduler {
     const toBuild =
       parsed &&
       (asap || isIntersecting) &&
-      (vs == VisibilityState.VISIBLE ||
+      (vs == VisibilityState_Enum.VISIBLE ||
         // Hidden (hidden tab) allows full build.
-        vs == VisibilityState.HIDDEN ||
+        vs == VisibilityState_Enum.HIDDEN ||
         // Prerender can only proceed when allowed.
-        (vs == VisibilityState.PRERENDER && target.prerenderAllowed()));
+        (vs == VisibilityState_Enum.PRERENDER && target.prerenderAllowed()) ||
+        // Preview can only proceed when allowed.
+        (vs == VisibilityState_Enum.PREVIEW && target.previewAllowed()));
     if (!toBuild) {
       return;
     }
@@ -285,7 +288,7 @@ export class Scheduler {
     // elements are scheduled via the `requestIdleCallback`.
     const {win} = this.ampdoc_;
     const scheduler =
-      asap || target.getBuildPriority() <= LayoutPriority.CONTENT
+      asap || target.getBuildPriority() <= LayoutPriority_Enum.CONTENT
         ? win.setTimeout
         : win.requestIdleCallback || win.setTimeout;
     scheduler(() => target.mountInternal());
diff --git a/src/service/standard-actions-impl.js b/src/service/standard-actions-impl.js
index dd41fcc426e7..2ff6a196869c 100644
--- a/src/service/standard-actions-impl.js
+++ b/src/service/standard-actions-impl.js
@@ -1,12 +1,18 @@
-import {ActionTrust} from '#core/constants/action-constants';
+import {devAssertElement} from '#core/assert';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
 import {tryFocus} from '#core/dom';
-import {Layout, getLayoutClass} from '#core/dom/layout';
+import {Layout_Enum, getLayoutClass} from '#core/dom/layout';
 import {computedStyle, toggle} from '#core/dom/style';
 import {isFiniteNumber} from '#core/types';
 import {getWin} from '#core/window';
+import {
+  copyTextToClipboard,
+  isCopyingToClipboardSupported,
+} from '#core/window/clipboard';
 
 import {Services} from '#service';
 
+import {createCustomEvent} from '#utils/event-helper';
 import {dev, user, userAssert} from '#utils/log';
 
 import {getAmpdoc, registerServiceBuilderForDoc} from '../service-helpers';
@@ -64,6 +70,8 @@ export class StandardActions {
     // Explicitly not setting `Action` as a member to scope installation to one
     // method and for bundle size savings. 💰
     this.installActions_(Services.actionServiceForDoc(context));
+
+    this.initThemeMode_();
   }
 
   /**
@@ -97,12 +105,50 @@ export class StandardActions {
       this.handleToggleClass_.bind(this)
     );
 
+    actionService.addGlobalMethodHandler('copy', this.handleCopy_.bind(this));
+
     actionService.addGlobalMethodHandler(
       'toggleChecked',
       this.handleToggleChecked_.bind(this)
     );
   }
 
+  /**
+   * Handles initiliazing the theme mode.
+   *
+   * This methode needs to be called on page load to set the `amp-dark-mode`
+   * class on the body if the user prefers the dark mode.
+   */
+  initThemeMode_() {
+    if (this.prefersDarkMode_()) {
+      this.ampdoc.waitForBodyOpen().then((body) => {
+        const darkModeClass =
+          body.getAttribute('data-prefers-dark-mode-class') || 'amp-dark-mode';
+
+        body.classList.add(darkModeClass);
+      });
+    }
+  }
+
+  /**
+   * Checks whether the user prefers dark mode based on local storage and
+   * user's operating systen settings.
+   *
+   * @return {boolean}
+   */
+  prefersDarkMode_() {
+    try {
+      const themeMode = this.ampdoc.win.localStorage.getItem('amp-dark-mode');
+
+      if (themeMode) {
+        return 'yes' === themeMode;
+      }
+    } catch (e) {}
+
+    // LocalStorage may not be accessible
+    return this.ampdoc.win.matchMedia?.('(prefers-color-scheme: dark)').matches;
+  }
+
   /**
    * Handles global `AMP` actions.
    * See `amp-actions-and-events.md` for details.
@@ -113,7 +159,7 @@ export class StandardActions {
    */
   handleAmpTarget_(invocation) {
     // All global `AMP` actions require default trust.
-    if (!invocation.satisfiesTrust(ActionTrust.DEFAULT)) {
+    if (!invocation.satisfiesTrust(ActionTrust_Enum.DEFAULT)) {
       return null;
     }
     const {args, method, node} = invocation;
@@ -154,16 +200,102 @@ export class StandardActions {
         win.print();
         return null;
 
+      case 'copy':
+        return this.handleCopy_(invocation);
+
       case 'optoutOfCid':
         return Services.cidForDoc(this.ampdoc)
           .then((cid) => cid.optOut())
           .catch((reason) => {
             dev().error(TAG, 'Failed to opt out of CID', reason);
           });
+      case 'toggleTheme':
+        this.handleToggleTheme_();
+        return null;
     }
     throw user().createError('Unknown AMP action ', method);
   }
 
+  /**
+   * Handles the copy to clipboard action
+   * @param {!./action-impl.ActionInvocation} invocation
+   */
+  handleCopy_(invocation) {
+    const {args, node} = invocation;
+    const win = getWin(node);
+
+    /** @enum {string} */
+    const CopyEvents = {
+      COPY_ERROR: 'copy-error',
+      COPY_SUCCESS: 'copy-success',
+    };
+    let textToCopy;
+
+    if (invocation.tagOrTarget === 'AMP') {
+      //
+      // Copy Static Text
+      //  Example: AMP.copy(text='TextToCopy');
+      //
+      textToCopy = args['text'].trim();
+    } else {
+      //
+      // Copy Target Element Text
+      //  Example: targetId.copy();
+      //
+      const target = devAssertElement(invocation.node);
+      textToCopy = (target.value ?? target.textContent).trim();
+    }
+
+    /**
+     * Raises a status event for copy task result
+     * @param {string} eventName
+     * @param {string} eventResult
+     * @param {!./action-impl.ActionInvocation} invocation
+     */
+    const triggerEvent = function (eventName, eventResult, invocation) {
+      const eventValue = /** @type {!JsonObject} */ ({
+        data: /** @type {!JsonObject} */ {type: eventResult},
+      });
+      const copyEvent = createCustomEvent(win, `${eventName}`, eventValue);
+
+      const action_ = Services.actionServiceForDoc(invocation.caller);
+      action_.trigger(
+        invocation.caller,
+        eventName,
+        copyEvent,
+        ActionTrust_Enum.HIGH
+      );
+    };
+
+    //
+    // Trigger Event based on copy action
+    //  - If content got copied to the clipboard successfully, it will
+    //    fire `copy-success` event with data type `success`.
+    //  - If there's any error in copying, it will
+    //    fire `copy-error` event with data type `error`.
+    //  - If browser is not supporting the copy function/action, it
+    //    will fire `copy-error` event with data type `browser`.
+    //
+    //  Example: <button on="tap:AMP.copy(text='Hello AMP');copy-success:copied.show()">Copy</button>
+    //
+    if (isCopyingToClipboardSupported(win.document)) {
+      copyTextToClipboard(
+        win,
+        textToCopy,
+        () => {
+          triggerEvent(CopyEvents.COPY_SUCCESS, 'success', invocation);
+        },
+        () => {
+          // Error encountered while copying.
+          triggerEvent(CopyEvents.COPY_ERROR, 'error', invocation);
+        }
+      );
+    } else {
+      // Copy is disabled or not supported by user.
+      triggerEvent(CopyEvents.COPY_ERROR, 'unsupported', invocation);
+    }
+  }
+
   /**
    * Handles the `navigateTo` action.
    * @param {!./action-impl.ActionInvocation} invocation
@@ -198,6 +330,30 @@ export class StandardActions {
     );
   }
 
+  /**
+   * Handles the `toggleTheme` action.
+   *
+   * This action sets the `amp-dark-mode` class on the body element and stores the the preference for dark mode in localstorage.
+   */
+  handleToggleTheme_() {
+    this.ampdoc.waitForBodyOpen().then((body) => {
+      try {
+        const darkModeClass =
+          body.getAttribute('data-prefers-dark-mode-class') || 'amp-dark-mode';
+
+        if (this.prefersDarkMode_()) {
+          body.classList.remove(darkModeClass);
+          this.ampdoc.win.localStorage.setItem('amp-dark-mode', 'no');
+        } else {
+          body.classList.add(darkModeClass);
+          this.ampdoc.win.localStorage.setItem('amp-dark-mode', 'yes');
+        }
+      } catch (e) {
+        // LocalStorage may not be accessible.
+      }
+    });
+  }
+
   /**
    * Handles the `handleCloseOrNavigateTo_` action.
    * This action tries to close the requesting window if allowed, otherwise
@@ -322,7 +478,7 @@ export class StandardActions {
     const target = dev().assertElement(node);
     const ownerWindow = getWin(target);
 
-    if (target.classList.contains(getLayoutClass(Layout.NODISPLAY))) {
+    if (target.classList.contains(getLayoutClass(Layout_Enum.NODISPLAY))) {
       user().warn(
         TAG,
         'Elements with layout=nodisplay cannot be dynamically shown.',
@@ -435,7 +591,7 @@ export class StandardActions {
     const {args} = invocation;
 
     this.mutator_.mutateElement(target, () => {
-      if (args['force'] !== undefined) {
+      if (args?.['force'] !== undefined) {
         // must be boolean, won't do type conversion
         const shouldForce = user().assertBoolean(
           args['force'],
diff --git a/src/service/storage-impl.js b/src/service/storage-impl.js
index 5d1c6b96f3c4..1e5c7659a7b0 100644
--- a/src/service/storage-impl.js
+++ b/src/service/storage-impl.js
@@ -1,4 +1,4 @@
-import {dict, recreateNonProtoObject} from '#core/types/object';
+import {recreateNonProtoObject} from '#core/types/object';
 import {parseJson} from '#core/types/object/json';
 
 import {Services} from '#service';
@@ -202,7 +202,7 @@ export class Store {
     /** @private @const {number} */
     this.maxValues_ = opt_maxValues || MAX_VALUES_PER_ORIGIN;
 
-    /** @private @const {!Object<string, !JsonObject>} */
+    /** @private @const {!{[key: string]: !JsonObject}} */
     this.values_ = this.obj['vv'] || Object.create(null);
     if (!this.obj['vv']) {
       this.obj['vv'] = this.values_;
@@ -251,10 +251,10 @@ export class Store {
       item['v'] = value;
       item['t'] = timestamp;
     } else {
-      this.values_[name] = dict({
+      this.values_[name] = {
         'v': value,
         't': Date.now(),
-      });
+      };
     }
 
     // Purge old values.
@@ -400,26 +400,17 @@ export class ViewerStorageBinding {
   /** @override */
   loadBlob(origin) {
     return this.viewer_
-      .sendMessageAwaitResponse('loadStore', dict({'origin': origin}))
+      .sendMessageAwaitResponse('loadStore', {'origin': origin})
       .then((response) => response['blob']);
   }
 
   /** @override */
   saveBlob(origin, blob) {
-    return /** @type {!Promise} */ (
-      this.viewer_
-        .sendMessageAwaitResponse(
-          'saveStore',
-          dict({'origin': origin, 'blob': blob})
-        )
-        .catch((reason) => {
-          throw dev().createExpectedError(
-            TAG,
-            'Failed to save store: ',
-            reason
-          );
-        })
-    );
+    return /** @type {!Promise} */ this.viewer_
+      .sendMessageAwaitResponse('saveStore', {'origin': origin, 'blob': blob})
+      .catch((reason) => {
+        throw dev().createExpectedError(TAG, 'Failed to save store: ', reason);
+      });
   }
 }
 
diff --git a/src/service/task-queue.js b/src/service/task-queue.js
index ac45e3d756f9..c2783f65dde0 100644
--- a/src/service/task-queue.js
+++ b/src/service/task-queue.js
@@ -28,7 +28,7 @@ export class TaskQueue {
     /** @private @const {!Array<!TaskDef>} */
     this.tasks_ = [];
 
-    /** @private @const {!Object<string, !TaskDef>} */
+    /** @private @const {!{[key: string]: !TaskDef}} */
     this.taskIdMap_ = {};
 
     /** @private {!time} */
diff --git a/src/service/template-impl.js b/src/service/template-impl.js
index e73a77e19834..c92e7946f47e 100644
--- a/src/service/template-impl.js
+++ b/src/service/template-impl.js
@@ -34,14 +34,14 @@ export class Templates {
 
     /**
      * A map from template type to template's class promise.
-     * @private @const {!Object<string, !Promise<typeof ../base-template.BaseTemplate>>}
+     * @private @const {!{[key: string]: !Promise<typeof ../base-template.BaseTemplate>}}
      */
     this.templateClassMap_ = {};
 
     /**
      * A map from template type to template's class promise. This is a transient
      * storage. As soon as the template class loaded, the entry is removed.
-     * @private @const {!Object<string, function(typeof ../base-template.BaseTemplate)>}
+     * @private @const {!{[key: string]: function(typeof ../base-template.BaseTemplate)}}
      */
     this.templateClassResolvers_ = {};
   }
@@ -91,6 +91,23 @@ export class Templates {
     });
   }
 
+  /**
+   * Resolves to a reusable template renderer.
+   *
+   * @param {!Element} templateElement
+   * @return {Promise<{
+   *   renderAsString: function(*=): string
+   * }>}
+   */
+  getTemplateRenderer(templateElement) {
+    return this.getImplementation_(templateElement).then((impl) => {
+      const renderer = {
+        renderAsString: (data) => impl.renderAsString(data),
+      };
+      return renderer;
+    });
+  }
+
   /**
    * Renders the specified template element using the supplied array of data
    * and returns an array of resulting elements.
diff --git a/src/service/url-expander/expander.js b/src/service/url-expander/expander.js
index 8a0b9d61c720..f2782607ce9b 100644
--- a/src/service/url-expander/expander.js
+++ b/src/service/url-expander/expander.js
@@ -37,11 +37,11 @@ export class Expander {
   /**
    * Link this instance of parser to the calling UrlReplacment
    * @param {?../variable-source.VariableSource} variableSource the keywords to replace
-   * @param {!Object<string, *>=} opt_bindings additional one-off bindings
-   * @param {!Object<string, *>=} opt_collectVars Object passed in to collect
+   * @param {!{[key: string]: *}=} opt_bindings additional one-off bindings
+   * @param {!{[key: string]: *}=} opt_collectVars Object passed in to collect
    *   variable resolutions.
    * @param {boolean=} opt_sync If the method should resolve syncronously.
-   * @param {!Object<string, boolean>=} opt_allowlist Optional allowlist of names
+   * @param {!{[key: string]: boolean}=} opt_allowlist Optional allowlist of names
    *   that can be substituted.
    * @param {boolean=} opt_noEncode Should not urlEncode macro resolution.
    */
@@ -56,17 +56,17 @@ export class Expander {
     /** @const {?../variable-source.VariableSource} */
     this.variableSource_ = variableSource;
 
-    /**@const {!Object<string, *>|undefined} */
+    /**@const {!{[key: string]: *}|undefined} */
     this.bindings_ = opt_bindings;
 
     // TODO(ccordry): Remove this output object passed into constructor.
-    /**@const {!Object<string, *>|undefined} */
+    /**@const {!{[key: string]: *}|undefined} */
     this.collectVars_ = opt_collectVars;
 
     /**@const {boolean|undefined} */
     this.sync_ = opt_sync;
 
-    /**@const {!Object<string, boolean>|undefined} */
+    /**@const {!{[key: string]: boolean}|undefined} */
     this.allowlist_ = opt_allowlist;
 
     /**@const {boolean|undefined} */
diff --git a/src/service/url-impl.js b/src/service/url-impl.js
index f0d652fdd334..a6e51ed62c65 100644
--- a/src/service/url-impl.js
+++ b/src/service/url-impl.js
@@ -1,7 +1,7 @@
 import {LruCache} from '#core/data-structures/lru-cache';
 import * as mode from '#core/mode';
 
-import {urls} from '../config';
+import * as urls from '../config/urls';
 import {registerServiceBuilderForDoc} from '../service-helpers';
 import {
   assertAbsoluteHttpOrHttpsUrl,
diff --git a/src/service/url-replacements-impl.js b/src/service/url-replacements-impl.js
index aed584ca05bb..b8d57083f275 100644
--- a/src/service/url-replacements-impl.js
+++ b/src/service/url-replacements-impl.js
@@ -66,7 +66,7 @@ function screenProperty(screen, property) {
 
 /**
  *
- * @param {Object<string,(string|Array<string>)>|null} geo
+ * @param {{[key: string]: (string|Array<string})>|null} geo
  * @param {string} geoType
  * @return {string}
  */
@@ -93,8 +93,11 @@ export class GlobalVariableSource extends VariableSource {
   constructor(ampdoc) {
     super(ampdoc);
 
-    /** @private {Object<string,(string|Array<string>)>|null} */
+    /** @private {{[key: string]: (string|Array<string})>|null} */
     this.cachedGeo_ = null;
+
+    /** @private {{[key: string]: string}}*/
+    this.cachedUach_ = {};
   }
 
   /**
@@ -280,7 +283,7 @@ export class GlobalVariableSource extends VariableSource {
     /**
      * Stores client ids that were generated during this page view
      * indexed by scope.
-     * @type {?Object<string, string>}
+     * @type {?{[key: string]: string}}
      */
     let clientIds = null;
     // Synchronous alternative. Only works for scopes that were previously
@@ -459,16 +462,12 @@ export class GlobalVariableSource extends VariableSource {
     });
 
     // Returns the user agent client hint.
-    this.setAsync(
+    this.setBoth(
       'UACH',
-      (variable) =>
-        win.navigator?.userAgentData
-          ?.getHighEntropyValues([variable])
-          ?.then((values) =>
-            typeof values[variable] !== 'object'
-              ? values[variable]
-              : JSON.stringify(values[variable])
-          ) || Promise.resolve('')
+      // Synchronous alternative, will only work if the requested values were
+      // previously requested using the async method.
+      (variable) => this.cachedUach_[variable] ?? '',
+      (variable) => this.getUach_(variable, win)
     );
 
     // Returns the time it took to load the whole page. (excludes amp-* elements
@@ -755,7 +754,7 @@ export class GlobalVariableSource extends VariableSource {
 
   /**
    * Resolves the value via amp-experiment's variants service.
-   * @param {function(!Object<string, string>):(?string)} getter
+   * @param {function(!{[key: string]: string}):(?string)} getter
    * @param {string} expr
    * @return {!Promise<?string>}
    * @template T
@@ -778,7 +777,7 @@ export class GlobalVariableSource extends VariableSource {
    * Resolves the value via geo service.
    * @param {function(!../../extensions/amp-geo/0.1/amp-geo.GeoDef)} getter
    * @param {string} expr
-   * @return {!Promise<Object<string,(string|Array<string>)>>}
+   * @return {!Promise<{[key: string]: (string|Array<string})>>}
    * @template T
    * @private
    */
@@ -793,6 +792,31 @@ export class GlobalVariableSource extends VariableSource {
       return getter(geo);
     });
   }
+
+  /**
+   * Returns cached uach signal if available, calculate it if not.
+   * @param {string} variable
+   * @param {!Window} win
+   * @return {!Promise<string>}
+   */
+  getUach_(variable, win) {
+    if (variable in this.cachedUach_) {
+      return Promise.resolve(this.cachedUach_[variable]);
+    } else {
+      return (
+        win.navigator?.userAgentData
+          ?.getHighEntropyValues([variable])
+          ?.then((values) => {
+            const value =
+              typeof values[variable] !== 'object'
+                ? values[variable]
+                : JSON.stringify(values[variable]);
+            this.cachedUach_[variable] = value;
+            return value;
+          }) || Promise.resolve('')
+      );
+    }
+  }
 }
 
 /**
@@ -818,8 +842,8 @@ export class UrlReplacements {
    * with their resolved values. Optional `opt_bindings` can be used to add new
    * variables or override existing ones.  Any async bindings are ignored.
    * @param {string} source
-   * @param {!Object<string, (ResolverReturnDef|!SyncResolverDef)>=} opt_bindings
-   * @param {!Object<string, boolean>=} opt_allowlist Optional allowlist of
+   * @param {!{[key: string]: (ResolverReturnDef|!SyncResolverDef)}=} opt_bindings
+   * @param {!{[key: string]: boolean}=} opt_allowlist Optional allowlist of
    *     names that can be substituted.
    * @return {string}
    */
@@ -841,8 +865,8 @@ export class UrlReplacements {
    * resolved values. Optional `opt_bindings` can be used to add new variables
    * or override existing ones.
    * @param {string} source
-   * @param {!Object<string, *>=} opt_bindings
-   * @param {!Object<string, boolean>=} opt_allowlist
+   * @param {!{[key: string]: *}=} opt_bindings
+   * @param {!{[key: string]: boolean}=} opt_allowlist
    * @return {!Promise<string>}
    */
   expandStringAsync(source, opt_bindings, opt_allowlist) {
@@ -863,8 +887,8 @@ export class UrlReplacements {
    * with their resolved values. Optional `opt_bindings` can be used to add new
    * variables or override existing ones.  Any async bindings are ignored.
    * @param {string} url
-   * @param {!Object<string, (ResolverReturnDef|!SyncResolverDef)>=} opt_bindings
-   * @param {!Object<string, boolean>=} opt_allowlist Optional allowlist of
+   * @param {!{[key: string]: (ResolverReturnDef|!SyncResolverDef)}=} opt_bindings
+   * @param {!{[key: string]: boolean}=} opt_allowlist Optional allowlist of
    *     names that can be substituted.
    * @return {string}
    */
@@ -888,8 +912,8 @@ export class UrlReplacements {
    * resolved values. Optional `opt_bindings` can be used to add new variables
    * or override existing ones.
    * @param {string} url
-   * @param {!Object<string, *>=} opt_bindings
-   * @param {!Object<string, boolean>=} opt_allowlist Optional allowlist of names
+   * @param {!{[key: string]: *}=} opt_bindings
+   * @param {!{[key: string]: boolean}=} opt_allowlist Optional allowlist of names
    *     that can be substituted.
    * @param {boolean=} opt_noEncode should not encode URL
    * @return {!Promise<string>}
@@ -972,9 +996,9 @@ export class UrlReplacements {
   /**
    * Returns a replacement allowlist from elements' data-amp-replace attribute.
    * @param {!Element} element
-   * @param {!Object<string, boolean>=} opt_supportedReplacement Optional supported
+   * @param {!{[key: string]: boolean}=} opt_supportedReplacement Optional supported
    * replacement that filters allowlist to a subset.
-   * @return {!Object<string, boolean>|undefined}
+   * @return {!{[key: string]: boolean}|undefined}
    */
   getAllowlistForElement_(element, opt_supportedReplacement) {
     const allowlist = element.getAttribute('data-amp-replace');
@@ -1112,7 +1136,7 @@ export class UrlReplacements {
 
   /**
    * @param {string} href
-   * @param {!Object<string, boolean>|undefined} allowlist
+   * @param {!{[key: string]: boolean}|undefined} allowlist
    * @return {string}
    */
   expandSyncIfAllowedList_(href, allowlist) {
@@ -1130,8 +1154,8 @@ export class UrlReplacements {
    * values for known variables. Optional `opt_bindings` can be used to add
    * new variables or override existing ones.
    * @param {string} url
-   * @param {!Object<string, *>=} opt_bindings
-   * @return {!Promise<!Object<string, *>>}
+   * @param {!{[key: string]: *}=} opt_bindings
+   * @return {!Promise<!{[key: string]: *}>}
    */
   collectVars(url, opt_bindings) {
     const vars = Object.create(null);
diff --git a/src/service/variable-source.js b/src/service/variable-source.js
index 31c457e4d66d..8bb3c8455a39 100644
--- a/src/service/variable-source.js
+++ b/src/service/variable-source.js
@@ -33,7 +33,7 @@ const WAITFOR_EVENTS_ENUM = {
 
 /**
  * A list of events on which event they should wait
- * @const {!Object<string, WAITFOR_EVENTS_ENUM>}
+ * @const {!{[key: string]: WAITFOR_EVENTS_ENUM}}
  */
 const NAV_TIMING_WAITFOR_EVENTS = {
   // ready on viewer first visible
@@ -165,7 +165,7 @@ export class VariableSource {
     /** @protected @const {!./ampdoc-impl.AmpDoc} */
     this.ampdoc = ampdoc;
 
-    /** @private @const {!Object<string, !ReplacementDef>} */
+    /** @private @const {!{[key: string]: !ReplacementDef}} */
     this.replacements_ = Object.create(null);
 
     /** @private {boolean} */
@@ -257,8 +257,8 @@ export class VariableSource {
   /**
    * Returns a Regular expression that can be used to detect all the variables
    * in a template.
-   * @param {!Object<string, *>=} opt_bindings
-   * @param {!Object<string, boolean>=} opt_allowlist Optional allowlist of names
+   * @param {!{[key: string]: *}=} opt_bindings
+   * @param {!{[key: string]: boolean}=} opt_allowlist Optional allowlist of names
    *   that can be substituted.
    * @return {!RegExp}
    */
@@ -272,7 +272,7 @@ export class VariableSource {
 
   /**
    * @param {!Array<string>} keys
-   * @param {!Object<string, boolean>=} opt_allowlist Optional allowlist of names
+   * @param {!{[key: string]: boolean}=} opt_allowlist Optional allowlist of names
    *   that can be substituted.
    * @return {!RegExp}
    * @private
diff --git a/src/service/video-manager-impl.js b/src/service/video-manager-impl.js
index ef36df7ff027..8c831353c92e 100644
--- a/src/service/video-manager-impl.js
+++ b/src/service/video-manager-impl.js
@@ -1,4 +1,4 @@
-import {ActionTrust} from '#core/constants/action-constants';
+import {ActionTrust_Enum} from '#core/constants/action-constants';
 import {dispatchCustomEvent, removeElement} from '#core/dom';
 import {measureIntersection} from '#core/dom/layout/intersection';
 import {createViewportObserver} from '#core/dom/layout/viewport-observer';
@@ -11,7 +11,7 @@ import {
 import {clamp} from '#core/math';
 import {isFiniteNumber} from '#core/types';
 import {once} from '#core/types/function';
-import {dict, map} from '#core/types/object';
+import {map} from '#core/types/object';
 
 import {Services} from '#service';
 
@@ -23,9 +23,9 @@ import {
 } from '#utils/event-helper';
 import {dev, devAssert, user, userAssert} from '#utils/log';
 
-import {VideoSessionManager} from './video-session-manager';
 import {renderIcon, renderInteractionOverlay} from './video/autoplay';
 import {installAutoplayStylesForDoc} from './video/install-autoplay-styles';
+import {VideoSessionManager} from './video-session-manager';
 
 import {
   EMPTY_METADATA,
@@ -38,11 +38,11 @@ import {
 import {registerServiceBuilderForDoc} from '../service-helpers';
 import {
   MIN_VISIBILITY_RATIO_FOR_AUTOPLAY,
-  PlayingStates,
+  PlayingStates_Enum,
   VideoAnalyticsEvents_Enum,
-  VideoAttributes,
-  VideoEvents,
-  VideoServiceSignals,
+  VideoAttributes_Enum,
+  VideoEvents_Enum,
+  VideoServiceSignals_Enum,
   setIsMediaComponent,
   userInteractedWith,
   videoAnalyticsCustomEventTypeKey,
@@ -139,7 +139,7 @@ export class VideoManager {
   secondsPlaying_() {
     for (let i = 0; i < this.entries_.length; i++) {
       const entry = this.entries_[i];
-      if (entry.getPlayingState() !== PlayingStates.PAUSED) {
+      if (entry.getPlayingState() !== PlayingStates_Enum.PAUSED) {
         analyticsEvent(entry, VideoAnalyticsEvents_Enum.SECONDS_PLAYED);
         this.timeUpdateActionEvent_(entry);
       }
@@ -164,12 +164,16 @@ export class VideoManager {
       duration > 0
     ) {
       const perc = currentTime / duration;
-      const event = createCustomEvent(
-        this.ampdoc.win,
-        `${TAG}.${name}`,
-        dict({'time': currentTime, 'percent': perc})
+      const event = createCustomEvent(this.ampdoc.win, `${TAG}.${name}`, {
+        'time': currentTime,
+        'percent': perc,
+      });
+      this.actions_.trigger(
+        entry.video.element,
+        name,
+        event,
+        ActionTrust_Enum.LOW
       );
-      this.actions_.trigger(entry.video.element, name, event, ActionTrust.LOW);
     }
   }
 
@@ -206,14 +210,14 @@ export class VideoManager {
       );
     }
     this.viewportObserver_.observe(videoBE.element);
-    listen(videoBE.element, VideoEvents.RELOAD, () => entry.videoLoaded());
+    listen(videoBE.element, VideoEvents_Enum.RELOAD, () => entry.videoLoaded());
 
     this.entries_ = this.entries_ || [];
     const entry = new VideoEntry(this, video);
     this.entries_.push(entry);
 
     const {element} = entry.video;
-    dispatchCustomEvent(element, VideoEvents.REGISTERED);
+    dispatchCustomEvent(element, VideoEvents_Enum.REGISTERED);
 
     setIsMediaComponent(element);
 
@@ -224,7 +228,7 @@ export class VideoManager {
       video
     ).signals();
 
-    signals.signal(VideoEvents.REGISTERED);
+    signals.signal(VideoEvents_Enum.REGISTERED);
 
     // Add a class to element to indicate it implements the video interface.
     element.classList.add('i-amphtml-video-interface');
@@ -239,9 +243,9 @@ export class VideoManager {
    * @private
    */
   registerCommonActions_(video) {
-    // Only require ActionTrust.LOW for video actions to defer to platform
+    // Only require ActionTrust_Enum.LOW for video actions to defer to platform
     // specific handling (e.g. user gesture requirement for unmuted playback).
-    const trust = ActionTrust.LOW;
+    const trust = ActionTrust_Enum.LOW;
 
     registerAction('play', () => tryPlay(video, /* isAutoplay */ false));
     registerAction('pause', () => video.pause());
@@ -390,7 +394,7 @@ export class VideoManager {
       if (
         entry.isPlaybackManaged() &&
         entry !== entryBeingPlayed &&
-        entry.getPlayingState() == PlayingStates.PLAYING_MANUAL
+        entry.getPlayingState() == PlayingStates_Enum.PLAYING_MANUAL
       ) {
         entry.video.pause();
       }
@@ -476,7 +480,9 @@ class VideoEntry {
     /** @private {boolean} */
     this.hasSeenPlayEvent_ = false;
 
-    this.hasAutoplay = video.element.hasAttribute(VideoAttributes.AUTOPLAY);
+    this.hasAutoplay = video.element.hasAttribute(
+      VideoAttributes_Enum.AUTOPLAY
+    );
 
     if (this.hasAutoplay) {
       this.manager_.installAutoplayStyles();
@@ -497,20 +503,20 @@ class VideoEntry {
       this.video.pause();
     };
 
-    listen(video.element, VideoEvents.LOAD, () => this.videoLoaded());
-    listen(video.element, VideoEvents.PAUSE, () => this.videoPaused_());
-    listen(video.element, VideoEvents.PLAY, () => {
+    listen(video.element, VideoEvents_Enum.LOAD, () => this.videoLoaded());
+    listen(video.element, VideoEvents_Enum.PAUSE, () => this.videoPaused_());
+    listen(video.element, VideoEvents_Enum.PLAY, () => {
       this.hasSeenPlayEvent_ = true;
       analyticsEvent(this, VideoAnalyticsEvents_Enum.PLAY);
     });
-    listen(video.element, VideoEvents.PLAYING, () => this.videoPlayed_());
-    listen(video.element, VideoEvents.MUTED, () => (this.muted_ = true));
-    listen(video.element, VideoEvents.UNMUTED, () => {
+    listen(video.element, VideoEvents_Enum.PLAYING, () => this.videoPlayed_());
+    listen(video.element, VideoEvents_Enum.MUTED, () => (this.muted_ = true));
+    listen(video.element, VideoEvents_Enum.UNMUTED, () => {
       this.muted_ = false;
       this.manager_.pauseOtherVideos(this);
     });
 
-    listen(video.element, VideoEvents.CUSTOM_TICK, (e) => {
+    listen(video.element, VideoEvents_Enum.CUSTOM_TICK, (e) => {
       const data = getData(e);
       const eventType = data['eventType'];
       if (!eventType) {
@@ -522,24 +528,24 @@ class VideoEntry {
       this.logCustomAnalytics_(eventType, data['vars']);
     });
 
-    listen(video.element, VideoEvents.ENDED, () => {
+    listen(video.element, VideoEvents_Enum.ENDED, () => {
       this.isRollingAd_ = false;
       analyticsEvent(this, VideoAnalyticsEvents_Enum.ENDED);
     });
 
-    listen(video.element, VideoEvents.AD_START, () => {
+    listen(video.element, VideoEvents_Enum.AD_START, () => {
       this.isRollingAd_ = true;
       analyticsEvent(this, VideoAnalyticsEvents_Enum.AD_START);
     });
 
-    listen(video.element, VideoEvents.AD_END, () => {
+    listen(video.element, VideoEvents_Enum.AD_END, () => {
       this.isRollingAd_ = false;
       analyticsEvent(this, VideoAnalyticsEvents_Enum.AD_END);
     });
 
     video
       .signals()
-      .whenSignal(VideoEvents.REGISTERED)
+      .whenSignal(VideoEvents_Enum.REGISTERED)
       .then(() => this.onRegister_());
 
     /**
@@ -548,12 +554,8 @@ class VideoEntry {
      */
     this.firstPlayEventOrNoop_ = once(() => {
       const firstPlay = 'firstPlay';
-      const trust = ActionTrust.LOW;
-      const event = createCustomEvent(
-        this.ampdoc_.win,
-        firstPlay,
-        /* detail */ dict({})
-      );
+      const trust = ActionTrust_Enum.LOW;
+      const event = createCustomEvent(this.ampdoc_.win, firstPlay, {});
       const {element} = this.video;
       const actions = Services.actionServiceForDoc(element);
       actions.trigger(element, firstPlay, event, trust);
@@ -569,7 +571,7 @@ class VideoEntry {
 
   /**
    * @param {string} eventType
-   * @param {!Object<string, string>} vars
+   * @param {!{[key: string]: string}} vars
    */
   logCustomAnalytics_(eventType, vars) {
     const prefixedVars = {[videoAnalyticsCustomEventTypeKey]: eventType};
@@ -584,7 +586,7 @@ class VideoEntry {
   /** Listens for signals to delegate playback to a different module. */
   listenForPlaybackDelegation_() {
     const signals = this.video.signals();
-    signals.whenSignal(VideoServiceSignals.PLAYBACK_DELEGATED).then(() => {
+    signals.whenSignal(VideoServiceSignals_Enum.PLAYBACK_DELEGATED).then(() => {
       this.managePlayback_ = false;
 
       if (this.isPlaying_) {
@@ -622,7 +624,7 @@ class VideoEntry {
     const {element} = this.video;
     if (
       this.video.preimplementsAutoFullscreen() ||
-      !element.hasAttribute(VideoAttributes.ROTATE_TO_FULLSCREEN)
+      !element.hasAttribute(VideoAttributes_Enum.ROTATE_TO_FULLSCREEN)
     ) {
       return false;
     }
@@ -641,7 +643,7 @@ class VideoEntry {
   videoPlayed_() {
     this.isPlaying_ = true;
 
-    if (this.getPlayingState() == PlayingStates.PLAYING_MANUAL) {
+    if (this.getPlayingState() == PlayingStates_Enum.PLAYING_MANUAL) {
       this.firstPlayEventOrNoop_();
       this.manager_.pauseOtherVideos(this);
     }
@@ -824,8 +826,8 @@ class VideoEntry {
     const {element, win} = this.video;
 
     if (
-      element.hasAttribute(VideoAttributes.NO_AUDIO) ||
-      element.signals().get(VideoServiceSignals.USER_INTERACTED)
+      element.hasAttribute(VideoAttributes_Enum.NO_AUDIO) ||
+      element.signals().get(VideoServiceSignals_Enum.USER_INTERACTED)
     ) {
       return;
     }
@@ -850,17 +852,19 @@ class VideoEntry {
     }
 
     const unlisteners = [
-      listen(element, VideoEvents.PAUSE, () => toggleAnimation(false)),
-      listen(element, VideoEvents.PLAYING, () => toggleAnimation(true)),
-      listen(element, VideoEvents.AD_START, () => {
+      listen(element, VideoEvents_Enum.PAUSE, () => toggleAnimation(false)),
+      listen(element, VideoEvents_Enum.PLAYING, () => toggleAnimation(true)),
+      listen(element, VideoEvents_Enum.AD_START, () => {
         toggleElements(false);
         video.showControls();
       }),
-      listen(element, VideoEvents.AD_END, () => {
+      listen(element, VideoEvents_Enum.AD_END, () => {
         toggleElements(true);
         video.hideControls();
       }),
-      listen(element, VideoEvents.UNMUTED, () => userInteractedWith(video)),
+      listen(element, VideoEvents_Enum.UNMUTED, () =>
+        userInteractedWith(video)
+      ),
     ];
 
     if (video.isInteractive()) {
@@ -883,7 +887,7 @@ class VideoEntry {
 
     video
       .signals()
-      .whenSignal(VideoServiceSignals.USER_INTERACTED)
+      .whenSignal(VideoServiceSignals_Enum.USER_INTERACTED)
       .then(() => {
         this.firstPlayEventOrNoop_();
         if (video.isInteractive()) {
@@ -954,7 +958,7 @@ class VideoEntry {
    */
   getPlayingState() {
     if (!this.isPlaying_) {
-      return PlayingStates.PAUSED;
+      return PlayingStates_Enum.PAUSED;
     }
 
     if (
@@ -962,10 +966,10 @@ class VideoEntry {
       this.playCalledByAutoplay_ &&
       !this.userInteracted()
     ) {
-      return PlayingStates.PLAYING_AUTO;
+      return PlayingStates_Enum.PLAYING_AUTO;
     }
 
-    return PlayingStates.PLAYING_MANUAL;
+    return PlayingStates_Enum.PLAYING_MANUAL;
   }
 
   /** @return {boolean} */
@@ -979,7 +983,7 @@ class VideoEntry {
    */
   userInteracted() {
     return (
-      this.video.signals().get(VideoServiceSignals.USER_INTERACTED) != null
+      this.video.signals().get(VideoServiceSignals_Enum.USER_INTERACTED) != null
     );
   }
 
@@ -1072,7 +1076,7 @@ export class AutoFullscreenManager {
      * @return {boolean}
      */
     this.boundIncludeOnlyPlaying_ = (video) =>
-      this.getPlayingState_(video) == PlayingStates.PLAYING_MANUAL;
+      this.getPlayingState_(video) == PlayingStates_Enum.PLAYING_MANUAL;
 
     /**
      * @param {!IntersectionObserverEntry} a
@@ -1102,13 +1106,13 @@ export class AutoFullscreenManager {
 
     this.entries_.push(video);
 
-    listen(element, VideoEvents.PAUSE, this.boundSelectBestCentered_);
-    listen(element, VideoEvents.PLAYING, this.boundSelectBestCentered_);
-    listen(element, VideoEvents.ENDED, this.boundSelectBestCentered_);
+    listen(element, VideoEvents_Enum.PAUSE, this.boundSelectBestCentered_);
+    listen(element, VideoEvents_Enum.PLAYING, this.boundSelectBestCentered_);
+    listen(element, VideoEvents_Enum.ENDED, this.boundSelectBestCentered_);
 
     video
       .signals()
-      .whenSignal(VideoServiceSignals.USER_INTERACTED)
+      .whenSignal(VideoServiceSignals_Enum.USER_INTERACTED)
       .then(this.boundSelectBestCentered_);
 
     // Set always
@@ -1250,8 +1254,8 @@ export class AutoFullscreenManager {
         const pos = optPos
           ? dev().assertString(optPos)
           : bottom > vh
-          ? 'bottom'
-          : 'top';
+            ? 'bottom'
+            : 'top';
         return viewport.animateScrollIntoView(element, pos);
       });
   }
@@ -1455,7 +1459,7 @@ export class AnalyticsPercentageTracker {
       this.calculate_(this.triggerId_);
     } else {
       this.unlisteners_.push(
-        listenOnce(element, VideoEvents.LOADEDMETADATA, () => {
+        listenOnce(element, VideoEvents_Enum.LOADEDMETADATA, () => {
           if (this.hasDuration_()) {
             this.calculate_(this.triggerId_);
           }
@@ -1464,7 +1468,7 @@ export class AnalyticsPercentageTracker {
     }
 
     this.unlisteners_.push(
-      listen(element, VideoEvents.ENDED, () => {
+      listen(element, VideoEvents_Enum.ENDED, () => {
         if (this.hasDuration_()) {
           this.maybeTrigger_(/* normalizedPercentage */ 100);
         }
@@ -1537,7 +1541,7 @@ export class AnalyticsPercentageTracker {
 
     const calculateAgain = () => this.calculate_(triggerId);
 
-    if (entry.getPlayingState() == PlayingStates.PAUSED) {
+    if (entry.getPlayingState() == PlayingStates_Enum.PAUSED) {
       timer.delay(calculateAgain, PERCENTAGE_FREQUENCY_WHEN_PAUSED_MS);
       return;
     }
@@ -1595,7 +1599,7 @@ export class AnalyticsPercentageTracker {
 /**
  * @param {!VideoEntry} entry
  * @param {!VideoAnalyticsEvents_Enum} eventType
- * @param {!Object<string, string>=} opt_vars A map of vars and their values.
+ * @param {!{[key: string]: string}=} opt_vars A map of vars and their values.
  * @private
  */
 function analyticsEvent(entry, eventType, opt_vars) {
diff --git a/src/service/viewer-cid-api.js b/src/service/viewer-cid-api.js
index 241fb5cb0fc7..4bb4c6df7443 100644
--- a/src/service/viewer-cid-api.js
+++ b/src/service/viewer-cid-api.js
@@ -1,5 +1,3 @@
-import {dict} from '#core/types/object';
-
 import {Services} from '#service';
 
 import {parseUrlDeprecated} from '../url';
@@ -45,11 +43,11 @@ export class ViewerCidApi {
    * @return {!Promise<?JsonObject|string|undefined>}
    */
   getScopedCid(apiKey, scope) {
-    const payload = dict({
+    const payload = {
       'scope': scope,
       'clientIdApi': !!apiKey,
       'canonicalOrigin': this.canonicalOrigin_,
-    });
+    };
     if (apiKey) {
       payload['apiKey'] = apiKey;
     }
diff --git a/src/service/viewer-impl.js b/src/service/viewer-impl.js
index 309b8f640f68..0c2b05d2e283 100644
--- a/src/service/viewer-impl.js
+++ b/src/service/viewer-impl.js
@@ -1,4 +1,4 @@
-import {VisibilityState} from '#core/constants/visibility-state';
+import {VisibilityState_Enum} from '#core/constants/visibility-state';
 import {Observable} from '#core/data-structures/observable';
 import {Deferred, tryResolve} from '#core/data-structures/promise';
 import {isIframed} from '#core/dom';
@@ -17,7 +17,7 @@ import {dev, devAssert} from '#utils/log';
 
 import {ViewerInterface} from './viewer-interface';
 
-import {urls} from '../config';
+import * as urls from '../config/urls';
 import {reportError} from '../error-reporting';
 import {registerServiceBuilderForDoc} from '../service-helpers';
 import {
@@ -31,7 +31,7 @@ import {
 const TAG_ = 'Viewer';
 
 /** @enum {string} */
-export const Capability = {
+export const Capability_Enum = {
   VIEWER_RENDER_TEMPLATE: 'viewerRenderTemplate',
 };
 
@@ -85,10 +85,10 @@ export class ViewerImpl {
     /** @private {boolean} */
     this.overtakeHistory_ = false;
 
-    /** @private {!Object<string, !Observable<!JsonObject>>} */
+    /** @private {!{[key: string]: !Observable<!JsonObject>}} */
     this.messageObservables_ = map();
 
-    /** @private {!Object<string, !./viewer-interface.RequestResponderDef>} */
+    /** @private {!{[key: string]: !./viewer-interface.RequestResponderDef}} */
     this.messageResponders_ = map();
 
     /** @private {!Observable<boolean>} */
@@ -128,7 +128,7 @@ export class ViewerImpl {
     /**
      * Subset of this.params_ that only contains parameters in the URL hash,
      * e.g. "#foo=bar".
-     * @const @private {!Object<string, string>}
+     * @const @private {!{[key: string]: string}}
      */
     this.hashParams_ = map();
 
@@ -519,17 +519,17 @@ export class ViewerImpl {
       return;
     }
 
-    devAssert(isEnumValue(VisibilityState, state));
+    devAssert(isEnumValue(VisibilityState_Enum, state));
 
     // The viewer is informing us we are not currently active because we are
     // being pre-rendered, or the user swiped to another doc (or closed the
     // viewer). Unfortunately, the viewer sends HIDDEN instead of PRERENDER or
     // INACTIVE, though we know better.
-    if (state === VisibilityState.HIDDEN) {
+    if (state === VisibilityState_Enum.HIDDEN) {
       state =
         this.ampdoc.getLastVisibleTime() != null
-          ? VisibilityState.INACTIVE
-          : VisibilityState.PRERENDER;
+          ? VisibilityState_Enum.INACTIVE
+          : VisibilityState_Enum.PRERENDER;
     }
 
     this.ampdoc.overrideVisibilityState(state);
@@ -897,13 +897,13 @@ export class ViewerImpl {
    * made visible by the viewer.
    */
   visibleOnUserAction_() {
-    if (this.ampdoc.getVisibilityState() == VisibilityState.VISIBLE) {
+    if (this.ampdoc.getVisibilityState() == VisibilityState_Enum.VISIBLE) {
       return;
     }
     const unlisten = [];
     const doUnlisten = () => unlisten.forEach((fn) => fn());
     const makeVisible = () => {
-      this.setVisibilityState_(VisibilityState.VISIBLE);
+      this.setVisibilityState_(VisibilityState_Enum.VISIBLE);
       doUnlisten();
       dev().expectedError(TAG_, 'Received user action in non-visible doc');
     };
diff --git a/src/service/viewer-interface.js b/src/service/viewer-interface.js
index 6c0d8b650422..a3e4476c758a 100644
--- a/src/service/viewer-interface.js
+++ b/src/service/viewer-interface.js
@@ -3,7 +3,7 @@
  */
 export let RequestResponderDef;
 
-/* eslint-disable no-unused-vars */
+/* eslint-disable @typescript-eslint/no-unused-vars */
 /**
  * @interface
  */
@@ -226,4 +226,3 @@ export class ViewerInterface {
    */
   replaceUrl(newUrl) {}
 }
-/* eslint-enable no-unused-vars */
diff --git a/src/service/viewport/viewport-impl.js b/src/service/viewport/viewport-impl.js
index 7c8566b463ff..3e45639ddec0 100644
--- a/src/service/viewport/viewport-impl.js
+++ b/src/service/viewport/viewport-impl.js
@@ -1,4 +1,4 @@
-import {VisibilityState} from '#core/constants/visibility-state';
+import {VisibilityState_Enum} from '#core/constants/visibility-state';
 import {Observable} from '#core/data-structures/observable';
 import {tryResolve} from '#core/data-structures/promise';
 import {getVerticalScrollbarWidth, isIframed} from '#core/dom';
@@ -11,7 +11,6 @@ import {closestAncestorElementBySelector} from '#core/dom/query';
 import {computedStyle, setStyle} from '#core/dom/style';
 import {numeric} from '#core/dom/transition';
 import {clamp} from '#core/math';
-import {dict} from '#core/types/object';
 
 import {isExperimentOn} from '#experiments';
 
@@ -327,9 +326,10 @@ export class ViewportImpl {
     if (this.size_.width == 0 || this.size_.height == 0) {
       // Only report when the visibility is "visible" or "prerender".
       const visibilityState = this.ampdoc.getVisibilityState();
+      // We do NOT want to report for PREVIEW mode.
       if (
-        visibilityState == VisibilityState.PRERENDER ||
-        visibilityState == VisibilityState.VISIBLE
+        visibilityState == VisibilityState_Enum.PRERENDER ||
+        visibilityState == VisibilityState_Enum.VISIBLE
       ) {
         if (Math.random() < 0.01) {
           dev().error(TAG_, 'viewport has zero dimensions');
@@ -650,11 +650,7 @@ export class ViewportImpl {
 
   /** @override */
   enterLightboxMode(opt_requestingElement, opt_onComplete) {
-    this.viewer_.sendMessage(
-      'requestFullOverlay',
-      dict(),
-      /* cancelUnsent */ true
-    );
+    this.viewer_.sendMessage('requestFullOverlay', {}, /* cancelUnsent */ true);
 
     this.enterOverlayMode();
     if (this.fixedLayer_) {
@@ -672,11 +668,7 @@ export class ViewportImpl {
 
   /** @override */
   leaveLightboxMode(opt_requestingElement) {
-    this.viewer_.sendMessage(
-      'cancelFullOverlay',
-      dict(),
-      /* cancelUnsent */ true
-    );
+    this.viewer_.sendMessage('cancelFullOverlay', {}, /* cancelUnsent */ true);
 
     if (this.fixedLayer_) {
       this.fixedLayer_.leaveLightbox();
@@ -1073,7 +1065,7 @@ export class ViewportImpl {
         this.scrollAnimationFrameThrottled_ = false;
         this.viewer_.sendMessage(
           'scroll',
-          dict({'scrollTop': this.getScrollTop()}),
+          {'scrollTop': this.getScrollTop()},
           /* cancelUnsent */ true
         );
       });
@@ -1107,7 +1099,7 @@ export class ViewportImpl {
  * width=device-width,initial-scale=1,minimum-scale=1
  * ```
  * @param {string} content
- * @return {!Object<string, (string|undefined)>}
+ * @return {!{[key: string]: (string|undefined)}}
  * @private Visible for testing only.
  */
 export function parseViewportMeta(content) {
@@ -1136,7 +1128,7 @@ export function parseViewportMeta(content) {
  * ```
  * width=device-width,initial-scale=1,minimum-scale=1
  * ```
- * @param {!Object<string, string>} params
+ * @param {!{[key: string]: string}} params
  * @return {string}
  * @private Visible for testing only.
  */
@@ -1162,7 +1154,7 @@ export function stringifyViewportMeta(params) {
  * updated string or the `currentValue` if no changes were necessary.
  *
  * @param {string} currentValue
- * @param {!Object<string, string|undefined>} updateParams
+ * @param {!{[key: string]: string|undefined}} updateParams
  * @return {string}
  * @private Visible for testing only.
  */
@@ -1208,7 +1200,7 @@ function createViewport(ampdoc) {
   let binding;
   if (
     ampdoc.isSingleDoc() &&
-    getViewportType(win, viewer) == ViewportType.NATURAL_IOS_EMBED &&
+    getViewportType(win, viewer) == ViewportType_Enum.NATURAL_IOS_EMBED &&
     !IS_SXG
   ) {
     binding = new ViewportBindingIosEmbedWrapper_(win);
@@ -1222,7 +1214,7 @@ function createViewport(ampdoc) {
  * The type of the viewport.
  * @enum {string}
  */
-const ViewportType = {
+const ViewportType_Enum = {
   /**
    * Viewer leaves sizing and scrolling up to the AMP document's window.
    */
@@ -1248,7 +1240,7 @@ function getViewportType(win, viewer) {
 
   // Enable iOS Embedded mode for iframed tests (e.g. integration tests).
   if (getMode(win).test && isIframedIos) {
-    return ViewportType.NATURAL_IOS_EMBED;
+    return ViewportType_Enum.NATURAL_IOS_EMBED;
   }
 
   // Override to ios-embed for iframe-viewer mode.
@@ -1257,9 +1249,9 @@ function getViewportType(win, viewer) {
     viewer.isEmbedded() &&
     !viewer.hasCapability('iframeScroll')
   ) {
-    return ViewportType.NATURAL_IOS_EMBED;
+    return ViewportType_Enum.NATURAL_IOS_EMBED;
   }
-  return ViewportType.NATURAL;
+  return ViewportType_Enum.NATURAL;
 }
 
 /**
diff --git a/src/service/viewport/viewport-interface.js b/src/service/viewport/viewport-interface.js
index 8784f6537993..b5f6a3267860 100644
--- a/src/service/viewport/viewport-interface.js
+++ b/src/service/viewport/viewport-interface.js
@@ -21,7 +21,7 @@ export let ViewportChangedEventDef;
  */
 export let ViewportResizedEventDef;
 
-/* eslint-disable no-unused-vars */
+/* eslint-disable @typescript-eslint/no-unused-vars */
 /**
  * @interface
  */
@@ -306,4 +306,3 @@ export class ViewportInterface extends Disposable {
    */
   createFixedLayer(constructor) {}
 }
-/* eslint-enable no-unused-vars */
diff --git a/src/service/vsync-impl.js b/src/service/vsync-impl.js
index 7bdfdd4b1c0f..8e16e8b83de5 100644
--- a/src/service/vsync-impl.js
+++ b/src/service/vsync-impl.js
@@ -20,7 +20,7 @@ import {getService, registerServiceBuilder} from '../service-helpers';
 const FRAME_TIME = 16;
 
 /**
- * @typedef {!Object<string, *>}
+ * @typedef {!{[key: string]: *}}
  */
 let VsyncStateDef;
 
diff --git a/src/shadow-embed.js b/src/shadow-embed.js
index 1d484bb90f30..98f76ff775c5 100644
--- a/src/shadow-embed.js
+++ b/src/shadow-embed.js
@@ -1,19 +1,18 @@
-import {iterateCursor} from '#core/dom';
 import {escapeCssSelectorIdent} from '#core/dom/css-selectors';
 import {setInitialDisplay, setStyle} from '#core/dom/style';
 import {
-  ShadowDomVersion,
+  ShadowDomVersion_Enum,
   getShadowDomSupportedVersion,
   isShadowCssSupported,
 } from '#core/dom/web-components';
 import {toArray} from '#core/types/array';
-import {getWin, toWin} from '#core/window';
+import {getWin} from '#core/window';
 
 import {Services} from '#service';
 
 import {dev, devAssert} from '#utils/log';
 
-import {ShadowCSS} from '#third_party/webcomponentsjs/ShadowCSS';
+import * as ShadowCSS from '#third_party/webcomponentsjs/ShadowCSS';
 
 import {installCssTransformer} from './style-installer';
 import {DomWriterBulk, DomWriterStreamer} from './utils/dom-writer';
@@ -24,8 +23,6 @@ const CSS_SELECTOR_BEG_REGEX = /[^\.\-\_0-9a-zA-Z]/;
 /** @const {!RegExp} */
 const CSS_SELECTOR_END_REGEX = /[^\-\_0-9a-zA-Z]/;
 
-const SHADOW_CSS_CACHE = '__AMP_SHADOW_CSS';
-
 /**
  * @type {boolean|undefined}
  */
@@ -42,19 +39,33 @@ export function createShadowRoot(hostElement) {
 
   const existingRoot = hostElement.shadowRoot || hostElement.__AMP_SHADOW_ROOT;
   if (existingRoot) {
-    existingRoot./*OK*/ innerHTML = '';
+    if (self.trustedTypes && self.trustedTypes.createPolicy) {
+      // Create Trusted Types policy that only returns the empty string as
+      // TrustedHTML
+      const policy = self.trustedTypes.createPolicy(
+        'shadow-embed#createShadowRoot',
+        {
+          createHTML: function (unused) {
+            return '';
+          },
+        }
+      );
+      existingRoot./*OK*/ innerHTML = policy.createHTML('');
+    } else {
+      existingRoot./*OK*/ innerHTML = '';
+    }
     return existingRoot;
   }
 
   let shadowRoot;
   const shadowDomSupported = getShadowDomSupportedVersion();
-  if (shadowDomSupported == ShadowDomVersion.V1) {
+  if (shadowDomSupported == ShadowDomVersion_Enum.V1) {
     shadowRoot = hostElement.attachShadow({mode: 'open'});
     if (!shadowRoot.styleSheets) {
       Object.defineProperty(shadowRoot, 'styleSheets', {
         get: function () {
           const items = [];
-          iterateCursor(shadowRoot.childNodes, (child) => {
+          shadowRoot.childNodes.forEach((child) => {
             if (child.tagName === 'STYLE') {
               items.push(child.sheet);
             }
@@ -63,7 +74,7 @@ export function createShadowRoot(hostElement) {
         },
       });
     }
-  } else if (shadowDomSupported == ShadowDomVersion.V0) {
+  } else if (shadowDomSupported == ShadowDomVersion_Enum.V0) {
     shadowRoot = hostElement.createShadowRoot();
   } else {
     shadowRoot = createShadowRootPolyfill(hostElement);
@@ -226,10 +237,7 @@ export function scopeShadowCss(shadowRoot, css) {
   }
 
   // Patch selectors.
-  // Invoke `ShadowCSS.scopeRules` via `call` because the way it uses `this`
-  // internally conflicts with Closure compiler's advanced optimizations.
-  const {scopeRules} = ShadowCSS;
-  return scopeRules.call(ShadowCSS, rules, `.${id}`, transformRootSelectors);
+  return ShadowCSS.scopeRules(rules, `.${id}`, transformRootSelectors);
 }
 
 /**
@@ -284,43 +292,6 @@ function getStylesheetRules(doc, css) {
   }
 }
 
-/**
- * @param {!ShadowRoot} shadowRoot
- * @param {string} name
- * @param {string} cssText
- */
-export function installShadowStyle(shadowRoot, name, cssText) {
-  const doc = shadowRoot.ownerDocument;
-  const win = toWin(doc.defaultView);
-  if (
-    shadowRoot.adoptedStyleSheets !== undefined &&
-    win.CSSStyleSheet.prototype.replaceSync !== undefined
-  ) {
-    const cache = win[SHADOW_CSS_CACHE] || (win[SHADOW_CSS_CACHE] = {});
-    let styleSheet = cache[name];
-    if (!styleSheet) {
-      styleSheet = new win.CSSStyleSheet();
-      styleSheet.replaceSync(cssText);
-      cache[name] = styleSheet;
-    }
-    shadowRoot.adoptedStyleSheets =
-      shadowRoot.adoptedStyleSheets.concat(styleSheet);
-  } else {
-    const styleEl = doc.createElement('style');
-    styleEl.setAttribute('data-name', name);
-    styleEl.textContent = cssText;
-    shadowRoot.appendChild(styleEl);
-  }
-}
-
-/**
- * @param {!Window} win
- * @visibleForTesting
- */
-export function resetShadowStyleCacheForTesting(win) {
-  win[SHADOW_CSS_CACHE] = null;
-}
-
 /**
  * @param {boolean|undefined} val
  * @visibleForTesting
diff --git a/src/ssr-template-helper.js b/src/ssr-template-helper.js
index d2d941574a94..1b382e52cf5d 100644
--- a/src/ssr-template-helper.js
+++ b/src/ssr-template-helper.js
@@ -1,5 +1,4 @@
 import {isArray} from '#core/types';
-import {dict} from '#core/types/object';
 
 import {userAssert} from '#utils/log';
 
@@ -139,7 +138,7 @@ export class SsrTemplateHelper {
    * @private
    */
   buildPayload_(request, mustacheTemplate, opt_templates, opt_attributes = {}) {
-    const ampComponent = dict({'type': this.sourceComponent_});
+    const ampComponent = {'type': this.sourceComponent_};
 
     const successTemplateKey = 'successTemplate';
     const successTemplate =
@@ -169,13 +168,13 @@ export class SsrTemplateHelper {
       Object.assign(ampComponent, opt_attributes);
     }
 
-    const data = dict({
+    const data = {
       'originalRequest': toStructuredCloneable(
         request.xhrUrl,
         request.fetchOpt
       ),
       'ampComponent': ampComponent,
-    });
+    };
 
     return data;
   }
diff --git a/src/standalone.js b/src/standalone.js
index ecadb2acf833..6ae4f87d5ec4 100644
--- a/src/standalone.js
+++ b/src/standalone.js
@@ -2,7 +2,7 @@ import {isAmphtml} from '#core/document/format';
 
 import {Services} from '#service';
 
-import {ChunkPriority, chunk} from './chunk';
+import {ChunkPriority_Enum, chunk} from './chunk';
 
 /**
  * @param {!./service/ampdoc-impl.AmpDoc} ampdoc
@@ -26,6 +26,6 @@ export function installStandaloneExtension(ampdoc) {
         .then(() => Services.standaloneServiceForDoc(ampdoc.getBody()))
         .then((standaloneService) => standaloneService.initialize());
     },
-    ChunkPriority.LOW
+    ChunkPriority_Enum.LOW
   );
 }
diff --git a/src/style-installer.js b/src/style-installer.js
index 4762cfd29a83..58f5e71475dc 100644
--- a/src/style-installer.js
+++ b/src/style-installer.js
@@ -1,5 +1,5 @@
-import {CommonSignals} from '#core/constants/common-signals';
-import {TickLabel} from '#core/constants/enums';
+import {CommonSignals_Enum} from '#core/constants/common-signals';
+import {TickLabel_Enum} from '#core/constants/enums';
 import {insertAfterOrAtStart, waitForBodyOpenPromise} from '#core/dom';
 import {setStyles} from '#core/dom/style';
 import {rethrowAsync} from '#core/error';
@@ -89,14 +89,19 @@ function insertStyleElement(cssRoot, cssText, isRuntimeCss, ext) {
   const key = isRuntimeCss
     ? 'amp-runtime'
     : isExtCss
-    ? `amp-extension=${ext}`
-    : null;
+      ? `amp-extension=${ext}`
+      : null;
 
   // Check if it has already been created or discovered.
   if (key) {
     const existing = getExistingStyleElement(cssRoot, styleMap, key);
+    // If we find a `link[rel=stylesheet]` to an extensions css, it is
+    // prioritized and not overwritten as the document would most likely
+    // be a transformed document and that the extension will also most likely
+    // be an extension without a CSS to install for optimization.
     if (existing) {
-      if (existing.textContent !== cssText) {
+      // Only overwrite the textContent if it is a `style` tag.
+      if (existing.tagName == 'STYLE' && existing.textContent !== cssText) {
         existing.textContent = cssText;
       }
       return existing;
@@ -132,7 +137,7 @@ function insertStyleElement(cssRoot, cssText, isRuntimeCss, ext) {
 
 /**
  * @param {!Element|!ShadowRoot} cssRoot
- * @param {!Object<string, !Element>} styleMap
+ * @param {!{[key: string]: !Element}} styleMap
  * @param {string} key
  * @return {?Element}
  */
@@ -142,7 +147,7 @@ function getExistingStyleElement(cssRoot, styleMap, key) {
     return styleMap[key];
   }
   // Check if the style has already been added by the server layout.
-  const existing = cssRoot./*OK*/ querySelector(`style[${key}]`);
+  const existing = cssRoot./*OK*/ querySelector(`style[${key}], link[${key}]`);
   if (existing) {
     styleMap[key] = existing;
     return existing;
@@ -209,14 +214,14 @@ export function makeBodyVisible(doc) {
       }
       setBodyVisibleStyles(doc);
       const ampdoc = getAmpdoc(doc);
-      ampdoc.signals().signal(CommonSignals.RENDER_START);
+      ampdoc.signals().signal(CommonSignals_Enum.RENDER_START);
       if (services.length > 0) {
         const resources = Services.resourcesForDoc(doc.documentElement);
         resources./*OK*/ schedulePass(1, /* relayoutAll */ true);
       }
       try {
         const perf = Services.performanceFor(win);
-        perf.tick(TickLabel.MAKE_BODY_VISIBLE);
+        perf.tick(TickLabel_Enum.MAKE_BODY_VISIBLE);
         perf.flush();
       } catch (e) {}
     });
@@ -267,6 +272,8 @@ function styleLoaded(doc, style) {
   const sheets = doc.styleSheets;
   for (let i = 0; i < sheets.length; i++) {
     const sheet = sheets[i];
+    // The `style` param here can be an instance of a `link[rel=stylesheet]` or
+    // a `style` element. Both can be an "ownerNode" of a CSSStyleSheet
     if (sheet.ownerNode == style) {
       return true;
     }
diff --git a/src/url-rewrite.js b/src/url-rewrite.js
index ed6f753f6cc8..bf5d270d4b5f 100644
--- a/src/url-rewrite.js
+++ b/src/url-rewrite.js
@@ -2,7 +2,7 @@ import {parseSrcset} from '#core/dom/srcset';
 
 import {user} from '#utils/log';
 
-import {urls} from './config';
+import * as urls from './config/urls';
 import {
   checkCorsUrl,
   getSourceUrl,
diff --git a/src/url.d.ts b/src/url.d.ts
new file mode 100644
index 000000000000..778b7669aecf
--- /dev/null
+++ b/src/url.d.ts
@@ -0,0 +1,13 @@
+/**
+ * Returns a Location-like object for the given URL. If it is relative,
+ * the URL gets resolved.
+ * Consider the returned object immutable. This is enforced during
+ * testing by freezing the object.
+ * TODO(#34453): The URL constructor isn't supported in IE11, but is supported
+ * everywhere else. There's a lot of code paths (and all uses of the LruCache)
+ * that are built around this polyfill. Once we can drop IE11 support and just
+ * use the URL constructor, we can clear out all of parseWithA, all the URL
+ * cache logic (incl. additional caches in other call-sites). Most is guarded by
+ * isEsm() and is only included in nomodule builds, but still.
+ */
+export function parseUrlDeprecated(url: string, nocache?: boolean): Location;
diff --git a/src/url.js b/src/url.js
index 91db92062ee0..0a2681092679 100644
--- a/src/url.js
+++ b/src/url.js
@@ -1,13 +1,15 @@
 import {LruCache} from '#core/data-structures/lru-cache';
 import * as mode from '#core/mode';
 import {arrayOrSingleItemToArray} from '#core/types/array';
-import {dict, hasOwn} from '#core/types/object';
+import {hasOwn} from '#core/types/object';
 import {endsWith} from '#core/types/string';
-import {parseQueryString} from '#core/types/string/url';
+import {INVALID_PROTOCOLS, parseQueryString} from '#core/types/string/url';
+
+import {Services} from '#service';
 
 import {userAssert} from '#utils/log';
 
-import {urls} from './config';
+import * as urls from './config/urls';
 
 const SERVING_TYPE_PREFIX = new Set([
   // No viewer
@@ -34,9 +36,6 @@ let cachedAnchorEl;
  */
 let urlCache;
 
-// eslint-disable-next-line no-script-url
-const INVALID_PROTOCOLS = ['javascript:', 'data:', 'vbscript:'];
-
 /** @const {string} */
 export const SOURCE_ORIGIN_PARAM = '__amp_source_origin';
 
@@ -251,7 +250,7 @@ export function addParamsToUrl(url, params) {
 export function addMissingParamsToUrl(url, params) {
   const location = parseUrlDeprecated(url);
   const existingParams = parseQueryString(location.search);
-  const paramsToAdd = dict({});
+  const paramsToAdd = {};
   const keys = Object.keys(params);
   for (let i = 0; i < keys.length; i++) {
     if (!hasOwn(existingParams, keys[i])) {
@@ -550,6 +549,20 @@ export function resolveRelativeUrl(relativeUrlString, baseUrl) {
   return resolveRelativeUrlFallback_(relativeUrlString, baseUrl);
 }
 
+/**
+ * Returns absolute URL resolved based on the relative URL and the element.
+ * @param {string} relativeUrlString
+ * @param {!element} element
+ * @return {string}
+ */
+export function relativeToSourceUrl(relativeUrlString, element) {
+  const {sourceUrl} = Services.documentInfoForDoc(element);
+  return Services.urlForDoc(element).resolveRelativeUrl(
+    relativeUrlString,
+    sourceUrl
+  );
+}
+
 /**
  * Fallback for URL resolver when URL class is not available.
  * @param {string} relativeUrlString
diff --git a/src/utils/analytics.js b/src/utils/analytics.js
index 875df753a1a7..884b00d13809 100644
--- a/src/utils/analytics.js
+++ b/src/utils/analytics.js
@@ -1,5 +1,3 @@
-import {dict} from '#core/types/object';
-
 import {Services} from '#service';
 
 /**
@@ -14,7 +12,7 @@ import {Services} from '#service';
 export function triggerAnalyticsEvent(
   target,
   eventType,
-  vars = dict(),
+  vars = {},
   enableDataVars = true
 ) {
   Services.analyticsForDocOrNull(target).then((analytics) => {
diff --git a/src/utils/animation.js b/src/utils/animation.js
index 68d464e7ab28..61a717484428 100644
--- a/src/utils/animation.js
+++ b/src/utils/animation.js
@@ -1,6 +1,8 @@
-import {NormTimeDef, getCurve} from '#core/data-structures/curve';
+import {getCurve} from '#core/data-structures/curve';
 import {Deferred} from '#core/data-structures/promise';
-import {TimestampDef} from '#core/types/date';
+
+/** @typedef {import('#core/types/date').NormTimeDef} NormTimeDef */
+/** @typedef {import('#core/types/date').TimestampDef} TimestampDef */
 
 import {Services} from '#service';
 
@@ -166,7 +168,7 @@ class AnimationPlayer {
     /** @private {boolean} */
     this.running_ = true;
 
-    /** @private {!Object<string, *>} */
+    /** @private {!{[key: string]: *}} */
     this.state_ = {};
 
     const deferred = new Deferred();
@@ -273,7 +275,7 @@ class AnimationPlayer {
   }
 
   /**
-   * @param {!Object<string, *>} unusedState
+   * @param {!{[key: string]: *}} unusedState
    * @private
    */
   stepMutate_(unusedState) {
diff --git a/src/utils/close-watcher-impl.js b/src/utils/close-watcher-impl.js
new file mode 100644
index 000000000000..320f18793daf
--- /dev/null
+++ b/src/utils/close-watcher-impl.js
@@ -0,0 +1,112 @@
+/**
+ * @fileoverview Support for the CloseWatcher API that fallbacks to the
+ * history service.
+ * See https://github.com/WICG/close-watcher.
+ */
+
+import {Keys_Enum} from '#core/constants/key-codes';
+
+import {Services} from '#service';
+
+import {dev, devAssert} from '#utils/log';
+
+const TAG = 'CloseWatcherImpl';
+
+export class CloseWatcherImpl {
+  /**
+   * @param {!../service/ampdoc-impl.AmpDoc} ampdoc
+   * @param {function()} handler
+   */
+  constructor(ampdoc, handler) {
+    const {win} = ampdoc;
+
+    /** @private @const */
+    this.win_ = win;
+
+    /** @private @const */
+    this.handler_ = handler;
+
+    /** @private {?CloseWatcher} */
+    this.watcher_ = null;
+
+    /** @private {?../service/history-impl.History} */
+    this.history_ = null;
+
+    /** @private {number} */
+    this.historyId_ = -1;
+
+    /** @private {?function()} */
+    this.boundCloseOnEscape_ = null;
+
+    if (typeof win.CloseWatcher === 'function') {
+      try {
+        this.watcher_ = new win.CloseWatcher();
+      } catch (e) {
+        dev().error(TAG, 'CloseWatcher failed:', e);
+      }
+    }
+    if (this.watcher_) {
+      this.watcher_.onclose = () => {
+        handler();
+        this.destroy();
+      };
+    } else {
+      this.history_ = Services.historyForDoc(ampdoc);
+      this.history_
+        .push(() => handler())
+        .then((historyId) => {
+          this.historyId_ = historyId;
+        });
+      this.boundCloseOnEscape_ = this.closeOnEscape_.bind(this);
+      win.document.documentElement.addEventListener(
+        'keydown',
+        this.boundCloseOnEscape_
+      );
+    }
+  }
+
+  /**
+   * Signals to the close watcher to close the modal.
+   * See `CloseWatcher.requestClose`.
+   */
+  requestClose() {
+    if (this.watcher_) {
+      this.watcher_.requestClose();
+    } else if (this.handler_) {
+      const handler = this.handler_;
+      handler();
+      this.destroy();
+    }
+  }
+
+  /**
+   * Destroys the watcher.
+   * See `CloseWatcher.destroy`.
+   */
+  destroy() {
+    this.handler_ = null;
+    if (this.watcher_) {
+      this.watcher_.destroy();
+      this.watcher_ = null;
+    } else if (this.historyId_ != -1) {
+      devAssert(this.history_).pop(this.historyId_);
+      this.historyId_ = -1;
+      this.history_ = null;
+      this.win_.document.documentElement.removeEventListener(
+        'keydown',
+        this.boundCloseOnEscape_
+      );
+    }
+  }
+
+  /**
+   * @param {!Event} event
+   * @private
+   */
+  closeOnEscape_(event) {
+    if (event.key == Keys_Enum.ESCAPE) {
+      event.preventDefault();
+      this.requestClose();
+    }
+  }
+}
diff --git a/src/utils/close-watcher.extern.js b/src/utils/close-watcher.extern.js
new file mode 100644
index 000000000000..12ee76aad07f
--- /dev/null
+++ b/src/utils/close-watcher.extern.js
@@ -0,0 +1,21 @@
+/**
+ * @fileoverview Externs for CloseWatcher class.
+ * See https://github.com/WICG/close-watcher.
+ *
+ * TODO(dvoytenko): remove CloseWatcher once it's added in Closure externs.
+ *
+ * @externs
+ */
+
+/** @constructor */
+function CloseWatcher() {}
+
+CloseWatcher.prototype.destroy = function () {};
+
+CloseWatcher.prototype.requestClose = function () {};
+
+/** @type {?function(!Event)} */
+CloseWatcher.prototype.onclose;
+
+/** @type {?function(!Event)} */
+CloseWatcher.prototype.oncancel;
diff --git a/src/utils/display-observer.js b/src/utils/display-observer.js
index e8a1e2b6271f..86d24f1f6e92 100644
--- a/src/utils/display-observer.js
+++ b/src/utils/display-observer.js
@@ -1,4 +1,4 @@
-import {VisibilityState} from '#core/constants/visibility-state';
+import {VisibilityState_Enum} from '#core/constants/visibility-state';
 import {containsNotSelf} from '#core/dom';
 import {rethrowAsync} from '#core/error';
 import {pushIfNotExist, removeItem} from '#core/types/array';
@@ -423,16 +423,16 @@ function computeDisplay(observations, isDocDisplay) {
 }
 
 /**
- * @param {!VisibilityState} visibilityState
+ * @param {!VisibilityState_Enum} visibilityState
  * @return {boolean}
  */
 function computeDocIsDisplayed(visibilityState) {
   return (
-    visibilityState == VisibilityState.VISIBLE ||
+    visibilityState == VisibilityState_Enum.VISIBLE ||
     // The document is still considered "displayed" or at least "displayable"
     // when it's hidden (tab is switched). Only prerender/paused/inactive
     // states require pause of resources.
-    visibilityState == VisibilityState.HIDDEN
+    visibilityState == VisibilityState_Enum.HIDDEN
   );
 }
 
diff --git a/src/utils/dom-ancestor-visitor.js b/src/utils/dom-ancestor-visitor.js
index 99fa31943657..b4008d546aea 100644
--- a/src/utils/dom-ancestor-visitor.js
+++ b/src/utils/dom-ancestor-visitor.js
@@ -4,7 +4,7 @@ import {computedStyle} from '#core/dom/style';
 import {dev} from '#utils/log';
 
 /** @typedef {
- *    function(!Element, !Object<string, string>): *
+ *    function(!Element, !{[key: string]: string}): *
  *  }
  */
 export let VisitorCallbackTypeDef;
@@ -97,7 +97,7 @@ class Visitor {
 
   /**
    * @param {!Element} element
-   * @param {!Object<string, string>} style
+   * @param {!{[key: string]: string}} style
    */
   callback(element, style) {
     devAssert(
diff --git a/src/utils/dom-tranform-stream.js b/src/utils/dom-transform-stream.js
similarity index 100%
rename from src/utils/dom-tranform-stream.js
rename to src/utils/dom-transform-stream.js
diff --git a/src/utils/dom-writer.js b/src/utils/dom-writer.js
index 766bf05ca84b..c4d6d5b35ccb 100644
--- a/src/utils/dom-writer.js
+++ b/src/utils/dom-writer.js
@@ -1,5 +1,5 @@
 import {devAssert} from '#core/assert';
-import {iterateCursor, removeElement} from '#core/dom';
+import {removeElement} from '#core/dom';
 import {childElementsByTag} from '#core/dom/query';
 
 import {Services} from '#service';
@@ -330,8 +330,5 @@ export class DomWriterBulk {
  * @param {!Element} parent
  */
 export function removeNoScriptElements(parent) {
-  const noscriptElements = childElementsByTag(parent, 'noscript');
-  iterateCursor(noscriptElements, (element) => {
-    removeElement(element);
-  });
+  childElementsByTag(parent, 'noscript').forEach(removeElement);
 }
diff --git a/src/utils/intersection-observer-3p-host.js b/src/utils/intersection-observer-3p-host.js
index 165477ca4926..afa0e7968552 100644
--- a/src/utils/intersection-observer-3p-host.js
+++ b/src/utils/intersection-observer-3p-host.js
@@ -1,10 +1,9 @@
-import {MessageType} from '#core/3p-frame-messaging';
+import {MessageType_Enum} from '#core/3p-frame-messaging';
 import {
   layoutRectLtwh,
   moveLayoutRect,
   rectIntersection,
 } from '#core/dom/layout/rect';
-import {dict} from '#core/types/object';
 
 import {SubscriptionApi} from '../iframe-helper';
 
@@ -75,7 +74,7 @@ export class IntersectionObserver3pHost {
     /** @private {?SubscriptionApi} */
     this.subscriptionApi_ = new SubscriptionApi(
       iframe,
-      MessageType.SEND_INTERSECTIONS,
+      MessageType_Enum.SEND_INTERSECTIONS,
       false, // is3P
       () => {
         this.startSendingIntersection_();
@@ -84,10 +83,9 @@ export class IntersectionObserver3pHost {
 
     this.intersectionObserver_ = new IntersectionObserver(
       (entries) => {
-        this.subscriptionApi_.send(
-          MessageType.INTERSECTION,
-          dict({'changes': entries.map(cloneEntryForCrossOrigin)})
-        );
+        this.subscriptionApi_.send(MessageType_Enum.INTERSECTION, {
+          'changes': entries.map(cloneEntryForCrossOrigin),
+        });
       },
       {threshold: DEFAULT_THRESHOLD}
     );
diff --git a/src/utils/log.d.ts b/src/utils/log.d.ts
new file mode 100644
index 000000000000..19646faf64b6
--- /dev/null
+++ b/src/utils/log.d.ts
@@ -0,0 +1,16 @@
+export interface Logger {
+  warn: (...args: any[]) => void;
+  error: (...args: any[]) => void;
+  assertString: (...args: any[]) => void;
+}
+
+export const user: () => Logger;
+export const dev: () => Logger;
+
+export type LogLevel_Enum = {
+  OFF: 0;
+  ERROR: 1;
+  WARN: 2;
+  INFO: 3;
+  FINE: 4;
+};
diff --git a/src/utils/log.js b/src/utils/log.js
index c53be165f9c8..698401d39f70 100644
--- a/src/utils/log.js
+++ b/src/utils/log.js
@@ -16,7 +16,7 @@ import {isArray, isString} from '#core/types';
 import {once} from '#core/types/function';
 import {getHashParams} from '#core/types/string/url';
 
-import {urls} from '../config';
+import * as urls from '../config/urls';
 import {getMode} from '../mode';
 
 const noop = () => {};
@@ -37,7 +37,7 @@ export function setReportError(fn) {
 /**
  * @enum {number}
  */
-export const LogLevel = {
+export const LogLevel_Enum = {
   OFF: 0,
   ERROR: 1,
   WARN: 2,
@@ -46,13 +46,13 @@ export const LogLevel = {
 };
 
 /**
- * @type {!LogLevel|undefined}
+ * @type {!LogLevel_Enum|undefined}
  * @private
  */
 let levelOverride_ = undefined;
 
 /**
- * @param {!LogLevel} level
+ * @param {!LogLevel_Enum} level
  */
 export function overrideLogLevel(level) {
   levelOverride_ = level;
@@ -79,7 +79,7 @@ const externalMessageUrl = (id, interpolatedParts) =>
   );
 
 /**
- * URL to simple log messages table JSON file, which contains an Object<string, string>
+ * URL to simple log messages table JSON file, which contains an {[key: string]: string}
  * which maps message id to full message template.
  * @return {string}
  */
@@ -119,7 +119,7 @@ export class Log {
    * https://blog.sentry.io/2016/01/04/client-javascript-reporting-window-onerror.html
    *
    * @param {!Window} win
-   * @param {function(number, boolean):!LogLevel} levelFunc
+   * @param {function(number, boolean):!LogLevel_Enum} levelFunc
    * @param {string=} opt_suffix
    */
   constructor(win, levelFunc, opt_suffix = '') {
@@ -130,10 +130,10 @@ export class Log {
      */
     this.win = getMode().test && win.__AMP_TEST_IFRAME ? win.parent : win;
 
-    /** @private @const {function(number, boolean):!LogLevel} */
+    /** @private @const {function(number, boolean):!LogLevel_Enum} */
     this.levelFunc_ = levelFunc;
 
-    /** @private @const {!LogLevel} */
+    /** @private @const {!LogLevel_Enum} */
     this.level_ = this.defaultLevel_();
 
     /** @private @const {string} */
@@ -164,7 +164,7 @@ export class Log {
   }
 
   /**
-   * @return {!LogLevel}
+   * @return {!LogLevel_Enum}
    * @private
    */
   defaultLevel_() {
@@ -175,17 +175,17 @@ export class Log {
       // Logging has been explicitly disabled.
       logHashParam(win) == 0
     ) {
-      return LogLevel.OFF;
+      return LogLevel_Enum.OFF;
     }
 
     // Logging is enabled for tests directly.
     if (getMode().test && win.ENABLE_LOG) {
-      return LogLevel.FINE;
+      return LogLevel_Enum.FINE;
     }
 
     // LocalDev by default allows INFO level, unless overriden by `#log`.
     if (getMode().localDev) {
-      return LogLevel.INFO;
+      return LogLevel_Enum.INFO;
     }
 
     return this.defaultLevelWithFunc_();
@@ -193,7 +193,7 @@ export class Log {
 
   /**
    * @param {!Window=} opt_win provided for testing
-   * @return {!LogLevel}
+   * @return {!LogLevel_Enum}
    * @private
    */
   defaultLevelWithFunc_(opt_win) {
@@ -203,7 +203,7 @@ export class Log {
 
   /**
    * @param {string} tag
-   * @param {!LogLevel} level
+   * @param {!LogLevel_Enum} level
    * @param {!Array} messages
    * @return {boolean} true if a the message was logged
    */
@@ -215,9 +215,9 @@ export class Log {
     const cs = this.win.console;
     const fn =
       {
-        [LogLevel.ERROR]: cs.error,
-        [LogLevel.INFO]: cs.info,
-        [LogLevel.WARN]: cs.warn,
+        [LogLevel_Enum.ERROR]: cs.error,
+        [LogLevel_Enum.INFO]: cs.info,
+        [LogLevel_Enum.WARN]: cs.warn,
       }[level] ?? cs.log;
 
     const args = this.maybeExpandMessageArgs_(messages);
@@ -240,7 +240,7 @@ export class Log {
    * @param {...*} args
    */
   fine(tag, ...args) {
-    this.msg_(tag, LogLevel.FINE, args);
+    this.msg_(tag, LogLevel_Enum.FINE, args);
   }
 
   /**
@@ -249,7 +249,7 @@ export class Log {
    * @param {...*} args
    */
   info(tag, ...args) {
-    this.msg_(tag, LogLevel.INFO, args);
+    this.msg_(tag, LogLevel_Enum.INFO, args);
   }
 
   /**
@@ -258,7 +258,7 @@ export class Log {
    * @param {...*} args
    */
   warn(tag, ...args) {
-    this.msg_(tag, LogLevel.WARN, args);
+    this.msg_(tag, LogLevel_Enum.WARN, args);
   }
 
   /**
@@ -267,7 +267,7 @@ export class Log {
    * @param {...*} args
    */
   error(tag, ...args) {
-    if (!this.msg_(tag, LogLevel.ERROR, args)) {
+    if (!this.msg_(tag, LogLevel_Enum.ERROR, args)) {
       const error = this.createError.apply(this, args);
       error.name = tag || error.name;
       self.__AMP_REPORT_ERROR?.(error);
@@ -281,7 +281,7 @@ export class Log {
    * @param {...*} args
    */
   expectedError(tag, ...args) {
-    if (!this.msg_(tag, LogLevel.ERROR, args)) {
+    if (!this.msg_(tag, LogLevel_Enum.ERROR, args)) {
       self.__AMP_REPORT_ERROR?.(this.createExpectedError.apply(this, args));
     }
   }
@@ -541,7 +541,7 @@ export function resetLogConstructorForTesting() {
 
 /**
  * Calls the log constructor with a given level function and suffix.
- * @param {function(number, boolean):!LogLevel} levelFunc
+ * @param {function(number, boolean):!LogLevel_Enum} levelFunc
  * @param {string=} opt_suffix
  * @return {!Log}
  */
@@ -587,7 +587,7 @@ export function user(opt_element) {
 function getUserLogger(suffix) {
   return callLogConstructor(
     (logNum, development) =>
-      development || logNum >= 1 ? LogLevel.FINE : LogLevel.WARN,
+      development || logNum >= 1 ? LogLevel_Enum.FINE : LogLevel_Enum.WARN,
     suffix
   );
 }
@@ -608,7 +608,11 @@ export function dev() {
   return (
     logs.dev ||
     (logs.dev = callLogConstructor((logNum) =>
-      logNum >= 3 ? LogLevel.FINE : logNum >= 2 ? LogLevel.INFO : LogLevel.OFF
+      logNum >= 3
+        ? LogLevel_Enum.FINE
+        : logNum >= 2
+          ? LogLevel_Enum.INFO
+          : LogLevel_Enum.OFF
     ))
   );
 }
diff --git a/src/utils/privacy-sandbox-utils.js b/src/utils/privacy-sandbox-utils.js
new file mode 100644
index 000000000000..b035ca998800
--- /dev/null
+++ b/src/utils/privacy-sandbox-utils.js
@@ -0,0 +1,28 @@
+/**
+ * Determine if `attribution-reporting` API is available in browser.
+ * @param {!Document} doc
+ * @return {boolean}
+ */
+export function isAttributionReportingAvailable(doc) {
+  return doc.featurePolicy?.features().includes('attribution-reporting');
+}
+
+/**
+ * Determine if `attribution-reporting` API is allowed in current context.
+ * @param {!Document} doc
+ * @return {boolean}
+ */
+export function isAttributionReportingAllowed(doc) {
+  return doc.featurePolicy?.allowedFeatures().includes('attribution-reporting');
+}
+
+/**
+ * Indicates the status of the `attribution-reporting` API.
+ * @enum
+ */
+export const AttributionReportingStatus = {
+  ATTRIBUTION_DATA_UNSPECIFIED: 0,
+  ATTRIBUTION_MACRO_PRESENT: 4,
+  ATTRIBUTION_DATA_PRESENT: 5,
+  ATTRIBUTION_DATA_PRESENT_AND_POLICY_ENABLED: 6,
+};
diff --git a/src/utils/xhr-utils.js b/src/utils/xhr-utils.js
index 28405299f56d..9ca203f8cbfe 100644
--- a/src/utils/xhr-utils.js
+++ b/src/utils/xhr-utils.js
@@ -1,6 +1,6 @@
 import {devAssert, userAssert} from '#core/assert';
 import {fromIterator, isArray} from '#core/types/array';
-import {dict, isObject, map} from '#core/types/object';
+import {isObject, map} from '#core/types/object';
 
 import {isExperimentOn} from '#experiments';
 
@@ -216,9 +216,9 @@ export function getViewerInterceptResponse(win, ampdocSingle, input, init) {
       ) {
         return;
       }
-      const messagePayload = dict({
+      const messagePayload = {
         'originalRequest': toStructuredCloneable(input, init),
-      });
+      };
       return viewer
         .sendMessageAwaitResponse('xhr', messagePayload)
         .then((response) =>
@@ -263,7 +263,7 @@ export function setupInit(opt_init, opt_accept) {
   );
 
   init.method = normalizeMethod_(init.method);
-  init.headers = init.headers || dict({});
+  init.headers = init.headers || {};
   if (opt_accept) {
     init.headers['Accept'] = opt_accept;
   }
diff --git a/src/validator-integration.js b/src/validator-integration.js
index 2e9309365c4c..b069065f274a 100644
--- a/src/validator-integration.js
+++ b/src/validator-integration.js
@@ -1,8 +1,9 @@
+import {propagateNonce} from '#core/dom';
 import {getHashParams} from '#core/types/string/url';
 
 import {loadPromise} from '#utils/event-helper';
 
-import {urls} from './config';
+import * as urls from './config/urls';
 import {isModeDevelopment} from './mode';
 
 /**
@@ -43,13 +44,30 @@ export function loadScript(doc, url) {
   const script = /** @type {!HTMLScriptElement} */ (
     doc.createElement('script')
   );
-  script.src = url;
-
-  // Propagate nonce to all generated script tags.
-  const currentScript = doc.head.querySelector('script[nonce]');
-  if (currentScript) {
-    script.setAttribute('nonce', currentScript.getAttribute('nonce'));
+  // Make script.src assignment Trusted Types compatible for compatible browsers
+  if (self.trustedTypes && self.trustedTypes.createPolicy) {
+    const policy = self.trustedTypes.createPolicy(
+      'validator-integration#loadScript',
+      {
+        createScriptURL: function (url) {
+          // Only allow trusted URLs
+          // Using explicit cdn domain as no other AMP Cache hosts validator_
+          // wasm so we can assume the explicit cdn domain is cdn.ampproject.org
+          // instead of using the dynamic cdn value from src/config/urls.js
+          // eslint-disable-next-line local/no-forbidden-terms
+          if (url === 'https://cdn.ampproject.org/v0/validator_wasm.js') {
+            return url;
+          } else {
+            return '';
+          }
+        },
+      }
+    );
+    script.src = policy.createScriptURL(url);
+  } else {
+    script.src = url;
   }
+  propagateNonce(doc, script);
 
   const promise = loadPromise(script).then(
     () => {
diff --git a/src/video-iframe-integration.js b/src/video-iframe-integration.js
index e3bbfea091f4..304951c90f70 100644
--- a/src/video-iframe-integration.js
+++ b/src/video-iframe-integration.js
@@ -3,7 +3,6 @@
 import {tryResolve} from '#core/data-structures/promise';
 import {isFiniteNumber} from '#core/types';
 import {once} from '#core/types/function';
-import {dict} from '#core/types/object';
 import {tryParseJson} from '#core/types/object/json';
 
 import {getData, listen} from '#utils/event-helper';
@@ -78,13 +77,13 @@ export class AmpVideoIntegration {
     /** @private @const */
     this.callCounter_ = 0;
 
-    /** @private @const {!Object<number, function()>} */
+    /** @private @const {!{[key: number]: function()}} */
     this.callbacks_ = {};
 
     /** @private @const {!Window} */
     this.win_ = win;
 
-    /** @private @const {!Object<string, function()>} */
+    /** @private @const {!{[key: string]: function()}} */
     this.methods_ = {};
 
     /** @private @const {function()} */
@@ -279,7 +278,10 @@ export class AmpVideoIntegration {
       });
 
       // in case `canplay` fires before this script loads
-      if (player.readyState() >= /* HAVE_FUTURE_DATA */ 3) {
+      if (
+        player.readyState() >= /* HAVE_FUTURE_DATA */ 3 ||
+        /iPhone|iPad|iPod/i.test(this.win_.navigator.userAgent) // iOS 12+ no longer fires `canplay`, this is a workaround
+      ) {
         this.postEvent(canplay);
       } else {
         player.on(canplay, () => this.postEvent(canplay));
@@ -336,24 +338,22 @@ export class AmpVideoIntegration {
    * @param {string} event
    */
   postEvent(event) {
-    this.postToParent_(dict({'event': event}));
+    this.postToParent_({'event': event});
   }
 
   /**
    * Posts a custom analytics event.
    * @param {string} eventType
-   * @param {!Object<string, string>=} opt_vars
+   * @param {!{[key: string]: string}=} opt_vars
    */
   postAnalyticsEvent(eventType, opt_vars) {
-    this.postToParent_(
-      dict({
-        'event': 'analytics',
-        'analytics': {
-          'eventType': eventType,
-          'vars': opt_vars,
-        },
-      })
-    );
+    this.postToParent_({
+      'event': 'analytics',
+      'analytics': {
+        'eventType': eventType,
+        'vars': opt_vars,
+      },
+    });
   }
 
   /**
@@ -402,7 +402,7 @@ export class AmpVideoIntegration {
    */
   getFromHostForTesting_(method, callback) {
     this.listenToOnce_();
-    return this.postToParent_(dict({'method': method}), callback);
+    return this.postToParent_({'method': method}, callback);
   }
 }
 
diff --git a/src/video-interface.js b/src/video-interface.js
index ffa9f99dd6f0..1e6d21c36c03 100644
--- a/src/video-interface.js
+++ b/src/video-interface.js
@@ -18,6 +18,12 @@ export const MIN_VISIBILITY_RATIO_FOR_AUTOPLAY = 0.5;
  * @interface
  */
 export class VideoInterface {
+  /** @return {!AmpElement} */
+  get element() {}
+
+  /** @return {!Window} */
+  get win() {}
+
   /**
    * See `BaseElement`.
    * @return {!./utils/signals.Signals}
@@ -182,12 +188,6 @@ export class VideoInterface {
   seekTo(unusedTimeSeconds) {}
 }
 
-/** @type {!AmpElement} */
-VideoInterface.prototype.element;
-
-/** @type {!Window} */
-VideoInterface.prototype.win;
-
 /**
  * Attributes
  *
@@ -196,7 +196,7 @@ VideoInterface.prototype.win;
  *
  * @enum {string}
  */
-export const VideoAttributes = {
+export const VideoAttributes_Enum = {
   /**
    * autoplay
    *
@@ -254,7 +254,7 @@ export const VideoAttributes = {
  *
  * @enum {string}
  */
-export const VideoEvents = {
+export const VideoEvents_Enum = {
   /**
    * registered
    *
@@ -416,7 +416,7 @@ export let PlayingStateDef;
  *
  * @enum {string}
  */
-export const PlayingStates = {
+export const PlayingStates_Enum = {
   /**
    * playing_manual
    *
@@ -563,11 +563,11 @@ export let VideoOrBaseElementDef;
  * @return {boolean}
  */
 export function isDockable(element) {
-  return element.hasAttribute(VideoAttributes.DOCK);
+  return element.hasAttribute(VideoAttributes_Enum.DOCK);
 }
 
 /** @enum {string} */
-export const VideoServiceSignals = {
+export const VideoServiceSignals_Enum = {
   USER_INTERACTED: 'user-interacted',
   PLAYBACK_DELEGATED: 'playback-delegated',
 };
@@ -575,13 +575,13 @@ export const VideoServiceSignals = {
 /** @param {!AmpElement|!VideoOrBaseElementDef} video */
 export function delegateAutoplay(video) {
   whenUpgradedToCustomElement(devAssertElement(video)).then((el) => {
-    el.signals().signal(VideoServiceSignals.PLAYBACK_DELEGATED);
+    el.signals().signal(VideoServiceSignals_Enum.PLAYBACK_DELEGATED);
   });
 }
 
 /** @param {!AmpElement|!VideoOrBaseElementDef} video */
 export function userInteractedWith(video) {
-  video.signals().signal(VideoServiceSignals.USER_INTERACTED);
+  video.signals().signal(VideoServiceSignals_Enum.USER_INTERACTED);
 }
 
 /**
diff --git a/src/web-worker/amp-worker.js b/src/web-worker/amp-worker.js
index df6b11e7c757..70658eaccf53 100644
--- a/src/web-worker/amp-worker.js
+++ b/src/web-worker/amp-worker.js
@@ -72,12 +72,39 @@ class AmpWorker {
     // Use RTV to make sure we fetch prod/canary/experiment correctly.
     const useLocal = getMode().localDev || getMode().test;
     const useRtvVersion = !useLocal;
-    const url = calculateEntryPointScriptUrl(
-      loc,
-      'ww',
-      useLocal,
-      useRtvVersion
-    );
+
+    let url = '';
+
+    let policy = {
+      createScriptURL: function (url) {
+        // Only allow the correct webworker url to pass through
+        const regexURL =
+          /^https:\/\/([a-zA-Z0-9_-]+\.)?cdn\.ampproject\.org(\/.*)?$/;
+
+        if (
+          (regexURL.test(url) || getMode().test || getMode().localDev) &&
+          (url.endsWith('ww.js') ||
+            url.endsWith('ww.min.js') ||
+            url.endsWith('ww.mjs') ||
+            url.endsWith('ww.min.mjs'))
+        ) {
+          return url;
+        } else {
+          return '';
+        }
+      },
+    };
+
+    if (self.trustedTypes && self.trustedTypes.createPolicy) {
+      policy = self.trustedTypes.createPolicy('amp-worker#fetchUrl', policy);
+    }
+
+    url = policy
+      .createScriptURL(
+        calculateEntryPointScriptUrl(loc, 'ww', useLocal, useRtvVersion)
+      )
+      .toString();
+
     dev().fine(TAG, 'Fetching web worker from', url);
 
     /** @private {Worker} */
@@ -103,13 +130,26 @@ class AmpWorker {
           type: 'text/javascript',
         });
         const blobUrl = win.URL.createObjectURL(blob);
-        this.worker_ = new win.Worker(blobUrl);
+        if (self.trustedTypes && self.trustedTypes.createPolicy) {
+          // We can trust the url for this policy usage because the blobUrl pulls the script from a controlled source, the ww.js file.
+          const policy = self.trustedTypes.createPolicy(
+            'amp-worker#constructor',
+            {
+              createScriptURL: function (url) {
+                return url;
+              },
+            }
+          );
+          this.worker_ = new win.Worker(policy.createScriptURL(blobUrl));
+        } else {
+          this.worker_ = new win.Worker(blobUrl);
+        }
         this.worker_.onmessage = this.receiveMessage_.bind(this);
       });
 
     /**
      * Array of in-flight messages pending response from worker.
-     * @const @private {!Object<number, PendingMessageDef>}
+     * @const @private {!{[key: number]: PendingMessageDef}}
      */
     this.messages_ = {};
 
diff --git a/src/web-worker/web-worker.js b/src/web-worker/web-worker.js
index 35f65d0fae57..c4f1fd4de34c 100644
--- a/src/web-worker/web-worker.js
+++ b/src/web-worker/web-worker.js
@@ -11,7 +11,7 @@ import {exponentialBackoff} from '#core/types/function/exponential-backoff';
 import {dev, initLogConstructor, setReportError} from '#utils/log';
 
 import {BindEvaluator} from '../../extensions/amp-bind/0.1/bind-evaluator';
-import {urls} from '../config';
+import * as urls from '../config/urls';
 import {reportError} from '../error-reporting';
 
 initLogConstructor();
diff --git a/test/e2e/test-amp-bind-live-list.js b/test/e2e/test-amp-bind-live-list.js
index f163803c240b..d38d590ea588 100644
--- a/test/e2e/test-amp-bind-live-list.js
+++ b/test/e2e/test-amp-bind-live-list.js
@@ -12,9 +12,8 @@ describes.endtoend(
 
     describe('with <amp-live-list>', () => {
       it('should detect bindings in initial live-list elements', async () => {
-        const liveListChildren = await controller.findElements(
-          '#liveListItems > *'
-        );
+        const liveListChildren =
+          await controller.findElements('#liveListItems > *');
         await expect(liveListChildren.length).to.equal(1);
 
         const existingItem = await controller.findElement('#liveListItem1');
@@ -38,9 +37,8 @@ describes.endtoend(
       // TODO(cvializ,choumx): Configure the server to send different data on the
       // second request. A queryparam should be able to implement this.
       it.skip('should apply scope to bindings in new list items', async () => {
-        const liveListChildren = await controller.findElements(
-          '#liveListItems > *'
-        );
+        const liveListChildren =
+          await controller.findElements('#liveListItems > *');
         await expect(liveListChildren.length).to.equal(1);
 
         const existingItem = await controller.findElement('#liveListItem1');
diff --git a/test/e2e/test-amp-bind-state.js b/test/e2e/test-amp-bind-state.js
index 68800444816d..4049f36a061f 100644
--- a/test/e2e/test-amp-bind-state.js
+++ b/test/e2e/test-amp-bind-state.js
@@ -23,9 +23,8 @@ describes.endtoend(
       // TODO(cvializ, choumx): Update server to have an endpoint that
       // would test the infinite-loop blocking behavior
       it.skip('should not loop infinitely if updates change its src binding', async () => {
-        const changeAmpStateSrcButton = await controller.findElement(
-          '#changeAmpStateSrc'
-        );
+        const changeAmpStateSrcButton =
+          await controller.findElement('#changeAmpStateSrc');
         const setState = await controller.findElement('#setState');
         const ampState = await controller.findElement('#ampState');
 
diff --git a/test/e2e/test-bento.js b/test/e2e/test-bento.js
deleted file mode 100644
index 7abab6163a6a..000000000000
--- a/test/e2e/test-bento.js
+++ /dev/null
@@ -1,20 +0,0 @@
-describes.endtoend(
-  'Bento',
-  {
-    environments: ['single'],
-    fixture: 'bento/minimal.html',
-  },
-  async function (env) {
-    it('attaches shadow root', async () => {
-      // Set timeout lower than default in order to fail early, since the root
-      // is attached as soon as possible.
-      // (Feel free to increase if flaky.)
-      this.timeout(100);
-      await env.controller.switchToShadowRoot(
-        await env.controller.findElement('bento-timeago')
-      );
-
-      await expect(await env.controller.findElement('time')).ok;
-    });
-  }
-);
diff --git a/test/fixtures/e2e/bento/bento-inline-gallery.html b/test/fixtures/e2e/bento/bento-inline-gallery.html
deleted file mode 100644
index 235d8002e314..000000000000
--- a/test/fixtures/e2e/bento/bento-inline-gallery.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <script src="https://cdn.ampproject.org/bento.js"></script>
-
-    <script async src="https://cdn.ampproject.org/v0/bento-inline-gallery-1.0.js"></script>
-    <link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-inline-gallery-1.0.css">
-
-    <script async src="https://cdn.ampproject.org/v0/bento-base-carousel-1.0.js"></script>
-    <link rel="stylesheet" href="https://cdn.ampproject.org/v0/bento-base-carousel-1.0.css">
-  <body>
-    <bento-inline-gallery id="inline-gallery">
-      <bento-inline-gallery-thumbnails style="height: 100px;" loop></bento-inline-gallery-thumbnails>
-
-      <bento-base-carousel style="height: 200px;" snap-align="center" visible-count="3" loop>
-        <img
-          src="https://images.unsplash.com/photo-1583511655857-d19b40a7a54e?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=1498&q=80"
-          data-thumbnail-src="https://images.unsplash.com/photo-1583511655857-d19b40a7a54e?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=120&q=80"
-        />
-        <img
-          src="https://images.unsplash.com/photo-1583511666407-5f06533f2113?ixlib=rb-1.2.1&auto=format&fit=crop&w=1498&q=80"
-          data-thumbnail-src="https://images.unsplash.com/photo-1583511666407-5f06533f2113?ixlib=rb-1.2.1&auto=format&fit=crop&w=120&q=80"
-        />
-        <img
-          src="https://images.unsplash.com/photo-1599839575945-a9e5af0c3fa5?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjQwMzA0fQ&auto=format&fit=crop&w=1498&q=80"
-          data-thumbnail-src="https://images.unsplash.com/photo-1599839575945-a9e5af0c3fa5?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjQwMzA0fQ&auto=format&fit=crop&w=1498&q=80"
-        />
-        <img
-          src="https://images.unsplash.com/photo-1583512603806-077998240c7a?ixlib=rb-1.2.1&auto=format&fit=crop&w=1498&q=80"
-          data-thumbnail-src="https://images.unsplash.com/photo-1583512603806-077998240c7a?ixlib=rb-1.2.1&auto=format&fit=crop&w=120&q=80"
-        />
-        <img
-          src="https://images.unsplash.com/photo-1598133893773-de3574464ef0?ixlib=rb-1.2.1&auto=format&fit=crop&w=1498&q=80"
-          data-thumbnail-src="https://images.unsplash.com/photo-1598133893773-de3574464ef0?ixlib=rb-1.2.1&auto=format&fit=crop&w=120&q=80"
-        />
-        <img
-          src="https://images.unsplash.com/photo-1603123853880-a92fafb7809f?ixlib=rb-1.2.1&auto=format&fit=crop&w=1498&q=80"
-          data-thumbnail-src="https://images.unsplash.com/photo-1603123853880-a92fafb7809f?ixlib=rb-1.2.1&auto=format&fit=crop&w=120&q=80"
-        />
-      </bento-base-carousel>
-
-      <bento-inline-gallery-pagination style="height: 20px;"></bento-inline-gallery-pagination>
-    </bento-inline-gallery>
-  </body>
-</html>
diff --git a/test/fixtures/e2e/bento/minimal.html b/test/fixtures/e2e/bento/minimal.html
deleted file mode 100644
index b2a744d598c5..000000000000
--- a/test/fixtures/e2e/bento/minimal.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8" />
-    <title>Bento component renders without v0.js</title>
-    <meta
-      name="viewport"
-      content="width=device-width,minimum-scale=1,initial-scale=1"
-    />
-    <script src="https://cdn.ampproject.org/bento.js"></script>
-    <script
-      async
-      src="https://cdn.ampproject.org/v0/bento-timeago-1.0.js"
-    ></script>
-  </head>
-  <body>
-    <bento-timeago
-      style="display: inline-block; width: 160px; height: 20px"
-      datetime="2018-04-11T00:37:33.809Z"
-    >
-      Saturday 11 April 2018 00.37
-    </bento-timeago>
-  </body>
-</html>
diff --git a/test/fixtures/e2e/bento/sidebar.html b/test/fixtures/e2e/bento/sidebar.html
deleted file mode 100644
index aff5bf224dac..000000000000
--- a/test/fixtures/e2e/bento/sidebar.html
+++ /dev/null
@@ -1,133 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8" />
-    <title>Bento Sidebar</title>
-    <meta
-      name="viewport"
-      content="width=device-width,minimum-scale=1,initial-scale=1"
-    />
-    <script src="https://cdn.ampproject.org/bento.js"></script>
-    <script
-      async
-      src="https://cdn.ampproject.org/v0/bento-sidebar-1.0.js"
-    ></script>
-  </head>
-  <body>
-    <h1>Sidebar</h1>
-    <bento-sidebar>
-      <nav>
-        <button id="close-sidebar">Close sidebar</button>
-        <h2>Navigation</h2>
-        <ul>
-          <li>
-            <a href="#bridge">Bridge</a>
-          </li>
-          <li>
-            <a href="#10forward">10 Forward</a>
-          </li>
-          <li>
-            <a href="#sickbay">Sickbay</a>
-          </li>
-          <li>
-            <a href="#engineering">Engineering</a>
-          </li>
-          <li>
-            <a href="#arboretum">Arboretum</a>
-          </li>
-          <li>
-            <a href="#cetacean-ops">Cetacean Ops</a>
-          </li>
-          <li>
-            <a href="#shuttlebay">Shuttlebay</a>
-          </li>
-        </ul>
-      </nav>
-    </bento-sidebar>
-    <main>
-      <div class="buttons" style="margin-top: 8px">
-        <button id="open-sidebar">Open sidebar</button>
-      </div>
-      <p id="bridge">
-        These are the voyages of the Starship Enterprise. Its continuing
-        mission, to explore strange new worlds, to seek out new life and new
-        civilizations, to boldly go where no one has gone before. We need to
-        neutralize the homing signal. Each unit has total environmental control,
-        gravity, temperature, atmosphere, light, in a protective field. Sensors
-        show energy readings in your area. We had a forced chamber explosion in
-        the resonator coil. Field strength has increased by 3,000 percent.
-      </p>
-
-      <p id="10forward">
-        Shields up. I recommend we transfer power to phasers and arm the photon
-        torpedoes. Something strange on the detector circuit. The weapons must
-        have disrupted our communicators. You saw something as tasty as meat,
-        but inorganically materialized out of patterns used by our transporters.
-        Captain, the most elementary and valuable statement in science, the
-        beginning of wisdom, is 'I do not know.' All transporters off.
-      </p>
-
-      <p id="sickbay">
-        Communication is not possible. The shuttle has no power. Using the
-        gravitational pull of a star to slingshot back in time? We are going to
-        Starbase Montgomery for Engineering consultations prompted by minor
-        read-out anomalies. Probes have recorded unusual levels of geological
-        activity in all five planetary systems. Assemble a team. Look at records
-        of the Drema quadrant. Would these scans detect artificial transmissions
-        as well as natural signals?
-      </p>
-
-      <p id="engineering">
-        Deflector power at maximum. Energy discharge in six seconds. Warp
-        reactor core primary coolant failure. Fluctuate phaser resonance
-        frequencies. Resistance is futile. Recommend we adjust shield harmonics
-        to the upper EM band when proceeding. These appear to be some kind of
-        power-wave-guide conduits which allow them to work collectively as they
-        perform ship functions. Increase deflector modulation to upper frequency
-        band.
-      </p>
-
-      <p id="arboretum">
-        Exceeding reaction chamber thermal limit. We have begun power-supply
-        calibration. Force fields have been established on all turbo lifts and
-        crawlways. Computer, run a level-two diagnostic on warp-drive systems.
-        Antimatter containment positive. Warp drive within normal parameters. I
-        read an ion trail characteristic of a freighter escape pod. The bomb had
-        a molecular-decay detonator. Detecting some unusual fluctuations in
-        subspace frequencies.
-      </p>
-
-      <p id="cetacean-ops">
-        Sensors indicate human life forms 30 meters below the planet's surface.
-        Stellar flares are increasing in magnitude and frequency. Set course for
-        Rhomboid Dronegar 006, warp seven. There's no evidence of an advanced
-        communication network. Total guidance system failure, with less than 24
-        hours' reserve power. Shield effectiveness has been reduced 12 percent.
-        We have covered the area in a spherical pattern which a ship without
-        warp drive could cross in the given time.
-      </p>
-
-      <p id="shuttlebay">
-        It indicates a synchronic distortion in the areas emanating triolic
-        waves. The cerebellum, the cerebral cortex, the brain stem, the entire
-        nervous system has been depleted of electrochemical energy. Any device
-        like that would produce high levels of triolic waves. These walls have
-        undergone some kind of selective molecular polarization. I haven't
-        determined if our phaser energy can generate a stable field. We could
-        alter the photons with phase discriminators.
-      </p>
-    </main>
-
-    <script>
-      (async () => {
-        const sidebar = document.querySelector('bento-sidebar');
-        await customElements.whenDefined('bento-sidebar');
-        const api = await sidebar.getApi();
-
-        // set up button actions
-        document.querySelector('#open-sidebar').onclick = () => api.open();
-        document.querySelector('#close-sidebar').onclick = () => api.close();
-      })();
-    </script>
-  </body>
-</html>
diff --git a/test/fixtures/e2e/bento/social-share.html b/test/fixtures/e2e/bento/social-share.html
deleted file mode 100644
index c2720548f2a1..000000000000
--- a/test/fixtures/e2e/bento/social-share.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8" />
-    <title>Bento Social Share</title>
-    <meta
-      name="viewport"
-      content="width=device-width,minimum-scale=1,initial-scale=1"
-    />
-    <link rel="canonical" href="//example.com" />
-    <script src="https://cdn.ampproject.org/bento.js"></script>
-    <script
-      async
-      src="https://cdn.ampproject.org/v0/bento-social-share-1.0.js"
-    ></script>
-  </head>
-  <body>
-    <h1>Social Share</h1>
-    <p>
-      <bento-social-share type="twitter"></bento-social-share>
-      <bento-social-share type="facebook"></bento-social-share>
-      <bento-social-share type="pinterest"></bento-social-share>
-      <bento-social-share type="linkedin"></bento-social-share>
-      <bento-social-share type="email"></bento-social-share>
-      <bento-social-share type="tumblr"></bento-social-share>
-      <bento-social-share type="whatsapp"></bento-social-share>
-      <bento-social-share type="line"></bento-social-share>
-      <bento-social-share type="sms"></bento-social-share>
-      <bento-social-share type="system"></bento-social-share>
-    </p>
-  </body>
-</html>
diff --git a/test/fixtures/e2e/bento/soundcloud.html b/test/fixtures/e2e/bento/soundcloud.html
deleted file mode 100644
index 6be0162df85d..000000000000
--- a/test/fixtures/e2e/bento/soundcloud.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8" />
-    <title>Bento Soundcloud</title>
-    <meta
-      name="viewport"
-      content="width=device-width,minimum-scale=1,initial-scale=1"
-    />
-    <script src="https://cdn.ampproject.org/bento.js"></script>
-    <script
-      async
-      src="https://cdn.ampproject.org/v0/bento-soundcloud-1.0.js"
-    ></script>
-  </head>
-  <body>
-    <h1>Soundcloud</h1>
-    <p>
-      <bento-soundcloud data-trackId="134337084" style="height: 170px">
-      </bento-soundcloud>
-    </p>
-  </body>
-</html>
diff --git a/test/fixtures/e2e/bento/timeago.html b/test/fixtures/e2e/bento/timeago.html
deleted file mode 100644
index db4e96b37551..000000000000
--- a/test/fixtures/e2e/bento/timeago.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8" />
-    <title>Bento Timeago</title>
-    <meta
-      name="viewport"
-      content="width=device-width,minimum-scale=1,initial-scale=1"
-    />
-    <script src="https://cdn.ampproject.org/bento.js"></script>
-    <script
-      async
-      src="https://cdn.ampproject.org/v0/bento-timeago-1.0.js"
-    ></script>
-  </head>
-  <body>
-    <h1>Time Ago</h1>
-    <p>
-      <bento-timeago id="timeago" style="height: 1.2em">
-        fallback display time goes here
-      </bento-timeago>
-    </p>
-    <!-- form to change time -->
-    <h2>Time ago input form</h2>
-    <form id="bentoChangeTimeForm" style="margin-top: 2em">
-      <p>
-        <time id="displayTime"></time>
-      </p>
-      <label>
-        display time
-        <input id="displayTimeInput" type="text" />
-      </label>
-      <button type="submit" id="bentoChangeTimeFormSubmit">change time</button>
-    </form>
-
-    <script>
-      const timeInput = document.querySelector('#displayTimeInput');
-      const displayTime = document.querySelector('#displayTime');
-      const threeYearsAgo = new Date();
-      threeYearsAgo.setFullYear(threeYearsAgo.getFullYear() - 3);
-
-      displayTime.innerHTML = threeYearsAgo.toISOString();
-      const bentoTimeAgo = document.querySelector('bento-timeago');
-
-      bentoTimeAgo.setAttribute('datetime', threeYearsAgo.toISOString());
-
-      // form controls to change the timeago time
-      document.getElementById('bentoChangeTimeForm').onsubmit = (e) => {
-        e.preventDefault();
-
-        bentoTimeAgo.setAttribute('datetime', timeInput.value);
-        displayTime.innerHTML = timeInput.value;
-        timeInput.value = '';
-      };
-    </script>
-  </body>
-</html>
diff --git a/test/fixtures/e2e/bento/video-iframe.html b/test/fixtures/e2e/bento/video-iframe.html
deleted file mode 100644
index e495be17e43e..000000000000
--- a/test/fixtures/e2e/bento/video-iframe.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8" />
-    <title>Bento Video iFrame</title>
-    <meta
-      name="viewport"
-      content="width=device-width,minimum-scale=1,initial-scale=1"
-    />
-    <script src="https://cdn.ampproject.org/bento.js"></script>
-    <script
-      async
-      src="https://cdn.ampproject.org/v0/bento-video-iframe-1.0.js"
-    ></script>
-  </head>
-  <body>
-    <h1>Video iFrame</h1>
-
-    <bento-video-iframe
-      id="myVideo"
-      src="/examples/amp-video-iframe/frame.html"
-      width="16"
-      height="9"
-      layout="responsive"
-      autoplay
-      style="height: 360px"
-    >
-      fallback message here
-    </bento-video-iframe>
-  </body>
-</html>
diff --git a/test/fixtures/e2e/bento/vimeo.html b/test/fixtures/e2e/bento/vimeo.html
deleted file mode 100644
index 2e77b69ca09b..000000000000
--- a/test/fixtures/e2e/bento/vimeo.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8" />
-    <title>Bento Vimeo</title>
-    <meta
-      name="viewport"
-      content="width=device-width,minimum-scale=1,initial-scale=1"
-    />
-    <script async src="https://cdn.ampproject.org/bento.js"></script>
-    <script
-      async
-      src="https://cdn.ampproject.org/v0/bento-vimeo-1.0.js"
-    ></script>
-  </head>
-  <body>
-    <h1>Vimeo</h1>
-    <p>
-      <bento-vimeo
-        data-videoid="23237102"
-        width="358"
-        height="204"
-        layout="responsive"
-        style="height: 204px; width: 358px"
-      >
-        fallback message here
-      </bento-vimeo>
-    </p>
-  </body>
-</html>
diff --git a/test/fixtures/e2e/bento/wordpress-embed.html b/test/fixtures/e2e/bento/wordpress-embed.html
deleted file mode 100644
index e040d348bc9b..000000000000
--- a/test/fixtures/e2e/bento/wordpress-embed.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8" />
-    <title>Bento Wordpress Embed</title>
-    <meta
-      name="viewport"
-      content="width=device-width,minimum-scale=1,initial-scale=1"
-    />
-    <script src="https://cdn.ampproject.org/bento.js"></script>
-    <script
-      async
-      src="https://cdn.ampproject.org/v0/bento-wordpress-embed-1.0.js"
-    ></script>
-  </head>
-  <body>
-    <h1>Wordpress Embed</h1>
-    <p>
-      <bento-wordpress-embed
-        data-url="https://wordpress.org/news/2021/10/episode-18-the-economics-of-wordpress/"
-        style="height: 500px; width: 500px"
-      >
-      </bento-wordpress-embed>
-    </p>
-  </body>
-</html>
diff --git a/test/fixtures/e2e/bento/youtube.html b/test/fixtures/e2e/bento/youtube.html
deleted file mode 100644
index 8cbe3575c9e9..000000000000
--- a/test/fixtures/e2e/bento/youtube.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8" />
-    <title>Bento Youtube</title>
-    <meta
-      name="viewport"
-      content="width=device-width,minimum-scale=1,initial-scale=1"
-    />
-    <script src="https://cdn.ampproject.org/bento.js"></script>
-    <script
-      async
-      src="https://cdn.ampproject.org/v0/bento-youtube-1.0.js"
-    ></script>
-  </head>
-  <body>
-    <h1>Youtube</h1>
-    <p>
-      <bento-youtube
-        data-videoid="dQw4w9WgXcQ"
-        width="358"
-        height="204"
-        layout="responsive"
-        style="height: 204px; width: 358px"
-      >
-        fallback message here
-      </bento-youtube>
-    </p>
-  </body>
-</html>
diff --git a/test/fixtures/served/shadow.html b/test/fixtures/served/shadow.html
index 564856384965..2856952337d5 100644
--- a/test/fixtures/served/shadow.html
+++ b/test/fixtures/served/shadow.html
@@ -10,6 +10,6 @@
   </head>
   <body>
     <h1>Shadow AMP document</h1>
-    <amp-img src="https://placekitten.com/640/480" layout="responsive" width="640" height="480"></amp-img>
+    <amp-img src="/examples/img/ampicon.png" layout="responsive" width="640" height="480"></amp-img>
   </body>
 </html>
\ No newline at end of file
diff --git a/test/integration/builtins/test-amp-img.js b/test/integration/builtins/test-amp-img.js
index 0928ccfe6de3..afac1875327c 100644
--- a/test/integration/builtins/test-amp-img.js
+++ b/test/integration/builtins/test-amp-img.js
@@ -1,4 +1,4 @@
-import {AmpEvents} from '#core/constants/amp-events';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
 
 import {createCustomEvent} from '#utils/event-helper';
 
@@ -20,7 +20,7 @@ describes.sandboxed('Rendering of amp-img', {}, () => {
     expect(fixture.doc.querySelectorAll('amp-img')).to.have.length(16);
     // 5 image visible in 500 pixel height. Note that there will be no load
     // event for the inabox image.
-    await fixture.awaitEvent(AmpEvents.LOAD_START, 3);
+    await fixture.awaitEvent(AmpEvents_Enum.LOAD_START, 3);
     expect(fixture.doc.querySelectorAll('amp-img img[src]')).to.have.length(4);
   });
 
@@ -28,17 +28,17 @@ describes.sandboxed('Rendering of amp-img', {}, () => {
     // Note that there will be no load event for the inabox image.
     fixture.iframe.height = 1500;
     fixture.win.dispatchEvent(createCustomEvent(fixture.win, 'resize', null));
-    await fixture.awaitEvent(AmpEvents.LOAD_START, 11);
+    await fixture.awaitEvent(AmpEvents_Enum.LOAD_START, 11);
     expect(fixture.doc.querySelectorAll('amp-img img[src]')).to.have.length(12);
 
     fixture.iframe.height = 2000;
     fixture.win.dispatchEvent(createCustomEvent(fixture.win, 'resize', null));
-    await fixture.awaitEvent(AmpEvents.LOAD_START, 13);
+    await fixture.awaitEvent(AmpEvents_Enum.LOAD_START, 13);
     expect(fixture.doc.querySelectorAll('amp-img img[src]')).to.have.length(14);
   });
 
   it('should respect media queries', async () => {
-    await fixture.awaitEvent(AmpEvents.LOAD_START, 3);
+    await fixture.awaitEvent(AmpEvents_Enum.LOAD_START, 3);
     await new Promise((res) => setTimeout(res, 1));
 
     const smallScreen = fixture.doc.getElementById('img3');
@@ -68,7 +68,7 @@ describes.sandboxed('Rendering of amp-img', {}, () => {
   });
 
   it('should not load image if already present (inabox)', async () => {
-    await fixture.awaitEvent(AmpEvents.LOAD_START, 3);
+    await fixture.awaitEvent(AmpEvents_Enum.LOAD_START, 3);
 
     const ampImage = fixture.doc.getElementById('img8');
     expect(ampImage).is.ok;
diff --git a/test/integration/test-amp-ad-type-custom.js b/test/integration/test-amp-ad-type-custom.js
index 647c24dc39d5..bf974da8c7af 100644
--- a/test/integration/test-amp-ad-type-custom.js
+++ b/test/integration/test-amp-ad-type-custom.js
@@ -59,7 +59,7 @@ describes.integration(
       return browser.waitForElementLayout('amp-ad');
     });
 
-    it('should render template', () => {
+    it.skip('should render template', () => {
       expect(doc.querySelectorAll('amp-img')).to.have.length(3);
 
       // ad1
diff --git a/test/integration/test-amp-analytics.js b/test/integration/test-amp-analytics.js
index 20590420d64c..0d937255d8c6 100644
--- a/test/integration/test-amp-analytics.js
+++ b/test/integration/test-amp-analytics.js
@@ -2,11 +2,10 @@ import {parseQueryString} from '#core/types/string/url';
 
 import {BrowserController, RequestBank} from '#testing/helpers/service';
 
-// TODO(wg-components): These tests time out on Firefox and Safari.
+// TODO(wg-components): These tests time out on Safari.
 describes.sandboxed
   .configure()
   .skipSafari()
-  .skipFirefox()
   .run('amp-analytics', {}, function () {
     describes.integration(
       'basic pageview',
@@ -913,17 +912,13 @@ describes.sandboxed
       }
     );
 
-    // TODO: Find source of test failure on edge.
-    describe
-      .configure()
-      .skipEdge()
-      .run('amp-analytics:shadow mode', function () {
-        describes.integration(
-          'basic pageview',
-          {
-            // TODO(ccordry): Figure out how to write cookie in shadow case, so that
-            // we can verify CLIENT_ID() is reading the right value.
-            body: `
+    describe('amp-analytics:shadow mode', function () {
+      describes.integration(
+        'basic pageview',
+        {
+          // TODO(ccordry): Figure out how to write cookie in shadow case, so that
+          // we can verify CLIENT_ID() is reading the right value.
+          body: `
         <!-- put amp-analytics > 3 viewports away from viewport -->
         <div style="height: 400vh"></div>
         <amp-analytics>
@@ -949,20 +944,20 @@ describes.sandboxed
           }
           </script>
         </amp-analytics>`,
-            extensions: ['amp-analytics'],
-            ampdoc: 'shadow',
-          },
-          () => {
-            it('should send request', () => {
-              return RequestBank.withdraw().then((req) => {
-                expect(req.url).to.match(/\/?a=2&b=Shadow%20Viewer&cid=amp-.*/);
-                expect(
-                  req.headers.referer,
-                  'should keep referrer if no referrerpolicy specified'
-                ).to.be.ok;
-              });
+          extensions: ['amp-analytics'],
+          ampdoc: 'shadow',
+        },
+        () => {
+          it('should send request', () => {
+            return RequestBank.withdraw().then((req) => {
+              expect(req.url).to.match(/\/?a=2&b=Shadow%20Viewer&cid=amp-.*/);
+              expect(
+                req.headers.referer,
+                'should keep referrer if no referrerpolicy specified'
+              ).to.be.ok;
             });
-          }
-        );
-      });
+          });
+        }
+      );
+    });
   });
diff --git a/test/integration/test-amp-bind.js b/test/integration/test-amp-bind.js
index 03646b954808..5c84bb154340 100644
--- a/test/integration/test-amp-bind.js
+++ b/test/integration/test-amp-bind.js
@@ -3,60 +3,55 @@ import {poll as classicPoll} from '#testing/iframe';
 
 const TIMEOUT = 10000;
 
-// Skip Edge, which throws "Permission denied" errors when inspecting
-// element properties in the testing iframe (Edge 17, Windows 10).
-describes.sandboxed
-  .configure()
-  .skipEdge()
-  .run('amp-bind', {}, function () {
-    this.timeout(TIMEOUT);
-
-    // Helper that sets the poll timeout.
-    function poll(desc, condition, onError) {
-      return classicPoll(desc, condition, onError, TIMEOUT);
-    }
-
-    describes.integration(
-      'basic',
-      {
-        body: `
+describes.sandboxed('amp-bind', {}, function () {
+  this.timeout(TIMEOUT);
+
+  // Helper that sets the poll timeout.
+  function poll(desc, condition, onError) {
+    return classicPoll(desc, condition, onError, TIMEOUT);
+  }
+
+  describes.integration(
+    'basic',
+    {
+      body: `
       <button on="tap:AMP.setState({t: 'after_text'})" id="changeText"></button>
       <button on="tap:AMP.setState({c: 'after_class'})" id="changeClass"></button>
       <p class="before_class" [class]="c" [text]="t">before_text</p>
     `,
-        extensions: ['amp-bind'],
-      },
-      (env) => {
-        let browser;
-        let doc;
-        let text;
-
-        beforeEach(() => {
-          doc = env.win.document;
-          text = doc.querySelector('p');
-          browser = new BrowserController(env.win);
-        });
-
-        it('[text]', function* () {
-          expect(text.textContent).to.equal('before_text');
-          yield browser.wait(200);
-          browser.click('#changeText');
-          yield poll('[text]', () => text.textContent === 'after_text');
-        });
-
-        it('[class]', function* () {
-          expect(text.className).to.equal('before_class');
-          yield browser.wait(200);
-          browser.click('#changeClass');
-          yield poll('[class]', () => text.className === 'after_class');
-        });
-      }
-    );
-
-    describes.integration(
-      '+ amp-img',
-      {
-        body: `
+      extensions: ['amp-bind'],
+    },
+    (env) => {
+      let browser;
+      let doc;
+      let text;
+
+      beforeEach(() => {
+        doc = env.win.document;
+        text = doc.querySelector('p');
+        browser = new BrowserController(env.win);
+      });
+
+      it('[text]', function* () {
+        expect(text.textContent).to.equal('before_text');
+        yield browser.wait(200);
+        browser.click('#changeText');
+        yield poll('[text]', () => text.textContent === 'after_text');
+      });
+
+      it('[class]', function* () {
+        expect(text.className).to.equal('before_class');
+        yield browser.wait(200);
+        browser.click('#changeClass');
+        yield poll('[class]', () => text.className === 'after_class');
+      });
+    }
+  );
+
+  describes.integration(
+    '+ amp-img',
+    {
+      body: `
       <amp-img id="image" layout="responsive"
         src="http://example.com/before.jpg" [src]="src"
         alt="before_alt" [alt]="alt"
@@ -67,52 +62,52 @@ describes.sandboxed
       <button on="tap:AMP.setState({alt: 'after_alt'})" id="changeAlt"></button>
       <button on="tap:AMP.setState({w: 2, h: 2})" id="changeSize"></button>
     `,
-        extensions: ['amp-bind'],
-      },
-      (env) => {
-        let doc, img;
-
-        beforeEach(() => {
-          doc = env.win.document;
-          img = doc.querySelector('amp-img');
-        });
-
-        it('[src] with valid URL', () => {
-          const button = doc.getElementById('changeSrc');
-          expect(img.getAttribute('src')).to.equal(
-            'http://example.com/before.jpg'
-          );
-          button.click();
-          return poll(
-            '[src]',
-            () => img.getAttribute('src') === 'http://example.com/after.jpg'
-          );
-        });
-
-        it('[alt]', () => {
-          const button = doc.getElementById('changeAlt');
-          expect(img.getAttribute('alt')).to.equal('before_alt');
-          button.click();
-          return poll('[src]', () => img.getAttribute('alt') === 'after_alt');
-        });
-
-        it('[width] and [height]', () => {
-          const button = doc.getElementById('changeSize');
-          expect(img.getAttribute('width')).to.equal('1');
-          expect(img.getAttribute('height')).to.equal('1');
-          button.click();
-          return Promise.all([
-            poll('[width]', () => img.getAttribute('width') === '2'),
-            poll('[height]', () => img.getAttribute('height') === '2'),
-          ]);
-        });
-      }
-    );
-
-    describes.integration(
-      '+ forms',
-      {
-        body: `
+      extensions: ['amp-bind'],
+    },
+    (env) => {
+      let doc, img;
+
+      beforeEach(() => {
+        doc = env.win.document;
+        img = doc.querySelector('amp-img');
+      });
+
+      it('[src] with valid URL', () => {
+        const button = doc.getElementById('changeSrc');
+        expect(img.getAttribute('src')).to.equal(
+          'http://example.com/before.jpg'
+        );
+        button.click();
+        return poll(
+          '[src]',
+          () => img.getAttribute('src') === 'http://example.com/after.jpg'
+        );
+      });
+
+      it('[alt]', () => {
+        const button = doc.getElementById('changeAlt');
+        expect(img.getAttribute('alt')).to.equal('before_alt');
+        button.click();
+        return poll('[src]', () => img.getAttribute('alt') === 'after_alt');
+      });
+
+      it('[width] and [height]', () => {
+        const button = doc.getElementById('changeSize');
+        expect(img.getAttribute('width')).to.equal('1');
+        expect(img.getAttribute('height')).to.equal('1');
+        button.click();
+        return Promise.all([
+          poll('[width]', () => img.getAttribute('width') === '2'),
+          poll('[height]', () => img.getAttribute('height') === '2'),
+        ]);
+      });
+    }
+  );
+
+  describes.integration(
+    '+ forms',
+    {
+      body: `
       <input type="range" min=0 max=100 value=0 on="change:AMP.setState({rangeChange: event})">
       <p id="range" [text]="rangeChange.min + ' <= ' + rangeChange.value + ' <= ' + rangeChange.max">before_range</p>
 
@@ -123,67 +118,67 @@ describes.sandboxed
       <input type="radio" on="change:AMP.setState({radioChange: event})">
       <p id="radio" [text]="'checked: ' + radioChange.checked" id="radioText">before_radio</p>
     `,
-        extensions: ['amp-bind'],
-      },
-      (env) => {
-        let doc;
-
-        beforeEach(() => {
-          doc = env.win.document;
-        });
-
-        it('input[type=range] on:change', () => {
-          const rangeText = doc.getElementById('range');
-          const range = doc.querySelector('input[type="range"]');
-          expect(rangeText.textContent).to.equal('before_range');
-          // Calling #click() on the range element will not generate a change event,
-          // so it must be generated manually.
-          range.value = 47;
-          range.dispatchEvent(new Event('change', {bubbles: true}));
-          poll('[text]', () => rangeText.textContent === '0 <= 47 <= 100');
-        });
-
-        it('input[type=checkbox] on:change', () => {
-          const checkboxText = doc.getElementById('checkbox');
-          const checkbox = doc.querySelector('input[type="checkbox"]');
-          expect(checkboxText.textContent).to.equal('before_check');
-          checkbox.click();
-          poll('[text]', () => checkboxText.textContent === 'checked: true');
-        });
-
-        it('[checked]', function* () {
-          const checkbox = doc.querySelector('input[type="checkbox"]');
-          const button = doc.querySelector('button');
-
-          checkbox.click();
-          // Note that attributes are initial values, properties are current values.
-          expect(checkbox.hasAttribute('checked')).to.be.false;
-          expect(checkbox.checked).to.be.true;
-
-          button.click();
-          yield poll('[checked]', () => !checkbox.checked);
-          expect(checkbox.hasAttribute('checked')).to.be.false;
-
-          button.click();
-          yield poll('[checked]', () => checkbox.checked);
-          // amp-bind sets both the attribute and property.
-          expect(checkbox.hasAttribute('checked')).to.be.true;
-        });
-
-        it('input[type=radio] on:change', () => {
-          const radioText = doc.getElementById('radio');
-          const radio = doc.querySelector('input[type="radio"]');
-          expect(radioText.textContent).to.equal('before_radio');
-          radio.click();
-          poll('[text]', () => radioText.textContent === 'checked: true');
-        });
-      }
-    );
-
-    describes.integration(
-      '+ amp-carousel',
-      {
-        body: `
+      extensions: ['amp-bind'],
+    },
+    (env) => {
+      let doc;
+
+      beforeEach(() => {
+        doc = env.win.document;
+      });
+
+      it('input[type=range] on:change', () => {
+        const rangeText = doc.getElementById('range');
+        const range = doc.querySelector('input[type="range"]');
+        expect(rangeText.textContent).to.equal('before_range');
+        // Calling #click() on the range element will not generate a change event,
+        // so it must be generated manually.
+        range.value = 47;
+        range.dispatchEvent(new Event('change', {bubbles: true}));
+        poll('[text]', () => rangeText.textContent === '0 <= 47 <= 100');
+      });
+
+      it('input[type=checkbox] on:change', () => {
+        const checkboxText = doc.getElementById('checkbox');
+        const checkbox = doc.querySelector('input[type="checkbox"]');
+        expect(checkboxText.textContent).to.equal('before_check');
+        checkbox.click();
+        poll('[text]', () => checkboxText.textContent === 'checked: true');
+      });
+
+      it('[checked]', function* () {
+        const checkbox = doc.querySelector('input[type="checkbox"]');
+        const button = doc.querySelector('button');
+
+        checkbox.click();
+        // Note that attributes are initial values, properties are current values.
+        expect(checkbox.hasAttribute('checked')).to.be.false;
+        expect(checkbox.checked).to.be.true;
+
+        button.click();
+        yield poll('[checked]', () => !checkbox.checked);
+        expect(checkbox.hasAttribute('checked')).to.be.false;
+
+        button.click();
+        yield poll('[checked]', () => checkbox.checked);
+        // amp-bind sets both the attribute and property.
+        expect(checkbox.hasAttribute('checked')).to.be.true;
+      });
+
+      it('input[type=radio] on:change', () => {
+        const radioText = doc.getElementById('radio');
+        const radio = doc.querySelector('input[type="radio"]');
+        expect(radioText.textContent).to.equal('before_radio');
+        radio.click();
+        poll('[text]', () => radioText.textContent === 'checked: true');
+      });
+    }
+  );
+
+  describes.integration(
+    '+ amp-carousel',
+    {
+      body: `
       <button on="tap:AMP.setState({slide: 1})" id="goToSlideOne"></button>
       <p [text]="slide">0</p>
       <amp-carousel type="slides" width=10 height=10
@@ -192,56 +187,56 @@ describes.sandboxed
         <amp-img src="http://example.com/bar.jpg" width=10 height=10></amp-img>
       </amp-carousel>
     `,
-        extensions: ['amp-bind', 'amp-carousel'],
-      },
-      (env) => {
-        let doc, carousel, slideText;
-
-        beforeEach(() => {
-          doc = env.win.document;
-          carousel = doc.querySelector('amp-carousel');
-          slideText = doc.querySelector('p');
-
-          const browserController = new BrowserController(env.win);
-          return browserController.waitForElementLayout('amp-carousel');
-        });
-
-        it('on:slideChange', () => {
-          expect(slideText.textContent).to.equal('0');
-
-          const nextSlide = carousel.querySelector(
-            'div.amp-carousel-button-next'
-          );
-          nextSlide.click();
-          return poll('[slide]', () => slideText.textContent === '1');
-        });
-
-        it('[slide]', function* () {
-          const slides = carousel.querySelectorAll(
-            '.i-amphtml-slide-item > amp-img'
-          );
-          const first = slides[0];
-          const second = slides[1];
-
-          expect(first.getAttribute('aria-hidden')).to.equal('false');
-          expect(second.getAttribute('aria-hidden')).to.be.equal('true');
-
-          const button = doc.getElementById('goToSlideOne');
-          button.click();
-
-          yield poll(
-            '[slide]',
-            () => first.getAttribute('aria-hidden') === 'true'
-          );
-          yield poll(
-            '[slide]',
-            () => second.getAttribute('aria-hidden') === 'false'
-          );
-        });
-      }
-    );
-
-    const list = `
+      extensions: ['amp-bind', 'amp-carousel'],
+    },
+    (env) => {
+      let doc, carousel, slideText;
+
+      beforeEach(() => {
+        doc = env.win.document;
+        carousel = doc.querySelector('amp-carousel');
+        slideText = doc.querySelector('p');
+
+        const browserController = new BrowserController(env.win);
+        return browserController.waitForElementLayout('amp-carousel');
+      });
+
+      it('on:slideChange', () => {
+        expect(slideText.textContent).to.equal('0');
+
+        const nextSlide = carousel.querySelector(
+          'div.amp-carousel-button-next'
+        );
+        nextSlide.click();
+        return poll('[slide]', () => slideText.textContent === '1');
+      });
+
+      it('[slide]', function* () {
+        const slides = carousel.querySelectorAll(
+          '.i-amphtml-slide-item > amp-img'
+        );
+        const first = slides[0];
+        const second = slides[1];
+
+        expect(first.getAttribute('aria-hidden')).to.equal('false');
+        expect(second.getAttribute('aria-hidden')).to.be.equal('true');
+
+        const button = doc.getElementById('goToSlideOne');
+        button.click();
+
+        yield poll(
+          '[slide]',
+          () => first.getAttribute('aria-hidden') === 'true'
+        );
+        yield poll(
+          '[slide]',
+          () => second.getAttribute('aria-hidden') === 'false'
+        );
+      });
+    }
+  );
+
+  const list = `
     <amp-state id="foo">
       <script type="application/json">
         {"bar": "123"}
@@ -255,60 +250,58 @@ describes.sandboxed
     </template>
   `;
 
-    const listTests = (env) => {
-      let doc;
-      let list;
-      let browser;
-
-      beforeEach(() => {
-        doc = env.win.document;
-        list = doc.querySelector('amp-list');
-        browser = new BrowserController(env.win);
-      });
-
-      it('[src]', () => {
-        expect(list.getAttribute('src')).to.equal(
-          '/list/fruit-data/get?cors=0'
-        );
-        browser.click('button');
-        poll(
-          '[src]',
-          () => list.getAttribute('src') === 'https://example.com/data'
-        );
-      });
-
-      it('evaluate bindings in children', function* () {
-        yield browser.waitForElementLayout('amp-list');
-        const children = list.querySelectorAll('p');
-        expect(children.length).to.equal(3);
-        children.forEach((span) => {
-          expect(span.textContent).to.equal('123');
-        });
+  const listTests = (env) => {
+    let doc;
+    let list;
+    let browser;
+
+    beforeEach(() => {
+      doc = env.win.document;
+      list = doc.querySelector('amp-list');
+      browser = new BrowserController(env.win);
+    });
+
+    it('[src]', () => {
+      expect(list.getAttribute('src')).to.equal('/list/fruit-data/get?cors=0');
+      browser.click('button');
+      poll(
+        '[src]',
+        () => list.getAttribute('src') === 'https://example.com/data'
+      );
+    });
+
+    it('evaluate bindings in children', function* () {
+      yield browser.waitForElementLayout('amp-list');
+      const children = list.querySelectorAll('p');
+      expect(children.length).to.equal(3);
+      children.forEach((span) => {
+        expect(span.textContent).to.equal('123');
       });
-    };
-
-    describes.integration(
-      '+ amp-list, amp-mustache:0.1',
-      {
-        body: list,
-        extensions: ['amp-bind', 'amp-list', 'amp-mustache:0.1'],
-      },
-      listTests
-    );
-
-    describes.integration(
-      '+ amp-list, amp-mustache:0.2',
-      {
-        body: list,
-        extensions: ['amp-bind', 'amp-list', 'amp-mustache:0.2'],
-      },
-      listTests
-    );
-
-    describes.integration(
-      '+ amp-selector',
-      {
-        body: `
+    });
+  };
+
+  describes.integration(
+    '+ amp-list, amp-mustache:0.1',
+    {
+      body: list,
+      extensions: ['amp-bind', 'amp-list', 'amp-mustache:0.1'],
+    },
+    listTests
+  );
+
+  describes.integration(
+    '+ amp-list, amp-mustache:0.2',
+    {
+      body: list,
+      extensions: ['amp-bind', 'amp-list', 'amp-mustache:0.2'],
+    },
+    listTests
+  );
+
+  describes.integration(
+    '+ amp-selector',
+    {
+      body: `
       <button on="tap:AMP.setState({selected: 2})"></button>
       <p [text]="selected"></p>
       <amp-selector layout="container" [selected]="selected" on="select:AMP.setState({selected: event.targetOption})">
@@ -317,44 +310,44 @@ describes.sandboxed
         <amp-img src="/2.jpg" width=10 height=10 option=2></amp-img>
       </amp-selector>
     `,
-        extensions: ['amp-bind', 'amp-selector'],
-      },
-      (env) => {
-        let doc, images, selectedText;
-
-        beforeEach(() => {
-          doc = env.win.document;
-          images = doc.getElementsByTagName('amp-img');
-          selectedText = doc.querySelector('p');
-
-          const browserController = new BrowserController(env.win);
-          return browserController.waitForElementLayout('amp-selector');
-        });
-
-        it('on:select', function* () {
-          expect(images[0].hasAttribute('selected')).to.be.false;
-          expect(images[1].hasAttribute('selected')).to.be.false;
-          expect(images[2].hasAttribute('selected')).to.be.false;
-          expect(selectedText.textContent).to.equal('');
-          images[1].click();
-          yield poll('[text]', () => selectedText.textContent === '1');
-          expect(images[0].hasAttribute('selected')).to.be.false;
-          expect(images[1].hasAttribute('selected')).to.be.true;
-          expect(images[2].hasAttribute('selected')).to.be.false;
-        });
-
-        it('[selected]', function* () {
-          const button = doc.querySelector('button');
-          expect(images[0].hasAttribute('selected')).to.be.false;
-          expect(images[1].hasAttribute('selected')).to.be.false;
-          expect(images[2].hasAttribute('selected')).to.be.false;
-          expect(selectedText.textContent).to.equal('');
-          button.click();
-          yield poll('[text]', () => selectedText.textContent === '2');
-          expect(images[0].hasAttribute('selected')).to.be.false;
-          expect(images[1].hasAttribute('selected')).to.be.false;
-          expect(images[2].hasAttribute('selected')).to.be.true;
-        });
-      }
-    );
-  });
+      extensions: ['amp-bind', 'amp-selector'],
+    },
+    (env) => {
+      let doc, images, selectedText;
+
+      beforeEach(() => {
+        doc = env.win.document;
+        images = doc.getElementsByTagName('amp-img');
+        selectedText = doc.querySelector('p');
+
+        const browserController = new BrowserController(env.win);
+        return browserController.waitForElementLayout('amp-selector');
+      });
+
+      it('on:select', function* () {
+        expect(images[0].hasAttribute('selected')).to.be.false;
+        expect(images[1].hasAttribute('selected')).to.be.false;
+        expect(images[2].hasAttribute('selected')).to.be.false;
+        expect(selectedText.textContent).to.equal('');
+        images[1].click();
+        yield poll('[text]', () => selectedText.textContent === '1');
+        expect(images[0].hasAttribute('selected')).to.be.false;
+        expect(images[1].hasAttribute('selected')).to.be.true;
+        expect(images[2].hasAttribute('selected')).to.be.false;
+      });
+
+      it('[selected]', function* () {
+        const button = doc.querySelector('button');
+        expect(images[0].hasAttribute('selected')).to.be.false;
+        expect(images[1].hasAttribute('selected')).to.be.false;
+        expect(images[2].hasAttribute('selected')).to.be.false;
+        expect(selectedText.textContent).to.equal('');
+        button.click();
+        yield poll('[text]', () => selectedText.textContent === '2');
+        expect(images[0].hasAttribute('selected')).to.be.false;
+        expect(images[1].hasAttribute('selected')).to.be.false;
+        expect(images[2].hasAttribute('selected')).to.be.true;
+      });
+    }
+  );
+});
diff --git a/test/integration/test-amp-carousel.js b/test/integration/test-amp-carousel.js
index 6ca17f598c0d..c2aa0788b049 100644
--- a/test/integration/test-amp-carousel.js
+++ b/test/integration/test-amp-carousel.js
@@ -1,4 +1,4 @@
-import {CommonSignals} from '#core/constants/common-signals';
+import {CommonSignals_Enum} from '#core/constants/common-signals';
 import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 
 const t = describes.sandboxed.configure().ifChrome();
@@ -18,7 +18,7 @@ t.run('amp-carousel', {}, function () {
   function waitForCarouselLayout() {
     const carousel = document.querySelector('amp-carousel');
     return whenUpgradedToCustomElement(carousel).then(() =>
-      carousel.signals().whenSignal(CommonSignals.LOAD_START)
+      carousel.signals().whenSignal(CommonSignals_Enum.LOAD_START)
     );
   }
 
@@ -358,11 +358,11 @@ t.run('amp-carousel', {}, function () {
           'able to get past the first and last item',
         () => {
           document.body.classList.add('amp-mode-mouse');
-          const amp = document.querySelector('#carousel-1');
-          const prevBtn = amp.querySelector('.amp-carousel-button-prev');
-          const nextBtn = amp.querySelector('.amp-carousel-button-next');
-          expect(amp.hasAttribute('loop')).to.be.true;
-          expect(amp.hasAttribute('controls')).to.be.true;
+          const carousel = document.querySelector('#carousel-1');
+          const prevBtn = carousel.querySelector('.amp-carousel-button-prev');
+          const nextBtn = carousel.querySelector('.amp-carousel-button-next');
+          expect(carousel.hasAttribute('loop')).to.be.true;
+          expect(carousel.hasAttribute('controls')).to.be.true;
           expect(prevBtn).to.not.be.null;
           expect(nextBtn).to.not.be.null;
           expect(prevBtn).to.be.visible;
diff --git a/test/integration/test-amp-recaptcha-input.js b/test/integration/test-amp-recaptcha-input.js
index 103a5b622233..94cc69a788c7 100644
--- a/test/integration/test-amp-recaptcha-input.js
+++ b/test/integration/test-amp-recaptcha-input.js
@@ -3,17 +3,11 @@ import {Deferred} from '#core/data-structures/promise';
 import {BrowserController, RequestBank} from '#testing/helpers/service';
 import {poll} from '#testing/iframe';
 
-// TODO(wg-components): These tests are broken on Firefox (as of v77). They
-// also fail on Safari.
-describes.sandboxed
-  .configure()
-  .skipFirefox()
-  .skipSafari()
-  .run('amp-recaptcha-input', {}, function () {
-    describes.integration(
-      'with form and amp-mustache',
-      {
-        body: `
+describes.sandboxed('amp-recaptcha-input', {}, function () {
+  describes.integration(
+    'with form and amp-mustache',
+    {
+      body: `
     <form
       method="POST"
       action-xhr="/recaptcha/submit"
@@ -57,7 +51,7 @@ describes.sandboxed
 
     </form>
     `,
-        css: `
+      css: `
       form.amp-form-submit-success [submit-success] {
         color: green;
       }
@@ -97,77 +91,77 @@ describes.sandboxed
         display: block;
       }
     `,
-        extensions: ['amp-recaptcha-input', 'amp-form', 'amp-mustache:0.2'],
-        experiments: ['amp-recaptcha-input'],
-      },
-      (env) => {
-        let doc;
-
-        beforeEach(() => {
-          doc = env.win.document;
-
-          const browserController = new BrowserController(env.win);
-          return browserController.waitForElementLayout('amp-recaptcha-input');
+      extensions: ['amp-recaptcha-input', 'amp-form', 'amp-mustache:0.2'],
+      experiments: ['amp-recaptcha-input'],
+    },
+    (env) => {
+      let doc;
+
+      beforeEach(() => {
+        doc = env.win.document;
+
+        const browserController = new BrowserController(env.win);
+        return browserController.waitForElementLayout('amp-recaptcha-input');
+      });
+
+      it('should be able to create the bootstrap frame', function () {
+        return waitForBootstrapFrameToBeCreated(doc).then((frame) => {
+          expect(frame.src.includes('recaptcha')).to.be.true;
+          expect(frame.getAttribute('data-amp-3p-sentinel')).to.be.equal(
+            'amp-recaptcha'
+          );
+          expect(frame.getAttribute('name')).to.be.equal(
+            JSON.stringify({
+              'sitekey': '6LebBGoUAAAAAHbj1oeZMBU_rze_CutlbyzpH8VE',
+              'sentinel': 'amp-recaptcha',
+              'global': false,
+            })
+          );
         });
+      });
 
-        it('should be able to create the bootstrap frame', function () {
-          return waitForBootstrapFrameToBeCreated(doc).then((frame) => {
-            expect(frame.src.includes('recaptcha')).to.be.true;
-            expect(frame.getAttribute('data-amp-3p-sentinel')).to.be.equal(
-              'amp-recaptcha'
-            );
-            expect(frame.getAttribute('name')).to.be.equal(
-              JSON.stringify({
-                'sitekey': '6LebBGoUAAAAAHbj1oeZMBU_rze_CutlbyzpH8VE',
-                'sentinel': 'amp-recaptcha',
-                'global': false,
-              })
-            );
-          });
+      it('should load the 3p recaptcha frame', function () {
+        return waitForBootstrapFrameOnLoad(doc).then((frame) => {
+          expect(frame).to.be.ok;
         });
-
-        it('should load the 3p recaptcha frame', function () {
-          return waitForBootstrapFrameOnLoad(doc).then((frame) => {
-            expect(frame).to.be.ok;
+      });
+
+      it(
+        'should create a hidden input, ' +
+          'with the value resolved from the recaptcha mock, ' +
+          ' on submit',
+        function () {
+          return submitForm(doc).then((hiddenInput) => {
+            expect(hiddenInput).to.be.ok;
+            expect(hiddenInput.name).to.be.equal('recaptcha-token');
+            expect(hiddenInput.value).to.be.equal('recaptcha-mock');
           });
-        });
+        }
+      );
 
-        it(
-          'should create a hidden input, ' +
-            'with the value resolved from the recaptcha mock, ' +
-            ' on submit',
-          function () {
-            return submitForm(doc).then((hiddenInput) => {
-              expect(hiddenInput).to.be.ok;
-              expect(hiddenInput.name).to.be.equal('recaptcha-token');
-              expect(hiddenInput.value).to.be.equal('recaptcha-mock');
-            });
-          }
-        );
-
-        it('should show submit-success on successful submit/response', function () {
-          return submitForm(doc).then(() => {
-            return poll(
-              'submit-success',
-              () => {
-                return doc.querySelector('div[id="submit-success"]');
-              },
-              undefined,
-              5000
-            );
-          });
+      it('should show submit-success on successful submit/response', function () {
+        return submitForm(doc).then(() => {
+          return poll(
+            'submit-success',
+            () => {
+              return doc.querySelector('div[id="submit-success"]');
+            },
+            undefined,
+            5000
+          );
         });
-      }
-    );
-
-    const recaptchaRequestId = {
-      GET: 'request bank GET',
-      POST: 'request bank POST',
-    };
-    describes.integration(
-      recaptchaRequestId.GET,
-      {
-        body: `
+      });
+    }
+  );
+
+  const recaptchaRequestId = {
+    GET: 'request bank GET',
+    POST: 'request bank POST',
+  };
+  describes.integration(
+    recaptchaRequestId.GET,
+    {
+      body: `
     <form
       method="GET"
       action-xhr="${RequestBank.getUrl(recaptchaRequestId.GET)}"
@@ -188,39 +182,39 @@ describes.sandboxed
       </fieldset>
     </form>
   `,
-        extensions: ['amp-recaptcha-input', 'amp-form'],
-        experiments: ['amp-recaptcha-input'],
-      },
-      (env) => {
-        let doc;
-
-        beforeEach(() => {
-          doc = env.win.document;
-
-          const browserController = new BrowserController(env.win);
-          return browserController.waitForElementLayout('amp-recaptcha-input');
-        });
-
-        afterEach(() => {
-          return RequestBank.tearDown();
-        });
-
-        it('should make a request with correct parameters', function () {
-          return submitForm(doc).then(() => {
-            return RequestBank.withdraw(recaptchaRequestId.GET).then((req) => {
-              expect(req.url).to.include('term=recaptcha-search');
-              expect(req.url).to.include('recaptcha-token=recaptcha-mock');
-              expect(req.headers.host).to.be.ok;
-            });
+      extensions: ['amp-recaptcha-input', 'amp-form'],
+      experiments: ['amp-recaptcha-input'],
+    },
+    (env) => {
+      let doc;
+
+      beforeEach(() => {
+        doc = env.win.document;
+
+        const browserController = new BrowserController(env.win);
+        return browserController.waitForElementLayout('amp-recaptcha-input');
+      });
+
+      afterEach(() => {
+        return RequestBank.tearDown();
+      });
+
+      it('should make a request with correct parameters', function () {
+        return submitForm(doc).then(() => {
+          return RequestBank.withdraw(recaptchaRequestId.GET).then((req) => {
+            expect(req.url).to.include('term=recaptcha-search');
+            expect(req.url).to.include('recaptcha-token=recaptcha-mock');
+            expect(req.headers.host).to.be.ok;
           });
         });
-      }
-    );
+      });
+    }
+  );
 
-    describes.integration(
-      recaptchaRequestId.POST,
-      {
-        body: `
+  describes.integration(
+    recaptchaRequestId.POST,
+    {
+      body: `
     <form
       method="POST"
       action-xhr="${RequestBank.getUrl(recaptchaRequestId.POST)}"
@@ -241,36 +235,36 @@ describes.sandboxed
       </fieldset>
     </form>
   `,
-        extensions: ['amp-recaptcha-input', 'amp-form'],
-        experiments: ['amp-recaptcha-input'],
-      },
-      (env) => {
-        let doc;
-
-        beforeEach(() => {
-          doc = env.win.document;
-
-          const browserController = new BrowserController(env.win);
-          return browserController.waitForElementLayout('amp-recaptcha-input');
-        });
-
-        afterEach(() => {
-          return RequestBank.tearDown();
-        });
-
-        it('should make a request with correct parameters', function () {
-          return submitForm(doc).then(() => {
-            return RequestBank.withdraw(recaptchaRequestId.POST).then((req) => {
-              expect(req.body).to.be.ok;
-              expect(req.body.term).to.be.equal('recaptcha-search');
-              expect(req.body['recaptcha-token']).to.be.equal('recaptcha-mock');
-              expect(req.headers.host).to.be.ok;
-            });
+      extensions: ['amp-recaptcha-input', 'amp-form'],
+      experiments: ['amp-recaptcha-input'],
+    },
+    (env) => {
+      let doc;
+
+      beforeEach(() => {
+        doc = env.win.document;
+
+        const browserController = new BrowserController(env.win);
+        return browserController.waitForElementLayout('amp-recaptcha-input');
+      });
+
+      afterEach(() => {
+        return RequestBank.tearDown();
+      });
+
+      it('should make a request with correct parameters', function () {
+        return submitForm(doc).then(() => {
+          return RequestBank.withdraw(recaptchaRequestId.POST).then((req) => {
+            expect(req.body).to.be.ok;
+            expect(req.body.term).to.be.equal('recaptcha-search');
+            expect(req.body['recaptcha-token']).to.be.equal('recaptcha-mock');
+            expect(req.headers.host).to.be.ok;
           });
         });
-      }
-    );
-  });
+      });
+    }
+  );
+});
 
 function waitForBootstrapFrameToBeCreated(doc) {
   return poll(
diff --git a/test/integration/test-amp-skimlinks.js b/test/integration/test-amp-skimlinks.js
index c2978bc03a07..c73fafe5fc0e 100644
--- a/test/integration/test-amp-skimlinks.js
+++ b/test/integration/test-amp-skimlinks.js
@@ -104,12 +104,7 @@ describes.sandboxed.skip('amp-skimlinks', {}, function () {
       });
     });
 
-    // TODO(alanorozco): Unskip on firefox
-    const itSkipFirefox = (desc, cb) =>
-      it.configure().skipFirefox().run(desc, cb);
-
-    // TODO(alanorozco): Unskip on firefox
-    itSkipFirefox('should send NA-tracking on non-merchant link click ', () => {
+    it('should send NA-tracking on non-merchant link click', () => {
       // Give 500ms for amp-skimlinks to set up.
       return browser.wait(500).then(() => {
         clickLinkAndNavigate('#non-merchant-link');
diff --git a/test/integration/test-amp-story-analytics.js b/test/integration/test-amp-story-analytics.js
index eca8d35d079e..805265aad5e7 100644
--- a/test/integration/test-amp-story-analytics.js
+++ b/test/integration/test-amp-story-analytics.js
@@ -2,9 +2,7 @@ import {parseQueryString} from '#core/types/string/url';
 
 import {BrowserController, RequestBank} from '#testing/helpers/service';
 
-const config = describes.sandboxed.configure().skipEdge().skipSafari();
-
-config.run('amp-story analytics', {}, () => {
+describes.sandboxed('amp-story analytics', {}, () => {
   const extensions = ['amp-story:1.0', 'amp-analytics', 'amp-social-share'];
   describes.integration(
     'amp-story analytics',
diff --git a/test/integration/test-boilerplates.js b/test/integration/test-boilerplates.js
index 7773a8a6cc3f..f64289dcf952 100644
--- a/test/integration/test-boilerplates.js
+++ b/test/integration/test-boilerplates.js
@@ -39,7 +39,7 @@ describes.sandboxed('New Visibility Boilerplate', {}, () => {
       expect(getStyle(fixture.win.document.body, 'visibility')).to.equal(
         'visible'
       );
-      expect(isAnimationNone(fixture.win.document.body)).to.be.true;
+      expect(isAnimationNone(fixture.win.document.body, true)).to.be.true;
     });
   });
 });
diff --git a/test/integration/test-configuration.js b/test/integration/test-configuration.js
index f99ba34e4145..6dcd626e8c9c 100644
--- a/test/integration/test-configuration.js
+++ b/test/integration/test-configuration.js
@@ -1,4 +1,4 @@
-import {AmpEvents} from '#core/constants/amp-events';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
 
 import {createFixtureIframe} from '#testing/iframe';
 
@@ -22,7 +22,7 @@ describes.sandboxed('Configuration', {}, function () {
     config.errorReportingUrl = 'http://error.foo.com';
     config.geoApiUrl = 'http://geo.bar.com';
 
-    return fixture.awaitEvent(AmpEvents.LOAD_START, 1).then(() => {
+    return fixture.awaitEvent(AmpEvents_Enum.LOAD_START, 1).then(() => {
       expect(fixture.win.AMP.config.urls.cdn).to.equal(config.cdnUrl);
       expect(fixture.win.AMP.config.urls.thirdParty).to.equal(
         config.thirdPartyUrl
diff --git a/test/integration/test-css.js b/test/integration/test-css.js
index b3f6b957d755..eb0c56f3702e 100644
--- a/test/integration/test-css.js
+++ b/test/integration/test-css.js
@@ -1,4 +1,4 @@
-import {AmpEvents} from '#core/constants/amp-events';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
 import {computedStyle} from '#core/dom/style';
 
 import {createFixtureIframe, expectBodyToBecomeVisible} from '#testing/iframe';
@@ -10,7 +10,7 @@ describes.sandboxed.configure().run('CSS', {}, () => {
       500
     );
     // Wait until layout.js CSS is applied.
-    await fixture.awaitEvent(AmpEvents.ATTACHED, 1);
+    await fixture.awaitEvent(AmpEvents_Enum.ATTACHED, 1);
     const {doc} = fixture;
 
     const iframe = doc.querySelector('amp-iframe');
diff --git a/test/integration/test-double-loading.js b/test/integration/test-double-loading.js
index 899205486d62..06b1d27ee825 100644
--- a/test/integration/test-double-loading.js
+++ b/test/integration/test-double-loading.js
@@ -1,4 +1,4 @@
-import {AmpEvents} from '#core/constants/amp-events';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
 
 import {createFixtureIframe} from '#testing/iframe';
 
@@ -25,7 +25,7 @@ describes.sandboxed
       expect(fixture.doc.querySelectorAll(testExtension)).to.have.length(1);
       // Wait for a the LOAD_START event which is enough of a signal that the
       // runtime has executed.
-      await fixture.awaitEvent(AmpEvents.LOAD_START, 1);
+      await fixture.awaitEvent(AmpEvents_Enum.LOAD_START, 1);
       expect(fixture.doc.documentElement.getAttribute('esm')).to.equal('1');
       checkElementUpgrade(fixture.doc.querySelector(testExtension));
     });
@@ -39,7 +39,7 @@ describes.sandboxed
       expect(fixture.doc.querySelectorAll(testExtension)).to.have.length(1);
       // Wait for a the LOAD_START event which is enough of a signal that the
       // runtime has executed.
-      await fixture.awaitEvent(AmpEvents.LOAD_START, 1);
+      await fixture.awaitEvent(AmpEvents_Enum.LOAD_START, 1);
       expect(fixture.doc.documentElement.getAttribute('esm')).to.equal('0');
       checkElementUpgrade(fixture.doc.querySelector(testExtension));
     });
diff --git a/test/integration/test-errors.js b/test/integration/test-errors.js
index 21ec0e3f7ef2..b11923a9838f 100644
--- a/test/integration/test-errors.js
+++ b/test/integration/test-errors.js
@@ -43,12 +43,9 @@ t.run('error page', function () {
     });
   });
 
-  it.configure()
-    .skipFirefox()
-    .skipEdge()
-    .run('should show the body in error test', () => {
-      return expectBodyToBecomeVisible(fixture.win, TIMEOUT);
-    });
+  it('should show the body in error test', () => {
+    return expectBodyToBecomeVisible(fixture.win, TIMEOUT);
+  });
 
   function shouldFail(id) {
     // Skip for issue #110
diff --git a/test/integration/test-extensions-loading.js b/test/integration/test-extensions-loading.js
index 984f2727e518..a055ae7e9c00 100644
--- a/test/integration/test-extensions-loading.js
+++ b/test/integration/test-extensions-loading.js
@@ -1,4 +1,4 @@
-import {AmpEvents} from '#core/constants/amp-events';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
 
 import {createFixtureIframe} from '#testing/iframe';
 
@@ -26,7 +26,7 @@ function testLoadOrderFixture(fixtureName, testElements) {
       for (let i = 0; i < testElements.length; i++) {
         expect(fixture.doc.querySelectorAll(testElements[i])).to.have.length(1);
       }
-      return fixture.awaitEvent(AmpEvents.LOAD_START, testElements.length);
+      return fixture.awaitEvent(AmpEvents_Enum.LOAD_START, testElements.length);
     })
     .then(() => {
       for (let i = 0; i < testElements.length; i++) {
diff --git a/test/integration/test-released.js b/test/integration/test-released.js
index ece885a8b719..725f6fbe057c 100644
--- a/test/integration/test-released.js
+++ b/test/integration/test-released.js
@@ -17,33 +17,25 @@ function runTest() {
       fixture = await createFixtureIframe('test/fixtures/released.html', 3000);
     });
 
-    // There is really weird behavior when running this test in FF during
-    // cross-browser testing. It never renders the ad, even though it appears to
-    // work when looking at the rendering. The test passes when running locally
-    // in FF.
-    // TODO(lannka, #3561): unmute the test.
-    it.configure()
-      .skipFirefox()
-      .skipChrome()
-      .run('all components should get loaded', function () {
-        this.timeout(15000);
-        return pollForLayout(fixture.win, 12, 10000)
-          .then(() => {
-            expect(
-              fixture.doc.querySelectorAll('.i-amphtml-element')
-            ).to.have.length(16);
-            expect(
-              fixture.doc.querySelectorAll('.i-amphtml-layout')
-            ).to.have.length(12);
-            expect(
-              fixture.doc.querySelectorAll('.i-amphtml-error')
-            ).to.have.length(0);
-            checkGlobalScope(fixture.win);
-          })
-          .then(() => {
-            return expectBodyToBecomeVisible(fixture.win);
-          });
-      });
+    it('all components should get loaded', function () {
+      this.timeout(15000);
+      return pollForLayout(fixture.win, 12, 10000)
+        .then(() => {
+          expect(
+            fixture.doc.querySelectorAll('.i-amphtml-element')
+          ).to.have.length(16);
+          expect(
+            fixture.doc.querySelectorAll('.i-amphtml-layout')
+          ).to.have.length(12);
+          expect(
+            fixture.doc.querySelectorAll('.i-amphtml-error')
+          ).to.have.length(0);
+          checkGlobalScope(fixture.win);
+        })
+        .then(() => {
+          return expectBodyToBecomeVisible(fixture.win);
+        });
+    });
 
     it('sanity for Firefox while we skip above', function () {
       this.timeout(15000);
diff --git a/test/integration/test-shadow-amp.js b/test/integration/test-shadow-amp.js
index 5844ae701c12..9301b07ed549 100644
--- a/test/integration/test-shadow-amp.js
+++ b/test/integration/test-shadow-amp.js
@@ -39,21 +39,16 @@ describes.integration(
       shadowDoc = env.win.document.getElementById('host').shadowRoot;
     });
 
-    // TODO(kevinkimball, #26863): Flaky on Safari.
-    it.configure().skipSafari('should attach shadow AMP document', () => {
+    it('should attach shadow AMP document', () => {
       return expect(shadowDoc.body.innerText).to.include('Shadow AMP document');
     });
 
-    // TODO(kevinkimball, #26863): Flaky on Safari.
-    it.configure().skipSafari(
-      'should layout amp-img component in shadow AMP document',
-      async () => {
-        const shadowDocController = new BrowserController(env.win, shadowDoc);
-        await shadowDocController.waitForElementLayout('amp-img');
-        return expect(
-          shadowDoc.querySelectorAll('amp-img img[src]')
-        ).to.have.length(1);
-      }
-    );
+    it('should layout amp-img component in shadow AMP document', async () => {
+      const shadowDocController = new BrowserController(env.win, shadowDoc);
+      await shadowDocController.waitForElementLayout('amp-img');
+      return expect(
+        shadowDoc.querySelectorAll('amp-img img[src]')
+      ).to.have.length(1);
+    });
   }
 );
diff --git a/test/integration/test-user-error-reporting.js b/test/integration/test-user-error-reporting.js
index 4b5210e43c46..a67f861da75c 100644
--- a/test/integration/test-user-error-reporting.js
+++ b/test/integration/test-user-error-reporting.js
@@ -1,9 +1,6 @@
 import {BrowserController, RequestBank} from '#testing/helpers/service';
 
-// TODO(zhouyx, #11459): Unskip the test on Safari and Firefox.
-const t = describes.sandboxed.configure().skipSafari().skipFirefox().skipEdge();
-
-t.run('user-error', {}, function () {
+describes.sandboxed('user-error', {}, function () {
   describes.integration(
     'user-error integration test',
     {
diff --git a/test/integration/test-video-manager.js b/test/integration/test-video-manager.js
index ae92a768d5b7..12f43945f1b9 100644
--- a/test/integration/test-video-manager.js
+++ b/test/integration/test-video-manager.js
@@ -10,7 +10,7 @@ import {listenOncePromise} from '#utils/event-helper';
 
 import {runVideoPlayerIntegrationTests} from './test-video-players-helper';
 
-import {PlayingStates, VideoEvents} from '../../src/video-interface';
+import {PlayingStates_Enum, VideoEvents_Enum} from '../../src/video-interface';
 
 // TODO(dvoytenko): These tests time out when run with the prod AMP config.
 // See #11588.
@@ -94,7 +94,7 @@ describes.sandboxed
           entry.isVisible_ = false;
 
           const curState = videoManager.getPlayingState(impl);
-          expect(curState).to.equal(PlayingStates.PAUSED);
+          expect(curState).to.equal(PlayingStates_Enum.PAUSED);
         });
 
         it('autoplay - should be PLAYING_MANUAL if user interacted', () => {
@@ -108,9 +108,9 @@ describes.sandboxed
           entry.loaded_ = true;
 
           impl.play();
-          return listenOncePromise(video, VideoEvents.PLAYING).then(() => {
+          return listenOncePromise(video, VideoEvents_Enum.PLAYING).then(() => {
             const curState = videoManager.getPlayingState(impl);
-            expect(curState).to.equal(PlayingStates.PLAYING_MANUAL);
+            expect(curState).to.equal(PlayingStates_Enum.PLAYING_MANUAL);
           });
         });
 
@@ -126,9 +126,9 @@ describes.sandboxed
           entry.loaded_ = true;
           entry.videoVisibilityChanged_();
 
-          return listenOncePromise(video, VideoEvents.PLAYING).then(() => {
+          return listenOncePromise(video, VideoEvents_Enum.PLAYING).then(() => {
             const curState = videoManager.getPlayingState(impl);
-            expect(curState).to.equal(PlayingStates.PLAYING_AUTO);
+            expect(curState).to.equal(PlayingStates_Enum.PLAYING_AUTO);
           });
         });
 
@@ -158,12 +158,12 @@ describes.sandboxed
             entry.videoVisibilityChanged_();
 
             return new Promise(function (resolve, reject) {
-              listenOncePromise(video, VideoEvents.PLAYING).then(() => {
+              listenOncePromise(video, VideoEvents_Enum.PLAYING).then(() => {
                 reject();
               });
               setTimeout(function () {
                 const curState = videoManager.getPlayingState(impl);
-                expect(curState).to.equal(PlayingStates.PAUSED);
+                expect(curState).to.equal(PlayingStates_Enum.PAUSED);
                 resolve('Video did not autoplay as expected');
               }, 1000);
             });
@@ -182,9 +182,9 @@ describes.sandboxed
           entry.isVisible_ = false;
 
           impl.pause();
-          return listenOncePromise(video, VideoEvents.PAUSE).then(() => {
+          return listenOncePromise(video, VideoEvents_Enum.PAUSE).then(() => {
             const curState = videoManager.getPlayingState(impl);
-            expect(curState).to.equal(PlayingStates.PAUSED);
+            expect(curState).to.equal(PlayingStates_Enum.PAUSED);
           });
         });
 
@@ -201,8 +201,14 @@ describes.sandboxed
         it('autoplay - there should be user interaction if the ad was unmuted', async () => {
           video.setAttribute('autoplay', '');
 
-          const playingPromise = listenOncePromise(video, VideoEvents.PLAYING);
-          const unmutedPromise = listenOncePromise(video, VideoEvents.UNMUTED);
+          const playingPromise = listenOncePromise(
+            video,
+            VideoEvents_Enum.PLAYING
+          );
+          const unmutedPromise = listenOncePromise(
+            video,
+            VideoEvents_Enum.UNMUTED
+          );
 
           videoManager.register(impl);
           const entry = videoManager.getEntry_(impl);
@@ -212,7 +218,7 @@ describes.sandboxed
 
           expect(videoManager.userInteracted(impl)).to.be.false;
 
-          dispatchCustomEvent(video, VideoEvents.AD_START);
+          dispatchCustomEvent(video, VideoEvents_Enum.AD_START);
 
           await playingPromise;
 
@@ -226,14 +232,17 @@ describes.sandboxed
           video.setAttribute('autoplay', '');
           video.setAttribute('controls', '');
 
-          const playingPromise = listenOncePromise(video, VideoEvents.PLAYING);
+          const playingPromise = listenOncePromise(
+            video,
+            VideoEvents_Enum.PLAYING
+          );
 
           videoManager.register(impl);
           const entry = videoManager.getEntry_(impl);
           entry.isVisible_ = true;
           entry.loaded_ = true;
 
-          dispatchCustomEvent(video, VideoEvents.AD_START);
+          dispatchCustomEvent(video, VideoEvents_Enum.AD_START);
 
           entry.autoplayLoadedVideoVisibilityChanged_();
 
@@ -254,7 +263,10 @@ describes.sandboxed
           video.setAttribute('autoplay', '');
           video.setAttribute('controls', '');
 
-          const playingPromise = listenOncePromise(video, VideoEvents.PLAYING);
+          const playingPromise = listenOncePromise(
+            video,
+            VideoEvents_Enum.PLAYING
+          );
 
           videoManager.register(impl);
           const entry = videoManager.getEntry_(impl);
@@ -292,7 +304,7 @@ describes.sandboxed
           entry.isVisible_ = false;
           entry.videoVisibilityChanged_();
           const curState = videoManager.getPlayingState(impl);
-          expect(curState).to.equal(PlayingStates.PAUSED);
+          expect(curState).to.equal(PlayingStates_Enum.PAUSED);
         });
 
         it('no autoplay - should pause if user presses pause after playing', () => {
@@ -301,11 +313,11 @@ describes.sandboxed
           entry.isVisible_ = false;
 
           impl.play();
-          return listenOncePromise(video, VideoEvents.PLAYING).then(() => {
+          return listenOncePromise(video, VideoEvents_Enum.PLAYING).then(() => {
             impl.pause();
-            listenOncePromise(video, VideoEvents.PAUSE).then(() => {
+            listenOncePromise(video, VideoEvents_Enum.PAUSE).then(() => {
               const curState = videoManager.getPlayingState(impl);
-              expect(curState).to.equal(PlayingStates.PAUSED);
+              expect(curState).to.equal(PlayingStates_Enum.PAUSED);
             });
           });
         });
@@ -316,9 +328,9 @@ describes.sandboxed
           entry.isVisible_ = false;
 
           impl.play();
-          return listenOncePromise(video, VideoEvents.PLAYING).then(() => {
+          return listenOncePromise(video, VideoEvents_Enum.PLAYING).then(() => {
             const curState = videoManager.getPlayingState(impl);
-            expect(curState).to.equal(PlayingStates.PLAYING_MANUAL);
+            expect(curState).to.equal(PlayingStates_Enum.PLAYING_MANUAL);
           });
         });
       }
@@ -344,6 +356,9 @@ describes.sandboxed
           width: null,
           height: null,
           opacity: null,
+          setProperty(name, value) {
+            video.style[name] = value;
+          },
         },
         muted: null,
         playsinline: null,
@@ -481,7 +496,7 @@ function createFakeVideoPlayerClass(win) {
       this.element.appendChild(iframe);
 
       return Promise.resolve().then(() => {
-        dispatchCustomEvent(this.element, VideoEvents.LOAD);
+        dispatchCustomEvent(this.element, VideoEvents_Enum.LOAD);
       });
     }
 
@@ -506,10 +521,10 @@ function createFakeVideoPlayerClass(win) {
      */
     play(unusedIsAutoplay) {
       Promise.resolve().then(() => {
-        dispatchCustomEvent(this.element, VideoEvents.PLAYING);
+        dispatchCustomEvent(this.element, VideoEvents_Enum.PLAYING);
         this.timeoutId_ = this.timer_.delay(() => {
           this.currentTime_ = this.duration_;
-          dispatchCustomEvent(this.element, VideoEvents.PAUSE);
+          dispatchCustomEvent(this.element, VideoEvents_Enum.PAUSE);
         }, this.length_);
       });
     }
@@ -519,7 +534,7 @@ function createFakeVideoPlayerClass(win) {
      */
     pause() {
       Promise.resolve().then(() => {
-        dispatchCustomEvent(this.element, VideoEvents.PAUSE);
+        dispatchCustomEvent(this.element, VideoEvents_Enum.PAUSE);
         this.timer_.cancel(this.timeoutId_);
       });
     }
@@ -529,7 +544,7 @@ function createFakeVideoPlayerClass(win) {
      */
     mute() {
       Promise.resolve().then(() => {
-        dispatchCustomEvent(this.element, VideoEvents.MUTED);
+        dispatchCustomEvent(this.element, VideoEvents_Enum.MUTED);
       });
     }
 
@@ -538,7 +553,7 @@ function createFakeVideoPlayerClass(win) {
      */
     unmute() {
       Promise.resolve().then(() => {
-        dispatchCustomEvent(this.element, VideoEvents.UNMUTED);
+        dispatchCustomEvent(this.element, VideoEvents_Enum.UNMUTED);
       });
     }
 
diff --git a/test/integration/test-video-players-helper.js b/test/integration/test-video-players-helper.js
index cb43f3a0bc4e..ef1d8f24e5d8 100644
--- a/test/integration/test-video-players-helper.js
+++ b/test/integration/test-video-players-helper.js
@@ -15,7 +15,7 @@ import {
 
 import {
   VideoAnalyticsEvents_Enum,
-  VideoEvents,
+  VideoEvents_Enum,
   VideoInterface,
 } from '../../src/video-interface';
 
@@ -93,24 +93,36 @@ export function runVideoPlayerIntegrationTests(
             const muteButton = createButton(r, 'mute');
             const unmuteButton = createButton(r, 'unmute');
 
-            return listenOncePromise(r.video, VideoEvents.LOAD)
+            return listenOncePromise(r.video, VideoEvents_Enum.LOAD)
               .then(() => {
-                const promise = listenOncePromise(r.video, VideoEvents.PLAYING);
+                const promise = listenOncePromise(
+                  r.video,
+                  VideoEvents_Enum.PLAYING
+                );
                 playButton.click();
                 return promise;
               })
               .then(() => {
-                const promise = listenOncePromise(r.video, VideoEvents.MUTED);
+                const promise = listenOncePromise(
+                  r.video,
+                  VideoEvents_Enum.MUTED
+                );
                 muteButton.click();
                 return promise;
               })
               .then(() => {
-                const promise = listenOncePromise(r.video, VideoEvents.PAUSE);
+                const promise = listenOncePromise(
+                  r.video,
+                  VideoEvents_Enum.PAUSE
+                );
                 pauseButton.click();
                 return promise;
               })
               .then(() => {
-                const promise = listenOncePromise(r.video, VideoEvents.UNMUTED);
+                const promise = listenOncePromise(
+                  r.video,
+                  VideoEvents_Enum.UNMUTED
+                );
                 unmuteButton.click();
                 return promise;
               });
@@ -153,7 +165,7 @@ export function runVideoPlayerIntegrationTests(
             playButton = createButton(r, 'play');
             const impl = await video.getImpl(false);
             const viewport = impl.getViewport();
-            const promise = listenOncePromise(video, VideoEvents.LOAD);
+            const promise = listenOncePromise(video, VideoEvents_Enum.LOAD);
             viewport.scrollIntoView(video);
             return promise;
           })
@@ -177,7 +189,7 @@ export function runVideoPlayerIntegrationTests(
           .then((r) => {
             video = r.video;
             pauseButton = createButton(r, 'pause');
-            return listenOncePromise(video, VideoEvents.PLAYING);
+            return listenOncePromise(video, VideoEvents_Enum.PLAYING);
           })
           .then(() => {
             const promise = listenOncePromise(
@@ -198,7 +210,7 @@ export function runVideoPlayerIntegrationTests(
         })
           .then((r) => {
             video = r.video;
-            const promise = listenOncePromise(video, VideoEvents.PLAYING);
+            const promise = listenOncePromise(video, VideoEvents_Enum.PLAYING);
             pauseButton = createButton(r, 'pause');
             return promise;
           })
@@ -225,7 +237,7 @@ export function runVideoPlayerIntegrationTests(
             viewport = impl.getViewport();
             // scroll to the bottom, make video fully visible
             viewport.scrollIntoView(video);
-            return listenOncePromise(video, VideoEvents.PLAYING);
+            return listenOncePromise(video, VideoEvents_Enum.PLAYING);
           })
           .then(() => {
             // scroll to the bottom, make video fully visible
@@ -276,10 +288,10 @@ export function runVideoPlayerIntegrationTests(
             video = r.video;
             playButton = createButton(r, 'play');
             pauseButton = createButton(r, 'pause');
-            return listenOncePromise(video, VideoEvents.LOAD);
+            return listenOncePromise(video, VideoEvents_Enum.LOAD);
           })
           .then(() => {
-            const promise = listenOncePromise(video, VideoEvents.PLAYING);
+            const promise = listenOncePromise(video, VideoEvents_Enum.PLAYING);
             playButton.click();
             return promise;
           })
@@ -336,7 +348,7 @@ export function runVideoPlayerIntegrationTests(
           })
           .then(() => {
             pauseButton.click();
-            return listenOncePromise(video, VideoEvents.PAUSE);
+            return listenOncePromise(video, VideoEvents_Enum.PAUSE);
           })
           .then(() => {
             return Promise.race([
@@ -349,7 +361,7 @@ export function runVideoPlayerIntegrationTests(
           })
           .then(() => {
             playButton.click();
-            return listenOncePromise(video, VideoEvents.PLAYING);
+            return listenOncePromise(video, VideoEvents_Enum.PLAYING);
           })
           .then(() => {
             return listenOncePromise(
@@ -370,7 +382,7 @@ export function runVideoPlayerIntegrationTests(
       it('should play when in view port initially', () => {
         return getVideoPlayer({outsideView: false, autoplay: true}).then(
           (r) => {
-            return listenOncePromise(r.video, VideoEvents.PLAYING);
+            return listenOncePromise(r.video, VideoEvents_Enum.PLAYING);
           }
         );
       });
@@ -378,9 +390,11 @@ export function runVideoPlayerIntegrationTests(
       it('should not play when initially outside viewport', () => {
         return getVideoPlayer({outsideView: true, autoplay: true}).then((r) => {
           const timer = Services.timerFor(r.video.ownerDocument.defaultView);
-          const p = listenOncePromise(r.video, VideoEvents.PLAYING).then(() => {
-            return Promise.reject('should not have autoplayed');
-          });
+          const p = listenOncePromise(r.video, VideoEvents_Enum.PLAYING).then(
+            () => {
+              return Promise.reject('should not have autoplayed');
+            }
+          );
           // we have to wait to ensure play is NOT called.
           return Promise.race([timer.promise(1000), p]);
         });
@@ -398,13 +412,13 @@ export function runVideoPlayerIntegrationTests(
             viewport = impl.getViewport();
 
             // scroll to the bottom, make video fully visible
-            const p = listenOncePromise(video, VideoEvents.PLAYING);
+            const p = listenOncePromise(video, VideoEvents_Enum.PLAYING);
             viewport.scrollIntoView(video);
             return p;
           })
           .then(() => {
             // scroll back to top, make video not visible
-            const p = listenOncePromise(video, VideoEvents.PAUSE);
+            const p = listenOncePromise(video, VideoEvents_Enum.PAUSE);
             viewport.setScrollTop(0);
             return p;
           });
@@ -510,14 +524,17 @@ export function runVideoPlayerIntegrationTests(
             video = r.video;
             playButton = createButton(r, 'play');
             mockLandscape(false);
-            const whenLoaded = listenOncePromise(video, VideoEvents.LOAD);
+            const whenLoaded = listenOncePromise(video, VideoEvents_Enum.LOAD);
             const impl = await video.getImpl(false);
             const viewport = impl.getViewport();
             viewport.scrollIntoView(video);
             return whenLoaded;
           })
           .then(() => {
-            const whenPlaying = listenOncePromise(video, VideoEvents.PLAYING);
+            const whenPlaying = listenOncePromise(
+              video,
+              VideoEvents_Enum.PLAYING
+            );
             playButton.click();
             return whenPlaying;
           })
@@ -561,7 +578,7 @@ export function runVideoPlayerIntegrationTests(
 
         const whenVideoRegistered = video
           .signals()
-          .whenSignal(VideoEvents.REGISTERED)
+          .whenSignal(VideoEvents_Enum.REGISTERED)
           .then(() => ({video, fixture}));
 
         ['autoplay', 'dock', 'rotate-to-fullscreen'].forEach((option) => {
@@ -573,8 +590,8 @@ export function runVideoPlayerIntegrationTests(
         video.setAttribute('id', 'myVideo');
         video.setAttribute('controls', '');
         video.setAttribute('layout', 'fixed');
-        video.setAttribute('width', '300px');
-        video.setAttribute('height', '50vh');
+        video.setAttribute('width', '300');
+        video.setAttribute('height', '300');
 
         video.style.position = 'absolute';
         video.style.top = top;
diff --git a/test/integration/test-video-players.js b/test/integration/test-video-players.js
index 3244474d8a0e..c93ba64b9a7e 100644
--- a/test/integration/test-video-players.js
+++ b/test/integration/test-video-players.js
@@ -12,20 +12,15 @@
 
 import {runVideoPlayerIntegrationTests} from './test-video-players-helper';
 
-// TODO(aghassemi,#7822): Videos may not be playable on an iOS simulator.
-describes.sandboxed
-  .configure()
-  .skipIos()
-  .run('amp-video', {}, (env) => {
-    runVideoPlayerIntegrationTests(env, (fixture) => {
-      const video = fixture.doc.createElement('amp-video');
-      video.setAttribute('src', '/examples/av/ForBiggerJoyrides-tiny.mp4');
-      return video;
-    });
+describes.sandboxed('amp-video', {}, (env) => {
+  runVideoPlayerIntegrationTests(env, (fixture) => {
+    const video = fixture.doc.createElement('amp-video');
+    video.setAttribute('src', '/examples/av/ForBiggerJoyrides-tiny.mp4');
+    return video;
   });
+});
 
-// TODO(alanorozco): unskip
-describes.sandboxed.skip('amp-video-iframe', {}, (env) => {
+describes.sandboxed('amp-video-iframe', {}, (env) => {
   runVideoPlayerIntegrationTests(
     env,
     (fixture) => {
@@ -39,7 +34,7 @@ describes.sandboxed.skip('amp-video-iframe', {}, (env) => {
   );
 });
 
-//TODO(aghassemi, #9379): unskip
+// TODO(#40181): Youtube tests not working on Circle.
 describes.sandboxed.skip('amp-youtube', {}, (env) => {
   runVideoPlayerIntegrationTests(
     env,
@@ -53,7 +48,7 @@ describes.sandboxed.skip('amp-youtube', {}, (env) => {
   );
 });
 
-//TODO(aghassemi, #9379): unskip
+// TODO(#40181): amp-dailymotion tests not working on Circle.
 describes.sandboxed.skip('amp-dailymotion', {}, (env) => {
   runVideoPlayerIntegrationTests(
     env,
@@ -67,7 +62,7 @@ describes.sandboxed.skip('amp-dailymotion', {}, (env) => {
   );
 });
 
-describes.sandboxed.configure().skip('amp-3q-player', {}, (env) => {
+describes.sandboxed('amp-3q-player', {}, (env) => {
   runVideoPlayerIntegrationTests(
     env,
     (fixture) => {
@@ -95,8 +90,7 @@ describes.sandboxed.skip('amp-nexxtv-player', {}, (env) => {
   );
 });
 
-//TODO(aghassemi, #9379): unskip
-describes.sandboxed.skip('amp-ima-video', {}, (env) => {
+describes.sandboxed('amp-ima-video', {}, (env) => {
   runVideoPlayerIntegrationTests(
     env,
     (fixture) => {
@@ -118,8 +112,7 @@ describes.sandboxed.skip('amp-ima-video', {}, (env) => {
   );
 });
 
-//TODO(cvializ, #14833): unskip after brid player is fixed
-describes.sandboxed.skip('amp-brid-player', {}, (env) => {
+describes.sandboxed('amp-brid-player', {}, (env) => {
   runVideoPlayerIntegrationTests(
     env,
     (fixture) => {
diff --git a/test/integration/test-visibility-states.js b/test/integration/test-visibility-states.js
index 8c49b598a6fe..c345f606c7f6 100644
--- a/test/integration/test-visibility-states.js
+++ b/test/integration/test-visibility-states.js
@@ -1,4 +1,4 @@
-import {VisibilityState} from '#core/constants/visibility-state';
+import {VisibilityState_Enum} from '#core/constants/visibility-state';
 import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 import {getVendorJsPropertyName} from '#core/dom/style';
 
@@ -32,6 +32,7 @@ t.run('Viewer Visibility State', {}, () => {
       let docHidden;
       let docVisibilityState;
       let prerenderAllowed;
+      let previewAllowed;
 
       function visChangeEventName() {
         const hiddenName = getVendorJsPropertyName(
@@ -56,6 +57,10 @@ t.run('Viewer Visibility State', {}, () => {
         );
       }
 
+      function changeViewerVisibilityState(state) {
+        viewer.receiveMessage('visibilitychange', {state});
+      }
+
       let shouldPass = false;
       let doPass_;
       let notifyPass = noop;
@@ -87,7 +92,7 @@ t.run('Viewer Visibility State', {}, () => {
         resumeCallback.reset();
       }
 
-      beforeEach(() => {
+      beforeEach(async () => {
         win = env.win;
         notifyPass = noop;
         shouldPass = false;
@@ -96,57 +101,52 @@ t.run('Viewer Visibility State', {}, () => {
         env.sandbox.stub(vsync, 'mutate').callsFake((mutator) => {
           mutator();
         });
+        viewer = await Services.viewerPromiseForDoc(win.document);
 
-        return Services.viewerPromiseForDoc(win.document)
-          .then((v) => {
-            viewer = v;
+        docHidden = env.sandbox.stub(win.document, 'hidden').value(false);
+        if ('visibilityState' in win.document) {
+          docVisibilityState = env.sandbox
+            .stub(win.document, 'visibilityState')
+            .value('visible');
+        }
 
-            docHidden = env.sandbox.stub(win.document, 'hidden').value(false);
-            if ('visibilityState' in win.document) {
-              docVisibilityState = env.sandbox
-                .stub(win.document, 'visibilityState')
-                .value('visible');
-            }
+        resources = Services.resourcesForDoc(win.document);
+        doPass_ = resources.doPass;
+        env.sandbox.stub(resources, 'doPass').callsFake(doPass);
+
+        const ampImg = win.document.createElement('amp-img');
+        ampImg.setAttribute('width', 100);
+        ampImg.setAttribute('height', 100);
+        ampImg.setAttribute('layout', 'fixed');
+        // TODO(#31915): Cleanup when R1_IMG_DEFERRED_BUILD is complete.
+        if (!R1_IMG_DEFERRED_BUILD) {
+          win.document.body.appendChild(ampImg);
+        }
 
-            resources = Services.resourcesForDoc(win.document);
-            doPass_ = resources.doPass;
-            env.sandbox.stub(resources, 'doPass').callsFake(doPass);
-
-            const img = win.document.createElement('amp-img');
-            img.setAttribute('width', 100);
-            img.setAttribute('height', 100);
-            img.setAttribute('layout', 'fixed');
-            // TODO(#31915): Cleanup when R1_IMG_DEFERRED_BUILD is complete.
-            if (!R1_IMG_DEFERRED_BUILD) {
-              win.document.body.appendChild(img);
-            }
+        const upgradedImg = await whenUpgradedToCustomElement(ampImg);
+        prerenderAllowed = env.sandbox.stub(upgradedImg, 'prerenderAllowed');
+        prerenderAllowed.returns(false);
+        previewAllowed = env.sandbox.stub(upgradedImg, 'previewAllowed');
+        previewAllowed.returns(false);
 
-            return whenUpgradedToCustomElement(img);
-          })
-          .then((img) => {
-            prerenderAllowed = env.sandbox.stub(img, 'prerenderAllowed');
-            prerenderAllowed.returns(false);
+        if (R1_IMG_DEFERRED_BUILD) {
+          win.document.body.appendChild(upgradedImg);
+        }
 
-            if (R1_IMG_DEFERRED_BUILD) {
-              win.document.body.appendChild(img);
-            }
-            return img.getImpl(false);
-          })
-          .then((impl) => {
-            layoutCallback = R1_IMG_DEFERRED_BUILD
-              ? env.sandbox.stub(impl, 'mountCallback')
-              : env.sandbox.stub(impl, 'layoutCallback');
-            unlayoutCallback = R1_IMG_DEFERRED_BUILD
-              ? env.sandbox.stub(impl, 'unmountCallback')
-              : env.sandbox.stub(impl, 'unlayoutCallback');
-            pauseCallback = env.sandbox.stub(impl, 'pauseCallback');
-            resumeCallback = env.sandbox.stub(impl, 'resumeCallback');
-            env.sandbox.stub(impl, 'isRelayoutNeeded').callsFake(() => true);
-            env.sandbox.stub(impl, 'isLayoutSupported').callsFake(() => true);
-
-            layoutCallback.returns(Promise.resolve());
-            unlayoutCallback.returns(true);
-          });
+        const impl = await upgradedImg.getImpl(false);
+        layoutCallback = R1_IMG_DEFERRED_BUILD
+          ? env.sandbox.stub(impl, 'mountCallback')
+          : env.sandbox.stub(impl, 'layoutCallback');
+        unlayoutCallback = R1_IMG_DEFERRED_BUILD
+          ? env.sandbox.stub(impl, 'unmountCallback')
+          : env.sandbox.stub(impl, 'unlayoutCallback');
+        pauseCallback = env.sandbox.stub(impl, 'pauseCallback');
+        resumeCallback = env.sandbox.stub(impl, 'resumeCallback');
+        env.sandbox.stub(impl, 'isRelayoutNeeded').callsFake(() => true);
+        env.sandbox.stub(impl, 'isLayoutSupported').callsFake(() => true);
+
+        layoutCallback.returns(Promise.resolve());
+        unlayoutCallback.returns(true);
       });
 
       describe('from in the PRERENDER state', () => {
@@ -157,13 +157,21 @@ t.run('Viewer Visibility State', {}, () => {
           });
 
           it('does layout when going to PRERENDER', async () => {
-            viewer.receiveMessage('visibilitychange', {
-              state: VisibilityState.PAUSED,
-            });
-            viewer.receiveMessage('visibilitychange', {
-              state: VisibilityState.PRERENDER,
-            });
+            changeViewerVisibilityState(VisibilityState_Enum.PAUSED);
+            changeViewerVisibilityState(VisibilityState_Enum.PRERENDER);
             await waitForNextPass();
+
+            expect(layoutCallback).to.have.been.called;
+            expect(unlayoutCallback).not.to.have.been.called;
+            expect(pauseCallback).not.to.have.been.called;
+            expect(resumeCallback).not.to.have.been.called;
+          });
+
+          it('calls layout when going to PREVIEW', async () => {
+            previewAllowed.returns(true);
+            changeViewerVisibilityState(VisibilityState_Enum.PREVIEW);
+            await waitForNextPass();
+
             expect(layoutCallback).to.have.been.called;
             expect(unlayoutCallback).not.to.have.been.called;
             expect(pauseCallback).not.to.have.been.called;
@@ -171,10 +179,9 @@ t.run('Viewer Visibility State', {}, () => {
           });
 
           it('calls layout when going to VISIBLE', async () => {
-            viewer.receiveMessage('visibilitychange', {
-              state: VisibilityState.VISIBLE,
-            });
+            changeViewerVisibilityState(VisibilityState_Enum.VISIBLE);
             await waitForNextPass();
+
             expect(layoutCallback).to.have.been.called;
             expect(unlayoutCallback).not.to.have.been.called;
             expect(pauseCallback).not.to.have.been.called;
@@ -182,38 +189,33 @@ t.run('Viewer Visibility State', {}, () => {
           });
 
           it('calls callbacks when going to HIDDEN', async () => {
-            viewer.receiveMessage('visibilitychange', {
-              state: VisibilityState.VISIBLE,
-            });
+            changeViewerVisibilityState(VisibilityState_Enum.VISIBLE);
             changeVisibility('hidden');
             await waitForNextPass();
+
             expect(unlayoutCallback).not.to.have.been.called;
             expect(pauseCallback).not.to.have.been.called;
             expect(resumeCallback).not.to.have.been.called;
           });
 
-          it('does not call callbacks when going to INACTIVE', () => {
-            viewer.receiveMessage('visibilitychange', {
-              state: VisibilityState.INACTIVE,
-            });
-            return waitForNextPass().then(() => {
-              expect(layoutCallback).not.to.have.been.called;
-              expect(unlayoutCallback).not.to.have.been.called;
-              expect(pauseCallback).not.to.have.been.called;
-              expect(resumeCallback).not.to.have.been.called;
-            });
+          it('does not call callbacks when going to INACTIVE', async () => {
+            changeViewerVisibilityState(VisibilityState_Enum.INACTIVE);
+            await waitForNextPass();
+
+            expect(layoutCallback).not.to.have.been.called;
+            expect(unlayoutCallback).not.to.have.been.called;
+            expect(pauseCallback).not.to.have.been.called;
+            expect(resumeCallback).not.to.have.been.called;
           });
 
-          it('does not call callbacks when going to PAUSED', () => {
-            viewer.receiveMessage('visibilitychange', {
-              state: VisibilityState.PAUSED,
-            });
-            return waitForNextPass().then(() => {
-              expect(layoutCallback).not.to.have.been.called;
-              expect(unlayoutCallback).not.to.have.been.called;
-              expect(pauseCallback).not.to.have.been.called;
-              expect(resumeCallback).not.to.have.been.called;
-            });
+          it('does not call callbacks when going to PAUSED', async () => {
+            changeViewerVisibilityState(VisibilityState_Enum.PAUSED);
+            await waitForNextPass();
+
+            expect(layoutCallback).not.to.have.been.called;
+            expect(unlayoutCallback).not.to.have.been.called;
+            expect(pauseCallback).not.to.have.been.called;
+            expect(resumeCallback).not.to.have.been.called;
           });
         });
 
@@ -222,292 +224,267 @@ t.run('Viewer Visibility State', {}, () => {
             setupSpys();
           });
 
-          it('does not call callbacks when going to PRERENDER', () => {
-            return waitForNextPass().then(() => {
-              expect(layoutCallback).not.to.have.been.called;
-              expect(unlayoutCallback).not.to.have.been.called;
-              expect(pauseCallback).not.to.have.been.called;
-              expect(resumeCallback).not.to.have.been.called;
-            });
-          });
+          it('does not call callbacks when going to PRERENDER', async () => {
+            await waitForNextPass();
 
-          it('calls layout when going to VISIBLE', () => {
-            viewer.receiveMessage('visibilitychange', {
-              state: VisibilityState.VISIBLE,
-            });
-            return waitForNextPass().then(() => {
-              expect(layoutCallback).to.have.been.called;
-              expect(unlayoutCallback).not.to.have.been.called;
-              expect(pauseCallback).not.to.have.been.called;
-              expect(resumeCallback).not.to.have.been.called;
-            });
+            expect(layoutCallback).not.to.have.been.called;
+            expect(unlayoutCallback).not.to.have.been.called;
+            expect(pauseCallback).not.to.have.been.called;
+            expect(resumeCallback).not.to.have.been.called;
           });
 
-          it('calls callbacks when going to HIDDEN', () => {
-            viewer.receiveMessage('visibilitychange', {
-              state: VisibilityState.VISIBLE,
-            });
-            changeVisibility('hidden');
-            return waitForNextPass().then(() => {
-              if (R1_IMG_DEFERRED_BUILD) {
-                expect(layoutCallback).to.have.been.called;
-              } else {
-                expect(layoutCallback).not.to.have.been.called;
-              }
-              expect(unlayoutCallback).not.to.have.been.called;
-              expect(pauseCallback).not.to.have.been.called;
-              expect(resumeCallback).not.to.have.been.called;
-            });
+          it('calls layout when going to PREVIEW', async () => {
+            previewAllowed.returns(true);
+            changeViewerVisibilityState(VisibilityState_Enum.PREVIEW);
+            await waitForNextPass();
+
+            expect(layoutCallback).to.have.been.called;
+            expect(unlayoutCallback).not.to.have.been.called;
+            expect(pauseCallback).not.to.have.been.called;
+            expect(resumeCallback).not.to.have.been.called;
           });
 
-          it('does not call callbacks when going to INACTIVE', () => {
-            viewer.receiveMessage('visibilitychange', {
-              state: VisibilityState.INACTIVE,
-            });
-            return waitForNextPass().then(() => {
-              expect(layoutCallback).not.to.have.been.called;
-              expect(unlayoutCallback).not.to.have.been.called;
-              expect(pauseCallback).not.to.have.been.called;
-              expect(resumeCallback).not.to.have.been.called;
-            });
+          it('calls layout when going to VISIBLE', async () => {
+            changeViewerVisibilityState(VisibilityState_Enum.VISIBLE);
+            await waitForNextPass();
+
+            expect(layoutCallback).to.have.been.called;
+            expect(unlayoutCallback).not.to.have.been.called;
+            expect(pauseCallback).not.to.have.been.called;
+            expect(resumeCallback).not.to.have.been.called;
           });
 
-          it('does not call callbacks when going to PAUSED', () => {
-            viewer.receiveMessage('visibilitychange', {
-              state: VisibilityState.PAUSED,
-            });
-            return waitForNextPass().then(() => {
+          it('calls callbacks when going to HIDDEN', async () => {
+            changeViewerVisibilityState(VisibilityState_Enum.VISIBLE);
+            changeVisibility('hidden');
+            await waitForNextPass();
+
+            if (R1_IMG_DEFERRED_BUILD) {
+              expect(layoutCallback).to.have.been.called;
+            } else {
               expect(layoutCallback).not.to.have.been.called;
-              expect(unlayoutCallback).not.to.have.been.called;
-              expect(pauseCallback).not.to.have.been.called;
-              expect(resumeCallback).not.to.have.been.called;
-            });
+            }
+            expect(unlayoutCallback).not.to.have.been.called;
+            expect(pauseCallback).not.to.have.been.called;
+            expect(resumeCallback).not.to.have.been.called;
           });
-        });
-      });
 
-      describe('from in the VISIBLE state', () => {
-        beforeEach(() => {
-          viewer.receiveMessage('visibilitychange', {
-            state: VisibilityState.VISIBLE,
-          });
-          return waitForNextPass().then(setupSpys);
-        });
+          it('does not call callbacks when going to INACTIVE', async () => {
+            changeViewerVisibilityState(VisibilityState_Enum.INACTIVE);
+            await waitForNextPass();
 
-        it('does not call callbacks when going to VISIBLE', () => {
-          return waitForNextPass().then(() => {
             expect(layoutCallback).not.to.have.been.called;
             expect(unlayoutCallback).not.to.have.been.called;
             expect(pauseCallback).not.to.have.been.called;
             expect(resumeCallback).not.to.have.been.called;
           });
-        });
 
-        it('does not call callbacks when going to HIDDEN', () => {
-          changeVisibility('hidden');
-          return waitForNextPass().then(() => {
+          it('does not call callbacks when going to PAUSED', async () => {
+            changeViewerVisibilityState(VisibilityState_Enum.PAUSED);
+            await waitForNextPass();
+
             expect(layoutCallback).not.to.have.been.called;
             expect(unlayoutCallback).not.to.have.been.called;
             expect(pauseCallback).not.to.have.been.called;
             expect(resumeCallback).not.to.have.been.called;
           });
         });
+      });
 
-        it('calls unload when going to INACTIVE', () => {
-          viewer.receiveMessage('visibilitychange', {
-            state: VisibilityState.INACTIVE,
-          });
-          return waitForNextPass().then(() => {
-            expect(unlayoutCallback).to.have.been.called;
-            expect(pauseCallback).to.have.been.called;
-            expect(resumeCallback).not.to.have.been.called;
-          });
+      describe('from in the VISIBLE state', () => {
+        beforeEach(async () => {
+          changeViewerVisibilityState(VisibilityState_Enum.VISIBLE);
+          await waitForNextPass();
+
+          setupSpys();
         });
 
-        it('calls pause when going to PAUSED', () => {
-          viewer.receiveMessage('visibilitychange', {
-            state: VisibilityState.PAUSED,
-          });
-          return waitForNextPass().then(() => {
-            expect(layoutCallback).not.to.have.been.called;
-            expect(unlayoutCallback).not.to.have.been.called;
-            expect(pauseCallback).to.have.been.called;
-            expect(resumeCallback).not.to.have.been.called;
-          });
+        it('does not call callbacks when going to VISIBLE', async () => {
+          await waitForNextPass();
+
+          expect(layoutCallback).not.to.have.been.called;
+          expect(unlayoutCallback).not.to.have.been.called;
+          expect(pauseCallback).not.to.have.been.called;
+          expect(resumeCallback).not.to.have.been.called;
+        });
+
+        it('does not call callbacks when going to HIDDEN', async () => {
+          changeVisibility('hidden');
+          await waitForNextPass();
+
+          expect(layoutCallback).not.to.have.been.called;
+          expect(unlayoutCallback).not.to.have.been.called;
+          expect(pauseCallback).not.to.have.been.called;
+          expect(resumeCallback).not.to.have.been.called;
+        });
+
+        it('calls unload when going to INACTIVE', async () => {
+          changeViewerVisibilityState(VisibilityState_Enum.INACTIVE);
+          await waitForNextPass();
+
+          expect(unlayoutCallback).to.have.been.called;
+          expect(pauseCallback).to.have.been.called;
+          expect(resumeCallback).not.to.have.been.called;
+        });
+
+        it('calls pause when going to PAUSED', async () => {
+          changeViewerVisibilityState(VisibilityState_Enum.PAUSED);
+          await waitForNextPass();
+
+          expect(layoutCallback).not.to.have.been.called;
+          expect(unlayoutCallback).not.to.have.been.called;
+          expect(pauseCallback).to.have.been.called;
+          expect(resumeCallback).not.to.have.been.called;
         });
       });
 
       describe('from in the HIDDEN state', () => {
-        beforeEach(() => {
-          viewer.receiveMessage('visibilitychange', {
-            state: VisibilityState.VISIBLE,
-          });
-          return waitForNextPass()
-            .then(() => {
-              changeVisibility('hidden');
-              return waitForNextPass();
-            })
-            .then(setupSpys);
+        beforeEach(async () => {
+          changeViewerVisibilityState(VisibilityState_Enum.VISIBLE);
+          await waitForNextPass();
+
+          changeVisibility('hidden');
+          await waitForNextPass();
+
+          setupSpys();
         });
 
-        it('does not call callbacks going to VISIBLE', () => {
+        it('does not call callbacks going to VISIBLE', async () => {
           changeVisibility('visible');
-          return waitForNextPass().then(() => {
-            expect(layoutCallback).not.to.have.been.called;
-            expect(unlayoutCallback).not.to.have.been.called;
-            expect(pauseCallback).not.to.have.been.called;
-            expect(resumeCallback).not.to.have.been.called;
-          });
+          await waitForNextPass();
+
+          expect(layoutCallback).not.to.have.been.called;
+          expect(unlayoutCallback).not.to.have.been.called;
+          expect(pauseCallback).not.to.have.been.called;
+          expect(resumeCallback).not.to.have.been.called;
         });
 
-        it('does not call callbacks when going to HIDDEN', () => {
-          return waitForNextPass().then(() => {
-            expect(layoutCallback).not.to.have.been.called;
-            expect(unlayoutCallback).not.to.have.been.called;
-            expect(pauseCallback).not.to.have.been.called;
-            expect(resumeCallback).not.to.have.been.called;
-          });
+        it('does not call callbacks when going to HIDDEN', async () => {
+          await waitForNextPass();
+
+          expect(layoutCallback).not.to.have.been.called;
+          expect(unlayoutCallback).not.to.have.been.called;
+          expect(pauseCallback).not.to.have.been.called;
+          expect(resumeCallback).not.to.have.been.called;
         });
 
-        it('calls unload when going to INACTIVE', () => {
-          viewer.receiveMessage('visibilitychange', {
-            state: VisibilityState.INACTIVE,
-          });
-          return waitForNextPass().then(() => {
-            expect(layoutCallback).not.to.have.been.called;
-            expect(unlayoutCallback).to.have.been.called;
-            expect(pauseCallback).to.have.been.called;
-            expect(resumeCallback).not.to.have.been.called;
-          });
+        it('calls unload when going to INACTIVE', async () => {
+          changeViewerVisibilityState(VisibilityState_Enum.INACTIVE);
+          await waitForNextPass();
+
+          expect(layoutCallback).not.to.have.been.called;
+          expect(unlayoutCallback).to.have.been.called;
+          expect(pauseCallback).to.have.been.called;
+          expect(resumeCallback).not.to.have.been.called;
         });
 
-        it('calls pause when going to PAUSED', () => {
+        it('calls pause when going to PAUSED', async () => {
           changeVisibility('visible');
-          viewer.receiveMessage('visibilitychange', {
-            state: VisibilityState.PAUSED,
-          });
-          return waitForNextPass().then(() => {
-            expect(layoutCallback).not.to.have.been.called;
-            expect(unlayoutCallback).not.to.have.been.called;
-            expect(pauseCallback).to.have.been.called;
-            expect(resumeCallback).not.to.have.been.called;
-          });
+          changeViewerVisibilityState(VisibilityState_Enum.PAUSED);
+          await waitForNextPass();
+
+          expect(layoutCallback).not.to.have.been.called;
+          expect(unlayoutCallback).not.to.have.been.called;
+          expect(pauseCallback).to.have.been.called;
+          expect(resumeCallback).not.to.have.been.called;
         });
       });
 
       describe('from in the INACTIVE state', () => {
-        beforeEach(() => {
-          viewer.receiveMessage('visibilitychange', {
-            state: VisibilityState.VISIBLE,
-          });
-          return waitForNextPass()
-            .then(() => {
-              viewer.receiveMessage('visibilitychange', {
-                state: VisibilityState.INACTIVE,
-              });
-              return waitForNextPass();
-            })
-            .then(setupSpys);
+        beforeEach(async () => {
+          changeViewerVisibilityState(VisibilityState_Enum.VISIBLE);
+          await waitForNextPass();
+
+          changeViewerVisibilityState(VisibilityState_Enum.INACTIVE);
+          await waitForNextPass();
+
+          setupSpys();
         });
 
-        it('calls layout and resume when going to VISIBLE', () => {
-          viewer.receiveMessage('visibilitychange', {
-            state: VisibilityState.VISIBLE,
-          });
-          return waitForNextPass().then(() => {
-            expect(layoutCallback).to.have.been.called;
-            expect(unlayoutCallback).not.to.have.been.called;
-            expect(pauseCallback).not.to.have.been.called;
-            expect(resumeCallback).to.have.been.called;
-          });
+        it('calls layout and resume when going to VISIBLE', async () => {
+          changeViewerVisibilityState(VisibilityState_Enum.VISIBLE);
+          await waitForNextPass();
+
+          expect(layoutCallback).to.have.been.called;
+          expect(unlayoutCallback).not.to.have.been.called;
+          expect(pauseCallback).not.to.have.been.called;
+          expect(resumeCallback).to.have.been.called;
         });
 
-        it('calls resume when going to HIDDEN', () => {
-          viewer.receiveMessage('visibilitychange', {
-            state: VisibilityState.VISIBLE,
-          });
+        it('calls resume when going to HIDDEN', async () => {
+          changeViewerVisibilityState(VisibilityState_Enum.VISIBLE);
           changeVisibility('hidden');
-          return waitForNextPass().then(() => {
-            if (R1_IMG_DEFERRED_BUILD) {
-              expect(layoutCallback).to.have.been.called;
-            } else {
-              expect(layoutCallback).not.to.have.been.called;
-            }
-            expect(unlayoutCallback).not.to.have.been.called;
-            expect(pauseCallback).not.to.have.been.called;
-            expect(resumeCallback).to.have.been.called;
-          });
-        });
+          await waitForNextPass();
 
-        it('does not call callbacks when going to PAUSED', () => {
-          viewer.receiveMessage('visibilitychange', {
-            state: VisibilityState.PAUSED,
-          });
-          return waitForNextPass().then(() => {
+          if (R1_IMG_DEFERRED_BUILD) {
+            expect(layoutCallback).to.have.been.called;
+          } else {
             expect(layoutCallback).not.to.have.been.called;
-            expect(unlayoutCallback).not.to.have.been.called;
-            expect(pauseCallback).not.to.have.been.called;
-            expect(resumeCallback).not.to.have.been.called;
-          });
+          }
+          expect(unlayoutCallback).not.to.have.been.called;
+          expect(pauseCallback).not.to.have.been.called;
+          expect(resumeCallback).to.have.been.called;
+        });
+
+        it('does not call callbacks when going to PAUSED', async () => {
+          changeViewerVisibilityState(VisibilityState_Enum.PAUSED);
+          await waitForNextPass();
+
+          expect(layoutCallback).not.to.have.been.called;
+          expect(unlayoutCallback).not.to.have.been.called;
+          expect(pauseCallback).not.to.have.been.called;
+          expect(resumeCallback).not.to.have.been.called;
         });
       });
 
       describe('from in the PAUSED state', () => {
-        beforeEach(() => {
-          viewer.receiveMessage('visibilitychange', {
-            state: VisibilityState.VISIBLE,
-          });
-          return waitForNextPass()
-            .then(() => {
-              viewer.receiveMessage('visibilitychange', {
-                state: VisibilityState.PAUSED,
-              });
-              return waitForNextPass();
-            })
-            .then(setupSpys);
+        beforeEach(async () => {
+          changeViewerVisibilityState(VisibilityState_Enum.VISIBLE);
+          await waitForNextPass();
+
+          changeViewerVisibilityState(VisibilityState_Enum.PAUSED);
+          await waitForNextPass();
+
+          setupSpys();
         });
 
-        it('calls resume when going to VISIBLE', () => {
-          viewer.receiveMessage('visibilitychange', {
-            state: VisibilityState.VISIBLE,
-          });
-          return waitForNextPass().then(() => {
-            expect(layoutCallback).not.to.have.been.called;
-            expect(unlayoutCallback).not.to.have.been.called;
-            expect(pauseCallback).not.to.have.been.called;
-            expect(resumeCallback).to.have.been.called;
-          });
+        it('calls resume when going to VISIBLE', async () => {
+          changeViewerVisibilityState(VisibilityState_Enum.VISIBLE);
+          await waitForNextPass();
+
+          expect(layoutCallback).not.to.have.been.called;
+          expect(unlayoutCallback).not.to.have.been.called;
+          expect(pauseCallback).not.to.have.been.called;
+          expect(resumeCallback).to.have.been.called;
         });
 
-        it('calls unlayout when going to HIDDEN', () => {
+        it('calls unlayout when going to HIDDEN', async () => {
           changeVisibility('hidden');
-          return waitForNextPass().then(() => {
-            expect(layoutCallback).not.to.have.been.called;
-            expect(unlayoutCallback).not.to.have.been.called;
-            expect(pauseCallback).not.to.have.been.called;
-            expect(resumeCallback).not.to.have.been.called;
-          });
+          await waitForNextPass();
+
+          expect(layoutCallback).not.to.have.been.called;
+          expect(unlayoutCallback).not.to.have.been.called;
+          expect(pauseCallback).not.to.have.been.called;
+          expect(resumeCallback).not.to.have.been.called;
         });
 
-        it('calls unlayout when going to INACTIVE', () => {
-          viewer.receiveMessage('visibilitychange', {
-            state: VisibilityState.INACTIVE,
-          });
-          return waitForNextPass().then(() => {
-            expect(layoutCallback).not.to.have.been.called;
-            expect(unlayoutCallback).to.have.been.called;
-            expect(pauseCallback).to.have.been.called;
-            expect(resumeCallback).not.to.have.been.called;
-          });
+        it('calls unlayout when going to INACTIVE', async () => {
+          changeViewerVisibilityState(VisibilityState_Enum.INACTIVE);
+          await waitForNextPass();
+
+          expect(layoutCallback).not.to.have.been.called;
+          expect(unlayoutCallback).to.have.been.called;
+          expect(pauseCallback).to.have.been.called;
+          expect(resumeCallback).not.to.have.been.called;
         });
 
-        it('does not call callbacks when going to PAUSED', () => {
-          return waitForNextPass().then(() => {
-            expect(layoutCallback).not.to.have.been.called;
-            expect(unlayoutCallback).not.to.have.been.called;
-            expect(pauseCallback).not.to.have.been.called;
-            expect(resumeCallback).not.to.have.been.called;
-          });
+        it('does not call callbacks when going to PAUSED', async () => {
+          await waitForNextPass();
+
+          expect(layoutCallback).not.to.have.been.called;
+          expect(unlayoutCallback).not.to.have.been.called;
+          expect(pauseCallback).not.to.have.been.called;
+          expect(resumeCallback).not.to.have.been.called;
         });
       });
     }
diff --git a/test/unit/3p/test-recaptcha.js b/test/unit/3p/test-recaptcha.js
index 5ffed3833adc..2f6491e0e8ac 100644
--- a/test/unit/3p/test-recaptcha.js
+++ b/test/unit/3p/test-recaptcha.js
@@ -1,6 +1,6 @@
 import {doesOriginDomainMatchIframeSrc, initRecaptcha} from '#3p/recaptcha';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {parseUrlDeprecated} from '../../../src/url';
 
 describes.sandboxed('3p recaptcha.js', {}, () => {
diff --git a/test/unit/builtins/test-amp-img-v1.js b/test/unit/builtins/test-amp-img-v1.js
index 5bb475bc3075..0985855d276b 100644
--- a/test/unit/builtins/test-amp-img-v1.js
+++ b/test/unit/builtins/test-amp-img-v1.js
@@ -1,7 +1,7 @@
 import {AmpImg} from '#builtins/amp-img/amp-img';
 
 import {createElementWithAttributes, dispatchCustomEvent} from '#core/dom';
-import {Layout, LayoutPriority} from '#core/dom/layout';
+import {LayoutPriority_Enum, Layout_Enum} from '#core/dom/layout';
 
 import {testElementR1} from '#testing/element-v1';
 
@@ -64,7 +64,7 @@ describes.realWin('amp-img R1', {amp: true}, (env) => {
   });
 
   it('getBuildPriority', () => {
-    expect(AmpImg.getBuildPriority()).to.equal(LayoutPriority.CONTENT);
+    expect(AmpImg.getBuildPriority()).to.equal(LayoutPriority_Enum.CONTENT);
   });
 
   it('should load an img', async () => {
@@ -240,7 +240,7 @@ describes.realWin('amp-img R1', {amp: true}, (env) => {
     ]);
   });
 
-  it('should preconnect to the the first srcset url if src is not set', () => {
+  it('should preconnect to the first srcset url if src is not set', () => {
     const element = createImg({srcset: SRCSET_STRING});
     expect(AmpImg.getPreconnects(element)).to.deep.equal([
       '/examples/img/hero@1x.jpg',
@@ -252,6 +252,11 @@ describes.realWin('amp-img R1', {amp: true}, (env) => {
     expect(AmpImg.prerenderAllowed(el)).to.equal(true);
   });
 
+  it('should allow preview by default', () => {
+    const el = createImg({src: '/examples/img/sample.jpg'});
+    expect(AmpImg.previewAllowed(el)).to.equal(true);
+  });
+
   it('should load an img with srcset', async () => {
     const ampImg = await getImg({
       srcset: SRCSET_STRING,
@@ -593,7 +598,7 @@ describes.realWin('amp-img R1', {amp: true}, (env) => {
     it('should generate correct sizes for layout fixed', async () => {
       const ampImg = await getStubbedImg(
         {
-          layout: Layout.FIXED,
+          layout: Layout_Enum.FIXED,
           src: 'test.jpg',
           srcset: 'large.jpg 2000w, small.jpg 1000w',
           width: 300,
@@ -610,7 +615,7 @@ describes.realWin('amp-img R1', {amp: true}, (env) => {
     it('should generate correct sizes for layout responsive', async () => {
       const ampImg = await getStubbedImg(
         {
-          layout: Layout.RESPONSIVE,
+          layout: Layout_Enum.RESPONSIVE,
           src: 'test.jpg',
           srcset: 'large.jpg 2000w, small.jpg 1000w',
           width: 300,
@@ -627,7 +632,7 @@ describes.realWin('amp-img R1', {amp: true}, (env) => {
     it('should generate correct sizes for layout fixed-height', async () => {
       const ampImg = await getStubbedImg(
         {
-          layout: Layout.FIXED_HEIGHT,
+          layout: Layout_Enum.FIXED_HEIGHT,
           src: 'test.jpg',
           srcset: 'large.jpg 2000w, small.jpg 1000w',
           width: 300,
@@ -644,7 +649,7 @@ describes.realWin('amp-img R1', {amp: true}, (env) => {
     it('should generate correct sizes for layout fill', async () => {
       const ampImg = await getStubbedImg(
         {
-          layout: Layout.FILL,
+          layout: Layout_Enum.FILL,
           src: 'test.jpg',
           srcset: 'large.jpg 2000w, small.jpg 1000w',
           width: 300,
@@ -661,7 +666,7 @@ describes.realWin('amp-img R1', {amp: true}, (env) => {
     it('should generate correct sizes for layout flex-item', async () => {
       const ampImg = await getStubbedImg(
         {
-          layout: Layout.FLEX_ITEM,
+          layout: Layout_Enum.FLEX_ITEM,
           src: 'test.jpg',
           srcset: 'large.jpg 2000w, small.jpg 1000w',
           width: 300,
diff --git a/test/unit/builtins/test-amp-img.js b/test/unit/builtins/test-amp-img.js
index b08164391b26..6009928ceb9b 100644
--- a/test/unit/builtins/test-amp-img.js
+++ b/test/unit/builtins/test-amp-img.js
@@ -4,7 +4,7 @@ import {
   installImg,
 } from '#builtins/amp-img/amp-img';
 
-import {Layout, LayoutPriority} from '#core/dom/layout';
+import {LayoutPriority_Enum, Layout_Enum} from '#core/dom/layout';
 
 import {Services} from '#service';
 
@@ -68,7 +68,7 @@ describes.sandboxed('amp-img', {}, (env) => {
       referrerpolicy: 'origin',
     });
     const impl = await ampImg.getImpl(false);
-    expect(impl.getLayoutPriority()).to.equal(LayoutPriority.CONTENT);
+    expect(impl.getLayoutPriority()).to.equal(LayoutPriority_Enum.CONTENT);
 
     const img = ampImg.querySelector('img');
     expect(img.tagName).to.equal('IMG');
@@ -86,7 +86,7 @@ describes.sandboxed('amp-img', {}, (env) => {
       height: 200,
     });
     const impl = await ampImg.getImpl(false);
-    expect(impl.getLayoutPriority()).to.equal(LayoutPriority.CONTENT);
+    expect(impl.getLayoutPriority()).to.equal(LayoutPriority_Enum.CONTENT);
 
     const img = ampImg.querySelector('img');
     expect(img.tagName).to.equal('IMG');
@@ -126,7 +126,7 @@ describes.sandboxed('amp-img', {}, (env) => {
     });
   });
 
-  it('should preconnect to the the first srcset url if src is not set', async () => {
+  it('should preconnect to the first srcset url if src is not set', async () => {
     const preconnect = {url: sandbox.stub()};
     sandbox.stub(Services, 'preconnectFor').returns(preconnect);
 
@@ -394,6 +394,14 @@ describes.sandboxed('amp-img', {}, (env) => {
     expect(AmpImg.prerenderAllowed(el)).to.equal(true);
   });
 
+  it('should allow preview by default', () => {
+    const el = document.createElement('amp-img');
+    el.setAttribute('src', 'test.jpg');
+    el.setAttribute('width', 100);
+    el.setAttribute('height', 100);
+    expect(AmpImg.previewAllowed(el)).to.equal(true);
+  });
+
   it('should propogate src as the final attribute', () => {
     expect(
       ATTRIBUTES_TO_PROPAGATE[ATTRIBUTES_TO_PROPAGATE.length - 1]
@@ -715,7 +723,7 @@ describes.sandboxed('amp-img', {}, (env) => {
     it('should generate correct sizes for layout fixed', () => {
       const impl = getStubbedImg(
         {
-          layout: Layout.FIXED,
+          layout: Layout_Enum.FIXED,
           src: 'test.jpg',
           srcset: 'large.jpg 2000w, small.jpg 1000w',
           width: 300,
@@ -735,7 +743,7 @@ describes.sandboxed('amp-img', {}, (env) => {
     it('should generate correct sizes for layout responsive', () => {
       const impl = getStubbedImg(
         {
-          layout: Layout.RESPONSIVE,
+          layout: Layout_Enum.RESPONSIVE,
           src: 'test.jpg',
           srcset: 'large.jpg 2000w, small.jpg 1000w',
           width: 300,
@@ -755,7 +763,7 @@ describes.sandboxed('amp-img', {}, (env) => {
     it('should generate correct sizes for layout fixed-height', () => {
       const impl = getStubbedImg(
         {
-          layout: Layout.FIXED_HEIGHT,
+          layout: Layout_Enum.FIXED_HEIGHT,
           src: 'test.jpg',
           srcset: 'large.jpg 2000w, small.jpg 1000w',
           width: 300,
@@ -775,7 +783,7 @@ describes.sandboxed('amp-img', {}, (env) => {
     it('should generate correct sizes for layout fill', () => {
       const impl = getStubbedImg(
         {
-          layout: Layout.FILL,
+          layout: Layout_Enum.FILL,
           src: 'test.jpg',
           srcset: 'large.jpg 2000w, small.jpg 1000w',
           width: 300,
@@ -795,7 +803,7 @@ describes.sandboxed('amp-img', {}, (env) => {
     it('should generate correct sizes for layout flex-item', () => {
       const impl = getStubbedImg(
         {
-          layout: Layout.FLEX_ITEM,
+          layout: Layout_Enum.FLEX_ITEM,
           src: 'test.jpg',
           srcset: 'large.jpg 2000w, small.jpg 1000w',
           width: 300,
diff --git a/test/unit/builtins/test-amp-layout.js b/test/unit/builtins/test-amp-layout.js
index 3949fc9ecd45..184a82996e8b 100644
--- a/test/unit/builtins/test-amp-layout.js
+++ b/test/unit/builtins/test-amp-layout.js
@@ -1,8 +1,12 @@
+import {createDocument as createWorkerDomDoc} from '@ampproject/worker-dom/dist/server-lib.mjs';
+
 import {AmpLayout} from '#builtins/amp-layout/amp-layout';
 import {buildDom} from '#builtins/amp-layout/build-dom';
 
 import {createElementWithAttributes} from '#core/dom';
-import {Layout} from '#core/dom/layout';
+import {Layout_Enum} from '#core/dom/layout';
+
+import {getDeterministicOuterHTML} from '#testing/helpers';
 
 describes.realWin('amp-layout', {amp: true}, (env) => {
   async function getAmpLayout(attrs, innerHTML) {
@@ -24,7 +28,7 @@ describes.realWin('amp-layout', {amp: true}, (env) => {
   it('should reparent all children under a container for when layout!=container', async () => {
     const children = '<span>hello</span><span>world</span>';
     const ampLayout = await getAmpLayout(
-      {layout: Layout.FIXED, height: 100, width: 100},
+      {layout: Layout_Enum.FIXED, height: 100, width: 100},
       children
     );
 
@@ -60,6 +64,32 @@ describes.realWin('amp-layout', {amp: true}, (env) => {
     expect(layout1.outerHTML).to.equal(layout2.outerHTML);
   });
 
+  it('buildDom should result in the same outerHTML in WorkerDOM and Browser', () => {
+    const browserAmpLayout = createElementWithAttributes(
+      env.win.document,
+      'amp-layout',
+      {
+        width: 100,
+        height: 100,
+      }
+    );
+    const workerDomAmpLayout = createElementWithAttributes(
+      createWorkerDomDoc(),
+      'amp-layout',
+      {
+        width: 100,
+        height: 100,
+      }
+    );
+
+    buildDom(browserAmpLayout);
+    buildDom(workerDomAmpLayout);
+
+    const browserHtml = getDeterministicOuterHTML(browserAmpLayout);
+    const workerDomHtml = getDeterministicOuterHTML(workerDomAmpLayout);
+    expect(browserHtml).to.equal(workerDomHtml);
+  });
+
   it('buildDom does not modify server rendered elements', () => {
     const layout = createElementWithAttributes(env.win.document, 'amp-layout');
     buildDom(layout);
diff --git a/test/unit/builtins/test-amp-pixel.js b/test/unit/builtins/test-amp-pixel.js
index c7330d143838..a7ee43aae008 100644
--- a/test/unit/builtins/test-amp-pixel.js
+++ b/test/unit/builtins/test-amp-pixel.js
@@ -1,6 +1,9 @@
+import {Services} from '#service';
 import {installUrlReplacementsForEmbed} from '#service/url-replacements-impl';
 import {VariableSource} from '#service/variable-source';
 
+import * as privacySandboxUtils from 'src/utils/privacy-sandbox-utils';
+
 describes.realWin('amp-pixel', {amp: true}, (env) => {
   const urlErrorRegex = /src attribute must start with/;
 
@@ -19,6 +22,7 @@ describes.realWin('amp-pixel', {amp: true}, (env) => {
     await createPixel(
       'https://pubads.g.doubleclick.net/activity;dc_iu=1/abc;ord=1?'
     );
+    env.sandbox.spy(Services, 'urlReplacementsForDoc');
   });
 
   function createPixel(src, referrerPolicy) {
@@ -33,12 +37,16 @@ describes.realWin('amp-pixel', {amp: true}, (env) => {
 
   /**
    * @param {string=} opt_src
+   * @param {string=} opt_attributionsrc
    * @return {!Promise<?Image>}
    */
-  function trigger(opt_src) {
+  function trigger(opt_src, opt_attributionsrc) {
     if (opt_src != null) {
       pixel.setAttribute('src', opt_src);
     }
+    if (opt_attributionsrc != null) {
+      pixel.setAttribute('attributionsrc', opt_attributionsrc);
+    }
     whenFirstVisibleResolver();
     return whenFirstVisiblePromise
       .then(() => {
@@ -132,6 +140,63 @@ describes.realWin('amp-pixel', {amp: true}, (env) => {
       );
     });
   });
+
+  it('should not allow attribution reporting with a non-supporting browser', () => {
+    env.sandbox
+      .stub(privacySandboxUtils, 'isAttributionReportingAllowed')
+      .returns(false);
+    const attributionSrc =
+      '//pubads.g.doubleclick.net/activity;dc_iu=1/abc;ord=2';
+    pixel.setAttribute(
+      'src',
+      'https://pubads.g.doubleclick.net/activity;dc_iu=1/abc;ord=1?ars=ATTRIBUTION_REPORTING_STATUS'
+    );
+    return trigger(null, attributionSrc).then((img) => {
+      // Protocol is resolved to `http:` relative to test server.
+      expect(img.src).to.equal(
+        'https://pubads.g.doubleclick.net/activity;dc_iu=1/abc;ord=1?ars=5'
+      );
+    });
+  });
+
+  it('should allow attribution reporting with empty attributionsrc', () => {
+    env.sandbox
+      .stub(privacySandboxUtils, 'isAttributionReportingAllowed')
+      .returns(true);
+    const attributionSrc = '';
+    pixel.setAttribute(
+      'src',
+      'https://pubads.g.doubleclick.net/activity;dc_iu=1/abc;ord=1?ars=ATTRIBUTION_REPORTING_STATUS'
+    );
+    return trigger(null, attributionSrc).then((img) => {
+      // Protocol is resolved to `http:` relative to test server.
+      expect(img.src).to.equal(
+        'https://pubads.g.doubleclick.net/activity;dc_iu=1/abc;ord=1?ars=6'
+      );
+      expect(img.attributionSrc).to.equal('');
+      expect(Services.urlReplacementsForDoc).to.be.calledWith(pixel);
+    });
+  });
+
+  it('should allow attribution reporting with attributionsrc defined', () => {
+    env.sandbox
+      .stub(privacySandboxUtils, 'isAttributionReportingAllowed')
+      .returns(true);
+    pixel.setAttribute(
+      'src',
+      'https://pubads.g.doubleclick.net/activity;dc_iu=1/abc;ord=1?ars=ATTRIBUTION_REPORTING_STATUS'
+    );
+    const attributionSrc =
+      'https://adtech.example?ars=ATTRIBUTION_REPORTING_STATUS';
+    return trigger(null, attributionSrc).then((img) => {
+      // Protocol is resolved to `http:` relative to test server.
+      expect(img.src).to.equal(
+        'https://pubads.g.doubleclick.net/activity;dc_iu=1/abc;ord=1?ars=6'
+      );
+      expect(img.attributionSrc).to.equal('https://adtech.example?ars=6');
+      expect(Services.urlReplacementsForDoc).to.be.calledWith(pixel);
+    });
+  });
 });
 
 describes.realWin(
diff --git a/test/unit/compiler/test-builders.js b/test/unit/compiler/test-builders.js
index d6959efb2dbc..73a0ea90f6b0 100644
--- a/test/unit/compiler/test-builders.js
+++ b/test/unit/compiler/test-builders.js
@@ -1,7 +1,11 @@
+import {createDocument as createWorkerDomDoc} from '@ampproject/worker-dom/dist/server-lib.mjs';
+
 import {getBuilders} from '#compiler/builders';
 
 import {createElementWithAttributes} from '#core/dom';
 
+import {getDeterministicOuterHTML} from '#testing/helpers';
+
 describes.fakeWin('getBuilders', {}, (env) => {
   let doc;
   beforeEach(() => (doc = env.win.document));
@@ -52,5 +56,27 @@ describes.fakeWin('getBuilders', {}, (env) => {
       builders.noop(elem);
       expect(elem.getAttribute('i-amphtml-layout')).equal('fixed');
     });
+
+    it('wrapper should behave same in browser as in WorkerDOM', () => {
+      const browserDiv = createElementWithAttributes(doc, 'div', {
+        height: 100,
+        width: 100,
+      });
+      const workerDomDiv = createElementWithAttributes(
+        createWorkerDomDoc(),
+        'div',
+        {
+          height: 100,
+          width: 100,
+        }
+      );
+
+      builders.noop(browserDiv);
+      builders.noop(workerDomDiv);
+
+      const browserHtml = getDeterministicOuterHTML(browserDiv);
+      const workerHtml = getDeterministicOuterHTML(workerDomDiv);
+      expect(workerHtml).equal(browserHtml);
+    });
   });
 });
diff --git a/test/unit/compiler/test-compile.js b/test/unit/compiler/test-compile.js
index c2fac5c2bafc..80780b9e0197 100644
--- a/test/unit/compiler/test-compile.js
+++ b/test/unit/compiler/test-compile.js
@@ -2,12 +2,13 @@ import {compile} from '#compiler/compile';
 
 describes.sandboxed('compile', {}, () => {
   it('should throw if provided invalid input', () => {
-    const errorMsg = /Must provide versions and either document or nodes/;
+    const errorMsg =
+      /Must provide component_versions and either document or nodes/;
 
     expect(() => compile()).throw(errorMsg);
     expect(() => compile({})).throw(errorMsg);
     expect(() => compile({unknown: {}})).throw(errorMsg);
-    expect(() => compile({versions: []})).throw(errorMsg);
+    expect(() => compile({component_versions: []})).throw(errorMsg); // eslint-disable-line local/camelcase
     expect(() => compile({nodes: []})).throw(errorMsg);
     expect(() => compile({document: {}})).throw(errorMsg);
   });
@@ -18,14 +19,20 @@ describes.sandboxed('compile', {}, () => {
       tree: [{tagid: 92, children: []}],
       'quirks_mode': false,
     };
-    expect(compile({document, versions: []})).to.deep.equal({document});
+
+    // eslint-disable-next-line local/camelcase
+    expect(compile({document, component_versions: []})).to.deep.equal({
+      document,
+    });
   });
 
   it('should return compiled nodes', () => {
     const nodes = [
-      {tagid: 1, value: 'a', children: [], attributes: []},
-      {tagid: 7, value: 'b', children: [], attributes: []},
+      {tagid: 1, value: 'a'},
+      {tagid: 7, value: 'b'},
     ];
-    expect(compile({nodes, versions: []})).to.deep.equal({nodes});
+
+    // eslint-disable-next-line local/camelcase
+    expect(compile({nodes, component_versions: []})).to.deep.equal({nodes});
   });
 });
diff --git a/test/unit/core/data-structures/test-curve.js b/test/unit/core/data-structures/test-curve.js
index 6a2bc78a1252..cd64b5b861ee 100644
--- a/test/unit/core/data-structures/test-curve.js
+++ b/test/unit/core/data-structures/test-curve.js
@@ -1,4 +1,4 @@
-import {Curves, bezierCurve, getCurve} from '#core/data-structures/curve';
+import {Curves_Enum, bezierCurve, getCurve} from '#core/data-structures/curve';
 
 describes.sandboxed('data structures - Curve', {}, () => {
   it('bezierCurve', () => {
@@ -23,11 +23,11 @@ describes.sandboxed('data structures - Curve', {}, () => {
     expect(getCurve(func)).to.equal(func);
 
     // String is translated.
-    expect(getCurve('linear')).to.equal(Curves.LINEAR);
-    expect(getCurve('ease')).to.equal(Curves.EASE);
-    expect(getCurve('ease-in')).to.equal(Curves.EASE_IN);
-    expect(getCurve('ease-out')).to.equal(Curves.EASE_OUT);
-    expect(getCurve('ease-in-out')).to.equal(Curves.EASE_IN_OUT);
+    expect(getCurve('linear')).to.equal(Curves_Enum.LINEAR);
+    expect(getCurve('ease')).to.equal(Curves_Enum.EASE);
+    expect(getCurve('ease-in')).to.equal(Curves_Enum.EASE_IN);
+    expect(getCurve('ease-out')).to.equal(Curves_Enum.EASE_OUT);
+    expect(getCurve('ease-in-out')).to.equal(Curves_Enum.EASE_IN_OUT);
   });
 
   it('getCurve on cubic-bezier curves', () => {
diff --git a/test/unit/core/data-structures/test-observable.js b/test/unit/core/data-structures/test-observable.js
index 22d7cadfcc52..5d3efe93f427 100644
--- a/test/unit/core/data-structures/test-observable.js
+++ b/test/unit/core/data-structures/test-observable.js
@@ -44,4 +44,20 @@ describes.sandboxed('data structures - Observable', {}, () => {
     expect(observer1Called).to.equal(1);
     expect(observer2Called).to.equal(2);
   });
+
+  it('remove while firing', () => {
+    let observer1Called = 0;
+    const observer1 = () => {
+      observer1Called++;
+    };
+    observable.add(observer1);
+    const remove = observable.add(() => {
+      remove();
+    });
+    observable.add(observer1);
+
+    observable.fire();
+
+    expect(observer1Called).to.equal(2);
+  });
 });
diff --git a/test/unit/core/dom/layout/test-layout.js b/test/unit/core/dom/layout/test-layout.js
index 7eb513f1fa95..fde14b37c2f9 100644
--- a/test/unit/core/dom/layout/test-layout.js
+++ b/test/unit/core/dom/layout/test-layout.js
@@ -1,5 +1,5 @@
 import {
-  Layout,
+  Layout_Enum,
   assertLength,
   assertLengthOrPercent,
   getLengthNumeral,
@@ -221,7 +221,7 @@ describes.sandboxed('DOM - layout', {}, () => {
 
   it('layout=nodisplay', () => {
     div.setAttribute('layout', 'nodisplay');
-    expect(applyStaticLayout(div)).to.equal(Layout.NODISPLAY);
+    expect(applyStaticLayout(div)).to.equal(Layout_Enum.NODISPLAY);
     expect(div.style.width).to.equal('');
     expect(div.style.height).to.equal('');
     document.body.appendChild(div);
@@ -236,7 +236,7 @@ describes.sandboxed('DOM - layout', {}, () => {
     div.setAttribute('layout', 'fixed');
     div.setAttribute('width', 100);
     div.setAttribute('height', 200);
-    expect(applyStaticLayout(div)).to.equal(Layout.FIXED);
+    expect(applyStaticLayout(div)).to.equal(Layout_Enum.FIXED);
     expect(div.style.width).to.equal('100px');
     expect(div.style.height).to.equal('200px');
     expect(div).to.have.class('i-amphtml-layout-fixed');
@@ -247,7 +247,7 @@ describes.sandboxed('DOM - layout', {}, () => {
   it('layout=fixed - default with width/height', () => {
     div.setAttribute('width', 100);
     div.setAttribute('height', 200);
-    expect(applyStaticLayout(div)).to.equal(Layout.FIXED);
+    expect(applyStaticLayout(div)).to.equal(Layout_Enum.FIXED);
     expect(div.style.width).to.equal('100px');
     expect(div.style.height).to.equal('200px');
   });
@@ -264,7 +264,7 @@ describes.sandboxed('DOM - layout', {}, () => {
   it('layout=fixed-height', () => {
     div.setAttribute('layout', 'fixed-height');
     div.setAttribute('height', 200);
-    expect(applyStaticLayout(div)).to.equal(Layout.FIXED_HEIGHT);
+    expect(applyStaticLayout(div)).to.equal(Layout_Enum.FIXED_HEIGHT);
     expect(div.style.width).to.equal('');
     expect(div.style.height).to.equal('200px');
     expect(div).to.have.class('i-amphtml-layout-fixed-height');
@@ -276,7 +276,7 @@ describes.sandboxed('DOM - layout', {}, () => {
     div.setAttribute('layout', 'fixed-height');
     div.setAttribute('height', 200);
     div.setAttribute('width', 'auto');
-    expect(applyStaticLayout(div)).to.equal(Layout.FIXED_HEIGHT);
+    expect(applyStaticLayout(div)).to.equal(Layout_Enum.FIXED_HEIGHT);
     expect(div.style.width).to.equal('');
     expect(div.style.height).to.equal('200px');
     expect(div).to.have.class('i-amphtml-layout-fixed-height');
@@ -297,7 +297,7 @@ describes.sandboxed('DOM - layout', {}, () => {
 
   it('layout=fixed-height - default with height', () => {
     div.setAttribute('height', 200);
-    expect(applyStaticLayout(div)).to.equal(Layout.FIXED_HEIGHT);
+    expect(applyStaticLayout(div)).to.equal(Layout_Enum.FIXED_HEIGHT);
     expect(div.style.height).to.equal('200px');
     expect(div.style.width).to.equal('');
   });
@@ -305,7 +305,7 @@ describes.sandboxed('DOM - layout', {}, () => {
   it('layout=fixed-height - default with height and width=auto', () => {
     div.setAttribute('height', 200);
     div.setAttribute('width', 'auto');
-    expect(applyStaticLayout(div)).to.equal(Layout.FIXED_HEIGHT);
+    expect(applyStaticLayout(div)).to.equal(Layout_Enum.FIXED_HEIGHT);
     expect(div.style.height).to.equal('200px');
     expect(div.style.width).to.equal('');
   });
@@ -323,7 +323,7 @@ describes.sandboxed('DOM - layout', {}, () => {
     div.setAttribute('layout', 'responsive');
     div.setAttribute('width', 100);
     div.setAttribute('height', 200);
-    expect(applyStaticLayout(div)).to.equal(Layout.RESPONSIVE);
+    expect(applyStaticLayout(div)).to.equal(Layout_Enum.RESPONSIVE);
     expect(div.style.width).to.equal('');
     expect(div.style.height).to.equal('');
     expect(div).to.have.class('i-amphtml-layout-responsive');
@@ -338,7 +338,7 @@ describes.sandboxed('DOM - layout', {}, () => {
     div.setAttribute('sizes', '50vw');
     div.setAttribute('width', 100);
     div.setAttribute('height', 200);
-    expect(applyStaticLayout(div)).to.equal(Layout.RESPONSIVE);
+    expect(applyStaticLayout(div)).to.equal(Layout_Enum.RESPONSIVE);
     expect(div.style.width).to.equal('');
     expect(div.style.height).to.equal('');
     expect(div).to.have.class('i-amphtml-layout-responsive');
@@ -353,7 +353,7 @@ describes.sandboxed('DOM - layout', {}, () => {
     div.setAttribute('layout', 'intrinsic');
     div.setAttribute('width', 100);
     div.setAttribute('height', 200);
-    expect(applyStaticLayout(div)).to.equal(Layout.INTRINSIC);
+    expect(applyStaticLayout(div)).to.equal(Layout_Enum.INTRINSIC);
     expect(div.style.width).to.equal('');
     expect(div.style.height).to.equal('');
     expect(div).to.have.class('i-amphtml-layout-intrinsic');
@@ -373,7 +373,7 @@ describes.sandboxed('DOM - layout', {}, () => {
     div.setAttribute('sizes', '50vw');
     div.setAttribute('width', 100);
     div.setAttribute('height', 200);
-    expect(applyStaticLayout(div)).to.equal(Layout.INTRINSIC);
+    expect(applyStaticLayout(div)).to.equal(Layout_Enum.INTRINSIC);
     expect(div.style.width).to.equal('');
     expect(div.style.height).to.equal('');
     expect(div).to.have.class('i-amphtml-layout-intrinsic');
@@ -390,7 +390,7 @@ describes.sandboxed('DOM - layout', {}, () => {
 
   it('layout=fill', () => {
     div.setAttribute('layout', 'fill');
-    expect(applyStaticLayout(div)).to.equal(Layout.FILL);
+    expect(applyStaticLayout(div)).to.equal(Layout_Enum.FILL);
     expect(div.style.width).to.equal('');
     expect(div.style.height).to.equal('');
     expect(div).to.have.class('i-amphtml-layout-fill');
@@ -400,7 +400,7 @@ describes.sandboxed('DOM - layout', {}, () => {
 
   it('layout=container', () => {
     div.setAttribute('layout', 'container');
-    expect(applyStaticLayout(div)).to.equal(Layout.CONTAINER);
+    expect(applyStaticLayout(div)).to.equal(Layout_Enum.CONTAINER);
     expect(div.style.width).to.equal('');
     expect(div.style.height).to.equal('');
     expect(div).to.have.class('i-amphtml-layout-container');
@@ -412,7 +412,7 @@ describes.sandboxed('DOM - layout', {}, () => {
     div.setAttribute('layout', 'flex-item');
     div.setAttribute('width', 100);
     div.setAttribute('height', 200);
-    expect(applyStaticLayout(div)).to.equal(Layout.FLEX_ITEM);
+    expect(applyStaticLayout(div)).to.equal(Layout_Enum.FLEX_ITEM);
     expect(div.style.width).to.equal('100px');
     expect(div.style.height).to.equal('200px');
     expect(div).to.have.class('i-amphtml-layout-flex-item');
@@ -424,7 +424,7 @@ describes.sandboxed('DOM - layout', {}, () => {
     div.setAttribute('height', 'fluid');
     const parentDiv = document.createElement('div');
     parentDiv.appendChild(div);
-    expect(applyStaticLayout(div)).to.equal(Layout.FLUID);
+    expect(applyStaticLayout(div)).to.equal(Layout_Enum.FLUID);
     expect(div).to.have.class('i-amphtml-layout-awaiting-size');
     expect(div.children.length).to.equal(0);
   });
@@ -432,7 +432,7 @@ describes.sandboxed('DOM - layout', {}, () => {
   it('layout=fluid - default with width', () => {
     div.setAttribute('height', 'fluid');
     div.setAttribute('width', 300);
-    expect(applyStaticLayout(div)).to.equal(Layout.FLUID);
+    expect(applyStaticLayout(div)).to.equal(Layout_Enum.FLUID);
     expect(div).to.have.class('i-amphtml-layout-awaiting-size');
     expect(div.style.width).to.equal('300px');
     expect(div.children.length).to.equal(0);
@@ -449,7 +449,7 @@ describes.sandboxed('DOM - layout', {}, () => {
 
   it('should configure natural dimensions; default layout', () => {
     const pixel = document.createElement('amp-pixel');
-    expect(applyStaticLayout(pixel)).to.equal(Layout.FIXED);
+    expect(applyStaticLayout(pixel)).to.equal(Layout_Enum.FIXED);
     expect(pixel.style.width).to.equal('0px');
     expect(pixel.style.height).to.equal('0px');
   });
@@ -457,7 +457,7 @@ describes.sandboxed('DOM - layout', {}, () => {
   it('should configure natural dimensions; default layout; with width', () => {
     const pixel = document.createElement('amp-pixel');
     pixel.setAttribute('width', '11');
-    expect(applyStaticLayout(pixel)).to.equal(Layout.FIXED);
+    expect(applyStaticLayout(pixel)).to.equal(Layout_Enum.FIXED);
     expect(pixel.style.width).to.equal('11px');
     expect(pixel.style.height).to.equal('0px');
   });
@@ -465,7 +465,7 @@ describes.sandboxed('DOM - layout', {}, () => {
   it('should configure natural dimensions; default layout; with height', () => {
     const pixel = document.createElement('amp-pixel');
     pixel.setAttribute('height', '11');
-    expect(applyStaticLayout(pixel)).to.equal(Layout.FIXED);
+    expect(applyStaticLayout(pixel)).to.equal(Layout_Enum.FIXED);
     expect(pixel.style.width).to.equal('0px');
     expect(pixel.style.height).to.equal('11px');
   });
@@ -473,7 +473,7 @@ describes.sandboxed('DOM - layout', {}, () => {
   it('should configure natural dimensions; layout=fixed', () => {
     const pixel = document.createElement('amp-pixel');
     pixel.setAttribute('layout', 'fixed');
-    expect(applyStaticLayout(pixel)).to.equal(Layout.FIXED);
+    expect(applyStaticLayout(pixel)).to.equal(Layout_Enum.FIXED);
     expect(pixel.style.width).to.equal('0px');
     expect(pixel.style.height).to.equal('0px');
   });
@@ -481,7 +481,7 @@ describes.sandboxed('DOM - layout', {}, () => {
   it('should configure natural dimensions; layout=fixed-height', () => {
     const pixel = document.createElement('amp-pixel');
     pixel.setAttribute('layout', 'fixed-height');
-    expect(applyStaticLayout(pixel)).to.equal(Layout.FIXED_HEIGHT);
+    expect(applyStaticLayout(pixel)).to.equal(Layout_Enum.FIXED_HEIGHT);
     expect(pixel.style.height).to.equal('0px');
     expect(pixel.style.width).to.equal('');
   });
@@ -536,7 +536,7 @@ describes.sandboxed('DOM - layout', {}, () => {
     div.className = 'other';
     div.style.width = '111px';
     div.style.height = '112px';
-    expect(applyStaticLayout(div)).to.equal(Layout.FLEX_ITEM);
+    expect(applyStaticLayout(div)).to.equal(Layout_Enum.FLEX_ITEM);
     // No other attributes are read or changed.
     expect(div.style.width).to.equal('111px');
     expect(div.style.height).to.equal('112px');
@@ -549,14 +549,14 @@ describes.sandboxed('DOM - layout', {}, () => {
     div.setAttribute('i-amphtml-layout', 'responsive');
     const sizer = document.createElement('i-amphtml-sizer');
     div.appendChild(sizer);
-    expect(applyStaticLayout(div)).to.equal(Layout.RESPONSIVE);
+    expect(applyStaticLayout(div)).to.equal(Layout_Enum.RESPONSIVE);
     expect(div.sizerElement).to.equal(sizer);
     expect(div.sizerElement.getAttribute('slot')).to.equal('i-amphtml-svc');
   });
 
   it('should allow sizer to be missing', () => {
     div.setAttribute('i-amphtml-layout', 'responsive');
-    expect(applyStaticLayout(div)).to.equal(Layout.RESPONSIVE);
+    expect(applyStaticLayout(div)).to.equal(Layout_Enum.RESPONSIVE);
     expect(div.sizerElement).to.be.undefined;
   });
 
@@ -564,7 +564,7 @@ describes.sandboxed('DOM - layout', {}, () => {
     div.setAttribute('i-amphtml-layout', 'responsive');
     const other = document.createElement('div');
     div.appendChild(other);
-    expect(applyStaticLayout(div)).to.equal(Layout.RESPONSIVE);
+    expect(applyStaticLayout(div)).to.equal(Layout_Enum.RESPONSIVE);
     expect(div.sizerElement).to.be.undefined;
   });
 
@@ -579,9 +579,9 @@ describes.sandboxed('DOM - layout', {}, () => {
     div.setAttribute('layout', 'responsive');
     div.setAttribute('width', 100);
     div.setAttribute('height', 200);
-    expect(applyStaticLayout(div)).to.equal(Layout.RESPONSIVE);
+    expect(applyStaticLayout(div)).to.equal(Layout_Enum.RESPONSIVE);
     const clone = div.cloneNode(true);
-    expect(applyStaticLayout(clone)).to.equal(Layout.RESPONSIVE);
+    expect(applyStaticLayout(clone)).to.equal(Layout_Enum.RESPONSIVE);
     expect(div.querySelectorAll('i-amphtml-sizer')).to.have.length(1);
     expect(clone.querySelectorAll('i-amphtml-sizer')).to.have.length(1);
   });
@@ -614,7 +614,7 @@ describes.realWin('ampshared.css', {amp: true}, function (env) {
       element.setAttribute('layout', 'responsive');
       element.setAttribute('width', 100);
       element.setAttribute('height', 100);
-      expect(applyStaticLayout(element)).to.equal(Layout.RESPONSIVE);
+      expect(applyStaticLayout(element)).to.equal(Layout_Enum.RESPONSIVE);
 
       expect(element.offsetWidth).to.equal(element.offsetHeight);
       expect(overflow.offsetHeight).to.equal(20);
@@ -624,7 +624,7 @@ describes.realWin('ampshared.css', {amp: true}, function (env) {
     it('should allow overflow element to distort container layout', () => {
       element.setAttribute('layout', 'container');
       overflow.text = 'test';
-      expect(applyStaticLayout(element)).to.equal(Layout.CONTAINER);
+      expect(applyStaticLayout(element)).to.equal(Layout_Enum.CONTAINER);
 
       expect(element.offsetHeight).to.equal(overflow.offsetHeight);
       expect(win.getComputedStyle(overflow).position).to.equal('relative');
diff --git a/test/unit/core/dom/layout/test-viewport-observer.js b/test/unit/core/dom/layout/test-viewport-observer.js
index a060c5e78a2e..f8f8e236cd3c 100644
--- a/test/unit/core/dom/layout/test-viewport-observer.js
+++ b/test/unit/core/dom/layout/test-viewport-observer.js
@@ -20,18 +20,30 @@ describes.sandboxed('DOM - layout - Viewport Observer', {}, (env) => {
 
     it('Uses implicit root.', () => {
       createViewportObserver(noop, win);
-      expect(ctorSpy).calledWith(noop, {threshold: undefined, root: undefined});
+      expect(ctorSpy).calledWith(noop, {
+        threshold: undefined,
+        root: undefined,
+        rootMargin: undefined,
+      });
     });
 
     it('Pass along threshold argument', () => {
       createViewportObserver(noop, win, {threshold: 0.5});
-      expect(ctorSpy).calledWith(noop, {threshold: 0.5, root: undefined});
+      expect(ctorSpy).calledWith(noop, {
+        threshold: 0.5,
+        root: undefined,
+        rootMargin: undefined,
+      });
     });
 
     it('Sets document root appropriately', () => {
       // Implicit root when not iframed.
       createViewportObserver(noop, win, {needsRootBounds: true});
-      expect(ctorSpy).calledWith(noop, {threshold: undefined, root: undefined});
+      expect(ctorSpy).calledWith(noop, {
+        threshold: undefined,
+        root: undefined,
+        rootMargin: undefined,
+      });
 
       // Document root when iframed.
       win.parent = {};
@@ -39,6 +51,7 @@ describes.sandboxed('DOM - layout - Viewport Observer', {}, (env) => {
       expect(ctorSpy).calledWith(noop, {
         threshold: undefined,
         root: win.document,
+        rootMargin: undefined,
       });
     });
   });
diff --git a/test/unit/core/dom/test-jsx-style-property-string.js b/test/unit/core/dom/test-jsx-style-property-string.js
new file mode 100644
index 000000000000..c51a4815d297
--- /dev/null
+++ b/test/unit/core/dom/test-jsx-style-property-string.js
@@ -0,0 +1,48 @@
+import {jsxStylePropertyString} from '#core/dom/jsx/style-property-string';
+
+describes.sandboxed('jsxStylePropertyString', {}, () => {
+  it('returns empty string with nullish', () => {
+    expect(jsxStylePropertyString('a', null)).to.equal('');
+    expect(jsxStylePropertyString('b', undefined)).to.equal('');
+    expect(
+      jsxStylePropertyString('c', null, /* isDimensional */ true)
+    ).to.equal('');
+    expect(
+      jsxStylePropertyString('d', undefined, /* isDimensional */ true)
+    ).to.equal('');
+  });
+
+  it('returns empty string with empty string', () => {
+    expect(jsxStylePropertyString('a', '')).to.equal('');
+    expect(jsxStylePropertyString('b', '')).to.equal('');
+    expect(jsxStylePropertyString('c', '', /* isDimensional */ true)).to.equal(
+      ''
+    );
+    expect(jsxStylePropertyString('d', '', /* isDimensional */ true)).to.equal(
+      ''
+    );
+  });
+
+  it('returns string value', () => {
+    expect(jsxStylePropertyString('background', 'red')).to.equal(
+      'background:red;'
+    );
+    expect(
+      jsxStylePropertyString('background', 'red', /* isDimensional */ true)
+    ).to.equal('background:red;');
+  });
+
+  it('returns non-dimensional number value as-is', () => {
+    expect(jsxStylePropertyString('flex', 1)).to.equal('flex:1;');
+    expect(jsxStylePropertyString('opacity', 0.5)).to.equal('opacity:0.5;');
+  });
+
+  it('returns dimensional number value with px', () => {
+    expect(
+      jsxStylePropertyString('width', 150, /* isDimensional */ true)
+    ).to.equal('width:150px;');
+    expect(
+      jsxStylePropertyString('height', 321, /* isDimensional */ true)
+    ).to.equal('height:321px;');
+  });
+});
diff --git a/test/unit/core/dom/test-jsx.js b/test/unit/core/dom/test-jsx.js
index c2d5e5173ae4..046192aed954 100644
--- a/test/unit/core/dom/test-jsx.js
+++ b/test/unit/core/dom/test-jsx.js
@@ -1,6 +1,9 @@
 import {dispatchCustomEvent} from '#core/dom/index';
 import * as Preact from '#core/dom/jsx';
 
+// We test invalid uses, so we disable the lint rule.
+/* eslint-disable local/core-dom-jsx */
+
 const {createElement} = Preact;
 
 describes.sandboxed('#core/dom/jsx', {}, (env) => {
@@ -145,6 +148,8 @@ describes.sandboxed('#core/dom/jsx', {}, (env) => {
   });
 
   it('renders with SVG namespace with props.xmlns', () => {
+    // Using `createElement` directly since `xmlns` is added during
+    // transformation by babel-plugin-dom-jsx-svg-namespace
     const xmlns = 'http://www.w3.org/2000/svg';
     const withProp = createElement('svg', {xmlns});
     expect(withProp.namespaceURI).to.equal(xmlns);
@@ -153,6 +158,8 @@ describes.sandboxed('#core/dom/jsx', {}, (env) => {
   });
 
   it('renders with SVG namespace with props.xmlns (compiled)', () => {
+    // This works because <svg> is transformed by
+    // babel-plugin-dom-jsx-svg-namespace
     const xmlns = 'http://www.w3.org/2000/svg';
     const withProp = <svg />;
     expect(withProp.namespaceURI).to.equal(xmlns);
@@ -168,14 +175,23 @@ describes.sandboxed('#core/dom/jsx', {}, (env) => {
     });
 
     it('does not support objects as attribute values', () => {
-      const element = (
-        <div style={{width: 400}} class={{foo: true, bar: false}} />
-      );
+      // Using `createElement` directly since objects in `style` JSXAttributes
+      // are otherwise transformed by babel-plugin-jsx-style-object
+      const element = createElement('div', {
+        style: {width: 400},
+        class: {foo: true, bar: false},
+      });
       expect(element.outerHTML).to.equal(
         '<div style="[object Object]" class="[object Object]"></div>'
       );
     });
 
+    it('supports object as style attribute value (compiled)', () => {
+      // This works because it's transformed by babel-plugin-jsx-style-object
+      const element = <div style={{width: 400, background: null}} />;
+      expect(element.outerHTML).to.equal('<div style="width:400px;"></div>');
+    });
+
     it('does not support dangerouslySetInnerHTML', () => {
       const element = <div dangerouslySetInnerHTML={{__html: '<script>'}} />;
       expect(element.outerHTML).to.equal(
diff --git a/test/unit/core/dom/test-style.js b/test/unit/core/dom/test-style.js
index 5b5d6fb7c290..a5e42e7f563e 100644
--- a/test/unit/core/dom/test-style.js
+++ b/test/unit/core/dom/test-style.js
@@ -24,9 +24,17 @@ describes.sandboxed('DOM - style helpers', {}, (env) => {
   });
 
   it('setStyle with vendor prefix', () => {
-    const element = {style: {WebkitTransitionDuration: ''}};
+    const element = {
+      style: {
+        WebkitTransitionDuration: '',
+        setProperty: (name, value) => {
+          element.style[name] = value;
+        },
+      },
+    };
+
     st.setStyle(element, 'transitionDuration', '1s', undefined, true);
-    expect(element.style.WebkitTransitionDuration).to.equal('1s');
+    expect(element.style['-webkit-transition-duration']).to.equal('1s');
   });
 
   it('setStyle with custom var', () => {
@@ -67,7 +75,7 @@ describes.sandboxed('DOM - style helpers', {}, (env) => {
       transitionDurationImportant: '1s',
     });
     expect(spy).to.have.been.calledWith(
-      'WebkitTransitionDurationImportant',
+      '-webkit-transition-duration-important',
       '1s',
       'important'
     );
@@ -95,6 +103,17 @@ describes.sandboxed('DOM - style helpers', {}, (env) => {
     expect(st.camelCaseToTitleCase(str)).to.equal('TheQuickBrownFox');
   });
 
+  it('camelCaseToHyphenCase', () => {
+    expect(st.camelCaseToHyphenCase('paddingTop')).to.equal('padding-top');
+    expect(st.camelCaseToHyphenCase('WebkitTransition')).to.equal(
+      '-webkit-transition'
+    );
+    expect(st.camelCaseToHyphenCase('webkitTransition')).to.equal(
+      '-webkit-transition'
+    );
+    expect(st.camelCaseToHyphenCase('oTransition')).to.equal('-o-transition');
+  });
+
   it('removeAlphaFromColor', () => {
     expect(st.removeAlphaFromColor('rgba(1, 1, 1, 0)')).to.equal(
       'rgba(1, 1, 1, 1)'
diff --git a/test/unit/core/dom/test-web-components.js b/test/unit/core/dom/test-web-components.js
index b96341170ac5..eea63a1bac80 100644
--- a/test/unit/core/dom/test-web-components.js
+++ b/test/unit/core/dom/test-web-components.js
@@ -1,7 +1,9 @@
 import {
-  ShadowDomVersion,
+  ShadowDomVersion_Enum,
   getShadowDomSupportedVersion,
+  isShadowCssSupported,
   isShadowDomSupported,
+  setShadowCssSupportedForTesting,
   setShadowDomSupportedVersionForTesting,
 } from '#core/dom/web-components';
 
@@ -31,7 +33,7 @@ describes.realWin('Web Components spec', {}, (env) => {
       win.Element.prototype.attachShadow = undefined;
 
       expect(getShadowDomSupportedVersion(win.Element)).to.equal(
-        ShadowDomVersion.NONE
+        ShadowDomVersion_Enum.NONE
       );
     });
 
@@ -41,7 +43,7 @@ describes.realWin('Web Components spec', {}, (env) => {
         !!win.Element.prototype.attachShadow
       ) {
         expect(getShadowDomSupportedVersion(win.Element)).to.equal(
-          ShadowDomVersion.V1
+          ShadowDomVersion_Enum.V1
         );
       }
     });
@@ -51,9 +53,41 @@ describes.realWin('Web Components spec', {}, (env) => {
         win.Element.prototype.attachShadow = undefined;
 
         expect(getShadowDomSupportedVersion(win.Element)).to.equal(
-          ShadowDomVersion.V0
+          ShadowDomVersion_Enum.V0
         );
       }
     });
   });
+
+  describe('Shadow CSS', () => {
+    beforeEach(() => {
+      setShadowCssSupportedForTesting(undefined);
+    });
+
+    it('should report whether native shadow css supported', () => {
+      const shadowDomV0 = !!win.Element.prototype.createShadowRoot;
+      const shadowDomV1 = !!win.Element.prototype.attachShadow;
+      expect(isShadowCssSupported()).to.equal(shadowDomV0 || shadowDomV1);
+    });
+
+    it('should report whether native shadow css supported using proxied Elements', () => {
+      const shadowDomV0 = !!win.Element.prototype.createShadowRoot;
+      const shadowDomV1 = !!win.Element.prototype.attachShadow;
+
+      if (shadowDomV0) {
+        const {createShadowRoot} = win.Element.prototype;
+
+        win.Element.prototype.createShadowRoot = (...args) =>
+          createShadowRoot(...args);
+      }
+
+      if (shadowDomV1) {
+        const {attachShadow} = win.Element.prototype;
+
+        win.Element.prototype.attachShadow = (...args) => attachShadow(...args);
+      }
+
+      expect(isShadowCssSupported()).to.equal(shadowDomV0 || shadowDomV1);
+    });
+  });
 });
diff --git a/test/unit/core/types/object/test-object.js b/test/unit/core/types/object/test-object.js
index 9600492bab54..d8a7ee31da24 100644
--- a/test/unit/core/types/object/test-object.js
+++ b/test/unit/core/types/object/test-object.js
@@ -4,6 +4,7 @@ import {
   hasOwn,
   map,
   memo,
+  objectsEqualDeep,
   ownProperty,
   recreateNonProtoObject,
 } from '#core/types/object';
@@ -189,6 +190,80 @@ describes.sandboxed('type helpers - objects', {}, () => {
     });
   });
 
+  describe('objectsEqualDeep', () => {
+    const getDeepObject = () => ({
+      a: 'A',
+      b: 13,
+      c: ['C', 'c', 'see', 'si'],
+      d: {e: 'E'},
+      f: {g: {h: [{i: ['J']}]}},
+    });
+    const deepObject = getDeepObject();
+
+    it('should compare deep objects', () => {
+      expect(objectsEqualDeep(deepObject, getDeepObject())).to.be.true;
+    });
+    it('should compare shallow objects', () => {
+      expect(objectsEqualDeep(deepObject, deepObject)).to.be.true;
+      expect(objectsEqualDeep(deepObject, {...deepObject})).to.be.true;
+      expect(objectsEqualDeep({...deepObject}, {...deepObject})).to.be.true;
+    });
+    it('should not matter what order the keys are in', () => {
+      expect(
+        objectsEqualDeep(deepObject, {
+          c: deepObject.c,
+          f: deepObject.f,
+          d: deepObject.d,
+          a: deepObject.a,
+          b: deepObject.b,
+        })
+      ).to.be.true;
+    });
+    it('should fail if there are extra keys', () => {
+      expect(objectsEqualDeep(deepObject, {...deepObject, foo: 'foo'})).to.be
+        .false;
+    });
+    it('should fail if there are too-few keys', () => {
+      const missingKeys = {...deepObject};
+      delete missingKeys['a'];
+      expect(objectsEqualDeep(deepObject, missingKeys)).to.be.false;
+    });
+    it('should fail if values are different', () => {
+      expect(objectsEqualDeep(deepObject, {...deepObject, a: 'AAA'})).to.be
+        .false;
+      expect(objectsEqualDeep(deepObject, {...deepObject, b: ['B']})).to.be
+        .false;
+      expect(objectsEqualDeep(deepObject, {...deepObject, c: 'C,c,see,si'})).to
+        .be.false;
+    });
+    it('should fail if a deep value is different', () => {
+      const o2 = getDeepObject();
+      o2.f.g.h[0].i[0] = 'JJJ';
+      expect(objectsEqualDeep(deepObject, o2)).to.be.false;
+    });
+
+    const getDeepArray = () => ['A', 'B', {c: 'C'}, ['D', 'E', 'F']];
+    const deepArray = getDeepArray();
+    it('should compare arrays', () => {
+      expect(objectsEqualDeep(deepArray, getDeepArray())).to.be.true;
+      expect(objectsEqualDeep(deepArray, [...getDeepArray()])).to.be.true;
+    });
+    it('should fail if the arrays are different', () => {
+      const o2 = getDeepArray();
+      expect(objectsEqualDeep(deepArray, o2.slice(1))).to.be.false;
+      expect(objectsEqualDeep(deepArray, o2.slice(0, 2))).to.be.false;
+      expect(objectsEqualDeep(deepArray, [...o2, 'extra'])).to.be.false;
+      expect(objectsEqualDeep(deepArray, ['extra', ...o2])).to.be.false;
+      expect(objectsEqualDeep(deepArray, [...o2, ...o2])).to.be.false;
+      o2[1] = 'BB';
+      expect(objectsEqualDeep(deepArray, o2)).to.be.false;
+
+      // Just to make sure nothing funky happened:
+      o2[1] = 'B';
+      expect(objectsEqualDeep(deepArray, o2)).to.be.true;
+    });
+  });
+
   describe('memo', () => {
     const PROP = '_a';
 
diff --git a/test/unit/core/types/string/test-base64.js b/test/unit/core/types/string/test-base64.js
index fd15d7175290..84594adec2d0 100644
--- a/test/unit/core/types/string/test-base64.js
+++ b/test/unit/core/types/string/test-base64.js
@@ -9,9 +9,7 @@ import {
 import {stringToBytes, utf8Decode, utf8Encode} from '#core/types/string/bytes';
 
 describes.sandboxed('type helpers - strings - base64', {}, () => {
-  // TODO(amphtml, #25621): Cannot find atob / btoa on Safari.
-  const config = describe.configure().skipSafari();
-  config.run('base64', () => {
+  describe('base64', () => {
     describe('base64 <> utf-8 encode/decode', () => {
       const testCases = [
         'SimplyFoo',
diff --git a/test/unit/core/types/string/test-string.js b/test/unit/core/types/string/test-string.js
index 6387c4ffc72b..77cd526923f1 100644
--- a/test/unit/core/types/string/test-string.js
+++ b/test/unit/core/types/string/test-string.js
@@ -89,7 +89,8 @@ describes.sandboxed('type helpers - strings', {}, () => {
       expect(expandTemplate('$x}', testGetter)).to.equal('$x}');
       expect(expandTemplate('$x', testGetter)).to.equal('$x');
       expect(expandTemplate('{x}', testGetter)).to.equal('{x}');
-      expect(expandTemplate('${{x}', testGetter)).to.equal('not found');
+      expect(expandTemplate('${{x}', testGetter)).to.equal('${{x}');
+      expect(expandTemplate('${${x}', testGetter)).to.equal('${Test 1');
     });
 
     it('should default to one iteration.', () => {
diff --git a/test/unit/core/window/test-history.js b/test/unit/core/window/test-history.js
index be657be4020b..38cdbc984a5e 100644
--- a/test/unit/core/window/test-history.js
+++ b/test/unit/core/window/test-history.js
@@ -10,6 +10,8 @@ import {installTimerService} from '#service/timer-impl';
 
 import {listenOncePromise} from '#utils/event-helper';
 
+import {FakePerformance} from '#testing/fake-dom';
+
 import {parseUrlDeprecated} from '../../../../src/url';
 
 describes.fakeWin(
@@ -322,6 +324,7 @@ describes.sandboxed('Window - History', {}, (env) => {
           'https://cdn.ampproject.org/c/s/www.example.com/path'
         ),
         addEventListener: () => null,
+        performance: new FakePerformance(window),
       };
       ampdoc = new AmpDocSingle(win);
       installHistoryServiceForDoc(ampdoc);
diff --git a/test/unit/inabox/test-inabox-resources.js b/test/unit/inabox/test-inabox-resources.js
index ef8a166501d6..e1047f763bea 100644
--- a/test/unit/inabox/test-inabox-resources.js
+++ b/test/unit/inabox/test-inabox-resources.js
@@ -4,9 +4,9 @@ import {toggleExperiment} from '#experiments';
 
 import {InaboxResources} from '#inabox/inabox-resources';
 
-import {ResourceState} from '#service/resource';
+import {ResourceState_Enum} from '#service/resource';
 
-import {macroTask} from '#testing/helpers';
+import {macroTask, sleep} from '#testing/helpers';
 
 describes.realWin('inabox-resources', {amp: true}, (env) => {
   let win;
@@ -65,13 +65,29 @@ describes.realWin('inabox-resources', {amp: true}, (env) => {
 
     await env.ampdoc.whenReady();
     expect(buildStub).to.be.calledOnce;
-    await new Promise(setTimeout);
+    await macroTask();
     schedulePassSpy.resetHistory();
     resolveBuild();
-    await new Promise(setTimeout);
+    await macroTask();
     expect(schedulePassSpy).to.be.calledOnce;
   });
 
+  it('upgraded: should handle when build() returns undefined', async () => {
+    const schedulePassSpy = env.sandbox.stub(resources, 'schedulePass');
+    const element1 = env.createAmpElement('amp-foo');
+    resources.add(element1);
+    const resource1 = resources.getResourceForElement(element1);
+    const buildStub = env.sandbox.stub(resource1, 'build');
+    buildStub.returns(undefined);
+    resources.upgraded(element1);
+
+    await env.ampdoc.whenReady();
+    await macroTask();
+
+    expect(buildStub).to.be.calledOnce;
+    expect(schedulePassSpy).to.be.calledTwice;
+  });
+
   it('eagerly builds amp elements', async () => {
     toggleExperiment(win, 'inabox-resources-eager', true);
     const readySignal = new Deferred();
@@ -159,17 +175,16 @@ describes.realWin('inabox-resources', {amp: true}, (env) => {
     env.sandbox.stub(resource2, 'build').resolves();
     env.sandbox
       .stub(resource1, 'getState')
-      .returns(ResourceState.READY_FOR_LAYOUT);
+      .returns(ResourceState_Enum.READY_FOR_LAYOUT);
     env.sandbox
       .stub(resource2, 'getState')
-      .returns(ResourceState.READY_FOR_LAYOUT);
+      .returns(ResourceState_Enum.READY_FOR_LAYOUT);
     env.sandbox.stub(resource1, 'isDisplayed').returns(true);
     env.sandbox.stub(resource2, 'isDisplayed').returns(true);
     resources.upgraded(element1);
 
     resources.schedulePass(0);
-    await new Promise(setTimeout);
-    await new Promise(setTimeout);
+    await sleep(10);
 
     expect(resource1.measure).to.be.called;
     expect(resource2.measure).to.not.be.called;
diff --git a/test/unit/inabox/test-position-observer.js b/test/unit/inabox/test-position-observer.js
index 5c41a6326500..555df0534cb3 100644
--- a/test/unit/inabox/test-position-observer.js
+++ b/test/unit/inabox/test-position-observer.js
@@ -5,6 +5,8 @@ import {
 
 import {layoutRectLtwh} from '#core/dom/layout/rect';
 
+import {sleep} from '#testing/helpers';
+
 describes.realWin('inabox-host:position-observer', {}, (env) => {
   let win;
   let observer;
@@ -39,7 +41,7 @@ describes.realWin('inabox-host:position-observer', {}, (env) => {
     };
   });
 
-  it('observe should work', () => {
+  it('observe should work', async () => {
     let position1 = {
       viewportRect: layoutRectLtwh(0, 0, 200, 300),
       targetRect: layoutRectLtwh(1, 2, 30, 40),
@@ -58,23 +60,18 @@ describes.realWin('inabox-host:position-observer', {}, (env) => {
     observer.observe(target2, callbackSpy21);
     expect(callbackSpy21).to.be.calledWith(position2);
     win.scrollTo(10, 20);
-    return new Promise((resolve) => {
-      setTimeout(() => {
-        position1 = {
-          viewportRect: layoutRectLtwh(10, 20, 200, 300),
-          targetRect: layoutRectLtwh(1, 2, 30, 40),
-        };
-        position2 = {
-          viewportRect: layoutRectLtwh(10, 20, 200, 300),
-          targetRect: layoutRectLtwh(3, 4, 30, 40),
-        };
-        resolve();
-      }, 100);
-    }).then(() => {
-      expect(callbackSpy11).to.be.calledWith(position1);
-      expect(callbackSpy12).to.be.calledWith(position1);
-      expect(callbackSpy21).to.be.calledWith(position2);
-    });
+    await sleep(100);
+    position1 = {
+      viewportRect: layoutRectLtwh(10, 20, 200, 300),
+      targetRect: layoutRectLtwh(1, 2, 30, 40),
+    };
+    position2 = {
+      viewportRect: layoutRectLtwh(10, 20, 200, 300),
+      targetRect: layoutRectLtwh(3, 4, 30, 40),
+    };
+    expect(callbackSpy11).to.be.calledWith(position1);
+    expect(callbackSpy12).to.be.calledWith(position1);
+    expect(callbackSpy21).to.be.calledWith(position2);
   });
 
   it('getTargetRect should work within nested iframes', () => {
diff --git a/test/unit/inabox/test-utils.js b/test/unit/inabox/test-utils.js
index d394dcd4aaae..9c72dd58f4a0 100644
--- a/test/unit/inabox/test-utils.js
+++ b/test/unit/inabox/test-utils.js
@@ -5,6 +5,8 @@ import {getA4AId, registerIniLoadListener} from '#inabox/utils';
 
 import {Services} from '#service';
 
+import {sleep} from '#testing/helpers';
+
 import * as IniLoad from '../../../src/ini-load';
 
 describes.realWin('inabox-utils', {}, (env) => {
@@ -47,18 +49,15 @@ describes.realWin('inabox-utils', {}, (env) => {
     env.win.dispatchEvent = dispatchEventStub;
   });
 
-  it('should fire custom event and postMessage', () => {
+  it('should fire custom event and postMessage', async () => {
     registerIniLoadListener(ampdoc);
     expect(dispatchEventStub).to.not.be.called;
     expect(parentPostMessageStub).to.not.be.called;
     iniLoadDeferred.resolve([]);
-    const timeDeferred = new Deferred();
-    setTimeout(() => timeDeferred.resolve(), 10);
-    return timeDeferred.promise.then(() => {
-      expect(dispatchEventStub).to.be.calledOnce;
-      expect(initCustomEventStub).to.be.calledWith('amp-ini-load');
-      expect(parentPostMessageStub).to.be.calledWith('amp-ini-load', '*');
-    });
+    await sleep(10);
+    expect(dispatchEventStub).to.be.calledOnce;
+    expect(initCustomEventStub).to.be.calledWith('amp-ini-load');
+    expect(parentPostMessageStub).to.be.calledWith('amp-ini-load', '*');
   });
 
   it('Should not return an a4aId if no a4a meta tag in head', () => {
diff --git a/test/unit/preact/component/test-renderer.js b/test/unit/preact/component/test-renderer.js
index a8f0c75c2a10..6c1f57467313 100644
--- a/test/unit/preact/component/test-renderer.js
+++ b/test/unit/preact/component/test-renderer.js
@@ -1,7 +1,7 @@
 import {mount} from 'enzyme';
 
 import * as Preact from '#preact';
-import {useRenderer} from '#preact/component';
+import {useRenderer} from '#preact/component/renderer';
 
 describes.sandboxed('useRenderer', {}, (env) => {
   function Component({data, render}) {
diff --git a/test/unit/preact/test-base-element-mapping.js b/test/unit/preact/test-base-element-mapping.js
index ed6c08da07a7..0ed1c4d280dc 100644
--- a/test/unit/preact/test-base-element-mapping.js
+++ b/test/unit/preact/test-base-element-mapping.js
@@ -4,6 +4,10 @@ import {omit} from '#core/types/object';
 
 import * as Preact from '#preact';
 import {PreactBaseElement} from '#preact/base-element';
+import {
+  createParseAttrsWithPrefix,
+  createParseDateAttr,
+} from '#preact/parse-props';
 import {Slot} from '#preact/slot';
 
 import {upgradeOrRegisterElement} from '#service/custom-element-registry';
@@ -74,6 +78,14 @@ describes.realWin('PreactBaseElement', spec, (env) => {
       Impl['loadable'] = true;
       expect(Impl.prerenderAllowed()).to.be.false;
     });
+
+    it('by default previewAllowed is NOT tied to the "loadable" flag', () => {
+      Impl['loadable'] = false;
+      expect(Impl.previewAllowed()).to.be.false;
+
+      Impl['loadable'] = true;
+      expect(Impl.previewAllowed()).to.be.false;
+    });
   });
 
   describe('layout mapping', () => {
@@ -106,7 +118,7 @@ describes.realWin('PreactBaseElement', spec, (env) => {
         'valueWithDef': {attr: 'value-with-def', default: 'DEFAULT'},
         'propA': {attr: 'prop-a'},
         'minFontSize': {attr: 'min-font-size', type: 'number'},
-        'aDate': {attr: 'a-date', type: 'date'},
+        'aDate': createParseDateAttr('a-date'),
         'disabled': {attr: 'disabled', type: 'boolean'},
         'enabled': {attr: 'enabled', type: 'boolean'},
         'boolDefTrue': {attr: 'bool-def-true', type: 'boolean', default: true},
@@ -115,8 +127,8 @@ describes.realWin('PreactBaseElement', spec, (env) => {
           parseAttrs: (e) =>
             `${e.getAttribute('part-a')}+${e.getAttribute('part-b')}`,
         },
-        'params': {attrPrefix: 'data-param-'},
-        'prefix': {attrPrefix: 'prefix'},
+        'params': createParseAttrsWithPrefix('data-param-'),
+        'prefix': createParseAttrsWithPrefix('prefix'),
       };
       element = html`
         <amp-preact
@@ -354,10 +366,10 @@ describes.realWin('PreactBaseElement', spec, (env) => {
       await element.buildInternal();
       await waitFor(() => component.callCount > 0, 'component rendered');
       expect(component).to.be.calledOnce;
-      const container = element.shadowRoot.querySelector(':scope > c');
+      const container = element.shadowRoot.querySelector(':scope c');
       expect(container).to.be.ok;
       expect(container.style.display).to.equal('contents');
-      expect(container.querySelector(':scope > #component')).to.be.ok;
+      expect(container.querySelector(':scope #component')).to.be.ok;
       expect(
         element.shadowRoot.querySelectorAll('slot[name="i-amphtml-svc"]')
       ).to.have.lengthOf(1);
@@ -383,7 +395,8 @@ describes.realWin('PreactBaseElement', spec, (env) => {
       expect(serviceSlot[0].assignedElements()[2]).to.equal(overflow);
     });
 
-    describe('SSR', () => {
+    // TODO(#38975): fix or remove broken test.
+    describe.skip('SSR', () => {
       let shadowRoot, container;
       let componentEl, serviceSlotEl, styleEl;
 
@@ -515,7 +528,7 @@ describes.realWin('PreactBaseElement', spec, (env) => {
       expect(lightDom.querySelector(':scope > #component')).to.be.ok;
       expect(lightDom.className).to.equal('i-amphtml-fill-content');
       expect(lightDom.hasAttribute('i-amphtml-rendered')).to.be.true;
-      expect(lastProps.className).to.equal('i-amphtml-fill-content');
+      expect(lastProps.class).to.equal('i-amphtml-fill-content');
       expect(lastProps.as).to.equal('time');
       await waitFor(
         () => updateEventSpy.callCount > 0,
@@ -535,7 +548,7 @@ describes.realWin('PreactBaseElement', spec, (env) => {
       expect(element.querySelector(':scope > time')).to.equal(existing);
       expect(existing.querySelector(':scope > #component')).to.be.ok;
       expect(existing.className).to.equal('i-amphtml-fill-content');
-      expect(lastProps.className).to.equal('i-amphtml-fill-content');
+      expect(lastProps.class).to.equal('i-amphtml-fill-content');
       expect(lastProps.as).to.equal('time');
       await waitFor(
         () => updateEventSpy.callCount > 0,
@@ -564,7 +577,7 @@ describes.realWin('PreactBaseElement', spec, (env) => {
             'valueWithDef': {attr: 'value-with-def', default: 'DEFAULT'},
             'propA': {attr: 'prop-a'},
             'minFontSize': {attr: 'min-font-size', type: 'number'},
-            'aDate': {attr: 'a-date', type: 'date'},
+            'aDate': createParseDateAttr('a-date'),
             'disabled': {attr: 'disabled', type: 'boolean'},
             'enabled': {attr: 'enabled', type: 'boolean'},
           },
@@ -600,8 +613,8 @@ describes.realWin('PreactBaseElement', spec, (env) => {
               parseAttrs: (e) =>
                 `${e.getAttribute('part-a')}+${e.getAttribute('part-b')}`,
             },
-            'params': {attrPrefix: 'data-param-'},
-            'prefix': {attrPrefix: 'prefix'},
+            'params': createParseAttrsWithPrefix('data-param-'),
+            'prefix': createParseAttrsWithPrefix('prefix'),
           },
           selector: '*', // This should be last as catch-all.
           single: false,
@@ -1151,7 +1164,7 @@ describes.realWin('PreactBaseElement', spec, (env) => {
             'valueWithDef': {attr: 'value-with-def', default: 'DEFAULT'},
             'propA': {attr: 'prop-a'},
             'minFontSize': {attr: 'min-font-size', type: 'number'},
-            'aDate': {attr: 'a-date', type: 'date'},
+            'aDate': createParseDateAttr('a-date'),
             'disabled': {attr: 'disabled', type: 'boolean'},
             'enabled': {attr: 'enabled', type: 'boolean'},
           },
diff --git a/test/unit/preact/test-base-element-runtime.js b/test/unit/preact/test-base-element-runtime.js
index 24f151de6989..2d9c51cdf29c 100644
--- a/test/unit/preact/test-base-element-runtime.js
+++ b/test/unit/preact/test-base-element-runtime.js
@@ -3,7 +3,7 @@ import {removeElement} from '#core/dom';
 import {htmlFor} from '#core/dom/static-template';
 
 import * as Preact from '#preact';
-import {PreactBaseElement, whenUpgraded} from '#preact/base-element';
+import {PreactBaseElement} from '#preact/base-element';
 import {forwardRef} from '#preact/compat';
 import {useAmpContext, useLoading} from '#preact/context';
 import {CanRender} from '#preact/contextprops';
@@ -15,6 +15,22 @@ import {getSchedulerForDoc} from '#service/scheduler';
 import {waitFor} from '#testing/helpers/service';
 import {installResizeObserverStub} from '#testing/resize-observer-stub';
 
+/**
+ * Returns the upgraded imperative API object, once Preact has actually mounted.
+ *
+ * This technically works with both Bento and Legacy components, returning the
+ * BaseElement instance in the later case.
+ *
+ * @param {!Element} el
+ * @return {!Promise<!Object>}
+ */
+function whenUpgraded(el) {
+  return el.ownerDocument.defaultView.customElements
+    .whenDefined(el.localName)
+    .then(() => el.getImpl())
+    .then((impl) => impl.getApi());
+}
+
 describes.realWin('PreactBaseElement', {amp: true}, (env) => {
   let win, doc, html;
   let Impl, component, lastProps, lastContext, lastLoading;
diff --git a/test/unit/preact/test-memo.js b/test/unit/preact/test-memo.js
new file mode 100644
index 000000000000..547c98c5af71
--- /dev/null
+++ b/test/unit/preact/test-memo.js
@@ -0,0 +1,42 @@
+import {mount} from 'enzyme';
+
+import * as Preact from '#preact';
+import {memo} from '#preact/compat';
+
+describes.sandboxed('preact/compat/memo', {}, (env) => {
+  let Component;
+  let Memoized;
+  let wrapper;
+  beforeEach(() => {
+    Component = env.sandbox.stub();
+    Component.callsFake((props) => {
+      return <div {...props} />;
+    });
+    Memoized = memo(Component);
+
+    wrapper = mount(<Memoized foo="foo" />);
+  });
+
+  it('should pass-through the props and render the component', () => {
+    expect(wrapper.find('div').props()).to.deep.equal({
+      foo: 'foo',
+    });
+
+    expect(Component).callCount(1);
+  });
+  it('should rerender if the props change', () => {
+    wrapper.setProps({foo: 'BAR'});
+
+    expect(Component).callCount(2);
+  });
+  it("should not rerender if the props haven't changed", () => {
+    wrapper.setProps({foo: 'foo'});
+
+    expect(Component).callCount(1);
+  });
+  it('should rerender if an extra prop is added', () => {
+    wrapper.setProps({bar: 'bar'});
+
+    expect(Component).callCount(2);
+  });
+});
diff --git a/test/unit/test-action.js b/test/unit/test-action.js
index 8abe811942c2..af664e3031d3 100644
--- a/test/unit/test-action.js
+++ b/test/unit/test-action.js
@@ -1,9 +1,9 @@
 import {
-  ActionTrust,
+  ActionTrust_Enum,
   DEFAULT_ACTION,
   RAW_OBJECT_ARGS_KEY,
 } from '#core/constants/action-constants';
-import {Keys} from '#core/constants/key-codes';
+import {Keys_Enum} from '#core/constants/key-codes';
 import {htmlFor} from '#core/dom/static-template';
 
 import {
@@ -17,6 +17,8 @@ import {AmpDocSingle} from '#service/ampdoc-impl';
 
 import {createCustomEvent} from '#utils/event-helper';
 
+import {FakePerformance} from '#testing/fake-dom';
+import {macroTask} from '#testing/helpers';
 import {whenCalled} from '#testing/helpers/service';
 
 /**
@@ -35,6 +37,7 @@ function actionService() {
     __AMP_SERVICES: {
       vsync: {obj: {}, ctor: Object},
     },
+    performance: new FakePerformance(window),
   };
   return new ActionService(new AmpDocSingle(win), document);
 }
@@ -821,7 +824,7 @@ describes.sandboxed('Action method', {}, (env) => {
         ampActionMacro,
         'tap',
         null,
-        ActionTrust.HIGH,
+        ActionTrust_Enum.HIGH,
         /* opt_args */ {arg1: 'realArgValue'}
       );
 
@@ -845,7 +848,7 @@ describes.sandboxed('Action method', {}, (env) => {
         expect(method).to.equal('method');
         expect(actionEventType).to.equal('tap');
         expect(args).to.deep.equal({realArgName: 'realArgValue'});
-        expect(trust).to.equal(ActionTrust.HIGH);
+        expect(trust).to.equal(ActionTrust_Enum.HIGH);
         expect(tagOrTarget).to.equal('AMP-ACTION-MACRO');
         expect(actionEventType).to.equal('tap');
         expect(source).to.equal(ampActionMacro);
@@ -873,7 +876,7 @@ describes.sandboxed('installActionHandler', {}, (env) => {
         'button',
         'button',
         'tap',
-        ActionTrust.HIGH
+        ActionTrust_Enum.HIGH
       )
     );
     expect(handlerSpy).to.be.calledOnce;
@@ -884,7 +887,7 @@ describes.sandboxed('installActionHandler', {}, (env) => {
     expect(callArgs.source).to.be.equal('button');
     expect(callArgs.caller).to.be.equal('button');
     expect(callArgs.event).to.be.equal('tap');
-    expect(callArgs.trust).to.be.equal(ActionTrust.HIGH);
+    expect(callArgs.trust).to.be.equal(ActionTrust_Enum.HIGH);
   });
 
   it('should not check trust level (handler should check)', () => {
@@ -899,12 +902,12 @@ describes.sandboxed('installActionHandler', {}, (env) => {
       'button',
       'button',
       'tapEvent',
-      ActionTrust.HIGH
+      ActionTrust_Enum.HIGH
     );
     action.invoke_(invocation);
     expect(handlerSpy).to.be.calledOnce;
 
-    invocation.trust = ActionTrust.LOW;
+    invocation.trust = ActionTrust_Enum.LOW;
     action.invoke_(invocation);
     expect(handlerSpy).to.be.calledTwice;
   });
@@ -988,10 +991,6 @@ describes.sandboxed('Multiple handlers action method', {}, (env) => {
     expect(xyz).to.not.have.been.called;
     expect(onEnqueue2).to.not.have.been.called;
 
-    // Invocation of chained actions are branched on promiseAbc/promiseXyz,
-    // so wait for macro-task to ensure all queued promises are resolved.
-    const macroTask = () => new Promise((resolve) => setTimeout(resolve, 0));
-
     resolveAbc();
     return macroTask()
       .then(() => {
@@ -1086,7 +1085,7 @@ describes.sandboxed('Action interceptor', {}, (env) => {
         'source1',
         'caller1',
         'event1',
-        ActionTrust.HIGH
+        ActionTrust_Enum.HIGH
       )
     );
     action.invoke_(
@@ -1097,7 +1096,7 @@ describes.sandboxed('Action interceptor', {}, (env) => {
         'source2',
         'caller2',
         'event2',
-        ActionTrust.HIGH
+        ActionTrust_Enum.HIGH
       )
     );
 
@@ -1135,7 +1134,7 @@ describes.sandboxed('Action interceptor', {}, (env) => {
         'source3',
         'caller3',
         'event3',
-        ActionTrust.HIGH
+        ActionTrust_Enum.HIGH
       )
     );
     expect(handler).to.have.callCount(3);
@@ -1174,7 +1173,7 @@ describes.sandboxed('Action common handler', {}, (env) => {
         'source1',
         'caller1',
         'event1',
-        ActionTrust.HIGH
+        ActionTrust_Enum.HIGH
       )
     );
     expect(action1).to.be.calledOnce;
@@ -1188,7 +1187,7 @@ describes.sandboxed('Action common handler', {}, (env) => {
         'source2',
         'caller2',
         'event2',
-        ActionTrust.HIGH
+        ActionTrust_Enum.HIGH
       )
     );
     expect(action2).to.be.calledOnce;
@@ -1199,7 +1198,7 @@ describes.sandboxed('Action common handler', {}, (env) => {
 
   it('should check trust before invoking action', () => {
     const handler = env.sandbox.spy();
-    action.addGlobalMethodHandler('foo', handler, ActionTrust.HIGH);
+    action.addGlobalMethodHandler('foo', handler, ActionTrust_Enum.HIGH);
 
     action.invoke_(
       new ActionInvocation(
@@ -1209,7 +1208,7 @@ describes.sandboxed('Action common handler', {}, (env) => {
         'source1',
         'caller1',
         'event1',
-        ActionTrust.HIGH
+        ActionTrust_Enum.HIGH
       )
     );
     expect(handler).to.be.calledOnce;
@@ -1223,7 +1222,7 @@ describes.sandboxed('Action common handler', {}, (env) => {
           'source1',
           'caller1',
           'event1',
-          ActionTrust.LOW
+          ActionTrust_Enum.LOW
         )
       );
       expect(handler).to.be.calledOnce;
@@ -1338,7 +1337,7 @@ describes.fakeWin('Core events', {amp: true}, (env) => {
       element.setAttribute('role', 'button');
       const event = {
         target: element,
-        key: Keys.ENTER,
+        key: Keys_Enum.ENTER,
         preventDefault: env.sandbox.stub(),
       };
       handler(event);
@@ -1359,7 +1358,7 @@ describes.fakeWin('Core events', {amp: true}, (env) => {
       element.setAttribute('role', 'button');
       const event = {
         target: element,
-        key: Keys.ENTER,
+        key: Keys_Enum.ENTER,
         preventDefault: env.sandbox.stub(),
       };
       handler(event);
@@ -1382,7 +1381,7 @@ describes.fakeWin('Core events', {amp: true}, (env) => {
       element.setAttribute('role', 'option');
       const event = {
         target: element,
-        key: Keys.ENTER,
+        key: Keys_Enum.ENTER,
         preventDefault: env.sandbox.stub(),
       };
       handler(event);
@@ -1401,7 +1400,7 @@ describes.fakeWin('Core events', {amp: true}, (env) => {
       const handler = window.document.addEventListener.getCall(1).args[1];
       const element = document.createElement('div');
       element.setAttribute('role', 'not-a-button');
-      const event = {target: element, key: Keys.ENTER};
+      const event = {target: element, key: Keys_Enum.ENTER};
       handler(event);
       expect(action.trigger).to.not.have.been.called;
     }
@@ -1416,7 +1415,7 @@ describes.fakeWin('Core events', {amp: true}, (env) => {
       );
       const handler = window.document.addEventListener.getCall(1).args[1];
       const element = document.createElement('input');
-      const event = {target: element, key: Keys.ENTER};
+      const event = {target: element, key: Keys_Enum.ENTER};
       handler(event);
       expect(action.trigger).to.not.have.been.called;
     }
@@ -1670,7 +1669,7 @@ describes.realWin(
         'source',
         'caller',
         'event',
-        ActionTrust.HIGH,
+        ActionTrust_Enum.HIGH,
         'tap',
         opt_tagOrTarget || element.tagName
       );
diff --git a/test/unit/test-activity.js b/test/unit/test-activity.js
index f993cd0a11c2..404c98f6973c 100644
--- a/test/unit/test-activity.js
+++ b/test/unit/test-activity.js
@@ -9,6 +9,8 @@ import {installViewerServiceForDoc} from '#service/viewer-impl';
 import {installViewportServiceForDoc} from '#service/viewport/viewport-impl';
 import {installVsyncService} from '#service/vsync-impl';
 
+import {FakePerformance} from '#testing/fake-dom';
+
 import {installActivityServiceForTesting} from '../../extensions/amp-analytics/0.1/activity-impl';
 
 describes.sandboxed('Activity getTotalEngagedTime', {}, (env) => {
@@ -76,6 +78,7 @@ describes.sandboxed('Activity getTotalEngagedTime', {}, (env) => {
       addEventListener: () => {},
       removeEventListener: () => {},
       Promise: window.Promise,
+      performance: new FakePerformance(window),
     };
     fakeDoc.defaultView = fakeWin;
     fakeDoc.head.defaultView = fakeWin;
@@ -301,6 +304,7 @@ describes.sandboxed('Activity getIncrementalEngagedTime', {}, (env) => {
       addEventListener: () => {},
       removeEventListener: () => {},
       Promise: window.Promise,
+      performance: new FakePerformance(window),
     };
     fakeDoc.defaultView = fakeWin;
     fakeDoc.head.defaultView = fakeWin;
diff --git a/test/unit/test-amp-context.js b/test/unit/test-amp-context.js
index a7c76053a5d4..ead22bbccdf6 100644
--- a/test/unit/test-amp-context.js
+++ b/test/unit/test-amp-context.js
@@ -1,6 +1,6 @@
 import {AmpContext} from '#3p/ampcontext';
 
-import {MessageType, serializeMessage} from '#core/3p-frame-messaging';
+import {MessageType_Enum, serializeMessage} from '#core/3p-frame-messaging';
 
 import {Platform} from '#service/platform-impl';
 
@@ -103,8 +103,8 @@ describes.sandboxed('3p ampcontext.js', {}, (env) => {
     expect(context.referrer).to.equal('baz.net');
   });
 
-  it('should add metadata to window.context using window var.', () => {
-    win.AMP_CONTEXT_DATA = generateAttributes();
+  it('should add metadata to window.context using window global.', () => {
+    win.AMP_CONTEXT_DATA = generateAMPConfigObject();
     const context = new AmpContext(win);
     expect(context.location).to.deep.equal({
       'hash': '',
@@ -174,7 +174,7 @@ describes.sandboxed('3p ampcontext.js', {}, (env) => {
     // send an intersection message down
     const messagePayload = {
       sentinel: '1-291921',
-      type: MessageType.INTERSECTION,
+      type: MessageType_Enum.INTERSECTION,
       changes: 'changes',
     };
     const messageData = 'amp-' + JSON.stringify(messagePayload);
@@ -215,7 +215,7 @@ describes.sandboxed('3p ampcontext.js', {}, (env) => {
     // send a page visibility message down
     const messagePayload = {
       sentinel: '1-291921',
-      type: MessageType.EMBED_STATE,
+      type: MessageType_Enum.EMBED_STATE,
       pageHidden: true,
     };
     const messageData = 'amp-' + JSON.stringify(messagePayload);
@@ -272,7 +272,7 @@ describes.sandboxed('3p ampcontext.js', {}, (env) => {
     // send a resize success message down
     const messagePayloadSuccess = {
       sentinel: '1-291921',
-      type: MessageType.EMBED_SIZE_CHANGED,
+      type: MessageType_Enum.EMBED_SIZE_CHANGED,
       id: initialId,
       requestedHeight: 300,
       requestedWidth: 200,
@@ -285,7 +285,7 @@ describes.sandboxed('3p ampcontext.js', {}, (env) => {
     // send a resize failure message down
     const messagePayloadFailure = {
       sentinel: '1-291921',
-      type: MessageType.EMBED_SIZE_DENIED,
+      type: MessageType_Enum.EMBED_SIZE_DENIED,
       id: initialId + 1,
       requestedHeight: 300,
       requestedWidth: 200,
@@ -328,7 +328,7 @@ describes.sandboxed('3p ampcontext.js', {}, (env) => {
     // send a resize success message down
     const messagePayload = {
       sentinel: '1-291921',
-      type: MessageType.EMBED_SIZE_CHANGED,
+      type: MessageType_Enum.EMBED_SIZE_CHANGED,
       requestedHeight: 300,
       requestedWidth: 200,
     };
@@ -374,7 +374,7 @@ describes.sandboxed('3p ampcontext.js', {}, (env) => {
     // send a resize denied message down
     const messagePayload = {
       sentinel: '1-291921',
-      type: MessageType.EMBED_SIZE_DENIED,
+      type: MessageType_Enum.EMBED_SIZE_DENIED,
       requestedHeight: 300,
       requestedWidth: 200,
     };
@@ -393,6 +393,20 @@ describes.sandboxed('3p ampcontext.js', {}, (env) => {
   });
 });
 
+function generateAMPConfigObject() {
+  return {
+    location: {
+      href: 'https://foo.com/a?b=c',
+    },
+    canonicalUrl: 'https://bar.com',
+    pageViewId: '1',
+    pageViewId64: 'abcdef',
+    sentinel: '1-291921',
+    startTime: 0,
+    referrer: 'baz.net',
+  };
+}
+
 function generateSerializedAttributes(opt_sentinel) {
   return JSON.stringify(generateAttributes(opt_sentinel));
 }
diff --git a/test/unit/test-amp-story-player.js b/test/unit/test-amp-story-player.js
index 7544bd17e85f..fc02a6313931 100644
--- a/test/unit/test-amp-story-player.js
+++ b/test/unit/test-amp-story-player.js
@@ -1,6 +1,8 @@
 import {Messaging} from '@ampproject/viewer-messaging';
 import {expect} from 'chai';
 
+import {computedStyle} from '#core/dom/style';
+
 import {createCustomEvent, listenOncePromise} from '#utils/event-helper';
 
 import {macroTask} from '#testing/helpers';
@@ -23,8 +25,6 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
     'https://www.washingtonpost.com/graphics/2019/lifestyle/travel/amp-stories/a-locals-guide-to-what-to-eat-and-do-in-new-york-city/';
   let fakeMessaging;
 
-  const nextTick = () => new Promise((resolve) => win.setTimeout(resolve, 0));
-
   function buildStoryPlayer(
     numStories = 1,
     url = DEFAULT_CACHE_URL,
@@ -157,7 +157,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
   it('should correctly append params at the end of the story url', async () => {
     buildStoryPlayer();
     await manager.loadPlayers();
-    await nextTick();
+    await macroTask();
 
     const storyIframe = playerEl.querySelector('iframe');
 
@@ -174,7 +174,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
     buildStoryPlayer(1, DEFAULT_CACHE_URL + existingQuery + existingHash);
 
     await manager.loadPlayers();
-    await nextTick();
+    await macroTask();
 
     const storyIframe = playerEl.querySelector('iframe');
 
@@ -193,7 +193,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
 
     buildStoryPlayer(3);
     await manager.loadPlayers();
-    await nextTick();
+    await macroTask();
 
     expect(sendRequestSpy).to.have.been.calledWith('visibilitychange', {
       'state': 'visible',
@@ -203,10 +203,10 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
   it('should prerender next story after first one is loaded', async () => {
     buildStoryPlayer(3);
     await manager.loadPlayers();
-    await nextTick();
+    await macroTask();
 
     fireHandler['storyContentLoaded']('storyContentLoaded', {});
-    await nextTick();
+    await macroTask();
 
     const storyIframes = playerEl.querySelectorAll('iframe');
     expect(storyIframes[1].getAttribute('src')).to.include(
@@ -214,10 +214,65 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
     );
   });
 
+  it('should apply desktop aspect ratio based on the active story', async () => {
+    const numStories = 2;
+    const storyAspectRatios = ['0.75', '0.5'];
+    buildStoryPlayer(numStories);
+    await manager.loadPlayers();
+    await macroTask();
+
+    // Aspect ratio should be applied after the first story is loaded.
+    fakeMessaging.sendRequest = () =>
+      Promise.resolve({value: storyAspectRatios[0]});
+    const sendRequestSpy = env.sandbox.spy(fakeMessaging, 'sendRequest');
+    fireHandler['storyContentLoaded']('storyContentLoaded', {});
+    await macroTask();
+
+    expect(sendRequestSpy).to.have.been.calledWith('getDocumentState', {
+      'state': 'DESKTOP_ASPECT_RATIO',
+    });
+    let playerContainer = win.document.querySelector(
+      '.i-amphtml-story-player-main-container'
+    );
+    expect(
+      computedStyle(win, playerContainer)
+        .getPropertyValue('--i-amphtml-story-player-panel-ratio')
+        .trim()
+    ).equal(storyAspectRatios[0]);
+
+    // Aspect ratio should be applied after navigating to the second story and it's loaded.
+    fakeMessaging.sendRequest = () =>
+      Promise.resolve({value: storyAspectRatios[1]});
+    fireHandler['selectDocument']('selectDocument', {next: true});
+    await macroTask();
+    fireHandler['storyContentLoaded']('storyContentLoaded', {});
+    await macroTask();
+    playerContainer = win.document.querySelector(
+      '.i-amphtml-story-player-main-container'
+    );
+    expect(
+      computedStyle(win, playerContainer)
+        .getPropertyValue('--i-amphtml-story-player-panel-ratio')
+        .trim()
+    ).equal(storyAspectRatios[1]);
+
+    // Aspect ratio should be applied after navigating back to the already loaded first story.
+    fireHandler['selectDocument']('selectDocument', {previous: true});
+    await macroTask();
+    playerContainer = win.document.querySelector(
+      '.i-amphtml-story-player-main-container'
+    );
+    expect(
+      computedStyle(win, playerContainer)
+        .getPropertyValue('--i-amphtml-story-player-panel-ratio')
+        .trim()
+    ).equal(storyAspectRatios[0]);
+  });
+
   it('should not load next story if first one has not finished loading', async () => {
     buildStoryPlayer(3);
     await manager.loadPlayers();
-    await nextTick();
+    await macroTask();
 
     const storyIframes = playerEl.querySelectorAll('iframe');
 
@@ -227,11 +282,11 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
   it('should load new story if user navigated before first finished loading', async () => {
     buildStoryPlayer(3);
     await manager.loadPlayers();
-    await nextTick();
+    await macroTask();
 
     // Swiping without waiting for story loaded event.
     swipeLeft();
-    await nextTick();
+    await macroTask();
 
     const storyIframes = playerEl.querySelectorAll('iframe');
     expect(storyIframes[1].getAttribute('src')).to.exist;
@@ -243,7 +298,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
     async () => {
       buildStoryPlayer(4);
       await manager.loadPlayers();
-      await nextTick();
+      await macroTask();
 
       const stories = playerEl.getStories();
 
@@ -265,7 +320,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
     async () => {
       buildStoryPlayer(4);
       await manager.loadPlayers();
-      await nextTick();
+      await macroTask();
 
       const stories = playerEl.getStories();
 
@@ -286,12 +341,13 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
 
     buildStoryPlayer();
     await manager.loadPlayers();
-    await nextTick();
+    await macroTask();
 
     expect(registerHandlerSpy).to.have.been.calledWith('touchstart');
     expect(registerHandlerSpy).to.have.been.calledWith('touchmove');
     expect(registerHandlerSpy).to.have.been.calledWith('touchend');
     expect(registerHandlerSpy).to.have.been.calledWith('selectDocument');
+    expect(registerHandlerSpy).to.have.been.calledWith('storyContentLoaded');
     expect(registerHandlerSpy).to.have.been.calledWith('documentStateUpdate');
   });
 
@@ -300,7 +356,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
 
     buildStoryPlayer();
     await manager.loadPlayers();
-    await nextTick();
+    await macroTask();
 
     expect(sendRequestSpy).to.have.been.calledWith('onDocumentState', {
       'state': 'PAGE_ATTACHMENT_STATE',
@@ -314,7 +370,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
     buildStoryPlayer(2);
 
     await manager.loadPlayers();
-    await nextTick();
+    await macroTask();
 
     const navigationSpy = env.sandbox.spy();
     playerEl.addEventListener('navigation', navigationSpy);
@@ -335,7 +391,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
     buildStoryPlayer(1);
 
     await manager.loadPlayers();
-    await nextTick();
+    await macroTask();
 
     const noNextSpy = env.sandbox.spy();
     playerEl.addEventListener('noNextStory', noNextSpy);
@@ -349,7 +405,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
     buildStoryPlayer(2);
 
     await manager.loadPlayers();
-    await nextTick();
+    await macroTask();
 
     const noNextSpy = env.sandbox.spy();
     playerEl.addEventListener('noNextStory', noNextSpy);
@@ -364,7 +420,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
     playerEl.appendChild(buildCircularWrappingConfig());
 
     await manager.loadPlayers();
-    await nextTick();
+    await macroTask();
 
     const noNextSpy = env.sandbox.spy();
     playerEl.addEventListener('noNextStory', noNextSpy);
@@ -385,10 +441,10 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
     const touchEndSpy = env.sandbox.spy(PageScroller.prototype, 'onTouchEnd');
 
     await manager.loadPlayers();
-    await nextTick();
+    await macroTask();
 
     swipeDown();
-    await nextTick();
+    await macroTask();
 
     expect(touchStartSpy).to.have.been.called;
     expect(touchMoveSpy).to.have.been.called;
@@ -407,10 +463,10 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
     const touchEndSpy = env.sandbox.spy(PageScroller.prototype, 'onTouchEnd');
 
     await manager.loadPlayers();
-    await nextTick();
+    await macroTask();
 
     swipeDown();
-    await nextTick();
+    await macroTask();
 
     expect(touchStartSpy).to.not.have.been.called;
     expect(touchMoveSpy).to.not.have.been.called;
@@ -424,7 +480,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
     const sendRequestSpy = env.sandbox.spy(fakeMessaging, 'sendRequest');
 
     await manager.loadPlayers();
-    await nextTick();
+    await macroTask();
 
     expect(sendRequestSpy).to.not.have.been.calledWith('visibilitychange', {
       'state': 'visible',
@@ -437,10 +493,10 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
     playerEl.appendChild(buildAutoplayConfig(/* autoplay */ false));
 
     await manager.loadPlayers();
-    await nextTick();
+    await macroTask();
 
     playerEl.play();
-    await nextTick();
+    await macroTask();
 
     expect(sendRequestSpy).to.have.been.calledWith('visibilitychange', {
       'state': 'visible',
@@ -454,7 +510,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
     const sendRequestSpy = env.sandbox.spy(fakeMessaging, 'sendRequest');
 
     await manager.loadPlayers();
-    await nextTick();
+    await macroTask();
 
     expect(sendRequestSpy).to.have.been.calledWith('visibilitychange', {
       'state': 'visible',
@@ -465,7 +521,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
     buildStoryPlayer(1);
 
     await manager.loadPlayers();
-    await nextTick();
+    await macroTask();
 
     const noPreviousSpy = env.sandbox.spy();
     playerEl.addEventListener('noPreviousStory', noPreviousSpy);
@@ -479,7 +535,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
     buildStoryPlayer(2);
 
     await manager.loadPlayers();
-    await nextTick();
+    await macroTask();
 
     const noPreviousSpy = env.sandbox.spy();
     playerEl.addEventListener('noPreviousStory', noPreviousSpy);
@@ -495,7 +551,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
     playerEl.appendChild(buildCircularWrappingConfig());
 
     await manager.loadPlayers();
-    await nextTick();
+    await macroTask();
 
     const noPreviousSpy = env.sandbox.spy();
     playerEl.addEventListener('noPreviousStory', noPreviousSpy);
@@ -509,13 +565,13 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
     buildStoryPlayer(1);
 
     await manager.loadPlayers();
-    await nextTick();
+    await macroTask();
 
     const touchSpy = env.sandbox.spy();
     playerEl.addEventListener('amp-story-player-touchstart', touchSpy);
 
     await swipeDown();
-    await nextTick();
+    await macroTask();
 
     expect(touchSpy).to.have.been.called;
   });
@@ -524,13 +580,13 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
     buildStoryPlayer(1);
 
     await manager.loadPlayers();
-    await nextTick();
+    await macroTask();
 
     const touchSpy = env.sandbox.spy();
     playerEl.addEventListener('amp-story-player-touchmove', touchSpy);
 
     await swipeLeft();
-    await nextTick();
+    await macroTask();
 
     expect(touchSpy).to.have.been.calledWithMatch({
       type: 'amp-story-player-touchmove',
@@ -550,13 +606,13 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
     buildStoryPlayer(1);
 
     await manager.loadPlayers();
-    await nextTick();
+    await macroTask();
 
     const touchSpy = env.sandbox.spy();
     playerEl.addEventListener('amp-story-player-touchmove', touchSpy);
 
     await swipeDown();
-    await nextTick();
+    await macroTask();
 
     expect(touchSpy).to.have.been.calledWithMatch({
       type: 'amp-story-player-touchmove',
@@ -576,13 +632,13 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
     buildStoryPlayer(1);
 
     await manager.loadPlayers();
-    await nextTick();
+    await macroTask();
 
     const touchSpy = env.sandbox.spy();
     playerEl.addEventListener('amp-story-player-touchend', touchSpy);
 
     await swipeDown();
-    await nextTick();
+    await macroTask();
 
     expect(touchSpy).to.have.been.called;
   });
@@ -590,7 +646,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
   it('should navigate when swiping', async () => {
     buildStoryPlayer(4);
     await manager.loadPlayers();
-    await nextTick();
+    await macroTask();
 
     const navigationSpy = env.sandbox.spy();
     playerEl.addEventListener('navigation', navigationSpy);
@@ -609,7 +665,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
   it('should not navigate when swiping last story', async () => {
     buildStoryPlayer(2);
     await manager.loadPlayers();
-    await nextTick();
+    await macroTask();
 
     const navigationSpy = env.sandbox.spy();
     playerEl.addEventListener('navigation', navigationSpy);
@@ -626,7 +682,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
       buildStoryPlayer(1, DEFAULT_ORIGIN_URL, 'cdn.ampproject.org');
       await manager.loadPlayers();
 
-      await nextTick();
+      await macroTask();
 
       const storyIframe = playerEl.querySelector('iframe');
 
@@ -641,7 +697,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
       buildStoryPlayer(1, DEFAULT_ORIGIN_URL);
       await manager.loadPlayers();
 
-      await nextTick();
+      await macroTask();
 
       const storyIframe = playerEl.querySelector('iframe');
 
@@ -659,7 +715,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
       buildStoryPlayer(1, DEFAULT_ORIGIN_URL, 'www.tacos.org');
 
       await manager.loadPlayers();
-      await nextTick();
+      await macroTask();
 
       expect(console.error).to.be.calledWithMatch(
         /\[amp-story-player\]/,
@@ -748,10 +804,10 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
       await player.load();
 
       player.show('https://example.com/story3.html');
-      await nextTick();
+      await macroTask();
 
       fireHandler['storyContentLoaded']('storyContentLoaded', {});
-      await nextTick();
+      await macroTask();
 
       const stories = playerEl.getStories();
 
@@ -771,10 +827,10 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
       await player.load();
 
       player.show('https://example.com/story3.html');
-      await nextTick();
+      await macroTask();
 
       fireHandler['storyContentLoaded']('storyContentLoaded', {});
-      await nextTick();
+      await macroTask();
 
       const storyIframes = playerEl.querySelectorAll('iframe');
 
@@ -796,12 +852,12 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
       const player = new AmpStoryPlayer(win, playerEl);
 
       await player.load();
-      await nextTick();
+      await macroTask();
 
       const sendRequestSpy = env.sandbox.spy(fakeMessaging, 'sendRequest');
       player.rewind('https://example.com/story0.html');
 
-      await nextTick();
+      await macroTask();
 
       expect(sendRequestSpy).to.have.been.calledWith('rewind', {});
     });
@@ -813,7 +869,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
       const player = new AmpStoryPlayer(win, playerEl);
 
       await player.load();
-      await nextTick();
+      await macroTask();
 
       return expect(() =>
         player.rewind('https://example.com/story6.html')
@@ -829,13 +885,13 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
       const player = new AmpStoryPlayer(win, playerEl);
 
       await player.load();
-      await nextTick();
+      await macroTask();
 
       const sendRequestSpy = env.sandbox.spy(fakeMessaging, 'sendRequest');
       player.rewind('https://example.com/story2.html');
 
       await player.go(2);
-      await nextTick();
+      await macroTask();
 
       expect(sendRequestSpy).to.have.been.calledWith('rewind', {});
     });
@@ -923,7 +979,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
       async () => {
         buildStoryPlayer(3);
         await manager.loadPlayers();
-        await nextTick();
+        await macroTask();
 
         swipeLeft();
         swipeLeft();
@@ -944,7 +1000,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
       await manager.loadPlayers();
 
       playerEl.pause();
-      await nextTick();
+      await macroTask();
 
       expect(spy).to.have.been.calledWith('visibilitychange', {
         state: 'paused',
@@ -957,7 +1013,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
       await manager.loadPlayers();
 
       playerEl.play();
-      await nextTick();
+      await macroTask();
 
       expect(spy).to.have.been.calledWith('visibilitychange', {
         state: 'visible',
@@ -970,7 +1026,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
       await manager.loadPlayers();
 
       await playerEl.mute();
-      await nextTick();
+      await macroTask();
 
       expect(spy).to.have.been.calledWith('setDocumentState', {
         state: 'MUTED_STATE',
@@ -984,7 +1040,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
       await manager.loadPlayers();
 
       await playerEl.unmute();
-      await nextTick();
+      await macroTask();
 
       expect(spy).to.have.been.calledWith('setDocumentState', {
         state: 'MUTED_STATE',
@@ -1077,7 +1133,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
       fakeResponse = {value: true};
       await playerEl.getStoryState('page-attachment');
 
-      await nextTick();
+      await macroTask();
 
       expect(sendRequestSpy).to.have.been.calledWith('getDocumentState', {
         'state': 'PAGE_ATTACHMENT_STATE',
@@ -1100,7 +1156,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
       buildStoryPlayer();
       playerEl.setAttribute('exit-control', 'back-button');
       await manager.loadPlayers();
-      await nextTick();
+      await macroTask();
 
       openPageAttachment();
 
@@ -1111,7 +1167,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
     it('should fire page attachment open event once', async () => {
       buildStoryPlayer();
       await manager.loadPlayers();
-      await nextTick();
+      await macroTask();
 
       const pageAttachmentSpy = env.sandbox.spy();
       playerEl.addEventListener('page-attachment-open', pageAttachmentSpy);
@@ -1124,7 +1180,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
     it('should fire page attachment close event once', async () => {
       buildStoryPlayer();
       await manager.loadPlayers();
-      await nextTick();
+      await macroTask();
 
       const pageAttachmentSpy = env.sandbox.spy();
       playerEl.addEventListener('page-attachment-close', pageAttachmentSpy);
@@ -1141,7 +1197,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
       const player = new AmpStoryPlayer(win, playerEl);
 
       await player.load();
-      await nextTick();
+      await macroTask();
 
       const navigationSpy = env.sandbox.spy();
       playerEl.addEventListener('navigation', navigationSpy);
@@ -1164,7 +1220,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
       const player = new AmpStoryPlayer(win, playerEl);
 
       await player.load();
-      await nextTick();
+      await macroTask();
 
       const navigationSpy = env.sandbox.spy();
       playerEl.addEventListener('navigation', navigationSpy);
@@ -1188,7 +1244,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
       const player = new AmpStoryPlayer(win, playerEl);
 
       await player.load();
-      await nextTick();
+      await macroTask();
 
       const navigationSpy = env.sandbox.spy();
       playerEl.addEventListener('navigation', navigationSpy);
@@ -1225,11 +1281,11 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
       const player = new AmpStoryPlayer(win, playerEl);
 
       await player.load();
-      await nextTick();
+      await macroTask();
 
       const sendRequestSpy = env.sandbox.spy(fakeMessaging, 'sendRequest');
       player.go(0, 4);
-      await nextTick();
+      await macroTask();
 
       expect(sendRequestSpy).to.have.been.calledWith('selectPage', {
         'delta': 4,
@@ -1243,13 +1299,13 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
       const player = new AmpStoryPlayer(win, playerEl);
 
       await player.load();
-      await nextTick();
+      await macroTask();
 
       const sendRequestSpy = env.sandbox.spy(fakeMessaging, 'sendRequest');
 
       player.show('', 'page-2');
 
-      await nextTick();
+      await macroTask();
 
       expect(sendRequestSpy).to.have.been.calledWith('selectPage', {
         'id': 'page-2',
@@ -1264,7 +1320,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
       const player = new AmpStoryPlayer(win, playerEl);
 
       await player.load();
-      await nextTick();
+      await macroTask();
 
       const navigationSpy = env.sandbox.spy();
       playerEl.addEventListener('navigation', navigationSpy);
@@ -1289,7 +1345,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
       const player = new AmpStoryPlayer(win, playerEl);
 
       await player.load();
-      await nextTick();
+      await macroTask();
 
       const navigationSpy = env.sandbox.spy();
       playerEl.addEventListener('navigation', navigationSpy);
@@ -1313,7 +1369,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
       const player = new AmpStoryPlayer(win, playerEl);
 
       await player.load();
-      await nextTick();
+      await macroTask();
 
       const navigationSpy = env.sandbox.spy();
       playerEl.addEventListener('navigation', navigationSpy);
@@ -1338,7 +1394,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
       const player = new AmpStoryPlayer(win, playerEl);
 
       await player.load();
-      await nextTick();
+      await macroTask();
 
       const navigationSpy = env.sandbox.spy();
       playerEl.addEventListener('navigation', navigationSpy);
@@ -1361,7 +1417,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
       const player = new AmpStoryPlayer(win, playerEl);
 
       await player.load();
-      await nextTick();
+      await macroTask();
 
       const spy = env.sandbox.spy();
       playerEl.addEventListener('amp-story-muted-state', spy);
@@ -1369,7 +1425,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
       const fakeData = {state: 'MUTED_STATE', value: false};
       fireHandler['documentStateUpdate']('documentStateUpdate', fakeData);
 
-      await nextTick();
+      await macroTask();
 
       expect(spy).to.have.been.calledWithMatch({
         type: 'amp-story-muted-state',
@@ -1386,7 +1442,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
       const player = new AmpStoryPlayer(win, playerEl);
 
       await player.load();
-      await nextTick();
+      await macroTask();
 
       const spy = env.sandbox.spy();
       playerEl.addEventListener('amp-story-muted-state', spy);
@@ -1394,7 +1450,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
       const fakeData = {state: 'MUTED_STATE', value: true};
       fireHandler['documentStateUpdate']('documentStateUpdate', fakeData);
 
-      await nextTick();
+      await macroTask();
 
       expect(spy).to.have.been.calledWithMatch({
         type: 'amp-story-muted-state',
@@ -1411,7 +1467,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
       const player = new AmpStoryPlayer(win, playerEl);
 
       await player.load();
-      await nextTick();
+      await macroTask();
 
       const navigationSpy = env.sandbox.spy();
       playerEl.addEventListener('storyNavigation', navigationSpy);
@@ -1420,7 +1476,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
       const fakeData = {state: 'CURRENT_PAGE_ID', value: 'page-2'};
       fireHandler['documentStateUpdate']('documentStateUpdate', fakeData);
 
-      await nextTick();
+      await macroTask();
 
       expect(navigationSpy).to.have.been.calledWithMatch({
         type: 'storyNavigation',
@@ -1439,7 +1495,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
       const player = new AmpStoryPlayer(win, playerEl);
 
       await player.load();
-      await nextTick();
+      await macroTask();
 
       player.go(1, 0, {animate: false});
 
@@ -1459,7 +1515,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
       const player = new AmpStoryPlayer(win, playerEl);
 
       await player.load();
-      await nextTick();
+      await macroTask();
 
       player.go(1, 0, {animate: true});
 
@@ -1479,7 +1535,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
       const player = new AmpStoryPlayer(win, playerEl);
 
       await player.load();
-      await nextTick();
+      await macroTask();
 
       player.go(1, 0, {animate: false});
 
@@ -1525,7 +1581,7 @@ describes.realWin('AmpStoryPlayer', {amp: false}, (env) => {
       const sendRequestSpy = env.sandbox.spy(fakeMessaging, 'sendRequest');
 
       win.dispatchEvent(createCustomEvent(win, 'resize', null));
-      await nextTick();
+      await macroTask();
 
       expect(sendRequestSpy).to.have.been.calledWith('onDocumentState', {
         'state': 'UI_STATE',
diff --git a/test/unit/test-ampdoc.js b/test/unit/test-ampdoc.js
index 4ae8484fcb78..43ddeb43a19f 100644
--- a/test/unit/test-ampdoc.js
+++ b/test/unit/test-ampdoc.js
@@ -2,7 +2,7 @@ import {Signals} from '#core/data-structures/signals';
 import * as docready from '#core/document/ready';
 import * as dom from '#core/dom';
 import {
-  ShadowDomVersion,
+  ShadowDomVersion_Enum,
   getShadowDomSupportedVersion,
   isShadowDomSupported,
   setShadowDomSupportedVersionForTesting,
@@ -111,7 +111,7 @@ describes.realWin('AmpDocService', {}, (env) => {
         host = doc.createElement('div');
         setShadowDomSupportedVersionForTesting(undefined);
         if (isShadowDomSupported()) {
-          if (getShadowDomSupportedVersion() == ShadowDomVersion.V1) {
+          if (getShadowDomSupportedVersion() == ShadowDomVersion_Enum.V1) {
             shadowRoot = host.attachShadow({mode: 'open'});
           } else {
             shadowRoot = host.createShadowRoot();
@@ -165,7 +165,7 @@ describes.realWin('AmpDocService', {}, (env) => {
       host = doc.createElement('div');
       setShadowDomSupportedVersionForTesting(undefined);
       if (isShadowDomSupported()) {
-        if (getShadowDomSupportedVersion() == ShadowDomVersion.V1) {
+        if (getShadowDomSupportedVersion() == ShadowDomVersion_Enum.V1) {
           shadowRoot = host.attachShadow({mode: 'open'});
         } else {
           shadowRoot = host.createShadowRoot();
@@ -275,7 +275,7 @@ describes.realWin('AmpDocService', {}, (env) => {
 
       let shadowRoot2;
       if (isShadowDomSupported()) {
-        if (getShadowDomSupportedVersion() == ShadowDomVersion.V1) {
+        if (getShadowDomSupportedVersion() == ShadowDomVersion_Enum.V1) {
           shadowRoot2 = host2.attachShadow({mode: 'open'});
         } else {
           shadowRoot2 = host2.createShadowRoot();
@@ -305,7 +305,7 @@ describes.realWin('AmpDocService', {}, (env) => {
       host = doc.createElement('div');
       setShadowDomSupportedVersionForTesting(undefined);
       if (isShadowDomSupported()) {
-        if (getShadowDomSupportedVersion() == ShadowDomVersion.V1) {
+        if (getShadowDomSupportedVersion() == ShadowDomVersion_Enum.V1) {
           shadowRoot = host.attachShadow({mode: 'open'});
         } else {
           shadowRoot = host.createShadowRoot();
@@ -401,7 +401,7 @@ describes.realWin('AmpDocService', {}, (env) => {
 
       let shadowRoot2;
       if (isShadowDomSupported()) {
-        if (getShadowDomSupportedVersion() == ShadowDomVersion.V1) {
+        if (getShadowDomSupportedVersion() == ShadowDomVersion_Enum.V1) {
           shadowRoot2 = host2.attachShadow({mode: 'open'});
         } else {
           shadowRoot2 = host2.createShadowRoot();
@@ -439,7 +439,13 @@ describes.sandboxed('AmpDoc.visibilityState', {}, (env) => {
       addEventListener: env.sandbox.spy(),
       removeEventListener: env.sandbox.spy(),
     };
-    win = {document: doc};
+    win = {
+      document: doc,
+      performance: {
+        now: performance.now,
+        timeOrigin: 1,
+      },
+    };
 
     childDoc = {
       body: null,
@@ -447,7 +453,13 @@ describes.sandboxed('AmpDoc.visibilityState', {}, (env) => {
       addEventListener: env.sandbox.spy(),
       removeEventListener: env.sandbox.spy(),
     };
-    childWin = {document: childDoc};
+    childWin = {
+      document: childDoc,
+      performance: {
+        now: performance.now,
+        timeOrigin: 2,
+      },
+    };
 
     top = new AmpDocSingle(win);
     embedSameWindow = new AmpDocFie(win, EMBED_URL, top);
@@ -524,6 +536,37 @@ describes.sandboxed('AmpDoc.visibilityState', {}, (env) => {
     expect(disposableService.dispose).to.be.calledOnce;
   });
 
+  describe('firstVisibleTime', () => {
+    it('should prefer timeOrigin doc initialized to visible', () => {
+      // Move page load time to 2021-01-01T12:30Z
+      win.performance.timeOrigin = 1609504200000;
+      // Page has been active for 30min
+      env.sandbox.stub(win.performance, 'now').returns(30 * 60 * 1000);
+      // Move epoch time to 2021-01-01T13:00Z
+      clock.tick(1609506000000 - Date.now());
+      top = new AmpDocSingle(win, {visibilityState: 'visible'});
+
+      expect(top.getFirstVisibleTime()).to.equal(win.performance.timeOrigin);
+      expect(top.getFirstVisibleTime()).not.to.equal(Date.now());
+    });
+
+    it('should wait for visible', () => {
+      // Move page load time to 2021-01-01T12:30Z
+      win.performance.timeOrigin = 1609504200000;
+      // Page has been active for 30min
+      env.sandbox.stub(win.performance, 'now').returns(30 * 60 * 1000);
+      // Move epoch time to 2021-01-01T13:00Z
+      clock.tick(1609506000000 - Date.now());
+      top = new AmpDocSingle(win, {visibilityState: 'prerender'});
+
+      expect(top.getFirstVisibleTime()).to.equal(null);
+
+      top.overrideVisibilityState('visible');
+      expect(top.getFirstVisibleTime()).to.equal(1609506000000);
+      expect(top.getFirstVisibleTime()).to.equal(Date.now());
+    });
+  });
+
   it('should be visible by default', () => {
     expect(top.getVisibilityState()).to.equal('visible');
     expect(embedSameWindow.getVisibilityState()).to.equal('visible');
@@ -537,13 +580,13 @@ describes.sandboxed('AmpDoc.visibilityState', {}, (env) => {
 
     expect(top.getFirstVisibleTime()).to.equal(1);
     expect(embedSameWindow.getFirstVisibleTime()).to.equal(1);
-    expect(embedOtherWindow.getFirstVisibleTime()).to.equal(1);
-    expect(embedChild.getFirstVisibleTime()).to.equal(1);
+    expect(embedOtherWindow.getFirstVisibleTime()).to.equal(2);
+    expect(embedChild.getFirstVisibleTime()).to.equal(2);
 
     expect(top.getLastVisibleTime()).to.equal(1);
     expect(embedSameWindow.getLastVisibleTime()).to.equal(1);
-    expect(embedOtherWindow.getLastVisibleTime()).to.equal(1);
-    expect(embedChild.getLastVisibleTime()).to.equal(1);
+    expect(embedOtherWindow.getLastVisibleTime()).to.equal(2);
+    expect(embedChild.getLastVisibleTime()).to.equal(2);
 
     return Promise.all([
       top.whenFirstVisible(),
@@ -635,15 +678,19 @@ describes.sandboxed('AmpDoc.visibilityState', {}, (env) => {
     expect(embedOtherWindow.isVisible()).to.be.true;
     expect(embedChild.isVisible()).to.be.true;
 
-    expect(top.getFirstVisibleTime()).to.equal(2);
-    expect(embedSameWindow.getFirstVisibleTime()).to.equal(2);
-    expect(embedOtherWindow.getFirstVisibleTime()).to.equal(2);
-    expect(embedChild.getFirstVisibleTime()).to.equal(2);
+    const epoch = win.performance.timeOrigin + performance.now();
+    const childEpoch = childWin.performance.timeOrigin + performance.now();
+    expect(epoch).to.equal(3);
+    expect(childEpoch).to.equal(4);
+    expect(top.getFirstVisibleTime()).to.equal(epoch);
+    expect(embedSameWindow.getFirstVisibleTime()).to.equal(epoch);
+    expect(embedOtherWindow.getFirstVisibleTime()).to.equal(childEpoch);
+    expect(embedChild.getFirstVisibleTime()).to.equal(childEpoch);
 
-    expect(top.getLastVisibleTime()).to.equal(2);
-    expect(embedSameWindow.getLastVisibleTime()).to.equal(2);
-    expect(embedOtherWindow.getLastVisibleTime()).to.equal(2);
-    expect(embedChild.getLastVisibleTime()).to.equal(2);
+    expect(top.getLastVisibleTime()).to.equal(epoch);
+    expect(embedSameWindow.getLastVisibleTime()).to.equal(epoch);
+    expect(embedOtherWindow.getLastVisibleTime()).to.equal(childEpoch);
+    expect(embedChild.getLastVisibleTime()).to.equal(childEpoch);
 
     return Promise.all([
       top.whenFirstVisible(),
@@ -683,8 +730,10 @@ describes.sandboxed('AmpDoc.visibilityState', {}, (env) => {
     expect(embedOtherWindow.getVisibilityState()).to.equal('visible');
     expect(embedChild.getVisibilityState()).to.equal('visible');
 
+    const epoch = win.performance.timeOrigin + performance.now();
+    expect(epoch).to.equal(4);
     expect(top.getFirstVisibleTime()).to.equal(1);
-    expect(top.getLastVisibleTime()).to.equal(3);
+    expect(top.getLastVisibleTime()).to.equal(epoch);
   });
 
   it('should update visibility in children', () => {
@@ -700,10 +749,10 @@ describes.sandboxed('AmpDoc.visibilityState', {}, (env) => {
     expect(top.getLastVisibleTime()).to.equal(1);
     expect(embedSameWindow.getFirstVisibleTime()).to.equal(1);
     expect(embedSameWindow.getLastVisibleTime()).to.equal(1);
-    expect(embedOtherWindow.getFirstVisibleTime()).to.equal(1);
-    expect(embedOtherWindow.getLastVisibleTime()).to.equal(1);
-    expect(embedChild.getFirstVisibleTime()).to.equal(1);
-    expect(embedChild.getLastVisibleTime()).to.equal(1);
+    expect(embedOtherWindow.getFirstVisibleTime()).to.equal(2);
+    expect(embedOtherWindow.getLastVisibleTime()).to.equal(2);
+    expect(embedChild.getFirstVisibleTime()).to.equal(2);
+    expect(embedChild.getLastVisibleTime()).to.equal(2);
 
     clock.tick(1);
     embedOtherWindow.overrideVisibilityState('visible');
@@ -715,10 +764,10 @@ describes.sandboxed('AmpDoc.visibilityState', {}, (env) => {
     expect(top.getLastVisibleTime()).to.equal(1);
     expect(embedSameWindow.getFirstVisibleTime()).to.equal(1);
     expect(embedSameWindow.getLastVisibleTime()).to.equal(1);
-    expect(embedOtherWindow.getFirstVisibleTime()).to.equal(1);
-    expect(embedOtherWindow.getLastVisibleTime()).to.equal(3);
-    expect(embedChild.getFirstVisibleTime()).to.equal(1);
-    expect(embedChild.getLastVisibleTime()).to.equal(3);
+    expect(embedOtherWindow.getFirstVisibleTime()).to.equal(2);
+    expect(embedOtherWindow.getLastVisibleTime()).to.equal(5);
+    expect(embedChild.getFirstVisibleTime()).to.equal(2);
+    expect(embedChild.getLastVisibleTime()).to.equal(5);
   });
 
   it('should update when document visibility changes', () => {
@@ -852,7 +901,10 @@ describes.realWin('AmpDocSingle', {}, (env) => {
       addEventListener: function () {},
       removeEventListener: function () {},
     };
-    const win = {document: doc};
+    const win = {
+      document: doc,
+      performance: env.win.performance,
+    };
 
     let bodyCallback;
     env.sandbox.stub(dom, 'waitForBodyOpenPromise').callsFake(() => {
diff --git a/test/unit/test-base-element.js b/test/unit/test-base-element.js
index 8badd41ceaac..43722918622b 100644
--- a/test/unit/test-base-element.js
+++ b/test/unit/test-base-element.js
@@ -1,5 +1,5 @@
 import {DEFAULT_ACTION} from '#core/constants/action-constants';
-import {LayoutPriority} from '#core/dom/layout';
+import {LayoutPriority_Enum} from '#core/dom/layout';
 import {layoutRectLtwh} from '#core/dom/layout/rect';
 
 import {Services} from '#service';
@@ -33,7 +33,7 @@ describes.realWin('BaseElement', {amp: true}, (env) => {
       resources,
       'updateLayoutPriority'
     );
-    element.updateLayoutPriority(LayoutPriority.METADATA);
+    element.updateLayoutPriority(LayoutPriority_Enum.METADATA);
     expect(updateLayoutPriorityStub).to.be.calledOnce;
   });
 
diff --git a/test/unit/test-cache-cid-api.js b/test/unit/test-cache-cid-api.js
index 916163a45bfa..6f5641d3751f 100644
--- a/test/unit/test-cache-cid-api.js
+++ b/test/unit/test-cache-cid-api.js
@@ -51,57 +51,115 @@ describes.realWin('cacheCidApi', {amp: true}, (env) => {
     });
   });
 
-  // TODO(amphtml, #25621): Cannot find atob / btoa on Safari.
-  describe
-    .configure()
-    .skipSafari()
-    .run('getScopedCid', () => {
-      beforeEach(() => {
-        viewerMock.isCctEmbedded.returns(true);
-        viewerMock.isProxyOrigin.returns(true);
+  describe('getScopedCid', () => {
+    beforeEach(() => {
+      viewerMock.isCctEmbedded.returns(true);
+      viewerMock.isProxyOrigin.returns(true);
+    });
+
+    it('should use client ID API from api if everything great', () => {
+      fetchJsonStub.returns(
+        Promise.resolve({
+          json: () => {
+            return Promise.resolve({
+              publisherClientId: 'publisher-client-id-from-cache',
+            });
+          },
+        })
+      );
+      return api.getScopedCid('AMP_ECID_GOOGLE').then((cid) => {
+        expect(cid).to.equal(
+          'amp-mJW1ZjoviqBJydzRI8KnitWEpqyhQqDegGCl' +
+            'rvvfkCif_N9oYLdZEB976uJDhYgL'
+        );
+        expect(fetchJsonStub).to.be.calledWith(
+          'https://ampcid.google.com/v1/cache:getClientId?key=AIzaSyDKtqGxnoeIqVM33Uf7hRSa3GJxuzR7mLc',
+          {
+            method: 'POST',
+            ampCors: false,
+            credentials: 'include',
+            mode: 'cors',
+            body: {
+              publisherOrigin: 'about:srcdoc',
+            },
+          }
+        );
       });
+    });
 
-      it('should use client ID API from api if everything great', () => {
-        fetchJsonStub.returns(
-          Promise.resolve({
-            json: () => {
-              return Promise.resolve({
-                publisherClientId: 'publisher-client-id-from-cache',
-              });
+    it('should return null if opted out', () => {
+      fetchJsonStub.returns(
+        Promise.resolve({
+          json: () => {
+            return Promise.resolve({
+              optOut: true,
+            });
+          },
+        })
+      );
+      return api.getScopedCid('AMP_ECID_GOOGLE').then((cid) => {
+        expect(cid).to.equal(null);
+        expect(fetchJsonStub).to.be.calledWith(
+          'https://ampcid.google.com/v1/cache:getClientId?key=AIzaSyDKtqGxnoeIqVM33Uf7hRSa3GJxuzR7mLc',
+          {
+            method: 'POST',
+            ampCors: false,
+            credentials: 'include',
+            mode: 'cors',
+            body: {
+              publisherOrigin: 'about:srcdoc',
             },
-          })
+          }
+        );
+      });
+    });
+
+    it('should try alternative url if API provides', () => {
+      fetchJsonStub.onCall(0).returns(
+        Promise.resolve({
+          json: () => {
+            return Promise.resolve({
+              alternateUrl: 'https://ampcid.google.co.uk/v1/cache:getClientId',
+            });
+          },
+        })
+      );
+      fetchJsonStub.onCall(1).returns(
+        Promise.resolve({
+          json: () => {
+            return Promise.resolve({
+              publisherClientId: 'publisher-client-id-from-cache',
+            });
+          },
+        })
+      );
+      return api.getScopedCid('AMP_ECID_GOOGLE').then((cid) => {
+        expect(cid).to.equal(
+          'amp-mJW1ZjoviqBJydzRI8KnitWEpqyhQqDegGCl' +
+            'rvvfkCif_N9oYLdZEB976uJDhYgL'
+        );
+        expect(fetchJsonStub.getCall(1).args[0]).to.equal(
+          'https://ampcid.google.co.uk/v1/cache:getClientId?key=AIzaSyDKtqGxnoeIqVM33Uf7hRSa3GJxuzR7mLc'
         );
-        return api.getScopedCid('AMP_ECID_GOOGLE').then((cid) => {
-          expect(cid).to.equal(
-            'amp-mJW1ZjoviqBJydzRI8KnitWEpqyhQqDegGCl' +
-              'rvvfkCif_N9oYLdZEB976uJDhYgL'
-          );
-          expect(fetchJsonStub).to.be.calledWith(
-            'https://ampcid.google.com/v1/cache:getClientId?key=AIzaSyDKtqGxnoeIqVM33Uf7hRSa3GJxuzR7mLc',
-            {
-              method: 'POST',
-              ampCors: false,
-              credentials: 'include',
-              mode: 'cors',
-              body: {
-                publisherOrigin: 'about:srcdoc',
-              },
-            }
-          );
-        });
       });
+    });
 
-      it('should return null if opted out', () => {
-        fetchJsonStub.returns(
-          Promise.resolve({
+    it('should fail if the request times out', () => {
+      expectAsyncConsoleError(/fetchCidTimeout​​​/);
+      fetchJsonStub.callsFake(() => {
+        return new Promise((resolve, unused) => {
+          clock.setTimeout(resolve, 35000, {
             json: () => {
               return Promise.resolve({
-                optOut: true,
+                publisherClientId: 'publisher-client-id-from-cache',
               });
             },
-          })
-        );
-        return api.getScopedCid('AMP_ECID_GOOGLE').then((cid) => {
+          });
+        });
+      });
+      const response = api
+        .getScopedCid('AMP_ECID_GOOGLE')
+        .then((cid) => {
           expect(cid).to.equal(null);
           expect(fetchJsonStub).to.be.calledWith(
             'https://ampcid.google.com/v1/cache:getClientId?key=AIzaSyDKtqGxnoeIqVM33Uf7hRSa3GJxuzR7mLc',
@@ -115,73 +173,10 @@ describes.realWin('cacheCidApi', {amp: true}, (env) => {
               },
             }
           );
-        });
-      });
-
-      it('should try alternative url if API provides', () => {
-        fetchJsonStub.onCall(0).returns(
-          Promise.resolve({
-            json: () => {
-              return Promise.resolve({
-                alternateUrl:
-                  'https://ampcid.google.co.uk/v1/cache:getClientId',
-              });
-            },
-          })
-        );
-        fetchJsonStub.onCall(1).returns(
-          Promise.resolve({
-            json: () => {
-              return Promise.resolve({
-                publisherClientId: 'publisher-client-id-from-cache',
-              });
-            },
-          })
-        );
-        return api.getScopedCid('AMP_ECID_GOOGLE').then((cid) => {
-          expect(cid).to.equal(
-            'amp-mJW1ZjoviqBJydzRI8KnitWEpqyhQqDegGCl' +
-              'rvvfkCif_N9oYLdZEB976uJDhYgL'
-          );
-          expect(fetchJsonStub.getCall(1).args[0]).to.equal(
-            'https://ampcid.google.co.uk/v1/cache:getClientId?key=AIzaSyDKtqGxnoeIqVM33Uf7hRSa3GJxuzR7mLc'
-          );
-        });
-      });
-
-      it('should fail if the request times out', () => {
-        expectAsyncConsoleError(/fetchCidTimeout​​​/);
-        fetchJsonStub.callsFake(() => {
-          return new Promise((resolve, unused) => {
-            clock.setTimeout(resolve, 35000, {
-              json: () => {
-                return Promise.resolve({
-                  publisherClientId: 'publisher-client-id-from-cache',
-                });
-              },
-            });
-          });
-        });
-        const response = api
-          .getScopedCid('AMP_ECID_GOOGLE')
-          .then((cid) => {
-            expect(cid).to.equal(null);
-            expect(fetchJsonStub).to.be.calledWith(
-              'https://ampcid.google.com/v1/cache:getClientId?key=AIzaSyDKtqGxnoeIqVM33Uf7hRSa3GJxuzR7mLc',
-              {
-                method: 'POST',
-                ampCors: false,
-                credentials: 'include',
-                mode: 'cors',
-                body: {
-                  publisherOrigin: 'about:srcdoc',
-                },
-              }
-            );
-          })
-          .catch(() => {});
-        clock.tick(30000);
-        return response;
-      });
+        })
+        .catch(() => {});
+      clock.tick(30000);
+      return response;
     });
+  });
 });
diff --git a/test/unit/test-chunk.js b/test/unit/test-chunk.js
index 5e1c14a5a266..30cece631ad3 100644
--- a/test/unit/test-chunk.js
+++ b/test/unit/test-chunk.js
@@ -161,40 +161,37 @@ describes.sandboxed('chunk2', {}, () => {
         basicTests(env);
       });
 
-      describe
-        .configure()
-        .skip(() => !('onunhandledrejection' in window))
-        .run('error handling', () => {
-          let fakeWin;
-          let done;
-
-          function onReject(event) {
-            expect(event.reason.message).to.match(/test async/);
-            done();
-          }
+      describe('error handling', () => {
+        let fakeWin;
+        let done;
 
-          beforeEach(() => {
-            fakeWin = env.win;
-            const {ampdoc} = env;
-            env.sandbox.stub(ampdoc, 'isVisible').callsFake(() => {
-              return true;
-            });
-            window.addEventListener('unhandledrejection', onReject);
-          });
+        function onReject(event) {
+          expect(event.reason.message).to.match(/test async/);
+          done();
+        }
 
-          afterEach(() => {
-            window.removeEventListener('unhandledrejection', onReject);
+        beforeEach(() => {
+          fakeWin = env.win;
+          const {ampdoc} = env;
+          env.sandbox.stub(ampdoc, 'isVisible').callsFake(() => {
+            return true;
           });
+          window.addEventListener('unhandledrejection', onReject);
+        });
 
-          it('should proceed on error and rethrowAsync', (d) => {
-            startupChunk(fakeWin.document, () => {
-              throw new Error('test async');
-            });
-            startupChunk(fakeWin.document, () => {
-              done = d;
-            });
+        afterEach(() => {
+          window.removeEventListener('unhandledrejection', onReject);
+        });
+
+        it('should proceed on error and rethrowAsync', (d) => {
+          startupChunk(fakeWin.document, () => {
+            throw new Error('test async');
+          });
+          startupChunk(fakeWin.document, () => {
+            done = d;
           });
         });
+      });
 
       describe('invisible', () => {
         beforeEach(() => {
@@ -436,31 +433,27 @@ describes.sandboxed('long tasks', {}, () => {
         });
       });
 
-      // Skipping Firefox due to issues with the promise ordering in
-      // the async-await polyfill that this test relies on.
-      it.configure()
-        .skipFirefox()
-        .run('should not issue a macro task after having been idle', (done) => {
-          (async function () {
-            startupChunk(
-              env.win.document,
-              complete('1', false),
-              /* make body visible */ true
-            );
-            // Unwind the promise queue so that subsequent invocations
-            // are scheduled into an empty task queue.
-            for (let i = 0; i < 100; i++) {
-              await Promise.resolve();
-            }
-            expect(progress).to.equal('1');
-            complete('2', true)();
-            startupChunk(env.win.document, () => {
-              expect(postMessageCalls).to.equal(0);
-              expect(progress).to.equal('12');
-              done();
-            });
-          })();
-        });
+      it('should not issue a macro task after having been idle', (done) => {
+        (async function () {
+          startupChunk(
+            env.win.document,
+            complete('1', false),
+            /* make body visible */ true
+          );
+          // Unwind the promise queue so that subsequent invocations
+          // are scheduled into an empty task queue.
+          for (let i = 0; i < 100; i++) {
+            await Promise.resolve();
+          }
+          expect(progress).to.equal('1');
+          complete('2', true)();
+          startupChunk(env.win.document, () => {
+            expect(postMessageCalls).to.equal(0);
+            expect(progress).to.equal('12');
+            done();
+          });
+        })();
+      });
     }
   );
 });
diff --git a/test/unit/test-cid.js b/test/unit/test-cid.js
index cb8638a6d6d7..d60bd1cc8ddb 100644
--- a/test/unit/test-cid.js
+++ b/test/unit/test-cid.js
@@ -15,6 +15,7 @@ import {installPlatformService} from '#service/platform-impl';
 import {installTimerService} from '#service/timer-impl';
 import {installViewerServiceForDoc} from '#service/viewer-impl';
 
+import {FakePerformance} from '#testing/fake-dom';
 import {macroTask} from '#testing/helpers';
 import {stubServiceForDoc} from '#testing/helpers/service';
 
@@ -97,6 +98,7 @@ describes.sandboxed('cid', {}, (env) => {
       clearTimeout: window.clearTimeout,
       Math: window.Math,
       Promise: window.Promise,
+      performance: new FakePerformance(window),
     };
     fakeWin.document.defaultView = fakeWin;
     installDocService(fakeWin, /* isSingleDoc */ true);
@@ -152,632 +154,613 @@ describes.sandboxed('cid', {}, (env) => {
     window.localStorage.removeItem('amp-cid');
   });
 
-  // TODO(amphtml, #25621): Cannot find atob / btoa on Safari.
-  describe
-    .configure()
-    .skipSafari()
-    .run('with real crypto', () => {
-      it('should hash domain name and scope', () => {
-        // domain name: 'http://www.origin.com'
-        // scope: 'custom-cid-scope'
-        return compare(
-          'custom-cid-scope',
-          'tSSEaSFEU2-vkEO0Mb9HZejJui-npGRhXf3fD3H3iWeYQrjkQOTaRYdPyFTogNXA'
-        );
-      });
+  describe('with real crypto', () => {
+    it('should hash domain name and scope', () => {
+      // domain name: 'http://www.origin.com'
+      // scope: 'custom-cid-scope'
+      return compare(
+        'custom-cid-scope',
+        'tSSEaSFEU2-vkEO0Mb9HZejJui-npGRhXf3fD3H3iWeYQrjkQOTaRYdPyFTogNXA'
+      );
+    });
 
-      it('should hash domain name and scope', () => {
-        fakeWin.location.href =
-          'https://cdn.ampproject.org/v/www.DIFFERENT.com/foo/?f=0';
-        // domain name: 'http://www.different.com'
-        // scope: 'another-custom-cid-scope'
-        return compare(
-          'another-custom-cid-scope',
-          '25lYHB6Luck8Z5ddpiB-FBbj2pa9zx3WdnJlZVgFneJRcFsDT3kIoPoi6k6-oxrB'
-        );
-      });
+    it('should hash domain name and scope', () => {
+      fakeWin.location.href =
+        'https://cdn.ampproject.org/v/www.DIFFERENT.com/foo/?f=0';
+      // domain name: 'http://www.different.com'
+      // scope: 'another-custom-cid-scope'
+      return compare(
+        'another-custom-cid-scope',
+        '25lYHB6Luck8Z5ddpiB-FBbj2pa9zx3WdnJlZVgFneJRcFsDT3kIoPoi6k6-oxrB'
+      );
     });
+  });
 
-  // TODO(amphtml, #25621): Cannot find atob / btoa on Safari.
-  describe
-    .configure()
-    .skipSafari()
-    .run('with crypto stub', () => {
-      const doesNotProvideError = '[CID] Viewer does not provide cap=cid';
-      const invalidFormatError = '[CID] invalid cid format';
-      beforeEach(() => {
-        crypto.sha384Base64 = (val) => {
-          if (val instanceof Uint8Array) {
-            val = '[' + Array.apply([], val).join(',') + ']';
-          }
-
-          return Promise.resolve('sha384(' + val + ')');
-        };
-      });
+  describe('with crypto stub', () => {
+    const doesNotProvideError = '[CID] Viewer does not provide cap=cid';
+    const invalidFormatError = '[CID] invalid cid format';
+    beforeEach(() => {
+      crypto.sha384Base64 = (val) => {
+        if (val instanceof Uint8Array) {
+          val = '[' + Array.apply([], val).join(',') + ']';
+        }
 
-      it('should depend on external id e1', () => {
-        clock.tick(123);
-        return compare(
-          'e1',
-          'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come1)'
-        ).then(() => {
-          expect(storage['amp-cid']).to.be.a('string');
-          const stored = JSON.parse(storage['amp-cid']);
-          expect(stored.cid).to.equal(
-            'sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])'
-          );
-          expect(stored.time).to.equal(123);
-        });
-      });
+        return Promise.resolve('sha384(' + val + ')');
+      };
+    });
 
-      it('should depend on external id e2', () => {
-        return compare(
-          'e2',
-          'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)'
+    it('should depend on external id e1', () => {
+      clock.tick(123);
+      return compare(
+        'e1',
+        'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come1)'
+      ).then(() => {
+        expect(storage['amp-cid']).to.be.a('string');
+        const stored = JSON.parse(storage['amp-cid']);
+        expect(stored.cid).to.equal(
+          'sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])'
         );
+        expect(stored.time).to.equal(123);
       });
+    });
 
-      it('should depend on domain', () => {
-        fakeWin.location.href =
-          'https://cdn.ampproject.org/v/www.DIFFERENT.com/foo/?f=0';
-        return compare(
-          'e2',
-          'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.different.come2)'
-        );
-      });
+    it('should depend on external id e2', () => {
+      return compare(
+        'e2',
+        'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)'
+      );
+    });
 
-      it('should fallback to cookie value on custom domain.', () => {
-        fakeWin.location.href = 'https://abc.org/v/www.DIFFERENT.com/foo/?f=0';
-        fakeWin.document.cookie = 'cookie_name=12345;scope_name=54321;';
-        return cid
-          .get(
-            {
-              scope: 'scope_name',
-            },
-            hasConsent
-          )
-          .then((c) => {
-            expect(c).to.equal('54321');
-          });
-      });
+    it('should depend on domain', () => {
+      fakeWin.location.href =
+        'https://cdn.ampproject.org/v/www.DIFFERENT.com/foo/?f=0';
+      return compare(
+        'e2',
+        'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.different.come2)'
+      );
+    });
 
-      it('should fallback to cookie of given name on custom domain.', () => {
-        fakeWin.location.href = 'https://abc.org/v/www.DIFFERENT.com/foo/?f=0';
-        fakeWin.document.cookie = 'cookie_name=12345;scope_name=54321;';
-        return cid
-          .get(
-            {
-              scope: 'scope_name',
-              cookieName: 'cookie_name',
-            },
-            hasConsent
-          )
-          .then((c) => {
-            expect(c).to.equal('12345');
-          });
-      });
+    it('should fallback to cookie value on custom domain.', () => {
+      fakeWin.location.href = 'https://abc.org/v/www.DIFFERENT.com/foo/?f=0';
+      fakeWin.document.cookie = 'cookie_name=12345;scope_name=54321;';
+      return cid
+        .get(
+          {
+            scope: 'scope_name',
+          },
+          hasConsent
+        )
+        .then((c) => {
+          expect(c).to.equal('54321');
+        });
+    });
 
-      it(
-        'should depend fall back to cookies on custom ' +
-          'domain and not create a cookie',
-        () => {
-          fakeWin.location.href =
-            'https://some.domain/v/www.DIFFERENT.com/foo/?f=0';
-          fakeWin.document.cookie = 'cookie_name=12345;';
-          return compare('other_cookie', null);
-        }
-      );
+    it('should fallback to cookie of given name on custom domain.', () => {
+      fakeWin.location.href = 'https://abc.org/v/www.DIFFERENT.com/foo/?f=0';
+      fakeWin.document.cookie = 'cookie_name=12345;scope_name=54321;';
+      return cid
+        .get(
+          {
+            scope: 'scope_name',
+            cookieName: 'cookie_name',
+          },
+          hasConsent
+        )
+        .then((c) => {
+          expect(c).to.equal('12345');
+        });
+    });
 
-      it('should produce golden value', () => {
-        crypto.sha384Base64 = new Crypto(fakeWin).sha384Base64;
-        return compare(
-          'e2',
-          'q0pPfZTWGruPrtURDJHexzs-MgOkt9SJAsAZodzr8tx8hKv8BS62AVpbttaFX8fK'
-        );
-      });
+    it(
+      'should depend fall back to cookies on custom ' +
+        'domain and not create a cookie',
+      () => {
+        fakeWin.location.href =
+          'https://some.domain/v/www.DIFFERENT.com/foo/?f=0';
+        fakeWin.document.cookie = 'cookie_name=12345;';
+        return compare('other_cookie', null);
+      }
+    );
 
-      it('should be stable with respect to a saved seed', () => {
-        const expected =
-          'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)';
+    it('should produce golden value', () => {
+      crypto.sha384Base64 = new Crypto(fakeWin).sha384Base64;
+      return compare(
+        'e2',
+        'q0pPfZTWGruPrtURDJHexzs-MgOkt9SJAsAZodzr8tx8hKv8BS62AVpbttaFX8fK'
+      );
+    });
+
+    it('should be stable with respect to a saved seed', () => {
+      const expected =
+        'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)';
+      return compare('e2', expected).then(() => {
+        seed = 2;
         return compare('e2', expected).then(() => {
-          seed = 2;
-          return compare('e2', expected).then(() => {
-            storage['amp-cid'] = undefined;
-            removeMemoryCacheOfCid();
-            return compare(
-              'e2',
-              'sha384(sha384([' +
-                // 2 because we set the seed to 2
-                '2' +
-                ',2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)'
-            );
-          });
+          storage['amp-cid'] = undefined;
+          removeMemoryCacheOfCid();
+          return compare(
+            'e2',
+            'sha384(sha384([' +
+              // 2 because we set the seed to 2
+              '2' +
+              ',2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)'
+          );
         });
       });
+    });
 
-      it('should pick up the cid value from storage', () => {
-        storage['amp-cid'] = JSON.stringify({
-          cid: 'YYY',
-          time: Date.now(),
-        });
-        return compare('e2', 'sha384(YYYhttp://www.origin.come2)');
+    it('should pick up the cid value from storage', () => {
+      storage['amp-cid'] = JSON.stringify({
+        cid: 'YYY',
+        time: Date.now(),
       });
+      return compare('e2', 'sha384(YYYhttp://www.origin.come2)');
+    });
+
+    it('should return empty if opted out', () => {
+      storageGetStub.withArgs('amp-cid-optout').returns(Promise.resolve(true));
 
-      it('should return empty if opted out', () => {
-        storageGetStub
-          .withArgs('amp-cid-optout')
-          .returns(Promise.resolve(true));
+      storage['amp-cid'] = JSON.stringify({
+        cid: 'YYY',
+        time: Date.now(),
+      });
+      return compare('e2', '');
+    });
 
-        storage['amp-cid'] = JSON.stringify({
-          cid: 'YYY',
-          time: Date.now(),
-        });
-        return compare('e2', '');
+    it('should read from viewer storage if embedded', () => {
+      expectAsyncConsoleError(doesNotProvideError);
+      fakeWin.parent = {};
+      const expectedBaseCid = 'from-viewer';
+      viewerStorage = JSON.stringify({
+        time: 0,
+        cid: expectedBaseCid,
       });
+      return Promise.all([
+        compare('e1', `sha384(${expectedBaseCid}http://www.origin.come1)`),
+        compare('e2', `sha384(${expectedBaseCid}http://www.origin.come2)`),
+      ])
+        .then(() => {
+          expect(viewerSendMessageStub).to.be.calledOnce;
+          expect(viewerSendMessageStub).to.be.calledWith('cid');
+          seed = 2;
+          // Ensure it's called only once since we cache it in memory.
+          return compare(
+            'e3',
+            `sha384(${expectedBaseCid}http://www.origin.come3)`
+          );
+        })
+        .then(() => {
+          expect(viewerSendMessageStub).to.be.calledOnce;
+          return expect(cid.baseCid_).to.eventually.equal(expectedBaseCid);
+        });
+    });
 
-      it('should read from viewer storage if embedded', () => {
+    it(
+      'should read from viewer storage if embedded and convert cid to ' +
+        'new format',
+      () => {
         expectAsyncConsoleError(doesNotProvideError);
+        expectAsyncConsoleError(invalidFormatError);
         fakeWin.parent = {};
         const expectedBaseCid = 'from-viewer';
-        viewerStorage = JSON.stringify({
-          time: 0,
-          cid: expectedBaseCid,
-        });
+        // baseCid returned by legacy API
+        viewerStorage = expectedBaseCid;
         return Promise.all([
           compare('e1', `sha384(${expectedBaseCid}http://www.origin.come1)`),
           compare('e2', `sha384(${expectedBaseCid}http://www.origin.come2)`),
-        ])
-          .then(() => {
-            expect(viewerSendMessageStub).to.be.calledOnce;
-            expect(viewerSendMessageStub).to.be.calledWith('cid');
-            seed = 2;
-            // Ensure it's called only once since we cache it in memory.
-            return compare(
-              'e3',
-              `sha384(${expectedBaseCid}http://www.origin.come3)`
-            );
-          })
-          .then(() => {
-            expect(viewerSendMessageStub).to.be.calledOnce;
-            return expect(cid.baseCid_).to.eventually.equal(expectedBaseCid);
-          });
-      });
-
-      it(
-        'should read from viewer storage if embedded and convert cid to ' +
-          'new format',
-        () => {
-          expectAsyncConsoleError(doesNotProvideError);
-          expectAsyncConsoleError(invalidFormatError);
-          fakeWin.parent = {};
-          const expectedBaseCid = 'from-viewer';
-          // baseCid returned by legacy API
-          viewerStorage = expectedBaseCid;
-          return Promise.all([
-            compare('e1', `sha384(${expectedBaseCid}http://www.origin.come1)`),
-            compare('e2', `sha384(${expectedBaseCid}http://www.origin.come2)`),
-          ]).then(() => {
-            expect(viewerSendMessageStub).to.be.calledOnce;
-            expect(viewerSendMessageStub).to.be.calledWith('cid');
-          });
-        }
-      );
-
-      it('should not read from untrusted viewer', () => {
-        fakeWin.parent = {};
-        trustedViewer = false;
-        const viewerBaseCid = 'from-viewer';
-        viewerStorage = JSON.stringify({
-          time: 0,
-          cid: viewerBaseCid,
-        });
-        return Promise.all([
-          compare(
-            'e1',
-            'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come1)'
-          ),
-          compare(
-            'e2',
-            'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)'
-          ),
         ]).then(() => {
-          expect(viewerSendMessageStub).to.not.be.called;
+          expect(viewerSendMessageStub).to.be.calledOnce;
+          expect(viewerSendMessageStub).to.be.calledWith('cid');
         });
-      });
+      }
+    );
 
-      it('should store to viewer storage if embedded', () => {
-        expectAsyncConsoleError(doesNotProvideError, 2);
-        fakeWin.parent = {};
-        const expectedBaseCid = 'sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])';
-        return compare(
+    it('should not read from untrusted viewer', () => {
+      fakeWin.parent = {};
+      trustedViewer = false;
+      const viewerBaseCid = 'from-viewer';
+      viewerStorage = JSON.stringify({
+        time: 0,
+        cid: viewerBaseCid,
+      });
+      return Promise.all([
+        compare(
+          'e1',
+          'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come1)'
+        ),
+        compare(
           'e2',
-          `sha384(${expectedBaseCid}http://www.origin.come2)`
-        )
-          .then(() => {
-            expect(viewerSendMessageStub).to.be.calledWith(
-              'cid',
-              JSON.stringify({
-                time: 0,
-                cid: expectedBaseCid,
-              })
-            );
-            seed = 2;
-            // Ensure it's called only once since we cache it in memory.
-            return compare(
-              'e3',
-              `sha384(${expectedBaseCid}http://www.origin.come3)`
-            );
-          })
-          .then(() => {
-            expect(viewerSendMessageStub).to.be.calledWith(
-              env.sandbox.match.string
-            );
-            return expect(cid.baseCid_).to.eventually.equal(expectedBaseCid);
-          });
+          'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)'
+        ),
+      ]).then(() => {
+        expect(viewerSendMessageStub).to.not.be.called;
       });
+    });
 
-      it('should prefer value in storage if present', () => {
-        fakeWin.parent = {};
-        storage['amp-cid'] = JSON.stringify({
-          cid: 'in-storage',
-          time: Date.now(),
+    it('should store to viewer storage if embedded', () => {
+      expectAsyncConsoleError(doesNotProvideError, 2);
+      fakeWin.parent = {};
+      const expectedBaseCid = 'sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])';
+      return compare('e2', `sha384(${expectedBaseCid}http://www.origin.come2)`)
+        .then(() => {
+          expect(viewerSendMessageStub).to.be.calledWith(
+            'cid',
+            JSON.stringify({
+              time: 0,
+              cid: expectedBaseCid,
+            })
+          );
+          seed = 2;
+          // Ensure it's called only once since we cache it in memory.
+          return compare(
+            'e3',
+            `sha384(${expectedBaseCid}http://www.origin.come3)`
+          );
+        })
+        .then(() => {
+          expect(viewerSendMessageStub).to.be.calledWith(
+            env.sandbox.match.string
+          );
+          return expect(cid.baseCid_).to.eventually.equal(expectedBaseCid);
         });
-        return compare('e2', 'sha384(in-storagehttp://www.origin.come2)');
+    });
+
+    it('should prefer value in storage if present', () => {
+      fakeWin.parent = {};
+      storage['amp-cid'] = JSON.stringify({
+        cid: 'in-storage',
+        time: Date.now(),
       });
+      return compare('e2', 'sha384(in-storagehttp://www.origin.come2)');
+    });
 
-      it('should expire on read after 365 days', () => {
-        const expected =
-          'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)';
+    it('should expire on read after 365 days', () => {
+      const expected =
+        'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)';
+      return compare('e2', expected).then(() => {
+        clock.tick(364 * DAY);
+        seed = 2;
         return compare('e2', expected).then(() => {
-          clock.tick(364 * DAY);
-          seed = 2;
-          return compare('e2', expected).then(() => {
-            clock.tick(365 * DAY + 1);
-            removeMemoryCacheOfCid();
-            return compare(
-              'e2',
-              'sha384(sha384([' +
-                // 2 because we set the seed to 2
-                '2' +
-                ',2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)'
-            );
-          });
+          clock.tick(365 * DAY + 1);
+          removeMemoryCacheOfCid();
+          return compare(
+            'e2',
+            'sha384(sha384([' +
+              // 2 because we set the seed to 2
+              '2' +
+              ',2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)'
+          );
         });
       });
+    });
 
-      it('should expire on read after 365 days when embedded', () => {
-        expectAsyncConsoleError(doesNotProvideError, 3);
-        fakeWin.parent = {};
-        const expectedBaseCid = 'from-viewer';
-        viewerStorage = JSON.stringify({
-          time: 0,
-          cid: expectedBaseCid,
-        });
+    it('should expire on read after 365 days when embedded', () => {
+      expectAsyncConsoleError(doesNotProvideError, 3);
+      fakeWin.parent = {};
+      const expectedBaseCid = 'from-viewer';
+      viewerStorage = JSON.stringify({
+        time: 0,
+        cid: expectedBaseCid,
+      });
 
-        const expectedIdFromViewer =
-          'sha384(from-viewerhttp://www.origin.come2)';
-        const expectedNewId =
-          'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)';
+      const expectedIdFromViewer = 'sha384(from-viewerhttp://www.origin.come2)';
+      const expectedNewId =
+        'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)';
+      return compare('e2', expectedIdFromViewer).then(() => {
+        clock.tick(364 * DAY);
         return compare('e2', expectedIdFromViewer).then(() => {
-          clock.tick(364 * DAY);
-          return compare('e2', expectedIdFromViewer).then(() => {
-            clock.tick(365 * DAY + 1);
-            removeMemoryCacheOfCid();
-            return compare('e2', expectedNewId);
-          });
+          clock.tick(365 * DAY + 1);
+          removeMemoryCacheOfCid();
+          return compare('e2', expectedNewId);
         });
       });
+    });
 
-      it('should set last access time once a day', () => {
-        const expected =
-          'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)';
-        function getStoredTime() {
-          return JSON.parse(storage['amp-cid']).time;
-        }
-        clock.tick(100);
+    it('should set last access time once a day', () => {
+      const expected =
+        'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)';
+      function getStoredTime() {
+        return JSON.parse(storage['amp-cid']).time;
+      }
+      clock.tick(100);
+      return compare('e2', expected).then(() => {
+        seed = 2;
+        expect(getStoredTime()).to.equal(100);
+        removeMemoryCacheOfCid();
+        clock.tick(3600);
         return compare('e2', expected).then(() => {
-          seed = 2;
           expect(getStoredTime()).to.equal(100);
           removeMemoryCacheOfCid();
-          clock.tick(3600);
+          clock.tick(DAY);
           return compare('e2', expected).then(() => {
-            expect(getStoredTime()).to.equal(100);
-            removeMemoryCacheOfCid();
-            clock.tick(DAY);
-            return compare('e2', expected).then(() => {
-              expect(getStoredTime()).to.equal(100 + 3600 + DAY);
-            });
+            expect(getStoredTime()).to.equal(100 + 3600 + DAY);
           });
         });
       });
+    });
 
-      it('should set last access time once a day when embedded', () => {
-        expectAsyncConsoleError(doesNotProvideError, 5);
-        fakeWin.parent = {};
-        const expected =
-          'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)';
-        function getStoredTime() {
-          return JSON.parse(viewerStorage).time;
-        }
-        clock.tick(100);
+    it('should set last access time once a day when embedded', () => {
+      expectAsyncConsoleError(doesNotProvideError, 5);
+      fakeWin.parent = {};
+      const expected =
+        'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)';
+      function getStoredTime() {
+        return JSON.parse(viewerStorage).time;
+      }
+      clock.tick(100);
+      return compare('e2', expected).then(() => {
+        seed = 2;
+        expect(getStoredTime()).to.equal(100);
+        removeMemoryCacheOfCid();
+        clock.tick(3600);
         return compare('e2', expected).then(() => {
-          seed = 2;
           expect(getStoredTime()).to.equal(100);
           removeMemoryCacheOfCid();
-          clock.tick(3600);
+          clock.tick(DAY);
           return compare('e2', expected).then(() => {
-            expect(getStoredTime()).to.equal(100);
-            removeMemoryCacheOfCid();
-            clock.tick(DAY);
-            return compare('e2', expected).then(() => {
-              expect(getStoredTime()).to.equal(100 + 3600 + DAY);
-            });
+            expect(getStoredTime()).to.equal(100 + 3600 + DAY);
           });
         });
       });
+    });
 
-      it('should wait until after pre-rendering', () => {
-        let nonce = 'not visible';
-        whenFirstVisible = timer.promise(100).then(() => {
-          nonce = 'visible';
-        });
-        const p = cid.get({scope: 'test'}, hasConsent).then((unusedC) => {
-          expect(nonce).to.equal('visible');
-        });
-        clock.tick(100);
-        return p;
+    it('should wait until after pre-rendering', () => {
+      let nonce = 'not visible';
+      whenFirstVisible = timer.promise(100).then(() => {
+        nonce = 'visible';
       });
-
-      it('should wait for consent', () => {
-        let nonce = 'before';
-        const consent = timer.promise(100).then(() => {
-          nonce = 'timer fired';
-        });
-        const p = cid.get({scope: 'test'}, consent).then((unusedC) => {
-          expect(nonce).to.equal('timer fired');
-        });
-        clock.tick(100);
-        return p;
+      const p = cid.get({scope: 'test'}, hasConsent).then((unusedC) => {
+        expect(nonce).to.equal('visible');
       });
+      clock.tick(100);
+      return p;
+    });
 
-      it('should fail on failed consent', () => {
-        return expect(cid.get({scope: 'abc'}, Promise.reject())).to.be.rejected;
+    it('should wait for consent', () => {
+      let nonce = 'before';
+      const consent = timer.promise(100).then(() => {
+        nonce = 'timer fired';
+      });
+      const p = cid.get({scope: 'test'}, consent).then((unusedC) => {
+        expect(nonce).to.equal('timer fired');
       });
+      clock.tick(100);
+      return p;
+    });
 
-      it('should fail on invalid scope', () => {
-        allowConsoleError(() => {
-          expect(() => {
-            cid.get({scope: '$$$'}, Promise.resolve());
-          }).to.throw(/\$\$\$/);
-        });
+    it('should fail on failed consent', () => {
+      return expect(cid.get({scope: 'abc'}, Promise.reject())).to.be.rejected;
+    });
+
+    it('should fail on invalid scope', () => {
+      allowConsoleError(() => {
+        expect(() => {
+          cid.get({scope: '$$$'}, Promise.resolve());
+        }).to.throw(/\$\$\$/);
       });
+    });
 
-      it('should not store until persistence promise resolves', () => {
-        let resolve;
-        const persistencePromise = new Promise((r) => {
-          resolve = r;
-        });
+    it('should not store until persistence promise resolves', () => {
+      let resolve;
+      const persistencePromise = new Promise((r) => {
+        resolve = r;
+      });
 
-        let sha384Promise;
-        crypto.sha384Base64 = (val) => {
-          if (val instanceof Uint8Array) {
-            val = '[' + Array.apply([], val).join(',') + ']';
-          }
+      let sha384Promise;
+      crypto.sha384Base64 = (val) => {
+        if (val instanceof Uint8Array) {
+          val = '[' + Array.apply([], val).join(',') + ']';
+        }
 
-          return (sha384Promise = Promise.resolve('sha384(' + val + ')'));
-        };
+        return (sha384Promise = Promise.resolve('sha384(' + val + ')'));
+      };
 
-        return cid
-          .get({scope: 'e2'}, hasConsent, persistencePromise)
-          .then((c) => {
-            expect(c).to.equal(
-              'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)'
+      return cid
+        .get({scope: 'e2'}, hasConsent, persistencePromise)
+        .then((c) => {
+          expect(c).to.equal(
+            'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)'
+          );
+          expect(storage['amp-cid']).to.be.undefined;
+          clock.tick(777);
+          resolve();
+          return Promise.all([persistencePromise, sha384Promise]).then(() => {
+            expect(storage['amp-cid']).to.be.a('string');
+            const stored = JSON.parse(storage['amp-cid']);
+            expect(stored.cid).to.equal(
+              'sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])'
             );
-            expect(storage['amp-cid']).to.be.undefined;
-            clock.tick(777);
-            resolve();
-            return Promise.all([persistencePromise, sha384Promise]).then(() => {
-              expect(storage['amp-cid']).to.be.a('string');
-              const stored = JSON.parse(storage['amp-cid']);
-              expect(stored.cid).to.equal(
-                'sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])'
-              );
-              expect(stored.time).to.equal(777);
-            });
+            expect(stored.time).to.equal(777);
           });
-      });
-
-      it('should not wait persistence consent for viewer storage', () => {
-        expectAsyncConsoleError(doesNotProvideError, 2);
-        fakeWin.parent = {};
-        const persistencePromise = new Promise(() => {
-          /* never resolves */
         });
-        return cid
-          .get({scope: 'e2'}, hasConsent, persistencePromise)
-          .then(() => {
-            expect(viewerStorage).to.equal(
-              JSON.stringify({
-                time: 0,
-                cid: 'sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])',
-              })
-            );
-          });
-      });
+    });
 
-      it('fallback with no window.crypto', () => {
-        fakeWin.crypto = undefined;
-        fakeWin.screen = {
-          width: '111',
-          height: '222',
-        };
-        fakeWin.Math = {
-          random: () => {
-            return 999;
-          },
-        };
-        clock.tick(7777);
-        return compare(
-          'e2',
-          'sha384(sha384(https://cdn.ampproject.org/v' +
-            '/www.origin.com/foo/?f=07777999111222)http://www.origin.come2)'
-        );
+    it('should not wait persistence consent for viewer storage', () => {
+      expectAsyncConsoleError(doesNotProvideError, 2);
+      fakeWin.parent = {};
+      const persistencePromise = new Promise(() => {
+        /* never resolves */
       });
-
-      it('should NOT create fallback cookie by default with string scope', () => {
-        fakeWin.location.href = 'https://abc.org/v/www.DIFFERENT.com/foo/?f=0';
-        return cid.get({scope: 'cookie_name'}, hasConsent).then((c) => {
-          expect(c).to.not.exist;
-          expect(fakeWin.document.cookie).to.not.exist;
-        });
+      return cid.get({scope: 'e2'}, hasConsent, persistencePromise).then(() => {
+        expect(viewerStorage).to.equal(
+          JSON.stringify({
+            time: 0,
+            cid: 'sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])',
+          })
+        );
       });
+    });
 
-      it('should NOT create fallback cookie by default with struct scope', () => {
-        fakeWin.location.href = 'https://abc.org/v/www.DIFFERENT.com/foo/?f=0';
-        return cid.get({scope: 'cookie_name'}, hasConsent).then((c) => {
-          expect(c).to.not.exist;
-          expect(fakeWin.document.cookie).to.not.exist;
-        });
-      });
+    it('fallback with no window.crypto', () => {
+      fakeWin.crypto = undefined;
+      fakeWin.screen = {
+        width: '111',
+        height: '222',
+      };
+      fakeWin.Math = {
+        random: () => {
+          return 999;
+        },
+      };
+      clock.tick(7777);
+      return compare(
+        'e2',
+        'sha384(sha384(https://cdn.ampproject.org/v' +
+          '/www.origin.com/foo/?f=07777999111222)http://www.origin.come2)'
+      );
+    });
 
-      it('should create fallback cookie when asked', () => {
-        fakeWin.location.href =
-          'https://foo.abc.org/v/www.DIFFERENT.com/foo/?f=0';
-        fakeWin.location.hostname = 'foo.abc.org';
-        fakeWin.crypto.getRandomValues = (array) => {
-          array[0] = 0;
-          array[1] = 2;
-          array[2] = 4;
-          array[3] = 8;
-          array[4] = 16;
-          array[5] = 32;
-          array[6] = 64;
-          array[7] = 128;
-          array[8] = 255;
-          array[9] = 7;
-          array[10] = 11;
-          array[11] = 22;
-          array[12] = 33;
-          array[13] = 66;
-          array[14] = 200;
-          array[15] = 39;
-        };
-        return cid
-          .get(
-            {scope: 'scope_name', createCookieIfNotPresent: true},
-            hasConsent
-          )
-          .then((c) => {
-            expect(c).to.exist;
-            // Since various parties depend on the cookie values, please be careful
-            // about changing the format.
-            expect(c).to.equal('amp-AAIECBAgQID_BwsWIULIJw');
-            expect(fakeWin.document.cookie).to.equal(
-              'scope_name=' +
-                encodeURIComponent(c) +
-                '; path=/' +
-                '; domain=abc.org' +
-                '; expires=Fri, 01 Jan 1971 00:00:00 GMT'
-            ); // 1 year from 0.
-          });
+    it('should NOT create fallback cookie by default with string scope', () => {
+      fakeWin.location.href = 'https://abc.org/v/www.DIFFERENT.com/foo/?f=0';
+      return cid.get({scope: 'cookie_name'}, hasConsent).then((c) => {
+        expect(c).to.not.exist;
+        expect(fakeWin.document.cookie).to.not.exist;
       });
+    });
 
-      it('should create fallback cookie with provided name', () => {
-        fakeWin.location.href =
-          'https://foo.abc.org/v/www.DIFFERENT.com/foo/?f=0';
-        fakeWin.location.hostname = 'foo.abc.org';
-        return cid
-          .get(
-            {
-              scope: 'scope_name',
-              createCookieIfNotPresent: true,
-              cookieName: 'cookie_name',
-            },
-            hasConsent
-          )
-          .then((c) => {
-            expect(c).to.exist;
-            expect(c).to.equal('amp-AQIDAAAAAAAAAAAAAAAADw');
-            expect(fakeWin.document.cookie).to.equal(
-              'cookie_name=' +
-                encodeURIComponent(c) +
-                '; path=/' +
-                '; domain=abc.org' +
-                '; expires=Fri, 01 Jan 1971 00:00:00 GMT'
-            ); // 1 year from 0.
-          });
+    it('should NOT create fallback cookie by default with struct scope', () => {
+      fakeWin.location.href = 'https://abc.org/v/www.DIFFERENT.com/foo/?f=0';
+      return cid.get({scope: 'cookie_name'}, hasConsent).then((c) => {
+        expect(c).to.not.exist;
+        expect(fakeWin.document.cookie).to.not.exist;
       });
+    });
 
-      it('should update fallback cookie expiration when present', () => {
-        fakeWin.location.href =
-          'https://foo.abc.org/v/www.DIFFERENT.com/foo/?f=0';
-        fakeWin.location.hostname = 'foo.abc.org';
-        fakeWin.document.cookie = 'cookie_name=amp-12345';
+    it('should create fallback cookie when asked', () => {
+      fakeWin.location.href =
+        'https://foo.abc.org/v/www.DIFFERENT.com/foo/?f=0';
+      fakeWin.location.hostname = 'foo.abc.org';
+      fakeWin.crypto.getRandomValues = (array) => {
+        array[0] = 0;
+        array[1] = 2;
+        array[2] = 4;
+        array[3] = 8;
+        array[4] = 16;
+        array[5] = 32;
+        array[6] = 64;
+        array[7] = 128;
+        array[8] = 255;
+        array[9] = 7;
+        array[10] = 11;
+        array[11] = 22;
+        array[12] = 33;
+        array[13] = 66;
+        array[14] = 200;
+        array[15] = 39;
+      };
+      return cid
+        .get({scope: 'scope_name', createCookieIfNotPresent: true}, hasConsent)
+        .then((c) => {
+          expect(c).to.exist;
+          // Since various parties depend on the cookie values, please be careful
+          // about changing the format.
+          expect(c).to.equal('amp-AAIECBAgQID_BwsWIULIJw');
+          expect(fakeWin.document.cookie).to.equal(
+            'scope_name=' +
+              encodeURIComponent(c) +
+              '; path=/' +
+              '; domain=abc.org' +
+              '; expires=Fri, 01 Jan 1971 00:00:00 GMT'
+          ); // 1 year from 0.
+        });
+    });
 
-        return cid.get({scope: 'cookie_name'}, hasConsent).then((c) => {
+    it('should create fallback cookie with provided name', () => {
+      fakeWin.location.href =
+        'https://foo.abc.org/v/www.DIFFERENT.com/foo/?f=0';
+      fakeWin.location.hostname = 'foo.abc.org';
+      return cid
+        .get(
+          {
+            scope: 'scope_name',
+            createCookieIfNotPresent: true,
+            cookieName: 'cookie_name',
+          },
+          hasConsent
+        )
+        .then((c) => {
+          expect(c).to.exist;
+          expect(c).to.equal('amp-AQIDAAAAAAAAAAAAAAAADw');
           expect(fakeWin.document.cookie).to.equal(
             'cookie_name=' +
               encodeURIComponent(c) +
               '; path=/' +
               '; domain=abc.org' +
-              '; expires=Fri, 01 Jan 1971 00:00:00 GMT' // 1 year from 0.
-          );
+              '; expires=Fri, 01 Jan 1971 00:00:00 GMT'
+          ); // 1 year from 0.
         });
+    });
+
+    it('should update fallback cookie expiration when present', () => {
+      fakeWin.location.href =
+        'https://foo.abc.org/v/www.DIFFERENT.com/foo/?f=0';
+      fakeWin.location.hostname = 'foo.abc.org';
+      fakeWin.document.cookie = 'cookie_name=amp-12345';
+
+      return cid.get({scope: 'cookie_name'}, hasConsent).then((c) => {
+        expect(fakeWin.document.cookie).to.equal(
+          'cookie_name=' +
+            encodeURIComponent(c) +
+            '; path=/' +
+            '; domain=abc.org' +
+            '; expires=Fri, 01 Jan 1971 00:00:00 GMT' // 1 year from 0.
+        );
       });
+    });
 
-      it('should not update expiration when created externally', () => {
-        fakeWin.location.href =
-          'https://foo.abc.org/v/www.DIFFERENT.com/foo/?f=0';
-        fakeWin.location.hostname = 'foo.abc.org';
-        fakeWin.document.cookie = 'cookie_name=12345';
+    it('should not update expiration when created externally', () => {
+      fakeWin.location.href =
+        'https://foo.abc.org/v/www.DIFFERENT.com/foo/?f=0';
+      fakeWin.location.hostname = 'foo.abc.org';
+      fakeWin.document.cookie = 'cookie_name=12345';
 
-        return cid.get({scope: 'cookie_name'}, hasConsent).then(() => {
-          expect(fakeWin.document.cookie).to.equal('cookie_name=12345');
-        });
+      return cid.get({scope: 'cookie_name'}, hasConsent).then(() => {
+        expect(fakeWin.document.cookie).to.equal('cookie_name=12345');
       });
+    });
 
-      it('should return same value for multiple calls on non-proxied urls', () => {
-        fakeWin.location.href = 'https://abc.org/foo/?f=0';
-        fakeWin.location.hostname = 'foo.abc.org';
-        const cid1 = cid.get(
-          {scope: 'cookie', createCookieIfNotPresent: true},
-          hasConsent
-        );
-        const cid2 = cid.get(
-          {scope: 'cookie', createCookieIfNotPresent: true},
-          hasConsent
-        );
-        return cid1.then((c1) => {
-          return cid2.then((c2) => {
-            expect(c1).to.equal(c2);
-          });
+    it('should return same value for multiple calls on non-proxied urls', () => {
+      fakeWin.location.href = 'https://abc.org/foo/?f=0';
+      fakeWin.location.hostname = 'foo.abc.org';
+      const cid1 = cid.get(
+        {scope: 'cookie', createCookieIfNotPresent: true},
+        hasConsent
+      );
+      const cid2 = cid.get(
+        {scope: 'cookie', createCookieIfNotPresent: true},
+        hasConsent
+      );
+      return cid1.then((c1) => {
+        return cid2.then((c2) => {
+          expect(c1).to.equal(c2);
         });
       });
+    });
 
-      it('should return same value for multiple calls on proxied urls', () => {
-        fakeWin.location.href = 'https://cdn.ampproject.org/v/abc.org/foo/?f=0';
-        fakeWin.location.hostname = 'cdn.ampproject.org';
-        const cid1 = cid.get(
+    it('should return same value for multiple calls on proxied urls', () => {
+      fakeWin.location.href = 'https://cdn.ampproject.org/v/abc.org/foo/?f=0';
+      fakeWin.location.hostname = 'cdn.ampproject.org';
+      const cid1 = cid.get(
+        {scope: 'cookie', createCookieIfNotPresent: true},
+        hasConsent
+      );
+      return cid1.then((c1) => {
+        const cid2 = cid.get(
           {scope: 'cookie', createCookieIfNotPresent: true},
           hasConsent
         );
-        return cid1.then((c1) => {
-          const cid2 = cid.get(
-            {scope: 'cookie', createCookieIfNotPresent: true},
-            hasConsent
-          );
-          return cid2.then((c2) => {
-            expect(c1).to.equal(c2);
-          });
+        return cid2.then((c2) => {
+          expect(c1).to.equal(c2);
         });
       });
+    });
 
-      it('should retreive cookie value with . in name', () => {
-        fakeWin.location.href = 'https://abc.org/';
-        fakeWin.document.cookie = '_sp_id.44=4567;';
-        return compare('_sp_id.44', '4567');
-      });
+    it('should retreive cookie value with . in name', () => {
+      fakeWin.location.href = 'https://abc.org/';
+      fakeWin.document.cookie = '_sp_id.44=4567;';
+      return compare('_sp_id.44', '4567');
     });
+  });
 
   function compare(externalCidScope, compareValue) {
     return cid.get({scope: externalCidScope}, hasConsent).then((c) => {
@@ -842,32 +825,28 @@ describes.realWin('cid', {amp: true}, (env) => {
     clock.uninstall();
   });
 
-  // TODO(amphtml, #25621): Cannot find atob / btoa on Safari.
-  it.configure().skipSafari(
-    'should store CID in cookie when not in Viewer',
-    function* () {
-      env.sandbox
-        .stub(cid.viewerCidApi_, 'isSupported')
-        .returns(Promise.resolve(false));
-      setCookie(win, 'foo', '', 0);
-      const fooCid = yield cid.get(
-        {
-          scope: 'foo',
-          createCookieIfNotPresent: true,
-        },
-        hasConsent
-      );
-      expect(fooCid).to.have.string('amp-');
-      const fooCid2 = yield cid.get(
-        {
-          scope: 'foo',
-          createCookieIfNotPresent: true,
-        },
-        hasConsent
-      );
-      expect(fooCid).to.equal(fooCid2);
-    }
-  );
+  it('should store CID in cookie when not in Viewer', function* () {
+    env.sandbox
+      .stub(cid.viewerCidApi_, 'isSupported')
+      .returns(Promise.resolve(false));
+    setCookie(win, 'foo', '', 0);
+    const fooCid = yield cid.get(
+      {
+        scope: 'foo',
+        createCookieIfNotPresent: true,
+      },
+      hasConsent
+    );
+    expect(fooCid).to.have.string('amp-');
+    const fooCid2 = yield cid.get(
+      {
+        scope: 'foo',
+        createCookieIfNotPresent: true,
+      },
+      hasConsent
+    );
+    expect(fooCid).to.equal(fooCid2);
+  });
 
   describe('CID backup', () => {
     beforeEach(() => {
@@ -1035,106 +1014,97 @@ describes.realWin('cid', {amp: true}, (env) => {
     yield macroTask();
   });
 
-  // TODO(amphtml, #25621): Cannot find atob / btoa on Safari.
-  describe
-    .configure()
-    .skipSafari()
-    .run('pub origin, CID API opt in', () => {
-      beforeEach(() => {
-        env.sandbox.stub(url, 'isProxyOrigin').returns(false);
-        ampdoc.win.document.head.innerHTML +=
-          '<meta name="amp-google-client-id-api" content="googleanalytics">';
-        setCookie(win, '_ga', '', 0);
-      });
-
-      afterEach(() => {
-        setCookie(win, '_ga', '', 0);
-      });
+  describe('pub origin, CID API opt in', () => {
+    beforeEach(() => {
+      env.sandbox.stub(url, 'isProxyOrigin').returns(false);
+      ampdoc.win.document.head.innerHTML +=
+        '<meta name="amp-google-client-id-api" content="googleanalytics">';
+      setCookie(win, '_ga', '', 0);
+    });
 
-      it('should use cid api on pub origin if opted in', () => {
-        cid.apiKeyMap_ = {'AMP_ECID_GOOGLE': 'cid-api-key'};
-        const getScopedCidStub = env.sandbox.stub(cid.cidApi_, 'getScopedCid');
-        getScopedCidStub.returns(Promise.resolve('cid-from-api'));
-        return cid
-          .get(
-            {
-              scope: 'AMP_ECID_GOOGLE',
-              cookieName: '_ga',
-              createCookieIfNotPresent: true,
-            },
-            hasConsent
-          )
-          .then((scopedCid) => {
-            expect(getScopedCidStub).to.be.calledWith(
-              'cid-api-key',
-              'AMP_ECID_GOOGLE'
-            );
-            expect(scopedCid).to.equal('cid-from-api');
-            expect(getCookie(win, '_ga')).to.equal('cid-from-api');
-          });
-      });
+    afterEach(() => {
+      setCookie(win, '_ga', '', 0);
+    });
 
-      it('should fallback to cookie if cid api returns nothing', () => {
-        env.sandbox
-          .stub(cid.cidApi_, 'getScopedCid')
-          .returns(Promise.resolve());
-        return cid
-          .get(
-            {
-              scope: 'AMP_ECID_GOOGLE',
-              cookieName: '_ga',
-              createCookieIfNotPresent: true,
-            },
-            hasConsent
-          )
-          .then((scopedCid) => {
-            expect(scopedCid).to.contain('amp-');
-            expect(getCookie(win, '_ga')).to.equal(scopedCid);
-          });
-      });
+    it('should use cid api on pub origin if opted in', () => {
+      cid.apiKeyMap_ = {'AMP_ECID_GOOGLE': 'cid-api-key'};
+      const getScopedCidStub = env.sandbox.stub(cid.cidApi_, 'getScopedCid');
+      getScopedCidStub.returns(Promise.resolve('cid-from-api'));
+      return cid
+        .get(
+          {
+            scope: 'AMP_ECID_GOOGLE',
+            cookieName: '_ga',
+            createCookieIfNotPresent: true,
+          },
+          hasConsent
+        )
+        .then((scopedCid) => {
+          expect(getScopedCidStub).to.be.calledWith(
+            'cid-api-key',
+            'AMP_ECID_GOOGLE'
+          );
+          expect(scopedCid).to.equal('cid-from-api');
+          expect(getCookie(win, '_ga')).to.equal('cid-from-api');
+        });
+    });
 
-      it('should respect CID API opt out', () => {
-        env.sandbox
-          .stub(cid.cidApi_, 'getScopedCid')
-          .returns(Promise.resolve('$OPT_OUT'));
-        return cid
-          .get(
-            {
-              scope: 'AMP_ECID_GOOGLE',
-              cookieName: '_ga',
-              createCookieIfNotPresent: true,
-            },
-            hasConsent
-          )
-          .then((scopedCid) => {
-            expect(scopedCid).to.be.null;
-            expect(getCookie(win, '_ga')).to.be.null;
-          });
-      });
+    it('should fallback to cookie if cid api returns nothing', () => {
+      env.sandbox.stub(cid.cidApi_, 'getScopedCid').returns(Promise.resolve());
+      return cid
+        .get(
+          {
+            scope: 'AMP_ECID_GOOGLE',
+            cookieName: '_ga',
+            createCookieIfNotPresent: true,
+          },
+          hasConsent
+        )
+        .then((scopedCid) => {
+          expect(scopedCid).to.contain('amp-');
+          expect(getCookie(win, '_ga')).to.equal(scopedCid);
+        });
+    });
 
-      it(
-        'should not store CID in storage if opt-in,' +
-          ' since CID is stored on servers',
-        () => {
-          storageMock.expects('setNonBoolean').never();
-          cid.apiKeyMap_ = {'AMP_ECID_GOOGLE': 'cid-api-key'};
-          const getScopedCidStub = env.sandbox.stub(
-            cid.cidApi_,
-            'getScopedCid'
-          );
-          getScopedCidStub.returns(Promise.resolve('cid-from-api'));
-          return cid.get(
-            {
-              scope: 'AMP_ECID_GOOGLE',
-              cookieName: '_ga',
-              createCookieIfNotPresent: true,
-            },
-            hasConsent
-          );
-        }
-      );
+    it('should respect CID API opt out', () => {
+      env.sandbox
+        .stub(cid.cidApi_, 'getScopedCid')
+        .returns(Promise.resolve('$OPT_OUT'));
+      return cid
+        .get(
+          {
+            scope: 'AMP_ECID_GOOGLE',
+            cookieName: '_ga',
+            createCookieIfNotPresent: true,
+          },
+          hasConsent
+        )
+        .then((scopedCid) => {
+          expect(scopedCid).to.be.null;
+          expect(getCookie(win, '_ga')).to.be.null;
+        });
     });
 
+    it(
+      'should not store CID in storage if opt-in,' +
+        ' since CID is stored on servers',
+      () => {
+        storageMock.expects('setNonBoolean').never();
+        cid.apiKeyMap_ = {'AMP_ECID_GOOGLE': 'cid-api-key'};
+        const getScopedCidStub = env.sandbox.stub(cid.cidApi_, 'getScopedCid');
+        getScopedCidStub.returns(Promise.resolve('cid-from-api'));
+        return cid.get(
+          {
+            scope: 'AMP_ECID_GOOGLE',
+            cookieName: '_ga',
+            createCookieIfNotPresent: true,
+          },
+          hasConsent
+        );
+      }
+    );
+  });
+
   describe('isScopeOptedIn', () => {
     it('should read predefined clients and custom API keys correctly', () => {
       ampdoc.win.document.head.innerHTML +=
diff --git a/test/unit/test-cookies.js b/test/unit/test-cookies.js
index c9585cb7fe49..b1e5557c1d4a 100644
--- a/test/unit/test-cookies.js
+++ b/test/unit/test-cookies.js
@@ -3,6 +3,7 @@ import * as fakeTimers from '@sinonjs/fake-timers';
 import {BASE_CID_MAX_AGE_MILLIS} from '#service/cid-impl';
 
 import {
+  canSetCookie,
   getCookie,
   getHighestAvailableDomain,
   setCookie,
@@ -231,4 +232,13 @@ describes.fakeWin('test-cookies', {amp: true}, (env) => {
     );
     expect(doc.cookie).to.equal('');
   });
+
+  it('can set cookie', () => {
+    expect(canSetCookie(win)).to.be.true;
+  });
+
+  it('cannot set cookie for proxy domain', () => {
+    win.location = 'https://foo.cdn.ampproject.org/test.html';
+    expect(canSetCookie(win)).to.be.false;
+  });
 });
diff --git a/test/unit/test-crypto.js b/test/unit/test-crypto.js
index 9fed50b043b0..e303999cac5e 100644
--- a/test/unit/test-crypto.js
+++ b/test/unit/test-crypto.js
@@ -4,6 +4,8 @@ import {Crypto} from '#service/crypto-impl';
 import {installExtensionsService} from '#service/extensions-impl';
 import {Platform} from '#service/platform-impl';
 
+import {FakePerformance} from '#testing/fake-dom';
+
 import {installCryptoPolyfill} from '../../extensions/amp-crypto-polyfill/0.1/amp-crypto-polyfill';
 
 describes.realWin('crypto-impl', {}, (env) => {
@@ -23,92 +25,89 @@ describes.realWin('crypto-impl', {}, (env) => {
   }
 
   function testSuite(description, win, expectedError) {
-    // TODO(amphtml, #25621): Cannot find atob / btoa on Safari.
-    describe
-      .configure()
-      .skipSafari()
-      .run(description, () => {
-        beforeEach(() => {
-          crypto = createCrypto(win || env.win);
-        });
+    describe(description, () => {
+      beforeEach(() => {
+        crypto = createCrypto(win || env.win);
+      });
 
-        it('should hash "abc" in sha384', () => {
-          if (expectedError) {
-            expectAsyncConsoleError(expectedError);
-          }
-          return crypto.sha384('abc').then((buffer) => {
-            expect(buffer.length).to.equal(48);
-            expect(buffer[0]).to.equal(203);
-            expect(buffer[1]).to.equal(0);
-            expect(buffer[47]).to.equal(167);
-          });
+      it('should hash "abc" in sha384', () => {
+        if (expectedError) {
+          expectAsyncConsoleError(expectedError);
+        }
+        return crypto.sha384('abc').then((buffer) => {
+          expect(buffer.length).to.equal(48);
+          expect(buffer[0]).to.equal(203);
+          expect(buffer[1]).to.equal(0);
+          expect(buffer[47]).to.equal(167);
         });
+      });
 
-        it('should hash [1,2,3] in sha384', () => {
-          if (expectedError) {
-            expectAsyncConsoleError(expectedError);
-          }
-          return crypto.sha384(uint8Array([1, 2, 3])).then((buffer) => {
-            expect(buffer.length).to.equal(48);
-            expect(buffer[0]).to.equal(134);
-            expect(buffer[1]).to.equal(34);
-            expect(buffer[47]).to.equal(246);
-          });
+      it('should hash [1,2,3] in sha384', () => {
+        if (expectedError) {
+          expectAsyncConsoleError(expectedError);
+        }
+        return crypto.sha384(uint8Array([1, 2, 3])).then((buffer) => {
+          expect(buffer.length).to.equal(48);
+          expect(buffer[0]).to.equal(134);
+          expect(buffer[1]).to.equal(34);
+          expect(buffer[47]).to.equal(246);
         });
+      });
 
-        it('should hash "abc" in sha384Base64', () => {
-          if (expectedError) {
-            expectAsyncConsoleError(expectedError);
-          }
-          return expect(crypto.sha384Base64('abc')).to.eventually.equal(
-            'ywB1P0WjXou1oD1pmsZQBycsMqsO3tFjGotgWkP_W-2AhgcroefMI1i67KE0yCWn'
-          );
-        });
+      it('should hash "abc" in sha384Base64', () => {
+        if (expectedError) {
+          expectAsyncConsoleError(expectedError);
+        }
+        return expect(crypto.sha384Base64('abc')).to.eventually.equal(
+          'ywB1P0WjXou1oD1pmsZQBycsMqsO3tFjGotgWkP_W-2AhgcroefMI1i67KE0yCWn'
+        );
+      });
 
-        it('should hash "foobar" in sha384Base64', () => {
-          if (expectedError) {
-            expectAsyncConsoleError(expectedError);
-          }
-          return expect(crypto.sha384Base64('foobar')).to.eventually.equal(
-            'PJww2fZl501RXIQpYNSkUcg6ASX9Pec5LXs3IxrxDHLqWK7fzfiaV2W_kCr5Ps8G'
-          );
-        });
+      it('should hash "foobar" in sha384Base64', () => {
+        if (expectedError) {
+          expectAsyncConsoleError(expectedError);
+        }
+        return expect(crypto.sha384Base64('foobar')).to.eventually.equal(
+          'PJww2fZl501RXIQpYNSkUcg6ASX9Pec5LXs3IxrxDHLqWK7fzfiaV2W_kCr5Ps8G'
+        );
+      });
 
-        it('should hash [1,2,3] in sha384', () => {
-          if (expectedError) {
-            expectAsyncConsoleError(expectedError);
-          }
-          return expect(
-            crypto.sha384Base64(uint8Array([1, 2, 3]))
-          ).to.eventually.equal(
-            'hiKdxtL_vqxzgHRBVKpwApHAZDUqDb3H' +
-              'e57T8sjh2sTcMlhn053f8dJim3o5PUf2'
-          );
-        });
+      it('should hash [1,2,3] in sha384', () => {
+        if (expectedError) {
+          expectAsyncConsoleError(expectedError);
+        }
+        return expect(
+          crypto.sha384Base64(uint8Array([1, 2, 3]))
+        ).to.eventually.equal(
+          'hiKdxtL_vqxzgHRBVKpwApHAZDUqDb3H' +
+            'e57T8sjh2sTcMlhn053f8dJim3o5PUf2'
+        );
+      });
 
-        it('should throw when input contains chars out of range [0,255]', () => {
-          allowConsoleError(() => {
-            expect(() => crypto.sha384('abc今')).to.throw();
-            expect(() => crypto.sha384Base64('abc今')).to.throw();
-            expect(() => crypto.uniform('abc今')).to.throw();
-          });
+      it('should throw when input contains chars out of range [0,255]', () => {
+        allowConsoleError(() => {
+          expect(() => crypto.sha384('abc今')).to.throw();
+          expect(() => crypto.sha384Base64('abc今')).to.throw();
+          expect(() => crypto.uniform('abc今')).to.throw();
         });
+      });
 
-        it('should hash "abc" to uniform number', () => {
-          if (expectedError) {
-            expectAsyncConsoleError(expectedError);
-          }
-          return crypto.uniform('abc').then((result) => {
-            expect(result.toFixed(6)).to.equal('0.792976');
-          });
+      it('should hash "abc" to uniform number', () => {
+        if (expectedError) {
+          expectAsyncConsoleError(expectedError);
+        }
+        return crypto.uniform('abc').then((result) => {
+          expect(result.toFixed(6)).to.equal('0.792976');
         });
       });
+    });
   }
 
   function createCrypto(win) {
-    if (win && !win.document) {
+    if (!win.document) {
       win.document = env.win.document;
     }
+    win.performance = new FakePerformance(win);
     installDocService(win, /* isSingleDoc */ true);
     installExtensionsService(win);
     const extensions = Services.extensionsFor(win);
@@ -129,8 +128,9 @@ describes.realWin('crypto-impl', {}, (env) => {
   }
 
   testSuite('with native crypto API');
-  testSuite('with crypto lib', {});
+  testSuite('with crypto lib', {...win, crypto: null});
   testSuite('with native crypto API rejects', {
+    ...win,
     crypto: {
       subtle: {
         digest: () => Promise.reject('Operation not supported'),
@@ -140,6 +140,7 @@ describes.realWin('crypto-impl', {}, (env) => {
   testSuite(
     'with native crypto API throws',
     {
+      ...win,
       crypto: {
         subtle: {
           digest: () => {
@@ -152,9 +153,10 @@ describes.realWin('crypto-impl', {}, (env) => {
   );
 
   it('native API result should exactly equal to crypto lib result', () => {
+    const fakeWin = {...win, crypto: null};
     return Promise.all([
       createCrypto(win).sha384('abc'),
-      createCrypto({}).sha384('abc'),
+      createCrypto(fakeWin).sha384('abc'),
     ]).then((results) => {
       expect(results[0]).to.jsonEqual(results[1]);
     });
diff --git a/test/unit/test-custom-element-registry.js b/test/unit/test-custom-element-registry.js
index 6f3941a9f566..519dd4566ae4 100644
--- a/test/unit/test-custom-element-registry.js
+++ b/test/unit/test-custom-element-registry.js
@@ -12,6 +12,8 @@ import {
   upgradeOrRegisterElement,
 } from '#service/custom-element-registry';
 
+import {FakePerformance} from '#testing/fake-dom';
+
 import {BaseElement} from '../../src/base-element';
 import {getImplSyncForTesting} from '../../src/custom-element';
 import {ElementStub} from '../../src/element-stub';
@@ -278,6 +280,7 @@ describes.realWin('CustomElement register', {amp: true}, (env) => {
         },
         HTMLElement,
         __AMP_EXTENDED_ELEMENTS: {},
+        performance: new FakePerformance(window),
       };
       doc.defaultView = win;
 
diff --git a/test/unit/test-custom-element-v1.js b/test/unit/test-custom-element-v1.js
index e6c5d1103a76..f8370cf240bb 100644
--- a/test/unit/test-custom-element-v1.js
+++ b/test/unit/test-custom-element-v1.js
@@ -1,9 +1,11 @@
-import {CommonSignals} from '#core/constants/common-signals';
-import {LayoutPriority} from '#core/dom/layout';
+import {CommonSignals_Enum} from '#core/constants/common-signals';
+import {LayoutPriority_Enum} from '#core/dom/layout';
 
 import {Services} from '#service';
 import {getSchedulerForDoc} from '#service/scheduler';
 
+import {sleep} from '#testing/helpers';
+
 import {BaseElement} from '../../src/base-element';
 import {chunkInstanceForTesting} from '../../src/chunk';
 import {
@@ -79,7 +81,7 @@ describes.realWin('CustomElement V1', {amp: true}, (env) => {
       expect(element.isUpgraded()).to.be.false;
       expect(getImplClassSyncForTesting(element)).to.equal(TestElement);
       expect(getImplSyncForTesting(element)).to.be.null;
-      expect(element.getBuildPriority()).equal(LayoutPriority.CONTENT);
+      expect(element.getBuildPriority()).equal(LayoutPriority_Enum.CONTENT);
 
       doc.body.appendChild(element);
 
@@ -88,7 +90,7 @@ describes.realWin('CustomElement V1', {amp: true}, (env) => {
       expect(element.isUpgraded()).to.be.false;
       expect(element.readyState).to.equal('building');
       expect(element.isBuilt()).to.be.false;
-      expect(element.getBuildPriority()).equal(LayoutPriority.CONTENT);
+      expect(element.getBuildPriority()).equal(LayoutPriority_Enum.CONTENT);
       expect(removeSpy).to.have.been.calledWith(
         'amp-unresolved',
         'i-amphtml-unresolved'
@@ -103,7 +105,7 @@ describes.realWin('CustomElement V1', {amp: true}, (env) => {
       expect(element.isUpgraded()).to.be.false;
       expect(getImplClassSyncForTesting(element)).to.be.null;
       expect(getImplSyncForTesting(element)).to.be.null;
-      expect(element.getBuildPriority()).equal(LayoutPriority.BACKGROUND);
+      expect(element.getBuildPriority()).equal(LayoutPriority_Enum.BACKGROUND);
 
       doc.body.appendChild(element);
       element.upgrade(TestElement);
@@ -113,7 +115,7 @@ describes.realWin('CustomElement V1', {amp: true}, (env) => {
       expect(element.isUpgraded()).to.be.false;
       expect(element.readyState).to.equal('building');
       expect(element.isBuilt()).to.be.false;
-      expect(element.getBuildPriority()).equal(LayoutPriority.CONTENT);
+      expect(element.getBuildPriority()).equal(LayoutPriority_Enum.CONTENT);
     });
 
     it('should reschedule build when re-attached', () => {
@@ -263,7 +265,7 @@ describes.realWin('CustomElement V1', {amp: true}, (env) => {
       expect(element).to.have.class('i-amphtml-notbuilt');
       expect(element).to.have.class('amp-notbuilt');
       expect(element).to.not.have.class('i-amphtml-built');
-      expect(element.signals().get(CommonSignals.BUILT)).to.be.null;
+      expect(element.signals().get(CommonSignals_Enum.BUILT)).to.be.null;
       expect(attachedCallbackStub).to.not.be.called;
       expect(getSizerStub).to.be.calledOnce;
 
@@ -276,7 +278,7 @@ describes.realWin('CustomElement V1', {amp: true}, (env) => {
       expect(element).to.not.have.class('i-amphtml-notbuilt');
       expect(element).to.not.have.class('amp-notbuilt');
       expect(element).to.have.class('i-amphtml-built');
-      expect(element.signals().get(CommonSignals.BUILT)).to.exist;
+      expect(element.signals().get(CommonSignals_Enum.BUILT)).to.exist;
       expect(attachedCallbackStub).to.be.calledOnce;
     });
 
@@ -299,7 +301,7 @@ describes.realWin('CustomElement V1', {amp: true}, (env) => {
       expect(element).to.have.class('i-amphtml-notbuilt');
       expect(element).to.have.class('amp-notbuilt');
       expect(element).to.not.have.class('i-amphtml-built');
-      expect(element.signals().get(CommonSignals.BUILT)).to.be.null;
+      expect(element.signals().get(CommonSignals_Enum.BUILT)).to.be.null;
       expect(attachedCallbackStub).to.not.be.called;
       expect(getSizerStub).to.be.calledOnce;
 
@@ -312,7 +314,7 @@ describes.realWin('CustomElement V1', {amp: true}, (env) => {
       expect(element).to.not.have.class('i-amphtml-notbuilt');
       expect(element).to.not.have.class('amp-notbuilt');
       expect(element).to.have.class('i-amphtml-built');
-      expect(element.signals().get(CommonSignals.BUILT)).to.exist;
+      expect(element.signals().get(CommonSignals_Enum.BUILT)).to.exist;
       expect(attachedCallbackStub).to.be.calledOnce;
     });
 
@@ -345,7 +347,7 @@ describes.realWin('CustomElement V1', {amp: true}, (env) => {
       expect(element).to.not.have.class('i-amphtml-notbuilt');
       expect(element).to.not.have.class('amp-notbuilt');
       expect(element).to.have.class('i-amphtml-built');
-      expect(element.signals().get(CommonSignals.BUILT)).to.exist;
+      expect(element.signals().get(CommonSignals_Enum.BUILT)).to.exist;
       expect(attachedCallbackStub).to.be.calledOnce;
     });
 
@@ -378,7 +380,7 @@ describes.realWin('CustomElement V1', {amp: true}, (env) => {
       expect(element).to.not.have.class('i-amphtml-notbuilt');
       expect(element).to.not.have.class('amp-notbuilt');
       expect(element).to.have.class('i-amphtml-built');
-      expect(element.signals().get(CommonSignals.BUILT)).to.exist;
+      expect(element.signals().get(CommonSignals_Enum.BUILT)).to.exist;
       expect(attachedCallbackStub).to.be.calledOnce;
     });
 
@@ -450,10 +452,10 @@ describes.realWin('CustomElement V1', {amp: true}, (env) => {
         expect(e.toString()).to.match(/intentional/);
       }
       expect(element.readyState).to.equal('error');
-      expect(element.signals().get(CommonSignals.BUILT)).to.exist;
-      expect(element.signals().get(CommonSignals.BUILT).toString()).to.match(
-        /intentional/
-      );
+      expect(element.signals().get(CommonSignals_Enum.BUILT)).to.exist;
+      expect(
+        element.signals().get(CommonSignals_Enum.BUILT).toString()
+      ).to.match(/intentional/);
     });
 
     it('should set the failing state if buildCallback rejects', async () => {
@@ -486,10 +488,10 @@ describes.realWin('CustomElement V1', {amp: true}, (env) => {
         expect(e.toString()).to.match(/intentional/);
       }
       expect(element.readyState).to.equal('error');
-      expect(element.signals().get(CommonSignals.MOUNTED)).to.exist;
-      expect(element.signals().get(CommonSignals.MOUNTED).toString()).to.match(
-        /intentional/
-      );
+      expect(element.signals().get(CommonSignals_Enum.MOUNTED)).to.exist;
+      expect(
+        element.signals().get(CommonSignals_Enum.MOUNTED).toString()
+      ).to.match(/intentional/);
     });
 
     it('should only execute build once', async () => {
@@ -625,6 +627,14 @@ describes.realWin('CustomElement V1', {amp: true}, (env) => {
       await element.buildInternal();
       await promise;
     });
+
+    it('should build if amp-bind mutation', async () => {
+      const element = new ElementClass();
+      builderMock.expects('scheduleAsap').withExactArgs(element).once();
+
+      doc.body.appendChild(element);
+      element.mutatedAttributesCallback({});
+    });
   });
 
   describe('mount/unmount', () => {
@@ -989,16 +999,16 @@ describes.realWin('CustomElement V1', {amp: true}, (env) => {
     it('should update loading state', () => {
       expect(element.readyState).equal('other');
       expect(element.toggleLoading).to.not.be.called;
-      expect(element.signals().get(CommonSignals.LOAD_START)).to.be.null;
-      element.signals().signal(CommonSignals.UNLOAD);
+      expect(element.signals().get(CommonSignals_Enum.LOAD_START)).to.be.null;
+      element.signals().signal(CommonSignals_Enum.UNLOAD);
       element.classList.remove('i-amphtml-layout');
 
       element.setReadyStateInternal('loading');
       expect(element.readyState).equal('loading');
       expect(element.toggleLoading).to.be.calledOnce.calledWith(true);
-      expect(element.signals().get(CommonSignals.LOAD_START)).to.exist;
-      expect(element.signals().get(CommonSignals.UNLOAD)).to.be.null;
-      expect(element.signals().get(CommonSignals.LOAD_END)).to.be.null;
+      expect(element.signals().get(CommonSignals_Enum.LOAD_START)).to.exist;
+      expect(element.signals().get(CommonSignals_Enum.UNLOAD)).to.be.null;
+      expect(element.signals().get(CommonSignals_Enum.LOAD_END)).to.be.null;
       expect(element).to.have.class('i-amphtml-layout');
     });
 
@@ -1008,15 +1018,15 @@ describes.realWin('CustomElement V1', {amp: true}, (env) => {
 
       expect(element.readyState).equal('other');
       expect(element.toggleLoading).to.not.be.called;
-      expect(element.signals().get(CommonSignals.LOAD_END)).to.be.null;
+      expect(element.signals().get(CommonSignals_Enum.LOAD_END)).to.be.null;
       element.classList.remove('i-amphtml-layout');
 
       element.setReadyStateInternal('complete');
       expect(element.readyState).equal('complete');
       expect(element.toggleLoading).to.be.calledOnce.calledWith(false);
-      expect(element.signals().get(CommonSignals.LOAD_END)).to.exist;
-      expect(element.signals().get(CommonSignals.LOAD_START)).to.exist;
-      expect(element.signals().get(CommonSignals.UNLOAD)).to.not.exist;
+      expect(element.signals().get(CommonSignals_Enum.LOAD_END)).to.exist;
+      expect(element.signals().get(CommonSignals_Enum.LOAD_START)).to.exist;
+      expect(element.signals().get(CommonSignals_Enum.UNLOAD)).to.not.exist;
       expect(element).to.have.class('i-amphtml-layout');
       expect(loadEventSpy).to.be.calledOnce;
       expect(loadEventSpy.firstCall.firstArg.bubbles).to.be.false;
@@ -1028,13 +1038,15 @@ describes.realWin('CustomElement V1', {amp: true}, (env) => {
 
       expect(element.readyState).equal('other');
       expect(element.toggleLoading).to.not.be.called;
-      expect(element.signals().get(CommonSignals.LOAD_END)).to.be.null;
+      expect(element.signals().get(CommonSignals_Enum.LOAD_END)).to.be.null;
 
       const error = new Error();
       element.setReadyStateInternal('error', error);
       expect(element.readyState).equal('error');
       expect(element.toggleLoading).to.be.calledOnce.calledWith(false);
-      expect(element.signals().get(CommonSignals.LOAD_END)).to.equal(error);
+      expect(element.signals().get(CommonSignals_Enum.LOAD_END)).to.equal(
+        error
+      );
       expect(errorEventSpy).to.be.calledOnce;
       expect(errorEventSpy.firstCall.firstArg.bubbles).to.be.false;
     });
@@ -1054,13 +1066,13 @@ describes.realWin('CustomElement V1', {amp: true}, (env) => {
     it('should return back to loading after complete', () => {
       element.setReadyStateInternal('complete');
       expect(element.readyState).equal('complete');
-      expect(element.signals().get(CommonSignals.LOAD_END)).to.exist;
+      expect(element.signals().get(CommonSignals_Enum.LOAD_END)).to.exist;
 
-      element.signals().reset(CommonSignals.LOAD_START);
+      element.signals().reset(CommonSignals_Enum.LOAD_START);
       element.setReadyStateInternal('loading');
       expect(element.readyState).equal('loading');
-      expect(element.signals().get(CommonSignals.LOAD_END)).to.be.null;
-      expect(element.signals().get(CommonSignals.LOAD_START)).to.exist;
+      expect(element.signals().get(CommonSignals_Enum.LOAD_END)).to.be.null;
+      expect(element.signals().get(CommonSignals_Enum.LOAD_START)).to.exist;
     });
   });
 
@@ -1116,7 +1128,7 @@ describes.realWin('CustomElement V1', {amp: true}, (env) => {
 
       doc.body.appendChild(element);
       await element.buildInternal();
-      await new Promise((resolve) => setTimeout(resolve, 10));
+      await sleep(10);
 
       expect(getActionQueueForTesting(element)).to.not.exist;
       expect(handler)
diff --git a/test/unit/test-custom-element.js b/test/unit/test-custom-element.js
index c36c391d975d..de8463fd962c 100644
--- a/test/unit/test-custom-element.js
+++ b/test/unit/test-custom-element.js
@@ -1,12 +1,12 @@
 import * as fakeTimers from '@sinonjs/fake-timers';
 
-import {AmpEvents} from '#core/constants/amp-events';
-import {CommonSignals} from '#core/constants/common-signals';
-import {LOADING_ELEMENTS_ENABLED, Layout} from '#core/dom/layout';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
+import {CommonSignals_Enum} from '#core/constants/common-signals';
+import {LOADING_ELEMENTS_ENUM, Layout_Enum} from '#core/dom/layout';
 
 import {Services} from '#service';
 import {elementConnectedCallback} from '#service/custom-element-registry';
-import {Resource, ResourceState} from '#service/resource';
+import {Resource, ResourceState_Enum} from '#service/resource';
 
 import {BaseElement} from '../../src/base-element';
 import {chunkInstanceForTesting} from '../../src/chunk';
@@ -19,1964 +19,1967 @@ import {
 import {ElementStub} from '../../src/element-stub';
 
 describes.realWin('CustomElement', {amp: true}, (env) => {
-  // TODO(dvoytenko, #11827): Make this test work on Safari.
-  describe
-    .configure()
-    .skipSafari()
-    .run('CustomElement', () => {
-      let win, doc, ampdoc;
-      let resources;
-      let resourcesMock;
-      let clock;
-      let testElementGetInsersectionElementLayoutBox;
-      let container;
-      let ElementClass, StubElementClass, ElementClassWithReUpgrade;
-
-      let testElementPreconnectCallback;
-      let testElementBuildCallback;
-      let testElementCreatePlaceholderCallback;
-      let testElementLayoutCallback;
-      let testElementFirstLayoutCompleted;
-      let testElementUnlayoutCallback;
-      let testElementPauseCallback;
-      let testElementResumeCallback;
-      let testElementAttachedCallback;
-      let testElementDetachedCallback;
-      let testOnLayoutMeasureCallback;
-
-      class TestElement extends BaseElement {
-        constructor(element, source) {
-          super(element);
-          this.source = source;
-        }
-
-        isLayoutSupported(unusedLayout) {
-          return true;
-        }
-        preconnectCallback(onLayout) {
-          testElementPreconnectCallback(onLayout);
-        }
-        buildCallback() {
-          testElementBuildCallback();
-        }
-        createPlaceholderCallback() {
-          testElementCreatePlaceholderCallback();
-        }
-        layoutCallback() {
-          testElementLayoutCallback();
-          return Promise.resolve();
-        }
-        firstLayoutCompleted() {
-          testElementFirstLayoutCompleted();
-        }
-        getIntersectionElementLayoutBox() {
-          testElementGetInsersectionElementLayoutBox();
-          return {top: 10, left: 10, width: 11, height: 1};
-        }
-        unlayoutCallback() {
-          testElementUnlayoutCallback();
-          return true;
-        }
-        pauseCallback() {
-          testElementPauseCallback();
-        }
-        resumeCallback() {
-          testElementResumeCallback();
-        }
-        attachedCallback() {
-          testElementAttachedCallback();
-        }
-        detachedCallback() {
-          testElementDetachedCallback();
-        }
-        onLayoutMeasure() {
-          testOnLayoutMeasureCallback();
-        }
+  describe('CustomElement', () => {
+    let win, doc, ampdoc;
+    let resources;
+    let resourcesMock;
+    let clock;
+    let testElementGetInsersectionElementLayoutBox;
+    let container;
+    let ElementClass, StubElementClass, ElementClassWithReUpgrade;
+
+    let testElementPreconnectCallback;
+    let testElementBuildCallback;
+    let testElementCreatePlaceholderCallback;
+    let testElementLayoutCallback;
+    let testElementFirstLayoutCompleted;
+    let testElementUnlayoutCallback;
+    let testElementPauseCallback;
+    let testElementResumeCallback;
+    let testElementAttachedCallback;
+    let testElementDetachedCallback;
+    let testOnLayoutMeasureCallback;
+
+    class TestElement extends BaseElement {
+      constructor(element, source) {
+        super(element);
+        this.source = source;
       }
 
-      class TestElementWithReUpgrade extends BaseElement {
-        isLayoutSupported(unusedLayout) {
-          return true;
-        }
-        upgradeCallback() {
-          return new TestElement(this.element, 're-upgrade');
-        }
+      isLayoutSupported(unusedLayout) {
+        return true;
       }
+      preconnectCallback(onLayout) {
+        testElementPreconnectCallback(onLayout);
+      }
+      buildCallback() {
+        testElementBuildCallback();
+      }
+      createPlaceholderCallback() {
+        testElementCreatePlaceholderCallback();
+      }
+      layoutCallback() {
+        testElementLayoutCallback();
+        return Promise.resolve();
+      }
+      firstLayoutCompleted() {
+        testElementFirstLayoutCompleted();
+      }
+      getIntersectionElementLayoutBox() {
+        testElementGetInsersectionElementLayoutBox();
+        return {top: 10, left: 10, width: 11, height: 1};
+      }
+      unlayoutCallback() {
+        testElementUnlayoutCallback();
+        return true;
+      }
+      pauseCallback() {
+        testElementPauseCallback();
+      }
+      resumeCallback() {
+        testElementResumeCallback();
+      }
+      attachedCallback() {
+        testElementAttachedCallback();
+      }
+      detachedCallback() {
+        testElementDetachedCallback();
+      }
+      onLayoutMeasure() {
+        testOnLayoutMeasureCallback();
+      }
+    }
 
-      beforeEach(() => {
-        win = env.win;
-        doc = win.document;
-        ampdoc = env.ampdoc;
-        clock = fakeTimers.withGlobal(win).install();
-        delete win.requestIdleCallback;
-        delete win.cancelIdleCallback;
-        delete win.__AMP_BASE_CE_CLASS;
-        resources = Services.resourcesForDoc(doc);
-        resources.isBuildOn_ = true;
-        resourcesMock = env.sandbox.mock(resources);
-        container = doc.createElement('div');
-        doc.body.appendChild(container);
-        chunkInstanceForTesting(env.ampdoc);
-
-        ElementClass = createAmpElementForTesting(win, TestElement);
-        StubElementClass = createAmpElementForTesting(win, ElementStub);
-        ElementClassWithReUpgrade = createAmpElementForTesting(
-          win,
-          TestElementWithReUpgrade
-        );
-
-        win.customElements.define('amp-test', ElementClass);
-        win.customElements.define('amp-stub', StubElementClass);
-        win.customElements.define(
-          'amp-test-with-re-upgrade',
-          ElementClassWithReUpgrade
-        );
-
-        win.__AMP_EXTENDED_ELEMENTS['amp-test'] = TestElement;
-        win.__AMP_EXTENDED_ELEMENTS['amp-stub'] = ElementStub;
-        win.__AMP_EXTENDED_ELEMENTS['amp-test-with-re-upgrade'] =
-          TestElementWithReUpgrade;
-        ampdoc.declareExtension('amp-stub', '0.1');
-
-        testElementPreconnectCallback = env.sandbox.spy();
-        testElementBuildCallback = env.sandbox.spy();
-        testElementCreatePlaceholderCallback = env.sandbox.spy();
-        testElementLayoutCallback = env.sandbox.spy();
-        testElementFirstLayoutCompleted = env.sandbox.spy();
-        testElementGetInsersectionElementLayoutBox = env.sandbox.spy();
-        testElementUnlayoutCallback = env.sandbox.spy();
-        testElementPauseCallback = env.sandbox.spy();
-        testElementResumeCallback = env.sandbox.spy();
-        testElementAttachedCallback = env.sandbox.spy();
-        testElementDetachedCallback = env.sandbox.spy();
-        testOnLayoutMeasureCallback = env.sandbox.spy();
-      });
-
-      afterEach(() => {
-        clock.uninstall();
-        resourcesMock.verify();
-        resetUnresolvedElementsForTesting();
-      });
-
-      function skipMicroTask() {
-        return new Promise((resolve) => resolve(Promise.resolve()));
+    class TestElementWithReUpgrade extends BaseElement {
+      isLayoutSupported(unusedLayout) {
+        return true;
+      }
+      upgradeCallback() {
+        return new TestElement(this.element, 're-upgrade');
       }
+    }
 
-      it('should initialize ampdoc and resources on attach only', () => {
-        const element = new ElementClass();
-        expect(element.ampdoc_).to.be.null;
-        allowConsoleError(() => {
-          expect(() => element.getAmpDoc()).to.throw(/no ampdoc yet/);
-        });
-        expect(element.resources_).to.be.null;
-        allowConsoleError(() => {
-          expect(() => element.getResources()).to.throw(/no resources yet/);
-        });
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      ampdoc = env.ampdoc;
+      clock = fakeTimers.withGlobal(win).install();
+      delete win.requestIdleCallback;
+      delete win.cancelIdleCallback;
+      delete win.__AMP_BASE_CE_CLASS;
+      resources = Services.resourcesForDoc(doc);
+      resources.isBuildOn_ = true;
+      resourcesMock = env.sandbox.mock(resources);
+      container = doc.createElement('div');
+      doc.body.appendChild(container);
+      chunkInstanceForTesting(env.ampdoc);
+
+      ElementClass = createAmpElementForTesting(win, TestElement);
+      StubElementClass = createAmpElementForTesting(win, ElementStub);
+      ElementClassWithReUpgrade = createAmpElementForTesting(
+        win,
+        TestElementWithReUpgrade
+      );
 
-        // Resources available after attachment.
-        container.appendChild(element);
-        expect(element.ampdoc_).to.be.ok;
-        expect(element.getAmpDoc()).to.be.ok;
-        expect(element.resources_).to.be.ok;
-        expect(element.getResources()).to.be.ok;
-      });
+      win.customElements.define('amp-test', ElementClass);
+      win.customElements.define('amp-stub', StubElementClass);
+      win.customElements.define(
+        'amp-test-with-re-upgrade',
+        ElementClassWithReUpgrade
+      );
 
-      it('Element - createdCallback', () => {
-        const element = new ElementClass();
-        const build = env.sandbox
-          .stub(element, 'buildInternal')
-          .returns(Promise.resolve());
+      win.__AMP_EXTENDED_ELEMENTS['amp-test'] = TestElement;
+      win.__AMP_EXTENDED_ELEMENTS['amp-stub'] = ElementStub;
+      win.__AMP_EXTENDED_ELEMENTS['amp-test-with-re-upgrade'] =
+        TestElementWithReUpgrade;
+      ampdoc.declareExtension('amp-stub', '0.1');
+
+      testElementPreconnectCallback = env.sandbox.spy();
+      testElementBuildCallback = env.sandbox.spy();
+      testElementCreatePlaceholderCallback = env.sandbox.spy();
+      testElementLayoutCallback = env.sandbox.spy();
+      testElementFirstLayoutCompleted = env.sandbox.spy();
+      testElementGetInsersectionElementLayoutBox = env.sandbox.spy();
+      testElementUnlayoutCallback = env.sandbox.spy();
+      testElementPauseCallback = env.sandbox.spy();
+      testElementResumeCallback = env.sandbox.spy();
+      testElementAttachedCallback = env.sandbox.spy();
+      testElementDetachedCallback = env.sandbox.spy();
+      testOnLayoutMeasureCallback = env.sandbox.spy();
+    });
 
-        expect(element.isBuilt()).to.equal(false);
-        expect(element.hasAttributes()).to.equal(false);
-        expect(element.isUpgraded()).to.equal(false);
-        expect(element.upgradeState_).to.equal(/* NOT_UPGRADED */ 1);
-        expect(element.readyState).to.equal('upgrading');
-        expect(element.everAttached).to.equal(false);
-        expect(element.getLayout()).to.equal(Layout.NODISPLAY);
+    afterEach(() => {
+      clock.uninstall();
+      resourcesMock.verify();
+      resetUnresolvedElementsForTesting();
+    });
 
-        container.appendChild(element);
-        expect(element).to.have.class('i-amphtml-element');
-        expect(element).to.have.class('i-amphtml-notbuilt');
-        expect(element).to.have.class('amp-notbuilt');
-        expect(element).to.not.have.class('i-amphtml-built');
-        expect(element.everAttached).to.equal(true);
-        expect(element.isUpgraded()).to.equal(true);
-        expect(build.calledOnce).to.equal(true);
-
-        expect(element.getResourceId()).to.equal(
-          resources.getResourceForElement(element).getId()
-        );
+    function skipMicroTask() {
+      return new Promise((resolve) => resolve(Promise.resolve()));
+    }
+
+    it('should initialize ampdoc and resources on attach only', () => {
+      const element = new ElementClass();
+      expect(element.ampdoc_).to.be.null;
+      allowConsoleError(() => {
+        expect(() => element.getAmpDoc()).to.throw(/no ampdoc yet/);
+      });
+      expect(element.resources_).to.be.null;
+      allowConsoleError(() => {
+        expect(() => element.getResources()).to.throw(/no resources yet/);
       });
 
-      it('StubElement - createdCallback', () => {
-        const element = new StubElementClass();
-        env.sandbox.stub(element, 'buildInternal');
+      // Resources available after attachment.
+      container.appendChild(element);
+      expect(element.ampdoc_).to.be.ok;
+      expect(element.getAmpDoc()).to.be.ok;
+      expect(element.resources_).to.be.ok;
+      expect(element.getResources()).to.be.ok;
+    });
 
-        expect(element.isBuilt()).to.equal(false);
-        expect(element.hasAttributes()).to.equal(false);
-        expect(element.isUpgraded()).to.equal(false);
-        expect(element.readyState).to.equal('upgrading');
-        expect(element.everAttached).to.equal(false);
-        expect(element.getLayout()).to.equal(Layout.NODISPLAY);
+    it('Element - createdCallback', () => {
+      const element = new ElementClass();
+      const build = env.sandbox
+        .stub(element, 'buildInternal')
+        .returns(Promise.resolve());
+
+      expect(element.isBuilt()).to.equal(false);
+      expect(element.hasAttributes()).to.equal(false);
+      expect(element.isUpgraded()).to.equal(false);
+      expect(element.upgradeState_).to.equal(/* NOT_UPGRADED */ 1);
+      expect(element.readyState).to.equal('upgrading');
+      expect(element.everAttached).to.equal(false);
+      expect(element.getLayout()).to.equal(Layout_Enum.NODISPLAY);
+
+      container.appendChild(element);
+      expect(element).to.have.class('i-amphtml-element');
+      expect(element).to.have.class('i-amphtml-notbuilt');
+      expect(element).to.have.class('amp-notbuilt');
+      expect(element).to.not.have.class('i-amphtml-built');
+      expect(element.everAttached).to.equal(true);
+      expect(element.isUpgraded()).to.equal(true);
+      expect(build.calledOnce).to.equal(true);
+
+      expect(element.getResourceId()).to.equal(
+        resources.getResourceForElement(element).getId()
+      );
+    });
 
-        container.appendChild(element);
-        expect(element).to.have.class('i-amphtml-element');
-        expect(element).to.have.class('i-amphtml-notbuilt');
-        expect(element).to.have.class('amp-notbuilt');
-        expect(element).to.not.have.class('i-amphtml-built');
-        expect(element.everAttached).to.equal(true);
-        expect(element.isUpgraded()).to.equal(false);
-        // TODO(jeffkaufman, #13422): this test was silently failing.  `build` was
-        // the return value from `env.sandbox.stub(element, 'buildInternal')`.
-        //
-        // expect(build.calledOnce).to.equal(true);
-      });
-
-      it('StubElement - should try to install an unregistered legacy extensions', () => {
-        delete win.__AMP_BASE_CE_CLASS;
-        const LegacyElementClass = createAmpElementForTesting(
-          win,
-          ElementStub,
-          elementConnectedCallback
-        );
-        win.customElements.define('amp-legacy', LegacyElementClass);
-        win.__AMP_EXTENDED_ELEMENTS['amp-legacy'] = ElementStub;
+    it('StubElement - createdCallback', () => {
+      const element = new StubElementClass();
+      env.sandbox.stub(element, 'buildInternal');
+
+      expect(element.isBuilt()).to.equal(false);
+      expect(element.hasAttributes()).to.equal(false);
+      expect(element.isUpgraded()).to.equal(false);
+      expect(element.readyState).to.equal('upgrading');
+      expect(element.everAttached).to.equal(false);
+      expect(element.getLayout()).to.equal(Layout_Enum.NODISPLAY);
+
+      container.appendChild(element);
+      expect(element).to.have.class('i-amphtml-element');
+      expect(element).to.have.class('i-amphtml-notbuilt');
+      expect(element).to.have.class('amp-notbuilt');
+      expect(element).to.not.have.class('i-amphtml-built');
+      expect(element.everAttached).to.equal(true);
+      expect(element.isUpgraded()).to.equal(false);
+      // TODO(jeffkaufman, #13422): this test was silently failing.  `build` was
+      // the return value from `env.sandbox.stub(element, 'buildInternal')`.
+      //
+      // expect(build.calledOnce).to.equal(true);
+    });
 
-        const extensions = Services.extensionsFor(win);
-        env.sandbox.stub(extensions, 'installExtensionForDoc');
+    it('StubElement - should try to install an unregistered legacy extensions', () => {
+      delete win.__AMP_BASE_CE_CLASS;
+      const LegacyElementClass = createAmpElementForTesting(
+        win,
+        ElementStub,
+        elementConnectedCallback
+      );
+      win.customElements.define('amp-legacy', LegacyElementClass);
+      win.__AMP_EXTENDED_ELEMENTS['amp-legacy'] = ElementStub;
 
-        const element = new LegacyElementClass();
-        env.sandbox.stub(element, 'buildInternal');
+      const extensions = Services.extensionsFor(win);
+      env.sandbox.stub(extensions, 'installExtensionForDoc');
 
-        container.appendChild(element);
-        expect(element.readyState).to.equal('upgrading');
-        expect(extensions.installExtensionForDoc).to.be.calledOnce.calledWith(
-          ampdoc,
-          'amp-legacy',
-          '0.1'
-        );
-      });
+      const element = new LegacyElementClass();
+      env.sandbox.stub(element, 'buildInternal');
 
-      it('StubElement - should not try to install a pre-registered legacy extensions', () => {
-        delete win.__AMP_BASE_CE_CLASS;
-        const LegacyElementClass = createAmpElementForTesting(
-          win,
-          ElementStub,
-          elementConnectedCallback
-        );
-        win.customElements.define('amp-legacy', LegacyElementClass);
-        win.__AMP_EXTENDED_ELEMENTS['amp-legacy'] = ElementStub;
-        ampdoc.declareExtension('amp-legacy', '0.1');
+      container.appendChild(element);
+      expect(element.readyState).to.equal('upgrading');
+      expect(extensions.installExtensionForDoc).to.be.calledOnce.calledWith(
+        ampdoc,
+        'amp-legacy',
+        '0.1'
+      );
+    });
 
-        const extensions = Services.extensionsFor(win);
-        env.sandbox.stub(extensions, 'installExtensionForDoc');
+    it('StubElement - should not try to install a pre-registered legacy extensions', () => {
+      delete win.__AMP_BASE_CE_CLASS;
+      const LegacyElementClass = createAmpElementForTesting(
+        win,
+        ElementStub,
+        elementConnectedCallback
+      );
+      win.customElements.define('amp-legacy', LegacyElementClass);
+      win.__AMP_EXTENDED_ELEMENTS['amp-legacy'] = ElementStub;
+      ampdoc.declareExtension('amp-legacy', '0.1');
 
-        const element = new LegacyElementClass();
-        env.sandbox.stub(element, 'buildInternal');
+      const extensions = Services.extensionsFor(win);
+      env.sandbox.stub(extensions, 'installExtensionForDoc');
 
-        container.appendChild(element);
-        expect(element.readyState).to.equal('upgrading');
-        expect(extensions.installExtensionForDoc).to.not.be.called;
-      });
+      const element = new LegacyElementClass();
+      env.sandbox.stub(element, 'buildInternal');
 
-      it('Element - should only add classes on first attachedCallback', () => {
-        const element = new ElementClass();
-        const buildPromise = Promise.resolve();
-        const buildStub = env.sandbox
-          .stub(element, 'buildInternal')
-          .returns(buildPromise);
+      container.appendChild(element);
+      expect(element.readyState).to.equal('upgrading');
+      expect(extensions.installExtensionForDoc).to.not.be.called;
+    });
 
+    it('Element - should only add classes on first attachedCallback', () => {
+      const element = new ElementClass();
+      const buildPromise = Promise.resolve();
+      const buildStub = env.sandbox
+        .stub(element, 'buildInternal')
+        .returns(buildPromise);
+
+      expect(element).to.not.have.class('i-amphtml-element');
+      expect(element).to.not.have.class('i-amphtml-notbuilt');
+      expect(element).to.not.have.class('amp-notbuilt');
+      expect(element).to.not.have.class('i-amphtml-built');
+
+      container.appendChild(element);
+
+      expect(element).to.have.class('i-amphtml-element');
+      expect(element).to.have.class('i-amphtml-notbuilt');
+      expect(element).to.have.class('amp-notbuilt');
+      element.classList.remove('i-amphtml-element');
+      element.classList.remove('i-amphtml-notbuilt');
+      element.classList.remove('amp-notbuilt');
+
+      container.appendChild(element);
+      return buildPromise.then(() => {
+        expect(buildStub).to.be.called;
         expect(element).to.not.have.class('i-amphtml-element');
         expect(element).to.not.have.class('i-amphtml-notbuilt');
         expect(element).to.not.have.class('amp-notbuilt');
-        expect(element).to.not.have.class('i-amphtml-built');
-
-        container.appendChild(element);
-
-        expect(element).to.have.class('i-amphtml-element');
-        expect(element).to.have.class('i-amphtml-notbuilt');
-        expect(element).to.have.class('amp-notbuilt');
-        element.classList.remove('i-amphtml-element');
-        element.classList.remove('i-amphtml-notbuilt');
-        element.classList.remove('amp-notbuilt');
-
-        container.appendChild(element);
-        return buildPromise.then(() => {
-          expect(buildStub).to.be.called;
-          expect(element).to.not.have.class('i-amphtml-element');
-          expect(element).to.not.have.class('i-amphtml-notbuilt');
-          expect(element).to.not.have.class('amp-notbuilt');
-        });
       });
+    });
 
-      it('Element - handles async connectedCallback when disconnected', () => {
-        const element = new ElementClass();
-        env.sandbox.defineProperty(element, 'isConnected', {
-          value: false,
-        });
-
-        expect(element).to.not.have.class('i-amphtml-element');
-        expect(element).to.not.have.class('i-amphtml-notbuilt');
-        expect(element).to.not.have.class('amp-notbuilt');
-        expect(element).to.not.have.class('i-amphtml-built');
-
-        container.appendChild(element);
-
-        expect(element).to.not.have.class('i-amphtml-element');
-        expect(element).to.not.have.class('i-amphtml-notbuilt');
-        expect(element).to.not.have.class('amp-notbuilt');
-        expect(element).to.not.have.class('i-amphtml-built');
+    it('Element - handles async connectedCallback when disconnected', () => {
+      const element = new ElementClass();
+      env.sandbox.defineProperty(element, 'isConnected', {
+        value: false,
       });
 
-      it('Element - should reset on 2nd attachedCallback when requested', () => {
-        clock.tick(1);
-        const element = new ElementClass();
-        const buildPromise = Promise.resolve();
-        const buildStub = env.sandbox
-          .stub(element, 'buildInternal')
-          .returns(buildPromise);
-        container.appendChild(element);
-        container.removeChild(element);
+      expect(element).to.not.have.class('i-amphtml-element');
+      expect(element).to.not.have.class('i-amphtml-notbuilt');
+      expect(element).to.not.have.class('amp-notbuilt');
+      expect(element).to.not.have.class('i-amphtml-built');
 
-        env.sandbox
-          .stub(element, 'reconstructWhenReparented')
-          .callsFake(() => true);
-        element.layoutCount_ = 10;
-        element.isFirstLayoutCompleted_ = true;
-        element.signals().signal(CommonSignals.RENDER_START);
-        element.signals().signal(CommonSignals.LOAD_END);
-        container.appendChild(element);
-        return buildPromise.then(() => {
-          expect(buildStub).to.be.called;
-          expect(element.layoutCount_).to.equal(0);
-          expect(element.isFirstLayoutCompleted_).to.be.false;
-          expect(element.signals().get(CommonSignals.RENDER_START)).to.be.null;
-          expect(element.signals().get(CommonSignals.LOAD_END)).to.be.null;
-        });
-      });
+      container.appendChild(element);
 
-      it('Element - should NOT reset on 2nd attachedCallback w/o request', () => {
-        clock.tick(1);
-        const element = new ElementClass();
-        env.sandbox.stub(element, 'buildInternal').returns(Promise.resolve());
-        container.appendChild(element);
-        container.removeChild(element);
+      expect(element).to.not.have.class('i-amphtml-element');
+      expect(element).to.not.have.class('i-amphtml-notbuilt');
+      expect(element).to.not.have.class('amp-notbuilt');
+      expect(element).to.not.have.class('i-amphtml-built');
+    });
 
-        env.sandbox
-          .stub(element, 'reconstructWhenReparented')
-          .callsFake(() => false);
-        element.layoutCount_ = 10;
-        element.isFirstLayoutCompleted_ = true;
-        element.signals().signal(CommonSignals.RENDER_START);
-        expect(element.signals().get(CommonSignals.RENDER_START)).to.be.ok;
-        element.signals().signal(CommonSignals.LOAD_END);
-        container.appendChild(element);
-        expect(element.layoutCount_).to.equal(10);
-        expect(element.isFirstLayoutCompleted_).to.be.true;
-        expect(element.signals().get(CommonSignals.RENDER_START)).to.be.ok;
-        expect(element.signals().get(CommonSignals.LOAD_END)).to.be.ok;
+    it('Element - should reset on 2nd attachedCallback when requested', () => {
+      clock.tick(1);
+      const element = new ElementClass();
+      const buildPromise = Promise.resolve();
+      const buildStub = env.sandbox
+        .stub(element, 'buildInternal')
+        .returns(buildPromise);
+      container.appendChild(element);
+      container.removeChild(element);
+
+      env.sandbox
+        .stub(element, 'reconstructWhenReparented')
+        .callsFake(() => true);
+      element.layoutCount_ = 10;
+      element.isFirstLayoutCompleted_ = true;
+      element.signals().signal(CommonSignals_Enum.RENDER_START);
+      element.signals().signal(CommonSignals_Enum.LOAD_END);
+      container.appendChild(element);
+      return buildPromise.then(() => {
+        expect(buildStub).to.be.called;
+        expect(element.layoutCount_).to.equal(0);
+        expect(element.isFirstLayoutCompleted_).to.be.false;
+        expect(element.signals().get(CommonSignals_Enum.RENDER_START)).to.be
+          .null;
+        expect(element.signals().get(CommonSignals_Enum.LOAD_END)).to.be.null;
       });
+    });
 
-      it('Element - getIntersectionChangeEntry', () => {
-        const element = new ElementClass();
-        container.appendChild(element);
-        element.updateLayoutBox({top: 0, left: 0, width: 111, height: 51});
-        element.getIntersectionChangeEntry();
-        expect(testElementGetInsersectionElementLayoutBox).to.be.calledOnce;
-      });
+    it('Element - should NOT reset on 2nd attachedCallback w/o request', () => {
+      clock.tick(1);
+      const element = new ElementClass();
+      env.sandbox.stub(element, 'buildInternal').returns(Promise.resolve());
+      container.appendChild(element);
+      container.removeChild(element);
+
+      env.sandbox
+        .stub(element, 'reconstructWhenReparented')
+        .callsFake(() => false);
+      element.layoutCount_ = 10;
+      element.isFirstLayoutCompleted_ = true;
+      element.signals().signal(CommonSignals_Enum.RENDER_START);
+      expect(element.signals().get(CommonSignals_Enum.RENDER_START)).to.be.ok;
+      element.signals().signal(CommonSignals_Enum.LOAD_END);
+      container.appendChild(element);
+      expect(element.layoutCount_).to.equal(10);
+      expect(element.isFirstLayoutCompleted_).to.be.true;
+      expect(element.signals().get(CommonSignals_Enum.RENDER_START)).to.be.ok;
+      expect(element.signals().get(CommonSignals_Enum.LOAD_END)).to.be.ok;
+    });
 
-      it('Element - updateLayoutBox', () => {
-        const element = new ElementClass();
-        container.appendChild(element);
-        expect(element.getLayoutSize()).to.deep.equal({width: 0, height: 0});
+    it('Element - getIntersectionChangeEntry', () => {
+      const element = new ElementClass();
+      container.appendChild(element);
+      element.updateLayoutBox({top: 0, left: 0, width: 111, height: 51});
+      element.getIntersectionChangeEntry();
+      expect(testElementGetInsersectionElementLayoutBox).to.be.calledOnce;
+    });
 
-        const rect = {top: 0, left: 0, width: 111, height: 51};
-        element.updateLayoutBox(rect);
-        expect(testOnLayoutMeasureCallback).to.not.be.called;
+    it('Element - updateLayoutBox', () => {
+      const element = new ElementClass();
+      container.appendChild(element);
+      expect(element.getLayoutSize()).to.deep.equal({width: 0, height: 0});
 
-        env.sandbox.stub(element, 'isBuilt').returns(true);
-        element.updateLayoutBox(rect);
-        expect(testOnLayoutMeasureCallback).to.be.calledOnce;
-      });
+      const rect = {top: 0, left: 0, width: 111, height: 51};
+      element.updateLayoutBox(rect);
+      expect(testOnLayoutMeasureCallback).to.not.be.called;
 
-      it('should tolerate errors in onLayoutMeasure', () => {
-        const element = new ElementClass();
-        env.sandbox
-          .stub(TestElement.prototype, 'onLayoutMeasure')
-          .callsFake(() => {
-            throw new Error('intentional');
-          });
-        const errorStub = env.sandbox.stub(
-          element,
-          'dispatchCustomEventForTesting'
-        );
-        container.appendChild(element);
-        return element.buildingPromise_.then(() => {
-          allowConsoleError(() => {
-            element.updateLayoutBox({top: 0, left: 0, width: 111, height: 51});
-            expect(element.getLayoutSize()).to.be.ok;
-            expect(errorStub).to.be.calledWith(AmpEvents.ERROR, 'intentional');
-          });
+      env.sandbox.stub(element, 'isBuilt').returns(true);
+      element.updateLayoutBox(rect);
+      expect(testOnLayoutMeasureCallback).to.be.calledOnce;
+    });
+
+    it('should tolerate errors in onLayoutMeasure', () => {
+      const element = new ElementClass();
+      env.sandbox
+        .stub(TestElement.prototype, 'onLayoutMeasure')
+        .callsFake(() => {
+          throw new Error('intentional');
+        });
+      const errorStub = env.sandbox.stub(
+        element,
+        'dispatchCustomEventForTesting'
+      );
+      container.appendChild(element);
+      return element.buildingPromise_.then(() => {
+        allowConsoleError(() => {
+          element.updateLayoutBox({top: 0, left: 0, width: 111, height: 51});
+          expect(element.getLayoutSize()).to.be.ok;
+          expect(errorStub).to.be.calledWith(
+            AmpEvents_Enum.ERROR,
+            'intentional'
+          );
         });
       });
+    });
 
-      it('StubElement - upgrade after attached', () => {
-        const element = new StubElementClass();
-        expect(element.isUpgraded()).to.equal(false);
-        expect(getImplSyncForTesting(element)).to.be.null;
+    it('StubElement - upgrade after attached', () => {
+      const element = new StubElementClass();
+      expect(element.isUpgraded()).to.equal(false);
+      expect(getImplSyncForTesting(element)).to.be.null;
 
-        element.setAttribute('layout', 'fill');
-        element.updateLayoutBox({top: 0, left: 0, width: 111, height: 51});
-        container.appendChild(element);
-        resourcesMock.expects('upgraded').withExactArgs(element).once();
+      element.setAttribute('layout', 'fill');
+      element.updateLayoutBox({top: 0, left: 0, width: 111, height: 51});
+      container.appendChild(element);
+      resourcesMock.expects('upgraded').withExactArgs(element).once();
 
-        element.upgrade(TestElement);
+      element.upgrade(TestElement);
 
-        expect(element.isUpgraded()).to.equal(true);
-        expect(element.readyState).to.equal('building');
-        const impl = getImplSyncForTesting(element);
-        expect(impl).to.be.instanceOf(TestElement);
-        expect(impl.getLayout()).to.equal(Layout.FILL);
-        expect(element.isBuilt()).to.equal(false);
-      });
+      expect(element.isUpgraded()).to.equal(true);
+      expect(element.readyState).to.equal('building');
+      const impl = getImplSyncForTesting(element);
+      expect(impl).to.be.instanceOf(TestElement);
+      expect(impl.getLayout()).to.equal(Layout_Enum.FILL);
+      expect(element.isBuilt()).to.equal(false);
+    });
 
-      it('StubElement - should not upgrade before attached', () => {
-        const element = new StubElementClass();
-        expect(element.isUpgraded()).to.equal(false);
-        expect(getImplSyncForTesting(element)).to.be.null;
+    it('StubElement - should not upgrade before attached', () => {
+      const element = new StubElementClass();
+      expect(element.isUpgraded()).to.equal(false);
+      expect(getImplSyncForTesting(element)).to.be.null;
 
-        element.setAttribute('layout', 'fill');
-        element.updateLayoutBox({top: 0, left: 0, width: 111, height: 51});
-        resourcesMock.expects('upgraded').withExactArgs(element).never();
+      element.setAttribute('layout', 'fill');
+      element.updateLayoutBox({top: 0, left: 0, width: 111, height: 51});
+      resourcesMock.expects('upgraded').withExactArgs(element).never();
 
-        element.upgrade(TestElement);
+      element.upgrade(TestElement);
 
-        expect(element.isUpgraded()).to.equal(false);
-        expect(element.readyState).to.equal('upgrading');
-        expect(getImplSyncForTesting(element)).to.be.null;
-        expect(element.isBuilt()).to.equal(false);
-      });
+      expect(element.isUpgraded()).to.equal(false);
+      expect(element.readyState).to.equal('upgrading');
+      expect(getImplSyncForTesting(element)).to.be.null;
+      expect(element.isBuilt()).to.equal(false);
+    });
 
-      it('StubElement - upgrade if ever attached', () => {
-        const element = new StubElementClass();
-        expect(element.isUpgraded()).to.equal(false);
-        expect(getImplSyncForTesting(element)).to.be.null;
+    it('StubElement - upgrade if ever attached', () => {
+      const element = new StubElementClass();
+      expect(element.isUpgraded()).to.equal(false);
+      expect(getImplSyncForTesting(element)).to.be.null;
 
-        element.setAttribute('layout', 'fill');
-        element.updateLayoutBox({top: 0, left: 0, width: 111, height: 51});
+      element.setAttribute('layout', 'fill');
+      element.updateLayoutBox({top: 0, left: 0, width: 111, height: 51});
 
-        // Attach once and remove.
-        container.appendChild(element);
-        container.removeChild(element);
+      // Attach once and remove.
+      container.appendChild(element);
+      container.removeChild(element);
 
-        resourcesMock.expects('upgraded').withExactArgs(element).once();
+      resourcesMock.expects('upgraded').withExactArgs(element).once();
 
-        element.upgrade(TestElement);
+      element.upgrade(TestElement);
 
-        expect(element.isUpgraded()).to.equal(true);
-        expect(element.readyState).to.equal('building');
-        expect(getImplSyncForTesting(element)).to.be.instanceOf(TestElement);
-        expect(element.isBuilt()).to.equal(false);
-      });
+      expect(element.isUpgraded()).to.equal(true);
+      expect(element.readyState).to.equal('building');
+      expect(getImplSyncForTesting(element)).to.be.instanceOf(TestElement);
+      expect(element.isBuilt()).to.equal(false);
+    });
 
-      it('StubElement - should NOT allow upgrade for a template element', () => {
-        const element = new StubElementClass();
-        expect(element.isUpgraded()).to.equal(false);
-        element.isInTemplate_ = true;
+    it('StubElement - should NOT allow upgrade for a template element', () => {
+      const element = new StubElementClass();
+      expect(element.isUpgraded()).to.equal(false);
+      element.isInTemplate_ = true;
 
-        resourcesMock.expects('upgraded').withExactArgs(element).never();
+      resourcesMock.expects('upgraded').withExactArgs(element).never();
 
-        element.upgrade(TestElement);
-        expect(element.isUpgraded()).to.equal(false);
-        expect(element.readyState).to.equal('upgrading');
-        expect(element.isBuilt()).to.equal(false);
-      });
+      element.upgrade(TestElement);
+      expect(element.isUpgraded()).to.equal(false);
+      expect(element.readyState).to.equal('upgrading');
+      expect(element.isBuilt()).to.equal(false);
+    });
 
-      it('Element - re-upgrade to new direct instance', () => {
-        const element = new ElementClassWithReUpgrade();
-        expect(element.isUpgraded()).to.equal(false);
+    it('Element - re-upgrade to new direct instance', () => {
+      const element = new ElementClassWithReUpgrade();
+      expect(element.isUpgraded()).to.equal(false);
 
-        container.appendChild(element);
-        expect(element.isUpgraded()).to.equal(true);
+      container.appendChild(element);
+      expect(element.isUpgraded()).to.equal(true);
 
-        const impl = getImplSyncForTesting(element);
-        expect(impl).to.be.instanceOf(TestElement);
-        expect(impl.source).to.equal('re-upgrade');
-        expect(element.upgradeDelayMs_).to.equal(0);
-      });
+      const impl = getImplSyncForTesting(element);
+      expect(impl).to.be.instanceOf(TestElement);
+      expect(impl.source).to.equal('re-upgrade');
+      expect(element.upgradeDelayMs_).to.equal(0);
+    });
 
-      it('Element - re-upgrade to new promised instance', async () => {
-        let promise;
-        env.sandbox
-          .stub(TestElementWithReUpgrade.prototype, 'upgradeCallback')
-          .callsFake(function () {
-            promise = Promise.resolve(
-              new TestElement(this.element, 're-upgrade-with-promise')
-            );
-            return promise;
-          });
+    it('Element - re-upgrade to new promised instance', async () => {
+      let promise;
+      env.sandbox
+        .stub(TestElementWithReUpgrade.prototype, 'upgradeCallback')
+        .callsFake(function () {
+          promise = Promise.resolve(
+            new TestElement(this.element, 're-upgrade-with-promise')
+          );
+          return promise;
+        });
 
-        const element = new ElementClassWithReUpgrade();
-        expect(element.isUpgraded()).to.equal(false);
-        container.appendChild(element);
+      const element = new ElementClassWithReUpgrade();
+      expect(element.isUpgraded()).to.equal(false);
+      container.appendChild(element);
 
-        expect(getImplSyncForTesting(element)).to.be.null;
-        expect(element.isUpgraded()).to.equal(false);
-        expect(element.upgradeState_).to.equal(/* UPGRADE_IN_PROGRESS */ 4);
-        expect(promise).to.exist;
+      expect(getImplSyncForTesting(element)).to.be.null;
+      expect(element.isUpgraded()).to.equal(false);
+      expect(element.upgradeState_).to.equal(/* UPGRADE_IN_PROGRESS */ 4);
+      expect(promise).to.exist;
 
-        await promise;
-        await skipMicroTask();
-        expect(element.isUpgraded()).to.equal(true);
-        expect(element.upgradeState_).to.equal(/* UPGRADED */ 2);
+      await promise;
+      await skipMicroTask();
+      expect(element.isUpgraded()).to.equal(true);
+      expect(element.upgradeState_).to.equal(/* UPGRADED */ 2);
 
-        const impl = getImplSyncForTesting(element);
-        expect(impl).to.be.instanceOf(TestElement);
-        expect(impl.source).to.equal('re-upgrade-with-promise');
-      });
+      const impl = getImplSyncForTesting(element);
+      expect(impl).to.be.instanceOf(TestElement);
+      expect(impl.source).to.equal('re-upgrade-with-promise');
+    });
 
-      it('Element - re-upgrade to new promised null', async () => {
-        let promise;
-        env.sandbox
-          .stub(TestElementWithReUpgrade.prototype, 'upgradeCallback')
-          .callsFake(function () {
-            promise = Promise.resolve(null);
-            return promise;
-          });
+    it('Element - re-upgrade to new promised null', async () => {
+      let promise;
+      env.sandbox
+        .stub(TestElementWithReUpgrade.prototype, 'upgradeCallback')
+        .callsFake(function () {
+          promise = Promise.resolve(null);
+          return promise;
+        });
 
-        const element = new ElementClassWithReUpgrade();
-        expect(element.isUpgraded()).to.equal(false);
-        container.appendChild(element);
+      const element = new ElementClassWithReUpgrade();
+      expect(element.isUpgraded()).to.equal(false);
+      container.appendChild(element);
 
-        expect(getImplSyncForTesting(element)).to.be.null;
-        expect(element.isUpgraded()).to.equal(false);
-        expect(element.upgradeState_).to.equal(/* UPGRADE_IN_PROGRESS */ 4);
-        expect(promise).to.exist;
+      expect(getImplSyncForTesting(element)).to.be.null;
+      expect(element.isUpgraded()).to.equal(false);
+      expect(element.upgradeState_).to.equal(/* UPGRADE_IN_PROGRESS */ 4);
+      expect(promise).to.exist;
 
-        await promise;
-        await skipMicroTask();
+      await promise;
+      await skipMicroTask();
 
-        expect(element.isUpgraded()).to.equal(true);
-        expect(element.upgradeState_).to.equal(/* UPGRADED */ 2);
+      expect(element.isUpgraded()).to.equal(true);
+      expect(element.upgradeState_).to.equal(/* UPGRADED */ 2);
 
-        const impl = getImplSyncForTesting(element);
-        expect(impl).to.be.instanceOf(TestElementWithReUpgrade);
-      });
+      const impl = getImplSyncForTesting(element);
+      expect(impl).to.be.instanceOf(TestElementWithReUpgrade);
+    });
 
-      it('StubElement - re-upgrade', () => {
-        const element = new StubElementClass();
-        expect(element.isUpgraded()).to.equal(false);
-        resourcesMock.expects('upgraded').withExactArgs(element).never();
+    it('StubElement - re-upgrade', () => {
+      const element = new StubElementClass();
+      expect(element.isUpgraded()).to.equal(false);
+      resourcesMock.expects('upgraded').withExactArgs(element).never();
 
-        element.upgrade(TestElementWithReUpgrade);
+      element.upgrade(TestElementWithReUpgrade);
 
-        expect(element.isUpgraded()).to.equal(false);
-      });
+      expect(element.isUpgraded()).to.equal(false);
+    });
 
-      it('Element - build allowed', () => {
-        const element = new ElementClass();
-        const getSizerStub = env.sandbox.stub(element, 'getSizer_');
+    it('Element - build allowed', () => {
+      const element = new ElementClass();
+      const getSizerStub = env.sandbox.stub(element, 'getSizer_');
 
-        expect(element.isBuilt()).to.equal(false);
-        expect(testElementBuildCallback).to.have.not.been.called;
-        expect(element.signals().get(CommonSignals.BUILT)).to.not.be.ok;
+      expect(element.isBuilt()).to.equal(false);
+      expect(testElementBuildCallback).to.have.not.been.called;
+      expect(element.signals().get(CommonSignals_Enum.BUILT)).to.not.be.ok;
 
-        clock.tick(1);
-        container.appendChild(element);
-        return element.buildingPromise_.then(() => {
-          expect(element.isBuilt()).to.equal(true);
-          expect(element).to.not.have.class('i-amphtml-notbuilt');
-          expect(element).to.not.have.class('amp-notbuilt');
-          expect(element).to.have.class('i-amphtml-built');
-          expect(getSizerStub).to.be.calledOnce;
-          expect(testElementBuildCallback).to.be.calledOnce;
-          expect(element.signals().get(CommonSignals.BUILT)).to.be.ok;
-          return element.whenBuilt(); // Should eventually resolve.
-        });
+      clock.tick(1);
+      container.appendChild(element);
+      return element.buildingPromise_.then(() => {
+        expect(element.isBuilt()).to.equal(true);
+        expect(element).to.not.have.class('i-amphtml-notbuilt');
+        expect(element).to.not.have.class('amp-notbuilt');
+        expect(element).to.have.class('i-amphtml-built');
+        expect(getSizerStub).to.be.calledOnce;
+        expect(testElementBuildCallback).to.be.calledOnce;
+        expect(element.signals().get(CommonSignals_Enum.BUILT)).to.be.ok;
+        return element.whenBuilt(); // Should eventually resolve.
       });
+    });
 
-      it('Element - attachedCallback is called post build and on reconnect', async () => {
-        const element = new ElementClass();
+    it('Element - attachedCallback is called post build and on reconnect', async () => {
+      const element = new ElementClass();
 
-        // First build.
-        clock.tick(1);
-        container.appendChild(element);
-        await element.buildingPromise_;
-        expect(testElementAttachedCallback).to.be.calledOnce;
+      // First build.
+      clock.tick(1);
+      container.appendChild(element);
+      await element.buildingPromise_;
+      expect(testElementAttachedCallback).to.be.calledOnce;
 
-        // Detach.
-        container.removeChild(element);
-        clock.tick(1);
-        expect(testElementDetachedCallback).to.be.calledOnce;
+      // Detach.
+      container.removeChild(element);
+      clock.tick(1);
+      expect(testElementDetachedCallback).to.be.calledOnce;
 
-        // Reconnect.
-        container.appendChild(element);
-        clock.tick(1);
-        expect(testElementAttachedCallback).to.be.calledTwice;
-      });
+      // Reconnect.
+      container.appendChild(element);
+      clock.tick(1);
+      expect(testElementAttachedCallback).to.be.calledTwice;
+    });
 
-      it('should build on consent sufficient', () => {
-        const element = new ElementClass();
-        env.sandbox
-          .stub(Services, 'consentPolicyServiceForDocOrNull')
-          .callsFake(() => {
-            return Promise.resolve({
-              whenPolicyUnblock: () => {
-                return Promise.resolve(true);
-              },
-            });
+    it('should build on consent sufficient', () => {
+      const element = new ElementClass();
+      env.sandbox
+        .stub(Services, 'consentPolicyServiceForDocOrNull')
+        .callsFake(() => {
+          return Promise.resolve({
+            whenPolicyUnblock: () => {
+              return Promise.resolve(true);
+            },
           });
-        env.sandbox.stub(element, 'getConsentPolicy_').callsFake(() => {
-          return 'default';
         });
-
-        clock.tick(1);
-        container.appendChild(element);
-        return element.whenBuilt();
+      env.sandbox.stub(element, 'getConsentPolicy_').callsFake(() => {
+        return 'default';
       });
 
-      it('should build on no consent policy', () => {
-        const element = new ElementClass();
-        env.sandbox
-          .stub(Services, 'consentPolicyServiceForDocOrNull')
-          .resolves(null);
-        env.sandbox.stub(element, 'getConsentPolicy_').callsFake(() => {
-          return 'default';
-        });
+      clock.tick(1);
+      container.appendChild(element);
+      return element.whenBuilt();
+    });
 
-        clock.tick(1);
-        container.appendChild(element);
-        return element.whenBuilt();
+    it('should build on no consent policy', () => {
+      const element = new ElementClass();
+      env.sandbox
+        .stub(Services, 'consentPolicyServiceForDocOrNull')
+        .resolves(null);
+      env.sandbox.stub(element, 'getConsentPolicy_').callsFake(() => {
+        return 'default';
       });
 
-      it('should not build on consent insufficient', () => {
-        const element = new ElementClass();
-        env.sandbox
-          .stub(Services, 'consentPolicyServiceForDocOrNull')
-          .callsFake(() => {
-            return Promise.resolve({
-              whenPolicyUnblock: () => {
-                return Promise.resolve(false);
-              },
-            });
+      clock.tick(1);
+      container.appendChild(element);
+      return element.whenBuilt();
+    });
+
+    it('should not build on consent insufficient', () => {
+      const element = new ElementClass();
+      env.sandbox
+        .stub(Services, 'consentPolicyServiceForDocOrNull')
+        .callsFake(() => {
+          return Promise.resolve({
+            whenPolicyUnblock: () => {
+              return Promise.resolve(false);
+            },
           });
-        env.sandbox.stub(element, 'getConsentPolicy_').callsFake(() => {
-          return 'default';
         });
-
-        clock.tick(1);
-        container.appendChild(element);
-        return expect(element.whenBuilt()).to.eventually.be.rejectedWith(
-          /BLOCK_BY_CONSENT/
-        );
-      });
-
-      it('should respect user specified consent policy', () => {
-        const element = new ElementClass();
-        container.appendChild(element);
-        expect(element.getConsentPolicy_()).to.equal(null);
-        element.setAttribute('data-block-on-consent', '');
-        expect(element.getConsentPolicy_()).to.equal('default');
-        element.setAttribute('data-block-on-consent', '_none');
-        expect(element.getConsentPolicy_()).to.equal('_none');
+      env.sandbox.stub(element, 'getConsentPolicy_').callsFake(() => {
+        return 'default';
       });
 
-      it('should repsect metaTag specified consent', () => {
-        const meta = doc.createElement('meta');
-        meta.setAttribute('name', 'amp-consent-blocking');
-        meta.setAttribute('content', 'amp-test');
-        doc.head.appendChild(meta);
-        const element = new ElementClass();
-        container.appendChild(element);
-        expect(element.getConsentPolicy_()).to.equal('default');
-        expect(element.getAttribute('data-block-on-consent')).to.equal(
-          'default'
-        );
-      });
-
-      describe('consent', () => {
-        describe('getPurposeConsent_', () => {
-          let element;
-          beforeEach(() => {
-            element = new ElementClass();
-          });
-
-          it('should find no consent purposes w/ no attribute', () => {
-            expect(element.getPurposesConsent_()).to.be.undefined;
-          });
+      clock.tick(1);
+      container.appendChild(element);
+      return expect(element.whenBuilt()).to.eventually.be.rejectedWith(
+        /BLOCK_BY_CONSENT/
+      );
+    });
 
-          it('should find no consent purposes w/ no value on attribute', () => {
-            element.setAttribute('data-block-on-consent-purposes', '');
-            expect(element.getPurposesConsent_()).to.be.undefined;
-          });
+    it('should respect user specified consent policy', () => {
+      const element = new ElementClass();
+      container.appendChild(element);
+      expect(element.getConsentPolicy_()).to.equal(null);
+      element.setAttribute('data-block-on-consent', '');
+      expect(element.getConsentPolicy_()).to.equal('default');
+      element.setAttribute('data-block-on-consent', '_none');
+      expect(element.getConsentPolicy_()).to.equal('_none');
+    });
 
-          it('should find correct consent purposes', () => {
-            element.setAttribute(
-              'data-block-on-consent-purposes',
-              'purpose-foo,purpose-bar'
-            );
-            expect(element.getPurposesConsent_()).to.deep.equals([
-              'purpose-foo',
-              'purpose-bar',
-            ]);
-          });
+    it('should repsect metaTag specified consent', () => {
+      const meta = doc.createElement('meta');
+      meta.setAttribute('name', 'amp-consent-blocking');
+      meta.setAttribute('content', 'amp-test');
+      doc.head.appendChild(meta);
+      const element = new ElementClass();
+      container.appendChild(element);
+      expect(element.getConsentPolicy_()).to.equal('default');
+      expect(element.getAttribute('data-block-on-consent')).to.equal('default');
+    });
 
-          it('should find correct consent purposes w/ whitespaces', () => {
-            element.setAttribute(
-              'data-block-on-consent-purposes',
-              '     purpose-foo, purpose-bar'
-            );
-            expect(element.getPurposesConsent_()).to.deep.equals([
-              'purpose-foo',
-              'purpose-bar',
-            ]);
-          });
+    describe('consent', () => {
+      describe('getPurposeConsent_', () => {
+        let element;
+        beforeEach(() => {
+          element = new ElementClass();
         });
 
-        it('should default to policyId', () => {
-          const element = new ElementClass();
-          const purposesSpy = env.sandbox.spy();
-          env.sandbox
-            .stub(Services, 'consentPolicyServiceForDocOrNull')
-            .resolves({
-              whenPolicyUnblock: () => {
-                return Promise.resolve(true);
-              },
-              whenPurposesUnblock: () => purposesSpy,
-            });
-          element.setAttribute('data-block-on-consent', '');
-          element.setAttribute(
-            'data-block-on-consent-purposes',
-            'purpose-foo,purpose-bar'
-          );
+        it('should find no consent purposes w/ no attribute', () => {
+          expect(element.getPurposesConsent_()).to.be.undefined;
+        });
 
-          clock.tick(1);
-          container.appendChild(element);
-          return element.whenBuilt().then(() => {
-            expect(purposesSpy).to.not.be.called;
-          });
+        it('should find no consent purposes w/ no value on attribute', () => {
+          element.setAttribute('data-block-on-consent-purposes', '');
+          expect(element.getPurposesConsent_()).to.be.undefined;
         });
 
-        it('should build on purpose consents', () => {
-          const element = new ElementClass();
-          const defaultPolicySpy = env.sandbox.spy();
-          env.sandbox
-            .stub(Services, 'consentPolicyServiceForDocOrNull')
-            .resolves({
-              whenPolicyUnblock: () => {
-                return defaultPolicySpy;
-              },
-              whenPurposesUnblock: () => {
-                return Promise.resolve(true);
-              },
-            });
+        it('should find correct consent purposes', () => {
           element.setAttribute(
             'data-block-on-consent-purposes',
             'purpose-foo,purpose-bar'
           );
-
-          clock.tick(1);
-          container.appendChild(element);
-          return element.whenBuilt().then(() => {
-            expect(defaultPolicySpy).to.not.be.called;
-          });
+          expect(element.getPurposesConsent_()).to.deep.equals([
+            'purpose-foo',
+            'purpose-bar',
+          ]);
         });
 
-        it('should not build on insufficient purpose consents', () => {
-          const element = new ElementClass();
-          env.sandbox
-            .stub(Services, 'consentPolicyServiceForDocOrNull')
-            .resolves({
-              whenPurposesUnblock: () => {
-                return Promise.resolve(false);
-              },
-            });
+        it('should find correct consent purposes w/ whitespaces', () => {
           element.setAttribute(
             'data-block-on-consent-purposes',
-            'purpose-foo,purpose-bar'
-          );
-
-          clock.tick(1);
-          container.appendChild(element);
-          return expect(element.whenBuilt()).to.eventually.be.rejectedWith(
-            /BLOCK_BY_CONSENT/
+            '     purpose-foo, purpose-bar'
           );
+          expect(element.getPurposesConsent_()).to.deep.equals([
+            'purpose-foo',
+            'purpose-bar',
+          ]);
         });
       });
 
-      it('should anticipate sync build errors', () => {
-        expectAsyncConsoleError(/intentional/, 2);
+      it('should default to policyId', () => {
         const element = new ElementClass();
+        const purposesSpy = env.sandbox.spy();
         env.sandbox
-          .stub(TestElement.prototype, 'buildCallback')
-          .callsFake(() => {
-            throw new Error('intentional');
+          .stub(Services, 'consentPolicyServiceForDocOrNull')
+          .resolves({
+            whenPolicyUnblock: () => {
+              return Promise.resolve(true);
+            },
+            whenPurposesUnblock: () => purposesSpy,
           });
-        container.appendChild(element);
-        expect(element.isBuilt()).to.be.false;
-        expect(element).to.have.class('i-amphtml-notbuilt');
-        expect(element).to.have.class('amp-notbuilt');
-        return expect(element.whenBuilt()).to.eventually.be.rejectedWith(
-          /intentional/
+        element.setAttribute('data-block-on-consent', '');
+        element.setAttribute(
+          'data-block-on-consent-purposes',
+          'purpose-foo,purpose-bar'
         );
-      });
-
-      it('Element - build creates a placeholder if one does not exist', () => {
-        const element = new ElementClass();
-        expect(testElementCreatePlaceholderCallback).to.have.not.been.called;
 
+        clock.tick(1);
         container.appendChild(element);
-        return element.buildingPromise_.then(() => {
-          expect(element.isBuilt()).to.equal(true);
-          expect(testElementCreatePlaceholderCallback).to.be.calledOnce;
+        return element.whenBuilt().then(() => {
+          expect(purposesSpy).to.not.be.called;
         });
       });
 
-      it('Element - build does not create a placeholder when one exists', () => {
+      it('should build on purpose consents', () => {
         const element = new ElementClass();
-        const placeholder = doc.createElement('div');
-        placeholder.setAttribute('placeholder', '');
-        element.appendChild(placeholder);
-        expect(testElementCreatePlaceholderCallback).to.have.not.been.called;
+        const defaultPolicySpy = env.sandbox.spy();
+        env.sandbox
+          .stub(Services, 'consentPolicyServiceForDocOrNull')
+          .resolves({
+            whenPolicyUnblock: () => {
+              return defaultPolicySpy;
+            },
+            whenPurposesUnblock: () => {
+              return Promise.resolve(true);
+            },
+          });
+        element.setAttribute(
+          'data-block-on-consent-purposes',
+          'purpose-foo,purpose-bar'
+        );
 
+        clock.tick(1);
         container.appendChild(element);
-        return element.buildingPromise_.then(() => {
-          expect(element.isBuilt()).to.equal(true);
-          expect(element.readyState).to.equal('loading');
-          expect(testElementCreatePlaceholderCallback).to.have.not.been.called;
+        return element.whenBuilt().then(() => {
+          expect(defaultPolicySpy).to.not.be.called;
         });
       });
 
-      it('Element - buildCallback cannot be called twice', () => {
+      it('should not build on insufficient purpose consents', () => {
         const element = new ElementClass();
-        expect(element.isBuilt()).to.equal(false);
-        expect(testElementBuildCallback).to.have.not.been.called;
+        env.sandbox
+          .stub(Services, 'consentPolicyServiceForDocOrNull')
+          .resolves({
+            whenPurposesUnblock: () => {
+              return Promise.resolve(false);
+            },
+          });
+        element.setAttribute(
+          'data-block-on-consent-purposes',
+          'purpose-foo,purpose-bar'
+        );
 
+        clock.tick(1);
         container.appendChild(element);
+        return expect(element.whenBuilt()).to.eventually.be.rejectedWith(
+          /BLOCK_BY_CONSENT/
+        );
+      });
+    });
 
-        return element.buildingPromise_.then(() => {
-          expect(element.isBuilt()).to.equal(true);
-          expect(testElementBuildCallback).to.be.calledOnce;
+    it('should anticipate sync build errors', () => {
+      expectAsyncConsoleError(/intentional/, 2);
+      const element = new ElementClass();
+      env.sandbox.stub(TestElement.prototype, 'buildCallback').callsFake(() => {
+        throw new Error('intentional');
+      });
+      container.appendChild(element);
+      expect(element.isBuilt()).to.be.false;
+      expect(element).to.have.class('i-amphtml-notbuilt');
+      expect(element).to.have.class('amp-notbuilt');
+      return expect(element.whenBuilt()).to.eventually.be.rejectedWith(
+        /intentional/
+      );
+    });
 
-          // Call again.
-          return element.buildInternal().then(() => {
-            expect(element.isBuilt()).to.equal(true);
-            expect(element.readyState).to.equal('loading');
-            expect(testElementBuildCallback).to.be.calledOnce;
-            setTimeout(() => {
-              expect(testElementPreconnectCallback).to.be.calledOnce;
-            }, 0);
-          });
-        });
+    it('Element - build creates a placeholder if one does not exist', () => {
+      const element = new ElementClass();
+      expect(testElementCreatePlaceholderCallback).to.have.not.been.called;
+
+      container.appendChild(element);
+      return element.buildingPromise_.then(() => {
+        expect(element.isBuilt()).to.equal(true);
+        expect(testElementCreatePlaceholderCallback).to.be.calledOnce;
       });
+    });
 
-      it('Element - build is repeatable', async () => {
-        const element = new ElementClass();
-        expect(element.isBuilt()).to.equal(false);
-        expect(testElementBuildCallback).to.have.not.been.called;
+    it('Element - build does not create a placeholder when one exists', () => {
+      const element = new ElementClass();
+      const placeholder = doc.createElement('div');
+      placeholder.setAttribute('placeholder', '');
+      element.appendChild(placeholder);
+      expect(testElementCreatePlaceholderCallback).to.have.not.been.called;
+
+      container.appendChild(element);
+      return element.buildingPromise_.then(() => {
+        expect(element.isBuilt()).to.equal(true);
+        expect(element.readyState).to.equal('loading');
+        expect(testElementCreatePlaceholderCallback).to.have.not.been.called;
+      });
+    });
 
-        container.appendChild(element);
-        const buildingPromise = element.buildingPromise_;
-        expect(element.buildInternal()).to.equal(buildingPromise);
-        // Skip a task.
-        await new Promise(setTimeout);
+    it('Element - buildCallback cannot be called twice', () => {
+      const element = new ElementClass();
+      expect(element.isBuilt()).to.equal(false);
+      expect(testElementBuildCallback).to.have.not.been.called;
+
+      container.appendChild(element);
+
+      return element.buildingPromise_.then(() => {
+        expect(element.isBuilt()).to.equal(true);
         expect(testElementBuildCallback).to.be.calledOnce;
+
+        // Call again.
+        return element.buildInternal().then(() => {
+          expect(element.isBuilt()).to.equal(true);
+          expect(element.readyState).to.equal('loading');
+          expect(testElementBuildCallback).to.be.calledOnce;
+          setTimeout(() => {
+            expect(testElementPreconnectCallback).to.be.calledOnce;
+          }, 0);
+        });
       });
+    });
 
-      it('Element - build NOT allowed when in template', () => {
-        const element = new ElementClass();
-        expect(element.isBuilt()).to.equal(false);
-        expect(testElementBuildCallback).to.have.not.been.called;
+    it('Element - build is repeatable', async () => {
+      const element = new ElementClass();
+      expect(element.isBuilt()).to.equal(false);
+      expect(testElementBuildCallback).to.have.not.been.called;
+
+      container.appendChild(element);
+      const buildingPromise = element.buildingPromise_;
+      expect(element.buildInternal()).to.equal(buildingPromise);
+      // Skip a task.
+      await new Promise(setTimeout);
+      expect(testElementBuildCallback).to.be.calledOnce;
+    });
 
-        element.isInTemplate_ = true;
-        allowConsoleError(() => {
-          expect(() => {
-            element.buildInternal();
-          }).to.throw(/Must never be called in template/);
-        });
+    it('Element - build NOT allowed when in template', () => {
+      const element = new ElementClass();
+      expect(element.isBuilt()).to.equal(false);
+      expect(testElementBuildCallback).to.have.not.been.called;
 
-        expect(element.isBuilt()).to.equal(false);
-        expect(testElementBuildCallback).to.have.not.been.called;
+      element.isInTemplate_ = true;
+      allowConsoleError(() => {
+        expect(() => {
+          element.buildInternal();
+        }).to.throw(/Must never be called in template/);
       });
 
-      it('StubElement - build never allowed', () => {
-        const element = new StubElementClass();
-        expect(element.isBuilt()).to.equal(false);
-        expect(testElementBuildCallback).to.have.not.been.called;
+      expect(element.isBuilt()).to.equal(false);
+      expect(testElementBuildCallback).to.have.not.been.called;
+    });
 
-        allowConsoleError(() => {
-          expect(() => {
-            element.buildInternal();
-          }).to.throw(/Cannot build unupgraded element/);
-        });
+    it('StubElement - build never allowed', () => {
+      const element = new StubElementClass();
+      expect(element.isBuilt()).to.equal(false);
+      expect(testElementBuildCallback).to.have.not.been.called;
 
-        expect(element.isBuilt()).to.equal(false);
-        expect(testElementBuildCallback).to.have.not.been.called;
+      allowConsoleError(() => {
+        expect(() => {
+          element.buildInternal();
+        }).to.throw(/Cannot build unupgraded element/);
       });
 
-      it('Element - createPlaceholder', () => {
-        const element = new ElementClass();
-        container.appendChild(element);
-        element.createPlaceholder();
-        expect(testElementCreatePlaceholderCallback).to.be.calledOnce;
-      });
+      expect(element.isBuilt()).to.equal(false);
+      expect(testElementBuildCallback).to.have.not.been.called;
+    });
 
-      it('Element - attachedCallback', () => {
-        const element = new ElementClass();
-        element.setAttribute('layout', 'fill');
-        expect(element.everAttached).to.equal(false);
-        expect(element.getLayout()).to.equal(Layout.NODISPLAY);
+    it('Element - createPlaceholder', () => {
+      const element = new ElementClass();
+      container.appendChild(element);
+      element.createPlaceholder();
+      expect(testElementCreatePlaceholderCallback).to.be.calledOnce;
+    });
 
-        resourcesMock.expects('add').withExactArgs(element).atLeast(1);
-        resourcesMock.expects('upgraded').withExactArgs(element).atLeast(1);
-        container.appendChild(element);
+    it('Element - attachedCallback', () => {
+      const element = new ElementClass();
+      element.setAttribute('layout', 'fill');
+      expect(element.everAttached).to.equal(false);
+      expect(element.getLayout()).to.equal(Layout_Enum.NODISPLAY);
+
+      resourcesMock.expects('add').withExactArgs(element).atLeast(1);
+      resourcesMock.expects('upgraded').withExactArgs(element).atLeast(1);
+      container.appendChild(element);
+
+      expect(element.everAttached).to.equal(true);
+      expect(element.getLayout()).to.equal(Layout_Enum.FILL);
+      expect(element.getLayout()).to.equal(Layout_Enum.FILL);
+      expect(getImplSyncForTesting(element).getLayout()).to.equal(
+        Layout_Enum.FILL
+      );
+    });
 
-        expect(element.everAttached).to.equal(true);
-        expect(element.getLayout()).to.equal(Layout.FILL);
-        expect(element.getLayout()).to.equal(Layout.FILL);
-        expect(getImplSyncForTesting(element).getLayout()).to.equal(
-          Layout.FILL
-        );
-      });
+    it('StubElement - attachedCallback', () => {
+      const element = new StubElementClass();
+      element.setAttribute('layout', 'fill');
+      expect(element.everAttached).to.equal(false);
+      expect(element.getLayout()).to.equal(Layout_Enum.NODISPLAY);
+
+      resourcesMock.expects('add').withExactArgs(element).atLeast(1);
+      container.appendChild(element);
+
+      expect(element.everAttached).to.equal(true);
+      expect(element.getLayout()).to.equal(Layout_Enum.FILL);
+      // Not upgraded yet, but extension hasn't failed.
+      expect(element).not.to.have.class('amp-unresolved');
+      expect(element).not.to.have.class('i-amphtml-unresolved');
+
+      // Upgrade
+      resourcesMock.expects('upgraded').withExactArgs(element).once();
+      element.upgrade(TestElement);
+
+      expect(element.getLayout()).to.equal(Layout_Enum.FILL);
+      expect(element.getLayout()).to.equal(Layout_Enum.FILL);
+      expect(getImplSyncForTesting(element).getLayout()).to.equal(
+        Layout_Enum.FILL
+      );
 
-      it('StubElement - attachedCallback', () => {
-        const element = new StubElementClass();
-        element.setAttribute('layout', 'fill');
-        expect(element.everAttached).to.equal(false);
-        expect(element.getLayout()).to.equal(Layout.NODISPLAY);
+      // Now it's called.
+      expect(element).to.not.have.class('amp-unresolved');
+      expect(element).to.not.have.class('i-amphtml-unresolved');
+    });
 
-        resourcesMock.expects('add').withExactArgs(element).atLeast(1);
-        container.appendChild(element);
+    it('StubElement - attachedCallback after failed to load', () => {
+      const element = new StubElementClass();
+      markUnresolvedElements('amp-stub');
+      element.setAttribute('layout', 'fill');
+      expect(element.everAttached).to.equal(false);
+      expect(element.getLayout()).to.equal(Layout_Enum.NODISPLAY);
+
+      resourcesMock.expects('add').withExactArgs(element).atLeast(1);
+      container.appendChild(element);
+
+      expect(element.everAttached).to.equal(true);
+      expect(element.getLayout()).to.equal(Layout_Enum.FILL);
+      // Extension already failed before attachedCallback
+      expect(element).to.have.class('amp-unresolved');
+      expect(element).to.have.class('i-amphtml-unresolved');
+    });
 
-        expect(element.everAttached).to.equal(true);
-        expect(element.getLayout()).to.equal(Layout.FILL);
-        // Not upgraded yet, but extension hasn't failed.
-        expect(element).not.to.have.class('amp-unresolved');
-        expect(element).not.to.have.class('i-amphtml-unresolved');
+    it('StubElement - attachedCallback before failed to load', () => {
+      const element = new StubElementClass();
+      element.setAttribute('layout', 'fill');
+      expect(element.everAttached).to.equal(false);
+      expect(element.getLayout()).to.equal(Layout_Enum.NODISPLAY);
+
+      resourcesMock.expects('add').withExactArgs(element).atLeast(1);
+      container.appendChild(element);
+
+      expect(element.everAttached).to.equal(true);
+      expect(element.getLayout()).to.equal(Layout_Enum.FILL);
+      // Not upgraded yet, but extension hasn't failed.
+      expect(element).not.to.have.class('amp-unresolved');
+      expect(element).not.to.have.class('i-amphtml-unresolved');
+
+      // Now it's called.
+      markUnresolvedElements('amp-stub');
+      expect(element).to.have.class('amp-unresolved');
+      expect(element).to.have.class('i-amphtml-unresolved');
+    });
 
-        // Upgrade
-        resourcesMock.expects('upgraded').withExactArgs(element).once();
-        element.upgrade(TestElement);
+    it('Element - detachedCallback', () => {
+      const element = new ElementClass();
+      element.setAttribute('layout', 'fill');
+      expect(element.everAttached).to.equal(false);
+      expect(element.getLayout()).to.equal(Layout_Enum.NODISPLAY);
 
-        expect(element.getLayout()).to.equal(Layout.FILL);
-        expect(element.getLayout()).to.equal(Layout.FILL);
-        expect(getImplSyncForTesting(element).getLayout()).to.equal(
-          Layout.FILL
-        );
+      resourcesMock.expects('add').withExactArgs(element).atLeast(1);
+      resourcesMock.expects('upgraded').withExactArgs(element).atLeast(1);
+      container.appendChild(element);
 
-        // Now it's called.
-        expect(element).to.not.have.class('amp-unresolved');
-        expect(element).to.not.have.class('i-amphtml-unresolved');
-      });
+      resourcesMock.expects('remove').withExactArgs(element).once();
+      container.removeChild(element);
 
-      it('StubElement - attachedCallback after failed to load', () => {
-        const element = new StubElementClass();
-        markUnresolvedElements('amp-stub');
-        element.setAttribute('layout', 'fill');
-        expect(element.everAttached).to.equal(false);
-        expect(element.getLayout()).to.equal(Layout.NODISPLAY);
+      expect(element.everAttached).to.equal(true);
+      expect(element.getLayout()).to.equal(Layout_Enum.FILL);
+      expect(getImplSyncForTesting(element).getLayout()).to.equal(
+        Layout_Enum.FILL
+      );
+    });
 
-        resourcesMock.expects('add').withExactArgs(element).atLeast(1);
-        container.appendChild(element);
+    it('Element - handles async detachedCallback when connected', () => {
+      const element = new ElementClass();
+      element.setAttribute('layout', 'fill');
+      expect(element.everAttached).to.equal(false);
+      expect(element.getLayout()).to.equal(Layout_Enum.NODISPLAY);
 
-        expect(element.everAttached).to.equal(true);
-        expect(element.getLayout()).to.equal(Layout.FILL);
-        // Extension already failed before attachedCallback
-        expect(element).to.have.class('amp-unresolved');
-        expect(element).to.have.class('i-amphtml-unresolved');
-      });
+      resourcesMock.expects('add').withExactArgs(element).atLeast(1);
+      resourcesMock.expects('upgraded').withExactArgs(element).atLeast(1);
+      container.appendChild(element);
 
-      it('StubElement - attachedCallback before failed to load', () => {
-        const element = new StubElementClass();
-        element.setAttribute('layout', 'fill');
-        expect(element.everAttached).to.equal(false);
-        expect(element.getLayout()).to.equal(Layout.NODISPLAY);
+      resourcesMock.expects('remove').withExactArgs(element).never();
+      env.sandbox.defineProperty(element, 'isConnected', {
+        value: true,
+      });
+      container.removeChild(element);
 
-        resourcesMock.expects('add').withExactArgs(element).atLeast(1);
-        container.appendChild(element);
+      expect(element.everAttached).to.equal(true);
+      expect(element.getLayout()).to.equal(Layout_Enum.FILL);
+      expect(getImplSyncForTesting(element).getLayout()).to.equal(
+        Layout_Enum.FILL
+      );
+    });
 
-        expect(element.everAttached).to.equal(true);
-        expect(element.getLayout()).to.equal(Layout.FILL);
-        // Not upgraded yet, but extension hasn't failed.
-        expect(element).not.to.have.class('amp-unresolved');
-        expect(element).not.to.have.class('i-amphtml-unresolved');
+    it('Element - layoutCallback before build', () => {
+      const element = new ElementClass();
+      element.setAttribute('layout', 'fill');
+      expect(testElementLayoutCallback).to.have.not.been.called;
+      expect(element.isBuilt()).to.equal(false);
 
-        // Now it's called.
-        markUnresolvedElements('amp-stub');
-        expect(element).to.have.class('amp-unresolved');
-        expect(element).to.have.class('i-amphtml-unresolved');
+      allowConsoleError(() => {
+        expect(() => {
+          element.layoutCallback();
+        }).to.throw(/Must be built to receive viewport events/);
       });
 
-      it('Element - detachedCallback', () => {
-        const element = new ElementClass();
-        element.setAttribute('layout', 'fill');
-        expect(element.everAttached).to.equal(false);
-        expect(element.getLayout()).to.equal(Layout.NODISPLAY);
+      expect(testElementLayoutCallback).to.have.not.been.called;
+    });
 
-        resourcesMock.expects('add').withExactArgs(element).atLeast(1);
-        resourcesMock.expects('upgraded').withExactArgs(element).atLeast(1);
-        container.appendChild(element);
+    it('StubElement - layoutCallback before build or upgrade', () => {
+      const element = new StubElementClass();
+      element.setAttribute('layout', 'fill');
+      expect(testElementLayoutCallback).to.have.not.been.called;
 
-        resourcesMock.expects('remove').withExactArgs(element).once();
-        container.removeChild(element);
+      expect(element.isUpgraded()).to.equal(false);
+      expect(element.isBuilt()).to.equal(false);
+      allowConsoleError(() => {
+        expect(() => {
+          element.layoutCallback();
+        }).to.throw(/Must be built to receive viewport events/);
+      });
 
-        expect(element.everAttached).to.equal(true);
-        expect(element.getLayout()).to.equal(Layout.FILL);
-        expect(getImplSyncForTesting(element).getLayout()).to.equal(
-          Layout.FILL
-        );
+      resourcesMock.expects('upgraded').withExactArgs(element).never();
+      element.upgrade(TestElement);
+
+      expect(element.isUpgraded()).to.equal(false);
+      expect(element.isBuilt()).to.equal(false);
+      allowConsoleError(() => {
+        expect(() => {
+          element.layoutCallback();
+        }).to.throw(/Must be built to receive viewport events/);
       });
 
-      it('Element - handles async detachedCallback when connected', () => {
-        const element = new ElementClass();
-        element.setAttribute('layout', 'fill');
-        expect(element.everAttached).to.equal(false);
-        expect(element.getLayout()).to.equal(Layout.NODISPLAY);
+      expect(testElementLayoutCallback).to.have.not.been.called;
+    });
 
-        resourcesMock.expects('add').withExactArgs(element).atLeast(1);
-        resourcesMock.expects('upgraded').withExactArgs(element).atLeast(1);
-        container.appendChild(element);
+    it('Element - layoutCallback', () => {
+      const element = new ElementClass();
+      element.setAttribute('layout', 'fill');
+      container.appendChild(element);
+      expect(element.readyState).to.equal('building');
+      return element.buildInternal().then(() => {
+        expect(element.isBuilt()).to.equal(true);
+        expect(element.readyState).to.equal('loading');
+        expect(testElementLayoutCallback).to.have.not.been.called;
 
-        resourcesMock.expects('remove').withExactArgs(element).never();
-        env.sandbox.defineProperty(element, 'isConnected', {
-          value: true,
+        const p = element.layoutCallback();
+        expect(testElementLayoutCallback).to.be.calledOnce;
+        expect(element.signals().get(CommonSignals_Enum.LOAD_START)).to.be.ok;
+        expect(element.signals().get(CommonSignals_Enum.LOAD_END)).to.be.null;
+        setTimeout(() => {
+          expect(testElementPreconnectCallback).to.have.callCount(2);
+          expect(testElementPreconnectCallback.getCall(1).args[0]).to.be.true;
+        }, 0);
+        return p.then(() => {
+          expect(element.readyState).to.equal('complete');
+          expect(element.signals().get(CommonSignals_Enum.LOAD_END)).to.be.ok;
         });
-        container.removeChild(element);
-
-        expect(element.everAttached).to.equal(true);
-        expect(element.getLayout()).to.equal(Layout.FILL);
-        expect(getImplSyncForTesting(element).getLayout()).to.equal(
-          Layout.FILL
-        );
       });
+    });
 
-      it('Element - layoutCallback before build', () => {
-        const element = new ElementClass();
-        element.setAttribute('layout', 'fill');
+    it('Element - layoutCallback aborted waiting for mutate phase', () => {
+      const element = new ElementClass();
+      element.setAttribute('layout', 'fill');
+      container.appendChild(element);
+      return element.buildInternal().then(() => {
+        expect(element.isBuilt()).to.equal(true);
         expect(testElementLayoutCallback).to.have.not.been.called;
-        expect(element.isBuilt()).to.equal(false);
 
-        allowConsoleError(() => {
-          expect(() => {
-            element.layoutCallback();
-          }).to.throw(/Must be built to receive viewport events/);
+        const controller = new AbortController();
+        controller.abort();
+        const p = element.layoutCallback(controller.signal);
+        expect(testElementLayoutCallback).not.to.be.called;
+        expect(element.signals().get(CommonSignals_Enum.LOAD_START)).to.be.null;
+        expect(element.signals().get(CommonSignals_Enum.LOAD_END)).to.be.null;
+        setTimeout(() => {
+          expect(testElementPreconnectCallback).to.have.callCount(1);
+        }, 0);
+        return expect(p).to.be.rejected.then(() => {
+          expect(element.readyState).to.equal('loading');
+          expect(element.signals().get(CommonSignals_Enum.LOAD_END)).to.be.null;
         });
+      });
+    });
 
+    it('Element - layoutCallback aborted before completing layout', () => {
+      const element = new ElementClass();
+      element.setAttribute('layout', 'fill');
+      container.appendChild(element);
+      return element.buildInternal().then(() => {
+        expect(element.isBuilt()).to.equal(true);
         expect(testElementLayoutCallback).to.have.not.been.called;
+
+        const controller = new AbortController();
+        const stub = env.sandbox
+          .stub(TestElement.prototype, 'layoutCallback')
+          .callsFake(() => {
+            controller.abort();
+          });
+        const p = element.layoutCallback(controller.signal);
+        expect(testElementLayoutCallback).not.to.be.called;
+        expect(element.signals().get(CommonSignals_Enum.LOAD_START)).to.be.ok;
+        expect(element.signals().get(CommonSignals_Enum.LOAD_END)).to.be.null;
+        setTimeout(() => {
+          expect(testElementPreconnectCallback).to.have.callCount(2);
+        }, 0);
+        return expect(p).to.be.rejected.then(() => {
+          expect(stub).to.have.been.called;
+          expect(element.readyState).to.equal('loading');
+          expect(element.signals().get(CommonSignals_Enum.LOAD_END)).to.be.null;
+        });
       });
+    });
 
-      it('StubElement - layoutCallback before build or upgrade', () => {
-        const element = new StubElementClass();
-        element.setAttribute('layout', 'fill');
+    it('Element - layoutCallback aborted before throwing in layout', () => {
+      const element = new ElementClass();
+      element.setAttribute('layout', 'fill');
+      container.appendChild(element);
+      return element.buildInternal().then(() => {
+        expect(element.isBuilt()).to.equal(true);
         expect(testElementLayoutCallback).to.have.not.been.called;
 
-        expect(element.isUpgraded()).to.equal(false);
-        expect(element.isBuilt()).to.equal(false);
-        allowConsoleError(() => {
-          expect(() => {
-            element.layoutCallback();
-          }).to.throw(/Must be built to receive viewport events/);
+        const controller = new AbortController();
+        const stub = env.sandbox
+          .stub(TestElement.prototype, 'layoutCallback')
+          .callsFake(() => {
+            controller.abort();
+            throw new Error('throwaway');
+          });
+        const p = element.layoutCallback(controller.signal);
+        expect(testElementLayoutCallback).not.to.be.called;
+        expect(element.signals().get(CommonSignals_Enum.LOAD_START)).to.be.ok;
+        expect(element.signals().get(CommonSignals_Enum.LOAD_END)).to.be.null;
+        setTimeout(() => {
+          expect(testElementPreconnectCallback).to.have.callCount(2);
+        }, 0);
+        return expect(p).to.be.rejected.then(() => {
+          expect(stub).to.have.been.called;
+          expect(element.readyState).to.equal('loading');
+          expect(element.signals().get(CommonSignals_Enum.LOAD_END)).to.be.null;
         });
+      });
+    });
 
-        resourcesMock.expects('upgraded').withExactArgs(element).never();
-        element.upgrade(TestElement);
+    it('Element - layoutCallback should call firstLayoutCompleted only once', () => {
+      const element = new ElementClass();
+      element.setAttribute('layout', 'fill');
+      container.appendChild(element);
+      return element.buildingPromise_
+        .then(() => {
+          const p = element.layoutCallback();
+          expect(testElementLayoutCallback).to.be.calledOnce;
+          expect(testElementFirstLayoutCompleted).to.have.not.been.called;
+          return p;
+        })
+        .then(() => {
+          expect(testElementFirstLayoutCompleted).to.be.calledOnce;
+
+          // But not second time.
+          const p2 = element.layoutCallback();
+          expect(testElementLayoutCallback).to.have.callCount(2);
+          expect(testElementFirstLayoutCompleted).to.be.calledOnce;
+          return p2;
+        })
+        .then(() => {
+          expect(testElementFirstLayoutCompleted).to.be.calledOnce;
+        });
+    });
 
-        expect(element.isUpgraded()).to.equal(false);
-        expect(element.isBuilt()).to.equal(false);
+    it('Element - layoutCallback is NOT allowed in template', () => {
+      const element = new ElementClass();
+      element.setAttribute('layout', 'fill');
+      container.appendChild(element);
+      return element.buildInternal().then(() => {
+        expect(element.isBuilt()).to.equal(true);
+        expect(testElementLayoutCallback).to.have.not.been.called;
+
+        element.isInTemplate_ = true;
         allowConsoleError(() => {
           expect(() => {
             element.layoutCallback();
-          }).to.throw(/Must be built to receive viewport events/);
+          }).to.throw(/Must never be called in template/);
         });
-
-        expect(testElementLayoutCallback).to.have.not.been.called;
       });
+    });
 
-      it('Element - layoutCallback', () => {
-        const element = new ElementClass();
-        element.setAttribute('layout', 'fill');
-        container.appendChild(element);
-        expect(element.readyState).to.equal('building');
-        return element.buildInternal().then(() => {
+    it('StubElement - layoutCallback after attached', () => {
+      const element = new StubElementClass();
+      element.setAttribute('layout', 'fill');
+      element.everAttached = true;
+      element.ampdoc_ = env.ampdoc;
+      element.resources_ = resources;
+      resourcesMock.expects('upgraded').withExactArgs(element).once();
+      element.upgrade(TestElement);
+      return element
+        .buildInternal()
+        .then(() => {
+          expect(element.isUpgraded()).to.equal(true);
           expect(element.isBuilt()).to.equal(true);
-          expect(element.readyState).to.equal('loading');
           expect(testElementLayoutCallback).to.have.not.been.called;
 
           const p = element.layoutCallback();
           expect(testElementLayoutCallback).to.be.calledOnce;
-          expect(element.signals().get(CommonSignals.LOAD_START)).to.be.ok;
-          expect(element.signals().get(CommonSignals.LOAD_END)).to.be.null;
-          setTimeout(() => {
-            expect(testElementPreconnectCallback).to.have.callCount(2);
-            expect(testElementPreconnectCallback.getCall(1).args[0]).to.be.true;
-          }, 0);
-          return p.then(() => {
-            expect(element.readyState).to.equal('complete');
-            expect(element.signals().get(CommonSignals.LOAD_END)).to.be.ok;
-          });
+          return p;
+        })
+        .then(() => {
+          expect(element.readyState).to.equal('complete');
         });
-      });
+    });
 
-      it('Element - layoutCallback aborted waiting for mutate phase', () => {
-        const element = new ElementClass();
-        element.setAttribute('layout', 'fill');
-        container.appendChild(element);
-        return element.buildInternal().then(() => {
-          expect(element.isBuilt()).to.equal(true);
-          expect(testElementLayoutCallback).to.have.not.been.called;
+    it('should enqueue actions until built', () => {
+      const element = new ElementClass();
+      const handler = env.sandbox.stub(TestElement.prototype, 'executeAction');
 
-          const controller = new AbortController();
-          controller.abort();
-          const p = element.layoutCallback(controller.signal);
-          expect(testElementLayoutCallback).not.to.be.called;
-          expect(element.signals().get(CommonSignals.LOAD_START)).to.be.null;
-          expect(element.signals().get(CommonSignals.LOAD_END)).to.be.null;
-          setTimeout(() => {
-            expect(testElementPreconnectCallback).to.have.callCount(1);
-          }, 0);
-          return expect(p).to.be.rejected.then(() => {
-            expect(element.readyState).to.equal('loading');
-            expect(element.signals().get(CommonSignals.LOAD_END)).to.be.null;
-          });
-        });
-      });
+      container.appendChild(element);
+      expect(element.actionQueue_).to.not.equal(null);
 
-      it('Element - layoutCallback aborted before completing layout', () => {
-        const element = new ElementClass();
-        element.setAttribute('layout', 'fill');
-        container.appendChild(element);
-        return element.buildInternal().then(() => {
-          expect(element.isBuilt()).to.equal(true);
-          expect(testElementLayoutCallback).to.have.not.been.called;
+      const inv = {};
+      element.enqueAction(inv);
+      expect(element.actionQueue_.length).to.equal(1);
+      expect(element.actionQueue_[0]).to.equal(inv);
+      expect(handler).to.have.not.been.called;
+    });
 
-          const controller = new AbortController();
-          const stub = env.sandbox
-            .stub(TestElement.prototype, 'layoutCallback')
-            .callsFake(() => {
-              controller.abort();
-            });
-          const p = element.layoutCallback(controller.signal);
-          expect(testElementLayoutCallback).not.to.be.called;
-          expect(element.signals().get(CommonSignals.LOAD_START)).to.be.ok;
-          expect(element.signals().get(CommonSignals.LOAD_END)).to.be.null;
-          setTimeout(() => {
-            expect(testElementPreconnectCallback).to.have.callCount(2);
-          }, 0);
-          return expect(p).to.be.rejected.then(() => {
-            expect(stub).to.have.been.called;
-            expect(element.readyState).to.equal('loading');
-            expect(element.signals().get(CommonSignals.LOAD_END)).to.be.null;
-          });
-        });
+    it('should execute action immediately after built', () => {
+      const element = new ElementClass();
+      const handler = env.sandbox.stub(TestElement.prototype, 'executeAction');
+      container.appendChild(element);
+      return element.buildInternal().then(() => {
+        const inv = {};
+        element.enqueAction(inv);
+        expect(handler).to.be.calledOnce;
+        expect(handler.getCall(0).args[0]).to.equal(inv);
+        expect(handler.getCall(0).args[1]).to.equal(false);
       });
+    });
 
-      it('Element - layoutCallback aborted before throwing in layout', () => {
-        const element = new ElementClass();
-        element.setAttribute('layout', 'fill');
-        container.appendChild(element);
-        return element.buildInternal().then(() => {
-          expect(element.isBuilt()).to.equal(true);
-          expect(testElementLayoutCallback).to.have.not.been.called;
+    it('should dequeue all actions after build', () => {
+      const element = new ElementClass();
+      const handler = env.sandbox.stub(TestElement.prototype, 'executeAction');
+
+      const inv1 = {};
+      const inv2 = {};
+      element.enqueAction(inv1);
+      element.enqueAction(inv2);
+      expect(element.actionQueue_.length).to.equal(2);
+      expect(element.actionQueue_[0]).to.equal(inv1);
+      expect(element.actionQueue_[1]).to.equal(inv2);
+      expect(handler).to.have.not.been.called;
+
+      container.appendChild(element);
+      return element.buildingPromise_.then(() => {
+        clock.tick(10);
+        expect(handler).to.have.callCount(2);
+        expect(handler.getCall(0).args[0]).to.equal(inv1);
+        expect(handler.getCall(0).args[1]).to.equal(true);
+        expect(handler.getCall(1).args[0]).to.equal(inv2);
+        expect(handler.getCall(1).args[1]).to.equal(true);
+        expect(element.actionQueue_).to.equal(null);
+      });
+    });
 
-          const controller = new AbortController();
-          const stub = env.sandbox
-            .stub(TestElement.prototype, 'layoutCallback')
-            .callsFake(() => {
-              controller.abort();
-              throw new Error('throwaway');
-            });
-          const p = element.layoutCallback(controller.signal);
-          expect(testElementLayoutCallback).not.to.be.called;
-          expect(element.signals().get(CommonSignals.LOAD_START)).to.be.ok;
-          expect(element.signals().get(CommonSignals.LOAD_END)).to.be.null;
-          setTimeout(() => {
-            expect(testElementPreconnectCallback).to.have.callCount(2);
-          }, 0);
-          return expect(p).to.be.rejected.then(() => {
-            expect(stub).to.have.been.called;
-            expect(element.readyState).to.equal('loading');
-            expect(element.signals().get(CommonSignals.LOAD_END)).to.be.null;
-          });
-        });
+    it('should NOT enqueue actions when in template', () => {
+      const element = new ElementClass();
+      expect(element.actionQueue_).to.not.equal(null);
+
+      const inv = {};
+      element.isInTemplate_ = true;
+      allowConsoleError(() => {
+        expect(() => {
+          element.enqueAction(inv);
+        }).to.throw(/Must never be called in template/);
       });
+    });
 
-      it('Element - layoutCallback should call firstLayoutCompleted only once', () => {
-        const element = new ElementClass();
-        element.setAttribute('layout', 'fill');
-        container.appendChild(element);
-        return element.buildingPromise_
-          .then(() => {
-            const p = element.layoutCallback();
-            expect(testElementLayoutCallback).to.be.calledOnce;
-            expect(testElementFirstLayoutCompleted).to.have.not.been.called;
-            return p;
-          })
-          .then(() => {
-            expect(testElementFirstLayoutCompleted).to.be.calledOnce;
+    describe('apply sizes and media query', () => {
+      let element1;
+      let element2;
+      let matchMedia;
+      let matchMinWidth1px;
+      let requestMeasureStub;
 
-            // But not second time.
-            const p2 = element.layoutCallback();
-            expect(testElementLayoutCallback).to.have.callCount(2);
-            expect(testElementFirstLayoutCompleted).to.be.calledOnce;
-            return p2;
-          })
-          .then(() => {
-            expect(testElementFirstLayoutCompleted).to.be.calledOnce;
-          });
+      beforeEach(() => {
+        element1 = new ElementClass();
+
+        matchMedia = env.sandbox.stub(
+          element1.ownerDocument.defaultView,
+          'matchMedia'
+        );
+        matchMinWidth1px = {
+          matches: true,
+          onchange: null,
+        };
+        matchMedia.withArgs('(min-width: 1px)').returns(matchMinWidth1px);
+        matchMedia
+          .withArgs('(min-width: 1111111px)')
+          .returns({matches: false, onchange: null});
+
+        element2 = new ElementClass();
+        element2.ampdoc_ = env.ampdoc;
+
+        requestMeasureStub = env.sandbox.stub(
+          Resource.prototype,
+          'requestMeasure'
+        );
       });
 
-      it('Element - layoutCallback is NOT allowed in template', () => {
-        const element = new ElementClass();
-        element.setAttribute('layout', 'fill');
-        container.appendChild(element);
-        return element.buildInternal().then(() => {
-          expect(element.isBuilt()).to.equal(true);
-          expect(testElementLayoutCallback).to.have.not.been.called;
+      it('should not request remeasure when no media attributes', () => {
+        doc.body.appendChild(element1);
+        expect(requestMeasureStub).to.not.be.called;
+      });
 
-          element.isInTemplate_ = true;
-          allowConsoleError(() => {
-            expect(() => {
-              element.layoutCallback();
-            }).to.throw(/Must never be called in template/);
-          });
-        });
+      it('should not apply sizes when "disable-inline-width" is present', () => {
+        element1.setAttribute('disable-inline-width', null);
+        element1.setAttribute('sizes', '(min-width: 1px) 200px, 50vw');
+        doc.body.appendChild(element1);
+        expect(element1.style.width).not.to.equal('200px');
+        expect(requestMeasureStub).to.not.be.called;
       });
 
-      it('StubElement - layoutCallback after attached', () => {
-        const element = new StubElementClass();
-        element.setAttribute('layout', 'fill');
-        element.everAttached = true;
-        element.ampdoc_ = env.ampdoc;
-        element.resources_ = resources;
-        resourcesMock.expects('upgraded').withExactArgs(element).once();
-        element.upgrade(TestElement);
-        return element
-          .buildInternal()
-          .then(() => {
-            expect(element.isUpgraded()).to.equal(true);
-            expect(element.isBuilt()).to.equal(true);
-            expect(testElementLayoutCallback).to.have.not.been.called;
+      it('should apply media condition', () => {
+        element1.setAttribute('media', '(min-width: 1px)');
+        doc.body.appendChild(element1);
+        expect(element1).to.not.have.class('i-amphtml-hidden-by-media-query');
+        expect(requestMeasureStub).to.be.calledOnce;
 
-            const p = element.layoutCallback();
-            expect(testElementLayoutCallback).to.be.calledOnce;
-            return p;
-          })
-          .then(() => {
-            expect(element.readyState).to.equal('complete');
-          });
+        element2.setAttribute('media', '(min-width: 1111111px)');
+        doc.body.appendChild(element2);
+        expect(element2).to.have.class('i-amphtml-hidden-by-media-query');
+        expect(requestMeasureStub).to.be.calledTwice;
       });
 
-      it('should enqueue actions until built', () => {
-        const element = new ElementClass();
-        const handler = env.sandbox.stub(
-          TestElement.prototype,
-          'executeAction'
-        );
+      it('should re-apply media condition', () => {
+        element1.setAttribute('media', '(min-width: 1px)');
+        doc.body.appendChild(element1);
+        expect(element1).to.not.have.class('i-amphtml-hidden-by-media-query');
+        expect(requestMeasureStub).to.be.calledOnce;
 
-        container.appendChild(element);
-        expect(element.actionQueue_).to.not.equal(null);
+        matchMinWidth1px.matches = false;
+        matchMinWidth1px.onchange();
+        expect(element1).to.have.class('i-amphtml-hidden-by-media-query');
+        expect(requestMeasureStub).to.be.calledTwice;
+      });
 
-        const inv = {};
-        element.enqueAction(inv);
-        expect(element.actionQueue_.length).to.equal(1);
-        expect(element.actionQueue_[0]).to.equal(inv);
-        expect(handler).to.have.not.been.called;
+      it('should apply sizes condition', () => {
+        element1.setAttribute('sizes', '(min-width: 1px) 200px, 50vw');
+        doc.body.appendChild(element1);
+        expect(element1.style.width).to.equal('200px');
+        expect(requestMeasureStub).to.be.calledOnce;
+
+        element2.setAttribute('sizes', '(min-width: 1111111px) 200px, 50vw');
+        doc.body.appendChild(element2);
+        expect(element2.style.width).to.equal('50vw');
+        expect(requestMeasureStub).to.be.calledTwice;
       });
 
-      it('should execute action immediately after built', () => {
-        const element = new ElementClass();
-        const handler = env.sandbox.stub(
-          TestElement.prototype,
-          'executeAction'
-        );
-        container.appendChild(element);
-        return element.buildInternal().then(() => {
-          const inv = {};
-          element.enqueAction(inv);
-          expect(handler).to.be.calledOnce;
-          expect(handler.getCall(0).args[0]).to.equal(inv);
-          expect(handler.getCall(0).args[1]).to.equal(false);
-        });
+      it('should apply heights condition', () => {
+        element1.sizerElement = doc.createElement('div');
+        element1.setAttribute('layout', 'responsive');
+        element1.setAttribute('width', '200px');
+        element1.setAttribute('height', '200px');
+        element1.setAttribute('heights', '(min-width: 1px) 99%, 1%');
+        container.appendChild(element1);
+        doc.body.appendChild(element1);
+        expect(element1.sizerElement.style.paddingTop).to.equal('99%');
+        expect(requestMeasureStub).to.be.calledOnce;
+
+        element2.sizerElement = doc.createElement('div');
+        element2.setAttribute('layout', 'responsive');
+        element2.setAttribute('width', '200px');
+        element2.setAttribute('height', '200px');
+        element2.setAttribute('heights', '(min-width: 1111111px) 99%, 1%');
+        container.appendChild(element2);
+        doc.body.appendChild(element2);
+        expect(element2.sizerElement.style.paddingTop).to.equal('1%');
+        expect(requestMeasureStub).to.be.calledTwice;
       });
+    });
+
+    it('should reapply layout=nodisplay in SSR', () => {
+      const element1 = new ElementClass();
+      element1.setAttribute('i-amphtml-layout', 'nodisplay');
+      element1.setAttribute('layout', 'nodisplay');
+      container.appendChild(element1);
+      expect(element1).to.have.display('none');
+    });
+
+    it('should change size without sizer', () => {
+      const element = new ElementClass();
+      element.applySize(111, 222, {top: 1, right: 2, bottom: 3, left: 4});
+      expect(element.style.height).to.equal('111px');
+      expect(element.style.width).to.equal('222px');
+      expect(element.style.marginTop).to.equal('1px');
+      expect(element.style.marginRight).to.equal('2px');
+      expect(element.style.marginBottom).to.equal('3px');
+      expect(element.style.marginLeft).to.equal('4px');
+    });
 
-      it('should dequeue all actions after build', () => {
-        const element = new ElementClass();
-        const handler = env.sandbox.stub(
-          TestElement.prototype,
-          'executeAction'
-        );
+    it('should change size - height only without sizer', () => {
+      const element = new ElementClass();
+      element.applySize(111);
+      expect(element.style.height).to.equal('111px');
+    });
 
-        const inv1 = {};
-        const inv2 = {};
-        element.enqueAction(inv1);
-        element.enqueAction(inv2);
-        expect(element.actionQueue_.length).to.equal(2);
-        expect(element.actionQueue_[0]).to.equal(inv1);
-        expect(element.actionQueue_[1]).to.equal(inv2);
-        expect(handler).to.have.not.been.called;
+    it('should change size - width only without sizer', () => {
+      const element = new ElementClass();
+      element.applySize(undefined, 111);
+      expect(element.style.width).to.equal('111px');
+    });
 
-        container.appendChild(element);
-        return element.buildingPromise_.then(() => {
-          clock.tick(10);
-          expect(handler).to.have.callCount(2);
-          expect(handler.getCall(0).args[0]).to.equal(inv1);
-          expect(handler.getCall(0).args[1]).to.equal(true);
-          expect(handler.getCall(1).args[0]).to.equal(inv2);
-          expect(handler.getCall(1).args[1]).to.equal(true);
-          expect(element.actionQueue_).to.equal(null);
-        });
-      });
+    it('should change size - margins only without sizer', () => {
+      const element = new ElementClass();
+      element.applySize(undefined, undefined, {
+        top: 1,
+        right: 2,
+        bottom: 3,
+        left: 4,
+      });
+      expect(element.style.marginTop).to.equal('1px');
+      expect(element.style.marginRight).to.equal('2px');
+      expect(element.style.marginBottom).to.equal('3px');
+      expect(element.style.marginLeft).to.equal('4px');
+    });
 
-      it('should NOT enqueue actions when in template', () => {
-        const element = new ElementClass();
-        expect(element.actionQueue_).to.not.equal(null);
+    it('should change size - some margins only without sizer', () => {
+      const element = new ElementClass();
+      element.style.margin = '1px 2px 3px 4px';
+      element.applySize(undefined, undefined, {top: 5, left: 6});
+      expect(element.style.marginTop).to.equal('5px');
+      expect(element.style.marginRight).to.equal('2px');
+      expect(element.style.marginBottom).to.equal('3px');
+      expect(element.style.marginLeft).to.equal('6px');
+    });
 
-        const inv = {};
-        element.isInTemplate_ = true;
-        allowConsoleError(() => {
-          expect(() => {
-            element.enqueAction(inv);
-          }).to.throw(/Must never be called in template/);
-        });
-      });
+    it('should change size - some margins only without sizer', () => {
+      const element = new ElementClass();
+      element.style.margin = '1px 2px 3px 4px';
+      element.applySize(undefined, undefined, {top: 5, left: 6});
+      expect(element.style.marginTop).to.equal('5px');
+      expect(element.style.marginRight).to.equal('2px');
+      expect(element.style.marginBottom).to.equal('3px');
+      expect(element.style.marginLeft).to.equal('6px');
+    });
 
-      describe('apply sizes and media query', () => {
-        let element1;
-        let element2;
-        let matchMedia;
-        let matchMinWidth1px;
-        let requestMeasureStub;
+    it('should change size with sizer', () => {
+      const element = new ElementClass();
+      const sizer = doc.createElement('div');
+      element.sizerElement = sizer;
+      element.applySize(111, 222, {top: 1, right: 2, bottom: 3, left: 4});
+      expect(element.style.height).to.equal('111px');
+      expect(element.style.width).to.equal('222px');
+      expect(element.style.marginTop).to.equal('1px');
+      expect(element.style.marginRight).to.equal('2px');
+      expect(element.style.marginBottom).to.equal('3px');
+      expect(element.style.marginLeft).to.equal('4px');
+    });
 
-        beforeEach(() => {
-          element1 = new ElementClass();
+    it('should reset sizer for responsive layout', () => {
+      const element = new ElementClass();
+      element.layout_ = Layout_Enum.RESPONSIVE;
+      const sizer = doc.createElement('div');
+      element.sizerElement = sizer;
+      element.applySize(111, 222, {top: 1, right: 2, bottom: 3, left: 4});
+      expect(sizer.style.paddingTop).to.equal('0px');
+      expect(element.sizerElement).to.be.null;
+    });
 
-          matchMedia = env.sandbox.stub(
-            element1.ownerDocument.defaultView,
-            'matchMedia'
-          );
-          matchMinWidth1px = {
-            matches: true,
-            onchange: null,
-          };
-          matchMedia.withArgs('(min-width: 1px)').returns(matchMinWidth1px);
-          matchMedia
-            .withArgs('(min-width: 1111111px)')
-            .returns({matches: false, onchange: null});
-
-          element2 = new ElementClass();
-          element2.ampdoc_ = env.ampdoc;
-
-          requestMeasureStub = env.sandbox.stub(
-            Resource.prototype,
-            'requestMeasure'
-          );
-        });
+    it('should reset sizer for intrinsic layout', () => {
+      const element = new ElementClass();
+      element.layout_ = Layout_Enum.INTRINSIC;
+      const sizer = doc.createElement('i-amphtml-sizer');
+      const intrinsicSizer = doc.createElement('img');
+      intrinsicSizer.classList.add('i-amphtml-intrinsic-sizer');
+      intrinsicSizer.setAttribute(
+        'src',
+        'data:image/svg+xml;charset=utf-8,<svg height=&quot;610&quot; width=&quot;1080&quot; xmlns=&quot;http://www.w3.org/2000/svg&quot; version=&quot;1.1&quot;/>'
+      );
+      sizer.appendChild(intrinsicSizer);
+      element.appendChild(sizer);
+      element.applySize(111);
+      expect(intrinsicSizer.getAttribute('src')).to.equal('');
+    });
 
-        it('should not request remeasure when no media attributes', () => {
-          doc.body.appendChild(element1);
-          expect(requestMeasureStub).to.not.be.called;
-        });
+    it('should change size to zero', () => {
+      const element = new ElementClass();
+      element.applySize(0, 0);
+      expect(element.style.height).to.equal('0px');
+      expect(element.style.width).to.equal('0px');
+    });
 
-        it('should not apply sizes when "disable-inline-width" is present', () => {
-          element1.setAttribute('disable-inline-width', null);
-          element1.setAttribute('sizes', '(min-width: 1px) 200px, 50vw');
-          doc.body.appendChild(element1);
-          expect(element1.style.width).not.to.equal('200px');
-          expect(requestMeasureStub).to.not.be.called;
-        });
+    it('should change width to zero', () => {
+      const element = new ElementClass();
+      element.applySize(undefined, 0);
+      expect(element.style.width).to.equal('0px');
+    });
+
+    it(
+      'should remove i-amphtml-layout-awaiting-size class when ' +
+        'size changed',
+      () => {
+        const element = new StubElementClass();
+        expect(element.isUpgraded()).to.equal(false);
+        element.classList.add('i-amphtml-layout-awaiting-size');
+
+        expect(element).to.have.class('i-amphtml-layout-awaiting-size');
+        element.applySize(100, 100);
+        expect(element).not.to.have.class('i-amphtml-layout-awaiting-size');
+      }
+    );
+
+    it('should dispatch custom event size-changed when size changed', () => {
+      const element = new ElementClass();
+      const spyDispatchEvent = env.sandbox.spy();
+      element.addEventListener(AmpEvents_Enum.SIZE_CHANGED, spyDispatchEvent);
+      element.applySize();
+      expect(spyDispatchEvent).to.be.calledOnce;
+    });
 
-        it('should apply media condition', () => {
-          element1.setAttribute('media', '(min-width: 1px)');
-          doc.body.appendChild(element1);
-          expect(element1).to.not.have.class('i-amphtml-hidden-by-media-query');
-          expect(requestMeasureStub).to.be.calledOnce;
+    describe('unlayoutCallback', () => {
+      it('should unlayout built element and reset layoutCount', () => {
+        const element = new ElementClass();
+        // Non-built element doesn't receive unlayoutCallback.
+        element.unlayoutCallback();
+        expect(testElementUnlayoutCallback).to.have.not.been.called;
 
-          element2.setAttribute('media', '(min-width: 1111111px)');
-          doc.body.appendChild(element2);
-          expect(element2).to.have.class('i-amphtml-hidden-by-media-query');
-          expect(requestMeasureStub).to.be.calledTwice;
-        });
+        env.sandbox
+          .stub(TestElement.prototype, 'layoutCallback')
+          .callsFake(() => {
+            testElementLayoutCallback();
+            element.layoutCount_++;
+            return Promise.resolve();
+          });
 
-        it('should re-apply media condition', () => {
-          element1.setAttribute('media', '(min-width: 1px)');
-          doc.body.appendChild(element1);
-          expect(element1).to.not.have.class('i-amphtml-hidden-by-media-query');
-          expect(requestMeasureStub).to.be.calledOnce;
+        env.sandbox
+          .stub(TestElement.prototype, 'unlayoutCallback')
+          .callsFake(() => {
+            testElementUnlayoutCallback();
+            return true;
+          });
 
-          matchMinWidth1px.matches = false;
-          matchMinWidth1px.onchange();
-          expect(element1).to.have.class('i-amphtml-hidden-by-media-query');
-          expect(requestMeasureStub).to.be.calledTwice;
+        // Built element receives unlayoutCallback.
+        container.appendChild(element);
+        return element.buildingPromise_.then(() => {
+          element.unlayoutCallback();
+          expect(testElementUnlayoutCallback).to.be.calledOnce;
+          expect(element.layoutCount_).to.equal(0);
         });
+      });
 
-        it('should apply sizes condition', () => {
-          element1.setAttribute('sizes', '(min-width: 1px) 200px, 50vw');
-          doc.body.appendChild(element1);
-          expect(element1.style.width).to.equal('200px');
-          expect(requestMeasureStub).to.be.calledOnce;
+      it('should not reset layoutCount if relayout not requested', () => {
+        const element = new ElementClass();
 
-          element2.setAttribute('sizes', '(min-width: 1111111px) 200px, 50vw');
-          doc.body.appendChild(element2);
-          expect(element2.style.width).to.equal('50vw');
-          expect(requestMeasureStub).to.be.calledTwice;
-        });
+        env.sandbox
+          .stub(TestElement.prototype, 'layoutCallback')
+          .callsFake(() => {
+            testElementLayoutCallback();
+            element.layoutCount_++;
+            return Promise.resolve();
+          });
 
-        it('should apply heights condition', () => {
-          element1.sizerElement = doc.createElement('div');
-          element1.setAttribute('layout', 'responsive');
-          element1.setAttribute('width', '200px');
-          element1.setAttribute('height', '200px');
-          element1.setAttribute('heights', '(min-width: 1px) 99%, 1%');
-          container.appendChild(element1);
-          doc.body.appendChild(element1);
-          expect(element1.sizerElement.style.paddingTop).to.equal('99%');
-          expect(requestMeasureStub).to.be.calledOnce;
-
-          element2.sizerElement = doc.createElement('div');
-          element2.setAttribute('layout', 'responsive');
-          element2.setAttribute('width', '200px');
-          element2.setAttribute('height', '200px');
-          element2.setAttribute('heights', '(min-width: 1111111px) 99%, 1%');
-          container.appendChild(element2);
-          doc.body.appendChild(element2);
-          expect(element2.sizerElement.style.paddingTop).to.equal('1%');
-          expect(requestMeasureStub).to.be.calledTwice;
+        env.sandbox
+          .stub(TestElement.prototype, 'unlayoutCallback')
+          .callsFake(() => {
+            testElementUnlayoutCallback();
+            return false;
+          });
+
+        container.appendChild(element);
+        return element.buildingPromise_.then(() => {
+          element.layoutCallback();
+          element.unlayoutCallback();
+          expect(testElementUnlayoutCallback).to.be.calledOnce;
+          expect(element.layoutCount_).to.equal(1);
         });
       });
 
-      it('should reapply layout=nodisplay in SSR', () => {
-        const element1 = new ElementClass();
-        element1.setAttribute('i-amphtml-layout', 'nodisplay');
-        element1.setAttribute('layout', 'nodisplay');
-        container.appendChild(element1);
-        expect(element1).to.have.display('none');
-      });
+      it('StubElement', () => {
+        const element = new StubElementClass();
 
-      it('should change size without sizer', () => {
-        const element = new ElementClass();
-        element.applySize(111, 222, {top: 1, right: 2, bottom: 3, left: 4});
-        expect(element.style.height).to.equal('111px');
-        expect(element.style.width).to.equal('222px');
-        expect(element.style.marginTop).to.equal('1px');
-        expect(element.style.marginRight).to.equal('2px');
-        expect(element.style.marginBottom).to.equal('3px');
-        expect(element.style.marginLeft).to.equal('4px');
+        // Unupgraded document doesn't receive unlayoutCallback.
+        element.unlayoutCallback();
+        expect(testElementUnlayoutCallback).to.have.not.been.called;
       });
+    });
 
-      it('should change size - height only without sizer', () => {
+    describe('pauseCallback', () => {
+      it('should not pause unbuilt element', () => {
         const element = new ElementClass();
-        element.applySize(111);
-        expect(element.style.height).to.equal('111px');
+        expect(() => element.pause()).to.not.throw();
+        expect(testElementPauseCallback).to.not.be.called;
       });
 
-      it('should change size - width only without sizer', () => {
+      it('should pause upgraded element', async () => {
         const element = new ElementClass();
-        element.applySize(undefined, 111);
-        expect(element.style.width).to.equal('111px');
+        container.appendChild(element);
+        await element.buildInternal();
+        element.pause();
+        expect(testElementPauseCallback).to.be.calledOnce;
       });
 
-      it('should change size - margins only without sizer', () => {
-        const element = new ElementClass();
-        element.applySize(undefined, undefined, {
-          top: 1,
-          right: 2,
-          bottom: 3,
-          left: 4,
-        });
-        expect(element.style.marginTop).to.equal('1px');
-        expect(element.style.marginRight).to.equal('2px');
-        expect(element.style.marginBottom).to.equal('3px');
-        expect(element.style.marginLeft).to.equal('4px');
-      });
+      it('should pause stub element', () => {
+        const element = new StubElementClass();
 
-      it('should change size - some margins only without sizer', () => {
-        const element = new ElementClass();
-        element.style.margin = '1px 2px 3px 4px';
-        element.applySize(undefined, undefined, {top: 5, left: 6});
-        expect(element.style.marginTop).to.equal('5px');
-        expect(element.style.marginRight).to.equal('2px');
-        expect(element.style.marginBottom).to.equal('3px');
-        expect(element.style.marginLeft).to.equal('6px');
+        // Unupgraded document doesn't receive pauseCallback.
+        element.pause();
+        expect(testElementPauseCallback).to.have.not.been.called;
       });
 
-      it('should change size - some margins only without sizer', () => {
+      it('should unload when pause with unlayoutOnPause', async () => {
         const element = new ElementClass();
-        element.style.margin = '1px 2px 3px 4px';
-        element.applySize(undefined, undefined, {top: 5, left: 6});
-        expect(element.style.marginTop).to.equal('5px');
-        expect(element.style.marginRight).to.equal('2px');
-        expect(element.style.marginBottom).to.equal('3px');
-        expect(element.style.marginLeft).to.equal('6px');
-      });
+        container.appendChild(element);
+        await element.buildInternal();
+        const impl = await element.getImpl();
+        env.sandbox.stub(impl, 'unlayoutOnPause').returns(true);
+        const resourceUnlayoutStub = env.sandbox.stub(
+          element.getResource_(),
+          'unlayout'
+        );
 
-      it('should change size with sizer', () => {
-        const element = new ElementClass();
-        const sizer = doc.createElement('div');
-        element.sizerElement = sizer;
-        element.applySize(111, 222, {top: 1, right: 2, bottom: 3, left: 4});
-        expect(element.style.height).to.equal('111px');
-        expect(element.style.width).to.equal('222px');
-        expect(element.style.marginTop).to.equal('1px');
-        expect(element.style.marginRight).to.equal('2px');
-        expect(element.style.marginBottom).to.equal('3px');
-        expect(element.style.marginLeft).to.equal('4px');
-      });
-
-      it('should reset sizer for responsive layout', () => {
-        const element = new ElementClass();
-        element.layout_ = Layout.RESPONSIVE;
-        const sizer = doc.createElement('div');
-        element.sizerElement = sizer;
-        element.applySize(111, 222, {top: 1, right: 2, bottom: 3, left: 4});
-        expect(sizer.style.paddingTop).to.equal('0px');
-        expect(element.sizerElement).to.be.null;
+        element.pause();
+        expect(testElementPauseCallback).to.be.calledOnce;
+        expect(resourceUnlayoutStub).to.be.calledOnce;
       });
 
-      it('should reset sizer for intrinsic layout', () => {
+      it('should pause and unlayout on unmount', async () => {
         const element = new ElementClass();
-        element.layout_ = Layout.INTRINSIC;
-        const sizer = doc.createElement('i-amphtml-sizer');
-        const intrinsicSizer = doc.createElement('img');
-        intrinsicSizer.classList.add('i-amphtml-intrinsic-sizer');
-        intrinsicSizer.setAttribute(
-          'src',
-          'data:image/svg+xml;charset=utf-8,<svg height=&quot;610&quot; width=&quot;1080&quot; xmlns=&quot;http://www.w3.org/2000/svg&quot; version=&quot;1.1&quot;/>'
+        container.appendChild(element);
+        await element.buildInternal();
+        const resourceUnlayoutStub = env.sandbox.stub(
+          element.getResource_(),
+          'unlayout'
         );
-        sizer.appendChild(intrinsicSizer);
-        element.appendChild(sizer);
-        element.applySize(111);
-        expect(intrinsicSizer.getAttribute('src')).to.equal('');
-      });
+        const schedulePassStub = env.sandbox.stub(resources, 'schedulePass');
 
-      it('should change size to zero', () => {
-        const element = new ElementClass();
-        element.applySize(0, 0);
-        expect(element.style.height).to.equal('0px');
-        expect(element.style.width).to.equal('0px');
+        element.unmount();
+        expect(testElementPauseCallback).to.be.calledOnce;
+        expect(resourceUnlayoutStub).to.be.calledOnce;
+        expect(schedulePassStub).to.be.calledOnce;
       });
 
-      it('should change width to zero', () => {
+      it('should pause and unlayout on unmount with unlayoutOnPause', async () => {
         const element = new ElementClass();
-        element.applySize(undefined, 0);
-        expect(element.style.width).to.equal('0px');
-      });
-
-      it(
-        'should remove i-amphtml-layout-awaiting-size class when ' +
-          'size changed',
-        () => {
-          const element = new StubElementClass();
-          expect(element.isUpgraded()).to.equal(false);
-          element.classList.add('i-amphtml-layout-awaiting-size');
+        container.appendChild(element);
+        await element.buildInternal();
+        element.getResource_().layoutScheduled(Date.now());
+        const impl = await element.getImpl();
+        env.sandbox.stub(impl, 'unlayoutOnPause').returns(true);
+        const schedulePassStub = env.sandbox.stub(resources, 'schedulePass');
+
+        element.unmount();
+        expect(testElementPauseCallback).to.be.calledOnce;
+        expect(testElementUnlayoutCallback).to.be.calledOnce;
+        // `schedulePass` is triggered twice: once for pause and once for
+        // unlayout. However, it's benign because only one pass will be
+        // scheduled as a result.
+        expect(schedulePassStub).to.be.calledTwice;
+      });
+
+      it('should NOT schedule pass on unmount when disconnected', async () => {
+        const element = new ElementClass();
+        container.appendChild(element);
+        await element.buildInternal();
+        const resourceUnlayoutStub = env.sandbox.stub(
+          element.getResource_(),
+          'unlayout'
+        );
+        const schedulePassStub = env.sandbox.stub(resources, 'schedulePass');
 
-          expect(element).to.have.class('i-amphtml-layout-awaiting-size');
-          element.applySize(100, 100);
-          expect(element).not.to.have.class('i-amphtml-layout-awaiting-size');
-        }
-      );
+        container.removeChild(element);
+        element.unmount();
+        expect(testElementPauseCallback).to.be.calledOnce;
+        expect(resourceUnlayoutStub).to.be.calledOnce;
+        expect(schedulePassStub).to.not.be.called;
+      });
+    });
 
-      it('should dispatch custom event size-changed when size changed', () => {
+    describe('resumeCallback', () => {
+      it('should resume upgraded element', async () => {
         const element = new ElementClass();
-        const spyDispatchEvent = env.sandbox.spy();
-        element.addEventListener(AmpEvents.SIZE_CHANGED, spyDispatchEvent);
-        element.applySize();
-        expect(spyDispatchEvent).to.be.calledOnce;
-      });
+        element.pause();
 
-      describe('unlayoutCallback', () => {
-        it('should unlayout built element and reset layoutCount', () => {
-          const element = new ElementClass();
-          // Non-built element doesn't receive unlayoutCallback.
-          element.unlayoutCallback();
-          expect(testElementUnlayoutCallback).to.have.not.been.called;
-
-          env.sandbox
-            .stub(TestElement.prototype, 'layoutCallback')
-            .callsFake(() => {
-              testElementLayoutCallback();
-              element.layoutCount_++;
-              return Promise.resolve();
-            });
-
-          env.sandbox
-            .stub(TestElement.prototype, 'unlayoutCallback')
-            .callsFake(() => {
-              testElementUnlayoutCallback();
-              return true;
-            });
-
-          // Built element receives unlayoutCallback.
-          container.appendChild(element);
-          return element.buildingPromise_.then(() => {
-            element.unlayoutCallback();
-            expect(testElementUnlayoutCallback).to.be.calledOnce;
-            expect(element.layoutCount_).to.equal(0);
-          });
-        });
+        // Non-built element doesn't receive resumeCallback.
+        element.resume();
+        expect(testElementResumeCallback).to.have.not.been.called;
 
-        it('should not reset layoutCount if relayout not requested', () => {
-          const element = new ElementClass();
-
-          env.sandbox
-            .stub(TestElement.prototype, 'layoutCallback')
-            .callsFake(() => {
-              testElementLayoutCallback();
-              element.layoutCount_++;
-              return Promise.resolve();
-            });
-
-          env.sandbox
-            .stub(TestElement.prototype, 'unlayoutCallback')
-            .callsFake(() => {
-              testElementUnlayoutCallback();
-              return false;
-            });
-
-          container.appendChild(element);
-          return element.buildingPromise_.then(() => {
-            element.layoutCallback();
-            element.unlayoutCallback();
-            expect(testElementUnlayoutCallback).to.be.calledOnce;
-            expect(element.layoutCount_).to.equal(1);
-          });
-        });
+        // Built element receives resumeCallback.
+        container.appendChild(element);
+        await element.buildInternal();
+        element.pause();
+        element.resume();
+        expect(testElementResumeCallback).to.be.calledOnce;
+      });
 
-        it('StubElement', () => {
-          const element = new StubElementClass();
+      it('should resume stub element', () => {
+        const element = new StubElementClass();
 
-          // Unupgraded document doesn't receive unlayoutCallback.
-          element.unlayoutCallback();
-          expect(testElementUnlayoutCallback).to.have.not.been.called;
-        });
+        // Unupgraded document doesn't receive resumeCallback.
+        element.pause();
+        element.resume();
+        expect(testElementResumeCallback).to.have.not.been.called;
       });
+    });
 
-      describe('pauseCallback', () => {
-        it('should not pause unbuilt element', () => {
-          const element = new ElementClass();
-          expect(() => element.pause()).to.not.throw();
-          expect(testElementPauseCallback).to.not.be.called;
-        });
-
-        it('should pause upgraded element', async () => {
-          const element = new ElementClass();
-          container.appendChild(element);
-          await element.buildInternal();
-          element.pause();
-          expect(testElementPauseCallback).to.be.calledOnce;
-        });
+    describe('prerenderAllowed', () => {
+      it('should NOT be allowed for an upgraded element', () => {
+        const element = new StubElementClass();
+        expect(element.prerenderAllowed()).to.be.false;
+      });
 
-        it('should pause stub element', () => {
-          const element = new StubElementClass();
+      it('should be allowed base on the upgraded class', () => {
+        const stub = env.sandbox.stub(TestElement, 'prerenderAllowed');
+        const element = new StubElementClass();
+        element.upgrade(TestElement);
 
-          // Unupgraded document doesn't receive pauseCallback.
-          element.pause();
-          expect(testElementPauseCallback).to.have.not.been.called;
-        });
+        stub.returns(false);
+        expect(element.prerenderAllowed()).to.be.false;
 
-        it('should unload when pause with unlayoutOnPause', async () => {
-          const element = new ElementClass();
-          container.appendChild(element);
-          await element.buildInternal();
-          const impl = await element.getImpl();
-          env.sandbox.stub(impl, 'unlayoutOnPause').returns(true);
-          const resourceUnlayoutStub = env.sandbox.stub(
-            element.getResource_(),
-            'unlayout'
-          );
+        stub.returns(true);
+        expect(element.prerenderAllowed()).to.be.true;
+      });
 
-          element.pause();
-          expect(testElementPauseCallback).to.be.calledOnce;
-          expect(resourceUnlayoutStub).to.be.calledOnce;
-        });
+      it('should NOT be allowed with noprerender attribute', () => {
+        env.sandbox.stub(TestElement, 'prerenderAllowed').returns(true);
+        const element = new StubElementClass();
+        element.upgrade(TestElement);
+        expect(element.prerenderAllowed()).to.be.true;
 
-        it('should pause and unlayout on unmount', async () => {
-          const element = new ElementClass();
-          container.appendChild(element);
-          await element.buildInternal();
-          const resourceUnlayoutStub = env.sandbox.stub(
-            element.getResource_(),
-            'unlayout'
-          );
-          const schedulePassStub = env.sandbox.stub(resources, 'schedulePass');
+        element.setAttribute('noprerender', '');
+        expect(element.prerenderAllowed()).to.be.false;
+      });
+    });
 
-          element.unmount();
-          expect(testElementPauseCallback).to.be.calledOnce;
-          expect(resourceUnlayoutStub).to.be.calledOnce;
-          expect(schedulePassStub).to.be.calledOnce;
-        });
+    describe('previewAllowed', () => {
+      it('should NOT be allowed for an upgraded element', () => {
+        const element = new StubElementClass();
+        expect(element.previewAllowed()).to.be.false;
+      });
 
-        it('should pause and unlayout on unmount with unlayoutOnPause', async () => {
-          const element = new ElementClass();
-          container.appendChild(element);
-          await element.buildInternal();
-          element.getResource_().layoutScheduled(Date.now());
-          const impl = await element.getImpl();
-          env.sandbox.stub(impl, 'unlayoutOnPause').returns(true);
-          const schedulePassStub = env.sandbox.stub(resources, 'schedulePass');
-
-          element.unmount();
-          expect(testElementPauseCallback).to.be.calledOnce;
-          expect(testElementUnlayoutCallback).to.be.calledOnce;
-          // `schedulePass` is triggered twice: once for pause and once for
-          // unlayout. However, it's benign because only one pass will be
-          // scheduled as a result.
-          expect(schedulePassStub).to.be.calledTwice;
-        });
+      it('should be allowed base on the upgraded class', () => {
+        const stub = env.sandbox.stub(TestElement, 'previewAllowed');
+        const element = new StubElementClass();
+        element.upgrade(TestElement);
 
-        it('should NOT schedule pass on unmount when disconnected', async () => {
-          const element = new ElementClass();
-          container.appendChild(element);
-          await element.buildInternal();
-          const resourceUnlayoutStub = env.sandbox.stub(
-            element.getResource_(),
-            'unlayout'
-          );
-          const schedulePassStub = env.sandbox.stub(resources, 'schedulePass');
+        stub.returns(false);
+        expect(element.previewAllowed()).to.be.false;
 
-          container.removeChild(element);
-          element.unmount();
-          expect(testElementPauseCallback).to.be.calledOnce;
-          expect(resourceUnlayoutStub).to.be.calledOnce;
-          expect(schedulePassStub).to.not.be.called;
-        });
+        stub.returns(true);
+        expect(element.previewAllowed()).to.be.true;
       });
+    });
 
-      describe('resumeCallback', () => {
-        it('should resume upgraded element', async () => {
-          const element = new ElementClass();
-          element.pause();
-
-          // Non-built element doesn't receive resumeCallback.
-          element.resume();
-          expect(testElementResumeCallback).to.have.not.been.called;
+    describe('ensureLoaded', () => {
+      it('should build and load', async () => {
+        const element = new ElementClass();
+        element.setAttribute('layout', 'fixed');
+        element.setAttribute('width', '10');
+        element.setAttribute('height', '10');
+        container.appendChild(element);
+        const resource = element.getResource_();
 
-          // Built element receives resumeCallback.
-          container.appendChild(element);
-          await element.buildInternal();
-          element.pause();
-          element.resume();
-          expect(testElementResumeCallback).to.be.calledOnce;
-        });
+        expect(element.isBuilt()).to.be.false;
 
-        it('should resume stub element', () => {
-          const element = new StubElementClass();
+        const parentPriority = 1;
+        resourcesMock
+          .expects('scheduleLayoutOrPreload')
+          .withExactArgs(
+            resource,
+            /* layout */ true,
+            parentPriority,
+            /* forceOutsideViewport */ true
+          )
+          .once();
+
+        const promise = element.ensureLoaded(parentPriority);
+        await resource.build();
+        await resource.whenBuilt();
+        await element.layoutCallback();
 
-          // Unupgraded document doesn't receive resumeCallback.
-          element.pause();
-          element.resume();
-          expect(testElementResumeCallback).to.have.not.been.called;
-        });
+        await promise;
+        expect(element.isBuilt()).to.be.true;
       });
 
-      describe('prerenderAllowed', () => {
-        it('should NOT be allowed for an upgraded element', () => {
-          const element = new StubElementClass();
-          expect(element.prerenderAllowed()).to.be.false;
-        });
-
-        it('should be allowed base on the upgraded class', () => {
-          const stub = env.sandbox.stub(TestElement, 'prerenderAllowed');
-          const element = new StubElementClass();
-          element.upgrade(TestElement);
-
-          stub.returns(false);
-          expect(element.prerenderAllowed()).to.be.false;
+      it('should mount and load', async () => {
+        const element = new ElementClass();
+        element.setAttribute('layout', 'fixed');
+        element.setAttribute('width', '10');
+        element.setAttribute('height', '10');
+        container.appendChild(element);
+        const resource = element.getResource_();
 
-          stub.returns(true);
-          expect(element.prerenderAllowed()).to.be.true;
-        });
+        expect(element.isBuilt()).to.be.false;
 
-        it('should NOT be allowed with noprerender attribute', () => {
-          env.sandbox.stub(TestElement, 'prerenderAllowed').returns(true);
-          const element = new StubElementClass();
-          element.upgrade(TestElement);
-          expect(element.prerenderAllowed()).to.be.true;
+        const parentPriority = 1;
+        resourcesMock
+          .expects('scheduleLayoutOrPreload')
+          .withExactArgs(
+            resource,
+            /* layout */ true,
+            parentPriority,
+            /* forceOutsideViewport */ true
+          )
+          .once();
+
+        const promise = element.ensureLoaded(parentPriority);
+        await element.mount();
+        await resource.whenBuilt();
+        await element.layoutCallback();
 
-          element.setAttribute('noprerender', '');
-          expect(element.prerenderAllowed()).to.be.false;
-        });
+        await promise;
+        expect(element.isBuilt()).to.be.true;
       });
 
-      describe('ensureLoaded', () => {
-        it('should build and load', async () => {
-          const element = new ElementClass();
-          element.setAttribute('layout', 'fixed');
-          element.setAttribute('width', '10');
-          element.setAttribute('height', '10');
-          container.appendChild(element);
-          const resource = element.getResource_();
-
-          expect(element.isBuilt()).to.be.false;
-
-          const parentPriority = 1;
-          resourcesMock
-            .expects('scheduleLayoutOrPreload')
-            .withExactArgs(
-              resource,
-              /* layout */ true,
-              parentPriority,
-              /* forceOutsideViewport */ true
-            )
-            .once();
-
-          const promise = element.ensureLoaded(parentPriority);
-          await resource.build();
-          await resource.whenBuilt();
-          await element.layoutCallback();
-
-          await promise;
-          expect(element.isBuilt()).to.be.true;
-        });
+      it('should load pre-built element', async () => {
+        const element = new ElementClass();
+        element.setAttribute('layout', 'fixed');
+        element.setAttribute('width', '10');
+        element.setAttribute('height', '10');
+        container.appendChild(element);
+        const resource = element.getResource_();
+
+        await resource.build();
+        await resource.whenBuilt();
+        expect(element.isBuilt()).to.be.true;
+
+        const parentPriority = 1;
+        resourcesMock
+          .expects('scheduleLayoutOrPreload')
+          .withExactArgs(
+            resource,
+            /* layout */ true,
+            parentPriority,
+            /* forceOutsideViewport */ true
+          )
+          .once();
+
+        const promise = element.ensureLoaded(parentPriority);
+        await element.layoutCallback();
+        await promise;
+      });
 
-        it('should mount and load', async () => {
-          const element = new ElementClass();
-          element.setAttribute('layout', 'fixed');
-          element.setAttribute('width', '10');
-          element.setAttribute('height', '10');
-          container.appendChild(element);
-          const resource = element.getResource_();
-
-          expect(element.isBuilt()).to.be.false;
-
-          const parentPriority = 1;
-          resourcesMock
-            .expects('scheduleLayoutOrPreload')
-            .withExactArgs(
-              resource,
-              /* layout */ true,
-              parentPriority,
-              /* forceOutsideViewport */ true
-            )
-            .once();
-
-          const promise = element.ensureLoaded(parentPriority);
-          await element.mount();
-          await resource.whenBuilt();
-          await element.layoutCallback();
-
-          await promise;
-          expect(element.isBuilt()).to.be.true;
-        });
+      it('should do nothing for already-loaded element', async () => {
+        const element = new ElementClass();
+        element.setAttribute('layout', 'fixed');
+        element.setAttribute('width', '10');
+        element.setAttribute('height', '10');
+        container.appendChild(element);
+        const resource = element.getResource_();
 
-        it('should load pre-built element', async () => {
-          const element = new ElementClass();
-          element.setAttribute('layout', 'fixed');
-          element.setAttribute('width', '10');
-          element.setAttribute('height', '10');
-          container.appendChild(element);
-          const resource = element.getResource_();
-
-          await resource.build();
-          await resource.whenBuilt();
-          expect(element.isBuilt()).to.be.true;
-
-          const parentPriority = 1;
-          resourcesMock
-            .expects('scheduleLayoutOrPreload')
-            .withExactArgs(
-              resource,
-              /* layout */ true,
-              parentPriority,
-              /* forceOutsideViewport */ true
-            )
-            .once();
-
-          const promise = element.ensureLoaded(parentPriority);
-          await element.layoutCallback();
-          await promise;
-        });
+        await resource.build();
+        await resource.whenBuilt();
+        resource.measure();
+        resource.layoutScheduled(Date.now());
+        await resource.startLayout();
 
-        it('should do nothing for already-loaded element', async () => {
-          const element = new ElementClass();
-          element.setAttribute('layout', 'fixed');
-          element.setAttribute('width', '10');
-          element.setAttribute('height', '10');
-          container.appendChild(element);
-          const resource = element.getResource_();
-
-          await resource.build();
-          await resource.whenBuilt();
-          resource.measure();
-          resource.layoutScheduled(Date.now());
-          await resource.startLayout();
+        resourcesMock.expects('scheduleLayoutOrPreload').never();
 
-          resourcesMock.expects('scheduleLayoutOrPreload').never();
+        await element.ensureLoaded();
+      });
 
-          await element.ensureLoaded();
-        });
+      it('should reload a previously failed element', async () => {
+        const element = new ElementClass();
+        element.setAttribute('layout', 'fixed');
+        element.setAttribute('width', '10');
+        element.setAttribute('height', '10');
+        container.appendChild(element);
+        const resource = element.getResource_();
+
+        await resource.build();
+        await resource.whenBuilt();
+        resource.measure();
+        resource.layoutScheduled(Date.now());
+        const layoutCallbackStub = env.sandbox.stub(element, 'layoutCallback');
+        layoutCallbackStub.returns(Promise.reject(new Error('intentional')));
+        try {
+          await resource.startLayout();
+        } catch (e) {
+          // Expected.
+        }
 
-        it('should reload a previously failed element', async () => {
-          const element = new ElementClass();
-          element.setAttribute('layout', 'fixed');
-          element.setAttribute('width', '10');
-          element.setAttribute('height', '10');
-          container.appendChild(element);
-          const resource = element.getResource_();
-
-          await resource.build();
-          await resource.whenBuilt();
-          resource.measure();
-          resource.layoutScheduled(Date.now());
-          const layoutCallbackStub = env.sandbox.stub(
-            element,
-            'layoutCallback'
-          );
-          layoutCallbackStub.returns(Promise.reject(new Error('intentional')));
-          try {
-            await resource.startLayout();
-          } catch (e) {
-            // Expected.
-          }
-
-          layoutCallbackStub./*OK*/ restore();
-          resourcesMock
-            .expects('scheduleLayoutOrPreload')
-            .withExactArgs(
-              resource,
-              /* layout */ true,
-              /* parentPriority */ undefined,
-              /* forceOutsideViewport */ true
-            )
-            .once();
-
-          const promise = element.ensureLoaded();
-          await element.layoutCallback();
-          await promise;
-        });
+        layoutCallbackStub./*OK*/ restore();
+        resourcesMock
+          .expects('scheduleLayoutOrPreload')
+          .withExactArgs(
+            resource,
+            /* layout */ true,
+            /* parentPriority */ undefined,
+            /* forceOutsideViewport */ true
+          )
+          .once();
+
+        const promise = element.ensureLoaded();
+        await element.layoutCallback();
+        await promise;
+      });
 
-        it('should do nothing for a non-displayed element', async () => {
-          const element = new ElementClass();
-          element.setAttribute('layout', 'nodisplay');
-          container.appendChild(element);
-          const resource = element.getResource_();
+      it('should do nothing for a non-displayed element', async () => {
+        const element = new ElementClass();
+        element.setAttribute('layout', 'nodisplay');
+        container.appendChild(element);
+        const resource = element.getResource_();
 
-          await resource.build();
-          await resource.whenBuilt();
+        await resource.build();
+        await resource.whenBuilt();
 
-          resourcesMock.expects('scheduleLayoutOrPreload').never();
+        resourcesMock.expects('scheduleLayoutOrPreload').never();
 
-          await element.ensureLoaded();
-        });
+        await element.ensureLoaded();
+      });
 
-        it('should remeasure if needed', async () => {
-          const element = new ElementClass();
-          element.setAttribute('layout', 'nodisplay');
-          container.appendChild(element);
-          const resource = element.getResource_();
+      it('should remeasure if needed', async () => {
+        const element = new ElementClass();
+        element.setAttribute('layout', 'nodisplay');
+        container.appendChild(element);
+        const resource = element.getResource_();
 
-          await resource.build();
-          await resource.whenBuilt();
+        await resource.build();
+        await resource.whenBuilt();
 
-          const measureSpy = env.sandbox.spy(resource, 'measure');
-          resourcesMock.expects('scheduleLayoutOrPreload').never();
+        const measureSpy = env.sandbox.spy(resource, 'measure');
+        resourcesMock.expects('scheduleLayoutOrPreload').never();
 
-          resource.requestMeasure();
-          await element.ensureLoaded();
-          expect(measureSpy).to.be.calledOnce;
-        });
+        resource.requestMeasure();
+        await element.ensureLoaded();
+        expect(measureSpy).to.be.calledOnce;
       });
     });
+  });
 });
 
 describes.realWin('CustomElement Service Elements', {amp: true}, (env) => {
@@ -2038,7 +2041,7 @@ describes.realWin('CustomElement Service Elements', {amp: true}, (env) => {
   it('toggleFallback should toggle unsupported class', () => {
     element.resource = {
       getState: () => {
-        return ResourceState.LAYOUT_COMPLETE;
+        return ResourceState_Enum.LAYOUT_COMPLETE;
       },
     };
     element.resources_ = {
@@ -2062,7 +2065,7 @@ describes.realWin('CustomElement Service Elements', {amp: true}, (env) => {
   it('toggleFallback should toggle unsupported class on R1 elements', () => {
     element.resource = {
       getState: () => {
-        return ResourceState.NOT_LAID_OUT;
+        return ResourceState_Enum.NOT_LAID_OUT;
       },
     };
     element.resources_ = {
@@ -2087,7 +2090,7 @@ describes.realWin('CustomElement Service Elements', {amp: true}, (env) => {
   });
 
   it('toggleFallback should not display fallback before element layout', () => {
-    let resourceState = ResourceState.NOT_LAID_OUT;
+    let resourceState = ResourceState_Enum.NOT_LAID_OUT;
     element.resource = {
       getState: () => {
         return resourceState;
@@ -2105,10 +2108,10 @@ describes.realWin('CustomElement Service Elements', {amp: true}, (env) => {
     element.appendChild(createWithAttr('fallback'));
     element.toggleFallback(true);
     expect(element).to.not.have.class('amp-notsupported');
-    resourceState = ResourceState.READY_FOR_LAYOUT;
+    resourceState = ResourceState_Enum.READY_FOR_LAYOUT;
     element.toggleFallback(true);
     expect(element).to.not.have.class('amp-notsupported');
-    resourceState = ResourceState.LAYOUT_COMPLETE;
+    resourceState = ResourceState_Enum.LAYOUT_COMPLETE;
     element.toggleFallback(true);
     expect(element).to.have.class('amp-notsupported');
   });
@@ -2124,218 +2127,214 @@ describes.realWin('CustomElement Service Elements', {amp: true}, (env) => {
 });
 
 describes.realWin('CustomElement', {amp: true}, (env) => {
-  // TODO(dvoytenko, #11827): Make this test work on Safari.
-  describe
-    .configure()
-    .skipSafari()
-    .run('Loading Indicator', () => {
-      let win, doc;
-      let ElementClass;
-      let clock;
-      let resources;
-      let element;
-      let vsync;
-      let resourcesMock;
-      let container;
-
-      class TestElement extends BaseElement {
-        isLayoutSupported(unusedLayout) {
-          return true;
-        }
+  describe('Loading Indicator', () => {
+    let win, doc;
+    let ElementClass;
+    let clock;
+    let resources;
+    let element;
+    let vsync;
+    let resourcesMock;
+    let container;
+
+    class TestElement extends BaseElement {
+      isLayoutSupported(unusedLayout) {
+        return true;
       }
+    }
 
-      beforeEach(() => {
-        win = env.win;
-        doc = win.document;
-        clock = fakeTimers.withGlobal(win).install({now: 42});
-        ElementClass = createAmpElementForTesting(win, TestElement);
-        win.customElements.define('amp-test-loader', ElementClass);
-        win.__AMP_EXTENDED_ELEMENTS['amp-test-loader'] = TestElement;
-        LOADING_ELEMENTS_ENABLED['amp-test-loader'.toUpperCase()] = true;
-        resources = Services.resourcesForDoc(doc);
-        resources.isBuildOn_ = true;
-        resourcesMock = env.sandbox.mock(resources);
-        element = new ElementClass();
-        element.layoutWidth_ = 300;
-        element.layout_ = Layout.FIXED;
-        element.setAttribute('layout', 'fixed');
-        element.resources_ = resources;
-        vsync = Services.vsyncFor(win);
-        env.sandbox.stub(vsync, 'run').callsFake((task) => {
-          if (task.measure) {
-            task.measure();
-          }
-          if (task.mutate) {
-            task.mutate();
-          }
-        });
-        container = doc.createElement('div');
-        doc.body.appendChild(container);
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      clock = fakeTimers.withGlobal(win).install({now: 42});
+      ElementClass = createAmpElementForTesting(win, TestElement);
+      win.customElements.define('amp-test-loader', ElementClass);
+      win.__AMP_EXTENDED_ELEMENTS['amp-test-loader'] = TestElement;
+      LOADING_ELEMENTS_ENUM.AMP_TEST_LOADER = 'AMP-TEST-LOADER';
+      resources = Services.resourcesForDoc(doc);
+      resources.isBuildOn_ = true;
+      resourcesMock = env.sandbox.mock(resources);
+      element = new ElementClass();
+      element.layoutWidth_ = 300;
+      element.layout_ = Layout_Enum.FIXED;
+      element.setAttribute('layout', 'fixed');
+      element.resources_ = resources;
+      vsync = Services.vsyncFor(win);
+      env.sandbox.stub(vsync, 'run').callsFake((task) => {
+        if (task.measure) {
+          task.measure();
+        }
+        if (task.mutate) {
+          task.mutate();
+        }
       });
+      container = doc.createElement('div');
+      doc.body.appendChild(container);
+    });
 
-      afterEach(() => {
-        clock.uninstall();
-        resourcesMock.verify();
-      });
+    afterEach(() => {
+      clock.uninstall();
+      resourcesMock.verify();
+    });
 
-      describe('toggleLoading', () => {
-        let loadingIndicatorServiceStub;
+    describe('toggleLoading', () => {
+      let loadingIndicatorServiceStub;
 
-        beforeEach(() => {
-          loadingIndicatorServiceStub = {
-            track: env.sandbox.spy(),
-            untrack: env.sandbox.spy(),
-          };
-          env.sandbox.stub(element, 'getAmpDoc').returns({});
-          env.sandbox
-            .stub(Services, 'loadingIndicatorOrNull')
-            .returns(loadingIndicatorServiceStub);
-        });
+      beforeEach(() => {
+        loadingIndicatorServiceStub = {
+          track: env.sandbox.spy(),
+          untrack: env.sandbox.spy(),
+        };
+        env.sandbox.stub(element, 'getAmpDoc').returns({});
+        env.sandbox
+          .stub(Services, 'loadingIndicatorOrNull')
+          .returns(loadingIndicatorServiceStub);
+      });
 
-        it('should be enabled by default', () => {
-          element.toggleLoading(true);
-          expect(loadingIndicatorServiceStub.track).to.be.calledOnce.calledWith(
-            element
-          );
-        });
+      it('should be enabled by default', () => {
+        element.toggleLoading(true);
+        expect(loadingIndicatorServiceStub.track).to.be.calledOnce.calledWith(
+          element
+        );
+      });
 
-        it('should disable when explicitly disabled by the attribute', () => {
-          element.setAttribute('noloading', '');
-          element.toggleLoading(true);
-          expect(loadingIndicatorServiceStub.track).to.not.be.called;
-        });
+      it('should disable when explicitly disabled by the attribute', () => {
+        element.setAttribute('noloading', '');
+        element.toggleLoading(true);
+        expect(loadingIndicatorServiceStub.track).to.not.be.called;
+      });
 
-        it('should disable when element is not allowlisted', () => {
-          LOADING_ELEMENTS_ENABLED['amp-test-loader'.toUpperCase()] = false;
-          element.toggleLoading(true);
-          expect(loadingIndicatorServiceStub.track).to.not.be.called;
-        });
+      it('should disable when element is not allowlisted', () => {
+        delete LOADING_ELEMENTS_ENUM.AMP_TEST_LOADER;
+        element.toggleLoading(true);
+        expect(loadingIndicatorServiceStub.track).to.not.be.called;
+      });
 
-        it('should disable when element has already been laid out', () => {
-          element.layoutCount_ = 1;
-          element.toggleLoading(true);
-          expect(loadingIndicatorServiceStub.track).to.not.be.called;
-        });
+      it('should disable when element has already been laid out', () => {
+        element.layoutCount_ = 1;
+        element.toggleLoading(true);
+        expect(loadingIndicatorServiceStub.track).to.not.be.called;
+      });
 
-        it('should disable when element is a placeholder itself', () => {
-          element.setAttribute('placeholder', '');
-          element.toggleLoading(true);
-          expect(loadingIndicatorServiceStub.track).to.not.be.called;
-        });
+      it('should disable when element is a placeholder itself', () => {
+        element.setAttribute('placeholder', '');
+        element.toggleLoading(true);
+        expect(loadingIndicatorServiceStub.track).to.not.be.called;
+      });
 
-        it('should disable when element is layout=nodisplay', () => {
-          element.layout_ = Layout.NODISPLAY;
-          element.toggleLoading(true);
-          expect(loadingIndicatorServiceStub.track).to.not.be.called;
-        });
+      it('should disable when element is layout=nodisplay', () => {
+        element.layout_ = Layout_Enum.NODISPLAY;
+        element.toggleLoading(true);
+        expect(loadingIndicatorServiceStub.track).to.not.be.called;
+      });
 
-        it('should enable when element is layout=container', () => {
-          element.layout_ = Layout.CONTAINER;
-          element.toggleLoading(true);
-          expect(loadingIndicatorServiceStub.track).to.be.calledOnce;
-        });
+      it('should enable when element is layout=container', () => {
+        element.layout_ = Layout_Enum.CONTAINER;
+        element.toggleLoading(true);
+        expect(loadingIndicatorServiceStub.track).to.be.calledOnce;
+      });
 
-        it('should ignore loading-on if already rendered', () => {
-          clock.tick(1);
-          element.signals().signal(CommonSignals.RENDER_START);
-          element.toggleLoading(true);
-          expect(loadingIndicatorServiceStub.track).to.not.be.called;
-        });
+      it('should ignore loading-on if already rendered', () => {
+        clock.tick(1);
+        element.signals().signal(CommonSignals_Enum.RENDER_START);
+        element.toggleLoading(true);
+        expect(loadingIndicatorServiceStub.track).to.not.be.called;
+      });
 
-        it('should ignore loading-on if already loaded', () => {
-          element.layoutCount_ = 1;
-          element.toggleLoading(true);
-          expect(loadingIndicatorServiceStub.track).to.not.be.called;
-        });
+      it('should ignore loading-on if already loaded', () => {
+        element.layoutCount_ = 1;
+        element.toggleLoading(true);
+        expect(loadingIndicatorServiceStub.track).to.not.be.called;
+      });
 
-        it('should cancel loading on render-start', () => {
-          clock.tick(1);
-          const stub = env.sandbox.stub(element, 'toggleLoading');
-          element.renderStarted();
-          expect(element.signals().get(CommonSignals.RENDER_START)).to.be.ok;
-          expect(stub).to.be.calledOnce.calledWith(false);
-        });
+      it('should cancel loading on render-start', () => {
+        clock.tick(1);
+        const stub = env.sandbox.stub(element, 'toggleLoading');
+        element.renderStarted();
+        expect(element.signals().get(CommonSignals_Enum.RENDER_START)).to.be.ok;
+        expect(stub).to.be.calledOnce.calledWith(false);
+      });
 
-        it('should untrack when toggled off', () => {
-          element.toggleLoading(false);
-          expect(
-            loadingIndicatorServiceStub.untrack
-          ).to.be.calledOnce.calledWith(element);
-        });
+      it('should untrack when toggled off', () => {
+        element.toggleLoading(false);
+        expect(loadingIndicatorServiceStub.untrack).to.be.calledOnce.calledWith(
+          element
+        );
       });
+    });
 
-      describe('toggleLoading with layout', () => {
-        let toggle;
+    describe('toggleLoading with layout', () => {
+      let toggle;
 
-        beforeEach(() => {
-          toggle = env.sandbox.spy(element, 'toggleLoading');
-        });
+      beforeEach(() => {
+        toggle = env.sandbox.spy(element, 'toggleLoading');
+      });
+
+      it('should toggle loading off after layout complete', () => {
+        element.setAttribute('height', '10');
+        element.setAttribute('width', '10');
+        container.appendChild(element);
+        return element.buildingPromise_
+          .then(() => {
+            toggle.resetHistory();
+            return element.layoutCallback();
+          })
+          .then(() => {
+            expect(toggle).to.be.calledTwice;
+            expect(toggle.firstCall).calledWith(true);
+            expect(toggle.secondCall).calledWith(false);
+          });
+      });
 
-        it('should toggle loading off after layout complete', () => {
-          element.setAttribute('height', '10');
-          element.setAttribute('width', '10');
-          container.appendChild(element);
-          return element.buildingPromise_
-            .then(() => {
-              toggle.resetHistory();
-              return element.layoutCallback();
-            })
-            .then(() => {
+      it('should toggle loading off after layout failed', () => {
+        env.sandbox
+          .stub(TestElement.prototype, 'layoutCallback')
+          .returns(Promise.reject());
+        element.setAttribute('height', '10');
+        element.setAttribute('width', '10');
+        container.appendChild(element);
+        return element.buildingPromise_
+          .then(() => {
+            toggle.resetHistory();
+            return element.layoutCallback();
+          })
+          .then(
+            () => {
+              throw new Error('Must have failed.');
+            },
+            () => {
               expect(toggle).to.be.calledTwice;
               expect(toggle.firstCall).calledWith(true);
               expect(toggle.secondCall).calledWith(false);
-            });
-        });
-
-        it('should toggle loading off after layout failed', () => {
-          env.sandbox
-            .stub(TestElement.prototype, 'layoutCallback')
-            .returns(Promise.reject());
-          element.setAttribute('height', '10');
-          element.setAttribute('width', '10');
-          container.appendChild(element);
-          return element.buildingPromise_
-            .then(() => {
-              toggle.resetHistory();
-              return element.layoutCallback();
-            })
-            .then(
-              () => {
-                throw new Error('Must have failed.');
-              },
-              () => {
-                expect(toggle).to.be.calledTwice;
-                expect(toggle.firstCall).calledWith(true);
-                expect(toggle.secondCall).calledWith(false);
-              }
-            );
-        });
+            }
+          );
+      });
 
-        it('should disable toggle loading on after layout failed', () => {
-          env.sandbox
-            .stub(TestElement.prototype, 'layoutCallback')
-            .returns(Promise.reject());
-          element.setAttribute('height', '10');
-          element.setAttribute('width', '10');
-          container.appendChild(element);
-          return element.buildingPromise_
-            .then(() => {
-              expect(element.layoutCount_).to.equal(0);
-              expect(element.isLoadingEnabled_()).to.equal(true);
-              return element.layoutCallback();
-            })
-            .then(
-              () => {
-                throw new Error('Must have failed.');
-              },
-              () => {
-                expect(element.layoutCount_).to.equal(1);
-                expect(element.isLoadingEnabled_()).to.equal(false);
-              }
-            );
-        });
+      it('should disable toggle loading on after layout failed', () => {
+        env.sandbox
+          .stub(TestElement.prototype, 'layoutCallback')
+          .returns(Promise.reject());
+        element.setAttribute('height', '10');
+        element.setAttribute('width', '10');
+        container.appendChild(element);
+        return element.buildingPromise_
+          .then(() => {
+            expect(element.layoutCount_).to.equal(0);
+            expect(element.isLoadingEnabled_()).to.equal(true);
+            return element.layoutCallback();
+          })
+          .then(
+            () => {
+              throw new Error('Must have failed.');
+            },
+            () => {
+              expect(element.layoutCount_).to.equal(1);
+              expect(element.isLoadingEnabled_()).to.equal(false);
+            }
+          );
       });
     });
+  });
 });
 
 describes.realWin('CustomElement Overflow Element', {amp: true}, (env) => {
@@ -2363,7 +2362,7 @@ describes.realWin('CustomElement Overflow Element', {amp: true}, (env) => {
     element = new ElementClass();
     element.ampdoc_ = doc;
     element.layoutWidth_ = 300;
-    element.layout_ = Layout.FIXED;
+    element.layout_ = Layout_Enum.FIXED;
     element.mutator_ = mutator;
     overflowElement = doc.createElement('div');
     overflowElement.setAttribute('overflow', '');
diff --git a/test/unit/test-document-info.js b/test/unit/test-document-info.js
index 5e248fc69958..4fa60cd2f460 100644
--- a/test/unit/test-document-info.js
+++ b/test/unit/test-document-info.js
@@ -3,402 +3,400 @@ import {installDocService} from '#service/ampdoc-impl';
 import * as CID from '#service/cid-impl';
 import {installDocumentInfoServiceForDoc} from '#service/document-info-impl';
 
+import {FakePerformance} from '#testing/fake-dom';
 import {createIframePromise} from '#testing/iframe';
 
-describes.sandboxed
-  .configure()
-  .skipFirefox()
-  .run('document-info', {}, (env) => {
-    beforeEach(() => {
-      env.sandbox.stub(CID, 'getRandomString64').returns('abcdef');
-    });
+describes.sandboxed('document-info', {}, (env) => {
+  beforeEach(() => {
+    env.sandbox.stub(CID, 'getRandomString64').returns('abcdef');
+  });
 
-    function getWin(links, metas) {
-      return createIframePromise().then((iframe) => {
-        if (links) {
-          for (const rel in links) {
-            const hrefs = links[rel];
-            for (let i = 0; i < hrefs.length; i++) {
-              const link = iframe.doc.createElement('link');
-              link.setAttribute('rel', rel);
-              link.setAttribute('href', hrefs[i]);
-              iframe.doc.head.appendChild(link);
-            }
+  function getWin(links, metas) {
+    return createIframePromise().then((iframe) => {
+      if (links) {
+        for (const rel in links) {
+          const hrefs = links[rel];
+          for (let i = 0; i < hrefs.length; i++) {
+            const link = iframe.doc.createElement('link');
+            link.setAttribute('rel', rel);
+            link.setAttribute('href', hrefs[i]);
+            iframe.doc.head.appendChild(link);
           }
         }
-        if (metas) {
-          for (const name in metas) {
-            const contents = metas[name];
-            for (let i = 0; i < contents.length; i++) {
-              const meta = iframe.doc.createElement('meta');
-              meta.setAttribute('name', name);
-              meta.setAttribute('content', contents[i]);
-              iframe.doc.head.appendChild(meta);
-            }
+      }
+      if (metas) {
+        for (const name in metas) {
+          const contents = metas[name];
+          for (let i = 0; i < contents.length; i++) {
+            const meta = iframe.doc.createElement('meta');
+            meta.setAttribute('name', name);
+            meta.setAttribute('content', contents[i]);
+            iframe.doc.head.appendChild(meta);
           }
         }
-        const {win} = iframe;
-        installDocService(win, /* isSingleDoc */ true);
-        env.sandbox.stub(win.Math, 'random').callsFake(() => 0.123456789);
-        win.__AMP_SERVICES.documentInfo = null;
-        installDocumentInfoServiceForDoc(win.document);
-        return iframe.win;
-      });
-    }
+      }
+      const {win} = iframe;
+      installDocService(win, /* isSingleDoc */ true);
+      env.sandbox.stub(win.Math, 'random').callsFake(() => 0.123456789);
+      win.__AMP_SERVICES.documentInfo = null;
+      installDocumentInfoServiceForDoc(win.document);
+      return iframe.win;
+    });
+  }
 
-    it('should provide the canonicalUrl', () => {
-      return getWin({'canonical': ['https://twitter.com/']}).then((win) => {
-        expect(Services.documentInfoForDoc(win.document).canonicalUrl).to.equal(
-          'https://twitter.com/'
-        );
-      });
+  it('should provide the canonicalUrl', () => {
+    return getWin({'canonical': ['https://x.com/']}).then((win) => {
+      expect(Services.documentInfoForDoc(win.document).canonicalUrl).to.equal(
+        'https://x.com/'
+      );
     });
+  });
 
-    it('should provide the sourceUrl', () => {
-      const win = {
-        document: {
-          nodeType: /* DOCUMENT */ 9,
-          head: {
-            nodeType: /* ELEMENT */ 1,
-            querySelector() {
-              return null;
-            },
-            querySelectorAll() {
-              return [];
-            },
-          },
+  it('should provide the sourceUrl', () => {
+    const win = {
+      document: {
+        nodeType: /* DOCUMENT */ 9,
+        head: {
+          nodeType: /* ELEMENT */ 1,
           querySelector() {
-            return 'http://www.origin.com/foo/?f=0';
+            return null;
           },
-          getRootNode() {
-            return win.document;
+          querySelectorAll() {
+            return [];
           },
         },
-        Math: {
-          random() {
-            return 0.123456789;
-          },
+        querySelector() {
+          return 'http://www.origin.com/foo/?f=0';
         },
-        location: {
-          href: 'https://cdn.ampproject.org/v/www.origin.com/foo/?f=0',
+        getRootNode() {
+          return win.document;
         },
-      };
-      win.document.defaultView = win;
-      installDocService(win, /* isSingleDoc */ true);
-      installDocumentInfoServiceForDoc(win.document);
-      expect(Services.documentInfoForDoc(win.document).sourceUrl).to.equal(
-        'http://www.origin.com/foo/?f=0'
-      );
-    });
+      },
+      Math: {
+        random() {
+          return 0.123456789;
+        },
+      },
+      location: {
+        href: 'https://cdn.ampproject.org/v/www.origin.com/foo/?f=0',
+      },
+      performance: new FakePerformance(window),
+    };
+    win.document.defaultView = win;
+    installDocService(win, /* isSingleDoc */ true);
+    installDocumentInfoServiceForDoc(win.document);
+    expect(Services.documentInfoForDoc(win.document).sourceUrl).to.equal(
+      'http://www.origin.com/foo/?f=0'
+    );
+  });
 
-    it('should provide the updated sourceUrl', () => {
-      const win = {
-        document: {
-          nodeType: /* document */ 9,
-          head: {
-            nodeType: /* ELEMENT */ 1,
-            querySelector() {
-              return null;
-            },
-            querySelectorAll() {
-              return [];
-            },
-          },
+  it('should provide the updated sourceUrl', () => {
+    const win = {
+      document: {
+        nodeType: /* document */ 9,
+        head: {
+          nodeType: /* ELEMENT */ 1,
           querySelector() {
-            return 'http://www.origin.com/foo/?f=0';
+            return null;
           },
-          getRootNode() {
-            return win.document;
+          querySelectorAll() {
+            return [];
           },
         },
-        Math: {
-          random() {
-            return 0.123456789;
-          },
+        querySelector() {
+          return 'http://www.origin.com/foo/?f=0';
         },
-        location: {
-          href: 'https://cdn.ampproject.org/v/www.origin.com/foo/?f=0',
+        getRootNode() {
+          return win.document;
         },
-      };
-      win.document.defaultView = win;
-      installDocService(win, /* isSingleDoc */ true);
-      installDocumentInfoServiceForDoc(win.document);
-      expect(Services.documentInfoForDoc(win.document).sourceUrl).to.equal(
-        'http://www.origin.com/foo/?f=0'
+      },
+      Math: {
+        random() {
+          return 0.123456789;
+        },
+      },
+      location: {
+        href: 'https://cdn.ampproject.org/v/www.origin.com/foo/?f=0',
+      },
+      performance: new FakePerformance(window),
+    };
+    win.document.defaultView = win;
+    installDocService(win, /* isSingleDoc */ true);
+    installDocumentInfoServiceForDoc(win.document);
+    expect(Services.documentInfoForDoc(win.document).sourceUrl).to.equal(
+      'http://www.origin.com/foo/?f=0'
+    );
+    win.location.href = 'https://cdn.ampproject.org/v/www.origin.com/foo/?f=1';
+    expect(Services.documentInfoForDoc(win.document).sourceUrl).to.equal(
+      'http://www.origin.com/foo/?f=1'
+    );
+  });
+
+  it('should provide the pageViewId', () => {
+    return getWin({'canonical': ['https://x.com/']}).then((win) => {
+      expect(Services.documentInfoForDoc(win.document).pageViewId).to.equal(
+        '1234'
       );
-      win.location.href =
-        'https://cdn.ampproject.org/v/www.origin.com/foo/?f=1';
-      expect(Services.documentInfoForDoc(win.document).sourceUrl).to.equal(
-        'http://www.origin.com/foo/?f=1'
+      expect(Services.documentInfoForDoc(win.document).pageViewId).to.equal(
+        '1234'
       );
     });
+  });
 
-    it('should provide the pageViewId', () => {
-      return getWin({'canonical': ['https://twitter.com/']}).then((win) => {
-        expect(Services.documentInfoForDoc(win.document).pageViewId).to.equal(
-          '1234'
-        );
-        expect(Services.documentInfoForDoc(win.document).pageViewId).to.equal(
-          '1234'
-        );
-      });
+  it('should provide the pageViewId64', () => {
+    return getWin({'canonical': ['https://x.com/']}).then((win) => {
+      expect(Services.documentInfoForDoc(win.document).pageViewId64).to.equal(
+        'abcdef'
+      );
+      expect(Services.documentInfoForDoc(win.document).pageViewId64).to.equal(
+        'abcdef'
+      );
     });
+  });
 
-    it('should provide the pageViewId64', () => {
-      return getWin({'canonical': ['https://twitter.com/']}).then((win) => {
-        expect(Services.documentInfoForDoc(win.document).pageViewId64).to.equal(
-          'abcdef'
-        );
-        expect(Services.documentInfoForDoc(win.document).pageViewId64).to.equal(
-          'abcdef'
-        );
-      });
+  it('should provide the relative canonicalUrl as absolute', () => {
+    return getWin({'canonical': ['./foo.html']}).then((win) => {
+      expect(Services.documentInfoForDoc(win.document).canonicalUrl).to.equal(
+        'http://localhost:' + location.port + '/foo.html'
+      );
     });
+  });
 
-    it('should provide the relative canonicalUrl as absolute', () => {
-      return getWin({'canonical': ['./foo.html']}).then((win) => {
-        expect(Services.documentInfoForDoc(win.document).canonicalUrl).to.equal(
-          'http://localhost:' + location.port + '/foo.html'
-        );
-      });
+  it('should provide the linkRels containing link tag rels', () => {
+    return getWin({
+      'canonical': ['https://x.com/'],
+      'icon': ['https://foo.html/bar.gif'],
+    }).then((win) => {
+      expect(
+        Services.documentInfoForDoc(win.document).linkRels['canonical']
+      ).to.equal('https://x.com/');
+      expect(
+        Services.documentInfoForDoc(win.document).linkRels['icon']
+      ).to.equal('https://foo.html/bar.gif');
+    });
+  });
+
+  it('should provide empty linkRels if there are no link tags', () => {
+    return getWin().then((win) => {
+      expect(Services.documentInfoForDoc(win.document).linkRels).to.be.empty;
+    });
+  });
+
+  it('should provide the linkRels containing link tag rels as absolute', () => {
+    return getWin({
+      'canonical': ['./foo.html'],
+      'icon': ['./bar.gif'],
+    }).then((win) => {
+      expect(
+        Services.documentInfoForDoc(win.document).linkRels['canonical']
+      ).to.equal('http://localhost:' + location.port + '/foo.html');
+      expect(
+        Services.documentInfoForDoc(win.document).linkRels['icon']
+      ).to.equal('http://localhost:' + location.port + '/bar.gif');
     });
+  });
 
-    it('should provide the linkRels containing link tag rels', () => {
+  it(
+    'should provide the linkRels containing link tag rels with ' +
+      'space in rel',
+    () => {
       return getWin({
-        'canonical': ['https://twitter.com/'],
+        'sharelink canonical': ['https://x.com/'],
         'icon': ['https://foo.html/bar.gif'],
       }).then((win) => {
+        expect(
+          Services.documentInfoForDoc(win.document).linkRels['sharelink']
+        ).to.equal('https://x.com/');
         expect(
           Services.documentInfoForDoc(win.document).linkRels['canonical']
-        ).to.equal('https://twitter.com/');
+        ).to.equal('https://x.com/');
         expect(
           Services.documentInfoForDoc(win.document).linkRels['icon']
         ).to.equal('https://foo.html/bar.gif');
       });
-    });
+    }
+  );
 
-    it('should provide empty linkRels if there are no link tags', () => {
-      return getWin().then((win) => {
-        expect(Services.documentInfoForDoc(win.document).linkRels).to.be.empty;
+  it(
+    'should provide the linkRels containing link tag rels with multiple ' +
+      'hrefs',
+    () => {
+      return getWin({
+        'canonical': ['https://x.com/'],
+        'icon': ['https://foo.html/bar.gif'],
+        'stylesheet': [
+          'https://foo.html/style1.css',
+          'https://foo.html/style2.css',
+        ],
+      }).then((win) => {
+        const documentInfo = Services.documentInfoForDoc(win.document);
+        expect(documentInfo.linkRels['canonical']).to.equal('https://x.com/');
+        expect(documentInfo.linkRels['icon']).to.equal(
+          'https://foo.html/bar.gif'
+        );
+        expect(documentInfo.linkRels['stylesheet'].length).to.equal(2);
+        expect(documentInfo.linkRels['stylesheet'][0]).to.equal(
+          'https://foo.html/style1.css'
+        );
+        expect(documentInfo.linkRels['stylesheet'][1]).to.equal(
+          'https://foo.html/style2.css'
+        );
       });
-    });
+    }
+  );
 
-    it('should provide the linkRels containing link tag rels as absolute', () => {
+  it(
+    'should provide the linkRels containing link tag rels but drop ' +
+      'prefetch/preload/preconnect rels',
+    () => {
       return getWin({
-        'canonical': ['./foo.html'],
-        'icon': ['./bar.gif'],
+        'canonical': ['https://x.com/'],
+        'icon': ['https://foo.html/bar.gif'],
+        'prefetch': ['https://foo1.com'],
+        'preload': ['https://foo2.com'],
+        'preconnect': ['https://foo3.com'],
       }).then((win) => {
         expect(
           Services.documentInfoForDoc(win.document).linkRels['canonical']
-        ).to.equal('http://localhost:' + location.port + '/foo.html');
+        ).to.equal('https://x.com/');
         expect(
           Services.documentInfoForDoc(win.document).linkRels['icon']
-        ).to.equal('http://localhost:' + location.port + '/bar.gif');
+        ).to.equal('https://foo.html/bar.gif');
+        expect(Services.documentInfoForDoc(win.document).linkRels['prefetch'])
+          .to.be.undefined;
+        expect(Services.documentInfoForDoc(win.document).linkRels['preload']).to
+          .be.undefined;
+        expect(Services.documentInfoForDoc(win.document).linkRels['preconnect'])
+          .to.be.undefined;
       });
-    });
-
-    it(
-      'should provide the linkRels containing link tag rels with ' +
-        'space in rel',
-      () => {
-        return getWin({
-          'sharelink canonical': ['https://twitter.com/'],
-          'icon': ['https://foo.html/bar.gif'],
-        }).then((win) => {
-          expect(
-            Services.documentInfoForDoc(win.document).linkRels['sharelink']
-          ).to.equal('https://twitter.com/');
-          expect(
-            Services.documentInfoForDoc(win.document).linkRels['canonical']
-          ).to.equal('https://twitter.com/');
-          expect(
-            Services.documentInfoForDoc(win.document).linkRels['icon']
-          ).to.equal('https://foo.html/bar.gif');
-        });
-      }
-    );
-
-    it(
-      'should provide the linkRels containing link tag rels with multiple ' +
-        'hrefs',
-      () => {
-        return getWin({
-          'canonical': ['https://twitter.com/'],
-          'icon': ['https://foo.html/bar.gif'],
-          'stylesheet': [
-            'https://foo.html/style1.css',
-            'https://foo.html/style2.css',
-          ],
-        }).then((win) => {
-          const documentInfo = Services.documentInfoForDoc(win.document);
-          expect(documentInfo.linkRels['canonical']).to.equal(
-            'https://twitter.com/'
-          );
-          expect(documentInfo.linkRels['icon']).to.equal(
-            'https://foo.html/bar.gif'
-          );
-          expect(documentInfo.linkRels['stylesheet'].length).to.equal(2);
-          expect(documentInfo.linkRels['stylesheet'][0]).to.equal(
-            'https://foo.html/style1.css'
-          );
-          expect(documentInfo.linkRels['stylesheet'][1]).to.equal(
-            'https://foo.html/style2.css'
-          );
-        });
-      }
-    );
+    }
+  );
 
-    it(
-      'should provide the linkRels containing link tag rels but drop ' +
-        'prefetch/preload/preconnect rels',
-      () => {
-        return getWin({
-          'canonical': ['https://twitter.com/'],
-          'icon': ['https://foo.html/bar.gif'],
-          'prefetch': ['https://foo1.com'],
-          'preload': ['https://foo2.com'],
-          'preconnect': ['https://foo3.com'],
-        }).then((win) => {
-          expect(
-            Services.documentInfoForDoc(win.document).linkRels['canonical']
-          ).to.equal('https://twitter.com/');
-          expect(
-            Services.documentInfoForDoc(win.document).linkRels['icon']
-          ).to.equal('https://foo.html/bar.gif');
-          expect(Services.documentInfoForDoc(win.document).linkRels['prefetch'])
-            .to.be.undefined;
-          expect(Services.documentInfoForDoc(win.document).linkRels['preload'])
-            .to.be.undefined;
-          expect(
-            Services.documentInfoForDoc(win.document).linkRels['preconnect']
-          ).to.be.undefined;
-        });
+  it('should provide the viewport', () => {
+    return getWin(
+      {},
+      {
+        'viewport': ['width=device-width'],
       }
-    );
-
-    it('should provide the viewport', () => {
-      return getWin(
-        {},
-        {
-          'viewport': ['width=device-width'],
-        }
-      ).then((win) => {
-        expect(Services.documentInfoForDoc(win.document).viewport).to.equal(
-          'width=device-width'
-        );
-      });
+    ).then((win) => {
+      expect(Services.documentInfoForDoc(win.document).viewport).to.equal(
+        'width=device-width'
+      );
     });
+  });
 
-    it('should provide the replaceParams for an AMP landing page', () => {
-      const base = 'https://cdn.ampproject.org/a/www.origin.com/foo/';
-      const win = {
-        document: {
-          nodeType: /* document */ 9,
-          head: {
-            nodeType: /* ELEMENT */ 1,
-            querySelector() {
-              return null;
-            },
-            querySelectorAll() {
-              return [];
-            },
-          },
+  it('should provide the replaceParams for an AMP landing page', () => {
+    const base = 'https://cdn.ampproject.org/a/www.origin.com/foo/';
+    const win = {
+      document: {
+        nodeType: /* document */ 9,
+        head: {
+          nodeType: /* ELEMENT */ 1,
           querySelector() {
-            return 'http://www.origin.com/foo/?f=0';
+            return null;
           },
-          getRootNode() {
-            return win.document;
+          querySelectorAll() {
+            return [];
           },
         },
-        Math: {
-          random() {
-            return 0.123456789;
-          },
+        querySelector() {
+          return 'http://www.origin.com/foo/?f=0';
         },
-        location: {
-          href: base + '?f=0&amp_r=test%3Dhello%20world',
+        getRootNode() {
+          return win.document;
         },
-      };
-      win.document.defaultView = win;
-      installDocService(win, /* isSingleDoc */ true);
-      installDocumentInfoServiceForDoc(win.document);
-      expect(
-        Services.documentInfoForDoc(win.document).replaceParams
-      ).to.deep.equal({'test': 'hello world'});
-    });
+      },
+      Math: {
+        random() {
+          return 0.123456789;
+        },
+      },
+      location: {
+        href: base + '?f=0&amp_r=test%3Dhello%20world',
+      },
+      performance: new FakePerformance(window),
+    };
+    win.document.defaultView = win;
+    installDocService(win, /* isSingleDoc */ true);
+    installDocumentInfoServiceForDoc(win.document);
+    expect(
+      Services.documentInfoForDoc(win.document).replaceParams
+    ).to.deep.equal({'test': 'hello world'});
+  });
 
-    it('should not have replaceParams for non-AMP landing page', () => {
-      const base = 'https://cdn.ampproject.org/v/www.origin.com/foo/';
-      const win = {
-        document: {
-          nodeType: /* document */ 9,
-          head: {
-            nodeType: /* ELEMENT */ 1,
-            querySelector() {
-              return null;
-            },
-            querySelectorAll() {
-              return [];
-            },
-          },
+  it('should not have replaceParams for non-AMP landing page', () => {
+    const base = 'https://cdn.ampproject.org/v/www.origin.com/foo/';
+    const win = {
+      document: {
+        nodeType: /* document */ 9,
+        head: {
+          nodeType: /* ELEMENT */ 1,
           querySelector() {
-            return 'http://www.origin.com/foo/?f=0';
+            return null;
           },
-          getRootNode() {
-            return win.document;
+          querySelectorAll() {
+            return [];
           },
         },
-        Math: {
-          random() {
-            return 0.123456789;
-          },
+        querySelector() {
+          return 'http://www.origin.com/foo/?f=0';
         },
-        location: {
-          href: base + '?f=0&amp_r=test%3Dhello%20world',
+        getRootNode() {
+          return win.document;
         },
-      };
-      win.document.defaultView = win;
-      installDocService(win, /* isSingleDoc */ true);
-      installDocumentInfoServiceForDoc(win.document);
-      expect(Services.documentInfoForDoc(win.document).replaceParams).to.be
-        .null;
-    });
+      },
+      Math: {
+        random() {
+          return 0.123456789;
+        },
+      },
+      location: {
+        href: base + '?f=0&amp_r=test%3Dhello%20world',
+      },
+      performance: new FakePerformance(window),
+    };
+    win.document.defaultView = win;
+    installDocService(win, /* isSingleDoc */ true);
+    installDocumentInfoServiceForDoc(win.document);
+    expect(Services.documentInfoForDoc(win.document).replaceParams).to.be.null;
+  });
 
-    it('should not provide the replaceParams if invalid', () => {
-      const base = 'https://cdn.ampproject.org/a/www.origin.com/foo/';
-      const win = {
-        document: {
-          nodeType: /* document */ 9,
-          head: {
-            nodeType: /* ELEMENT */ 1,
-            querySelector() {
-              return null;
-            },
-            querySelectorAll() {
-              return [];
-            },
-          },
+  it('should not provide the replaceParams if invalid', () => {
+    const base = 'https://cdn.ampproject.org/a/www.origin.com/foo/';
+    const win = {
+      document: {
+        nodeType: /* document */ 9,
+        head: {
+          nodeType: /* ELEMENT */ 1,
           querySelector() {
-            return 'http://www.origin.com/foo/?f=0';
+            return null;
           },
-          getRootNode() {
-            return win.document;
+          querySelectorAll() {
+            return [];
           },
         },
-        Math: {
-          random() {
-            return 0.123456789;
-          },
+        querySelector() {
+          return 'http://www.origin.com/foo/?f=0';
         },
-        location: {
-          href: base + '?f=0&amp_r=%3Dinvalid',
+        getRootNode() {
+          return win.document;
         },
-      };
-      win.document.defaultView = win;
-      installDocService(win, /* isSingleDoc */ true);
-      installDocumentInfoServiceForDoc(win.document);
-      expect(
-        Services.documentInfoForDoc(win.document).replaceParams
-      ).to.deep.equal({});
-    });
+      },
+      Math: {
+        random() {
+          return 0.123456789;
+        },
+      },
+      location: {
+        href: base + '?f=0&amp_r=%3Dinvalid',
+      },
+      performance: new FakePerformance(window),
+    };
+    win.document.defaultView = win;
+    installDocService(win, /* isSingleDoc */ true);
+    installDocumentInfoServiceForDoc(win.document);
+    expect(
+      Services.documentInfoForDoc(win.document).replaceParams
+    ).to.deep.equal({});
   });
+});
diff --git a/test/unit/test-error-reporting.js b/test/unit/test-error-reporting.js
index 5934f2b74f7f..c295f74aea7b 100644
--- a/test/unit/test-error-reporting.js
+++ b/test/unit/test-error-reporting.js
@@ -189,7 +189,7 @@ describes.sandboxed('getErrorReportData', {}, (env) => {
 
   beforeEach(() => {
     onError = window.onerror;
-    nextRandomNumber = 0;
+    nextRandomNumber = 1;
     env.sandbox.stub(Math, 'random').callsFake(() => nextRandomNumber);
     self.__AMP_MODE = undefined;
   });
@@ -227,6 +227,7 @@ describes.sandboxed('getErrorReportData', {}, (env) => {
     expect(data.r).to.contain('http://localhost');
     expect(data.noAmp).to.equal('1');
     expect(data.args).to.be.undefined;
+    expect(data.cdn).to.equal('https://cdn.ampproject.org');
   });
 
   it('reportError with error and ignore stack', () => {
@@ -499,7 +500,7 @@ describes.sandboxed('getErrorReportData', {}, (env) => {
   });
 
   it('should throttle user errors', () => {
-    nextRandomNumber = 0.2;
+    nextRandomNumber = 0.0099999;
     let e = '';
     allowConsoleError(() => {
       try {
@@ -519,7 +520,7 @@ describes.sandboxed('getErrorReportData', {}, (env) => {
   });
 
   it('should not report load errors', () => {
-    nextRandomNumber = 1e-3 + 1e-4;
+    nextRandomNumber = 0.000099999;
     const e = new Error('Failed to load:');
     const data = getErrorReportData(
       undefined,
@@ -532,7 +533,7 @@ describes.sandboxed('getErrorReportData', {}, (env) => {
   });
 
   it('should report throttled load errors at threshold', () => {
-    nextRandomNumber = 1e-3;
+    nextRandomNumber = 0.9999;
     const e = new Error('Failed to load:');
     const data = getErrorReportData(
       undefined,
@@ -546,7 +547,7 @@ describes.sandboxed('getErrorReportData', {}, (env) => {
   });
 
   it('should not report Script errors', () => {
-    nextRandomNumber = 1e-3 + 1e-4;
+    nextRandomNumber = 0.000099999;
     const e = new Error('Script error.');
     const data = getErrorReportData(
       undefined,
@@ -559,7 +560,7 @@ describes.sandboxed('getErrorReportData', {}, (env) => {
   });
 
   it('should report throttled Script errors at threshold', () => {
-    nextRandomNumber = 1e-3;
+    nextRandomNumber = 0.9999;
     const e = new Error('Script error.');
     const data = getErrorReportData(
       undefined,
@@ -573,7 +574,7 @@ describes.sandboxed('getErrorReportData', {}, (env) => {
   });
 
   it('should report throttled load errors under threshold', () => {
-    nextRandomNumber = 1e-3 - 1e-4;
+    nextRandomNumber = 0.9999;
     const e = new Error('Failed to load:');
     const data = getErrorReportData(
       undefined,
diff --git a/test/unit/test-extension-script.js b/test/unit/test-extension-script.js
index 0a9c52206d07..8455098d8984 100644
--- a/test/unit/test-extension-script.js
+++ b/test/unit/test-extension-script.js
@@ -2,6 +2,7 @@ import {createElementWithAttributes} from '#core/dom';
 
 import {
   calculateEntryPointScriptUrl,
+  calculateExtensionFileUrl,
   calculateExtensionScriptUrl,
   getExtensionScripts,
   parseExtensionUrl,
@@ -323,6 +324,54 @@ describes.sandboxed('Module Extension Location', {}, () => {
   });
 });
 
+describes.sandboxed('Extension File Location', {}, () => {
+  describe('get correct file location', () => {
+    beforeEach(() => {
+      // These functions must not rely on log for cases in SW.
+      resetLogConstructorForTesting();
+    });
+
+    afterEach(() => {
+      initLogConstructor();
+      window.__AMP_MODE = {};
+    });
+
+    it('with local mode', () => {
+      window.__AMP_MODE = {rtvVersion: '123'};
+      const script = calculateExtensionFileUrl(
+        window,
+        {
+          pathname: 'examples/ads.amp.html',
+          host: 'localhost:8000',
+          protocol: 'http:',
+        },
+        'some-file.json',
+        true
+      );
+      expect(script).to.equal(
+        'http://localhost:8000/dist/rtv/123/v0/some-file.json'
+      );
+    });
+
+    it('with remote mode', () => {
+      window.__AMP_MODE = {rtvVersion: '123'};
+      const script = calculateExtensionFileUrl(
+        window,
+        {
+          pathname: 'examples/ads.amp.html',
+          host: 'localhost:8000',
+          protocol: 'http:',
+        },
+        'some-file.json',
+        false
+      );
+      expect(script).to.equal(
+        'https://cdn.ampproject.org/rtv/123/v0/some-file.json'
+      );
+    });
+  });
+});
+
 describes.fakeWin('getExtensionScripts', {}, (env) => {
   let win, doc;
 
@@ -362,6 +411,22 @@ describes.fakeWin('getExtensionScripts', {}, (env) => {
       })
     );
 
+    doc.head.appendChild(
+      createElementWithAttributes(doc, 'script', {
+        'id': 'amp-ext3-with-ssr-css-query-param-on',
+        'custom-element': 'amp-ext3',
+        'src': 'https://cdn.ampproject.org/v0/amp-ext3-0.3.js?ssr-css=1',
+      })
+    );
+
+    doc.head.appendChild(
+      createElementWithAttributes(doc, 'script', {
+        'id': 'amp-ext3-with-ssr-css-query-param-off',
+        'custom-element': 'amp-ext3',
+        'src': 'https://cdn.ampproject.org/v0/amp-ext3-0.3.js?ssr-css=0',
+      })
+    );
+
     doc.head.appendChild(
       createElementWithAttributes(doc, 'script', {
         'id': 'amp-ext2-latest',
@@ -406,6 +471,15 @@ describes.fakeWin('getExtensionScripts', {}, (env) => {
     ).to.deep.equal(['amp-ext2-latest']);
   });
 
+  it('should find a specific version with ssr-css query param', () => {
+    expect(
+      ids(getExtensionScripts(win, 'amp-ext3', '0.3', true))
+    ).to.deep.equal([
+      'amp-ext3-with-ssr-css-query-param-on',
+      'amp-ext3-with-ssr-css-query-param-off',
+    ]);
+  });
+
   it('should find an intermediate extension', () => {
     expect(
       ids(getExtensionScripts(win, '_intermediate', '', false))
diff --git a/test/unit/test-fixed-layer.js b/test/unit/test-fixed-layer.js
index a496420433a9..ae02ff0ea181 100644
--- a/test/unit/test-fixed-layer.js
+++ b/test/unit/test-fixed-layer.js
@@ -12,7 +12,12 @@ import {installViewerServiceForDoc} from '#service/viewer-impl';
 import {Animation} from '#utils/animation';
 import {user} from '#utils/log';
 
-import {FakeMutationObserver, FakeWindow} from '#testing/fake-dom';
+import {
+  FakeMutationObserver,
+  FakePerformance,
+  FakeWindow,
+} from '#testing/fake-dom';
+import {hypenCaseToCamelCase} from '#testing/helpers';
 
 describes.sandboxed('FixedLayer', {}, (env) => {
   let parentApi;
@@ -150,6 +155,7 @@ describes.sandboxed('FixedLayer', {}, (env) => {
         navigator: window.navigator,
         location: window.location,
         cookie: '',
+        performance: new FakePerformance(window),
       },
       createElement: (name) => {
         return createElement(name);
@@ -218,70 +224,32 @@ describes.sandboxed('FixedLayer', {}, (env) => {
         return id;
       },
       style: {
-        _top: '15px',
-        _bottom: '',
-        _position: '',
-        _opacity: '0.9',
-        _visibility: 'visible',
-        _transition: '',
+        top: '15px',
+        bottom: '',
+        position: '',
+        opacity: '0.9',
+        visibility: 'visible',
+        transition: '',
 
-        get top() {
-          return this._top;
-        },
-        set top(v) {
-          elem.style.setProperty('top', v);
-        },
-        get bottom() {
-          return this._bottom;
-        },
-        set bottom(v) {
-          elem.style.setProperty('bottom', v);
-        },
-        get position() {
-          return this._position;
-        },
-        set position(v) {
-          elem.style.setProperty('position', v);
-        },
-        get opacity() {
-          return this._opacity;
-        },
-        set opacity(v) {
-          elem.style.setProperty('opacity', v);
-        },
-        get visibility() {
-          return this._visibility;
-        },
-        set visibility(v) {
-          elem.style.setProperty('visibility', v);
-        },
-        get transition() {
-          return this._transition;
-        },
-        set transition(v) {
-          elem.style.setProperty('transition', v);
-        },
         setProperty(prop, value, priority) {
-          const privProp = '_' + prop;
-
           // Override if important
           if (priority === 'important') {
-            elem.style[privProp] = `${value} !${priority}`;
+            elem.style[prop] = `${value} !${priority}`;
           } else if (
-            elem.style[privProp] ||
-            !endsWith(elem.computedStyle[prop], '!important')
+            elem.style[prop] ||
+            !elem.computedStyle[prop]?.endsWith('!important')
           ) {
             if (
               prop === 'transition' &&
               !value &&
-              endsWith(elem.style[privProp] || '', '!important')
+              endsWith(elem.style[prop] || '', '!important')
             ) {
               // Emulate a stupid Safari bug.
               // noop.
             } else {
               // If element style is already set, we can override
               // Or, if computed style is not important priority
-              elem.style[privProp] = value;
+              elem.style[hypenCaseToCamelCase(prop)] = value;
             }
           }
         },
@@ -448,794 +416,788 @@ describes.sandboxed('FixedLayer', {}, (env) => {
     return rule;
   }
 
-  // TODO(jridgewell, #11827): Make this test work on Safari.
-  describe
-    .configure()
-    .skipSafari()
-    .run('no-transfer', () => {
-      let fixedLayer;
+  describe('no-transfer', () => {
+    let fixedLayer;
 
-      beforeEach(() => {
-        fixedLayer = new FixedLayer(
-          ampdoc,
-          vsyncApi,
-          /* borderTop */ 0,
-          /* paddingTop */ 11,
-          /* transfer */ false
+    beforeEach(() => {
+      fixedLayer = new FixedLayer(
+        ampdoc,
+        vsyncApi,
+        /* borderTop */ 0,
+        /* paddingTop */ 11,
+        /* transfer */ false
+      );
+      fixedLayer.setup();
+    });
+
+    it('should initialize fixed layer to null', () => {
+      expect(fixedLayer.transferLayer_).to.be.null;
+    });
+
+    it('should discover all potentials', () => {
+      function expectFe(actual, expected) {
+        expect(actual.id).to.equal(expected.id, `${expected.id} wrong`);
+        expect(actual.element).to.equal(
+          expected.element,
+          `${expected.id}: wrong element`
+        );
+        expect(actual.position).to.equal(
+          expected.position,
+          `${expected.id}: wrong position`
+        );
+        expect(JSON.stringify(actual.selectors)).to.equal(
+          JSON.stringify(expected.selectors),
+          `${expected.id}: wrong selectors`
         );
-        fixedLayer.setup();
+      }
+
+      expect(fixedLayer.elements_).to.have.length(5);
+      expectFe(fixedLayer.elements_[0], {
+        id: 'F0',
+        element: element1,
+        position: 'fixed',
+        selectors: [
+          '#amp-custom-rule1',
+          '#doc-body-id #amp-custom-rule1',
+          '#amp-custom-rule2',
+          '#amp-custom-media-rule1',
+          '#other-rule1',
+        ],
       });
-
-      it('should initialize fixed layer to null', () => {
-        expect(fixedLayer.transferLayer_).to.be.null;
+      expectFe(fixedLayer.elements_[1], {
+        id: 'F1',
+        element: element2,
+        position: 'fixed',
+        selectors: [
+          '#amp-custom-rule2',
+          '#amp-custom-supports-rule1',
+          '#other-rule2',
+        ],
+      });
+      expectFe(fixedLayer.elements_[2], {
+        id: 'F2',
+        element: element2,
+        position: 'sticky',
+        selectors: ['#amp-custom-rule4'],
+      });
+      expectFe(fixedLayer.elements_[3], {
+        id: 'F3',
+        element: element4,
+        position: 'sticky',
+        selectors: ['#amp-custom-rule4'],
+      });
+      expectFe(fixedLayer.elements_[4], {
+        id: 'F4',
+        element: element5,
+        position: 'sticky',
+        selectors: ['#amp-custom-rule5'],
       });
+      expect(fixedLayer.isDeclaredFixed(element1)).to.be.true;
+      expect(fixedLayer.isDeclaredSticky(element1)).to.be.false;
+      expect(fixedLayer.isDeclaredFixed(element2)).to.be.true;
+      expect(fixedLayer.isDeclaredSticky(element2)).to.be.true;
+      expect(fixedLayer.isDeclaredFixed(element3)).to.be.false;
+      expect(fixedLayer.isDeclaredSticky(element3)).to.be.false;
+      expect(fixedLayer.isDeclaredSticky(element4)).to.be.true;
+      expect(fixedLayer.isDeclaredSticky(element5)).to.be.true;
+    });
 
-      it('should discover all potentials', () => {
-        function expectFe(actual, expected) {
-          expect(actual.id).to.equal(expected.id, `${expected.id} wrong`);
-          expect(actual.element).to.equal(
-            expected.element,
-            `${expected.id}: wrong element`
-          );
-          expect(actual.position).to.equal(
-            expected.position,
-            `${expected.id}: wrong position`
-          );
-          expect(JSON.stringify(actual.selectors)).to.equal(
-            JSON.stringify(expected.selectors),
-            `${expected.id}: wrong selectors`
-          );
-        }
+    it('should add and remove element directly', () => {
+      const updateStub = env.sandbox.stub(fixedLayer, 'update');
+      expect(fixedLayer.elements_).to.have.length(5);
 
-        expect(fixedLayer.elements_).to.have.length(5);
-        expectFe(fixedLayer.elements_[0], {
-          id: 'F0',
-          element: element1,
-          position: 'fixed',
-          selectors: [
-            '#amp-custom-rule1',
-            '#doc-body-id #amp-custom-rule1',
-            '#amp-custom-rule2',
-            '#amp-custom-media-rule1',
-            '#other-rule1',
-          ],
-        });
-        expectFe(fixedLayer.elements_[1], {
-          id: 'F1',
-          element: element2,
-          position: 'fixed',
-          selectors: [
-            '#amp-custom-rule2',
-            '#amp-custom-supports-rule1',
-            '#other-rule2',
-          ],
-        });
-        expectFe(fixedLayer.elements_[2], {
-          id: 'F2',
-          element: element2,
-          position: 'sticky',
-          selectors: ['#amp-custom-rule4'],
-        });
-        expectFe(fixedLayer.elements_[3], {
-          id: 'F3',
-          element: element4,
-          position: 'sticky',
-          selectors: ['#amp-custom-rule4'],
-        });
-        expectFe(fixedLayer.elements_[4], {
-          id: 'F4',
-          element: element5,
-          position: 'sticky',
-          selectors: ['#amp-custom-rule5'],
-        });
-        expect(fixedLayer.isDeclaredFixed(element1)).to.be.true;
-        expect(fixedLayer.isDeclaredSticky(element1)).to.be.false;
-        expect(fixedLayer.isDeclaredFixed(element2)).to.be.true;
-        expect(fixedLayer.isDeclaredSticky(element2)).to.be.true;
-        expect(fixedLayer.isDeclaredFixed(element3)).to.be.false;
-        expect(fixedLayer.isDeclaredSticky(element3)).to.be.false;
-        expect(fixedLayer.isDeclaredSticky(element4)).to.be.true;
-        expect(fixedLayer.isDeclaredSticky(element5)).to.be.true;
-      });
+      // Add.
+      fixedLayer.addElement(element6);
+      expect(updateStub).to.be.calledOnce;
+      expect(fixedLayer.elements_).to.have.length(6);
+      const fe = fixedLayer.elements_[5];
+      expect(fe.id).to.equal('F5');
+      expect(fe.element).to.equal(element6);
+      expect(fe.selectors).to.deep.equal(['*']);
+      expect(fe.forceTransfer).to.be.undefined;
+
+      // Remove.
+      fixedLayer.removeElement(element6);
+      expect(fixedLayer.elements_).to.have.length(5);
+
+      // Add with forceTransfer=true.
+      fixedLayer.addElement(element6, true);
+      expect(updateStub).to.have.callCount(2);
+      expect(fixedLayer.elements_).to.have.length(6);
+      const fe1 = fixedLayer.elements_[5];
+      expect(fe1.id).to.equal('F6');
+      expect(fe1.element).to.equal(element6);
+      expect(fe1.selectors).to.deep.equal(['*']);
+      expect(fe1.forceTransfer).to.be.true;
+
+      // Remove.
+      fixedLayer.removeElement(element6);
+      expect(fixedLayer.elements_).to.have.length(5);
+
+      // Add with forceTransfer=false.
+      fixedLayer.addElement(element6, false);
+      expect(updateStub).to.have.callCount(3);
+      expect(fixedLayer.elements_).to.have.length(6);
+      const fe2 = fixedLayer.elements_[5];
+      expect(fe2.id).to.equal('F7');
+      expect(fe2.element).to.equal(element6);
+      expect(fe2.selectors).to.deep.equal(['*']);
+      expect(fe2.forceTransfer).to.be.false;
+
+      // Remove.
+      fixedLayer.removeElement(element6);
+      expect(fixedLayer.elements_).to.have.length(5);
+    });
 
-      it('should add and remove element directly', () => {
-        const updateStub = env.sandbox.stub(fixedLayer, 'update');
-        expect(fixedLayer.elements_).to.have.length(5);
-
-        // Add.
-        fixedLayer.addElement(element6);
-        expect(updateStub).to.be.calledOnce;
-        expect(fixedLayer.elements_).to.have.length(6);
-        const fe = fixedLayer.elements_[5];
-        expect(fe.id).to.equal('F5');
-        expect(fe.element).to.equal(element6);
-        expect(fe.selectors).to.deep.equal(['*']);
-        expect(fe.forceTransfer).to.be.undefined;
-
-        // Remove.
-        fixedLayer.removeElement(element6);
-        expect(fixedLayer.elements_).to.have.length(5);
-
-        // Add with forceTransfer=true.
-        fixedLayer.addElement(element6, true);
-        expect(updateStub).to.have.callCount(2);
-        expect(fixedLayer.elements_).to.have.length(6);
-        const fe1 = fixedLayer.elements_[5];
-        expect(fe1.id).to.equal('F6');
-        expect(fe1.element).to.equal(element6);
-        expect(fe1.selectors).to.deep.equal(['*']);
-        expect(fe1.forceTransfer).to.be.true;
-
-        // Remove.
-        fixedLayer.removeElement(element6);
-        expect(fixedLayer.elements_).to.have.length(5);
-
-        // Add with forceTransfer=false.
-        fixedLayer.addElement(element6, false);
-        expect(updateStub).to.have.callCount(3);
-        expect(fixedLayer.elements_).to.have.length(6);
-        const fe2 = fixedLayer.elements_[5];
-        expect(fe2.id).to.equal('F7');
-        expect(fe2.element).to.equal(element6);
-        expect(fe2.selectors).to.deep.equal(['*']);
-        expect(fe2.forceTransfer).to.be.false;
-
-        // Remove.
-        fixedLayer.removeElement(element6);
-        expect(fixedLayer.elements_).to.have.length(5);
-      });
+    it('should remove node when disappeared from DOM', () => {
+      docBody.removeChild(element1);
+      expect(fixedLayer.elements_).to.have.length(5);
+      fixedLayer.update();
+      expect(fixedLayer.elements_).to.have.length(4);
+    });
 
-      it('should remove node when disappeared from DOM', () => {
-        docBody.removeChild(element1);
-        expect(fixedLayer.elements_).to.have.length(5);
-        fixedLayer.update();
-        expect(fixedLayer.elements_).to.have.length(4);
-      });
+    it('should remove all candidates', () => {
+      // element2 is both fixed and sticky.
+      docBody.removeChild(element2);
+      expect(fixedLayer.elements_).to.have.length(5);
+      fixedLayer.update();
+      expect(fixedLayer.elements_).to.have.length(3);
+    });
 
-      it('should remove all candidates', () => {
-        // element2 is both fixed and sticky.
-        docBody.removeChild(element2);
-        expect(fixedLayer.elements_).to.have.length(5);
-        fixedLayer.update();
-        expect(fixedLayer.elements_).to.have.length(3);
-      });
+    it('should collect updates', () => {
+      element1.computedStyle['position'] = 'fixed';
+      element1.offsetWidth = 10;
+      element1.offsetHeight = 10;
+      element5.computedStyle['position'] = 'sticky';
 
-      it('should collect updates', () => {
-        element1.computedStyle['position'] = 'fixed';
-        element1.offsetWidth = 10;
-        element1.offsetHeight = 10;
-        element5.computedStyle['position'] = 'sticky';
+      expect(vsyncTasks).to.have.length(1);
+      const state = {};
+      vsyncTasks[0].measure(state);
 
-        expect(vsyncTasks).to.have.length(1);
-        const state = {};
-        vsyncTasks[0].measure(state);
+      // F0: element1
+      expect(state['F0'].fixed).to.be.true;
+      expect(state['F0'].sticky).to.be.false;
+      expect(state['F0'].top).to.equal('');
+      expect(state['F0'].zIndex).to.equal('');
 
-        // F0: element1
-        expect(state['F0'].fixed).to.be.true;
-        expect(state['F0'].sticky).to.be.false;
-        expect(state['F0'].top).to.equal('');
-        expect(state['F0'].zIndex).to.equal('');
-
-        // F1: element2
-        expect(state['F1'].fixed).to.equal(false);
-        expect(state['F1'].sticky).to.equal(false);
-
-        // F2: element3
-        expect(state['F2'].fixed).to.equal(false);
-        expect(state['F2'].sticky).to.equal(false);
-
-        // F3: element4
-        expect(state['F3'].fixed).to.be.false;
-        expect(state['F3'].sticky).to.be.false;
-        expect(state['F3'].top).to.equal('');
-        expect(state['F3'].zIndex).to.equal('');
-
-        // F4: element5
-        expect(state['F4'].fixed).to.be.false;
-        expect(state['F4'].sticky).to.be.true;
-        expect(state['F4'].top).to.equal('');
-        expect(state['F4'].zIndex).to.equal('');
-      });
+      // F1: element2
+      expect(state['F1'].fixed).to.equal(false);
+      expect(state['F1'].sticky).to.equal(false);
 
-      it('should support vendor-based sticky', () => {
-        element5.computedStyle['position'] = '-webkit-sticky';
+      // F2: element3
+      expect(state['F2'].fixed).to.equal(false);
+      expect(state['F2'].sticky).to.equal(false);
 
-        expect(vsyncTasks).to.have.length(1);
-        const state = {};
-        vsyncTasks[0].measure(state);
+      // F3: element4
+      expect(state['F3'].fixed).to.be.false;
+      expect(state['F3'].sticky).to.be.false;
+      expect(state['F3'].top).to.equal('');
+      expect(state['F3'].zIndex).to.equal('');
 
-        expect(state['F4'].sticky).to.be.true;
-      });
+      // F4: element5
+      expect(state['F4'].fixed).to.be.false;
+      expect(state['F4'].sticky).to.be.true;
+      expect(state['F4'].top).to.equal('');
+      expect(state['F4'].zIndex).to.equal('');
+    });
 
-      it('should disregard non-fixed position', () => {
-        element1.computedStyle['position'] = 'static';
-        element1.offsetWidth = 10;
-        element1.offsetHeight = 10;
-        element5.computedStyle['position'] = 'static';
+    it('should support vendor-based sticky', () => {
+      element5.computedStyle['position'] = '-webkit-sticky';
 
-        expect(vsyncTasks).to.have.length(1);
-        const state = {};
-        vsyncTasks[0].measure(state);
+      expect(vsyncTasks).to.have.length(1);
+      const state = {};
+      vsyncTasks[0].measure(state);
 
-        expect(state['F0'].fixed).to.be.false;
-        expect(state['F1'].fixed).to.be.false;
-        expect(state['F4'].fixed).to.be.false;
-      });
+      expect(state['F4'].sticky).to.be.true;
+    });
 
-      it('should disregard invisible element, but for fixed only', () => {
-        element1.computedStyle['position'] = 'fixed';
-        element1.offsetWidth = 0;
-        element1.offsetHeight = 0;
-        element5.computedStyle['position'] = 'sticky';
-        element5.offsetWidth = 0;
-        element5.offsetHeight = 0;
+    it('should disregard non-fixed position', () => {
+      element1.computedStyle['position'] = 'static';
+      element1.offsetWidth = 10;
+      element1.offsetHeight = 10;
+      element5.computedStyle['position'] = 'static';
 
-        expect(vsyncTasks).to.have.length(1);
-        const state = {};
-        vsyncTasks[0].measure(state);
+      expect(vsyncTasks).to.have.length(1);
+      const state = {};
+      vsyncTasks[0].measure(state);
 
-        expect(state['F0'].fixed).to.be.false;
-        expect(state['F1'].fixed).to.be.false;
-        expect(state['F4'].sticky).to.be.true;
-      });
+      expect(state['F0'].fixed).to.be.false;
+      expect(state['F1'].fixed).to.be.false;
+      expect(state['F4'].fixed).to.be.false;
+    });
 
-      it('should disregard display:none element', () => {
-        element1.computedStyle['position'] = 'fixed';
-        element1.offsetWidth = 10;
-        element1.offsetHeight = 10;
-        element1.computedStyle['display'] = 'none';
-        element5.computedStyle['position'] = 'sticky';
-        element5.offsetWidth = 10;
-        element5.offsetHeight = 10;
-        element5.computedStyle['display'] = 'none';
+    it('should disregard invisible element, but for fixed only', () => {
+      element1.computedStyle['position'] = 'fixed';
+      element1.offsetWidth = 0;
+      element1.offsetHeight = 0;
+      element5.computedStyle['position'] = 'sticky';
+      element5.offsetWidth = 0;
+      element5.offsetHeight = 0;
 
-        expect(vsyncTasks).to.have.length(1);
-        const state = {};
-        vsyncTasks[0].measure(state);
+      expect(vsyncTasks).to.have.length(1);
+      const state = {};
+      vsyncTasks[0].measure(state);
 
-        expect(state['F0'].fixed).to.be.false;
-        expect(state['F1'].fixed).to.be.false;
-        expect(state['F4'].sticky).to.be.false;
-      });
+      expect(state['F0'].fixed).to.be.false;
+      expect(state['F1'].fixed).to.be.false;
+      expect(state['F4'].sticky).to.be.true;
+    });
 
-      it('should tolerate getComputedStyle = null', () => {
-        // See #3096 and https://bugzilla.mozilla.org/show_bug.cgi?id=548397
-        documentApi.defaultView.getComputedStyle = () => null;
+    it('should disregard display:none element', () => {
+      element1.computedStyle['position'] = 'fixed';
+      element1.offsetWidth = 10;
+      element1.offsetHeight = 10;
+      element1.computedStyle['display'] = 'none';
+      element5.computedStyle['position'] = 'sticky';
+      element5.offsetWidth = 10;
+      element5.offsetHeight = 10;
+      element5.computedStyle['display'] = 'none';
 
-        element1.computedStyle['position'] = 'fixed';
-        element1.offsetWidth = 10;
-        element1.offsetHeight = 10;
+      expect(vsyncTasks).to.have.length(1);
+      const state = {};
+      vsyncTasks[0].measure(state);
 
-        expect(vsyncTasks).to.have.length(1);
-        const state = {};
-        vsyncTasks[0].measure(state);
+      expect(state['F0'].fixed).to.be.false;
+      expect(state['F1'].fixed).to.be.false;
+      expect(state['F4'].sticky).to.be.false;
+    });
 
-        expect(state['F0'].fixed).to.be.false;
-        expect(state['F0'].sticky).to.be.false;
-        expect(state['F0'].transferrable).to.be.false;
-        expect(state['F0'].top).to.equal('');
-        expect(state['F0'].zIndex).to.equal('');
+    it('should tolerate getComputedStyle = null', () => {
+      // See #3096 and https://bugzilla.mozilla.org/show_bug.cgi?id=548397
+      documentApi.defaultView.getComputedStyle = () => null;
 
-        expect(state['F1'].fixed).to.be.false;
-        expect(state['F1'].sticky).to.be.false;
-      });
+      element1.computedStyle['position'] = 'fixed';
+      element1.offsetWidth = 10;
+      element1.offsetHeight = 10;
 
-      it('should collect for top != auto', () => {
-        element1.computedStyle['position'] = 'fixed';
-        element1.computedStyle['top'] = '11px';
-        element1.offsetWidth = 10;
-        element1.offsetHeight = 10;
-        element5.computedStyle['position'] = 'sticky';
-        element5.computedStyle['top'] = '11px';
+      expect(vsyncTasks).to.have.length(1);
+      const state = {};
+      vsyncTasks[0].measure(state);
 
-        expect(vsyncTasks).to.have.length(1);
-        const state = {};
-        vsyncTasks[0].measure(state);
+      expect(state['F0'].fixed).to.be.false;
+      expect(state['F0'].sticky).to.be.false;
+      expect(state['F0'].transferrable).to.be.false;
+      expect(state['F0'].top).to.equal('');
+      expect(state['F0'].zIndex).to.equal('');
 
-        expect(state['F0'].fixed).to.be.true;
-        expect(state['F0'].sticky).to.be.false;
-        expect(state['F0'].top).to.equal('11px');
+      expect(state['F1'].fixed).to.be.false;
+      expect(state['F1'].sticky).to.be.false;
+    });
 
-        expect(state['F4'].fixed).to.be.false;
-        expect(state['F4'].sticky).to.be.true;
-        expect(state['F4'].top).to.equal('11px');
-      });
+    it('should collect for top != auto', () => {
+      element1.computedStyle['position'] = 'fixed';
+      element1.computedStyle['top'] = '11px';
+      element1.offsetWidth = 10;
+      element1.offsetHeight = 10;
+      element5.computedStyle['position'] = 'sticky';
+      element5.computedStyle['top'] = '11px';
 
-      it('should collect for top = auto, but not update top', () => {
-        element1.computedStyle['position'] = 'fixed';
-        element1.computedStyle['top'] = 'auto';
-        element1.offsetWidth = 10;
-        element1.offsetHeight = 10;
-        element5.computedStyle['position'] = 'sticky';
-        element5.computedStyle['top'] = 'auto';
+      expect(vsyncTasks).to.have.length(1);
+      const state = {};
+      vsyncTasks[0].measure(state);
 
-        expect(vsyncTasks).to.have.length(1);
-        const state = {};
-        vsyncTasks[0].measure(state);
+      expect(state['F0'].fixed).to.be.true;
+      expect(state['F0'].sticky).to.be.false;
+      expect(state['F0'].top).to.equal('11px');
 
-        expect(state['F0'].fixed).to.be.true;
-        expect(state['F0'].sticky).to.be.false;
-        expect(state['F0'].top).to.equal('');
+      expect(state['F4'].fixed).to.be.false;
+      expect(state['F4'].sticky).to.be.true;
+      expect(state['F4'].top).to.equal('11px');
+    });
 
-        expect(state['F4'].fixed).to.be.false;
-        expect(state['F4'].sticky).to.be.true;
-        expect(state['F4'].top).to.equal('');
-      });
+    it('should collect for top = auto, but not update top', () => {
+      element1.computedStyle['position'] = 'fixed';
+      element1.computedStyle['top'] = 'auto';
+      element1.offsetWidth = 10;
+      element1.offsetHeight = 10;
+      element5.computedStyle['position'] = 'sticky';
+      element5.computedStyle['top'] = 'auto';
 
-      it('should work around top=0 for sticky', () => {
-        // See http://crbug.com/703816.
-        element5.computedStyle['position'] = 'sticky';
-        element5.computedStyle['top'] = '0px';
-        element5.autoTop = '12px';
+      expect(vsyncTasks).to.have.length(1);
+      const state = {};
+      vsyncTasks[0].measure(state);
 
-        expect(vsyncTasks).to.have.length(1);
-        const state = {};
-        vsyncTasks[0].measure(state);
+      expect(state['F0'].fixed).to.be.true;
+      expect(state['F0'].sticky).to.be.false;
+      expect(state['F0'].top).to.equal('');
 
-        expect(state['F4'].sticky).to.be.true;
-        expect(state['F4'].top).to.equal('');
-      });
+      expect(state['F4'].fixed).to.be.false;
+      expect(state['F4'].sticky).to.be.true;
+      expect(state['F4'].top).to.equal('');
+    });
 
-      it('should work around top=0 for sticky when offset = 0', () => {
-        // See http://crbug.com/703816.
-        element5.computedStyle['position'] = 'sticky';
-        element5.computedStyle['top'] = '0px';
-        element5.autoTop = '0px';
+    it('should work around top=0 for sticky', () => {
+      // See http://crbug.com/703816.
+      element5.computedStyle['position'] = 'sticky';
+      element5.computedStyle['top'] = '0px';
+      element5.autoTop = '12px';
 
-        expect(vsyncTasks).to.have.length(1);
-        const state = {};
-        vsyncTasks[0].measure(state);
+      expect(vsyncTasks).to.have.length(1);
+      const state = {};
+      vsyncTasks[0].measure(state);
 
-        expect(state['F4'].sticky).to.be.true;
-        expect(state['F4'].top).to.equal('0px');
-      });
+      expect(state['F4'].sticky).to.be.true;
+      expect(state['F4'].top).to.equal('');
+    });
 
-      it('should NOT work around top=0 for sticky for non-implicit top', () => {
-        // See http://crbug.com/703816.
-        element5.computedStyle['position'] = 'sticky';
-        element5.computedStyle['top'] = '0px';
-        element5.autoTop = '12px';
+    it('should work around top=0 for sticky when offset = 0', () => {
+      // See http://crbug.com/703816.
+      element5.computedStyle['position'] = 'sticky';
+      element5.computedStyle['top'] = '0px';
+      element5.autoTop = '0px';
 
-        expect(vsyncTasks).to.have.length(1);
-        const state = {};
-        vsyncTasks[0].measure(state);
+      expect(vsyncTasks).to.have.length(1);
+      const state = {};
+      vsyncTasks[0].measure(state);
 
-        expect(state['F4'].sticky).to.be.true;
-        expect(state['F4'].top).to.equal('');
-      });
+      expect(state['F4'].sticky).to.be.true;
+      expect(state['F4'].top).to.equal('0px');
+    });
 
-      it('should collect for implicit top = auto, but not update top', () => {
-        element1.computedStyle['position'] = 'fixed';
-        element1.computedStyle['top'] = '0px';
-        element1.autoTop = '12px';
-        element1.offsetWidth = 10;
-        element1.offsetHeight = 10;
-        element5.computedStyle['position'] = 'sticky';
-        element5.autoTop = '12px';
+    it('should NOT work around top=0 for sticky for non-implicit top', () => {
+      // See http://crbug.com/703816.
+      element5.computedStyle['position'] = 'sticky';
+      element5.computedStyle['top'] = '0px';
+      element5.autoTop = '12px';
 
-        expect(vsyncTasks).to.have.length(1);
-        const state = {};
-        vsyncTasks[0].measure(state);
+      expect(vsyncTasks).to.have.length(1);
+      const state = {};
+      vsyncTasks[0].measure(state);
 
-        expect(state['F0'].fixed).to.be.true;
-        expect(state['F0'].top).to.equal('');
+      expect(state['F4'].sticky).to.be.true;
+      expect(state['F4'].top).to.equal('');
+    });
 
-        expect(state['F4'].sticky).to.be.true;
-        expect(state['F4'].top).to.equal('');
-      });
+    it('should collect for implicit top = auto, but not update top', () => {
+      element1.computedStyle['position'] = 'fixed';
+      element1.computedStyle['top'] = '0px';
+      element1.autoTop = '12px';
+      element1.offsetWidth = 10;
+      element1.offsetHeight = 10;
+      element5.computedStyle['position'] = 'sticky';
+      element5.autoTop = '12px';
 
-      it('should override implicit top = auto to 0 when equals padding', () => {
-        element1.computedStyle['position'] = 'fixed';
-        element1.computedStyle['top'] = '11px';
-        element1.autoTop = '0px';
-        element1.offsetWidth = 10;
-        element1.offsetHeight = 10;
-        element5.computedStyle['position'] = 'sticky';
-        element5.computedStyle['top'] = '11px';
-        element5.autoTop = '11px';
+      expect(vsyncTasks).to.have.length(1);
+      const state = {};
+      vsyncTasks[0].measure(state);
 
-        expect(vsyncTasks).to.have.length(1);
-        const state = {};
-        vsyncTasks[0].measure(state);
+      expect(state['F0'].fixed).to.be.true;
+      expect(state['F0'].top).to.equal('');
 
-        expect(state['F0'].fixed).to.be.true;
-        expect(state['F0'].top).to.equal('0px');
+      expect(state['F4'].sticky).to.be.true;
+      expect(state['F4'].top).to.equal('');
+    });
 
-        expect(state['F4'].sticky).to.be.true;
-        expect(state['F4'].top).to.equal('11px');
-      });
+    it('should override implicit top = auto to 0 when equals padding', () => {
+      element1.computedStyle['position'] = 'fixed';
+      element1.computedStyle['top'] = '11px';
+      element1.autoTop = '0px';
+      element1.offsetWidth = 10;
+      element1.offsetHeight = 10;
+      element5.computedStyle['position'] = 'sticky';
+      element5.computedStyle['top'] = '11px';
+      element5.autoTop = '11px';
 
-      it('should override implicit top = auto to 0 and padding + border', () => {
-        fixedLayer.borderTop_ = 1;
-        element1.computedStyle['position'] = 'fixed';
-        element1.computedStyle['top'] = '12px';
-        element1.autoTop = '0px';
-        element1.offsetWidth = 10;
-        element1.offsetHeight = 10;
-        element5.computedStyle['position'] = 'sticky';
-        element5.computedStyle['top'] = '12px';
-        element5.autoTop = '12px';
+      expect(vsyncTasks).to.have.length(1);
+      const state = {};
+      vsyncTasks[0].measure(state);
 
-        expect(vsyncTasks).to.have.length(1);
-        const state = {};
-        vsyncTasks[0].measure(state);
+      expect(state['F0'].fixed).to.be.true;
+      expect(state['F0'].top).to.equal('0px');
 
-        expect(state['F0'].fixed).to.be.true;
-        expect(state['F0'].top).to.equal('0px');
+      expect(state['F4'].sticky).to.be.true;
+      expect(state['F4'].top).to.equal('11px');
+    });
 
-        expect(state['F4'].sticky).to.be.true;
-        expect(state['F4'].top).to.equal('12px');
-      });
+    it('should override implicit top = auto to 0 and padding + border', () => {
+      fixedLayer.borderTop_ = 1;
+      element1.computedStyle['position'] = 'fixed';
+      element1.computedStyle['top'] = '12px';
+      element1.autoTop = '0px';
+      element1.offsetWidth = 10;
+      element1.offsetHeight = 10;
+      element5.computedStyle['position'] = 'sticky';
+      element5.computedStyle['top'] = '12px';
+      element5.autoTop = '12px';
 
-      it('should override implicit top = auto to 0 w/transient padding', () => {
-        element1.computedStyle['position'] = 'fixed';
-        element1.computedStyle['top'] = '11px';
-        element1.autoTop = '0px';
-        element1.offsetWidth = 10;
-        element1.offsetHeight = 10;
-        element5.computedStyle['position'] = 'sticky';
-        element5.computedStyle['top'] = '11px';
-        element5.autoTop = '11px';
+      expect(vsyncTasks).to.have.length(1);
+      const state = {};
+      vsyncTasks[0].measure(state);
 
-        expect(vsyncTasks).to.have.length(1);
-        const state = {};
-        vsyncTasks[0].measure(state);
+      expect(state['F0'].fixed).to.be.true;
+      expect(state['F0'].top).to.equal('0px');
 
-        expect(state['F0'].fixed).to.equal(true);
-        expect(state['F0'].top).to.equal('0px');
+      expect(state['F4'].sticky).to.be.true;
+      expect(state['F4'].top).to.equal('12px');
+    });
 
-        // Update to transient padding.
-        env.sandbox.stub(fixedLayer, 'update').callsFake(() => {});
-        fixedLayer.updatePaddingTop(22, /* transient */ true);
-        vsyncTasks[0].measure(state);
-        expect(state['F0'].fixed).to.be.true;
-        expect(state['F0'].top).to.equal('0px');
-        expect(state['F4'].sticky).to.be.true;
-        expect(state['F4'].top).to.equal('11px');
-        expect(fixedLayer.paddingTop_).to.equal(22);
-        expect(fixedLayer.committedPaddingTop_).to.equal(11);
-
-        // Update to non-transient padding.
-        fixedLayer.updatePaddingTop(22, /* transient */ false);
-        vsyncTasks[0].measure(state);
-        expect(state['F0'].fixed).to.be.true;
-        expect(state['F0'].top).to.equal(''); // Reset completely.
-        expect(state['F4'].sticky).to.be.true;
-        expect(state['F4'].top).to.equal('11px');
-        expect(fixedLayer.paddingTop_).to.equal(22);
-        expect(fixedLayer.committedPaddingTop_).to.equal(22);
-      });
+    it('should override implicit top = auto to 0 w/transient padding', () => {
+      element1.computedStyle['position'] = 'fixed';
+      element1.computedStyle['top'] = '11px';
+      element1.autoTop = '0px';
+      element1.offsetWidth = 10;
+      element1.offsetHeight = 10;
+      element5.computedStyle['position'] = 'sticky';
+      element5.computedStyle['top'] = '11px';
+      element5.autoTop = '11px';
 
-      it('should always collect and update top = 0', () => {
-        element1.computedStyle['position'] = 'fixed';
-        element1.computedStyle['top'] = '0px';
-        element1.autoTop = '0px';
-        element1.offsetWidth = 10;
-        element1.offsetHeight = 10;
-        element5.computedStyle['position'] = 'sticky';
-        element5.computedStyle['top'] = '0px';
-        element5.autoTop = '0px';
+      expect(vsyncTasks).to.have.length(1);
+      const state = {};
+      vsyncTasks[0].measure(state);
 
-        expect(vsyncTasks).to.have.length(1);
-        const state = {};
-        vsyncTasks[0].measure(state);
+      expect(state['F0'].fixed).to.equal(true);
+      expect(state['F0'].top).to.equal('0px');
 
-        expect(state['F0'].fixed).to.be.true;
-        expect(state['F0'].top).to.equal('0px');
+      // Update to transient padding.
+      env.sandbox.stub(fixedLayer, 'update').callsFake(() => {});
+      fixedLayer.updatePaddingTop(22, /* transient */ true);
+      vsyncTasks[0].measure(state);
+      expect(state['F0'].fixed).to.be.true;
+      expect(state['F0'].top).to.equal('0px');
+      expect(state['F4'].sticky).to.be.true;
+      expect(state['F4'].top).to.equal('11px');
+      expect(fixedLayer.paddingTop_).to.equal(22);
+      expect(fixedLayer.committedPaddingTop_).to.equal(11);
 
-        expect(state['F4'].sticky).to.be.true;
-        expect(state['F4'].top).to.equal('0px');
-      });
+      // Update to non-transient padding.
+      fixedLayer.updatePaddingTop(22, /* transient */ false);
+      vsyncTasks[0].measure(state);
+      expect(state['F0'].fixed).to.be.true;
+      expect(state['F0'].top).to.equal(''); // Reset completely.
+      expect(state['F4'].sticky).to.be.true;
+      expect(state['F4'].top).to.equal('11px');
+      expect(fixedLayer.paddingTop_).to.equal(22);
+      expect(fixedLayer.committedPaddingTop_).to.equal(22);
+    });
 
-      it('should handle transitions', () => {
-        element1.computedStyle['position'] = 'fixed';
-        element1.computedStyle['transition'] = 'all .4s ease';
-        element1.computedStyle['top'] = '0px';
-        element1.autoTop = '0px';
-        element1.offsetWidth = 10;
-        element1.offsetHeight = 10;
-        element5.computedStyle['position'] = 'sticky';
-        element5.computedStyle['transition'] = 'all .4s ease';
-        element5.computedStyle['top'] = '0px';
-        element5.autoTop = '0px';
+    it('should always collect and update top = 0', () => {
+      element1.computedStyle['position'] = 'fixed';
+      element1.computedStyle['top'] = '0px';
+      element1.autoTop = '0px';
+      element1.offsetWidth = 10;
+      element1.offsetHeight = 10;
+      element5.computedStyle['position'] = 'sticky';
+      element5.computedStyle['top'] = '0px';
+      element5.autoTop = '0px';
 
-        expect(vsyncTasks).to.have.length(1);
-        const state = {};
-        vsyncTasks[0].measure(state);
+      expect(vsyncTasks).to.have.length(1);
+      const state = {};
+      vsyncTasks[0].measure(state);
 
-        expect(state['F0'].fixed).to.be.true;
-        expect(state['F0'].top).to.equal('0px');
-        expect(element1.style.transition).to.equal('none !important');
+      expect(state['F0'].fixed).to.be.true;
+      expect(state['F0'].top).to.equal('0px');
 
-        expect(state['F4'].sticky).to.be.true;
-        expect(state['F4'].top).to.equal('0px');
-        expect(element5.style.transition).to.equal('none !important');
+      expect(state['F4'].sticky).to.be.true;
+      expect(state['F4'].top).to.equal('0px');
+    });
 
-        vsyncTasks[0].mutate({});
-        expect(element1.style.transition).to.equal('');
-        expect(element5.style.transition).to.equal('');
-      });
+    it('should handle transitions', () => {
+      element1.computedStyle['position'] = 'fixed';
+      element1.computedStyle['transition'] = 'all .4s ease';
+      element1.computedStyle['top'] = '0px';
+      element1.autoTop = '0px';
+      element1.offsetWidth = 10;
+      element1.offsetHeight = 10;
+      element5.computedStyle['position'] = 'sticky';
+      element5.computedStyle['transition'] = 'all .4s ease';
+      element5.computedStyle['top'] = '0px';
+      element5.autoTop = '0px';
 
-      it('should mutate element to fixed without top', () => {
-        const fe = fixedLayer.elements_[0];
-        fixedLayer.mutateElement_(fe, 1, {
-          fixed: true,
-          sticky: false,
-          top: '',
-        });
+      expect(vsyncTasks).to.have.length(1);
+      const state = {};
+      vsyncTasks[0].measure(state);
 
-        expect(fe.fixedNow).to.be.true;
-        expect(fe.stickyNow).to.be.false;
-        expect(fe.element.style.top).to.equal('15px');
-        expect(fixedLayer.transferLayer_).to.be.null;
+      expect(state['F0'].fixed).to.be.true;
+      expect(state['F0'].top).to.equal('0px');
+      expect(element1.style.transition).to.equal('none !important');
+
+      expect(state['F4'].sticky).to.be.true;
+      expect(state['F4'].top).to.equal('0px');
+      expect(element5.style.transition).to.equal('none !important');
+
+      vsyncTasks[0].mutate({});
+      expect(element1.style.transition).to.equal('');
+      expect(element5.style.transition).to.equal('');
+    });
+
+    it('should mutate element to fixed without top', () => {
+      const fe = fixedLayer.elements_[0];
+      fixedLayer.mutateElement_(fe, 1, {
+        fixed: true,
+        sticky: false,
+        top: '',
       });
 
-      it('should mutate element to sticky without top', () => {
-        const fe = fixedLayer.elements_[4];
-        fixedLayer.mutateElement_(fe, 1, {
-          fixed: false,
-          sticky: true,
-          top: '',
-        });
+      expect(fe.fixedNow).to.be.true;
+      expect(fe.stickyNow).to.be.false;
+      expect(fe.element.style.top).to.equal('15px');
+      expect(fixedLayer.transferLayer_).to.be.null;
+    });
 
-        expect(fe.fixedNow).to.be.false;
-        expect(fe.stickyNow).to.be.true;
-        expect(fe.element.style.top).to.equal('15px');
-        expect(fixedLayer.transferLayer_).to.be.null;
+    it('should mutate element to sticky without top', () => {
+      const fe = fixedLayer.elements_[4];
+      fixedLayer.mutateElement_(fe, 1, {
+        fixed: false,
+        sticky: true,
+        top: '',
       });
 
-      it('should mutate element to fixed with top', () => {
-        const fe = fixedLayer.elements_[0];
-        element1.style.top = '';
-        fixedLayer.mutateElement_(fe, 1, {
-          fixed: true,
-          top: '17px',
-        });
+      expect(fe.fixedNow).to.be.false;
+      expect(fe.stickyNow).to.be.true;
+      expect(fe.element.style.top).to.equal('15px');
+      expect(fixedLayer.transferLayer_).to.be.null;
+    });
 
-        expect(fe.fixedNow).to.be.true;
-        expect(fe.element.style.top).to.equal('calc(17px + 11px)');
+    it('should mutate element to fixed with top', () => {
+      const fe = fixedLayer.elements_[0];
+      element1.style.top = '';
+      fixedLayer.mutateElement_(fe, 1, {
+        fixed: true,
+        top: '17px',
       });
 
-      it('should add needed padding to sticky top if transferring', () => {
-        const fe = fixedLayer.elements_[4];
-        fixedLayer.transfer_ = true;
-        fe.element.style.top = '';
-        fixedLayer.mutateElement_(fe, 1, {
-          sticky: true,
-          top: '17px',
-        });
+      expect(fe.fixedNow).to.be.true;
+      expect(fe.element.style.top).to.equal('calc(17px + 11px)');
+    });
 
-        expect(fe.stickyNow).to.be.true;
-        expect(fe.element.style.top).to.equal('17px');
+    it('should add needed padding to sticky top if transferring', () => {
+      const fe = fixedLayer.elements_[4];
+      fixedLayer.transfer_ = true;
+      fe.element.style.top = '';
+      fixedLayer.mutateElement_(fe, 1, {
+        sticky: true,
+        top: '17px',
       });
 
-      it('should not add unneeded padding to sticky top if transferring', () => {
-        const fe = fixedLayer.elements_[4];
-        fixedLayer.transfer_ = true;
-        fixedLayer.paddingTop_ = 0;
-        fe.element.style.top = '';
-        fixedLayer.mutateElement_(fe, 1, {
-          sticky: true,
-          top: '17px',
-        });
+      expect(fe.stickyNow).to.be.true;
+      expect(fe.element.style.top).to.equal('17px');
+    });
 
-        expect(fe.stickyNow).to.be.true;
-        expect(fe.element.style.top).to.equal('calc(17px - 11px)');
+    it('should not add unneeded padding to sticky top if transferring', () => {
+      const fe = fixedLayer.elements_[4];
+      fixedLayer.transfer_ = true;
+      fixedLayer.paddingTop_ = 0;
+      fe.element.style.top = '';
+      fixedLayer.mutateElement_(fe, 1, {
+        sticky: true,
+        top: '17px',
       });
 
-      it('should mutate element to sticky with top', () => {
-        const fe = fixedLayer.elements_[4];
-        fixedLayer.mutateElement_(fe, 1, {
-          sticky: true,
-          top: '17px',
-        });
+      expect(fe.stickyNow).to.be.true;
+      expect(fe.element.style.top).to.equal('calc(17px - 11px)');
+    });
 
-        expect(fe.stickyNow).to.be.true;
-        expect(fe.element.style.top).to.equal('calc(17px + 11px)');
+    it('should mutate element to sticky with top', () => {
+      const fe = fixedLayer.elements_[4];
+      fixedLayer.mutateElement_(fe, 1, {
+        sticky: true,
+        top: '17px',
       });
 
-      it('should reset top upon being removed from fixedlayer', () => {
-        expect(fixedLayer.elements_).to.have.length(5);
-
-        // Add.
-        fixedLayer.addElement(element6, '*');
-        expect(fixedLayer.elements_).to.have.length(6);
-        const fe = fixedLayer.elements_[5];
-        expect(fe.id).to.equal('F5');
-        expect(fe.element).to.equal(element6);
-        expect(fe.selectors).to.deep.equal(['*']);
-        fixedLayer.mutateElement_(fe, 1, {
-          fixed: true,
-          top: '17px',
-        });
+      expect(fe.stickyNow).to.be.true;
+      expect(fe.element.style.top).to.equal('calc(17px + 11px)');
+    });
 
-        expect(fe.fixedNow).to.be.true;
-        expect(fe.element.style.top).to.equal('calc(17px + 11px)');
-        // Remove.
-        fixedLayer.vsync_ = {
-          mutate(callback) {
-            callback();
-          },
-        };
-        fixedLayer.removeElement(element6);
-        expect(fixedLayer.elements_).to.have.length(5);
-        expect(element6.style.top).to.equal('');
+    it('should reset top upon being removed from fixedlayer', () => {
+      expect(fixedLayer.elements_).to.have.length(5);
+
+      // Add.
+      fixedLayer.addElement(element6, '*');
+      expect(fixedLayer.elements_).to.have.length(6);
+      const fe = fixedLayer.elements_[5];
+      expect(fe.id).to.equal('F5');
+      expect(fe.element).to.equal(element6);
+      expect(fe.selectors).to.deep.equal(['*']);
+      fixedLayer.mutateElement_(fe, 1, {
+        fixed: true,
+        top: '17px',
       });
 
-      it('should reset sticky top upon being removed from fixedlayer', () => {
-        expect(fixedLayer.elements_).to.have.length(5);
+      expect(fe.fixedNow).to.be.true;
+      expect(fe.element.style.top).to.equal('calc(17px + 11px)');
+      // Remove.
+      fixedLayer.vsync_ = {
+        mutate(callback) {
+          callback();
+        },
+      };
+      fixedLayer.removeElement(element6);
+      expect(fixedLayer.elements_).to.have.length(5);
+      expect(element6.style.top).to.equal('');
+    });
 
-        const fe = fixedLayer.elements_[4];
-        fixedLayer.mutateElement_(fe, 1, {
-          sticky: true,
-          top: '17px',
-        });
+    it('should reset sticky top upon being removed from fixedlayer', () => {
+      expect(fixedLayer.elements_).to.have.length(5);
 
-        expect(fe.stickyNow).to.be.true;
-        expect(fe.element.style.top).to.equal('calc(17px + 11px)');
-
-        // Remove.
-        fixedLayer.vsync_ = {
-          mutate(callback) {
-            callback();
-          },
-        };
-        fixedLayer.removeElement(element5);
-        expect(fixedLayer.elements_).to.have.length(4);
-        expect(element5.style.top).to.equal('');
+      const fe = fixedLayer.elements_[4];
+      fixedLayer.mutateElement_(fe, 1, {
+        sticky: true,
+        top: '17px',
       });
 
-      it('should transform fixed elements with anchored top', () => {
-        const fe = fixedLayer.elements_[0];
-        fixedLayer.mutateElement_(fe, 1, {
-          fixed: true,
-          top: '17px',
-        });
-        expect(fe.fixedNow).to.be.true;
-        expect(fe.element.style.top).to.equal('calc(17px + 11px)');
+      expect(fe.stickyNow).to.be.true;
+      expect(fe.element.style.top).to.equal('calc(17px + 11px)');
 
-        fixedLayer.transformMutate('translateY(-10px)');
-        expect(fe.element.style.transform).to.equal('translateY(-10px)');
-        expect(fe.element.style.transition).to.equal('none');
+      // Remove.
+      fixedLayer.vsync_ = {
+        mutate(callback) {
+          callback();
+        },
+      };
+      fixedLayer.removeElement(element5);
+      expect(fixedLayer.elements_).to.have.length(4);
+      expect(element5.style.top).to.equal('');
+    });
 
-        // Reset back.
-        fixedLayer.transformMutate(null);
-        expect(fe.element.style.transform).to.equal('');
-        expect(fe.element.style.transition).to.equal('');
+    it('should transform fixed elements with anchored top', () => {
+      const fe = fixedLayer.elements_[0];
+      fixedLayer.mutateElement_(fe, 1, {
+        fixed: true,
+        top: '17px',
       });
+      expect(fe.fixedNow).to.be.true;
+      expect(fe.element.style.top).to.equal('calc(17px + 11px)');
 
-      it('should NOT transform sticky elements with anchored top', () => {
-        const fe = fixedLayer.elements_[4];
-        fixedLayer.mutateElement_(fe, 1, {
-          sticky: true,
-          top: '17px',
-        });
-        expect(fe.stickyNow).to.be.true;
-        expect(fe.element.style.top).to.equal('calc(17px + 11px)');
+      fixedLayer.transformMutate('translateY(-10px)');
+      expect(fe.element.style.transform).to.equal('translateY(-10px)');
+      expect(fe.element.style.transition).to.equal('none');
 
-        fixedLayer.transformMutate('translateY(-10px)');
-        expect(fe.element.style.transform).to.be.undefined;
-        expect(fe.element.style.transition).to.equal('');
+      // Reset back.
+      fixedLayer.transformMutate(null);
+      expect(fe.element.style.transform).to.equal('');
+      expect(fe.element.style.transition).to.equal('');
+    });
 
-        // Reset back.
-        fixedLayer.transformMutate(null);
-        expect(fe.element.style.transform).to.be.undefined;
-        expect(fe.element.style.transition).to.equal('');
+    it('should NOT transform sticky elements with anchored top', () => {
+      const fe = fixedLayer.elements_[4];
+      fixedLayer.mutateElement_(fe, 1, {
+        sticky: true,
+        top: '17px',
       });
+      expect(fe.stickyNow).to.be.true;
+      expect(fe.element.style.top).to.equal('calc(17px + 11px)');
 
-      it('should compound transform with anchored top', () => {
-        const fe = fixedLayer.elements_[0];
-        fixedLayer.mutateElement_(fe, 1, {
-          fixed: true,
-          top: '17px',
-          transform: 'scale(2)',
-        });
+      fixedLayer.transformMutate('translateY(-10px)');
+      expect(fe.element.style.transform).to.be.undefined;
+      expect(fe.element.style.transition).to.equal('');
 
-        fixedLayer.transformMutate('translateY(-10px)');
-        expect(fe.element.style.transform).to.equal(
-          'scale(2) translateY(-10px)'
-        );
+      // Reset back.
+      fixedLayer.transformMutate(null);
+      expect(fe.element.style.transform).to.be.undefined;
+      expect(fe.element.style.transition).to.equal('');
+    });
+
+    it('should compound transform with anchored top', () => {
+      const fe = fixedLayer.elements_[0];
+      fixedLayer.mutateElement_(fe, 1, {
+        fixed: true,
+        top: '17px',
+        transform: 'scale(2)',
       });
 
-      it('should NOT transform fixed elements w/o anchored top', () => {
-        const fe = fixedLayer.elements_[0];
-        fe.element.style.transform = '';
-        fixedLayer.mutateElement_(fe, 1, {
-          fixed: true,
-          top: '',
-        });
-        expect(fe.fixedNow).to.be.true;
+      fixedLayer.transformMutate('translateY(-10px)');
+      expect(fe.element.style.transform).to.equal('scale(2) translateY(-10px)');
+    });
 
-        fixedLayer.transformMutate('translateY(-10px)');
-        expect(fe.element.style.transform).to.equal('');
+    it('should NOT transform fixed elements w/o anchored top', () => {
+      const fe = fixedLayer.elements_[0];
+      fe.element.style.transform = '';
+      fixedLayer.mutateElement_(fe, 1, {
+        fixed: true,
+        top: '',
       });
+      expect(fe.fixedNow).to.be.true;
 
-      it('should user error when inline styles may be overriden', () => {
-        // Set both attribute and property since element1 is a fake element.
-        element1.setAttribute('style', 'bottom: 10px');
-        element1.style.bottom = '10px';
-
-        const userError = env.sandbox.stub(user(), 'error');
-        fixedLayer.setup();
-        // Expect error regarding inline styles.
-        expect(userError).calledWithMatch(
-          'FixedLayer',
-          /not supported yet for fixed or sticky elements/
-        );
+      fixedLayer.transformMutate('translateY(-10px)');
+      expect(fe.element.style.transform).to.equal('');
+    });
+
+    it('should user error when inline styles may be overriden', () => {
+      // Set both attribute and property since element1 is a fake element.
+      element1.setAttribute('style', 'bottom: 10px');
+      element1.style.bottom = '10px';
+
+      const userError = env.sandbox.stub(user(), 'error');
+      fixedLayer.setup();
+      // Expect error regarding inline styles.
+      expect(userError).calledWithMatch(
+        'FixedLayer',
+        /not supported yet for fixed or sticky elements/
+      );
+    });
+
+    describe('hidden toggle', () => {
+      let mutationObserver;
+      beforeEach(() => {
+        fixedLayer.observeHiddenMutations();
+        mutationObserver = Services.hiddenObserverForDoc(
+          documentApi.documentElement
+        ).mutationObserver_;
       });
 
-      describe('hidden toggle', () => {
-        let mutationObserver;
-        beforeEach(() => {
-          fixedLayer.observeHiddenMutations();
-          mutationObserver = Services.hiddenObserverForDoc(
-            documentApi.documentElement
-          ).mutationObserver_;
-        });
+      it('should trigger an update', () => {
+        element1.computedStyle['position'] = 'fixed';
+        element1.offsetWidth = 10;
+        element1.offsetHeight = 10;
+        element1.computedStyle['display'] = 'none';
 
-        it('should trigger an update', () => {
-          element1.computedStyle['position'] = 'fixed';
-          element1.offsetWidth = 10;
-          element1.offsetHeight = 10;
-          element1.computedStyle['display'] = 'none';
+        expect(vsyncTasks).to.have.length(1);
+        const state = {};
+        vsyncTasks[0].measure(state);
 
-          expect(vsyncTasks).to.have.length(1);
-          const state = {};
-          vsyncTasks[0].measure(state);
+        expect(state['F0'].fixed).to.be.false;
 
-          expect(state['F0'].fixed).to.be.false;
+        element1.computedStyle['display'] = '';
 
-          element1.computedStyle['display'] = '';
+        env.sandbox.stub(timer, 'delay').callsFake((callback) => {
+          callback();
+        });
+        return mutationObserver
+          .__mutate({
+            attributeName: 'hidden',
+          })
+          .then(() => {
+            expect(vsyncTasks).to.have.length(2);
+            const state = {};
+            vsyncTasks[0].measure(state);
 
-          env.sandbox.stub(timer, 'delay').callsFake((callback) => {
-            callback();
+            expect(state['F0'].fixed).to.be.true;
+            expect(state['F0'].top).to.equal('');
+            expect(state['F0'].zIndex).to.equal('');
           });
-          return mutationObserver
-            .__mutate({
-              attributeName: 'hidden',
-            })
-            .then(() => {
-              expect(vsyncTasks).to.have.length(2);
-              const state = {};
-              vsyncTasks[0].measure(state);
-
-              expect(state['F0'].fixed).to.be.true;
-              expect(state['F0'].top).to.equal('');
-              expect(state['F0'].zIndex).to.equal('');
-            });
-        });
       });
+    });
 
-      it('should ignore descendants of already-tracked elements', () => {
-        const updateStub = env.sandbox.stub(fixedLayer, 'update');
-        expect(fixedLayer.elements_).to.have.length(5);
-
-        element1.appendChild(element6);
+    it('should ignore descendants of already-tracked elements', () => {
+      const updateStub = env.sandbox.stub(fixedLayer, 'update');
+      expect(fixedLayer.elements_).to.have.length(5);
 
-        // Add.
-        fixedLayer.addElement(element6);
-        expect(updateStub).not.to.have.been.called;
-        expect(fixedLayer.elements_).to.have.length(5);
-      });
+      element1.appendChild(element6);
 
-      it('should replace descendants of tracked elements', () => {
-        const updateStub = env.sandbox.stub(fixedLayer, 'update');
-        expect(fixedLayer.elements_).to.have.length(5);
+      // Add.
+      fixedLayer.addElement(element6);
+      expect(updateStub).not.to.have.been.called;
+      expect(fixedLayer.elements_).to.have.length(5);
+    });
 
-        element6.appendChild(element1);
+    it('should replace descendants of tracked elements', () => {
+      const updateStub = env.sandbox.stub(fixedLayer, 'update');
+      expect(fixedLayer.elements_).to.have.length(5);
 
-        // Add.
-        fixedLayer.addElement(element6);
-        expect(updateStub).to.be.calledOnce;
-        expect(fixedLayer.elements_).to.have.length(5);
+      element6.appendChild(element1);
 
-        const fe = fixedLayer.elements_[4];
-        expect(fe.id).to.equal('F5');
-        expect(fe.element).to.equal(element6);
-        expect(fe.selectors).to.deep.equal(['*']);
-        expect(fe.forceTransfer).to.be.undefined;
-      });
+      // Add.
+      fixedLayer.addElement(element6);
+      expect(updateStub).to.be.calledOnce;
+      expect(fixedLayer.elements_).to.have.length(5);
+
+      const fe = fixedLayer.elements_[4];
+      expect(fe.id).to.equal('F5');
+      expect(fe.element).to.equal(element6);
+      expect(fe.selectors).to.deep.equal(['*']);
+      expect(fe.forceTransfer).to.be.undefined;
     });
+  });
 
   describe('with-transfer', () => {
     let fixedLayer;
@@ -1461,11 +1423,11 @@ describes.sandboxed('FixedLayer', {}, (env) => {
 
       expect(fixedLayer.transferLayer_).to.exist;
       const layer = fixedLayer.transferLayer_.layer_;
-      expect(layer.style['pointerEvents']).to.equal('none');
+      expect(layer.style.pointerEvents).to.equal('none');
 
       expect(fe.element.parentElement).to.equal(layer);
-      expect(fe.element.style['pointer-events']).to.equal('initial');
-      expect(fe.element.style['zIndex']).to.equal('calc(10001 + 11)');
+      expect(fe.element.style.pointerEvents).to.equal('initial');
+      expect(fe.element.style.zIndex).to.equal('calc(10001 + 11)');
     });
 
     it('should ignore transfer when non-transferrable', () => {
diff --git a/test/unit/test-font-stylesheet-timeout.js b/test/unit/test-font-stylesheet-timeout.js
index 3c5257df8f6b..eaa213b9ecba 100644
--- a/test/unit/test-font-stylesheet-timeout.js
+++ b/test/unit/test-font-stylesheet-timeout.js
@@ -6,228 +6,217 @@ describes.realWin(
     amp: true,
   },
   (env) => {
-    describe
-      .configure()
-      .skipFirefox()
-      .run('font-stylesheet-timeout', () => {
-        let clock;
-        let win;
-        let readyState;
-        let navigationStart;
+    describe('font-stylesheet-timeout', () => {
+      let clock;
+      let win;
+      let readyState;
+      let navigationStart;
 
-        const defaultTimeout =
-          /* target */ 2500 -
-          /* max paint time */ 400 -
-          /* default nav start*/ 1500;
+      const defaultTimeout =
+        /* target */ 2500 -
+        /* max paint time */ 400 -
+        /* default nav start*/ 1500;
 
-        beforeEach(() => {
-          clock = env.sandbox.useFakeTimers();
-          win = env.win;
-          win.setTimeout = self.setTimeout;
-          readyState = 'interactive';
-          navigationStart = undefined;
-          env.sandbox.defineProperty(win.document, 'readyState', {
-            get() {
-              return readyState;
-            },
-          });
-          env.sandbox.defineProperty(
-            win.performance.timing,
-            'navigationStart',
-            {
-              get() {
-                return navigationStart;
-              },
-            }
-          );
+      beforeEach(() => {
+        clock = env.sandbox.useFakeTimers();
+        win = env.win;
+        win.setTimeout = self.setTimeout;
+        readyState = 'interactive';
+        navigationStart = undefined;
+        env.sandbox.defineProperty(win.document, 'readyState', {
+          get() {
+            return readyState;
+          },
         });
+        env.sandbox.defineProperty(win.performance.timing, 'navigationStart', {
+          get() {
+            return navigationStart;
+          },
+        });
+      });
 
-        function addLink(opt_content, opt_href) {
-          const link = document.createElement('link');
-          link.href = opt_href || immediatelyLoadingHref(opt_content);
-          link.setAttribute('rel', 'stylesHEet');
-          win.document.head.appendChild(link);
-          return link;
-        }
-
-        function immediatelyLoadingHref(opt_content) {
-          return 'data:text/css;charset=utf-8,' + (opt_content || '');
-        }
-
-        // TODO(cramforce, #11827): Make this test work on Safari.
-        it.configure()
-          .skipSafari()
-          .run(
-            'should not time out for immediately loading style sheets',
-            () => {
-              const link = addLink();
-              fontStylesheetTimeout(win);
-              clock.tick(10000);
-              expect(
-                win.document.querySelectorAll('link[rel="stylesheet"]')
-              ).to.have.length(1);
-              expect(
-                win.document.querySelector('link[rel="stylesheet"]')
-              ).to.equal(link);
-              expect(
-                win.document.querySelectorAll(
-                  'link[rel="stylesheet"][i-amphtml-timeout]'
-                )
-              ).to.have.length(0);
-            }
-          );
+      function addLink(opt_content, opt_href) {
+        const link = document.createElement('link');
+        link.href = opt_href || immediatelyLoadingHref(opt_content);
+        link.setAttribute('rel', 'stylesHEet');
+        win.document.head.appendChild(link);
+        return link;
+      }
 
-        it('should time out if style sheets do not load', () => {
-          const link = addLink(undefined, '/does-not-exist.css');
-          fontStylesheetTimeout(win);
-          clock.tick(defaultTimeout - 1);
-          expect(
-            win.document.querySelectorAll(
-              'link[rel="stylesheet"][i-amphtml-timeout]'
-            )
-          ).to.have.length(0);
-          clock.tick(1);
-          expect(
-            win.document.querySelectorAll(
-              'link[rel="stylesheet"][i-amphtml-timeout]'
-            )
-          ).to.have.length(1);
-          const after = win.document.querySelector('link[rel="stylesheet"]');
-          expect(after).to.equal(link);
-          expect(after.href).to.equal(link.href);
-          expect(after.media).to.equal('print');
-          after.href = immediatelyLoadingHref('/* make-it-load */');
-          return new Promise((resolve) => {
-            after.addEventListener('load', () => {
-              resolve();
-            });
-          }).then(() => {
-            expect(after.media).to.equal('all');
-          });
-        });
+      function immediatelyLoadingHref(opt_content) {
+        return 'data:text/css;charset=utf-8,' + (opt_content || '');
+      }
 
-        it('should time out from response start', () => {
-          const startTime = 100000;
-          clock.tick(startTime);
-          navigationStart = startTime;
-          clock.tick(250);
-          const link = addLink(undefined, '/does-not-exist.css');
+      it.configure()
+        .skipFirefox()
+        .run('should not time out for immediately loading style sheets', () => {
+          const link = addLink();
           fontStylesheetTimeout(win);
-          clock.tick(2500 - 400 - 250 - 1);
-          expect(
-            win.document.querySelectorAll(
-              'link[rel="stylesheet"][i-amphtml-timeout]'
-            )
-          ).to.have.length(0);
-          clock.tick(1);
+          clock.tick(10000);
           expect(
-            win.document.querySelectorAll(
-              'link[rel="stylesheet"][i-amphtml-timeout]'
-            )
+            win.document.querySelectorAll('link[rel="stylesheet"]')
           ).to.have.length(1);
           expect(win.document.querySelector('link[rel="stylesheet"]')).to.equal(
             link
           );
-          expect(
-            win.document.querySelector('link[rel="stylesheet"]').href
-          ).to.equal(link.href);
-        });
-
-        it('should time out multiple style sheets and ignore CDN URLs', () => {
-          navigationStart = 500;
-          clock.tick(10000);
-          const link0 = addLink(undefined, '/does-not-exist.css');
-          const link1 = addLink(undefined, '/does-not-exist.css');
-          const cdnLink = addLink(
-            undefined,
-            'https://cdn.ampproject.org/does-not-exist.css'
-          );
-          fontStylesheetTimeout(win);
           expect(
             win.document.querySelectorAll(
               'link[rel="stylesheet"][i-amphtml-timeout]'
             )
           ).to.have.length(0);
-          clock.tick(1);
-          expect(
-            win.document.querySelectorAll(
-              'link[rel="stylesheet"][i-amphtml-timeout]'
-            )
-          ).to.have.length(2);
-          expect(
-            win.document.querySelectorAll(
-              'link[rel="stylesheet"][i-amphtml-timeout]'
-            )[0]
-          ).to.equal(link0);
-          expect(
-            win.document.querySelectorAll(
-              'link[rel="stylesheet"][i-amphtml-timeout]'
-            )[1]
-          ).to.equal(link1);
-          expect(
-            win.document.querySelectorAll('link[rel="stylesheet"]')[2]
-          ).to.equal(cdnLink);
         });
 
-        describe('font-display: swap', () => {
-          let fonts;
-          beforeEach(() => {
-            fonts = [
-              {
-                status: 'loaded',
-                display: 'auto',
-              },
-              {
-                status: 'loading',
-                display: 'auto',
-              },
-              {
-                status: 'loading',
-                display: 'auto',
-              },
-              {
-                status: 'loading',
-                display: 'optional',
-              },
-              null,
-            ];
-            let index = 0;
-            env.sandbox.defineProperty(win.document, 'fonts', {
-              get: () => {
-                return {
-                  values: () => {
-                    return {
-                      next: () => {
-                        return {value: fonts[index++]};
-                      },
-                    };
-                  },
-                };
-              },
-            });
+      it('should time out if style sheets do not load', () => {
+        const link = addLink(undefined, '/does-not-exist.css');
+        fontStylesheetTimeout(win);
+        clock.tick(defaultTimeout - 1);
+        expect(
+          win.document.querySelectorAll(
+            'link[rel="stylesheet"][i-amphtml-timeout]'
+          )
+        ).to.have.length(0);
+        clock.tick(1);
+        expect(
+          win.document.querySelectorAll(
+            'link[rel="stylesheet"][i-amphtml-timeout]'
+          )
+        ).to.have.length(1);
+        const after = win.document.querySelector('link[rel="stylesheet"]');
+        expect(after).to.equal(link);
+        expect(after.href).to.equal(link.href);
+        expect(after.media).to.equal('print');
+        after.href = immediatelyLoadingHref('/* make-it-load */');
+        return new Promise((resolve) => {
+          after.addEventListener('load', () => {
+            resolve();
           });
+        }).then(() => {
+          expect(after.media).to.equal('all');
+        });
+      });
 
-          it('should not change loaded fonts', () => {
-            fontStylesheetTimeout(win);
-            clock.tick(250);
-            expect(fonts[0].display).to.equal('auto');
-          });
+      it('should time out from response start', () => {
+        const startTime = 100000;
+        clock.tick(startTime);
+        navigationStart = startTime;
+        clock.tick(250);
+        const link = addLink(undefined, '/does-not-exist.css');
+        fontStylesheetTimeout(win);
+        clock.tick(2500 - 400 - 250 - 1);
+        expect(
+          win.document.querySelectorAll(
+            'link[rel="stylesheet"][i-amphtml-timeout]'
+          )
+        ).to.have.length(0);
+        clock.tick(1);
+        expect(
+          win.document.querySelectorAll(
+            'link[rel="stylesheet"][i-amphtml-timeout]'
+          )
+        ).to.have.length(1);
+        expect(win.document.querySelector('link[rel="stylesheet"]')).to.equal(
+          link
+        );
+        expect(
+          win.document.querySelector('link[rel="stylesheet"]').href
+        ).to.equal(link.href);
+      });
 
-          it('should change loading fonts to swap', () => {
-            fontStylesheetTimeout(win);
-            expect(fonts[1].display).to.equal('auto');
-            expect(fonts[2].display).to.equal('auto');
-            clock.tick(defaultTimeout);
-            expect(fonts[1].display).to.equal('swap');
-            expect(fonts[2].display).to.equal('swap');
-          });
+      it('should time out multiple style sheets and ignore CDN URLs', () => {
+        navigationStart = 500;
+        clock.tick(10000);
+        const link0 = addLink(undefined, '/does-not-exist.css');
+        const link1 = addLink(undefined, '/does-not-exist.css');
+        const cdnLink = addLink(
+          undefined,
+          'https://cdn.ampproject.org/does-not-exist.css'
+        );
+        fontStylesheetTimeout(win);
+        expect(
+          win.document.querySelectorAll(
+            'link[rel="stylesheet"][i-amphtml-timeout]'
+          )
+        ).to.have.length(0);
+        clock.tick(1);
+        expect(
+          win.document.querySelectorAll(
+            'link[rel="stylesheet"][i-amphtml-timeout]'
+          )
+        ).to.have.length(2);
+        expect(
+          win.document.querySelectorAll(
+            'link[rel="stylesheet"][i-amphtml-timeout]'
+          )[0]
+        ).to.equal(link0);
+        expect(
+          win.document.querySelectorAll(
+            'link[rel="stylesheet"][i-amphtml-timeout]'
+          )[1]
+        ).to.equal(link1);
+        expect(
+          win.document.querySelectorAll('link[rel="stylesheet"]')[2]
+        ).to.equal(cdnLink);
+      });
 
-          it('should not override non-default values', () => {
-            fontStylesheetTimeout(win);
-            clock.tick(defaultTimeout);
-            expect(fonts[3].display).to.equal('optional');
+      describe('font-display: swap', () => {
+        let fonts;
+        beforeEach(() => {
+          fonts = [
+            {
+              status: 'loaded',
+              display: 'auto',
+            },
+            {
+              status: 'loading',
+              display: 'auto',
+            },
+            {
+              status: 'loading',
+              display: 'auto',
+            },
+            {
+              status: 'loading',
+              display: 'optional',
+            },
+            null,
+          ];
+          let index = 0;
+          env.sandbox.defineProperty(win.document, 'fonts', {
+            get: () => {
+              return {
+                values: () => {
+                  return {
+                    next: () => {
+                      return {value: fonts[index++]};
+                    },
+                  };
+                },
+              };
+            },
           });
         });
+
+        it('should not change loaded fonts', () => {
+          fontStylesheetTimeout(win);
+          clock.tick(250);
+          expect(fonts[0].display).to.equal('auto');
+        });
+
+        it('should change loading fonts to swap', () => {
+          fontStylesheetTimeout(win);
+          expect(fonts[1].display).to.equal('auto');
+          expect(fonts[2].display).to.equal('auto');
+          clock.tick(defaultTimeout);
+          expect(fonts[1].display).to.equal('swap');
+          expect(fonts[2].display).to.equal('swap');
+        });
+
+        it('should not override non-default values', () => {
+          fontStylesheetTimeout(win);
+          clock.tick(defaultTimeout);
+          expect(fonts[3].display).to.equal('optional');
+        });
       });
+    });
   }
 );
diff --git a/test/unit/test-friendly-iframe-embed.js b/test/unit/test-friendly-iframe-embed.js
index 18bcc9fbbb36..aa4e362a6a04 100644
--- a/test/unit/test-friendly-iframe-embed.js
+++ b/test/unit/test-friendly-iframe-embed.js
@@ -973,7 +973,7 @@ describes.realWin('friendly-iframe-embed', {amp: true}, (env) => {
         tagName: 'IFRAME',
         nodeType: 1,
         ownerDocument: {defaultView: win},
-        style: {},
+        style: {setProperty: () => {}},
         setAttribute: () => {},
         addEventListener: (eventType, listener) => {
           if (eventType == 'load') {
@@ -985,7 +985,7 @@ describes.realWin('friendly-iframe-embed', {amp: true}, (env) => {
       contentWindow = new FakeWindow();
       contentDocument = contentWindow.document;
       contentWindow.frameElement = iframe;
-      contentBody = {nodeType: 1, style: {}};
+      contentBody = {nodeType: 1, style: {setProperty: () => {}}};
       container = {
         appendChild: () => {},
       };
diff --git a/test/unit/test-gesture.js b/test/unit/test-gesture.js
index c694b03db4a8..0f9ec0c3a746 100644
--- a/test/unit/test-gesture.js
+++ b/test/unit/test-gesture.js
@@ -1,3 +1,5 @@
+import {resetPassiveSupportedForTesting} from '#core/dom/event-helper-listen';
+
 import {GestureRecognizer, Gestures} from '../../src/gesture';
 
 describes.sandboxed('Gestures', {}, (env) => {
@@ -13,6 +15,16 @@ describes.sandboxed('Gestures', {}, (env) => {
     }
   }
 
+  function setPassiveSupported(passiveSupported) {
+    resetPassiveSupportedForTesting();
+    env.sandbox
+      .stub(window, 'addEventListener')
+      .callsFake((name, listener, option) => {
+        passiveSupported ? option.passive : false;
+      });
+    env.sandbox.stub(window, 'removeEventListener');
+  }
+
   let element;
   let clock;
   let recognizer;
@@ -23,6 +35,7 @@ describes.sandboxed('Gestures', {}, (env) => {
 
   beforeEach(() => {
     clock = env.sandbox.useFakeTimers();
+    setPassiveSupported(false); // so we can test preventDefault()
 
     eventListeners = {};
     element = {
diff --git a/test/unit/test-iframe-helper.js b/test/unit/test-iframe-helper.js
index 0fe0aa2fcca0..2c068e9e9baa 100644
--- a/test/unit/test-iframe-helper.js
+++ b/test/unit/test-iframe-helper.js
@@ -160,8 +160,6 @@ describes.sandboxed
       });
     });
 
-    // TODO(cvializ, #3314): Figure out why this fails. Probably have to do with
-    // removing the iframes in init-tests.
     it.skip('should un-listen on next message when iframe is unattached', () => {
       let calls = 0;
       let otherCalls = 0;
@@ -192,8 +190,7 @@ describes.sandboxed
       });
     });
 
-    // TODO(wg-components, #32103): This fails regularly during CI
-    it.skip('should set sentinel on postMessage data', () => {
+    it('should set sentinel on postMessage data', () => {
       insert(testIframe);
       const postMessageSpy = env.sandbox /*OK*/
         .spy(testIframe.contentWindow, 'postMessage');
diff --git a/test/unit/test-iframe-stub.js b/test/unit/test-iframe-stub.js
index 3fc097e9afdf..66da4e941c41 100644
--- a/test/unit/test-iframe-stub.js
+++ b/test/unit/test-iframe-stub.js
@@ -1,89 +1,85 @@
+import {Deferred} from '#core/data-structures/promise';
+
 import {createIframeWithMessageStub, expectPostMessage} from '#testing/iframe';
 
-describes.sandboxed
-  .configure()
-  .skipFirefox()
-  .run('test-iframe-createIframeWithMessageStub', {}, () => {
-    const data1 = {
-      foo: 'bar',
-      test: true,
-      type: 'test',
-    };
+describes.sandboxed('test-iframe-createIframeWithMessageStub', {}, () => {
+  const data1 = {
+    foo: 'bar',
+    test: true,
+    type: 'test',
+  };
 
-    const data2 = {
-      num: 5,
-    };
+  const data2 = {
+    num: 5,
+  };
 
-    let iframe;
+  let iframe;
 
-    beforeEach((done) => {
-      iframe = createIframeWithMessageStub(window);
-      document.body.appendChild(iframe);
-      iframe.onload = () => {
-        done();
-      };
-    });
+  beforeEach(async () => {
+    iframe = createIframeWithMessageStub(window);
+    document.body.appendChild(iframe);
+    const {promise, resolve} = new Deferred();
+    iframe.onload = resolve;
+    await promise;
+  });
 
-    it('should get message from fragment and post back to parent window', () => {
-      iframe.postMessageToParent(data1);
-      return expectPostMessage(iframe.contentWindow, window, data1)
-        .then((receivedMessage) => {
-          expect(receivedMessage).to.jsonEqual(data1);
-        })
-        .then(() => {
-          iframe.postMessageToParent(data2);
-          return expectPostMessage(iframe.contentWindow, window, data2);
-        })
-        .then((receivedMessage) => {
-          expect(receivedMessage).to.jsonEqual(data2);
-        });
-    });
+  it('should get message from fragment and post back to parent window', () => {
+    iframe.postMessageToParent(data1);
+    return expectPostMessage(iframe.contentWindow, window, data1)
+      .then((receivedMessage) => {
+        expect(receivedMessage).to.jsonEqual(data1);
+      })
+      .then(() => {
+        iframe.postMessageToParent(data2);
+        return expectPostMessage(iframe.contentWindow, window, data2);
+      })
+      .then((receivedMessage) => {
+        expect(receivedMessage).to.jsonEqual(data2);
+      });
+  });
 
-    it('should echo back message to parent window', () => {
-      iframe.contentWindow.postMessage(data1, '*');
-      return iframe
-        .expectMessageFromParent('test')
-        .then(() => {
-          iframe.contentWindow.postMessage(data2, '*');
-          return iframe.expectMessageFromParent((data, msg) => {
-            expect(data).to.jsonEqual(data2);
-            expect(msg).to.jsonEqual(data2);
-            return true;
-          });
-        })
-        .then(() => {
-          iframe.contentWindow.postMessage(
-            'test-' + JSON.stringify(data2),
-            '*'
-          );
-          return iframe.expectMessageFromParent((data, msg) => {
-            expect(data).to.equal(null);
-            expect(msg).to.equal('test-' + JSON.stringify(data2));
-            return true;
-          });
-        })
-        .then(() => {
-          iframe.contentWindow.postMessage('amp-' + JSON.stringify(data2), '*');
-          return iframe.expectMessageFromParent((data, msg) => {
-            expect(data).to.jsonEqual(data2);
-            expect(msg).to.equal('amp-' + JSON.stringify(data2));
-            return true;
-          });
-        })
-        .then(() => {
-          iframe.contentWindow.postMessage(data2, '*');
-          return iframe
-            .expectMessageFromParent(() => {
-              throw new Error('test');
-            })
-            .then(
-              () => {
-                throw new Error('should not get here');
-              },
-              () => {
-                expect(true).to.equal(true);
-              }
-            );
+  it('should echo back message to parent window', () => {
+    iframe.contentWindow.postMessage(data1, '*');
+    return iframe
+      .expectMessageFromParent('test')
+      .then(() => {
+        iframe.contentWindow.postMessage(data2, '*');
+        return iframe.expectMessageFromParent((data, msg) => {
+          expect(data).to.jsonEqual(data2);
+          expect(msg).to.jsonEqual(data2);
+          return true;
+        });
+      })
+      .then(() => {
+        iframe.contentWindow.postMessage('test-' + JSON.stringify(data2), '*');
+        return iframe.expectMessageFromParent((data, msg) => {
+          expect(data).to.equal(null);
+          expect(msg).to.equal('test-' + JSON.stringify(data2));
+          return true;
         });
-    });
+      })
+      .then(() => {
+        iframe.contentWindow.postMessage('amp-' + JSON.stringify(data2), '*');
+        return iframe.expectMessageFromParent((data, msg) => {
+          expect(data).to.jsonEqual(data2);
+          expect(msg).to.equal('amp-' + JSON.stringify(data2));
+          return true;
+        });
+      })
+      .then(() => {
+        iframe.contentWindow.postMessage(data2, '*');
+        return iframe
+          .expectMessageFromParent(() => {
+            throw new Error('test');
+          })
+          .then(
+            () => {
+              throw new Error('should not get here');
+            },
+            () => {
+              expect(true).to.equal(true);
+            }
+          );
+      });
   });
+});
diff --git a/test/unit/test-localization.js b/test/unit/test-localization.js
index 161a0309ba1b..3c587537ce00 100644
--- a/test/unit/test-localization.js
+++ b/test/unit/test-localization.js
@@ -1,13 +1,22 @@
+import {createElementWithAttributes} from '#core/dom';
+
 import {Services} from '#service';
 import {
   LocalizationService,
   getLanguageCodesFromString,
 } from '#service/localization';
 import {
-  LocalizedStringId,
+  LocalizedStringId_Enum,
   createPseudoLocale,
 } from '#service/localization/strings';
 
+import {waitFor} from '#testing/helpers/service';
+
+import {
+  getLocalizationService,
+  localizeTemplate,
+} from 'extensions/amp-story/1.0/amp-story-localization-service';
+
 describes.fakeWin('localization', {amp: true}, (env) => {
   let win;
 
@@ -19,11 +28,11 @@ describes.fakeWin('localization', {amp: true}, (env) => {
     it('should have unique values', () => {
       // Transform string IDs from a map of keys to values to a multimap of
       // values to a list of keys that have that value.
-      const localizedStringIdKeys = Object.keys(LocalizedStringId);
+      const localizedStringIdKeys = Object.keys(LocalizedStringId_Enum);
       const valuesToKeys = localizedStringIdKeys.reduce(
         (freq, LocalizedStringIdKey) => {
           const LocalizedStringIdValue =
-            LocalizedStringId[LocalizedStringIdKey];
+            LocalizedStringId_Enum[LocalizedStringIdKey];
           if (!freq[LocalizedStringIdValue]) {
             freq[LocalizedStringIdValue] = [];
           }
@@ -50,14 +59,16 @@ describes.fakeWin('localization', {amp: true}, (env) => {
     });
   });
 
-  describe('localization service', () => {
+  describe('localization service synchronous', () => {
     it('should get string text', () => {
       const localizationService = new LocalizationService(win.document.body);
-      localizationService.registerLocalizedStringBundle('en', {
-        'test_string_id': {
-          string: 'test string content',
+      localizationService.registerLocalizedStringBundles({
+        'en': {
+          'test_string_id': {
+            string: 'test string content',
+          },
+          'test_string_unwrapped': 'test string in unwrapped format',
         },
-        'test_string_unwrapped': 'test string in unwrapped format',
       });
 
       expect(localizationService.getLocalizedString('test_string_id')).to.equal(
@@ -71,11 +82,13 @@ describes.fakeWin('localization', {amp: true}, (env) => {
     it('should handle registration of uppercase locales', () => {
       env.win.document.documentElement.setAttribute('lang', 'zh-CN');
       const localizationService = new LocalizationService(win.document.body);
-      localizationService.registerLocalizedStringBundle('zh-CN', {
-        '123': {
-          string: '买票',
+      localizationService.registerLocalizedStringBundles({
+        'zh-CN': {
+          '123': {
+            string: '买票',
+          },
+          'test_string_unwrapped': 'test string in unwrapped format',
         },
-        'test_string_unwrapped': 'test string in unwrapped format',
       });
 
       expect(localizationService.getLocalizedString('123')).to.equal('买票');
@@ -133,6 +146,196 @@ describes.fakeWin('localization', {amp: true}, (env) => {
       );
     });
   });
+
+  describe('localize element async', () => {
+    beforeEach(() => {
+      env.sandbox
+        .stub(Services, 'vsyncFor')
+        .callsFake(() => ({mutatePromise: (task) => task()}));
+    });
+    it('should set the text content if the bundle is installed for the default language', async () => {
+      const localizationService = getLocalizationService(win.document.body);
+      localizationService.registerLocalizedStringBundles({
+        'en': {
+          'test_string_id': {
+            string: 'test string content',
+          },
+        },
+      });
+
+      const element = win.document.createElement('div');
+      element.appendChild(
+        createElementWithAttributes(win.document, 'div', {
+          'i-amphtml-i18n-text-content': 'test_string_id',
+        })
+      );
+
+      win.document.body.appendChild(element);
+
+      await localizeTemplate(element, win.document.body);
+
+      expect(element.textContent).to.equal('test string content');
+    });
+
+    it('should set the text content if the bundle is installed for the element language', async () => {
+      const element = env.win.document.createElement('div');
+      win.document.body.parentElement.setAttribute('lang', 'es');
+      element.appendChild(
+        createElementWithAttributes(win.document, 'div', {
+          'i-amphtml-i18n-text-content': 'test_string_id',
+        })
+      );
+
+      const localizationService = getLocalizationService(win.document.body);
+      localizationService.registerLocalizedStringBundles({
+        'es': {
+          'test_string_id': {
+            string: 'contenido de prueba',
+          },
+        },
+      });
+
+      await localizeTemplate(element, win.document.body);
+
+      expect(element.textContent).to.equal('contenido de prueba');
+    });
+
+    it('should set the text content if bundles are installed for fallback language', async () => {
+      const element = env.win.document.createElement('div');
+      win.document.body.parentElement.setAttribute('lang', 'es-419');
+      element.appendChild(
+        createElementWithAttributes(win.document, 'div', {
+          'i-amphtml-i18n-text-content': 'test_string_id',
+        })
+      );
+
+      const localizationService = getLocalizationService(win.document.body);
+      localizationService.registerLocalizedStringBundles({
+        'es': {
+          'test_string_id': {
+            string: 'contenido de prueba',
+          },
+        },
+      });
+
+      await localizeTemplate(element, win.document.body);
+
+      expect(element.textContent).to.equal('contenido de prueba');
+    });
+
+    it('should set the aria-label if the attribute is provided', async () => {
+      const localizationService = getLocalizationService(win.document.body);
+      const element = env.win.document.createElement('div');
+      win.document.body.parentElement.setAttribute('lang', 'es');
+      const localizedEl = createElementWithAttributes(win.document, 'div', {
+        'i-amphtml-i18n-aria-label': 'test_string_id',
+      });
+      element.appendChild(localizedEl);
+
+      localizationService.registerLocalizedStringBundles({
+        'es': {
+          'test_string_id': {
+            string: 'contenido de prueba',
+          },
+        },
+      });
+
+      await localizeTemplate(element, win.document.body);
+
+      expect(localizedEl.getAttribute('aria-label')).to.equal(
+        'contenido de prueba'
+      );
+    });
+
+    it('should set the text content if the bundle is installed after localizing', async () => {
+      const element = env.win.document.createElement('div');
+      win.document.body.parentElement.setAttribute('lang', 'es');
+      element.appendChild(
+        createElementWithAttributes(win.document, 'div', {
+          'i-amphtml-i18n-text-content': 'test_string_id',
+        })
+      );
+
+      const localizationService = getLocalizationService(win.document.body);
+
+      localizeTemplate(element, win.document.body);
+
+      localizationService.registerLocalizedStringBundles({
+        'es': {
+          'test_string_id': {
+            string: 'contenido de prueba',
+          },
+        },
+      });
+
+      await waitFor(() => element.textContent);
+
+      expect(element.textContent).to.equal('contenido de prueba');
+    });
+
+    it('should use the more specific language registered', async () => {
+      const element = env.win.document.createElement('div');
+      win.document.body.parentElement.setAttribute('lang', 'es');
+      const localizedEl = createElementWithAttributes(win.document, 'div', {
+        'i-amphtml-i18n-aria-label': 'test_string_id',
+      });
+      element.appendChild(localizedEl);
+      win.document.body.appendChild(element);
+
+      const localizationService = getLocalizationService(win.document.body);
+      localizationService.registerLocalizedStringBundles({
+        'default': {
+          'test_string_id': {
+            string: 'test string content',
+          },
+        },
+        'es': {
+          'test_string_id': {
+            string: 'contenido de prueba',
+          },
+        },
+      });
+
+      await localizeTemplate(element, win.document.body);
+
+      expect(localizedEl.getAttribute('aria-label')).to.equal(
+        'contenido de prueba'
+      );
+    });
+
+    it('should not update twice the element when a more specific language is registered later', async () => {
+      const element = env.win.document.createElement('div');
+      win.document.body.setAttribute('lang', 'es');
+      const localizedEl = createElementWithAttributes(win.document, 'div', {
+        'i-amphtml-i18n-aria-label': 'test_string_id',
+      });
+      element.appendChild(localizedEl);
+
+      const localizationService = getLocalizationService(win.document.body);
+      localizationService.registerLocalizedStringBundles({
+        'default': {
+          'test_string_id': {
+            string: 'test string content',
+          },
+        },
+      });
+
+      await localizeTemplate(element, win.document.body);
+
+      localizationService.registerLocalizedStringBundles({
+        'es': {
+          'test_string_id': {
+            string: 'contenido de prueba',
+          },
+        },
+      });
+
+      // Should not localize it in spanish because it was already localized in english.
+      expect(localizedEl.getAttribute('aria-label')).to.equal(
+        'test string content'
+      );
+    });
+  });
 });
 
 describes.fakeWin('viewer localization', {amp: true}, (env) => {
@@ -148,14 +351,16 @@ describes.fakeWin('viewer localization', {amp: true}, (env) => {
 
     it('should take precedence over document language', () => {
       const localizationService = new LocalizationService(win.document.body);
-      localizationService.registerLocalizedStringBundle('fr', {
-        'test_string_id': {
-          string: 'oui',
+      localizationService.registerLocalizedStringBundles({
+        'fr': {
+          'test_string_id': {
+            string: 'oui',
+          },
         },
-      });
-      localizationService.registerLocalizedStringBundle('en', {
-        'test_string_id': {
-          string: 'yes',
+        'en': {
+          'test_string_id': {
+            string: 'yes',
+          },
         },
       });
 
@@ -166,14 +371,16 @@ describes.fakeWin('viewer localization', {amp: true}, (env) => {
 
     it('should fall back if string is not found', () => {
       const localizationService = new LocalizationService(win.document.body);
-      localizationService.registerLocalizedStringBundle('fr', {
-        'incorrect_test_string_id': {
-          string: 'non',
+      localizationService.registerLocalizedStringBundles({
+        'fr': {
+          'incorrect_test_string_id': {
+            string: 'non',
+          },
         },
-      });
-      localizationService.registerLocalizedStringBundle('en', {
-        'correct_test_string_id': {
-          string: 'yes',
+        'en': {
+          'correct_test_string_id': {
+            string: 'yes',
+          },
         },
       });
 
@@ -184,9 +391,11 @@ describes.fakeWin('viewer localization', {amp: true}, (env) => {
 
     it('should fall back if language code is not registered', () => {
       const localizationService = new LocalizationService(win.document.body);
-      localizationService.registerLocalizedStringBundle('en', {
-        'test_string_id': {
-          string: 'yes',
+      localizationService.registerLocalizedStringBundles({
+        'en': {
+          'test_string_id': {
+            string: 'yes',
+          },
         },
       });
 
diff --git a/test/unit/test-mutator.js b/test/unit/test-mutator.js
index 4d6934b8bd9a..a0ff9d1754ed 100644
--- a/test/unit/test-mutator.js
+++ b/test/unit/test-mutator.js
@@ -1,13 +1,13 @@
 import * as fakeTimers from '@sinonjs/fake-timers';
 
-import {VisibilityState} from '#core/constants/visibility-state';
+import {VisibilityState_Enum} from '#core/constants/visibility-state';
 import {Signals} from '#core/data-structures/signals';
-import {LayoutPriority} from '#core/dom/layout';
+import {LayoutPriority_Enum} from '#core/dom/layout';
 import {layoutRectLtwh} from '#core/dom/layout/rect';
 
 import {AmpDocSingle} from '#service/ampdoc-impl';
 import {MutatorImpl} from '#service/mutator-impl';
-import {Resource, ResourceState} from '#service/resource';
+import {Resource, ResourceState_Enum} from '#service/resource';
 import {ResourcesImpl} from '#service/resources-impl';
 
 import {installInputService} from '../../src/input';
@@ -77,6 +77,7 @@ describes.realWin('mutator changeSize', {amp: true}, (env) => {
       getBoundingClientRect: () => rect,
       layoutCallback: () => Promise.resolve(),
       prerenderAllowed: () => true,
+      previewAllowed: () => true,
       renderOutsideViewport: () => false,
       unlayoutCallback: () => true,
       pause: () => {},
@@ -92,7 +93,7 @@ describes.realWin('mutator changeSize', {amp: true}, (env) => {
         unused_requestedWidth
         /* eslint-enable local/camelcase */
       ) => {},
-      getLayoutPriority: () => LayoutPriority.CONTENT,
+      getLayoutPriority: () => LayoutPriority_Enum.CONTENT,
       signals: () => signals,
       fakeComputedStyle: {
         marginTop: '0px',
@@ -106,7 +107,7 @@ describes.realWin('mutator changeSize', {amp: true}, (env) => {
   function createResource(id, rect) {
     const resource = new Resource(id, createElement(rect), resources);
     resource.element['__AMP__RESOURCE'] = resource;
-    resource.state_ = ResourceState.READY_FOR_LAYOUT;
+    resource.state_ = ResourceState_Enum.READY_FOR_LAYOUT;
     resource.initialLayoutBox_ = resource.layoutBox_ = rect;
     resource.changeSize = env.sandbox.spy();
     return resource;
@@ -177,7 +178,7 @@ describes.realWin('mutator changeSize', {amp: true}, (env) => {
       false
     );
     expect(resources.requestsChangeSize_.length).to.equal(2);
-    resource1.state_ = ResourceState.LAYOUT_SCHEDULED;
+    resource1.state_ = ResourceState_Enum.LAYOUT_SCHEDULED;
     resource1.unlayout();
     resources.cleanupTasks_(resource1);
     expect(resources.requestsChangeSize_.length).to.equal(1);
@@ -436,28 +437,44 @@ describes.realWin('mutator changeSize', {amp: true}, (env) => {
       expect(overflowCallbackSpy.firstCall.args[0]).to.equal(false);
     });
 
-    // TODO (#16156): duplicate stub for getVisibilityState on Safari
-    it.configure()
-      .skipSafari()
-      .run('should change size when document is invisible', () => {
-        resources.visible_ = false;
-        env.sandbox
-          .stub(resources.ampdoc, 'getVisibilityState')
-          .returns(VisibilityState.PRERENDER);
-        mutator.scheduleChangeSize_(
-          resource1,
-          111,
-          222,
-          undefined,
-          NO_EVENT,
-          false
-        );
-        resources.mutateWork_();
-        expect(resources.requestsChangeSize_).to.be.empty;
-        expect(resource1.changeSize).to.be.calledOnce;
-        expect(overflowCallbackSpy).to.be.calledOnce;
-        expect(overflowCallbackSpy.firstCall.args[0]).to.equal(false);
-      });
+    it('should change size when document is invisible', () => {
+      resources.visible_ = false;
+      env.sandbox
+        .stub(resources.ampdoc, 'getVisibilityState')
+        .returns(VisibilityState_Enum.PRERENDER);
+      mutator.scheduleChangeSize_(
+        resource1,
+        111,
+        222,
+        undefined,
+        NO_EVENT,
+        false
+      );
+      resources.mutateWork_();
+      expect(resources.requestsChangeSize_).to.be.empty;
+      expect(resource1.changeSize).to.be.calledOnce;
+      expect(overflowCallbackSpy).to.be.calledOnce;
+      expect(overflowCallbackSpy.firstCall.args[0]).to.equal(false);
+    });
+
+    it('should change size when document is in preview mode', () => {
+      env.sandbox
+        .stub(resources.ampdoc, 'getVisibilityState')
+        .returns(VisibilityState_Enum.PREVIEW);
+      mutator.scheduleChangeSize_(
+        resource1,
+        111,
+        222,
+        undefined,
+        NO_EVENT,
+        false
+      );
+      resources.mutateWork_();
+      expect(resources.requestsChangeSize_).to.be.empty;
+      expect(resource1.changeSize).to.be.calledOnce;
+      expect(overflowCallbackSpy).to.be.calledOnce;
+      expect(overflowCallbackSpy.firstCall.args[0]).to.equal(false);
+    });
 
     it('should change size when active', () => {
       resource1.element.contains = () => true;
@@ -956,40 +973,35 @@ describes.realWin('mutator changeSize', {amp: true}, (env) => {
       expect(overflowCallbackSpy).to.not.been.called;
     });
 
-    // TODO(#25518): investigate failure on Safari
-    it.configure().skipSafari(
-      'in viewport should change size if in the last 15% and ' +
-        'in the last 1000px',
-      () => {
-        viewportRect.top = 9600;
-        viewportRect.bottom = 9800;
-        resource1.layoutBox_ = {
-          top: 9650,
-          left: 0,
-          right: 100,
-          bottom: 9700,
-          height: 50,
-        };
-        mutator.scheduleChangeSize_(
-          resource1,
-          111,
-          222,
-          {top: 1, right: 2, bottom: 3, left: 4},
-          NO_EVENT,
-          false
-        );
+    it('in viewport should change size if in the last 15% and in the last 1000px', () => {
+      viewportRect.top = 9600;
+      viewportRect.bottom = 9800;
+      resource1.layoutBox_ = {
+        top: 9650,
+        left: 0,
+        right: 100,
+        bottom: 9700,
+        height: 50,
+      };
+      mutator.scheduleChangeSize_(
+        resource1,
+        111,
+        222,
+        {top: 1, right: 2, bottom: 3, left: 4},
+        NO_EVENT,
+        false
+      );
 
-        expect(vsyncSpy).to.be.calledOnce;
-        const marginsTask = vsyncSpy.lastCall.args[0];
-        marginsTask.measure({});
+      expect(vsyncSpy).to.be.calledOnce;
+      const marginsTask = vsyncSpy.lastCall.args[0];
+      marginsTask.measure({});
 
-        resources.mutateWork_();
-        expect(resources.requestsChangeSize_).to.be.empty;
-        expect(resource1.changeSize).to.be.calledOnce;
-        expect(overflowCallbackSpy).to.be.calledOnce;
-        expect(overflowCallbackSpy.firstCall.args[0]).to.equal(false);
-      }
-    );
+      resources.mutateWork_();
+      expect(resources.requestsChangeSize_).to.be.empty;
+      expect(resource1.changeSize).to.be.calledOnce;
+      expect(overflowCallbackSpy).to.be.calledOnce;
+      expect(overflowCallbackSpy.firstCall.args[0]).to.equal(false);
+    });
 
     it(
       'in viewport should NOT change size if in the last 15% but NOT ' +
@@ -1374,7 +1386,7 @@ describes.realWin('mutator mutateElement and collapse', {amp: true}, (env) => {
     element.isUpgraded = () => true;
     element.updateLayoutBox = () => {};
     element.getPlaceholder = () => null;
-    element.getLayoutPriority = () => LayoutPriority.CONTENT;
+    element.getLayoutPriority = () => LayoutPriority_Enum.CONTENT;
     element.getLayout = () => 'fixed';
 
     element.isInViewport = () => false;
@@ -1383,6 +1395,7 @@ describes.realWin('mutator mutateElement and collapse', {amp: true}, (env) => {
     element.getBoundingClientRect = () => rect;
     element.layoutCallback = () => Promise.resolve();
     element.prerenderAllowed = () => true;
+    element.previewAllowed = () => true;
     element.renderOutsideViewport = () => true;
     element.isRelayoutNeeded = () => true;
     element.pause = () => {};
@@ -1401,7 +1414,7 @@ describes.realWin('mutator mutateElement and collapse', {amp: true}, (env) => {
       resources
     );
     resource.element['__AMP__RESOURCE'] = resource;
-    resource.state_ = ResourceState.READY_FOR_LAYOUT;
+    resource.state_ = ResourceState_Enum.READY_FOR_LAYOUT;
     resource.layoutBox_ = rect;
     resource.changeSize = env.sandbox.spy();
     resource.completeCollapse = env.sandbox.spy();
diff --git a/test/unit/test-navigation.js b/test/unit/test-navigation.js
index aebab0bad96b..2b45a67dfb06 100644
--- a/test/unit/test-navigation.js
+++ b/test/unit/test-navigation.js
@@ -839,117 +839,113 @@ describes.sandboxed('Navigation', {}, () => {
       },
     },
     (env) => {
-      // TODO(dvoytenko, #11827): Make this test work on Safari.
-      describe
-        .configure()
-        .skipSafari()
-        .run('fie embed', () => {
-          let win, doc;
-          let parentWin;
-          let ampdoc;
-          let embed;
-          let handler;
-          let winOpenStub;
-          let scrollIntoViewStub;
-          let replaceStateForTargetStub;
-          let replaceStateForTargetPromise;
-          let anchor;
-          let elementWithId;
-          let anchorWithName;
+      describe('fie embed', () => {
+        let win, doc;
+        let parentWin;
+        let ampdoc;
+        let embed;
+        let handler;
+        let winOpenStub;
+        let scrollIntoViewStub;
+        let replaceStateForTargetStub;
+        let replaceStateForTargetPromise;
+        let anchor;
+        let elementWithId;
+        let anchorWithName;
 
-          beforeEach(() => {
-            win = env.win;
-            doc = win.document;
-            ampdoc = env.ampdoc;
-            parentWin = env.parentWin;
-            embed = env.embed;
-
-            handler = ampdoc.__AMP_SERVICES.navigation.obj;
-            winOpenStub = env.sandbox.stub(win, 'open').callsFake(() => {
-              return {};
-            });
-            const viewport = parentWin.__AMP_SERVICES.viewport.obj;
-            scrollIntoViewStub = env.sandbox.stub(viewport, 'scrollIntoView');
-            const history = parentWin.__AMP_SERVICES.history.obj;
-            replaceStateForTargetPromise = Promise.resolve();
-            replaceStateForTargetStub = env.sandbox
-              .stub(history, 'replaceStateForTarget')
-              .callsFake(() => replaceStateForTargetPromise);
-
-            anchor = doc.createElement('a');
-            anchor.href = 'http://ads.localhost:8000/example';
-            doc.body.appendChild(anchor);
-            event.target = anchor;
-
-            // Navigation uses the UrlReplacements service scoped to the event
-            // target, but for testing stub in the top-level service for simplicity.
-            const {documentElement} = parentWin.document;
-            const urlReplacements =
-              Services.urlReplacementsForDoc(documentElement);
-            env.sandbox
-              .stub(Services, 'urlReplacementsForDoc')
-              .withArgs(anchor)
-              .returns(urlReplacements);
-
-            elementWithId = doc.createElement('div');
-            elementWithId.id = 'test';
-            doc.body.appendChild(elementWithId);
-
-            anchorWithName = doc.createElement('a');
-            anchorWithName.setAttribute('name', 'test2');
-            doc.body.appendChild(anchorWithName);
+        beforeEach(() => {
+          win = env.win;
+          doc = win.document;
+          ampdoc = env.ampdoc;
+          parentWin = env.parentWin;
+          embed = env.embed;
+
+          handler = ampdoc.__AMP_SERVICES.navigation.obj;
+          winOpenStub = env.sandbox.stub(win, 'open').callsFake(() => {
+            return {};
           });
+          const viewport = parentWin.__AMP_SERVICES.viewport.obj;
+          scrollIntoViewStub = env.sandbox.stub(viewport, 'scrollIntoView');
+          const history = parentWin.__AMP_SERVICES.history.obj;
+          replaceStateForTargetPromise = Promise.resolve();
+          replaceStateForTargetStub = env.sandbox
+            .stub(history, 'replaceStateForTarget')
+            .callsFake(() => replaceStateForTargetPromise);
+
+          anchor = doc.createElement('a');
+          anchor.href = 'http://ads.localhost:8000/example';
+          doc.body.appendChild(anchor);
+          event.target = anchor;
+
+          // Navigation uses the UrlReplacements service scoped to the event
+          // target, but for testing stub in the top-level service for simplicity.
+          const {documentElement} = parentWin.document;
+          const urlReplacements =
+            Services.urlReplacementsForDoc(documentElement);
+          env.sandbox
+            .stub(Services, 'urlReplacementsForDoc')
+            .withArgs(anchor)
+            .returns(urlReplacements);
 
-          it('should adopt correctly to embed', () => {
-            expect(handler.ampdoc).to.equal(ampdoc);
-            expect(handler.rootNode_).to.equal(embed.win.document);
-            expect(handler.isEmbed_).to.be.true;
-          });
+          elementWithId = doc.createElement('div');
+          elementWithId.id = 'test';
+          doc.body.appendChild(elementWithId);
 
-          describe('when linking to a different origin or path', () => {
-            it('should update target to _blank', () => {
-              anchor.href = 'https://www.google.com/some-other-path';
-              handler.handle_(event);
-              expect(event.defaultPrevented).to.be.false;
-              expect(winOpenStub).to.not.be.called;
-              expect(scrollIntoViewStub).to.not.be.called;
-              expect(anchor.getAttribute('target')).to.equal('_blank');
-            });
+          anchorWithName = doc.createElement('a');
+          anchorWithName.setAttribute('name', 'test2');
+          doc.body.appendChild(anchorWithName);
+        });
 
-            it('should keep the target when specified', () => {
-              anchor.href = 'https://www.google.com/some-other-path';
-              anchor.setAttribute('target', '_top');
-              handler.handle_(event);
-              expect(event.defaultPrevented).to.be.false;
-              expect(winOpenStub).to.not.be.called;
-              expect(scrollIntoViewStub).to.not.be.called;
-              expect(anchor.getAttribute('target')).to.equal('_top');
-            });
+        it('should adopt correctly to embed', () => {
+          expect(handler.ampdoc).to.equal(ampdoc);
+          expect(handler.rootNode_).to.equal(embed.win.document);
+          expect(handler.isEmbed_).to.be.true;
+        });
 
-            it('should reset the target when illegal specified', () => {
-              anchor.href = 'https://www.google.com/some-other-path';
-              anchor.setAttribute('target', '_self');
-              handler.handle_(event);
-              expect(event.defaultPrevented).to.be.false;
-              expect(winOpenStub).to.not.be.called;
-              expect(scrollIntoViewStub).to.not.be.called;
-              expect(anchor.getAttribute('target')).to.equal('_blank');
-            });
+        describe('when linking to a different origin or path', () => {
+          it('should update target to _blank', () => {
+            anchor.href = 'https://www.google.com/some-other-path';
+            handler.handle_(event);
+            expect(event.defaultPrevented).to.be.false;
+            expect(winOpenStub).to.not.be.called;
+            expect(scrollIntoViewStub).to.not.be.called;
+            expect(anchor.getAttribute('target')).to.equal('_blank');
           });
 
-          describe('when linking to identifier', () => {
-            beforeEach(() => {
-              anchor.href = 'http://ads.localhost:8000/example#test';
-            });
+          it('should keep the target when specified', () => {
+            anchor.href = 'https://www.google.com/some-other-path';
+            anchor.setAttribute('target', '_top');
+            handler.handle_(event);
+            expect(event.defaultPrevented).to.be.false;
+            expect(winOpenStub).to.not.be.called;
+            expect(scrollIntoViewStub).to.not.be.called;
+            expect(anchor.getAttribute('target')).to.equal('_top');
+          });
 
-            it('should NOT do anything, but cancel the event', () => {
-              handler.handle_(event);
-              expect(event.defaultPrevented).to.be.true;
-              expect(replaceStateForTargetStub).to.not.be.called;
-              expect(scrollIntoViewStub).to.not.be.called;
-            });
+          it('should reset the target when illegal specified', () => {
+            anchor.href = 'https://www.google.com/some-other-path';
+            anchor.setAttribute('target', '_self');
+            handler.handle_(event);
+            expect(event.defaultPrevented).to.be.false;
+            expect(winOpenStub).to.not.be.called;
+            expect(scrollIntoViewStub).to.not.be.called;
+            expect(anchor.getAttribute('target')).to.equal('_blank');
+          });
+        });
+
+        describe('when linking to identifier', () => {
+          beforeEach(() => {
+            anchor.href = 'http://ads.localhost:8000/example#test';
+          });
+
+          it('should NOT do anything, but cancel the event', () => {
+            handler.handle_(event);
+            expect(event.defaultPrevented).to.be.true;
+            expect(replaceStateForTargetStub).to.not.be.called;
+            expect(scrollIntoViewStub).to.not.be.called;
           });
         });
+      });
     }
   );
 });
diff --git a/test/unit/test-origin-experiments.js b/test/unit/test-origin-experiments.js
index b7a25342280f..a7ba1ef3ffa9 100644
--- a/test/unit/test-origin-experiments.js
+++ b/test/unit/test-origin-experiments.js
@@ -69,33 +69,25 @@ describes.fakeWin('OriginExperiments', {amp: true}, (env) => {
     expect(error).calledWithMatch(TAG, 'Failed to verify experiment token');
   });
 
-  // TODO(amphtml, #25621): Cannot find atob / btoa on Safari.
-  it.configure().skipSafari(
-    'should return true for valid token with matching origin',
-    function* () {
-      setupMetaTagWith(token);
-      win.location.href = 'https://origin.com';
-
-      const experiments = originExperiments.getExperiments();
-      expect(experiments).to.eventually.deep.equal(['foo']);
-      yield experiments;
-      expect(error).to.not.be.called;
-    }
-  );
-
-  // TODO(amphtml, #25621): Cannot find atob / btoa on Safari.
-  it.configure().skipSafari(
-    'should return false if experiment is not in config',
-    function* () {
-      setupMetaTagWith(token);
-      win.location.href = 'https://origin.com';
-
-      const experiments = originExperiments.getExperiments();
-      expect(experiments).to.eventually.deep.equal([]);
-      yield experiments;
-      expect(error).to.not.be.called;
-    }
-  );
+  it('should return true for valid token with matching origin', function* () {
+    setupMetaTagWith(token);
+    win.location.href = 'https://origin.com';
+
+    const experiments = originExperiments.getExperiments();
+    expect(experiments).to.eventually.deep.equal(['foo']);
+    yield experiments;
+    expect(error).to.not.be.called;
+  });
+
+  it('should return false if experiment is not in config', function* () {
+    setupMetaTagWith(token);
+    win.location.href = 'https://origin.com';
+
+    const experiments = originExperiments.getExperiments();
+    expect(experiments).to.eventually.deep.equal([]);
+    yield experiments;
+    expect(error).to.not.be.called;
+  });
 });
 
 describes.fakeWin('TokenMaster', {amp: true}, (env) => {
@@ -110,122 +102,118 @@ describes.fakeWin('TokenMaster', {amp: true}, (env) => {
   let tokenWithBadConfigLength;
   let tokenWithBadSignature;
 
-  // TODO(amphtml, #25621): Cannot find atob / btoa on Safari.
-  describe
-    .configure()
-    .skipSafari()
-    .run('TokenMaster', () => {
-      // Generate test tokens once since generating keys is slow.
-      beforeEach(() => {
-        const crypto = Services.cryptoFor(env.win);
-        const url = Services.urlForDoc(env.ampdoc.getHeadNode());
-        tokenMaster = new TokenMaster(crypto, url);
-
-        return tokenMaster.generateKeys().then((keyPair) => {
-          ({privateKey, publicKey} = keyPair);
-
-          const config = {
-            origin: 'https://origin.com',
-            experiment: 'origin',
-            expiration: Date.now() + 1000 * 1000, // 1000s in the future.
-          };
-          const expired = {
-            origin: 'https://origin.com',
-            experiment: 'expired',
-            expiration: Date.now() - 1000, // 1s in the past.
-          };
-
-          return Promise.all([
-            tokenMaster.generateToken(0, config, privateKey),
-            tokenMaster.generateToken(42, config, privateKey),
-            tokenMaster.generateToken(0, expired, privateKey),
-          ]).then((results) => {
-            token = results[0];
-            tokenWithBadVersion = results[1];
-            tokenWithExpiredExperiment = results[2];
-
-            // Generate token with bad signature by truncating.
-            tokenWithBadSignature = token.slice(0, token.length - 5);
-
-            // Generate token with bad config length by hand.
-            const data = new Uint8Array(5);
-            new DataView(data.buffer).setUint32(1, 999, false); // 999 length.
-            tokenWithBadConfigLength = btoa(bytesToString(data));
-          });
+  describe('TokenMaster', () => {
+    // Generate test tokens once since generating keys is slow.
+    beforeEach(() => {
+      const crypto = Services.cryptoFor(env.win);
+      const url = Services.urlForDoc(env.ampdoc.getHeadNode());
+      tokenMaster = new TokenMaster(crypto, url);
+
+      return tokenMaster.generateKeys().then((keyPair) => {
+        ({privateKey, publicKey} = keyPair);
+
+        const config = {
+          origin: 'https://origin.com',
+          experiment: 'origin',
+          expiration: Date.now() + 1000 * 1000, // 1000s in the future.
+        };
+        const expired = {
+          origin: 'https://origin.com',
+          experiment: 'expired',
+          expiration: Date.now() - 1000, // 1s in the past.
+        };
+
+        return Promise.all([
+          tokenMaster.generateToken(0, config, privateKey),
+          tokenMaster.generateToken(42, config, privateKey),
+          tokenMaster.generateToken(0, expired, privateKey),
+        ]).then((results) => {
+          token = results[0];
+          tokenWithBadVersion = results[1];
+          tokenWithExpiredExperiment = results[2];
+
+          // Generate token with bad signature by truncating.
+          tokenWithBadSignature = token.slice(0, token.length - 5);
+
+          // Generate token with bad config length by hand.
+          const data = new Uint8Array(5);
+          new DataView(data.buffer).setUint32(1, 999, false); // 999 length.
+          tokenWithBadConfigLength = btoa(bytesToString(data));
         });
       });
+    });
 
-      it('should throw for an unknown token version number', () => {
-        const verify = tokenMaster.verifyToken(
-          tokenWithBadVersion,
-          'https://origin.com',
-          publicKey
-        );
-        return expect(verify).to.eventually.be.rejectedWith(
-          'Unrecognized token version: 42'
-        );
-      });
+    it('should throw for an unknown token version number', () => {
+      const verify = tokenMaster.verifyToken(
+        tokenWithBadVersion,
+        'https://origin.com',
+        publicKey
+      );
+      return expect(verify).to.eventually.be.rejectedWith(
+        'Unrecognized token version: 42'
+      );
+    });
 
-      it('should throw if config length exceeds byte length', () => {
-        const verify = tokenMaster.verifyToken(
-          tokenWithBadConfigLength,
-          'https://origin.com',
-          publicKey
-        );
-        return expect(verify).to.eventually.be.rejectedWith(
-          'Unexpected config length: 999'
-        );
-      });
+    it('should throw if config length exceeds byte length', () => {
+      const verify = tokenMaster.verifyToken(
+        tokenWithBadConfigLength,
+        'https://origin.com',
+        publicKey
+      );
+      return expect(verify).to.eventually.be.rejectedWith(
+        'Unexpected config length: 999'
+      );
+    });
 
-      it('should throw if signature cannot be verified', () => {
-        const verify = tokenMaster.verifyToken(
-          tokenWithBadSignature,
-          'https://origin.com',
-          publicKey
-        );
-        return expect(verify).to.eventually.be.rejectedWith(
-          'Failed to verify token signature.'
-        );
-      });
+    it('should throw if signature cannot be verified', () => {
+      const verify = tokenMaster.verifyToken(
+        tokenWithBadSignature,
+        'https://origin.com',
+        publicKey
+      );
+      return expect(verify).to.eventually.be.rejectedWith(
+        'Failed to verify token signature.'
+      );
+    });
 
-      it('should throw if approved origin is not current origin', () => {
-        const verify = tokenMaster.verifyToken(
-          token,
-          'https://not-origin.com',
-          publicKey
-        );
-        return expect(verify).to.eventually.be.rejectedWith(
-          /does not match window/
-        );
-      });
+    it('should throw if approved origin is not current origin', () => {
+      const verify = tokenMaster.verifyToken(
+        token,
+        'https://not-origin.com',
+        publicKey
+      );
+      return expect(verify).to.eventually.be.rejectedWith(
+        /does not match window/
+      );
+    });
 
-      it('should return false if trial has expired', () => {
-        const verify = tokenMaster.verifyToken(
-          tokenWithExpiredExperiment,
-          'https://origin.com',
-          publicKey
-        );
-        return expect(verify).to.eventually.be.rejectedWith(
-          'Experiment "expired" has expired.'
-        );
-      });
+    it('should return false if trial has expired', () => {
+      const verify = tokenMaster.verifyToken(
+        tokenWithExpiredExperiment,
+        'https://origin.com',
+        publicKey
+      );
+      return expect(verify).to.eventually.be.rejectedWith(
+        'Experiment "expired" has expired.'
+      );
+    });
 
-      it('should return true for a well-formed, unexpired token', () => {
-        const verify = tokenMaster.verifyToken(
-          token,
-          'https://origin.com',
-          publicKey
-        );
-        return expect(verify).to.eventually.be.fulfilled;
-      });
+    it('should return true for a well-formed, unexpired token', () => {
+      const verify = tokenMaster.verifyToken(
+        token,
+        'https://origin.com',
+        publicKey
+      );
+      return expect(verify).to.eventually.be.fulfilled;
+    });
 
-      it('should ignore trailing slash on location', () => {
-        const verify = tokenMaster.verifyToken(
-          token,
-          'https://origin.com/',
-          publicKey
-        );
-        return expect(verify).to.eventually.be.fulfilled;
-      });
+    it('should ignore trailing slash on location', () => {
+      const verify = tokenMaster.verifyToken(
+        token,
+        'https://origin.com/',
+        publicKey
+      );
+      return expect(verify).to.eventually.be.fulfilled;
     });
+  });
 });
diff --git a/test/unit/test-owners.js b/test/unit/test-owners.js
index c2504b35e138..90257806b5c3 100644
--- a/test/unit/test-owners.js
+++ b/test/unit/test-owners.js
@@ -1,5 +1,5 @@
 import {Services} from '#service';
-import {Resource, ResourceState} from '#service/resource';
+import {Resource, ResourceState_Enum} from '#service/resource';
 
 describes.realWin(
   'owners-impl',
@@ -47,13 +47,13 @@ describes.realWin(
 
     function createElementWithResource(
       id,
-      state = ResourceState.LAYOUT_COMPLETE
+      state = ResourceState_Enum.LAYOUT_COMPLETE
     ) {
       const element = createElement();
       const resource = new Resource(id, element, resources);
       resource.state_ = state;
       env.sandbox.stub(resource, 'measure').callsFake(() => {
-        resource.state_ = ResourceState.READY_FOR_LAYOUT;
+        resource.state_ = ResourceState_Enum.READY_FOR_LAYOUT;
       });
       resource.isDisplayedForTesting = true;
       env.sandbox
@@ -151,7 +151,7 @@ describes.realWin(
       it('should schedule when resource is READY_FOR_LAYOUT', () => {
         const resource1 = setElementResourceState(
           children[1],
-          ResourceState.READY_FOR_LAYOUT
+          ResourceState_Enum.READY_FOR_LAYOUT
         );
         const ensureLoadedStub = env.sandbox
           .stub(resource1.element, 'ensureLoaded')
@@ -163,7 +163,7 @@ describes.realWin(
       it('should schedule even when not build', async () => {
         const resource1 = setElementResourceState(
           children[1],
-          ResourceState.NOT_BUILT
+          ResourceState_Enum.NOT_BUILT
         );
         env.sandbox.stub(resource1, 'whenBuilt').returns(new Promise(() => {}));
         const ensureLoadedStub = env.sandbox
@@ -204,9 +204,9 @@ describes.realWin(
 
     describe('schedulePreload', () => {
       beforeEach(() => {
-        setAllResourceState(ResourceState.NOT_BUILT);
+        setAllResourceState(ResourceState_Enum.NOT_BUILT);
         [parent, children[1], children[2]].forEach((element) => {
-          setElementResourceState(element, ResourceState.READY_FOR_LAYOUT);
+          setElementResourceState(element, ResourceState_Enum.READY_FOR_LAYOUT);
         });
       });
 
@@ -247,13 +247,13 @@ describes.realWin(
       it('should schedule on nested custom element placeholder', () => {
         const placeholder1 = createElementWithResource(
           10,
-          ResourceState.READY_FOR_LAYOUT
+          ResourceState_Enum.READY_FOR_LAYOUT
         );
         children[1].getPlaceholder = () => placeholder1;
 
         const placeholder2 = createElementWithResource(
           11,
-          ResourceState.READY_FOR_LAYOUT
+          ResourceState_Enum.READY_FOR_LAYOUT
         );
         children[2].getPlaceholder = () => placeholder2;
 
@@ -272,7 +272,7 @@ describes.realWin(
       it('should schedule amp-* placeholder inside non-amp element', () => {
         const insidePlaceholder1 = createElementWithResource(
           10,
-          ResourceState.READY_FOR_LAYOUT
+          ResourceState_Enum.READY_FOR_LAYOUT
         );
         const placeholder1 = doc.createElement('div');
         children[0].getElementsByClassName = () => [insidePlaceholder1];
@@ -299,31 +299,31 @@ describes.realWin(
       });
 
       it('should layout AMP element itself', async () => {
-        setAllResourceState(ResourceState.READY_FOR_LAYOUT);
+        setAllResourceState(ResourceState_Enum.READY_FOR_LAYOUT);
         const scheduledElements = await owners.requireLayout(parent);
         expect(scheduledElements).to.deep.equal([0]);
       });
 
       it("should layout non-AMP element's all AMP children", async () => {
-        setAllResourceState(ResourceState.READY_FOR_LAYOUT);
+        setAllResourceState(ResourceState_Enum.READY_FOR_LAYOUT);
         const scheduledElements = await owners.requireLayout(children[0]);
         expect(scheduledElements).to.deep.equal([3, 4]);
       });
 
       it('should layout element w/ state=LAYOUT_FAILED', async () => {
-        setElementResourceState(parent, ResourceState.LAYOUT_FAILED);
+        setElementResourceState(parent, ResourceState_Enum.LAYOUT_FAILED);
         const scheduledElements = await owners.requireLayout(parent);
         expect(scheduledElements).to.deep.equal([0]);
       });
 
       it('should layout element w/ state=LAYOUT_COMPLETE', async () => {
-        setElementResourceState(parent, ResourceState.LAYOUT_COMPLETE);
+        setElementResourceState(parent, ResourceState_Enum.LAYOUT_COMPLETE);
         const scheduledElements = await owners.requireLayout(parent);
         expect(scheduledElements).to.deep.equal([0]);
       });
 
       it('should not double schedule element w/ state=LAYOUT_SCHEDULED', async () => {
-        setElementResourceState(parent, ResourceState.LAYOUT_SCHEDULED);
+        setElementResourceState(parent, ResourceState_Enum.LAYOUT_SCHEDULED);
         const scheduledElements = await owners.requireLayout(parent);
         expect(scheduledElements).to.deep.equal([0]);
       });
@@ -331,7 +331,7 @@ describes.realWin(
       it('should not require layout for undisplayed element', async () => {
         const resource = setElementResourceState(
           parent,
-          ResourceState.READY_FOR_LAYOUT
+          ResourceState_Enum.READY_FOR_LAYOUT
         );
         resource.isDisplayedForTesting = false;
         const scheduledElements = await owners.requireLayout(parent);
diff --git a/test/unit/test-performance.js b/test/unit/test-performance.js
index 50d6434c05a8..8ba98d04682d 100644
--- a/test/unit/test-performance.js
+++ b/test/unit/test-performance.js
@@ -1,8 +1,10 @@
 import * as fakeTimers from '@sinonjs/fake-timers';
 
-import {VisibilityState} from '#core/constants/visibility-state';
+import {VisibilityState_Enum} from '#core/constants/visibility-state';
 import {base64UrlDecodeToBytes} from '#core/types/string/base64';
 
+import {toggleExperiment} from '#experiments';
+
 import {Services} from '#service';
 import {installRuntimeServices} from '#service/core-services';
 import {
@@ -36,6 +38,7 @@ describes.realWin('performance', {amp: true}, (env) => {
   beforeEach(() => {
     win = env.win;
     ampdoc = env.ampdoc;
+    toggleExperiment(win, 'interaction-to-next-paint', true);
     clock = fakeTimers.withGlobal(win).install({
       toFake: ['Date', 'setTimeout', 'clearTimeout'],
       // set initial Date.now to 100, so that we can differentiate between time relative to epoch and relative to process start (value vs. delta).
@@ -152,370 +155,371 @@ describes.realWin('performance', {amp: true}, (env) => {
     });
   });
 
-  describe
-    .configure()
-    .skipFirefox()
-    .run('when viewer is ready,', () => {
-      let viewer;
-      let viewerSendMessageStub;
+  describe('when viewer is ready,', () => {
+    let viewer;
+    let viewerSendMessageStub;
 
-      beforeEach(() => {
-        viewer = Services.viewerForDoc(ampdoc);
-        viewerSendMessageStub = env.sandbox.stub(viewer, 'sendMessage');
-      });
+    beforeEach(() => {
+      viewer = Services.viewerForDoc(ampdoc);
+      viewerSendMessageStub = env.sandbox.stub(viewer, 'sendMessage');
+    });
 
-      describe('config', () => {
-        it(
-          'should configure correctly when viewer is embedded and supports ' +
-            'csi',
-          () => {
-            env.sandbox.stub(viewer, 'getParam').withArgs('csi').returns('1');
-            env.sandbox.stub(viewer, 'isEmbedded').returns(true);
-            perf.coreServicesAvailable().then(() => {
-              expect(perf.isPerformanceTrackingOn()).to.be.true;
-            });
-          }
-        );
-
-        it(
-          'should configure correctly when viewer is embedded and does ' +
-            'NOT support csi',
-          () => {
-            env.sandbox.stub(viewer, 'getParam').withArgs('csi').returns('0');
-            env.sandbox.stub(viewer, 'isEmbedded').returns(true);
-            perf.coreServicesAvailable().then(() => {
-              expect(perf.isPerformanceTrackingOn()).to.be.false;
-            });
-          }
-        );
-
-        it(
-          'should configure correctly when viewer is embedded and does ' +
-            'NOT support csi',
-          () => {
-            env.sandbox.stub(viewer, 'getParam').withArgs('csi').returns(null);
-            env.sandbox.stub(viewer, 'isEmbedded').returns(true);
-            perf.coreServicesAvailable().then(() => {
-              expect(perf.isPerformanceTrackingOn()).to.be.false;
-            });
-          }
-        );
+    describe('config', () => {
+      it(
+        'should configure correctly when viewer is embedded and supports ' +
+          'csi',
+        () => {
+          env.sandbox.stub(viewer, 'getParam').withArgs('csi').returns('1');
+          env.sandbox.stub(viewer, 'isEmbedded').returns(true);
+          perf.coreServicesAvailable().then(() => {
+            expect(perf.isPerformanceTrackingOn()).to.be.true;
+          });
+        }
+      );
 
-        it('should configure correctly when viewer is not embedded', () => {
-          env.sandbox.stub(viewer, 'getParam').withArgs('csi').returns(null);
-          env.sandbox.stub(viewer, 'isEmbedded').returns(false);
+      it(
+        'should configure correctly when viewer is embedded and does ' +
+          'NOT support csi',
+        () => {
+          env.sandbox.stub(viewer, 'getParam').withArgs('csi').returns('0');
+          env.sandbox.stub(viewer, 'isEmbedded').returns(true);
           perf.coreServicesAvailable().then(() => {
             expect(perf.isPerformanceTrackingOn()).to.be.false;
           });
-        });
-      });
+        }
+      );
 
-      describe('channel established', () => {
-        it('should flush events when channel is ready', () => {
+      it(
+        'should configure correctly when viewer is embedded and does ' +
+          'NOT support csi',
+        () => {
           env.sandbox.stub(viewer, 'getParam').withArgs('csi').returns(null);
-          env.sandbox
-            .stub(viewer, 'whenMessagingReady')
-            .returns(Promise.resolve());
-          expect(perf.isMessagingReady_).to.be.false;
-          const promise = perf.coreServicesAvailable();
-          expect(perf.events_.length).to.equal(0);
-
-          perf.tick('start');
-          expect(perf.events_.length).to.equal(1);
-
-          perf.tick('startEnd');
-          expect(perf.events_.length).to.equal(2);
-          expect(perf.isMessagingReady_).to.be.false;
+          env.sandbox.stub(viewer, 'isEmbedded').returns(true);
+          perf.coreServicesAvailable().then(() => {
+            expect(perf.isPerformanceTrackingOn()).to.be.false;
+          });
+        }
+      );
 
-          const flushSpy = env.sandbox.spy(perf, 'flush');
-          expect(flushSpy).to.have.callCount(0);
-          perf.flush();
-          expect(flushSpy).to.have.callCount(1);
-          expect(perf.events_.length).to.equal(2);
-
-          perf.isPerformanceTrackingOn_ = true;
-          clock.tick(1);
-          return promise.then(() => {
-            expect(perf.isMessagingReady_).to.be.true;
-            const msrCalls = viewerSendMessageStub.withArgs(
-              'tick',
-              env.sandbox.match((arg) => arg.label === 'msr')
-            );
-            expect(msrCalls).to.be.calledOnce;
-            expect(msrCalls.args[0][1]).to.be.jsonEqual({
-              label: 'msr',
-              delta: 1,
-            });
+      it('should configure correctly when viewer is not embedded', () => {
+        env.sandbox.stub(viewer, 'getParam').withArgs('csi').returns(null);
+        env.sandbox.stub(viewer, 'isEmbedded').returns(false);
+        perf.coreServicesAvailable().then(() => {
+          expect(perf.isPerformanceTrackingOn()).to.be.false;
+        });
+      });
+    });
 
-            const timeOriginCall = viewerSendMessageStub.withArgs(
-              'tick',
-              env.sandbox.match((arg) => arg.label === 'timeOrigin')
-            );
-            expect(timeOriginCall).to.be.calledOnce;
-            expect(timeOriginCall).calledWithMatch('tick', {
-              label: 'timeOrigin',
-              value: 100,
-            });
+    describe('channel established', () => {
+      it('should flush events when channel is ready', () => {
+        env.sandbox.stub(viewer, 'getParam').withArgs('csi').returns(null);
+        env.sandbox
+          .stub(viewer, 'whenMessagingReady')
+          .returns(Promise.resolve());
+        expect(perf.isMessagingReady_).to.be.false;
+        const promise = perf.coreServicesAvailable();
+        expect(perf.events_.length).to.equal(0);
+
+        perf.tick('start');
+        expect(perf.events_.length).to.equal(1);
+
+        perf.tick('startEnd');
+        expect(perf.events_.length).to.equal(2);
+        expect(perf.isMessagingReady_).to.be.false;
+
+        const flushSpy = env.sandbox.spy(perf, 'flush');
+        expect(flushSpy).to.have.callCount(0);
+        perf.flush();
+        expect(flushSpy).to.have.callCount(1);
+        expect(perf.events_.length).to.equal(2);
+
+        perf.isPerformanceTrackingOn_ = true;
+        clock.tick(1);
+        return promise.then(() => {
+          expect(perf.isMessagingReady_).to.be.true;
+          const msrCalls = viewerSendMessageStub.withArgs(
+            'tick',
+            env.sandbox.match((arg) => arg.label === 'msr')
+          );
+          expect(msrCalls).to.be.calledOnce;
+          expect(msrCalls.args[0][1]).to.be.jsonEqual({
+            label: 'msr',
+            delta: 1,
+          });
 
-            expect(flushSpy).to.have.callCount(5);
-            expect(perf.events_.length).to.equal(0);
+          const timeOriginCall = viewerSendMessageStub.withArgs(
+            'tick',
+            env.sandbox.match((arg) => arg.label === 'timeOrigin')
+          );
+          expect(timeOriginCall).to.be.calledOnce;
+          expect(timeOriginCall).calledWithMatch('tick', {
+            label: 'timeOrigin',
+            value: 100,
           });
+
+          expect(flushSpy).to.have.callCount(6);
+          expect(perf.events_.length).to.equal(0);
         });
       });
+    });
 
-      describe('channel not established', () => {
-        it('should not flush anything', () => {
-          env.sandbox.stub(viewer, 'whenMessagingReady').returns(null);
-          expect(perf.isMessagingReady_).to.be.false;
+    describe('channel not established', () => {
+      it('should not flush anything', () => {
+        env.sandbox.stub(viewer, 'whenMessagingReady').returns(null);
+        expect(perf.isMessagingReady_).to.be.false;
 
-          expect(perf.events_.length).to.equal(0);
+        expect(perf.events_.length).to.equal(0);
 
-          perf.tick('start');
-          expect(perf.events_.length).to.equal(1);
+        perf.tick('start');
+        expect(perf.events_.length).to.equal(1);
 
-          perf.tick('startEnd');
-          expect(perf.events_.length).to.equal(2);
-          expect(perf.isMessagingReady_).to.be.false;
+        perf.tick('startEnd');
+        expect(perf.events_.length).to.equal(2);
+        expect(perf.isMessagingReady_).to.be.false;
 
-          const flushSpy = env.sandbox.spy(perf, 'flush');
-          expect(flushSpy).to.have.callCount(0);
-          perf.flush();
-          expect(flushSpy).to.have.callCount(1);
-          expect(perf.events_.length).to.equal(2);
-
-          return Promise.all([
-            perf.coreServicesAvailable(),
-            ampdoc.whenFirstVisible(),
-          ]).then(() => {
-            expect(flushSpy).to.have.callCount(4);
-            expect(perf.isMessagingReady_).to.be.false;
-            const count = 5;
-            expect(perf.events_.length).to.equal(count);
-          });
+        const flushSpy = env.sandbox.spy(perf, 'flush');
+        expect(flushSpy).to.have.callCount(0);
+        perf.flush();
+        expect(flushSpy).to.have.callCount(1);
+        expect(perf.events_.length).to.equal(2);
+
+        return Promise.all([
+          perf.coreServicesAvailable(),
+          ampdoc.whenFirstVisible(),
+        ]).then(() => {
+          expect(flushSpy).to.have.callCount(5);
+          expect(perf.isMessagingReady_).to.be.false;
+          const count = 6;
+          expect(perf.events_.length).to.equal(count);
         });
       });
+    });
 
-      describe('tickSinceVisible', () => {
-        let tickDeltaStub;
-        let firstVisibleTime;
-
-        beforeEach(() => {
-          tickDeltaStub = env.sandbox.stub(perf, 'tickDelta');
-          firstVisibleTime = null;
-          env.sandbox
-            .stub(ampdoc, 'getFirstVisibleTime')
-            .callsFake(() => firstVisibleTime);
-          perf.coreServicesAvailable();
-          perf.viewer_ = {isEmbedded: () => true};
-        });
+    describe('tickSinceVisible', () => {
+      let tickDeltaStub;
+      let firstVisibleTime;
+
+      beforeEach(() => {
+        tickDeltaStub = env.sandbox.stub(perf, 'tickDelta');
+        firstVisibleTime = null;
+        env.sandbox
+          .stub(ampdoc, 'getFirstVisibleTime')
+          .callsFake(() => firstVisibleTime);
+        perf.coreServicesAvailable();
+        perf.viewer_ = {isEmbedded: () => true};
+      });
 
-        it('should not offset by visible time when viewer is not set', () => {
-          perf.viewer_ = {isEmbedded: () => false};
-          clock.tick(10);
-          perf.tickSinceVisible('test');
+      it('should not offset by visible time when viewer is not set', () => {
+        perf.viewer_ = {isEmbedded: () => false};
+        clock.tick(10);
+        perf.tickSinceVisible('test');
 
-          expect(tickDeltaStub).to.have.been.calledOnce;
-          expect(tickDeltaStub.firstCall.args[1]).to.equal(10);
-        });
+        expect(tickDeltaStub).to.have.been.calledOnce;
+        expect(tickDeltaStub.firstCall.args[1]).to.equal(10);
+      });
 
-        it('should always be zero before visible', () => {
-          clock.tick(10);
-          perf.tickSinceVisible('test');
+      it('should always be zero before visible', () => {
+        clock.tick(10);
+        perf.tickSinceVisible('test');
 
-          expect(tickDeltaStub).to.have.been.calledOnce;
-          expect(tickDeltaStub.firstCall.args[1]).to.equal(0);
-        });
+        expect(tickDeltaStub).to.have.been.calledOnce;
+        expect(tickDeltaStub.firstCall.args[1]).to.equal(0);
+      });
 
-        it('should calculate after visible', () => {
-          firstVisibleTime = timeOrigin + 5;
+      it('should calculate after visible', () => {
+        firstVisibleTime = timeOrigin + 5;
 
-          clock.tick(10);
-          perf.tickSinceVisible('test');
+        clock.tick(10);
+        perf.tickSinceVisible('test');
 
-          expect(tickDeltaStub).to.have.been.calledOnce;
-          expect(tickDeltaStub.firstCall.args[1]).to.equal(5);
-        });
+        expect(tickDeltaStub).to.have.been.calledOnce;
+        expect(tickDeltaStub.firstCall.args[1]).to.equal(5);
+      });
 
-        it('should be zero after visible but for earlier event', () => {
-          firstVisibleTime = timeOrigin + 5;
+      it('should be zero after visible but for earlier event', () => {
+        firstVisibleTime = timeOrigin + 5;
 
-          // An earlier event, since event time (4) is less than visible time (5).
-          clock.tick(4);
-          perf.tickSinceVisible('test');
+        // An earlier event, since event time (4) is less than visible time (5).
+        clock.tick(4);
+        perf.tickSinceVisible('test');
 
-          expect(tickDeltaStub).to.have.been.calledOnce;
-          expect(tickDeltaStub.firstCall.args[1]).to.equal(0);
-        });
+        expect(tickDeltaStub).to.have.been.calledOnce;
+        expect(tickDeltaStub.firstCall.args[1]).to.equal(0);
       });
+    });
 
-      describe('and performanceTracking is off', () => {
-        beforeEach(() => {
-          env.sandbox.stub(viewer, 'getParam').withArgs('csi').returns(null);
-          env.sandbox.stub(viewer, 'isEmbedded').returns(false);
-        });
+    describe('and performanceTracking is off', () => {
+      beforeEach(() => {
+        env.sandbox.stub(viewer, 'getParam').withArgs('csi').returns(null);
+        env.sandbox.stub(viewer, 'isEmbedded').returns(false);
+      });
 
-        it('should not forward queued ticks', () => {
-          perf.tick('start0');
-          clock.tick(1);
-          perf.tick('start1', 'start0');
+      it('should not forward queued ticks', () => {
+        perf.tick('start0');
+        clock.tick(1);
+        perf.tick('start1', 'start0');
 
-          expect(perf.events_.length).to.equal(2);
+        expect(perf.events_.length).to.equal(2);
 
-          return perf.coreServicesAvailable().then(() => {
-            perf.flushQueuedTicks_();
-            perf.flush();
-            expect(perf.events_.length).to.equal(0);
+        return perf.coreServicesAvailable().then(() => {
+          perf.flushQueuedTicks_();
+          perf.flush();
+          expect(perf.events_.length).to.equal(0);
 
-            expect(viewerSendMessageStub.withArgs('tick')).to.not.be.called;
-            expect(
-              viewerSendMessageStub.withArgs(
-                'sendCsi',
-                undefined,
-                /* cancelUnsent */ true
-              )
-            ).to.not.be.called;
-          });
+          expect(viewerSendMessageStub.withArgs('tick')).to.not.be.called;
+          expect(
+            viewerSendMessageStub.withArgs(
+              'sendCsi',
+              undefined,
+              /* cancelUnsent */ true
+            )
+          ).to.not.be.called;
         });
+      });
 
-        it('should ignore all calls to tick', () => {
-          perf.tick('start0');
-          return perf.coreServicesAvailable().then(() => {
-            expect(viewerSendMessageStub.withArgs('tick')).to.not.be.called;
-          });
+      it('should ignore all calls to tick', () => {
+        perf.tick('start0');
+        return perf.coreServicesAvailable().then(() => {
+          expect(viewerSendMessageStub.withArgs('tick')).to.not.be.called;
         });
+      });
 
-        it('should ignore all calls to flush', () => {
-          perf.tick('start0');
-          perf.flush();
-          return perf.coreServicesAvailable().then(() => {
-            expect(
-              viewerSendMessageStub.withArgs(
-                'sendCsi',
-                undefined,
-                /* cancelUnsent */ true
-              )
-            ).to.not.be.called;
-          });
+      it('should ignore all calls to flush', () => {
+        perf.tick('start0');
+        perf.flush();
+        return perf.coreServicesAvailable().then(() => {
+          expect(
+            viewerSendMessageStub.withArgs(
+              'sendCsi',
+              undefined,
+              /* cancelUnsent */ true
+            )
+          ).to.not.be.called;
         });
       });
+    });
 
-      describe('and performanceTracking is on', () => {
-        beforeEach(() => {
-          env.sandbox.stub(viewer, 'getParam').withArgs('csi').returns('1');
-          env.sandbox.stub(viewer, 'isEmbedded').returns(true);
-          env.sandbox
-            .stub(viewer, 'whenMessagingReady')
-            .returns(Promise.resolve());
-        });
+    describe('and performanceTracking is on', () => {
+      beforeEach(() => {
+        env.sandbox.stub(viewer, 'getParam').withArgs('csi').returns('1');
+        env.sandbox.stub(viewer, 'isEmbedded').returns(true);
+        env.sandbox
+          .stub(viewer, 'whenMessagingReady')
+          .returns(Promise.resolve());
+      });
 
-        it('should forward all queued tick events', () => {
-          perf.tick('start0');
-          clock.tick(1);
-          perf.tick('start1');
+      it('should forward all queued tick events', () => {
+        perf.tick('start0');
+        clock.tick(1);
+        perf.tick('start1');
 
-          expect(perf.events_.length).to.equal(2);
+        expect(perf.events_.length).to.equal(2);
 
-          return perf.coreServicesAvailable().then(() => {
-            expect(
-              viewerSendMessageStub.withArgs('tick').getCall(0).args[1]
-            ).to.be.jsonEqual({
-              label: 'start0',
-              value: timeOrigin,
-            });
-            expect(
-              viewerSendMessageStub.withArgs('tick').getCall(1).args[1]
-            ).to.be.jsonEqual({
-              label: 'start1',
-              value: timeOrigin + 1,
-            });
-            expect(
-              viewerSendMessageStub.withArgs('tick').getCall(4).args[1]
-            ).to.be.jsonEqual({
-              label: 'msr',
-              delta: 1,
-            });
+        return perf.coreServicesAvailable().then(() => {
+          expect(
+            viewerSendMessageStub.withArgs('tick').getCall(0).args[1]
+          ).to.be.jsonEqual({
+            label: 'start0',
+            value: timeOrigin,
+          });
+          expect(
+            viewerSendMessageStub.withArgs('tick').getCall(1).args[1]
+          ).to.be.jsonEqual({
+            label: 'start1',
+            value: timeOrigin + 1,
+          });
+          expect(
+            viewerSendMessageStub.withArgs('tick').getCall(4).args[1]
+          ).to.be.jsonEqual({
+            label: 'inp',
+            delta: 40,
+          });
+          expect(
+            viewerSendMessageStub.withArgs('tick').getCall(5).args[1]
+          ).to.be.jsonEqual({
+            label: 'msr',
+            delta: 1,
           });
         });
+      });
 
-        it('should have no more queued tick events after flush', () => {
-          perf.tick('start0');
-          perf.tick('start1');
+      it('should have no more queued tick events after flush', () => {
+        perf.tick('start0');
+        perf.tick('start1');
 
-          expect(perf.events_.length).to.equal(2);
+        expect(perf.events_.length).to.equal(2);
 
-          return perf.coreServicesAvailable().then(() => {
-            expect(perf.events_.length).to.equal(0);
-          });
+        return perf.coreServicesAvailable().then(() => {
+          expect(perf.events_.length).to.equal(0);
         });
+      });
 
-        it('should forward tick events', () => {
-          return perf.coreServicesAvailable().then(() => {
-            clock.tick(100);
-            perf.tick('start0');
-            perf.tick('start1', 300);
+      it('should forward tick events', () => {
+        return perf.coreServicesAvailable().then(() => {
+          clock.tick(100);
+          perf.tick('start0');
+          perf.tick('start1', 300);
 
-            expect(
-              viewerSendMessageStub.withArgs(
-                'tick',
-                env.sandbox.match((arg) => arg.label == 'start0')
-              ).args[0][1]
-            ).to.be.jsonEqual({
-              label: 'start0',
-              value: timeOrigin + 100,
-            });
-            expect(
-              viewerSendMessageStub.withArgs(
-                'tick',
-                env.sandbox.match((arg) => arg.label == 'start1')
-              ).args[0][1]
-            ).to.be.jsonEqual({
-              label: 'start1',
-              delta: 300,
-            });
+          expect(
+            viewerSendMessageStub.withArgs(
+              'tick',
+              env.sandbox.match((arg) => arg.label == 'start0')
+            ).args[0][1]
+          ).to.be.jsonEqual({
+            label: 'start0',
+            value: timeOrigin + 100,
+          });
+          expect(
+            viewerSendMessageStub.withArgs(
+              'tick',
+              env.sandbox.match((arg) => arg.label == 'start1')
+            ).args[0][1]
+          ).to.be.jsonEqual({
+            label: 'start1',
+            delta: 300,
           });
         });
+      });
 
-        it('should call the flush callback', () => {
-          // Make sure "first visible" arrives after "channel ready".
-          const firstVisiblePromise = new Promise(() => {});
-          env.sandbox
-            .stub(ampdoc, 'whenFirstVisible')
-            .returns(firstVisiblePromise);
+      it('should call the flush callback', () => {
+        // Make sure "first visible" arrives after "channel ready".
+        const firstVisiblePromise = new Promise(() => {});
+        env.sandbox
+          .stub(ampdoc, 'whenFirstVisible')
+          .returns(firstVisiblePromise);
+        expect(viewerSendMessageStub.withArgs('sendCsi')).to.have.callCount(0);
+        // coreServicesAvailable calls flush once.
+        return perf.coreServicesAvailable().then(() => {
           expect(viewerSendMessageStub.withArgs('sendCsi')).to.have.callCount(
-            0
+            1
+          );
+          perf.flush();
+          expect(viewerSendMessageStub.withArgs('sendCsi')).to.have.callCount(
+            2
+          );
+          perf.flush();
+          expect(viewerSendMessageStub.withArgs('sendCsi')).to.have.callCount(
+            3
           );
-          // coreServicesAvailable calls flush once.
-          return perf.coreServicesAvailable().then(() => {
-            expect(viewerSendMessageStub.withArgs('sendCsi')).to.have.callCount(
-              1
-            );
-            perf.flush();
-            expect(viewerSendMessageStub.withArgs('sendCsi')).to.have.callCount(
-              2
-            );
-            perf.flush();
-            expect(viewerSendMessageStub.withArgs('sendCsi')).to.have.callCount(
-              3
-            );
-          });
         });
+      });
 
-        it('should flush with the story experiment enabled', () => {
-          const storyEl = win.document.createElement('amp-story');
-          const bodyEl = win.document.body;
-          bodyEl.insertBefore(storyEl, bodyEl.firstElementChild || null);
-
-          return perf.coreServicesAvailable().then(() => {
-            expect(viewerSendMessageStub.withArgs('sendCsi')).to.have.callCount(
-              1
-            );
-            const call = viewerSendMessageStub.withArgs('sendCsi').getCall(0);
-            expect(call.args[1]).to.have.property('ampexp');
-            expect(call.args[1].ampexp).to.contain('story');
-          });
+      it('should flush with the story experiment enabled', () => {
+        const storyEl = win.document.createElement('amp-story');
+        const bodyEl = win.document.body;
+        bodyEl.insertBefore(storyEl, bodyEl.firstElementChild || null);
+
+        return perf.coreServicesAvailable().then(() => {
+          expect(viewerSendMessageStub.withArgs('sendCsi')).to.have.callCount(
+            1
+          );
+          const call = viewerSendMessageStub.withArgs('sendCsi').getCall(0);
+          expect(call.args[1]).to.have.property('ampexp');
+          expect(call.args[1].ampexp).to.contain('story');
         });
       });
     });
+  });
 
   it('should wait for visible resources', () => {
     const resources = Services.resourcesForDoc(ampdoc);
@@ -877,8 +881,8 @@ describes.realWin('PeformanceObserver metrics', {amp: true}, (env) => {
 
   async function toggleVisibility(perf, on) {
     viewerVisibilityState = on
-      ? VisibilityState.VISIBLE
-      : VisibilityState.HIDDEN;
+      ? VisibilityState_Enum.VISIBLE
+      : VisibilityState_Enum.HIDDEN;
     perf.onAmpDocVisibilityChange_();
   }
 
@@ -1042,7 +1046,11 @@ describes.realWin('PeformanceObserver metrics', {amp: true}, (env) => {
       toggleVisibility(perf, false);
 
       const lcpEvents = perf.events_.filter(({label}) => label === 'lcp');
-      expect(lcpEvents.length).to.equal(1);
+      expect(lcpEvents.length).to.equal(2);
+      expect(lcpEvents).deep.include({
+        label: 'lcp',
+        delta: 12,
+      });
       expect(lcpEvents).deep.include({
         label: 'lcp',
         delta: 23,
@@ -1248,7 +1256,7 @@ describes.realWin('PeformanceObserver metrics', {amp: true}, (env) => {
         },
       });
 
-      viewerVisibilityState = VisibilityState.INACTIVE;
+      viewerVisibilityState = VisibilityState_Enum.INACTIVE;
       perf.onAmpDocVisibilityChange_();
 
       const clsEvents = perf.events_.filter((evt) =>
@@ -1369,6 +1377,140 @@ describes.realWin('PeformanceObserver metrics', {amp: true}, (env) => {
     });
   });
 
+  describe('forwards INP metrics', () => {
+    let PerformanceObserverConstructorStub, performanceObserver;
+    beforeEach(() => {
+      toggleExperiment(env.win, 'interaction-to-next-paint', true);
+
+      // Stub and fake the PerformanceObserver constructor.
+      const PerformanceObserverStub = env.sandbox.stub();
+      PerformanceObserverStub.callsFake((callback) => {
+        performanceObserver = new PerformanceObserverImpl(callback);
+        return performanceObserver;
+      });
+      PerformanceObserverConstructorStub = env.sandbox.stub(
+        env.win,
+        'PerformanceObserver'
+      );
+      PerformanceObserverConstructorStub.callsFake(PerformanceObserverStub);
+    });
+
+    it('after performance service registered', () => {
+      // Pretend that the Navigation API exists.
+      PerformanceObserverConstructorStub.supportedEntryTypes = ['event'];
+
+      installPerformanceService(env.win);
+
+      const perf = Services.performanceFor(env.win);
+      perf.ampdoc_ = env.ampdoc;
+      perf.registerPerformanceObserver_();
+
+      // Fake interaction events.
+      perf.tickInteractionToNextPaint_(38);
+
+      expect(perf.events_.length).to.equal(1);
+      expect(perf.events_).to.be.jsonEqual([
+        {
+          label: 'inp',
+          delta: 38,
+        },
+      ]);
+
+      perf.tickInteractionToNextPaint_(380);
+      expect(perf.events_.length).to.equal(2);
+      expect(perf.events_).to.be.jsonEqual([
+        {
+          label: 'inp',
+          delta: 38,
+        },
+        {
+          label: 'inp',
+          delta: 380 - 38,
+        },
+      ]);
+
+      perf.tickInteractionToNextPaint_(30);
+      expect(perf.events_.length).to.equal(2);
+      expect(perf.events_).to.be.jsonEqual([
+        {
+          label: 'inp',
+          delta: 38,
+        },
+        {
+          label: 'inp',
+          delta: 380 - 38,
+        },
+      ]);
+    });
+  });
+
+  describe('forwards INP metrics', () => {
+    let PerformanceObserverConstructorStub, performanceObserver;
+    beforeEach(() => {
+      // Stub and fake the PerformanceObserver constructor.
+      toggleExperiment(env.win, 'interaction-to-next-paint', true);
+
+      const PerformanceObserverStub = env.sandbox.stub();
+      PerformanceObserverStub.callsFake((callback) => {
+        performanceObserver = new PerformanceObserverImpl(callback);
+        return performanceObserver;
+      });
+      PerformanceObserverConstructorStub = env.sandbox.stub(
+        env.win,
+        'PerformanceObserver'
+      );
+      PerformanceObserverConstructorStub.callsFake(PerformanceObserverStub);
+    });
+
+    it('after performance service registered', () => {
+      // Pretend that the Navigation API exists.
+      PerformanceObserverConstructorStub.supportedEntryTypes = ['event'];
+
+      installPerformanceService(env.win);
+
+      const perf = Services.performanceFor(env.win);
+      perf.ampdoc_ = env.ampdoc;
+      perf.registerPerformanceObserver_();
+
+      // Fake interaction events.
+      perf.tickInteractionToNextPaint_(38);
+
+      expect(perf.events_.length).to.equal(1);
+      expect(perf.events_).to.be.jsonEqual([
+        {
+          label: 'inp',
+          delta: 38,
+        },
+      ]);
+
+      perf.tickInteractionToNextPaint_(380);
+      expect(perf.events_.length).to.equal(2);
+      expect(perf.events_).to.be.jsonEqual([
+        {
+          label: 'inp',
+          delta: 38,
+        },
+        {
+          label: 'inp',
+          delta: 380 - 38,
+        },
+      ]);
+
+      perf.tickInteractionToNextPaint_(30);
+      expect(perf.events_.length).to.equal(2);
+      expect(perf.events_).to.be.jsonEqual([
+        {
+          label: 'inp',
+          delta: 38,
+        },
+        {
+          label: 'inp',
+          delta: 380 - 38,
+        },
+      ]);
+    });
+  });
+
   describe('inabox environment', () => {
     let PerformanceObserverConstructorStub;
 
diff --git a/test/unit/test-position-observer.js b/test/unit/test-position-observer.js
index 301bd4348adf..93b253a6c3c9 100644
--- a/test/unit/test-position-observer.js
+++ b/test/unit/test-position-observer.js
@@ -5,7 +5,7 @@ import {setStyles} from '#core/dom/style';
 
 import {Services} from '#service';
 import {PositionObserver} from '#service/position-observer/position-observer-impl';
-import {PositionObserverFidelity} from '#service/position-observer/position-observer-worker';
+import {PositionObserverFidelity_Enum} from '#service/position-observer/position-observer-worker';
 
 import {macroTask} from '#testing/helpers';
 
@@ -53,16 +53,16 @@ describes.realWin('PositionObserver', {amp: 1}, (env) => {
     describe('API functions includes observe/unobserve/changeFidelity', () => {
       it('should observe identical element and start', () => {
         const spy = env.sandbox.spy(posOb, 'startCallback_');
-        posOb.observe(elem, PositionObserverFidelity.LOW, () => {});
-        posOb.observe(elem1, PositionObserverFidelity.LOW, () => {});
+        posOb.observe(elem, PositionObserverFidelity_Enum.LOW, () => {});
+        posOb.observe(elem1, PositionObserverFidelity_Enum.LOW, () => {});
         expect(posOb.workers_).to.have.length(2);
         expect(spy).to.be.calledOnce;
       });
 
       it('should unobserve and stop', () => {
         const spy = env.sandbox.spy(posOb, 'stopCallback_');
-        posOb.observe(elem, PositionObserverFidelity.LOW, () => {});
-        posOb.observe(elem1, PositionObserverFidelity.LOW, () => {});
+        posOb.observe(elem, PositionObserverFidelity_Enum.LOW, () => {});
+        posOb.observe(elem1, PositionObserverFidelity_Enum.LOW, () => {});
         posOb.unobserve(elem);
         expect(posOb.workers_).to.have.length(1);
         expect(spy).to.not.be.called;
@@ -83,7 +83,7 @@ describes.realWin('PositionObserver', {amp: 1}, (env) => {
       });
       it('should update new position with scroll event', function* () {
         const spy = env.sandbox.spy();
-        posOb.observe(elem, PositionObserverFidelity.HIGH, spy);
+        posOb.observe(elem, PositionObserverFidelity_Enum.HIGH, spy);
         clock.tick(2);
         yield macroTask();
         expect(spy).to.be.calledOnce;
@@ -109,7 +109,7 @@ describes.realWin('PositionObserver', {amp: 1}, (env) => {
 
       it('should not update if element position does not change', function* () {
         const spy = env.sandbox.spy();
-        posOb.observe(elem, PositionObserverFidelity.HIGH, spy);
+        posOb.observe(elem, PositionObserverFidelity_Enum.HIGH, spy);
         yield macroTask();
         expect(spy).to.be.calledOnce;
         win.dispatchEvent(new Event('scroll'));
@@ -134,7 +134,7 @@ describes.realWin('PositionObserver', {amp: 1}, (env) => {
         const sizes = viewport.getSize();
         const spy = env.sandbox.spy();
         top = 1;
-        posOb.observe(elem, PositionObserverFidelity.HIGH, spy);
+        posOb.observe(elem, PositionObserverFidelity_Enum.HIGH, spy);
         yield macroTask();
         expect(spy).to.be.calledWith({
           positionRect: layoutRectLtwh(2, 1, 20, 10),
@@ -172,7 +172,7 @@ describes.realWin('PositionObserver', {amp: 1}, (env) => {
         const viewport = Services.viewportForDoc(ampdoc);
         const sizes = viewport.getSize();
         const spy = env.sandbox.spy();
-        posOb.observe(elem, PositionObserverFidelity.HIGH, spy);
+        posOb.observe(elem, PositionObserverFidelity_Enum.HIGH, spy);
         yield macroTask();
         spy.resetHistory();
         top = -11;
diff --git a/test/unit/test-preconnect.js b/test/unit/test-preconnect.js
index c4359e3d7a73..36e4d5239f8b 100644
--- a/test/unit/test-preconnect.js
+++ b/test/unit/test-preconnect.js
@@ -306,35 +306,31 @@ describes.sandboxed('preconnect', {}, (env) => {
     });
   });
 
-  // TODO(cramforce, #11827): Make this test work on Safari.
-  it.configure()
-    .skipSafari()
-    .skipFirefox()
-    .run('should add links if feature if detected', () => {
-      // Don't stub preload support allow the test to run through the browser
-      // default regardless of support or not.
-      return getPreconnectIframe(/* detectFeatures */ true).then((iframe) => {
-        preconnect.preload(ampdoc, 'https://a.prefetch.com/foo/bar', 'script');
-        preconnect.preload(ampdoc, 'https://a.prefetch.com/foo/bar');
-        preconnect.preload(ampdoc, 'https://a.prefetch.com/other', 'style');
-        preconnect.preload(ampdoc, javascriptUrlPrefix + ':alert()');
+  it('should add links if feature if detected', () => {
+    // Don't stub preload support allow the test to run through the browser
+    // default regardless of support or not.
+    return getPreconnectIframe(/* detectFeatures */ true).then((iframe) => {
+      preconnect.preload(ampdoc, 'https://a.prefetch.com/foo/bar', 'script');
+      preconnect.preload(ampdoc, 'https://a.prefetch.com/foo/bar');
+      preconnect.preload(ampdoc, 'https://a.prefetch.com/other', 'style');
+      preconnect.preload(ampdoc, javascriptUrlPrefix + ':alert()');
+      const fetches = iframe.doc.querySelectorAll('link[rel=preload]');
+      expect(fetches).to.have.length(0);
+      return visiblePromise.then(() => {
+        expect(
+          iframe.doc.querySelectorAll('link[rel=preconnect]')
+        ).to.have.length(1);
+        expect(iframe.doc.querySelector('link[rel=preconnect]').href).to.equal(
+          'https://a.prefetch.com/'
+        );
         const fetches = iframe.doc.querySelectorAll('link[rel=preload]');
-        expect(fetches).to.have.length(0);
-        return visiblePromise.then(() => {
-          expect(
-            iframe.doc.querySelectorAll('link[rel=preconnect]')
-          ).to.have.length(1);
-          expect(
-            iframe.doc.querySelector('link[rel=preconnect]').href
-          ).to.equal('https://a.prefetch.com/');
-          const fetches = iframe.doc.querySelectorAll('link[rel=preload]');
-          expect(fetches).to.have.length(2);
-          expect(fetches[0].href).to.equal('https://a.prefetch.com/foo/bar');
-          expect(fetches[1].href).to.equal('https://a.prefetch.com/other');
-          expect(fetches[0].getAttribute('referrerpolicy')).to.equal('origin');
-        });
+        expect(fetches).to.have.length(2);
+        expect(fetches[0].href).to.equal('https://a.prefetch.com/foo/bar');
+        expect(fetches[1].href).to.equal('https://a.prefetch.com/other');
+        expect(fetches[0].getAttribute('referrerpolicy')).to.equal('origin');
       });
     });
+  });
 
   it('should preload', () => {
     preloadSupported = true;
diff --git a/test/unit/test-purifier.js b/test/unit/test-purifier.js
index 8d4aeb03be20..2cd00822b82c 100644
--- a/test/unit/test-purifier.js
+++ b/test/unit/test-purifier.js
@@ -2,856 +2,866 @@ import {Purifier} from '#purifier';
 
 import * as urlRewrite from '../../src/url-rewrite';
 
-describes.sandboxed
-  .configure()
-  .skipFirefox()
-  .run('DOMPurify-based', {}, (env) => {
-    let purify;
-    let purifyTripleMustache;
-    let rewriteAttributeValueSpy;
-
-    beforeEach(() => {
-      rewriteAttributeValueSpy = env.sandbox.spy(
-        urlRewrite,
-        'rewriteAttributeValue'
-      );
-
-      const purifier = new Purifier(
-        document,
-        {},
-        urlRewrite.rewriteAttributeValue
-      );
-
-      /**
-       * Helper that serializes output of purifyHtml() to string.
-       * @param {string} html
-       * @return {string}
-       */
-      purify = (html) => purifier.purifyHtml(html).innerHTML;
-
-      /**
-       * Helper that calls purifyTagsForTripleMustache().
-       * @param {string} html
-       * @return {string}
-       */
-      purifyTripleMustache = (html) =>
-        purifier.purifyTagsForTripleMustache(html);
-    });
-
-    describe('sanitizer tests', () => {
-      /**
-       * @param {string} html
-       * @return {!NodeList}
-       */
-      function serialize(html) {
-        const div = document.createElement('div');
-        div.innerHTML = html;
-        return div.childNodes;
-      }
+describes.sandboxed('DOMPurify-based', {}, (env) => {
+  let html;
+  let purify;
+  let purifyTripleMustache;
+  let rewriteAttributeValueSpy;
+
+  beforeEach(() => {
+    html = document.createElement('html');
+    const documentEl = {
+      documentElement: html,
+      createElement: (tagName) => document.createElement(tagName),
+    };
+
+    rewriteAttributeValueSpy = env.sandbox.spy(
+      urlRewrite,
+      'rewriteAttributeValue'
+    );
+
+    const purifier = new Purifier(
+      documentEl,
+      {},
+      urlRewrite.rewriteAttributeValue
+    );
+
+    /**
+     * Helper that serializes output of purifyHtml() to string.
+     * @param {string} html
+     * @return {string}
+     */
+    purify = (html) => purifier.purifyHtml(html).innerHTML;
+
+    /**
+     * Helper that calls purifyTagsForTripleMustache().
+     * @param {string} html
+     * @return {string}
+     */
+    purifyTripleMustache = (html) => purifier.purifyTagsForTripleMustache(html);
+  });
 
-      /**
-       * @param {!NodeList} a
-       * @param {!NodeList} b
-       */
-      function expectEqualNodeLists(a, b) {
-        expect(a.length).to.equal(b.length);
-        for (let i = 0; i < a.length; i++) {
-          expect(a[i].isEqualNode(b[i])).to.be.true;
-        }
+  describe('sanitizer tests', () => {
+    /**
+     * @param {string} html
+     * @return {!NodeList}
+     */
+    function serialize(html) {
+      const div = document.createElement('div');
+      div.innerHTML = html;
+      return div.childNodes;
+    }
+
+    /**
+     * @param {!NodeList} a
+     * @param {!NodeList} b
+     */
+    function expectEqualNodeLists(a, b) {
+      expect(a.length).to.equal(b.length);
+      for (let i = 0; i < a.length; i++) {
+        expect(a[i].isEqualNode(b[i])).to.be.true;
       }
+    }
 
-      it('should output basic text', () => {
-        expect(purify('abc')).to.be.equal('abc');
-      });
+    it('should output basic text', () => {
+      expect(purify('abc')).to.be.equal('abc');
+    });
 
-      it('should output valid markup', () => {
-        expect(purify('<h1>abc</h1>')).to.be.equal('<h1>abc</h1>');
-        expect(purify('<h1>a<i>b</i>c</h1>')).to.be.equal(
-          '<h1>a<i>b</i>c</h1>'
-        );
-        expect(purify('<h1>a<i>b</i><br>c</h1>')).to.be.equal(
-          '<h1>a<i>b</i><br>c</h1>'
-        );
-        expect(
-          purify(
-            '<h1>a<i>b</i>c' +
-              '<amp-img src="http://example.com/1.png"></amp-img></h1>'
-          )
-        ).to.be.equal(
+    it('should output valid markup', () => {
+      expect(purify('<h1>abc</h1>')).to.be.equal('<h1>abc</h1>');
+      expect(purify('<h1>a<i>b</i>c</h1>')).to.be.equal('<h1>a<i>b</i>c</h1>');
+      expect(purify('<h1>a<i>b</i><br>c</h1>')).to.be.equal(
+        '<h1>a<i>b</i><br>c</h1>'
+      );
+      expect(
+        purify(
           '<h1>a<i>b</i>c' +
-            '<amp-img src="http://example.com/1.png" i-amphtml-ignore=""></amp-img></h1>'
-        );
-        expect(rewriteAttributeValueSpy).to.be.calledWith(
-          'amp-img',
-          'src',
-          'http://example.com/1.png'
-        );
-      });
-
-      it('should NOT output security-sensitive markup', () => {
-        expect(purify('a<script>b</script>c')).to.be.equal('ac');
-        expect(purify('a<script>b<img>d</script>c')).to.be.equal('ac');
-        expect(purify('a<img>c')).to.be.equal('ac');
-        expect(purify('a<iframe></iframe>c')).to.be.equal('ac');
-        expect(purify('a<frame></frame>c')).to.be.equal('ac');
-        expect(purify('a<video></video>c')).to.be.equal('ac');
-        expect(purify('a<audio></audio>c')).to.be.equal('ac');
-        expect(purify('a<applet></applet>c')).to.be.equal('ac');
-        expect(purify('a<link>c')).to.be.equal('ac');
-        expect(purify('a<meta>c')).to.be.equal('ac');
-      });
-
-      it('should NOT output security-sensitive markup when nested', () => {
-        expect(purify('a<script><style>b</style></script>c')).to.be.equal('ac');
-        expect(purify('a<style><iframe>b</iframe></style>c')).to.be.equal('ac');
-        expect(purify('a<script><img></script>c')).to.be.equal('ac');
-      });
+            '<amp-img src="http://example.com/1.png"></amp-img></h1>'
+        )
+      ).to.be.equal(
+        '<h1>a<i>b</i>c' +
+          '<amp-img src="http://example.com/1.png" i-amphtml-ignore=""></amp-img></h1>'
+      );
+      expect(rewriteAttributeValueSpy).to.be.calledWith(
+        'amp-img',
+        'src',
+        'http://example.com/1.png'
+      );
+    });
 
-      it('should NOT output security-sensitive markup when broken', () => {
-        expect(purify('a<script>bc')).to.be.equal('a');
-        expect(purify('a<SCRIPT>bc')).to.be.equal('a');
-      });
+    it('should NOT output security-sensitive markup', () => {
+      expect(purify('a<script>b</script>c')).to.be.equal('ac');
+      expect(purify('a<script>b<img>d</script>c')).to.be.equal('ac');
+      expect(purify('a<img>c')).to.be.equal('ac');
+      expect(purify('a<iframe></iframe>c')).to.be.equal('ac');
+      expect(purify('a<frame></frame>c')).to.be.equal('ac');
+      expect(purify('a<video></video>c')).to.be.equal('ac');
+      expect(purify('a<audio></audio>c')).to.be.equal('ac');
+      expect(purify('a<applet></applet>c')).to.be.equal('ac');
+      expect(purify('a<link>c')).to.be.equal('ac');
+      expect(purify('a<meta>c')).to.be.equal('ac');
+    });
 
-      it('should output "on" attribute', () => {
-        expect(purify('a<a on="tap:AMP.print">b</a>')).to.be.equal(
-          'a<a on="tap:AMP.print">b</a>'
-        );
-        expect(rewriteAttributeValueSpy.callCount).to.be.equal(1);
-      });
+    it('should NOT output security-sensitive markup when nested', () => {
+      expect(purify('a<script><style>b</style></script>c')).to.be.equal('ac');
+      expect(purify('a<style><iframe>b</iframe></style>c')).to.be.equal('ac');
+      expect(purify('a<script><img></script>c')).to.be.equal('ac');
+    });
 
-      it('should output "data-, aria-, and role" attributes', () => {
-        // Can't use string equality since DOMPurify will reorder attributes.
-        const actual = serialize(
-          purify('<a aria-label="bar" data-foo="bar" role="button">b</a>')
-        );
-        const expected = serialize(
-          '<a aria-label="bar" data-foo="bar" role="button">b</a>'
-        );
-        expectEqualNodeLists(actual, expected);
-        expect(rewriteAttributeValueSpy.callCount).to.be.equal(3);
-      });
+    it('should NOT output security-sensitive markup when broken', () => {
+      expect(purify('a<script>bc')).to.be.equal('a');
+      expect(purify('a<SCRIPT>bc')).to.be.equal('a');
+    });
 
-      it('should output "href" attribute', () => {
-        // Can't use string equality since DOMPurify will reorder attributes.
-        const actual = serialize(purify('a<a href="http://acme.com/">b</a>'));
-        const expected = serialize(
-          'a<a target="_top" href="http://acme.com/">b</a>'
-        );
-        expectEqualNodeLists(actual, expected);
-        expect(rewriteAttributeValueSpy.callCount).to.be.equal(2);
-      });
+    it('should output "on" attribute', () => {
+      expect(purify('a<a on="tap:AMP.print">b</a>')).to.be.equal(
+        'a<a on="tap:AMP.print">b</a>'
+      );
+      expect(rewriteAttributeValueSpy.callCount).to.be.equal(1);
+    });
 
-      it('should allow arbitrary protocols', () => {
-        expect(purify('<a href="foo://bar">link</a>')).to.be.equal(
-          '<a target="_top" href="foo://bar">link</a>'
-        );
-        expect(rewriteAttributeValueSpy.callCount).to.be.equal(2);
-      });
+    it('should output "data-, aria-, and role" attributes', () => {
+      // Can't use string equality since DOMPurify will reorder attributes.
+      const actual = serialize(
+        purify('<a aria-label="bar" data-foo="bar" role="button">b</a>')
+      );
+      const expected = serialize(
+        '<a aria-label="bar" data-foo="bar" role="button">b</a>'
+      );
+      expectEqualNodeLists(actual, expected);
+      expect(rewriteAttributeValueSpy.callCount).to.be.equal(3);
+    });
 
-      it('should output "rel" attribute', () => {
-        // Can't use string equality since DOMPurify will reorder attributes.
-        const actual = serialize(
-          purify('a<a href="http://acme.com/" rel="amphtml">b</a>')
-        );
-        const expected = serialize(
-          'a<a href="http://acme.com/" rel="amphtml" target="_top">b</a>'
-        );
-        expectEqualNodeLists(actual, expected);
-        expect(rewriteAttributeValueSpy.callCount).to.be.equal(3);
-      });
+    it('should output "href" attribute', () => {
+      // Can't use string equality since DOMPurify will reorder attributes.
+      const actual = serialize(purify('a<a href="http://acme.com/">b</a>'));
+      const expected = serialize(
+        'a<a target="_top" href="http://acme.com/">b</a>'
+      );
+      expectEqualNodeLists(actual, expected);
+      expect(rewriteAttributeValueSpy.callCount).to.be.equal(2);
+    });
 
-      it('should output "layout" attribute', () => {
-        expect(purify('<amp-img layout="responsive"></amp-img>')).to.equal(
-          '<amp-img layout="responsive" i-amphtml-ignore=""></amp-img>'
-        );
-        expect(rewriteAttributeValueSpy.callCount).to.be.equal(1);
-      });
+    it('should allow arbitrary protocols', () => {
+      expect(purify('<a href="foo://bar">link</a>')).to.be.equal(
+        '<a target="_top" href="foo://bar">link</a>'
+      );
+      expect(rewriteAttributeValueSpy.callCount).to.be.equal(2);
+    });
 
-      it('should output "media" attribute', () => {
-        expect(
-          purify('<amp-img media="(min-width: 650px)"></amp-img>')
-        ).to.equal(
-          '<amp-img media="(min-width: 650px)" i-amphtml-ignore=""></amp-img>'
-        );
-        expect(rewriteAttributeValueSpy.callCount).to.be.equal(1);
-      });
+    it('should output "rel" attribute', () => {
+      // Can't use string equality since DOMPurify will reorder attributes.
+      const actual = serialize(
+        purify('a<a href="http://acme.com/" rel="amphtml">b</a>')
+      );
+      const expected = serialize(
+        'a<a href="http://acme.com/" rel="amphtml" target="_top">b</a>'
+      );
+      expectEqualNodeLists(actual, expected);
+      expect(rewriteAttributeValueSpy.callCount).to.be.equal(3);
+    });
 
-      it('should output "sizes" attribute', () => {
-        expect(
-          purify('<amp-img sizes="(min-width: 650px) 50vw, 100vw"></amp-img>')
-        ).to.equal(
-          '<amp-img sizes="(min-width: 650px) 50vw, 100vw" i-amphtml-ignore=""></amp-img>'
-        );
-        expect(rewriteAttributeValueSpy.callCount).to.be.equal(1);
-      });
+    it('should output "layout" attribute', () => {
+      expect(purify('<amp-img layout="responsive"></amp-img>')).to.equal(
+        '<amp-img layout="responsive" i-amphtml-ignore=""></amp-img>'
+      );
+      expect(rewriteAttributeValueSpy.callCount).to.be.equal(1);
+    });
 
-      it('should output "heights" attribute', () => {
-        expect(
-          purify('<amp-img heights="(min-width:500px) 200px, 80%"></amp-img>')
-        ).to.equal(
-          '<amp-img heights="(min-width:500px) 200px, 80%" i-amphtml-ignore=""></amp-img>'
-        );
-        expect(rewriteAttributeValueSpy.callCount).to.be.equal(1);
-      });
+    it('should output "media" attribute', () => {
+      expect(purify('<amp-img media="(min-width: 650px)"></amp-img>')).to.equal(
+        '<amp-img media="(min-width: 650px)" i-amphtml-ignore=""></amp-img>'
+      );
+      expect(rewriteAttributeValueSpy.callCount).to.be.equal(1);
+    });
 
-      it('should default target to _top with href', () => {
-        // Can't use string equality since DOMPurify will reorder attributes.
-        const actual = serialize(
-          purify('<a href="">a</a><a href="" target="">c</a>')
-        );
-        const expected = serialize(
-          '<a href="" target="_top">a</a><a href="" target="_top">c</a>'
-        );
-        expectEqualNodeLists(actual, expected);
-      });
+    it('should output "sizes" attribute', () => {
+      expect(
+        purify('<amp-img sizes="(min-width: 650px) 50vw, 100vw"></amp-img>')
+      ).to.equal(
+        '<amp-img sizes="(min-width: 650px) 50vw, 100vw" i-amphtml-ignore=""></amp-img>'
+      );
+      expect(rewriteAttributeValueSpy.callCount).to.be.equal(1);
+    });
 
-      it('should NOT default target to _top w/o href', () => {
-        expect(purify('<a>b</a><a target="">d</a>')).to.equal(
-          '<a>b</a><a target="_top">d</a>'
-        );
-        expect(rewriteAttributeValueSpy.callCount).to.be.equal(1);
-      });
+    it('should output "heights" attribute', () => {
+      expect(
+        purify('<amp-img heights="(min-width:500px) 200px, 80%"></amp-img>')
+      ).to.equal(
+        '<amp-img heights="(min-width:500px) 200px, 80%" i-amphtml-ignore=""></amp-img>'
+      );
+      expect(rewriteAttributeValueSpy.callCount).to.be.equal(1);
+    });
 
-      it('should output a valid target', () => {
-        expect(
-          purify('<a target="_top">a</a><a target="_blank">b</a>')
-        ).to.equal('<a target="_top">a</a><a target="_blank">b</a>');
-        expect(rewriteAttributeValueSpy.callCount).to.be.equal(2);
-      });
+    it('should default target to _top with href', () => {
+      // Can't use string equality since DOMPurify will reorder attributes.
+      const actual = serialize(
+        purify('<a href="">a</a><a href="" target="">c</a>')
+      );
+      const expected = serialize(
+        '<a href="" target="_top">a</a><a href="" target="_top">c</a>'
+      );
+      expectEqualNodeLists(actual, expected);
+    });
 
-      it('should output a valid target in different case', () => {
-        expect(
-          purify('<a target="_TOP">a</a><a target="_BLANK">b</a>')
-        ).to.equal('<a target="_top">a</a><a target="_blank">b</a>');
-        expect(rewriteAttributeValueSpy.callCount).to.be.equal(2);
-      });
+    it('should NOT default target to _top w/o href', () => {
+      expect(purify('<a>b</a><a target="">d</a>')).to.equal(
+        '<a>b</a><a target="_top">d</a>'
+      );
+      expect(rewriteAttributeValueSpy.callCount).to.be.equal(1);
+    });
 
-      it('should override a unallowed target', () => {
-        expect(
-          purify(
-            '<a target="_self">_self</a>' +
-              '<a target="_parent">_parent</a>' +
-              '<a target="_other">_other</a>' +
-              '<a target="_OTHER">_OTHER</a>' +
-              '<a target="other">other</a>'
-          )
-        ).to.equal(
-          '<a target="_top">_self</a>' +
-            '<a target="_top">_parent</a>' +
-            '<a target="_top">_other</a>' +
-            '<a target="_top">_OTHER</a>' +
-            '<a target="_top">other</a>'
-        );
-        expect(rewriteAttributeValueSpy.callCount).to.be.equal(5);
-      });
+    it('should output a valid target', () => {
+      expect(purify('<a target="_top">a</a><a target="_blank">b</a>')).to.equal(
+        '<a target="_top">a</a><a target="_blank">b</a>'
+      );
+      expect(rewriteAttributeValueSpy.callCount).to.be.equal(2);
+    });
 
-      it('should NOT output security-sensitive attributes', () => {
-        allowConsoleError(() => {
-          expect(purify('a<a onclick="alert">b</a>')).to.be.equal('a<a>b</a>');
-          expect(purify('a<a href="javascript:alert">b</a>')).to.be.equal(
-            'a<a target="_top">b</a>'
-          );
-          expect(purify('a<a href=" JAVASCRIPT:alert">b</a>')).to.be.equal(
-            'a<a target="_top">b</a>'
-          );
-          expect(purify('a<a href="vbscript:alert">b</a>')).to.be.equal(
-            'a<a target="_top">b</a>'
-          );
-          expect(purify('a<a href=" VBSCRIPT:alert">b</a>')).to.be.equal(
-            'a<a target="_top">b</a>'
-          );
-          expect(purify('a<a href="data:alert">b</a>')).to.be.equal(
-            'a<a target="_top">b</a>'
-          );
-          expect(purify('a<a href=" DATA:alert">b</a>')).to.be.equal(
-            'a<a target="_top">b</a>'
-          );
-          expect(purify('a<a href="blob:alert">b</a>')).to.be.equal(
-            'a<a target="_top">b</a>'
-          );
-          expect(purify('a<a href=" BLOB:alert">b</a>')).to.be.equal(
-            'a<a target="_top">b</a>'
-          );
-          expect(
-            purify('a<a href="?__amp_source_origin=foo">b</a>')
-          ).to.be.equal('a<a target="_top">b</a>');
-        });
-      });
+    it('should output a valid target in different case', () => {
+      expect(purify('<a target="_TOP">a</a><a target="_BLANK">b</a>')).to.equal(
+        '<a target="_top">a</a><a target="_blank">b</a>'
+      );
+      expect(rewriteAttributeValueSpy.callCount).to.be.equal(2);
+    });
 
-      it('should NOT output denylisted values for class attributes', () => {
-        allowConsoleError(() => {
-          expect(purify('<p class="i-amphtml-">hello</p>')).to.be.equal(
-            '<p>hello</p>'
-          );
-          expect(purify('<p class="i-amphtml-class">hello</p>')).to.be.equal(
-            '<p>hello</p>'
-          );
-          expect(purify('<p class="foo-i-amphtml-bar">hello</p>')).to.be.equal(
-            '<p>hello</p>'
-          );
-          expect(rewriteAttributeValueSpy.callCount).to.be.equal(0);
-        });
-      });
+    it('should override a unallowed target', () => {
+      expect(
+        purify(
+          '<a target="_self">_self</a>' +
+            '<a target="_parent">_parent</a>' +
+            '<a target="_other">_other</a>' +
+            '<a target="_OTHER">_OTHER</a>' +
+            '<a target="other">other</a>'
+        )
+      ).to.equal(
+        '<a target="_top">_self</a>' +
+          '<a target="_top">_parent</a>' +
+          '<a target="_top">_other</a>' +
+          '<a target="_top">_OTHER</a>' +
+          '<a target="_top">other</a>'
+      );
+      expect(rewriteAttributeValueSpy.callCount).to.be.equal(5);
+    });
 
-      it('should allow amp-subscriptions attributes', () => {
-        expect(purify('<div subscriptions-action="login">link</div>')).to.equal(
-          '<div subscriptions-action="login">link</div>'
+    it('should NOT output security-sensitive attributes', () => {
+      allowConsoleError(() => {
+        expect(purify('a<a onclick="alert">b</a>')).to.be.equal('a<a>b</a>');
+        expect(purify('a<a href="javascript:alert">b</a>')).to.be.equal(
+          'a<a target="_top">b</a>'
         );
-        expect(
-          purify('<div subscriptions-section="actions">link</div>')
-        ).to.equal('<div subscriptions-section="actions">link</div>');
-        expect(purify('<div subscriptions-actions="">link</div>')).to.equal(
-          '<div subscriptions-actions="">link</div>'
+        expect(purify('a<a href=" JAVASCRIPT:alert">b</a>')).to.be.equal(
+          'a<a target="_top">b</a>'
         );
-        expect(purify('<div subscriptions-display="">link</div>')).to.equal(
-          '<div subscriptions-display="">link</div>'
+        expect(purify('a<a href="vbscript:alert">b</a>')).to.be.equal(
+          'a<a target="_top">b</a>'
         );
-        expect(purify('<div subscriptions-dialog="">link</div>')).to.equal(
-          '<div subscriptions-dialog="">link</div>'
+        expect(purify('a<a href=" VBSCRIPT:alert">b</a>')).to.be.equal(
+          'a<a target="_top">b</a>'
         );
-        expect(rewriteAttributeValueSpy.callCount).to.be.equal(2);
-      });
-
-      it('should allow source::src with valid protocol', () => {
-        expect(purify('<source src="https://www.foo.com/">')).to.equal(
-          '<source src="https://www.foo.com/">'
+        expect(purify('a<a href="data:alert">b</a>')).to.be.equal(
+          'a<a target="_top">b</a>'
         );
-        expect(rewriteAttributeValueSpy.callCount).to.be.equal(1);
-      });
-
-      // TODO(choumx): HTTPS-only URI attributes are not enforced consistently
-      // in the sanitizer yet. E.g. amp-video requires HTTPS, amp-img does not.
-      // Unskip when this is fixed.
-      it.skip('should not allow source::src with invalid protocol', () => {
-        expect(purify('<source src="http://www.foo.com">')).to.equal(
-          '<source src="">'
+        expect(purify('a<a href=" DATA:alert">b</a>')).to.be.equal(
+          'a<a target="_top">b</a>'
         );
-        expect(purify('<source src="<script>bad()</script>">')).to.equal(
-          '<source src="">'
+        expect(purify('a<a href="blob:alert">b</a>')).to.be.equal(
+          'a<a target="_top">b</a>'
         );
-        expect(rewriteAttributeValueSpy.callCount).to.be.equal(1);
-      });
-
-      it('should allow div::template', () => {
-        expect(purify('<div template="my-template-id"></div>')).to.equal(
-          '<div template="my-template-id"></div>'
-        );
-        expect(rewriteAttributeValueSpy.callCount).to.be.equal(1);
-      });
-
-      it('should allow form::action-xhr', () => {
-        expect(purify('<form action-xhr="https://foo.com"></form>')).to.equal(
-          '<form action-xhr="https://foo.com"></form>'
+        expect(purify('a<a href=" BLOB:alert">b</a>')).to.be.equal(
+          'a<a target="_top">b</a>'
         );
-        expect(rewriteAttributeValueSpy.callCount).to.be.equal(1);
-      });
-
-      it('should allow input::mask-output', () => {
-        expect(purify('<input mask-output="alphanumeric">')).to.equal(
-          '<input mask-output="alphanumeric">'
+        expect(purify('a<a href="?__amp_source_origin=foo">b</a>')).to.be.equal(
+          'a<a target="_top">b</a>'
         );
-        expect(rewriteAttributeValueSpy.callCount).to.be.equal(1);
-      });
-
-      // Need to test this since DOMPurify doesn't offer a API for tag-specific
-      // attribute allowlists. Instead, we hack around it with custom hooks.
-      it('should not allow unsupported attributes after a valid one', () => {
-        const html =
-          '<form action-xhr="https://foo.com"></form>' +
-          '<p action-xhr="https://foo.com"></p>';
-        expect(purify(html)).to.equal(
-          '<form action-xhr="https://foo.com"></form><p></p>'
-        );
-        expect(rewriteAttributeValueSpy.callCount).to.be.equal(2);
       });
+    });
 
-      it('should allow <amp-form>-related attributes', () => {
-        expect(purify('<div submitting></div>')).to.equal(
-          '<div submitting=""></div>'
-        );
-        expect(purify('<div submit-success></div>')).to.equal(
-          '<div submit-success=""></div>'
+    it('should NOT output denylisted values for class attributes', () => {
+      allowConsoleError(() => {
+        expect(purify('<p class="i-amphtml-">hello</p>')).to.be.equal(
+          '<p>hello</p>'
         );
-        expect(purify('<div submit-error></div>')).to.equal(
-          '<div submit-error=""></div>'
+        expect(purify('<p class="i-amphtml-class">hello</p>')).to.be.equal(
+          '<p>hello</p>'
         );
-        expect(purify('<div verify-error></div>')).to.equal(
-          '<div verify-error=""></div>'
+        expect(purify('<p class="foo-i-amphtml-bar">hello</p>')).to.be.equal(
+          '<p>hello</p>'
         );
-        expect(
-          purify('<span visible-when-invalid="valueMissing"></span>')
-        ).to.equal('<span visible-when-invalid="valueMissing"></span>');
-        expect(purify('<span validation-for="form1"></span>')).to.equal(
-          '<span validation-for="form1"></span>'
-        );
-        expect(rewriteAttributeValueSpy.callCount).to.be.equal(2);
+        expect(rewriteAttributeValueSpy.callCount).to.be.equal(0);
       });
+    });
 
-      it('should avoid disallowing default-supported attributes', () => {
-        // We allowlist all attributes of AMP elements, but make sure we don't
-        // remove default-supported attributes from the allowlist afterwards.
-        expect(
-          purify(
-            '<amp-img style="color: red"></amp-img><p style="color: blue"></p>'
-          )
-        ).to.equal(
-          '<amp-img style="color: red" i-amphtml-ignore=""></amp-img><p style="color: blue"></p>'
-        );
-        expect(rewriteAttributeValueSpy.callCount).to.be.equal(2);
-      });
+    it('should allow amp-subscriptions attributes', () => {
+      expect(purify('<div subscriptions-action="login">link</div>')).to.equal(
+        '<div subscriptions-action="login">link</div>'
+      );
+      expect(
+        purify('<div subscriptions-section="actions">link</div>')
+      ).to.equal('<div subscriptions-section="actions">link</div>');
+      expect(purify('<div subscriptions-actions="">link</div>')).to.equal(
+        '<div subscriptions-actions="">link</div>'
+      );
+      expect(purify('<div subscriptions-display="">link</div>')).to.equal(
+        '<div subscriptions-display="">link</div>'
+      );
+      expect(purify('<div subscriptions-dialog="">link</div>')).to.equal(
+        '<div subscriptions-dialog="">link</div>'
+      );
+      expect(rewriteAttributeValueSpy.callCount).to.be.equal(2);
+    });
 
-      it('should allow <amp-lightbox> attributes', () => {
-        expect(purify('<amp-lightbox scrollable></amp-lightbox>')).to.match(
-          /<amp-lightbox scrollable="" i-amphtml-key="(\d+)"><\/amp-lightbox>/
-        );
-      });
+    it('should allow source::src with valid protocol', () => {
+      expect(purify('<source src="https://www.foo.com/">')).to.equal(
+        '<source src="https://www.foo.com/">'
+      );
+      expect(rewriteAttributeValueSpy.callCount).to.be.equal(1);
+    });
 
-      it('should output diff marker attributes for some elements', () => {
-        // Elements with bindings should have [i-amphtml-key=<number>].
-        expect(purify('<p [x]="y"></p>')).to.match(
-          /<p data-amp-bind-x="y" i-amphtml-binding="" i-amphtml-key="(\d+)"><\/p>/
-        );
-        // AMP elements should have [i-amphtml-key=<number>].
-        expect(purify('<amp-pixel></amp-pixel>')).to.match(
-          /<amp-pixel i-amphtml-key="(\d+)"><\/amp-pixel>/
-        );
-        // AMP elements with bindings should have [i-amphtml-key=<number>].
-        expect(purify('<amp-pixel [x]="y"></amp-pixel>')).to.match(
-          /<amp-pixel data-amp-bind-x="y" i-amphtml-binding="" i-amphtml-key="(\d+)"><\/amp-pixel>/
-        );
-        // amp-img should have [i-amphtml-ignore].
-        expect(purify('<amp-img></amp-img>')).to.equal(
-          '<amp-img i-amphtml-ignore=""></amp-img>'
-        );
-        // Other elements should NOT have [i-amphtml-key].
-        expect(purify('<p></p>')).to.equal('<p></p>');
-        expect(rewriteAttributeValueSpy.callCount).to.be.equal(2);
-      });
+    // TODO(choumx): HTTPS-only URI attributes are not enforced consistently
+    // in the sanitizer yet. E.g. amp-video requires HTTPS, amp-img does not.
+    // Unskip when this is fixed.
+    it.skip('should not allow source::src with invalid protocol', () => {
+      expect(purify('<source src="http://www.foo.com">')).to.equal(
+        '<source src="">'
+      );
+      expect(purify('<source src="<script>bad()</script>">')).to.equal(
+        '<source src="">'
+      );
+      expect(rewriteAttributeValueSpy.callCount).to.be.equal(1);
+    });
 
-      it('should resolve URLs', () => {
-        expect(purify('<a href="/path"></a>')).to.match(/http/);
-        expect(purify('<amp-img src="/path"></amp-img>')).to.match(/http/);
-        expect(purify('<amp-img srcset="/path"></amp-img>')).to.match(/http/);
-      });
+    it('should allow div::template', () => {
+      expect(purify('<div template="my-template-id"></div>')).to.equal(
+        '<div template="my-template-id"></div>'
+      );
+      expect(rewriteAttributeValueSpy.callCount).to.be.equal(1);
     });
 
-    describe('purifyTagsForTripleMustache()', () => {
-      it('should output basic text', () => {
-        expect(purifyTripleMustache('abc')).to.be.equal('abc');
-      });
+    it('should allow form::action-xhr', () => {
+      expect(purify('<form action-xhr="https://foo.com"></form>')).to.equal(
+        '<form action-xhr="https://foo.com"></form>'
+      );
+      expect(rewriteAttributeValueSpy.callCount).to.be.equal(1);
+    });
 
-      it('should output HTML entities', () => {
-        const entity = '&lt;tag&gt;';
-        expect(purifyTripleMustache(entity)).to.be.equal(entity);
-        // DOMPurify short-circuits when there are no '<' characters.
-        expect(purifyTripleMustache(`<p>${entity}</p>`)).to.be.equal(
-          `<p>${entity}</p>`
-        );
-      });
+    it('should allow input::mask-output', () => {
+      expect(purify('<input mask-output="alphanumeric">')).to.equal(
+        '<input mask-output="alphanumeric">'
+      );
+      expect(rewriteAttributeValueSpy.callCount).to.be.equal(1);
+    });
 
-      it('should output valid markup', () => {
-        expect(purifyTripleMustache('<b>abc</b>')).to.be.equal('<b>abc</b>');
-        expect(purifyTripleMustache('<b>ab<br>c</b>')).to.be.equal(
-          '<b>ab<br>c</b>'
-        );
-        expect(purifyTripleMustache('<b>a<i>b</i>c</b>')).to.be.equal(
-          '<b>a<i>b</i>c</b>'
-        );
-        const markupWithClassAttribute = '<p class="some-class">heading</p>';
-        expect(purifyTripleMustache(markupWithClassAttribute)).to.be.equal(
-          markupWithClassAttribute
-        );
-        const markupWithClassesAttribute =
-          '<div class="some-class another"><span>heading</span></div>';
-        expect(purifyTripleMustache(markupWithClassesAttribute)).to.be.equal(
-          markupWithClassesAttribute
-        );
-        const markupParagraph = '<p class="valid-class">paragraph</p>';
-        expect(purifyTripleMustache(markupParagraph)).to.be.equal(
-          markupParagraph
-        );
-      });
+    // Need to test this since DOMPurify doesn't offer a API for tag-specific
+    // attribute allowlists. Instead, we hack around it with custom hooks.
+    it('should not allow unsupported attributes after a valid one', () => {
+      const html =
+        '<form action-xhr="https://foo.com"></form>' +
+        '<p action-xhr="https://foo.com"></p>';
+      expect(purify(html)).to.equal(
+        '<form action-xhr="https://foo.com"></form><p></p>'
+      );
+      expect(rewriteAttributeValueSpy.callCount).to.be.equal(2);
+    });
 
-      it('should NOT output non-allowlisted markup', () => {
-        expect(purifyTripleMustache('a<style>b</style>c')).to.be.equal('ac');
-        expect(purifyTripleMustache('a<img>c')).to.be.equal('ac');
-      });
+    it('should allow <amp-form>-related attributes', () => {
+      expect(purify('<div submitting></div>')).to.equal(
+        '<div submitting=""></div>'
+      );
+      expect(purify('<div submit-success></div>')).to.equal(
+        '<div submit-success=""></div>'
+      );
+      expect(purify('<div submit-error></div>')).to.equal(
+        '<div submit-error=""></div>'
+      );
+      expect(purify('<div verify-error></div>')).to.equal(
+        '<div verify-error=""></div>'
+      );
+      expect(
+        purify('<span visible-when-invalid="valueMissing"></span>')
+      ).to.equal('<span visible-when-invalid="valueMissing"></span>');
+      expect(purify('<span validation-for="form1"></span>')).to.equal(
+        '<span validation-for="form1"></span>'
+      );
+      expect(rewriteAttributeValueSpy.callCount).to.be.equal(2);
+    });
 
-      it('should compensate for broken markup', () => {
-        expect(purifyTripleMustache('<b>a<i>b')).to.be.equal(
-          '<b>a<i>b</i></b>'
-        );
-      });
+    it('should avoid disallowing default-supported attributes', () => {
+      // We allowlist all attributes of AMP elements, but make sure we don't
+      // remove default-supported attributes from the allowlist afterwards.
+      expect(
+        purify(
+          '<amp-img style="color: red"></amp-img><p style="color: blue"></p>'
+        )
+      ).to.equal(
+        '<amp-img style="color: red" i-amphtml-ignore=""></amp-img><p style="color: blue"></p>'
+      );
+      expect(rewriteAttributeValueSpy.callCount).to.be.equal(2);
+    });
 
-      it('should support list tags', () => {
-        const html = '<ol><li></li></ol><ul></ul>';
-        expect(purifyTripleMustache(html)).to.be.equal(html);
-      });
+    it('should allow <amp-lightbox> attributes', () => {
+      expect(purify('<amp-lightbox scrollable></amp-lightbox>')).to.match(
+        /<amp-lightbox scrollable="" i-amphtml-key="(\d+)"><\/amp-lightbox>/
+      );
+    });
 
-      it('should allowlist formatting related elements', () => {
-        const nonAllowlistedTag = '<img>';
-        const allowlistedFormattingTags =
-          '<b>abc</b><div>def</div>' +
-          '<br><code></code><del></del><em></em>' +
-          '<i></i><ins></ins><mark></mark><s></s>' +
-          '<small></small><strong></strong><sub></sub>' +
-          '<sup></sup><time></time><u></u><hr>';
-        const html = `${allowlistedFormattingTags}${nonAllowlistedTag}`;
-        // Expect the purifier to unescape the allowlisted tags and to sanitize
-        // and remove the img tag.
-        expect(purifyTripleMustache(html)).to.be.equal(
-          allowlistedFormattingTags
-        );
-      });
+    it('should output diff marker attributes for some elements', () => {
+      // Elements with bindings should have [i-amphtml-key=<number>].
+      expect(purify('<p [x]="y"></p>')).to.match(
+        /<p data-amp-bind-x="y" i-amphtml-binding="" i-amphtml-key="(\d+)"><\/p>/
+      );
+      // AMP elements should have [i-amphtml-key=<number>].
+      expect(purify('<amp-pixel></amp-pixel>')).to.match(
+        /<amp-pixel i-amphtml-key="(\d+)"><\/amp-pixel>/
+      );
+      // AMP elements with bindings should have [i-amphtml-key=<number>].
+      expect(purify('<amp-pixel [x]="y"></amp-pixel>')).to.match(
+        /<amp-pixel data-amp-bind-x="y" i-amphtml-binding="" i-amphtml-key="(\d+)"><\/amp-pixel>/
+      );
+      // amp-img should have [i-amphtml-ignore].
+      expect(purify('<amp-img></amp-img>')).to.equal(
+        '<amp-img i-amphtml-ignore=""></amp-img>'
+      );
+      // Other elements should NOT have [i-amphtml-key].
+      expect(purify('<p></p>')).to.equal('<p></p>');
+      expect(rewriteAttributeValueSpy.callCount).to.be.equal(2);
+    });
 
-      it('should allowlist h1, h2, h3 and amp-img elements', () => {
-        const html =
-          '<h1>Heading 1</h1>' +
-          '<h2>Heading 2</h2>' +
-          '<h3>Heading 3</h3>' +
-          '<amp-img></amp-img>';
-        expect(purifyTripleMustache(html)).to.be.equal(html);
-      });
+    it('should resolve URLs', () => {
+      expect(purify('<a href="/path"></a>')).to.match(/http/);
+      expect(purify('<amp-img src="/path"></amp-img>')).to.match(/http/);
+      expect(purify('<amp-img srcset="/path"></amp-img>')).to.match(/http/);
+    });
+  });
 
-      it('should allowlist table related elements and anchor tags', () => {
-        const html =
-          '<table class="valid-class">' +
-          '<colgroup><col><col></colgroup>' +
-          '<caption>caption</caption>' +
-          '<thead><tr><th colspan="2">header</th></tr></thead>' +
-          '<tbody><tr><td>' +
-          '<a href="http://www.google.com">google</a>' +
-          '</td></tr></tbody>' +
-          '<tfoot><tr>' +
-          '<td colspan="2"><span>footer</span></td>' +
-          '</tr></tfoot>' +
-          '</table>';
-        expect(purifyTripleMustache(html)).to.be.equal(html);
-      });
+  describe('purifyTagsForTripleMustache()', () => {
+    it('should output basic text', () => {
+      expect(purifyTripleMustache('abc')).to.be.equal('abc');
+    });
 
-      it('should allowlist container elements', () => {
-        const html =
-          '<article>Article</article>' +
-          '<aside></aside>' +
-          '<blockquote>A quote</blockquote>' +
-          '<details></details>' +
-          '<figcaption></figcaption>' +
-          '<figure></figure>' +
-          '<footer>Footer</footer>' +
-          '<header></header>' +
-          '<main class="content"></main>' +
-          '<nav></nav>' +
-          '<pre></pre>' +
-          '<section id="sec"></section>' +
-          '<summary></summary>';
-        expect(purifyTripleMustache(html)).to.be.equal(html);
-      });
+    it('should output HTML entities', () => {
+      const entity = '&lt;tag&gt;';
+      expect(purifyTripleMustache(entity)).to.be.equal(entity);
+      // DOMPurify short-circuits when there are no '<' characters.
+      expect(purifyTripleMustache(`<p>${entity}</p>`)).to.be.equal(
+        `<p>${entity}</p>`
+      );
+    });
 
-      it('should sanitize tags, removing unsafe attributes', () => {
-        const html =
-          '<a href="javascript:alert(\'XSS\')">test</a>' +
-          '<img src="x" onerror="alert(\'XSS\')" />';
-        expect(purifyTripleMustache(html)).to.be.equal('<a>test</a>');
-      });
+    it('should output valid markup', () => {
+      expect(purifyTripleMustache('<b>abc</b>')).to.be.equal('<b>abc</b>');
+      expect(purifyTripleMustache('<b>ab<br>c</b>')).to.be.equal(
+        '<b>ab<br>c</b>'
+      );
+      expect(purifyTripleMustache('<b>a<i>b</i>c</b>')).to.be.equal(
+        '<b>a<i>b</i>c</b>'
+      );
+      const markupWithClassAttribute = '<p class="some-class">heading</p>';
+      expect(purifyTripleMustache(markupWithClassAttribute)).to.be.equal(
+        markupWithClassAttribute
+      );
+      const markupWithClassesAttribute =
+        '<div class="some-class another"><span>heading</span></div>';
+      expect(purifyTripleMustache(markupWithClassesAttribute)).to.be.equal(
+        markupWithClassesAttribute
+      );
+      const markupParagraph = '<p class="valid-class">paragraph</p>';
+      expect(purifyTripleMustache(markupParagraph)).to.be.equal(
+        markupParagraph
+      );
+    });
+
+    it('should NOT output non-allowlisted markup', () => {
+      expect(purifyTripleMustache('a<style>b</style>c')).to.be.equal('ac');
+      expect(purifyTripleMustache('a<img>c')).to.be.equal('ac');
+    });
 
-      describe('should sanitize `style` attribute', () => {
-        it('should allow valid styles', () => {
-          expect(purify('<div style="color:blue">Test</div>')).to.equal(
-            '<div style="color:blue">Test</div>'
+    it('should compensate for broken markup', () => {
+      expect(purifyTripleMustache('<b>a<i>b')).to.be.equal('<b>a<i>b</i></b>');
+    });
+
+    it('should support list tags', () => {
+      const html = '<ol><li></li></ol><ul></ul>';
+      expect(purifyTripleMustache(html)).to.be.equal(html);
+    });
+
+    ['amp', 'amp4email'].forEach((format) => {
+      describe(`with ${format} format`, () => {
+        beforeEach(() => {
+          html.setAttribute(format, '');
+        });
+
+        it('should allowlist formatting related elements', () => {
+          const nonAllowlistedTag = '<img>';
+          const allowlistedFormattingTags =
+            '<b>abc</b><div>def</div>' +
+            '<br><code></code><del></del><em></em>' +
+            '<i></i><ins></ins><mark></mark><s></s>' +
+            '<small></small><strong></strong><sub></sub>' +
+            '<sup></sup><time></time><u></u><hr>';
+          const html = `${allowlistedFormattingTags}${nonAllowlistedTag}`;
+          // Expect the purifier to unescape the allowlisted tags and to
+          // sanitize and remove the img tag.
+          expect(purifyTripleMustache(html)).to.be.equal(
+            allowlistedFormattingTags
           );
         });
 
-        it('should ignore styles containing `!important`', () => {
-          allowConsoleError(() => {
-            expect(
-              purify('<div style="color:blue!important">Test</div>')
-            ).to.equal('<div>Test</div>');
-          });
+        it('should allowlist h1, h2 and h3 elements', () => {
+          const html = '<h1>Heading 1</h1><h2>Heading 2</h2><h3>Heading 3</h3>';
+          expect(purifyTripleMustache(html)).to.be.equal(html);
         });
 
-        it('should ignore styles containing `position:fixed`', () => {
-          allowConsoleError(() => {
-            expect(purify('<div style="position:fixed">Test</div>')).to.equal(
-              '<div>Test</div>'
-            );
-          });
+        it('should allowlist table related elements and anchor tags', () => {
+          const html =
+            '<table class="valid-class">' +
+            '<colgroup><col><col></colgroup>' +
+            '<caption>caption</caption>' +
+            '<thead><tr><th colspan="2">header</th></tr></thead>' +
+            '<tbody><tr><td>' +
+            '<a href="http://www.google.com">google</a>' +
+            '</td></tr></tbody>' +
+            '<tfoot><tr>' +
+            '<td colspan="2"><span>footer</span></td>' +
+            '</tr></tfoot>' +
+            '</table>';
+          expect(purifyTripleMustache(html)).to.be.equal(html);
         });
 
-        it('should ignore styles containing `position:sticky`', () => {
-          allowConsoleError(() => {
-            expect(purify('<div style="position:sticky">Test</div>')).to.equal(
-              '<div>Test</div>'
-            );
-          });
+        it('should allowlist container elements', () => {
+          const html =
+            '<article>Article</article>' +
+            '<aside></aside>' +
+            '<blockquote>A quote</blockquote>' +
+            '<details></details>' +
+            '<figcaption></figcaption>' +
+            '<figure></figure>' +
+            '<footer>Footer</footer>' +
+            '<header></header>' +
+            '<main class="content"></main>' +
+            '<nav></nav>' +
+            '<pre></pre>' +
+            '<section id="sec"></section>' +
+            '<summary></summary>';
+          expect(purifyTripleMustache(html)).to.be.equal(html);
         });
       });
     });
 
-    describe('<script>', () => {
-      it('should not allow plain <script> tags', () => {
-        expect(purify('<script>alert(1)</script>')).to.equal('');
-      });
+    it('should allowlist amp-img element', () => {
+      html.setAttribute('amp', '');
+      const markup = '<amp-img></amp-img>';
+      expect(purifyTripleMustache(markup)).to.be.equal(markup);
+    });
 
-      it('should not allow script[type="text/javascript"]', () => {
-        expect(
-          purify('<script type="text/javascript">alert(1)</script>')
-        ).to.equal('');
-      });
+    it('should not allowlist amp-img element for AMP4Email', () => {
+      html.setAttribute('amp4email', '');
+      const markup = '<amp-img></amp-img>';
+      expect(purifyTripleMustache(markup)).to.be.empty;
+    });
 
-      it('should not allow script[type="application/javascript"]', () => {
-        const html = '<script type="application/javascript">alert(1)</script>';
-        expect(purify(html)).to.equal('');
+    it('should sanitize tags, removing unsafe attributes', () => {
+      const html =
+        '<a href="javascript:alert(\'XSS\')">test</a>' +
+        '<img src="x" onerror="alert(\'XSS\')" />';
+      expect(purifyTripleMustache(html)).to.be.equal('<a>test</a>');
+    });
+
+    describe('should sanitize `style` attribute', () => {
+      it('should allow valid styles', () => {
+        expect(purify('<div style="color:blue">Test</div>')).to.equal(
+          '<div style="color:blue">Test</div>'
+        );
       });
 
-      it('should allow script[type="application/json"]', () => {
-        const html = '<script type="application/json">{}</script>';
-        expect(purify(html)).to.equal(html);
+      it('should ignore styles containing `!important`', () => {
+        allowConsoleError(() => {
+          expect(
+            purify('<div style="color:blue!important">Test</div>')
+          ).to.equal('<div>Test</div>');
+        });
       });
 
-      it('should allow script[type="application/ld+json"]', () => {
-        const html = '<script type="application/ld+json">{}</script>';
-        expect(purify(html)).to.equal(html);
+      it('should ignore styles containing `position:fixed`', () => {
+        allowConsoleError(() => {
+          expect(purify('<div style="position:fixed">Test</div>')).to.equal(
+            '<div>Test</div>'
+          );
+        });
       });
 
-      it('should not allow insecure <script> tags around secure ones', () => {
-        const html = '<script type="application/json">{}</script>';
-        // Should not allow an insecure tag following a secure one.
-        expect(purify(html + '<script>alert(1)</script>')).to.equal(html);
-        // Should not allow an insecure tag preceding a secure one.
-        expect(purify('<script>alert(1)</script>' + html)).to.equal(html);
-        // Should not allow an insecure tag containing a secure one.
-        expect(
-          purify(
-            '<script>alert(1)' +
-              '<script type="application/json">{}</script></script>'
-          )
-        ).to.equal('');
+      it('should ignore styles containing `position:sticky`', () => {
+        allowConsoleError(() => {
+          expect(purify('<div style="position:sticky">Test</div>')).to.equal(
+            '<div>Test</div>'
+          );
+        });
       });
     });
+  });
 
-    describe('for <amp-bind>', () => {
-      it('should rewrite [text] and [class] attributes', () => {
-        expect(purify('<p [text]="foo"></p>')).to.match(
-          /<p data-amp-bind-text="foo" i-amphtml-binding="" i-amphtml-key="(\d+)"><\/p>/
-        );
-        expect(purify('<p [class]="bar"></p>')).to.match(
-          /<p data-amp-bind-class="bar" i-amphtml-binding="" i-amphtml-key="(\d+)"><\/p>/
-        );
-      });
+  describe('<script>', () => {
+    it('should not allow plain <script> tags', () => {
+      expect(purify('<script>alert(1)</script>')).to.equal('');
+    });
 
-      it('should add "i-amphtml-binding" for data-amp-bind-*', () => {
-        expect(purify('<p data-amp-bind-text="foo"></p>')).to.match(
-          /<p i-amphtml-binding="" data-amp-bind-text="foo" i-amphtml-key="(\d+)"><\/p>/
-        );
-      });
+    it('should not allow script[type="text/javascript"]', () => {
+      expect(
+        purify('<script type="text/javascript">alert(1)</script>')
+      ).to.equal('');
+    });
 
-      it('should NOT rewrite values of binding attributes', () => {
-        // Should not change "foo.bar".
-        expect(purify('<a [href]="foo.bar">link</a>')).to.match(
-          /<a data-amp-bind-href="foo.bar" i-amphtml-binding="" i-amphtml-key="(\d+)">link<\/a>/
-        );
-      });
+    it('should not allow script[type="application/javascript"]', () => {
+      const html = '<script type="application/javascript">alert(1)</script>';
+      expect(purify(html)).to.equal('');
     });
 
-    describe('structured data', () => {
-      it('[itemprop] global attribute', () => {
-        const h1 = '<h1 itemprop="foo">h1</h1>';
-        expect(purify(h1)).to.equal(h1);
+    it('should allow script[type="application/json"]', () => {
+      const html = '<script type="application/json">{}</script>';
+      expect(purify(html)).to.equal(html);
+    });
 
-        const span = '<span itemprop="bar">span</span>';
-        expect(purify(span)).to.equal(span);
+    it('should allow script[type="application/ld+json"]', () => {
+      const html = '<script type="application/ld+json">{}</script>';
+      expect(purify(html)).to.equal(html);
+    });
 
-        const a = '<a itemprop="baz">a</a>';
-        expect(purify(a)).to.equal(a);
-      });
+    it('should not allow insecure <script> tags around secure ones', () => {
+      const html = '<script type="application/json">{}</script>';
+      // Should not allow an insecure tag following a secure one.
+      expect(purify(html + '<script>alert(1)</script>')).to.equal(html);
+      // Should not allow an insecure tag preceding a secure one.
+      expect(purify('<script>alert(1)</script>' + html)).to.equal(html);
+      // Should not allow an insecure tag containing a secure one.
+      expect(
+        purify(
+          '<script>alert(1)' +
+            '<script type="application/json">{}</script></script>'
+        )
+      ).to.equal('');
     });
+  });
 
-    // Select SVG XSS tests from https://html5sec.org/#svg.
-    describe('SVG', () => {
-      it('should prevent XSS via <G> tag and onload attribute', () => {
-        const svg =
-          '<svg xmlns="http://www.w3.org/2000/svg">' +
-          '<g onload="javascript:alert(1)"></g></svg>';
-        expect(purify(svg)).to.equal(
-          '<svg xmlns="http://www.w3.org/2000/svg"><g></g></svg>'
-        );
-      });
+  describe('for <amp-bind>', () => {
+    it('should rewrite [text] and [class] attributes', () => {
+      expect(purify('<p [text]="foo"></p>')).to.match(
+        /<p data-amp-bind-text="foo" i-amphtml-binding="" i-amphtml-key="(\d+)"><\/p>/
+      );
+      expect(purify('<p [class]="bar"></p>')).to.match(
+        /<p data-amp-bind-class="bar" i-amphtml-binding="" i-amphtml-key="(\d+)"><\/p>/
+      );
+    });
 
-      it('should prevent XSS via <SCRIPT> tag', () => {
-        const svg =
-          '<svg xmlns="http://www.w3.org/2000/svg">' +
-          '<script>alert(1)</script></svg>';
-        expect(purify(svg)).to.equal(
-          '<svg xmlns="http://www.w3.org/2000/svg"></svg>'
-        );
-      });
+    it('should add "i-amphtml-binding" for data-amp-bind-*', () => {
+      expect(purify('<p data-amp-bind-text="foo"></p>')).to.match(
+        /<p i-amphtml-binding="" data-amp-bind-text="foo" i-amphtml-key="(\d+)"><\/p>/
+      );
+    });
 
-      it(
-        'should prevent automatic execution of onload attribute without other ' +
-          'SVG elements',
-        () => {
-          const svg =
-            '<svg onload="javascript:alert(1)" ' +
-            'xmlns="http://www.w3.org/2000/svg"></svg>';
-          expect(purify(svg)).to.equal(
-            '<svg xmlns="http://www.w3.org/2000/svg"></svg>'
-          );
-        }
+    it('should NOT rewrite values of binding attributes', () => {
+      // Should not change "foo.bar".
+      expect(purify('<a [href]="foo.bar">link</a>')).to.match(
+        /<a data-amp-bind-href="foo.bar" i-amphtml-binding="" i-amphtml-key="(\d+)">link<\/a>/
       );
+    });
+  });
 
-      it('should prevent simple passive XSS via XLink', () => {
-        const svg =
-          '<svg xmlns="http://www.w3.org/2000/svg">' +
-          '<a xmlns:xlink="http://www.w3.org/1999/xlink" ' +
-          'xlink:href="javascript:alert(1)">' +
-          '<rect width="1000" height="1000" fill="white"/></a></svg>';
-        expect(purify(svg)).to.equal(
-          '<svg xmlns="http://www.w3.org/2000/svg">' +
-            '<a xmlns:xlink="http://www.w3.org/1999/xlink">' +
-            '<rect fill="white" height="1000" width="1000"></rect></a></svg>'
-        );
-      });
+  describe('structured data', () => {
+    it('[itemprop] global attribute', () => {
+      const h1 = '<h1 itemprop="foo">h1</h1>';
+      expect(purify(h1)).to.equal(h1);
+
+      const span = '<span itemprop="bar">span</span>';
+      expect(purify(span)).to.equal(span);
 
-      it('should prevent XSS via "from" attribute in SVG and inline-SVG', () => {
+      const a = '<a itemprop="baz">a</a>';
+      expect(purify(a)).to.equal(a);
+    });
+  });
+
+  // Select SVG XSS tests from https://html5sec.org/#svg.
+  describe('SVG', () => {
+    it('should prevent XSS via <G> tag and onload attribute', () => {
+      const svg =
+        '<svg xmlns="http://www.w3.org/2000/svg">' +
+        '<g onload="javascript:alert(1)"></g></svg>';
+      expect(purify(svg)).to.equal(
+        '<svg xmlns="http://www.w3.org/2000/svg"><g></g></svg>'
+      );
+    });
+
+    it('should prevent XSS via <SCRIPT> tag', () => {
+      const svg =
+        '<svg xmlns="http://www.w3.org/2000/svg">' +
+        '<script>alert(1)</script></svg>';
+      expect(purify(svg)).to.equal(
+        '<svg xmlns="http://www.w3.org/2000/svg"></svg>'
+      );
+    });
+
+    it(
+      'should prevent automatic execution of onload attribute without other ' +
+        'SVG elements',
+      () => {
         const svg =
-          '<svg>' +
-          '<a xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="?">' +
-          '<circle r="400"></circle>' +
-          '<animate attributeName="xlink:href" begin="0" ' +
-          'from="javascript:alert(1)" to="&" />' +
-          '</a></svg>';
+          '<svg onload="javascript:alert(1)" ' +
+          'xmlns="http://www.w3.org/2000/svg"></svg>';
         expect(purify(svg)).to.equal(
-          '<svg><a xlink:href="?" xmlns:xlink="http://www.w3.org/1999/xlink">' +
-            '<circle r="400"></circle></a></svg>'
+          '<svg xmlns="http://www.w3.org/2000/svg"></svg>'
         );
-      });
+      }
+    );
+
+    it('should prevent simple passive XSS via XLink', () => {
+      const svg =
+        '<svg xmlns="http://www.w3.org/2000/svg">' +
+        '<a xmlns:xlink="http://www.w3.org/1999/xlink" ' +
+        'xlink:href="javascript:alert(1)">' +
+        '<rect width="1000" height="1000" fill="white"/></a></svg>';
+      expect(purify(svg)).to.equal(
+        '<svg xmlns="http://www.w3.org/2000/svg">' +
+          '<a xmlns:xlink="http://www.w3.org/1999/xlink">' +
+          '<rect fill="white" height="1000" width="1000"></rect></a></svg>'
+      );
+    });
 
-      it('should output <use> only if href is relative', () => {
-        allowConsoleError(() => {
-          const href =
-            '<svg xmlns="http://www.w3.org/2000/svg"><use href="#foo"></use></svg>';
-          expect(purify(href)).to.equal(href);
+    it('should prevent XSS via "from" attribute in SVG and inline-SVG', () => {
+      const svg =
+        '<svg>' +
+        '<a xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="?">' +
+        '<circle r="400"></circle>' +
+        '<animate attributeName="xlink:href" begin="0" ' +
+        'from="javascript:alert(1)" to="&" />' +
+        '</a></svg>';
+      expect(purify(svg)).to.equal(
+        '<svg><a xlink:href="?" xmlns:xlink="http://www.w3.org/1999/xlink">' +
+          '<circle r="400"></circle></a></svg>'
+      );
+    });
 
-          const xlink =
-            '<svg xmlns="http://www.w3.org/2000/svg"><use xlink:href="#foo"></use></svg>';
-          expect(purify(xlink)).to.equal(xlink);
+    it('should output <use> only if href is relative', () => {
+      allowConsoleError(() => {
+        const href =
+          '<svg xmlns="http://www.w3.org/2000/svg"><use href="#foo"></use></svg>';
+        expect(purify(href)).to.equal(href);
 
-          expect(
-            purify(
-              '<svg xmlns="http://www.w3.org/2000/svg"><use href="//evil"></svg>'
-            )
-          ).to.equal('<svg xmlns="http://www.w3.org/2000/svg"></svg>');
-          expect(
-            purify(
-              '<svg xmlns="http://www.w3.org/2000/svg"><use xlink:href="//evil"></svg>'
-            )
-          ).to.equal('<svg xmlns="http://www.w3.org/2000/svg"></svg>');
-        });
+        const xlink =
+          '<svg xmlns="http://www.w3.org/2000/svg"><use xlink:href="#foo"></use></svg>';
+        expect(purify(xlink)).to.equal(xlink);
+
+        expect(
+          purify(
+            '<svg xmlns="http://www.w3.org/2000/svg"><use href="//evil"></svg>'
+          )
+        ).to.equal('<svg xmlns="http://www.w3.org/2000/svg"></svg>');
+        expect(
+          purify(
+            '<svg xmlns="http://www.w3.org/2000/svg"><use xlink:href="//evil"></svg>'
+          )
+        ).to.equal('<svg xmlns="http://www.w3.org/2000/svg"></svg>');
       });
     });
   });
+});
 
-describes.sandboxed
-  .configure()
-  .skipFirefox()
-  .run('DOMPurify-based, custom html', {}, () => {
-    let html;
-    let purify;
-
-    before(() => {
-      html = document.createElement('html');
-      const doc = {
-        documentElement: html,
-        createElement: (tagName) => document.createElement(tagName),
-      };
-
-      const purifier = () => new Purifier(doc);
-
-      /**
-       * Helper that serializes output of purifyHtml() to string.
-       * @param {string} html
-       * @return {string}
-       */
-      purify = (html) => purifier().purifyHtml(html).innerHTML;
-    });
-
-    describe('AMP formats', () => {
-      it('should denylist input[type="image"] and input[type="button"] in AMP', () => {
-        // Given the AMP format type.
-        html.setAttribute('amp', '');
-        allowConsoleError(() => {
-          expect(purify('<input type="image">')).to.equal('<input>');
-          expect(purify('<input type="button">')).to.equal('<input>');
-        });
-      });
+describes.sandboxed('DOMPurify-based, custom html', {}, () => {
+  let html;
+  let purify;
+
+  before(() => {
+    html = document.createElement('html');
+    const doc = {
+      documentElement: html,
+      createElement: (tagName) => document.createElement(tagName),
+    };
+
+    const purifier = () => new Purifier(doc);
+
+    /**
+     * Helper that serializes output of purifyHtml() to string.
+     * @param {string} html
+     * @return {string}
+     */
+    purify = (html) => purifier().purifyHtml(html).innerHTML;
+  });
 
-      it('should allow input[type="file"] and input[type="password"]', () => {
-        // Given that the AMP format does not denylist input types file and
-        // password.
-        html.setAttribute('amp', '');
-        expect(purify('<input type="file">')).to.equal('<input type="file">');
-        expect(purify('<input type="password">')).to.equal(
-          '<input type="password">'
-        );
+  describe('AMP formats', () => {
+    it('should denylist input[type="image"] and input[type="button"] in AMP', () => {
+      // Given the AMP format type.
+      html.setAttribute('amp', '');
+      allowConsoleError(() => {
+        expect(purify('<input type="image">')).to.equal('<input>');
+        expect(purify('<input type="button">')).to.equal('<input>');
       });
+    });
 
-      it('should sanitize certain tag attributes for AMP4Email', () => {
-        html.setAttribute('amp4email', '');
-        allowConsoleError(() => {
-          expect(purify('<input type="password">')).to.equal('<input>');
-          expect(purify('<input type="file">')).to.equal('<input>');
-          expect(purify('<form name="form-name"></form>')).to.equal(
-            '<form></form>'
-          );
-          expect(purify('<amp-anim controls></amp-anim>')).to.match(
-            /<amp-anim i-amphtml-key="(\d+)"><\/amp-anim>/
-          );
-        });
-      });
+    it('should allow input[type="file"] and input[type="password"]', () => {
+      // Given that the AMP format does not denylist input types file and
+      // password.
+      html.setAttribute('amp', '');
+      expect(purify('<input type="file">')).to.equal('<input type="file">');
+      expect(purify('<input type="password">')).to.equal(
+        '<input type="password">'
+      );
+    });
 
-      it('should only allow allowlisted AMP elements in AMP4EMAIL', () => {
-        html.setAttribute('amp4email', '');
-        expect(purify('<amp-analytics>')).to.equal('');
-        expect(purify('<amp-iframe>')).to.equal('');
-        expect(purify('<amp-list>')).to.equal('');
-        expect(purify('<amp-pixel>')).to.equal('');
-        expect(purify('<amp-twitter>')).to.equal('');
-        expect(purify('<amp-video>')).to.equal('');
-        expect(purify('<amp-youtube>')).to.equal('');
-
-        expect(purify('<amp-img>')).to.equal(
-          '<amp-img i-amphtml-ignore=""></amp-img>'
-        );
-        expect(purify('<amp-accordion>')).to.match(
-          /<amp-accordion i-amphtml-key="(\d+)"><\/amp-accordion>/
+    it('should sanitize certain tag attributes for AMP4Email', () => {
+      html.setAttribute('amp4email', '');
+      allowConsoleError(() => {
+        expect(purify('<input type="password">')).to.equal('<input>');
+        expect(purify('<input type="file">')).to.equal('<input>');
+        expect(purify('<form name="form-name"></form>')).to.equal(
+          '<form></form>'
         );
-        expect(purify('<amp-anim>')).to.match(
+        expect(purify('<amp-anim controls></amp-anim>')).to.match(
           /<amp-anim i-amphtml-key="(\d+)"><\/amp-anim>/
         );
-        expect(purify('<amp-bind-macro>')).to.match(
-          /<amp-bind-macro i-amphtml-key="(\d+)"><\/amp-bind-macro>/
-        );
-        expect(purify('<amp-carousel>')).to.match(
-          /<amp-carousel i-amphtml-key="(\d+)"><\/amp-carousel>/
-        );
-        expect(purify('<amp-fit-text>')).to.match(
-          /<amp-fit-text i-amphtml-key="(\d+)"><\/amp-fit-text>/
-        );
-        expect(purify('<amp-layout>')).to.match(
-          /<amp-layout i-amphtml-key="(\d+)"><\/amp-layout>/
-        );
-        expect(purify('<amp-selector>')).to.match(
-          /<amp-selector i-amphtml-key="(\d+)"><\/amp-selector>/
-        );
-        expect(purify('<amp-sidebar>')).to.match(
-          /<amp-sidebar i-amphtml-key="(\d+)"><\/amp-sidebar>/
-        );
-        expect(purify('<amp-timeago>')).to.match(
-          /<amp-timeago i-amphtml-key="(\d+)"><\/amp-timeago>/
-        );
       });
     });
+
+    it('should only allow allowlisted AMP elements in AMP4EMAIL', () => {
+      html.setAttribute('amp4email', '');
+      expect(purify('<amp-analytics>')).to.equal('');
+      expect(purify('<amp-iframe>')).to.equal('');
+      expect(purify('<amp-list>')).to.equal('');
+      expect(purify('<amp-pixel>')).to.equal('');
+      expect(purify('<amp-twitter>')).to.equal('');
+      expect(purify('<amp-video>')).to.equal('');
+      expect(purify('<amp-youtube>')).to.equal('');
+
+      expect(purify('<amp-img>')).to.equal(
+        '<amp-img i-amphtml-ignore=""></amp-img>'
+      );
+      expect(purify('<amp-accordion>')).to.match(
+        /<amp-accordion i-amphtml-key="(\d+)"><\/amp-accordion>/
+      );
+      expect(purify('<amp-anim>')).to.match(
+        /<amp-anim i-amphtml-key="(\d+)"><\/amp-anim>/
+      );
+      expect(purify('<amp-bind-macro>')).to.match(
+        /<amp-bind-macro i-amphtml-key="(\d+)"><\/amp-bind-macro>/
+      );
+      expect(purify('<amp-carousel>')).to.match(
+        /<amp-carousel i-amphtml-key="(\d+)"><\/amp-carousel>/
+      );
+      expect(purify('<amp-fit-text>')).to.match(
+        /<amp-fit-text i-amphtml-key="(\d+)"><\/amp-fit-text>/
+      );
+      expect(purify('<amp-layout>')).to.match(
+        /<amp-layout i-amphtml-key="(\d+)"><\/amp-layout>/
+      );
+      expect(purify('<amp-selector>')).to.match(
+        /<amp-selector i-amphtml-key="(\d+)"><\/amp-selector>/
+      );
+      expect(purify('<amp-sidebar>')).to.match(
+        /<amp-sidebar i-amphtml-key="(\d+)"><\/amp-sidebar>/
+      );
+      expect(purify('<amp-timeago>')).to.match(
+        /<amp-timeago i-amphtml-key="(\d+)"><\/amp-timeago>/
+      );
+    });
   });
+});
 
 describes.sandboxed('validateAttributeChange', {}, () => {
   let purifier;
diff --git a/test/unit/test-real-time-config.js b/test/unit/test-real-time-config.js
index e54b87c79a73..b6a6b8a74b96 100644
--- a/test/unit/test-real-time-config.js
+++ b/test/unit/test-real-time-config.js
@@ -796,7 +796,8 @@ describes.realWin('real-time-config service', {amp: true}, (env) => {
        * Both save and retrieve to a cookie named `foo`. They should be isolated and the cookies should not be shared.
        * But, for some reason they are. So, for now use a cookie called bar here.
        */
-      const url = 'https://www.foo.example/?cid=CLIENT_ID(bar)';
+      const url =
+        'https://www.foo.example/?title=TITLE&src=SOURCE_URL&cid=CLIENT_ID(bar)';
       rtc.rtcConfig_ = {
         timeoutMillis: 1000,
       };
@@ -809,11 +810,9 @@ describes.realWin('real-time-config service', {amp: true}, (env) => {
       );
       await rtc.promiseArray_[0];
       expect(fetchJsonStub).to.be.called;
-      expect(
-        fetchJsonStub.calledWithMatch(
-          /https:\/\/www.foo.example\/\?cid=amp-\S+$/
-        )
-      ).to.be.true;
+      expect(fetchJsonStub).to.be.calledWithMatch(
+        /https:\/\/www\.foo\.example\/\?title=[^&]*&src=[^&]*&cid=amp-\S+$/
+      );
     });
   });
 
diff --git a/test/unit/test-resource.js b/test/unit/test-resource.js
index 78dcf58cd189..9ad046064770 100644
--- a/test/unit/test-resource.js
+++ b/test/unit/test-resource.js
@@ -1,10 +1,10 @@
-import {LayoutPriority} from '#core/dom/layout';
+import {LayoutPriority_Enum} from '#core/dom/layout';
 import {layoutRectLtwh} from '#core/dom/layout/rect';
 
 import {Services} from '#service';
 import {AmpDocSingle} from '#service/ampdoc-impl';
 import {OwnersImpl} from '#service/owners-impl';
-import {Resource, ResourceState} from '#service/resource';
+import {Resource, ResourceState_Enum} from '#service/resource';
 import {ResourcesImpl} from '#service/resources-impl';
 
 import {isCancellation} from '../../src/error-reporting';
@@ -24,7 +24,7 @@ describes.realWin('Resource', {amp: true}, (env) => {
     doc.body.appendChild(element);
     env.sandbox
       .stub(element, 'getLayoutPriority')
-      .callsFake(() => LayoutPriority.ADS);
+      .callsFake(() => LayoutPriority_Enum.ADS);
     elementMock = env.sandbox.mock(element);
 
     const viewer = Services.viewerForDoc(doc);
@@ -58,8 +58,8 @@ describes.realWin('Resource', {amp: true}, (env) => {
   it('should initialize correctly', () => {
     expect(resource.getId()).to.equal(1);
     expect(resource.debugid).to.equal('amp-fake-element#1');
-    expect(resource.getLayoutPriority()).to.equal(LayoutPriority.ADS);
-    expect(resource.getState()).to.equal(ResourceState.NOT_BUILT);
+    expect(resource.getLayoutPriority()).to.equal(LayoutPriority_Enum.ADS);
+    expect(resource.getState()).to.equal(ResourceState_Enum.NOT_BUILT);
     expect(resource.getLayoutBox().width).to.equal(0);
     expect(resource.getLayoutBox().height).to.equal(0);
     expect(resource.isInViewport()).to.equal(false);
@@ -68,7 +68,7 @@ describes.realWin('Resource', {amp: true}, (env) => {
   it('should initialize correctly when already built', () => {
     elementMock.expects('isBuilt').returns(true).once();
     expect(new Resource(1, element, resources).getState()).to.equal(
-      ResourceState.NOT_LAID_OUT
+      ResourceState_Enum.NOT_LAID_OUT
     );
   });
 
@@ -78,7 +78,7 @@ describes.realWin('Resource', {amp: true}, (env) => {
     elementMock.expects('updateLayoutBox').never();
 
     expect(resource.build()).to.be.null;
-    expect(resource.getState()).to.equal(ResourceState.NOT_BUILT);
+    expect(resource.getState()).to.equal(ResourceState_Enum.NOT_BUILT);
   });
 
   it('should build after upgraded', () => {
@@ -87,7 +87,7 @@ describes.realWin('Resource', {amp: true}, (env) => {
     elementMock.expects('buildInternal').returns(buildPromise).once();
     elementMock.expects('updateLayoutBox').never();
     return resource.build().then(() => {
-      expect(resource.getState()).to.equal(ResourceState.NOT_LAID_OUT);
+      expect(resource.getState()).to.equal(ResourceState_Enum.NOT_LAID_OUT);
     });
   });
 
@@ -118,7 +118,7 @@ describes.realWin('Resource', {amp: true}, (env) => {
       },
       () => {
         expect(resource.isBuilding()).to.be.false;
-        expect(resource.getState()).to.equal(ResourceState.NOT_BUILT);
+        expect(resource.getState()).to.equal(ResourceState_Enum.NOT_BUILT);
       }
     );
   });
@@ -129,7 +129,7 @@ describes.realWin('Resource', {amp: true}, (env) => {
     elementMock.expects('buildInternal').returns(Promise.resolve()).once();
     resource.layoutBox_ = box;
     return resource.build().then(() => {
-      expect(resource.getState()).to.equal(ResourceState.NOT_LAID_OUT);
+      expect(resource.getState()).to.equal(ResourceState_Enum.NOT_LAID_OUT);
     });
   });
 
@@ -137,7 +137,7 @@ describes.realWin('Resource', {amp: true}, (env) => {
     elementMock.expects('isUpgraded').returns(true).atLeast(1);
     elementMock.expects('buildInternal').returns(Promise.resolve()).once();
     return resource.build().then(() => {
-      expect(resource.getState()).to.equal(ResourceState.NOT_LAID_OUT);
+      expect(resource.getState()).to.equal(ResourceState_Enum.NOT_LAID_OUT);
     });
   });
 
@@ -205,7 +205,7 @@ describes.realWin('Resource', {amp: true}, (env) => {
       .returns(layoutRectLtwh(0, 0, 0, 0))
       .once();
     resource.measure();
-    expect(resource.getState()).to.equal(ResourceState.NOT_BUILT);
+    expect(resource.getState()).to.equal(ResourceState_Enum.NOT_BUILT);
     expect(resource.isFixed()).to.be.false;
   });
 
@@ -227,7 +227,7 @@ describes.realWin('Resource', {amp: true}, (env) => {
         )
         .once();
       resource.measure();
-      expect(resource.getState()).to.equal(ResourceState.READY_FOR_LAYOUT);
+      expect(resource.getState()).to.equal(ResourceState_Enum.READY_FOR_LAYOUT);
       expect(resource.getLayoutBox().left).to.equal(11);
       expect(resource.getLayoutBox().top).to.equal(12);
       expect(resource.getLayoutBox().width).to.equal(111);
@@ -272,14 +272,14 @@ describes.realWin('Resource', {amp: true}, (env) => {
   it('should request measure when built', () => {
     expect(resource.isMeasureRequested()).to.be.false;
     elementMock.expects('getBoundingClientRect').never();
-    resource.state_ = ResourceState.READY_FOR_LAYOUT;
+    resource.state_ = ResourceState_Enum.READY_FOR_LAYOUT;
     resource.requestMeasure();
     expect(resource.isMeasureRequested()).to.be.true;
   });
 
   it('should always layout if has not been laid out before', () => {
     elementMock.expects('isUpgraded').returns(true).atLeast(1);
-    resource.state_ = ResourceState.NOT_LAID_OUT;
+    resource.state_ = ResourceState_Enum.NOT_LAID_OUT;
     resource.layoutBox_ = {left: 11, top: 12, width: 111, height: 222};
 
     elementMock
@@ -287,11 +287,11 @@ describes.realWin('Resource', {amp: true}, (env) => {
       .returns(resource.layoutBox_)
       .once();
     resource.measure();
-    expect(resource.getState()).to.equal(ResourceState.READY_FOR_LAYOUT);
+    expect(resource.getState()).to.equal(ResourceState_Enum.READY_FOR_LAYOUT);
   });
 
   it('should not relayout if has box has not changed', () => {
-    resource.state_ = ResourceState.LAYOUT_COMPLETE;
+    resource.state_ = ResourceState_Enum.LAYOUT_COMPLETE;
     resource.layoutBox_ = {left: 11, top: 12, width: 111, height: 222};
 
     // Left is not part of validation.
@@ -300,13 +300,13 @@ describes.realWin('Resource', {amp: true}, (env) => {
       .returns({left: 11 + 10, top: 12, width: 111, height: 222})
       .once();
     resource.measure();
-    expect(resource.getState()).to.equal(ResourceState.LAYOUT_COMPLETE);
+    expect(resource.getState()).to.equal(ResourceState_Enum.LAYOUT_COMPLETE);
     expect(resource.getLayoutBox().left).to.equal(11 + 10);
   });
 
   it("should not relayout if box changed but element didn't opt in", () => {
     elementMock.expects('isUpgraded').returns(true).atLeast(1);
-    resource.state_ = ResourceState.LAYOUT_COMPLETE;
+    resource.state_ = ResourceState_Enum.LAYOUT_COMPLETE;
     resource.layoutBox_ = {left: 11, top: 12, width: 111, height: 222};
 
     // Width changed.
@@ -316,13 +316,13 @@ describes.realWin('Resource', {amp: true}, (env) => {
       .once();
     elementMock.expects('isRelayoutNeeded').returns(false).atLeast(1);
     resource.measure();
-    expect(resource.getState()).to.equal(ResourceState.LAYOUT_COMPLETE);
+    expect(resource.getState()).to.equal(ResourceState_Enum.LAYOUT_COMPLETE);
     expect(resource.getLayoutBox().width).to.equal(111 + 10);
   });
 
   it('should relayout if box changed when element opted in', () => {
     elementMock.expects('isUpgraded').returns(true).atLeast(1);
-    resource.state_ = ResourceState.LAYOUT_COMPLETE;
+    resource.state_ = ResourceState_Enum.LAYOUT_COMPLETE;
     resource.layoutBox_ = {left: 11, top: 12, width: 111, height: 222};
 
     // Width changed.
@@ -332,13 +332,13 @@ describes.realWin('Resource', {amp: true}, (env) => {
       .once();
     elementMock.expects('isRelayoutNeeded').returns(true).atLeast(1);
     resource.measure();
-    expect(resource.getState()).to.equal(ResourceState.READY_FOR_LAYOUT);
+    expect(resource.getState()).to.equal(ResourceState_Enum.READY_FOR_LAYOUT);
     expect(resource.getLayoutBox().width).to.equal(111 + 10);
   });
 
   it('should not relayout if element has not completed layout', () => {
     elementMock.expects('isUpgraded').returns(true).atLeast(1);
-    resource.state_ = ResourceState.LAYOUT_SCHEDULED;
+    resource.state_ = ResourceState_Enum.LAYOUT_SCHEDULED;
     resource.layoutBox_ = {left: 11, top: 12, width: 111, height: 222};
 
     // Width changed.
@@ -348,7 +348,7 @@ describes.realWin('Resource', {amp: true}, (env) => {
       .once();
     elementMock.expects('isRelayoutNeeded').returns(true).atLeast(0);
     resource.measure();
-    expect(resource.getState()).to.equal(ResourceState.LAYOUT_SCHEDULED);
+    expect(resource.getState()).to.equal(ResourceState_Enum.LAYOUT_SCHEDULED);
     expect(resource.getLayoutBox().width).to.equal(111 + 10);
   });
 
@@ -449,7 +449,7 @@ describes.realWin('Resource', {amp: true}, (env) => {
       elementMock.expects('getBoundingClientRect').returns(rect).once();
       resource.measure();
 
-      expect(resource.getState()).to.equal(ResourceState.READY_FOR_LAYOUT);
+      expect(resource.getState()).to.equal(ResourceState_Enum.READY_FOR_LAYOUT);
       expect(resource.hasBeenMeasured()).to.be.true;
     });
 
@@ -460,7 +460,7 @@ describes.realWin('Resource', {amp: true}, (env) => {
       elementMock.expects('getBoundingClientRect').never();
       resource.measure();
 
-      expect(resource.getState()).to.equal(ResourceState.NOT_LAID_OUT);
+      expect(resource.getState()).to.equal(ResourceState_Enum.NOT_LAID_OUT);
       expect(resource.hasBeenMeasured()).to.be.false;
     });
 
@@ -470,7 +470,7 @@ describes.realWin('Resource', {amp: true}, (env) => {
       elementMock.expects('getBoundingClientRect').returns(rect).once();
       resource.measure();
 
-      expect(resource.getState()).to.equal(ResourceState.READY_FOR_LAYOUT);
+      expect(resource.getState()).to.equal(ResourceState_Enum.READY_FOR_LAYOUT);
       expect(resource.hasBeenMeasured()).to.be.true;
     });
 
@@ -480,7 +480,7 @@ describes.realWin('Resource', {amp: true}, (env) => {
       elementMock.expects('getBoundingClientRect').returns(rect).once();
       resource.measure();
 
-      expect(resource.getState()).to.equal(ResourceState.READY_FOR_LAYOUT);
+      expect(resource.getState()).to.equal(ResourceState_Enum.READY_FOR_LAYOUT);
       expect(resource.hasBeenMeasured()).to.be.true;
     });
   });
@@ -525,18 +525,18 @@ describes.realWin('Resource', {amp: true}, (env) => {
     elementMock.expects('layoutCallback').never();
     resource.layoutBox_ = {left: 11, top: 12, width: 10, height: 10};
 
-    resource.state_ = ResourceState.LAYOUT_COMPLETE;
+    resource.state_ = ResourceState_Enum.LAYOUT_COMPLETE;
     resource.startLayout();
 
-    resource.state_ = ResourceState.LAYOUT_FAILED;
+    resource.state_ = ResourceState_Enum.LAYOUT_FAILED;
     resource.startLayout();
 
-    resource.state_ = ResourceState.READY_FOR_LAYOUT;
+    resource.state_ = ResourceState_Enum.READY_FOR_LAYOUT;
     allowConsoleError(() => {
       resource.startLayout();
     });
 
-    resource.state_ = ResourceState.LAYOUT_SCHEDULED;
+    resource.state_ = ResourceState_Enum.LAYOUT_SCHEDULED;
     resource.layoutPromise_ = {};
     resource.startLayout();
   });
@@ -544,7 +544,7 @@ describes.realWin('Resource', {amp: true}, (env) => {
   it('should fail startLayout if not built', () => {
     elementMock.expects('layoutCallback').never();
 
-    resource.state_ = ResourceState.NOT_BUILT;
+    resource.state_ = ResourceState_Enum.NOT_BUILT;
     allowConsoleError(() => {
       expect(() => {
         resource.startLayout();
@@ -554,7 +554,7 @@ describes.realWin('Resource', {amp: true}, (env) => {
 
   it('should ignore startLayout if not visible', () => {
     elementMock.expects('layoutCallback').never();
-    resource.state_ = ResourceState.LAYOUT_SCHEDULED;
+    resource.state_ = ResourceState_Enum.LAYOUT_SCHEDULED;
     resource.layoutBox_ = {left: 11, top: 12, width: 0, height: 0};
     allowConsoleError(() => {
       expect(() => {
@@ -566,20 +566,20 @@ describes.realWin('Resource', {amp: true}, (env) => {
   it('should force startLayout for first layout', () => {
     elementMock.expects('layoutCallback').returns(Promise.resolve()).once();
 
-    resource.state_ = ResourceState.LAYOUT_SCHEDULED;
+    resource.state_ = ResourceState_Enum.LAYOUT_SCHEDULED;
     resource.layoutBox_ = {left: 11, top: 12, width: 10, height: 10};
     resource.startLayout();
-    expect(resource.getState()).to.equal(ResourceState.LAYOUT_SCHEDULED);
+    expect(resource.getState()).to.equal(ResourceState_Enum.LAYOUT_SCHEDULED);
   });
 
   it('should abort startLayout with unload', async () => {
     const neverEndingPromise = new Promise(() => {});
     elementMock.expects('layoutCallback').returns(neverEndingPromise).once();
 
-    resource.state_ = ResourceState.LAYOUT_SCHEDULED;
+    resource.state_ = ResourceState_Enum.LAYOUT_SCHEDULED;
     resource.layoutBox_ = {left: 11, top: 12, width: 10, height: 10};
     const layoutPromise = resource.startLayout();
-    expect(resource.getState()).to.equal(ResourceState.LAYOUT_SCHEDULED);
+    expect(resource.getState()).to.equal(ResourceState_Enum.LAYOUT_SCHEDULED);
 
     resource.unload();
 
@@ -596,37 +596,37 @@ describes.realWin('Resource', {amp: true}, (env) => {
   it('should ignore startLayout for re-layout when not opt-in', () => {
     elementMock.expects('layoutCallback').never();
 
-    resource.state_ = ResourceState.LAYOUT_SCHEDULED;
+    resource.state_ = ResourceState_Enum.LAYOUT_SCHEDULED;
     resource.layoutBox_ = {left: 11, top: 12, width: 10, height: 10};
     resource.layoutCount_ = 1;
     elementMock.expects('isRelayoutNeeded').returns(false).atLeast(1);
     resource.startLayout();
-    expect(resource.getState()).to.equal(ResourceState.LAYOUT_COMPLETE);
+    expect(resource.getState()).to.equal(ResourceState_Enum.LAYOUT_COMPLETE);
   });
 
   it('should force startLayout for re-layout when opt-in', () => {
     elementMock.expects('layoutCallback').returns(Promise.resolve()).once();
 
-    resource.state_ = ResourceState.LAYOUT_SCHEDULED;
+    resource.state_ = ResourceState_Enum.LAYOUT_SCHEDULED;
     resource.layoutBox_ = {left: 11, top: 12, width: 10, height: 10};
     resource.layoutCount_ = 1;
     elementMock.expects('isRelayoutNeeded').returns(true).atLeast(1);
     resource.startLayout();
-    expect(resource.getState()).to.equal(ResourceState.LAYOUT_SCHEDULED);
+    expect(resource.getState()).to.equal(ResourceState_Enum.LAYOUT_SCHEDULED);
   });
 
   it('should complete startLayout', () => {
     elementMock.expects('layoutCallback').returns(Promise.resolve()).once();
 
-    resource.state_ = ResourceState.LAYOUT_SCHEDULED;
+    resource.state_ = ResourceState_Enum.LAYOUT_SCHEDULED;
     resource.layoutBox_ = {left: 11, top: 12, width: 10, height: 10};
     const loaded = resource.loadedOnce();
     const promise = resource.startLayout();
     expect(resource.layoutPromise_).to.not.equal(null);
-    expect(resource.getState()).to.equal(ResourceState.LAYOUT_SCHEDULED);
+    expect(resource.getState()).to.equal(ResourceState_Enum.LAYOUT_SCHEDULED);
 
     return promise.then(() => {
-      expect(resource.getState()).to.equal(ResourceState.LAYOUT_COMPLETE);
+      expect(resource.getState()).to.equal(ResourceState_Enum.LAYOUT_COMPLETE);
       expect(resource.layoutPromise_).to.equal(null);
       return loaded; // Just making sure this doesn't time out.
     });
@@ -636,15 +636,15 @@ describes.realWin('Resource', {amp: true}, (env) => {
     elementMock.expects('layoutCallback').returns(Promise.resolve()).once();
     elementMock.expects('getLayout').returns('fluid').once();
 
-    resource.state_ = ResourceState.LAYOUT_SCHEDULED;
+    resource.state_ = ResourceState_Enum.LAYOUT_SCHEDULED;
     resource.layoutBox_ = {left: 11, top: 12, width: 10, height: 0};
     const loaded = resource.loadedOnce();
     const promise = resource.startLayout();
     expect(resource.layoutPromise_).to.not.equal(null);
-    expect(resource.getState()).to.equal(ResourceState.LAYOUT_SCHEDULED);
+    expect(resource.getState()).to.equal(ResourceState_Enum.LAYOUT_SCHEDULED);
 
     return promise.then(() => {
-      expect(resource.getState()).to.equal(ResourceState.LAYOUT_COMPLETE);
+      expect(resource.getState()).to.equal(ResourceState_Enum.LAYOUT_COMPLETE);
       expect(resource.layoutPromise_).to.equal(null);
       return loaded;
     });
@@ -654,11 +654,11 @@ describes.realWin('Resource', {amp: true}, (env) => {
     const error = new Error('intentional');
     elementMock.expects('layoutCallback').returns(Promise.reject(error)).once();
 
-    resource.state_ = ResourceState.LAYOUT_SCHEDULED;
+    resource.state_ = ResourceState_Enum.LAYOUT_SCHEDULED;
     resource.layoutBox_ = {left: 11, top: 12, width: 10, height: 10};
     const promise = resource.startLayout();
     expect(resource.layoutPromise_).to.not.equal(null);
-    expect(resource.getState()).to.equal(ResourceState.LAYOUT_SCHEDULED);
+    expect(resource.getState()).to.equal(ResourceState_Enum.LAYOUT_SCHEDULED);
 
     /* global fail: false */
     return promise
@@ -667,7 +667,9 @@ describes.realWin('Resource', {amp: true}, (env) => {
           fail('should not be here');
         },
         () => {
-          expect(resource.getState()).to.equal(ResourceState.LAYOUT_FAILED);
+          expect(resource.getState()).to.equal(
+            ResourceState_Enum.LAYOUT_FAILED
+          );
           expect(resource.layoutPromise_).to.equal(null);
           expect(resource.lastLayoutError_).to.equal(error);
 
@@ -693,21 +695,21 @@ describes.realWin('Resource', {amp: true}, (env) => {
     resource.layoutScheduled(400);
     expect(resource.element.layoutScheduleTime).to.equal(400);
 
-    expect(resource.getState()).to.equal(ResourceState.LAYOUT_SCHEDULED);
+    expect(resource.getState()).to.equal(ResourceState_Enum.LAYOUT_SCHEDULED);
   });
 
   it('should not record layout schedule time in startLayout', () => {
-    resource.state_ = ResourceState.LAYOUT_SCHEDULED;
+    resource.state_ = ResourceState_Enum.LAYOUT_SCHEDULED;
     resource.layoutBox_ = {left: 11, top: 12, width: 10, height: 10};
     allowConsoleError(() => resource.startLayout());
 
     expect(resource.element.layoutScheduleTime).to.be.undefined;
-    expect(resource.getState()).to.equal(ResourceState.LAYOUT_SCHEDULED);
+    expect(resource.getState()).to.equal(ResourceState_Enum.LAYOUT_SCHEDULED);
   });
 
   it('should change size and update state', () => {
     expect(resource.isMeasureRequested()).to.be.false;
-    resource.state_ = ResourceState.READY_FOR_LAYOUT;
+    resource.state_ = ResourceState_Enum.READY_FOR_LAYOUT;
     elementMock
       .expects('applySize')
       .withExactArgs(111, 222, {top: 1, right: 2, bottom: 3, left: 4})
@@ -717,29 +719,31 @@ describes.realWin('Resource', {amp: true}, (env) => {
   });
 
   it('should change size but not state', () => {
-    resource.state_ = ResourceState.NOT_BUILT;
+    resource.state_ = ResourceState_Enum.NOT_BUILT;
     elementMock
       .expects('applySize')
       .withExactArgs(111, 222, {top: 1, right: 2, bottom: 3, left: 4})
       .once();
     resource.changeSize(111, 222, {top: 1, right: 2, bottom: 3, left: 4});
-    expect(resource.getState()).to.equal(ResourceState.NOT_BUILT);
+    expect(resource.getState()).to.equal(ResourceState_Enum.NOT_BUILT);
   });
 
   it('should update priority', () => {
-    expect(resource.getLayoutPriority()).to.equal(LayoutPriority.ADS);
+    expect(resource.getLayoutPriority()).to.equal(LayoutPriority_Enum.ADS);
 
-    resource.updateLayoutPriority(LayoutPriority.ADS);
-    expect(resource.getLayoutPriority()).to.equal(LayoutPriority.ADS);
+    resource.updateLayoutPriority(LayoutPriority_Enum.ADS);
+    expect(resource.getLayoutPriority()).to.equal(LayoutPriority_Enum.ADS);
 
-    resource.updateLayoutPriority(LayoutPriority.BACKGROUND);
-    expect(resource.getLayoutPriority()).to.equal(LayoutPriority.BACKGROUND);
+    resource.updateLayoutPriority(LayoutPriority_Enum.BACKGROUND);
+    expect(resource.getLayoutPriority()).to.equal(
+      LayoutPriority_Enum.BACKGROUND
+    );
 
-    resource.updateLayoutPriority(LayoutPriority.METADATA);
-    expect(resource.getLayoutPriority()).to.equal(LayoutPriority.METADATA);
+    resource.updateLayoutPriority(LayoutPriority_Enum.METADATA);
+    expect(resource.getLayoutPriority()).to.equal(LayoutPriority_Enum.METADATA);
 
-    resource.updateLayoutPriority(LayoutPriority.CONTENT);
-    expect(resource.getLayoutPriority()).to.equal(LayoutPriority.CONTENT);
+    resource.updateLayoutPriority(LayoutPriority_Enum.CONTENT);
+    expect(resource.getLayoutPriority()).to.equal(LayoutPriority_Enum.CONTENT);
   });
 
   describe('setInViewport', () => {
@@ -842,22 +846,22 @@ describes.realWin('Resource', {amp: true}, (env) => {
 
   describe('unlayoutCallback', () => {
     it('should NOT call unlayoutCallback on unbuilt element', () => {
-      resource.state_ = ResourceState.NOT_BUILT;
+      resource.state_ = ResourceState_Enum.NOT_BUILT;
       elementMock.expects('unlayoutCallback').never();
       resource.unlayout();
-      expect(resource.getState()).to.equal(ResourceState.NOT_BUILT);
+      expect(resource.getState()).to.equal(ResourceState_Enum.NOT_BUILT);
     });
 
     it('should call unlayoutCallback on built element and update state', () => {
-      resource.state_ = ResourceState.LAYOUT_COMPLETE;
+      resource.state_ = ResourceState_Enum.LAYOUT_COMPLETE;
       elementMock.expects('unlayoutCallback').returns(true).once();
       elementMock.expects('togglePlaceholder').withArgs(true).once();
       resource.unlayout();
-      expect(resource.getState()).to.equal(ResourceState.NOT_LAID_OUT);
+      expect(resource.getState()).to.equal(ResourceState_Enum.NOT_LAID_OUT);
     });
 
     it('updated state should bypass isRelayoutNeeded', () => {
-      resource.state_ = ResourceState.LAYOUT_COMPLETE;
+      resource.state_ = ResourceState_Enum.LAYOUT_COMPLETE;
       elementMock.expects('unlayoutCallback').returns(true).once();
       elementMock.expects('togglePlaceholder').withArgs(true).once();
       elementMock.expects('isUpgraded').returns(true).atLeast(1);
@@ -868,44 +872,44 @@ describes.realWin('Resource', {amp: true}, (env) => {
 
       resource.unlayout();
 
-      resource.state_ = ResourceState.LAYOUT_SCHEDULED;
+      resource.state_ = ResourceState_Enum.LAYOUT_SCHEDULED;
       elementMock.expects('layoutCallback').returns(Promise.resolve()).once();
       resource.measure();
       resource.startLayout();
     });
 
     it('should call unlayoutCallback on built element but NOT update state', () => {
-      resource.state_ = ResourceState.LAYOUT_COMPLETE;
+      resource.state_ = ResourceState_Enum.LAYOUT_COMPLETE;
       elementMock.expects('unlayoutCallback').returns(false).once();
       elementMock.expects('togglePlaceholder').withArgs(true).never();
       resource.unlayout();
-      expect(resource.getState()).to.equal(ResourceState.LAYOUT_COMPLETE);
+      expect(resource.getState()).to.equal(ResourceState_Enum.LAYOUT_COMPLETE);
     });
 
     it('should delegate unload to unlayoutCallback', () => {
-      resource.state_ = ResourceState.LAYOUT_COMPLETE;
+      resource.state_ = ResourceState_Enum.LAYOUT_COMPLETE;
       elementMock.expects('unlayoutCallback').returns(false).once();
       elementMock.expects('togglePlaceholder').withArgs(true).never();
       resource.unload();
-      expect(resource.getState()).to.equal(ResourceState.LAYOUT_COMPLETE);
+      expect(resource.getState()).to.equal(ResourceState_Enum.LAYOUT_COMPLETE);
     });
   });
 
   describe('pause', () => {
     it('should call pause on unbuilt element', () => {
-      resource.state_ = ResourceState.NOT_BUILT;
+      resource.state_ = ResourceState_Enum.NOT_BUILT;
       elementMock.expects('pause').once();
       resource.pause();
     });
 
     it('should call pause on built element', () => {
-      resource.state_ = ResourceState.LAYOUT_COMPLETE;
+      resource.state_ = ResourceState_Enum.LAYOUT_COMPLETE;
       elementMock.expects('pause').once();
       resource.pause();
     });
 
     it('should NOT call unlayoutCallback', () => {
-      resource.state_ = ResourceState.LAYOUT_COMPLETE;
+      resource.state_ = ResourceState_Enum.LAYOUT_COMPLETE;
       elementMock.expects('pause').once();
       elementMock.expects('unlayoutCallback').never();
       resource.pause();
@@ -913,13 +917,13 @@ describes.realWin('Resource', {amp: true}, (env) => {
 
     describe('when remove from DOM', () => {
       it('should call pause on remove for unbuilt ele', () => {
-        resource.state_ = ResourceState.NOT_BUILT;
+        resource.state_ = ResourceState_Enum.NOT_BUILT;
         elementMock.expects('pause').once();
         resource.pauseOnRemove();
       });
 
       it('should call pause on remove for built ele', () => {
-        resource.state_ = ResourceState.LAYOUT_COMPLETE;
+        resource.state_ = ResourceState_Enum.LAYOUT_COMPLETE;
         elementMock.expects('pause').once();
         resource.pauseOnRemove();
       });
@@ -954,13 +958,13 @@ describes.realWin('Resource', {amp: true}, (env) => {
 
   describe('resume', () => {
     it('should call resume on unbuilt element', () => {
-      resource.state_ = ResourceState.NOT_BUILT;
+      resource.state_ = ResourceState_Enum.NOT_BUILT;
       elementMock.expects('resume').once();
       resource.resume();
     });
 
     it('should call resume on un-paused element', () => {
-      resource.state_ = ResourceState.LAYOUT_COMPLETE;
+      resource.state_ = ResourceState_Enum.LAYOUT_COMPLETE;
       elementMock.expects('resume').once();
       resource.resume();
     });
@@ -996,7 +1000,7 @@ describes.sandboxed('Resource idleRenderOutsideViewport', {}, (env) => {
       unlayoutCallback: () => true,
       pause: () => false,
       resume: () => false,
-      getLayoutPriority: () => LayoutPriority.CONTENT,
+      getLayoutPriority: () => LayoutPriority_Enum.CONTENT,
     };
     resources = new ResourcesImpl(new AmpDocSingle(window));
     resource = new Resource(1, element, resources);
diff --git a/test/unit/test-resources.js b/test/unit/test-resources.js
index 174369752a4e..ef16711a00ba 100644
--- a/test/unit/test-resources.js
+++ b/test/unit/test-resources.js
@@ -1,13 +1,13 @@
 import * as fakeTimers from '@sinonjs/fake-timers';
 
-import {VisibilityState} from '#core/constants/visibility-state';
+import {VisibilityState_Enum} from '#core/constants/visibility-state';
 import {Signals} from '#core/data-structures/signals';
-import {LayoutPriority} from '#core/dom/layout';
+import {LayoutPriority_Enum} from '#core/dom/layout';
 import {layoutRectLtwh} from '#core/dom/layout/rect';
 
 import {Services} from '#service';
 import {AmpDocSingle} from '#service/ampdoc-impl';
-import {Resource, ResourceState} from '#service/resource';
+import {Resource, ResourceState_Enum} from '#service/resource';
 import {ResourcesImpl} from '#service/resources-impl';
 
 import {loadPromise} from '#utils/event-helper';
@@ -43,6 +43,7 @@ describes.realWin('Resources', {amp: true}, (env) => {
       isInViewport,
       layoutPriority,
       prerenderAllowed,
+      previewAllowed,
       renderOutsideViewport,
       state,
       taskId,
@@ -50,14 +51,15 @@ describes.realWin('Resources', {amp: true}, (env) => {
       id: '1',
       isBuilt: false,
       isBuilding: false,
-      state: ResourceState.NOT_BUILT,
+      state: ResourceState_Enum.NOT_BUILT,
       isDisplayed: true,
       isFixed: false,
       isInViewport: true,
       prerenderAllowed: false,
+      previewAllowed: false,
       renderOutsideViewport: false,
       idleRenderOutsideViewport: false,
-      layoutPriority: LayoutPriority.CONTENT,
+      layoutPriority: LayoutPriority_Enum.CONTENT,
       taskId: 'resource#P',
       ...opts,
     };
@@ -75,6 +77,7 @@ describes.realWin('Resources', {amp: true}, (env) => {
     env.sandbox.stub(resource, 'isFixed').returns(isFixed);
     env.sandbox.stub(resource, 'isInViewport').returns(isInViewport);
     env.sandbox.stub(resource, 'prerenderAllowed').returns(prerenderAllowed);
+    env.sandbox.stub(resource, 'previewAllowed').returns(previewAllowed);
     env.sandbox
       .stub(resource, 'renderOutsideViewport')
       .returns(renderOutsideViewport);
@@ -313,44 +316,60 @@ describes.realWin('Resources', {amp: true}, (env) => {
       ' document is in prerender',
     () => {
       const resource = createResource({
-        state: ResourceState.READY_FOR_LAYOUT,
+        state: ResourceState_Enum.READY_FOR_LAYOUT,
       });
       resources.visible_ = false;
       env.sandbox
         .stub(resources.ampdoc, 'getVisibilityState')
-        .returns(VisibilityState.PRERENDER);
+        .returns(VisibilityState_Enum.PRERENDER);
       resources.scheduleLayoutOrPreload(resource, true);
       expect(resources.queue_.getSize()).to.equal(0);
     }
   );
 
-  it('should schedule prerenderable resource when document is in prerender', () => {
+  it(
+    'should not schedule non-previewable resource when' +
+      ' document is in preview',
+    () => {
+      const resource = createResource({
+        state: ResourceState_Enum.READY_FOR_LAYOUT,
+      });
+      resources.visible_ = false;
+      env.sandbox
+        .stub(resources.ampdoc, 'getVisibilityState')
+        .returns(VisibilityState_Enum.PREVIEW);
+      resources.scheduleLayoutOrPreload(resource, true);
+      expect(resources.queue_.getSize()).to.equal(0);
+    }
+  );
+
+  it('should schedule previewable resource when document is in preview', () => {
     const resource = createResource({
-      state: ResourceState.READY_FOR_LAYOUT,
-      prerenderAllowed: true,
+      state: ResourceState_Enum.READY_FOR_LAYOUT,
+      previewAllowed: true,
       renderOutsideViewport: true,
-      layoutPriority: LayoutPriority.METADATA,
+      layoutPriority: LayoutPriority_Enum.METADATA,
     });
     resources.visible_ = false;
     env.sandbox
       .stub(resources.ampdoc, 'getVisibilityState')
-      .returns(VisibilityState.PRERENDER);
+      .returns(VisibilityState_Enum.PREVIEW);
     resources.scheduleLayoutOrPreload(resource, true);
     expect(resources.queue_.getSize()).to.equal(1);
     expect(resources.queue_.tasks_[0].forceOutsideViewport).to.be.false;
   });
 
-  it('should not schedule prerenderable resource when document is hidden', () => {
+  it('should not schedule previewable resource when document is hidden', () => {
     const resource = createResource({
-      state: ResourceState.READY_FOR_LAYOUT,
-      prerenderAllowed: true,
+      state: ResourceState_Enum.READY_FOR_LAYOUT,
+      previewAllowed: true,
       renderOutsideViewport: true,
-      layoutPriority: LayoutPriority.METADATA,
+      layoutPriority: LayoutPriority_Enum.METADATA,
     });
     resources.visible_ = false;
     env.sandbox
       .stub(resources.ampdoc, 'getVisibilityState')
-      .returns(VisibilityState.HIDDEN);
+      .returns(VisibilityState_Enum.HIDDEN);
     resources.scheduleLayoutOrPreload(resource, true);
     expect(resources.queue_.getSize()).to.equal(0);
   });
@@ -360,7 +379,7 @@ describes.realWin('Resources', {amp: true}, (env) => {
       ' resource is not visible',
     () => {
       const resource = createResource({
-        state: ResourceState.READY_FOR_LAYOUT,
+        state: ResourceState_Enum.READY_FOR_LAYOUT,
         isInViewport: false,
         prerenderAllowed: true,
       });
@@ -374,10 +393,10 @@ describes.realWin('Resources', {amp: true}, (env) => {
       ' resource is not visible',
     () => {
       const resource = createResource({
-        state: ResourceState.READY_FOR_LAYOUT,
+        state: ResourceState_Enum.READY_FOR_LAYOUT,
         isInViewport: false,
         prerenderAllowed: true,
-        layoutPriority: LayoutPriority.METADATA,
+        layoutPriority: LayoutPriority_Enum.METADATA,
         taskId: 'resource#L',
       });
       resources.scheduleLayoutOrPreload(
@@ -396,10 +415,10 @@ describes.realWin('Resources', {amp: true}, (env) => {
       ' resource is not visible',
     () => {
       const resource = createResource({
-        state: ResourceState.READY_FOR_LAYOUT,
+        state: ResourceState_Enum.READY_FOR_LAYOUT,
         prerenderAllowed: true,
         renderOutsideViewport: true,
-        layoutPriority: LayoutPriority.METADATA,
+        layoutPriority: LayoutPriority_Enum.METADATA,
         taskId: 'resource#L',
       });
       resources.scheduleLayoutOrPreload(resource, true);
@@ -413,11 +432,11 @@ describes.realWin('Resources', {amp: true}, (env) => {
       ' resource is not visible',
     () => {
       const resource = createResource({
-        state: ResourceState.READY_FOR_LAYOUT,
+        state: ResourceState_Enum.READY_FOR_LAYOUT,
         isInViewport: false,
         prerenderAllowed: true,
         idleRenderOutsideViewport: true,
-        layoutPriority: LayoutPriority.METADATA,
+        layoutPriority: LayoutPriority_Enum.METADATA,
         taskId: 'resource#L',
       });
       resources.scheduleLayoutOrPreload(resource, true);
@@ -429,13 +448,13 @@ describes.realWin('Resources', {amp: true}, (env) => {
   it('should update priority and schedule pass', () => {
     const element = document.createElement('div');
     element.isBuilt = () => true;
-    element.getLayoutPriority = () => LayoutPriority.ADS;
+    element.getLayoutPriority = () => LayoutPriority_Enum.ADS;
     const resource = new Resource(1, element, resources);
     resources.pass_.cancel();
-    expect(resource.getLayoutPriority()).to.equal(LayoutPriority.ADS);
+    expect(resource.getLayoutPriority()).to.equal(LayoutPriority_Enum.ADS);
 
-    resources.updateLayoutPriority(element, LayoutPriority.METADATA);
-    expect(resource.getLayoutPriority()).to.equal(LayoutPriority.METADATA);
+    resources.updateLayoutPriority(element, LayoutPriority_Enum.METADATA);
+    expect(resource.getLayoutPriority()).to.equal(LayoutPriority_Enum.METADATA);
     expect(resources.pass_.isPending()).to.be.true;
   });
 
@@ -445,27 +464,27 @@ describes.realWin('Resources', {amp: true}, (env) => {
     // Target element.
     const element = document.createElement('div');
     element.isBuilt = () => true;
-    element.getLayoutPriority = () => LayoutPriority.ADS;
+    element.getLayoutPriority = () => LayoutPriority_Enum.ADS;
     const resource = new Resource(1, element, resources);
     resources.schedule_(resource, 'L', 0, 0, () => {});
     const task = resources.queue_.tasks_[0];
-    expect(task.priority).to.equal(LayoutPriority.ADS);
+    expect(task.priority).to.equal(LayoutPriority_Enum.ADS);
 
     // Another element.
     const element2 = document.createElement('div');
     element2.isBuilt = () => true;
-    element2.getLayoutPriority = () => LayoutPriority.ADS;
+    element2.getLayoutPriority = () => LayoutPriority_Enum.ADS;
     const resource2 = new Resource(2, element2, resources);
     resources.schedule_(resource2, 'L', 0, 0, () => {});
     const task2 = resources.queue_.tasks_[1];
-    expect(task2.priority).to.equal(LayoutPriority.ADS);
+    expect(task2.priority).to.equal(LayoutPriority_Enum.ADS);
 
-    resources.updateLayoutPriority(element, LayoutPriority.METADATA);
-    expect(resource.getLayoutPriority()).to.equal(LayoutPriority.METADATA);
+    resources.updateLayoutPriority(element, LayoutPriority_Enum.METADATA);
+    expect(resource.getLayoutPriority()).to.equal(LayoutPriority_Enum.METADATA);
     expect(resources.pass_.isPending()).to.be.true;
-    expect(task.priority).to.equal(LayoutPriority.METADATA);
+    expect(task.priority).to.equal(LayoutPriority_Enum.METADATA);
     // The other task is not updated.
-    expect(task2.priority).to.equal(LayoutPriority.ADS);
+    expect(task2.priority).to.equal(LayoutPriority_Enum.ADS);
   });
 });
 
@@ -614,7 +633,7 @@ describes.realWin('Resources discoverWork', {amp: true}, (env) => {
     element.isUpgraded = () => true;
     element.updateLayoutBox = () => {};
     element.getPlaceholder = () => null;
-    element.getLayoutPriority = () => LayoutPriority.CONTENT;
+    element.getLayoutPriority = () => LayoutPriority_Enum.CONTENT;
     element.getLayout = () => 'fixed';
 
     element.idleRenderOutsideViewport = () => true;
@@ -625,6 +644,7 @@ describes.realWin('Resources discoverWork', {amp: true}, (env) => {
     element.layoutCallback = () => Promise.resolve();
     element.viewportCallback = sandbox.spy();
     element.prerenderAllowed = () => true;
+    element.previewAllowed = () => true;
     element.renderOutsideViewport = () => true;
     element.isRelayoutNeeded = () => true;
     element.pause = () => {};
@@ -643,7 +663,7 @@ describes.realWin('Resources discoverWork', {amp: true}, (env) => {
 
   function createResource(id, rect) {
     const resource = new Resource(id, createElement(rect), resources);
-    resource.state_ = ResourceState.READY_FOR_LAYOUT;
+    resource.state_ = ResourceState_Enum.READY_FOR_LAYOUT;
     resource.layoutBox_ = rect;
     return resource;
   }
@@ -700,7 +720,7 @@ describes.realWin('Resources discoverWork', {amp: true}, (env) => {
     resources.visible_ = true;
     sandbox
       .stub(resources.ampdoc, 'getVisibilityState')
-      .returns(VisibilityState.VISIBLE);
+      .returns(VisibilityState_Enum.VISIBLE);
     viewportMock.expects('getRect').returns(layoutRectLtwh(0, 0, 300, 400));
     resource1.isBuilt = () => false;
     expect(resource1.hasBeenMeasured()).to.be.false;
@@ -715,7 +735,7 @@ describes.realWin('Resources discoverWork', {amp: true}, (env) => {
     resources.visible_ = true;
     sandbox
       .stub(resources.ampdoc, 'getVisibilityState')
-      .returns(VisibilityState.VISIBLE);
+      .returns(VisibilityState_Enum.VISIBLE);
     viewportMock.expects('getRect').returns(layoutRectLtwh(0, 0, 300, 400));
 
     resources.discoverWork_();
@@ -726,12 +746,12 @@ describes.realWin('Resources discoverWork', {amp: true}, (env) => {
   });
 
   it('should NOT rerender anything', () => {
-    resource1.state_ = ResourceState.LAYOUT_COMPLETE;
-    resource2.state_ = ResourceState.LAYOUT_COMPLETE;
+    resource1.state_ = ResourceState_Enum.LAYOUT_COMPLETE;
+    resource2.state_ = ResourceState_Enum.LAYOUT_COMPLETE;
     resources.visible_ = true;
     sandbox
       .stub(resources.ampdoc, 'getVisibilityState')
-      .returns(VisibilityState.VISIBLE);
+      .returns(VisibilityState_Enum.VISIBLE);
     viewportMock.expects('getRect').returns(layoutRectLtwh(0, 0, 300, 400));
 
     resources.discoverWork_();
@@ -740,8 +760,8 @@ describes.realWin('Resources discoverWork', {amp: true}, (env) => {
   });
 
   it('should re-render from requested position', () => {
-    resource1.state_ = ResourceState.LAYOUT_COMPLETE;
-    resource2.state_ = ResourceState.LAYOUT_COMPLETE;
+    resource1.state_ = ResourceState_Enum.LAYOUT_COMPLETE;
+    resource2.state_ = ResourceState_Enum.LAYOUT_COMPLETE;
     resource1.hasBeenMeasured = () => true;
     resource2.hasBeenMeasured = () => true;
     resource1.element.getBoundingClientRect = () =>
@@ -751,7 +771,7 @@ describes.realWin('Resources discoverWork', {amp: true}, (env) => {
     resources.visible_ = true;
     sandbox
       .stub(resources.ampdoc, 'getVisibilityState')
-      .returns(VisibilityState.VISIBLE);
+      .returns(VisibilityState_Enum.VISIBLE);
     resources.relayoutAll_ = false;
     resources.relayoutTop_ = 1000;
     viewportMock.expects('getRect').returns(layoutRectLtwh(0, 0, 300, 400));
@@ -761,15 +781,15 @@ describes.realWin('Resources discoverWork', {amp: true}, (env) => {
     expect(resources.relayoutTop_).to.equal(-1);
     expect(resources.queue_.getSize()).to.equal(1);
     expect(resources.queue_.tasks_[0].resource).to.equal(resource2);
-    expect(resource1.state_).to.equal(ResourceState.LAYOUT_COMPLETE);
-    expect(resource2.state_).to.equal(ResourceState.LAYOUT_SCHEDULED);
+    expect(resource1.state_).to.equal(ResourceState_Enum.LAYOUT_COMPLETE);
+    expect(resource2.state_).to.equal(ResourceState_Enum.LAYOUT_SCHEDULED);
   });
 
   it('should prerender only one screen in visibilityState=prerender', () => {
     resources.visible_ = false;
     sandbox
       .stub(resources.ampdoc, 'getVisibilityState')
-      .returns(VisibilityState.PRERENDER);
+      .returns(VisibilityState_Enum.PRERENDER);
     viewportMock.expects('getRect').returns(layoutRectLtwh(0, 0, 300, 1009));
 
     resources.discoverWork_();
@@ -780,12 +800,12 @@ describes.realWin('Resources discoverWork', {amp: true}, (env) => {
 
   // TODO(dvoytenko, #12476): Make this test work with sinon 4.0.
   it.skip('should remeasure when requested and scheduled unloads', () => {
-    resource1.state_ = ResourceState.LAYOUT_COMPLETE;
-    resource2.state_ = ResourceState.LAYOUT_COMPLETE;
+    resource1.state_ = ResourceState_Enum.LAYOUT_COMPLETE;
+    resource2.state_ = ResourceState_Enum.LAYOUT_COMPLETE;
     resources.visible_ = true;
     sandbox
       .stub(resources.ampdoc, 'getVisibilityState')
-      .returns(VisibilityState.VISIBLE);
+      .returns(VisibilityState_Enum.VISIBLE);
     viewportMock.expects('getRect').returns(layoutRectLtwh(0, 0, 300, 400));
 
     const resource1MeasureStub = sandbox
@@ -826,7 +846,7 @@ describes.realWin('Resources discoverWork', {amp: true}, (env) => {
 
   it('should eject stale tasks when element unloaded', () => {
     const pendingResource = createResource(5, layoutRectLtwh(0, 0, 0, 0));
-    pendingResource.state_ = ResourceState.NOT_BUILT;
+    pendingResource.state_ = ResourceState_Enum.NOT_BUILT;
     resources.pendingBuildResources_ = [pendingResource];
     resources.visible_ = true;
     // Don't resolve layout - immulating DOM being removed and load
@@ -840,7 +860,7 @@ describes.realWin('Resources discoverWork', {amp: true}, (env) => {
 
     sandbox
       .stub(resources.ampdoc, 'getVisibilityState')
-      .returns(VisibilityState.VISIBLE);
+      .returns(VisibilityState_Enum.VISIBLE);
     viewportMock
       .expects('getRect')
       .returns(layoutRectLtwh(0, 0, 300, 400))
@@ -891,14 +911,14 @@ describes.realWin('Resources discoverWork', {amp: true}, (env) => {
     resources.work_();
     expect(resources.exec_.getSize()).to.equal(1);
     expect(measureSpy).to.be.calledOnce;
-    expect(resource1.getState()).to.equal(ResourceState.LAYOUT_SCHEDULED);
+    expect(resource1.getState()).to.equal(ResourceState_Enum.LAYOUT_SCHEDULED);
   });
 
   it('should record layout schedule time on the resource element', () => {
     resources.scheduleLayoutOrPreload(resource1, true);
 
     resources.work_();
-    expect(resource1.getState()).to.equal(ResourceState.LAYOUT_SCHEDULED);
+    expect(resource1.getState()).to.equal(ResourceState_Enum.LAYOUT_SCHEDULED);
     expect(resource1.element.layoutScheduleTime).to.be.greaterThan(0);
   });
 
@@ -916,7 +936,7 @@ describes.realWin('Resources discoverWork', {amp: true}, (env) => {
     expect(resources.exec_.getSize()).to.equal(0);
     expect(measureSpy).to.be.calledOnce;
     expect(layoutCanceledSpy).to.be.calledOnce;
-    expect(resource1.getState()).to.equal(ResourceState.READY_FOR_LAYOUT);
+    expect(resource1.getState()).to.equal(ResourceState_Enum.READY_FOR_LAYOUT);
   });
 
   it('should force schedule resource execution outside viewport', () => {
@@ -936,7 +956,7 @@ describes.realWin('Resources discoverWork', {amp: true}, (env) => {
     resources.work_();
     expect(resources.exec_.getSize()).to.equal(1);
     expect(measureSpy).to.be.calledOnce;
-    expect(resource1.getState()).to.equal(ResourceState.LAYOUT_SCHEDULED);
+    expect(resource1.getState()).to.equal(ResourceState_Enum.LAYOUT_SCHEDULED);
   });
 
   it('should schedule resource prerender when doc in prerender mode', () => {
@@ -955,7 +975,7 @@ describes.realWin('Resources discoverWork', {amp: true}, (env) => {
     expect(resources.exec_.getSize()).to.equal(1);
     expect(measureSpy).to.be.calledOnce;
     expect(layoutCanceledSpy).to.not.be.called;
-    expect(resource1.getState()).to.equal(ResourceState.LAYOUT_SCHEDULED);
+    expect(resource1.getState()).to.equal(ResourceState_Enum.LAYOUT_SCHEDULED);
   });
 
   it('should not schedule resource prerender', () => {
@@ -974,7 +994,45 @@ describes.realWin('Resources discoverWork', {amp: true}, (env) => {
     expect(resources.exec_.getSize()).to.equal(0);
     expect(measureSpy).to.be.calledOnce;
     expect(layoutCanceledSpy).to.be.calledOnce;
-    expect(resource1.getState()).to.equal(ResourceState.READY_FOR_LAYOUT);
+    expect(resource1.getState()).to.equal(ResourceState_Enum.READY_FOR_LAYOUT);
+  });
+
+  it('should schedule resource preview when doc in preview mode', () => {
+    resources.scheduleLayoutOrPreload(resource1, true);
+    expect(resources.queue_.getSize()).to.equal(1);
+    expect(resources.queue_.tasks_[0].resource).to.equal(resource1);
+
+    resources.visible_ = false;
+    sandbox.stub(resources.ampdoc, 'getVisibilityState').returns('preview');
+    sandbox.stub(resource1, 'isInViewport').returns(true);
+    sandbox.stub(resource1, 'previewAllowed').returns(true);
+
+    const measureSpy = sandbox.spy(resource1, 'measure');
+    const layoutCanceledSpy = sandbox.spy(resource1, 'layoutCanceled');
+    resources.work_();
+    expect(resources.exec_.getSize()).to.equal(1);
+    expect(measureSpy).to.be.calledOnce;
+    expect(layoutCanceledSpy).to.not.be.called;
+    expect(resource1.getState()).to.equal(ResourceState_Enum.LAYOUT_SCHEDULED);
+  });
+
+  it('should not schedule resource preview', () => {
+    resources.scheduleLayoutOrPreload(resource1, true);
+    expect(resources.queue_.getSize()).to.equal(1);
+    expect(resources.queue_.tasks_[0].resource).to.equal(resource1);
+
+    resources.visible_ = false;
+    sandbox.stub(resources.ampdoc, 'getVisibilityState').returns('preview');
+    sandbox.stub(resource1, 'isInViewport').returns(true);
+    sandbox.stub(resource1, 'previewAllowed').returns(false);
+
+    const measureSpy = sandbox.spy(resource1, 'measure');
+    const layoutCanceledSpy = sandbox.spy(resource1, 'layoutCanceled');
+    resources.work_();
+    expect(resources.exec_.getSize()).to.equal(0);
+    expect(measureSpy).to.be.calledOnce;
+    expect(layoutCanceledSpy).to.be.calledOnce;
+    expect(resource1.getState()).to.equal(ResourceState_Enum.READY_FOR_LAYOUT);
   });
 
   it('should schedule resource execution when doc is hidden', () => {
@@ -995,14 +1053,11 @@ describes.realWin('Resources discoverWork', {amp: true}, (env) => {
     expect(layoutCanceledSpy).to.be.calledOnce;
   });
 
-  // TODO (#16156): this test results in too many calls to getRect on Safari
-  // TODO(jridgewell, #21546): fix this flaky test. Originally configured with:
-  // it.configure().skipSafari().run(
-  it.skip('should update inViewport before scheduling layouts', () => {
+  it('should update inViewport before scheduling layouts', () => {
     resources.visible_ = true;
     sandbox
       .stub(resources.ampdoc, 'getVisibilityState')
-      .returns(VisibilityState.VISIBLE);
+      .returns(VisibilityState_Enum.VISIBLE);
     viewportMock.expects('getRect').returns(layoutRectLtwh(0, 0, 300, 400));
     const setInViewport = sandbox.spy(resource1, 'setInViewport');
     const schedule = sandbox.spy(resources, 'scheduleLayoutOrPreload');
@@ -1024,7 +1079,7 @@ describes.realWin('Resources discoverWork', {amp: true}, (env) => {
       .onSecondCall()
       .returns(false);
     resource2.element.idleRenderOutsideViewport = () => false;
-    resource1.state_ = ResourceState.NOT_BUILT;
+    resource1.state_ = ResourceState_Enum.NOT_BUILT;
     resource1.build = sandbox.spy();
 
     resources.discoverWork_();
@@ -1048,7 +1103,7 @@ describes.realWin('Resources discoverWork', {amp: true}, (env) => {
       .onSecondCall()
       .returns(true);
     resource2.element.idleRenderOutsideViewport = () => false;
-    resource1.state_ = ResourceState.NOT_BUILT;
+    resource1.state_ = ResourceState_Enum.NOT_BUILT;
     resource1.build = sandbox.spy();
 
     resources.discoverWork_();
@@ -1060,13 +1115,31 @@ describes.realWin('Resources discoverWork', {amp: true}, (env) => {
   it('should NOT build non-prerenderable resources in prerender', () => {
     sandbox
       .stub(resources.ampdoc, 'getVisibilityState')
-      .returns(VisibilityState.PRERENDER);
+      .returns(VisibilityState_Enum.PRERENDER);
     sandbox.stub(resources, 'schedule_');
     resources.documentReady_ = true;
 
     resource1.element.isBuilt = () => false;
     resource1.prerenderAllowed = () => false;
-    resource1.state_ = ResourceState.NOT_BUILT;
+    resource1.state_ = ResourceState_Enum.NOT_BUILT;
+    resource1.build = sandbox.spy();
+    resource2.element.idleRenderOutsideViewport = () => false;
+
+    resources.discoverWork_();
+
+    expect(resource1.build).to.not.be.called;
+  });
+
+  it('should NOT build non-previewable resources in preview', () => {
+    sandbox
+      .stub(resources.ampdoc, 'getVisibilityState')
+      .returns(VisibilityState_Enum.PREVIEW);
+    sandbox.stub(resources, 'schedule_');
+    resources.documentReady_ = true;
+
+    resource1.element.isBuilt = () => false;
+    resource1.previewAllowed = () => false;
+    resource1.state_ = ResourceState_Enum.NOT_BUILT;
     resource1.build = sandbox.spy();
     resource2.element.idleRenderOutsideViewport = () => false;
 
@@ -1085,7 +1158,7 @@ describes.realWin('Resources discoverWork', {amp: true}, (env) => {
     resource1.element.idleRenderOutsideViewport = () => true;
     resource1.prerenderAllowed = () => true;
     resource1.isBuildRenderBlocking = () => false;
-    resource1.state_ = ResourceState.NOT_BUILT;
+    resource1.state_ = ResourceState_Enum.NOT_BUILT;
     resource1.build = sandbox.spy();
 
     resources.buildOrScheduleBuildForResource_(resource1);
@@ -1102,7 +1175,7 @@ describes.realWin('Resources discoverWork', {amp: true}, (env) => {
     resource1.element.idleRenderOutsideViewport = () => true;
     resource1.prerenderAllowed = () => true;
     resource1.isBuildRenderBlocking = () => true;
-    resource1.state_ = ResourceState.NOT_BUILT;
+    resource1.state_ = ResourceState_Enum.NOT_BUILT;
     resource1.build = sandbox.spy();
 
     resources.buildOrScheduleBuildForResource_(resource1);
@@ -1118,7 +1191,7 @@ describes.realWin('Resources discoverWork', {amp: true}, (env) => {
     resource1.element.idleRenderOutsideViewport = () => true;
     resource2.element.renderOutsideViewport = () => false;
     resource2.element.idleRenderOutsideViewport = () => false;
-    resource1.state_ = ResourceState.READY_FOR_LAYOUT;
+    resource1.state_ = ResourceState_Enum.READY_FOR_LAYOUT;
 
     resources.discoverWork_();
 
@@ -1132,7 +1205,7 @@ describes.realWin('Resources discoverWork', {amp: true}, (env) => {
     // Emulates a resource not building.
     resource1.element.isBuilt = sandbox.stub().returns(false);
     resource2.element.idleRenderOutsideViewport = () => false;
-    resource1.state_ = ResourceState.NOT_BUILT;
+    resource1.state_ = ResourceState_Enum.NOT_BUILT;
     resource1.build = sandbox.spy();
 
     resources.discoverWork_();
@@ -1311,7 +1384,7 @@ describes.fakeWin('Resources.add/upgrade/remove', {amp: true}, (env) => {
   function createElementWithResource(id) {
     const element = createElement();
     const resource = new Resource(id, element, resources);
-    resource.state_ = ResourceState.NOT_BUILT;
+    resource.state_ = ResourceState_Enum.NOT_BUILT;
     resource.element['__AMP__RESOURCE'] = resource;
     return [element, resource];
   }
@@ -1372,61 +1445,53 @@ describes.fakeWin('Resources.add/upgrade/remove', {amp: true}, (env) => {
     });
   });
 
-  // TODO(jridgewell, #15748): Fails on Safari 11.1.0.
-  it.configure().skipSafari(
-    'should not schedule pass when immediate build fails',
-    () => {
-      const schedulePassStub = sandbox.stub(resources, 'schedulePass');
-      child1.isBuilt = () => false;
-      const child1BuildSpy = sandbox.spy();
-      child1.buildInternal = () => {
-        // Emulate an error happening during an element build.
-        child1BuildSpy();
-        return Promise.reject(new Error('child1-build-error'));
-      };
-      resources.documentReady_ = true;
-      resources.add(child1);
-      const resource1 = stubBuild(Resource.forElementOptional(child1));
-      resources.upgraded(child1);
-      expect(resources.get()).to.contain(resource1);
-      return resource1.buildPromise.then(
-        () => {
-          throw new Error('must have failed');
-        },
-        () => {
-          expect(child1BuildSpy).to.be.calledOnce;
-          expect(schedulePassStub).to.not.be.called;
-          expect(resources.get()).to.not.contain(resource1);
-        }
-      );
-    }
-  );
+  it('should not schedule pass when immediate build fails', () => {
+    const schedulePassStub = sandbox.stub(resources, 'schedulePass');
+    child1.isBuilt = () => false;
+    const child1BuildSpy = sandbox.spy();
+    child1.buildInternal = () => {
+      // Emulate an error happening during an element build.
+      child1BuildSpy();
+      return Promise.reject(new Error('child1-build-error'));
+    };
+    resources.documentReady_ = true;
+    resources.add(child1);
+    const resource1 = stubBuild(Resource.forElementOptional(child1));
+    resources.upgraded(child1);
+    expect(resources.get()).to.contain(resource1);
+    return resource1.buildPromise.then(
+      () => {
+        throw new Error('must have failed');
+      },
+      () => {
+        expect(child1BuildSpy).to.be.calledOnce;
+        expect(schedulePassStub).to.not.be.called;
+        expect(resources.get()).to.not.contain(resource1);
+      }
+    );
+  });
 
-  // TODO(amphtml, #15748): Fails on Safari 11.1.0.
-  it.configure().skipSafari(
-    'should add element to pending build when document is not ready',
-    () => {
-      child1.isBuilt = () => false;
-      child2.isBuilt = () => false;
-      resources.buildReadyResources_ = sandbox.spy();
-      resources.documentReady_ = false;
-      resources.add(child1);
-      resources.upgraded(child1);
-      expect(child1.buildInternal.called).to.be.false;
-      expect(resources.pendingBuildResources_.length).to.be.equal(1);
-      resources.add(child2);
-      resources.upgraded(child2);
-      expect(child2.buildInternal.called).to.be.false;
-      expect(resources.pendingBuildResources_.length).to.be.equal(2);
-      expect(resources.buildReadyResources_.calledTwice).to.be.true;
-      const resource1 = Resource.forElementOptional(child1);
-      const resource2 = Resource.forElementOptional(child2);
-      expect(resources.get()).to.contain(resource1);
-      expect(resources.get()).to.contain(resource2);
-      expect(resource1.isBuilding()).to.be.false;
-      expect(resource2.isBuilding()).to.be.false;
-    }
-  );
+  it('should add element to pending build when document is not ready', () => {
+    child1.isBuilt = () => false;
+    child2.isBuilt = () => false;
+    resources.buildReadyResources_ = sandbox.spy();
+    resources.documentReady_ = false;
+    resources.add(child1);
+    resources.upgraded(child1);
+    expect(child1.buildInternal.called).to.be.false;
+    expect(resources.pendingBuildResources_.length).to.be.equal(1);
+    resources.add(child2);
+    resources.upgraded(child2);
+    expect(child2.buildInternal.called).to.be.false;
+    expect(resources.pendingBuildResources_.length).to.be.equal(2);
+    expect(resources.buildReadyResources_.calledTwice).to.be.true;
+    const resource1 = Resource.forElementOptional(child1);
+    const resource2 = Resource.forElementOptional(child2);
+    expect(resources.get()).to.contain(resource1);
+    expect(resources.get()).to.contain(resource2);
+    expect(resource1.isBuilding()).to.be.false;
+    expect(resource2.isBuilding()).to.be.false;
+  });
 
   describe('buildReadyResources_', () => {
     let schedulePassStub;
@@ -1441,47 +1506,43 @@ describes.fakeWin('Resources.add/upgrade/remove', {amp: true}, (env) => {
       resources.resources_ = [resource1, resource2];
     });
 
-    // TODO(amphtml, #15748): Fails on Safari 11.1.0.
-    it.configure().skipSafari(
-      'should build ready resources and remove them from pending',
-      () => {
-        resources.pendingBuildResources_ = [resource1, resource2];
-        resources.buildReadyResources_();
-        expect(child1.buildInternal.called).to.be.false;
-        expect(child2.buildInternal.called).to.be.false;
-        expect(resources.pendingBuildResources_.length).to.be.equal(2);
-        expect(resources.schedulePass.called).to.be.false;
+    it('should build ready resources and remove them from pending', () => {
+      resources.pendingBuildResources_ = [resource1, resource2];
+      resources.buildReadyResources_();
+      expect(child1.buildInternal.called).to.be.false;
+      expect(child2.buildInternal.called).to.be.false;
+      expect(resources.pendingBuildResources_.length).to.be.equal(2);
+      expect(resources.schedulePass.called).to.be.false;
 
-        child1.nextSibling = child2;
-        resources.buildReadyResources_();
-        expect(child1.buildInternal.called).to.be.true;
-        expect(child2.buildInternal.called).to.be.false;
-        expect(resources.pendingBuildResources_.length).to.be.equal(1);
-        expect(resources.pendingBuildResources_[0]).to.be.equal(resource2);
-        expect(resource1.isBuilding()).to.be.true;
-        expect(resource2.isBuilding()).to.be.false;
-        return resource1.buildPromise
-          .then(() => {
-            expect(resources.schedulePass.calledOnce).to.be.true;
-
-            child2.parentNode = parent;
-            parent.nextSibling = true;
-            resources.buildReadyResources_();
-            expect(child1.buildInternal).to.be.calledOnce;
-            expect(child2.buildInternal.called).to.be.true;
-            expect(resources.pendingBuildResources_.length).to.be.equal(0);
-            expect(resource2.isBuilding()).to.be.true;
-            return resource2.buildPromise;
-          })
-          .then(() => {
-            expect(resources.get()).to.contain(resource1);
-            expect(resources.get()).to.contain(resource2);
-            expect(resource1.isBuilding()).to.be.false;
-            expect(resource2.isBuilding()).to.be.false;
-            expect(resources.schedulePass.calledTwice).to.be.true;
-          });
-      }
-    );
+      child1.nextSibling = child2;
+      resources.buildReadyResources_();
+      expect(child1.buildInternal.called).to.be.true;
+      expect(child2.buildInternal.called).to.be.false;
+      expect(resources.pendingBuildResources_.length).to.be.equal(1);
+      expect(resources.pendingBuildResources_[0]).to.be.equal(resource2);
+      expect(resource1.isBuilding()).to.be.true;
+      expect(resource2.isBuilding()).to.be.false;
+      return resource1.buildPromise
+        .then(() => {
+          expect(resources.schedulePass.calledOnce).to.be.true;
+
+          child2.parentNode = parent;
+          parent.nextSibling = true;
+          resources.buildReadyResources_();
+          expect(child1.buildInternal).to.be.calledOnce;
+          expect(child2.buildInternal.called).to.be.true;
+          expect(resources.pendingBuildResources_.length).to.be.equal(0);
+          expect(resource2.isBuilding()).to.be.true;
+          return resource2.buildPromise;
+        })
+        .then(() => {
+          expect(resources.get()).to.contain(resource1);
+          expect(resources.get()).to.contain(resource2);
+          expect(resource1.isBuilding()).to.be.false;
+          expect(resource2.isBuilding()).to.be.false;
+          expect(resources.schedulePass.calledTwice).to.be.true;
+        });
+    });
 
     it('should NOT build past the root node when pending', () => {
       resources.pendingBuildResources_ = [resource1];
@@ -1536,82 +1597,69 @@ describes.fakeWin('Resources.add/upgrade/remove', {amp: true}, (env) => {
       expect(resources.pendingBuildResources_.length).to.be.equal(0);
     });
 
-    // TODO(amphtml, #15748): Fails on Safari 11.1.0.
-    it.configure().skipSafari(
-      'should build everything pending when document is ready',
-      () => {
-        resources.documentReady_ = true;
-        resources.pendingBuildResources_ = [
-          parentResource,
-          resource1,
-          resource2,
-        ];
-        const child1BuildSpy = sandbox.spy();
-        child1.buildInternal = () => {
-          // Emulate an error happening during an element build.
-          child1BuildSpy();
-          return Promise.reject(new Error('child1-build-error'));
-        };
-        resources.buildReadyResources_();
-        expect(child1BuildSpy.called).to.be.true;
-        expect(child2.buildInternal.called).to.be.true;
-        expect(parent.buildInternal.called).to.be.true;
-        expect(resources.pendingBuildResources_.length).to.be.equal(0);
-        return Promise.all([
-          parentResource.buildPromise,
-          resource2.buildPromise,
-          resource1.buildPromise.then(
-            () => {
-              throw new Error('must have failed');
-            },
-            () => {
-              // Ignore error.
-            }
-          ),
-        ]).then(() => {
-          expect(schedulePassStub).to.be.calledTwice;
-          // Failed build.
-          expect(resources.get()).to.not.contain(resource1);
-          expect(resource1.isBuilding()).to.be.false;
-          // Successful build.
-          expect(resources.get()).to.contain(resource2);
-          expect(resource2.isBuilding()).to.be.false;
-        });
-      }
-    );
-
-    // TODO(amphtml, #15748): Fails on Safari 11.1.0.
-    it.configure().skipSafari(
-      'should not schedule pass if all builds failed',
-      () => {
-        resources.documentReady_ = true;
-        resources.pendingBuildResources_ = [resource1];
-        const child1BuildSpy = sandbox.spy();
-        child1.buildInternal = () => {
-          // Emulate an error happening during an element build.
-          child1BuildSpy();
-          return Promise.reject(new Error('child1-build-error'));
-        };
-        resources.buildReadyResources_();
-        expect(child1BuildSpy.called).to.be.true;
-        expect(resources.pendingBuildResources_.length).to.be.equal(0);
-        return resource1.buildPromise.then(
+    it('should build everything pending when document is ready', () => {
+      resources.documentReady_ = true;
+      resources.pendingBuildResources_ = [parentResource, resource1, resource2];
+      const child1BuildSpy = sandbox.spy();
+      child1.buildInternal = () => {
+        // Emulate an error happening during an element build.
+        child1BuildSpy();
+        return Promise.reject(new Error('child1-build-error'));
+      };
+      resources.buildReadyResources_();
+      expect(child1BuildSpy.called).to.be.true;
+      expect(child2.buildInternal.called).to.be.true;
+      expect(parent.buildInternal.called).to.be.true;
+      expect(resources.pendingBuildResources_.length).to.be.equal(0);
+      return Promise.all([
+        parentResource.buildPromise,
+        resource2.buildPromise,
+        resource1.buildPromise.then(
           () => {
             throw new Error('must have failed');
           },
           () => {
-            expect(schedulePassStub).to.not.be.called;
-            expect(resources.get()).to.not.contain(resource1);
-            expect(resource1.isBuilding()).to.be.false;
+            // Ignore error.
           }
-        );
-      }
-    );
+        ),
+      ]).then(() => {
+        expect(schedulePassStub).to.be.calledTwice;
+        // Failed build.
+        expect(resources.get()).to.not.contain(resource1);
+        expect(resource1.isBuilding()).to.be.false;
+        // Successful build.
+        expect(resources.get()).to.contain(resource2);
+        expect(resource2.isBuilding()).to.be.false;
+      });
+    });
+
+    it('should not schedule pass if all builds failed', () => {
+      resources.documentReady_ = true;
+      resources.pendingBuildResources_ = [resource1];
+      const child1BuildSpy = sandbox.spy();
+      child1.buildInternal = () => {
+        // Emulate an error happening during an element build.
+        child1BuildSpy();
+        return Promise.reject(new Error('child1-build-error'));
+      };
+      resources.buildReadyResources_();
+      expect(child1BuildSpy.called).to.be.true;
+      expect(resources.pendingBuildResources_.length).to.be.equal(0);
+      return resource1.buildPromise.then(
+        () => {
+          throw new Error('must have failed');
+        },
+        () => {
+          expect(schedulePassStub).to.not.be.called;
+          expect(resources.get()).to.not.contain(resource1);
+          expect(resource1.isBuilding()).to.be.false;
+        }
+      );
+    });
   });
 
   describe('remove', () => {
-    // TODO(amphtml, #15748): Fails on Safari 11.1.0.
-    it.configure().skipSafari('should remove resource and pause', () => {
+    it('should remove resource and pause', () => {
       child1.isBuilt = () => true;
       resources.add(child1);
       const resource = child1['__AMP__RESOURCE'];
@@ -1626,9 +1674,9 @@ describes.fakeWin('Resources.add/upgrade/remove', {amp: true}, (env) => {
 
   it("remove should remove all of a resource's tasks", () => {
     const states = [
-      ResourceState.NOT_LAID_OUT,
-      ResourceState.READY_FOR_LAYOUT,
-      ResourceState.LAYOUT_SCHEDULED,
+      ResourceState_Enum.NOT_LAID_OUT,
+      ResourceState_Enum.READY_FOR_LAYOUT,
+      ResourceState_Enum.LAYOUT_SCHEDULED,
     ];
 
     states.forEach((state) => {
@@ -1660,8 +1708,7 @@ describes.fakeWin('Resources.add/upgrade/remove', {amp: true}, (env) => {
       resources.remove(child1);
     });
 
-    // TODO(amphtml, #15748): Fails on Safari 11.1.0.
-    it.configure().skipSafari('should keep reference to the resource', () => {
+    it('should keep reference to the resource', () => {
       expect(resource).to.not.be.null;
       expect(Resource.forElementOptional(child1)).to.equal(resource);
       expect(resources.get()).to.not.contain(resource);
diff --git a/test/unit/test-runtime.js b/test/unit/test-runtime.js
index ee2633b385ed..4cab5719eed2 100644
--- a/test/unit/test-runtime.js
+++ b/test/unit/test-runtime.js
@@ -1868,64 +1868,52 @@ describes.realWin(
           };
         }
 
-        it.configure()
-          .skipFirefox()
-          .run('should broadcast to all but sender', () => {
-            doc1.viewer.broadcast({test: 1});
-            return doc1.viewer
-              .sendMessageAwaitResponse('ignore', {})
-              .then(() => {
-                // Sender is not called.
-                expect(doc1.broadcastReceived).to.not.be.called;
-
-                // All others are called.
-                expect(doc2.broadcastReceived).to.be.calledOnce;
-                expect(doc2.broadcastReceived.args[0][0]).deep.equal({test: 1});
-                expect(doc3.broadcastReceived).to.be.calledOnce;
-                expect(doc3.broadcastReceived.args[0][0]).deep.equal({test: 1});
-
-                // None of the onMessage are called.
-                expect(doc1.onMessage).to.not.be.called;
-                expect(doc2.onMessage).to.not.be.called;
-                expect(doc3.onMessage).to.not.be.called;
-              });
+        it('should broadcast to all but sender', () => {
+          doc1.viewer.broadcast({test: 1});
+          return doc1.viewer.sendMessageAwaitResponse('ignore', {}).then(() => {
+            // Sender is not called.
+            expect(doc1.broadcastReceived).to.not.be.called;
+
+            // All others are called.
+            expect(doc2.broadcastReceived).to.be.calledOnce;
+            expect(doc2.broadcastReceived.args[0][0]).deep.equal({test: 1});
+            expect(doc3.broadcastReceived).to.be.calledOnce;
+            expect(doc3.broadcastReceived.args[0][0]).deep.equal({test: 1});
+
+            // None of the onMessage are called.
+            expect(doc1.onMessage).to.not.be.called;
+            expect(doc2.onMessage).to.not.be.called;
+            expect(doc3.onMessage).to.not.be.called;
           });
+        });
 
-        it.configure()
-          .skipFirefox()
-          .run('should stop broadcasting after close', () => {
-            doc3.amp.close();
-            doc1.viewer.broadcast({test: 1});
-            return doc1.viewer
-              .sendMessageAwaitResponse('ignore', {})
-              .then(() => {
-                // Sender is not called, closed is not called.
-                expect(doc1.broadcastReceived).to.not.be.called;
-                expect(doc3.broadcastReceived).to.not.be.called;
-
-                // All others are called.
-                expect(doc2.broadcastReceived).to.be.calledOnce;
-                expect(doc2.broadcastReceived.args[0][0]).deep.equal({test: 1});
-              });
+        it('should stop broadcasting after close', () => {
+          doc3.amp.close();
+          doc1.viewer.broadcast({test: 1});
+          return doc1.viewer.sendMessageAwaitResponse('ignore', {}).then(() => {
+            // Sender is not called, closed is not called.
+            expect(doc1.broadcastReceived).to.not.be.called;
+            expect(doc3.broadcastReceived).to.not.be.called;
+
+            // All others are called.
+            expect(doc2.broadcastReceived).to.be.calledOnce;
+            expect(doc2.broadcastReceived.args[0][0]).deep.equal({test: 1});
           });
+        });
 
-        it.configure()
-          .skipFirefox()
-          .run('should stop broadcasting after force-close', () => {
-            doc3.hostElement.parentNode.removeChild(doc3.hostElement);
-            doc1.viewer.broadcast({test: 1});
-            return doc1.viewer
-              .sendMessageAwaitResponse('ignore', {})
-              .then(() => {
-                // Sender is not called, closed is not called.
-                expect(doc1.broadcastReceived).to.not.be.called;
-                expect(doc3.broadcastReceived).to.not.be.called;
-
-                // All others are called.
-                expect(doc2.broadcastReceived).to.be.calledOnce;
-                expect(doc2.broadcastReceived.args[0][0]).deep.equal({test: 1});
-              });
+        it('should stop broadcasting after force-close', () => {
+          doc3.hostElement.parentNode.removeChild(doc3.hostElement);
+          doc1.viewer.broadcast({test: 1});
+          return doc1.viewer.sendMessageAwaitResponse('ignore', {}).then(() => {
+            // Sender is not called, closed is not called.
+            expect(doc1.broadcastReceived).to.not.be.called;
+            expect(doc3.broadcastReceived).to.not.be.called;
+
+            // All others are called.
+            expect(doc2.broadcastReceived).to.be.calledOnce;
+            expect(doc2.broadcastReceived.args[0][0]).deep.equal({test: 1});
           });
+        });
 
         it('should send message', () => {
           doc1.onMessage.returns(Promise.resolve());
diff --git a/test/unit/test-sanitizer.js b/test/unit/test-sanitizer.js
index 6728dc1a6e05..77ba789f1c10 100644
--- a/test/unit/test-sanitizer.js
+++ b/test/unit/test-sanitizer.js
@@ -2,11 +2,12 @@ import {sanitizeHtml, sanitizeTagsForTripleMustache} from '../../src/sanitizer';
 
 let sanitize;
 let html;
+let documentEl;
 
 describes.sandboxed('Caja-based', {}, () => {
   beforeEach(() => {
     html = document.createElement('html');
-    const documentEl = {documentElement: html};
+    documentEl = {documentElement: html};
     sanitize = (html) => sanitizeHtml(html, documentEl);
   });
 
@@ -422,43 +423,54 @@ function runSanitizerTests() {
 
   describe('sanitizeTagsForTripleMustache', () => {
     it('should output basic text', () => {
-      expect(sanitizeTagsForTripleMustache('abc')).to.be.equal('abc');
+      expect(sanitizeTagsForTripleMustache('abc', documentEl)).to.be.equal(
+        'abc'
+      );
     });
 
     it('should output valid markup', () => {
-      expect(sanitizeTagsForTripleMustache('<b>abc</b>')).to.be.equal(
-        '<b>abc</b>'
-      );
-      expect(sanitizeTagsForTripleMustache('<b>ab<br>c</b>')).to.be.equal(
-        '<b>ab<br>c</b>'
-      );
-      expect(sanitizeTagsForTripleMustache('<b>a<i>b</i>c</b>')).to.be.equal(
-        '<b>a<i>b</i>c</b>'
-      );
+      expect(
+        sanitizeTagsForTripleMustache('<b>abc</b>', documentEl)
+      ).to.be.equal('<b>abc</b>');
+      expect(
+        sanitizeTagsForTripleMustache('<b>ab<br>c</b>', documentEl)
+      ).to.be.equal('<b>ab<br>c</b>');
+      expect(
+        sanitizeTagsForTripleMustache('<b>a<i>b</i>c</b>', documentEl)
+      ).to.be.equal('<b>a<i>b</i>c</b>');
       const markupWithClassAttribute = '<p class="some-class">heading</p>';
       expect(
-        sanitizeTagsForTripleMustache(markupWithClassAttribute)
+        sanitizeTagsForTripleMustache(markupWithClassAttribute, documentEl)
       ).to.be.equal(markupWithClassAttribute);
       const markupWithClassesAttribute =
         '<div class="some-class another"><span>heading</span></div>';
       expect(
-        sanitizeTagsForTripleMustache(markupWithClassesAttribute)
+        sanitizeTagsForTripleMustache(markupWithClassesAttribute, documentEl)
       ).to.be.equal(markupWithClassesAttribute);
       const markupParagraph = '<p class="valid-class">paragraph</p>';
-      expect(sanitizeTagsForTripleMustache(markupParagraph)).to.be.equal(
-        markupParagraph
-      );
+      expect(
+        sanitizeTagsForTripleMustache(markupParagraph, documentEl)
+      ).to.be.equal(markupParagraph);
     });
 
     it('should NOT output non-allowlisted markup', () => {
-      expect(sanitizeTagsForTripleMustache('a<style>b</style>c')).to.be.equal(
+      expect(
+        sanitizeTagsForTripleMustache('a<style>b</style>c', documentEl)
+      ).to.be.equal('ac');
+      expect(sanitizeTagsForTripleMustache('a<img>c', documentEl)).to.be.equal(
         'ac'
       );
-      expect(sanitizeTagsForTripleMustache('a<img>c')).to.be.equal('ac');
+    });
+
+    it('should not allowlist amp-img element for AMP4Email', () => {
+      html.setAttribute('amp4email', '');
+      expect(
+        sanitizeTagsForTripleMustache('a<amp-img></amp-img>c', documentEl)
+      ).to.be.equal('ac');
     });
 
     it('should compensate for broken markup', () => {
-      expect(sanitizeTagsForTripleMustache('<b>a<i>b')).to.be.equal(
+      expect(sanitizeTagsForTripleMustache('<b>a<i>b', documentEl)).to.be.equal(
         '<b>a<i>b</i></b>'
       );
     });
diff --git a/test/unit/test-scheduler.js b/test/unit/test-scheduler.js
index a2656592f363..d30766552b84 100644
--- a/test/unit/test-scheduler.js
+++ b/test/unit/test-scheduler.js
@@ -1,7 +1,7 @@
 import * as fakeTimers from '@sinonjs/fake-timers';
 
 import {createElementWithAttributes} from '#core/dom';
-import {LayoutPriority} from '#core/dom/layout';
+import {LayoutPriority_Enum} from '#core/dom/layout';
 
 import {READY_SCAN_SIGNAL} from '#service/resources-interface';
 import {Scheduler} from '#service/scheduler';
@@ -57,8 +57,9 @@ describes.realWin('Scheduler', {amp: true}, (env) => {
     });
     element.deferredMount = () => options.deferredMount || false;
     element.prerenderAllowed = () => options.prerenderAllowed || false;
+    element.previewAllowed = () => options.previewAllowed || false;
     element.getBuildPriority = () =>
-      options.buildPriority || LayoutPriority.CONTENT;
+      options.buildPriority || LayoutPriority_Enum.CONTENT;
     element.mountInternal = env.sandbox.stub();
     return element;
   }
@@ -203,112 +204,280 @@ describes.realWin('Scheduler', {amp: true}, (env) => {
   });
 
   describe('wait for document visibility', () => {
-    beforeEach(async () => {
-      ampdoc.overrideVisibilityState('prerender');
-      await setAmpdocReady();
-    });
+    describe('visibility state: prerender', () => {
+      beforeEach(async () => {
+        ampdoc.overrideVisibilityState('prerender');
+        await setAmpdocReady();
+      });
 
-    it('should build if prerenderAllowed', () => {
-      const element = createAmpElement({
-        deferredMount: false,
-        prerenderAllowed: true,
+      it('should build if prerenderAllowed', () => {
+        const element = createAmpElement({
+          deferredMount: false,
+          prerenderAllowed: true,
+        });
+        scheduler.schedule(element);
+        clock.tick(1);
+        expect(element.mountInternal).to.be.calledOnce;
       });
-      scheduler.schedule(element);
-      clock.tick(1);
-      expect(element.mountInternal).to.be.calledOnce;
-    });
 
-    it('should build asap if prerenderAllowed', () => {
-      const element = createAmpElement({
-        deferredMount: true,
-        prerenderAllowed: true,
+      it('should build asap if prerenderAllowed', () => {
+        const element = createAmpElement({
+          deferredMount: true,
+          prerenderAllowed: true,
+        });
+        scheduler.scheduleAsap(element);
+        clock.tick(1);
+        expect(element.mountInternal).to.be.calledOnce;
       });
-      scheduler.scheduleAsap(element);
-      clock.tick(1);
-      expect(element.mountInternal).to.be.calledOnce;
-    });
 
-    it('should NOT build if not prerenderAllowed', () => {
-      const element = createAmpElement({
-        deferredMount: false,
-        prerenderAllowed: false,
+      it('should NOT build if not prerenderAllowed', () => {
+        const element = createAmpElement({
+          deferredMount: false,
+          prerenderAllowed: false,
+        });
+        scheduler.schedule(element);
+        clock.tick(1);
+        expect(element.mountInternal).to.be.not.called;
       });
-      scheduler.schedule(element);
-      clock.tick(1);
-      expect(element.mountInternal).to.be.not.called;
-    });
 
-    it('should NOT build asap if not prerenderAllowed', () => {
-      const element = createAmpElement({
-        deferredMount: true,
-        prerenderAllowed: false,
+      it('should NOT build asap if not prerenderAllowed', () => {
+        const element = createAmpElement({
+          deferredMount: true,
+          prerenderAllowed: false,
+        });
+        scheduler.scheduleAsap(element);
+        clock.tick(1);
+        expect(element.mountInternal).to.be.not.called;
       });
-      scheduler.scheduleAsap(element);
-      clock.tick(1);
-      expect(element.mountInternal).to.be.not.called;
-    });
 
-    it('should build when becomes visible', () => {
-      const element = createAmpElement({prerenderAllowed: false});
-      scheduler.schedule(element);
-      clock.tick(1);
-      expect(element.mountInternal).to.not.be.called;
+      it('should build when becomes preview if previewAllowed', () => {
+        const element = createAmpElement({
+          prerenderAllowed: false,
+          previewAllowed: true,
+        });
+        scheduler.schedule(element);
+        clock.tick(1);
+        expect(element.mountInternal).to.not.be.called;
+
+        ampdoc.overrideVisibilityState('preview');
+        clock.tick(1);
+        expect(element.mountInternal).to.be.calledOnce;
+      });
 
-      ampdoc.overrideVisibilityState('visible');
-      clock.tick(1);
-      expect(element.mountInternal).to.be.calledOnce;
-    });
+      it('should NOT build when becomes preview if not previewAllowed', () => {
+        const element = createAmpElement({
+          prerenderAllowed: false,
+          previewAllowed: false,
+        });
+        scheduler.schedule(element);
+        clock.tick(1);
+        expect(element.mountInternal).to.not.be.called;
+
+        ampdoc.overrideVisibilityState('preview');
+        clock.tick(1);
+        expect(element.mountInternal).to.not.be.called;
+      });
 
-    it('should build when becomes hidden', () => {
-      const element = createAmpElement({prerenderAllowed: false});
-      scheduler.schedule(element);
-      clock.tick(1);
-      expect(element.mountInternal).to.not.be.called;
+      it('should build when becomes visible', () => {
+        const element = createAmpElement({prerenderAllowed: false});
+        scheduler.schedule(element);
+        clock.tick(1);
+        expect(element.mountInternal).to.not.be.called;
 
-      ampdoc.overrideVisibilityState('hidden');
-      clock.tick(1);
-      expect(element.mountInternal).to.be.calledOnce;
-    });
+        ampdoc.overrideVisibilityState('visible');
+        clock.tick(1);
+        expect(element.mountInternal).to.be.calledOnce;
+      });
 
-    it('should NOT build when becomes paused or inactive', () => {
-      const element = createAmpElement({prerenderAllowed: false});
-      scheduler.schedule(element);
-      clock.tick(1);
-      expect(element.mountInternal).to.not.be.called;
+      it('should build when becomes hidden', () => {
+        const element = createAmpElement({prerenderAllowed: false});
+        scheduler.schedule(element);
+        clock.tick(1);
+        expect(element.mountInternal).to.not.be.called;
 
-      ampdoc.overrideVisibilityState('paused');
-      clock.tick(1);
-      expect(element.mountInternal).to.not.be.called;
+        ampdoc.overrideVisibilityState('hidden');
+        clock.tick(1);
+        expect(element.mountInternal).to.be.calledOnce;
+      });
 
-      ampdoc.overrideVisibilityState('inactive');
-      clock.tick(1);
-      expect(element.mountInternal).to.not.be.called;
-    });
+      it('should NOT build when becomes paused or inactive', () => {
+        const element = createAmpElement({prerenderAllowed: false});
+        scheduler.schedule(element);
+        clock.tick(1);
+        expect(element.mountInternal).to.not.be.called;
 
-    it('should NOT build when scheduled in paused', () => {
-      ampdoc.overrideVisibilityState('paused');
+        ampdoc.overrideVisibilityState('paused');
+        clock.tick(1);
+        expect(element.mountInternal).to.not.be.called;
 
-      const element = createAmpElement({prerenderAllowed: false});
-      scheduler.schedule(element);
-      clock.tick(1);
-      expect(element.mountInternal).to.not.be.called;
+        ampdoc.overrideVisibilityState('inactive');
+        clock.tick(1);
+        expect(element.mountInternal).to.not.be.called;
+      });
 
-      ampdoc.overrideVisibilityState('visible');
-      clock.tick(1);
-      expect(element.mountInternal).to.be.calledOnce;
+      it('should NOT build when scheduled in paused', () => {
+        ampdoc.overrideVisibilityState('paused');
+
+        const element = createAmpElement({prerenderAllowed: false});
+        scheduler.schedule(element);
+        clock.tick(1);
+        expect(element.mountInternal).to.not.be.called;
+
+        ampdoc.overrideVisibilityState('visible');
+        clock.tick(1);
+        expect(element.mountInternal).to.be.calledOnce;
+      });
+
+      it('should NOT build when scheduled in inactive', () => {
+        ampdoc.overrideVisibilityState('inactive');
+
+        const element = createAmpElement({prerenderAllowed: false});
+        scheduler.schedule(element);
+        clock.tick(1);
+        expect(element.mountInternal).to.not.be.called;
+
+        ampdoc.overrideVisibilityState('visible');
+        clock.tick(1);
+        expect(element.mountInternal).to.be.calledOnce;
+      });
     });
 
-    it('should NOT build when scheduled in inactive', () => {
-      ampdoc.overrideVisibilityState('inactive');
+    describe('visibility state: preview', () => {
+      beforeEach(async () => {
+        ampdoc.overrideVisibilityState('preview');
+        await setAmpdocReady();
+      });
 
-      const element = createAmpElement({prerenderAllowed: false});
-      scheduler.schedule(element);
-      clock.tick(1);
-      expect(element.mountInternal).to.not.be.called;
+      it('should build if previewAllowed', () => {
+        const element = createAmpElement({
+          deferredMount: false,
+          previewAllowed: true,
+        });
+        scheduler.schedule(element);
+        clock.tick(1);
+        expect(element.mountInternal).to.be.calledOnce;
+      });
 
-      ampdoc.overrideVisibilityState('visible');
-      clock.tick(1);
-      expect(element.mountInternal).to.be.calledOnce;
+      it('should build asap if previewAllowed', () => {
+        const element = createAmpElement({
+          deferredMount: true,
+          previewAllowed: true,
+        });
+        scheduler.scheduleAsap(element);
+        clock.tick(1);
+        expect(element.mountInternal).to.be.calledOnce;
+      });
+
+      it('should NOT build if not previewAllowed', () => {
+        const element = createAmpElement({
+          deferredMount: false,
+          previewAllowed: false,
+        });
+        scheduler.schedule(element);
+        clock.tick(1);
+        expect(element.mountInternal).to.be.not.called;
+      });
+
+      it('should NOT build asap if not previewAllowed', () => {
+        const element = createAmpElement({
+          deferredMount: true,
+          previewAllowed: false,
+        });
+        scheduler.scheduleAsap(element);
+        clock.tick(1);
+        expect(element.mountInternal).to.be.not.called;
+      });
+
+      it('should build when becomes prerender if prerenderAllowed', () => {
+        const element = createAmpElement({
+          prerenderAllowed: true,
+          previewAllowed: false,
+        });
+        scheduler.schedule(element);
+        clock.tick(1);
+        expect(element.mountInternal).to.not.be.called;
+
+        ampdoc.overrideVisibilityState('prerender');
+        clock.tick(1);
+        expect(element.mountInternal).to.be.calledOnce;
+      });
+
+      it('should NOT build when becomes prerender if not prerenderAllowed', () => {
+        const element = createAmpElement({
+          prerenderAllowed: false,
+          previewAllowed: false,
+        });
+        scheduler.schedule(element);
+        clock.tick(1);
+        expect(element.mountInternal).to.not.be.called;
+
+        ampdoc.overrideVisibilityState('prerender');
+        clock.tick(1);
+        expect(element.mountInternal).to.not.be.called;
+      });
+
+      it('should build when becomes visible', () => {
+        const element = createAmpElement({previewAllowed: false});
+        scheduler.schedule(element);
+        clock.tick(1);
+        expect(element.mountInternal).to.not.be.called;
+
+        ampdoc.overrideVisibilityState('visible');
+        clock.tick(1);
+        expect(element.mountInternal).to.be.calledOnce;
+      });
+
+      it('should build when becomes hidden', () => {
+        const element = createAmpElement({previewAllowed: false});
+        scheduler.schedule(element);
+        clock.tick(1);
+        expect(element.mountInternal).to.not.be.called;
+
+        ampdoc.overrideVisibilityState('hidden');
+        clock.tick(1);
+        expect(element.mountInternal).to.be.calledOnce;
+      });
+
+      it('should NOT build when becomes paused or inactive', () => {
+        const element = createAmpElement({previewAllowed: false});
+        scheduler.schedule(element);
+        clock.tick(1);
+        expect(element.mountInternal).to.not.be.called;
+
+        ampdoc.overrideVisibilityState('paused');
+        clock.tick(1);
+        expect(element.mountInternal).to.not.be.called;
+
+        ampdoc.overrideVisibilityState('inactive');
+        clock.tick(1);
+        expect(element.mountInternal).to.not.be.called;
+      });
+
+      it('should NOT build when scheduled in paused', () => {
+        ampdoc.overrideVisibilityState('paused');
+
+        const element = createAmpElement({previewAllowed: false});
+        scheduler.schedule(element);
+        clock.tick(1);
+        expect(element.mountInternal).to.not.be.called;
+
+        ampdoc.overrideVisibilityState('visible');
+        clock.tick(1);
+        expect(element.mountInternal).to.be.calledOnce;
+      });
+
+      it('should NOT build when scheduled in inactive', () => {
+        ampdoc.overrideVisibilityState('inactive');
+
+        const element = createAmpElement({previewAllowed: false});
+        scheduler.schedule(element);
+        clock.tick(1);
+        expect(element.mountInternal).to.not.be.called;
+
+        ampdoc.overrideVisibilityState('visible');
+        clock.tick(1);
+        expect(element.mountInternal).to.be.calledOnce;
+      });
     });
   });
 
@@ -375,7 +544,7 @@ describes.realWin('Scheduler', {amp: true}, (env) => {
     it('should run deferred METADATA at low priority', () => {
       const element = createAmpElement({
         deferredMount: true,
-        buildPriority: LayoutPriority.METADATA,
+        buildPriority: LayoutPriority_Enum.METADATA,
       });
       scheduler.schedule(element);
       intersectionObserverStub.notifySync({
@@ -392,7 +561,7 @@ describes.realWin('Scheduler', {amp: true}, (env) => {
     it('should run non-deferred METADATA at low priority', () => {
       const element = createAmpElement({
         deferredMount: false,
-        buildPriority: LayoutPriority.METADATA,
+        buildPriority: LayoutPriority_Enum.METADATA,
       });
       scheduler.schedule(element);
       clock.tick(1);
@@ -405,7 +574,7 @@ describes.realWin('Scheduler', {amp: true}, (env) => {
     it('should run asap METADATA at high priority', () => {
       const element = createAmpElement({
         deferredMount: false,
-        buildPriority: LayoutPriority.METADATA,
+        buildPriority: LayoutPriority_Enum.METADATA,
       });
       scheduler.scheduleAsap(element);
       clock.tick(1);
diff --git a/test/unit/test-shadow-embed.js b/test/unit/test-shadow-embed.js
index 414f154316de..ae38f1b05c57 100644
--- a/test/unit/test-shadow-embed.js
+++ b/test/unit/test-shadow-embed.js
@@ -1,5 +1,9 @@
 import {
-  ShadowDomVersion,
+  installShadowStyle,
+  resetShadowStyleCacheForTesting,
+} from '#core/dom/shadow-embed';
+import {
+  ShadowDomVersion_Enum,
   setShadowCssSupportedForTesting,
   setShadowDomSupportedVersionForTesting,
 } from '#core/dom/web-components';
@@ -13,8 +17,6 @@ import {
   createShadowDomWriter,
   createShadowRoot,
   importShadowBody,
-  installShadowStyle,
-  resetShadowStyleCacheForTesting,
   scopeShadowCss,
   setShadowDomStreamingSupportedForTesting,
 } from '../../src/shadow-embed';
@@ -25,227 +27,223 @@ describes.sandboxed('shadow-embed', {}, (env) => {
     setShadowDomSupportedVersionForTesting(undefined);
   });
 
-  [ShadowDomVersion.NONE, ShadowDomVersion.V0, ShadowDomVersion.V1].forEach(
-    (scenario) => {
-      describe('shadow APIs', () => {
-        let hostElement;
+  [
+    ShadowDomVersion_Enum.NONE,
+    ShadowDomVersion_Enum.V0,
+    ShadowDomVersion_Enum.V1,
+  ].forEach((scenario) => {
+    describe('shadow APIs', () => {
+      let hostElement;
+
+      beforeEach(function () {
+        hostElement = document.createElement('div');
+        setShadowDomSupportedVersionForTesting(scenario);
+        setShadowCssSupportedForTesting(undefined);
+      });
 
-        beforeEach(function () {
-          hostElement = document.createElement('div');
-          setShadowDomSupportedVersionForTesting(scenario);
-          setShadowCssSupportedForTesting(undefined);
+      describe(scenario, function () {
+        before(function () {
+          if (
+            scenario == ShadowDomVersion_Enum.V0 &&
+            !Element.prototype.createShadowRoot
+          ) {
+            this.skipTest();
+          }
+
+          if (
+            scenario == ShadowDomVersion_Enum.V1 &&
+            !Element.prototype.attachShadow
+          ) {
+            this.skipTest();
+          }
         });
 
-        describe(scenario, function () {
-          before(function () {
-            if (
-              scenario == ShadowDomVersion.V0 &&
-              !Element.prototype.createShadowRoot
-            ) {
-              this.skipTest();
-            }
+        it('should transform CSS installStylesForDoc for shadow root', () => {
+          const shadowRoot = createShadowRoot(hostElement);
+          const ampdoc = new AmpDocShadow(window, 'https://a.org/', shadowRoot);
+          const style = installStylesForDoc(ampdoc, 'body {}', null, true);
+          expect(shadowRoot.contains(style)).to.be.true;
+          const css = style.textContent.replace(/\s/g, '');
+          if (scenario == ShadowDomVersion_Enum.NONE) {
+            expect(css).to.match(/amp-body/);
+          } else {
+            expect(css).to.equal('body{}');
+          }
+        });
 
-            if (
-              scenario == ShadowDomVersion.V1 &&
-              !Element.prototype.attachShadow
-            ) {
-              this.skipTest();
-            }
+        describe('createShadowRoot', () => {
+          it('should clear duplicate root', () => {
+            const shadowRoot1 = createShadowRoot(hostElement);
+            const span = document.createElement('span');
+            shadowRoot1.appendChild(span);
+            expect(shadowRoot1.contains(span)).to.be.true;
+
+            const shadowRoot2 = createShadowRoot(hostElement);
+            expect(shadowRoot2).to.equal(shadowRoot1);
+            expect(shadowRoot2.contains(span)).to.be.false;
           });
 
-          it('should transform CSS installStylesForDoc for shadow root', () => {
+          it('should have host', () => {
             const shadowRoot = createShadowRoot(hostElement);
-            const ampdoc = new AmpDocShadow(
-              window,
-              'https://a.org/',
-              shadowRoot
-            );
-            const style = installStylesForDoc(ampdoc, 'body {}', null, true);
-            expect(shadowRoot.contains(style)).to.be.true;
-            const css = style.textContent.replace(/\s/g, '');
-            if (scenario == ShadowDomVersion.NONE) {
-              expect(css).to.match(/amp-body/);
-            } else {
-              expect(css).to.equal('body{}');
-            }
+            expect(shadowRoot.host).to.equal(hostElement);
           });
 
-          describe('createShadowRoot', () => {
-            it('should clear duplicate root', () => {
-              const shadowRoot1 = createShadowRoot(hostElement);
-              const span = document.createElement('span');
-              shadowRoot1.appendChild(span);
-              expect(shadowRoot1.contains(span)).to.be.true;
+          it('should have getElementById', () => {
+            const shadowRoot = createShadowRoot(hostElement);
+            expect(shadowRoot.getElementById).to.be.ok;
 
-              const shadowRoot2 = createShadowRoot(hostElement);
-              expect(shadowRoot2).to.equal(shadowRoot1);
-              expect(shadowRoot2.contains(span)).to.be.false;
-            });
+            const spanId = 'test' + Math.floor(Math.random() * 10000);
+            const span = document.createElement('span');
+            span.id = spanId;
+            shadowRoot.appendChild(span);
+            expect(shadowRoot.getElementById(spanId)).to.equal(span);
+          });
 
-            it('should have host', () => {
+          if (scenario == ShadowDomVersion_Enum.NONE) {
+            it('should add id for polyfill', () => {
               const shadowRoot = createShadowRoot(hostElement);
-              expect(shadowRoot.host).to.equal(hostElement);
+              expect(shadowRoot.tagName).to.equal('I-AMPHTML-SHADOW-ROOT');
+              expect(shadowRoot.id).to.match(/i-amphtml-sd-\d+/);
             });
 
-            it('should have getElementById', () => {
+            it('should add host style for polyfill', () => {
+              const doc = hostElement.ownerDocument;
+              doc.body.appendChild(hostElement);
+              const slot = doc.createElement('div');
+              hostElement.appendChild(slot);
+              expect(slot).to.have.display('block');
               const shadowRoot = createShadowRoot(hostElement);
-              expect(shadowRoot.getElementById).to.be.ok;
-
-              const spanId = 'test' + Math.floor(Math.random() * 10000);
-              const span = document.createElement('span');
-              span.id = spanId;
-              shadowRoot.appendChild(span);
-              expect(shadowRoot.getElementById(spanId)).to.equal(span);
+              expect(hostElement).to.have.class(
+                'i-amphtml-shadow-host-polyfill'
+              );
+              expect(slot).to.have.display('none');
+              expect(shadowRoot).to.not.have.display('none');
+              doc.body.removeChild(hostElement);
             });
+          }
 
-            if (scenario == ShadowDomVersion.NONE) {
-              it('should add id for polyfill', () => {
-                const shadowRoot = createShadowRoot(hostElement);
-                expect(shadowRoot.tagName).to.equal('I-AMPHTML-SHADOW-ROOT');
-                expect(shadowRoot.id).to.match(/i-amphtml-sd-\d+/);
-              });
-
-              it('should add host style for polyfill', () => {
-                const doc = hostElement.ownerDocument;
-                doc.body.appendChild(hostElement);
-                const slot = doc.createElement('div');
-                hostElement.appendChild(slot);
-                expect(slot).to.have.display('block');
-                const shadowRoot = createShadowRoot(hostElement);
-                expect(hostElement).to.have.class(
-                  'i-amphtml-shadow-host-polyfill'
-                );
-                expect(slot).to.have.display('none');
-                expect(shadowRoot).to.not.have.display('none');
-                doc.body.removeChild(hostElement);
-              });
-            }
-
-            // Test scenarios where Shadow Css is not supported
-            it('Should add an id and class for CSS \
+          // Test scenarios where Shadow Css is not supported
+          it('Should add an id and class for CSS \
                 encapsulation to the shadow root', () => {
-              setShadowCssSupportedForTesting(false);
-              const shadowRoot = createShadowRoot(hostElement);
-              expect(shadowRoot.id).to.match(/i-amphtml-sd-\d+/);
-              const shadowRootClassListArray = toArray(
-                shadowRoot.host.classList
-              );
-              let foundShadowCssClass = false;
-              for (let i = 0; i < shadowRootClassListArray.length; i++) {
-                if (shadowRootClassListArray[i].match(/i-amphtml-sd-\d+/)) {
-                  foundShadowCssClass = true;
-                  break;
-                }
+            setShadowCssSupportedForTesting(false);
+            const shadowRoot = createShadowRoot(hostElement);
+            expect(shadowRoot.id).to.match(/i-amphtml-sd-\d+/);
+            const shadowRootClassListArray = toArray(shadowRoot.host.classList);
+            let foundShadowCssClass = false;
+            for (let i = 0; i < shadowRootClassListArray.length; i++) {
+              if (shadowRootClassListArray[i].match(/i-amphtml-sd-\d+/)) {
+                foundShadowCssClass = true;
+                break;
               }
-              expect(foundShadowCssClass).to.be.ok;
-            });
+            }
+            expect(foundShadowCssClass).to.be.ok;
+          });
 
-            it('Should transform CSS for the shadow root', () => {
-              setShadowCssSupportedForTesting(false);
-              const shadowRoot = createShadowRoot(hostElement);
-              const ampdoc = new AmpDocShadow(
-                window,
-                'https://a.org/',
-                shadowRoot
-              );
-              const style = installStylesForDoc(ampdoc, 'body {}', null, true);
-              expect(shadowRoot.contains(style)).to.be.true;
-              const css = style.textContent.replace(/\s/g, '');
-              expect(css).to.match(/amp-body/);
-            });
+          it('Should transform CSS for the shadow root', () => {
+            setShadowCssSupportedForTesting(false);
+            const shadowRoot = createShadowRoot(hostElement);
+            const ampdoc = new AmpDocShadow(
+              window,
+              'https://a.org/',
+              shadowRoot
+            );
+            const style = installStylesForDoc(ampdoc, 'body {}', null, true);
+            expect(shadowRoot.contains(style)).to.be.true;
+            const css = style.textContent.replace(/\s/g, '');
+            expect(css).to.match(/amp-body/);
           });
+        });
 
-          describe('stylesheets', () => {
-            let parentStylesheet;
+        describe('stylesheets', () => {
+          let parentStylesheet;
 
-            beforeEach(() => {
-              parentStylesheet = document.createElement('style');
-              parentStylesheet.textContent = '.x {background: red}';
-              document.body.appendChild(parentStylesheet);
-              document.body.appendChild(hostElement);
-            });
+          beforeEach(() => {
+            parentStylesheet = document.createElement('style');
+            parentStylesheet.textContent = '.x {background: red}';
+            document.body.appendChild(parentStylesheet);
+            document.body.appendChild(hostElement);
+          });
 
-            afterEach(() => {
-              document.body.removeChild(parentStylesheet);
-              document.body.removeChild(hostElement);
-            });
+          afterEach(() => {
+            document.body.removeChild(parentStylesheet);
+            document.body.removeChild(hostElement);
+          });
 
-            it('should have shadow stylesheets and not global', () => {
-              const shadowRoot = createShadowRoot(hostElement);
-              const shadowStyle = document.createElement('style');
-              shadowStyle.textContent = '.x {background: green}';
-              shadowRoot.appendChild(shadowStyle);
-
-              const {styleSheets} = shadowRoot;
-              expect(styleSheets).to.exist;
-              expect(styleSheets).to.have.length(1);
-              expect(styleSheets[0].ownerNode).to.equal(shadowStyle);
-            });
+          it('should have shadow stylesheets and not global', () => {
+            const shadowRoot = createShadowRoot(hostElement);
+            const shadowStyle = document.createElement('style');
+            shadowStyle.textContent = '.x {background: green}';
+            shadowRoot.appendChild(shadowStyle);
+
+            const {styleSheets} = shadowRoot;
+            expect(styleSheets).to.exist;
+            expect(styleSheets).to.have.length(1);
+            expect(styleSheets[0].ownerNode).to.equal(shadowStyle);
           });
+        });
 
-          describe('importShadowBody', () => {
-            let shadowRoot, source, child1, child2;
-
-            beforeEach(() => {
-              shadowRoot = createShadowRoot(hostElement);
-              source = document.createElement('body');
-              child1 = document.createElement('div');
-              child1.id = 'child1';
-              child2 = document.createElement('div');
-              child2.id = 'child2';
-              source.appendChild(child1);
-              source.appendChild(child2);
-            });
+        describe('importShadowBody', () => {
+          let shadowRoot, source, child1, child2;
+
+          beforeEach(() => {
+            shadowRoot = createShadowRoot(hostElement);
+            source = document.createElement('body');
+            child1 = document.createElement('div');
+            child1.id = 'child1';
+            child2 = document.createElement('div');
+            child2.id = 'child2';
+            source.appendChild(child1);
+            source.appendChild(child2);
+          });
 
-            it('should import body with all children', () => {
-              expect(shadowRoot.body).to.be.undefined;
-              const body = importShadowBody(shadowRoot, source, true);
-              expect(shadowRoot.body).to.equal(body);
-              expect(body.tagName).to.equal(
-                scenario == ShadowDomVersion.NONE ? 'AMP-BODY' : 'BODY'
-              );
-              expect(body.style.position).to.equal('relative');
-              if (scenario == ShadowDomVersion.NONE) {
-                expect(body.style.display).to.equal('block');
-              }
-              expect(shadowRoot.contains(body)).to.be.true;
-              expect(body.children).to.have.length(2);
-              expect(body.children[0].id).to.equal('child1');
-              expect(body.children[1].id).to.equal('child2');
-            });
+          it('should import body with all children', () => {
+            expect(shadowRoot.body).to.be.undefined;
+            const body = importShadowBody(shadowRoot, source, true);
+            expect(shadowRoot.body).to.equal(body);
+            expect(body.tagName).to.equal(
+              scenario == ShadowDomVersion_Enum.NONE ? 'AMP-BODY' : 'BODY'
+            );
+            expect(body.style.position).to.equal('relative');
+            if (scenario == ShadowDomVersion_Enum.NONE) {
+              expect(body.style.display).to.equal('block');
+            }
+            expect(shadowRoot.contains(body)).to.be.true;
+            expect(body.children).to.have.length(2);
+            expect(body.children[0].id).to.equal('child1');
+            expect(body.children[1].id).to.equal('child2');
+          });
 
-            it('should import shallow body', () => {
-              expect(shadowRoot.body).to.be.undefined;
-              const body = importShadowBody(shadowRoot, source, false);
-              expect(shadowRoot.body).to.equal(body);
-              expect(body.tagName).to.equal(
-                scenario == ShadowDomVersion.NONE ? 'AMP-BODY' : 'BODY'
-              );
-              expect(body.style.position).to.equal('relative');
-              if (scenario == ShadowDomVersion.NONE) {
-                expect(body.style.display).to.equal('block');
-              }
-              expect(shadowRoot.contains(body)).to.be.true;
-              expect(body.children).to.have.length(0);
-            });
+          it('should import shallow body', () => {
+            expect(shadowRoot.body).to.be.undefined;
+            const body = importShadowBody(shadowRoot, source, false);
+            expect(shadowRoot.body).to.equal(body);
+            expect(body.tagName).to.equal(
+              scenario == ShadowDomVersion_Enum.NONE ? 'AMP-BODY' : 'BODY'
+            );
+            expect(body.style.position).to.equal('relative');
+            if (scenario == ShadowDomVersion_Enum.NONE) {
+              expect(body.style.display).to.equal('block');
+            }
+            expect(shadowRoot.contains(body)).to.be.true;
+            expect(body.children).to.have.length(0);
+          });
 
-            it('should allow reusing same body', () => {
-              const firstBody = importShadowBody(shadowRoot, source, true);
-              const newSource = document.createElement('body');
-              newSource.appendChild(document.createElement('span'));
-              const secondBody = importShadowBody(shadowRoot, newSource, true);
-
-              expect(shadowRoot.body).to.equal(secondBody);
-              expect(shadowRoot.children).to.have.length(1);
-              expect(firstBody).not.to.equal(secondBody);
-              expect(secondBody.children).to.have.length(1);
-              expect(secondBody.firstChild.tagName).to.equal('SPAN');
-            });
+          it('should allow reusing same body', () => {
+            const firstBody = importShadowBody(shadowRoot, source, true);
+            const newSource = document.createElement('body');
+            newSource.appendChild(document.createElement('span'));
+            const secondBody = importShadowBody(shadowRoot, newSource, true);
+
+            expect(shadowRoot.body).to.equal(secondBody);
+            expect(shadowRoot.children).to.have.length(1);
+            expect(firstBody).not.to.equal(secondBody);
+            expect(secondBody.children).to.have.length(1);
+            expect(secondBody.firstChild.tagName).to.equal('SPAN');
           });
         });
       });
-    }
-  );
+    });
+  });
 
   describe('scopeShadowCss', () => {
     let shadowRoot;
diff --git a/test/unit/test-standard-actions.js b/test/unit/test-standard-actions.js
index 62b33ef832e7..1eadf2fda5a0 100644
--- a/test/unit/test-standard-actions.js
+++ b/test/unit/test-standard-actions.js
@@ -561,6 +561,32 @@ describes.sandboxed('StandardActions', {}, (env) => {
       expectCheckboxToHaveCheckedStateTrue(element);
     });
 
+    it('should set checked property to false when checked property is true and args is null', () => {
+      const element = createElement();
+      element.type = 'checkbox';
+      element.checked = true;
+      const invocation = {
+        node: element,
+        satisfiesTrust: () => true,
+        args: null,
+      };
+      standardActions.handleToggleChecked_(invocation);
+      expectCheckboxToHaveCheckedStateFalse(element);
+    });
+
+    it('should set checked property to true when checked property is false and args is null', () => {
+      const element = createElement();
+      element.type = 'checkbox';
+      element.checked = false;
+      const invocation = {
+        node: element,
+        satisfiesTrust: () => true,
+        args: null,
+      };
+      standardActions.handleToggleChecked_(invocation);
+      expectCheckboxToHaveCheckedStateTrue(element);
+    });
+
     it('should set checked property to true when force=true', () => {
       const element = createElement();
       element.type = 'checkbox';
@@ -951,3 +977,189 @@ describes.sandboxed('StandardActions', {}, (env) => {
     });
   });
 });
+
+describes.realWin('toggleTheme action', {amp: true}, (env) => {
+  let invocation, win, body, standardActions;
+  let matchMediaStub, getItemStub, setItemStub;
+
+  beforeEach(() => {
+    win = env.win;
+    body = win.document.body;
+    standardActions = new StandardActions(env.ampdoc);
+
+    getItemStub = env.sandbox.stub(win.localStorage, 'getItem');
+    setItemStub = env.sandbox.stub(win.localStorage, 'setItem');
+
+    matchMediaStub = env.sandbox.stub(win, 'matchMedia');
+
+    invocation = {
+      node: {
+        ownerDocument: {
+          defaultView: env.win,
+        },
+      },
+      satisfiesTrust: () => true,
+    };
+
+    invocation.method = 'toggleTheme';
+  });
+
+  it('should set amp-dark-mode property in localStorage with yes', async () => {
+    getItemStub.withArgs('amp-dark-mode').returns('no');
+
+    await standardActions.handleAmpTarget_(invocation);
+
+    expect(getItemStub)
+      .to.be.calledOnce.and.calledWith('amp-dark-mode')
+      .and.returned('no');
+
+    expect(body).to.have.class('amp-dark-mode');
+
+    expect(setItemStub).to.be.calledOnce.and.calledWith('amp-dark-mode', 'yes');
+  });
+
+  it('should set amp-dark-mode property in localStorage with no', async () => {
+    getItemStub.withArgs('amp-dark-mode').returns('yes');
+
+    await standardActions.handleAmpTarget_(invocation);
+
+    expect(getItemStub)
+      .to.be.calledOnce.and.calledWith('amp-dark-mode')
+      .and.returned('yes');
+
+    expect(body).to.not.have.class('amp-dark-mode');
+
+    expect(setItemStub).to.be.calledOnce.and.calledWith('amp-dark-mode', 'no');
+  });
+
+  it('should set amp-dark-mode property in localStorage with yes if it is null and user prefers light mode', async () => {
+    getItemStub.withArgs('amp-dark-mode').returns(null);
+
+    matchMediaStub
+      .withArgs('(prefers-color-scheme: dark)')
+      .returns({matches: false});
+
+    await standardActions.handleAmpTarget_(invocation);
+
+    expect(getItemStub)
+      .to.be.calledOnce.and.calledWith('amp-dark-mode')
+      .and.returned(null);
+
+    expect(body).to.have.class('amp-dark-mode');
+
+    expect(setItemStub).to.be.calledOnce.and.calledWith('amp-dark-mode', 'yes');
+  });
+
+  it('should set amp-dark-mode property in localStorage with no if it is null and user prefers dark mode', async () => {
+    getItemStub.withArgs('amp-dark-mode').returns(null);
+
+    matchMediaStub
+      .withArgs('(prefers-color-scheme: dark)')
+      .returns({matches: true});
+
+    await standardActions.handleAmpTarget_(invocation);
+
+    expect(getItemStub)
+      .to.be.calledOnce.and.calledWith('amp-dark-mode')
+      .and.returned(null);
+
+    expect(body).to.not.have.class('amp-dark-mode');
+
+    expect(setItemStub).to.be.calledOnce.and.calledWith('amp-dark-mode', 'no');
+  });
+
+  it('should add custom dark mode class to the body', async () => {
+    body.setAttribute('data-prefers-dark-mode-class', 'is-dark-mode');
+    getItemStub.withArgs('amp-dark-mode').returns('no');
+
+    await standardActions.handleAmpTarget_(invocation);
+
+    expect(body).to.have.class('is-dark-mode');
+
+    expect(setItemStub).to.be.calledOnce.and.calledWith('amp-dark-mode', 'yes');
+  });
+});
+
+describes.realWin('copy action', {amp: true}, (env) => {
+  let ampdoc, standardActions, win;
+  beforeEach(() => {
+    ampdoc = new AmpDocSingle(window);
+    env.sandbox.stub(AmpDocService.prototype, 'getAmpDoc').returns(ampdoc);
+    standardActions = new StandardActions(ampdoc);
+    win = env.win;
+  });
+
+  function trustedInvocation(obj) {
+    return {satisfiesTrust: () => true, ...obj};
+  }
+
+  it('should copy `static text` using navigator.clipboard api', async () => {
+    env.sandbox.spy(env.win.navigator.clipboard, 'writeText');
+    const doc = win.document;
+
+    const invocation = trustedInvocation({
+      args: {'text': 'Hello World!'},
+      tagOrTarget: 'AMP',
+      node: doc,
+      caller: doc,
+    });
+    standardActions.handleCopy_(invocation);
+
+    await expect(env.win.navigator.clipboard.writeText).to.be.calledWith(
+      'Hello World!'
+    );
+  });
+
+  it('should copy `DIV Content` using navigator.clipboard api', async () => {
+    env.sandbox.spy(env.win.navigator.clipboard, 'writeText');
+    const divElement = win.document.createElement('div');
+    divElement.textContent = 'Hello World!';
+
+    const invocation = trustedInvocation({
+      node: divElement,
+      caller: divElement,
+    });
+    standardActions.handleCopy_(invocation);
+
+    await expect(env.win.navigator.clipboard.writeText).to.be.calledWith(
+      'Hello World!'
+    );
+  });
+
+  it('should copy `INPUT Value` using navigator.clipboard api', async () => {
+    env.sandbox.spy(env.win.navigator.clipboard, 'writeText');
+    const inputElement = win.document.createElement('input');
+    inputElement.value = 'Hello World!';
+
+    const invocation = trustedInvocation({
+      node: inputElement,
+      caller: inputElement,
+    });
+    standardActions.handleCopy_(invocation);
+
+    await expect(env.win.navigator.clipboard.writeText).to.be.calledWith(
+      'Hello World!'
+    );
+  });
+
+  it('should fall back to legacy "doc.execCommand" if clipboard is not on the window.navigator', async () => {
+    Object.defineProperties(env.win.navigator, {
+      clipboard: {
+        value: undefined,
+        writable: true,
+      },
+    });
+
+    env.sandbox.spy(env.win.document, 'execCommand');
+    const divElement = win.document.createElement('div');
+    divElement.textContent = 'Live long and prosper!';
+
+    const invocation = trustedInvocation({
+      node: divElement,
+      caller: divElement,
+    });
+    standardActions.handleCopy_(invocation);
+
+    await expect(env.win.document.execCommand).to.be.calledWith('copy');
+  });
+});
diff --git a/test/unit/test-storage.js b/test/unit/test-storage.js
index 90ef382daf50..41bfe1494d94 100644
--- a/test/unit/test-storage.js
+++ b/test/unit/test-storage.js
@@ -8,6 +8,8 @@ import {
 
 import {dev} from '#utils/log';
 
+import {FakePerformance} from '#testing/fake-dom';
+
 describes.sandboxed('Storage', {}, (env) => {
   let storage;
   let binding;
@@ -19,375 +21,372 @@ describes.sandboxed('Storage', {}, (env) => {
   let viewerBroadcastHandler;
   let clock;
 
-  // TODO(amphtml, #25621): Cannot find atob / btoa on Safari.
-  describe
-    .configure()
-    .skipSafari()
-    .run('Storage', () => {
-      beforeEach(() => {
-        viewerBroadcastHandler = undefined;
-        viewer = {
-          onBroadcast: (handler) => {
-            viewerBroadcastHandler = handler;
-          },
-          broadcast: () => {},
-        };
-        viewerMock = env.sandbox.mock(viewer);
-
-        windowApi = {
-          document: {},
-          location: 'https://acme.com/document1',
-        };
-        ampdoc = new AmpDocSingle(windowApi);
-
-        binding = {
-          loadBlob: () => {},
-          saveBlob: () => {},
-        };
-        bindingMock = env.sandbox.mock(binding);
-
-        storage = new Storage(ampdoc, viewer, binding);
-        storage.start_();
-      });
+  describe('Storage', () => {
+    beforeEach(() => {
+      viewerBroadcastHandler = undefined;
+      viewer = {
+        onBroadcast: (handler) => {
+          viewerBroadcastHandler = handler;
+        },
+        broadcast: () => {},
+      };
+      viewerMock = env.sandbox.mock(viewer);
+
+      windowApi = {
+        document: {},
+        location: 'https://acme.com/document1',
+        performance: new FakePerformance(window),
+      };
+      ampdoc = new AmpDocSingle(windowApi);
+
+      binding = {
+        loadBlob: () => {},
+        saveBlob: () => {},
+      };
+      bindingMock = env.sandbox.mock(binding);
+
+      storage = new Storage(ampdoc, viewer, binding);
+      storage.start_();
+    });
 
-      function expectStorage(keyValues) {
-        const list = [];
-        for (const k in keyValues) {
-          list.push(
-            storage.get(k).then((value) => {
-              const expectedValue = keyValues[k];
-              expect(value).to.equal(expectedValue, `For "${k}"`);
-            })
-          );
-        }
-        return Promise.all(list);
+    function expectStorage(keyValues) {
+      const list = [];
+      for (const k in keyValues) {
+        list.push(
+          storage.get(k).then((value) => {
+            const expectedValue = keyValues[k];
+            expect(value).to.equal(expectedValue, `For "${k}"`);
+          })
+        );
       }
+      return Promise.all(list);
+    }
+
+    it('should configure store correctly', () => {
+      const store1 = new Store({});
+      store1.set('key1', 'value1');
+      store1.set('key2', 'value2');
+      bindingMock
+        .expects('loadBlob')
+        .withExactArgs('https://acme.com')
+        .returns(Promise.resolve(btoa(JSON.stringify(store1.obj))))
+        .once();
+      return storage
+        .get('key1')
+        .then(() => {
+          return storage.storePromise_;
+        })
+        .then((store) => {
+          expect(store.maxValues_).to.equal(8);
+        });
+    });
 
-      it('should configure store correctly', () => {
-        const store1 = new Store({});
-        store1.set('key1', 'value1');
-        store1.set('key2', 'value2');
-        bindingMock
-          .expects('loadBlob')
-          .withExactArgs('https://acme.com')
-          .returns(Promise.resolve(btoa(JSON.stringify(store1.obj))))
-          .once();
-        return storage
-          .get('key1')
-          .then(() => {
-            return storage.storePromise_;
-          })
-          .then((store) => {
-            expect(store.maxValues_).to.equal(8);
-          });
+    it('should initialize empty store with prototype-less objects', () => {
+      bindingMock
+        .expects('loadBlob')
+        .withExactArgs('https://acme.com')
+        .returns(Promise.resolve(null))
+        .once();
+      return storage
+        .get('key1')
+        .then(() => {
+          return storage.storePromise_;
+        })
+        .then((store) => {
+          expect(store.obj.__proto__).to.be.undefined;
+          expect(store.values_.__proto__).to.be.undefined;
+        });
+    });
+
+    it('should restore store with prototype-less objects', () => {
+      const store1 = new Store({});
+      store1.set('key1', 'value1');
+      store1.set('key2', 'value2');
+      bindingMock
+        .expects('loadBlob')
+        .withExactArgs('https://acme.com')
+        .returns(Promise.resolve(btoa(JSON.stringify(store1.obj))))
+        .once();
+      return storage
+        .get('key1')
+        .then(() => {
+          return storage.storePromise_;
+        })
+        .then((store) => {
+          expect(store.obj.__proto__).to.be.undefined;
+          expect(store.values_.__proto__).to.be.undefined;
+        });
+    });
+
+    it('should get the value first time and reuse store', () => {
+      const store1 = new Store({});
+      store1.set('key1', 'value1');
+      store1.set('key2', 'value2');
+      bindingMock
+        .expects('loadBlob')
+        .withExactArgs('https://acme.com')
+        .returns(Promise.resolve(btoa(JSON.stringify(store1.obj))))
+        .once();
+      expect(storage.storePromise_).to.not.exist;
+      const promise = storage.get('key1');
+      return promise.then((value) => {
+        expect(value).to.equal('value1');
+        const store1Promise = storage.storePromise_;
+        expect(store1Promise).to.exist;
+
+        // Repeat.
+        return storage.get('key2').then((value2) => {
+          expect(value2).to.equal('value2');
+          expect(storage.storePromise_).to.equal(store1Promise);
+        });
       });
+    });
 
-      it('should initialize empty store with prototype-less objects', () => {
-        bindingMock
-          .expects('loadBlob')
-          .withExactArgs('https://acme.com')
-          .returns(Promise.resolve(null))
-          .once();
-        return storage
-          .get('key1')
-          .then(() => {
-            return storage.storePromise_;
-          })
-          .then((store) => {
-            expect(store.obj.__proto__).to.be.undefined;
-            expect(store.values_.__proto__).to.be.undefined;
-          });
+    it('should get the value from first ever request and reuse store', () => {
+      bindingMock
+        .expects('loadBlob')
+        .withExactArgs('https://acme.com')
+        .returns(Promise.resolve(null))
+        .once();
+      expect(storage.storePromise_).to.not.exist;
+      const promise = storage.get('key1');
+      return promise.then((value) => {
+        expect(value).to.be.undefined;
+        const store1Promise = storage.storePromise_;
+        expect(store1Promise).to.exist;
+
+        // Repeat.
+        return storage.get('key2').then((value2) => {
+          expect(value2).to.be.undefined;
+          expect(storage.storePromise_).to.equal(store1Promise);
+        });
       });
+    });
 
-      it('should restore store with prototype-less objects', () => {
-        const store1 = new Store({});
-        store1.set('key1', 'value1');
-        store1.set('key2', 'value2');
-        bindingMock
-          .expects('loadBlob')
-          .withExactArgs('https://acme.com')
-          .returns(Promise.resolve(btoa(JSON.stringify(store1.obj))))
-          .once();
-        return storage
-          .get('key1')
-          .then(() => {
-            return storage.storePromise_;
-          })
-          .then((store) => {
-            expect(store.obj.__proto__).to.be.undefined;
-            expect(store.values_.__proto__).to.be.undefined;
-          });
+    it('should recover from binding failure', () => {
+      expectAsyncConsoleError(/Failed to load store/);
+      bindingMock
+        .expects('loadBlob')
+        .withExactArgs('https://acme.com')
+        .returns(Promise.reject('intentional'))
+        .once();
+      expect(storage.storePromise_).to.not.exist;
+      const promise = storage.get('key1');
+      return promise.then((value) => {
+        expect(value).to.be.undefined;
+        expect(storage.storePromise_).to.exist;
       });
+    });
 
-      it('should get the value first time and reuse store', () => {
-        const store1 = new Store({});
-        store1.set('key1', 'value1');
-        store1.set('key2', 'value2');
-        bindingMock
-          .expects('loadBlob')
-          .withExactArgs('https://acme.com')
-          .returns(Promise.resolve(btoa(JSON.stringify(store1.obj))))
-          .once();
-        expect(storage.storePromise_).to.not.exist;
-        const promise = storage.get('key1');
-        return promise.then((value) => {
-          expect(value).to.equal('value1');
+    it('should recover from binding error', () => {
+      expectAsyncConsoleError(/Failed to load store/);
+      bindingMock
+        .expects('loadBlob')
+        .withExactArgs('https://acme.com')
+        .returns(Promise.resolve('UNKNOWN FORMAT'))
+        .once();
+      expect(storage.storePromise_).to.not.exist;
+      const promise = storage.get('key1');
+      return promise.then((value) => {
+        expect(value).to.be.undefined;
+        expect(storage.storePromise_).to.exist;
+      });
+    });
+
+    it('should save the value first time and reuse store', () => {
+      const store1 = new Store({});
+      store1.set('key1', 'value1');
+      store1.set('key2', 'value2');
+      bindingMock
+        .expects('loadBlob')
+        .withExactArgs('https://acme.com')
+        .returns(Promise.resolve(btoa(JSON.stringify(store1.obj))))
+        .once();
+      bindingMock
+        .expects('saveBlob')
+        .withExactArgs(
+          'https://acme.com',
+          env.sandbox.match((arg) => {
+            const store2 = new Store(JSON.parse(atob(arg)));
+            return (
+              store2.get('key1') !== undefined &&
+              store2.get('key2') !== undefined
+            );
+          })
+        )
+        .returns(Promise.resolve())
+        .twice();
+      viewerMock
+        .expects('broadcast')
+        .withExactArgs(
+          env.sandbox.match((arg) => {
+            return (
+              arg['type'] == 'amp-storage-reset' &&
+              arg['origin'] == 'https://acme.com'
+            );
+          })
+        )
+        .twice();
+      expect(storage.storePromise_).to.not.exist;
+      const promise = storage.set('key1', true);
+      return promise
+        .then(() => {
           const store1Promise = storage.storePromise_;
           expect(store1Promise).to.exist;
 
           // Repeat.
-          return storage.get('key2').then((value2) => {
-            expect(value2).to.equal('value2');
+          return storage.set('key2', true).then(() => {
             expect(storage.storePromise_).to.equal(store1Promise);
           });
+        })
+        .then(() => {
+          return expectStorage({
+            'key1': true,
+            'key2': true,
+          });
         });
-      });
+    });
 
-      it('should get the value from first ever request and reuse store', () => {
-        bindingMock
-          .expects('loadBlob')
-          .withExactArgs('https://acme.com')
-          .returns(Promise.resolve(null))
-          .once();
-        expect(storage.storePromise_).to.not.exist;
-        const promise = storage.get('key1');
-        return promise.then((value) => {
-          expect(value).to.be.undefined;
+    it('should remove the key first time and reuse store', () => {
+      const store1 = new Store({});
+      store1.set('key1', 'value1');
+      store1.set('key2', 'value2');
+      bindingMock
+        .expects('loadBlob')
+        .withExactArgs('https://acme.com')
+        .returns(Promise.resolve(btoa(JSON.stringify(store1.obj))))
+        .once();
+      bindingMock
+        .expects('saveBlob')
+        .withExactArgs(
+          'https://acme.com',
+          env.sandbox.match((arg) => {
+            const store2 = new Store(JSON.parse(atob(arg)));
+            return store2.get('key1') === undefined;
+          })
+        )
+        .returns(Promise.resolve())
+        .twice();
+      viewerMock
+        .expects('broadcast')
+        .withExactArgs(
+          env.sandbox.match((arg) => {
+            return (
+              arg['type'] == 'amp-storage-reset' &&
+              arg['origin'] == 'https://acme.com'
+            );
+          })
+        )
+        .twice();
+      expect(storage.storePromise_).to.not.exist;
+      const promise = storage.remove('key1');
+      return promise
+        .then(() => {
           const store1Promise = storage.storePromise_;
           expect(store1Promise).to.exist;
 
           // Repeat.
-          return storage.get('key2').then((value2) => {
-            expect(value2).to.be.undefined;
+          return storage.remove('key2').then(() => {
             expect(storage.storePromise_).to.equal(store1Promise);
           });
+        })
+        .then(() => {
+          return expectStorage({
+            'key1': undefined,
+            'key2': undefined,
+          });
         });
-      });
-
-      it('should recover from binding failure', () => {
-        expectAsyncConsoleError(/Failed to load store/);
-        bindingMock
-          .expects('loadBlob')
-          .withExactArgs('https://acme.com')
-          .returns(Promise.reject('intentional'))
-          .once();
-        expect(storage.storePromise_).to.not.exist;
-        const promise = storage.get('key1');
-        return promise.then((value) => {
-          expect(value).to.be.undefined;
-          expect(storage.storePromise_).to.exist;
-        });
-      });
+    });
 
-      it('should recover from binding error', () => {
-        expectAsyncConsoleError(/Failed to load store/);
-        bindingMock
-          .expects('loadBlob')
-          .withExactArgs('https://acme.com')
-          .returns(Promise.resolve('UNKNOWN FORMAT'))
-          .once();
-        expect(storage.storePromise_).to.not.exist;
-        const promise = storage.get('key1');
-        return promise.then((value) => {
-          expect(value).to.be.undefined;
-          expect(storage.storePromise_).to.exist;
-        });
+    it('should get unexpired value based on duration', async () => {
+      clock = env.sandbox.useFakeTimers();
+      const store1 = new Store({});
+      store1.set('key1', 'value1');
+      expect(store1.values_).to.deep.equal({
+        'key1': {v: 'value1', t: 0},
       });
 
-      it('should save the value first time and reuse store', () => {
-        const store1 = new Store({});
-        store1.set('key1', 'value1');
-        store1.set('key2', 'value2');
-        bindingMock
-          .expects('loadBlob')
-          .withExactArgs('https://acme.com')
-          .returns(Promise.resolve(btoa(JSON.stringify(store1.obj))))
-          .once();
-        bindingMock
-          .expects('saveBlob')
-          .withExactArgs(
-            'https://acme.com',
-            env.sandbox.match((arg) => {
-              const store2 = new Store(JSON.parse(atob(arg)));
-              return (
-                store2.get('key1') !== undefined &&
-                store2.get('key2') !== undefined
-              );
-            })
-          )
-          .returns(Promise.resolve())
-          .twice();
-        viewerMock
-          .expects('broadcast')
-          .withExactArgs(
-            env.sandbox.match((arg) => {
-              return (
-                arg['type'] == 'amp-storage-reset' &&
-                arg['origin'] == 'https://acme.com'
-              );
-            })
-          )
-          .twice();
-        expect(storage.storePromise_).to.not.exist;
-        const promise = storage.set('key1', true);
-        return promise
-          .then(() => {
-            const store1Promise = storage.storePromise_;
-            expect(store1Promise).to.exist;
-
-            // Repeat.
-            return storage.set('key2', true).then(() => {
-              expect(storage.storePromise_).to.equal(store1Promise);
-            });
+      bindingMock
+        .expects('loadBlob')
+        .withExactArgs('https://acme.com')
+        .returns(Promise.resolve(btoa(JSON.stringify(store1.obj))))
+        .once();
+      bindingMock
+        .expects('saveBlob')
+        .withExactArgs(
+          'https://acme.com',
+          env.sandbox.match((arg) => {
+            const store2 = new Store(JSON.parse(atob(arg)));
+            return store2.get('key1') === undefined;
           })
-          .then(() => {
-            return expectStorage({
-              'key1': true,
-              'key2': true,
-            });
-          });
-      });
-
-      it('should remove the key first time and reuse store', () => {
-        const store1 = new Store({});
-        store1.set('key1', 'value1');
-        store1.set('key2', 'value2');
-        bindingMock
-          .expects('loadBlob')
-          .withExactArgs('https://acme.com')
-          .returns(Promise.resolve(btoa(JSON.stringify(store1.obj))))
-          .once();
-        bindingMock
-          .expects('saveBlob')
-          .withExactArgs(
-            'https://acme.com',
-            env.sandbox.match((arg) => {
-              const store2 = new Store(JSON.parse(atob(arg)));
-              return store2.get('key1') === undefined;
-            })
-          )
-          .returns(Promise.resolve())
-          .twice();
-        viewerMock
-          .expects('broadcast')
-          .withExactArgs(
-            env.sandbox.match((arg) => {
-              return (
-                arg['type'] == 'amp-storage-reset' &&
-                arg['origin'] == 'https://acme.com'
-              );
-            })
-          )
-          .twice();
-        expect(storage.storePromise_).to.not.exist;
-        const promise = storage.remove('key1');
-        return promise
-          .then(() => {
-            const store1Promise = storage.storePromise_;
-            expect(store1Promise).to.exist;
-
-            // Repeat.
-            return storage.remove('key2').then(() => {
-              expect(storage.storePromise_).to.equal(store1Promise);
-            });
+        )
+        .returns(Promise.resolve())
+        .twice();
+      viewerMock
+        .expects('broadcast')
+        .withExactArgs(
+          env.sandbox.match((arg) => {
+            return (
+              arg['type'] == 'amp-storage-reset' &&
+              arg['origin'] == 'https://acme.com'
+            );
           })
-          .then(() => {
-            return expectStorage({
-              'key1': undefined,
-              'key2': undefined,
-            });
-          });
-      });
-
-      it('should get unexpired value based on duration', async () => {
-        clock = env.sandbox.useFakeTimers();
-        const store1 = new Store({});
-        store1.set('key1', 'value1');
-        expect(store1.values_).to.deep.equal({
-          'key1': {v: 'value1', t: 0},
-        });
+        )
+        .once();
 
-        bindingMock
-          .expects('loadBlob')
-          .withExactArgs('https://acme.com')
-          .returns(Promise.resolve(btoa(JSON.stringify(store1.obj))))
-          .once();
-        bindingMock
-          .expects('saveBlob')
-          .withExactArgs(
-            'https://acme.com',
-            env.sandbox.match((arg) => {
-              const store2 = new Store(JSON.parse(atob(arg)));
-              return store2.get('key1') === undefined;
-            })
-          )
-          .returns(Promise.resolve())
-          .twice();
-        viewerMock
-          .expects('broadcast')
-          .withExactArgs(
-            env.sandbox.match((arg) => {
-              return (
-                arg['type'] == 'amp-storage-reset' &&
-                arg['origin'] == 'https://acme.com'
-              );
-            })
-          )
-          .once();
-
-        expect(await storage.get('key1', 10)).to.equal('value1');
-        clock.tick(100);
-        expect(await storage.get('key1', 5)).to.be.undefined;
-      });
+      expect(await storage.get('key1', 10)).to.equal('value1');
+      clock.tick(100);
+      expect(await storage.get('key1', 5)).to.be.undefined;
+    });
 
-      it('should react to reset messages', () => {
-        const store1 = new Store({});
-        store1.set('key1', 'value1');
-        bindingMock
-          .expects('loadBlob')
-          .withExactArgs('https://acme.com')
-          .returns(Promise.resolve(btoa(JSON.stringify(store1.obj))))
-          .twice();
+    it('should react to reset messages', () => {
+      const store1 = new Store({});
+      store1.set('key1', 'value1');
+      bindingMock
+        .expects('loadBlob')
+        .withExactArgs('https://acme.com')
+        .returns(Promise.resolve(btoa(JSON.stringify(store1.obj))))
+        .twice();
+      return storage.get('key1').then((value) => {
+        expect(value).to.equal('value1');
+        const store1Promise = storage.storePromise_;
+        expect(store1Promise).to.exist;
+
+        // Issue broadcast event.
+        viewerBroadcastHandler({
+          'type': 'amp-storage-reset',
+          'origin': 'https://acme.com',
+        });
+        expect(storage.storePromise_).to.not.exist;
         return storage.get('key1').then((value) => {
           expect(value).to.equal('value1');
-          const store1Promise = storage.storePromise_;
-          expect(store1Promise).to.exist;
-
-          // Issue broadcast event.
-          viewerBroadcastHandler({
-            'type': 'amp-storage-reset',
-            'origin': 'https://acme.com',
-          });
-          expect(storage.storePromise_).to.not.exist;
-          return storage.get('key1').then((value) => {
-            expect(value).to.equal('value1');
-            expect(storage.storePromise_).to.exist;
-          });
+          expect(storage.storePromise_).to.exist;
         });
       });
+    });
 
-      it('should ignore unrelated reset messages', () => {
-        const store1 = new Store({});
-        store1.set('key1', 'value1');
-        bindingMock
-          .expects('loadBlob')
-          .withExactArgs('https://acme.com')
-          .returns(Promise.resolve(btoa(JSON.stringify(store1.obj))))
-          .twice();
-        return storage.get('key1').then((value) => {
-          expect(value).to.equal('value1');
-          const store1Promise = storage.storePromise_;
-          expect(store1Promise).to.exist;
-
-          // Issue broadcast event.
-          viewerBroadcastHandler({
-            'type': 'amp-storage-reset',
-            'origin': 'OTHER',
-          });
-          expect(storage.storePromise_).to.exist;
+    it('should ignore unrelated reset messages', () => {
+      const store1 = new Store({});
+      store1.set('key1', 'value1');
+      bindingMock
+        .expects('loadBlob')
+        .withExactArgs('https://acme.com')
+        .returns(Promise.resolve(btoa(JSON.stringify(store1.obj))))
+        .twice();
+      return storage.get('key1').then((value) => {
+        expect(value).to.equal('value1');
+        const store1Promise = storage.storePromise_;
+        expect(store1Promise).to.exist;
+
+        // Issue broadcast event.
+        viewerBroadcastHandler({
+          'type': 'amp-storage-reset',
+          'origin': 'OTHER',
         });
+        expect(storage.storePromise_).to.exist;
       });
     });
+  });
 });
 
 describes.sandboxed('Store', {}, (env) => {
diff --git a/test/unit/test-style-installer.js b/test/unit/test-style-installer.js
index 7df00b823b14..6b0f0387d138 100644
--- a/test/unit/test-style-installer.js
+++ b/test/unit/test-style-installer.js
@@ -6,6 +6,7 @@ import {AmpDocShadow, AmpDocSingle} from '#service/ampdoc-impl';
 import {installPerformanceService} from '#service/performance-impl';
 import {installPlatformService} from '#service/platform-impl';
 
+import {macroTask} from '#testing/helpers';
 import {isAnimationNone} from '#testing/helpers/service';
 
 import * as rds from '../../src/render-delaying-services';
@@ -48,7 +49,7 @@ describes.sandboxed('Styles', {}, () => {
       expect(isAnimationNone(doc.body)).to.be.true;
     });
 
-    it('should wait for render delaying services', () => {
+    it('should wait for render delaying services', async () => {
       expect(getStyle(doc.body, 'opacity')).to.equal('');
       expect(getStyle(doc.body, 'visibility')).to.equal('');
       expect(getStyle(doc.body, 'animation')).to.equal('');
@@ -58,31 +59,25 @@ describes.sandboxed('Styles', {}, () => {
         .withArgs(win)
         .returns(Promise.resolve(['service1', 'service2']));
       styles.makeBodyVisible(doc);
-      return new Promise((resolve) => {
-        setTimeout(resolve, 0);
-      }).then(() => {
-        expect(getStyle(doc.body, 'opacity')).to.equal('1');
-        expect(getStyle(doc.body, 'visibility')).to.equal('visible');
-        expect(isAnimationNone(doc.body)).to.be.true;
-        expect(tickSpy.withArgs('mbv')).to.be.calledOnce;
-        expect(schedulePassSpy.withArgs(1, true)).to.be.calledOnce;
-        expect(ampdoc.signals().get('render-start')).to.be.ok;
-      });
+      await macroTask();
+      expect(getStyle(doc.body, 'opacity')).to.equal('1');
+      expect(getStyle(doc.body, 'visibility')).to.equal('visible');
+      expect(isAnimationNone(doc.body)).to.be.true;
+      expect(tickSpy.withArgs('mbv')).to.be.calledOnce;
+      expect(schedulePassSpy.withArgs(1, true)).to.be.calledOnce;
+      expect(ampdoc.signals().get('render-start')).to.be.ok;
     });
 
-    it('should skip schedulePass if no render delaying services', () => {
+    it('should skip schedulePass if no render delaying services', async () => {
       waitForServicesStub.withArgs(win).returns(Promise.resolve([]));
       styles.makeBodyVisible(doc);
-      return new Promise((resolve) => {
-        setTimeout(resolve, 0);
-      }).then(() => {
-        expect(tickSpy.withArgs('mbv')).to.be.calledOnce;
-        expect(schedulePassSpy).to.not.be.calledWith(
-          env.sandbox.match.number,
-          true
-        );
-        expect(ampdoc.signals().get('render-start')).to.be.ok;
-      });
+      await macroTask();
+      expect(tickSpy.withArgs('mbv')).to.be.calledOnce;
+      expect(schedulePassSpy).to.not.be.calledWith(
+        env.sandbox.match.number,
+        true
+      );
+      expect(ampdoc.signals().get('render-start')).to.be.ok;
     });
   });
 
@@ -250,6 +245,28 @@ describes.sandboxed('Styles', {}, () => {
           });
         });
 
+        it('should discover existing extension link[rel=stylesheet] and not overwrite it', () => {
+          const serverEl = doc.createElement('link');
+          serverEl.setAttribute('amp-extension', 'amp-story');
+          serverEl.setAttribute(
+            'href',
+            '/examples/amp-story/amp-story-1.0.css'
+          );
+          serverEl.setAttribute('rel', 'stylesheet');
+          head.appendChild(serverEl);
+          const promise = installStylesAsPromise('other{}', false, 'amp-story');
+          return promise.then((styleEl) => {
+            expect(head.__AMP_CSS_SM['amp-runtime']).to.not.exist;
+            expect(head.__AMP_CSS_SM['amp-extension=amp-story']).to.equal(
+              serverEl
+            );
+            expect(styleEl).to.equal(serverEl);
+            expect(
+              head.querySelectorAll('link[amp-extension=amp-story]')
+            ).to.have.length(1);
+          });
+        });
+
         it('should re-create extension style', () => {
           installStylesAsPromise('runtime{}', true);
           const promise = installStylesAsPromise('other{}', false, 'amp-ext1');
diff --git a/test/unit/test-url-replacements.js b/test/unit/test-url-replacements.js
index 8b4306458651..848cde3e9ed3 100644
--- a/test/unit/test-url-replacements.js
+++ b/test/unit/test-url-replacements.js
@@ -33,232 +33,239 @@ describes.sandboxed('UrlReplacements', {}, (env) => {
   let userErrorStub;
   let ampdoc;
 
-  // TODO(amphtml, #25621): Cannot find atob / btoa on Safari.
-  describe
-    .configure()
-    .skipSafari()
-    .run('UrlReplacements', () => {
-      beforeEach(() => {
-        canonical = 'https://canonical.com/doc1';
-        userErrorStub = env.sandbox.stub(user(), 'error');
-      });
+  describe('UrlReplacements', () => {
+    beforeEach(() => {
+      canonical = 'https://canonical.com/doc1';
+      userErrorStub = env.sandbox.stub(user(), 'error');
+    });
 
-      function getReplacements(opt_options) {
-        return createIframePromise().then((iframe) => {
-          ampdoc = iframe.ampdoc;
-          iframe.doc.title = 'Pixel Test';
-          const link = iframe.doc.createElement('link');
-          link.setAttribute('href', 'https://pinterest.com:8080/pin1');
-          link.setAttribute('rel', 'canonical');
-          iframe.doc.head.appendChild(link);
-          iframe.win.__AMP_SERVICES.documentInfo = null;
-          installDocumentInfoServiceForDoc(iframe.ampdoc);
-          resetScheduledElementForTesting(iframe.win, 'amp-analytics');
-          resetScheduledElementForTesting(iframe.win, 'amp-experiment');
-          if (opt_options) {
-            if (opt_options.withCid) {
-              markElementScheduledForTesting(iframe.win, 'amp-analytics');
-              cidServiceForDocForTesting(iframe.ampdoc);
-              installCryptoService(iframe.win);
-            }
-            if (opt_options.withActivity) {
-              markElementScheduledForTesting(iframe.win, 'amp-analytics');
-              installActivityServiceForTesting(iframe.ampdoc);
-            }
-            if (opt_options.withVariant) {
-              markElementScheduledForTesting(iframe.win, 'amp-experiment');
-              registerServiceBuilder(iframe.win, 'variant', function () {
-                return {
-                  getVariants: () =>
-                    Promise.resolve({
-                      'x1': 'v1',
-                      'x2': null,
-                    }),
-                };
-              });
-            }
-            if (opt_options.withViewerIntegrationVariableService) {
-              markElementScheduledForTesting(
-                iframe.win,
-                'amp-viewer-integration'
-              );
-              registerServiceBuilder(
-                iframe.win,
-                'viewer-integration-variable',
-                function () {
-                  return Promise.resolve(
-                    opt_options.withViewerIntegrationVariableService
-                  );
-                }
-              );
-            }
-            if (opt_options.withOriginalTitle) {
-              iframe.doc.originalTitle = 'Original Pixel Test';
-            }
+    function getReplacements(opt_options) {
+      return createIframePromise().then((iframe) => {
+        ampdoc = iframe.ampdoc;
+        iframe.doc.title = 'Pixel Test';
+        const link = iframe.doc.createElement('link');
+        link.setAttribute('href', 'https://pinterest.com:8080/pin1');
+        link.setAttribute('rel', 'canonical');
+        iframe.doc.head.appendChild(link);
+        iframe.win.__AMP_SERVICES.documentInfo = null;
+        installDocumentInfoServiceForDoc(iframe.ampdoc);
+        resetScheduledElementForTesting(iframe.win, 'amp-analytics');
+        resetScheduledElementForTesting(iframe.win, 'amp-experiment');
+        if (opt_options) {
+          if (opt_options.withCid) {
+            markElementScheduledForTesting(iframe.win, 'amp-analytics');
+            cidServiceForDocForTesting(iframe.ampdoc);
+            installCryptoService(iframe.win);
           }
-          viewerService = Services.viewerForDoc(iframe.ampdoc);
-          replacements = Services.urlReplacementsForDoc(
-            iframe.doc.documentElement
-          );
-          return replacements;
-        });
-      }
-
-      function expandUrlAsync(url, opt_bindings, opt_options) {
-        return getReplacements(opt_options).then((replacements) =>
-          replacements.expandUrlAsync(url, opt_bindings)
+          if (opt_options.withActivity) {
+            markElementScheduledForTesting(iframe.win, 'amp-analytics');
+            installActivityServiceForTesting(iframe.ampdoc);
+          }
+          if (opt_options.withVariant) {
+            markElementScheduledForTesting(iframe.win, 'amp-experiment');
+            registerServiceBuilder(iframe.win, 'variant', function () {
+              return {
+                getVariants: () =>
+                  Promise.resolve({
+                    'x1': 'v1',
+                    'x2': null,
+                  }),
+              };
+            });
+          }
+          if (opt_options.withViewerIntegrationVariableService) {
+            markElementScheduledForTesting(
+              iframe.win,
+              'amp-viewer-integration'
+            );
+            registerServiceBuilder(
+              iframe.win,
+              'viewer-integration-variable',
+              function () {
+                return Promise.resolve(
+                  opt_options.withViewerIntegrationVariableService
+                );
+              }
+            );
+          }
+          if (opt_options.withOriginalTitle) {
+            iframe.doc.originalTitle = 'Original Pixel Test';
+          }
+        }
+        viewerService = Services.viewerForDoc(iframe.ampdoc);
+        replacements = Services.urlReplacementsForDoc(
+          iframe.doc.documentElement
         );
-      }
+        return replacements;
+      });
+    }
 
-      function getFakeWindow() {
-        loadObservable = new Observable();
-        const win = {
-          addEventListener(type, callback) {
-            loadObservable.add(callback);
-          },
-          Object,
-          performance: {
-            timing: {
-              navigationStart: 100,
-              loadEventStart: 0,
-            },
-          },
-          removeEventListener(type, callback) {
-            loadObservable.remove(callback);
-          },
-          document: {
-            nodeType: /* document */ 9,
-            querySelector: () => {
-              return {href: canonical};
-            },
-            getElementById: () => {},
-            cookie: '',
-            documentElement: {
-              nodeType: /* element */ 1,
-              getRootNode() {
-                return win.document;
-              },
-              hasAttribute: () => {},
-            },
+    function expandUrlAsync(url, opt_bindings, opt_options) {
+      return getReplacements(opt_options).then((replacements) =>
+        replacements.expandUrlAsync(url, opt_bindings)
+      );
+    }
+
+    function getFakeWindow() {
+      loadObservable = new Observable();
+      const win = {
+        addEventListener(type, callback) {
+          loadObservable.add(callback);
+        },
+        Object,
+        performance: {
+          timing: {
+            navigationStart: 100,
+            loadEventStart: 0,
           },
-          Math: {
-            random: () => 0.1234,
+        },
+        removeEventListener(type, callback) {
+          loadObservable.remove(callback);
+        },
+        document: {
+          nodeType: /* document */ 9,
+          querySelector: () => {
+            return {href: canonical};
           },
-          crypto: {
-            getRandomValues: (array) => {
-              array[0] = 1;
-              array[1] = 2;
-              array[2] = 3;
-              array[15] = 15;
+          getElementById: () => {},
+          cookie: '',
+          documentElement: {
+            nodeType: /* element */ 1,
+            getRootNode() {
+              return win.document;
             },
+            hasAttribute: () => {},
           },
-          __AMP_SERVICES: {
-            'viewport': {obj: {}, ctor: Object},
-            'cid': {
-              promise: Promise.resolve({
-                get: (config) =>
-                  Promise.resolve('test-cid(' + config.scope + ')'),
-              }),
-            },
+        },
+        Math: {
+          random: () => 0.1234,
+        },
+        crypto: {
+          getRandomValues: (array) => {
+            array[0] = 1;
+            array[1] = 2;
+            array[2] = 3;
+            array[15] = 15;
           },
-        };
-        win.document.defaultView = win;
-        win.document.documentElement.ownerDocument = win.document;
-        win.document.head = {
-          nodeType: /* element */ 1,
-          // Fake query selectors needed to bypass <meta> tag checks.
-          querySelector: () => null,
-          querySelectorAll: () => [],
-          getRootNode() {
-            return win.document;
+        },
+        __AMP_SERVICES: {
+          'viewport': {obj: {}, ctor: Object},
+          'cid': {
+            promise: Promise.resolve({
+              get: (config) =>
+                Promise.resolve('test-cid(' + config.scope + ')'),
+            }),
           },
-        };
-        installDocService(win, /* isSingleDoc */ true);
-        const ampdoc = Services.ampdocServiceFor(win).getSingleDoc();
-        win.__AMP_SERVICES.documentInfo = null;
-        installDocumentInfoServiceForDoc(ampdoc);
-        win.ampdoc = ampdoc;
-        env.sandbox.stub(win.ampdoc, 'getMeta').returns({
-          'amp-link-variable-allowed-origin':
-            'https://allowlisted.com http://example.com',
-        });
-        installUrlReplacementsServiceForDoc(ampdoc);
-        return win;
-      }
+        },
+      };
+      win.document.defaultView = win;
+      win.document.documentElement.ownerDocument = win.document;
+      win.document.head = {
+        nodeType: /* element */ 1,
+        // Fake query selectors needed to bypass <meta> tag checks.
+        querySelector: () => null,
+        querySelectorAll: () => [],
+        getRootNode() {
+          return win.document;
+        },
+      };
+      installDocService(win, /* isSingleDoc */ true);
+      const ampdoc = Services.ampdocServiceFor(win).getSingleDoc();
+      win.__AMP_SERVICES.documentInfo = null;
+      installDocumentInfoServiceForDoc(ampdoc);
+      win.ampdoc = ampdoc;
+      env.sandbox.stub(win.ampdoc, 'getMeta').returns({
+        'amp-link-variable-allowed-origin':
+          'https://allowlisted.com http://example.com',
+      });
+      installUrlReplacementsServiceForDoc(ampdoc);
+      return win;
+    }
+
+    it('limit replacement params size', () => {
+      return getReplacements().then((replacements) => {
+        replacements.getVariableSource().initialize();
+        const variables = Object.keys(
+          replacements.getVariableSource().replacements_
+        );
+        // Restrict the number of replacement params to globalVariableSource
+        // Please consider adding the logic to amp-analytics instead.
+        // Please contact @lannka or @zhouyx if the test fail.
+        expect(variables.length).to.equal(60);
+      });
+    });
 
-      it('limit replacement params size', () => {
-        return getReplacements().then((replacements) => {
-          replacements.getVariableSource().initialize();
-          const variables = Object.keys(
-            replacements.getVariableSource().replacements_
-          );
-          // Restrict the number of replacement params to globalVariableSource
-          // Please consider adding the logic to amp-analytics instead.
-          // Please contact @lannka or @zhouyx if the test fail.
-          expect(variables.length).to.equal(60);
-        });
+    it('should replace RANDOM', () => {
+      return expandUrlAsync('ord=RANDOM?').then((res) => {
+        expect(res).to.match(/ord=(\d+(\.\d+)?)\?$/);
       });
+    });
 
-      it('should replace RANDOM', () => {
-        return expandUrlAsync('ord=RANDOM?').then((res) => {
-          expect(res).to.match(/ord=(\d+(\.\d+)?)\?$/);
-        });
+    it('should replace COUNTER', () => {
+      return expandUrlAsync(
+        'COUNTER(foo),COUNTER(bar),COUNTER(foo),COUNTER(bar),COUNTER(bar)'
+      ).then((res) => {
+        expect(res).to.equal('1,1,2,2,3');
       });
+    });
 
-      it('should replace COUNTER', () => {
-        return expandUrlAsync(
-          'COUNTER(foo),COUNTER(bar),COUNTER(foo),COUNTER(bar),COUNTER(bar)'
-        ).then((res) => {
-          expect(res).to.equal('1,1,2,2,3');
-        });
+    it('should replace CANONICAL_URL', () => {
+      return expandUrlAsync('?href=CANONICAL_URL').then((res) => {
+        expect(res).to.equal('?href=https%3A%2F%2Fpinterest.com%3A8080%2Fpin1');
       });
+    });
 
-      it.configure()
-        .skipFirefox()
-        .run('should replace CANONICAL_URL', () => {
-          return expandUrlAsync('?href=CANONICAL_URL').then((res) => {
-            expect(res).to.equal(
-              '?href=https%3A%2F%2Fpinterest.com%3A8080%2Fpin1'
-            );
-          });
-        });
+    it('should replace CANONICAL_HOST', () => {
+      return expandUrlAsync('?host=CANONICAL_HOST').then((res) => {
+        expect(res).to.equal('?host=pinterest.com%3A8080');
+      });
+    });
 
-      it.configure()
-        .skipFirefox()
-        .run('should replace CANONICAL_HOST', () => {
-          return expandUrlAsync('?host=CANONICAL_HOST').then((res) => {
-            expect(res).to.equal('?host=pinterest.com%3A8080');
-          });
-        });
+    it('should replace CANONICAL_HOSTNAME', () => {
+      return expandUrlAsync('?host=CANONICAL_HOSTNAME').then((res) => {
+        expect(res).to.equal('?host=pinterest.com');
+      });
+    });
 
-      it.configure()
-        .skipFirefox()
-        .run('should replace CANONICAL_HOSTNAME', () => {
-          return expandUrlAsync('?host=CANONICAL_HOSTNAME').then((res) => {
-            expect(res).to.equal('?host=pinterest.com');
-          });
-        });
+    it('should replace CANONICAL_PATH', () => {
+      return expandUrlAsync('?path=CANONICAL_PATH').then((res) => {
+        expect(res).to.equal('?path=%2Fpin1');
+      });
+    });
 
-      it.configure()
-        .skipFirefox()
-        .run('should replace CANONICAL_PATH', () => {
-          return expandUrlAsync('?path=CANONICAL_PATH').then((res) => {
-            expect(res).to.equal('?path=%2Fpin1');
-          });
-        });
+    it('should replace DOCUMENT_REFERRER', async () => {
+      const replacements = await getReplacements();
+      env.sandbox
+        .stub(viewerService, 'getReferrerUrl')
+        .returns('http://fake.example/?foo=bar');
+      const res = await replacements.expandUrlAsync('?ref=DOCUMENT_REFERRER');
+      expect(res).to.equal('?ref=http%3A%2F%2Ffake.example%2F%3Ffoo%3Dbar');
+    });
 
-      it('should replace DOCUMENT_REFERRER', async () => {
-        const replacements = await getReplacements();
-        env.sandbox
-          .stub(viewerService, 'getReferrerUrl')
-          .returns('http://fake.example/?foo=bar');
-        const res = await replacements.expandUrlAsync('?ref=DOCUMENT_REFERRER');
-        expect(res).to.equal('?ref=http%3A%2F%2Ffake.example%2F%3Ffoo%3Dbar');
-      });
+    it('should replace EXTERNAL_REFERRER', () => {
+      const windowInterface = mockWindowInterface(env.sandbox);
+      windowInterface.getHostname.returns('different.org');
+      return getReplacements()
+        .then((replacements) => {
+          stubServiceForDoc(
+            env.sandbox,
+            ampdoc,
+            'viewer',
+            'getReferrerUrl'
+          ).returns(Promise.resolve('http://example.org/page.html'));
+          return replacements.expandUrlAsync('?ref=EXTERNAL_REFERRER');
+        })
+        .then((res) => {
+          expect(res).to.equal('?ref=http%3A%2F%2Fexample.org%2Fpage.html');
+        });
+    });
 
-      it('should replace EXTERNAL_REFERRER', () => {
+    it(
+      'should replace EXTERNAL_REFERRER to empty string ' +
+        'if referrer is of same domain',
+      () => {
         const windowInterface = mockWindowInterface(env.sandbox);
-        windowInterface.getHostname.returns('different.org');
+        windowInterface.getHostname.returns('example.org');
         return getReplacements()
           .then((replacements) => {
             stubServiceForDoc(
@@ -270,1922 +277,1857 @@ describes.sandboxed('UrlReplacements', {}, (env) => {
             return replacements.expandUrlAsync('?ref=EXTERNAL_REFERRER');
           })
           .then((res) => {
-            expect(res).to.equal('?ref=http%3A%2F%2Fexample.org%2Fpage.html');
+            expect(res).to.equal('?ref=');
           });
-      });
-
-      it(
-        'should replace EXTERNAL_REFERRER to empty string ' +
-          'if referrer is of same domain',
-        () => {
-          const windowInterface = mockWindowInterface(env.sandbox);
-          windowInterface.getHostname.returns('example.org');
-          return getReplacements()
-            .then((replacements) => {
-              stubServiceForDoc(
-                env.sandbox,
-                ampdoc,
-                'viewer',
-                'getReferrerUrl'
-              ).returns(Promise.resolve('http://example.org/page.html'));
-              return replacements.expandUrlAsync('?ref=EXTERNAL_REFERRER');
-            })
-            .then((res) => {
-              expect(res).to.equal('?ref=');
-            });
-        }
-      );
+      }
+    );
 
-      it(
-        'should replace EXTERNAL_REFERRER to empty string ' +
-          'if referrer is CDN proxy of same domain',
-        () => {
-          const windowInterface = mockWindowInterface(env.sandbox);
-          windowInterface.getHostname.returns('example.org');
-          return getReplacements()
-            .then((replacements) => {
-              stubServiceForDoc(
-                env.sandbox,
-                ampdoc,
-                'viewer',
-                'getReferrerUrl'
-              ).returns(
-                Promise.resolve(
-                  'https://example-org.cdn.ampproject.org/v/example.org/page.html'
-                )
-              );
-              return replacements.expandUrlAsync('?ref=EXTERNAL_REFERRER');
-            })
-            .then((res) => {
-              expect(res).to.equal('?ref=');
-            });
-        }
-      );
+    it(
+      'should replace EXTERNAL_REFERRER to empty string ' +
+        'if referrer is CDN proxy of same domain',
+      () => {
+        const windowInterface = mockWindowInterface(env.sandbox);
+        windowInterface.getHostname.returns('example.org');
+        return getReplacements()
+          .then((replacements) => {
+            stubServiceForDoc(
+              env.sandbox,
+              ampdoc,
+              'viewer',
+              'getReferrerUrl'
+            ).returns(
+              Promise.resolve(
+                'https://example-org.cdn.ampproject.org/v/example.org/page.html'
+              )
+            );
+            return replacements.expandUrlAsync('?ref=EXTERNAL_REFERRER');
+          })
+          .then((res) => {
+            expect(res).to.equal('?ref=');
+          });
+      }
+    );
 
-      it(
-        'should replace EXTERNAL_REFERRER to empty string ' +
-          'if referrer is CDN proxy of same domain (before CURLS)',
-        () => {
-          const windowInterface = mockWindowInterface(env.sandbox);
-          windowInterface.getHostname.returns('example.org');
-          return getReplacements()
-            .then((replacements) => {
-              stubServiceForDoc(
-                env.sandbox,
-                ampdoc,
-                'viewer',
-                'getReferrerUrl'
-              ).returns(
-                Promise.resolve(
-                  'https://cdn.ampproject.org/v/example.org/page.html'
-                )
-              );
-              return replacements.expandUrlAsync('?ref=EXTERNAL_REFERRER');
-            })
-            .then((res) => {
-              expect(res).to.equal('?ref=');
-            });
-        }
-      );
+    it(
+      'should replace EXTERNAL_REFERRER to empty string ' +
+        'if referrer is CDN proxy of same domain (before CURLS)',
+      () => {
+        const windowInterface = mockWindowInterface(env.sandbox);
+        windowInterface.getHostname.returns('example.org');
+        return getReplacements()
+          .then((replacements) => {
+            stubServiceForDoc(
+              env.sandbox,
+              ampdoc,
+              'viewer',
+              'getReferrerUrl'
+            ).returns(
+              Promise.resolve(
+                'https://cdn.ampproject.org/v/example.org/page.html'
+              )
+            );
+            return replacements.expandUrlAsync('?ref=EXTERNAL_REFERRER');
+          })
+          .then((res) => {
+            expect(res).to.equal('?ref=');
+          });
+      }
+    );
 
-      it('should replace TITLE', () => {
-        return expandUrlAsync('?title=TITLE').then((res) => {
-          expect(res).to.equal('?title=Pixel%20Test');
-        });
+    it('should replace TITLE', () => {
+      return expandUrlAsync('?title=TITLE').then((res) => {
+        expect(res).to.equal('?title=Pixel%20Test');
       });
+    });
 
-      it('should prefer original title for TITLE', () => {
-        return expandUrlAsync('?title=TITLE', /*opt_bindings*/ undefined, {
-          withOriginalTitle: true,
-        }).then((res) => {
-          expect(res).to.equal('?title=Original%20Pixel%20Test');
-        });
+    it('should prefer original title for TITLE', () => {
+      return expandUrlAsync('?title=TITLE', /*opt_bindings*/ undefined, {
+        withOriginalTitle: true,
+      }).then((res) => {
+        expect(res).to.equal('?title=Original%20Pixel%20Test');
       });
+    });
 
-      describe('AMPDOC_URL', () => {
-        it('should replace AMPDOC_URL', () => {
-          return expandUrlAsync('?ref=AMPDOC_URL').then((res) => {
-            expect(res).to.not.match(/AMPDOC_URL/);
-          });
-        });
-
-        it('should add extra params to AMPDOC_URL', () => {
-          const win = getFakeWindow();
-          win.location = parseUrlDeprecated(
-            'https://cdn.ampproject.org/a/o.com/foo/?amp_r=hello%3Dworld'
-          );
-          return Services.urlReplacementsForDoc(win.document.documentElement)
-            .expandUrlAsync('?url=AMPDOC_URL')
-            .then((res) => {
-              expect(res).to.contain(
-                encodeURIComponent(
-                  'https://cdn.ampproject.org/a/o.com/foo/?hello=world'
-                )
-              );
-            });
-        });
-
-        it('should merge extra params in AMPDOC_URL', () => {
-          const win = getFakeWindow();
-          win.location = parseUrlDeprecated(
-            'https://cdn.ampproject.org/a/o.com/foo/?test=case&amp_r=hello%3Dworld'
-          );
-          return Services.urlReplacementsForDoc(win.document.documentElement)
-            .expandUrlAsync('?url=AMPDOC_URL')
-            .then((res) => {
-              expect(res).to.contain(
-                encodeURIComponent(
-                  'https://cdn.ampproject.org/a/o.com/foo/?test=case&hello=world'
-                )
-              );
-            });
-        });
-
-        it('should allow an embedded amp_r parameter', () => {
-          const win = getFakeWindow();
-          win.location = parseUrlDeprecated(
-            'https://cdn.ampproject.org/a/o.com/foo/?amp_r=amp_r%3Dweird'
-          );
-          return Services.urlReplacementsForDoc(win.document.documentElement)
-            .expandUrlAsync('?url=AMPDOC_URL')
-            .then((res) => {
-              expect(res).to.contain(
-                encodeURIComponent(
-                  'https://cdn.ampproject.org/a/o.com/foo/?amp_r=weird'
-                )
-              );
-            });
-        });
-
-        it('should prefer original params in AMPDOC_URL', () => {
-          const win = getFakeWindow();
-          win.location = parseUrlDeprecated(
-            'https://cdn.ampproject.org/a/o.com/foo/?test=case&amp_r=test%3Devil'
-          );
-          return Services.urlReplacementsForDoc(win.document.documentElement)
-            .expandUrlAsync('?url=AMPDOC_URL')
-            .then((res) => {
-              expect(res).to.contain(
-                encodeURIComponent(
-                  'https://cdn.ampproject.org/a/o.com/foo/?test=case'
-                )
-              );
-            });
-        });
-
-        it('should merge multiple extra params safely in AMPDOC_URL', () => {
-          const win = getFakeWindow();
-          win.location = parseUrlDeprecated(
-            'https://cdn.ampproject.org/a/o.com/foo/?test=case&a&hello=you&amp_r=hello%3Dworld%26goodnight%3Dmoon'
-          );
-          return Services.urlReplacementsForDoc(win.document.documentElement)
-            .expandUrlAsync('?url=AMPDOC_URL')
-            .then((res) => {
-              expect(res).to.contain(
-                encodeURIComponent(
-                  'https://cdn.ampproject.org/a/o.com/foo/?test=case&a&hello=you&goodnight=moon'
-                )
-              );
-            });
+    describe('AMPDOC_URL', () => {
+      it('should replace AMPDOC_URL', () => {
+        return expandUrlAsync('?ref=AMPDOC_URL').then((res) => {
+          expect(res).to.not.match(/AMPDOC_URL/);
         });
       });
 
-      it('should replace AMPDOC_HOST', () => {
-        return expandUrlAsync('?ref=AMPDOC_HOST').then((res) => {
-          expect(res).to.not.match(/AMPDOC_HOST/);
-        });
+      it('should add extra params to AMPDOC_URL', () => {
+        const win = getFakeWindow();
+        win.location = parseUrlDeprecated(
+          'https://cdn.ampproject.org/a/o.com/foo/?amp_r=hello%3Dworld'
+        );
+        return Services.urlReplacementsForDoc(win.document.documentElement)
+          .expandUrlAsync('?url=AMPDOC_URL')
+          .then((res) => {
+            expect(res).to.contain(
+              encodeURIComponent(
+                'https://cdn.ampproject.org/a/o.com/foo/?hello=world'
+              )
+            );
+          });
       });
 
-      it('should replace AMPDOC_HOSTNAME', () => {
-        return expandUrlAsync('?ref=AMPDOC_HOSTNAME').then((res) => {
-          expect(res).to.not.match(/AMPDOC_HOSTNAME/);
-        });
+      it('should merge extra params in AMPDOC_URL', () => {
+        const win = getFakeWindow();
+        win.location = parseUrlDeprecated(
+          'https://cdn.ampproject.org/a/o.com/foo/?test=case&amp_r=hello%3Dworld'
+        );
+        return Services.urlReplacementsForDoc(win.document.documentElement)
+          .expandUrlAsync('?url=AMPDOC_URL')
+          .then((res) => {
+            expect(res).to.contain(
+              encodeURIComponent(
+                'https://cdn.ampproject.org/a/o.com/foo/?test=case&hello=world'
+              )
+            );
+          });
       });
 
-      describe('SOURCE_URL', () => {
-        it('should replace SOURCE_URL and SOURCE_HOST', () => {
-          const win = getFakeWindow();
-          win.location = parseUrlDeprecated('https://wrong.com');
-          env.sandbox
-            .stub(trackPromise, 'getTrackImpressionPromise')
-            .callsFake(() => {
-              return new Promise((resolve) => {
-                win.location = parseUrlDeprecated('https://example.com/test');
-                resolve();
-              });
-            });
-          return Services.urlReplacementsForDoc(win.document.documentElement)
-            .expandUrlAsync('?url=SOURCE_URL&host=SOURCE_HOST')
-            .then((res) => {
-              expect(res).to.equal(
-                '?url=https%3A%2F%2Fexample.com%2Ftest&host=example.com'
-              );
-            });
-        });
-
-        it('should replace SOURCE_URL and SOURCE_HOSTNAME', () => {
-          const win = getFakeWindow();
-          win.location = parseUrlDeprecated('https://wrong.com');
-          env.sandbox
-            .stub(trackPromise, 'getTrackImpressionPromise')
-            .callsFake(() => {
-              return new Promise((resolve) => {
-                win.location = parseUrlDeprecated('https://example.com/test');
-                resolve();
-              });
-            });
-          return Services.urlReplacementsForDoc(win.document.documentElement)
-            .expandUrlAsync('?url=SOURCE_URL&hostname=SOURCE_HOSTNAME')
-            .then((res) => {
-              expect(res).to.equal(
-                '?url=https%3A%2F%2Fexample.com%2Ftest&hostname=example.com'
-              );
-            });
-        });
-
-        it('should update SOURCE_URL after track impression', () => {
-          const win = getFakeWindow();
-          win.location = parseUrlDeprecated('https://wrong.com');
-          env.sandbox
-            .stub(trackPromise, 'getTrackImpressionPromise')
-            .callsFake(() => {
-              return new Promise((resolve) => {
-                win.location = parseUrlDeprecated(
-                  'https://example.com?gclid=123456'
-                );
-                resolve();
-              });
-            });
-          return Services.urlReplacementsForDoc(win.document.documentElement)
-            .expandUrlAsync('?url=SOURCE_URL')
-            .then((res) => {
-              expect(res).to.contain('example.com');
-            });
-        });
-
-        it('should add extra params to SOURCE_URL', () => {
-          const win = getFakeWindow();
-          win.location = parseUrlDeprecated(
-            'https://cdn.ampproject.org/a/o.com/foo/?a&amp_r=hello%3Dworld'
-          );
-          env.sandbox
-            .stub(trackPromise, 'getTrackImpressionPromise')
-            .callsFake(() => {
-              return Promise.resolve();
-            });
-          return Services.urlReplacementsForDoc(win.document.documentElement)
-            .expandUrlAsync('?url=SOURCE_URL')
-            .then((res) => {
-              expect(res).to.equal(
-                '?url=' + encodeURIComponent('http://o.com/foo/?a&hello=world')
-              );
-            });
-        });
-
-        it('should ignore extra params that already exists in SOURCE_URL', () => {
-          const win = getFakeWindow();
-          win.location = parseUrlDeprecated(
-            'https://cdn.ampproject.org/a/o.com/foo/?a=1&safe=1&amp_r=hello%3Dworld%26safe=evil'
-          );
-          env.sandbox
-            .stub(trackPromise, 'getTrackImpressionPromise')
-            .callsFake(() => {
-              return Promise.resolve();
-            });
-          return Services.urlReplacementsForDoc(win.document.documentElement)
-            .expandUrlAsync('?url=SOURCE_URL')
-            .then((res) => {
-              expect(res).to.equal(
-                '?url=' +
-                  encodeURIComponent('http://o.com/foo/?a=1&safe=1&hello=world')
-              );
-            });
-        });
-
-        it('should not change SOURCE_URL if is not ad landing page', () => {
-          const win = getFakeWindow();
-          win.location = parseUrlDeprecated(
-            'https://cdn.ampproject.org/v/o.com/foo/?a&amp_r=hello%3Dworld'
-          );
-          env.sandbox
-            .stub(trackPromise, 'getTrackImpressionPromise')
-            .callsFake(() => {
-              return Promise.resolve();
-            });
-          return Services.urlReplacementsForDoc(win.document.documentElement)
-            .expandUrlAsync('?url=SOURCE_URL')
-            .then((res) => {
-              expect(res).to.equal(
-                '?url=' + encodeURIComponent('http://o.com/foo/?a')
-              );
-            });
-        });
+      it('should allow an embedded amp_r parameter', () => {
+        const win = getFakeWindow();
+        win.location = parseUrlDeprecated(
+          'https://cdn.ampproject.org/a/o.com/foo/?amp_r=amp_r%3Dweird'
+        );
+        return Services.urlReplacementsForDoc(win.document.documentElement)
+          .expandUrlAsync('?url=AMPDOC_URL')
+          .then((res) => {
+            expect(res).to.contain(
+              encodeURIComponent(
+                'https://cdn.ampproject.org/a/o.com/foo/?amp_r=weird'
+              )
+            );
+          });
       });
 
-      it('should replace SOURCE_PATH', () => {
-        return expandUrlAsync('?path=SOURCE_PATH').then((res) => {
-          expect(res).to.not.match(/SOURCE_PATH/);
-        });
+      it('should prefer original params in AMPDOC_URL', () => {
+        const win = getFakeWindow();
+        win.location = parseUrlDeprecated(
+          'https://cdn.ampproject.org/a/o.com/foo/?test=case&amp_r=test%3Devil'
+        );
+        return Services.urlReplacementsForDoc(win.document.documentElement)
+          .expandUrlAsync('?url=AMPDOC_URL')
+          .then((res) => {
+            expect(res).to.contain(
+              encodeURIComponent(
+                'https://cdn.ampproject.org/a/o.com/foo/?test=case'
+              )
+            );
+          });
       });
 
-      it('should replace PAGE_VIEW_ID', () => {
-        return expandUrlAsync('?pid=PAGE_VIEW_ID').then((res) => {
-          expect(res).to.match(/pid=\d+/);
-        });
+      it('should merge multiple extra params safely in AMPDOC_URL', () => {
+        const win = getFakeWindow();
+        win.location = parseUrlDeprecated(
+          'https://cdn.ampproject.org/a/o.com/foo/?test=case&a&hello=you&amp_r=hello%3Dworld%26goodnight%3Dmoon'
+        );
+        return Services.urlReplacementsForDoc(win.document.documentElement)
+          .expandUrlAsync('?url=AMPDOC_URL')
+          .then((res) => {
+            expect(res).to.contain(
+              encodeURIComponent(
+                'https://cdn.ampproject.org/a/o.com/foo/?test=case&a&hello=you&goodnight=moon'
+              )
+            );
+          });
       });
+    });
 
-      it('should replace PAGE_VIEW_ID_64', () => {
-        return expandUrlAsync('?pid=PAGE_VIEW_ID_64').then((res) => {
-          expect(res).to.match(/pid=([a-zA-Z0-9_-]{10,})/);
-        });
+    it('should replace AMPDOC_HOST', () => {
+      return expandUrlAsync('?ref=AMPDOC_HOST').then((res) => {
+        expect(res).to.not.match(/AMPDOC_HOST/);
       });
+    });
 
-      it('should replace CLIENT_ID', () => {
-        setCookie(window, 'url-abc', 'cid-for-abc');
-        // Make sure cookie does not exist
-        setCookie(window, 'url-xyz', '');
-        return expandUrlAsync(
-          '?a=CLIENT_ID(url-abc)&b=CLIENT_ID(url-xyz)',
-          /*opt_bindings*/ undefined,
-          {withCid: true}
-        ).then((res) => {
-          expect(res).to.match(/^\?a=cid-for-abc\&b=amp-([a-zA-Z0-9_-]{10,})/);
-        });
+    it('should replace AMPDOC_HOSTNAME', () => {
+      return expandUrlAsync('?ref=AMPDOC_HOSTNAME').then((res) => {
+        expect(res).to.not.match(/AMPDOC_HOSTNAME/);
       });
+    });
 
-      it('should allow empty CLIENT_ID', () => {
-        return getReplacements()
-          .then((replacements) => {
-            stubServiceForDoc(env.sandbox, ampdoc, 'cid', 'get').returns(
-              Promise.resolve()
-            );
-            return replacements.expandUrlAsync('?a=CLIENT_ID(_ga)');
-          })
+    describe('SOURCE_URL', () => {
+      it('should replace SOURCE_URL and SOURCE_HOST', () => {
+        const win = getFakeWindow();
+        win.location = parseUrlDeprecated('https://wrong.com');
+        env.sandbox
+          .stub(trackPromise, 'getTrackImpressionPromise')
+          .callsFake(() => {
+            return new Promise((resolve) => {
+              win.location = parseUrlDeprecated('https://example.com/test');
+              resolve();
+            });
+          });
+        return Services.urlReplacementsForDoc(win.document.documentElement)
+          .expandUrlAsync('?url=SOURCE_URL&host=SOURCE_HOST')
           .then((res) => {
-            expect(res).to.equal('?a=');
+            expect(res).to.equal(
+              '?url=https%3A%2F%2Fexample.com%2Ftest&host=example.com'
+            );
           });
       });
 
-      it('should replace CLIENT_ID with opt_cookieName', () => {
-        setCookie(window, 'url-abc', 'cid-for-abc');
-        // Make sure cookie does not exist
-        setCookie(window, 'url-xyz', '');
-        return expandUrlAsync(
-          '?a=CLIENT_ID(abc,,url-abc)&b=CLIENT_ID(xyz,,url-xyz)',
-          /*opt_bindings*/ undefined,
-          {withCid: true}
-        ).then((res) => {
-          expect(res).to.match(/^\?a=cid-for-abc\&b=amp-([a-zA-Z0-9_-]{10,})/);
-        });
+      it('should replace SOURCE_URL and SOURCE_HOSTNAME', () => {
+        const win = getFakeWindow();
+        win.location = parseUrlDeprecated('https://wrong.com');
+        env.sandbox
+          .stub(trackPromise, 'getTrackImpressionPromise')
+          .callsFake(() => {
+            return new Promise((resolve) => {
+              win.location = parseUrlDeprecated('https://example.com/test');
+              resolve();
+            });
+          });
+        return Services.urlReplacementsForDoc(win.document.documentElement)
+          .expandUrlAsync('?url=SOURCE_URL&hostname=SOURCE_HOSTNAME')
+          .then((res) => {
+            expect(res).to.equal(
+              '?url=https%3A%2F%2Fexample.com%2Ftest&hostname=example.com'
+            );
+          });
       });
 
-      it('should parse _ga cookie correctly', () => {
-        setCookie(window, '_ga', 'GA1.2.12345.54321');
-        return expandUrlAsync(
-          '?a=CLIENT_ID(AMP_ECID_GOOGLE,,_ga)&b=CLIENT_ID(_ga)',
-          /*opt_bindings*/ undefined,
-          {withCid: true}
-        ).then((res) => {
-          expect(res).to.match(/^\?a=12345.54321&b=12345.54321/);
-        });
+      it('should update SOURCE_URL after track impression', () => {
+        const win = getFakeWindow();
+        win.location = parseUrlDeprecated('https://wrong.com');
+        env.sandbox
+          .stub(trackPromise, 'getTrackImpressionPromise')
+          .callsFake(() => {
+            return new Promise((resolve) => {
+              win.location = parseUrlDeprecated(
+                'https://example.com?gclid=123456'
+              );
+              resolve();
+            });
+          });
+        return Services.urlReplacementsForDoc(win.document.documentElement)
+          .expandUrlAsync('?url=SOURCE_URL')
+          .then((res) => {
+            expect(res).to.contain('example.com');
+          });
       });
 
-      // TODO(alanorozco, #11827): Make this test work on Safari.
-      it.configure()
-        .skipSafari()
-        .run('should replace CLIENT_ID synchronously when available', () => {
-          return getReplacements({withCid: true}).then((urlReplacements) => {
-            setCookie(window, 'url-abc', 'cid-for-abc');
-            setCookie(window, 'url-xyz', 'cid-for-xyz');
-            // Only requests cid-for-xyz in async path
-            return urlReplacements
-              .expandUrlAsync('b=CLIENT_ID(url-xyz)')
-              .then((res) => {
-                expect(res).to.equal('b=cid-for-xyz');
-              })
-              .then(() => {
-                const result = urlReplacements.expandUrlSync(
-                  '?a=CLIENT_ID(url-abc)&b=CLIENT_ID(url-xyz)' +
-                    '&c=CLIENT_ID(other)'
-                );
-                expect(result).to.equal('?a=&b=cid-for-xyz&c=');
-              });
+      it('should add extra params to SOURCE_URL', () => {
+        const win = getFakeWindow();
+        win.location = parseUrlDeprecated(
+          'https://cdn.ampproject.org/a/o.com/foo/?a&amp_r=hello%3Dworld'
+        );
+        env.sandbox
+          .stub(trackPromise, 'getTrackImpressionPromise')
+          .callsFake(() => {
+            return Promise.resolve();
           });
-        });
+        return Services.urlReplacementsForDoc(win.document.documentElement)
+          .expandUrlAsync('?url=SOURCE_URL')
+          .then((res) => {
+            expect(res).to.equal(
+              '?url=' + encodeURIComponent('http://o.com/foo/?a&hello=world')
+            );
+          });
+      });
 
-      it('should replace AMP_STATE(key)', () => {
+      it('should ignore extra params that already exists in SOURCE_URL', () => {
         const win = getFakeWindow();
-        env.sandbox.stub(Services, 'bindForDocOrNull').returns(
-          Promise.resolve({
-            getStateValue(key) {
-              expect(key).to.equal('foo.bar');
-              return Promise.resolve('baz');
-            },
-          })
+        win.location = parseUrlDeprecated(
+          'https://cdn.ampproject.org/a/o.com/foo/?a=1&safe=1&amp_r=hello%3Dworld%26safe=evil'
         );
+        env.sandbox
+          .stub(trackPromise, 'getTrackImpressionPromise')
+          .callsFake(() => {
+            return Promise.resolve();
+          });
         return Services.urlReplacementsForDoc(win.document.documentElement)
-          .expandUrlAsync('?state=AMP_STATE(foo.bar)')
+          .expandUrlAsync('?url=SOURCE_URL')
           .then((res) => {
-            expect(res).to.equal('?state=baz');
+            expect(res).to.equal(
+              '?url=' +
+                encodeURIComponent('http://o.com/foo/?a=1&safe=1&hello=world')
+            );
           });
       });
 
-      // TODO(#16916): Make this test work with synchronous throws.
-      it.skip('should replace VARIANT', () => {
-        return expect(
-          expandUrlAsync(
-            '?x1=VARIANT(x1)&x2=VARIANT(x2)&x3=VARIANT(x3)',
-            /*opt_bindings*/ undefined,
-            {withVariant: true}
-          )
-        ).to.eventually.equal('?x1=v1&x2=none&x3=');
+      it('should not change SOURCE_URL if is not ad landing page', () => {
+        const win = getFakeWindow();
+        win.location = parseUrlDeprecated(
+          'https://cdn.ampproject.org/v/o.com/foo/?a&amp_r=hello%3Dworld'
+        );
+        env.sandbox
+          .stub(trackPromise, 'getTrackImpressionPromise')
+          .callsFake(() => {
+            return Promise.resolve();
+          });
+        return Services.urlReplacementsForDoc(win.document.documentElement)
+          .expandUrlAsync('?url=SOURCE_URL')
+          .then((res) => {
+            expect(res).to.equal(
+              '?url=' + encodeURIComponent('http://o.com/foo/?a')
+            );
+          });
       });
+    });
 
-      // TODO(#16916): Make this test work with synchronous throws.
-      it.skip(
-        'should replace VARIANT with empty string if ' +
-          'amp-experiment is not configured ',
-        () => {
-          return expect(
-            expandUrlAsync('?x1=VARIANT(x1)&x2=VARIANT(x2)&x3=VARIANT(x3)')
-          ).to.eventually.equal('?x1=&x2=&x3=');
-        }
-      );
-
-      it('should replace VARIANTS', () => {
-        return expect(
-          expandUrlAsync('?VARIANTS', /*opt_bindings*/ undefined, {
-            withVariant: true,
-          })
-        ).to.eventually.equal('?x1.v1!x2.none');
+    it('should replace SOURCE_PATH', () => {
+      return expandUrlAsync('?path=SOURCE_PATH').then((res) => {
+        expect(res).to.not.match(/SOURCE_PATH/);
       });
+    });
 
-      // TODO(#16916): Make this test work with synchronous throws.
-      it.skip(
-        'should replace VARIANTS with empty string if ' +
-          'amp-experiment is not configured ',
-        () => {
-          return expect(expandUrlAsync('?VARIANTS')).to.eventually.equal('?');
-        }
-      );
-
-      it('should replace TIMESTAMP', () => {
-        return expandUrlAsync('?ts=TIMESTAMP').then((res) => {
-          expect(res).to.match(/ts=\d+/);
-        });
+    it('should replace PAGE_VIEW_ID', () => {
+      return expandUrlAsync('?pid=PAGE_VIEW_ID').then((res) => {
+        expect(res).to.match(/pid=\d+/);
       });
+    });
 
-      it('should replace TIMESTAMP_ISO', () => {
-        return expandUrlAsync('?tsf=TIMESTAMP_ISO').then((res) => {
-          expect(res).to.match(/tsf=\d+/);
-        });
+    it('should replace PAGE_VIEW_ID_64', () => {
+      return expandUrlAsync('?pid=PAGE_VIEW_ID_64').then((res) => {
+        expect(res).to.match(/pid=([a-zA-Z0-9_-]{10,})/);
       });
+    });
 
-      it('should return correct ISO timestamp', () => {
-        const fakeTime = 1499979336612;
-        env.sandbox.useFakeTimers(fakeTime);
-        return expect(expandUrlAsync('?tsf=TIMESTAMP_ISO')).to.eventually.equal(
-          '?tsf=2017-07-13T20%3A55%3A36.612Z'
-        );
+    it('should replace CLIENT_ID', () => {
+      setCookie(window, 'url-abc', 'cid-for-abc');
+      // Make sure cookie does not exist
+      setCookie(window, 'url-xyz', '');
+      return expandUrlAsync(
+        '?a=CLIENT_ID(url-abc)&b=CLIENT_ID(url-xyz)',
+        /*opt_bindings*/ undefined,
+        {withCid: true}
+      ).then((res) => {
+        expect(res).to.match(/^\?a=cid-for-abc\&b=amp-([a-zA-Z0-9_-]{10,})/);
       });
+    });
 
-      it('should replace TIMEZONE', () => {
-        return expandUrlAsync('?tz=TIMEZONE').then((res) => {
-          expect(res).to.match(/tz=-?\d+/);
+    it('should allow empty CLIENT_ID', () => {
+      return getReplacements()
+        .then((replacements) => {
+          stubServiceForDoc(env.sandbox, ampdoc, 'cid', 'get').returns(
+            Promise.resolve()
+          );
+          return replacements.expandUrlAsync('?a=CLIENT_ID(_ga)');
+        })
+        .then((res) => {
+          expect(res).to.equal('?a=');
         });
-      });
+    });
 
-      it('should replace SCROLL_HEIGHT', () => {
-        return expandUrlAsync('?scrollHeight=SCROLL_HEIGHT').then((res) => {
-          expect(res).to.match(/scrollHeight=\d+/);
-        });
+    it('should replace CLIENT_ID with opt_cookieName', () => {
+      setCookie(window, 'url-abc', 'cid-for-abc');
+      // Make sure cookie does not exist
+      setCookie(window, 'url-xyz', '');
+      return expandUrlAsync(
+        '?a=CLIENT_ID(abc,,url-abc)&b=CLIENT_ID(xyz,,url-xyz)',
+        /*opt_bindings*/ undefined,
+        {withCid: true}
+      ).then((res) => {
+        expect(res).to.match(/^\?a=cid-for-abc\&b=amp-([a-zA-Z0-9_-]{10,})/);
       });
+    });
 
-      it('should replace SCREEN_WIDTH', () => {
-        return expandUrlAsync('?sw=SCREEN_WIDTH').then((res) => {
-          expect(res).to.match(/sw=\d+/);
-        });
+    it('should parse _ga cookie correctly', () => {
+      setCookie(window, '_ga', 'GA1.2.12345.54321');
+      return expandUrlAsync(
+        '?a=CLIENT_ID(AMP_ECID_GOOGLE,,_ga)&b=CLIENT_ID(_ga)',
+        /*opt_bindings*/ undefined,
+        {withCid: true}
+      ).then((res) => {
+        expect(res).to.match(/^\?a=12345.54321&b=12345.54321/);
       });
+    });
 
-      it('should replace SCREEN_HEIGHT', () => {
-        return expandUrlAsync('?sh=SCREEN_HEIGHT').then((res) => {
-          expect(res).to.match(/sh=\d+/);
-        });
+    it('should replace CLIENT_ID synchronously when available', () => {
+      return getReplacements({withCid: true}).then((urlReplacements) => {
+        setCookie(window, 'url-abc', 'cid-for-abc');
+        setCookie(window, 'url-xyz', 'cid-for-xyz');
+        // Only requests cid-for-xyz in async path
+        return urlReplacements
+          .expandUrlAsync('b=CLIENT_ID(url-xyz)')
+          .then((res) => {
+            expect(res).to.equal('b=cid-for-xyz');
+          })
+          .then(() => {
+            const result = urlReplacements.expandUrlSync(
+              '?a=CLIENT_ID(url-abc)&b=CLIENT_ID(url-xyz)' +
+                '&c=CLIENT_ID(other)'
+            );
+            expect(result).to.equal('?a=&b=cid-for-xyz&c=');
+          });
       });
+    });
 
-      it('should replace VIEWPORT_WIDTH', () => {
-        return expandUrlAsync('?vw=VIEWPORT_WIDTH').then((res) => {
-          expect(res).to.match(/vw=\d+/);
+    it('should replace AMP_STATE(key)', () => {
+      const win = getFakeWindow();
+      env.sandbox.stub(Services, 'bindForDocOrNull').returns(
+        Promise.resolve({
+          getStateValue(key) {
+            expect(key).to.equal('foo.bar');
+            return Promise.resolve('baz');
+          },
+        })
+      );
+      return Services.urlReplacementsForDoc(win.document.documentElement)
+        .expandUrlAsync('?state=AMP_STATE(foo.bar)')
+        .then((res) => {
+          expect(res).to.equal('?state=baz');
         });
-      });
+    });
 
-      it('should replace VIEWPORT_HEIGHT', () => {
-        return expandUrlAsync('?vh=VIEWPORT_HEIGHT').then((res) => {
-          expect(res).to.match(/vh=\d+/);
-        });
-      });
+    it.skip('should replace VARIANT', () => {
+      return expect(
+        expandUrlAsync(
+          '?x1=VARIANT(x1)&x2=VARIANT(x2)&x3=VARIANT(x3)',
+          /*opt_bindings*/ undefined,
+          {withVariant: true}
+        )
+      ).to.eventually.equal('?x1=v1&x2=none&x3=');
+    });
 
-      it('should replace PAGE_LOAD_TIME', () => {
-        return expandUrlAsync('?sh=PAGE_LOAD_TIME').then((res) => {
-          expect(res).to.match(/sh=\d+/);
-        });
-      });
+    it.skip(
+      'should replace VARIANT with empty string if ' +
+        'amp-experiment is not configured ',
+      () => {
+        return expect(
+          expandUrlAsync('?x1=VARIANT(x1)&x2=VARIANT(x2)&x3=VARIANT(x3)')
+        ).to.eventually.equal('?x1=&x2=&x3=');
+      }
+    );
+
+    it('should replace VARIANTS', () => {
+      return expect(
+        expandUrlAsync('?VARIANTS', /*opt_bindings*/ undefined, {
+          withVariant: true,
+        })
+      ).to.eventually.equal('?x1.v1!x2.none');
+    });
 
-      it('should reject protocol changes', () => {
-        const win = getFakeWindow();
-        const {documentElement} = win.document;
-        const urlReplacements = Services.urlReplacementsForDoc(documentElement);
-        return urlReplacements
-          .expandUrlAsync('PROTOCOL://example.com/?r=RANDOM', {
-            'PROTOCOL': Promise.resolve('abc'),
-          })
-          .then((expanded) => {
-            expect(expanded).to.equal('PROTOCOL://example.com/?r=RANDOM');
-          });
-      });
+    it.skip(
+      'should replace VARIANTS with empty string if ' +
+        'amp-experiment is not configured ',
+      () => {
+        return expect(expandUrlAsync('?VARIANTS')).to.eventually.equal('?');
+      }
+    );
 
-      it('Should replace BACKGROUND_STATE with 0', () => {
-        const win = getFakeWindow();
-        const {ampdoc} = win;
-        env.sandbox.stub(ampdoc, 'isVisible').returns(true);
-        return Services.urlReplacementsForDoc(win.document.documentElement)
-          .expandUrlAsync('?sh=BACKGROUND_STATE')
-          .then((res) => {
-            expect(res).to.equal('?sh=0');
-          });
+    it('should replace TIMESTAMP', () => {
+      return expandUrlAsync('?ts=TIMESTAMP').then((res) => {
+        expect(res).to.match(/ts=\d+/);
       });
+    });
 
-      it('Should replace BACKGROUND_STATE with 1', () => {
-        const win = getFakeWindow();
-        const {ampdoc} = win;
-        env.sandbox.stub(ampdoc, 'isVisible').returns(false);
-        return Services.urlReplacementsForDoc(win.document.documentElement)
-          .expandUrlAsync('?sh=BACKGROUND_STATE')
-          .then((res) => {
-            expect(res).to.equal('?sh=1');
-          });
+    it('should replace TIMESTAMP_ISO', () => {
+      return expandUrlAsync('?tsf=TIMESTAMP_ISO').then((res) => {
+        expect(res).to.match(/tsf=\d+/);
       });
+    });
 
-      it('Should replace VIDEO_STATE(video,parameter) with video data', () => {
-        const win = getFakeWindow();
-        env.sandbox.stub(Services, 'videoManagerForDoc').returns({
-          getVideoStateProperty() {
-            return Promise.resolve('1.5');
-          },
-        });
-        env.sandbox
-          .stub(win.document, 'getElementById')
-          .withArgs('video')
-          .returns(document.createElement('video'));
+    it('should return correct ISO timestamp', () => {
+      const fakeTime = 1499979336612;
+      env.sandbox.useFakeTimers(fakeTime);
+      return expect(expandUrlAsync('?tsf=TIMESTAMP_ISO')).to.eventually.equal(
+        '?tsf=2017-07-13T20%3A55%3A36.612Z'
+      );
+    });
 
-        return Services.urlReplacementsForDoc(win.document.documentElement)
-          .expandUrlAsync('?sh=VIDEO_STATE(video,currentTime)')
-          .then((res) => {
-            expect(res).to.equal('?sh=1.5');
-          });
+    it('should replace TIMEZONE', () => {
+      return expandUrlAsync('?tz=TIMEZONE').then((res) => {
+        expect(res).to.match(/tz=-?\d+/);
       });
+    });
 
-      describe('PAGE_LOAD_TIME', () => {
-        let win;
-        let eventListeners;
-        beforeEach(() => {
-          win = getFakeWindow();
-          eventListeners = {};
-          win.document.readyState = 'loading';
-          win.document.addEventListener = function (eventType, handler) {
-            eventListeners[eventType] = handler;
-          };
-          win.document.removeEventListener = function (eventType, handler) {
-            if (eventListeners[eventType] == handler) {
-              delete eventListeners[eventType];
-            }
-          };
-        });
-
-        it('is replaced if timing info is not available', () => {
-          win.document.readyState = 'complete';
-          return Services.urlReplacementsForDoc(win.document.documentElement)
-            .expandUrlAsync('?sh=PAGE_LOAD_TIME&s')
-            .then((res) => {
-              expect(res).to.match(/sh=&s/);
-            });
-        });
+    it('should replace SCROLL_HEIGHT', () => {
+      return expandUrlAsync('?scrollHeight=SCROLL_HEIGHT').then((res) => {
+        expect(res).to.match(/scrollHeight=\d+/);
+      });
+    });
 
-        it('is replaced if PAGE_LOAD_TIME is available within a delay', () => {
-          const {documentElement} = win.document;
-          const urlReplacements =
-            Services.urlReplacementsForDoc(documentElement);
-          const validMetric = urlReplacements.expandUrlAsync(
-            '?sh=PAGE_LOAD_TIME&s'
-          );
-          urlReplacements.ampdoc.win.performance.timing.loadEventStart = 109;
-          win.document.readyState = 'complete';
-          loadObservable.fire({type: 'load'});
-          return validMetric.then((res) => {
-            expect(res).to.match(/sh=9&s/);
-          });
-        });
+    it('should replace SCREEN_WIDTH', () => {
+      return expandUrlAsync('?sw=SCREEN_WIDTH').then((res) => {
+        expect(res).to.match(/sw=\d+/);
       });
+    });
 
-      it('should replace NAV_REDIRECT_COUNT', () => {
-        return expandUrlAsync('?sh=NAV_REDIRECT_COUNT').then((res) => {
-          expect(res).to.match(/sh=\d+/);
-        });
+    it('should replace SCREEN_HEIGHT', () => {
+      return expandUrlAsync('?sh=SCREEN_HEIGHT').then((res) => {
+        expect(res).to.match(/sh=\d+/);
       });
+    });
 
-      // TODO(cvializ, #12336): unskip
-      it.skip('should replace NAV_TIMING', () => {
-        return expandUrlAsync(
-          '?a=NAV_TIMING(navigationStart)' +
-            '&b=NAV_TIMING(navigationStart,responseStart)'
-        ).then((res) => {
-          expect(res).to.match(/a=\d+&b=\d+/);
-        });
+    it('should replace VIEWPORT_WIDTH', () => {
+      return expandUrlAsync('?vw=VIEWPORT_WIDTH').then((res) => {
+        expect(res).to.match(/vw=\d+/);
       });
+    });
 
-      it('should replace NAV_TIMING when attribute names are invalid', () => {
-        return expandUrlAsync(
-          '?a=NAV_TIMING(invalid)' +
-            '&b=NAV_TIMING(invalid,invalid)' +
-            '&c=NAV_TIMING(navigationStart,invalid)' +
-            '&d=NAV_TIMING(invalid,responseStart)'
-        ).then((res) => {
-          expect(res).to.match(/a=&b=&c=&d=/);
-        });
+    it('should replace VIEWPORT_HEIGHT', () => {
+      return expandUrlAsync('?vh=VIEWPORT_HEIGHT').then((res) => {
+        expect(res).to.match(/vh=\d+/);
       });
+    });
 
-      it('should replace NAV_TYPE', () => {
-        return expandUrlAsync('?sh=NAV_TYPE').then((res) => {
-          expect(res).to.match(/sh=\d+/);
-        });
+    it('should replace PAGE_LOAD_TIME', () => {
+      return expandUrlAsync('?sh=PAGE_LOAD_TIME').then((res) => {
+        expect(res).to.match(/sh=\d+/);
       });
+    });
 
-      it('should replace DOMAIN_LOOKUP_TIME', () => {
-        return expandUrlAsync('?sh=DOMAIN_LOOKUP_TIME').then((res) => {
-          expect(res).to.match(/sh=\d+/);
+    it('should reject protocol changes', () => {
+      const win = getFakeWindow();
+      const {documentElement} = win.document;
+      const urlReplacements = Services.urlReplacementsForDoc(documentElement);
+      return urlReplacements
+        .expandUrlAsync('PROTOCOL://example.com/?r=RANDOM', {
+          'PROTOCOL': Promise.resolve('abc'),
+        })
+        .then((expanded) => {
+          expect(expanded).to.equal('PROTOCOL://example.com/?r=RANDOM');
         });
-      });
+    });
 
-      it('should replace TCP_CONNECT_TIME', () => {
-        return expandUrlAsync('?sh=TCP_CONNECT_TIME').then((res) => {
-          expect(res).to.match(/sh=\d+/);
+    it('Should replace BACKGROUND_STATE with 0', () => {
+      const win = getFakeWindow();
+      const {ampdoc} = win;
+      env.sandbox.stub(ampdoc, 'isVisible').returns(true);
+      return Services.urlReplacementsForDoc(win.document.documentElement)
+        .expandUrlAsync('?sh=BACKGROUND_STATE')
+        .then((res) => {
+          expect(res).to.equal('?sh=0');
         });
-      });
+    });
 
-      it('should replace SERVER_RESPONSE_TIME', () => {
-        return expandUrlAsync('?sh=SERVER_RESPONSE_TIME').then((res) => {
-          expect(res).to.match(/sh=\d+/);
+    it('Should replace BACKGROUND_STATE with 1', () => {
+      const win = getFakeWindow();
+      const {ampdoc} = win;
+      env.sandbox.stub(ampdoc, 'isVisible').returns(false);
+      return Services.urlReplacementsForDoc(win.document.documentElement)
+        .expandUrlAsync('?sh=BACKGROUND_STATE')
+        .then((res) => {
+          expect(res).to.equal('?sh=1');
         });
+    });
+
+    it('Should replace VIDEO_STATE(video,parameter) with video data', () => {
+      const win = getFakeWindow();
+      env.sandbox.stub(Services, 'videoManagerForDoc').returns({
+        getVideoStateProperty() {
+          return Promise.resolve('1.5');
+        },
       });
+      env.sandbox
+        .stub(win.document, 'getElementById')
+        .withArgs('video')
+        .returns(document.createElement('video'));
 
-      it('should replace PAGE_DOWNLOAD_TIME', () => {
-        return expandUrlAsync('?sh=PAGE_DOWNLOAD_TIME').then((res) => {
-          expect(res).to.match(/sh=\d+/);
+      return Services.urlReplacementsForDoc(win.document.documentElement)
+        .expandUrlAsync('?sh=VIDEO_STATE(video,currentTime)')
+        .then((res) => {
+          expect(res).to.equal('?sh=1.5');
         });
+    });
+
+    describe('PAGE_LOAD_TIME', () => {
+      let win;
+      let eventListeners;
+      beforeEach(() => {
+        win = getFakeWindow();
+        eventListeners = {};
+        win.document.readyState = 'loading';
+        win.document.addEventListener = function (eventType, handler) {
+          eventListeners[eventType] = handler;
+        };
+        win.document.removeEventListener = function (eventType, handler) {
+          if (eventListeners[eventType] == handler) {
+            delete eventListeners[eventType];
+          }
+        };
       });
 
-      // TODO(cvializ, #12336): unskip
-      it.skip('should replace REDIRECT_TIME', () => {
-        return expandUrlAsync('?sh=REDIRECT_TIME').then((res) => {
-          expect(res).to.match(/sh=\d+/);
-        });
+      it('is replaced if timing info is not available', () => {
+        win.document.readyState = 'complete';
+        return Services.urlReplacementsForDoc(win.document.documentElement)
+          .expandUrlAsync('?sh=PAGE_LOAD_TIME&s')
+          .then((res) => {
+            expect(res).to.match(/sh=&s/);
+          });
       });
 
-      it('should replace DOM_INTERACTIVE_TIME', () => {
-        return expandUrlAsync('?sh=DOM_INTERACTIVE_TIME').then((res) => {
-          expect(res).to.match(/sh=\d+/);
+      it('is replaced if PAGE_LOAD_TIME is available within a delay', () => {
+        const {documentElement} = win.document;
+        const urlReplacements = Services.urlReplacementsForDoc(documentElement);
+        const validMetric = urlReplacements.expandUrlAsync(
+          '?sh=PAGE_LOAD_TIME&s'
+        );
+        urlReplacements.ampdoc.win.performance.timing.loadEventStart = 109;
+        win.document.readyState = 'complete';
+        loadObservable.fire({type: 'load'});
+        return validMetric.then((res) => {
+          expect(res).to.match(/sh=9&s/);
         });
       });
+    });
 
-      it('should replace CONTENT_LOAD_TIME', () => {
-        return expandUrlAsync('?sh=CONTENT_LOAD_TIME').then((res) => {
-          expect(res).to.match(/sh=\d+/);
-        });
+    it('should replace NAV_REDIRECT_COUNT', () => {
+      return expandUrlAsync('?sh=NAV_REDIRECT_COUNT').then((res) => {
+        expect(res).to.match(/sh=\d+/);
       });
+    });
 
-      it('should replace AVAILABLE_SCREEN_HEIGHT', () => {
-        return expandUrlAsync('?sh=AVAILABLE_SCREEN_HEIGHT').then((res) => {
-          expect(res).to.match(/sh=\d+/);
-        });
+    it.skip('should replace NAV_TIMING', () => {
+      return expandUrlAsync(
+        '?a=NAV_TIMING(navigationStart)' +
+          '&b=NAV_TIMING(navigationStart,responseStart)'
+      ).then((res) => {
+        expect(res).to.match(/a=\d+&b=\d+/);
       });
+    });
 
-      it('should replace AVAILABLE_SCREEN_WIDTH', () => {
-        return expandUrlAsync('?sh=AVAILABLE_SCREEN_WIDTH').then((res) => {
-          expect(res).to.match(/sh=\d+/);
-        });
+    it('should replace NAV_TIMING when attribute names are invalid', () => {
+      return expandUrlAsync(
+        '?a=NAV_TIMING(invalid)' +
+          '&b=NAV_TIMING(invalid,invalid)' +
+          '&c=NAV_TIMING(navigationStart,invalid)' +
+          '&d=NAV_TIMING(invalid,responseStart)'
+      ).then((res) => {
+        expect(res).to.match(/a=&b=&c=&d=/);
       });
+    });
 
-      it('should replace SCREEN_COLOR_DEPTH', () => {
-        return expandUrlAsync('?sh=SCREEN_COLOR_DEPTH').then((res) => {
-          expect(res).to.match(/sh=\d+/);
-        });
+    it('should replace NAV_TYPE', () => {
+      return expandUrlAsync('?sh=NAV_TYPE').then((res) => {
+        expect(res).to.match(/sh=\d+/);
       });
+    });
 
-      it('should replace BROWSER_LANGUAGE', () => {
-        return expandUrlAsync('?sh=BROWSER_LANGUAGE').then((res) => {
-          expect(res).to.match(/sh=\w+/);
-        });
+    it('should replace DOMAIN_LOOKUP_TIME', () => {
+      return expandUrlAsync('?sh=DOMAIN_LOOKUP_TIME').then((res) => {
+        expect(res).to.match(/sh=\d+/);
       });
+    });
 
-      it('should replace UACH platform', () => {
-        return expandUrlAsync('?sh=UACH(platform)').then((res) => {
-          expect(res).to.match(/sh=\w?/);
-        });
+    it('should replace TCP_CONNECT_TIME', () => {
+      return expandUrlAsync('?sh=TCP_CONNECT_TIME').then((res) => {
+        expect(res).to.match(/sh=\d+/);
       });
+    });
 
-      it('should replace UACH brands', () => {
-        return expandUrlAsync('?sh=UACH(brands)').then((res) => {
-          expect(res).to.match(/sh=\w?/);
-        });
+    it('should replace SERVER_RESPONSE_TIME', () => {
+      return expandUrlAsync('?sh=SERVER_RESPONSE_TIME').then((res) => {
+        expect(res).to.match(/sh=\d+/);
       });
+    });
 
-      it('should replace USER_AGENT', () => {
-        return expandUrlAsync('?sh=USER_AGENT').then((res) => {
-          expect(res).to.match(/sh=\w+/);
-        });
+    it('should replace PAGE_DOWNLOAD_TIME', () => {
+      return expandUrlAsync('?sh=PAGE_DOWNLOAD_TIME').then((res) => {
+        expect(res).to.match(/sh=\d+/);
       });
+    });
 
-      it('should replace VIEWER with origin', () => {
-        return getReplacements().then((replacements) => {
-          env.sandbox
-            .stub(viewerService, 'getViewerOrigin')
-            .returns(Promise.resolve('https://www.google.com'));
-          return replacements.expandUrlAsync('?sh=VIEWER').then((res) => {
-            expect(res).to.equal('?sh=https%3A%2F%2Fwww.google.com');
-          });
-        });
+    it.skip('should replace REDIRECT_TIME', () => {
+      return expandUrlAsync('?sh=REDIRECT_TIME').then((res) => {
+        expect(res).to.match(/sh=\d+/);
       });
+    });
 
-      it('should replace VIEWER with empty string', () => {
-        return getReplacements().then((replacements) => {
-          env.sandbox
-            .stub(viewerService, 'getViewerOrigin')
-            .returns(Promise.resolve(''));
-          return replacements.expandUrlAsync('?sh=VIEWER').then((res) => {
-            expect(res).to.equal('?sh=');
-          });
-        });
+    it('should replace DOM_INTERACTIVE_TIME', () => {
+      return expandUrlAsync('?sh=DOM_INTERACTIVE_TIME').then((res) => {
+        expect(res).to.match(/sh=\d+/);
       });
+    });
 
-      it('should replace TOTAL_ENGAGED_TIME', () => {
-        return expandUrlAsync(
-          '?sh=TOTAL_ENGAGED_TIME',
-          /*opt_bindings*/ undefined,
-          {withActivity: true}
-        ).then((res) => {
-          expect(res).to.match(/sh=\d+/);
-        });
+    it('should replace CONTENT_LOAD_TIME', () => {
+      return expandUrlAsync('?sh=CONTENT_LOAD_TIME').then((res) => {
+        expect(res).to.match(/sh=\d+/);
       });
+    });
 
-      it('should replace INCREMENTAL_ENGAGED_TIME', () => {
-        return expandUrlAsync(
-          '?sh=INCREMENTAL_ENGAGED_TIME',
-          /*opt_bindings*/ undefined,
-          {withActivity: true}
-        ).then((res) => {
-          expect(res).to.match(/sh=\d+/);
-        });
+    it('should replace AVAILABLE_SCREEN_HEIGHT', () => {
+      return expandUrlAsync('?sh=AVAILABLE_SCREEN_HEIGHT').then((res) => {
+        expect(res).to.match(/sh=\d+/);
       });
+    });
 
-      it('should replace AMP_VERSION', () => {
-        return expandUrlAsync('?sh=AMP_VERSION').then((res) => {
-          expect(res).to.equal('?sh=%24internalRuntimeVersion%24');
-        });
+    it('should replace AVAILABLE_SCREEN_WIDTH', () => {
+      return expandUrlAsync('?sh=AVAILABLE_SCREEN_WIDTH').then((res) => {
+        expect(res).to.match(/sh=\d+/);
       });
+    });
 
-      it('should replace FRAGMENT_PARAM with 2', () => {
-        const win = getFakeWindow();
-        win.location = {originalHash: '#margarine=1&ice=2&cream=3'};
-        return Services.urlReplacementsForDoc(win.document.documentElement)
-          .expandUrlAsync('?sh=FRAGMENT_PARAM(ice)&s')
-          .then((res) => {
-            expect(res).to.equal('?sh=2&s');
-          });
+    it('should replace SCREEN_COLOR_DEPTH', () => {
+      return expandUrlAsync('?sh=SCREEN_COLOR_DEPTH').then((res) => {
+        expect(res).to.match(/sh=\d+/);
       });
+    });
 
-      it('should async replace AMP_GEO(ISOCountry) and AMP_GEO', () => {
-        env.sandbox.stub(Services, 'geoForDocOrNull').returns(
-          Promise.resolve({
-            'ISOCountry': 'unknown',
-            'ISOCountryGroups': ['nafta', 'waldo'],
-            'nafta': true,
-            'waldo': true,
-            'matchedISOCountryGroups': ['nafta', 'waldo'],
-          })
-        );
-        return expandUrlAsync('?geo=AMP_GEO,country=AMP_GEO(ISOCountry)').then(
-          (res) => {
-            expect(res).to.equal('?geo=nafta%2Cwaldo,country=unknown');
-          }
-        );
+    it('should replace BROWSER_LANGUAGE', () => {
+      return expandUrlAsync('?sh=BROWSER_LANGUAGE').then((res) => {
+        expect(res).to.match(/sh=\w+/);
       });
+    });
 
-      it('should sync replace AMP_GEO(ISOCountry) and AMP_GEO', () => {
-        env.sandbox.stub(Services, 'geoForDocOrNull').returns(
-          Promise.resolve({
-            'ISOCountry': 'unknown',
-            'ISOCountryGroups': ['nafta', 'waldo'],
-            'nafta': true,
-            'waldo': true,
-            'matchedISOCountryGroups': ['nafta', 'waldo'],
-          })
-        );
-        getReplacements().then((replacements) =>
-          expect(
-            replacements.expandUrlSync(
-              '?geo=AMP_GEO,country=AMP_GEO(ISOCountry)'
-            )
-          ).to.equal('?geo=nafta%2Cwaldo,country=unknown')
-        );
+    it('should replace UACH platform', () => {
+      return expandUrlAsync('?sh=UACH(platform)').then((res) => {
+        expect(res).to.match(/sh=\w?/);
       });
+    });
 
-      it('should sync replace AMP_GEO(ISOCountry) and AMP_GEO with unknown when geo is not available', () => {
-        env.sandbox.stub(Services, 'geoForDocOrNull').returns(null);
-        getReplacements().then((replacements) =>
-          expect(
-            replacements.expandUrlSync(
-              '?geo=AMP_GEO,country=AMP_GEO(ISOCountry)'
-            )
-          ).to.equal('?geo=unknown,country=unknown')
-        );
+    it('should replace UACH brands', () => {
+      return expandUrlAsync('?sh=UACH(brands)').then((res) => {
+        expect(res).to.match(/sh=\w?/);
       });
+    });
 
-      it('should sync replace AMP_GEO(ISOCountry) and AMP_GEO with unknown when geo is unknown', () => {
-        getReplacements().then((replacements) =>
-          expect(
-            replacements.expandUrlSync(
-              '?geo=AMP_GEO,country=AMP_GEO(ISOCountry)'
-            )
-          ).to.equal('?geo=unknown,country=unknown')
-        );
+    it('should replace USER_AGENT', () => {
+      return expandUrlAsync('?sh=USER_AGENT').then((res) => {
+        expect(res).to.match(/sh=\w+/);
       });
+    });
 
-      it.configure()
-        .skipFirefox()
-        .run('should accept $expressions', () => {
-          return expandUrlAsync('?href=$CANONICAL_URL').then((res) => {
-            expect(res).to.equal(
-              '?href=https%3A%2F%2Fpinterest.com%3A8080%2Fpin1'
-            );
-          });
+    it('should replace VIEWER with origin', () => {
+      return getReplacements().then((replacements) => {
+        env.sandbox
+          .stub(viewerService, 'getViewerOrigin')
+          .returns(Promise.resolve('https://www.google.com'));
+        return replacements.expandUrlAsync('?sh=VIEWER').then((res) => {
+          expect(res).to.equal('?sh=https%3A%2F%2Fwww.google.com');
         });
+      });
+    });
 
-      it('should ignore unknown substitutions', () => {
-        return expandUrlAsync('?a=UNKNOWN').then((res) => {
-          expect(res).to.equal('?a=UNKNOWN');
+    it('should replace VIEWER with empty string', () => {
+      return getReplacements().then((replacements) => {
+        env.sandbox
+          .stub(viewerService, 'getViewerOrigin')
+          .returns(Promise.resolve(''));
+        return replacements.expandUrlAsync('?sh=VIEWER').then((res) => {
+          expect(res).to.equal('?sh=');
         });
       });
+    });
 
-      it.configure()
-        .skipFirefox()
-        .run('should replace several substitutions', () => {
-          return expandUrlAsync(
-            '?a=UNKNOWN&href=CANONICAL_URL&title=TITLE'
-          ).then((res) => {
-            expect(res).to.equal(
-              '?a=UNKNOWN' +
-                '&href=https%3A%2F%2Fpinterest.com%3A8080%2Fpin1' +
-                '&title=Pixel%20Test'
-            );
-          });
-        });
+    it('should replace TOTAL_ENGAGED_TIME', () => {
+      return expandUrlAsync(
+        '?sh=TOTAL_ENGAGED_TIME',
+        /*opt_bindings*/ undefined,
+        {withActivity: true}
+      ).then((res) => {
+        expect(res).to.match(/sh=\d+/);
+      });
+    });
 
-      it('should replace new substitutions', () => {
-        return getReplacements().then((replacements) => {
-          replacements.getVariableSource().set('ONE', () => 'a');
-          expect(replacements.expandUrlAsync('?a=ONE')).to.eventually.equal(
-            '?a=a'
-          );
-          replacements.getVariableSource().set('ONE', () => 'b');
-          replacements.getVariableSource().set('TWO', () => 'b');
-          return expect(
-            replacements.expandUrlAsync('?a=ONE&b=TWO')
-          ).to.eventually.equal('?a=b&b=b');
-        });
+    it('should replace INCREMENTAL_ENGAGED_TIME', () => {
+      return expandUrlAsync(
+        '?sh=INCREMENTAL_ENGAGED_TIME',
+        /*opt_bindings*/ undefined,
+        {withActivity: true}
+      ).then((res) => {
+        expect(res).to.match(/sh=\d+/);
       });
+    });
 
-      // TODO(#16916): Make this test work with synchronous throws.
-      it.skip('should report errors & replace them with empty string (sync)', () => {
-        const clock = env.sandbox.useFakeTimers();
-        const {documentElement} = window.document;
-        const replacements = Services.urlReplacementsForDoc(documentElement);
-        replacements.getVariableSource().set('ONE', () => {
-          throw new Error('boom');
-        });
-        const p = expect(
-          replacements.expandUrlAsync('?a=ONE')
-        ).to.eventually.equal('?a=');
-        allowConsoleError(() => {
-          expect(() => {
-            clock.tick(1);
-          }).to.throw(/boom/);
-        });
-        return p;
+    it('should replace AMP_VERSION', () => {
+      return expandUrlAsync('?sh=AMP_VERSION').then((res) => {
+        expect(res).to.equal('?sh=%24internalRuntimeVersion%24');
       });
+    });
 
-      // TODO(#16916): Make this test work with synchronous throws.
-      it.skip('should report errors & replace them with empty string (promise)', () => {
-        const clock = env.sandbox.useFakeTimers();
-        const {documentElement} = window.document;
-        const replacements = Services.urlReplacementsForDoc(documentElement);
-        replacements.getVariableSource().set('ONE', () => {
-          return Promise.reject(new Error('boom'));
+    it('should replace FRAGMENT_PARAM with 2', () => {
+      const win = getFakeWindow();
+      win.location = {originalHash: '#margarine=1&ice=2&cream=3'};
+      return Services.urlReplacementsForDoc(win.document.documentElement)
+        .expandUrlAsync('?sh=FRAGMENT_PARAM(ice)&s')
+        .then((res) => {
+          expect(res).to.equal('?sh=2&s');
         });
-        return expect(replacements.expandUrlAsync('?a=ONE'))
-          .to.eventually.equal('?a=')
-          .then(() => {
-            allowConsoleError(() => {
-              expect(() => {
-                clock.tick(1);
-              }).to.throw(/boom/);
-            });
-          });
+    });
+
+    it('should async replace AMP_GEO(ISOCountry) and AMP_GEO', () => {
+      env.sandbox.stub(Services, 'geoForDocOrNull').returns(
+        Promise.resolve({
+          'ISOCountry': 'unknown',
+          'ISOCountryGroups': ['nafta', 'waldo'],
+          'nafta': true,
+          'waldo': true,
+          'matchedISOCountryGroups': ['nafta', 'waldo'],
+        })
+      );
+      return expandUrlAsync('?geo=AMP_GEO,country=AMP_GEO(ISOCountry)').then(
+        (res) => {
+          expect(res).to.equal('?geo=nafta%2Cwaldo,country=unknown');
+        }
+      );
+    });
+
+    it('should sync replace AMP_GEO(ISOCountry) and AMP_GEO', () => {
+      env.sandbox.stub(Services, 'geoForDocOrNull').returns(
+        Promise.resolve({
+          'ISOCountry': 'unknown',
+          'ISOCountryGroups': ['nafta', 'waldo'],
+          'nafta': true,
+          'waldo': true,
+          'matchedISOCountryGroups': ['nafta', 'waldo'],
+        })
+      );
+      getReplacements().then((replacements) =>
+        expect(
+          replacements.expandUrlSync('?geo=AMP_GEO,country=AMP_GEO(ISOCountry)')
+        ).to.equal('?geo=nafta%2Cwaldo,country=unknown')
+      );
+    });
+
+    it('should sync replace AMP_GEO(ISOCountry) and AMP_GEO with unknown when geo is not available', () => {
+      env.sandbox.stub(Services, 'geoForDocOrNull').returns(null);
+      getReplacements().then((replacements) =>
+        expect(
+          replacements.expandUrlSync('?geo=AMP_GEO,country=AMP_GEO(ISOCountry)')
+        ).to.equal('?geo=unknown,country=unknown')
+      );
+    });
+
+    it('should sync replace AMP_GEO(ISOCountry) and AMP_GEO with unknown when geo is unknown', () => {
+      getReplacements().then((replacements) =>
+        expect(
+          replacements.expandUrlSync('?geo=AMP_GEO,country=AMP_GEO(ISOCountry)')
+        ).to.equal('?geo=unknown,country=unknown')
+      );
+    });
+
+    it('should accept $expressions', () => {
+      return expandUrlAsync('?href=$CANONICAL_URL').then((res) => {
+        expect(res).to.equal('?href=https%3A%2F%2Fpinterest.com%3A8080%2Fpin1');
       });
+    });
 
-      it('should support positional arguments', () => {
-        return getReplacements().then((replacements) => {
-          replacements.getVariableSource().set('FN', (one) => one);
-          return expect(
-            replacements.expandUrlAsync('?a=FN(xyz1)')
-          ).to.eventually.equal('?a=xyz1');
-        });
+    it('should ignore unknown substitutions', () => {
+      return expandUrlAsync('?a=UNKNOWN').then((res) => {
+        expect(res).to.equal('?a=UNKNOWN');
       });
+    });
 
-      it('should support multiple positional arguments', () => {
-        return getReplacements().then((replacements) => {
-          replacements.getVariableSource().set('FN', (one, two) => {
-            return one + '-' + two;
-          });
-          return expect(
-            replacements.expandUrlAsync('?a=FN(xyz,abc)')
-          ).to.eventually.equal('?a=xyz-abc');
-        });
+    it('should replace several substitutions', () => {
+      return expandUrlAsync('?a=UNKNOWN&href=CANONICAL_URL&title=TITLE').then(
+        (res) => {
+          expect(res).to.equal(
+            '?a=UNKNOWN' +
+              '&href=https%3A%2F%2Fpinterest.com%3A8080%2Fpin1' +
+              '&title=Pixel%20Test'
+          );
+        }
+      );
+    });
+
+    it('should replace new substitutions', () => {
+      return getReplacements().then((replacements) => {
+        replacements.getVariableSource().set('ONE', () => 'a');
+        expect(replacements.expandUrlAsync('?a=ONE')).to.eventually.equal(
+          '?a=a'
+        );
+        replacements.getVariableSource().set('ONE', () => 'b');
+        replacements.getVariableSource().set('TWO', () => 'b');
+        return expect(
+          replacements.expandUrlAsync('?a=ONE&b=TWO')
+        ).to.eventually.equal('?a=b&b=b');
       });
+    });
 
-      it('should support multiple positional arguments with dots', () => {
-        return getReplacements().then((replacements) => {
-          replacements.getVariableSource().set('FN', (one, two) => {
-            return one + '-' + two;
+    it.skip('should report errors & replace them with empty string (sync)', () => {
+      const clock = env.sandbox.useFakeTimers();
+      const {documentElement} = window.document;
+      const replacements = Services.urlReplacementsForDoc(documentElement);
+      replacements.getVariableSource().set('ONE', () => {
+        throw new Error('boom');
+      });
+      const p = expect(
+        replacements.expandUrlAsync('?a=ONE')
+      ).to.eventually.equal('?a=');
+      allowConsoleError(() => {
+        expect(() => {
+          clock.tick(1);
+        }).to.throw(/boom/);
+      });
+      return p;
+    });
+
+    it.skip('should report errors & replace them with empty string (promise)', () => {
+      const clock = env.sandbox.useFakeTimers();
+      const {documentElement} = window.document;
+      const replacements = Services.urlReplacementsForDoc(documentElement);
+      replacements.getVariableSource().set('ONE', () => {
+        return Promise.reject(new Error('boom'));
+      });
+      return expect(replacements.expandUrlAsync('?a=ONE'))
+        .to.eventually.equal('?a=')
+        .then(() => {
+          allowConsoleError(() => {
+            expect(() => {
+              clock.tick(1);
+            }).to.throw(/boom/);
           });
-          return expect(
-            replacements.expandUrlAsync('?a=FN(xy.z,ab.c)')
-          ).to.eventually.equal('?a=xy.z-ab.c');
         });
+    });
+
+    it('should support positional arguments', () => {
+      return getReplacements().then((replacements) => {
+        replacements.getVariableSource().set('FN', (one) => one);
+        return expect(
+          replacements.expandUrlAsync('?a=FN(xyz1)')
+        ).to.eventually.equal('?a=xyz1');
       });
+    });
 
-      it('should support promises as replacements', () => {
-        return getReplacements().then((replacements) => {
-          replacements
-            .getVariableSource()
-            .set('P1', () => Promise.resolve('abc '));
-          replacements
-            .getVariableSource()
-            .set('P2', () => Promise.resolve('xyz'));
-          replacements
-            .getVariableSource()
-            .set('P3', () => Promise.resolve('123'));
-          replacements.getVariableSource().set('OTHER', () => 'foo');
-          return expect(
-            replacements.expandUrlAsync('?a=P1&b=P2&c=P3&d=OTHER')
-          ).to.eventually.equal('?a=abc%20&b=xyz&c=123&d=foo');
+    it('should support multiple positional arguments', () => {
+      return getReplacements().then((replacements) => {
+        replacements.getVariableSource().set('FN', (one, two) => {
+          return one + '-' + two;
         });
+        return expect(
+          replacements.expandUrlAsync('?a=FN(xyz,abc)')
+        ).to.eventually.equal('?a=xyz-abc');
       });
+    });
 
-      it('should override an existing binding', () => {
-        return expandUrlAsync('ord=RANDOM?', {'RANDOM': 'abc'}).then((res) => {
-          expect(res).to.match(/ord=abc\?$/);
+    it('should support multiple positional arguments with dots', () => {
+      return getReplacements().then((replacements) => {
+        replacements.getVariableSource().set('FN', (one, two) => {
+          return one + '-' + two;
         });
+        return expect(
+          replacements.expandUrlAsync('?a=FN(xy.z,ab.c)')
+        ).to.eventually.equal('?a=xy.z-ab.c');
       });
+    });
 
-      it('should add an additional binding', () => {
-        return expandUrlAsync('rid=NONSTANDARD?', {'NONSTANDARD': 'abc'}).then(
-          (res) => {
-            expect(res).to.match(/rid=abc\?$/);
-          }
-        );
+    it('should support promises as replacements', () => {
+      return getReplacements().then((replacements) => {
+        replacements
+          .getVariableSource()
+          .set('P1', () => Promise.resolve('abc '));
+        replacements
+          .getVariableSource()
+          .set('P2', () => Promise.resolve('xyz'));
+        replacements
+          .getVariableSource()
+          .set('P3', () => Promise.resolve('123'));
+        replacements.getVariableSource().set('OTHER', () => 'foo');
+        return expect(
+          replacements.expandUrlAsync('?a=P1&b=P2&c=P3&d=OTHER')
+        ).to.eventually.equal('?a=abc%20&b=xyz&c=123&d=foo');
       });
+    });
 
-      it('should NOT overwrite the cached expression with new bindings', () => {
-        return expandUrlAsync('rid=NONSTANDARD?', {'NONSTANDARD': 'abc'}).then(
-          (res) => {
-            expect(res).to.match(/rid=abc\?$/);
-            return expandUrlAsync('rid=NONSTANDARD?').then((res) => {
-              expect(res).to.match(/rid=NONSTANDARD\?$/);
-            });
-          }
-        );
+    it('should override an existing binding', () => {
+      return expandUrlAsync('ord=RANDOM?', {'RANDOM': 'abc'}).then((res) => {
+        expect(res).to.match(/ord=abc\?$/);
       });
+    });
 
-      it('should expand bindings as functions', () => {
-        return expandUrlAsync('rid=FUNC(abc)?', {
-          'FUNC': (value) => 'func_' + value,
-        }).then((res) => {
-          expect(res).to.match(/rid=func_abc\?$/);
-        });
-      });
+    it('should add an additional binding', () => {
+      return expandUrlAsync('rid=NONSTANDARD?', {'NONSTANDARD': 'abc'}).then(
+        (res) => {
+          expect(res).to.match(/rid=abc\?$/);
+        }
+      );
+    });
 
-      it('should expand bindings as functions with promise', () => {
-        return expandUrlAsync('rid=FUNC(abc)?', {
-          'FUNC': (value) => Promise.resolve('func_' + value),
-        }).then((res) => {
-          expect(res).to.match(/rid=func_abc\?$/);
-        });
-      });
+    it('should NOT overwrite the cached expression with new bindings', () => {
+      return expandUrlAsync('rid=NONSTANDARD?', {'NONSTANDARD': 'abc'}).then(
+        (res) => {
+          expect(res).to.match(/rid=abc\?$/);
+          return expandUrlAsync('rid=NONSTANDARD?').then((res) => {
+            expect(res).to.match(/rid=NONSTANDARD\?$/);
+          });
+        }
+      );
+    });
 
-      it('should expand null as empty string', () => {
-        return expandUrlAsync('v=VALUE', {'VALUE': null}).then((res) => {
-          expect(res).to.equal('v=');
-        });
+    it('should expand bindings as functions', () => {
+      return expandUrlAsync('rid=FUNC(abc)?', {
+        'FUNC': (value) => 'func_' + value,
+      }).then((res) => {
+        expect(res).to.match(/rid=func_abc\?$/);
       });
+    });
 
-      it('should expand undefined as empty string', () => {
-        return expandUrlAsync('v=VALUE', {'VALUE': undefined}).then((res) => {
-          expect(res).to.equal('v=');
-        });
+    it('should expand bindings as functions with promise', () => {
+      return expandUrlAsync('rid=FUNC(abc)?', {
+        'FUNC': (value) => Promise.resolve('func_' + value),
+      }).then((res) => {
+        expect(res).to.match(/rid=func_abc\?$/);
       });
+    });
 
-      it('should expand empty string as empty string', () => {
-        return expandUrlAsync('v=VALUE', {'VALUE': ''}).then((res) => {
-          expect(res).to.equal('v=');
-        });
+    it('should expand null as empty string', () => {
+      return expandUrlAsync('v=VALUE', {'VALUE': null}).then((res) => {
+        expect(res).to.equal('v=');
       });
+    });
 
-      it('should expand zero as zero', () => {
-        return expandUrlAsync('v=VALUE', {'VALUE': 0}).then((res) => {
-          expect(res).to.equal('v=0');
-        });
+    it('should expand undefined as empty string', () => {
+      return expandUrlAsync('v=VALUE', {'VALUE': undefined}).then((res) => {
+        expect(res).to.equal('v=');
       });
+    });
 
-      it('should expand false as false', () => {
-        return expandUrlAsync('v=VALUE', {'VALUE': false}).then((res) => {
-          expect(res).to.equal('v=false');
-        });
+    it('should expand empty string as empty string', () => {
+      return expandUrlAsync('v=VALUE', {'VALUE': ''}).then((res) => {
+        expect(res).to.equal('v=');
       });
+    });
 
-      it('should resolve sub-included bindings', () => {
-        // RANDOM is a standard property and we add RANDOM_OTHER.
-        return expandUrlAsync('r=RANDOM&ro=RANDOM_OTHER?', {
-          'RANDOM_OTHER': 'ABC',
-        }).then((res) => {
-          expect(res).to.match(/r=(\d+(\.\d+)?)&ro=ABC\?$/);
-        });
+    it('should expand zero as zero', () => {
+      return expandUrlAsync('v=VALUE', {'VALUE': 0}).then((res) => {
+        expect(res).to.equal('v=0');
       });
+    });
 
-      it('should expand multiple vars', () => {
-        return expandUrlAsync('a=VALUEA&b=VALUEB?', {
-          'VALUEA': 'aaa',
-          'VALUEB': 'bbb',
-        }).then((res) => {
-          expect(res).to.match(/a=aaa&b=bbb\?$/);
-        });
+    it('should expand false as false', () => {
+      return expandUrlAsync('v=VALUE', {'VALUE': false}).then((res) => {
+        expect(res).to.equal('v=false');
       });
+    });
 
-      describe('QUERY_PARAM', () => {
-        it('should replace QUERY_PARAM with foo', () => {
-          const win = getFakeWindow();
-          win.location = parseUrlDeprecated(
-            'https://example.com?query_string_param1=wrong'
-          );
-          env.sandbox
-            .stub(trackPromise, 'getTrackImpressionPromise')
-            .callsFake(() => {
-              return new Promise((resolve) => {
-                win.location = parseUrlDeprecated(
-                  'https://example.com?query_string_param1=foo'
-                );
-                resolve();
-              });
-            });
-          return Services.urlReplacementsForDoc(win.document.documentElement)
-            .expandUrlAsync('?sh=QUERY_PARAM(query_string_param1)&s')
-            .then((res) => {
-              expect(res).to.match(/sh=foo&s/);
-            });
-        });
-
-        it('should replace QUERY_PARAM with ""', () => {
-          const win = getFakeWindow();
-          win.location = parseUrlDeprecated('https://example.com');
-          env.sandbox
-            .stub(trackPromise, 'getTrackImpressionPromise')
-            .callsFake(() => {
-              return Promise.resolve();
-            });
-          return Services.urlReplacementsForDoc(win.document.documentElement)
-            .expandUrlAsync('?sh=QUERY_PARAM(query_string_param1)&s')
-            .then((res) => {
-              expect(res).to.match(/sh=&s/);
-            });
-        });
+    it('should resolve sub-included bindings', () => {
+      // RANDOM is a standard property and we add RANDOM_OTHER.
+      return expandUrlAsync('r=RANDOM&ro=RANDOM_OTHER?', {
+        'RANDOM_OTHER': 'ABC',
+      }).then((res) => {
+        expect(res).to.match(/r=(\d+(\.\d+)?)&ro=ABC\?$/);
+      });
+    });
 
-        it('should replace QUERY_PARAM with default_value', () => {
-          const win = getFakeWindow();
-          win.location = parseUrlDeprecated('https://example.com');
-          env.sandbox
-            .stub(trackPromise, 'getTrackImpressionPromise')
-            .callsFake(() => {
-              return Promise.resolve();
-            });
-          return Services.urlReplacementsForDoc(win.document.documentElement)
-            .expandUrlAsync(
-              '?sh=QUERY_PARAM(query_string_param1,default_value)&s'
-            )
-            .then((res) => {
-              expect(res).to.match(/sh=default_value&s/);
-            });
-        });
+    it('should expand multiple vars', () => {
+      return expandUrlAsync('a=VALUEA&b=VALUEB?', {
+        'VALUEA': 'aaa',
+        'VALUEB': 'bbb',
+      }).then((res) => {
+        expect(res).to.match(/a=aaa&b=bbb\?$/);
+      });
+    });
 
-        it('should replace QUERY_PARAM with extra param', () => {
-          const win = getFakeWindow();
-          win.location = parseUrlDeprecated(
-            'https://cdn.ampproject.org/a/o.com/foo/?x=wrong'
-          );
-          env.sandbox
-            .stub(trackPromise, 'getTrackImpressionPromise')
-            .callsFake(() => {
-              return new Promise((resolve) => {
-                win.location = parseUrlDeprecated(
-                  'https://cdn.ampproject.org/a/o.com/foo/?amp_r=x%3Dfoo'
-                );
-                resolve();
-              });
-            });
-          return Services.urlReplacementsForDoc(win.document.documentElement)
-            .expandUrlAsync('?sh=QUERY_PARAM(x)&s')
-            .then((res) => {
-              expect(res).to.match(/sh=foo&s/);
+    describe('QUERY_PARAM', () => {
+      it('should replace QUERY_PARAM with foo', () => {
+        const win = getFakeWindow();
+        win.location = parseUrlDeprecated(
+          'https://example.com?query_string_param1=wrong'
+        );
+        env.sandbox
+          .stub(trackPromise, 'getTrackImpressionPromise')
+          .callsFake(() => {
+            return new Promise((resolve) => {
+              win.location = parseUrlDeprecated(
+                'https://example.com?query_string_param1=foo'
+              );
+              resolve();
             });
-        });
+          });
+        return Services.urlReplacementsForDoc(win.document.documentElement)
+          .expandUrlAsync('?sh=QUERY_PARAM(query_string_param1)&s')
+          .then((res) => {
+            expect(res).to.match(/sh=foo&s/);
+          });
+      });
 
-        it('should replace QUERY_PARAM, preferring original over extra', () => {
-          const win = getFakeWindow();
-          win.location = parseUrlDeprecated(
-            'https://cdn.ampproject.org/a/o.com/foo/?x=wrong'
-          );
-          env.sandbox
-            .stub(trackPromise, 'getTrackImpressionPromise')
-            .callsFake(() => {
-              return new Promise((resolve) => {
-                win.location = parseUrlDeprecated(
-                  'https://cdn.ampproject.org/a/o.com/foo/?x=foo&amp_r=x%3Devil'
-                );
-                resolve();
-              });
-            });
-          return Services.urlReplacementsForDoc(win.document.documentElement)
-            .expandUrlAsync('?sh=QUERY_PARAM(x)&s')
-            .then((res) => {
-              expect(res).to.match(/sh=foo&s/);
-            });
-        });
+      it('should replace QUERY_PARAM with ""', () => {
+        const win = getFakeWindow();
+        win.location = parseUrlDeprecated('https://example.com');
+        env.sandbox
+          .stub(trackPromise, 'getTrackImpressionPromise')
+          .callsFake(() => {
+            return Promise.resolve();
+          });
+        return Services.urlReplacementsForDoc(win.document.documentElement)
+          .expandUrlAsync('?sh=QUERY_PARAM(query_string_param1)&s')
+          .then((res) => {
+            expect(res).to.match(/sh=&s/);
+          });
       });
 
-      it('should collect vars', () => {
+      it('should replace QUERY_PARAM with default_value', () => {
         const win = getFakeWindow();
-        win.location = parseUrlDeprecated('https://example.com?p1=foo');
+        win.location = parseUrlDeprecated('https://example.com');
         env.sandbox
           .stub(trackPromise, 'getTrackImpressionPromise')
           .callsFake(() => {
             return Promise.resolve();
           });
         return Services.urlReplacementsForDoc(win.document.documentElement)
-          .collectVars('?SOURCE_HOST&QUERY_PARAM(p1)&SIMPLE&FUNC&PROMISE', {
-            'SIMPLE': 21,
-            'FUNC': () => 22,
-            'PROMISE': () => Promise.resolve(23),
-          })
+          .expandUrlAsync(
+            '?sh=QUERY_PARAM(query_string_param1,default_value)&s'
+          )
           .then((res) => {
-            expect(res).to.deep.equal({
-              'SOURCE_HOST': 'example.com',
-              'QUERY_PARAM(p1)': 'foo',
-              'SIMPLE': 21,
-              'FUNC': 22,
-              'PROMISE': 23,
-            });
+            expect(res).to.match(/sh=default_value&s/);
           });
       });
 
-      it('should collect unallowlisted vars', () => {
+      it('should replace QUERY_PARAM with extra param', () => {
         const win = getFakeWindow();
         win.location = parseUrlDeprecated(
-          'https://example.com/base?foo=bar&bar=abc&gclid=123'
+          'https://cdn.ampproject.org/a/o.com/foo/?x=wrong'
         );
-        const element = document.createElement('amp-foo');
-        element.setAttribute('src', '?SOURCE_HOST&QUERY_PARAM(p1)&COUNTER');
-        element.setAttribute('data-amp-replace', 'QUERY_PARAM');
-        const {documentElement} = win.document;
-        const urlReplacements = Services.urlReplacementsForDoc(documentElement);
-        const unallowlisted =
-          urlReplacements.collectDisallowedVarsSync(element);
-        expect(unallowlisted).to.deep.equal(['SOURCE_HOST', 'COUNTER']);
+        env.sandbox
+          .stub(trackPromise, 'getTrackImpressionPromise')
+          .callsFake(() => {
+            return new Promise((resolve) => {
+              win.location = parseUrlDeprecated(
+                'https://cdn.ampproject.org/a/o.com/foo/?amp_r=x%3Dfoo'
+              );
+              resolve();
+            });
+          });
+        return Services.urlReplacementsForDoc(win.document.documentElement)
+          .expandUrlAsync('?sh=QUERY_PARAM(x)&s')
+          .then((res) => {
+            expect(res).to.match(/sh=foo&s/);
+          });
       });
 
-      it('should reject javascript protocol', () => {
-        const protocolErrorRegex = /invalid protocol/;
-        expectAsyncConsoleError(protocolErrorRegex);
+      it('should replace QUERY_PARAM, preferring original over extra', () => {
         const win = getFakeWindow();
-        const {documentElement} = win.document;
-        const urlReplacements = Services.urlReplacementsForDoc(documentElement);
-        /*eslint no-script-url: 0*/
-        return urlReplacements
-          .expandUrlAsync('javascript://example.com/?r=RANDOM')
-          .then(
-            () => {
-              throw new Error('never here');
-            },
-            (err) => {
-              expect(err.message).to.match(protocolErrorRegex);
-            }
-          );
+        win.location = parseUrlDeprecated(
+          'https://cdn.ampproject.org/a/o.com/foo/?x=wrong'
+        );
+        env.sandbox
+          .stub(trackPromise, 'getTrackImpressionPromise')
+          .callsFake(() => {
+            return new Promise((resolve) => {
+              win.location = parseUrlDeprecated(
+                'https://cdn.ampproject.org/a/o.com/foo/?x=foo&amp_r=x%3Devil'
+              );
+              resolve();
+            });
+          });
+        return Services.urlReplacementsForDoc(win.document.documentElement)
+          .expandUrlAsync('?sh=QUERY_PARAM(x)&s')
+          .then((res) => {
+            expect(res).to.match(/sh=foo&s/);
+          });
       });
+    });
 
-      describe('sync expansion', () => {
-        it('should expand w/ collect vars (skip async macro)', () => {
-          const win = getFakeWindow();
-          const {documentElement} = win.document;
-          const urlReplacements =
-            Services.urlReplacementsForDoc(documentElement);
-          urlReplacements.ampdoc.win.performance.timing.loadEventStart = 109;
-          const expanded = urlReplacements.expandUrlSync(
-            'r=RANDOM&c=CONST&f=FUNCT(hello,world)&a=b&d=PROM&e=PAGE_LOAD_TIME',
-            {
-              'CONST': 'ABC',
-              'FUNCT': function (a, b) {
-                return a + b;
-              },
-              // Will ignore promise based result and instead insert empty string.
-              'PROM': function () {
-                return Promise.resolve('boo');
-              },
-            }
-          );
-          expect(expanded).to.match(
-            /^r=\d(\.\d+)?&c=ABC&f=helloworld&a=b&d=&e=9$/
-          );
+    it('should collect vars', () => {
+      const win = getFakeWindow();
+      win.location = parseUrlDeprecated('https://example.com?p1=foo');
+      env.sandbox
+        .stub(trackPromise, 'getTrackImpressionPromise')
+        .callsFake(() => {
+          return Promise.resolve();
+        });
+      return Services.urlReplacementsForDoc(win.document.documentElement)
+        .collectVars('?SOURCE_HOST&QUERY_PARAM(p1)&SIMPLE&FUNC&PROMISE', {
+          'SIMPLE': 21,
+          'FUNC': () => 22,
+          'PROMISE': () => Promise.resolve(23),
+        })
+        .then((res) => {
+          expect(res).to.deep.equal({
+            'SOURCE_HOST': 'example.com',
+            'QUERY_PARAM(p1)': 'foo',
+            'SIMPLE': 21,
+            'FUNC': 22,
+            'PROMISE': 23,
+          });
         });
+    });
 
-        it('should reject protocol changes', () => {
-          const win = getFakeWindow();
-          const {documentElement} = win.document;
-          const urlReplacements =
-            Services.urlReplacementsForDoc(documentElement);
-          let expanded = urlReplacements.expandUrlSync(
-            'PROTOCOL://example.com/?r=RANDOM',
-            {
-              'PROTOCOL': 'abc',
-            }
-          );
-          expect(expanded).to.equal('PROTOCOL://example.com/?r=RANDOM');
-          expanded = urlReplacements.expandUrlSync(
-            'FUNCT://example.com/?r=RANDOM',
-            {
-              'FUNCT': function () {
-                return 'abc';
-              },
-            }
-          );
-          expect(expanded).to.equal('FUNCT://example.com/?r=RANDOM');
-        });
+    it('should collect unallowlisted vars', () => {
+      const win = getFakeWindow();
+      win.location = parseUrlDeprecated(
+        'https://example.com/base?foo=bar&bar=abc&gclid=123'
+      );
+      const element = document.createElement('amp-foo');
+      element.setAttribute('src', '?SOURCE_HOST&QUERY_PARAM(p1)&COUNTER');
+      element.setAttribute('data-amp-replace', 'QUERY_PARAM');
+      const {documentElement} = win.document;
+      const urlReplacements = Services.urlReplacementsForDoc(documentElement);
+      const unallowlisted = urlReplacements.collectDisallowedVarsSync(element);
+      expect(unallowlisted).to.deep.equal(['SOURCE_HOST', 'COUNTER']);
+    });
 
-        it('should reject javascript protocol', () => {
-          const win = getFakeWindow();
-          const {documentElement} = win.document;
-          const urlReplacements =
-            Services.urlReplacementsForDoc(documentElement);
-          allowConsoleError(() => {
-            expect(() => {
-              /*eslint no-script-url: 0*/
-              urlReplacements.expandUrlSync(
-                'javascript://example.com/?r=RANDOM'
-              );
-            }).to.throw('invalid protocol');
-          });
-        });
-      });
+    it('should reject javascript protocol', () => {
+      const protocolErrorRegex = /invalid protocol/;
+      expectAsyncConsoleError(protocolErrorRegex);
+      const win = getFakeWindow();
+      const {documentElement} = win.document;
+      const urlReplacements = Services.urlReplacementsForDoc(documentElement);
+      /*eslint no-script-url: 0*/
+      return urlReplacements
+        .expandUrlAsync('javascript://example.com/?r=RANDOM')
+        .then(
+          () => {
+            throw new Error('never here');
+          },
+          (err) => {
+            expect(err.message).to.match(protocolErrorRegex);
+          }
+        );
+    });
 
-      it('should expand sync and respect allowlisted', () => {
+    describe('sync expansion', () => {
+      it('should expand w/ collect vars (skip async macro)', () => {
         const win = getFakeWindow();
         const {documentElement} = win.document;
         const urlReplacements = Services.urlReplacementsForDoc(documentElement);
+        urlReplacements.ampdoc.win.performance.timing.loadEventStart = 109;
         const expanded = urlReplacements.expandUrlSync(
           'r=RANDOM&c=CONST&f=FUNCT(hello,world)&a=b&d=PROM&e=PAGE_LOAD_TIME',
           {
             'CONST': 'ABC',
-            'FUNCT': () => {
-              throw Error('Should not be called');
+            'FUNCT': function (a, b) {
+              return a + b;
             },
-          },
+            // Will ignore promise based result and instead insert empty string.
+            'PROM': function () {
+              return Promise.resolve('boo');
+            },
+          }
+        );
+        expect(expanded).to.match(
+          /^r=\d(\.\d+)?&c=ABC&f=helloworld&a=b&d=&e=9$/
+        );
+      });
+
+      it('should reject protocol changes', () => {
+        const win = getFakeWindow();
+        const {documentElement} = win.document;
+        const urlReplacements = Services.urlReplacementsForDoc(documentElement);
+        let expanded = urlReplacements.expandUrlSync(
+          'PROTOCOL://example.com/?r=RANDOM',
           {
-            'CONST': true,
+            'PROTOCOL': 'abc',
           }
         );
-        expect(expanded).to.equal(
-          'r=RANDOM&c=ABC&f=FUNCT(hello,world)&a=b&d=PROM&e=PAGE_LOAD_TIME'
+        expect(expanded).to.equal('PROTOCOL://example.com/?r=RANDOM');
+        expanded = urlReplacements.expandUrlSync(
+          'FUNCT://example.com/?r=RANDOM',
+          {
+            'FUNCT': function () {
+              return 'abc';
+            },
+          }
         );
+        expect(expanded).to.equal('FUNCT://example.com/?r=RANDOM');
       });
 
-      describe('access values via amp-access', () => {
-        let accessService;
-        let accessServiceMock;
-
-        beforeEach(() => {
-          accessService = {
-            getAccessReaderId: () => {},
-            getAuthdataField: () => {},
-          };
-          accessServiceMock = env.sandbox.mock(accessService);
-          env.sandbox
-            .stub(Services, 'accessServiceForDocOrNull')
-            .callsFake(() => {
-              return Promise.resolve(accessService);
-            });
+      it('should reject javascript protocol', () => {
+        const win = getFakeWindow();
+        const {documentElement} = win.document;
+        const urlReplacements = Services.urlReplacementsForDoc(documentElement);
+        allowConsoleError(() => {
+          expect(() => {
+            /*eslint no-script-url: 0*/
+            urlReplacements.expandUrlSync('javascript://example.com/?r=RANDOM');
+          }).to.throw('invalid protocol');
         });
+      });
+    });
 
-        afterEach(() => {
-          accessServiceMock.verify();
+    it('should expand sync and respect allowlisted', () => {
+      const win = getFakeWindow();
+      const {documentElement} = win.document;
+      const urlReplacements = Services.urlReplacementsForDoc(documentElement);
+      const expanded = urlReplacements.expandUrlSync(
+        'r=RANDOM&c=CONST&f=FUNCT(hello,world)&a=b&d=PROM&e=PAGE_LOAD_TIME',
+        {
+          'CONST': 'ABC',
+          'FUNCT': () => {
+            throw Error('Should not be called');
+          },
+        },
+        {
+          'CONST': true,
+        }
+      );
+      expect(expanded).to.equal(
+        'r=RANDOM&c=ABC&f=FUNCT(hello,world)&a=b&d=PROM&e=PAGE_LOAD_TIME'
+      );
+    });
+
+    describe('access values via amp-access', () => {
+      let accessService;
+      let accessServiceMock;
+
+      beforeEach(() => {
+        accessService = {
+          getAccessReaderId: () => {},
+          getAuthdataField: () => {},
+        };
+        accessServiceMock = env.sandbox.mock(accessService);
+        env.sandbox
+          .stub(Services, 'accessServiceForDocOrNull')
+          .callsFake(() => {
+            return Promise.resolve(accessService);
+          });
+      });
+
+      afterEach(() => {
+        accessServiceMock.verify();
+      });
+
+      function expandUrlAsync(url, opt_disabled) {
+        if (opt_disabled) {
+          accessService = null;
+        }
+        return createIframePromise().then((iframe) => {
+          iframe.doc.title = 'Pixel Test';
+          const link = iframe.doc.createElement('link');
+          link.setAttribute('href', 'https://pinterest.com/pin1');
+          link.setAttribute('rel', 'canonical');
+          iframe.doc.head.appendChild(link);
+          const {documentElement} = iframe.doc;
+          Services.ampdoc(documentElement).setExtensionsKnown();
+          const replacements = Services.urlReplacementsForDoc(documentElement);
+          return replacements.expandUrlAsync(url);
         });
+      }
 
-        function expandUrlAsync(url, opt_disabled) {
-          if (opt_disabled) {
-            accessService = null;
-          }
-          return createIframePromise().then((iframe) => {
-            iframe.doc.title = 'Pixel Test';
-            const link = iframe.doc.createElement('link');
-            link.setAttribute('href', 'https://pinterest.com/pin1');
-            link.setAttribute('rel', 'canonical');
-            iframe.doc.head.appendChild(link);
-            const {documentElement} = iframe.doc;
-            Services.ampdoc(documentElement).setExtensionsKnown();
-            const replacements =
-              Services.urlReplacementsForDoc(documentElement);
-            return replacements.expandUrlAsync(url);
-          });
-        }
-
-        it('should replace ACCESS_READER_ID', () => {
-          accessServiceMock
-            .expects('getAccessReaderId')
-            .returns(Promise.resolve('reader1'))
-            .once();
-          return expandUrlAsync('?a=ACCESS_READER_ID').then((res) => {
-            expect(res).to.match(/a=reader1/);
-            expect(userErrorStub).to.have.not.been.called;
-          });
+      it('should replace ACCESS_READER_ID', () => {
+        accessServiceMock
+          .expects('getAccessReaderId')
+          .returns(Promise.resolve('reader1'))
+          .once();
+        return expandUrlAsync('?a=ACCESS_READER_ID').then((res) => {
+          expect(res).to.match(/a=reader1/);
+          expect(userErrorStub).to.have.not.been.called;
         });
+      });
 
-        it('should replace AUTHDATA', () => {
-          accessServiceMock
-            .expects('getAuthdataField')
-            .withExactArgs('field1')
-            .returns(Promise.resolve('value1'))
-            .once();
-          return expandUrlAsync('?a=AUTHDATA(field1)').then((res) => {
-            expect(res).to.match(/a=value1/);
-            expect(userErrorStub).to.have.not.been.called;
-          });
+      it('should replace AUTHDATA', () => {
+        accessServiceMock
+          .expects('getAuthdataField')
+          .withExactArgs('field1')
+          .returns(Promise.resolve('value1'))
+          .once();
+        return expandUrlAsync('?a=AUTHDATA(field1)').then((res) => {
+          expect(res).to.match(/a=value1/);
+          expect(userErrorStub).to.have.not.been.called;
         });
+      });
 
-        it('should report error if not available', () => {
-          accessServiceMock.expects('getAccessReaderId').never();
-          return expandUrlAsync(
-            '?a=ACCESS_READER_ID;',
-            /* disabled */ true
-          ).then((res) => {
+      it('should report error if not available', () => {
+        accessServiceMock.expects('getAccessReaderId').never();
+        return expandUrlAsync('?a=ACCESS_READER_ID;', /* disabled */ true).then(
+          (res) => {
             expect(res).to.match(/a=;/);
             expect(userErrorStub).to.be.calledOnce;
-          });
-        });
+          }
+        );
       });
+    });
 
-      describe('access values via amp-subscriptions', () => {
-        let subscriptionsService;
-        let subscriptionsServiceMock;
-
-        beforeEach(() => {
-          subscriptionsService = {
-            getAccessReaderId: () => {},
-            getAuthdataField: () => {},
-          };
-          subscriptionsServiceMock = env.sandbox.mock(subscriptionsService);
-          env.sandbox
-            .stub(Services, 'subscriptionsServiceForDocOrNull')
-            .callsFake(() => {
-              return Promise.resolve(subscriptionsService);
-            });
-        });
-
-        afterEach(() => {
-          subscriptionsServiceMock.verify();
-        });
+    describe('access values via amp-subscriptions', () => {
+      let subscriptionsService;
+      let subscriptionsServiceMock;
 
-        function expandUrlAsync(url, opt_disabled) {
-          if (opt_disabled) {
-            subscriptionsService = null;
-          }
-          return createIframePromise().then((iframe) => {
-            iframe.doc.title = 'Pixel Test';
-            const link = iframe.doc.createElement('link');
-            link.setAttribute('href', 'https://pinterest.com/pin1');
-            link.setAttribute('rel', 'canonical');
-            iframe.doc.head.appendChild(link);
-            const {documentElement} = iframe.doc;
-            Services.ampdoc(documentElement).setExtensionsKnown();
-            const replacements =
-              Services.urlReplacementsForDoc(documentElement);
-            return replacements.expandUrlAsync(url);
+      beforeEach(() => {
+        subscriptionsService = {
+          getAccessReaderId: () => {},
+          getAuthdataField: () => {},
+        };
+        subscriptionsServiceMock = env.sandbox.mock(subscriptionsService);
+        env.sandbox
+          .stub(Services, 'subscriptionsServiceForDocOrNull')
+          .callsFake(() => {
+            return Promise.resolve(subscriptionsService);
           });
+      });
+
+      afterEach(() => {
+        subscriptionsServiceMock.verify();
+      });
+
+      function expandUrlAsync(url, opt_disabled) {
+        if (opt_disabled) {
+          subscriptionsService = null;
         }
+        return createIframePromise().then((iframe) => {
+          iframe.doc.title = 'Pixel Test';
+          const link = iframe.doc.createElement('link');
+          link.setAttribute('href', 'https://pinterest.com/pin1');
+          link.setAttribute('rel', 'canonical');
+          iframe.doc.head.appendChild(link);
+          const {documentElement} = iframe.doc;
+          Services.ampdoc(documentElement).setExtensionsKnown();
+          const replacements = Services.urlReplacementsForDoc(documentElement);
+          return replacements.expandUrlAsync(url);
+        });
+      }
 
-        it('should replace ACCESS_READER_ID', () => {
-          subscriptionsServiceMock
-            .expects('getAccessReaderId')
-            .returns(Promise.resolve('reader1'))
-            .once();
-          return expandUrlAsync('?a=ACCESS_READER_ID').then((res) => {
-            expect(res).to.match(/a=reader1/);
-            expect(userErrorStub).to.have.not.been.called;
-          });
+      it('should replace ACCESS_READER_ID', () => {
+        subscriptionsServiceMock
+          .expects('getAccessReaderId')
+          .returns(Promise.resolve('reader1'))
+          .once();
+        return expandUrlAsync('?a=ACCESS_READER_ID').then((res) => {
+          expect(res).to.match(/a=reader1/);
+          expect(userErrorStub).to.have.not.been.called;
         });
+      });
 
-        it('should replace AUTHDATA', () => {
-          subscriptionsServiceMock
-            .expects('getAuthdataField')
-            .withExactArgs('field1')
-            .returns(Promise.resolve('value1'))
-            .once();
-          return expandUrlAsync('?a=AUTHDATA(field1)').then((res) => {
-            expect(res).to.match(/a=value1/);
-            expect(userErrorStub).to.have.not.been.called;
-          });
+      it('should replace AUTHDATA', () => {
+        subscriptionsServiceMock
+          .expects('getAuthdataField')
+          .withExactArgs('field1')
+          .returns(Promise.resolve('value1'))
+          .once();
+        return expandUrlAsync('?a=AUTHDATA(field1)').then((res) => {
+          expect(res).to.match(/a=value1/);
+          expect(userErrorStub).to.have.not.been.called;
         });
+      });
 
-        it('should report error if not available', () => {
-          subscriptionsServiceMock.expects('getAccessReaderId').never();
-          return expandUrlAsync(
-            '?a=ACCESS_READER_ID;',
-            /* disabled */ true
-          ).then((res) => {
+      it('should report error if not available', () => {
+        subscriptionsServiceMock.expects('getAccessReaderId').never();
+        return expandUrlAsync('?a=ACCESS_READER_ID;', /* disabled */ true).then(
+          (res) => {
             expect(res).to.match(/a=;/);
             expect(userErrorStub).to.be.calledOnce;
-          });
-        });
+          }
+        );
+      });
 
-        it('should prefer amp-subscriptions if amp-access also available', () => {
-          const accessService = {
-            getAccessReaderId: () => {},
-            getAuthdataField: () => {},
-          };
-          const accessServiceMock = env.sandbox.mock(accessService);
-          env.sandbox
-            .stub(Services, 'accessServiceForDocOrNull')
-            .callsFake(() => {
-              return Promise.resolve(accessService);
-            });
-          accessServiceMock.expects('getAuthdataField').never();
-
-          subscriptionsServiceMock
-            .expects('getAuthdataField')
-            .withExactArgs('field1')
-            .returns(Promise.resolve('value1'))
-            .once();
-          return expandUrlAsync('?a=AUTHDATA(field1)').then((res) => {
-            expect(res).to.match(/a=value1/);
-            expect(userErrorStub).to.have.not.been.called;
-            accessServiceMock.verify();
+      it('should prefer amp-subscriptions if amp-access also available', () => {
+        const accessService = {
+          getAccessReaderId: () => {},
+          getAuthdataField: () => {},
+        };
+        const accessServiceMock = env.sandbox.mock(accessService);
+        env.sandbox
+          .stub(Services, 'accessServiceForDocOrNull')
+          .callsFake(() => {
+            return Promise.resolve(accessService);
           });
+        accessServiceMock.expects('getAuthdataField').never();
+
+        subscriptionsServiceMock
+          .expects('getAuthdataField')
+          .withExactArgs('field1')
+          .returns(Promise.resolve('value1'))
+          .once();
+        return expandUrlAsync('?a=AUTHDATA(field1)').then((res) => {
+          expect(res).to.match(/a=value1/);
+          expect(userErrorStub).to.have.not.been.called;
+          accessServiceMock.verify();
         });
       });
+    });
 
-      describe('link expansion', () => {
-        let urlReplacements;
-        let a;
-        let win;
+    describe('link expansion', () => {
+      let urlReplacements;
+      let a;
+      let win;
 
-        beforeEach(() => {
-          a = document.createElement('a');
-          win = getFakeWindow();
-          win.location = parseUrlDeprecated(
-            'https://example.com/base?foo=bar&bar=abc&gclid=123'
-          );
-          const {documentElement} = win.document;
-          urlReplacements = Services.urlReplacementsForDoc(documentElement);
-        });
+      beforeEach(() => {
+        a = document.createElement('a');
+        win = getFakeWindow();
+        win.location = parseUrlDeprecated(
+          'https://example.com/base?foo=bar&bar=abc&gclid=123'
+        );
+        const {documentElement} = win.document;
+        urlReplacements = Services.urlReplacementsForDoc(documentElement);
+      });
 
-        it('should replace href', () => {
-          a.href = 'https://example.com/link?out=QUERY_PARAM(foo)';
-          a.setAttribute('data-amp-replace', 'QUERY_PARAM');
-          urlReplacements.maybeExpandLink(a, null);
-          expect(a.href).to.equal('https://example.com/link?out=bar');
-        });
+      it('should replace href', () => {
+        a.href = 'https://example.com/link?out=QUERY_PARAM(foo)';
+        a.setAttribute('data-amp-replace', 'QUERY_PARAM');
+        urlReplacements.maybeExpandLink(a, null);
+        expect(a.href).to.equal('https://example.com/link?out=bar');
+      });
 
-        it('should append default outgoing decoration', () => {
-          a.href = 'https://example.com/link?out=QUERY_PARAM(foo)';
-          a.setAttribute('data-amp-replace', 'QUERY_PARAM');
-          urlReplacements.maybeExpandLink(a, 'gclid=QUERY_PARAM(gclid)');
-          expect(a.href).to.equal('https://example.com/link?out=bar&gclid=123');
-        });
+      it('should append default outgoing decoration', () => {
+        a.href = 'https://example.com/link?out=QUERY_PARAM(foo)';
+        a.setAttribute('data-amp-replace', 'QUERY_PARAM');
+        urlReplacements.maybeExpandLink(a, 'gclid=QUERY_PARAM(gclid)');
+        expect(a.href).to.equal('https://example.com/link?out=bar&gclid=123');
+      });
 
-        it('should replace href 2x', () => {
-          a.href = 'https://example.com/link?out=QUERY_PARAM(foo)';
-          a.setAttribute('data-amp-replace', 'QUERY_PARAM');
-          urlReplacements.maybeExpandLink(a, null);
-          expect(a.href).to.equal('https://example.com/link?out=bar');
-          urlReplacements.maybeExpandLink(a, null);
-          expect(a.href).to.equal('https://example.com/link?out=bar');
-        });
+      it('should replace href 2x', () => {
+        a.href = 'https://example.com/link?out=QUERY_PARAM(foo)';
+        a.setAttribute('data-amp-replace', 'QUERY_PARAM');
+        urlReplacements.maybeExpandLink(a, null);
+        expect(a.href).to.equal('https://example.com/link?out=bar');
+        urlReplacements.maybeExpandLink(a, null);
+        expect(a.href).to.equal('https://example.com/link?out=bar');
+      });
 
-        it('should replace href 2', () => {
-          a.href =
-            'https://example.com/link?out=QUERY_PARAM(foo)&' +
-            'out2=QUERY_PARAM(bar)';
-          a.setAttribute('data-amp-replace', 'QUERY_PARAM');
-          urlReplacements.maybeExpandLink(a, null);
-          expect(a.href).to.equal('https://example.com/link?out=bar&out2=abc');
-        });
+      it('should replace href 2', () => {
+        a.href =
+          'https://example.com/link?out=QUERY_PARAM(foo)&' +
+          'out2=QUERY_PARAM(bar)';
+        a.setAttribute('data-amp-replace', 'QUERY_PARAM');
+        urlReplacements.maybeExpandLink(a, null);
+        expect(a.href).to.equal('https://example.com/link?out=bar&out2=abc');
+      });
 
-        it('has nothing to replace', () => {
-          a.href = 'https://example.com/link';
-          a.setAttribute('data-amp-replace', 'QUERY_PARAM');
-          urlReplacements.maybeExpandLink(a, null);
-          expect(a.href).to.equal('https://example.com/link');
-        });
+      it('has nothing to replace', () => {
+        a.href = 'https://example.com/link';
+        a.setAttribute('data-amp-replace', 'QUERY_PARAM');
+        urlReplacements.maybeExpandLink(a, null);
+        expect(a.href).to.equal('https://example.com/link');
+      });
 
-        it('should not replace without user allowance', () => {
-          a.href = 'https://example.com/link?out=QUERY_PARAM(foo)';
-          urlReplacements.maybeExpandLink(a, null);
-          expect(a.href).to.equal(
-            'https://example.com/link?out=QUERY_PARAM(foo)'
-          );
-        });
+      it('should not replace without user allowance', () => {
+        a.href = 'https://example.com/link?out=QUERY_PARAM(foo)';
+        urlReplacements.maybeExpandLink(a, null);
+        expect(a.href).to.equal(
+          'https://example.com/link?out=QUERY_PARAM(foo)'
+        );
+      });
 
-        it('should not replace without user allowance 2', () => {
-          a.href = 'https://example.com/link?out=QUERY_PARAM(foo)';
-          a.setAttribute('data-amp-replace', 'ABC');
-          urlReplacements.maybeExpandLink(a, null);
-          expect(a.href).to.equal(
-            'https://example.com/link?out=QUERY_PARAM(foo)'
-          );
-        });
+      it('should not replace without user allowance 2', () => {
+        a.href = 'https://example.com/link?out=QUERY_PARAM(foo)';
+        a.setAttribute('data-amp-replace', 'ABC');
+        urlReplacements.maybeExpandLink(a, null);
+        expect(a.href).to.equal(
+          'https://example.com/link?out=QUERY_PARAM(foo)'
+        );
+      });
 
-        it('should replace default append params regardless of allowlist', () => {
-          a.href = 'https://example.com/link?out=QUERY_PARAM(foo)';
-          urlReplacements.maybeExpandLink(a, 'gclid=QUERY_PARAM(gclid)');
-          expect(a.href).to.equal(
-            'https://example.com/link?out=QUERY_PARAM(foo)&gclid=123'
-          );
-        });
+      it('should replace default append params regardless of allowlist', () => {
+        a.href = 'https://example.com/link?out=QUERY_PARAM(foo)';
+        urlReplacements.maybeExpandLink(a, 'gclid=QUERY_PARAM(gclid)');
+        expect(a.href).to.equal(
+          'https://example.com/link?out=QUERY_PARAM(foo)&gclid=123'
+        );
+      });
 
-        it('should not replace unallowlisted fields', () => {
-          a.href = 'https://example.com/link?out=RANDOM';
-          a.setAttribute('data-amp-replace', 'RANDOM');
-          urlReplacements.maybeExpandLink(a, null);
-          expect(a.href).to.equal('https://example.com/link?out=RANDOM');
-        });
+      it('should not replace unallowlisted fields', () => {
+        a.href = 'https://example.com/link?out=RANDOM';
+        a.setAttribute('data-amp-replace', 'RANDOM');
+        urlReplacements.maybeExpandLink(a, null);
+        expect(a.href).to.equal('https://example.com/link?out=RANDOM');
+      });
 
-        it('should replace for http (non-secure) allowlisted origin', () => {
-          canonical = 'http://example.com/link';
-          a.href = 'http://example.com/link?out=QUERY_PARAM(foo)';
-          a.setAttribute('data-amp-replace', 'QUERY_PARAM');
-          urlReplacements.maybeExpandLink(a, null);
-          expect(a.href).to.equal('http://example.com/link?out=bar');
-        });
+      it('should replace for http (non-secure) allowlisted origin', () => {
+        canonical = 'http://example.com/link';
+        a.href = 'http://example.com/link?out=QUERY_PARAM(foo)';
+        a.setAttribute('data-amp-replace', 'QUERY_PARAM');
+        urlReplacements.maybeExpandLink(a, null);
+        expect(a.href).to.equal('http://example.com/link?out=bar');
+      });
 
-        it('should replace with canonical origin', () => {
-          a.href = 'https://canonical.com/link?out=QUERY_PARAM(foo)';
-          a.setAttribute('data-amp-replace', 'QUERY_PARAM');
-          urlReplacements.maybeExpandLink(a, null);
-          expect(a.href).to.equal('https://canonical.com/link?out=bar');
-        });
+      it('should replace with canonical origin', () => {
+        a.href = 'https://canonical.com/link?out=QUERY_PARAM(foo)';
+        a.setAttribute('data-amp-replace', 'QUERY_PARAM');
+        urlReplacements.maybeExpandLink(a, null);
+        expect(a.href).to.equal('https://canonical.com/link?out=bar');
+      });
 
-        it('should replace with allowlisted origin', () => {
-          a.href = 'https://allowlisted.com/link?out=QUERY_PARAM(foo)';
-          a.setAttribute('data-amp-replace', 'QUERY_PARAM');
-          urlReplacements.maybeExpandLink(a, null);
-          expect(a.href).to.equal('https://allowlisted.com/link?out=bar');
-        });
+      it('should replace with allowlisted origin', () => {
+        a.href = 'https://allowlisted.com/link?out=QUERY_PARAM(foo)';
+        a.setAttribute('data-amp-replace', 'QUERY_PARAM');
+        urlReplacements.maybeExpandLink(a, null);
+        expect(a.href).to.equal('https://allowlisted.com/link?out=bar');
+      });
 
-        it('should not replace to different origin', () => {
-          a.href = 'https://example2.com/link?out=QUERY_PARAM(foo)';
-          a.setAttribute('data-amp-replace', 'QUERY_PARAM');
+      it('should not replace to different origin', () => {
+        a.href = 'https://example2.com/link?out=QUERY_PARAM(foo)';
+        a.setAttribute('data-amp-replace', 'QUERY_PARAM');
+        urlReplacements.maybeExpandLink(a, null);
+        expect(a.href).to.equal(
+          'https://example2.com/link?out=QUERY_PARAM(foo)'
+        );
+      });
+
+      it('should not append default param to different origin', () => {
+        a.href = 'https://example2.com/link?out=QUERY_PARAM(foo)';
+        a.setAttribute('data-amp-replace', 'QUERY_PARAM');
+        urlReplacements.maybeExpandLink(a, 'gclid=QUERY_PARAM(gclid)');
+        expect(a.href).to.equal(
+          'https://example2.com/link?out=QUERY_PARAM(foo)'
+        );
+      });
+
+      it('should replace allowlisted fields', () => {
+        a.href =
+          'https://canonical.com/link?' +
+          'out=QUERY_PARAM(foo)' +
+          '&c=PAGE_VIEW_IDCLIENT_ID(abc)NAV_TIMING(navigationStart)';
+        a.setAttribute(
+          'data-amp-replace',
+          'QUERY_PARAM CLIENT_ID PAGE_VIEW_ID NAV_TIMING'
+        );
+        // No replacement without previous async replacement
+        urlReplacements.maybeExpandLink(a, null);
+        expect(a.href).to.equal('https://canonical.com/link?out=bar&c=1234100');
+        // Get a cid, then proceed.
+        return urlReplacements.expandUrlAsync('CLIENT_ID(abc)').then(() => {
           urlReplacements.maybeExpandLink(a, null);
           expect(a.href).to.equal(
-            'https://example2.com/link?out=QUERY_PARAM(foo)'
+            'https://canonical.com/link?out=bar&c=1234test-cid(abc)100'
           );
         });
+      });
 
-        it('should not append default param to different origin', () => {
-          a.href = 'https://example2.com/link?out=QUERY_PARAM(foo)';
-          a.setAttribute('data-amp-replace', 'QUERY_PARAM');
-          urlReplacements.maybeExpandLink(a, 'gclid=QUERY_PARAM(gclid)');
-          expect(a.href).to.equal(
-            'https://example2.com/link?out=QUERY_PARAM(foo)'
-          );
-        });
+      it('should add URL parameters for different origin', () => {
+        a.href = 'https://example2.com/link';
+        a.setAttribute('data-amp-addparams', 'guid=123');
+        urlReplacements.maybeExpandLink(a, null);
+        expect(a.href).to.equal('https://example2.com/link?guid=123');
+      });
 
-        it('should replace allowlisted fields', () => {
-          a.href =
-            'https://canonical.com/link?' +
-            'out=QUERY_PARAM(foo)' +
-            '&c=PAGE_VIEW_IDCLIENT_ID(abc)NAV_TIMING(navigationStart)';
-          a.setAttribute(
-            'data-amp-replace',
-            'QUERY_PARAM CLIENT_ID PAGE_VIEW_ID NAV_TIMING'
-          );
-          // No replacement without previous async replacement
-          urlReplacements.maybeExpandLink(a, null);
-          expect(a.href).to.equal(
-            'https://canonical.com/link?out=bar&c=1234100'
-          );
+      it("should add URL parameters for http URL's(non-secure)", () => {
+        a.href = 'http://allowlisted.com/link?out=QUERY_PARAM(foo)';
+        a.setAttribute('data-amp-addparams', 'guid=123');
+        urlReplacements.maybeExpandLink(a, null);
+        expect(a.href).to.equal(
+          'http://allowlisted.com/link?out=QUERY_PARAM(foo)&guid=123'
+        );
+      });
+
+      it('should concatenate and expand additional params w/ allowlist', () => {
+        a.href = 'http://example.com/link?first=QUERY_PARAM(src,YYYY)';
+        a.setAttribute('data-amp-replace', 'QUERY_PARAM');
+        a.setAttribute(
+          'data-amp-addparams',
+          'second=QUERY_PARAM(baz,XXXX)&third=CLIENT_ID(AMP_ECID_GOOGLE,,_ga)&' +
+            'fourth=link123'
+        );
+        urlReplacements.maybeExpandLink(a, null);
+        expect(a.href).to.equal(
+          'http://example.com/link?first=YYYY&second=XXXX&' +
+            'third=CLIENT_ID(AMP_ECID_GOOGLE%2C%2C_ga)&fourth=link123'
+        );
+      });
+
+      it(
+        'should add URL parameters and repalce allowlisted' +
+          " values for http allowlisted URL's(non-secure)",
+        () => {
+          a.href = 'http://example.com/link?out=QUERY_PARAM(foo)';
+          a.setAttribute('data-amp-replace', 'CLIENT_ID');
+          a.setAttribute('data-amp-addparams', 'guid=123&c=CLIENT_ID(abc)');
           // Get a cid, then proceed.
           return urlReplacements.expandUrlAsync('CLIENT_ID(abc)').then(() => {
             urlReplacements.maybeExpandLink(a, null);
             expect(a.href).to.equal(
-              'https://canonical.com/link?out=bar&c=1234test-cid(abc)100'
+              'http://example.com/link?out=QUERY_PARAM(foo)&guid=123&c=test-cid(abc)'
             );
           });
-        });
-
-        it('should add URL parameters for different origin', () => {
-          a.href = 'https://example2.com/link';
-          a.setAttribute('data-amp-addparams', 'guid=123');
-          urlReplacements.maybeExpandLink(a, null);
-          expect(a.href).to.equal('https://example2.com/link?guid=123');
-        });
-
-        it("should add URL parameters for http URL's(non-secure)", () => {
-          a.href = 'http://allowlisted.com/link?out=QUERY_PARAM(foo)';
-          a.setAttribute('data-amp-addparams', 'guid=123');
-          urlReplacements.maybeExpandLink(a, null);
-          expect(a.href).to.equal(
-            'http://allowlisted.com/link?out=QUERY_PARAM(foo)&guid=123'
-          );
-        });
-
-        it('should concatenate and expand additional params w/ allowlist', () => {
-          a.href = 'http://example.com/link?first=QUERY_PARAM(src,YYYY)';
-          a.setAttribute('data-amp-replace', 'QUERY_PARAM');
-          a.setAttribute(
-            'data-amp-addparams',
-            'second=QUERY_PARAM(baz,XXXX)&third=CLIENT_ID(AMP_ECID_GOOGLE,,_ga)&' +
-              'fourth=link123'
-          );
-          urlReplacements.maybeExpandLink(a, null);
-          expect(a.href).to.equal(
-            'http://example.com/link?first=YYYY&second=XXXX&' +
-              'third=CLIENT_ID(AMP_ECID_GOOGLE%2C%2C_ga)&fourth=link123'
-          );
-        });
-
-        it(
-          'should add URL parameters and repalce allowlisted' +
-            " values for http allowlisted URL's(non-secure)",
-          () => {
-            a.href = 'http://example.com/link?out=QUERY_PARAM(foo)';
-            a.setAttribute('data-amp-replace', 'CLIENT_ID');
-            a.setAttribute('data-amp-addparams', 'guid=123&c=CLIENT_ID(abc)');
-            // Get a cid, then proceed.
-            return urlReplacements.expandUrlAsync('CLIENT_ID(abc)').then(() => {
-              urlReplacements.maybeExpandLink(a, null);
-              expect(a.href).to.equal(
-                'http://example.com/link?out=QUERY_PARAM(foo)&guid=123&c=test-cid(abc)'
-              );
-            });
-          }
-        );
-
-        it(
-          'should add URL parameters and not repalce allowlisted' +
-            " values for non allowlisted http URL's(non-secure)",
-          () => {
-            a.href = 'http://example2.com/link?out=QUERY_PARAM(foo)';
-            a.setAttribute('data-amp-replace', 'CLIENT_ID');
-            a.setAttribute('data-amp-addparams', 'guid=123&c=CLIENT_ID(abc)');
-            // Get a cid, then proceed.
-            return urlReplacements.expandUrlAsync('CLIENT_ID(abc)').then(() => {
-              urlReplacements.maybeExpandLink(a, null);
-              expect(a.href).to.equal(
-                'http://example2.com/link?out=QUERY_PARAM(foo)&guid=123&c=CLIENT_ID(abc)'
-              );
-            });
-          }
-        );
+        }
+      );
 
-        it('should append query parameters and repalce allowlisted values', () => {
-          a.href = 'https://allowlisted.com/link?out=QUERY_PARAM(foo)';
-          a.setAttribute('data-amp-replace', 'QUERY_PARAM CLIENT_ID');
+      it(
+        'should add URL parameters and not repalce allowlisted' +
+          " values for non allowlisted http URL's(non-secure)",
+        () => {
+          a.href = 'http://example2.com/link?out=QUERY_PARAM(foo)';
+          a.setAttribute('data-amp-replace', 'CLIENT_ID');
           a.setAttribute('data-amp-addparams', 'guid=123&c=CLIENT_ID(abc)');
           // Get a cid, then proceed.
           return urlReplacements.expandUrlAsync('CLIENT_ID(abc)').then(() => {
             urlReplacements.maybeExpandLink(a, null);
             expect(a.href).to.equal(
-              'https://allowlisted.com/link?out=bar&guid=123&c=test-cid(abc)'
+              'http://example2.com/link?out=QUERY_PARAM(foo)&guid=123&c=CLIENT_ID(abc)'
             );
           });
-        });
-      });
+        }
+      );
 
-      describe('Expanding String', () => {
-        it('should not reject protocol changes with expandStringSync', () => {
-          const win = getFakeWindow();
-          const {documentElement} = win.document;
-          const urlReplacements =
-            Services.urlReplacementsForDoc(documentElement);
-          let expanded = urlReplacements.expandStringSync(
-            'PROTOCOL://example.com/?r=RANDOM',
-            {
-              'PROTOCOL': 'abc',
-            }
-          );
-          expect(expanded).to.match(/abc:\/\/example\.com\/\?r=(\d+(\.\d+)?)$/);
-          expanded = urlReplacements.expandStringSync(
-            'FUNCT://example.com/?r=RANDOM',
-            {
-              'FUNCT': function () {
-                return 'abc';
-              },
-            }
+      it('should append query parameters and repalce allowlisted values', () => {
+        a.href = 'https://allowlisted.com/link?out=QUERY_PARAM(foo)';
+        a.setAttribute('data-amp-replace', 'QUERY_PARAM CLIENT_ID');
+        a.setAttribute('data-amp-addparams', 'guid=123&c=CLIENT_ID(abc)');
+        // Get a cid, then proceed.
+        return urlReplacements.expandUrlAsync('CLIENT_ID(abc)').then(() => {
+          urlReplacements.maybeExpandLink(a, null);
+          expect(a.href).to.equal(
+            'https://allowlisted.com/link?out=bar&guid=123&c=test-cid(abc)'
           );
-          expect(expanded).to.match(/abc:\/\/example\.com\/\?r=(\d+(\.\d+)?)$/);
-        });
-
-        it('should not encode values returned by expandStringSync', () => {
-          const win = getFakeWindow();
-          const {documentElement} = win.document;
-          const urlReplacements =
-            Services.urlReplacementsForDoc(documentElement);
-          const expanded = urlReplacements.expandStringSync('title=TITLE', {
-            'TITLE': 'test with spaces',
-          });
-          expect(expanded).to.equal('title=test with spaces');
         });
+      });
+    });
 
-        it('should not check protocol changes with expandStringAsync', () => {
-          const win = getFakeWindow();
-          const {documentElement} = win.document;
-          const urlReplacements =
-            Services.urlReplacementsForDoc(documentElement);
-          return urlReplacements
-            .expandStringAsync('RANDOM:X:Y', {
-              'RANDOM': Promise.resolve('abc'),
-            })
-            .then((expanded) => {
-              expect(expanded).to.equal('abc:X:Y');
-            });
-        });
+    describe('Expanding String', () => {
+      it('should not reject protocol changes with expandStringSync', () => {
+        const win = getFakeWindow();
+        const {documentElement} = win.document;
+        const urlReplacements = Services.urlReplacementsForDoc(documentElement);
+        let expanded = urlReplacements.expandStringSync(
+          'PROTOCOL://example.com/?r=RANDOM',
+          {
+            'PROTOCOL': 'abc',
+          }
+        );
+        expect(expanded).to.match(/abc:\/\/example\.com\/\?r=(\d+(\.\d+)?)$/);
+        expanded = urlReplacements.expandStringSync(
+          'FUNCT://example.com/?r=RANDOM',
+          {
+            'FUNCT': function () {
+              return 'abc';
+            },
+          }
+        );
+        expect(expanded).to.match(/abc:\/\/example\.com\/\?r=(\d+(\.\d+)?)$/);
+      });
 
-        it('should not encode values returned by expandStringAsync', () => {
-          const win = getFakeWindow();
-          const {documentElement} = win.document;
-          const urlReplacements =
-            Services.urlReplacementsForDoc(documentElement);
-          return urlReplacements
-            .expandStringAsync('title=TITLE', {
-              'TITLE': Promise.resolve('test with spaces'),
-            })
-            .then((expanded) => {
-              expect(expanded).to.equal('title=test with spaces');
-            });
+      it('should not encode values returned by expandStringSync', () => {
+        const win = getFakeWindow();
+        const {documentElement} = win.document;
+        const urlReplacements = Services.urlReplacementsForDoc(documentElement);
+        const expanded = urlReplacements.expandStringSync('title=TITLE', {
+          'TITLE': 'test with spaces',
         });
+        expect(expanded).to.equal('title=test with spaces');
       });
 
-      describe('Expanding Input Value', () => {
-        it('should fail for non-inputs', () => {
-          const win = getFakeWindow();
-          const {documentElement} = win.document;
-          const urlReplacements =
-            Services.urlReplacementsForDoc(documentElement);
-          const input = document.createElement('textarea');
-          input.value = 'RANDOM';
-          input.setAttribute('data-amp-replace', 'RANDOM');
-          allowConsoleError(() => {
-            expect(() => urlReplacements.expandInputValueSync(input)).to.throw(
-              /Input value expansion only works on hidden input fields/
-            );
+      it('should not check protocol changes with expandStringAsync', () => {
+        const win = getFakeWindow();
+        const {documentElement} = win.document;
+        const urlReplacements = Services.urlReplacementsForDoc(documentElement);
+        return urlReplacements
+          .expandStringAsync('RANDOM:X:Y', {
+            'RANDOM': Promise.resolve('abc'),
+          })
+          .then((expanded) => {
+            expect(expanded).to.equal('abc:X:Y');
           });
-          expect(input.value).to.equal('RANDOM');
-        });
+      });
 
-        it('should fail for non-hidden inputs', () => {
-          const win = getFakeWindow();
-          const {documentElement} = win.document;
-          const urlReplacements =
-            Services.urlReplacementsForDoc(documentElement);
-          const input = document.createElement('input');
-          input.value = 'RANDOM';
-          input.setAttribute('data-amp-replace', 'RANDOM');
-          allowConsoleError(() => {
-            expect(() => urlReplacements.expandInputValueSync(input)).to.throw(
-              /Input value expansion only works on hidden input fields/
-            );
+      it('should not encode values returned by expandStringAsync', () => {
+        const win = getFakeWindow();
+        const {documentElement} = win.document;
+        const urlReplacements = Services.urlReplacementsForDoc(documentElement);
+        return urlReplacements
+          .expandStringAsync('title=TITLE', {
+            'TITLE': Promise.resolve('test with spaces'),
+          })
+          .then((expanded) => {
+            expect(expanded).to.equal('title=test with spaces');
           });
-          expect(input.value).to.equal('RANDOM');
-        });
+      });
+    });
 
-        it('should not replace not allowlisted vars', () => {
-          const win = getFakeWindow();
-          const {documentElement} = win.document;
-          const urlReplacements =
-            Services.urlReplacementsForDoc(documentElement);
-          const input = document.createElement('input');
-          input.value = 'RANDOM';
-          input.type = 'hidden';
-          input.setAttribute('data-amp-replace', 'CANONICAL_URL');
-          let expandedValue = urlReplacements.expandInputValueSync(input);
-          expect(expandedValue).to.equal('RANDOM');
-          input.setAttribute('data-amp-replace', 'CANONICAL_URL RANDOM');
-          expandedValue = urlReplacements.expandInputValueSync(input);
-          expect(expandedValue).to.match(/(\d+(\.\d+)?)/);
-          expect(input.value).to.match(/(\d+(\.\d+)?)/);
-          expect(input['amp-original-value']).to.equal('RANDOM');
+    describe('Expanding Input Value', () => {
+      it('should fail for non-inputs', () => {
+        const win = getFakeWindow();
+        const {documentElement} = win.document;
+        const urlReplacements = Services.urlReplacementsForDoc(documentElement);
+        const input = document.createElement('textarea');
+        input.value = 'RANDOM';
+        input.setAttribute('data-amp-replace', 'RANDOM');
+        allowConsoleError(() => {
+          expect(() => urlReplacements.expandInputValueSync(input)).to.throw(
+            /Input value expansion only works on hidden input fields/
+          );
         });
+        expect(input.value).to.equal('RANDOM');
+      });
 
-        it('should replace input value with var subs - sync', () => {
-          const win = getFakeWindow();
-          const {documentElement} = win.document;
-          const urlReplacements =
-            Services.urlReplacementsForDoc(documentElement);
-          const input = document.createElement('input');
-          input.value = 'RANDOM';
-          input.type = 'hidden';
-          input.setAttribute('data-amp-replace', 'RANDOM');
-          let expandedValue = urlReplacements.expandInputValueSync(input);
-          expect(expandedValue).to.match(/(\d+(\.\d+)?)/);
-
-          input['amp-original-value'] = 'RANDOM://example.com/RANDOM';
-          expandedValue = urlReplacements.expandInputValueSync(input);
-          expect(expandedValue).to.match(
-            /(\d+(\.\d+)?):\/\/example\.com\/(\d+(\.\d+)?)$/
-          );
-          expect(input.value).to.match(
-            /(\d+(\.\d+)?):\/\/example\.com\/(\d+(\.\d+)?)$/
-          );
-          expect(input['amp-original-value']).to.equal(
-            'RANDOM://example.com/RANDOM'
+      it('should fail for non-hidden inputs', () => {
+        const win = getFakeWindow();
+        const {documentElement} = win.document;
+        const urlReplacements = Services.urlReplacementsForDoc(documentElement);
+        const input = document.createElement('input');
+        input.value = 'RANDOM';
+        input.setAttribute('data-amp-replace', 'RANDOM');
+        allowConsoleError(() => {
+          expect(() => urlReplacements.expandInputValueSync(input)).to.throw(
+            /Input value expansion only works on hidden input fields/
           );
         });
+        expect(input.value).to.equal('RANDOM');
+      });
 
-        it('should replace input value with var subs - sync', () => {
-          const win = getFakeWindow();
-          const {documentElement} = win.document;
-          const urlReplacements =
-            Services.urlReplacementsForDoc(documentElement);
-          const input = document.createElement('input');
-          input.value = 'RANDOM';
-          input.type = 'hidden';
-          input.setAttribute('data-amp-replace', 'RANDOM');
-          return urlReplacements
-            .expandInputValueAsync(input)
-            .then((expandedValue) => {
-              expect(input['amp-original-value']).to.equal('RANDOM');
-              expect(input.value).to.match(/(\d+(\.\d+)?)/);
-              expect(expandedValue).to.match(/(\d+(\.\d+)?)/);
-            });
-        });
+      it('should not replace not allowlisted vars', () => {
+        const win = getFakeWindow();
+        const {documentElement} = win.document;
+        const urlReplacements = Services.urlReplacementsForDoc(documentElement);
+        const input = document.createElement('input');
+        input.value = 'RANDOM';
+        input.type = 'hidden';
+        input.setAttribute('data-amp-replace', 'CANONICAL_URL');
+        let expandedValue = urlReplacements.expandInputValueSync(input);
+        expect(expandedValue).to.equal('RANDOM');
+        input.setAttribute('data-amp-replace', 'CANONICAL_URL RANDOM');
+        expandedValue = urlReplacements.expandInputValueSync(input);
+        expect(expandedValue).to.match(/(\d+(\.\d+)?)/);
+        expect(input.value).to.match(/(\d+(\.\d+)?)/);
+        expect(input['amp-original-value']).to.equal('RANDOM');
+      });
+
+      it('should replace input value with var subs - sync', () => {
+        const win = getFakeWindow();
+        const {documentElement} = win.document;
+        const urlReplacements = Services.urlReplacementsForDoc(documentElement);
+        const input = document.createElement('input');
+        input.value = 'RANDOM';
+        input.type = 'hidden';
+        input.setAttribute('data-amp-replace', 'RANDOM');
+        let expandedValue = urlReplacements.expandInputValueSync(input);
+        expect(expandedValue).to.match(/(\d+(\.\d+)?)/);
+
+        input['amp-original-value'] = 'RANDOM://example.com/RANDOM';
+        expandedValue = urlReplacements.expandInputValueSync(input);
+        expect(expandedValue).to.match(
+          /(\d+(\.\d+)?):\/\/example\.com\/(\d+(\.\d+)?)$/
+        );
+        expect(input.value).to.match(
+          /(\d+(\.\d+)?):\/\/example\.com\/(\d+(\.\d+)?)$/
+        );
+        expect(input['amp-original-value']).to.equal(
+          'RANDOM://example.com/RANDOM'
+        );
       });
 
-      describe('extractClientIdFromGaCookie', () => {
-        it('should extract correct Client ID', () => {
-          expect(
-            extractClientIdFromGaCookie('GA1.2.430749005.1489527047')
-          ).to.equal('430749005.1489527047');
-          expect(
-            extractClientIdFromGaCookie('GA1.12.430749005.1489527047')
-          ).to.equal('430749005.1489527047');
-          expect(
-            extractClientIdFromGaCookie('GA1.1-2.430749005.1489527047')
-          ).to.equal('430749005.1489527047');
-          expect(
-            extractClientIdFromGaCookie('1.1.430749005.1489527047')
-          ).to.equal('430749005.1489527047');
-          expect(
-            extractClientIdFromGaCookie(
-              'GA1.3.amp-JTHCVn-4iMhzv5oEIZIspaXUSnEF0PwNVoxs' +
-                'NDrFP4BtPQJMyxE4jb9FDlp37OJL'
-            )
-          ).to.equal(
-            'amp-JTHCVn-4iMhzv5oEIZIspaXUSnEF0PwNVoxs' +
+      it('should replace input value with var subs - sync', () => {
+        const win = getFakeWindow();
+        const {documentElement} = win.document;
+        const urlReplacements = Services.urlReplacementsForDoc(documentElement);
+        const input = document.createElement('input');
+        input.value = 'RANDOM';
+        input.type = 'hidden';
+        input.setAttribute('data-amp-replace', 'RANDOM');
+        return urlReplacements
+          .expandInputValueAsync(input)
+          .then((expandedValue) => {
+            expect(input['amp-original-value']).to.equal('RANDOM');
+            expect(input.value).to.match(/(\d+(\.\d+)?)/);
+            expect(expandedValue).to.match(/(\d+(\.\d+)?)/);
+          });
+      });
+    });
+
+    describe('extractClientIdFromGaCookie', () => {
+      it('should extract correct Client ID', () => {
+        expect(
+          extractClientIdFromGaCookie('GA1.2.430749005.1489527047')
+        ).to.equal('430749005.1489527047');
+        expect(
+          extractClientIdFromGaCookie('GA1.12.430749005.1489527047')
+        ).to.equal('430749005.1489527047');
+        expect(
+          extractClientIdFromGaCookie('GA1.1-2.430749005.1489527047')
+        ).to.equal('430749005.1489527047');
+        expect(
+          extractClientIdFromGaCookie('1.1.430749005.1489527047')
+        ).to.equal('430749005.1489527047');
+        expect(
+          extractClientIdFromGaCookie(
+            'GA1.3.amp-JTHCVn-4iMhzv5oEIZIspaXUSnEF0PwNVoxs' +
               'NDrFP4BtPQJMyxE4jb9FDlp37OJL'
-          );
-          expect(
-            extractClientIdFromGaCookie(
-              '1.3.amp-JTHCVn-4iMhzv5oEIZIspaXUSnEF0PwNVoxs' +
-                'NDrFP4BtPQJMyxE4jb9FDlp37OJL'
-            )
-          ).to.equal(
-            'amp-JTHCVn-4iMhzv5oEIZIspaXUSnEF0PwNVoxs' +
+          )
+        ).to.equal(
+          'amp-JTHCVn-4iMhzv5oEIZIspaXUSnEF0PwNVoxs' +
+            'NDrFP4BtPQJMyxE4jb9FDlp37OJL'
+        );
+        expect(
+          extractClientIdFromGaCookie(
+            '1.3.amp-JTHCVn-4iMhzv5oEIZIspaXUSnEF0PwNVoxs' +
               'NDrFP4BtPQJMyxE4jb9FDlp37OJL'
-          );
-          expect(
-            extractClientIdFromGaCookie(
-              'amp-JTHCVn-4iMhzv5oEIZIspaXUSnEF0PwNVoxs' +
-                'NDrFP4BtPQJMyxE4jb9FDlp37OJL'
-            )
-          ).to.equal(
+          )
+        ).to.equal(
+          'amp-JTHCVn-4iMhzv5oEIZIspaXUSnEF0PwNVoxs' +
+            'NDrFP4BtPQJMyxE4jb9FDlp37OJL'
+        );
+        expect(
+          extractClientIdFromGaCookie(
             'amp-JTHCVn-4iMhzv5oEIZIspaXUSnEF0PwNVoxs' +
               'NDrFP4BtPQJMyxE4jb9FDlp37OJL'
-          );
-        });
+          )
+        ).to.equal(
+          'amp-JTHCVn-4iMhzv5oEIZIspaXUSnEF0PwNVoxs' +
+            'NDrFP4BtPQJMyxE4jb9FDlp37OJL'
+        );
       });
     });
+  });
 });
diff --git a/test/unit/test-url-rewrite.js b/test/unit/test-url-rewrite.js
index e694c0c0f13e..405a4ee9f73d 100644
--- a/test/unit/test-url-rewrite.js
+++ b/test/unit/test-url-rewrite.js
@@ -117,18 +117,16 @@ describes.sandboxed('resolveUrlAttr', {}, () => {
     ).to.equal('http://acme.org/image1');
   });
 
-  it.configure()
-    .skipFirefox()
-    .run('should NOT rewrite image data src', () => {
-      expect(
-        resolveUrlAttr(
-          'amp-img',
-          'src',
-          'data:12345',
-          'https://cdn.ampproject.org/c/acme.org/doc1'
-        )
-      ).to.equal('data:12345');
-    });
+  it('should NOT rewrite image data src', () => {
+    expect(
+      resolveUrlAttr(
+        'amp-img',
+        'src',
+        'data:12345',
+        'https://cdn.ampproject.org/c/acme.org/doc1'
+      )
+    ).to.equal('data:12345');
+  });
 });
 
 describes.sandboxed('rewriteAttributesForElement', {}, () => {
diff --git a/test/unit/test-url.js b/test/unit/test-url.js
index dc1d82385c64..eeac0087801d 100644
--- a/test/unit/test-url.js
+++ b/test/unit/test-url.js
@@ -114,8 +114,7 @@ describes.sandboxed('parseUrlDeprecated', {}, () => {
     expect(a1).to.equal(a2);
   });
 
-  // TODO(#14349): unskip flaky test
-  it.skip('caches up to 100 results', () => {
+  it('caches up to 100 results', () => {
     const url = 'https://foo.com:123/abc?123#foo';
     const a1 = parseUrlDeprecated(url);
 
@@ -226,9 +225,9 @@ describes.sandboxed('parseUrlDeprecated', {}, () => {
       origin: 'http://foo.com:123',
     });
   });
-  it('should parse origin https://twitter.com/path#abc', () => {
-    expect(parseUrlDeprecated('https://twitter.com/path#abc').origin).to.equal(
-      'https://twitter.com'
+  it('should parse origin https://x.com/path#abc', () => {
+    expect(parseUrlDeprecated('https://x.com/path#abc').origin).to.equal(
+      'https://x.com'
     );
   });
 
@@ -286,13 +285,13 @@ describes.sandboxed('assertHttpsUrl/isSecureUrl', {}, () => {
     assertHttpsUrl('', referenceElement);
   });
   it('should allow https', () => {
-    assertHttpsUrl('https://twitter.com', referenceElement);
-    expect(isSecureUrlDeprecated('https://twitter.com')).to.be.true;
+    assertHttpsUrl('https://x.com', referenceElement);
+    expect(isSecureUrlDeprecated('https://x.com')).to.be.true;
   });
   it('should allow protocol relative', () => {
-    assertHttpsUrl('//twitter.com', referenceElement);
+    assertHttpsUrl('//x.com', referenceElement);
     // `isSecureUrl` always resolves relative URLs.
-    expect(isSecureUrlDeprecated('//twitter.com')).to.be.equal(
+    expect(isSecureUrlDeprecated('//x.com')).to.be.equal(
       window.location.protocol == 'https:'
     );
   });
@@ -309,10 +308,10 @@ describes.sandboxed('assertHttpsUrl/isSecureUrl', {}, () => {
   it('should fail on http', () => {
     allowConsoleError(() => {
       expect(() => {
-        assertHttpsUrl('http://twitter.com', referenceElement);
+        assertHttpsUrl('http://x.com', referenceElement);
       }).to.throw(/source must start with/);
     });
-    expect(isSecureUrlDeprecated('http://twitter.com')).to.be.false;
+    expect(isSecureUrlDeprecated('http://x.com')).to.be.false;
   });
   it('should fail on http with localhost in the name', () => {
     allowConsoleError(() => {
@@ -326,25 +325,25 @@ describes.sandboxed('assertHttpsUrl/isSecureUrl', {}, () => {
 
 describes.sandboxed('assertAbsoluteHttpOrHttpsUrl', {}, () => {
   it('should allow http', () => {
-    expect(assertAbsoluteHttpOrHttpsUrl('http://twitter.com/')).to.equal(
-      'http://twitter.com/'
+    expect(assertAbsoluteHttpOrHttpsUrl('http://x.com/')).to.equal(
+      'http://x.com/'
     );
-    expect(assertAbsoluteHttpOrHttpsUrl('HTTP://twitter.com/')).to.equal(
-      'http://twitter.com/'
+    expect(assertAbsoluteHttpOrHttpsUrl('HTTP://x.com/')).to.equal(
+      'http://x.com/'
     );
   });
   it('should allow https', () => {
-    expect(assertAbsoluteHttpOrHttpsUrl('https://twitter.com/')).to.equal(
-      'https://twitter.com/'
+    expect(assertAbsoluteHttpOrHttpsUrl('https://x.com/')).to.equal(
+      'https://x.com/'
     );
-    expect(assertAbsoluteHttpOrHttpsUrl('HTTPS://twitter.com/')).to.equal(
-      'https://twitter.com/'
+    expect(assertAbsoluteHttpOrHttpsUrl('HTTPS://x.com/')).to.equal(
+      'https://x.com/'
     );
   });
   it('should fail on relative protocol', () => {
     allowConsoleError(() => {
       expect(() => {
-        assertAbsoluteHttpOrHttpsUrl('//twitter.com/');
+        assertAbsoluteHttpOrHttpsUrl('//x.com/');
       }).to.throw(/URL must start with/);
     });
   });
@@ -368,69 +367,61 @@ describes.sandboxed('assertAbsoluteHttpOrHttpsUrl', {}, () => {
 
 describes.sandboxed('removeFragment', {}, () => {
   it('should remove fragment', () => {
-    expect(removeFragment('https://twitter.com/path#abc')).to.equal(
-      'https://twitter.com/path'
+    expect(removeFragment('https://x.com/path#abc')).to.equal(
+      'https://x.com/path'
     );
   });
   it('should remove empty fragment', () => {
-    expect(removeFragment('https://twitter.com/path#')).to.equal(
-      'https://twitter.com/path'
+    expect(removeFragment('https://x.com/path#')).to.equal(
+      'https://x.com/path'
     );
   });
   it('should ignore when no fragment', () => {
-    expect(removeFragment('https://twitter.com/path')).to.equal(
-      'https://twitter.com/path'
-    );
+    expect(removeFragment('https://x.com/path')).to.equal('https://x.com/path');
   });
 });
 
 describes.sandboxed('removeSearch', {}, () => {
   it('should remove search', () => {
-    expect(removeSearch('https://twitter.com/path?abc')).to.equal(
-      'https://twitter.com/path'
+    expect(removeSearch('https://x.com/path?abc')).to.equal(
+      'https://x.com/path'
     );
   });
   it('should remove search with value', () => {
-    expect(removeSearch('https://twitter.com/path?abc=123')).to.equal(
-      'https://twitter.com/path'
+    expect(removeSearch('https://x.com/path?abc=123')).to.equal(
+      'https://x.com/path'
     );
   });
   it('should remove multiple params', () => {
-    expect(removeSearch('https://twitter.com/path?abc=123&d&e=4')).to.equal(
-      'https://twitter.com/path'
+    expect(removeSearch('https://x.com/path?abc=123&d&e=4')).to.equal(
+      'https://x.com/path'
     );
   });
   it('should remove empty search', () => {
-    expect(removeSearch('https://twitter.com/path?')).to.equal(
-      'https://twitter.com/path'
-    );
+    expect(removeSearch('https://x.com/path?')).to.equal('https://x.com/path');
   });
   it('should ignore when no search', () => {
-    expect(removeSearch('https://twitter.com/path')).to.equal(
-      'https://twitter.com/path'
-    );
+    expect(removeSearch('https://x.com/path')).to.equal('https://x.com/path');
   });
   it('should preserve fragment', () => {
-    expect(removeSearch('https://twitter.com/path?abc#f')).to.equal(
-      'https://twitter.com/path#f'
+    expect(removeSearch('https://x.com/path?abc#f')).to.equal(
+      'https://x.com/path#f'
     );
   });
   it('should preserve fragment with multiple params', () => {
-    expect(removeSearch('https://twitter.com/path?a&d=1&e=5#f=x')).to.equal(
-      'https://twitter.com/path#f=x'
+    expect(removeSearch('https://x.com/path?a&d=1&e=5#f=x')).to.equal(
+      'https://x.com/path#f=x'
     );
   });
   it('should preserve fragment when no search', () => {
-    expect(removeSearch('https://twitter.com/path#f')).to.equal(
-      'https://twitter.com/path#f'
+    expect(removeSearch('https://x.com/path#f')).to.equal(
+      'https://x.com/path#f'
     );
   });
   it('should handle empty fragment', () => {
-    expect(removeSearch('https://twitter.com/path#')).to.equal(
-      'https://twitter.com/path#'
-    );
-    expect(removeSearch('https://twitter.com/path?#')).to.equal(
-      'https://twitter.com/path#'
+    expect(removeSearch('https://x.com/path#')).to.equal('https://x.com/path#');
+    expect(removeSearch('https://x.com/path?#')).to.equal(
+      'https://x.com/path#'
     );
   });
 });
@@ -632,17 +623,15 @@ describes.sandboxed('isLocalhostOrigin', {}, () => {
 
 describes.sandboxed('isProtocolValid', {}, () => {
   function testProtocolValid(href, bool) {
-    it.configure()
-      .skipFirefox()
-      .run(
-        'should return that ' +
-          href +
-          (bool ? ' is' : ' is not') +
-          ' a valid protocol',
-        () => {
-          expect(isProtocolValid(href)).to.equal(bool);
-        }
-      );
+    it(
+      'should return that ' +
+        href +
+        (bool ? ' is' : ' is not') +
+        ' a valid protocol',
+      () => {
+        expect(isProtocolValid(href)).to.equal(bool);
+      }
+    );
   }
 
   testProtocolValid('http://foo.com', true);
@@ -822,24 +811,22 @@ describes.sandboxed('getSourceOrigin/Url', {}, () => {
 
 describes.sandboxed('resolveRelativeUrl', {}, () => {
   function testRelUrl(href, baseHref, resolvedHref) {
-    it.configure()
-      .skipFirefox()
-      .run(
-        'should return the resolved rel url from ' +
-          href +
-          ' with base ' +
-          baseHref,
-        () => {
-          expect(resolveRelativeUrl(href, baseHref)).to.equal(
-            resolvedHref,
-            'native or fallback'
-          );
-          expect(resolveRelativeUrlFallback_(href, baseHref)).to.equal(
-            resolvedHref,
-            'fallback'
-          );
-        }
-      );
+    it(
+      'should return the resolved rel url from ' +
+        href +
+        ' with base ' +
+        baseHref,
+      () => {
+        expect(resolveRelativeUrl(href, baseHref)).to.equal(
+          resolvedHref,
+          'native or fallback'
+        );
+        expect(resolveRelativeUrlFallback_(href, baseHref)).to.equal(
+          resolvedHref,
+          'fallback'
+        );
+      }
+    );
   }
 
   // Absolute URL.
diff --git a/test/unit/test-validator-integration.js b/test/unit/test-validator-integration.js
index 94354843303d..6004de344268 100644
--- a/test/unit/test-validator-integration.js
+++ b/test/unit/test-validator-integration.js
@@ -63,16 +63,21 @@ describes.fakeWin('validator-integration', {}, (env) => {
   describe('loadScript', () => {
     it('should propagate pre-existing nonces', () => {
       const scriptEl = env.win.document.createElement('script');
-      scriptEl.setAttribute('nonce', '123');
+      scriptEl.setAttribute('nonce', '');
+      scriptEl.nonce = '123';
       win.document.head.append(scriptEl);
+
       loadScriptStub = env.sandbox
         .stub(eventHelper, 'loadPromise')
         .returns(Promise.resolve());
 
-      loadScript(win.document, 'http://example.com');
+      loadScript(
+        win.document,
+        'https://cdn.ampproject.org/v0/validator_wasm.js'
+      );
 
       expect(loadScriptStub).calledWith(
-        env.sandbox.match((el) => el.getAttribute('nonce') === '123')
+        env.sandbox.match((el) => el.nonce === '123')
       );
     });
   });
diff --git a/test/unit/test-video-analytics-percentage-tracker.js b/test/unit/test-video-analytics-percentage-tracker.js
index d828d35658d1..4f0753479cae 100644
--- a/test/unit/test-video-analytics-percentage-tracker.js
+++ b/test/unit/test-video-analytics-percentage-tracker.js
@@ -7,7 +7,7 @@ import {
 
 import {createCustomEvent} from '#utils/event-helper';
 
-import {PlayingStates, VideoEvents} from '../../src/video-interface';
+import {PlayingStates_Enum, VideoEvents_Enum} from '../../src/video-interface';
 
 describes.fakeWin(
   'video-manager-impl#AnalyticsPercentageTracker',
@@ -55,7 +55,7 @@ describes.fakeWin(
     }
 
     function dispatchLoadedMetadata(element) {
-      dispatchCustom(element, VideoEvents.LOADEDMETADATA);
+      dispatchCustom(element, VideoEvents_Enum.LOADEDMETADATA);
     }
 
     function mockTrigger(tracker) {
@@ -74,7 +74,7 @@ describes.fakeWin(
       mockEntry = {
         video: createFakeVideo(),
         getPlayingState() {
-          return PlayingStates.PAUSED;
+          return PlayingStates_Enum.PAUSED;
         },
       };
 
@@ -147,7 +147,7 @@ describes.fakeWin(
 
           const {element} = video;
 
-          setPlayingState(mockEntry, PlayingStates.PLAYING_MANUAL);
+          setPlayingState(mockEntry, PlayingStates_Enum.PLAYING_MANUAL);
           tracker.start();
 
           dispatchLoadedMetadata(element);
@@ -192,7 +192,7 @@ describes.fakeWin(
 
         dispatchLoadedMetadata(element);
 
-        setPlayingState(mockEntry, PlayingStates.PLAYING_MANUAL);
+        setPlayingState(mockEntry, PlayingStates_Enum.PLAYING_MANUAL);
 
         const cutoff = (validDurationSeconds / 100) * interval;
 
@@ -227,7 +227,7 @@ describes.fakeWin(
 
           dispatchLoadedMetadata(element);
 
-          setPlayingState(mockEntry, PlayingStates.PLAYING_MANUAL);
+          setPlayingState(mockEntry, PlayingStates_Enum.PLAYING_MANUAL);
 
           for (
             let timeSeconds = startTimeSeconds;
@@ -265,14 +265,14 @@ describes.fakeWin(
         setDuration(video, validDurationSeconds);
         setCurrentTime(video, startTimeSeconds);
 
-        setPlayingState(mockEntry, PlayingStates.PLAYING_MANUAL);
+        setPlayingState(mockEntry, PlayingStates_Enum.PLAYING_MANUAL);
 
         tracker.start();
 
         dispatchLoadedMetadata(element);
 
         mockTimerCallback();
-        dispatchCustom(element, VideoEvents.ENDED);
+        dispatchCustom(element, VideoEvents_Enum.ENDED);
 
         expect(triggerMock.withArgs(100)).to.have.been.calledOnce;
       });
@@ -291,7 +291,7 @@ describes.fakeWin(
         setDuration(video, validDurationSeconds);
         setCurrentTime(video, startTimeSeconds);
 
-        setPlayingState(mockEntry, PlayingStates.PLAYING_MANUAL);
+        setPlayingState(mockEntry, PlayingStates_Enum.PLAYING_MANUAL);
 
         tracker.start();
 
@@ -300,7 +300,7 @@ describes.fakeWin(
         tracker.stop();
 
         mockTimerCallback();
-        dispatchCustom(element, VideoEvents.ENDED);
+        dispatchCustom(element, VideoEvents_Enum.ENDED);
 
         expect(triggerMock).to.not.have.been.called;
       });
diff --git a/test/unit/test-video-iframe-integration.js b/test/unit/test-video-iframe-integration.js
index c749fddd5d16..c4b47da72f81 100644
--- a/test/unit/test-video-iframe-integration.js
+++ b/test/unit/test-video-iframe-integration.js
@@ -268,7 +268,7 @@ describes.realWin('video-iframe-integration', {amp: false}, (env) => {
 
           const player = mockVideoJsPlayer();
 
-          const integration = new AmpVideoIntegration();
+          const integration = new AmpVideoIntegration(env.win);
 
           const listenToOnce = env.sandbox.stub(integration, 'listenToOnce_');
           const methodSpy = env.sandbox.spy(integration, 'method');
diff --git a/test/unit/test-video-rotate-to-fullscreen.js b/test/unit/test-video-rotate-to-fullscreen.js
index 1e7e20d51e0a..3f631028d2d3 100644
--- a/test/unit/test-video-rotate-to-fullscreen.js
+++ b/test/unit/test-video-rotate-to-fullscreen.js
@@ -1,7 +1,7 @@
 import {Services} from '#service';
 import {AutoFullscreenManager} from '#service/video-manager-impl';
 
-import {PlayingStates} from '../../src/video-interface';
+import {PlayingStates_Enum} from '../../src/video-interface';
 
 describes.fakeWin('Rotate-to-fullscreen', {amp: true}, (env) => {
   let ampdoc;
@@ -133,9 +133,9 @@ describes.fakeWin('Rotate-to-fullscreen', {amp: true}, (env) => {
       'getPlayingState_'
     );
 
-    getPlayingState.withArgs(video1).returns(PlayingStates.PAUSED);
-    getPlayingState.withArgs(video2).returns(PlayingStates.PLAYING_AUTO);
-    getPlayingState.withArgs(video3).returns(PlayingStates.PLAYING_MANUAL);
+    getPlayingState.withArgs(video1).returns(PlayingStates_Enum.PAUSED);
+    getPlayingState.withArgs(video2).returns(PlayingStates_Enum.PLAYING_AUTO);
+    getPlayingState.withArgs(video3).returns(PlayingStates_Enum.PLAYING_MANUAL);
 
     autoFullscreenManager.register({video: video1});
     autoFullscreenManager.register({video: video2});
@@ -196,9 +196,9 @@ describes.fakeWin('Rotate-to-fullscreen', {amp: true}, (env) => {
       'getPlayingState_'
     );
 
-    getPlayingState.withArgs(video1).returns(PlayingStates.PLAYING_MANUAL);
-    getPlayingState.withArgs(video2).returns(PlayingStates.PLAYING_MANUAL);
-    getPlayingState.withArgs(video3).returns(PlayingStates.PLAYING_MANUAL);
+    getPlayingState.withArgs(video1).returns(PlayingStates_Enum.PLAYING_MANUAL);
+    getPlayingState.withArgs(video2).returns(PlayingStates_Enum.PLAYING_MANUAL);
+    getPlayingState.withArgs(video3).returns(PlayingStates_Enum.PLAYING_MANUAL);
 
     autoFullscreenManager.register({video: video1});
     autoFullscreenManager.register({video: video2});
@@ -247,8 +247,8 @@ describes.fakeWin('Rotate-to-fullscreen', {amp: true}, (env) => {
       'getPlayingState_'
     );
 
-    getPlayingState.withArgs(video1).returns(PlayingStates.PLAYING_MANUAL);
-    getPlayingState.withArgs(video2).returns(PlayingStates.PLAYING_MANUAL);
+    getPlayingState.withArgs(video1).returns(PlayingStates_Enum.PLAYING_MANUAL);
+    getPlayingState.withArgs(video2).returns(PlayingStates_Enum.PLAYING_MANUAL);
 
     autoFullscreenManager.register({video: video1});
     autoFullscreenManager.register({video: video2});
@@ -295,8 +295,8 @@ describes.fakeWin('Rotate-to-fullscreen', {amp: true}, (env) => {
       'getPlayingState_'
     );
 
-    getPlayingState.withArgs(video1).returns(PlayingStates.PLAYING_MANUAL);
-    getPlayingState.withArgs(video2).returns(PlayingStates.PLAYING_MANUAL);
+    getPlayingState.withArgs(video1).returns(PlayingStates_Enum.PLAYING_MANUAL);
+    getPlayingState.withArgs(video2).returns(PlayingStates_Enum.PLAYING_MANUAL);
 
     autoFullscreenManager.register({video: video1});
     autoFullscreenManager.register({video: video2});
diff --git a/test/unit/test-viewer-cid-api.js b/test/unit/test-viewer-cid-api.js
index 204df14b512c..b55558b869a8 100644
--- a/test/unit/test-viewer-cid-api.js
+++ b/test/unit/test-viewer-cid-api.js
@@ -1,5 +1,3 @@
-import {dict} from '#core/types/object';
-
 import {ViewerCidApi} from '#service/viewer-cid-api';
 
 import {mockServiceForDoc} from '#testing/helpers/service';
@@ -49,11 +47,11 @@ describes.realWin('viewerCidApi', {amp: true}, (env) => {
         .getScopedCid(used ? 'api-key' : undefined, 'AMP_ECID_GOOGLE')
         .then((cid) => {
           expect(cid).to.equal('client-id-from-viewer');
-          const payload = dict({
+          const payload = {
             'scope': 'AMP_ECID_GOOGLE',
             'clientIdApi': used,
             'canonicalOrigin': 'http://localhost:9876',
-          });
+          };
           if (used) {
             payload['apiKey'] = 'api-key';
           }
@@ -74,14 +72,11 @@ describes.realWin('viewerCidApi', {amp: true}, (env) => {
 
     it('should not use client ID API if scope not allowlisted', () => {
       viewerMock.sendMessageAwaitResponse
-        .withArgs(
-          'cid',
-          dict({
-            'scope': 'NON_ALLOWLISTED_SCOPE',
-            'clientIdApi': false,
-            'canonicalOrigin': 'http://localhost:9876',
-          })
-        )
+        .withArgs('cid', {
+          'scope': 'NON_ALLOWLISTED_SCOPE',
+          'clientIdApi': false,
+          'canonicalOrigin': 'http://localhost:9876',
+        })
         .returns(Promise.resolve('client-id-from-viewer'));
       return expect(
         api.getScopedCid(undefined, 'NON_ALLOWLISTED_SCOPE')
diff --git a/test/unit/test-viewer.js b/test/unit/test-viewer.js
index d69d9b0ff0ff..f4d58c0b4eaf 100644
--- a/test/unit/test-viewer.js
+++ b/test/unit/test-viewer.js
@@ -9,6 +9,8 @@ import {ViewerImpl} from '#service/viewer-impl';
 
 import {dev} from '#utils/log';
 
+import {FakePerformance} from '#testing/fake-dom';
+
 import {parseUrlDeprecated, removeFragment} from '../../src/url';
 
 describes.sandboxed('Viewer', {}, (env) => {
@@ -66,6 +68,7 @@ describes.sandboxed('Viewer', {}, (env) => {
       ancestorOrigins: null,
       search: '',
     };
+    windowApi.performance = new FakePerformance(window);
     windowApi.addEventListener = (type, listener) => {
       events[type] = listener;
     };
@@ -315,11 +318,13 @@ describes.sandboxed('Viewer', {}, (env) => {
     return promise;
   });
 
-  it('should initialize firstVisibleTime when doc becomes visible', () => {
+  // TODO(#37245): Fix failing test
+  it.skip('should initialize firstVisibleTime when doc becomes visible', () => {
     const viewer = new ViewerImpl(ampdoc);
     expect(ampdoc.isVisible()).to.be.true;
-    expect(ampdoc.getFirstVisibleTime()).to.equal(0);
-    expect(ampdoc.getLastVisibleTime()).to.equal(0);
+    // We don't live during the unix epoch, so time is always positive.
+    expect(ampdoc.getFirstVisibleTime()).to.equal(1);
+    expect(ampdoc.getLastVisibleTime()).to.equal(1);
 
     // Becomes invisible.
     clock.tick(1);
@@ -327,8 +332,8 @@ describes.sandboxed('Viewer', {}, (env) => {
       state: 'hidden',
     });
     expect(ampdoc.isVisible()).to.be.false;
-    expect(ampdoc.getFirstVisibleTime()).to.equal(0);
-    expect(ampdoc.getLastVisibleTime()).to.equal(0);
+    expect(ampdoc.getFirstVisibleTime()).to.equal(1);
+    expect(ampdoc.getLastVisibleTime()).to.equal(1);
 
     // Back to visible.
     clock.tick(1);
@@ -336,7 +341,7 @@ describes.sandboxed('Viewer', {}, (env) => {
       state: 'visible',
     });
     expect(ampdoc.isVisible()).to.be.true;
-    expect(ampdoc.getFirstVisibleTime()).to.equal(0);
+    expect(ampdoc.getFirstVisibleTime()).to.equal(1);
     expect(ampdoc.getLastVisibleTime()).to.equal(2);
 
     // Back to invisible again.
@@ -345,7 +350,7 @@ describes.sandboxed('Viewer', {}, (env) => {
       state: 'hidden',
     });
     expect(ampdoc.isVisible()).to.be.false;
-    expect(ampdoc.getFirstVisibleTime()).to.equal(0);
+    expect(ampdoc.getFirstVisibleTime()).to.equal(1);
     expect(ampdoc.getLastVisibleTime()).to.equal(2);
   });
 
diff --git a/test/unit/test-viewport-binding.js b/test/unit/test-viewport-binding.js
index ee3d527e95e4..d134f142a9d4 100644
--- a/test/unit/test-viewport-binding.js
+++ b/test/unit/test-viewport-binding.js
@@ -84,14 +84,11 @@ describes.realWin('ViewportBindingNatural', {ampCss: true}, (env) => {
     expect(win.document.documentElement.style.paddingTop).to.equal('31px');
   });
 
-  // TODO(zhouyx, #11827): Make this test work on Safari.
-  it.configure()
-    .skipSafari()
-    .run('should calculate size', () => {
-      const size = binding.getSize();
-      expect(size.width).to.equal(100);
-      expect(size.height).to.equal(200);
-    });
+  it('should calculate size', () => {
+    const size = binding.getSize();
+    expect(size.width).to.equal(100);
+    expect(size.height).to.equal(200);
+  });
 
   it('should calculate scrollTop from scrollElement', () => {
     win.pageYOffset = 11;
@@ -330,48 +327,46 @@ describes.realWin('ViewportBindingIosEmbedWrapper', {ampCss: true}, (env) => {
     expect(binding.wrapper_).to.have.class('top');
   });
 
-  it.configure()
-    .skipFirefox()
-    .run('should have CSS setup', () => {
-      win.document.body.style.display = 'table';
-      const htmlCss = win.getComputedStyle(win.document.documentElement);
-      const wrapperCss = win.getComputedStyle(binding.wrapper_);
-      const bodyCss = win.getComputedStyle(win.document.body);
-
-      // `<html>` must have `position: static` or layout is broken.
-      expect(htmlCss.position).to.equal('static');
-
-      // `<html>` and `<i-amphtml-wrapper>` must be scrollable, but not `body`.
-      // Unfortunately, we can't test here `-webkit-overflow-scrolling`.
-      expect(htmlCss.overflowY).to.equal('auto');
-      expect(htmlCss.overflowX).to.equal('hidden');
-      expect(wrapperCss.overflowY).to.equal('auto');
-      expect(wrapperCss.overflowX).to.equal('hidden');
-      expect(bodyCss.overflowY).to.equal('visible');
-      expect(bodyCss.overflowX).to.equal('visible');
-
-      // Wrapper must be a block and positioned absolute at 0/0/0/0.
-      expect(wrapperCss.display).to.equal('block');
-      expect(wrapperCss.position).to.equal('absolute');
-      expect(wrapperCss.top).to.equal('0px');
-      expect(wrapperCss.left).to.equal('0px');
-      expect(wrapperCss.right).to.equal('0px');
-      expect(wrapperCss.bottom).to.equal('0px');
-      expect(wrapperCss.margin).to.equal('0px');
-
-      // `body` must have `relative` positioning and `block` display.
-      expect(bodyCss.position).to.equal('relative');
-      // Preserve the customized `display` value.
-      expect(bodyCss.display).to.equal('table');
-
-      // `body` must have a 1px transparent border for two purposes:
-      // (1) to cancel out margin collapse in body's children;
-      // (2) to offset scroll adjustment to 1 to avoid scroll freeze problem.
-      expect(
-        bodyCss.borderTop.replace('rgba(0, 0, 0, 0)', 'transparent')
-      ).to.equal('1px solid transparent');
-      expect(bodyCss.margin).to.equal('0px');
-    });
+  it('should have CSS setup', () => {
+    win.document.body.style.display = 'table';
+    const htmlCss = win.getComputedStyle(win.document.documentElement);
+    const wrapperCss = win.getComputedStyle(binding.wrapper_);
+    const bodyCss = win.getComputedStyle(win.document.body);
+
+    // `<html>` must have `position: static` or layout is broken.
+    expect(htmlCss.position).to.equal('static');
+
+    // `<html>` and `<i-amphtml-wrapper>` must be scrollable, but not `body`.
+    // Unfortunately, we can't test here `-webkit-overflow-scrolling`.
+    expect(htmlCss.overflowY).to.equal('auto');
+    expect(htmlCss.overflowX).to.equal('hidden');
+    expect(wrapperCss.overflowY).to.equal('auto');
+    expect(wrapperCss.overflowX).to.equal('hidden');
+    expect(bodyCss.overflowY).to.equal('visible');
+    expect(bodyCss.overflowX).to.equal('visible');
+
+    // Wrapper must be a block and positioned absolute at 0/0/0/0.
+    expect(wrapperCss.display).to.equal('block');
+    expect(wrapperCss.position).to.equal('absolute');
+    expect(wrapperCss.top).to.equal('0px');
+    expect(wrapperCss.left).to.equal('0px');
+    expect(wrapperCss.right).to.equal('0px');
+    expect(wrapperCss.bottom).to.equal('0px');
+    expect(wrapperCss.margin).to.equal('0px');
+
+    // `body` must have `relative` positioning and `block` display.
+    expect(bodyCss.position).to.equal('relative');
+    // Preserve the customized `display` value.
+    expect(bodyCss.display).to.equal('table');
+
+    // `body` must have a 1px transparent border for two purposes:
+    // (1) to cancel out margin collapse in body's children;
+    // (2) to offset scroll adjustment to 1 to avoid scroll freeze problem.
+    expect(
+      bodyCss.borderTop.replace('rgba(0, 0, 0, 0)', 'transparent')
+    ).to.equal('1px solid transparent');
+    expect(bodyCss.margin).to.equal('0px');
+  });
 
   it('should be immediately scrolled to 1 to avoid freeze', () => {
     expect(binding.wrapper_.scrollTop).to.equal(1);
@@ -401,14 +396,11 @@ describes.realWin('ViewportBindingIosEmbedWrapper', {ampCss: true}, (env) => {
     expect(win.document.documentElement.style.paddingTop).to.equal('');
   });
 
-  // TODO(zhouyx, #11827): Make this test work on Safari.
-  it.configure()
-    .skipSafari()
-    .run('should calculate size', () => {
-      const size = binding.getSize();
-      expect(size.width).to.equal(100);
-      expect(size.height).to.equal(100);
-    });
+  it('should calculate size', () => {
+    const size = binding.getSize();
+    expect(size.width).to.equal(100);
+    expect(size.height).to.equal(100);
+  });
 
   it('should calculate scrollTop from wrapper', () => {
     binding.wrapper_.scrollTop = 17;
diff --git a/test/unit/test-viewport.js b/test/unit/test-viewport.js
index 82b46a4ee6ff..dba6059a0940 100644
--- a/test/unit/test-viewport.js
+++ b/test/unit/test-viewport.js
@@ -23,6 +23,8 @@ import {installVsyncService} from '#service/vsync-impl';
 import {loadPromise} from '#utils/event-helper';
 import {dev} from '#utils/log';
 
+import {FakePerformance} from '#testing/fake-dom';
+
 import {getMode} from '../../src/mode';
 import {setParentWindow} from '../../src/service-helpers';
 
@@ -1267,25 +1269,19 @@ describes.fakeWin('Viewport', {}, (env) => {
       root.className = '';
     });
 
-    // TODO(zhouyx, #11827): Make this test work on Safari.
-    it.configure()
-      .skipSafari()
-      .run('should not set pan-y when not embedded', () => {
-        viewer.isEmbedded = () => false;
-        viewport = new ViewportImpl(ampdoc, binding, viewer);
-        expect(win.getComputedStyle(root)['touch-action']).to.equal('auto');
-      });
+    it('should not set pan-y when not embedded', () => {
+      viewer.isEmbedded = () => false;
+      viewport = new ViewportImpl(ampdoc, binding, viewer);
+      expect(win.getComputedStyle(root)['touch-action']).to.equal('auto');
+    });
 
-    // TODO(zhouyx, #11827): Make this test work on Safari.
-    it.configure()
-      .skipSafari()
-      .run('should set pan-y with experiment', () => {
-        viewer.isEmbedded = () => true;
-        viewport = new ViewportImpl(ampdoc, binding, viewer);
-        expect(win.getComputedStyle(root)['touch-action']).to.equal(
-          'pan-y pinch-zoom'
-        );
-      });
+    it('should set pan-y with experiment', () => {
+      viewer.isEmbedded = () => true;
+      viewport = new ViewportImpl(ampdoc, binding, viewer);
+      expect(win.getComputedStyle(root)['touch-action']).to.equal(
+        'pan-y pinch-zoom'
+      );
+    });
   });
 
   describe('for child window', () => {
@@ -1648,6 +1644,7 @@ describes.sandboxed('Viewport META', {}, (env) => {
         clearTimeout: window.clearTimeout,
         location: {},
         Promise: window.Promise,
+        performance: new FakePerformance(window),
       };
       installTimerService(windowApi);
       installVsyncService(windowApi);
diff --git a/test/unit/test-vsync.js b/test/unit/test-vsync.js
index 3ab6bfa6e808..97df81ed5101 100644
--- a/test/unit/test-vsync.js
+++ b/test/unit/test-vsync.js
@@ -429,7 +429,7 @@ describes.fakeWin('vsync', {}, (env) => {
       vsync.raf_ = (handler) => (rafHandler = handler);
       isVisibleStub.returns(false);
 
-      let result = ''; // eslint-disable-line no-unused-vars
+      let result = ''; // eslint-disable-line @typescript-eslint/no-unused-vars
       const res = vsync.runAnim(contextNode, {
         mutate: () => {
           result += 'mu1';
@@ -446,7 +446,7 @@ describes.fakeWin('vsync', {}, (env) => {
       vsync.raf_ = (handler) => (rafHandler = handler);
       isVisibleStub.returns(false);
 
-      let result = ''; // eslint-disable-line no-unused-vars
+      let result = ''; // eslint-disable-line @typescript-eslint/no-unused-vars
       const task = vsync.createAnimTask(contextNode, {
         mutate: () => {
           result += 'mu1';
@@ -709,7 +709,7 @@ describes.fakeWin('vsync', {}, (env) => {
       vsync.raf_ = (handler) => (rafHandler = handler);
       doc.visibilityState = 'hidden';
 
-      let result = ''; // eslint-disable-line no-unused-vars
+      let result = ''; // eslint-disable-line @typescript-eslint/no-unused-vars
       const res = vsync.runAnim(contextNode, {
         mutate: () => {
           result += 'mu1';
@@ -726,7 +726,7 @@ describes.fakeWin('vsync', {}, (env) => {
       vsync.raf_ = (handler) => (rafHandler = handler);
       doc.visibilityState = 'hidden';
 
-      let result = ''; // eslint-disable-line no-unused-vars
+      let result = ''; // eslint-disable-line @typescript-eslint/no-unused-vars
       const task = vsync.createAnimTask(contextNode, {
         mutate: () => {
           result += 'mu1';
diff --git a/test/unit/test-xhr.js b/test/unit/test-xhr.js
index 39d69b6c56f3..b8c085856fad 100644
--- a/test/unit/test-xhr.js
+++ b/test/unit/test-xhr.js
@@ -14,819 +14,835 @@ import {getCookie} from '../../src/cookies';
 import {createFormDataWrapper} from '../../src/form-data-wrapper';
 import * as mode from '../../src/mode';
 
-// TODO(jridgewell, #11827): Make this test work on Safari.
-describes.sandboxed
-  .configure()
-  .skipSafari()
-  .run('XHR', {}, function (env) {
-    let ampdocServiceForStub;
-    let ampdoc;
-    let ampdocViewerStub;
-    let xhrCreated;
-    let viewer;
-
-    const location = {href: 'https://acme.com/path'};
-    const nativeWin = {
-      location,
-      fetch: window.fetch,
-    };
-
-    const polyfillWin = {
-      location,
-      fetch: fetchPolyfill,
-    };
-
-    // Given XHR calls give tests more time.
-    this.timeout(5000);
-
-    const scenarios = [
-      {
-        win: nativeWin,
-        desc: 'Native',
-      },
-      {
-        win: polyfillWin,
-        desc: 'Polyfill',
-      },
-    ];
-
-    function setupMockXhr() {
-      const mockXhr = env.sandbox.useFakeXMLHttpRequest();
-      xhrCreated = new Promise((resolve) => (mockXhr.onCreate = resolve));
+describes.sandboxed('XHR', {}, function (env) {
+  let ampdocServiceForStub;
+  let ampdoc;
+  let ampdocViewerStub;
+  let xhrCreated;
+  let viewer;
+
+  const location = {href: 'https://acme.com/path'};
+  const nativeWin = {
+    location,
+    fetch: window.fetch,
+  };
+
+  const polyfillWin = {
+    location,
+    fetch: fetchPolyfill,
+  };
+
+  // Given XHR calls give tests more time.
+  this.timeout(5000);
+
+  const scenarios = [
+    {
+      win: nativeWin,
+      desc: 'Native',
+    },
+    {
+      win: polyfillWin,
+      desc: 'Polyfill',
+    },
+  ];
+
+  function setupMockXhr() {
+    const mockXhr = env.sandbox.useFakeXMLHttpRequest();
+    xhrCreated = new Promise((resolve) => (mockXhr.onCreate = resolve));
+  }
+
+  function noOrigin(url) {
+    let index = url.indexOf('//');
+    if (index == -1) {
+      return url;
     }
+    index = url.indexOf('/', index + 2);
+    return url.substring(index);
+  }
+
+  beforeEach(() => {
+    ampdocServiceForStub = env.sandbox.stub(Services, 'ampdocServiceFor');
+    ampdoc = {
+      getRootNode: () => null,
+      whenFirstVisible: () => Promise.resolve(),
+    };
+    ampdocServiceForStub.returns({
+      isSingleDoc: () => false,
+      getAmpDoc: () => ampdoc,
+      getSingleDoc: () => ampdoc,
+    });
+    ampdocViewerStub = env.sandbox.stub(Services, 'viewerForDoc');
+    ampdocViewerStub.returns({});
 
-    function noOrigin(url) {
-      let index = url.indexOf('//');
-      if (index == -1) {
-        return url;
-      }
-      index = url.indexOf('/', index + 2);
-      return url.substring(index);
-    }
+    location.href = 'https://acme.com/path';
+  });
 
+  scenarios.forEach((test) => {
+    let xhr;
     beforeEach(() => {
-      ampdocServiceForStub = env.sandbox.stub(Services, 'ampdocServiceFor');
-      ampdoc = {
-        getRootNode: () => null,
-        whenFirstVisible: () => Promise.resolve(),
-      };
-      ampdocServiceForStub.returns({
-        isSingleDoc: () => false,
-        getAmpDoc: () => ampdoc,
-        getSingleDoc: () => ampdoc,
-      });
-      ampdocViewerStub = env.sandbox.stub(Services, 'viewerForDoc');
-      ampdocViewerStub.returns({});
-
-      location.href = 'https://acme.com/path';
+      xhr = xhrServiceForTesting(test.win);
     });
+    // Since it's the Native fetch, it won't use the XHR object so
+    // mocking and testing the request becomes not doable.
+    if (test.desc != 'Native') {
+      describe('#XHR', () => {
+        beforeEach(() => {
+          setupMockXhr();
+        });
 
-    scenarios.forEach((test) => {
-      let xhr;
-      beforeEach(() => {
-        xhr = xhrServiceForTesting(test.win);
-      });
-      // Since it's the Native fetch, it won't use the XHR object so
-      // mocking and testing the request becomes not doable.
-      if (test.desc != 'Native') {
-        describe('#XHR', () => {
-          beforeEach(() => {
-            setupMockXhr();
+        it('should allow GET and POST methods', () => {
+          const get = xhr.fetchJson.bind(xhr, '/get?k=v1');
+          const post = xhr.fetchJson.bind(xhr, '/post', {
+            method: 'POST',
+            body: {
+              hello: 'world',
+            },
           });
-
-          it('should allow GET and POST methods', () => {
-            const get = xhr.fetchJson.bind(xhr, '/get?k=v1');
-            const post = xhr.fetchJson.bind(xhr, '/post', {
-              method: 'POST',
-              body: {
-                hello: 'world',
-              },
-            });
-            const put = xhr.fetchJson.bind(xhr, '/put', {
-              method: 'PUT',
-              body: {
-                hello: 'world',
-              },
-            });
-            const patch = xhr.fetchJson.bind(xhr, '/patch', {
-              method: 'PATCH',
-              body: {
-                hello: 'world',
-              },
-            });
-            const deleteMethod = xhr.fetchJson.bind(xhr, '/delete', {
-              method: 'DELETE',
-              body: {
-                id: 3,
-              },
-            });
-
-            expect(get).to.not.throw();
-            expect(post).to.not.throw();
-            allowConsoleError(() => {
-              expect(put).to.throw();
-            });
-            allowConsoleError(() => {
-              expect(patch).to.throw();
-            });
-            allowConsoleError(() => {
-              expect(deleteMethod).to.throw();
-            });
+          const put = xhr.fetchJson.bind(xhr, '/put', {
+            method: 'PUT',
+            body: {
+              hello: 'world',
+            },
           });
-
-          it('should allow FormData as body', () => {
-            const fakeWin = null;
-            env.sandbox.stub(Services, 'platformFor').returns({
-              isIos() {
-                return false;
-              },
-            });
-
-            const formData = createFormDataWrapper(fakeWin);
-            env.sandbox.stub(JSON, 'stringify');
-            formData.append('name', 'John Miller');
-            formData.append('age', 56);
-            const post = xhr.fetchJson.bind(xhr, '/post', {
-              method: 'POST',
-              body: formData,
-            });
-            expect(post).to.not.throw();
-            expect(JSON.stringify.called).to.be.false;
+          const patch = xhr.fetchJson.bind(xhr, '/patch', {
+            method: 'PATCH',
+            body: {
+              hello: 'world',
+            },
           });
-
-          it('should do `GET` as default method', () => {
-            xhr.fetchJson('/get?k=v1');
-            return xhrCreated.then((xhr) => expect(xhr.method).to.equal('GET'));
+          const deleteMethod = xhr.fetchJson.bind(xhr, '/delete', {
+            method: 'DELETE',
+            body: {
+              id: 3,
+            },
           });
 
-          it('should normalize GET method name to uppercase', () => {
-            xhr.fetchJson('/abc');
-            return xhrCreated.then((xhr) => expect(xhr.method).to.equal('GET'));
+          expect(get).to.not.throw();
+          expect(post).to.not.throw();
+          allowConsoleError(() => {
+            expect(put).to.throw();
           });
-
-          it('should normalize POST method name to uppercase', () => {
-            xhr.fetchJson('/abc', {
-              method: 'post',
-              body: {
-                hello: 'world',
-              },
-            });
-            return xhrCreated.then((xhr) =>
-              expect(xhr.method).to.equal('POST')
-            );
+          allowConsoleError(() => {
+            expect(patch).to.throw();
           });
-
-          it('should inject source origin query parameter', () => {
-            xhr.fetchJson('/get?k=v1#h1');
-            return xhrCreated.then((xhr) =>
-              expect(noOrigin(xhr.url)).to.equal(
-                '/get?k=v1&__amp_source_origin=https%3A%2F%2Facme.com#h1'
-              )
-            );
+          allowConsoleError(() => {
+            expect(deleteMethod).to.throw();
           });
+        });
 
-          it('should inject source origin query parameter w/o query', () => {
-            xhr.fetchJson('/get');
-            return xhrCreated.then((xhr) =>
-              expect(noOrigin(xhr.url)).to.equal(
-                '/get?__amp_source_origin=https%3A%2F%2Facme.com'
-              )
-            );
+        it('should allow FormData as body', () => {
+          const fakeWin = null;
+          env.sandbox.stub(Services, 'platformFor').returns({
+            isIos() {
+              return false;
+            },
           });
 
-          it('should defend against invalid source origin query parameter', () => {
-            allowConsoleError(() => {
-              expect(() => {
-                xhr.fetchJson('/get?k=v1&__amp_source_origin=invalid#h1');
-              }).to.throw(/Source origin is not allowed/);
-            });
+          const formData = createFormDataWrapper(fakeWin);
+          env.sandbox.stub(JSON, 'stringify');
+          formData.append('name', 'John Miller');
+          formData.append('age', 56);
+          const post = xhr.fetchJson.bind(xhr, '/post', {
+            method: 'POST',
+            body: formData,
           });
+          expect(post).to.not.throw();
+          expect(JSON.stringify.called).to.be.false;
+        });
 
-          it('should defend against empty source origin query parameter', () => {
-            allowConsoleError(() => {
-              expect(() => {
-                xhr.fetchJson('/get?k=v1&__amp_source_origin=#h1');
-              }).to.throw(/Source origin is not allowed/);
-            });
-          });
+        it('should do `GET` as default method', () => {
+          xhr.fetchJson('/get?k=v1');
+          return xhrCreated.then((xhr) => expect(xhr.method).to.equal('GET'));
+        });
 
-          it('should defend against re-encoded source origin parameter', () => {
-            allowConsoleError(() => {
-              expect(() => {
-                xhr.fetchJson('/get?k=v1&_%5famp_source_origin=#h1');
-              }).to.throw(/Source origin is not allowed/);
-            });
+        it('should normalize GET method name to uppercase', () => {
+          xhr.fetchJson('/abc');
+          return xhrCreated.then((xhr) => expect(xhr.method).to.equal('GET'));
+        });
+
+        it('should normalize POST method name to uppercase', () => {
+          xhr.fetchJson('/abc', {
+            method: 'post',
+            body: {
+              hello: 'world',
+            },
           });
+          return xhrCreated.then((xhr) => expect(xhr.method).to.equal('POST'));
+        });
 
-          it(
-            'should not include __amp_source_origin if ampCors ' +
-              'set to false',
-            () => {
-              xhr.fetchJson('/get', {ampCors: false});
-              return xhrCreated.then((xhr) =>
-                expect(noOrigin(xhr.url)).to.equal('/get')
-              );
-            }
+        it('should inject source origin query parameter', () => {
+          xhr.fetchJson('/get?k=v1#h1');
+          return xhrCreated.then((xhr) =>
+            expect(noOrigin(xhr.url)).to.equal(
+              '/get?k=v1&__amp_source_origin=https%3A%2F%2Facme.com#h1'
+            )
           );
+        });
 
-          it('should accept AMP origin when received in response', () => {
-            const promise = xhr.fetchJson('/get');
-            xhrCreated.then((xhr) =>
-              xhr.respond(
-                200,
-                {
-                  'Content-Type': 'application/json',
-                },
-                '{}'
-              )
-            );
-            return promise;
-          });
+        it('should inject source origin query parameter w/o query', () => {
+          xhr.fetchJson('/get');
+          return xhrCreated.then((xhr) =>
+            expect(noOrigin(xhr.url)).to.equal(
+              '/get?__amp_source_origin=https%3A%2F%2Facme.com'
+            )
+          );
+        });
 
-          describe('doc visibility', () => {
-            afterEach(() => {
-              test.win.fetch.restore();
-            });
-            it('should not call fetch if view is not visible ', () => {
-              const fetchCall = env.sandbox.spy(test.win, 'fetch');
-              ampdoc.whenFirstVisible = () => Promise.reject();
-              xhr.fetchJson('/get', {ampCors: false});
-              expect(fetchCall.notCalled).to.be.true;
-            });
-            it('should call fetch if view is visible ', () => {
-              const fetchCall = env.sandbox.spy(test.win, 'fetch');
-              ampdoc.whenFirstVisible = () => Promise.resolve();
-              const fetch = xhr.fetchJson('/get', {ampCors: false});
-              fetch.then(() => {
-                expect(fetchCall.calledOnce).to.be.true;
-              });
-            });
+        it('should defend against invalid source origin query parameter', () => {
+          allowConsoleError(() => {
+            expect(() => {
+              xhr.fetchJson('/get?k=v1&__amp_source_origin=invalid#h1');
+            }).to.throw(/Source origin is not allowed/);
           });
         });
-      }
 
-      describe('AMP-Same-Origin', () => {
-        beforeEach(() => {
-          xhr = xhrServiceForTesting(test.win);
+        it('should defend against empty source origin query parameter', () => {
+          allowConsoleError(() => {
+            expect(() => {
+              xhr.fetchJson('/get?k=v1&__amp_source_origin=#h1');
+            }).to.throw(/Source origin is not allowed/);
+          });
         });
 
-        it('should not be set for cross origin requests', () => {
-          const init = {};
-          xhr.fetchJson('/whatever', init);
-          expect(init['headers']['AMP-Same-Origin']).to.be.undefined;
+        it('should defend against re-encoded source origin parameter', () => {
+          allowConsoleError(() => {
+            expect(() => {
+              xhr.fetchJson('/get?k=v1&_%5famp_source_origin=#h1');
+            }).to.throw(/Source origin is not allowed/);
+          });
         });
 
-        it('should be set for all same origin GET requests', () => {
-          const init = {};
-          location.href = '/path';
-          xhr.fetchJson('/whatever', init);
-          expect(init['headers']['AMP-Same-Origin']).to.equal('true');
+        it('should not include __amp_source_origin if ampCors set to false', () => {
+          xhr.fetchJson('/get', {ampCors: false});
+          return xhrCreated.then((xhr) =>
+            expect(noOrigin(xhr.url)).to.equal('/get')
+          );
         });
 
-        it('should be set for all same origin POST requests', () => {
-          const init = {method: 'post', body: {}};
-          location.href = '/path';
-          xhr.fetchJson('/whatever', init);
-          expect(init['headers']['AMP-Same-Origin']).to.equal('true');
+        it('should accept AMP origin when received in response', () => {
+          const promise = xhr.fetchJson('/get');
+          xhrCreated.then((xhr) =>
+            xhr.respond(
+              200,
+              {
+                'Content-Type': 'application/json',
+              },
+              '{}'
+            )
+          );
+          return promise;
         });
 
-        it('should check origin not source origin', () => {
-          let init = {method: 'post', body: {}};
-          location.href =
-            'https://cdn.ampproject.org/c/s/example.com/hello/path';
-          xhr.fetchJson('https://example.com/what/ever', init);
-          expect(init['headers']['AMP-Same-Origin']).to.be.undefined;
-
-          init = {method: 'post', body: {}};
-          location.href = 'https://example.com/hello/path';
-          xhr.fetchJson('https://example.com/what/ever', init);
-          expect(init['headers']['AMP-Same-Origin']).to.equal('true');
+        describe('doc visibility', () => {
+          afterEach(() => {
+            test.win.fetch.restore();
+          });
+          it('should not call fetch if view is not visible ', () => {
+            const fetchCall = env.sandbox.spy(test.win, 'fetch');
+            ampdoc.whenFirstVisible = () => Promise.reject();
+            xhr.fetchJson('/get', {ampCors: false});
+            expect(fetchCall.notCalled).to.be.true;
+          });
+          it('should call fetch if view is visible ', () => {
+            const fetchCall = env.sandbox.spy(test.win, 'fetch');
+            ampdoc.whenFirstVisible = () => Promise.resolve();
+            const fetch = xhr.fetchJson('/get', {ampCors: false});
+            fetch.then(() => {
+              expect(fetchCall.calledOnce).to.be.true;
+            });
+          });
         });
       });
+    }
 
-      describe(test.desc, () => {
-        const {testServerPort} = window.ampTestRuntimeConfig;
-        const baseUrl = `http://localhost:${testServerPort}`;
+    describe('AMP-Same-Origin', () => {
+      beforeEach(() => {
+        xhr = xhrServiceForTesting(test.win);
+      });
 
-        beforeEach(() => {
-          xhr = xhrServiceForTesting(test.win);
-        });
+      it('should not be set for cross origin requests', () => {
+        const init = {};
+        xhr.fetchJson('/whatever', init);
+        expect(init['headers']['AMP-Same-Origin']).to.be.undefined;
+      });
 
-        describe('assertSuccess', () => {
-          function createResponseInstance(body, init) {
-            return new Response(body, init);
-          }
-          const mockXhr = {
-            status: 200,
-            headers: {
-              'Content-Type': 'plain/text',
-            },
-            getResponseHeader: () => '',
-          };
-
-          it('should resolve if success', () => {
-            mockXhr.status = 200;
-            return assertSuccess(createResponseInstance('', mockXhr)).then(
-              (response) => {
-                expect(response.status).to.equal(200);
-              }
-            ).should.not.be.rejected;
-          });
+      it('should be set for all same origin GET requests', () => {
+        const init = {};
+        location.href = '/path';
+        xhr.fetchJson('/whatever', init);
+        expect(init['headers']['AMP-Same-Origin']).to.equal('true');
+      });
 
-          it('should reject if error', () => {
-            mockXhr.status = 500;
-            return assertSuccess(createResponseInstance('', mockXhr)).should.be
-              .rejected;
-          });
+      it('should be set for all same origin POST requests', () => {
+        const init = {method: 'post', body: {}};
+        location.href = '/path';
+        xhr.fetchJson('/whatever', init);
+        expect(init['headers']['AMP-Same-Origin']).to.equal('true');
+      });
 
-          it('should include response in error', () => {
-            mockXhr.status = 500;
-            return assertSuccess(createResponseInstance('', mockXhr)).catch(
-              (error) => {
-                expect(error.response).to.exist;
-                expect(error.response.status).to.equal(500);
-              }
-            );
-          });
+      it('should check origin not source origin', () => {
+        let init = {method: 'post', body: {}};
+        location.href = 'https://cdn.ampproject.org/c/s/example.com/hello/path';
+        xhr.fetchJson('https://example.com/what/ever', init);
+        expect(init['headers']['AMP-Same-Origin']).to.be.undefined;
 
-          it('should not resolve after rejecting promise', () => {
-            mockXhr.status = 500;
-            mockXhr.responseText = '{"a": "hello"}';
-            mockXhr.headers['Content-Type'] = 'application/json';
-            mockXhr.getResponseHeader = () => 'application/json';
-            return assertSuccess(createResponseInstance('{"a": 2}', mockXhr))
-              .should.not.be.fulfilled;
-          });
-        });
+        init = {method: 'post', body: {}};
+        location.href = 'https://example.com/hello/path';
+        xhr.fetchJson('https://example.com/what/ever', init);
+        expect(init['headers']['AMP-Same-Origin']).to.equal('true');
+      });
+    });
 
-        it('should do simple JSON fetch', () => {
-          env.sandbox.stub(user(), 'assert');
-          return xhr
-            .fetchJson(`${baseUrl}/get?k=v1`)
-            .then((res) => res.json())
-            .then((res) => {
-              expect(res).to.exist;
-              expect(res['args']['k']).to.equal('v1');
-            });
+    describe(test.desc, () => {
+      const {testServerPort} = window.ampTestRuntimeConfig;
+      const baseUrl = `http://localhost:${testServerPort}`;
+
+      beforeEach(() => {
+        xhr = xhrServiceForTesting(test.win);
+      });
+
+      describe('assertSuccess', () => {
+        function createResponseInstance(body, init) {
+          return new Response(body, init);
+        }
+        const mockXhr = {
+          status: 200,
+          headers: {
+            'Content-Type': 'plain/text',
+          },
+          getResponseHeader: () => '',
+        };
+
+        it('should resolve if success', () => {
+          mockXhr.status = 200;
+          return assertSuccess(createResponseInstance('', mockXhr)).then(
+            (response) => {
+              expect(response.status).to.equal(200);
+            }
+          ).should.not.be.rejected;
         });
 
-        it('should redirect fetch', () => {
-          const url =
-            `${baseUrl}/redirect-to?url=` +
-            encodeURIComponent(`${baseUrl}/get?k=v2`);
-          return xhr
-            .fetchJson(url, {ampCors: false})
-            .then((res) => res.json())
-            .then((res) => {
-              expect(res).to.exist;
-              expect(res['args']['k']).to.equal('v2');
-            });
+        it('should reject if error', () => {
+          mockXhr.status = 500;
+          return assertSuccess(createResponseInstance('', mockXhr)).should.be
+            .rejected;
         });
 
-        it('should fail fetch for 400-error', () => {
-          const url = `${baseUrl}/status/404`;
-          return xhr.fetchJson(url).then(
-            () => {
-              throw new Error('UNREACHABLE');
-            },
+        it('should include response in error', () => {
+          mockXhr.status = 500;
+          return assertSuccess(createResponseInstance('', mockXhr)).catch(
             (error) => {
-              expect(error.message).to.contain('HTTP error 404');
+              expect(error.response).to.exist;
+              expect(error.response.status).to.equal(500);
             }
           );
         });
 
-        it('should fail fetch for 500-error', () => {
-          const url = `${baseUrl}/status/500?CID=cid`;
-          return xhr.fetchJson(url).then(
-            () => {
-              throw new Error('UNREACHABLE');
-            },
-            (error) => {
-              expect(error.message).to.contain('HTTP error 500');
-            }
-          );
+        it('should not resolve after rejecting promise', () => {
+          mockXhr.status = 500;
+          mockXhr.responseText = '{"a": "hello"}';
+          mockXhr.headers['Content-Type'] = 'application/json';
+          mockXhr.getResponseHeader = () => 'application/json';
+          return assertSuccess(createResponseInstance('{"a": 2}', mockXhr))
+            .should.not.be.fulfilled;
         });
+      });
 
-        it('should NOT succeed CORS setting cookies without credentials', () => {
-          const cookieName = 'TEST_CORS_' + Math.round(Math.random() * 10000);
-          const url = `${baseUrl}/cookies/set?${cookieName}=v1`;
-          return xhr.fetchJson(url).then((res) => {
+      it('should do simple JSON fetch', () => {
+        env.sandbox.stub(user(), 'assert');
+        return xhr
+          .fetchJson(`${baseUrl}/get?k=v1`)
+          .then((res) => res.json())
+          .then((res) => {
             expect(res).to.exist;
-            expect(getCookie(window, cookieName)).to.be.null;
+            expect(res['args']['k']).to.equal('v1');
           });
-        });
+      });
 
-        it('should succeed CORS setting cookies with credentials', () => {
-          const cookieName = 'TEST_CORS_' + Math.round(Math.random() * 10000);
-          const url = `${baseUrl}/cookies/set?${cookieName}=v1`;
-          return xhr.fetchJson(url, {credentials: 'include'}).then((res) => {
+      it('should redirect fetch', () => {
+        const url =
+          `${baseUrl}/redirect-to?url=` +
+          encodeURIComponent(`${baseUrl}/get?k=v2`);
+        return xhr
+          .fetchJson(url, {ampCors: false})
+          .then((res) => res.json())
+          .then((res) => {
             expect(res).to.exist;
-            expect(getCookie(window, cookieName)).to.equal('v1');
+            expect(res['args']['k']).to.equal('v2');
           });
+      });
+
+      it('should fail fetch for 400-error', () => {
+        const url = `${baseUrl}/status/404`;
+        return xhr.fetchJson(url).then(
+          () => {
+            throw new Error('UNREACHABLE');
+          },
+          (error) => {
+            expect(error.message).to.contain('HTTP error 404');
+          }
+        );
+      });
+
+      it('should fail fetch for 500-error', () => {
+        const url = `${baseUrl}/status/500?CID=cid`;
+        return xhr.fetchJson(url).then(
+          () => {
+            throw new Error('UNREACHABLE');
+          },
+          (error) => {
+            expect(error.message).to.contain('HTTP error 500');
+          }
+        );
+      });
+
+      it('should NOT succeed CORS setting cookies without credentials', () => {
+        const cookieName = 'TEST_CORS_' + Math.round(Math.random() * 10000);
+        const url = `${baseUrl}/cookies/set?${cookieName}=v1`;
+        return xhr.fetchJson(url).then((res) => {
+          expect(res).to.exist;
+          expect(getCookie(window, cookieName)).to.be.null;
         });
+      });
 
-        it('should ignore CORS setting cookies w/omit credentials', () => {
-          const cookieName = 'TEST_CORS_' + Math.round(Math.random() * 10000);
-          const url = `${baseUrl}/cookies/set?${cookieName}=v1`;
-          return xhr.fetchJson(url, {credentials: 'omit'}).then((res) => {
-            expect(res).to.exist;
-            expect(getCookie(window, cookieName)).to.be.null;
-          });
+      it('should succeed CORS setting cookies with credentials', () => {
+        const cookieName = 'TEST_CORS_' + Math.round(Math.random() * 10000);
+        const url = `${baseUrl}/cookies/set?${cookieName}=v1`;
+        return xhr.fetchJson(url, {credentials: 'include'}).then((res) => {
+          expect(res).to.exist;
+          expect(getCookie(window, cookieName)).to.equal('v1');
         });
+      });
 
-        it('should NOT succeed CORS with invalid credentials', () => {
-          allowConsoleError(() => {
-            expect(() => {
-              xhr.fetchJson('https://acme.org/', {credentials: null});
-            }).to.throw(/Only credentials=include|omit support: null/);
-          });
+      it('should ignore CORS setting cookies w/omit credentials', () => {
+        const cookieName = 'TEST_CORS_' + Math.round(Math.random() * 10000);
+        const url = `${baseUrl}/cookies/set?${cookieName}=v1`;
+        return xhr.fetchJson(url, {credentials: 'omit'}).then((res) => {
+          expect(res).to.exist;
+          expect(getCookie(window, cookieName)).to.be.null;
         });
+      });
 
-        it('should expose HTTP headers', () => {
-          const url =
-            `${baseUrl}/response-headers?AMP-Header=Value1&` +
-            'Access-Control-Expose-Headers=AMP-Header';
-          return xhr.fetchAmpCors_(url, {ampCors: false}).then((res) => {
-            expect(res.headers.get('AMP-Header')).to.equal('Value1');
-          });
+      it('should NOT succeed CORS with invalid credentials', () => {
+        allowConsoleError(() => {
+          expect(() => {
+            xhr.fetchJson('https://acme.org/', {credentials: null});
+          }).to.throw(/Only credentials=include|omit support: null/);
         });
+      });
 
-        it('should omit request details for privacy', () => {
-          // NOTE THIS IS A BAD PORT ON PURPOSE.
-          return xhr.fetchJson('http://localhost:31863/status/500').then(
-            () => {
-              throw new Error('UNREACHABLE');
-            },
-            (error) => {
-              const {message} = error;
-              expect(message).to.contain('http://localhost:31863');
-              expect(message).not.to.contain('status/500');
-              expect(message).not.to.contain('CID');
-            }
-          );
+      it('should expose HTTP headers', () => {
+        const url =
+          `${baseUrl}/response-headers?AMP-Header=Value1&` +
+          'Access-Control-Expose-Headers=AMP-Header';
+        return xhr.fetchAmpCors_(url, {ampCors: false}).then((res) => {
+          expect(res.headers.get('AMP-Header')).to.equal('Value1');
         });
       });
 
-      describe('#fetchText', () => {
-        const TEST_TEXT = 'test text';
-        let fetchStub;
+      it('should omit request details for privacy', () => {
+        // NOTE THIS IS A BAD PORT ON PURPOSE.
+        return xhr.fetchJson('http://localhost:31863/status/500').then(
+          () => {
+            throw new Error('UNREACHABLE');
+          },
+          (error) => {
+            const {message} = error;
+            expect(message).to.contain('http://localhost:31863');
+            expect(message).not.to.contain('status/500');
+            expect(message).not.to.contain('CID');
+          }
+        );
+      });
+    });
 
-        beforeEach(() => {
-          xhr = xhrServiceForTesting(test.win);
-          fetchStub = env.sandbox
-            .stub(xhr, 'fetchAmpCors_')
-            .callsFake(() => Promise.resolve(new Response(TEST_TEXT)));
-        });
+    describe('#fetchText', () => {
+      const TEST_TEXT = 'test text';
+      let fetchStub;
 
-        it('should be able to fetch a document', () => {
-          const promise = xhr.fetchText('/text.html');
-          expect(fetchStub).to.be.calledWith('/text.html', {
-            method: 'GET',
-            headers: {'Accept': 'text/plain'},
-          });
-          return promise
-            .then((res) => {
-              return res.text();
-            })
-            .then((text) => {
-              expect(text).to.equal(TEST_TEXT);
-            });
-        });
+      beforeEach(() => {
+        xhr = xhrServiceForTesting(test.win);
+        fetchStub = env.sandbox
+          .stub(xhr, 'fetchAmpCors_')
+          .callsFake(() => Promise.resolve(new Response(TEST_TEXT)));
       });
 
-      describe('#fetch ' + test.desc, () => {
-        const creative = '<html><body>This is a creative简</body></html>';
-
-        beforeEach(() => (xhr = xhrServiceForTesting(test.win)));
-
-        // Using the Native fetch, we can't mock the XHR request, so an actual
-        // HTTP request would be sent to the server.  Only execute this test
-        // when we're on the PolyFill case, so that we can mock the XHR and
-        // control the response.
-        if (test.desc != 'Native') {
-          it('should be able to fetch a response', () => {
-            setupMockXhr();
-            const promise = xhr.fetch('/index.html').then((response) => {
-              expect(response.headers.get('X-foo-header')).to.equal('foo data');
-              expect(response.headers.get('X-bar-header')).to.equal('bar data');
-              response
-                .arrayBuffer()
-                .then((bytes) => utf8Decode(bytes))
-                .then((text) => {
-                  expect(text).to.equal(creative);
-                });
-            });
-            xhrCreated.then((xhr) =>
-              xhr.respond(
-                200,
-                {
-                  'Content-Type': 'text/xml',
-                  'X-foo-header': 'foo data',
-                  'X-bar-header': 'bar data',
-                },
-                creative
-              )
-            );
-            return promise;
+      it('should be able to fetch a document', () => {
+        const promise = xhr.fetchText('/text.html');
+        expect(fetchStub).to.be.calledWith('/text.html', {
+          method: 'GET',
+          headers: {'Accept': 'text/plain'},
+        });
+        return promise
+          .then((res) => {
+            return res.text();
+          })
+          .then((text) => {
+            expect(text).to.equal(TEST_TEXT);
           });
-        }
       });
     });
 
-    scenarios.forEach((test) => {
-      const {testServerPort} = window.ampTestRuntimeConfig;
-      const url = `http://localhost:${testServerPort}/post`;
-
-      describe(test.desc + ' POST', () => {
-        let xhr;
+    describe('#fetch ' + test.desc, () => {
+      const creative = '<html><body>This is a creative简</body></html>';
 
-        beforeEach(() => (xhr = xhrServiceForTesting(test.win)));
+      beforeEach(() => (xhr = xhrServiceForTesting(test.win)));
 
-        if (test.desc != 'Native') {
-          it('should have required json POST headers by default', () => {
-            setupMockXhr();
-            xhr.fetchJson(url, {
-              method: 'POST',
-              body: {
-                hello: 'world',
-              },
-              headers: {
-                'Other': 'another',
-              },
-            });
-            return xhrCreated.then((xhr) =>
-              expect(xhr.requestHeaders).to.deep.equal({
-                'Accept': 'application/json',
-                'Content-Type': 'text/plain;charset=utf-8',
-                'Other': 'another', // Not removed when other headers set.
-              })
-            );
+      // Using the Native fetch, we can't mock the XHR request, so an actual
+      // HTTP request would be sent to the server.  Only execute this test
+      // when we're on the PolyFill case, so that we can mock the XHR and
+      // control the response.
+      if (test.desc != 'Native') {
+        it('should be able to fetch a response', () => {
+          setupMockXhr();
+          const promise = xhr.fetch('/index.html').then((response) => {
+            expect(response.headers.get('X-foo-header')).to.equal('foo data');
+            expect(response.headers.get('X-bar-header')).to.equal('bar data');
+            response
+              .arrayBuffer()
+              .then((bytes) => utf8Decode(bytes))
+              .then((text) => {
+                expect(text).to.equal(creative);
+              });
           });
-        }
-
-        it("should get an echo'd response back", () => {
-          return xhr
-            .fetchJson(url, {
-              method: 'POST',
-              body: {
-                hello: 'world',
-              },
-              headers: {
-                'Content-Type': 'application/json;charset=utf-8',
+          xhrCreated.then((xhr) =>
+            xhr.respond(
+              200,
+              {
+                'Content-Type': 'text/xml',
+                'X-foo-header': 'foo data',
+                'X-bar-header': 'bar data',
               },
-            })
-            .then((res) => res.json())
-            .then((res) => {
-              expect(res.json).to.jsonEqual({
-                hello: 'world',
-              });
-            });
+              creative
+            )
+          );
+          return promise;
         });
+      }
+    });
+  });
+
+  scenarios.forEach((test) => {
+    const {testServerPort} = window.ampTestRuntimeConfig;
+    const url = `http://localhost:${testServerPort}/post`;
+
+    describe(test.desc + ' POST', () => {
+      let xhr;
 
-        it('should throw when `body` is not an object or array', () => {
-          const objectFn = xhr.fetchJson.bind(xhr, url, {
+      beforeEach(() => (xhr = xhrServiceForTesting(test.win)));
+
+      if (test.desc != 'Native') {
+        it('should have required json POST headers by default', () => {
+          setupMockXhr();
+          xhr.fetchJson(url, {
             method: 'POST',
             body: {
               hello: 'world',
             },
+            headers: {
+              'Other': 'another',
+            },
           });
-          const arrayFn = xhr.fetchJson.bind(xhr, url, {
-            method: 'POST',
-            body: ['hello', 'world'],
-          });
-          const stringFn = xhr.fetchJson.bind(xhr, url, {
-            method: 'POST',
-            body: 'hello world',
-          });
-          const numberFn = xhr.fetchJson.bind(xhr, url, {
-            method: 'POST',
-            body: 3,
-          });
-          const booleanFn = xhr.fetchJson.bind(xhr, url, {
-            method: 'POST',
-            body: true,
-          });
-          const nullFn = xhr.fetchJson.bind(xhr, url, {
+          return xhrCreated.then((xhr) =>
+            expect(xhr.requestHeaders).to.deep.equal({
+              'Accept': 'application/json',
+              'Content-Type': 'text/plain;charset=utf-8',
+              'Other': 'another', // Not removed when other headers set.
+            })
+          );
+        });
+      }
+
+      it("should get an echo'd response back", () => {
+        return xhr
+          .fetchJson(url, {
             method: 'POST',
-            body: null,
+            body: {
+              hello: 'world',
+            },
+            headers: {
+              'Content-Type': 'application/json;charset=utf-8',
+            },
+          })
+          .then((res) => res.json())
+          .then((res) => {
+            expect(res.json).to.jsonEqual({
+              hello: 'world',
+            });
           });
+      });
 
-          expect(objectFn).to.not.throw();
-          expect(arrayFn).to.not.throw();
-          allowConsoleError(() => {
-            expect(stringFn).to.throw();
-          });
-          allowConsoleError(() => {
-            expect(numberFn).to.throw();
-          });
-          allowConsoleError(() => {
-            expect(booleanFn).to.throw();
-          });
-          allowConsoleError(() => {
-            expect(nullFn).to.throw();
-          });
+      it('should throw when `body` is not an object or array', () => {
+        const objectFn = xhr.fetchJson.bind(xhr, url, {
+          method: 'POST',
+          body: {
+            hello: 'world',
+          },
+        });
+        const arrayFn = xhr.fetchJson.bind(xhr, url, {
+          method: 'POST',
+          body: ['hello', 'world'],
+        });
+        const stringFn = xhr.fetchJson.bind(xhr, url, {
+          method: 'POST',
+          body: 'hello world',
+        });
+        const numberFn = xhr.fetchJson.bind(xhr, url, {
+          method: 'POST',
+          body: 3,
+        });
+        const booleanFn = xhr.fetchJson.bind(xhr, url, {
+          method: 'POST',
+          body: true,
+        });
+        const nullFn = xhr.fetchJson.bind(xhr, url, {
+          method: 'POST',
+          body: null,
+        });
+
+        expect(objectFn).to.not.throw();
+        expect(arrayFn).to.not.throw();
+        allowConsoleError(() => {
+          expect(stringFn).to.throw();
+        });
+        allowConsoleError(() => {
+          expect(numberFn).to.throw();
+        });
+        allowConsoleError(() => {
+          expect(booleanFn).to.throw();
+        });
+        allowConsoleError(() => {
+          expect(nullFn).to.throw();
         });
       });
     });
+  });
 
-    describe('interceptor', () => {
-      const origin = 'https://acme.com';
-
-      let interceptionEnabledWin;
-      let optedInDoc;
-      let sendMessageStub;
-      function getDefaultResponseOptions() {
-        return {
-          headers: [],
-        };
-      }
+  describe('interceptor', () => {
+    const origin = 'https://acme.com';
 
-      function getDefaultResponsePromise() {
-        return Promise.resolve({init: getDefaultResponseOptions()});
-      }
+    let interceptionEnabledWin;
+    let optedInDoc;
+    let sendMessageStub;
+    function getDefaultResponseOptions() {
+      return {
+        headers: [],
+      };
+    }
 
-      beforeEach(() => {
-        optedInDoc = window.document.implementation.createHTMLDocument('');
-        optedInDoc.documentElement.setAttribute('allow-xhr-interception', '');
+    function getDefaultResponsePromise() {
+      return Promise.resolve({init: getDefaultResponseOptions()});
+    }
 
-        const ampdoc = {
-          getRootNode: () => optedInDoc,
-          whenFirstVisible: () => Promise.resolve(),
-        };
-        ampdocServiceForStub.returns({
-          isSingleDoc: () => true,
-          getAmpDoc: () => ampdoc,
-          getSingleDoc: () => ampdoc,
-        });
-        viewer = {
-          hasCapability: () => true,
-          isTrustedViewer: () => Promise.resolve(true),
-          sendMessageAwaitResponse: getDefaultResponsePromise,
-          whenFirstVisible: () => Promise.resolve(),
-        };
-        sendMessageStub = env.sandbox.stub(viewer, 'sendMessageAwaitResponse');
-        sendMessageStub.returns(getDefaultResponsePromise());
-        ampdocViewerStub.returns(viewer);
-        interceptionEnabledWin = {
-          location: {
-            href: `${origin}/path`,
-          },
-          fetch: () =>
-            Promise.resolve(new Response('', getDefaultResponseOptions())),
-        };
-      });
+    beforeEach(() => {
+      optedInDoc = window.document.implementation.createHTMLDocument('');
+      optedInDoc.documentElement.setAttribute('allow-xhr-interception', '');
 
-      afterEach(() => {
-        toggleExperiment(
-          interceptionEnabledWin,
-          'untrusted-xhr-interception',
-          false
-        );
+      const ampdoc = {
+        getRootNode: () => optedInDoc,
+        whenFirstVisible: () => Promise.resolve(),
+      };
+      ampdocServiceForStub.returns({
+        isSingleDoc: () => true,
+        getAmpDoc: () => ampdoc,
+        getSingleDoc: () => ampdoc,
       });
+      viewer = {
+        hasCapability: () => true,
+        isTrustedViewer: () => Promise.resolve(true),
+        sendMessageAwaitResponse: getDefaultResponsePromise,
+        whenFirstVisible: () => Promise.resolve(),
+      };
+      sendMessageStub = env.sandbox.stub(viewer, 'sendMessageAwaitResponse');
+      sendMessageStub.returns(getDefaultResponsePromise());
+      ampdocViewerStub.returns(viewer);
+      interceptionEnabledWin = {
+        location: {
+          href: `${origin}/path`,
+        },
+        fetch: () =>
+          Promise.resolve(new Response('', getDefaultResponseOptions())),
+      };
+    });
 
-      it('should not intercept if AMP doc is not single', () => {
-        const ampdoc = {
-          getRootNode: () => optedInDoc,
-          whenFirstVisible: () => Promise.resolve(),
-        };
-        ampdocServiceForStub.returns({
-          isSingleDoc: () => false,
-          getAmpDoc: () => ampdoc,
-          getSingleDoc: () => ampdoc,
-        });
-        const xhr = xhrServiceForTesting(interceptionEnabledWin);
+    afterEach(() => {
+      toggleExperiment(
+        interceptionEnabledWin,
+        'untrusted-xhr-interception',
+        false
+      );
+    });
 
-        return xhr
-          .fetch('https://cdn.ampproject.org')
-          .then(() => expect(sendMessageStub).to.not.have.been.called);
+    it('should not intercept if AMP doc is not single', () => {
+      const ampdoc = {
+        getRootNode: () => optedInDoc,
+        whenFirstVisible: () => Promise.resolve(),
+      };
+      ampdocServiceForStub.returns({
+        isSingleDoc: () => false,
+        getAmpDoc: () => ampdoc,
+        getSingleDoc: () => ampdoc,
       });
+      const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-      it('should not intercept if AMP doc does not opt in', () => {
-        const nonOptedInDoc =
-          window.document.implementation.createHTMLDocument('');
-        const ampdoc = {
-          getRootNode: () => nonOptedInDoc,
-          whenFirstVisible: () => Promise.resolve(),
-        };
-        ampdocServiceForStub.returns({
-          isSingleDoc: () => true,
-          getAmpDoc: () => ampdoc,
-          getSingleDoc: () => ampdoc,
-        });
-
-        const xhr = xhrServiceForTesting(interceptionEnabledWin);
+      return xhr
+        .fetch('https://cdn.ampproject.org')
+        .then(() => expect(sendMessageStub).to.not.have.been.called);
+    });
 
-        return xhr
-          .fetch('https://cdn.ampproject.org')
-          .then(() => expect(sendMessageStub).to.not.have.been.called);
+    it('should not intercept if AMP doc does not opt in', () => {
+      const nonOptedInDoc =
+        window.document.implementation.createHTMLDocument('');
+      const ampdoc = {
+        getRootNode: () => nonOptedInDoc,
+        whenFirstVisible: () => Promise.resolve(),
+      };
+      ampdocServiceForStub.returns({
+        isSingleDoc: () => true,
+        getAmpDoc: () => ampdoc,
+        getSingleDoc: () => ampdoc,
       });
 
-      it('should not intercept if viewer is not capable', () => {
-        env.sandbox
-          .stub(viewer, 'hasCapability')
-          .withArgs('xhrInterceptor')
-          .returns(false);
-        const xhr = xhrServiceForTesting(interceptionEnabledWin);
+      const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-        return xhr
-          .fetch('https://cdn.ampproject.org')
-          .then(() => expect(sendMessageStub).to.not.have.been.called);
-      });
+      return xhr
+        .fetch('https://cdn.ampproject.org')
+        .then(() => expect(sendMessageStub).to.not.have.been.called);
+    });
 
-      it('should not intercept if viewer untrusted and non-dev mode', () => {
-        env.sandbox
-          .stub(viewer, 'isTrustedViewer')
-          .returns(Promise.resolve(false));
-        interceptionEnabledWin.AMP_DEV_MODE = false;
+    it('should not intercept if viewer is not capable', () => {
+      env.sandbox
+        .stub(viewer, 'hasCapability')
+        .withArgs('xhrInterceptor')
+        .returns(false);
+      const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-        const xhr = xhrServiceForTesting(interceptionEnabledWin);
+      return xhr
+        .fetch('https://cdn.ampproject.org')
+        .then(() => expect(sendMessageStub).to.not.have.been.called);
+    });
 
-        return xhr
-          .fetch('https://cdn.ampproject.org')
-          .then(() => expect(sendMessageStub).to.not.have.been.called);
-      });
+    it('should not intercept if viewer untrusted and non-dev mode', () => {
+      env.sandbox
+        .stub(viewer, 'isTrustedViewer')
+        .returns(Promise.resolve(false));
+      interceptionEnabledWin.AMP_DEV_MODE = false;
 
-      it('should not intercept a 1p cdn from subdomain', () => {
-        const xhr = xhrServiceForTesting(interceptionEnabledWin);
+      const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-        return xhr
-          .fetch('https://subdomain-model.cdn.ampproject.org/ww.js')
-          .then(() => expect(sendMessageStub).to.not.have.been.called);
-      });
+      return xhr
+        .fetch('https://cdn.ampproject.org')
+        .then(() => expect(sendMessageStub).to.not.have.been.called);
+    });
 
-      it('should not intercept a 1p cdn resource', () => {
-        const xhr = xhrServiceForTesting(interceptionEnabledWin);
+    it('should not intercept a 1p cdn from subdomain', () => {
+      const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-        return xhr
-          .fetch('https://cdn.ampproject.org/ww.js')
-          .then(() => expect(sendMessageStub).to.not.have.been.called);
-      });
+      return xhr
+        .fetch('https://subdomain-model.cdn.ampproject.org/ww.js')
+        .then(() => expect(sendMessageStub).to.not.have.been.called);
+    });
 
-      it('should intercept if viewer untrusted but in local dev mode', () => {
-        env.sandbox
-          .stub(viewer, 'isTrustedViewer')
-          .returns(Promise.resolve(false));
-        env.sandbox.stub(mode, 'getMode').returns({localDev: true});
+    it('should not intercept a 1p cdn resource', () => {
+      const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-        const xhr = xhrServiceForTesting(interceptionEnabledWin);
+      return xhr
+        .fetch('https://cdn.ampproject.org/ww.js')
+        .then(() => expect(sendMessageStub).to.not.have.been.called);
+    });
 
-        return xhr
-          .fetch('https://www.some-url.org/some-resource/')
-          .then(() => expect(sendMessageStub).to.have.been.called);
-      });
+    it('should intercept if viewer untrusted but in local dev mode', () => {
+      env.sandbox
+        .stub(viewer, 'isTrustedViewer')
+        .returns(Promise.resolve(false));
+      env.sandbox.stub(mode, 'getMode').returns({localDev: true});
 
-      it('should intercept if untrusted-xhr-interception experiment enabled', () => {
-        env.sandbox
-          .stub(viewer, 'isTrustedViewer')
-          .returns(Promise.resolve(false));
-        env.sandbox.stub(mode, 'getMode').returns({localDev: false});
-        env.sandbox
-          .stub(viewer, 'hasCapability')
-          .withArgs('xhrInterceptor')
-          .returns(true);
-        toggleExperiment(
-          interceptionEnabledWin,
-          'untrusted-xhr-interception',
-          true
-        );
+      const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-        const xhr = xhrServiceForTesting(interceptionEnabledWin);
+      return xhr
+        .fetch('https://www.some-url.org/some-resource/')
+        .then(() => expect(sendMessageStub).to.have.been.called);
+    });
 
-        return xhr
-          .fetch('https://www.some-url.org/some-resource/')
-          .then(() => expect(sendMessageStub).to.have.been.called);
-      });
+    it('should intercept if untrusted-xhr-interception experiment enabled', () => {
+      env.sandbox
+        .stub(viewer, 'isTrustedViewer')
+        .returns(Promise.resolve(false));
+      env.sandbox.stub(mode, 'getMode').returns({localDev: false});
+      env.sandbox
+        .stub(viewer, 'hasCapability')
+        .withArgs('xhrInterceptor')
+        .returns(true);
+      toggleExperiment(
+        interceptionEnabledWin,
+        'untrusted-xhr-interception',
+        true
+      );
+
+      const xhr = xhrServiceForTesting(interceptionEnabledWin);
+
+      return xhr
+        .fetch('https://www.some-url.org/some-resource/')
+        .then(() => expect(sendMessageStub).to.have.been.called);
+    });
 
-      it('should intercept if non-dev mode but viewer trusted', () => {
-        env.sandbox
-          .stub(viewer, 'isTrustedViewer')
-          .returns(Promise.resolve(true));
-        interceptionEnabledWin.AMP_DEV_MODE = false;
+    it('should intercept if non-dev mode but viewer trusted', () => {
+      env.sandbox
+        .stub(viewer, 'isTrustedViewer')
+        .returns(Promise.resolve(true));
+      interceptionEnabledWin.AMP_DEV_MODE = false;
 
-        const xhr = xhrServiceForTesting(interceptionEnabledWin);
+      const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-        return xhr
-          .fetch('https://www.some-url.org/some-resource/')
-          .then(() => expect(sendMessageStub).to.have.been.called);
-      });
+      return xhr
+        .fetch('https://www.some-url.org/some-resource/')
+        .then(() => expect(sendMessageStub).to.have.been.called);
+    });
 
-      it('should send viewer message named `xhr`', () => {
-        const xhr = xhrServiceForTesting(interceptionEnabledWin);
+    it('should send viewer message named `xhr`', () => {
+      const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-        return xhr
-          .fetch('https://www.some-url.org/some-resource/')
-          .then(() =>
-            expect(sendMessageStub).to.have.been.calledWithMatch(
-              'xhr',
-              env.sandbox.match.any
-            )
-          );
-      });
+      return xhr
+        .fetch('https://www.some-url.org/some-resource/')
+        .then(() =>
+          expect(sendMessageStub).to.have.been.calledWithMatch(
+            'xhr',
+            env.sandbox.match.any
+          )
+        );
+    });
 
-      it('should post correct structurally-cloneable GET request', () => {
-        const xhr = xhrServiceForTesting(interceptionEnabledWin);
+    it('should post correct structurally-cloneable GET request', () => {
+      const xhr = xhrServiceForTesting(interceptionEnabledWin);
+
+      return xhr.fetch('https://www.some-url.org/some-resource/').then(() =>
+        expect(sendMessageStub).to.have.been.calledWithMatch(
+          env.sandbox.match.any,
+          {
+            originalRequest: {
+              input:
+                'https://www.some-url.org/some-resource/' +
+                '?__amp_source_origin=https%3A%2F%2Facme.com',
+              init: {
+                headers: {},
+                method: 'GET',
+              },
+            },
+          }
+        )
+      );
+    });
+
+    it('should post correct structurally-cloneable JSON request', () => {
+      const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-        return xhr.fetch('https://www.some-url.org/some-resource/').then(() =>
+      return xhr
+        .fetch('https://www.some-url.org/some-resource/', {
+          method: 'POST',
+          headers: {'Content-Type': 'application/json;charset=utf-8'},
+          body: JSON.stringify({a: 42, b: [24, true]}),
+        })
+        .then(() =>
           expect(sendMessageStub).to.have.been.calledWithMatch(
             env.sandbox.match.any,
             {
@@ -835,334 +851,297 @@ describes.sandboxed
                   'https://www.some-url.org/some-resource/' +
                   '?__amp_source_origin=https%3A%2F%2Facme.com',
                 init: {
-                  headers: {},
-                  method: 'GET',
+                  headers: {
+                    'Content-Type': 'application/json;charset=utf-8',
+                  },
+                  body: '{"a":42,"b":[24,true]}',
+                  method: 'POST',
                 },
               },
             }
           )
         );
-      });
+    });
 
-      it('should post correct structurally-cloneable JSON request', () => {
-        const xhr = xhrServiceForTesting(interceptionEnabledWin);
+    it('should post correct structurally-cloneable FormData request', () => {
+      const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-        return xhr
-          .fetch('https://www.some-url.org/some-resource/', {
-            method: 'POST',
-            headers: {'Content-Type': 'application/json;charset=utf-8'},
-            body: JSON.stringify({a: 42, b: [24, true]}),
-          })
-          .then(() =>
-            expect(sendMessageStub).to.have.been.calledWithMatch(
-              env.sandbox.match.any,
-              {
-                originalRequest: {
-                  input:
-                    'https://www.some-url.org/some-resource/' +
-                    '?__amp_source_origin=https%3A%2F%2Facme.com',
-                  init: {
-                    headers: {
-                      'Content-Type': 'application/json;charset=utf-8',
-                    },
-                    body: '{"a":42,"b":[24,true]}',
-                    method: 'POST',
+      const fakeWin = null;
+      env.sandbox.stub(Services, 'platformFor').returns({
+        isIos() {
+          return false;
+        },
+      });
+
+      const formData = createFormDataWrapper(fakeWin);
+      formData.append('a', 42);
+      formData.append('b', '24');
+      formData.append('b', true);
+
+      return xhr
+        .fetch('https://www.some-url.org/some-resource/', {
+          method: 'POST',
+          body: formData,
+        })
+        .then(() =>
+          expect(sendMessageStub).to.have.been.calledWithMatch(
+            env.sandbox.match.any,
+            {
+              originalRequest: {
+                input:
+                  'https://www.some-url.org/some-resource/' +
+                  '?__amp_source_origin=https%3A%2F%2Facme.com',
+                init: {
+                  headers: {
+                    'Content-Type': 'multipart/form-data;charset=utf-8',
                   },
+                  body: [
+                    ['a', '42'],
+                    ['b', '24'],
+                    ['b', 'true'],
+                  ],
+                  method: 'POST',
                 },
-              }
-            )
-          );
-      });
+              },
+            }
+          )
+        );
+    });
 
-      it('should post correct structurally-cloneable FormData request', () => {
-        const xhr = xhrServiceForTesting(interceptionEnabledWin);
+    it('should be rejected when response undefined', () => {
+      expectAsyncConsoleError(/Object expected/);
+      sendMessageStub.returns(Promise.resolve());
+      const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-        const fakeWin = null;
-        env.sandbox.stub(Services, 'platformFor').returns({
-          isIos() {
-            return false;
-          },
-        });
+      return expect(
+        xhr.fetch('https://www.some-url.org/some-resource/')
+      ).to.eventually.be.rejectedWith(Error, 'Object expected: undefined');
+    });
 
-        const formData = createFormDataWrapper(fakeWin);
-        formData.append('a', 42);
-        formData.append('b', '24');
-        formData.append('b', true);
+    it('should be rejected when response null', () => {
+      expectAsyncConsoleError(/Object expected/);
+      sendMessageStub.returns(Promise.resolve(null));
+      const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-        return xhr
-          .fetch('https://www.some-url.org/some-resource/', {
-            method: 'POST',
-            body: formData,
-          })
-          .then(() =>
-            expect(sendMessageStub).to.have.been.calledWithMatch(
-              env.sandbox.match.any,
-              {
-                originalRequest: {
-                  input:
-                    'https://www.some-url.org/some-resource/' +
-                    '?__amp_source_origin=https%3A%2F%2Facme.com',
-                  init: {
-                    headers: {
-                      'Content-Type': 'multipart/form-data;charset=utf-8',
-                    },
-                    body: [
-                      ['a', '42'],
-                      ['b', '24'],
-                      ['b', 'true'],
-                    ],
-                    method: 'POST',
-                  },
-                },
-              }
-            )
-          );
-      });
+      return expect(
+        xhr.fetch('https://www.some-url.org/some-resource/')
+      ).to.eventually.be.rejectedWith(Error, 'Object expected: null');
+    });
 
-      it('should be rejected when response undefined', () => {
-        expectAsyncConsoleError(/Object expected/);
-        sendMessageStub.returns(Promise.resolve());
-        const xhr = xhrServiceForTesting(interceptionEnabledWin);
+    it('should be rejected when response is string', () => {
+      expectAsyncConsoleError(/Object expected/);
+      sendMessageStub.returns(Promise.resolve('response text'));
+      const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-        return expect(
-          xhr.fetch('https://www.some-url.org/some-resource/')
-        ).to.eventually.be.rejectedWith(Error, 'Object expected: undefined');
-      });
+      return expect(
+        xhr.fetch('https://www.some-url.org/some-resource/')
+      ).to.eventually.be.rejectedWith(Error, 'Object expected: response text');
+    });
 
-      it('should be rejected when response null', () => {
-        expectAsyncConsoleError(/Object expected/);
-        sendMessageStub.returns(Promise.resolve(null));
+    describe('when native Response type is available', () => {
+      beforeEach(() => (interceptionEnabledWin.Response = window.Response));
+
+      it('should return correct non-document response', () => {
+        sendMessageStub.returns(
+          Promise.resolve({
+            body: '{"content":32}',
+            init: {
+              status: 242,
+              statusText: 'Magic status',
+              headers: [
+                ['a', 2],
+                ['b', false],
+              ],
+            },
+          })
+        );
         const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-        return expect(
-          xhr.fetch('https://www.some-url.org/some-resource/')
-        ).to.eventually.be.rejectedWith(Error, 'Object expected: null');
+        return xhr
+          .fetch('https://www.some-url.org/some-resource/')
+          .then((response) => {
+            expect(response.headers.get('a')).to.equal('2');
+            expect(response.headers.get('b')).to.equal('false');
+            expect(response).to.have.property('ok').that.is.true;
+            expect(response).to.have.property('status').that.equals(242);
+            expect(response)
+              .to.have.property('statusText')
+              .that.equals('Magic status');
+            return expect(response.text()).to.eventually.equal(
+              '{"content":32}'
+            );
+            return expect(response.json()).to.eventually.deep.equal({
+              content: 32,
+            });
+          });
       });
+    });
 
-      it('should be rejected when response is string', () => {
-        expectAsyncConsoleError(/Object expected/);
-        sendMessageStub.returns(Promise.resolve('response text'));
+    describe('when native Response type is unavailable', () => {
+      beforeEach(() => (interceptionEnabledWin.Response = undefined));
+
+      it('should return correct non-document response', () => {
+        sendMessageStub.returns(
+          Promise.resolve({
+            body: '{"content":32}',
+            init: {
+              status: 242,
+              statusText: 'Magic status',
+              headers: [
+                ['a', 2],
+                ['b', false],
+              ],
+            },
+          })
+        );
         const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-        return expect(
-          xhr.fetch('https://www.some-url.org/some-resource/')
-        ).to.eventually.be.rejectedWith(
-          Error,
-          'Object expected: response text'
-        );
+        return xhr
+          .fetch('https://www.some-url.org/some-resource/')
+          .then((response) => {
+            expect(response.headers.get('a')).to.equal('2');
+            expect(response.headers.get('b')).to.equal('false');
+            expect(response).to.have.property('ok').that.is.true;
+            expect(response).to.have.property('status').that.equals(242);
+            return expect(response.json()).to.eventually.deep.equal({
+              content: 32,
+            });
+          });
       });
 
-      describe('when native Response type is available', () => {
-        beforeEach(() => (interceptionEnabledWin.Response = window.Response));
+      it('should return default response when body/init missing', () => {
+        sendMessageStub.returns(Promise.resolve({}));
+        const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-        it('should return correct non-document response', () => {
-          sendMessageStub.returns(
-            Promise.resolve({
-              body: '{"content":32}',
-              init: {
-                status: 242,
-                statusText: 'Magic status',
-                headers: [
-                  ['a', 2],
-                  ['b', false],
-                ],
-              },
-            })
-          );
-          const xhr = xhrServiceForTesting(interceptionEnabledWin);
-
-          return xhr
-            .fetch('https://www.some-url.org/some-resource/')
-            .then((response) => {
-              expect(response.headers.get('a')).to.equal('2');
-              expect(response.headers.get('b')).to.equal('false');
-              expect(response).to.have.property('ok').that.is.true;
-              expect(response).to.have.property('status').that.equals(242);
-              expect(response)
-                .to.have.property('statusText')
-                .that.equals('Magic status');
-              return expect(response.text()).to.eventually.equal(
-                '{"content":32}'
-              );
-              return expect(response.json()).to.eventually.deep.equal({
-                content: 32,
-              });
-            });
-        });
+        return xhr
+          .fetch('https://www.some-url.org/some-resource/', {ampCors: false})
+          .then((response) => {
+            expect(response.headers.get('a')).to.be.null;
+            expect(response.headers.has('a')).to.be.false;
+            expect(response).to.have.property('ok').that.is.true;
+            expect(response).to.have.property('status').that.equals(200);
+            return expect(response.text()).to.eventually.be.empty;
+          });
       });
 
-      describe('when native Response type is unavailable', () => {
-        beforeEach(() => (interceptionEnabledWin.Response = undefined));
-
-        it('should return correct non-document response', () => {
-          sendMessageStub.returns(
-            Promise.resolve({
-              body: '{"content":32}',
-              init: {
-                status: 242,
-                statusText: 'Magic status',
-                headers: [
-                  ['a', 2],
-                  ['b', false],
-                ],
-              },
-            })
-          );
-          const xhr = xhrServiceForTesting(interceptionEnabledWin);
-
-          return xhr
-            .fetch('https://www.some-url.org/some-resource/')
-            .then((response) => {
-              expect(response.headers.get('a')).to.equal('2');
-              expect(response.headers.get('b')).to.equal('false');
-              expect(response).to.have.property('ok').that.is.true;
-              expect(response).to.have.property('status').that.equals(242);
-              return expect(response.json()).to.eventually.deep.equal({
-                content: 32,
-              });
-            });
-        });
+      it('should return default response when status/headers missing', () => {
+        sendMessageStub.returns(Promise.resolve({body: '', init: {}}));
+        const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-        it('should return default response when body/init missing', () => {
-          sendMessageStub.returns(Promise.resolve({}));
-          const xhr = xhrServiceForTesting(interceptionEnabledWin);
-
-          return xhr
-            .fetch('https://www.some-url.org/some-resource/', {ampCors: false})
-            .then((response) => {
-              expect(response.headers.get('a')).to.be.null;
-              expect(response.headers.has('a')).to.be.false;
-              expect(response).to.have.property('ok').that.is.true;
-              expect(response).to.have.property('status').that.equals(200);
-              return expect(response.text()).to.eventually.be.empty;
-            });
-        });
+        return xhr
+          .fetch('https://www.some-url.org/some-resource/', {ampCors: false})
+          .then((response) => {
+            expect(response.headers.get('a')).to.be.null;
+            expect(response.headers.has('a')).to.be.false;
+            expect(response).to.have.property('status').that.equals(200);
+          });
+      });
 
-        it('should return default response when status/headers missing', () => {
-          sendMessageStub.returns(Promise.resolve({body: '', init: {}}));
-          const xhr = xhrServiceForTesting(interceptionEnabledWin);
+      it('should convert body to string', () => {
+        sendMessageStub.returns(Promise.resolve({body: 32}));
+        const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-          return xhr
-            .fetch('https://www.some-url.org/some-resource/', {ampCors: false})
-            .then((response) => {
-              expect(response.headers.get('a')).to.be.null;
-              expect(response.headers.has('a')).to.be.false;
-              expect(response).to.have.property('status').that.equals(200);
-            });
-        });
+        return xhr
+          .fetch('https://www.some-url.org/some-resource/', {ampCors: false})
+          .then((response) => {
+            return expect(response.text()).to.eventually.equal('32');
+          });
+      });
 
-        it('should convert body to string', () => {
-          sendMessageStub.returns(Promise.resolve({body: 32}));
-          const xhr = xhrServiceForTesting(interceptionEnabledWin);
+      it('should convert status to int', () => {
+        sendMessageStub.returns(Promise.resolve({init: {status: '209.6'}}));
+        const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-          return xhr
-            .fetch('https://www.some-url.org/some-resource/', {ampCors: false})
-            .then((response) => {
-              return expect(response.text()).to.eventually.equal('32');
-            });
-        });
+        return xhr
+          .fetch('https://www.some-url.org/some-resource/', {ampCors: false})
+          .then((response) => {
+            return expect(response).to.have.property('status').that.equals(209);
+          });
+      });
 
-        it('should convert status to int', () => {
-          sendMessageStub.returns(Promise.resolve({init: {status: '209.6'}}));
-          const xhr = xhrServiceForTesting(interceptionEnabledWin);
+      it('should convert headers to string', () => {
+        sendMessageStub.returns(
+          Promise.resolve({
+            init: {
+              headers: [
+                [1, true],
+                [false, NaN],
+                [undefined, null],
+              ],
+            },
+          })
+        );
+        const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-          return xhr
-            .fetch('https://www.some-url.org/some-resource/', {ampCors: false})
-            .then((response) => {
-              return expect(response)
-                .to.have.property('status')
-                .that.equals(209);
-            });
-        });
+        return xhr
+          .fetch('https://www.some-url.org/some-resource/', {ampCors: false})
+          .then((response) => {
+            expect(response.headers.get(1)).to.equal('true');
+            expect(response.headers.get('false')).to.equal('NaN');
+            expect(response.headers.get('undefined')).to.equal('null');
+          });
+      });
 
-        it('should convert headers to string', () => {
-          sendMessageStub.returns(
-            Promise.resolve({
-              init: {
-                headers: [
-                  [1, true],
-                  [false, NaN],
-                  [undefined, null],
-                ],
-              },
-            })
-          );
-          const xhr = xhrServiceForTesting(interceptionEnabledWin);
-
-          return xhr
-            .fetch('https://www.some-url.org/some-resource/', {ampCors: false})
-            .then((response) => {
-              expect(response.headers.get(1)).to.equal('true');
-              expect(response.headers.get('false')).to.equal('NaN');
-              expect(response.headers.get('undefined')).to.equal('null');
-            });
-        });
+      it('should support case-insensitive header search', () => {
+        sendMessageStub.returns(
+          Promise.resolve({
+            init: {
+              headers: [
+                ['Content-Type', 'text/plain'],
+                ['ACCEPT', 'text/plain'],
+                ['x-amp-custom', 'foo'],
+              ],
+            },
+          })
+        );
+        const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-        it('should support case-insensitive header search', () => {
-          sendMessageStub.returns(
-            Promise.resolve({
-              init: {
-                headers: [
-                  ['Content-Type', 'text/plain'],
-                  ['ACCEPT', 'text/plain'],
-                  ['x-amp-custom', 'foo'],
-                ],
-              },
-            })
-          );
-          const xhr = xhrServiceForTesting(interceptionEnabledWin);
-
-          return xhr
-            .fetch('https://www.some-url.org/some-resource/', {ampCors: false})
-            .then((response) => {
-              expect(response.headers.get('content-type')).to.equal(
-                'text/plain'
-              );
-              expect(response.headers.get('Accept')).to.equal('text/plain');
-              expect(response.headers.get('X-AMP-CUSTOM')).to.equal('foo');
-            });
-        });
+        return xhr
+          .fetch('https://www.some-url.org/some-resource/', {ampCors: false})
+          .then((response) => {
+            expect(response.headers.get('content-type')).to.equal('text/plain');
+            expect(response.headers.get('Accept')).to.equal('text/plain');
+            expect(response.headers.get('X-AMP-CUSTOM')).to.equal('foo');
+          });
       });
     });
+  });
 
-    describe('#xssiJson', () => {
-      let xhr;
-      beforeEach(() => {
-        xhr = xhrServiceForTesting(polyfillWin);
-        setupMockXhr();
-      });
+  describe('#xssiJson', () => {
+    let xhr;
+    beforeEach(() => {
+      xhr = xhrServiceForTesting(polyfillWin);
+      setupMockXhr();
+    });
 
-      it('should call response.json() if prefix is either missing or the empty string', () => {
-        xhrCreated.then((mock) => mock.respond(200, [], '{a: 1}'));
-        const response = {
-          json: () => Promise.resolve(),
-          text: () => Promise.reject(new Error('should not be called')),
-        };
+    it('should call response.json() if prefix is either missing or the empty string', () => {
+      xhrCreated.then((mock) => mock.respond(200, [], '{a: 1}'));
+      const response = {
+        json: () => Promise.resolve(),
+        text: () => Promise.reject(new Error('should not be called')),
+      };
 
-        return Promise.all([
-          xhr.xssiJson(response),
-          xhr.xssiJson(response, ''),
-        ]);
-      });
+      return Promise.all([xhr.xssiJson(response), xhr.xssiJson(response, '')]);
+    });
 
-      it('should not strip characters if the prefix is not present', () => {
-        xhrCreated.then((mock) => mock.respond(200, [], '{"a": 1}'));
-        return xhr
-          .fetchJson('/abc')
-          .then((res) => xhr.xssiJson(res, 'while(1)'))
-          .then((json) => {
-            expect(json).to.be.deep.equal({a: 1});
-          });
-      });
+    it('should not strip characters if the prefix is not present', () => {
+      xhrCreated.then((mock) => mock.respond(200, [], '{"a": 1}'));
+      return xhr
+        .fetchJson('/abc')
+        .then((res) => xhr.xssiJson(res, 'while(1)'))
+        .then((json) => {
+          expect(json).to.be.deep.equal({a: 1});
+        });
+    });
 
-      it('should strip prefix from the response text if prefix is present', () => {
-        xhrCreated.then((mock) => mock.respond(200, [], 'while(1){"a": 1}'));
-        return xhr
-          .fetchJson('/abc')
-          .then((res) => xhr.xssiJson(res, 'while(1)'))
-          .then((json) => {
-            expect(json).to.be.deep.equal({a: 1});
-          });
-      });
+    it('should strip prefix from the response text if prefix is present', () => {
+      xhrCreated.then((mock) => mock.respond(200, [], 'while(1){"a": 1}'));
+      return xhr
+        .fetchJson('/abc')
+        .then((res) => xhr.xssiJson(res, 'while(1)'))
+        .then((json) => {
+          expect(json).to.be.deep.equal({a: 1});
+        });
     });
   });
+});
diff --git a/test/unit/utils/test-close-watcher-impl.js b/test/unit/utils/test-close-watcher-impl.js
new file mode 100644
index 000000000000..fb1e1067c3aa
--- /dev/null
+++ b/test/unit/utils/test-close-watcher-impl.js
@@ -0,0 +1,80 @@
+import {Keys_Enum} from '#core/constants/key-codes';
+
+import {Services} from '#service';
+
+import {CloseWatcherImpl} from '#utils/close-watcher-impl';
+
+describes.realWin('#CloseWatcherImpl', {amp: true}, (env) => {
+  let doc, win, ampdoc;
+  let historyMock;
+  let handler;
+
+  beforeEach(() => {
+    win = env.win;
+    doc = win.document;
+    ampdoc = env.ampdoc;
+
+    const history = Services.historyForDoc(ampdoc);
+    historyMock = env.sandbox.mock(history);
+
+    handler = env.sandbox.spy();
+  });
+
+  afterEach(() => {
+    historyMock.verify();
+  });
+
+  it.configure()
+    .if(() => 'CloseWatcher' in window)
+    .run('should call the handler on requestClose', async () => {
+      const watcher = new CloseWatcherImpl(ampdoc, handler);
+      watcher.requestClose();
+      expect(handler).to.be.calledOnce;
+    });
+
+  it.configure()
+    .if(() => !('CloseWatcher' in window))
+    .run('should push and pop history state', async () => {
+      historyMock.expects('push').resolves('H1').once();
+      historyMock.expects('pop').withArgs('H1').once();
+      const watcher = new CloseWatcherImpl(ampdoc, handler);
+      await Promise.resolve('H1');
+      watcher.requestClose();
+      expect(handler).to.be.calledOnce;
+    });
+
+  it.configure()
+    .if(() => !('CloseWatcher' in window))
+    .run('should trigger on history pop', async () => {
+      let popHandler;
+      historyMock
+        .expects('push')
+        .withArgs(
+          env.sandbox.match((a) => {
+            popHandler = a;
+            return true;
+          })
+        )
+        .resolves('H1')
+        .once();
+      new CloseWatcherImpl(ampdoc, handler);
+      await Promise.resolve('H1');
+      expect(popHandler).to.exist;
+      popHandler();
+      expect(handler).to.be.calledOnce;
+    });
+
+  it.configure()
+    .if(() => !('CloseWatcher' in window))
+    .run('should trigger on ESC key', async () => {
+      historyMock.expects('push').resolves('H1').once();
+      historyMock.expects('pop').withArgs('H1').once();
+      new CloseWatcherImpl(ampdoc, handler);
+      await Promise.resolve('H1');
+
+      doc.documentElement.dispatchEvent(
+        new KeyboardEvent('keydown', {key: Keys_Enum.ESCAPE})
+      );
+      expect(handler).to.be.calledOnce;
+    });
+});
diff --git a/test/unit/utils/test-dom-transform-stream.js b/test/unit/utils/test-dom-transform-stream.js
index 330d17df9447..93d54822729f 100644
--- a/test/unit/utils/test-dom-transform-stream.js
+++ b/test/unit/utils/test-dom-transform-stream.js
@@ -1,4 +1,4 @@
-import {DomTransformStream} from '#utils/dom-tranform-stream';
+import {DomTransformStream} from '#utils/dom-transform-stream';
 
 import {macroTask} from '#testing/helpers';
 
diff --git a/test/unit/utils/test-dom-writer.js b/test/unit/utils/test-dom-writer.js
index eaf865f04a2b..e55c89cf391e 100644
--- a/test/unit/utils/test-dom-writer.js
+++ b/test/unit/utils/test-dom-writer.js
@@ -1,136 +1,133 @@
 import {DomWriterBulk, DomWriterStreamer} from '#utils/dom-writer';
 
 describes.fakeWin('DomWriterStreamer', {amp: true}, (env) => {
-  describe
-    .configure()
-    .skipFirefox()
-    .run('DomWriterStreamer', () => {
-      let win;
-      let writer;
-      let onBodySpy, onBodyChunkSpy;
-      let onBodyPromise, onBodyChunkPromiseResolver, onEndPromise;
-
-      beforeEach(() => {
-        win = env.win;
-        writer = new DomWriterStreamer(win);
-        onBodySpy = env.sandbox.spy();
-        onBodyChunkSpy = env.sandbox.spy();
-        onBodyPromise = new Promise((resolve) => {
-          writer.onBody((parsedDoc) => {
-            resolve(parsedDoc.body);
-            onBodySpy();
-            return win.document.body;
-          });
-        });
-        writer.onBodyChunk(() => {
-          if (onBodyChunkPromiseResolver) {
-            onBodyChunkPromiseResolver();
-            onBodyChunkPromiseResolver = null;
-          }
-          onBodyChunkSpy();
-        });
-        onEndPromise = new Promise((resolve) => {
-          writer.onEnd(resolve);
+  describe('DomWriterStreamer', () => {
+    let win;
+    let writer;
+    let onBodySpy, onBodyChunkSpy;
+    let onBodyPromise, onBodyChunkPromiseResolver, onEndPromise;
+
+    beforeEach(() => {
+      win = env.win;
+      writer = new DomWriterStreamer(win);
+      onBodySpy = env.sandbox.spy();
+      onBodyChunkSpy = env.sandbox.spy();
+      onBodyPromise = new Promise((resolve) => {
+        writer.onBody((parsedDoc) => {
+          resolve(parsedDoc.body);
+          onBodySpy();
+          return win.document.body;
         });
       });
+      writer.onBodyChunk(() => {
+        if (onBodyChunkPromiseResolver) {
+          onBodyChunkPromiseResolver();
+          onBodyChunkPromiseResolver = null;
+        }
+        onBodyChunkSpy();
+      });
+      onEndPromise = new Promise((resolve) => {
+        writer.onEnd(resolve);
+      });
+    });
 
-      function waitForNextBodyChunk() {
-        return new Promise((resolve) => {
-          onBodyChunkPromiseResolver = resolve;
-        });
-      }
-
-      it('should complete when writer has been closed', () => {
-        writer.close();
-        return onEndPromise.then(() => {
-          expect(onBodySpy).to.be.calledOnce;
-          env.flushVsync();
-          expect(onBodyChunkSpy).to.not.be.called;
-        });
+    function waitForNextBodyChunk() {
+      return new Promise((resolve) => {
+        onBodyChunkPromiseResolver = resolve;
+      });
+    }
+
+    it('should complete when writer has been closed', () => {
+      writer.close();
+      return onEndPromise.then(() => {
+        expect(onBodySpy).to.be.calledOnce;
+        env.flushVsync();
+        expect(onBodyChunkSpy).to.not.be.called;
       });
+    });
 
-      it('should resolve body as soon as available', () => {
-        writer.write('<body class="b">');
-        expect(onBodySpy).to.not.be.called;
-        return onBodyPromise.then((body) => {
-          expect(body.getAttribute('class')).to.equal('b');
-          expect(onBodySpy).to.be.calledOnce;
-        });
+    it('should resolve body as soon as available', () => {
+      writer.write('<body class="b">');
+      expect(onBodySpy).to.not.be.called;
+      return onBodyPromise.then((body) => {
+        expect(body.getAttribute('class')).to.equal('b');
+        expect(onBodySpy).to.be.calledOnce;
       });
+    });
 
-      it('should schedule body chunk', () => {
-        writer.write('<body>');
-        return onBodyPromise.then(() => {
+    it('should schedule body chunk', () => {
+      writer.write('<body>');
+      return onBodyPromise.then(() => {
+        expect(onBodySpy).to.be.calledOnce;
+        writer.write('<child>');
+        expect(onBodyChunkSpy).to.not.be.called;
+        return waitForNextBodyChunk().then(() => {
+          env.flushVsync();
           expect(onBodySpy).to.be.calledOnce;
-          writer.write('<child>');
-          expect(onBodyChunkSpy).to.not.be.called;
+          expect(onBodyChunkSpy).to.be.calledOnce;
+          expect(win.document.body.querySelector('child')).to.exist;
+
+          writer.write('</child><child2>');
           return waitForNextBodyChunk().then(() => {
             env.flushVsync();
-            expect(onBodySpy).to.be.calledOnce;
-            expect(onBodyChunkSpy).to.be.calledOnce;
-            expect(win.document.body.querySelector('child')).to.exist;
-
-            writer.write('</child><child2>');
-            return waitForNextBodyChunk().then(() => {
-              env.flushVsync();
-              expect(win.document.body.querySelector('child2')).to.exist;
-            });
+            expect(win.document.body.querySelector('child2')).to.exist;
           });
         });
       });
+    });
 
-      it('should schedule several body chunks together', () => {
-        writer.write('<body>');
-        return onBodyPromise.then(() => {
-          expect(onBodySpy).to.be.calledOnce;
-          writer.write('<child></child>');
-          expect(onBodyChunkSpy).to.not.be.called;
-          const promise = waitForNextBodyChunk();
-          writer.write('<child2></child2>');
-          return promise.then(() => {
-            expect(onBodyChunkSpy).to.be.calledOnce;
-            expect(win.document.body.querySelector('child')).to.exist;
-            expect(win.document.body.querySelector('child2')).to.exist;
-          });
+    it('should schedule several body chunks together', () => {
+      writer.write('<body>');
+      return onBodyPromise.then(() => {
+        expect(onBodySpy).to.be.calledOnce;
+        writer.write('<child></child>');
+        expect(onBodyChunkSpy).to.not.be.called;
+        const promise = waitForNextBodyChunk();
+        writer.write('<child2></child2>');
+        return promise.then(() => {
+          expect(onBodyChunkSpy).to.be.calledOnce;
+          expect(win.document.body.querySelector('child')).to.exist;
+          expect(win.document.body.querySelector('child2')).to.exist;
         });
       });
+    });
 
-      it('should not parse noscript as markup', () => {
-        writer.write(
-          '<body><child1></child1><noscript><child2></child2></noscript>'
-        );
-        return waitForNextBodyChunk().then(() => {
-          expect(win.document.body.querySelector('child1')).to.exist;
-          expect(win.document.body.querySelector('child2')).not.to.exist;
-          writer.write('<noscript><child3></child3></noscript>');
-          writer.write('<child4></child4>');
-          writer.close();
-          env.flushVsync();
+    it('should not parse noscript as markup', () => {
+      writer.write(
+        '<body><child1></child1><noscript><child2></child2></noscript>'
+      );
+      return waitForNextBodyChunk().then(() => {
+        expect(win.document.body.querySelector('child1')).to.exist;
+        expect(win.document.body.querySelector('child2')).not.to.exist;
+        writer.write('<noscript><child3></child3></noscript>');
+        writer.write('<child4></child4>');
+        writer.close();
+        env.flushVsync();
 
-          return onEndPromise.then(() => {
-            expect(win.document.body.querySelector('child3')).not.to.exist;
-            expect(win.document.body.querySelector('child4')).to.exist;
-          });
+        return onEndPromise.then(() => {
+          expect(win.document.body.querySelector('child3')).not.to.exist;
+          expect(win.document.body.querySelector('child4')).to.exist;
         });
       });
+    });
 
-      it('should not parse noscript as markup across writes', () => {
-        writer.write('<body><child1></child1><noscript><child2>');
-        return waitForNextBodyChunk().then(() => {
-          expect(win.document.body.querySelector('child1')).to.exist;
-          writer.write('</child2></noscript>');
-          writer.write('<child3></child3>');
-          writer.close();
-          env.flushVsync();
+    it('should not parse noscript as markup across writes', () => {
+      writer.write('<body><child1></child1><noscript><child2>');
+      return waitForNextBodyChunk().then(() => {
+        expect(win.document.body.querySelector('child1')).to.exist;
+        writer.write('</child2></noscript>');
+        writer.write('<child3></child3>');
+        writer.close();
+        env.flushVsync();
 
-          return onEndPromise.then(() => {
-            expect(win.document.body.querySelector('child1')).to.exist;
-            expect(win.document.body.querySelector('child2')).not.to.exist;
-            expect(win.document.body.querySelector('child3')).to.exist;
-          });
+        return onEndPromise.then(() => {
+          expect(win.document.body.querySelector('child1')).to.exist;
+          expect(win.document.body.querySelector('child2')).not.to.exist;
+          expect(win.document.body.querySelector('child3')).to.exist;
         });
       });
     });
+  });
 });
 
 describes.fakeWin('DomWriterBulk', {amp: true}, (env) => {
diff --git a/test/unit/utils/test-log.js b/test/unit/utils/test-log.js
index dabd369d915e..40ad9acc2ec1 100644
--- a/test/unit/utils/test-log.js
+++ b/test/unit/utils/test-log.js
@@ -6,7 +6,7 @@ import {
 
 import {
   Log,
-  LogLevel,
+  LogLevel_Enum,
   dev,
   devAssert,
   setReportError,
@@ -15,11 +15,11 @@ import {
 } from '#utils/log';
 
 describes.sandboxed('Logging', {}, (env) => {
-  const RETURNS_FINE = () => LogLevel.FINE;
-  const RETURNS_INFO = () => LogLevel.INFO;
-  const RETURNS_WARN = () => LogLevel.WARN;
-  const RETURNS_ERROR = () => LogLevel.ERROR;
-  const RETURNS_OFF = () => LogLevel.OFF;
+  const RETURNS_FINE = () => LogLevel_Enum.FINE;
+  const RETURNS_INFO = () => LogLevel_Enum.INFO;
+  const RETURNS_WARN = () => LogLevel_Enum.WARN;
+  const RETURNS_ERROR = () => LogLevel_Enum.ERROR;
+  const RETURNS_OFF = () => LogLevel_Enum.OFF;
 
   let mode;
   let win;
@@ -51,42 +51,42 @@ describes.sandboxed('Logging', {}, (env) => {
 
   describe('Level', () => {
     it('should be enabled when directly allowed', () => {
-      expect(new Log(win, RETURNS_FINE).level_).to.equal(LogLevel.FINE);
+      expect(new Log(win, RETURNS_FINE).level_).to.equal(LogLevel_Enum.FINE);
     });
 
     it('should be disabled when directly disallowed', () => {
-      expect(new Log(win, RETURNS_OFF).level_).to.equal(LogLevel.OFF);
+      expect(new Log(win, RETURNS_OFF).level_).to.equal(LogLevel_Enum.OFF);
     });
 
     it('should be disabled with no console', () => {
       win.console.log = null;
-      expect(new Log(win, RETURNS_FINE).level_).to.equal(LogLevel.OFF);
+      expect(new Log(win, RETURNS_FINE).level_).to.equal(LogLevel_Enum.OFF);
 
       win.console = null;
-      expect(new Log(win, RETURNS_FINE).level_).to.equal(LogLevel.OFF);
+      expect(new Log(win, RETURNS_FINE).level_).to.equal(LogLevel_Enum.OFF);
     });
 
     it('should be disabled with hash param log=0', () => {
       win.location.hash = '#log=0';
-      expect(new Log(win, RETURNS_FINE).level_).to.equal(LogLevel.OFF);
+      expect(new Log(win, RETURNS_FINE).level_).to.equal(LogLevel_Enum.OFF);
     });
 
     it('should be enabled when forced for tests', () => {
       mode.test = true;
       win.ENABLE_LOG = true;
-      expect(new Log(win, RETURNS_OFF).level_).to.equal(LogLevel.FINE);
+      expect(new Log(win, RETURNS_OFF).level_).to.equal(LogLevel_Enum.FINE);
     });
 
     it('should be enabled as INFO when forced for localDev', () => {
       mode.localDev = true;
-      expect(new Log(win, RETURNS_OFF).level_).to.equal(LogLevel.INFO);
+      expect(new Log(win, RETURNS_OFF).level_).to.equal(LogLevel_Enum.INFO);
     });
   });
 
   describe('Level messages', () => {
     it('should log correctly for FINE', () => {
       const log = new Log(win, RETURNS_FINE);
-      expect(log.level_).to.equal(LogLevel.FINE);
+      expect(log.level_).to.equal(LogLevel_Enum.FINE);
 
       log.fine('test-log', 'fine');
       log.info('test-log', 'info');
@@ -103,7 +103,7 @@ describes.sandboxed('Logging', {}, (env) => {
 
     it('should log correctly for INFO', () => {
       const log = new Log(win, RETURNS_INFO);
-      expect(log.level_).to.equal(LogLevel.INFO);
+      expect(log.level_).to.equal(LogLevel_Enum.INFO);
 
       log.fine('test-log', 'fine');
       log.info('test-log', 'info');
@@ -119,7 +119,7 @@ describes.sandboxed('Logging', {}, (env) => {
 
     it('should log correctly for WARN', () => {
       const log = new Log(win, RETURNS_WARN);
-      expect(log.level_).to.equal(LogLevel.WARN);
+      expect(log.level_).to.equal(LogLevel_Enum.WARN);
 
       log.fine('test-log', 'fine');
       log.info('test-log', 'info');
@@ -134,7 +134,7 @@ describes.sandboxed('Logging', {}, (env) => {
 
     it('should log correctly for ERROR', () => {
       const log = new Log(win, RETURNS_ERROR);
-      expect(log.level_).to.equal(LogLevel.ERROR);
+      expect(log.level_).to.equal(LogLevel_Enum.ERROR);
 
       log.fine('test-log', 'fine');
       log.info('test-log', 'info');
@@ -148,7 +148,7 @@ describes.sandboxed('Logging', {}, (env) => {
 
     it('should report ERROR even when OFF and coallesce messages', () => {
       const log = new Log(win, RETURNS_OFF);
-      expect(log.level_).to.equal(LogLevel.OFF);
+      expect(log.level_).to.equal(LogLevel_Enum.OFF);
       let reportedError;
       setReportError(function (e) {
         reportedError = e;
@@ -164,7 +164,7 @@ describes.sandboxed('Logging', {}, (env) => {
 
     it('should report ERROR and mark with expected flag', () => {
       const log = new Log(win, RETURNS_OFF);
-      expect(log.level_).to.equal(LogLevel.OFF);
+      expect(log.level_).to.equal(LogLevel_Enum.OFF);
       let reportedError;
       setReportError(function (e) {
         reportedError = e;
@@ -179,7 +179,7 @@ describes.sandboxed('Logging', {}, (env) => {
 
     it('should report ERROR when OFF from a single message', () => {
       const log = new Log(win, RETURNS_OFF);
-      expect(log.level_).to.equal(LogLevel.OFF);
+      expect(log.level_).to.equal(LogLevel_Enum.OFF);
       let reportedError;
       setReportError(function (e) {
         reportedError = e;
@@ -194,7 +194,7 @@ describes.sandboxed('Logging', {}, (env) => {
 
     it('should report ERROR when OFF from a single error object', () => {
       const log = new Log(win, RETURNS_OFF);
-      expect(log.level_).to.equal(LogLevel.OFF);
+      expect(log.level_).to.equal(LogLevel_Enum.OFF);
       let reportedError;
       setReportError(function (e) {
         reportedError = e;
@@ -210,28 +210,28 @@ describes.sandboxed('Logging', {}, (env) => {
 
   describe('UserLog', () => {
     it('should be WARN by default', () => {
-      expect(user().defaultLevelWithFunc_()).to.equal(LogLevel.WARN);
+      expect(user().defaultLevelWithFunc_()).to.equal(LogLevel_Enum.WARN);
     });
 
     it('should be enabled in development mode', () => {
       mode.development = true;
-      expect(user().defaultLevelWithFunc_()).to.equal(LogLevel.FINE);
+      expect(user().defaultLevelWithFunc_()).to.equal(LogLevel_Enum.FINE);
     });
 
     it('should be enabled with log=1', () => {
       win.location.hash = '#log=1';
-      expect(user().defaultLevelWithFunc_(win)).to.equal(LogLevel.FINE);
+      expect(user().defaultLevelWithFunc_(win)).to.equal(LogLevel_Enum.FINE);
     });
 
     it('should be enabled with log>1', () => {
       win.location.hash = '#log=2';
-      expect(user().defaultLevelWithFunc_(win)).to.equal(LogLevel.FINE);
+      expect(user().defaultLevelWithFunc_(win)).to.equal(LogLevel_Enum.FINE);
 
       win.location.hash = '#log=3';
-      expect(user().defaultLevelWithFunc_(win)).to.equal(LogLevel.FINE);
+      expect(user().defaultLevelWithFunc_(win)).to.equal(LogLevel_Enum.FINE);
 
       win.location.hash = '#log=4';
-      expect(user().defaultLevelWithFunc_(win)).to.equal(LogLevel.FINE);
+      expect(user().defaultLevelWithFunc_(win)).to.equal(LogLevel_Enum.FINE);
     });
 
     it('should be configured with USER suffix', () => {
@@ -241,27 +241,27 @@ describes.sandboxed('Logging', {}, (env) => {
 
   describe('DevLog', () => {
     it('should be disabled by default', () => {
-      expect(dev().defaultLevelWithFunc_()).to.equal(LogLevel.OFF);
+      expect(dev().defaultLevelWithFunc_()).to.equal(LogLevel_Enum.OFF);
     });
 
     it('should NOT be enabled in development mode', () => {
       mode.development = true;
-      expect(dev().defaultLevelWithFunc_()).to.equal(LogLevel.OFF);
+      expect(dev().defaultLevelWithFunc_()).to.equal(LogLevel_Enum.OFF);
     });
 
     it('should NOT be enabled with log=1', () => {
       win.location.hash = '#log=1';
-      expect(dev().defaultLevelWithFunc_(win)).to.equal(LogLevel.OFF);
+      expect(dev().defaultLevelWithFunc_(win)).to.equal(LogLevel_Enum.OFF);
     });
 
     it('should be enabled as INFO with log=2', () => {
       win.location.hash = '#log=2';
-      expect(dev().defaultLevelWithFunc_(win)).to.equal(LogLevel.INFO);
+      expect(dev().defaultLevelWithFunc_(win)).to.equal(LogLevel_Enum.INFO);
     });
 
     it('should be enabled as FINE with log=3', () => {
       win.location.hash = '#log=3';
-      expect(dev().defaultLevelWithFunc_(win)).to.equal(LogLevel.FINE);
+      expect(dev().defaultLevelWithFunc_(win)).to.equal(LogLevel_Enum.FINE);
     });
 
     it('should be configured with no suffix', () => {
diff --git a/test/unit/utils/test-xhr-utils.js b/test/unit/utils/test-xhr-utils.js
index f342091b85d6..b6ac5b3a051c 100644
--- a/test/unit/utils/test-xhr-utils.js
+++ b/test/unit/utils/test-xhr-utils.js
@@ -1,5 +1,3 @@
-import {dict} from '#core/types/object';
-
 import {Services} from '#service';
 
 import {
@@ -165,14 +163,14 @@ describes.sandboxed('utils/xhr-utils', {}, (env) => {
 
       await getViewerInterceptResponse(win, ampDocSingle, input, init);
 
-      const msgPayload = dict({
+      const msgPayload = {
         'originalRequest': {
           'input': 'https://www.shouldsendxhrrequesttoviewer.org',
           'init': {
             'body': {},
           },
         },
-      });
+      };
       expect(viewer.sendMessageAwaitResponse).to.have.been.calledOnceWith(
         'xhr',
         msgPayload
diff --git a/test/visual-diff/visual-tests.jsonc b/test/visual-diff/visual-tests.jsonc
index d609779f7cd8..0591434e1ee1 100644
--- a/test/visual-diff/visual-tests.jsonc
+++ b/test/visual-diff/visual-tests.jsonc
@@ -297,17 +297,6 @@
       "viewport": {"width": 400, "height": 500},
       "loading_complete_selectors": [".i-amphtml-story-loaded"]
     },
-    {
-      "url": "examples/visual-tests/amp-story/amp-story-cta-layer.html",
-      "name": "amp-story: CTA layer",
-      "viewport": {"width": 320, "height": 480},
-      "loading_complete_selectors": [
-        ".i-amphtml-story-loaded",
-        "amp-story-page#the-one-with-the-cta-layer[active]"
-      ],
-      // for page navigation
-      "loading_complete_delay_ms": 500
-    },
     {
       "url": "examples/visual-tests/amp-story/embed-mode-1.html",
       "name": "amp-story: embed mode 1",
@@ -324,10 +313,8 @@
       "url": "examples/visual-tests/amp-story/share-menu.html",
       "name": "amp-story: share menu",
       "viewport": {"width": 320, "height": 480},
-      "loading_complete_selectors": [
-        ".i-amphtml-story-loaded",
-        ".i-amphtml-story-share-menu"
-      ]
+      "interactive_tests": "examples/visual-tests/amp-story/share-menu.js",
+      "no_base_test": true
     },
     {
       // TODO(#36358, @ampproject/wg-stories): Re-enable test.
@@ -335,10 +322,8 @@
       "url": "examples/visual-tests/amp-story/info-dialog.html",
       "name": "amp-story: info dialog",
       "viewport": {"width": 320, "height": 480},
-      "loading_complete_selectors": [
-        ".i-amphtml-story-loaded",
-        ".i-amphtml-story-info-dialog"
-      ]
+      "interactive_tests": "examples/visual-tests/amp-story/info-dialog.js",
+      "no_base_test": true
     },
     {
       "url": "examples/visual-tests/amp-story/amp-story-consent.html",
@@ -351,7 +336,7 @@
       "interactive_tests": "examples/visual-tests/amp-story/amp-story-consent.js"
     },
     {
-      "url": "examples/visual-tests/amp-story/amp-story-unsupported-browser-layer.html",
+      "url": "examples/visual-tests/amp-story/amp-story-unsupported-browser-layer.html?transform=0",
       "name": "amp-story: unsupported browser",
       "viewport": {"width": 320, "height": 480},
       "loading_complete_selectors": [
@@ -394,17 +379,6 @@
       "loading_incomplete_selectors": ["[grid-area]"],
       "loading_complete_selectors": [".i-amphtml-story-loaded"]
     },
-    {
-      "url": "examples/visual-tests/amp-story/amp-story-cta-layer.html",
-      "name": "amp-story: CTA layer (desktop)",
-      "viewport": {"width": 1440, "height": 900},
-      "loading_complete_selectors": [
-        ".i-amphtml-story-loaded",
-        "amp-story-page#the-one-with-the-cta-layer[active]"
-      ],
-      // for page navigation
-      "loading_complete_delay_ms": 500
-    },
     {
       "url": "examples/visual-tests/amp-story/embed-mode-1.html",
       "name": "amp-story: embed mode 1 (desktop)",
@@ -428,7 +402,7 @@
       "interactive_tests": "examples/visual-tests/amp-story/amp-story-consent.js"
     },
     {
-      "url": "examples/visual-tests/amp-story/amp-story-unsupported-browser-layer.html",
+      "url": "examples/visual-tests/amp-story/amp-story-unsupported-browser-layer.html?transform=0",
       "name": "amp-story: unsupported browser (desktop)",
       "viewport": {"width": 1440, "height": 900},
       "loading_complete_selectors": [
@@ -474,10 +448,8 @@
       "url": "examples/visual-tests/amp-story/share-menu.rtl.html",
       "name": "amp-story: share menu (rtl)",
       "viewport": {"width": 320, "height": 480},
-      "loading_complete_selectors": [
-        ".i-amphtml-story-loaded",
-        ".i-amphtml-story-share-menu"
-      ]
+      "interactive_tests": "examples/visual-tests/amp-story/share-menu.js",
+      "no_base_test": true
     },
     {
       // TODO(#36358, @ampproject/wg-stories): Re-enable test.
@@ -485,10 +457,8 @@
       "url": "examples/visual-tests/amp-story/info-dialog.rtl.html",
       "name": "amp-story: info dialog (rtl)",
       "viewport": {"width": 320, "height": 480},
-      "loading_complete_selectors": [
-        ".i-amphtml-story-loaded",
-        ".i-amphtml-story-info-dialog"
-      ]
+      "interactive_tests": "examples/visual-tests/amp-story/info-dialog.js",
+      "no_base_test": true
     },
     {
       "url": "examples/visual-tests/amp-story/amp-story-consent.rtl.html",
@@ -648,6 +618,12 @@
       "name": "amp-form",
       "interactive_tests": "examples/visual-tests/amp-form/amp-form.js"
     },
+    {
+      "url": "examples/visual-tests/amp-form/amp-form-server-error.amp.html",
+      "name": "amp-form (server error)",
+      "interactive_tests": "examples/visual-tests/amp-form/amp-form-server-error.js",
+      "no_base_test": true
+    },
     {
       "url": "examples/visual-tests/amp-accordion/amp-accordion.html",
       "name": "amp-accordion: page loads",
@@ -759,6 +735,8 @@
       "no_base_test": true
     },
     {
+      "flaky": true,
+      // See https://app.circleci.com/pipelines/github/ampproject/amphtml/30897/workflows/f282d8cb-5906-400d-93e6-add6ae10f59b/jobs/669174
       "url": "examples/visual-tests/amp-story-player/player-amp-version.html",
       "name": "amp-story-player AMP version",
       "interactive_tests": "examples/visual-tests/amp-story-player/player-amp-version.js",
@@ -785,7 +763,7 @@
       "loading_complete_delay_ms": 2000
     },
     {
-      "url": "examples/visual-tests/amp-story/basic-transformed.html",
+      "url": "examples/visual-tests/amp-story/basic-transformed.html?transform=0",
       "name": "amp-story: basic example transformed with toolbox-optimizer",
       "viewport": {"width": 320, "height": 480},
       "loading_complete_selectors": [".i-amphtml-story-loaded"]
@@ -811,11 +789,56 @@
       "interactive_tests": "examples/visual-tests/amp-story/amp-story-page-attachment.js"
     },
     {
+      "flaky": true,
+      // See https://percy.io/ampproject/amphtml/builds/21369889/changed/1191157503?browser=chrome&browser_ids=23&subcategories=unreviewed%2Cchanges_requested&viewLayout=side-by-side&viewMode=new&width=320&widths=320%2C375
       "url": "examples/visual-tests/amp-story/amp-story-shopping.html",
       "name": "amp-story-shopping UI",
+      "viewport": {"width": 320, "height": 900},
+      "loading_complete_selectors": [".i-amphtml-story-loaded"],
+      "interactive_tests": "examples/visual-tests/amp-story/amp-story-shopping.js"
+    },
+    {
+      "flaky": true,
+      // See https://percy.io/ampproject/amphtml/builds/20456391/changed/1146414036?browser=chrome&browser_ids=23&subcategories=unreviewed%2Cchanges_requested&viewLayout=side-by-side&viewMode=new&width=320&widths=320%2C400
+      "url": "examples/visual-tests/amp-story/amp-story-shopping-rtl.html",
+      "name": "amp-story-shopping UI RTL",
+      "viewport": {"width": 320, "height": 900},
+      "loading_complete_selectors": [".i-amphtml-story-loaded"],
+      "interactive_tests": "examples/visual-tests/amp-story/amp-story-shopping.js"
+    },
+    {
+      "url": "examples/visual-tests/amp-story/amp-story-shopping-lang-de.html",
+      "name": "amp-story-shopping UI number format based on language",
       "viewport": {"width": 320, "height": 480},
+      "loading_complete_selectors": [".i-amphtml-story-loaded"]
+    },
+    {
+      "url": "examples/visual-tests/amp-story/amp-story-shopping-landscape.html",
+      "name": "amp-story-shopping UI in desktop supports landscape mode",
+      "viewport": {"width": 1500, "height": 1000},
       "loading_complete_selectors": [".i-amphtml-story-loaded"],
       "interactive_tests": "examples/visual-tests/amp-story/amp-story-shopping.js"
-    }    
+    },
+    {
+      "url": "examples/visual-tests/amp-story/amp-story-subscriptions.html",
+      "name": "amp-story-subscriptions UI",
+      "viewport": {"width": 400, "height": 800},
+      "loading_complete_selectors": ["amp-subscriptions-dialog:not([hidden])"],
+      "interactive_tests": "examples/visual-tests/amp-story/amp-story-subscriptions.js"
+    },
+    {
+      "url": "examples/visual-tests/amp-story/amp-story-custom-desktop-aspect-ratio.html",
+      "name": "amp-story: custom desktop aspect ratio",
+      "viewport": {"width": 1440, "height": 900},
+      "loading_complete_selectors": [".i-amphtml-story-loaded"]
+    },
+    {
+      "url": "examples/visual-tests/amp-story-player/player-local-story-custom-desktop-aspect-ratio.html",
+      "name": "amp-story-player: custom desktop aspect ratio",
+      "viewport": {"width": 1440, "height": 900},
+      "interactive_tests": "examples/visual-tests/amp-story-player/story-loaded.js",
+      "loading_incomplete_selectors": [".i-amphtml-story-player-loading"],
+      "no_base_test": true
+    }
   ]
 }
diff --git a/testing/amp-performance-extension/measure.js b/testing/amp-performance-extension/measure.js
index d3b84f6549ab..c70a824c1163 100644
--- a/testing/amp-performance-extension/measure.js
+++ b/testing/amp-performance-extension/measure.js
@@ -1,5 +1,5 @@
 let cumulativeLayoutShift, largestContentfulPaint, longTasks;
-let measureStarted; // eslint-disable-line no-unused-vars
+let measureStarted; // eslint-disable-line @typescript-eslint/no-unused-vars
 
 function renderMeasurement(container, label, count) {
   container./*OK*/ innerHTML += `<div class='i-amphtml-performance-line'>
diff --git a/testing/console-logging-setup.js b/testing/console-logging-setup.js
index 0b1e0f35e67a..e79ec923b5fe 100644
--- a/testing/console-logging-setup.js
+++ b/testing/console-logging-setup.js
@@ -2,6 +2,8 @@
 
 import sinon from 'sinon'; // eslint-disable-line local/no-import
 
+import {logger} from '#preact/logger';
+
 /**
  * @fileoverview Provides functions that track unexpected console errors during
  * tests and prints warnings when they are detected.
@@ -24,7 +26,7 @@ export function setTestName(name) {
 
 /**
  * Exposes the test runner object so that errors can be associated with it.
- * TODO(rsimha): Remove this after karma-runner/karma-mocha#236 is fixed.
+ * TODO(wg-infra): Remove this after karma-runner/karma-mocha#236 is fixed.
  * @param {Object} runner
  */
 export function setTestRunner(runner) {
@@ -160,3 +162,18 @@ export function maybeStubConsoleInfoLogWarn() {
     consoleInfoLogWarnSandbox.stub(console, 'warn').callsFake(() => {});
   }
 }
+
+let loggerSandbox;
+/**
+ * Used to silence "production" logs from logger
+ */
+export function stubLogger() {
+  loggerSandbox = sinon.createSandbox();
+  // Ensure we do not log anything (even if --verbose is enabled)
+  loggerSandbox.stub(logger);
+  // Ensure error logs still get reported properly:
+  logger.error.callsFake(console.error.bind(console));
+}
+export function restoreLogger() {
+  loggerSandbox?.restore();
+}
diff --git a/testing/describes.js b/testing/describes.js
index 0b8d28beb28e..e909e41aafa4 100644
--- a/testing/describes.js
+++ b/testing/describes.js
@@ -116,7 +116,7 @@ const SUB = ' ';
 let iframeCount = 0;
 
 /**
- * @const {!Object<string, function(!Object)>}
+ * @const {!{[key: string]: function(!Object)}}
  */
 const extensionsBuffer = {};
 
@@ -146,7 +146,7 @@ export let TestSpec;
  *   extensions: (!Array<string>|undefined),
  *   canonicalUrl: (string|undefined),
  *   ampdoc: (string|undefined),
- *   params: (!Object<string, string>|undefined),
+ *   params: (!{[key: string]: string}|undefined),
  * }}
  */
 export let AmpTestSpec;
@@ -229,7 +229,7 @@ export const integration = createConfigurableRunner((spec) => [
 /**
  * A repeated test within a sandboxed wrapper.
  * @param {string} name
- * @param {!Object<string, *>} variants
+ * @param {!{[key: string]: *}} variants
  * @param {function()} fn
  */
 export const repeated = createRepeatedRunner();
@@ -240,7 +240,7 @@ export const repeated = createRepeatedRunner();
 function repeatedEnv() {
   /**
    * @param {string} name
-   * @param {!Object<string, *>} variants
+   * @param {!{[key: string]: *}} variants
    * @param {function(string, *)} fn
    * @param {function(string, function())} describeFunc
    */
diff --git a/testing/fake-dom.js b/testing/fake-dom.js
index b0c85a66bbf3..6e9bce717894 100644
--- a/testing/fake-dom.js
+++ b/testing/fake-dom.js
@@ -71,6 +71,14 @@ export class FakeWindow {
     // Document.
     /** @const {!HTMLDocument} */
     this.document = self.document.implementation.createHTMLDocument('');
+    // NOTE: There was a change between chrome 119 and 120 where the above
+    // self.document.implementation.createHTMLDocument no longer inherits
+    // the baseURI of self.document. We explicitly set and force it thru
+    // a `<base>` element.
+    const base = this.document.createElement('base');
+    base.href = self.document.baseURI;
+    this.document.head.appendChild(base);
+
     Object.defineProperty(this.document, 'defaultView', {
       get: () => this,
     });
@@ -210,6 +218,9 @@ export class FakeWindow {
     /** @const */
     this.Date = window.Date;
 
+    /** @const */
+    this.performance = new FakePerformance(this);
+
     /** polyfill setTimeout. */
     this.setTimeout = function () {
       return window.setTimeout.apply(window, arguments);
@@ -325,8 +336,8 @@ class EventListeners {
         typeof captureOrOpts == 'boolean'
           ? captureOrOpts
           : typeof captureOrOpts == 'object'
-          ? captureOrOpts.capture || false
-          : false,
+            ? captureOrOpts.capture || false
+            : false,
       options: typeof captureOrOpts == 'object' ? captureOrOpts : null,
     };
   }
@@ -609,7 +620,7 @@ export class FakeHistory {
  */
 export class FakeStorage {
   constructor() {
-    /** @const {!Object<string, string>} */
+    /** @const {!{[key: string]: string}} */
     this.values = {};
 
     // Length.
@@ -672,7 +683,7 @@ export class FakeCustomElements {
     /** @type {number} */
     this.count = 0;
 
-    /** @const {!Object<string, !{prototype: !Prototype}>} */
+    /** @const {!{[key: string]: !{prototype: !Prototype}}} */
     this.elements = {};
 
     /**
@@ -751,6 +762,21 @@ export class FakeMutationObserver {
   }
 }
 
+export class FakePerformance {
+  constructor(win) {
+    /** @const */
+    this.win_ = win;
+  }
+
+  get timeOrigin() {
+    return 1;
+  }
+
+  now() {
+    return this.win_.Date.now();
+  }
+}
+
 /**
  * @param {!Object} obj
  * @return {!Object}
diff --git a/testing/helpers/cleanHtml.ts b/testing/helpers/cleanHtml.ts
new file mode 100644
index 000000000000..18cff7c3b38e
--- /dev/null
+++ b/testing/helpers/cleanHtml.ts
@@ -0,0 +1,20 @@
+/**
+ * Simple logic for cleaning attributes from html.
+ * Useful for creating "snapshots" in tests.
+ * @param html - A string of HTML
+ * @param [keepAttrs] - An optional array of attributes to keep
+ */
+export function cleanHtml(html: string, keepAttrs?: string[]): string {
+  html = html.replace(/\s([-\w]+)(="[^"]*")/g, ($0, $attr) => {
+    return keepAttrs?.includes($attr) ? $0 : '';
+  });
+
+  // Condense whitespace:
+  html = cleanWhitespace(html);
+
+  return html;
+}
+
+export function cleanWhitespace(html: string): string {
+  return html.trim().replace(/\s\s+/g, ' ');
+}
diff --git a/testing/helpers/index.js b/testing/helpers/index.js
index 545b34775ff0..e5163df2e9fa 100644
--- a/testing/helpers/index.js
+++ b/testing/helpers/index.js
@@ -3,6 +3,8 @@
  */
 let env_;
 
+/** @typedef {typeof setTimeout} SetTimeoutFunctionType */
+
 /**
  * Sets up the helper environment.
  * @param {*} env
@@ -13,22 +15,30 @@ export function configureHelpers(env) {
 
 /**
  * Returns a Promise that resolves after the specified number of milliseconds.
+ *
+ * Pass an optional alternative `setTimeout` function when using fake timers in
+ * your test environment, and you want to perform the sleep in that env.
  * @param {number} ms
+ * @param {SetTimeoutFunctionType} setTimeoutFunc
  * @return {Promise<void>}
  */
-export function sleep(ms) {
+export function sleep(ms, setTimeoutFunc = setTimeout) {
   return new Promise((resolve) => {
-    setTimeout(resolve, ms);
+    setTimeoutFunc(resolve, ms);
   });
 }
 
 /**
- * A convenient method so you can flush the event queue by doing
- * `yield macroTask()` in your test.
+ * A convenience method to flush the event queue by calling `await macroTask()`
+ * in your test.
+ *
+ * Pass an optional alternative `setTimeout` function when using fake timers in
+ * your test environment, and you want to perform the sleep in that env.
+ * @param {SetTimeoutFunctionType} setTimeoutFunc
  * @return {Promise<void>}
  */
-export function macroTask() {
-  return sleep(0);
+export function macroTask(setTimeoutFunc = setTimeout) {
+  return sleep(0, setTimeoutFunc);
 }
 
 /**
@@ -62,3 +72,66 @@ export async function awaitFrameAfter(ms) {
   await sleep(ms);
   await afterRenderPromise();
 }
+
+const VOID_ELEMENTS = new Set([
+  'AREA',
+  'BASE',
+  'BR',
+  'COL',
+  'EMBED',
+  'HR',
+  'IMG',
+  'INPUT',
+  'LINK',
+  'META',
+  'PARAM',
+  'SOURCE',
+  'TRACK',
+  'WBR',
+]);
+
+/**
+ * Returns true of node is a void element.
+ * @see https://developer.mozilla.org/en-US/docs/Glossary/Empty_element
+ *
+ * @param {Node} node
+ * @return {boolean}
+ */
+function isVoidElement(node) {
+  return (
+    node.nodeType === Node.ELEMENT_NODE && VOID_ELEMENTS.has(node.nodeName)
+  );
+}
+
+/**
+ * Returns the outerHTML for an element, but with lexicographically sorted attributes.
+ * @param {Element} node
+ * @return {string}
+ */
+export function getDeterministicOuterHTML(node) {
+  const tag = node.localName;
+  const attributes = Array.from(node.attributes)
+    .map(({name, value}) => `${name}="${value}"`)
+    .sort()
+    .join(' ');
+  const start = `<${tag} ${attributes}>`;
+  const contents = Array.from(node.childNodes).map((childNode) => {
+    if (childNode.nodeType === Node.ELEMENT_NODE) {
+      return getDeterministicOuterHTML(/** @type {Element} */ (childNode));
+    }
+    return childNode.textContent;
+  });
+
+  if (!contents && isVoidElement(node)) {
+    return start;
+  }
+  return start + contents + `</${tag}>`;
+}
+
+/**
+ * @param {string} hyphenCase camel cased string
+ * @return {string} camelCased string
+ */
+export function hypenCaseToCamelCase(hyphenCase) {
+  return hyphenCase.replace(/-./g, (match) => match.slice(1).toUpperCase());
+}
diff --git a/testing/helpers/service.js b/testing/helpers/service.js
index c03643354459..350795d60a70 100644
--- a/testing/helpers/service.js
+++ b/testing/helpers/service.js
@@ -88,25 +88,40 @@ export function waitFor(callback, errorMessage) {
   );
 }
 
-const noneValues = {
-  'animation-name': ['none', 'initial'],
-  'animation-duration': ['0s', 'initial'],
-  'animation-timing-function': ['ease', 'initial'],
-  'animation-delay': ['0s', 'initial'],
-  'animation-iteration-count': ['1', 'initial'],
-  'animation-direction': ['normal', 'initial'],
-  'animation-fill-mode': ['none', 'initial'],
-  'animation-play-state': ['running', 'initial', /* IE11 */ ''],
-};
+/**
+ * Gets the initial values of an Element's animation state.
+ * For time-based animations, auto is equivalent to a value of 0s.
+ *
+ * @param {boolean} isTimeBasedAnimation
+ */
+function getInitialNoneValues(isTimeBasedAnimation) {
+  const initialValues = {
+    'animation-name': ['none', 'initial'],
+    'animation-duration': ['0s', 'auto', 'initial'],
+    'animation-timing-function': ['ease', 'initial'],
+    'animation-delay': ['0s', 'initial'],
+    'animation-iteration-count': ['1', 'initial'],
+    'animation-direction': ['normal', 'initial'],
+    'animation-fill-mode': ['none', 'initial'],
+    'animation-play-state': ['running', 'initial', /* IE11 */ ''],
+  };
+  if (isTimeBasedAnimation) {
+    initialValues['animation-duration'].unshift('auto');
+  }
+  return initialValues;
+}
 
 /**
  * Browsers are inconsistent when accessing the value for 'animation: none'.
  * Some return 'none', some return the full shorthand, some give the full
  * shorthand in a different order.
+ *
  * @param {!Element} element
+ * @param {boolean=} opt_isTimeBasedAnimation
  * @return {boolean}
  */
-export function isAnimationNone(element) {
+export function isAnimationNone(element, opt_isTimeBasedAnimation = true) {
+  const noneValues = getInitialNoneValues(opt_isTimeBasedAnimation);
   for (const property in noneValues) {
     const value = getStyle(element, property);
     const expectedValues = noneValues[property];
@@ -365,10 +380,11 @@ export class ImagePixelVerifier {
     return this.imagePixels_.length > 0;
   }
 
-  verifyRequest(url, referrerPolicy) {
+  verifyRequest(url, referrerPolicy, attributionSrc) {
     const pixel = this.imagePixels_.shift();
     expect(pixel.src).to.equal(url);
     expect(pixel.referrerPolicy).to.equal(referrerPolicy);
+    expect(pixel.attributionSrc).to.equal(attributionSrc);
   }
 
   verifyRequestMatch(regex) {
diff --git a/testing/iframe.js b/testing/iframe.js
index 0c8fe08824c0..d96bda1ac6c4 100644
--- a/testing/iframe.js
+++ b/testing/iframe.js
@@ -1,5 +1,5 @@
 import {deserializeMessage, isAmpMessage} from '#core/3p-frame-messaging';
-import {AmpEvents} from '#core/constants/amp-events';
+import {AmpEvents_Enum} from '#core/constants/amp-events';
 
 import {install as installCustomElements} from '#polyfills/custom-elements';
 
@@ -61,13 +61,13 @@ export function createFixtureIframe(
   return new Promise((resolve, reject) => {
     // Counts the supported custom events.
     const events = {
-      [AmpEvents.ATTACHED]: 0,
-      [AmpEvents.DOM_UPDATE]: 0,
-      [AmpEvents.ERROR]: 0,
-      [AmpEvents.LOAD_END]: 0,
-      [AmpEvents.LOAD_START]: 0,
-      [AmpEvents.STUBBED]: 0,
-      [AmpEvents.UNLOAD]: 0,
+      [AmpEvents_Enum.ATTACHED]: 0,
+      [AmpEvents_Enum.DOM_UPDATE]: 0,
+      [AmpEvents_Enum.ERROR]: 0,
+      [AmpEvents_Enum.LOAD_END]: 0,
+      [AmpEvents_Enum.LOAD_START]: 0,
+      [AmpEvents_Enum.STUBBED]: 0,
+      [AmpEvents_Enum.UNLOAD]: 0,
       [BindEvents.INITIALIZE]: 0,
       [BindEvents.SET_STATE]: 0,
       [BindEvents.RESCAN_TEMPLATE]: 0,
@@ -353,7 +353,7 @@ export function createServedIframe(src) {
 }
 
 const IFRAME_STUB_URL =
-  '//ads.localhost:9876/test/fixtures/served/iframe-stub.html#';
+  '//ads.localhost:8081/test/fixtures/served/iframe-stub.html#';
 
 /**
  * Creates an iframe fixture in the given window that can be used for
diff --git a/testing/init-tests-helpers.js b/testing/init-tests-helpers.js
new file mode 100644
index 000000000000..888d33cec2fc
--- /dev/null
+++ b/testing/init-tests-helpers.js
@@ -0,0 +1,192 @@
+'use strict';
+
+// These two imports must precede all others.
+import '#polyfills';
+import './setup_chai_sinon';
+
+import {configure as configureEnzyme} from 'enzyme';
+import PreactEnzyme from 'enzyme-adapter-preact-pure';
+
+import {removeElement} from '#core/dom';
+import {resetEvtListenerOptsSupportForTesting} from '#core/dom/event-helper-listen';
+
+import {resetExperimentTogglesForTesting} from '#experiments';
+
+import {Services} from '#service';
+import {installDocService} from '#service/ampdoc-impl';
+import {
+  installAmpdocServices,
+  installRuntimeServices,
+} from '#service/core-services';
+import {cancelTimersForTesting} from '#service/timer-impl';
+
+import {preventAsyncErrorThrows} from './async-errors';
+import {
+  maybeStubConsoleInfoLogWarn,
+  restoreConsoleError,
+  restoreConsoleSandbox,
+  restoreLogger,
+  setTestName,
+  setTestRunner,
+  stubLogger,
+  warnForConsoleError,
+} from './console-logging-setup';
+import * as describes from './describes';
+import {flush as flushPreactEffects} from './preact';
+import {TestConfig} from './test-config';
+import {installYieldIt} from './yield';
+
+import AMP_CONFIG from '../build-system/global-configs/prod-config.json' assert {type: 'json'}; // lgtm[js/syntax-error]
+import {setDefaultBootstrapBaseUrlForTesting} from '../src/3p-frame';
+import {activateChunkingForTesting} from '../src/chunk';
+import {resetAccumulatedErrorMessagesForTesting} from '../src/error-reporting';
+import {adoptWithMultidocDeps} from '../src/runtime';
+
+/** @fileoverview
+ * This file initializes AMP's Karma + Mocha based unit & integration tests.
+ * TODO(wg-infra): Do a detailed inventory and remove unnecessary steps.
+ */
+
+/**
+ * Initializes the global state required by all AMP unit and integration tests.
+ */
+export function initializeTests() {
+  initializeTestConstructs();
+  exposeKarmaConfig();
+  resetTestingState();
+  overrideAmpExtensionInstaller();
+}
+
+/**
+ * Exposes Karma's config constant for use during tests. The regular test runner
+ * uses `karma`, while the debugger uses `__karma__ `.
+ */
+function exposeKarmaConfig() {
+  if (parent.karma && !parent.__karma__) {
+    parent.__karma__ = parent.karma;
+  }
+  window.ampTestRuntimeConfig = parent.__karma__
+    ? parent.__karma__.config.amp
+    : {};
+}
+
+/**
+ * Initializes the constructs with which all test cases are authored.
+ */
+function initializeTestConstructs() {
+  // Allow Mocha's it() to call yield and allow pending promises to resolve.
+  installYieldIt(it);
+
+  // Make Mocha's describe() and it() globally configurable.
+  describe.configure = () => new TestConfig(describe);
+  it.configure = () => new TestConfig(it);
+
+  // Make AMP's custom describes() globally available.
+  global.describes = describes;
+
+  // Set up Mocha's global setup / clean up functions.
+  before(overrideSkipTest);
+  beforeEach(setupTestcase);
+  afterEach(cleanupTestcase);
+}
+
+/**
+ * Overrides AMP.extension() so that extension installation is buffered and
+ * executed just when needed.
+ */
+function overrideAmpExtensionInstaller() {
+  global.AMP.extension = (name, version, installer) =>
+    describes.bufferExtension(`${name}:${version}`, installer);
+}
+
+/**
+ * Overrides skipTest() with a more robust version of `this.skip()`. See #17245.
+ */
+function overrideSkipTest() {
+  this.skipTest = function () {
+    if (!this._runnable.title.startsWith('"before all" hook')) {
+      throw new Error('skipTest() can only be called from within before()');
+    }
+    this.test.parent.pending = true; // Workaround for mochajs/mocha#2683.
+    this.skip();
+  };
+}
+
+/**
+ * Sets up the initial state required by individual test cases.
+ */
+function setupTestcase() {
+  resetTestingState();
+  setTestName(this.currentTest.fullTitle());
+  maybeStubConsoleInfoLogWarn();
+  preventAsyncErrorThrows();
+  warnForConsoleError();
+  stubLogger();
+}
+
+/**
+ * Resets AMP-specific state in the global window object.
+ */
+function resetWindowState() {
+  window.localStorage.clear();
+  window.ENABLE_LOG = false;
+  window.AMP_CONFIG = AMP_CONFIG;
+  window.AMP_DEV_MODE = false;
+  window.context = undefined;
+  window.__AMP_MODE = undefined;
+  window.__AMP_TEST = true;
+  delete window.document['__AMPDOC'];
+}
+
+/**
+ * Resets the window's testing state. Used at the start by initializeTests() and
+ * before each test case by setupTestcase().
+ */
+function resetTestingState() {
+  activateChunkingForTesting();
+  resetWindowState();
+  installDocService(window, /* isSingleDoc */ true);
+  const ampdoc = Services.ampdocServiceFor(window).getSingleDoc();
+  installRuntimeServices(window);
+  installAmpdocServices(ampdoc);
+  Services.resourcesForDoc(ampdoc).ampInitComplete();
+  adoptWithMultidocDeps(window);
+  configureEnzyme({adapter: new PreactEnzyme()});
+}
+
+/**
+ * Cleans up global state added during tests.
+ * @return {Promise<void>}
+ */
+async function cleanupTestcase() {
+  await flushPreactEffects();
+  setTestRunner(this);
+  restoreConsoleSandbox();
+  restoreAsyncErrorThrows();
+  restoreConsoleError();
+  restoreLogger();
+  cleanupTestPageElements();
+  resetWindowState();
+  setDefaultBootstrapBaseUrlForTesting(null);
+  resetAccumulatedErrorMessagesForTesting();
+  resetExperimentTogglesForTesting(window);
+  resetEvtListenerOptsSupportForTesting();
+  cancelTimersForTesting();
+}
+
+/**
+ * Cleans up any HTML elements that tests might have added to the document.
+ */
+function cleanupTestPageElements() {
+  const cleanupTagNames = ['link', 'meta', 'iframe'];
+  const cleanup = document.querySelectorAll(cleanupTagNames.join(','));
+  for (let i = 0; i < cleanup.length; i++) {
+    try {
+      const element = cleanup[i];
+      removeElement(element);
+    } catch (e) {
+      // This sometimes fails for unknown reasons.
+      console./*OK*/ log(e);
+    }
+  }
+}
diff --git a/testing/init-tests.js b/testing/init-tests.js
index f176f27feaec..fd10ba600580 100644
--- a/testing/init-tests.js
+++ b/testing/init-tests.js
@@ -1,192 +1,9 @@
 'use strict';
 
-// These two imports must precede all others.
-import '#polyfills';
-import './setup_chai_sinon';
-
-import {configure as configureEnzyme} from 'enzyme';
-import PreactEnzyme from 'enzyme-adapter-preact-pure';
-
-import {removeElement} from '#core/dom';
-import {resetEvtListenerOptsSupportForTesting} from '#core/dom/event-helper-listen';
-
-import {resetExperimentTogglesForTesting} from '#experiments';
-
-import {Services} from '#service';
-import {installDocService} from '#service/ampdoc-impl';
-import {
-  installAmpdocServices,
-  installRuntimeServices,
-} from '#service/core-services';
-import {cancelTimersForTesting} from '#service/timer-impl';
-
-import {preventAsyncErrorThrows} from './async-errors';
-import {
-  maybeStubConsoleInfoLogWarn,
-  restoreConsoleError,
-  restoreConsoleSandbox,
-  setTestName,
-  setTestRunner,
-  warnForConsoleError,
-} from './console-logging-setup';
-import * as describes from './describes';
-import {flush as flushPreactEffects} from './preact';
-import {TestConfig} from './test-config';
-import {installYieldIt} from './yield';
-
-import AMP_CONFIG from '../build-system/global-configs/prod-config.json' assert {type: 'json'}; // lgtm[js/syntax-error]
-import {setDefaultBootstrapBaseUrlForTesting} from '../src/3p-frame';
-import {activateChunkingForTesting} from '../src/chunk';
-import {resetAccumulatedErrorMessagesForTesting} from '../src/error-reporting';
-import {adoptWithMultidocDeps} from '../src/runtime';
+import {initializeTests} from './init-tests-helpers';
 
 /** @fileoverview
  * This file initializes AMP's Karma + Mocha based unit & integration tests.
- * TODO(wg-infra): Do a detailed inventory and remove unnecessary steps.
  */
 
-// This is the entry point for all AMP unit and integration tests. It should be
-// the only globally-invoked function in this file.
 initializeTests();
-
-/**
- * Initializes the global state required by all AMP unit and integration tests.
- */
-function initializeTests() {
-  initializeTestConstructs();
-  exposeKarmaConfig();
-  resetTestingState();
-  overrideAmpExtensionInstaller();
-}
-
-/**
- * Exposes Karma's config constant for use during tests. The regular test runner
- * uses `karma`, while the debugger uses `__karma__ `.
- */
-function exposeKarmaConfig() {
-  if (parent.karma && !parent.__karma__) {
-    parent.__karma__ = parent.karma;
-  }
-  window.ampTestRuntimeConfig = parent.__karma__
-    ? parent.__karma__.config.amp
-    : {};
-}
-
-/**
- * Initializes the constructs with which all test cases are authored.
- */
-function initializeTestConstructs() {
-  // Allow Mocha's it() to call yield and allow pending promises to resolve.
-  installYieldIt(it);
-
-  // Make Mocha's describe() and it() globally configurable.
-  describe.configure = () => new TestConfig(describe);
-  it.configure = () => new TestConfig(it);
-
-  // Make AMP's custom describes() globally available.
-  global.describes = describes;
-
-  // Set up Mocha's global setup / clean up functions.
-  before(overrideSkipTest);
-  beforeEach(setupTestcase);
-  afterEach(cleanupTestcase);
-}
-
-/**
- * Overrides AMP.extension() so that extension installation is buffered and
- * executed just when needed.
- */
-function overrideAmpExtensionInstaller() {
-  global.AMP.extension = (name, version, installer) =>
-    describes.bufferExtension(`${name}:${version}`, installer);
-}
-
-/**
- * Overrides skipTest() with a more robust version of `this.skip()`. See #17245.
- */
-function overrideSkipTest() {
-  this.skipTest = function () {
-    if (!this._runnable.title.startsWith('"before all" hook')) {
-      throw new Error('skipTest() can only be called from within before()');
-    }
-    this.test.parent.pending = true; // Workaround for mochajs/mocha#2683.
-    this.skip();
-  };
-}
-
-/**
- * Sets up the initial state required by individual test cases.
- */
-function setupTestcase() {
-  resetTestingState();
-  setTestName(this.currentTest.fullTitle());
-  maybeStubConsoleInfoLogWarn();
-  preventAsyncErrorThrows();
-  warnForConsoleError();
-}
-
-/**
- * Resets AMP-specific state in the global window object.
- */
-function resetWindowState() {
-  window.localStorage.clear();
-  window.ENABLE_LOG = false;
-  window.AMP_CONFIG = AMP_CONFIG;
-  window.AMP_DEV_MODE = false;
-  window.context = undefined;
-  window.__AMP_MODE = undefined;
-  window.__AMP_TEST = true;
-  delete window.document['__AMPDOC'];
-}
-
-/**
- * Resets the window's testing state. Used at the start by initializeTests() and
- * before each test case by setupTestcase().
- */
-function resetTestingState() {
-  activateChunkingForTesting();
-  resetWindowState();
-  installDocService(window, /* isSingleDoc */ true);
-  const ampdoc = Services.ampdocServiceFor(window).getSingleDoc();
-  installRuntimeServices(window);
-  installAmpdocServices(ampdoc);
-  Services.resourcesForDoc(ampdoc).ampInitComplete();
-  adoptWithMultidocDeps(window);
-  configureEnzyme({adapter: new PreactEnzyme()});
-}
-
-/**
- * Cleans up global state added during tests.
- * @return {Promise<void>}
- */
-async function cleanupTestcase() {
-  await flushPreactEffects();
-  setTestRunner(this);
-  restoreConsoleSandbox();
-  restoreConsoleError();
-  restoreAsyncErrorThrows();
-  cleanupTestPageElements();
-  resetWindowState();
-  setDefaultBootstrapBaseUrlForTesting(null);
-  resetAccumulatedErrorMessagesForTesting();
-  resetExperimentTogglesForTesting(window);
-  resetEvtListenerOptsSupportForTesting();
-  cancelTimersForTesting();
-}
-
-/**
- * Cleans up any HTML elements that tests might have added to the document.
- */
-function cleanupTestPageElements() {
-  const cleanupTagNames = ['link', 'meta', 'iframe'];
-  const cleanup = document.querySelectorAll(cleanupTagNames.join(','));
-  for (let i = 0; i < cleanup.length; i++) {
-    try {
-      const element = cleanup[i];
-      removeElement(element);
-    } catch (e) {
-      // This sometimes fails for unknown reasons.
-      console./*OK*/ log(e);
-    }
-  }
-}
diff --git a/third_party/OWNERS b/third_party/OWNERS
index d2492f5eef9b..b3d88e8a47f1 100644
--- a/third_party/OWNERS
+++ b/third_party/OWNERS
@@ -4,13 +4,7 @@
 {
   rules: [
     {
-      owners: [
-        {name: 'kristoferbaxter'},
-        {name: 'rsimha'},
-        {name: 'erwinmombay'},
-        {name: 'choumx'},
-        {name: 'jridgewell'},
-      ],
+      owners: [{name: 'erwinmombay'}, {name: 'choumx'}],
     },
   ],
 }
diff --git a/third_party/amp-toolbox-cache-url/package.json b/third_party/amp-toolbox-cache-url/package.json
index 69f257ce7c55..3dc2cddac0ee 100644
--- a/third_party/amp-toolbox-cache-url/package.json
+++ b/third_party/amp-toolbox-cache-url/package.json
@@ -28,26 +28,26 @@
   "homepage": "https://github.com/ampproject/amp-toolbox#readme",
   "files": ["dist", "package.json", "../LICENSE", "README.md"],
   "dependencies": {
-    "punycode": "2.1.1",
-    "url-parse": "1.5.3"
+    "punycode": "2.3.1",
+    "url-parse": "1.5.10"
   },
   "devDependencies": {
     "@ampproject/rollup-plugin-closure-compiler": "0.27.0",
-    "eslint": "8.1.0",
+    "eslint": "9.13.0",
     "eslint-config-google": "0.14.0",
-    "jasmine": "3.10.0",
-    "karma": "6.3.6",
-    "karma-chrome-launcher": "3.1.0",
-    "karma-jasmine": "4.0.1",
-    "npm-run-all": "4.1.5",
-    "rollup": "2.58.3",
+    "jasmine": "5.4.0",
+    "karma": "6.4.4",
+    "karma-chrome-launcher": "3.2.0",
+    "karma-jasmine": "5.1.0",
+    "npm-run-all2": "6.2.4",
+    "rollup": "4.24.0",
     "rollup-plugin-commonjs": "10.1.0",
-    "rollup-plugin-filesize": "9.1.1",
+    "rollup-plugin-filesize": "10.0.0",
     "rollup-plugin-ignore": "1.0.10",
     "rollup-plugin-json": "4.0.0",
     "rollup-plugin-node-builtins": "2.1.2",
-    "rollup-plugin-node-resolve": "5.2.0",
-    "rollup-plugin-serve": "1.1.0",
-    "semver": "7.3.5"
+    "@rollup/plugin-node-resolve": "15.3.0",
+    "rollup-plugin-serve": "3.0.0",
+    "semver": "7.6.3"
   }
 }
diff --git a/third_party/css-escape/README.amp b/third_party/css-escape/README.amp
index a07c8d754513..00b17a97c1c3 100644
--- a/third_party/css-escape/README.amp
+++ b/third_party/css-escape/README.amp
@@ -8,3 +8,4 @@ For of CSS.escape polyfill.
 Local Modifications:
 Stripped polyfill part and turn it into utility function.
 Transformed code into a regex replace function (size over speed).
+Added TypeScript definition file `css-escape.d.ts`
diff --git a/third_party/css-escape/css-escape.d.ts b/third_party/css-escape/css-escape.d.ts
new file mode 100644
index 000000000000..9d3aa039f474
--- /dev/null
+++ b/third_party/css-escape/css-escape.d.ts
@@ -0,0 +1 @@
+export function cssEscape(s: string): string;
diff --git a/third_party/mustache/compile.sh b/third_party/mustache/compile.sh
deleted file mode 100755
index 540440388041..000000000000
--- a/third_party/mustache/compile.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-# Run this file with bash to convert the mustache library from UMD to ESM
-# for inclusion into AMP.
-
-# Apply all the patches in third_party/mustache/patches/
-for patchfile in patches/*.patch
-do
-  echo "Applying patch $patchfile"
-  patch < $patchfile
-done
diff --git a/third_party/mustache/patches/0000-remove-umd-wrapper.patch b/third_party/mustache/patches/0000-remove-umd-wrapper.patch
deleted file mode 100644
index b24aba4fbef6..000000000000
--- a/third_party/mustache/patches/0000-remove-umd-wrapper.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/third_party/mustache/mustache.js b/third_party/mustache/mustache.js
-index fcc0fe678..869e4f36f 100644
---- a/third_party/mustache/mustache.js
-+++ b/third_party/mustache/mustache.js
-@@ -5,16 +5,7 @@
-
- /*global define: false Mustache: true*/
-
--(function defineMustache (global, factory) {
--  if (typeof exports === 'object' && exports && typeof exports.nodeName !== 'string') {
--    factory(exports); // CommonJS
--  } else if (typeof define === 'function' && define.amd) {
--    define(['exports'], factory); // AMD
--  } else {
--    global.Mustache = {};
--    factory(Mustache); // script, wsh, asp
--  }
--}(this, function mustacheFactory (mustache) {
-+function mustacheFactory (mustache) {
-
-   var objectToString = Object.prototype.toString;
-   var isArray = Array.isArray || function isArrayPolyfill (object) {
-@@ -649,4 +640,8 @@
-   mustache.Context = Context;
-   mustache.Writer = Writer;
-
--}));
-+};
-+
-+const Mustache = {};
-+mustacheFactory(Mustache);
-+export default Mustache;
diff --git a/third_party/optimized-svg-icons/amp-social-share-svgs.css b/third_party/optimized-svg-icons/amp-social-share-svgs.css
index 3d8ad3b53886..d818c7720a7f 100644
--- a/third_party/optimized-svg-icons/amp-social-share-svgs.css
+++ b/third_party/optimized-svg-icons/amp-social-share-svgs.css
@@ -5,45 +5,42 @@
  */
 
 .amp-social-share-facebook {
-  background-image: url('data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%20512%20512%22%3E%3Cpath%20fill%3D%22%23ffffff%22%20d%3D%22M211.9%20197.4h-36.7v59.9h36.7V433.1h70.5V256.5h49.2l5.2-59.1h-54.4c0%200%200-22.1%200-33.7%200-13.9%202.8-19.5%2016.3-19.5%2010.9%200%2038.2%200%2038.2%200V82.9c0%200-40.2%200-48.8%200%20-52.5%200-76.1%2023.1-76.1%2067.3C211.9%20188.8%20211.9%20197.4%20211.9%20197.4z%22%3E%3C%2Fpath%3E%3C%2Fsvg%3E');
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="#fff" d="M212 197h-37v60h37v176h70V257h50l5-60h-55v-33c0-14 3-20 17-20h38V83h-49c-52 0-76 23-76 67v47z"/></svg>');
 }
 
 .amp-social-share-pinterest {
-  background-image: url('data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%20512%20512%22%3E%3Cpath%20fill%3D%22%23ffffff%22%20d%3D%22M266.6%2076.5c-100.2%200-150.7%2071.8-150.7%20131.7%200%2036.3%2013.7%2068.5%2043.2%2080.6%204.8%202%209.2%200.1%2010.6-5.3%201-3.7%203.3-13%204.3-16.9%201.4-5.3%200.9-7.1-3-11.8%20-8.5-10-13.9-23-13.9-41.3%200-53.3%2039.9-101%20103.8-101%2056.6%200%2087.7%2034.6%2087.7%2080.8%200%2060.8-26.9%20112.1-66.8%20112.1%20-22.1%200-38.6-18.2-33.3-40.6%206.3-26.7%2018.6-55.5%2018.6-74.8%200-17.3-9.3-31.7-28.4-31.7%20-22.5%200-40.7%2023.3-40.7%2054.6%200%2019.9%206.7%2033.4%206.7%2033.4s-23.1%2097.8-27.1%20114.9c-8.1%2034.1-1.2%2075.9-0.6%2080.1%200.3%202.5%203.6%203.1%205%201.2%202.1-2.7%2028.9-35.9%2038.1-69%202.6-9.4%2014.8-58%2014.8-58%207.3%2014%2028.7%2026.3%2051.5%2026.3%2067.8%200%20113.8-61.8%20113.8-144.5C400.1%20134.7%20347.1%2076.5%20266.6%2076.5z%22%2F%3E%3C%2Fsvg%3E');
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="#fff" d="M267 77c-101 0-151 71-151 131 0 36 14 69 43 81 5 2 9 0 11-6l4-16c1-6 1-8-3-12-8-10-14-23-14-42 0-53 40-101 104-101 57 0 88 35 88 81 0 61-27 112-67 112-22 0-39-18-33-40 6-27 18-56 18-75 0-17-9-32-28-32-23 0-41 24-41 55 0 20 7 33 7 33l-27 115c-9 34-2 76-1 80 0 3 4 3 5 1 2-2 29-35 38-69l15-58c7 14 29 27 51 27 68 0 114-62 114-145 0-62-53-120-133-120z"/></svg>');
 }
 
 .amp-social-share-linkedin {
-  background-image: url('data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%20512%20512%22%3E%3Cpath%20fill%3D%22%23ffffff%22%20d%3D%22M186.4%20142.4c0%2019-15.3%2034.5-34.2%2034.5%20-18.9%200-34.2-15.4-34.2-34.5%200-19%2015.3-34.5%2034.2-34.5C171.1%20107.9%20186.4%20123.4%20186.4%20142.4zM181.4%20201.3h-57.8V388.1h57.8V201.3zM273.8%20201.3h-55.4V388.1h55.4c0%200%200-69.3%200-98%200-26.3%2012.1-41.9%2035.2-41.9%2021.3%200%2031.5%2015%2031.5%2041.9%200%2026.9%200%2098%200%2098h57.5c0%200%200-68.2%200-118.3%200-50-28.3-74.2-68-74.2%20-39.6%200-56.3%2030.9-56.3%2030.9v-25.2H273.8z%22%2F%3E%3C%2Fsvg%3E');
-}
-
-.amp-social-share-gplus {
-  background-image: url('data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%20512%20512%22%3E%3Cpath%20fill%3D%22%23ffffff%22%20d%3D%22M179.7%20237.6L179.7%20284.2%20256.7%20284.2C253.6%20304.2%20233.4%20342.9%20179.7%20342.9%20133.4%20342.9%2095.6%20304.4%2095.6%20257%2095.6%20209.6%20133.4%20171.1%20179.7%20171.1%20206.1%20171.1%20223.7%20182.4%20233.8%20192.1L270.6%20156.6C247%20134.4%20216.4%20121%20179.7%20121%20104.7%20121%2044%20181.8%2044%20257%2044%20332.2%20104.7%20393%20179.7%20393%20258%20393%20310%20337.8%20310%20260.1%20310%20251.2%20309%20244.4%20307.9%20237.6L179.7%20237.6%20179.7%20237.6ZM468%20236.7L429.3%20236.7%20429.3%20198%20390.7%20198%20390.7%20236.7%20352%20236.7%20352%20275.3%20390.7%20275.3%20390.7%20314%20429.3%20314%20429.3%20275.3%20468%20275.3%22%2F%3E%3C%2Fsvg%3E');
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="#fff" d="M186.4 142.4c0 19-15.3 34.5-34.2 34.5-18.9 0-34.2-15.4-34.2-34.5 0-19 15.3-34.5 34.2-34.5 18.9 0 34.2 15.5 34.2 34.5zm-5 58.9h-57.8v186.8h57.8V201.3zm92.4 0h-55.4v186.8h55.4v-98c0-26.3 12.1-41.9 35.2-41.9 21.3 0 31.5 15 31.5 41.9v98H398V269.8c0-50-28.3-74.2-68-74.2-39.6 0-56.3 30.9-56.3 30.9v-25.2h.1z"/></svg>');
 }
 
 .amp-social-share-email {
-  background-image: url('data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%20512%20512%22%3E%3Cpath%20fill%3D%22%23ffffff%22%20d%3D%22M101.3%20141.6v228.9h0.3%20308.4%200.8V141.6H101.3zM375.7%20167.8l-119.7%2091.5%20-119.6-91.5H375.7zM127.6%20194.1l64.1%2049.1%20-64.1%2064.1V194.1zM127.8%20344.2l84.9-84.9%2043.2%2033.1%2043-32.9%2084.7%2084.7L127.8%20344.2%20127.8%20344.2zM384.4%20307.8l-64.4-64.4%2064.4-49.3V307.8z%22%2F%3E%3C%2Fsvg%3E');
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="#fff" d="M101 142v229h310V142H101zm275 26-120 91-120-91h240zm-248 26 64 49-64 64V194zm0 150 85-85 43 33 43-33 85 85H128zm256-36-64-65 64-49v114z"/></svg>');
 }
 
 .amp-social-share-twitter {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="400" height="400"><g fill="none" fill-rule="evenodd"><path d="M0 0h400v400H0z"/><path fill="#FFF" fill-rule="nonzero" d="M153.62 301.59c94.34 0 145.94-78.16 145.94-145.94 0-2.22 0-4.43-.15-6.63A104.36 104.36 0 0 0 325 122.47a102.38 102.38 0 0 1-29.46 8.07 51.47 51.47 0 0 0 22.55-28.37 102.79 102.79 0 0 1-32.57 12.45c-15.9-16.906-41.163-21.044-61.625-10.093-20.461 10.95-31.032 34.266-25.785 56.873A145.62 145.62 0 0 1 92.4 107.81c-13.614 23.436-6.66 53.419 15.88 68.47A50.91 50.91 0 0 1 85 169.86v.65c.007 24.416 17.218 45.445 41.15 50.28a51.21 51.21 0 0 1-23.16.88c6.72 20.894 25.976 35.208 47.92 35.62a102.92 102.92 0 0 1-63.7 22 104.41 104.41 0 0 1-12.21-.74 145.21 145.21 0 0 0 78.62 23"/></g></svg>');
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="1200" height="1227" viewBox="0 0 1200 1227" fill="none"><path d="M714.163 519.284L1160.89 0H1055.03L667.137 450.887L357.328 0H0L468.492 681.821L0 1226.37H105.866L515.491 750.218L842.672 1226.37H1200L714.137 519.284H714.163ZM569.165 687.828L521.697 619.934L144.011 79.6944H306.615L611.412 515.685L658.88 583.579L1055.08 1150.3H892.476L569.165 687.854V687.828Z" fill="white" /></svg>');
+  background-size: 30%;
 }
 
 .amp-social-share-tumblr {
-  background-image: url('data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%20512%20512%22%3E%3Cpath%20fill%3D%22%23ffffff%22%20d%3D%22M210.8%2080.3c-2.3%2018.3-6.4%2033.4-12.4%2045.2%20-6%2011.9-13.9%2022-23.9%2030.5%20-9.9%208.5-21.8%2014.9-35.7%2019.5v50.6h38.9v124.5c0%2016.2%201.7%2028.6%205.1%2037.1%203.4%208.5%209.5%2016.6%2018.3%2024.2%208.8%207.6%2019.4%2013.4%2031.9%2017.5%2012.5%204.1%2026.8%206.1%2043%206.1%2014.3%200%2027.6-1.4%2039.9-4.3%2012.3-2.9%2026-7.9%2041.2-15v-55.9c-17.8%2011.7-35.7%2017.5-53.7%2017.5%20-10.1%200-19.1-2.4-27-7.1%20-5.9-3.5-10-8.2-12.2-14%20-2.2-5.8-3.3-19.1-3.3-39.7v-91.1H345.5v-55.8h-84.4v-90H210.8z%22%2F%3E%3C%2Fsvg%3E');
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="#fff" d="M211 80c-2 19-7 34-13 46a96 96 0 0 1-59 50v50h39v125c0 16 1 28 5 37 3 8 9 16 18 24s20 13 32 17c13 5 27 7 43 7a174 174 0 0 0 81-20v-56a97 97 0 0 1-54 18c-10 0-19-3-27-7-6-4-10-8-12-14s-3-19-3-40v-91h85v-56h-85V80h-50z"/></svg>');
 }
 
 .amp-social-share-whatsapp {
-  background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="46" height="46"><path fill="#FFF" d="M35.4 10.4C32 6.9 27.3 5 22.5 5 12.3 5 4.1 13.3 4.2 23.4c0 3.2.9 6.3 2.4 9.1L4 42l9.7-2.5c2.7 1.5 5.7 2.2 8.7 2.2 10.1 0 18.3-8.3 18.3-18.4 0-4.9-1.9-9.5-5.3-12.9zM22.5 38.6c-2.7 0-5.4-.7-7.7-2.1l-.6-.3-5.8 1.5L9.9 32l-.4-.6c-4.4-7.1-2.3-16.5 4.9-20.9 7.2-4.4 16.5-2.3 20.9 4.9 4.4 7.2 2.3 16.5-4.9 20.9-2.3 1.5-5.1 2.3-7.9 2.3zm8.8-11.1l-1.1-.5s-1.6-.7-2.6-1.2c-.1 0-.2-.1-.3-.1-.3 0-.5.1-.7.2 0 0-.1.1-1.5 1.7-.1.2-.3.3-.5.3h-.1c-.1 0-.3-.1-.4-.2l-.5-.2c-1.1-.5-2.1-1.1-2.9-1.9-.2-.2-.5-.4-.7-.6-.7-.7-1.4-1.5-1.9-2.4l-.1-.2c-.1-.1-.1-.2-.2-.4 0-.2 0-.4.1-.5 0 0 .4-.5.7-.8.2-.2.3-.5.5-.7.2-.3.3-.7.2-1-.1-.5-1.3-3.2-1.6-3.8-.2-.3-.4-.4-.7-.5h-1.1c-.2 0-.4.1-.6.1l-.1.1c-.2.1-.4.3-.6.4-.2.2-.3.4-.5.6-.7.9-1.1 2-1.1 3.1 0 .8.2 1.6.5 2.3l.1.3c.9 1.9 2.1 3.6 3.7 5.1l.4.4c.3.3.6.5.8.8 2.1 1.8 4.5 3.1 7.2 3.8.3.1.7.1 1 .2h1c.5 0 1.1-.2 1.5-.4.3-.2.5-.2.7-.4l.2-.2c.2-.2.4-.3.6-.5.2-.2.4-.4.5-.6.2-.4.3-.9.4-1.4v-.7s-.1-.1-.3-.2z"/></svg>');
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="46" height="46"><path fill="#FFF" d="M35.4 10.4a18.27 18.27 0 0 0-31.2 13c0 3.2.9 6.3 2.4 9.1L4 42l9.7-2.5c2.7 1.5 5.7 2.2 8.7 2.2a18.4 18.4 0 0 0 13-31.3zM22.5 38.6c-2.7 0-5.4-.7-7.7-2.1l-.6-.3-5.8 1.5L9.9 32l-.4-.6c-4.4-7.1-2.3-16.5 4.9-20.9 7.2-4.4 16.5-2.3 20.9 4.9 4.4 7.2 2.3 16.5-4.9 20.9-2.3 1.5-5.1 2.3-7.9 2.3zm8.8-11.1-1.1-.5s-1.6-.7-2.6-1.2c-.1 0-.2-.1-.3-.1-.3 0-.5.1-.7.2l-1.5 1.7c-.1.2-.3.3-.5.3h-.1c-.1 0-.3-.1-.4-.2l-.5-.2c-1.1-.5-2.1-1.1-2.9-1.9-.2-.2-.5-.4-.7-.6-.7-.7-1.4-1.5-1.9-2.4l-.1-.2c-.1-.1-.1-.2-.2-.4 0-.2 0-.4.1-.5 0 0 .4-.5.7-.8.2-.2.3-.5.5-.7.2-.3.3-.7.2-1-.1-.5-1.3-3.2-1.6-3.8-.2-.3-.4-.4-.7-.5h-1.1c-.2 0-.4.1-.6.1l-.1.1c-.2.1-.4.3-.6.4-.2.2-.3.4-.5.6a5.1 5.1 0 0 0-.6 5.4l.1.3c.9 1.9 2.1 3.6 3.7 5.1l.4.4c.3.3.6.5.8.8 2.1 1.8 4.5 3.1 7.2 3.8.3.1.7.1 1 .2h1c.5 0 1.1-.2 1.5-.4.3-.2.5-.2.7-.4l.2-.2c.2-.2.4-.3.6-.5.2-.2.4-.4.5-.6.2-.4.3-.9.4-1.4v-.7s-.1-.1-.3-.2z"/></svg>');
 }
 
 .amp-social-share-line {
-  background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 511.99"><defs><style>.cls-1{fill:#fff;}</style></defs><title>名称未設定-1</title><g id="レイヤー_1" data-name="レイヤー 1"><path class="cls-1" d="M443.2,233.29c0-84.14-84.35-152.6-188-152.6s-188,68.46-188,152.6c0,75.43,66.9,138.61,157.26,150.55,6.13,1.32,14.46,4,16.57,9.27,1.89,4.76,1.24,12.2.61,17,0,0-2.21,13.26-2.69,16.09-.82,4.75-3.78,18.6,16.29,10.14S363.45,372.58,402.9,327.18h0C430.15,297.29,443.2,267,443.2,233.29ZM188.82,278.21a3.67,3.67,0,0,1-3.66,3.67H132.47a3.6,3.6,0,0,1-2.53-1l-.06-.05,0-.05a3.65,3.65,0,0,1-1-2.53h0V196.29a3.66,3.66,0,0,1,3.66-3.66h13.19a3.66,3.66,0,0,1,3.66,3.66v65.07h35.84a3.66,3.66,0,0,1,3.66,3.66Zm31.8,0a3.65,3.65,0,0,1-3.66,3.65h-13.2a3.65,3.65,0,0,1-3.66-3.65V196.29a3.66,3.66,0,0,1,3.66-3.66H217a3.66,3.66,0,0,1,3.66,3.66Zm90.78,0a3.65,3.65,0,0,1-3.66,3.65H294.55a3.67,3.67,0,0,1-.94-.12h-.05l-.25-.08-.11,0-.18-.08-.17-.08-.11-.06-.22-.14,0,0a3.45,3.45,0,0,1-.93-.9L254,229.56v48.66a3.66,3.66,0,0,1-3.67,3.65H237.1a3.65,3.65,0,0,1-3.66-3.65V196.29a3.66,3.66,0,0,1,3.66-3.66h13.51l.19,0,.16,0,.21.05.13,0,.21.07.12,0a1.31,1.31,0,0,1,.21.08l.12.06.19.11a.41.41,0,0,1,.11.07l.19.13.1.07.19.16.07.07a2.28,2.28,0,0,1,.22.22l0,0a3.58,3.58,0,0,1,.28.37L290.89,245V196.29a3.66,3.66,0,0,1,3.66-3.66h13.19a3.66,3.66,0,0,1,3.66,3.66Zm72.83-68.74a3.66,3.66,0,0,1-3.65,3.67H344.74V227h35.84a3.66,3.66,0,0,1,3.65,3.67v13.19a3.65,3.65,0,0,1-3.65,3.66H344.74v13.85h35.84a3.65,3.65,0,0,1,3.65,3.66v13.19a3.66,3.66,0,0,1-3.65,3.67h-52.7a3.66,3.66,0,0,1-2.53-1l-.05-.05a.12.12,0,0,1-.05-.05,3.65,3.65,0,0,1-1-2.53h0V196.3h0a3.6,3.6,0,0,1,1-2.52l.06-.07s0,0,0,0a3.63,3.63,0,0,1,2.54-1h52.7a3.66,3.66,0,0,1,3.65,3.67Z"/></g></svg>');
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="#fff" d="M443 233c0-84-84-152-188-152S67 149 67 233c0 76 67 139 157 151 7 1 15 4 17 9s1 12 1 17l-3 16c-1 5-4 19 16 10s108-63 148-109c27-30 40-60 40-94Zm-254 45a4 4 0 0 1-4 4h-53a4 4 0 0 1-2-1 4 4 0 0 1-1-3v-82a4 4 0 0 1 4-3h13a4 4 0 0 1 3 3v65h36a4 4 0 0 1 4 4Zm32 0a4 4 0 0 1-4 4h-13a4 4 0 0 1-4-4v-82a4 4 0 0 1 4-3h13a4 4 0 0 1 4 3Zm90 0a4 4 0 0 1-3 4h-13a4 4 0 0 1-1 0h-1v-1a3 3 0 0 1-1-1l-38-50v48a4 4 0 0 1-4 4h-13a4 4 0 0 1-4-4v-82a4 4 0 0 1 4-3h16v1l38 51v-49a4 4 0 0 1 4-3h13a4 4 0 0 1 3 3Zm73-69a4 4 0 0 1-3 4h-36v14h36a4 4 0 0 1 3 4v13a4 4 0 0 1-3 4h-36v13h36a4 4 0 0 1 3 4v13a4 4 0 0 1-3 4h-53a4 4 0 0 1-3-1 4 4 0 0 1-1-3v-82a4 4 0 0 1 1-2 4 4 0 0 1 3-1h53a4 4 0 0 1 3 3Z" data-name="レイヤー 1"/></svg>');
 }
 
 .amp-social-share-sms {
-  background-image: url('data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2230px%22%20height%3D%2229px%22%20viewBox%3D%220%200%2030%2029%22%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%3E%0D%0A%20%20%20%20%3Cg%20id%3D%22Page-1%22%20stroke%3D%22none%22%20stroke-width%3D%221%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%0D%0A%20%20%20%20%20%20%20%20%3Cpolygon%20id%3D%22Path-2%22%20stroke%3D%22%23FFFFFF%22%20stroke-width%3D%223%22%20points%3D%228.73038556%2026%208.73038556%2020.3418498%202%2020.3418498%202%202%2027.9696307%202%2028%2020.3547094%2015.9383952%2020.3972827%22%3E%3C%2Fpolygon%3E%0D%0A%20%20%20%20%3C%2Fg%3E%0D%0A%3C%2Fsvg%3E');
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="30" height="29"><path fill="none" fill-rule="evenodd" stroke="#FFF" stroke-width="3" d="M8.7 26v-5.7H2V2h26v18.4H15.9z"/></svg>');
 }
 
 .amp-social-share-system {
-  background-image: url('data:image/svg+xml;charset=utf-8,%3Csvg%20fill=%22#ffffff%22%20height=%2224%22%20viewBox=%220%200%2024%2024%22%20width=%2224%22%20xmlns=%22http://www.w3.org/2000/svg%22%3E%3Cpath%20d=%22M0%200h24v24H0z%22%20fill=%22none%22/%3E%3Cpath%20d=%22M18%2016.08c-.76%200-1.44.3-1.96.77L8.91%2012.7c.05-.23.09-.46.09-.7s-.04-.47-.09-.7l7.05-4.11c.54.5%201.25.81%202.04.81%201.66%200%203-1.34%203-3s-1.34-3-3-3-3%201.34-3%203c0%20.24.04.47.09.7L8.04%209.81C7.5%209.31%206.79%209%206%209c-1.66%200-3%201.34-3%203s1.34%203%203%203c.79%200%201.5-.31%202.04-.81l7.12%204.16c-.05.21-.08.43-.08.65%200%201.61%201.31%202.92%202.92%202.92%201.61%200%202.92-1.31%202.92-2.92s-1.31-2.92-2.92-2.92z%22/%3E%3C/svg%3E');
+  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="#fff"><path fill="none" d="M0 0h24v24H0z"/><path d="M18 16.08c-.76 0-1.44.3-1.96.77L8.91 12.7c.05-.23.09-.46.09-.7s-.04-.47-.09-.7l7.05-4.11A2.99 2.99 0 0 0 21 5a3 3 0 1 0-5.91.7L8.04 9.81A2.99 2.99 0 0 0 3 12a3 3 0 0 0 5.04 2.19l7.12 4.16A2.92 2.92 0 1 0 18 16.08z"/></svg>');
 }
diff --git a/third_party/subscriptions-project/OWNERS b/third_party/subscriptions-project/OWNERS
index fb8442ea3803..5ab764df0487 100644
--- a/third_party/subscriptions-project/OWNERS
+++ b/third_party/subscriptions-project/OWNERS
@@ -5,11 +5,11 @@
   rules: [
     {
       owners: [
-        {name: 'chenshay'},
+        {name: 'alin04'},
         {name: 'chrisantaki'},
-        {name: 'dparikh'},
-        {name: 'dvoytenko'},
-        {name: 'jpettitt'},
+        {name: 'fikus'},
+        {name: 'hartmannr76'},
+        {name: 'jpettitt', notify: true},
       ],
     },
   ],
diff --git a/third_party/subscriptions-project/config.js b/third_party/subscriptions-project/config.js
index d879b5ad9597..987ffd60f63b 100644
--- a/third_party/subscriptions-project/config.js
+++ b/third_party/subscriptions-project/config.js
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/** Version: 0.1.22.192 */
+/** Version: 3579668c */
 /**
  * Copyright 2018 The Subscribe with Google Authors. All Rights Reserved.
  *
@@ -653,10 +653,10 @@ const RE_ALLOWED_TYPES = new RegExp(ALLOWED_TYPES.join('|'));
  */
 class PageConfigResolver {
   /**
-   * @param {!Window|!Document|!Doc} winOrDoc
+   * @param {!Window|!Document|!DocInterface} winOrDoc
    */
   constructor(winOrDoc) {
-    /** @private @const {!Doc} */
+    /** @private @const {!DocInterface} */
     this.doc_ = resolveDoc(winOrDoc);
 
     /** @private {?function((!PageConfig|!Promise))} */
@@ -693,13 +693,10 @@ class PageConfigResolver {
     if (!this.configResolver_) {
       return null;
     }
-    let config = this.metaParser_.check();
-    if (!config) {
-      config = this.ldParser_.check();
-    }
-    if (!config) {
-      config = this.microdataParser_.check();
-    }
+    const config =
+      this.metaParser_.check() ||
+      this.ldParser_.check() ||
+      this.microdataParser_.check();
     if (config) {
       // Product ID has been found: initialize the rest of the config.
       this.configResolver_(config);
@@ -747,20 +744,18 @@ class TypeChecker {
   }
 
   /**
-   * @param {Array<?string>} typeArray
+   * @param {!Array<?string>} typeArray
    * @param {Array<string>} expectedTypes
    * @return {boolean}
    */
   checkArray(typeArray, expectedTypes) {
-    let found = false;
-    typeArray.forEach((candidateType) => {
-      found =
-        found ||
-        expectedTypes.includes(
-          candidateType.replace(/^http:\/\/schema.org\//i, '')
-        );
-    });
-    return found;
+    for (const schemaTypeUrl of typeArray) {
+      const schemaType = schemaTypeUrl.replace(/^http:\/\/schema.org\//i, '');
+      if (expectedTypes.includes(schemaType)) {
+        return true;
+      }
+    }
+    return false;
   }
 
   /*
@@ -775,10 +770,10 @@ class TypeChecker {
 
 class MetaParser {
   /**
-   * @param {!Doc} doc
+   * @param {!DocInterface} doc
    */
   constructor(doc) {
-    /** @private @const {!Doc} */
+    /** @private @const {!DocInterface} */
     this.doc_ = doc;
   }
 
@@ -815,10 +810,10 @@ class MetaParser {
 
 class JsonLdParser {
   /**
-   * @param {!Doc} doc
+   * @param {!DocInterface} doc
    */
   constructor(doc) {
-    /** @private @const {!Doc} */
+    /** @private @const {!DocInterface} */
     this.doc_ = doc;
     /** @private @const @function */
     this.checkType_ = new TypeChecker();
@@ -917,26 +912,25 @@ class JsonLdParser {
 
   /**
    * @param {*} value
-   * @param {boolean} def
+   * @param {boolean} defaultValue
    * @return {boolean}
    */
-  bool_(value, def) {
-    if (value == null || value === '') {
-      return def;
-    }
-    if (typeof value == 'boolean') {
+  bool_(value, defaultValue) {
+    if (typeof value === 'boolean') {
       return value;
     }
-    if (typeof value == 'string') {
+
+    if (typeof value === 'string') {
       const lowercase = value.toLowerCase();
-      if (lowercase == 'false') {
+      if (lowercase === 'false') {
         return false;
       }
-      if (lowercase == 'true') {
+      if (lowercase === 'true') {
         return true;
       }
     }
-    return def;
+
+    return defaultValue;
   }
 
   /**
@@ -978,10 +972,10 @@ class JsonLdParser {
 
 class MicrodataParser {
   /**
-   * @param {!Doc} doc
+   * @param {!DocInterface} doc
    */
   constructor(doc) {
-    /** @private @const {!Doc} */
+    /** @private @const {!DocInterface} */
     this.doc_ = doc;
     /** @private {?boolean} */
     this.access_ = null;
diff --git a/third_party/subscriptions-project/swg-button.css b/third_party/subscriptions-project/swg-button.css
index 8550c3cf9cc5..63fe41c8181c 100644
--- a/third_party/subscriptions-project/swg-button.css
+++ b/third_party/subscriptions-project/swg-button.css
@@ -179,11 +179,11 @@
 .swg-button-dark:lang(it):after {
   background-image: url("https://news.google.com/swg/js/v1/i18n/b-it-dk.svg");
 }
-.swg-button:lang(jp):after,
-.swg-button-light:lang(jp):after {
+.swg-button:lang(ja):after,
+.swg-button-light:lang(ja):after {
   background-image: url("https://news.google.com/swg/js/v1/i18n/b-jp-lt.svg");
 }
-.swg-button-dark:lang(jp):after {
+.swg-button-dark:lang(ja):after {
   background-image: url("https://news.google.com/swg/js/v1/i18n/b-jp-dk.svg");
 }
 .swg-button:lang(ko):after,
@@ -242,12 +242,12 @@
 .swg-button-dark:lang(ru):after {
   background-image: url("https://news.google.com/swg/js/v1/i18n/b-ru-dk.svg");
 }
-.swg-button:lang(se):after,
-.swg-button-light:lang(se):after {
-  background-image: url("https://news.google.com/swg/js/v1/i18n/b-se-lt.svg");
+.swg-button:lang(sv):after,
+.swg-button-light:lang(sv):after {
+  background-image: url("https://news.google.com/swg/js/v1/i18n/b-sv-lt.svg");
 }
-.swg-button-dark:lang(se):after {
-  background-image: url("https://news.google.com/swg/js/v1/i18n/b-se-dk.svg");
+.swg-button-dark:lang(sv):after {
+  background-image: url("https://news.google.com/swg/js/v1/i18n/b-sv-dk.svg");
 }
 .swg-button:lang(th):after,
 .swg-button-light:lang(th):after {
@@ -270,6 +270,13 @@
 .swg-button-dark:lang(uk):after {
   background-image: url("https://news.google.com/swg/js/v1/i18n/b-uk-dk.svg");
 }
+.swg-button:lang(zh-cn):after,
+.swg-button-light:lang(zh-cn):after {
+  background-image: url("https://news.google.com/swg/js/v1/i18n/b-zh-cn-lt.svg");
+}
+.swg-button-dark:lang(zh-cn):after {
+  background-image: url("https://news.google.com/swg/js/v1/i18n/b-zh-cn-dk.svg");
+}
 .swg-button:lang(zh-tw):after,
 .swg-button-light:lang(zh-tw):after {
   background-image: url("https://news.google.com/swg/js/v1/i18n/b-zh-tw-lt.svg");
diff --git a/third_party/subscriptions-project/swg-gaa.js b/third_party/subscriptions-project/swg-gaa.js
index ea16d43e5825..ba5a6f0238bf 100644
--- a/third_party/subscriptions-project/swg-gaa.js
+++ b/third_party/subscriptions-project/swg-gaa.js
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/** Version: 0.1.22.192 */
+/** Version: 3579668c */
 /**
  * Copyright 2018 The Subscribe with Google Authors. All Rights Reserved.
  *
@@ -35,11 +35,15 @@
 
 const I18N_STRINGS = {
   'SHOWCASE_REGWALL_TITLE': {
+    'bg': 'Получавайте повече с Google',
     'bn': 'Google-এ আরও অনেক কিছুর সুবিধা পান',
     'cs': 'Získejte s&nbsp;Googlem víc',
+    'da': 'Få adgang til mere med Google',
     'de': 'Immer gut informiert mit Google',
+    'el': 'Αποκτήστε περισσότερα με την Google',
     'en': 'Get more with Google',
     'es': 'Disfruta de más artículos con Google',
+    'es-419': 'Disfruta más artículos con Google',
     'es-ar': 'Disfruta más artículos con Google',
     'fr': 'Plus de contenus avec Google',
     'fr-ca': 'Aller plus loin avec Google',
@@ -47,66 +51,100 @@ const I18N_STRINGS = {
     'it': 'Con Google puoi avere di più',
     'ja': 'Google からのプレゼント',
     'kn': 'Google ನಿಂದ ಹೆಚ್ಚಿನ ಪ್ರಯೋಜನ ಪಡೆಯಿರಿ',
+    'lt': 'Gaukite daugiau su „Google“',
+    'lv': 'Iegūstiet vairāk ar Google',
     'ml': 'Google ഉപയോഗിച്ച് കൂടുതൽ പ്രയോജനങ്ങൾ നേടൂ',
     'mr': 'Google वापरून बरेच काही मिळवा',
     'nl': 'Krijg meer met Google',
+    'pl': 'Z&nbsp;Google dostajesz więcej',
     'pt-br': 'Veja mais com o Google',
     'pt-pt': 'Obtenha mais com a Google',
+    'ro': 'Mai multe beneficii cu Google',
+    'sk': 'Získajte viac s&nbsp;Googlom',
+    'sl': 'Izkoristite več z Googlom',
+    'sv': 'Få mer med Google',
     'ta': 'Google மூலம் மேலும் பல கட்டுரைகளைப் படியுங்கள்',
     'te': 'Googleతో మరిన్ని ప్రయోజనాలను పొందండి',
   },
   'SHOWCASE_REGWALL_DESCRIPTION': {
+    'bg': '<strong></strong>За съдържанието обикновено се изисква плащане, но Google ви дава достъп без парично заплащане до тази и други статии, когато се регистрирате за <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> с профила си в Google.',
     'bn': '<strong></strong>এই কন্টেন্ট অ্যাক্সেস করার জন্য সাধারণত পেমেন্ট করতে হয় কিন্তু Google আপনাকে এই নিবন্ধ ফ্রিতে অ্যাক্সেস করতে এবং সেইসাথে অনেক কিছু পেতে সাহায্য করছে। এই সুবিধা পাওয়ার জন্য Google অ্যাকাউন্ট ব্যবহার করে আপনাকে <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph>-এ রেজিস্টার করতে হবে।',
     'cs': '<strong></strong>Tento obsah je obvykle zpoplatněn, ale pokud se do publikace <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> zaregistrujete pomocí účtu Google, získáte od Googlu přístup zdarma.',
+    'da': '<strong></strong>Du skal normalt betale for at få adgang til dette indhold, men hvis du tilmelder dig <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> med din Google-konto, giver Google dig gratis adgang til artiklen og andet indhold.',
     'de': '<strong></strong>Dieser Inhalt ist normalerweise kostenpflichtig. Google gewährt dir jedoch kostenlos Zugriff auf diesen Artikel und andere Inhalte, wenn du dich mit deinem Google-Konto bei <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> registrierst.',
+    'el': '<strong></strong>Συνήθως απαιτείται πληρωμή για αυτό το περιεχόμενο, αλλά η Google σας προσφέρει πρόσβαση χωρίς χρέωση σε αυτό το άρθρο και σε πολλά ακόμη, εάν εγγραφείτε στην έκδοση <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> με χρήση του Λογαριασμού σας Google.',
     'en': '<strong></strong>This content usually requires payment, but Google is giving you free access to this article and more when you register with <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> using your Google Account.',
     'es': '<strong></strong>Normalmente, es necesario pagar para ver este contenido, pero Google te ofrece acceso gratuito a este y otros artículos si te registras en <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> con tu cuenta de Google.',
+    'es-419':
+      '<strong></strong>Normalmente, es necesario pagar para ver este contenido, pero Google te ofrece acceso gratuito a este y otros artículos si te registras en <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> con tu Cuenta&nbsp;de&nbsp;Google.',
     'es-ar':
       '<strong></strong>Normalmente, es necesario pagar para ver este contenido, pero Google te ofrece acceso gratuito a este y otros artículos si te registras en <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> con tu Cuenta&nbsp;de&nbsp;Google.',
     'fr': '<strong></strong>Ce contenu est généralement payant, mais vous pouvez lire cet article et d\'autres contenus gratuitement grâce à Google en vous inscrivant sur <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> avec votre compte Google.',
     'fr-ca':
       '<strong></strong>Ce contenu est généralement payant, mais Google vous offre un accès gratuit à cet article et à d\'autres si vous vous inscrivez à <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> à l\'aide de votre compte Google.',
-    'hi': '<strong></strong>इस कॉन्टेंट को पढ़ने के लिए पैसे चुकाने पड़ते हैं, लेकिन आप Google की मदद से इस लेख और अन्य कॉन्टेंट को मुफ़्त में पढ़ सकते हैं. इसके लिए, आपको Google खाते का इस्तेमाल करके, <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> में रजिस्टर करना होगा.',
-    'it': '<strong></strong>Generalmente questi contenuti sono a pagamento, ma Google ti offre accesso gratuito a questo articolo e ad altri articoli se ti registri a <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> usando il tuo Account Google.',
+    'hi': '<strong></strong>आम तौर पर, इस कॉन्टेंट को पढ़ने के लिए पैसे चुकाने पड़ते हैं. हालांकि, Google की मदद से, इस लेख और अन्य कॉन्टेंट को मुफ़्त में ऐक्सेस किया जा सकता है. इसके लिए, आपको Google खाते का इस्तेमाल करके, <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> में रजिस्टर करना होगा.',
+    'it': '<strong></strong>Generalmente questi contenuti sono a pagamento, ma Google ti offre accesso gratuito a questo e ad altri articoli se ti registri a <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> usando il tuo Account Google.',
     'ja': '<strong></strong>通常、この記事をお読みいただくにはお支払いが必要ですが、お使いの Google アカウントで <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> に登録すると、この記事を無料でお読みいただけます。',
     'kn': '<strong></strong>ಸಾಮಾನ್ಯವಾಗಿ ಈ ವಿಷಯಕ್ಕಾಗಿ ಹಣ ಪಾವತಿಸಬೇಕಾಗುತ್ತದೆ, ಆದರೆ ನೀವು <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> ಗೆ ನಿಮ್ಮ Google ಖಾತೆಯ ಮೂಲಕ ನೋಂದಾಯಿಸಿಕೊಂಡಾಗ Google ಈ ಲೇಖನ ಮತ್ತು ಇನ್ನಷ್ಟು ವಿಷಯಗಳಿಗೆ ನಿಮಗೆ ಉಚಿತವಾದ ಪ್ರವೇಶವನ್ನು ನೀಡುತ್ತದೆ.',
+    'lt': '<strong></strong>Šis turinys paprastai yra mokamas, tačiau „Google“ suteikia jums prieigą prie šio straipsnio ir kt. be papildomo mokesčio, kai užsiregistruojate „<ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph>“ naudodami savo „Google“ paskyrą.',
+    'lv': '<strong></strong>Parasti šis ir maksas saturs, taču Google piešķirs jums bezmaksas piekļuvi šim un citiem rakstiem, ja reģistrēsieties izdevumam <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> ar savu Google kontu.',
     'ml': '<strong></strong>സാധാരണ ഈ ഉള്ളടക്കത്തിന് പണം നൽകേണ്ടതുണ്ട്, എന്നാൽ Google അക്കൗണ്ട് ഉപയോഗിച്ച് <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> എന്നതിൽ രജിസ്‌റ്റർ ചെയ്യുമ്പോൾ, ഈ ലേഖനത്തിലേക്കും മറ്റും Google നിങ്ങൾക്ക് സൗജന്യ ആക്‌സസ് നൽകുന്നു.',
     'mr': '<strong></strong>या आशयासाठी सामान्यतः पेमेंट आवश्यक असते पण तुम्ही तुमचे Google खाते वापरून <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> मध्ये नोंदणी करता तेव्हा, Google तुम्हाला या लेखाचा आणि आणखी बऱ्याच आशयाचा विनामूल्य ॲक्सेस देते.',
     'nl': '<strong></strong>Voor deze content moet je eigenlijk betalen. Maar Google geeft je kosteloos toegang tot dit artikel en andere content als je je registreert bij <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> via je Google-account.',
+    'pl': '<strong></strong>Te treści zazwyczaj wymagają opłaty, ale dzięki Google możesz bezpłatnie przeczytać ten artykuł i&nbsp;korzystać z&nbsp;innych materiałów po zarejestrowaniu się w&nbsp;publikacji <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> za pomocą konta Google.',
     'pt-br':
-      '<strong></strong>Normalmente, é preciso pagar por este conteúdo. Porém, basta você se registrar na publicação <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> usando sua Conta do Google para ter acesso gratuito a esta matéria e muito mais.',
+      '<strong></strong>Normalmente, é preciso pagar por este conteúdo. Porém, basta você se registrar na publicação <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> usando sua Conta do Google para ter acesso a esta matéria e muito mais sem custos financeiros.',
     'pt-pt':
       '<strong></strong>Geralmente, este conteúdo requer um pagamento, mas a Google concede-lhe acesso gratuito a este artigo e muito mais ao registar-se na publicação <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> com a sua Conta Google.',
+    'ro': '<strong></strong>Acest conținut este de obicei cu plată, dar Google vă oferă acces fără costuri la acest articol și la altele când vă înregistrați la <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> folosind Contul Google.',
+    'sk': '<strong></strong>Tento obsah je obvykle platený, ale ak sa do publikácie <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> zaregistrujete účtom Google, získate od Googlu bezplatný prístup k&nbsp;tomuto článku a&nbsp;ďalšie výhody.',
+    'sl': '<strong></strong>Za to vsebino je običajno zahtevano plačilo, vendar vam Google omogoča dostop do tega članka in drugega brez stroškov, če se z računom Google registrirate pri publikaciji <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph>.',
+    'sv': '<strong></strong>Det krävs vanligtvis betalning för det här innehållet, men Google ger dig gratis åtkomst till artikeln och annat innehåll när du registrerar dig hos <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> med ditt Google-konto.',
     'ta': '<strong></strong>வழக்கமாக இந்த உள்ளடக்கத்தை வாசிக்க கட்டணம் செலுத்த வேண்டியிருக்கும். ஆனால் <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> இல் உங்கள் Google கணக்கைப் பயன்படுத்திப் பதிவுசெய்யும்போது இந்தக் கட்டுரைக்கும் மேலும் பலவற்றுக்கும் Google இலவச அணுகலை வழங்குகிறது.',
     'te': '<strong></strong>ఈ కంటెంట్‌కు మీరు సాధారణంగా పేమెంట్ చేయాల్సి ఉంటుంది, కానీ మీరు Google ఖాతాను ఉపయోగించి <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph>తో రిజిస్టర్ చేసుకున్నప్పుడు, ఈ వార్తా కథనానికి ఇంకా మరెన్నో వాటికి Google, ఉచిత యాక్సెస్‌ను ఇస్తుంది.',
   },
   'SHOWCASE_REGWALL_PUBLISHER_SIGN_IN_BUTTON': {
-    'bn': 'আপনার কি আগে থেকেই অ্যাকাউন্ট আছে?',
-    'cs': 'Už máte účet?',
-    'de': 'Du hast bereits ein Konto?',
-    'en': 'Already have an account?',
-    'es': '¿Ya tienes una cuenta?',
+    'bg': 'Вече сте се регистрирали? Вход',
+    'bn': 'আগে থেকেই রেজিস্টার করেছেন? সাইন-ইন করুন',
+    'cs': 'Jste už zaregistrováni? Přihlásit se',
+    'da': 'Er du allerede tilmeldt? Log ind',
+    'de': 'Bereits registriert? Anmelden',
+    'el': 'Έχετε εγγραφεί ήδη; Σύνδεση',
+    'en': 'Already registered? Sign in',
+    'es': '¿Ya te has registrado? Iniciar sesión',
+    'es-419': '¿Ya te registraste? Accede',
     'es-ar': '¿Ya tienes una cuenta?',
-    'fr': 'Vous avez déjà un compte&nbsp;?',
-    'fr-ca': 'Vous avez déjà un compte?',
-    'hi': 'क्या आपके पास पहले से कोई प्रकाशक खाता है?',
-    'it': 'Hai già un account?',
-    'ja': 'すでにアカウントをお持ちですか？',
-    'kn': 'ಈಗಾಗಲೇ ಖಾತೆಯೊಂದನ್ನು ಹೊಂದಿದ್ದೀರಾ?',
-    'ml': 'മുമ്പേ അക്കൗണ്ടുണ്ടോ?',
-    'mr': 'आधीपासून खाते आहे?',
-    'nl': 'Heb je al een account?',
-    'pt-br': 'Já tem uma conta?',
-    'pt-pt': 'Já tem uma conta?',
-    'ta': 'ஏற்கெனவே கணக்கு உள்ளதா?',
-    'te': 'ఇప్పటికే ఖాతా ఉందా?',
+    'fr': 'Déjà inscrit&nbsp;? Connectez-vous',
+    'fr-ca': 'Déjà inscrit? Se connecter',
+    'hi': 'पहले से रजिस्टर किया हुआ है? साइन इन करें',
+    'it': 'Hai già effettuato la registrazione? Accedi',
+    'ja': '登録済みの方: ログイン',
+    'kn': 'ಈಗಾಗಲೇ ನೋಂದಾಯಿಸಲಾಗಿದೆಯೇ? ಸೈನ್ ಇನ್',
+    'lt': 'Jau užsiregistravote? Prisijungti',
+    'lv': 'Vai esat jau reģistrējies? Pierakstīties',
+    'ml': 'മുമ്പേ രജിസ്റ്റർ ചെയ്തിട്ടുണ്ടോ? സൈൻ ഇൻ ചെയ്യുക',
+    'mr': 'आधीपासून नोंदणी केली आहे का? साइन इन करा',
+    'nl': 'Al geregistreerd? Inloggen',
+    'pl': 'Jesteś już zarejestrowanym użytkownikiem? Zaloguj się',
+    'pt-br': 'Já se inscreveu? Fazer login',
+    'pt-pt': 'Já fez o seu registo? Inicie sessão',
+    'ro': 'V-ați înregistrat deja? Conectați-vă',
+    'sk': 'Už máte zaregistrovaný účet? Prihlásiť sa',
+    'sl': 'Ste že registrirani? Prijavite se.',
+    'sv': 'Har du redan registrerat dig? Logga in',
+    'ta': 'ஏற்கெனவே பதிவுசெய்துள்ளீர்களா? உள்நுழைக',
+    'te': 'ఇప్పటికే రిజిస్టర్ చేయబడి ఉందా? సైన్ ఇన్ చేయండి',
   },
   'SHOWCASE_REGWALL_GOOGLE_SIGN_IN_BUTTON': {
+    'bg': 'Вход с Google',
     'bn': 'Google দিয়ে সাইন-ইন করুন',
     'cs': 'Přihlásit se přes Google',
+    'da': 'Log ind med Google',
     'de': 'Über Google anmelden',
+    'el': 'Σύνδεση μέσω Google',
     'en': 'Sign in with Google',
     'es': 'Iniciar sesión con Google',
+    'es-419': 'Acceder con Google',
     'es-ar': 'Acceder con Google',
     'fr': 'Se connecter avec Google',
     'fr-ca': 'Se connecter avec Google',
@@ -114,39 +152,361 @@ const I18N_STRINGS = {
     'it': 'Accedi con Google',
     'ja': 'Google でログイン',
     'kn': 'Google ಖಾತೆ ಬಳಸಿಕೊಂಡು ಸೈನ್ ಇನ್ ಮಾಡಿ',
+    'lt': 'Prisijunkite su „Google“',
+    'lv': 'Pierakstīties, izmantojot Google',
     'ml': 'Google ഉപയോഗിച്ച് സൈൻ ഇൻ ചെയ്യുക',
     'mr': 'Google वापरून साइन इन करा',
     'nl': 'Inloggen met Google',
+    'pl': 'Zaloguj się przez Google',
     'pt-br': 'Fazer login com o Google',
     'pt-pt': 'Iniciar sessão com o Google',
+    'ro': 'Conectați-vă cu Google',
+    'sk': 'Prihlásiť sa účtom Google',
+    'sl': 'Prijavite se z Googlom',
+    'sv': 'Logga in med Google',
     'ta': 'Google மூலம் உள்நுழைக',
     'te': 'Googleతో సైన్ ఇన్ చేయండి',
   },
   'SHOWCASE_REGWALL_CASL': {
-    'bn': 'Review <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph>\'s <ph name="LINK_START"><ex>&lt;a&gt;</ex></ph>CASL terms<ph name="LINK_END"><ex>&lt;/a&gt;</ex></ph>',
+    'bg': 'Прегледайте <ph name="LINK_START"><ex>&lt;a&gt;</ex></ph>Общите условия за канадското законодателство за борба със спама<ph name="LINK_END"><ex>&lt;/a&gt;</ex></ph> на <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph>',
+    'bn': '<ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph>-এর <ph name="LINK_START"><ex>&lt;a&gt;</ex></ph>CASL শর্ত<ph name="LINK_END"><ex>&lt;/a&gt;</ex></ph> পর্যালোচনা করুন',
     'cs': 'Prostudujte si <ph name="LINK_START"><ex>&lt;a&gt;</ex></ph>podmínky CASL<ph name="LINK_END"><ex>&lt;/a&gt;</ex></ph> publikace <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph>',
+    'da': 'Gennemgå <ph name="LINK_START"><ex>&lt;a&gt;</ex></ph>CASL-vilkårene<ph name="LINK_END"><ex>&lt;/a&gt;</ex></ph> (Canadian Anti-Spam Legislation, canadisk lovgivning vedrørende antispam) for <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph>',
     'de': '<ph name="LINK_START"><ex>&lt;a&gt;</ex></ph>CASL-Bedingungen<ph name="LINK_END"><ex>&lt;/a&gt;</ex></ph> von <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> ansehen',
+    'el': 'Ελέγξτε αν τηρούνται στη δημοσίευση <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> οι <ph name="LINK_START"><ex>&lt;a&gt;</ex></ph>Όροι CASL<ph name="LINK_END"><ex>&lt;/a&gt;</ex></ph>',
     'en': 'Review <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph>\'s <ph name="LINK_START"><ex>&lt;a&gt;</ex></ph>CASL terms<ph name="LINK_END"><ex>&lt;/a&gt;</ex></ph>',
-    'es': 'Review <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph>\'s <ph name="LINK_START"><ex>&lt;a&gt;</ex></ph>CASL terms<ph name="LINK_END"><ex>&lt;/a&gt;</ex></ph>',
+    'es': 'Consulta los <ph name="LINK_START"><ex>&lt;a&gt;</ex></ph>términos de la CASL<ph name="LINK_END"><ex>&lt;/a&gt;</ex></ph> de <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph>',
+    'es-419':
+      'Consulta las <ph name="LINK_START"><ex>&lt;a&gt;</ex></ph>condiciones de CASL<ph name="LINK_END"><ex>&lt;/a&gt;</ex></ph> de <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph>',
     'fr': 'Consultez les <ph name="LINK_START"><ex>&lt;a&gt;</ex></ph>Conditions d\'utilisation LCAP (Loi canadienne anti-pourriel)<ph name="LINK_END"><ex>&lt;/a&gt;</ex></ph> de <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph>',
     'fr-ca':
       'Consulter les <ph name="LINK_START"><ex>&lt;a&gt;</ex></ph>conditions d\'utilisation relatives à la Loi canadienne antipourriel (LCAP)<ph name="LINK_END"><ex>&lt;/a&gt;</ex></ph> de la publication <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph>',
     'hi': '<ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> की <ph name="LINK_START"><ex>&lt;a&gt;</ex></ph>सीएएसएल (कैनेडियन एंटी-स्पैम लेजिस्लेशन) से जुड़ी शर्तों<ph name="LINK_END"><ex>&lt;/a&gt;</ex></ph> के बारे में पढ़ें',
     'it': 'Rileggi i <ph name="LINK_START"><ex>&lt;a&gt;</ex></ph>termini della legge CASL<ph name="LINK_END"><ex>&lt;/a&gt;</ex></ph> di <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph>',
     'ja': '<ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> の <ph name="LINK_START"><ex>&lt;a&gt;</ex></ph>CASL 規約<ph name="LINK_END"><ex>&lt;/a&gt;</ex></ph>を見る',
-    'kn': 'Review <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph>\'s <ph name="LINK_START"><ex>&lt;a&gt;</ex></ph>CASL terms<ph name="LINK_END"><ex>&lt;/a&gt;</ex></ph>',
-    'ml': 'Review <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph>\'s <ph name="LINK_START"><ex>&lt;a&gt;</ex></ph>CASL terms<ph name="LINK_END"><ex>&lt;/a&gt;</ex></ph>',
-    'mr': 'Review <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph>\'s <ph name="LINK_START"><ex>&lt;a&gt;</ex></ph>CASL terms<ph name="LINK_END"><ex>&lt;/a&gt;</ex></ph>',
+    'kn': '<ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> ನ <ph name="LINK_START"><ex>&lt;a&gt;</ex></ph>CASL ನಿಯಮಗಳು<ph name="LINK_END"><ex>&lt;/a&gt;</ex></ph> ಅನ್ನು ಪರಿಶೀಲಿಸಿ',
+    'lt': 'Peržiūrėkite „<ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph>“ <ph name="LINK_START"><ex>&lt;a&gt;</ex></ph>CASL sąlygas<ph name="LINK_END"><ex>&lt;/a&gt;</ex></ph>',
+    'lv': 'Pārskatīt <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> <ph name="LINK_START"><ex>&lt;a&gt;</ex></ph>CASL noteikumus<ph name="LINK_END"><ex>&lt;/a&gt;</ex></ph>',
+    'ml': '<ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> എന്നതിന്റെ <ph name="LINK_START"><ex>&lt;a&gt;</ex></ph>CASL നിബന്ധനകൾ<ph name="LINK_END"><ex>&lt;/a&gt;</ex></ph> അവലോകനം ചെയ്യുക',
+    'mr': '<ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> च्या <ph name="LINK_START"><ex>&lt;a&gt;</ex></ph>CASL अटी<ph name="LINK_END"><ex>&lt;/a&gt;</ex></ph> यांचे पुनरावलोकन करा',
     'nl': 'Bekijk de <ph name="LINK_START"><ex>&lt;a&gt;</ex></ph>CASL-voorwaarden<ph name="LINK_END"><ex>&lt;/a&gt;</ex></ph> van <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph>',
+    'pl': 'Zapoznaj się z&nbsp;<ph name="LINK_START"><ex>&lt;a&gt;</ex></ph>warunkami CASL<ph name="LINK_END"><ex>&lt;/a&gt;</ex></ph> publikacji <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph>',
     'pt-br':
       'Confira os <ph name="LINK_START"><ex>&lt;a&gt;</ex></ph>termos da CASL<ph name="LINK_END"><ex>&lt;/a&gt;</ex></ph> da publicação <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph>',
     'pt-pt':
       'Analise os <ph name="LINK_START"><ex>&lt;a&gt;</ex></ph>termos da CASL<ph name="LINK_END"><ex>&lt;/a&gt;</ex></ph> da publicação <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph>',
+    'ro': 'Examinați <ph name="LINK_START"><ex>&lt;a&gt;</ex></ph>Termenii CASL<ph name="LINK_END"><ex>&lt;/a&gt;</ex></ph> ai <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph>',
+    'sk': 'Prečítajte si <ph name="LINK_START"><ex>&lt;a&gt;</ex></ph>podmienky CASL<ph name="LINK_END"><ex>&lt;/a&gt;</ex></ph> publikácie <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph>',
+    'sl': 'Preglejte <ph name="LINK_START"><ex>&lt;a&gt;</ex></ph>pogoje CASL<ph name="LINK_END"><ex>&lt;/a&gt;</ex></ph> za publikacijo <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph>',
+    'sv': 'Läs <ph name="LINK_START"><ex>&lt;a&gt;</ex></ph>villkoren i lagstiftningen CASL<ph name="LINK_END"><ex>&lt;/a&gt;</ex></ph> för <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph>',
     'ta': '<ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph> இன் <ph name="LINK_START"><ex>&lt;a&gt;</ex></ph>CASL விதிமுறைகளைப்<ph name="LINK_END"><ex>&lt;/a&gt;</ex></ph> பாருங்கள்',
-    'te': 'Review <ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph>\'s <ph name="LINK_START"><ex>&lt;a&gt;</ex></ph>CASL terms<ph name="LINK_END"><ex>&lt;/a&gt;</ex></ph>',
+    'te': '<ph name="PUBLICATION"><ex>AP News</ex>{publication}</ph>‌కు సంబంధించిన <ph name="LINK_START"><ex>&lt;a&gt;</ex></ph>CASL నియమాల<ph name="LINK_END"><ex>&lt;/a&gt;</ex></ph>ను రివ్యూ చేయండి',
   },
 };
 
+/**
+ * Copyright 2018 The Subscribe with Google Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Debug logger, only log message if #swg.log=1
+ * @param {...*} var_args [decription]
+ */
+
+/* eslint-disable */
+
+function debugLog(var_args) {
+  if (/swg.debug=1/.test(self.location.hash)) {
+    const logArgs = Array.prototype.slice.call(arguments, 0);
+    logArgs.unshift('[Subscriptions]');
+    log.apply(log, logArgs);
+  }
+}
+
+/**
+ * @param  {...*} var_args [description]
+ */
+function log(var_args) {
+  console.log.apply(console, arguments);
+}
+
+/**
+ * @param  {...*} var_args [description]
+ */
+function warn(var_args) {
+  console.warn.apply(console, arguments);
+}
+
+/**
+ * Throws an error if the first argument isn't trueish.
+ *
+ * Supports argument substitution into the message via %s placeholders.
+ *
+ * Throws an error object that has two extra properties:
+ * - associatedElement: This is the first element provided in the var args.
+ *   It can be used for improved display of error messages.
+ * - messageArray: The elements of the substituted message as non-stringified
+ *   elements in an array. When e.g. passed to console.error this yields
+ *   native displays of things like HTML elements.
+ *
+ * @param {T} shouldBeTrueish The value to assert. The assert fails if it does
+ *     not evaluate to true.
+ * @param {string=} message The assertion message
+ * @param {...*} var_args Arguments substituted into %s in the message.
+ * @return {T} The value of shouldBeTrueish.
+ * @template T
+ */
+function assert(shouldBeTrueish, message, var_args) {
+  let firstElement;
+  if (!shouldBeTrueish) {
+    message = message || 'Assertion failed';
+    const splitMessage = message.split('%s');
+    const first = splitMessage.shift();
+    let formatted = first;
+    const messageArray = [];
+    pushIfNonEmpty(messageArray, first);
+    for (let i = 2; i < arguments.length; i++) {
+      const val = arguments[i];
+      if (val && val.tagName) {
+        firstElement = val;
+      }
+      const nextConstant = splitMessage.shift();
+      messageArray.push(val);
+      pushIfNonEmpty(messageArray, nextConstant.trim());
+      formatted += toString(val) + nextConstant;
+    }
+    const e = new Error(formatted);
+    e.fromAssert = true;
+    e.associatedElement = firstElement;
+    e.messageArray = messageArray;
+    throw e;
+  }
+  return shouldBeTrueish;
+}
+
+/**
+ * @param {!Array} array
+ * @param {*} val
+ */
+function pushIfNonEmpty(array, val) {
+  if (val != '') {
+    array.push(val);
+  }
+}
+
+function toString(val) {
+  // Do check equivalent to `val instanceof Element` without cross-window bug
+  if (val && val.nodeType == 1) {
+    return val.tagName.toLowerCase() + (val.id ? '#' + val.id : '');
+  }
+  return /** @type {string} */ (val);
+}
+
+/**
+ * Copyright 2018 The Subscribe with Google Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Character mapping from base64url to base64.
+ * @const {!Object<string, string>}
+ */
+const base64UrlDecodeSubs = {'-': '+', '_': '/'};
+
+/**
+ * Converts a string which holds 8-bit code points, such as the result of atob,
+ * into a Uint8Array with the corresponding bytes.
+ * If you have a string of characters, you probably want to be using utf8Encode.
+ * @param {string} str
+ * @return {!Uint8Array}
+ */
+function stringToBytes(str) {
+  const bytes = new Uint8Array(str.length);
+  for (let i = 0; i < str.length; i++) {
+    const charCode = str.charCodeAt(i);
+    assert(charCode <= 255, 'Characters must be in range [0,255]');
+    bytes[i] = charCode;
+  }
+  return bytes;
+}
+
+/**
+ * Converts a 8-bit bytes array into a string
+ * @param {!Uint8Array} bytes
+ * @return {string}
+ */
+function bytesToString(bytes) {
+  // Intentionally avoids String.fromCharCode.apply so we don't suffer a
+  // stack overflow. #10495, https://jsperf.com/bytesToString-2
+  const array = new Array(bytes.length);
+  for (let i = 0; i < bytes.length; i++) {
+    array[i] = String.fromCharCode(bytes[i]);
+  }
+  return array.join('');
+}
+
+/**
+ * Interpret a byte array as a UTF-8 string.
+ * @param {!Uint8Array} bytes
+ * @return {string}
+ */
+function utf8DecodeSync(bytes) {
+  if (typeof TextDecoder !== 'undefined') {
+    return new TextDecoder('utf-8').decode(bytes);
+  }
+  const asciiString = bytesToString(new Uint8Array(bytes));
+  return decodeURIComponent(escape(asciiString));
+}
+
+/**
+ * Converts a string which is in base64url encoding into a Uint8Array
+ * containing the decoded value.
+ * @param {string} str
+ * @return {!Uint8Array}
+ */
+function base64UrlDecodeToBytes(str) {
+  const encoded = atob(str.replace(/[-_]/g, (ch) => base64UrlDecodeSubs[ch]));
+  return stringToBytes(encoded);
+}
+
+/**
+ * Copyright 2018 The Subscribe with Google Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @fileoverview This module declares JSON types as defined in the
+ * {@link http://json.org/}.
+ */
+
+/**
+ * Simple wrapper around JSON.parse that casts the return value
+ * to JsonObject.
+ * Create a new wrapper if an array return value is desired.
+ * @param {*} json JSON string to parse
+ * @return {?JsonObject|undefined} May be extend to parse arrays.
+ */
+function parseJson(json) {
+  return /** @type {?JsonObject} */ (JSON.parse(/** @type {string} */ (json)));
+}
+
+/**
+ * Parses the given `json` string without throwing an exception if not valid.
+ * Returns `undefined` if parsing fails.
+ * Returns the `Object` corresponding to the JSON string when parsing succeeds.
+ * @param {*} json JSON string to parse
+ * @param {function(!Error)=} onFailed Optional function that will be called
+ *     with the error if parsing fails.
+ * @return {?JsonObject|undefined} May be extend to parse arrays.
+ */
+function tryParseJson(json, onFailed) {
+  try {
+    return parseJson(json);
+  } catch (e) {
+    if (onFailed) {
+      onFailed(e);
+    }
+    return undefined;
+  }
+}
+
+/**
+ * Copyright 2018 The Subscribe with Google Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Provides helper methods to decode and verify JWT tokens.
+ */
+class JwtHelper {
+  constructor() {}
+
+  /**
+   * Decodes JWT token and returns its payload.
+   * @param {string} encodedToken
+   * @return {?JsonObject|undefined}
+   */
+  decode(encodedToken) {
+    return this.decodeInternal_(encodedToken).payload;
+  }
+
+  /**
+   * @param {string} encodedToken
+   * @return {!JwtTokenInternalDef}
+   * @private
+   */
+  decodeInternal_(encodedToken) {
+    // See https://jwt.io/introduction/
+    /**
+     * Throws error about invalid token.
+     */
+    function invalidToken() {
+      throw new Error(`Invalid token: "${encodedToken}"`);
+    }
+
+    // Encoded token has three parts: header.payload.sig
+    // Note! The padding is not allowed by JWT spec:
+    // http://self-issued.info/docs/draft-goland-json-web-token-00.html#rfc.section.5
+    const parts = encodedToken.split('.');
+    if (parts.length != 3) {
+      invalidToken();
+    }
+    const headerUtf8Bytes = base64UrlDecodeToBytes(parts[0]);
+    const payloadUtf8Bytes = base64UrlDecodeToBytes(parts[1]);
+    return {
+      header: tryParseJson(utf8DecodeSync(headerUtf8Bytes), invalidToken),
+      payload: tryParseJson(utf8DecodeSync(payloadUtf8Bytes), invalidToken),
+      verifiable: `${parts[0]}.${parts[1]}`,
+      sig: parts[2],
+    };
+  }
+}
+
 /**
  * Copyright 2018 The Subscribe with Google Authors. All Rights Reserved.
  *
@@ -191,6 +551,26 @@ const AnalyticsEvent = {
   IMPRESSION_SWG_SUBSCRIPTION_MINI_PROMPT: 24,
   IMPRESSION_SWG_CONTRIBUTION_MINI_PROMPT: 25,
   IMPRESSION_CONTRIBUTION_OFFERS: 26,
+  IMPRESSION_TWG_COUNTER: 27,
+  IMPRESSION_TWG_SITE_SUPPORTER_WALL: 28,
+  IMPRESSION_TWG_PUBLICATION: 29,
+  IMPRESSION_TWG_STATIC_BUTTON: 30,
+  IMPRESSION_TWG_DYNAMIC_BUTTON: 31,
+  IMPRESSION_TWG_STICKER_SELECTION_SCREEN: 32,
+  IMPRESSION_TWG_PUBLICATION_NOT_SET_UP: 33,
+  IMPRESSION_REGWALL_OPT_IN: 34,
+  IMPRESSION_NEWSLETTER_OPT_IN: 35,
+  IMPRESSION_SUBSCRIPTION_OFFERS_ERROR: 36,
+  IMPRESSION_CONTRIBUTION_OFFERS_ERROR: 37,
+  IMPRESSION_TWG_SHORTENED_STICKER_FLOW: 38,
+  IMPRESSION_SUBSCRIPTION_LINKING_LOADING: 39,
+  IMPRESSION_SUBSCRIPTION_LINKING_COMPLETE: 40,
+  IMPRESSION_SUBSCRIPTION_LINKING_ERROR: 41,
+  IMPRESSION_SURVEY: 42,
+  IMPRESSION_REGWALL_ERROR: 43,
+  IMPRESSION_NEWSLETTER_ERROR: 44,
+  IMPRESSION_SURVEY_ERROR: 45,
+  IMPRESSION_METER_TOAST_ERROR: 46,
   ACTION_SUBSCRIBE: 1000,
   ACTION_PAYMENT_COMPLETE: 1001,
   ACTION_ACCOUNT_CREATED: 1002,
@@ -230,7 +610,51 @@ const AnalyticsEvent = {
   ACTION_SHOWCASE_REGWALL_EXISTING_ACCOUNT_CLICK: 1036,
   ACTION_SUBSCRIPTION_OFFERS_CLOSED: 1037,
   ACTION_CONTRIBUTION_OFFERS_CLOSED: 1038,
+  ACTION_TWG_STATIC_CTA_CLICK: 1039,
+  ACTION_TWG_DYNAMIC_CTA_CLICK: 1040,
+  ACTION_TWG_SITE_LEVEL_SUPPORTER_WALL_CTA_CLICK: 1041,
+  ACTION_TWG_DIALOG_SUPPORTER_WALL_CTA_CLICK: 1042,
+  ACTION_TWG_COUNTER_CLICK: 1043,
+  ACTION_TWG_SITE_SUPPORTER_WALL_ALL_THANKS_CLICK: 1044,
+  ACTION_TWG_PAID_STICKER_SELECTED_SCREEN_CLOSE_CLICK: 1045,
+  ACTION_TWG_PAID_STICKER_SELECTION_CLICK: 1046,
+  ACTION_TWG_FREE_STICKER_SELECTION_CLICK: 1047,
+  ACTION_TWG_MINI_SUPPORTER_WALL_CLICK: 1048,
+  ACTION_TWG_CREATOR_BENEFIT_CLICK: 1049,
+  ACTION_TWG_FREE_TRANSACTION_START_NEXT_BUTTON_CLICK: 1050,
+  ACTION_TWG_PAID_TRANSACTION_START_NEXT_BUTTON_CLICK: 1051,
+  ACTION_TWG_STICKER_SELECTION_SCREEN_CLOSE_CLICK: 1052,
+  ACTION_TWG_ARTICLE_LEVEL_SUPPORTER_WALL_CTA_CLICK: 1053,
+  ACTION_REGWALL_OPT_IN_BUTTON_CLICK: 1054,
+  ACTION_REGWALL_ALREADY_OPTED_IN_CLICK: 1055,
+  ACTION_NEWSLETTER_OPT_IN_BUTTON_CLICK: 1056,
+  ACTION_NEWSLETTER_ALREADY_OPTED_IN_CLICK: 1057,
+  ACTION_REGWALL_OPT_IN_CLOSE: 1058,
+  ACTION_NEWSLETTER_OPT_IN_CLOSE: 1059,
+  ACTION_SHOWCASE_REGWALL_SIWG_CLICK: 1060,
+  ACTION_TWG_CHROME_APP_MENU_ENTRY_POINT_CLICK: 1061,
+  ACTION_TWG_DISCOVER_FEED_MENU_ENTRY_POINT_CLICK: 1062,
+  ACTION_SHOWCASE_REGWALL_3P_BUTTON_CLICK: 1063,
+  ACTION_SUBSCRIPTION_OFFERS_RETRY: 1064,
+  ACTION_CONTRIBUTION_OFFERS_RETRY: 1065,
+  ACTION_TWG_SHORTENED_STICKER_FLOW_STICKER_SELECTION_CLICK: 1066,
+  ACTION_INITIATE_UPDATED_SUBSCRIPTION_LINKING: 1067,
+  ACTION_SURVEY_SUBMIT_CLICK: 1068,
+  ACTION_SURVEY_CLOSED: 1069,
+  ACTION_SURVEY_DATA_TRANSFER: 1070,
+  ACTION_REGWALL_PAGE_REFRESH: 1071,
+  ACTION_NEWSLETTER_PAGE_REFRESH: 1072,
+  ACTION_SURVEY_PAGE_REFRESH: 1073,
+  ACTION_METER_TOAST_PAGE_REFRESH: 1074,
   EVENT_PAYMENT_FAILED: 2000,
+  EVENT_REGWALL_OPT_IN_FAILED: 2001,
+  EVENT_NEWSLETTER_OPT_IN_FAILED: 2002,
+  EVENT_REGWALL_ALREADY_OPT_IN: 2003,
+  EVENT_NEWSLETTER_ALREADY_OPT_IN: 2004,
+  EVENT_SUBSCRIPTION_LINKING_FAILED: 2005,
+  EVENT_SURVEY_ALREADY_SUBMITTED: 2006,
+  EVENT_SURVEY_SUBMIT_FAILED: 2007,
+  EVENT_SURVEY_DATA_TRANSFER_FAILED: 2008,
   EVENT_CUSTOM: 3000,
   EVENT_CONFIRM_TX_ID: 3001,
   EVENT_CHANGED_TX_ID: 3002,
@@ -246,6 +670,22 @@ const AnalyticsEvent = {
   EVENT_UNLOCKED_FREE_PAGE: 3012,
   EVENT_INELIGIBLE_PAYWALL: 3013,
   EVENT_UNLOCKED_FOR_CRAWLER: 3014,
+  EVENT_TWG_COUNTER_VIEW: 3015,
+  EVENT_TWG_SITE_SUPPORTER_WALL_VIEW: 3016,
+  EVENT_TWG_STATIC_BUTTON_VIEW: 3017,
+  EVENT_TWG_DYNAMIC_BUTTON_VIEW: 3018,
+  EVENT_TWG_PRE_TRANSACTION_PRIVACY_SETTING_PRIVATE: 3019,
+  EVENT_TWG_POST_TRANSACTION_SETTING_PRIVATE: 3020,
+  EVENT_TWG_PRE_TRANSACTION_PRIVACY_SETTING_PUBLIC: 3021,
+  EVENT_TWG_POST_TRANSACTION_SETTING_PUBLIC: 3022,
+  EVENT_REGWALL_OPTED_IN: 3023,
+  EVENT_NEWSLETTER_OPTED_IN: 3024,
+  EVENT_SHOWCASE_METERING_INIT: 3025,
+  EVENT_DISABLE_MINIPROMPT_DESKTOP: 3026,
+  EVENT_SUBSCRIPTION_LINKING_SUCCESS: 3027,
+  EVENT_SURVEY_SUBMITTED: 3028,
+  EVENT_LINK_ACCOUNT_SUCCESS: 3029,
+  EVENT_SAVE_SUBSCRIPTION_SUCCESS: 3030,
   EVENT_SUBSCRIPTION_STATE: 4000,
 };
 /** @enum {number} */
@@ -259,29 +699,6 @@ const EventOriginator = {
   SHOWCASE_CLIENT: 6,
 };
 
-/**
- * Copyright 2018 The Subscribe with Google Authors. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS-IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * @param  {...*} var_args [description]
- */
-function warn(var_args) {
-  console.warn.apply(console, arguments);
-}
-
 /**
  * Copyright 2018 The Subscribe with Google Authors. All Rights Reserved.
  *
@@ -314,62 +731,6 @@ function map(initial) {
   return obj;
 }
 
-/**
- * Implements `Array.find()` method that's not yet available in all browsers.
- *
- * @param {?Array<T>} array
- * @param {function(T, number, !Array<T>):boolean} predicate
- * @return {?T}
- * @template T
- */
-function findInArray(array, predicate) {
-  if (!array) {
-    return null;
-  }
-  const len = array.length || 0;
-  if (len > 0) {
-    for (let i = 0; i < len; i++) {
-      const other = array[i];
-      if (predicate(other, i, array)) {
-        return other;
-      }
-    }
-  }
-  return null;
-}
-
-/**
- * Copyright 2018 The Subscribe with Google Authors. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS-IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * @fileoverview This module declares JSON types as defined in the
- * {@link http://json.org/}.
- */
-
-/**
- * Simple wrapper around JSON.parse that casts the return value
- * to JsonObject.
- * Create a new wrapper if an array return value is desired.
- * @param {*} json JSON string to parse
- * @return {?JsonObject|undefined} May be extend to parse arrays.
- */
-function parseJson(json) {
-  return /** @type {?JsonObject} */ (JSON.parse(/** @type {string} */ (json)));
-}
-
 /**
  * Copyright 2018 The Subscribe with Google Authors. All Rights Reserved.
  *
@@ -472,12 +833,6 @@ function parseUrl(url) {
 function parseUrlWithA(a, url) {
   a.href = url;
 
-  // IE11 doesn't provide full URL components when parsing relative URLs.
-  // Assigning to itself again does the trick.
-  if (!a.protocol) {
-    a.href = a.href;
-  }
-
   /** @type {!LocationDef} */
   const info = {
     href: a.href,
@@ -488,33 +843,15 @@ function parseUrlWithA(a, url) {
     pathname: a.pathname,
     search: a.search,
     hash: a.hash,
-    origin: '', // Set below.
+    origin: a.protocol + '//' + a.host,
   };
 
-  // Some IE11 specific polyfills.
-  // 1) IE11 strips out the leading '/' in the pathname.
-  if (info.pathname[0] !== '/') {
-    info.pathname = '/' + info.pathname;
-  }
-
-  // 2) For URLs with implicit ports, IE11 parses to default ports while
-  // other browsers leave the port field empty.
-  if (
-    (info.protocol == 'http:' && info.port == 80) ||
-    (info.protocol == 'https:' && info.port == 443)
-  ) {
-    info.port = '';
-    info.host = info.hostname;
-  }
-
   // For data URI a.origin is equal to the string 'null' which is not useful.
   // We instead return the actual origin which is the full URL.
-  if (a.origin && a.origin != 'null') {
+  if (a.origin && a.origin !== 'null') {
     info.origin = a.origin;
-  } else if (info.protocol == 'data:' || !info.host) {
+  } else if (info.protocol === 'data:' || !info.host) {
     info.origin = info.href;
-  } else {
-    info.origin = info.protocol + '//' + info.host;
   }
   return info;
 }
@@ -676,11 +1013,308 @@ function getLanguageCodeFromElement(element) {
  * @param {string} prefix
  * @return {boolean}
  */
-function startsWith(string, prefix) {
-  if (prefix.length > string.length) {
-    return false;
-  }
-  return string.lastIndexOf(prefix, 0) == 0;
+function startsWith(string, prefix) {
+  if (prefix.length > string.length) {
+    return false;
+  }
+  return string.lastIndexOf(prefix, 0) == 0;
+}
+
+/**
+ * Copyright 2018 The Subscribe with Google Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @type {Object<string, string>} */
+let propertyNameCache;
+
+/** @const {!Array<string>} */
+const vendorPrefixes = ['Webkit', 'webkit', 'Moz', 'moz', 'ms', 'O', 'o'];
+
+/**
+ * @param {string} camelCase camel cased string
+ * @return {string} title cased string
+ */
+function camelCaseToTitleCase(camelCase) {
+  return camelCase.charAt(0).toUpperCase() + camelCase.slice(1);
+}
+
+/**
+ * Checks the style if a prefixed version of a property exists and returns
+ * it or returns an empty string.
+ * @private
+ * @param {!Object} style
+ * @param {string} titleCase the title case version of a css property name
+ * @return {string} the prefixed property name or null.
+ */
+function getVendorJsPropertyName_(style, titleCase) {
+  for (let i = 0; i < vendorPrefixes.length; i++) {
+    const propertyName = vendorPrefixes[i] + titleCase;
+    if (style[propertyName] !== undefined) {
+      return propertyName;
+    }
+  }
+  return '';
+}
+
+/**
+ * Returns the possibly prefixed JavaScript property name of a style property
+ * (ex. WebkitTransitionDuration) given a camelCase'd version of the property
+ * (ex. transitionDuration).
+ * @param {!Object} style
+ * @param {string} camelCase the camel cased version of a css property name
+ * @param {boolean=} bypassCache bypass the memoized cache of property
+ *   mapping
+ * @return {string}
+ */
+function getVendorJsPropertyName(style, camelCase, bypassCache) {
+  if (startsWith(camelCase, '--')) {
+    // CSS vars are returned as is.
+    return camelCase;
+  }
+  if (!propertyNameCache) {
+    propertyNameCache = map();
+  }
+  let propertyName = propertyNameCache[camelCase];
+  if (!propertyName || bypassCache) {
+    propertyName = camelCase;
+    if (style[camelCase] === undefined) {
+      const titleCase = camelCaseToTitleCase(camelCase);
+      const prefixedPropertyName = getVendorJsPropertyName_(style, titleCase);
+
+      if (style[prefixedPropertyName] !== undefined) {
+        propertyName = prefixedPropertyName;
+      }
+    }
+    if (!bypassCache) {
+      propertyNameCache[camelCase] = propertyName;
+    }
+  }
+  return propertyName;
+}
+
+/**
+ * Sets the CSS styles of the specified element with !important. The styles
+ * are specified as a map from CSS property names to their values.
+ * @param {!Element} element
+ * @param {!Object<string, string|number>} styles
+ */
+function setImportantStyles(element, styles) {
+  for (const k in styles) {
+    element.style.setProperty(
+      getVendorJsPropertyName(styles, k),
+      styles[k].toString(),
+      'important'
+    );
+  }
+}
+
+/**
+ * Sets the CSS style of the specified element with optional units, e.g. "px".
+ * @param {Element} element
+ * @param {string} property
+ * @param {?string|number|boolean} value
+ * @param {string=} units
+ * @param {boolean=} bypassCache
+ */
+function setStyle(element, property, value, units, bypassCache) {
+  const propertyName = getVendorJsPropertyName(
+    element.style,
+    property,
+    bypassCache
+  );
+  if (propertyName) {
+    element.style[propertyName] = /** @type {string} */ (
+      units ? value + units : value
+    );
+  }
+}
+
+/**
+ * Sets the CSS styles of the specified element. The styles
+ * a specified as a map from CSS property names to their values.
+ * @param {!Element} element
+ * @param {!Object<string, ?string|number|boolean>} styles
+ */
+function setStyles(element, styles) {
+  for (const k in styles) {
+    setStyle(element, k, styles[k]);
+  }
+}
+
+/**
+ * Copyright 2018 The Subscribe with Google Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @const {string} */
+const styleType = 'text/css';
+
+/**
+ * Add attributes to an element.
+ * @param {!Element} element
+ * @param {!Object<string, string|number|boolean|!Object<string, string|number|boolean>>} attributes
+ * @return {!Element} updated element.
+ */
+function addAttributesToElement(element, attributes) {
+  for (const attr in attributes) {
+    if (attr == 'style') {
+      setStyles(
+        element,
+        /** @type {!Object<string, string|boolean|number>} */
+        (attributes[attr])
+      );
+    } else {
+      element.setAttribute(
+        attr,
+        /** @type {string|boolean|number} */ (attributes[attr])
+      );
+    }
+  }
+  return element;
+}
+
+/**
+ * Create a new element on document with specified tagName and attributes.
+ * @param {!Document} doc
+ * @param {string} tagName
+ * @param {!Object<string, string>} attributes
+ * @param {?(string|!Node|!ArrayLike<!Node>|!Array<!Node>)=} content
+ * @return {!Element} created element.
+ */
+function createElement(doc, tagName, attributes, content) {
+  const element = doc.createElement(tagName);
+  addAttributesToElement(element, attributes);
+  if (content != null) {
+    if (typeof content == 'string') {
+      element.textContent = content;
+    } else if (content.nodeType) {
+      element.appendChild(/** @type {!Node} */ (content));
+    } else if ('length' in content) {
+      for (let i = 0; i < content.length; i++) {
+        element.appendChild(content[i]);
+      }
+    } else {
+      assert(false, 'Unsupported content: %s', content);
+    }
+  }
+  return element;
+}
+
+/**
+ * Injects the provided styles in the HEAD section of the document.
+ * @param {!../model/doc.Doc} doc The document object.
+ * @param {string} styleText The style string.
+ * @return {!Element}
+ */
+function injectStyleSheet(doc, styleText) {
+  const styleElement = createElement(doc.getWin().document, 'style', {
+    'type': styleType,
+  });
+  styleElement.textContent = styleText;
+  doc.getHead().appendChild(styleElement);
+  return styleElement;
+}
+
+/**
+ * Copyright 2018 The Subscribe with Google Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @param {!Document} doc
+ * @return {string}
+ */
+function getReadyState(doc) {
+  return /** @type {string} */ (doc['readyState']);
+}
+
+/**
+ * Whether the document is ready.
+ * @param {!Document} doc
+ * @return {boolean}
+ */
+function isDocumentReady(doc) {
+  const readyState = getReadyState(doc);
+  return readyState != 'loading' && readyState != 'uninitialized';
+}
+
+/**
+ * Calls the callback when document is ready.
+ * @param {!Document} doc
+ * @param {function(!Document)} callback
+ */
+function onDocumentReady(doc, callback) {
+  onDocumentState(doc, isDocumentReady, callback);
+}
+
+/**
+ * Calls the callback once when document's state satisfies the condition.
+ * @param {!Document} doc
+ * @param {function(!Document):boolean} condition
+ * @param {function(!Document)} callback
+ */
+function onDocumentState(doc, condition, callback) {
+  if (condition(doc)) {
+    // Execute callback right now.
+    callback(doc);
+    return;
+  }
+
+  // Execute callback (once!) after condition is satisfied.
+  let callbackHasExecuted = false;
+  const readyListener = () => {
+    if (condition(doc) && !callbackHasExecuted) {
+      callback(doc);
+      callbackHasExecuted = true;
+      doc.removeEventListener('readystatechange', readyListener);
+    }
+  };
+  doc.addEventListener('readystatechange', readyListener);
+}
+
+/**
+ * Returns a promise that is resolved when document is ready.
+ * @param {!Document} doc
+ * @return {!Promise<!Document>}
+ */
+function whenDocumentReady(doc) {
+  return new Promise((resolve) => {
+    onDocumentReady(doc, resolve);
+  });
 }
 
 /**
@@ -699,88 +1333,81 @@ function startsWith(string, prefix) {
  * limitations under the License.
  */
 
-/** @type {Object<string, string>} */
-let propertyNameCache;
+/** @implements {Doc} */
+class GlobalDoc {
+  /**
+   * @param {!Window|!Document} winOrDoc
+   */
+  constructor(winOrDoc) {
+    const isWin = !!winOrDoc.document;
+    /** @private @const {!Window} */
+    this.win_ = /** @type {!Window} */ (
+      isWin
+        ? /** @type {!Window} */ (winOrDoc)
+        : /** @type {!Document} */ (winOrDoc).defaultView
+    );
+    /** @private @const {!Document} */
+    this.doc_ = isWin
+      ? /** @type {!Window} */ (winOrDoc).document
+      : /** @type {!Document} */ (winOrDoc);
+  }
 
-/** @const {!Array<string>} */
-const vendorPrefixes = ['Webkit', 'webkit', 'Moz', 'moz', 'ms', 'O', 'o'];
+  /** @override */
+  getWin() {
+    return this.win_;
+  }
 
-/**
- * @param {string} camelCase camel cased string
- * @return {string} title cased string
- */
-function camelCaseToTitleCase(camelCase) {
-  return camelCase.charAt(0).toUpperCase() + camelCase.slice(1);
-}
+  /** @override */
+  getRootNode() {
+    return this.doc_;
+  }
 
-/**
- * Checks the style if a prefixed version of a property exists and returns
- * it or returns an empty string.
- * @private
- * @param {!Object} style
- * @param {string} titleCase the title case version of a css property name
- * @return {string} the prefixed property name or null.
- */
-function getVendorJsPropertyName_(style, titleCase) {
-  for (let i = 0; i < vendorPrefixes.length; i++) {
-    const propertyName = vendorPrefixes[i] + titleCase;
-    if (style[propertyName] !== undefined) {
-      return propertyName;
-    }
+  /** @override */
+  getRootElement() {
+    return this.doc_.documentElement;
   }
-  return '';
-}
 
-/**
- * Returns the possibly prefixed JavaScript property name of a style property
- * (ex. WebkitTransitionDuration) given a camelCase'd version of the property
- * (ex. transitionDuration).
- * @param {!Object} style
- * @param {string} camelCase the camel cased version of a css property name
- * @param {boolean=} bypassCache bypass the memoized cache of property
- *   mapping
- * @return {string}
- */
-function getVendorJsPropertyName(style, camelCase, bypassCache) {
-  if (startsWith(camelCase, '--')) {
-    // CSS vars are returned as is.
-    return camelCase;
+  /** @override */
+  getHead() {
+    // `document.head` always has a chance to be parsed, at least partially.
+    return /** @type {!Element} */ (this.doc_.head);
   }
-  if (!propertyNameCache) {
-    propertyNameCache = map();
+
+  /** @override */
+  getBody() {
+    return this.doc_.body;
   }
-  let propertyName = propertyNameCache[camelCase];
-  if (!propertyName || bypassCache) {
-    propertyName = camelCase;
-    if (style[camelCase] === undefined) {
-      const titleCase = camelCaseToTitleCase(camelCase);
-      const prefixedPropertyName = getVendorJsPropertyName_(style, titleCase);
 
-      if (style[prefixedPropertyName] !== undefined) {
-        propertyName = prefixedPropertyName;
-      }
-    }
-    if (!bypassCache) {
-      propertyNameCache[camelCase] = propertyName;
-    }
+  /** @override */
+  isReady() {
+    return isDocumentReady(this.doc_);
+  }
+
+  /** @override */
+  whenReady() {
+    return whenDocumentReady(this.doc_);
+  }
+
+  /** @override */
+  addToFixedLayer(unusedElement) {
+    return Promise.resolve();
   }
-  return propertyName;
 }
 
 /**
- * Sets the CSS styles of the specified element with !important. The styles
- * are specified as a map from CSS property names to their values.
- * @param {!Element} element
- * @param {!Object<string, string|number>} styles
+ * @param {!Document|!Window|!Doc} input
+ * @return {!Doc}
  */
-function setImportantStyles(element, styles) {
-  for (const k in styles) {
-    element.style.setProperty(
-      getVendorJsPropertyName(styles, k),
-      styles[k].toString(),
-      'important'
-    );
+function resolveDoc(input) {
+  // Is it a `Document`
+  if (/** @type {!Document} */ (input).nodeType === /* DOCUMENT */ 9) {
+    return new GlobalDoc(/** @type {!Document} */ (input));
+  }
+  // Is it a `Window`?
+  if (/** @type {!Window} */ (input).document) {
+    return new GlobalDoc(/** @type {!Window} */ (input));
   }
+  return /** @type {!Doc} */ (input);
 }
 
 /**
@@ -874,8 +1501,14 @@ const POST_MESSAGE_COMMAND_USER = 'user';
 /** Error command for post messages. */
 const POST_MESSAGE_COMMAND_ERROR = 'error';
 
-/** Button click command for post messages. */
-const POST_MESSAGE_COMMAND_BUTTON_CLICK = 'button-click';
+/** GSI Button click command for post messages. */
+const POST_MESSAGE_COMMAND_GSI_BUTTON_CLICK = 'gsi-button-click';
+
+/** SIWG Button click command for post messages. */
+const POST_MESSAGE_COMMAND_SIWG_BUTTON_CLICK = 'siwg-button-click';
+
+/** 3P button click command for post messages. */
+const POST_MESSAGE_COMMAND_3P_BUTTON_CLICK = '3p-button-click';
 
 /** ID for the Google Sign-In iframe element. */
 const GOOGLE_SIGN_IN_IFRAME_ID = 'swg-google-sign-in-iframe';
@@ -892,6 +1525,10 @@ const SIGN_IN_WITH_GOOGLE_BUTTON_ID = 'swg-sign-in-with-google-button';
 /** ID for the Publisher sign-in button element. */
 const PUBLISHER_SIGN_IN_BUTTON_ID = 'swg-publisher-sign-in-button';
 
+/** ID for the Regwall container element. */
+const REGISTRATION_BUTTON_CONTAINER_ID =
+  'swg-registration-button-container';
+
 /** ID for the Regwall container element. */
 const REGWALL_CONTAINER_ID = 'swg-regwall-container';
 
@@ -901,6 +1538,9 @@ const REGWALL_DIALOG_ID = 'swg-regwall-dialog';
 /** ID for the Regwall title element. */
 const REGWALL_TITLE_ID = 'swg-regwall-title';
 
+/** Delay used to log 3P button click before redirect */
+const REDIRECT_DELAY = 10;
+
 /**
  * HTML for the metering regwall dialog, where users can sign in with Google.
  * The script creates a dialog based on this HTML.
@@ -917,8 +1557,8 @@ const REGWALL_HTML = `
   .gaa-metering-regwall--description,
   .gaa-metering-regwall--description strong,
   .gaa-metering-regwall--iframe,
-  .gaa-metering-regwall--casl,
-  .gaa-metering-regwall--publisher-no-thanks-button {
+  .gaa-metering-regwall--registration-button-container,
+  .gaa-metering-regwall--casl {
     all: initial !important;
     box-sizing: border-box !important;
     font-family: Roboto, arial, sans-serif !important;
@@ -981,7 +1621,15 @@ const REGWALL_HTML = `
   .gaa-metering-regwall--iframe {
     border: none !important;
     display: block !important;
-    height: 36px !important;
+    height: 44px !important;
+    margin: 0 0 30px !important;
+    width: 100% !important;
+  }
+
+  .gaa-metering-regwall--registration-button-container {
+    border: none !important;
+    display: block !important;
+    height: 44px !important;
     margin: 0 0 30px !important;
     width: 100% !important;
   }
@@ -1005,20 +1653,12 @@ const REGWALL_HTML = `
     margin: 0 0 24px !important;
   }
 
-  .gaa-metering-regwall--publisher-sign-in-button,
-  .gaa-metering-regwall--publisher-no-thanks-button {
+  .gaa-metering-regwall--publisher-sign-in-button {
     color: #1967d2 !important;
-    display: block !important;
     cursor: pointer !important;
+    display: block !important;
     font-size: 12px !important;
-  }
-
-  .gaa-metering-regwall--publisher-sign-in-button {
-  }
-
-  .gaa-metering-regwall--publisher-no-thanks-button {
-    display: none !important;
-    float: right !important;
+    text-decoration: underline !important;
   }
 
   .gaa-metering-regwall--google-sign-in-button {
@@ -1050,11 +1690,7 @@ const REGWALL_HTML = `
       $SHOWCASE_REGWALL_DESCRIPTION$
     </div>
 
-    <iframe
-        id="${GOOGLE_SIGN_IN_IFRAME_ID}"
-        class="gaa-metering-regwall--iframe"
-        src="$iframeUrl$">
-    </iframe>
+    $SHOWCASE_REGISTRATION_BUTTON$
 
     $SHOWCASE_REGWALL_CASL$
 
@@ -1071,6 +1707,27 @@ const REGWALL_HTML = `
 </div>
 `;
 
+/**
+ * HTML for iFrame to render registration widget.
+ */
+const REGISTRATION_WIDGET_IFRAME_HTML = `
+  <iframe
+      id="${GOOGLE_SIGN_IN_IFRAME_ID}"
+      class="gaa-metering-regwall--iframe"
+      src="$iframeUrl$">
+  </iframe>
+`;
+
+/**
+ * HTML for container of the registration button.
+ */
+const REGISTRATION_BUTTON_HTML = `
+  <div
+      id="${REGISTRATION_BUTTON_CONTAINER_ID}"
+      class="gaa-metering-regwall--registration-button-container">
+  </div>
+`;
+
 /**
  * HTML for the CASL blurb.
  * CASL stands for Canadian Anti-Spam Law.
@@ -1082,16 +1739,17 @@ const CASL_HTML = `
 `;
 
 /** Base styles for both the Google and Google 3p Sign-In button iframes. */
-const GOOGLE_SIGN_IN_IFRAME_STYLES = `
-  body {
-    margin: 0;
-    overflow: hidden;
-  }
+const GOOGLE_SIGN_IN_BUTTON_STYLES = `
   #${GOOGLE_3P_SIGN_IN_BUTTON_ID},
   #${SIGN_IN_WITH_GOOGLE_BUTTON_ID},
   #${GOOGLE_SIGN_IN_BUTTON_ID} {
     margin: 0 auto;
   }
+
+  #${SIGN_IN_WITH_GOOGLE_BUTTON_ID}{
+    width: 220px;
+  }
+
   #${GOOGLE_3P_SIGN_IN_BUTTON_ID} > div,
   #${SIGN_IN_WITH_GOOGLE_BUTTON_ID} > div,
   #${GOOGLE_SIGN_IN_BUTTON_ID} > div {
@@ -1132,6 +1790,12 @@ const GOOGLE_SIGN_IN_IFRAME_STYLES = `
     content: '$SHOWCASE_REGWALL_GOOGLE_SIGN_IN_BUTTON$';
     font-size: 15px;
   }`;
+const GOOGLE_SIGN_IN_IFRAME_STYLES = `
+  body {
+    margin: 0;
+    overflow: hidden;
+  }${GOOGLE_SIGN_IN_BUTTON_STYLES}
+`;
 
 /**
  * User object that Publisher JS receives after users sign in.
@@ -1158,7 +1822,7 @@ let GaaUserDef;
  * GoogleUser object that Google Sign-In returns after users sign in.
  * https://developers.google.com/identity/sign-in/web/reference#googleusergetbasicprofile
  * @typedef {{
- *   getAuthResponse: function(boolean): {
+ *  getAuthResponse: function(boolean): {
  *     access_token: string,
  *     id_token: string,
  *     scope: string,
@@ -1220,14 +1884,17 @@ function queryStringHasFreshGaaParams(
 /** Renders Google Article Access (GAA) Metering Regwall. */
 class GaaMeteringRegwall {
   /**
-   * Returns a promise for a Google Sign-In user object.
-   * https://developers.google.com/identity/sign-in/web/reference#googleusergetbasicprofile
+   * Returns a promise for a Google user object.
+   * The user object will be a:
+   * - GaaUserDef, if you use the GaaGoogleSignInButton
+   * - GoogleIdentityV1, if you use the GaaSignInWithGoogleButton
+   * - Custom object, if you use the GaaGoogle3pSignInButton
    *
    * This method opens a metering regwall dialog,
    * where users can sign in with Google.
    * @nocollapse
    * @param {{ iframeUrl: string, caslUrl: string }} params
-   * @return {!Promise<!GaaUserDef>}
+   * @return {!Promise<!GaaUserDef|!GoogleIdentityV1|!Object>}
    */
   static show({iframeUrl, caslUrl}) {
     const queryString = GaaUtils.getQueryString();
@@ -1260,6 +1927,76 @@ class GaaMeteringRegwall {
       });
   }
 
+  /**
+   * Returns a promise for a Google user object.
+   * The user object will be a GoogleIdentityV1
+   *
+   * This method opens a metering regwall dialog,
+   * where users can sign in with Google.
+   * @nocollapse
+   * @param {{ caslUrl: string, googleApiClientId: string, rawJwt: (boolean|null) }} params
+   * @return {!Promise<!GoogleIdentityV1>}
+   */
+  static showWithNativeRegistrationButton({
+    caslUrl,
+    googleApiClientId,
+    rawJwt = true,
+  }) {
+    logEvent({
+      showcaseEvent: ShowcaseEvent.EVENT_SHOWCASE_NO_ENTITLEMENTS_REGWALL,
+      isFromUserAction: false,
+    });
+
+    GaaMeteringRegwall.render_({
+      iframeUrl: '',
+      caslUrl,
+      useNativeMode: true,
+    });
+
+    return GaaMeteringRegwall.createNativeRegistrationButton({
+      googleApiClientId,
+    })
+      .then((jwt) => {
+        GaaMeteringRegwall.remove();
+        if (rawJwt) {
+          return jwt;
+        } else {
+          return new JwtHelper().decode(jwt.credential);
+        }
+      })
+      .catch((err) => {
+        // Close the Regwall, since the flow failed.
+        GaaMeteringRegwall.remove();
+
+        // Rethrow error.
+        debugLog(`Regwall failed: ${err}`);
+      });
+  }
+
+  /**
+   * This method opens a metering regwall dialog,
+   * where users can sign in with Google.
+   *
+   * @nocollapse
+   * @param {{ caslUrl: string, authorizationUrl: string }} params
+   * @return {boolean}
+   */
+  static showWithNative3PRegistrationButton({caslUrl, authorizationUrl}) {
+    logEvent({
+      showcaseEvent: ShowcaseEvent.EVENT_SHOWCASE_NO_ENTITLEMENTS_REGWALL,
+      isFromUserAction: false,
+    });
+
+    GaaMeteringRegwall.render_({
+      iframeUrl: '',
+      caslUrl,
+      useNativeMode: true,
+    });
+    return GaaMeteringRegwall.createNative3PRegistrationButton({
+      authorizationUrl,
+    });
+  }
+
   /**
    * Removes the Regwall.
    * @nocollapse
@@ -1288,24 +2025,20 @@ class GaaMeteringRegwall {
    * Renders the Regwall.
    * @private
    * @nocollapse
-   * @param {{ iframeUrl: string, caslUrl: string }} params
+   * @param {{ iframeUrl: string, caslUrl: string, useNativeMode: (boolean|undefined)}} params
    */
-  static render_({iframeUrl, caslUrl}) {
+  static render_({iframeUrl, caslUrl, useNativeMode = false}) {
     const languageCode = getLanguageCodeFromElement(self.document.body);
     const publisherName = GaaMeteringRegwall.getPublisherNameFromPageConfig_();
     const placeholderPatternForPublication = /<ph name="PUBLICATION".+?\/ph>/g;
     const placeholderPatternForLinkStart = /<ph name="LINK_START".+?\/ph>/g;
     const placeholderPatternForLinkEnd = /<ph name="LINK_END".+?\/ph>/g;
 
-    // Tell the iframe which language to render.
-    iframeUrl = addQueryParam(iframeUrl, 'lang', languageCode);
-
     // Create and style container element.
     // TODO: Consider using a FriendlyIframe here, to avoid CSS conflicts.
-    const containerEl = /** @type {!HTMLDivElement} */ (
-      self.document.createElement('div')
-    );
-    containerEl.id = REGWALL_CONTAINER_ID;
+    const containerEl = createElement(self.document, 'div', {
+      id: REGWALL_CONTAINER_ID,
+    });
     setImportantStyles(containerEl, {
       'all': 'unset',
       'background-color': 'rgba(32, 33, 36, 0.6)',
@@ -1343,10 +2076,22 @@ class GaaMeteringRegwall {
         );
     }
 
+    let registrationButtonHtml = '';
+    if (useNativeMode) {
+      registrationButtonHtml = REGISTRATION_BUTTON_HTML;
+    } else {
+      // Tell the iframe which language to render.
+      iframeUrl = addQueryParam(iframeUrl, 'lang', languageCode);
+      registrationButtonHtml = REGISTRATION_WIDGET_IFRAME_HTML.replace(
+        '$iframeUrl$',
+        iframeUrl
+      );
+    }
+
     // Prepare HTML.
     containerEl./*OK*/ innerHTML = REGWALL_HTML.replace(
-      '$iframeUrl$',
-      iframeUrl
+      '$SHOWCASE_REGISTRATION_BUTTON$',
+      registrationButtonHtml
     )
       .replace(
         '$SHOWCASE_REGWALL_TITLE$',
@@ -1385,6 +2130,8 @@ class GaaMeteringRegwall {
       const titleEl = self.document.getElementById(REGWALL_TITLE_ID);
       titleEl.focus();
     });
+
+    return containerEl;
   }
 
   /**
@@ -1418,26 +2165,28 @@ class GaaMeteringRegwall {
    * @return {string|undefined}
    */
   static getPublisherNameFromJsonLdPageConfig_() {
-    const ldJsonElements = self.document.querySelectorAll(
-      'script[type="application/ld+json"]'
+    // Get JSON from ld+json scripts.
+    const ldJsonScripts = Array.prototype.slice.call(
+      self.document.querySelectorAll('script[type="application/ld+json"]')
+    );
+    const jsonQueue = /** @type {!Array<*>} */ (
+      ldJsonScripts.map((script) => parseJson(script.textContent))
     );
 
-    for (let i = 0; i < ldJsonElements.length; i++) {
-      const ldJsonElement = ldJsonElements[i];
-      let ldJson = /** @type {*} */ (parseJson(ldJsonElement.textContent));
-
-      if (!Array.isArray(ldJson)) {
-        ldJson = [ldJson];
-      }
-
-      const publisherName = findInArray(
-        ldJson,
-        (entry) => entry?.publisher?.name
-      )?.publisher.name;
+    // Search for publisher name, breadth-first.
+    for (let i = 0; i < jsonQueue.length; i++) {
+      const json = /** @type {!Object<?,?>} */ (jsonQueue[i]);
 
+      // Return publisher name, if possible.
+      const publisherName = json?.publisher?.name;
       if (publisherName) {
         return publisherName;
       }
+
+      // Explore JSON.
+      if (json && typeof json === 'object') {
+        jsonQueue.push(...Object.values(json));
+      }
     }
   }
 
@@ -1452,8 +2201,7 @@ class GaaMeteringRegwall {
       '[itemscope][itemtype][itemprop="publisher"] [itemprop="name"]'
     );
 
-    for (let i = 0; i < publisherNameElements.length; i++) {
-      const publisherNameElement = publisherNameElements[i];
+    for (const publisherNameElement of publisherNameElements) {
       const publisherName = publisherNameElement.content;
       if (publisherName) {
         return publisherName;
@@ -1494,8 +2242,8 @@ class GaaMeteringRegwall {
       self.addEventListener('message', (e) => {
         if (e.data.stamp === POST_MESSAGE_STAMP) {
           if (e.data.command === POST_MESSAGE_COMMAND_USER) {
-            // Pass along GAA user.
-            resolve(e.data.gaaUser);
+            // Pass along user details.
+            resolve(e.data.gaaUser || e.data.returnedJwt);
           }
 
           if (e.data.command === POST_MESSAGE_COMMAND_ERROR) {
@@ -1517,7 +2265,7 @@ class GaaMeteringRegwall {
     self.addEventListener('message', (e) => {
       if (
         e.data.stamp === POST_MESSAGE_STAMP &&
-        e.data.command === POST_MESSAGE_COMMAND_BUTTON_CLICK
+        e.data.command === POST_MESSAGE_COMMAND_GSI_BUTTON_CLICK
       ) {
         // Log button click event.
         logEvent({
@@ -1525,6 +2273,27 @@ class GaaMeteringRegwall {
           isFromUserAction: true,
         });
       }
+      if (
+        e.data.stamp === POST_MESSAGE_STAMP &&
+        e.data.command === POST_MESSAGE_COMMAND_SIWG_BUTTON_CLICK
+      ) {
+        // Log button click event.
+        logEvent({
+          analyticsEvent: AnalyticsEvent.ACTION_SHOWCASE_REGWALL_SIWG_CLICK,
+          isFromUserAction: true,
+        });
+      }
+      if (
+        e.data.stamp === POST_MESSAGE_STAMP &&
+        e.data.command === POST_MESSAGE_COMMAND_3P_BUTTON_CLICK
+      ) {
+        // Log button click event.
+        logEvent({
+          analyticsEvent:
+            AnalyticsEvent.ACTION_SHOWCASE_REGWALL_3P_BUTTON_CLICK,
+          isFromUserAction: true,
+        });
+      }
     });
   }
 
@@ -1551,6 +2320,91 @@ class GaaMeteringRegwall {
       );
     };
   }
+
+  static createNativeRegistrationButton({googleApiClientId}) {
+    const languageCode = getLanguageCodeFromElement(self.document.body);
+    const parentElement = self.document.getElementById(
+      REGISTRATION_BUTTON_CONTAINER_ID
+    );
+    if (!parentElement) {
+      return false;
+    }
+    // Apply iframe styles.
+    const styleText = GOOGLE_SIGN_IN_BUTTON_STYLES.replace(
+      '$SHOWCASE_REGWALL_GOOGLE_SIGN_IN_BUTTON$',
+      msg(I18N_STRINGS['SHOWCASE_REGWALL_GOOGLE_SIGN_IN_BUTTON'], languageCode)
+    );
+    injectStyleSheet(resolveDoc(self.document), styleText);
+
+    // Create and append button to regwall
+    const buttonEl = createElement(self.document, 'div', {
+      id: SIGN_IN_WITH_GOOGLE_BUTTON_ID,
+      tabIndex: 0,
+    });
+    parentElement.appendChild(buttonEl);
+
+    function logButtonClicks() {
+      logEvent({
+        analyticsEvent: AnalyticsEvent.ACTION_SHOWCASE_REGWALL_SIWG_CLICK,
+        isFromUserAction: true,
+      });
+    }
+
+    return new Promise((resolve) => {
+      self.google.accounts.id.initialize({
+        /* eslint-disable google-camelcase/google-camelcase */
+        client_id: googleApiClientId,
+        callback: resolve,
+        /* eslint-enable google-camelcase/google-camelcase */
+      });
+      self.google.accounts.id.renderButton(buttonEl, {
+        'type': 'standard',
+        'theme': 'outline',
+        'text': 'continue_with',
+        'logo_alignment': 'center',
+        'click_listener': logButtonClicks,
+      });
+    });
+  }
+
+  static createNative3PRegistrationButton({authorizationUrl}) {
+    const languageCode = getLanguageCodeFromElement(self.document.body);
+    const parentElement = self.document.getElementById(
+      REGISTRATION_BUTTON_CONTAINER_ID
+    );
+    if (!parentElement) {
+      return false;
+    }
+    // Apply iframe styles.
+    const styleText = GOOGLE_3P_SIGN_IN_IFRAME_STYLES.replace(
+      '$SHOWCASE_REGWALL_GOOGLE_SIGN_IN_BUTTON$',
+      msg(I18N_STRINGS['SHOWCASE_REGWALL_GOOGLE_SIGN_IN_BUTTON'], languageCode)
+    );
+    injectStyleSheet(resolveDoc(self.document), styleText);
+
+    // Render the third party Google Sign-In button.
+    const buttonEl = createElement(self.document, 'div', {
+      id: GOOGLE_3P_SIGN_IN_BUTTON_ID,
+      tabIndex: 0,
+    });
+    buttonEl./*OK*/ innerHTML = GOOGLE_3P_SIGN_IN_BUTTON_HTML;
+    parentElement.appendChild(buttonEl);
+
+    buttonEl.addEventListener('click', () => {
+      // Track button clicks.
+      logEvent({
+        analyticsEvent: AnalyticsEvent.ACTION_SHOWCASE_REGWALL_3P_BUTTON_CLICK,
+        isFromUserAction: true,
+      });
+      // Redirect user using the parent window.
+      // TODO(b/242998655): Fix the downstream calls for logEvent to be chained to remove the need of delaying redirect.
+      self.setTimeout(() => {
+        self.open(authorizationUrl, '_parent');
+      }, REDIRECT_DELAY);
+    });
+
+    return buttonEl;
+  }
 }
 
 class GaaGoogleSignInButton {
@@ -1566,12 +2420,11 @@ class GaaGoogleSignInButton {
     const languageCode = queryParams['lang'] || 'en';
 
     // Apply iframe styles.
-    const styleEl = self.document.createElement('style');
-    styleEl./*OK*/ innerText = GOOGLE_SIGN_IN_IFRAME_STYLES.replace(
+    const styleText = GOOGLE_SIGN_IN_IFRAME_STYLES.replace(
       '$SHOWCASE_REGWALL_GOOGLE_SIGN_IN_BUTTON$',
       msg(I18N_STRINGS['SHOWCASE_REGWALL_GOOGLE_SIGN_IN_BUTTON'], languageCode)
     );
-    self.document.head.appendChild(styleEl);
+    injectStyleSheet(resolveDoc(self.document), styleText);
 
     // Promise a function that sends messages to the parent frame.
     // Note: A function is preferable to a reference to the parent frame
@@ -1602,8 +2455,7 @@ class GaaGoogleSignInButton {
     }
 
     // Validate origins.
-    for (let i = 0; i < allowedOrigins.length; i++) {
-      const allowedOrigin = allowedOrigins[i];
+    for (const allowedOrigin of allowedOrigins) {
       const url = new URL(allowedOrigin);
 
       const isOrigin = url.origin === allowedOrigin;
@@ -1627,9 +2479,10 @@ class GaaGoogleSignInButton {
         () =>
           new Promise((resolve) => {
             // Render the Google Sign-In button.
-            const buttonEl = self.document.createElement('div');
-            buttonEl.id = GOOGLE_SIGN_IN_BUTTON_ID;
-            buttonEl.tabIndex = 0;
+            const buttonEl = createElement(self.document, 'div', {
+              id: GOOGLE_SIGN_IN_BUTTON_ID,
+              tabIndex: 0,
+            });
             self.document.body.appendChild(buttonEl);
             self.gapi.signin2.render(GOOGLE_SIGN_IN_BUTTON_ID, {
               'longtitle': true,
@@ -1645,7 +2498,7 @@ class GaaGoogleSignInButton {
               sendMessageToParentFnPromise.then((sendMessageToParent) => {
                 sendMessageToParent({
                   stamp: POST_MESSAGE_STAMP,
-                  command: POST_MESSAGE_COMMAND_BUTTON_CLICK,
+                  command: POST_MESSAGE_COMMAND_GSI_BUTTON_CLICK,
                 });
               });
             });
@@ -1775,29 +2628,51 @@ class GaaGoogle3pSignInButton {
   /**
    * Renders the third party Google Sign-In button for external authentication.
    * @nocollapse
-   * @param {{ allowedOrigins: !Array<string>, authorizationUrl: string }} params
+   * @param {{
+   *    allowedOrigins: !Array<string>,
+   *    authorizationUrl: string,
+   *    redirectMode: boolean,
+   * }} params GaaGoogle3pSignInButton operates in two modes: redirect and
+   * popup. The default mode is pop-up mode which opens the authorizationUrl
+   * in a new window. To use a redirect mode and open the authorizationUrl in
+   * the same window, set redirectMode to true. For webview applications
+   * redirectMode is recommended.
    */
-  static show({allowedOrigins, authorizationUrl}) {
+  static show({allowedOrigins, authorizationUrl, redirectMode = false}) {
     // Optionally grab language code from URL.
     const queryString = GaaUtils.getQueryString();
     const queryParams = parseQueryString(queryString);
     const languageCode = queryParams['lang'] || 'en';
 
     // Apply iframe styles.
-    const styleEl = self.document.createElement('style');
-    styleEl./*OK*/ innerText = GOOGLE_3P_SIGN_IN_IFRAME_STYLES.replace(
+    const styleText = GOOGLE_3P_SIGN_IN_IFRAME_STYLES.replace(
       '$SHOWCASE_REGWALL_GOOGLE_SIGN_IN_BUTTON$',
       msg(I18N_STRINGS['SHOWCASE_REGWALL_GOOGLE_SIGN_IN_BUTTON'], languageCode)
     );
-    self.document.head.appendChild(styleEl);
+    injectStyleSheet(resolveDoc(self.document), styleText);
 
     // Render the third party Google Sign-In button.
-    const buttonEl = self.document.createElement('div');
-    buttonEl.id = GOOGLE_3P_SIGN_IN_BUTTON_ID;
-    buttonEl.tabIndex = 0;
+    const buttonEl = createElement(self.document, 'div', {
+      id: GOOGLE_3P_SIGN_IN_BUTTON_ID,
+      tabIndex: 0,
+    });
     buttonEl./*OK*/ innerHTML = GOOGLE_3P_SIGN_IN_BUTTON_HTML;
     buttonEl.onclick = () => {
-      self.open(authorizationUrl);
+      sendMessageToParentFnPromise.then((sendMessageToParent) => {
+        sendMessageToParent({
+          stamp: POST_MESSAGE_STAMP,
+          command: POST_MESSAGE_COMMAND_3P_BUTTON_CLICK,
+        });
+      });
+      if (redirectMode) {
+        // TODO(b/242998655): Fix the downstream calls for logEvent to be chained to remove the need of delaying redirect.
+        self.setTimeout(() => {
+          self.open(authorizationUrl, '_parent');
+        }, REDIRECT_DELAY);
+        self.open(authorizationUrl, '_parent');
+      } else {
+        self.open(authorizationUrl);
+      }
     };
     self.document.body.appendChild(buttonEl);
 
@@ -1859,6 +2734,18 @@ class GaaGoogle3pSignInButton {
       }
     });
   }
+  /**
+   * Notify Google Intervention of a complete sign-in event.
+   * @nocollapse
+   * @param {{ gaaUser: GaaUserDef}} params
+   */
+  static gaaNotifySignIn({gaaUser}) {
+    self.opener.postMessage({
+      stamp: POST_MESSAGE_STAMP,
+      command: POST_MESSAGE_COMMAND_USER,
+      gaaUser,
+    });
+  }
 }
 
 /**
@@ -1879,14 +2766,14 @@ function logEvent({analyticsEvent, showcaseEvent, isFromUserAction} = {}) {
         : [analyticsEvent];
 
       // Log each analytics event.
-      eventTypes.forEach((eventType) => {
+      for (const eventType of eventTypes) {
         eventManager.logEvent({
           eventType,
           eventOriginator: EventOriginator.SWG_CLIENT,
           isFromUserAction,
           additionalParameters: null,
         });
-      });
+      }
     });
   });
 }
diff --git a/third_party/subscriptions-project/swg.js b/third_party/subscriptions-project/swg.js
index 50cb5624d289..fd9bd8399911 100644
--- a/third_party/subscriptions-project/swg.js
+++ b/third_party/subscriptions-project/swg.js
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/** Version: 0.1.22.192 */
+/** Version: 3579668c */
 /**
  * Copyright 2018 The Subscribe with Google Authors. All Rights Reserved.
  *
@@ -58,6 +58,26 @@ const AnalyticsEvent = {
   IMPRESSION_SWG_SUBSCRIPTION_MINI_PROMPT: 24,
   IMPRESSION_SWG_CONTRIBUTION_MINI_PROMPT: 25,
   IMPRESSION_CONTRIBUTION_OFFERS: 26,
+  IMPRESSION_TWG_COUNTER: 27,
+  IMPRESSION_TWG_SITE_SUPPORTER_WALL: 28,
+  IMPRESSION_TWG_PUBLICATION: 29,
+  IMPRESSION_TWG_STATIC_BUTTON: 30,
+  IMPRESSION_TWG_DYNAMIC_BUTTON: 31,
+  IMPRESSION_TWG_STICKER_SELECTION_SCREEN: 32,
+  IMPRESSION_TWG_PUBLICATION_NOT_SET_UP: 33,
+  IMPRESSION_REGWALL_OPT_IN: 34,
+  IMPRESSION_NEWSLETTER_OPT_IN: 35,
+  IMPRESSION_SUBSCRIPTION_OFFERS_ERROR: 36,
+  IMPRESSION_CONTRIBUTION_OFFERS_ERROR: 37,
+  IMPRESSION_TWG_SHORTENED_STICKER_FLOW: 38,
+  IMPRESSION_SUBSCRIPTION_LINKING_LOADING: 39,
+  IMPRESSION_SUBSCRIPTION_LINKING_COMPLETE: 40,
+  IMPRESSION_SUBSCRIPTION_LINKING_ERROR: 41,
+  IMPRESSION_SURVEY: 42,
+  IMPRESSION_REGWALL_ERROR: 43,
+  IMPRESSION_NEWSLETTER_ERROR: 44,
+  IMPRESSION_SURVEY_ERROR: 45,
+  IMPRESSION_METER_TOAST_ERROR: 46,
   ACTION_SUBSCRIBE: 1000,
   ACTION_PAYMENT_COMPLETE: 1001,
   ACTION_ACCOUNT_CREATED: 1002,
@@ -97,7 +117,51 @@ const AnalyticsEvent = {
   ACTION_SHOWCASE_REGWALL_EXISTING_ACCOUNT_CLICK: 1036,
   ACTION_SUBSCRIPTION_OFFERS_CLOSED: 1037,
   ACTION_CONTRIBUTION_OFFERS_CLOSED: 1038,
+  ACTION_TWG_STATIC_CTA_CLICK: 1039,
+  ACTION_TWG_DYNAMIC_CTA_CLICK: 1040,
+  ACTION_TWG_SITE_LEVEL_SUPPORTER_WALL_CTA_CLICK: 1041,
+  ACTION_TWG_DIALOG_SUPPORTER_WALL_CTA_CLICK: 1042,
+  ACTION_TWG_COUNTER_CLICK: 1043,
+  ACTION_TWG_SITE_SUPPORTER_WALL_ALL_THANKS_CLICK: 1044,
+  ACTION_TWG_PAID_STICKER_SELECTED_SCREEN_CLOSE_CLICK: 1045,
+  ACTION_TWG_PAID_STICKER_SELECTION_CLICK: 1046,
+  ACTION_TWG_FREE_STICKER_SELECTION_CLICK: 1047,
+  ACTION_TWG_MINI_SUPPORTER_WALL_CLICK: 1048,
+  ACTION_TWG_CREATOR_BENEFIT_CLICK: 1049,
+  ACTION_TWG_FREE_TRANSACTION_START_NEXT_BUTTON_CLICK: 1050,
+  ACTION_TWG_PAID_TRANSACTION_START_NEXT_BUTTON_CLICK: 1051,
+  ACTION_TWG_STICKER_SELECTION_SCREEN_CLOSE_CLICK: 1052,
+  ACTION_TWG_ARTICLE_LEVEL_SUPPORTER_WALL_CTA_CLICK: 1053,
+  ACTION_REGWALL_OPT_IN_BUTTON_CLICK: 1054,
+  ACTION_REGWALL_ALREADY_OPTED_IN_CLICK: 1055,
+  ACTION_NEWSLETTER_OPT_IN_BUTTON_CLICK: 1056,
+  ACTION_NEWSLETTER_ALREADY_OPTED_IN_CLICK: 1057,
+  ACTION_REGWALL_OPT_IN_CLOSE: 1058,
+  ACTION_NEWSLETTER_OPT_IN_CLOSE: 1059,
+  ACTION_SHOWCASE_REGWALL_SIWG_CLICK: 1060,
+  ACTION_TWG_CHROME_APP_MENU_ENTRY_POINT_CLICK: 1061,
+  ACTION_TWG_DISCOVER_FEED_MENU_ENTRY_POINT_CLICK: 1062,
+  ACTION_SHOWCASE_REGWALL_3P_BUTTON_CLICK: 1063,
+  ACTION_SUBSCRIPTION_OFFERS_RETRY: 1064,
+  ACTION_CONTRIBUTION_OFFERS_RETRY: 1065,
+  ACTION_TWG_SHORTENED_STICKER_FLOW_STICKER_SELECTION_CLICK: 1066,
+  ACTION_INITIATE_UPDATED_SUBSCRIPTION_LINKING: 1067,
+  ACTION_SURVEY_SUBMIT_CLICK: 1068,
+  ACTION_SURVEY_CLOSED: 1069,
+  ACTION_SURVEY_DATA_TRANSFER: 1070,
+  ACTION_REGWALL_PAGE_REFRESH: 1071,
+  ACTION_NEWSLETTER_PAGE_REFRESH: 1072,
+  ACTION_SURVEY_PAGE_REFRESH: 1073,
+  ACTION_METER_TOAST_PAGE_REFRESH: 1074,
   EVENT_PAYMENT_FAILED: 2000,
+  EVENT_REGWALL_OPT_IN_FAILED: 2001,
+  EVENT_NEWSLETTER_OPT_IN_FAILED: 2002,
+  EVENT_REGWALL_ALREADY_OPT_IN: 2003,
+  EVENT_NEWSLETTER_ALREADY_OPT_IN: 2004,
+  EVENT_SUBSCRIPTION_LINKING_FAILED: 2005,
+  EVENT_SURVEY_ALREADY_SUBMITTED: 2006,
+  EVENT_SURVEY_SUBMIT_FAILED: 2007,
+  EVENT_SURVEY_DATA_TRANSFER_FAILED: 2008,
   EVENT_CUSTOM: 3000,
   EVENT_CONFIRM_TX_ID: 3001,
   EVENT_CHANGED_TX_ID: 3002,
@@ -113,6 +177,22 @@ const AnalyticsEvent = {
   EVENT_UNLOCKED_FREE_PAGE: 3012,
   EVENT_INELIGIBLE_PAYWALL: 3013,
   EVENT_UNLOCKED_FOR_CRAWLER: 3014,
+  EVENT_TWG_COUNTER_VIEW: 3015,
+  EVENT_TWG_SITE_SUPPORTER_WALL_VIEW: 3016,
+  EVENT_TWG_STATIC_BUTTON_VIEW: 3017,
+  EVENT_TWG_DYNAMIC_BUTTON_VIEW: 3018,
+  EVENT_TWG_PRE_TRANSACTION_PRIVACY_SETTING_PRIVATE: 3019,
+  EVENT_TWG_POST_TRANSACTION_SETTING_PRIVATE: 3020,
+  EVENT_TWG_PRE_TRANSACTION_PRIVACY_SETTING_PUBLIC: 3021,
+  EVENT_TWG_POST_TRANSACTION_SETTING_PUBLIC: 3022,
+  EVENT_REGWALL_OPTED_IN: 3023,
+  EVENT_NEWSLETTER_OPTED_IN: 3024,
+  EVENT_SHOWCASE_METERING_INIT: 3025,
+  EVENT_DISABLE_MINIPROMPT_DESKTOP: 3026,
+  EVENT_SUBSCRIPTION_LINKING_SUCCESS: 3027,
+  EVENT_SURVEY_SUBMITTED: 3028,
+  EVENT_LINK_ACCOUNT_SUCCESS: 3029,
+  EVENT_SAVE_SUBSCRIPTION_SUCCESS: 3030,
   EVENT_SUBSCRIPTION_STATE: 4000,
 };
 /** @enum {number} */
@@ -130,6 +210,7 @@ const EntitlementSource = {
   UNKNOWN_ENTITLEMENT_SOURCE: 0,
   GOOGLE_SUBSCRIBER_ENTITLEMENT: 1001,
   GOOGLE_SHOWCASE_METERING_SERVICE: 2001,
+  SUBSCRIBE_WITH_GOOGLE_METERING_SERVICE: 2002,
   PUBLISHER_ENTITLEMENT: 3001,
 };
 /** @enum {number} */
@@ -369,6 +450,12 @@ class AnalyticsContext {
       data[11 + base] == null || data[11 + base] == undefined
         ? null
         : new Timestamp(data[11 + base], includesLabel);
+
+    /** @private {?ReaderSurfaceType} */
+    this.readerSurfaceType_ = data[12 + base] == null ? null : data[12 + base];
+
+    /** @private {?string} */
+    this.integrationVersion_ = data[13 + base] == null ? null : data[13 + base];
   }
 
   /**
@@ -539,6 +626,34 @@ class AnalyticsContext {
     this.clientTimestamp_ = value;
   }
 
+  /**
+   * @return {?ReaderSurfaceType}
+   */
+  getReaderSurfaceType() {
+    return this.readerSurfaceType_;
+  }
+
+  /**
+   * @param {!ReaderSurfaceType} value
+   */
+  setReaderSurfaceType(value) {
+    this.readerSurfaceType_ = value;
+  }
+
+  /**
+   * @return {?string}
+   */
+  getIntegrationVersion() {
+    return this.integrationVersion_;
+  }
+
+  /**
+   * @param {string} value
+   */
+  setIntegrationVersion(value) {
+    this.integrationVersion_ = value;
+  }
+
   /**
    * @param {boolean=} includeLabel
    * @return {!Array<?>}
@@ -558,6 +673,8 @@ class AnalyticsContext {
         this.clientVersion_, // field 10 - client_version
         this.url_, // field 11 - url
         this.clientTimestamp_ ? this.clientTimestamp_.toArray(includeLabel) : [], // field 12 - client_timestamp
+        this.readerSurfaceType_, // field 13 - reader_surface_type
+        this.integrationVersion_, // field 14 - integration_version
     ];
     if (includeLabel) {
       arr.unshift(this.label());
@@ -761,6 +878,166 @@ class AnalyticsRequest {
   }
 }
 
+/**
+ * @implements {Message}
+ */
+class AudienceActivityClientLogsRequest {
+  /**
+   * @param {!Array<*>=} data
+   * @param {boolean=} includesLabel
+   */
+  constructor(data = [], includesLabel = true) {
+    const base = includesLabel ? 1 : 0;
+
+    /** @private {?AnalyticsEvent} */
+    this.event_ = data[base] == null ? null : data[base];
+  }
+
+  /**
+   * @return {?AnalyticsEvent}
+   */
+  getEvent() {
+    return this.event_;
+  }
+
+  /**
+   * @param {!AnalyticsEvent} value
+   */
+  setEvent(value) {
+    this.event_ = value;
+  }
+
+  /**
+   * @param {boolean=} includeLabel
+   * @return {!Array<?>}
+   * @override
+   */
+  toArray(includeLabel = true) {
+    const arr = [
+        this.event_, // field 1 - event
+    ];
+    if (includeLabel) {
+      arr.unshift(this.label());
+    }
+    return arr;
+  }
+
+  /**
+   * @return {string}
+   * @override
+   */
+  label() {
+    return 'AudienceActivityClientLogsRequest';
+  }
+}
+
+/**
+ * @implements {Message}
+ */
+class CompleteAudienceActionResponse {
+  /**
+   * @param {!Array<*>=} data
+   * @param {boolean=} includesLabel
+   */
+  constructor(data = [], includesLabel = true) {
+    const base = includesLabel ? 1 : 0;
+
+    /** @private {?string} */
+    this.swgUserToken_ = data[base] == null ? null : data[base];
+
+    /** @private {?boolean} */
+    this.actionCompleted_ = data[1 + base] == null ? null : data[1 + base];
+
+    /** @private {?string} */
+    this.userEmail_ = data[2 + base] == null ? null : data[2 + base];
+
+    /** @private {?boolean} */
+    this.alreadyCompleted_ = data[3 + base] == null ? null : data[3 + base];
+  }
+
+  /**
+   * @return {?string}
+   */
+  getSwgUserToken() {
+    return this.swgUserToken_;
+  }
+
+  /**
+   * @param {string} value
+   */
+  setSwgUserToken(value) {
+    this.swgUserToken_ = value;
+  }
+
+  /**
+   * @return {?boolean}
+   */
+  getActionCompleted() {
+    return this.actionCompleted_;
+  }
+
+  /**
+   * @param {boolean} value
+   */
+  setActionCompleted(value) {
+    this.actionCompleted_ = value;
+  }
+
+  /**
+   * @return {?string}
+   */
+  getUserEmail() {
+    return this.userEmail_;
+  }
+
+  /**
+   * @param {string} value
+   */
+  setUserEmail(value) {
+    this.userEmail_ = value;
+  }
+
+  /**
+   * @return {?boolean}
+   */
+  getAlreadyCompleted() {
+    return this.alreadyCompleted_;
+  }
+
+  /**
+   * @param {boolean} value
+   */
+  setAlreadyCompleted(value) {
+    this.alreadyCompleted_ = value;
+  }
+
+  /**
+   * @param {boolean=} includeLabel
+   * @return {!Array<?>}
+   * @override
+   */
+  toArray(includeLabel = true) {
+    const arr = [
+        this.swgUserToken_, // field 1 - swg_user_token
+        this.actionCompleted_, // field 2 - action_completed
+        this.userEmail_, // field 3 - user_email
+        this.alreadyCompleted_, // field 4 - already_completed
+    ];
+    if (includeLabel) {
+      arr.unshift(this.label());
+    }
+    return arr;
+  }
+
+  /**
+   * @return {string}
+   * @override
+   */
+  label() {
+    return 'CompleteAudienceActionResponse';
+  }
+}
+
 /**
  * @implements {Message}
  */
@@ -866,6 +1143,12 @@ class EntitlementsRequest {
 
     /** @private {?boolean} */
     this.isUserRegistered_ = data[5 + base] == null ? null : data[5 + base];
+
+    /** @private {?Timestamp} */
+    this.subscriptionTimestamp_ =
+      data[6 + base] == null || data[6 + base] == undefined
+        ? null
+        : new Timestamp(data[6 + base], includesLabel);
   }
 
   /**
@@ -952,6 +1235,20 @@ class EntitlementsRequest {
     this.isUserRegistered_ = value;
   }
 
+  /**
+   * @return {?Timestamp}
+   */
+  getSubscriptionTimestamp() {
+    return this.subscriptionTimestamp_;
+  }
+
+  /**
+   * @param {!Timestamp} value
+   */
+  setSubscriptionTimestamp(value) {
+    this.subscriptionTimestamp_ = value;
+  }
+
   /**
    * @param {boolean=} includeLabel
    * @return {!Array<?>}
@@ -965,6 +1262,7 @@ class EntitlementsRequest {
         this.entitlementResult_, // field 4 - entitlement_result
         this.token_, // field 5 - token
         this.isUserRegistered_, // field 6 - is_user_registered
+        this.subscriptionTimestamp_ ? this.subscriptionTimestamp_.toArray(includeLabel) : [], // field 7 - subscription_timestamp
     ];
     if (includeLabel) {
       arr.unshift(this.label());
@@ -1083,6 +1381,12 @@ class EventParams {
 
     /** @private {?string} */
     this.subscriptionFlow_ = data[6 + base] == null ? null : data[6 + base];
+
+    /** @private {?Timestamp} */
+    this.subscriptionTimestamp_ =
+      data[7 + base] == null || data[7 + base] == undefined
+        ? null
+        : new Timestamp(data[7 + base], includesLabel);
   }
 
   /**
@@ -1183,6 +1487,20 @@ class EventParams {
     this.subscriptionFlow_ = value;
   }
 
+  /**
+   * @return {?Timestamp}
+   */
+  getSubscriptionTimestamp() {
+    return this.subscriptionTimestamp_;
+  }
+
+  /**
+   * @param {!Timestamp} value
+   */
+  setSubscriptionTimestamp(value) {
+    this.subscriptionTimestamp_ = value;
+  }
+
   /**
    * @param {boolean=} includeLabel
    * @return {!Array<?>}
@@ -1197,6 +1515,7 @@ class EventParams {
         this.oldTransactionId_, // field 5 - old_transaction_id
         this.isUserRegistered_, // field 6 - is_user_registered
         this.subscriptionFlow_, // field 7 - subscription_flow
+        this.subscriptionTimestamp_ ? this.subscriptionTimestamp_.toArray(includeLabel) : [], // field 8 - subscription_timestamp
     ];
     if (includeLabel) {
       arr.unshift(this.label());
@@ -1420,21 +1739,430 @@ class OpenDialogRequest {
     const base = includesLabel ? 1 : 0;
 
     /** @private {?string} */
-    this.urlPath_ = data[base] == null ? null : data[base];
+    this.urlPath_ = data[base] == null ? null : data[base];
+  }
+
+  /**
+   * @return {?string}
+   */
+  getUrlPath() {
+    return this.urlPath_;
+  }
+
+  /**
+   * @param {string} value
+   */
+  setUrlPath(value) {
+    this.urlPath_ = value;
+  }
+
+  /**
+   * @param {boolean=} includeLabel
+   * @return {!Array<?>}
+   * @override
+   */
+  toArray(includeLabel = true) {
+    const arr = [
+        this.urlPath_, // field 1 - url_path
+    ];
+    if (includeLabel) {
+      arr.unshift(this.label());
+    }
+    return arr;
+  }
+
+  /**
+   * @return {string}
+   * @override
+   */
+  label() {
+    return 'OpenDialogRequest';
+  }
+}
+
+/**
+ * @implements {Message}
+ */
+class SkuSelectedResponse {
+  /**
+   * @param {!Array<*>=} data
+   * @param {boolean=} includesLabel
+   */
+  constructor(data = [], includesLabel = true) {
+    const base = includesLabel ? 1 : 0;
+
+    /** @private {?string} */
+    this.sku_ = data[base] == null ? null : data[base];
+
+    /** @private {?string} */
+    this.oldSku_ = data[1 + base] == null ? null : data[1 + base];
+
+    /** @private {?boolean} */
+    this.oneTime_ = data[2 + base] == null ? null : data[2 + base];
+
+    /** @private {?string} */
+    this.playOffer_ = data[3 + base] == null ? null : data[3 + base];
+
+    /** @private {?string} */
+    this.oldPlayOffer_ = data[4 + base] == null ? null : data[4 + base];
+
+    /** @private {?string} */
+    this.customMessage_ = data[5 + base] == null ? null : data[5 + base];
+
+    /** @private {?boolean} */
+    this.anonymous_ = data[6 + base] == null ? null : data[6 + base];
+
+    /** @private {?boolean} */
+    this.sharingPolicyEnabled_ = data[7 + base] == null ? null : data[7 + base];
+  }
+
+  /**
+   * @return {?string}
+   */
+  getSku() {
+    return this.sku_;
+  }
+
+  /**
+   * @param {string} value
+   */
+  setSku(value) {
+    this.sku_ = value;
+  }
+
+  /**
+   * @return {?string}
+   */
+  getOldSku() {
+    return this.oldSku_;
+  }
+
+  /**
+   * @param {string} value
+   */
+  setOldSku(value) {
+    this.oldSku_ = value;
+  }
+
+  /**
+   * @return {?boolean}
+   */
+  getOneTime() {
+    return this.oneTime_;
+  }
+
+  /**
+   * @param {boolean} value
+   */
+  setOneTime(value) {
+    this.oneTime_ = value;
+  }
+
+  /**
+   * @return {?string}
+   */
+  getPlayOffer() {
+    return this.playOffer_;
+  }
+
+  /**
+   * @param {string} value
+   */
+  setPlayOffer(value) {
+    this.playOffer_ = value;
+  }
+
+  /**
+   * @return {?string}
+   */
+  getOldPlayOffer() {
+    return this.oldPlayOffer_;
+  }
+
+  /**
+   * @param {string} value
+   */
+  setOldPlayOffer(value) {
+    this.oldPlayOffer_ = value;
+  }
+
+  /**
+   * @return {?string}
+   */
+  getCustomMessage() {
+    return this.customMessage_;
+  }
+
+  /**
+   * @param {string} value
+   */
+  setCustomMessage(value) {
+    this.customMessage_ = value;
+  }
+
+  /**
+   * @return {?boolean}
+   */
+  getAnonymous() {
+    return this.anonymous_;
+  }
+
+  /**
+   * @param {boolean} value
+   */
+  setAnonymous(value) {
+    this.anonymous_ = value;
+  }
+
+  /**
+   * @return {?boolean}
+   */
+  getSharingPolicyEnabled() {
+    return this.sharingPolicyEnabled_;
+  }
+
+  /**
+   * @param {boolean} value
+   */
+  setSharingPolicyEnabled(value) {
+    this.sharingPolicyEnabled_ = value;
+  }
+
+  /**
+   * @param {boolean=} includeLabel
+   * @return {!Array<?>}
+   * @override
+   */
+  toArray(includeLabel = true) {
+    const arr = [
+        this.sku_, // field 1 - sku
+        this.oldSku_, // field 2 - old_sku
+        this.oneTime_, // field 3 - one_time
+        this.playOffer_, // field 4 - play_offer
+        this.oldPlayOffer_, // field 5 - old_play_offer
+        this.customMessage_, // field 6 - custom_message
+        this.anonymous_, // field 7 - anonymous
+        this.sharingPolicyEnabled_, // field 8 - sharing_policy_enabled
+    ];
+    if (includeLabel) {
+      arr.unshift(this.label());
+    }
+    return arr;
+  }
+
+  /**
+   * @return {string}
+   * @override
+   */
+  label() {
+    return 'SkuSelectedResponse';
+  }
+}
+
+/**
+ * @implements {Message}
+ */
+class SmartBoxMessage {
+  /**
+   * @param {!Array<*>=} data
+   * @param {boolean=} includesLabel
+   */
+  constructor(data = [], includesLabel = true) {
+    const base = includesLabel ? 1 : 0;
+
+    /** @private {?boolean} */
+    this.isClicked_ = data[base] == null ? null : data[base];
+  }
+
+  /**
+   * @return {?boolean}
+   */
+  getIsClicked() {
+    return this.isClicked_;
+  }
+
+  /**
+   * @param {boolean} value
+   */
+  setIsClicked(value) {
+    this.isClicked_ = value;
+  }
+
+  /**
+   * @param {boolean=} includeLabel
+   * @return {!Array<?>}
+   * @override
+   */
+  toArray(includeLabel = true) {
+    const arr = [
+        this.isClicked_, // field 1 - is_clicked
+    ];
+    if (includeLabel) {
+      arr.unshift(this.label());
+    }
+    return arr;
+  }
+
+  /**
+   * @return {string}
+   * @override
+   */
+  label() {
+    return 'SmartBoxMessage';
+  }
+}
+
+/**
+ * @implements {Message}
+ */
+class SubscribeResponse$1 {
+  /**
+   * @param {!Array<*>=} data
+   * @param {boolean=} includesLabel
+   */
+  constructor(data = [], includesLabel = true) {
+    const base = includesLabel ? 1 : 0;
+
+    /** @private {?boolean} */
+    this.subscribe_ = data[base] == null ? null : data[base];
+  }
+
+  /**
+   * @return {?boolean}
+   */
+  getSubscribe() {
+    return this.subscribe_;
+  }
+
+  /**
+   * @param {boolean} value
+   */
+  setSubscribe(value) {
+    this.subscribe_ = value;
+  }
+
+  /**
+   * @param {boolean=} includeLabel
+   * @return {!Array<?>}
+   * @override
+   */
+  toArray(includeLabel = true) {
+    const arr = [
+        this.subscribe_, // field 1 - subscribe
+    ];
+    if (includeLabel) {
+      arr.unshift(this.label());
+    }
+    return arr;
+  }
+
+  /**
+   * @return {string}
+   * @override
+   */
+  label() {
+    return 'SubscribeResponse';
+  }
+}
+
+/**
+ * @implements {Message}
+ */
+class SubscriptionLinkingCompleteResponse {
+  /**
+   * @param {!Array<*>=} data
+   * @param {boolean=} includesLabel
+   */
+  constructor(data = [], includesLabel = true) {
+    const base = includesLabel ? 1 : 0;
+
+    /** @private {?string} */
+    this.publisherProvidedId_ = data[base] == null ? null : data[base];
+
+    /** @private {?boolean} */
+    this.success_ = data[1 + base] == null ? null : data[1 + base];
+  }
+
+  /**
+   * @return {?string}
+   */
+  getPublisherProvidedId() {
+    return this.publisherProvidedId_;
+  }
+
+  /**
+   * @param {string} value
+   */
+  setPublisherProvidedId(value) {
+    this.publisherProvidedId_ = value;
+  }
+
+  /**
+   * @return {?boolean}
+   */
+  getSuccess() {
+    return this.success_;
+  }
+
+  /**
+   * @param {boolean} value
+   */
+  setSuccess(value) {
+    this.success_ = value;
+  }
+
+  /**
+   * @param {boolean=} includeLabel
+   * @return {!Array<?>}
+   * @override
+   */
+  toArray(includeLabel = true) {
+    const arr = [
+        this.publisherProvidedId_, // field 1 - publisher_provided_id
+        this.success_, // field 2 - success
+    ];
+    if (includeLabel) {
+      arr.unshift(this.label());
+    }
+    return arr;
+  }
+
+  /**
+   * @return {string}
+   * @override
+   */
+  label() {
+    return 'SubscriptionLinkingCompleteResponse';
+  }
+}
+
+/**
+ * @implements {Message}
+ */
+class SubscriptionLinkingResponse {
+  /**
+   * @param {!Array<*>=} data
+   * @param {boolean=} includesLabel
+   */
+  constructor(data = [], includesLabel = true) {
+    const base = includesLabel ? 1 : 0;
+
+    /** @private {?string} */
+    this.publisherProvidedId_ = data[base] == null ? null : data[base];
   }
 
   /**
    * @return {?string}
    */
-  getUrlPath() {
-    return this.urlPath_;
+  getPublisherProvidedId() {
+    return this.publisherProvidedId_;
   }
 
   /**
    * @param {string} value
    */
-  setUrlPath(value) {
-    this.urlPath_ = value;
+  setPublisherProvidedId(value) {
+    this.publisherProvidedId_ = value;
   }
 
   /**
@@ -1444,7 +2172,7 @@ class OpenDialogRequest {
    */
   toArray(includeLabel = true) {
     const arr = [
-        this.urlPath_, // field 1 - url_path
+        this.publisherProvidedId_, // field 1 - publisher_provided_id
     ];
     if (includeLabel) {
       arr.unshift(this.label());
@@ -1457,14 +2185,14 @@ class OpenDialogRequest {
    * @override
    */
   label() {
-    return 'OpenDialogRequest';
+    return 'SubscriptionLinkingResponse';
   }
 }
 
 /**
  * @implements {Message}
  */
-class SkuSelectedResponse {
+class SurveyAnswer {
   /**
    * @param {!Array<*>=} data
    * @param {boolean=} includesLabel
@@ -1472,124 +2200,111 @@ class SkuSelectedResponse {
   constructor(data = [], includesLabel = true) {
     const base = includesLabel ? 1 : 0;
 
-    /** @private {?string} */
-    this.sku_ = data[base] == null ? null : data[base];
-
-    /** @private {?string} */
-    this.oldSku_ = data[1 + base] == null ? null : data[1 + base];
-
-    /** @private {?boolean} */
-    this.oneTime_ = data[2 + base] == null ? null : data[2 + base];
-
-    /** @private {?string} */
-    this.playOffer_ = data[3 + base] == null ? null : data[3 + base];
+    /** @private {?number} */
+    this.answerId_ = data[base] == null ? null : data[base];
 
     /** @private {?string} */
-    this.oldPlayOffer_ = data[4 + base] == null ? null : data[4 + base];
+    this.answerText_ = data[1 + base] == null ? null : data[1 + base];
 
     /** @private {?string} */
-    this.customMessage_ = data[5 + base] == null ? null : data[5 + base];
-
-    /** @private {?boolean} */
-    this.anonymous_ = data[6 + base] == null ? null : data[6 + base];
+    this.answerCategory_ = data[2 + base] == null ? null : data[2 + base];
   }
 
   /**
-   * @return {?string}
+   * @return {?number}
    */
-  getSku() {
-    return this.sku_;
+  getAnswerId() {
+    return this.answerId_;
   }
 
   /**
-   * @param {string} value
+   * @param {number} value
    */
-  setSku(value) {
-    this.sku_ = value;
+  setAnswerId(value) {
+    this.answerId_ = value;
   }
 
   /**
    * @return {?string}
    */
-  getOldSku() {
-    return this.oldSku_;
+  getAnswerText() {
+    return this.answerText_;
   }
 
   /**
    * @param {string} value
    */
-  setOldSku(value) {
-    this.oldSku_ = value;
-  }
-
-  /**
-   * @return {?boolean}
-   */
-  getOneTime() {
-    return this.oneTime_;
-  }
-
-  /**
-   * @param {boolean} value
-   */
-  setOneTime(value) {
-    this.oneTime_ = value;
+  setAnswerText(value) {
+    this.answerText_ = value;
   }
 
   /**
    * @return {?string}
    */
-  getPlayOffer() {
-    return this.playOffer_;
+  getAnswerCategory() {
+    return this.answerCategory_;
   }
 
   /**
    * @param {string} value
    */
-  setPlayOffer(value) {
-    this.playOffer_ = value;
+  setAnswerCategory(value) {
+    this.answerCategory_ = value;
   }
 
   /**
-   * @return {?string}
+   * @param {boolean=} includeLabel
+   * @return {!Array<?>}
+   * @override
    */
-  getOldPlayOffer() {
-    return this.oldPlayOffer_;
+  toArray(includeLabel = true) {
+    const arr = [
+        this.answerId_, // field 1 - answer_id
+        this.answerText_, // field 2 - answer_text
+        this.answerCategory_, // field 3 - answer_category
+    ];
+    if (includeLabel) {
+      arr.unshift(this.label());
+    }
+    return arr;
   }
 
   /**
-   * @param {string} value
+   * @return {string}
+   * @override
    */
-  setOldPlayOffer(value) {
-    this.oldPlayOffer_ = value;
+  label() {
+    return 'SurveyAnswer';
   }
+}
 
+/**
+ * @implements {Message}
+ */
+class SurveyDataTransferRequest {
   /**
-   * @return {?string}
+   * @param {!Array<*>=} data
+   * @param {boolean=} includesLabel
    */
-  getCustomMessage() {
-    return this.customMessage_;
-  }
+  constructor(data = [], includesLabel = true) {
+    const base = includesLabel ? 1 : 0;
 
-  /**
-   * @param {string} value
-   */
-  setCustomMessage(value) {
-    this.customMessage_ = value;
+    /** @private {!Array<!SurveyQuestion>} */
+    this.surveyQuestions_ = (data[base] || []).map(item => new SurveyQuestion(item, includesLabel));
   }
 
   /**
-   * @return {?boolean}
+   * @return {!Array<!SurveyQuestion>}
    */
-  getAnonymous() {
-    return this.anonymous_;
+  getSurveyQuestionsList() {
+    return this.surveyQuestions_;
   }
 
   /**
-   * @param {boolean} value
+   * @param {!Array<!SurveyQuestion>} value
    */
-  setAnonymous(value) {
-    this.anonymous_ = value;
+  setSurveyQuestionsList(value) {
+    this.surveyQuestions_ = value;
   }
 
   /**
@@ -1599,13 +2314,7 @@ class SkuSelectedResponse {
    */
   toArray(includeLabel = true) {
     const arr = [
-        this.sku_, // field 1 - sku
-        this.oldSku_, // field 2 - old_sku
-        this.oneTime_, // field 3 - one_time
-        this.playOffer_, // field 4 - play_offer
-        this.oldPlayOffer_, // field 5 - old_play_offer
-        this.customMessage_, // field 6 - custom_message
-        this.anonymous_, // field 7 - anonymous
+        this.surveyQuestions_ ? this.surveyQuestions_.map(item => item.toArray(includeLabel)) : [], // field 1 - survey_questions
     ];
     if (includeLabel) {
       arr.unshift(this.label());
@@ -1618,14 +2327,14 @@ class SkuSelectedResponse {
    * @override
    */
   label() {
-    return 'SkuSelectedResponse';
+    return 'SurveyDataTransferRequest';
   }
 }
 
 /**
  * @implements {Message}
  */
-class SmartBoxMessage {
+class SurveyDataTransferResponse {
   /**
    * @param {!Array<*>=} data
    * @param {boolean=} includesLabel
@@ -1634,21 +2343,21 @@ class SmartBoxMessage {
     const base = includesLabel ? 1 : 0;
 
     /** @private {?boolean} */
-    this.isClicked_ = data[base] == null ? null : data[base];
+    this.success_ = data[base] == null ? null : data[base];
   }
 
   /**
    * @return {?boolean}
    */
-  getIsClicked() {
-    return this.isClicked_;
+  getSuccess() {
+    return this.success_;
   }
 
   /**
    * @param {boolean} value
    */
-  setIsClicked(value) {
-    this.isClicked_ = value;
+  setSuccess(value) {
+    this.success_ = value;
   }
 
   /**
@@ -1658,7 +2367,7 @@ class SmartBoxMessage {
    */
   toArray(includeLabel = true) {
     const arr = [
-        this.isClicked_, // field 1 - is_clicked
+        this.success_, // field 1 - success
     ];
     if (includeLabel) {
       arr.unshift(this.label());
@@ -1671,14 +2380,14 @@ class SmartBoxMessage {
    * @override
    */
   label() {
-    return 'SmartBoxMessage';
+    return 'SurveyDataTransferResponse';
   }
 }
 
 /**
  * @implements {Message}
  */
-class SubscribeResponse$1 {
+class SurveyQuestion {
   /**
    * @param {!Array<*>=} data
    * @param {boolean=} includesLabel
@@ -1686,22 +2395,73 @@ class SubscribeResponse$1 {
   constructor(data = [], includesLabel = true) {
     const base = includesLabel ? 1 : 0;
 
-    /** @private {?boolean} */
-    this.subscribe_ = data[base] == null ? null : data[base];
+    /** @private {?number} */
+    this.questionId_ = data[base] == null ? null : data[base];
+
+    /** @private {?string} */
+    this.questionText_ = data[1 + base] == null ? null : data[1 + base];
+
+    /** @private {?string} */
+    this.questionCategory_ = data[2 + base] == null ? null : data[2 + base];
+
+    /** @private {!Array<!SurveyAnswer>} */
+    this.surveyAnswers_ = (data[3 + base] || []).map(item => new SurveyAnswer(item, includesLabel));
   }
 
   /**
-   * @return {?boolean}
+   * @return {?number}
    */
-  getSubscribe() {
-    return this.subscribe_;
+  getQuestionId() {
+    return this.questionId_;
   }
 
   /**
-   * @param {boolean} value
+   * @param {number} value
    */
-  setSubscribe(value) {
-    this.subscribe_ = value;
+  setQuestionId(value) {
+    this.questionId_ = value;
+  }
+
+  /**
+   * @return {?string}
+   */
+  getQuestionText() {
+    return this.questionText_;
+  }
+
+  /**
+   * @param {string} value
+   */
+  setQuestionText(value) {
+    this.questionText_ = value;
+  }
+
+  /**
+   * @return {?string}
+   */
+  getQuestionCategory() {
+    return this.questionCategory_;
+  }
+
+  /**
+   * @param {string} value
+   */
+  setQuestionCategory(value) {
+    this.questionCategory_ = value;
+  }
+
+  /**
+   * @return {!Array<!SurveyAnswer>}
+   */
+  getSurveyAnswersList() {
+    return this.surveyAnswers_;
+  }
+
+  /**
+   * @param {!Array<!SurveyAnswer>} value
+   */
+  setSurveyAnswersList(value) {
+    this.surveyAnswers_ = value;
   }
 
   /**
@@ -1711,7 +2471,10 @@ class SubscribeResponse$1 {
    */
   toArray(includeLabel = true) {
     const arr = [
-        this.subscribe_, // field 1 - subscribe
+        this.questionId_, // field 1 - question_id
+        this.questionText_, // field 2 - question_text
+        this.questionCategory_, // field 3 - question_category
+        this.surveyAnswers_ ? this.surveyAnswers_.map(item => item.toArray(includeLabel)) : [], // field 4 - survey_answers
     ];
     if (includeLabel) {
       arr.unshift(this.label());
@@ -1724,7 +2487,7 @@ class SubscribeResponse$1 {
    * @override
    */
   label() {
-    return 'SubscribeResponse';
+    return 'SurveyQuestion';
   }
 }
 
@@ -1912,6 +2675,8 @@ const PROTO_MAP = {
   'AnalyticsContext': AnalyticsContext,
   'AnalyticsEventMeta': AnalyticsEventMeta,
   'AnalyticsRequest': AnalyticsRequest,
+  'AudienceActivityClientLogsRequest': AudienceActivityClientLogsRequest,
+  'CompleteAudienceActionResponse': CompleteAudienceActionResponse,
   'EntitlementJwt': EntitlementJwt,
   'EntitlementsRequest': EntitlementsRequest,
   'EntitlementsResponse': EntitlementsResponse,
@@ -1923,6 +2688,12 @@ const PROTO_MAP = {
   'SkuSelectedResponse': SkuSelectedResponse,
   'SmartBoxMessage': SmartBoxMessage,
   'SubscribeResponse': SubscribeResponse$1,
+  'SubscriptionLinkingCompleteResponse': SubscriptionLinkingCompleteResponse,
+  'SubscriptionLinkingResponse': SubscriptionLinkingResponse,
+  'SurveyAnswer': SurveyAnswer,
+  'SurveyDataTransferRequest': SurveyDataTransferRequest,
+  'SurveyDataTransferResponse': SurveyDataTransferResponse,
+  'SurveyQuestion': SurveyQuestion,
   'Timestamp': Timestamp,
   'ToastCloseRequest': ToastCloseRequest,
   'ViewSubscriptionsResponse': ViewSubscriptionsResponse,
@@ -2005,7 +2776,7 @@ class ClientEventManagerApi {
   /**
    * Call this function to log an event. The registered listeners will be
    * invoked unless the event is filtered.
-   * @param {!function(!ClientEvent)} listener
+   * @param {!function(!ClientEvent, (!ClientEventParams|undefined)=)} listener
    */
   registerEventListener(listener) {}
 
@@ -2024,10 +2795,10 @@ class ClientEventManagerApi {
    * stop the event if a filterer cancels it.  After that, it will call each
    * listener asynchronously.
    * @param {!ClientEvent} event
+   * @param {(!ClientEventParams|undefined)=} eventParams
    */
-  logEvent(event) {}
+  logEvent(event, eventParams = undefined) {}
 }
-/* eslint-enable no-unused-vars */
 
 /**
  * Copyright 2018 The Subscribe with Google Authors. All Rights Reserved.
@@ -2858,9 +3629,9 @@ function setStyles(element, styles) {
  */
 function resetStyles(element, properties) {
   const styleObj = {};
-  properties.forEach((prop) => {
-    styleObj[prop] = null;
-  });
+  for (const property of properties) {
+    styleObj[property] = null;
+  }
   setStyles(element, styleObj);
 }
 
@@ -3095,7 +3866,7 @@ class ActivityIframeView extends View {
    * @param {!Window} win
    * @param {!../components/activities.ActivityPorts} activityPorts
    * @param {string} src
-   * @param {!Object<string, ?>=} args
+   * @param {!Object<string, ?>=} args Additional data to be passed to the iframe.
    * @param {boolean=} shouldFadeBody
    * @param {boolean=} hasLoadingIndicator
    */
@@ -3308,6 +4079,8 @@ const Constants$1 = {};
  */
 Constants$1.USER_TOKEN = 'USER_TOKEN';
 
+Constants$1.READ_TIME = 'READ_TIME';
+
 /**
  * Copyright 2018 The Subscribe with Google Authors. All Rights Reserved.
  *
@@ -3451,6 +4224,9 @@ class JwtHelper {
  * limitations under the License.
  */
 
+/** Source for Google-provided non-metering entitlements. */
+const GOOGLE_SOURCE = 'google';
+
 /** Source for Google-provided metering entitlements. */
 const GOOGLE_METERING_SOURCE = 'google:metering';
 
@@ -3460,6 +4236,9 @@ const PRIVILEGED_SOURCE = 'privileged';
 /** Subscription token for dev mode entitlements. */
 const DEV_MODE_TOKEN = 'GOOGLE_DEV_MODE_TOKEN';
 
+/** Order ID returned for dev mode entitlements. */
+const DEV_MODE_ORDER = 'GOOGLE_DEV_MODE_ORDER';
+
 /**
  * The holder of the entitlements for a service.
  */
@@ -3542,16 +4321,18 @@ class Entitlements {
     const entitlement = this.getEntitlementForThis();
     return (
       !!entitlement &&
-      entitlement.source !== GOOGLE_METERING_SOURCE &&
-      entitlement.subscriptionToken !== DEV_MODE_TOKEN
+      !this.enablesThisWithGoogleMetering() &&
+      !this.enablesThisWithGoogleDevMode()
     );
   }
 
   /**
    * Returns true if the current article is unlocked by a
-   * Google metering entitlement. These entitlements come
+   * Google metering entitlement. These entitlements may come
    * from Google News Intiative's licensing program to support news.
    * https://www.blog.google/outreach-initiatives/google-news-initiative/licensing-program-support-news-industry-/
+   * They may also come from Google's Subscribe With Google Metering
+   * functionality.
    * @return {boolean}
    */
   enablesThisWithGoogleMetering() {
@@ -3559,6 +4340,23 @@ class Entitlements {
     return !!entitlement && entitlement.source === GOOGLE_METERING_SOURCE;
   }
 
+  /**
+   * Returns true if the current article is unlocked by a Google dev mode
+   * entitlement.
+   * @return {boolean}
+   */
+  enablesThisWithGoogleDevMode() {
+    const entitlement = this.getEntitlementForThis();
+    if (!entitlement) {
+      return false;
+    }
+    const isFirstPartyToken =
+      entitlement.source === GOOGLE_SOURCE &&
+      entitlement.subscriptionToken.indexOf(DEV_MODE_ORDER) !== -1;
+    const isThirdPartyToken = entitlement.subscriptionToken === DEV_MODE_TOKEN;
+    return isFirstPartyToken || isThirdPartyToken;
+  }
+
   /**
    * @param {string=} source
    * @return {boolean}
@@ -3700,14 +4498,26 @@ class Entitlement {
    * @param {string} source
    * @param {!Array<string>} products
    * @param {string} subscriptionToken
+   * @param {JsonObject|null|undefined} subscriptionTokenContents
+   * @param {!Timestamp|null} subscriptionTimestamp
    */
-  constructor(source, products, subscriptionToken) {
+  constructor(
+    source,
+    products,
+    subscriptionToken,
+    subscriptionTokenContents,
+    subscriptionTimestamp
+  ) {
     /** @const {string} */
     this.source = source;
     /** @const {!Array<string>} */
     this.products = products;
     /** @const {string} */
     this.subscriptionToken = subscriptionToken;
+    /** @const {JsonObject|null|undefined} */
+    this.subscriptionTokenContents = subscriptionTokenContents;
+    /** @const {!Timestamp|null} */
+    this.subscriptionTimestamp = subscriptionTimestamp;
   }
 
   /**
@@ -3717,7 +4527,9 @@ class Entitlement {
     return new Entitlement(
       this.source,
       this.products.slice(0),
-      this.subscriptionToken
+      this.subscriptionToken,
+      this.subscriptionTokenContents,
+      this.subscriptionTimestamp
     );
   }
 
@@ -3765,16 +4577,42 @@ class Entitlement {
 
   /**
    * @param {?Object} json
+   * @param {!../utils/jwt.JwtHelper} jwtHelper
    * @return {!Entitlement}
    */
-  static parseFromJson(json) {
+  static parseFromJson(json, jwtHelper) {
     if (!json) {
       json = {};
     }
     const source = json['source'] || '';
     const products = json['products'] || [];
     const subscriptionToken = json['subscriptionToken'];
-    return new Entitlement(source, products, subscriptionToken);
+    let subscriptionTokenContents;
+    try {
+      subscriptionTokenContents = subscriptionToken
+        ? jwtHelper.decode(subscriptionToken)
+        : null;
+    } catch (e) {
+      subscriptionTokenContents = null;
+    }
+
+    const timestampJson = json['subscriptionTimestamp'];
+    let subscriptionTimestamp;
+    try {
+      subscriptionTimestamp = new Timestamp(
+        [timestampJson.seconds_, timestampJson.nanos_],
+        false
+      );
+    } catch (e) {
+      subscriptionTimestamp = null;
+    }
+    return new Entitlement(
+      source,
+      products,
+      subscriptionToken,
+      subscriptionTokenContents,
+      subscriptionTimestamp
+    );
   }
 
   /**
@@ -3782,13 +4620,14 @@ class Entitlement {
    * - Single entitlement: `{products: [], ...}`.
    * - A list of entitlements: `[{products: [], ...}, {...}]`.
    * @param {!Object|!Array<!Object>} json
+   * @param {!../utils/jwt.JwtHelper} jwtHelper
    * @return {!Array<!Entitlement>}
    */
-  static parseListFromJson(json) {
+  static parseListFromJson(json, jwtHelper) {
     const jsonList = Array.isArray(json)
       ? /** @type {!Array<Object>} */ (json)
       : [json];
-    return jsonList.map((json) => Entitlement.parseFromJson(json));
+    return jsonList.map((json) => Entitlement.parseFromJson(json, jwtHelper));
   }
 
   /**
@@ -4441,9 +5280,6 @@ function defaultConfig() {
  * limitations under the License.
  */
 
-// NOTE: This regex was copied from SwG's AMP extension. https://github.com/ampproject/amphtml/blob/c23bf281f817a2ee5df73f6fd45e9f4b71bb68b6/extensions/amp-subscriptions-google/0.1/amp-subscriptions-google.js#L56
-const GOOGLE_DOMAIN_RE = /(^|\.)google\.(com?|[a-z]{2}|com?\.[a-z]{2}|cat)$/;
-
 /**
  * Cached a-tag to avoid memory allocation during URL parsing.
  * @type {HTMLAnchorElement}
@@ -4492,12 +5328,6 @@ function parseUrl(url) {
 function parseUrlWithA(a, url) {
   a.href = url;
 
-  // IE11 doesn't provide full URL components when parsing relative URLs.
-  // Assigning to itself again does the trick.
-  if (!a.protocol) {
-    a.href = a.href;
-  }
-
   /** @type {!LocationDef} */
   const info = {
     href: a.href,
@@ -4508,33 +5338,15 @@ function parseUrlWithA(a, url) {
     pathname: a.pathname,
     search: a.search,
     hash: a.hash,
-    origin: '', // Set below.
+    origin: a.protocol + '//' + a.host,
   };
 
-  // Some IE11 specific polyfills.
-  // 1) IE11 strips out the leading '/' in the pathname.
-  if (info.pathname[0] !== '/') {
-    info.pathname = '/' + info.pathname;
-  }
-
-  // 2) For URLs with implicit ports, IE11 parses to default ports while
-  // other browsers leave the port field empty.
-  if (
-    (info.protocol == 'http:' && info.port == 80) ||
-    (info.protocol == 'https:' && info.port == 443)
-  ) {
-    info.port = '';
-    info.host = info.hostname;
-  }
-
   // For data URI a.origin is equal to the string 'null' which is not useful.
   // We instead return the actual origin which is the full URL.
-  if (a.origin && a.origin != 'null') {
+  if (a.origin && a.origin !== 'null') {
     info.origin = a.origin;
-  } else if (info.protocol == 'data:' || !info.host) {
+  } else if (info.protocol === 'data:' || !info.host) {
     info.origin = info.href;
-  } else {
-    info.origin = info.protocol + '//' + info.host;
   }
   return info;
 }
@@ -4599,26 +5411,23 @@ function serializeProtoMessageForUrl(message) {
 }
 
 /**
+ * Returns the canonical URL from the canonical tag. If the canonical tag is
+ * not present, treat the doc URL itself as canonical.
  * @param {!../model/doc.Doc} doc
  * @return {string}
  */
 function getCanonicalUrl(doc) {
-  const node = doc.getRootNode().querySelector("link[rel='canonical']");
-  return (node && node.href) || '';
+  const rootNode = doc.getRootNode();
+  const canonicalTag = rootNode.querySelector("link[rel='canonical']");
+  return (
+    canonicalTag?.href ||
+    rootNode.location?.origin + rootNode.location?.pathname ||
+    ''
+  );
 }
 
 const PARSED_URL = parseUrl(self.window.location.href);
-const PARSED_REFERRER = parseUrl(self.document.referrer);
-
-/**
- * True for Google domains
- * @param {LocationDef=} parsedUrl Defaults to the current page's URL
- * @return {boolean}
- */
-function isGoogleDomain(parsedUrl) {
-  parsedUrl = parsedUrl || PARSED_URL;
-  return GOOGLE_DOMAIN_RE.test(parsedUrl.hostname);
-}
+parseUrl(self.document.referrer);
 
 /**
  * True for HTTPS URLs
@@ -4630,17 +5439,6 @@ function isSecure(parsedUrl) {
   return parsedUrl.protocol === 'https' || parsedUrl.protocol === 'https:';
 }
 
-/**
- * True when the page is rendered within a secure Google application or
- * was linked to from a secure Google domain.
- * @param {LocationDef=} parsedReferrer Defaults to the current page's referrer
- * @return {boolean}
- */
-function wasReferredByGoogle(parsedReferrer) {
-  parsedReferrer = parsedReferrer || PARSED_REFERRER;
-  return isSecure(parsedReferrer) && isGoogleDomain(parsedReferrer);
-}
-
 /**
  * Copyright 2018 The Subscribe with Google Authors. All Rights Reserved.
  *
@@ -4752,6 +5550,13 @@ function feOrigin() {
  * @return {string} The complete URL.
  */
 function serviceUrl(url) {
+  // Allows us to make API calls with enabled experiments.
+  const query = parseQueryString(self.location.hash);
+  const experiments = query['swg.experiments'];
+  if (experiments !== undefined) {
+    url = addQueryParam(url, 'e', experiments);
+  }
+
   return `${getSwgMode().frontEnd}/swg/_/api/v1` + url;
 }
 
@@ -4769,18 +5574,9 @@ function adsUrl(url) {
  * @param {Object<string, string>=} params List of extra params to append to the URL.
  * @return {string} The complete URL.
  */
-function feUrl(
-  url,
-  params = {},
-  usePrefixedHostPath = false,
-  prefix = ''
-) {
+function feUrl(url, params = {}, prefix = '') {
   // Add cache param.
-  const prefixed = prefix
-    ? usePrefixedHostPath
-      ? `swg/${prefix}`
-      : `${prefix}/swg`
-    : 'swg';
+  const prefixed = prefix ? `swg/${prefix}` : 'swg';
   url = feCached(`${getSwgMode().frontEnd}/${prefixed}/_/ui/v1${url}`);
 
   // Optionally add jsmode param. This allows us to test against "aggressively" compiled Boq JS.
@@ -4790,6 +5586,12 @@ function feUrl(
     url = addQueryParam(url, 'jsmode', boqJsMode);
   }
 
+  // Allows us to open iframes with enabled experiments.
+  const experiments = query['swg.experiments'];
+  if (experiments !== undefined) {
+    url = addQueryParam(url, 'e', experiments);
+  }
+
   for (const param in params) {
     url = addQueryParam(url, param, params[param]);
   }
@@ -4811,7 +5613,7 @@ function feCached(url) {
  */
 function feArgs(args) {
   return Object.assign(args, {
-    '_client': 'SwG 0.1.22.192',
+    '_client': 'SwG 3579668c',
   });
 }
 
@@ -5005,8 +5807,8 @@ class PayStartFlow {
       {
         forceRedirect:
           this.deps_.config().windowOpenMode == WindowOpenMode.REDIRECT,
-        // basic flow does not support native.
-        forceDisableNative: paySwgVersion == '2',
+        // SwG basic and TwG flows do not support native.
+        forceDisableNative: paySwgVersion == '2' || paySwgVersion == '3',
       }
     );
     return Promise.resolve();
@@ -5155,10 +5957,13 @@ class PayCompleteFlow {
         publicationId: args.publicationId,
         offerId: this.sku_,
         origin: parseUrl(this.win_.location.href).origin,
+        isPaid: true,
+        checkOrderStatus: true,
       });
       if (response.requestMetadata) {
         urlParams.canonicalUrl = response.requestMetadata.contentId;
         urlParams.isAnonymous = response.requestMetadata.anonymous;
+        args['contentTitle'] = response.requestMetadata.contentTitle;
       }
 
       // Add feArgs to be passed via activities.
@@ -5179,6 +5984,8 @@ class PayCompleteFlow {
       .getClientConfig()
       .then((clientConfig) => {
         args['useUpdatedConfirmUi'] = clientConfig.useUpdatedOfferFlows;
+        args['skipAccountCreationScreen'] =
+          clientConfig.skipAccountCreationScreen;
         return new ActivityIframeView(
           this.win_,
           this.activityPorts_,
@@ -5199,6 +6006,11 @@ class PayCompleteFlow {
         });
 
         this.readyPromise_ = this.dialogManager_.openView(activityIframeView);
+
+        this.readyPromise_.then(() => {
+          this.deps_.callbacks().triggerPayConfirmOpened(activityIframeView);
+        });
+
         return activityIframeView;
       }));
   }
@@ -5223,26 +6035,37 @@ class PayCompleteFlow {
       true,
       getEventParams$1(this.sku_ || '')
     );
+    const now = Date.now().toString();
+    this.deps_
+      .storage()
+      .set(Constants$1.READ_TIME, now, /*useLocalStorage=*/ false);
     this.deps_.entitlementsManager().unblockNextNotification();
     return Promise.all([
       this.activityIframeViewPromise_,
       this.readyPromise_,
+      this.clientConfigManager_.getClientConfig(),
     ]).then((values) => {
       const activityIframeView = values[0];
-      const accountCompletionRequest = new AccountCreationRequest();
-      accountCompletionRequest.setComplete(true);
-      activityIframeView.execute(accountCompletionRequest);
+      const clientConfig = values[2];
+      // Skip account creation screen if requested (needed for AMP)
+      if (!clientConfig.skipAccountCreationScreen) {
+        const accountCompletionRequest = new AccountCreationRequest();
+        accountCompletionRequest.setComplete(true);
+        activityIframeView.execute(accountCompletionRequest);
+      }
       return activityIframeView
         .acceptResult()
         .catch(() => {
           // Ignore errors.
         })
         .then(() => {
-          this.eventManager_.logSwgEvent(
-            AnalyticsEvent.ACTION_ACCOUNT_ACKNOWLEDGED,
-            true,
-            getEventParams$1(this.sku_ || '')
-          );
+          if (!clientConfig.skipAccountCreationScreen) {
+            this.eventManager_.logSwgEvent(
+              AnalyticsEvent.ACTION_ACCOUNT_ACKNOWLEDGED,
+              true,
+              getEventParams$1(this.sku_ || '')
+            );
+          }
           this.deps_.entitlementsManager().setToastShown(true);
         });
     });
@@ -5340,6 +6163,11 @@ function parseSubscriptionResponse(deps, data, completeHandler) {
           (data['paymentRequest']['i'] || {})['productType'] ||
           ProductType.SUBSCRIPTION;
       }
+      // Set productType if paymentRequest is not present, which happens
+      // if the pay flow was opened in redirect mode.
+      else if ('productType' in data) {
+        productType = data['productType'];
+      }
     }
   }
   if (raw && !swgData) {
@@ -5542,7 +6370,7 @@ class OffersFlow {
           ? new ActivityIframeView(
               this.win_,
               this.activityPorts_,
-              this.getUrl_(clientConfig),
+              this.getUrl_(clientConfig, deps.pageConfig()),
               feArgsObj,
               /* shouldFadeBody */ true
             )
@@ -5647,7 +6475,10 @@ class OffersFlow {
           return this.dialogManager_.openView(
             this.activityIframeView_,
             /* hidden */ false,
-            this.getDialogConfig_(clientConfig)
+            this.getDialogConfig_(
+              clientConfig,
+              this.clientConfigManager_.shouldAllowScroll()
+            )
           );
         });
       });
@@ -5669,33 +6500,42 @@ class OffersFlow {
   /**
    * Gets display configuration options for the opened dialog. Uses the
    * responsive desktop design properties if the updated offer flows UI (for
-   * SwG Basic) is enabled.
+   * SwG Basic) is enabled. Permits override to allow scrolling.
    * @param {!../model/client-config.ClientConfig} clientConfig
+   * @param {boolean} shouldAllowScroll
    * @return {!../components/dialog.DialogConfig}
    */
-  getDialogConfig_(clientConfig) {
+  getDialogConfig_(clientConfig, shouldAllowScroll) {
     return clientConfig.useUpdatedOfferFlows
-      ? {desktopConfig: {isCenterPositioned: true, supportsWideScreen: true}}
+      ? {
+          desktopConfig: {isCenterPositioned: true, supportsWideScreen: true},
+          shouldDisableBodyScrolling: !shouldAllowScroll,
+        }
       : {};
   }
 
   /**
    * Returns the full URL that should be used for the activity iFrame view.
    * @param {!../model/client-config.ClientConfig} clientConfig
+   * @param {!../model/page-config.PageConfig} pageConfig
    * @return {string}
    */
-  getUrl_(clientConfig) {
+  getUrl_(clientConfig, pageConfig) {
     if (!clientConfig.useUpdatedOfferFlows) {
       return feUrl('/offersiframe');
     }
 
+    const params = {'publicationId': pageConfig.getPublicationId()};
+
     if (this.clientConfigManager_.shouldForceLangInIframes()) {
-      return feUrl('/subscriptionoffersiframe', {
-        'hl': this.clientConfigManager_.getLanguage(),
-      });
+      params['hl'] = this.clientConfigManager_.getLanguage();
+    }
+
+    if (clientConfig.uiPredicates?.purchaseUnavailableRegion) {
+      params['purchaseUnavailableRegion'] = 'true';
     }
 
-    return feUrl('/subscriptionoffersiframe');
+    return feUrl('/subscriptionoffersiframe', params);
   }
 
   /**
@@ -6115,7 +6955,7 @@ class ActivityPorts$1 {
         'analyticsContext': context.toArray(),
         'publicationId': pageConfig.getPublicationId(),
         'productId': pageConfig.getProductId(),
-        '_client': 'SwG 0.1.22.192',
+        '_client': 'SwG 3579668c',
         'supportsEventManager': true,
       },
       args || {}
@@ -6146,7 +6986,22 @@ class ActivityPorts$1 {
     if (addDefaultArguments) {
       args = this.addDefaultArguments(args);
     }
-    return this.openActivityIframePort_(iframe, url, args);
+    return this.deps_
+      .storage()
+      .get(Constants$1.USER_TOKEN, /* useLocalStorage= */ true)
+      .then((swgUserToken) => {
+        const queryParams = new URL(url).searchParams;
+        if (swgUserToken && !queryParams.has('sut')) {
+          url = addQueryParam(url, 'sut', swgUserToken);
+        }
+
+        const pubId = this.deps_.pageConfig().getPublicationId();
+        if (pubId && !queryParams.has('publicationId')) {
+          url = addQueryParam(url, 'publicationId', pubId);
+        }
+
+        return this.openActivityIframePort_(iframe, url, args);
+      });
   }
 
   /**
@@ -6378,7 +7233,7 @@ class ClientEventManager {
    * @param {!Promise} configuredPromise
    */
   constructor(configuredPromise) {
-    /** @private {!Array<function(!../api/client-event-manager-api.ClientEvent)>} */
+    /** @private {!Array<function(!../api/client-event-manager-api.ClientEvent, (!../api/client-event-manager-api.ClientEventParams|undefined)=)>} */
     this.listeners_ = [];
 
     /** @private {!Array<function(!../api/client-event-manager-api.ClientEvent):!FilterResult>} */
@@ -6414,8 +7269,9 @@ class ClientEventManager {
   /**
    * @overrides
    * @param {!../api/client-event-manager-api.ClientEvent} event
+   * @param {(!../api/client-event-manager-api.ClientEventParams|undefined)=} eventParams
    */
-  logEvent(event) {
+  logEvent(event, eventParams = undefined) {
     validateEvent(event);
     this.lastAction_ = this.isReadyPromise_.then(() => {
       for (let filterer = 0; filterer < this.filterers_.length; filterer++) {
@@ -6429,7 +7285,7 @@ class ClientEventManager {
       }
       for (let listener = 0; listener < this.listeners_.length; listener++) {
         try {
-          this.listeners_[listener](event);
+          this.listeners_[listener](event, eventParams);
         } catch (e) {
           log(e);
         }
@@ -6521,6 +7377,27 @@ const ExperimentFlags = {
    * Experiment flag for guarding changes to fix PayClient redirect flow.
    */
   PAY_CLIENT_REDIRECT: 'pay-client-redirect',
+
+  /**
+   * Directs basic-runtime to use the article endpoint instead of the separate
+   * entitlements and clientconfiguration endpoints.
+   */
+  USE_ARTICLE_ENDPOINT: 'use-article-endpoint',
+
+  /**
+   * Experiment flag for logging audience activity.
+   */
+  LOGGING_AUDIENCE_ACTIVITY: 'logging-audience-activity',
+
+  /**
+   * Experiment flag for swapping the location of the counter and the main CTA in Amplio blogs.
+   */
+  TWG_SWAP_COUNTER_AND_CTA: 'counter_cta_swap_enable_experiment',
+
+  /**
+   * Experiment flag for disabling the miniprompt icon on desktop screens wider than 480px.
+   */
+  DISABLE_DESKTOP_MINIPROMPT: 'disable-desktop-miniprompt',
 };
 
 /**
@@ -6563,6 +7440,22 @@ const ExperimentFlags = {
  *    control. In this case, 20% of the impressions will be split into two
  *    categories: experiment and control. Notice, a control can be requested
  *    only for the fraction under 20%.
+ *
+ * Server-side experiments in SwG.
+ *
+ * These are only observed at runtime via the `#swg.experiments=${experimentsString}`
+ * parameter in the URL's fragment.
+ *
+ * The `${experimentsString}` follows the convention of comma separated
+ * experiment ID's, optionally prefixed with hyphen (`-`) indicating you want
+ * the experiment to be disabled.
+ *
+ * An example would look like:
+ *  - `MyExperiment,-OtherExperiment` - indicates that you would like `MyExperiment`
+ * to be enabled and `OtherExperiment` to be disabled.
+ *
+ * Due to restrictions, server flags can only be enabled following the
+ * internal policy; otherwise they are ignored.
  */
 
 /**
@@ -6607,18 +7500,18 @@ function getExperiments(win) {
 
     // Format:
     // - experimentString = (experimentSpec,)*
-    combinedExperimentString.split(',').forEach((s) => {
-      s = s.trim();
-      if (!s) {
-        return;
+    for (let experimentString of combinedExperimentString.split(',')) {
+      experimentString = experimentString.trim();
+      if (!experimentString) {
+        continue;
       }
       try {
-        parseSetExperiment(win, experimentMap, s);
+        parseSetExperiment(win, experimentMap, experimentString);
       } catch (e) {
         // Ignore: experiment parsing cannot block runtime.
         ErrorUtils.throwAsync(e);
       }
-    });
+    }
   }
   return experimentMap;
 }
@@ -6774,6 +7667,25 @@ function toTimestamp(millis) {
   );
 }
 
+/**
+ * @param {!number} timestamp represented as seconds, milliseconds or microseconds
+ * @return {!number}
+ */
+function convertPotentialTimestampToMilliseconds(timestamp) {
+  let timestampInMilliseconds;
+  if (timestamp >= 1e14 || timestamp <= -1e14) {
+    // Microseconds
+    timestampInMilliseconds = Math.floor(timestamp / 1000);
+  } else if (timestamp >= 1e11 || timestamp <= -3e10) {
+    // Milliseconds
+    timestampInMilliseconds = timestamp;
+  } else {
+    // Seconds
+    timestampInMilliseconds = Math.floor(timestamp * 1000);
+  }
+  return timestampInMilliseconds;
+}
+
 /**
  * Copyright 2018 The Subscribe with Google Authors. All Rights Reserved.
  *
@@ -6891,6 +7803,24 @@ class AnalyticsService {
     this.getTimestamp_ = () => {
       return toTimestamp(Date.now());
     };
+
+    // While false, we will buffer logs instead of sending them to the analytics service.
+    /** @private {boolean} */
+    this.readyForLogging_ = false;
+
+    // Stores log events while we wait to be ready for logging.
+    /** @private {Array<!../api/client-event-manager-api.ClientEvent>}*/
+    this.logs_ = [];
+  }
+
+  /**
+   * Sets ready for logging to true and logs all the client events that were previously buffered.
+   */
+  setReadyForLogging() {
+    this.readyForLogging_ = true;
+    this.logs_.forEach((event) => {
+      this.handleClientEvent_(event);
+    });
   }
 
   /**
@@ -6945,11 +7875,11 @@ class AnalyticsService {
   addLabels(labels) {
     if (labels && labels.length > 0) {
       const newLabels = [].concat(this.context_.getLabelList());
-      labels.forEach((label) => {
+      for (const label of labels) {
         if (newLabels.indexOf(label) == -1) {
           newLabels.push(label);
         }
-      });
+      }
       this.context_.setLabelList(newLabels);
     }
   }
@@ -6994,7 +7924,7 @@ class AnalyticsService {
       context.setTransactionId(getUuid());
     }
     context.setReferringOrigin(parseUrl(this.getReferrer_()).origin);
-    context.setClientVersion('SwG 0.1.22.192');
+    context.setClientVersion('SwG 3579668c');
     context.setUrl(getCanonicalUrl(this.doc_));
 
     const utmParams = parseQueryString(this.getQueryString_());
@@ -7138,15 +8068,23 @@ class AnalyticsService {
     ) {
       return;
     }
-    // Register we sent a log, the port will call this.afterLogging_ when done.
-    this.unfinishedLogs_++;
-    this.lastAction_ = this.start().then((port) => {
-      const analyticsRequest = this.createLogRequest_(event);
-      port.execute(analyticsRequest);
-      if (isExperimentOn(this.doc_.getWin(), ExperimentFlags.LOGGING_BEACON)) {
-        this.sendBeacon_(analyticsRequest);
-      }
-    });
+
+    if (this.readyForLogging_) {
+      // Register we sent a log, the port will call this.afterLogging_ when done.
+      this.unfinishedLogs_++;
+      this.lastAction_ = this.start().then((port) => {
+        const analyticsRequest = this.createLogRequest_(event);
+        port.execute(analyticsRequest);
+        if (
+          isExperimentOn(this.doc_.getWin(), ExperimentFlags.LOGGING_BEACON)
+        ) {
+          this.sendBeacon_(analyticsRequest);
+        }
+      });
+    } else {
+      // If we're not ready to log events yet, store the event so we can log it later.
+      this.logs_.push(event);
+    }
   }
 
   /**
@@ -7269,7 +8207,7 @@ const SWG_I18N_STRINGS = {
     'hi': 'Google के ज़रिये सदस्यता',
     'id': 'Berlangganan dengan Google',
     'it': 'Abbonati con Google',
-    'jp': 'Google で購読',
+    'ja': 'Google で購読',
     'ko': 'Google 을 통한구독',
     'ms': 'Langgan dengan Google',
     'nl': 'Abonneren via Google',
@@ -7278,10 +8216,12 @@ const SWG_I18N_STRINGS = {
     'pt': 'Subscrever com o Google',
     'pt-br': 'Assine com o Google',
     'ru': 'Подпиcка через Google',
-    'se': 'Prenumerera med Google',
+    'sv': 'Prenumerera med Google',
     'th': 'สมัครฟาน Google',
     'tr': 'Google ile Abone Ol',
     'uk': 'Підписатися через Google',
+    'zh-cn': '通过 Google 订阅',
+    'zh-hk': '透過 Google 訂閱',
     'zh-tw': '透過 Google 訂閱',
   },
   'CONTRIBUTION_TITLE_LANG_MAP': {
@@ -7301,21 +8241,262 @@ const SWG_I18N_STRINGS = {
     'hi': 'Google खाते की मदद से योगदान करें',
     'id': 'Berkontribusi dengan Google',
     'it': 'Contribuisci con Google',
-    'jp': 'Google で寄付',
+    'ja': 'Google で寄付',
     'ko': 'Google을 통해 참여하기',
     'ms': 'Sumbangkan dengan Google',
     'nl': 'Bijdragen met Google',
     'no': 'Bidra med Google',
     'pl': 'Wesprzyj publikację przez Google',
-    'pt': 'Contribuir com o Google',
-    'pt-br': 'Contribua com o Google',
+    'pt': 'Contribuir utilizando o Google',
+    'pt-br': 'Contribua usando o Google',
     'ru': 'Внести средства через Google',
-    'se': 'Bidra med Google',
+    'sv': 'Bidra med Google',
     'th': 'มีส่วนร่วมผ่าน Google',
     'tr': 'Google ile Katkıda Bulun',
     'uk': 'Зробити внесок через Google',
+    'zh-cn': '通过 Google 捐赠',
+    'zh-hk': '透過 Google 提供內容',
     'zh-tw': '透過 Google 捐款',
   },
+  'REGWALL_ALREADY_REGISTERED_LANG_MAP': {
+    'en': 'You have registered before.',
+    'ar': 'لقد سبق أن تسجّلت.',
+    'de': 'Du bist bereits registriert.',
+    'en-au': 'You have registered before.',
+    'en-ca': 'You have registered before.',
+    'en-gb': 'You have registered before.',
+    'en-us': 'You have registered before.',
+    'es': 'Ya te habías registrado anteriormente.',
+    'es-419': 'Ya te registraste antes.',
+    'fr': 'Vous vous êtes déjà inscrit.',
+    'fr-ca': 'Vous vous êtes inscrit auparavant.',
+    'hi': 'आपने पहले ही इसके लिए रजिस्टर कर लिया है.',
+    'id': 'Anda telah mendaftar sebelumnya.',
+    'it': 'Registrazione già effettuata in precedenza.',
+    'ja': 'すでに登録済みです。',
+    'ko': '이전에 등록한 사용자입니다.',
+    'ms': 'Anda telah mendaftar sebelum ini.',
+    'nl': 'Je hebt je al eerder geregistreerd.',
+    'no': 'Du er allerede registrert.',
+    'pl': 'Masz już wcześniejszą rejestrację.',
+    'pt': 'Já se registou anteriormente.',
+    'pt-br': 'Você já tem um cadastro.',
+    'ru': 'Вы уже зарегистрированы.',
+    'sv': 'Du har redan registrerat dig.',
+    'th': 'คุณเคยลงทะเบียนแล้ว',
+    'tr': 'Daha önce kaydolmuştunuz.',
+    'uk': 'Ви вже зареєструвалися раніше.',
+    'zh-cn': '您之前已注册。',
+    'zh-hk': '您之前已註冊。',
+    'zh-tw': '你已註冊這個出版品。',
+  },
+  'NEWSLETTER_ALREADY_SIGNED_UP_LANG_MAP': {
+    'en': 'You have signed up before.',
+    'ar': 'سبق أن اشتركت في النشرة الإخبارية.',
+    'de': 'Du hast dich bereits angemeldet.',
+    'en-au': 'You have signed up before.',
+    'en-ca': 'You have signed up before.',
+    'en-gb': 'You have signed up before.',
+    'en-us': 'You have signed up before.',
+    'es': 'Ya te has registrado anteriormente.',
+    'es-419': 'Ya te registraste antes.',
+    'fr': 'Vous vous êtes déjà inscrit.',
+    'fr-ca': 'Vous vous êtes inscrit auparavant.',
+    'hi': 'न्यूज़लेटर के लिए पहले ही साइन अप किया जा चुका है.',
+    'id': 'Anda telah mendaftar sebelumnya.',
+    'it': "Hai già effettuato l'iscrizione.",
+    'ja': 'すでに登録されています。',
+    'ko': '이전에 가입한 사용자입니다.',
+    'ms': 'Anda sudah mendaftar sebelum ini.',
+    'nl': 'Je hebt je al eerder aangemeld.',
+    'no': 'Du er allerede registrert.',
+    'pl': 'Już wcześniej się zarejestrowałeś(-aś).',
+    'pt': 'Já se inscreveu anteriormente.',
+    'pt-br': 'Você se inscreveu anteriormente.',
+    'ru': 'Вы уже зарегистрированы.',
+    'sv': 'Du har redan registrerat dig.',
+    'th': 'คุณสมัครรับข้อมูลมาก่อนแล้ว',
+    'tr': 'Daha önce kaydolmuştunuz.',
+    'uk': 'Ви вже зареєструвалися.',
+    'zh-cn': '您之前已注册。',
+    'zh-hk': '您之前已訂閱。',
+    'zh-tw': '你已經訂閱了。',
+  },
+  'REGWALL_REGISTER_FAILED_LANG_MAP': {
+    'en': 'Registration failed. Try registering again.',
+    'ar': 'تعذَّرت عملية التسجيل. يُرجى إعادة المحاولة.',
+    'de': 'Registrierung fehlgeschlagen. Versuche es noch einmal.',
+    'en-au': 'Registration failed. Try registering again.',
+    'en-ca': 'Registration failed. Try registering again.',
+    'en-gb': 'Registration failed. Try registering again.',
+    'en-us': 'Registration failed. Try registering again.',
+    'es': 'No se ha podido completar el registro. Prueba a registrarte de nuevo.',
+    'es-419': 'No se pudo completar el registro. Vuelve a intentarlo.',
+    'fr': "Échec de l'enregistrement. Réessayez.",
+    'fr-ca': "Échec de l'inscription. Essayez de vous inscrire à nouveau.",
+    'hi': 'रजिस्ट्रेशन नहीं हो सका. फिर से रजिस्टर करने की कोशिश करें.',
+    'id': 'Pendaftaran gagal. Coba daftar lagi.',
+    'it': 'Registrazione non riuscita. Prova a registrarti di nuovo.',
+    'ja': '登録できませんでした。もう一度お試しください。',
+    'ko': '등록에 실패했습니다. 다시 등록해 보세요.',
+    'ms': 'Pendaftaran gagal. Cuba mendaftar lagi.',
+    'nl': 'Registratie mislukt. Probeer opnieuw te registreren.',
+    'no': 'Registreringen mislyktes. Prøv å registrere deg på nytt.',
+    'pl': 'Rejestracja się nie udała. Spróbuj jeszcze raz się zarejestrować.',
+    'pt': 'Falha no registo. Tente registar-se novamente.',
+    'pt-br': 'Não foi possível fazer o registro. Tente novamente.',
+    'ru': 'Ошибка регистрации. Повторите попытку.',
+    'sv': 'Registreringen misslyckades. Försök att registrera dig igen.',
+    'th': 'ลงทะเบียนไม่สำเร็จ ลองลงทะเบียนอีกครั้ง',
+    'tr': 'Kayıt işlemi başarısız oldu. Tekrar kaydolmayı deneyin.',
+    'uk': 'Помилка реєстрації. Повторіть спробу.',
+    'zh-cn': '注册失败。请尝试重新注册。',
+    'zh-hk': '註冊失敗。請嘗試重新註冊。',
+    'zh-tw': '註冊失敗，請再試一次。',
+  },
+  'NEWSLETTER_SIGN_UP_FAILED_LANG_MAP': {
+    'en': 'Signup failed. Try signing up again.',
+    'ar': 'تعذَّرت عملية الاشتراك. يُرجى إعادة المحاولة.',
+    'de': 'Anmeldung fehlgeschlagen. Versuche es noch einmal.',
+    'en-au': 'Sign-up failed. Try signing up again.',
+    'en-ca': 'Sign-up failed. Try signing up again.',
+    'en-gb': 'Sign-up failed. Try signing up again.',
+    'en-us': 'Sign-up failed. Try signing up again.',
+    'es': 'No se ha podido completar la suscripción. Prueba a suscribirte de nuevo.',
+    'es-419': 'Se produjo un error de registro. Vuelve a intentarlo.',
+    'fr': "Échec de l'inscription. Réessayez.",
+    'fr-ca': "Échec de l'inscription. Essayez de vous inscrire à nouveau.",
+    'hi': 'साइन अप नहीं किया जा सका. फिर से साइन अप करने की कोशिश करें.',
+    'id': 'Pendaftaran gagal. Coba daftar lagi.',
+    'it': 'Iscrizione non riuscita. Prova a iscriverti di nuovo.',
+    'ja': '登録できませんでした。もう一度お試しください。',
+    'ko': '가입에 실패했습니다. 다시 가입해 보세요.',
+    'ms': 'Daftar gagal. Cuba daftar lagi.',
+    'nl': 'Aanmelding mislukt. Probeer opnieuw aan te melden.',
+    'no': 'Registreringen mislyktes. Prøv å registrere deg på nytt.',
+    'pl': 'Rejestracja się nie udała. Spróbuj jeszcze raz się zarejestrować.',
+    'pt': 'Falha na inscrição. Tente inscrever-se novamente.',
+    'pt-br': 'Não foi possível se inscrever. Tente novamente.',
+    'ru': 'Не удалось зарегистрироваться. Повторите попытку.',
+    'sv': 'Registreringen misslyckades. Försök att registrera dig igen.',
+    'th': 'ลงชื่อสมัครใช้ไม่สำเร็จ ลองลงชื่อสมัครใช้อีกครั้ง',
+    'tr': 'Kaydolma işlemi başarısız oldu. Tekrar kaydolmayı deneyin.',
+    'uk': 'Помилка реєстрації. Повторіть спробу.',
+    'zh-cn': '注册失败。请尝试重新注册。',
+    'zh-hk': '申請失敗。請嘗試重新申請。',
+    'zh-tw': '訂閱失敗，請再試一次。',
+  },
+  'REGWALL_ACCOUNT_CREATED_LANG_MAP': {
+    'en': 'Created an account with <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph>',
+    'ar': 'تم إنشاء حساب باستخدام <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph>.',
+    'de': 'Konto bei <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph> wurde erstellt',
+    'en-au':
+      'Created an account with <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph>',
+    'en-ca':
+      'Created an account with <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph>',
+    'en-gb':
+      'Created an account with <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph>',
+    'en-us':
+      'Created an account with <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph>',
+    'es': 'Has creado una cuenta con <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph>',
+    'es-419':
+      'Se creó una cuenta con <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph>',
+    'fr': 'A créé un compte avec <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph>',
+    'fr-ca':
+      'Un compte a été créé avec l\'adresse <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph>',
+    'hi': '<ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph> का इस्तेमाल करके, एक खाता बनाया गया',
+    'id': 'Membuat akun dengan <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph>',
+    'it': 'È stato creato un account con l\'indirizzo <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph>',
+    'ja': '<ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph> でアカウントを作成しました',
+    'ko': '<ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph>(으)로 계정을 만들었습니다.',
+    'ms': 'Membuat akaun dengan <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph>',
+    'nl': 'Account gemaakt met <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph>',
+    'no': 'Du har opprettet en konto med <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph>',
+    'pl': 'Utworzono konto za pomocą adresu <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph>',
+    'pt': 'Criou uma conta com <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph>',
+    'pt-br':
+      'Conta criada com o e-mail <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph>',
+    'ru': 'Вы зарегистрировали аккаунт на адрес <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph>.',
+    'sv': 'Du skapade ett konto med <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph>',
+    'th': 'สร้างบัญชีด้วย <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph>',
+    'tr': '<ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph> ile bir hesap oluşturun',
+    'uk': 'Обліковий запис створено за допомогою електронної адреси <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph>',
+    'zh-cn': '已使用 <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph> 创建帐号',
+    'zh-hk': '已使用 <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph> 建立帳戶',
+    'zh-tw': '已使用 <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph> 建立帳戶',
+  },
+  'NEWSLETTER_SIGNED_UP_LANG_MAP': {
+    'en': 'Signed up with <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph> for the newsletter',
+    'ar': 'تم الاشتراك في النشرة الإخبارية باستخدام <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph>.',
+    'de': 'Du hast dich für den Newsletter von <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph> angemeldet',
+    'en-au':
+      'Signed up with <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph> for the newsletter',
+    'en-ca':
+      'Signed up with <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph> for the newsletter',
+    'en-gb':
+      'Signed up with <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph> for the newsletter',
+    'en-us':
+      'Signed up with <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph> for the newsletter',
+    'es': 'Te has suscrito a la newsletter con <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph>',
+    'es-419':
+      'Te registraste con <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph> para recibir el boletín informativo',
+    'fr': 'S\'est abonné à la newsletter avec <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph>',
+    'fr-ca':
+      'Vous êtes inscrit au bulletin d\'information avec l\'adresse <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph>',
+    'hi': 'न्यूज़लेटर पाने के लिए, <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph> से साइन अप किया गया',
+    'id': 'Mendaftar dengan <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph> untuk mendapatkan newsletter',
+    'it': 'Iscrizione alla newsletter con l\'indirizzo <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph> effettuata',
+    'ja': '<ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph> でニュースレターを登録しました',
+    'ko': '<ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph>(으)로 뉴스레터에 가입했습니다.',
+    'ms': 'Mendaftar dengan <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph> untuk surat berita',
+    'nl': 'Aangemeld met <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph> voor de nieuwsbrief',
+    'no': 'Du har registrert deg for nyhetsbrevet med <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph>',
+    'pl': 'Zapisano się na newsletter za pomocą adresu <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph>',
+    'pt': 'Inscreveu-se com <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph> no boletim informativo',
+    'pt-br':
+      'Inscrição na newsletter feita com o e-mail <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph>',
+    'ru': 'Вы подписались на новостную рассылку, используя аккаунт <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph>.',
+    'sv': 'Du registrerade dig för nyhetsbrevet med <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph>',
+    'th': 'ลงชื่อเข้าใช้ด้วย <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph> สำหรับจดหมายข่าว',
+    'tr': 'Bülten için <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph> ile kaydoldunuz',
+    'uk': 'Ви підписалися на інформаційні листи на електронну адресу <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph>',
+    'zh-cn': '已使用 <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph> 订阅简报',
+    'zh-hk': '已使用 <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph> 註冊通訊',
+    'zh-tw':
+      '已使用 <ph name="EMAIL"><ex>user@gmail.com</ex>%s</ph> 訂閱電子報',
+  },
+  'NO_MEMBERSHIP_FOUND_LANG_MAP': {
+    'en': 'No membership found',
+    'ar': 'لم يتم العثور على أي اشتراك.',
+    'de': 'Keine Mitgliedschaftsdaten gefunden',
+    'en-au': 'No membership found',
+    'en-ca': 'No membership found',
+    'en-gb': 'No membership found',
+    'en-us': 'No membership found',
+    'es': 'No se han encontrado suscripciones',
+    'es-419': 'No se encontró ninguna membresía',
+    'fr': 'Aucun abonnement trouvé',
+    'fr-ca': 'Aucun abonnement trouvé',
+    'hi': 'पैसे चुकाकर ली जाने वाली कोई सदस्यता नहीं मिली',
+    'id': 'Langganan tidak ditemukan',
+    'it': 'Nessun abbonamento trovato',
+    'ja': 'メンバーシップが見つかりません',
+    'ko': '멤버십 정보를 찾을 수 없습니다.',
+    'ms': 'Tiada keahlian ditemukan',
+    'nl': 'Geen lidmaatschap gevonden',
+    'no': 'Fant ingen abonnementer',
+    'pl': 'Nie znaleziono subskrypcji',
+    'pt': 'Nenhuma subscrição encontrada',
+    'pt-br': 'Nenhuma assinatura foi encontrada',
+    'ru': 'Подписка не найдена.',
+    'se': 'Inget medlemskap hittades',
+    'th': 'ไม่พบการเป็นสมาชิก',
+    'tr': 'Üyelik bulunamadı',
+    'uk': 'Немає підписок',
+    'zh-cn': '未找到会员资料',
+    'zh-hk': '找不到會籍',
+    'zh-tw': '找不到會員資料',
+  },
 };
 
 /**
@@ -7408,12 +8589,7 @@ class SmartSubscriptionButtonApi {
    */
   handleSmartBoxClick_(smartBoxMessage) {
     if (smartBoxMessage && smartBoxMessage.getIsClicked()) {
-      if (!this.callback_) {
-        throw new Error('No callback!');
-      }
       this.callback_();
-
-      return;
     }
   }
 
@@ -7716,7 +8892,7 @@ class ButtonApi {
     options,
     attributeValueToCallback
   ) {
-    attributeValues.forEach((attributeValue) => {
+    for (const attributeValue of attributeValues) {
       const elements = this.doc_
         .getRootNode()
         .querySelectorAll(`[${attribute}="${attributeValue}"]`);
@@ -7735,7 +8911,7 @@ class ButtonApi {
           );
         }
       }
-    });
+    }
   }
 
   /**
@@ -7854,6 +9030,8 @@ const CallbackId = {
   LINK_COMPLETE: 6,
   FLOW_STARTED: 7,
   FLOW_CANCELED: 8,
+  PAY_CONFIRM_OPENED: 9,
+  OFFERS_FLOW_REQUEST: 10,
 };
 
 /**
@@ -7950,6 +9128,21 @@ class Callbacks {
     return !!this.resultBuffer_[CallbackId.LINK_COMPLETE];
   }
 
+  /**
+   * @param {function(!../ui/activity-iframe-view.ActivityIframeView)} callback
+   */
+  setOnPayConfirmOpened(callback) {
+    this.setCallback_(CallbackId.PAY_CONFIRM_OPENED, callback);
+  }
+
+  /**
+   * @param {!../ui/activity-iframe-view.ActivityIframeView} activityIframeView
+   * @return {boolean} Whether the callback has been found.
+   */
+  triggerPayConfirmOpened(activityIframeView) {
+    return this.trigger_(CallbackId.PAY_CONFIRM_OPENED, activityIframeView);
+  }
+
   /**
    * @param {function()} callback
    */
@@ -7971,6 +9164,27 @@ class Callbacks {
     return !!this.callbacks_[CallbackId.SUBSCRIBE_REQUEST];
   }
 
+  /**
+   * @param {function()} callback
+   */
+  setOnOffersFlowRequest(callback) {
+    this.setCallback_(CallbackId.OFFERS_FLOW_REQUEST, callback);
+  }
+
+  /**
+   * @return {boolean} Whether the callback has been found.
+   */
+  triggerOffersFlowRequest() {
+    return this.trigger_(CallbackId.OFFERS_FLOW_REQUEST, true);
+  }
+
+  /**
+   * @return {boolean}
+   */
+  hasOffersFlowRequestCallback() {
+    return !!this.callbacks_[CallbackId.OFFERS_FLOW_REQUEST];
+  }
+
   /**
    * @param {function(!Promise<!../api/subscribe-response.SubscribeResponse>)} callback
    */
@@ -8177,27 +9391,33 @@ class AttributionParams {
  */
 class AutoPromptConfig {
   /**
-   * @param {number|undefined} maxImpressionsPerWeek
+   * @param {!AutoPromptConfigParams=} params
    */
-  constructor(
-    maxImpressionsPerWeek,
+  constructor({
     displayDelaySeconds,
-    backoffSeconds,
+    dismissalBackOffSeconds,
     maxDismissalsPerWeek,
-    maxDismissalsResultingHideSeconds
-  ) {
-    /** @const {number|undefined} */
-    this.maxImpressionsPerWeek = maxImpressionsPerWeek;
-
+    maxDismissalsResultingHideSeconds,
+    impressionBackOffSeconds,
+    maxImpressions,
+    maxImpressionsResultingHideSeconds,
+  } = {}) {
     /** @const {!ClientDisplayTrigger} */
     this.clientDisplayTrigger = new ClientDisplayTrigger(displayDelaySeconds);
 
     /** @const {!ExplicitDismissalConfig} */
     this.explicitDismissalConfig = new ExplicitDismissalConfig(
-      backoffSeconds,
+      dismissalBackOffSeconds,
       maxDismissalsPerWeek,
       maxDismissalsResultingHideSeconds
     );
+
+    /** @const {!ImpressionConfig} */
+    this.impressionConfig = new ImpressionConfig(
+      impressionBackOffSeconds,
+      maxImpressions,
+      maxImpressionsResultingHideSeconds
+    );
   }
 }
 
@@ -8219,17 +9439,17 @@ class ClientDisplayTrigger {
  */
 class ExplicitDismissalConfig {
   /**
-   * @param {number|undefined} backoffSeconds
+   * @param {number|undefined} backOffSeconds
    * @param {number|undefined} maxDismissalsPerWeek
    * @param {number|undefined} maxDismissalsResultingHideSeconds
    */
   constructor(
-    backoffSeconds,
+    backOffSeconds,
     maxDismissalsPerWeek,
     maxDismissalsResultingHideSeconds
   ) {
     /** @const {number|undefined} */
-    this.backoffSeconds = backoffSeconds;
+    this.backOffSeconds = backOffSeconds;
 
     /** @const {number|undefined} */
     this.maxDismissalsPerWeek = maxDismissalsPerWeek;
@@ -8240,19 +9460,28 @@ class ExplicitDismissalConfig {
 }
 
 /**
- * Predicates of whether or not to show button and prompt.
+ * Configuration of impression behavior and its effects.
  */
-class UiPredicates {
+class ImpressionConfig {
   /**
-   * @param {boolean|undefined} canDisplayAutoPrompt
-   * @param {boolean|undefined} canDisplayButton
+   * @param {number|undefined} backOffSeconds
+   * @param {number|undefined} maxImpressions
+   * @param {number|undefined} maxImpressionsResultingHideSeconds
    */
-  constructor(canDisplayAutoPrompt, canDisplayButton) {
-    /** @const {boolean|undefined} */
-    this.canDisplayAutoPrompt = canDisplayAutoPrompt;
+  constructor(
+    backOffSeconds,
+    maxImpressions,
+    maxImpressionsResultingHideSeconds
+  ) {
+    /** @const {number|undefined} */
+    this.backOffSeconds = backOffSeconds;
 
-    /** @const {boolean|undefined} */
-    this.canDisplayButton = canDisplayButton;
+    /** @const {number|undefined} */
+    this.maxImpressions = maxImpressions;
+
+    /** @const {number|undefined} */
+    this.maxImpressionsResultingHideSeconds =
+      maxImpressionsResultingHideSeconds;
   }
 }
 
@@ -8284,8 +9513,8 @@ class ClientConfig {
     autoPromptConfig,
     paySwgVersion,
     uiPredicates,
-    usePrefixedHostPath,
     useUpdatedOfferFlows,
+    skipAccountCreationScreen,
   } = {}) {
     /** @const {./auto-prompt-config.AutoPromptConfig|undefined} */
     this.autoPromptConfig = autoPromptConfig;
@@ -8294,12 +9523,12 @@ class ClientConfig {
     this.paySwgVersion = paySwgVersion;
 
     /** @const {boolean} */
-    this.usePrefixedHostPath = usePrefixedHostPath || false;
+    this.useUpdatedOfferFlows = useUpdatedOfferFlows || false;
 
     /** @const {boolean} */
-    this.useUpdatedOfferFlows = useUpdatedOfferFlows || false;
+    this.skipAccountCreationScreen = skipAccountCreationScreen || false;
 
-    /** @const {./auto-prompt-config.UiPredicates|undefined} */
+    /** @const {UiPredicates|undefined} */
     this.uiPredicates = uiPredicates;
 
     /** @const {./attribution-params.AttributionParams|undefined} */
@@ -8307,6 +9536,31 @@ class ClientConfig {
   }
 }
 
+/**
+ * Predicates to control UI elements.
+ */
+class UiPredicates {
+  /**
+   * @param {boolean|undefined} canDisplayAutoPrompt
+   * @param {boolean|undefined} canDisplayButton
+   * @param {boolean|undefined} purchaseUnavailableRegion
+   */
+  constructor(
+    canDisplayAutoPrompt,
+    canDisplayButton,
+    purchaseUnavailableRegion
+  ) {
+    /** @const {boolean|undefined} */
+    this.canDisplayAutoPrompt = canDisplayAutoPrompt;
+
+    /** @const {boolean|undefined} */
+    this.canDisplayButton = canDisplayButton;
+
+    /** @const {boolean|undefined} */
+    this.purchaseUnavailableRegion = purchaseUnavailableRegion;
+  }
+}
+
 /**
  * Copyright 2020 The Subscribe with Google Authors. All Rights Reserved.
  *
@@ -8351,11 +9605,15 @@ const ClientTheme = {
  */
 class ClientConfigManager {
   /**
+   * @param {!./deps.DepsDef} deps
    * @param {string} publicationId
    * @param {!./fetcher.Fetcher} fetcher
    * @param {!../api/basic-subscriptions.ClientOptions=} clientOptions
    */
-  constructor(publicationId, fetcher, clientOptions) {
+  constructor(deps, publicationId, fetcher, clientOptions) {
+    /** @private @const {!./deps.DepsDef} */
+    this.deps_ = deps;
+
     /** @private @const {!../api/basic-subscriptions.ClientOptions} */
     this.clientOptions_ = clientOptions || {};
 
@@ -8367,18 +9625,26 @@ class ClientConfigManager {
 
     /** @private {?Promise<!ClientConfig>} */
     this.responsePromise_ = null;
+
+    /** @private @const {ClientConfig} */
+    this.defaultConfig_ = new ClientConfig({
+      skipAccountCreationScreen: this.clientOptions_.skipAccountCreationScreen,
+    });
   }
 
   /**
    * Fetches the client config from the server.
+   * @param {Promise<void>=} readyPromise optional promise to wait on before
+   * attempting to fetch the clientConfiguration.
    * @return {!Promise<!ClientConfig>}
    */
-  fetchClientConfig() {
+  fetchClientConfig(readyPromise) {
     if (!this.publicationId_) {
       throw new Error('fetchClientConfig requires publicationId');
     }
     if (!this.responsePromise_) {
-      this.responsePromise_ = this.fetch_();
+      readyPromise = readyPromise || Promise.resolve();
+      this.responsePromise_ = readyPromise.then(() => this.fetch_());
     }
     return this.responsePromise_;
   }
@@ -8389,7 +9655,7 @@ class ClientConfigManager {
    * @return {!Promise<!ClientConfig>}
    */
   getClientConfig() {
-    return this.responsePromise_ || Promise.resolve(new ClientConfig());
+    return this.responsePromise_ || Promise.resolve(this.defaultConfig_);
   }
 
   /**
@@ -8424,6 +9690,15 @@ class ClientConfigManager {
     return this.clientOptions_.theme || ClientTheme.LIGHT;
   }
 
+  /**
+   * Returns whether scrolling on main page should be allowed when
+   * subscription or contribution dialog is displayed.
+   * @return {boolean}
+   */
+  shouldAllowScroll() {
+    return !!this.clientOptions_.allowScroll;
+  }
+
   /**
    * Returns whether iframes should also use the language specified in the
    * client options, rather than the default of letting the iframes decide the
@@ -8467,19 +9742,30 @@ class ClientConfigManager {
    * @return {!Promise<!ClientConfig>}
    */
   fetch_() {
-    const url = serviceUrl(
-      '/publication/' +
-        encodeURIComponent(this.publicationId_) +
-        '/clientconfiguration'
-    );
-    return this.fetcher_.fetchCredentialedJson(url).then((json) => {
-      if (json.errorMessages && json.errorMessages.length > 0) {
-        json.errorMessages.forEach((errorMessage) => {
-          warn('SwG ClientConfigManager: ' + errorMessage);
-        });
-      }
-      return this.parseClientConfig_(json);
-    });
+    return this.deps_
+      .entitlementsManager()
+      .getArticle()
+      .then((article) => {
+        if (article) {
+          return this.parseClientConfig_(article['clientConfig']);
+        } else {
+          // If there was no article from the entitlement manager, we need
+          // to fetch our own using the internal version.
+          const url = serviceUrl(
+            '/publication/' +
+              encodeURIComponent(this.publicationId_) +
+              '/clientconfiguration'
+          );
+          return this.fetcher_.fetchCredentialedJson(url).then((json) => {
+            if (json.errorMessages && json.errorMessages.length > 0) {
+              for (const errorMessage of json.errorMessages) {
+                warn('SwG ClientConfigManager: ' + errorMessage);
+              }
+            }
+            return this.parseClientConfig_(json);
+          });
+        }
+      });
   }
 
   /**
@@ -8492,13 +9778,23 @@ class ClientConfigManager {
     const autoPromptConfigJson = json['autoPromptConfig'];
     let autoPromptConfig = undefined;
     if (autoPromptConfigJson) {
-      autoPromptConfig = new AutoPromptConfig(
-        autoPromptConfigJson.maxImpressionsPerWeek,
-        autoPromptConfigJson.clientDisplayTrigger?.displayDelaySeconds,
-        autoPromptConfigJson.explicitDismissalConfig?.backoffSeconds,
-        autoPromptConfigJson.explicitDismissalConfig?.maxDismissalsPerWeek,
-        autoPromptConfigJson.explicitDismissalConfig?.maxDismissalsResultingHideSeconds
-      );
+      autoPromptConfig = new AutoPromptConfig({
+        displayDelaySeconds:
+          autoPromptConfigJson.clientDisplayTrigger?.displayDelaySeconds,
+        dismissalBackOffSeconds:
+          autoPromptConfigJson.explicitDismissalConfig?.backOffSeconds,
+        maxDismissalsPerWeek:
+          autoPromptConfigJson.explicitDismissalConfig?.maxDismissalsPerWeek,
+        maxDismissalsResultingHideSeconds:
+          autoPromptConfigJson.explicitDismissalConfig
+            ?.maxDismissalsResultingHideSeconds,
+        impressionBackOffSeconds:
+          autoPromptConfigJson.impressionConfig?.backOffSeconds,
+        maxImpressions: autoPromptConfigJson.impressionConfig?.maxImpressions,
+        maxImpressionsResultingHideSeconds:
+          autoPromptConfigJson.impressionConfig
+            ?.maxImpressionsResultingHideSeconds,
+      });
     }
 
     const uiPredicatesJson = json['uiPredicates'];
@@ -8506,7 +9802,8 @@ class ClientConfigManager {
     if (uiPredicatesJson) {
       uiPredicates = new UiPredicates(
         uiPredicatesJson.canDisplayAutoPrompt,
-        uiPredicatesJson.canDisplayButton
+        uiPredicatesJson.canDisplayButton,
+        uiPredicatesJson.purchaseUnavailableRegion
       );
     }
 
@@ -8522,8 +9819,8 @@ class ClientConfigManager {
     return new ClientConfig({
       autoPromptConfig,
       paySwgVersion,
-      usePrefixedHostPath: json['usePrefixedHostPath'],
       useUpdatedOfferFlows: json['useUpdatedOfferFlows'],
+      skipAccountCreationScreen: this.clientOptions_.skipAccountCreationScreen,
       uiPredicates,
       attributionParams,
     });
@@ -8586,7 +9883,7 @@ class ContributionsFlow {
           ? new ActivityIframeView(
               this.win_,
               this.activityPorts_,
-              this.getUrl_(clientConfig),
+              this.getUrl_(clientConfig, deps.pageConfig()),
               feArgs({
                 'productId': deps.pageConfig().getProductId(),
                 'publicationId': deps.pageConfig().getPublicationId(),
@@ -8660,10 +9957,38 @@ class ContributionsFlow {
       );
       activityIframeView.on(SkuSelectedResponse, this.startPayFlow_.bind(this));
       this.activityIframeView_ = activityIframeView;
-      return this.dialogManager_.openView(this.activityIframeView_);
+      return this.clientConfigManager_
+        .getClientConfig()
+        .then((clientConfig) => {
+          if (!this.activityIframeView_) {
+            return;
+          }
+          return this.dialogManager_.openView(
+            this.activityIframeView_,
+            /* hidden */ false,
+            this.getDialogConfig_(
+              clientConfig,
+              this.clientConfigManager_.shouldAllowScroll()
+            )
+          );
+        });
     });
   }
 
+  /**
+   * Gets display configuration options for the opened dialog. Uses the
+   * responsive desktop design properties if the updated offer flows UI (for
+   * SwG Basic) is enabled. Permits override to allow scrolling.
+   * @param {!../model/client-config.ClientConfig} clientConfig
+   * @param {boolean} shouldAllowScroll
+   * @return {!../components/dialog.DialogConfig}
+   */
+  getDialogConfig_(clientConfig, shouldAllowScroll) {
+    return clientConfig.useUpdatedOfferFlows && !shouldAllowScroll
+      ? {shouldDisableBodyScrolling: true}
+      : {};
+  }
+
   /**
    * Returns whether this flow is configured as enabled, not showing
    * even on explicit start when flag is configured false.
@@ -8678,9 +10003,10 @@ class ContributionsFlow {
   /**
    * Gets the complete URL that should be used for the activity iFrame view.
    * @param {!../model/client-config.ClientConfig} clientConfig
+   * @param {!../model/page-config.PageConfig} pageConfig
    * @return {string}
    */
-  getUrl_(clientConfig) {
+  getUrl_(clientConfig, pageConfig) {
     if (!clientConfig.useUpdatedOfferFlows) {
       return feUrl('/contributionsiframe');
     }
@@ -8688,10 +10014,13 @@ class ContributionsFlow {
     if (this.clientConfigManager_.shouldForceLangInIframes()) {
       return feUrl('/contributionoffersiframe', {
         'hl': this.clientConfigManager_.getLanguage(),
+        'publicationId': pageConfig.getPublicationId(),
       });
     }
 
-    return feUrl('/contributionoffersiframe');
+    return feUrl('/contributionoffersiframe', {
+      'publicationId': pageConfig.getPublicationId(),
+    });
   }
 
   /**
@@ -8874,7 +10203,7 @@ class DeferredAccountFlow {
   }
 }
 
-const CSS$1 = "body{margin:0;padding:0}swg-container,swg-loading,swg-loading-animate,swg-loading-image{display:block}swg-loading-container{-ms-flex-align:center!important;-ms-flex-pack:center!important;align-items:center!important;bottom:0!important;display:-ms-flexbox!important;display:flex!important;height:100%!important;justify-content:center!important;margin-top:5px!important;min-height:148px!important;width:100%!important;z-index:2147483647!important}@media (min-height:630px),(min-width:630px){swg-loading-container{background-color:#fff!important;border-top-left-radius:8px!important;border-top-right-radius:8px!important;box-shadow:0 1px 1px rgba(60,64,67,.3),0 1px 4px 1px rgba(60,64,67,.15)!important;margin-left:auto!important;margin-right:auto!important;width:560px!important}swg-loading-container.centered-on-desktop{border-radius:8px!important;height:120px!important;min-height:120px!important}}swg-loading{animation:mspin-rotate 1568.63ms linear infinite;height:36px;overflow:hidden;width:36px;z-index:2147483647!important}swg-loading-animate{animation:mspin-revrot 5332ms steps(4) infinite}swg-loading-image{animation:swg-loading-film 5332ms steps(324) infinite;background-image:url(https://news.google.com/swg/js/v1/loader.svg);background-size:100%;height:36px;width:11664px}@keyframes swg-loading-film{0%{transform:translateX(0)}to{transform:translateX(-11664px)}}@keyframes mspin-rotate{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}@keyframes mspin-revrot{0%{transform:rotate(0deg)}to{transform:rotate(-1turn)}}\n/*# sourceURL=/./src/ui/ui.css*/";
+const CSS$1 = "body{margin:0;padding:0}swg-container,swg-loading,swg-loading-animate,swg-loading-image{display:block}swg-loading-container{-ms-flex-align:center!important;-ms-flex-pack:center!important;align-items:center!important;bottom:0!important;display:-ms-flexbox!important;display:flex!important;height:100%!important;justify-content:center!important;margin-top:5px!important;min-height:148px!important;width:100%!important;z-index:2147483647!important}@media (min-height:630px),(min-width:630px){swg-loading-container{background-color:#fff!important;border-top-left-radius:8px!important;border-top-right-radius:8px!important;box-shadow:0 1px 1px rgba(60,64,67,.3),0 1px 4px 1px rgba(60,64,67,.15)!important;margin-left:auto!important;margin-right:auto!important;width:560px!important}swg-loading-container.centered-on-desktop{border-radius:8px!important;height:120px!important;min-height:120px!important}}swg-loading{animation:mspin-rotate 1568.63ms linear infinite;height:36px;overflow:hidden;width:36px;z-index:2147483647!important}swg-loading-animate{animation:mspin-revrot 5332ms steps(4) infinite}swg-loading-image{animation:swg-loading-film 5332ms steps(324) infinite;background-image:url(https://news.google.com/swg/js/v1/loader.svg);background-size:100%;height:36px;width:11664px}@keyframes swg-loading-film{0%{transform:translateX(0)}to{transform:translateX(-11664px)}}@keyframes mspin-rotate{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}@keyframes mspin-revrot{0%{transform:rotate(0deg)}to{transform:rotate(-1turn)}}\n/*# sourceURL=/./src/ui/ui.css*/\n";
 
 /**
  * Copyright 2018 The Subscribe with Google Authors. All Rights Reserved.
@@ -9172,9 +10501,9 @@ class LoadingView {
       {}
     );
     if (config.additionalClasses) {
-      config.additionalClasses.forEach((additionalClass) => {
+      for (const additionalClass of config.additionalClasses) {
         this.loadingContainer_.classList.add(additionalClass);
-      });
+      }
     }
 
     /** @private @const {!Element} */
@@ -9534,6 +10863,10 @@ class Dialog {
     /** @const @private {boolean} */
     this.positionCenterOnDesktop_ = !!desktopDialogConfig.isCenterPositioned;
 
+    /** @const @private {boolean} */
+    this.shouldDisableBodyScrolling_ =
+      !!dialogConfig.shouldDisableBodyScrolling;
+
     /** @const @private {!MediaQueryList} */
     this.desktopMediaQuery_ = this.doc_
       .getWin()
@@ -9640,20 +10973,20 @@ class Dialog {
   close(animated = true) {
     let animating;
     if (animated) {
+      const transitionStyles = this.shouldPositionCenter_()
+        ? {'opacity': 0}
+        : {'transform': 'translateY(100%)'};
+
       animating = this.animate_(() => {
         this.graypane_.hide(/* animate */ true);
-        return transition$1(
-          this.getElement(),
-          {
-            'transform': 'translateY(100%)',
-          },
-          300,
-          'ease-out'
-        );
+        return transition$1(this.getElement(), transitionStyles, 300, 'ease-out');
       });
     } else {
       animating = Promise.resolve();
     }
+
+    this.doc_.getBody().classList.remove('swg-disable-scroll');
+
     return animating.then(() => {
       const iframeEl = this.iframe_.getElement();
       iframeEl.parentNode.removeChild(iframeEl);
@@ -9765,6 +11098,10 @@ class Dialog {
     this.view_ = view;
     this.getContainer().appendChild(view.getElement());
 
+    if (this.shouldDisableBodyScrolling_) {
+      this.doc_.getBody().classList.add('swg-disable-scroll');
+    }
+
     // If the current view should fade the parent document.
     if (view.shouldFadeBody() && !this.hidden_) {
       this.graypane_.show(/* animate */ true);
@@ -9804,7 +11141,10 @@ class Dialog {
         },
         300,
         'ease-out'
-      );
+      ).then(() => {
+        // Focus the dialog contents, per WAI-ARIA best practices.
+        this.getElement().focus();
+      });
     });
     this.hidden_ = false;
   }
@@ -9839,10 +11179,16 @@ class Dialog {
             return Promise.resolve();
           }
 
-          setImportantStyles$1(this.getElement(), {
+          const immediateStyles = {
             'height': `${newHeight}px`,
-            'transform': `translateY(${newHeight - oldHeight}px)`,
-          });
+          };
+          if (!this.shouldPositionCenter_()) {
+            immediateStyles['transform'] = `translateY(${
+              newHeight - oldHeight
+            }px)`;
+          }
+          setImportantStyles$1(this.getElement(), immediateStyles);
+
           return transition$1(
             this.getElement(),
             {
@@ -9860,7 +11206,9 @@ class Dialog {
             : transition$1(
                 this.getElement(),
                 {
-                  'transform': `translateY(${oldHeight - newHeight}px)`,
+                  'transform': this.shouldPositionCenter_()
+                    ? this.getDefaultTranslateY_()
+                    : `translateY(${oldHeight - newHeight}px)`,
                 },
                 300,
                 'ease-out'
@@ -9935,7 +11283,7 @@ class Dialog {
    * @private
    */
   updatePaddingToHtml_(newHeight) {
-    if (this.positionCenterOnDesktop_ && this.desktopMediaQuery_.matches) {
+    if (this.shouldPositionCenter_()) {
       // For centered dialogs, there should be no bottom padding.
       this.removePaddingToHtml_();
       return;
@@ -9963,13 +11311,22 @@ class Dialog {
     setImportantStyles$1(this.getElement(), this.getPositionStyle_());
   }
 
+  /**
+   * Returns whether or not the dialog should have position 'CENTER'.
+   * @return {boolean}
+   * @private
+   */
+  shouldPositionCenter_() {
+    return this.positionCenterOnDesktop_ && this.desktopMediaQuery_.matches;
+  }
+
   /**
    * Returns the styles required to postion the dialog.
    * @return {!Object<string, string|number>}
    * @private
    */
   getPositionStyle_() {
-    if (this.positionCenterOnDesktop_ && this.desktopMediaQuery_.matches) {
+    if (this.shouldPositionCenter_()) {
       return {
         'top': '50%',
         'bottom': 0,
@@ -9989,7 +11346,7 @@ class Dialog {
    * @private
    */
   getDefaultTranslateY_() {
-    if (this.positionCenterOnDesktop_ && this.desktopMediaQuery_.matches) {
+    if (this.shouldPositionCenter_()) {
       return 'translateY(-50%)';
     }
     return 'translateY(0px)';
@@ -10176,6 +11533,11 @@ class DialogManager {
 const MeterClientTypes = {
   /** Meter client type for content licensed by Google. */
   LICENSED_BY_GOOGLE: 1,
+  /**
+   * Meter client type for content that a publication is allowing to be
+   * metered by Google.
+   */
+  METERED_BY_GOOGLE: 2,
 };
 
 /**
@@ -10197,12 +11559,45 @@ const MeterClientTypes = {
 const IFRAME_BOX_SHADOW =
   'rgba(60, 64, 67, 0.3) 0px -2px 5px, rgba(60, 64, 67, 0.15) 0px -5px 5px';
 const MINIMIZED_IFRAME_SIZE = '420px';
+const ANONYMOUS_USER_ATTRIBUTE = 'anonymous_user';
+
+/**
+ * Values of meterClientUserAttribute for which to show the Known MeterType.
+ * @const {Array<string>}
+ */
+const KNOWN_USER_ATTRIBUTES = [
+  'known_user',
+  'newsletter_user',
+  'registration_user',
+];
+
+/**
+ * The iframe URLs to be used per MeterClientType
+ * @type {Object.<MeterClientTypes, string>}
+ */
+const IframeUrlByMeterClientType = {
+  [MeterClientTypes.LICENSED_BY_GOOGLE]: '/metertoastiframe',
+  [MeterClientTypes.METERED_BY_GOOGLE]: '/meteriframe',
+};
+/** @enum {string} */
+const MeterType = {
+  UNKNOWN: 'UNKNOWN',
+  KNOWN: 'KNOWN',
+  SUPPRESSED: 'SUPPRESSED',
+};
 
 class MeterToastApi {
   /**
    * @param {!./deps.DepsDef} deps
+   * @param {!MeterToastApiParams=} params
    */
-  constructor(deps) {
+  constructor(
+    deps,
+    {
+      meterClientType = MeterClientTypes.LICENSED_BY_GOOGLE,
+      meterClientUserAttribute = ANONYMOUS_USER_ATTRIBUTE,
+    } = {}
+  ) {
     /** @private @const {!./deps.DepsDef} */
     this.deps_ = deps;
 
@@ -10215,21 +11610,15 @@ class MeterToastApi {
     /** @private @const {!../components/dialog-manager.DialogManager} */
     this.dialogManager_ = deps.dialogManager();
 
-    const iframeArgs = this.activityPorts_.addDefaultArguments({
-      isClosable: true,
-      hasSubscriptionCallback: deps.callbacks().hasSubscribeRequestCallback(),
-    });
-    /** @private @const {!ActivityIframeView} */
-    this.activityIframeView_ = new ActivityIframeView(
-      this.win_,
-      this.activityPorts_,
-      feUrl('/metertoastiframe'),
-      iframeArgs,
-      /* shouldFadeBody */ false
-    );
+    /** @private @const {!MeterClientTypes} */
+    this.meterClientType_ = meterClientType;
+
+    /** @private @const {string} */
+    this.meterClientUserAttribute_ = meterClientUserAttribute;
 
     /**
-     * Function this class calls when a user dismisses the toast to consume a free read.
+     * Function this class calls when a user dismisses the toast to consume a
+     * free read.
      * @private {?function()}
      */
     this.onConsumeCallback_ = null;
@@ -10242,6 +11631,60 @@ class MeterToastApi {
      */
     this.onConsumeCallbackHandled_ = false;
 
+    /** @private {?function()} */
+    this.scrollEventListener_ = null;
+  }
+
+  /**
+   * Shows the user the metering toast.
+   * @return {!Promise}
+   */
+  start() {
+    const additionalArguments = {
+      isClosable: true,
+      hasSubscriptionCallback: this.deps_
+        .callbacks()
+        .hasSubscribeRequestCallback(),
+    };
+    if (this.meterClientType_ === MeterClientTypes.METERED_BY_GOOGLE) {
+      additionalArguments['meterType'] =
+        this.meterClientUserAttribute_ === ANONYMOUS_USER_ATTRIBUTE
+          ? MeterType.UNKNOWN
+          : KNOWN_USER_ATTRIBUTES.includes(this.meterClientUserAttribute_)
+          ? MeterType.KNOWN
+          : MeterType.SUPPRESSED;
+    }
+
+    // Exit flow and do not show prompt for Suppressed MeterType
+    if (additionalArguments['meterType'] === MeterType.SUPPRESSED) {
+      return Promise.resolve();
+    }
+
+    const iframeArgs =
+      this.activityPorts_.addDefaultArguments(additionalArguments);
+
+    const iframeUrl =
+      IframeUrlByMeterClientType[
+        this.meterClientType_ ?? MeterClientTypes.LICENSED_BY_GOOGLE
+      ];
+
+    const iframeUrlParams = {
+      'origin': parseUrl(this.win_.location.href).origin,
+    };
+
+    if (this.deps_.clientConfigManager().shouldForceLangInIframes()) {
+      iframeUrlParams['hl'] = this.deps_.clientConfigManager().getLanguage();
+    }
+
+    /** @private @const {!ActivityIframeView} */
+    this.activityIframeView_ = new ActivityIframeView(
+      this.win_,
+      this.activityPorts_,
+      feUrl(iframeUrl, iframeUrlParams),
+      iframeArgs,
+      /* shouldFadeBody */ false
+    );
+
     /** @private @const {!function()} */
     this.sendCloseRequestFunction_ = () => {
       const closeRequest = new ToastCloseRequest();
@@ -10260,45 +11703,40 @@ class MeterToastApi {
         this.onConsumeCallbackHandled_ = true;
         this.onConsumeCallback_();
       }
-    };
-
-    /** @private {?function()} */
-    this.scrollEventListener_ = null;
-  }
-
-  /**
-   * Shows the user the metering toast.
-   * @return {!Promise}
-   */
-  start() {
+    };
+
     this.deps_
       .callbacks()
       .triggerFlowStarted(SubscriptionFlows.SHOW_METER_TOAST);
     this.activityIframeView_.on(
       ViewSubscriptionsResponse,
-      this.startNativeFlow_.bind(this)
+      this.startSubscriptionFlow_.bind(this)
     );
-    if (!this.deps_.callbacks().hasSubscribeRequestCallback()) {
+    if (
+      !this.deps_.callbacks().hasSubscribeRequestCallback() &&
+      !this.deps_.callbacks().hasOffersFlowRequestCallback()
+    ) {
       const errorMessage =
-        '[swg.js]: `setOnNativeSubscribeRequest` has not been ' +
-        'set before starting the metering flow, so users will not be able to ' +
+        '[swg.js]: `setOnNativeSubscribeRequest` has not been set ' +
+        'before starting the metering flow, so users will not be able to ' +
         'subscribe from the metering dialog directly. Please call ' +
-        '`setOnNativeSubscribeRequest` with a subscription flow callback before ' +
-        'starting metering.';
+        '`setOnNativeSubscribeRequest` with a subscription flow callback ' +
+        'before starting metering.';
       warn(errorMessage);
     }
 
     this.dialogManager_
       .handleCancellations(this.activityIframeView_)
       .catch((reason) => {
-        // Possibly call onConsumeCallback on all dialog cancellations to ensure unexpected
-        // dialog closures don't give access without a meter consumed.
+        // Possibly call onConsumeCallback on all dialog cancellations to
+        // ensure unexpected dialog closures don't give access without a
+        // meter consumed.
         if (this.onConsumeCallback_ && !this.onConsumeCallbackHandled_) {
           this.onConsumeCallbackHandled_ = true;
           this.onConsumeCallback_();
         }
-        // Don't throw on cancel errors since they happen when a user closes the toast,
-        // which is expected.
+        // Don't throw on cancel errors since they happen when a user closes
+        // the toast, which is expected.
         if (!isCancelError(reason)) {
           // eslint-disable-next-line no-console
           console /*OK*/
@@ -10308,6 +11746,7 @@ class MeterToastApi {
           throw reason;
         }
       });
+
     return this.dialogManager_.openDialog().then((dialog) => {
       this.setDialogBoxShadow_();
       this.setLoadingViewWidth_();
@@ -10415,12 +11854,14 @@ class MeterToastApi {
    * @param {ViewSubscriptionsResponse} response
    * @private
    */
-  startNativeFlow_(response) {
+  startSubscriptionFlow_(response) {
+    this.removeCloseEventListener();
+    // We shouldn't decrement the meter on redirects, so don't call onConsumeCallback.
+    this.onConsumeCallbackHandled_ = true;
     if (response.getNative()) {
-      this.removeCloseEventListener();
-      // We shouldn't decrement the meter on redirects, so don't call onConsumeCallback.
-      this.onConsumeCallbackHandled_ = true;
       this.deps_.callbacks().triggerSubscribeRequest();
+    } else {
+      this.deps_.callbacks().triggerOffersFlowRequest();
     }
   }
 
@@ -10767,6 +12208,36 @@ const AnalyticsEventToGoogleAnalyticsEvent = {
       '',
       true
     ),
+  [AnalyticsEvent.IMPRESSION_NEWSLETTER_OPT_IN]: createGoogleAnalyticsEvent(
+    'NTG newsletter',
+    'newsletter modal impression',
+    '',
+    true
+  ),
+  [AnalyticsEvent.EVENT_NEWSLETTER_OPTED_IN]: createGoogleAnalyticsEvent(
+    'NTG newsletter',
+    'newsletter signup',
+    'success',
+    false
+  ),
+  [AnalyticsEvent.IMPRESSION_REGWALL_OPT_IN]: createGoogleAnalyticsEvent(
+    'NTG account',
+    'registration modal impression',
+    '',
+    true
+  ),
+  [AnalyticsEvent.EVENT_REGWALL_OPTED_IN]: createGoogleAnalyticsEvent(
+    'NTG account',
+    'registration',
+    'success',
+    false
+  ),
+  [AnalyticsEvent.ACTION_SURVEY_DATA_TRANSFER]: createGoogleAnalyticsEvent(
+    '',
+    'survey submission',
+    '',
+    false
+  ),
 };
 
 /** @const {!Object<?AnalyticsEvent,?Object>} */
@@ -10923,8 +12394,17 @@ class EntitlementsManager {
    * @param {!../model/page-config.PageConfig} pageConfig
    * @param {!./fetcher.Fetcher} fetcher
    * @param {!./deps.DepsDef} deps
+   * @param {!boolean} useArticleEndpoint
+   * @param {!boolean} enableDefaultMeteringHandler
    */
-  constructor(win, pageConfig, fetcher, deps) {
+  constructor(
+    win,
+    pageConfig,
+    fetcher,
+    deps,
+    useArticleEndpoint,
+    enableDefaultMeteringHandler
+  ) {
     /** @private @const {!Window} */
     this.win_ = win;
 
@@ -10962,6 +12442,14 @@ class EntitlementsManager {
      */
     this.encodedParams_ = null;
 
+    /** @protected {!string} */
+    this.encodedParamName_ = useArticleEndpoint
+      ? 'encodedEntitlementsParams'
+      : 'encodedParams';
+
+    /** @protected {!string} */
+    this.action_ = useArticleEndpoint ? '/article' : '/entitlements';
+
     /** @private @const {!./storage.Storage} */
     this.storage_ = deps.storage();
 
@@ -10977,6 +12465,18 @@ class EntitlementsManager {
      */
     this.entitlementsPostPromise = null;
 
+    /** @private @const {boolean} */
+    this.useArticleEndpoint_ = useArticleEndpoint;
+
+    /** @private @const {boolean} */
+    this.enableDefaultMeteringHandler_ = enableDefaultMeteringHandler;
+
+    /** @private {?Article} */
+    this.article_ = null;
+
+    /** @private {boolean} */
+    this.enableMeteredByGoogle_ = false;
+
     this.deps_
       .eventManager()
       .registerEventListener(this.possiblyPingbackOnClientEvent_.bind(this));
@@ -11069,33 +12569,51 @@ class EntitlementsManager {
 
   /**
    * Sends a pingback that marks a metering entitlement as used.
-   * @param {!Entitlements} entitlements
+   * @param {!Entitlement|null} entitlement
    */
-  consumeMeter_(entitlements) {
-    const entitlement = entitlements.getEntitlementForThis();
+  consumeMeter_(entitlement) {
     if (!entitlement || entitlement.source !== GOOGLE_METERING_SOURCE) {
       return;
     }
-    // Verify GAA params are present, otherwise bail since the pingback
-    // shouldn't happen on non-metering requests.
-    if (!queryStringHasFreshGaaParams(this.win_.location.search)) {
-      return;
+
+    // If GAA params are present, include them in the pingback.
+    let gaaToken;
+    let entitlementSource;
+    if (
+      entitlement.subscriptionTokenContents &&
+      entitlement.subscriptionTokenContents['metering']['clientType'] ===
+        MeterClientTypes.METERED_BY_GOOGLE
+    ) {
+      // If clientType is METERED_BY_GOOGLE, this is the appropriate
+      // EntitlementSource, and no GAA params are required.
+      entitlementSource =
+        EntitlementSource.SUBSCRIBE_WITH_GOOGLE_METERING_SERVICE;
+    } else {
+      // Expected: clientType is LICENSED_BY_GOOGLE
+      if (queryStringHasFreshGaaParams(this.win_.location.search)) {
+        // GAA params are valid. Post back as Showcase.
+        entitlementSource = EntitlementSource.GOOGLE_SHOWCASE_METERING_SERVICE;
+        gaaToken = this.getGaaToken_();
+      } else {
+        // Sanity check:
+        // If we're not METERED_BY_GOOGLE, and GAA params are not valid, do not
+        // post back.
+        return;
+      }
     }
 
     this.deps_
       .eventManager()
       .logSwgEvent(AnalyticsEvent.EVENT_UNLOCKED_BY_METER, false);
 
-    const token = this.getGaaToken_();
-
     const jwt = new EntitlementJwt();
     jwt.setSource(entitlement.source);
     jwt.setJwt(entitlement.subscriptionToken);
     return this.postEntitlementsRequest_(
-      jwt,
-      EntitlementResult.UNLOCKED_METER,
-      EntitlementSource.GOOGLE_SHOWCASE_METERING_SERVICE,
-      token
+      /* usedEntitlement */ jwt,
+      /* entitlementResult */ EntitlementResult.UNLOCKED_METER,
+      /* entitlementSource */ entitlementSource,
+      /* optionalToken */ gaaToken
     );
   }
 
@@ -11144,12 +12662,15 @@ class EntitlementsManager {
     const token = this.getGaaToken_();
     const isUserRegistered =
       event?.additionalParameters?.getIsUserRegistered?.();
+    const subscriptionTimestamp =
+      event?.additionalParameters?.getSubscriptionTimestamp?.();
     this.postEntitlementsRequest_(
       new EntitlementJwt(),
       result,
       source,
       token,
-      isUserRegistered
+      isUserRegistered,
+      subscriptionTimestamp
     );
   }
 
@@ -11160,7 +12681,8 @@ class EntitlementsManager {
     entitlementResult,
     entitlementSource,
     optionalToken = '',
-    optionalIsUserRegistered = null
+    optionalIsUserRegistered = null,
+    optionalSubscriptionTimestamp = null
   ) {
     const message = new EntitlementsRequest();
     message.setUsedEntitlement(usedEntitlement);
@@ -11171,11 +12693,12 @@ class EntitlementsManager {
     if (typeof optionalIsUserRegistered === 'boolean') {
       message.setIsUserRegistered(optionalIsUserRegistered);
     }
+    if (optionalSubscriptionTimestamp) {
+      message.setSubscriptionTimestamp(optionalSubscriptionTimestamp);
+    }
 
     let url =
-      '/publication/' +
-      encodeURIComponent(this.publicationId_) +
-      '/entitlements';
+      '/publication/' + encodeURIComponent(this.publicationId_) + this.action_;
     url = addDevModeParamsToUrl(this.win_.location, url);
 
     // Promise that sets this.encodedParams_ when it resolves.
@@ -11195,10 +12718,19 @@ class EntitlementsManager {
           );
         });
 
-    this.entitlementsPostPromise = encodedParamsPromise.then(() => {
+    // Get swgUserToken from local storage
+    const swgUserTokenPromise = this.storage_.get(Constants$1.USER_TOKEN, true);
+    this.entitlementsPostPromise = Promise.all([
+      swgUserTokenPromise,
+      encodedParamsPromise,
+    ]).then((values) => {
+      const swgUserToken = values[0];
+      if (swgUserToken) {
+        url = addQueryParam(url, 'sut', swgUserToken);
+      }
       url = addQueryParam(
         url,
-        'encodedParams',
+        this.encodedParamName_,
         /** @type {!string} */ (this.encodedParams_)
       );
 
@@ -11255,6 +12787,37 @@ class EntitlementsManager {
     });
   }
 
+  /**
+   * If the manager is also responsible for fetching the Article, it
+   * will be accessible from here and should resolve a null promise otherwise.
+   * @returns {!Promise<?Article>}
+   */
+  getArticle() {
+    // The base manager only fetches from the entitlements endpoint, which does
+    // not contain an Article.
+    if (!this.useArticleEndpoint_ || !this.responsePromise_) {
+      return Promise.resolve();
+    }
+    return this.responsePromise_.then(() => Promise.resolve(this.article_));
+  }
+
+  /**
+   * The experiment flags that are returned by the article endpoint should be accessible from here.
+   * @returns {Promise<Array<string>>}
+   */
+  getExperimentConfigFlags() {
+    return this.getArticle().then((article) => {
+      const expConfig = article['experimentConfig'];
+      if (expConfig != null) {
+        const expFlags = expConfig['experimentFlags'];
+        if (expFlags != null) {
+          return expFlags;
+        }
+      }
+      return [];
+    });
+  }
+
   /**
    * @param {!GetEntitlementsParamsExternalDef=} params
    * @return {!Promise<!Entitlements>}
@@ -11305,6 +12868,13 @@ class EntitlementsManager {
     this.blockNextNotification_ = false;
   }
 
+  /**
+   * Allow Google to handle metering for the given page.
+   */
+  enableMeteredByGoogle() {
+    this.enableMeteredByGoogle_ = true;
+  }
+
   /**
    * The JSON must either contain a "signedEntitlements" with JWT, or
    * "entitlements" field with plain JSON object.
@@ -11321,6 +12891,9 @@ class EntitlementsManager {
     const signedData = json['signedEntitlements'];
     const decryptedDocumentKey = json['decryptedDocumentKey'];
     const swgUserToken = json['swgUserToken'];
+    if (swgUserToken) {
+      this.saveSwgUserToken_(swgUserToken);
+    }
     if (signedData) {
       const entitlements = this.getValidJwtEntitlements_(
         signedData,
@@ -11329,13 +12902,11 @@ class EntitlementsManager {
         decryptedDocumentKey
       );
       if (entitlements) {
-        this.saveSwgUserToken_(swgUserToken);
         return entitlements;
       }
     } else {
       const plainEntitlements = json['entitlements'];
       if (plainEntitlements) {
-        this.saveSwgUserToken_(swgUserToken);
         return this.createEntitlements_(
           '',
           plainEntitlements,
@@ -11414,7 +12985,7 @@ class EntitlementsManager {
     return new Entitlements(
       SERVICE_ID,
       raw,
-      Entitlement.parseListFromJson(json),
+      Entitlement.parseListFromJson(json, this.jwtHelper_),
       this.pageConfig_.getProductId(),
       this.ack_.bind(this),
       this.consume_.bind(this),
@@ -11444,6 +13015,14 @@ class EntitlementsManager {
       .callbacks()
       .triggerEntitlementsResponse(Promise.resolve(entitlements));
 
+    // Implementation of the default ability to always consume metered entitlements
+    // if they are provided in an entitlements response.
+    if (this.enableDefaultMeteringHandler_) {
+      if (entitlements.enablesThisWithGoogleMetering()) {
+        entitlements.consume();
+      }
+    }
+
     const entitlement = entitlements.getEntitlementForThis();
     if (!entitlement) {
       this.deps_
@@ -11474,6 +13053,9 @@ class EntitlementsManager {
 
     const params = new EventParams();
     params.setIsUserRegistered(true);
+    if (entitlement.subscriptionTimestamp) {
+      params.setSubscriptionTimestamp(entitlement.subscriptionTimestamp);
+    }
 
     // Log unlock event.
     const eventType =
@@ -11519,41 +13101,42 @@ class EntitlementsManager {
    */
   consume_(entitlements, onCloseDialog) {
     if (entitlements.enablesThisWithGoogleMetering()) {
+      const entitlement = entitlements.getEntitlementForThis();
+
       const onConsumeCallback = () => {
         if (onCloseDialog) {
           onCloseDialog();
         }
-        this.consumeMeter_(entitlements);
+        this.consumeMeter_(entitlement);
       };
-      const showToast = this.getShowToastFromEntitlements_(entitlements);
-      if (showToast === false) {
-        // If showToast is explicitly false, call onConsumeCallback directly.
+
+      if (!entitlement.subscriptionTokenContents) {
+        // Ignore decoding errors. Don't show a toast, and return
+        // onConsumeCallback directly.
         return onConsumeCallback();
       }
-      const meterToastApi = new MeterToastApi(this.deps_);
-      meterToastApi.setOnConsumeCallback(onConsumeCallback);
-      return meterToastApi.start();
-    }
-  }
 
-  /**
-   * Gets the `showToast` value (or null/undefined if unavailable) from
-   * the Google metering entitlement details in the input entitlements.
-   * @param {!Entitlements} entitlements
-   * @return {boolean|undefined}
-   * @private
-   */
-  getShowToastFromEntitlements_(entitlements) {
-    const entitlement = entitlements.getEntitlementForThis();
-    if (!entitlement || entitlement.source !== GOOGLE_METERING_SOURCE) {
-      return;
-    }
-    try {
-      const meteringJwt = this.jwtHelper_.decode(entitlement.subscriptionToken);
-      return meteringJwt['metering'] && meteringJwt['metering']['showToast'];
-    } catch (e) {
-      // Ignore decoding errors.
-      return;
+      if (
+        entitlement.subscriptionTokenContents['metering'] &&
+        entitlement.subscriptionTokenContents['metering']['showToast'] === true
+      ) {
+        // Return a delegation to the meterToastApi, which will return the
+        // onConsumeCallback when the toast is dismissed.
+        const meterToastApi = new MeterToastApi(this.deps_, {
+          meterClientType:
+            entitlement.subscriptionTokenContents['metering']['clientType'],
+          meterClientUserAttribute:
+            entitlement.subscriptionTokenContents['metering'][
+              'clientUserAttribute'
+            ],
+        });
+        meterToastApi.setOnConsumeCallback(onConsumeCallback);
+        return meterToastApi.start();
+      } else {
+        // If showToast isn't true, don't show a toast, and return
+        // onConsumeCallback directly.
+        return onConsumeCallback();
+      }
     }
   }
 
@@ -11563,25 +13146,27 @@ class EntitlementsManager {
    * @private
    */
   fetch_(params) {
-    // Get swgUserToken from getEntitlements params
-    const swgUserTokenParam = params?.encryption?.swgUserToken;
-    // Get swgUserToken from local storage if it is not in getEntitlements params
-    const swgUserTokenPromise = swgUserTokenParam
-      ? Promise.resolve(swgUserTokenParam)
-      : this.storage_.get(Constants$1.USER_TOKEN, true);
+    // Get swgUserToken from local storage
+    const swgUserTokenPromise = this.storage_.get(Constants$1.USER_TOKEN, true);
+
+    // Get read_time from session storage
+    const readTimePromise = this.storage_.get(
+      Constants$1.READ_TIME,
+      /*useLocalStorage=*/ false
+    );
 
     let url =
-      '/publication/' +
-      encodeURIComponent(this.publicationId_) +
-      '/entitlements';
+      '/publication/' + encodeURIComponent(this.publicationId_) + this.action_;
 
     return Promise.all([
       hash(getCanonicalUrl(this.deps_.doc())),
       swgUserTokenPromise,
+      readTimePromise,
     ])
       .then((values) => {
         const hashedCanonicalUrl = values[0];
         const swgUserToken = values[1];
+        const readTime = values[2];
 
         url = addDevModeParamsToUrl(this.win_.location, url);
 
@@ -11598,6 +13183,46 @@ class EntitlementsManager {
         if (swgUserToken) {
           url = addQueryParam(url, 'sut', swgUserToken);
         }
+        // Add publisherProvidedId param for swg-basic.
+        if (this.config_.publisherProvidedId) {
+          url = addQueryParam(url, 'ppid', this.config_.publisherProvidedId);
+        }
+        // Add publisherProvidedId param for swg-classic.
+        else if (
+          params?.publisherProvidedId &&
+          typeof params.publisherProvidedId === 'string' &&
+          params.publisherProvidedId.length > 0
+        ) {
+          url = addQueryParam(url, 'ppid', params.publisherProvidedId);
+        }
+
+        // Add interaction_age param.
+        if (readTime) {
+          const last = parseInt(readTime, 10);
+          if (last) {
+            const interactionAge = Math.floor((Date.now() - last) / 1000);
+            if (interactionAge >= 0) {
+              url = addQueryParam(
+                url,
+                'interaction_age',
+                interactionAge.toString()
+              );
+            }
+          }
+        }
+
+        /** @type {!GetEntitlementsParamsInternalDef|undefined} */
+        let encodableParams = this.enableMeteredByGoogle_
+          ? {
+              metering: {
+                clientTypes: [MeterClientTypes.METERED_BY_GOOGLE],
+                owner: this.publicationId_,
+                resource: {
+                  hashedCanonicalUrl,
+                },
+              },
+            }
+          : undefined;
 
         // Add metering params.
         if (
@@ -11610,15 +13235,14 @@ class EntitlementsManager {
             typeof meteringStateId === 'string' &&
             meteringStateId.length > 0
           ) {
-            /** @type {!GetEntitlementsParamsInternalDef} */
-            const encodableParams = {
+            encodableParams = {
               metering: {
                 clientTypes: [MeterClientTypes.LICENSED_BY_GOOGLE],
                 owner: this.publicationId_,
                 resource: {
                   hashedCanonicalUrl,
                 },
-                // Publisher provided state.
+                // Add publisher provided state and additional fields.
                 state: {
                   id: meteringStateId,
                   attributes: [],
@@ -11634,7 +13258,7 @@ class EntitlementsManager {
               }
 
               const attributeNames = Object.keys(attributes);
-              attributeNames.forEach((attributeName) => {
+              for (const attributeName of attributeNames) {
                 const name = `${category}_${attributeName}`;
                 const timestamp = Number(attributes[attributeName].timestamp);
 
@@ -11652,7 +13276,7 @@ class EntitlementsManager {
                   name,
                   timestamp,
                 });
-              });
+              }
             }
             collectAttributes({
               attributes: params.metering.state.standardAttributes,
@@ -11662,12 +13286,6 @@ class EntitlementsManager {
               attributes: params.metering.state.customAttributes,
               category: 'custom',
             });
-
-            // Encode params.
-            this.encodedParams_ = base64UrlEncodeFromBytes(
-              utf8EncodeSync(JSON.stringify(encodableParams))
-            );
-            url = addQueryParam(url, 'encodedParams', this.encodedParams_);
           } else {
             warn(
               `SwG Entitlements: Please specify a metering state ID string, ideally a hash to avoid PII.`
@@ -11675,6 +13293,14 @@ class EntitlementsManager {
           }
         }
 
+        if (encodableParams) {
+          // Encode params.
+          this.encodedParams_ = base64UrlEncodeFromBytes(
+            utf8EncodeSync(JSON.stringify(encodableParams))
+          );
+          url = addQueryParam(url, this.encodedParamName_, this.encodedParams_);
+        }
+
         // Build URL.
         return serviceUrl(url);
       })
@@ -11685,12 +13311,18 @@ class EntitlementsManager {
         return this.fetcher_.fetchCredentialedJson(url);
       })
       .then((json) => {
+        let response = json;
+        if (this.useArticleEndpoint_) {
+          this.article_ = json;
+          response = json['entitlements'];
+        }
+
         if (json.errorMessages && json.errorMessages.length > 0) {
-          json.errorMessages.forEach((errorMessage) => {
+          for (const errorMessage of json.errorMessages) {
             warn('SwG Entitlements: ' + errorMessage);
-          });
+          }
         }
-        return this.parseEntitlements(json);
+        return this.parseEntitlements(response);
       });
   }
 }
@@ -11812,7 +13444,7 @@ class Xhr {
          */
         const targetOrigin = parseUrl(input).origin;
         throw new Error(
-          `XHR Failed fetching (${targetOrigin}/...): (Note: a CORS error above may indicate that this domain is not configured for Subscribe with Google)`,
+          `XHR Failed fetching (${targetOrigin}/...): (Note: a CORS error above may indicate that this publisher or domain is not configured in Publisher Center. The CORS error happens becasue 4xx responses do not set CORS headers.)`,
           reason && reason.message
         );
       })
@@ -11885,9 +13517,9 @@ function fetchPolyfill(input, init) {
     }
 
     if (init.headers) {
-      Object.keys(init.headers).forEach(function (header) {
+      for (const header of Object.keys(init.headers)) {
         xhr.setRequestHeader(header, init.headers[header]);
-      });
+      }
     }
 
     xhr.onreadystatechange = () => {
@@ -12094,6 +13726,8 @@ class FetchResponseHeaders {
  * limitations under the License.
  */
 
+const jsonSaftyPrefix = /^(\)\]\}'\n)/;
+
 /**
  * @interface
  */
@@ -12149,7 +13783,7 @@ class XhrFetcher {
     return this.fetch(url, init).then((response) => {
       return response.text().then((text) => {
         // Remove "")]}'\n" XSSI prevention prefix in safe responses.
-        const cleanedText = text.replace(/^(\)\]\}'\n)/, '');
+        const cleanedText = text.replace(jsonSaftyPrefix, '');
         return parseJson(cleanedText);
       });
     });
@@ -12165,9 +13799,21 @@ class XhrFetcher {
       credentials: 'include',
       body: 'f.req=' + serializeProtoMessageForUrl(message),
     });
-    return this.fetch(url, init).then(
-      (response) => (response && response.json()) || {}
-    );
+    return this.fetch(url, init).then((response) => {
+      if (!response) {
+        return {};
+      }
+      return response.text().then((text) => {
+        try {
+          // Remove "")]}'\n" XSSI prevention prefix in safe responses.
+          const cleanedText = text.replace(jsonSaftyPrefix, '');
+          return parseJson(cleanedText);
+        } catch (e) {
+          ErrorUtils.throwAsync(e);
+          return {};
+        }
+      });
+    });
   }
 
   /** @override */
@@ -12206,14 +13852,15 @@ class XhrFetcher {
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+/* eslint-enable no-unused-vars */
 
 class GoogleAnalyticsEventListener {
   /**
    * @param {!./deps.DepsDef} deps
    */
   constructor(deps) {
-    /** @private @const {!Window} */
-    this.win_ = deps.win();
+    /** @private @const {!./deps.DepsDef} deps */
+    this.deps_ = deps;
 
     /** @private @const {!./client-event-manager.ClientEventManager} */
     this.eventManager_ = deps.eventManager();
@@ -12231,12 +13878,24 @@ class GoogleAnalyticsEventListener {
   /**
    *  Listens for new events from the events manager and logs appropriate events to Google Analytics.
    * @param {!../api/client-event-manager-api.ClientEvent} event
+   * @param {(!../api/client-event-manager-api.ClientEventParams|undefined)=} eventParams
    */
-  handleClientEvent_(event) {
-    // Bail immediately if ga function doesn't exist in Window.
-    if (typeof this.win_.ga != 'function') {
+  handleClientEvent_(event, eventParams = undefined) {
+    // Require either ga function (analytics.js) or gtag function (gtag.js).
+    const gaIsEligible = GoogleAnalyticsEventListener.isGaEligible(this.deps_);
+    const gtagIsEligible = GoogleAnalyticsEventListener.isGtagEligible(
+      this.deps_
+    );
+    const neitherIsEligible = !gaIsEligible && !gtagIsEligible;
+    if (neitherIsEligible) {
       return;
     }
+
+    // Extract methods from window.
+    const {ga, gtag} = /** @type {!WindowWithAnalyticsMethods} */ (
+      this.deps_.win()
+    );
+
     let subscriptionFlow = '';
     if (event.additionalParameters) {
       // additionalParameters isn't strongly typed so checking for both object and class notation.
@@ -12244,14 +13903,58 @@ class GoogleAnalyticsEventListener {
         event.additionalParameters.subscriptionFlow ||
         event.additionalParameters.getSubscriptionFlow();
     }
-    const gaEvent = analyticsEventToGoogleAnalyticsEvent(
+    let gaEvent = analyticsEventToGoogleAnalyticsEvent(
       event.eventType,
       subscriptionFlow
     );
-    if (gaEvent) {
-      this.win_.ga('send', 'event', gaEvent);
+    if (!gaEvent) {
+      return;
+    }
+
+    const analyticsParams = eventParams?.googleAnalyticsParameters || {};
+    gaEvent = {
+      ...gaEvent,
+      eventCategory: analyticsParams.event_category || gaEvent.eventCategory,
+      eventLabel: analyticsParams.event_label || gaEvent.eventLabel,
+    };
+
+    // TODO(b/234825847): Remove this once universal analytics is deprecated in 2023.
+    if (gaIsEligible) {
+      ga('send', 'event', gaEvent);
+    }
+
+    if (gtagIsEligible) {
+      const gtagEvent = {
+        'event_category': gaEvent.eventCategory,
+        'event_label': gaEvent.eventLabel,
+        'non_interaction': gaEvent.nonInteraction,
+        ...analyticsParams,
+      };
+      gtag('event', gaEvent.eventAction, gtagEvent);
     }
   }
+
+  /**
+   * Function to determine whether event is eligible for GA logging.
+   * @param {!./deps.DepsDef} deps
+   * @returns {boolean}
+   */
+  static isGaEligible(deps) {
+    return isFunction(
+      /** @type {!WindowWithAnalyticsMethods} */ (deps.win()).ga
+    );
+  }
+
+  /**
+   * Function to determine whether event is eligible for gTag logging.
+   * @param {!./deps.DepsDef} deps
+   * @returns {boolean}
+   */
+  static isGtagEligible(deps) {
+    return isFunction(
+      /** @type {!WindowWithAnalyticsMethods} */ (deps.win()).gtag
+    );
+  }
 }
 
 /**
@@ -12457,6 +14160,9 @@ class LinkCompleteFlow {
           deps
             .eventManager()
             .logSwgEvent(AnalyticsEvent.ACTION_LINK_CONTINUE, true);
+          deps
+            .eventManager()
+            .logSwgEvent(AnalyticsEvent.EVENT_LINK_ACCOUNT_SUCCESS);
           const flow = new LinkCompleteFlow(deps, response);
           flow.start();
         },
@@ -12491,9 +14197,6 @@ class LinkCompleteFlow {
     /** @private @const {!Window} */
     this.win_ = deps.win();
 
-    /** @private @const {!./client-config-manager.ClientConfigManager} */
-    this.clientConfigManager_ = deps.clientConfigManager();
-
     /** @private @const {!../components/activities.ActivityPorts} */
     this.activityPorts_ = deps.activities();
 
@@ -12506,32 +14209,11 @@ class LinkCompleteFlow {
     /** @private @const {!./callbacks.Callbacks} */
     this.callbacks_ = deps.callbacks();
 
-    const index = (response && response['index']) || '0';
-
     /** @private {?ActivityIframeView} */
     this.activityIframeView_ = null;
 
-    /** @private @const {!Promise<!ActivityIframeView>} */
-    this.activityIframeViewPromise_ = this.clientConfigManager_
-      .getClientConfig()
-      .then(
-        (clientConfig) =>
-          new ActivityIframeView(
-            this.win_,
-            this.activityPorts_,
-            feUrl(
-              '/linkconfirmiframe',
-              {},
-              clientConfig.usePrefixedHostPath,
-              'u/' + index
-            ),
-            feArgs({
-              'productId': deps.pageConfig().getProductId(),
-              'publicationId': deps.pageConfig().getPublicationId(),
-            }),
-            /* shouldFadeBody */ true
-          )
-      );
+    /** @private {!Object} */
+    this.response_ = response || {};
 
     /** @private {?function()} */
     this.completeResolver_ = null;
@@ -12547,51 +14229,70 @@ class LinkCompleteFlow {
    * @return {!Promise}
    */
   start() {
-    return this.activityIframeViewPromise_.then((activityIframeView) => {
-      this.activityIframeView_ = activityIframeView;
+    if (this.response_['saveAndRefresh']) {
+      this.complete_(this.response_, this.response_['linked']);
+      return Promise.resolve();
+    }
 
-      const promise = this.activityIframeView_.acceptResultAndVerify(
-        feOrigin(),
-        /* requireOriginVerified */ true,
-        /* requireSecureChannel */ true
-      );
-      promise
-        .then((response) => {
-          this.complete_(response);
-        })
-        .catch((reason) => {
-          // Rethrow async.
-          setTimeout(() => {
-            throw reason;
-          });
-        })
-        .then(() => {
-          // The flow is complete.
-          this.dialogManager_.completeView(this.activityIframeView_);
+    // Show confirmation.
+    const index = this.response_['index'] || '0';
+    this.activityIframeView_ = new ActivityIframeView(
+      this.win_,
+      this.activityPorts_,
+      feUrl('/linkconfirmiframe', {}, 'u/' + index),
+      feArgs({
+        'productId': this.deps_.pageConfig().getProductId(),
+        'publicationId': this.deps_.pageConfig().getPublicationId(),
+      }),
+      /* shouldFadeBody */ true
+    );
+
+    const promise = this.activityIframeView_.acceptResultAndVerify(
+      feOrigin(),
+      /* requireOriginVerified */ true,
+      /* requireSecureChannel */ true
+    );
+    promise
+      .then((response = {}) => {
+        this.complete_(response, !!response['success']);
+      })
+      .catch((reason) => {
+        // Rethrow async.
+        setTimeout(() => {
+          throw reason;
         });
-      this.deps_
-        .eventManager()
-        .logSwgEvent(AnalyticsEvent.EVENT_GOOGLE_UPDATED, true);
-      this.deps_
-        .eventManager()
-        .logSwgEvent(AnalyticsEvent.IMPRESSION_GOOGLE_UPDATED, true);
-      return this.dialogManager_.openView(this.activityIframeView_);
-    });
+      })
+      .then(() => {
+        // The flow is complete.
+        this.dialogManager_.completeView(this.activityIframeView_);
+      });
+    this.deps_
+      .eventManager()
+      .logSwgEvent(AnalyticsEvent.EVENT_GOOGLE_UPDATED, true);
+    this.deps_
+      .eventManager()
+      .logSwgEvent(AnalyticsEvent.IMPRESSION_GOOGLE_UPDATED, true);
+    return this.dialogManager_.openView(this.activityIframeView_);
   }
 
   /**
-   * @param {?Object} response
+   * @param {!Object} response
+   * @param {boolean} success
    * @private
    */
-  complete_(response) {
+  complete_(response, success) {
     this.deps_
       .eventManager()
       .logSwgEvent(AnalyticsEvent.ACTION_GOOGLE_UPDATED_CLOSE, true);
+    const userToken = response['swgUserToken'];
+    if (userToken) {
+      this.deps_.storage().set(Constants$1.USER_TOKEN, userToken, true);
+    }
     this.callbacks_.triggerLinkComplete();
     this.callbacks_.resetLinkProgress();
     this.entitlementsManager_.setToastShown(true);
     this.entitlementsManager_.unblockNextNotification();
-    this.entitlementsManager_.reset((response && response['success']) || false);
+    this.entitlementsManager_.reset(success);
     if (response && response['entitlements']) {
       this.entitlementsManager_.pushNextEntitlements(response['entitlements']);
     }
@@ -12671,6 +14372,9 @@ class LinkSaveFlow {
       this.deps_.callbacks().triggerFlowStarted(SubscriptionFlows.LINK_ACCOUNT);
       linkConfirm = new LinkCompleteFlow(this.deps_, result);
       startPromise = linkConfirm.start();
+      this.deps_
+        .eventManager()
+        .logSwgEvent(AnalyticsEvent.EVENT_SAVE_SUBSCRIPTION_SUCCESS);
     } else {
       startPromise = Promise.reject(createCancelError(this.win_, 'not linked'));
     }
@@ -14978,7 +16682,7 @@ class PaymentsWebActivityDelegate {
       // http://yaqs/4912322941550592
       return '/ui/pay';
     }
-    return this.getBasePath_() + '/ui/pay';
+    return this.getBasePath_() + '/ui/pay?swg=true';
   }
 
   /**
@@ -14991,12 +16695,12 @@ class PaymentsWebActivityDelegate {
   getIframeUrl(environment, origin) {
     // TODO: These should be compile time constants and not dependent
     // on the environment.
-    let iframeUrl = `https://pay.google.com/gp/p/ui/pay?origin=${origin}`;
+    let iframeUrl = `https://pay.google.com/gp/p/ui/pay?origin=${origin}&swg=true`;
     if (
       environment == Constants.Environment.SANDBOX ||
       environment == Constants.Environment.PREPROD
     ) {
-      iframeUrl = `https://pay'+  (environment == Constants.Environment.PREPROD ? '-preprod' : '')+  '.sandbox.google.com/gp/p/ui/pay?origin=${origin}`;
+      iframeUrl = `https://pay'+  (environment == Constants.Environment.PREPROD ? '-preprod' : '')+  '.sandbox.google.com/gp/p/ui/pay?origin=${origin}&swg=true`;
     }
     return iframeUrl;
   }
@@ -16988,7 +18692,7 @@ class Propensity {
   }
 }
 
-const CSS = ".swg-dialog,.swg-toast{background-color:#fff!important;box-sizing:border-box}.swg-toast{border:none!important;bottom:0!important;max-height:46px!important;position:fixed!important;z-index:2147483647!important}@media (min-width:871px) and (min-height:641px){.swg-dialog.swg-wide-dialog{left:-435px!important;width:870px!important}}@media (max-height:640px),(max-width:640px){.swg-dialog,.swg-toast{border-top-left-radius:8px!important;border-top-right-radius:8px!important;box-shadow:0 1px 1px rgba(60,64,67,.3),0 1px 4px 1px rgba(60,64,67,.15)!important;left:-240px!important;margin-left:50vw!important;width:480px!important}}@media (min-width:641px) and (min-height:641px){.swg-dialog{background-color:transparent!important;border:none!important;left:-315px!important;margin-left:50vw!important;width:630px!important}.swg-toast{border-radius:4px!important;bottom:8px!important;box-shadow:0 3px 1px -2px rgba(0,0,0,.2),0 2px 2px 0 rgba(0,0,0,.14),0 1px 5px 0 rgba(0,0,0,.12)!important;left:8px!important}}@media (max-width:480px){.swg-dialog,.swg-toast{left:0!important;margin-left:0!important;right:0!important;width:100%!important}}\n/*# sourceURL=/./src/components/dialog.css*/";
+const CSS = ".swg-dialog,.swg-toast{background-color:#fff!important;box-sizing:border-box}.swg-toast{border:none!important;bottom:0!important;max-height:46px!important;position:fixed!important;z-index:2147483647!important}@media (min-width:871px) and (min-height:641px){.swg-dialog.swg-wide-dialog{left:-435px!important;width:870px!important}}@media (max-height:640px),(max-width:640px){.swg-dialog,.swg-toast{border-top-left-radius:8px!important;border-top-right-radius:8px!important;box-shadow:0 1px 1px rgba(60,64,67,.3),0 1px 4px 1px rgba(60,64,67,.15)!important;left:-240px!important;margin-left:50vw!important;width:480px!important}}@media (min-width:641px) and (min-height:641px){.swg-dialog{background-color:transparent!important;border:none!important;left:-315px!important;margin-left:50vw!important;width:630px!important}.swg-toast{border-radius:4px!important;bottom:8px!important;box-shadow:0 3px 1px -2px rgba(0,0,0,.2),0 2px 2px 0 rgba(0,0,0,.14),0 1px 5px 0 rgba(0,0,0,.12)!important;left:8px!important}}@media (max-width:480px){.swg-dialog,.swg-toast{left:0!important;margin-left:0!important;right:0!important;width:100%!important}}html>body.swg-disable-scroll{height:100vh!important;overflow:hidden!important}html>body.swg-disable-scroll *{overflow:hidden!important}\n/*# sourceURL=/./src/components/dialog.css*/\n";
 
 /**
  * Copyright 2018 The Subscribe with Google Authors. All Rights Reserved.
@@ -17202,16 +18906,18 @@ class WaitForSubscriptionLookupApi {
 
 /**
  * @implements {DepsDef}
- * @implements {Subscriptions}
+ * @implements {SubscriptionsInterface}
  */
 class ConfiguredRuntime {
   /**
-   * @param {!Window|!Document|!Doc} winOrDoc
+   * @param {!Window|!Document|!DocInterface} winOrDoc
    * @param {!../model/page-config.PageConfig} pageConfig
    * @param {{
-   *     fetcher: (!Fetcher|undefined),
+   *     fetcher: (!FetcherInterface|undefined),
    *     configPromise: (!Promise|undefined),
    *     enableGoogleAnalytics: (boolean|undefined),
+   *     enableDefaultMeteringHandler: (boolean|undefined),
+   *     useArticleEndpoint: (boolean|undefined)
    *   }=} integr
    * @param {!../api/subscriptions.Config=} config
    * @param {!{
@@ -17226,7 +18932,7 @@ class ConfiguredRuntime {
     /** @private @const {!ClientEventManager} */
     this.eventManager_ = new ClientEventManager(integr.configPromise);
 
-    /** @private @const {!Doc} */
+    /** @private @const {!DocInterface} */
     this.doc_ = resolveDoc(winOrDoc);
 
     /** @private @const {!Window} */
@@ -17253,7 +18959,7 @@ class ConfiguredRuntime {
     /** @private @const {!JsError} */
     this.jserror_ = new JsError(this.doc_);
 
-    /** @private @const {!Fetcher} */
+    /** @private @const {!FetcherInterface} */
     this.fetcher_ = integr.fetcher || new XhrFetcher(this.win_);
 
     /** @private @const {!Storage} */
@@ -17271,6 +18977,9 @@ class ConfiguredRuntime {
     /** @private {?ContributionsFlow} */
     this.lastContributionsFlow_ = null;
 
+    /** @private {string|undefined} */
+    this.publisherProvidedId_ = undefined;
+
     // Start listening to Google Analytics events, if applicable.
     if (integr.enableGoogleAnalytics) {
       /** @private @const {!GoogleAnalyticsEventListener} */
@@ -17287,7 +18996,6 @@ class ConfiguredRuntime {
 
     /** @private @const {!AnalyticsService} */
     this.analyticsService_ = new AnalyticsService(this, this.fetcher_);
-    this.analyticsService_.start();
 
     /** @private @const {!PayClient} */
     this.payClient_ = new PayClient(this);
@@ -17300,11 +19008,14 @@ class ConfiguredRuntime {
       this.win_,
       this.pageConfig_,
       this.fetcher_,
-      this // See note about 'this' above
+      this, // See note about 'this' above
+      integr.useArticleEndpoint || false,
+      integr.enableDefaultMeteringHandler || false
     );
 
     /** @private @const {!ClientConfigManager} */
     this.clientConfigManager_ = new ClientConfigManager(
+      this, // See note about 'this' above
       pageConfig.getPublicationId(),
       this.fetcher_,
       clientOptions
@@ -17426,39 +19137,60 @@ class ConfiguredRuntime {
   configure_(config) {
     // Validate first.
     let error = '';
-    for (const k in config) {
-      const v = config[k];
-      switch (k) {
+    for (const key in config) {
+      const value = config[key];
+      switch (key) {
         case 'windowOpenMode':
-          if (v != WindowOpenMode.AUTO && v != WindowOpenMode.REDIRECT) {
-            error = 'Unknown windowOpenMode: ' + v;
+          if (
+            value != WindowOpenMode.AUTO &&
+            value != WindowOpenMode.REDIRECT
+          ) {
+            error = 'Unknown windowOpenMode: ' + value;
           }
           break;
         case 'experiments':
-          v.forEach((experiment) => setExperiment(this.win_, experiment, true));
+          for (const experiment of value) {
+            setExperiment(this.win_, experiment, true);
+          }
           if (this.analytics()) {
             // If analytics service isn't set up yet, then it will get the
             // experiments later.
-            this.analytics().addLabels(v);
+            this.analytics().addLabels(value);
           }
           break;
         case 'analyticsMode':
-          if (v != AnalyticsMode.DEFAULT && v != AnalyticsMode.IMPRESSIONS) {
-            error = 'Unknown analytics mode: ' + v;
+          if (
+            value != AnalyticsMode.DEFAULT &&
+            value != AnalyticsMode.IMPRESSIONS
+          ) {
+            error = 'Unknown analytics mode: ' + value;
           }
           break;
         case 'enableSwgAnalytics':
-          if (!isBoolean(v)) {
-            error = 'Unknown enableSwgAnalytics value: ' + v;
+          if (!isBoolean(value)) {
+            error = 'Unknown enableSwgAnalytics value: ' + value;
           }
           break;
         case 'enablePropensity':
-          if (!isBoolean(v)) {
-            error = 'Unknown enablePropensity value: ' + v;
+          if (!isBoolean(value)) {
+            error = 'Unknown enablePropensity value: ' + value;
+          }
+          break;
+        case 'skipAccountCreationScreen':
+          if (!isBoolean(value)) {
+            error = 'Unknown skipAccountCreationScreen value: ' + value;
+          }
+          break;
+        case 'publisherProvidedId':
+          if (
+            value != undefined &&
+            !(typeof value === 'string' && value != '')
+          ) {
+            error = 'publisherProvidedId must be a string, value: ' + value;
           }
           break;
         default:
-          error = 'Unknown config property: ' + k;
+          error = 'Unknown config property: ' + key;
       }
     }
     // Throw error string if it's not null
@@ -17500,9 +19232,15 @@ class ConfiguredRuntime {
 
   /** @override */
   getEntitlements(params) {
+    if (params?.publisherProvidedId) {
+      params.publisherProvidedId = this.publisherProvidedId_;
+    }
     return this.entitlementsManager_
       .getEntitlements(params)
       .then((entitlements) => {
+        // The swg user token is stored in the entitlements flow, so the analytics service is ready for logging.
+        this.analyticsService_.setReadyForLogging();
+        this.analyticsService_.start();
         // Auto update internal things tracking the user's current SKU.
         if (entitlements) {
           try {
@@ -17786,7 +19524,6 @@ class ConfiguredRuntime {
     if (
       !entitlement ||
       !isSecure(this.win().location) ||
-      !wasReferredByGoogle(parseUrl(this.win().document.referrer)) ||
       !queryStringHasFreshGaaParams(
         this.win().location.search,
         /*allowAllAccessTypes=*/ true
@@ -17799,6 +19536,15 @@ class ConfiguredRuntime {
       showcaseEventToAnalyticsEvents(entitlement.entitlement) || [];
     const params = new EventParams();
     params.setIsUserRegistered(entitlement.isUserRegistered);
+    if (entitlement.subscriptionTimestamp) {
+      params.setSubscriptionTimestamp(
+        toTimestamp(
+          convertPotentialTimestampToMilliseconds(
+            entitlement.subscriptionTimestamp
+          )
+        )
+      );
+    }
 
     for (let i = 0; i < eventsToLog.length; i++) {
       this.eventManager().logEvent({
@@ -17824,6 +19570,11 @@ class ConfiguredRuntime {
   showBestAudienceAction() {
     warn('Not implemented yet');
   }
+
+  /** @override */
+  setPublisherProvidedId(publisherProvidedId) {
+    this.publisherProvidedId_ = publisherProvidedId;
+  }
 }
 
 export { AnalyticsEvent, ClientEvent, ClientEventManagerApi, ConfiguredRuntime, DeferredAccountCreationResponse, Entitlement, Entitlements, EventOriginator, Fetcher, FilterResult, PurchaseData, SubscribeResponse, UserData };
diff --git a/third_party/webcomponentsjs/README.amp b/third_party/webcomponentsjs/README.amp
index 5e3359fa0119..d9b8411ea0ec 100644
--- a/third_party/webcomponentsjs/README.amp
+++ b/third_party/webcomponentsjs/README.amp
@@ -8,3 +8,14 @@ Shadow DOM-related polyfills
 Local Modifications:
 - Stripped to only perform necessary Shadow CSS polyfilling.
 - Shortened License based on intended functionality from build pipeline.
+- Added feature switches that allows certain codepaths to be
+  dead-code-eliminated: `allowArraySelectors` and `isIeSupported`
+- All exported functions were originally part of an object named `ShadowCSS`.
+  We instead export them as plain functions allow them to be
+  dead-code-eliminated, and for their names to be mangled.
+  This also involves changing references to each function from `this.x()` to
+  just `x()`
+- Renamed `scopeSelector()` to `doScopeSelector()` since the original name
+  conflicts with argument `scopeSelector` after removing `this.`.
+- Removed a `strict` argument before `opt_transformer` in `doScopeSelector`
+  to be replaced with the constant value for `strictStyling`.
diff --git a/third_party/webcomponentsjs/ShadowCSS.js b/third_party/webcomponentsjs/ShadowCSS.js
index 13db6e36b718..b9f0f5d8a710 100644
--- a/third_party/webcomponentsjs/ShadowCSS.js
+++ b/third_party/webcomponentsjs/ShadowCSS.js
@@ -121,152 +121,157 @@
   in comments in lieu of the next selector when running under polyfill.
 */
 
-export const ShadowCSS = {
-  strictStyling: false,
-  // change a selector like 'div' to 'name div'
-  /** @this {ShadowCSS} */
-  scopeRules: function(cssRules, scopeSelector, opt_transformer) {
-    var cssText = '';
-    if (cssRules) {
-      Array.prototype.forEach.call(cssRules, function(rule) {
-        if (rule.selectorText && (rule.style && rule.style.cssText !== undefined)) {
-          cssText += this.scopeSelector(rule.selectorText, scopeSelector,
-            this.strictStyling, opt_transformer) + ' {\n\t';
-          cssText += this.propertiesFromRule(rule) + '\n}\n\n';
-        } else if (rule.type === CSSRule.MEDIA_RULE) {
-          cssText += '@media ' + rule.media.mediaText + ' {\n';
-          cssText += this.scopeRules(rule.cssRules, scopeSelector);
-          cssText += '\n}\n\n';
-        } else {
-          // KEYFRAMES_RULE in IE throws when we query cssText
-          // when it contains a -webkit- property.
-          // if this happens, we fallback to constructing the rule
-          // from the CSSRuleSet
-          // https://connect.microsoft.com/IE/feedbackdetail/view/955703/accessing-csstext-of-a-keyframe-rule-that-contains-a-webkit-property-via-cssom-generates-exception
-          try {
-            if (rule.cssText) {
-              cssText += rule.cssText + '\n\n';
-            }
-          } catch(x) {
-            if (rule.type === CSSRule.KEYFRAMES_RULE && rule.cssRules) {
-              cssText += this.ieSafeCssTextFromKeyFrameRule(rule);
-            }
+
+const strictStyling = false;
+const allowArraySelectors = false;
+const isIeSupported = false;
+
+// change a selector like 'div' to 'name div'
+export function scopeRules(cssRules, scopeSelector, opt_transformer) {
+  var cssText = '';
+  if (cssRules) {
+    Array.prototype.forEach.call(cssRules, function(rule) {
+      if (rule.selectorText && (rule.style && rule.style.cssText !== undefined)) {
+        cssText += doScopeSelector(
+          rule.selectorText, scopeSelector, opt_transformer) + ' {\n\t';
+        cssText += propertiesFromRule(rule) + '\n}\n\n';
+      } else if (rule.type === CSSRule.MEDIA_RULE) {
+        cssText += '@media ' + rule.media.mediaText + ' {\n';
+        cssText += scopeRules(rule.cssRules, scopeSelector);
+        cssText += '\n}\n\n';
+      } else {
+        // KEYFRAMES_RULE in IE throws when we query cssText
+        // when it contains a -webkit- property.
+        // if this happens, we fallback to constructing the rule
+        // from the CSSRuleSet
+        // https://connect.microsoft.com/IE/feedbackdetail/view/955703/accessing-csstext-of-a-keyframe-rule-that-contains-a-webkit-property-via-cssom-generates-exception
+        try {
+          if (rule.cssText) {
+            cssText += rule.cssText + '\n\n';
+          }
+        } catch(x) {
+          if (
+            isIeSupported &&
+            rule.type === CSSRule.KEYFRAMES_RULE &&
+            rule.cssRules
+          ) {
+            cssText += ieSafeCssTextFromKeyFrameRule(rule);
           }
         }
-      }, this);
-    }
-    return cssText;
-  },
-  /** @this {ShadowCSS} */
-  ieSafeCssTextFromKeyFrameRule: function(rule) {
-    var cssText = '@keyframes ' + rule.name + ' {';
-    Array.prototype.forEach.call(rule.cssRules, function(rule) {
-      cssText += ' ' + rule.keyText + ' {' + rule.style.cssText + '}';
-    });
-    cssText += ' }';
-    return cssText;
-  },
-  /** @this {ShadowCSS} */
-  scopeSelector: function(selector, scopeSelector, strict, opt_transformer) {
-    var r = [], parts = selector.split(',');
-    parts.forEach(function(p) {
-      p = p.trim();
-      if (opt_transformer) {
-        p = opt_transformer(p);
-      }
-      if (this.selectorNeedsScoping(p, scopeSelector)) {
-        p = (strict && !p.match(polyfillHostNoCombinator)) ?
-            this.applyStrictSelectorScope(p, scopeSelector) :
-            this.applySelectorScope(p, scopeSelector);
       }
-      r.push(p);
-    }, this);
-    return r.join(', ');
-  },
-  /** @this {ShadowCSS} */
-  selectorNeedsScoping: function(selector, scopeSelector) {
-    if (Array.isArray(scopeSelector)) {
-      return true;
-    }
-    var re = this.makeScopeMatcher(scopeSelector);
-    return !selector.match(re);
-  },
-  /** @this {ShadowCSS} */
-  makeScopeMatcher: function(scopeSelector) {
-    scopeSelector = scopeSelector.replace(/\[/g, '\\[').replace(/\]/g, '\\]');
-    return new RegExp('^(' + scopeSelector + ')' + selectorReSuffix, 'm');
-  },
-  /** @this {ShadowCSS} */
-  applySelectorScope: function(selector, selectorScope) {
-    return Array.isArray(selectorScope) ?
-        this.applySelectorScopeList(selector, selectorScope) :
-        this.applySimpleSelectorScope(selector, selectorScope);
-  },
-  // apply an array of selectors
-  /** @this {ShadowCSS} */
-  applySelectorScopeList: function(selector, scopeSelectorList) {
-    var r = [];
-    for (var i=0, s; (s=scopeSelectorList[i]); i++) {
-      r.push(this.applySimpleSelectorScope(selector, s));
-    }
-    return r.join(', ');
-  },
-  // scope via name and [is=name]
-  /** @this {ShadowCSS} */
-  applySimpleSelectorScope: function(selector, scopeSelector) {
-    if (selector.match(polyfillHostRe)) {
-      selector = selector.replace(polyfillHostNoCombinator, scopeSelector);
-      return selector.replace(polyfillHostRe, scopeSelector + ' ');
-    } else {
-      return scopeSelector + ' ' + selector;
-    }
-  },
-  // return a selector with [name] suffix on each simple selector
-  // e.g. .foo.bar > .zot becomes .foo[name].bar[name] > .zot[name]
-  /** @this {ShadowCSS} */
-  applyStrictSelectorScope: function(selector, scopeSelector) {
-    scopeSelector = scopeSelector.replace(/\[is=([^\]]*)\]/g, '$1');
-    var splits = [' ', '>', '+', '~'],
-      scoped = selector,
-      attrName = '[' + scopeSelector + ']';
-    splits.forEach(function(sep) {
-      var parts = scoped.split(sep);
-      scoped = parts.map(function(p) {
-        // remove :host since it should be unnecessary
-        var t = p.trim().replace(polyfillHostRe, '');
-        if (t && (splits.indexOf(t) < 0) && (t.indexOf(attrName) < 0)) {
-          p = t.replace(/([^:]*)(:*)(.*)/, '$1' + attrName + '$2$3');
-        }
-        return p;
-      }).join(sep);
     });
-    return scoped;
-  },
-  /** @this {ShadowCSS} */
-  propertiesFromRule: function(rule) {
-    var cssText = rule.style.cssText;
-    // TODO(sorvell): Safari cssom incorrectly removes quotes from the content
-    // property. (https://bugs.webkit.org/show_bug.cgi?id=118045)
-    // don't replace attr rules
-    if (rule.style.content && !rule.style.content.match(/['"]+|attr/)) {
-      cssText = cssText.replace(/content:[^;]*;/g, 'content: \'' +
-          rule.style.content + '\';');
+  }
+  return cssText;
+}
+
+export function ieSafeCssTextFromKeyFrameRule(rule) {
+  var cssText = '@keyframes ' + rule.name + ' {';
+  Array.prototype.forEach.call(rule.cssRules, function(rule) {
+    cssText += ' ' + rule.keyText + ' {' + rule.style.cssText + '}';
+  });
+  cssText += ' }';
+  return cssText;
+}
+
+export function doScopeSelector(selector, scopeSelector, opt_transformer) {
+  var r = [], parts = selector.split(',');
+  parts.forEach(function(p) {
+    p = p.trim();
+    if (opt_transformer) {
+      p = opt_transformer(p);
     }
-    // TODO(sorvell): we can workaround this issue here, but we need a list
-    // of troublesome properties to fix https://github.com/Polymer/platform/issues/53
-    //
-    // inherit rules can be omitted from cssText
-    // TODO(sorvell): remove when Blink bug is fixed:
-    // https://code.google.com/p/chromium/issues/detail?id=358273
-    var style = rule.style;
-    for (var i in style) {
-      if (style[i] === 'initial') {
-        cssText += i + ': initial; ';
+    if (selectorNeedsScoping(p, scopeSelector)) {
+      p = (strictStyling && !p.match(polyfillHostNoCombinator)) ?
+          applyStrictSelectorScope(p, scopeSelector) :
+          applySelectorScope(p, scopeSelector);
+    }
+    r.push(p);
+  });
+  return r.join(', ');
+}
+
+export function selectorNeedsScoping(selector, scopeSelector) {
+  if (allowArraySelectors && Array.isArray(scopeSelector)) {
+    return true;
+  }
+  var re = makeScopeMatcher(scopeSelector);
+  return !selector.match(re);
+}
+
+export function makeScopeMatcher(scopeSelector) {
+  scopeSelector = scopeSelector.replace(/\[/g, '\\[').replace(/\]/g, '\\]');
+  return new RegExp('^(' + scopeSelector + ')' + selectorReSuffix, 'm');
+}
+
+export function applySelectorScope(selector, selectorScope) {
+  return allowArraySelectors && Array.isArray(selectorScope) ?
+      applySelectorScopeList(selector, selectorScope) :
+      applySimpleSelectorScope(selector, selectorScope);
+}
+
+// apply an array of selectors
+export function applySelectorScopeList(selector, scopeSelectorList) {
+  var r = [];
+  for (var i=0, s; (s=scopeSelectorList[i]); i++) {
+    r.push(applySimpleSelectorScope(selector, s));
+  }
+  return r.join(', ');
+}
+
+// scope via name and [is=name]
+export function applySimpleSelectorScope(selector, scopeSelector) {
+  if (selector.match(polyfillHostRe)) {
+    selector = selector.replace(polyfillHostNoCombinator, scopeSelector);
+    return selector.replace(polyfillHostRe, scopeSelector + ' ');
+  } else {
+    return scopeSelector + ' ' + selector;
+  }
+}
+
+// return a selector with [name] suffix on each simple selector
+// e.g. .foo.bar > .zot becomes .foo[name].bar[name] > .zot[name]
+export function applyStrictSelectorScope(selector, scopeSelector) {
+  scopeSelector = scopeSelector.replace(/\[is=([^\]]*)\]/g, '$1');
+  var splits = [' ', '>', '+', '~'],
+    scoped = selector,
+    attrName = '[' + scopeSelector + ']';
+  splits.forEach(function(sep) {
+    var parts = scoped.split(sep);
+    scoped = parts.map(function(p) {
+      // remove :host since it should be unnecessary
+      var t = p.trim().replace(polyfillHostRe, '');
+      if (t && (splits.indexOf(t) < 0) && (t.indexOf(attrName) < 0)) {
+        p = t.replace(/([^:]*)(:*)(.*)/, '$1' + attrName + '$2$3');
       }
+      return p;
+    }).join(sep);
+  });
+  return scoped;
+}
+
+export function propertiesFromRule(rule) {
+  var cssText = rule.style.cssText;
+  // TODO(sorvell): Safari cssom incorrectly removes quotes from the content
+  // property. (https://bugs.webkit.org/show_bug.cgi?id=118045)
+  // don't replace attr rules
+  if (rule.style.content && !rule.style.content.match(/['"]+|attr/)) {
+    cssText = cssText.replace(/content:[^;]*;/g, 'content: \'' +
+        rule.style.content + '\';');
+  }
+  // TODO(sorvell): we can workaround this issue here, but we need a list
+  // of troublesome properties to fix https://github.com/Polymer/platform/issues/53
+  //
+  // inherit rules can be omitted from cssText
+  // TODO(sorvell): remove when Blink bug is fixed:
+  // https://code.google.com/p/chromium/issues/detail?id=358273
+  var style = rule.style;
+  for (var i in style) {
+    if (style[i] === 'initial') {
+      cssText += i + ': initial; ';
     }
-    return cssText;
   }
-};
+  return cssText;
+}
 
 var selectorRe = /([^{]*)({[\s\S]*?})/gim,
     cssCommentRe = /\/\*[^*]*\*+([^/*][^*]*\*+)*\//gim,
diff --git a/tools/experiments/experiments-config.js b/tools/experiments/experiments-config.js
index 334e5d883901..1833718b46a5 100644
--- a/tools/experiments/experiments-config.js
+++ b/tools/experiments/experiments-config.js
@@ -143,22 +143,11 @@ export const EXPERIMENTS = [
     name: 'Move ads placement into layoutCallback',
     spec: 'https://github.com/ampproject/amphtml/issues/27068',
   },
-  {
-    id: 'amp-cid-backup',
-    name: 'Backup AMP-generated CIDs to Storage.',
-    spec: 'https://github.com/ampproject/amphtml/issues/29484',
-    cleanupIssue: 'https://github.com/ampproject/amphtml/issues/29484',
-  },
   {
     id: 'dfp-render-on-idle-cwv-exp',
     name: 'To measure the CWV impact of ads idle rendering',
     spec: 'https://github.com/ampproject/amphtml/issues/31436',
   },
-  {
-    id: 'amp-story-desktop-one-panel',
-    name: 'New desktop one-panel UI with background blur for stories.',
-    spec: 'https://github.com/ampproject/amphtml/projects/128',
-  },
   {
     id: 'flexible-bitrate',
     name: 'Adaptive bitrate algorithm for videos on documents from the AMPProject CDN',
@@ -179,4 +168,39 @@ export const EXPERIMENTS = [
     name: 'Story ad CTA page outlink',
     spec: 'https://github.com/ampproject/amphtml/pull/35867',
   },
+  {
+    id: 'amp-story-first-page-max-bitrate',
+    name: 'Decrease max bitrate for videos on first page',
+    spec: 'https://github.com/ampproject/amphtml/pull/35389',
+  },
+  {
+    id: 'story-disable-animations-first-page',
+    name: 'Disable animations on the first page that can artificially delay LCP reports',
+    spec: 'https://github.com/ampproject/amphtml/pull/35356',
+  },
+  {
+    id: 'story-load-inactive-outside-viewport',
+    name: 'Load inactive pages outside the viewport to prevent them from counting towards LCP when invisible',
+    spec: 'https://github.com/ampproject/amphtml/pull/35323',
+  },
+  {
+    id: 'story-video-cache-apply-audio',
+    name: 'Apply the hasAudio flag from cached videos on stories',
+    spec: 'https://github.com/ampproject/amphtml/pull/38285',
+  },
+  {
+    id: 'amp-story-subscriptions',
+    name: 'Enable paywall experiences in web stories by turning on amp-story-subscriptions extension',
+    spec: 'https://github.com/ampproject/amphtml/pull/38179',
+  },
+  {
+    id: 'attribution-reporting',
+    name: 'Enable new privacy preserving attribution reporting APIs',
+    spec: 'https://github.com/ampproject/amphtml/pull/35347',
+  },
+  {
+    id: 'interaction-to-next-paint',
+    name: 'Enable new INP metrics reporting on amp-analytics',
+    spec: 'https://github.com/ampproject/amphtml/issues/38470',
+  },
 ];
diff --git a/tools/experiments/experiments.js b/tools/experiments/experiments.js
index c38f729d1c6c..fa05cf7dd8aa 100644
--- a/tools/experiments/experiments.js
+++ b/tools/experiments/experiments.js
@@ -1,16 +1,20 @@
 import '#polyfills';
 import '#service/timer-impl';
 import {Deferred} from '#core/data-structures/promise';
-import {EXPERIMENTS} from './experiments-config';
-import {SameSite, getCookie, setCookie} from '../../src/cookies';
-import {devAssert, initLogConstructor, setReportError} from '#utils/log';
-import {getMode} from '../../src/mode';
+import {onDocumentReady} from '#core/document/ready';
+
 import {isExperimentOn, toggleExperiment} from '#experiments';
+
 import {listenOnce} from '#utils/event-helper';
-import {onDocumentReady} from '#core/document/ready';
+import {devAssert, initLogConstructor, setReportError} from '#utils/log';
+
+import {EXPERIMENTS} from './experiments-config';
+
+import {SameSite_Enum, getCookie, setCookie} from '../../src/cookies';
+import {reportError} from '../../src/error-reporting';
+import {getMode} from '../../src/mode';
 import {parseUrlDeprecated} from '../../src/url';
 //TODO(@cramforce): For type. Replace with forward declaration.
-import {reportError} from '../../src/error-reporting';
 
 initLogConstructor();
 setReportError(reportError);
@@ -286,7 +290,7 @@ function setAmpOptInCookie_(cookieState) {
     // Make sure the cookie is available for the script loads coming from
     // other domains. Chrome's default of LAX would otherwise prevent it
     // from being sent.
-    sameSite: SameSite.NONE,
+    sameSite: SameSite_Enum.NONE,
     secure: true,
   };
   setCookie(
diff --git a/tsconfig.base.json b/tsconfig.base.json
new file mode 100644
index 000000000000..21a0f9d0c694
--- /dev/null
+++ b/tsconfig.base.json
@@ -0,0 +1,56 @@
+{
+  "compilerOptions": {
+    "allowJs": true,
+    "checkJs": true,
+    "noEmit": true,
+    "downlevelIteration": true,
+    "target": "esnext",
+    "moduleResolution": "node",
+    "strictNullChecks": true,
+    "noImplicitAny": true,
+    "isolatedModules": true,
+    "lib": ["dom", "esnext", "es6"],
+    "jsx": "preserve",
+
+    "paths": {
+      "#3p/*": ["./3p/*"],
+      "#ads/*": ["./ads/*"],
+      "#build/*": ["./build/*"],
+
+      "#bento/*": ["./src/bento/*"],
+      "#builtins/*": ["./src/builtins/*"],
+      "#compiler": ["./src/compiler"],
+      "#compiler/*": ["./src/compiler/*"],
+      "#core/*": ["./src/core/*"],
+      "#experiments": ["./src/experiments"],
+      "#experiments/*": ["./src/experiments/*"],
+      "#inabox/*": ["./src/inabox/*"],
+      "#polyfills": ["./src/polyfills"],
+      "#polyfills/*": ["./src/polyfills/*"],
+      "#preact": ["./src/preact"],
+      "#preact/*": ["./src/preact/*"],
+      "#purifier": ["./src/purifier"],
+      "#purifier/*": ["./src/purifier/*"],
+      "#service": ["./src/service"],
+      "#service/*": ["./src/service/*"],
+      "#utils": ["./src/utils"],
+      "#utils/*": ["./src/utils/*"],
+
+      "#test/*": ["./test/*"],
+      "#testing/*": ["./testing/*"],
+
+      "#third_party/*": ["./third_party/*"],
+
+      "preact/dom": ["./src/preact/preact-dom.ts"]
+    }
+  },
+
+  "exclude": [
+    "**/build/**",
+    "**/dist/**",
+    "**/dist.*/**",
+    "**/node_modules/**",
+    "**/third_party/**",
+    "**/*.extern.js"
+  ]
+}
diff --git a/tsconfig.json b/tsconfig.json
index a9d151cabc95..36d9d6a50331 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,38 +1,14 @@
 {
+  "extends": "./tsconfig.base.json",
+
   "compilerOptions": {
-    "allowJs": true,
     "baseUrl": ".",
     "outDir": "dist",
-    "noEmit": true,
-    "paths": {
-      "#3p/*": ["./3p/*"],
-      "#ads/*": ["./ads/*"],
-      "#build/*": ["./build/*"],
-
-      "#builtins/*": ["./src/builtins/*"],
-      "#compiler": ["./src/compiler"],
-      "#compiler/*": ["./src/compiler/*"],
-      "#core/*": ["./src/core/*"],
-      "#experiments": ["./src/experiments"],
-      "#experiments/*": ["./src/experiments/*"],
-      "#inabox/*": ["./src/inabox/*"],
-      "#polyfills": ["./src/polyfills"],
-      "#polyfills/*": ["./src/polyfills/*"],
-      "#preact": ["./src/preact"],
-      "#preact/*": ["./src/preact/*"],
-      "#purifier": ["./src/purifier"],
-      "#purifier/*": ["./src/purifier/*"],
-      "#service": ["./src/service"],
-      "#service/*": ["./src/service/*"],
-      "#utils": ["./src/utils"],
-      "#utils/*": ["./src/utils/*"],
-
-      "#test/*": ["./test/*"],
-      "#testing/*": ["./testing/*"],
-
-      "#third_party/*": ["./third_party/*"]
-    }
+    "checkJs": false,
+    "jsx": "react-jsx",
+    "jsxImportSource": "preact"
   },
+
   "include": ["src", "3p", "ads", "extensions", "test", "testing"],
-  "exclude": ["build", "dist", "dist.*", "node_modules"]
+  "exclude": ["**/*shame.d.ts"]
 }
diff --git a/validator/.bazelrc b/validator/.bazelrc
new file mode 100644
index 000000000000..463c9830d972
--- /dev/null
+++ b/validator/.bazelrc
@@ -0,0 +1,16 @@
+# Defaults to compile as fast as possible.
+build --compilation_mode fastbuild
+
+# Tested and compiles in llvm.
+build --repo_env=CC=clang
+
+# Contains c++17 features.
+build --cxxopt='-std=c++17'
+
+# Enabled operator new and operator delete for custom allocators.
+build --cxxopt='-fsized-deallocation'
+
+build --cxxopt='-Wno-error=return-type'
+build --cxxopt='-Wno-error=unused-but-set-variable'
+build --cxxopt='-Wno-error=unused-variable'
+build --cxxopt='-Wno-unknown-warning-option'
diff --git a/validator/.gitignore b/validator/.gitignore
index fcb834e0d5cd..20748c98c5cc 100644
--- a/validator/.gitignore
+++ b/validator/.gitignore
@@ -6,3 +6,5 @@ node_modules/
 *.pyc
 # These directories are generated by bazel
 bazel-*
+# These files are generated by copybara
+*.orig
diff --git a/validator/BUILD b/validator/BUILD
index 8beb39c6c39a..c30b3cc279c0 100644
--- a/validator/BUILD
+++ b/validator/BUILD
@@ -1,4 +1,5 @@
-load("@rules_cc//cc:defs.bzl", "cc_library", "cc_proto_library")
+load("@io_bazel_rules_closure//closure:defs.bzl", "closure_proto_library")
+load("@rules_cc//cc:defs.bzl", "cc_proto_library")
 load("@rules_proto//proto:defs.bzl", "proto_library")
 
 package(default_visibility = ["//visibility:public"])
@@ -10,9 +11,19 @@ proto_library(
     srcs = ["validator.proto"],
 )
 
+proto_library(
+    name = "validator_proto",
+    srcs = ["validator.proto"],
+)
+
 cc_proto_library(
     name = "validator_cc_proto",
-    deps = [":validator-proto"],
+    deps = [":validator_proto"],
+)
+
+closure_proto_library(
+    name = "validator_closure_proto",
+    deps = [":validator_proto"],
 )
 
 # <validator rules protoascii>
diff --git a/validator/README.md b/validator/README.md
index 11c8d3cb6503..d5c2ba0c61dd 100644
--- a/validator/README.md
+++ b/validator/README.md
@@ -3,27 +3,29 @@
 A validator for the
 [AMP HTML format](https://github.com/ampproject/amphtml/blob/main/README.md).
 
+## Validating a Page
+
 If you just want to validate a page, please see
 [our documentation over at amp.dev](https://amp.dev/documentation/guides-and-tutorials/learn/validation-workflow/validate_amp).
 
-## Chrome Extension
+### Chrome Extension
 
 Please see [js/chromeextension/README.md](https://github.com/ampproject/amphtml/blob/main/validator/js/chromeextension/README.md).
 
-## Visual Studio Code Extension
+### Visual Studio Code Extension
 
 An extension for Visual Studio Code
 [VSCode marketplace](https://marketplace.visualstudio.com/items?itemName=amphtml.amphtml-validator)
 
-## Command Line Tool and Node.js API
+### Command Line Tool and Node.js API
 
 Please see [js/nodejs/README.md](https://github.com/ampproject/amphtml/blob/main/validator/js/nodejs/README.md).
 
-## Web UI
+### Web UI
 
 Please see [js/webui/README.md](https://github.com/ampproject/amphtml/blob/main/validator/js/webui/README.md).
 
-## JSON
+### JSON
 
 The validator rules are exported in the JSON format and hosted on: `https://cdn.ampproject.org/v0/validator.json`
 
@@ -32,118 +34,48 @@ rely on them in a production environment.
 
 ## Building a Custom Validator
 
-This is only useful for development - e.g. when making changes to
-`js/engine/validator.js` or when authoring an AMP extension, and it's rough
-around the edges. Below are instructions for Linux Ubuntu 14.
-
-## Installation
-
-### Linux
-
-Install these packages using apt-get:
-
--   `npm`
--   `default-jdk`
--   `protobuf-compiler`
--   `python3`
--   `python3-pip`
-
-Then `pip3 install protobuf`.
-
-In addition, install Node.js v4.4.2. E.g.,
-[by downloading](https://nodejs.org/en/download/) or
-[by using a package manager](https://nodejs.org/en/download/package-manager/) or
-[by using NVM](https://github.com/creationix/nvm).
-
-### OSX
-
-Dependencies:
-
--   npm
--   [homebrew](https://brew.sh/)
--   python 3 (e.g. [these instructions](https://docs.python-guide.org/starting/install3/osx/))
-
-    -   protobuf
+This is only useful development - e.g. when making changes to
+`cpp/engine/validator.h`.
 
-        ```sh
-        pip3 install --user protobuf
-        ```
+### Development Prerequisites
 
-    -   openjdk-7-jre
-
-        Install openjdk, then symlink the system Java wrappers to find it:
-
-        ```sh
-        brew install openjdk
-        sudo ln -sfn /usr/local/opt/openjdk/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk.jdk
-        ```
-
-### Usage
-
-Then, run `python build.py`. This creates `dist/validator_minified.js`, which is
-equivalent to the validator deployed at cdn.ampproject.org. You may now
-use the `--validator_js` command line flag to
-[amphtml-validator](https://amp.dev/documentation/guides-and-tutorials/learn/validation-workflow/validate_amp#command-line-tool) to use this validator.
-
-For use for testing with extensions, you can simply run `python build.py`
-to run all of the validator tests in the amphtml repo.
-To create/update `validator-*.out` files that are used in the test,
-run `python build.py --update_tests`.
-
-```sh
-$ amphtml-validator --validator_js dist/validator_minified.js testdata/feature_tests/several_errors.html
-testdata/feature_tests/several_errors.html:23:2 The attribute 'charset' may not appear in tag 'meta name= and content='.
-testdata/feature_tests/several_errors.html:26:2 The tag 'script' is disallowed except in specific forms.
-testdata/feature_tests/several_errors.html:32:2 The mandatory attribute 'height' is missing in tag 'amp-img'. (see https://amp.dev/documentation/components/amp-img)
-testdata/feature_tests/several_errors.html:34:2 The attribute 'width' in tag 'amp-ad' is set to the invalid value '100%'. (see https://amp.dev/documentation/components/amp-ad)
-...
-```
-
-### Building on MacOS
-
-_Note: This is for building the validator from source. If you are simply running validator tests for extensions, see the Installation steps instead._
+1. Start an interactive docker container. Note that you will be the `root` user inside the docker container.
+    ```bash
+    docker run -it -u root cimg/openjdk:17.0-node bash
+    ```
+1. Run following commands in the container.
+    ```bash
+    apt update
+    apt install -y python sudo
+    git clone https://github.com/ampproject/amphtml.git
+    cd amphtml
+    npm install
+    npm run postinstall
+    .circleci/install_validator_dependencies.sh
+    ```
 
--   Download protobuf with `brew install protobuf` via [homebrew](https://brew.sh/).
--   Use pip to `pip install google` and `pip install protobuf`. If you don't have pip, you can get it either via `brew install python` or [get-pip.py](https://bootstrap.pypa.io/get-pip.py).
--   If your [npm](https://www.npmjs.com/) is out of date, run `npm i -g npm` to update it.
+### Building Validator Engine
 
-To verify that you have the necessary prerequisites, run and verify:
+In `amphtml/validator` folder, run
 
-```sh
-$ protoc --version
-libprotoc 3.5.1
+```bash
+bazel build cpp/engine/wasm:validator_js_bin
 ```
 
-and
-
-```sh
-$ python
->>> import google.protobuf
->>>
-```
+This creates `bazel-bin/cpp/engine/wasm/validator_js_bin.js`, which is
+equivalent to the validator deployed at `cdn.ampproject.org`.
 
-Now `cd amphtml/validator` and run `python build.py`.
+You may now use the `--validator_js` command line flag to
+[amphtml-validator](https://amp.dev/documentation/guides-and-tutorials/learn/validation-workflow/validate_amp#command-line-tool) to use this validator.
 
-### Locally Reproduce Validator Tests of Circle CI workflow
+### Reproducing Validator Tests of Circle CI workflow
 
-In the case the test passes in your local machine but fails in Circle CI,
-you can use docker to reproduce the test errors.
+1. In `amphtml` folder, run
 
-1. Start an interactive docker container
-    ```bash
-    docker run -it node:lts-buster bash
-    ```
-1. Run following commands in the container. Note that you are already the `root` user inside the docker container.
     ```bash
-    apt update
-    apt install -y sudo
-    git clone https://github.com/ampproject/amphtml.git
-    cd amphtml
-    npm install
-    npm run postinstall
-    .circleci/install_validator_dependencies.sh
     amp validator-cpp && echo SUCCESS || echo FAIL
     ```
+
 1. To see more information of the tests
     ```bash
     sed -i 's/--test_output=errors//' build-system/tasks/validator.js
diff --git a/validator/WORKSPACE b/validator/WORKSPACE
index 3728db3c07e2..0510b05e5e72 100644
--- a/validator/WORKSPACE
+++ b/validator/WORKSPACE
@@ -2,21 +2,49 @@ workspace(name = "validator")
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
+http_archive(
+    name = "com_google_absl",
+    sha256 = "050071396c0483035c9545daaaf953a47449b971978631db040cd31bcb2d3dde",
+    strip_prefix = "abseil-cpp-fc44fa053cc91193d2bb60fb9356bcecb301242e",
+    urls = ["https://github.com/abseil/abseil-cpp/archive/fc44fa053cc91193d2bb60fb9356bcecb301242e.zip"],
+)
+
+http_archive(
+    name = "com_google_googletest",
+    sha256 = "c83f69fa8cb7a503d3ae9f736cf679b0846772b1ae955c63133520b749491a7c",
+    strip_prefix = "googletest-8a6feabf04bec8fb125e0df0ad1195c42350725f",
+    urls = ["https://github.com/google/googletest/archive/8a6feabf04bec8fb125e0df0ad1195c42350725f.zip"],  # 2019-01-07
+)
+
 http_archive(
     name = "com_google_protobuf",
-    sha256 = "40825ef029f05038008b6217e34d00c09e506f99cb91fb97a2f2fd20143fb849",
-    strip_prefix = "protobuf-master",
-    urls = ["https://github.com/protocolbuffers/protobuf/archive/master.zip"],
+    sha256 = "750428a8c7f1a75a8e6027e30b46a1c2f0475205f44563589736e0f279b938c0",
+    strip_prefix = "protobuf-f0dc78d7e6e331b8c6bb2d5283e06aa26883ca7c",
+    urls = ["https://github.com/protocolbuffers/protobuf/archive/f0dc78d7e6e331b8c6bb2d5283e06aa26883ca7c.zip"],
 )
 load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 protobuf_deps()
 
+http_archive(
+    name = "com_github_gflags_gflags",
+    sha256 = "017e0a91531bfc45be9eaf07e4d8fed33c488b90b58509dbd2e33a33b2648ae6",
+    strip_prefix = "gflags-a738fdf9338412f83ab3f26f31ac11ed3f3ec4bd",
+    urls = ["https://github.com/gflags/gflags/archive/a738fdf9338412f83ab3f26f31ac11ed3f3ec4bd.zip"],
+)
+
+http_archive(
+    name = "com_googlesource_code_re2",
+    sha256 = "e9e9cd5902c711131825f7dd45dfdb063555171d8d26300b336aace5f97215ef",
+    strip_prefix = "re2-87d09ef4f0307e53f1d3796843f4b90d41cfccaa",
+    urls = ["https://github.com/google/re2/archive/87d09ef4f0307e53f1d3796843f4b90d41cfccaa.zip"],
+)
+
 # rules_cc defines rules for generating C++ code from Protocol Buffers.
 http_archive(
     name = "rules_cc",
-    sha256 = "7e7b3ffb2cdda7488c53ac266b23fe7fbc3cc7d072f164cdf88ee2e20ebb076e",
-    strip_prefix = "rules_cc-f84656686987ce254481cc33efa3b6645d4254c3",
-    urls = ["https://github.com/bazelbuild/rules_cc/archive/f84656686987ce254481cc33efa3b6645d4254c3.zip"],
+    sha256 = "97a7c3f2f601a0d0cc9d26a4173d65e4b7028776a66e2e4fc736e49a5300a483",
+    strip_prefix = "rules_cc-b039a551a7b41b70e426e4a3cd60346c89db9b6c",
+    urls = ["https://github.com/bazelbuild/rules_cc/archive/b039a551a7b41b70e426e4a3cd60346c89db9b6c.zip"],
 )
 load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies")
 rules_cc_dependencies()
@@ -24,17 +52,51 @@ rules_cc_dependencies()
 # rules_proto defines abstract rules for building Protocol Buffers.
 http_archive(
     name = "rules_proto",
-    sha256 = "83c8798f5a4fe1f6a13b5b6ae4267695b71eed7af6fbf2b6ec73a64cf01239ab",
-    strip_prefix = "rules_proto-b22f78685bf62775b80738e766081b9e4366cdf0",
+    sha256 = "36e4de702036d31b649f96519676509c4027dc10cc3c97f0335c199b305d45b7",
+    strip_prefix = "rules_proto-8aa1e67c09bc8df20df33886909d44129cfb7e63",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/b22f78685bf62775b80738e766081b9e4366cdf0.tar.gz",
-        "https://github.com/bazelbuild/rules_proto/archive/b22f78685bf62775b80738e766081b9e4366cdf0.tar.gz",
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/8aa1e67c09bc8df20df33886909d44129cfb7e63.tar.gz",
+        "https://github.com/bazelbuild/rules_proto/archive/8aa1e67c09bc8df20df33886909d44129cfb7e63.tar.gz",
     ],
 )
 load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
 rules_proto_dependencies()
 rules_proto_toolchains()
 
+http_archive(
+    name = "emsdk",
+    sha256 = "836e9dc2ea0df6e9369f58fcb884df0447304a089cdbef2cd06a28cf2d06b53d",
+    strip_prefix = "emsdk-fc645b7626ebf86530dbd82fbece74d457e7ae07/bazel",
+    url = "https://github.com/emscripten-core/emsdk/archive/fc645b7626ebf86530dbd82fbece74d457e7ae07.tar.gz",
+)
+
+load("@emsdk//:deps.bzl", emsdk_deps = "deps")
+emsdk_deps()
+
+load("@emsdk//:emscripten_deps.bzl", emsdk_emscripten_deps = "emscripten_deps")
+emsdk_emscripten_deps(emscripten_version = "2.0.31")
+
+http_archive(
+    name = "com_google_javascript_closure_library",
+    sha256 = "d0935e88b306fcaa37ac99031ce8a19b18e27396603eeb8f984233203768a406",
+    strip_prefix = "closure-library-e896a74c48695b2bfe0f586f13870c0bc50ce99e",
+    urls = ["https://github.com/google/closure-library/archive/e896a74c48695b2bfe0f586f13870c0bc50ce99e.tar.gz"],
+)
+
+http_archive(
+    name = "io_bazel_rules_closure",
+    sha256 = "9498e57368efb82b985db1ed426a767cbf1ba0398fd7aed632fc3908654e1b1e",
+    strip_prefix = "rules_closure-0.12.0",
+    urls = [
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_closure/archive/0.12.0.tar.gz",
+        "https://github.com/bazelbuild/rules_closure/archive/0.12.0.tar.gz",
+    ],
+)
+
+load("@io_bazel_rules_closure//closure:repositories.bzl", "rules_closure_dependencies", "rules_closure_toolchains")
+rules_closure_dependencies()
+rules_closure_toolchains()
+
 local_repository(
     name = "amphtml-extensions",
     path = "../extensions",
diff --git a/validator/build.py b/validator/build.py
index 4cc107096bf4..007a26d56da0 100755
--- a/validator/build.py
+++ b/validator/build.py
@@ -273,7 +273,7 @@ def CompileWithClosure(js_files, definitions, entry_points, output_file):
 
   cmd = [
       'java', '-jar',
-      '../node_modules/@ampproject/google-closure-compiler-java/compiler.jar',
+      './node_modules/google-closure-compiler-java/compiler.jar',
       '--language_out=ES5_STRICT', '--dependency_mode=PRUNE',
       '--js_output_file=%s' % output_file
   ]
diff --git a/validator/cpp/engine/BUILD b/validator/cpp/engine/BUILD
index a2fe804911a6..c60425d0d25c 100644
--- a/validator/cpp/engine/BUILD
+++ b/validator/cpp/engine/BUILD
@@ -45,7 +45,7 @@ cc_library(
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/strings:str_format",
         "@com_googlesource_code_re2//:re2",
-        "@validator//:validator_cc_proto",
+        "//:validator_cc_proto",
     ],
 )
 
@@ -68,7 +68,7 @@ cc_library(
     deps = [
         "@com_google_absl//absl/strings",
         "@com_googlesource_code_re2//:re2",
-        "@htmlparser//:strings",
+        "//cpp/htmlparser:strings",
     ],
 )
 
@@ -91,7 +91,7 @@ cc_library(
         "@com_google_absl//absl/base",
         "@com_google_absl//absl/strings",
         "@com_googlesource_code_re2//:re2",
-        "@validator//:validator_cc_proto",
+        "//:validator_cc_proto",
     ],
 )
 
@@ -114,7 +114,8 @@ cc_library(
         ":utf8-util",
         "@com_google_absl//absl/base",
         "@com_google_absl//absl/strings",
-        "@htmlparser//:strings",
+        "//cpp/htmlparser:logging",
+        "//cpp/htmlparser:strings",
     ],
 )
 
@@ -137,7 +138,8 @@ cc_library(
         "@com_google_absl//absl/base",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/strings:cord",
-        "@htmlparser//:strings",
+        "//cpp/htmlparser:logging",
+        "//cpp/htmlparser:strings",
     ],
 )
 
@@ -148,7 +150,7 @@ cc_test(
     deps = [
         ":utf8-util",
         "@com_google_googletest//:gtest_main",
-        "@htmlparser//:strings",
+        "//cpp/htmlparser:strings",
     ],
 )
 
@@ -161,7 +163,7 @@ cc_library(
         "@com_google_absl//absl/base",
         "@com_google_absl//absl/memory",
         "@com_google_absl//absl/strings",
-        "@htmlparser//css:parse-css",
+        "//cpp/htmlparser/css:parse-css",
     ],
 )
 
@@ -172,8 +174,8 @@ cc_test(
         ":keyframes-parse-css",
         "@com_google_absl//absl/strings",
         "@com_google_googletest//:gtest_main",
-        "@htmlparser//:strings",
-        "@htmlparser//css:parse-css",
+        "//cpp/htmlparser:strings",
+        "//cpp/htmlparser/css:parse-css",
     ],
 )
 
@@ -184,7 +186,7 @@ cc_library(
     copts = ["-std=c++17"],
     deps = [
         "@com_google_absl//absl/strings",
-        "@validator//:validator_cc_proto",
+        "//:validator_cc_proto",
     ],
 )
 
@@ -194,7 +196,7 @@ cc_test(
     deps = [
         ":type-identifier",
         "@com_google_googletest//:gtest_main",
-        "@validator//:validator_cc_proto",
+        "//:validator_cc_proto",
     ],
 )
 
@@ -205,10 +207,10 @@ cc_library(
     copts = ["-std=c++17"],
     deps = [
         ":validator_pb",
-        "@com_github_glog//:glog",
         "@com_googlesource_code_re2//:re2",
-        "@htmlparser//:strings",
-        "@validator//:validator_cc_proto",
+        "//cpp/htmlparser:logging",
+        "//cpp/htmlparser:strings",
+        "//:validator_cc_proto",
     ],
 )
 
@@ -228,15 +230,16 @@ cc_binary(
     copts = ["-std=c++17"],
     deps = [
         "@com_google_protobuf//:protobuf",
-        "@htmlparser//:defer",
-        "@htmlparser//:fileutil",
-        "@validator//:validator_cc_proto",
+        "//cpp/htmlparser:defer",
+        "//cpp/htmlparser:fileutil",
+        "//cpp/htmlparser:logging",
+        "//:validator_cc_proto",
     ],
 )
 
 genrule(
     name = "validator-pb",
-    srcs = ["@validator//:validator.protoascii"],
+    srcs = ["//:validator.protoascii"],
     outs = ["validator.pb"],
     cmd = "$(location :validator-convert) " +
           "$(SRCS) $@",
@@ -271,18 +274,18 @@ cc_library(
         "@com_google_absl//absl/strings:cord",
         "@com_google_absl//absl/synchronization",
         "@com_googlesource_code_re2//:re2",
-        "@htmlparser//:atom",
-        "@htmlparser//:atomutil",
-        "@htmlparser//:defer",
-        "@htmlparser//:node",
-        "@htmlparser//:parser",
-        "@htmlparser//:strings",
-        "@htmlparser//:url",
-        "@htmlparser//css:amp4ads-parse-css",
-        "@htmlparser//css:parse-css",
-        "@htmlparser//css:parse_css_cc_proto",
-        "@htmlparser//json:parser",
-        "@validator//:validator_cc_proto",
+        "//cpp/htmlparser:atom",
+        "//cpp/htmlparser:atomutil",
+        "//cpp/htmlparser:defer",
+        "//cpp/htmlparser:node",
+        "//cpp/htmlparser:parser",
+        "//cpp/htmlparser:strings",
+        "//cpp/htmlparser:url",
+        "//cpp/htmlparser/css:amp4ads-parse-css",
+        "//cpp/htmlparser/css:parse-css",
+        "//cpp/htmlparser/css:parse_css_cc_proto",
+        "//cpp/htmlparser/validators:json",
+        "//:validator_cc_proto",
     ],
 )
 
@@ -294,7 +297,8 @@ cc_library(
     copts = ["-std=c++17"],
     deps = [
         ":validator-internal",
-        "@validator//:validator_cc_proto",
+        "//cpp/htmlparser/css:parse-css",
+        "//:validator_cc_proto",
     ],
     alwayslink = 1,
 )
@@ -310,14 +314,24 @@ cc_library(
     copts = ["-std=c++17"],
     data = [
         "@amphtml-extensions//:testdata_files",
-        "@validator//:testdata_files",
+        "//:testdata_files",
     ],
     deps = [
         ":error-formatter",
         "@com_google_absl//absl/strings",
-        "@htmlparser//:fileutil",
-        "@htmlparser//:strings",
-        "@validator//:validator_cc_proto",
+        "//cpp/htmlparser:fileutil",
+        "//cpp/htmlparser:strings",
+        "//:validator_cc_proto",
+    ],
+)
+
+cc_binary(
+    name = "update-tests",
+    srcs = ["update-tests.cc"],
+    copts = ["-std=c++17"],
+    deps = [
+        ":testing-utils",
+        ":validator",
     ],
 )
 
@@ -329,10 +343,12 @@ cc_test(
         ":testing-utils",
         ":validator",
         ":validator_pb",
+        "@com_google_absl//absl/container:flat_hash_map",
+        "@com_google_absl//absl/container:flat_hash_set",
         "@com_google_absl//absl/strings",
         "@com_google_googletest//:gtest_main",
-        "@htmlparser//css:parse_css_cc_proto",
-        "@validator//:validator_cc_proto",
+        "//cpp/htmlparser/css:parse_css_cc_proto",
+        "//:validator_cc_proto",
     ],
 )
 
diff --git a/validator/cpp/engine/WORKSPACE b/validator/cpp/engine/WORKSPACE
deleted file mode 100644
index 30298ec74268..000000000000
--- a/validator/cpp/engine/WORKSPACE
+++ /dev/null
@@ -1,67 +0,0 @@
-workspace(name = "ampvalidator")
-
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
-http_archive(
-    name = "com_google_absl",
-    strip_prefix = "abseil-cpp-master",
-    urls = ["https://github.com/abseil/abseil-cpp/archive/master.zip"],
-)
-
-http_archive(
-    name = "com_google_googletest",
-    sha256 = "002d540f947e5981f54ddaab476d87b113d2a14822f21a34dca30f24c9492a24",
-    strip_prefix = "googletest-16f637fbf4ffc3f7a01fa4eceb7906634565242f",
-    urls = ["https://github.com/google/googletest/archive/16f637fbf4ffc3f7a01fa4eceb7906634565242f.zip"],  # 2019-01-07
-)
-
-http_archive(
-    name = "com_googlesource_code_re2",
-    sha256 = "57b9d6e4742e3feeb3a74c3b00e440edaa8d4e2a77e4a68eb7f7f005eb217ec7",
-    strip_prefix = "re2-9262284a7edc1b83e7172f4ec2d7967d695e7420",
-    urls = [
-        "https://github.com/google/re2/archive/9262284a7edc1b83e7172f4ec2d7967d695e7420.tar.gz",
-    ],
-)
-
-http_archive(
-    name = "com_github_gflags_gflags",
-    strip_prefix = "gflags-master",
-    urls = ["https://github.com/gflags/gflags/archive/master.zip"],
-)
-
-http_archive(
-    name = "com_github_re2",
-    strip_prefix = "re2-main",
-    urls = ["https://github.com/google/re2/archive/main.zip"],
-)
-
-http_archive(
-    name = "com_github_glog",
-    strip_prefix = "glog-master",
-    urls = ["https://github.com/google/glog/archive/master.zip"],
-)
-
-http_archive(
-    name = "com_google_protobuf",
-    strip_prefix = "protobuf-master",
-    urls = ["https://github.com/protocolbuffers/protobuf/archive/master.zip"],
-)
-
-load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
-protobuf_deps()
-
-local_repository(
-    name = "amphtml-extensions",
-    path = "../../../extensions/",
-)
-
-local_repository(
-    name = "validator",
-    path = "../../",
-)
-
-local_repository(
-    name = "htmlparser",
-    path = "../htmlparser/",
-)
diff --git a/validator/cpp/engine/embed_data.bzl b/validator/cpp/engine/embed_data.bzl
index b4578c6a9f9f..ba0f40fd9867 100644
--- a/validator/cpp/engine/embed_data.bzl
+++ b/validator/cpp/engine/embed_data.bzl
@@ -39,10 +39,10 @@ embed_data = rule(
         ),
         "header_generator": attr.label(
             executable = True,
-            cfg = "host",
+            cfg = "exec",
             allow_files = True,
             default = Label(
-                "//scripts:filecontents_to_cpp_header",
+                "//cpp/engine/scripts:filecontents_to_cpp_header",
             ),
         ),
     },
diff --git a/validator/cpp/engine/error-formatter.cc b/validator/cpp/engine/error-formatter.cc
index d3767c7125c0..810a3a080b5b 100644
--- a/validator/cpp/engine/error-formatter.cc
+++ b/validator/cpp/engine/error-formatter.cc
@@ -1,11 +1,11 @@
 // AMP Validator client library to validate if given html is a valid AMP
 // document.
 //
-#include "error-formatter.h"
+#include "cpp/engine/error-formatter.h"
 
-#include "glog/logging.h"
-#include "validator_pb.h"
-#include "strings.h"
+#include "cpp/engine/validator_pb.h"
+#include "cpp/htmlparser/logging.h"
+#include "cpp/htmlparser/strings.h"
 #include "validator.pb.h"
 #include "re2/re2.h"  // NOLINT(build/deprecated)
 
diff --git a/validator/cpp/engine/error-formatter.h b/validator/cpp/engine/error-formatter.h
index 660ebc410569..afb9abddcf55 100644
--- a/validator/cpp/engine/error-formatter.h
+++ b/validator/cpp/engine/error-formatter.h
@@ -8,8 +8,8 @@
 // then call the ErrorFormatter::ApplyFormat function.
 //
 // A Java port is available: java/com/google/amp/validator/ErrorFormatter.java.
-#ifndef AMPVALIDATOR__ERROR_FORMATTER_H_
-#define AMPVALIDATOR__ERROR_FORMATTER_H_
+#ifndef CPP_ENGINE_ERROR_FORMATTER_H_
+#define CPP_ENGINE_ERROR_FORMATTER_H_
 
 #include <string>
 
@@ -39,4 +39,4 @@ class ErrorFormatter {
 };
 }  // namespace amp::validator
 
-#endif  // AMPVALIDATOR__ERROR_FORMATTER_H_
+#endif  // CPP_ENGINE_ERROR_FORMATTER_H_
diff --git a/validator/cpp/engine/error-formatter_test.cc b/validator/cpp/engine/error-formatter_test.cc
index d4fdba36a888..3064db279adc 100644
--- a/validator/cpp/engine/error-formatter_test.cc
+++ b/validator/cpp/engine/error-formatter_test.cc
@@ -1,7 +1,7 @@
 // AMP Validator client library to validate if given html is a valid AMP
 // document.
 
-#include "error-formatter.h"
+#include "cpp/engine/error-formatter.h"
 
 #include "gtest/gtest.h"
 
diff --git a/validator/cpp/engine/keyframes-parse-css.cc b/validator/cpp/engine/keyframes-parse-css.cc
index 34f4e854ec02..3320bcfd2722 100644
--- a/validator/cpp/engine/keyframes-parse-css.cc
+++ b/validator/cpp/engine/keyframes-parse-css.cc
@@ -1,6 +1,5 @@
-#include "keyframes-parse-css.h"
+#include "cpp/engine/keyframes-parse-css.h"
 
-#include "glog/logging.h"
 #include "absl/memory/memory.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
diff --git a/validator/cpp/engine/keyframes-parse-css.h b/validator/cpp/engine/keyframes-parse-css.h
index a6a5bb57a6ec..cb4253f7c750 100644
--- a/validator/cpp/engine/keyframes-parse-css.h
+++ b/validator/cpp/engine/keyframes-parse-css.h
@@ -1,10 +1,10 @@
-#ifndef AMPVALIDATOR__KEYFRAMES_PARSE_CSS_H_
-#define AMPVALIDATOR__KEYFRAMES_PARSE_CSS_H_
+#ifndef CPP_ENGINE_KEYFRAMES_PARSE_CSS_H_
+#define CPP_ENGINE_KEYFRAMES_PARSE_CSS_H_
 
 #include <string>
 #include <vector>
 
-#include "css/parse-css.h"
+#include "cpp/htmlparser/css/parse-css.h"
 //
 // This is *not* meant to be a public API.
 //
@@ -23,4 +23,4 @@ void ValidateKeyframesCss(
     std::vector<std::unique_ptr<htmlparser::css::ErrorToken>>* errors);
 }  // namespace amp::validator::parse_css
 
-#endif  // AMPVALIDATOR__KEYFRAMES_PARSE_CSS_H_
+#endif  // CPP_ENGINE_KEYFRAMES_PARSE_CSS_H_
diff --git a/validator/cpp/engine/keyframes-parse-css_test.cc b/validator/cpp/engine/keyframes-parse-css_test.cc
index e9a3236c986b..e2de006360a8 100644
--- a/validator/cpp/engine/keyframes-parse-css_test.cc
+++ b/validator/cpp/engine/keyframes-parse-css_test.cc
@@ -1,11 +1,11 @@
-#include "keyframes-parse-css.h"
+#include "cpp/engine/keyframes-parse-css.h"
 
 #include <gmock/gmock.h>
 #include "gtest/gtest.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-#include "css/parse-css.h"
-#include "strings.h"
+#include "cpp/htmlparser/css/parse-css.h"
+#include "cpp/htmlparser/strings.h"
 
 using htmlparser::css::BlockType;
 using htmlparser::css::CssParsingConfig;
@@ -97,176 +97,8 @@ TEST(KeyframesParseCssTest, Good_Stylesheet) {
       Tokenize(&css, /*line=*/1, /*col=*/0, &errors);
   unique_ptr<Stylesheet> stylesheet =
       ParseAStylesheet(&tokens, KeyframesCssParsingConfig(), &errors);
-  EXPECT_EQ(stylesheet->ToJson().ToString(), R""({
-  "tokentype": "STYLESHEET",
-  "line": 1,
-  "col": 0,
-  "rules":  [
-    {
-      "tokentype": "AT_RULE",
-      "line": 1,
-      "col": 0,
-      "name": "keyframes",
-      "prelude":      [
-        {
-          "tokentype": "WHITESPACE",
-          "line": 1,
-          "col": 10
-        },
-        {
-          "tokentype": "IDENT",
-          "line": 1,
-          "col": 11,
-          "value": "anim1"
-        },
-        {
-          "tokentype": "WHITESPACE",
-          "line": 1,
-          "col": 16
-        },
-        {
-          "tokentype": "EOF_TOKEN",
-          "line": 1,
-          "col": 17
-        }
-      ],
-      "rules":      [
-        {
-          "tokentype": "QUALIFIED_RULE",
-          "line": 1,
-          "col": 18,
-          "prelude":          [
-            {
-              "tokentype": "PERCENTAGE",
-              "line": 1,
-              "col": 18,
-              "repr": "0",
-              "value": 0.000000
-            },
-            {
-              "tokentype": "WHITESPACE",
-              "line": 1,
-              "col": 20
-            },
-            {
-              "tokentype": "EOF_TOKEN",
-              "line": 1,
-              "col": 21
-            }
-          ],
-          "declarations":          [
-            {
-              "tokentype": "DECLARATION",
-              "line": 1,
-              "col": 22,
-              "name": "transform",
-              "important": false,
-              "value":              [
-                {
-                  "tokentype": "WHITESPACE",
-                  "line": 1,
-                  "col": 32
-                },
-                {
-                  "tokentype": "FUNCTION_TOKEN",
-                  "line": 1,
-                  "col": 33,
-                  "value": "translateX"
-                },
-                {
-                  "tokentype": "PERCENTAGE",
-                  "line": 1,
-                  "col": 44,
-                  "repr": "-100",
-                  "value": -100.000000
-                },
-                {
-                  "tokentype": "CLOSE_PAREN",
-                  "line": 1,
-                  "col": 49
-                },
-                {
-                  "tokentype": "EOF_TOKEN",
-                  "line": 1,
-                  "col": 50
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "tokentype": "QUALIFIED_RULE",
-          "line": 1,
-          "col": 52,
-          "prelude":          [
-            {
-              "tokentype": "PERCENTAGE",
-              "line": 1,
-              "col": 52,
-              "repr": "100",
-              "value": 100.000000
-            },
-            {
-              "tokentype": "WHITESPACE",
-              "line": 1,
-              "col": 56
-            },
-            {
-              "tokentype": "EOF_TOKEN",
-              "line": 1,
-              "col": 57
-            }
-          ],
-          "declarations":          [
-            {
-              "tokentype": "DECLARATION",
-              "line": 1,
-              "col": 58,
-              "name": "transform",
-              "important": false,
-              "value":              [
-                {
-                  "tokentype": "WHITESPACE",
-                  "line": 1,
-                  "col": 68
-                },
-                {
-                  "tokentype": "FUNCTION_TOKEN",
-                  "line": 1,
-                  "col": 69,
-                  "value": "translateX"
-                },
-                {
-                  "tokentype": "PERCENTAGE",
-                  "line": 1,
-                  "col": 80,
-                  "repr": "100",
-                  "value": 100.000000
-                },
-                {
-                  "tokentype": "CLOSE_PAREN",
-                  "line": 1,
-                  "col": 84
-                },
-                {
-                  "tokentype": "EOF_TOKEN",
-                  "line": 1,
-                  "col": 85
-                }
-              ]
-            }
-          ]
-        }
-      ],
-      "declarations":      []
-    }
-  ],
-  "eof":  {
-    "tokentype": "EOF_TOKEN",
-    "line": 1,
-    "col": 88
-  }
-})"");
+  EXPECT_EQ(stylesheet->ToJson().ToString(),
+            R"({"tokentype":"STYLESHEET","line":1,"col":0,"rules":[{"tokentype":"AT_RULE","line":1,"col":0,"name":"keyframes","prelude":[{"tokentype":"WHITESPACE","line":1,"col":10},{"tokentype":"IDENT","line":1,"col":11,"value":"anim1"},{"tokentype":"WHITESPACE","line":1,"col":16},{"tokentype":"EOF_TOKEN","line":1,"col":17}],"rules":[{"tokentype":"QUALIFIED_RULE","line":1,"col":18,"prelude":[{"tokentype":"PERCENTAGE","line":1,"col":18,"repr":"0","value":0.000000},{"tokentype":"WHITESPACE","line":1,"col":20},{"tokentype":"EOF_TOKEN","line":1,"col":21}],"declarations":[{"tokentype":"DECLARATION","line":1,"col":22,"name":"transform","important":false,"value":[{"tokentype":"WHITESPACE","line":1,"col":32},{"tokentype":"FUNCTION_TOKEN","line":1,"col":33,"value":"translateX"},{"tokentype":"PERCENTAGE","line":1,"col":44,"repr":"-100","value":-100.000000},{"tokentype":"CLOSE_PAREN","line":1,"col":49},{"tokentype":"EOF_TOKEN","line":1,"col":50}]}]},{"tokentype":"QUALIFIED_RULE","line":1,"col":52,"prelude":[{"tokentype":"PERCENTAGE","line":1,"col":52,"repr":"100","value":100.000000},{"tokentype":"WHITESPACE","line":1,"col":56},{"tokentype":"EOF_TOKEN","line":1,"col":57}],"declarations":[{"tokentype":"DECLARATION","line":1,"col":58,"name":"transform","important":false,"value":[{"tokentype":"WHITESPACE","line":1,"col":68},{"tokentype":"FUNCTION_TOKEN","line":1,"col":69,"value":"translateX"},{"tokentype":"PERCENTAGE","line":1,"col":80,"repr":"100","value":100.000000},{"tokentype":"CLOSE_PAREN","line":1,"col":84},{"tokentype":"EOF_TOKEN","line":1,"col":85}]}]}],"declarations":[]}],"eof":{"tokentype":"EOF_TOKEN","line":1,"col":88}})");
 }  // Good_Stylesheet
 
 TEST(KeyframesParseCssTest, Good_Allowed_At_Rules) {
@@ -297,56 +129,10 @@ TEST(KeyframesParseCssTest, Bad_NotAtRule) {
       ParseAStylesheet(&tokens, KeyframesCssParsingConfig(), &errors);
   EXPECT_EQ(JsonFromList(errors), "[]");
 
-  EXPECT_EQ(stylesheet->ToJson().ToString(), R""({
-  "tokentype": "STYLESHEET",
-  "line": 1,
-  "col": 0,
-  "rules":  [
-    {
-      "tokentype": "QUALIFIED_RULE",
-      "line": 1,
-      "col": 0,
-      "prelude":      [
-        {
-          "tokentype": "IDENT",
-          "line": 1,
-          "col": 0,
-          "value": "amp-img"
-        },
-        {
-          "tokentype": "WHITESPACE",
-          "line": 1,
-          "col": 7
-        },
-        {
-          "tokentype": "EOF_TOKEN",
-          "line": 1,
-          "col": 8
-        }
-      ],
-      "declarations":      []
-    }
-  ],
-  "eof":  {
-    "tokentype": "EOF_TOKEN",
-    "line": 1,
-    "col": 10
-  }
-})"");
+  EXPECT_EQ(stylesheet->ToJson().ToString(), R"({"tokentype":"STYLESHEET","line":1,"col":0,"rules":[{"tokentype":"QUALIFIED_RULE","line":1,"col":0,"prelude":[{"tokentype":"IDENT","line":1,"col":0,"value":"amp-img"},{"tokentype":"WHITESPACE","line":1,"col":7},{"tokentype":"EOF_TOKEN","line":1,"col":8}],"declarations":[]}],"eof":{"tokentype":"EOF_TOKEN","line":1,"col":10}})");
 
   ValidateKeyframesCss(*stylesheet, &errors);
-  EXPECT_EQ(JsonFromList(errors), R""([
-  {
-    "tokentype": "ERROR",
-    "line": 1,
-    "col": 0,
-    "code": "CSS_SYNTAX_DISALLOWED_QUALIFIED_RULE_MUST_BE_INSIDE_KEYFRAME",
-    "params":    [
-      "style",
-      "amp-img"
-    ]
-  }
-])"");
+  EXPECT_EQ(JsonFromList(errors), R"([{"tokentype":"ERROR","line":1,"col":0,"code":"CSS_SYNTAX_DISALLOWED_QUALIFIED_RULE_MUST_BE_INSIDE_KEYFRAME","params":["style","amp-img"]}])");
 }  // Bad_NotAtRule
 
 TEST(KeyframesParseCssTest, Bad_NonKeyFrameWithDeclarations) {
@@ -361,145 +147,10 @@ TEST(KeyframesParseCssTest, Bad_NonKeyFrameWithDeclarations) {
       ParseAStylesheet(&tokens, KeyframesCssParsingConfig(), &errors);
   EXPECT_EQ(JsonFromList(errors), "[]");
 
-  EXPECT_EQ(stylesheet->ToJson().ToString(), R""({
-  "tokentype": "STYLESHEET",
-  "line": 1,
-  "col": 0,
-  "rules":  [
-    {
-      "tokentype": "AT_RULE",
-      "line": 1,
-      "col": 0,
-      "name": "media",
-      "prelude":      [
-        {
-          "tokentype": "WHITESPACE",
-          "line": 1,
-          "col": 6
-        },
-        {
-          "tokentype": "OPEN_PAREN",
-          "line": 1,
-          "col": 7
-        },
-        {
-          "tokentype": "IDENT",
-          "line": 1,
-          "col": 8,
-          "value": "min-width"
-        },
-        {
-          "tokentype": "COLON",
-          "line": 1,
-          "col": 17
-        },
-        {
-          "tokentype": "WHITESPACE",
-          "line": 1,
-          "col": 18
-        },
-        {
-          "tokentype": "DIMENSION",
-          "line": 1,
-          "col": 19,
-          "repr": "300",
-          "type": "integer",
-          "unit": "px",
-          "value": 300.000000
-        },
-        {
-          "tokentype": "CLOSE_PAREN",
-          "line": 1,
-          "col": 24
-        },
-        {
-          "tokentype": "WHITESPACE",
-          "line": 1,
-          "col": 25
-        },
-        {
-          "tokentype": "EOF_TOKEN",
-          "line": 1,
-          "col": 26
-        }
-      ],
-      "rules":      [
-        {
-          "tokentype": "QUALIFIED_RULE",
-          "line": 1,
-          "col": 27,
-          "prelude":          [
-            {
-              "tokentype": "PERCENTAGE",
-              "line": 1,
-              "col": 27,
-              "repr": "100",
-              "value": 100.000000
-            },
-            {
-              "tokentype": "WHITESPACE",
-              "line": 1,
-              "col": 31
-            },
-            {
-              "tokentype": "EOF_TOKEN",
-              "line": 1,
-              "col": 32
-            }
-          ],
-          "declarations":          [
-            {
-              "tokentype": "DECLARATION",
-              "line": 1,
-              "col": 33,
-              "name": "offset-distance",
-              "important": false,
-              "value":              [
-                {
-                  "tokentype": "WHITESPACE",
-                  "line": 1,
-                  "col": 49
-                },
-                {
-                  "tokentype": "PERCENTAGE",
-                  "line": 1,
-                  "col": 50,
-                  "repr": "100",
-                  "value": 100.000000
-                },
-                {
-                  "tokentype": "EOF_TOKEN",
-                  "line": 1,
-                  "col": 54
-                }
-              ]
-            }
-          ]
-        }
-      ],
-      "declarations":      []
-    }
-  ],
-  "eof":  {
-    "tokentype": "EOF_TOKEN",
-    "line": 1,
-    "col": 56
-  }
-})"");
+  EXPECT_EQ(stylesheet->ToJson().ToString(), R"({"tokentype":"STYLESHEET","line":1,"col":0,"rules":[{"tokentype":"AT_RULE","line":1,"col":0,"name":"media","prelude":[{"tokentype":"WHITESPACE","line":1,"col":6},{"tokentype":"OPEN_PAREN","line":1,"col":7},{"tokentype":"IDENT","line":1,"col":8,"value":"min-width"},{"tokentype":"COLON","line":1,"col":17},{"tokentype":"WHITESPACE","line":1,"col":18},{"tokentype":"DIMENSION","line":1,"col":19,"repr":"300","type":"integer","unit":"px","value":300.000000},{"tokentype":"CLOSE_PAREN","line":1,"col":24},{"tokentype":"WHITESPACE","line":1,"col":25},{"tokentype":"EOF_TOKEN","line":1,"col":26}],"rules":[{"tokentype":"QUALIFIED_RULE","line":1,"col":27,"prelude":[{"tokentype":"PERCENTAGE","line":1,"col":27,"repr":"100","value":100.000000},{"tokentype":"WHITESPACE","line":1,"col":31},{"tokentype":"EOF_TOKEN","line":1,"col":32}],"declarations":[{"tokentype":"DECLARATION","line":1,"col":33,"name":"offset-distance","important":false,"value":[{"tokentype":"WHITESPACE","line":1,"col":49},{"tokentype":"PERCENTAGE","line":1,"col":50,"repr":"100","value":100.000000},{"tokentype":"EOF_TOKEN","line":1,"col":54}]}]}],"declarations":[]}],"eof":{"tokentype":"EOF_TOKEN","line":1,"col":56}})");
 
   ValidateKeyframesCss(*stylesheet, &errors);
-  EXPECT_EQ(JsonFromList(errors), R""([
-  {
-    "tokentype": "ERROR",
-    "line": 1,
-    "col": 27,
-    "code": "CSS_SYNTAX_DISALLOWED_QUALIFIED_RULE_MUST_BE_INSIDE_KEYFRAME",
-    "params":    [
-      "style",
-      "100"
-    ]
-  }
-])"");
+  EXPECT_EQ(JsonFromList(errors), R"([{"tokentype":"ERROR","line":1,"col":27,"code":"CSS_SYNTAX_DISALLOWED_QUALIFIED_RULE_MUST_BE_INSIDE_KEYFRAME","params":["style","100"]}])");
 }  // Bad_NonKeyFrameWithDeclarations
 
 TEST(KeyframesParseCssTest, TestCorrectPreludeConcatenation) {
@@ -510,68 +161,10 @@ TEST(KeyframesParseCssTest, TestCorrectPreludeConcatenation) {
       Tokenize(&css, /*line=*/1, /*col=*/0, &errors);
   unique_ptr<Stylesheet> stylesheet =
       ParseAStylesheet(&tokens, KeyframesCssParsingConfig(), &errors);
-  EXPECT_EQ(stylesheet->ToJson().ToString(), R""({
-  "tokentype": "STYLESHEET",
-  "line": 1,
-  "col": 0,
-  "rules":  [
-    {
-      "tokentype": "QUALIFIED_RULE",
-      "line": 1,
-      "col": 0,
-      "prelude":      [
-        {
-          "tokentype": "IDENT",
-          "line": 1,
-          "col": 0,
-          "value": "a"
-        },
-        {
-          "tokentype": "DELIM",
-          "line": 1,
-          "col": 1,
-          "value": "."
-        },
-        {
-          "tokentype": "IDENT",
-          "line": 1,
-          "col": 2,
-          "value": "underlined"
-        },
-        {
-          "tokentype": "WHITESPACE",
-          "line": 1,
-          "col": 12
-        },
-        {
-          "tokentype": "EOF_TOKEN",
-          "line": 1,
-          "col": 13
-        }
-      ],
-      "declarations":      []
-    }
-  ],
-  "eof":  {
-    "tokentype": "EOF_TOKEN",
-    "line": 1,
-    "col": 15
-  }
-})"");
+  EXPECT_EQ(stylesheet->ToJson().ToString(), R"({"tokentype":"STYLESHEET","line":1,"col":0,"rules":[{"tokentype":"QUALIFIED_RULE","line":1,"col":0,"prelude":[{"tokentype":"IDENT","line":1,"col":0,"value":"a"},{"tokentype":"DELIM","line":1,"col":1,"value":"."},{"tokentype":"IDENT","line":1,"col":2,"value":"underlined"},{"tokentype":"WHITESPACE","line":1,"col":12},{"tokentype":"EOF_TOKEN","line":1,"col":13}],"declarations":[]}],"eof":{"tokentype":"EOF_TOKEN","line":1,"col":15}})");
   EXPECT_EQ(JsonFromList(errors), "[]");
   ValidateKeyframesCss(*stylesheet, &errors);
-  EXPECT_EQ(JsonFromList(errors), R""([
-  {
-    "tokentype": "ERROR",
-    "line": 1,
-    "col": 0,
-    "code": "CSS_SYNTAX_DISALLOWED_QUALIFIED_RULE_MUST_BE_INSIDE_KEYFRAME",
-    "params":    [
-      "style",
-      "a.underlined"
-    ]
-  }
-])"");
+  EXPECT_EQ(JsonFromList(errors), R"([{"tokentype":"ERROR","line":1,"col":0,"code":"CSS_SYNTAX_DISALLOWED_QUALIFIED_RULE_MUST_BE_INSIDE_KEYFRAME","params":["style","a.underlined"]}])");
 }  // TestCorrectPreludeConcatenation
 
 TEST(KeyframesParseCssTest, Bad_QualifiedRuleNotInsideAtRule) {
@@ -584,18 +177,7 @@ TEST(KeyframesParseCssTest, Bad_QualifiedRuleNotInsideAtRule) {
       ParseAStylesheet(&tokens, KeyframesCssParsingConfig(), &errors);
   EXPECT_EQ(JsonFromList(errors), "[]");
   ValidateKeyframesCss(*stylesheet, &errors);
-  EXPECT_EQ(JsonFromList(errors), R""([
-  {
-    "tokentype": "ERROR",
-    "line": 1,
-    "col": 0,
-    "code": "CSS_SYNTAX_DISALLOWED_QUALIFIED_RULE_MUST_BE_INSIDE_KEYFRAME",
-    "params":    [
-      "style",
-      "a"
-    ]
-  }
-])"");
+  EXPECT_EQ(JsonFromList(errors), R"([{"tokentype":"ERROR","line":1,"col":0,"code":"CSS_SYNTAX_DISALLOWED_QUALIFIED_RULE_MUST_BE_INSIDE_KEYFRAME","params":["style","a"]}])");
 }  // Bad_QualifiedRuleNotInsideAtRule
 
 TEST(KeyframesParseCssTest, Bad_QualifiedRuleKeyframeInsideKeyframe) {
@@ -612,17 +194,7 @@ TEST(KeyframesParseCssTest, Bad_QualifiedRuleKeyframeInsideKeyframe) {
       ParseAStylesheet(&tokens, KeyframesCssParsingConfig(), &errors);
   EXPECT_EQ(JsonFromList(errors), "[]");
   ValidateKeyframesCss(*stylesheet, &errors);
-  EXPECT_EQ(JsonFromList(errors), R""([
-  {
-    "tokentype": "ERROR",
-    "line": 1,
-    "col": 18,
-    "code": "CSS_SYNTAX_DISALLOWED_KEYFRAME_INSIDE_KEYFRAME",
-    "params":    [
-      "style"
-    ]
-  }
-])"");
+  EXPECT_EQ(JsonFromList(errors), R"([{"tokentype":"ERROR","line":1,"col":18,"code":"CSS_SYNTAX_DISALLOWED_KEYFRAME_INSIDE_KEYFRAME","params":["style"]}])");
 }  // Bad_QualifiedRuleKeyframeInsideKeyframe
 
 }  // namespace
diff --git a/validator/cpp/engine/parse-layout-sizes.cc b/validator/cpp/engine/parse-layout-sizes.cc
index 27b71df3238c..37b22a374097 100644
--- a/validator/cpp/engine/parse-layout-sizes.cc
+++ b/validator/cpp/engine/parse-layout-sizes.cc
@@ -1,8 +1,8 @@
-#include "parse-layout-sizes.h"
+#include "cpp/engine/parse-layout-sizes.h"
 
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
-#include "strings.h"
+#include "cpp/htmlparser/strings.h"
 #include "re2/re2.h"  // NOLINT(build/deprecated)
 
 using absl::string_view;
diff --git a/validator/cpp/engine/parse-layout-sizes.h b/validator/cpp/engine/parse-layout-sizes.h
index ba6f256a2aba..2150cf858e03 100644
--- a/validator/cpp/engine/parse-layout-sizes.h
+++ b/validator/cpp/engine/parse-layout-sizes.h
@@ -1,5 +1,5 @@
-#ifndef AMPVALIDATOR__PARSE_LAYOUT_SIZES_H_
-#define AMPVALIDATOR__PARSE_LAYOUT_SIZES_H_
+#ifndef CPP_ENGINE_PARSE_LAYOUT_SIZES_H_
+#define CPP_ENGINE_PARSE_LAYOUT_SIZES_H_
 
 #include <vector>
 
@@ -43,4 +43,4 @@ struct CssSizes {
 
 }  // namespace amp::validator::parse_layout_sizes
 
-#endif  // AMPVALIDATOR__PARSE_LAYOUT_SIZES_H_
+#endif  // CPP_ENGINE_PARSE_LAYOUT_SIZES_H_
diff --git a/validator/cpp/engine/parse-layout-sizes_test.cc b/validator/cpp/engine/parse-layout-sizes_test.cc
index 840791f1aad0..71db4c3c6ccc 100644
--- a/validator/cpp/engine/parse-layout-sizes_test.cc
+++ b/validator/cpp/engine/parse-layout-sizes_test.cc
@@ -1,4 +1,4 @@
-#include "parse-layout-sizes.h"
+#include "cpp/engine/parse-layout-sizes.h"
 
 #include <gmock/gmock.h>
 #include "gtest/gtest.h"
diff --git a/validator/cpp/engine/parse-layout.cc b/validator/cpp/engine/parse-layout.cc
index 8e17e386c812..1be01f304a16 100644
--- a/validator/cpp/engine/parse-layout.cc
+++ b/validator/cpp/engine/parse-layout.cc
@@ -1,4 +1,4 @@
-#include "parse-layout.h"
+#include "cpp/engine/parse-layout.h"
 
 #include <string>
 #include <unordered_map>
diff --git a/validator/cpp/engine/parse-layout.h b/validator/cpp/engine/parse-layout.h
index 7d375bfdec61..4a713bae61e9 100644
--- a/validator/cpp/engine/parse-layout.h
+++ b/validator/cpp/engine/parse-layout.h
@@ -1,5 +1,5 @@
-#ifndef AMPVALIDATOR__PARSE_LAYOUT_H_
-#define AMPVALIDATOR__PARSE_LAYOUT_H_
+#ifndef CPP_ENGINE_PARSE_LAYOUT_H_
+#define CPP_ENGINE_PARSE_LAYOUT_H_
 
 #include <string>
 
@@ -117,4 +117,4 @@ std::string GetLayoutAwaitingSizeClass();
 
 }  // namespace amp::validator::parse_layout
 
-#endif  // AMPVALIDATOR__PARSE_LAYOUT_H_
+#endif  // CPP_ENGINE_PARSE_LAYOUT_H_
diff --git a/validator/cpp/engine/parse-layout_test.cc b/validator/cpp/engine/parse-layout_test.cc
index 3de47202f251..00f39496bfe1 100644
--- a/validator/cpp/engine/parse-layout_test.cc
+++ b/validator/cpp/engine/parse-layout_test.cc
@@ -1,4 +1,4 @@
-#include "parse-layout.h"
+#include "cpp/engine/parse-layout.h"
 
 #include "gtest/gtest.h"
 #include "absl/strings/str_cat.h"
diff --git a/validator/cpp/engine/parse-srcset.cc b/validator/cpp/engine/parse-srcset.cc
index 85c14da51bb7..a81916862ce6 100644
--- a/validator/cpp/engine/parse-srcset.cc
+++ b/validator/cpp/engine/parse-srcset.cc
@@ -1,4 +1,4 @@
-#include "parse-srcset.h"
+#include "cpp/engine/parse-srcset.h"
 
 #include <unordered_set>
 #include <vector>
diff --git a/validator/cpp/engine/parse-srcset.h b/validator/cpp/engine/parse-srcset.h
index 4761f7113efb..30ef62197c00 100644
--- a/validator/cpp/engine/parse-srcset.h
+++ b/validator/cpp/engine/parse-srcset.h
@@ -1,5 +1,5 @@
-#ifndef AMPVALIDATOR__PARSE_SRCSET_H_
-#define AMPVALIDATOR__PARSE_SRCSET_H_
+#ifndef CPP_ENGINE_PARSE_SRCSET_H_
+#define CPP_ENGINE_PARSE_SRCSET_H_
 
 #include <string>
 #include <vector>
@@ -47,4 +47,4 @@ SrcsetParsingResult ParseSourceSet(
 
 }  // namespace amp::validator::parse_srcset
 
-#endif  // AMPVALIDATOR__PARSE_SRCSET_H_
+#endif  // CPP_ENGINE_PARSE_SRCSET_H_
diff --git a/validator/cpp/engine/parse-srcset_test.cc b/validator/cpp/engine/parse-srcset_test.cc
index f3ac91d7a8e6..894ae8bf7db8 100644
--- a/validator/cpp/engine/parse-srcset_test.cc
+++ b/validator/cpp/engine/parse-srcset_test.cc
@@ -1,4 +1,4 @@
-#include "parse-srcset.h"
+#include "cpp/engine/parse-srcset.h"
 
 #include <vector>
 
diff --git a/validator/cpp/engine/parse-viewport.cc b/validator/cpp/engine/parse-viewport.cc
index 941558dfa93f..1d79d8c5150a 100644
--- a/validator/cpp/engine/parse-viewport.cc
+++ b/validator/cpp/engine/parse-viewport.cc
@@ -1,10 +1,10 @@
-#include "parse-viewport.h"
+#include "cpp/engine/parse-viewport.h"
 
 #include <map>
 
 #include "absl/strings/ascii.h"
-#include "utf8-util.h"
-#include "strings.h"
+#include "cpp/engine/utf8-util.h"
+#include "cpp/htmlparser/strings.h"
 
 using std::map;
 
diff --git a/validator/cpp/engine/parse-viewport.h b/validator/cpp/engine/parse-viewport.h
index 1edbd0ca2a11..170f7a3cd523 100644
--- a/validator/cpp/engine/parse-viewport.h
+++ b/validator/cpp/engine/parse-viewport.h
@@ -1,5 +1,5 @@
-#ifndef AMPVALIDATOR__PARSE_VIEWPORT_H_
-#define AMPVALIDATOR__PARSE_VIEWPORT_H_
+#ifndef CPP_ENGINE_PARSE_VIEWPORT_H_
+#define CPP_ENGINE_PARSE_VIEWPORT_H_
 
 #include <map>
 #include <string>
@@ -18,4 +18,4 @@ namespace amp::validator::parse_viewport {
 std::map<std::string, std::string> ParseContent(const std::string& content);
 }  // namespace amp::validator::parse_viewport
 
-#endif  // AMPVALIDATOR__PARSE_VIEWPORT_H_
+#endif  // CPP_ENGINE_PARSE_VIEWPORT_H_
diff --git a/validator/cpp/engine/parse-viewport_test.cc b/validator/cpp/engine/parse-viewport_test.cc
index 95cc3ef901de..6f971059a7c4 100644
--- a/validator/cpp/engine/parse-viewport_test.cc
+++ b/validator/cpp/engine/parse-viewport_test.cc
@@ -1,4 +1,4 @@
-#include "parse-viewport.h"
+#include "cpp/engine/parse-viewport.h"
 
 #include <gmock/gmock.h>
 #include "gtest/gtest.h"
diff --git a/validator/cpp/engine/scripts/BUILD b/validator/cpp/engine/scripts/BUILD
index 1bfad34d2043..358ee80a0a6b 100644
--- a/validator/cpp/engine/scripts/BUILD
+++ b/validator/cpp/engine/scripts/BUILD
@@ -8,7 +8,7 @@ cc_binary(
         "filecontents_to_cpp_header.cc",
     ],
     deps = [
-        "@htmlparser//:defer",
+        "//cpp/htmlparser:defer",
     ],
 )
 
@@ -18,7 +18,7 @@ cc_binary(
         "validator_example.cc",
     ],
     deps = [
-        "@ampvalidator//:validator",
-        "@validator//:validator_cc_proto",
+        "//cpp/engine:validator",
+        "//:validator_cc_proto",
     ],
 )
diff --git a/validator/cpp/engine/scripts/filecontents_to_cpp_header.cc b/validator/cpp/engine/scripts/filecontents_to_cpp_header.cc
index e7a53b303e69..830fdf1a7085 100644
--- a/validator/cpp/engine/scripts/filecontents_to_cpp_header.cc
+++ b/validator/cpp/engine/scripts/filecontents_to_cpp_header.cc
@@ -44,7 +44,7 @@
 #include <iostream>
 #include <string>
 
-#include "defer.h"
+#include "cpp/htmlparser/defer.h"
 
 int main(int argc, char** argv) {
   if (argc != 5) {
diff --git a/validator/cpp/engine/scripts/validator_example.cc b/validator/cpp/engine/scripts/validator_example.cc
index 5e0c5af785e6..f372b3cfe1e9 100644
--- a/validator/cpp/engine/scripts/validator_example.cc
+++ b/validator/cpp/engine/scripts/validator_example.cc
@@ -2,7 +2,7 @@
 #include <iostream>
 #include <string_view>
 
-#include "validator.h"
+#include "cpp/engine/validator.h"
 #include "validator.pb.h"
 
 static constexpr std::string_view kValidAMPHtml{R"HTML(
diff --git a/validator/cpp/engine/testing-utils.cc b/validator/cpp/engine/testing-utils.cc
index d55be24da180..f6cc635024dc 100644
--- a/validator/cpp/engine/testing-utils.cc
+++ b/validator/cpp/engine/testing-utils.cc
@@ -3,13 +3,13 @@
 
 #include <filesystem>
 
-#include "glog/logging.h"
-#include "testing-utils.h"
-#include "error-formatter.h"
+#include "cpp/htmlparser/logging.h"
+#include "cpp/engine/testing-utils.h"
+#include "cpp/engine/error-formatter.h"
 #include "absl/strings/substitute.h"
 #include "absl/strings/str_cat.h"
-#include "fileutil.h"
-#include "strings.h"
+#include "cpp/htmlparser/fileutil.h"
+#include "cpp/htmlparser/strings.h"
 #include "absl/strings/ascii.h"
 #include "absl/strings/strip.h"
 
@@ -91,7 +91,7 @@ const std::map<std::string, TestCase>& TestCases() {
     std::vector<TestCase> cases;
     std::vector<std::string> html_files;
     CHECK(htmlparser::FileUtil::Glob(
-           "external/validator/testdata/*/*.html",
+           "testdata/*/*.html",
            &html_files)) << "Test cases file pattern not found.";
     CHECK(htmlparser::FileUtil::Glob(
            "external/amphtml-extensions/*/*/test/*.html",
diff --git a/validator/cpp/engine/testing-utils.h b/validator/cpp/engine/testing-utils.h
index a5f534e6bde0..6dc2ac9549b4 100644
--- a/validator/cpp/engine/testing-utils.h
+++ b/validator/cpp/engine/testing-utils.h
@@ -1,5 +1,5 @@
-#ifndef AMPVALIDATOR__TESTING_UTILS_H_
-#define AMPVALIDATOR__TESTING_UTILS_H_
+#ifndef CPP_ENGINE_TESTING_UTILS_H_
+#define CPP_ENGINE_TESTING_UTILS_H_
 
 #include <map>
 
@@ -37,4 +37,4 @@ const std::map<std::string, TestCase>& TestCases();
 }  // namespace amp::validator::testing
 
 
-#endif  // AMPVALIDATOR__TESTING_UTILS_H_
+#endif  // CPP_ENGINE_TESTING_UTILS_H_
diff --git a/validator/cpp/engine/type-identifier.cc b/validator/cpp/engine/type-identifier.cc
index 95e8a359c58b..915457695803 100644
--- a/validator/cpp/engine/type-identifier.cc
+++ b/validator/cpp/engine/type-identifier.cc
@@ -1,4 +1,4 @@
-#include "type-identifier.h"
+#include "cpp/engine/type-identifier.h"
 
 #include <algorithm>
 
diff --git a/validator/cpp/engine/type-identifier.h b/validator/cpp/engine/type-identifier.h
index 18dbc01f3eed..75fff1f4c8ec 100644
--- a/validator/cpp/engine/type-identifier.h
+++ b/validator/cpp/engine/type-identifier.h
@@ -1,5 +1,5 @@
-#ifndef AMPVALIDATOR__TYPE_IDENTIFIER_H_
-#define AMPVALIDATOR__TYPE_IDENTIFIER_H_
+#ifndef CPP_ENGINE_TYPE_IDENTIFIER_H_
+#define CPP_ENGINE_TYPE_IDENTIFIER_H_
 
 #include <vector>
 
@@ -46,4 +46,4 @@ bool HasSignedExchangeTypeIdentifiers(
     std::vector<TypeIdentifier> type_identifiers);
 }  // namespace amp::validator
 
-#endif  // AMPVALIDATOR__TYPE_IDENTIFIER_H_
+#endif  // CPP_ENGINE_TYPE_IDENTIFIER_H_
diff --git a/validator/cpp/engine/type-identifier_test.cc b/validator/cpp/engine/type-identifier_test.cc
index fb396089f79e..a91c42dab3a5 100644
--- a/validator/cpp/engine/type-identifier_test.cc
+++ b/validator/cpp/engine/type-identifier_test.cc
@@ -1,4 +1,4 @@
-#include "type-identifier.h"
+#include "cpp/engine/type-identifier.h"
 
 #include "gtest/gtest.h"
 #include "validator.pb.h"
diff --git a/validator/cpp/engine/update-tests.cc b/validator/cpp/engine/update-tests.cc
new file mode 100644
index 000000000000..1e4a632f20e5
--- /dev/null
+++ b/validator/cpp/engine/update-tests.cc
@@ -0,0 +1,43 @@
+// A binary which runs the validator over golden test input files and overwrites
+// all output files. It is useful to update a bunch of test and then inspect
+// the diff.
+
+#include <fstream>
+
+#include "absl/strings/str_replace.h"
+#include "cpp/engine/testing-utils.h"
+#include "cpp/engine/validator.h"
+
+namespace amp::validator {
+namespace {
+
+void UpdateTests() {
+  for (const auto& entry : testing::TestCases()) {
+    const testing::TestCase& test_case = entry.second;
+    ValidationResult result =
+        Validate(test_case.input_content, test_case.html_format);
+    std::string output_content = testing::RenderInlineResult(
+        test_case.name, test_case.input_content, result);
+    const std::string output_filename = absl::StrReplaceAll(
+        test_case.output_file,
+        {{"external/validator/testdata/", "validator/testdata/"},
+         {"external/amphtml-extensions/", "extensions/"}});
+    if (output_content == test_case.output_content) {
+      std::cout << "Unchanged validation: " << output_filename << std::endl;
+    } else {
+      std::cout << "Updating validation: " << output_filename << std::endl;
+      std::ofstream output_stream;
+      output_stream.open(output_filename);
+      output_stream << output_content;
+      output_stream.close();
+    }
+  }
+}
+
+}  // namespace
+}  // namespace amp::validator
+
+int main(int argc, char* argv[]) {
+  amp::validator::UpdateTests();
+  return 0;
+}
diff --git a/validator/cpp/engine/utf8-util.cc b/validator/cpp/engine/utf8-util.cc
index a6a03e40d853..e2d0b38b8f7e 100644
--- a/validator/cpp/engine/utf8-util.cc
+++ b/validator/cpp/engine/utf8-util.cc
@@ -1,8 +1,8 @@
-#include "utf8-util.h"
+#include "cpp/engine/utf8-util.h"
 
-#include "glog/logging.h"
 #include "absl/strings/string_view.h"
-#include "strings.h"
+#include "cpp/htmlparser/logging.h"
+#include "cpp/htmlparser/strings.h"
 
 using absl::string_view;
 using std::vector;
diff --git a/validator/cpp/engine/utf8-util.h b/validator/cpp/engine/utf8-util.h
index ab6afe1b255c..d6dbc5521aed 100644
--- a/validator/cpp/engine/utf8-util.h
+++ b/validator/cpp/engine/utf8-util.h
@@ -1,5 +1,5 @@
-#ifndef AMPVALIDATOR__UTF8_UTIL_H_
-#define AMPVALIDATOR__UTF8_UTIL_H_
+#ifndef CPP_ENGINE_UTF8_UTIL_H_
+#define CPP_ENGINE_UTF8_UTIL_H_
 
 #include <string>
 #include <vector>
@@ -37,4 +37,4 @@ class CodePointTraverser {
 
 }  // namespace amp::validator::utf8_util
 
-#endif  // AMPVALIDATOR__UTF8_UTIL_H_
+#endif  // CPP_ENGINE_UTF8_UTIL_H_
diff --git a/validator/cpp/engine/utf8-util_test.cc b/validator/cpp/engine/utf8-util_test.cc
index 355ae98d35c1..0f5f6b9bf783 100644
--- a/validator/cpp/engine/utf8-util_test.cc
+++ b/validator/cpp/engine/utf8-util_test.cc
@@ -1,7 +1,7 @@
-#include "utf8-util.h"
+#include "cpp/engine/utf8-util.h"
 
 #include "gtest/gtest.h"
-#include "strings.h"
+#include "cpp/htmlparser/strings.h"
 
 using ::testing::Eq;
 
diff --git a/validator/cpp/engine/validator-convert.cc b/validator/cpp/engine/validator-convert.cc
index eb4b75930ee2..f653cf3acb94 100644
--- a/validator/cpp/engine/validator-convert.cc
+++ b/validator/cpp/engine/validator-convert.cc
@@ -2,11 +2,11 @@
 #include <fstream>
 #include <string>
 
-#include "glog/logging.h"
 #include "google/protobuf/text_format.h"
 
-#include "defer.h"
-#include "fileutil.h"
+#include "cpp/htmlparser/defer.h"
+#include "cpp/htmlparser/fileutil.h"
+#include "cpp/htmlparser/logging.h"
 
 #include "validator.pb.h"
 
diff --git a/validator/cpp/engine/validator-internal.cc b/validator/cpp/engine/validator-internal.cc
index bf817bf78873..63856a5eb540 100644
--- a/validator/cpp/engine/validator-internal.cc
+++ b/validator/cpp/engine/validator-internal.cc
@@ -6,7 +6,6 @@
 #include <unordered_map>
 #include <unordered_set>
 
-#include "glog/logging.h"
 #include "google/protobuf/repeated_field.h"
 #include "absl/algorithm/container.h"
 #include "absl/base/thread_annotations.h"
@@ -26,25 +25,26 @@
 #include "absl/strings/strip.h"
 #include "absl/strings/substitute.h"
 #include "absl/synchronization/mutex.h"
-#include "keyframes-parse-css.h"
-#include "parse-layout.h"
-#include "parse-srcset.h"
-#include "parse-viewport.h"
-#include "type-identifier.h"
-#include "utf8-util.h"
-#include "validator_pb.h"
-#include "atom.h"
-#include "atomutil.h"
-#include "css/amp4ads-parse-css.h"
-#include "css/parse-css.h"
-#include "css/parse-css.pb.h"
-#include "defer.h"
-#include "elements.h"
-#include "json/parser.h"
-#include "node.h"
-#include "parser.h"
-#include "strings.h"
-#include "url.h"
+#include "cpp/engine/keyframes-parse-css.h"
+#include "cpp/engine/parse-layout.h"
+#include "cpp/engine/parse-srcset.h"
+#include "cpp/engine/parse-viewport.h"
+#include "cpp/engine/type-identifier.h"
+#include "cpp/engine/utf8-util.h"
+#include "cpp/engine/validator_pb.h"
+#include "cpp/htmlparser/atom.h"
+#include "cpp/htmlparser/atomutil.h"
+#include "cpp/htmlparser/css/amp4ads-parse-css.h"
+#include "cpp/htmlparser/css/parse-css.h"
+#include "cpp/htmlparser/css/parse-css.pb.h"
+#include "cpp/htmlparser/defer.h"
+#include "cpp/htmlparser/elements.h"
+#include "cpp/htmlparser/logging.h"
+#include "cpp/htmlparser/node.h"
+#include "cpp/htmlparser/parser.h"
+#include "cpp/htmlparser/strings.h"
+#include "cpp/htmlparser/url.h"
+#include "cpp/htmlparser/validators/json.h"
 #include "validator.pb.h"
 #include "re2/re2.h"  // NOLINT(build/deprecated)
 
@@ -127,12 +127,30 @@ static const LazyRE2 kRuntimeScriptPathRe = {
 static const LazyRE2 kExtensionPathRe = {
     R"re((?:lts/)?v0/(amp-[a-z0-9-]*)-([a-z0-9.]*)\.(?:m)?js(?:\?f=sxg)?)re"};
 
+// Generates a htmlparser::css::CssParsingConfig.
+CssParsingConfig GenCssParsingConfig() {
+  CssParsingConfig config;
+  // If other @ rule types are added to the rules, their block parsing types
+  // will need to be added here as well.
+  config.at_rule_spec["font-face"] = BlockType::PARSE_AS_DECLARATIONS;
+  config.at_rule_spec["keyframes"] = BlockType::PARSE_AS_RULES;
+  config.at_rule_spec["media"] = BlockType::PARSE_AS_RULES;
+  config.at_rule_spec["page"] = BlockType::PARSE_AS_DECLARATIONS;
+  config.at_rule_spec["supports"] = BlockType::PARSE_AS_RULES;
+  config.at_rule_spec["-moz-document"] = BlockType::PARSE_AS_RULES;
+  // Note that ignoring still generates an error.
+  config.default_spec = BlockType::PARSE_AS_IGNORE;
+  return config;
+}
+
 namespace {
 
+#define CHECK_NOTNULL(x) (x)
+
 // Sorts and eliminates duplicates in |v|.
 template <typename T>
 void SortAndUniquify(vector<T>* v) {
-  std::sort(v->begin(), v->end());
+  std::stable_sort(v->begin(), v->end());
   v->erase(std::unique(v->begin(), v->end()), v->end());
 }
 
@@ -293,42 +311,62 @@ ScriptTag ParseScriptTag(htmlparser::Node* node) {
     }
   }
 
+  if (src.empty()) {
+    return script_tag;
+  }
+
+  std::string src_str{src};
   // Determine if this has a valid AMP domain and separate the path from the
   // attribute 'src'. Consumes the domain making src just the path.
   if (absl::ConsumePrefix(&src, kAmpProjectDomain)) {
     script_tag.is_amp_domain = true;
-    script_tag.path = std::string(src);
-
-    // Only look at script tags that have attribute 'async'.
-    if (has_async_attr) {
-      // Determine if this is the AMP Runtime.
-      if (!script_tag.is_extension &&
-          RE2::FullMatch(src, *kRuntimeScriptPathRe)) {
-        script_tag.is_runtime = true;
-        script_tag.has_valid_path = true;
-      }
-
-      // For AMP Extensions, validate path and extract name and version.
-      if (script_tag.is_extension &&
-          RE2::FullMatch(src, *kExtensionPathRe, &script_tag.extension_name,
-                         &script_tag.extension_version)) {
-        script_tag.has_valid_path = true;
-      }
-
-      // Determine the release version (LTS, module, standard, etc).
-      if ((has_module_attr && RE2::FullMatch(src, *kModuleLtsScriptPathRe)) ||
-          (has_nomodule_attr && RE2::FullMatch(src, *kLtsScriptPathRe))) {
-        script_tag.release_version = ScriptReleaseVersion::MODULE_NOMODULE_LTS;
-      } else if ((has_module_attr &&
-                  RE2::FullMatch(src, *kModuleScriptPathRe)) ||
-                 (has_nomodule_attr &&
-                  RE2::FullMatch(src, *kStandardScriptPathRe))) {
-        script_tag.release_version = ScriptReleaseVersion::MODULE_NOMODULE;
-      } else if (RE2::FullMatch(src, *kLtsScriptPathRe)) {
-        script_tag.release_version = ScriptReleaseVersion::LTS;
-      } else if (RE2::FullMatch(src, *kStandardScriptPathRe)) {
-        script_tag.release_version = ScriptReleaseVersion::STANDARD;
-      }
+    script_tag.path = src_str;
+  } else {
+    script_tag.is_amp_domain = false;
+    htmlparser::URL url(src_str);
+    // Error cases, early exit:
+    if (!url.is_valid()) return script_tag;
+    if (!url.has_protocol()) return script_tag;
+    if (url.protocol() != "https" && url.protocol() != "http")
+      return script_tag;
+    if (url.hostname().empty()) return script_tag;
+
+    src = url.path_params_fragment().data();
+    // Trim the "/" prefix as this is what kExtensionPathRe expects.
+    if (!src.empty() && src[0] == '/') src = src.substr(1);
+    std::string src_str{src};
+    script_tag.path = src_str;
+  }
+
+  // Only look at script tags that have attribute 'async'.
+  if (has_async_attr) {
+    // Determine if this is the AMP Runtime.
+    if (!script_tag.is_extension &&
+        RE2::FullMatch(src, *kRuntimeScriptPathRe)) {
+      script_tag.is_runtime = true;
+      script_tag.has_valid_path = true;
+    }
+
+    // For AMP Extensions, validate path and extract name and version.
+    if (script_tag.is_extension &&
+        RE2::FullMatch(src, *kExtensionPathRe, &script_tag.extension_name,
+                       &script_tag.extension_version)) {
+      script_tag.has_valid_path = true;
+    }
+
+    // Determine the release version (LTS, module, standard, etc).
+    if ((has_module_attr && RE2::FullMatch(src, *kModuleLtsScriptPathRe)) ||
+        (has_nomodule_attr && RE2::FullMatch(src, *kLtsScriptPathRe))) {
+      script_tag.release_version = ScriptReleaseVersion::MODULE_NOMODULE_LTS;
+    } else if ((has_module_attr &&
+                RE2::FullMatch(src, *kModuleScriptPathRe)) ||
+               (has_nomodule_attr &&
+                RE2::FullMatch(src, *kStandardScriptPathRe))) {
+      script_tag.release_version = ScriptReleaseVersion::MODULE_NOMODULE;
+    } else if (RE2::FullMatch(src, *kLtsScriptPathRe)) {
+      script_tag.release_version = ScriptReleaseVersion::LTS;
+    } else if (RE2::FullMatch(src, *kStandardScriptPathRe)) {
+      script_tag.release_version = ScriptReleaseVersion::STANDARD;
     }
   }
   return script_tag;
@@ -606,9 +644,9 @@ struct ParsedReferencePoint {
 class ParsedReferencePoints {
  public:
   ParsedReferencePoints() : parent_(nullptr) {}
-  ParsedReferencePoints(
-      const TagSpec& parent,
-      const unordered_map<std::string, int32_t>& tag_spec_ids_by_tag_spec_name)
+  ParsedReferencePoints(const TagSpec& parent,
+                        const absl::flat_hash_map<std::string, int32_t>&
+                            tag_spec_ids_by_tag_spec_name)
       : parent_(&parent) {
     for (const ReferencePoint& p : parent.reference_points()) {
       auto iter = tag_spec_ids_by_tag_spec_name.find(p.tag_spec_name());
@@ -843,22 +881,6 @@ class ParsedAttrSpecs {
   unordered_map<std::string, vector<const ParsedAttrSpec*>> attr_lists_by_name_;
 };
 
-// Generates a htmlparser::css::CssParsingConfig.
-CssParsingConfig GenCssParsingConfig() {
-  CssParsingConfig config;
-  // If other @ rule types are added to the rules, their block parsing types
-  // will need to be added here as well.
-  config.at_rule_spec["font-face"] = BlockType::PARSE_AS_DECLARATIONS;
-  config.at_rule_spec["keyframes"] = BlockType::PARSE_AS_RULES;
-  config.at_rule_spec["media"] = BlockType::PARSE_AS_RULES;
-  config.at_rule_spec["page"] = BlockType::PARSE_AS_DECLARATIONS;
-  config.at_rule_spec["supports"] = BlockType::PARSE_AS_RULES;
-  config.at_rule_spec["-moz-document"] = BlockType::PARSE_AS_RULES;
-  // Note that ignoring still generates an error.
-  config.default_spec = BlockType::PARSE_AS_IGNORE;
-  return config;
-}
-
 // Instances of this class precompute the regular expressions for a particular
 // Cdata specification.
 class ParsedCdataSpec {
@@ -1010,7 +1032,7 @@ RecordValidated ShouldRecordTagspecValidated(
   // Unique and similar can introduce requirements, ie: there cannot be
   // another such tag. We don't want to introduce requirements for failing
   // tags.
-  if (tag.unique() || tag.unique_warning() || !tag.requires().empty())
+  if (tag.unique() || tag.unique_warning() || !tag.requires_condition().empty())
     return IF_PASSING;
   return NEVER;
 }
@@ -1019,11 +1041,11 @@ RecordValidated ShouldRecordTagspecValidated(
 // which is unique within its context, the ParsedValidatorRules.
 class ParsedTagSpec {
  public:
-  ParsedTagSpec(
-      ParsedAttrSpecs* parsed_attr_specs,
-      const unordered_map<std::string, int32_t>& tag_spec_ids_by_tag_spec_name,
-      RecordValidated should_record_tagspec_validated, const TagSpec* spec,
-      int32_t id)
+  ParsedTagSpec(ParsedAttrSpecs* parsed_attr_specs,
+                const absl::flat_hash_map<std::string, int32_t>&
+                    tag_spec_ids_by_tag_spec_name,
+                RecordValidated should_record_tagspec_validated,
+                const TagSpec* spec, int32_t id)
       : spec_(spec),
         id_(id),
         reference_points_(*spec, tag_spec_ids_by_tag_spec_name),
@@ -1083,8 +1105,8 @@ class ParsedTagSpec {
     SortAndUniquify(&mandatory_anyofs_);
     SortAndUniquify(&mandatory_attr_ids_);
     c_copy(spec->requires_extension(), std::back_inserter(requires_extension_));
-    c_copy(spec->requires(), std::back_inserter(requires_));
-    c_copy(spec->excludes(), std::back_inserter(excludes_));
+    c_copy(spec->requires_condition(), std::back_inserter(requires_condition_));
+    c_copy(spec->excludes_condition(), std::back_inserter(excludes_condition_));
     for (const std::string& tag_spec_name : spec->also_requires_tag_warning()) {
       auto iter = tag_spec_ids_by_tag_spec_name.find(tag_spec_name);
       CHECK(iter != tag_spec_ids_by_tag_spec_name.end());
@@ -1165,8 +1187,8 @@ class ParsedTagSpec {
   const vector<int32_t>& AlsoRequiresTagWarnings() const {
     return also_requires_tag_warnings_;
   }
-  const vector<std::string>& Requires() const { return requires_; }
-  const vector<std::string>& Excludes() const { return excludes_; }
+  const vector<std::string>& Requires() const { return requires_condition_; }
+  const vector<std::string>& Excludes() const { return excludes_condition_; }
 
   // Whether or not the tag should be recorded via
   // Context->RecordTagspecValidated if it was validated
@@ -1196,7 +1218,7 @@ class ParsedTagSpec {
 
   const set<int32_t>& implicit_attrspecs() const { return implicit_attrspecs_; }
 
-  const unordered_map<std::string, int32_t>& attr_ids_by_name() const {
+  const absl::flat_hash_map<std::string, int32_t>& attr_ids_by_name() const {
     return attr_ids_by_name_;
   }
 
@@ -1218,7 +1240,7 @@ class ParsedTagSpec {
   bool is_reference_point_;
   bool is_type_json_ = false;
   bool contains_url_ = false;
-  unordered_map<std::string, int32_t> attr_ids_by_name_;
+  absl::flat_hash_map<std::string, int32_t> attr_ids_by_name_;
   vector<TypeIdentifier> disabled_by_;
   vector<TypeIdentifier> enabled_by_;
   vector<int32_t> mandatory_attr_ids_;
@@ -1227,8 +1249,8 @@ class ParsedTagSpec {
   ParsedCdataSpec parsed_cdata_spec_;
   RecordValidated should_record_tagspec_validated_;
   bool attrs_can_satisfy_extension_ = false;
-  vector<std::string> requires_;
-  vector<std::string> excludes_;
+  vector<std::string> requires_condition_;
+  vector<std::string> excludes_condition_;
   vector<std::string> requires_extension_;
   vector<int32_t> also_requires_tag_warnings_;
   set<int32_t> implicit_attrspecs_;
@@ -2454,7 +2476,7 @@ class Context {
     if (!tag_result.best_match_tag_spec) return;
     const ParsedTagSpec* parsed_tag_spec = tag_result.best_match_tag_spec;
     if (!parsed_tag_spec->AttrsCanSatisfyExtension()) return;
-    const unordered_map<std::string, int32_t>& attr_ids_by_name =
+    const absl::flat_hash_map<std::string, int32_t>& attr_ids_by_name =
         parsed_tag_spec->attr_ids_by_name();
     ExtensionsContext* extensions_ctx = mutable_extensions();
     for (const ParsedHtmlTagAttr& attr : encountered_tag.Attributes()) {
@@ -2471,7 +2493,7 @@ class Context {
 
   // Record document-level conditions which have been satisfied by the tag spec.
   void SatisfyConditionsFromTagSpec(const ParsedTagSpec& parsed_tag_spec) {
-    c_copy(parsed_tag_spec.spec().satisfies(),
+    c_copy(parsed_tag_spec.spec().satisfies_condition(),
            std::inserter(conditions_satisfied_, conditions_satisfied_.end()));
   }
 
@@ -3292,7 +3314,7 @@ void ValidateAttrValueProperties(const ParsedAttrSpec& parsed_attr_spec,
            mandatory_value_properties_seen);
 
   // To reduce churn emit errors sorted by names instead of memory addresses.
-  std::sort(not_seen.begin(), not_seen.end(),
+  std::stable_sort(not_seen.begin(), not_seen.end(),
             [](const PropertySpec* lhs, const PropertySpec* rhs) {
               return lhs->name() < rhs->name();
             });
@@ -3974,8 +3996,14 @@ void ValidateAmpScriptSrcAttr(const ParsedHtmlTag& tag,
                               const TagSpec& tag_spec, const Context& context,
                               ValidationResult* result) {
   if (!tag.IsAmpDomain()) {
-    context.AddError(ValidationError::DISALLOWED_AMP_DOMAIN, context.line_col(),
-                     /*params=*/{}, /*spec_url=*/"", result);
+    bool is_amp_format =
+        c_find(context.type_identifiers(), TypeIdentifier::kAmp) !=
+        context.type_identifiers().end();
+    if (!is_amp_format || context.is_transformed()) {
+      context.AddError(ValidationError::DISALLOWED_AMP_DOMAIN,
+                       context.line_col(),
+                       /*params=*/{}, /*spec_url=*/"", result);
+    }
   }
 
   if (tag.IsExtensionScript() && tag_spec.has_extension_spec()) {
@@ -4384,7 +4412,7 @@ void ValidateAttributes(const ParsedTagSpec& parsed_tag_spec,
   set<std::string_view> mandatory_anyofs_seen;
   vector<const ParsedAttrTriggerSpec*> parsed_trigger_specs;
   set<int32_t> attrspecs_validated;
-  const unordered_map<std::string, int32_t>& attr_ids_by_name =
+  const absl::flat_hash_map<std::string, int32_t>& attr_ids_by_name =
       parsed_tag_spec.attr_ids_by_name();
 
   for (const ParsedHtmlTagAttr& attr : encountered_tag.Attributes()) {
@@ -4629,7 +4657,7 @@ void ValidateAttributes(const ParsedTagSpec& parsed_tag_spec,
     missing_attrs.push_back(attr_name);
   }
   // Sort this list for stability across implementations.
-  std::sort(missing_attrs.begin(), missing_attrs.end());
+  std::stable_sort(missing_attrs.begin(), missing_attrs.end());
   for (const std::string& missing_attr : missing_attrs) {
     context.AddError(ValidationError::MANDATORY_ATTR_MISSING,
                      context.line_col(),
@@ -4689,7 +4717,7 @@ ParsedValidatorRules::ParsedValidatorRules(HtmlFormat::Code html_format)
   // |tag_spec_names_to_track| to identify those tagspecs that are
   // referenced by others via "also_requires_tag".  The ParsedTagSpec
   // constructor completes this translation to ids.
-  unordered_map<std::string, int32_t> tag_spec_ids_by_tag_spec_name;
+  absl::flat_hash_map<std::string, int32_t> tag_spec_ids_by_tag_spec_name;
   unordered_set<std::string> tag_spec_names_to_track;
   for (int ii = 0; ii < rules_.tags_size(); ++ii) {
     const TagSpec& tag = rules_.tags(ii);
@@ -4734,7 +4762,7 @@ ParsedValidatorRules::ParsedValidatorRules(HtmlFormat::Code html_format)
     }
     if (parsed_tag_spec.spec().mandatory()) mandatory_tagspecs_.push_back(ii);
   }
-  std::sort(mandatory_tagspecs_.begin(), mandatory_tagspecs_.end());
+  std::stable_sort(mandatory_tagspecs_.begin(), mandatory_tagspecs_.end());
 
   error_codes_.resize(ValidationError::Code_MAX + 1);
   for (const ErrorSpecificity& error_specificity : rules_.error_specificity()) {
@@ -4804,8 +4832,9 @@ void ParsedValidatorRules::ExpandModuleExtensionSpec(
     TagSpec* tagspec, const string_view spec_name) const {
   tagspec->set_spec_name(StrCat(spec_name, " module extension script"));
   tagspec->set_descriptive_name(tagspec->spec_name());
-  tagspec->add_satisfies(tagspec->spec_name());
-  tagspec->add_requires(StrCat(spec_name, " nomodule extension script"));
+  tagspec->add_satisfies_condition(tagspec->spec_name());
+  tagspec->add_requires_condition(
+      StrCat(spec_name, " nomodule extension script"));
   AttrSpec* attr = tagspec->add_attrs();
   attr->set_name("crossorigin");
   attr->add_value("anonymous");
@@ -4822,8 +4851,9 @@ void ParsedValidatorRules::ExpandNomoduleExtensionSpec(
     TagSpec* tagspec, const string_view spec_name) const {
   tagspec->set_spec_name(StrCat(spec_name, " nomodule extension script"));
   tagspec->set_descriptive_name(tagspec->spec_name());
-  tagspec->add_satisfies(tagspec->spec_name());
-  tagspec->add_requires(StrCat(spec_name, " module extension script"));
+  tagspec->add_satisfies_condition(tagspec->spec_name());
+  tagspec->add_requires_condition(
+      StrCat(spec_name, " module extension script"));
   AttrSpec* attr = tagspec->add_attrs();
   attr->set_name("nomodule");
   attr->add_value("");
@@ -4848,7 +4878,7 @@ void ParsedValidatorRules::ExpandExtensionSpec(ValidatorRules* rules) const {
       tagspec->set_descriptive_name(tagspec->spec_name());
     tagspec->set_mandatory_parent("HEAD");
     // This is satisfied by any of the `v0.js` variants:
-    tagspec->add_requires("amphtml javascript runtime (v0.js)");
+    tagspec->add_requires_condition("amphtml javascript runtime (v0.js)");
 
     if (extension_spec.deprecated_allow_duplicates()) {
       tagspec->set_unique_warning(true);
@@ -5592,7 +5622,7 @@ void ReferencePointMatcher::RecordMatch(const ParsedTagSpec& reference_point) {
 
 void ReferencePointMatcher::ExitParentTag(const Context& context,
                                           ValidationResult* result) const {
-  absl::node_hash_map<int32_t, int32_t> reference_point_by_count;
+  absl::flat_hash_map<int32_t, int32_t> reference_point_by_count;
   for (int32_t r : reference_points_matched_) ++reference_point_by_count[r];
   for (const ParsedReferencePoint& p : *parsed_reference_points_) {
     if (p.point->mandatory() && reference_point_by_count.find(p.tag_spec_id) ==
@@ -5656,9 +5686,7 @@ class ParsedValidatorRulesProvider {
 class Validator {
  public:
   Validator(const ParsedValidatorRules* rules, int max_errors = -1)
-      : rules_(rules),
-        max_errors_(max_errors),
-        context_(rules_, max_errors_) {}
+      : rules_(rules), max_errors_(max_errors), context_(rules_, max_errors_) {}
 
   ValidationResult Validate(const htmlparser::Document& doc) {
     doc_metadata_ = doc.Metadata();
@@ -5690,7 +5718,7 @@ class Validator {
     // Currently parser returns nullptr only if document is too complex.
     // NOTE: If htmlparser starts returning null document for other reasons, we
     // must add new error types here.
-    if (doc == nullptr) {
+    if (!doc || !doc->status().ok()) {
       context_.AddError(ValidationError::DOCUMENT_TOO_COMPLEX, LineCol(1, 0),
                         {}, "", &result_);
       return result_;
@@ -5784,7 +5812,7 @@ class Validator {
               (htmlparser::Strings::EqualFold(attr.value, "application/json") ||
                htmlparser::Strings::EqualFold(attr.value,
                                               "application/ld+json"))) {
-            if (auto v = htmlparser::json::JSONParser::Validate(
+            if (auto v = htmlparser::json::Validate(
                     node->FirstChild()->Data());
                 !v.first) {
               std::pair<int, int> json_linecol{0, 0};
@@ -5849,14 +5877,16 @@ class Validator {
         auto dummy_node = std::make_unique<htmlparser::Node>(
             htmlparser::NodeType::ELEMENT_NODE, htmlparser::Atom::BODY);
         auto doc = htmlparser::ParseFragment(c->Data(), dummy_node.get());
-        // Append all the nodes to the original <noscript> parent.
-        for (htmlparser::Node* cn : doc->FragmentNodes()) {
-          cn->UpdateChildNodesPositions(node);
-          UpdateLineColumnIndex(cn);
-          ValidateNode(cn, ++stack_size);
-          --stack_size;
+        if (doc && doc->status().ok()) {
+          // Append all the nodes to the original <noscript> parent.
+          for (htmlparser::Node* cn : doc->FragmentNodes()) {
+            cn->UpdateChildNodesPositions(node);
+            UpdateLineColumnIndex(cn);
+            ValidateNode(cn, ++stack_size);
+            --stack_size;
+          }
+          node->RemoveChild(c);
         }
-        node->RemoveChild(c);
       }
       c = next;
     }
diff --git a/validator/cpp/engine/validator.h b/validator/cpp/engine/validator.h
index d32a3ea8a4f8..0fe97adb2ae3 100644
--- a/validator/cpp/engine/validator.h
+++ b/validator/cpp/engine/validator.h
@@ -20,10 +20,11 @@
 //
 //   - See scripts/basic_validator_example.cc for a working example.
 
-#ifndef AMPVALIDATOR__VALIDATOR_H_
-#define AMPVALIDATOR__VALIDATOR_H_
+#ifndef CPP_ENGINE_VALIDATOR_H_
+#define CPP_ENGINE_VALIDATOR_H_
 
-#include "document.h"
+#include "cpp/htmlparser/css/parse-css.h"
+#include "cpp/htmlparser/document.h"
 #include "validator.pb.h"
 
 namespace amp::validator {
@@ -38,7 +39,8 @@ ValidationResult Validate(std::string_view html,
 
 int RulesSpecVersion();
 int ValidatorVersion();
+htmlparser::css::CssParsingConfig GenCssParsingConfig();
 
 }  // namespace amp::validator
 
-#endif  // AMPVALIDATOR__VALIDATOR_H_
+#endif  // CPP_ENGINE_VALIDATOR_H_
diff --git a/validator/cpp/engine/validator_test.cc b/validator/cpp/engine/validator_test.cc
index 9ea94a503a14..545f14abbe59 100644
--- a/validator/cpp/engine/validator_test.cc
+++ b/validator/cpp/engine/validator_test.cc
@@ -2,9 +2,10 @@
 #include <fstream>
 #include <memory>
 
-#include "glog/logging.h"
-#include "validator_pb.h"
+#include "cpp/engine/validator_pb.h"
 #include "gtest/gtest.h"
+#include "absl/container/flat_hash_map.h"
+#include "absl/container/flat_hash_set.h"
 #include "absl/status/status.h"
 #include "absl/strings/cord.h"
 #include "absl/strings/escaping.h"
@@ -13,10 +14,12 @@
 #include "absl/strings/str_join.h"
 #include "absl/strings/str_replace.h"
 #include "absl/strings/str_split.h"
-#include "testing-utils.h"
-#include "validator.h"
-#include "css/parse-css.pb.h"
+#include "cpp/engine/testing-utils.h"
+#include "cpp/engine/validator.h"
+#include "cpp/htmlparser/css/parse-css.pb.h"
+#include "cpp/htmlparser/logging.h"
 #include "validator.pb.h"
+#include "re2/re2.h"
 
 using absl::StartsWith;
 using absl::StrAppend;
@@ -36,10 +39,10 @@ using amp::validator::TagSpec;
 using amp::validator::ValidationError;
 using amp::validator::ValidationResult;
 using amp::validator::ValidatorRules;
-using amp::validator::testing::TestCase;
-using amp::validator::testing::TestCases;
 using amp::validator::testing::RenderInlineResult;
 using amp::validator::testing::RenderResult;
+using amp::validator::testing::TestCase;
+using amp::validator::testing::TestCases;
 
 namespace fs = std::filesystem;
 
@@ -478,8 +481,8 @@ TEST(ValidatorTest, TestCssLengthAmpEmail) {
         ":13:2 The author stylesheet specified in tag 'style amp-custom' "
         "is too long - document contains 75001 bytes whereas the "
         "limit is 75000 "
-        "bytes. (see https://amp.dev/documentation/guides-and-tutorials/learn/"
-        "spec/amphtml/#maximum-size)");
+        "bytes. (see https://amp.dev/documentation/guides-and-tutorials/email/"
+        "learn/spec/amphtml#maximum-size)");
     EXPECT_EQ(expected_output, output) << "test case " << test_case_name;
   }
 
@@ -524,7 +527,8 @@ TEST(ValidatorTest, TestCssLengthAmpEmail) {
         ":19:6 The author stylesheet specified in tag 'style amp-custom' "
         "and the combined inline styles is too large - document contains 75010 "
         "bytes whereas the limit is 75000 bytes. (see https://amp.dev/"
-        "documentation/guides-and-tutorials/learn/spec/amphtml/#maximum-size)");
+        "documentation/guides-and-tutorials/email/learn/spec/amphtml"
+        "#maximum-size)");
     EXPECT_EQ(expected_output, output) << "test case " << test_case_name;
   }
 
@@ -552,7 +556,8 @@ TEST(ValidatorTest, TestCssLengthAmpEmail) {
         ":7519:6 The author stylesheet specified in tag 'style amp-custom' "
         "and the combined inline styles is too large - document contains 75014 "
         "bytes whereas the limit is 75000 bytes. (see https://amp.dev/"
-        "documentation/guides-and-tutorials/learn/spec/amphtml/#maximum-size)");
+        "documentation/guides-and-tutorials/email/learn/spec/amphtml"
+        "#maximum-size)");
     EXPECT_EQ(expected_output, output) << "test case " << test_case_name;
   }
 
@@ -598,8 +603,8 @@ TEST(ValidatorTest, TestCssLengthAmpEmail) {
         test_case_name,
         ":17:2 The inline style specified in tag 'div' is too long - it "
         "contains 1001 bytes whereas the limit is 1000 bytes. (see "
-        "https://amp.dev/documentation/guides-and-tutorials/learn/spec/"
-        "amphtml/#maximum-size)");
+        "https://amp.dev/documentation/guides-and-tutorials/email/learn/spec/"
+        "amphtml#maximum-size)");
     EXPECT_EQ(expected_output, output) << "test case " << test_case_name;
   }
 }
@@ -646,8 +651,8 @@ TEST(ValidatorTest, TestCssLengthAmpEmailStrict) {
         ":13:2 The author stylesheet specified in tag 'style amp-custom' "
         "is too long - document contains 75001 bytes whereas the "
         "limit is 75000 "
-        "bytes. (see https://amp.dev/documentation/guides-and-tutorials/learn/"
-        "spec/amphtml/#maximum-size)");
+        "bytes. (see https://amp.dev/documentation/guides-and-tutorials/email/"
+        "learn/spec/amphtml#maximum-size)");
     EXPECT_EQ(expected_output, output) << "test case " << test_case_name;
   }
 
@@ -678,7 +683,8 @@ TEST(ValidatorTest, TestCssLengthAmpEmailStrict) {
         ":19:6 The author stylesheet specified in tag 'style amp-custom' "
         "and the combined inline styles is too large - document contains 75010 "
         "bytes whereas the limit is 75000 bytes. (see https://amp.dev/"
-        "documentation/guides-and-tutorials/learn/spec/amphtml/#maximum-size)");
+        "documentation/guides-and-tutorials/email/learn/spec/amphtml"
+        "#maximum-size)");
     EXPECT_EQ(expected_output, output) << "test case " << test_case_name;
   }
 
@@ -698,7 +704,8 @@ TEST(ValidatorTest, TestCssLengthAmpEmailStrict) {
         ":3769:6 The author stylesheet specified in tag 'style amp-custom' "
         "and the combined inline styles is too large - document contains 75014 "
         "bytes whereas the limit is 75000 bytes. (see https://amp.dev/"
-        "documentation/guides-and-tutorials/learn/spec/amphtml/#maximum-size)");
+        "documentation/guides-and-tutorials/email/learn/spec/amphtml"
+        "#maximum-size)");
     EXPECT_EQ(expected_output, output) << "test case " << test_case_name;
   }
 
@@ -727,12 +734,12 @@ TEST(ValidatorTest, TestCssLengthAmpEmailStrict) {
     std::string output = RenderResult(
         /*filename=*/test_case_name,
         amp::validator::Validate(test_html, HtmlFormat::AMP4EMAIL));
-    std::string expected_output =
-        StrCat("FAIL\n", test_case_name,
-               ":17:2 The inline style specified in tag 'div' is too long - it "
-               "contains 1001 bytes whereas the limit is 1000 bytes. (see "
-               "https://amp.dev/documentation/guides-and-tutorials/learn/spec/"
-               "amphtml/#maximum-size)");
+    std::string expected_output = StrCat(
+        "FAIL\n", test_case_name,
+        ":17:2 The inline style specified in tag 'div' is too long - it "
+        "contains 1001 bytes whereas the limit is 1000 bytes. (see "
+        "https://amp.dev/documentation/guides-and-tutorials/email/learn/spec/"
+        "amphtml#maximum-size)");
     EXPECT_EQ(expected_output, output) << "test case " << test_case_name;
   }
 }
@@ -1137,5 +1144,562 @@ TEST(ValidatorTest, InvalidHyphenCharacter) {
   EXPECT_EQ(ValidationResult::FAIL, result.status());
 }
 
+// Checks that `type_identifiers` contains no duplicate items, and checks that
+// every item of `type_identifiers` is in `valid_type_identifiers`.
+void TypeIdentifiersAreValidAndUnique(
+    const absl::flat_hash_set<std::string_view>& valid_type_identifiers,
+    const google::protobuf::RepeatedPtrField<std::string>& type_identifiers,
+    std::string_view field_name, std::string_view spec_type,
+    std::string_view spec_name) {
+  absl::flat_hash_set<std::string_view> encountered_type_identifiers;
+  for (const std::string& type_identifier : type_identifiers) {
+    EXPECT_TRUE(valid_type_identifiers.contains(type_identifier))
+        << spec_type << " '" << spec_name << "' has " << field_name
+        << " set to an invalid type identifier: '" << type_identifier << "'";
+    EXPECT_FALSE(encountered_type_identifiers.contains(type_identifier))
+        << spec_type << " '" << spec_name << "' has duplicate " << field_name
+        << ": '" << type_identifier << "'";
+    encountered_type_identifiers.insert(type_identifier);
+  }
+}
+
+// Helper for ValidatorRulesMakeSense.
+template <typename T>
+void TypeIdentifiersShouldMakeSense(const T& spec, std::string_view spec_type,
+                                    std::string_view spec_name) {
+  absl::flat_hash_set<std::string_view> valid_type_identifiers = {
+      "amp", "amp4ads", "amp4email", "transformed", "data-css-strict",
+  };
+  EXPECT_FALSE(spec.enabled_by_size() > 0 && spec.disabled_by_size() > 0)
+      << spec_type << " '" << spec_name
+      << "'  has both enabled_by and disabled_by set, but it must be one or "
+         "the other, not both.";
+  TypeIdentifiersAreValidAndUnique(valid_type_identifiers, spec.enabled_by(),
+                                   "enabled_by", spec_type, spec_name);
+  TypeIdentifiersAreValidAndUnique(valid_type_identifiers, spec.disabled_by(),
+                                   "disabled_by", spec_type, spec_name);
+}
+
+TEST(ValidatorTest, RulesMakeSense) {
+  ValidatorRules rules;
+  rules.ParseFromArray(amp::validator::data::kValidatorProtoBytes,
+                       amp::validator::data::kValidatorProtoBytesSize);
+  EXPECT_GE(rules.tags_size(), 0) << "tags not defined";
+  EXPECT_TRUE(rules.has_template_spec_url());
+
+  // For verifying that all ReferencePoint::tag_spec_names will resolve to a
+  // generated.TagSpec that's marked REFERENCE_POINT.
+  absl::flat_hash_set<std::string_view> all_reference_points;
+  for (const TagSpec& tag_spec : rules.tags()) {
+    all_reference_points.insert(tag_spec.spec_name());
+  }
+
+  absl::flat_hash_set<std::string> encountered_spec_name;
+  absl::flat_hash_set<int> encountered_name_id;
+  absl::flat_hash_set<std::string_view> encountered_tag_without_spec_name;
+  const RE2 tag_name_regex("(!DOCTYPE|O:P|[A-Z0-9-]+|\\$REFERENCE_POINT)");
+  const RE2 disallowed_ancestor_regex("[A-Z0-9-]+");
+
+  for (const TagSpec& tag_spec : rules.tags()) {
+    // Helper for message output, set a tagspec_name in this order:
+    // 1. tagSpec.specName, 2. tagSpec.tagName, 3. UNKNOWN_TAGSPEC.
+    std::string_view tag_spec_name;
+    if (tag_spec.has_spec_name()) {
+      tag_spec_name = tag_spec.spec_name();
+    } else if (tag_spec.has_tag_name()) {
+      tag_spec_name = tag_spec.tag_name();
+    } else {
+      tag_spec_name = "UNKNOWN_TAGSPEC";
+    }
+
+    EXPECT_GT(tag_spec.html_format_size(), 0)
+        << tag_spec_name << " must have at least one htmlFormat set";
+
+    auto html_format = tag_spec.html_format();
+    EXPECT_EQ(std::find(html_format.cbegin(), html_format.cend(),
+                        HtmlFormat::UNKNOWN_CODE),
+              html_format.cend())
+        << "tagSpec.htmlFormat should never contain UNKNOWN_CODE"
+        << ":\n" << tag_spec.DebugString();
+
+    EXPECT_TRUE(tag_spec.has_tag_name());
+    EXPECT_TRUE(RE2::PartialMatch(tag_spec.tag_name(), tag_name_regex));
+
+    // spec_name can't be empty and must be unique.
+    if (tag_spec.has_spec_name()) {
+      const std::string spec_name = tag_spec.spec_name();
+      EXPECT_FALSE(encountered_spec_name.contains(spec_name));
+      encountered_spec_name.insert(spec_name);
+    } else if (tag_spec.has_extension_spec()) {
+      const std::string spec_name = tag_spec.extension_spec().name() + ' ' +
+                                    tag_spec.extension_spec().version_name() +
+                                    " extension script";
+      EXPECT_FALSE(encountered_spec_name.contains(spec_name));
+      encountered_spec_name.insert(spec_name);
+    } else {
+      const std::string_view tag_name = tag_spec.tag_name();
+      EXPECT_FALSE(encountered_tag_without_spec_name.contains(tag_name));
+      encountered_tag_without_spec_name.insert(tag_name);
+    }
+
+    if (tag_spec.tag_name() == "$REFERENCE_POINT") {
+      EXPECT_TRUE(tag_spec.has_descriptive_name())
+          << tag_spec_name
+          << " needs a descriptive_name because it is a reference point";
+    }
+    if (tag_spec.enabled_by_size() > 0 || tag_spec.disabled_by_size() > 0) {
+      TypeIdentifiersShouldMakeSense(tag_spec, "tag_spec", tag_spec_name);
+    }
+    if (tag_spec.has_named_id() &&
+        tag_spec.named_id() != TagSpec_NamedId_NOT_SET) {
+      EXPECT_FALSE(encountered_name_id.contains(tag_spec.named_id()));
+      encountered_name_id.insert(tag_spec.named_id());
+    }
+    // Verify AMP4ADS extensions are approved.
+    if (absl::StartsWith(tag_spec.tag_name(), "SCRIPT") &&
+        tag_spec.has_extension_spec() &&
+        absl::c_linear_search(tag_spec.html_format(),
+                              HtmlFormat_Code_AMP4ADS)) {
+      // AMP4ADS format lists approved extensions.
+      // https://github.com/ampproject/amphtml/blob/main/extensions/amp-a4a/amp-a4a-format.md#amp-extensions-and-builtins
+      // Changes to the following map must be approved by the Ads Working
+      // Group, @wg-monetization.
+      const absl::flat_hash_map<absl::string_view,
+                                absl::flat_hash_set<absl::string_view>>
+          approved_amp4ads_extensions = {
+              {"amp-accordion", {"0.1", "latest"}},
+              {"amp-ad-exit", {"0.1", "latest"}},
+              {"amp-analytics", {"0.1", "latest"}},
+              {"amp-anim", {"0.1", "latest"}},
+              {"amp-animation", {"0.1", "latest"}},
+              {"amp-audio", {"0.1", "latest"}},
+              {"amp-bind", {"0.1", "latest"}},
+              {"amp-carousel", {"0.1", "0.2", "latest"}},
+              {"amp-fit-text", {"0.1", "latest"}},
+              {"amp-font", {"0.1", "latest"}},
+              {"amp-form", {"0.1", "latest"}},
+              {"amp-gwd-animation", {"0.1", "latest"}},
+              {"amp-img", {"0.1", "latest"}},
+              {"amp-layout", {"0.1", "latest"}},
+              {"amp-lightbox", {"0.1", "latest"}},
+              {"amp-mraid", {"0.1", "latest"}},
+              {"amp-mustache", {"0.1", "0.2", "latest"}},
+              {"amp-pixel", {"0.1", "latest"}},
+              {"amp-position-observer", {"0.1", "latest"}},
+              {"amp-selector", {"0.1", "latest"}},
+              {"amp-social-share", {"0.1", "latest"}},
+              {"amp-video", {"0.1", "latest"}},
+          };
+      const absl::string_view extension_name = tag_spec.extension_spec().name();
+      ASSERT_TRUE(approved_amp4ads_extensions.contains(extension_name))
+          << extension_name
+          << " has html_format either explicitly or implicitly"
+          << " set for AMP4ADS but " << extension_name << " is not approved"
+          << " for AMP4ADS";
+      const absl::flat_hash_set<absl::string_view>& approved_versions =
+          approved_amp4ads_extensions.at(extension_name);
+      for (const std::string& version : tag_spec.extension_spec().version()) {
+        EXPECT_TRUE(approved_versions.contains(version))
+            << extension_name
+            << " has html_format either explicitly or implicitly set"
+               " for AMP4ADS but "
+            << extension_name << " version " << version
+            << " is not approved for AMP4ADS. If this version is intended"
+               " for AMP4ADS please get approval from @wg-monetization and then"
+               " update this test. Otherwise remove the version for"
+               " AMP4ADS from the tagspec";
+      }
+    }
+    // Verify AMP4EMAIL extensions and their usage are approved.
+    if (absl::StartsWith(tag_spec.tag_name(), "AMP-") &&
+        absl::c_linear_search(tag_spec.html_format(),
+                              HtmlFormat_Code::HtmlFormat_Code_AMP4EMAIL)) {
+      // AMP4EMAIL format lists approved extensions.
+      // Changes to the following map must be approved by the AMP4Email
+      // Working Group, @wg-amp4email.
+      const absl::flat_hash_map<absl::string_view,
+                                absl::flat_hash_set<absl::string_view>>
+          approved_amp4email_extensions = {
+              {"AMP-ACCORDION", {"0.1"}}, {"AMP-AUTOCOMPLETE", {"0.1"}},
+              {"AMP-ANIM", {"0.1"}},      {"AMP-BIND-MACRO", {"0.1"}},
+              {"AMP-CAROUSEL", {"0.1"}},  {"AMP-FIT-TEXT", {"0.1"}},
+              {"AMP-IMG", {"0.1"}},       {"AMP-IMAGE-LIGHTBOX", {"0.1"}},
+              {"AMP-LAYOUT", {"0.1"}},    {"AMP-LIGHTBOX", {"0.1"}},
+              {"AMP-LIST", {"0.1"}},      {"AMP-SELECTOR", {"0.1"}},
+              {"AMP-SIDEBAR", {"0.1"}},   {"AMP-STATE", {"0.1"}},
+              {"AMP-TIMEAGO", {"0.1"}},
+          };
+      ASSERT_TRUE(approved_amp4email_extensions.contains(tag_spec.tag_name()))
+          << tag_spec.tag_name()
+          << " has html_format either explicitly or implicitly"
+             " set for AMP4EMAIL but "
+          << tag_spec.tag_name() << " is not approved for AMP4EMAIL";
+      const absl::flat_hash_set<absl::string_view>& approved_versions =
+          approved_amp4email_extensions.at(tag_spec.tag_name());
+      // Extension is approved. Verify extension version is approved.
+      // Only care about SCRIPT tags since only those are versioned.
+      if (absl::StartsWith(tag_spec.tag_name(), "SCRIPT") &&
+          tag_spec.has_extension_spec()) {
+        const absl::string_view extension_name =
+            tag_spec.extension_spec().name();
+        for (const std::string& version : tag_spec.extension_spec().version()) {
+          EXPECT_TRUE(approved_versions.contains(version))
+              << extension_name
+              << " has html_format either explicitly or implicitly"
+                 " set for AMP4EMAIL but "
+              << extension_name << " version " << version
+              << " is not approved for AMP4EMAIL. If this version is "
+                 "intended"
+                 " for AMP4EMAIL please get approval from @wg-amp4email and"
+                 " then update this test. Otherwise remove the version for"
+                 " AMP4EMAIL from the tagspec";
+        }
+      }
+    }
+
+    for (const std::string& disallowed_ancestor :
+         tag_spec.disallowed_ancestor()) {
+      EXPECT_TRUE(
+          RE2::PartialMatch(disallowed_ancestor, disallowed_ancestor_regex))
+          << "disallowed_ancestor defined and not equal to mandatory parent";
+      if (tag_spec.has_mandatory_parent()) {
+        EXPECT_NE(disallowed_ancestor, tag_spec.mandatory_parent())
+            << "Can't disallow an ancestor and require the same parent";
+      }
+    }
+
+    EXPECT_FALSE(tag_spec.unique() && tag_spec.unique_warning())
+        << "unique and unique_warning can not be defined at the same time";
+
+    if (tag_spec.explicit_attrs_only()) {
+      EXPECT_FALSE(tag_spec.has_amp_layout())
+          << "'" << tag_spec_name
+          << "' has explicit_attrs_only set to true and must not have any "
+             "amp_layouts";
+    }
+
+    // attr_specs within tag.
+    absl::flat_hash_set<std::string_view> encountered_attr_name;
+    for (const AttrSpec& attr_spec : tag_spec.attrs()) {
+      const std::string_view attr_name = attr_spec.name();
+      EXPECT_FALSE(encountered_attr_name.contains(attr_name))
+          << "attr_name within tag_spec '" << tag_spec_name
+          << "' should be unique";
+      encountered_attr_name.insert(attr_name);
+
+      // Transformed AMP does not allow `nonce` attributes, so it must have
+      // disabled_by: "transformed" on the attrSpec or the tagSpec. Since this
+      // attribute does not have an attrSpec then it must be on the tagSpec.
+      // Verify that it is set on the tagSpec.
+      if (attr_name == "nonce" &&
+          absl::c_linear_search(tag_spec.html_format(),
+                                HtmlFormat_Code::HtmlFormat_Code_AMP)) {
+        EXPECT_TRUE(
+            absl::c_linear_search(tag_spec.disabled_by(), "transformed"))
+            << tag_spec_name
+            << R"( nonce attributes must have `disabled_by: "transformed"`)";
+      }
+      if (attr_spec.enabled_by_size() > 0 || attr_spec.disabled_by_size() > 0) {
+        TypeIdentifiersShouldMakeSense(attr_spec, "attr_spec",
+                                       attr_spec.name());
+      }
+
+      // Special check that every <script> tag with a src attribute has a
+      // allowlist check on the attribute value.
+      if (tag_spec.tag_name() == "SCRIPT" && attr_spec.name() == "src") {
+        EXPECT_TRUE(attr_spec.value_size() > 0 || attr_spec.has_value_regex())
+            << tag_spec.tag_name()
+            << " <script> tag with a src attribute need an allowlist check";
+      }
+
+      if (tag_spec.has_extension_spec()) {
+        const ExtensionSpec& extension_spec = tag_spec.extension_spec();
+        const RE2 version_regexp("^(latest|[0-9]+[.][0-9]+)$");
+        EXPECT_TRUE(extension_spec.has_name())
+            << "extension must have a name field value";
+        // AMP4EMAIL extensions must support at least one version.
+        if (absl::c_linear_search(tag_spec.html_format(),
+                                  HtmlFormat_Code::HtmlFormat_Code_AMP4EMAIL)) {
+          EXPECT_GT(extension_spec.version_size(), 0)
+              << "extension " << extension_spec.name()
+              << " must have at least one version";
+        }
+        for (const std::string& version_string : extension_spec.version()) {
+          EXPECT_TRUE(RE2::PartialMatch(version_string, version_regexp))
+              << "extension " << extension_spec.name()
+              << " versions must be 'latest' or a numeric value";
+        }
+        for (const std::string& version_string :
+             extension_spec.deprecated_version()) {
+          EXPECT_TRUE(RE2::PartialMatch(version_string, version_regexp))
+              << "extension " << extension_spec.name()
+              << " versions must be 'latest' or a numeric value";
+          EXPECT_TRUE(
+              absl::c_linear_search(extension_spec.version(), version_string))
+              << "extension " << extension_spec.name()
+              << " deprecated_version must be a subset of version";
+        }
+        ASSERT_EQ(tag_spec.attr_lists_size(), 1);
+        EXPECT_EQ(tag_spec.attr_lists(0), "common-extension-attrs");
+      }
+      if (tag_spec.has_cdata()) {
+        bool useful_cdata_spec = false;
+        EXPECT_GE(tag_spec.cdata().max_bytes(), -2);
+        if (tag_spec.cdata().max_bytes() == -1) {
+          useful_cdata_spec = true;
+        }
+        if (tag_spec.cdata().max_bytes() >= 0) {
+          useful_cdata_spec = true;
+          EXPECT_TRUE(tag_spec.cdata().has_max_bytes_spec_url())
+              << "max_bytes >= 0 must have max_bytes_spec_url defined";
+        }
+        for (const DisallowedCDataRegex& disallowed_cdata_regex :
+             tag_spec.cdata().disallowed_cdata_regex()) {
+          useful_cdata_spec = true;
+          EXPECT_TRUE(disallowed_cdata_regex.has_regex());
+          EXPECT_TRUE(RE2(disallowed_cdata_regex.regex()).ok())
+              << "disallowed_cdata_regex is not a valid regex";
+          EXPECT_TRUE(disallowed_cdata_regex.has_error_message());
+        }
+
+        if (tag_spec.cdata().has_css_spec()) {
+          useful_cdata_spec = true;
+          absl::flat_hash_set<std::string_view> encountered_at_rule_spec_name;
+          const RE2 at_rule_spec_regex("[a-z-_]*");
+          const std::unordered_map<std::string,
+                                   htmlparser::css::BlockType::Code>
+              parsing_spec = GenCssParsingConfig().at_rule_spec;
+          for (const AtRuleSpec& at_rule_spec :
+               tag_spec.cdata().css_spec().at_rule_spec()) {
+            EXPECT_TRUE(RE2::FullMatch(at_rule_spec.name(), at_rule_spec_regex))
+                << "at_rule_spec must be lower case alphabetic";
+            EXPECT_NE(parsing_spec.find(at_rule_spec.name()),
+                      parsing_spec.cend())
+                << "at_rule_spec must have matching css parsing spec. You "
+                   "probably need to update the mapping in GenCssParsingConfig "
+                   "to add support for your new at rule";
+            if (at_rule_spec.has_media_query_spec()) {
+              EXPECT_EQ(at_rule_spec.name(), "media")
+                  << "only media atrule contains mediaQuerySpec";
+            }
+            EXPECT_FALSE(
+                encountered_at_rule_spec_name.contains(at_rule_spec.name()));
+            encountered_at_rule_spec_name.insert(at_rule_spec.name());
+          }
+        }
+        if (tag_spec.tag_name() == "SCRIPT" || tag_spec.tag_name() == "STYLE") {
+          EXPECT_TRUE(tag_spec.cdata().disallowed_cdata_regex_size() > 0 ||
+                      tag_spec.cdata().has_cdata_regex() ||
+                      tag_spec.cdata().has_mandatory_cdata() ||
+                      tag_spec.cdata().max_bytes() == -1 ||
+                      tag_spec.cdata().has_whitespace_only() ||
+                      tag_spec.cdata().css_spec().validate_keyframes())
+              << "script and style tags must have cdata rules";
+        }
+        // We want to be certain not to allow SCRIPT tagspecs which don't either
+        // define a src attribute OR define a JSON, OCTET-STREAM, or TEXT/PLAIN
+        // type. Note that OCTET-STREAM scripts can only be used during SwG
+        // Encryption (go/swg-encryption).
+        if (tag_spec.tag_name() == "SCRIPT") {
+          bool has_src = false;
+          bool has_json = false;
+          bool has_text_plain = false;
+          bool has_octet_stream = false;
+          bool has_ciphertext = false;
+          bool has_amp_onerror = false;
+          bool has_amp_story_dvh_polyfill = false;
+          for (const AttrSpec& attr_spec : tag_spec.attrs()) {
+            if (attr_spec.name() == "src") {
+              has_src = true;
+            }
+            if (attr_spec.name() == "ciphertext") {
+              has_ciphertext = true;
+            }
+            if (attr_spec.name() == "type" &&
+                attr_spec.value_casei_size() > 0) {
+              for (const std::string& value : attr_spec.value_casei()) {
+                if (value == "application/ld+json" ||
+                    value == "application/json") {
+                  has_json = true;
+                }
+                if (value == "application/octet-stream") {
+                  has_octet_stream = true;
+                }
+                if (value == "text/plain") {
+                  has_text_plain = true;
+                }
+              }
+            }
+            if (attr_spec.name() == "amp-onerror") {
+              has_amp_onerror = true;
+            }
+            if (attr_spec.name() == "amp-story-dvh-polyfill") {
+              has_amp_story_dvh_polyfill = true;
+            }
+          }
+          EXPECT_TRUE(has_src || has_json || has_text_plain ||
+                      (has_octet_stream && has_ciphertext) || has_amp_onerror ||
+                      has_amp_story_dvh_polyfill)
+              << "script tags must have either a src attribute or type json, "
+                 "octet-stream (during SwG encryption), or text/plain";
+        }
+        if (tag_spec.cdata().has_cdata_regex() ||
+            tag_spec.cdata().has_mandatory_cdata() ||
+            tag_spec.cdata().has_whitespace_only()) {
+          useful_cdata_spec = true;
+        }
+        EXPECT_TRUE(useful_cdata_spec) << "Tag spec '" << tag_spec_name
+                                       << "' must define a useful cdata spec";
+        EXPECT_TRUE(RE2(tag_spec.cdata().cdata_regex()).ok());
+        for (const ReferencePoint& reference_point :
+             tag_spec.reference_points()) {
+          EXPECT_TRUE(
+              all_reference_points.contains(reference_point.tag_spec_name()))
+              << "reference_point '" << reference_point.tag_spec_name()
+              << "' is not defined";
+        }
+      }
+    }
+
+    for (const auto& attr_spec : tag_spec.attrs()) {
+      EXPECT_TRUE(attr_spec.has_name()) << attr_spec.DebugString();
+      // Attribute Spec names are matched against lowercased attributes,
+      // so the rules *must* also be lower case or non-cased.
+      EXPECT_TRUE(RE2::FullMatch(attr_spec.name(), RE2("[^A-Z]+")))
+          << attr_spec.DebugString();
+      EXPECT_NE(attr_spec.name(), "[style]") << attr_spec.DebugString();
+      if (attr_spec.has_value_url()) {
+        for (const std::string& protocol : attr_spec.value_url().protocol()) {
+          // UrlSpec protocol is matched against lowercased protocol names,
+          // so the rules *must* also be lower case.
+          EXPECT_TRUE(RE2::FullMatch(protocol, RE2("[a-z+-]+"))) << protocol;
+        }
+        if (!absl::StartsWith(attr_spec.name(), "data-") &&
+            !absl::c_linear_search(
+                tag_spec.html_format(),
+                HtmlFormat_Code::HtmlFormat_Code_AMP4EMAIL)) {
+          for (const std::string& protocol : attr_spec.value_url().protocol()) {
+            if (protocol == "http" &&
+                attr_spec.value_url().has_allow_relative()) {
+              EXPECT_TRUE(attr_spec.value_url().allow_relative())
+                  << attr_spec.value_url().DebugString();
+            }
+          }
+        }
+      }
+      if (attr_spec.has_value_regex()) {
+        EXPECT_TRUE(RE2(attr_spec.value_regex()).ok())
+            << attr_spec.DebugString();
+      }
+      if (attr_spec.has_value_regex_casei()) {
+        EXPECT_TRUE(RE2(attr_spec.value_regex_casei()).ok())
+            << attr_spec.DebugString();
+      }
+      if (attr_spec.has_disallowed_value_regex()) {
+        EXPECT_TRUE(RE2(attr_spec.disallowed_value_regex()).ok())
+            << attr_spec.DebugString();
+      }
+      if (attr_spec.has_value_url()) {
+        EXPECT_GT(attr_spec.value_url().protocol().size(), 0)
+            << "value_url must have at least one protocol\n"
+            << attr_spec.DebugString();
+      }
+      int num_values = 0;
+      if (!attr_spec.value().empty()) {
+        num_values += 1;
+      }
+      if (!attr_spec.value_casei().empty()) {
+        num_values += 1;
+      }
+      if (attr_spec.has_value_regex()) {
+        num_values += 1;
+      }
+      if (attr_spec.has_value_regex_casei()) {
+        num_values += 1;
+      }
+      if (attr_spec.has_value_url()) {
+        num_values += 1;
+      }
+      if (attr_spec.has_value_properties()) {
+        num_values += 1;
+      }
+      EXPECT_LT(num_values, 2) << "attr_spec should only have one value set";
+      if (attr_spec.name() == "id" && num_values == 0) {
+        EXPECT_TRUE(attr_spec.has_disallowed_value_regex())
+            << "'id' attribute must have 'disallowed_value_regex' set\n"
+            << attr_spec.DebugString();
+      }
+      if (attr_spec.name() == "name" && num_values == 0) {
+        EXPECT_TRUE(attr_spec.has_disallowed_value_regex())
+            << "'name' attribute must have 'disallowed_value_regex' set\n"
+            << attr_spec.DebugString();
+      }
+      if (attr_spec.has_deprecation()) {
+        EXPECT_TRUE(attr_spec.has_deprecation_url());
+      }
+      if (attr_spec.has_deprecation_url()) {
+        EXPECT_TRUE(attr_spec.has_deprecation());
+      }
+      if (attr_spec.has_dispatch_key()) {
+        EXPECT_TRUE(attr_spec.mandatory() || attr_spec.has_mandatory_oneof());
+      }
+      if (attr_spec.has_value_properties()) {
+        absl::flat_hash_set<std::string_view> encountered_property_spec_names;
+        for (const PropertySpec& property_spec :
+             attr_spec.value_properties().properties()) {
+          EXPECT_FALSE(
+              encountered_property_spec_names.contains(property_spec.name()))
+              << "value_properties within attr_spec '" << attr_spec.name()
+              << "' should be unique";
+          encountered_property_spec_names.insert(property_spec.name());
+        }
+      }
+      // Transformed AMP does not allow `nonce` attributes, so it must have
+      // disabled_by: "transformed".
+      if (attr_spec.name() == "nonce" &&
+          absl::c_linear_search(tag_spec.html_format(), HtmlFormat_Code_AMP)) {
+        EXPECT_TRUE(
+            absl::c_linear_search(attr_spec.disabled_by(), "transformed"));
+      }
+    }
+  }
+
+  // satisfies needs to match up with requires and excludes
+  absl::flat_hash_set<std::string> all_satisfies;
+  absl::flat_hash_set<std::string> all_requires_and_excludes;
+  for (const TagSpec& tag_spec : rules.tags()) {
+    all_satisfies.insert(tag_spec.satisfies_condition().cbegin(),
+                         tag_spec.satisfies_condition().cend());
+    all_requires_and_excludes.insert(tag_spec.requires_condition().cbegin(),
+                                     tag_spec.requires_condition().cend());
+    all_requires_and_excludes.insert(tag_spec.excludes_condition().cbegin(),
+                                     tag_spec.excludes_condition().cend());
+  }
+  for (const std::string& satisfy : all_satisfies) {
+    EXPECT_TRUE(all_requires_and_excludes.contains(satisfy)) << satisfy;
+  }
+  for (const std::string& require_or_exclude : all_requires_and_excludes) {
+    EXPECT_TRUE(all_satisfies.contains(require_or_exclude))
+        << require_or_exclude;
+  }
+
+  absl::flat_hash_set<ValidationError_Code> encountered_error_specificity_code;
+  for (const ErrorSpecificity& error_specificity : rules.error_specificity()) {
+    EXPECT_FALSE(
+        encountered_error_specificity_code.contains(error_specificity.code()))
+        << "Error specificity code should be unique "
+        << error_specificity.code();
+    encountered_error_specificity_code.insert(error_specificity.code());
+  }
+
+  absl::flat_hash_set<ValidationError_Code> encountered_error_format_code;
+  for (const ErrorFormat& error_format : rules.error_formats()) {
+    EXPECT_FALSE(
+        encountered_error_format_code.contains(error_format.code()))
+        << "Error format code should be unique " << error_format.code();
+    encountered_error_format_code.insert(error_format.code());
+  }
+}
+
 }  // namespace
 }  // namespace amp::validator
diff --git a/validator/cpp/engine/wasm/BUILD b/validator/cpp/engine/wasm/BUILD
new file mode 100644
index 000000000000..4253cb6e5a2d
--- /dev/null
+++ b/validator/cpp/engine/wasm/BUILD
@@ -0,0 +1,74 @@
+# Wraps AMP Validator into a WebAssembly library,
+# which can be used by javascript files.
+
+load("@emsdk//emscripten_toolchain:wasm_rules.bzl", "wasm_cc_binary")
+load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_binary", "closure_js_library")
+
+licenses(["notice"])
+
+cc_library(
+    name = "validator_inner_wrapper",
+    srcs = ["validator_inner_wrapper.cc"],
+    hdrs = ["validator_inner_wrapper.h"],
+    copts = ["-std=c++17"],
+    deps = [
+        "//cpp/engine:error-formatter",
+        "//cpp/engine:testing-utils",
+        "//cpp/engine:validator",
+        "@com_google_absl//absl/strings",
+        "//:validator_cc_proto",
+    ],
+)
+
+EMCC_SETTINGS = [
+    "--bind",
+    "--no-entry",
+    "-g3",
+    "-s DYNAMIC_EXECUTION=0",
+    "-s EXPORT_NAME=loadValidatorWasm",
+    "-s FILESYSTEM=0",
+    "-s INITIAL_MEMORY=33554432",
+    "-s MODULARIZE=1",
+    "-s SINGLE_FILE=1",
+    "-s USE_PTHREADS=0",
+]
+
+cc_binary(
+    name = "validator_outer_wrapper_wasm",
+    srcs = ["validator_outer_wrapper.cc"],
+    copts = ["-std=c++17"],
+    linkopts = EMCC_SETTINGS,
+    deps = [
+        ":validator_inner_wrapper",
+    ],
+)
+
+wasm_cc_binary(
+    name = "validator_emcc_wasm",
+    cc_target = ":validator_outer_wrapper_wasm",
+)
+
+closure_js_library(
+    name = "validator_js_lib",
+    srcs = [
+        "validator.js",
+        "validator_emcc_wasm/validator_outer_wrapper_wasm.js",
+    ],
+    deps = [
+        "//:validator_closure_proto",
+        "@com_google_javascript_closure_library//closure/goog/asserts",
+        "@com_google_javascript_closure_library//closure/goog/crypt:base64",
+        "@com_google_javascript_closure_library//closure/goog/uri:utils",
+    ],
+)
+
+closure_js_binary(
+    name = "validator_js_bin",
+    compilation_level = "WHITESPACE_ONLY",
+    formatting = "PRETTY_PRINT",
+    language = "ECMASCRIPT_2019",
+    output_wrapper = "CLOSURE_NO_DEPS = true; %output%",
+    deps = [
+        ":validator_js_lib",
+    ],
+)
diff --git a/validator/cpp/engine/wasm/validator.js b/validator/cpp/engine/wasm/validator.js
new file mode 100644
index 000000000000..5014482505fa
--- /dev/null
+++ b/validator/cpp/engine/wasm/validator.js
@@ -0,0 +1,245 @@
+goog.require('goog.asserts');
+goog.require('goog.crypt.base64');
+goog.require('goog.uri.utils');
+goog.require('proto.amp.validator.ValidationError');
+goog.require('proto.amp.validator.ValidationResult');
+const {
+  ValidationError,
+  ValidationResult,
+} = proto.amp.validator;
+const {
+  asserts,
+  crypt: {
+    base64,
+  },
+  uri: {
+    utils: uriUtils,
+  },
+} = goog;
+
+let wasmModule;
+
+/**
+ * Initialize WebAssembly module. This function must be called before all other
+ * functions.
+ *
+ * @async
+ */
+async function init() {
+  if (!wasmModule) {
+    wasmModule = await loadValidatorWasm();
+  }
+}
+
+/**
+ * An object holding both number-to-string mapping and string-to-number mapping
+ * of a protocol buffer enum.
+ */
+class ProtobufEnum {
+  /**
+   * @param {Object!} jspbObject Enum generated by go/jspb. This is a JavaScript
+   * plain object containing a string-to-number mapping of the enum.
+   */
+  constructor(jspbObject) {
+    const entries = Object.entries(jspbObject);
+    this.numberByName = new Map(entries);
+    this.nameByNumber =
+        new Map(entries.map(([name, number]) => [number, name]));
+  }
+}
+
+const CODE = new ProtobufEnum(ValidationError.Code);
+const SEVERITY = new ProtobufEnum(ValidationError.Severity);
+const STATUS = new ProtobufEnum(ValidationResult.Status);
+
+/**
+ * Transforms the fields in a ValidationError from number to string
+ * @param {Object!} error a ValidationError whose values are numeric
+ * @return {Object!}
+ */
+function stringifyValidationErrorFields(error) {
+  return {
+    ...error,
+    params: error.paramsList,
+    severity: SEVERITY.nameByNumber.get(error.severity),
+    code: CODE.nameByNumber.get(error.code),
+  };
+}
+
+/**
+ * Creates a ValidationError by transforming the fields from string to number
+ * @param {Object!} error an object whose strusture is the same as
+ *   ValidationError, except that the fields are strings.
+ * @return {Object!} a ValidationError
+ */
+function digitizeValidationErrorFields(error) {
+  return {
+    ...error,
+    severity: SEVERITY.numberByName.get(error.severity),
+    code: CODE.numberByName.get(error.code),
+  };
+}
+
+/**
+ * When transforming validation errors and validation results from jspb to plain
+ * objects, the protobuf base64 string is also attached to the output.
+ * Hence when a plain object neeeds to be transformed back to protobuf,
+ * the attached base64 could be directly used.
+ */
+const PB_BASE64 = '_PB_BASE64';
+
+/**
+ * Validates a document input as a string.
+ *
+ * @param {string} input
+ * @param {string=} opt_htmlFormat the allowed format; defaults to 'AMP'.
+ * @return {Object!} Validation Result (status and errors)
+ */
+function validateString(input, opt_htmlFormat) {
+  let htmlFormat = 'AMP';
+  if (opt_htmlFormat) {
+    htmlFormat = opt_htmlFormat.toUpperCase();
+  }
+  asserts.assertExists(wasmModule, `WebAssembly is uninitialized`);
+  const resultBase64 =
+      wasmModule.validateString(input, htmlFormat, /*maxErrors=*/ -1);
+  const resultJspb = ValidationResult.deserializeBinary(resultBase64);
+  const resultObject = resultJspb.toObject();
+  resultObject.errors = resultJspb.getErrorsList().map((errorJspb) => {
+    const errorObject = stringifyValidationErrorFields(errorJspb.toObject());
+    errorObject[PB_BASE64] =
+        base64.encodeByteArray(errorJspb.serializeBinary());
+    return errorObject;
+  });
+  resultObject.status = STATUS.nameByNumber.get(resultObject.status);
+  resultObject[PB_BASE64] = resultBase64;
+  return resultObject;
+}
+
+/**
+ * Renders the error message for a single error.
+ *
+ * @param {!Object} error
+ * @return {string}
+ */
+function renderErrorMessage(error) {
+  asserts.assertExists(wasmModule, `WebAssembly is uninitialized`);
+  return wasmModule.renderErrorMessage(error[PB_BASE64]);
+}
+
+/**
+ * @param {!Object} validationResult
+ * @param {string} filename to use in rendering error messages.
+ * @param {string} inputContents
+ * @return {string}
+ */
+function renderInlineResult(validationResult, filename, inputContents) {
+  asserts.assertExists(wasmModule, `WebAssembly is uninitialized`);
+  return wasmModule.renderInlineResult(
+      validationResult[PB_BASE64],
+      filename,
+      inputContents,
+  );
+}
+
+/**
+ * Checks if the given URL is an AMP cache URL
+ * @param {string} url
+ * @return {boolean}
+ */
+function isAmpCacheUrl(url) {
+  return uriUtils.getDomain(url) === 'cdn.ampproject.org';
+}
+
+/**
+ * Renders one line of error output.
+ * @param {string} filenameOrUrl
+ * @param {!Object} error
+ * @return {string}
+ */
+function errorLine(filenameOrUrl, error) {
+  const line = error.line ?? 1;
+  const col = error.col ?? 0;
+  let errorLine = `${uriUtils.removeFragment(filenameOrUrl)}:${line}:${col} ${
+      renderErrorMessage(error)}`;
+  if (error.specUrl) {
+    errorLine += ` (see ${error.specUrl})`;
+  }
+  return errorLine;
+}
+
+/**
+ * Log validation result to the console, distinguishing warnings and errors.
+ * @param {!Object} validationResult
+ * @param {string} url
+ */
+function logValidationResult(validationResult, url) {
+  const {
+    status,
+    errors,
+  } = validationResult;
+  if (status === STATUS.nameByNumber.get(ValidationResult.Status.PASS)) {
+    console.info('AMP validation successful.');
+    console.info(
+        `Review our 'publishing checklist' to ensure successful AMP document` +
+        `distribution. See https://go.amp.dev/publishing-checklist`);
+    if (errors.length === 0) {
+      return;
+    }
+  } else if (status !== STATUS.nameByNumber.get(ValidationResult.Status.FAIL)) {
+    console.error(
+        'AMP validation had unknown results. This indicates a validator ' +
+        'bug. Please report at https://github.com/ampproject/amphtml/issues .');
+  }
+  if (status === STATUS.nameByNumber.get(ValidationResult.Status.FAIL)) {
+    console.error('AMP validation had errors:');
+  } else {
+    console.error('AMP validation had warnings:');
+  }
+  for (const error of errors) {
+    if (error.severity ===
+        SEVERITY.nameByNumber.get(ValidationError.Severity.ERROR)) {
+      console.error(errorLine(url, error));
+    } else {
+      console.warn(errorLine(url, error));
+    }
+  }
+  if (errors.length !== 0) {
+    console.info(`See also https://validator.amp.dev/?experimental_wasm=1#url=${
+        encodeURIComponent(uriUtils.removeFragment(url))}`);
+  }
+}
+
+/**
+ * Validates a URL input, and logs the result to console.
+ * @param {string} url
+ * @async
+ */
+async function validateUrlAndLog(url) {
+  asserts.assert(
+      isAmpCacheUrl(url) === false,
+      'Attempting to validate an AMP cache URL.' +
+          'Please use #development=1 on the origin URL instead.');
+  const [
+    response,
+  ] = await Promise.all([
+    fetch(url),
+    init(),
+  ]);
+  asserts.assert(response.status === 200, `Failed to fetch ${url}`);
+  const html = await response.text();
+  let format = 'AMP';
+  uriUtils.parseQueryData(uriUtils.getFragment(url), (key, value) => {
+    if (key === 'development') {
+      format = value === '1' ? 'AMP' : value;
+    }
+  });
+  const validationResult = validateString(html, format);
+  logValidationResult(validationResult, url);
+}
+
+goog.exportSymbol('amp.validator.init', init);
+goog.exportSymbol('amp.validator.renderErrorMessage', renderErrorMessage);
+goog.exportSymbol('amp.validator.renderInlineResult', renderInlineResult);
+goog.exportSymbol('amp.validator.validateString', validateString);
+goog.exportSymbol('amp.validator.validateUrlAndLog', validateUrlAndLog);
diff --git a/validator/cpp/engine/wasm/validator_inner_wrapper.cc b/validator/cpp/engine/wasm/validator_inner_wrapper.cc
new file mode 100644
index 000000000000..f1f6a7b3a946
--- /dev/null
+++ b/validator/cpp/engine/wasm/validator_inner_wrapper.cc
@@ -0,0 +1,41 @@
+#include "cpp/engine/wasm/validator_inner_wrapper.h"
+
+#include <string_view>
+
+#include "absl/strings/escaping.h"
+#include "cpp/engine/error-formatter.h"
+#include "cpp/engine/testing-utils.h"
+#include "cpp/engine/validator.h"
+#include "validator.pb.h"
+
+namespace amp::validator {
+
+std::string ValidateString(std::string html, std::string html_format_name,
+                           int max_errors) {
+  HtmlFormat::Code html_format_code;
+  HtmlFormat::Code_Parse(html_format_name, &html_format_code);
+  auto validation_result =
+      Validate(std::string_view(html), html_format_code, max_errors);
+  return absl::Base64Escape(validation_result.SerializeAsString());
+}
+
+std::string RenderErrorMessage(std::string error_base64) {
+  std::string error_binary;
+  absl::Base64Unescape(error_base64, &error_binary);
+  ValidationError error;
+  error.ParseFromString(error_binary);
+  return ErrorFormatter::FormattedMessageFor(error);
+}
+
+std::string RenderInlineResult(std::string validation_result_base64,
+                               std::string filename,
+                               std::string input_contents) {
+  std::string validation_result_binary;
+  absl::Base64Unescape(validation_result_base64, &validation_result_binary);
+  ValidationResult validation_result;
+  validation_result.ParseFromString(validation_result_binary);
+  return testing::RenderInlineResult(filename, input_contents,
+                                     validation_result);
+}
+
+}  // namespace amp::validator
diff --git a/validator/cpp/engine/wasm/validator_inner_wrapper.h b/validator/cpp/engine/wasm/validator_inner_wrapper.h
new file mode 100644
index 000000000000..d84bd750e84c
--- /dev/null
+++ b/validator/cpp/engine/wasm/validator_inner_wrapper.h
@@ -0,0 +1,27 @@
+#ifndef CPP_ENGINE_WASM_VALIDATOR_INNER_WRAPPER_H_
+#define CPP_ENGINE_WASM_VALIDATOR_INNER_WRAPPER_H_
+
+#include <string>
+
+#include "validator.pb.h"
+
+namespace amp::validator {
+
+// Validates an AMP document, and returns validation result. The return value is
+// a base64-encoded protobuf message.
+std::string ValidateString(std::string html, std::string html_format_name,
+                           int max_errors);
+
+// Renders a validation error. The input is a base64-encoded protobuf struct
+// amp.validator.ValidationError.
+std::string RenderErrorMessage(std::string error_base64);
+
+// Renders the validation result with the input contents. The parameter
+// `validation_result_base64` is the base64-encoded protobuf ValidationResult.
+std::string RenderInlineResult(std::string validation_result_base64,
+                               std::string filename,
+                               std::string input_contents);
+
+}  // namespace amp::validator
+
+#endif  // CPP_ENGINE_WASM_VALIDATOR_INNER_WRAPPER_H_
diff --git a/validator/cpp/engine/wasm/validator_outer_wrapper.cc b/validator/cpp/engine/wasm/validator_outer_wrapper.cc
new file mode 100644
index 000000000000..d1a60ffe49ba
--- /dev/null
+++ b/validator/cpp/engine/wasm/validator_outer_wrapper.cc
@@ -0,0 +1,12 @@
+// This file selects which C++ functions are exported to WebAssembly
+#include <emscripten/bind.h>
+
+#include "cpp/engine/wasm/validator_inner_wrapper.h"
+
+EMSCRIPTEN_BINDINGS(what) {
+  emscripten::function("renderErrorMessage",
+                       &amp::validator::RenderErrorMessage);
+  emscripten::function("renderInlineResult",
+                       &amp::validator::RenderInlineResult);
+  emscripten::function("validateString", &amp::validator::ValidateString);
+}
diff --git a/validator/cpp/htmlparser/BUILD b/validator/cpp/htmlparser/BUILD
index 8bedc6275217..78de2920159d 100644
--- a/validator/cpp/htmlparser/BUILD
+++ b/validator/cpp/htmlparser/BUILD
@@ -182,11 +182,22 @@ cc_library(
     copts = ["-std=c++17"],
 )
 
+cc_library(
+    name = "glog_polyfill",
+    hdrs = [
+        "glog_polyfill.h",
+    ],
+    copts = ["-std=c++17"],
+)
+
 cc_library(
     name = "logging",
     hdrs = [
         "logging.h",
     ],
+    deps = [
+        ":glog_polyfill",
+    ],
     copts = ["-std=c++17"],
 )
 
@@ -224,7 +235,7 @@ cc_library(
         ":error",
         ":logging",
         ":token",
-        "@com_github_glog//:glog",
+        "@com_google_absl//absl/strings",
     ],
 )
 
@@ -244,24 +255,12 @@ cc_test(
 )
 
 cc_library(
-    name = "htmlentities",
+    name = "iterators",
     hdrs = [
-        "entity.h",
+        "iterators.h",
     ],
-    copts = ["-std=c++17"],
     deps = [
-        ":comparators",
-    ],
-)
-
-cc_test(
-    name = "entity_test",
-    srcs = [
-        "entity_test.cc",
-    ],
-    deps = [
-        ":htmlentities",
-        "@com_google_googletest//:gtest_main",
+        ":node",
     ],
 )
 
@@ -276,9 +275,33 @@ cc_library(
     copts = ["-std=c++17"],
     deps = [
         ":allocator",
+        ":iterators",
         ":node",
         ":token",
         "@com_google_absl//absl/flags:flag",
+        "@com_google_absl//absl/status",
+    ],
+)
+
+cc_library(
+    name = "htmlentities",
+    hdrs = [
+        "entity.h",
+    ],
+    copts = ["-std=c++17"],
+    deps = [
+        ":comparators",
+    ],
+)
+
+cc_test(
+    name = "entity_test",
+    srcs = [
+        "entity_test.cc",
+    ],
+    deps = [
+        ":htmlentities",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
@@ -327,9 +350,8 @@ cc_library(
         ":node",
         ":strings",
         ":tokenizer",
-        "@com_github_glog//:glog",
-        "@com_google_absl//absl/base",
         "@com_google_absl//absl/flags:flag",
+        "@com_google_absl//absl/status",
     ],
 )
 
@@ -400,10 +422,7 @@ cc_library(
     deps = [
         ":casetable",
         ":htmlentities",
-        ":logging",
         ":whitespacetable",
-        "@com_github_glog//:glog",
-        "@com_google_absl//absl/base",
     ],
 )
 
@@ -444,7 +463,6 @@ cc_test(
         "tokenizer_test.cc",
     ],
     deps = [
-        ":parser",
         ":token",
         ":tokenizer",
         "@com_google_googletest//:gtest_main",
@@ -476,6 +494,23 @@ cc_test(
     ],
 )
 
+cc_library(
+    name = "utf8",
+    hdrs = ["utf8.h"],
+    copts = ["-std=c++17"],
+)
+
+cc_test(
+    name = "utf8_test",
+    srcs = [
+        "utf8_test.cc",
+    ],
+    deps = [
+        ":utf8",
+        "@com_google_googletest//:gtest_main",
+    ],
+)
+
 cc_library(
     name = "testconstants",
     hdrs = [
@@ -507,7 +542,6 @@ cc_test(
         ":html5lib_test_files",
     ],
     deps = [
-        ":atom",
         ":atomutil",
         ":defer",
         ":fileutil",
@@ -518,5 +552,6 @@ cc_test(
         ":testconstants",
         ":tokenizer",
         "@com_google_googletest//:gtest_main",
+        "@com_google_absl//absl/flags:flag",
     ],
 )
diff --git a/validator/cpp/htmlparser/README.md b/validator/cpp/htmlparser/README.md
index 53bd5637fea5..b181218b06df 100644
--- a/validator/cpp/htmlparser/README.md
+++ b/validator/cpp/htmlparser/README.md
@@ -1,21 +1,6 @@
 # HTML Parser
 
-This is an HTML5 compliant parser written in C++. It was created to be used by
-the
-[AMPHTML Validator](https://github.com/ampproject/amphtml/tree/main/validator)
-to standardize how AMPHTML documents should be parsed for AMP validation.
-
-## Maintainers
-
-This parser is maintained by the [AMP Working Group](https://amp.dev/community/working-groups/amp4email/):
-[Caching](https://amp.dev/community/working-groups/caching/)
-
-## Current Status
-
-This parser is in active development and has several outstanding TODOs.
-These TODOs may cause certain parsing tests to fail. Those tests have been
-excluded until the TODOs are resolved. See htmldataset_test.cc for a list of
-those tests.
+This is an HTML5 compliant parser written in C++.
 
 ## Building and Testing with Bazel
 
diff --git a/validator/cpp/htmlparser/WORKSPACE b/validator/cpp/htmlparser/WORKSPACE
deleted file mode 100644
index c22d78bc7515..000000000000
--- a/validator/cpp/htmlparser/WORKSPACE
+++ /dev/null
@@ -1,48 +0,0 @@
-workspace(name = "htmlparser")
-
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
-http_archive(
-    name = "com_google_absl",
-    strip_prefix = "abseil-cpp-master",
-    urls = ["https://github.com/abseil/abseil-cpp/archive/master.zip"],
-)
-
-http_archive(
-    name = "com_google_googletest",
-    sha256 = "002d540f947e5981f54ddaab476d87b113d2a14822f21a34dca30f24c9492a24",
-    strip_prefix = "googletest-16f637fbf4ffc3f7a01fa4eceb7906634565242f",
-    urls = ["https://github.com/google/googletest/archive/16f637fbf4ffc3f7a01fa4eceb7906634565242f.zip"],  # 2019-01-07
-)
-
-http_archive(
-    name = "com_github_gflags_gflags",
-    strip_prefix = "gflags-master",
-    urls = ["https://github.com/gflags/gflags/archive/master.zip"],
-)
-
-http_archive(
-    name = "com_github_re2",
-    strip_prefix = "re2-main",
-    urls = ["https://github.com/google/re2/archive/main.zip"],
-)
-
-http_archive(
-    name = "com_github_glog",
-    strip_prefix = "glog-master",
-    urls = ["https://github.com/google/glog/archive/master.zip"],
-)
-
-http_archive(
-    name = "com_google_protobuf",
-    strip_prefix = "protobuf-master",
-    urls = ["https://github.com/protocolbuffers/protobuf/archive/master.zip"],
-)
-
-load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
-protobuf_deps()
-
-local_repository(
-    name = "validator",
-    path = "../../",
-)
diff --git a/validator/cpp/htmlparser/allocator.h b/validator/cpp/htmlparser/allocator.h
index 7a16cf779172..0620c4ed32fb 100644
--- a/validator/cpp/htmlparser/allocator.h
+++ b/validator/cpp/htmlparser/allocator.h
@@ -165,8 +165,8 @@
 //    - 62 is multiple of 4?
 //     60 & (4 - 1) != 0;
 
-#ifndef HTMLPARSER__ALLOCATOR_H_
-#define HTMLPARSER__ALLOCATOR_H_
+#ifndef CPP_HTMLPARSER_ALLOCATOR_H_
+#define CPP_HTMLPARSER_ALLOCATOR_H_
 
 #include <unistd.h>  // For getpagesize()
 
@@ -366,4 +366,4 @@ class Allocator {
 
 }  // namespace htmlparser
 
-#endif  // HTMLPARSER__ALLOCATOR_H_
+#endif  // CPP_HTMLPARSER_ALLOCATOR_H_
diff --git a/validator/cpp/htmlparser/allocator_test.cc b/validator/cpp/htmlparser/allocator_test.cc
index 7720a868544b..7922016aafca 100644
--- a/validator/cpp/htmlparser/allocator_test.cc
+++ b/validator/cpp/htmlparser/allocator_test.cc
@@ -1,4 +1,4 @@
-#include "allocator.h"
+#include "cpp/htmlparser/allocator.h"
 
 #include "gtest/gtest.h"
 
diff --git a/validator/cpp/htmlparser/atom.h b/validator/cpp/htmlparser/atom.h
index 739fcd1eee7e..027c86a16529 100644
--- a/validator/cpp/htmlparser/atom.h
+++ b/validator/cpp/htmlparser/atom.h
@@ -1,8 +1,8 @@
 // AUTO GENERATED; DO NOT EDIT.
 // To regenerate this file see comments in bin/atomgen.cc
 
-#ifndef HTMLPARSER__ATOM_H_
-#define HTMLPARSER__ATOM_H_
+#ifndef CPP_HTMLPARSER_ATOM_H_
+#define CPP_HTMLPARSER_ATOM_H_
 
 #include <array>
 #include <string>
@@ -1919,4 +1919,4 @@ inline constexpr std::string_view kAtomText(
 
 }  // namespace htmlparser.
 
-#endif  // HTMLPARSER__ATOM_H_
+#endif  // CPP_HTMLPARSER_ATOM_H_
diff --git a/validator/cpp/htmlparser/atomutil.cc b/validator/cpp/htmlparser/atomutil.cc
index a89cfd3a3979..368b32848ebd 100644
--- a/validator/cpp/htmlparser/atomutil.cc
+++ b/validator/cpp/htmlparser/atomutil.cc
@@ -1,6 +1,6 @@
-#include "atomutil.h"
+#include "cpp/htmlparser/atomutil.h"
 
-#include "hash.h"
+#include "cpp/htmlparser/hash.h"
 
 namespace htmlparser {
 
diff --git a/validator/cpp/htmlparser/atomutil.h b/validator/cpp/htmlparser/atomutil.h
index e47619747c0d..b3677d9c6293 100644
--- a/validator/cpp/htmlparser/atomutil.h
+++ b/validator/cpp/htmlparser/atomutil.h
@@ -1,12 +1,12 @@
 // Helper class to do a lookup of a tag/entity/event to its Atom and convert
 // atom to string.
 
-#ifndef HTMLPARSER__ATOMUTIL_H_
-#define HTMLPARSER__ATOMUTIL_H_
+#ifndef CPP_HTMLPARSER_ATOMUTIL_H_
+#define CPP_HTMLPARSER_ATOMUTIL_H_
 
 #include <string>
 
-#include "atom.h"
+#include "cpp/htmlparser/atom.h"
 
 namespace htmlparser {
 
@@ -33,4 +33,4 @@ class AtomUtil {
 
 }  // namespace htmlparser
 
-#endif  // HTMLPARSER__ATOMUTIL_H_
+#endif  // CPP_HTMLPARSER_ATOMUTIL_H_
diff --git a/validator/cpp/htmlparser/atomutil_test.cc b/validator/cpp/htmlparser/atomutil_test.cc
index 684283afaf19..4ece68572bfc 100644
--- a/validator/cpp/htmlparser/atomutil_test.cc
+++ b/validator/cpp/htmlparser/atomutil_test.cc
@@ -1,7 +1,7 @@
-#include "atomutil.h"
+#include "cpp/htmlparser/atomutil.h"
 
 #include "gtest/gtest.h"
-#include "hash.h"
+#include "cpp/htmlparser/hash.h"
 
 TEST(AtomUtilTest, StringToAtom) {
   // String to atom.
diff --git a/validator/cpp/htmlparser/bin/BUILD b/validator/cpp/htmlparser/bin/BUILD
index 2752795cfe2a..3ec777a76ef2 100644
--- a/validator/cpp/htmlparser/bin/BUILD
+++ b/validator/cpp/htmlparser/bin/BUILD
@@ -10,17 +10,17 @@ cc_binary(
         "atomgen.cc",
     ],
     data = [
-        "@htmlparser//data:amptags.txt",
-        "@htmlparser//data:htmlattributes.txt",
-        "@htmlparser//data:htmltags.txt",
-        "@htmlparser//data:javascriptevents.txt",
+        "//cpp/htmlparser/data:amptags.txt",
+        "//cpp/htmlparser/data:htmlattributes.txt",
+        "//cpp/htmlparser/data:htmltags.txt",
+        "//cpp/htmlparser/data:javascriptevents.txt",
     ],
     deps = [
-        "@htmlparser//:defer",
-        "@htmlparser//:fileutil",
-        "@htmlparser//:hash",
-        "@htmlparser//:strings",
-        "@htmlparser//:token",
+        "//cpp/htmlparser:defer",
+        "//cpp/htmlparser:fileutil",
+        "//cpp/htmlparser:hash",
+        "//cpp/htmlparser:strings",
+        "//cpp/htmlparser:token",
     ],
 )
 
@@ -30,11 +30,11 @@ cc_binary(
         "casetablegen.cc",
     ],
     data = [
-        "@htmlparser//data:CaseFolding.txt",
+        "//cpp/htmlparser/data:CaseFolding.txt",
     ],
     deps = [
-        "@htmlparser//:defer",
-        "@htmlparser//:fileutil",
+        "//cpp/htmlparser:defer",
+        "//cpp/htmlparser:fileutil",
     ],
 )
 
@@ -44,27 +44,28 @@ cc_binary(
         "entitytablegen.cc",
     ],
     data = [
-        "@htmlparser//data:entities.json",
+        "//cpp/htmlparser/data:entities.json",
     ],
     deps = [
-        "@htmlparser//:defer",
-        "@htmlparser//:fileutil",
-        "@htmlparser//:strings",
+        "//cpp/htmlparser:defer",
+        "//cpp/htmlparser:fileutil",
+        "//cpp/htmlparser:strings",
     ],
 )
 
 cc_binary(
-    name = "statetablegen",
+    name = "validatorgen",
     srcs = [
-        "statetablegen.cc",
+        "validatorgen.cc",
     ],
     data = [
-        "@htmlparser//data:jsongrammar.txt",
-        "@htmlparser//json:states.h",
+        "//cpp/htmlparser/data:jsongrammar.txt",
+        "//cpp/htmlparser/validators:json.h",
     ],
     deps = [
+        "//base",
         "@com_google_absl//absl/flags:flag",
         "@com_google_absl//absl/flags:parse",
-        "@htmlparser//grammar:tablebuilder",
+        "//cpp/htmlparser/grammar:tablebuilder",
     ],
 )
diff --git a/validator/cpp/htmlparser/bin/atomgen.cc b/validator/cpp/htmlparser/bin/atomgen.cc
index cc4b2edc5ff0..54a41ab09934 100644
--- a/validator/cpp/htmlparser/bin/atomgen.cc
+++ b/validator/cpp/htmlparser/bin/atomgen.cc
@@ -16,11 +16,11 @@
 #include <utility>
 #include <vector>
 
-#include "defer.h"
-#include "fileutil.h"
-#include "hash.h"
-#include "strings.h"
-#include "token.h"
+#include "cpp/htmlparser/defer.h"
+#include "cpp/htmlparser/fileutil.h"
+#include "cpp/htmlparser/hash.h"
+#include "cpp/htmlparser/strings.h"
+#include "cpp/htmlparser/token.h"
 
 namespace htmlparser {
 
@@ -167,17 +167,17 @@ int main(int argc, char** argv) {
   };
 
   if (!(FileUtil::ReadFileLines(
-            options, "data/htmltags.txt", &all_names) &&
+            options, "cpp/htmlparser/data/htmltags.txt", &all_names) &&
         FileUtil::ReadFileLines(
-            options, "data/htmlattributes.txt",
+            options, "cpp/htmlparser/data/htmlattributes.txt",
             &all_names) &&
         FileUtil::ReadFileLines(
-            options, "data/javascriptevents.txt",
+            options, "cpp/htmlparser/data/javascriptevents.txt",
             &all_names) &&
         FileUtil::ReadFileLines(
-            options, "data/extras.txt", &all_names) &&
+            options, "cpp/htmlparser/data/extras.txt", &all_names) &&
         FileUtil::ReadFileLines(
-            options, "data/amptags.txt", &all_names))) {
+            options, "cpp/htmlparser/data/amptags.txt", &all_names))) {
     std::cerr << "Error reading input txt files." << std::endl;
     return EXIT_FAILURE;
   }
@@ -281,14 +281,14 @@ int main(int argc, char** argv) {
     nameToTextOffset[s] = static_cast<uint32_t>(offset << 8 | s.size());
   }
 
-  std::ofstream fd("atom.h");
+  std::ofstream fd("cpp/htmlparser/atom.h");
   Defer ____([&]() {fd.close();});
 
   fd << R"(// AUTO GENERATED; DO NOT EDIT.
 // To regenerate this file see comments in bin/atomgen.cc
 
-#ifndef HTMLPARSER__ATOM_H_
-#define HTMLPARSER__ATOM_H_
+#ifndef CPP_HTMLPARSER_ATOM_H_
+#define CPP_HTMLPARSER_ATOM_H_
 
 #include <array>
 #include <string>
@@ -334,5 +334,5 @@ enum class Atom {
   fd << "inline constexpr std::string_view kAtomText(\""
      << text << "\");" << std::endl;
   fd << std::endl << "}  // namespace htmlparser." << std::endl;
-  fd << std::endl << "#endif  // HTMLPARSER__ATOM_H_" << std::endl;
+  fd << std::endl << "#endif  // CPP_HTMLPARSER_ATOM_H_" << std::endl;
 }
diff --git a/validator/cpp/htmlparser/bin/casetablegen.cc b/validator/cpp/htmlparser/bin/casetablegen.cc
index 793f6c6650fe..a66464dc2bda 100644
--- a/validator/cpp/htmlparser/bin/casetablegen.cc
+++ b/validator/cpp/htmlparser/bin/casetablegen.cc
@@ -3,20 +3,20 @@
 #include <sstream>
 #include <utility>
 
-#include "defer.h"
-#include "fileutil.h"
+#include "cpp/htmlparser/defer.h"
+#include "cpp/htmlparser/fileutil.h"
 
 const char kFileHeader[] =
     R"HEADER(// AUTO GENERATED; DO NOT EDIT.
 // To regenerate this file, see comments in bin/casetable.cc
 
-#ifndef HTMLPARSER__CASETABLE_H_
-#define HTMLPARSER__CASETABLE_H_
+#ifndef CPP_HTMLPARSER_CASETABLE_H_
+#define CPP_HTMLPARSER_CASETABLE_H_
 
 #include <algorithm>
 #include <utility>
 
-#include "comparators.h"
+#include "cpp/htmlparser/comparators.h"
 
 namespace htmlparser {
 
@@ -70,7 +70,7 @@ inline char32_t ToUpperChar(char32_t c) {
 
 }  // namespace htmlparser
 
-#endif  // HTMLPARSER__CASETABLE_H_
+#endif  // CPP_HTMLPARSER_CASETABLE_H_
 )FOOTER";
 
 namespace htmlparser {
@@ -131,7 +131,7 @@ int main(int argc, char** argv) {
     return EXIT_FAILURE;
   }
 
-  std::ofstream fd("casetable.h");
+  std::ofstream fd("cpp/htmlparser/casetable.h");
   htmlparser::Defer __([&]() { fd.close(); });
 
   fd << kFileHeader;
diff --git a/validator/cpp/htmlparser/bin/entitytablegen.cc b/validator/cpp/htmlparser/bin/entitytablegen.cc
index fbee8e6e9b7c..95810636a429 100644
--- a/validator/cpp/htmlparser/bin/entitytablegen.cc
+++ b/validator/cpp/htmlparser/bin/entitytablegen.cc
@@ -9,23 +9,23 @@
 #include <utility>
 #include <vector>
 
-#include "defer.h"
-#include "fileutil.h"
-#include "strings.h"
+#include "cpp/htmlparser/defer.h"
+#include "cpp/htmlparser/fileutil.h"
+#include "cpp/htmlparser/strings.h"
 
 const char kFileHeader[] =
     R"HEADER(// AUTO GENERATED; DO NOT EDIT.
 // To regenerate this file, see comments in bin/entitytablegen.cc
 
-#ifndef HTMLPARSER__ENTITY_H_
-#define HTMLPARSER__ENTITY_H_
+#ifndef CPP_HTMLPARSER_ENTITY_H_
+#define CPP_HTMLPARSER_ENTITY_H_
 
 #include <algorithm>
 #include <array>
 #include <string>
 #include <string_view>
 
-#include "comparators.h"
+#include "cpp/htmlparser/comparators.h"
 
 namespace htmlparser {
 
@@ -53,7 +53,7 @@ inline std::string_view EntityLookup(std::string_view entity_name) {
 
 }  // namespace htmlparser
 
-#endif  // HTMLPARSER__ENTITY_H_
+#endif  // CPP_HTMLPARSER_ENTITY_H_
 )FOOTER";
 
 // Extracts the entity name from it's line in entities.json.
@@ -103,7 +103,7 @@ int main(int argc, char** argv) {
   options.white_space_transform =
       htmlparser::FileReadOptions::LineTransforms::StripWhitespace();
   if (!htmlparser::FileUtil::ReadFileLines(
-          options, "data/entities.json", &lines)) {
+          options, "cpp/htmlparser/data/entities.json", &lines)) {
     std::cerr << "Error reading input file." << std::endl;
     return EXIT_FAILURE;
   }
@@ -113,7 +113,7 @@ int main(int argc, char** argv) {
     return EXIT_FAILURE;
   }
 
-  std::ofstream fd("entity.h");
+  std::ofstream fd("cpp/htmlparser/entity.h");
   htmlparser::Defer __([&]() {fd.close();});
 
   fd << kFileHeader;
@@ -139,7 +139,7 @@ int main(int argc, char** argv) {
 
       if ((code_point & 0xffffff80) == 0) {  // 1 byte sequence.
         // 0b0xxxxxx.
-        fd << "\\x" << code_point;
+        fd << "\\x" << std::hex << static_cast<uint32_t>(code_point);
       } else if ((code_point & 0xfffff800) == 0) {  // 2 byte sequence.
         // 0b110xxxxx 0b10xxxxxx.
         fd << "\\x" << std::hex << ((code_point >> 6) | 0xc0)
diff --git a/validator/cpp/htmlparser/bin/statetablegen.cc b/validator/cpp/htmlparser/bin/statetablegen.cc
deleted file mode 100644
index 80fcb0ed57d9..000000000000
--- a/validator/cpp/htmlparser/bin/statetablegen.cc
+++ /dev/null
@@ -1,45 +0,0 @@
-// To regenerate states.h file, run:
-//
-// blaze clean
-// bazel build htmlparser/bin:statetablegen
-// bazel-bin/htmlparser/bin/statetablegen --input_grammar=url
-//                            or
-// bazel-bin/htmlparser/bin/statetablegen --input_grammar=json
-
-#include <iostream>
-
-#include "absl/flags/flag.h"
-#include "absl/flags/parse.h"
-#include "grammar/tablebuilder.h"
-
-ABSL_FLAG(std::string, input_grammar, "", "Options: url, json");
-
-
-int main(int argc, char** argv) {
-  absl::ParseCommandLine(argc, argv);
-  std::string grammar = absl::GetFlag(FLAGS_input_grammar);
-
-  std::string input_grammar;
-  std::string cpp_namespace;
-  std::string ifdef_guard;
-  std::string output_file;
-  if (grammar == "json") {
-    input_grammar = "data/jsongrammar.txt";
-    cpp_namespace = "htmlparser::json";
-    ifdef_guard = "HTMLPARSER__JSON_STATES_H_";
-    output_file = "json/states.h";
-  } else {
-    std::cerr << "Invalid -input_grammar value: " << grammar;
-    return -1;
-  }
-
-  htmlparser::grammar::TableBuilder builder(input_grammar,
-                                            {.output_file_path = output_file,
-                                             .ifdef_guard = ifdef_guard,
-                                             .cpp_namespace = cpp_namespace});
-
-  if (!builder.ParseRulesAndGenerateTable()) {
-    std::cerr << "Table generation failed.\n";
-    return -1;
-  }
-}
diff --git a/validator/cpp/htmlparser/bin/validatorgen.cc b/validator/cpp/htmlparser/bin/validatorgen.cc
new file mode 100644
index 000000000000..8300004437ce
--- /dev/null
+++ b/validator/cpp/htmlparser/bin/validatorgen.cc
@@ -0,0 +1,69 @@
+//
+// Copyright 2020 The AMP HTML Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS-IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the license.
+//
+
+#include <iostream>
+
+#include "glog/logging.h"
+#include "absl/flags/flag.h"
+#include "absl/flags/parse.h"
+#include "cpp/htmlparser/grammar/tablebuilder.h"
+
+ABSL_FLAG(std::string, input_grammar, "", "Options: supported-media, json");
+
+int main(int argc, char** argv) {
+  absl::ParseCommandLine(argc, argv);
+  std::string grammar = absl::GetFlag(FLAGS_input_grammar);
+
+  std::string input_grammar;
+  std::string cpp_namespace;
+  std::string output_file;
+  char termination_sentinel;
+  std::string ifdef_guard;
+  if (grammar == "json") {
+    input_grammar = "cpp/htmlparser/data/jsongrammar.txt";
+    cpp_namespace = "htmlparser::json";
+    output_file = "cpp/htmlparser/validators/json.h";
+    termination_sentinel = ' ';
+    ifdef_guard = "CPP_HTMLPARSER_VALIDATORS_JSON_H_";
+  } else if (grammar == "ipaddress") {
+    input_grammar = "cpp/htmlparser/data/ipaddressgrammar.txt";
+    cpp_namespace = "htmlparser::ipaddress";
+    output_file = "cpp/htmlparser/validators/ipaddress.h";
+    termination_sentinel = ' ';
+    ifdef_guard = "CPP_HTMLPARSER_VALIDATORS_IPADDRESS_H_";
+  } else if (grammar == "supported-media") {
+    input_grammar = "cpp/htmlparser/data/supportedmediagrammar.txt";
+    cpp_namespace = "htmlparser::css";
+    output_file = "cpp/htmlparser/validators/supported_media_query.h";
+    termination_sentinel = '\0';
+    ifdef_guard = "CPP_HTMLPARSER_VALIDATORS_SUPPORTED_MEDIA_QUERY_H_";
+  } else {
+    std::cerr << "Invalid -input_grammar value: " << grammar;
+    return -1;
+  }
+
+  htmlparser::grammar::TableBuilder builder(
+      input_grammar,
+      {.output_file_path = output_file,
+       .ifdef_guard = ifdef_guard,
+       .cpp_namespace = cpp_namespace,
+       .termination_sentinel = termination_sentinel});
+
+  if (!builder.ParseRulesAndGenerateTable()) {
+    std::cerr << "Table generation failed.\n";
+    return -1;
+  }
+}
diff --git a/validator/cpp/htmlparser/casetable.h b/validator/cpp/htmlparser/casetable.h
index 57a298fe2231..07804e6953d9 100644
--- a/validator/cpp/htmlparser/casetable.h
+++ b/validator/cpp/htmlparser/casetable.h
@@ -1,13 +1,13 @@
 // AUTO GENERATED; DO NOT EDIT.
 // To regenerate this file, see comments in bin/casetable.cc
 
-#ifndef HTMLPARSER__CASETABLE_H_
-#define HTMLPARSER__CASETABLE_H_
+#ifndef CPP_HTMLPARSER_CASETABLE_H_
+#define CPP_HTMLPARSER_CASETABLE_H_
 
 #include <algorithm>
 #include <utility>
 
-#include "comparators.h"
+#include "cpp/htmlparser/comparators.h"
 
 namespace htmlparser {
 
@@ -2967,4 +2967,4 @@ inline char32_t ToUpperChar(char32_t c) {
 
 }  // namespace htmlparser
 
-#endif  // HTMLPARSER__CASETABLE_H_
+#endif  // CPP_HTMLPARSER_CASETABLE_H_
diff --git a/validator/cpp/htmlparser/casetable_test.cc b/validator/cpp/htmlparser/casetable_test.cc
index 93ab55e5ec11..ed20806894b3 100644
--- a/validator/cpp/htmlparser/casetable_test.cc
+++ b/validator/cpp/htmlparser/casetable_test.cc
@@ -1,7 +1,7 @@
-#include "casetable.h"
+#include "cpp/htmlparser/casetable.h"
 
 #include "gtest/gtest.h"
-#include "strings.h"
+#include "cpp/htmlparser/strings.h"
 
 // Just one test to ensure table mapping is correct.
 TEST(CasetableTest, TestTableMappingIsCorrect) {
diff --git a/validator/cpp/htmlparser/comparators.h b/validator/cpp/htmlparser/comparators.h
index 8ea332663ad7..b60c1a907662 100644
--- a/validator/cpp/htmlparser/comparators.h
+++ b/validator/cpp/htmlparser/comparators.h
@@ -1,7 +1,7 @@
 // Comparators for calling standard algorithms on various containers.
 
-#ifndef HTMLPARSER__COMPARATORS_H_
-#define HTMLPARSER__COMPARATORS_H_
+#ifndef CPP_HTMLPARSER_COMPARATORS_H_
+#define CPP_HTMLPARSER_COMPARATORS_H_
 
 #include <utility>
 
@@ -23,4 +23,4 @@ struct PairComparator {
 
 }  // namespace htmlparser
 
-#endif  // HTMLPARSER__COMPARATORS_H_
+#endif  // CPP_HTMLPARSER_COMPARATORS_H_
diff --git a/validator/cpp/htmlparser/css/BUILD b/validator/cpp/htmlparser/css/BUILD
index 663ab09147b0..6fc3c7014a27 100644
--- a/validator/cpp/htmlparser/css/BUILD
+++ b/validator/cpp/htmlparser/css/BUILD
@@ -29,14 +29,14 @@ cc_library(
     hdrs = ["parse-css.h"],
     deps = [
         ":parse_css_cc_proto",
-        "@com_github_glog//:glog",
         "@com_google_absl//absl/algorithm:container",
         "@com_google_absl//absl/memory",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/types:variant",
-        "@htmlparser//:strings",
-        "@htmlparser//json:types",
-        "@validator//:validator_cc_proto",
+        "//cpp/htmlparser:logging",
+        "//cpp/htmlparser:strings",
+        "//cpp/htmlparser/json:types",
+        "//:validator_cc_proto",
     ],
 )
 
@@ -49,7 +49,7 @@ cc_test(
         ":parse_css_cc_proto",
         "@com_google_absl//absl/strings",
         "@com_google_googletest//:gtest_main",
-        "@htmlparser//:strings",
+        "//cpp/htmlparser:strings",
     ],
 )
 
@@ -69,13 +69,12 @@ cc_library(
     hdrs = ["parse-css-urls.h"],
     deps = [
         ":parse_css_urls_cc_proto",
-        "@com_github_glog//:glog",
         "@com_google_absl//absl/algorithm:container",
         "@com_google_absl//absl/memory",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/types:variant",
-        "@htmlparser//:strings",
-        "@validator//:validator_cc_proto",
+        "//cpp/htmlparser:strings",
+        "//:validator_cc_proto",
     ],
 )
 
@@ -110,6 +109,6 @@ cc_test(
         ":parse-css",
         "@com_google_absl//absl/strings",
         "@com_google_googletest//:gtest_main",
-        "@htmlparser//:strings",
+        "//cpp/htmlparser:strings",
     ],
 )
diff --git a/validator/cpp/htmlparser/css/amp4ads-parse-css.cc b/validator/cpp/htmlparser/css/amp4ads-parse-css.cc
index 535c61381081..0fec958bcd1d 100644
--- a/validator/cpp/htmlparser/css/amp4ads-parse-css.cc
+++ b/validator/cpp/htmlparser/css/amp4ads-parse-css.cc
@@ -1,9 +1,9 @@
-#include "css/amp4ads-parse-css.h"
+#include "cpp/htmlparser/css/amp4ads-parse-css.h"
 
 #include "absl/memory/memory.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
-#include "css/parse-css.h"
+#include "cpp/htmlparser/css/parse-css.h"
 #include "re2/re2.h"
 
 using absl::make_unique;
diff --git a/validator/cpp/htmlparser/css/amp4ads-parse-css.h b/validator/cpp/htmlparser/css/amp4ads-parse-css.h
index c592d0fde18d..87a48eeb6576 100644
--- a/validator/cpp/htmlparser/css/amp4ads-parse-css.h
+++ b/validator/cpp/htmlparser/css/amp4ads-parse-css.h
@@ -1,9 +1,9 @@
-#ifndef HTMLPARSER__CSS_AMP4ADS_PARSE_CSS_H_
-#define HTMLPARSER__CSS_AMP4ADS_PARSE_CSS_H_
+#ifndef CPP_HTMLPARSER_CSS_AMP4ADS_PARSE_CSS_H_
+#define CPP_HTMLPARSER_CSS_AMP4ADS_PARSE_CSS_H_
 
 #include <string>
 #include <vector>
-#include "css/parse-css.h"
+#include "cpp/htmlparser/css/parse-css.h"
 //
 // This is *not* meant to be a public API.
 //
@@ -22,4 +22,4 @@ void ValidateAmp4AdsCss(const Stylesheet& stylesheet,
                         std::vector<std::unique_ptr<ErrorToken>>* errors);
 }  // namespace htmlparser::css
 
-#endif  // HTMLPARSER__CSS_AMP4ADS_PARSE_CSS_H_
+#endif  // CPP_HTMLPARSER_CSS_AMP4ADS_PARSE_CSS_H_
diff --git a/validator/cpp/htmlparser/css/amp4ads-parse-css_test.cc b/validator/cpp/htmlparser/css/amp4ads-parse-css_test.cc
index 716197defcc6..ca45c6be916a 100644
--- a/validator/cpp/htmlparser/css/amp4ads-parse-css_test.cc
+++ b/validator/cpp/htmlparser/css/amp4ads-parse-css_test.cc
@@ -1,12 +1,12 @@
-#include "css/amp4ads-parse-css.h"
+#include "cpp/htmlparser/css/amp4ads-parse-css.h"
 
 #include <gmock/gmock.h>
 #include "gtest/gtest.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
-#include "css/parse-css.h"
-#include "strings.h"
+#include "cpp/htmlparser/css/parse-css.h"
+#include "cpp/htmlparser/strings.h"
 
 using std::unique_ptr;
 using testing::ElementsAre;
@@ -46,144 +46,7 @@ TEST(Amp4AdsParseCssTest, AmpAnimateExample_Good) {
   unique_ptr<Stylesheet> stylesheet =
       ParseAStylesheet(&tokens, A4aCssParsingConfig(), &errors);
   EXPECT_EQ(JsonFromList(errors), "[]");
-  EXPECT_EQ(stylesheet->ToJson().ToString(), R""({
-  "tokentype": "STYLESHEET",
-  "line": 1,
-  "col": 0,
-  "rules":  [
-    {
-      "tokentype": "QUALIFIED_RULE",
-      "line": 1,
-      "col": 0,
-      "prelude":      [
-        {
-          "tokentype": "DELIM",
-          "line": 1,
-          "col": 0,
-          "value": "."
-        },
-        {
-          "tokentype": "IDENT",
-          "line": 1,
-          "col": 1,
-          "value": "amp-animate"
-        },
-        {
-          "tokentype": "WHITESPACE",
-          "line": 1,
-          "col": 12
-        },
-        {
-          "tokentype": "DELIM",
-          "line": 1,
-          "col": 13,
-          "value": "."
-        },
-        {
-          "tokentype": "IDENT",
-          "line": 1,
-          "col": 14,
-          "value": "box"
-        },
-        {
-          "tokentype": "WHITESPACE",
-          "line": 1,
-          "col": 17
-        },
-        {
-          "tokentype": "EOF_TOKEN",
-          "line": 1,
-          "col": 18
-        }
-      ],
-      "declarations":      [
-        {
-          "tokentype": "DECLARATION",
-          "line": 1,
-          "col": 22,
-          "name": "transform",
-          "important": false,
-          "value":          [
-            {
-              "tokentype": "WHITESPACE",
-              "line": 1,
-              "col": 32
-            },
-            {
-              "tokentype": "FUNCTION_TOKEN",
-              "line": 1,
-              "col": 33,
-              "value": "rotate"
-            },
-            {
-              "tokentype": "DIMENSION",
-              "line": 1,
-              "col": 40,
-              "repr": "180",
-              "type": "integer",
-              "unit": "deg",
-              "value": 180.000000
-            },
-            {
-              "tokentype": "CLOSE_PAREN",
-              "line": 1,
-              "col": 46
-            },
-            {
-              "tokentype": "EOF_TOKEN",
-              "line": 1,
-              "col": 47
-            }
-          ]
-        },
-        {
-          "tokentype": "DECLARATION",
-          "line": 1,
-          "col": 49,
-          "name": "transition",
-          "important": false,
-          "value":          [
-            {
-              "tokentype": "WHITESPACE",
-              "line": 1,
-              "col": 60
-            },
-            {
-              "tokentype": "IDENT",
-              "line": 1,
-              "col": 61,
-              "value": "transform"
-            },
-            {
-              "tokentype": "WHITESPACE",
-              "line": 1,
-              "col": 70
-            },
-            {
-              "tokentype": "DIMENSION",
-              "line": 1,
-              "col": 71,
-              "repr": "2",
-              "type": "integer",
-              "unit": "s",
-              "value": 2.000000
-            },
-            {
-              "tokentype": "EOF_TOKEN",
-              "line": 1,
-              "col": 73
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "eof":  {
-    "tokentype": "EOF_TOKEN",
-    "line": 1,
-    "col": 76
-  }
-})"");
+  EXPECT_EQ(stylesheet->ToJson().ToString(), R"({"tokentype":"STYLESHEET","line":1,"col":0,"rules":[{"tokentype":"QUALIFIED_RULE","line":1,"col":0,"prelude":[{"tokentype":"DELIM","line":1,"col":0,"value":"."},{"tokentype":"IDENT","line":1,"col":1,"value":"amp-animate"},{"tokentype":"WHITESPACE","line":1,"col":12},{"tokentype":"DELIM","line":1,"col":13,"value":"."},{"tokentype":"IDENT","line":1,"col":14,"value":"box"},{"tokentype":"WHITESPACE","line":1,"col":17},{"tokentype":"EOF_TOKEN","line":1,"col":18}],"declarations":[{"tokentype":"DECLARATION","line":1,"col":22,"name":"transform","important":false,"value":[{"tokentype":"WHITESPACE","line":1,"col":32},{"tokentype":"FUNCTION_TOKEN","line":1,"col":33,"value":"rotate"},{"tokentype":"DIMENSION","line":1,"col":40,"repr":"180","type":"integer","unit":"deg","value":180.000000},{"tokentype":"CLOSE_PAREN","line":1,"col":46},{"tokentype":"EOF_TOKEN","line":1,"col":47}]},{"tokentype":"DECLARATION","line":1,"col":49,"name":"transition","important":false,"value":[{"tokentype":"WHITESPACE","line":1,"col":60},{"tokentype":"IDENT","line":1,"col":61,"value":"transform"},{"tokentype":"WHITESPACE","line":1,"col":70},{"tokentype":"DIMENSION","line":1,"col":71,"repr":"2","type":"integer","unit":"s","value":2.000000},{"tokentype":"EOF_TOKEN","line":1,"col":73}]}]}],"eof":{"tokentype":"EOF_TOKEN","line":1,"col":76}})");
   ValidateAmp4AdsCss(*stylesheet, &errors);
   EXPECT_EQ(JsonFromList(errors), "[]");
 }
@@ -213,119 +76,9 @@ TEST(Amp4AdsParseCssTest,
   unique_ptr<Stylesheet> stylesheet =
       ParseAStylesheet(&tokens, A4aCssParsingConfig(), &errors);
   EXPECT_EQ(JsonFromList(errors), "[]");
-  EXPECT_EQ(stylesheet->ToJson().ToString(), R""({
-  "tokentype": "STYLESHEET",
-  "line": 1,
-  "col": 0,
-  "rules":  [
-    {
-      "tokentype": "QUALIFIED_RULE",
-      "line": 1,
-      "col": 0,
-      "prelude":      [
-        {
-          "tokentype": "DELIM",
-          "line": 1,
-          "col": 0,
-          "value": "."
-        },
-        {
-          "tokentype": "IDENT",
-          "line": 1,
-          "col": 1,
-          "value": "box"
-        },
-        {
-          "tokentype": "WHITESPACE",
-          "line": 1,
-          "col": 4
-        },
-        {
-          "tokentype": "EOF_TOKEN",
-          "line": 1,
-          "col": 5
-        }
-      ],
-      "declarations":      [
-        {
-          "tokentype": "DECLARATION",
-          "line": 1,
-          "col": 7,
-          "name": "position",
-          "important": false,
-          "value":          [
-            {
-              "tokentype": "WHITESPACE",
-              "line": 1,
-              "col": 16
-            },
-            {
-              "tokentype": "IDENT",
-              "line": 1,
-              "col": 17,
-              "value": "fixed"
-            },
-            {
-              "tokentype": "EOF_TOKEN",
-              "line": 1,
-              "col": 22
-            }
-          ]
-        },
-        {
-          "tokentype": "DECLARATION",
-          "line": 1,
-          "col": 24,
-          "name": "position",
-          "important": false,
-          "value":          [
-            {
-              "tokentype": "IDENT",
-              "line": 1,
-              "col": 33,
-              "value": "sticky"
-            },
-            {
-              "tokentype": "EOF_TOKEN",
-              "line": 1,
-              "col": 39
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "eof":  {
-    "tokentype": "EOF_TOKEN",
-    "line": 1,
-    "col": 42
-  }
-})"");
+  EXPECT_EQ(stylesheet->ToJson().ToString(), R"({"tokentype":"STYLESHEET","line":1,"col":0,"rules":[{"tokentype":"QUALIFIED_RULE","line":1,"col":0,"prelude":[{"tokentype":"DELIM","line":1,"col":0,"value":"."},{"tokentype":"IDENT","line":1,"col":1,"value":"box"},{"tokentype":"WHITESPACE","line":1,"col":4},{"tokentype":"EOF_TOKEN","line":1,"col":5}],"declarations":[{"tokentype":"DECLARATION","line":1,"col":7,"name":"position","important":false,"value":[{"tokentype":"WHITESPACE","line":1,"col":16},{"tokentype":"IDENT","line":1,"col":17,"value":"fixed"},{"tokentype":"EOF_TOKEN","line":1,"col":22}]},{"tokentype":"DECLARATION","line":1,"col":24,"name":"position","important":false,"value":[{"tokentype":"IDENT","line":1,"col":33,"value":"sticky"},{"tokentype":"EOF_TOKEN","line":1,"col":39}]}]}],"eof":{"tokentype":"EOF_TOKEN","line":1,"col":42}})");
   ValidateAmp4AdsCss(*stylesheet, &errors);
-  EXPECT_EQ(JsonFromList(errors), R""([
-  {
-    "tokentype": "ERROR",
-    "line": 1,
-    "col": 7,
-    "code": "CSS_SYNTAX_DISALLOWED_PROPERTY_VALUE",
-    "params":    [
-      "style",
-      "position",
-      "fixed"
-    ]
-  },
-  {
-    "tokentype": "ERROR",
-    "line": 1,
-    "col": 24,
-    "code": "CSS_SYNTAX_DISALLOWED_PROPERTY_VALUE",
-    "params":    [
-      "style",
-      "position",
-      "sticky"
-    ]
-  }
-])"");
+  EXPECT_EQ(JsonFromList(errors), R"([{"tokentype":"ERROR","line":1,"col":7,"code":"CSS_SYNTAX_DISALLOWED_PROPERTY_VALUE","params":["style","position","fixed"]},{"tokentype":"ERROR","line":1,"col":24,"code":"CSS_SYNTAX_DISALLOWED_PROPERTY_VALUE","params":["style","position","sticky"]}])");
 }
 
 TEST(Amp4AdsParseCssTest,
@@ -344,169 +97,7 @@ TEST(Amp4AdsParseCssTest,
   unique_ptr<Stylesheet> stylesheet =
       ParseAStylesheet(&tokens, A4aCssParsingConfig(), &errors);
   EXPECT_EQ(JsonFromList(errors), "[]");
-  EXPECT_EQ(stylesheet->ToJson().ToString(), R""({
-  "tokentype": "STYLESHEET",
-  "line": 1,
-  "col": 0,
-  "rules":  [
-    {
-      "tokentype": "QUALIFIED_RULE",
-      "line": 1,
-      "col": 0,
-      "prelude":      [
-        {
-          "tokentype": "DELIM",
-          "line": 1,
-          "col": 0,
-          "value": "."
-        },
-        {
-          "tokentype": "IDENT",
-          "line": 1,
-          "col": 1,
-          "value": "amp-animate"
-        },
-        {
-          "tokentype": "WHITESPACE",
-          "line": 1,
-          "col": 12
-        },
-        {
-          "tokentype": "DELIM",
-          "line": 1,
-          "col": 13,
-          "value": "."
-        },
-        {
-          "tokentype": "IDENT",
-          "line": 1,
-          "col": 14,
-          "value": "box"
-        },
-        {
-          "tokentype": "WHITESPACE",
-          "line": 1,
-          "col": 17
-        },
-        {
-          "tokentype": "EOF_TOKEN",
-          "line": 1,
-          "col": 18
-        }
-      ],
-      "declarations":      [
-        {
-          "tokentype": "DECLARATION",
-          "line": 1,
-          "col": 24,
-          "name": "color",
-          "important": false,
-          "value":          [
-            {
-              "tokentype": "WHITESPACE",
-              "line": 1,
-              "col": 30
-            },
-            {
-              "tokentype": "IDENT",
-              "line": 1,
-              "col": 31,
-              "value": "red"
-            },
-            {
-              "tokentype": "EOF_TOKEN",
-              "line": 1,
-              "col": 34
-            }
-          ]
-        },
-        {
-          "tokentype": "DECLARATION",
-          "line": 1,
-          "col": 40,
-          "name": "transform",
-          "important": false,
-          "value":          [
-            {
-              "tokentype": "WHITESPACE",
-              "line": 1,
-              "col": 50
-            },
-            {
-              "tokentype": "FUNCTION_TOKEN",
-              "line": 1,
-              "col": 51,
-              "value": "rotate"
-            },
-            {
-              "tokentype": "DIMENSION",
-              "line": 1,
-              "col": 58,
-              "repr": "180",
-              "type": "integer",
-              "unit": "deg",
-              "value": 180.000000
-            },
-            {
-              "tokentype": "CLOSE_PAREN",
-              "line": 1,
-              "col": 64
-            },
-            {
-              "tokentype": "EOF_TOKEN",
-              "line": 1,
-              "col": 65
-            }
-          ]
-        },
-        {
-          "tokentype": "DECLARATION",
-          "line": 1,
-          "col": 70,
-          "name": "transition",
-          "important": false,
-          "value":          [
-            {
-              "tokentype": "WHITESPACE",
-              "line": 1,
-              "col": 81
-            },
-            {
-              "tokentype": "IDENT",
-              "line": 1,
-              "col": 82,
-              "value": "transform"
-            },
-            {
-              "tokentype": "WHITESPACE",
-              "line": 1,
-              "col": 91
-            },
-            {
-              "tokentype": "DIMENSION",
-              "line": 1,
-              "col": 92,
-              "repr": "2",
-              "type": "integer",
-              "unit": "s",
-              "value": 2.000000
-            },
-            {
-              "tokentype": "EOF_TOKEN",
-              "line": 1,
-              "col": 94
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "eof":  {
-    "tokentype": "EOF_TOKEN",
-    "line": 1,
-    "col": 96
-  }
-})"");
+  EXPECT_EQ(stylesheet->ToJson().ToString(), R"({"tokentype":"STYLESHEET","line":1,"col":0,"rules":[{"tokentype":"QUALIFIED_RULE","line":1,"col":0,"prelude":[{"tokentype":"DELIM","line":1,"col":0,"value":"."},{"tokentype":"IDENT","line":1,"col":1,"value":"amp-animate"},{"tokentype":"WHITESPACE","line":1,"col":12},{"tokentype":"DELIM","line":1,"col":13,"value":"."},{"tokentype":"IDENT","line":1,"col":14,"value":"box"},{"tokentype":"WHITESPACE","line":1,"col":17},{"tokentype":"EOF_TOKEN","line":1,"col":18}],"declarations":[{"tokentype":"DECLARATION","line":1,"col":24,"name":"color","important":false,"value":[{"tokentype":"WHITESPACE","line":1,"col":30},{"tokentype":"IDENT","line":1,"col":31,"value":"red"},{"tokentype":"EOF_TOKEN","line":1,"col":34}]},{"tokentype":"DECLARATION","line":1,"col":40,"name":"transform","important":false,"value":[{"tokentype":"WHITESPACE","line":1,"col":50},{"tokentype":"FUNCTION_TOKEN","line":1,"col":51,"value":"rotate"},{"tokentype":"DIMENSION","line":1,"col":58,"repr":"180","type":"integer","unit":"deg","value":180.000000},{"tokentype":"CLOSE_PAREN","line":1,"col":64},{"tokentype":"EOF_TOKEN","line":1,"col":65}]},{"tokentype":"DECLARATION","line":1,"col":70,"name":"transition","important":false,"value":[{"tokentype":"WHITESPACE","line":1,"col":81},{"tokentype":"IDENT","line":1,"col":82,"value":"transform"},{"tokentype":"WHITESPACE","line":1,"col":91},{"tokentype":"DIMENSION","line":1,"col":92,"repr":"2","type":"integer","unit":"s","value":2.000000},{"tokentype":"EOF_TOKEN","line":1,"col":94}]}]}],"eof":{"tokentype":"EOF_TOKEN","line":1,"col":96}})");
   ValidateAmp4AdsCss(*stylesheet, &errors);
   EXPECT_EQ(JsonFromList(errors), "[]");
 }
@@ -544,127 +135,7 @@ TEST(Amp4AdsParseCssTest, AmpAnimateExample_Good_MissingContextClass) {
   unique_ptr<Stylesheet> stylesheet =
       ParseAStylesheet(&tokens, A4aCssParsingConfig(), &errors);
   EXPECT_EQ(JsonFromList(errors), "[]");
-  EXPECT_EQ(stylesheet->ToJson().ToString(), R""({
-  "tokentype": "STYLESHEET",
-  "line": 1,
-  "col": 0,
-  "rules":  [
-    {
-      "tokentype": "QUALIFIED_RULE",
-      "line": 1,
-      "col": 0,
-      "prelude":      [
-        {
-          "tokentype": "DELIM",
-          "line": 1,
-          "col": 0,
-          "value": "."
-        },
-        {
-          "tokentype": "IDENT",
-          "line": 1,
-          "col": 1,
-          "value": "box"
-        },
-        {
-          "tokentype": "WHITESPACE",
-          "line": 1,
-          "col": 4
-        },
-        {
-          "tokentype": "EOF_TOKEN",
-          "line": 1,
-          "col": 5
-        }
-      ],
-      "declarations":      [
-        {
-          "tokentype": "DECLARATION",
-          "line": 1,
-          "col": 11,
-          "name": "transform",
-          "important": false,
-          "value":          [
-            {
-              "tokentype": "WHITESPACE",
-              "line": 1,
-              "col": 21
-            },
-            {
-              "tokentype": "FUNCTION_TOKEN",
-              "line": 1,
-              "col": 22,
-              "value": "rotate"
-            },
-            {
-              "tokentype": "DIMENSION",
-              "line": 1,
-              "col": 29,
-              "repr": "180",
-              "type": "integer",
-              "unit": "deg",
-              "value": 180.000000
-            },
-            {
-              "tokentype": "CLOSE_PAREN",
-              "line": 1,
-              "col": 35
-            },
-            {
-              "tokentype": "EOF_TOKEN",
-              "line": 1,
-              "col": 36
-            }
-          ]
-        },
-        {
-          "tokentype": "DECLARATION",
-          "line": 1,
-          "col": 42,
-          "name": "transition",
-          "important": false,
-          "value":          [
-            {
-              "tokentype": "WHITESPACE",
-              "line": 1,
-              "col": 53
-            },
-            {
-              "tokentype": "IDENT",
-              "line": 1,
-              "col": 54,
-              "value": "transform"
-            },
-            {
-              "tokentype": "WHITESPACE",
-              "line": 1,
-              "col": 63
-            },
-            {
-              "tokentype": "DIMENSION",
-              "line": 1,
-              "col": 64,
-              "repr": "2",
-              "type": "integer",
-              "unit": "s",
-              "value": 2.000000
-            },
-            {
-              "tokentype": "EOF_TOKEN",
-              "line": 1,
-              "col": 66
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "eof":  {
-    "tokentype": "EOF_TOKEN",
-    "line": 1,
-    "col": 69
-  }
-})"");
+  EXPECT_EQ(stylesheet->ToJson().ToString(), R"({"tokentype":"STYLESHEET","line":1,"col":0,"rules":[{"tokentype":"QUALIFIED_RULE","line":1,"col":0,"prelude":[{"tokentype":"DELIM","line":1,"col":0,"value":"."},{"tokentype":"IDENT","line":1,"col":1,"value":"box"},{"tokentype":"WHITESPACE","line":1,"col":4},{"tokentype":"EOF_TOKEN","line":1,"col":5}],"declarations":[{"tokentype":"DECLARATION","line":1,"col":11,"name":"transform","important":false,"value":[{"tokentype":"WHITESPACE","line":1,"col":21},{"tokentype":"FUNCTION_TOKEN","line":1,"col":22,"value":"rotate"},{"tokentype":"DIMENSION","line":1,"col":29,"repr":"180","type":"integer","unit":"deg","value":180.000000},{"tokentype":"CLOSE_PAREN","line":1,"col":35},{"tokentype":"EOF_TOKEN","line":1,"col":36}]},{"tokentype":"DECLARATION","line":1,"col":42,"name":"transition","important":false,"value":[{"tokentype":"WHITESPACE","line":1,"col":53},{"tokentype":"IDENT","line":1,"col":54,"value":"transform"},{"tokentype":"WHITESPACE","line":1,"col":63},{"tokentype":"DIMENSION","line":1,"col":64,"repr":"2","type":"integer","unit":"s","value":2.000000},{"tokentype":"EOF_TOKEN","line":1,"col":66}]}]}],"eof":{"tokentype":"EOF_TOKEN","line":1,"col":69}})");
   ValidateAmp4AdsCss(*stylesheet, &errors);
   EXPECT_EQ(JsonFromList(errors), "[]");
 }
@@ -682,20 +153,7 @@ TEST(Amp4AdsParseCssTest,
       ParseAStylesheet(&tokens, A4aCssParsingConfig(), &errors);
   EXPECT_EQ(JsonFromList(errors), "[]");
   ValidateAmp4AdsCss(*stylesheet, &errors);
-  EXPECT_EQ(JsonFromList(errors), R""([
-  {
-    "tokentype": "ERROR",
-    "line": 1,
-    "col": 24,
-    "code": "CSS_SYNTAX_DISALLOWED_PROPERTY_VALUE_WITH_HINT",
-    "params":    [
-      "style",
-      "transition",
-      "background-color",
-      "['opacity', 'transform']"
-    ]
-  }
-])"");
+  EXPECT_EQ(JsonFromList(errors), R"([{"tokentype":"ERROR","line":1,"col":24,"code":"CSS_SYNTAX_DISALLOWED_PROPERTY_VALUE_WITH_HINT","params":["style","transition","background-color","['opacity', 'transform']"]}])");
 }
 
 TEST(Amp4AdsParseCssTest, KeyframesExample_Good) {
@@ -710,178 +168,7 @@ TEST(Amp4AdsParseCssTest, KeyframesExample_Good) {
   unique_ptr<Stylesheet> stylesheet =
       ParseAStylesheet(&tokens, A4aCssParsingConfig(), &errors);
   EXPECT_EQ(JsonFromList(errors), "[]");
-  EXPECT_EQ(stylesheet->ToJson().ToString(), R""({
-  "tokentype": "STYLESHEET",
-  "line": 1,
-  "col": 0,
-  "rules":  [
-    {
-      "tokentype": "AT_RULE",
-      "line": 1,
-      "col": 0,
-      "name": "keyframes",
-      "prelude":      [
-        {
-          "tokentype": "WHITESPACE",
-          "line": 1,
-          "col": 10
-        },
-        {
-          "tokentype": "IDENT",
-          "line": 1,
-          "col": 11,
-          "value": "turn"
-        },
-        {
-          "tokentype": "WHITESPACE",
-          "line": 1,
-          "col": 15
-        },
-        {
-          "tokentype": "EOF_TOKEN",
-          "line": 1,
-          "col": 16
-        }
-      ],
-      "rules":      [
-        {
-          "tokentype": "QUALIFIED_RULE",
-          "line": 1,
-          "col": 20,
-          "prelude":          [
-            {
-              "tokentype": "IDENT",
-              "line": 1,
-              "col": 20,
-              "value": "from"
-            },
-            {
-              "tokentype": "WHITESPACE",
-              "line": 1,
-              "col": 24
-            },
-            {
-              "tokentype": "EOF_TOKEN",
-              "line": 1,
-              "col": 25
-            }
-          ],
-          "declarations":          [
-            {
-              "tokentype": "DECLARATION",
-              "line": 1,
-              "col": 27,
-              "name": "transform",
-              "important": false,
-              "value":              [
-                {
-                  "tokentype": "WHITESPACE",
-                  "line": 1,
-                  "col": 37
-                },
-                {
-                  "tokentype": "FUNCTION_TOKEN",
-                  "line": 1,
-                  "col": 38,
-                  "value": "rotate"
-                },
-                {
-                  "tokentype": "DIMENSION",
-                  "line": 1,
-                  "col": 45,
-                  "repr": "180",
-                  "type": "integer",
-                  "unit": "deg",
-                  "value": 180.000000
-                },
-                {
-                  "tokentype": "CLOSE_PAREN",
-                  "line": 1,
-                  "col": 51
-                },
-                {
-                  "tokentype": "EOF_TOKEN",
-                  "line": 1,
-                  "col": 52
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "tokentype": "QUALIFIED_RULE",
-          "line": 1,
-          "col": 58,
-          "prelude":          [
-            {
-              "tokentype": "IDENT",
-              "line": 1,
-              "col": 58,
-              "value": "to"
-            },
-            {
-              "tokentype": "WHITESPACE",
-              "line": 1,
-              "col": 60
-            },
-            {
-              "tokentype": "EOF_TOKEN",
-              "line": 1,
-              "col": 61
-            }
-          ],
-          "declarations":          [
-            {
-              "tokentype": "DECLARATION",
-              "line": 1,
-              "col": 63,
-              "name": "transform",
-              "important": false,
-              "value":              [
-                {
-                  "tokentype": "WHITESPACE",
-                  "line": 1,
-                  "col": 73
-                },
-                {
-                  "tokentype": "FUNCTION_TOKEN",
-                  "line": 1,
-                  "col": 74,
-                  "value": "rotate"
-                },
-                {
-                  "tokentype": "DIMENSION",
-                  "line": 1,
-                  "col": 81,
-                  "repr": "90",
-                  "type": "integer",
-                  "unit": "deg",
-                  "value": 90.000000
-                },
-                {
-                  "tokentype": "CLOSE_PAREN",
-                  "line": 1,
-                  "col": 86
-                },
-                {
-                  "tokentype": "EOF_TOKEN",
-                  "line": 1,
-                  "col": 87
-                }
-              ]
-            }
-          ]
-        }
-      ],
-      "declarations":      []
-    }
-  ],
-  "eof":  {
-    "tokentype": "EOF_TOKEN",
-    "line": 1,
-    "col": 92
-  }
-})"");
+  EXPECT_EQ(stylesheet->ToJson().ToString(), R"({"tokentype":"STYLESHEET","line":1,"col":0,"rules":[{"tokentype":"AT_RULE","line":1,"col":0,"name":"keyframes","prelude":[{"tokentype":"WHITESPACE","line":1,"col":10},{"tokentype":"IDENT","line":1,"col":11,"value":"turn"},{"tokentype":"WHITESPACE","line":1,"col":15},{"tokentype":"EOF_TOKEN","line":1,"col":16}],"rules":[{"tokentype":"QUALIFIED_RULE","line":1,"col":20,"prelude":[{"tokentype":"IDENT","line":1,"col":20,"value":"from"},{"tokentype":"WHITESPACE","line":1,"col":24},{"tokentype":"EOF_TOKEN","line":1,"col":25}],"declarations":[{"tokentype":"DECLARATION","line":1,"col":27,"name":"transform","important":false,"value":[{"tokentype":"WHITESPACE","line":1,"col":37},{"tokentype":"FUNCTION_TOKEN","line":1,"col":38,"value":"rotate"},{"tokentype":"DIMENSION","line":1,"col":45,"repr":"180","type":"integer","unit":"deg","value":180.000000},{"tokentype":"CLOSE_PAREN","line":1,"col":51},{"tokentype":"EOF_TOKEN","line":1,"col":52}]}]},{"tokentype":"QUALIFIED_RULE","line":1,"col":58,"prelude":[{"tokentype":"IDENT","line":1,"col":58,"value":"to"},{"tokentype":"WHITESPACE","line":1,"col":60},{"tokentype":"EOF_TOKEN","line":1,"col":61}],"declarations":[{"tokentype":"DECLARATION","line":1,"col":63,"name":"transform","important":false,"value":[{"tokentype":"WHITESPACE","line":1,"col":73},{"tokentype":"FUNCTION_TOKEN","line":1,"col":74,"value":"rotate"},{"tokentype":"DIMENSION","line":1,"col":81,"repr":"90","type":"integer","unit":"deg","value":90.000000},{"tokentype":"CLOSE_PAREN","line":1,"col":86},{"tokentype":"EOF_TOKEN","line":1,"col":87}]}]}],"declarations":[]}],"eof":{"tokentype":"EOF_TOKEN","line":1,"col":92}})");
   ValidateAmp4AdsCss(*stylesheet, &errors);
   EXPECT_EQ(JsonFromList(errors), "[]");
 }
@@ -931,56 +218,7 @@ TEST(Amp4AdsParseCssTest,
       ParseAStylesheet(&tokens, A4aCssParsingConfig(), &errors);
   EXPECT_EQ(JsonFromList(errors), "[]");
   ValidateAmp4AdsCss(*stylesheet, &errors);
-  EXPECT_EQ(JsonFromList(errors), R""([
-  {
-    "tokentype": "ERROR",
-    "line": 1,
-    "col": 30,
-    "code": "CSS_SYNTAX_PROPERTY_DISALLOWED_WITHIN_AT_RULE",
-    "params":    [
-      "style",
-      "margin-left",
-      "keyframes",
-      "['animation-timing-function', 'opacity', 'transform']"
-    ]
-  },
-  {
-    "tokentype": "ERROR",
-    "line": 1,
-    "col": 48,
-    "code": "CSS_SYNTAX_PROPERTY_DISALLOWED_WITHIN_AT_RULE",
-    "params":    [
-      "style",
-      "width",
-      "keyframes",
-      "['animation-timing-function', 'opacity', 'transform']"
-    ]
-  },
-  {
-    "tokentype": "ERROR",
-    "line": 1,
-    "col": 69,
-    "code": "CSS_SYNTAX_PROPERTY_DISALLOWED_WITHIN_AT_RULE",
-    "params":    [
-      "style",
-      "margin-left",
-      "keyframes",
-      "['animation-timing-function', 'opacity', 'transform']"
-    ]
-  },
-  {
-    "tokentype": "ERROR",
-    "line": 1,
-    "col": 85,
-    "code": "CSS_SYNTAX_PROPERTY_DISALLOWED_WITHIN_AT_RULE",
-    "params":    [
-      "style",
-      "width",
-      "keyframes",
-      "['animation-timing-function', 'opacity', 'transform']"
-    ]
-  }
-])"");
+  EXPECT_EQ(JsonFromList(errors), R"([{"tokentype":"ERROR","line":1,"col":30,"code":"CSS_SYNTAX_PROPERTY_DISALLOWED_WITHIN_AT_RULE","params":["style","margin-left","keyframes","['animation-timing-function', 'opacity', 'transform']"]},{"tokentype":"ERROR","line":1,"col":48,"code":"CSS_SYNTAX_PROPERTY_DISALLOWED_WITHIN_AT_RULE","params":["style","width","keyframes","['animation-timing-function', 'opacity', 'transform']"]},{"tokentype":"ERROR","line":1,"col":69,"code":"CSS_SYNTAX_PROPERTY_DISALLOWED_WITHIN_AT_RULE","params":["style","margin-left","keyframes","['animation-timing-function', 'opacity', 'transform']"]},{"tokentype":"ERROR","line":1,"col":85,"code":"CSS_SYNTAX_PROPERTY_DISALLOWED_WITHIN_AT_RULE","params":["style","width","keyframes","['animation-timing-function', 'opacity', 'transform']"]}])");
 }
 
 TEST(Amp4AdsParseCssTest,
@@ -997,56 +235,7 @@ TEST(Amp4AdsParseCssTest,
       ParseAStylesheet(&tokens, A4aCssParsingConfig(), &errors);
   EXPECT_EQ(JsonFromList(errors), "[]");
   ValidateAmp4AdsCss(*stylesheet, &errors);
-  EXPECT_EQ(JsonFromList(errors), R""([
-  {
-    "tokentype": "ERROR",
-    "line": 1,
-    "col": 35,
-    "code": "CSS_SYNTAX_PROPERTY_DISALLOWED_WITHIN_AT_RULE",
-    "params":    [
-      "style",
-      "margin-left",
-      "-moz-keyframes",
-      "['animation-timing-function', 'opacity', 'transform']"
-    ]
-  },
-  {
-    "tokentype": "ERROR",
-    "line": 1,
-    "col": 53,
-    "code": "CSS_SYNTAX_PROPERTY_DISALLOWED_WITHIN_AT_RULE",
-    "params":    [
-      "style",
-      "width",
-      "-moz-keyframes",
-      "['animation-timing-function', 'opacity', 'transform']"
-    ]
-  },
-  {
-    "tokentype": "ERROR",
-    "line": 1,
-    "col": 74,
-    "code": "CSS_SYNTAX_PROPERTY_DISALLOWED_WITHIN_AT_RULE",
-    "params":    [
-      "style",
-      "margin-left",
-      "-moz-keyframes",
-      "['animation-timing-function', 'opacity', 'transform']"
-    ]
-  },
-  {
-    "tokentype": "ERROR",
-    "line": 1,
-    "col": 90,
-    "code": "CSS_SYNTAX_PROPERTY_DISALLOWED_WITHIN_AT_RULE",
-    "params":    [
-      "style",
-      "width",
-      "-moz-keyframes",
-      "['animation-timing-function', 'opacity', 'transform']"
-    ]
-  }
-])"");
+  EXPECT_EQ(JsonFromList(errors), R"([{"tokentype":"ERROR","line":1,"col":35,"code":"CSS_SYNTAX_PROPERTY_DISALLOWED_WITHIN_AT_RULE","params":["style","margin-left","-moz-keyframes","['animation-timing-function', 'opacity', 'transform']"]},{"tokentype":"ERROR","line":1,"col":53,"code":"CSS_SYNTAX_PROPERTY_DISALLOWED_WITHIN_AT_RULE","params":["style","width","-moz-keyframes","['animation-timing-function', 'opacity', 'transform']"]},{"tokentype":"ERROR","line":1,"col":74,"code":"CSS_SYNTAX_PROPERTY_DISALLOWED_WITHIN_AT_RULE","params":["style","margin-left","-moz-keyframes","['animation-timing-function', 'opacity', 'transform']"]},{"tokentype":"ERROR","line":1,"col":90,"code":"CSS_SYNTAX_PROPERTY_DISALLOWED_WITHIN_AT_RULE","params":["style","width","-moz-keyframes","['animation-timing-function', 'opacity', 'transform']"]}])");
 }
 
 }  // namespace
diff --git a/validator/cpp/htmlparser/css/parse-css-urls.cc b/validator/cpp/htmlparser/css/parse-css-urls.cc
index b0c160fe2715..9d2ae3d3033d 100644
--- a/validator/cpp/htmlparser/css/parse-css-urls.cc
+++ b/validator/cpp/htmlparser/css/parse-css-urls.cc
@@ -1,4 +1,4 @@
-#include "css/parse-css-urls.h"
+#include "cpp/htmlparser/css/parse-css-urls.h"
 
 #include <memory>
 
@@ -8,9 +8,8 @@
 #include "absl/strings/numbers.h"
 #include "absl/strings/str_join.h"
 #include "absl/types/variant.h"
-#include "glog/logging.h"
-#include "logging.h"
-#include "strings.h"
+#include "cpp/htmlparser/logging.h"
+#include "cpp/htmlparser/strings.h"
 
 using absl::AsciiStrToLower;
 using absl::c_find;
@@ -142,8 +141,9 @@ class Tokenizer {
   }
 
   char32_t Next(int num = 1) {
-    CHECK(num >= 0, "Spec Error; negative lookahead.");
-    CHECK(num <= 3, "Spec Error; no more than three codepoints of lookahead.");
+    CHECK(num >= 0) << "Spec Error; negative lookahead.";
+    CHECK(num <= 3)
+        << "Spec Error; no more than three codepoints of lookahead.";
     return Codepoint(pos_ + num);
   }
 
@@ -615,7 +615,7 @@ int ConsumeABlock(const vector<unique_ptr<Token>>& tokens,
 int ConsumeAComponentValue(const vector<unique_ptr<Token>>& tokens,
                            const int start_pos) {
   TokenType::Code type = TypeOrEof(tokens, start_pos);
-  CHECK(type != TokenType::EOF_TOKEN, "");
+  CHECK(type != TokenType::EOF_TOKEN);
   if (type == TokenType::OPEN_CURLY || type == TokenType::OPEN_SQUARE ||
       type == TokenType::OPEN_PAREN || type == TokenType::FUNCTION_TOKEN) {
     return ConsumeABlock(tokens, start_pos);
@@ -628,11 +628,11 @@ int ConsumeAComponentValue(const vector<unique_ptr<Token>>& tokens,
 // starts at position |start_pos|.
 int ConsumeAFontFace(const vector<unique_ptr<Token>>& tokens,
                      const int start_pos) {
-  CHECK(TypeOrEof(tokens, start_pos) == TokenType::AT_KEYWORD,
-        TokenType::Code_Name(TypeOrEof(tokens, start_pos)));
+  CHECK(TypeOrEof(tokens, start_pos) == TokenType::AT_KEYWORD)
+      << TokenType::Code_Name(TypeOrEof(tokens, start_pos));
   CHECK(static_cast<const AtKeywordToken&>(*tokens[start_pos]).StringValue() ==
-            "font-face",
-        static_cast<const AtKeywordToken&>(*tokens[start_pos]).StringValue());
+        "font-face")
+      << static_cast<const AtKeywordToken&>(*tokens[start_pos]).StringValue();
   int cur_pos = start_pos;
   while (true) {
     cur_pos++;
@@ -650,7 +650,7 @@ int ConsumeAFontFace(const vector<unique_ptr<Token>>& tokens,
 int ConsumeAUrlFunction(const vector<unique_ptr<Token>>& tokens,
                         const int start_pos, std::string* url) {
   TokenType::Code type = TypeOrEof(tokens, start_pos);
-  CHECK(type == TokenType::FUNCTION_TOKEN, TokenType::Code_Name(type));
+  CHECK(type == TokenType::FUNCTION_TOKEN) << TokenType::Code_Name(type);
   int cur_pos = start_pos;
   *url = "";
   while (true) {
@@ -736,7 +736,7 @@ bool SegmentCss(const std::string& utf8_css, vector<CssSegment>* segments) {
         segments->emplace_back(segment);
       }
 
-      CHECK(cur_pos + 1 < tokens.size(), "tokens missing EOF_TOKEN");
+      CHECK(cur_pos + 1 < tokens.size()) << "tokens missing EOF_TOKEN";
       // Set our next range start to the start of the next token.
       css_chars_emitted_until = tokens[cur_pos + 1]->pos();
     }
diff --git a/validator/cpp/htmlparser/css/parse-css-urls.h b/validator/cpp/htmlparser/css/parse-css-urls.h
index bbf494cfa3f3..39893392207d 100644
--- a/validator/cpp/htmlparser/css/parse-css-urls.h
+++ b/validator/cpp/htmlparser/css/parse-css-urls.h
@@ -7,8 +7,8 @@
 // CSS. See search/amphtml/transformers/external_url_rewrite_transformer.cc for
 // the primary use case of this library.
 
-#ifndef HTMLPARSER__CSS_PARSE_CSS_URLS_H_
-#define HTMLPARSER__CSS_PARSE_CSS_URLS_H_
+#ifndef CPP_HTMLPARSER_CSS_PARSE_CSS_URLS_H_
+#define CPP_HTMLPARSER_CSS_PARSE_CSS_URLS_H_
 
 #include <memory>
 #include <string>
@@ -17,7 +17,7 @@
 
 #include "absl/memory/memory.h"
 #include "absl/types/variant.h"
-#include "css/parse-css-urls.pb.h"
+#include "cpp/htmlparser/css/parse-css-urls.pb.h"
 
 namespace htmlparser::css::url {
 // Implements 3.3. Preprocessing the input stream.
@@ -266,4 +266,4 @@ bool SegmentCss(const std::string& utf8_css,
 
 }  // namespace htmlparser::css::url
 
-#endif  // HTMLPARSER__CSS_PARSE_CSS_URLS_H_
+#endif  // CPP_HTMLPARSER_CSS_PARSE_CSS_URLS_H_
diff --git a/validator/cpp/htmlparser/css/parse-css-urls_test.cc b/validator/cpp/htmlparser/css/parse-css-urls_test.cc
index 5164a23a973a..844412770512 100644
--- a/validator/cpp/htmlparser/css/parse-css-urls_test.cc
+++ b/validator/cpp/htmlparser/css/parse-css-urls_test.cc
@@ -1,11 +1,11 @@
-#include "css/parse-css-urls.h"
+#include "cpp/htmlparser/css/parse-css-urls.h"
 
 #include <ostream>
 
 #include <gmock/gmock.h>
 #include "gtest/gtest.h"
 #include "absl/strings/str_cat.h"
-#include "strings.h"
+#include "cpp/htmlparser/strings.h"
 
 using testing::Eq;
 using testing::Pointwise;
diff --git a/validator/cpp/htmlparser/css/parse-css.cc b/validator/cpp/htmlparser/css/parse-css.cc
index 475b6a76fd80..4df12b588e33 100644
--- a/validator/cpp/htmlparser/css/parse-css.cc
+++ b/validator/cpp/htmlparser/css/parse-css.cc
@@ -1,4 +1,4 @@
-#include "css/parse-css.h"
+#include "cpp/htmlparser/css/parse-css.h"
 
 #include <deque>
 #include <memory>
@@ -9,9 +9,9 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
 #include "absl/types/variant.h"
-#include "css/parse-css.pb.h"
-#include "logging.h"
-#include "strings.h"
+#include "cpp/htmlparser/css/parse-css.pb.h"
+#include "cpp/htmlparser/logging.h"
+#include "cpp/htmlparser/strings.h"
 
 using absl::make_unique;
 using absl::StrCat;
@@ -463,8 +463,9 @@ class Tokenizer {
   }
 
   char32_t Next(int num = 1) {
-    CHECK(num >= 0, "Spec Error; cannot lookahead a negative amount");
-    CHECK(num <= 3, "Spec Error; no more than three codepoints of lookahead.");
+    CHECK(num >= 0) << "Spec Error; cannot lookahead a negative amount";
+    CHECK(num <= 3)
+        << "Spec Error; no more than three codepoints of lookahead.";
     return Codepoint(pos_ + num);
   }
 
@@ -952,8 +953,9 @@ unique_ptr<ErrorToken> CreateParseErrorTokenAt(
 //
 TokenStream::TokenStream(vector<unique_ptr<Token>> tokens)
     : tokens_(std::move(tokens)), pos_(-1) {
-  CHECK(!tokens_.empty(), "empty tokens");
-  CHECK(tokens_.back()->Type() == TokenType::EOF_TOKEN, tokens_.back()->Type());
+  CHECK(!tokens_.empty()) << "empty tokens";
+  CHECK(tokens_.back()->Type() == TokenType::EOF_TOKEN)
+      << tokens_.back()->Type();
 
   // Since the last element in |tokens| may get released, we make a
   // copy so that TokenAt may safely return it for n >=
@@ -963,7 +965,7 @@ TokenStream::TokenStream(vector<unique_ptr<Token>> tokens)
 
 const Token& TokenStream::TokenAt(int n) const {
   const unique_ptr<Token>& token = (n < tokens_.size()) ? tokens_[n] : eof_;
-  CHECK(token.get(), n);
+  CHECK(token.get()) << n;
   return *token;
 }
 
@@ -974,13 +976,13 @@ const Token& TokenStream::Next() { return TokenAt(pos_ + 1); }
 void TokenStream::Reconsume() { --pos_; }
 
 const Token& TokenStream::Current() const {
-  CHECK(pos_ >= 0, "Consume not called");
+  CHECK(pos_ >= 0) << "Consume not called";
   return TokenAt(pos_);
 }
 
 unique_ptr<Token> TokenStream::ReleaseCurrentOrCreateEof() {
   if (pos_ < tokens_.size()) {
-    CHECK(tokens_[pos_].get(), "null token");
+    CHECK(tokens_[pos_].get()) << "null token";
     return std::move(tokens_[pos_]);
   }
   return CreateEOFTokenAt(*eof_);
@@ -1036,7 +1038,7 @@ class Canonicalizer {
   // Parses an At Rule.
   unique_ptr<AtRule> ParseAnAtRule(TokenStream* s,
                                    vector<unique_ptr<ErrorToken>>* errors) {
-    CHECK(s->Current().Type() == TokenType::AT_KEYWORD, "invalid type");
+    CHECK(s->Current().Type() == TokenType::AT_KEYWORD) << "invalid type";
     auto rule = make_unique<AtRule>(s->Current().StringValue());
     s->Current().CopyStartPositionTo(rule.get());
 
@@ -1082,8 +1084,8 @@ class Canonicalizer {
   // selector (if any) and a list of declarations.
   void ParseAQualifiedRule(TokenStream* s, vector<unique_ptr<Rule>>* rules,
                            vector<unique_ptr<ErrorToken>>* errors) {
-    CHECK(s->Current().Type() != TokenType::EOF_TOKEN, "EOF_TOKEN");
-    CHECK(s->Current().Type() != TokenType::AT_KEYWORD, "AT_KEYWORD");
+    CHECK(s->Current().Type() != TokenType::EOF_TOKEN) << "EOF_TOKEN";
+    CHECK(s->Current().Type() != TokenType::AT_KEYWORD) << "AT_KEYWORD";
 
     auto rule = make_unique<QualifiedRule>();
     s->Current().CopyStartPositionTo(rule.get());
@@ -1159,7 +1161,7 @@ class Canonicalizer {
   void ParseADeclaration(TokenStream* s,
                          vector<unique_ptr<Declaration>>* declarations,
                          vector<unique_ptr<ErrorToken>>* errors) {
-    CHECK(s->Current().Type() == TokenType::IDENT, "invalid type");
+    CHECK(s->Current().Type() == TokenType::IDENT) << "invalid type";
 
     auto decl = make_unique<Declaration>(s->Current().StringValue());
     s->Current().CopyStartPositionTo(decl.get());
@@ -1241,9 +1243,9 @@ class Canonicalizer {
                                   int depth) {
     if (depth > kMaximumCssRecursion) return false;
     CHECK(s->Current().Type() == TokenType::OPEN_CURLY ||
-              s->Current().Type() == TokenType::OPEN_SQUARE ||
-              s->Current().Type() == TokenType::OPEN_PAREN,
-          TokenType::Code_Name(s->Current().Type()));
+          s->Current().Type() == TokenType::OPEN_SQUARE ||
+          s->Current().Type() == TokenType::OPEN_PAREN)
+        << TokenType::Code_Name(s->Current().Type());
     std::string mirror =
         static_cast<const GroupingToken&>(s->Current()).Mirror();
     tokens->emplace_back(s->ReleaseCurrentOrCreateEof());
@@ -1274,7 +1276,7 @@ class Canonicalizer {
                                   vector<std::string>{"style"}));
     // A simple block always has a start token (e.g. '{') and
     // either a closing token or EOF token.
-    CHECK(simple_block.size() >= 2, "");
+    CHECK_GE(simple_block.size(), 2);
 
     int original_size = simple_block.size();
 
@@ -1282,7 +1284,7 @@ class Canonicalizer {
     simple_block.erase(simple_block.begin());
     unique_ptr<Token> eof = CreateEOFTokenAt(*simple_block.back());
     simple_block.back().swap(eof);
-    CHECK(simple_block.size() == original_size - 1, "");
+    CHECK(simple_block.size() == original_size - 1);
     return simple_block;
   }
 
@@ -1293,7 +1295,7 @@ class Canonicalizer {
   static bool ConsumeAFunction(TokenStream* s,
                                vector<unique_ptr<Token>>* tokens, int depth) {
     if (depth > kMaximumCssRecursion) return false;
-    CHECK(s->Current().Type() == TokenType::FUNCTION_TOKEN, "");
+    CHECK(s->Current().Type() == TokenType::FUNCTION_TOKEN);
     tokens->emplace_back(s->ReleaseCurrentOrCreateEof());
     while (true) {
       s->Consume();
@@ -1321,7 +1323,7 @@ class Canonicalizer {
 
     // A simple block always has a start function token
     // either a close paren token or EOF token.
-    CHECK(function.size() >= 2, "");
+    CHECK_GE(function.size(), 2);
 
     // Convert end token to EOF.
     unique_ptr<Token> eof = CreateEOFTokenAt(*function.back());
@@ -1363,9 +1365,9 @@ namespace {
 //                and token_idx + 1 is in range.
 void ParseUrlToken(const vector<unique_ptr<Token>>& tokens, int token_idx,
                    ParsedCssUrl* parsed) {
-  CHECK(token_idx + 1 < tokens.size(), "");
+  CHECK(token_idx + 1 < tokens.size());
   const Token& token = *tokens[token_idx];
-  CHECK(token.Type() == TokenType::URL, "");
+  CHECK(token.Type() == TokenType::URL);
   token.CopyStartPositionTo(parsed);
   parsed->set_end_pos(tokens[token_idx + 1]->pos());
   parsed->set_utf8_url(static_cast<const URLToken&>(token).StringValue());
@@ -1379,18 +1381,18 @@ void ParseUrlToken(const vector<unique_ptr<Token>>& tokens, int token_idx,
 int ParseUrlFunction(const vector<unique_ptr<Token>>& tokens, int token_idx,
                      ParsedCssUrl* parsed) {
   const Token& token = *tokens[token_idx];
-  CHECK(token.Type() == TokenType::FUNCTION_TOKEN, "");
-  CHECK(static_cast<const FunctionToken&>(token).StringValue() == "url", "");
-  CHECK(tokens.back()->Type() == TokenType::EOF_TOKEN, "");
+  CHECK(token.Type() == TokenType::FUNCTION_TOKEN);
+  CHECK(static_cast<const FunctionToken&>(token).StringValue() == "url");
+  CHECK(tokens.back()->Type() == TokenType::EOF_TOKEN);
   token.CopyStartPositionTo(parsed);
 
   ++token_idx;  // We've digested the function token above.
-  CHECK(token_idx < tokens.size(), "tokens missing EOF_TOKEN");
+  CHECK(token_idx < tokens.size()) << "tokens missing EOF_TOKEN";
 
   // Consume optional whitespace.
   while (tokens[token_idx]->Type() == TokenType::WHITESPACE) {
     ++token_idx;
-    CHECK(token_idx < tokens.size(), "tokens missing EOF_TOKEN");
+    CHECK(token_idx < tokens.size()) << "tokens missing EOF_TOKEN";
   }
 
   // Consume URL.
@@ -1398,17 +1400,17 @@ int ParseUrlFunction(const vector<unique_ptr<Token>>& tokens, int token_idx,
   parsed->set_utf8_url(
       static_cast<const StringToken&>(*tokens[token_idx]).StringValue());
   ++token_idx;
-  CHECK(token_idx < tokens.size(), "tokens missing EOF_TOKEN");
+  CHECK(token_idx < tokens.size()) << "tokens missing EOF_TOKEN";
 
   // Consume optional whitespace.
   while (tokens[token_idx]->Type() == TokenType::WHITESPACE) {
     ++token_idx;
-    CHECK(token_idx < tokens.size(), "tokens missing EOF_TOKEN");
+    CHECK(token_idx < tokens.size()) << "tokens missing EOF_TOKEN";
   }
 
   // Consume ')'
   if (tokens[token_idx]->Type() != TokenType::CLOSE_PAREN) return -1;
-  CHECK(token_idx + 1 < tokens.size(), "tokens missing EOF_TOKEN");
+  CHECK(token_idx + 1 < tokens.size()) << "tokens missing EOF_TOKEN";
   parsed->set_end_pos(tokens[token_idx + 1]->pos());
   return token_idx + 1;
 }
@@ -1427,8 +1429,8 @@ class UrlFunctionVisitor : public RuleVisitor {
   void LeaveAtRule(const AtRule& at_rule) override { at_rule_scope_.clear(); }
 
   void VisitDeclaration(const Declaration& declaration) override {
-    CHECK(!declaration.value().empty(), "");
-    CHECK(declaration.value().back()->Type() == TokenType::EOF_TOKEN, "");
+    CHECK(!declaration.value().empty());
+    CHECK(declaration.value().back()->Type() == TokenType::EOF_TOKEN);
     for (int ii = 0; ii < declaration.value().size() - 1;) {
       const Token& token = *declaration.value()[ii];
       if (token.Type() == TokenType::URL) {
@@ -2088,7 +2090,7 @@ htmlparser::json::JsonDict IdSelector::ToJson() const {
 }
 
 unique_ptr<IdSelector> ParseAnIdSelector(TokenStream* token_stream) {
-  CHECK(TokenType::HASH == token_stream->Current().Type(), "");
+  CHECK(TokenType::HASH == token_stream->Current().Type());
   const HashToken& hash =
       *static_cast<const HashToken*>(&token_stream->Current());
   token_stream->Consume();
@@ -2148,7 +2150,7 @@ unique_ptr<ErrorToken> NewInvalidAttrSelectorError(const Token& start) {
 // token_stream->Current() must be the open square token.
 // Returns either an AttrSelector or a ErrorToken.
 ErrorTokenOr<AttrSelector> ParseAnAttrSelector(TokenStream* token_stream) {
-  CHECK(TokenType::OPEN_SQUARE == token_stream->Current().Type(), "");
+  CHECK(TokenType::OPEN_SQUARE == token_stream->Current().Type());
   const Token& start = token_stream->Current();
   token_stream->Consume();  // Consumes '['.
   if (token_stream->Current().Type() == TokenType::WHITESPACE)
@@ -2272,7 +2274,7 @@ htmlparser::json::JsonDict PseudoSelector::ToJson() const {
 // the pseudo token can't be parsed (e.g., a lone ':').
 // Returns either a PseudoSelector or an ErrorToken.
 ErrorTokenOr<PseudoSelector> ParseAPseudoSelector(TokenStream* token_stream) {
-  CHECK(TokenType::COLON == token_stream->Current().Type(), "");
+  CHECK(TokenType::COLON == token_stream->Current().Type());
   const Token& first_colon = token_stream->Current();
   token_stream->Consume();
   bool is_class = true;
@@ -2329,8 +2331,9 @@ void ClassSelector::Accept(SelectorVisitor* visitor) const {
 
 // token_stream->Current() must be the '.' delimiter token.
 unique_ptr<ClassSelector> ParseAClassSelector(TokenStream* token_stream) {
-  CHECK(IsDelim(token_stream->Current(), "."), "invalid delimiter token");
-  CHECK(TokenType::IDENT == token_stream->Next().Type(), "invalid ident token");
+  CHECK(IsDelim(token_stream->Current(), ".")) << "invalid delimiter token";
+  CHECK(TokenType::IDENT == token_stream->Next().Type())
+      << "invalid ident token";
   const DelimToken& dot =
       *static_cast<const DelimToken*>(&token_stream->Current());
   token_stream->Consume();
@@ -2469,9 +2472,9 @@ CombinatorType::Code CombinatorTypeForToken(const Token& token) {
   if (IsDelim(token, "~")) return CombinatorType::GENERAL_SIBLING;
   // CombinatorTypeForToken is only ever called if the token has one of these
   // delimitors, so reaching this point is impossible.
-  CHECK(false, absl::StrCat("not a combinator token - type=",
-                            TokenType::Code_Name(token.Type()),
-                            " value=", token.StringValue()));
+  CHECK(false) << absl::StrCat(
+      "not a combinator token - type=", TokenType::Code_Name(token.Type()),
+      " value=", token.StringValue());
 }
 
 // Whether or not the provided token could be the start of a simple
diff --git a/validator/cpp/htmlparser/css/parse-css.h b/validator/cpp/htmlparser/css/parse-css.h
index 9bbce7ba5a15..d1612a0c4258 100644
--- a/validator/cpp/htmlparser/css/parse-css.h
+++ b/validator/cpp/htmlparser/css/parse-css.h
@@ -18,8 +18,8 @@
 // hierarchy. However the parsing routines sometimes instantiate a
 // temporary TokenStream and put some AST nodes into there.
 
-#ifndef HTMLPARSER__CSS_PARSE_CSS_H_
-#define HTMLPARSER__CSS_PARSE_CSS_H_
+#ifndef CPP_HTMLPARSER_CSS_PARSE_CSS_H_
+#define CPP_HTMLPARSER_CSS_PARSE_CSS_H_
 
 #include <memory>
 #include <string>
@@ -29,8 +29,8 @@
 
 #include "absl/memory/memory.h"
 #include "absl/strings/strip.h"
-#include "css/parse-css.pb.h"
-#include "json/types.h"
+#include "cpp/htmlparser/css/parse-css.pb.h"
+#include "cpp/htmlparser/json/types.h"
 #include "validator.pb.h"
 
 namespace htmlparser::css {
@@ -1010,4 +1010,4 @@ class SelectorVisitor : public RuleVisitor {
 };
 }  // namespace htmlparser::css
 
-#endif  // HTMLPARSER__CSS_PARSE_CSS_H_
+#endif  // CPP_HTMLPARSER_CSS_PARSE_CSS_H_
diff --git a/validator/cpp/htmlparser/css/parse-css_test.cc b/validator/cpp/htmlparser/css/parse-css_test.cc
index 96868e7941c3..850a67f4ed76 100644
--- a/validator/cpp/htmlparser/css/parse-css_test.cc
+++ b/validator/cpp/htmlparser/css/parse-css_test.cc
@@ -1,4 +1,4 @@
-#include "css/parse-css.h"
+#include "cpp/htmlparser/css/parse-css.h"
 
 #include <memory>
 #include <vector>
@@ -7,9 +7,9 @@
 #include "gtest/gtest.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
-#include "css/parse-css.pb.h"
-#include "logging.h"
-#include "strings.h"
+#include "cpp/htmlparser/css/parse-css.pb.h"
+#include "cpp/htmlparser/logging.h"
+#include "cpp/htmlparser/strings.h"
 
 using std::unique_ptr;
 using std::vector;
@@ -67,71 +67,7 @@ TEST(ParseCssTest, Tokenize_GeneratesTokensForSimpleExample) {
   vector<unique_ptr<ErrorToken>> errors;
   vector<unique_ptr<Token>> tokens =
       Tokenize(&css, /*line=*/1, /*col=*/0, &errors);
-  EXPECT_EQ(JsonFromList(tokens), R""([
-  {
-    "tokentype": "IDENT",
-    "line": 1,
-    "col": 0,
-    "value": "foo"
-  },
-  {
-    "tokentype": "WHITESPACE",
-    "line": 1,
-    "col": 3
-  },
-  {
-    "tokentype": "OPEN_CURLY",
-    "line": 1,
-    "col": 4
-  },
-  {
-    "tokentype": "WHITESPACE",
-    "line": 1,
-    "col": 5
-  },
-  {
-    "tokentype": "IDENT",
-    "line": 1,
-    "col": 6,
-    "value": "bar"
-  },
-  {
-    "tokentype": "COLON",
-    "line": 1,
-    "col": 9
-  },
-  {
-    "tokentype": "WHITESPACE",
-    "line": 1,
-    "col": 10
-  },
-  {
-    "tokentype": "IDENT",
-    "line": 1,
-    "col": 11,
-    "value": "baz"
-  },
-  {
-    "tokentype": "SEMICOLON",
-    "line": 1,
-    "col": 14
-  },
-  {
-    "tokentype": "WHITESPACE",
-    "line": 1,
-    "col": 15
-  },
-  {
-    "tokentype": "CLOSE_CURLY",
-    "line": 1,
-    "col": 16
-  },
-  {
-    "tokentype": "EOF_TOKEN",
-    "line": 1,
-    "col": 17
-  }
-])"");
+  EXPECT_EQ(JsonFromList(tokens), R"([{"tokentype":"IDENT","line":1,"col":0,"value":"foo"},{"tokentype":"WHITESPACE","line":1,"col":3},{"tokentype":"OPEN_CURLY","line":1,"col":4},{"tokentype":"WHITESPACE","line":1,"col":5},{"tokentype":"IDENT","line":1,"col":6,"value":"bar"},{"tokentype":"COLON","line":1,"col":9},{"tokentype":"WHITESPACE","line":1,"col":10},{"tokentype":"IDENT","line":1,"col":11,"value":"baz"},{"tokentype":"SEMICOLON","line":1,"col":14},{"tokentype":"WHITESPACE","line":1,"col":15},{"tokentype":"CLOSE_CURLY","line":1,"col":16},{"tokentype":"EOF_TOKEN","line":1,"col":17}])");
   EXPECT_EQ(0, errors.size());
   // Also keeps track of positions / offsets for each token into the
   // original css.
@@ -155,41 +91,9 @@ TEST(ParseCssTest, Tokenize_TokenizesWithParseErrors) {
   vector<unique_ptr<ErrorToken>> errors;
   vector<unique_ptr<Token>> tokens =
       Tokenize(&css, /*line=*/1, /*col=*/0, &errors);
-  EXPECT_EQ(JsonFromList(tokens), R"([
-  {
-    "tokentype": "WHITESPACE",
-    "line": 1,
-    "col": 0
-  },
-  {
-    "tokentype": "WHITESPACE",
-    "line": 1,
-    "col": 2
-  },
-  {
-    "tokentype": "STRING",
-    "line": 2,
-    "col": 1,
-    "value": ""
-  },
-  {
-    "tokentype": "EOF_TOKEN",
-    "line": 2,
-    "col": 2
-  }
-])");
-
-  EXPECT_EQ(JsonFromList(errors), R"([
-  {
-    "tokentype": "ERROR",
-    "line": 1,
-    "col": 1,
-    "code": "CSS_SYNTAX_UNTERMINATED_STRING",
-    "params":    [
-      "style"
-    ]
-  }
-])");
+  EXPECT_EQ(JsonFromList(tokens), R"([{"tokentype":"WHITESPACE","line":1,"col":0},{"tokentype":"WHITESPACE","line":1,"col":2},{"tokentype":"STRING","line":2,"col":1,"value":""},{"tokentype":"EOF_TOKEN","line":2,"col":2}])");
+
+  EXPECT_EQ(JsonFromList(errors), R"([{"tokentype":"ERROR","line":1,"col":1,"code":"CSS_SYNTAX_UNTERMINATED_STRING","params":["style"]}])");
 }
 
 TEST(ParseCssTest, Tokenize_ProvidesErrorsWithLineColOffsets) {
@@ -199,48 +103,10 @@ TEST(ParseCssTest, Tokenize_ProvidesErrorsWithLineColOffsets) {
   vector<unique_ptr<ErrorToken>> errors;
   vector<unique_ptr<Token>> tokens =
       Tokenize(&css, /*line=*/1, /*col=*/0, &errors);
-  EXPECT_EQ(JsonFromList(errors), R""([
-  {
-    "tokentype": "ERROR",
-    "line": 1,
-    "col": 7,
-    "code": "CSS_SYNTAX_UNTERMINATED_STRING",
-    "params":    [
-      "style"
-    ]
-  },
-  {
-    "tokentype": "ERROR",
-    "line": 2,
-    "col": 7,
-    "code": "CSS_SYNTAX_UNTERMINATED_STRING",
-    "params":    [
-      "style"
-    ]
-  }
-])"");
+  EXPECT_EQ(JsonFromList(errors), R"([{"tokentype":"ERROR","line":1,"col":7,"code":"CSS_SYNTAX_UNTERMINATED_STRING","params":["style"]},{"tokentype":"ERROR","line":2,"col":7,"code":"CSS_SYNTAX_UNTERMINATED_STRING","params":["style"]}])");
   errors.clear();
   tokens = Tokenize(&css, /*line=*/5, /*col=*/5, &errors);
-  EXPECT_EQ(JsonFromList(errors), R""([
-  {
-    "tokentype": "ERROR",
-    "line": 5,
-    "col": 12,
-    "code": "CSS_SYNTAX_UNTERMINATED_STRING",
-    "params":    [
-      "style"
-    ]
-  },
-  {
-    "tokentype": "ERROR",
-    "line": 6,
-    "col": 7,
-    "code": "CSS_SYNTAX_UNTERMINATED_STRING",
-    "params":    [
-      "style"
-    ]
-  }
-])"");
+  EXPECT_EQ(JsonFromList(errors), R"([{"tokentype":"ERROR","line":5,"col":12,"code":"CSS_SYNTAX_UNTERMINATED_STRING","params":["style"]},{"tokentype":"ERROR","line":6,"col":7,"code":"CSS_SYNTAX_UNTERMINATED_STRING","params":["style"]}])");
 }
 
 TEST(ParseCssTest, Tokenize_DealsWStrayBackslashesUnterminatedCommentsBadUrls) {
@@ -249,45 +115,15 @@ TEST(ParseCssTest, Tokenize_DealsWStrayBackslashesUnterminatedCommentsBadUrls) {
   vector<unique_ptr<ErrorToken>> errors;
   vector<unique_ptr<Token>> tokens =
       Tokenize(&css, /*line=*/1, /*col=*/0, &errors);
-  EXPECT_EQ(JsonFromList(errors), R""([
-  {
-    "tokentype": "ERROR",
-    "line": 1,
-    "col": 11,
-    "code": "CSS_SYNTAX_STRAY_TRAILING_BACKSLASH",
-    "params":    [
-      "style"
-    ]
-  }
-])"");
+  EXPECT_EQ(JsonFromList(errors), R"([{"tokentype":"ERROR","line":1,"col":11,"code":"CSS_SYNTAX_STRAY_TRAILING_BACKSLASH","params":["style"]}])");
   errors.clear();
   css = htmlparser::Strings::Utf8ToCodepoints("h1 {color: red; } /*");
   tokens = Tokenize(&css, /*line=*/1, /*col=*/0, &errors);
-  EXPECT_EQ(JsonFromList(errors), R""([
-  {
-    "tokentype": "ERROR",
-    "line": 1,
-    "col": 17,
-    "code": "CSS_SYNTAX_UNTERMINATED_COMMENT",
-    "params":    [
-      "style"
-    ]
-  }
-])"");
+  EXPECT_EQ(JsonFromList(errors), R"([{"tokentype":"ERROR","line":1,"col":17,"code":"CSS_SYNTAX_UNTERMINATED_COMMENT","params":["style"]}])");
   errors.clear();
   css = htmlparser::Strings::Utf8ToCodepoints("oh hi url(foo\"bar)");
   tokens = Tokenize(&css, /*line=*/1, /*col=*/0, &errors);
-  EXPECT_EQ(JsonFromList(errors), R""([
-  {
-    "tokentype": "ERROR",
-    "line": 1,
-    "col": 6,
-    "code": "CSS_SYNTAX_BAD_URL",
-    "params":    [
-      "style"
-    ]
-  }
-])"");
+  EXPECT_EQ(JsonFromList(errors), R"([{"tokentype":"ERROR","line":1,"col":6,"code":"CSS_SYNTAX_BAD_URL","params":["style"]}])");
 }
 
 CssParsingConfig AmpCssParsingConfig() {
@@ -349,117 +185,7 @@ TEST(ParseCssTest, ParseAStylesheet_ParsesRGBValues) {
       Tokenize(&css, /*line=*/1, /*col=*/0, &errors);
   unique_ptr<Stylesheet> stylesheet =
       ParseAStylesheet(&tokens, AmpCssParsingConfig(), &errors);
-  EXPECT_EQ(stylesheet->ToJson().ToString(), R""({
-  "tokentype": "STYLESHEET",
-  "line": 1,
-  "col": 0,
-  "rules":  [
-    {
-      "tokentype": "QUALIFIED_RULE",
-      "line": 1,
-      "col": 0,
-      "prelude":      [
-        {
-          "tokentype": "IDENT",
-          "line": 1,
-          "col": 0,
-          "value": "foo"
-        },
-        {
-          "tokentype": "WHITESPACE",
-          "line": 1,
-          "col": 3
-        },
-        {
-          "tokentype": "EOF_TOKEN",
-          "line": 1,
-          "col": 4
-        }
-      ],
-      "declarations":      [
-        {
-          "tokentype": "DECLARATION",
-          "line": 1,
-          "col": 6,
-          "name": "bar",
-          "important": false,
-          "value":          [
-            {
-              "tokentype": "WHITESPACE",
-              "line": 1,
-              "col": 10
-            },
-            {
-              "tokentype": "FUNCTION_TOKEN",
-              "line": 1,
-              "col": 11,
-              "value": "rgb"
-            },
-            {
-              "tokentype": "NUMBER",
-              "line": 1,
-              "col": 15,
-              "repr": "255",
-              "type": "integer",
-              "value": 255.000000
-            },
-            {
-              "tokentype": "COMMA",
-              "line": 1,
-              "col": 18
-            },
-            {
-              "tokentype": "WHITESPACE",
-              "line": 1,
-              "col": 19
-            },
-            {
-              "tokentype": "NUMBER",
-              "line": 1,
-              "col": 20,
-              "repr": "0",
-              "type": "integer",
-              "value": 0.000000
-            },
-            {
-              "tokentype": "COMMA",
-              "line": 1,
-              "col": 21
-            },
-            {
-              "tokentype": "WHITESPACE",
-              "line": 1,
-              "col": 22
-            },
-            {
-              "tokentype": "NUMBER",
-              "line": 1,
-              "col": 23,
-              "repr": "127",
-              "type": "integer",
-              "value": 127.000000
-            },
-            {
-              "tokentype": "CLOSE_PAREN",
-              "line": 1,
-              "col": 26
-            },
-            {
-              "tokentype": "EOF_TOKEN",
-              "line": 1,
-              "col": 27
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "eof":  {
-    "tokentype": "EOF_TOKEN",
-    "line": 1,
-    "col": 30
-  }
-})"");
+  EXPECT_EQ(stylesheet->ToJson().ToString(), R"({"tokentype":"STYLESHEET","line":1,"col":0,"rules":[{"tokentype":"QUALIFIED_RULE","line":1,"col":0,"prelude":[{"tokentype":"IDENT","line":1,"col":0,"value":"foo"},{"tokentype":"WHITESPACE","line":1,"col":3},{"tokentype":"EOF_TOKEN","line":1,"col":4}],"declarations":[{"tokentype":"DECLARATION","line":1,"col":6,"name":"bar","important":false,"value":[{"tokentype":"WHITESPACE","line":1,"col":10},{"tokentype":"FUNCTION_TOKEN","line":1,"col":11,"value":"rgb"},{"tokentype":"NUMBER","line":1,"col":15,"repr":"255","type":"integer","value":255.000000},{"tokentype":"COMMA","line":1,"col":18},{"tokentype":"WHITESPACE","line":1,"col":19},{"tokentype":"NUMBER","line":1,"col":20,"repr":"0","type":"integer","value":0.000000},{"tokentype":"COMMA","line":1,"col":21},{"tokentype":"WHITESPACE","line":1,"col":22},{"tokentype":"NUMBER","line":1,"col":23,"repr":"127","type":"integer","value":127.000000},{"tokentype":"CLOSE_PAREN","line":1,"col":26},{"tokentype":"EOF_TOKEN","line":1,"col":27}]}]}],"eof":{"tokentype":"EOF_TOKEN","line":1,"col":30}})");
 
   // Some assertions about the positions of the nodes, which we
   // keep track of as well. This also tests the visitor pattern implementation.
@@ -483,43 +209,7 @@ TEST(ParseCssTest, ParseAStylesheet_ParsesAHashReference) {
       Tokenize(&css, /*line=*/1, /*col=*/0, &errors);
   unique_ptr<Stylesheet> stylesheet =
       ParseAStylesheet(&tokens, AmpCssParsingConfig(), &errors);
-  EXPECT_EQ(stylesheet->ToJson().ToString(), R""({
-  "tokentype": "STYLESHEET",
-  "line": 1,
-  "col": 0,
-  "rules":  [
-    {
-      "tokentype": "QUALIFIED_RULE",
-      "line": 1,
-      "col": 0,
-      "prelude":      [
-        {
-          "tokentype": "HASH",
-          "line": 1,
-          "col": 0,
-          "value": "foo",
-          "type": "id"
-        },
-        {
-          "tokentype": "WHITESPACE",
-          "line": 1,
-          "col": 4
-        },
-        {
-          "tokentype": "EOF_TOKEN",
-          "line": 1,
-          "col": 5
-        }
-      ],
-      "declarations":      []
-    }
-  ],
-  "eof":  {
-    "tokentype": "EOF_TOKEN",
-    "line": 1,
-    "col": 7
-  }
-})"");
+  EXPECT_EQ(stylesheet->ToJson().ToString(), R"({"tokentype":"STYLESHEET","line":1,"col":0,"rules":[{"tokentype":"QUALIFIED_RULE","line":1,"col":0,"prelude":[{"tokentype":"HASH","line":1,"col":0,"value":"foo","type":"id"},{"tokentype":"WHITESPACE","line":1,"col":4},{"tokentype":"EOF_TOKEN","line":1,"col":5}],"declarations":[]}],"eof":{"tokentype":"EOF_TOKEN","line":1,"col":7}})");
 }
 
 TEST(ParseCssTest, ParseAStylesheet_ParsesAnAtMediaRule) {
@@ -529,38 +219,7 @@ TEST(ParseCssTest, ParseAStylesheet_ParsesAnAtMediaRule) {
       Tokenize(&css, /*line=*/1, /*col=*/0, &errors);
   unique_ptr<Stylesheet> stylesheet =
       ParseAStylesheet(&tokens, AmpCssParsingConfig(), &errors);
-  EXPECT_EQ(stylesheet->ToJson().ToString(), R""({
-  "tokentype": "STYLESHEET",
-  "line": 1,
-  "col": 0,
-  "rules":  [
-    {
-      "tokentype": "AT_RULE",
-      "line": 1,
-      "col": 0,
-      "name": "media",
-      "prelude":      [
-        {
-          "tokentype": "WHITESPACE",
-          "line": 1,
-          "col": 6
-        },
-        {
-          "tokentype": "EOF_TOKEN",
-          "line": 1,
-          "col": 7
-        }
-      ],
-      "rules":      [],
-      "declarations":      []
-    }
-  ],
-  "eof":  {
-    "tokentype": "EOF_TOKEN",
-    "line": 1,
-    "col": 9
-  }
-})"");
+  EXPECT_EQ(stylesheet->ToJson().ToString(), R"({"tokentype":"STYLESHEET","line":1,"col":0,"rules":[{"tokentype":"AT_RULE","line":1,"col":0,"name":"media","prelude":[{"tokentype":"WHITESPACE","line":1,"col":6},{"tokentype":"EOF_TOKEN","line":1,"col":7}],"rules":[],"declarations":[]}],"eof":{"tokentype":"EOF_TOKEN","line":1,"col":9}})");
   EXPECT_EQ(0, errors.size());
 }
 
@@ -579,614 +238,10 @@ TEST(ParseCssTest, ParseAStylesheet_ParsesNestedMediaRulesAndDeclarations) {
   vector<unique_ptr<ErrorToken>> errors;
   vector<unique_ptr<Token>> tokens =
       Tokenize(&css, /*line=*/1, /*col=*/0, &errors);
-  EXPECT_EQ(JsonFromList(tokens), R""([
-  {
-    "tokentype": "IDENT",
-    "line": 1,
-    "col": 0,
-    "value": "h1"
-  },
-  {
-    "tokentype": "WHITESPACE",
-    "line": 1,
-    "col": 2
-  },
-  {
-    "tokentype": "OPEN_CURLY",
-    "line": 1,
-    "col": 3
-  },
-  {
-    "tokentype": "WHITESPACE",
-    "line": 1,
-    "col": 4
-  },
-  {
-    "tokentype": "IDENT",
-    "line": 1,
-    "col": 5,
-    "value": "color"
-  },
-  {
-    "tokentype": "COLON",
-    "line": 1,
-    "col": 10
-  },
-  {
-    "tokentype": "WHITESPACE",
-    "line": 1,
-    "col": 11
-  },
-  {
-    "tokentype": "IDENT",
-    "line": 1,
-    "col": 12,
-    "value": "red"
-  },
-  {
-    "tokentype": "SEMICOLON",
-    "line": 1,
-    "col": 15
-  },
-  {
-    "tokentype": "WHITESPACE",
-    "line": 1,
-    "col": 16
-  },
-  {
-    "tokentype": "CLOSE_CURLY",
-    "line": 1,
-    "col": 17
-  },
-  {
-    "tokentype": "WHITESPACE",
-    "line": 1,
-    "col": 18
-  },
-  {
-    "tokentype": "AT_KEYWORD",
-    "line": 2,
-    "col": 0,
-    "value": "media"
-  },
-  {
-    "tokentype": "WHITESPACE",
-    "line": 2,
-    "col": 6
-  },
-  {
-    "tokentype": "IDENT",
-    "line": 2,
-    "col": 7,
-    "value": "print"
-  },
-  {
-    "tokentype": "WHITESPACE",
-    "line": 2,
-    "col": 12
-  },
-  {
-    "tokentype": "OPEN_CURLY",
-    "line": 2,
-    "col": 13
-  },
-  {
-    "tokentype": "WHITESPACE",
-    "line": 2,
-    "col": 14
-  },
-  {
-    "tokentype": "AT_KEYWORD",
-    "line": 3,
-    "col": 2,
-    "value": "media"
-  },
-  {
-    "tokentype": "WHITESPACE",
-    "line": 3,
-    "col": 8
-  },
-  {
-    "tokentype": "IDENT",
-    "line": 3,
-    "col": 9,
-    "value": "print"
-  },
-  {
-    "tokentype": "WHITESPACE",
-    "line": 3,
-    "col": 14
-  },
-  {
-    "tokentype": "OPEN_CURLY",
-    "line": 3,
-    "col": 15
-  },
-  {
-    "tokentype": "WHITESPACE",
-    "line": 3,
-    "col": 16
-  },
-  {
-    "tokentype": "IDENT",
-    "line": 4,
-    "col": 4,
-    "value": "h2"
-  },
-  {
-    "tokentype": "DELIM",
-    "line": 4,
-    "col": 6,
-    "value": "."
-  },
-  {
-    "tokentype": "IDENT",
-    "line": 4,
-    "col": 7,
-    "value": "bar"
-  },
-  {
-    "tokentype": "WHITESPACE",
-    "line": 4,
-    "col": 10
-  },
-  {
-    "tokentype": "OPEN_CURLY",
-    "line": 4,
-    "col": 11
-  },
-  {
-    "tokentype": "WHITESPACE",
-    "line": 4,
-    "col": 12
-  },
-  {
-    "tokentype": "IDENT",
-    "line": 4,
-    "col": 13,
-    "value": "size"
-  },
-  {
-    "tokentype": "COLON",
-    "line": 4,
-    "col": 17
-  },
-  {
-    "tokentype": "WHITESPACE",
-    "line": 4,
-    "col": 18
-  },
-  {
-    "tokentype": "DIMENSION",
-    "line": 4,
-    "col": 19,
-    "repr": "4",
-    "type": "integer",
-    "unit": "px",
-    "value": 4.000000
-  },
-  {
-    "tokentype": "SEMICOLON",
-    "line": 4,
-    "col": 22
-  },
-  {
-    "tokentype": "WHITESPACE",
-    "line": 4,
-    "col": 23
-  },
-  {
-    "tokentype": "CLOSE_CURLY",
-    "line": 4,
-    "col": 24
-  },
-  {
-    "tokentype": "WHITESPACE",
-    "line": 4,
-    "col": 25
-  },
-  {
-    "tokentype": "CLOSE_CURLY",
-    "line": 5,
-    "col": 2
-  },
-  {
-    "tokentype": "WHITESPACE",
-    "line": 5,
-    "col": 3
-  },
-  {
-    "tokentype": "CLOSE_CURLY",
-    "line": 6,
-    "col": 0
-  },
-  {
-    "tokentype": "WHITESPACE",
-    "line": 6,
-    "col": 1
-  },
-  {
-    "tokentype": "AT_KEYWORD",
-    "line": 7,
-    "col": 0,
-    "value": "font-face"
-  },
-  {
-    "tokentype": "WHITESPACE",
-    "line": 7,
-    "col": 10
-  },
-  {
-    "tokentype": "OPEN_CURLY",
-    "line": 7,
-    "col": 11
-  },
-  {
-    "tokentype": "WHITESPACE",
-    "line": 7,
-    "col": 12
-  },
-  {
-    "tokentype": "IDENT",
-    "line": 8,
-    "col": 2,
-    "value": "font-family"
-  },
-  {
-    "tokentype": "COLON",
-    "line": 8,
-    "col": 13
-  },
-  {
-    "tokentype": "WHITESPACE",
-    "line": 8,
-    "col": 14
-  },
-  {
-    "tokentype": "STRING",
-    "line": 8,
-    "col": 15,
-    "value": "MyFont"
-  },
-  {
-    "tokentype": "SEMICOLON",
-    "line": 8,
-    "col": 23
-  },
-  {
-    "tokentype": "WHITESPACE",
-    "line": 8,
-    "col": 24
-  },
-  {
-    "tokentype": "IDENT",
-    "line": 9,
-    "col": 2,
-    "value": "src"
-  },
-  {
-    "tokentype": "COLON",
-    "line": 9,
-    "col": 5
-  },
-  {
-    "tokentype": "WHITESPACE",
-    "line": 9,
-    "col": 6
-  },
-  {
-    "tokentype": "FUNCTION_TOKEN",
-    "line": 9,
-    "col": 7,
-    "value": "url"
-  },
-  {
-    "tokentype": "STRING",
-    "line": 9,
-    "col": 11,
-    "value": "foo.ttf"
-  },
-  {
-    "tokentype": "CLOSE_PAREN",
-    "line": 9,
-    "col": 20
-  },
-  {
-    "tokentype": "SEMICOLON",
-    "line": 9,
-    "col": 21
-  },
-  {
-    "tokentype": "WHITESPACE",
-    "line": 9,
-    "col": 22
-  },
-  {
-    "tokentype": "CLOSE_CURLY",
-    "line": 10,
-    "col": 0
-  },
-  {
-    "tokentype": "EOF_TOKEN",
-    "line": 10,
-    "col": 1
-  }
-])"");
+  EXPECT_EQ(JsonFromList(tokens), R"([{"tokentype":"IDENT","line":1,"col":0,"value":"h1"},{"tokentype":"WHITESPACE","line":1,"col":2},{"tokentype":"OPEN_CURLY","line":1,"col":3},{"tokentype":"WHITESPACE","line":1,"col":4},{"tokentype":"IDENT","line":1,"col":5,"value":"color"},{"tokentype":"COLON","line":1,"col":10},{"tokentype":"WHITESPACE","line":1,"col":11},{"tokentype":"IDENT","line":1,"col":12,"value":"red"},{"tokentype":"SEMICOLON","line":1,"col":15},{"tokentype":"WHITESPACE","line":1,"col":16},{"tokentype":"CLOSE_CURLY","line":1,"col":17},{"tokentype":"WHITESPACE","line":1,"col":18},{"tokentype":"AT_KEYWORD","line":2,"col":0,"value":"media"},{"tokentype":"WHITESPACE","line":2,"col":6},{"tokentype":"IDENT","line":2,"col":7,"value":"print"},{"tokentype":"WHITESPACE","line":2,"col":12},{"tokentype":"OPEN_CURLY","line":2,"col":13},{"tokentype":"WHITESPACE","line":2,"col":14},{"tokentype":"AT_KEYWORD","line":3,"col":2,"value":"media"},{"tokentype":"WHITESPACE","line":3,"col":8},{"tokentype":"IDENT","line":3,"col":9,"value":"print"},{"tokentype":"WHITESPACE","line":3,"col":14},{"tokentype":"OPEN_CURLY","line":3,"col":15},{"tokentype":"WHITESPACE","line":3,"col":16},{"tokentype":"IDENT","line":4,"col":4,"value":"h2"},{"tokentype":"DELIM","line":4,"col":6,"value":"."},{"tokentype":"IDENT","line":4,"col":7,"value":"bar"},{"tokentype":"WHITESPACE","line":4,"col":10},{"tokentype":"OPEN_CURLY","line":4,"col":11},{"tokentype":"WHITESPACE","line":4,"col":12},{"tokentype":"IDENT","line":4,"col":13,"value":"size"},{"tokentype":"COLON","line":4,"col":17},{"tokentype":"WHITESPACE","line":4,"col":18},{"tokentype":"DIMENSION","line":4,"col":19,"repr":"4","type":"integer","unit":"px","value":4.000000},{"tokentype":"SEMICOLON","line":4,"col":22},{"tokentype":"WHITESPACE","line":4,"col":23},{"tokentype":"CLOSE_CURLY","line":4,"col":24},{"tokentype":"WHITESPACE","line":4,"col":25},{"tokentype":"CLOSE_CURLY","line":5,"col":2},{"tokentype":"WHITESPACE","line":5,"col":3},{"tokentype":"CLOSE_CURLY","line":6,"col":0},{"tokentype":"WHITESPACE","line":6,"col":1},{"tokentype":"AT_KEYWORD","line":7,"col":0,"value":"font-face"},{"tokentype":"WHITESPACE","line":7,"col":10},{"tokentype":"OPEN_CURLY","line":7,"col":11},{"tokentype":"WHITESPACE","line":7,"col":12},{"tokentype":"IDENT","line":8,"col":2,"value":"font-family"},{"tokentype":"COLON","line":8,"col":13},{"tokentype":"WHITESPACE","line":8,"col":14},{"tokentype":"STRING","line":8,"col":15,"value":"MyFont"},{"tokentype":"SEMICOLON","line":8,"col":23},{"tokentype":"WHITESPACE","line":8,"col":24},{"tokentype":"IDENT","line":9,"col":2,"value":"src"},{"tokentype":"COLON","line":9,"col":5},{"tokentype":"WHITESPACE","line":9,"col":6},{"tokentype":"FUNCTION_TOKEN","line":9,"col":7,"value":"url"},{"tokentype":"STRING","line":9,"col":11,"value":"foo.ttf"},{"tokentype":"CLOSE_PAREN","line":9,"col":20},{"tokentype":"SEMICOLON","line":9,"col":21},{"tokentype":"WHITESPACE","line":9,"col":22},{"tokentype":"CLOSE_CURLY","line":10,"col":0},{"tokentype":"EOF_TOKEN","line":10,"col":1}])");
   unique_ptr<Stylesheet> stylesheet =
       ParseAStylesheet(&tokens, AmpCssParsingConfig(), &errors);
-  EXPECT_EQ(stylesheet->ToJson().ToString(), R""({
-  "tokentype": "STYLESHEET",
-  "line": 1,
-  "col": 0,
-  "rules":  [
-    {
-      "tokentype": "QUALIFIED_RULE",
-      "line": 1,
-      "col": 0,
-      "prelude":      [
-        {
-          "tokentype": "IDENT",
-          "line": 1,
-          "col": 0,
-          "value": "h1"
-        },
-        {
-          "tokentype": "WHITESPACE",
-          "line": 1,
-          "col": 2
-        },
-        {
-          "tokentype": "EOF_TOKEN",
-          "line": 1,
-          "col": 3
-        }
-      ],
-      "declarations":      [
-        {
-          "tokentype": "DECLARATION",
-          "line": 1,
-          "col": 5,
-          "name": "color",
-          "important": false,
-          "value":          [
-            {
-              "tokentype": "WHITESPACE",
-              "line": 1,
-              "col": 11
-            },
-            {
-              "tokentype": "IDENT",
-              "line": 1,
-              "col": 12,
-              "value": "red"
-            },
-            {
-              "tokentype": "EOF_TOKEN",
-              "line": 1,
-              "col": 15
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "tokentype": "AT_RULE",
-      "line": 2,
-      "col": 0,
-      "name": "media",
-      "prelude":      [
-        {
-          "tokentype": "WHITESPACE",
-          "line": 2,
-          "col": 6
-        },
-        {
-          "tokentype": "IDENT",
-          "line": 2,
-          "col": 7,
-          "value": "print"
-        },
-        {
-          "tokentype": "WHITESPACE",
-          "line": 2,
-          "col": 12
-        },
-        {
-          "tokentype": "EOF_TOKEN",
-          "line": 2,
-          "col": 13
-        }
-      ],
-      "rules":      [
-        {
-          "tokentype": "AT_RULE",
-          "line": 3,
-          "col": 2,
-          "name": "media",
-          "prelude":          [
-            {
-              "tokentype": "WHITESPACE",
-              "line": 3,
-              "col": 8
-            },
-            {
-              "tokentype": "IDENT",
-              "line": 3,
-              "col": 9,
-              "value": "print"
-            },
-            {
-              "tokentype": "WHITESPACE",
-              "line": 3,
-              "col": 14
-            },
-            {
-              "tokentype": "EOF_TOKEN",
-              "line": 3,
-              "col": 15
-            }
-          ],
-          "rules":          [
-            {
-              "tokentype": "QUALIFIED_RULE",
-              "line": 4,
-              "col": 4,
-              "prelude":              [
-                {
-                  "tokentype": "IDENT",
-                  "line": 4,
-                  "col": 4,
-                  "value": "h2"
-                },
-                {
-                  "tokentype": "DELIM",
-                  "line": 4,
-                  "col": 6,
-                  "value": "."
-                },
-                {
-                  "tokentype": "IDENT",
-                  "line": 4,
-                  "col": 7,
-                  "value": "bar"
-                },
-                {
-                  "tokentype": "WHITESPACE",
-                  "line": 4,
-                  "col": 10
-                },
-                {
-                  "tokentype": "EOF_TOKEN",
-                  "line": 4,
-                  "col": 11
-                }
-              ],
-              "declarations":              [
-                {
-                  "tokentype": "DECLARATION",
-                  "line": 4,
-                  "col": 13,
-                  "name": "size",
-                  "important": false,
-                  "value":                  [
-                    {
-                      "tokentype": "WHITESPACE",
-                      "line": 4,
-                      "col": 18
-                    },
-                    {
-                      "tokentype": "DIMENSION",
-                      "line": 4,
-                      "col": 19,
-                      "repr": "4",
-                      "type": "integer",
-                      "unit": "px",
-                      "value": 4.000000
-                    },
-                    {
-                      "tokentype": "EOF_TOKEN",
-                      "line": 4,
-                      "col": 22
-                    }
-                  ]
-                }
-              ]
-            }
-          ],
-          "declarations":          []
-        }
-      ],
-      "declarations":      []
-    },
-    {
-      "tokentype": "AT_RULE",
-      "line": 7,
-      "col": 0,
-      "name": "font-face",
-      "prelude":      [
-        {
-          "tokentype": "WHITESPACE",
-          "line": 7,
-          "col": 10
-        },
-        {
-          "tokentype": "EOF_TOKEN",
-          "line": 7,
-          "col": 11
-        }
-      ],
-      "rules":      [],
-      "declarations":      [
-        {
-          "tokentype": "DECLARATION",
-          "line": 8,
-          "col": 2,
-          "name": "font-family",
-          "important": false,
-          "value":          [
-            {
-              "tokentype": "WHITESPACE",
-              "line": 8,
-              "col": 14
-            },
-            {
-              "tokentype": "STRING",
-              "line": 8,
-              "col": 15,
-              "value": "MyFont"
-            },
-            {
-              "tokentype": "EOF_TOKEN",
-              "line": 8,
-              "col": 23
-            }
-          ]
-        },
-        {
-          "tokentype": "DECLARATION",
-          "line": 9,
-          "col": 2,
-          "name": "src",
-          "important": false,
-          "value":          [
-            {
-              "tokentype": "WHITESPACE",
-              "line": 9,
-              "col": 6
-            },
-            {
-              "tokentype": "FUNCTION_TOKEN",
-              "line": 9,
-              "col": 7,
-              "value": "url"
-            },
-            {
-              "tokentype": "STRING",
-              "line": 9,
-              "col": 11,
-              "value": "foo.ttf"
-            },
-            {
-              "tokentype": "CLOSE_PAREN",
-              "line": 9,
-              "col": 20
-            },
-            {
-              "tokentype": "EOF_TOKEN",
-              "line": 9,
-              "col": 21
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "eof":  {
-    "tokentype": "EOF_TOKEN",
-    "line": 10,
-    "col": 1
-  }
-})"");
+  EXPECT_EQ(stylesheet->ToJson().ToString(), R"({"tokentype":"STYLESHEET","line":1,"col":0,"rules":[{"tokentype":"QUALIFIED_RULE","line":1,"col":0,"prelude":[{"tokentype":"IDENT","line":1,"col":0,"value":"h1"},{"tokentype":"WHITESPACE","line":1,"col":2},{"tokentype":"EOF_TOKEN","line":1,"col":3}],"declarations":[{"tokentype":"DECLARATION","line":1,"col":5,"name":"color","important":false,"value":[{"tokentype":"WHITESPACE","line":1,"col":11},{"tokentype":"IDENT","line":1,"col":12,"value":"red"},{"tokentype":"EOF_TOKEN","line":1,"col":15}]}]},{"tokentype":"AT_RULE","line":2,"col":0,"name":"media","prelude":[{"tokentype":"WHITESPACE","line":2,"col":6},{"tokentype":"IDENT","line":2,"col":7,"value":"print"},{"tokentype":"WHITESPACE","line":2,"col":12},{"tokentype":"EOF_TOKEN","line":2,"col":13}],"rules":[{"tokentype":"AT_RULE","line":3,"col":2,"name":"media","prelude":[{"tokentype":"WHITESPACE","line":3,"col":8},{"tokentype":"IDENT","line":3,"col":9,"value":"print"},{"tokentype":"WHITESPACE","line":3,"col":14},{"tokentype":"EOF_TOKEN","line":3,"col":15}],"rules":[{"tokentype":"QUALIFIED_RULE","line":4,"col":4,"prelude":[{"tokentype":"IDENT","line":4,"col":4,"value":"h2"},{"tokentype":"DELIM","line":4,"col":6,"value":"."},{"tokentype":"IDENT","line":4,"col":7,"value":"bar"},{"tokentype":"WHITESPACE","line":4,"col":10},{"tokentype":"EOF_TOKEN","line":4,"col":11}],"declarations":[{"tokentype":"DECLARATION","line":4,"col":13,"name":"size","important":false,"value":[{"tokentype":"WHITESPACE","line":4,"col":18},{"tokentype":"DIMENSION","line":4,"col":19,"repr":"4","type":"integer","unit":"px","value":4.000000},{"tokentype":"EOF_TOKEN","line":4,"col":22}]}]}],"declarations":[]}],"declarations":[]},{"tokentype":"AT_RULE","line":7,"col":0,"name":"font-face","prelude":[{"tokentype":"WHITESPACE","line":7,"col":10},{"tokentype":"EOF_TOKEN","line":7,"col":11}],"rules":[],"declarations":[{"tokentype":"DECLARATION","line":8,"col":2,"name":"font-family","important":false,"value":[{"tokentype":"WHITESPACE","line":8,"col":14},{"tokentype":"STRING","line":8,"col":15,"value":"MyFont"},{"tokentype":"EOF_TOKEN","line":8,"col":23}]},{"tokentype":"DECLARATION","line":9,"col":2,"name":"src","important":false,"value":[{"tokentype":"WHITESPACE","line":9,"col":6},{"tokentype":"FUNCTION_TOKEN","line":9,"col":7,"value":"url"},{"tokentype":"STRING","line":9,"col":11,"value":"foo.ttf"},{"tokentype":"CLOSE_PAREN","line":9,"col":20},{"tokentype":"EOF_TOKEN","line":9,"col":21}]}]}],"eof":{"tokentype":"EOF_TOKEN","line":10,"col":1}})");
   EXPECT_EQ(0, errors.size());
 }
 
@@ -1201,36 +256,7 @@ TEST(ParseCssTest, ParseAStylesheet_GeneratesErrorsNotAssertionsForInvalidCss) {
       Tokenize(&css, /*line=*/1, /*col=*/0, &errors);
   unique_ptr<Stylesheet> stylesheet =
       ParseAStylesheet(&tokens, AmpCssParsingConfig(), &errors);
-  EXPECT_EQ(JsonFromList(errors), R""([
-  {
-    "tokentype": "ERROR",
-    "line": 1,
-    "col": 7,
-    "code": "CSS_SYNTAX_INCOMPLETE_DECLARATION",
-    "params":    [
-      "style"
-    ]
-  },
-  {
-    "tokentype": "ERROR",
-    "line": 2,
-    "col": 13,
-    "code": "CSS_SYNTAX_INVALID_AT_RULE",
-    "params":    [
-      "style",
-      "media"
-    ]
-  },
-  {
-    "tokentype": "ERROR",
-    "line": 4,
-    "col": 0,
-    "code": "CSS_SYNTAX_EOF_IN_PRELUDE_OF_QUALIFIED_RULE",
-    "params":    [
-      "style"
-    ]
-  }
-])"");
+  EXPECT_EQ(JsonFromList(errors), R"([{"tokentype":"ERROR","line":1,"col":7,"code":"CSS_SYNTAX_INCOMPLETE_DECLARATION","params":["style"]},{"tokentype":"ERROR","line":2,"col":13,"code":"CSS_SYNTAX_INVALID_AT_RULE","params":["style","media"]},{"tokentype":"ERROR","line":4,"col":0,"code":"CSS_SYNTAX_EOF_IN_PRELUDE_OF_QUALIFIED_RULE","params":["style"]}])");
 }
 
 TEST(ParseCssTest, ParseAStylesheet_GeneratesErrorsBasedOnTheGrammar) {
@@ -1242,74 +268,8 @@ TEST(ParseCssTest, ParseAStylesheet_GeneratesErrorsBasedOnTheGrammar) {
       Tokenize(&css, /*line=*/1, /*col=*/0, &errors);
   unique_ptr<Stylesheet> stylesheet =
       ParseAStylesheet(&tokens, AmpCssParsingConfig(), &errors);
-  EXPECT_EQ(JsonFromList(errors), R""([
-  {
-    "tokentype": "ERROR",
-    "line": 2,
-    "col": 5,
-    "code": "CSS_SYNTAX_INCOMPLETE_DECLARATION",
-    "params":    [
-      "style"
-    ]
-  }
-])"");
-  EXPECT_EQ(stylesheet->ToJson().ToString(), R""({
-  "tokentype": "STYLESHEET",
-  "line": 1,
-  "col": 0,
-  "rules":  [
-    {
-      "tokentype": "AT_RULE",
-      "line": 1,
-      "col": 0,
-      "name": "gregable",
-      "prelude":      [
-        {
-          "tokentype": "WHITESPACE",
-          "line": 1,
-          "col": 9
-        },
-        {
-          "tokentype": "EOF_TOKEN",
-          "line": 1,
-          "col": 10
-        }
-      ],
-      "rules":      [],
-      "declarations":      []
-    },
-    {
-      "tokentype": "QUALIFIED_RULE",
-      "line": 2,
-      "col": 0,
-      "prelude":      [
-        {
-          "tokentype": "DELIM",
-          "line": 2,
-          "col": 0,
-          "value": "."
-        },
-        {
-          "tokentype": "IDENT",
-          "line": 2,
-          "col": 1,
-          "value": "foo"
-        },
-        {
-          "tokentype": "EOF_TOKEN",
-          "line": 2,
-          "col": 4
-        }
-      ],
-      "declarations":      []
-    }
-  ],
-  "eof":  {
-    "tokentype": "EOF_TOKEN",
-    "line": 2,
-    "col": 10
-  }
-})"");
+  EXPECT_EQ(JsonFromList(errors), R"([{"tokentype":"ERROR","line":2,"col":5,"code":"CSS_SYNTAX_INCOMPLETE_DECLARATION","params":["style"]}])");
+  EXPECT_EQ(stylesheet->ToJson().ToString(), R"({"tokentype":"STYLESHEET","line":1,"col":0,"rules":[{"tokentype":"AT_RULE","line":1,"col":0,"name":"gregable","prelude":[{"tokentype":"WHITESPACE","line":1,"col":9},{"tokentype":"EOF_TOKEN","line":1,"col":10}],"rules":[],"declarations":[]},{"tokentype":"QUALIFIED_RULE","line":2,"col":0,"prelude":[{"tokentype":"DELIM","line":2,"col":0,"value":"."},{"tokentype":"IDENT","line":2,"col":1,"value":"foo"},{"tokentype":"EOF_TOKEN","line":2,"col":4}],"declarations":[]}],"eof":{"tokentype":"EOF_TOKEN","line":2,"col":10}})");
 }
 
 TEST(ParseCssTest, ParseAStylesheet_HandlesANestedMediaRuleWithDeclarations) {
@@ -1326,228 +286,7 @@ TEST(ParseCssTest, ParseAStylesheet_HandlesANestedMediaRuleWithDeclarations) {
       Tokenize(&css, /*line=*/1, /*col=*/0, &errors);
   unique_ptr<Stylesheet> stylesheet =
       ParseAStylesheet(&tokens, AmpCssParsingConfig(), &errors);
-  EXPECT_EQ(stylesheet->ToJson().ToString(), R""({
-  "tokentype": "STYLESHEET",
-  "line": 1,
-  "col": 0,
-  "rules":  [
-    {
-      "tokentype": "AT_RULE",
-      "line": 1,
-      "col": 0,
-      "name": "media",
-      "prelude":      [
-        {
-          "tokentype": "WHITESPACE",
-          "line": 1,
-          "col": 6
-        },
-        {
-          "tokentype": "IDENT",
-          "line": 1,
-          "col": 7,
-          "value": "print"
-        },
-        {
-          "tokentype": "WHITESPACE",
-          "line": 1,
-          "col": 12
-        },
-        {
-          "tokentype": "EOF_TOKEN",
-          "line": 1,
-          "col": 13
-        }
-      ],
-      "rules":      [
-        {
-          "tokentype": "QUALIFIED_RULE",
-          "line": 3,
-          "col": 0,
-          "prelude":          [
-            {
-              "tokentype": "HASH",
-              "line": 3,
-              "col": 0,
-              "value": "navigation",
-              "type": "id"
-            },
-            {
-              "tokentype": "WHITESPACE",
-              "line": 3,
-              "col": 11
-            },
-            {
-              "tokentype": "EOF_TOKEN",
-              "line": 3,
-              "col": 12
-            }
-          ],
-          "declarations":          [
-            {
-              "tokentype": "DECLARATION",
-              "line": 3,
-              "col": 14,
-              "name": "display",
-              "important": false,
-              "value":              [
-                {
-                  "tokentype": "WHITESPACE",
-                  "line": 3,
-                  "col": 22
-                },
-                {
-                  "tokentype": "IDENT",
-                  "line": 3,
-                  "col": 23,
-                  "value": "none"
-                },
-                {
-                  "tokentype": "WHITESPACE",
-                  "line": 3,
-                  "col": 27
-                },
-                {
-                  "tokentype": "EOF_TOKEN",
-                  "line": 3,
-                  "col": 28
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "tokentype": "AT_RULE",
-          "line": 4,
-          "col": 0,
-          "name": "media",
-          "prelude":          [
-            {
-              "tokentype": "WHITESPACE",
-              "line": 4,
-              "col": 6
-            },
-            {
-              "tokentype": "OPEN_PAREN",
-              "line": 4,
-              "col": 7
-            },
-            {
-              "tokentype": "IDENT",
-              "line": 4,
-              "col": 8,
-              "value": "max-width"
-            },
-            {
-              "tokentype": "COLON",
-              "line": 4,
-              "col": 17
-            },
-            {
-              "tokentype": "WHITESPACE",
-              "line": 4,
-              "col": 18
-            },
-            {
-              "tokentype": "DIMENSION",
-              "line": 4,
-              "col": 19,
-              "repr": "12",
-              "type": "integer",
-              "unit": "cm",
-              "value": 12.000000
-            },
-            {
-              "tokentype": "CLOSE_PAREN",
-              "line": 4,
-              "col": 23
-            },
-            {
-              "tokentype": "WHITESPACE",
-              "line": 4,
-              "col": 24
-            },
-            {
-              "tokentype": "EOF_TOKEN",
-              "line": 4,
-              "col": 25
-            }
-          ],
-          "rules":          [
-            {
-              "tokentype": "QUALIFIED_RULE",
-              "line": 6,
-              "col": 2,
-              "prelude":              [
-                {
-                  "tokentype": "DELIM",
-                  "line": 6,
-                  "col": 2,
-                  "value": "."
-                },
-                {
-                  "tokentype": "IDENT",
-                  "line": 6,
-                  "col": 3,
-                  "value": "note"
-                },
-                {
-                  "tokentype": "WHITESPACE",
-                  "line": 6,
-                  "col": 7
-                },
-                {
-                  "tokentype": "EOF_TOKEN",
-                  "line": 6,
-                  "col": 8
-                }
-              ],
-              "declarations":              [
-                {
-                  "tokentype": "DECLARATION",
-                  "line": 6,
-                  "col": 10,
-                  "name": "float",
-                  "important": false,
-                  "value":                  [
-                    {
-                      "tokentype": "WHITESPACE",
-                      "line": 6,
-                      "col": 16
-                    },
-                    {
-                      "tokentype": "IDENT",
-                      "line": 6,
-                      "col": 17,
-                      "value": "none"
-                    },
-                    {
-                      "tokentype": "WHITESPACE",
-                      "line": 6,
-                      "col": 21
-                    },
-                    {
-                      "tokentype": "EOF_TOKEN",
-                      "line": 6,
-                      "col": 22
-                    }
-                  ]
-                }
-              ]
-            }
-          ],
-          "declarations":          []
-        }
-      ],
-      "declarations":      []
-    }
-  ],
-  "eof":  {
-    "tokentype": "EOF_TOKEN",
-    "line": 7,
-    "col": 1
-  }
-})"");
+  EXPECT_EQ(stylesheet->ToJson().ToString(), R"({"tokentype":"STYLESHEET","line":1,"col":0,"rules":[{"tokentype":"AT_RULE","line":1,"col":0,"name":"media","prelude":[{"tokentype":"WHITESPACE","line":1,"col":6},{"tokentype":"IDENT","line":1,"col":7,"value":"print"},{"tokentype":"WHITESPACE","line":1,"col":12},{"tokentype":"EOF_TOKEN","line":1,"col":13}],"rules":[{"tokentype":"QUALIFIED_RULE","line":3,"col":0,"prelude":[{"tokentype":"HASH","line":3,"col":0,"value":"navigation","type":"id"},{"tokentype":"WHITESPACE","line":3,"col":11},{"tokentype":"EOF_TOKEN","line":3,"col":12}],"declarations":[{"tokentype":"DECLARATION","line":3,"col":14,"name":"display","important":false,"value":[{"tokentype":"WHITESPACE","line":3,"col":22},{"tokentype":"IDENT","line":3,"col":23,"value":"none"},{"tokentype":"WHITESPACE","line":3,"col":27},{"tokentype":"EOF_TOKEN","line":3,"col":28}]}]},{"tokentype":"AT_RULE","line":4,"col":0,"name":"media","prelude":[{"tokentype":"WHITESPACE","line":4,"col":6},{"tokentype":"OPEN_PAREN","line":4,"col":7},{"tokentype":"IDENT","line":4,"col":8,"value":"max-width"},{"tokentype":"COLON","line":4,"col":17},{"tokentype":"WHITESPACE","line":4,"col":18},{"tokentype":"DIMENSION","line":4,"col":19,"repr":"12","type":"integer","unit":"cm","value":12.000000},{"tokentype":"CLOSE_PAREN","line":4,"col":23},{"tokentype":"WHITESPACE","line":4,"col":24},{"tokentype":"EOF_TOKEN","line":4,"col":25}],"rules":[{"tokentype":"QUALIFIED_RULE","line":6,"col":2,"prelude":[{"tokentype":"DELIM","line":6,"col":2,"value":"."},{"tokentype":"IDENT","line":6,"col":3,"value":"note"},{"tokentype":"WHITESPACE","line":6,"col":7},{"tokentype":"EOF_TOKEN","line":6,"col":8}],"declarations":[{"tokentype":"DECLARATION","line":6,"col":10,"name":"float","important":false,"value":[{"tokentype":"WHITESPACE","line":6,"col":16},{"tokentype":"IDENT","line":6,"col":17,"value":"none"},{"tokentype":"WHITESPACE","line":6,"col":21},{"tokentype":"EOF_TOKEN","line":6,"col":22}]}]}],"declarations":[]}],"declarations":[]}],"eof":{"tokentype":"EOF_TOKEN","line":7,"col":1}})");
   EXPECT_EQ(0, errors.size());
 }
 
@@ -1560,68 +299,7 @@ TEST(ParseCssTest,
       Tokenize(&css, /*line=*/1, /*col=*/0, &errors);
   unique_ptr<Stylesheet> stylesheet =
       ParseAStylesheet(&tokens, AmpCssParsingConfig(), &errors);
-  EXPECT_EQ(stylesheet->ToJson().ToString(), R""({
-  "tokentype": "STYLESHEET",
-  "line": 1,
-  "col": 0,
-  "rules":  [
-    {
-      "tokentype": "QUALIFIED_RULE",
-      "line": 1,
-      "col": 1,
-      "prelude":      [
-        {
-          "tokentype": "IDENT",
-          "line": 1,
-          "col": 1,
-          "value": "h1"
-        },
-        {
-          "tokentype": "WHITESPACE",
-          "line": 1,
-          "col": 3
-        },
-        {
-          "tokentype": "EOF_TOKEN",
-          "line": 1,
-          "col": 4
-        }
-      ],
-      "declarations":      [
-        {
-          "tokentype": "DECLARATION",
-          "line": 1,
-          "col": 6,
-          "name": "color",
-          "important": false,
-          "value":          [
-            {
-              "tokentype": "WHITESPACE",
-              "line": 1,
-              "col": 12
-            },
-            {
-              "tokentype": "IDENT",
-              "line": 1,
-              "col": 13,
-              "value": "blue"
-            },
-            {
-              "tokentype": "EOF_TOKEN",
-              "line": 1,
-              "col": 17
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "eof":  {
-    "tokentype": "EOF_TOKEN",
-    "line": 1,
-    "col": 21
-  }
-})"");
+  EXPECT_EQ(stylesheet->ToJson().ToString(), R"({"tokentype":"STYLESHEET","line":1,"col":0,"rules":[{"tokentype":"QUALIFIED_RULE","line":1,"col":1,"prelude":[{"tokentype":"IDENT","line":1,"col":1,"value":"h1"},{"tokentype":"WHITESPACE","line":1,"col":3},{"tokentype":"EOF_TOKEN","line":1,"col":4}],"declarations":[{"tokentype":"DECLARATION","line":1,"col":6,"name":"color","important":false,"value":[{"tokentype":"WHITESPACE","line":1,"col":12},{"tokentype":"IDENT","line":1,"col":13,"value":"blue"},{"tokentype":"EOF_TOKEN","line":1,"col":17}]}]}],"eof":{"tokentype":"EOF_TOKEN","line":1,"col":21}})");
   EXPECT_EQ(0, errors.size());
 }
 
@@ -1657,68 +335,7 @@ TEST(ParseCssTest, Important) {
       Tokenize(&css, /*line=*/1, /*col=*/0, &errors);
   unique_ptr<Stylesheet> stylesheet =
       ParseAStylesheet(&tokens, AmpCssParsingConfig(), &errors);
-  EXPECT_EQ(stylesheet->ToJson().ToString(), R""({
-  "tokentype": "STYLESHEET",
-  "line": 1,
-  "col": 0,
-  "rules":  [
-    {
-      "tokentype": "QUALIFIED_RULE",
-      "line": 1,
-      "col": 0,
-      "prelude":      [
-        {
-          "tokentype": "IDENT",
-          "line": 1,
-          "col": 0,
-          "value": "b"
-        },
-        {
-          "tokentype": "WHITESPACE",
-          "line": 1,
-          "col": 1
-        },
-        {
-          "tokentype": "EOF_TOKEN",
-          "line": 1,
-          "col": 2
-        }
-      ],
-      "declarations":      [
-        {
-          "tokentype": "DECLARATION",
-          "line": 1,
-          "col": 4,
-          "name": "color",
-          "important": true,
-          "value":          [
-            {
-              "tokentype": "IDENT",
-              "line": 1,
-              "col": 10,
-              "value": "red"
-            },
-            {
-              "tokentype": "WHITESPACE",
-              "line": 1,
-              "col": 13
-            },
-            {
-              "tokentype": "EOF_TOKEN",
-              "line": 1,
-              "col": 25
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "eof":  {
-    "tokentype": "EOF_TOKEN",
-    "line": 1,
-    "col": 26
-  }
-})"");
+  EXPECT_EQ(stylesheet->ToJson().ToString(), R"({"tokentype":"STYLESHEET","line":1,"col":0,"rules":[{"tokentype":"QUALIFIED_RULE","line":1,"col":0,"prelude":[{"tokentype":"IDENT","line":1,"col":0,"value":"b"},{"tokentype":"WHITESPACE","line":1,"col":1},{"tokentype":"EOF_TOKEN","line":1,"col":2}],"declarations":[{"tokentype":"DECLARATION","line":1,"col":4,"name":"color","important":true,"value":[{"tokentype":"IDENT","line":1,"col":10,"value":"red"},{"tokentype":"WHITESPACE","line":1,"col":13},{"tokentype":"EOF_TOKEN","line":1,"col":25}]}]}],"eof":{"tokentype":"EOF_TOKEN","line":1,"col":26}})");
 }
 
 TEST(ParseCssTest, ParseAStyleSheet_ImagesAndFonts) {
@@ -1735,384 +352,7 @@ TEST(ParseCssTest, ParseAStyleSheet_ImagesAndFonts) {
       Tokenize(&css, /*line=*/1, /*col=*/0, &errors);
   unique_ptr<Stylesheet> stylesheet =
       ParseAStylesheet(&tokens, AmpCssParsingConfig(), &errors);
-  EXPECT_EQ(stylesheet->ToJson().ToString(), R""({
-  "tokentype": "STYLESHEET",
-  "line": 1,
-  "col": 0,
-  "rules":  [
-    {
-      "tokentype": "QUALIFIED_RULE",
-      "line": 1,
-      "col": 0,
-      "prelude":      [
-        {
-          "tokentype": "DELIM",
-          "line": 1,
-          "col": 0,
-          "value": "."
-        },
-        {
-          "tokentype": "IDENT",
-          "line": 1,
-          "col": 1,
-          "value": "a"
-        },
-        {
-          "tokentype": "WHITESPACE",
-          "line": 1,
-          "col": 2
-        },
-        {
-          "tokentype": "EOF_TOKEN",
-          "line": 1,
-          "col": 3
-        }
-      ],
-      "declarations":      [
-        {
-          "tokentype": "DECLARATION",
-          "line": 1,
-          "col": 5,
-          "name": "color",
-          "important": false,
-          "value":          [
-            {
-              "tokentype": "IDENT",
-              "line": 1,
-              "col": 11,
-              "value": "red"
-            },
-            {
-              "tokentype": "EOF_TOKEN",
-              "line": 1,
-              "col": 14
-            }
-          ]
-        },
-        {
-          "tokentype": "DECLARATION",
-          "line": 1,
-          "col": 16,
-          "name": "background-image",
-          "important": false,
-          "value":          [
-            {
-              "tokentype": "URL",
-              "line": 1,
-              "col": 33,
-              "value": "4.png"
-            },
-            {
-              "tokentype": "WHITESPACE",
-              "line": 1,
-              "col": 43
-            },
-            {
-              "tokentype": "EOF_TOKEN",
-              "line": 1,
-              "col": 44
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "tokentype": "QUALIFIED_RULE",
-      "line": 1,
-      "col": 45,
-      "prelude":      [
-        {
-          "tokentype": "DELIM",
-          "line": 1,
-          "col": 45,
-          "value": "."
-        },
-        {
-          "tokentype": "IDENT",
-          "line": 1,
-          "col": 46,
-          "value": "b"
-        },
-        {
-          "tokentype": "WHITESPACE",
-          "line": 1,
-          "col": 47
-        },
-        {
-          "tokentype": "EOF_TOKEN",
-          "line": 1,
-          "col": 48
-        }
-      ],
-      "declarations":      [
-        {
-          "tokentype": "DECLARATION",
-          "line": 1,
-          "col": 50,
-          "name": "color",
-          "important": false,
-          "value":          [
-            {
-              "tokentype": "IDENT",
-              "line": 1,
-              "col": 56,
-              "value": "black"
-            },
-            {
-              "tokentype": "EOF_TOKEN",
-              "line": 1,
-              "col": 61
-            }
-          ]
-        },
-        {
-          "tokentype": "DECLARATION",
-          "line": 1,
-          "col": 63,
-          "name": "background-image",
-          "important": false,
-          "value":          [
-            {
-              "tokentype": "FUNCTION_TOKEN",
-              "line": 1,
-              "col": 80,
-              "value": "url"
-            },
-            {
-              "tokentype": "STRING",
-              "line": 1,
-              "col": 84,
-              "value": "http://a.com/b.png"
-            },
-            {
-              "tokentype": "CLOSE_PAREN",
-              "line": 1,
-              "col": 104
-            },
-            {
-              "tokentype": "WHITESPACE",
-              "line": 1,
-              "col": 105
-            },
-            {
-              "tokentype": "EOF_TOKEN",
-              "line": 1,
-              "col": 106
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "tokentype": "AT_RULE",
-      "line": 1,
-      "col": 108,
-      "name": "font-face",
-      "prelude":      [
-        {
-          "tokentype": "WHITESPACE",
-          "line": 1,
-          "col": 118
-        },
-        {
-          "tokentype": "EOF_TOKEN",
-          "line": 1,
-          "col": 119
-        }
-      ],
-      "rules":      [],
-      "declarations":      [
-        {
-          "tokentype": "DECLARATION",
-          "line": 1,
-          "col": 120,
-          "name": "font-family",
-          "important": false,
-          "value":          [
-            {
-              "tokentype": "WHITESPACE",
-              "line": 1,
-              "col": 132
-            },
-            {
-              "tokentype": "STRING",
-              "line": 1,
-              "col": 133,
-              "value": "Medium"
-            },
-            {
-              "tokentype": "EOF_TOKEN",
-              "line": 1,
-              "col": 141
-            }
-          ]
-        },
-        {
-          "tokentype": "DECLARATION",
-          "line": 1,
-          "col": 142,
-          "name": "src",
-          "important": false,
-          "value":          [
-            {
-              "tokentype": "WHITESPACE",
-              "line": 1,
-              "col": 146
-            },
-            {
-              "tokentype": "FUNCTION_TOKEN",
-              "line": 1,
-              "col": 147,
-              "value": "url"
-            },
-            {
-              "tokentype": "STRING",
-              "line": 1,
-              "col": 151,
-              "value": "http://a.com/1.woff"
-            },
-            {
-              "tokentype": "CLOSE_PAREN",
-              "line": 1,
-              "col": 172
-            },
-            {
-              "tokentype": "WHITESPACE",
-              "line": 1,
-              "col": 173
-            },
-            {
-              "tokentype": "FUNCTION_TOKEN",
-              "line": 1,
-              "col": 174,
-              "value": "format"
-            },
-            {
-              "tokentype": "STRING",
-              "line": 1,
-              "col": 181,
-              "value": "woff"
-            },
-            {
-              "tokentype": "CLOSE_PAREN",
-              "line": 1,
-              "col": 187
-            },
-            {
-              "tokentype": "COMMA",
-              "line": 1,
-              "col": 188
-            },
-            {
-              "tokentype": "FUNCTION_TOKEN",
-              "line": 1,
-              "col": 189,
-              "value": "url"
-            },
-            {
-              "tokentype": "STRING",
-              "line": 1,
-              "col": 193,
-              "value": "http://b.com/1.ttf"
-            },
-            {
-              "tokentype": "CLOSE_PAREN",
-              "line": 1,
-              "col": 213
-            },
-            {
-              "tokentype": "WHITESPACE",
-              "line": 1,
-              "col": 214
-            },
-            {
-              "tokentype": "FUNCTION_TOKEN",
-              "line": 1,
-              "col": 215,
-              "value": "format"
-            },
-            {
-              "tokentype": "STRING",
-              "line": 1,
-              "col": 222,
-              "value": "truetype"
-            },
-            {
-              "tokentype": "CLOSE_PAREN",
-              "line": 1,
-              "col": 232
-            },
-            {
-              "tokentype": "COMMA",
-              "line": 1,
-              "col": 233
-            },
-            {
-              "tokentype": "IDENT",
-              "line": 1,
-              "col": 234,
-              "value": "src"
-            },
-            {
-              "tokentype": "COLON",
-              "line": 1,
-              "col": 237
-            },
-            {
-              "tokentype": "FUNCTION_TOKEN",
-              "line": 1,
-              "col": 238,
-              "value": "url"
-            },
-            {
-              "tokentype": "STRING",
-              "line": 1,
-              "col": 242,
-              "value": ""
-            },
-            {
-              "tokentype": "CLOSE_PAREN",
-              "line": 1,
-              "col": 244
-            },
-            {
-              "tokentype": "WHITESPACE",
-              "line": 1,
-              "col": 245
-            },
-            {
-              "tokentype": "FUNCTION_TOKEN",
-              "line": 1,
-              "col": 246,
-              "value": "format"
-            },
-            {
-              "tokentype": "STRING",
-              "line": 1,
-              "col": 253,
-              "value": "embedded-opentype"
-            },
-            {
-              "tokentype": "CLOSE_PAREN",
-              "line": 1,
-              "col": 272
-            },
-            {
-              "tokentype": "EOF_TOKEN",
-              "line": 1,
-              "col": 273
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "eof":  {
-    "tokentype": "EOF_TOKEN",
-    "line": 1,
-    "col": 275
-  }
-})"");
+  EXPECT_EQ(stylesheet->ToJson().ToString(), R"({"tokentype":"STYLESHEET","line":1,"col":0,"rules":[{"tokentype":"QUALIFIED_RULE","line":1,"col":0,"prelude":[{"tokentype":"DELIM","line":1,"col":0,"value":"."},{"tokentype":"IDENT","line":1,"col":1,"value":"a"},{"tokentype":"WHITESPACE","line":1,"col":2},{"tokentype":"EOF_TOKEN","line":1,"col":3}],"declarations":[{"tokentype":"DECLARATION","line":1,"col":5,"name":"color","important":false,"value":[{"tokentype":"IDENT","line":1,"col":11,"value":"red"},{"tokentype":"EOF_TOKEN","line":1,"col":14}]},{"tokentype":"DECLARATION","line":1,"col":16,"name":"background-image","important":false,"value":[{"tokentype":"URL","line":1,"col":33,"value":"4.png"},{"tokentype":"WHITESPACE","line":1,"col":43},{"tokentype":"EOF_TOKEN","line":1,"col":44}]}]},{"tokentype":"QUALIFIED_RULE","line":1,"col":45,"prelude":[{"tokentype":"DELIM","line":1,"col":45,"value":"."},{"tokentype":"IDENT","line":1,"col":46,"value":"b"},{"tokentype":"WHITESPACE","line":1,"col":47},{"tokentype":"EOF_TOKEN","line":1,"col":48}],"declarations":[{"tokentype":"DECLARATION","line":1,"col":50,"name":"color","important":false,"value":[{"tokentype":"IDENT","line":1,"col":56,"value":"black"},{"tokentype":"EOF_TOKEN","line":1,"col":61}]},{"tokentype":"DECLARATION","line":1,"col":63,"name":"background-image","important":false,"value":[{"tokentype":"FUNCTION_TOKEN","line":1,"col":80,"value":"url"},{"tokentype":"STRING","line":1,"col":84,"value":"http://a.com/b.png"},{"tokentype":"CLOSE_PAREN","line":1,"col":104},{"tokentype":"WHITESPACE","line":1,"col":105},{"tokentype":"EOF_TOKEN","line":1,"col":106}]}]},{"tokentype":"AT_RULE","line":1,"col":108,"name":"font-face","prelude":[{"tokentype":"WHITESPACE","line":1,"col":118},{"tokentype":"EOF_TOKEN","line":1,"col":119}],"rules":[],"declarations":[{"tokentype":"DECLARATION","line":1,"col":120,"name":"font-family","important":false,"value":[{"tokentype":"WHITESPACE","line":1,"col":132},{"tokentype":"STRING","line":1,"col":133,"value":"Medium"},{"tokentype":"EOF_TOKEN","line":1,"col":141}]},{"tokentype":"DECLARATION","line":1,"col":142,"name":"src","important":false,"value":[{"tokentype":"WHITESPACE","line":1,"col":146},{"tokentype":"FUNCTION_TOKEN","line":1,"col":147,"value":"url"},{"tokentype":"STRING","line":1,"col":151,"value":"http://a.com/1.woff"},{"tokentype":"CLOSE_PAREN","line":1,"col":172},{"tokentype":"WHITESPACE","line":1,"col":173},{"tokentype":"FUNCTION_TOKEN","line":1,"col":174,"value":"format"},{"tokentype":"STRING","line":1,"col":181,"value":"woff"},{"tokentype":"CLOSE_PAREN","line":1,"col":187},{"tokentype":"COMMA","line":1,"col":188},{"tokentype":"FUNCTION_TOKEN","line":1,"col":189,"value":"url"},{"tokentype":"STRING","line":1,"col":193,"value":"http://b.com/1.ttf"},{"tokentype":"CLOSE_PAREN","line":1,"col":213},{"tokentype":"WHITESPACE","line":1,"col":214},{"tokentype":"FUNCTION_TOKEN","line":1,"col":215,"value":"format"},{"tokentype":"STRING","line":1,"col":222,"value":"truetype"},{"tokentype":"CLOSE_PAREN","line":1,"col":232},{"tokentype":"COMMA","line":1,"col":233},{"tokentype":"IDENT","line":1,"col":234,"value":"src"},{"tokentype":"COLON","line":1,"col":237},{"tokentype":"FUNCTION_TOKEN","line":1,"col":238,"value":"url"},{"tokentype":"STRING","line":1,"col":242,"value":""},{"tokentype":"CLOSE_PAREN","line":1,"col":244},{"tokentype":"WHITESPACE","line":1,"col":245},{"tokentype":"FUNCTION_TOKEN","line":1,"col":246,"value":"format"},{"tokentype":"STRING","line":1,"col":253,"value":"embedded-opentype"},{"tokentype":"CLOSE_PAREN","line":1,"col":272},{"tokentype":"EOF_TOKEN","line":1,"col":273}]}]}],"eof":{"tokentype":"EOF_TOKEN","line":1,"col":275}})");
   EXPECT_EQ(0, errors.size());
 }
 
@@ -2130,110 +370,8 @@ TEST(ParseCssTest, ParseAStyleSheet_NastyEscaping) {
       Tokenize(&css, /*line=*/1, /*col=*/0, &errors);
   unique_ptr<Stylesheet> stylesheet =
       ParseAStylesheet(&tokens, AmpCssParsingConfig(), &errors);
-  EXPECT_EQ(stylesheet->ToJson().ToString(), R""({
-  "tokentype": "STYLESHEET",
-  "line": 1,
-  "col": 0,
-  "rules":  [
-    {
-      "tokentype": "QUALIFIED_RULE",
-      "line": 1,
-      "col": 0,
-      "prelude":      [
-        {
-          "tokentype": "DELIM",
-          "line": 1,
-          "col": 0,
-          "value": "."
-        },
-        {
-          "tokentype": "IDENT",
-          "line": 1,
-          "col": 1,
-          "value": "a"
-        },
-        {
-          "tokentype": "WHITESPACE",
-          "line": 1,
-          "col": 2
-        },
-        {
-          "tokentype": "EOF_TOKEN",
-          "line": 1,
-          "col": 3
-        }
-      ],
-      "declarations":      [
-        {
-          "tokentype": "DECLARATION",
-          "line": 1,
-          "col": 5,
-          "name": "background-image",
-          "important": false,
-          "value":          [
-            {
-              "tokentype": "FUNCTION_TOKEN",
-              "line": 1,
-              "col": 22,
-              "value": "url"
-            },
-            {
-              "tokentype": "STRING",
-              "line": 1,
-              "col": 26,
-              "value": "http://esc.com/'\"
-            },
-            {
-              "tokentype": "DELIM",
-              "line": 1,
-              "col": 46,
-              "value": "/"
-            },
-            {
-              "tokentype": "IDENT",
-              "line": 1,
-              "col": 47,
-              "value": "c"
-            },
-            {
-              "tokentype": "DELIM",
-              "line": 1,
-              "col": 48,
-              "value": "."
-            },
-            {
-              "tokentype": "IDENT",
-              "line": 1,
-              "col": 49,
-              "value": "png"
-            },
-            {
-              "tokentype": "STRING",
-              "line": 1,
-              "col": 52,
-              "value": ") } "
-            },
-            {
-              "tokentype": "EOF_TOKEN",
-              "line": 1,
-              "col": 57
-            },
-            {
-              "tokentype": "EOF_TOKEN",
-              "line": 1,
-              "col": 57
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "eof":  {
-    "tokentype": "EOF_TOKEN",
-    "line": 1,
-    "col": 57
-  }
-})"");
+  EXPECT_EQ(R"({"tokentype":"STYLESHEET","line":1,"col":0,"rules":[{"tokentype":"QUALIFIED_RULE","line":1,"col":0,"prelude":[{"tokentype":"DELIM","line":1,"col":0,"value":"."},{"tokentype":"IDENT","line":1,"col":1,"value":"a"},{"tokentype":"WHITESPACE","line":1,"col":2},{"tokentype":"EOF_TOKEN","line":1,"col":3}],"declarations":[{"tokentype":"DECLARATION","line":1,"col":5,"name":"background-image","important":false,"value":[{"tokentype":"FUNCTION_TOKEN","line":1,"col":22,"value":"url"},{"tokentype":"STRING","line":1,"col":26,"value":"http://esc.com/'\"},{"tokentype":"DELIM","line":1,"col":46,"value":"/"},{"tokentype":"IDENT","line":1,"col":47,"value":"c"},{"tokentype":"DELIM","line":1,"col":48,"value":"."},{"tokentype":"IDENT","line":1,"col":49,"value":"png"},{"tokentype":"STRING","line":1,"col":52,"value":") } "},{"tokentype":"EOF_TOKEN","line":1,"col":57},{"tokentype":"EOF_TOKEN","line":1,"col":57}]}]}],"eof":{"tokentype":"EOF_TOKEN","line":1,"col":57}})",
+            stylesheet->ToJson().ToString());
 }
 
 // Tests that font urls are parsed with font-face atRuleScope.
@@ -2249,16 +387,7 @@ TEST(ParseCssTest, ExtractUrls_FindsFontInFontFace) {
   vector<unique_ptr<ParsedCssUrl>> parsed_urls;
   ExtractUrls(*stylesheet, &parsed_urls, &errors);
   EXPECT_EQ(JsonFromList(errors), "[]");
-  EXPECT_EQ(JsonFromList(parsed_urls), R""([
-  {
-    "tokentype": "PARSED_CSS_URL",
-    "line": 1,
-    "col": 37,
-    "endPos": 66,
-    "utf8Url": "http://foo.com/bar.ttf",
-    "atRuleScope": "font-face"
-  }
-])"");
+  EXPECT_EQ(JsonFromList(parsed_urls), R"([{"tokentype":"PARSED_CSS_URL","line":1,"col":37,"endPos":66,"utf8Url":"http://foo.com/bar.ttf","atRuleScope":"font-face"}])");
 }
 
 // Tests that image URLs are parsed with empty atRuleScope; also tests
@@ -2275,16 +404,7 @@ TEST(ParseCssTest, ExtractUrls_SupportsImageUrlWithUnicode) {
   vector<unique_ptr<ParsedCssUrl>> parsed_urls;
   ExtractUrls(*stylesheet, &parsed_urls, &errors);
   EXPECT_EQ(JsonFromList(errors), "[]");
-  EXPECT_EQ(JsonFromList(parsed_urls), R""([
-  {
-    "tokentype": "PARSED_CSS_URL",
-    "line": 1,
-    "col": 23,
-    "endPos": 62,
-    "utf8Url": "http://a.com/b/c=d&e=f_g*h",
-    "atRuleScope": ""
-  }
-])"");
+  EXPECT_EQ(JsonFromList(parsed_urls), R"([{"tokentype":"PARSED_CSS_URL","line":1,"col":23,"endPos":62,"utf8Url":"http://a.com/b/c=d&e=f_g*h","atRuleScope":""}])");
 }
 
 // This example is taken from pcu_request_flow_test.cc and contains both
@@ -2306,48 +426,7 @@ TEST(ParseCssTest, ExtractUrls_LongerExample) {
   vector<unique_ptr<ParsedCssUrl>> parsed_urls;
   ExtractUrls(*stylesheet, &parsed_urls, &errors);
   EXPECT_EQ(JsonFromList(errors), "[]");
-  EXPECT_EQ(JsonFromList(parsed_urls), R""([
-  {
-    "tokentype": "PARSED_CSS_URL",
-    "line": 1,
-    "col": 33,
-    "endPos": 43,
-    "utf8Url": "4.png",
-    "atRuleScope": ""
-  },
-  {
-    "tokentype": "PARSED_CSS_URL",
-    "line": 1,
-    "col": 80,
-    "endPos": 105,
-    "utf8Url": "http://a.com/b.png",
-    "atRuleScope": ""
-  },
-  {
-    "tokentype": "PARSED_CSS_URL",
-    "line": 1,
-    "col": 147,
-    "endPos": 173,
-    "utf8Url": "http://a.com/1.woff",
-    "atRuleScope": "font-face"
-  },
-  {
-    "tokentype": "PARSED_CSS_URL",
-    "line": 1,
-    "col": 189,
-    "endPos": 214,
-    "utf8Url": "http://b.com/1.ttf",
-    "atRuleScope": "font-face"
-  },
-  {
-    "tokentype": "PARSED_CSS_URL",
-    "line": 1,
-    "col": 238,
-    "endPos": 245,
-    "utf8Url": "",
-    "atRuleScope": "font-face"
-  }
-])"");
+  EXPECT_EQ(JsonFromList(parsed_urls), R"([{"tokentype":"PARSED_CSS_URL","line":1,"col":33,"endPos":43,"utf8Url":"4.png","atRuleScope":""},{"tokentype":"PARSED_CSS_URL","line":1,"col":80,"endPos":105,"utf8Url":"http://a.com/b.png","atRuleScope":""},{"tokentype":"PARSED_CSS_URL","line":1,"col":147,"endPos":173,"utf8Url":"http://a.com/1.woff","atRuleScope":"font-face"},{"tokentype":"PARSED_CSS_URL","line":1,"col":189,"endPos":214,"utf8Url":"http://b.com/1.ttf","atRuleScope":"font-face"},{"tokentype":"PARSED_CSS_URL","line":1,"col":238,"endPos":245,"utf8Url":"","atRuleScope":"font-face"}])");
 }
 
 // Windows newlines present extra challenges for position information.
@@ -2364,24 +443,7 @@ TEST(ParseCssTest, ExtractUrls_WithWindowsNewlines) {
   vector<unique_ptr<ParsedCssUrl>> parsed_urls;
   ExtractUrls(*stylesheet, &parsed_urls, &errors);
   EXPECT_EQ(JsonFromList(errors), "[]");
-  EXPECT_EQ(JsonFromList(parsed_urls), R""([
-  {
-    "tokentype": "PARSED_CSS_URL",
-    "line": 2,
-    "col": 30,
-    "endPos": 44,
-    "utf8Url": "4.png",
-    "atRuleScope": ""
-  },
-  {
-    "tokentype": "PARSED_CSS_URL",
-    "line": 4,
-    "col": 17,
-    "endPos": 108,
-    "utf8Url": "http://a.com/b.png",
-    "atRuleScope": ""
-  }
-])"");
+  EXPECT_EQ(JsonFromList(parsed_urls), R"([{"tokentype":"PARSED_CSS_URL","line":2,"col":30,"endPos":44,"utf8Url":"4.png","atRuleScope":""},{"tokentype":"PARSED_CSS_URL","line":4,"col":17,"endPos":108,"utf8Url":"http://a.com/b.png","atRuleScope":""}])");
 }
 
 // This example parses as CSS without errors, however once the URL
@@ -2402,17 +464,7 @@ TEST(ParseCssTest, ExtractUrls_InvalidArgumentsInsideUrlFunctionYieldsError) {
   EXPECT_EQ(JsonFromList(errors), "[]");
   vector<unique_ptr<ParsedCssUrl>> parsed_urls;
   ExtractUrls(*stylesheet, &parsed_urls, &errors);
-  EXPECT_EQ(JsonFromList(errors), R""([
-  {
-    "tokentype": "ERROR",
-    "line": 4,
-    "col": 11,
-    "code": "CSS_SYNTAX_BAD_URL",
-    "params":    [
-      "style"
-    ]
-  }
-])"");
+  EXPECT_EQ(JsonFromList(errors), R"([{"tokentype":"ERROR","line":4,"col":11,"code":"CSS_SYNTAX_BAD_URL","params":["style"]}])");
   EXPECT_EQ(JsonFromList(parsed_urls), "[]");
 }
 
@@ -2466,17 +518,7 @@ TEST(ParseCssTest, ParseMediaQueries_TestErrorPosition) {
   ParseMediaQueries(*MediaQueryStyleSheet("screen,"), &media_types,
                     &media_features, &errors);
   EXPECT_EQ(errors.size(), 1);
-  EXPECT_EQ(JsonFromList(errors), R""([
-  {
-    "tokentype": "ERROR",
-    "line": 1,
-    "col": 0,
-    "code": "CSS_SYNTAX_MALFORMED_MEDIA_QUERY",
-    "params":    [
-      "style"
-    ]
-  }
-])"");
+  EXPECT_EQ(JsonFromList(errors), R"([{"tokentype":"ERROR","line":1,"col":0,"code":"CSS_SYNTAX_MALFORMED_MEDIA_QUERY","params":["style"]}])");
 }
 
 TEST(ParseCssTest, ParseMediaQueries_ErrorParseCases) {
@@ -2528,24 +570,8 @@ TEST(ParseCssTest, ParseMediaQueries_ExtractsTypesAndFeatures) {
   ParseMediaQueries(*MediaQueryStyleSheet("screen and (color)"), &media_types,
                     &media_features, &errors);
   EXPECT_EQ(JsonFromList(errors), "[]");
-  EXPECT_EQ(JsonFromList(media_types),
-            R""([
-  {
-    "tokentype": "IDENT",
-    "line": 1,
-    "col": 7,
-    "value": "screen"
-  }
-])"");
-  EXPECT_EQ(JsonFromList(media_features),
-            R""([
-  {
-    "tokentype": "IDENT",
-    "line": 1,
-    "col": 19,
-    "value": "color"
-  }
-])"");
+  EXPECT_EQ(JsonFromList(media_types), R"([{"tokentype":"IDENT","line":1,"col":7,"value":"screen"}])");
+  EXPECT_EQ(JsonFromList(media_features), R"([{"tokentype":"IDENT","line":1,"col":19,"value":"color"}])");
 }
 
 TEST(ParseCssTest, ParseMediaQueries_ExtractsTypesAndFeaturesCases) {
@@ -2609,165 +635,7 @@ TEST(ParseCssTest, ParseInlineStyle_Successful) {
   vector<unique_ptr<Declaration>> declarations =
       ParseInlineStyle(&tokens, &errors);
   EXPECT_EQ(0, errors.size());
-  EXPECT_EQ(JsonFromList(declarations), R""([
-  {
-    "tokentype": "DECLARATION",
-    "line": 1,
-    "col": 0,
-    "name": "display",
-    "important": false,
-    "value":    [
-      {
-        "tokentype": "WHITESPACE",
-        "line": 1,
-        "col": 8
-      },
-      {
-        "tokentype": "IDENT",
-        "line": 1,
-        "col": 9,
-        "value": "block"
-      },
-      {
-        "tokentype": "EOF_TOKEN",
-        "line": 1,
-        "col": 14
-      }
-    ]
-  },
-  {
-    "tokentype": "DECLARATION",
-    "line": 1,
-    "col": 15,
-    "name": "lemur",
-    "important": false,
-    "value":    [
-      {
-        "tokentype": "EOF_TOKEN",
-        "line": 1,
-        "col": 21
-      }
-    ]
-  },
-  {
-    "tokentype": "DECLARATION",
-    "line": 1,
-    "col": 22,
-    "name": "animation",
-    "important": false,
-    "value":    [
-      {
-        "tokentype": "IDENT",
-        "line": 1,
-        "col": 32,
-        "value": "-amp-start"
-      },
-      {
-        "tokentype": "WHITESPACE",
-        "line": 1,
-        "col": 42
-      },
-      {
-        "tokentype": "DIMENSION",
-        "line": 1,
-        "col": 43,
-        "repr": "8",
-        "type": "integer",
-        "unit": "s",
-        "value": 8.000000
-      },
-      {
-        "tokentype": "WHITESPACE",
-        "line": 1,
-        "col": 45
-      },
-      {
-        "tokentype": "FUNCTION_TOKEN",
-        "line": 1,
-        "col": 46,
-        "value": "steps"
-      },
-      {
-        "tokentype": "NUMBER",
-        "line": 1,
-        "col": 52,
-        "repr": "1",
-        "type": "integer",
-        "value": 1.000000
-      },
-      {
-        "tokentype": "COMMA",
-        "line": 1,
-        "col": 53
-      },
-      {
-        "tokentype": "IDENT",
-        "line": 1,
-        "col": 54,
-        "value": "end"
-      },
-      {
-        "tokentype": "CLOSE_PAREN",
-        "line": 1,
-        "col": 57
-      },
-      {
-        "tokentype": "WHITESPACE",
-        "line": 1,
-        "col": 58
-      },
-      {
-        "tokentype": "DIMENSION",
-        "line": 1,
-        "col": 59,
-        "repr": "0",
-        "type": "integer",
-        "unit": "s",
-        "value": 0.000000
-      },
-      {
-        "tokentype": "WHITESPACE",
-        "line": 1,
-        "col": 61
-      },
-      {
-        "tokentype": "NUMBER",
-        "line": 1,
-        "col": 62,
-        "repr": "1",
-        "type": "integer",
-        "value": 1.000000
-      },
-      {
-        "tokentype": "WHITESPACE",
-        "line": 1,
-        "col": 63
-      },
-      {
-        "tokentype": "IDENT",
-        "line": 1,
-        "col": 64,
-        "value": "normal"
-      },
-      {
-        "tokentype": "WHITESPACE",
-        "line": 1,
-        "col": 70
-      },
-      {
-        "tokentype": "IDENT",
-        "line": 1,
-        "col": 71,
-        "value": "both"
-      },
-      {
-        "tokentype": "EOF_TOKEN",
-        "line": 1,
-        "col": 75
-      }
-    ]
-  }
-])"");
+  EXPECT_EQ(JsonFromList(declarations), R"([{"tokentype":"DECLARATION","line":1,"col":0,"name":"display","important":false,"value":[{"tokentype":"WHITESPACE","line":1,"col":8},{"tokentype":"IDENT","line":1,"col":9,"value":"block"},{"tokentype":"EOF_TOKEN","line":1,"col":14}]},{"tokentype":"DECLARATION","line":1,"col":15,"name":"lemur","important":false,"value":[{"tokentype":"EOF_TOKEN","line":1,"col":21}]},{"tokentype":"DECLARATION","line":1,"col":22,"name":"animation","important":false,"value":[{"tokentype":"IDENT","line":1,"col":32,"value":"-amp-start"},{"tokentype":"WHITESPACE","line":1,"col":42},{"tokentype":"DIMENSION","line":1,"col":43,"repr":"8","type":"integer","unit":"s","value":8.000000},{"tokentype":"WHITESPACE","line":1,"col":45},{"tokentype":"FUNCTION_TOKEN","line":1,"col":46,"value":"steps"},{"tokentype":"NUMBER","line":1,"col":52,"repr":"1","type":"integer","value":1.000000},{"tokentype":"COMMA","line":1,"col":53},{"tokentype":"IDENT","line":1,"col":54,"value":"end"},{"tokentype":"CLOSE_PAREN","line":1,"col":57},{"tokentype":"WHITESPACE","line":1,"col":58},{"tokentype":"DIMENSION","line":1,"col":59,"repr":"0","type":"integer","unit":"s","value":0.000000},{"tokentype":"WHITESPACE","line":1,"col":61},{"tokentype":"NUMBER","line":1,"col":62,"repr":"1","type":"integer","value":1.000000},{"tokentype":"WHITESPACE","line":1,"col":63},{"tokentype":"IDENT","line":1,"col":64,"value":"normal"},{"tokentype":"WHITESPACE","line":1,"col":70},{"tokentype":"IDENT","line":1,"col":71,"value":"both"},{"tokentype":"EOF_TOKEN","line":1,"col":75}]}])");
 }
 
 TEST(ParseCssTest, ParseInlineStyle_GeneratesInvalidAtRuleError) {
@@ -2795,17 +663,7 @@ TEST(ParseCssTest, ParseInlineStyle_GeneratesIncompleteDeclarationError) {
   vector<unique_ptr<Declaration>> declarations =
       ParseInlineStyle(&tokens, &errors);
   EXPECT_EQ(1, errors.size());
-  EXPECT_EQ(JsonFromList(errors), R""([
-  {
-    "tokentype": "ERROR",
-    "line": 1,
-    "col": 0,
-    "code": "CSS_SYNTAX_INCOMPLETE_DECLARATION",
-    "params":    [
-      "style"
-    ]
-  }
-])"");
+  EXPECT_EQ(JsonFromList(errors), R"([{"tokentype":"ERROR","line":1,"col":0,"code":"CSS_SYNTAX_INCOMPLETE_DECLARATION","params":["style"]}])");
 }
 
 TEST(ParseCssTest, ParseInlineStyle_GeneratesInvalidDeclarationError) {
@@ -2820,17 +678,7 @@ TEST(ParseCssTest, ParseInlineStyle_GeneratesInvalidDeclarationError) {
     vector<unique_ptr<Declaration>> declarations =
         ParseInlineStyle(&tokens, &errors);
     EXPECT_EQ(1, errors.size()) << testcase;
-    EXPECT_EQ(JsonFromList(errors), R""([
-  {
-    "tokentype": "ERROR",
-    "line": 1,
-    "col": 0,
-    "code": "CSS_SYNTAX_INVALID_DECLARATION",
-    "params":    [
-      "style"
-    ]
-  }
-])"") << testcase;
+    EXPECT_EQ(JsonFromList(errors), R"([{"tokentype":"ERROR","line":1,"col":0,"code":"CSS_SYNTAX_INVALID_DECLARATION","params":["style"]}])") << testcase;
   }
 }
 
@@ -2845,7 +693,7 @@ vector<unique_ptr<Token>> ParseSelectorForTest(const std::string& selector) {
   EXPECT_EQ(JsonFromList(errors), "[]");
   EXPECT_EQ(1, sheet->rules().size());
   Rule* rule = (*sheet->mutable_rules()).front().get();
-  CHECK(TokenType::QUALIFIED_RULE == rule->Type(), "");
+  CHECK(TokenType::QUALIFIED_RULE == rule->Type());
   QualifiedRule* qualified = static_cast<QualifiedRule*>(rule);
   vector<unique_ptr<Token>> selector_tokens;
   qualified->mutable_prelude()->swap(selector_tokens);
@@ -2857,19 +705,7 @@ vector<unique_ptr<Token>> ParseSelectorForTest(const std::string& selector) {
 //
 TEST(ParseCssTest, ParseATypeSelector) {
   vector<unique_ptr<Token>> tokens = ParseSelectorForTest("*");
-  EXPECT_EQ(JsonFromList(tokens), R""([
-  {
-    "tokentype": "DELIM",
-    "line": 1,
-    "col": 0,
-    "value": "*"
-  },
-  {
-    "tokentype": "EOF_TOKEN",
-    "line": 1,
-    "col": 1
-  }
-])"");
+  EXPECT_EQ(JsonFromList(tokens), R"([{"tokentype":"DELIM","line":1,"col":0,"value":"*"},{"tokentype":"EOF_TOKEN","line":1,"col":1}])");
   TokenStream token_stream(std::move(tokens));
   token_stream.Consume();
   unique_ptr<TypeSelector> type_selector = ParseATypeSelector(&token_stream);
@@ -2903,20 +739,7 @@ TEST(ParseCssTest, ParseATypeSelector) {
 
 TEST(ParseCssTest, ParseAnIdSelector) {
   vector<unique_ptr<Token>> tokens = ParseSelectorForTest("#hello-world");
-  EXPECT_EQ(JsonFromList(tokens), R""([
-  {
-    "tokentype": "HASH",
-    "line": 1,
-    "col": 0,
-    "value": "hello-world",
-    "type": "id"
-  },
-  {
-    "tokentype": "EOF_TOKEN",
-    "line": 1,
-    "col": 12
-  }
-])"");
+  EXPECT_EQ(JsonFromList(tokens), R"([{"tokentype":"HASH","line":1,"col":0,"value":"hello-world","type":"id"},{"tokentype":"EOF_TOKEN","line":1,"col":12}])");
   TokenStream token_stream(std::move(tokens));
   token_stream.Consume();
   unique_ptr<IdSelector> id_selector = ParseAnIdSelector(&token_stream);
@@ -2927,25 +750,7 @@ TEST(ParseCssTest, ParseAnIdSelector) {
 
 TEST(ParseCssTest, ParseAClassSelector) {
   vector<unique_ptr<Token>> tokens = ParseSelectorForTest(".hello-world");
-  EXPECT_EQ(JsonFromList(tokens), R""([
-  {
-    "tokentype": "DELIM",
-    "line": 1,
-    "col": 0,
-    "value": "."
-  },
-  {
-    "tokentype": "IDENT",
-    "line": 1,
-    "col": 1,
-    "value": "hello-world"
-  },
-  {
-    "tokentype": "EOF_TOKEN",
-    "line": 1,
-    "col": 12
-  }
-])"");
+  EXPECT_EQ(JsonFromList(tokens), R"([{"tokentype":"DELIM","line":1,"col":0,"value":"."},{"tokentype":"IDENT","line":1,"col":1,"value":"hello-world"},{"tokentype":"EOF_TOKEN","line":1,"col":12}])");
   TokenStream token_stream(std::move(tokens));
   token_stream.Consume();
   unique_ptr<ClassSelector> class_selector = ParseAClassSelector(&token_stream);
@@ -2956,38 +761,7 @@ TEST(ParseCssTest, ParseAClassSelector) {
 
 TEST(ParseCssTest, ParseASimpleSelectorSequence) {
   vector<unique_ptr<Token>> tokens = ParseSelectorForTest("a|b#c");
-  EXPECT_EQ(JsonFromList(tokens), R""([
-  {
-    "tokentype": "IDENT",
-    "line": 1,
-    "col": 0,
-    "value": "a"
-  },
-  {
-    "tokentype": "DELIM",
-    "line": 1,
-    "col": 1,
-    "value": "|"
-  },
-  {
-    "tokentype": "IDENT",
-    "line": 1,
-    "col": 2,
-    "value": "b"
-  },
-  {
-    "tokentype": "HASH",
-    "line": 1,
-    "col": 3,
-    "value": "c",
-    "type": "id"
-  },
-  {
-    "tokentype": "EOF_TOKEN",
-    "line": 1,
-    "col": 5
-  }
-])"");
+  EXPECT_EQ(JsonFromList(tokens), R"([{"tokentype":"IDENT","line":1,"col":0,"value":"a"},{"tokentype":"DELIM","line":1,"col":1,"value":"|"},{"tokentype":"IDENT","line":1,"col":2,"value":"b"},{"tokentype":"HASH","line":1,"col":3,"value":"c","type":"id"},{"tokentype":"EOF_TOKEN","line":1,"col":5}])");
   TokenStream token_stream(std::move(tokens));
   token_stream.Consume();
   ErrorTokenOr<SimpleSelectorSequence> maybe_sequence =
@@ -2996,29 +770,7 @@ TEST(ParseCssTest, ParseASimpleSelectorSequence) {
       maybe_sequence));
   unique_ptr<SimpleSelectorSequence> sequence =
       std::move(std::get<unique_ptr<SimpleSelectorSequence>>(maybe_sequence));
-  EXPECT_EQ(sequence->ToJson().ToString(), R""({
-  "tokentype": "SIMPLE_SELECTOR_SEQUENCE",
-  "line": 1,
-  "col": 0,
-  "typeSelector":  {
-    "tokentype": "TYPE_SELECTOR",
-    "line": 1,
-    "col": 0,
-    "namespacePrefix": "a",
-    "elementName": "b",
-    "pos": 0,
-    "endPos": 3
-  },
-  "otherSelectors":  [
-    {
-      "tokentype": "ID_SELECTOR",
-      "line": 1,
-      "col": 3,
-      "value": "c",
-      "endPos": 5
-    }
-  ]
-})"");
+  EXPECT_EQ(sequence->ToJson().ToString(), R"({"tokentype":"SIMPLE_SELECTOR_SEQUENCE","line":1,"col":0,"typeSelector":{"tokentype":"TYPE_SELECTOR","line":1,"col":0,"namespacePrefix":"a","elementName":"b","pos":0,"endPos":3},"otherSelectors":[{"tokentype":"ID_SELECTOR","line":1,"col":3,"value":"c","endPos":5}]})");
 
   tokens = ParseSelectorForTest("a|foo#bar.baz");
   token_stream = TokenStream(std::move(tokens));
@@ -3028,36 +780,7 @@ TEST(ParseCssTest, ParseASimpleSelectorSequence) {
       maybe_sequence));
   sequence =
       std::move(std::get<unique_ptr<SimpleSelectorSequence>>(maybe_sequence));
-  EXPECT_EQ(sequence->ToJson().ToString(), R""({
-  "tokentype": "SIMPLE_SELECTOR_SEQUENCE",
-  "line": 1,
-  "col": 0,
-  "typeSelector":  {
-    "tokentype": "TYPE_SELECTOR",
-    "line": 1,
-    "col": 0,
-    "namespacePrefix": "a",
-    "elementName": "foo",
-    "pos": 0,
-    "endPos": 5
-  },
-  "otherSelectors":  [
-    {
-      "tokentype": "ID_SELECTOR",
-      "line": 1,
-      "col": 5,
-      "value": "bar",
-      "endPos": 9
-    },
-    {
-      "tokentype": "CLASS_SELECTOR",
-      "line": 1,
-      "col": 9,
-      "value": "baz",
-      "endPos": 13
-    }
-  ]
-})"");
+  EXPECT_EQ(sequence->ToJson().ToString(), R"({"tokentype":"SIMPLE_SELECTOR_SEQUENCE","line":1,"col":0,"typeSelector":{"tokentype":"TYPE_SELECTOR","line":1,"col":0,"namespacePrefix":"a","elementName":"foo","pos":0,"endPos":5},"otherSelectors":[{"tokentype":"ID_SELECTOR","line":1,"col":5,"value":"bar","endPos":9},{"tokentype":"CLASS_SELECTOR","line":1,"col":9,"value":"baz","endPos":13}]})");
 
   tokens = ParseSelectorForTest(R"(a[*|b="c"])");
   token_stream = TokenStream(std::move(tokens));
@@ -3067,32 +790,7 @@ TEST(ParseCssTest, ParseASimpleSelectorSequence) {
       maybe_sequence));
   sequence =
       std::move(std::get<unique_ptr<SimpleSelectorSequence>>(maybe_sequence));
-  EXPECT_EQ(sequence->ToJson().ToString(), R"({
-  "tokentype": "SIMPLE_SELECTOR_SEQUENCE",
-  "line": 1,
-  "col": 0,
-  "typeSelector":  {
-    "tokentype": "TYPE_SELECTOR",
-    "line": 1,
-    "col": 0,
-    "elementName": "a",
-    "pos": 0,
-    "endPos": 1
-  },
-  "otherSelectors":  [
-    {
-      "tokentype": "ATTR_SELECTOR",
-      "line": 1,
-      "col": 1,
-      "namespacePrefix": "*",
-      "attrName": "b",
-      "matchOperator": "=",
-      "value": "c",
-      "valueStartPos": 6,
-      "valueEndPos": 9
-    }
-  ]
-})");
+  EXPECT_EQ(sequence->ToJson().ToString(), R"({"tokentype":"SIMPLE_SELECTOR_SEQUENCE","line":1,"col":0,"typeSelector":{"tokentype":"TYPE_SELECTOR","line":1,"col":0,"elementName":"a","pos":0,"endPos":1},"otherSelectors":[{"tokentype":"ATTR_SELECTOR","line":1,"col":1,"namespacePrefix":"*","attrName":"b","matchOperator":"=","value":"c","valueStartPos":6,"valueEndPos":9}]})");
 
   tokens = ParseSelectorForTest(R"(a[b|c="d"])");
   token_stream = TokenStream(std::move(tokens));
@@ -3102,32 +800,7 @@ TEST(ParseCssTest, ParseASimpleSelectorSequence) {
       maybe_sequence));
   sequence =
       std::move(std::get<unique_ptr<SimpleSelectorSequence>>(maybe_sequence));
-  EXPECT_EQ(sequence->ToJson().ToString(), R"({
-  "tokentype": "SIMPLE_SELECTOR_SEQUENCE",
-  "line": 1,
-  "col": 0,
-  "typeSelector":  {
-    "tokentype": "TYPE_SELECTOR",
-    "line": 1,
-    "col": 0,
-    "elementName": "a",
-    "pos": 0,
-    "endPos": 1
-  },
-  "otherSelectors":  [
-    {
-      "tokentype": "ATTR_SELECTOR",
-      "line": 1,
-      "col": 1,
-      "namespacePrefix": "b",
-      "attrName": "c",
-      "matchOperator": "=",
-      "value": "d",
-      "valueStartPos": 6,
-      "valueEndPos": 9
-    }
-  ]
-})");
+  EXPECT_EQ(sequence->ToJson().ToString(), R"({"tokentype":"SIMPLE_SELECTOR_SEQUENCE","line":1,"col":0,"typeSelector":{"tokentype":"TYPE_SELECTOR","line":1,"col":0,"elementName":"a","pos":0,"endPos":1},"otherSelectors":[{"tokentype":"ATTR_SELECTOR","line":1,"col":1,"namespacePrefix":"b","attrName":"c","matchOperator":"=","value":"d","valueStartPos":6,"valueEndPos":9}]})");
 
   // For this selector, the universal selector '*' is implied as its
   // type selector. The fact that it's implied results in both its pos
@@ -3140,313 +813,44 @@ TEST(ParseCssTest, ParseASimpleSelectorSequence) {
       maybe_sequence));
   sequence =
       std::move(std::get<unique_ptr<SimpleSelectorSequence>>(maybe_sequence));
-  EXPECT_EQ(sequence->ToJson().ToString(), R"({
-  "tokentype": "SIMPLE_SELECTOR_SEQUENCE",
-  "line": 1,
-  "col": 0,
-  "typeSelector":  {
-    "tokentype": "TYPE_SELECTOR",
-    "line": 1,
-    "col": 0,
-    "elementName": "*",
-    "pos": 0,
-    "endPos": 0
-  },
-  "otherSelectors":  [
-    {
-      "tokentype": "ID_SELECTOR",
-      "line": 1,
-      "col": 0,
-      "value": "foo",
-      "endPos": 4
-    }
-  ]
-})");
+  EXPECT_EQ(sequence->ToJson().ToString(), R"({"tokentype":"SIMPLE_SELECTOR_SEQUENCE","line":1,"col":0,"typeSelector":{"tokentype":"TYPE_SELECTOR","line":1,"col":0,"elementName":"*","pos":0,"endPos":0},"otherSelectors":[{"tokentype":"ID_SELECTOR","line":1,"col":0,"value":"foo","endPos":4}]})");
 }
 
 TEST(ParseCssTest, ParseASelector) {
   vector<unique_ptr<Token>> tokens = ParseSelectorForTest("foo bar \n baz");
-  EXPECT_EQ(JsonFromList(tokens), R""([
-  {
-    "tokentype": "IDENT",
-    "line": 1,
-    "col": 0,
-    "value": "foo"
-  },
-  {
-    "tokentype": "WHITESPACE",
-    "line": 1,
-    "col": 3
-  },
-  {
-    "tokentype": "IDENT",
-    "line": 1,
-    "col": 4,
-    "value": "bar"
-  },
-  {
-    "tokentype": "WHITESPACE",
-    "line": 1,
-    "col": 7
-  },
-  {
-    "tokentype": "IDENT",
-    "line": 2,
-    "col": 1,
-    "value": "baz"
-  },
-  {
-    "tokentype": "EOF_TOKEN",
-    "line": 2,
-    "col": 4
-  }
-])"");
+  EXPECT_EQ(JsonFromList(tokens), R"([{"tokentype":"IDENT","line":1,"col":0,"value":"foo"},{"tokentype":"WHITESPACE","line":1,"col":3},{"tokentype":"IDENT","line":1,"col":4,"value":"bar"},{"tokentype":"WHITESPACE","line":1,"col":7},{"tokentype":"IDENT","line":2,"col":1,"value":"baz"},{"tokentype":"EOF_TOKEN","line":2,"col":4}])");
   TokenStream token_stream(std::move(tokens));
   token_stream.Consume();
   ErrorTokenOr<Selector> maybe_selector = ParseASelector(&token_stream);
   ASSERT_TRUE(std::holds_alternative<unique_ptr<Selector>>(maybe_selector));
   unique_ptr<Selector> selector =
       std::move(std::get<unique_ptr<Selector>>(maybe_selector));
-  EXPECT_EQ(selector->ToJson().ToString(), R""({
-  "tokentype": "COMBINATOR",
-  "line": 1,
-  "col": 7,
-  "combinatorType": "DESCENDANT",
-  "left":  {
-    "tokentype": "COMBINATOR",
-    "line": 1,
-    "col": 3,
-    "combinatorType": "DESCENDANT",
-    "left":    {
-      "tokentype": "SIMPLE_SELECTOR_SEQUENCE",
-      "line": 1,
-      "col": 0,
-      "typeSelector":      {
-        "tokentype": "TYPE_SELECTOR",
-        "line": 1,
-        "col": 0,
-        "elementName": "foo",
-        "pos": 0,
-        "endPos": 3
-      },
-      "otherSelectors":      []
-    },
-    "right":    {
-      "tokentype": "SIMPLE_SELECTOR_SEQUENCE",
-      "line": 1,
-      "col": 4,
-      "typeSelector":      {
-        "tokentype": "TYPE_SELECTOR",
-        "line": 1,
-        "col": 4,
-        "elementName": "bar",
-        "pos": 4,
-        "endPos": 7
-      },
-      "otherSelectors":      []
-    }
-  },
-  "right":  {
-    "tokentype": "SIMPLE_SELECTOR_SEQUENCE",
-    "line": 2,
-    "col": 1,
-    "typeSelector":    {
-      "tokentype": "TYPE_SELECTOR",
-      "line": 2,
-      "col": 1,
-      "elementName": "baz",
-      "pos": 10,
-      "endPos": 13
-    },
-    "otherSelectors":    []
-  }
-})"");
+  EXPECT_EQ(selector->ToJson().ToString(), R"({"tokentype":"COMBINATOR","line":1,"col":7,"combinatorType":"DESCENDANT","left":{"tokentype":"COMBINATOR","line":1,"col":3,"combinatorType":"DESCENDANT","left":{"tokentype":"SIMPLE_SELECTOR_SEQUENCE","line":1,"col":0,"typeSelector":{"tokentype":"TYPE_SELECTOR","line":1,"col":0,"elementName":"foo","pos":0,"endPos":3},"otherSelectors":[]},"right":{"tokentype":"SIMPLE_SELECTOR_SEQUENCE","line":1,"col":4,"typeSelector":{"tokentype":"TYPE_SELECTOR","line":1,"col":4,"elementName":"bar","pos":4,"endPos":7},"otherSelectors":[]}},"right":{"tokentype":"SIMPLE_SELECTOR_SEQUENCE","line":2,"col":1,"typeSelector":{"tokentype":"TYPE_SELECTOR","line":2,"col":1,"elementName":"baz","pos":10,"endPos":13},"otherSelectors":[]}})");
 }
 
 TEST(ParseCssTest, ParsesASelectorsGroup) {
   vector<unique_ptr<Token>> tokens = ParseSelectorForTest("foo, bar \n, baz");
-  EXPECT_EQ(JsonFromList(tokens), R""([
-  {
-    "tokentype": "IDENT",
-    "line": 1,
-    "col": 0,
-    "value": "foo"
-  },
-  {
-    "tokentype": "COMMA",
-    "line": 1,
-    "col": 3
-  },
-  {
-    "tokentype": "WHITESPACE",
-    "line": 1,
-    "col": 4
-  },
-  {
-    "tokentype": "IDENT",
-    "line": 1,
-    "col": 5,
-    "value": "bar"
-  },
-  {
-    "tokentype": "WHITESPACE",
-    "line": 1,
-    "col": 8
-  },
-  {
-    "tokentype": "COMMA",
-    "line": 2,
-    "col": 0
-  },
-  {
-    "tokentype": "WHITESPACE",
-    "line": 2,
-    "col": 1
-  },
-  {
-    "tokentype": "IDENT",
-    "line": 2,
-    "col": 2,
-    "value": "baz"
-  },
-  {
-    "tokentype": "EOF_TOKEN",
-    "line": 2,
-    "col": 5
-  }
-])"");
+  EXPECT_EQ(JsonFromList(tokens), R"([{"tokentype":"IDENT","line":1,"col":0,"value":"foo"},{"tokentype":"COMMA","line":1,"col":3},{"tokentype":"WHITESPACE","line":1,"col":4},{"tokentype":"IDENT","line":1,"col":5,"value":"bar"},{"tokentype":"WHITESPACE","line":1,"col":8},{"tokentype":"COMMA","line":2,"col":0},{"tokentype":"WHITESPACE","line":2,"col":1},{"tokentype":"IDENT","line":2,"col":2,"value":"baz"},{"tokentype":"EOF_TOKEN","line":2,"col":5}])");
   TokenStream token_stream(std::move(tokens));
   token_stream.Consume();
   ErrorTokenOr<Selector> maybe_selector = ParseASelectorsGroup(&token_stream);
   ASSERT_TRUE(std::holds_alternative<unique_ptr<Selector>>(maybe_selector));
   unique_ptr<Selector> selector =
       std::move(std::get<unique_ptr<Selector>>(maybe_selector));
-  EXPECT_EQ(selector->ToJson().ToString(), R""({
-  "tokentype": "SELECTORS_GROUP",
-  "line": 1,
-  "col": 0,
-  "elements":  [
-    {
-      "tokentype": "SIMPLE_SELECTOR_SEQUENCE",
-      "line": 1,
-      "col": 0,
-      "typeSelector":      {
-        "tokentype": "TYPE_SELECTOR",
-        "line": 1,
-        "col": 0,
-        "elementName": "foo",
-        "pos": 0,
-        "endPos": 3
-      },
-      "otherSelectors":      []
-    },
-    {
-      "tokentype": "SIMPLE_SELECTOR_SEQUENCE",
-      "line": 1,
-      "col": 5,
-      "typeSelector":      {
-        "tokentype": "TYPE_SELECTOR",
-        "line": 1,
-        "col": 5,
-        "elementName": "bar",
-        "pos": 5,
-        "endPos": 8
-      },
-      "otherSelectors":      []
-    },
-    {
-      "tokentype": "SIMPLE_SELECTOR_SEQUENCE",
-      "line": 2,
-      "col": 2,
-      "typeSelector":      {
-        "tokentype": "TYPE_SELECTOR",
-        "line": 2,
-        "col": 2,
-        "elementName": "baz",
-        "pos": 12,
-        "endPos": 15
-      },
-      "otherSelectors":      []
-    }
-  ]
-})"");
+  EXPECT_EQ(selector->ToJson().ToString(), R"({"tokentype":"SELECTORS_GROUP","line":1,"col":0,"elements":[{"tokentype":"SIMPLE_SELECTOR_SEQUENCE","line":1,"col":0,"typeSelector":{"tokentype":"TYPE_SELECTOR","line":1,"col":0,"elementName":"foo","pos":0,"endPos":3},"otherSelectors":[]},{"tokentype":"SIMPLE_SELECTOR_SEQUENCE","line":1,"col":5,"typeSelector":{"tokentype":"TYPE_SELECTOR","line":1,"col":5,"elementName":"bar","pos":5,"endPos":8},"otherSelectors":[]},{"tokentype":"SIMPLE_SELECTOR_SEQUENCE","line":2,"col":2,"typeSelector":{"tokentype":"TYPE_SELECTOR","line":2,"col":2,"elementName":"baz","pos":12,"endPos":15},"otherSelectors":[]}]})");
 }
 
 TEST(ParseCssTest, ParseASelectorsGroupWithAnAttribMatch) {
   vector<unique_ptr<Token>> tokens =
       ParseSelectorForTest("a[href=\"http://www.w3.org/\"]");
-  EXPECT_EQ(JsonFromList(tokens), R""([
-  {
-    "tokentype": "IDENT",
-    "line": 1,
-    "col": 0,
-    "value": "a"
-  },
-  {
-    "tokentype": "OPEN_SQUARE",
-    "line": 1,
-    "col": 1
-  },
-  {
-    "tokentype": "IDENT",
-    "line": 1,
-    "col": 2,
-    "value": "href"
-  },
-  {
-    "tokentype": "DELIM",
-    "line": 1,
-    "col": 6,
-    "value": "="
-  },
-  {
-    "tokentype": "STRING",
-    "line": 1,
-    "col": 7,
-    "value": "http://www.w3.org/"
-  },
-  {
-    "tokentype": "CLOSE_SQUARE",
-    "line": 1,
-    "col": 27
-  },
-  {
-    "tokentype": "EOF_TOKEN",
-    "line": 1,
-    "col": 28
-  }
-])"");
+  EXPECT_EQ(JsonFromList(tokens), R"([{"tokentype":"IDENT","line":1,"col":0,"value":"a"},{"tokentype":"OPEN_SQUARE","line":1,"col":1},{"tokentype":"IDENT","line":1,"col":2,"value":"href"},{"tokentype":"DELIM","line":1,"col":6,"value":"="},{"tokentype":"STRING","line":1,"col":7,"value":"http://www.w3.org/"},{"tokentype":"CLOSE_SQUARE","line":1,"col":27},{"tokentype":"EOF_TOKEN","line":1,"col":28}])");
   TokenStream token_stream(std::move(tokens));
   token_stream.Consume();
   ErrorTokenOr<Selector> maybe_selector = ParseASelectorsGroup(&token_stream);
   ASSERT_TRUE(std::holds_alternative<unique_ptr<Selector>>(maybe_selector));
   unique_ptr<Selector> selector =
       std::move(std::get<unique_ptr<Selector>>(maybe_selector));
-  EXPECT_EQ(selector->ToJson().ToString(), R""({
-  "tokentype": "SIMPLE_SELECTOR_SEQUENCE",
-  "line": 1,
-  "col": 0,
-  "typeSelector":  {
-    "tokentype": "TYPE_SELECTOR",
-    "line": 1,
-    "col": 0,
-    "elementName": "a",
-    "pos": 0,
-    "endPos": 1
-  },
-  "otherSelectors":  [
-    {
-      "tokentype": "ATTR_SELECTOR",
-      "line": 1,
-      "col": 1,
-      "attrName": "href",
-      "matchOperator": "=",
-      "value": "http://www.w3.org/",
-      "valueStartPos": 7,
-      "valueEndPos": 27
-    }
-  ]
-})"");
+  EXPECT_EQ(selector->ToJson().ToString(), R"({"tokentype":"SIMPLE_SELECTOR_SEQUENCE","line":1,"col":0,"typeSelector":{"tokentype":"TYPE_SELECTOR","line":1,"col":0,"elementName":"a","pos":0,"endPos":1},"otherSelectors":[{"tokentype":"ATTR_SELECTOR","line":1,"col":1,"attrName":"href","matchOperator":"=","value":"http://www.w3.org/","valueStartPos":7,"valueEndPos":27}]})");
 }
 
 TEST(ParseCssTest, ParseASelectorsGroupWithMoreAttribMatches) {
@@ -3460,210 +864,19 @@ TEST(ParseCssTest, ParseASelectorsGroupWithMoreAttribMatches) {
   ASSERT_TRUE(std::holds_alternative<unique_ptr<Selector>>(maybe_selector));
   unique_ptr<Selector> selector =
       std::move(std::get<unique_ptr<Selector>>(maybe_selector));
-  EXPECT_EQ(selector->ToJson().ToString(), R""({
-  "tokentype": "SIMPLE_SELECTOR_SEQUENCE",
-  "line": 1,
-  "col": 0,
-  "typeSelector":  {
-    "tokentype": "TYPE_SELECTOR",
-    "line": 1,
-    "col": 0,
-    "elementName": "elem",
-    "pos": 0,
-    "endPos": 4
-  },
-  "otherSelectors":  [
-    {
-      "tokentype": "ATTR_SELECTOR",
-      "line": 1,
-      "col": 4,
-      "attrName": "attr1",
-      "matchOperator": "=",
-      "value": "v1",
-      "valueStartPos": 11,
-      "valueEndPos": 15
-    },
-    {
-      "tokentype": "ATTR_SELECTOR",
-      "line": 1,
-      "col": 16,
-      "attrName": "attr2",
-      "matchOperator": "=",
-      "value": "value2",
-      "valueStartPos": 23,
-      "valueEndPos": 29
-    },
-    {
-      "tokentype": "ATTR_SELECTOR",
-      "line": 2,
-      "col": 1,
-      "attrName": "attr3",
-      "matchOperator": "~=",
-      "value": "foo",
-      "valueStartPos": 39,
-      "valueEndPos": 44
-    },
-    {
-      "tokentype": "ATTR_SELECTOR",
-      "line": 2,
-      "col": 15,
-      "attrName": "attr4",
-      "matchOperator": "|=",
-      "value": "bar",
-      "valueStartPos": 53,
-      "valueEndPos": 58
-    },
-    {
-      "tokentype": "ATTR_SELECTOR",
-      "line": 2,
-      "col": 29,
-      "attrName": "attr5",
-      "matchOperator": "|=",
-      "value": "baz",
-      "valueStartPos": 68,
-      "valueEndPos": 73
-    },
-    {
-      "tokentype": "ATTR_SELECTOR",
-      "line": 2,
-      "col": 44,
-      "attrName": "attr6",
-      "matchOperator": "$=",
-      "value": "boo",
-      "valueStartPos": 83,
-      "valueEndPos": 86
-    },
-    {
-      "tokentype": "ATTR_SELECTOR",
-      "line": 2,
-      "col": 57,
-      "attrName": "attr7",
-      "matchOperator": "*=",
-      "value": "bang",
-      "valueStartPos": 96,
-      "valueEndPos": 100
-    },
-    {
-      "tokentype": "ATTR_SELECTOR",
-      "line": 2,
-      "col": 72,
-      "attrName": "attr8",
-      "matchOperator": "",
-      "value": "",
-      "valueStartPos": -1,
-      "valueEndPos": -1
-    }
-  ]
-})"");
+  EXPECT_EQ(selector->ToJson().ToString(), R"({"tokentype":"SIMPLE_SELECTOR_SEQUENCE","line":1,"col":0,"typeSelector":{"tokentype":"TYPE_SELECTOR","line":1,"col":0,"elementName":"elem","pos":0,"endPos":4},"otherSelectors":[{"tokentype":"ATTR_SELECTOR","line":1,"col":4,"attrName":"attr1","matchOperator":"=","value":"v1","valueStartPos":11,"valueEndPos":15},{"tokentype":"ATTR_SELECTOR","line":1,"col":16,"attrName":"attr2","matchOperator":"=","value":"value2","valueStartPos":23,"valueEndPos":29},{"tokentype":"ATTR_SELECTOR","line":2,"col":1,"attrName":"attr3","matchOperator":"~=","value":"foo","valueStartPos":39,"valueEndPos":44},{"tokentype":"ATTR_SELECTOR","line":2,"col":15,"attrName":"attr4","matchOperator":"|=","value":"bar","valueStartPos":53,"valueEndPos":58},{"tokentype":"ATTR_SELECTOR","line":2,"col":29,"attrName":"attr5","matchOperator":"|=","value":"baz","valueStartPos":68,"valueEndPos":73},{"tokentype":"ATTR_SELECTOR","line":2,"col":44,"attrName":"attr6","matchOperator":"$=","value":"boo","valueStartPos":83,"valueEndPos":86},{"tokentype":"ATTR_SELECTOR","line":2,"col":57,"attrName":"attr7","matchOperator":"*=","value":"bang","valueStartPos":96,"valueEndPos":100},{"tokentype":"ATTR_SELECTOR","line":2,"col":72,"attrName":"attr8","matchOperator":"","value":"","valueStartPos":-1,"valueEndPos":-1}]})");
 }
 
 TEST(ParseCssTest, ParseASelectorsGroupWithPseudoClass) {
   vector<unique_ptr<Token>> tokens = ParseSelectorForTest("a::b:lang(fr-be)");
-  EXPECT_EQ(JsonFromList(tokens), R""([
-  {
-    "tokentype": "IDENT",
-    "line": 1,
-    "col": 0,
-    "value": "a"
-  },
-  {
-    "tokentype": "COLON",
-    "line": 1,
-    "col": 1
-  },
-  {
-    "tokentype": "COLON",
-    "line": 1,
-    "col": 2
-  },
-  {
-    "tokentype": "IDENT",
-    "line": 1,
-    "col": 3,
-    "value": "b"
-  },
-  {
-    "tokentype": "COLON",
-    "line": 1,
-    "col": 4
-  },
-  {
-    "tokentype": "FUNCTION_TOKEN",
-    "line": 1,
-    "col": 5,
-    "value": "lang"
-  },
-  {
-    "tokentype": "IDENT",
-    "line": 1,
-    "col": 10,
-    "value": "fr-be"
-  },
-  {
-    "tokentype": "CLOSE_PAREN",
-    "line": 1,
-    "col": 15
-  },
-  {
-    "tokentype": "EOF_TOKEN",
-    "line": 1,
-    "col": 16
-  }
-])"");
+  EXPECT_EQ(JsonFromList(tokens), R"([{"tokentype":"IDENT","line":1,"col":0,"value":"a"},{"tokentype":"COLON","line":1,"col":1},{"tokentype":"COLON","line":1,"col":2},{"tokentype":"IDENT","line":1,"col":3,"value":"b"},{"tokentype":"COLON","line":1,"col":4},{"tokentype":"FUNCTION_TOKEN","line":1,"col":5,"value":"lang"},{"tokentype":"IDENT","line":1,"col":10,"value":"fr-be"},{"tokentype":"CLOSE_PAREN","line":1,"col":15},{"tokentype":"EOF_TOKEN","line":1,"col":16}])");
   TokenStream token_stream(std::move(tokens));
   token_stream.Consume();
   ErrorTokenOr<Selector> maybe_selector = ParseASelectorsGroup(&token_stream);
   ASSERT_TRUE(std::holds_alternative<unique_ptr<Selector>>(maybe_selector));
   unique_ptr<Selector> selector =
       std::move(std::get<unique_ptr<Selector>>(maybe_selector));
-  EXPECT_EQ(selector->ToJson().ToString(), R""({
-  "tokentype": "SIMPLE_SELECTOR_SEQUENCE",
-  "line": 1,
-  "col": 0,
-  "typeSelector":  {
-    "tokentype": "TYPE_SELECTOR",
-    "line": 1,
-    "col": 0,
-    "elementName": "a",
-    "pos": 0,
-    "endPos": 1
-  },
-  "otherSelectors":  [
-    {
-      "tokentype": "PSEUDO_SELECTOR",
-      "line": 1,
-      "col": 1,
-      "isClass": false,
-      "name": "b"
-    },
-    {
-      "tokentype": "PSEUDO_SELECTOR",
-      "line": 1,
-      "col": 4,
-      "isClass": true,
-      "name": "lang",
-      "func":      [
-        {
-          "tokentype": "FUNCTION_TOKEN",
-          "line": 1,
-          "col": 5,
-          "value": "lang"
-        },
-        {
-          "tokentype": "IDENT",
-          "line": 1,
-          "col": 10,
-          "value": "fr-be"
-        },
-        {
-          "tokentype": "EOF_TOKEN",
-          "line": 1,
-          "col": 15
-        }
-      ]
-    }
-  ]
-})"");
+  EXPECT_EQ(selector->ToJson().ToString(), R"({"tokentype":"SIMPLE_SELECTOR_SEQUENCE","line":1,"col":0,"typeSelector":{"tokentype":"TYPE_SELECTOR","line":1,"col":0,"elementName":"a","pos":0,"endPos":1},"otherSelectors":[{"tokentype":"PSEUDO_SELECTOR","line":1,"col":1,"isClass":false,"name":"b"},{"tokentype":"PSEUDO_SELECTOR","line":1,"col":4,"isClass":true,"name":"lang","func":[{"tokentype":"FUNCTION_TOKEN","line":1,"col":5,"value":"lang"},{"tokentype":"IDENT","line":1,"col":10,"value":"fr-be"},{"tokentype":"EOF_TOKEN","line":1,"col":15}]}]})");
 }
 
 TEST(ParseCssTest, ParseASelectorsGroupWithANegation) {
@@ -3678,84 +891,7 @@ TEST(ParseCssTest, ParseASelectorsGroupWithANegation) {
   ASSERT_TRUE(std::holds_alternative<unique_ptr<Selector>>(maybe_selector));
   unique_ptr<Selector> selector =
       std::move(std::get<unique_ptr<Selector>>(maybe_selector));
-  EXPECT_EQ(selector->ToJson().ToString(), R""({
-  "tokentype": "SIMPLE_SELECTOR_SEQUENCE",
-  "line": 1,
-  "col": 0,
-  "typeSelector":  {
-    "tokentype": "TYPE_SELECTOR",
-    "line": 1,
-    "col": 0,
-    "namespacePrefix": "html",
-    "elementName": "*",
-    "pos": 0,
-    "endPos": 6
-  },
-  "otherSelectors":  [
-    {
-      "tokentype": "PSEUDO_SELECTOR",
-      "line": 1,
-      "col": 6,
-      "isClass": true,
-      "name": "not",
-      "func":      [
-        {
-          "tokentype": "FUNCTION_TOKEN",
-          "line": 1,
-          "col": 7,
-          "value": "not"
-        },
-        {
-          "tokentype": "COLON",
-          "line": 1,
-          "col": 11
-        },
-        {
-          "tokentype": "IDENT",
-          "line": 1,
-          "col": 12,
-          "value": "link"
-        },
-        {
-          "tokentype": "EOF_TOKEN",
-          "line": 1,
-          "col": 16
-        }
-      ]
-    },
-    {
-      "tokentype": "PSEUDO_SELECTOR",
-      "line": 1,
-      "col": 17,
-      "isClass": true,
-      "name": "not",
-      "func":      [
-        {
-          "tokentype": "FUNCTION_TOKEN",
-          "line": 1,
-          "col": 18,
-          "value": "not"
-        },
-        {
-          "tokentype": "COLON",
-          "line": 1,
-          "col": 22
-        },
-        {
-          "tokentype": "IDENT",
-          "line": 1,
-          "col": 23,
-          "value": "visited"
-        },
-        {
-          "tokentype": "EOF_TOKEN",
-          "line": 1,
-          "col": 30
-        }
-      ]
-    }
-  ]
-})"");
+  EXPECT_EQ(selector->ToJson().ToString(), R"({"tokentype":"SIMPLE_SELECTOR_SEQUENCE","line":1,"col":0,"typeSelector":{"tokentype":"TYPE_SELECTOR","line":1,"col":0,"namespacePrefix":"html","elementName":"*","pos":0,"endPos":6},"otherSelectors":[{"tokentype":"PSEUDO_SELECTOR","line":1,"col":6,"isClass":true,"name":"not","func":[{"tokentype":"FUNCTION_TOKEN","line":1,"col":7,"value":"not"},{"tokentype":"COLON","line":1,"col":11},{"tokentype":"IDENT","line":1,"col":12,"value":"link"},{"tokentype":"EOF_TOKEN","line":1,"col":16}]},{"tokentype":"PSEUDO_SELECTOR","line":1,"col":17,"isClass":true,"name":"not","func":[{"tokentype":"FUNCTION_TOKEN","line":1,"col":18,"value":"not"},{"tokentype":"COLON","line":1,"col":22},{"tokentype":"IDENT","line":1,"col":23,"value":"visited"},{"tokentype":"EOF_TOKEN","line":1,"col":30}]}]})");
 }
 
 TEST(ParseCssTest, ParseSelectors_ReportsErrorForUnparsedRemainderOfInput) {
@@ -3766,15 +902,7 @@ TEST(ParseCssTest, ParseSelectors_ReportsErrorForUnparsedRemainderOfInput) {
   ASSERT_TRUE(std::holds_alternative<unique_ptr<ErrorToken>>(maybe_selector));
   unique_ptr<ErrorToken> error =
       std::move(std::get<unique_ptr<ErrorToken>>(maybe_selector));
-  EXPECT_EQ(error->ToJson().ToString(), R""({
-  "tokentype": "ERROR",
-  "line": 1,
-  "col": 8,
-  "code": "CSS_SYNTAX_UNPARSED_INPUT_REMAINS_IN_SELECTOR",
-  "params":  [
-    "style"
-  ]
-})"");
+  EXPECT_EQ(error->ToJson().ToString(), R"({"tokentype":"ERROR","line":1,"col":8,"code":"CSS_SYNTAX_UNPARSED_INPUT_REMAINS_IN_SELECTOR","params":["style"]})");
 }
 
 TEST(ParseCssTest, SelectorParserRecordsOneParsingError) {
@@ -3822,60 +950,7 @@ TEST(ParseCssTest, SelectorParserImplementsVisitorPattern) {
 
   // The combinator #2 is the (in) famous whitespace operator.
   EXPECT_EQ(visitor.combinators_[2]->ToJson().ToString(),
-            R""({
-  "tokentype": "COMBINATOR",
-  "line": 1,
-  "col": 5,
-  "combinatorType": "DESCENDANT",
-  "left":  {
-    "tokentype": "COMBINATOR",
-    "line": 1,
-    "col": 2,
-    "combinatorType": "CHILD",
-    "left":    {
-      "tokentype": "SIMPLE_SELECTOR_SEQUENCE",
-      "line": 1,
-      "col": 0,
-      "typeSelector":      {
-        "tokentype": "TYPE_SELECTOR",
-        "line": 1,
-        "col": 0,
-        "elementName": "a",
-        "pos": 0,
-        "endPos": 1
-      },
-      "otherSelectors":      []
-    },
-    "right":    {
-      "tokentype": "SIMPLE_SELECTOR_SEQUENCE",
-      "line": 1,
-      "col": 4,
-      "typeSelector":      {
-        "tokentype": "TYPE_SELECTOR",
-        "line": 1,
-        "col": 4,
-        "elementName": "b",
-        "pos": 4,
-        "endPos": 5
-      },
-      "otherSelectors":      []
-    }
-  },
-  "right":  {
-    "tokentype": "SIMPLE_SELECTOR_SEQUENCE",
-    "line": 1,
-    "col": 6,
-    "typeSelector":    {
-      "tokentype": "TYPE_SELECTOR",
-      "line": 1,
-      "col": 6,
-      "elementName": "c",
-      "pos": 6,
-      "endPos": 7
-    },
-    "otherSelectors":    []
-  }
-})"");
+            R"({"tokentype":"COMBINATOR","line":1,"col":5,"combinatorType":"DESCENDANT","left":{"tokentype":"COMBINATOR","line":1,"col":2,"combinatorType":"CHILD","left":{"tokentype":"SIMPLE_SELECTOR_SEQUENCE","line":1,"col":0,"typeSelector":{"tokentype":"TYPE_SELECTOR","line":1,"col":0,"elementName":"a","pos":0,"endPos":1},"otherSelectors":[]},"right":{"tokentype":"SIMPLE_SELECTOR_SEQUENCE","line":1,"col":4,"typeSelector":{"tokentype":"TYPE_SELECTOR","line":1,"col":4,"elementName":"b","pos":4,"endPos":5},"otherSelectors":[]}},"right":{"tokentype":"SIMPLE_SELECTOR_SEQUENCE","line":1,"col":6,"typeSelector":{"tokentype":"TYPE_SELECTOR","line":1,"col":6,"elementName":"c","pos":6,"endPos":7},"otherSelectors":[]}})");
 }
 
 // Collects type selectors that match a body tag.
@@ -3952,16 +1027,7 @@ TEST(ParseCssTest, CloneTypeSelectorWithDefaultNamespace) {
 }
 
 TEST(ParseCssTest, CloneAttrSelectorWithDefaultNamespace) {
-  const std::string kExpectedJson = R"({
-  "tokentype": "ATTR_SELECTOR",
-  "line": 1,
-  "col": 0,
-  "attrName": "attr",
-  "matchOperator": "=",
-  "value": "val",
-  "valueStartPos": -1,
-  "valueEndPos": -1
-})";
+  const std::string kExpectedJson = R"({"tokentype":"ATTR_SELECTOR","line":1,"col":0,"attrName":"attr","matchOperator":"=","value":"val","valueStartPos":-1,"valueEndPos":-1})";
 
   AttrSelector attr_selector(/*namespace_prefix=*/nullptr, "attr", "=", "val");
   EXPECT_EQ(attr_selector.ToJson().ToString(), kExpectedJson);
diff --git a/validator/cpp/htmlparser/data/CaseFolding.txt b/validator/cpp/htmlparser/data/CaseFolding.txt
index 033788b253f7..65aa0fcd6b32 100644
--- a/validator/cpp/htmlparser/data/CaseFolding.txt
+++ b/validator/cpp/htmlparser/data/CaseFolding.txt
@@ -1,11 +1,11 @@
-# CaseFolding-13.0.0.txt
-# Date: 2019-09-08, 23:30:59 GMT
-# © 2019 Unicode®, Inc.
+# CaseFolding-15.0.0.txt
+# Date: 2022-02-02, 23:35:35 GMT
+# © 2022 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
-# For terms of use, see http://www.unicode.org/terms_of_use.html
+# For terms of use, see https://www.unicode.org/terms_of_use.html
 #
 # Unicode Character Database
-#   For documentation, see http://www.unicode.org/reports/tr44/
+#   For documentation, see https://www.unicode.org/reports/tr44/
 #
 # Case Folding Properties
 #
@@ -1050,6 +1050,7 @@
 2C2C; C; 2C5C; # GLAGOLITIC CAPITAL LETTER SHTAPIC
 2C2D; C; 2C5D; # GLAGOLITIC CAPITAL LETTER TROKUTASTI A
 2C2E; C; 2C5E; # GLAGOLITIC CAPITAL LETTER LATINATE MYSLITE
+2C2F; C; 2C5F; # GLAGOLITIC CAPITAL LETTER CAUDATE CHRIVI
 2C60; C; 2C61; # LATIN CAPITAL LETTER L WITH DOUBLE BAR
 2C62; C; 026B; # LATIN CAPITAL LETTER L WITH MIDDLE TILDE
 2C63; C; 1D7D; # LATIN CAPITAL LETTER P WITH STROKE
@@ -1230,12 +1231,16 @@ A7B8; C; A7B9; # LATIN CAPITAL LETTER U WITH STROKE
 A7BA; C; A7BB; # LATIN CAPITAL LETTER GLOTTAL A
 A7BC; C; A7BD; # LATIN CAPITAL LETTER GLOTTAL I
 A7BE; C; A7BF; # LATIN CAPITAL LETTER GLOTTAL U
+A7C0; C; A7C1; # LATIN CAPITAL LETTER OLD POLISH O
 A7C2; C; A7C3; # LATIN CAPITAL LETTER ANGLICANA W
 A7C4; C; A794; # LATIN CAPITAL LETTER C WITH PALATAL HOOK
 A7C5; C; 0282; # LATIN CAPITAL LETTER S WITH HOOK
 A7C6; C; 1D8E; # LATIN CAPITAL LETTER Z WITH PALATAL HOOK
 A7C7; C; A7C8; # LATIN CAPITAL LETTER D WITH SHORT STROKE OVERLAY
 A7C9; C; A7CA; # LATIN CAPITAL LETTER S WITH SHORT STROKE OVERLAY
+A7D0; C; A7D1; # LATIN CAPITAL LETTER CLOSED INSULAR G
+A7D6; C; A7D7; # LATIN CAPITAL LETTER MIDDLE SCOTS S
+A7D8; C; A7D9; # LATIN CAPITAL LETTER SIGMOID S
 A7F5; C; A7F6; # LATIN CAPITAL LETTER REVERSED HALF H
 AB70; C; 13A0; # CHEROKEE SMALL LETTER A
 AB71; C; 13A1; # CHEROKEE SMALL LETTER E
@@ -1431,6 +1436,41 @@ FF3A; C; FF5A; # FULLWIDTH LATIN CAPITAL LETTER Z
 104D1; C; 104F9; # OSAGE CAPITAL LETTER GHA
 104D2; C; 104FA; # OSAGE CAPITAL LETTER ZA
 104D3; C; 104FB; # OSAGE CAPITAL LETTER ZHA
+10570; C; 10597; # VITHKUQI CAPITAL LETTER A
+10571; C; 10598; # VITHKUQI CAPITAL LETTER BBE
+10572; C; 10599; # VITHKUQI CAPITAL LETTER BE
+10573; C; 1059A; # VITHKUQI CAPITAL LETTER CE
+10574; C; 1059B; # VITHKUQI CAPITAL LETTER CHE
+10575; C; 1059C; # VITHKUQI CAPITAL LETTER DE
+10576; C; 1059D; # VITHKUQI CAPITAL LETTER DHE
+10577; C; 1059E; # VITHKUQI CAPITAL LETTER EI
+10578; C; 1059F; # VITHKUQI CAPITAL LETTER E
+10579; C; 105A0; # VITHKUQI CAPITAL LETTER FE
+1057A; C; 105A1; # VITHKUQI CAPITAL LETTER GA
+1057C; C; 105A3; # VITHKUQI CAPITAL LETTER HA
+1057D; C; 105A4; # VITHKUQI CAPITAL LETTER HHA
+1057E; C; 105A5; # VITHKUQI CAPITAL LETTER I
+1057F; C; 105A6; # VITHKUQI CAPITAL LETTER IJE
+10580; C; 105A7; # VITHKUQI CAPITAL LETTER JE
+10581; C; 105A8; # VITHKUQI CAPITAL LETTER KA
+10582; C; 105A9; # VITHKUQI CAPITAL LETTER LA
+10583; C; 105AA; # VITHKUQI CAPITAL LETTER LLA
+10584; C; 105AB; # VITHKUQI CAPITAL LETTER ME
+10585; C; 105AC; # VITHKUQI CAPITAL LETTER NE
+10586; C; 105AD; # VITHKUQI CAPITAL LETTER NJE
+10587; C; 105AE; # VITHKUQI CAPITAL LETTER O
+10588; C; 105AF; # VITHKUQI CAPITAL LETTER PE
+10589; C; 105B0; # VITHKUQI CAPITAL LETTER QA
+1058A; C; 105B1; # VITHKUQI CAPITAL LETTER RE
+1058C; C; 105B3; # VITHKUQI CAPITAL LETTER SE
+1058D; C; 105B4; # VITHKUQI CAPITAL LETTER SHE
+1058E; C; 105B5; # VITHKUQI CAPITAL LETTER TE
+1058F; C; 105B6; # VITHKUQI CAPITAL LETTER THE
+10590; C; 105B7; # VITHKUQI CAPITAL LETTER U
+10591; C; 105B8; # VITHKUQI CAPITAL LETTER VE
+10592; C; 105B9; # VITHKUQI CAPITAL LETTER XE
+10594; C; 105BB; # VITHKUQI CAPITAL LETTER Y
+10595; C; 105BC; # VITHKUQI CAPITAL LETTER ZE
 10C80; C; 10CC0; # OLD HUNGARIAN CAPITAL LETTER A
 10C81; C; 10CC1; # OLD HUNGARIAN CAPITAL LETTER AA
 10C82; C; 10CC2; # OLD HUNGARIAN CAPITAL LETTER EB
diff --git a/validator/cpp/htmlparser/data/ipaddressgrammar.txt b/validator/cpp/htmlparser/data/ipaddressgrammar.txt
new file mode 100644
index 000000000000..9b8b7797bfcd
--- /dev/null
+++ b/validator/cpp/htmlparser/data/ipaddressgrammar.txt
@@ -0,0 +1,363 @@
+$ '[' IPV6_1_1;
+$ '0' IPV4_OCTAL_1_2;
+# Max 199
+$ '1' IPV4_99_1_2;
+# Max 255.
+$ '2' IPV4_55_1_2;
+# Max 2 digits.
+$ "3..9" IPV4_2DIG_1_2;
+
+# =================
+#      IPv4
+# =================
+IPV4_99_1_2 "0..9" IPV4_99_1_3;
+IPV4_99_1_2 '.' IPV4_2;
+IPV4_99_1_3 "0..9" IPV4_DOT_1;
+IPV4_99_1_3 '.' IPV4_2;
+
+IPV4_55_1_2 "0..5" IPV4_55_1_3;
+IPV4_55_1_2 '.' IPV4_2;
+IPV4_55_1_3 "0..5" IPV4_DOT_1;
+IPV4_55_1_3 '.' IPV4_2;
+
+IPV4_2DIG_1_2 "0..9" IPV4_DOT_1;
+IPV4_2DIG_1_2 '.' IPV4_2;
+IPV4_DOT_1 '.' IPV4_2;
+IPV4_DOT_2 '.' IPV4_3;
+IPV4_DOT_3 '.' IPV4_4;
+
+IPV4_2 '0' IPV4_OCTAL_2_2;
+IPV4_2 '1' IPV4_99_2_2;
+IPV4_2 '2' IPV4_55_2_2;
+IPV4_2 "3..9" IPV4_2DIG_2_2;
+
+IPV4_99_2_2 "0..9" IPV4_99_2_3;
+IPV4_99_2_2 '.' IPV4_3;
+IPV4_99_2_3 "0..9" IPV4_DOT_2;
+IPV4_99_2_3 '.' IPV4_3;
+
+IPV4_55_2_2 "0..5" IPV4_55_2_3;
+IPV4_55_2_2 '.' IPV4_3;
+IPV4_55_2_3 "0..5" IPV4_DOT_2;
+IPV4_55_2_3 '.' IPV4_3;
+
+IPV4_2DIG_2_2 "0..9" IPV4_DOT_2;
+IPV4_2DIG_2_2 '.' IPV4_3;
+
+IPV4_3 '0' IPV4_OCTAL_3_2;
+IPV4_3 '1' IPV4_99_3_2
+IPV4_3 '2' IPV4_55_3_2;
+IPV4_3 "3..9" IPV4_2DIG_3_2;
+
+IPV4_99_3_2 "0..9" IPV4_99_3_3;
+IPV4_99_3_2 '.' IPV4_4;
+IPV4_99_3_3 "0..9" IPV4_SEPARATOR_3;
+IPV4_99_3_3 '.' IPV4_4;
+IPV4_SEPARATOR_3 '.' IPV4_4;
+
+IPV4_55_3_2 "0..5" IPV4_55_3_3;
+IPV4_55_3_2 '.' IPV4_4;
+IPV4_55_3_3 "0..5" IPV4_SEPARATOR_3;
+IPV4_55_3_3 '.' IPV4_4;
+
+IPV4_2DIG_3_2 "0..9" IPV4_SEPARATOR_3;
+IPV4_2DIG_3_2 '.' IPV4_4;
+IPV4_SEPARATOR_3 '.' IPV4_4;
+
+IPV4_4 '0' IPV4_OCTAL_4_2;
+IPV4_4 '1' IPV4_99_4_2;
+IPV4_4 '2' IPV4_55_4_2;
+IPV4_4 "3..9" IPV4_2DIG_4_2;
+IPV4_99_4_2 "0..9" IPV4_99_4_3;
+IPV4_99_4_2 ':' PORT_1;
+IPV4_99_4_2 0 POP;
+IPV4_99_4_3 "0..9" IP_END;
+IPV4_55_4_2 "0..5" IPV4_55_4_3;
+IPV4_55_4_2 ':' PORT_1;
+IPV4_55_4_2 0 POP;
+IPV4_55_4_3 "0..5" IP_END;
+IPV4_55_4_3 ':' PORT_1;
+IPV4_55_4_3 0 POP;
+IPV4_2DIG_4_2 "0..9" IP_END;
+IPV4_2DIG_4_2 ':' PORT_1;
+IPV4_2DIG_4_2 0 POP;
+
+# IPv4 Octal values.
+IPV4_OCTAL_1_2 "1..3" IPV4_OCTAL_3_DIGIT_1_3;
+IPV4_OCTAL_1_2 "4..7" IPV4_OCTAL_2_DIGIT_1_3;
+IPV4_OCTAL_1_2 '.' IPV4_2;
+IPV4_OCTAL_2_DIGIT_1_3 "0..7" IPV4_2;
+IPV4_OCTAL_2_DIGIT_1_3 '.' IPV4_2;
+IPV4_OCTAL_3_DIGIT_1_3 "0..7" IPV4_OCTAL_3_DIGIT_1_4;
+IPV4_OCTAL_3_DIGIT_1_3 '.' IPV4_2;
+IPV4_OCTAL_3_DIGIT_1_4 "0..7" IPV4_DOT_1;
+IPV4_OCTAL_3_DIGIT_1_4 '.' IPV4_2;
+
+IPV4_OCTAL_2_2 "1..3" IPV4_OCTAL_3_DIGIT_2_3;
+IPV4_OCTAL_2_2 "4..7" IPV4_OCTAL_2_DIGIT_2_3;
+IPV4_OCTAL_2_2 '.' IPV4_3;
+IPV4_OCTAL_2_DIGIT_2_3 "0..7" IPV4_3;
+IPV4_OCTAL_2_DIGIT_2_3 '.' IPV4_3;
+IPV4_OCTAL_3_DIGIT_2_3 "0..7" IPV4_OCTAL_3_DIGIT_2_4;
+IPV4_OCTAL_3_DIGIT_2_4 "0..7" IPV4_DOT_2;
+IPV4_OCTAL_3_DIGIT_2_4 '.' IPV4_3;
+
+IPV4_OCTAL_3_2 "1..3" IPV4_OCTAL_3_DIGIT_3_3;
+IPV4_OCTAL_3_2 "4..7" IPV4_OCTAL_2_DIGIT_3_3;
+IPV4_OCTAL_3_2 '.' IPV4_4;
+IPV4_OCTAL_2_DIGIT_3_3 "0..7" IPV4_4;
+IPV4_OCTAL_2_DIGIT_3_3 '.' IPV4_4;
+IPV4_OCTAL_3_DIGIT_3_3 "0..7" IPV4_OCTAL_3_DIGIT_3_4;
+IPV4_OCTAL_3_DIGIT_3_4 "0..7" IPV4_DOT_3;
+IPV4_OCTAL_3_DIGIT_3_4 '.' IPV4_4;
+
+IPV4_OCTAL_4_2 "1..3" IPV4_OCTAL_3_DIGIT_4_3;
+IPV4_OCTAL_4_2 "4..7" IPV4_OCTAL_2_DIGIT_4_3;
+IPV4_OCTAL_4_2 ':' PORT_1;
+IPV4_OCTAL_4_2 0 POP;
+IPV4_OCTAL_2_DIGIT_4_3 "0..7" IP_END;
+IPV4_OCTAL_3_DIGIT_4_3 "0..7" IPV4_OCTAL_3_DIGIT_4_4;
+IPV4_OCTAL_3_DIGIT_4_3 ':' PORT_1;
+IPV4_OCTAL_3_DIGIT_4_3 0 POP;
+IPV4_OCTAL_3_DIGIT_4_4 "0..7" IP_END;
+IPV4_OCTAL_3_DIGIT_4_4 ':' PORT_1;
+IPV4_OCTAL_3_DIGIT_4_4 0 POP;
+
+# =================
+#      IPv6
+# =================
+# First octet.
+IPV6_1_1 "0..9a..fA..F" IPV6_1_2;
+IPV6_1_2 "0..9a..fA..F" IPV6_1_3;
+IPV6_1_3 "0..9a..fA..F" IPV6_1_4;
+IPV6_1_4 "0..9a..fA..F" IPV6_SEP_1_1;
+IPV6_1_1 ':' IPV6_SEP_1_2;
+IPV6_1_2 ':' IPV6_SEP_1_2;
+IPV6_1_3 ':' IPV6_SEP_1_2;
+IPV6_1_4 ':' IPV6_SEP_1_2;
+IPV6_SEP_1_1 ':' IPV6_SEP_1_2;
+IPV6_SEP_1_2 "0..9a..fA..F" IPV6_2_2;
+IPV6_SEP_1_2 ':' IPV6_1_CLOSE;
+IPV6_1_CLOSE ']' IP_END;
+IPV6_1_CLOSE "0..9a..fA..F" IPV6_2_2_COMPRESSED;
+
+# Second octet.
+IPV6_2_2 "0..9a..fA..F" IPV6_2_3;
+IPV6_2_3 "0..9a..fA..F" IPV6_2_4;
+IPV6_2_4 "0..9a..fA..F" IPV6_SEP_2_1;
+IPV6_2_2 ':' IPV6_SEP_2_2;
+IPV6_2_3 ':' IPV6_SEP_2_2;
+IPV6_2_4 ':' IPV6_SEP_2_2;
+IPV6_SEP_2_1 ':' IPV6_SEP_2_2;
+IPV6_SEP_2_2 "0..9a..fA..F" IPV6_3_2;
+IPV6_SEP_2_2 ':' IPV6_2_CLOSE;
+IPV6_2_CLOSE ']' IP_END;
+IPV6_2_CLOSE "0..9a..fA..F" IPV6_3_2_COMPRESSED;
+
+# Third octet.
+IPV6_3_2 "0..9a..fA..F" IPV6_3_3;
+IPV6_3_3 "0..9a..fA..F" IPV6_3_4;
+IPV6_3_4 "0..9a..fA..F" IPV6_SEP_3_1;
+IPV6_3_2 ':' IPV6_SEP_3_2;
+IPV6_3_3 ':' IPV6_SEP_3_2;
+IPV6_3_4 ':' IPV6_SEP_3_2;
+IPV6_SEP_3_1 ':' IPV6_SEP_3_2;
+IPV6_SEP_3_2 "0..9a..fA..F" IPV6_4_2;
+IPV6_SEP_3_2 ':' IPV6_3_CLOSE;
+IPV6_3_CLOSE ']' IP_END;
+IPV6_3_CLOSE "0..9a..fA..F" IPV6_4_2_COMPRESSED;
+
+# Fourth octet.
+IPV6_4_2 "0..9a..fA..F" IPV6_4_3;
+IPV6_4_3 "0..9a..fA..F" IPV6_4_4;
+IPV6_4_4 "0..9a..fA..F" IPV6_SEP_4_1;
+IPV6_4_2 ':' IPV6_SEP_4_2;
+IPV6_4_3 ':' IPV6_SEP_4_2;
+IPV6_4_4 ':' IPV6_SEP_4_2;
+IPV6_SEP_4_1 ':' IPV6_SEP_4_2;
+IPV6_SEP_4_2 "0..9a..fA..F" IPV6_5_2;
+IPV6_SEP_4_2 ':' IPV6_4_CLOSE;
+IPV6_4_CLOSE ']' IP_END;
+IPV6_4_CLOSE "0..9a..fA..F" IPV6_5_2_COMPRESSED;
+
+# Fifth octet.
+IPV6_5_2 "0..9a..fA..F" IPV6_5_3;
+IPV6_5_3 "0..9a..fA..F" IPV6_5_4;
+IPV6_5_4 "0..9a..fA..F" IPV6_SEP_5_1;
+IPV6_5_2 ':' IPV6_SEP_5_2;
+IPV6_5_3 ':' IPV6_SEP_5_2;
+IPV6_5_4 ':' IPV6_SEP_5_2;
+IPV6_SEP_5_1 ':' IPV6_SEP_5_2;
+IPV6_SEP_5_2 "0..9a..fA..F" IPV6_6_2;
+IPV6_SEP_5_2 ':' IPV6_5_CLOSE;
+IPV6_5_CLOSE ']' IP_END;
+IPV6_5_CLOSE "0..9a..fA..F" IPV6_6_2_COMPRESSED;
+
+# Sixth octet.
+IPV6_6_2 "0..9a..fA..F" IPV6_6_3;
+IPV6_6_3 "0..9a..fA..F" IPV6_6_4;
+IPV6_6_4 "0..9a..fA..F" IPV6_SEP_6_1;
+IPV6_6_2 ':' IPV6_SEP_6_2;
+IPV6_6_3 ':' IPV6_SEP_6_2;
+IPV6_6_4 ':' IPV6_SEP_6_2;
+IPV6_SEP_6_1 ':' IPV6_SEP_6_2;
+IPV6_SEP_6_2 "0..9a..fA..F" IPV6_7_2;
+IPV6_SEP_6_2 ':' IPV6_6_CLOSE;
+IPV6_6_CLOSE ']' IP_END;
+IPV6_6_CLOSE "0..9a..fA..F" IPV6_7_2_COMPRESSED;
+
+# Sevent octet.
+IPV6_7_2 "0..9a..fA..F" IPV6_7_3;
+IPV6_7_3 "0..9a..fA..F" IPV6_7_4;
+IPV6_7_4 "0..9a..fA..F" IPV6_SEP_7_1;
+IPV6_7_2 ':' IPV6_SEP_7_2;
+IPV6_7_3 ':' IPV6_SEP_7_2;
+IPV6_7_4 ':' IPV6_SEP_7_2;
+IPV6_SEP_7_1 ':' IPV6_SEP_7_2;
+IPV6_SEP_7_2 "0..9a..fA..F" IPV6_8_2;
+IPV6_SEP_7_2 ':' IPV6_7_CLOSE;
+IPV6_7_CLOSE ']' IP_END;
+IPV6_7_CLOSE "0..9a..fA..F" IPV6_8_2;
+
+# Eighth octet.
+IPV6_8_2 "0..9a..fA..F" IPV6_8_3;
+IPV6_8_3 "0..9a..fA..F" IPV6_8_4;
+IPV6_8_4 "0..9a..fA..F" IPV6_CLOSE;
+IPV6_CLOSE ']' IP_END;
+IPV6_8_2 "%" IPV6_ZONE_ID_1;
+IPV6_8_3 "%" IPV6_ZONE_ID_1;
+IPV6_8_4 "%" IPV6_ZONE_ID_1;
+IPV6_8_2 ']' IP_END;
+IPV6_8_3 ']' IP_END;
+IPV6_8_4 ']' IP_END;
+
+IPV6_2_2_COMPRESSED "0..9a..fA..F" IPV6_2_3_COMPRESSED;
+IPV6_2_3_COMPRESSED "0..9a..fA..F" IPV6_2_4_COMPRESSED
+IPV6_2_4_COMPRESSED "0..9a..fA..F" IPV6_SEP_2_1_COMPRESSED;
+IPV6_SEP_2_1_COMPRESSED ':' IPV6_3_1_COMPRESSED;
+IPV6_2_2_COMPRESSED ':' IPV6_3_1_COMPRESSED;
+IPV6_2_3_COMPRESSED ':' IPV6_3_1_COMPRESSED;
+IPV6_2_4_COMPRESSED ':' IPV6_3_1_COMPRESSED;
+IPV6_SEP_2_1_COMPRESSED ']' IP_END;
+IPV6_SEP_2_1_COMPRESSED '%' IPV6_ZONE_ID_1;
+IPV6_2_2_COMPRESSED '%' IPV6_ZONE_ID_1;
+IPV6_2_3_COMPRESSED '%' IPV6_ZONE_ID_1;
+IPV6_2_4_COMPRESSED '%' IPV6_ZONE_ID_1;
+IPV6_2_2_COMPRESSED ']' IP_END;
+IPV6_2_3_COMPRESSED ']' IP_END;
+IPV6_2_4_COMPRESSED ']' IP_END;
+
+IPV6_3_1_COMPRESSED "0..9a..fA..F" IPV6_3_2_COMPRESSED;
+IPV6_3_2_COMPRESSED "0..9a..fA..F" IPV6_3_3_COMPRESSED;
+IPV6_3_3_COMPRESSED "0..9a..fA..F" IPV6_3_4_COMPRESSED
+IPV6_3_4_COMPRESSED "0..9a..fA..F" IPV6_SEP_3_1_COMPRESSED;
+IPV6_SEP_3_1_COMPRESSED ':' IPV6_4_1_COMPRESSED;
+IPV6_3_2_COMPRESSED ':' IPV6_4_1_COMPRESSED;
+IPV6_3_3_COMPRESSED ':' IPV6_4_1_COMPRESSED;
+IPV6_3_4_COMPRESSED ':' IPV6_4_1_COMPRESSED;
+IPV6_SEP_3_1_COMPRESSED ']' IP_END;
+IPV6_SEP_3_1_COMPRESSED '%' IPV6_ZONE_ID_1;
+IPV6_3_2_COMPRESSED '%' IPV6_ZONE_ID_1;
+IPV6_3_3_COMPRESSED '%' IPV6_ZONE_ID_1;
+IPV6_3_4_COMPRESSED '%' IPV6_ZONE_ID_1;
+IPV6_3_2_COMPRESSED ']' IP_END;
+IPV6_3_3_COMPRESSED ']' IP_END;
+IPV6_3_4_COMPRESSED ']' IP_END;
+
+IPV6_4_1_COMPRESSED "0..9a..fA..F" IPV6_4_2_COMPRESSED;
+IPV6_4_2_COMPRESSED "0..9a..fA..F" IPV6_4_3_COMPRESSED;
+IPV6_4_3_COMPRESSED "0..9a..fA..F" IPV6_4_4_COMPRESSED
+IPV6_4_4_COMPRESSED "0..9a..fA..F" IPV6_SEP_4_1_COMPRESSED;
+IPV6_SEP_4_1_COMPRESSED ':' IPV6_5_1_COMPRESSED;
+IPV6_4_2_COMPRESSED ':' IPV6_5_1_COMPRESSED;
+IPV6_4_3_COMPRESSED ':' IPV6_5_1_COMPRESSED;
+IPV6_4_4_COMPRESSED ':' IPV6_5_1_COMPRESSED;
+IPV6_SEP_4_1_COMPRESSED ']' IP_END;
+IPV6_SEP_4_1_COMPRESSED '%' IPV6_ZONE_ID_1;
+IPV6_4_2_COMPRESSED '%' IPV6_ZONE_ID_1;
+IPV6_4_3_COMPRESSED '%' IPV6_ZONE_ID_1;
+IPV6_4_4_COMPRESSED '%' IPV6_ZONE_ID_1;
+IPV6_4_2_COMPRESSED ']' IP_END;
+IPV6_4_3_COMPRESSED ']' IP_END;
+IPV6_4_4_COMPRESSED ']' IP_END;
+
+IPV6_5_1_COMPRESSED "0..9a..fA..F" IPV6_5_2_COMPRESSED;
+IPV6_5_2_COMPRESSED "0..9a..fA..F" IPV6_5_3_COMPRESSED;
+IPV6_5_3_COMPRESSED "0..9a..fA..F" IPV6_5_4_COMPRESSED
+IPV6_5_4_COMPRESSED "0..9a..fA..F" IPV6_SEP_5_1_COMPRESSED;
+IPV6_SEP_5_1_COMPRESSED ':' IPV6_6_1_COMPRESSED;
+IPV6_5_2_COMPRESSED ':' IPV6_6_1_COMPRESSED;
+IPV6_5_3_COMPRESSED ':' IPV6_6_1_COMPRESSED;
+IPV6_5_4_COMPRESSED ':' IPV6_6_1_COMPRESSED;
+IPV6_SEP_5_1_COMPRESSED ']' IP_END;
+IPV6_SEP_5_1_COMPRESSED '%' IPV6_ZONE_ID_1;
+IPV6_5_2_COMPRESSED '%' IPV6_ZONE_ID_1;
+IPV6_5_3_COMPRESSED '%' IPV6_ZONE_ID_1;
+IPV6_5_4_COMPRESSED '%' IPV6_ZONE_ID_1;
+IPV6_5_2_COMPRESSED ']' IP_END;
+IPV6_5_3_COMPRESSED ']' IP_END;
+IPV6_5_4_COMPRESSED ']' IP_END;
+
+IPV6_6_1_COMPRESSED "0..9a..fA..F" IPV6_6_2_COMPRESSED;
+IPV6_6_2_COMPRESSED "0..9a..fA..F" IPV6_6_3_COMPRESSED;
+IPV6_6_3_COMPRESSED "0..9a..fA..F" IPV6_6_4_COMPRESSED
+IPV6_6_4_COMPRESSED "0..9a..fA..F" IPV6_SEP_6_1_COMPRESSED;
+IPV6_SEP_6_1_COMPRESSED ':' IPV6_7_1_COMPRESSED;
+IPV6_6_2_COMPRESSED ':' IPV6_7_1_COMPRESSED;
+IPV6_6_3_COMPRESSED ':' IPV6_7_1_COMPRESSED;
+IPV6_6_4_COMPRESSED ':' IPV6_7_1_COMPRESSED;
+IPV6_SEP_6_1_COMPRESSED ']' IP_END;
+IPV6_SEP_6_1_COMPRESSED '%' IPV6_ZONE_ID_1;
+IPV6_6_2_COMPRESSED '%' IPV6_ZONE_ID_1;
+IPV6_6_3_COMPRESSED '%' IPV6_ZONE_ID_1;
+IPV6_6_4_COMPRESSED '%' IPV6_ZONE_ID_1;
+IPV6_6_2_COMPRESSED ']' IP_END;
+IPV6_6_3_COMPRESSED ']' IP_END;
+IPV6_6_4_COMPRESSED ']' IP_END;
+
+IPV6_7_1_COMPRESSED "0..9a..fA..F" IPV6_7_2_COMPRESSED;
+IPV6_7_2_COMPRESSED "0..9a..fA..F" IPV6_7_3_COMPRESSED;
+IPV6_7_3_COMPRESSED "0..9a..fA..F" IPV6_7_4_COMPRESSED
+IPV6_7_4_COMPRESSED "0..9a..fA..F" IPV6_ZONE_ID;
+IPV6_7_2_COMPRESSED '%' IPV6_ZONE_ID_1;
+IPV6_7_3_COMPRESSED '%' IPV6_ZONE_ID_1;
+IPV6_7_4_COMPRESSED '%' IPV6_ZONE_ID_1;
+IPV6_7_2_COMPRESSED ']' IP_END;
+IPV6_7_3_COMPRESSED ']' IP_END;
+IPV6_7_4_COMPRESSED ']' IP_END;
+
+IP_END ':' PORT_1;
+IP_END 0 POP;
+
+IPV6_ZONE_ID '%' IPV6_ZONE_ID_1;
+IPV6_ZONE_ID ']' IP_END;
+IPV6_ZONE_ID_1 "a..zA..Z0..9" IPV6_ZONE_ID_2;
+IPV6_ZONE_ID_1 ']' IP_END;
+IPV6_ZONE_ID_2 "a..zA..Z0..9" IPV6_ZONE_ID_3;
+IPV6_ZONE_ID_2 ']' IP_END;
+IPV6_ZONE_ID_3 "a..zA..Z0..9" IPV6_ZONE_ID_4;
+IPV6_ZONE_ID_3 ']' IP_END;
+IPV6_ZONE_ID_4 "a..zA..Z0..9" IPV6_ZONE_ID_5;
+IPV6_ZONE_ID_4 ']' IP_END;
+IPV6_ZONE_ID_5 "a..zA..Z0..9" IPV6_ZONE_ID_6;
+IPV6_ZONE_ID_5 ']' IP_END;
+IPV6_ZONE_ID_6 "a..zA..Z0..9" IPV6_ZONE_ID_7;
+IPV6_ZONE_ID_6 ']' IP_END;
+IPV6_ZONE_ID_7 "a..zA..Z0..9" IPV6_ZONE_ID_8;
+IPV6_ZONE_ID_7 ']' IP_END;
+IPV6_ZONE_ID_8 "a..zA..Z0..9" IPV6_ZONE_ID_9;
+IPV6_ZONE_ID_9 ']' IP_END;
+
+PORT_1 "0..9" PORT_2;
+PORT_2 "0..9" PORT_3;
+# google.com:8/
+PORT_2 0 POP;
+PORT_3 "0..9" PORT_4;
+# google.com:80/
+PORT_3 0 POP;
+PORT_4 "0..9" PORT_5;
+# google.com:808/
+PORT_4 0 POP;
+PORT_5 "0..9" PORT_END;
+PORT_5 0 POP;
+PORT_END 0 POP;
diff --git a/validator/cpp/htmlparser/data/jsongrammar.txt b/validator/cpp/htmlparser/data/jsongrammar.txt
index 61df21299088..d79b3eb8cd4e 100644
--- a/validator/cpp/htmlparser/data/jsongrammar.txt
+++ b/validator/cpp/htmlparser/data/jsongrammar.txt
@@ -1,15 +1,15 @@
-# JSON grammer. https://www.json.org/
+# JSON grammar. https://www.json.org/
 
 # Begin.
-$ '{' OBJECT;
-$ '[' ARRAY_FIRST_ITEM;
-$ '"' STRING;
-$ '-' NUMBER_AFTER_HYPHEN;
-$ "1..9" NUMBER;
-$ '0' NUMBER_AFTER_ZERO;
-$ 't' TRUE_1;
-$ 'f' FALSE_1;
-$ 'n' NULL_1;
+$ '{' DICT ROOT_DICT;
+$ '[' ARRAY_FIRST_ITEM ROOT_ARRAY;
+$ '"' STRING ROOT_STRING;
+$ '-' NUMBER_AFTER_HYPHEN ROOT_NUMBER;
+$ "1..9" NUMBER ROOT_NUMBER;
+$ '0' NUMBER_AFTER_ZERO ROOT_NUMBER_AFTER_ZERO;
+$ 't' TRUE_1  ROOT_BOOL_TRUE;
+$ 'f' FALSE_1 ROOT_BOOL_FALSE;
+$ 'n' NULL_1 ROOT_NULL_VAL;
 # Ignore whitespace chars.
 $ "\t\n\r " $;
 
@@ -58,18 +58,23 @@ UNICODE_HEX_CHAR_LAST "0..9a..fA..F" STRING;
 # https://www.json.org/img/number.png
 # 1-9
 NUMBER "0..9" NUMBER;
-NUMBER '.' NUMBER_AFTER_PERIOD;
-# Stop for any other character.
-NUMBER ",}] \t\n\r" POP;
+NUMBER '.' NUMBER_AFTER_PERIOD FLOATING_POINT_T;
+NUMBER "\t\n\r " POP;
+NUMBER ",}]" SHIFT;
 
 NUMBER_AFTER_PERIOD "0..9" NUMBER_AFTER_PERIOD_DIGIT;
 NUMBER_AFTER_PERIOD_DIGIT "0..9" NUMBER_AFTER_PERIOD_DIGIT;
 NUMBER_AFTER_PERIOD_DIGIT "eE" NUMBER_AFTER_E_NOTATION;
-NUMBER_AFTER_PERIOD_DIGIT ",}] \t\n\r"  POP;
+NUMBER_AFTER_PERIOD_DIGIT ",}]\t\n\r " SHIFT;
 
-NUMBER_AFTER_ZERO '.' NUMBER_AFTER_PERIOD;
+NUMBER_AFTER_ZERO '.' NUMBER_AFTER_PERIOD FLOATING_POINT_T;
+# Even though 0e+3 is invalid syntax (zero must be followed by period), but
+# browsers accept it as valid and convert it to 0.
+# As per spec (https://www.json.org/img/number.png) this is invalid, but we
+# are considering it as OK.
+# Commenting the following line will treat 0e+3 number value as invalid json.
 NUMBER_AFTER_ZERO "eE" NUMBER_AFTER_E_NOTATION;
-NUMBER_AFTER_ZERO ",}] \t\n\r" POP;
+NUMBER_AFTER_ZERO ",}]\t\n\r " SHIFT;
 
 NUMBER_AFTER_HYPHEN "0..9" NUMBER;
 NUMBER_AFTER_HYPHEN '0' NUMBER_AFTER_ZERO;
@@ -79,65 +84,64 @@ NUMBER_AFTER_E_NOTATION "0..9" NUMBER_AFTER_E_DIGIT_NOTATION;
 
 NUMBER_AFTER_E_DIGIT_NOTATION "0..9" NUMBER_AFTER_E_DIGIT_NOTATION;
 NUMBER_AFTER_PLUS_MINUS_AFTER_E_NOTATION "0..9" NUMBER_AFTER_PLUS_MINUS_AFTER_E_NOTATION;
-NUMBER_AFTER_E_DIGIT_NOTATION ",}] \t\n\r"  POP;
-NUMBER_AFTER_PLUS_MINUS_AFTER_E_NOTATION ",}] \t\n\r" POP;
+NUMBER_AFTER_E_DIGIT_NOTATION ",}]\t\n\r " SHIFT;
+NUMBER_AFTER_PLUS_MINUS_AFTER_E_NOTATION " \t\n\r" POP;
+NUMBER_AFTER_PLUS_MINUS_AFTER_E_NOTATION ",}]" SHIFT;
 
 # Arrays.
 # https://www.json.org/img/array.png
-ARRAY_FIRST_ITEM ']' ARRAY_END;
-ARRAY_FIRST_ITEM '{' OBJECT|PUSH|ARRAY_SEPARATOR;
-ARRAY_FIRST_ITEM '[' ARRAY_FIRST_ITEM|PUSH|ARRAY_SEPARATOR;
-ARRAY_FIRST_ITEM '"' STRING|PUSH|ARRAY_SEPARATOR;
-ARRAY_FIRST_ITEM '-' NUMBER_AFTER_HYPHEN|PUSH|ARRAY_SEPARATOR;
-ARRAY_FIRST_ITEM '0' NUMBER_AFTER_ZERO|PUSH|ARRAY_SEPARATOR;
-ARRAY_FIRST_ITEM "1..9" NUMBER|PUSH|ARRAY_SEPARATOR;
-ARRAY_FIRST_ITEM 't' TRUE_1|PUSH|ARRAY_SEPARATOR;
-ARRAY_FIRST_ITEM 'f' FALSE_1|PUSH|ARRAY_SEPARATOR;
-ARRAY_FIRST_ITEM 'n' NULL_1|PUSH|ARRAY_SEPARATOR;
-ARRAY_FIRST_ITEM ']' POP;
+ARRAY_FIRST_ITEM ']' POP ARRAY_END;
+ARRAY_FIRST_ITEM '{' DICT|PUSH|ARRAY_SEPARATOR DICT_T;
+ARRAY_FIRST_ITEM '[' ARRAY_FIRST_ITEM|PUSH|ARRAY_SEPARATOR ARRAY_T;
+ARRAY_FIRST_ITEM '"' STRING|PUSH|ARRAY_SEPARATOR STRING_T;
+ARRAY_FIRST_ITEM '-' NUMBER_AFTER_HYPHEN|PUSH|ARRAY_SEPARATOR NUMBER_T;
+ARRAY_FIRST_ITEM '0' NUMBER_AFTER_ZERO|PUSH|ARRAY_SEPARATOR NUMBER_T;
+ARRAY_FIRST_ITEM "1..9" NUMBER|PUSH|ARRAY_SEPARATOR NUMBER_T;
+ARRAY_FIRST_ITEM 't' TRUE_1|PUSH|ARRAY_SEPARATOR TRUE_T;
+ARRAY_FIRST_ITEM 'f' FALSE_1|PUSH|ARRAY_SEPARATOR FALSE_T;
+ARRAY_FIRST_ITEM 'n' NULL_1|PUSH|ARRAY_SEPARATOR NULL_T;
+ARRAY_FIRST_ITEM ']' POP ARRAY_END;
 # Ignore whitespace chars between [ and first item.
 ARRAY_FIRST_ITEM "\t\n\r " ARRAY_FIRST_ITEM;
-ARRAY_SEPARATOR ',' ARRAY_NEXT_ITEM;
+ARRAY_SEPARATOR ',' ARRAY_NEXT_ITEM ARRAY_VAL_END;
 # Ignore whitespce chars between first item and comma.
 ARRAY_SEPARATOR "\t\n\r " ARRAY_SEPARATOR;
-ARRAY_SEPARATOR ']' ARRAY_END;
-ARRAY_NEXT_ITEM '{' OBJECT|PUSH|ARRAY_SEPARATOR;
-ARRAY_NEXT_ITEM '[' ARRAY_FIRST_ITEM|PUSH|ARRAY_SEPARATOR;
-ARRAY_NEXT_ITEM '"' STRING|PUSH|ARRAY_SEPARATOR;
-ARRAY_NEXT_ITEM '-' NUMBER_AFTER_HYPHEN|PUSH|ARRAY_SEPARATOR;
-ARRAY_NEXT_ITEM '0' NUMBER_AFTER_ZERO|PUSH|ARRAY_SEPARATOR;
-ARRAY_NEXT_ITEM "1..9" NUMBER|PUSH|ARRAY_SEPARATOR;
-ARRAY_NEXT_ITEM 't' TRUE_1|PUSH|ARRAY_SEPARATOR;
-ARRAY_NEXT_ITEM 'f' FALSE_1|PUSH|ARRAY_SEPARATOR;
-ARRAY_NEXT_ITEM 'n' NULL_1|PUSH|ARRAY_SEPARATOR;
+ARRAY_SEPARATOR ']' POP ARRAY_END;
+ARRAY_NEXT_ITEM '{' DICT|PUSH|ARRAY_SEPARATOR DICT_T;
+ARRAY_NEXT_ITEM '[' ARRAY_FIRST_ITEM|PUSH|ARRAY_SEPARATOR ARRAY_T;
+ARRAY_NEXT_ITEM '"' STRING|PUSH|ARRAY_SEPARATOR STRING_T;
+ARRAY_NEXT_ITEM '-' NUMBER_AFTER_HYPHEN|PUSH|ARRAY_SEPARATOR NUMBER_T;
+ARRAY_NEXT_ITEM '0' NUMBER_AFTER_ZERO|PUSH|ARRAY_SEPARATOR NUMBER_T;
+ARRAY_NEXT_ITEM "1..9" NUMBER|PUSH|ARRAY_SEPARATOR NUMBER_T;
+ARRAY_NEXT_ITEM 't' TRUE_1|PUSH|ARRAY_SEPARATOR TRUE_T;
+ARRAY_NEXT_ITEM 'f' FALSE_1|PUSH|ARRAY_SEPARATOR FALSE_T;
+ARRAY_NEXT_ITEM 'n' NULL_1|PUSH|ARRAY_SEPARATOR NULL_T;
 # Ignore whitespace chars between comma and next item or ].
 ARRAY_NEXT_ITEM "\t\n\r " ARRAY_NEXT_ITEM;
-ARRAY_END .* POP;
 
-# Object.
+# Dictionary.
 # https://www.json.org/img/object.png
-OBJECT '"' STRING|PUSH|OBJECT_KEY;
-OBJECT_KEY_BEGIN_QUOTE '"' STRING|PUSH|OBJECT_KEY;
-OBJECT_KEY_BEGIN_QUOTE "\t\n\r " OBJECT_KEY_BEGIN_QUOTE;
+DICT '"' STRING|PUSH|DICT_KEY DICT_KEY_BEGIN;
+DICT_KEY_BEGIN_QUOTE '"' STRING|PUSH|DICT_KEY DICT_KEY_BEGIN;
+DICT_KEY_BEGIN_QUOTE "\t\n\r " DICT_KEY_BEGIN_QUOTE;
 # Ignore whitespace between { and first key.
-OBJECT "\t\n\r " OBJECT;
-OBJECT '}' OBJECT_END;
-OBJECT_KEY ':' OBJECT_VALUE;
+DICT "\t\n\r " DICT;
+DICT '}' POP DICT_END;
+DICT_KEY ':' DICT_VALUE DICT_KEY_END;
 # Ignore whitespace betwen key and colon.
-OBJECT_KEY "\t\n\r " OBJECT_KEY;
-OBJECT_VALUE '"' STRING|PUSH|OBJECT_SEPARATOR;
-OBJECT_VALUE 't' TRUE_1|PUSH|OBJECT_SEPARATOR;
-OBJECT_VALUE 'f' FALSE_1|PUSH|OBJECT_SEPARATOR;
-OBJECT_VALUE 'n' NULL_1|PUSH|OBJECT_SEPARATOR;
+DICT_KEY "\t\n\r " DICT_KEY;
+DICT_VALUE '"' STRING|PUSH|DICT_END_OR_SEPARATOR STRING_T;
+DICT_VALUE 't' TRUE_1|PUSH|DICT_END_OR_SEPARATOR TRUE_T;
+DICT_VALUE 'f' FALSE_1|PUSH|DICT_END_OR_SEPARATOR FALSE_T;
+DICT_VALUE 'n' NULL_1|PUSH|DICT_END_OR_SEPARATOR NULL_T;
 # Ignore whitespace between colon and value.
-OBJECT_VALUE "\t\n\r " OBJECT_VALUE;
-OBJECT_VALUE '0' NUMBER_AFTER_ZERO|PUSH|OBJECT_SEPARATOR;
-OBJECT_VALUE '-' NUMBER_AFTER_HYPHEN|PUSH|OBJECT_SEPARATOR;
-OBJECT_VALUE "1..9" NUMBER|PUSH|OBJECT_SEPARATOR;
-OBJECT_VALUE '[' ARRAY_FIRST_ITEM|PUSH|OBJECT_SEPARATOR;
-OBJECT_VALUE '{' OBJECT|PUSH|OBJECT_SEPARATOR;
-OBJECT_SEPARATOR ',' OBJECT_KEY_BEGIN_QUOTE;
+DICT_VALUE "\t\n\r " DICT_VALUE;
+DICT_VALUE '0' NUMBER_AFTER_ZERO|PUSH|DICT_END_OR_SEPARATOR NUMBER_T;
+DICT_VALUE '-' NUMBER_AFTER_HYPHEN|PUSH|DICT_END_OR_SEPARATOR NUMBER_T;
+DICT_VALUE "1..9" NUMBER|PUSH|DICT_END_OR_SEPARATOR NUMBER_T;
+DICT_VALUE '[' ARRAY_FIRST_ITEM|PUSH|DICT_END_OR_SEPARATOR ARRAY_T;
+DICT_VALUE '{' DICT|PUSH|DICT_END_OR_SEPARATOR DICT_T;
 # Ignore whitespace chars between comma and next value.
-OBJECT_SEPARATOR "\t\n\r " OBJECT_SEPARATOR;
-OBJECT_SEPARATOR '}' OBJECT_END;
-OBJECT_END .* POP;
+DICT_END_OR_SEPARATOR "\t\r\n " DICT_END_OR_SEPARATOR;
+DICT_END_OR_SEPARATOR ',' DICT_KEY_BEGIN_QUOTE DICT_VAL_END;
+DICT_END_OR_SEPARATOR '}' POP DICT_END;
diff --git a/validator/cpp/htmlparser/data/supportedmediagrammar.txt b/validator/cpp/htmlparser/data/supportedmediagrammar.txt
new file mode 100644
index 000000000000..00999c3c3caf
--- /dev/null
+++ b/validator/cpp/htmlparser/data/supportedmediagrammar.txt
@@ -0,0 +1,205 @@
+#
+# Copyright 2021 The AMP HTML Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS-IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the license.
+#
+# Restricted subset of media queries as discussed at:
+# https://github.com/google/webpackager/blob/master/docs/supported_media.md
+
+# Begin.
+$ 'o' ONLY_N;
+$ 'a' ALL_L1;
+$ 's' SCREEN_C;
+$ "\t\n\r " $;
+
+# ONLY.
+ONLY_N 'n' ONLY_L;
+ONLY_L 'l' ONLY_Y;
+ONLY_Y 'y' SPACE_AFTER_ONLY;
+
+# ALL
+ALL_L1 'l' ALL_L2;
+ALL_L2 'l' SPACE_AFTER_SCREEN;
+
+SPACE_AFTER_ONLY "\t\n\r " SPACE_AFTER_ONLY;
+SPACE_AFTER_ONLY 's' SCREEN_C;
+
+SCREEN_C 'c' SCREEN_R;
+SCREEN_R 'r' SCREEN_E;
+SCREEN_E 'e' SCREEN_E2;
+SCREEN_E2 'e' SCREEN_N;
+SCREEN_N 'n' SPACE_AFTER_SCREEN;
+
+SPACE_AFTER_SCREEN "\t\n\r " SPACE_AFTER_SCREEN;
+SPACE_AFTER_SCREEN 'a' AND_N;
+
+AND_N 'n' AND_D;
+AND_D 'd' SPACE_AFTER_AND;
+
+SPACE_AFTER_AND "\t\n\r " SPACE_AFTER_AND;
+SPACE_AFTER_AND '(' EXPRESSION_BEGIN;
+
+# skip whitespaces.
+EXPRESSION_BEGIN "\t\n\r " EXPRESSION_BEGIN;
+
+
+EXPRESSION_BEGIN 'm' MIN_OR_MAX;
+
+# min- prefix expression.
+MIN_OR_MAX 'i' MIN_N;
+MIN_N 'n' MAX_HYPHEN;
+
+# max- prefix expression.
+MIN_OR_MAX 'a' MAX_X;
+MAX_X 'x' MAX_HYPHEN;
+MAX_HYPHEN '-' MINMAX_EXPRESSION_BEGIN;
+
+# width expression.
+MINMAX_EXPRESSION_BEGIN 'w' WIDTH_I;
+EXPRESSION_BEGIN 'w' WIDTH_I;
+WIDTH_I 'i' WIDTH_D;
+WIDTH_D 'd' WIDTH_T;
+WIDTH_T 't' WIDTH_H;
+WIDTH_H 'h' SPACE_OR_COLON|PUSH|LENGTH_NUMBER_BEGIN;
+
+# height expression.
+EXPRESSION_BEGIN 'h' HEIGHT_OR_HOVER;
+MINMAX_EXPRESSION_BEGIN 'h' HEIGHT_E;
+HEIGHT_OR_HOVER 'e' HEIGHT_I;
+HEIGHT_E 'e' HEIGHT_I;
+HEIGHT_I 'i' HEIGHT_G;
+HEIGHT_G 'g' HEIGHT_H;
+HEIGHT_H 'h' HEIGHT_T;
+HEIGHT_T 't' SPACE_OR_COLON|PUSH|LENGTH_NUMBER_BEGIN;
+
+# aspect-ratio.
+EXPRESSION_BEGIN 'a' ASPECT_RATIO_S;
+MINMAX_EXPRESSION_BEGIN 'a' ASPECT_RATIO_S;
+ASPECT_RATIO_S 's' ASPECT_RATIO_P;
+ASPECT_RATIO_P 'p' ASPECT_RATIO_E;
+ASPECT_RATIO_E 'e' ASPECT_RATIO_C;
+ASPECT_RATIO_C 'c' ASPECT_RATIO_T;
+ASPECT_RATIO_T 't' ASPECT_RATIO_HYPHEN;
+ASPECT_RATIO_HYPHEN '-' ASPECT_RATIO_R;
+ASPECT_RATIO_R 'r' ASPECT_RATIO_A2;
+ASPECT_RATIO_A2 'a' ASPECT_RATIO_T2;
+ASPECT_RATIO_T2 't' ASPECT_RATIO_I;
+ASPECT_RATIO_I 'i' ASPECT_RATIO_O;
+ASPECT_RATIO_O 'o' SPACE_OR_COLON|PUSH|RATIO_NUMERATOR_BEGIN;
+
+# device-aspect-ratio expression.
+EXPRESSION_BEGIN 'd' DEVICE_ASPECT_RATIO_E;
+MINMAX_EXPRESSION_BEGIN 'd' DEVICE_ASPECT_RATIO_E;
+DEVICE_ASPECT_RATIO_E 'e' DEVICE_ASPECT_RATIO_V;
+DEVICE_ASPECT_RATIO_V 'v' DEVICE_ASPECT_RATIO_I;
+DEVICE_ASPECT_RATIO_I 'i' DEVICE_ASPECT_RATIO_C;
+DEVICE_ASPECT_RATIO_C 'c' DEVICE_ASPECT_RATIO_E2;
+DEVICE_ASPECT_RATIO_E2 'e' DEVICE_ASPECT_RATIO_HYPHEN;
+DEVICE_ASPECT_RATIO_HYPHEN '-' DEVICE_HYPHEN_NEXT;
+DEVICE_HYPHEN_NEXT 'a' ASPECT_RATIO_S;
+DEVICE_HYPHEN_NEXT 'h' HEIGHT_OR_HOVER;
+DEVICE_HYPHEN_NEXT 'w' WIDTH_I;
+
+LENGTH_NUMBER_BEGIN "\t\n\r " LENGTH_NUMBER_BEGIN;
+LENGTH_NUMBER_BEGIN "1..9" LENGTH_NUMBER;
+LENGTH_NUMBER "0..9" LENGTH_NUMBER;
+
+# px, pt, or pc.
+LENGTH_NUMBER 'p' P_UNIT;
+P_UNIT 'x' END_LENGTH_UNIT;
+P_UNIT 't' END_LENGTH_UNIT;
+P_UNIT 'c' END_LENGTH_UNIT;
+
+# in.
+LENGTH_NUMBER 'i' INCH_UNIT;
+INCH_UNIT 'n' END_LENGTH_UNIT;
+
+# em.
+LENGTH_NUMBER 'e' EM_UNIT;
+EM_UNIT 'm' END_LENGTH_UNIT;
+
+# cm.
+LENGTH_NUMBER 'c' CM_UNIT;
+CM_UNIT 'm' END_LENGTH_UNIT;
+
+# mm.
+LENGTH_NUMBER 'm' MM_UNIT;
+MM_UNIT 'm' END_LENGTH_UNIT;
+
+RATIO_NUMERATOR_BEGIN "\t\n\r " RATIO_NUMERATOR_BEGIN;
+RATIO_NUMERATOR_BEGIN "1..9" RATIO_NUMERATOR;
+RATIO_NUMERATOR "0..9" RATIO_NUMERATOR;
+RATIO_NUMERATOR '/' RATIO_DENOMINATOR_BEGIN;
+RATIO_DENOMINATOR_BEGIN "1..9" RATIO_DENOMINATOR;
+RATIO_DENOMINATOR "0..9" RATIO_DENOMINATOR;
+RATIO_DENOMINATOR ')' AND_OR_END;
+
+END_LENGTH_UNIT "\t\r\n " END_LENGTH_UNIT;
+END_LENGTH_UNIT ')' AND_OR_END;
+
+EXPRESSION_BEGIN 'p' POINTER_O;
+EXPRESSION_BEGIN 'h' HEIGHT_OR_HOVER;
+
+# pointer
+POINTER_O 'o' POINTER_I;
+POINTER_I 'i' POINTER_N;
+POINTER_N 'n' POINTER_T;
+POINTER_T 't' POINTER_E;
+POINTER_E 'e' POINTER_R;
+POINTER_R 'r' SPACE_OR_COLON|PUSH|POINTER_VALUE_BEGIN;
+
+SPACE_OR_COLON ':' POP;
+SPACE_OR_COLON "\t\n\r " SPACE_OR_COLON;
+
+POINTER_VALUE_BEGIN "\t\n\r " POINTER_VALUE_BEGIN;
+POINTER_VALUE_BEGIN 'n' NONE_O;
+POINTER_VALUE_BEGIN 'c' COARSE_O;
+POINTER_VALUE_BEGIN 'f' FINE_I;
+
+# fine
+FINE_I 'i' FINE_N;
+FINE_N 'n' FINE_E;
+FINE_E 'e' EXPRESSION_VALUE_END;
+
+# coarse
+COARSE_O 'o' COARSE_A;
+COARSE_A 'a' COARSE_R;
+COARSE_R 'r' COARSE_S;
+COARSE_S 's' COARSE_E;
+COARSE_E 'e' EXPRESSION_VALUE_END;
+
+# none
+NONE_O 'o' NONE_N;
+NONE_N 'n' NONE_E;
+NONE_E 'e' EXPRESSION_VALUE_END;
+
+# hover
+HEIGHT_OR_HOVER 'o' HOVER_V;
+HOVER_V 'v' HOVER_E;
+HOVER_E 'e' HOVER_R;
+HOVER_R 'r' SPACE_OR_COLON|PUSH|HOVER_VALUE_BEGIN;
+HOVER_VALUE_BEGIN "\t\n\r " HOVER_VALUE_BEGIN;
+HOVER_VALUE_BEGIN 'n' NONE_O;
+HOVER_VALUE_BEGIN 'h' HOVER_VALUE_O;
+HOVER_VALUE_O 'o' HOVER_VALUE_V;
+HOVER_VALUE_V 'v' HOVER_VALUE_E;
+HOVER_VALUE_E 'e' HOVER_VALUE_R;
+HOVER_VALUE_R 'r' EXPRESSION_VALUE_END;
+
+EXPRESSION_VALUE_END "\t\n\r " EXPRESSION_VALUE_END;
+EXPRESSION_VALUE_END ')' AND_OR_END;
+
+AND_OR_END "\t\n\r " AND_OR_END;
+AND_OR_END 'a' AND_N;
+# Termination EOF.
+AND_OR_END 0 POP;
diff --git a/validator/cpp/htmlparser/defer.h b/validator/cpp/htmlparser/defer.h
index b0e52cb0ad9f..4f1e372b46eb 100644
--- a/validator/cpp/htmlparser/defer.h
+++ b/validator/cpp/htmlparser/defer.h
@@ -43,8 +43,8 @@
 //   fd_counter++;
 // });
 
-#ifndef HTMLPARSER__DEFER_H_
-#define HTMLPARSER__DEFER_H_
+#ifndef CPP_HTMLPARSER_DEFER_H_
+#define CPP_HTMLPARSER_DEFER_H_
 
 #include <functional>
 
@@ -79,4 +79,4 @@ class Defer {
 
 }  // namespace htmlparser
 
-#endif  // HTMLPARSER__DEFER_H_
+#endif  // CPP_HTMLPARSER_DEFER_H_
diff --git a/validator/cpp/htmlparser/doctype.cc b/validator/cpp/htmlparser/doctype.cc
index 9d4fbc081b9c..13cb08531323 100644
--- a/validator/cpp/htmlparser/doctype.cc
+++ b/validator/cpp/htmlparser/doctype.cc
@@ -1,8 +1,8 @@
-#include "doctype.h"
+#include "cpp/htmlparser/doctype.h"
 
 #include <sstream>
 
-#include "strings.h"
+#include "cpp/htmlparser/strings.h"
 
 namespace htmlparser {
 
@@ -37,77 +37,12 @@ void StripSelfClosingSlash(std::string_view* s) {
   }
 }
 
-// Skips:
-// lang=en
-// lang="en"
-// lang='en'
-// lang
-// lang = "en"
-// lang = en
-// lang = 'en'
-void SkipLangAttribute(std::string_view* s) {
-  // Stop if there is not minimum 4 characters ("lang").
-  if (s->size() < 4) return;
-
-  // Extract and check these 4 chars.
-  std::string_view maybelang = s->substr(0, 4);
-  if (!Strings::EqualFold(maybelang, "lang")) return;
-
-  // lang attribute seen.
-  s->remove_prefix(4);
-  SkipLeadingWhitespace(s);
-
-  // Empty lang attribute. (with no value).
-  // <!doctype html lang> or <!doctype lang html>
-  if (s->empty() || s->front() != '=') {
-    return;
-  }
-
-  s->remove_prefix(1);  // Move past '='.
-  SkipLeadingWhitespace(s);
-  if (s->empty()) return;
-
-  // Skip attribute value if it is in quotes.
-  char quote = s->front();
-  if (quote == '"' || quote == '\'') {
-    s->remove_prefix(1);
-    std::size_t i = 0;
-    // Read until closing quote.
-    while (!s->empty()) {
-      i = s->find(quote, i);
-      if (i != std::string_view::npos) {
-        if (i > 0 && s->at(i - 1) == '\\') {
-          continue;
-        }
-        break;
-      }
-    }
-
-    // Nothing after quote start.
-    // <!doctype lang='> or <!doctype lang=">
-    if (s->empty()) return;
-
-    std::string value(s->substr(0, i));
-    Attribute lang_attr{"", "lang", value};
-    s->remove_prefix(i + 1);
-    return;
-  }
-
-  // Skip lang value until next whitespace.
-  std::string lang_val = ReadUntil(s, Strings::kWhitespace);
-}
-
 bool ParseDoctype(std::string_view s, Node* doctype_node) {
   bool quirks = false;
 
   SkipLeadingWhitespace(&s);
   StripSelfClosingSlash(&s);
 
-#if ALLOW_LANG_ATTRIBUTE_IN_DOCTYPE
-  SkipLangAttribute(&s);
-  SkipLeadingWhitespace(&s);
-#endif
-
   std::size_t space = Strings::IndexAny(s, Strings::kWhitespace);
   if (space == std::string::npos) {
     space = s.size();
@@ -116,10 +51,6 @@ bool ParseDoctype(std::string_view s, Node* doctype_node) {
   s.remove_prefix(space);
   SkipLeadingWhitespace(&s);
 
-#if ALLOW_LANG_ATTRIBUTE_IN_DOCTYPE
-  SkipLangAttribute(&s);
-#endif
-
   if (!(Strings::EqualFold(data, "html") && s.empty())) {
     quirks = true;
   }
diff --git a/validator/cpp/htmlparser/doctype.h b/validator/cpp/htmlparser/doctype.h
index 44f9d4c3bb2d..fb97a1dd4623 100644
--- a/validator/cpp/htmlparser/doctype.h
+++ b/validator/cpp/htmlparser/doctype.h
@@ -1,19 +1,14 @@
-#ifndef HTMLPARSER__DOCTYPE_H_
-#define HTMLPARSER__DOCTYPE_H_
+#ifndef CPP_HTMLPARSER_DOCTYPE_H_
+#define CPP_HTMLPARSER_DOCTYPE_H_
 
 #include <memory>
 #include <string_view>
 #include <tuple>
 
-#include "node.h"
+#include "cpp/htmlparser/node.h"
 
 namespace htmlparser {
 
-// Controls if lang=.* parameter or any combinations of it are allowed in the
-// doctype declarations. We have seen several web pages with lang attribute in
-// doctype.
-#define ALLOW_LANG_ATTRIBUTE_IN_DOCTYPE 1
-
 // Parses the data from a DoctypeToken into a name,
 // public identifier, and system identifier. It returns a Node whose Type
 // is DoctypeNode, whose Data is the name, and which has attributes
@@ -83,4 +78,4 @@ inline constexpr std::array<std::string_view, 55> kQuirkyIDs {
 
 }  // namespace htmlparser
 
-#endif  // HTMLPARSER__DOCTYPE_H_
+#endif  // CPP_HTMLPARSER_DOCTYPE_H_
diff --git a/validator/cpp/htmlparser/doctype_test.cc b/validator/cpp/htmlparser/doctype_test.cc
index 4be462d7e062..6134072c302f 100644
--- a/validator/cpp/htmlparser/doctype_test.cc
+++ b/validator/cpp/htmlparser/doctype_test.cc
@@ -1,5 +1,5 @@
-#include "doctype.h"
-#include "node.h"
+#include "cpp/htmlparser/doctype.h"
+#include "cpp/htmlparser/node.h"
 
 #include "gtest/gtest.h"
 
@@ -55,44 +55,44 @@ TEST(DoctypeTest, ParseTest) {
   Node doctype_node6(NodeType::DOCTYPE_NODE);
   bool quirks_mode6 = htmlparser::ParseDoctype("lang=\"en\" html",
                                                &doctype_node6);
-  EXPECT_FALSE(quirks_mode6);
+  EXPECT_TRUE(quirks_mode6);
 
   Node doctype_node7(NodeType::DOCTYPE_NODE);
   bool quirks_mode7 = htmlparser::ParseDoctype("html lang=\"en\"",
                                                &doctype_node7);
-  EXPECT_FALSE(quirks_mode7);
+  EXPECT_TRUE(quirks_mode7);
 
   Node doctype_node8(NodeType::DOCTYPE_NODE);
   bool quirks_mode8 = htmlparser::ParseDoctype("html lang='en'",
                                                &doctype_node8);
-  EXPECT_FALSE(quirks_mode8);
+  EXPECT_TRUE(quirks_mode8);
 
   // lang attribute with no value.
   Node doctype_node9(NodeType::DOCTYPE_NODE);
   bool quirks_mode9 = htmlparser::ParseDoctype("html lang",
                                                &doctype_node9);
-  EXPECT_FALSE(quirks_mode9);
+  EXPECT_TRUE(quirks_mode9);
 
   // attribute value without quote.
   Node doctype_node10(NodeType::DOCTYPE_NODE);
   bool quirks_mode10 = htmlparser::ParseDoctype("html lang=en",
                                                 &doctype_node10);
-  EXPECT_FALSE(quirks_mode10);
+  EXPECT_TRUE(quirks_mode10);
 
   // Spaces and new lines.
   Node doctype_node11(NodeType::DOCTYPE_NODE);
   bool quirks_mode11  =
       htmlparser::ParseDoctype(R"DOCTYPE(          html                 lang             =
                           "en")DOCTYPE", &doctype_node11);
-  EXPECT_FALSE(quirks_mode11);
+  EXPECT_TRUE(quirks_mode11);
 
   // With self closing slash.
   Node doctype_node12(NodeType::DOCTYPE_NODE);
   bool quirks_mode12 = htmlparser::ParseDoctype("html lang /", &doctype_node12);
-  EXPECT_FALSE(quirks_mode12);
+  EXPECT_TRUE(quirks_mode12);
 
   Node doctype_node13(NodeType::DOCTYPE_NODE);
   bool quirks_mode13 = htmlparser::ParseDoctype("html lang=en /////////////",
                                                 &doctype_node13);
-  EXPECT_FALSE(quirks_mode13);
+  EXPECT_TRUE(quirks_mode13);
 }
diff --git a/validator/cpp/htmlparser/document.cc b/validator/cpp/htmlparser/document.cc
index 97dea8f16a77..4f54b2713f38 100644
--- a/validator/cpp/htmlparser/document.cc
+++ b/validator/cpp/htmlparser/document.cc
@@ -1,5 +1,5 @@
 #include "absl/flags/flag.h"
-#include "document.h"
+#include "cpp/htmlparser/document.h"
 
 ABSL_FLAG(std::size_t, htmlparser_nodes_allocator_block_size,
           256 << 10 /* 256k */,
diff --git a/validator/cpp/htmlparser/document.h b/validator/cpp/htmlparser/document.h
index 07075d1ff590..5fb1341ba6d0 100644
--- a/validator/cpp/htmlparser/document.h
+++ b/validator/cpp/htmlparser/document.h
@@ -1,12 +1,14 @@
-#ifndef HTMLPARSER__DOCUMENT_H_
-#define HTMLPARSER__DOCUMENT_H_
+#ifndef CPP_HTMLPARSER_DOCUMENT_H_
+#define CPP_HTMLPARSER_DOCUMENT_H_
 
 #include <memory>
 #include <vector>
 
-#include "allocator.h"
-#include "node.h"
-#include "token.h"
+#include "absl/status/status.h"
+#include "cpp/htmlparser/allocator.h"
+#include "cpp/htmlparser/iterators.h"
+#include "cpp/htmlparser/node.h"
+#include "cpp/htmlparser/token.h"
 
 namespace htmlparser {
 
@@ -68,18 +70,34 @@ struct DocumentMetadata {
 // The document class is a wrapper for the DOM tree exposed with RootNode().
 // All the nodes inside the document are owned by document. The nodes are
 // destroyed when Document objects goes out of scope or deleted.
+//
+// Usage:
+// unique_ptr<Document> doc = parser.Parse(html);
+// if (!doc->status().ok()) {
+//   LOG(ERROR) << "Parsing failed. " << doc->status();
+//   return;
+// }
+//
+// Node* root_node = doc.RootNode();
+// ...
+//
 class Document {
  public:
   Document();
   ~Document() = default;
 
-
   const DocumentMetadata& Metadata() const { return metadata_; }
 
   // Creates a new node. The node is owned by Document and is destroyed when
   // document is destructed.
   Node* NewNode(NodeType node_type, Atom atom = Atom::UNKNOWN);
 
+  // Returns OK if Document is result of successful html parsing.
+  // Accessing any fields/methods when status() != OK is undefined behavior.
+  absl::Status status() const {
+    return status_;
+  }
+
   // Returns the root node of a DOM tree. Node* owned by document.
   Node* RootNode() const { return root_node_; }
 
@@ -87,6 +105,14 @@ class Document {
   // owned by the document.
   const std::vector<Node*> FragmentNodes() const { return fragment_nodes_; }
 
+  using const_iterator = NodeIterator<true>;
+  using iterator = NodeIterator<false>;
+
+  iterator begin() { return iterator{root_node_}; }
+  iterator end() { return iterator{nullptr}; }
+  const_iterator cbegin() const { return const_iterator{root_node_}; }
+  const_iterator cend() const { return const_iterator{nullptr}; }
+
  private:
   // Returns a new node with the same type, data and attributes.
   // The clone has no parent, no siblings and no children.
@@ -101,6 +127,8 @@ class Document {
   std::vector<Node*> fragment_nodes_{};
   std::size_t html_src_bytes_;
   DocumentMetadata metadata_;
+  // Document parsing status.
+  absl::Status status_ = absl::OkStatus();
 
   friend class Parser;
   friend std::unique_ptr<Document> Parse(std::string_view html);
@@ -117,4 +145,4 @@ class Document {
 }  // namespace htmlparser
 
 
-#endif  // HTMLPARSER__DOCUMENT_H_
+#endif  // CPP_HTMLPARSER_DOCUMENT_H_
diff --git a/validator/cpp/htmlparser/elements.h b/validator/cpp/htmlparser/elements.h
index 1f9b5f2483d0..4f45d81f8a7b 100644
--- a/validator/cpp/htmlparser/elements.h
+++ b/validator/cpp/htmlparser/elements.h
@@ -1,9 +1,9 @@
-#ifndef HTMLPARSER__ELEMENTS_H_
-#define HTMLPARSER__ELEMENTS_H_
+#ifndef CPP_HTMLPARSER_ELEMENTS_H_
+#define CPP_HTMLPARSER_ELEMENTS_H_
 
 #include <array>
 
-#include "atom.h"
+#include "cpp/htmlparser/atom.h"
 
 namespace htmlparser {
 
@@ -116,4 +116,4 @@ inline constexpr std::array<Atom, 82> kSpecialElements{
 
 }  // namespace htmlparser
 
-#endif  // HTMLPARSER__ELEMENTS_H_
+#endif  // CPP_HTMLPARSER_ELEMENTS_H_
diff --git a/validator/cpp/htmlparser/entity.h b/validator/cpp/htmlparser/entity.h
index cab4c7787957..e54ee5f39e24 100644
--- a/validator/cpp/htmlparser/entity.h
+++ b/validator/cpp/htmlparser/entity.h
@@ -1,15 +1,15 @@
 // AUTO GENERATED; DO NOT EDIT.
 // To regenerate this file, see comments in bin/entitytablegen.cc
 
-#ifndef HTMLPARSER__ENTITY_H_
-#define HTMLPARSER__ENTITY_H_
+#ifndef CPP_HTMLPARSER_ENTITY_H_
+#define CPP_HTMLPARSER_ENTITY_H_
 
 #include <algorithm>
 #include <array>
 #include <string>
 #include <string_view>
 
-#include "comparators.h"
+#include "cpp/htmlparser/comparators.h"
 
 namespace htmlparser {
 
@@ -2271,4 +2271,4 @@ inline std::string_view EntityLookup(std::string_view entity_name) {
 
 }  // namespace htmlparser
 
-#endif  // HTMLPARSER__ENTITY_H_
+#endif  // CPP_HTMLPARSER_ENTITY_H_
diff --git a/validator/cpp/htmlparser/entity_test.cc b/validator/cpp/htmlparser/entity_test.cc
index b98add27dee4..b87590e0f6a0 100644
--- a/validator/cpp/htmlparser/entity_test.cc
+++ b/validator/cpp/htmlparser/entity_test.cc
@@ -1,4 +1,4 @@
-#include "entity.h"
+#include "cpp/htmlparser/entity.h"
 
 #include "gtest/gtest.h"
 
diff --git a/validator/cpp/htmlparser/error.cc b/validator/cpp/htmlparser/error.cc
index 0de5e09ab091..36f8f31355c8 100644
--- a/validator/cpp/htmlparser/error.cc
+++ b/validator/cpp/htmlparser/error.cc
@@ -1,4 +1,4 @@
-#include "error.h"
+#include "cpp/htmlparser/error.h"
 
 namespace htmlparser {
 
diff --git a/validator/cpp/htmlparser/error.h b/validator/cpp/htmlparser/error.h
index 30a4a6c2283b..2305c45fd144 100644
--- a/validator/cpp/htmlparser/error.h
+++ b/validator/cpp/htmlparser/error.h
@@ -1,5 +1,5 @@
-#ifndef HTMLPARSER__ERROR_H_
-#define HTMLPARSER__ERROR_H_
+#ifndef CPP_HTMLPARSER_ERROR_H_
+#define CPP_HTMLPARSER_ERROR_H_
 
 #include <optional>
 #include <string>
@@ -15,4 +15,4 @@ std::optional<Error> error(const std::string& error_msg);
 
 }  // namespace htmlparser
 
-#endif  // HTMLPARSER__ERROR_H_
+#endif  // CPP_HTMLPARSER_ERROR_H_
diff --git a/validator/cpp/htmlparser/fileutil.cc b/validator/cpp/htmlparser/fileutil.cc
index 631cb55977bd..58b5834bf9b1 100644
--- a/validator/cpp/htmlparser/fileutil.cc
+++ b/validator/cpp/htmlparser/fileutil.cc
@@ -1,14 +1,15 @@
-#include "fileutil.h"
+#include "cpp/htmlparser/fileutil.h"
 
 #include <glob.h>
 
+#include <algorithm>
 #include <cstring>
 #include <fstream>
 #include <iostream>
 #include <sstream>
 
-#include "defer.h"
-#include "strings.h"
+#include "cpp/htmlparser/defer.h"
+#include "cpp/htmlparser/strings.h"
 
 // TODO(caoboxiao)
 // The Macro `GLOB_TILDE` is not defined in the WebAssembly environment because
diff --git a/validator/cpp/htmlparser/fileutil.h b/validator/cpp/htmlparser/fileutil.h
index 4bc22b5d3e81..84072276a566 100644
--- a/validator/cpp/htmlparser/fileutil.h
+++ b/validator/cpp/htmlparser/fileutil.h
@@ -1,5 +1,5 @@
-#ifndef HTMLPARSER__FILEUTIL_H_
-#define HTMLPARSER__FILEUTIL_H_
+#ifndef CPP_HTMLPARSER_FILEUTIL_H_
+#define CPP_HTMLPARSER_FILEUTIL_H_
 
 #include <climits>
 #include <functional>
@@ -241,4 +241,4 @@ class FileUtil {
 
 }  // namespace htmlparser
 
-#endif  // HTMLPARSER__FILEUTIL_H_
+#endif  // CPP_HTMLPARSER_FILEUTIL_H_
diff --git a/validator/cpp/htmlparser/fileutil_test.cc b/validator/cpp/htmlparser/fileutil_test.cc
index 660fbdade060..5d4b4f807839 100644
--- a/validator/cpp/htmlparser/fileutil_test.cc
+++ b/validator/cpp/htmlparser/fileutil_test.cc
@@ -1,4 +1,4 @@
-#include "fileutil.h"
+#include "cpp/htmlparser/fileutil.h"
 
 #include <vector>
 
diff --git a/validator/cpp/htmlparser/foreign.cc b/validator/cpp/htmlparser/foreign.cc
index 091e88311603..bd425bdd9003 100644
--- a/validator/cpp/htmlparser/foreign.cc
+++ b/validator/cpp/htmlparser/foreign.cc
@@ -1,9 +1,9 @@
-#include "foreign.h"
+#include "cpp/htmlparser/foreign.h"
 
 #include <algorithm>
 
-#include "comparators.h"
-#include "strings.h"
+#include "cpp/htmlparser/comparators.h"
+#include "cpp/htmlparser/strings.h"
 
 namespace htmlparser {
 
diff --git a/validator/cpp/htmlparser/foreign.h b/validator/cpp/htmlparser/foreign.h
index c82a38836ec1..5c0e99158eb9 100644
--- a/validator/cpp/htmlparser/foreign.h
+++ b/validator/cpp/htmlparser/foreign.h
@@ -1,10 +1,10 @@
-#ifndef HTMLPARSER__FOREIGN_H_
-#define HTMLPARSER__FOREIGN_H_
+#ifndef CPP_HTMLPARSER_FOREIGN_H_
+#define CPP_HTMLPARSER_FOREIGN_H_
 
 #include <string>
 #include <string_view>
 
-#include "node.h"
+#include "cpp/htmlparser/node.h"
 
 namespace htmlparser {
 
@@ -177,4 +177,4 @@ inline constexpr std::pair<std::string_view, std::string_view>
 
 }  // namespace htmlparser
 
-#endif  // HTMLPARSER__FOREIGN_H_
+#endif  // CPP_HTMLPARSER_FOREIGN_H_
diff --git a/validator/cpp/htmlparser/glog_polyfill.h b/validator/cpp/htmlparser/glog_polyfill.h
new file mode 100644
index 000000000000..2ed52d8a3ed9
--- /dev/null
+++ b/validator/cpp/htmlparser/glog_polyfill.h
@@ -0,0 +1,41 @@
+#ifndef CPP_HTMLPARSER_GLOG_POLYFILL_H_
+#define CPP_HTMLPARSER_GLOG_POLYFILL_H_
+
+#include <cstdlib>
+
+class Checker {
+ public:
+  Checker(bool condition) : condition_(condition) {}
+  ~Checker() {
+    if (!condition_) {
+      abort();
+    }
+  }
+  template <typename T>
+  Checker& operator<<(T s) {
+    return *this;
+  }
+
+ private:
+  bool condition_;
+};
+
+// Using the same value as `absl::LogSeverity`
+const int INFO = 0;
+const int WARNING = 1;
+const int ERROR = 2;
+const int FATAL = 3;
+
+#define CHECK(condition) Checker(condition)
+#define CHECK_EQ(val1, val2) Checker((val1) == (val2))
+#define CHECK_GE(val1, val2) Checker((val1) >= (val2))
+#define CHECK_LT(val1, val2) Checker((val1) < (val2))
+#define CHECK_NE(val1, val2) Checker((val1) != (val2))
+#define LOG(level) Checker((level) < FATAL)
+
+#define DCHECK(condition) Checker(true)
+#define DCHECK_EQ(val1, val2) Checker(true)
+#define DCHECK_GE(val1, val2) Checker(true)
+#define DLOG(level) Checker(true)
+
+#endif  // CPP_HTMLPARSER_GLOG_POLYFILL_H_
diff --git a/validator/cpp/htmlparser/grammar/BUILD b/validator/cpp/htmlparser/grammar/BUILD
index 119cf1d9e78e..c0cabb146d75 100644
--- a/validator/cpp/htmlparser/grammar/BUILD
+++ b/validator/cpp/htmlparser/grammar/BUILD
@@ -13,8 +13,9 @@ cc_library(
         "tablebuilder.h",
     ],
     deps = [
-        "@htmlparser//:defer",
-        "@htmlparser//:fileutil",
-        "@htmlparser//:strings",
+        "@com_google_absl//absl/strings",
+        "//cpp/htmlparser:defer",
+        "//cpp/htmlparser:fileutil",
+        "//cpp/htmlparser:strings",
     ],
 )
diff --git a/validator/cpp/htmlparser/grammar/tablebuilder.cc b/validator/cpp/htmlparser/grammar/tablebuilder.cc
index ac249ba57ea2..69368df66893 100644
--- a/validator/cpp/htmlparser/grammar/tablebuilder.cc
+++ b/validator/cpp/htmlparser/grammar/tablebuilder.cc
@@ -1,22 +1,29 @@
-#include "grammar/tablebuilder.h"
+#include "cpp/htmlparser/grammar/tablebuilder.h"
 
+#include <algorithm>
 #include <array>
 #include <filesystem>
 #include <fstream>
 #include <iostream>
+#include <iterator>
 
-#include "defer.h"
-#include "fileutil.h"
-#include "strings.h"
+#include "absl/strings/match.h"
+#include "cpp/htmlparser/defer.h"
+#include "cpp/htmlparser/fileutil.h"
+#include "cpp/htmlparser/strings.h"
 
 namespace htmlparser::grammar {
 
 constexpr std::string_view BOLD_RED_BEGIN = "\033[1;31m";
 constexpr std::string_view BOLD_RED_END = "\033[0m";
+constexpr std::array<std::string_view, 3> kBuiltInStates {
+  "PUSH", "POP", "SHIFT"
+};
 
 TableBuilder::TableBuilder(std::string_view grammar_file_path,
-                           OutputFileOptions options)
-    : grammar_file_path_(grammar_file_path), header_options_(options) {}
+                           ParseOptions options)
+    : grammar_file_path_(grammar_file_path),
+      parse_options_(options) {}
 
 bool TableBuilder::ParseRulesAndGenerateTable() {
   if (!std::filesystem::exists(grammar_file_path_)) {
@@ -30,8 +37,12 @@ bool TableBuilder::ParseRulesAndGenerateTable() {
     return false;
   }
 
-  std::set<std::string> declared_states{"PUSH", "POP"};
+  std::set<std::string> declared_states{kBuiltInStates.begin(),
+                                        kBuiltInStates.end()};
+
   std::set<std::string> transition_states{"$"};
+  std::set<std::string> callback_codes{};
+
   for (auto& r : raw_rules_) {
     declared_states.insert(r.state);
     for (auto& t : r.transition) {
@@ -40,6 +51,7 @@ bool TableBuilder::ParseRulesAndGenerateTable() {
     for (char c : r.input.charset) {
       charset_.insert(c);
     }
+    if (!r.callback.empty()) callback_codes.insert(r.callback);
   }
 
   std::set<std::string> unused_states;
@@ -47,8 +59,10 @@ bool TableBuilder::ParseRulesAndGenerateTable() {
                       transition_states.begin(), transition_states.end(),
                       std::inserter(unused_states, unused_states.begin()));
 
-  unused_states.erase("PUSH");
-  unused_states.erase("POP");
+  for (auto& s  : kBuiltInStates) {
+    unused_states.erase(s.data());
+  }
+
   if (!unused_states.empty()) {
     std::cerr << BOLD_RED_BEGIN << "Following states defined but not used: \n";
     for (auto& us : unused_states) {
@@ -64,8 +78,10 @@ bool TableBuilder::ParseRulesAndGenerateTable() {
       declared_states.begin(), declared_states.end(),
       std::inserter(undefined_states, undefined_states.begin()));
 
-  undefined_states.erase("PUSH");
-  undefined_states.erase("POP");
+  for (auto& s : kBuiltInStates) {
+    undefined_states.erase(s.data());
+  }
+
   if (!undefined_states.empty()) {
     std::cerr << BOLD_RED_BEGIN << "Following states not defined: \n";
     for (auto& us : undefined_states) {
@@ -82,16 +98,18 @@ bool TableBuilder::ParseRulesAndGenerateTable() {
     }
   }
 
-  declared_states.erase("PUSH");
-  declared_states.erase("POP");
-  if (declared_states.size() > 256) {
-    std::cerr << "Maximum 256 states supported. " << declared_states.size()
-              << " declared." << std::endl;
+  for (auto& s : kBuiltInStates) {
+    declared_states.erase(s.data());
+  }
+
+  if (declared_states.size() >= UINT8_MAX) {
+    std::cerr << "Maximum " << UINT8_MAX + 1 << " states supported. "
+              << declared_states.size() << " declared." << std::endl;
     return false;
   }
 
-  std::array<int, 127> charindexes = {-1};
-  for (int i = 0; i < 127; i++) {
+  std::array<int, INT8_MAX> charindexes = {-1};
+  for (int i = 0; i < INT8_MAX; i++) {
     // Default to match rest of the chars column (last column).
     charindexes[i] = charset_.size();
   }
@@ -107,9 +125,9 @@ bool TableBuilder::ParseRulesAndGenerateTable() {
 
   bool has_non_ascii_char_def = charset_.find(0x80) != charset_.end();
 
+  uint8_t state_code_counter{0};
   for (auto& s : declared_states) {
-    uint8_t code = state_code_counter_;
-    state_code_counter_ += 1;
+    uint8_t code = state_code_counter++;
     state_codes_.insert({s, code});
 
     for (int i = 0; i < charset_.size(); i++) {
@@ -125,9 +143,17 @@ bool TableBuilder::ParseRulesAndGenerateTable() {
     table[code].push_back(0xff);
   }
 
+  uint8_t callback_code_counter{0};
+  for (auto& c : callback_codes) {
+    callback_codes_.insert({c, ++callback_code_counter});
+  }
+
+  // Special callback denoting the end of parsing.
+  callback_codes_.insert({"PARSE_END", ++callback_code_counter});
+
   for (auto& r : raw_rules_) {
     uint8_t code = state_codes_[r.state];
-    auto value = ComputeState(code, r);
+    auto value = ComputeState(r);
     if (!value.has_value()) return false;
 
     if (r.input.charset.empty()) {
@@ -157,60 +183,80 @@ bool TableBuilder::ParseRulesAndGenerateTable() {
 
 bool TableBuilder::OutputHeaderFile(
     const std::set<std::string>& declared_states,
-    const std::array<int, 127>& tokenindexes,
+    const std::array<int, INT8_MAX>& tokenindexes,
     const std::map<uint8_t, std::vector<uint32_t>>& table) {
-  std::ofstream fd(header_options_.output_file_path);
+  std::ofstream fd(parse_options_.output_file_path);
   htmlparser::Defer ____([&]() { fd.close(); });
 
   fd << "// -*- C++ -*-\n";
 
   fd << "\n// AUTO GENERATED; DO NOT EDIT.\n";
-  fd << "// To regenerate this file, see comments in bin/statetablegen\n\n";
-  if (!header_options_.ifdef_guard.empty()) {
-    fd << "#ifndef " << header_options_.ifdef_guard << "\n";
-    fd << "#define " << header_options_.ifdef_guard << "\n\n";
+  fd << "// To regenerate this file, see comments in bin/validatorgen\n\n";
+  if (!parse_options_.ifdef_guard.empty()) {
+    fd << "#ifndef " << parse_options_.ifdef_guard << "\n";
+    fd << "#define " << parse_options_.ifdef_guard << "\n\n";
   } else {
     fd << "#pragma once\n";
   }
 
-  fd << "#include <array>\n\n";
+  fd << "#include <array>\n";
+  fd << "#include <functional>\n";
+  fd << "#include <iostream>\n";
+  fd << "#include <optional>\n";
+  fd << "#include <string_view>\n";
+  fd << "#include <utility>\n";
+  fd << "#include <vector>\n\n";
 
-  if (!header_options_.cpp_namespace.empty()) {
-    fd << "namespace " << header_options_.cpp_namespace << " {\n\n";
+
+  if (!parse_options_.cpp_namespace.empty()) {
+    fd << "namespace " << parse_options_.cpp_namespace << " {\n\n";
   }
 
-  fd << "enum class StateCode {\n";
+  fd << "enum class StateCode : uint8_t {\n";
   for (auto [k, v] : state_codes_) {
     fd << "  " << k << " = " << static_cast<int>(v) << ",\n";
   }
   fd << "};\n\n";
 
   fd << "enum class CallbackCode {\n";
-  fd << "  // TODO: Implement callbacks.\n";
+  fd << "  NONE = 0,\n";
+  for (auto [k, v] : callback_codes_) {
+    fd << "  " << k << " = " << static_cast<int>(v) << ",\n";
+  }
   fd << "};\n\n";
 
+  fd << "using Callback = std::function<void(CallbackCode, StateCode, int)>;\n";
+  fd << "using LineCol = std::pair<int, int>;\n\n";
+
   fd << R"(
+// Validates json string, returns error line/col if str is invalid json.
+inline std::pair<bool, LineCol> Validate(std::string_view str,
+                                         Callback callback = nullptr);
+
 // Extracts CallbackCode from the bytes.
-inline static uint8_t ToCallbackCode(uint32_t code);
+inline static CallbackCode ToCallbackCode(uint32_t code);
 
 // Extracts push StateCode from the bytes.
-inline static uint8_t ToPushStateCode(uint32_t code);
+inline static StateCode ToPushStateCode(uint32_t code);
 
 // Extracts active State code from the bytes.
-inline static uint8_t ToCurrentStateCode(uint32_t code);
+inline static StateCode ToCurrentStateCode(uint32_t code);
 
 // Returns code for current token and active state.
-inline static uint32_t CodeForToken(unsigned char c, uint8_t state);
+inline static uint32_t CodeForToken(unsigned char c, StateCode state);
 
 // Checks the push bit is on.
 inline static bool HasPushBit(uint32_t code);
 
-// Checks the push bit is off.
+// Checks the pop bit is on.
 inline static bool HasPopBit(uint32_t code);
 
+// Checks the shift bit is on.
+inline static bool HasShiftBit(uint32_t code);
+
 )";
 
-  fd << "constexpr std::array<int, 127> kTokenIndexes {\n    ";
+  fd << "constexpr std::array<int, INT8_MAX> kTokenIndexes {\n    ";
   for (int i = 0; i < tokenindexes.size(); i++) {
     fd << tokenindexes[i];
     fd << (i > 0 && ((i + 1) % 8 == 0) ? ",\n    " : ", ");
@@ -229,7 +275,7 @@ inline static bool HasPopBit(uint32_t code);
     for (int i = 0; i < v.size(); i++) {
       fd << "0x" << std::hex << v[i];
       if (i < v.size() - 1) {
-        fd << (i > 0 && ((i + 1) % 8 == 0) ? ",\n     " : ", ");
+        fd << (i > 0 && ((i + 1) % 6 == 0) ? ",\n     " : ", ");
       }
     }
 
@@ -239,24 +285,24 @@ inline static bool HasPopBit(uint32_t code);
   fd << "}};\n\n";
 
   fd << R"(
-inline static uint8_t ToCallbackCode(uint32_t code) {
+inline static CallbackCode ToCallbackCode(uint32_t code) {
   // 4th byte.
-  return static_cast<uint8_t>(code >> 24);
+  return static_cast<CallbackCode>((code & 0xff000000) >> 24);
 }
 
-inline static uint8_t ToPushStateCode(uint32_t code) {
+inline static StateCode ToPushStateCode(uint32_t code) {
   // 3rd byte.
-  return static_cast<uint8_t>((code & 0x00ff0000) >> 16);
+  return static_cast<StateCode>((code & 0x00ff0000) >> 16);
 }
 
-inline static uint8_t ToCurrentStateCode(uint32_t code) {
+inline static StateCode ToCurrentStateCode(uint32_t code) {
   // 2nd byte.
-  return static_cast<uint8_t>((code & 0x0000ff00) >> 8);
+  return static_cast<StateCode>((code & 0x0000ff00) >> 8);
 }
 
 inline static bool HasPushBit(uint32_t code) {
-  // 6th bit in first byte.
-  return ((code & 0x80) >> 7) == 1;
+  // 8th bit in first byte.
+  return (code & 0x80);
 }
 
 inline static bool HasPopBit(uint32_t code) {
@@ -264,48 +310,158 @@ inline static bool HasPopBit(uint32_t code) {
   return ((code & 0x40) >> 6) == 1;
 }
 
-inline static uint32_t CodeForToken(unsigned char c, uint8_t state) {
-  if (c > 127) {
+inline static bool HasShiftBit(uint32_t code) {
+  // 6th bit in first byte.
+  return ((code & 0x20) >> 5) == 1;
+}
+
+inline static uint32_t CodeForToken(unsigned char c, StateCode state) {
+  if (c > INT8_MAX) {
 )";
 
-  fd << "    return kParseStates[state][";
+  fd << "    return kParseStates[static_cast<uint8_t>(state)][";
   fd << std::dec << charset_.size() - 1 << "];\n";
   fd << "  }\n";
   fd << "  int index = kTokenIndexes[c];\n";
   fd << "  if (index == -1) index = " << std::dec << charset_.size() << ";\n";
-  fd << "  return kParseStates[state][index];\n}\n\n";
+  fd << "  return kParseStates[static_cast<uint8_t>(state)][index];\n}\n\n";
+
+  fd << R"(
+inline std::optional<StateCode> ParseToken(
+    char c, StateCode state, int i, std::vector<StateCode>* states_stack,
+    Callback callback = nullptr) {
+  uint32_t code = CodeForToken(c, state);
+  if (code == 0xff) {
+    code = CodeForToken(0, state);
+  }
+
+  if (code == 0xff) {
+    return std::nullopt;
+  }
+
+  auto callback_code = ToCallbackCode(code);
+  if (callback && callback_code > CallbackCode::NONE) {
+    callback(callback_code, state, i);
+  }
+
+  if (HasPushBit(code)) {
+    auto shift_code = ToPushStateCode(code);
+    states_stack->push_back(shift_code);
+    return ToCurrentStateCode(code);
+  } else if (HasPopBit(code) && !states_stack->empty()) {
+    state = states_stack->back();
+    states_stack->pop_back();
+    return state;
+  } else if (HasShiftBit(code) && !states_stack->empty()) {
+    auto shift_state = states_stack->back();
+    states_stack->pop_back();
+    if (auto s = ParseToken(c, shift_state, i, states_stack); s) {
+      code = CodeForToken(c, shift_state);
+      callback_code = ToCallbackCode(code);
+      if (callback && callback_code > CallbackCode::NONE) {
+        callback(callback_code, shift_state, i);
+      }
+      return s.value();
+    } else {
+      return std::nullopt;
+    }
+  } else {
+    return ToCurrentStateCode(code);
+  }
+}
 
-  if (!header_options_.cpp_namespace.empty()) {
-    fd << "}  // namespace " << header_options_.cpp_namespace << "\n\n";
+std::pair<bool, LineCol> Validate(std::string_view str, Callback callback) {
+  StateCode state = StateCode::$;
+  uint32_t code = 0;
+  CallbackCode callback_code = CallbackCode::NONE;
+  std::vector<StateCode> states_stack {StateCode::$};
+
+  LineCol line_col{0, 0};
+  std::size_t str_size = str.size();
+  for (std::size_t i = 0; i < str_size; i++) {
+    uint8_t c = str.at(i);
+    if (c == '\n' || (c == '\r' &&
+                      i < str_size - 1 &&
+                      str.at(i + 1) != '\n')) {
+      line_col.first++;
+      line_col.second = 0;
+    } else {
+      line_col.second++;
+    }
+
+    auto s = ParseToken(c, state, i, &states_stack, callback);
+    if (!s.has_value()) {
+      // Invalid character.
+      return {false, line_col};
+    }
+    state = s.value();
   }
 
-  if (!header_options_.ifdef_guard.empty()) {
-    fd << "#endif  // " << header_options_.ifdef_guard << std::endl;
+  code = CodeForToken()";
+  fd << +parse_options_.termination_sentinel << ", state);\n";
+  fd << "  callback_code = ToCallbackCode(code);\n";
+  fd << "  auto end = ParseToken(";
+  fd << +parse_options_.termination_sentinel;
+  fd << R"(, state, str.size() - 1, &states_stack, callback);
+  if (!end.has_value()) {
+    return {false, line_col};
+  }
+  state = end.value();
+  if (callback && callback_code > CallbackCode::NONE) {
+    callback(callback_code, state, str.size() - 1);
+  }
+
+  if (state != StateCode::$) {
+    return {false, line_col};
+  }
+
+  // Final callback denoting end of parsing.
+  if (callback) {
+    callback(CallbackCode::PARSE_END, state, str.size());
+  }
+
+  return {true, line_col};
+}
+
+)";
+
+  if (!parse_options_.cpp_namespace.empty()) {
+    fd << "}  // namespace " << parse_options_.cpp_namespace << "\n\n";
+  }
+
+  if (!parse_options_.ifdef_guard.empty()) {
+    fd << "#endif  // " << parse_options_.ifdef_guard << std::endl;
   }
 
   return true;
 }
 
-std::optional<uint32_t> TableBuilder::ComputeState(uint8_t row, Rule r) {
+std::optional<uint32_t> TableBuilder::ComputeState(Rule r) {
+  uint8_t cb_code = r.callback.empty() ? 0 : callback_codes_[r.callback];
   if (r.transition.size() == 3) {
-    return ComputeStateBits(0, state_codes_[r.transition[2]],
-                            state_codes_[r.transition[0]], true, false);
+    return ComputeStateBits(cb_code, state_codes_[r.transition[2]],
+                            state_codes_[r.transition[0]],
+                            true, false, false);
   } else if (r.transition.size() == 2) {
     if (r.transition[0] == "PUSH") {
-      return ComputeStateBits(0, state_codes_[r.transition[2]], 0, true, false);
+      return ComputeStateBits(cb_code, state_codes_[r.transition[2]], 0,
+                              true, false, false);
     } else if (r.transition[1] == "PUSH") {
-      return ComputeStateBits(0, 0, state_codes_[r.transition[2]], true, false);
+      return ComputeStateBits(cb_code, 0, state_codes_[r.transition[2]],
+                              true, false, false);
     }
   } else if (r.transition.size() == 1) {
     if (r.transition[0] == "POP") {
-      return ComputeStateBits(0, 0, 0, false, true);
+      return ComputeStateBits(cb_code, 0, 0, false, true, false);
+    } else if (r.transition[0] == "SHIFT") {
+      return ComputeStateBits(cb_code, 0, 0, false, false, true);
     } else {
-      return ComputeStateBits(0, 0, state_codes_[r.transition[0]], false,
-                              false);
+      return ComputeStateBits(cb_code, 0, state_codes_[r.transition[0]],
+                              false, false, false);
     }
   }
 
-  return true;
+  return std::nullopt;
 }
 
 bool TableBuilder::ParseGrammarFile() {
@@ -353,6 +509,7 @@ std::optional<Rule> TableBuilder::ReadRule(std::string_view line,
   }
 
   std::string state = buf.str();
+  htmlparser::Strings::Trim(&state);
 
   bool exclude = false;
   std::vector<uint8_t> input;
@@ -502,17 +659,28 @@ std::optional<Rule> TableBuilder::ReadRule(std::string_view line,
       return std::nullopt;
     }
     line.remove_prefix(1);
+  } else if (c == '0' && line.size() > 1 && line.at(1) == ' ') {
+    line.remove_prefix(1);
   } else {
     std::cerr << "Parse failed for character: " << c << std::endl;
     return std::nullopt;
   }
 
   RemoveLeadingWhitespace(&line);
-  std::string transition(line.substr(0, line.find_first_of(';')));
-  if (transition.find(' ') != std::string::npos) {
-    std::cerr << "Invalid syntax at line: " << line_no << ":"
-              << line_size - line.size() << std::endl;
-    return std::nullopt;
+  std::string transition;
+  std::string callback;
+  if (auto n = line.find_first_of(' '); n != std::string::npos) {
+    transition = line.substr(0, n);
+    if (absl::StrContains(transition, ' ')) {
+      std::cerr << "Invalid syntax at line: " << line_no << ":"
+                << line_size - line.size() << std::endl;
+      return std::nullopt;
+    }
+    line.remove_prefix(n + 1);
+    callback = line.substr(0, line.find_first_of(';'));
+    htmlparser::Strings::Trim(&callback);
+  } else {
+    transition = line.substr(0, line.find_first_of(';'));
   }
 
   if (transition.empty()) {
@@ -522,6 +690,17 @@ std::optional<Rule> TableBuilder::ReadRule(std::string_view line,
 
   auto transition_states = Strings::SplitStringAt(transition, '|');
 
+  if (state == "$") {
+    for (const auto& t : transition_states) {
+      if (std::find(kBuiltInStates.begin(), kBuiltInStates.end(), t) !=
+          kBuiltInStates.end()) {
+        std::cerr << "PUSH|POP|SHIFT are invalid in begin \"$\" state."
+                  << std::endl;
+        return std::nullopt;
+      }
+    }
+  }
+
   if (transition_states.size() > 3) {
     std::cerr << BOLD_RED_BEGIN
               << "Maximum 3 transition states allowed. Found: "
@@ -551,17 +730,19 @@ std::optional<Rule> TableBuilder::ReadRule(std::string_view line,
   return Rule{
       .state = state,
       .input = {.exclude = exclude, .charset{input.begin(), input.end()}},
-      .transition = transition_states};
+      .transition = transition_states,
+      .callback = callback};
 }
 
 std::optional<uint32_t> TableBuilder::ComputeStateBits(
     uint8_t callback_code, uint8_t push_state_code, uint8_t current_state_code,
-    bool push, bool pop) {
+    bool push, bool pop, bool shift) {
   uint32_t result = callback_code << 24;
   result |= (push_state_code << 16);
   result |= (current_state_code << 8);
   if (push) result |= (1 << 7);
   if (pop) result |= (1 << 6);
+  if (shift) result |= (1 << 5);
   return result;
 }
 
diff --git a/validator/cpp/htmlparser/grammar/tablebuilder.h b/validator/cpp/htmlparser/grammar/tablebuilder.h
index 8b97b6ba7971..f62e22f95007 100644
--- a/validator/cpp/htmlparser/grammar/tablebuilder.h
+++ b/validator/cpp/htmlparser/grammar/tablebuilder.h
@@ -1,8 +1,8 @@
-#ifndef HTMLPARSER__GRAMMAR_TABLEBUILDER_H_
-#define HTMLPARSER__GRAMMAR_TABLEBUILDER_H_
+#ifndef CPP_HTMLPARSER_GRAMMAR_TABLEBUILDER_H_
+#define CPP_HTMLPARSER_GRAMMAR_TABLEBUILDER_H_
 
 //
-// NOTE: This is very basic right now. No validation of grammer syntax. Lack of
+// NOTE: This is very basic right now. No validation of grammar syntax. Lack of
 // verbose errors and not well tested. Parsers using table generated by this
 // class must be thoroughly tested.
 //
@@ -18,7 +18,7 @@
 // states. Unline LR parsers there is no shift at each stage of parsing.
 
 // See grammar.txt tutorial for learning grammar syntax.
-// TODO: Add grammer tutorial.
+// TODO: Add grammar tutorial.
 //
 // Notes:
 //  - Supports up to 255 unique states.
@@ -45,17 +45,25 @@ struct Rule {
   std::string state;
   Input input;
   std::vector<std::string> transition;
+  std::string callback;
 };
 
 class TableBuilder  {
  public:
-  struct OutputFileOptions {
+  struct ParseOptions {
     std::string output_file_path;
     std::string ifdef_guard;
     std::string cpp_namespace;
+    // Not all syntax has a definite terminal point.
+    // Example: in json ] ends the array, } ends the dict etc, so it can stop
+    // processing or shift to END_* state upon encountering such token.
+    // But in some cases we have to hint parser when to terminate (end of input)
+    // parsing, this character helps generate the state for last token that is
+    // termination_sentinel.
+    uint8_t termination_sentinel;
   };
 
-  TableBuilder(std::string_view grammar_file_path, OutputFileOptions options);
+  TableBuilder(std::string_view grammar_file_path, ParseOptions options);
 
   bool ParseRulesAndGenerateTable();
 
@@ -65,21 +73,22 @@ class TableBuilder  {
                         const std::map<uint8_t, std::vector<uint32_t>>& table);
 
   // The state code contains information about the state, transition,
-  // shifting and callbacks.
+  // shifting.
   //
-  // lowest 6 bits are reserved for future use.
+  // lowest 5 bits are reserved for future use.
+  // 6th bit contains shift bit.
   // 7th bit contains pop bit.
   // 8th bit contains push bit.
   // next 8 bits contains active state code.
   // next 8 bits contains shift state code.
   // next 8 bits contains callback code.
   //
-  // 0b11111111  11111111   11111111   11         111111
-  // ----------  --------   --------   --         ------
-  //     |           |         |       |            |
-  // Callback   shift code   state  Push|Pop bits  Reserved.
+  // 0b11111111  11111111   11111111   1      1      1      11111
+  // ----------  --------   --------   -      -      -      -----
+  //     |           |         |       |      |      |        |
+  //  callback  shift code   state   push    pop   shift   reserved.
   //
-  std::optional<uint32_t> ComputeState(uint8_t row, Rule r);
+  std::optional<uint32_t> ComputeState(Rule r);
   bool ParseGrammarFile();
   void RemoveLeadingWhitespace(std::string_view* line) const;
   std::optional<Rule> ReadRule(std::string_view line, int line_no) const;
@@ -87,17 +96,18 @@ class TableBuilder  {
                                            uint8_t push_state_code,
                                            uint8_t current_state_code,
                                            bool push,
-                                           bool pop);
+                                           bool pop,
+                                           bool shift);
 
   std::vector<Rule> raw_rules_;
   std::string grammar_file_path_;
-  OutputFileOptions header_options_;
-  std::map<std::string, uint8_t> state_codes_;
-  std::set<uint8_t> charset_;
-  uint8_t state_code_counter_ = 0;
+  ParseOptions parse_options_;
+  std::map<std::string, uint8_t> state_codes_{};
+  std::map<std::string, uint8_t> callback_codes_{};
+  std::set<uint8_t> charset_{};
 };
 
 }  // namespace htmlparser::grammar
 
 
-#endif  // HTMLPARSER__GRAMMAR_TABLEBUILDER_H_
+#endif  // CPP_HTMLPARSER_GRAMMAR_TABLEBUILDER_H_
diff --git a/validator/cpp/htmlparser/hash.h b/validator/cpp/htmlparser/hash.h
index eba6a99ecfb5..ff7fc25c6e79 100644
--- a/validator/cpp/htmlparser/hash.h
+++ b/validator/cpp/htmlparser/hash.h
@@ -1,5 +1,5 @@
-#ifndef HTMLPARSER__HASH_H_
-#define HTMLPARSER__HASH_H_
+#ifndef CPP_HTMLPARSER_HASH_H_
+#define CPP_HTMLPARSER_HASH_H_
 
 #include <string_view>
 
@@ -43,4 +43,4 @@ class Hash {
 
 }  // namespace htmlparser
 
-#endif  // HTMLPARSER__HASH_H_
+#endif  // CPP_HTMLPARSER_HASH_H_
diff --git a/validator/cpp/htmlparser/htmldataset_test.cc b/validator/cpp/htmlparser/htmldataset_test.cc
index cf7df7b50a9f..443238b623e1 100644
--- a/validator/cpp/htmlparser/htmldataset_test.cc
+++ b/validator/cpp/htmlparser/htmldataset_test.cc
@@ -10,15 +10,15 @@
 
 #include "gtest/gtest.h"
 #include "absl/flags/flag.h"
-#include "atomutil.h"
-#include "defer.h"
-#include "fileutil.h"
-#include "node.h"
-#include "parser.h"
-#include "renderer.h"
-#include "strings.h"
-#include "testconstants.h"
-#include "tokenizer.h"
+#include "cpp/htmlparser/atomutil.h"
+#include "cpp/htmlparser/defer.h"
+#include "cpp/htmlparser/fileutil.h"
+#include "cpp/htmlparser/node.h"
+#include "cpp/htmlparser/parser.h"
+#include "cpp/htmlparser/renderer.h"
+#include "cpp/htmlparser/strings.h"
+#include "cpp/htmlparser/testconstants.h"
+#include "cpp/htmlparser/tokenizer.h"
 
 ABSL_FLAG(std::string, test_srcdir, "", "Testdata directory");
 
diff --git a/validator/cpp/htmlparser/iterators.h b/validator/cpp/htmlparser/iterators.h
new file mode 100644
index 000000000000..70aef9c71a3d
--- /dev/null
+++ b/validator/cpp/htmlparser/iterators.h
@@ -0,0 +1,97 @@
+#ifndef CPP_HTMLPARSER_ITERATOR_H_
+#define CPP_HTMLPARSER_ITERATOR_H_
+
+#include <iterator>
+#include <stack>
+
+#include "cpp/htmlparser/node.h"
+
+namespace htmlparser {
+
+class Document;
+
+// A forward iterator that facilitates iterating dom tree (through root node),
+// in depth first traversal.
+//
+// Example usage:
+// auto doc = parser.Parse(html);
+// for (auto iter = doc.begin(); iter != doc.end(); ++iter) {
+//   ProcessNode(*iter);
+// }
+//
+// The above dom without NodeIterator require a lot of boiler plate code like
+// defining a stack class and data structure, knowledge of Node data structure.
+//
+// Clients should not access this class directly but get handle from Document
+// object.
+// auto iter = doc.begin();
+// auto const_iter = doc.cbegin();
+template <bool Const>
+class NodeIterator {
+ public:
+  // Member typdefs required by std::iterator_traits
+  // Not the correct type, and not used anyway.
+  using difference_type = std::ptrdiff_t;
+  using value_type = Node;
+  using pointer = std::conditional_t<Const, const Node*, Node*>;
+  using reference = std::conditional_t<Const, const Node&, Node&>;
+  using iterator_category = std::forward_iterator_tag;
+
+  reference operator*() const { return *current_node_; }
+  pointer operator->() const { return current_node_; }
+
+  // Prefix increment.
+  auto& operator++() {
+    if (current_node_->FirstChild()) {
+      if (current_node_->NextSibling()) {
+        stack_.push(current_node_->NextSibling());
+      }
+      current_node_ = current_node_->FirstChild();
+    } else {
+      current_node_ = current_node_->NextSibling();
+    }
+
+    if (!current_node_) {
+      if (!stack_.empty()) {
+        current_node_ = stack_.top();
+        stack_.pop();
+      }
+    }
+
+    return *this;
+  }
+
+  // Postfix increment.
+  auto operator++(int) {
+    auto result = *this; ++*this; return result;
+  }
+
+  template<bool R>
+  bool operator==(const NodeIterator<R>& rhs) const {
+    return current_node_ == rhs.current_node_;
+  }
+
+  template<bool R>
+  bool operator!=(const NodeIterator<R>& rhs) const {
+    return current_node_ != rhs.current_node_;
+  }
+
+  operator NodeIterator<true>() const {
+    return NodeIterator<true>{current_node_};
+  }
+
+ private:
+  explicit NodeIterator(Node* node) : current_node_(node) {}
+
+  friend class Document;
+  friend class NodeIterator<!Const>;
+  using node_pointer = std::conditional_t<Const, const Node*, Node*>;
+  node_pointer current_node_;
+  // Facilitates depth first traversal.
+  std::stack<Node*> stack_;
+};
+
+}  // namespace htmlparser
+
+
+#endif  // CPP_HTMLPARSER_ITERATOR_H_
diff --git a/validator/cpp/htmlparser/json/BUILD b/validator/cpp/htmlparser/json/BUILD
index 138629d9d9d9..65445a1e9a6a 100644
--- a/validator/cpp/htmlparser/json/BUILD
+++ b/validator/cpp/htmlparser/json/BUILD
@@ -4,37 +4,6 @@ package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])
 
-cc_library(
-    name = "states",
-    hdrs = [
-        "states.h",
-    ],
-)
-
-cc_library(
-    name = "parser",
-    srcs = [
-        "parser.cc",
-    ],
-    hdrs = [
-        "parser.h",
-    ],
-    deps = [
-        ":states",
-    ],
-)
-
-cc_test(
-    name = "parser_test",
-    srcs = [
-        "parser_test.cc",
-    ],
-    deps = [
-        ":parser",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
 cc_library(
     name = "types",
     srcs = [
@@ -61,18 +30,25 @@ filegroup(
     srcs = glob(["testdata/*.json"]),
 )
 
-cc_test(
-    name = "jsondataset_test",
-    srcs = [
-        "jsondataset_test.cc",
-    ],
-    data = [
-        ":json_testfiles",
+cc_library(
+    name = "json",
+    srcs = ["json.cc"],
+    hdrs = ["json.h"],
+    deps = [
+        ":types",
+        "@com_google_absl//absl/strings",
+        "//cpp/htmlparser:logging",
+        "//cpp/htmlparser/validators:json",
     ],
+)
+
+cc_test(
+    name = "json_test",
+    srcs = ["json_test.cc"],
+    data = [":json_testfiles"],
     deps = [
-        ":parser",
+        ":json",
+        ":types",
         "@com_google_googletest//:gtest_main",
-        "@htmlparser//:defer",
-        "@htmlparser//:fileutil",
     ],
 )
diff --git a/validator/cpp/htmlparser/json/json.cc b/validator/cpp/htmlparser/json/json.cc
new file mode 100644
index 000000000000..6dec3e7bc28a
--- /dev/null
+++ b/validator/cpp/htmlparser/json/json.cc
@@ -0,0 +1,370 @@
+#include "cpp/htmlparser/json/json.h"
+
+#include <stack>
+
+#include "absl/strings/numbers.h"
+#include "cpp/htmlparser/logging.h"
+#include "cpp/htmlparser/validators/json.h"
+
+namespace htmlparser::json {
+
+namespace {
+
+// ParseInternal is internal library responsible for parsing/validating JSON and
+// deserializing them to JSON objects in C++.
+//
+// The parsing technology is different. Unlike lexer/tokenizer based approach
+// this parser is built using a state table auto generated by (validatorgen.cc)
+// which reads JSON grammar from (jsongrammar.txt). The JSON validator
+// (validators/json.h) accurately validates the JSON and also provides callbacks
+// for each parsing event. See switch case statement in ParseInternal::Parse()
+// method below.
+//
+// So essentially, this parser does not actual parsing/tokenizing work but
+// simply  assembles the JSON objects. This makes this parser very fast and
+// memory efficient.
+//
+// Using ParseOptions one can customzie the behavior of the parser to further
+// optimize and match the project requirements.
+//
+// Though clients cannot access this class, this class is not thread safe.
+// Entire execution should be in one thread execution only. Running validate
+// in one thread and Parser in another can lead to undefined behavior or even
+// crash the binary.
+//
+// The Validator (validators/json.h) is accurate validator and hence no extra
+// validation is required in parse internal. For example a string callback is
+// guaranteed to contain a double quoted string. There is no further check for
+// existence of double quotes or missing quotes etc. Same applies to different
+// objects. The callback ARRAY_NEXT_ITEM for example is guaranteed to be in
+// JsonArray node, so it simply appends the item in the current_node_ which is
+// JsonArray.
+class ParseInternal {
+ public:
+  ParseInternal(std::string_view json_str, ParseOptions options);
+  std::unique_ptr<JsonObject> Parse();
+
+ private:
+  // We register the callbacks for beginning of these types but populate these
+  // fields only when a proper terminating callback is invoked, for example
+  // ARRAY_NEXT_ITEM, or DICT_VAL_END. The hints can be and/or'ed so in one
+  // state two types NUMBER_T and FLOAT_T can  be active.
+  enum TypeHint {
+    UNKNOWN             = 1 << 0,
+    NUMBER_T            = 1 << 1,
+    FLOAT_T             = 1 << 2,
+    STRING_T            = 1 << 3,
+    NULL_T              = 1 << 4,
+    TRUE_T              = 1 << 5,
+    FALSE_T             = 1 << 6,
+    NUMBER_AFTER_ZERO_T = 1 << 7,
+  };
+
+  // All the following methods must be called only from the validator callbacks,
+  // as it assumes some validation conditions. Calling them outside of callbacks
+  // can lead to undefined behavior.
+  // ===========================================================================
+  // Assembles the current string excluding double quotes.
+  inline std::string_view CurrentString(std::size_t current_index);
+  // Assembles the current number or double based on type hints.
+  inline std::string_view CurrentNumberStr(std::size_t current_index);
+  // Assembles the dictionary key in string format.
+  inline std::string_view DictKey() const;
+  // Creates a new node and places it on the stack.
+  inline void NewNode(JsonObject&& node);
+  // Populates the dictionary item, i.e key/val pair.
+  inline void PopulateDictionaryItem(std::size_t current_index);
+  // Populates the array item, i.e appends the value to existing array.
+  inline void PopulateArrayItem(std::size_t current_index);
+  // Pops the node from the stack. When the node closes example dictionary or
+  // array ends.
+  inline void Pop();
+  // When new nested node is created, the current node is pushed on to stack
+  // which is popped back when the child node is closed.
+  inline void Push(JsonObject* node);
+  // Assembles root values. i.e. "string", true, false, null, 123, 1.23 etc.
+  inline void AssembleRootValues(std::size_t current_index);
+
+  // The current node on which all insert/append operations are performed.
+  // In most cases this is either dictionary {} or array [].
+  JsonObject* current_node_;
+  // The actual input json string.
+  std::string_view json_str_;
+  // The parser customization options.
+  ParseOptions parse_options_;
+  // The TypeHint(s) holder.
+  int64_t hints_ = 0;
+  // Various string markers in the json.
+  std::size_t dict_key_start_idx_ = std::string_view::npos;
+  std::size_t dict_key_end_idx_ = std::string_view::npos;
+  std::size_t string_start_idx_ = std::string_view::npos;
+
+  // The object stack to push parent objects when new nested nodes are created.
+  // Stack must be empty at the end of the parsing or it is an error.
+  std::stack<JsonObject*> obj_stack_;
+};
+
+ParseInternal::ParseInternal(std::string_view json_str, ParseOptions options)
+    : json_str_(json_str), parse_options_(options) {}
+
+std::string_view ParseInternal::CurrentString(std::size_t current_index) {
+  hints_ ^= STRING_T;
+  // The indexes are guaranteed by the validator.
+  return json_str_.substr(string_start_idx_ + 1,
+                          current_index - string_start_idx_ - 2);
+}
+
+std::string_view ParseInternal::CurrentNumberStr(std::size_t current_index) {
+  hints_ ^= NUMBER_T;
+  return json_str_.substr(string_start_idx_,
+                          current_index - string_start_idx_);
+}
+
+void ParseInternal::NewNode(JsonObject&& node) {
+  if (auto array = current_node_->Get<JsonArray>(); array) {
+    array->Append(std::move(node));
+    Push(array->Last());
+  } else if (auto dict = current_node_->Get<JsonDict>(); dict) {
+    auto key = DictKey();
+    dict->Insert(key, std::move(node));
+    Push(dict->Get(key));
+  }
+}
+
+void ParseInternal::PopulateDictionaryItem(std::size_t current_index) {
+  auto dict = current_node_->Get<JsonDict>();
+  if (hints_ & STRING_T) {
+    auto key = DictKey();
+    auto value = CurrentString(current_index);
+    if (parse_options_.use_string_references) {
+      dict->Insert<std::string_view>(key, value);
+    } else {
+      dict->Insert<std::string>(key, std::string(value));
+    }
+  } else if (hints_ & NUMBER_T) {
+    auto str = CurrentNumberStr(current_index);
+    if (hints_ & FLOAT_T) {
+      double num;
+      if (absl::SimpleAtod(str, &num)) {
+        dict->Insert<double>(DictKey(), num);
+      }
+      hints_ ^= FLOAT_T;
+    } else {
+      int64_t num;
+      if (absl::SimpleAtoi(str, &num)) {
+        dict->Insert<int64_t>(DictKey(), num);
+      }
+    }
+  } else if (hints_ & NULL_T) {
+    dict->Insert(DictKey(), nullptr);
+    hints_ ^= NULL_T;
+  } else if (hints_ & TRUE_T) {
+    dict->Insert(DictKey(), true);
+    hints_ ^= TRUE_T;
+  } else if (hints_ & FALSE_T) {
+    dict->Insert(DictKey(), false);
+    hints_ ^= FALSE_T;
+  }
+}
+
+void ParseInternal::PopulateArrayItem(std::size_t current_index) {
+  auto array = current_node_->Get<JsonArray>();
+  if (hints_ & STRING_T) {
+    auto str = CurrentString(current_index);
+    if (parse_options_.use_string_references) {
+      array->Append<std::string_view>(str);
+    } else {
+      array->Append<std::string>(std::string(str));
+    }
+  } else if (hints_ & NUMBER_T) {
+    auto str = CurrentNumberStr(current_index);
+    if (hints_ & FLOAT_T) {
+      double num;
+      if (absl::SimpleAtod(str, &num)) {
+        array->Append<double>(num);
+      }
+      hints_ ^= FLOAT_T;
+    } else {
+      int64_t num;
+      if (absl::SimpleAtoi(str, &num)) {
+        array->Append<int64_t>(num);
+      }
+    }
+  } else if (hints_ & NULL_T) {
+    array->Append(nullptr);
+    hints_ ^= NULL_T;
+  } else if (hints_ & TRUE_T) {
+    array->Append(true);
+    hints_ ^= TRUE_T;
+  } else if (hints_ & FALSE_T) {
+    array->Append(false);
+    hints_ ^= FALSE_T;
+  }
+}
+
+void ParseInternal::Pop() {
+  if (!obj_stack_.empty()) {
+    current_node_ = obj_stack_.top();
+    obj_stack_.pop();
+  }
+}
+
+void ParseInternal::Push(JsonObject* node) {
+  obj_stack_.push(current_node_);
+  current_node_ = node;
+}
+
+std::string_view ParseInternal::DictKey() const {
+  return json_str_.substr(dict_key_start_idx_,
+                          dict_key_end_idx_ - dict_key_start_idx_);
+}
+
+void ParseInternal::AssembleRootValues(std::size_t current_index) {
+  if (hints_ & STRING_T) {
+    if (parse_options_.use_string_references) {
+      *current_node_ = CurrentString(current_index);
+    }  else {
+      *current_node_ = std::string(CurrentString(current_index));
+    }
+  } else if (hints_ & TRUE_T) {
+    *current_node_ = true;
+  } else if (hints_ & FALSE_T) {
+    *current_node_ = false;
+  } else if (hints_ & NULL_T) {
+    *current_node_ = JsonNull();
+  } else if (hints_ & NUMBER_T) {
+    auto str = CurrentNumberStr(current_index);
+    if (hints_ & FLOAT_T) {
+      double num;
+      if (absl::SimpleAtod(str, &num)) {
+        *current_node_ = num;
+      }
+      hints_ ^= FLOAT_T;
+    } else {
+      int64_t num;
+      if (absl::SimpleAtoi(str, &num)) {
+        *current_node_ = num;
+      }
+    }
+  }
+  hints_ = 0;
+}
+
+std::unique_ptr<JsonObject> ParseInternal::Parse() {
+  auto value = std::make_unique<JsonObject>(true);
+  current_node_ = value.get();
+
+  auto result = Validate(json_str_, [&](auto cb_code, auto state_code, int i) {
+    switch (cb_code) {
+      case CallbackCode::ROOT_DICT: {
+        *current_node_ = JsonDict();
+        break;
+      }
+      case CallbackCode::ROOT_ARRAY: {
+        *current_node_ = JsonArray();
+        break;
+      }
+      case CallbackCode::ROOT_STRING:
+      case CallbackCode::STRING_T: {
+        hints_ |= STRING_T;
+        string_start_idx_ = i;
+        break;
+      }
+      case CallbackCode::ROOT_BOOL_TRUE:
+      case CallbackCode::TRUE_T: {
+        hints_ |= TRUE_T;
+        break;
+      }
+      case CallbackCode::ROOT_BOOL_FALSE:
+      case CallbackCode::FALSE_T: {
+        hints_ |= FALSE_T;
+        break;
+      }
+      case CallbackCode::ROOT_NULL_VAL:
+      case CallbackCode::NULL_T: {
+        hints_ |= NULL_T;
+        break;
+      }
+      case CallbackCode::ROOT_NUMBER:
+      case CallbackCode::NUMBER_T: {
+        hints_ |= NUMBER_T;
+        string_start_idx_ = i;
+        break;
+      }
+      case CallbackCode::ROOT_NUMBER_AFTER_ZERO: {
+        hints_ |= NUMBER_AFTER_ZERO_T;
+        break;
+      }
+      case CallbackCode::FLOATING_POINT_T: {
+        hints_ |= FLOAT_T;
+        break;
+      }
+      case CallbackCode::DICT_KEY_BEGIN: {
+        // If this is EOF, validator will invalidate the json, so the increment
+        // below will never cause IndexOutOfBoundsException.
+        dict_key_start_idx_ = i + 1 /* skip start quote */;
+        break;
+      }
+      case CallbackCode::DICT_VAL_END: {
+        PopulateDictionaryItem(i);
+        break;
+      }
+      case CallbackCode::DICT_KEY_END: {
+        dict_key_end_idx_ = i - 1; /* skip end quote */
+        break;
+      }
+      case CallbackCode::DICT_END: {
+        PopulateDictionaryItem(i);
+        Pop();
+        break;
+      }
+      case CallbackCode::ARRAY_VAL_END: {
+        PopulateArrayItem(i);
+        break;
+      }
+      case CallbackCode::ARRAY_END: {
+        PopulateArrayItem(i);
+        Pop();
+        break;
+      }
+      case CallbackCode::DICT_T: {
+        JsonDict dict;
+        JsonObject dict_node(dict);
+        NewNode(std::move(dict_node));
+        break;
+      }
+      case CallbackCode::ARRAY_T: {
+        JsonArray arr;
+        JsonObject array_node(arr);
+        NewNode(std::move(array_node));
+        break;
+      }
+      case CallbackCode::PARSE_END: {
+        AssembleRootValues(i);
+        CHECK(obj_stack_.empty()) << "Json objects not assembled properly.";
+        break;
+      }
+      case CallbackCode::NONE: {
+        // Not possible. Making compiler happy.
+        CHECK(false) << "JSONParser reached unreachable condition.";
+        break;
+      }
+      // NOTE: Do not add default: label.
+    }
+  });
+
+  if (result.first) {
+    return value;
+  }
+
+  return nullptr;
+}
+
+}  // namespace
+
+std::unique_ptr<JsonObject> Parse(std::string_view json_str,
+                                  ParseOptions options) {
+  return ParseInternal(json_str, options).Parse();
+}
+
+}  // namespace htmlparser::json
diff --git a/validator/cpp/htmlparser/json/json.h b/validator/cpp/htmlparser/json/json.h
new file mode 100644
index 000000000000..d21c2d17df28
--- /dev/null
+++ b/validator/cpp/htmlparser/json/json.h
@@ -0,0 +1,27 @@
+#ifndef CPP_HTMLPARSER_JSON_JSON_H_
+#define CPP_HTMLPARSER_JSON_JSON_H_
+
+#include <memory>
+#include <string_view>
+
+#include "cpp/htmlparser/json/types.h"
+
+namespace htmlparser::json {
+
+struct ParseOptions {
+  // If true, parses the string values as references to the input json string in
+  // the form of string_view, i.e. no new memory is allocated for the string.
+  // Use this option only if the following conditions are true:
+  // A) The original json string outlives the parsed JsonObject.
+  // B) The JsonObject is quickly disposed off by converting it to other format,
+  //    thereby copying the fields.
+  bool use_string_references = false;
+};
+
+std::unique_ptr<JsonObject> Parse(std::string_view json_str,
+                                  ParseOptions options = {
+                                      .use_string_references = false});
+
+}  // namespace htmlparser::json
+
+#endif  // CPP_HTMLPARSER_JSON_JSON_H_
diff --git a/validator/cpp/htmlparser/json/json_test.cc b/validator/cpp/htmlparser/json/json_test.cc
new file mode 100644
index 000000000000..b9e688e19654
--- /dev/null
+++ b/validator/cpp/htmlparser/json/json_test.cc
@@ -0,0 +1,341 @@
+#include "cpp/htmlparser/json/json.h"
+
+#include <gmock/gmock.h>
+#include "gtest/gtest.h"
+#include "cpp/htmlparser/json/types.h"
+
+using htmlparser::json::JsonArray;
+using htmlparser::json::JsonDict;
+using htmlparser::json::JsonNull;
+using htmlparser::json::Parse;
+using testing::NotNull;
+
+TEST(JsonTest, RootBoolTest) {
+  EXPECT_TRUE(Parse("true")->Bool());
+  EXPECT_FALSE(Parse("false")->Bool());
+}
+
+TEST(JsonTest, RootStringTest) {
+  std::string str = "\"foobar\"";
+  // Points to original string.
+  auto result = Parse(str, {.use_string_references = true});
+  ASSERT_THAT(result, NotNull());
+  EXPECT_FALSE(result->Is<std::string>());
+  EXPECT_TRUE(result->Is<std::string_view>());
+  str[1] = 'Z';
+  EXPECT_EQ(result->StringView(), "Zoobar");
+
+  // String copy.
+  auto result2 = Parse(str, {.use_string_references = false});
+  ASSERT_THAT(result2, NotNull());
+  EXPECT_FALSE(result2->Is<std::string_view>());
+  EXPECT_TRUE(result2->Is<std::string>());
+  str[2] = 'm';
+  EXPECT_EQ(result2->String(), "Zoobar");
+}
+
+TEST(JsonTest, EmptyStringTest) {
+  std::string str = R"("")";
+  auto result = Parse(str);
+  EXPECT_TRUE(result->String().empty());
+
+  str = R"([true, "", 1])";
+  auto result2 = Parse(str);
+  auto array = result2->Array();
+  EXPECT_TRUE(array.at(1).String().empty());
+}
+
+TEST(JsonTest, RootInvalidString) {
+  // Not ending with closing quotes.
+  std::string str = "\"foobar";
+  EXPECT_EQ(Parse(str), nullptr);
+}
+
+TEST(JsonTest, RootNumber) {
+  std::string numstr = "1234";
+  auto result = Parse(numstr);
+  EXPECT_EQ(result->Number(), 1234);
+}
+
+TEST(JsonTest, RootInvalidNumber) {
+  std::string numstr = "1234a";
+  auto result = Parse(numstr);
+  EXPECT_EQ(result, nullptr);
+}
+
+TEST(JsonTest, RootDouble) {
+  std::string numstr = "3.14";
+  auto result = Parse(numstr);
+  EXPECT_EQ(result->Double(), 3.14);
+}
+
+TEST(JsonTest, RootNullTest) {
+  std::string json_str{"null"};
+  auto result = Parse(json_str);
+  ASSERT_THAT(result, NotNull());
+  EXPECT_TRUE(result->IsNull());
+}
+
+TEST(JsonTest, RootEmptyDictTest) {
+  std::string json_str{"{}"};
+  auto result = Parse(json_str);
+  ASSERT_THAT(result, NotNull());
+  EXPECT_TRUE(result->Is<JsonDict>());
+  EXPECT_EQ(result->Dict().size(), 0);
+}
+
+TEST(JsonTest, RootEmptyArrayTest) {
+  std::string json_str{"[]"};
+  auto result = Parse(json_str);
+  ASSERT_THAT(result, NotNull());
+  EXPECT_TRUE(result->Is<JsonArray>());
+  EXPECT_EQ(result->Array().size(), 0);
+}
+
+TEST(JsonTest, RootArrayAllBoolValues) {
+  std::string json_str{"[true, false, true, true, false]"};
+  auto result = Parse(json_str);
+  ASSERT_THAT(result, NotNull());
+  EXPECT_TRUE(result->Is<JsonArray>());
+  auto array = result->Array();
+  EXPECT_EQ(array.size(), 5);
+  EXPECT_TRUE(array.at(0).Bool());
+  EXPECT_FALSE(array.at(1).Bool());
+  EXPECT_TRUE(array.at(2).Bool());
+  EXPECT_TRUE(array.at(3).Bool());
+  EXPECT_FALSE(array.at(4).Bool());
+}
+
+TEST(JsonTest, RootArrayAllNumbers) {
+  std::string json_str{"[1, 2, 3, 4]"};
+  auto result = Parse(json_str);
+  ASSERT_THAT(result, NotNull());
+  EXPECT_TRUE(result->Is<JsonArray>());
+  auto array = result->Array();
+  EXPECT_EQ(array.size(), 4);
+  EXPECT_EQ(array.at(0).Number(), 1);
+  EXPECT_EQ(array.at(1).Number(), 2);
+  EXPECT_EQ(array.at(2).Number(), 3);
+  EXPECT_EQ(array.at(3).Number(), 4);
+}
+
+TEST(JsonTest, RootArrayAllDouble) {
+  std::string json_str{"[1.1, 2.2, 3.3, 4.4]"};
+  auto result = Parse(json_str);
+  ASSERT_THAT(result, NotNull());
+  EXPECT_TRUE(result->Is<JsonArray>());
+  auto array = result->Array();
+  EXPECT_EQ(array.size(), 4);
+  EXPECT_EQ(array.at(0).Double(), 1.1);
+  EXPECT_EQ(array.at(1).Double(), 2.2);
+  EXPECT_EQ(array.at(2).Double(), 3.3);
+  EXPECT_EQ(array.at(3).Double(), 4.4);
+}
+
+TEST(JsonTest, RootArrayNumberExpNotation) {
+  std::string json_str{"[3.14e+3, -3.14e+3, 0.14e+3, -0.58e+8]"};
+  auto result = Parse(json_str);
+  ASSERT_THAT(result, NotNull());
+  EXPECT_TRUE(result->Is<JsonArray>());
+  auto array = result->Array();
+  EXPECT_EQ(array.size(), 4);
+  EXPECT_EQ(array.at(0).Double(), 3.14e+3);
+  EXPECT_EQ(array.at(1).Double(), -3.14e+3);
+  EXPECT_EQ(array.at(2).Double(), 0.14e+3);
+  EXPECT_EQ(array.at(3).Double(), -0.58e+8);
+}
+
+TEST(JsonTest, RootArrayMixedIntTypes) {
+  std::string json_str{"[1, 1.1, 2, 2.2, 3, 3.3, 4, 4.4]"};
+  auto result = Parse(json_str);
+  ASSERT_THAT(result, NotNull());
+  EXPECT_TRUE(result->Is<JsonArray>());
+  auto array = result->Array();
+  EXPECT_EQ(array.size(), 8);
+  EXPECT_EQ(array.at(0).Number(), 1);
+  EXPECT_EQ(array.at(1).Double(), 1.1);
+  EXPECT_EQ(array.at(2).Number(), 2);
+  EXPECT_EQ(array.at(3).Double(), 2.2);
+  EXPECT_EQ(array.at(4).Number(), 3);
+  EXPECT_EQ(array.at(5).Double(), 3.3);
+  EXPECT_EQ(array.at(6).Number(), 4);
+  EXPECT_EQ(array.at(7).Double(), 4.4);
+}
+
+TEST(JsonTest, NestedArrays) {
+  std::string json_str{"[1, [2, [3, [4, 5, 6], 7], 8], 9]"};
+  auto result = Parse(json_str);
+  ASSERT_THAT(result, NotNull());
+  EXPECT_TRUE(result->Is<JsonArray>());
+  auto array = result->Array();
+  EXPECT_EQ(array.size(), 3);
+  auto array2 = array.at(1).Array();
+  auto array3 = array2.at(1).Array();
+  auto array4 = array3.at(1).Array();
+  EXPECT_EQ(array.at(0).Number(), 1);
+  EXPECT_EQ(array2.at(0).Number(), 2);
+  EXPECT_EQ(array3.at(0).Number(), 3);
+  EXPECT_EQ(array4.at(0).Number(), 4);
+  EXPECT_EQ(array4.at(1).Number(), 5);
+  EXPECT_EQ(array4.at(2).Number(), 6);
+  EXPECT_EQ(array3.at(2).Number(), 7);
+  EXPECT_EQ(array2.at(2).Number(), 8);
+  EXPECT_EQ(array.at(2).Number(), 9);
+}
+
+TEST(JsonTest, NestedDictInsideArray) {
+  std::string json_str{R"([1, [null, 3], true])"};
+  auto result = Parse(json_str);
+  ASSERT_THAT(result, NotNull());
+}
+
+TEST(JsonTest, RootArrayAllStrings) {
+  std::string json_str{R"(["foo", "bar", "a", "true"])"};
+  auto result = Parse(json_str);
+  ASSERT_THAT(result, NotNull());
+  EXPECT_TRUE(result->Is<JsonArray>());
+  auto array = result->Array();
+  EXPECT_EQ(array.size(), 4);
+  EXPECT_EQ(array.at(0).String(), "foo");
+  EXPECT_EQ(array.at(1).String(), "bar");
+  EXPECT_EQ(array.at(2).String(), "a");
+  EXPECT_EQ(array.at(3).String(), "true");
+}
+
+TEST(JsonTest, RootArrayAllNulls) {
+  std::string json_str{R"([null, null, null, null])"};
+  auto result = Parse(json_str);
+  ASSERT_THAT(result, NotNull());
+  EXPECT_TRUE(result->Is<JsonArray>());
+  auto array = result->Array();
+  EXPECT_EQ(array.size(), 4);
+  EXPECT_TRUE(array.at(0).IsNull());
+  EXPECT_TRUE(array.at(1).IsNull());
+  EXPECT_TRUE(array.at(2).IsNull());
+  EXPECT_TRUE(array.at(3).IsNull());
+}
+
+TEST(JsonTest, RootArrayMixedValuesAsReferences) {
+  std::string json_str{R"([1, true, null, "foo", false, "",
+  {}, 324.123445560])"};
+  auto result = Parse(json_str, {.use_string_references = true});
+  ASSERT_THAT(result, NotNull());
+  EXPECT_TRUE(result->Is<JsonArray>());
+  auto array = result->Array();
+  EXPECT_EQ(array.size(), 8);
+  EXPECT_EQ(array.at(0).Number(), 1);
+  EXPECT_TRUE(array.at(1).Bool());
+  EXPECT_TRUE(array.at(2).IsNull());
+  json_str[17] = 'b';
+  json_str[18] = 'a';
+  json_str[19] = 'r';
+  EXPECT_EQ(array.at(3).StringView(), "bar");
+  EXPECT_FALSE(array.at(4).Bool());
+  EXPECT_EQ(array.at(5).StringView(), "");
+  ASSERT_THAT(array.at(6).Get<JsonDict>(), NotNull());
+  EXPECT_EQ(array.at(7).Double(), 324.123445560);
+}
+
+TEST(JsonTest, RootArrayMixedValues) {
+  std::string json_str{R"([1, true, null, "foo", false, "", 324.123445560])"};
+  auto result = Parse(json_str, {.use_string_references = false});
+  ASSERT_THAT(result, NotNull());
+  EXPECT_TRUE(result->Is<JsonArray>());
+  auto array = result->Array();
+  EXPECT_EQ(array.size(), 7);
+  EXPECT_EQ(array.at(0).Number(), 1);
+  EXPECT_TRUE(array.at(1).Bool());
+  EXPECT_TRUE(array.at(2).IsNull());
+  json_str[17] = 'b';
+  json_str[18] = 'a';
+  json_str[19] = 'r';
+  EXPECT_EQ(array.at(3).String(), "foo");
+  EXPECT_FALSE(array.at(4).Bool());
+  EXPECT_EQ(array.at(5).String(), "");
+  EXPECT_EQ(array.at(6).Double(), 324.123445560);
+}
+
+TEST(JsonTest, RootDictTest) {
+  std::string json_str{R"({
+  "a": null, "b": true, "c": "value", "d": false,
+  "e": 123, "f": "foo", "b": false
+  })"};
+  auto result = Parse(json_str);
+  ASSERT_THAT(result, NotNull());
+  ASSERT_THAT(result->Get<JsonDict>(), NotNull());
+  auto dict = result->Dict();
+  EXPECT_EQ(dict.size(), 7);
+  ASSERT_THAT(dict.Get<JsonNull>("a"), NotNull());
+  // Overwritten by second definition.
+  EXPECT_FALSE(*dict.Get<bool>("b"));
+  EXPECT_EQ(*dict.Get<std::string>("c"), "value");
+  EXPECT_FALSE(*dict.Get<bool>("d"));
+  EXPECT_EQ(*dict.Get<int64_t>("e"), 123);
+  EXPECT_EQ(*dict.Get<std::string>("f"), "foo");
+}
+
+TEST(JsonTest, NegativeNumber) {
+  std::string json_str{
+      R"([-65.613616999999977,43.420273000000009, -65.619720000000029,43.418052999999986,-65.625,43.421379000000059])"};
+  auto result = Parse(json_str);
+  ASSERT_THAT(result, NotNull());
+  ASSERT_THAT(result->Get<JsonArray>(), NotNull());
+  auto array = result->Array();
+  EXPECT_EQ(array.at(0).Double(), -65.613616999999977);
+  EXPECT_EQ(array.at(1).Double(), 43.420273000000009);
+  EXPECT_EQ(array.at(2).Double(), -65.619720000000029);
+  EXPECT_EQ(array.at(3).Double(), 43.418052999999986);
+  EXPECT_EQ(array.at(4).Double(), -65.625);
+  EXPECT_EQ(array.at(5).Double(), 43.421379000000059);
+}
+
+TEST(JsonTest, BasicAllInOneTest) {
+  auto result = htmlparser::json::Parse(R"JSON({
+  "a": "b",
+  "c": "hello world!     ",
+  "d": [1, 0.23, {"a": true}, [1, "foo"], "abc"],
+  "foo": "bar",
+  "e": {"foo": "b\"a\"r", "baz": false, "ok": {"hello":"world"}},
+  "f": [1,[2,[1,[2,[4,[5,[6]]]]]]]
+  })JSON");
+  ASSERT_THAT(result, NotNull());
+  auto dict = result->Dict();
+  EXPECT_EQ(*dict.Get<std::string>("a"), std::string("b"));
+  EXPECT_EQ(*dict.Get<std::string>("c"), std::string("hello world!     "));
+  EXPECT_EQ(*dict.Get<std::string>("foo"), std::string("bar"));
+  auto array = *dict.Get<JsonArray>("d");
+  EXPECT_EQ(array.at(0).Number(), 1);
+  EXPECT_EQ(array.at(1).Double(), 0.23);
+  auto dict2 = array.at(2).Dict();
+  EXPECT_TRUE(dict2.Get<bool>("a"));
+  auto array2 = array.at(3).Array();
+  EXPECT_EQ(array2.at(0).Number(), 1);
+  EXPECT_EQ(array2.at(1).String(), "foo");
+  EXPECT_EQ(array.at(4).String(), "abc");
+  auto dict3 = *dict.Get<JsonDict>("e");
+  EXPECT_EQ(*dict3.Get<std::string>("foo"), std::string(R"(b\"a\"r)"));
+  EXPECT_FALSE(*dict3.Get<bool>("baz"));
+  auto dict4 = *dict3.Get<JsonDict>("ok");
+  EXPECT_EQ(*dict4.Get<std::string>("hello"), "world");
+  auto array3 = *dict.Get<JsonArray>("f");
+  EXPECT_EQ(array3.size(), 2);
+  EXPECT_EQ(array3.at(0).Number(), 1);
+  auto array3_1 = array3.at(1).Array();
+  EXPECT_EQ(array3_1.size(), 2);
+  EXPECT_EQ(array3_1.at(0).Number(), 2);
+  auto array3_2 = array3_1.at(1).Array();
+  EXPECT_EQ(array3_2.size(), 2);
+  EXPECT_EQ(array3_2.at(0).Number(), 1);
+  auto array3_3 = array3_2.at(1).Array();
+  EXPECT_EQ(array3_3.size(), 2);
+  EXPECT_EQ(array3_3.at(0).Number(), 2);
+  auto array3_4 = array3_3.at(1).Array();
+  EXPECT_EQ(array3_4.size(), 2);
+  EXPECT_EQ(array3_4.at(0).Number(), 4);
+  auto array3_5 = array3_4.at(1).Array();
+  EXPECT_EQ(array3_5.size(), 2);
+  EXPECT_EQ(array3_5.at(0).Number(), 5);
+  auto array3_6 = array3_5.at(1).Array();
+  EXPECT_EQ(array3_6.size(), 1);
+  EXPECT_EQ(array3_6.at(0).Number(), 6);
+}
diff --git a/validator/cpp/htmlparser/json/jsondataset_test.cc b/validator/cpp/htmlparser/json/jsondataset_test.cc
deleted file mode 100644
index 3e22b558765e..000000000000
--- a/validator/cpp/htmlparser/json/jsondataset_test.cc
+++ /dev/null
@@ -1,67 +0,0 @@
-#include <fstream>
-#include <vector>
-#include <sstream>
-#include <string_view>
-
-#include "gtest/gtest.h"
-#include "defer.h"
-#include "fileutil.h"
-#include "json/parser.h"
-
-void ParseAndValidateFile(std::string file_path) {
-  std::ifstream fd(file_path);
-  EXPECT_TRUE(fd.good());
-  htmlparser::defer(fd.close());
-
-  std::stringbuf buf;
-  htmlparser::FileUtil::ReadFileLines(htmlparser::FileReadOptions{
-    .ignore_comments = false},
-    fd,
-    [&](std::string_view line, int line_no) {
-      buf.sputc('\n');
-      buf.sputn(line.data(), line.size());
-    });
-  std::string json = buf.str();
-  auto v = htmlparser::json::JSONParser::Validate(json);
-  EXPECT_TRUE(v.first);
-}
-
-TEST(JSONParserTest, File1) {
-  ParseAndValidateFile("json/testdata/1.json");
-}
-
-TEST(JSONParserTest, File2) {
-  ParseAndValidateFile("json/testdata/2.json");
-}
-
-TEST(JSONParserTest, File3) {
-  ParseAndValidateFile("json/testdata/3.json");
-}
-
-TEST(JSONParserTest, File4) {
-  ParseAndValidateFile("json/testdata/4.json");
-}
-
-TEST(JSONParserTest, File5) {
-  ParseAndValidateFile("json/testdata/5.json");
-}
-
-TEST(JSONParserTest, File6) {
-  ParseAndValidateFile("json/testdata/6.json");
-}
-
-TEST(JSONParserTest, File7) {
-  ParseAndValidateFile("json/testdata/7.json");
-}
-
-TEST(JSONParserTest, File8) {
-  ParseAndValidateFile("json/testdata/8.json");
-}
-
-TEST(JSONParserTest, File9) {
-  ParseAndValidateFile("json/testdata/9.json");
-}
-
-TEST(JSONParserTest, File10) {
-  ParseAndValidateFile("json/testdata/10.json");
-}
diff --git a/validator/cpp/htmlparser/json/parser.cc b/validator/cpp/htmlparser/json/parser.cc
deleted file mode 100644
index da7b5337d4ea..000000000000
--- a/validator/cpp/htmlparser/json/parser.cc
+++ /dev/null
@@ -1,93 +0,0 @@
-#include <vector>
-
-#include "json/parser.h"
-#include "json/states.h"
-
-namespace htmlparser::json {
-
-inline std::optional<uint8_t> ParseToken(char c, uint8_t state,
-                                         std::vector<uint8_t>* states_stack);
-
-std::pair<bool, LineCol> JSONParser::Validate(std::string_view json) {
-  uint8_t state = 0;
-  std::vector<uint8_t> states_stack {0};
-
-  LineCol line_col{0, 0};
-  std::size_t str_size = json.size();
-  for (std::size_t i = 0; i < str_size; i++) {
-    uint8_t c = json.at(i);
-    if (c == '\n' || (c == '\r' &&
-                      i < str_size - 1 &&
-                      json.at(i + 1) != '\n')) {
-      line_col.first++;
-      line_col.second = 0;
-    } else {
-      line_col.second++;
-    }
-
-    auto s = ParseToken(c, state, &states_stack);
-    if (!s.has_value()) {
-      // Invalid character.
-      return {false, line_col};
-    }
-
-    state = s.value();
-  }
-
-  auto end = ParseToken(' ', state, &states_stack);
-  if (!end.has_value()) {
-    return {false, line_col};
-  }
-  state = end.value();
-
-  if (static_cast<StateCode>(state) != StateCode::$) {
-    return {false, line_col};
-  }
-
-  return {true, line_col};
-}
-
-inline std::optional<uint8_t> ParseToken(char c, uint8_t state,
-                                         std::vector<uint8_t>* states_stack) {
-  auto code = CodeForToken(c, state);
-
-  if (code == 0xff) {
-    code = CodeForToken(0, state);
-  }
-
-  if (code == 0xff) {
-    return std::nullopt;
-  }
-
-  if (HasPushBit(code)) {
-    uint8_t shift_code = 0;
-    shift_code = ToPushStateCode(code);
-    states_stack->push_back(shift_code);
-  } else if (HasPopBit(code) && !states_stack->empty()) {
-    state = states_stack->back();
-    states_stack->pop_back();
-
-    // TODO: Fix the grammar.txt file to support GOTO.
-    if (c == ',' &&
-        state == static_cast<uint8_t>(StateCode::ARRAY_SEPARATOR)) {
-      state = static_cast<uint8_t>(StateCode::ARRAY_NEXT_ITEM);
-    } else if (c == ']' && state == static_cast<uint8_t>(
-        StateCode::ARRAY_SEPARATOR)) {
-      state = static_cast<uint8_t>(StateCode::ARRAY_END);
-    } else if (c == '}' && state == static_cast<uint8_t>(
-        StateCode::OBJECT_SEPARATOR)) {
-      state = static_cast<uint8_t>(StateCode::OBJECT_END);
-    } else if (c == ',' && state == static_cast<uint8_t>(
-        StateCode::OBJECT_SEPARATOR)) {
-      state = static_cast<uint8_t>(
-          htmlparser::json::StateCode::OBJECT_KEY_BEGIN_QUOTE);
-    }
-
-    return state;
-  }
-
-  state = ToCurrentStateCode(code);
-  return state;
-}
-
-}  // namespace htmlparser::json
diff --git a/validator/cpp/htmlparser/json/parser.h b/validator/cpp/htmlparser/json/parser.h
deleted file mode 100644
index d8126902a375..000000000000
--- a/validator/cpp/htmlparser/json/parser.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef HTMLPARSER__JSON_PARSER_H_
-#define HTMLPARSER__JSON_PARSER_H_
-
-#include <string_view>
-#include <optional>
-#include <utility>
-
-namespace htmlparser::json {
-
-using LineCol = std::pair<int, int>;
-
-class JSONParser {
- public:
-  // Validates that a json string is valid json as per json syntax grammer.
-  // If invalid, returns false along with line/col pair.
-  static std::pair<bool, LineCol> Validate(std::string_view json);
-};
-
-}  // namespace htmlparser::json
-
-
-#endif  // HTMLPARSER__JSON_PARSER_H_
diff --git a/validator/cpp/htmlparser/json/parser_test.cc b/validator/cpp/htmlparser/json/parser_test.cc
deleted file mode 100644
index 5f40cf8ca338..000000000000
--- a/validator/cpp/htmlparser/json/parser_test.cc
+++ /dev/null
@@ -1,363 +0,0 @@
-#include "json/parser.h"
-
-#include "gtest/gtest.h"
-
-namespace htmlparser::json {
-
-std::pair<bool, LineCol> V(std::string_view s) {
-  return JSONParser::Validate(s);
-}
-
-TEST(ParserTest, ValidJson) {
-  // true, false and null literals.
-  EXPECT_TRUE(V("true").first);
-  EXPECT_TRUE(V("false").first);
-  EXPECT_TRUE(V("null").first);
-
-  // String values.
-  // - Basic.
-  EXPECT_TRUE(V("\"amaltas\"").first);
-  EXPECT_TRUE(V("\"kotlin的练习demo\"").first);
-
-  // - Escaped quotes.
-  EXPECT_TRUE(V("\"am\\\"altas\"").first);
-  // - Contains tab.
-  EXPECT_TRUE(V("\"hello\tworld\"").first);
-  // - Contains formfeed.
-  EXPECT_TRUE(V("\"hello\fworld\"").first);
-  // - Contains linefeed.
-  EXPECT_TRUE(V("\"hello\rworld\"").first);
-  // - Contains newline.
-  EXPECT_TRUE(V("\"hello\nworld\"").first);
-  // - Contains backspace.
-  EXPECT_TRUE(V("\"hello\bworld\"").first);
-  // - Contains \uxxxx (u followed by four hex digits).
-  EXPECT_TRUE(V("\"hello\\uA93cworld\"").first);
-
-  // Number.
-  // - Basic.
-  // minus zero is valid value.
-  EXPECT_TRUE(V("-0").first);
-  // plus zero is not.
-  EXPECT_FALSE(V("+0").first);
-
-  EXPECT_TRUE(V("1234567890987654321").first);
-  // - Negative number.
-  EXPECT_TRUE(V("-1234567890987654321").first);
-  // Decimal number.
-  EXPECT_TRUE(V("3.1415926535897932384626433832795028841971693993751").first);
-  // Negative decimal number.
-  EXPECT_TRUE(V("-3.1415926535897932384626433832795028841971693993751").first);
-  // Exponent notation +.
-  EXPECT_TRUE(V("3.14e+3").first);
-  // Exponent notation -.
-  EXPECT_TRUE(V("3.14e-3").first);
-  // Exponent without notation.
-  EXPECT_TRUE(V("3.14e3").first);
-  // Negative number e notation.
-  EXPECT_TRUE(V("-3.14e+3").first);
-  EXPECT_TRUE(V("-3.14e-3").first);
-  EXPECT_TRUE(V("-3.14e3").first);
-  // Number starting with zero.
-  EXPECT_TRUE(V("0").first);
-  EXPECT_TRUE(V("0.123").first);
-  EXPECT_TRUE(V("-0.123").first);
-  EXPECT_TRUE(V("-0.123e+3").first);
-  EXPECT_TRUE(V("-0.123e-3").first);
-  EXPECT_TRUE(V("-0.123e3").first);
-  // Extra decimal cases.
-  EXPECT_TRUE(V("1.0e3").first);
-  EXPECT_TRUE(V("1.00001").first);
-  EXPECT_TRUE(V("1.10000").first);
-
-  // Arrays.
-  // Empty.
-  EXPECT_TRUE(V("[]").first);
-  // Basic with same values.
-  EXPECT_TRUE(V("[1, 2, 3]").first);
-  EXPECT_TRUE(V("[\"amaltas\", \"seol\", \"hello\", \"ok\\uA93Cbye\"]").first);
-  EXPECT_TRUE(V("[true, false, false, true, true, null]").first);
-  EXPECT_TRUE(V("[1.0, 2.0, 3.0, 4.0e+3, 5.12e-3, 6.40e3, 0.1, -0.1]").first);
-  // Basic with diffrent type values.
-  EXPECT_TRUE(V("[1, true, \"amaltas\", 1.0, null, \"world\", false]").first);
-  // Array inside array.
-  EXPECT_TRUE(V("[1, [2, [3, [4, 5]]], true, false, [\"a\", \"b\"]]").first);
-  // End with a comma OK.
-  EXPECT_TRUE(V("[1, 2, 3]").first);
-  EXPECT_TRUE(V("[\"amaltas\", \"seol\", \"hello\", \"ok\\uA93Cbye\"]").first);
-  EXPECT_TRUE(V("[1.0, 2.0, 3.0, 4.0e+3, 5.12e-3, 6.40e3, 0.1, -0.1]").first);
-
-  // Object.
-  // Empty.
-  EXPECT_TRUE(V("{}").first);
-  // Basic with one value.
-  EXPECT_TRUE(V("{\"a\": 1}").first);
-  EXPECT_TRUE(V("{\"a\": true}").first);
-  EXPECT_TRUE(V("{\"a\": false}").first);
-  EXPECT_TRUE(V("{\"a\": null}").first);
-  EXPECT_TRUE(V("{\"a\": \"amaltas\"}").first);
-  EXPECT_TRUE(V("{\"a\": 1.0}").first);
-  EXPECT_TRUE(V("{\"a\": -1.0}").first);
-  EXPECT_TRUE(V("{\"a\": 0.1}").first);
-  EXPECT_TRUE(V("{\"a\": -123098}").first);
-  EXPECT_TRUE(V("{\"a\": 1.30e+35}").first);
-  EXPECT_TRUE(V("{\"a\": 1.30e-30}").first);
-  EXPECT_TRUE(V("{\"a\": 1.30e3}").first);
-  // Spaces everywhere.
-  EXPECT_TRUE(V("{      \"hello\"      :       \"world\"         }").first);
-  EXPECT_TRUE(V("{      \"hello\"      :       123         }").first);
-  EXPECT_TRUE(V("{      \"hello\"      :       true         }").first);
-  EXPECT_TRUE(V("{      \"hello\"      :       false         }").first);
-  EXPECT_TRUE(V("{      \"hello\"      :       null         }").first);
-  EXPECT_TRUE(V("{      \"hello\"      :       0.1232         }").first);
-  EXPECT_TRUE(V("{      \"hello\"      :       -123         }").first);
-  EXPECT_TRUE(V("{      \"hello\"      :       -0.193e+3         }").first);
-
-  // Multiple values, nested multi line objects.
-  auto v = V(R"(
-      {"hello": "world",
-       "foo": "bar",
-       "age": 33, "a": true,
-       "kids": 2,
-       "names": ["foo", "bar"],
-       "scores": [8, 10, [1, 2, 3.14, 0.34e+3], [-34.39, 0.340e-3, true]],
-       "addresses": [{
-           "home": "tracy, ca",
-           "zip": 95304}, {
-           "work": "MTV",
-           "zip": 94043}],
-       "own_home": true,
-       "has_car": false,
-       "ssn": null})");
-  EXPECT_TRUE(v.first);
-}
-
-TEST(ParserTest, InvalidJson) {
-  // The v.second below is pair of line/col where error is reported.
-  auto v = V("True");
-  EXPECT_FALSE(v.first);
-  EXPECT_EQ(v.second.second, 1 /* true is case sensitive. */);
-
-  v = V("tru");
-  EXPECT_FALSE(v.first);
-  EXPECT_EQ(v.second.second, 3 /* e missing */);
-
-  v = V("truE");
-  EXPECT_FALSE(v.first);
-  EXPECT_EQ(v.second.second, 4 /* uppercase E invalid */);
-
-  v = V("tuee");
-  EXPECT_FALSE(v.first);
-  EXPECT_EQ(v.second.second, 2 /* found u instead of r */);
-
-  v = V("truee");
-  EXPECT_FALSE(v.first);
-  EXPECT_EQ(v.second.second, 5 /* extra e */);
-
-  v = V("False");
-  EXPECT_FALSE(v.first);
-  EXPECT_EQ(v.second.second, 1 /* false is case sensitive. */);
-
-  v = V("fals");
-  EXPECT_FALSE(v.first);
-  EXPECT_EQ(v.second.second, 4 /* e missing */);
-
-  v = V("falsE");
-  EXPECT_FALSE(v.first);
-  EXPECT_EQ(v.second.second, 5 /* uppercase E invalid */);
-
-  v = V("faIse");
-  EXPECT_FALSE(v.first);
-  EXPECT_EQ(v.second.second, 3 /* found I instead of l */);
-
-  v = V("falsee");
-  EXPECT_FALSE(v.first);
-  EXPECT_EQ(v.second.second, 6 /* extra e */);
-
-  v = V("Null");
-  EXPECT_FALSE(v.first);
-  EXPECT_EQ(v.second.second, 1 /* null is case sensitive */);
-
-  v = V("nuIl");
-  EXPECT_FALSE(v.first);
-  EXPECT_EQ(v.second.second, 3 /* I instead of l */);
-
-  v = V("nul");
-  EXPECT_FALSE(v.first);
-  EXPECT_EQ(v.second.second, 3 /* second l missing */);
-
-  v = V("nil");
-  EXPECT_FALSE(v.first);
-  EXPECT_EQ(v.second.second, 2 /* nil is not a keyword */);
-
-  v = V("nulls");
-  EXPECT_FALSE(v.first);
-  EXPECT_EQ(v.second.second, 5 /* extra 's char is invalid */);
-
-  // 0 prefix number are invalid. But -0 is valid. +0 is not.
-  EXPECT_FALSE(V("01234").first);
-  EXPECT_TRUE(V("-0").first);
-  EXPECT_FALSE(V("+0").first);
-  EXPECT_FALSE(V("00000").first);
-
-  v = V("1.234.55");
-  EXPECT_FALSE(v.first);
-  EXPECT_EQ(v.second.second, 6);
-
-  v = V("1.23e+e34");
-  EXPECT_FALSE(v.first);
-  EXPECT_EQ(v.second.second, 7 /* two e */);
-
-  v = V("123e4");
-  EXPECT_FALSE(v.first);
-  EXPECT_EQ(v.second.second, 4 /* e not allowed here */);
-
-  v = V("123.e+4");
-  EXPECT_FALSE(v.first);
-  EXPECT_EQ(v.second.second, 5 /* e not allowed immediately after period */);
-
-  v = V("123.3e");
-  EXPECT_FALSE(v.first);
-  EXPECT_EQ(v.second.second, 6 /* degree after e missing */);
-
-  v = V("1.30e+-3");
-  EXPECT_FALSE(v.first);
-  EXPECT_EQ(v.second.second, 7 /* either - or + after e */);
-
-  v = V("123.e+4");
-  EXPECT_FALSE(v.first);
-  EXPECT_EQ(v.second.second, 5 /* e not allowed immediately after period */);
-
-  v = V("0.4f");
-  EXPECT_FALSE(v.first);
-  EXPECT_EQ(v.second.second, 4 /* floating point notation not allowed. */);
-
-  v = V("[1, 2.2, 300, -0, 1000000, 1.34e+10, 033, 0.10, -1000, -0.3, -10.33");
-  EXPECT_FALSE(v.first);
-  EXPECT_EQ(v.second.second, 39 /* Invalid number 033 */);
-
-  // Arrays.
-  // Not closed.
-  v = V("[1,2,3");
-  EXPECT_FALSE(v.first);
-  EXPECT_EQ(v.second.second, 6);
-  // Nested not closed.
-  v = V("[1, 2, [3, 4, [5, \"a\"], true], null, 1.2,");
-  EXPECT_FALSE(v.first);
-  EXPECT_EQ(v.second.second, 41);
-
-  // Closed with wrong bracket.
-  v = V("[1,2,3}");
-  EXPECT_FALSE(v.first);
-  EXPECT_EQ(v.second.second, 7);
-
-  v = V("[,]");
-  EXPECT_FALSE(v.first);
-  EXPECT_EQ(v.second.second, 2);
-
-  v = V("[,1,2,3]");
-  EXPECT_FALSE(v.first);
-  EXPECT_EQ(v.second.second, 2 /* first comma before item */);
-  EXPECT_TRUE(V("[1,2,3]").first);  // Fixed previous error.
-
-  // Objects.
-  v = V("{3: 4}");
-  EXPECT_FALSE(v.first);
-  EXPECT_EQ(v.second.second, 2 /* Only string keys in double quotes allwoed */);
-
-  v = V("{'a': 4}");
-  EXPECT_FALSE(v.first);
-  EXPECT_EQ(v.second.second, 2 /* Only string keys in double quotes allwoed */);
-
-  v = V("{\"a\": tru}");
-  EXPECT_FALSE(v.first);
-  EXPECT_EQ(v.second.second, 10 /* invalid true literal, missing e */);
-
-  // Closed wrongly.
-  v = V("{\"a\": 3]");
-  EXPECT_FALSE(v.first);
-  EXPECT_EQ(v.second.second, 8);
-
-  // Empty objects OK.
-  EXPECT_TRUE(V("{}").first);
-
-  // Empty objects with no key/value not ok.
-  EXPECT_FALSE(V("{,}").first);
-  EXPECT_FALSE(V("{:}").first);
-
-  // No value of an item not ok.
-  EXPECT_FALSE(V("{\"a\":}").first);
-}
-
-TEST(ParserTest, LargeObjects) {
-  std::string_view json = R"JSON({
-  "states":[
-  {"state":{"state_id":"AN","state_name":"Andaman and Nicobar Island (UT)"}},
-  {"state":{"state_id":"AP","state_name":"Andhra Pradesh"}},
-  {"state":{"state_id":"AR","state_name":"Arunachal Pradesh"}},
-  {"state":{"state_id":"AS","state_name":"Assam"}},
-  {"state":{"state_id":"BR","state_name":"Bihar"}},
-  {"state":{"state_id":"CH","state_name":"Chandigarh (UT)"}
-  },{"state":{"state_id":"CG","state_name":"Chhattisgarh"}},
-  {"state":{"state_id":"DN","state_name":"Dadra and Nagar Haveli (UT)"}},
-  {"state":{"state_id":"DD","state_name":"Daman and Diu (UT)"}},
-  {"state":{"state_id":"DL","state_name":"Delhi (NCT)"}},
-  {"state":{"state_id":"GA","state_name":"Goa"}},
-  {"state":{"state_id":"GJ","state_name":"Gujarat"}},
-  {"state":{"state_id":"HR","state_name":"Haryana"}},
-  {"state":{"state_id":"HP","state_name":"Himachal Pradesh"}},
-  {"state":{"state_id":"JK","state_name":"Jammu and Kashmir"}},
-  {"state":{"state_id":"JH","state_name":"Jharkhand"}},
-  {"state":{"state_id":"KA","state_name":"Karnataka"}},
-  {"state":{"state_id":"KL","state_name":"Kerala"}},
-  {"state":{"state_id":"LD","state_name":"Lakshadweep (UT)"}},
-  {"state":{"state_id":"MP","state_name":"Madhya Pradesh"}},
-  {"state":{"state_id":"MH","state_name":"Maharashtra"}},
-  {"state":{"state_id":"MN","state_name":"Manipur"}},
-  {"state":{"state_id":"ML","state_name":"Meghalaya"}},
-  {"state":{"state_id":"MZ","state_name":"Mizoram"}},
-  {"state":{"state_id":"NL","state_name":"Nagaland"}},
-  {"state":{"state_id":"OR","state_name":"Odisha"}},
-  {"state":{"state_id":"PY","state_name":"Puducherry (UT)"}},
-  {"state":{"state_id":"PB","state_name":"Punjab"}},
-  {"state":{"state_id":"RJ","state_name":"Rajasthan"}},
-  {"state":{"state_id":"SK","state_name":"Sikkim"}},
-  {"state":{"state_id":"TN","state_name":"Tamil Nadu"}},
-  {"state":{"state_id":"TG","state_name":"Telangana"}},
-  {"state":{"state_id":"TR","state_name":"Tripura"}},
-  {"state":{"state_id":"UK","state_name":"Uttarakhand"}},
-  {"state":{"state_id":"UP","state_name":"Uttar Pradesh"}},
-  {"state":{"state_id":"WB","state_name":"West Bengal"}}]})JSON";
-  EXPECT_TRUE(V(json).first);
-}
-
-TEST(ParserTest, TrailingComma) {
-  auto v = V("{\"vars\": {\"account\": 7436 },\"extraUrlParams\": {\"int\": "
-             "\"%%interest%%\"},}");
-  EXPECT_FALSE(v.first);  // Trailing comma in object declaration.
-
-  v = V("{\"vars\": {\"account\": 7436 },\"extraUrlParams\": {\"int\": "
-        "\"%%interest%%\"}}");
-  EXPECT_TRUE(v.first);  // Trailing comma fixed.
-
-  v = V("[1,2,3,]");
-  EXPECT_FALSE(v.first);  // Trailing comma in array declaration.
-  EXPECT_EQ(v.second.second, 8);
-  v = V("[1,2,\"hello\",]");
-  EXPECT_FALSE(v.first);  // Trailing comma in array declaration.
-  v = V("[1,2,true,]");
-  EXPECT_FALSE(v.first);  // Trailing comma in array declaration.
-  v = V("[1,2,false,]");
-  EXPECT_FALSE(v.first);  // Trailing comma in array declaration.
-
-  v = V("[1,2,3]");      // Trailing comma fixed.
-  EXPECT_TRUE(v.first);  // Trailing comma fixed.
-  v = V("[1,2,\"hello\"]");
-  EXPECT_TRUE(v.first);  // Trailing comma fixed.
-  v = V("[1,2,true]");
-  EXPECT_TRUE(v.first);  // Trailing comma fixed.
-  v = V("[1,2,false]");
-  EXPECT_TRUE(v.first);  // Trailing comma fixed.
-}
-
-}  // namespace htmlparser::json
diff --git a/validator/cpp/htmlparser/json/states.h b/validator/cpp/htmlparser/json/states.h
deleted file mode 100644
index ab85ba27f6ad..000000000000
--- a/validator/cpp/htmlparser/json/states.h
+++ /dev/null
@@ -1,412 +0,0 @@
-// -*- C++ -*-
-
-// AUTO GENERATED; DO NOT EDIT.
-// To regenerate this file, see comments in bin/statestablegen
-
-#ifndef HTMLPARSER__JSON_STATES_H_
-#define HTMLPARSER__JSON_STATES_H_
-
-#include <array>
-
-namespace htmlparser::json {
-
-enum class StateCode {
-  $ = 0,
-  ARRAY_END = 1,
-  ARRAY_FIRST_ITEM = 2,
-  ARRAY_NEXT_ITEM = 3,
-  ARRAY_SEPARATOR = 4,
-  FALSE_1 = 5,
-  FALSE_2 = 6,
-  FALSE_3 = 7,
-  FALSE_4 = 8,
-  NULL_1 = 9,
-  NULL_2 = 10,
-  NULL_3 = 11,
-  NUMBER = 12,
-  NUMBER_AFTER_E_DIGIT_NOTATION = 13,
-  NUMBER_AFTER_E_NOTATION = 14,
-  NUMBER_AFTER_HYPHEN = 15,
-  NUMBER_AFTER_PERIOD = 16,
-  NUMBER_AFTER_PERIOD_DIGIT = 17,
-  NUMBER_AFTER_PLUS_MINUS_AFTER_E_NOTATION = 18,
-  NUMBER_AFTER_ZERO = 19,
-  OBJECT = 20,
-  OBJECT_END = 21,
-  OBJECT_KEY = 22,
-  OBJECT_KEY_BEGIN_QUOTE = 23,
-  OBJECT_SEPARATOR = 24,
-  OBJECT_VALUE = 25,
-  STRING = 26,
-  STRING_ESCAPE = 27,
-  TRUE_1 = 28,
-  TRUE_2 = 29,
-  TRUE_3 = 30,
-  UNICODE_HEX_CHAR_FIRST = 31,
-  UNICODE_HEX_CHAR_LAST = 32,
-  UNICODE_HEX_CHAR_SECOND = 33,
-  UNICODE_HEX_CHAR_THIRD = 34,
-};
-
-enum class CallbackCode {
-  // TODO: Implement callbacks.
-};
-
-
-// Extracts CallbackCode from the bytes.
-inline static uint8_t ToCallbackCode(uint32_t code);
-
-// Extracts push StateCode from the bytes.
-inline static uint8_t ToPushStateCode(uint32_t code);
-
-// Extracts active State code from the bytes.
-inline static uint8_t ToCurrentStateCode(uint32_t code);
-
-// Returns code for current token and active state.
-inline static uint32_t CodeForToken(unsigned char c, uint8_t state);
-
-// Checks the push bit is on.
-inline static bool HasPushBit(uint32_t code);
-
-// Checks the push bit is off.
-inline static bool HasPopBit(uint32_t code);
-
-constexpr std::array<int, 127> kTokenIndexes {
-    44, 44, 44, 44, 44, 44, 44, 44,
-    44, 0, 1, 44, 44, 2, 44, 44,
-    44, 44, 44, 44, 44, 44, 44, 44,
-    44, 44, 44, 44, 44, 44, 44, 44,
-    3, 44, 4, 44, 44, 44, 44, 44,
-    44, 44, 44, 5, 6, 7, 8, 9,
-    10, 11, 12, 13, 14, 15, 16, 17,
-    18, 19, 20, 44, 44, 44, 44, 44,
-    44, 21, 22, 23, 24, 25, 26, 44,
-    44, 44, 44, 44, 44, 44, 44, 44,
-    44, 44, 44, 44, 44, 44, 44, 44,
-    44, 44, 44, 27, 28, 29, 44, 44,
-    44, 30, 31, 32, 33, 34, 35, 44,
-    44, 44, 44, 44, 36, 44, 37, 44,
-    44, 44, 38, 39, 40, 41, 44, 44,
-    44, 44, 44, 42, 44, 43, 44, };
-
-constexpr std::array<std::array<uint32_t, 46>, 35> kParseStates {{
-    // $
-    // Code: 0
-    {0x0, 0x0, 0x0, 0x0, 0x1a00, 0xff, 0xff, 0xf00,
-     0xff, 0xff, 0x1300, 0xc00, 0xc00, 0xc00, 0xc00, 0xc00,
-     0xc00, 0xc00, 0xc00, 0xc00, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0x200, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0x500, 0xff, 0x900, 0xff, 0xff,
-     0x1c00, 0xff, 0x1400, 0xff, 0xff, 0xff},
-    // ARRAY_END
-    // Code: 1
-    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0x40, 0x40},
-    // ARRAY_FIRST_ITEM
-    // Code: 2
-    {0x200, 0x200, 0x200, 0x200, 0x41a80, 0xff, 0xff, 0x40f80,
-     0xff, 0xff, 0x41380, 0x40c80, 0x40c80, 0x40c80, 0x40c80, 0x40c80,
-     0x40c80, 0x40c80, 0x40c80, 0x40c80, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0x40280, 0xff, 0x40, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0x40580, 0xff, 0x40980, 0xff, 0xff,
-     0x41c80, 0xff, 0x41480, 0xff, 0xff, 0xff},
-    // ARRAY_NEXT_ITEM
-    // Code: 3
-    {0x300, 0x300, 0x300, 0x300, 0x41a80, 0xff, 0xff, 0x40f80,
-     0xff, 0xff, 0x41380, 0x40c80, 0x40c80, 0x40c80, 0x40c80, 0x40c80,
-     0x40c80, 0x40c80, 0x40c80, 0x40c80, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0x40280, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0x40580, 0xff, 0x40980, 0xff, 0xff,
-     0x41c80, 0xff, 0x41480, 0xff, 0xff, 0xff},
-    // ARRAY_SEPARATOR
-    // Code: 4
-    {0x400, 0x400, 0x400, 0x400, 0xff, 0xff, 0x300, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0x100, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-    // FALSE_1
-    // Code: 5
-    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x600, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-    // FALSE_2
-    // Code: 6
-    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0x700, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-    // FALSE_3
-    // Code: 7
-    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x800,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-    // FALSE_4
-    // Code: 8
-    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0x40, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-    // NULL_1
-    // Code: 9
-    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xa00, 0xff, 0xff, 0xff, 0xff},
-    // NULL_2
-    // Code: 10
-    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xb00, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-    // NULL_3
-    // Code: 11
-    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0x40, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-    // NUMBER
-    // Code: 12
-    {0x40, 0x40, 0x40, 0x40, 0xff, 0xff, 0x40, 0xff,
-     0x1000, 0xff, 0xc00, 0xc00, 0xc00, 0xc00, 0xc00, 0xc00,
-     0xc00, 0xc00, 0xc00, 0xc00, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0x40, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0x40, 0xff, 0xff},
-    // NUMBER_AFTER_E_DIGIT_NOTATION
-    // Code: 13
-    {0x40, 0x40, 0x40, 0x40, 0xff, 0xff, 0x40, 0xff,
-     0xff, 0xff, 0xd00, 0xd00, 0xd00, 0xd00, 0xd00, 0xd00,
-     0xd00, 0xd00, 0xd00, 0xd00, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0x40, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0x40, 0xff, 0xff},
-    // NUMBER_AFTER_E_NOTATION
-    // Code: 14
-    {0xff, 0xff, 0xff, 0xff, 0xff, 0x1200, 0xff, 0x1200,
-     0xff, 0xff, 0xd00, 0xd00, 0xd00, 0xd00, 0xd00, 0xd00,
-     0xd00, 0xd00, 0xd00, 0xd00, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-    // NUMBER_AFTER_HYPHEN
-    // Code: 15
-    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0x1300, 0xc00, 0xc00, 0xc00, 0xc00, 0xc00,
-     0xc00, 0xc00, 0xc00, 0xc00, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-    // NUMBER_AFTER_PERIOD
-    // Code: 16
-    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0x1100, 0x1100, 0x1100, 0x1100, 0x1100, 0x1100,
-     0x1100, 0x1100, 0x1100, 0x1100, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-    // NUMBER_AFTER_PERIOD_DIGIT
-    // Code: 17
-    {0x40, 0x40, 0x40, 0x40, 0xff, 0xff, 0x40, 0xff,
-     0xff, 0xff, 0x1100, 0x1100, 0x1100, 0x1100, 0x1100, 0x1100,
-     0x1100, 0x1100, 0x1100, 0x1100, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xe00, 0xff, 0xff, 0xff, 0x40, 0xff, 0xff,
-     0xff, 0xff, 0xe00, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0x40, 0xff, 0xff},
-    // NUMBER_AFTER_PLUS_MINUS_AFTER_E_NOTATION
-    // Code: 18
-    {0x40, 0x40, 0x40, 0x40, 0xff, 0xff, 0x40, 0xff,
-     0xff, 0xff, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200,
-     0x1200, 0x1200, 0x1200, 0x1200, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0x40, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0x40, 0xff, 0xff},
-    // NUMBER_AFTER_ZERO
-    // Code: 19
-    {0x40, 0x40, 0x40, 0x40, 0xff, 0xff, 0x40, 0xff,
-     0x1000, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xe00, 0xff, 0xff, 0xff, 0x40, 0xff, 0xff,
-     0xff, 0xff, 0xe00, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0x40, 0xff, 0xff},
-    // OBJECT
-    // Code: 20
-    {0x1400, 0x1400, 0x1400, 0x1400, 0x161a80, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0x1500, 0xff, 0xff},
-    // OBJECT_END
-    // Code: 21
-    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0x40, 0x40},
-    // OBJECT_KEY
-    // Code: 22
-    {0x1600, 0x1600, 0x1600, 0x1600, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0x1900, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-    // OBJECT_KEY_BEGIN_QUOTE
-    // Code: 23
-    {0x1700, 0x1700, 0x1700, 0x1700, 0x161a80, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-    // OBJECT_SEPARATOR
-    // Code: 24
-    {0x1800, 0x1800, 0x1800, 0x1800, 0xff, 0xff, 0x1700, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0x1500, 0xff, 0xff},
-    // OBJECT_VALUE
-    // Code: 25
-    {0x1900, 0x1900, 0x1900, 0x1900, 0x181a80, 0xff, 0xff, 0x180f80,
-     0xff, 0xff, 0x181380, 0x180c80, 0x180c80, 0x180c80, 0x180c80, 0x180c80,
-     0x180c80, 0x180c80, 0x180c80, 0x180c80, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0x180280, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0x180580, 0xff, 0x180980, 0xff, 0xff,
-     0x181c80, 0xff, 0x181480, 0xff, 0xff, 0xff},
-    // STRING
-    // Code: 26
-    {0xff, 0xff, 0xff, 0xff, 0x40, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0x1b00, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0x1a00, 0x1a00},
-    // STRING_ESCAPE
-    // Code: 27
-    {0xff, 0xff, 0xff, 0xff, 0x1a00, 0xff, 0xff, 0xff,
-     0xff, 0x1a00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0x1a00, 0xff, 0xff, 0x1a00,
-     0xff, 0xff, 0xff, 0x1a00, 0xff, 0x1a00, 0x1a00, 0xff,
-     0x1a00, 0x1f00, 0xff, 0xff, 0xff, 0xff},
-    // TRUE_1
-    // Code: 28
-    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1d00, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-    // TRUE_2
-    // Code: 29
-    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0x1e00, 0xff, 0xff, 0xff, 0xff},
-    // TRUE_3
-    // Code: 30
-    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0x40, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-    // UNICODE_HEX_CHAR_FIRST
-    // Code: 31
-    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100, 0x2100,
-     0x2100, 0x2100, 0x2100, 0x2100, 0xff, 0x2100, 0x2100, 0x2100,
-     0x2100, 0x2100, 0x2100, 0xff, 0xff, 0xff, 0x2100, 0x2100,
-     0x2100, 0x2100, 0x2100, 0x2100, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-    // UNICODE_HEX_CHAR_LAST
-    // Code: 32
-    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0x1a00, 0x1a00, 0x1a00, 0x1a00, 0x1a00, 0x1a00,
-     0x1a00, 0x1a00, 0x1a00, 0x1a00, 0xff, 0x1a00, 0x1a00, 0x1a00,
-     0x1a00, 0x1a00, 0x1a00, 0xff, 0xff, 0xff, 0x1a00, 0x1a00,
-     0x1a00, 0x1a00, 0x1a00, 0x1a00, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-    // UNICODE_HEX_CHAR_SECOND
-    // Code: 33
-    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0x2200, 0x2200, 0x2200, 0x2200, 0x2200, 0x2200,
-     0x2200, 0x2200, 0x2200, 0x2200, 0xff, 0x2200, 0x2200, 0x2200,
-     0x2200, 0x2200, 0x2200, 0xff, 0xff, 0xff, 0x2200, 0x2200,
-     0x2200, 0x2200, 0x2200, 0x2200, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-    // UNICODE_HEX_CHAR_THIRD
-    // Code: 34
-    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0x2000, 0x2000, 0x2000, 0x2000, 0x2000, 0x2000,
-     0x2000, 0x2000, 0x2000, 0x2000, 0xff, 0x2000, 0x2000, 0x2000,
-     0x2000, 0x2000, 0x2000, 0xff, 0xff, 0xff, 0x2000, 0x2000,
-     0x2000, 0x2000, 0x2000, 0x2000, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-}};
-
-
-inline static uint8_t ToCallbackCode(uint32_t code) {
-  // 4th byte.
-  return static_cast<uint8_t>(code >> 24);
-}
-
-inline static uint8_t ToPushStateCode(uint32_t code) {
-  // 3rd byte.
-  return static_cast<uint8_t>((code & 0x00ff0000) >> 16);
-}
-
-inline static uint8_t ToCurrentStateCode(uint32_t code) {
-  // 2nd byte.
-  return static_cast<uint8_t>((code & 0x0000ff00) >> 8);
-}
-
-inline static bool HasPushBit(uint32_t code) {
-  // 6th bit in first byte.
-  return ((code & 0x80) >> 7) == 1;
-}
-
-inline static bool HasPopBit(uint32_t code) {
-  // 7th bit in first byte.
-  return ((code & 0x40) >> 6) == 1;
-}
-
-inline static uint32_t CodeForToken(unsigned char c, uint8_t state) {
-  if (c > 127) {
-    return kParseStates[state][44];
-  }
-  int index = kTokenIndexes[c];
-  if (index == -1) index = 45;
-  return kParseStates[state][index];
-}
-
-}  // namespace htmlparser::json
-
-#endif  // HTMLPARSER__JSON_STATES_H_
diff --git a/validator/cpp/htmlparser/json/types.cc b/validator/cpp/htmlparser/json/types.cc
index 755ffbba49b8..9500a17df7e6 100644
--- a/validator/cpp/htmlparser/json/types.cc
+++ b/validator/cpp/htmlparser/json/types.cc
@@ -1,104 +1,59 @@
-#include "json/types.h"
+#include "cpp/htmlparser/json/types.h"
 
 #include <array>
 
 namespace htmlparser::json {
 
-constexpr std::array<std::string_view, 35> kIndentSpaces {
-  "",
-  " ",
-  "  ",
-  "   ",
-  "    ",
-  "     ",
-  "      ",
-  "       ",
-  "        ",
-  "         ",
-  "          ",
-  "           ",
-  "            ",
-  "             ",
-  "              ",
-  "               ",
-  "                ",
-  "                 ",
-  "                  ",
-  "                   ",
-  "                    ",
-  "                     ",
-  "                      ",
-  "                       ",
-  "                        ",
-  "                         ",
-  "                          ",
-  "                           ",
-  "                            ",
-  "                             ",
-  "                              ",
-  "                               ",
-  "                                ",
-  "                                 ",
-  "                                  "};
-
 const int64_t MAX_SAFE_INTEGER = 1LL << 53;  // 2 ^^ 53.
 
-void AddIndentation(std::stringbuf* buf, int indent_columns) {
-  if (indent_columns > 35) indent_columns = 35;
-  if (indent_columns > 0) {
-    buf->sputn(kIndentSpaces[indent_columns].data(), indent_columns);
-  }
-}
-
-std::string NullValue::ToString(int indent_columns) const {
+std::string JsonNull::ToString() const {
   std::stringbuf buf;
-  ToString(&buf, indent_columns);
+  ToString(&buf);
   return buf.str();
 }
 
-void NullValue::ToString(std::stringbuf* buf, int indent_columns) const {
-  AddIndentation(buf, indent_columns);
+void JsonNull::ToString(std::stringbuf* buf) const {
   buf->sputn("null", 4);
 }
 
-std::string JsonDict::ToString(int indent_columns) const {
+std::string JsonDict::ToString() const {
   std::stringbuf buf;
-  ToString(&buf, indent_columns);
+  ToString(&buf);
   return buf.str();
 }
 
-void JsonDict::ToString(std::stringbuf* buf, int indent_columns) const {
+JsonObject* JsonDict::Get(std::string_view key) {
+  for (auto iter = items_.rbegin(); iter != items_.rend(); ++iter) {
+    if (iter->first == key) {
+      return &iter->second;
+    }
+  }
+  return nullptr;
+}
+
+void JsonDict::ToString(std::stringbuf* buf) const {
   bool first = true;
   buf->sputc('{');
-  buf->sputc('\n');
-  for (auto& [k, v] : values_) {
+  for (auto& [k, v] : items_) {
     if (!first) {
       buf->sputc(',');
-      buf->sputc('\n');
     }
-    AddIndentation(buf, indent_columns + 2);
     first = false;
     buf->sputc('"');
     buf->sputn(k.c_str(), k.size());
     buf->sputn("\":", 2);
-    if (!v.Has<JsonArray, JsonDict>()) {
-      v.ToString(buf, 1);
-    } else {
-      v.ToString(buf, indent_columns + 2);
-    }
+    v.ToString(buf);
   }
-  buf->sputc('\n');
-  AddIndentation(buf, indent_columns);
   buf->sputc('}');
 }
 
-std::string JsonArray::ToString(int indent_columns) const {
+std::string JsonArray::ToString() const {
   std::stringbuf buf;
-  ToString(&buf, indent_columns);
+  ToString(&buf);
   return buf.str();
 }
 
-void JsonArray::ToString(std::stringbuf* buf, int indent_columns) const {
+void JsonArray::ToString(std::stringbuf* buf) const {
   if (items_.empty()) {
     buf->sputn("[]", 2);
     return;
@@ -106,23 +61,19 @@ void JsonArray::ToString(std::stringbuf* buf, int indent_columns) const {
 
   bool first = true;
   buf->sputc('[');
-  buf->sputc('\n');
   for (auto& i : items_) {
     if (!first) {
       buf->sputc(',');
-      buf->sputc('\n');
     }
     first = false;
-    i.ToString(buf, indent_columns + 2);
+    i.ToString(buf);
   }
-  buf->sputc('\n');
-  AddIndentation(buf, indent_columns);
   buf->sputc(']');
 }
 
-std::string JsonObject::ToString(int indent_columns) const {
+std::string JsonObject::ToString() const {
   std::stringbuf buf;
-  ToString(&buf, indent_columns);
+  ToString(&buf);
   return buf.str();
 }
 
@@ -138,8 +89,7 @@ struct overloaded : Fs... {
 template <class ...Ts>
 overloaded(Ts&&...) -> overloaded<std::remove_reference_t<Ts>...>;
 
-void JsonObject::ToString(std::stringbuf* buf, int indent_columns) const {
-  AddIndentation(buf, indent_columns);
+void JsonObject::ToString(std::stringbuf* buf) const {
   std::visit(
       overloaded{
           [&](int32_t i) {
@@ -173,19 +123,19 @@ void JsonObject::ToString(std::stringbuf* buf, int indent_columns) const {
             buf->sputn(str.c_str(), str.size());
             buf->sputc('"');
           },
-          [&](NullValue n) { buf->sputn("null", 4); },
-          [&](const JsonArray& a) { a.ToString(buf, indent_columns); },
-          [&](const JsonDict& d) { d.ToString(buf, indent_columns); },
-          [&](const Any<JsonArray>& a) {
-            a.ToString(buf, indent_columns);
-          },
-          [&](const Any<JsonDict>& a) {
-            a.ToString(buf, indent_columns);
-          },
-          [&](const Any<JsonObject>& a) {
-            a.ToString(buf, indent_columns);
+          [&](const std::string_view& str) {
+            buf->sputc('"');
+            buf->sputn(str.data(), str.size());
+            buf->sputc('"');
           },
-      }, v_);
+          [&](JsonNull n) { buf->sputn("null", 4); },
+          [&](const JsonArray& a) { a.ToString(buf); },
+          [&](const JsonDict& d) { d.ToString(buf); },
+          [&](const Any<JsonArray>& a) { a.ToString(buf); },
+          [&](const Any<JsonDict>& a) { a.ToString(buf); },
+          [&](const Any<JsonObject>& a) { a.ToString(buf); },
+      },
+      v_);
 }
 
 }  // namespace htmlparser::json
diff --git a/validator/cpp/htmlparser/json/types.h b/validator/cpp/htmlparser/json/types.h
index 5b4820a445bf..aa54f9a110c4 100644
--- a/validator/cpp/htmlparser/json/types.h
+++ b/validator/cpp/htmlparser/json/types.h
@@ -71,10 +71,11 @@
 //
 // See types_test.cc for detailed usage of generating nested json objects.
 //
-#ifndef HTMLPARSER__JSON_JSON_H_
-#define HTMLPARSER__JSON_JSON_H_
+#ifndef CPP_HTMLPARSER_JSON_TYPES_H_
+#define CPP_HTMLPARSER_JSON_TYPES_H_
 
 #include <functional>
+#include <map>
 #include <memory>
 #include <optional>
 #include <sstream>
@@ -86,25 +87,30 @@ namespace htmlparser::json {
 
 class JsonArray;
 class JsonDict;
-class NullValue;
+class JsonNull;
 class JsonObject;
 
 class JsonDict {
  public:
   template <typename V>
-  void Insert(std::string key, V value) {
-    values_.emplace_back(std::pair<std::string, V>{key, value});
+  void Insert(std::string_view key, V&& value) {
+    items_.emplace_back(std::make_pair(key, std::forward<V>(value)));
   }
 
-  std::size_t size() const { return values_.size(); }
+  template <typename V>
+  void Insert(std::string_view key, const V& value) {
+    items_.emplace_back(std::make_pair(key, value));
+  }
 
-  bool empty() const { return values_.empty(); }
+  std::size_t size() const;
+  bool empty() const { return items_.empty(); }
 
-  std::string ToString(int indent_columns = 0) const;
-  void ToString(std::stringbuf*, int indent_columns = 0) const;
+  std::string ToString() const;
+  void ToString(std::stringbuf* buf) const;
 
   template <typename T>
-  T* Get(const std::string& key);
+  T* Get(std::string_view key);
+  JsonObject* Get(std::string_view key);
 
   // Facilitates range based iterator directly on JsonDict object.
   // for (auto& [k, v] : my_json_dict) {
@@ -112,20 +118,25 @@ class JsonDict {
   // }
   // This only works with auto syntax. Following wont' compile:
   // JsonDict::const_iterator = mydict.begin();
-  auto begin() { return values_.begin(); }
-  auto end() { return values_.end(); }
+  auto begin() { return items_.begin(); }
+  auto end() { return items_.end(); }
   // const_iterator.
-  auto begin() const { return values_.begin(); }
-  auto end() const { return values_.end(); }
+  auto begin() const { return items_.begin(); }
+  auto end() const { return items_.end(); }
 
  private:
-  std::vector<std::pair<std::string, JsonObject>> values_;
+  std::vector<std::pair<std::string, JsonObject>> items_;
 };
 
 class JsonArray {
  public:
   template <typename T>
-  void Append(T i) {
+  void Append(T&& i) {
+    items_.emplace_back(i);
+  }
+
+  template <typename T>
+  void Append(T& i) {
     items_.emplace_back(i);
   }
 
@@ -135,14 +146,19 @@ class JsonArray {
   // [1, 2, 3, 4, "hello", "world", true, true, false];
   template <typename... Ts>
   void Append(Ts&&... items) {
-    int unused[] = {0, (items_.emplace_back(std::forward<Ts>(items)), 0)...};
+    auto unused = {0, (items_.emplace_back(std::forward<Ts>(items)), 0)...};
+  }
+
+  template <typename... Ts>
+  void Append(const Ts&... items) {
+    auto unused = {0, (items_.emplace_back(items), 0)...};
   }
 
-  std::size_t size() const { return items_.size(); }
+  std::size_t size() const;
   bool empty() const { return items_.empty(); }
 
-  std::string ToString(int indent_columns = 0) const;
-  void ToString(std::stringbuf*, int indent_columns = 0) const;
+  std::string ToString() const;
+  void ToString(std::stringbuf*) const;
 
   // Facilitates range based for loop.
   // for (const auto& item : my_json_array) {
@@ -154,14 +170,17 @@ class JsonArray {
   auto begin() const { return items_.begin(); }
   auto end() const { return items_.end(); }
 
+  JsonObject& at(std::size_t i);
+  JsonObject* Last();
+
  private:
   std::vector<JsonObject> items_;
 };
 
-class NullValue {
+class JsonNull {
  public:
-  void ToString(std::stringbuf* buf, int indent_columns = 0) const;
-  std::string ToString(int indent_columns = 0) const;
+  std::string ToString() const;
+  void ToString(std::stringbuf* buf) const;
 };
 
 template <typename JsonType>
@@ -176,16 +195,18 @@ class Any {
   Any(Any&& from) { wrapper_ = std::move(from.wrapper_); }
 
   Any& operator=(const Any& from) {
-    wrapper_ = from.wrapper_->Clone();
+    if (&from != this) {
+      wrapper_ = from.wrapper_->Clone();
+    }
     return *this;
   }
 
-  std::string ToString(int indent_columns = 0) const {
-    return wrapper_->ToJson().ToString(indent_columns);
+  std::string ToString() const {
+    return wrapper_->ToJson().ToString();
   }
 
-  void ToString(std::stringbuf* buf, int indent_columns = 0) const {
-    wrapper_->ToJson().ToString(buf, indent_columns);
+  void ToString(std::stringbuf* buf) const {
+    wrapper_->ToJson().ToString(buf);
   }
 
  private:
@@ -224,12 +245,13 @@ class JsonObject {
   explicit JsonObject(float f) : v_(f) {}
   explicit JsonObject(const char* s) { v_.emplace<std::string>(s); }
   explicit JsonObject(const std::string& s) : v_(s) {}
+  explicit JsonObject(const std::string_view& sv) : v_(sv) {}
   explicit JsonObject(bool b) : v_(b) {}
-  explicit JsonObject(std::nullptr_t n) : v_(NullValue()) {}
-  explicit JsonObject(JsonArray l) : v_(l) {}
-  explicit JsonObject(JsonDict o) : v_(o) {}
-  explicit JsonObject(JsonArray&& l) : v_(std::move(l)) {}
-  explicit JsonObject(JsonDict&& o) : v_(std::move(o)) {}
+  explicit JsonObject(std::nullptr_t n) : v_(JsonNull()) {}
+  explicit JsonObject(JsonArray& a) : v_(a) {}
+  explicit JsonObject(JsonDict& d) : v_(d) {}
+  explicit JsonObject(JsonArray&& a) : v_(std::move(a)) {}
+  explicit JsonObject(JsonDict&& d) : v_(std::move(d)) {}
   explicit JsonObject(Any<JsonArray> a) : v_(a) {}
   explicit JsonObject(Any<JsonDict> a) : v_(a) {}
   explicit JsonObject(Any<JsonObject> j) : v_(j) {}
@@ -242,7 +264,14 @@ class JsonObject {
   JsonObject(const JsonObject& from) { v_ = from.v_; }
 
   JsonObject& operator=(const JsonObject& from) {
-    v_ = from.v_;
+    if (&from != this) {
+      v_ = from.v_;
+    }
+    return *this;
+  }
+
+  JsonObject& operator=(const char* s) {
+    v_ = std::string(s);
     return *this;
   }
 
@@ -262,26 +291,46 @@ class JsonObject {
     return &std::get<T>(v_);
   }
 
+  std::string String() const { return std::get<std::string>(v_); }
+  std::string_view StringView() const { return std::get<std::string_view>(v_); }
+  int64_t Number() const { return std::get<int64_t>(v_); }
+  double Double() const { return std::get<double>(v_); }
+  bool Bool() const { return std::get<bool>(v_); }
+  bool IsNull() const { return std::holds_alternative<JsonNull>(v_); }
+  const JsonArray& Array() const { return std::get<JsonArray>(v_); }
+  const JsonDict& Dict() const { return std::get<JsonDict>(v_); }
+
   template <typename... Types>
-  constexpr bool Has() const {
+  constexpr bool Is() const {
     return (std::holds_alternative<Types>(v_) || ...);
   }
 
-  std::string ToString(int indent_columns = 0) const;
-  void ToString(std::stringbuf* buf, int indent_columns = 0) const;
+  std::string ToString() const;
+  void ToString(std::stringbuf* buf) const;
 
  private:
-  std::variant<bool, int32_t, int64_t, double, float, std::string, NullValue,
-               JsonArray, JsonDict, Any<JsonArray>, Any<JsonDict>,
-               Any<JsonObject>>
+  std::variant<bool, int32_t, int64_t, double, float, std::string,
+               std::string_view, JsonNull, JsonArray, JsonDict, Any<JsonArray>,
+               Any<JsonDict>, Any<JsonObject>>
       v_;
 };
 
+inline std::size_t JsonDict::size() const { return items_.size(); }
+
+inline std::size_t JsonArray::size() const { return items_.size(); }
+
+inline JsonObject& JsonArray::at(std::size_t i) { return items_[i]; }
+
+inline JsonObject* JsonArray::Last() {
+  if (items_.empty()) return nullptr;
+  return &items_.back();
+}
+
 template <typename T>
-T* JsonDict::Get(const std::string& key) {
-  for (auto& [k, v] : values_) {
-    if (k == key) {
-      return v.Get<T>();
+T* JsonDict::Get(std::string_view key) {
+  for (auto iter = items_.rbegin(); iter != items_.rend(); ++iter) {
+    if (iter->first == key) {
+      return iter->second.Get<T>();
     }
   }
   return nullptr;
@@ -289,4 +338,4 @@ T* JsonDict::Get(const std::string& key) {
 
 }  // namespace htmlparser::json
 
-#endif  // HTMLPARSER__JSON_JSON_H_
+#endif  // CPP_HTMLPARSER_JSON_TYPES_H_
diff --git a/validator/cpp/htmlparser/json/types_test.cc b/validator/cpp/htmlparser/json/types_test.cc
index 8459799314a6..9a9862943bc8 100644
--- a/validator/cpp/htmlparser/json/types_test.cc
+++ b/validator/cpp/htmlparser/json/types_test.cc
@@ -1,4 +1,4 @@
-#include "json/types.h"
+#include "cpp/htmlparser/json/types.h"
 
 #include <cmath>
 #include <type_traits>
@@ -74,44 +74,8 @@ TEST(TypesTest, BasicAllTypesTest) {
   json.Insert("employed", false);
   json.Insert("married", true);
 
-  EXPECT_EQ(
-      R"({
-  "name": "John",
-  "age": 18,
-  "friends":  [
-    "Alice",
-    "Bob"
-  ],
-  "address":  [
-    123,
-    "foo street",
-    "3rd floor",
-    "New york",
-    91234,
-    true,
-    null,
-    false
-  ],
-  "devices":  {
-    "phone": "android",
-    "laptop": "macbook",
-    "camera": null,
-    "music":    [
-      "spotify",
-      "youtube",
-      "apple"
-    ],
-    "sdcards":    [
-      64,
-      128,
-      256.250000,
-      255
-    ]
-  },
-  "gender": "male",
-  "employed": false,
-  "married": true
-})", json.ToString());
+  EXPECT_EQ(R"({"name":"John","age":18,"friends":["Alice","Bob"],"address":[123,"foo street","3rd floor","New york",91234,true,null,false],"devices":{"phone":"android","laptop":"macbook","camera":null,"music":["spotify","youtube","apple"],"sdcards":[64,128,256.250000,255]},"gender":"male","employed":false,"married":true})",
+            json.ToString());
 }
 
 TEST(TypesTest, SingleValue) {
@@ -137,25 +101,13 @@ TEST(TypesTest, SingleValue) {
   EXPECT_EQ(jarr.ToString(), "[]");
   // Bulk append.
   jarr.Append(1, 2, 3, 1.200000, 2.200000, 3.300000, "hello", "world");
-  EXPECT_EQ(jarr.ToString(),
-            R"([
-  1,
-  2,
-  3,
-  1.200000,
-  2.200000,
-  3.300000,
-  "hello",
-  "world"
-])");
+  EXPECT_EQ("[1,2,3,1.200000,2.200000,3.300000,\"hello\",\"world\"]",
+            jarr.ToString());
 
   JsonDict keyval;
-  EXPECT_EQ(keyval.ToString(), "{\n\n}");
+  EXPECT_EQ(keyval.ToString(), "{}");
   keyval.Insert("foo", "bar");
-  EXPECT_EQ(keyval.ToString(),
-            R"({
-  "foo": "bar"
-})");
+  EXPECT_EQ("{\"foo\":\"bar\"}", keyval.ToString());
 }
 
 TEST(TypesTest, GetAndAssignmentOperatorTest) {
@@ -167,6 +119,10 @@ TEST(TypesTest, GetAndAssignmentOperatorTest) {
   // int_value is now string.
   int_value = "Hello World!";
   EXPECT_EQ("Hello World!", *int_value.Get<std::string>());
+  std::string_view str = "Foo Bar";
+  str.remove_prefix(1);
+  int_value = str;
+  EXPECT_EQ("oo Bar", *int_value.Get<std::string_view>());
 }
 
 TEST(TypesTest, OverflowIntegerTest) {
@@ -234,9 +190,7 @@ TEST(TypesTest, AnyObjectTest) {
     return dict;
   };
   Any<JsonDict> any(&greet, serializer1);
-  EXPECT_EQ(any.ToString(), R"({
-  "greeting": "Hello World!"
-})");
+  EXPECT_EQ("{\"greeting\":\"Hello World!\"}", any.ToString());
 
   // Output as JsonObject.
   std::function<JsonObject(const Greeting&)> serializer2 = [](
@@ -246,9 +200,7 @@ TEST(TypesTest, AnyObjectTest) {
     return JsonObject(dict);
   };
   Any<JsonObject> any2(&greet, serializer2);
-  EXPECT_EQ(any2.ToString(), R"({
-  "greeting": "Hello World!"
-})");
+  EXPECT_EQ("{\"greeting\":\"Hello World!\"}", any2.ToString());
 
   // Output as json array.
   LottoDrawing drawing{.n1 = 18, .n2 = 33, .n3 = 36, .n4 = 45, .n5 = 50,
@@ -261,14 +213,7 @@ TEST(TypesTest, AnyObjectTest) {
     return jarray;
   };
   Any<JsonArray> any3(&drawing, serializer3);
-  EXPECT_EQ(any3.ToString(), R"([
-  18,
-  33,
-  36,
-  45,
-  50,
-  10
-])");
+  EXPECT_EQ("[18,33,36,45,50,10]", any3.ToString());
 
   // Output as int.
   Age age{.age = 18};
@@ -308,20 +253,8 @@ TEST(TypesTest, AnyObjectTest) {
     return JsonObject(dict);
   };
   Any<JsonObject> any6(&nested, serializer6);
-  EXPECT_EQ(any6.ToString(),
-            R"({
-  "name": "John Doe",
-  "age": 18,
-  "greeting": "Hello World!",
-  "drawing":  [
-    18,
-    33,
-    36,
-    45,
-    50,
-    10
-  ]
-})");
+  EXPECT_EQ(R"({"name":"John Doe","age":18,"greeting":"Hello World!","drawing":[18,33,36,45,50,10]})",
+            any6.ToString());
 }
 
 TEST(TypesTest, JsonDictTypedGetter) {
@@ -345,23 +278,10 @@ TEST(TypesTest, ImmutablityTest) {
   array.Append(1, 2, 3);
   json.Insert("array", array);
   EXPECT_EQ(json.Get<JsonArray>("array")->size(), 3);
-  EXPECT_EQ(json.Get<JsonArray>("array")->ToString(),
-            R"([
-  1,
-  2,
-  3
-])");
+  EXPECT_EQ("[1,2,3]", json.Get<JsonArray>("array")->ToString());
   json.Get<JsonArray>("array")->Append(4, 5, 6);
   EXPECT_EQ(json.Get<JsonArray>("array")->size(), 6);
-  EXPECT_EQ(json.Get<JsonArray>("array")->ToString(),
-            R"([
-  1,
-  2,
-  3,
-  4,
-  5,
-  6
-])");
+  EXPECT_EQ("[1,2,3,4,5,6]", json.Get<JsonArray>("array")->ToString());
 }
 
 TEST(TypesTest, ArrayAppendTest) {
diff --git a/validator/cpp/htmlparser/logging.h b/validator/cpp/htmlparser/logging.h
index d743b38a68bc..08e33cfd29fc 100644
--- a/validator/cpp/htmlparser/logging.h
+++ b/validator/cpp/htmlparser/logging.h
@@ -1,19 +1,9 @@
 // Defines various logging macros. This is temporary and will be replaced by a
 // stable logging library.
 
-#ifndef HTMLPARSER__LOGGING_H_
-#define HTMLPARSER__LOGGING_H_
+#ifndef CPP_HTMLPARSER_LOGGING_H_
+#define CPP_HTMLPARSER_LOGGING_H_
 
-#include <cstdlib>
-#include <iostream>
+#include "cpp/htmlparser/glog_polyfill.h"
 
-#define CHECK(condition, message)                                        \
-  do {                                                                   \
-    if (!(condition)) {                                                  \
-      std::cerr << "CHECK(`" #condition "`) failed in " << __FILE__      \
-                << " line " << __LINE__ << ": " << message << std::endl; \
-      abort();                                                           \
-    }                                                                    \
-  } while (false)
-
-#endif  // HTMLPARSER__LOGGING_H_
+#endif  // CPP_HTMLPARSER_LOGGING_H_
diff --git a/validator/cpp/htmlparser/node.cc b/validator/cpp/htmlparser/node.cc
index 44591e9fae01..d7441a7a0c5b 100644
--- a/validator/cpp/htmlparser/node.cc
+++ b/validator/cpp/htmlparser/node.cc
@@ -1,12 +1,14 @@
-#include "node.h"
+#include "cpp/htmlparser/node.h"
 
 #include <algorithm>
 #include <functional>
 #include <sstream>
 
-#include "atomutil.h"
-#include "elements.h"
-#include "logging.h"
+#include "absl/strings/str_join.h"
+#include "absl/strings/string_view.h"
+#include "cpp/htmlparser/atomutil.h"
+#include "cpp/htmlparser/elements.h"
+#include "cpp/htmlparser/logging.h"
 
 namespace htmlparser {
 
@@ -22,7 +24,7 @@ void Node::AddAttribute(const Attribute& attr) {
 }
 
 void Node::SortAttributes(bool remove_duplicates) {
-  std::sort(attributes_.begin(), attributes_.end(),
+  std::stable_sort(attributes_.begin(), attributes_.end(),
             [](const Attribute& left, const Attribute& right) -> bool {
               return left.KeyPart() < right.KeyPart();
             });
@@ -103,8 +105,8 @@ bool Node::InsertBefore(Node* new_child, Node* old_child) {
 
 bool Node::AppendChild(Node* new_child) {
   CHECK(!(new_child->Parent() || new_child->PrevSibling() ||
-          new_child->NextSibling()),
-        "html: AppendChild called for an attached child Node.");
+          new_child->NextSibling()))
+      << "html: AppendChild called for an attached child Node.";
 
   Node* last = LastChild();
   if (last) {
@@ -121,7 +123,7 @@ bool Node::AppendChild(Node* new_child) {
 
 Node* Node::RemoveChild(Node* c) {
   // Remove child called for a non-child node.
-  CHECK(c->parent_ == this, "html: RemoveChild called for a non-child Node");
+  CHECK(c->parent_ == this) << "html: RemoveChild called for a non-child Node";
 
   if (first_child_ == c) {
     first_child_ = c->next_sibling_;
@@ -375,35 +377,33 @@ bool Node::IsBlockElementNode() {
 }
 
 std::string Node::InnerText() const {
-  static std::function<void(const Node*, std::string*)> output;
-  output = [](const Node* node, std::string* buf) {
-    switch (node->Type()) {
-      case NodeType::TEXT_NODE: {
-        buf->append(node->Data());
-        buf->append(" ");
-        return;
-      }
-      case NodeType::COMMENT_NODE: {
-        // Ignore comments.
-        return;
-      }
-      default:
-        break;
-    }
-
-    for (Node* child = node->FirstChild(); child;
-         child = child->NextSibling()) {
-      output(child, buf);
-    }
-  };
-
-  std::string buffer;
-  output(this, &buffer);
-
-  if (!buffer.empty() && buffer.at(buffer.size() - 1) == ' ') {
-    buffer.erase(buffer.size() - 1);
-  }
-  return buffer;
+  static std::function<void(const Node*, std::vector<absl::string_view>&)>
+      output =
+          [](const Node* node, std::vector<absl::string_view>& output_content) {
+            switch (node->Type()) {
+              case NodeType::TEXT_NODE: {
+                output_content.push_back(absl::string_view(
+                    node->Data().data(), node->Data().size()));
+                return;
+              }
+              case NodeType::COMMENT_NODE: {
+                // Ignore comments.
+                return;
+              }
+              default:
+                break;
+            }
+
+            for (Node* child = node->FirstChild(); child;
+                 child = child->NextSibling()) {
+              output(child, output_content);
+            }
+          };
+
+  std::vector<absl::string_view> buffer;
+  output(this, buffer);
+
+  return absl::StrJoin(buffer, " ");
 }
 
 void Node::UpdateChildNodesPositions(Node* relative_node) {
diff --git a/validator/cpp/htmlparser/node.h b/validator/cpp/htmlparser/node.h
index 6b1ec739972d..31b8c9482ce4 100644
--- a/validator/cpp/htmlparser/node.h
+++ b/validator/cpp/htmlparser/node.h
@@ -1,5 +1,5 @@
-#ifndef HTMLPARSER__NODE_H_
-#define HTMLPARSER__NODE_H_
+#ifndef CPP_HTMLPARSER_NODE_H_
+#define CPP_HTMLPARSER_NODE_H_
 
 #include <deque>
 #include <memory>
@@ -10,9 +10,9 @@
 #include <utility>
 #include <vector>
 
-#include "atom.h"
-#include "error.h"
-#include "token.h"
+#include "cpp/htmlparser/atom.h"
+#include "cpp/htmlparser/error.h"
+#include "cpp/htmlparser/token.h"
 
 namespace htmlparser {
 
@@ -232,4 +232,4 @@ std::optional<Error> CheckNodeConsistency(Node* node);
 
 }  // namespace htmlparser
 
-#endif  // HTMLPARSER__NODE_H_
+#endif  // CPP_HTMLPARSER_NODE_H_
diff --git a/validator/cpp/htmlparser/node_test.cc b/validator/cpp/htmlparser/node_test.cc
index 6f90c485f4cd..3bca02f512dd 100644
--- a/validator/cpp/htmlparser/node_test.cc
+++ b/validator/cpp/htmlparser/node_test.cc
@@ -1,10 +1,10 @@
-#include "node.h"
+#include "cpp/htmlparser/node.h"
 
 #include "gtest/gtest.h"
-#include "atom.h"
-#include "document.h"
-#include "parser.h"
-#include "renderer.h"
+#include "cpp/htmlparser/atom.h"
+#include "cpp/htmlparser/document.h"
+#include "cpp/htmlparser/parser.h"
+#include "cpp/htmlparser/renderer.h"
 
 using htmlparser::Atom;
 using htmlparser::Attribute;
diff --git a/validator/cpp/htmlparser/parser.cc b/validator/cpp/htmlparser/parser.cc
index a46620b0a8ab..1ddbd303054d 100644
--- a/validator/cpp/htmlparser/parser.cc
+++ b/validator/cpp/htmlparser/parser.cc
@@ -6,21 +6,17 @@
 #endif               // DUMP_NODES
 
 #include "absl/flags/flag.h"
-#include "atomutil.h"
-#include "comparators.h"
-#include "defer.h"
-#include "doctype.h"
-#include "foreign.h"
-#include "logging.h"
-#include "parser.h"
-#include "strings.h"
-
-ABSL_FLAG(uint32_t, htmlparser_max_nodes_depth_count, 245,
-          "Maximum depth of open nodes. "
-          "For: <a><b><c><d></d></c></b/></a>, the stack size is 4 as <a> is "
-          "kept open until three elements <b>,<c> and <d> are closed. "
-          "For: <a>a</a><b>b</b><c>c</c><d>d</d> the depth is 1 as they are "
-          "closed immediately after one child element.");
+#include "absl/status/status.h"
+#include "cpp/htmlparser/atomutil.h"
+#include "cpp/htmlparser/comparators.h"
+#include "cpp/htmlparser/defer.h"
+#include "cpp/htmlparser/doctype.h"
+#include "cpp/htmlparser/foreign.h"
+#include "cpp/htmlparser/logging.h"
+#include "cpp/htmlparser/parser.h"
+#include "cpp/htmlparser/strings.h"
+
+ABSL_RETIRED_FLAG(uint32_t, htmlparser_max_nodes_depth_count, 245, "retired");
 
 namespace htmlparser {
 
@@ -85,16 +81,14 @@ std::unique_ptr<Document> ParseFragmentWithOptions(std::string_view html,
 
   auto doc = parser->Parse();
 
-  // doc could be nullptr when, for example, the stack depth >
-  // htmlparser_max_nodes_depth_count).
-  if (doc == nullptr) return nullptr;
-
-  Node* parent = fragment_parent ? root : doc->root_node_;
-  for (Node* c = parent->FirstChild(); c;) {
-    Node* next = c->NextSibling();
-    doc->fragment_nodes_.push_back(std::move(c));
-    parent->RemoveChild(c);
-    c = next;
+  if (doc->status().ok()) {
+    Node* parent = fragment_parent ? root : doc->root_node_;
+    for (Node* c = parent->FirstChild(); c;) {
+      Node* next = c->NextSibling();
+      doc->fragment_nodes_.push_back(std::move(c));
+      parent->RemoveChild(c);
+      c = next;
+    }
   }
 
   return doc;
@@ -134,13 +128,6 @@ Parser::Parser(std::string_view html, const ParseOptions& options,
 std::unique_ptr<Document> Parser::Parse() {
   bool eof = tokenizer_->IsEOF();
   while (!eof) {
-    if (open_elements_stack_.size() >
-        ::absl::GetFlag(FLAGS_htmlparser_max_nodes_depth_count)) {
-      // Skipping parsing. Document too complex.
-      delete document_.release();
-      return nullptr;
-    }
-
     Node* node = open_elements_stack_.Top();
     tokenizer_->SetAllowCDATA(node && !node->name_space_.empty());
     // Read and parse the next token.
@@ -150,7 +137,9 @@ std::unique_ptr<Document> Parser::Parse() {
     if (token_type == TokenType::ERROR_TOKEN) {
       eof = tokenizer_->IsEOF();
       if (!eof && tokenizer_->Error()) {
-        return nullptr;
+        document_->status_ = absl::InvalidArgumentError(
+            "htmlparser::Parser tokenizer error.");
+        return std::move(document_);
       }
     }
     token_ = tokenizer_->token();
@@ -217,7 +206,7 @@ int Parser::IndexOfElementInScope(Scope scope,
           }
           break;
         default:
-          CHECK(false, "HTML Parser reached unreachable scope");
+          CHECK(false) << "HTML Parser reached unreachable scope";
       }
     }
 
@@ -274,7 +263,7 @@ void Parser::ClearStackToContext(Scope scope) {
         }
         break;
       default:
-        CHECK(false, "HTML Parser reached unreachable scope");
+        CHECK(false) << "HTML Parser reached unreachable scope";
     }
   }
 }  // Parser::ClearStackToContext.
@@ -548,8 +537,8 @@ void Parser::AcknowledgeSelfClosingTag() {
 
 // Section 12.2.4.1, "using the rules for".
 void Parser::SetOriginalIM() {
-  CHECK(!original_insertion_mode_,
-        "html: bad parser state: original_insertion_mode was set twice");
+  CHECK(!original_insertion_mode_)
+      << "html: bad parser state: original_insertion_mode was set twice";
   original_insertion_mode_ = insertion_mode_;
 }  // Parser::SetOriginalIM.
 
@@ -1016,8 +1005,8 @@ bool Parser::InHeadNoscriptIM() {
       break;
   }
   open_elements_stack_.Pop();
-  CHECK(top()->atom_ == Atom::HEAD,
-        "html: the new current node will be a head element.");
+  CHECK(top()->atom_ == Atom::HEAD)
+      << "html: the new current node will be a head element.";
 
   insertion_mode_ = std::bind(&Parser::InHeadIM, this);
   if (token_.atom == Atom::NOSCRIPT) {
@@ -1119,7 +1108,7 @@ bool Parser::AfterHeadIM() {
 }  // Parser::AfterHeadIM.
 
 // Section 12.2.6.4.7.
-bool Parser::InBodyIM() {
+bool Parser::InBodyIM() {  // NOLINT
   switch (token_.token_type) {
     case TokenType::TEXT_TOKEN: {
       std::string d = token_.data;
@@ -1751,7 +1740,8 @@ bool Parser::InBodyIM() {
   }
 
   return true;
-}  // Parser::InBodyIM.
+}  // NOLINT(readability/fn_size)
+// Parser::InBodyIM end.
 
 void Parser::InBodyEndTagFormatting(Atom tag_atom, std::string_view tag_name) {
   // This is the "adoption agency" algorithm, described at
@@ -2868,9 +2858,9 @@ bool Parser::AfterBodyIM() {
     case TokenType::COMMENT_TOKEN: {
       // The comment is attached to the <html> element.
       CHECK(open_elements_stack_.size() > 0 &&
-                open_elements_stack_.at(0)->atom_ == Atom::HTML,
-            "html: bad parser state: <html> element not found, in the "
-            "after-body insertion mode");
+            open_elements_stack_.at(0)->atom_ == Atom::HTML)
+          << "html: bad parser state: <html> element not found, in the "
+             "after-body insertion mode";
       Node* node = document_->NewNode(NodeType::COMMENT_NODE);
       node->SetManufactured(token_.is_manufactured);
       if (record_node_offsets_) {
@@ -3136,7 +3126,7 @@ bool Parser::ParseForeignContent() {
         }
         AdjustSVGAttributeNames(&token_.attributes);
       } else {
-        CHECK(false, "html: bad parser state: unexpected namespace");
+        CHECK(false) << "html: bad parser state: unexpected namespace";
       }
 
       AdjustForeignAttributes(&token_.attributes);
@@ -3323,7 +3313,7 @@ void Parser::RecordLinkRelCanonical(Node* link_node) {
   if (link_node->Type() != NodeType::ELEMENT_NODE ||
       link_node->DataAtom() != Atom::LINK) return;
 
-  bool canonical;
+  bool canonical = false;
   std::string canonical_url;
   for (auto& attr : link_node->Attributes()) {
     if (Strings::EqualFold(attr.key, "rel") &&
diff --git a/validator/cpp/htmlparser/parser.h b/validator/cpp/htmlparser/parser.h
index de778d0cb97a..403dab453fb9 100644
--- a/validator/cpp/htmlparser/parser.h
+++ b/validator/cpp/htmlparser/parser.h
@@ -1,15 +1,15 @@
-#ifndef HTMLPARSER__PARSER_H_
-#define HTMLPARSER__PARSER_H_
+#ifndef CPP_HTMLPARSER_PARSER_H_
+#define CPP_HTMLPARSER_PARSER_H_
 
 #include <array>
 #include <deque>
 #include <functional>
 #include <vector>
 
-#include "atom.h"
-#include "document.h"
-#include "node.h"
-#include "tokenizer.h"
+#include "cpp/htmlparser/atom.h"
+#include "cpp/htmlparser/document.h"
+#include "cpp/htmlparser/node.h"
+#include "cpp/htmlparser/tokenizer.h"
 
 namespace htmlparser {
 
@@ -357,4 +357,4 @@ class Parser {
 
 }  // namespace htmlparser
 
-#endif  // HTMLPARSER__PARSER_H_
+#endif  // CPP_HTMLPARSER_PARSER_H_
diff --git a/validator/cpp/htmlparser/parser_test.cc b/validator/cpp/htmlparser/parser_test.cc
index 7b46b6523a35..4a5a74de57ed 100644
--- a/validator/cpp/htmlparser/parser_test.cc
+++ b/validator/cpp/htmlparser/parser_test.cc
@@ -1,18 +1,16 @@
-#include "parser.h"
+#include "cpp/htmlparser/parser.h"
 
 #include "gtest/gtest.h"
 #include "absl/flags/declare.h"
 #include "absl/flags/flag.h"
-#include "atom.h"
-#include "atomutil.h"
-#include "node.h"
-#include "renderer.h"
-#include "token.h"
-
-ABSL_DECLARE_FLAG(uint32_t, htmlparser_max_nodes_depth_count);
+#include "cpp/htmlparser/atom.h"
+#include "cpp/htmlparser/atomutil.h"
+#include "cpp/htmlparser/node.h"
+#include "cpp/htmlparser/renderer.h"
+#include "cpp/htmlparser/token.h"
 
 // For operator""s.
-using namespace std::string_literals;
+using namespace std::string_literals;  // NOLINT
 
 #define EXPECT_NOT_NULL(p) EXPECT_TRUE((p) != nullptr)
 #define EXPECT_NULL(p) EXPECT_FALSE((p) != nullptr)
@@ -769,32 +767,13 @@ TEST(ParserTest, NumTermsInTextNodeCountDisabled) {
   EXPECT_EQ(body->FirstChild()->NumTerms(), -1);
 }
 
-TEST(ParserTest, DocumentComplexityTest) {
-  ::absl::SetFlag(&FLAGS_htmlparser_max_nodes_depth_count, 4);
-
-  // Document parsing failed, body contains 4 deeply nested nodes..
-  htmlparser::Parser p(
-      "<html><body><a><b><c><m></m></c></b></a></body></html>");
-  EXPECT_NULL(p.Parse());
-
-  // Document parsed, open elements stack less than 4.
-  htmlparser::Parser p2("<html><body><a><b>foo</b></a></body></html>");
-  EXPECT_NOT_NULL(p2.Parse());
-
-  // Child nodes closing reduces the stack size. So maximum open nodes in the
-  // following document is 4.
-  htmlparser::Parser p3("<html><body><a>"
-                        "<b>foo</b><b>foo</b><b>foo</b><b>foo</b><b>foo</b>"
-                        "<b>foo</b><b>foo</b><b>foo</b><b>foo</b><b>foo</b>"
-                        "</a></body></html>");
-  EXPECT_NOT_NULL(p3.Parse());
-}
-
 TEST(ParserTest, DocumentMetadataTest) {
-  auto doc = htmlparser::Parse("<html><head><base href=\"www.google.com\""
-                               "target=\"blank\">"
-                               "<link rel=canonical href=\"foo.google.com\">"
-                               "</head><body></body></html>");
+  auto doc = htmlparser::Parse(
+      "<html><head><base href=\"www.google.com\""
+      "target=\"blank\">"
+      "<link rel=canonical href=\"foo.google.com\">"
+      "<link rel=\"icon\" href=\"https://www.bonappetit.com/favicon.ico\">"
+      "</head><body></body></html>");
   EXPECT_EQ(doc->Metadata().base_url.first, "www.google.com");
   EXPECT_EQ(doc->Metadata().base_url.second, "blank");
   EXPECT_EQ(doc->Metadata().canonical_url, "foo.google.com");
diff --git a/validator/cpp/htmlparser/renderer.cc b/validator/cpp/htmlparser/renderer.cc
index 33644ce440a5..71c6ca5f62e3 100644
--- a/validator/cpp/htmlparser/renderer.cc
+++ b/validator/cpp/htmlparser/renderer.cc
@@ -1,9 +1,13 @@
+#include "cpp/htmlparser/renderer.h"
+
 #include <algorithm>
+#include <sstream>
+#include <stack>
+#include <tuple>
 
-#include "atomutil.h"
-#include "elements.h"
-#include "renderer.h"
-#include "strings.h"
+#include "cpp/htmlparser/atomutil.h"
+#include "cpp/htmlparser/elements.h"
+#include "cpp/htmlparser/strings.h"
 
 namespace htmlparser {
 
@@ -27,67 +31,65 @@ inline void WriteQuoted(const std::string& str, std::stringbuf* buf) {
   WriteToBuffer(str, buf);
   buf->sputc(quote);
 }
-}  // namespace.
 
-RenderError Renderer::Render(Node* node, std::stringbuf* buf) {
-  switch (node->Type()) {
-    case NodeType::ERROR_NODE:
-      return RenderError::ERROR_NODE_NO_RENDER;
-    case NodeType::TEXT_NODE:
-      Strings::Escape(node->Data().data(), buf);
-      return RenderError::NO_ERROR;
-    case NodeType::DOCUMENT_NODE:
-      for (Node* c = node->FirstChild(); c; c = c->NextSibling()) {
-        auto err = Render(c, buf);
-        if (err != RenderError::NO_ERROR) {
-          return  err;
-        }
-      }
-      return RenderError::NO_ERROR;
-    case NodeType::ELEMENT_NODE:
-      // No-op.
-      break;
-    case NodeType::COMMENT_NODE:
-      WriteToBuffer("<!--", buf);
-      WriteToBuffer(node->Data().data(), buf);
-      WriteToBuffer("-->", buf);
-      return RenderError::NO_ERROR;
-    case NodeType::DOCTYPE_NODE: {
-      WriteToBuffer("<!DOCTYPE ", buf);
-      WriteToBuffer(node->Data().data(), buf);
-      std::string p;
-      std::string s;
-      for (auto& attr : node->Attributes()) {
-        std::string key = attr.key;
-        std::string value = attr.value;
-        if (key == "public") {
-          p = value;
-        } else if (key == "system") {
-          s = value;
-        }
-      }
-      if (!p.empty()) {
-        WriteToBuffer(" PUBLIC ", buf);
-        WriteQuoted(p, buf);
-        if (!s.empty()) {
-          buf->sputc(' ');
-          WriteQuoted(s, buf);
-        }
-      } else if (!s.empty()) {
-        WriteToBuffer(" SYSTEM ", buf);
-        WriteQuoted(s, buf);
-      }
-      buf->sputc('>');
-      return RenderError::NO_ERROR;
-    }
-    default:
-      return RenderError::UNKNOWN_NODE_TYPE;
+// A stack structure that keeps track of the depth-first traversal of the
+// elements tree that still need to be rendered.
+class RenderStack {
+ public:
+  struct RenderTask {
+    RenderTask(Node* node_, bool is_closing_tag_, bool is_raw_text_)
+        : node(node_),
+          is_closing_tag(is_closing_tag_),
+          is_raw_text(is_raw_text_) {}
+    Node* node;
+    // Marks that this task is for the closing tag of node.
+    bool is_closing_tag;
+    // Used for TEXT_NODEs contained inside a RawText node.
+    bool is_raw_text;
+  };
+
+  bool IsEmpty() const { return tasks_.empty(); }
+
+  void PushRenderNode(Node* render_node) {
+    tasks_.emplace(render_node, /*is_closing_tag=*/false,
+                   /*is_raw_text=*/false);
+  }
+
+  void PushRenderCloseNode(Node* render_node) {
+    tasks_.emplace(render_node, /*is_closing_tag=*/true, /*is_raw_text=*/false);
+  }
+
+  void PushRenderRawTextNode(Node* render_node) {
+    tasks_.emplace(render_node, /*is_closing_tag=*/false, /*is_raw_text=*/true);
   }
 
+  RenderTask Pop() {
+    RenderTask task = tasks_.top();
+    tasks_.pop();
+    return task;
+  }
+
+ private:
+  std::stack<RenderTask> tasks_;
+};
+
+RenderError RenderElementNode(Node* node, bool is_closing_tag,
+                              RenderStack* render_tasks, std::stringbuf* buf) {
+  if (is_closing_tag) {
+    // Render the </xxx> closing tag.
+    WriteToBuffer("</", buf);
+    WriteToBuffer(node->DataAtom() == Atom::UNKNOWN
+                      ? node->Data().data()
+                      : AtomUtil::ToString(node->DataAtom()),
+                  buf);
+    buf->sputc('>');
+    return RenderError::NO_ERROR;
+  }
   // Render the <xxx> opening tag.
   buf->sputc('<');
-  WriteToBuffer(node->DataAtom() == Atom::UNKNOWN ?
-                node->Data().data() : AtomUtil::ToString(node->DataAtom()),
+  WriteToBuffer(node->DataAtom() == Atom::UNKNOWN
+                    ? node->Data().data()
+                    : AtomUtil::ToString(node->DataAtom()),
                 buf);
   for (auto& attr : node->Attributes()) {
     std::string ns = attr.name_space;
@@ -106,8 +108,7 @@ RenderError Renderer::Render(Node* node, std::stringbuf* buf) {
     }
   }
 
-  if (auto ve = std::find(kVoidElements.begin(),
-                          kVoidElements.end(),
+  if (auto ve = std::find(kVoidElements.begin(), kVoidElements.end(),
                           node->DataAtom());
       ve != kVoidElements.end()) {
     if (node->FirstChild()) {
@@ -115,33 +116,31 @@ RenderError Renderer::Render(Node* node, std::stringbuf* buf) {
     }
     WriteToBuffer(">", buf);
     return RenderError::NO_ERROR;
+  } else {
+    // Push the closing tag ahead of any children nodes, as tasks are processed
+    // in reverse order.
+    render_tasks->PushRenderCloseNode(node);
   }
 
   buf->sputc('>');
 
   // Add initial newline where there is danger of a newline being ignored.
-  if (Node* c = node->FirstChild();
-      c && c->Type() == NodeType::TEXT_NODE && Strings::StartsWith(
-      c->Data(), "\n")) {
-    if (node->DataAtom() == Atom::PRE ||
-        node->DataAtom() == Atom::LISTING ||
+  if (Node* c = node->FirstChild(); c && c->Type() == NodeType::TEXT_NODE &&
+                                    Strings::StartsWith(c->Data(), "\n")) {
+    if (node->DataAtom() == Atom::PRE || node->DataAtom() == Atom::LISTING ||
         node->DataAtom() == Atom::TEXTAREA) {
       buf->sputc('\n');
     }
   }
 
   // Render any child nodes.
-  if (std::find(kRawTextNodes.begin(),
-                kRawTextNodes.end(),
-                node->DataAtom()) != kRawTextNodes.end()) {
-    for (Node* c = node->FirstChild(); c; c = c->NextSibling()) {
+  if (std::find(kRawTextNodes.begin(), kRawTextNodes.end(), node->DataAtom()) !=
+      kRawTextNodes.end()) {
+    for (Node* c = node->LastChild(); c != nullptr; c = c->PrevSibling()) {
       if (c->Type() == NodeType::TEXT_NODE) {
-        WriteToBuffer(c->Data().data(), buf);
+        render_tasks->PushRenderRawTextNode(c);
       } else {
-        auto err = Render(c, buf);
-        if (err != RenderError::NO_ERROR) {
-          return err;
-        }
+        render_tasks->PushRenderNode(c);
       }
     }
     if (node->DataAtom() == Atom::PLAINTEXT) {
@@ -150,21 +149,82 @@ RenderError Renderer::Render(Node* node, std::stringbuf* buf) {
       return RenderError::PLAIN_TEXT_ABORT;
     }
   } else {
-    for (Node* c = node->FirstChild(); c; c = c->NextSibling()) {
-      auto err = Render(c, buf);
-      if (err != RenderError::NO_ERROR) {
-        return err;
-      }
+    for (Node* c = node->LastChild(); c != nullptr; c = c->PrevSibling()) {
+      render_tasks->PushRenderNode(c);
     }
   }
 
-  // Render the </xxx> closing tag.
-  WriteToBuffer("</", buf);
-  WriteToBuffer(node->DataAtom() == Atom::UNKNOWN ?
-                node->Data().data() : AtomUtil::ToString(node->DataAtom()),
-                buf);
-  buf->sputc('>');
+  return RenderError::NO_ERROR;
+}
+
+}  // namespace.
+
+RenderError Renderer::Render(Node* node, std::stringbuf* buf) {
+  RenderStack render_tasks;
+  render_tasks.PushRenderNode(node);
+  while (!render_tasks.IsEmpty()) {
+    RenderStack::RenderTask task = render_tasks.Pop();
+    Node* node = task.node;
 
+    switch (node->Type()) {
+      case NodeType::ERROR_NODE:
+        return RenderError::ERROR_NODE_NO_RENDER;
+      case NodeType::TEXT_NODE:
+        if (task.is_raw_text) {
+          WriteToBuffer(node->Data().data(), buf);
+        } else {
+          Strings::Escape(node->Data().data(), buf);
+        }
+        break;
+      case NodeType::DOCUMENT_NODE:
+        for (Node* c = node->LastChild(); c != nullptr; c = c->PrevSibling()) {
+          render_tasks.PushRenderNode(c);
+        }
+        break;
+      case NodeType::ELEMENT_NODE: {
+        auto err =
+            RenderElementNode(node, task.is_closing_tag, &render_tasks, buf);
+        if (err != RenderError::NO_ERROR) {
+          return err;
+        }
+      } break;
+      case NodeType::COMMENT_NODE:
+        WriteToBuffer("<!--", buf);
+        WriteToBuffer(node->Data().data(), buf);
+        WriteToBuffer("-->", buf);
+        break;
+      case NodeType::DOCTYPE_NODE: {
+        WriteToBuffer("<!DOCTYPE ", buf);
+        WriteToBuffer(node->Data().data(), buf);
+        std::string p;
+        std::string s;
+        for (auto& attr : node->Attributes()) {
+          std::string key = attr.key;
+          std::string value = attr.value;
+          if (key == "public") {
+            p = value;
+          } else if (key == "system") {
+            s = value;
+          }
+        }
+        if (!p.empty()) {
+          WriteToBuffer(" PUBLIC ", buf);
+          WriteQuoted(p, buf);
+          if (!s.empty()) {
+            buf->sputc(' ');
+            WriteQuoted(s, buf);
+          }
+        } else if (!s.empty()) {
+          WriteToBuffer(" SYSTEM ", buf);
+          WriteQuoted(s, buf);
+        }
+        buf->sputc('>');
+        break;
+      }
+      default:
+        return RenderError::UNKNOWN_NODE_TYPE;
+    }
+  }
   return RenderError::NO_ERROR;
 }
 
diff --git a/validator/cpp/htmlparser/renderer.h b/validator/cpp/htmlparser/renderer.h
index d15c06a7963c..b387d04eb4e6 100644
--- a/validator/cpp/htmlparser/renderer.h
+++ b/validator/cpp/htmlparser/renderer.h
@@ -23,12 +23,12 @@
 // Another example is that the programmatic equivalent of "a<head>b</head>c"
 // becomes "<html><head><head/><body>abc</body></html>".
 
-#ifndef HTMLPARSER__RENDERER_H_
-#define HTMLPARSER__RENDERER_H_
+#ifndef CPP_HTMLPARSER_RENDERER_H_
+#define CPP_HTMLPARSER_RENDERER_H_
 
 #include <sstream>
 
-#include "node.h"
+#include "cpp/htmlparser/node.h"
 
 namespace htmlparser {
 
@@ -43,16 +43,10 @@ enum class RenderError {
 class Renderer {
  public:
   // This renderer though fully functional, is primarily used to render webkit
-  // test cases. This Render uses recursion which may not be very efficient for
-  // production rendering. Some things you may need to consider:
-  // A) Increase the stack size.
-  // B) Control document complexity by --htmlparser_max_nodes_depth_count flag.
-  // C) Write your own renderer.
-  //
-  // TODO(amaltas): Replace recursion with iteration based dom tree traversal.
-  static RenderError Render(Node* node, std::stringbuf* output_buffer);
+  // test cases.
+  static RenderError Render(Node* node, std::stringbuf* buf);
 };
 
 }  // namespace htmlparser
 
-#endif  // HTMLPARSER__RENDERER_H_
+#endif  // CPP_HTMLPARSER_RENDERER_H_
diff --git a/validator/cpp/htmlparser/renderer_test.cc b/validator/cpp/htmlparser/renderer_test.cc
index 0b26f83c096e..1c37bc55a058 100644
--- a/validator/cpp/htmlparser/renderer_test.cc
+++ b/validator/cpp/htmlparser/renderer_test.cc
@@ -1,9 +1,9 @@
-#include "renderer.h"
+#include "cpp/htmlparser/renderer.h"
 
 #include <sstream>
 
 #include "gtest/gtest.h"
-#include "parser.h"
+#include "cpp/htmlparser/parser.h"
 
 using namespace std::string_literals;
 
diff --git a/validator/cpp/htmlparser/strings.cc b/validator/cpp/htmlparser/strings.cc
index 5672da403fd3..999ab6622912 100644
--- a/validator/cpp/htmlparser/strings.cc
+++ b/validator/cpp/htmlparser/strings.cc
@@ -1,13 +1,13 @@
-#include "strings.h"
+#include "cpp/htmlparser/strings.h"
 
 #include <algorithm>
 #include <array>
 #include <functional>
 #include <sstream>
 #include <tuple>
-#include "casetable.h"
-#include "entity.h"
-#include "whitespacetable.h"
+#include "cpp/htmlparser/casetable.h"
+#include "cpp/htmlparser/entity.h"
+#include "cpp/htmlparser/whitespacetable.h"
 
 namespace htmlparser {
 
@@ -226,7 +226,7 @@ void Strings::ConvertNewLines(std::string* s) {
   }
 }
 
-std::string Strings::ToHexString(char32_t c) {
+std::string Strings::ToHexString(uint32_t c) {
   std::stringstream ss;
   ss << "0x" << std::hex << c;
   return ss.str();
diff --git a/validator/cpp/htmlparser/strings.h b/validator/cpp/htmlparser/strings.h
index 759e8b71aa49..67ef42e54d69 100644
--- a/validator/cpp/htmlparser/strings.h
+++ b/validator/cpp/htmlparser/strings.h
@@ -1,5 +1,5 @@
-#ifndef HTMLPARSER__STRINGS_H_
-#define HTMLPARSER__STRINGS_H_
+#ifndef CPP_HTMLPARSER_STRINGS_H_
+#define CPP_HTMLPARSER_STRINGS_H_
 
 #include <optional>
 #include <sstream>
@@ -56,7 +56,7 @@ class Strings {
     std::string_view uri);
 
   // Returns hex string representation of a 4 byte codepoint.
-  static std::string ToHexString(char32_t c);
+  static std::string ToHexString(uint32_t c);
 
   // byte is in the range 0x41-0x5A or 0x61-0x7A (A-Z or a-z).
   static bool IsCharAlphabet(char c);
@@ -301,4 +301,4 @@ class Strings {
 
 }  // namespace htmlparser
 
-#endif  // HTMLPARSER__STRINGS_H_
+#endif  // CPP_HTMLPARSER_STRINGS_H_
diff --git a/validator/cpp/htmlparser/strings_test.cc b/validator/cpp/htmlparser/strings_test.cc
index c843d59b39f0..2ae273c41c4b 100644
--- a/validator/cpp/htmlparser/strings_test.cc
+++ b/validator/cpp/htmlparser/strings_test.cc
@@ -1,4 +1,4 @@
-#include "strings.h"
+#include "cpp/htmlparser/strings.h"
 
 #include <string>
 
@@ -303,14 +303,26 @@ TEST(StringsTest, EscapeUnescapeTest) {
   std::string str2 = "&gt;cdef";
   std::string str3 = "abc&nGt;cdef";
   std::string str4 = "&abc;def";
+  std::string str5 = "&amp;num;";
+  std::string str6 = "&amp;num";
+  std::string str7 = "&num";
+  std::string str8 = "&num;";
   htmlparser::Strings::UnescapeString(&str1);
   htmlparser::Strings::UnescapeString(&str2);
   htmlparser::Strings::UnescapeString(&str3);
   htmlparser::Strings::UnescapeString(&str4);
+  htmlparser::Strings::UnescapeString(&str5);
+  htmlparser::Strings::UnescapeString(&str6);
+  htmlparser::Strings::UnescapeString(&str7);
+  htmlparser::Strings::UnescapeString(&str8);
   EXPECT_EQ(str1, "≫⃒cdef");
   EXPECT_EQ(str2, ">cdef");
   EXPECT_EQ(str3, "abc≫⃒cdef");
   EXPECT_EQ(str4, "&abc;def");
+  EXPECT_EQ(str5, "&num;");
+  EXPECT_EQ(str6, "&num");
+  EXPECT_EQ(str7, "&num");
+  EXPECT_EQ(str8, "#");
 }
 
 TEST(StringsTest, EncodingTest) {
diff --git a/validator/cpp/htmlparser/testconstants.h b/validator/cpp/htmlparser/testconstants.h
index 7ecb2fc8dacd..fa1b50b3a347 100644
--- a/validator/cpp/htmlparser/testconstants.h
+++ b/validator/cpp/htmlparser/testconstants.h
@@ -1,5 +1,5 @@
-#ifndef HTMLPARSER__TESTCONSTANTS_H_
-#define HTMLPARSER__TESTCONSTANTS_H_
+#ifndef CPP_HTMLPARSER_TESTCONSTANTS_H_
+#define CPP_HTMLPARSER_TESTCONSTANTS_H_
 
 #include <array>
 #include <string_view>
@@ -10,10 +10,10 @@ namespace testing {
 
 inline constexpr std::array<std::string_view, 2> kTestDataDirs{
     "testdata/tree-construction/*.dat",
-    "testdata/go/*.dat",
+    "cpp/htmlparser/testdata/go/*.dat",
 };
 
 }  // namespace testing
 }  // namespace htmlparser
 
-#endif  // HTMLPARSER__TESTCONSTANTS_H_
+#endif  // CPP_HTMLPARSER_TESTCONSTANTS_H_
diff --git a/validator/cpp/htmlparser/token.cc b/validator/cpp/htmlparser/token.cc
index 669f32e1f09b..5ae0fdd66ed4 100644
--- a/validator/cpp/htmlparser/token.cc
+++ b/validator/cpp/htmlparser/token.cc
@@ -1,6 +1,6 @@
-#include "token.h"
+#include "cpp/htmlparser/token.h"
 
-#include "strings.h"
+#include "cpp/htmlparser/strings.h"
 
 namespace htmlparser {
 
diff --git a/validator/cpp/htmlparser/token.h b/validator/cpp/htmlparser/token.h
index 78f8143dc457..a91c08891655 100644
--- a/validator/cpp/htmlparser/token.h
+++ b/validator/cpp/htmlparser/token.h
@@ -1,12 +1,12 @@
-#ifndef HTMLPARSER__TOKEN_H_
-#define HTMLPARSER__TOKEN_H_
+#ifndef CPP_HTMLPARSER_TOKEN_H_
+#define CPP_HTMLPARSER_TOKEN_H_
 
 #include <memory>
 #include <optional>
 #include <string>
 #include <vector>
 
-#include "atom.h"
+#include "cpp/htmlparser/atom.h"
 
 namespace htmlparser {
 
@@ -92,4 +92,4 @@ struct Token {
 
 }  // namespace htmlparser
 
-#endif  // HTMLPARSER__TOKEN_H_
+#endif  // CPP_HTMLPARSER_TOKEN_H_
diff --git a/validator/cpp/htmlparser/tokenizer.cc b/validator/cpp/htmlparser/tokenizer.cc
index 4a2568e1dc7e..49483ac3f6b2 100644
--- a/validator/cpp/htmlparser/tokenizer.cc
+++ b/validator/cpp/htmlparser/tokenizer.cc
@@ -1,10 +1,10 @@
-#include "tokenizer.h"
+#include "cpp/htmlparser/tokenizer.h"
 
 #include "absl/flags/flag.h"
-#include "atom.h"
-#include "atomutil.h"
-#include "defer.h"
-#include "strings.h"
+#include "cpp/htmlparser/atom.h"
+#include "cpp/htmlparser/atomutil.h"
+#include "cpp/htmlparser/defer.h"
+#include "cpp/htmlparser/strings.h"
 
 ABSL_FLAG(std::size_t, htmlparser_max_attributes_per_node,
           1000,
diff --git a/validator/cpp/htmlparser/tokenizer.h b/validator/cpp/htmlparser/tokenizer.h
index f8b0d075c141..8cf22be99b84 100644
--- a/validator/cpp/htmlparser/tokenizer.h
+++ b/validator/cpp/htmlparser/tokenizer.h
@@ -1,12 +1,12 @@
-#ifndef HTMLPARSER__TOKENIZER_H_
-#define HTMLPARSER__TOKENIZER_H_
+#ifndef CPP_HTMLPARSER_TOKENIZER_H_
+#define CPP_HTMLPARSER_TOKENIZER_H_
 
 #include <memory>
 #include <optional>
 #include <tuple>
 #include <vector>
 
-#include "token.h"
+#include "cpp/htmlparser/token.h"
 
 namespace htmlparser {
 
@@ -261,4 +261,4 @@ class Tokenizer {
 
 }  // namespace htmlparser
 
-#endif  // HTMLPARSER__TOKENIZER_H_
+#endif  // CPP_HTMLPARSER_TOKENIZER_H_
diff --git a/validator/cpp/htmlparser/tokenizer_test.cc b/validator/cpp/htmlparser/tokenizer_test.cc
index 475e650367d0..8c5c9a119fea 100644
--- a/validator/cpp/htmlparser/tokenizer_test.cc
+++ b/validator/cpp/htmlparser/tokenizer_test.cc
@@ -1,15 +1,17 @@
-#include "tokenizer.h"
+#include "cpp/htmlparser/tokenizer.h"
 
 #include "gtest/gtest.h"
-#include "token.h"
+#include "cpp/htmlparser/token.h"
 
 // TODO: Add more complex html not-well-formed documents to cover
 // complex tokenization scenarios. Eg. <html>><head><<body;>> etc..
 
 TEST(TokenizerTest, BasicTokenizationOfADocument) {
   std::string html =
-      "<html><head><title>hello</title></head><body><div>Hello</div>"
-      "<textarea id=\"my-text\" class=\"my-style\"></textarea>"
+      "<html><head><title>hello</title></head><body><div>"
+      "Hello&amp;World Number &num; 123</div>"
+      "<textarea id=\"my-text\" class=\"my-style\">Foo &amp; Bar "
+      "Number &num; 123</textarea>"
       "<img src=\"foo.png\" /></body></html>";
 
   htmlparser::Tokenizer t(html);
@@ -22,7 +24,7 @@ TEST(TokenizerTest, BasicTokenizationOfADocument) {
     tokens.push_back(token);
   }
 
-  EXPECT_EQ(tokens.size(), 15) << "Total 15 tokens generated by tokenizer";
+  EXPECT_EQ(tokens.size(), 16) << "Total 15 tokens generated by tokenizer";
 
   // First three start tags. <html><head><title>.
   EXPECT_EQ(tokens[0].token_type, htmlparser::TokenType::START_TAG_TOKEN)
@@ -51,7 +53,8 @@ TEST(TokenizerTest, BasicTokenizationOfADocument) {
   // Text "Hello"
   EXPECT_EQ(tokens[8].token_type , htmlparser::TokenType::TEXT_TOKEN)
       << "Hello text token 8";
-  EXPECT_EQ(tokens[8].data , "Hello") << "Hello string inside <div> 8";
+  EXPECT_EQ(tokens[8].data , "Hello&World Number # 123")
+      << "Hello string inside <div> 8";
 
   // End div.
   EXPECT_EQ(tokens[9].token_type , htmlparser::TokenType::END_TAG_TOKEN)
@@ -74,25 +77,29 @@ TEST(TokenizerTest, BasicTokenizationOfADocument) {
   EXPECT_EQ(tokens[10].attributes[1].value , "my-style")
       << "textarea second attribute class value is my-style";
 
+  // Text content in text area.
+  EXPECT_EQ(tokens[11].token_type, htmlparser::TokenType::TEXT_TOKEN);
+  EXPECT_EQ(tokens[11].data, "Foo & Bar Number # 123");
+
   // End textarea.
-  EXPECT_EQ(tokens[11].token_type , htmlparser::TokenType::END_TAG_TOKEN)
+  EXPECT_EQ(tokens[12].token_type , htmlparser::TokenType::END_TAG_TOKEN)
       << "<textarea> end tag 11";
 
   // img tag. self closing.
-  EXPECT_EQ(tokens[12].token_type ,
+  EXPECT_EQ(tokens[13].token_type ,
             htmlparser::TokenType::SELF_CLOSING_TAG_TOKEN)
       << "<img> self closing tag 12";
-  EXPECT_EQ(tokens[12].attributes.size() , 1)
+  EXPECT_EQ(tokens[13].attributes.size() , 1)
       << "img only one attribute";
-  EXPECT_EQ(tokens[12].attributes[0].key , "src")
+  EXPECT_EQ(tokens[13].attributes[0].key , "src")
       << "img first attribute is src";
-  EXPECT_EQ(tokens[12].attributes[0].value , "foo.png")
+  EXPECT_EQ(tokens[13].attributes[0].value , "foo.png")
       << "img first attribute src value is foo.png";
 
   // Close body, html.
-  EXPECT_EQ(tokens[13].token_type , htmlparser::TokenType::END_TAG_TOKEN)
-      << "body close tag 13";
   EXPECT_EQ(tokens[14].token_type , htmlparser::TokenType::END_TAG_TOKEN)
+      << "body close tag 13";
+  EXPECT_EQ(tokens[15].token_type , htmlparser::TokenType::END_TAG_TOKEN)
       << "html close tag 14";
 
   EXPECT_EQ(t.LinesProcessed(), 1);
diff --git a/validator/cpp/htmlparser/url.cc b/validator/cpp/htmlparser/url.cc
index f19f71156e0b..98c2ad8d01d8 100644
--- a/validator/cpp/htmlparser/url.cc
+++ b/validator/cpp/htmlparser/url.cc
@@ -1,6 +1,6 @@
-#include "url.h"
+#include "cpp/htmlparser/url.h"
 
-#include "strings.h"
+#include "cpp/htmlparser/strings.h"
 
 namespace htmlparser {
 
@@ -145,6 +145,9 @@ void URL::ParseAuthority() {
     }
     idx++;
   }
+  // Save off whatever is left as the path + params + fragment.
+  // We don't further parse this.
+  path_params_fragment_ = url_.substr(idx);
 
   // Extract the login string if one was found.
   if (at_idx != -1) {
@@ -161,7 +164,8 @@ void URL::ParseAuthority() {
 
   bool is_ipv6_literal = false;
   std::string_view host = url_.substr(host_begin, host_end - host_begin);
-  if (host.front() == '[' && host.back() == ']' && host.size() > 2 /* [] */) {
+  if (!host.empty() && host.front() == '[' && host.back() == ']' &&
+      host.size() > 2 /* [] */) {
     is_ipv6_literal = true;
     host.remove_prefix(1);
     host.remove_suffix(1);
diff --git a/validator/cpp/htmlparser/url.h b/validator/cpp/htmlparser/url.h
index cf6027f142e7..f890b76cf4b7 100644
--- a/validator/cpp/htmlparser/url.h
+++ b/validator/cpp/htmlparser/url.h
@@ -1,7 +1,7 @@
 // Uniform resouce locator parsing related static functions.
 
-#ifndef HTMLPARSER__URL_H_
-#define HTMLPARSER__URL_H_
+#ifndef CPP_HTMLPARSER_URL_H_
+#define CPP_HTMLPARSER_URL_H_
 
 #include <arpa/inet.h>
 #include <cctype>
@@ -28,6 +28,9 @@ class URL {
   std::string hostname() const { return host_; }
   std::string login() const { return login_; }
   int port() const { return port_; }
+  std::string_view path_params_fragment() const {
+    return path_params_fragment_;
+  }
 
  private:
   static bool IsAlphaNum(uint8_t c) {
@@ -79,8 +82,9 @@ class URL {
   std::string login_;
   std::string host_;
   int port_;
+  std::string_view path_params_fragment_;
 };
 
 }  // namespace htmlparser
 
-#endif  // HTMLPARSER__URL_H_
+#endif  // CPP_HTMLPARSER_URL_H_
diff --git a/validator/cpp/htmlparser/url_test.cc b/validator/cpp/htmlparser/url_test.cc
index f6d0373f65c2..ba6e7e0df335 100644
--- a/validator/cpp/htmlparser/url_test.cc
+++ b/validator/cpp/htmlparser/url_test.cc
@@ -1,4 +1,4 @@
-#include "url.h"
+#include "cpp/htmlparser/url.h"
 
 #include "gtest/gtest.h"
 
@@ -41,6 +41,7 @@ TEST(URLTest, BasicTests) {
   EXPECT_EQ(url.protocol(), "http");
   EXPECT_EQ(url.hostname(), "www.google.com");
   EXPECT_EQ(url.port(), 80);
+  EXPECT_EQ(url.path_params_fragment(), "/");
 
   URL https_url("https://www.google.com/");
   EXPECT_TRUE(https_url.has_protocol());
@@ -91,9 +92,11 @@ TEST(URLTest, BasicTests) {
   EXPECT_EQ(port_url.protocol(), "http");
   EXPECT_EQ(port_url.hostname(), "www.google.com");
   EXPECT_EQ(port_url.port(), 8080);
+  EXPECT_EQ(port_url.path_params_fragment(), "/");
 
   URL port_url2("http://www.google.com:0080/foo:8080");
   EXPECT_EQ(port_url2.port(), 80);
+  EXPECT_EQ(port_url2.path_params_fragment(), "/foo:8080");
 
   // Invalid port.
   URL invalid_port("http://www.google.com:99999/foo");
@@ -111,6 +114,7 @@ TEST(URLTest, BasicTests) {
   URL ipv6("http://[::2]/foo");
   EXPECT_TRUE(ipv6.is_valid());
   EXPECT_EQ(ipv6.hostname(), "::2");
+  EXPECT_EQ(ipv6.path_params_fragment(), "/foo");
 
   URL ipv62("http://foo:bar@[1:2:3::4]:8080/foo");
   EXPECT_TRUE(ipv62.is_valid());
diff --git a/validator/cpp/htmlparser/utf8.h b/validator/cpp/htmlparser/utf8.h
index 5b29ad79ac18..f7d530bdd038 100644
--- a/validator/cpp/htmlparser/utf8.h
+++ b/validator/cpp/htmlparser/utf8.h
@@ -1,5 +1,5 @@
-#ifndef HTMLPARSER__UTF8_H_
-#define HTMLPARSER__UTF8_H_
+#ifndef CPP_HTMLPARSER_UTF8_H_
+#define CPP_HTMLPARSER_UTF8_H_
 
 #include <array>
 
@@ -131,4 +131,4 @@ static constexpr std::array<uint8_t, 16> k4ByteTrailByteValidity {
 }  // namespace htmlparser
 
 
-#endif  // HTMLPARSER__UTF8_H_
+#endif  // CPP_HTMLPARSER_UTF8_H_
diff --git a/validator/cpp/htmlparser/utf8_test.cc b/validator/cpp/htmlparser/utf8_test.cc
index 3b11a73578ce..a3fc2936bcbf 100644
--- a/validator/cpp/htmlparser/utf8_test.cc
+++ b/validator/cpp/htmlparser/utf8_test.cc
@@ -1,4 +1,4 @@
-#include "utf8.h"
+#include "cpp/htmlparser/utf8.h"
 
 #include "gtest/gtest.h"
 
diff --git a/validator/cpp/htmlparser/validators/BUILD b/validator/cpp/htmlparser/validators/BUILD
new file mode 100644
index 000000000000..bdb4137a0fbd
--- /dev/null
+++ b/validator/cpp/htmlparser/validators/BUILD
@@ -0,0 +1,37 @@
+load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")
+
+# Requirements:
+# clang with c++17 support.
+#
+# Usage:
+# To build the library, use the following bazel command:
+#
+# bazel build --repo_env=CC=clang --cxxopt='-std=c++17' <build_target>
+
+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+exports_files(
+    [
+        # These are generated by validatorgen.cc
+        "json.h",
+    ],
+    visibility = ["//cpp/htmlparser/bin:__subpackages__"],
+)
+
+cc_library(
+    name = "json",
+    hdrs = ["json.h"],
+)
+
+cc_test(
+    name = "json_test",
+    srcs = [
+        "json_test.cc",
+    ],
+    deps = [
+        ":json",
+        "@com_google_googletest//:gtest_main",
+    ],
+)
diff --git a/validator/cpp/htmlparser/validators/ipaddress.h b/validator/cpp/htmlparser/validators/ipaddress.h
new file mode 100644
index 000000000000..7ccb88dbd164
--- /dev/null
+++ b/validator/cpp/htmlparser/validators/ipaddress.h
@@ -0,0 +1,2247 @@
+// -*- C++ -*-
+
+// AUTO GENERATED; DO NOT EDIT.
+// To regenerate this file, see comments in bin/validatorgen
+
+#ifndef CPP_HTMLPARSER_VALIDATORS_IPADDRESS_H_
+#define CPP_HTMLPARSER_VALIDATORS_IPADDRESS_H_
+
+#include <array>
+#include <functional>
+#include <iostream>
+#include <optional>
+#include <string_view>
+#include <utility>
+#include <vector>
+
+namespace htmlparser::ipaddress {
+
+enum class StateCode : uint8_t {
+  $ = 0,
+  IPV4_2 = 1,
+  IPV4_2DIG_1_2 = 2,
+  IPV4_2DIG_2_2 = 3,
+  IPV4_2DIG_3_2 = 4,
+  IPV4_2DIG_4_2 = 5,
+  IPV4_3 = 6,
+  IPV4_4 = 7,
+  IPV4_55_1_2 = 8,
+  IPV4_55_1_3 = 9,
+  IPV4_55_2_2 = 10,
+  IPV4_55_2_3 = 11,
+  IPV4_55_3_2 = 12,
+  IPV4_55_3_3 = 13,
+  IPV4_55_4_2 = 14,
+  IPV4_55_4_3 = 15,
+  IPV4_99_1_2 = 16,
+  IPV4_99_1_3 = 17,
+  IPV4_99_2_2 = 18,
+  IPV4_99_2_3 = 19,
+  IPV4_99_3_2 = 20,
+  IPV4_99_3_3 = 21,
+  IPV4_99_4_2 = 22,
+  IPV4_99_4_3 = 23,
+  IPV4_DOT_1 = 24,
+  IPV4_DOT_2 = 25,
+  IPV4_DOT_3 = 26,
+  IPV4_OCTAL_1_2 = 27,
+  IPV4_OCTAL_2_2 = 28,
+  IPV4_OCTAL_2_DIGIT_1_3 = 29,
+  IPV4_OCTAL_2_DIGIT_2_3 = 30,
+  IPV4_OCTAL_2_DIGIT_3_3 = 31,
+  IPV4_OCTAL_2_DIGIT_4_3 = 32,
+  IPV4_OCTAL_3_2 = 33,
+  IPV4_OCTAL_3_DIGIT_1_3 = 34,
+  IPV4_OCTAL_3_DIGIT_1_4 = 35,
+  IPV4_OCTAL_3_DIGIT_2_3 = 36,
+  IPV4_OCTAL_3_DIGIT_2_4 = 37,
+  IPV4_OCTAL_3_DIGIT_3_3 = 38,
+  IPV4_OCTAL_3_DIGIT_3_4 = 39,
+  IPV4_OCTAL_3_DIGIT_4_3 = 40,
+  IPV4_OCTAL_3_DIGIT_4_4 = 41,
+  IPV4_OCTAL_4_2 = 42,
+  IPV4_SEPARATOR_3 = 43,
+  IPV6_1_1 = 44,
+  IPV6_1_2 = 45,
+  IPV6_1_3 = 46,
+  IPV6_1_4 = 47,
+  IPV6_1_CLOSE = 48,
+  IPV6_2_2 = 49,
+  IPV6_2_2_COMPRESSED = 50,
+  IPV6_2_3 = 51,
+  IPV6_2_3_COMPRESSED = 52,
+  IPV6_2_4 = 53,
+  IPV6_2_4_COMPRESSED = 54,
+  IPV6_2_CLOSE = 55,
+  IPV6_3_1_COMPRESSED = 56,
+  IPV6_3_2 = 57,
+  IPV6_3_2_COMPRESSED = 58,
+  IPV6_3_3 = 59,
+  IPV6_3_3_COMPRESSED = 60,
+  IPV6_3_4 = 61,
+  IPV6_3_4_COMPRESSED = 62,
+  IPV6_3_CLOSE = 63,
+  IPV6_4_1_COMPRESSED = 64,
+  IPV6_4_2 = 65,
+  IPV6_4_2_COMPRESSED = 66,
+  IPV6_4_3 = 67,
+  IPV6_4_3_COMPRESSED = 68,
+  IPV6_4_4 = 69,
+  IPV6_4_4_COMPRESSED = 70,
+  IPV6_4_CLOSE = 71,
+  IPV6_5_1_COMPRESSED = 72,
+  IPV6_5_2 = 73,
+  IPV6_5_2_COMPRESSED = 74,
+  IPV6_5_3 = 75,
+  IPV6_5_3_COMPRESSED = 76,
+  IPV6_5_4 = 77,
+  IPV6_5_4_COMPRESSED = 78,
+  IPV6_5_CLOSE = 79,
+  IPV6_6_1_COMPRESSED = 80,
+  IPV6_6_2 = 81,
+  IPV6_6_2_COMPRESSED = 82,
+  IPV6_6_3 = 83,
+  IPV6_6_3_COMPRESSED = 84,
+  IPV6_6_4 = 85,
+  IPV6_6_4_COMPRESSED = 86,
+  IPV6_6_CLOSE = 87,
+  IPV6_7_1_COMPRESSED = 88,
+  IPV6_7_2 = 89,
+  IPV6_7_2_COMPRESSED = 90,
+  IPV6_7_3 = 91,
+  IPV6_7_3_COMPRESSED = 92,
+  IPV6_7_4 = 93,
+  IPV6_7_4_COMPRESSED = 94,
+  IPV6_7_CLOSE = 95,
+  IPV6_8_2 = 96,
+  IPV6_8_3 = 97,
+  IPV6_8_4 = 98,
+  IPV6_CLOSE = 99,
+  IPV6_SEP_1_1 = 100,
+  IPV6_SEP_1_2 = 101,
+  IPV6_SEP_2_1 = 102,
+  IPV6_SEP_2_1_COMPRESSED = 103,
+  IPV6_SEP_2_2 = 104,
+  IPV6_SEP_3_1 = 105,
+  IPV6_SEP_3_1_COMPRESSED = 106,
+  IPV6_SEP_3_2 = 107,
+  IPV6_SEP_4_1 = 108,
+  IPV6_SEP_4_1_COMPRESSED = 109,
+  IPV6_SEP_4_2 = 110,
+  IPV6_SEP_5_1 = 111,
+  IPV6_SEP_5_1_COMPRESSED = 112,
+  IPV6_SEP_5_2 = 113,
+  IPV6_SEP_6_1 = 114,
+  IPV6_SEP_6_1_COMPRESSED = 115,
+  IPV6_SEP_6_2 = 116,
+  IPV6_SEP_7_1 = 117,
+  IPV6_SEP_7_2 = 118,
+  IPV6_ZONE_ID = 119,
+  IPV6_ZONE_ID_1 = 120,
+  IPV6_ZONE_ID_2 = 121,
+  IPV6_ZONE_ID_3 = 122,
+  IPV6_ZONE_ID_4 = 123,
+  IPV6_ZONE_ID_5 = 124,
+  IPV6_ZONE_ID_6 = 125,
+  IPV6_ZONE_ID_7 = 126,
+  IPV6_ZONE_ID_8 = 127,
+  IPV6_ZONE_ID_9 = 128,
+  IP_END = 129,
+  PORT_1 = 130,
+  PORT_2 = 131,
+  PORT_3 = 132,
+  PORT_4 = 133,
+  PORT_5 = 134,
+  PORT_END = 135,
+};
+
+enum class CallbackCode {
+  NONE = 0,
+};
+
+using Callback = std::function<void(CallbackCode, StateCode, int)>;
+using LineCol = std::pair<int, int>;
+
+
+// Validates json string, returns error line/col if str is invalid json.
+inline std::pair<bool, LineCol> Validate(std::string_view str,
+                                         Callback callback = nullptr);
+
+// Extracts CallbackCode from the bytes.
+inline static CallbackCode ToCallbackCode(uint32_t code);
+
+// Extracts push StateCode from the bytes.
+inline static StateCode ToPushStateCode(uint32_t code);
+
+// Extracts active State code from the bytes.
+inline static StateCode ToCurrentStateCode(uint32_t code);
+
+// Returns code for current token and active state.
+inline static uint32_t CodeForToken(unsigned char c, StateCode state);
+
+// Checks the push bit is on.
+inline static bool HasPushBit(uint32_t code);
+
+// Checks the pop bit is on.
+inline static bool HasPopBit(uint32_t code);
+
+// Checks the shift bit is on.
+inline static bool HasShiftBit(uint32_t code);
+
+constexpr std::array<int, INT8_MAX> kTokenIndexes {
+    67, 67, 67, 67, 67, 67, 67, 67,
+    67, 67, 67, 67, 67, 67, 67, 67,
+    67, 67, 67, 67, 67, 67, 67, 67,
+    67, 67, 67, 67, 67, 67, 67, 67,
+    67, 67, 67, 67, 67, 0, 67, 67,
+    67, 67, 67, 67, 67, 67, 1, 67,
+    2, 3, 4, 5, 6, 7, 8, 9,
+    10, 11, 12, 67, 67, 67, 67, 67,
+    67, 13, 14, 15, 16, 17, 18, 19,
+    20, 21, 22, 23, 24, 25, 26, 27,
+    28, 29, 30, 31, 32, 33, 34, 35,
+    36, 37, 38, 39, 67, 40, 67, 67,
+    67, 41, 42, 43, 44, 45, 46, 47,
+    48, 49, 50, 51, 52, 53, 54, 55,
+    56, 57, 58, 59, 60, 61, 62, 63,
+    64, 65, 66, 67, 67, 67, 67, };
+
+constexpr std::array<std::array<uint32_t, 69>, 136> kParseStates {{
+    // $
+    // Code: 0
+    {0xff, 0xff, 0x1b00, 0x1000, 0x800, 0x200,
+     0x200, 0x200, 0x200, 0x200, 0x200, 0x200,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0x2c00, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV4_2
+    // Code: 1
+    {0xff, 0xff, 0x1c00, 0x1200, 0xa00, 0x300,
+     0x300, 0x300, 0x300, 0x300, 0x300, 0x300,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV4_2DIG_1_2
+    // Code: 2
+    {0xff, 0x100, 0x1800, 0x1800, 0x1800, 0x1800,
+     0x1800, 0x1800, 0x1800, 0x1800, 0x1800, 0x1800,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV4_2DIG_2_2
+    // Code: 3
+    {0xff, 0x600, 0x1900, 0x1900, 0x1900, 0x1900,
+     0x1900, 0x1900, 0x1900, 0x1900, 0x1900, 0x1900,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV4_2DIG_3_2
+    // Code: 4
+    {0xff, 0x700, 0x2b00, 0x2b00, 0x2b00, 0x2b00,
+     0x2b00, 0x2b00, 0x2b00, 0x2b00, 0x2b00, 0x2b00,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV4_2DIG_4_2
+    // Code: 5
+    {0xff, 0xff, 0x8100, 0x8100, 0x8100, 0x8100,
+     0x8100, 0x8100, 0x8100, 0x8100, 0x8100, 0x8100,
+     0x8200, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0x40, 0x40},
+    // IPV4_3
+    // Code: 6
+    {0xff, 0xff, 0x2100, 0x1400, 0xc00, 0x400,
+     0x400, 0x400, 0x400, 0x400, 0x400, 0x400,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV4_4
+    // Code: 7
+    {0xff, 0xff, 0x2a00, 0x1600, 0xe00, 0x500,
+     0x500, 0x500, 0x500, 0x500, 0x500, 0x500,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV4_55_1_2
+    // Code: 8
+    {0xff, 0x100, 0x900, 0x900, 0x900, 0x900,
+     0x900, 0x900, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV4_55_1_3
+    // Code: 9
+    {0xff, 0x100, 0x1800, 0x1800, 0x1800, 0x1800,
+     0x1800, 0x1800, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV4_55_2_2
+    // Code: 10
+    {0xff, 0x600, 0xb00, 0xb00, 0xb00, 0xb00,
+     0xb00, 0xb00, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV4_55_2_3
+    // Code: 11
+    {0xff, 0x600, 0x1900, 0x1900, 0x1900, 0x1900,
+     0x1900, 0x1900, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV4_55_3_2
+    // Code: 12
+    {0xff, 0x700, 0xd00, 0xd00, 0xd00, 0xd00,
+     0xd00, 0xd00, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV4_55_3_3
+    // Code: 13
+    {0xff, 0x700, 0x2b00, 0x2b00, 0x2b00, 0x2b00,
+     0x2b00, 0x2b00, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV4_55_4_2
+    // Code: 14
+    {0xff, 0xff, 0xf00, 0xf00, 0xf00, 0xf00,
+     0xf00, 0xf00, 0xff, 0xff, 0xff, 0xff,
+     0x8200, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0x40, 0x40},
+    // IPV4_55_4_3
+    // Code: 15
+    {0xff, 0xff, 0x8100, 0x8100, 0x8100, 0x8100,
+     0x8100, 0x8100, 0xff, 0xff, 0xff, 0xff,
+     0x8200, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0x40, 0x40},
+    // IPV4_99_1_2
+    // Code: 16
+    {0xff, 0x100, 0x1100, 0x1100, 0x1100, 0x1100,
+     0x1100, 0x1100, 0x1100, 0x1100, 0x1100, 0x1100,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV4_99_1_3
+    // Code: 17
+    {0xff, 0x100, 0x1800, 0x1800, 0x1800, 0x1800,
+     0x1800, 0x1800, 0x1800, 0x1800, 0x1800, 0x1800,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV4_99_2_2
+    // Code: 18
+    {0xff, 0x600, 0x1300, 0x1300, 0x1300, 0x1300,
+     0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV4_99_2_3
+    // Code: 19
+    {0xff, 0x600, 0x1900, 0x1900, 0x1900, 0x1900,
+     0x1900, 0x1900, 0x1900, 0x1900, 0x1900, 0x1900,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV4_99_3_2
+    // Code: 20
+    {0xff, 0x700, 0x1500, 0x1500, 0x1500, 0x1500,
+     0x1500, 0x1500, 0x1500, 0x1500, 0x1500, 0x1500,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV4_99_3_3
+    // Code: 21
+    {0xff, 0x700, 0x2b00, 0x2b00, 0x2b00, 0x2b00,
+     0x2b00, 0x2b00, 0x2b00, 0x2b00, 0x2b00, 0x2b00,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV4_99_4_2
+    // Code: 22
+    {0xff, 0xff, 0x1700, 0x1700, 0x1700, 0x1700,
+     0x1700, 0x1700, 0x1700, 0x1700, 0x1700, 0x1700,
+     0x8200, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0x40, 0x40},
+    // IPV4_99_4_3
+    // Code: 23
+    {0xff, 0xff, 0x8100, 0x8100, 0x8100, 0x8100,
+     0x8100, 0x8100, 0x8100, 0x8100, 0x8100, 0x8100,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV4_DOT_1
+    // Code: 24
+    {0xff, 0x100, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV4_DOT_2
+    // Code: 25
+    {0xff, 0x600, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV4_DOT_3
+    // Code: 26
+    {0xff, 0x700, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV4_OCTAL_1_2
+    // Code: 27
+    {0xff, 0x100, 0xff, 0x2200, 0x2200, 0x2200,
+     0x1d00, 0x1d00, 0x1d00, 0x1d00, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV4_OCTAL_2_2
+    // Code: 28
+    {0xff, 0x600, 0xff, 0x2400, 0x2400, 0x2400,
+     0x1e00, 0x1e00, 0x1e00, 0x1e00, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV4_OCTAL_2_DIGIT_1_3
+    // Code: 29
+    {0xff, 0x100, 0x100, 0x100, 0x100, 0x100,
+     0x100, 0x100, 0x100, 0x100, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV4_OCTAL_2_DIGIT_2_3
+    // Code: 30
+    {0xff, 0x600, 0x600, 0x600, 0x600, 0x600,
+     0x600, 0x600, 0x600, 0x600, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV4_OCTAL_2_DIGIT_3_3
+    // Code: 31
+    {0xff, 0x700, 0x700, 0x700, 0x700, 0x700,
+     0x700, 0x700, 0x700, 0x700, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV4_OCTAL_2_DIGIT_4_3
+    // Code: 32
+    {0xff, 0xff, 0x8100, 0x8100, 0x8100, 0x8100,
+     0x8100, 0x8100, 0x8100, 0x8100, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV4_OCTAL_3_2
+    // Code: 33
+    {0xff, 0x700, 0xff, 0x2600, 0x2600, 0x2600,
+     0x1f00, 0x1f00, 0x1f00, 0x1f00, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV4_OCTAL_3_DIGIT_1_3
+    // Code: 34
+    {0xff, 0x100, 0x2300, 0x2300, 0x2300, 0x2300,
+     0x2300, 0x2300, 0x2300, 0x2300, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV4_OCTAL_3_DIGIT_1_4
+    // Code: 35
+    {0xff, 0x100, 0x1800, 0x1800, 0x1800, 0x1800,
+     0x1800, 0x1800, 0x1800, 0x1800, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV4_OCTAL_3_DIGIT_2_3
+    // Code: 36
+    {0xff, 0xff, 0x2500, 0x2500, 0x2500, 0x2500,
+     0x2500, 0x2500, 0x2500, 0x2500, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV4_OCTAL_3_DIGIT_2_4
+    // Code: 37
+    {0xff, 0x600, 0x1900, 0x1900, 0x1900, 0x1900,
+     0x1900, 0x1900, 0x1900, 0x1900, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV4_OCTAL_3_DIGIT_3_3
+    // Code: 38
+    {0xff, 0xff, 0x2700, 0x2700, 0x2700, 0x2700,
+     0x2700, 0x2700, 0x2700, 0x2700, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV4_OCTAL_3_DIGIT_3_4
+    // Code: 39
+    {0xff, 0x700, 0x1a00, 0x1a00, 0x1a00, 0x1a00,
+     0x1a00, 0x1a00, 0x1a00, 0x1a00, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV4_OCTAL_3_DIGIT_4_3
+    // Code: 40
+    {0xff, 0xff, 0x2900, 0x2900, 0x2900, 0x2900,
+     0x2900, 0x2900, 0x2900, 0x2900, 0xff, 0xff,
+     0x8200, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0x40, 0x40},
+    // IPV4_OCTAL_3_DIGIT_4_4
+    // Code: 41
+    {0xff, 0xff, 0x8100, 0x8100, 0x8100, 0x8100,
+     0x8100, 0x8100, 0x8100, 0x8100, 0xff, 0xff,
+     0x8200, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0x40, 0x40},
+    // IPV4_OCTAL_4_2
+    // Code: 42
+    {0xff, 0xff, 0xff, 0x2800, 0x2800, 0x2800,
+     0x2000, 0x2000, 0x2000, 0x2000, 0xff, 0xff,
+     0x8200, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0x40, 0x40},
+    // IPV4_SEPARATOR_3
+    // Code: 43
+    {0xff, 0x700, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_1_1
+    // Code: 44
+    {0xff, 0xff, 0x2d00, 0x2d00, 0x2d00, 0x2d00,
+     0x2d00, 0x2d00, 0x2d00, 0x2d00, 0x2d00, 0x2d00,
+     0x6500, 0x2d00, 0x2d00, 0x2d00, 0x2d00, 0x2d00,
+     0x2d00, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x2d00,
+     0x2d00, 0x2d00, 0x2d00, 0x2d00, 0x2d00, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_1_2
+    // Code: 45
+    {0xff, 0xff, 0x2e00, 0x2e00, 0x2e00, 0x2e00,
+     0x2e00, 0x2e00, 0x2e00, 0x2e00, 0x2e00, 0x2e00,
+     0x6500, 0x2e00, 0x2e00, 0x2e00, 0x2e00, 0x2e00,
+     0x2e00, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x2e00,
+     0x2e00, 0x2e00, 0x2e00, 0x2e00, 0x2e00, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_1_3
+    // Code: 46
+    {0xff, 0xff, 0x2f00, 0x2f00, 0x2f00, 0x2f00,
+     0x2f00, 0x2f00, 0x2f00, 0x2f00, 0x2f00, 0x2f00,
+     0x6500, 0x2f00, 0x2f00, 0x2f00, 0x2f00, 0x2f00,
+     0x2f00, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x2f00,
+     0x2f00, 0x2f00, 0x2f00, 0x2f00, 0x2f00, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_1_4
+    // Code: 47
+    {0xff, 0xff, 0x6400, 0x6400, 0x6400, 0x6400,
+     0x6400, 0x6400, 0x6400, 0x6400, 0x6400, 0x6400,
+     0x6500, 0x6400, 0x6400, 0x6400, 0x6400, 0x6400,
+     0x6400, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x6400,
+     0x6400, 0x6400, 0x6400, 0x6400, 0x6400, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_1_CLOSE
+    // Code: 48
+    {0xff, 0xff, 0x3200, 0x3200, 0x3200, 0x3200,
+     0x3200, 0x3200, 0x3200, 0x3200, 0x3200, 0x3200,
+     0xff, 0x3200, 0x3200, 0x3200, 0x3200, 0x3200,
+     0x3200, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x8100, 0x3200,
+     0x3200, 0x3200, 0x3200, 0x3200, 0x3200, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_2_2
+    // Code: 49
+    {0xff, 0xff, 0x3300, 0x3300, 0x3300, 0x3300,
+     0x3300, 0x3300, 0x3300, 0x3300, 0x3300, 0x3300,
+     0x6800, 0x3300, 0x3300, 0x3300, 0x3300, 0x3300,
+     0x3300, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x3300,
+     0x3300, 0x3300, 0x3300, 0x3300, 0x3300, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_2_2_COMPRESSED
+    // Code: 50
+    {0x7800, 0xff, 0x3400, 0x3400, 0x3400, 0x3400,
+     0x3400, 0x3400, 0x3400, 0x3400, 0x3400, 0x3400,
+     0x3800, 0x3400, 0x3400, 0x3400, 0x3400, 0x3400,
+     0x3400, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x8100, 0x3400,
+     0x3400, 0x3400, 0x3400, 0x3400, 0x3400, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_2_3
+    // Code: 51
+    {0xff, 0xff, 0x3500, 0x3500, 0x3500, 0x3500,
+     0x3500, 0x3500, 0x3500, 0x3500, 0x3500, 0x3500,
+     0x6800, 0x3500, 0x3500, 0x3500, 0x3500, 0x3500,
+     0x3500, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x3500,
+     0x3500, 0x3500, 0x3500, 0x3500, 0x3500, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_2_3_COMPRESSED
+    // Code: 52
+    {0x7800, 0xff, 0x3600, 0x3600, 0x3600, 0x3600,
+     0x3600, 0x3600, 0x3600, 0x3600, 0x3600, 0x3600,
+     0x3800, 0x3600, 0x3600, 0x3600, 0x3600, 0x3600,
+     0x3600, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x8100, 0x3600,
+     0x3600, 0x3600, 0x3600, 0x3600, 0x3600, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_2_4
+    // Code: 53
+    {0xff, 0xff, 0x6600, 0x6600, 0x6600, 0x6600,
+     0x6600, 0x6600, 0x6600, 0x6600, 0x6600, 0x6600,
+     0x6800, 0x6600, 0x6600, 0x6600, 0x6600, 0x6600,
+     0x6600, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x6600,
+     0x6600, 0x6600, 0x6600, 0x6600, 0x6600, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_2_4_COMPRESSED
+    // Code: 54
+    {0x7800, 0xff, 0x6700, 0x6700, 0x6700, 0x6700,
+     0x6700, 0x6700, 0x6700, 0x6700, 0x6700, 0x6700,
+     0x3800, 0x6700, 0x6700, 0x6700, 0x6700, 0x6700,
+     0x6700, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x8100, 0x6700,
+     0x6700, 0x6700, 0x6700, 0x6700, 0x6700, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_2_CLOSE
+    // Code: 55
+    {0xff, 0xff, 0x3a00, 0x3a00, 0x3a00, 0x3a00,
+     0x3a00, 0x3a00, 0x3a00, 0x3a00, 0x3a00, 0x3a00,
+     0xff, 0x3a00, 0x3a00, 0x3a00, 0x3a00, 0x3a00,
+     0x3a00, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x8100, 0x3a00,
+     0x3a00, 0x3a00, 0x3a00, 0x3a00, 0x3a00, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_3_1_COMPRESSED
+    // Code: 56
+    {0xff, 0xff, 0x3a00, 0x3a00, 0x3a00, 0x3a00,
+     0x3a00, 0x3a00, 0x3a00, 0x3a00, 0x3a00, 0x3a00,
+     0xff, 0x3a00, 0x3a00, 0x3a00, 0x3a00, 0x3a00,
+     0x3a00, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x3a00,
+     0x3a00, 0x3a00, 0x3a00, 0x3a00, 0x3a00, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_3_2
+    // Code: 57
+    {0xff, 0xff, 0x3b00, 0x3b00, 0x3b00, 0x3b00,
+     0x3b00, 0x3b00, 0x3b00, 0x3b00, 0x3b00, 0x3b00,
+     0x6b00, 0x3b00, 0x3b00, 0x3b00, 0x3b00, 0x3b00,
+     0x3b00, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x3b00,
+     0x3b00, 0x3b00, 0x3b00, 0x3b00, 0x3b00, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_3_2_COMPRESSED
+    // Code: 58
+    {0x7800, 0xff, 0x3c00, 0x3c00, 0x3c00, 0x3c00,
+     0x3c00, 0x3c00, 0x3c00, 0x3c00, 0x3c00, 0x3c00,
+     0x4000, 0x3c00, 0x3c00, 0x3c00, 0x3c00, 0x3c00,
+     0x3c00, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x8100, 0x3c00,
+     0x3c00, 0x3c00, 0x3c00, 0x3c00, 0x3c00, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_3_3
+    // Code: 59
+    {0xff, 0xff, 0x3d00, 0x3d00, 0x3d00, 0x3d00,
+     0x3d00, 0x3d00, 0x3d00, 0x3d00, 0x3d00, 0x3d00,
+     0x6b00, 0x3d00, 0x3d00, 0x3d00, 0x3d00, 0x3d00,
+     0x3d00, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x3d00,
+     0x3d00, 0x3d00, 0x3d00, 0x3d00, 0x3d00, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_3_3_COMPRESSED
+    // Code: 60
+    {0x7800, 0xff, 0x3e00, 0x3e00, 0x3e00, 0x3e00,
+     0x3e00, 0x3e00, 0x3e00, 0x3e00, 0x3e00, 0x3e00,
+     0x4000, 0x3e00, 0x3e00, 0x3e00, 0x3e00, 0x3e00,
+     0x3e00, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x8100, 0x3e00,
+     0x3e00, 0x3e00, 0x3e00, 0x3e00, 0x3e00, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_3_4
+    // Code: 61
+    {0xff, 0xff, 0x6900, 0x6900, 0x6900, 0x6900,
+     0x6900, 0x6900, 0x6900, 0x6900, 0x6900, 0x6900,
+     0x6b00, 0x6900, 0x6900, 0x6900, 0x6900, 0x6900,
+     0x6900, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x6900,
+     0x6900, 0x6900, 0x6900, 0x6900, 0x6900, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_3_4_COMPRESSED
+    // Code: 62
+    {0x7800, 0xff, 0x6a00, 0x6a00, 0x6a00, 0x6a00,
+     0x6a00, 0x6a00, 0x6a00, 0x6a00, 0x6a00, 0x6a00,
+     0x4000, 0x6a00, 0x6a00, 0x6a00, 0x6a00, 0x6a00,
+     0x6a00, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x8100, 0x6a00,
+     0x6a00, 0x6a00, 0x6a00, 0x6a00, 0x6a00, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_3_CLOSE
+    // Code: 63
+    {0xff, 0xff, 0x4200, 0x4200, 0x4200, 0x4200,
+     0x4200, 0x4200, 0x4200, 0x4200, 0x4200, 0x4200,
+     0xff, 0x4200, 0x4200, 0x4200, 0x4200, 0x4200,
+     0x4200, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x8100, 0x4200,
+     0x4200, 0x4200, 0x4200, 0x4200, 0x4200, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_4_1_COMPRESSED
+    // Code: 64
+    {0xff, 0xff, 0x4200, 0x4200, 0x4200, 0x4200,
+     0x4200, 0x4200, 0x4200, 0x4200, 0x4200, 0x4200,
+     0xff, 0x4200, 0x4200, 0x4200, 0x4200, 0x4200,
+     0x4200, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x4200,
+     0x4200, 0x4200, 0x4200, 0x4200, 0x4200, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_4_2
+    // Code: 65
+    {0xff, 0xff, 0x4300, 0x4300, 0x4300, 0x4300,
+     0x4300, 0x4300, 0x4300, 0x4300, 0x4300, 0x4300,
+     0x6e00, 0x4300, 0x4300, 0x4300, 0x4300, 0x4300,
+     0x4300, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x4300,
+     0x4300, 0x4300, 0x4300, 0x4300, 0x4300, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_4_2_COMPRESSED
+    // Code: 66
+    {0x7800, 0xff, 0x4400, 0x4400, 0x4400, 0x4400,
+     0x4400, 0x4400, 0x4400, 0x4400, 0x4400, 0x4400,
+     0x4800, 0x4400, 0x4400, 0x4400, 0x4400, 0x4400,
+     0x4400, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x8100, 0x4400,
+     0x4400, 0x4400, 0x4400, 0x4400, 0x4400, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_4_3
+    // Code: 67
+    {0xff, 0xff, 0x4500, 0x4500, 0x4500, 0x4500,
+     0x4500, 0x4500, 0x4500, 0x4500, 0x4500, 0x4500,
+     0x6e00, 0x4500, 0x4500, 0x4500, 0x4500, 0x4500,
+     0x4500, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x4500,
+     0x4500, 0x4500, 0x4500, 0x4500, 0x4500, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_4_3_COMPRESSED
+    // Code: 68
+    {0x7800, 0xff, 0x4600, 0x4600, 0x4600, 0x4600,
+     0x4600, 0x4600, 0x4600, 0x4600, 0x4600, 0x4600,
+     0x4800, 0x4600, 0x4600, 0x4600, 0x4600, 0x4600,
+     0x4600, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x8100, 0x4600,
+     0x4600, 0x4600, 0x4600, 0x4600, 0x4600, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_4_4
+    // Code: 69
+    {0xff, 0xff, 0x6c00, 0x6c00, 0x6c00, 0x6c00,
+     0x6c00, 0x6c00, 0x6c00, 0x6c00, 0x6c00, 0x6c00,
+     0x6e00, 0x6c00, 0x6c00, 0x6c00, 0x6c00, 0x6c00,
+     0x6c00, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x6c00,
+     0x6c00, 0x6c00, 0x6c00, 0x6c00, 0x6c00, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_4_4_COMPRESSED
+    // Code: 70
+    {0x7800, 0xff, 0x6d00, 0x6d00, 0x6d00, 0x6d00,
+     0x6d00, 0x6d00, 0x6d00, 0x6d00, 0x6d00, 0x6d00,
+     0x4800, 0x6d00, 0x6d00, 0x6d00, 0x6d00, 0x6d00,
+     0x6d00, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x8100, 0x6d00,
+     0x6d00, 0x6d00, 0x6d00, 0x6d00, 0x6d00, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_4_CLOSE
+    // Code: 71
+    {0xff, 0xff, 0x4a00, 0x4a00, 0x4a00, 0x4a00,
+     0x4a00, 0x4a00, 0x4a00, 0x4a00, 0x4a00, 0x4a00,
+     0xff, 0x4a00, 0x4a00, 0x4a00, 0x4a00, 0x4a00,
+     0x4a00, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x8100, 0x4a00,
+     0x4a00, 0x4a00, 0x4a00, 0x4a00, 0x4a00, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_5_1_COMPRESSED
+    // Code: 72
+    {0xff, 0xff, 0x4a00, 0x4a00, 0x4a00, 0x4a00,
+     0x4a00, 0x4a00, 0x4a00, 0x4a00, 0x4a00, 0x4a00,
+     0xff, 0x4a00, 0x4a00, 0x4a00, 0x4a00, 0x4a00,
+     0x4a00, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x4a00,
+     0x4a00, 0x4a00, 0x4a00, 0x4a00, 0x4a00, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_5_2
+    // Code: 73
+    {0xff, 0xff, 0x4b00, 0x4b00, 0x4b00, 0x4b00,
+     0x4b00, 0x4b00, 0x4b00, 0x4b00, 0x4b00, 0x4b00,
+     0x7100, 0x4b00, 0x4b00, 0x4b00, 0x4b00, 0x4b00,
+     0x4b00, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x4b00,
+     0x4b00, 0x4b00, 0x4b00, 0x4b00, 0x4b00, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_5_2_COMPRESSED
+    // Code: 74
+    {0x7800, 0xff, 0x4c00, 0x4c00, 0x4c00, 0x4c00,
+     0x4c00, 0x4c00, 0x4c00, 0x4c00, 0x4c00, 0x4c00,
+     0x5000, 0x4c00, 0x4c00, 0x4c00, 0x4c00, 0x4c00,
+     0x4c00, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x8100, 0x4c00,
+     0x4c00, 0x4c00, 0x4c00, 0x4c00, 0x4c00, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_5_3
+    // Code: 75
+    {0xff, 0xff, 0x4d00, 0x4d00, 0x4d00, 0x4d00,
+     0x4d00, 0x4d00, 0x4d00, 0x4d00, 0x4d00, 0x4d00,
+     0x7100, 0x4d00, 0x4d00, 0x4d00, 0x4d00, 0x4d00,
+     0x4d00, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x4d00,
+     0x4d00, 0x4d00, 0x4d00, 0x4d00, 0x4d00, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_5_3_COMPRESSED
+    // Code: 76
+    {0x7800, 0xff, 0x4e00, 0x4e00, 0x4e00, 0x4e00,
+     0x4e00, 0x4e00, 0x4e00, 0x4e00, 0x4e00, 0x4e00,
+     0x5000, 0x4e00, 0x4e00, 0x4e00, 0x4e00, 0x4e00,
+     0x4e00, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x8100, 0x4e00,
+     0x4e00, 0x4e00, 0x4e00, 0x4e00, 0x4e00, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_5_4
+    // Code: 77
+    {0xff, 0xff, 0x6f00, 0x6f00, 0x6f00, 0x6f00,
+     0x6f00, 0x6f00, 0x6f00, 0x6f00, 0x6f00, 0x6f00,
+     0x7100, 0x6f00, 0x6f00, 0x6f00, 0x6f00, 0x6f00,
+     0x6f00, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x6f00,
+     0x6f00, 0x6f00, 0x6f00, 0x6f00, 0x6f00, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_5_4_COMPRESSED
+    // Code: 78
+    {0x7800, 0xff, 0x7000, 0x7000, 0x7000, 0x7000,
+     0x7000, 0x7000, 0x7000, 0x7000, 0x7000, 0x7000,
+     0x5000, 0x7000, 0x7000, 0x7000, 0x7000, 0x7000,
+     0x7000, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x8100, 0x7000,
+     0x7000, 0x7000, 0x7000, 0x7000, 0x7000, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_5_CLOSE
+    // Code: 79
+    {0xff, 0xff, 0x5200, 0x5200, 0x5200, 0x5200,
+     0x5200, 0x5200, 0x5200, 0x5200, 0x5200, 0x5200,
+     0xff, 0x5200, 0x5200, 0x5200, 0x5200, 0x5200,
+     0x5200, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x8100, 0x5200,
+     0x5200, 0x5200, 0x5200, 0x5200, 0x5200, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_6_1_COMPRESSED
+    // Code: 80
+    {0xff, 0xff, 0x5200, 0x5200, 0x5200, 0x5200,
+     0x5200, 0x5200, 0x5200, 0x5200, 0x5200, 0x5200,
+     0xff, 0x5200, 0x5200, 0x5200, 0x5200, 0x5200,
+     0x5200, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x5200,
+     0x5200, 0x5200, 0x5200, 0x5200, 0x5200, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_6_2
+    // Code: 81
+    {0xff, 0xff, 0x5300, 0x5300, 0x5300, 0x5300,
+     0x5300, 0x5300, 0x5300, 0x5300, 0x5300, 0x5300,
+     0x7400, 0x5300, 0x5300, 0x5300, 0x5300, 0x5300,
+     0x5300, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x5300,
+     0x5300, 0x5300, 0x5300, 0x5300, 0x5300, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_6_2_COMPRESSED
+    // Code: 82
+    {0x7800, 0xff, 0x5400, 0x5400, 0x5400, 0x5400,
+     0x5400, 0x5400, 0x5400, 0x5400, 0x5400, 0x5400,
+     0x5800, 0x5400, 0x5400, 0x5400, 0x5400, 0x5400,
+     0x5400, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x8100, 0x5400,
+     0x5400, 0x5400, 0x5400, 0x5400, 0x5400, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_6_3
+    // Code: 83
+    {0xff, 0xff, 0x5500, 0x5500, 0x5500, 0x5500,
+     0x5500, 0x5500, 0x5500, 0x5500, 0x5500, 0x5500,
+     0x7400, 0x5500, 0x5500, 0x5500, 0x5500, 0x5500,
+     0x5500, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x5500,
+     0x5500, 0x5500, 0x5500, 0x5500, 0x5500, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_6_3_COMPRESSED
+    // Code: 84
+    {0x7800, 0xff, 0x5600, 0x5600, 0x5600, 0x5600,
+     0x5600, 0x5600, 0x5600, 0x5600, 0x5600, 0x5600,
+     0x5800, 0x5600, 0x5600, 0x5600, 0x5600, 0x5600,
+     0x5600, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x8100, 0x5600,
+     0x5600, 0x5600, 0x5600, 0x5600, 0x5600, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_6_4
+    // Code: 85
+    {0xff, 0xff, 0x7200, 0x7200, 0x7200, 0x7200,
+     0x7200, 0x7200, 0x7200, 0x7200, 0x7200, 0x7200,
+     0x7400, 0x7200, 0x7200, 0x7200, 0x7200, 0x7200,
+     0x7200, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x7200,
+     0x7200, 0x7200, 0x7200, 0x7200, 0x7200, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_6_4_COMPRESSED
+    // Code: 86
+    {0x7800, 0xff, 0x7300, 0x7300, 0x7300, 0x7300,
+     0x7300, 0x7300, 0x7300, 0x7300, 0x7300, 0x7300,
+     0x5800, 0x7300, 0x7300, 0x7300, 0x7300, 0x7300,
+     0x7300, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x8100, 0x7300,
+     0x7300, 0x7300, 0x7300, 0x7300, 0x7300, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_6_CLOSE
+    // Code: 87
+    {0xff, 0xff, 0x5a00, 0x5a00, 0x5a00, 0x5a00,
+     0x5a00, 0x5a00, 0x5a00, 0x5a00, 0x5a00, 0x5a00,
+     0xff, 0x5a00, 0x5a00, 0x5a00, 0x5a00, 0x5a00,
+     0x5a00, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x8100, 0x5a00,
+     0x5a00, 0x5a00, 0x5a00, 0x5a00, 0x5a00, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_7_1_COMPRESSED
+    // Code: 88
+    {0xff, 0xff, 0x5a00, 0x5a00, 0x5a00, 0x5a00,
+     0x5a00, 0x5a00, 0x5a00, 0x5a00, 0x5a00, 0x5a00,
+     0xff, 0x5a00, 0x5a00, 0x5a00, 0x5a00, 0x5a00,
+     0x5a00, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x5a00,
+     0x5a00, 0x5a00, 0x5a00, 0x5a00, 0x5a00, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_7_2
+    // Code: 89
+    {0xff, 0xff, 0x5b00, 0x5b00, 0x5b00, 0x5b00,
+     0x5b00, 0x5b00, 0x5b00, 0x5b00, 0x5b00, 0x5b00,
+     0x7600, 0x5b00, 0x5b00, 0x5b00, 0x5b00, 0x5b00,
+     0x5b00, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x5b00,
+     0x5b00, 0x5b00, 0x5b00, 0x5b00, 0x5b00, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_7_2_COMPRESSED
+    // Code: 90
+    {0x7800, 0xff, 0x5c00, 0x5c00, 0x5c00, 0x5c00,
+     0x5c00, 0x5c00, 0x5c00, 0x5c00, 0x5c00, 0x5c00,
+     0xff, 0x5c00, 0x5c00, 0x5c00, 0x5c00, 0x5c00,
+     0x5c00, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x8100, 0x5c00,
+     0x5c00, 0x5c00, 0x5c00, 0x5c00, 0x5c00, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_7_3
+    // Code: 91
+    {0xff, 0xff, 0x5d00, 0x5d00, 0x5d00, 0x5d00,
+     0x5d00, 0x5d00, 0x5d00, 0x5d00, 0x5d00, 0x5d00,
+     0x7600, 0x5d00, 0x5d00, 0x5d00, 0x5d00, 0x5d00,
+     0x5d00, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x5d00,
+     0x5d00, 0x5d00, 0x5d00, 0x5d00, 0x5d00, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_7_3_COMPRESSED
+    // Code: 92
+    {0x7800, 0xff, 0x5e00, 0x5e00, 0x5e00, 0x5e00,
+     0x5e00, 0x5e00, 0x5e00, 0x5e00, 0x5e00, 0x5e00,
+     0xff, 0x5e00, 0x5e00, 0x5e00, 0x5e00, 0x5e00,
+     0x5e00, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x8100, 0x5e00,
+     0x5e00, 0x5e00, 0x5e00, 0x5e00, 0x5e00, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_7_4
+    // Code: 93
+    {0xff, 0xff, 0x7500, 0x7500, 0x7500, 0x7500,
+     0x7500, 0x7500, 0x7500, 0x7500, 0x7500, 0x7500,
+     0x7600, 0x7500, 0x7500, 0x7500, 0x7500, 0x7500,
+     0x7500, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x7500,
+     0x7500, 0x7500, 0x7500, 0x7500, 0x7500, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_7_4_COMPRESSED
+    // Code: 94
+    {0x7800, 0xff, 0x7700, 0x7700, 0x7700, 0x7700,
+     0x7700, 0x7700, 0x7700, 0x7700, 0x7700, 0x7700,
+     0xff, 0x7700, 0x7700, 0x7700, 0x7700, 0x7700,
+     0x7700, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x8100, 0x7700,
+     0x7700, 0x7700, 0x7700, 0x7700, 0x7700, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_7_CLOSE
+    // Code: 95
+    {0xff, 0xff, 0x6000, 0x6000, 0x6000, 0x6000,
+     0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000,
+     0xff, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000,
+     0x6000, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x8100, 0x6000,
+     0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_8_2
+    // Code: 96
+    {0x7800, 0xff, 0x6100, 0x6100, 0x6100, 0x6100,
+     0x6100, 0x6100, 0x6100, 0x6100, 0x6100, 0x6100,
+     0xff, 0x6100, 0x6100, 0x6100, 0x6100, 0x6100,
+     0x6100, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x8100, 0x6100,
+     0x6100, 0x6100, 0x6100, 0x6100, 0x6100, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_8_3
+    // Code: 97
+    {0x7800, 0xff, 0x6200, 0x6200, 0x6200, 0x6200,
+     0x6200, 0x6200, 0x6200, 0x6200, 0x6200, 0x6200,
+     0xff, 0x6200, 0x6200, 0x6200, 0x6200, 0x6200,
+     0x6200, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x8100, 0x6200,
+     0x6200, 0x6200, 0x6200, 0x6200, 0x6200, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_8_4
+    // Code: 98
+    {0x7800, 0xff, 0x6300, 0x6300, 0x6300, 0x6300,
+     0x6300, 0x6300, 0x6300, 0x6300, 0x6300, 0x6300,
+     0xff, 0x6300, 0x6300, 0x6300, 0x6300, 0x6300,
+     0x6300, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x8100, 0x6300,
+     0x6300, 0x6300, 0x6300, 0x6300, 0x6300, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_CLOSE
+    // Code: 99
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x8100, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_SEP_1_1
+    // Code: 100
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0x6500, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_SEP_1_2
+    // Code: 101
+    {0xff, 0xff, 0x3100, 0x3100, 0x3100, 0x3100,
+     0x3100, 0x3100, 0x3100, 0x3100, 0x3100, 0x3100,
+     0x3000, 0x3100, 0x3100, 0x3100, 0x3100, 0x3100,
+     0x3100, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x3100,
+     0x3100, 0x3100, 0x3100, 0x3100, 0x3100, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_SEP_2_1
+    // Code: 102
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0x6800, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_SEP_2_1_COMPRESSED
+    // Code: 103
+    {0x7800, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0x3800, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x8100, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_SEP_2_2
+    // Code: 104
+    {0xff, 0xff, 0x3900, 0x3900, 0x3900, 0x3900,
+     0x3900, 0x3900, 0x3900, 0x3900, 0x3900, 0x3900,
+     0x3700, 0x3900, 0x3900, 0x3900, 0x3900, 0x3900,
+     0x3900, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x3900,
+     0x3900, 0x3900, 0x3900, 0x3900, 0x3900, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_SEP_3_1
+    // Code: 105
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0x6b00, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_SEP_3_1_COMPRESSED
+    // Code: 106
+    {0x7800, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0x4000, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x8100, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_SEP_3_2
+    // Code: 107
+    {0xff, 0xff, 0x4100, 0x4100, 0x4100, 0x4100,
+     0x4100, 0x4100, 0x4100, 0x4100, 0x4100, 0x4100,
+     0x3f00, 0x4100, 0x4100, 0x4100, 0x4100, 0x4100,
+     0x4100, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x4100,
+     0x4100, 0x4100, 0x4100, 0x4100, 0x4100, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_SEP_4_1
+    // Code: 108
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0x6e00, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_SEP_4_1_COMPRESSED
+    // Code: 109
+    {0x7800, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0x4800, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x8100, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_SEP_4_2
+    // Code: 110
+    {0xff, 0xff, 0x4900, 0x4900, 0x4900, 0x4900,
+     0x4900, 0x4900, 0x4900, 0x4900, 0x4900, 0x4900,
+     0x4700, 0x4900, 0x4900, 0x4900, 0x4900, 0x4900,
+     0x4900, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x4900,
+     0x4900, 0x4900, 0x4900, 0x4900, 0x4900, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_SEP_5_1
+    // Code: 111
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0x7100, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_SEP_5_1_COMPRESSED
+    // Code: 112
+    {0x7800, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0x5000, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x8100, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_SEP_5_2
+    // Code: 113
+    {0xff, 0xff, 0x5100, 0x5100, 0x5100, 0x5100,
+     0x5100, 0x5100, 0x5100, 0x5100, 0x5100, 0x5100,
+     0x4f00, 0x5100, 0x5100, 0x5100, 0x5100, 0x5100,
+     0x5100, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x5100,
+     0x5100, 0x5100, 0x5100, 0x5100, 0x5100, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_SEP_6_1
+    // Code: 114
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0x7400, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_SEP_6_1_COMPRESSED
+    // Code: 115
+    {0x7800, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0x5800, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x8100, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_SEP_6_2
+    // Code: 116
+    {0xff, 0xff, 0x5900, 0x5900, 0x5900, 0x5900,
+     0x5900, 0x5900, 0x5900, 0x5900, 0x5900, 0x5900,
+     0x5700, 0x5900, 0x5900, 0x5900, 0x5900, 0x5900,
+     0x5900, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x5900,
+     0x5900, 0x5900, 0x5900, 0x5900, 0x5900, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_SEP_7_1
+    // Code: 117
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0x7600, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_SEP_7_2
+    // Code: 118
+    {0xff, 0xff, 0x6000, 0x6000, 0x6000, 0x6000,
+     0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000,
+     0x5f00, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000,
+     0x6000, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x6000,
+     0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_ZONE_ID
+    // Code: 119
+    {0x7800, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x8100, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IPV6_ZONE_ID_1
+    // Code: 120
+    {0xff, 0xff, 0x7900, 0x7900, 0x7900, 0x7900,
+     0x7900, 0x7900, 0x7900, 0x7900, 0x7900, 0x7900,
+     0xff, 0x7900, 0x7900, 0x7900, 0x7900, 0x7900,
+     0x7900, 0x7900, 0x7900, 0x7900, 0x7900, 0x7900,
+     0x7900, 0x7900, 0x7900, 0x7900, 0x7900, 0x7900,
+     0x7900, 0x7900, 0x7900, 0x7900, 0x7900, 0x7900,
+     0x7900, 0x7900, 0x7900, 0xff, 0x8100, 0x7900,
+     0x7900, 0x7900, 0x7900, 0x7900, 0x7900, 0x7900,
+     0x7900, 0x7900, 0x7900, 0x7900, 0x7900, 0x7900,
+     0x7900, 0x7900, 0x7900, 0x7900, 0x7900, 0x7900,
+     0x7900, 0x7900, 0x7900, 0x7900, 0x7900, 0x7900,
+     0x7900, 0xff, 0xff},
+    // IPV6_ZONE_ID_2
+    // Code: 121
+    {0xff, 0xff, 0x7a00, 0x7a00, 0x7a00, 0x7a00,
+     0x7a00, 0x7a00, 0x7a00, 0x7a00, 0x7a00, 0x7a00,
+     0xff, 0x7a00, 0x7a00, 0x7a00, 0x7a00, 0x7a00,
+     0x7a00, 0x7a00, 0x7a00, 0x7a00, 0x7a00, 0x7a00,
+     0x7a00, 0x7a00, 0x7a00, 0x7a00, 0x7a00, 0x7a00,
+     0x7a00, 0x7a00, 0x7a00, 0x7a00, 0x7a00, 0x7a00,
+     0x7a00, 0x7a00, 0x7a00, 0xff, 0x8100, 0x7a00,
+     0x7a00, 0x7a00, 0x7a00, 0x7a00, 0x7a00, 0x7a00,
+     0x7a00, 0x7a00, 0x7a00, 0x7a00, 0x7a00, 0x7a00,
+     0x7a00, 0x7a00, 0x7a00, 0x7a00, 0x7a00, 0x7a00,
+     0x7a00, 0x7a00, 0x7a00, 0x7a00, 0x7a00, 0x7a00,
+     0x7a00, 0xff, 0xff},
+    // IPV6_ZONE_ID_3
+    // Code: 122
+    {0xff, 0xff, 0x7b00, 0x7b00, 0x7b00, 0x7b00,
+     0x7b00, 0x7b00, 0x7b00, 0x7b00, 0x7b00, 0x7b00,
+     0xff, 0x7b00, 0x7b00, 0x7b00, 0x7b00, 0x7b00,
+     0x7b00, 0x7b00, 0x7b00, 0x7b00, 0x7b00, 0x7b00,
+     0x7b00, 0x7b00, 0x7b00, 0x7b00, 0x7b00, 0x7b00,
+     0x7b00, 0x7b00, 0x7b00, 0x7b00, 0x7b00, 0x7b00,
+     0x7b00, 0x7b00, 0x7b00, 0xff, 0x8100, 0x7b00,
+     0x7b00, 0x7b00, 0x7b00, 0x7b00, 0x7b00, 0x7b00,
+     0x7b00, 0x7b00, 0x7b00, 0x7b00, 0x7b00, 0x7b00,
+     0x7b00, 0x7b00, 0x7b00, 0x7b00, 0x7b00, 0x7b00,
+     0x7b00, 0x7b00, 0x7b00, 0x7b00, 0x7b00, 0x7b00,
+     0x7b00, 0xff, 0xff},
+    // IPV6_ZONE_ID_4
+    // Code: 123
+    {0xff, 0xff, 0x7c00, 0x7c00, 0x7c00, 0x7c00,
+     0x7c00, 0x7c00, 0x7c00, 0x7c00, 0x7c00, 0x7c00,
+     0xff, 0x7c00, 0x7c00, 0x7c00, 0x7c00, 0x7c00,
+     0x7c00, 0x7c00, 0x7c00, 0x7c00, 0x7c00, 0x7c00,
+     0x7c00, 0x7c00, 0x7c00, 0x7c00, 0x7c00, 0x7c00,
+     0x7c00, 0x7c00, 0x7c00, 0x7c00, 0x7c00, 0x7c00,
+     0x7c00, 0x7c00, 0x7c00, 0xff, 0x8100, 0x7c00,
+     0x7c00, 0x7c00, 0x7c00, 0x7c00, 0x7c00, 0x7c00,
+     0x7c00, 0x7c00, 0x7c00, 0x7c00, 0x7c00, 0x7c00,
+     0x7c00, 0x7c00, 0x7c00, 0x7c00, 0x7c00, 0x7c00,
+     0x7c00, 0x7c00, 0x7c00, 0x7c00, 0x7c00, 0x7c00,
+     0x7c00, 0xff, 0xff},
+    // IPV6_ZONE_ID_5
+    // Code: 124
+    {0xff, 0xff, 0x7d00, 0x7d00, 0x7d00, 0x7d00,
+     0x7d00, 0x7d00, 0x7d00, 0x7d00, 0x7d00, 0x7d00,
+     0xff, 0x7d00, 0x7d00, 0x7d00, 0x7d00, 0x7d00,
+     0x7d00, 0x7d00, 0x7d00, 0x7d00, 0x7d00, 0x7d00,
+     0x7d00, 0x7d00, 0x7d00, 0x7d00, 0x7d00, 0x7d00,
+     0x7d00, 0x7d00, 0x7d00, 0x7d00, 0x7d00, 0x7d00,
+     0x7d00, 0x7d00, 0x7d00, 0xff, 0x8100, 0x7d00,
+     0x7d00, 0x7d00, 0x7d00, 0x7d00, 0x7d00, 0x7d00,
+     0x7d00, 0x7d00, 0x7d00, 0x7d00, 0x7d00, 0x7d00,
+     0x7d00, 0x7d00, 0x7d00, 0x7d00, 0x7d00, 0x7d00,
+     0x7d00, 0x7d00, 0x7d00, 0x7d00, 0x7d00, 0x7d00,
+     0x7d00, 0xff, 0xff},
+    // IPV6_ZONE_ID_6
+    // Code: 125
+    {0xff, 0xff, 0x7e00, 0x7e00, 0x7e00, 0x7e00,
+     0x7e00, 0x7e00, 0x7e00, 0x7e00, 0x7e00, 0x7e00,
+     0xff, 0x7e00, 0x7e00, 0x7e00, 0x7e00, 0x7e00,
+     0x7e00, 0x7e00, 0x7e00, 0x7e00, 0x7e00, 0x7e00,
+     0x7e00, 0x7e00, 0x7e00, 0x7e00, 0x7e00, 0x7e00,
+     0x7e00, 0x7e00, 0x7e00, 0x7e00, 0x7e00, 0x7e00,
+     0x7e00, 0x7e00, 0x7e00, 0xff, 0x8100, 0x7e00,
+     0x7e00, 0x7e00, 0x7e00, 0x7e00, 0x7e00, 0x7e00,
+     0x7e00, 0x7e00, 0x7e00, 0x7e00, 0x7e00, 0x7e00,
+     0x7e00, 0x7e00, 0x7e00, 0x7e00, 0x7e00, 0x7e00,
+     0x7e00, 0x7e00, 0x7e00, 0x7e00, 0x7e00, 0x7e00,
+     0x7e00, 0xff, 0xff},
+    // IPV6_ZONE_ID_7
+    // Code: 126
+    {0xff, 0xff, 0x7f00, 0x7f00, 0x7f00, 0x7f00,
+     0x7f00, 0x7f00, 0x7f00, 0x7f00, 0x7f00, 0x7f00,
+     0xff, 0x7f00, 0x7f00, 0x7f00, 0x7f00, 0x7f00,
+     0x7f00, 0x7f00, 0x7f00, 0x7f00, 0x7f00, 0x7f00,
+     0x7f00, 0x7f00, 0x7f00, 0x7f00, 0x7f00, 0x7f00,
+     0x7f00, 0x7f00, 0x7f00, 0x7f00, 0x7f00, 0x7f00,
+     0x7f00, 0x7f00, 0x7f00, 0xff, 0x8100, 0x7f00,
+     0x7f00, 0x7f00, 0x7f00, 0x7f00, 0x7f00, 0x7f00,
+     0x7f00, 0x7f00, 0x7f00, 0x7f00, 0x7f00, 0x7f00,
+     0x7f00, 0x7f00, 0x7f00, 0x7f00, 0x7f00, 0x7f00,
+     0x7f00, 0x7f00, 0x7f00, 0x7f00, 0x7f00, 0x7f00,
+     0x7f00, 0xff, 0xff},
+    // IPV6_ZONE_ID_8
+    // Code: 127
+    {0xff, 0xff, 0x8000, 0x8000, 0x8000, 0x8000,
+     0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000,
+     0xff, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000,
+     0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000,
+     0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000,
+     0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000,
+     0x8000, 0x8000, 0x8000, 0xff, 0xff, 0x8000,
+     0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000,
+     0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000,
+     0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000,
+     0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000,
+     0x8000, 0xff, 0xff},
+    // IPV6_ZONE_ID_9
+    // Code: 128
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x8100, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // IP_END
+    // Code: 129
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0x8200, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0x40, 0x40},
+    // PORT_1
+    // Code: 130
+    {0xff, 0xff, 0x8300, 0x8300, 0x8300, 0x8300,
+     0x8300, 0x8300, 0x8300, 0x8300, 0x8300, 0x8300,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff},
+    // PORT_2
+    // Code: 131
+    {0xff, 0xff, 0x8400, 0x8400, 0x8400, 0x8400,
+     0x8400, 0x8400, 0x8400, 0x8400, 0x8400, 0x8400,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0x40, 0x40},
+    // PORT_3
+    // Code: 132
+    {0xff, 0xff, 0x8500, 0x8500, 0x8500, 0x8500,
+     0x8500, 0x8500, 0x8500, 0x8500, 0x8500, 0x8500,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0x40, 0x40},
+    // PORT_4
+    // Code: 133
+    {0xff, 0xff, 0x8600, 0x8600, 0x8600, 0x8600,
+     0x8600, 0x8600, 0x8600, 0x8600, 0x8600, 0x8600,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0x40, 0x40},
+    // PORT_5
+    // Code: 134
+    {0xff, 0xff, 0x8700, 0x8700, 0x8700, 0x8700,
+     0x8700, 0x8700, 0x8700, 0x8700, 0x8700, 0x8700,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0x40, 0x40},
+    // PORT_END
+    // Code: 135
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0x40, 0x40},
+}};
+
+
+inline static CallbackCode ToCallbackCode(uint32_t code) {
+  // 4th byte.
+  return static_cast<CallbackCode>((code & 0xff000000) >> 24);
+}
+
+inline static StateCode ToPushStateCode(uint32_t code) {
+  // 3rd byte.
+  return static_cast<StateCode>((code & 0x00ff0000) >> 16);
+}
+
+inline static StateCode ToCurrentStateCode(uint32_t code) {
+  // 2nd byte.
+  return static_cast<StateCode>((code & 0x0000ff00) >> 8);
+}
+
+inline static bool HasPushBit(uint32_t code) {
+  // 8th bit in first byte.
+  return (code & 0x80);
+}
+
+inline static bool HasPopBit(uint32_t code) {
+  // 7th bit in first byte.
+  return ((code & 0x40) >> 6) == 1;
+}
+
+inline static bool HasShiftBit(uint32_t code) {
+  // 6th bit in first byte.
+  return ((code & 0x20) >> 5) == 1;
+}
+
+inline static uint32_t CodeForToken(unsigned char c, StateCode state) {
+  if (c > INT8_MAX) {
+    return kParseStates[static_cast<uint8_t>(state)][67];
+  }
+  int index = kTokenIndexes[c];
+  if (index == -1) index = 68;
+  return kParseStates[static_cast<uint8_t>(state)][index];
+}
+
+
+inline std::optional<StateCode> ParseToken(
+    char c, StateCode state, int i, std::vector<StateCode>* states_stack,
+    Callback callback = nullptr) {
+  uint32_t code = CodeForToken(c, state);
+  if (code == 0xff) {
+    code = CodeForToken(0, state);
+  }
+
+  if (code == 0xff) {
+    return std::nullopt;
+  }
+
+  auto callback_code = ToCallbackCode(code);
+  if (callback && callback_code > CallbackCode::NONE) {
+    callback(callback_code, state, i);
+  }
+
+  if (HasPushBit(code)) {
+    auto shift_code = ToPushStateCode(code);
+    states_stack->push_back(shift_code);
+    return ToCurrentStateCode(code);
+  } else if (HasPopBit(code) && !states_stack->empty()) {
+    state = states_stack->back();
+    states_stack->pop_back();
+    return state;
+  } else if (HasShiftBit(code) && !states_stack->empty()) {
+    auto shift_state = states_stack->back();
+    states_stack->pop_back();
+    if (auto s = ParseToken(c, shift_state, i, states_stack); s) {
+      code = CodeForToken(c, shift_state);
+      callback_code = ToCallbackCode(code);
+      if (callback && callback_code > CallbackCode::NONE) {
+        callback(callback_code, shift_state, i);
+      }
+      return s.value();
+    } else {
+      return std::nullopt;
+    }
+  } else {
+    return ToCurrentStateCode(code);
+  }
+}
+
+std::pair<bool, LineCol> Validate(std::string_view str, Callback callback) {
+  StateCode state = StateCode::$;
+  uint32_t code = 0;
+  CallbackCode callback_code = CallbackCode::NONE;
+  std::vector<StateCode> states_stack {StateCode::$};
+
+  LineCol line_col{0, 0};
+  std::size_t str_size = str.size();
+  for (std::size_t i = 0; i < str_size; i++) {
+    uint8_t c = str.at(i);
+    if (c == '\n' || (c == '\r' &&
+                      i < str_size - 1 &&
+                      str.at(i + 1) != '\n')) {
+      line_col.first++;
+      line_col.second = 0;
+    } else {
+      line_col.second++;
+    }
+
+    auto s = ParseToken(c, state, i, &states_stack, callback);
+    if (!s.has_value()) {
+      // Invalid character.
+      return {false, line_col};
+    }
+    state = s.value();
+  }
+
+  code = CodeForToken(32, state);
+  callback_code = ToCallbackCode(code);
+  auto end = ParseToken(32, state, str.size() - 1, &states_stack, callback);
+  if (!end.has_value()) {
+    return {false, line_col};
+  }
+  state = end.value();
+  if (callback && callback_code > CallbackCode::NONE) {
+    callback(callback_code, state, str.size() - 1);
+  }
+
+  if (state != StateCode::$) {
+    return {false, line_col};
+  }
+
+  return {true, line_col};
+}
+
+}  // namespace htmlparser::ipaddress
+
+#endif  // CPP_HTMLPARSER_VALIDATORS_IPADDRESS_H_
diff --git a/validator/cpp/htmlparser/validators/ipaddress_test.cc b/validator/cpp/htmlparser/validators/ipaddress_test.cc
new file mode 100644
index 000000000000..fc3e9584ab02
--- /dev/null
+++ b/validator/cpp/htmlparser/validators/ipaddress_test.cc
@@ -0,0 +1,146 @@
+#include "cpp/htmlparser/validators/ipaddress.h"
+#include "gtest/gtest.h"
+
+namespace htmlparser::ipaddress {
+
+std::pair<bool, LineCol> V(std::string_view s) {
+  return Validate(s);
+}
+
+TEST(ParserTest, ValidIPs) {
+  EXPECT_TRUE(V("[1:2:3::abcd]").first);
+
+  // Octal IPv4
+  EXPECT_TRUE(V("010.010.010.010").first);  // 8.8.8.8
+  EXPECT_TRUE(V("010.010.010.010").first);  // 8.8.8.8:1000
+  EXPECT_TRUE(V("0376.0376.0376.0376").first);  // 254.254.254.254
+  // First two octal and next two decimal.
+  EXPECT_TRUE(V("010.010.8.8").first);
+  EXPECT_TRUE(V("010.010.192.8").first);
+  EXPECT_TRUE(V("1.2.3.4").first);
+  EXPECT_TRUE(V("100.254.200.199").first);
+  EXPECT_TRUE(V("1.2.3.4").first);
+  EXPECT_TRUE(V("100.254.200.199").first);
+  // Octal IPv4
+  EXPECT_TRUE(V("010.010.010.010").first);  // 8.8.8.8
+  EXPECT_TRUE(V("010.010.010.010:1000").first);  // 8.8.8.8:1000
+  // First two octal and next two decimal.
+  EXPECT_TRUE(V("010.010.8.8").first);
+  EXPECT_TRUE(V("010.010.192.8").first);
+  EXPECT_TRUE(V("1.2.3.4").first);
+  EXPECT_TRUE(V("100.254.200.199").first);
+  // Octal IPv4
+  EXPECT_TRUE(V("010.010.010.010").first);  // 8.8.8.8
+  EXPECT_TRUE(V("010.010.010.010:1000").first);  // 8.8.8.8:1000
+  EXPECT_TRUE(V("0376.0376.0376.0376").first);  // 254.254.254.254
+  // First two octal and next two decimal.
+  EXPECT_TRUE(V("010.010.8.8").first);
+  EXPECT_TRUE(V("010.010.192.8").first);
+
+  // IPv6
+  EXPECT_TRUE(
+      V("[2001:0db8:85a3:0000:0000:8a2e:0370:7334]:17000").first);
+  EXPECT_TRUE(V("[a:b:c:d:e:f:1:2]").first);
+  EXPECT_TRUE(V("[a:b::c:d:e:f]").first);
+  EXPECT_TRUE(V("[a::]").first);
+  EXPECT_TRUE(V("[a::b]").first);
+  EXPECT_TRUE(V("[a:b:c::]").first);
+  EXPECT_TRUE(V("[abcd:1234:8901:26dd:a94d:0000:0:0d]").first);
+  EXPECT_TRUE(V("[::a]").first);
+  // Same as above, uncompressed.
+  EXPECT_TRUE(V("[0:0:0:0:0:0:0:a]").first);
+  // Same as above, all 4 zerofill.
+  EXPECT_TRUE(V("[0000:0000:0000:0000:0000:0000:0000:a]").first);
+  // Empty OK.
+  EXPECT_TRUE(V("[::]").first);
+  EXPECT_TRUE(V("[::1]").first);
+
+  // Less than 8 groups in case of compressions.
+  EXPECT_TRUE(V("[a::b:c:d:e:f:1234]").first);
+
+  // IPV6 hostname and port.
+  EXPECT_TRUE(V("[a:b:c:d::e]:80").first);
+
+  // IPV6 with zone identifier.
+  EXPECT_TRUE(V("[1:2:3:4:5:6:7:8%eth0]").first);
+  EXPECT_TRUE(V("[1:2:3:4:5:6:7:8%anything]").first);
+  EXPECT_TRUE(V("[1::2000%32]").first);
+  EXPECT_TRUE(V("[1:2::2000%32]").first);
+  EXPECT_TRUE(V("[1:2:3::2000%32]").first);
+  EXPECT_TRUE(V("[1:2:3:4::2000%32]").first);
+  EXPECT_TRUE(V("[1:2:3:4:5::2000%32]").first);
+  EXPECT_TRUE(V("[1:2:3:4:5:6::2000%32]").first);
+
+  // Checks IPV6 closes in all compression scenarios.
+  EXPECT_TRUE(V("[1::a]").first);
+  EXPECT_TRUE(V("[1::ab]").first);
+  EXPECT_TRUE(V("[1::abc]").first);
+  EXPECT_TRUE(V("[1::abcd]").first);
+  EXPECT_TRUE(V("[1::abcd]").first);
+  EXPECT_TRUE(V("[11::abcd]").first);
+  EXPECT_TRUE(V("[111::abcd]").first);
+  EXPECT_TRUE(V("[1111::abcd]").first);
+  EXPECT_TRUE(V("[1:2::a]").first);
+  EXPECT_TRUE(V("[1:2::ab]").first);
+  EXPECT_TRUE(V("[1:2::abc]").first);
+  EXPECT_TRUE(V("[1:2::abcd]").first);
+  EXPECT_TRUE(V("[1:2:3::a]").first);
+  EXPECT_TRUE(V("[1:2:3::ab]").first);
+  EXPECT_TRUE(V("[1:2:3::abc]").first);
+  EXPECT_TRUE(V("[1:2:3::abcd]").first);
+  EXPECT_TRUE(V("[1:2:3:4::a]").first);
+  EXPECT_TRUE(V("[1:2:3:4::ab]").first);
+  EXPECT_TRUE(V("[1:2:3:4::abc]").first);
+  EXPECT_TRUE(V("[1:2:3:4::abcd]").first);
+  EXPECT_TRUE(V("[1:2:3:4:5::a]").first);
+  EXPECT_TRUE(V("[1:2:3:4:5::ab]").first);
+  EXPECT_TRUE(V("[1:2:3:4:5::abc]").first);
+  EXPECT_TRUE(V("[1:2:3:4:5::abcd]").first);
+  EXPECT_TRUE(V("[1:2:3:4:5:6::a]").first);
+  EXPECT_TRUE(V("[1:2:3:4:5:6::ab]").first);
+  EXPECT_TRUE(V("[1:2:3:4:5:6::abc]").first);
+  EXPECT_TRUE(V("[1:2:3:4:5:6::abcd]").first);
+}
+
+TEST(ParserTest, InValidURLs) {
+  // Two compression not valid.
+  EXPECT_FALSE(V("[a:b::c::d:e:f]").first);
+  // Non hexadecimal character.
+  EXPECT_FALSE(V("[xyz::abcd:0a]").first);
+  // Error occurred on 0th line and 1st column.
+  EXPECT_EQ(V("[xyz::abcd:0a]").second.first, 0);
+  EXPECT_EQ(V("[xyz::abcd:0a]").second.second, 2 /* x */);
+  // More than 4 bytes.
+  EXPECT_FALSE(V("[abcd:1234:abcde::]").first);
+  // Illegal characeters.
+  EXPECT_FALSE(V("[abcd:1234:abcd#::]").first);
+  EXPECT_FALSE(V("[abcd:123_:abcd::]").first);
+  EXPECT_FALSE(V("[abcd:123O:abcd::]").first);
+
+  // max 8 groups.
+  EXPECT_FALSE(V("[a:b:c:d:e:f:1:2:3]").first);
+  // Less than 8 in case of compression.
+  EXPECT_FALSE(V("[a:b:c:d:e::f:1:2]").first);
+
+  // Closed with wrong character.
+  EXPECT_FALSE(V("[a:::b:c}").first);
+
+  // Not closed.
+  EXPECT_FALSE(V("[a:::b:c").first);
+  // Column number is also reported. Error occurred on 0th line and 7th column.
+  EXPECT_EQ(V("[a::b:c").second.first, 0);
+  EXPECT_EQ(V("[a::b:c").second.second, 7 /* missing closing ] */);
+
+  // Invalid octal IPs.
+  // 038 = 256.
+  EXPECT_FALSE(V("038.010.010.010").first);
+  EXPECT_FALSE(V("010.038.010.010").first);
+  EXPECT_FALSE(V("010.010.038.010").first);
+  EXPECT_FALSE(V("010.010.010.038").first);
+  EXPECT_FALSE(V("038.10.10.10").first);
+  EXPECT_FALSE(V("10.038.10.10").first);
+  EXPECT_FALSE(V("10.10.038.10").first);
+  EXPECT_FALSE(V("10.10.10.038").first);
+}
+
+}  // namespace htmlparser::ipaddress
diff --git a/validator/cpp/htmlparser/validators/json.h b/validator/cpp/htmlparser/validators/json.h
new file mode 100644
index 000000000000..f367f98ea365
--- /dev/null
+++ b/validator/cpp/htmlparser/validators/json.h
@@ -0,0 +1,598 @@
+// -*- C++ -*-
+
+// AUTO GENERATED; DO NOT EDIT.
+// To regenerate this file, see comments in bin/validatorgen
+
+#ifndef CPP_HTMLPARSER_VALIDATORS_JSON_H_
+#define CPP_HTMLPARSER_VALIDATORS_JSON_H_
+
+#include <array>
+#include <functional>
+#include <iostream>
+#include <optional>
+#include <string_view>
+#include <utility>
+#include <vector>
+
+namespace htmlparser::json {
+
+enum class StateCode : uint8_t {
+  $ = 0,
+  ARRAY_FIRST_ITEM = 1,
+  ARRAY_NEXT_ITEM = 2,
+  ARRAY_SEPARATOR = 3,
+  DICT = 4,
+  DICT_END_OR_SEPARATOR = 5,
+  DICT_KEY = 6,
+  DICT_KEY_BEGIN_QUOTE = 7,
+  DICT_VALUE = 8,
+  FALSE_1 = 9,
+  FALSE_2 = 10,
+  FALSE_3 = 11,
+  FALSE_4 = 12,
+  NULL_1 = 13,
+  NULL_2 = 14,
+  NULL_3 = 15,
+  NUMBER = 16,
+  NUMBER_AFTER_E_DIGIT_NOTATION = 17,
+  NUMBER_AFTER_E_NOTATION = 18,
+  NUMBER_AFTER_HYPHEN = 19,
+  NUMBER_AFTER_PERIOD = 20,
+  NUMBER_AFTER_PERIOD_DIGIT = 21,
+  NUMBER_AFTER_PLUS_MINUS_AFTER_E_NOTATION = 22,
+  NUMBER_AFTER_ZERO = 23,
+  STRING = 24,
+  STRING_ESCAPE = 25,
+  TRUE_1 = 26,
+  TRUE_2 = 27,
+  TRUE_3 = 28,
+  UNICODE_HEX_CHAR_FIRST = 29,
+  UNICODE_HEX_CHAR_LAST = 30,
+  UNICODE_HEX_CHAR_SECOND = 31,
+  UNICODE_HEX_CHAR_THIRD = 32,
+};
+
+enum class CallbackCode {
+  NONE = 0,
+  ARRAY_END = 1,
+  ARRAY_T = 2,
+  ARRAY_VAL_END = 3,
+  DICT_END = 4,
+  DICT_KEY_BEGIN = 5,
+  DICT_KEY_END = 6,
+  DICT_T = 7,
+  DICT_VAL_END = 8,
+  FALSE_T = 9,
+  FLOATING_POINT_T = 10,
+  NULL_T = 11,
+  NUMBER_T = 12,
+  PARSE_END = 23,
+  ROOT_ARRAY = 13,
+  ROOT_BOOL_FALSE = 14,
+  ROOT_BOOL_TRUE = 15,
+  ROOT_DICT = 16,
+  ROOT_NULL_VAL = 17,
+  ROOT_NUMBER = 18,
+  ROOT_NUMBER_AFTER_ZERO = 19,
+  ROOT_STRING = 20,
+  STRING_T = 21,
+  TRUE_T = 22,
+};
+
+using Callback = std::function<void(CallbackCode, StateCode, int)>;
+using LineCol = std::pair<int, int>;
+
+
+// Validates json string, returns error line/col if str is invalid json.
+inline std::pair<bool, LineCol> Validate(std::string_view str,
+                                         Callback callback = nullptr);
+
+// Extracts CallbackCode from the bytes.
+inline static CallbackCode ToCallbackCode(uint32_t code);
+
+// Extracts push StateCode from the bytes.
+inline static StateCode ToPushStateCode(uint32_t code);
+
+// Extracts active State code from the bytes.
+inline static StateCode ToCurrentStateCode(uint32_t code);
+
+// Returns code for current token and active state.
+inline static uint32_t CodeForToken(unsigned char c, StateCode state);
+
+// Checks the push bit is on.
+inline static bool HasPushBit(uint32_t code);
+
+// Checks the pop bit is on.
+inline static bool HasPopBit(uint32_t code);
+
+// Checks the shift bit is on.
+inline static bool HasShiftBit(uint32_t code);
+
+constexpr std::array<int, INT8_MAX> kTokenIndexes {
+    44, 44, 44, 44, 44, 44, 44, 44,
+    44, 0, 1, 44, 44, 2, 44, 44,
+    44, 44, 44, 44, 44, 44, 44, 44,
+    44, 44, 44, 44, 44, 44, 44, 44,
+    3, 44, 4, 44, 44, 44, 44, 44,
+    44, 44, 44, 5, 6, 7, 8, 9,
+    10, 11, 12, 13, 14, 15, 16, 17,
+    18, 19, 20, 44, 44, 44, 44, 44,
+    44, 21, 22, 23, 24, 25, 26, 44,
+    44, 44, 44, 44, 44, 44, 44, 44,
+    44, 44, 44, 44, 44, 44, 44, 44,
+    44, 44, 44, 27, 28, 29, 44, 44,
+    44, 30, 31, 32, 33, 34, 35, 44,
+    44, 44, 44, 44, 36, 44, 37, 44,
+    44, 44, 38, 39, 40, 41, 44, 44,
+    44, 44, 44, 42, 44, 43, 44, };
+
+constexpr std::array<std::array<uint32_t, 46>, 33> kParseStates {{
+    // $
+    // Code: 0
+    {0x0, 0x0, 0x0, 0x0, 0x14001800, 0xff,
+     0xff, 0x12001300, 0xff, 0xff, 0x13001700, 0x12001000,
+     0x12001000, 0x12001000, 0x12001000, 0x12001000, 0x12001000, 0x12001000,
+     0x12001000, 0x12001000, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xd000100, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xe000900,
+     0xff, 0x11000d00, 0xff, 0xff, 0xf001a00, 0xff,
+     0x10000400, 0xff, 0xff, 0xff},
+    // ARRAY_FIRST_ITEM
+    // Code: 1
+    {0x100, 0x100, 0x100, 0x100, 0x15031880, 0xff,
+     0xff, 0xc031380, 0xff, 0xff, 0xc031780, 0xc031080,
+     0xc031080, 0xc031080, 0xc031080, 0xc031080, 0xc031080, 0xc031080,
+     0xc031080, 0xc031080, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0x2030180, 0xff, 0x1000040,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x9030980,
+     0xff, 0xb030d80, 0xff, 0xff, 0x16031a80, 0xff,
+     0x7030480, 0xff, 0xff, 0xff},
+    // ARRAY_NEXT_ITEM
+    // Code: 2
+    {0x200, 0x200, 0x200, 0x200, 0x15031880, 0xff,
+     0xff, 0xc031380, 0xff, 0xff, 0xc031780, 0xc031080,
+     0xc031080, 0xc031080, 0xc031080, 0xc031080, 0xc031080, 0xc031080,
+     0xc031080, 0xc031080, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0x2030180, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x9030980,
+     0xff, 0xb030d80, 0xff, 0xff, 0x16031a80, 0xff,
+     0x7030480, 0xff, 0xff, 0xff},
+    // ARRAY_SEPARATOR
+    // Code: 3
+    {0x300, 0x300, 0x300, 0x300, 0xff, 0xff,
+     0x3000200, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x1000040,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff},
+    // DICT
+    // Code: 4
+    {0x400, 0x400, 0x400, 0x400, 0x5061880, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0x4000040, 0xff, 0xff},
+    // DICT_END_OR_SEPARATOR
+    // Code: 5
+    {0x500, 0x500, 0x500, 0x500, 0xff, 0xff,
+     0x8000700, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0x4000040, 0xff, 0xff},
+    // DICT_KEY
+    // Code: 6
+    {0x600, 0x600, 0x600, 0x600, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0x6000800, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff},
+    // DICT_KEY_BEGIN_QUOTE
+    // Code: 7
+    {0x700, 0x700, 0x700, 0x700, 0x5061880, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff},
+    // DICT_VALUE
+    // Code: 8
+    {0x800, 0x800, 0x800, 0x800, 0x15051880, 0xff,
+     0xff, 0xc051380, 0xff, 0xff, 0xc051780, 0xc051080,
+     0xc051080, 0xc051080, 0xc051080, 0xc051080, 0xc051080, 0xc051080,
+     0xc051080, 0xc051080, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0x2050180, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x9050980,
+     0xff, 0xb050d80, 0xff, 0xff, 0x16051a80, 0xff,
+     0x7050480, 0xff, 0xff, 0xff},
+    // FALSE_1
+    // Code: 9
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xa00, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff},
+    // FALSE_2
+    // Code: 10
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xb00, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff},
+    // FALSE_3
+    // Code: 11
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xc00, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff},
+    // FALSE_4
+    // Code: 12
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x40, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff},
+    // NULL_1
+    // Code: 13
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xe00,
+     0xff, 0xff, 0xff, 0xff},
+    // NULL_2
+    // Code: 14
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xf00, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff},
+    // NULL_3
+    // Code: 15
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0x40, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff},
+    // NUMBER
+    // Code: 16
+    {0x40, 0x40, 0x40, 0x40, 0xff, 0xff,
+     0x20, 0xff, 0xa001400, 0xff, 0x1000, 0x1000,
+     0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000,
+     0x1000, 0x1000, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x20,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0x20, 0xff, 0xff},
+    // NUMBER_AFTER_E_DIGIT_NOTATION
+    // Code: 17
+    {0x20, 0x20, 0x20, 0x20, 0xff, 0xff,
+     0x20, 0xff, 0xff, 0xff, 0x1100, 0x1100,
+     0x1100, 0x1100, 0x1100, 0x1100, 0x1100, 0x1100,
+     0x1100, 0x1100, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x20,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0x20, 0xff, 0xff},
+    // NUMBER_AFTER_E_NOTATION
+    // Code: 18
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0x1600,
+     0xff, 0x1600, 0xff, 0xff, 0x1100, 0x1100,
+     0x1100, 0x1100, 0x1100, 0x1100, 0x1100, 0x1100,
+     0x1100, 0x1100, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff},
+    // NUMBER_AFTER_HYPHEN
+    // Code: 19
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x1700, 0x1000,
+     0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000,
+     0x1000, 0x1000, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff},
+    // NUMBER_AFTER_PERIOD
+    // Code: 20
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x1500, 0x1500,
+     0x1500, 0x1500, 0x1500, 0x1500, 0x1500, 0x1500,
+     0x1500, 0x1500, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff},
+    // NUMBER_AFTER_PERIOD_DIGIT
+    // Code: 21
+    {0x20, 0x20, 0x20, 0x20, 0xff, 0xff,
+     0x20, 0xff, 0xff, 0xff, 0x1500, 0x1500,
+     0x1500, 0x1500, 0x1500, 0x1500, 0x1500, 0x1500,
+     0x1500, 0x1500, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0x1200, 0xff, 0xff, 0xff, 0x20,
+     0xff, 0xff, 0xff, 0xff, 0x1200, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0x20, 0xff, 0xff},
+    // NUMBER_AFTER_PLUS_MINUS_AFTER_E_NOTATION
+    // Code: 22
+    {0x40, 0x40, 0x40, 0x40, 0xff, 0xff,
+     0x20, 0xff, 0xff, 0xff, 0x1600, 0x1600,
+     0x1600, 0x1600, 0x1600, 0x1600, 0x1600, 0x1600,
+     0x1600, 0x1600, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x20,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0x20, 0xff, 0xff},
+    // NUMBER_AFTER_ZERO
+    // Code: 23
+    {0x20, 0x20, 0x20, 0x20, 0xff, 0xff,
+     0x20, 0xff, 0xa001400, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0x1200, 0xff, 0xff, 0xff, 0x20,
+     0xff, 0xff, 0xff, 0xff, 0x1200, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0x20, 0xff, 0xff},
+    // STRING
+    // Code: 24
+    {0xff, 0xff, 0xff, 0xff, 0x40, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x1900, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0x1800, 0x1800},
+    // STRING_ESCAPE
+    // Code: 25
+    {0xff, 0xff, 0xff, 0xff, 0x1800, 0xff,
+     0xff, 0xff, 0xff, 0x1800, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x1800, 0xff,
+     0xff, 0x1800, 0xff, 0xff, 0xff, 0x1800,
+     0xff, 0x1800, 0x1800, 0xff, 0x1800, 0x1d00,
+     0xff, 0xff, 0xff, 0xff},
+    // TRUE_1
+    // Code: 26
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0x1b00, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff},
+    // TRUE_2
+    // Code: 27
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x1c00,
+     0xff, 0xff, 0xff, 0xff},
+    // TRUE_3
+    // Code: 28
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x40, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff},
+    // UNICODE_HEX_CHAR_FIRST
+    // Code: 29
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x1f00, 0x1f00,
+     0x1f00, 0x1f00, 0x1f00, 0x1f00, 0x1f00, 0x1f00,
+     0x1f00, 0x1f00, 0xff, 0x1f00, 0x1f00, 0x1f00,
+     0x1f00, 0x1f00, 0x1f00, 0xff, 0xff, 0xff,
+     0x1f00, 0x1f00, 0x1f00, 0x1f00, 0x1f00, 0x1f00,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff},
+    // UNICODE_HEX_CHAR_LAST
+    // Code: 30
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x1800, 0x1800,
+     0x1800, 0x1800, 0x1800, 0x1800, 0x1800, 0x1800,
+     0x1800, 0x1800, 0xff, 0x1800, 0x1800, 0x1800,
+     0x1800, 0x1800, 0x1800, 0xff, 0xff, 0xff,
+     0x1800, 0x1800, 0x1800, 0x1800, 0x1800, 0x1800,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff},
+    // UNICODE_HEX_CHAR_SECOND
+    // Code: 31
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x2000, 0x2000,
+     0x2000, 0x2000, 0x2000, 0x2000, 0x2000, 0x2000,
+     0x2000, 0x2000, 0xff, 0x2000, 0x2000, 0x2000,
+     0x2000, 0x2000, 0x2000, 0xff, 0xff, 0xff,
+     0x2000, 0x2000, 0x2000, 0x2000, 0x2000, 0x2000,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff},
+    // UNICODE_HEX_CHAR_THIRD
+    // Code: 32
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x1e00, 0x1e00,
+     0x1e00, 0x1e00, 0x1e00, 0x1e00, 0x1e00, 0x1e00,
+     0x1e00, 0x1e00, 0xff, 0x1e00, 0x1e00, 0x1e00,
+     0x1e00, 0x1e00, 0x1e00, 0xff, 0xff, 0xff,
+     0x1e00, 0x1e00, 0x1e00, 0x1e00, 0x1e00, 0x1e00,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff},
+}};
+
+
+inline static CallbackCode ToCallbackCode(uint32_t code) {
+  // 4th byte.
+  return static_cast<CallbackCode>((code & 0xff000000) >> 24);
+}
+
+inline static StateCode ToPushStateCode(uint32_t code) {
+  // 3rd byte.
+  return static_cast<StateCode>((code & 0x00ff0000) >> 16);
+}
+
+inline static StateCode ToCurrentStateCode(uint32_t code) {
+  // 2nd byte.
+  return static_cast<StateCode>((code & 0x0000ff00) >> 8);
+}
+
+inline static bool HasPushBit(uint32_t code) {
+  // 8th bit in first byte.
+  return (code & 0x80);
+}
+
+inline static bool HasPopBit(uint32_t code) {
+  // 7th bit in first byte.
+  return ((code & 0x40) >> 6) == 1;
+}
+
+inline static bool HasShiftBit(uint32_t code) {
+  // 6th bit in first byte.
+  return ((code & 0x20) >> 5) == 1;
+}
+
+inline static uint32_t CodeForToken(unsigned char c, StateCode state) {
+  if (c > INT8_MAX) {
+    return kParseStates[static_cast<uint8_t>(state)][44];
+  }
+  int index = kTokenIndexes[c];
+  if (index == -1) index = 45;
+  return kParseStates[static_cast<uint8_t>(state)][index];
+}
+
+
+inline std::optional<StateCode> ParseToken(
+    char c, StateCode state, int i, std::vector<StateCode>* states_stack,
+    Callback callback = nullptr) {
+  uint32_t code = CodeForToken(c, state);
+  if (code == 0xff) {
+    code = CodeForToken(0, state);
+  }
+
+  if (code == 0xff) {
+    return std::nullopt;
+  }
+
+  auto callback_code = ToCallbackCode(code);
+  if (callback && callback_code > CallbackCode::NONE) {
+    callback(callback_code, state, i);
+  }
+
+  if (HasPushBit(code)) {
+    auto shift_code = ToPushStateCode(code);
+    states_stack->push_back(shift_code);
+    return ToCurrentStateCode(code);
+  } else if (HasPopBit(code) && !states_stack->empty()) {
+    state = states_stack->back();
+    states_stack->pop_back();
+    return state;
+  } else if (HasShiftBit(code) && !states_stack->empty()) {
+    auto shift_state = states_stack->back();
+    states_stack->pop_back();
+    if (auto s = ParseToken(c, shift_state, i, states_stack); s) {
+      code = CodeForToken(c, shift_state);
+      callback_code = ToCallbackCode(code);
+      if (callback && callback_code > CallbackCode::NONE) {
+        callback(callback_code, shift_state, i);
+      }
+      return s.value();
+    } else {
+      return std::nullopt;
+    }
+  } else {
+    return ToCurrentStateCode(code);
+  }
+}
+
+std::pair<bool, LineCol> Validate(std::string_view str, Callback callback) {
+  StateCode state = StateCode::$;
+  uint32_t code = 0;
+  CallbackCode callback_code = CallbackCode::NONE;
+  std::vector<StateCode> states_stack {StateCode::$};
+
+  LineCol line_col{0, 0};
+  std::size_t str_size = str.size();
+  for (std::size_t i = 0; i < str_size; i++) {
+    uint8_t c = str.at(i);
+    if (c == '\n' || (c == '\r' &&
+                      i < str_size - 1 &&
+                      str.at(i + 1) != '\n')) {
+      line_col.first++;
+      line_col.second = 0;
+    } else {
+      line_col.second++;
+    }
+
+    auto s = ParseToken(c, state, i, &states_stack, callback);
+    if (!s.has_value()) {
+      // Invalid character.
+      return {false, line_col};
+    }
+    state = s.value();
+  }
+
+  code = CodeForToken(32, state);
+  callback_code = ToCallbackCode(code);
+  auto end = ParseToken(32, state, str.size() - 1, &states_stack, callback);
+  if (!end.has_value()) {
+    return {false, line_col};
+  }
+  state = end.value();
+  if (callback && callback_code > CallbackCode::NONE) {
+    callback(callback_code, state, str.size() - 1);
+  }
+
+  if (state != StateCode::$) {
+    return {false, line_col};
+  }
+
+  // Final callback denoting end of parsing.
+  if (callback) {
+    callback(CallbackCode::PARSE_END, state, str.size());
+  }
+
+  return {true, line_col};
+}
+
+}  // namespace htmlparser::json
+
+#endif  // CPP_HTMLPARSER_VALIDATORS_JSON_H_
diff --git a/validator/cpp/htmlparser/validators/json_test.cc b/validator/cpp/htmlparser/validators/json_test.cc
new file mode 100644
index 000000000000..5b9f37adc04d
--- /dev/null
+++ b/validator/cpp/htmlparser/validators/json_test.cc
@@ -0,0 +1,629 @@
+//
+// Copyright 2020 The AMP HTML Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS-IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the license.
+//
+
+#include "cpp/htmlparser/validators/json.h"
+
+#include <vector>
+
+#include <gmock/gmock.h>
+#include "gtest/gtest.h"
+
+namespace htmlparser::json {
+
+std::pair<bool, LineCol> V(std::string_view s, Callback callback = nullptr) {
+  return Validate(s, callback);
+}
+
+TEST(ParserTest, ValidJson) {
+  // true, false and null literals.
+  EXPECT_TRUE(V("true").first);
+  EXPECT_TRUE(V("false").first);
+  EXPECT_TRUE(V("null").first);
+
+  // Empty key is a valid json..
+  EXPECT_TRUE(V("{\"\":true}").first);
+
+  // String values.
+  // - Basic.
+  EXPECT_TRUE(V("\"amaltas\"").first);
+  EXPECT_TRUE(V("\"kotlin的练习demo\"").first);
+
+  // - Escaped quotes.
+  EXPECT_TRUE(V("\"am\\\"altas\"").first);
+  // - Contains tab.
+  EXPECT_TRUE(V("\"hello\tworld\"").first);
+  // - Contains formfeed.
+  EXPECT_TRUE(V("\"hello\fworld\"").first);
+  // - Contains linefeed.
+  EXPECT_TRUE(V("\"hello\rworld\"").first);
+  // - Contains newline.
+  EXPECT_TRUE(V("\"hello\nworld\"").first);
+  // - Contains backspace.
+  EXPECT_TRUE(V("\"hello\bworld\"").first);
+  // - Contains \uxxxx (u followed by four hex digits).
+  EXPECT_TRUE(V("\"hello\\uA93cworld\"").first);
+
+  // Number.
+  // - Basic.
+  // minus zero is valid value.
+  EXPECT_TRUE(V("-0").first);
+  // plus zero is not.
+  EXPECT_FALSE(V("+0").first);
+
+  EXPECT_TRUE(V("1234567890987654321").first);
+  // - Negative number.
+  EXPECT_TRUE(V("-1234567890987654321").first);
+  // Decimal number.
+  EXPECT_TRUE(V("3.1415926535897932384626433832795028841971693993751").first);
+  // Negative decimal number.
+  EXPECT_TRUE(V("-3.1415926535897932384626433832795028841971693993751").first);
+  // Exponent notation +.
+  EXPECT_TRUE(V("3.14e+3").first);
+  // Exponent notation -.
+  EXPECT_TRUE(V("3.14e-3").first);
+  // Exponent without notation.
+  EXPECT_TRUE(V("3.14e3").first);
+  // Negative number e notation.
+  EXPECT_TRUE(V("-3.14e+3").first);
+  EXPECT_TRUE(V("-3.14e-3").first);
+  EXPECT_TRUE(V("-3.14e3").first);
+  // Number starting with zero.
+  EXPECT_TRUE(V("0").first);
+  EXPECT_TRUE(V("0.123").first);
+  EXPECT_TRUE(V("-0.123").first);
+  EXPECT_TRUE(V("-0.123e+3").first);
+  EXPECT_TRUE(V("-0.123e-3").first);
+  EXPECT_TRUE(V("-0.123e3").first);
+  // Extra decimal cases.
+  EXPECT_TRUE(V("1.0e3").first);
+  EXPECT_TRUE(V("1.00001").first);
+  EXPECT_TRUE(V("1.10000").first);
+
+  EXPECT_TRUE(V("0e+3").first);
+
+  // Arrays.
+  // Empty.
+  EXPECT_TRUE(V("[]").first);
+  // Basic with same values.
+  EXPECT_TRUE(V("[1, 2, 3]").first);
+  EXPECT_TRUE(V("[\"amaltas\", \"seol\", \"hello\", \"ok\\uA93Cbye\"]").first);
+  EXPECT_TRUE(V("[true, false, false, true, true, null]").first);
+  EXPECT_TRUE(V("[1.0, 2.0, 3.0, 4.0e+3, 5.12e-3, 6.40e3, 0.1, -0.1]").first);
+  // Basic with diffrent type values.
+  EXPECT_TRUE(V("[1, true, \"amaltas\", 1.0, null, \"world\", false]").first);
+  // Array inside array.
+  EXPECT_TRUE(V("[1, [2, [3, [4, 5]]], true, false, [\"a\", \"b\"]]").first);
+  // End with a comma OK.
+  EXPECT_TRUE(V("[1, 2, 3]").first);
+  EXPECT_TRUE(V("[\"amaltas\", \"seol\", \"hello\", \"ok\\uA93Cbye\"]").first);
+  EXPECT_TRUE(V("[1.0, 2.0, 3.0, 4.0e+3, 5.12e-3, 6.40e3, 0.1, -0.1]").first);
+
+  // Object.
+  // Empty.
+  EXPECT_TRUE(V("{}").first);
+  // Basic with one value.
+  EXPECT_TRUE(V("{\"a\": 1}").first);
+  EXPECT_TRUE(V("{\"a\": true}").first);
+  EXPECT_TRUE(V("{\"a\": false}").first);
+  EXPECT_TRUE(V("{\"a\": null}").first);
+  EXPECT_TRUE(V("{\"a\": \"amaltas\"}").first);
+  EXPECT_TRUE(V("{\"a\": 1.0}").first);
+  EXPECT_TRUE(V("{\"a\": -1.0}").first);
+  EXPECT_TRUE(V("{\"a\": 0.1}").first);
+  EXPECT_TRUE(V("{\"a\": -123098}").first);
+  EXPECT_TRUE(V("{\"a\": 1.30e+35}").first);
+  EXPECT_TRUE(V("{\"a\": 1.30e-30}").first);
+  EXPECT_TRUE(V("{\"a\": 1.30e3}").first);
+  // Spaces everywhere.
+  EXPECT_TRUE(V("{      \"hello\"      :       \"world\"         }").first);
+  EXPECT_TRUE(V("{      \"hello\"      :       123         }").first);
+  EXPECT_TRUE(V("{      \"hello\"      :       true         }").first);
+  EXPECT_TRUE(V("{      \"hello\"      :       false         }").first);
+  EXPECT_TRUE(V("{      \"hello\"      :       null         }").first);
+  EXPECT_TRUE(V("{      \"hello\"      :       0.1232         }").first);
+  EXPECT_TRUE(V("{      \"hello\"      :       -123         }").first);
+  EXPECT_TRUE(V("{      \"hello\"      :       -0.193e+3         }").first);
+
+  // Multiple values, nested multi line objects.
+  auto v = V(R"(
+      {"hello": "world",
+       "foo": "bar",
+       "age": 33, "a": true,
+       "kids": 2,
+       "names": ["foo", "bar"],
+       "scores": [8, 10, [1, 2, 3.14, 0.34e+3], [-34.39, 0.340e-3, true]],
+       "addresses": [{
+           "home": "tracy, ca",
+           "zip": 95304}, {
+           "work": "MTV",
+           "zip": 94043}],
+       "own_home": true,
+       "has_car": false,
+       "ssn": null})");
+  EXPECT_TRUE(v.first);
+}
+
+TEST(ParserTest, InvalidJson) {
+  // The v.second below is pair of line/col where error is reported.
+  auto v = V("True");
+  EXPECT_FALSE(v.first);
+  EXPECT_EQ(v.second.second, 1 /* true is case sensitive. */);
+
+  v = V("tru");
+  EXPECT_FALSE(v.first);
+  EXPECT_EQ(v.second.second, 3 /* e missing */);
+
+  v = V("truE");
+  EXPECT_FALSE(v.first);
+  EXPECT_EQ(v.second.second, 4 /* uppercase E invalid */);
+
+  v = V("tuee");
+  EXPECT_FALSE(v.first);
+  EXPECT_EQ(v.second.second, 2 /* found u instead of r */);
+
+  v = V("truee");
+  EXPECT_FALSE(v.first);
+  EXPECT_EQ(v.second.second, 5 /* extra e */);
+
+  v = V("False");
+  EXPECT_FALSE(v.first);
+  EXPECT_EQ(v.second.second, 1 /* false is case sensitive. */);
+
+  v = V("fals");
+  EXPECT_FALSE(v.first);
+  EXPECT_EQ(v.second.second, 4 /* e missing */);
+
+  v = V("falsE");
+  EXPECT_FALSE(v.first);
+  EXPECT_EQ(v.second.second, 5 /* uppercase E invalid */);
+
+  v = V("faIse");
+  EXPECT_FALSE(v.first);
+  EXPECT_EQ(v.second.second, 3 /* found I instead of l */);
+
+  v = V("falsee");
+  EXPECT_FALSE(v.first);
+  EXPECT_EQ(v.second.second, 6 /* extra e */);
+
+  v = V("Null");
+  EXPECT_FALSE(v.first);
+  EXPECT_EQ(v.second.second, 1 /* null is case sensitive */);
+
+  v = V("nuIl");
+  EXPECT_FALSE(v.first);
+  EXPECT_EQ(v.second.second, 3 /* I instead of l */);
+
+  v = V("nul");
+  EXPECT_FALSE(v.first);
+  EXPECT_EQ(v.second.second, 3 /* second l missing */);
+
+  v = V("nil");
+  EXPECT_FALSE(v.first);
+  EXPECT_EQ(v.second.second, 2 /* nil is not a keyword */);
+
+  v = V("nulls");
+  EXPECT_FALSE(v.first);
+  EXPECT_EQ(v.second.second, 5 /* extra 's char is invalid */);
+
+  // 0 prefix number are invalid. But -0 is valid. +0 is not.
+  EXPECT_FALSE(V("01234").first);
+  EXPECT_TRUE(V("-0").first);
+  EXPECT_FALSE(V("+0").first);
+  EXPECT_FALSE(V("00000").first);
+
+  v = V("1.234.55");
+  EXPECT_FALSE(v.first);
+  EXPECT_EQ(v.second.second, 6);
+
+  v = V("1.23e+e34");
+  EXPECT_FALSE(v.first);
+  EXPECT_EQ(v.second.second, 7 /* two e */);
+
+  v = V("123e4");
+  EXPECT_FALSE(v.first);
+  EXPECT_EQ(v.second.second, 4 /* e not allowed here */);
+
+  v = V("123.e+4");
+  EXPECT_FALSE(v.first);
+  EXPECT_EQ(v.second.second, 5 /* e not allowed immediately after period */);
+
+  v = V("123.3e");
+  EXPECT_FALSE(v.first);
+  EXPECT_EQ(v.second.second, 6 /* degree after e missing */);
+
+  v = V("1.30e+-3");
+  EXPECT_FALSE(v.first);
+  EXPECT_EQ(v.second.second, 7 /* either - or + after e */);
+
+  v = V("123.e+4");
+  EXPECT_FALSE(v.first);
+  EXPECT_EQ(v.second.second, 5 /* e not allowed immediately after period */);
+
+  v = V("0.4f");
+  EXPECT_FALSE(v.first);
+  EXPECT_EQ(v.second.second, 4 /* floating point notation not allowed. */);
+
+  v = V("[1, 2.2, 300, -0, 1000000, 1.34e+10, 033, 0.10, -1000, -0.3, -10.33");
+  EXPECT_FALSE(v.first);
+  EXPECT_EQ(v.second.second, 39 /* Invalid number 033 */);
+
+  // Arrays.
+  // Not closed.
+  v = V("[1,2,3");
+  EXPECT_FALSE(v.first);
+  EXPECT_EQ(v.second.second, 6);
+  // Nested not closed.
+  v = V("[1, 2, [3, 4, [5, \"a\"], true], null, 1.2,");
+  EXPECT_FALSE(v.first);
+  EXPECT_EQ(v.second.second, 41);
+
+  // Closed with wrong bracket.
+  v = V("[1,2,3}");
+  EXPECT_FALSE(v.first);
+  EXPECT_EQ(v.second.second, 7);
+
+  v = V("[,]");
+  EXPECT_FALSE(v.first);
+  EXPECT_EQ(v.second.second, 2);
+
+  v = V("[,1,2,3]");
+  EXPECT_FALSE(v.first);
+  EXPECT_EQ(v.second.second, 2 /* first comma before item */);
+  EXPECT_TRUE(V("[1,2,3]").first);  // Fixed previous error.
+
+  // Objects.
+  v = V("{3: 4}");
+  EXPECT_FALSE(v.first);
+  EXPECT_EQ(v.second.second, 2 /* Only string keys in double quotes allwoed */);
+
+  v = V("{'a': 4}");
+  EXPECT_FALSE(v.first);
+  EXPECT_EQ(v.second.second, 2 /* Only string keys in double quotes allwoed */);
+
+  v = V("{\"a\": tru}");
+  EXPECT_FALSE(v.first);
+  EXPECT_EQ(v.second.second, 10 /* invalid true literal, missing e */);
+
+  // Closed wrongly.
+  v = V("{\"a\": 3]");
+  EXPECT_FALSE(v.first);
+  EXPECT_EQ(v.second.second, 8);
+
+  // Empty objects OK.
+  EXPECT_TRUE(V("{}").first);
+
+  // Empty objects with no key/value not ok.
+  EXPECT_FALSE(V("{,}").first);
+  EXPECT_FALSE(V("{:}").first);
+
+  // No value of an item not ok.
+  EXPECT_FALSE(V("{\"a\":}").first);
+}
+
+TEST(ParserTest, LargeObjects) {
+  std::string_view json = R"JSON({
+  "states":[
+  {"state":{"state_id":"AN","state_name":"Andaman and Nicobar Island (UT)"}},
+  {"state":{"state_id":"AP","state_name":"Andhra Pradesh"}},
+  {"state":{"state_id":"AR","state_name":"Arunachal Pradesh"}},
+  {"state":{"state_id":"AS","state_name":"Assam"}},
+  {"state":{"state_id":"BR","state_name":"Bihar"}},
+  {"state":{"state_id":"CH","state_name":"Chandigarh (UT)"}
+  },{"state":{"state_id":"CG","state_name":"Chhattisgarh"}},
+  {"state":{"state_id":"DN","state_name":"Dadra and Nagar Haveli (UT)"}},
+  {"state":{"state_id":"DD","state_name":"Daman and Diu (UT)"}},
+  {"state":{"state_id":"DL","state_name":"Delhi (NCT)"}},
+  {"state":{"state_id":"GA","state_name":"Goa"}},
+  {"state":{"state_id":"GJ","state_name":"Gujarat"}},
+  {"state":{"state_id":"HR","state_name":"Haryana"}},
+  {"state":{"state_id":"HP","state_name":"Himachal Pradesh"}},
+  {"state":{"state_id":"JK","state_name":"Jammu and Kashmir"}},
+  {"state":{"state_id":"JH","state_name":"Jharkhand"}},
+  {"state":{"state_id":"KA","state_name":"Karnataka"}},
+  {"state":{"state_id":"KL","state_name":"Kerala"}},
+  {"state":{"state_id":"LD","state_name":"Lakshadweep (UT)"}},
+  {"state":{"state_id":"MP","state_name":"Madhya Pradesh"}},
+  {"state":{"state_id":"MH","state_name":"Maharashtra"}},
+  {"state":{"state_id":"MN","state_name":"Manipur"}},
+  {"state":{"state_id":"ML","state_name":"Meghalaya"}},
+  {"state":{"state_id":"MZ","state_name":"Mizoram"}},
+  {"state":{"state_id":"NL","state_name":"Nagaland"}},
+  {"state":{"state_id":"OR","state_name":"Odisha"}},
+  {"state":{"state_id":"PY","state_name":"Puducherry (UT)"}},
+  {"state":{"state_id":"PB","state_name":"Punjab"}},
+  {"state":{"state_id":"RJ","state_name":"Rajasthan"}},
+  {"state":{"state_id":"SK","state_name":"Sikkim"}},
+  {"state":{"state_id":"TN","state_name":"Tamil Nadu"}},
+  {"state":{"state_id":"TG","state_name":"Telangana"}},
+  {"state":{"state_id":"TR","state_name":"Tripura"}},
+  {"state":{"state_id":"UK","state_name":"Uttarakhand"}},
+  {"state":{"state_id":"UP","state_name":"Uttar Pradesh"}},
+  {"state":{"state_id":"WB","state_name":"West Bengal"}}]})JSON";
+  EXPECT_TRUE(V(json).first);
+}
+
+TEST(ParserTest, TrailingComma) {
+  auto v = V("{\"vars\": {\"account\": 7436 },\"extraUrlParams\": {\"int\": "
+             "\"%%interest%%\"},}");
+  EXPECT_FALSE(v.first);  // Trailing comma in object declaration.
+
+  v = V("{\"vars\": {\"account\": 7436 },\"extraUrlParams\": {\"int\": "
+        "\"%%interest%%\"}}");
+  EXPECT_TRUE(v.first);  // Trailing comma fixed.
+
+  v = V("[1,2,3,]");
+  EXPECT_FALSE(v.first);  // Trailing comma in array declaration.
+  EXPECT_EQ(v.second.second, 8);
+  v = V("[1,2,\"hello\",]");
+  EXPECT_FALSE(v.first);  // Trailing comma in array declaration.
+  v = V("[1,2,true,]");
+  EXPECT_FALSE(v.first);  // Trailing comma in array declaration.
+  v = V("[1,2,false,]");
+  EXPECT_FALSE(v.first);  // Trailing comma in array declaration.
+
+  v = V("[1,2,3]");      // Trailing comma fixed.
+  EXPECT_TRUE(v.first);  // Trailing comma fixed.
+  v = V("[1,2,\"hello\"]");
+  EXPECT_TRUE(v.first);  // Trailing comma fixed.
+  v = V("[1,2,true]");
+  EXPECT_TRUE(v.first);  // Trailing comma fixed.
+  v = V("[1,2,false]");
+  EXPECT_TRUE(v.first);  // Trailing comma fixed.
+}
+
+TEST(ParserTest, ArraysSHIFTScenarios) {
+  EXPECT_TRUE(V(R"([1,2, 3,"a",    "b",true, true, 4,true,
+  false, false,null,
+  null, 1,-2, -4,   -0.3,[1,2], [1,   2, true], {"a":"b"},{"a": "b"}])").first);
+
+  EXPECT_TRUE(V(R"({"a":"b", "c":     true,"e"      :false, "f":null,"g":
+  [1,2, 3   ], "h"  : -2,"i":-2,"j":{"a":"b"},"h" : {  "a" : "b" }})").first);
+}
+
+TEST(ParserTest, CallbackTestArrayAllInt) {
+  std::vector<std::pair<CallbackCode, int>> callbacks{};
+  EXPECT_TRUE(V("[1,     2, 3]", [&](CallbackCode cb_code, StateCode state_code,
+                                 int i) {
+    callbacks.push_back(std::make_pair(cb_code, i));
+  }).first);
+  EXPECT_THAT(callbacks, ::testing::ElementsAre(
+      testing::Pair(CallbackCode::ROOT_ARRAY, 0),
+      testing::Pair(CallbackCode::NUMBER_T, 1),
+      testing::Pair(CallbackCode::ARRAY_VAL_END, 2),
+      testing::Pair(CallbackCode::NUMBER_T, 8),
+      testing::Pair(CallbackCode::ARRAY_VAL_END, 9),
+      testing::Pair(CallbackCode::NUMBER_T, 11),
+      testing::Pair(CallbackCode::ARRAY_END, 12),
+      testing::Pair(CallbackCode::PARSE_END, 13)));
+}
+
+TEST(ParserTest, CallbackTestArrayAllString) {
+  std::vector<std::pair<CallbackCode, int>> callbacks{};
+  EXPECT_TRUE(V(R"(["a", "b", "c"])",
+                [&](CallbackCode cb_code, StateCode state_code, int i) {
+    callbacks.push_back(std::make_pair(cb_code, i));
+  }).first);
+  EXPECT_THAT(callbacks, ::testing::ElementsAre(
+      testing::Pair(CallbackCode::ROOT_ARRAY, 0),
+      testing::Pair(CallbackCode::STRING_T, 1),
+      testing::Pair(CallbackCode::ARRAY_VAL_END, 4),
+      testing::Pair(CallbackCode::STRING_T, 6),
+      testing::Pair(CallbackCode::ARRAY_VAL_END, 9),
+      testing::Pair(CallbackCode::STRING_T, 11),
+      testing::Pair(CallbackCode::ARRAY_END, 14),
+      testing::Pair(CallbackCode::PARSE_END, 15)));
+}
+
+TEST(ParserTest, CallbackTestArrayAllBool) {
+  std::vector<std::pair<CallbackCode, int>> callbacks{};
+  EXPECT_TRUE(V(R"([true, false, true])",
+                [&](CallbackCode cb_code, StateCode state_code, int i) {
+    callbacks.push_back(std::make_pair(cb_code, i));
+  }).first);
+  EXPECT_THAT(callbacks, ::testing::ElementsAre(
+      testing::Pair(CallbackCode::ROOT_ARRAY, 0),
+      testing::Pair(CallbackCode::TRUE_T, 1),
+      testing::Pair(CallbackCode::ARRAY_VAL_END, 5),
+      testing::Pair(CallbackCode::FALSE_T, 7),
+      testing::Pair(CallbackCode::ARRAY_VAL_END, 12),
+      testing::Pair(CallbackCode::TRUE_T, 14),
+      testing::Pair(CallbackCode::ARRAY_END, 18),
+      testing::Pair(CallbackCode::PARSE_END, 19)));
+}
+
+TEST(ParserTest, CallbackTestArrayAllNulls) {
+  std::vector<std::pair<CallbackCode, int>> callbacks{};
+  EXPECT_TRUE(V(R"([null, null, null])",
+                [&](CallbackCode cb_code, StateCode state_code, int i) {
+    callbacks.push_back(std::make_pair(cb_code, i));
+  }).first);
+  EXPECT_THAT(callbacks, ::testing::ElementsAre(
+      testing::Pair(CallbackCode::ROOT_ARRAY, 0),
+      testing::Pair(CallbackCode::NULL_T, 1),
+      testing::Pair(CallbackCode::ARRAY_VAL_END, 5),
+      testing::Pair(CallbackCode::NULL_T, 7),
+      testing::Pair(CallbackCode::ARRAY_VAL_END, 11),
+      testing::Pair(CallbackCode::NULL_T, 13),
+      testing::Pair(CallbackCode::ARRAY_END, 17),
+      testing::Pair(CallbackCode::PARSE_END, 18)));
+}
+
+TEST(ParserTest, CallbackTestArrayAllFloatingPoints) {
+  std::vector<std::pair<CallbackCode, int>> callbacks{};
+  EXPECT_TRUE(V(R"([0.2, 0.3, 0.4])",
+                [&](CallbackCode cb_code, StateCode state_code, int i) {
+    callbacks.push_back(std::make_pair(cb_code, i));
+  }).first);
+  EXPECT_THAT(callbacks, ::testing::ElementsAre(
+      testing::Pair(CallbackCode::ROOT_ARRAY, 0),
+      testing::Pair(CallbackCode::NUMBER_T, 1),
+      testing::Pair(CallbackCode::FLOATING_POINT_T, 2),
+      testing::Pair(CallbackCode::ARRAY_VAL_END, 4),
+      testing::Pair(CallbackCode::NUMBER_T, 6),
+      testing::Pair(CallbackCode::FLOATING_POINT_T, 7),
+      testing::Pair(CallbackCode::ARRAY_VAL_END, 9),
+      testing::Pair(CallbackCode::NUMBER_T, 11),
+      testing::Pair(CallbackCode::FLOATING_POINT_T, 12),
+      testing::Pair(CallbackCode::ARRAY_END, 14),
+      testing::Pair(CallbackCode::PARSE_END, 15)));
+}
+
+TEST(ParserTest, CallbackTestArrayAllNegativeNumbers) {
+  std::vector<std::pair<CallbackCode, int>> callbacks{};
+  EXPECT_TRUE(V(R"([-1, -2, -3])",
+                [&](CallbackCode cb_code, StateCode state_code, int i) {
+    callbacks.push_back(std::make_pair(cb_code, i));
+  }).first);
+  EXPECT_THAT(callbacks, ::testing::ElementsAre(
+      testing::Pair(CallbackCode::ROOT_ARRAY, 0),
+      testing::Pair(CallbackCode::NUMBER_T, 1),
+      testing::Pair(CallbackCode::ARRAY_VAL_END, 3),
+      testing::Pair(CallbackCode::NUMBER_T, 5),
+      testing::Pair(CallbackCode::ARRAY_VAL_END, 7),
+      testing::Pair(CallbackCode::NUMBER_T, 9),
+      testing::Pair(CallbackCode::ARRAY_END, 11),
+      testing::Pair(CallbackCode::PARSE_END, 12)));
+}
+
+TEST(ParserTest, CallbackTestArrayMixed) {
+  std::vector<std::pair<CallbackCode, int>> callbacks{};
+  EXPECT_TRUE(V(R"([1, true, null, "a", 0.3, false])",
+                [&](CallbackCode cb_code, StateCode state_code, int i) {
+    callbacks.push_back(std::make_pair(cb_code, i));
+  }).first);
+  EXPECT_THAT(callbacks, ::testing::ElementsAre(
+      testing::Pair(CallbackCode::ROOT_ARRAY, 0),
+      testing::Pair(CallbackCode::NUMBER_T, 1),
+      testing::Pair(CallbackCode::ARRAY_VAL_END, 2),
+      testing::Pair(CallbackCode::TRUE_T, 4),
+      testing::Pair(CallbackCode::ARRAY_VAL_END, 8),
+      testing::Pair(CallbackCode::NULL_T, 10),
+      testing::Pair(CallbackCode::ARRAY_VAL_END, 14),
+      testing::Pair(CallbackCode::STRING_T, 16),
+      testing::Pair(CallbackCode::ARRAY_VAL_END, 19),
+      testing::Pair(CallbackCode::NUMBER_T, 21),
+      testing::Pair(CallbackCode::FLOATING_POINT_T, 22),
+      testing::Pair(CallbackCode::ARRAY_VAL_END, 24),
+      testing::Pair(CallbackCode::FALSE_T, 26),
+      testing::Pair(CallbackCode::ARRAY_END, 31),
+      testing::Pair(CallbackCode::PARSE_END, 32)));
+}
+
+TEST(ParserTest, CallbackPlainNumber) {
+  std::vector<std::pair<CallbackCode, int>> callbacks{};
+  EXPECT_TRUE(V("1",
+                [&](CallbackCode cb_code, StateCode state_code, int i) {
+    callbacks.push_back(std::make_pair(cb_code, i));
+  }).first);
+  EXPECT_THAT(callbacks, ::testing::ElementsAre(
+      testing::Pair(CallbackCode::ROOT_NUMBER, 0),
+      testing::Pair(CallbackCode::PARSE_END, 1)));
+}
+
+TEST(ParserTest, CallbackPlainEmptyArray) {
+  std::vector<std::pair<CallbackCode, int>> callbacks{};
+  EXPECT_TRUE(V("[]",
+                [&](CallbackCode cb_code, StateCode state_code, int i) {
+    callbacks.push_back(std::make_pair(cb_code, i));
+  }).first);
+  EXPECT_THAT(callbacks, ::testing::ElementsAre(
+      testing::Pair(CallbackCode::ROOT_ARRAY, 0),
+      testing::Pair(CallbackCode::ARRAY_END, 1),
+      testing::Pair(CallbackCode::PARSE_END, 2)));
+}
+
+TEST(ParserTest, CallbackPlainBoolTrue) {
+  std::vector<std::pair<CallbackCode, int>> callbacks{};
+  EXPECT_TRUE(V("true",
+                [&](CallbackCode cb_code, StateCode state_code, int i) {
+    callbacks.push_back(std::make_pair(cb_code, i));
+  }).first);
+  EXPECT_THAT(callbacks, ::testing::ElementsAre(
+      testing::Pair(CallbackCode::ROOT_BOOL_TRUE, 0),
+      testing::Pair(CallbackCode::PARSE_END, 4)));
+}
+
+TEST(ParserTest, CallbackPlainBoolFalse) {
+  std::vector<std::pair<CallbackCode, int>> callbacks{};
+  EXPECT_TRUE(V("false",
+                [&](CallbackCode cb_code, StateCode state_code, int i) {
+    callbacks.push_back(std::make_pair(cb_code, i));
+  }).first);
+  EXPECT_THAT(callbacks, ::testing::ElementsAre(
+      testing::Pair(CallbackCode::ROOT_BOOL_FALSE, 0),
+      testing::Pair(CallbackCode::PARSE_END, 5)));
+}
+
+TEST(ParserTest, CallbackPlainNull) {
+  std::vector<std::pair<CallbackCode, int>> callbacks{};
+  EXPECT_TRUE(V("null",
+                [&](CallbackCode cb_code, StateCode state_code, int i) {
+    callbacks.push_back(std::make_pair(cb_code, i));
+  }).first);
+  EXPECT_THAT(callbacks, ::testing::ElementsAre(
+      testing::Pair(CallbackCode::ROOT_NULL_VAL, 0),
+      testing::Pair(CallbackCode::PARSE_END, 4)));
+}
+
+TEST(ParserTest, CallbackEmptyDictionary) {
+  std::vector<std::pair<CallbackCode, int>> callbacks{};
+  EXPECT_TRUE(V("{}",
+                [&](CallbackCode cb_code, StateCode state_code, int i) {
+    callbacks.push_back(std::make_pair(cb_code, i));
+  }).first);
+  EXPECT_THAT(callbacks, ::testing::ElementsAre(
+      testing::Pair(CallbackCode::ROOT_DICT, 0),
+      testing::Pair(CallbackCode::DICT_END, 1),
+      testing::Pair(CallbackCode::PARSE_END, 2)));
+}
+
+TEST(ParserTest, CallbackDictionary) {
+  std::vector<std::pair<CallbackCode, int>> callbacks{};
+  EXPECT_TRUE(V(R"({"a": 1.0, "b": true, "c": "value"})",
+                [&](CallbackCode cb_code, StateCode state_code, int i) {
+                  callbacks.push_back(std::make_pair(cb_code, i));
+                }).first);
+
+  EXPECT_THAT(callbacks, ::testing::ElementsAre(
+                             testing::Pair(CallbackCode::ROOT_DICT, 0),
+                             testing::Pair(CallbackCode::DICT_KEY_BEGIN, 1),
+                             testing::Pair(CallbackCode::DICT_KEY_END, 4),
+                             testing::Pair(CallbackCode::NUMBER_T, 6),
+                             testing::Pair(CallbackCode::FLOATING_POINT_T, 7),
+                             testing::Pair(CallbackCode::DICT_VAL_END, 9),
+                             testing::Pair(CallbackCode::DICT_KEY_BEGIN, 11),
+                             testing::Pair(CallbackCode::DICT_KEY_END, 14),
+                             testing::Pair(CallbackCode::TRUE_T, 16),
+                             testing::Pair(CallbackCode::DICT_VAL_END, 20),
+                             testing::Pair(CallbackCode::DICT_KEY_BEGIN, 22),
+                             testing::Pair(CallbackCode::DICT_KEY_END, 25),
+                             testing::Pair(CallbackCode::STRING_T, 27),
+                             testing::Pair(CallbackCode::DICT_END, 34),
+                             testing::Pair(CallbackCode::PARSE_END, 35)));
+}
+
+TEST(ParserTest, CallbackRootString) {
+  std::vector<std::pair<CallbackCode, int>> callbacks{};
+  EXPECT_TRUE(
+      V(R"("foobar")", [&](CallbackCode cb_code, StateCode state_code, int i) {
+        callbacks.push_back(std::make_pair(cb_code, i));
+      }).first);
+  EXPECT_THAT(callbacks, ::testing::ElementsAre(
+                             testing::Pair(CallbackCode::ROOT_STRING, 0),
+                             testing::Pair(CallbackCode::PARSE_END, 8)));
+}
+
+}  // namespace htmlparser::json
diff --git a/validator/cpp/htmlparser/validators/supported_media_query.h b/validator/cpp/htmlparser/validators/supported_media_query.h
new file mode 100644
index 000000000000..69e4fe3c719e
--- /dev/null
+++ b/validator/cpp/htmlparser/validators/supported_media_query.h
@@ -0,0 +1,1117 @@
+// -*- C++ -*-
+
+// AUTO GENERATED; DO NOT EDIT.
+// To regenerate this file, see comments in bin/validatorgen
+
+#ifndef CPP_HTMLPARSER_VALIDATORS_SUPPORTED_MEDIA_QUERY_H_
+#define CPP_HTMLPARSER_VALIDATORS_SUPPORTED_MEDIA_QUERY_H_
+
+#include <array>
+#include <functional>
+#include <iostream>
+#include <optional>
+#include <string_view>
+#include <utility>
+#include <vector>
+
+namespace htmlparser::css {
+
+enum class StateCode : uint8_t {
+  $ = 0,
+  ALL_L1 = 1,
+  ALL_L2 = 2,
+  AND_D = 3,
+  AND_N = 4,
+  AND_OR_END = 5,
+  ASPECT_RATIO_A2 = 6,
+  ASPECT_RATIO_C = 7,
+  ASPECT_RATIO_E = 8,
+  ASPECT_RATIO_HYPHEN = 9,
+  ASPECT_RATIO_I = 10,
+  ASPECT_RATIO_O = 11,
+  ASPECT_RATIO_P = 12,
+  ASPECT_RATIO_R = 13,
+  ASPECT_RATIO_S = 14,
+  ASPECT_RATIO_T = 15,
+  ASPECT_RATIO_T2 = 16,
+  CM_UNIT = 17,
+  COARSE_A = 18,
+  COARSE_E = 19,
+  COARSE_O = 20,
+  COARSE_R = 21,
+  COARSE_S = 22,
+  DEVICE_ASPECT_RATIO_C = 23,
+  DEVICE_ASPECT_RATIO_E = 24,
+  DEVICE_ASPECT_RATIO_E2 = 25,
+  DEVICE_ASPECT_RATIO_HYPHEN = 26,
+  DEVICE_ASPECT_RATIO_I = 27,
+  DEVICE_ASPECT_RATIO_V = 28,
+  DEVICE_HYPHEN_NEXT = 29,
+  EM_UNIT = 30,
+  END_LENGTH_UNIT = 31,
+  EXPRESSION_BEGIN = 32,
+  EXPRESSION_VALUE_END = 33,
+  FINE_E = 34,
+  FINE_I = 35,
+  FINE_N = 36,
+  HEIGHT_E = 37,
+  HEIGHT_G = 38,
+  HEIGHT_H = 39,
+  HEIGHT_I = 40,
+  HEIGHT_OR_HOVER = 41,
+  HEIGHT_T = 42,
+  HOVER_E = 43,
+  HOVER_R = 44,
+  HOVER_V = 45,
+  HOVER_VALUE_BEGIN = 46,
+  HOVER_VALUE_E = 47,
+  HOVER_VALUE_O = 48,
+  HOVER_VALUE_R = 49,
+  HOVER_VALUE_V = 50,
+  INCH_UNIT = 51,
+  LENGTH_NUMBER = 52,
+  LENGTH_NUMBER_BEGIN = 53,
+  MAX_HYPHEN = 54,
+  MAX_X = 55,
+  MINMAX_EXPRESSION_BEGIN = 56,
+  MIN_N = 57,
+  MIN_OR_MAX = 58,
+  MM_UNIT = 59,
+  NONE_E = 60,
+  NONE_N = 61,
+  NONE_O = 62,
+  ONLY_L = 63,
+  ONLY_N = 64,
+  ONLY_Y = 65,
+  POINTER_E = 66,
+  POINTER_I = 67,
+  POINTER_N = 68,
+  POINTER_O = 69,
+  POINTER_R = 70,
+  POINTER_T = 71,
+  POINTER_VALUE_BEGIN = 72,
+  P_UNIT = 73,
+  RATIO_DENOMINATOR = 74,
+  RATIO_DENOMINATOR_BEGIN = 75,
+  RATIO_NUMERATOR = 76,
+  RATIO_NUMERATOR_BEGIN = 77,
+  SCREEN_C = 78,
+  SCREEN_E = 79,
+  SCREEN_E2 = 80,
+  SCREEN_N = 81,
+  SCREEN_R = 82,
+  SPACE_AFTER_AND = 83,
+  SPACE_AFTER_ONLY = 84,
+  SPACE_AFTER_SCREEN = 85,
+  SPACE_OR_COLON = 86,
+  WIDTH_D = 87,
+  WIDTH_H = 88,
+  WIDTH_I = 89,
+  WIDTH_T = 90,
+};
+
+enum class CallbackCode {
+  NONE = 0,
+};
+
+using Callback = std::function<void(CallbackCode, StateCode, int)>;
+using LineCol = std::pair<int, int>;
+
+
+// Validates json string, returns error line/col if str is invalid json.
+inline std::pair<bool, LineCol> Validate(std::string_view str,
+                                         Callback callback = nullptr);
+
+// Extracts CallbackCode from the bytes.
+inline static CallbackCode ToCallbackCode(uint32_t code);
+
+// Extracts push StateCode from the bytes.
+inline static StateCode ToPushStateCode(uint32_t code);
+
+// Extracts active State code from the bytes.
+inline static StateCode ToCurrentStateCode(uint32_t code);
+
+// Returns code for current token and active state.
+inline static uint32_t CodeForToken(unsigned char c, StateCode state);
+
+// Checks the push bit is on.
+inline static bool HasPushBit(uint32_t code);
+
+// Checks the pop bit is on.
+inline static bool HasPopBit(uint32_t code);
+
+// Checks the shift bit is on.
+inline static bool HasShiftBit(uint32_t code);
+
+constexpr std::array<int, INT8_MAX> kTokenIndexes {
+    39, 39, 39, 39, 39, 39, 39, 39,
+    39, 0, 1, 39, 39, 2, 39, 39,
+    39, 39, 39, 39, 39, 39, 39, 39,
+    39, 39, 39, 39, 39, 39, 39, 39,
+    3, 39, 39, 39, 39, 39, 39, 39,
+    4, 5, 39, 39, 39, 6, 39, 7,
+    8, 9, 10, 11, 12, 13, 14, 15,
+    16, 17, 18, 39, 39, 39, 39, 39,
+    39, 39, 39, 39, 39, 39, 39, 39,
+    39, 39, 39, 39, 39, 39, 39, 39,
+    39, 39, 39, 39, 39, 39, 39, 39,
+    39, 39, 39, 39, 39, 39, 39, 39,
+    39, 19, 39, 20, 21, 22, 23, 24,
+    25, 26, 39, 39, 27, 28, 29, 30,
+    31, 39, 32, 33, 34, 39, 35, 36,
+    37, 38, 39, 39, 39, 39, 39, };
+
+constexpr std::array<std::array<uint32_t, 41>, 91> kParseStates {{
+    // $
+    // Code: 0
+    {0x0, 0x0, 0x0, 0x0, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0x100, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0x4000, 0xff, 0xff, 0x4e00, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // ALL_L1
+    // Code: 1
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0x200, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // ALL_L2
+    // Code: 2
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0x5500, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // AND_D
+    // Code: 3
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0x5300, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // AND_N
+    // Code: 4
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x300,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // AND_OR_END
+    // Code: 5
+    {0x500, 0x500, 0x500, 0x500, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0x400, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0x40, 0x40},
+    // ASPECT_RATIO_A2
+    // Code: 6
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0x1000, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // ASPECT_RATIO_C
+    // Code: 7
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xf00, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // ASPECT_RATIO_E
+    // Code: 8
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x700, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // ASPECT_RATIO_HYPHEN
+    // Code: 9
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xd00, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // ASPECT_RATIO_I
+    // Code: 10
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xb00, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // ASPECT_RATIO_O
+    // Code: 11
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0x4d5680, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // ASPECT_RATIO_P
+    // Code: 12
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0x800, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // ASPECT_RATIO_R
+    // Code: 13
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0x600, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // ASPECT_RATIO_S
+    // Code: 14
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xc00, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // ASPECT_RATIO_T
+    // Code: 15
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x900, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // ASPECT_RATIO_T2
+    // Code: 16
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xa00, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // CM_UNIT
+    // Code: 17
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x1f00, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // COARSE_A
+    // Code: 18
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0x1500, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // COARSE_E
+    // Code: 19
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x2100, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // COARSE_O
+    // Code: 20
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0x1200, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // COARSE_R
+    // Code: 21
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0x1600, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // COARSE_S
+    // Code: 22
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0x1300, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // DEVICE_ASPECT_RATIO_C
+    // Code: 23
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0x1900, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // DEVICE_ASPECT_RATIO_E
+    // Code: 24
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x1c00, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // DEVICE_ASPECT_RATIO_E2
+    // Code: 25
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x1a00, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // DEVICE_ASPECT_RATIO_HYPHEN
+    // Code: 26
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0x1d00, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // DEVICE_ASPECT_RATIO_I
+    // Code: 27
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0x1700, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // DEVICE_ASPECT_RATIO_V
+    // Code: 28
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x1b00,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // DEVICE_HYPHEN_NEXT
+    // Code: 29
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xe00, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0x2900, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0x5900, 0xff, 0xff, 0xff, 0xff},
+    // EM_UNIT
+    // Code: 30
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x1f00, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // END_LENGTH_UNIT
+    // Code: 31
+    {0x1f00, 0x1f00, 0x1f00, 0x1f00, 0xff, 0x500,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // EXPRESSION_BEGIN
+    // Code: 32
+    {0x2000, 0x2000, 0x2000, 0x2000, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xe00, 0xff, 0x1800, 0xff, 0xff,
+     0xff, 0x2900, 0xff, 0xff, 0x3a00, 0xff,
+     0xff, 0x4500, 0xff, 0xff, 0xff, 0xff,
+     0x5900, 0xff, 0xff, 0xff, 0xff},
+    // EXPRESSION_VALUE_END
+    // Code: 33
+    {0x2100, 0x2100, 0x2100, 0x2100, 0xff, 0x500,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // FINE_E
+    // Code: 34
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x2100, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // FINE_I
+    // Code: 35
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0x2400, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // FINE_N
+    // Code: 36
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x2200,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // HEIGHT_E
+    // Code: 37
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x2800, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // HEIGHT_G
+    // Code: 38
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0x2700, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // HEIGHT_H
+    // Code: 39
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0x2a00, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // HEIGHT_I
+    // Code: 40
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0x2600, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // HEIGHT_OR_HOVER
+    // Code: 41
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x2800, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0x2d00, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // HEIGHT_T
+    // Code: 42
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x355680, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // HOVER_E
+    // Code: 43
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x2c00, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // HOVER_R
+    // Code: 44
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0x2e5680, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // HOVER_V
+    // Code: 45
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x2b00,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // HOVER_VALUE_BEGIN
+    // Code: 46
+    {0x2e00, 0x2e00, 0x2e00, 0x2e00, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0x3000, 0xff, 0xff, 0xff, 0x3e00,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // HOVER_VALUE_E
+    // Code: 47
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x3100, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // HOVER_VALUE_O
+    // Code: 48
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0x3200, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // HOVER_VALUE_R
+    // Code: 49
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0x2100, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // HOVER_VALUE_V
+    // Code: 50
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x2f00,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // INCH_UNIT
+    // Code: 51
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x1f00,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // LENGTH_NUMBER
+    // Code: 52
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0x3400, 0x3400, 0x3400, 0x3400,
+     0x3400, 0x3400, 0x3400, 0x3400, 0x3400, 0x3400,
+     0xff, 0xff, 0x1100, 0xff, 0x1e00, 0xff,
+     0xff, 0xff, 0x3300, 0xff, 0x3b00, 0xff,
+     0xff, 0x4900, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // LENGTH_NUMBER_BEGIN
+    // Code: 53
+    {0x3500, 0x3500, 0x3500, 0x3500, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0x3400, 0x3400, 0x3400,
+     0x3400, 0x3400, 0x3400, 0x3400, 0x3400, 0x3400,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // MAX_HYPHEN
+    // Code: 54
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0x3800, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // MAX_X
+    // Code: 55
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0x3600, 0xff, 0xff, 0xff},
+    // MINMAX_EXPRESSION_BEGIN
+    // Code: 56
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xe00, 0xff, 0x1800, 0xff, 0xff,
+     0xff, 0x2500, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0x5900, 0xff, 0xff, 0xff, 0xff},
+    // MIN_N
+    // Code: 57
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x3600,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // MIN_OR_MAX
+    // Code: 58
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0x3700, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0x3900, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // MM_UNIT
+    // Code: 59
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x1f00, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // NONE_E
+    // Code: 60
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x2100, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // NONE_N
+    // Code: 61
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x3c00,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // NONE_O
+    // Code: 62
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0x3d00, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // ONLY_L
+    // Code: 63
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0x4100, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // ONLY_N
+    // Code: 64
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x3f00,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // ONLY_Y
+    // Code: 65
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0x5400, 0xff, 0xff},
+    // POINTER_E
+    // Code: 66
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x4600, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // POINTER_I
+    // Code: 67
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0x4400, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // POINTER_N
+    // Code: 68
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x4700,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // POINTER_O
+    // Code: 69
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0x4300, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // POINTER_R
+    // Code: 70
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0x485680, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // POINTER_T
+    // Code: 71
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x4200, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // POINTER_VALUE_BEGIN
+    // Code: 72
+    {0x4800, 0x4800, 0x4800, 0x4800, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0x1400, 0xff, 0xff, 0x2300,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x3e00,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // P_UNIT
+    // Code: 73
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0x1f00, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x1f00, 0xff,
+     0xff, 0x1f00, 0xff, 0xff, 0xff},
+    // RATIO_DENOMINATOR
+    // Code: 74
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0x500,
+     0xff, 0xff, 0x4a00, 0x4a00, 0x4a00, 0x4a00,
+     0x4a00, 0x4a00, 0x4a00, 0x4a00, 0x4a00, 0x4a00,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // RATIO_DENOMINATOR_BEGIN
+    // Code: 75
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0x4a00, 0x4a00, 0x4a00,
+     0x4a00, 0x4a00, 0x4a00, 0x4a00, 0x4a00, 0x4a00,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // RATIO_NUMERATOR
+    // Code: 76
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0x4b00, 0x4c00, 0x4c00, 0x4c00, 0x4c00,
+     0x4c00, 0x4c00, 0x4c00, 0x4c00, 0x4c00, 0x4c00,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // RATIO_NUMERATOR_BEGIN
+    // Code: 77
+    {0x4d00, 0x4d00, 0x4d00, 0x4d00, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0x4c00, 0x4c00, 0x4c00,
+     0x4c00, 0x4c00, 0x4c00, 0x4c00, 0x4c00, 0x4c00,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // SCREEN_C
+    // Code: 78
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0x5200, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // SCREEN_E
+    // Code: 79
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x5000, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // SCREEN_E2
+    // Code: 80
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x5100, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // SCREEN_N
+    // Code: 81
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0x5500,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // SCREEN_R
+    // Code: 82
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0x4f00, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // SPACE_AFTER_AND
+    // Code: 83
+    {0x5300, 0x5300, 0x5300, 0x5300, 0x2000, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // SPACE_AFTER_ONLY
+    // Code: 84
+    {0x5400, 0x5400, 0x5400, 0x5400, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0x4e00, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // SPACE_AFTER_SCREEN
+    // Code: 85
+    {0x5500, 0x5500, 0x5500, 0x5500, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0x400, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // SPACE_OR_COLON
+    // Code: 86
+    {0x5600, 0x5600, 0x5600, 0x5600, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0x40, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // WIDTH_D
+    // Code: 87
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0x5a00, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // WIDTH_H
+    // Code: 88
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0x355680, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // WIDTH_I
+    // Code: 89
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0x5700, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+    // WIDTH_T
+    // Code: 90
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0x5800, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff},
+}};
+
+
+inline static CallbackCode ToCallbackCode(uint32_t code) {
+  // 4th byte.
+  return static_cast<CallbackCode>((code & 0xff000000) >> 24);
+}
+
+inline static StateCode ToPushStateCode(uint32_t code) {
+  // 3rd byte.
+  return static_cast<StateCode>((code & 0x00ff0000) >> 16);
+}
+
+inline static StateCode ToCurrentStateCode(uint32_t code) {
+  // 2nd byte.
+  return static_cast<StateCode>((code & 0x0000ff00) >> 8);
+}
+
+inline static bool HasPushBit(uint32_t code) {
+  // 8th bit in first byte.
+  return (code & 0x80);
+}
+
+inline static bool HasPopBit(uint32_t code) {
+  // 7th bit in first byte.
+  return ((code & 0x40) >> 6) == 1;
+}
+
+inline static bool HasShiftBit(uint32_t code) {
+  // 6th bit in first byte.
+  return ((code & 0x20) >> 5) == 1;
+}
+
+inline static uint32_t CodeForToken(unsigned char c, StateCode state) {
+  if (c > INT8_MAX) {
+    return kParseStates[static_cast<uint8_t>(state)][39];
+  }
+  int index = kTokenIndexes[c];
+  if (index == -1) index = 40;
+  return kParseStates[static_cast<uint8_t>(state)][index];
+}
+
+
+inline std::optional<StateCode> ParseToken(
+    char c, StateCode state, int i, std::vector<StateCode>* states_stack,
+    Callback callback = nullptr) {
+  uint32_t code = CodeForToken(c, state);
+  if (code == 0xff) {
+    code = CodeForToken(0, state);
+  }
+
+  if (code == 0xff) {
+    return std::nullopt;
+  }
+
+  auto callback_code = ToCallbackCode(code);
+  if (callback && callback_code > CallbackCode::NONE) {
+    callback(callback_code, state, i);
+  }
+
+  if (HasPushBit(code)) {
+    auto shift_code = ToPushStateCode(code);
+    states_stack->push_back(shift_code);
+    return ToCurrentStateCode(code);
+  } else if (HasPopBit(code) && !states_stack->empty()) {
+    state = states_stack->back();
+    states_stack->pop_back();
+    return state;
+  } else if (HasShiftBit(code) && !states_stack->empty()) {
+    auto shift_state = states_stack->back();
+    states_stack->pop_back();
+    if (auto s = ParseToken(c, shift_state, i, states_stack); s) {
+      code = CodeForToken(c, shift_state);
+      callback_code = ToCallbackCode(code);
+      if (callback && callback_code > CallbackCode::NONE) {
+        callback(callback_code, shift_state, i);
+      }
+      return s.value();
+    } else {
+      return std::nullopt;
+    }
+  } else {
+    return ToCurrentStateCode(code);
+  }
+}
+
+std::pair<bool, LineCol> Validate(std::string_view str, Callback callback) {
+  StateCode state = StateCode::$;
+  uint32_t code = 0;
+  CallbackCode callback_code = CallbackCode::NONE;
+  std::vector<StateCode> states_stack {StateCode::$};
+
+  LineCol line_col{0, 0};
+  std::size_t str_size = str.size();
+  for (std::size_t i = 0; i < str_size; i++) {
+    uint8_t c = str.at(i);
+    if (c == '\n' || (c == '\r' &&
+                      i < str_size - 1 &&
+                      str.at(i + 1) != '\n')) {
+      line_col.first++;
+      line_col.second = 0;
+    } else {
+      line_col.second++;
+    }
+
+    auto s = ParseToken(c, state, i, &states_stack, callback);
+    if (!s.has_value()) {
+      // Invalid character.
+      return {false, line_col};
+    }
+    state = s.value();
+  }
+
+  code = CodeForToken(0, state);
+  callback_code = ToCallbackCode(code);
+  auto end = ParseToken(0, state, str.size() - 1, &states_stack, callback);
+  if (!end.has_value()) {
+    return {false, line_col};
+  }
+  state = end.value();
+  if (callback && callback_code > CallbackCode::NONE) {
+    callback(callback_code, state, str.size() - 1);
+  }
+
+  if (state != StateCode::$) {
+    return {false, line_col};
+  }
+
+  return {true, line_col};
+}
+
+}  // namespace htmlparser::css
+
+#endif  // CPP_HTMLPARSER_VALIDATORS_SUPPORTED_MEDIA_QUERY_H_
diff --git a/validator/cpp/htmlparser/validators/supported_media_query_test.cc b/validator/cpp/htmlparser/validators/supported_media_query_test.cc
new file mode 100644
index 000000000000..26d0b4fb044f
--- /dev/null
+++ b/validator/cpp/htmlparser/validators/supported_media_query_test.cc
@@ -0,0 +1,609 @@
+#include "cpp/htmlparser/validators/supported_media_query.h"
+
+#include "gtest/gtest.h"
+
+namespace htmlparser::css {
+namespace {
+
+std::pair<bool, LineCol> V(std::string_view s) {
+  return Validate(s);
+}
+
+TEST(SupportedMediaQueryParserTest, InValidQuerySingleExpression) {
+  auto r = V("all");
+  // ------------^  incomplete query.
+  EXPECT_FALSE(r.first);
+
+  // Error line column.
+  // Error at the end of line.
+  EXPECT_EQ(r.second.second, 3);
+
+  r = V("only icreen and (min-width: )");
+  // ---------^  misspelled screen.
+  EXPECT_FALSE(r.first);
+  EXPECT_EQ(r.second.second, 6  /* only i... */);
+
+  r = V("all (min-width: )");
+  // -------^   missing and.
+  EXPECT_FALSE(r.first);
+  EXPECT_EQ(r.second.second, 5  /* missing and */);
+
+  r = V("only screen and (min-width: 200        )");
+  // -----------------------------------^  no unit.
+  EXPECT_FALSE(r.first);
+  EXPECT_EQ(r.second.second, 32 /* missing unit (px, in etc.) suffix */);
+
+  r = V("all screen and (min-width: 200px)");
+  // --------^  all screen invalid.
+  EXPECT_FALSE(r.first);
+  EXPECT_EQ(r.second.second, 5 /* Invalid screen after all */);
+
+  r = V("all and (min: 200px)");
+  // ----------------^  min what?.
+  EXPECT_FALSE(r.first);
+  EXPECT_EQ(r.second.second, 13 /* min is invalid expecting min-width etc. */);
+
+  r = V("all and (min-width: 200px and max-width: 200px)");
+  // ------------------------------^  only single expression inside paranthesis.
+  EXPECT_FALSE(r.first);
+  EXPECT_EQ(r.second.second, 27 /* invalid second 'and' operator */);
+
+  // Multiline.
+  r = V(R"(only screen and
+  (max-width: 300px) and
+  (min-height: 400px) and
+  (aspect-ratio: 9/6) and
+  (no-such-field: 200px))");  // No such expression.
+  EXPECT_FALSE(r.first);
+  EXPECT_EQ(r.second.first, 4 /* line */);
+  EXPECT_EQ(r.second.second, 4 /* col */);
+
+  // Invalid values.
+  // Invalid 2.0f value.
+  EXPECT_FALSE(V("all and (max-width: 2.0f)").first);
+  // Corrected above.
+  EXPECT_TRUE(V("all and (max-width: 200px)").first);
+
+  // No NULL value for pointer.
+  EXPECT_FALSE(V("all and (pointer: NULL)").first);
+  // Corrected above.
+  EXPECT_TRUE(V("all and (pointer: none)").first);
+
+  // Ratios.
+  EXPECT_FALSE(V("all and (aspect-ratio: 200px)").first);
+  // Corrected above.
+  EXPECT_TRUE(V("all and (aspect-ratio: 9/6)").first);
+
+  // Invalid pointer value, allowed values are fine, coarse and none.
+  EXPECT_FALSE(V("all and (pointer: beautiful)").first);
+  // Corrected above.
+  EXPECT_TRUE(V("all and (pointer: coarse)").first);
+
+  // No max-pointer, max-hover, min-pointer, min-hover.
+  EXPECT_FALSE(V("all and (max-pointer: none)").first);
+  EXPECT_FALSE(V("all and (min-pointer: none)").first);
+  EXPECT_FALSE(V("all and (max-hover: none)").first);
+  EXPECT_FALSE(V("all and (min-hover: none)").first);
+
+  // Just min/max is invalid.
+  EXPECT_FALSE(V("all and (min: 200px)").first);
+  EXPECT_FALSE(V("all and (min-: 200px)").first);
+  EXPECT_FALSE(V("all and (max: 200px)").first);
+  EXPECT_FALSE(V("all and (max-: 200px)").first);
+
+  // Invalid chars anywhere.
+  EXPECT_FALSE(V("all and '(min-height: 200px)'").first);
+  // ---------------------^   Single quotes not allowed.
+  EXPECT_TRUE(V("all and (min-height: 200px)").first);
+
+  EXPECT_FALSE(V("all and \"(min-height: 200px)\"").first);
+  // ---------------------^   Double quotes not allowed.
+  EXPECT_TRUE(V("all and (min-height: 200px)").first);
+
+  EXPECT_FALSE(V("all and (min height: 200px)").first);
+  // -------------------------^ Space instead of hyphen.
+  EXPECT_TRUE(V("all and (min-height: 200px)").first);
+
+  // Supported min/max expressions.
+  EXPECT_TRUE(V("all and (min-width: 200px)").first);
+  EXPECT_TRUE(V("all and (min-height: 200px)").first);
+  EXPECT_TRUE(V("all and (min-device-height: 5in)").first);
+  EXPECT_TRUE(V("all and (min-device-width: 3in)").first);
+  EXPECT_TRUE(V("all and (min-device-aspect-ratio: 3/2)").first);
+  EXPECT_TRUE(V("all and (max-width: 200px)").first);
+  EXPECT_TRUE(V("all and (max-height: 200px)").first);
+  EXPECT_TRUE(V("all and (max-device-height: 5in)").first);
+  EXPECT_TRUE(V("all and (max-device-width: 3in)").first);
+  EXPECT_TRUE(V("all and (max-device-aspect-ratio: 3/2)").first);
+
+  // All of the above valid expressions without min/max.
+  EXPECT_TRUE(V("all and (width: 200px)").first);
+  EXPECT_TRUE(V("all and (height: 200px)").first);
+  EXPECT_TRUE(V("all and (device-height: 5in)").first);
+  EXPECT_TRUE(V("all and (device-width: 3in)").first);
+  EXPECT_TRUE(V("all and (device-aspect-ratio: 3/2)").first);
+  EXPECT_TRUE(V("all and (width: 200px)").first);
+  EXPECT_TRUE(V("all and (height: 200px)").first);
+  EXPECT_TRUE(V("all and (device-height: 5in)").first);
+  EXPECT_TRUE(V("all and (device-width: 3in)").first);
+}
+
+TEST(SupportedMediaQueryParserTest, ValidQuerySingleExpressionPixelUnits) {
+  // Width.
+  EXPECT_TRUE(V("all and (max-width: 200px)").first);
+  EXPECT_TRUE(V("only screen and (max-width: 200px)").first);
+  EXPECT_TRUE(V("screen and (max-width: 200px)").first);
+
+  EXPECT_TRUE(V("all and (min-width: 200px)").first);
+  EXPECT_TRUE(V("only screen and (min-width: 200px)").first);
+  EXPECT_TRUE(V("screen and (min-width: 200px)").first);
+
+  EXPECT_TRUE(V("all and (width: 200px)").first);
+  EXPECT_TRUE(V("only screen and (width: 200px)").first);
+  EXPECT_TRUE(V("screen and (min-width: 200px)").first);
+
+  // Height.
+  EXPECT_TRUE(V("all and (max-height: 200px)").first);
+  EXPECT_TRUE(V("only screen and (max-height: 200px)").first);
+  EXPECT_TRUE(V("screen and (max-height: 200px)").first);
+
+  EXPECT_TRUE(V("all and (min-height: 200px)").first);
+  EXPECT_TRUE(V("only screen and (min-height: 200px)").first);
+  EXPECT_TRUE(V("screen and (min-height: 200px)").first);
+
+  EXPECT_TRUE(V("all and (height: 200px)").first);
+  EXPECT_TRUE(V("only screen and (height: 200px)").first);
+  EXPECT_TRUE(V("screen and (height: 200px)").first);
+
+  // Aspect ratio.
+  EXPECT_TRUE(V("all and (max-aspect-ratio: 3/2)").first);
+  EXPECT_TRUE(V("only screen and (max-aspect-ratio: 3/2)").first);
+  EXPECT_TRUE(V("screen and (max-aspect-ratio: 3/2)").first);
+
+  EXPECT_TRUE(V("all and (min-aspect-ratio: 100/50)").first);
+  EXPECT_TRUE(V("only screen and (min-aspect-ratio: 200/50)").first);
+  EXPECT_TRUE(V("screen and (min-aspect-ratio: 200/50)").first);
+
+  EXPECT_TRUE(V("all and (aspect-ratio: 200/100)").first);
+  EXPECT_TRUE(V("only screen and (aspect-ratio: 200/50)").first);
+  EXPECT_TRUE(V("screen and (aspect-ratio: 200/50)").first);
+
+  // Device aspect ratio.
+  EXPECT_TRUE(V("all and (max-device-aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("only screen and (max-device-aspect-ratio: 18/4)").first);
+  EXPECT_TRUE(V("screen and (max-device-aspect-ratio: 18/4)").first);
+
+  EXPECT_TRUE(V("all and (min-device-aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("only screen and (min-device-aspect-ratio: 100/50)").first);
+  EXPECT_TRUE(V("screen and (min-device-aspect-ratio: 100/50)").first);
+
+  EXPECT_TRUE(V("all and (device-aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("only screen and (device-aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("screen and (device-aspect-ratio: 9/6)").first);
+
+  // Device width.
+  EXPECT_TRUE(V("all and (max-device-width: 200px)").first);
+  EXPECT_TRUE(V("only screen and (max-device-width: 200px)").first);
+  EXPECT_TRUE(V("screen and (max-device-width: 200px)").first);
+
+  EXPECT_TRUE(V("all and (min-device-width: 200px)").first);
+  EXPECT_TRUE(V("only screen and (min-device-width: 200px)").first);
+  EXPECT_TRUE(V("screen and (min-device-width: 200px)").first);
+
+  EXPECT_TRUE(V("all and (device-width: 200px)").first);
+  EXPECT_TRUE(V("only screen and (device-width: 200px)").first);
+  EXPECT_TRUE(V("screen and (device-width: 200px)").first);
+
+  // Device height.
+  EXPECT_TRUE(V("all and (max-device-height: 200px)").first);
+  EXPECT_TRUE(V("only screen and (max-device-height: 200px)").first);
+  EXPECT_TRUE(V("screen and (max-device-height: 200px)").first);
+
+  EXPECT_TRUE(V("all and (min-device-height: 200px)").first);
+  EXPECT_TRUE(V("only screen and (min-device-height: 200px)").first);
+  EXPECT_TRUE(V("screen and (min-device-height: 200px)").first);
+
+  EXPECT_TRUE(V("all and (device-height: 200px)").first);
+  EXPECT_TRUE(V("only screen and (device-height: 200px)").first);
+  EXPECT_TRUE(V("screen and (device-height: 200px)").first);
+}
+
+TEST(SupportedMediaQueryParserTest, ValidQuerySingleExpressionInchUnits) {
+  // Width.
+  EXPECT_TRUE(V("all and (max-width: 200in)").first);
+  EXPECT_TRUE(V("only screen and (max-width: 200in)").first);
+  EXPECT_TRUE(V("screen and (max-width: 200in)").first);
+
+  EXPECT_TRUE(V("all and (min-width: 200in)").first);
+  EXPECT_TRUE(V("only screen and (min-width: 200in)").first);
+  EXPECT_TRUE(V("screen and (min-width: 200in)").first);
+
+  EXPECT_TRUE(V("all and (width: 200in)").first);
+  EXPECT_TRUE(V("only screen and (width: 200in)").first);
+  EXPECT_TRUE(V("screen and (width: 200in)").first);
+
+  // Height.
+  EXPECT_TRUE(V("all and (max-height: 200in)").first);
+  EXPECT_TRUE(V("only screen and (max-height: 200in)").first);
+  EXPECT_TRUE(V("screen and (max-height: 200in)").first);
+
+  EXPECT_TRUE(V("all and (min-height: 200in)").first);
+  EXPECT_TRUE(V("only screen and (min-height: 200in)").first);
+  EXPECT_TRUE(V("screen and (min-height: 200in)").first);
+
+  EXPECT_TRUE(V("all and (height: 200in)").first);
+  EXPECT_TRUE(V("only screen and (height: 200in)").first);
+  EXPECT_TRUE(V("screen and (height: 200in)").first);
+
+  // Aspect ratio.
+  EXPECT_TRUE(V("all and (max-aspect-ratio: 80/50)").first);
+  EXPECT_TRUE(V("only screen and (max-aspect-ratio: 60/30)").first);
+  EXPECT_TRUE(V("screen and (max-aspect-ratio: 60/30)").first);
+
+  EXPECT_TRUE(V("all and (min-aspect-ratio: 9/7)").first);
+  EXPECT_TRUE(V("only screen and (min-aspect-ratio: 9/7)").first);
+  EXPECT_TRUE(V("screen and (min-aspect-ratio: 9/7)").first);
+
+  EXPECT_TRUE(V("all and (aspect-ratio: 9/7)").first);
+  EXPECT_TRUE(V("only screen and (aspect-ratio: 9/7)").first);
+  EXPECT_TRUE(V("screen and (aspect-ratio: 9/7)").first);
+
+  // Device aspect ratio.
+  EXPECT_TRUE(V("all and (max-device-aspect-ratio: 9/7)").first);
+  EXPECT_TRUE(V("only screen and (max-device-aspect-ratio: 9/7)").first);
+  EXPECT_TRUE(V("screen and (max-device-aspect-ratio: 9/7)").first);
+
+  EXPECT_TRUE(V("all and (min-device-aspect-ratio: 9/7)").first);
+  EXPECT_TRUE(V("only screen and (min-device-aspect-ratio: 9/7)").first);
+  EXPECT_TRUE(V("screen and (min-device-aspect-ratio: 9/7)").first);
+
+  EXPECT_TRUE(V("all and (device-aspect-ratio: 9/7)").first);
+  EXPECT_TRUE(V("only screen and (device-aspect-ratio: 9/7)").first);
+  EXPECT_TRUE(V("screen and (device-aspect-ratio: 9/7)").first);
+
+  // Device width.
+  EXPECT_TRUE(V("all and (max-device-width: 200in)").first);
+  EXPECT_TRUE(V("only screen and (max-device-width: 200in)").first);
+  EXPECT_TRUE(V("screen and (max-device-width: 200in)").first);
+
+  EXPECT_TRUE(V("all and (min-device-width: 200in)").first);
+  EXPECT_TRUE(V("only screen and (min-device-width: 200in)").first);
+  EXPECT_TRUE(V("screen and (min-device-width: 200in)").first);
+
+  EXPECT_TRUE(V("all and (device-width: 200in)").first);
+  EXPECT_TRUE(V("only screen and (device-width: 200in)").first);
+  EXPECT_TRUE(V("screen and (device-width: 200in)").first);
+
+  // Device height.
+  EXPECT_TRUE(V("all and (max-device-height: 200in)").first);
+  EXPECT_TRUE(V("only screen and (max-device-height: 200in)").first);
+  EXPECT_TRUE(V("screen and (max-device-height: 200in)").first);
+
+  EXPECT_TRUE(V("all and (min-device-height: 200in)").first);
+  EXPECT_TRUE(V("only screen and (min-device-height: 200in)").first);
+  EXPECT_TRUE(V("screen and (min-device-height: 200in)").first);
+
+  EXPECT_TRUE(V("all and (device-height: 200in)").first);
+  EXPECT_TRUE(V("only screen and (device-height: 200in)").first);
+  EXPECT_TRUE(V("screen and (device-height: 200in)").first);
+}
+
+TEST(SupportedMediaQueryParserTest, ValidQuerySingleExpressionEmUnits) {
+  // Width.
+  EXPECT_TRUE(V("all and (max-width: 200em)").first);
+  EXPECT_TRUE(V("only screen and (max-width: 200em)").first);
+  EXPECT_TRUE(V("screen and (max-width: 200em)").first);
+
+  EXPECT_TRUE(V("all and (min-width: 200em)").first);
+  EXPECT_TRUE(V("only screen and (min-width: 200em)").first);
+
+  EXPECT_TRUE(V("all and (width: 200em)").first);
+  EXPECT_TRUE(V("only screen and (width: 200em)").first);
+  EXPECT_TRUE(V("screen and (min-width: 200em)").first);
+
+  // Height.
+  EXPECT_TRUE(V("all and (max-height: 200em)").first);
+  EXPECT_TRUE(V("only screen and (max-height: 200em)").first);
+  EXPECT_TRUE(V("screen and (max-height: 200em)").first);
+
+  EXPECT_TRUE(V("all and (min-height: 200em)").first);
+  EXPECT_TRUE(V("only screen and (min-height: 200em)").first);
+  EXPECT_TRUE(V("screen and (min-height: 200em)").first);
+
+  EXPECT_TRUE(V("all and (height: 200em)").first);
+  EXPECT_TRUE(V("only screen and (height: 200em)").first);
+  EXPECT_TRUE(V("screen and (height: 200em)").first);
+
+  // Aspect ratio.
+  EXPECT_TRUE(V("all and (max-aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("only screen and (max-aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("screen and (max-aspect-ratio: 9/6)").first);
+
+  EXPECT_TRUE(V("all and (min-aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("only screen and (min-aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("screen and (min-aspect-ratio: 9/6)").first);
+
+  EXPECT_TRUE(V("all and (aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("only screen and (aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("screen and (aspect-ratio: 9/6)").first);
+
+  // Device aspect ratio.
+  EXPECT_TRUE(V("all and (max-device-aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("only screen and (max-device-aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("screen and (max-device-aspect-ratio: 9/6)").first);
+
+  EXPECT_TRUE(V("all and (min-device-aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("only screen and (min-device-aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("screen and (min-device-aspect-ratio: 9/6)").first);
+
+  EXPECT_TRUE(V("all and (device-aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("only screen and (device-aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("screen and (device-aspect-ratio: 9/6)").first);
+
+  // Device width.
+  EXPECT_TRUE(V("all and (max-device-width: 200em)").first);
+  EXPECT_TRUE(V("only screen and (max-device-width: 200em)").first);
+  EXPECT_TRUE(V("screen and (max-device-width: 200em)").first);
+
+  EXPECT_TRUE(V("all and (min-device-width: 200em)").first);
+  EXPECT_TRUE(V("only screen and (min-device-width: 200em)").first);
+  EXPECT_TRUE(V("screen and (min-device-width: 200em)").first);
+
+  EXPECT_TRUE(V("all and (device-width: 200em)").first);
+  EXPECT_TRUE(V("only screen and (device-width: 200em)").first);
+  EXPECT_TRUE(V("screen and (device-width: 200em)").first);
+
+  // Device height.
+  EXPECT_TRUE(V("all and (max-device-height: 200em)").first);
+  EXPECT_TRUE(V("only screen and (max-device-height: 200em)").first);
+  EXPECT_TRUE(V("screen and (max-device-height: 200em)").first);
+
+  EXPECT_TRUE(V("all and (min-device-height: 200em)").first);
+  EXPECT_TRUE(V("only screen and (min-device-height: 200em)").first);
+  EXPECT_TRUE(V("screen and (min-device-height: 200em)").first);
+
+  EXPECT_TRUE(V("all and (device-height: 200em)").first);
+  EXPECT_TRUE(V("only screen and (device-height: 200em)").first);
+  EXPECT_TRUE(V("screen and (device-height: 200em)").first);
+}
+
+TEST(SupportedMediaQueryParserTest, ValidQuerySingleExpressionPTUnits) {
+  // Width.
+  EXPECT_TRUE(V("all and (max-width: 200pt)").first);
+  EXPECT_TRUE(V("only screen and (max-width: 200pt)").first);
+  EXPECT_TRUE(V("screen and (max-width: 200pt)").first);
+
+  EXPECT_TRUE(V("all and (min-width: 200pt)").first);
+  EXPECT_TRUE(V("only screen and (min-width: 200pt)").first);
+  EXPECT_TRUE(V("screen and (min-width: 200pt)").first);
+
+  EXPECT_TRUE(V("all and (width: 200pt)").first);
+  EXPECT_TRUE(V("only screen and (width: 200pt)").first);
+  EXPECT_TRUE(V("screen and (width: 200pt)").first);
+
+  // Height.
+  EXPECT_TRUE(V("all and (max-height: 200pt)").first);
+  EXPECT_TRUE(V("only screen and (max-height: 200pt)").first);
+  EXPECT_TRUE(V("screen and (max-height: 200pt)").first);
+
+  EXPECT_TRUE(V("all and (min-height: 200pt)").first);
+  EXPECT_TRUE(V("only screen and (min-height: 200pt)").first);
+  EXPECT_TRUE(V("screen and (min-height: 200pt)").first);
+
+  EXPECT_TRUE(V("all and (height: 200pt)").first);
+  EXPECT_TRUE(V("only screen and (height: 200pt)").first);
+  EXPECT_TRUE(V("screen and (height: 200pt)").first);
+
+  // Aspect ratio.
+  EXPECT_TRUE(V("all and (max-aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("only screen and (max-aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("screen and (max-aspect-ratio: 9/6)").first);
+
+  EXPECT_TRUE(V("all and (min-aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("only screen and (min-aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("screen and (min-aspect-ratio: 9/6)").first);
+
+  EXPECT_TRUE(V("all and (aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("only screen and (aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("screen and (aspect-ratio: 9/6)").first);
+
+  // Device aspect ratio.
+  EXPECT_TRUE(V("all and (max-device-aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("only screen and (max-device-aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("screen and (max-device-aspect-ratio: 9/6)").first);
+
+  EXPECT_TRUE(V("all and (min-device-aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("only screen and (min-device-aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("screen and (min-device-aspect-ratio: 9/6)").first);
+
+  EXPECT_TRUE(V("all and (device-aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("only screen and (device-aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("screen and (device-aspect-ratio: 9/6)").first);
+
+  // Device width.
+  EXPECT_TRUE(V("all and (max-device-width: 200pt)").first);
+  EXPECT_TRUE(V("only screen and (max-device-width: 200pt)").first);
+  EXPECT_TRUE(V("screen and (max-device-width: 200pt)").first);
+
+  EXPECT_TRUE(V("all and (min-device-width: 200pt)").first);
+  EXPECT_TRUE(V("only screen and (min-device-width: 200pt)").first);
+  EXPECT_TRUE(V("screen and (min-device-width: 200pt)").first);
+
+  EXPECT_TRUE(V("all and (device-width: 200pt)").first);
+  EXPECT_TRUE(V("only screen and (device-width: 200pt)").first);
+  EXPECT_TRUE(V("screen and (device-width: 200pt)").first);
+
+  // Device height.
+  EXPECT_TRUE(V("all and (max-device-height: 200pt)").first);
+  EXPECT_TRUE(V("only screen and (max-device-height: 200pt)").first);
+  EXPECT_TRUE(V("screen and (max-device-height: 200pt)").first);
+
+  EXPECT_TRUE(V("all and (min-device-height: 200pt)").first);
+  EXPECT_TRUE(V("only screen and (min-device-height: 200pt)").first);
+  EXPECT_TRUE(V("screen and (min-device-height: 200pt)").first);
+
+  EXPECT_TRUE(V("all and (device-height: 200pt)").first);
+  EXPECT_TRUE(V("only screen and (device-height: 200pt)").first);
+  EXPECT_TRUE(V("screen and (device-height: 200pt)").first);
+}
+
+TEST(SupportedMediaQueryParserTest, ValidQuerySingleExpressionCMUnits) {
+  // Width.
+  EXPECT_TRUE(V("all and (max-width: 200cm)").first);
+  EXPECT_TRUE(V("only screen and (max-width: 200cm)").first);
+  EXPECT_TRUE(V("screen and (max-width: 200cm)").first);
+
+  EXPECT_TRUE(V("all and (min-width: 200cm)").first);
+  EXPECT_TRUE(V("only screen and (min-width: 200cm)").first);
+  EXPECT_TRUE(V("screen and (min-width: 200cm)").first);
+
+  EXPECT_TRUE(V("all and (width: 200cm)").first);
+  EXPECT_TRUE(V("only screen and (width: 200cm)").first);
+  EXPECT_TRUE(V("screen and (width: 200cm)").first);
+
+  // Height.
+  EXPECT_TRUE(V("all and (max-height: 200cm)").first);
+  EXPECT_TRUE(V("only screen and (max-height: 200cm)").first);
+  EXPECT_TRUE(V("screen and (max-height: 200cm)").first);
+
+  EXPECT_TRUE(V("all and (min-height: 200cm)").first);
+  EXPECT_TRUE(V("only screen and (min-height: 200cm)").first);
+  EXPECT_TRUE(V("screen and (min-height: 200cm)").first);
+
+  EXPECT_TRUE(V("all and (height: 200cm)").first);
+  EXPECT_TRUE(V("only screen and (height: 200cm)").first);
+  EXPECT_TRUE(V("screen and (height: 200cm)").first);
+
+  // Aspect ratio.
+  EXPECT_TRUE(V("all and (max-aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("only screen and (max-aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("screen and (max-aspect-ratio: 9/6)").first);
+
+  EXPECT_TRUE(V("all and (min-aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("only screen and (min-aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("screen and (min-aspect-ratio: 9/6)").first);
+
+  EXPECT_TRUE(V("all and (aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("only screen and (aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("screen and (aspect-ratio: 9/6)").first);
+
+  // Device aspect ratio.
+  EXPECT_TRUE(V("all and (max-device-aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("only screen and (max-device-aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("screen and (max-device-aspect-ratio: 9/6)").first);
+
+  EXPECT_TRUE(V("all and (min-device-aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("only screen and (min-device-aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("screen and (min-device-aspect-ratio: 9/6)").first);
+
+  EXPECT_TRUE(V("all and (device-aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("only screen and (device-aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("screen and (device-aspect-ratio: 9/6)").first);
+
+  // Device width.
+  EXPECT_TRUE(V("all and (max-device-width: 200cm)").first);
+  EXPECT_TRUE(V("only screen and (max-device-width: 200cm)").first);
+  EXPECT_TRUE(V("screen and (max-device-width: 200cm)").first);
+
+  EXPECT_TRUE(V("all and (min-device-width: 200cm)").first);
+  EXPECT_TRUE(V("only screen and (min-device-width: 200cm)").first);
+  EXPECT_TRUE(V("screen and (min-device-width: 200cm)").first);
+
+  EXPECT_TRUE(V("all and (device-width: 200cm)").first);
+  EXPECT_TRUE(V("only screen and (device-width: 200cm)").first);
+  EXPECT_TRUE(V("screen and (device-width: 200cm)").first);
+
+  // Device height.
+  EXPECT_TRUE(V("all and (max-device-height: 200cm)").first);
+  EXPECT_TRUE(V("only screen and (max-device-height: 200cm)").first);
+  EXPECT_TRUE(V("screen and (max-device-height: 200cm)").first);
+
+  EXPECT_TRUE(V("all and (min-device-height: 200cm)").first);
+  EXPECT_TRUE(V("only screen and (min-device-height: 200cm)").first);
+  EXPECT_TRUE(V("screen and (min-device-height: 200cm)").first);
+
+  EXPECT_TRUE(V("all and (device-height: 200cm)").first);
+  EXPECT_TRUE(V("only screen and (device-height: 200cm)").first);
+  EXPECT_TRUE(V("screen and (device-height: 200cm)").first);
+}
+
+TEST(SupportedMediaQueryParserTest, ValidQueryMultipleExpressions) {
+  EXPECT_TRUE(V("all and (device-width: 200px) "
+                "and (device-height: 400px) "
+                "and (pointer: none) "
+                "and (max-device-width: 300px)").first);
+  EXPECT_TRUE(V("only screen and (device-width: 200px) "
+                "and (device-height: 400px) "
+                "and (pointer: coarse) "
+                "and (max-device-width: 300px)").first);
+  EXPECT_TRUE(V("screen and (device-width: 200px) "
+                "and (device-height: 400px) "
+                "and (max-device-width: 300px)").first);
+
+  EXPECT_TRUE(V("all and (device-width: 200in) "
+                "and (device-height: 400in) "
+                "and (pointer:      fine       ) "
+                "and (hover: none) "
+                "and (max-device-width: 300in)").first);
+  EXPECT_TRUE(V("only screen and (device-width: 200in) "
+                "and (device-height: 400in) "
+                "and (max-device-width: 300in)").first);
+  EXPECT_TRUE(V("screen and (device-width: 200in) "
+                "and (device-height: 400in) "
+                "and (hover: hover) "
+                "and (max-device-width: 300in)").first);
+
+  // Multiple spaces ok.
+  EXPECT_TRUE(V("all and           (device-width: 200in) "
+                "and (device-height: 400in)\t\t\t "
+                "and        (max-device-width: 300in)\t\t \n").first);
+  EXPECT_TRUE(V("only screen and           (device-width: 200in) "
+                "and (device-height: 400in)\t\t\t "
+                "and (max-device-width: 300in)\t\t \n").first);
+  EXPECT_TRUE(V("screen "
+                "and           (device-width: 200in) "
+                "and (device-height: 400in)\t\t\t "
+                "and (max-device-width: 300in)\t\t \n").first);
+}
+
+TEST(SupportedMediaQueryParserTest, ValidQueryRatio) {
+  EXPECT_TRUE(V("all and (aspect-ratio    : 1900/300)").first);
+  EXPECT_TRUE(V("only screen and (aspect-ratio    : 1900/300)").first);
+  EXPECT_TRUE(V("screen and (aspect-ratio    : 1900/300)").first);
+  EXPECT_TRUE(V("all and (aspect-ratio: 9/6) and "
+                "(device-aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("only screen and (aspect-ratio: 9/6) and "
+                "(device-aspect-ratio: 9/6)").first);
+  EXPECT_TRUE(V("screen and (aspect-ratio: 9/6) and "
+                "(device-aspect-ratio: 9/6)").first);
+
+  // Aspect ratio must be ratio, not length.
+  EXPECT_FALSE(V("all and (aspect-ratio: 200px)").first);
+}
+
+TEST(SupportedMediaQueryParserTest, MultiLine) {
+  EXPECT_TRUE(V(R"(all and
+  (max-width: 200px) and
+  (max-height: 500px) and
+  (aspect-ratio: 9/6) and
+  (device-width: 8in) and
+  (device-height: 16in))").first);
+
+  EXPECT_TRUE(V(R"(only screen and
+  (max-width: 200px) and
+  (max-height: 500px) and
+  (aspect-ratio: 9/6) and
+  (device-width: 8in) and
+  (device-height: 16in))").first);
+
+  EXPECT_TRUE(V(R"(screen and
+  (max-width: 200px) and
+  (max-height: 500px) and
+  (aspect-ratio: 9/6) and
+  (device-width: 8in) and
+  (device-height: 16in))").first);
+}
+
+}  // namespace
+
+}  // namespace htmlparser::css
diff --git a/validator/cpp/htmlparser/whitespacetable.h b/validator/cpp/htmlparser/whitespacetable.h
index 70cad4c62169..abdb9aa6c6d5 100644
--- a/validator/cpp/htmlparser/whitespacetable.h
+++ b/validator/cpp/htmlparser/whitespacetable.h
@@ -1,5 +1,5 @@
-#ifndef HTMLPARSER__WHITESPACETABLE_H_
-#define HTMLPARSER__WHITESPACETABLE_H_
+#ifndef CPP_HTMLPARSER_WHITESPACETABLE_H_
+#define CPP_HTMLPARSER_WHITESPACETABLE_H_
 
 #include <array>
 
@@ -187,4 +187,4 @@ constexpr static std::array<std::array<uint8_t, 255>, 10> kWhitespaceTable {{
 
 }  // namespace htmlparser
 
-#endif  // HTMLPARSER__WHITESPACETABLE_H_
+#endif  // CPP_HTMLPARSER_WHITESPACETABLE_H_
diff --git a/validator/js/chromeextension/.gitignore b/validator/js/chromeextension/.gitignore
index dcee01fb13d4..14d096cc0379 100644
--- a/validator/js/chromeextension/.gitignore
+++ b/validator/js/chromeextension/.gitignore
@@ -1,2 +1,4 @@
 # These files get generated by build_extension.sh
-amp-validator.build.*
+*.build.html
+*.build.js
+validator_wasm.js
diff --git a/validator/js/chromeextension/background.html b/validator/js/chromeextension/background.html
deleted file mode 100644
index 21f8d7c82370..000000000000
--- a/validator/js/chromeextension/background.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <script src="https://cdn.ampproject.org/v0/validator_wasm.js"></script>
-    <script src="background.js"></script>
-  </head>
-  <body></body>
-</html>
diff --git a/validator/js/chromeextension/background.js b/validator/js/chromeextension/background.js
deleted file mode 100644
index 83d210f669a4..000000000000
--- a/validator/js/chromeextension/background.js
+++ /dev/null
@@ -1,393 +0,0 @@
-const globals = {};
-globals.ampCacheBgcolor = '#ffffff';
-globals.ampCacheIconPrefix = 'amp-link';
-globals.ampCacheTitle = chrome.i18n.getMessage('pageFromAmpCacheTitle');
-globals.devModeAmpBgcolor = '#fcba03';
-globals.devModeAmpIconPrefix = 'dev';
-globals.devModeAmpTitle = chrome.i18n.getMessage('pageInDevModeTitle');
-globals.invalidAmpBgcolor = '#f44336';
-globals.invalidAmpIconPrefix = 'invalid';
-globals.invalidAmpTitle = chrome.i18n.getMessage('pageFailsValidationTitle');
-globals.linkToAmpBgColor = '#ffffff';
-globals.linkToAmpIconPrefix = 'amp-link';
-globals.linkToAmpTitle = chrome.i18n.getMessage('pageHasAmpAltTitle');
-globals.tabToUrl = {};
-globals.userAgentHeader = 'X-AMP-Validator-UA';
-globals.validAmpBgcolor = '#ffd700';
-globals.validAmpIconPrefix = 'valid';
-globals.validAmpTitle = chrome.i18n.getMessage('pagePassesValidationTitle');
-globals.validatorNotPresentBadge = chrome.i18n.getMessage('validatorNotPresentBadge');
-globals.validatorNotPresentBgColor = '#b71c1c';
-globals.validatorNotPresentIconPrefix = 'validator-not-present';
-globals.validatorNotPresentPopup = 'popup-validator-not-present.build.html';
-globals.validatorNotPresentTitle = chrome.i18n.getMessage('validatorNotPresentTitle');
-globals.validatorPopup = 'popup-validator.build.html';
-
-/**
- * Format a hex value (HTML colors such as #ffffff) as an RGBA.
- *
- * @param {string} hex
- * @return {string} rgba
- */
-function hex2rgba(hex) {
-  // Remove the '#' char if necessary.
-  if (hex.charAt(0) === '#') { hex = hex.slice(1); }
-  hex = hex.toUpperCase();
-  let hexAlpha = '0123456789ABCDEF', value = new Array(4), k = 0, int1, int2, i;
-  for (i = 0; i < 6; i += 2) {
-    int1 = hexAlpha.indexOf(hex.charAt(i));
-    int2 = hexAlpha.indexOf(hex.charAt(i + 1));
-    value[k] = (int1 * 16) + int2;
-    k += 1;
-  }
-  value[3] = 255;
-  return value;
-}
-
-/**
- * Returns a dictionary of the number of errors and warnings that occur
- * in the set of ValidationErrors.
- *
- * @param {Array<ValidationError>} errors Validation errors and/or warnings.
- * @return {Object}
- */
-function getErrorSeverityCounts(errors) {
-  let numErrors = 0;
-  let numWarnings = 0;
-  for (const error in errors) {
-    if (errors[error].severity == 'ERROR') {numErrors += 1;}
-    if (errors[error].severity == 'WARNING') {numWarnings += 1;}
-  }
-  return {'ERROR': numErrors, 'WARNING': numWarnings};
-}
-
-/**
- * Returns the number of errors that occur in the set of ValidationErrors.
- *
- *
- * @param {Array<ValidationError>} errors Validation errors and/or warnings.
- * @return {number}
- */
-function getNumberOfErrors(errors) {
-  return getErrorSeverityCounts(errors)['ERROR'];
-}
-
-/**
- * Returns the number of warnings that occur in the set of ValidationErrors.
- *
- * @param {Array<ValidationError>} errors Validation errors and/or warnings.
- * @return {number}
- */
-function getNumberOfWarnings(errors) {
-  return getErrorSeverityCounts(errors)['WARNING'];
-}
-
-/**
- * Inspects ValidationResult to discover if the document has only one
- * error which states DEV_MODE_ONLY. See #24176 for more context.
- *
- * @param {!Object<!ValidationResult>} validationResult
- * @return {boolean}
- */
-function onlyErrorIsDevMode(validationResult) {
-  return ((validationResult.errors.length == 1) &&
-      (validationResult.errors[0].code == 'DEV_MODE_ONLY'));
-}
-
-/**
- * Handles actions to be taken for pages that are on an AMP Cache.
- *
- * @param {integer} tabId ID of a tab.
- * @param {string} ampHref The URL of the AMP page.
- */
-function handleAmpCache(tabId, ampHref) {
-  updateTabStatus(
-      tabId, globals.ampCacheIconPrefix, globals.ampCacheTitle,
-      '' /*text*/, globals.ampCacheBgcolor);
-  chrome.browserAction.onClicked.addListener(
-      function loadAmpHref(tab) {
-        if (tab.id == tabId) {
-          chrome.browserAction.onClicked.removeListener(loadAmpHref);
-          chrome.tabs.sendMessage(tab.id,
-              {'loadAmp': true, 'ampHref': ampHref});
-        }
-      }
-  );
-}
-
-/**
- * Handles actions to be taken for AMP pages that are in Dev Mode.
- *
- * @param {integer} tabId ID of a tab.
- */
-function handleAmpDevMode(tabId) {
-  updateTabStatus(
-      tabId, globals.devModeAmpIconPrefix, globals.devModeAmpTitle,
-      '' /*text*/, globals.devModeAmpBgColor);
-  updateTabPopup(tabId);
-}
-
-/**
- * Handles actions to be taken for AMP pages that fail validation.
- *
- * @param {integer} tabId ID of a tab.
- * @param {!Object<!ValidationResult>} validationResult
- */
-function handleAmpFail(tabId, validationResult) {
-  const numErrors = getNumberOfErrors(validationResult.errors);
-  updateTabStatus(
-      tabId, globals.invalidAmpIconPrefix, globals.invalidAmpTitle,
-      numErrors.toString(), globals.invalidAmpBgcolor);
-  updateTabPopup(tabId);
-}
-
-/**
- * Handles actions to be taken for pages that have an AMP page available.
- *
- * @param {integer} tabId ID of a tab.
- * @param {string} ampHref The URL of the AMP page.
- */
-function handleAmpLink(tabId, ampHref) {
-  updateTabStatus(
-      tabId, globals.linkToAmpIconPrefix, globals.linkToAmpTitle,
-      '' /*text*/, globals.linkToAmpBgColor);
-  chrome.browserAction.onClicked.addListener(
-      function loadAmpHref(tab) {
-        if (tab.id == tabId) {
-          chrome.browserAction.onClicked.removeListener(loadAmpHref);
-          chrome.tabs.sendMessage(tab.id,
-              {'loadAmp': true, 'ampHref': ampHref});
-        }
-      }
-  );
-}
-
-/**
- * Handles actions to be taken for AMP pages that pass validation.
- *
- * @param {integer} tabId ID of a tab.
- * @param {!Object<!ValidationResult>} validationResult
- */
-function handleAmpPass(tabId, validationResult) {
-  const numWarnings = getNumberOfWarnings(validationResult.errors);
-  updateTabStatus(
-      tabId, globals.validAmpIconPrefix, globals.validAmpTitle,
-      '' /*text*/, globals.validAmpBgcolor);
-  if (numWarnings > 0) {updateTabPopup(tabId);}
-}
-
-function handleValidatorNotPresent(tabId) {
-  updateTabStatus(tabId, globals.validatorNotPresentIconPrefix,
-      globals.validatorNotPresentTitle, globals.validatorNotPresentBadge,
-      globals.validatorNotPresentBgColor);
-  chrome.tabs.get(tabId, function(tab) {
-    if (!chrome.runtime.lastError) {
-      chrome.browserAction.setPopup({
-        tabId,
-        popup: globals.validatorNotPresentPopup,
-      });
-    }
-  });
-}
-
-/**
- * Returns whether the url is forbidden for the extension to act on.
- *
- * @param {string} url The URL of a tab.
- * @return {boolean}
- */
-function isForbiddenUrl(url) {
-  return (url.startsWith('chrome://') || url.startsWith('view-source'));
-}
-
-/**
- * Handles events for a specific tab and asks the tab's content_script to
- * determine AMP details about the page's content.
- *
- * @param {Tab} tab The Tab which triggered the event.
- */
-function updateTab(tab) {
-  if (!isForbiddenUrl(tab.url)) {
-    chrome.tabs.sendMessage(
-        tab.id, {'getAmpDetails': true}, function(response) {
-          if (response && response.fromAmpCache && response.ampHref) {
-            handleAmpCache(tab.id, response.ampHref);
-          } else if (response && response.isAmp) {
-            validateUrlFromTab(tab, response.userAgent);
-          } else if (response && !response.isAmp && response.ampHref) {
-            handleAmpLink(tab.id, response.ampHref);
-          }
-        }
-    );
-  }
-}
-
-/**
- * Updates the tabId's extension popup.
- *
- * @param {number} tabId ID of a tab.
- */
-function updateTabPopup(tabId) {
-  // Verify tab still exists
-  chrome.tabs.get(tabId, function(tab) {
-    if (!chrome.runtime.lastError) {
-      chrome.browserAction.setPopup(
-          {tabId, popup: globals.validatorPopup});
-    }
-  });
-}
-
-/**
- * Updates the tabId's extension icon and badge.
- *
- * @param {number} tabId ID of a tab.
- * @param {string} iconPrefix File name prefix of the icon to use.
- * @param {string} title Title to display in extension icon hover.
- * @param {string} text Text to display in badge.
- * @param {string} color Background color for badge.
- */
-function updateTabStatus(tabId, iconPrefix, title, text, color) {
-  // Verify tab still exists
-  chrome.tabs.get(tabId, function(tab) {
-    if (!chrome.runtime.lastError) {
-      chrome.browserAction.setIcon({
-        path: {
-          '19': iconPrefix + '-128.png',
-          '38': iconPrefix + '-38.png',
-        },
-        tabId,
-      });
-      if (title !== undefined)
-      {chrome.browserAction.setTitle({title, tabId});}
-      if (text !== undefined)
-      {chrome.browserAction.setBadgeText({text, tabId});}
-      if (color !== undefined)
-      {chrome.browserAction.setBadgeBackgroundColor(
-          {color: hex2rgba(color), tabId});}
-    }
-  });
-}
-
-/**
- * Fetches the content of the tab's URL and validates it. Then updates the
- * extension's icons with pass/fail.
- *
- * @param {Tab} tab The Tab which triggered the event.
- * @param {userAgent} string Tab's current user agent.
- */
-function validateUrlFromTab(tab, userAgent) {
-  // Verify amp and amp.validator are defined.
-  if (typeof amp === 'undefined' || typeof amp.validator === 'undefined') {
-    handleValidatorNotPresent(tab.id);
-    return;
-  }
-  const xhr = new XMLHttpRequest();
-  const url = tab.url.split('#')[0];
-  xhr.open('GET', url, true);
-
-  // We can't set the User-Agent header directly, but we can set this header
-  // and let the onBeforeSendHeaders handler rename it for us.
-  // Add the listener now. It'll be removed after the request is made.
-  // It's not possible to set filters on the listener to only capture our
-  // traffic, so this approach will interfere as little as possible with the
-  // 99.9% of requests which aren't for AMP validation.
-  chrome.webRequest.onBeforeSendHeaders.addListener(
-      updateSendHeadersUserAgent,
-      {urls: [url], types: ['xmlhttprequest'], tabId: -1},
-      ['requestHeaders', 'blocking']
-  );
-  // Add the temporary header to the request
-  xhr.setRequestHeader(globals.userAgentHeader, userAgent);
-
-  xhr.onreadystatechange = async function() {
-    if (xhr.readyState === 4) {
-      // The request is complete; remove our temporary listener.
-      chrome.webRequest.onBeforeSendHeaders.removeListener(
-          updateSendHeadersUserAgent);
-      const doc = xhr.responseText;
-      await amp.validator.init();
-      const validationResult = amp.validator.validateString(doc);
-      window.sessionStorage.setItem(url, JSON.stringify(validationResult));
-      if (validationResult.status == 'PASS') {
-        handleAmpPass(tab.id, validationResult);
-      } else if (onlyErrorIsDevMode(validationResult)) {
-        handleAmpDevMode(tab.id);
-      } else {
-        handleAmpFail(tab.id, validationResult);
-      }
-    }
-  };
-  xhr.send();
-}
-
-/**
- * Event handler which gets called for onBeforeSendHeaders
- * (developer.chrome.com/extensions/webRequest#event-onBeforeSendHeaders) and
- * updates the User-Agent header to the value that's been specified.
- *
- * @param {!Object<OnBeforeSendHeadersDetails>} details Details object as
- *   defined by Chrome.
- * @return {Object<HttpHeaders>} Object with HttpHeaders value
- *   (https://developer.chrome.com/extensions/webRequest#type-HttpHeaders)
- */
-function updateSendHeadersUserAgent(details) {
-  let newUserAgent,
-      headers = details.requestHeaders;
-  // Using var instead of let keeps the index in scope for later
-  for (var i = 0; i < headers.length; i++) {
-    if (headers[i].name === globals.userAgentHeader) {
-      // Found a header with our internal User Agent Header
-      newUserAgent = headers[i].value;
-      break;
-    }
-  }
-  if (newUserAgent) {
-    // We previously found our UA header. Delete that by the index.
-    headers.splice(i, 1);
-    // And then update the actual User-Agent header
-    for (i = 0; i < headers.length; i++) {
-      if (headers[i].name == 'User-Agent') {
-        headers[i].value = newUserAgent;
-        break;
-      }
-    }
-    return {requestHeaders: headers};
-  }
-}
-
-/**
- * Listen for a new tab being created.
- */
-chrome.tabs.onCreated.addListener(function(tab) {
-  updateTab(tab);
-});
-
-/**
- * Listen for a tab being changed.
- */
-chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab) {
-  globals.tabToUrl[tabId] = tab.url;
-  updateTab(tab);
-});
-
-/**
- * Listen for a tab being removed.
- */
-chrome.tabs.onRemoved.addListener(function(tabId, removeInfo) {
-  window.sessionStorage.removeItem(globals.tabToUrl[tabId]);
-});
-
-/**
- * Listen for a tab being replaced (due to prerendering or instant).
- */
-chrome.tabs.onReplaced.addListener(function(addedTabId, removedTabId) {
-  window.sessionStorage.removeItem(globals.tabToUrl[removedTabId]);
-  chrome.tabs.get(addedTabId, function(tab) {
-    updateTab(tab);
-  });
-});
-
-/**
- * Reload every hour to retrieve the most recent AMP Validator.
- */
-window.setTimeout(() => { location.reload(); } , 60 * 60 * 1000);
diff --git a/validator/js/chromeextension/build_extension.sh b/validator/js/chromeextension/build_extension.sh
index 5628541fdae1..7e0b2ebd3f96 100755
--- a/validator/js/chromeextension/build_extension.sh
+++ b/validator/js/chromeextension/build_extension.sh
@@ -2,6 +2,8 @@
 #
 # A script to install dependencies and then build the extension.
 
+curl -f https://cdn.ampproject.org/v0/validator_wasm.js -o validator_wasm.js
+
 echo 'Installing web components'
 bower install
 
diff --git a/validator/js/chromeextension/manifest.json b/validator/js/chromeextension/manifest.json
index 73e9eddf04d0..363cfcde4199 100644
--- a/validator/js/chromeextension/manifest.json
+++ b/validator/js/chromeextension/manifest.json
@@ -1,7 +1,7 @@
 {
-  "manifest_version": 2,
+  "manifest_version": 3,
   "name": "__MSG_extensionName__",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "default_locale": "en",
   "description": "__MSG_extensionDescription__",
   "icons": {
@@ -9,29 +9,36 @@
     "48": "icon-48.png",
     "128": "icon-128.png"
   },
-  "browser_action": {
+  "action": {
     "default_icon": {
       "19": "no-amp-128.png",
       "38": "no-amp-38.png"
     }
   },
   "background": {
-    "page": "background.html"
+    "service_worker": "worker.js"
   },
   "content_scripts": [
     {
-      "js": ["content_script.js"],
-      "matches": ["<all_urls>"],
+      "js": [
+        "content_script.js"
+      ],
+      "matches": [
+        "<all_urls>"
+      ],
       "run_at": "document_start"
     }
   ],
-  "content_security_policy": "script-src 'self' https://cdn.ampproject.org 'wasm-eval'; object-src 'self'",
+  "content_security_policy": {
+    "extension_pages": "script-src 'self' 'wasm-unsafe-eval'; object-src 'self'"
+  },
   "homepage_url": "https://amp.dev",
   "permissions": [
     "tabs",
-    "webRequest",
-    "webRequestBlocking",
+    "storage"
+  ],
+  "host_permissions": [
     "*://*/",
     "<all_urls>"
   ]
-}
+}
\ No newline at end of file
diff --git a/validator/js/chromeextension/popup-validator.html b/validator/js/chromeextension/popup-validator.html
index ad9ad1409bb6..4250b0f242e3 100644
--- a/validator/js/chromeextension/popup-validator.html
+++ b/validator/js/chromeextension/popup-validator.html
@@ -4,7 +4,7 @@
     <script src="./bower_components/webcomponentsjs/CustomElements.min.js"></script>
     <link href="polymer.html" rel="import">
     <link href="polymer-extension-toolbar.html" rel="import">
-    <script src="https://cdn.ampproject.org/v0/validator_wasm.js"></script>
+    <script src="./validator_wasm.js"></script>
     <style is="custom-style">
       body {
         background-color: #fff;
@@ -199,27 +199,28 @@
           },
         });
         function processTab(tabs, toolbar, content) {
-          var url = tabs[0].url.split('#')[0];
-          var validationResult;
-          chrome.runtime.getBackgroundPage(function(backgroundPage) {
-            validationResult =
-              JSON.parse(backgroundPage.sessionStorage.getItem(url));
+          const url = tabs[0].url.split('#')[0];
+          chrome.runtime.sendMessage(url).then(function(result) {
+            console.log('worker response: ' + result);
+            const validationResult = JSON.parse(result);
             if (validationResult) {
               processResult(validationResult, toolbar, content, url);
             } else {
-              var xhr = new XMLHttpRequest();
-              xhr.open('GET', url, true);
-              xhr.onreadystatechange = function() {
-                if (xhr.readyState === 4) {
-                  amp.validator.init().then(function() {
-                    validationResult =
-                      amp.validator.validateString(xhr.responseText);
-                    processResult(validationResult, toolbar, content, url);
-                  });
-                }
-              };
-              xhr.send();
+              throw new Error();
             }
+          }).catch(function() {
+            var xhr = new XMLHttpRequest();
+            xhr.open('GET', url, true);
+            xhr.onreadystatechange = function () {
+              if (xhr.readyState === 4) {
+                amp.validator.init().then(function () {
+                  validationResult =
+                    amp.validator.validateString(xhr.responseText);
+                  processResult(validationResult, toolbar, content, url);
+                });
+              }
+            };
+            xhr.send();
           });
         }
         function processResult(validationResult, toolbar, content, url) {
diff --git a/validator/js/chromeextension/worker.js b/validator/js/chromeextension/worker.js
new file mode 100644
index 000000000000..c830dbf45bf4
--- /dev/null
+++ b/validator/js/chromeextension/worker.js
@@ -0,0 +1,354 @@
+importScripts('./validator_wasm.js');
+
+const globals = {};
+globals.ampCacheBgcolor = '#ffffff';
+globals.ampCacheIconPrefix = 'amp-link';
+globals.ampCacheTitle = chrome.i18n.getMessage('pageFromAmpCacheTitle');
+globals.devModeAmpBgcolor = '#fcba03';
+globals.devModeAmpIconPrefix = 'dev';
+globals.devModeAmpTitle = chrome.i18n.getMessage('pageInDevModeTitle');
+globals.invalidAmpBgcolor = '#f44336';
+globals.invalidAmpIconPrefix = 'invalid';
+globals.invalidAmpTitle = chrome.i18n.getMessage('pageFailsValidationTitle');
+globals.linkToAmpBgColor = '#ffffff';
+globals.linkToAmpIconPrefix = 'amp-link';
+globals.linkToAmpTitle = chrome.i18n.getMessage('pageHasAmpAltTitle');
+globals.userAgentHeader = 'X-AMP-Validator-UA';
+globals.validAmpBgcolor = '#ffd700';
+globals.validAmpIconPrefix = 'valid';
+globals.validAmpTitle = chrome.i18n.getMessage('pagePassesValidationTitle');
+globals.validatorNotPresentBadge = chrome.i18n.getMessage('validatorNotPresentBadge');
+globals.validatorNotPresentBgColor = '#b71c1c';
+globals.validatorNotPresentIconPrefix = 'validator-not-present';
+globals.validatorNotPresentPopup = 'popup-validator-not-present.build.html';
+globals.validatorNotPresentTitle = chrome.i18n.getMessage('validatorNotPresentTitle');
+globals.validatorPopup = 'popup-validator.build.html';
+
+/**
+ * Format a hex value (HTML colors such as #ffffff) as an RGBA.
+ *
+ * @param {string} hex
+ * @return {string} rgba
+ */
+function hex2rgba(hex) {
+  // Remove the '#' char if necessary.
+  if (hex.charAt(0) === '#') { hex = hex.slice(1); }
+  hex = hex.toUpperCase();
+  let hexAlpha = '0123456789ABCDEF', value = new Array(4), k = 0, int1, int2, i;
+  for (i = 0; i < 6; i += 2) {
+    int1 = hexAlpha.indexOf(hex.charAt(i));
+    int2 = hexAlpha.indexOf(hex.charAt(i + 1));
+    value[k] = (int1 * 16) + int2;
+    k += 1;
+  }
+  value[3] = 255;
+  return value;
+}
+
+/**
+ * Returns a dictionary of the number of errors and warnings that occur
+ * in the set of ValidationErrors.
+ *
+ * @param {Array<ValidationError>} errors Validation errors and/or warnings.
+ * @return {Object}
+ */
+function getErrorSeverityCounts(errors) {
+  let numErrors = 0;
+  let numWarnings = 0;
+  for (const error in errors) {
+    if (errors[error].severity == 'ERROR') {numErrors += 1;}
+    if (errors[error].severity == 'WARNING') {numWarnings += 1;}
+  }
+  return {'ERROR': numErrors, 'WARNING': numWarnings};
+}
+
+/**
+ * Returns the number of errors that occur in the set of ValidationErrors.
+ *
+ *
+ * @param {Array<ValidationError>} errors Validation errors and/or warnings.
+ * @return {number}
+ */
+function getNumberOfErrors(errors) {
+  return getErrorSeverityCounts(errors)['ERROR'];
+}
+
+/**
+ * Returns the number of warnings that occur in the set of ValidationErrors.
+ *
+ * @param {Array<ValidationError>} errors Validation errors and/or warnings.
+ * @return {number}
+ */
+function getNumberOfWarnings(errors) {
+  return getErrorSeverityCounts(errors)['WARNING'];
+}
+
+/**
+ * Inspects ValidationResult to discover if the document has only one
+ * error which states DEV_MODE_ONLY. See #24176 for more context.
+ *
+ * @param {!Object<!ValidationResult>} validationResult
+ * @return {boolean}
+ */
+function onlyErrorIsDevMode(validationResult) {
+  return ((validationResult.errors.length == 1) &&
+      (validationResult.errors[0].code == 'DEV_MODE_ONLY'));
+}
+
+/**
+ * Handles actions to be taken for pages that are on an AMP Cache.
+ *
+ * @param {integer} tabId ID of a tab.
+ * @param {string} ampHref The URL of the AMP page.
+ */
+function handleAmpCache(tabId, ampHref) {
+  updateTabStatus(
+      tabId, globals.ampCacheIconPrefix, globals.ampCacheTitle,
+      '' /*text*/, globals.ampCacheBgcolor);
+  chrome.action.onClicked.addListener(
+      function loadAmpHref(tab) {
+        if (tab.id == tabId) {
+          chrome.action.onClicked.removeListener(loadAmpHref);
+          chrome.tabs.sendMessage(tab.id,
+              {'loadAmp': true, 'ampHref': ampHref});
+        }
+      }
+  );
+}
+
+/**
+ * Handles actions to be taken for AMP pages that are in Dev Mode.
+ *
+ * @param {integer} tabId ID of a tab.
+ */
+function handleAmpDevMode(tabId) {
+  updateTabStatus(
+      tabId, globals.devModeAmpIconPrefix, globals.devModeAmpTitle,
+      '' /*text*/, globals.devModeAmpBgColor);
+  updateTabPopup(tabId);
+}
+
+/**
+ * Handles actions to be taken for AMP pages that fail validation.
+ *
+ * @param {integer} tabId ID of a tab.
+ * @param {!Object<!ValidationResult>} validationResult
+ */
+function handleAmpFail(tabId, validationResult) {
+  const numErrors = getNumberOfErrors(validationResult.errors);
+  updateTabStatus(
+      tabId, globals.invalidAmpIconPrefix, globals.invalidAmpTitle,
+      numErrors.toString(), globals.invalidAmpBgcolor);
+  updateTabPopup(tabId);
+}
+
+/**
+ * Handles actions to be taken for pages that have an AMP page available.
+ *
+ * @param {integer} tabId ID of a tab.
+ * @param {string} ampHref The URL of the AMP page.
+ */
+function handleAmpLink(tabId, ampHref) {
+  updateTabStatus(
+      tabId, globals.linkToAmpIconPrefix, globals.linkToAmpTitle,
+      '' /*text*/, globals.linkToAmpBgColor);
+  chrome.action.onClicked.addListener(
+      function loadAmpHref(tab) {
+        if (tab.id == tabId) {
+          chrome.action.onClicked.removeListener(loadAmpHref);
+          chrome.tabs.sendMessage(tab.id,
+              {'loadAmp': true, 'ampHref': ampHref});
+        }
+      }
+  );
+}
+
+/**
+ * Handles actions to be taken for AMP pages that pass validation.
+ *
+ * @param {integer} tabId ID of a tab.
+ * @param {!Object<!ValidationResult>} validationResult
+ */
+function handleAmpPass(tabId, validationResult) {
+  const numWarnings = getNumberOfWarnings(validationResult.errors);
+  updateTabStatus(
+      tabId, globals.validAmpIconPrefix, globals.validAmpTitle,
+      '' /*text*/, globals.validAmpBgcolor);
+  if (numWarnings > 0) {updateTabPopup(tabId);}
+}
+
+function handleValidatorNotPresent(tabId) {
+  updateTabStatus(tabId, globals.validatorNotPresentIconPrefix,
+      globals.validatorNotPresentTitle, globals.validatorNotPresentBadge,
+      globals.validatorNotPresentBgColor);
+  chrome.tabs.get(tabId, () => {
+    if (!chrome.runtime.lastError) {
+      chrome.action.setPopup({
+        tabId,
+        popup: globals.validatorNotPresentPopup,
+      });
+    }
+  });
+}
+
+/**
+ * Returns whether the url is forbidden for the extension to act on.
+ *
+ * @param {string} url The URL of a tab.
+ * @return {boolean}
+ */
+function isForbiddenUrl(url) {
+  return (url.startsWith('chrome://') || url.startsWith('view-source'));
+}
+
+/**
+ * Handles events for a specific tab and asks the tab's content_script to
+ * determine AMP details about the page's content.
+ *
+ * @param {Tab} tab The Tab which triggered the event.
+ */
+function updateTab(tab) {
+  if (!isForbiddenUrl(tab.url)) {
+    chrome.tabs.sendMessage(
+        tab.id, {'getAmpDetails': true}, response => {
+          if (response && response.fromAmpCache && response.ampHref) {
+            handleAmpCache(tab.id, response.ampHref);
+          } else if (response && response.isAmp) {
+            validateUrlFromTab(tab, response.userAgent);
+          } else if (response && !response.isAmp && response.ampHref) {
+            handleAmpLink(tab.id, response.ampHref);
+          }
+        }
+    );
+  }
+}
+
+/**
+ * Updates the tabId's extension popup.
+ *
+ * @param {number} tabId ID of a tab.
+ */
+function updateTabPopup(tabId) {
+  // Verify tab still exists
+  chrome.tabs.get(tabId, () => {
+    if (!chrome.runtime.lastError) {
+      chrome.action.setPopup(
+          {tabId, popup: globals.validatorPopup});
+    }
+  });
+}
+
+/**
+ * Updates the tabId's extension icon and badge.
+ *
+ * @param {number} tabId ID of a tab.
+ * @param {string} iconPrefix File name prefix of the icon to use.
+ * @param {string} title Title to display in extension icon hover.
+ * @param {string} text Text to display in badge.
+ * @param {string} color Background color for badge.
+ */
+function updateTabStatus(tabId, iconPrefix, title, text, color) {
+  // Verify tab still exists
+  chrome.tabs.get(tabId, () => {
+    if (!chrome.runtime.lastError) {
+      chrome.action.setIcon({
+        path: {
+          '19': iconPrefix + '-128.png',
+          '38': iconPrefix + '-38.png',
+        },
+        tabId,
+      });
+      if (title !== undefined)
+      {chrome.action.setTitle({title, tabId});}
+      if (text !== undefined)
+      {chrome.action.setBadgeText({text, tabId});}
+      if (color !== undefined)
+      {chrome.action.setBadgeBackgroundColor(
+          {color: hex2rgba(color), tabId});}
+    }
+  });
+}
+
+/**
+ * Fetches the content of the tab's URL and validates it. Then updates the
+ * extension's icons with pass/fail.
+ *
+ * @param {Tab} tab The Tab which triggered the event.
+ * @param {userAgent} string Tab's current user agent.
+ */
+function validateUrlFromTab(tab, userAgent) {
+  // Verify amp and amp.validator are defined.
+  if (typeof amp === 'undefined' || typeof amp.validator === 'undefined') {
+    handleValidatorNotPresent(tab.id);
+    return;
+  }
+
+  const url = tab.url.split('#')[0];
+  fetch(url, {
+    method: 'GET',
+    headers: {
+      'user-agent': userAgent,
+    }
+  }).then(resp => {
+    if (resp.ok) {
+      return resp.text();
+    }
+  }).then(async text => {
+    await amp.validator.init();
+    const validationResult = amp.validator.validateString(text);
+    chrome.storage.session.set({
+      [url]: JSON.stringify(validationResult)
+    });
+    if (validationResult.status == 'PASS') {
+      handleAmpPass(tab.id, validationResult);
+    } else if (onlyErrorIsDevMode(validationResult)) {
+      handleAmpDevMode(tab.id);
+    } else {
+      handleAmpFail(tab.id, validationResult);
+    }
+  });
+}
+
+/**
+ * Remove the URL from storage when the tab is closed.
+ */
+function removeTab(tabId) {
+  chrome.tabs.get(tabId, tab => {
+    if (!chrome.runtime.lastError) {
+      chrome.storage.session.remove(tab.url);
+    }
+  });
+}
+
+/**
+ * Listen for a new tab being created.
+ */
+chrome.tabs.onCreated.addListener(updateTab);
+
+/**
+ * Listen for a tab being changed.
+ */
+chrome.tabs.onUpdated.addListener((tabId, changeInfo, tab) => {
+  removeTab(tabId);
+  updateTab(tab);
+});
+
+/**
+ * Listen for a tab being replaced (due to prerendering or instant).
+ */
+chrome.tabs.onReplaced.addListener((addedTabId, removedTabId) => {
+  removeTab(removedTabId);
+  chrome.tabs.get(addedTabId, tab => {
+    updateTab(tab);
+  });
+});
+
+chrome.runtime.onMessage.addListener((url, sender, sendResponse) => {
+  // To ensure that the browser does not drop the reply.
+  (async () => {
+    chrome.storage.session.get(url, result => {
+      sendResponse(result[url]);
+    });
+  })();
+  return true;
+});
diff --git a/validator/js/engine/amp4ads-parse-css.js b/validator/js/engine/amp4ads-parse-css.js
deleted file mode 100644
index 0fd0d61c1542..000000000000
--- a/validator/js/engine/amp4ads-parse-css.js
+++ /dev/null
@@ -1,136 +0,0 @@
-goog.module('amp.validator.validateAmp4AdsCss');
-
-const parse_css = goog.require('parse_css');
-const tokenize_css = goog.require('tokenize_css');
-const {ValidationError} = goog.require('amp.validator.protogenerated');
-
-/**
- * Fills an ErrorToken with the provided position, code, and params.
- * @param {!tokenize_css.Token} positionToken
- * @param {!ValidationError.Code} code
- * @param {!Array<string>} params
- * @return {!tokenize_css.ErrorToken}
- */
-function createParseErrorTokenAt(positionToken, code, params) {
-  const token = new tokenize_css.ErrorToken(code, params);
-  positionToken.copyPosTo(token);
-  return token;
-}
-
-/**
- * For a list of |tokens|, if the first non-whitespace token is an identifier,
- * returns its string value. Otherwise, returns the empty string.
- * @param {!Array<!tokenize_css.Token>} tokens
- * @return {string}
- */
-function firstIdent(tokens) {
-  if (tokens.length === 0) {
-    return '';
-  }
-  if (tokens[0].tokenType === tokenize_css.TokenType.IDENT) {
-    return /** @type {!tokenize_css.StringValuedToken} */ (tokens[0]).value;
-  }
-  if (tokens.length >= 2 &&
-      (tokens[0].tokenType === tokenize_css.TokenType.WHITESPACE) &&
-      tokens[1].tokenType === tokenize_css.TokenType.IDENT) {
-    return /** @type {!tokenize_css.StringValuedToken} */ (tokens[1]).value;
-  }
-  return '';
-}
-
-/** @private */
-class Amp4AdsVisitor extends parse_css.RuleVisitor {
-  /**
-   * @param {!Array<!tokenize_css.ErrorToken>} errors
-   */
-  constructor(errors) {
-    super();
-
-    /** @type {!Array<!tokenize_css.ErrorToken>} */
-    this.errors = errors;
-
-    /** @type {?parse_css.AtRule} */
-    this.inKeyframes = null;
-  }
-
-  /** @inheritDoc */
-  visitDeclaration(declaration) {
-    // position:fixed and position:sticky are disallowed.
-    if (declaration.name !== 'position') {
-      return;
-    }
-    const ident = firstIdent(declaration.value);
-    if (ident === 'fixed' || ident === 'sticky') {
-      this.errors.push(createParseErrorTokenAt(
-          declaration,
-          ValidationError.Code.CSS_SYNTAX_DISALLOWED_PROPERTY_VALUE,
-          ['style', 'position', ident]));
-    }
-  }
-
-  /** @inheritDoc */
-  visitQualifiedRule(qualifiedRule) {
-    for (const decl of qualifiedRule.declarations) {
-      const name = parse_css.stripVendorPrefix(decl.name);
-      // The name of the property may identify a transition. The only
-      // properties that may be transitioned are opacity and transform.
-      if (name === 'transition') {
-        const transitionedProperty = firstIdent(decl.value);
-        const transitionedPropertyStripped =
-            parse_css.stripVendorPrefix(transitionedProperty);
-        if (transitionedPropertyStripped !== 'opacity' &&
-            transitionedPropertyStripped !== 'transform') {
-          this.errors.push(createParseErrorTokenAt(
-              decl,
-              ValidationError.Code
-                  .CSS_SYNTAX_DISALLOWED_PROPERTY_VALUE_WITH_HINT,
-              [
-                'style',
-                'transition',
-                transitionedProperty,
-                '[\'opacity\', \'transform\']',
-              ]));
-        }
-      }
-      // This is the @keyframes variant for identifying transitions;
-      // the only properties that may be specified within a transition
-      // are opacity, transform, and animation-timing-function.
-      if (this.inKeyframes !== null && name !== 'transform' &&
-          name !== 'opacity' && name !== 'animation-timing-function') {
-        this.errors.push(createParseErrorTokenAt(
-            decl,
-            ValidationError.Code.CSS_SYNTAX_PROPERTY_DISALLOWED_WITHIN_AT_RULE,
-            [
-              'style',
-              decl.name,
-              this.inKeyframes.name,
-              '[\'animation-timing-function\', \'opacity\', \'transform\']',
-            ]));
-      }
-    }
-  }
-
-  /** @inheritDoc */
-  visitAtRule(atRule) {
-    if (parse_css.stripVendorPrefix(atRule.name) === 'keyframes') {
-      this.inKeyframes = atRule;
-    } else {
-      this.inKeyframes = null;
-    }
-  }
-
-  /** @inheritDoc */
-  leaveAtRule(atRule) {
-    this.inKeyframes = null;
-  }
-}
-
-/**
- * @param {!parse_css.Stylesheet} styleSheet
- * @param {!Array<!tokenize_css.ErrorToken>} errors
- */
-const validateAmp4AdsCss = function(styleSheet, errors) {
-  const visitor = new Amp4AdsVisitor(errors);
-  styleSheet.accept(visitor);
-};
-exports.validateAmp4AdsCss = validateAmp4AdsCss;
diff --git a/validator/js/engine/amp4ads-parse-css_test.js b/validator/js/engine/amp4ads-parse-css_test.js
deleted file mode 100644
index ac1b4caff78b..000000000000
--- a/validator/js/engine/amp4ads-parse-css_test.js
+++ /dev/null
@@ -1,363 +0,0 @@
-goog.module('parse_css.Amp4AdsParseCssTest');
-
-const json_testutil = goog.require('json_testutil');
-const parse_css = goog.require('parse_css');
-const tokenize_css = goog.require('tokenize_css');
-const {validateAmp4AdsCss} = goog.require('amp.validator.validateAmp4AdsCss');
-
-/**
- * A strict comparison between two values that does not truncate the
- * error messages and works well with the closure compiler.
- * @param {*} expected
- * @param {*} saw
- */
-function assertStrictEqual(expected, saw) {
-  assert.ok(expected === saw, 'expected: ' + expected + ' saw: ' + saw);
-}
-
-/**
- * For emitting json output with keys in logical order for ErrorToken.
- * @param {string} a
- * @param {string} b
- * @return {number}
- */
-const jsonKeyCmp = json_testutil.makeJsonKeyCmpFn(
-    ['line', 'col', 'tokenType', 'code', 'params']);
-
-/**
- * @param {!Object} left
- * @param {!Object} right
- */
-function assertJSONEquals(left, right) {
-  assertStrictEqual(
-      json_testutil.renderJSON(left, jsonKeyCmp, /*offset=*/ 4),
-      json_testutil.renderJSON(right, jsonKeyCmp, /*offset=*/ 4));
-}
-
-/** @type {!Object<string,parse_css.BlockType>} */
-const amp4AdsCssParsingSpec = {
-  'font-face': parse_css.BlockType.PARSE_AS_DECLARATIONS,
-  'media': parse_css.BlockType.PARSE_AS_RULES,
-  'keyframes': parse_css.BlockType.PARSE_AS_RULES,
-};
-
-describe('validateAmp4AdsCss', () => {
-  it('validates good amp-animate example', () => {
-    const css = '.amp-animate .box { ' +
-        '  transform: rotate(180deg); transition: transform 2s; ' +
-        '}';
-    const errors = [];
-    const tokens = tokenize_css.tokenize(css, 1, 0, errors);
-    const sheet = parse_css.parseAStylesheet(
-        tokens, amp4AdsCssParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-        errors);
-    assertJSONEquals([], errors);
-    validateAmp4AdsCss(sheet, errors);
-    assertJSONEquals([], errors);
-  });
-
-  it('validates good amp-animate example with vendor prefixes', () => {
-    const css = '.amp-animate .box { ' +
-        '  -moz-transform: rotate(180deg); ' +
-        '  -webkit-transition: -o-transform 2s; ' +
-        '}';
-    const errors = [];
-    const tokens = tokenize_css.tokenize(css, 1, 0, errors);
-    const sheet = parse_css.parseAStylesheet(
-        tokens, amp4AdsCssParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-        errors);
-    assertJSONEquals([], errors);
-    validateAmp4AdsCss(sheet, errors);
-    assertJSONEquals([], errors);
-  });
-
-  it('reports that position fixed and position sticky are disallowed', () => {
-    const css = '.box { position: fixed; position:sticky; }';
-    const errors = [];
-    const tokens = tokenize_css.tokenize(css, 1, 0, errors);
-    const sheet = parse_css.parseAStylesheet(
-        tokens, amp4AdsCssParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-        errors);
-    assertJSONEquals([], errors);
-    validateAmp4AdsCss(sheet, errors);
-    assertJSONEquals(
-        [
-          {
-            'line': 1,
-            'col': 7,
-            'tokenType': 'ERROR',
-            'code': 'CSS_SYNTAX_DISALLOWED_PROPERTY_VALUE',
-            'params': ['style', 'position', 'fixed'],
-          },
-          {
-            'line': 1,
-            'col': 24,
-            'tokenType': 'ERROR',
-            'code': 'CSS_SYNTAX_DISALLOWED_PROPERTY_VALUE',
-            'params': ['style', 'position', 'sticky'],
-          },
-        ],
-        errors);
-  });
-
-  it('validates non-animation properties in animation selectors', () => {
-    // The non-animation property (in this case color) is allowed in an
-    // animation selector.
-    const css = '.amp-animate .box { ' +
-        '    color: red; ' +
-        '    transform: rotate(180deg);' +
-        '    transition: transform 2s;' +
-        '}';
-    const errors = [];
-    const tokens = tokenize_css.tokenize(css, 1, 0, errors);
-    const sheet = parse_css.parseAStylesheet(
-        tokens, amp4AdsCssParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-        errors);
-    assertJSONEquals([], errors);
-    validateAmp4AdsCss(sheet, errors);
-    assertJSONEquals([], errors);
-  });
-
-  it('validates non-animation properties in animation selectors (vendor prefixed)',
-     () => {
-       // The non-animation property (in this case color) is allowed in an
-       // animation selector.
-       const css = '.amp-animate .box { ' +
-           '    color: red; ' +
-           '    -o-transform: rotate(180deg);' +
-           '    -ms-transition: -webkit-transform 2s;' +
-           '}';
-       const errors = [];
-       const tokens = tokenize_css.tokenize(css, 1, 0, errors);
-       const sheet = parse_css.parseAStylesheet(
-           tokens, amp4AdsCssParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-           errors);
-       assertJSONEquals([], errors);
-       validateAmp4AdsCss(sheet, errors);
-       assertJSONEquals([], errors);
-     });
-
-  it('No longer an error when .amp-animate is missing', () => {
-    const css = '.box { ' +
-        '    transform: rotate(180deg); ' +
-        '    transition: transform 2s; ' +
-        '}';
-    const errors = [];
-    const tokens = tokenize_css.tokenize(css, 1, 0, errors);
-    const sheet = parse_css.parseAStylesheet(
-        tokens, amp4AdsCssParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-        errors);
-    assertJSONEquals([], errors);
-    validateAmp4AdsCss(sheet, errors);
-    assertJSONEquals([], errors);
-  });
-
-  it('allows only opacity and transform to be transitioned', () => {
-    const css = '.amp-animate .box { ' +
-        '    transition: background-color 2s; ' +
-        '}';
-    const errors = [];
-    const tokens = tokenize_css.tokenize(css, 1, 0, errors);
-    const sheet = parse_css.parseAStylesheet(
-        tokens, amp4AdsCssParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-        errors);
-    assertJSONEquals([], errors);
-    validateAmp4AdsCss(sheet, errors);
-    assertJSONEquals(
-        [{
-          'line': 1,
-          'col': 24,
-          'tokenType': 'ERROR',
-          'code': 'CSS_SYNTAX_DISALLOWED_PROPERTY_VALUE_WITH_HINT',
-          'params': [
-            'style',
-            'transition',
-            'background-color',
-            '[\'opacity\', \'transform\']',
-          ],
-        }],
-        errors);
-  });
-
-  it('allows keyframes as a mechanism for transitions', () => {
-    const css = '@keyframes turn { ' +
-        '  from { transform: rotate(180deg); } ' +
-        '  to { transform: rotate(90deg); } ' +
-        '}';
-    const errors = [];
-    const tokens = tokenize_css.tokenize(css, 1, 0, errors);
-    const sheet = parse_css.parseAStylesheet(
-        tokens, amp4AdsCssParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-        errors);
-    assertJSONEquals([], errors);
-    validateAmp4AdsCss(sheet, errors);
-    assertJSONEquals([], errors);
-  });
-
-  it('allows keyframes as a mechanism for transitions (vendor prefixed)',
-     () => {
-       const css = '@-moz-keyframes turn { ' +
-           '  from { -webkit-transform: rotate(180deg); } ' +
-           '  to { -o-transform: rotate(90deg); } ' +
-           '}';
-       const errors = [];
-       const tokens = tokenize_css.tokenize(css, 1, 0, errors);
-       const sheet = parse_css.parseAStylesheet(
-           tokens, amp4AdsCssParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-           errors);
-       assertJSONEquals([], errors);
-       validateAmp4AdsCss(sheet, errors);
-       assertJSONEquals([], errors);
-     });
-
-  it('allows animation-timing-function within keyframes', () => {
-    const css = '@-moz-keyframes turn { ' +
-        '  from { transform: rotate(180deg); ' +
-        '         animation-timing-function: linear; } ' +
-        '  to { transform: rotate(90deg); } ' +
-        '}';
-    const errors = [];
-    const tokens = tokenize_css.tokenize(css, 1, 0, errors);
-    const sheet = parse_css.parseAStylesheet(
-        tokens, amp4AdsCssParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-        errors);
-    assertJSONEquals([], errors);
-    validateAmp4AdsCss(sheet, errors);
-    assertJSONEquals([], errors);
-  });
-
-  it('allows only animation-timing-function, opacity, ' +
-         'transform in keyframe transitions',
-     () => {
-       const css = '@keyframes slidein { ' +
-           '  from { margin-left:100%; width:300%; } ' +
-           '  to { margin-left:0%; width:100%; } ' +
-           '}';
-       const errors = [];
-       const tokens = tokenize_css.tokenize(css, 1, 0, errors);
-       const sheet = parse_css.parseAStylesheet(
-           tokens, amp4AdsCssParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-           errors);
-       assertJSONEquals([], errors);
-       validateAmp4AdsCss(sheet, errors);
-       assertJSONEquals(
-           [
-             {
-               'line': 1,
-               'col': 30,
-               'tokenType': 'ERROR',
-               'code': 'CSS_SYNTAX_PROPERTY_DISALLOWED_WITHIN_AT_RULE',
-               'params': [
-                 'style',
-                 'margin-left',
-                 'keyframes',
-                 '[\'animation-timing-function\', \'opacity\', \'transform\']',
-               ],
-             },
-             {
-               'line': 1,
-               'col': 48,
-               'tokenType': 'ERROR',
-               'code': 'CSS_SYNTAX_PROPERTY_DISALLOWED_WITHIN_AT_RULE',
-               'params': [
-                 'style',
-                 'width',
-                 'keyframes',
-                 '[\'animation-timing-function\', \'opacity\', \'transform\']',
-               ],
-             },
-             {
-               'line': 1,
-               'col': 69,
-               'tokenType': 'ERROR',
-               'code': 'CSS_SYNTAX_PROPERTY_DISALLOWED_WITHIN_AT_RULE',
-               'params': [
-                 'style',
-                 'margin-left',
-                 'keyframes',
-                 '[\'animation-timing-function\', \'opacity\', \'transform\']',
-               ],
-             },
-             {
-               'line': 1,
-               'col': 85,
-               'tokenType': 'ERROR',
-               'code': 'CSS_SYNTAX_PROPERTY_DISALLOWED_WITHIN_AT_RULE',
-               'params': [
-                 'style',
-                 'width',
-                 'keyframes',
-                 '[\'animation-timing-function\', \'opacity\', \'transform\']',
-               ],
-             },
-           ],
-           errors);
-     });
-
-  it('allows only opacity, transform in keyframe transitions (vendor prefixed)',
-     () => {
-       const css = '@-moz-keyframes slidein { ' +
-           '  from { margin-left:100%; width:300%; } ' +
-           '  to { margin-left:0%; width:100%; } ' +
-           '}';
-       const errors = [];
-       const tokens = tokenize_css.tokenize(css, 1, 0, errors);
-       const sheet = parse_css.parseAStylesheet(
-           tokens, amp4AdsCssParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-           errors);
-       assertJSONEquals([], errors);
-       validateAmp4AdsCss(sheet, errors);
-       assertJSONEquals(
-           [
-             {
-               'line': 1,
-               'col': 35,
-               'tokenType': 'ERROR',
-               'code': 'CSS_SYNTAX_PROPERTY_DISALLOWED_WITHIN_AT_RULE',
-               'params': [
-                 'style',
-                 'margin-left',
-                 '-moz-keyframes',
-                 '[\'animation-timing-function\', \'opacity\', \'transform\']',
-               ],
-             },
-             {
-               'line': 1,
-               'col': 53,
-               'tokenType': 'ERROR',
-               'code': 'CSS_SYNTAX_PROPERTY_DISALLOWED_WITHIN_AT_RULE',
-               'params': [
-                 'style',
-                 'width',
-                 '-moz-keyframes',
-                 '[\'animation-timing-function\', \'opacity\', \'transform\']',
-               ],
-             },
-             {
-               'line': 1,
-               'col': 74,
-               'tokenType': 'ERROR',
-               'code': 'CSS_SYNTAX_PROPERTY_DISALLOWED_WITHIN_AT_RULE',
-               'params': [
-                 'style',
-                 'margin-left',
-                 '-moz-keyframes',
-                 '[\'animation-timing-function\', \'opacity\', \'transform\']',
-               ],
-             },
-             {
-               'line': 1,
-               'col': 90,
-               'tokenType': 'ERROR',
-               'code': 'CSS_SYNTAX_PROPERTY_DISALLOWED_WITHIN_AT_RULE',
-               'params': [
-                 'style',
-                 'width',
-                 '-moz-keyframes',
-                 '[\'animation-timing-function\', \'opacity\', \'transform\']',
-               ],
-             },
-           ],
-           errors);
-     });
-});
diff --git a/validator/js/engine/definitions.js b/validator/js/engine/definitions.js
deleted file mode 100644
index d163e889049d..000000000000
--- a/validator/js/engine/definitions.js
+++ /dev/null
@@ -1,4 +0,0 @@
-goog.provide('amp.validator.VALIDATE_CSS');
-
-/** @define {boolean} */
-amp.validator.VALIDATE_CSS = true;
diff --git a/validator/js/engine/htmlparser-interface.js b/validator/js/engine/htmlparser-interface.js
index c88200ff446f..660d1e0af418 100644
--- a/validator/js/engine/htmlparser-interface.js
+++ b/validator/js/engine/htmlparser-interface.js
@@ -1,5 +1,4 @@
 goog.module('amp.htmlparser.interface');
-
 /**
  * @param {string} str The string to lower case.
  * @return {string} The str in lower case format.
@@ -20,7 +19,6 @@ const toLowerCase = function(str) {
   });
 };
 exports.toLowerCase = toLowerCase;
-
 /**
  * @param {string} str The string to upper case.
  * @return {string} The str in upper case format.
@@ -41,7 +39,6 @@ const toUpperCase = function(str) {
   });
 };
 exports.toUpperCase = toUpperCase;
-
 /**
  * Name/Value pair representing an HTML Tag attribute.
  */
@@ -54,7 +51,6 @@ const ParsedAttr = class {
   }
 };
 exports.ParsedAttr = ParsedAttr;
-
 // If any script in the page uses a specific release version, then all scripts
 // must use that specific release version. This is used to record the first
 // seen script tag and ensure all following script tags follow the convention
@@ -68,34 +64,28 @@ const ScriptReleaseVersion = {
   MODULE_NOMODULE_LTS: 'module/nomodule LTS',
 };
 exports.ScriptReleaseVersion = ScriptReleaseVersion;
-
 // AMP domain
 const /** string */ ampProjectDomain = 'https://cdn.ampproject.org/';
-
 // Standard and Nomodule JavaScript:
 // v0.js
 // v0/amp-ad-0.1.js
 const /** !RegExp */ standardScriptPathRegex =
     new RegExp('^(v0|v0/amp-[a-z0-9-]*-[a-z0-9.]*)\\.js$', 'i');
-
 // LTS and Nomodule LTS JavaScript:
 // lts/v0.js
 // lts/v0/amp-ad-0.1.js
 const /** !RegExp */ ltsScriptPathRegex =
     new RegExp('^lts/(v0|v0/amp-[a-z0-9-]*-[a-z0-9.]*)\\.js$', 'i');
-
 // Module JavaScript:
 // v0.mjs
 // amp-ad-0.1.mjs
 const /** !RegExp */ moduleScriptPathRegex =
     new RegExp('^(v0|v0/amp-[a-z0-9-]*-[a-z0-9.]*)\\.mjs$', 'i');
-
 // Module LTS JavaScript:
 // lts/v0.mjs
 // lts/v0/amp-ad-0.1.mjs
 const /** !RegExp */ moduleLtsScriptPathRegex =
     new RegExp('^lts/(v0|v0/amp-[a-z0-9-]*-[a-z0-9.]*)\\.mjs$', 'i');
-
 // Runtime JavaScript:
 // v0.js
 // v0.mjs
@@ -105,7 +95,6 @@ const /** !RegExp */ moduleLtsScriptPathRegex =
 // lts/v0.mjs
 const /** !RegExp */ runtimeScriptPathRegex =
     new RegExp('^(lts/)?v0\\.m?js(\\?f=sxg)?$', 'i');
-
 // Extension JavaScript:
 // lts/v0/amp-ad-0.1.js
 // lts/v0/amp-ad-0.1.js?f=sxg
@@ -115,7 +104,6 @@ const /** !RegExp */ runtimeScriptPathRegex =
 // v0/am-ad-0.1.mjs
 const /** !RegExp */ extensionScriptPathRegex = new RegExp(
     '^(?:lts/)?v0/(amp-[a-z0-9-]*)-([a-z0-9.]*)\\.(?:m)?js(?:\\?f=sxg)?$', 'i');
-
 /**
  * Represents the state of a script tag.
  */
@@ -141,7 +129,6 @@ const ScriptTag = class {
     this.hasValidPath = false;
     /** @type {!ScriptReleaseVersion} */
     this.releaseVersion = ScriptReleaseVersion.UNKNOWN;
-
     /** @type {boolean} */
     let isAsync = false;
     /** @type {boolean} */
@@ -150,11 +137,9 @@ const ScriptTag = class {
     let isNomodule = false;
     /** @type {string} */
     let src = '';
-
     if (tagName !== 'SCRIPT') {
       return;
     }
-
     for (const attr of attrs) {
       if (attr.name === 'async') {
         isAsync = true;
@@ -170,13 +155,11 @@ const ScriptTag = class {
         isModule = true;
       }
     }
-
     // Determine if this has a valid AMP domain and separate the path from the
     // attribute 'src'.
     if (src.startsWith(ampProjectDomain)) {
       this.isAmpDomain = true;
       this.path = src.substr(ampProjectDomain.length);
-
       // Only look at script tags that have attribute 'async'.
       if (isAsync) {
         // Determine if this is the AMP Runtime.
@@ -184,7 +167,6 @@ const ScriptTag = class {
           this.isRuntime = true;
           this.hasValidPath = true;
         }
-
         // For AMP Extensions, validate path and extract name and version.
         if (this.isExtension && extensionScriptPathRegex.test(this.path)) {
           this.hasValidPath = true;
@@ -194,7 +176,6 @@ const ScriptTag = class {
             this.extensionVersion = reResult[2];
           }
         }
-
         // Determine the release version (LTS, module, standard, etc).
         if ((isModule && moduleLtsScriptPathRegex.test(this.path)) ||
             (isNomodule && ltsScriptPathRegex.test(this.path))) {
@@ -213,8 +194,6 @@ const ScriptTag = class {
   }
 };
 exports.ScriptTag = ScriptTag;
-
-
 /**
  * An Html parser makes method calls with ParsedHtmlTags as arguments.
  */
@@ -233,7 +212,6 @@ const ParsedHtmlTag = class {
     // sensitive contexts.
     /** @type {!Array<string>} */
     const attrs = opt_attrs || [];
-
     /** @private @type {string} */
     this.tagName_ = toUpperCase(tagName);
     /** @private @type {!Array<!ParsedAttr>} */
@@ -262,15 +240,12 @@ const ParsedHtmlTag = class {
       // No need to sub-sort by attr values, just names will do.
       return 0;
     });
-
     // Lazily allocated map from attribute name to value.
     /** @private @type {?Object<string, string>} */
     this.attrsByKey_ = null;
-
     /** @private @type {?ScriptTag} */
     this.scriptTag_ = new ScriptTag(this.tagName_, this.attrs_);
   }
-
   /**
    * Lower-case tag name
    * @return {string}
@@ -278,7 +253,6 @@ const ParsedHtmlTag = class {
   lowerName() {
     return toLowerCase(this.tagName_);
   }
-
   /**
    * Upper-case tag name
    * @return {string}
@@ -286,7 +260,6 @@ const ParsedHtmlTag = class {
   upperName() {
     return this.tagName_;
   }
-
   /**
    * Returns an array of attributes. Each attribute has two fields: name and
    * value. Name is always lower-case, value is the case from the original
@@ -296,7 +269,6 @@ const ParsedHtmlTag = class {
   attrs() {
     return this.attrs_;
   }
-
   /**
    * Returns an object mapping attribute name to attribute value. This is
    * populated lazily, as it's not used for most tags.
@@ -311,7 +283,6 @@ const ParsedHtmlTag = class {
     }
     return /** @type{Object<string, string>} */ (this.attrsByKey_);
   }
-
   /**
    * Returns a duplicate attribute name if the tag contains two attributes
    * named the same, but with different attribute values. Same attribute name
@@ -332,7 +303,6 @@ const ParsedHtmlTag = class {
     }
     return null;
   }
-
   /**
    * Removes duplicate attributes from the attribute list. This is consistent
    * with HTML5 parsing error handling rules, only the first attribute with
@@ -351,7 +321,6 @@ const ParsedHtmlTag = class {
     }
     this.attrs_ = newAttrs;
   }
-
   /**
    * Returns the value of a given attribute name. If it does not exist then
    * returns null.
@@ -362,7 +331,6 @@ const ParsedHtmlTag = class {
   getAttrValueOrNull_(name) {
     return this.attrsByKey()[name] || null;
   }
-
   /**
    * Returns the extension name.
    * @return {string}
@@ -370,7 +338,6 @@ const ParsedHtmlTag = class {
   getExtensionName() {
     return this.scriptTag_.extensionName;
   }
-
   /**
    * Returns the extension version.
    * @return {string}
@@ -378,7 +345,6 @@ const ParsedHtmlTag = class {
   getExtensionVersion() {
     return this.scriptTag_.extensionVersion;
   }
-
   /**
    * Returns the script release version, otherwise ScriptReleaseVersion.UNKNOWN.
    * @return {!ScriptReleaseVersion}
@@ -386,7 +352,6 @@ const ParsedHtmlTag = class {
   getScriptReleaseVersion() {
     return this.scriptTag_.releaseVersion;
   }
-
   /**
    * Returns the script tag path of the 'src' attribute.
    * @return {string}
@@ -394,7 +359,6 @@ const ParsedHtmlTag = class {
   getAmpScriptPath() {
     return this.scriptTag_.path;
   }
-
   /**
    * Tests if this tag is a script with a valid AMP script path.
    * @return {boolean}
@@ -402,7 +366,6 @@ const ParsedHtmlTag = class {
   hasValidAmpScriptPath() {
     return this.scriptTag_.hasValidPath;
   }
-
   /**
    * Tests if this tag is a script with a src of an AMP domain.
    * @return {boolean}
@@ -410,7 +373,6 @@ const ParsedHtmlTag = class {
   isAmpDomain() {
     return this.scriptTag_.isAmpDomain;
   }
-
   /**
    * Tests if this is the AMP runtime script tag.
    * @return {boolean}
@@ -418,7 +380,6 @@ const ParsedHtmlTag = class {
   isAmpRuntimeScript() {
     return this.scriptTag_.isRuntime;
   }
-
   /**
    * Tests if this is an extension script tag.
    * @return {boolean}
@@ -428,8 +389,6 @@ const ParsedHtmlTag = class {
   }
 };
 exports.ParsedHtmlTag = ParsedHtmlTag;
-
-
 /**
  * An interface to the `htmlparser.HtmlParser` visitor, that gets
  * called while the HTML is being parsed.
@@ -440,48 +399,40 @@ const HtmlSaxHandler = class {
    * @param {!ParsedHtmlTag} tag
    */
   startTag(tag) {}
-
   /**
    * Handler called when the parser found a closing tag.
    * @param {!ParsedHtmlTag} tag
    */
   endTag(tag) {}
-
   /**
    * Handler called when PCDATA is found.
    * @param {string} text The PCDATA text found.
    */
   pcdata(text) {}
-
   /**
    * Handler called when RCDATA is found.
    * @param {string} text The RCDATA text found.
    */
   rcdata(text) {}
-
   /**
    * Handler called when CDATA is found.
    * @param {string} text The CDATA text found.
    */
   cdata(text) {}
-
   /**
    * Handler called when the parser is starting to parse the document.
    */
   startDoc() {}
-
   /**
    * Handler called when the parsing is done.
    */
   endDoc() {}
-
   /**
    * Callback for informing that the parser is manufacturing a <body> tag not
    * actually found on the page. This will be followed by a startTag() with the
    * actual body tag in question.
    */
   markManufacturedBody() {}
-
   /**
    * HTML5 defines how parsers treat documents with multiple body tags: they
    * merge the attributes from the later ones into the first one. Therefore,
@@ -492,8 +443,6 @@ const HtmlSaxHandler = class {
   effectiveBodyTag(attributes) {}
 };
 exports.HtmlSaxHandler = HtmlSaxHandler;
-
-
 /**
  * An interface for determining the line/column information for SAX events that
  * are being received by a `HtmlSaxHandler`. Please see
@@ -501,7 +450,6 @@ exports.HtmlSaxHandler = HtmlSaxHandler;
  */
 const DocLocator = class {
   constructor() {}
-
   /**
    * The current line in the HTML source from which the most recent SAX event
    * was generated. This value is only sensible once an event has been
@@ -510,7 +458,6 @@ const DocLocator = class {
    * @return {number} line The current line.
    */
   getLine() {}
-
   /**
    * The current column in the HTML source from which the most recent SAX event
    * was generated. This value is only sensible once an event has been
@@ -519,7 +466,6 @@ const DocLocator = class {
    * @return {number} line The current column.
    */
   getCol() {}
-
   /**
    * The size of the document in bytes.
    * @return {number}.
@@ -527,8 +473,6 @@ const DocLocator = class {
   getDocByteSize() {}
 };
 exports.DocLocator = DocLocator;
-
-
 /**
  * Handler with a setDocLocator method in addition to the parser callbacks.
  * @extends {HtmlSaxHandler}
@@ -537,7 +481,6 @@ const HtmlSaxHandlerWithLocation = class extends HtmlSaxHandler {
   constructor() {
     super();
   }
-
   /**
    * Called prior to parsing a document, that is, before `startTag`.
    * @param {!DocLocator} locator A locator instance which
diff --git a/validator/js/engine/json-testutil.js b/validator/js/engine/json-testutil.js
deleted file mode 100644
index 73d7f9c93f20..000000000000
--- a/validator/js/engine/json-testutil.js
+++ /dev/null
@@ -1,241 +0,0 @@
-goog.module('json_testutil');
-const asserts = goog.require('goog.asserts');
-
-/**
- * Helper function for renderJSON below.
- * Serializes a json object into a json string segments.
- * This is done by traversing the object recursively, calling toJSON
- * on anything encountered, and then mapping the objects, arrays,
- * and primitive types (string, number, boolean) to string segments.
- * This code is partially lifted from goog.json.Serializer,
- * but simpler (falls back to JSON.stringify for primitive types) and
- * sorts keys alphabetically, to avoid having brittle unittests. It
- * also emits single quotes instead of double quotes, technically
- * violating json.org but complying with our style guide.
- * @param {*} obj json object to serialize.
- * @param {!Array<string>} out accumulates the output, to be later joined.
- * @param {function(string, string):number=} cmpFn comparator for json keys
- */
-function objToJsonSegments(obj, out, cmpFn) {
-  if (obj === null) {
-    out.push('null');
-    return;
-  }
-  if (obj === undefined) {
-    out.push('undefined');
-    return;
-  }
-  if (obj.toJSON) {
-    obj = obj.toJSON();
-  }
-  if (typeof obj === 'object') {
-    if (Array.isArray(obj)) {
-      out.push('[');
-      for (let i = 0; i < obj.length; i++) {
-        if (i > 0) {
-          out.push(',');
-        }
-        objToJsonSegments(obj[i], out, cmpFn);
-      }
-      out.push(']');
-      return;
-    } else if (
-        obj instanceof String || obj instanceof Number ||
-        obj instanceof Boolean) {
-      obj = obj.valueOf();
-      // Fall through to switch below.
-    } else {
-      out.push('{');
-      const keys = [];
-      for (const key in obj) {
-        if (Object.prototype.hasOwnProperty.call(
-                /** @type {Object}*/ (obj), key)) {
-          keys.push(key);
-        }
-      }
-      // We sort the keys, to make the behavior deterministic.
-      if (cmpFn !== undefined) {
-        keys.sort(cmpFn);
-      } else {
-        keys.sort();
-      }
-      for (let i = 0; i < keys.length; i++) {
-        if (i > 0) {
-          out.push(',');
-        }
-        objToJsonSegments(keys[i], out, cmpFn);
-        out.push(':');
-        objToJsonSegments(obj[keys[i]], out, cmpFn);
-      }
-      out.push('}');
-      return;
-    }
-  }
-  switch (typeof obj) {
-    case 'string':
-    case 'number':
-    case 'boolean': {
-      const candidate = JSON.stringify(obj, null, '');
-      if (startsWithChar(candidate, '"')) {
-        // We hack the non-standard "'" into place here because the
-        // Javascript style guide prefers them (and git5 lint reports
-        // double quotes as errors).
-        out.push('\'' + candidate.slice(1, -1).replace(/\'/g, '\\\'') + '\'');
-      } else {
-        out.push(candidate);
-      }
-      return;
-    }
-    default:
-      asserts.fail('Unknown type: ' + typeof obj);
-  }
-}
-
-/**
- * Default key comparator for ordering the json output.
- * @param {string} a
- * @param {string} b
- * @return {number}
- */
-const defaultCmpFn = function(a, b) {
-  if (a < b) {
-    return -1;
-  }
-  if (a > b) {
-    return 1;
-  }
-  return 0;
-};
-exports.defaultCmpFn = defaultCmpFn;
-
-
-/**
- * Given an order for the json keys, creates a function which
- * lets us sort the keys in json output. This can improve the
- * rendered json output that's used in assertions in a unittest.
- *
- * @param {!Array<string>} keyOrder
- * @return {function(string, string): number}
- */
-const makeJsonKeyCmpFn = function(keyOrder) {
-  /** @type {!Object<string, number>} */
-  const keyPriority = {};
-  for (let ii = 0; ii < keyOrder.length; ++ii) {
-    keyPriority[keyOrder[ii]] = ii;
-  }
-
-  return function(a, b) {
-    // Handle cases where only only one of the two keys is recognized.
-    // Unrecognized keys go last.
-    if (keyPriority.hasOwnProperty(a) && !keyPriority.hasOwnProperty(b)) {
-      return -1;
-    }
-    if (keyPriority.hasOwnProperty(b) && !keyPriority.hasOwnProperty(a)) {
-      return 1;
-    }
-
-    // Handle case where both keys are recognized.
-    if (keyPriority.hasOwnProperty(b) && keyPriority.hasOwnProperty(a)) {
-      return keyPriority[a] - keyPriority[b];
-    }
-
-    return defaultCmpFn(a, b);
-  };
-};
-exports.makeJsonKeyCmpFn = makeJsonKeyCmpFn;
-
-/**
- * Determines whether the provided string starts with a particular character.
- * Note: In ES6, there's string::startsWith but we want to make this work
- * for some interpreters < ES6.
- * @param {string} str
- * @param {string} ch
- * @return {boolean}
- */
-function startsWithChar(str, ch) {
-  return str.length > 0 && str.charAt(0) === ch;
-}
-
-/**
- * Determines whether the provided string ends with a particular character.
- * Note: In ES6, there's string::endsWith but we want to make this work
- * for some interpreters < ES6.
- * @param {string} str
- * @param {string} ch
- * @return {boolean}
- */
-function endsWithChar(str, ch) {
-  return str.length > 0 && str.charAt(str.length - 1) === ch;
-}
-
-/**
- * Emits JSON output which is formatted for inclusion in a unittest.
- * This includes line breaks and emitting the non-standard quotes. It
- * uses objToJsonSegments rather than something else, to sort all fields in
- * objects by cmpFn. The output is stable for running emacs
- * indent-region over it, or using knock off features in lesser
- * editors. Usually, minor tweaking is sufficient to fit the output
- * onto our 80 column IBM 5081 punch cards.
- * @param {!Object} obj
- * @param {function(string, string):number=} [cmpFn=defaultCmpFn]
- * json key comparator
- * @param {number=} [offset=0] Offset number of characters.
- * @return {string}
- */
-const renderJSON = function(obj, cmpFn, offset) {
-  if (cmpFn === undefined) {
-    cmpFn = defaultCmpFn;
-  }
-  if (offset === undefined) {
-    offset = 0;
-  }
-  // First, let objToJsonSegments emit the json into
-  // segments. Conveniently, special characters such as '{', ',',
-  // etc. are - unless inside a string - emitted as individual strings
-  // - much like tokens coming from a tokenizer.
-  const segments = [];
-  objToJsonSegments(obj, segments, cmpFn);
-
-  const lines = [];
-  let current = '';      // current line
-  let nesting = offset;  // Keep track of how deep inside {[]} etc.
-
-  // Walk over the segments emitted by objToJsonSegments.
-  for (const segment of segments) {
-    // Start a new line, either if the current one ends with , or : and
-    // we're past 60 chars, or if the segment to process starts
-    // with an opening block character (but keep multiple opening blocks
-    // together).
-    if ((current.length > 60 &&
-         (endsWithChar(current, ',') || endsWithChar(current, ':'))) ||
-        ((segment === '{' || segment === '[') && !endsWithChar(current, '{') &&
-         !endsWithChar(current, '['))) {
-      lines.push(current);
-      current = '';
-      for (let i = 0; i < nesting; i++) {  // Emit indentation.
-        current += ' ';
-      }
-    }
-    // If the ',' or ':' didn't cause a line break, add a space after them
-    // to comply with the style guide.
-    if (endsWithChar(current, ',') || endsWithChar(current, ':')) {
-      current += ' ';
-    }
-    // Keep track of how deep we're inside {} [] for indentation.
-    if (segment === '{' || segment === '[') {
-      nesting++;
-    } else if (segment === '}' || segment === ']') {
-      nesting--;
-    }
-    // Now add the segment.
-    current += segment;
-  }
-  // Process leftovers.
-  if (current.length > 0) {
-    lines.push(current);
-  }
-  // Note that the return value starts and ends with a newline. That's
-  // handy for cutting / pasting a region of lines.
-  return lines.join('\n') + '\n';
-};
-exports.renderJSON = renderJSON;
diff --git a/validator/js/engine/keyframes-parse-css.js b/validator/js/engine/keyframes-parse-css.js
deleted file mode 100644
index abe6e41c86af..000000000000
--- a/validator/js/engine/keyframes-parse-css.js
+++ /dev/null
@@ -1,89 +0,0 @@
-goog.module('amp.validator.keyframesParseCss');
-
-const parse_css = goog.require('parse_css');
-const tokenize_css = goog.require('tokenize_css');
-const {ValidationError} = goog.require('amp.validator.protogenerated');
-
-/**
- * Fills an ErrorToken with the provided position, code, and params.
- * @param {!tokenize_css.Token} positionToken
- * @param {!ValidationError.Code} code
- * @param {!Array<string>} params
- * @return {!tokenize_css.ErrorToken}
- */
-const createErrorTokenAt = function(positionToken, code, params) {
-  const token = new tokenize_css.ErrorToken(code, params);
-  positionToken.copyPosTo(token);
-  return token;
-};
-exports.createErrorTokenAt = createErrorTokenAt;
-
-/** @private */
-class KeyframesVisitor extends parse_css.RuleVisitor {
-  /**
-   * @param {!Array<!tokenize_css.ErrorToken>} errors
-   */
-  constructor(errors) {
-    super();
-
-    /** @type {!Array<!tokenize_css.ErrorToken>} */
-    this.errors = errors;
-
-    /** @type {boolean} */
-    this.parentIsKeyframesAtRule = false;
-  }
-
-  /** @inheritDoc */
-  visitQualifiedRule(qualifiedRule) {
-    if (!this.parentIsKeyframesAtRule) {
-      this.errors.push(createErrorTokenAt(
-          qualifiedRule,
-          ValidationError.Code
-              .CSS_SYNTAX_DISALLOWED_QUALIFIED_RULE_MUST_BE_INSIDE_KEYFRAME,
-          ['style', qualifiedRule.ruleName()]));
-      return;
-    }
-    if (qualifiedRule.declarations.length > 0) {
-      return;
-    }
-    this.errors.push(createErrorTokenAt(
-        qualifiedRule,
-        ValidationError.Code.CSS_SYNTAX_QUALIFIED_RULE_HAS_NO_DECLARATIONS,
-        ['style', qualifiedRule.ruleName()]));
-  }
-
-  /** @inheritDoc */
-  visitAtRule(atRule) {
-    switch (atRule.name) {
-      case 'keyframes':
-      case '-moz-keyframes':
-      case '-o-keyframes':
-      case '-webkit-keyframes':
-        if (this.parentIsKeyframesAtRule) {
-          this.errors.push(createErrorTokenAt(
-              atRule,
-              ValidationError.Code
-                  .CSS_SYNTAX_DISALLOWED_KEYFRAME_INSIDE_KEYFRAME,
-              ['style']));
-        }
-        this.parentIsKeyframesAtRule = true;
-        return;
-      default:
-    }
-  }
-
-  /** @inheritDoc */
-  leaveAtRule(atRule) {
-    this.parentIsKeyframesAtRule = false;
-  }
-}
-
-/**
- * @param {!parse_css.Stylesheet} styleSheet
- * @param {!Array<!tokenize_css.ErrorToken>} errors
- */
-const validateKeyframesCss = function(styleSheet, errors) {
-  const visitor = new KeyframesVisitor(errors);
-  styleSheet.accept(visitor);
-};
-exports.validateKeyframesCss = validateKeyframesCss;
diff --git a/validator/js/engine/keyframes-parse-css_test.js b/validator/js/engine/keyframes-parse-css_test.js
deleted file mode 100644
index bd80ac4fec2d..000000000000
--- a/validator/js/engine/keyframes-parse-css_test.js
+++ /dev/null
@@ -1,221 +0,0 @@
-goog.module('parse_css.KeyframesParseCssTest');
-
-const json_testutil = goog.require('json_testutil');
-const parse_css = goog.require('parse_css');
-const tokenize_css = goog.require('tokenize_css');
-const {validateKeyframesCss} = goog.require('amp.validator.keyframesParseCss');
-
-/**
- * A strict comparison between two values that does not truncate the
- * error messages and works well with the closure compiler.
- * @param {*} expected
- * @param {*} saw
- */
-function assertStrictEqual(expected, saw) {
-  assert.ok(expected === saw, 'expected: ' + expected + ' saw: ' + saw);
-}
-
-/**
- * For emitting json output with keys in logical order for ErrorToken.
- * @param {string} a
- * @param {string} b
- * @return {number}
- */
-const jsonKeyCmp = json_testutil.makeJsonKeyCmpFn(
-    ['line', 'col', 'tokenType', 'code', 'params']);
-
-/**
- * @param {!Object} left
- * @param {!Object} right
- */
-function assertJSONEquals(left, right) {
-  assertStrictEqual(
-      json_testutil.renderJSON(left, jsonKeyCmp, /*offset=*/ 4),
-      json_testutil.renderJSON(right, jsonKeyCmp, /*offset=*/ 4));
-}
-
-/** @type {!Object<string,parse_css.BlockType>} */
-const keyframesCssParsingSpec = {
-  'keyframes': parse_css.BlockType.PARSE_AS_RULES,
-  'media': parse_css.BlockType.PARSE_AS_RULES,
-  'supports': parse_css.BlockType.PARSE_AS_RULES,
-  '-moz-keyframes': parse_css.BlockType.PARSE_AS_RULES,
-  '-o-keyframes': parse_css.BlockType.PARSE_AS_RULES,
-  '-webkit-keyframes': parse_css.BlockType.PARSE_AS_RULES,
-};
-
-describe('validateKeyframesCss', () => {
-  it('validates good keyframes example', () => {
-    const css = '@keyframes anim1 {' +
-        '0% {transform: translateX(-100%);}' +
-        '100% {transform: translateX(100%);}' +
-        '}' +
-        '@-webkit-keyframes anim1 {' +
-        '0% {transform: translateX(-100%);}' +
-        '100% {transform: translateX(100%);}' +
-        '}' +
-        '@media (min-width: 300px) {' +
-        '@keyframes anim1 {' +
-        '0% {transform: translateX(-100%);}' +
-        '100% {transform: translateX(100%);}' +
-        '}' +
-        '}' +
-        '@supports (offset-distance: 0) {' +
-        '@keyframes anim1 {' +
-        '0% {offset-distance: 0}' +
-        '100% {offset-distance: 100%}' +
-        '}' +
-        '}' +
-        '@media (min-width: 300px) {' +
-        '@supports (offset-distance: 0) {' +
-        '@keyframes anim1 {' +
-        '0% {offset-distance: 0}' +
-        '100% {offset-distance: 100%}' +
-        '}' +
-        '}' +
-        '}' +
-        '@supports (offset-distance: 0) {' +
-        '@media (min-width: 300px) {' +
-        '@keyframes anim1 {' +
-        '0% {transform: translateX(-100%);}' +
-        '100% {transform: translateX(100%);}' +
-        '}' +
-        '}' +
-        '}';
-    const errors = [];
-    const tokens = tokenize_css.tokenize(css, 1, 0, errors);
-    const sheet = parse_css.parseAStylesheet(
-        tokens, keyframesCssParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-        errors);
-    assertJSONEquals([], errors);
-    validateKeyframesCss(sheet, errors);
-    assertJSONEquals([], errors);
-  });
-
-  it('validates good allowed "@" rules', () => {
-    const css = '@keyframes anim1 {}' +
-        '@-webkit-keyframes anim1 {}' +
-        '@media (min-width: 300px) {}' +
-        '@supports (offset-distance: 0) {}' +
-        '@media (min-width: 300px) {}' +
-        '@supports (offset-distance: 0) {}';
-    const errors = [];
-    const tokens = tokenize_css.tokenize(css, 1, 0, errors);
-    const sheet = parse_css.parseAStylesheet(
-        tokens, keyframesCssParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-        errors);
-    assertJSONEquals([], errors);
-    validateKeyframesCss(sheet, errors);
-    assertJSONEquals([], errors);
-  });
-
-  it('validates bad not "@" rule', () => {
-    const css = 'amp-img {}';
-    const errors = [];
-    const tokens = tokenize_css.tokenize(css, 1, 0, errors);
-    const sheet = parse_css.parseAStylesheet(
-        tokens, keyframesCssParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-        errors);
-    assertJSONEquals([], errors);
-    validateKeyframesCss(sheet, errors);
-    assertJSONEquals(
-        [{
-          'line': 1,
-          'col': 0,
-          'tokenType': 'ERROR',
-          'code':
-              'CSS_SYNTAX_DISALLOWED_QUALIFIED_RULE_MUST_BE_INSIDE_KEYFRAME',
-          'params': ['style', 'amp-img'],
-        }],
-        errors);
-  });
-
-  it('validates bad non keyframe with declarations', () => {
-    const css = '@media (min-width: 300px) {' +
-        '100% {offset-distance: 100%}' +
-        '}';
-    const errors = [];
-    const tokens = tokenize_css.tokenize(css, 1, 0, errors);
-    const sheet = parse_css.parseAStylesheet(
-        tokens, keyframesCssParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-        errors);
-    assertJSONEquals([], errors);
-    validateKeyframesCss(sheet, errors);
-    assertJSONEquals(
-        [{
-          'line': 1,
-          'col': 27,
-          'tokenType': 'ERROR',
-          'code':
-              'CSS_SYNTAX_DISALLOWED_QUALIFIED_RULE_MUST_BE_INSIDE_KEYFRAME',
-          'params': ['style', '100'],
-        }],
-        errors);
-  });
-
-  it('validates correct prelude concatenation', () => {
-    const css = 'a.underlined {}';
-    const errors = [];
-    const tokens = tokenize_css.tokenize(css, 1, 0, errors);
-    const sheet = parse_css.parseAStylesheet(
-        tokens, keyframesCssParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-        errors);
-    assertJSONEquals([], errors);
-    validateKeyframesCss(sheet, errors);
-    assertJSONEquals(
-        [{
-          'line': 1,
-          'col': 0,
-          'tokenType': 'ERROR',
-          'code':
-              'CSS_SYNTAX_DISALLOWED_QUALIFIED_RULE_MUST_BE_INSIDE_KEYFRAME',
-          'params': ['style', 'a.underlined'],
-        }],
-        errors);
-  });
-
-  it('validates bad qualified rule, not inside "@" rule', () => {
-    const css = 'a { color: red }';
-    const errors = [];
-    const tokens = tokenize_css.tokenize(css, 1, 0, errors);
-    const sheet = parse_css.parseAStylesheet(
-        tokens, keyframesCssParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-        errors);
-    assertJSONEquals([], errors);
-    validateKeyframesCss(sheet, errors);
-    assertJSONEquals(
-        [{
-          'line': 1,
-          'col': 0,
-          'tokenType': 'ERROR',
-          'code':
-              'CSS_SYNTAX_DISALLOWED_QUALIFIED_RULE_MUST_BE_INSIDE_KEYFRAME',
-          'params': ['style', 'a'],
-        }],
-        errors);
-  });
-
-  it('validates bad qualified rule, keyframe inside keyframe', () => {
-    const css = '@keyframes anim2 {' +
-        '@keyframes anim1 {' +
-        '100% {visibility: visible}' +
-        '}' +
-        '}';
-    const errors = [];
-    const tokens = tokenize_css.tokenize(css, 1, 0, errors);
-    const sheet = parse_css.parseAStylesheet(
-        tokens, keyframesCssParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-        errors);
-    assertJSONEquals([], errors);
-    validateKeyframesCss(sheet, errors);
-    assertJSONEquals(
-        [{
-          'line': 1,
-          'col': 18,
-          'tokenType': 'ERROR',
-          'code': 'CSS_SYNTAX_DISALLOWED_KEYFRAME_INSIDE_KEYFRAME',
-          'params': ['style'],
-        }],
-        errors);
-  });
-});
diff --git a/validator/js/engine/parse-css.js b/validator/js/engine/parse-css.js
deleted file mode 100644
index 95a32c024d3b..000000000000
--- a/validator/js/engine/parse-css.js
+++ /dev/null
@@ -1,2322 +0,0 @@
-/**
- * Credits:
- *   This original version of this file was derived from
- *   https://github.com/tabatkins/parse-css by Tab Atkins,
- *   licensed under the CC0 license
- *   (http://creativecommons.org/publicdomain/zero/1.0/).
- */
-goog.module('parse_css');
-
-const asserts = goog.require('goog.asserts');
-const googString = goog.require('goog.string');
-const tokenize_css = goog.require('tokenize_css');
-const {ValidationError} = goog.require('amp.validator.protogenerated');
-
-/**
- * @param {!Array<?>} arr
- * @return {!Array<!Object>}
- */
-function arrayToJSON(arr) {
-  const json = [];
-  for (let i = 0; i < arr.length; i++) {
-    json.push(arr[i].toJSON());
-  }
-  return json;
-}
-
-/**
- * A TokenStream is essentially an array of Token objects
- * with a reference to a current position. Consume/Reconsume methods
- * move the current position. tokenAt, current, and next inspect tokens
- * at specific points.
- */
-const TokenStream = class {
-  /**
-   * @param {!Array<!tokenize_css.Token>} tokens
-   */
-  constructor(tokens) {
-    asserts.assert(
-        tokens.length > 0,
-        'Internal Error: empty TokenStream - must have EOF token');
-    asserts.assert(
-        tokens[tokens.length - 1].tokenType ===
-            tokenize_css.TokenType.EOF_TOKEN,
-        'Internal Error: TokenStream must end with EOF');
-
-    /** @type {!Array<!tokenize_css.Token>} */
-    this.tokens = tokens;
-    /** @type {number} */
-    this.pos = -1;
-  }
-
-  /**
-   * Returns the token at an absolute position in the token stream.
-   *
-   * @param {number} num
-   * @return {!tokenize_css.Token}
-   */
-  tokenAt(num) {
-    // The last token is guaranteed to be the EOF token (with correct
-    // line / col!) so any request past the length of the array
-    // fetches that.
-    return (num < this.tokens.length) ? this.tokens[num] :
-                                        this.tokens[this.tokens.length - 1];
-  }
-
-  /**
-   * Returns the token at the current position in the token stream.
-   * @return {!tokenize_css.Token}
-   */
-  current() {
-    return this.tokenAt(this.pos);
-  }
-
-  /**
-   * Returns the token at the next position in the token stream.
-   * @return {!tokenize_css.Token}
-   */
-  next() {
-    return this.tokenAt(this.pos + 1);
-  }
-
-  /**
-   * Advances the stream by one.
-   */
-  consume() {
-    this.pos++;
-  }
-
-  /** Rewinds to the previous position in the input. */
-  reconsume() {
-    this.pos--;
-  }
-};
-exports.TokenStream = TokenStream;
-
-/**
- * Strips vendor prefixes from identifiers, e.g. property names or names
- * of at rules. E.g., "-moz-keyframes" -> "keyframes".
- * @param {string} prefixedString
- * @return {string}
- */
-const stripVendorPrefix = function(prefixedString) {
-  // Checking for '-' is an optimization.
-  if (prefixedString !== '' && prefixedString[0] === '-') {
-    if (googString./*OK*/ startsWith(prefixedString, '-o-')) {
-      return prefixedString.substr('-o-'.length);
-    }
-    if (googString./*OK*/ startsWith(prefixedString, '-moz-')) {
-      return prefixedString.substr('-moz-'.length);
-    }
-    if (googString./*OK*/ startsWith(prefixedString, '-ms-')) {
-      return prefixedString.substr('-ms-'.length);
-    }
-    if (googString./*OK*/ startsWith(prefixedString, '-webkit-')) {
-      return prefixedString.substr('-webkit-'.length);
-    }
-  }
-  return prefixedString;
-};
-exports.stripVendorPrefix = stripVendorPrefix;
-
-/**
- * Strips 'min-' or 'max-' from the start of a media feature identifier, if
- * present. E.g., "min-width" -> "width".
- * @param {string} prefixedString
- * @return {string}
- */
-const stripMinMax = function(prefixedString) {
-  if (googString./*OK*/ startsWith(prefixedString, 'min-')) {
-    return prefixedString.substr('min-'.length);
-  }
-  if (googString./*OK*/ startsWith(prefixedString, 'max-')) {
-    return prefixedString.substr('max-'.length);
-  }
-  return prefixedString;
-};
-exports.stripMinMax = stripMinMax;
-
-/**
- * Returns a Stylesheet object with nested Rules.
- *
- * The top level Rules in a Stylesheet are always a series of
- * QualifiedRule's or AtRule's.
- *
- * @param {!Array<!tokenize_css.Token>} tokenList
- * @param {!Object<string,!BlockType>} atRuleSpec block type rules for
- * all CSS AT rules this canonicalizer should handle.
- * @param {!BlockType} defaultSpec default block type for types not
- * found in atRuleSpec.
- * @param {!Array<!tokenize_css.ErrorToken>} errors output array for the errors.
- * @return {!Stylesheet}
- */
-const parseAStylesheet = function(tokenList, atRuleSpec, defaultSpec, errors) {
-  const canonicalizer = new Canonicalizer(atRuleSpec, defaultSpec);
-  const stylesheet = new Stylesheet();
-
-  stylesheet.rules =
-      canonicalizer.parseAListOfRules(tokenList, /* topLevel */ true, errors);
-  tokenList[0].copyPosTo(stylesheet);
-  const eof = /** @type {!tokenize_css.EOFToken} */
-      (tokenList[tokenList.length - 1]);
-  stylesheet.eof = eof;
-
-  return stylesheet;
-};
-exports.parseAStylesheet = parseAStylesheet;
-
-/**
- * Returns a array of Declaration objects.
- *
- * @param {!Array<!tokenize_css.Token>} tokenList
- * @param {!Array<!tokenize_css.ErrorToken>} errors output array for the errors.
- * @return {!Array<!Declaration>}
- */
-const parseInlineStyle = function(tokenList, errors) {
-  const canonicalizer = new Canonicalizer({}, BlockType.PARSE_AS_DECLARATIONS);
-  return canonicalizer.parseAListOfDeclarations(tokenList, errors);
-};
-exports.parseInlineStyle = parseInlineStyle;
-
-/**
- * Abstract super class for the parser rules.
- */
-const Rule = class extends tokenize_css.Token {
-  constructor() {
-    super();
-    /** @type {!tokenize_css.TokenType} */
-    this.tokenType = tokenize_css.TokenType.UNKNOWN;
-  }
-
-  /** @param {!RuleVisitor} visitor */
-  accept(visitor) {}
-
-  /**
-   * @param {number=} opt_indent
-   * @return {string}
-   */
-  toString(opt_indent) {
-    return JSON.stringify(this.toJSON(), null, opt_indent);
-  }
-};
-exports.Rule = Rule;
-
-const Stylesheet = class extends Rule {
-  constructor() {
-    super();
-    /** @type {!Array<!Rule>} */
-    this.rules = [];
-    /** @type {?tokenize_css.EOFToken} */
-    this.eof = null;
-    /** @type {!tokenize_css.TokenType} */
-    this.tokenType = tokenize_css.TokenType.STYLESHEET;
-  }
-
-  /** @inheritDoc */
-  accept(visitor) {
-    visitor.visitStylesheet(this);
-    for (const rule of this.rules) {
-      rule.accept(visitor);
-    }
-    visitor.leaveStylesheet(this);
-  }
-};
-exports.Stylesheet = Stylesheet;
-
-/** @inheritDoc */
-Stylesheet.prototype.toJSON = function() {
-  const json = Rule.prototype.toJSON.call(this);
-  json['rules'] = arrayToJSON(this.rules);
-  json['eof'] = this.eof.toJSON();
-  return json;
-};
-
-const AtRule = class extends Rule {
-  /**
-   * @param {string} name
-   */
-  constructor(name) {
-    super();
-    /** @type {string} */
-    this.name = name;
-    /** @type {!Array<!tokenize_css.Token>} */
-    this.prelude = [];
-    /** @type {!Array<!Rule>} */
-    this.rules = [];
-    /** @type {!Array<!Declaration>} */
-    this.declarations = [];
-    /** @type {!tokenize_css.TokenType} */
-    this.tokenType = tokenize_css.TokenType.AT_RULE;
-  }
-
-  /** @inheritDoc */
-  accept(visitor) {
-    visitor.visitAtRule(this);
-    for (const rule of this.rules) {
-      rule.accept(visitor);
-    }
-    for (const declaration of this.declarations) {
-      declaration.accept(visitor);
-    }
-    visitor.leaveAtRule(this);
-  }
-};
-exports.AtRule = AtRule;
-
-/** @inheritDoc */
-AtRule.prototype.toJSON = function() {
-  const json = Rule.prototype.toJSON.call(this);
-  json['name'] = this.name;
-  json['prelude'] = arrayToJSON(this.prelude);
-  json['rules'] = arrayToJSON(this.rules);
-  json['declarations'] = arrayToJSON(this.declarations);
-  return json;
-};
-
-const QualifiedRule = class extends Rule {
-  constructor() {
-    super();
-    /** @type {!Array<!tokenize_css.Token>} */
-    this.prelude = [];
-    /** @type {!Array<!Declaration>} */
-    this.declarations = [];
-    /** @type {!tokenize_css.TokenType} */
-    this.tokenType = tokenize_css.TokenType.QUALIFIED_RULE;
-  }
-
-  /** @inheritDoc */
-  accept(visitor) {
-    visitor.visitQualifiedRule(this);
-    for (const declaration of this.declarations) {
-      declaration.accept(visitor);
-    }
-    visitor.leaveQualifiedRule(this);
-  }
-};
-exports.QualifiedRule = QualifiedRule;
-
-/** @inheritDoc */
-QualifiedRule.prototype.toJSON = function() {
-  const json = Rule.prototype.toJSON.call(this);
-  json['prelude'] = arrayToJSON(this.prelude);
-  json['declarations'] = arrayToJSON(this.declarations);
-  return json;
-};
-
-/** @return {string} The concatenation of the qualified rule name. */
-QualifiedRule.prototype.ruleName = function() {
-  let ruleName = '';
-  for (let i = 0; i < this.prelude.length; ++i) {
-    const prelude =
-        /** @type {!tokenize_css.IdentToken} */ (this.prelude[i]);
-    if (prelude.value) {
-      ruleName += prelude.value;
-    }
-  }
-  return ruleName;
-};
-
-const Declaration = class extends Rule {
-  /**
-   * @param {string} name
-   */
-  constructor(name) {
-    super();
-    /** @type {string} */
-    this.name = name;
-    /** @type {!Array<!tokenize_css.Token>} */
-    this.value = [];
-    /** @type {boolean} */
-    this.important = false;
-    /** @type {number} */
-    this.important_line = -1;
-    /** @type {number} */
-    this.important_col = -1;
-    /** @type {!tokenize_css.TokenType} */
-    this.tokenType = tokenize_css.TokenType.DECLARATION;
-  }
-
-  /**
-   * For a declaration, if the first non-whitespace token is an identifier,
-   * (including a number token type), returns its string value. Otherwise,
-   * returns the empty string.
-   * @return {string}
-   */
-  firstIdent() {
-    if (this.value.length === 0) {
-      return '';
-    }
-    if (this.value[0].tokenType === tokenize_css.TokenType.IDENT) {
-      return /** @type {!tokenize_css.StringValuedToken} */ (this.value[0])
-          .value;
-    }
-    if (this.value[0].tokenType === tokenize_css.TokenType.NUMBER) {
-      return /** @type {!tokenize_css.NumberToken} */ (this.value[0]).repr;
-    }
-    if (this.value.length >= 2 &&
-        (this.value[0].tokenType === tokenize_css.TokenType.WHITESPACE)) {
-      if (this.value[1].tokenType === tokenize_css.TokenType.IDENT) {
-        return /** @type {!tokenize_css.StringValuedToken} */ (this.value[1])
-            .value;
-      }
-      if (this.value[1].tokenType === tokenize_css.TokenType.NUMBER) {
-        return /** @type {!tokenize_css.NumberToken} */ (this.value[1]).repr;
-      }
-    }
-    return '';
-  }
-
-  /** @inheritDoc */
-  accept(visitor) {
-    visitor.visitDeclaration(this);
-    visitor.leaveDeclaration(this);
-  }
-};
-/** @inheritDoc */
-Declaration.prototype.toJSON = function() {
-  const json = Rule.prototype.toJSON.call(this);
-  json['name'] = this.name;
-  json['important'] = this.important;
-  json['value'] = arrayToJSON(this.value);
-  return json;
-};
-exports.Declaration = Declaration;
-
-/**
- * A visitor for Rule subclasses (StyleSheet, AtRule, QualifiedRule,
- * Declaration). Pass this to the Rule::Accept method.
- * Visitation order is to call the Visit* method on the current node,
- * then visit the children, then call the Leave* method on the current node.
- */
-const RuleVisitor = class {
-  constructor() {}
-
-  /** @param {!Stylesheet} stylesheet */
-  visitStylesheet(stylesheet) {}
-
-  /** @param {!Stylesheet} stylesheet */
-  leaveStylesheet(stylesheet) {}
-
-  /** @param {!AtRule} atRule */
-  visitAtRule(atRule) {}
-
-  /** @param {!AtRule} atRule */
-  leaveAtRule(atRule) {}
-
-  /** @param {!QualifiedRule} qualifiedRule */
-  visitQualifiedRule(qualifiedRule) {}
-
-  /** @param {!QualifiedRule} qualifiedRule */
-  leaveQualifiedRule(qualifiedRule) {}
-
-  /** @param {!Declaration} declaration */
-  visitDeclaration(declaration) {}
-
-  /** @param {!Declaration} declaration */
-  leaveDeclaration(declaration) {}
-};
-exports.RuleVisitor = RuleVisitor;
-
-/**
- * Enum describing how to parse the rules inside a CSS AT Rule.
- * @enum {string}
- */
-const BlockType = {
-  // Parse this simple block as a list of rules
-  // (Either Qualified Rules or AT Rules)
-  'PARSE_AS_RULES': 'PARSE_AS_RULES',
-  // Parse this simple block as a list of declarations
-  'PARSE_AS_DECLARATIONS': 'PARSE_AS_DECLARATIONS',
-  // Ignore this simple block, do not parse. This is generally used
-  // in conjunction with a later step emitting an error for this rule.
-  'PARSE_AS_IGNORE': 'PARSE_AS_IGNORE',
-};
-exports.BlockType = BlockType;
-
-/**
- * A canonicalizer is created with a specific spec for canonicalizing CSS AT
- * rules. It otherwise has no state.
- * @private
- */
-class Canonicalizer {
-  /**
-   * @param {!Object<string,!BlockType>} atRuleSpec block
-   * type rules for all CSS AT rules this canonicalizer should handle.
-   * @param {!BlockType} defaultSpec default block type for
-   * types not found in atRuleSpec.
-   */
-  constructor(atRuleSpec, defaultSpec) {
-    /**
-     * @type {!Object<string,!BlockType>}
-     * @private
-     */
-    this.atRuleSpec_ = atRuleSpec;
-    /**
-     * @type {!BlockType}
-     * @private
-     */
-    this.defaultAtRuleSpec_ = defaultSpec;
-  }
-
-  /**
-   * Returns a type telling us how to canonicalize a given AT rule's block.
-   * @param {!AtRule} atRule
-   * @return {!BlockType}
-   */
-  blockTypeFor(atRule) {
-    const maybeBlockType = this.atRuleSpec_[stripVendorPrefix(atRule.name)];
-    if (maybeBlockType !== undefined) {
-      return maybeBlockType;
-    } else {
-      return this.defaultAtRuleSpec_;
-    }
-  }
-
-  /**
-   * Parses and returns a list of rules, such as at the top level of a
-   * stylesheet. Return list has only QualifiedRule's and AtRule's as top level
-   * elements.
-   * @param {!Array<!tokenize_css.Token>} tokenList
-   * @param {boolean} topLevel
-   * @param {!Array<!tokenize_css.ErrorToken>} errors output array for the
-   *     errors.
-   * @return {!Array<!Rule>}
-   */
-  parseAListOfRules(tokenList, topLevel, errors) {
-    const tokenStream = new TokenStream(tokenList);
-    const rules = [];
-    while (true) {
-      tokenStream.consume();
-      const current = tokenStream.current().tokenType;
-      if (current === tokenize_css.TokenType.WHITESPACE) {
-        continue;
-      } else if (current === tokenize_css.TokenType.EOF_TOKEN) {
-        return rules;
-      } else if (
-          current === tokenize_css.TokenType.CDO ||
-          current === tokenize_css.TokenType.CDC) {
-        if (topLevel) {
-          continue;
-        }
-        this.parseAQualifiedRule(tokenStream, rules, errors);
-      } else if (current === tokenize_css.TokenType.AT_KEYWORD) {
-        rules.push(this.parseAnAtRule(tokenStream, errors));
-      } else {
-        this.parseAQualifiedRule(tokenStream, rules, errors);
-      }
-    }
-  }
-
-  /**
-   * Parses an At Rule.
-   *
-   * @param {!TokenStream} tokenStream
-   * @param {!Array<!tokenize_css.ErrorToken>} errors output array for the
-   *     errors.
-   * @return {!AtRule}
-   */
-  parseAnAtRule(tokenStream, errors) {
-    asserts.assert(
-        tokenStream.current().tokenType === tokenize_css.TokenType.AT_KEYWORD,
-        'Internal Error: parseAnAtRule precondition not met');
-
-    const startToken =
-        /** @type {!tokenize_css.AtKeywordToken} */ (tokenStream.current());
-    const rule = new AtRule(startToken.value);
-    startToken.copyPosTo(rule);
-
-    while (true) {
-      tokenStream.consume();
-      const current = tokenStream.current().tokenType;
-      if (current === tokenize_css.TokenType.SEMICOLON ||
-          current === tokenize_css.TokenType.EOF_TOKEN) {
-        rule.prelude.push(tokenStream.current());
-        return rule;
-      }
-      if (current === tokenize_css.TokenType.OPEN_CURLY) {
-        rule.prelude.push(
-            tokenStream.current().copyPosTo(new tokenize_css.EOFToken()));
-
-        /** @type {!Array<!tokenize_css.Token>} */
-        const contents = extractASimpleBlock(tokenStream, errors);
-
-        switch (this.blockTypeFor(rule)) {
-          case BlockType.PARSE_AS_RULES: {
-            rule.rules =
-                this.parseAListOfRules(contents, /* topLevel */ false, errors);
-            break;
-          }
-          case BlockType.PARSE_AS_DECLARATIONS: {
-            rule.declarations = this.parseAListOfDeclarations(contents, errors);
-            break;
-          }
-          case BlockType.PARSE_AS_IGNORE: {
-            break;
-          }
-          default: {
-            asserts.fail('Unrecognized blockType ' + this.blockTypeFor(rule));
-            break;
-          }
-        }
-        return rule;
-      }
-      if (!consumeAComponentValue(tokenStream, rule.prelude, /*depth*/ 0)) {
-        errors.push(tokenStream.current().copyPosTo(new tokenize_css.ErrorToken(
-            ValidationError.Code.CSS_EXCESSIVELY_NESTED, ['style'])));
-      }
-    }
-  }
-
-  /**
-   * Parses one Qualified rule or ErrorToken appended to either rules or errors
-   * respectively. Rule will include a prelude with the CSS selector (if any)
-   * and a list of declarations.
-   *
-   * @param {!TokenStream} tokenStream
-   * @param {!Array<!Rule>} rules output array for new rule
-   * @param {!Array<!tokenize_css.ErrorToken>} errors output array for new
-   *     error.
-   */
-  parseAQualifiedRule(tokenStream, rules, errors) {
-    asserts.assert(
-        tokenStream.current().tokenType !== tokenize_css.TokenType.EOF_TOKEN &&
-            tokenStream.current().tokenType !==
-                tokenize_css.TokenType.AT_KEYWORD,
-        'Internal Error: parseAQualifiedRule precondition not met');
-
-    const rule = tokenStream.current().copyPosTo(new QualifiedRule());
-    tokenStream.reconsume();
-    while (true) {
-      tokenStream.consume();
-      const current = tokenStream.current().tokenType;
-      if (current === tokenize_css.TokenType.EOF_TOKEN) {
-        errors.push(rule.copyPosTo(new tokenize_css.ErrorToken(
-            ValidationError.Code.CSS_SYNTAX_EOF_IN_PRELUDE_OF_QUALIFIED_RULE,
-            ['style'])));
-        return;
-      }
-      if (current === tokenize_css.TokenType.OPEN_CURLY) {
-        rule.prelude.push(
-            tokenStream.current().copyPosTo(new tokenize_css.EOFToken()));
-
-        // This consumes declarations (ie: "color: red;" ) inside
-        // a qualified rule as that rule's value.
-        rule.declarations = this.parseAListOfDeclarations(
-            extractASimpleBlock(tokenStream, errors), errors);
-
-        rules.push(rule);
-        return;
-      }
-      // This consumes a CSS selector as the rules prelude.
-      if (!consumeAComponentValue(tokenStream, rule.prelude, /*depth*/ 0)) {
-        errors.push(tokenStream.current().copyPosTo(new tokenize_css.ErrorToken(
-            ValidationError.Code.CSS_EXCESSIVELY_NESTED, ['style'])));
-      }
-    }
-  }
-
-  /**
-   * @param {!Array<!tokenize_css.Token>} tokenList
-   * @param {!Array<!tokenize_css.ErrorToken>} errors output array for the
-   *     errors.
-   * @return {!Array<!Declaration>}
-   */
-  parseAListOfDeclarations(tokenList, errors) {
-    /** @type {!Array<!Declaration>} */
-    const decls = [];
-    const tokenStream = new TokenStream(tokenList);
-    while (true) {
-      tokenStream.consume();
-      const current = tokenStream.current().tokenType;
-      if (current === tokenize_css.TokenType.WHITESPACE ||
-          current === tokenize_css.TokenType.SEMICOLON) {
-        continue;
-      } else if (current === tokenize_css.TokenType.EOF_TOKEN) {
-        return decls;
-      } else if (current === tokenize_css.TokenType.AT_KEYWORD) {
-        // The CSS3 Parsing spec allows for AT rules inside lists of
-        // declarations, but our grammar does not so we deviate a tiny bit here.
-        // We consume an AT rule, but drop it and instead push an error token.
-        const atRule = this.parseAnAtRule(tokenStream, errors);
-        errors.push(atRule.copyPosTo(new tokenize_css.ErrorToken(
-            ValidationError.Code.CSS_SYNTAX_INVALID_AT_RULE,
-            ['style', atRule.name])));
-      } else if (current === tokenize_css.TokenType.IDENT) {
-        this.parseADeclaration(tokenStream, decls, errors);
-      } else {
-        errors.push(tokenStream.current().copyPosTo(new tokenize_css.ErrorToken(
-            ValidationError.Code.CSS_SYNTAX_INVALID_DECLARATION, ['style'])));
-        tokenStream.reconsume();
-        while (!(
-            tokenStream.next().tokenType === tokenize_css.TokenType.SEMICOLON ||
-            tokenStream.next().tokenType ===
-                tokenize_css.TokenType.EOF_TOKEN)) {
-          tokenStream.consume();
-          const dummyTokenList = [];
-          if (!consumeAComponentValue(
-                  tokenStream, dummyTokenList, /*depth*/ 0)) {
-            errors.push(
-                tokenStream.current().copyPosTo(new tokenize_css.ErrorToken(
-                    ValidationError.Code.CSS_EXCESSIVELY_NESTED, ['style'])));
-          }
-        }
-      }
-    }
-  }
-
-  /**
-   * Adds one element to either declarations or errors.
-   * @param {!TokenStream} tokenStream
-   * @param {!Array<!Declaration>} declarations output array for
-   * declarations
-   * @param {!Array<!tokenize_css.ErrorToken>} errors output array for the
-   *     errors.
-   */
-  parseADeclaration(tokenStream, declarations, errors) {
-    asserts.assert(
-        tokenStream.current().tokenType === tokenize_css.TokenType.IDENT,
-        'Internal Error: parseADeclaration precondition not met');
-
-    const startToken =
-        /** @type {!tokenize_css.IdentToken} */ (tokenStream.current());
-    const decl = startToken.copyPosTo(new Declaration(startToken.value));
-
-    while (tokenStream.next().tokenType === tokenize_css.TokenType.WHITESPACE) {
-      tokenStream.consume();
-    }
-
-    tokenStream.consume();
-    if (!(tokenStream.current().tokenType === tokenize_css.TokenType.COLON)) {
-      errors.push(startToken.copyPosTo(new tokenize_css.ErrorToken(
-          ValidationError.Code.CSS_SYNTAX_INCOMPLETE_DECLARATION, ['style'])));
-      tokenStream.reconsume();
-      while (!(
-          tokenStream.next().tokenType === tokenize_css.TokenType.SEMICOLON ||
-          tokenStream.next().tokenType === tokenize_css.TokenType.EOF_TOKEN)) {
-        tokenStream.consume();
-      }
-      return;
-    }
-
-    while (
-        !(tokenStream.next().tokenType === tokenize_css.TokenType.SEMICOLON ||
-          tokenStream.next().tokenType === tokenize_css.TokenType.EOF_TOKEN)) {
-      tokenStream.consume();
-      if (!consumeAComponentValue(tokenStream, decl.value, /*depth*/ 0)) {
-        errors.push(tokenStream.current().copyPosTo(new tokenize_css.ErrorToken(
-            ValidationError.Code.CSS_EXCESSIVELY_NESTED, ['style'])));
-      }
-    }
-    decl.value.push(tokenStream.next().copyPosTo(new tokenize_css.EOFToken()));
-
-    let foundImportant = false;
-    // The last token is always EOF, so start at the 2nd to last token.
-    for (let i = decl.value.length - 2; i >= 0; i--) {
-      if (decl.value[i].tokenType === tokenize_css.TokenType.WHITESPACE) {
-        continue;
-      } else if (
-          decl.value[i].tokenType === tokenize_css.TokenType.IDENT &&
-          /** @type {!tokenize_css.IdentToken} */
-          (decl.value[i]).ASCIIMatch('important')) {
-        foundImportant = true;
-      } else if (
-          foundImportant &&
-          decl.value[i].tokenType === tokenize_css.TokenType.DELIM &&
-          /** @type {!tokenize_css.DelimToken} */ (decl.value[i]).value ===
-              '!') {
-        decl.important = true;
-        decl.important_line = decl.value[i].line;
-        decl.important_col = decl.value[i].col;
-        // Delete !important and later, but not the EOF token
-        decl.value.splice(i, decl.value.length - i - 1);
-        break;
-      } else {
-        break;
-      }
-    }
-
-    declarations.push(decl);
-  }
-}
-
-/** @type {number} **/
-const kMaximumCssRecursion = 100;
-
-/**
- * Consumes one or more tokens from a tokenStream, appending them to a
- * tokenList. If exceeds depth, returns false
- * @param {!TokenStream} tokenStream
- * @param {!Array<!tokenize_css.Token>} tokenList output array for tokens.
- * @param {number} depth
- * @return {boolean}
- */
-function consumeAComponentValue(tokenStream, tokenList, depth) {
-  if (depth > kMaximumCssRecursion) {
-    return false;
-  }
-  const current = tokenStream.current().tokenType;
-  if (current === tokenize_css.TokenType.OPEN_CURLY ||
-      current === tokenize_css.TokenType.OPEN_SQUARE ||
-      current === tokenize_css.TokenType.OPEN_PAREN) {
-    if (!consumeASimpleBlock(tokenStream, tokenList, depth + 1)) {
-      return false;
-    }
-  } else if (current === tokenize_css.TokenType.FUNCTION_TOKEN) {
-    if (!consumeAFunction(tokenStream, tokenList, depth + 1)) {
-      return false;
-    }
-  } else {
-    tokenList.push(tokenStream.current());
-  }
-  return true;
-}
-
-/**
- * Appends a simple block's contents to a tokenList, consuming from
- * the stream all those tokens that it adds to the tokenList,
- * including the start/end grouping token. If exceeds depth, returns false.
- * @param {!TokenStream} tokenStream
- * @param {!Array<!tokenize_css.Token>} tokenList output array for tokens.
- * @param {number} depth
- * @return {boolean}
- */
-function consumeASimpleBlock(tokenStream, tokenList, depth) {
-  if (depth > kMaximumCssRecursion) {
-    return false;
-  }
-  const current = tokenStream.current().tokenType;
-  asserts.assert(
-      (current === tokenize_css.TokenType.OPEN_CURLY ||
-       current === tokenize_css.TokenType.OPEN_SQUARE ||
-       current === tokenize_css.TokenType.OPEN_PAREN),
-      'Internal Error: consumeASimpleBlock precondition not met');
-
-  const startToken =
-      /** @type {!tokenize_css.GroupingToken} */ (tokenStream.current());
-  const {mirror} = startToken;
-
-  tokenList.push(startToken);
-  while (true) {
-    tokenStream.consume();
-    const current = tokenStream.current().tokenType;
-    if (current === tokenize_css.TokenType.EOF_TOKEN) {
-      tokenList.push(tokenStream.current());
-      return true;
-    } else if (
-        (current === tokenize_css.TokenType.CLOSE_CURLY ||
-         current === tokenize_css.TokenType.CLOSE_SQUARE ||
-         current === tokenize_css.TokenType.CLOSE_PAREN) &&
-        /** @type {!tokenize_css.GroupingToken} */
-        (tokenStream.current()).value === mirror) {
-      tokenList.push(tokenStream.current());
-      return true;
-    } else {
-      if (!consumeAComponentValue(tokenStream, tokenList, depth + 1)) {
-        return false;
-      }
-    }
-  }
-}
-
-/**
- * Returns a simple block's contents in tokenStream, excluding the
- * start/end grouping token, and appended with an EOFToken.
- * @param {!TokenStream} tokenStream
- * @param {!Array<!tokenize_css.ErrorToken>} errors
- * @return {!Array<!tokenize_css.Token>}
- */
-const extractASimpleBlock = function(tokenStream, errors) {
-  /** @type {!Array<!tokenize_css.Token>} */
-  const consumedTokens = [];
-  if (!consumeASimpleBlock(tokenStream, consumedTokens, /*depth*/ 0)) {
-    errors.push(tokenStream.current().copyPosTo(new tokenize_css.ErrorToken(
-        ValidationError.Code.CSS_EXCESSIVELY_NESTED, ['style'])));
-  }
-
-  // A simple block always has a start token (e.g. '{') and
-  // either a closing token or EOF token.
-  asserts.assert(consumedTokens.length >= 2);
-
-  // Exclude the start token. Convert end token to EOF.
-  const end = consumedTokens.length - 1;
-  consumedTokens[end] =
-      consumedTokens[end].copyPosTo(new tokenize_css.EOFToken());
-  return consumedTokens.slice(1);
-};
-exports.extractASimpleBlock = extractASimpleBlock;
-
-/**
- * Appends a function's contents to a tokenList, consuming from the
- * stream all those tokens that it adds to the tokenList, including
- * the function token and end grouping token. If exceeds depth, returns false.
- * @param {!TokenStream} tokenStream
- * @param {!Array<!tokenize_css.Token>} tokenList output array for tokens.
- * @param {number} depth
- * @return {boolean}
- */
-function consumeAFunction(tokenStream, tokenList, depth) {
-  if (depth > kMaximumCssRecursion) {
-    return false;
-  }
-  asserts.assert(
-      tokenStream.current().tokenType === tokenize_css.TokenType.FUNCTION_TOKEN,
-      'Internal Error: consumeAFunction precondition not met');
-  tokenList.push(tokenStream.current());
-  while (true) {
-    tokenStream.consume();
-    const current = tokenStream.current().tokenType;
-    if (current === tokenize_css.TokenType.EOF_TOKEN ||
-        current === tokenize_css.TokenType.CLOSE_PAREN) {
-      tokenList.push(tokenStream.current());
-      return true;
-    } else {
-      if (!consumeAComponentValue(tokenStream, tokenList, depth + 1)) {
-        return false;
-      }
-    }
-  }
-}
-
-/**
- * Returns a function's contents in tokenList, including the leading
- * FunctionToken, but excluding the trailing CloseParen token and
- * appended with an EOFToken instead.
- * @param {!TokenStream} tokenStream
- * @param {!Array<!tokenize_css.ErrorToken>} errors
- * @return {!Array<!tokenize_css.Token>}
- */
-const extractAFunction = function(tokenStream, errors) {
-  /** @type {!Array<!tokenize_css.Token>} */
-  const consumedTokens = [];
-  if (!consumeAFunction(tokenStream, consumedTokens, /*depth*/ 0)) {
-    errors.push(tokenStream.current().copyPosTo(new tokenize_css.ErrorToken(
-        ValidationError.Code.CSS_EXCESSIVELY_NESTED, ['style'])));
-  }
-  // A function always has a start FunctionToken and
-  // either a CloseParenToken or EOFToken.
-  asserts.assert(consumedTokens.length >= 2);
-
-  // Convert end token to EOF.
-  const end = consumedTokens.length - 1;
-  consumedTokens[end] =
-      consumedTokens[end].copyPosTo(new tokenize_css.EOFToken());
-  return consumedTokens;
-};
-exports.extractAFunction = extractAFunction;
-
-/**
- * Used by ExtractUrls to return urls it has seen. This represents
- * URLs in CSS such as url(http://foo.com/) and url("http://bar.com/").
- * For this token, line() and col() indicate the position information
- * of the left-most CSS token that's part of the URL. E.g., this would be
- * the URLToken instance or the FunctionToken instance.
- */
-const ParsedCssUrl = class extends tokenize_css.Token {
-  constructor() {
-    super();
-    /** @type {!tokenize_css.TokenType} */
-    this.tokenType = tokenize_css.TokenType.PARSED_CSS_URL;
-    /**
-     * The decoded URL. This string will not contain CSS string escapes,
-     * quotes, or similar. Encoding is utf8.
-     * @type {string}
-     */
-    this.utf8Url = '';
-    /**
-     * A rule scope, in case the url was encountered within an at-rule.
-     * If not within an at-rule, this string is empty.
-     * @type {string}
-     */
-    this.atRuleScope = '';
-  }
-};
-exports.ParsedCssUrl = ParsedCssUrl;
-
-/** @inheritDoc */
-ParsedCssUrl.prototype.toJSON = function() {
-  const json = tokenize_css.Token.prototype.toJSON.call(this);
-  json['utf8Url'] = this.utf8Url;
-  json['atRuleScope'] = this.atRuleScope;
-  return json;
-};
-
-/**
- * Parses a CSS URL token; typically takes the form "url(http://foo)".
- * Preconditions: tokens[token_idx] is a URL token
- *                and token_idx + 1 is in range.
- * @param {!Array<!tokenize_css.Token>} tokens
- * @param {number} tokenIdx
- * @param {!ParsedCssUrl} parsed
- */
-function parseUrlToken(tokens, tokenIdx, parsed) {
-  asserts.assert(tokenIdx + 1 < tokens.length);
-  const token = tokens[tokenIdx];
-  asserts.assert(token.tokenType === tokenize_css.TokenType.URL);
-  token.copyPosTo(parsed);
-  parsed.utf8Url = /** @type {!tokenize_css.URLToken}*/ (token).value;
-}
-
-/**
- * Parses a CSS function token named 'url', including the string and closing
- * paren. Typically takes the form "url('http://foo')".
- * Returns the token_idx past the closing paren, or -1 if parsing fails.
- * Preconditions: tokens[token_idx] is a URL token
- *                and tokens[token_idx]->StringValue() == "url"
- * @param {!Array<!tokenize_css.Token>} tokens
- * @param {number} tokenIdx
- * @param {!ParsedCssUrl} parsed
- * @return {number}
- */
-function parseUrlFunction(tokens, tokenIdx, parsed) {
-  const token = tokens[tokenIdx];
-  asserts.assert(token.tokenType == tokenize_css.TokenType.FUNCTION_TOKEN);
-  asserts.assert(
-      /** @type {!tokenize_css.FunctionToken} */ (token).value === 'url');
-  asserts.assert(
-      tokens[tokens.length - 1].tokenType === tokenize_css.TokenType.EOF_TOKEN);
-  token.copyPosTo(parsed);
-  ++tokenIdx;  // We've digested the function token above.
-  // Safe: tokens ends w/ EOF_TOKEN.
-  asserts.assert(tokenIdx < tokens.length);
-
-  // Consume optional whitespace.
-  while (tokens[tokenIdx].tokenType === tokenize_css.TokenType.WHITESPACE) {
-    ++tokenIdx;
-    // Safe: tokens ends w/ EOF_TOKEN.
-    asserts.assert(tokenIdx < tokens.length);
-  }
-
-  // Consume URL.
-  if (tokens[tokenIdx].tokenType !== tokenize_css.TokenType.STRING) {
-    return -1;
-  }
-  parsed.utf8Url =
-      /** @type {!tokenize_css.StringToken} */ (tokens[tokenIdx]).value;
-
-  ++tokenIdx;
-  // Safe: tokens ends w/ EOF_TOKEN.
-  asserts.assert(tokenIdx < tokens.length);
-
-  // Consume optional whitespace.
-  while (tokens[tokenIdx].tokenType === tokenize_css.TokenType.WHITESPACE) {
-    ++tokenIdx;
-    // Safe: tokens ends w/ EOF_TOKEN.
-    asserts.assert(tokenIdx < tokens.length);
-  }
-
-  // Consume ')'
-  if (tokens[tokenIdx].tokenType !== tokenize_css.TokenType.CLOSE_PAREN) {
-    return -1;
-  }
-  return tokenIdx + 1;
-}
-
-/**
- * Helper class for implementing extractUrls.
- * @private
- */
-class UrlFunctionVisitor extends RuleVisitor {
-  /**
-   * @param {!Array<!ParsedCssUrl>} parsedUrls
-   * @param {!Array<!tokenize_css.ErrorToken>} errors
-   */
-  constructor(parsedUrls, errors) {
-    super();
-
-    /** @type {!Array<!ParsedCssUrl>} */
-    this.parsedUrls = parsedUrls;
-    /** @type {!Array<!tokenize_css.ErrorToken>} */
-    this.errors = errors;
-    /** @type {string} */
-    this.atRuleScope = '';
-  }
-
-  /** @inheritDoc */
-  visitAtRule(atRule) {
-    this.atRuleScope = atRule.name;
-  }
-
-  /** @inheritDoc */
-  leaveAtRule(atRule) {
-    this.atRuleScope = '';
-  }
-
-  /** @inheritDoc */
-  visitQualifiedRule(qualifiedRule) {
-    this.atRuleScope = '';
-  }
-
-  /** @inheritDoc */
-  visitDeclaration(declaration) {
-    asserts.assert(declaration.value.length > 0);
-    asserts.assert(
-        declaration.value[declaration.value.length - 1].tokenType ===
-        tokenize_css.TokenType.EOF_TOKEN);
-    for (let ii = 0; ii < declaration.value.length - 1;) {
-      const token = declaration.value[ii];
-      if (token.tokenType === tokenize_css.TokenType.URL) {
-        const parsedUrl = new ParsedCssUrl();
-        parseUrlToken(declaration.value, ii, parsedUrl);
-        parsedUrl.atRuleScope = this.atRuleScope;
-        this.parsedUrls.push(parsedUrl);
-        ++ii;
-        continue;
-      }
-      if (token.tokenType === tokenize_css.TokenType.FUNCTION_TOKEN &&
-          /** @type {!tokenize_css.FunctionToken} */ (token).value === 'url') {
-        const parsedUrl = new ParsedCssUrl();
-        ii = parseUrlFunction(declaration.value, ii, parsedUrl);
-        if (ii === -1) {
-          this.errors.push(token.copyPosTo(new tokenize_css.ErrorToken(
-              ValidationError.Code.CSS_SYNTAX_BAD_URL, ['style'])));
-          return;
-        }
-        parsedUrl.atRuleScope = this.atRuleScope;
-        this.parsedUrls.push(parsedUrl);
-        continue;
-      }
-      // It's neither a url token nor a function token named url. So, we skip.
-      ++ii;
-    }
-  }
-}
-
-/**
- * Helper class for implementing ExtractImportantProperties.
- * Iterates over all declarations and returns pointers to declarations
- * that were marked with `!important`.
- * @private
- */
-class ImportantPropertyVisitor extends RuleVisitor {
-  /**
-   * @param {!Array<!Declaration>} important
-   */
-  constructor(important) {
-    super();
-
-    /** @type {!Array<!Declaration>} */
-    this.important = important;
-  }
-
-  /** @inheritDoc */
-  visitDeclaration(declaration) {
-    if (declaration.important) this.important.push(declaration);
-  }
-}
-
-/**
- * Extracts the URLs within the provided stylesheet, emitting them into
- * parsedUrls and errors into errors.
- * @param {!Stylesheet} stylesheet
- * @param {!Array<!ParsedCssUrl>} parsedUrls
- * @param {!Array<!tokenize_css.ErrorToken>} errors
- */
-const extractUrlsFromStylesheet = function(stylesheet, parsedUrls, errors) {
-  const parsedUrlsOldLength = parsedUrls.length;
-  const errorsOldLength = errors.length;
-  const visitor = new UrlFunctionVisitor(parsedUrls, errors);
-  stylesheet.accept(visitor);
-  // If anything went wrong, delete the urls we've already emitted.
-  if (errorsOldLength !== errors.length) {
-    parsedUrls.splice(parsedUrlsOldLength);
-  }
-};
-exports.extractUrlsFromStylesheet = extractUrlsFromStylesheet;
-
-/**
- * Same as the stylesheet variant above, but operates on a single declaration at
- * a time. Usedful when operating on parsed style attributes.
- * @param {!Declaration} declaration
- * @param {!Array<!ParsedCssUrl>} parsedUrls
- * @param {!Array<!tokenize_css.ErrorToken>} errors
- */
-const extractUrlsFromDeclaration = function(declaration, parsedUrls, errors) {
-  const parsedUrlsOldLength = parsedUrls.length;
-  const errorsOldLength = errors.length;
-  const visitor = new UrlFunctionVisitor(parsedUrls, errors);
-  declaration.accept(visitor);
-  // If anything went wrong, delete the urls we've already emitted.
-  if (errorsOldLength !== errors.length) {
-    parsedUrls.splice(parsedUrlsOldLength);
-  }
-};
-exports.extractUrlsFromDeclaration = extractUrlsFromDeclaration;
-
-/**
- * Extracts the declarations marked `!important` within within the provided
- * stylesheet, emitting them into `important`.
- * @param {!Stylesheet} stylesheet
- * @param {!Array<!Declaration>} important
- */
-const extractImportantDeclarations = function(stylesheet, important) {
-  const visitor = new ImportantPropertyVisitor(important);
-  stylesheet.accept(visitor);
-};
-exports.extractImportantDeclarations = extractImportantDeclarations;
-
-/**
- * Helper class for implementing parseMediaQueries.
- * @private
- */
-class MediaQueryVisitor extends RuleVisitor {
-  /**
-   * @param {!Array<!tokenize_css.IdentToken>} mediaTypes
-   * @param {!Array<!tokenize_css.IdentToken>} mediaFeatures
-   * @param {!Array<!tokenize_css.ErrorToken>} errors
-   */
-  constructor(mediaTypes, mediaFeatures, errors) {
-    super();
-
-    /** @type {!Array<!tokenize_css.IdentToken>} */
-    this.mediaTypes = mediaTypes;
-    /** @type {!Array<!tokenize_css.IdentToken>} */
-    this.mediaFeatures = mediaFeatures;
-    /** @type {!Array<!tokenize_css.ErrorToken>} */
-    this.errors = errors;
-  }
-
-  /** @inheritDoc */
-  visitAtRule(atRule) {
-    if (atRule.name.toLowerCase() !== 'media') {
-      return;
-    }
-
-    const tokenStream = new TokenStream(atRule.prelude);
-    tokenStream.consume();  // Advance to first token.
-    if (!this.parseAMediaQueryList_(tokenStream)) {
-      this.errors.push(atRule.copyPosTo(new tokenize_css.ErrorToken(
-          ValidationError.Code.CSS_SYNTAX_MALFORMED_MEDIA_QUERY, ['style'])));
-    }
-  }
-
-  /**
-   * Maybe consume one whitespace token.
-   * @param {!TokenStream} tokenStream
-   * @private
-   */
-  maybeConsumeAWhitespaceToken_(tokenStream) {
-    // While the grammar calls for consuming multiple whitespace tokens,
-    // our tokenizer already collapses whitespace so only one token can ever
-    // be present.
-    if (tokenStream.current().tokenType === tokenize_css.TokenType.WHITESPACE) {
-      tokenStream.consume();
-    }
-  }
-
-  /**
-   * Parse a media query list
-   * @param {!TokenStream} tokenStream
-   * @return {boolean}
-   * @private
-   */
-  parseAMediaQueryList_(tokenStream) {
-    // https://www.w3.org/TR/css3-mediaqueries/#syntax
-    // : S* [media_query [ ',' S* media_query ]* ]?
-    // ;
-    this.maybeConsumeAWhitespaceToken_(tokenStream);
-    if (tokenStream.current().tokenType !== tokenize_css.TokenType.EOF_TOKEN) {
-      if (!this.parseAMediaQuery_(tokenStream)) {
-        return false;
-      }
-      while (tokenStream.current().tokenType === tokenize_css.TokenType.COMMA) {
-        tokenStream.consume();  // ','
-        this.maybeConsumeAWhitespaceToken_(tokenStream);
-        if (!this.parseAMediaQuery_(tokenStream)) {
-          return false;
-        }
-      }
-    }
-    return tokenStream.current().tokenType === tokenize_css.TokenType.EOF_TOKEN;
-  }
-
-  /**
-   * Parse a media query
-   * @param {!TokenStream} tokenStream
-   * @return {boolean}
-   * @private
-   */
-  parseAMediaQuery_(tokenStream) {
-    // : [ONLY | NOT]? S* media_type S* [ AND S* expression ]*
-    // | expression [ AND S* expression ]*
-    // ;
-    //
-    // Below we parse media queries with this equivalent grammar:
-    // : (expression | [ONLY | NOT]? S* media_type S* )
-    // [ AND S* expression ]*
-    // ;
-    //
-    // This is more convenient because we know that expressions must start with
-    // '(', so it's simpler to use as a check to distinguis the expression case
-    // from the media type case.
-    if (tokenStream.current().tokenType === tokenize_css.TokenType.OPEN_PAREN) {
-      if (!this.parseAMediaExpression_(tokenStream)) {
-        return false;
-      }
-    } else {
-      if (tokenStream.current().tokenType === tokenize_css.TokenType.IDENT &&
-          (
-              /** @type {!tokenize_css.IdentToken} */
-              (tokenStream.current()).ASCIIMatch('only') ||
-              /** @type {!tokenize_css.IdentToken} */
-              (tokenStream.current()).ASCIIMatch('not'))) {
-        tokenStream.consume();  // 'ONLY' | 'NOT'
-      }
-      this.maybeConsumeAWhitespaceToken_(tokenStream);
-      if (!this.parseAMediaType_(tokenStream)) {
-        return false;
-      }
-      this.maybeConsumeAWhitespaceToken_(tokenStream);
-    }
-    while (tokenStream.current().tokenType === tokenize_css.TokenType.IDENT &&
-           /** @type {!tokenize_css.IdentToken} */
-           (tokenStream.current()).ASCIIMatch('and')) {
-      tokenStream.consume();  // 'AND'
-      this.maybeConsumeAWhitespaceToken_(tokenStream);
-      if (!this.parseAMediaExpression_(tokenStream)) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  /**
-   * Parse a media type
-   * @param {!TokenStream} tokenStream
-   * @return {boolean}
-   * @private
-   */
-  parseAMediaType_(tokenStream) {
-    // : IDENT
-    // ;
-    if (tokenStream.current().tokenType === tokenize_css.TokenType.IDENT) {
-      this.mediaTypes.push(
-          /** @type {!tokenize_css.IdentToken} */ (tokenStream.current()));
-      tokenStream.consume();
-      return true;
-    }
-    return false;
-  }
-
-  /**
-   * token_stream->Current() must be a FUNCTION_TOKEN. Consumes all Tokens up
-   * to and including the matching closing paren for that FUNCTION_TOKEN.
-   * If false, recursion exceeded maximum depth.
-   * @param {!TokenStream} tokenStream
-   * @param {number} depth
-   * @returns {boolean}
-   */
-  consumeAFunction_(tokenStream, depth) {
-    if (depth > kMaximumCssRecursion) return false;
-    if (tokenStream.current().tokenType !=
-        tokenize_css.TokenType.FUNCTION_TOKEN)
-      return false;
-    tokenStream.consume();  // FUNCTION_TOKEN
-    while (tokenStream.current().tokenType !=
-           tokenize_css.TokenType.EOF_TOKEN) {
-      const type = tokenStream.current().tokenType;
-      if (type == tokenize_css.TokenType.FUNCTION_TOKEN) {
-        if (!this.consumeAFunction_(tokenStream, depth + 1)) return false;
-      } else if (type == tokenize_css.TokenType.CLOSE_PAREN) {
-        tokenStream.consume();
-        return true;
-      } else {
-        tokenStream.consume();
-      }
-    }
-    return false;  // EOF before function CLOSE_PAREN
-  }
-
-  /**
-   * Parse a media expression
-   * @param {!TokenStream} tokenStream
-   * @return {boolean}
-   * @private
-   */
-  parseAMediaExpression_(tokenStream) {
-    //  : '(' S* media_feature S* [ ':' S* expr ]? ')' S*
-    //  ;
-    if (tokenStream.current().tokenType !== tokenize_css.TokenType.OPEN_PAREN) {
-      return false;
-    }
-    tokenStream.consume();  // '('
-    this.maybeConsumeAWhitespaceToken_(tokenStream);
-    if (!this.parseAMediaFeature_(tokenStream)) {
-      return false;
-    }
-    this.maybeConsumeAWhitespaceToken_(tokenStream);
-    if (tokenStream.current().tokenType === tokenize_css.TokenType.COLON) {
-      tokenStream.consume();  // '('
-      this.maybeConsumeAWhitespaceToken_(tokenStream);
-      // The CSS3 grammar at this point just tells us to expect some
-      // expr. Which tokens are accepted here are defined by the media
-      // feature found above. We don't implement media features here, so
-      // we just loop over tokens until we find a CLOSE_PAREN or EOF while
-      // handling nested functions like calc().
-      while (tokenStream.current().tokenType !=
-             tokenize_css.TokenType.EOF_TOKEN) {
-        const type = tokenStream.current().tokenType;
-        if (type == tokenize_css.TokenType.CLOSE_PAREN) {
-          break;
-        } else if (type == tokenize_css.TokenType.FUNCTION_TOKEN) {
-          if (!this.consumeAFunction_(tokenStream, 0)) return false;
-        } else {
-          tokenStream.consume();
-        }
-      }
-    }
-    if (tokenStream.current().tokenType !==
-        tokenize_css.TokenType.CLOSE_PAREN) {
-      return false;
-    }
-    tokenStream.consume();  // ')'
-    this.maybeConsumeAWhitespaceToken_(tokenStream);
-    return true;
-  }
-
-  /**
-   * Parse a media feature
-   * @param {!TokenStream} tokenStream
-   * @return {boolean}
-   * @private
-   */
-  parseAMediaFeature_(tokenStream) {
-    // : IDENT
-    // ;
-    if (tokenStream.current().tokenType === tokenize_css.TokenType.IDENT) {
-      this.mediaFeatures.push(
-          /** @type {!tokenize_css.IdentToken} */ (tokenStream.current()));
-      tokenStream.consume();
-      return true;
-    }
-    return false;
-  }
-}
-
-/**
- * Parses media queries within the provided stylesheet, emitting the set of
- * discovered media types and media features, as well as errors if parsing
- * failed.
- * parsedUrls and errors into errors.
- * @param {!Stylesheet} stylesheet
- * @param {!Array<!tokenize_css.IdentToken>} mediaTypes
- * @param {!Array<!tokenize_css.IdentToken>} mediaFeatures
- * @param {!Array<!tokenize_css.ErrorToken>} errors
- */
-const parseMediaQueries = function(
-    stylesheet, mediaTypes, mediaFeatures, errors) {
-  const visitor = new MediaQueryVisitor(mediaTypes, mediaFeatures, errors);
-  stylesheet.accept(visitor);
-};
-exports.parseMediaQueries = parseMediaQueries;
-
-/**
- * Abstract super class for CSS Selectors. The Token class, which this
- * class inherits from, has line, col, and tokenType fields.
- */
-const Selector = class extends tokenize_css.Token {
-  /** @param {function(!Selector)} lambda */
-  forEachChild(lambda) {}
-
-  /** @param {!SelectorVisitor} visitor */
-  accept(visitor) {}
-};
-exports.Selector = Selector;
-
-/**
- * A super class for making visitors (by overriding the types of interest). The
- * standard RuleVisitor does not recursively parse the prelude of qualified
- * rules for the components of a selector. This visitor re-parses these preludes
- * and then visits the fields within. The parse step has the possibility of
- * emitting new CSS ErrorTokens
- */
-const SelectorVisitor = class extends RuleVisitor {
-  /**
-   * @param {!Array<!tokenize_css.ErrorToken>} errors
-   */
-  constructor(errors) {
-    super();
-    /**
-     * @type {!Array<!tokenize_css.ErrorToken>}
-     * @private
-     */
-    this.errors_ = errors;
-  }
-
-  /** @param {!QualifiedRule} qualifiedRule */
-  visitQualifiedRule(qualifiedRule) {
-    const tokenStream = new TokenStream(qualifiedRule.prelude);
-    tokenStream.consume();
-    const maybeSelector = parseASelectorsGroup(tokenStream);
-    if (maybeSelector instanceof tokenize_css.ErrorToken) {
-      this.errors_.push(maybeSelector);
-      return;
-    }
-
-    /** @type {!Array<!Selector>} */
-    const toVisit = [maybeSelector];
-    while (toVisit.length > 0) {
-      /** @type {!Selector} */
-      const node = toVisit.shift();
-      node.accept(this);
-      node.forEachChild(child => {
-        toVisit.push(child);
-      });
-    }
-  }
-
-  /** @param {!TypeSelector} typeSelector */
-  visitTypeSelector(typeSelector) {}
-
-  /** @param {!IdSelector} idSelector */
-  visitIdSelector(idSelector) {}
-
-  /** @param {!AttrSelector} attrSelector */
-  visitAttrSelector(attrSelector) {}
-
-  /** @param {!PseudoSelector} pseudoSelector */
-  visitPseudoSelector(pseudoSelector) {}
-
-  /** @param {!ClassSelector} classSelector */
-  visitClassSelector(classSelector) {}
-
-  /** @param {!SimpleSelectorSequence} sequence */
-  visitSimpleSelectorSequence(sequence) {}
-
-  /** @param {!Combinator} combinator */
-  visitCombinator(combinator) {}
-
-  /** @param {!SelectorsGroup} group */
-  visitSelectorsGroup(group) {}
-};
-exports.SelectorVisitor = SelectorVisitor;
-
-/**
- * This node models type selectors and universial selectors.
- * http://www.w3.org/TR/css3-selectors/#type-selectors
- * http://www.w3.org/TR/css3-selectors/#universal-selector
- */
-const TypeSelector = class extends Selector {
-  /**
-   * Choices for namespacePrefix:
-   * - 'a specific namespace prefix' means 'just that specific namespace'.
-   * - '' means 'without a namespace'
-   * - '*' means 'any namespace including without a namespace'
-   * - null means the default namespace if one is declared, and '*' otherwise.
-   *
-   * The universal selector is covered by setting the elementName to '*'.
-   *
-   * @param {?string} namespacePrefix
-   * @param {string} elementName
-   */
-  constructor(namespacePrefix, elementName) {
-    super();
-    /** @type {?string} */
-    this.namespacePrefix = namespacePrefix;
-    /** @type {string} */
-    this.elementName = elementName;
-    /** @type {!tokenize_css.TokenType} */
-    this.tokenType = tokenize_css.TokenType.TYPE_SELECTOR;
-  }
-
-  /**
-   * Serializes the selector to a string (in this case CSS syntax that
-   * could be used to recreate it).
-   * @return {string}
-   */
-  toString() {
-    if (this.namespacePrefix === null) {
-      return this.elementName;
-    }
-    return this.namespacePrefix + '|' + this.elementName;
-  }
-
-  /** @inheritDoc */
-  accept(visitor) {
-    visitor.visitTypeSelector(this);
-  }
-};
-
-/** @inheritDoc */
-TypeSelector.prototype.toJSON = function() {
-  const json = Selector.prototype.toJSON.call(this);
-  json['namespacePrefix'] = this.namespacePrefix;
-  json['elementName'] = this.elementName;
-  return json;
-};
-
-/**
- * Helper function for determining whether the provided token is a specific
- * delimiter.
- * @param {!tokenize_css.Token} token
- * @param {string} delimChar
- * @return {boolean}
- */
-function isDelim(token, delimChar) {
-  return token.tokenType === tokenize_css.TokenType.DELIM &&
-      /** @type {!tokenize_css.DelimToken} */ (token).value === delimChar;
-}
-
-/**
- * tokenStream.current() is the first token of the type selector.
- * @param {!TokenStream} tokenStream
- * @return {!TypeSelector}
- */
-const parseATypeSelector = function(tokenStream) {
-  /** @type {?string} */
-  let namespacePrefix = null;
-  /** @type {string} */
-  let elementName = '*';
-  const start = tokenStream.current();
-
-  if (isDelim(tokenStream.current(), '|')) {
-    namespacePrefix = '';
-    tokenStream.consume();
-  } else if (
-      isDelim(tokenStream.current(), '*') && isDelim(tokenStream.next(), '|')) {
-    namespacePrefix = '*';
-    tokenStream.consume();
-    tokenStream.consume();
-  } else if (
-      tokenStream.current().tokenType === tokenize_css.TokenType.IDENT &&
-      isDelim(tokenStream.next(), '|')) {
-    const ident =
-        /** @type {!tokenize_css.IdentToken} */ (tokenStream.current());
-    namespacePrefix = ident.value;
-    tokenStream.consume();
-    tokenStream.consume();
-  }
-  if (isDelim(tokenStream.current(), '*')) {
-    elementName = '*';
-    tokenStream.consume();
-  } else if (tokenStream.current().tokenType === tokenize_css.TokenType.IDENT) {
-    const ident =
-        /** @type {!tokenize_css.IdentToken} */ (tokenStream.current());
-    elementName = ident.value;
-    tokenStream.consume();
-  }
-  return start.copyPosTo(new TypeSelector(namespacePrefix, elementName));
-};
-exports.parseATypeSelector = parseATypeSelector;
-
-/**
- * An ID selector references some document id.
- * http://www.w3.org/TR/css3-selectors/#id-selectors
- * Typically written as '#foo'.
- */
-const IdSelector = class extends Selector {
-  /**
-   * @param {string} value
-   */
-  constructor(value) {
-    super();
-    /** @type {string} */
-    this.value = value;
-    /** @type {!tokenize_css.TokenType} */
-    this.tokenType = tokenize_css.TokenType.ID_SELECTOR;
-  }
-
-  /** @return {string} */
-  toString() {
-    return '#' + this.value;
-  }
-
-  /** @inheritDoc */
-  accept(visitor) {
-    visitor.visitIdSelector(this);
-  }
-};
-/** @inheritDoc */
-IdSelector.prototype.toJSON = function() {
-  const json = Selector.prototype.toJSON.call(this);
-  json['value'] = this.value;
-  return json;
-};
-
-/**
- * tokenStream.current() must be the hash token.
- * @param {!TokenStream} tokenStream
- * @return {!IdSelector}
- */
-const parseAnIdSelector = function(tokenStream) {
-  asserts.assert(
-      tokenStream.current().tokenType === tokenize_css.TokenType.HASH,
-      'Precondition violated: must start with HashToken');
-  const hash = /** @type {!tokenize_css.HashToken} */ (tokenStream.current());
-  tokenStream.consume();
-  return hash.copyPosTo(new IdSelector(hash.value));
-};
-exports.parseAnIdSelector = parseAnIdSelector;
-
-/**
- * An attribute selector matches document nodes based on their attributes.
- * http://www.w3.org/TR/css3-selectors/#attribute-selectors
- *
- * Typically written as '[foo=bar]'.
- */
-const AttrSelector = class extends Selector {
-  /**
-   * @param {?string} namespacePrefix
-   * @param {string} attrName
-   * @param {string} matchOperator is either the string
-   * representation of the match operator (e.g., '=' or '~=') or '',
-   * in which case the attribute selector is a check for the presence
-   * of the attribute.
-   * @param {string} value is the value to apply the match operator
-   * against, or if matchOperator is '', then this must be empty as
-   * well.
-   */
-  constructor(namespacePrefix, attrName, matchOperator, value) {
-    super();
-    /** @type {?string} */
-    this.namespacePrefix = namespacePrefix;
-    /** @type {string} */
-    this.attrName = attrName;
-    /** @type {string} */
-    this.matchOperator = matchOperator;
-    /** @type {string} */
-    this.value = value;
-    /** @type {!tokenize_css.TokenType} */
-    this.tokenType = tokenize_css.TokenType.ATTR_SELECTOR;
-  }
-
-  /** @inheritDoc */
-  accept(visitor) {
-    visitor.visitAttrSelector(this);
-  }
-};
-exports.AttrSelector = AttrSelector;
-
-/** @inheritDoc */
-AttrSelector.prototype.toJSON = function() {
-  const json = Selector.prototype.toJSON.call(this);
-  json['namespacePrefix'] = this.namespacePrefix;
-  json['attrName'] = this.attrName;
-  json['matchOperator'] = this.matchOperator;
-  json['value'] = this.value;
-  return json;
-};
-
-/**
- * Helper for parseAnAttrSelector.
- * @private
- * @param {!tokenize_css.Token} start
- * @return {!tokenize_css.ErrorToken}
- */
-function newInvalidAttrSelectorError(start) {
-  return start.copyPosTo(new tokenize_css.ErrorToken(
-      ValidationError.Code.CSS_SYNTAX_INVALID_ATTR_SELECTOR, ['style']));
-}
-
-/**
- * tokenStream.current() must be the open square token.
- * @param {!TokenStream} tokenStream
- * @return {!AttrSelector|!tokenize_css.ErrorToken}
- */
-function parseAnAttrSelector(tokenStream) {
-  asserts.assert(
-      tokenStream.current().tokenType === tokenize_css.TokenType.OPEN_SQUARE,
-      'Precondition violated: must be an OpenSquareToken');
-  const start = tokenStream.current();
-  tokenStream.consume();  // Consumes '['.
-  if (tokenStream.current().tokenType === tokenize_css.TokenType.WHITESPACE) {
-    tokenStream.consume();
-  }
-  // This part is defined in https://www.w3.org/TR/css3-selectors/#attrnmsp:
-  // Attribute selectors and namespaces. It is similar to parseATypeSelector.
-  let namespacePrefix = null;
-  if (isDelim(tokenStream.current(), '|')) {
-    namespacePrefix = '';
-    tokenStream.consume();
-  } else if (
-      isDelim(tokenStream.current(), '*') && isDelim(tokenStream.next(), '|')) {
-    namespacePrefix = '*';
-    tokenStream.consume();
-    tokenStream.consume();
-  } else if (
-      tokenStream.current().tokenType === tokenize_css.TokenType.IDENT &&
-      isDelim(tokenStream.next(), '|')) {
-    const ident =
-        /** @type {!tokenize_css.IdentToken} */ (tokenStream.current());
-    namespacePrefix = ident.value;
-    tokenStream.consume();
-    tokenStream.consume();
-  }
-  // Now parse the attribute name. This part is mandatory.
-  if (!(tokenStream.current().tokenType === tokenize_css.TokenType.IDENT)) {
-    return newInvalidAttrSelectorError(start);
-  }
-  const ident =
-      /** @type {!tokenize_css.IdentToken} */ (tokenStream.current());
-  const attrName = ident.value;
-  tokenStream.consume();
-  if (tokenStream.current().tokenType === tokenize_css.TokenType.WHITESPACE) {
-    tokenStream.consume();
-  }
-
-  // After the attribute name, we may see an operator; if we do, then
-  // we must see either a string or an identifier. This covers
-  // 6.3.1 Attribute presence and value selectors
-  // (https://www.w3.org/TR/css3-selectors/#attribute-representation) and
-  // 6.3.2 Substring matching attribute selectors
-  // (https://www.w3.org/TR/css3-selectors/#attribute-substrings).
-
-  /** @type {string} */
-  let matchOperator = '';
-  const current = tokenStream.current().tokenType;
-  if (isDelim(tokenStream.current(), '=')) {
-    matchOperator = '=';
-    tokenStream.consume();
-  } else if (current === tokenize_css.TokenType.INCLUDE_MATCH) {
-    matchOperator = '~=';
-    tokenStream.consume();
-  } else if (current === tokenize_css.TokenType.DASH_MATCH) {
-    matchOperator = '|=';
-    tokenStream.consume();
-  } else if (current === tokenize_css.TokenType.PREFIX_MATCH) {
-    matchOperator = '^=';
-    tokenStream.consume();
-  } else if (current === tokenize_css.TokenType.SUFFIX_MATCH) {
-    matchOperator = '$=';
-    tokenStream.consume();
-  } else if (current === tokenize_css.TokenType.SUBSTRING_MATCH) {
-    matchOperator = '*=';
-    tokenStream.consume();
-  }
-  if (tokenStream.current().tokenType === tokenize_css.TokenType.WHITESPACE) {
-    tokenStream.consume();
-  }
-  /** @type {string} */
-  let value = '';
-  if (matchOperator !== '') {  // If we saw an operator, parse the value.
-    const current = tokenStream.current().tokenType;
-    if (current === tokenize_css.TokenType.IDENT) {
-      const ident =
-          /** @type {!tokenize_css.IdentToken} */ (tokenStream.current());
-      value = ident.value;
-      tokenStream.consume();
-    } else if (current === tokenize_css.TokenType.STRING) {
-      const str =
-          /** @type {!tokenize_css.StringToken} */ (tokenStream.current());
-      value = str.value;
-      tokenStream.consume();
-    }
-  }
-  if (tokenStream.current().tokenType === tokenize_css.TokenType.WHITESPACE) {
-    tokenStream.consume();
-  }
-  // The attribute selector must in any case terminate with a close square
-  // token.
-  if (tokenStream.current().tokenType !== tokenize_css.TokenType.CLOSE_SQUARE) {
-    return newInvalidAttrSelectorError(start);
-  }
-  tokenStream.consume();
-  const selector =
-      new AttrSelector(namespacePrefix, attrName, matchOperator, value);
-  return start.copyPosTo(selector);
-}
-
-/**
- * @param {!Array<!Object>} array
- * @return {!Array<string>}
- */
-function recursiveArrayToJSON(array) {
-  const json = [];
-  for (const entry of array) {
-    json.push(entry.toJSON());
-  }
-  return json;
-}
-
-/**
- * A pseudo selector can match either pseudo classes or pseudo elements.
- * http://www.w3.org/TR/css3-selectors/#pseudo-classes
- * http://www.w3.org/TR/css3-selectors/#pseudo-elements.
- *
- * Typically written as ':visited', ':lang(fr)', and '::first-line'.
- *
- * isClass: Pseudo selectors with a single colon (e.g., ':visited')
- * are pseudo class selectors. Selectors with two colons (e.g.,
- * '::first-line') are pseudo elements.
- *
- * func: If it's a function style pseudo selector, like lang(fr), then func
- * the function tokens. TODO(powdercloud): parse this in more detail.
- */
-const PseudoSelector = class extends Selector {
-  /**
-   * @param {boolean} isClass
-   * @param {string} name
-   * @param {!Array<!tokenize_css.Token>} func
-   */
-  constructor(isClass, name, func) {
-    super();
-    /** @type {boolean} */
-    this.isClass = isClass;
-    /** @type {string} */
-    this.name = name;
-    /** @type {!Array<!tokenize_css.Token>} */
-    this.func = func;
-    /** @type {!tokenize_css.TokenType} */
-    this.tokenType = tokenize_css.TokenType.PSEUDO_SELECTOR;
-  }
-
-  /** @inheritDoc */
-  accept(visitor) {
-    visitor.visitPseudoSelector(this);
-  }
-};
-exports.PseudoSelector = PseudoSelector;
-
-/** @inheritDoc */
-PseudoSelector.prototype.toJSON = function() {
-  const json = Selector.prototype.toJSON.call(this);
-  json['isClass'] = this.isClass;
-  json['name'] = this.name;
-  if (this.func.length !== 0) {
-    json['func'] = recursiveArrayToJSON(this.func);
-  }
-  return json;
-};
-
-/**
- * tokenStream.current() must be the ColonToken. Returns an error if
- * the pseudo token can't be parsed (e.g., a lone ':').
- * @param {!TokenStream} tokenStream
- * @return {!PseudoSelector|!tokenize_css.ErrorToken}
- */
-function parseAPseudoSelector(tokenStream) {
-  asserts.assert(
-      tokenStream.current().tokenType === tokenize_css.TokenType.COLON,
-      'Precondition violated: must be a ":"');
-  const firstColon = tokenStream.current();
-  tokenStream.consume();
-  let isClass = true;
-  if (tokenStream.current().tokenType === tokenize_css.TokenType.COLON) {
-    // '::' starts a pseudo element, ':' starts a pseudo class.
-    isClass = false;
-    tokenStream.consume();
-  }
-  if (tokenStream.current().tokenType === tokenize_css.TokenType.IDENT) {
-    const ident =
-        /** @type {!tokenize_css.IdentToken} */ (tokenStream.current());
-    const name = ident.value;
-    tokenStream.consume();
-    return firstColon.copyPosTo(new PseudoSelector(isClass, name, []));
-  } else if (
-      tokenStream.current().tokenType ===
-      tokenize_css.TokenType.FUNCTION_TOKEN) {
-    const funcToken =
-        /** @type {!tokenize_css.FunctionToken} */ (tokenStream.current());
-    /**  @type {!Array<!tokenize_css.ErrorToken>} */
-    const errors = [];
-    const func = extractAFunction(tokenStream, errors);
-    if (errors.length > 0) {
-      return errors[0];
-    }
-    tokenStream.consume();
-    return firstColon.copyPosTo(
-        new PseudoSelector(isClass, funcToken.value, func));
-  } else {
-    return firstColon.copyPosTo(new tokenize_css.ErrorToken(
-        ValidationError.Code.CSS_SYNTAX_ERROR_IN_PSEUDO_SELECTOR, ['style']));
-  }
-}
-
-/**
- * A class selector of the form '.value' is a shorthand notation for
- * an attribute match of the form '[class~=value]'.
- * http://www.w3.org/TR/css3-selectors/#class-html
- */
-const ClassSelector = class extends Selector {
-  /**
-   * @param {string} value the class to match.
-   */
-  constructor(value) {
-    super();
-    /** @type {string} */
-    this.value = value;
-    /** @type {!tokenize_css.TokenType} */
-    this.tokenType = tokenize_css.TokenType.CLASS_SELECTOR;
-  }
-  /** @return {string} */
-  toString() {
-    return '.' + this.value;
-  }
-
-  /** @inheritDoc */
-  accept(visitor) {
-    visitor.visitClassSelector(this);
-  }
-};
-/** @inheritDoc */
-ClassSelector.prototype.toJSON = function() {
-  const json = Selector.prototype.toJSON.call(this);
-  json['value'] = this.value;
-  return json;
-};
-
-/**
- * tokenStream.current() must be the '.' delimiter token.
- * @param {!TokenStream} tokenStream
- * @return {!ClassSelector}
- */
-const parseAClassSelector = function(tokenStream) {
-  asserts.assert(
-      isDelim(tokenStream.current(), '.') &&
-          tokenStream.next().tokenType === tokenize_css.TokenType.IDENT,
-      'Precondition violated: must start with "." and follow with ident');
-  const dot = tokenStream.current();
-  tokenStream.consume();
-  const ident =
-      /** @type {!tokenize_css.IdentToken} */ (tokenStream.current());
-  tokenStream.consume();
-  return dot.copyPosTo(new ClassSelector(ident.value));
-};
-exports.parseAClassSelector = parseAClassSelector;
-
-
-/**
- * Models a simple selector sequence, e.g. '*|foo#id'.
- */
-const SimpleSelectorSequence = class extends Selector {
-  /**
-   * @param {!TypeSelector} typeSelector
-   * @param {!Array<!Selector>} otherSelectors
-   */
-  constructor(typeSelector, otherSelectors) {
-    super();
-    /** @type {!TypeSelector} */
-    this.typeSelector = typeSelector;
-    /** @type {!Array<!Selector>} */
-    this.otherSelectors = otherSelectors;
-    /** @type {!tokenize_css.TokenType} */
-    this.tokenType = tokenize_css.TokenType.SIMPLE_SELECTOR_SEQUENCE;
-  }
-
-  /** @inheritDoc */
-  forEachChild(lambda) {
-    lambda(this.typeSelector);
-    for (const other of this.otherSelectors) {
-      lambda(other);
-    }
-  }
-
-  /** @inheritDoc */
-  accept(visitor) {
-    visitor.visitSimpleSelectorSequence(this);
-  }
-};
-/** @inheritDoc */
-SimpleSelectorSequence.prototype.toJSON = function() {
-  const json = Selector.prototype.toJSON.call(this);
-  json['typeSelector'] = this.typeSelector.toJSON();
-  json['otherSelectors'] = recursiveArrayToJSON(this.otherSelectors);
-  return json;
-};
-
-/**
- * tokenStream.current must be the first token of the sequence.
- * This function will return an error if no selector is found.
- * @param {!TokenStream} tokenStream
- * @return {!SimpleSelectorSequence|!tokenize_css.ErrorToken}
- */
-const parseASimpleSelectorSequence = function(tokenStream) {
-  const start = tokenStream.current();
-  let typeSelector = null;
-  if (isDelim(tokenStream.current(), '*') ||
-      isDelim(tokenStream.current(), '|') ||
-      tokenStream.current().tokenType === tokenize_css.TokenType.IDENT) {
-    typeSelector = parseATypeSelector(tokenStream);
-  }
-  /** @type {!Array<!Selector>} */
-  const otherSelectors = [];
-  while (true) {
-    if (tokenStream.current().tokenType === tokenize_css.TokenType.HASH) {
-      otherSelectors.push(parseAnIdSelector(tokenStream));
-    } else if (
-        isDelim(tokenStream.current(), '.') &&
-        tokenStream.next().tokenType === tokenize_css.TokenType.IDENT) {
-      otherSelectors.push(parseAClassSelector(tokenStream));
-    } else if (
-        tokenStream.current().tokenType ===
-        tokenize_css.TokenType.OPEN_SQUARE) {
-      const maybeAttrSelector = parseAnAttrSelector(tokenStream);
-      if (maybeAttrSelector.tokenType === tokenize_css.TokenType.ERROR) {
-        return /** @type {!tokenize_css.ErrorToken} */ (maybeAttrSelector);
-      }
-      otherSelectors.push(
-          /** @type {!Selector} */ (maybeAttrSelector));
-    } else if (
-        tokenStream.current().tokenType === tokenize_css.TokenType.COLON) {
-      const maybePseudo = parseAPseudoSelector(tokenStream);
-      if (maybePseudo.tokenType === tokenize_css.TokenType.ERROR) {
-        return /** @type {!tokenize_css.ErrorToken} */ (maybePseudo);
-      }
-      otherSelectors.push(/** @type {!Selector} */ (maybePseudo));
-      // NOTE: If adding more 'else if' clauses here, be sure to udpate
-      // isSimpleSelectorSequenceStart accordingly.
-    } else {
-      if (typeSelector === null) {
-        if (otherSelectors.length == 0) {
-          return tokenStream.current().copyPosTo(new tokenize_css.ErrorToken(
-              ValidationError.Code.CSS_SYNTAX_MISSING_SELECTOR, ['style']));
-        }
-        // If no type selector is given then the universal selector is
-        // implied.
-        typeSelector = start.copyPosTo(new TypeSelector(
-            /*namespacePrefix=*/ null, /*elementName=*/ '*'));
-      }
-      return start.copyPosTo(
-          new SimpleSelectorSequence(typeSelector, otherSelectors));
-    }
-  }
-};
-exports.parseASimpleSelectorSequence = parseASimpleSelectorSequence;
-
-/**
- * @enum {string}
- */
-const CombinatorType = {
-  'DESCENDANT': 'DESCENDANT',
-  'CHILD': 'CHILD',
-  'ADJACENT_SIBLING': 'ADJACENT_SIBLING',
-  'GENERAL_SIBLING': 'GENERAL_SIBLING',
-};
-exports.CombinatorType = CombinatorType;
-
-/**
- * Models a combinator, as described in
- * http://www.w3.org/TR/css3-selectors/#combinators.
- */
-const Combinator = class extends Selector {
-  /**
-   * @param {!CombinatorType} combinatorType
-   * @param {!SimpleSelectorSequence|!Combinator} left
-   * @param {!SimpleSelectorSequence} right
-   */
-  constructor(combinatorType, left, right) {
-    super();
-    /** @type {!CombinatorType} */
-    this.combinatorType = combinatorType;
-    /** @type {!SimpleSelectorSequence|!Combinator} */
-    this.left = left;
-    /** @type {!SimpleSelectorSequence} */
-    this.right = right;
-    /** @type {!tokenize_css.TokenType} */
-    this.tokenType = tokenize_css.TokenType.COMBINATOR;
-  }
-
-  /** @inheritDoc */
-  forEachChild(lambda) {
-    lambda(this.left);
-    lambda(this.right);
-  }
-
-  /** @inheritDoc */
-  accept(visitor) {
-    visitor.visitCombinator(this);
-  }
-};
-exports.Combinator = Combinator;
-
-/** @inheritDoc */
-Combinator.prototype.toJSON = function() {
-  const json = Selector.prototype.toJSON.call(this);
-  json['combinatorType'] = this.combinatorType;
-  json['left'] = this.left.toJSON();
-  json['right'] = this.right.toJSON();
-  return json;
-};
-
-/**
- * The CombinatorType for a given token; helper function used when
- * constructing a Combinator instance.
- * @param {!tokenize_css.Token} token
- * @return {!CombinatorType}
- */
-function combinatorTypeForToken(token) {
-  if (token.tokenType === tokenize_css.TokenType.WHITESPACE) {
-    return CombinatorType.DESCENDANT;
-  } else if (isDelim(token, '>')) {
-    return CombinatorType.CHILD;
-  } else if (isDelim(token, '+')) {
-    return CombinatorType.ADJACENT_SIBLING;
-  } else if (isDelim(token, '~')) {
-    return CombinatorType.GENERAL_SIBLING;
-  }
-  asserts.fail('Internal Error: not a combinator token');
-}
-
-/**
- * Whether or not the provided token could be the start of a simple
- * selector sequence. See the simple_selector_sequence production in
- * http://www.w3.org/TR/css3-selectors/#grammar.
- * @param {!tokenize_css.Token} token
- * @return {boolean}
- */
-function isSimpleSelectorSequenceStart(token) {
-  // Type selector start.
-  if (isDelim(token, '*') || isDelim(token, '|') ||
-      (token.tokenType === tokenize_css.TokenType.IDENT)) {
-    return true;
-  }
-  // Id selector start.
-  if (token.tokenType === tokenize_css.TokenType.HASH) {
-    return true;
-  }
-  // Class selector start.
-  if (isDelim(token, '.')) {
-    return true;
-  }
-  // Attr selector start.
-  if (token.tokenType === tokenize_css.TokenType.OPEN_SQUARE) {
-    return true;
-  }
-  // A pseudo selector.
-  if (token.tokenType === tokenize_css.TokenType.COLON) {
-    return true;
-  }
-  // TODO(johannes): add the others.
-  return false;
-}
-
-/**
- * The selector production from
- * http://www.w3.org/TR/css3-selectors/#grammar
- * Returns an ErrorToken if no selector is found.
- * @param {!TokenStream} tokenStream
- * @return {!SimpleSelectorSequence|
- *          !Combinator|!tokenize_css.ErrorToken}
- */
-const parseASelector = function(tokenStream) {
-  if (!isSimpleSelectorSequenceStart(tokenStream.current())) {
-    return tokenStream.current().copyPosTo(new tokenize_css.ErrorToken(
-        ValidationError.Code.CSS_SYNTAX_NOT_A_SELECTOR_START, ['style']));
-  }
-  const parsed = parseASimpleSelectorSequence(tokenStream);
-  if (parsed.tokenType === tokenize_css.TokenType.ERROR) {
-    return parsed;
-  }
-  let left = /** @type {!SimpleSelectorSequence}*/ (parsed);
-  while (true) {
-    // Consume whitespace in front of combinators, while being careful
-    // to not eat away the infamous "whitespace operator" (sigh, haha).
-    if ((tokenStream.current().tokenType ===
-         tokenize_css.TokenType.WHITESPACE) &&
-        !isSimpleSelectorSequenceStart(tokenStream.next())) {
-      tokenStream.consume();
-    }
-    // If present, grab the combinator token which we'll use for line
-    // / column info.
-    if (!(((tokenStream.current().tokenType ===
-            tokenize_css.TokenType.WHITESPACE) &&
-           isSimpleSelectorSequenceStart(tokenStream.next())) ||
-          isDelim(tokenStream.current(), '+') ||
-          isDelim(tokenStream.current(), '>') ||
-          isDelim(tokenStream.current(), '~'))) {
-      return left;
-    }
-    const combinatorToken = tokenStream.current();
-    tokenStream.consume();
-    if (tokenStream.current().tokenType === tokenize_css.TokenType.WHITESPACE) {
-      tokenStream.consume();
-    }
-    const right = parseASimpleSelectorSequence(tokenStream);
-    if (right.tokenType === tokenize_css.TokenType.ERROR) {
-      return right;  // TODO(johannes): more than one error / partial tree.
-    }
-    left = combinatorToken.copyPosTo(new Combinator(
-        combinatorTypeForToken(combinatorToken), left,
-        /** @type {!SimpleSelectorSequence} */ (right)));
-  }
-};
-exports.parseASelector = parseASelector;
-
-/**
- * Models a selectors group, as described in
- * http://www.w3.org/TR/css3-selectors/#grouping.
- */
-const SelectorsGroup = class extends Selector {
-  /**
-   * @param {!Array<!SimpleSelectorSequence|
-   *         !Combinator>} elements
-   */
-  constructor(elements) {
-    super();
-    /**
-       @type {!Array<!SimpleSelectorSequence|
-        !Combinator>}
-     */
-    this.elements = elements;
-    /** @type {!tokenize_css.TokenType} */
-    this.tokenType = tokenize_css.TokenType.SELECTORS_GROUP;
-  }
-
-  /** @inheritDoc */
-  forEachChild(lambda) {
-    for (const child of this.elements) {
-      lambda(child);
-    }
-  }
-
-  /** @param {!SelectorVisitor} visitor */
-  accept(visitor) {
-    visitor.visitSelectorsGroup(this);
-  }
-};
-/** @inheritDoc */
-SelectorsGroup.prototype.toJSON = function() {
-  const json = Selector.prototype.toJSON.call(this);
-  json['elements'] = recursiveArrayToJSON(this.elements);
-  return json;
-};
-
-/**
- * The selectors_group production from
- * http://www.w3.org/TR/css3-selectors/#grammar.
- * In addition, this parsing routine checks that no input remains,
- * that is, after parsing the production we reached the end of |token_stream|.
- * @param {!TokenStream} tokenStream
- * @return {!SelectorsGroup|!tokenize_css.ErrorToken}
- */
-const parseASelectorsGroup = function(tokenStream) {
-  if (!isSimpleSelectorSequenceStart(tokenStream.current())) {
-    return tokenStream.current().copyPosTo(new tokenize_css.ErrorToken(
-        ValidationError.Code.CSS_SYNTAX_NOT_A_SELECTOR_START, ['style']));
-  }
-  const start = tokenStream.current();
-  const elements = [parseASelector(tokenStream)];
-  if (elements[0].tokenType === tokenize_css.TokenType.ERROR) {
-    return elements[0];
-  }
-  while (true) {
-    if (tokenStream.current().tokenType === tokenize_css.TokenType.WHITESPACE) {
-      tokenStream.consume();
-    }
-    if (tokenStream.current().tokenType === tokenize_css.TokenType.COMMA) {
-      tokenStream.consume();
-      if (tokenStream.current().tokenType ===
-          tokenize_css.TokenType.WHITESPACE) {
-        tokenStream.consume();
-      }
-      elements.push(parseASelector(tokenStream));
-      if (elements[elements.length - 1].tokenType ===
-          tokenize_css.TokenType.ERROR) {
-        return elements[elements.length - 1];
-      }
-      continue;
-    }
-    // We're about to claim success and return a selector,
-    // but before we do, we check that no unparsed input remains.
-    if (!(tokenStream.current().tokenType ===
-          tokenize_css.TokenType.EOF_TOKEN)) {
-      return tokenStream.current().copyPosTo(new tokenize_css.ErrorToken(
-          ValidationError.Code.CSS_SYNTAX_UNPARSED_INPUT_REMAINS_IN_SELECTOR,
-          ['style']));
-    }
-    if (elements.length == 1) {
-      return elements[0];
-    }
-    return start.copyPosTo(new SelectorsGroup(elements));
-  }
-};
-exports.parseASelectorsGroup = parseASelectorsGroup;
diff --git a/validator/js/engine/parse-css_test.js b/validator/js/engine/parse-css_test.js
deleted file mode 100644
index 9c87902887de..000000000000
--- a/validator/js/engine/parse-css_test.js
+++ /dev/null
@@ -1,1963 +0,0 @@
-/**
- * Credits:
- *   This original version of this file was derived from
- *   https://github.com/tabatkins/parse-css by Tab Atkins,
- *   licensed under the CC0 license
- *   (http://creativecommons.org/publicdomain/zero/1.0/).
- */
-goog.module('parse_css.ParseCssTest');
-
-const asserts = goog.require('goog.asserts');
-const json_testutil = goog.require('json_testutil');
-const parse_css = goog.require('parse_css');
-const tokenize_css = goog.require('tokenize_css');
-
-/**
- * A strict comparison between two values that does not truncate the
- * error messages and works well with the closure compiler.
- * @param {*} expected
- * @param {*} saw
- */
-function assertStrictEqual(expected, saw) {
-  assert.ok(expected === saw, 'expected: ' + expected + ' saw: ' + saw);
-}
-
-describe('stripVendorPrefix', () => {
-  it('removes typical vendor prefixes', () => {
-    assertStrictEqual('foo', parse_css.stripVendorPrefix('-moz-foo'));
-    assertStrictEqual('foo', parse_css.stripVendorPrefix('-ms-foo'));
-    assertStrictEqual('foo', parse_css.stripVendorPrefix('-o-foo'));
-    assertStrictEqual('foo', parse_css.stripVendorPrefix('-webkit-foo'));
-    assertStrictEqual('foo', parse_css.stripVendorPrefix('foo'));
-    assertStrictEqual('foo-foo', parse_css.stripVendorPrefix('foo-foo'));
-    assertStrictEqual('-d-foo-foo', parse_css.stripVendorPrefix('-d-foo-foo'));
-    assertStrictEqual('-foo', parse_css.stripVendorPrefix('-foo'));
-  });
-});
-
-/**
- * For emitting json output with keys in logical order for the CSS parser's AST.
- * @param {string} a
- * @param {string} b
- * @return {number}
- */
-const jsonKeyCmp = json_testutil.makeJsonKeyCmpFn([
-  'line',
-  'col',
-  'tokenType',
-  'name',
-  'prelude',
-  'declarations',
-  'rules',
-  'errorType',
-  'msg',
-  'type',
-  'value',
-  'repr',
-  'unit',
-  'eof',
-]);
-
-/**
- * @param {!Object} left
- * @param {!Object} right
- */
-function assertJSONEquals(left, right) {
-  assertStrictEqual(
-      json_testutil.renderJSON(left, jsonKeyCmp, /*offset=*/ 4),
-      json_testutil.renderJSON(right, jsonKeyCmp, /*offset=*/ 4));
-}
-
-/** @type {!Object<string,parse_css.BlockType>} */
-const ampAtRuleParsingSpec = {
-  'font-face': parse_css.BlockType.PARSE_AS_DECLARATIONS,
-  'media': parse_css.BlockType.PARSE_AS_RULES,
-};
-
-describe('tokenize', () => {
-  it('generates tokens for simple example', () => {
-    const css = 'foo { bar: baz; }';
-    const errors = [];
-    const tokenlist = tokenize_css.tokenize(css, 1, 0, errors);
-    assertJSONEquals(
-        [
-          {'line': 1, 'col': 0, 'tokenType': 'IDENT', 'value': 'foo'},
-          {'line': 1, 'col': 3, 'tokenType': 'WHITESPACE'},
-          {'line': 1, 'col': 4, 'tokenType': 'OPEN_CURLY'},
-          {'line': 1, 'col': 5, 'tokenType': 'WHITESPACE'},
-          {'line': 1, 'col': 6, 'tokenType': 'IDENT', 'value': 'bar'},
-          {'line': 1, 'col': 9, 'tokenType': 'COLON'},
-          {'line': 1, 'col': 10, 'tokenType': 'WHITESPACE'},
-          {'line': 1, 'col': 11, 'tokenType': 'IDENT', 'value': 'baz'},
-          {'line': 1, 'col': 14, 'tokenType': 'SEMICOLON'},
-          {'line': 1, 'col': 15, 'tokenType': 'WHITESPACE'},
-          {'line': 1, 'col': 16, 'tokenType': 'CLOSE_CURLY'},
-          {'line': 1, 'col': 17, 'tokenType': 'EOF_TOKEN'},
-        ],
-        tokenlist);
-    assertStrictEqual(0, errors.length);
-  });
-
-  it('tokenizes with parse errors', () => {
-    const css = ' "\n "';
-    const errors = [];
-    const tokenlist = tokenize_css.tokenize(css, 1, 0, errors);
-    assertJSONEquals(
-        [
-          {'line': 1, 'col': 0, 'tokenType': 'WHITESPACE'},
-          {'line': 1, 'col': 2, 'tokenType': 'WHITESPACE'},
-          {'line': 2, 'col': 1, 'tokenType': 'STRING', 'value': ''},
-          {'line': 2, 'col': 2, 'tokenType': 'EOF_TOKEN'},
-        ],
-        tokenlist);
-    assertJSONEquals(
-        [{
-          'line': 1,
-          'col': 1,
-          'tokenType': 'ERROR',
-          'code': 'CSS_SYNTAX_UNTERMINATED_STRING',
-          'params': ['style'],
-        }],
-        errors);
-  });
-
-  it('provides errors with line col offsets', () => {
-    const css = 'line 1 "unterminated\n' +
-        'line 2 "unterminated\n';
-    let errors = [];
-    tokenize_css.tokenize(css, 1, 0, errors);
-    assertJSONEquals(
-        [
-          {
-            'line': 1,
-            'col': 7,
-            'tokenType': 'ERROR',
-            'code': 'CSS_SYNTAX_UNTERMINATED_STRING',
-            'params': ['style'],
-          },
-          {
-            'line': 2,
-            'col': 7,
-            'tokenType': 'ERROR',
-            'code': 'CSS_SYNTAX_UNTERMINATED_STRING',
-            'params': ['style'],
-          },
-        ],
-        errors);
-    errors = [];
-    tokenize_css.tokenize(css, 5, 5, errors);
-    assertJSONEquals(
-        [
-          {
-            'line': 5,
-            'col': 12,
-            'tokenType': 'ERROR',
-            'code': 'CSS_SYNTAX_UNTERMINATED_STRING',
-            'params': ['style'],
-          },
-          {
-            'line': 6,
-            'col': 7,
-            'tokenType': 'ERROR',
-            'code': 'CSS_SYNTAX_UNTERMINATED_STRING',
-            'params': ['style'],
-          },
-        ],
-        errors);
-  });
-
-  it('deals w/ stray backslashes, unterminated comments and bad urls', () => {
-    // Note that Javascript has its own escaping, so there's really just one
-    // '\'.
-    let errors = [];
-    tokenize_css.tokenize('a trailing \\\nbackslash', 1, 0, errors);
-    assertJSONEquals(
-        [{
-          'line': 1,
-          'col': 11,
-          'tokenType': 'ERROR',
-          'code': 'CSS_SYNTAX_STRAY_TRAILING_BACKSLASH',
-          'params': ['style'],
-        }],
-        errors);
-
-    errors = [];
-    tokenize_css.tokenize('h1 {color: red; } /*', 1, 0, errors);
-    assertJSONEquals(
-        [{
-          'line': 1,
-          'col': 17,
-          'tokenType': 'ERROR',
-          'code': 'CSS_SYNTAX_UNTERMINATED_COMMENT',
-          'params': ['style'],
-        }],
-        errors);
-
-    errors = [];
-    tokenize_css.tokenize('oh hi url(foo"bar)', 1, 0, errors);
-    assertJSONEquals(
-        [{
-          'line': 1,
-          'col': 6,
-          'tokenType': 'ERROR',
-          'code': 'CSS_SYNTAX_BAD_URL',
-          'params': ['style'],
-        }],
-        errors);
-  });
-});
-
-/**
- * @param {parse_css.Rule} rule
- * @return {string}
- */
-function getPos(rule) {
-  return '(' + rule.line + ',' + rule.col + ')';
-}
-
-/** @private */
-class LogRulePositions extends parse_css.RuleVisitor {
-  constructor() {
-    super();
-    /** @type {!Array<string>} */
-    this.out = [];
-  }
-
-  /** @inheritDoc */
-  visitStylesheet(stylesheet) {
-    this.out.push('Stylesheet ', getPos(stylesheet), '\n');
-  }
-
-  /** @inheritDoc */
-  leaveStylesheet(stylesheet) {
-    this.out.push('Leaving Stylesheet ', getPos(stylesheet), '\n');
-  }
-
-  /** @inheritDoc */
-  visitAtRule(atRule) {
-    this.out.push('AtRule name=', atRule.name, ' ', getPos(atRule), '\n');
-  }
-
-  /** @inheritDoc */
-  leaveAtRule(atRule) {
-    this.out.push(
-        'Leaving AtRule name=', atRule.name, ' ', getPos(atRule), '\n');
-  }
-
-  /** @inheritDoc */
-  visitQualifiedRule(qualifiedRule) {
-    this.out.push('QualifiedRule ', getPos(qualifiedRule), '\n');
-  }
-
-  /** @inheritDoc */
-  leaveQualifiedRule(qualifiedRule) {
-    this.out.push('Leaving QualifiedRule ', getPos(qualifiedRule), '\n');
-  }
-
-  /** @inheritDoc */
-  visitDeclaration(declaration) {
-    this.out.push('Declaration ', getPos(declaration), '\n');
-  }
-
-  /** @inheritDoc */
-  leaveDeclaration(declaration) {
-    this.out.push('Leaving Declaration ', getPos(declaration), '\n');
-  }
-}
-
-describe('parseAStylesheet', () => {
-  it('parses rgb values', () => {
-    const css = 'foo { bar: rgb(255, 0, 127); }';
-    const errors = [];
-    const tokenlist = tokenize_css.tokenize(css, 1, 0, errors);
-    const sheet = parse_css.parseAStylesheet(
-        tokenlist, ampAtRuleParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-        errors);
-    assertJSONEquals(
-        {
-          'line': 1,
-          'col': 0,
-          'tokenType': 'STYLESHEET',
-          'rules': [{
-            'line': 1,
-            'col': 0,
-            'tokenType': 'QUALIFIED_RULE',
-            'prelude': [
-              {'line': 1, 'col': 0, 'tokenType': 'IDENT', 'value': 'foo'},
-              {'line': 1, 'col': 3, 'tokenType': 'WHITESPACE'},
-              {'line': 1, 'col': 4, 'tokenType': 'EOF_TOKEN'},
-            ],
-            'declarations': [{
-              'line': 1,
-              'col': 6,
-              'tokenType': 'DECLARATION',
-              'name': 'bar',
-              'value': [
-                {'line': 1, 'col': 10, 'tokenType': 'WHITESPACE'},
-                {
-                  'line': 1,
-                  'col': 11,
-                  'tokenType': 'FUNCTION_TOKEN',
-                  'value': 'rgb',
-                },
-                {
-                  'line': 1,
-                  'col': 15,
-                  'tokenType': 'NUMBER',
-                  'type': 'integer',
-                  'value': 255,
-                  'repr': '255',
-                },
-                {'line': 1, 'col': 18, 'tokenType': 'COMMA'},
-                {'line': 1, 'col': 19, 'tokenType': 'WHITESPACE'},
-                {
-                  'line': 1,
-                  'col': 20,
-                  'tokenType': 'NUMBER',
-                  'type': 'integer',
-                  'value': 0,
-                  'repr': '0',
-                },
-                {'line': 1, 'col': 21, 'tokenType': 'COMMA'},
-                {'line': 1, 'col': 22, 'tokenType': 'WHITESPACE'},
-                {
-                  'line': 1,
-                  'col': 23,
-                  'tokenType': 'NUMBER',
-                  'type': 'integer',
-                  'value': 127,
-                  'repr': '127',
-                },
-                {'line': 1, 'col': 26, 'tokenType': 'CLOSE_PAREN'},
-                {'line': 1, 'col': 27, 'tokenType': 'EOF_TOKEN'},
-              ],
-              'important': false,
-            }],
-          }],
-          'eof': {'line': 1, 'col': 30, 'tokenType': 'EOF_TOKEN'},
-        },
-        sheet);
-    // Some assertions about the line/cols of nodes, which we use to test the
-    // visitor pattern implementation.
-    const visitor = new LogRulePositions();
-    sheet.accept(visitor);
-    assertStrictEqual(
-        'Stylesheet (1,0)\n' +
-            'QualifiedRule (1,0)\n' +
-            'Declaration (1,6)\n' +
-            'Leaving Declaration (1,6)\n' +
-            'Leaving QualifiedRule (1,0)\n' +
-            'Leaving Stylesheet (1,0)\n',
-        visitor.out.join(''));
-  });
-
-  it('parses a hash reference', () => {
-    const css = '#foo {}';
-    const errors = [];
-    const tokenlist = tokenize_css.tokenize(css, 1, 0, errors);
-    const sheet = parse_css.parseAStylesheet(
-        tokenlist, ampAtRuleParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-        errors);
-    assertJSONEquals(
-        {
-          'line': 1,
-          'col': 0,
-          'tokenType': 'STYLESHEET',
-          'rules': [{
-            'line': 1,
-            'col': 0,
-            'tokenType': 'QUALIFIED_RULE',
-            'prelude': [
-              {
-                'line': 1,
-                'col': 0,
-                'tokenType': 'HASH',
-                'type': 'id',
-                'value': 'foo',
-              },
-              {'line': 1, 'col': 4, 'tokenType': 'WHITESPACE'},
-              {'line': 1, 'col': 5, 'tokenType': 'EOF_TOKEN'},
-            ],
-            'declarations': [],
-          }],
-          'eof': {'line': 1, 'col': 7, 'tokenType': 'EOF_TOKEN'},
-        },
-        sheet);
-  });
-
-  it('parses an @media rule', () => {
-    const css = '@media {}';
-    const errors = [];
-    const tokenlist = tokenize_css.tokenize(css, 1, 0, errors);
-    const sheet = parse_css.parseAStylesheet(
-        tokenlist, ampAtRuleParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-        errors);
-    assertJSONEquals(
-        {
-          'line': 1,
-          'col': 0,
-          'tokenType': 'STYLESHEET',
-          'rules': [{
-            'line': 1,
-            'col': 0,
-            'tokenType': 'AT_RULE',
-            'name': 'media',
-            'prelude': [
-              {'line': 1, 'col': 6, 'tokenType': 'WHITESPACE'},
-              {'line': 1, 'col': 7, 'tokenType': 'EOF_TOKEN'},
-            ],
-            'declarations': [],
-            'rules': [],
-          }],
-          'eof': {'line': 1, 'col': 9, 'tokenType': 'EOF_TOKEN'},
-        },
-        sheet);
-  });
-
-  it('parses nested media rules and declarations',
-     () => {
-       const css = 'h1 { color: red; }\n' +
-           '@media print {\n' +
-           '  @media print {\n' +
-           '    h2.bar { size: 4px; }\n' +
-           '  }\n' +
-           '}\n' +
-           '@font-face {\n' +
-           '  font-family: \'MyFont\';\n' +
-           '  src: url(\'foo.ttf\');\n' +
-           '}';
-       const errors = [];
-       const tokenlist = tokenize_css.tokenize(css, 1, 0, errors);
-       assertJSONEquals(
-           [
-             {'line': 1, 'col': 0, 'tokenType': 'IDENT', 'value': 'h1'},
-             {'line': 1, 'col': 2, 'tokenType': 'WHITESPACE'},
-             {'line': 1, 'col': 3, 'tokenType': 'OPEN_CURLY'},
-             {'line': 1, 'col': 4, 'tokenType': 'WHITESPACE'},
-             {'line': 1, 'col': 5, 'tokenType': 'IDENT', 'value': 'color'},
-             {'line': 1, 'col': 10, 'tokenType': 'COLON'},
-             {'line': 1, 'col': 11, 'tokenType': 'WHITESPACE'},
-             {'line': 1, 'col': 12, 'tokenType': 'IDENT', 'value': 'red'},
-             {'line': 1, 'col': 15, 'tokenType': 'SEMICOLON'},
-             {'line': 1, 'col': 16, 'tokenType': 'WHITESPACE'},
-             {'line': 1, 'col': 17, 'tokenType': 'CLOSE_CURLY'},
-             {'line': 1, 'col': 18, 'tokenType': 'WHITESPACE'},
-             {'line': 2, 'col': 0, 'tokenType': 'AT_KEYWORD', 'value': 'media'},
-             {'line': 2, 'col': 6, 'tokenType': 'WHITESPACE'},
-             {'line': 2, 'col': 7, 'tokenType': 'IDENT', 'value': 'print'},
-             {'line': 2, 'col': 12, 'tokenType': 'WHITESPACE'},
-             {'line': 2, 'col': 13, 'tokenType': 'OPEN_CURLY'},
-             {'line': 2, 'col': 14, 'tokenType': 'WHITESPACE'},
-             {'line': 3, 'col': 2, 'tokenType': 'AT_KEYWORD', 'value': 'media'},
-             {'line': 3, 'col': 8, 'tokenType': 'WHITESPACE'},
-             {'line': 3, 'col': 9, 'tokenType': 'IDENT', 'value': 'print'},
-             {'line': 3, 'col': 14, 'tokenType': 'WHITESPACE'},
-             {'line': 3, 'col': 15, 'tokenType': 'OPEN_CURLY'},
-             {'line': 3, 'col': 16, 'tokenType': 'WHITESPACE'},
-             {'line': 4, 'col': 4, 'tokenType': 'IDENT', 'value': 'h2'},
-             {'line': 4, 'col': 6, 'tokenType': 'DELIM', 'value': '.'},
-             {'line': 4, 'col': 7, 'tokenType': 'IDENT', 'value': 'bar'},
-             {'line': 4, 'col': 10, 'tokenType': 'WHITESPACE'},
-             {'line': 4, 'col': 11, 'tokenType': 'OPEN_CURLY'},
-             {'line': 4, 'col': 12, 'tokenType': 'WHITESPACE'},
-             {'line': 4, 'col': 13, 'tokenType': 'IDENT', 'value': 'size'},
-             {'line': 4, 'col': 17, 'tokenType': 'COLON'},
-             {'line': 4, 'col': 18, 'tokenType': 'WHITESPACE'},
-             {
-               'line': 4,
-               'col': 19,
-               'tokenType': 'DIMENSION',
-               'type': 'integer',
-               'value': 4,
-               'repr': '4',
-               'unit': 'px',
-             },
-             {'line': 4, 'col': 22, 'tokenType': 'SEMICOLON'},
-             {'line': 4, 'col': 23, 'tokenType': 'WHITESPACE'},
-             {'line': 4, 'col': 24, 'tokenType': 'CLOSE_CURLY'},
-             {'line': 4, 'col': 25, 'tokenType': 'WHITESPACE'},
-             {'line': 5, 'col': 2, 'tokenType': 'CLOSE_CURLY'},
-             {'line': 5, 'col': 3, 'tokenType': 'WHITESPACE'},
-             {'line': 6, 'col': 0, 'tokenType': 'CLOSE_CURLY'},
-             {'line': 6, 'col': 1, 'tokenType': 'WHITESPACE'},
-             {
-               'line': 7,
-               'col': 0,
-               'tokenType': 'AT_KEYWORD',
-               'value': 'font-face',
-             },
-             {'line': 7, 'col': 10, 'tokenType': 'WHITESPACE'},
-             {'line': 7, 'col': 11, 'tokenType': 'OPEN_CURLY'},
-             {'line': 7, 'col': 12, 'tokenType': 'WHITESPACE'},
-             {
-               'line': 8,
-               'col': 2,
-               'tokenType': 'IDENT',
-               'value': 'font-family',
-             },
-             {'line': 8, 'col': 13, 'tokenType': 'COLON'},
-             {'line': 8, 'col': 14, 'tokenType': 'WHITESPACE'},
-             {'line': 8, 'col': 15, 'tokenType': 'STRING', 'value': 'MyFont'},
-             {'line': 8, 'col': 23, 'tokenType': 'SEMICOLON'},
-             {'line': 8, 'col': 24, 'tokenType': 'WHITESPACE'},
-             {'line': 9, 'col': 2, 'tokenType': 'IDENT', 'value': 'src'},
-             {'line': 9, 'col': 5, 'tokenType': 'COLON'},
-             {'line': 9, 'col': 6, 'tokenType': 'WHITESPACE'},
-             {
-               'line': 9,
-               'col': 7,
-               'tokenType': 'FUNCTION_TOKEN',
-               'value': 'url',
-             },
-             {'line': 9, 'col': 11, 'tokenType': 'STRING', 'value': 'foo.ttf'},
-             {'line': 9, 'col': 20, 'tokenType': 'CLOSE_PAREN'},
-             {'line': 9, 'col': 21, 'tokenType': 'SEMICOLON'},
-             {'line': 9, 'col': 22, 'tokenType': 'WHITESPACE'},
-             {'line': 10, 'col': 0, 'tokenType': 'CLOSE_CURLY'},
-             {'line': 10, 'col': 1, 'tokenType': 'EOF_TOKEN'},
-           ],
-           tokenlist);
-       const sheet = parse_css.parseAStylesheet(
-           tokenlist, ampAtRuleParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-           errors);
-       assertStrictEqual(0, errors.length);
-       assertJSONEquals(
-            {
-              'line': 1,
-              'col': 0,
-              'tokenType': 'STYLESHEET',
-              'rules': [
-                {
-                  'line': 1,
-                  'col': 0,
-                  'tokenType': 'QUALIFIED_RULE',
-                  'prelude': [
-                    {'line': 1, 'col': 0, 'tokenType': 'IDENT', 'value': 'h1'},
-                    {'line': 1, 'col': 2, 'tokenType': 'WHITESPACE'},
-                    {'line': 1, 'col': 3, 'tokenType': 'EOF_TOKEN'},
-                  ],
-                  'declarations': [{
-                    'line': 1,
-                    'col': 5,
-                    'tokenType': 'DECLARATION',
-                    'name': 'color',
-                    'value': [
-                      {'line': 1, 'col': 11, 'tokenType': 'WHITESPACE'},
-                      {'line': 1, 'col': 12, 'tokenType': 'IDENT', 'value': 'red'},
-                      {'line': 1, 'col': 15, 'tokenType': 'EOF_TOKEN'},
-                    ],
-                    'important': false,
-                  }],
-                },
-                {
-                  'line': 2,
-                  'col': 0,
-                  'tokenType': 'AT_RULE',
-                  'name': 'media',
-                  'prelude': [
-                    {'line': 2, 'col': 6, 'tokenType': 'WHITESPACE'},
-                    {'line': 2, 'col': 7, 'tokenType': 'IDENT', 'value': 'print'},
-                    {'line': 2, 'col': 12, 'tokenType': 'WHITESPACE'},
-                    {'line': 2, 'col': 13, 'tokenType': 'EOF_TOKEN'},
-                  ],
-                  'declarations': [],
-                  'rules': [{
-                    'line': 3,
-                    'col': 2,
-                    'tokenType': 'AT_RULE',
-                    'name': 'media',
-                    'prelude': [
-                      {'line': 3, 'col': 8, 'tokenType': 'WHITESPACE'},
-                      {'line': 3, 'col': 9, 'tokenType': 'IDENT', 'value': 'print'},
-                      {'line': 3, 'col': 14, 'tokenType': 'WHITESPACE'},
-                      {'line': 3, 'col': 15, 'tokenType': 'EOF_TOKEN'},
-                    ],
-                    'declarations': [],
-                    'rules': [{
-                      'line': 4,
-                      'col': 4,
-                      'tokenType': 'QUALIFIED_RULE',
-                      'prelude': [
-                        {'line': 4, 'col': 4, 'tokenType': 'IDENT', 'value': 'h2'},
-                        {'line': 4, 'col': 6, 'tokenType': 'DELIM', 'value': '.'},
-                        {'line': 4, 'col': 7, 'tokenType': 'IDENT', 'value': 'bar'},
-                        {'line': 4, 'col': 10, 'tokenType': 'WHITESPACE'},
-                        {'line': 4, 'col': 11, 'tokenType': 'EOF_TOKEN'},
-                      ],
-                      'declarations': [{
-                        'line': 4,
-                        'col': 13,
-                        'tokenType': 'DECLARATION',
-                        'name': 'size',
-                        'value': [
-                          {'line': 4, 'col': 18, 'tokenType': 'WHITESPACE'}, {
-                            'line': 4,
-                            'col': 19,
-                            'tokenType': 'DIMENSION',
-                            'type': 'integer',
-                            'value': 4,
-                            'repr': '4',
-                            'unit': 'px',
-                          },
-                          {'line': 4, 'col': 22, 'tokenType': 'EOF_TOKEN'},
-                        ],
-                        'important': false,
-                      }],
-                    }],
-                  }],
-                },
-                {
-                  'line': 7,
-                  'col': 0,
-                  'tokenType': 'AT_RULE',
-                  'name': 'font-face',
-                  'prelude': [
-                    {'line': 7, 'col': 10, 'tokenType': 'WHITESPACE'},
-                    {'line': 7, 'col': 11, 'tokenType': 'EOF_TOKEN'},
-                  ],
-                  'declarations': [
-                    {
-                      'line': 8,
-                      'col': 2,
-                      'tokenType': 'DECLARATION',
-                      'name': 'font-family',
-                      'value': [
-                        {'line': 8, 'col': 14, 'tokenType': 'WHITESPACE'}, {
-                          'line': 8,
-                          'col': 15,
-                          'tokenType': 'STRING',
-                          'value': 'MyFont',
-                        },
-                        {'line': 8, 'col': 23, 'tokenType': 'EOF_TOKEN'},
-                      ],
-                      'important': false,
-                    },
-                    {
-                      'line': 9,
-                      'col': 2,
-                      'tokenType': 'DECLARATION',
-                      'name': 'src',
-                      'value': [
-                        {'line': 9, 'col': 6, 'tokenType': 'WHITESPACE'}, {
-                          'line': 9,
-                          'col': 7,
-                          'tokenType': 'FUNCTION_TOKEN',
-                          'value': 'url',
-                        },
-                        {
-                          'line': 9,
-                          'col': 11,
-                          'tokenType': 'STRING',
-                          'value': 'foo.ttf',
-                        },
-                        {'line': 9, 'col': 20, 'tokenType': 'CLOSE_PAREN'},
-                        {'line': 9, 'col': 21, 'tokenType': 'EOF_TOKEN'},
-                      ],
-                      'important': false,
-                    },
-                  ],
-                  'rules': [],
-                },
-              ],
-              'eof': {'line': 10, 'col': 1, 'tokenType': 'EOF_TOKEN'},
-            },
-            sheet);
-     });
-
-  it('generates errors not assertions for invalid css', () => {
-    const css = '#foo { foo.bar {} }\n' +  // qual. rule inside declarations
-        '@font-face { @media {} }\n' +     // @rule inside declarations
-        '@media { @gregable }\n' +         // unrecognized @rule, ignored
-        'color: red;\n';  // declaration outside qualified rule.
-    const errors = [];
-    const tokenlist = tokenize_css.tokenize(css, 1, 0, errors);
-    parse_css.parseAStylesheet(
-        tokenlist, ampAtRuleParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-        errors);
-    assertJSONEquals(
-        [
-          {
-            'line': 1,
-            'col': 7,
-            'tokenType': 'ERROR',
-            'code': 'CSS_SYNTAX_INCOMPLETE_DECLARATION',
-            'params': ['style'],
-          },
-          {
-            'line': 2,
-            'col': 13,
-            'tokenType': 'ERROR',
-            'code': 'CSS_SYNTAX_INVALID_AT_RULE',
-            'params': ['style', 'media'],
-          },
-          {
-            'line': 4,
-            'col': 0,
-            'tokenType': 'ERROR',
-            'code': 'CSS_SYNTAX_EOF_IN_PRELUDE_OF_QUALIFIED_RULE',
-            'params': ['style'],
-          },
-        ],
-        errors);
-  });
-
-  it('generates errors based on the grammar', () => {
-    // @gregable is not supported by the grammar.
-    const css = '@gregable {}\n.foo{prop}';
-    const errors = [];
-    const tokenlist = tokenize_css.tokenize(css, 1, 0, errors);
-    const sheet = parse_css.parseAStylesheet(
-        tokenlist, ampAtRuleParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-        errors);
-    assertJSONEquals(
-        [{
-          'line': 2,
-          'col': 5,
-          'tokenType': 'ERROR',
-          'code': 'CSS_SYNTAX_INCOMPLETE_DECLARATION',
-          'params': ['style'],
-        }],
-        errors);
-    assertJSONEquals(
-        {
-          'line': 1,
-          'col': 0,
-          'tokenType': 'STYLESHEET',
-          'rules': [
-            {
-              'line': 1,
-              'col': 0,
-              'tokenType': 'AT_RULE',
-              'name': 'gregable',
-              'prelude': [
-                {'line': 1, 'col': 9, 'tokenType': 'WHITESPACE'},
-                {'line': 1, 'col': 10, 'tokenType': 'EOF_TOKEN'},
-              ],
-              'declarations': [],
-              'rules': [],
-            },
-            {
-              'line': 2,
-              'col': 0,
-              'tokenType': 'QUALIFIED_RULE',
-              'prelude': [
-                {'line': 2, 'col': 0, 'tokenType': 'DELIM', 'value': '.'},
-                {'line': 2, 'col': 1, 'tokenType': 'IDENT', 'value': 'foo'},
-                {'line': 2, 'col': 4, 'tokenType': 'EOF_TOKEN'},
-              ],
-              'declarations': [],
-            },
-          ],
-          'eof': {'line': 2, 'col': 10, 'tokenType': 'EOF_TOKEN'},
-        },
-        sheet);
-  });
-
-  it('handles a nested media rule with declarations', () => {
-    const css = '@media print {\n' +
-        '/* hide navigation controls when printing */\n' +
-        '#navigation { display: none }\n' +
-        '@media (max-width: 12cm) {\n' +
-        '  /* keep notes in flow when printing to narrow pages */\n' +
-        '  .note { float: none }\n' +
-        '}';
-    const errors = [];
-    const tokenlist = tokenize_css.tokenize(css, 1, 0, errors);
-    const sheet = parse_css.parseAStylesheet(
-        tokenlist, ampAtRuleParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-        errors);
-
-    assertJSONEquals(
-        {'line': 1, 'col': 0, 'tokenType': 'STYLESHEET', 'rules':
-         [{'line': 1, 'col': 0, 'tokenType': 'AT_RULE', 'name': 'media',
-           'prelude':
-           [{'line': 1, 'col': 6, 'tokenType': 'WHITESPACE'},
-             {'line': 1, 'col': 7, 'tokenType': 'IDENT', 'value': 'print'},
-             {'line': 1, 'col': 12, 'tokenType': 'WHITESPACE'},
-             {'line': 1, 'col': 13, 'tokenType': 'EOF_TOKEN'}], 'declarations':
-           [], 'rules':
-           [{'line': 3, 'col': 0, 'tokenType': 'QUALIFIED_RULE', 'prelude':
-             [{'line': 3, 'col': 0, 'tokenType': 'HASH', 'type': 'id',
-               'value': 'navigation'},
-             {'line': 3, 'col': 11, 'tokenType': 'WHITESPACE'},
-             {'line': 3, 'col': 12, 'tokenType': 'EOF_TOKEN'}],
-           'declarations':
-             [{'line': 3, 'col': 14, 'tokenType': 'DECLARATION', 'name':
-               'display', 'value':
-               [{'line': 3, 'col': 22, 'tokenType': 'WHITESPACE'},
-                 {'line': 3, 'col': 23, 'tokenType': 'IDENT', 'value':
-                 'none'},
-                 {'line': 3, 'col': 27, 'tokenType': 'WHITESPACE'},
-                 {'line': 3, 'col': 28, 'tokenType': 'EOF_TOKEN'}],
-             'important': false}]},
-           {'line': 4, 'col': 0, 'tokenType': 'AT_RULE', 'name':
-             'media', 'prelude':
-             [{'line': 4, 'col': 6, 'tokenType': 'WHITESPACE'},
-               {'line': 4, 'col': 7, 'tokenType': 'OPEN_PAREN'},
-               {'line': 4, 'col': 8, 'tokenType': 'IDENT', 'value':
-               'max-width'},
-               {'line': 4, 'col': 17, 'tokenType': 'COLON'},
-               {'line': 4, 'col': 18, 'tokenType': 'WHITESPACE'},
-               {'line': 4, 'col': 19, 'tokenType': 'DIMENSION', 'type':
-               'integer', 'value': 12, 'repr': '12', 'unit': 'cm'},
-               {'line': 4, 'col': 23, 'tokenType': 'CLOSE_PAREN'},
-               {'line': 4, 'col': 24, 'tokenType': 'WHITESPACE'},
-               {'line': 4, 'col': 25, 'tokenType': 'EOF_TOKEN'}],
-           'declarations': [], 'rules':
-             [{'line': 6, 'col': 2, 'tokenType': 'QUALIFIED_RULE',
-               'prelude':
-               [{'line': 6, 'col': 2, 'tokenType': 'DELIM', 'value':
-                 '.'},
-               {'line': 6, 'col': 3, 'tokenType': 'IDENT', 'value':
-                 'note'},
-               {'line': 6, 'col': 7, 'tokenType': 'WHITESPACE'},
-               {'line': 6, 'col': 8, 'tokenType': 'EOF_TOKEN'}],
-               'declarations':
-               [{'line': 6, 'col': 10, 'tokenType': 'DECLARATION',
-                 'name': 'float', 'value':
-                 [{'line': 6, 'col': 16, 'tokenType': 'WHITESPACE'},
-                   {'line': 6, 'col': 17, 'tokenType': 'IDENT', 'value':
-                   'none'},
-                   {'line': 6, 'col': 21, 'tokenType': 'WHITESPACE'},
-                   {'line': 6, 'col': 22, 'tokenType': 'EOF_TOKEN'}],
-                 'important': false}]}]}]}], 'eof':
-         {'line': 7, 'col': 1, 'tokenType': 'EOF_TOKEN'}},
-        sheet);
-    assertStrictEqual(0, errors.length);
-  });
-
-  it('handles selectors but does not parse them in detail yet', () => {
-    const css = ' h1 { color: blue; } ';
-    const errors = [];
-    const tokenlist = tokenize_css.tokenize(css, 1, 0, errors);
-    const sheet = parse_css.parseAStylesheet(
-        tokenlist, ampAtRuleParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-        errors);
-
-    assertJSONEquals(
-        {
-          'line': 1,
-          'col': 0,
-          'tokenType': 'STYLESHEET',
-          'rules': [{
-            'line': 1,
-            'col': 1,
-            'tokenType': 'QUALIFIED_RULE',
-            'prelude': [
-              {'line': 1, 'col': 1, 'tokenType': 'IDENT', 'value': 'h1'},
-              {'line': 1, 'col': 3, 'tokenType': 'WHITESPACE'},
-              {'line': 1, 'col': 4, 'tokenType': 'EOF_TOKEN'},
-            ],
-            'declarations': [{
-              'line': 1,
-              'col': 6,
-              'tokenType': 'DECLARATION',
-              'name': 'color',
-              'value': [
-                {'line': 1, 'col': 12, 'tokenType': 'WHITESPACE'},
-                {'line': 1, 'col': 13, 'tokenType': 'IDENT', 'value': 'blue'},
-                {'line': 1, 'col': 17, 'tokenType': 'EOF_TOKEN'},
-              ],
-              'important': false,
-            }],
-          }],
-          'eof': {'line': 1, 'col': 21, 'tokenType': 'EOF_TOKEN'},
-        },
-        sheet);
-    assertStrictEqual(0, errors.length);
-  });
-
-  // The tests below are exploratory - they tell us what the css parser
-  // currently produces for these selectors. For a list of selectors, see
-  // http://www.w3.org/TR/css3-selectors/#selectors.
-
-  it('handles simple selector example', () => {
-    assertJSONEquals(
-        [
-          {'line': 1, 'col': 0, 'tokenType': 'DELIM', 'value': '*'},
-          {'line': 1, 'col': 1, 'tokenType': 'EOF_TOKEN'},
-        ],
-        parseSelectorForTest('*'));
-  });
-
-  it('handles another selector example', () => {
-    assertJSONEquals(
-        [
-          {'line': 1, 'col': 0, 'tokenType': 'IDENT', 'value': 'E'},
-          {'line': 1, 'col': 1, 'tokenType': 'EOF_TOKEN'},
-        ],
-        parseSelectorForTest('E'));
-  });
-
-  it('handles selector example with square braces', () => {
-    assertJSONEquals(
-        [
-          {'line': 1, 'col': 0, 'tokenType': 'IDENT', 'value': 'E'},
-          {'line': 1, 'col': 1, 'tokenType': 'OPEN_SQUARE'},
-          {'line': 1, 'col': 2, 'tokenType': 'IDENT', 'value': 'foo'},
-          {'line': 1, 'col': 5, 'tokenType': 'CLOSE_SQUARE'},
-          {'line': 1, 'col': 6, 'tokenType': 'EOF_TOKEN'},
-        ],
-        parseSelectorForTest('E[foo]'));
-  });
-
-  it('handles selector example with string matching', () => {
-    assertJSONEquals(
-        [
-          {'line': 1, 'col': 0, 'tokenType': 'IDENT', 'value': 'E'},
-          {'line': 1, 'col': 1, 'tokenType': 'OPEN_SQUARE'},
-          {'line': 1, 'col': 2, 'tokenType': 'IDENT', 'value': 'foo'},
-          {'line': 1, 'col': 5, 'tokenType': 'DELIM', 'value': '='},
-          {'line': 1, 'col': 6, 'tokenType': 'STRING', 'value': 'bar'},
-          {'line': 1, 'col': 11, 'tokenType': 'CLOSE_SQUARE'},
-          {'line': 1, 'col': 12, 'tokenType': 'EOF_TOKEN'},
-        ],
-        parseSelectorForTest('E[foo="bar"]'));
-  });
-});
-
-describe('extractUrlsFromStylesheet', () => {
-  // Tests that font urls are parsed with font-face atRuleScope.
-  it('finds font in font-face', () => {
-    const css =
-        '@font-face {font-family: \'Foo\'; src: url(\'http://foo.com/bar.ttf\');}';
-    const errors = [];
-    const tokenList = tokenize_css.tokenize(css, 1, 0, errors);
-    const sheet = parse_css.parseAStylesheet(
-        tokenList, ampAtRuleParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-        errors);
-    const parsedUrls = [];
-    parse_css.extractUrlsFromStylesheet(sheet, parsedUrls, errors);
-    assertJSONEquals([], errors);
-    assertJSONEquals(
-        [{
-          'line': 1,
-          'col': 37,
-          'tokenType': 'PARSED_CSS_URL',
-          'atRuleScope': 'font-face',
-          'utf8Url': 'http://foo.com/bar.ttf',
-        }],
-        parsedUrls);
-  });
-
-  // Tests that image URLs are parsed with empty atRuleScope; also tests
-  // that unicode escapes (in this case \000026) within the URL are decoded.
-  it('supports image url with unicode', () => {
-    const css =
-        'body{background-image: url(\'http://a.com/b/c=d\\000026e=f_g*h\');}';
-    const errors = [];
-    const tokenList = tokenize_css.tokenize(css, 1, 0, errors);
-    const sheet = parse_css.parseAStylesheet(
-        tokenList, ampAtRuleParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-        errors);
-    const parsedUrls = [];
-    parse_css.extractUrlsFromStylesheet(sheet, parsedUrls, errors);
-    assertJSONEquals([], errors);
-    assertJSONEquals(
-        [{
-          'line': 1,
-          'col': 23,
-          'tokenType': 'PARSED_CSS_URL',
-          'atRuleScope': '',
-          'utf8Url': 'http://a.com/b/c=d&e=f_g*h',
-        }],
-        parsedUrls);
-  });
-
-  // This test verifies that a declaration ending in `!important` is treated by
-  // parsing out the `!important` marker and setting that as a special value in
-  // the declaration. In particular, we are looking for:
-  // 1) rules[0].declarations[0].important is true.
-  // 2) rules[0].declarations[0].value does not contain the tokens corresponding
-  //    to `!important`.
-  it('detects important', () => {
-    const css = 'b { color: red !important }';
-    const errors = [];
-    const tokenList = tokenize_css.tokenize(css, 1, 0, errors);
-    const sheet = parse_css.parseAStylesheet(
-        tokenList, ampAtRuleParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-        errors);
-    assertJSONEquals([], errors);
-    assertJSONEquals(
-        {
-          'line': 1,
-          'col': 0,
-          'tokenType': 'STYLESHEET',
-          'rules': [{
-            'line': 1,
-            'col': 0,
-            'tokenType': 'QUALIFIED_RULE',
-            'prelude': [
-              {'line': 1, 'col': 0, 'tokenType': 'IDENT', 'value': 'b'},
-              {'line': 1, 'col': 1, 'tokenType': 'WHITESPACE'},
-              {'line': 1, 'col': 2, 'tokenType': 'EOF_TOKEN'}
-            ],
-            'declarations': [{
-              'line': 1,
-              'col': 4,
-              'tokenType': 'DECLARATION',
-              'name': 'color',
-              'value': [
-                {'line': 1, 'col': 10, 'tokenType': 'WHITESPACE'},
-                {'line': 1, 'col': 11, 'tokenType': 'IDENT', 'value': 'red'},
-                {'line': 1, 'col': 14, 'tokenType': 'WHITESPACE'},
-                {'line': 1, 'col': 26, 'tokenType': 'EOF_TOKEN'}
-              ],
-              'important': true
-            }]
-          }],
-          'eof': {'line': 1, 'col': 27, 'tokenType': 'EOF_TOKEN'}
-        },
-        sheet);
-  });
-
-  // This example contains both image urls, other urls (fonts) and
-  // segments in between.
-  it('handles longer example', () => {
-    const css = '.a { color:red; background-image:url(4.png) }' +
-        '.b { color:black; background-image:url(\'http://a.com/b.png\') } ' +
-        '@font-face {font-family: \'Medium\';src: url(\'http://a.com/1.woff\') ' +
-        'format(\'woff\'),url(\'http://b.com/1.ttf\') format(\'truetype\'),' +
-        'src:url(\'\') format(\'embedded-opentype\');}';
-    const errors = [];
-    const tokenList = tokenize_css.tokenize(css, 1, 0, errors);
-    const sheet = parse_css.parseAStylesheet(
-        tokenList, ampAtRuleParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-        errors);
-    const parsedUrls = [];
-    parse_css.extractUrlsFromStylesheet(sheet, parsedUrls, errors);
-    assertJSONEquals([], errors);
-    assertJSONEquals(
-        [
-          {
-            'line': 1,
-            'col': 33,
-            'tokenType': 'PARSED_CSS_URL',
-            'atRuleScope': '',
-            'utf8Url': '4.png',
-          },
-          {
-            'line': 1,
-            'col': 80,
-            'tokenType': 'PARSED_CSS_URL',
-            'atRuleScope': '',
-            'utf8Url': 'http://a.com/b.png',
-          },
-          {
-            'line': 1,
-            'col': 147,
-            'tokenType': 'PARSED_CSS_URL',
-            'atRuleScope': 'font-face',
-            'utf8Url': 'http://a.com/1.woff',
-          },
-          {
-            'line': 1,
-            'col': 189,
-            'tokenType': 'PARSED_CSS_URL',
-            'atRuleScope': 'font-face',
-            'utf8Url': 'http://b.com/1.ttf',
-          },
-          {
-            'line': 1,
-            'col': 238,
-            'tokenType': 'PARSED_CSS_URL',
-            'atRuleScope': 'font-face',
-            'utf8Url': '',
-          },
-        ],
-        parsedUrls);
-  });
-
-  // Windows newlines present extra challenges for position information.
-  it('handles windows newlines', () => {
-    const css = '.a \r\n{ color:red; background-image:url(4.png) }\r\n' +
-        '.b { color:black; \r\nbackground-image:url(\'http://a.com/b.png\') }';
-    const errors = [];
-    const tokenList = tokenize_css.tokenize(css, 1, 0, errors);
-    const sheet = parse_css.parseAStylesheet(
-        tokenList, ampAtRuleParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-        errors);
-    const parsedUrls = [];
-    parse_css.extractUrlsFromStylesheet(sheet, parsedUrls, errors);
-    assertJSONEquals([], errors);
-    assertJSONEquals(
-        [
-          {
-            'line': 2,
-            'col': 30,
-            'tokenType': 'PARSED_CSS_URL',
-            'atRuleScope': '',
-            'utf8Url': '4.png',
-          },
-          {
-            'line': 4,
-            'col': 17,
-            'tokenType': 'PARSED_CSS_URL',
-            'atRuleScope': '',
-            'utf8Url': 'http://a.com/b.png',
-          },
-        ],
-        parsedUrls);
-  });
-
-  // This example parses as CSS without errors, however once the URL
-  // with parameters is extracted, we recognize that the arguments to
-  // the url function are invalid.
-  it('invalid arguments inside url function yields error', () => {
-    const css = '\n' +
-        '    @font-face {\n' +
-        '      font-family: \'Roboto\', sans-serif;\n' +
-        '      src: url(\'<link href=\'https://fonts.googleapis.com/css' +
-        '?family=Roboto:300,400,500,700\' ' +
-        'rel=\'stylesheet\' type=\'text/css\'>\');\n' +
-        '    }\n';
-    const errors = [];
-    const tokenList = tokenize_css.tokenize(css, 1, 0, errors);
-    const sheet = parse_css.parseAStylesheet(
-        tokenList, ampAtRuleParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-        errors);
-    const parsedUrls = [];
-    parse_css.extractUrlsFromStylesheet(sheet, parsedUrls, errors);
-    assertJSONEquals(
-        [{
-          'line': 4,
-          'col': 11,
-          'tokenType': 'ERROR',
-          'code': 'CSS_SYNTAX_BAD_URL',
-          'params': ['style'],
-        }],
-        errors);
-    assertJSONEquals([], parsedUrls);
-  });
-});
-
-/**
- * Helper function for parseMediaQueries tests.
- * @param {string} mediaQuery
- * @return  {!parse_css.Stylesheet}
- */
-function mediaQueryStylesheet(mediaQuery) {
-  const css = '@media ' + mediaQuery + ' {}';
-  const errors = [];
-  const tokenList = tokenize_css.tokenize(css, 1, 0, errors);
-  const sheet = parse_css.parseAStylesheet(
-      tokenList, ampAtRuleParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-      errors);
-  assertJSONEquals([], errors);
-  return sheet;
-}
-
-describe('parseMediaQueries', () => {
-  // Tests demonstrates the error position reported for a simple error media
-  // query. Note that the position is actually the @media AT rule.
-  it('identifies error position', () => {
-    const sheet = mediaQueryStylesheet('screen,');
-    const errors = [];
-    const mediaTypes = [];
-    const mediaFeatures = [];
-    parse_css.parseMediaQueries(sheet, mediaTypes, mediaFeatures, errors);
-    assertJSONEquals(
-        [{
-          'line': 1,
-          'col': 0,
-          'code': 'CSS_SYNTAX_MALFORMED_MEDIA_QUERY',
-          'params': ['style'],
-          'tokenType': 'ERROR',
-        }],
-        errors);
-  });
-
-  // Tests demonstrates a series of media queries which are expected to produce
-  // errors.
-  it('fails on error queries', () => {
-    const cases = [
-      'screen, ',
-      'screen and',
-      'screen (',
-      '((min-width:500px)',
-      '(min-width:500px))',
-      '((min-width:500px))',
-      'not only screen and (color)',
-      '(example, all), speech',
-      '&test, screen',
-      'all and(color)',
-    ];
-
-    for (const testcase of cases) {
-      const sheet = mediaQueryStylesheet(testcase);
-      const errors = [];
-      const mediaTypes = [];
-      const mediaFeatures = [];
-      parse_css.parseMediaQueries(sheet, mediaTypes, mediaFeatures, errors);
-      assertStrictEqual(1, errors.length);
-    }
-  });
-
-  // Tests demonstrates a series of media queries which are expected to not
-  // produce errors.
-  it('succeeds on non-error queries', () => {
-    const cases = [
-      'screen, braille, hologram, greetingcard',
-      'screen and (color), projection and (color)',
-      'all and (min-width:500px)',
-      'all and (min-width: 500px)',
-      '(min-width:500px)',
-      'not screen and (color)',
-      'only screen and (color)',
-      'NOT screen AND (color)',
-      'screen \t \n , \t \n braille',
-      '(min-width: calc(840px - 48px))',
-    ];
-
-    for (const testcase of cases) {
-      const sheet = mediaQueryStylesheet(testcase);
-      const errors = [];
-      const mediaTypes = [];
-      const mediaFeatures = [];
-      parse_css.parseMediaQueries(sheet, mediaTypes, mediaFeatures, errors);
-      assertStrictEqual(0, errors.length);
-    }
-  });
-
-  // Tests demonstrates that media type and media feature extraction.
-  it('extracts media types and features', () => {
-    const cases = [
-      // Query,              Types,    Features
-      ['screen and (color)', 'screen', 'color'],
-      ['screen and (color), braille', 'screen,braille', 'color'],
-      [
-        'screen and (min-width: 50px) and (max-width:51px)',
-        'screen',
-        'min-width,max-width',
-      ],
-      ['(color) and (max-width:abc)', '', 'color,max-width'],
-      ['only screen', 'screen', ''],
-      ['not screen', 'screen', ''],
-      ['screen, not braille', 'screen,braille', ''],
-      ['SCREEN AND (COLOR)', 'SCREEN', 'COLOR'],
-    ];
-
-    for (const testcase of cases) {
-      assertStrictEqual(3, testcase.length);
-      const query = testcase[0];
-      const expectedTypes = testcase[1];
-      const expectedFeatures = testcase[2];
-
-      const sheet = mediaQueryStylesheet(query);
-      const errors = [];
-      const mediaTypes = [];
-      const mediaFeatures = [];
-      parse_css.parseMediaQueries(sheet, mediaTypes, mediaFeatures, errors);
-      assertStrictEqual(0, errors.length);
-
-      let seenTypes = '';
-      for (const token of mediaTypes) {
-        if (seenTypes !== '') {
-          seenTypes += ',';
-        }
-        seenTypes += token.value;
-      }
-      let seenFeatures = '';
-      for (const token of mediaFeatures) {
-        if (seenFeatures !== '') {
-          seenFeatures += ',';
-        }
-        seenFeatures += token.value;
-      }
-
-      assertStrictEqual(expectedTypes, seenTypes);
-      assertStrictEqual(expectedFeatures, seenFeatures);
-    }
-  });
-});  // describe('parseMediaQueries')
-
-//
-// Below this line: unittests for css-selectors.js.
-//
-describe('css_selectors', () => {
-  it('parses a type selector', () => {
-    const tokens = parseSelectorForTest('*');
-    assertJSONEquals(
-        [
-          {'line': 1, 'col': 0, 'tokenType': 'DELIM', 'value': '*'},
-          {'line': 1, 'col': 1, 'tokenType': 'EOF_TOKEN'},
-        ],
-        tokens);
-    let tokenStream = new parse_css.TokenStream(tokens);
-    tokenStream.consume();
-    let typeSelector = parse_css.parseATypeSelector(tokenStream);
-    assertStrictEqual('*', typeSelector.toString());
-
-    tokenStream = new parse_css.TokenStream(parseSelectorForTest('*|*'));
-    tokenStream.consume();
-    typeSelector = parse_css.parseATypeSelector(tokenStream);
-    assertStrictEqual('*|*', typeSelector.toString());
-
-    tokenStream = new parse_css.TokenStream(parseSelectorForTest('*|E'));
-    tokenStream.consume();
-    typeSelector = parse_css.parseATypeSelector(tokenStream);
-    assertStrictEqual('*|E', typeSelector.toString());
-
-    tokenStream = new parse_css.TokenStream(parseSelectorForTest('svg|E'));
-    tokenStream.consume();
-    typeSelector = parse_css.parseATypeSelector(tokenStream);
-    assertStrictEqual('svg|E', typeSelector.toString());
-
-    tokenStream = new parse_css.TokenStream(parseSelectorForTest('svg|*'));
-    tokenStream.consume();
-    typeSelector = parse_css.parseATypeSelector(tokenStream);
-    assertStrictEqual('svg|*', typeSelector.toString());
-
-    tokenStream = new parse_css.TokenStream(parseSelectorForTest('|E'));
-    tokenStream.consume();
-    typeSelector = parse_css.parseATypeSelector(tokenStream);
-    assertStrictEqual('|E', typeSelector.toString());
-  });
-
-  it('parses an id selector', () => {
-    const tokens = parseSelectorForTest('#hello-world');
-    assertJSONEquals(
-        [
-          {
-            'line': 1,
-            'col': 0,
-            'tokenType': 'HASH',
-            'type': 'id',
-            'value': 'hello-world',
-          },
-          {'line': 1, 'col': 12, 'tokenType': 'EOF_TOKEN'},
-        ],
-        tokens);
-    const tokenStream = new parse_css.TokenStream(tokens);
-    tokenStream.consume();
-    const idSelector = parse_css.parseAnIdSelector(tokenStream);
-    assertStrictEqual('#hello-world', idSelector.toString());
-    assertStrictEqual(1, idSelector.line);
-    assertStrictEqual(0, idSelector.col);
-  });
-
-  it('parses a class selector', () => {
-    const tokens = parseSelectorForTest('.hello-world');
-    assertJSONEquals(
-        [
-          {'line': 1, 'col': 0, 'tokenType': 'DELIM', 'value': '.'},
-          {'line': 1, 'col': 1, 'tokenType': 'IDENT', 'value': 'hello-world'},
-          {'line': 1, 'col': 12, 'tokenType': 'EOF_TOKEN'},
-        ],
-        tokens);
-    const tokenStream = new parse_css.TokenStream(tokens);
-    tokenStream.consume();
-    const classSelector = parse_css.parseAClassSelector(tokenStream);
-    assertStrictEqual('.hello-world', classSelector.toString());
-    assertStrictEqual(1, classSelector.line);
-    assertStrictEqual(0, classSelector.col);
-  });
-
-  it('parses a simple selector sequence', () => {
-    let tokens = parseSelectorForTest('a|b#c');
-    assertJSONEquals(
-        [
-          {'line': 1, 'col': 0, 'tokenType': 'IDENT', 'value': 'a'},
-          {'line': 1, 'col': 1, 'tokenType': 'DELIM', 'value': '|'},
-          {'line': 1, 'col': 2, 'tokenType': 'IDENT', 'value': 'b'},
-          {
-            'line': 1,
-            'col': 3,
-            'tokenType': 'HASH',
-            'type': 'id',
-            'value': 'c',
-          },
-          {'line': 1, 'col': 5, 'tokenType': 'EOF_TOKEN'},
-        ],
-        tokens);
-    let tokenStream = new parse_css.TokenStream(tokens);
-    tokenStream.consume();
-    let sequence = parse_css.parseASimpleSelectorSequence(tokenStream);
-    assertJSONEquals(
-        {
-          'line': 1,
-          'col': 0,
-          'tokenType': 'SIMPLE_SELECTOR_SEQUENCE',
-          'otherSelectors':
-              [{'line': 1, 'col': 3, 'value': 'c', 'tokenType': 'ID_SELECTOR'}],
-          'typeSelector': {
-            'line': 1,
-            'col': 0,
-            'elementName': 'b',
-            'namespacePrefix': 'a',
-            'tokenType': 'TYPE_SELECTOR',
-          },
-        },
-        sequence);
-    tokens = parseSelectorForTest('a|foo#bar.baz');
-    tokenStream = new parse_css.TokenStream(tokens);
-    tokenStream.consume();
-    sequence = parse_css.parseASimpleSelectorSequence(tokenStream);
-    assertJSONEquals(
-        {
-          'line': 1,
-          'col': 0,
-          'tokenType': 'SIMPLE_SELECTOR_SEQUENCE',
-          'otherSelectors': [
-            {'line': 1, 'col': 5, 'value': 'bar', 'tokenType': 'ID_SELECTOR'},
-            {
-              'line': 1,
-              'col': 9,
-              'value': 'baz',
-              'tokenType': 'CLASS_SELECTOR',
-            },
-          ],
-          'typeSelector': {
-            'line': 1,
-            'col': 0,
-            'elementName': 'foo',
-            'namespacePrefix': 'a',
-            'tokenType': 'TYPE_SELECTOR',
-          },
-        },
-        sequence);
-  });
-
-  it('parses a selector', () => {
-    const tokens = parseSelectorForTest('foo bar \n baz');
-    assertJSONEquals(
-        [
-          {'line': 1, 'col': 0, 'tokenType': 'IDENT', 'value': 'foo'},
-          {'line': 1, 'col': 3, 'tokenType': 'WHITESPACE'},
-          {'line': 1, 'col': 4, 'tokenType': 'IDENT', 'value': 'bar'},
-          {'line': 1, 'col': 7, 'tokenType': 'WHITESPACE'},
-          {'line': 2, 'col': 1, 'tokenType': 'IDENT', 'value': 'baz'},
-          {'line': 2, 'col': 4, 'tokenType': 'EOF_TOKEN'},
-        ],
-        tokens);
-    const tokenStream = new parse_css.TokenStream(tokens);
-    tokenStream.consume();
-    const selector = parse_css.parseASelector(tokenStream);
-    assertJSONEquals(
-        {
-          'line': 1,
-          'col': 7,
-          'combinatorType': 'DESCENDANT',
-          'left': {
-            'line': 1,
-            'col': 3,
-            'combinatorType': 'DESCENDANT',
-            'left': {
-              'line': 1,
-              'col': 0,
-              'tokenType': 'SIMPLE_SELECTOR_SEQUENCE',
-              'otherSelectors': [],
-              'typeSelector': {
-                'line': 1,
-                'col': 0,
-                'elementName': 'foo',
-                'namespacePrefix': null,
-                'tokenType': 'TYPE_SELECTOR',
-              },
-            },
-            'tokenType': 'COMBINATOR',
-            'right': {
-              'line': 1,
-              'col': 4,
-              'tokenType': 'SIMPLE_SELECTOR_SEQUENCE',
-              'otherSelectors': [],
-              'typeSelector': {
-                'line': 1,
-                'col': 4,
-                'elementName': 'bar',
-                'namespacePrefix': null,
-                'tokenType': 'TYPE_SELECTOR',
-              },
-            },
-          },
-          'tokenType': 'COMBINATOR',
-          'right': {
-            'line': 2,
-            'col': 1,
-            'tokenType': 'SIMPLE_SELECTOR_SEQUENCE',
-            'otherSelectors': [],
-            'typeSelector': {
-              'line': 2,
-              'col': 1,
-              'elementName': 'baz',
-              'namespacePrefix': null,
-              'tokenType': 'TYPE_SELECTOR',
-            },
-          },
-        },
-        selector);
-  });
-
-  it('parses a selectors group', () => {
-    const tokens = parseSelectorForTest('foo, bar \n, baz');
-    assertJSONEquals(
-        [
-          {'line': 1, 'col': 0, 'tokenType': 'IDENT', 'value': 'foo'},
-          {'line': 1, 'col': 3, 'tokenType': 'COMMA'},
-          {'line': 1, 'col': 4, 'tokenType': 'WHITESPACE'},
-          {'line': 1, 'col': 5, 'tokenType': 'IDENT', 'value': 'bar'},
-          {'line': 1, 'col': 8, 'tokenType': 'WHITESPACE'},
-          {'line': 2, 'col': 0, 'tokenType': 'COMMA'},
-          {'line': 2, 'col': 1, 'tokenType': 'WHITESPACE'},
-          {'line': 2, 'col': 2, 'tokenType': 'IDENT', 'value': 'baz'},
-          {'line': 2, 'col': 5, 'tokenType': 'EOF_TOKEN'},
-        ],
-        tokens);
-    const tokenStream = new parse_css.TokenStream(tokens);
-    tokenStream.consume();
-    const selector = parse_css.parseASelectorsGroup(tokenStream);
-    assertJSONEquals(
-        {
-          'line': 1,
-          'col': 0,
-          'elements': [
-            {
-              'line': 1,
-              'col': 0,
-              'tokenType': 'SIMPLE_SELECTOR_SEQUENCE',
-              'otherSelectors': [],
-              'typeSelector': {
-                'line': 1,
-                'col': 0,
-                'elementName': 'foo',
-                'namespacePrefix': null,
-                'tokenType': 'TYPE_SELECTOR',
-              },
-            },
-            {
-              'line': 1,
-              'col': 5,
-              'tokenType': 'SIMPLE_SELECTOR_SEQUENCE',
-              'otherSelectors': [],
-              'typeSelector': {
-                'line': 1,
-                'col': 5,
-                'elementName': 'bar',
-                'namespacePrefix': null,
-                'tokenType': 'TYPE_SELECTOR',
-              },
-            },
-            {
-              'line': 2,
-              'col': 2,
-              'tokenType': 'SIMPLE_SELECTOR_SEQUENCE',
-              'otherSelectors': [],
-              'typeSelector': {
-                'line': 2,
-                'col': 2,
-                'elementName': 'baz',
-                'namespacePrefix': null,
-                'tokenType': 'TYPE_SELECTOR',
-              },
-            },
-          ],
-          'tokenType': 'SELECTORS_GROUP',
-        },
-        selector);
-  });
-
-  it('parses a selectors group with an attrib match', () => {
-    const tokens = parseSelectorForTest('a[href="http://www.w3.org/"]');
-    assertJSONEquals(
-        [
-          {'line': 1, 'col': 0, 'tokenType': 'IDENT', 'value': 'a'},
-          {'line': 1, 'col': 1, 'tokenType': 'OPEN_SQUARE'},
-          {'line': 1, 'col': 2, 'tokenType': 'IDENT', 'value': 'href'},
-          {'line': 1, 'col': 6, 'tokenType': 'DELIM', 'value': '='},
-          {
-            'line': 1,
-            'col': 7,
-            'tokenType': 'STRING',
-            'value': 'http://www.w3.org/',
-          },
-          {'line': 1, 'col': 27, 'tokenType': 'CLOSE_SQUARE'},
-          {'line': 1, 'col': 28, 'tokenType': 'EOF_TOKEN'},
-        ],
-        tokens);
-    const tokenStream = new parse_css.TokenStream(tokens);
-    tokenStream.consume();
-    const selector = parse_css.parseASelectorsGroup(tokenStream);
-    assertJSONEquals(
-        {
-          'line': 1,
-          'col': 0,
-          'tokenType': 'SIMPLE_SELECTOR_SEQUENCE',
-          'otherSelectors': [{
-            'line': 1,
-            'col': 1,
-            'tokenType': 'ATTR_SELECTOR',
-            'value': 'http://www.w3.org/',
-            'attrName': 'href',
-            'matchOperator': '=',
-            'namespacePrefix': null,
-          }],
-          'typeSelector': {
-            'line': 1,
-            'col': 0,
-            'elementName': 'a',
-            'namespacePrefix': null,
-            'tokenType': 'TYPE_SELECTOR',
-          },
-        },
-        selector);
-  });
-
-  it('parses a selectors group with more attrib matches', () => {
-    const tokens = parseSelectorForTest(
-        'elem[attr1="v1"][attr2=value2\n]' +
-        '[attr3~="foo"][attr4|="bar"][attr5|= "baz"][attr6 $=boo]' +
-        '[ attr7*=bang ][attr8]');
-    const tokenStream = new parse_css.TokenStream(tokens);
-    tokenStream.consume();
-    const selector = parse_css.parseASelectorsGroup(tokenStream);
-    assertJSONEquals(
-        {
-          'line': 1,
-          'col': 0,
-          'tokenType': 'SIMPLE_SELECTOR_SEQUENCE',
-          'otherSelectors': [
-            {
-              'line': 1,
-              'col': 4,
-              'tokenType': 'ATTR_SELECTOR',
-              'value': 'v1',
-              'attrName': 'attr1',
-              'matchOperator': '=',
-              'namespacePrefix': null,
-            },
-            {
-              'line': 1,
-              'col': 16,
-              'tokenType': 'ATTR_SELECTOR',
-              'value': 'value2',
-              'attrName': 'attr2',
-              'matchOperator': '=',
-              'namespacePrefix': null,
-            },
-            {
-              'line': 2,
-              'col': 1,
-              'tokenType': 'ATTR_SELECTOR',
-              'value': 'foo',
-              'attrName': 'attr3',
-              'matchOperator': '~=',
-              'namespacePrefix': null,
-            },
-            {
-              'line': 2,
-              'col': 15,
-              'tokenType': 'ATTR_SELECTOR',
-              'value': 'bar',
-              'attrName': 'attr4',
-              'matchOperator': '|=',
-              'namespacePrefix': null,
-            },
-            {
-              'line': 2,
-              'col': 29,
-              'tokenType': 'ATTR_SELECTOR',
-              'value': 'baz',
-              'attrName': 'attr5',
-              'matchOperator': '|=',
-              'namespacePrefix': null,
-            },
-            {
-              'line': 2,
-              'col': 44,
-              'tokenType': 'ATTR_SELECTOR',
-              'value': 'boo',
-              'attrName': 'attr6',
-              'matchOperator': '$=',
-              'namespacePrefix': null,
-            },
-            {
-              'line': 2,
-              'col': 57,
-              'tokenType': 'ATTR_SELECTOR',
-              'value': 'bang',
-              'attrName': 'attr7',
-              'matchOperator': '*=',
-              'namespacePrefix': null,
-            },
-            {
-              'line': 2,
-              'col': 72,
-              'tokenType': 'ATTR_SELECTOR',
-              'value': '',
-              'attrName': 'attr8',
-              'matchOperator': '',
-              'namespacePrefix': null,
-            },
-          ],
-          'typeSelector': {
-            'line': 1,
-            'col': 0,
-            'tokenType': 'TYPE_SELECTOR',
-            'elementName': 'elem',
-            'namespacePrefix': null,
-          },
-        },
-        selector);
-  });
-
-  it('parses a selectors group with a pseudo class', () => {
-    const tokens = parseSelectorForTest('a::b:lang(fr-be)');
-    assertJSONEquals(
-        [
-          {'line': 1, 'col': 0, 'tokenType': 'IDENT', 'value': 'a'},
-          {'line': 1, 'col': 1, 'tokenType': 'COLON'},
-          {'line': 1, 'col': 2, 'tokenType': 'COLON'},
-          {'line': 1, 'col': 3, 'tokenType': 'IDENT', 'value': 'b'},
-          {'line': 1, 'col': 4, 'tokenType': 'COLON'},
-          {'line': 1, 'col': 5, 'tokenType': 'FUNCTION_TOKEN', 'value': 'lang'},
-          {'line': 1, 'col': 10, 'tokenType': 'IDENT', 'value': 'fr-be'},
-          {'line': 1, 'col': 15, 'tokenType': 'CLOSE_PAREN'},
-          {'line': 1, 'col': 16, 'tokenType': 'EOF_TOKEN'},
-        ],
-        tokens);
-    const tokenStream = new parse_css.TokenStream(tokens);
-    tokenStream.consume();
-    const selector = parse_css.parseASelectorsGroup(tokenStream);
-    assertJSONEquals(
-        {
-          'line': 1,
-          'col': 0,
-          'tokenType': 'SIMPLE_SELECTOR_SEQUENCE',
-          'otherSelectors': [
-            {
-              'line': 1,
-              'col': 1,
-              'name': 'b',
-              'isClass': false,
-              'tokenType': 'PSEUDO_SELECTOR',
-            },
-            {
-              'line': 1,
-              'col': 4,
-              'name': 'lang',
-              'func': [
-                {
-                  'line': 1,
-                  'col': 5,
-                  'tokenType': 'FUNCTION_TOKEN',
-                  'value': 'lang',
-                },
-                {'line': 1, 'col': 10, 'tokenType': 'IDENT', 'value': 'fr-be'},
-                {'line': 1, 'col': 15, 'tokenType': 'EOF_TOKEN'},
-              ],
-              'isClass': true,
-              'tokenType': 'PSEUDO_SELECTOR',
-            },
-          ],
-          'typeSelector': {
-            'line': 1,
-            'col': 0,
-            'elementName': 'a',
-            'namespacePrefix': null,
-            'tokenType': 'TYPE_SELECTOR',
-          },
-        },
-        selector);
-  });
-
-  it('parses a selectors group with a negation', () => {
-    // This test records the status quo with respect to negation:
-    // We allow it, but don't currently parse the inside of it, we just
-    // mirror it over into the 'func' field of the pseudo selector.
-    const tokens = parseSelectorForTest('html|*:not(:link):not(:visited)');
-    const tokenStream = new parse_css.TokenStream(tokens);
-    tokenStream.consume();
-    const selector = parse_css.parseASelectorsGroup(tokenStream);
-    assertJSONEquals(
-        {
-          'line': 1,
-          'col': 0,
-          'tokenType': 'SIMPLE_SELECTOR_SEQUENCE',
-          'otherSelectors': [
-            {
-              'line': 1,
-              'col': 6,
-              'tokenType': 'PSEUDO_SELECTOR',
-              'name': 'not',
-              'func': [
-                {
-                  'line': 1,
-                  'col': 7,
-                  'tokenType': 'FUNCTION_TOKEN',
-                  'value': 'not',
-                },
-                {'line': 1, 'col': 11, 'tokenType': 'COLON'},
-                {'line': 1, 'col': 12, 'tokenType': 'IDENT', 'value': 'link'},
-                {'line': 1, 'col': 16, 'tokenType': 'EOF_TOKEN'},
-              ],
-              'isClass': true,
-            },
-            {
-              'line': 1,
-              'col': 17,
-              'tokenType': 'PSEUDO_SELECTOR',
-              'name': 'not',
-              'func': [
-                {
-                  'line': 1,
-                  'col': 18,
-                  'tokenType': 'FUNCTION_TOKEN',
-                  'value': 'not',
-                },
-                {'line': 1, 'col': 22, 'tokenType': 'COLON'},
-                {
-                  'line': 1,
-                  'col': 23,
-                  'tokenType': 'IDENT',
-                  'value': 'visited',
-                },
-                {'line': 1, 'col': 30, 'tokenType': 'EOF_TOKEN'},
-              ],
-              'isClass': true,
-            },
-          ],
-          'typeSelector': {
-            'line': 1,
-            'col': 0,
-            'tokenType': 'TYPE_SELECTOR',
-            'elementName': '*',
-            'namespacePrefix': 'html',
-          },
-        },
-        selector);
-  });
-
-  it('reports error for unparsed remainder of input', () => {
-    const tokens = parseSelectorForTest('foo bar 9');
-    const tokenStream = new parse_css.TokenStream(tokens);
-    tokenStream.consume();
-    const selector = parse_css.parseASelectorsGroup(tokenStream);
-    assertJSONEquals(
-        {
-          'code': 'CSS_SYNTAX_UNPARSED_INPUT_REMAINS_IN_SELECTOR',
-          'col': 8,
-          'line': 1,
-          'params': ['style'],
-          'tokenType': 'ERROR',
-        },
-        selector);
-  });
-
-  it('records one selector parsing error', () => {
-    const css = '/*error*/ {}';
-    const errors = [];
-    const tokenlist = tokenize_css.tokenize(css, 1, 0, errors);
-    const sheet = parse_css.parseAStylesheet(
-        tokenlist, ampAtRuleParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-        errors);
-    assertStrictEqual(0, errors.length);
-    const visitor = new parse_css.SelectorVisitor(errors);
-    sheet.accept(visitor);
-    assertStrictEqual(1, errors.length);
-  });
-
-  it('implements visitor pattern', () => {
-    class CollectCombinatorNodes extends parse_css.SelectorVisitor {
-      constructor() {
-        super(/*errors*/[]);
-        /**
-         * @type {!Array<!parse_css.Combinator>}
-         */
-        this.combinatorNodes = [];
-      }
-
-      /**
-       * @param {!parse_css.Combinator} combinator
-       * @override
-       */
-      visitCombinator(combinator) {
-        this.combinatorNodes.push(combinator);
-      }
-    }
-
-    const css = 'a > b c + d ~ e {}';
-    const errors = [];
-    const tokenlist = tokenize_css.tokenize(css, 1, 0, errors);
-    const sheet = parse_css.parseAStylesheet(
-        tokenlist, ampAtRuleParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-        errors);
-    const visitor = new CollectCombinatorNodes();
-    sheet.accept(visitor);
-    assertStrictEqual(0, errors.length);
-    assertStrictEqual(4, visitor.combinatorNodes.length);
-    assertStrictEqual(
-        'GENERAL_SIBLING', visitor.combinatorNodes[0].combinatorType);
-    assertStrictEqual(1, visitor.combinatorNodes[0].line);
-    assertStrictEqual(12, visitor.combinatorNodes[0].col);
-
-    // The combinator #2 is the (in)famous whitespace operator.
-    assertJSONEquals(
-        {
-          'line': 1,
-          'col': 5,
-          'combinatorType': 'DESCENDANT',
-          'left': {
-            'line': 1,
-            'col': 2,
-            'combinatorType': 'CHILD',
-            'left': {
-              'line': 1,
-              'col': 0,
-              'tokenType': 'SIMPLE_SELECTOR_SEQUENCE',
-              'otherSelectors': [],
-              'typeSelector': {
-                'line': 1,
-                'col': 0,
-                'elementName': 'a',
-                'namespacePrefix': null,
-                'tokenType': 'TYPE_SELECTOR',
-              },
-            },
-            'tokenType': 'COMBINATOR',
-            'right': {
-              'line': 1,
-              'col': 4,
-              'tokenType': 'SIMPLE_SELECTOR_SEQUENCE',
-              'otherSelectors': [],
-              'typeSelector': {
-                'line': 1,
-                'col': 4,
-                'elementName': 'b',
-                'namespacePrefix': null,
-                'tokenType': 'TYPE_SELECTOR',
-              },
-            },
-          },
-          'tokenType': 'COMBINATOR',
-          'right': {
-            'line': 1,
-            'col': 6,
-            'tokenType': 'SIMPLE_SELECTOR_SEQUENCE',
-            'otherSelectors': [],
-            'typeSelector': {
-              'line': 1,
-              'col': 6,
-              'elementName': 'c',
-              'namespacePrefix': null,
-              'tokenType': 'TYPE_SELECTOR',
-            },
-          },
-        },
-        visitor.combinatorNodes[2]);
-  });
-});
-
-/**
- * @param {string} selector
- * @return {!Array<!tokenize_css.Token>}
- */
-function parseSelectorForTest(selector) {
-  const css = selector + '{}';
-  const errors = [];
-  const tokenlist = tokenize_css.tokenize(css, 1, 0, errors);
-  const sheet = parse_css.parseAStylesheet(
-      tokenlist, ampAtRuleParsingSpec, parse_css.BlockType.PARSE_AS_IGNORE,
-      errors);
-  return asserts.assertInstanceof(sheet.rules[0], parse_css.QualifiedRule)
-      .prelude;
-}
diff --git a/validator/js/engine/parse-srcset.js b/validator/js/engine/parse-srcset.js
deleted file mode 100644
index d11cece1c384..000000000000
--- a/validator/js/engine/parse-srcset.js
+++ /dev/null
@@ -1,135 +0,0 @@
-goog.module('parse_srcset');
-const Set = goog.require('goog.structs.Set');
-const {ValidationError} = goog.require('amp.validator.protogenerated');
-
-/**
- * A single source within a srcset.
- * @typedef {{
- *   url: string,
- *   widthOrPixelDensity: string
- * }}
- */
-const SrcsetSourceDef = function() {};
-exports.SrcsetSourceDef = SrcsetSourceDef;
-
-/**
- * Return value for parseSrcset.
- * @constructor @struct
- */
-const SrcsetParsingResult = function() {
-  /** @type {boolean} */
-  this.success = false;
-  /** @type {!ValidationError.Code} */
-  this.errorCode = ValidationError.Code.UNKNOWN_CODE;
-  /** @type {!Array<!SrcsetSourceDef>} */
-  this.srcsetImages = [];
-};
-exports.SrcsetParsingResult = SrcsetParsingResult;
-
-/**
- * Parses the text representation of srcset into array of SrcsetSourceDef.
- * See https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img#Attributes.
- * See
- * http://www.w3.org/html/wg/drafts/html/master/semantics.html#attr-img-srcset.
- *
- * If parsing fails, returns false in SrcsetParsingResult.status.
- *
- * @param {string} srcset
- * @return {!SrcsetParsingResult}
- */
-const parseSrcset = function(srcset) {
-  // Regex for leading spaces, followed by an optional comma and whitespace,
-  // followed by an URL*, followed by an optional space, followed by an
-  // optional width or pixel density**, followed by spaces, followed by an
-  // optional comma and whitespace.
-  //
-  // URL*: matches non-space, non-empty string which neither ends nor begins
-  // with a comma. The set of space characters in the srcset attribute is
-  // defined to include only ascii characters, so using \s, which is an
-  // ascii only character set, is fine. See
-  // https://html.spec.whatwg.org/multipage/infrastructure.html#space-character.
-  //
-  // Optional width or pixel density**: Matches the empty string or (one or
-  // more spaces + a non empty string containing no space or commas).
-  // Doesn't capture the initial space.
-  //
-  // \s*                       Match, but don't capture leading spaces.
-  // (?:,\s*)?                 Optionally match comma and trailing space,
-  //                           but don't capture comma.
-  // ([^,\s]\S*[^,\s])         Match something like "google.com/favicon.ico"
-  //                           but not ",google.com/favicon.ico,".
-  // \s*                       Match, but dont capture spaces.
-  // (                         Match the width or density descriptor...
-  //   [1-9]\d*[wx]            which is a non-zero integer followed by a w
-  //                           or an x ...
-  //   |                       or ...
-  //   [1-9]\d*\.\d+x          a decimal with its whole-number part greater
-  //                           than zero and followed by an x ...
-  //   |                       or ...
-  //   0\.\d*[1-9]\d*x         a decimal with its fractional part greater
-  //                           than zero and followed by an x ...
-  // )?                        and make it optional.
-  // \s*                       Match, but don't capture space.
-  // (?:(,)\s*)?               Optionally match comma and trailing space,
-  //                           capturing comma.
-  const imageCandidateRegex = new RegExp(
-      '\\s*' +
-          '(?:,\\s*)?' +
-          '([^,\\s]\\S*[^,\\s])' +
-          '\\s*' +
-          '(' +
-              '[1-9]\\d*[wx]' +
-              '|' +
-              '[1-9]\\d*\\.\\d+x' +
-              '|' +
-              '0\\.\\d*[1-9]\\d*x' +
-          ')?' +
-          '\\s*' +
-          '(?:(,)\\s*)?',
-      'g');
-  let remainingSrcset = srcset;
-  /** @type {!Set<string>} */
-  const seenWidthOrPixelDensity = new Set();
-  /** @type {!SrcsetParsingResult} */
-  const result = new SrcsetParsingResult();
-  const {srcsetImages} = result;
-  let source;
-  while (source = imageCandidateRegex.exec(srcset)) {
-    const url = source[1];
-    let widthOrPixelDensity = source[2];
-    const comma = source[3];
-    if (widthOrPixelDensity === undefined) {
-      widthOrPixelDensity = '1x';
-    }
-    // Duplicate width or pixel density in srcset.
-    if (seenWidthOrPixelDensity.contains(widthOrPixelDensity)) {
-      result.errorCode = ValidationError.Code.DUPLICATE_DIMENSION;
-      return result;
-    }
-    seenWidthOrPixelDensity.add(widthOrPixelDensity);
-    srcsetImages.push({url, widthOrPixelDensity});
-    remainingSrcset = srcset.substr(imageCandidateRegex.lastIndex);
-    // If no more srcset, break.
-    if (srcset.length <= imageCandidateRegex.lastIndex) {
-      break;
-    }
-    // More srcset, comma expected as separator for image candidates.
-    if (comma === undefined) {
-      result.errorCode = ValidationError.Code.INVALID_ATTR_VALUE;
-      return result;
-    }
-  }
-  // Regex didn't consume all of the srcset string
-  if (remainingSrcset !== '') {
-    result.errorCode = ValidationError.Code.INVALID_ATTR_VALUE;
-    return result;
-  }
-  // Must have at least one image candidate.
-  if (srcsetImages.length === 0) {
-    result.errorCode = ValidationError.Code.INVALID_ATTR_VALUE;
-    return result;
-  }
-  result.success = true;
-  return result;
-};
-exports.parseSrcset = parseSrcset;
diff --git a/validator/js/engine/parse-srcset_test.js b/validator/js/engine/parse-srcset_test.js
deleted file mode 100644
index 7c975b202d73..000000000000
--- a/validator/js/engine/parse-srcset_test.js
+++ /dev/null
@@ -1,293 +0,0 @@
-/**
- *  Credits:
- *    Original version of this file was derived from
- *    https://github.com/ampproject/amphtml/blob/main/test/unit/test-srcset.js
- */
-goog.module('parse_srcset.ParseSrcsetTest');
-
-const parse_srcset = goog.require('parse_srcset');
-
-/**
- * A strict comparison between two values.
- * Note: Unfortunately assert.strictEqual has some drawbacks, including that
- * it truncates the provided arguments (and it's not configurable) and
- * with the Closure compiler, it requires a message argument to which
- * we'd always have to pass undefined. Too messy, so we roll our own.
- * @param {T} expected
- * @param {T} saw
- * @template T
- */
-function assertStrictEqual(expected, saw) {
-  assert.ok(expected === saw, 'expected: ' + expected + ' saw: ' + saw);
-}
-
-/**
- * Test parseSrcset and assert results are as expected.
- * @param {string} s
- * @param {!Array<!parse_srcset.SrcsetSourceDef>} expected
- */
-function test(s, expected) {
-  const result = parse_srcset.parseSrcset(s);
-  assertStrictEqual(result.srcsetImages.length, expected.length);
-  for (let i = 0; i < expected.length; i++) {
-    const r = result.srcsetImages[i];
-    const e = expected[i];
-    assertStrictEqual(r.url, e.url);
-    assertStrictEqual(r.widthOrPixelDensity, e.widthOrPixelDensity);
-  }
-  expect(result.success).toBe(true);
-}
-
-describe('Srcset parseSrcset', () => {
-  it('should accept single source', () => {
-    test('image', [
-      {url: 'image', widthOrPixelDensity: '1x'},
-    ]);
-  });
-
-  it('should accept single source with width/pixel-density', () => {
-    test('image 100w', [
-      {url: 'image', widthOrPixelDensity: '100w'},
-    ]);
-    test('image 2x', [
-      {url: 'image', widthOrPixelDensity: '2x'},
-    ]);
-  });
-
-  it('should accept whitespace around url', () => {
-    test(' \t\n image \n\t\t ', [
-      {url: 'image', widthOrPixelDensity: '1x'},
-    ]);
-  });
-
-  it('should ignore empty source', () => {
-    test(' \n image \n, ', [
-      {url: 'image', widthOrPixelDensity: '1x'},
-    ]);
-    test(' , \n image \n, ', [
-      {url: 'image', widthOrPixelDensity: '1x'},
-    ]);
-  });
-
-  it('should accept multiple sources', () => {
-    test('image1 2x, image2, image3 3x, image4 4x', [
-      {url: 'image1', widthOrPixelDensity: '2x'},
-      {url: 'image2', widthOrPixelDensity: '1x'},
-      {url: 'image3', widthOrPixelDensity: '3x'},
-      {url: 'image4', widthOrPixelDensity: '4x'},
-    ]);
-    test(' \n image 2x \n\t, image2 \n ', [
-      {url: 'image', widthOrPixelDensity: '2x'},
-      {url: 'image2', widthOrPixelDensity: '1x'},
-    ]);
-  });
-
-  it('should not accept multiple sources with duplicate width', () => {
-    const result = parse_srcset.parseSrcset(
-        'image1 10w, image2 100w, image3 1000w, image4 10w');
-
-    expect(result.success).toBe(false);
-  });
-
-  it('should accept width-based sources', () => {
-    test(' \n image-100 100w\n, image 10w', [
-      {url: 'image-100', widthOrPixelDensity: '100w'},
-      {url: 'image', widthOrPixelDensity: '10w'},
-    ]);
-  });
-
-  it('should accept dpr-based sources', () => {
-    test(' \n image-x1.5 1.5x\n , image', [
-      {url: 'image-x1.5', widthOrPixelDensity: '1.5x'},
-      {url: 'image', widthOrPixelDensity: '1x'},
-    ]);
-  });
-
-  it('should accept commas in URLs', () => {
-    test(' \n image,1 100w\n , \n image,2 50w \n', [
-      {url: 'image,1', widthOrPixelDensity: '100w'},
-      {url: 'image,2', widthOrPixelDensity: '50w'},
-    ]);
-    test(' \n image,100w 100w\n , \n image,20w 50w \n', [
-      {url: 'image,100w', widthOrPixelDensity: '100w'},
-      {url: 'image,20w', widthOrPixelDensity: '50w'},
-    ]);
-    test(' \n image,2 2x\n , \n image,1', [
-      {url: 'image,2', widthOrPixelDensity: '2x'},
-      {url: 'image,1', widthOrPixelDensity: '1x'},
-    ]);
-    test(' \n image,2x 2x\n , \n image,1x', [
-      {url: 'image,2x', widthOrPixelDensity: '2x'},
-      {url: 'image,1x', widthOrPixelDensity: '1x'},
-    ]);
-    test(' \n image,2 , \n  image,1 2x\n', [
-      {url: 'image,2', widthOrPixelDensity: '1x'},
-      {url: 'image,1', widthOrPixelDensity: '2x'},
-    ]);
-    test(' \n image,1x , \n  image,2x 2x\n', [
-      {url: 'image,1x', widthOrPixelDensity: '1x'},
-      {url: 'image,2x', widthOrPixelDensity: '2x'},
-    ]);
-    test(' \n image,1 \n ', [
-      {url: 'image,1', widthOrPixelDensity: '1x'},
-    ]);
-    test(' \n image,1x \n ', [
-      {url: 'image,1x', widthOrPixelDensity: '1x'},
-    ]);
-  });
-
-  it('should accept leading and trailing commas and commas in url', () => {
-    // Leading and trailing commas are OK, as are commas in side URLs.
-    // This example only looks a little strange because the ParseSourceSet
-    // function does not further validate the URL.
-    test(',image1,100w,image2,50w,', [
-      {url: 'image1,100w,image2,50w', widthOrPixelDensity: '1x'},
-    ]);
-
-    // This is a more typical-looking example, with leading and trailing commas.
-    test(',example.com/,/,/,/,50w,', [
-      {url: 'example.com/,/,/,/,50w', widthOrPixelDensity: '1x'},
-    ]);
-  });
-
-  it('should accept no-whitespace', () => {
-    test('image 100w,image 50w', [
-      {url: 'image', widthOrPixelDensity: '100w'},
-      {url: 'image', widthOrPixelDensity: '50w'},
-    ]);
-    test('image,1 100w,image,2 50w', [
-      {url: 'image,1', widthOrPixelDensity: '100w'},
-      {url: 'image,2', widthOrPixelDensity: '50w'},
-    ]);
-    test('image,1 2x,image,2', [
-      {url: 'image,1', widthOrPixelDensity: '2x'},
-      {url: 'image,2', widthOrPixelDensity: '1x'},
-    ]);
-    test('image,2 2x', [
-      {url: 'image,2', widthOrPixelDensity: '2x'},
-    ]);
-    test('image,1', [
-      {url: 'image,1', widthOrPixelDensity: '1x'},
-    ]);
-  });
-
-  it('should accept other special chars in URLs', () => {
-    test(' \n http://im-a+ge;1?&2#3 100w\n , \n image;2 50w \n', [
-      {url: 'http://im-a+ge;1?&2#3', widthOrPixelDensity: '100w'},
-      {url: 'image;2', widthOrPixelDensity: '50w'},
-    ]);
-  });
-
-  it('should accept false cognitives in URLs', () => {
-    test(' \n image,100w 100w\n , \n image,20x 50w \n', [
-      {url: 'image,100w', widthOrPixelDensity: '100w'},
-      {url: 'image,20x', widthOrPixelDensity: '50w'},
-    ]);
-    test(' \n image,1x 2x\n , \n image,2x', [
-      {url: 'image,1x', widthOrPixelDensity: '2x'},
-      {url: 'image,2x', widthOrPixelDensity: '1x'},
-    ]);
-    test(' \n image,1x \n ', [
-      {url: 'image,1x', widthOrPixelDensity: '1x'},
-    ]);
-    test(' \n image,1w \n ', [
-      {url: 'image,1w', widthOrPixelDensity: '1x'},
-    ]);
-  });
-
-  it('should parse misc examples', () => {
-    test('image-1x.png 1x, image-2x.png 2x, image-3x.png 3x, image-4x.png 4x', [
-      {url: 'image-1x.png', widthOrPixelDensity: '1x'},
-      {url: 'image-2x.png', widthOrPixelDensity: '2x'},
-      {url: 'image-3x.png', widthOrPixelDensity: '3x'},
-      {url: 'image-4x.png', widthOrPixelDensity: '4x'},
-    ]);
-    test('image,one.png', [
-      {url: 'image,one.png', widthOrPixelDensity: '1x'},
-    ]);
-  });
-
-  it('should reject urls with spaces', () => {
-    let result = parse_srcset.parseSrcset('image 1x png 1x');
-
-    expect(result.success).toBe(false);
-    result = parse_srcset.parseSrcset('image 1x png 1x, image-2x.png 2x');
-
-    expect(result.success).toBe(false);
-  });
-
-  it('should reject width or pixel density with negatives', () => {
-    let result = parse_srcset.parseSrcset('image.png -1x');
-
-    expect(result.success).toBe(false);
-    result = parse_srcset.parseSrcset('image.png 1x, image2.png -2x');
-
-    expect(result.success).toBe(false);
-    result = parse_srcset.parseSrcset('image.png -480w');
-
-    expect(result.success).toBe(false);
-    result = parse_srcset.parseSrcset('image.png 1x, image2.png -100w');
-
-    expect(result.success).toBe(false);
-  });
-
-  it('should reject width or pixel density that are zero', () => {
-    let result = parse_srcset.parseSrcset('image.png 0x');
-
-    expect(result.success).toBe(false);
-    result = parse_srcset.parseSrcset('image.png 1x, image2.png 0.0x');
-
-    expect(result.success).toBe(false);
-    result = parse_srcset.parseSrcset('image.png 0w');
-
-    expect(result.success).toBe(false);
-    result = parse_srcset.parseSrcset('image.png 1x, image2.png 000w');
-
-    expect(result.success).toBe(false);
-  });
-
-  it('should reject empty srcsets', () => {
-    let result = parse_srcset.parseSrcset('');
-
-    expect(result.success).toBe(false);
-    result = parse_srcset.parseSrcset(' \n\t\f\r');
-
-    expect(result.success).toBe(false);
-  });
-
-  it('should reject invalid text after valid srcsets', () => {
-    const result = parse_srcset.parseSrcset('image1, image2, ,,,');
-
-    expect(result.success).toBe(false);
-  });
-
-  it('should reject no comma between sources', () => {
-    const result = parse_srcset.parseSrcset('image1 100w image2 50w');
-
-    expect(result.success).toBe(false);
-  });
-
-  it('should reject decimal values for widths', () => {
-    let result = parse_srcset.parseSrcset('image.png 500.0w');
-
-    expect(result.success).toBe(false);
-    result = parse_srcset.parseSrcset('image.png 1.5w');
-
-    expect(result.success).toBe(false);
-    result = parse_srcset.parseSrcset('image.png 0.1w');
-
-    expect(result.success).toBe(false);
-  });
-
-  it('should reject pixel values or other invalid dimensions', () => {
-    let result = parse_srcset.parseSrcset('image.png 500px');
-
-    expect(result.success).toBe(false);
-    result = parse_srcset.parseSrcset('image.png 2 x');
-
-    expect(result.success).toBe(false);
-    result = parse_srcset.parseSrcset('image.png 1kw');
-
-    expect(result.success).toBe(false);
-  });
-});
diff --git a/validator/js/engine/parse-url.js b/validator/js/engine/parse-url.js
deleted file mode 100644
index 7c8ad060939b..000000000000
--- a/validator/js/engine/parse-url.js
+++ /dev/null
@@ -1,412 +0,0 @@
-goog.module('parse_url');
-const googString = goog.require('goog.string');
-
-/**
- * @param {number} code
- * @return {boolean}
- */
-function alphaNum(code) {
-  return (
-      (code >= /* '0' */ 0x30 && code <= /* '9' */ 0x39) ||
-      (code >= /* 'a' */ 0x61 && code <= /* 'z' */ 0x7a) ||
-      (code >= /* 'A' */ 0x41 && code <= /* 'Z' */ 0x5a));
-}
-
-/**
- * @param {number} code
- * @return {boolean}
- */
-function protocolCharIsValid(code) {
-  return (alphaNum(code) || code === /* '+' */ 0x2B || code === /* '-' */ 0x2D);
-}
-
-/**
- * @param {string} maybeInt
- * @return {boolean}
- */
-function isPositiveInteger(maybeInt) {
-  const re = /^[0-9]*$/g;
-  return re.test(maybeInt);
-}
-
-/**
- * @param {number} code
- * @return {boolean}
- */
-function hostCharIsEnd(code) {
-  return (
-      code === /* '#' */ 0x23 || code === /* '/' */ 0x2F ||
-      code === /* '?' */ 0x3F || code === /* '\' */ 0x5C || isNaN(code));
-}
-
-/**
- * Determines if a character code is valid when found in a hostname.
- * Note that the hostname should first be percent-unescaped to get
- * correct results.
- * @param {number} code
- * @return {boolean}
- */
-function hostCharIsValid(code) {
-  return (
-      !isNaN(code) && code > /* unprintable */ 0x1F &&
-      code !== /* ' ' */ 0x20 && code !== /* '!' */ 0x21 &&
-      code !== /* '"' */ 0x22 && code !== /* '#' */ 0x23 &&
-      code !== /* '$' */ 0x24 && code !== /* '%' */ 0x25 &&
-      code !== /* '&' */ 0x26 && code !== /* ''' */ 0x27 &&
-      code !== /* '(' */ 0x28 && code !== /* ')' */ 0x29 &&
-      code !== /* '*' */ 0x2A && code !== /* '+' */ 0x2B &&
-      code !== /* ',' */ 0x2C && code !== /* '/' */ 0x2F &&
-      code !== /* ':' */ 0x3A && code !== /* ';' */ 0x3B &&
-      code !== /* '<' */ 0x3C && code !== /* '=' */ 0x3D &&
-      code !== /* '>' */ 0x3E && code !== /* '?' */ 0x3F &&
-      code !== /* '@' */ 0x3A && code !== /* '[' */ 0x5B &&
-      code !== /* '\' */ 0x5C && code !== /* ']' */ 0x5D &&
-      code !== /* '^' */ 0x5E && code !== /* '`' */ 0x60 &&
-      code !== /* '{' */ 0x7B && code !== /* '|' */ 0x7C &&
-      code !== /* '}' */ 0x7D && code !== /* '~' */ 0x7E &&
-      code !== /*     */ 0x7B);
-}
-
-/**
- * Check if a host might be an IPv6 literal. See man page for INET_PTON(3)
- * @param {string} host
- * @return {boolean}
- */
-function hostIsIPv6Literal(host) {
-  // 16-bit hexadecimal number, where leading zeroes can be discarded.
-  const hexRe = /^[0-9A-Fa-f]{1,4}$/;
-  // IPv4 address
-  const ipv4Re = /^([0-9]{1,3}\.){3}[0-9]{1,3}$/;
-  let hasEmpty = false;
-  const parts = host.split(':');
-  let numParts = parts.length;
-  for (let i = 0; i < parts.length; ++i) {
-    const part = parts[i];
-
-    // Look for empty parts, caused abbreviating contiguous zero values with
-    // '::' syntax.
-    if (part === '') {
-      // There can be exactly one empty 'part'
-      if (hasEmpty) {
-        return false;
-      }
-      hasEmpty = true;
-      // Leading and trailing empty parts are written as '::' resulting in
-      // host.split returning two empty parts. We skip these in this case.
-      // We must use two conditions to cover the case of host being exactly
-      // '::'.
-      if (i === 0) {
-        ++i;
-        --numParts;
-      }
-      if (i === parts.length - 2) {
-        ++i;
-        --numParts;
-      }
-    }
-    // Typically we expect a 16-bit hexadecimal number for each part.
-    else if (hexRe.test(part)) {
-    }
-    // Or, if the last 'part', we can allow a IPv4 address:
-    else if (i === parts.length - 1 && ipv4Re.test(part)) {
-      // An IPv4 address counts for 2 parts.
-      ++numParts;
-    } else {
-      return false;
-    }
-  }
-
-  // There should be 8 parts, with an empty part possibly counting as more than
-  // one.
-  if (numParts > 8) {
-    return false;
-  }
-  if (numParts < 8 && !hasEmpty) {
-    return false;
-  }
-  return true;
-}
-
-const URL = class {
-  /**
-   * @param {string} url
-   */
-  constructor(url) {
-    // If isValid === false, no guarantees are made regarding the other
-    // fields in this URL object. Some may be 'correct', depending on the
-    // point in the parsing that a validity issue was discovered.
-    /** @type {boolean} */
-    this.isValid = true;
-    /** @type {boolean} */
-    this.hasProtocol = false;
-    /** @type {string} */
-    this.protocol = '';  // Guaranteed to be lower case.
-    /** @type {string} */
-    this.defaultProtocol = 'https';  // Must be set to a lower case value.
-    /** @type {boolean} */
-    this./*OK*/ startsWithDoubleSlash = false;
-    // The hostname will be hex-unescaped and isValid will be set to false if
-    // the resulting string is not UTF-8 valid, but the hostname will not be
-    // encoded to punycode for non-ascii hostnames. Browsers can do this for
-    // us and implementing the encoding in javascript would be slow. Similarly,
-    // we do not normalize unusual (hex, octal, etc) IPv4 address formats,
-    // though we do accept them.
-    /** @type {string} */
-    this.host = '';
-    /** @type {number} */
-    this.port = -1;
-
-    // This parser doesn't bother with parsing anything after the authority
-    // section of the URL string. IE, it doesn't parse path, query, or fragment.
-    // This is because the AMP validator has no need for parsing these and they
-    // cannot make an URL invalid in any way.
-    this.unparsed_url = '';
-
-    // Note that we don't parse out username/password from this string, nor
-    // are we bothering with correctly unescaping everything we find in here.
-    // If examining the login string more closely becomes an issue, more
-    // parsing is necessary.
-    /** @type {string} */
-    this.login = '';
-
-    this.parseUrl_(url);
-  }
-
-  /**
-   * @param {string} unparsed
-   * @private
-   */
-  parseUrl_(unparsed) {
-    // Strip whitespace from both sides of the URL.
-    unparsed = unparsed.trim();
-
-    // Browsers remove Tab/CR/LF from the entire URL, so we do too.
-    unparsed = unparsed.replace(/[\t\r\n]/g, '');
-
-    unparsed = this.parseProtocol_(unparsed);
-
-    // If '//' is present as a prefix (after parsing protocol if any), then
-    // we need to parse the authority section (username:password@hostname:port)
-    if (googString./*OK*/ startsWith(unparsed, '//')) {
-      if (this.protocol === '') {
-        this./*OK*/ startsWithDoubleSlash = true;
-      }
-      unparsed = unparsed.substr(2);
-      unparsed = this.parseAuthority_(unparsed);
-    }
-
-    this.unparsed_url = unparsed;
-  }
-
-  /**
-   * @param {string} unparsed
-   * @return {string} Returns the suffix of URL not including the protocol or
-   *                  separating ':' character. ex: '//example.com/'.
-   * @private
-   */
-  parseProtocol_(unparsed) {
-    // Fast paths for the most common cases
-    if (googString./*OK*/ startsWith(unparsed, 'https:')) {
-      this.hasProtocol = true;
-      this.protocol = 'https';
-      return unparsed.substr(6);  // skip over 'https:' prefix
-    }
-    if (googString./*OK*/ startsWith(unparsed, 'http:')) {
-      this.hasProtocol = true;
-      this.protocol = 'http';
-      return unparsed.substr(5);  // skip over 'http:' prefix
-    }
-
-    const colon = unparsed.indexOf(':');
-    if (colon === -1) {
-      this.hasProtocol = false;
-      this.protocol = this.defaultProtocol;
-      return unparsed;
-    }
-
-    for (let ii = 0; ii < colon; ++ii) {
-      const charCode = unparsed.charCodeAt(ii);
-      if (!protocolCharIsValid(charCode)) {
-        this.hasProtocol = false;
-        this.protocol = this.defaultProtocol;
-        return unparsed;
-      }
-    }
-    // ex: split 'foo:bar' into 'foo' and 'bar'.
-    this.hasProtocol = true;
-    this.protocol = unparsed.substr(0, colon).toLowerCase();
-    unparsed = unparsed.substr(colon + 1);
-
-    if (this.protocol != 'http' && this.protocol != 'https' &&
-        this.protocol != 'ftp' && this.protocol != 'sftp') {
-      unparsed = '';
-    }
-    return unparsed;
-  }
-
-  /**
-   * @param {string} host
-   * @return {string}
-   * @private
-   */
-  unescapeAndCheckHost_(host) {
-    let unescapedHost = '';
-    try {
-      unescapedHost = decodeURIComponent(host);
-    } catch (e) {
-      // Indicates that host had escaped multibyte characters which
-      // when unescaped were not UTF-8 valid.
-      this.isValid = false;
-      return host;
-    }
-
-    for (let ii = 0; ii < unescapedHost.length; ++ii) {
-      const charCode = unescapedHost.charCodeAt(ii);
-      if (!hostCharIsValid(charCode)) {
-        this.isValid = false;
-      }
-    }
-    return unescapedHost;
-  }
-
-  /**
-   * @param {string} host
-   * @return {string}
-   * @private
-   */
-  processHostDots_(host) {
-    if (googString./*OK*/ startsWith(host, '.') || host.indexOf('..') !== -1) {
-      this.isValid = false;
-    } else if (host.substr(-1) === '.') {  // strip trailing '.'.
-      host = host.substr(0, host.length - 1);
-    }
-    return host;
-  }
-
-  /**
-   * @param {string} unparsed
-   * @return {string} Returns the suffix of the URL not including the authority
-   *                  section (host, port, user, password).
-   * @private
-   */
-  parseAuthority_(unparsed) {
-    let idx = 0;
-
-    // See if this could be an IPv6 address literal. If so, we skip colons
-    // until we see a matching ']'.
-    let skipColons = false;
-    if (unparsed !== '' && unparsed.charCodeAt(0) === /* '[' */ 0x5B) {
-      skipColons = true;
-      idx++;  // skip over the '['
-    }
-
-    // look for '@' and ':', e.g. user:password@example.com:1234
-    // and for '[' and ']', e.g. [2001:0db8:85a3]
-    let atIdx = -1;
-    let portIdx = -1;
-    let passwordIdx = -1;
-    let charCode = unparsed.charCodeAt(idx);
-    for (; !hostCharIsEnd(charCode); charCode = unparsed.charCodeAt(++idx)) {
-      switch (charCode) {
-        case /* '@' */ 0x40:
-          atIdx = idx;  // save the last occurrence of '@'
-          passwordIdx = portIdx;
-          portIdx = -1;  // we have a login, so reset the port
-
-          // Any [ before here must have been junk, or part of the password
-          // so we reset.
-          if (unparsed.charCodeAt(idx + 1) === /* '[' */ 0x5B) {
-            skipColons = true;
-            idx++;
-          } else {
-            skipColons = false;
-          }
-          break;
-        case /* ':' */ 0x3A:
-          if ((portIdx === -1) && !skipColons) {
-            portIdx = idx + 1;  // might be password; save as port anyway
-          }
-          break;
-        case /* '[' */ 0x5B:
-          // Start brackets can only either come at the start of where we
-          // expect a host name (right after the protocol://, or right after @),
-          // so this is either junk or part of the password.
-          // In any case, this is not an IPv6 literal.
-          skipColons = false;
-          break;
-        case /* ']' */ 0x5D:
-          // End bracket; stop skipping colons. Note that this allows multiple
-          // [] groups, but the URL is broken anyway, so it doesn't matter much
-          // if we split it "wrong".
-          skipColons = false;
-          break;
-      }
-    }
-
-    // Extract the login string if one was found.
-    if (atIdx !== -1) {
-      let loginLength = atIdx;
-      if (passwordIdx !== -1 && passwordIdx === atIdx) {
-        loginLength--;
-      }
-      this.login = unparsed.substr(0, loginLength);
-    }
-
-    // Extract the hostname.
-    let hostBeginIdx = (atIdx !== -1 ? atIdx + 1 : 0);
-    let hostEndIdx = (portIdx !== -1 ? portIdx - 1 : idx);
-
-    // Special case: If the host is something that looks like a valid IPv6
-    // address, with a [] at both ends, remove the [].
-    let isIPv6Literal = false;
-    if (unparsed.charCodeAt(hostBeginIdx) === /* '[' */ 0x5B &&
-        unparsed.charCodeAt(hostEndIdx - 1) === /* ']' */ 0x5D &&
-        hostBeginIdx != hostEndIdx) {
-      isIPv6Literal = hostIsIPv6Literal(
-          unparsed.substr(hostBeginIdx + 1, hostEndIdx - hostBeginIdx - 2));
-      if (isIPv6Literal) {
-        ++hostBeginIdx;
-        --hostEndIdx;
-      } else {
-        this.isValid = false;
-        return '';
-      }
-    }
-    let host = unparsed.substr(hostBeginIdx, hostEndIdx - hostBeginIdx);
-    if (!isIPv6Literal) {
-      host = this.unescapeAndCheckHost_(host);
-    }
-    this.host = this.processHostDots_(host);
-    if (this.host === '') {
-      this.isValid = false;
-    }
-
-    // Extract the port, if present.
-    if (portIdx !== -1) {
-      const portStr = unparsed.substr(portIdx, idx - portIdx);
-      if (portStr === '') {
-        this.port = 0;
-      } else if (isPositiveInteger(portStr)) {
-        this.port = parseInt(portStr, 10);
-      } else {
-        this.isValid = false;
-        return '';
-      }
-
-      if (this.port > 65535) {
-        this.isValid = false;
-        return '';
-      }
-
-      // 0 indicates a default port.
-      if (this.port === 0) {
-        this.port =
-            {'http': 80, 'https': 443, 'ftp': 21, 'sftp': 22}[this.protocol];
-      }
-    }
-
-    unparsed = unparsed.substr(idx + 1);
-    return unparsed;
-  }
-};
-exports.URL = URL;
diff --git a/validator/js/engine/parse-url_test.js b/validator/js/engine/parse-url_test.js
deleted file mode 100644
index 72f6a5b72920..000000000000
--- a/validator/js/engine/parse-url_test.js
+++ /dev/null
@@ -1,281 +0,0 @@
-goog.module('parse_url.ParseURLTest');
-
-const parse_url = goog.require('parse_url');
-
-/**
- * A strict comparison between two values that does not truncate the
- * error messages and works well with the closure compiler.
- * @param {*} expected
- * @param {*} saw
- */
-function assertStrictEqual(expected, saw) {
-  assert.ok(expected === saw, 'expected: ' + expected + ' saw: ' + saw);
-}
-
-describe('parse_url', () => {
-  it('ignores leading/trailing spaces', () => {
-    let urlString = ' foo:bar ';
-    let url = new parse_url.URL(urlString);
-    assertStrictEqual('foo', url.protocol);
-
-    urlString = '\nfoo:bar';
-    url = new parse_url.URL(urlString);
-    assertStrictEqual('foo', url.protocol);
-
-    urlString = 'foo:bar\t \r';
-    url = new parse_url.URL(urlString);
-    assertStrictEqual('foo', url.protocol);
-  });
-
-  it('ignores Tab/CR/LF bytes', () => {
-    const urlString = ' f\ro\to\n:bar ';
-    const url = new parse_url.URL(urlString);
-    assertStrictEqual('foo', url.protocol);
-  });
-
-  it('parses simple protocols', () => {
-    let urlString = 'http://example.com/';
-    let url = new parse_url.URL(urlString);
-    assertStrictEqual('http', url.protocol);
-
-    urlString = 'https://example.com/';
-    url = new parse_url.URL(urlString);
-    assertStrictEqual('https', url.protocol);
-  });
-
-  it('parses with missing protocol', () => {
-    const urlString = 'example.com';
-    const url = new parse_url.URL(urlString);
-    assertStrictEqual(true, url.isValid);
-    assertStrictEqual(false, url.hasProtocol);
-    assertStrictEqual(url.defaultProtocol, url.protocol);
-    assertStrictEqual('', url.host);  // example.com is a relative path
-  });
-
-  it('parses with invalid protocol characters', () => {
-    const urlString = 'foo bar:baz';
-    const url = new parse_url.URL(urlString);
-    assertStrictEqual(false, url.hasProtocol);
-    assertStrictEqual('https', url.protocol);
-  });
-
-  it('parses with utf8 protocol characters', () => {
-    const urlString = '⚡:amp';
-    const url = new parse_url.URL(urlString);
-    assertStrictEqual(false, url.hasProtocol);
-    assertStrictEqual('https', url.protocol);
-  });
-
-  it('parses protocol with non-alpha protocol characters', () => {
-    const urlString = 'foo+bar-baz:baz';
-    const url = new parse_url.URL(urlString);
-    assertStrictEqual(true, url.hasProtocol);
-    assertStrictEqual('foo+bar-baz', url.protocol);
-  });
-
-  it('parses uncommon protocols, but not parse_url.URLs', () => {
-    const urlString = 'whatsapp:i have no idea what this should contain';
-    const url = new parse_url.URL(urlString);
-    assertStrictEqual(true, url.hasProtocol);
-    assertStrictEqual('whatsapp', url.protocol);
-  });
-
-  it('parses basic login', () => {
-    const urlString = 'https://user:password@example.com/';
-    const url = new parse_url.URL(urlString);
-    assertStrictEqual('user:password', url.login);
-  });
-
-  it('parses login with ipv6 host that has colons to confuse things', () => {
-    const urlString = 'https://user:password@[2001:0db8::85a3]/';
-    const url = new parse_url.URL(urlString);
-    assertStrictEqual('user:password', url.login);
-  });
-
-  it('parses login with ipv6 host and [ character in password', () => {
-    const urlString = 'https://user:pas[word@[2001:0db8::85a3]/';
-    const url = new parse_url.URL(urlString);
-    assertStrictEqual('user:pas[word', url.login);
-  });
-
-  it('parses login with port to confuse things', () => {
-    const urlString = 'https://user:password@example.com:8000/';
-    const url = new parse_url.URL(urlString);
-    assertStrictEqual('user:password', url.login);
-  });
-
-  it('parses login with @ to confuse things', () => {
-    const urlString = 'https://user:p@ssword@example.com/';
-    const url = new parse_url.URL(urlString);
-    assertStrictEqual('user:p@ssword', url.login);
-  });
-
-  it('parses login with : to confuse things', () => {
-    const urlString = 'https://user:passwo:d@example.com/';
-    const url = new parse_url.URL(urlString);
-    assertStrictEqual('user:passwo:d', url.login);
-  });
-
-  it('parses valid IPv6 hostname', () => {
-    for (const urlString
-             of ['https://[2001:0db8::85a3]/', 'https://[::1]/',
-                 'https://[::]/', 'https://[0:0:0:0:0:0:0:1]/',
-                 'https://[0:0:0:0:0:0:8.8.8.8]/',
-                 'https://[0:0:0:0:0:0:8.124.8.8]/',
-                 'https://[0:0:0:0:0:0:8.8.8.22]/', 'https://[::8.8.8.8]/']) {
-      const url = new parse_url.URL(urlString);
-      assert.ok(url.isValid, 'Expected ' + urlString + ' to be valid.');
-    }
-  });
-
-  it('fails on invalid IPv6 hostname', () => {
-    for (const urlString
-             of ['https://[2001:0db8:85a3]/', 'https://[20012:0db8::85a3]/',
-                 'https://[200g:0db8:85a3]/', 'https://[:::1]/',
-                 'https://[0:0:0:0:0:0:1]/', 'https://[0:0:0:0:0:0:0:0:1]/',
-                 'https://[0:0:0:0:0:0:8.8.8.1024]/',
-                 'https://[0:0:0:0:0:0:8.8.8]/',
-                 'https://[0:0:0:0:0:0:8.8.8.8.8]/',
-                 'https://[0:0:0:0:0:0:0:8.8.8.8]/',
-                 'https://[0:0:0:0:0:8.8.8.8]/',
-                 'https://[0:0:0:0:0:8.8.8.8:1]/']) {
-      const url = new parse_url.URL(urlString);
-      assert.ok(!url.isValid, 'Expected ' + urlString + ' to be invalid.');
-    }
-  });
-
-  it('fails on invalid port characters', () => {
-    const urlString = 'https://example.com:123abc/';
-    const url = new parse_url.URL(urlString);
-    assertStrictEqual(false, url.isValid);
-  });
-
-  it('fails on port with decimal', () => {
-    const urlString = 'https://example.com:80.0/';
-    const url = new parse_url.URL(urlString);
-    assertStrictEqual(false, url.isValid);
-  });
-
-  it('fails on port with negative', () => {
-    const urlString = 'https://example.com:-80/';
-    const url = new parse_url.URL(urlString);
-    assertStrictEqual(false, url.isValid);
-  });
-
-  it('allows high port values', () => {
-    const urlString = 'https://example.com:65535/';
-    const url = new parse_url.URL(urlString);
-    assertStrictEqual(true, url.isValid);
-    assertStrictEqual(65535, url.port);
-  });
-
-  it('fails on invalid port values', () => {
-    const urlString = 'https://example.com:65536/';
-    const url = new parse_url.URL(urlString);
-    assertStrictEqual(false, url.isValid);
-  });
-
-  it('parses empty port strings', () => {
-    const urlString = 'https://example.com:/';
-    const url = new parse_url.URL(urlString);
-    assertStrictEqual(true, url.isValid);
-    assertStrictEqual(443, url.port);
-  });
-
-  it('replaces 0 port with default port', () => {
-    const urlString = 'http://example.com:0/';
-    const url = new parse_url.URL(urlString);
-    assertStrictEqual(true, url.isValid);
-    assertStrictEqual(80, url.port);
-  });
-
-  it('fails on invalid character ! in hostname', () => {
-    const urlString = 'http://example!.com/';
-    const url = new parse_url.URL(urlString);
-    assertStrictEqual(false, url.isValid);
-  });
-
-  it('fails on invalid character 0x10 in hostname', () => {
-    const urlString = 'http://example\x10.com/';
-    const url = new parse_url.URL(urlString);
-    assertStrictEqual(false, url.isValid);
-  });
-
-  it('fails on invalid character & in hostname', () => {
-    const urlString = 'http://example.com&/';
-    const url = new parse_url.URL(urlString);
-    assertStrictEqual(false, url.isValid);
-  });
-
-  it('fails on invalid characters in hostname', () => {
-    const urlString = 'http://example!.com/';
-    const url = new parse_url.URL(urlString);
-    assertStrictEqual(false, url.isValid);
-  });
-
-  it('fails on invalid utf8 percent-escape in hostname', () => {
-    const urlString = 'http://example-%FF.com/';
-    const url = new parse_url.URL(urlString);
-    assertStrictEqual(false, url.isValid);
-  });
-
-  it('fails on dot host', () => {
-    const urlString = 'http://./';
-    const url = new parse_url.URL(urlString);
-    assertStrictEqual(false, url.isValid);
-  });
-
-  it('fails on host with consecutive dots', () => {
-    const urlString = 'http://example..com/';
-    const url = new parse_url.URL(urlString);
-    assertStrictEqual(false, url.isValid);
-  });
-
-  it('strips trailing . from host', () => {
-    const urlString = 'http://example.com./';
-    const url = new parse_url.URL(urlString);
-    assertStrictEqual(true, url.isValid);
-    assertStrictEqual('example.com', url.host);
-  });
-
-  it('accepts relative urls', () => {
-    const urlString = '/foo';
-    const url = new parse_url.URL(urlString);
-    assertStrictEqual(true, url.isValid);
-  });
-
-  it('parses relative parse_url.URL with : character', () => {
-    const urlString = '/image:foo.jpg-bar';
-    const url = new parse_url.URL(urlString);
-    assertStrictEqual(true, url.isValid);
-    assertStrictEqual(false, url.hasProtocol);
-  });
-
-  it('accepts utf8 characters in hostname', () => {
-    const urlString = 'http://⚡.com/';
-    const url = new parse_url.URL(urlString);
-    assertStrictEqual(true, url.isValid);
-    assertStrictEqual('⚡.com', url.host);
-  });
-
-  it('rejects http://', () => {
-    const urlString = 'http://';
-    const url = new parse_url.URL(urlString);
-    assertStrictEqual(false, url.isValid);
-    assertStrictEqual('', url.host);
-  });
-
-  it('rejects http:/// (empty host)', () => {  // NOTYPO
-    const urlString = 'http:///';              // NOTYPO
-    const url = new parse_url.URL(urlString);
-    assertStrictEqual(false, url.isValid);
-    assertStrictEqual('', url.host);
-  });
-
-  it('accepts \\x10 in hostname', () => {
-    const urlString = 'http://example.com\\x10.com/';
-    const url = new parse_url.URL(urlString);
-    assertStrictEqual(true, url.isValid);
-    assertStrictEqual('example.com', url.host);
-  });
-});
diff --git a/validator/js/engine/tokenize-css.js b/validator/js/engine/tokenize-css.js
deleted file mode 100644
index 5a9e9ea8485b..000000000000
--- a/validator/js/engine/tokenize-css.js
+++ /dev/null
@@ -1,1405 +0,0 @@
-/**
- * Credits:
- *   This original version of this file was derived from
- *   https://github.com/tabatkins/parse-css by Tab Atkins,
- *   licensed under the CC0 license
- *   (http://creativecommons.org/publicdomain/zero/1.0/).
- */
-goog.module('tokenize_css');
-const asserts = goog.require('goog.asserts');
-const {ValidationError} = goog.require('amp.validator.protogenerated');
-
-/**
- * Returns an array of Tokens.
- *
- * Token Hierarchy:
- * Token (abstract)
- *   - StringValuedToken (abstract)
- *     - IdentToken
- *     - FunctionToken
- *     - AtKeywordToken
- *     - HashToken
- *     - StringRoken
- *     - URLToken
- *   - GroupingToken (abstract)
- *     - OpenCurlyToken
- *     - CloseCurlyToken
- *     - OpenSquareToken
- *     - CloseSquareToken
- *     - OpenParenToken
- *     - CloseParenToken
- *   - WhitespaceToken
- *   - CDOToken
- *   - CDCToken
- *   - ColonToken
- *   - SemiColonToken
- *   - CommaToken
- *   - IncludeMatchToken
- *   - DashMatchToken
- *   - PrefixMatchToken
- *   - SuffixMatchToken
- *   - SubstringMatchToken
- *   - ColumnToken
- *   - EOFToken
- *   - DelimToken
- *   - NumberToken
- *   - PercentageToken
- *   - DimensionToken
- *   - ErrorToken
- *
- * @param {string} strIn
- * @param {number|undefined} line
- * @param {number|undefined} col
- * @param {!Array<!ErrorToken>} errors output array for the errors.
- * @return {!Array<!Token>}
- */
-const tokenize = function(strIn, line, col, errors) {
-  const tokenizer = new Tokenizer(strIn, line, col, errors);
-  return tokenizer.getTokens();
-};
-exports.tokenize = tokenize;
-
-/**
- * @param {number} num
- * @param {number} first
- * @param {number} last
- * @return {boolean}
- */
-function between(num, first, last) {
-  return num >= first && num <= last;
-}
-
-/**
- * @param {number} code
- * @return {boolean}
- */
-function digit(code) {
-  return between(code, /* '0' */ 0x30, /* '9' */ 0x39);
-}
-
-/**
- * @param {number} code
- * @return {boolean}
- */
-function hexDigit(code) {
-  return digit(code) || between(code, /* 'A' */ 0x41, /* 'F' */ 0x46) ||
-      between(code, /* 'a' */ 0x61, /* 'f' */ 0x66);
-}
-
-/**
- * @param {number} code
- * @return {boolean}
- */
-function upperCaseLetter(code) {
-  return between(code, /* 'A' */ 0x41, /* 'Z' */ 0x5a);
-}
-
-/**
- * @param {number} code
- * @return {boolean}
- */
-function lowerCaseLetter(code) {
-  return between(code, /* 'a' */ 0x61, /* 'z' */ 0x7a);
-}
-
-/**
- * @param {number} code
- * @return {boolean}
- */
-function letter(code) {
-  return upperCaseLetter(code) || lowerCaseLetter(code);
-}
-
-/**
- * @param {number} code
- * @return {boolean}
- */
-function nonAscii(code) {
-  return code >= 0x80;
-}
-
-/**
- * @param {number} code
- * @return {boolean}
- */
-function nameStartChar(code) {
-  return letter(code) || nonAscii(code) || code === /* '_' */ 0x5f;
-}
-
-/**
- * @param {number} code
- * @return {boolean}
- */
-function nameChar(code) {
-  return nameStartChar(code) || digit(code) || code === /* '-' */ 0x2d;
-}
-
-/**
- * @param {number} code
- * @return {boolean}
- */
-function nonPrintable(code) {
-  return between(code, 0, 8) || code === 0xb || between(code, 0xe, 0x1f) ||
-      code === 0x7f;
-}
-
-/**
- * @param {number} code
- * @return {boolean}
- */
-function newline(code) {
-  return code === /* '\n' */ 0xa;
-}
-
-/**
- * @param {number} code
- * @return {boolean}
- */
-function whitespace(code) {
-  return newline(code) || code === /* '\t' */ 0x9 || code === /* ' ' */ 0x20;
-}
-
-/** @const @type {number} */
-const maxAllowedCodepoint = 0x10ffff;
-
-/**
- * @param {string} str
- * @return {!Array<number>}
- */
-function preprocess(str) {
-  // Turn a string into an array of code points,
-  // following the preprocessing cleanup rules.
-  const codepoints = [];
-  for (let i = 0; i < str.length; i++) {
-    let code = str.charCodeAt(i);
-    if (code === /* '\r' */ 0xd && str.charCodeAt(i + 1) === /* '\n' */ 0xa) {
-      code = /* '\n' */ 0xa;
-      i++;
-    }
-    if (code === /* '\r' */ 0xd || code === 0xc) {
-      code = /* '\n' */ 0xa;
-    }
-    if (code === 0x0) {
-      code = 0xfffd;
-    }
-    if (between(code, 0xd800, 0xdbff) &&
-        between(str.charCodeAt(i + 1), 0xdc00, 0xdfff)) {
-      // Decode a surrogate pair into an astral codepoint.
-      const lead = code - 0xd800;
-      const trail = str.charCodeAt(i + 1) - 0xdc00;
-      code = Math.pow(2, 20) + lead * Math.pow(2, 10) + trail;
-      i++;
-    }
-    codepoints.push(code);
-  }
-  return codepoints;
-}
-
-/**
- * @param {number} code
- * @return {string}
- */
-function stringFromCode(code) {
-  if (code <= 0xffff) {
-    return String.fromCharCode(code);
-  }
-  // Otherwise, encode astral char as surrogate pair.
-  code -= Math.pow(2, 20);
-  const lead = Math.floor(code / Math.pow(2, 10)) + 0xd800;
-  const trail = code % Math.pow(2, 10) + 0xdc00;
-  return String.fromCharCode(lead) + String.fromCharCode(trail);
-}
-
-/**
- * Tokenizer class. Used internally by the tokenize function.
- * @private
- */
-class Tokenizer {
-  /**
-   * @param {string} strIn
-   * @param {number|undefined} line
-   * @param {number|undefined} col
-   * @param {!Array<!ErrorToken>} errors output array for the
-   *     errors.
-   */
-  constructor(strIn, line, col, errors) {
-    this.tokens_ = [];
-    /**
-     * @private
-     * @type {!Array<!ErrorToken>}
-     */
-    this.errors_ = errors;
-    /**
-     * @private
-     * @type {!Array<number>}
-     */
-    this.codepoints_ = preprocess(strIn);
-    /**
-     * @private
-     * @type {number}
-     */
-    this.pos_ = -1;
-    /**
-     * @private
-     * @type {number}
-     */
-    this.code_;
-
-    // Line number information.
-    let eofToken;
-    /** @private @type {!Array<number>} */
-    this.lineByPos_ = [];
-    /** @private @type {!Array<number>} */
-    this.colByPos_ = [];
-    let currentLine = line || 1;
-    let currentCol = col || 0;
-    for (let i = 0; i < this.codepoints_.length; ++i) {
-      this.lineByPos_[i] = currentLine;
-      this.colByPos_[i] = currentCol;
-      if (newline(this.codepoints_[i])) {
-        ++currentLine;
-        currentCol = 0;
-      } else {
-        ++currentCol;
-      }
-    }
-    eofToken = new EOFToken();
-    eofToken.line = currentLine;
-    eofToken.col = currentCol;
-
-    let iterationCount = 0;
-    while (!this.eof(this.next())) {
-      const token = this.consumeAToken();
-      if (token.tokenType === TokenType.ERROR) {
-        this.errors_.push(/** @type {!ErrorToken} */ (token));
-      } else {
-        this.tokens_.push(token);
-      }
-      iterationCount++;
-      asserts.assert(
-          iterationCount <= this.codepoints_.length * 2,
-          'Internal Error: infinite-looping');
-    }
-    this.tokens_.push(eofToken);
-  }
-
-  /**
-   * @return {number}
-   */
-  getLine() {
-    const pos = Math.min(this.pos_, this.lineByPos_.length - 1);
-    return (pos < 0) ? 1 : this.lineByPos_[this.pos_];
-  }
-
-  /**
-   * @return {number}
-   */
-  getCol() {
-    const pos = Math.min(this.pos_, this.colByPos_.length - 1);
-    return (pos < 0) ? 0 : this.colByPos_[this.pos_];
-  }
-
-  /**
-   * @return {!Array<!Token>}
-   */
-  getTokens() {
-    return this.tokens_;
-  }
-
-  /**
-   * Returns the codepoint at the given position.
-   * @param {number} num
-   * @return {number}
-   */
-  codepoint(num) {
-    if (num >= this.codepoints_.length) {
-      return -1;
-    }
-    return this.codepoints_[num];
-  }
-
-  /**
-   * Peeks ahead and returns the codepoint opt_num positions ahead.
-   * @param {number=} opt_num
-   * @return {number}
-   */
-  next(opt_num) {
-    const num = opt_num || 1;
-    asserts.assert(
-        num <= 3, 'Spec Error: no more than three codepoints of lookahead.');
-    return this.codepoint(this.pos_ + num);
-  }
-
-  /**
-   * Moves ahead opt_num positions in the string. May move past the
-   * end of the string.
-   * @param {number=} opt_num
-   */
-  consume(opt_num) {
-    const num = opt_num || 1;
-    this.pos_ += num;
-    this.code_ = this.codepoint(this.pos_);
-  }
-
-  /**
-   * Backs up exactly one position in the string.
-   */
-  reconsume() {
-    this.pos_ -= 1;
-    // TODO(johannes): Oddly, adding the following breaks the test with
-    // internal errors. Investigate.
-    // this.code_ = this.codepoint(this.pos_);
-  }
-
-  /**
-   * @param {number=} opt_codepoint
-   * @return {boolean}
-   */
-  eof(opt_codepoint) {
-    const codepoint = opt_codepoint || this.code_;
-    return codepoint === -1;
-  }
-
-  /** @return {!Token} */
-  consumeAToken() {
-    this.consumeComments();
-    this.consume();
-    const mark = new Token();
-    mark.line = this.getLine();
-    mark.col = this.getCol();
-    if (whitespace(this.code_)) {
-      // Merge consecutive whitespace into one token.
-      while (whitespace(this.next())) {
-        this.consume();
-      }
-      return mark.copyPosTo(new WhitespaceToken());
-    } else if (this.code_ === /* '"' */ 0x22) {
-      return mark.copyPosTo(this.consumeAStringToken());
-    } else if (this.code_ === /* '#' */ 0x23) {
-      if (nameChar(this.next()) ||
-          this.areAValidEscape(this.next(1), this.next(2))) {
-        let type = null;
-        if (this.wouldStartAnIdentifier(
-                this.next(1), this.next(2), this.next(3))) {
-          type = 'id';
-        }
-        const token = new HashToken();
-        token.value = this.consumeAName();
-        if (type !== null) {
-          token.type = type;
-        }
-        return mark.copyPosTo(token);
-      } else {
-        return mark.copyPosTo(new DelimToken(this.code_));
-      }
-    } else if (this.code_ === /* '$' */ 0x24) {
-      if (this.next() === /* '=' */ 0x3d) {
-        this.consume();
-        return mark.copyPosTo(new SuffixMatchToken());
-      } else {
-        return mark.copyPosTo(new DelimToken(this.code_));
-      }
-    } else if (this.code_ === /* ''' */ 0x27) {
-      return mark.copyPosTo(this.consumeAStringToken());
-    } else if (this.code_ === /* '(' */ 0x28) {
-      return mark.copyPosTo(new OpenParenToken());
-    } else if (this.code_ === /* ')' */ 0x29) {
-      return mark.copyPosTo(new CloseParenToken());
-    } else if (this.code_ === /* '*' */ 0x2a) {
-      if (this.next() === /* '=' */ 0x3d) {
-        this.consume();
-        return mark.copyPosTo(new SubstringMatchToken());
-      } else {
-        return mark.copyPosTo(new DelimToken(this.code_));
-      }
-    } else if (this.code_ === /* '+' */ 0x2b) {
-      if (this./*OK*/ startsWithANumber()) {
-        this.reconsume();
-        return mark.copyPosTo(this.consumeANumericToken());
-      } else {
-        return mark.copyPosTo(new DelimToken(this.code_));
-      }
-    } else if (this.code_ === /* ',' */ 0x2c) {
-      return mark.copyPosTo(new CommaToken());
-    } else if (this.code_ === /* '-' */ 0x2d) {
-      if (this./*OK*/ startsWithANumber()) {
-        this.reconsume();
-        return mark.copyPosTo(this.consumeANumericToken());
-      } else if (
-          this.next(1) === /* '-' */ 0x2d && this.next(2) === /* '>' */ 0x3e) {
-        this.consume(2);
-        return mark.copyPosTo(new CDCToken());
-      } else if (this./*OK*/ startsWithAnIdentifier()) {
-        this.reconsume();
-        return mark.copyPosTo(this.consumeAnIdentlikeToken());
-      } else {
-        return mark.copyPosTo(new DelimToken(this.code_));
-      }
-    } else if (this.code_ === /* '.' */ 0x2e) {
-      if (this./*OK*/ startsWithANumber()) {
-        this.reconsume();
-        return mark.copyPosTo(this.consumeANumericToken());
-      } else {
-        return mark.copyPosTo(new DelimToken(this.code_));
-      }
-    } else if (this.code_ === /* ':' */ 0x3a) {
-      return mark.copyPosTo(new ColonToken());
-    } else if (this.code_ === /* ';' */ 0x3b) {
-      return mark.copyPosTo(new SemicolonToken());
-    } else if (this.code_ === /* '<' */ 0x3c) {
-      if (this.next(1) === /* '!' */ 0x21 && this.next(2) === /* '-' */ 0x2d &&
-          this.next(3) === /* '-' */ 0x2d) {
-        this.consume(3);
-        return mark.copyPosTo(new CDOToken());
-      } else {
-        return mark.copyPosTo(new DelimToken(this.code_));
-      }
-    } else if (this.code_ === /* '@' */ 0x40) {
-      if (this.wouldStartAnIdentifier(
-              this.next(1), this.next(2), this.next(3))) {
-        const token = new AtKeywordToken();
-        token.value = this.consumeAName();
-        return mark.copyPosTo(token);
-      } else {
-        return mark.copyPosTo(new DelimToken(this.code_));
-      }
-    } else if (this.code_ === /* '[' */ 0x5b) {
-      return mark.copyPosTo(new OpenSquareToken());
-    } else if (this.code_ === /* '\' */ 0x5c) {
-      if (this./*OK*/ startsWithAValidEscape()) {
-        this.reconsume();
-        return mark.copyPosTo(this.consumeAnIdentlikeToken());
-      } else {
-        // This condition happens if we are in consumeAToken (this method),
-        // the current codepoint is 0x5c (\) and the next codepoint is a
-        // newline (\n).
-        return mark.copyPosTo(new ErrorToken(
-            ValidationError.Code.CSS_SYNTAX_STRAY_TRAILING_BACKSLASH,
-            ['style']));
-      }
-    } else if (this.code_ === /* ']' */ 0x5d) {
-      return mark.copyPosTo(new CloseSquareToken());
-    } else if (this.code_ === /* '^' */ 0x5e) {
-      if (this.next() === /* '=' */ 0x3d) {
-        this.consume();
-        return mark.copyPosTo(new PrefixMatchToken());
-      } else {
-        return mark.copyPosTo(new DelimToken(this.code_));
-      }
-    } else if (this.code_ === /* '{' */ 0x7b) {
-      return mark.copyPosTo(new OpenCurlyToken());
-    } else if (this.code_ === /* '|' */ 0x7c) {
-      if (this.next() === /* '=' */ 0x3d) {
-        this.consume();
-        return mark.copyPosTo(new DashMatchToken());
-      } else if (this.next() === /* '|' */ 0x7c) {
-        this.consume();
-        return mark.copyPosTo(new ColumnToken());
-      } else {
-        return mark.copyPosTo(new DelimToken(this.code_));
-      }
-    } else if (this.code_ === /* '}' */ 0x7d) {
-      return mark.copyPosTo(new CloseCurlyToken());
-    } else if (this.code_ === /* '~' */ 0x7e) {
-      if (this.next() === /* '=' */ 0x3d) {
-        this.consume();
-        return mark.copyPosTo(new IncludeMatchToken());
-      } else {
-        return mark.copyPosTo(new DelimToken(this.code_));
-      }
-    } else if (digit(this.code_)) {
-      this.reconsume();
-      return mark.copyPosTo(this.consumeANumericToken());
-    } else if (nameStartChar(this.code_)) {
-      this.reconsume();
-      return mark.copyPosTo(this.consumeAnIdentlikeToken());
-    } else if (this.eof()) {
-      return mark.copyPosTo(new EOFToken());
-    } else {
-      const token = new DelimToken(this.code_);
-      return mark.copyPosTo(token);
-    }
-  }
-
-  /**
-   * Consume everything starting with /* and ending at * / (ignore the space),
-   * emitting a parse error if we hit the end of the file. Returns nothing.
-   */
-  consumeComments() {
-    const mark = new Token();
-    mark.line = this.getLine();
-    mark.col = this.getCol();
-    while (this.next(1) === /* '/' */ 0x2f && this.next(2) === /* '*' */ 0x2a) {
-      this.consume(2);
-      while (true) {
-        this.consume();
-        if (this.code_ === /* '*' */ 0x2a && this.next() === /* '/' */ 0x2f) {
-          this.consume();
-          break;
-        } else if (this.eof()) {
-          // For example "h1 { color: red; } \* " would emit this parse error
-          // at the end of the string.
-          this.errors_.push(mark.copyPosTo(new ErrorToken(
-              ValidationError.Code.CSS_SYNTAX_UNTERMINATED_COMMENT,
-              ['style'])));
-          return;
-        }
-      }
-    }
-  }
-
-  /**
-   * Consumes a token that starts with a number.
-   * The specific type is one of:
-   *   NumberToken, DimensionToken, PercentageToken
-   * @return {!Token}
-   */
-  consumeANumericToken() {
-    asserts.assert(
-        this.wouldStartANumber(this.next(1), this.next(2), this.next(3)),
-        'Internal Error: consumeANumericToken precondition not met');
-    /** @type {!NumberToken} */
-    const num = this.consumeANumber();
-    if (this.wouldStartAnIdentifier(this.next(1), this.next(2), this.next(3))) {
-      const token = new DimensionToken();
-      token.value = num.value;
-      token.repr = num.repr;
-      token.type = num.type;
-      token.unit = this.consumeAName();
-      return token;
-    } else if (this.next() === /* '%' */ 0x25) {
-      this.consume();
-      const token = new PercentageToken();
-      token.value = num.value;
-      token.repr = num.repr;
-      return token;
-    }
-    return num;
-  }
-
-  /**
-   * Consume an identifier-like token.
-   * The specific type is one of:
-   *   FunctionToken, URLToken, ErrorToken, IdentToken
-   * @return {!Token}
-   */
-  consumeAnIdentlikeToken() {
-    const name = this.consumeAName();
-    if (name.toLowerCase() === 'url' && this.next() === /* '(' */ 0x28) {
-      this.consume();
-      while (whitespace(this.next(1)) && whitespace(this.next(2))) {
-        this.consume();
-      }
-      if (this.next() === /* '"' */ 0x22 || this.next() === /* ''' */ 0x27) {
-        const token = new FunctionToken();
-        token.value = name;
-        return token;
-      } else if (
-          whitespace(this.next()) &&
-          (this.next(2) === /* '"' */ 0x22 ||
-           this.next(2) === /* ''' */ 0x27)) {
-        const token = new FunctionToken();
-        token.value = name;
-        return token;
-      } else {
-        return this.consumeAURLToken();
-      }
-    } else if (this.next() === /* '(' */ 0x28) {
-      this.consume();
-      const token = new FunctionToken();
-      token.value = name;
-      return token;
-    } else {
-      const token = new IdentToken();
-      token.value = name;
-      return token;
-    }
-  }
-
-  /**
-   * Consume a string token.
-   * The specific type is one of:
-   *   StringToken, ErrorToken
-   * @return {!Token}
-   */
-  consumeAStringToken() {
-    asserts.assert(
-        (this.code_ === /* '"' */ 0x22) || (this.code_ === /* ''' */ 0x27),
-        'Internal Error: consumeAStringToken precondition not met');
-    const endingCodePoint = this.code_;
-    let string = '';
-    while (true) {
-      this.consume();
-      if (this.code_ === endingCodePoint || this.eof()) {
-        const token = new StringToken();
-        token.value = string;
-        return token;
-      } else if (newline(this.code_)) {
-        this.reconsume();
-        return new ErrorToken(
-            ValidationError.Code.CSS_SYNTAX_UNTERMINATED_STRING, ['style']);
-      } else if (this.code_ === /* '\' */ 0x5c) {
-        if (this.eof(this.next())) {
-          continue;
-        } else if (newline(this.next())) {
-          this.consume();
-        } else {
-          string += stringFromCode(this.consumeEscape());
-        }
-      } else {
-        string += stringFromCode(this.code_);
-      }
-    }
-  }
-
-  /**
-   * Consume an URL token.
-   * The specific type is one of:
-   *   URLToken, ErrorToken
-   * @return {!Token}
-   */
-  consumeAURLToken() {
-    const token = new URLToken();
-    while (whitespace(this.next())) {
-      this.consume();
-    }
-    if (this.eof(this.next())) {
-      return token;
-    }
-    while (true) {
-      this.consume();
-      if (this.code_ === /* ')' */ 0x29 || this.eof()) {
-        return token;
-      } else if (whitespace(this.code_)) {
-        while (whitespace(this.next())) {
-          this.consume();
-        }
-        if (this.next() === /* ')' */ 0x29 || this.eof(this.next())) {
-          this.consume();
-          return token;
-        } else {
-          this.consumeTheRemnantsOfABadURL();
-          return new ErrorToken(
-              ValidationError.Code.CSS_SYNTAX_BAD_URL, ['style']);
-        }
-      } else if (
-          this.code_ === /* '"' */ 0x22 || this.code_ === /* ''' */ 0x27 ||
-          this.code_ === /* '(' */ 0x28 || nonPrintable(this.code_)) {
-        this.consumeTheRemnantsOfABadURL();
-        return new ErrorToken(
-            ValidationError.Code.CSS_SYNTAX_BAD_URL, ['style']);
-      } else if (this.code_ === /* '\' */ 0x5c) {
-        if (this./*OK*/ startsWithAValidEscape()) {
-          token.value += stringFromCode(this.consumeEscape());
-        } else {
-          this.consumeTheRemnantsOfABadURL();
-          return new ErrorToken(
-              ValidationError.Code.CSS_SYNTAX_BAD_URL, ['style']);
-        }
-      } else {
-        token.value += stringFromCode(this.code_);
-      }
-    }
-  }
-
-  /**
-   * Consume an escaped character, ex: \a212f3, followed by any whitespace.
-   * Returns the numerical value of the character. If the codepoint following
-   * the '\' character is not a hex code and not EOF, returns that codepoint.
-   * @return {number}
-   */
-  consumeEscape() {
-    // Assume the the current character is the \
-    // and the next code point is not a newline.
-    this.consume();  // '\'
-    if (hexDigit(this.code_)) {
-      // Consume 1-6 hex digits
-      const digits = [this.code_];
-      for (let total = 0; total < 5; total++) {
-        if (hexDigit(this.next())) {
-          this.consume();
-          digits.push(this.code_);
-        } else {
-          break;
-        }
-      }
-      if (whitespace(this.next())) {
-        this.consume();
-      }
-      let value = parseInt(
-          digits
-              .map(function(x) {
-                return String.fromCharCode(x);
-              })
-              .join(''),
-          16);
-      if (value > maxAllowedCodepoint) {
-        value = 0xfffd;
-      }
-      return value;
-    } else if (this.eof()) {
-      return 0xfffd;
-    } else {
-      return this.code_;
-    }
-  }
-
-  /**
-   * Returns true if the codepoint sequence c1, c2 are the start
-   * of an escape token.
-   * @param {number} c1 codepoint at pos x
-   * @param {number} c2 codepoint at pos x + 1
-   * @return {boolean}
-   */
-  areAValidEscape(c1, c2) {
-    if (c1 != /* '\' */ 0x5c) {
-      return false;
-    }
-    if (newline(c2)) {
-      return false;
-    }
-    return true;
-  }
-
-  /**
-   * Returns true if the next two codepoints are the start of an escape token.
-   * @return {boolean}
-   */
-  /*OK*/ startsWithAValidEscape() {
-    return this.areAValidEscape(this.code_, this.next());
-  }
-
-  /**
-   * Returns true if the codepoint sequence c1, c2, c3 are the
-   * start of an identifier.
-   * @param {number} c1 codepoint at pos x
-   * @param {number} c2 codepoint at pos x + 1
-   * @param {number} c3 codepoint at pos x + 2
-   * @return {boolean}
-   */
-  wouldStartAnIdentifier(c1, c2, c3) {
-    if (c1 === /* '-' */ 0x2d) {
-      return nameStartChar(c2) || c2 === /* '-' */ 0x2d ||
-          this.areAValidEscape(c2, c3);
-    } else if (nameStartChar(c1)) {
-      return true;
-    } else if (c1 === /* '\' */ 0x5c) {
-      return this.areAValidEscape(c1, c2);
-    } else {
-      return false;
-    }
-  }
-
-  /**
-   * Returns true if the next three codepoints are the start of an identifier.
-   * @return {boolean}
-   */
-  /*OK*/ startsWithAnIdentifier() {
-    return this.wouldStartAnIdentifier(this.code_, this.next(1), this.next(2));
-  }
-
-  /**
-   * Returns true if the codepoint sequence c1, c2, c3 are the
-   * start of a number.
-   * @param {number} c1 codepoint at pos x
-   * @param {number} c2 codepoint at pos x + 1
-   * @param {number} c3 codepoint at pos x + 2
-   * @return {boolean}
-   */
-  wouldStartANumber(c1, c2, c3) {
-    if (c1 === /* '+' */ 0x2b || c1 === /* '-' */ 0x2d) {
-      if (digit(c2)) {
-        return true;
-      }
-      if (c2 === /* '.' */ 0x2e && digit(c3)) {
-        return true;
-      }
-      return false;
-    } else if (c1 === /* '.' */ 0x2e) {
-      if (digit(c2)) {
-        return true;
-      }
-      return false;
-    } else if (digit(c1)) {
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-  /**
-   * Returns true if the next three codepoints are the start of a number.
-   * @return {boolean}
-   */
-  /*OK*/ startsWithANumber() {
-    return this.wouldStartANumber(this.code_, this.next(1), this.next(2));
-  }
-
-  /** @return {string} */
-  consumeAName() {
-    let result = '';
-    while (true) {
-      this.consume();
-      if (nameChar(this.code_)) {
-        result += stringFromCode(this.code_);
-      } else if (this./*OK*/ startsWithAValidEscape()) {
-        result += stringFromCode(this.consumeEscape());
-      } else {
-        this.reconsume();
-        return result;
-      }
-    }
-  }
-
-  /**
-   * Consumes a number, returning it as a string representation. Numbers
-   * may include +/- prefixes, ./e/E delimiters, etc. The type string will
-   * be either 'integer' or 'number'. A number may be an integer.
-   * @return {!NumberToken}
-   */
-  consumeANumber() {
-    asserts.assert(
-        this.wouldStartANumber(this.next(1), this.next(2), this.next(3)),
-        'Internal Error: consumeANumber precondition not met');
-    /** @type {string} */
-    let repr = '';
-    /** @type {string} */
-    let type = 'integer';
-    if (this.next() === /* '+' */ 0x2b || this.next() === /* '-' */ 0x2d) {
-      this.consume();
-      repr += stringFromCode(this.code_);  // + or -
-    }
-    while (digit(this.next())) {
-      this.consume();
-      repr += stringFromCode(this.code_);  // 0-9
-    }
-    if (this.next(1) === /* '.' */ 0x2e && digit(this.next(2))) {
-      this.consume();
-      repr += stringFromCode(this.code_);  // '.'
-      type = 'number';
-      while (digit(this.next())) {
-        this.consume();
-        repr += stringFromCode(this.code_);  // 0-9
-      }
-    }
-    const c1 = this.next(1);
-    const c2 = this.next(2);
-    const c3 = this.next(3);
-    if ((c1 === /* 'E' */ 0x45 || c1 === /* 'e' */ 0x65) && digit(c2)) {
-      this.consume();
-      repr += stringFromCode(this.code_);  // E or e
-      type = 'number';
-      while (digit(this.next())) {
-        this.consume();
-        repr += stringFromCode(this.code_);  // 0-9
-      }
-    } else if (
-        (c1 === /* 'E' */ 0x45 || c1 === /* 'e' */ 0x65) &&
-        (c2 === /* '+' */ 0x2b || c2 === /* '-' */ 0x2d) && digit(c3)) {
-      this.consume();
-      repr += stringFromCode(this.code_);  // E or e
-      this.consume();
-      repr += stringFromCode(this.code_);  // + or -
-      type = 'number';
-      while (digit(this.next())) {
-        this.consume();
-        repr += stringFromCode(this.code_);  // 0-9
-      }
-    }
-    const numberToken = new NumberToken();
-    numberToken.type = type;
-    numberToken.value = this.convertAStringToANumber(repr);
-    numberToken.repr = repr;
-    return numberToken;
-  }
-
-  /**
-   * Converts a numerical representation of a string to a number.
-   * @param {string} string
-   * @return {number}
-   */
-  convertAStringToANumber(string) {
-    // CSS's number rules are identical to JS, afaik.
-    return Number(string);
-  }
-
-  /**
-   * Consumes ?. Returns nothing.
-   */
-  consumeTheRemnantsOfABadURL() {
-    while (true) {
-      this.consume();
-      if (this.code_ === /* '-' */ 0x2d || this.eof()) {
-        return;
-      } else if (this./*OK*/ startsWithAValidEscape()) {
-        this.consumeEscape();
-      }
-    }
-  }
-}
-
-
-/**
- * NOTE: When adding to this enum, you must update TokenType_NamesById below.
- * @enum {number}
- */
-const TokenType = {
-  UNKNOWN: 0,
-  AT_KEYWORD: 1,
-  CDC: 2,  // -->
-  CDO: 3,  // <!--
-  CLOSE_CURLY: 4,
-  CLOSE_PAREN: 5,
-  CLOSE_SQUARE: 6,
-  COLON: 7,
-  COLUMN: 8,  // ||
-  COMMA: 9,
-  DASH_MATCH: 10,  // |=
-  DELIM: 11,
-  DIMENSION: 12,
-  EOF_TOKEN: 13,  // Can't call this EOF due to symbol conflict in C.
-  ERROR: 14,
-  FUNCTION_TOKEN: 15,
-  HASH: 16,  // #
-  IDENT: 17,
-  INCLUDE_MATCH: 18,  // ~=
-  NUMBER: 19,
-  OPEN_CURLY: 20,
-  OPEN_PAREN: 21,
-  OPEN_SQUARE: 22,
-  PERCENTAGE: 23,
-  PREFIX_MATCH: 24,  // ^=
-  SEMICOLON: 25,
-  STRING: 26,
-  SUBSTRING_MATCH: 27,  // *=
-  SUFFIX_MATCH: 28,     // $=
-  WHITESPACE: 29,
-  URL: 30,
-
-  // AST nodes produced by the parsing routines.
-  STYLESHEET: 31,
-  AT_RULE: 32,
-  QUALIFIED_RULE: 33,
-  DECLARATION: 34,
-  BLOCK: 35,
-  FUNCTION: 36,
-
-  // For ExtractUrls
-  PARSED_CSS_URL: 37,
-
-  // For css-selectors.js.
-  TYPE_SELECTOR: 38,
-  ID_SELECTOR: 39,
-  ATTR_SELECTOR: 40,
-  PSEUDO_SELECTOR: 41,
-  CLASS_SELECTOR: 42,
-  SIMPLE_SELECTOR_SEQUENCE: 43,
-  COMBINATOR: 44,
-  SELECTORS_GROUP: 45,
-};
-exports.TokenType = TokenType;
-
-/** @type {!Array<string>} */
-const TokenType_NamesById = [
-  'UNKNOWN',
-  'AT_KEYWORD',
-  'CDC',
-  'CDO',
-  'CLOSE_CURLY',
-  'CLOSE_PAREN',
-  'CLOSE_SQUARE',
-  'COLON',
-  'COLUMN',
-  'COMMA',
-  'DASH_MATCH',
-  'DELIM',
-  'DIMENSION',
-  'EOF_TOKEN',
-  'ERROR',
-  'FUNCTION_TOKEN',
-  'HASH',
-  'IDENT',
-  'INCLUDE_MATCH',
-  'NUMBER',
-  'OPEN_CURLY',
-  'OPEN_PAREN',
-  'OPEN_SQUARE',
-  'PERCENTAGE',
-  'PREFIX_MATCH',
-  'SEMICOLON',
-  'STRING',
-  'SUBSTRING_MATCH',
-  'SUFFIX_MATCH',
-  'WHITESPACE',
-  'URL',
-  'STYLESHEET',
-  'AT_RULE',
-  'QUALIFIED_RULE',
-  'DECLARATION',
-  'BLOCK',
-  'FUNCTION',
-  'PARSED_CSS_URL',
-  'TYPE_SELECTOR',
-  'ID_SELECTOR',
-  'ATTR_SELECTOR',
-  'PSEUDO_SELECTOR',
-  'CLASS_SELECTOR',
-  'SIMPLE_SELECTOR_SEQUENCE',
-  'COMBINATOR',
-  'SELECTORS_GROUP',
-];
-
-/**
- * The abstract superclass for all tokens.
- */
-const Token = class {
-  constructor() {
-    /** @type {number} */
-    this.line = 1;
-    /** @type {number} */
-    this.col = 0;
-  }
-
-  /**
-   * Copies the line / col values of |this| to |other|.
-   * @param {!T} other
-   * @return {!T}
-   * @template T
-   */
-  copyPosTo(other) {
-    other.line = this.line;
-    other.col = this.col;
-    return other;
-  }
-};
-exports.Token = Token;
-/** @type {!TokenType} */
-Token.prototype.tokenType = TokenType.UNKNOWN;
-
-/** @return {!Object} */
-Token.prototype.toJSON = function() {
-  return {
-    'tokenType': TokenType_NamesById[this.tokenType],
-    'line': this.line,
-    'col': this.col,
-  };
-};
-
-/**
- * Error tokens carry an error code and parameters, which can be
- * formatted into an error message via the format strings in
- * validator.protoascii.
- */
-const ErrorToken = class extends Token {
-  /**
-   * @param {!ValidationError.Code=} opt_code
-   * @param {!Array<string>=} opt_params
-   */
-  constructor(opt_code, opt_params) {
-    super();
-    asserts.assert(opt_code !== undefined);
-    asserts.assert(opt_params !== undefined);
-    /** @type {!ValidationError.Code} */
-    this.code = opt_code;
-    /** @type {!Array<string>} */
-    this.params = opt_params;
-  }
-};
-/** @type {!TokenType} */
-ErrorToken.prototype.tokenType = TokenType.ERROR;
-exports.ErrorToken = ErrorToken;
-
-/** @inheritDoc */
-ErrorToken.prototype.toJSON = function() {
-  const json = Token.prototype.toJSON.call(this);
-  json['code'] = this.code;
-  json['params'] = this.params;
-  return json;
-};
-
-const WhitespaceToken = class extends Token {};
-exports.WhitespaceToken = WhitespaceToken;
-/** @type {!TokenType} */
-WhitespaceToken.prototype.tokenType = TokenType.WHITESPACE;
-
-const CDOToken = class extends Token {};
-exports.CDOToken = CDOToken;
-/** @type {!TokenType} */
-CDOToken.prototype.tokenType = TokenType.CDO;
-
-const CDCToken = class extends Token {};
-exports.CDCToken = CDCToken;
-/** @type {!TokenType} */
-CDCToken.prototype.tokenType = TokenType.CDC;
-
-const ColonToken = class extends Token {};
-exports.ColonToken = ColonToken;
-/** @type {!TokenType} */
-ColonToken.prototype.tokenType = TokenType.COLON;
-
-const SemicolonToken = class extends Token {};
-exports.SemicolonToken = SemicolonToken;
-/** @type {!TokenType} */
-SemicolonToken.prototype.tokenType = TokenType.SEMICOLON;
-
-const CommaToken = class extends Token {};
-exports.CommaToken = CommaToken;
-/** @type {!TokenType} */
-CommaToken.prototype.tokenType = TokenType.COMMA;
-
-const GroupingToken = class extends Token {};
-exports.GroupingToken = GroupingToken;
-/** @type {string} */
-GroupingToken.prototype.value = 'abstract';
-/** @type {string} */
-GroupingToken.prototype.mirror = 'abstract';
-
-const OpenCurlyToken = class extends GroupingToken {};
-exports.OpenCurlyToken = OpenCurlyToken;
-/** @type {!TokenType} */
-OpenCurlyToken.prototype.tokenType = TokenType.OPEN_CURLY;
-/** @type {string} */
-OpenCurlyToken.prototype.value = '{';
-/** @type {string} */
-OpenCurlyToken.prototype.mirror = '}';
-
-const CloseCurlyToken = class extends GroupingToken {};
-exports.CloseCurlyToken = CloseCurlyToken;
-/** @type {!TokenType} */
-CloseCurlyToken.prototype.tokenType = TokenType.CLOSE_CURLY;
-/** @type {string} */
-CloseCurlyToken.prototype.value = '}';
-/** @type {string} */
-CloseCurlyToken.prototype.mirror = '{';
-
-const OpenSquareToken = class extends GroupingToken {};
-exports.OpenSquareToken = OpenSquareToken;
-/** @type {!TokenType} */
-OpenSquareToken.prototype.tokenType = TokenType.OPEN_SQUARE;
-/** @type {string} */
-OpenSquareToken.prototype.value = '[';
-/** @type {string} */
-OpenSquareToken.prototype.mirror = ']';
-
-const CloseSquareToken = class extends GroupingToken {};
-exports.CloseSquareToken = CloseSquareToken;
-/** @type {!TokenType} */
-CloseSquareToken.prototype.tokenType = TokenType.CLOSE_SQUARE;
-/** @type {string} */
-CloseSquareToken.prototype.value = ']';
-/** @type {string} */
-CloseSquareToken.prototype.mirror = '[';
-
-const OpenParenToken = class extends GroupingToken {};
-exports.OpenParenToken = OpenParenToken;
-/** @type {!TokenType} */
-OpenParenToken.prototype.tokenType = TokenType.OPEN_PAREN;
-/** @type {string} */
-OpenParenToken.prototype.value = '(';
-/** @type {string} */
-OpenParenToken.prototype.mirror = ')';
-
-const CloseParenToken = class extends GroupingToken {};
-exports.CloseParenToken = CloseParenToken;
-/** @type {!TokenType} */
-CloseParenToken.prototype.tokenType = TokenType.CLOSE_PAREN;
-/** @type {string} */
-CloseParenToken.prototype.value = ')';
-/** @type {string} */
-CloseParenToken.prototype.mirror = '(';
-
-const IncludeMatchToken = class extends Token {};
-exports.IncludeMatchToken = IncludeMatchToken;
-/** @type {!TokenType} */
-IncludeMatchToken.prototype.tokenType = TokenType.INCLUDE_MATCH;
-
-const DashMatchToken = class extends Token {};
-exports.DashMatchToken = DashMatchToken;
-/** @type {!TokenType} */
-DashMatchToken.prototype.tokenType = TokenType.DASH_MATCH;
-
-const PrefixMatchToken = class extends Token {};
-exports.PrefixMatchToken = PrefixMatchToken;
-/** @type {!TokenType} */
-PrefixMatchToken.prototype.tokenType = TokenType.PREFIX_MATCH;
-
-const SuffixMatchToken = class extends Token {};
-exports.SuffixMatchToken = SuffixMatchToken;
-/** @type {!TokenType} */
-SuffixMatchToken.prototype.tokenType = TokenType.SUFFIX_MATCH;
-
-const SubstringMatchToken = class extends Token {};
-exports.SubstringMatchToken = SubstringMatchToken;
-/** @type {!TokenType} */
-SubstringMatchToken.prototype.tokenType = TokenType.SUBSTRING_MATCH;
-
-const ColumnToken = class extends Token {};
-exports.ColumnToken = ColumnToken;
-/** @type {!TokenType} */
-ColumnToken.prototype.tokenType = TokenType.COLUMN;
-
-const EOFToken = class extends Token {};
-exports.EOFToken = EOFToken;
-/** @type {!TokenType} */
-EOFToken.prototype.tokenType = TokenType.EOF_TOKEN;
-
-const DelimToken = class extends Token {
-  /**
-   * @param {number} code
-   */
-  constructor(code) {
-    super();
-    /** @type {string} */
-    this.value = stringFromCode(code);
-  }
-};
-exports.DelimToken = DelimToken;
-/** @type {!TokenType} */
-DelimToken.prototype.tokenType = TokenType.DELIM;
-
-/** @inheritDoc */
-DelimToken.prototype.toJSON = function() {
-  const json = Token.prototype.toJSON.call(this);
-  json['value'] = this.value;
-  return json;
-};
-
-const StringValuedToken = class extends Token {
-  constructor() {
-    super();
-    /** @type {string} */
-    this.value = '';
-  }
-
-  /**
-   * @param {string} str
-   * @return {boolean}
-   */
-  ASCIIMatch(str) {
-    return this.value.toLowerCase() === str.toLowerCase();
-  }
-};
-/** @inheritDoc */
-StringValuedToken.prototype.toJSON = function() {
-  const json = Token.prototype.toJSON.call(this);
-  json['value'] = this.value;
-  return json;
-};
-exports.StringValuedToken = StringValuedToken;
-
-const IdentToken = class extends StringValuedToken {};
-/** @type {!TokenType} */
-IdentToken.prototype.tokenType = TokenType.IDENT;
-exports.IdentToken = IdentToken;
-
-const FunctionToken = class extends StringValuedToken {};
-/** @type {!TokenType} */
-FunctionToken.prototype.tokenType = TokenType.FUNCTION_TOKEN;
-/** @type {string} */
-FunctionToken.prototype.mirror = ')';
-exports.FunctionToken = FunctionToken;
-
-const AtKeywordToken = class extends StringValuedToken {};
-/** @type {!TokenType} */
-AtKeywordToken.prototype.tokenType = TokenType.AT_KEYWORD;
-exports.AtKeywordToken = AtKeywordToken;
-
-const HashToken = class extends StringValuedToken {
-  constructor() {
-    super();
-    /** @type {string} */
-    this.type = 'unrestricted';
-  }
-};
-/** @type {!TokenType} */
-HashToken.prototype.tokenType = TokenType.HASH;
-
-/** @inheritDoc */
-HashToken.prototype.toJSON = function() {
-  const json = StringValuedToken.prototype.toJSON.call(this);
-  json['type'] = this.type;
-  return json;
-};
-exports.HashToken = HashToken;
-
-const StringToken = class extends StringValuedToken {};
-/** @type {!TokenType} */
-StringToken.prototype.tokenType = TokenType.STRING;
-exports.StringToken = StringToken;
-
-const URLToken = class extends StringValuedToken {};
-/** @type {!TokenType} */
-URLToken.prototype.tokenType = TokenType.URL;
-exports.URLToken = URLToken;
-
-const NumberToken = class extends Token {
-  constructor() {
-    super();
-    /** @type {?number} */
-    this.value = null;
-    /** @type {string} */
-    this.type = 'integer';
-    /** @type {string} */
-    this.repr = '';
-  }
-};
-/** @type {!TokenType} */
-NumberToken.prototype.tokenType = TokenType.NUMBER;
-
-/** @inheritDoc */
-NumberToken.prototype.toJSON = function() {
-  const json = Token.prototype.toJSON.call(this);
-  json['value'] = this.value;
-  json['type'] = this.type;
-  json['repr'] = this.repr;
-  return json;
-};
-exports.NumberToken = NumberToken;
-
-const PercentageToken = class extends Token {
-  constructor() {
-    super();
-    /** @type {?number} */
-    this.value = null;
-    /** @type {string} */
-    this.repr = '';
-  }
-};
-/** @type {!TokenType} */
-PercentageToken.prototype.tokenType = TokenType.PERCENTAGE;
-
-/** @inheritDoc */
-PercentageToken.prototype.toJSON = function() {
-  const json = Token.prototype.toJSON.call(this);
-  json['value'] = this.value;
-  json['repr'] = this.repr;
-  return json;
-};
-exports.PercentageToken = PercentageToken;
-
-const DimensionToken = class extends Token {
-  constructor() {
-    super();
-    /** @type {?number} */
-    this.value = null;
-    /** @type {string} */
-    this.type = 'integer';
-    /** @type {string} */
-    this.repr = '';
-    /** @type {string} */
-    this.unit = '';
-  }
-};
-/** @type {!TokenType} */
-DimensionToken.prototype.tokenType = TokenType.DIMENSION;
-
-/** @inheritDoc */
-DimensionToken.prototype.toJSON = function() {
-  const json = Token.prototype.toJSON.call(this);
-  json['value'] = this.value;
-  json['type'] = this.type;
-  json['repr'] = this.repr;
-  json['unit'] = this.unit;
-  return json;
-};
-exports.DimensionToken = DimensionToken;
diff --git a/validator/js/engine/validator-deprecated.js b/validator/js/engine/validator-deprecated.js
deleted file mode 100644
index 2fddaed677ba..000000000000
--- a/validator/js/engine/validator-deprecated.js
+++ /dev/null
@@ -1,146 +0,0 @@
-goog.module('amp.validator');
-
-const VALIDATOR_DEPRECATED =
-    'The native JavaScript AMPHTML Validator (validator.js) has been turned ' +
-    'down. If you are seeing this error, update your tooling to instead ' +
-    'load the API compatible WebAssembly AMPHTML Validator ' +
-    '(validator_wasm.js) instead.';
-
-const errorCategoryCode = {
-  UNKNOWN: 'UNKNOWN',
-};
-
-const htmlFormatCode = {
-  UNKNOWN_CODE: 'UNKNOWN_CODE',
-};
-
-const validationErrorCode = {
-  UNKNOWN_CODE: 'UNKNOWN_CODE',
-};
-
-const validationErrorSeverity = {
-  ERROR: 'ERROR',
-};
-
-const validationError = {
-  'severity': validationErrorSeverity,
-  'code': validationErrorCode,
-  'line': 1,
-  'col': 0,
-  'specUrl': '',
-  'params': [],
-  'category': null,
-  'dataAmpReportTestValue': null,
-};
-
-const validationResultStatus = {
-  FAIL: 'FAIL',
-};
-
-const validationResult = {
-  'status': validationResultStatus,
-  'errors': [validationError],
-  'validatorRevision': -1,
-  'specFileRevision': -1,
-  'transformedVersion': 0,
-  'typeIdentifier': [],
-  'valueSetProvisions': [],
-  'valueSetRequirements': [],
-};
-
-/**
- * DEPRECATED. This now always returns false.
- *
- * @param {!Object} error ignored.
- * @return {boolean}
- */
-const isSeverityWarning = function(error) {
-  console.log('ERROR: ' + VALIDATOR_DEPRECATED);
-  return false;
-};
-exports.isSeverityWarning = isSeverityWarning;
-
-/**
- * DEPRECATED. This now always returns an error message stating this is
- * deprecated and to use validator_wasm.js instead.
- *
- * @nocollapse
- * @param {string} inputDocContents ignored.
- * @param {string=} opt_htmlFormat the allowed format ignored.
- * @return {!Object} Validation Result (status and errors)
- */
-const validateString = function(inputDocContents, opt_htmlFormat) {
-  console.log('ERROR: ' + VALIDATOR_DEPRECATED);
-  return validationResult;
-};
-exports.validateString = validateString;
-
-/**
- * DEPRECATED. This now always returns an error message stating this is
- * deprecated and to use validator_wasm.js instead.
- *
- * @param {!Object} error ignored.
- * @return {string}
- */
-const renderErrorMessage = function(error) {
-  return VALIDATOR_DEPRECATED;
-};
-exports.renderErrorMessage = renderErrorMessage;
-
-/**
- * DEPRECATED. This now always returns an error message stating this is
- * deprecated and to use validator_wasm.js instead.
- *
- * @param {!Object} validationResult ignored.
- * @param {string} filename to use in rendering error messages ignored.
- * @return {!Array<string>}
- */
-const renderValidationResult = function(validationResult, filename) {
-  return [VALIDATOR_DEPRECATED];
-};
-exports.renderValidationResult = renderValidationResult;
-
-/**
- * DEPRECATED.
- *
- * @param {!Object} error ignored.
- * @return {!Object}
- */
-const categorizeError = function(error) {
-  console.log('ERROR: ' + VALIDATOR_DEPRECATED);
-  return errorCategoryCode;
-};
-exports.categorizeError = categorizeError;
-
-/**
- * DEPRECATED. This now doesn't do anything to the input.
- *
- * @param {!Object} result ignored.
- */
-const annotateWithErrorCategories = function(result) {
-  console.log('ERROR: ' + VALIDATOR_DEPRECATED);
-};
-exports.annotateWithErrorCategories = annotateWithErrorCategories;
-
-// These are DEPRECATED. Please use validator_wasm.js instead.
-goog.exportSymbol('amp.validator.ErrorCategory.Code', {
-  errorCategoryCode,
-});
-goog.exportSymbol('amp.validator.HtmlFormat.Code', {
-  htmlFormatCode,
-});
-goog.exportSymbol('amp.validator.validateString', validateString);
-goog.exportSymbol('amp.validator.ValidationError', validationError);
-goog.exportSymbol('amp.validator.ValidationError.Code', validationErrorCode);
-goog.exportSymbol(
-    'amp.validator.ValidationError.Severity', validationErrorSeverity);
-goog.exportSymbol('amp.validator.ValidationResult', validationResult);
-goog.exportSymbol(
-    'amp.validator.ValidationResult.Status', validationResultStatus);
-goog.exportSymbol('amp.validator.renderErrorMessage', renderErrorMessage);
-goog.exportSymbol(
-    'amp.validator.renderValidationResult', renderValidationResult);
-goog.exportSymbol('amp.validator.categorizeError', categorizeError);
-goog.exportSymbol(
-    'amp.validator.annotateWithErrorCategories', annotateWithErrorCategories);
-goog.exportSymbol('amp.validator.isSeverityWarning', isSeverityWarning);
diff --git a/validator/js/engine/validator-in-browser-deprecated.js b/validator/js/engine/validator-in-browser-deprecated.js
deleted file mode 100644
index 6042d961721d..000000000000
--- a/validator/js/engine/validator-in-browser-deprecated.js
+++ /dev/null
@@ -1,79 +0,0 @@
-goog.module('amp.validator.validatorInBrowser');
-
-const VALIDATOR_DEPRECATED =
-    'ERROR: The native JavaScript AMPHTML Validator (validator.js) has been ' +
-    'turned down. If you are seeing this error, update your tooling to ' +
-    'instead load the API compatible WebAssembly AMPHTML Validator ' +
-    '(validator_wasm.js) instead.';
-
-const validationErrorCode = {
-  UNKNOWN_CODE: 'UNKNOWN_CODE',
-};
-
-const validationErrorSeverity = {
-  ERROR: 'ERROR',
-};
-
-const validationError = {
-  'severity': validationErrorSeverity,
-  'code': validationErrorCode,
-  'line': 1,
-  'col': 0,
-  'specUrl': '',
-  'params': [],
-  'category': null,
-  'dataAmpReportTestValue': null,
-};
-
-const validationResultStatus = {
-  FAIL: 'FAIL',
-};
-
-const validationResult = {
-  'status': validationResultStatus,
-  'errors': [validationError],
-  'validatorRevision': -1,
-  'specFileRevision': -1,
-  'transformedVersion': 0,
-  'typeIdentifier': [],
-  'valueSetProvisions': [],
-  'valueSetRequirements': [],
-};
-
-/**
- * Checks if the given URL is an AMP cache URL.
- * @param {string} url ignored.
- * @return {boolean}
- */
-const isAmpCacheUrl = function(url) {
-  return url.toLowerCase().indexOf('cdn.ampproject.org') !==
-      -1;  // lgtm [js/incomplete-url-substring-sanitization]
-};
-exports.isAmpCacheUrl = isAmpCacheUrl;
-goog.exportSymbol('amp.validator.isAmpCacheUrl', isAmpCacheUrl);
-
-/**
- * DEPRECATED. This now always returns ValidationResult set to FAIL.
- *
- * @param {!Document=} opt_doc ignored.
- * @return {!Object}
- */
-const validateInBrowser = function(opt_doc) {
-  console.log(VALIDATOR_DEPRECATED);
-  return validationResult;
-};
-exports.validateInBrowser = validateInBrowser;
-goog.exportSymbol('amp.validator.validateInBrowser', validateInBrowser);
-
-/**
- * DEPRECATED. This now always returns an error message stating this is
- * deprecated and to use validator_wasm.js instead.
- *
- * @param {string} url ignored.
- * @param {!Document=} opt_doc ignored.
- */
-const validateUrlAndLog = function(url, opt_doc) {
-  console.log(VALIDATOR_DEPRECATED);
-};
-exports.validateUrlAndLog = validateUrlAndLog;
-goog.exportSymbol('amp.validator.validateUrlAndLog', validateUrlAndLog);
diff --git a/validator/js/engine/validator-in-browser.js b/validator/js/engine/validator-in-browser.js
deleted file mode 100644
index b747e10144c6..000000000000
--- a/validator/js/engine/validator-in-browser.js
+++ /dev/null
@@ -1,107 +0,0 @@
-goog.module('amp.validator.validatorInBrowser');
-
-const GoogPromise = goog.require('goog.Promise');
-const uriUtils = goog.require('goog.uri.utils');
-const validator = goog.require('amp.validator');
-const {ValidationResult} = goog.require('amp.validator.protogenerated');
-
-/**
- * Fetches the contents of a URL as a Promise.
- * @param {string} url
- * @return {!GoogPromise<string>} The fetched document.
- */
-function getUrl(url) {
-  return new GoogPromise(function(resolve, reject) {
-    const xhr = new XMLHttpRequest();
-
-    xhr.onreadystatechange = function() {
-      if (xhr.readyState == 4) {
-        if (xhr.status == 200) {
-          resolve(xhr.responseText);
-        } else {
-          reject('Fetching file for validation failed: ' + url);
-        }
-      }
-    };
-    xhr.open('GET', url, true);
-    xhr.send();
-  });
-}
-
-/**
- * Checks if the given URL is an AMP cache URL.
- * @param {string} url
- * @return {boolean}
- */
-const isAmpCacheUrl = function(url) {
-  return url.toLowerCase().indexOf('cdn.ampproject.org') !==
-      -1;  // lgtm [js/incomplete-url-substring-sanitization]
-};
-exports.isAmpCacheUrl = isAmpCacheUrl;
-goog.exportSymbol('amp.validator.isAmpCacheUrl', isAmpCacheUrl);
-
-/**
- * Validates doc in the browser by inspecting elements, attributes, etc. in
- * the DOM. This method is exported so it can be unit tested.
- * @param {!Document=} opt_doc
- * @return {!ValidationResult}
- */
-const validateInBrowser = function(opt_doc) {
-  const result = new ValidationResult();
-  result.status = ValidationResult.Status.UNKNOWN;
-
-  // If adding in-browser validation functions, please add them here.
-  // Note that result.status is set to UNKNOWN by default. If a routine
-  // finds an error, then it should be set to 'FAIL'. Otherwise, it
-  // should be left alone - that is, even for warnings it should be left
-  // at UNKNOWN, so as to not override a FAIL coming from
-  // validator.validateString below when we call mergeFrom.
-  return result;
-};
-exports.validateInBrowser = validateInBrowser;
-goog.exportSymbol('amp.validator.validateInBrowser', validateInBrowser);
-
-/**
- * Validates a URL input, logging to the console the result.
- * Careful when modifying this; it's called from
- * https://github.com/ampproject/amphtml/blob/main/src/validator-integration.js
- *
- * WARNING: This is exported; interface changes may break downstream users like
- * https://www.npmjs.com/package/amphtml-validator and
- * https://validator.amp.dev/.
-
- * @param {string} url
- * @param {!Document=} opt_doc
- */
-const validateUrlAndLog = function(url, opt_doc) {
-  if (isAmpCacheUrl(url)) {
-    console.error(
-        'Attempting to validate an AMP cache URL. Please use ' +
-        '#development=1 on the origin URL instead.');
-    return;
-  }
-  getUrl(url).then(
-      function(html) {  // Success
-        const fragment = uriUtils.getFragment(url);
-        let format = 'AMP';
-        if (fragment.indexOf('development') != -1) {
-          fragment.split('&').forEach(hashValue => {
-            const keyValue = hashValue.split('=');
-            if (keyValue[0] === 'development') {
-              format = keyValue[1] === '1' ? 'AMP' : format = keyValue[1];
-            }
-          });
-        }
-        const validationResult = validator.validateString(html, format);
-        if (opt_doc) {
-          const browserResult = validateInBrowser(opt_doc);
-          validationResult.mergeFrom(browserResult);
-        }
-        validationResult.outputToTerminal(url, undefined);
-      },
-      function(reason) {  // Failure
-        console.error(reason);
-      });
-};
-exports.validateUrlAndLog = validateUrlAndLog;
-goog.exportSymbol('amp.validator.validateUrlAndLog', validateUrlAndLog);
diff --git a/validator/js/engine/validator.js b/validator/js/engine/validator.js
deleted file mode 100644
index 238e158d071d..000000000000
--- a/validator/js/engine/validator.js
+++ /dev/null
@@ -1,7436 +0,0 @@
-goog.module('amp.validator');
-const VALIDATE_CSS = goog.require('amp.validator.VALIDATE_CSS');
-const amp4ads = goog.require('amp.validator.validateAmp4AdsCss');
-const asserts = goog.require('goog.asserts');
-const createRules = goog.require('amp.validator.createRules');
-const generated = goog.require('amp.validator.protogenerated');
-const googArray = goog.require('goog.array');
-const googString = goog.require('goog.string');
-const htmlparser = goog.require('amp.htmlparser');
-const keyframes = goog.require('amp.validator.keyframesParseCss');
-const parse_css = goog.require('parse_css');
-const parse_srcset = goog.require('parse_srcset');
-const parse_url = goog.require('parse_url');
-const parserInterface = goog.require('amp.htmlparser.interface');
-const tokenize_css = goog.require('tokenize_css');
-const uriUtils = goog.require('goog.uri.utils');
-
-/**
- * Sorts and eliminates duplicates in |arrayValue|. Modifies the input in place.
- *
- * WARNING: This is exported; htmlparser changes may break downstream users like
- * https://www.npmjs.com/package/amphtml-validator and
- * https://validator.amp.dev/.
- *
- * @param {!Array<T>} arrayValue
- * @template T
- */
-function sortAndUniquify(arrayValue) {
-  if (arrayValue.length < 2) {
-    return;
-  }
-
-  googArray.sort(arrayValue);
-  let uniqIdx = 0;
-  for (let i = 1; i < arrayValue.length; ++i) {
-    if (arrayValue[i] === arrayValue[uniqIdx]) {
-      continue;
-    }
-    uniqIdx++;
-    if (uniqIdx !== i) {
-      arrayValue[uniqIdx] = arrayValue[i];
-    }
-  }
-  arrayValue.splice(uniqIdx + 1);
-}
-exports.sortAndUniquify = sortAndUniquify;
-
-/**
- * Computes the difference set |left| - |right|, assuming |left| and
- * |right| are sorted and uniquified.
- *
- * WARNING: This is exported; htmlparser changes may break downstream users like
- * https://www.npmjs.com/package/amphtml-validator and
- * https://validator.amp.dev/.
- *
- * @param {!Array<T>} left
- * @param {!Array<T>} right
- * @return {!Array<T>} Computed difference of left - right.
- * @template T
- */
-function subtractDiff(left, right) {
-  let l = 0;
-  let r = 0;
-  const diff = [];
-  while (l < left.length) {
-    if (r >= right.length) {
-      diff.push(left[l]);
-      l++;
-    } else if (right[r] > left[l]) {
-      diff.push(left[l]);
-      l++;
-    } else if (right[r] < left[l]) {
-      r++;
-    } else {
-      asserts.assert(right[r] === left[l]);
-      l++;
-      r++;
-    }
-  }
-  return diff;
-}
-exports.subtractDiff = subtractDiff;
-
-/**
- * A line / column pair.
- * @private
- */
-class LineCol {
-  /**
-   * @param {number} line
-   * @param {number} col
-   */
-  constructor(line, col) {
-    this.line_ = line;
-    this.col_ = col;
-  }
-
-  /** @return {number} */
-  getLine() {
-    return this.line_;
-  }
-
-  /** @return {number} */
-  getCol() {
-    return this.col_;
-  }
-}
-
-/**
- * Construct a ValidationError object from the given argument list.
- * @param {!generated.ValidationError.Severity} severity
- * @param {!generated.ValidationError.Code} validationErrorCode Error code
- * @param {!LineCol} lineCol a line / column pair.
- * @param {!Array<string>} params
- * @param {?string} specUrl a link (URL) to the amphtml spec
- * @return {!generated.ValidationError}
- */
-function populateError(
-    severity, validationErrorCode, lineCol, params, specUrl) {
-  const error = new generated.ValidationError();
-  error.severity = severity;
-  error.code = validationErrorCode;
-  error.params = params;
-  error.line = lineCol.getLine();
-  error.col = lineCol.getCol();
-  error.specUrl = (specUrl === null ? '' : specUrl);
-  return error;
-}
-
-/**
- * ParsedUrlSpec is used for both ParsedAttrSpec and ParsedCdataSpec, to
- * check URLs. The main logic is in ParsedUrlSpec.ValidateUrlAndProtocol,
- * which gets instantiated with two different adapter classes, which
- * emit errors either for URLs in attribute values or URLs in templates.
- * @private
- */
-class ParsedUrlSpec {
-  /**
-   * Note that the spec can be null.
-   * @param {!generated.UrlSpec} spec
-   */
-  constructor(spec) {
-    /**
-     * @type {!generated.UrlSpec}
-     * @private
-     */
-    this.spec_ = spec;
-
-    /**
-     * @type {!Object<string, number>}
-     * @private
-     */
-    this.allowedProtocols_ = Object.create(null);
-    if (this.spec_ !== null) {
-      for (const protocol of this.spec_.protocol) {
-        this.allowedProtocols_[protocol] = 0;
-      }
-    }
-  }
-
-  /** @return {!generated.UrlSpec} */
-  getSpec() {
-    return this.spec_;
-  }
-
-  /**
-   * @param {string} protocol
-   * @return {boolean}
-   */
-  isAllowedProtocol(protocol) {
-    return protocol in this.allowedProtocols_;
-  }
-}
-
-/** @private */
-class ParsedValueProperties {
-  /** @param {!generated.PropertySpecList} spec */
-  constructor(spec) {
-    /**
-     * @type {!Object<string, !generated.PropertySpec>}
-     * @private
-     */
-    this.valuePropertyByName_ = Object.create(null);
-    /**
-     * @type {!Array<string>}
-     * @private
-     */
-    this.mandatoryValuePropertyNames_ = [];
-
-    for (const propertySpec of spec.properties) {
-      this.valuePropertyByName_[propertySpec.name] = propertySpec;
-      if (propertySpec.mandatory) {
-        this.mandatoryValuePropertyNames_.push(propertySpec.name);
-      }
-    }
-    googArray.sort(this.mandatoryValuePropertyNames_);
-  }
-
-  /** @return {!Object<string, !generated.PropertySpec>} */
-  getValuePropertyByName() {
-    return this.valuePropertyByName_;
-  }
-
-  /** @return {!Array<string>} */
-  getMandatoryValuePropertyNames() {
-    return this.mandatoryValuePropertyNames_;
-  }
-}
-
-/**
- * This wrapper class provides access to an generated.AttrSpec and
- * an attribute id which is unique within its context
- * (e.g., it's unique within the ParsedTagSpec).
- * @private
- */
-class ParsedAttrSpec {
-  /**
-   * @param {!generated.AttrSpec} attrSpec
-   * @param {number} attrId
-   */
-  constructor(attrSpec, attrId) {
-    /**
-     * JSON Attribute Spec dictionary.
-     * @type {!generated.AttrSpec}
-     * @private
-     */
-    this.spec_ = attrSpec;
-
-    /**
-     * Globally unique attribute rule id.
-     * @type {number}
-     * @private
-     */
-    this.id_ = attrId;
-
-    /**
-     * @type {?ParsedUrlSpec}
-     * @private
-     */
-    this.valueUrlSpec_ = null;
-
-    /**
-     * @type {?ParsedValueProperties}
-     * @private
-     */
-    this.valueProperties_ = null;
-
-    /**
-     * @type {!Object<string, !generated.CssDeclaration>}
-     * @private
-     */
-    this.cssDeclarationByName_ = Object.create(null);
-
-    for (const cssDeclaration of attrSpec.cssDeclaration) {
-      if (cssDeclaration.name) {
-        this.cssDeclarationByName_[cssDeclaration.name] = cssDeclaration;
-      }
-    }
-  }
-
-  /**
-   * @return {number} unique for this attr spec.
-   */
-  getId() {
-    return this.id_;
-  }
-
-  /**
-   * @return {!generated.AttrSpec}
-   */
-  getSpec() {
-    return this.spec_;
-  }
-
-  /**
-   * @return {!ParsedUrlSpec}
-   */
-  getValueUrlSpec() {
-    if (this.valueUrlSpec_ === null) {
-      this.valueUrlSpec_ = new ParsedUrlSpec(
-          /** @type{!generated.UrlSpec} */ (this.spec_.valueUrl));
-    }
-    return this.valueUrlSpec_;
-  }
-
-  /**
-   * @return {ParsedValueProperties}
-   */
-  getValuePropertiesOrNull() {
-    if (this.spec_.valueProperties === null) {
-      return null;
-    }
-    if (this.valueProperties_ === null) {
-      this.valueProperties_ =
-          new ParsedValueProperties(this.spec_.valueProperties);
-    }
-    return this.valueProperties_;
-  }
-
-  /**
-   * @return {!Object<string, !generated.CssDeclaration>}
-   */
-  getCssDeclarationByName() {
-    return this.cssDeclarationByName_;
-  }
-
-  /**
-   * Returns true if this generated.AttrSpec should be used for the given type
-   * identifiers based on the generated.AttrSpec's disabled_by or enabled_by
-   * fields.
-   * @param {!Array<string>} typeIdentifiers
-   * @return {boolean}
-   */
-  isUsedForTypeIdentifiers(typeIdentifiers) {
-    return isUsedForTypeIdentifiers(
-        typeIdentifiers, this.spec_.enabledBy, this.spec_.disabledBy);
-  }
-}
-
-/**
- * For uniquely identifying a tag spec, we either find the specName in the tag
- * spec or fall back to the tagName.
- * @param {!generated.TagSpec} tagSpec generated.TagSpec instance from the
- *   validator.protoscii file.
- * @return {string}
- * @private
- */
-function getTagSpecName(tagSpec) {
-  return (tagSpec.specName !== null) ? tagSpec.specName :
-                                       tagSpec.tagName.toLowerCase();
-}
-
-/**
- * For creating error messages, we either find the descriptiveName in the tag
- * spec or fall back to the tagName.
- * @param {!generated.TagSpec} tagSpec generated.TagSpec instance from the
- *   validator.protoscii file.
- * @return {string}
- * @private
- */
-function getTagDescriptiveName(tagSpec) {
-  return (tagSpec.descriptiveName !== null) ? tagSpec.descriptiveName :
-                                              tagSpec.tagName.toLowerCase();
-}
-
-/**
- * For creating error URLs, we either find the specUrl in the tag spec or fall
- * back to the extension spec URL if available.
- * @param {!generated.TagSpec|!ParsedTagSpec} tagSpec
- * @return {string}
- * @private
- */
-function getTagSpecUrl(tagSpec) {
-  // Handle a ParsedTagSpec as well as a tag spec.
-  // TODO(gregable): This is a bit hacky, we should improve on this approach
-  // in the future.
-  if (tagSpec.getSpec !== undefined) {
-    return getTagSpecUrl(tagSpec.getSpec());
-  }
-
-  if (tagSpec.specUrl !== null) {
-    return tagSpec.specUrl;
-  }
-
-  const extensionSpecUrlPrefix = 'https://amp.dev/documentation/components/';
-  if (tagSpec.extensionSpec !== null && tagSpec.extensionSpec.name !== null) {
-    return extensionSpecUrlPrefix + tagSpec.extensionSpec.name;
-  }
-  if (tagSpec.requiresExtension.length > 0) {
-    // Return the first |requires_extension|, which should be the most
-    // representitive.
-    return extensionSpecUrlPrefix + tagSpec.requiresExtension[0];
-  }
-
-  return '';
-}
-
-/**
- * Returns true if this spec should be used for the given type identifiers
- * based on the spec's disabled_by or enabled_by fields.
- * @param {!Array<string>} typeIdentifiers
- * @param {!Array<string>} enabledBys
- * @param {!Array<string>} disabledBys
- * @return {boolean}
- */
-function isUsedForTypeIdentifiers(typeIdentifiers, enabledBys, disabledBys) {
-  if (enabledBys.length > 0) {
-    for (const enabledBy of enabledBys) {
-      // Is enabled by a given type identifier, use.
-      if (typeIdentifiers.includes(enabledBy)) {
-        return true;
-      }
-    }
-    // Is not enabled for these type identifiers, do not use.
-    return false;
-  } else if (disabledBys.length > 0) {
-    for (const disabledBy of disabledBys) {
-      // Is disabled by a given type identifier, do not use.
-      if (typeIdentifiers.includes(disabledBy)) {
-        return false;
-      }
-    }
-    // Is not disabled for these type identifiers, use.
-    return true;
-  }
-  // Is not enabled nor disabled for any type identifiers, use.
-  return true;
-}
-
-/**
- * Holds the reference points for a particular parent tag spec, including
- * their resolved tagspec ids.
- * @private
- */
-class ParsedReferencePoints {
-  /**
-   * @param {!generated.TagSpec} parentTagSpec
-   */
-  constructor(parentTagSpec) {
-    /**
-     * @type {!generated.TagSpec}
-     * @private
-     */
-    this.parentTagSpec_ = parentTagSpec;
-  }
-
-  /** @return {!Array<!generated.ReferencePoint>} */
-  iterate() {
-    return this.parentTagSpec_.referencePoints;
-  }
-
-  /** @return {boolean} */
-  empty() {
-    return this.size() === 0;
-  }
-
-  /** @return {number} */
-  size() {
-    return this.parentTagSpec_.referencePoints.length;
-  }
-
-  /** @return {?string} */
-  parentSpecUrl() {
-    return getTagSpecUrl(this.parentTagSpec_);
-  }
-
-  /** @return {string} */
-  parentTagSpecName() {
-    return getTagSpecName(this.parentTagSpec_);
-  }
-}
-
-/**
- * Wrapper around DocSpec.
- * @private
- */
-class ParsedDocSpec {
-  /**
-   * @param {!generated.DocSpec} spec
-   */
-  constructor(spec) {
-    /**
-     * @type {!generated.DocSpec}
-     * @private
-     */
-    this.spec_ = spec;
-  }
-
-  /** @return {!generated.DocSpec} */
-  spec() {
-    return this.spec_;
-  }
-
-  /** @return {!Array<string>} */
-  disabledBy() {
-    return this.spec_.disabledBy;
-  }
-
-  /** @return {!Array<string>} */
-  enabledBy() {
-    return this.spec_.enabledBy;
-  }
-}
-
-/**
- * Wrapper around DocCssSpec.
- * @private
- */
-class ParsedDocCssSpec {
-  /**
-   * @param {!generated.DocCssSpec} spec
-   * @param {!Array<!generated.DeclarationList>} declLists
-   */
-  constructor(spec, declLists) {
-    /**
-     * @type {!generated.DocCssSpec}
-     * @private
-     */
-    this.spec_ = spec;
-
-    /**
-     * @type {!Object<string, !generated.CssDeclaration>}
-     * @private
-     */
-    this.cssDeclarationByName_ = Object.create(null);
-
-    /**
-     * @type {!Object<string, !generated.CssDeclaration>}
-     * @private
-     */
-    this.cssDeclarationSvgByName_ = Object.create(null);
-
-    for (const declaration of spec.declaration) {
-      if (declaration.name === null) continue;
-      this.cssDeclarationByName_[declaration.name] = declaration;
-      this.cssDeclarationSvgByName_[declaration.name] = declaration;
-    }
-    for (const declaration of spec.declarationSvg) {
-      if (declaration.name === null) continue;
-      this.cssDeclarationSvgByName_[declaration.name] = declaration;
-    }
-    // Expand the list of declarations tracked by this spec by merging in any
-    // declarations mentioned in declaration_lists referenced by this spec. This
-    // mechanism reduces redundancy in the lists themselves, making rules more
-    // readable.
-    for (const declListName of spec.declarationList) {
-      for (const declList of declLists) {
-        if (declList.name === declListName) {
-          for (const declaration of declList.declaration) {
-            if (declaration.name !== null) {
-              this.cssDeclarationByName_[declaration.name] = declaration;
-              this.cssDeclarationSvgByName_[declaration.name] = declaration;
-            }
-          }
-        }
-      }
-    }
-    for (const declListName of spec.declarationListSvg) {
-      for (const declList of declLists) {
-        if (declList.name === declListName) {
-          for (const declaration of declList.declaration) {
-            if (declaration.name !== null)
-              this.cssDeclarationSvgByName_[declaration.name] = declaration;
-          }
-        }
-      }
-    }
-
-    /**
-     * @type {!ParsedUrlSpec}
-     * @private
-     */
-    this.parsedImageUrlSpec_ = new ParsedUrlSpec(
-        /** @type{!generated.UrlSpec} */ (spec.imageUrlSpec));
-
-    /**
-     * @type {!ParsedUrlSpec}
-     * @private
-     */
-    this.parsedFontUrlSpec_ = new ParsedUrlSpec(
-        /** @type{!generated.UrlSpec} */ (spec.fontUrlSpec));
-  }
-
-  /** @return {!generated.DocCssSpec} */
-  spec() {
-    return this.spec_;
-  }
-
-  /** @return {!Array<string>} */
-  disabledBy() {
-    return this.spec_.disabledBy;
-  }
-
-  /** @return {!Array<string>} */
-  enabledBy() {
-    return this.spec_.enabledBy;
-  }
-
-  /**
-   * @return {?generated.CssDeclaration}
-   * @param {string} candidate
-   * Returns the CssDeclaration rules for a matching css declaration name, if is
-   * found, else null.
-   */
-  cssDeclarationByName(candidate) {
-    let key = candidate.toLowerCase();
-    if (this.spec_.expandVendorPrefixes) key = parse_css.stripVendorPrefix(key);
-    const cssDeclaration = this.cssDeclarationByName_[key];
-    if (cssDeclaration !== undefined) {
-      return cssDeclaration;
-    }
-    return null;
-  }
-
-  /**
-   * @return {?generated.CssDeclaration}
-   * @param {string} candidate
-   * Returns the CssDeclaration rules for a matching css declaration name, if is
-   * found, else null.
-   */
-  cssDeclarationSvgByName(candidate) {
-    let key = candidate.toLowerCase();
-    if (this.spec_.expandVendorPrefixes) key = parse_css.stripVendorPrefix(key);
-    const cssDeclaration = this.cssDeclarationSvgByName_[key];
-    if (cssDeclaration !== undefined) {
-      return cssDeclaration;
-    }
-    return null;
-  }
-
-  /** @return {!ParsedUrlSpec} */
-  imageUrlSpec() {
-    return this.parsedImageUrlSpec_;
-  }
-
-  /** @return {!ParsedUrlSpec} */
-  fontUrlSpec() {
-    return this.parsedFontUrlSpec_;
-  }
-}
-
-/**
- * TagSpecs specify attributes that are valid for a particular tag.
- * They can also reference lists of attributes (AttrLists), thereby
- * sharing those definitions. This abstraction instantiates
- * ParsedAttrSpec for each generated.AttrSpec (from validator-*.protoascii,
- * our specification file) exactly once, and provides quick access to the attr
- * spec names as well, including for simple attr specs (those which only have
- * a name but no specification for their value).
- * @private
- */
-class ParsedAttrSpecs {
-  /**
-   * @param {!generated.ValidatorRules} rules
-   */
-  constructor(rules) {
-    /** @type {!Array<!Array<number>>} */
-    this.attrLists = rules.directAttrLists;
-
-    /** @type {!Array<number>} */
-    this.globalAttrs = rules.globalAttrs;
-
-    /** @type {!Array<number>} */
-    this.ampLayoutAttrs = rules.ampLayoutAttrs;
-
-    /**
-     * The generated.AttrSpec instances, indexed by attr spec ids.
-     * @private @type {!Array<!generated.AttrSpec>}
-     */
-    this.attrSpecs_ = rules.attrs;
-
-    /**
-     * @private @type {!Array<string>}
-     */
-    this.internedStrings_ = rules.internedStrings;
-
-    /**
-     * The already instantiated ParsedAttrSpec instances, indexed by
-     * attr spec ids.
-     * @private @type {!Array<!ParsedAttrSpec>}
-     */
-    this.parsedAttrSpecs_ = new Array(rules.attrs.length);
-  }
-
-  /**
-   * @param {number} id
-   * @return {!ParsedAttrSpec}
-   */
-  getByAttrSpecId(id) {
-    if (this.parsedAttrSpecs_.hasOwnProperty(id)) {
-      return this.parsedAttrSpecs_[id];
-    }
-    const parsed = new ParsedAttrSpec(this.attrSpecs_[id], id);
-    this.parsedAttrSpecs_[id] = parsed;
-    return parsed;
-  }
-
-  /**
-   * @param {number} id
-   * @return {string}
-   */
-  getNameByAttrSpecId(id) {
-    if (id < 0) {
-      return this.internedStrings_[-1 - id];
-    }
-    return this.attrSpecs_[id].name;
-  }
-}
-
-/** @enum {string} */
-const RecordValidated = {
-  ALWAYS: 'ALWAYS',
-  NEVER: 'NEVER',
-  IF_PASSING: 'IF_PASSING'
-};
-
-/**
- * We only track (that is, add them to Context.RecordTagspecValidated)
- * validated tagspecs as necessary. That is, if it's needed for document scope
- * validation:
- * - Mandatory tags
- * - Unique tags
- * - Tags (identified by their TagSpecName() that are required by other tags.
- * @param {!generated.TagSpec} tag
- * @param {number} tagSpecId
- * @param {!Array<boolean>} tagSpecIdsToTrack
- * @return {!RecordValidated}
- */
-function shouldRecordTagspecValidated(tag, tagSpecId, tagSpecIdsToTrack) {
-  // Always update from TagSpec if the tag is passing. If it's failing we
-  // typically want to update from the best match as it can satisfy
-  // requirements which otherwise can confuse the user later. The exception is
-  // tagspecs which introduce requirements but satisfy none, such as unique.
-  // https://github.com/ampproject/amphtml/issues/24359
-
-  // Mandatory and tagSpecIdsToTrack only satisfy requirements, making the
-  // output less verbose even if the tag is failing.
-  if (tag.mandatory || tagSpecIdsToTrack.hasOwnProperty(tagSpecId))
-    return RecordValidated.ALWAYS;
-  // Unique and similar can introduce requirements, ie: there cannot be
-  // another such tag. We don't want to introduce requirements for failing
-  // tags.
-  if (tag.unique || tag.requires.length > 0 || tag.uniqueWarning)
-    return RecordValidated.IF_PASSING;
-  return RecordValidated.NEVER;
-}
-
-/**
- * This wrapper class provides access to a TagSpec and a tag id
- * which is unique within its context, the ParsedValidatorRules.
- * @private
- */
-class ParsedTagSpec {
-  /**
-   * @param {!ParsedAttrSpecs} parsedAttrSpecs
-   * @param {!RecordValidated} shouldRecordTagspecValidated
-   * @param {!generated.TagSpec} tagSpec
-   * @param {number} id
-   */
-  constructor(parsedAttrSpecs, shouldRecordTagspecValidated, tagSpec, id) {
-    /**
-     * @type {!generated.TagSpec}
-     * @private
-     */
-    this.spec_ = tagSpec;
-    /**
-     * @type {number}
-     * @private
-     */
-    this.id_ = id;
-    /**
-     * @type {!ParsedReferencePoints}
-     * @private
-     */
-    this.referencePoints_ = new ParsedReferencePoints(tagSpec);
-    /**
-     * @type {boolean}
-     * @private
-     */
-    this.isReferencePoint_ = (tagSpec.tagName === '$REFERENCE_POINT');
-    /**
-     * @type {boolean}
-     * @private
-     */
-    this.isTypeJson_ = false;
-    /**
-     * @type {!RecordValidated}
-     * @private
-     */
-    this.shouldRecordTagspecValidated_ = shouldRecordTagspecValidated;
-    /**
-     * @type {boolean}
-     * @private
-     */
-    this.attrsCanSatisfyExtension_ = false;
-    /**
-     * ParsedAttributes keyed by name.
-     * @type {!Object<string, number>}
-     * @private
-     */
-    this.attrsByName_ = Object.create(null);
-    /**
-     * Attribute ids that are mandatory for this tag to legally validate.
-     * @type {!Array<number>}
-     * @private
-     */
-    this.mandatoryAttrIds_ = [];
-    /**
-     * @type {!Array<number>}
-     * @private
-     */
-    this.mandatoryOneofs_ = [];
-    /**
-     * @type {!Array<number>}
-     * @private
-     */
-    this.mandatoryAnyofs_ = [];
-    /**
-     * @type {!Array<number>}
-     * @private
-     */
-    this.implicitAttrspecs_ = [];
-    /**
-     * @type {boolean}
-     * @private
-     */
-    this.containsUrl_ = false;
-
-    // Collect the attr spec ids for a given |tagspec|.
-    // There are four ways to specify attributes:
-    // (1) implicitly by a tag spec, if the tag spec has the amp_layout field
-    // set - in this case, the AMP_LAYOUT_ATTRS are assumed;
-    // (2) within a TagSpec::attrs;
-    // (3) via TagSpec::attr_lists which references lists by key;
-    // (4) within the $GLOBAL_ATTRS TagSpec::attr_list.
-    // It's possible to provide multiple specifications for the same attribute
-    // name, but for any given tag only one such specification can be active.
-    // The precedence is (1), (2), (3), (4)
-    // If tagSpec.explicitAttrsOnly is true then only collect the attributes
-    // from (2) and (3).
-
-    // (1) layout attrs (except when explicitAttrsOnly is true).
-    if (!tagSpec.explicitAttrsOnly && tagSpec.ampLayout !== null &&
-        !this.isReferencePoint_) {
-      this.mergeAttrs(parsedAttrSpecs.ampLayoutAttrs, parsedAttrSpecs);
-    }
-    // (2) attributes specified within |tagSpec|.
-    this.mergeAttrs(tagSpec.attrs, parsedAttrSpecs);
-
-    // (3) attributes specified via reference to an attr_list.
-    for (const id of tagSpec.attrLists) {
-      this.mergeAttrs(parsedAttrSpecs.attrLists[id], parsedAttrSpecs);
-    }
-    // (4) attributes specified in the global_attr list (except when
-    // explicitAttrsOnly is true).
-    if (!tagSpec.explicitAttrsOnly && !this.isReferencePoint_) {
-      this.mergeAttrs(parsedAttrSpecs.globalAttrs, parsedAttrSpecs);
-    }
-    sortAndUniquify(this.mandatoryOneofs_);
-    sortAndUniquify(this.mandatoryAnyofs_);
-    sortAndUniquify(this.mandatoryAttrIds_);
-
-    /**
-     * @type {!Array<string>}
-     * @private
-     */
-    this.dispatchKeys_ = [];
-    for (const attrName of Object.keys(this.attrsByName_)) {
-      const attrId = this.attrsByName_[attrName];
-      if (attrId < 0)  // negative attr ids are simple attrs (only name set).
-        continue;
-      const parsedAttrSpec = parsedAttrSpecs.getByAttrSpecId(attrId);
-      const attrSpec = parsedAttrSpec.getSpec();
-      if (attrSpec.dispatchKey !== null) {
-        const mandatoryParent =
-            tagSpec.mandatoryParent !== null ? tagSpec.mandatoryParent : '';
-        if (attrSpec.value.length > 0) {
-          this.dispatchKeys_.push(makeDispatchKey(
-              attrSpec.dispatchKey, attrName, attrSpec.value[0].toLowerCase(),
-              mandatoryParent));
-        } else if (attrSpec.valueCasei.length > 0) {
-          this.dispatchKeys_.push(makeDispatchKey(
-              attrSpec.dispatchKey, attrName, attrSpec.valueCasei[0],
-              mandatoryParent));
-        } else {
-          this.dispatchKeys_.push(makeDispatchKey(
-              attrSpec.dispatchKey, attrName, '', mandatoryParent));
-        }
-      }
-    }
-  }
-
-  /**
-   * Merges the list of attrs into attrsByName, avoiding to merge in attrs
-   * with names that are already in attrsByName.
-   * @param {!Array<number>} attrs
-   * @param {!ParsedAttrSpecs} parsedAttrSpecs
-   */
-  mergeAttrs(attrs, parsedAttrSpecs) {
-    for (const attrId of attrs) {
-      const name = parsedAttrSpecs.getNameByAttrSpecId(attrId);
-      if (name in this.attrsByName_) {
-        continue;
-      }
-      this.attrsByName_[name] = attrId;
-      if (attrId < 0) {  // negative attr ids are simple attrs (only name set).
-        continue;
-      }
-      const attr = parsedAttrSpecs.getByAttrSpecId(attrId);
-      const spec = attr.getSpec();
-      if (spec.mandatory) {
-        this.mandatoryAttrIds_.push(attrId);
-      }
-      if (spec.mandatoryOneof !== null) {
-        this.mandatoryOneofs_.push(spec.mandatoryOneof);
-      }
-      if (spec.mandatoryAnyof !== null) {
-        this.mandatoryAnyofs_.push(spec.mandatoryAnyof);
-      }
-      for (const altName of spec.alternativeNames) {
-        this.attrsByName_[altName] = attrId;
-      }
-      if (spec.implicit) {
-        this.implicitAttrspecs_.push(attrId);
-      }
-      if (spec.name === 'type' && spec.valueCasei.length > 0) {
-        for (const v of spec.valueCasei) {
-          if (('application/json' === v) || ('application/ld+json' === v)) {
-            this.isTypeJson_ = true;
-            break;
-          }
-        }
-      }
-      if (spec.valueUrl) {
-        this.containsUrl_ = true;
-      }
-      if (spec.requiresExtension.length > 0) {
-        this.attrsCanSatisfyExtension_ = true;
-      }
-    }
-  }
-
-  /**
-   * Return the numerical id.
-   * @return {number}
-   */
-  id() {
-    return this.id_;
-  }
-
-  /**
-   * Return the original tag spec. This is the json object representation from
-   * amp.validator.createRules().
-   * @return {!generated.TagSpec}
-   */
-  getSpec() {
-    return this.spec_;
-  }
-
-  /**
-   * If tag has a cdata spec, returns a CdataMatcher, else null.
-   * @param {!LineCol} lineCol
-   * @return {?CdataMatcher}
-   */
-  cdataMatcher(lineCol) {
-    if (this.spec_.cdata !== null) {
-      return new CdataMatcher(this.spec_, lineCol);
-    }
-    return null;
-  }
-
-  /**
-   * If tag has a child_tag spec, returns a ChildTagMatcher, else null.
-   * @param {!LineCol} lineCol
-   * @return {?ChildTagMatcher}
-   */
-  childTagMatcher(lineCol) {
-    if (this.spec_.childTags !== null) {
-      return new ChildTagMatcher(this.spec_, lineCol);
-    }
-    return null;
-  }
-
-  /**
-   * If tag has a reference_point spec, returns a ReferencePointMatcher,
-   * else null.
-   * @param {!ParsedValidatorRules} rules
-   * @param {!LineCol} lineCol
-   * @return {?ReferencePointMatcher}
-   */
-  referencePointMatcher(rules, lineCol) {
-    if (this.hasReferencePoints()) {
-      return new ReferencePointMatcher(rules, this.referencePoints_, lineCol);
-    }
-    return null;
-  }
-
-  /**
-   * Returns true if this tagSpec contains an attribute of name "type" and
-   * value "application/json".
-   * @return {boolean}
-   */
-  isTypeJson() {
-    return this.isTypeJson_;
-  }
-
-  /**
-   * Returns true if this tagSpec contains a value_url field.
-   * @return {boolean}
-   */
-  containsUrl() {
-    return this.containsUrl_;
-  }
-
-  /**
-   * Returns true if this TagSpec should be used for the given type
-   * identifiers based on the TagSpec's disabled_by or enabled_by fields.
-   * @param {!Array<string>} typeIdentifiers
-   * @return {boolean}
-   */
-  isUsedForTypeIdentifiers(typeIdentifiers) {
-    return isUsedForTypeIdentifiers(
-        typeIdentifiers, this.spec_.enabledBy, this.spec_.disabledBy);
-  }
-
-  /**
-   * Returns an array (typically empty) of all unique dispatch keys for this
-   * tagspec. A dispatch key is a combination of attribute name, attribute
-   * value, and / or tag parent. If multiple TagSpecs have the same dispatch
-   * key, then the Tagwith the first instance of that dispatch key is used.
-   * When an encounttag matches this dispatch key, it is validated first
-   * against that first TagSpec in order to improve validation performance and
-   * error message selection. Not all TagSpecs have a dispatch key. If the
-   * attribute value is used (either value or value_casei), uses the first
-   * value from the protoascii.
-   * @return {!Array<string>}
-   */
-  GetDispatchKeys() {
-    return this.dispatchKeys_;
-  }
-
-
-  /**
-   * A TagSpec may specify other tags to be required as well, when that
-   * tag is used. This accessor returns the IDs for the tagspecs that
-   * are also required if |this| tag occurs in the document, but where
-   * such requirement is currently only a warning.
-   * @return {!Array<number>}
-   */
-  getAlsoRequiresTagWarning() {
-    return this.spec_.alsoRequiresTagWarning;
-  }
-
-  /**
-   * A TagSpec may specify generic conditions which are required if the
-   * tag is present. This accessor returns the list of those conditions.
-   * @return {!Array<number>}
-   */
-  requires() {
-    return this.spec_.requires;
-  }
-
-  /**
-   * A TagSpec may specify that another tag is excluded. This accessor returns
-   * the list of those tags.
-   * @return {!Array<number>}
-   */
-  excludes() {
-    return this.spec_.excludes;
-  }
-
-  /**
-   * Whether or not the tag should be recorded via
-   * Context.recordTagspecValidated_ if it was validated
-   * successfullly. For performance, this is only done for tags that are
-   * mandatory, unique, or possibly required by some other tag.
-   * @return {!RecordValidated}
-   */
-  shouldRecordTagspecValidated() {
-    return this.shouldRecordTagspecValidated_;
-  }
-
-  /** @return {boolean} */
-  isReferencePoint() {
-    return this.isReferencePoint_;
-  }
-
-  /** @return {boolean} */
-  hasReferencePoints() {
-    return !this.referencePoints_.empty();
-  }
-
-  /** @return {!ParsedReferencePoints} */
-  getReferencePoints() {
-    return this.referencePoints_;
-  }
-
-  /** @return {boolean} */
-  attrsCanSatisfyExtension() {
-    return this.attrsCanSatisfyExtension_;
-  }
-
-  /**
-   * @param {string} name
-   * @return {boolean}
-   */
-  hasAttrWithName(name) {
-    return name in this.attrsByName_;
-  }
-
-  /**
-   * @return {!Array<number>}
-   */
-  getImplicitAttrspecs() {
-    return this.implicitAttrspecs_;
-  }
-
-  /**
-   * @return {!Object<string, number>}
-   */
-  getAttrsByName() {
-    return this.attrsByName_;
-  }
-
-  /**
-   * @return {!Array<number>}
-   */
-  getMandatoryOneofs() {
-    return this.mandatoryOneofs_;
-  }
-
-  /**
-   * @return {!Array<number>}
-   */
-  getMandatoryAnyofs() {
-    return this.mandatoryAnyofs_;
-  }
-
-  /**
-   * @return {!Array<number>}
-   */
-  getMandatoryAttrIds() {
-    return this.mandatoryAttrIds_;
-  }
-}
-
-/**
- * Attempts to URI decode an attribute value. If URI decoding fails, it falls
- * back to calling unescape. We want to minimize the scope of this try/catch
- * to allow v8 to optimize more code.
- * @param {string} attrValue
- * @return {string}
- */
-function decodeAttrValue(attrValue) {
-  let decodedAttrValue;
-  try {
-    decodedAttrValue = decodeURIComponent(attrValue);
-  } catch (e) {
-    // This branch is best effort, since unescape is deprecated.
-    // However unescape appears to work even if the value is not a
-    // properly encoded attribute.
-    // TODO(powdercloud): We're currently using this to prohibit
-    // __amp_source_origin for URLs. We may want to introduce a
-    // global bad url functionality with patterns or similar, as opposed
-    // to applying this to every attribute that has a denylisted value
-    // regex.
-    decodedAttrValue = unescape(attrValue);
-  }
-  return decodedAttrValue;
-}
-
-/**
- * Merge results from another ValidationResult while dealing with the UNKNOWN
- *   status.
- * @this {!generated.ValidationResult}
- * @param {!generated.ValidationResult} other
- */
-generated.ValidationResult.prototype.mergeFrom = function(other) {
-  asserts.assert(this.status !== null);
-  asserts.assert(other.status !== null);
-  // Copy status only if fail. Failing is a terminal state.
-  if (other.status === generated.ValidationResult.Status.FAIL) {
-    this.status = generated.ValidationResult.Status.FAIL;
-  }
-  Array.prototype.push.apply(this.errors, other.errors);
-};
-
-/**
- * The child tag matcher evaluates ChildTagSpec. The constructor
- * provides the enclosing TagSpec for the parent tag so that we can
- * produce error messages mentioning the parent.
- * @private
- */
-class ChildTagMatcher {
-  /**
-   * @param {!generated.TagSpec} parentSpec
-   * @param {!LineCol} lineCol
-   */
-  constructor(parentSpec, lineCol) {
-    /**
-     * @type {!generated.TagSpec}
-     * @private
-     */
-    this.parentSpec_ = parentSpec;
-
-    /**
-     * @type {!LineCol}
-     * @private
-     */
-    this.lineCol_ = lineCol;
-
-    asserts.assert(this.parentSpec_.childTags !== null);
-  }
-
-  /** @return {!LineCol} */
-  getLineCol() {
-    return this.lineCol_;
-  }
-
-  /**
-   * @param {!parserInterface.ParsedHtmlTag} encounteredTag
-   * @param {!Context} context
-   * @param {!generated.ValidationResult} result
-   */
-  matchChildTagName(encounteredTag, context, result) {
-    const {childTags} = this.parentSpec_;
-    // Enforce child_tag_name_oneof: If at least one tag name is specified,
-    // then the child tags of the parent tag must have one of the provided
-    // tag names.
-    if (childTags.childTagNameOneof.length > 0) {
-      const names = childTags.childTagNameOneof;
-      if (names.indexOf(encounteredTag.upperName()) === -1) {
-        const allowedNames = '[\'' + names.join('\', \'') + '\']';
-        context.addError(
-            generated.ValidationError.Code.DISALLOWED_CHILD_TAG_NAME,
-            context.getLineCol(),
-            /* params */
-            [
-              encounteredTag.lowerName(),
-              getTagDescriptiveName(this.parentSpec_),
-              allowedNames.toLowerCase(),
-            ],
-            getTagSpecUrl(this.parentSpec_), result);
-      }
-    }
-    // Enforce first_child_tag_name_oneof: If at least one tag name is
-    // specified, then the first child of the parent tag must have one
-    // of the provided tag names.
-    if (childTags.firstChildTagNameOneof.length > 0 &&
-        context.getTagStack().parentChildCount() === 0) {
-      const names = childTags.firstChildTagNameOneof;
-      if (names.indexOf(encounteredTag.upperName()) === -1) {
-        const allowedNames = '[\'' + names.join('\', \'') + '\']';
-        context.addError(
-            generated.ValidationError.Code.DISALLOWED_FIRST_CHILD_TAG_NAME,
-            context.getLineCol(),
-            /* params */
-            [
-              encounteredTag.lowerName(),
-              getTagDescriptiveName(this.parentSpec_),
-              allowedNames.toLowerCase(),
-            ],
-            getTagSpecUrl(this.parentSpec_), result);
-      }
-    }
-  }
-
-  /**
-   * @param {!Context} context
-   * @param {!generated.ValidationResult} result
-   */
-  exitTag(context, result) {
-    const expectedNumChildTags =
-        this.parentSpec_.childTags.mandatoryNumChildTags;
-    if (expectedNumChildTags !== -1 &&
-        expectedNumChildTags !== context.getTagStack().parentChildCount()) {
-      context.addError(
-          generated.ValidationError.Code.INCORRECT_NUM_CHILD_TAGS,
-          this.getLineCol(),
-          /* params */
-          [
-            getTagDescriptiveName(this.parentSpec_),
-            expectedNumChildTags.toString(),
-            context.getTagStack().parentChildCount().toString(),
-          ],
-          getTagSpecUrl(this.parentSpec_), result);
-      return;
-    }
-
-    const expectedMinNumChildTags =
-        this.parentSpec_.childTags.mandatoryMinNumChildTags;
-    if (expectedMinNumChildTags !== -1 &&
-        context.getTagStack().parentChildCount() < expectedMinNumChildTags) {
-      context.addError(
-          generated.ValidationError.Code.INCORRECT_MIN_NUM_CHILD_TAGS,
-          this.getLineCol(),
-          /* params */
-          [
-            getTagDescriptiveName(this.parentSpec_),
-            expectedMinNumChildTags.toString(),
-            context.getTagStack().parentChildCount().toString(),
-          ],
-          getTagSpecUrl(this.parentSpec_), result);
-      return;
-    }
-  }
-}
-/**
- * Return type tuple for ValidateTag.
- * @typedef {{ validationResult: !generated.ValidationResult,
- *             bestMatchTagSpec: ?ParsedTagSpec,
- *             devModeSuppress: (boolean|undefined),
- *             inlineStyleCssBytes: number }}
- */
-let ValidateTagResult;
-
-/**
- * A tag may initialize this ReferencePointMatcher with its reference points.
- * Then, the matcher will be invoked for each child tag via ::Match,
- * and eventually it will be invoked upon exiting the parent tag.
- * @private
- */
-class ReferencePointMatcher {
-  /**
-   * @param {!ParsedValidatorRules} parsedValidatorRules
-   * @param {!ParsedReferencePoints} parsedReferencePoints
-   * @param {!LineCol} lineCol
-   */
-  constructor(parsedValidatorRules, parsedReferencePoints, lineCol) {
-    /**
-     * @type {!ParsedValidatorRules}
-     * @private
-     */
-    this.parsedValidatorRules_ = parsedValidatorRules;
-
-    /**
-     * @type {!ParsedReferencePoints}
-     * @private
-     */
-    this.parsedReferencePoints_ = parsedReferencePoints;
-
-    /**
-     * @type {!LineCol}
-     * @private
-     */
-    this.lineCol_ = lineCol;
-
-    /**
-     * @type {!Array<number>}
-     * @private
-     */
-    this.referencePointsMatched_ = [];
-
-    // Assert that this is not an empty reference point matcher.
-    asserts.assert(!parsedReferencePoints.empty());
-  }
-
-  /**
-   * @return {!LineCol}
-   */
-  getLineCol() {
-    return this.lineCol_;
-  }
-
-  /**
-   * This method gets invoked when matching a child tag of the parent
-   * that is specifying / requiring the reference points. So
-   * effectively, this method will try through the specified reference
-   * points and record them in this.referencePointsMatched_.
-   * @param {!parserInterface.ParsedHtmlTag} tag
-   * @param {!Context} context
-   * @return {ValidateTagResult} result
-   */
-  validateTag(tag, context) {
-    // Look for a matching reference point, if we find one, record and exit.
-    /** @type {!ValidateTagResult} */
-    let resultForBestAttempt = {
-      validationResult: new generated.ValidationResult(),
-      bestMatchTagSpec: null,
-      inlineStyleCssBytes: 0,
-    };
-    resultForBestAttempt.validationResult.status =
-        generated.ValidationResult.Status.UNKNOWN;
-    for (const p of this.parsedReferencePoints_.iterate()) {
-      // p.tagSpecName here is actually a number, which was replaced in
-      // validator_gen_js.py from the name string, so this works.
-      const parsedTagSpec = context.getRules().getByTagSpecId(
-          /** @type {number} */ (p.tagSpecName));
-      // Skip TagSpecs that aren't used for these type identifiers.
-      if (!parsedTagSpec.isUsedForTypeIdentifiers(
-              context.getTypeIdentifiers())) {
-        continue;
-      }
-      const resultForAttempt = validateTagAgainstSpec(
-          parsedTagSpec, /*bestMatchReferencePoint=*/ null, context, tag);
-      if (context.getRules().betterValidationResultThan(
-              resultForAttempt.validationResult,
-              resultForBestAttempt.validationResult)) {
-        resultForBestAttempt = resultForAttempt;
-      }
-      if (resultForBestAttempt.validationResult.status ===
-          generated.ValidationResult.Status.PASS) {
-        resultForBestAttempt.bestMatchTagSpec = parsedTagSpec;
-        return resultForBestAttempt;
-      }
-    }
-    // This check cannot fail as a successful validation above exits early.
-    asserts.assert(
-        resultForBestAttempt.validationResult.status ===
-        generated.ValidationResult.Status.FAIL);
-    // Special case: only one reference point defined - emit a singular
-    // error message *and* merge in the errors from the best attempt above.
-    if (this.parsedReferencePoints_.size() === 1) {
-      context.addError(
-          generated.ValidationError.Code
-              .CHILD_TAG_DOES_NOT_SATISFY_REFERENCE_POINT_SINGULAR,
-          context.getLineCol(),
-          /*params*/
-          [
-            tag.lowerName(),
-            this.parsedReferencePoints_.parentTagSpecName(),
-            this.parsedValidatorRules_.getReferencePointName(
-                this.parsedReferencePoints_.iterate()[0]),
-          ],
-          this.parsedReferencePoints_.parentSpecUrl(),
-          resultForBestAttempt.validationResult);
-      return resultForBestAttempt;
-    }
-    // General case: more than one reference point defined. Emit a plural
-    // message with the acceptable reference points listed.
-    const acceptable = [];
-    for (const p of this.parsedReferencePoints_.iterate()) {
-      acceptable.push(this.parsedValidatorRules_.getReferencePointName(p));
-    }
-    const resultForMultipleAttempts = new generated.ValidationResult();
-    context.addError(
-        generated.ValidationError.Code
-            .CHILD_TAG_DOES_NOT_SATISFY_REFERENCE_POINT,
-        context.getLineCol(),
-        /*params*/
-        [
-          tag.lowerName(),
-          this.parsedReferencePoints_.parentTagSpecName(),
-          acceptable.join(', '),
-        ],
-        this.parsedReferencePoints_.parentSpecUrl(), resultForMultipleAttempts);
-    return {
-      validationResult: resultForMultipleAttempts,
-      bestMatchTagSpec: null,
-      inlineStyleCssBytes: 0,
-    };
-  }
-
-  /**
-   * @param {!ParsedTagSpec} parsedTagSpec
-   */
-  recordMatch(parsedTagSpec) {
-    this.referencePointsMatched_.push(parsedTagSpec.id());
-  }
-
-  /**
-   * This method gets invoked when we're done with processing all the
-   * child tags, so now we can determine whether any reference points
-   * remain unsatisfied or duplicate.
-   * @param {!Context} context
-   * @param {!generated.ValidationResult} result
-   */
-  exitParentTag(context, result) {
-    /** @type {!Array<number>} */
-    const referencePointByCount = [];
-    for (const r of this.referencePointsMatched_) {
-      referencePointByCount[r] = referencePointByCount.hasOwnProperty(r) ?
-          (referencePointByCount[r] + 1) :
-          1;
-    }
-    for (const p of this.parsedReferencePoints_.iterate()) {
-      // p.tagSpecName here is actually a number, which was replaced in
-      // validator_gen_js.py from the name string, so this works.
-      const RefPointTagSpecId = /** @type {number} */ (p.tagSpecName);
-      if (p.mandatory &&
-          !referencePointByCount.hasOwnProperty(RefPointTagSpecId)) {
-        context.addError(
-            generated.ValidationError.Code.MANDATORY_REFERENCE_POINT_MISSING,
-            this.getLineCol(),
-            /*params*/
-            [
-              this.parsedValidatorRules_.getReferencePointName(p),
-              this.parsedReferencePoints_.parentTagSpecName(),
-            ],
-            this.parsedReferencePoints_.parentSpecUrl(), result);
-      }
-      if (p.unique && referencePointByCount.hasOwnProperty(RefPointTagSpecId) &&
-          referencePointByCount[RefPointTagSpecId] !== 1) {
-        context.addError(
-            generated.ValidationError.Code.DUPLICATE_REFERENCE_POINT,
-            this.getLineCol(),
-            /*params*/
-            [
-              this.parsedValidatorRules_.getReferencePointName(p),
-              this.parsedReferencePoints_.parentTagSpecName(),
-            ],
-            this.parsedReferencePoints_.parentSpecUrl(), result);
-      }
-    }
-  }
-}
-
-// Instances of this class specify which tag names (|allowedTags|)
-// are allowed as descendent tags of a particular tag (|tagName|).
-/**
- * @typedef {{ tagName: string,
- *             allowedTags: !Array<string>}}
- */
-let DescendantConstraints;
-
-/**
- * tagSpec and referencePoint are the ParsedTagSpecs that best matched the
- * stack entry. May be null. May not fully match.
- * @typedef {{ tagName: string,
- *             tagSpec: ?ParsedTagSpec,
- *             referencePoint: ?ParsedTagSpec,
- *             hasDescendantConstraintLists: boolean,
- *             numChildren: number,
- *             onlyChildTagName: string,
- *             onlyChildErrorLineCol: LineCol,
- *             lastChildTagName: string,
- *             lastChildUrl: string,
- *             lastChildErrorLineCol: LineCol,
- *             cdataMatcher: ?CdataMatcher,
- *             childTagMatcher: ?ChildTagMatcher,
- *             referencePointMatcher: ?ReferencePointMatcher,
- *             devMode: boolean }}
- */
-let TagStackEntry;
-
-/**
- * This abstraction keeps track of the tag names and ChildTagMatchers
- * as we enter / exit tags in the document. Closing tags is tricky:
- * - We assume that all end tags are optional and we close, that is, pop off
- *   tags our stack, lazily as we encounter parent closing tags. This part
- *   differs slightly from the behavior per spec: instead of closing an
- *   <option> tag when a following <option> tag is seen, we close it when the
- *   parent closing tag (in practice <select>) is encountered.
- * @private
- */
-class TagStack {
-  /** Creates an empty instance. */
-  constructor() {
-    /**
-     * The current tag name and its parents.
-     * @type {!Array<TagStackEntry>}
-     * @private
-     */
-    this.stack_ = [];
-
-    // // We always have one element on the stack. This simplifies certain
-    // checks, for example, allowing us to guarantee we can always return a
-    // value for parent().
-    this.stack_.push(this.createNewTagStackEntry('$ROOT'));
-
-    /**
-     * @type {!Array<DescendantConstraints>}
-     * @private
-     */
-    this.allowedDescendantsList_ = [];
-  }
-
-  /**
-   * @param {string} tagName
-   * @return {TagStackEntry} a new TagStackEntry.
-   */
-  createNewTagStackEntry(tagName) {
-    return {
-      tagName,
-      tagSpec: null,
-      referencePoint: null,
-      hasDescendantConstraintLists: false,
-      numChildren: 0,
-      onlyChildTagName: '',
-      onlyChildErrorLineCol: null,
-      lastChildSiblingCount: 0,
-      lastChildTagName: '',
-      lastChildUrl: '',
-      lastChildErrorLineCol: null,
-      cdataMatcher: null,
-      childTagMatcher: null,
-      referencePointMatcher: null,
-      devMode: false,
-    };
-  }
-
-  /**
-   * Enter a tag, opening a scope for child tags.
-   * @param {string} tagName
-   * @param {!ValidateTagResult} referencePointResult
-   * @param {!ValidateTagResult} tagResult
-   */
-  enterTag(tagName, referencePointResult, tagResult) {
-    const stackEntry = this.createNewTagStackEntry(tagName);
-    stackEntry.referencePoint = referencePointResult.bestMatchTagSpec;
-    stackEntry.tagSpec = tagResult.bestMatchTagSpec;
-    this.stack_.push(stackEntry);
-  }
-
-  /**
-   * Upon exiting a tag, validation for the current child tag matcher is
-   * triggered, e.g. for checking that the tag had some specified number
-   * of children.
-   * @param {!Context} context
-   * @param {!generated.ValidationResult} result
-   */
-  exitTag(context, result) {
-    asserts.assert(this.stack_.length > 0, 'Exiting an empty tag stack.');
-
-    this.unSetDescendantConstraintList();
-    const topStackEntry = this.back_();
-    if (topStackEntry.childTagMatcher !== null) {
-      topStackEntry.childTagMatcher.exitTag(context, result);
-    }
-    if (topStackEntry.referencePointMatcher !== null) {
-      topStackEntry.referencePointMatcher.exitParentTag(context, result);
-    }
-    this.stack_.pop();
-  }
-
-  /**
-   * Given a ValidateTagResult, update the tag stack entry at the top of the
-   * tag stack to add any constraints from the spec.
-   * @param {!ValidateTagResult} result
-   * @param {!ParsedValidatorRules} parsedRules
-   * @param {!LineCol} lineCol
-   * @private
-   */
-  updateStackEntryFromTagResult_(result, parsedRules, lineCol) {
-    if (result.devModeSuppress) this.setDevMode();
-    if (result.bestMatchTagSpec === null) {
-      return;
-    }
-    const parsedTagSpec = result.bestMatchTagSpec;
-
-    this.setReferencePointMatcher(
-        parsedTagSpec.referencePointMatcher(parsedRules, lineCol));
-
-    // The following only add new constraints, not new allowances, so
-    // only add the constraints if the validation passed.
-    if (result.validationResult.status ===
-        generated.ValidationResult.Status.PASS) {
-      this.setChildTagMatcher(parsedTagSpec.childTagMatcher(lineCol));
-      this.setCdataMatcher(parsedTagSpec.cdataMatcher(lineCol));
-      this.setDescendantConstraintList(parsedTagSpec, parsedRules);
-    }
-  }
-
-  /**
-   * Update tagstack state after validating an encountered tag. Called with
-   * the best matching specs, even if not a match.
-   * @param {!parserInterface.ParsedHtmlTag} encounteredTag
-   * @param {!ValidateTagResult} referencePointResult
-   * @param {!ValidateTagResult} tagResult
-   * @param {!ParsedValidatorRules} parsedRules
-   * @param {!LineCol} lineCol
-   */
-  updateFromTagResults(
-      encounteredTag, referencePointResult, tagResult, parsedRules, lineCol) {
-    // Keep track of the number of direct children this tag has, even as we
-    // pop in and out of them on the stack.
-    this.parentStackEntry_().numChildren++;
-
-    // Record in the parent element that a reference point has been satisfied,
-    // even if the reference point didn't match completely.
-    if (referencePointResult.bestMatchTagSpec !== null) {
-      asserts.assert(this.parentReferencePointMatcher() !== null);
-      this.parentReferencePointMatcher().recordMatch(
-          /** @type{!ParsedTagSpec} */ (referencePointResult.bestMatchTagSpec));
-    }
-
-    // The following only add new constraints, not new allowances, so
-    // only add the constraints if the validation passed.
-    if (tagResult.validationResult.status ===
-        generated.ValidationResult.Status.PASS) {
-      const parsedTagSpec = tagResult.bestMatchTagSpec;
-      const tagSpec = parsedTagSpec.getSpec();
-      // Record that this tag must not have any siblings.
-      if (tagSpec.siblingsDisallowed) {
-        this.tellParentNoSiblingsAllowed(tagSpec.tagName, lineCol);
-      }
-
-      // Record that this tag must be the last child of it's parent.
-      if (tagSpec.mandatoryLastChild) {
-        this.tellParentImTheLastChild(
-            getTagSpecName(tagSpec), getTagSpecUrl(tagSpec), lineCol);
-      }
-    }
-
-    // Add the tag to the stack, and then update the stack entry.
-    this.enterTag(encounteredTag.upperName(), referencePointResult, tagResult);
-
-    this.updateStackEntryFromTagResult_(
-        referencePointResult, parsedRules, lineCol);
-    this.updateStackEntryFromTagResult_(tagResult, parsedRules, lineCol);
-  }
-
-  /**
-   * Alias to the last element on the tag stack.
-   * @return {TagStackEntry}
-   * @private
-   */
-  back_() {
-    asserts.assert(this.stack_.length > 0, 'Exiting an empty tag stack.');
-    return this.stack_[this.stack_.length - 1];
-  }
-
-
-  /**
-   * Sets the child tag matcher for the tag currently on the stack.
-   * @param {?ChildTagMatcher} matcher
-   */
-  setChildTagMatcher(matcher) {
-    if (matcher !== null) {
-      this.back_().childTagMatcher = matcher;
-    }
-  }
-
-  /**
-   * @param {boolean} value
-   */
-  setHasDescendantConstraintLists(value) {
-    this.back_().hasDescendantConstraintLists = value;
-  }
-
-  /**
-   * Sets the cdata matcher for the tag currently on the stack.
-   * @param {?CdataMatcher} matcher
-   */
-  setCdataMatcher(matcher) {
-    if (matcher !== null) {
-      this.back_().cdataMatcher = matcher;
-    }
-  }
-
-  /**
-   * Returns the cdata matcher for the tag currently on the stack. If there
-   * is no cdata matcher, returns null.
-   * @return {?CdataMatcher}
-   */
-  cdataMatcher() {
-    return this.back_().cdataMatcher;
-  }
-
-  /**
-   * Sets the reference point matcher for the tag currently on the stack.
-   * @param {?ReferencePointMatcher} matcher
-   */
-  setReferencePointMatcher(matcher) {
-    if (matcher !== null) {
-      this.back_().referencePointMatcher = matcher;
-    }
-  }
-
-  /**
-   * Records that tag currently on the stack is using data-ampdevmode.
-   */
-  setDevMode() {
-    this.back_().devMode = true;
-  }
-
-  /**
-   * @return {?ReferencePointMatcher}
-   */
-  parentReferencePointMatcher() {
-    return this.parentStackEntry_().referencePointMatcher;
-  }
-
-  /**
-   * This method is called as we're visiting a tag; so the matcher we
-   * need here is the one provided/specified for the tag parent.
-   * @param {!parserInterface.ParsedHtmlTag} encounteredTag
-   * @param {!Context} context
-   * @param {!generated.ValidationResult} result
-   */
-  matchChildTagName(encounteredTag, context, result) {
-    const matcher = this.parentStackEntry_().childTagMatcher;
-    if (matcher !== null) {
-      matcher.matchChildTagName(encounteredTag, context, result);
-    }
-  }
-
-  /**
-   * The parent of the current stack entry.
-   * @return {TagStackEntry}
-   * @private
-   */
-  parentStackEntry_() {
-    asserts.assert(
-        this.stack_.length >= 1, 'Parent of empty $ROOT tag requested.');
-    return this.back_();
-  }
-
-  /**
-   * The name of the parent of the current tag.
-   * @return {string}
-   */
-  parentTagName() {
-    return this.parentStackEntry_().tagName;
-  }
-
-  /**
-   * The spec_name of the parent of the current tag if one exists, otherwise
-   * the tag_name.
-   * @return {string}
-   */
-  parentTagSpecName() {
-    if ((this.parentStackEntry_().tagSpec !== null) &&
-        (this.parentStackEntry_().tagSpec.getSpec().specName !== null)) {
-      return /** @type {string} */ (
-          this.parentStackEntry_().tagSpec.getSpec().specName);
-    }
-    return this.parentStackEntry_().tagName;
-  }
-
-  /**
-   * The number of children that have been discovered up to now by traversing
-   * the stack.
-   * @return {number}
-   */
-  parentChildCount() {
-    return this.parentStackEntry_().numChildren;
-  }
-
-  /**
-   * True if the current stack leaf has dev mode set.
-   * @return {boolean}
-   */
-  isDevMode() {
-    return this.parentStackEntry_().devMode;
-  }
-
-  /**
-   * Tells the parent of the current stack entry that it can only have 1 child
-   * and that child must be me (the current stack entry).
-   * @param {string} tagName The current stack entry's tag name.
-   * @param {!LineCol} lineCol
-   */
-  tellParentNoSiblingsAllowed(tagName, lineCol) {
-    this.parentStackEntry_().onlyChildTagName = tagName;
-    this.parentStackEntry_().onlyChildErrorLineCol = lineCol;
-  }
-
-  /**
-   * @return {!LineCol} The LineCol of the tag that set the rule.
-   */
-  parentOnlyChildErrorLineCol() {
-    return /** @type {!LineCol} */ (
-        this.parentStackEntry_().onlyChildErrorLineCol);
-  }
-
-  /**
-   * @return {string} The name of the tag that set the 'no siblings allowed'
-   * rule.
-   */
-  parentOnlyChildTagName() {
-    return this.parentStackEntry_().onlyChildTagName;
-  }
-
-  /**
-   * @return {boolean} true if this tag's parent has a child with 'no siblings
-   * allowed' rule. Else false.
-   */
-  parentHasChildWithNoSiblingRule() {
-    return this.parentOnlyChildTagName().length > 0;
-  }
-
-  /**
-   * Tells the parent of the current stack entry that its last child must be
-   * me (the current stack entry).
-   * @param {string} tagName The current stack entry's tag name.
-   * @param {string} url The current stack entry's spec url.
-   * @param {!LineCol} lineCol
-   */
-  tellParentImTheLastChild(tagName, url, lineCol) {
-    this.parentStackEntry_().lastChildTagName = tagName;
-    this.parentStackEntry_().lastChildErrorLineCol = lineCol;
-    this.parentStackEntry_().lastChildUrl = url;
-  }
-
-  /**
-   * @return {!LineCol} The LineCol of the tag that set the 'last child' rule.
-   */
-  parentLastChildErrorLineCol() {
-    return /** @type {!LineCol} */ (
-        this.parentStackEntry_().lastChildErrorLineCol);
-  }
-
-  /**
-   * @return {string} The name of the tag with the 'last child' rule.
-   */
-  parentLastChildTagName() {
-    return this.parentStackEntry_().lastChildTagName;
-  }
-
-  /**
-   * @return {string} The spec url of the last child.
-   */
-  parentLastChildUrl() {
-    return this.parentStackEntry_().lastChildUrl;
-  }
-
-  /**
-   * @return {boolean} true if this tag's parent has a child with 'last child'
-   * rule. Else false.
-   */
-  parentHasChildWithLastChildRule() {
-    return this.parentLastChildTagName().length > 0;
-  }
-
-  /**
-   * @return {boolean} true if this within <script type=application/json>.
-   *     Else
-   * false.
-   */
-  isScriptTypeJsonChild() {
-    return (this.parentStackEntry_().tagName === 'SCRIPT') &&
-        (this.parentStackEntry_().tagSpec !== null) &&
-        this.parentStackEntry_().tagSpec.isTypeJson();
-  }
-
-  /**
-   * @return {boolean} true iff the parent tagspec indicates that these bytes
-   * should be counted against the document CSS byte limit.
-   */
-  countDocCssBytes() {
-    const parentSpec = this.parentStackEntry_().tagSpec;
-    return (parentSpec !== null) && (parentSpec.getSpec().cdata !== null) &&
-        (parentSpec.getSpec().cdata.docCssBytes);
-  }
-
-  /**
-   * Returns true if the current tag has ancestor with the given tag name or
-   * specName.
-   * @param {string} ancestor
-   * @return {boolean}
-   */
-  hasAncestor(ancestor) {
-    // Skip the first element, which is "$ROOT".
-    for (let i = 1; i < this.stack_.length; ++i) {
-      if (this.stack_[i].tagName === ancestor) {
-        return true;
-      }
-      if ((this.stack_[i].tagSpec !== null) &&
-          (this.stack_[i].tagSpec.getSpec().specName === ancestor)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Returns true if the current tag has an ancestor which set the given
-   * marker.
-   * @param {!generated.AncestorMarker.Marker} query
-   * @return {boolean}
-   */
-  hasAncestorMarker(query) {
-    asserts.assert(query !== generated.AncestorMarker.Marker.UNKNOWN);
-    // Skip the first element, which is "$ROOT".
-    for (let i = 1; i < this.stack_.length; ++i) {
-      if (this.stack_[i].tagSpec === null) {
-        continue;
-      }
-      const spec = this.stack_[i].tagSpec.getSpec();
-      if (spec.markDescendants === null) {
-        continue;
-      }
-      for (const marker of spec.markDescendants.marker) {
-        if (marker === query) {
-          return true;
-        }
-      }
-    }
-    return false;
-  }
-
-  /**
-   * @param {!ParsedTagSpec} parsedTagSpec
-   * @param {!ParsedValidatorRules} parsedRules
-   * tagName.
-   */
-  setDescendantConstraintList(parsedTagSpec, parsedRules) {
-    if (parsedTagSpec.getSpec().descendantTagList === null) {
-      return;
-    }
-
-    const allowedDescendantsForThisTag = [];
-    for (const descendantTagList of parsedRules.getDescendantTagLists()) {
-      // Get the list matching this tag's descendant tag name.
-      if (parsedTagSpec.getSpec().descendantTagList ===
-          descendantTagList.name) {
-        for (const tag of descendantTagList.tag) {
-          allowedDescendantsForThisTag.push(tag);
-        }
-      }
-    }
-
-    this.allowedDescendantsList_.push({
-      tagName: getTagSpecName(parsedTagSpec.getSpec()),
-      allowedTags: allowedDescendantsForThisTag
-    });
-    this.setHasDescendantConstraintLists(true);
-  }
-
-  /**
-   * @return {boolean} true if the tag introduced descendant constraints.
-   * Else false.
-   */
-  hasDescendantConstraintLists() {
-    return this.back_().hasDescendantConstraintLists;
-  }
-
-  /**
-   * Updates the allowed descendants list if a tag introduced constraints.
-   * This is called when exiting a tag.
-   */
-  unSetDescendantConstraintList() {
-    if (this.hasDescendantConstraintLists()) {
-      this.allowedDescendantsList_.pop();
-      this.setHasDescendantConstraintLists(false);
-    }
-  }
-
-  /**
-   * @return {!Array<DescendantConstraints>}
-   */
-  allowedDescendantsList() {
-    return this.allowedDescendantsList_;
-  }
-}
-
-/**
- * Returns true if the given AT rule is considered valid.
- * @param {!generated.CssSpec} cssSpec
- * @param {string} atRuleName
- * @return {boolean}
- */
-function isAtRuleValid(cssSpec, atRuleName) {
-  for (const atRuleSpec of cssSpec.atRuleSpec) {
-    // "-moz-document" is specified in the list of allowed rules with an
-    // explicit vendor prefix. The idea here is that only this specific vendor
-    // prefix is allowed, not "-ms-document" or even "document". We first
-    // search the allowed list for the seen `at_rule_name` with stripped
-    // vendor prefix, then if not found, we search again without sripping the
-    // vendor prefix.
-    if (atRuleSpec.name === parse_css.stripVendorPrefix(atRuleName) ||
-        atRuleSpec.name === atRuleName) {
-      return true;
-    }
-  }
-  return false;
-}
-
-/**
- * Returns true if the given Declaration is considered valid.
- * @param {!generated.CssSpec} cssSpec
- * @param {string} declarationName
- * @return {boolean}
- */
-function IsDeclarationValid(cssSpec, declarationName) {
-  if (cssSpec.declaration.length === 0) {
-    return true;
-  }
-  return cssSpec.declaration.indexOf(
-             parse_css.stripVendorPrefix(declarationName)) > -1;
-}
-
-/**
- * Returns a string of the allowed Declarations.
- * @param {!generated.CssSpec} cssSpec
- * @return {string}
- */
-function AllowedDeclarationsString(cssSpec) {
-  if (cssSpec.declaration.length > 5) {
-    return '';
-  }
-  return '[\'' + cssSpec.declaration.join('\', \'') + '\']';
-}
-
-/** @private */
-class InvalidRuleVisitor extends parse_css.RuleVisitor {
-  /**
-   * @param {!generated.TagSpec} tagSpec
-   * @param {!generated.CssSpec} cssSpec
-   * @param {!Context} context
-   * @param {!generated.ValidationResult} result
-   */
-  constructor(tagSpec, cssSpec, context, result) {
-    super();
-    /** @type {!generated.TagSpec} */
-    this.tagSpec = tagSpec;
-    /** @type {!generated.CssSpec} */
-    this.cssSpec = cssSpec;
-    /** @type {!Context} */
-    this.context = context;
-    /** @type {!generated.ValidationResult} */
-    this.result = result;
-  }
-
-  /** @inheritDoc */
-  visitAtRule(atRule) {
-    if (!isAtRuleValid(this.cssSpec, atRule.name)) {
-      this.context.addError(
-          generated.ValidationError.Code.CSS_SYNTAX_INVALID_AT_RULE,
-          new LineCol(atRule.line, atRule.col),
-          /* params */[getTagDescriptiveName(this.tagSpec), atRule.name],
-          /* url */ '', this.result);
-    }
-  }
-
-  /** @inheritDoc */
-  visitDeclaration(declaration) {
-    if (!IsDeclarationValid(this.cssSpec, declaration.name)) {
-      const declarationsStr = AllowedDeclarationsString(this.cssSpec);
-      if (declarationsStr === '') {
-        this.context.addError(
-            generated.ValidationError.Code.CSS_SYNTAX_INVALID_PROPERTY_NOLIST,
-            new LineCol(declaration.line, declaration.col),
-            /* params */
-            [getTagDescriptiveName(this.tagSpec), declaration.name],
-            /* url */ '', this.result);
-
-      } else {
-        this.context.addError(
-            generated.ValidationError.Code.CSS_SYNTAX_INVALID_PROPERTY,
-            new LineCol(declaration.line, declaration.col),
-            /* params */
-            [
-              getTagDescriptiveName(this.tagSpec),
-              declaration.name,
-              AllowedDeclarationsString(this.cssSpec),
-            ],
-            /* url */ '', this.result);
-      }
-    }
-  }
-}
-
-/** @private */
-class InvalidDeclVisitor extends parse_css.RuleVisitor {
-  /**
-   * @param {!ParsedDocCssSpec} cssSpec
-   * @param {!Context} context
-   * @param {string} tagDescriptiveName
-   * @param {!generated.ValidationResult} result
-   */
-  constructor(cssSpec, context, tagDescriptiveName, result) {
-    super();
-    /** @type {!ParsedDocCssSpec} */
-    this.cssSpec = cssSpec;
-    /** @type {!Context} */
-    this.context = context;
-    /** @type {string} */
-    this.tagDescriptiveName = tagDescriptiveName;
-    /** @type {!generated.ValidationResult} */
-    this.result = result;
-  }
-
-  /** @inheritDoc */
-  visitDeclaration(declaration) {
-    const cssDeclaration = this.cssSpec.cssDeclarationByName(declaration.name);
-    const firstIdent = declaration.firstIdent();
-    const lineCol = new LineCol(declaration.line, declaration.col);
-    if (!cssDeclaration) {
-      this.context.addError(
-          generated.ValidationError.Code.CSS_SYNTAX_INVALID_PROPERTY_NOLIST,
-          lineCol, [this.tagDescriptiveName, declaration.name],
-          this.cssSpec.spec().specUrl, this.result);
-      // Don't emit additional errors for this declaration
-      return;
-    }
-    if (cssDeclaration.valueCasei.length > 0) {
-      let hasValidValue = false;
-      for (const value of cssDeclaration.valueCasei) {
-        if (firstIdent.toLowerCase() == value) {
-          hasValidValue = true;
-          break;
-        }
-      }
-      if (!hasValidValue) {
-        // Declaration value not allowed.
-        this.context.addError(
-            generated.ValidationError.Code.CSS_SYNTAX_DISALLOWED_PROPERTY_VALUE,
-            lineCol, /* params */
-            [this.tagDescriptiveName, declaration.name, firstIdent],
-            this.cssSpec.spec().specUrl, this.result);
-      }
-    } else if (cssDeclaration.valueRegexCasei != null) {
-      const valueRegex = this.context.getRules().getFullMatchCaseiRegex(
-          /** @type {number} */ (cssDeclaration.valueRegexCasei));
-      if (!valueRegex.test(firstIdent)) {
-        this.context.addError(
-            generated.ValidationError.Code.CSS_SYNTAX_DISALLOWED_PROPERTY_VALUE,
-            lineCol, /* params */
-            [this.tagDescriptiveName, declaration.name, firstIdent],
-            this.cssSpec.spec().specUrl, this.result);
-      }
-    }
-  }
-}
-
-/**
- * @typedef {{ atRuleSpec: !Object<string, parse_css.BlockType>,
- *             defaultSpec: !parse_css.BlockType }}
- */
-let CssParsingConfig;
-
-/**
- * Generates a CssParsingConfig.
- * @return {!CssParsingConfig}
- */
-function GenCssParsingConfig() {
-  /** @type {!Object<string, parse_css.BlockType>} */
-  const ampAtRuleParsingSpec = Object.create(null);
-  ampAtRuleParsingSpec['font-face'] = parse_css.BlockType.PARSE_AS_DECLARATIONS;
-  ampAtRuleParsingSpec['keyframes'] = parse_css.BlockType.PARSE_AS_RULES;
-  ampAtRuleParsingSpec['media'] = parse_css.BlockType.PARSE_AS_RULES;
-  ampAtRuleParsingSpec['page'] = parse_css.BlockType.PARSE_AS_DECLARATIONS;
-  ampAtRuleParsingSpec['supports'] = parse_css.BlockType.PARSE_AS_RULES;
-  ampAtRuleParsingSpec['-moz-document'] = parse_css.BlockType.PARSE_AS_RULES;
-  const config = {
-    atRuleSpec: ampAtRuleParsingSpec,
-    defaultSpec: parse_css.BlockType.PARSE_AS_IGNORE,
-  };
-  return config;
-}
-exports.GenCssParsingConfig = GenCssParsingConfig;
-
-const SelectorSpecVisitor = class extends parse_css.SelectorVisitor {
-  /**
-   * @param {!generated.SelectorSpec} spec
-   * @param {!Array<!tokenize_css.ErrorToken>} errorBuffer
-   */
-  constructor(spec, errorBuffer) {
-    super(errorBuffer);
-    /** @private {!generated.SelectorSpec} */
-    this.selectorSpec_ = spec;
-
-    /** @private {!Array<!tokenize_css.ErrorToken>} */
-    this.errorBuffer_ = errorBuffer;
-  }
-
-  /**
-   * @override
-   * @param {!parse_css.AttrSelector} attrSelector
-   */
-  visitAttrSelector(attrSelector) {
-    for (const allowedName of this.selectorSpec_.attributeName) {
-      if (allowedName === '*' || allowedName === attrSelector.attrName) return;
-    }
-    const errorToken = new tokenize_css.ErrorToken(
-        generated.ValidationError.Code.CSS_SYNTAX_DISALLOWED_ATTR_SELECTOR,
-        ['', attrSelector.attrName]);
-    attrSelector.copyPosTo(errorToken);
-    this.errorBuffer_.push(errorToken);
-  }
-
-  /**
-   * @override
-   * @param {!parse_css.PseudoSelector} selector
-   */
-  visitPseudoSelector(selector) {
-    if (selector.isClass) {  // pseudo-class
-      for (const allowedPseudoClass of this.selectorSpec_.pseudoClass) {
-        if (allowedPseudoClass === '*' || allowedPseudoClass === selector.name)
-          return;
-      }
-      const errorToken = new tokenize_css.ErrorToken(
-          generated.ValidationError.Code.CSS_SYNTAX_DISALLOWED_PSEUDO_CLASS,
-          ['', selector.name]);
-      selector.copyPosTo(errorToken);
-      this.errorBuffer_.push(errorToken);
-    } else {  // pseudo-element
-      for (const allowedPseudoElement of this.selectorSpec_.pseudoElement) {
-        if (allowedPseudoElement === '*' ||
-            allowedPseudoElement === selector.name)
-          return;
-      }
-      const errorToken = new tokenize_css.ErrorToken(
-          generated.ValidationError.Code.CSS_SYNTAX_DISALLOWED_PSEUDO_ELEMENT,
-          ['', selector.name]);
-      selector.copyPosTo(errorToken);
-      this.errorBuffer_.push(errorToken);
-    }
-  }
-};
-
-/**
- * CdataMatcher maintains a constraint to check which an opening tag
- * introduces: a tag's cdata matches constraints set by it's cdata
- * spec. Unfortunately we need to defer such checking and can't
- * handle it while the opening tag is being processed.
- * TODO(powdercloud): Separate out a ParsedCdataSpec class.
- * @private
- */
-class CdataMatcher {
-  /**
-   * @param {!generated.TagSpec} tagSpec
-   * @param {!LineCol} lineCol
-   */
-  constructor(tagSpec, lineCol) {
-    /** @private @type {!generated.TagSpec} */
-    this.tagSpec_ = tagSpec;
-
-    // The CDataMatcher in Javascript also keeps track of the line/column
-    // information from the context when it was created. This is necessary
-    // because this code does not have control over the advancement of the
-    // DocLocator instance (in Context) over the document, so by the time
-    // we know that there's something wrong with the cdata for a tag,
-    // we've advanced past the tag. This information gets filled in
-    // by Context.setCdataMatcher_.
-
-    /** @private @type {!LineCol} */
-    this.lineCol_ = lineCol;
-  }
-
-  /**
-   * Matches the provided cdata against what this CdataMatcher expects.
-   * @param {string} cdata
-   * @param {!Context} context
-   * @param {!generated.ValidationResult} validationResult
-   */
-  match(cdata, context, validationResult) {
-    const cdataSpec = this.tagSpec_.cdata;
-    if (cdataSpec === null) {
-      return;
-    }
-    let urlBytes = 0;
-    // The mandatory_cdata, cdata_regex, and css_spec fields are treated
-    // like a oneof, but we're not using oneof because it's a feature
-    // that was added after protobuf 2.5.0 (which our open-source
-    // version uses).
-    // begin oneof {
-
-    // Mandatory CDATA exact match
-    if (cdataSpec.mandatoryCdata !== null) {
-      if (cdataSpec.mandatoryCdata !== cdata) {
-        context.addError(
-            generated.ValidationError.Code.MANDATORY_CDATA_MISSING_OR_INCORRECT,
-            context.getLineCol(),
-            /* params */[getTagDescriptiveName(this.tagSpec_)],
-            getTagSpecUrl(this.tagSpec_), validationResult);
-      }
-      // We return early if the cdata has an exact match rule. The
-      // spec shouldn't have an exact match rule that doesn't validate.
-      return;
-    } else if (this.tagSpec_.cdata.cdataRegex !== null) {
-      if (!context.getRules()
-               .getFullMatchRegex(this.tagSpec_.cdata.cdataRegex)
-               .test(cdata)) {
-        context.addError(
-            generated.ValidationError.Code.MANDATORY_CDATA_MISSING_OR_INCORRECT,
-            context.getLineCol(),
-            /* params */[getTagDescriptiveName(this.tagSpec_)],
-            getTagSpecUrl(this.tagSpec_), validationResult);
-        return;
-      }
-    } else if (cdataSpec.cssSpec !== null) {
-      if (VALIDATE_CSS) {
-        urlBytes =
-            this.matchCss_(cdata, cdataSpec.cssSpec, context, validationResult);
-      }
-    } else if (cdataSpec.whitespaceOnly === true) {
-      if (!(/^\s*$/.test(cdata))) {
-        context.addError(
-            generated.ValidationError.Code.NON_WHITESPACE_CDATA_ENCOUNTERED,
-            context.getLineCol(),
-            /* params */[getTagDescriptiveName(this.tagSpec_)],
-            getTagSpecUrl(this.tagSpec_), validationResult);
-      }
-    }
-    // } end oneof
-
-    const maybeDocCssSpec = context.matchingDocCssSpec();
-
-    /** @type {number} */
-    let adjustedCdataLength = htmlparser.byteLength(cdata);
-    if (maybeDocCssSpec !== null && !maybeDocCssSpec.spec().urlBytesIncluded) {
-      adjustedCdataLength -= urlBytes;
-    }
-
-    // Max CDATA Byte Length, specific to this CDATA (not the document limit).
-    if (cdataSpec.maxBytes !== -2 && adjustedCdataLength > cdataSpec.maxBytes) {
-      if (this.tagSpec_.tagName == 'SCRIPT') {
-        context.addError(
-            generated.ValidationError.Code.INLINE_SCRIPT_TOO_LONG,
-            context.getLineCol(),
-            /* params */
-            [
-              adjustedCdataLength.toString(),
-              cdataSpec.maxBytes.toString(),
-            ],
-            cdataSpec.maxBytesSpecUrl, validationResult);
-
-      } else {
-        context.addError(
-            generated.ValidationError.Code.STYLESHEET_TOO_LONG,
-            context.getLineCol(),
-            /* params */
-            [
-              getTagDescriptiveName(this.tagSpec_),
-              adjustedCdataLength.toString(),
-              cdataSpec.maxBytes.toString(),
-            ],
-            cdataSpec.maxBytesSpecUrl, validationResult);
-      }
-      return;
-    }
-
-    // Record <style amp-custom> byte size
-    if (context.getTagStack().countDocCssBytes()) {
-      context.addStyleTagByteSize(adjustedCdataLength);
-    }
-
-    // Disallowed CDATA Regular Expressions
-    // We use a combined regex as a fast test. If it matches, we re-match
-    // against each individual regex so that we can generate better error
-    // messages.
-    if (cdataSpec.combinedDenyListedCdataRegex === null) {
-      return;
-    }
-    if (!context.getRules()
-             .getPartialMatchCaseiRegex(cdataSpec.combinedDenyListedCdataRegex)
-             .test(cdata)) {
-      return;
-    }
-    for (const denylist of cdataSpec.disallowedCdataRegex) {
-      const disallowedRegex = new RegExp(denylist.regex, 'i');
-      if (disallowedRegex.test(cdata)) {
-        context.addError(
-            generated.ValidationError.Code.CDATA_VIOLATES_DENYLIST,
-            context.getLineCol(),
-            /* params */
-            [getTagDescriptiveName(this.tagSpec_), denylist.errorMessage],
-            getTagSpecUrl(this.tagSpec_), validationResult);
-      }
-    }
-  }
-
-  /**
-   * Matches the provided stylesheet against a CSS media query specification.
-   * @param {!parse_css.Stylesheet} stylesheet
-   * @param {!generated.MediaQuerySpec} spec
-   * @param {!Array<!tokenize_css.ErrorToken>} errorBuffer
-   * @private
-   */
-  matchMediaQuery_(stylesheet, spec, errorBuffer) {
-    /** @type{!Array<!tokenize_css.IdentToken>} */
-    const seenMediaTypes = [];
-    /** @type{!Array<!tokenize_css.IdentToken>} */
-    const seenMediaFeatures = [];
-    parse_css.parseMediaQueries(
-        stylesheet, seenMediaTypes, seenMediaFeatures, errorBuffer);
-
-    for (const token of seenMediaTypes) {
-      /** @type{string} */
-      const strippedMediaType =
-          parse_css.stripVendorPrefix(token.value.toLowerCase());
-      if (!spec.type.includes(strippedMediaType)) {
-        const errorToken = new tokenize_css.ErrorToken(
-            generated.ValidationError.Code.CSS_SYNTAX_DISALLOWED_MEDIA_TYPE,
-            ['', token.value]);
-        token.copyPosTo(errorToken);
-        errorBuffer.push(errorToken);
-      }
-    }
-
-    for (const token of seenMediaFeatures) {
-      /** @type{string} */
-      const strippedMediaFeature = parse_css.stripMinMax(
-          parse_css.stripVendorPrefix(token.value.toLowerCase()));
-      if (!spec.feature.includes(strippedMediaFeature)) {
-        const errorToken = new tokenize_css.ErrorToken(
-            generated.ValidationError.Code.CSS_SYNTAX_DISALLOWED_MEDIA_FEATURE,
-            ['', token.value]);
-        token.copyPosTo(errorToken);
-        errorBuffer.push(errorToken);
-      }
-    }
-  }
-
-  /**
-   * Matches the provided stylesheet against a SelectorSpec
-   * @param {!parse_css.Stylesheet} stylesheet
-   * @param {!generated.SelectorSpec} spec
-   * @param {!Array<!tokenize_css.ErrorToken>} errorBuffer
-   * @private
-   */
-  matchSelectors_(stylesheet, spec, errorBuffer) {
-    let visitor = new SelectorSpecVisitor(spec, errorBuffer);
-    stylesheet.accept(visitor);
-  }
-
-  /**
-   * Matches the provided cdata against a CSS specification. Helper
-   * routine for match (see above). The return value is the number of
-   * bytes in the CSS string which were measured as URLs. In some
-   * validation types, these bytes are not counted against byte limits.
-   * @param {string} cdata
-   * @param {!generated.CssSpec} cssSpec
-   * @param {!Context} context
-   * @param {!generated.ValidationResult} validationResult
-   * @returns {number}
-   * @private
-   */
-  matchCss_(cdata, cssSpec, context, validationResult) {
-    /** @type {!Array<!tokenize_css.ErrorToken>} */
-    const cssErrors = [];
-    /** @type {!Array<!tokenize_css.ErrorToken>} */
-    const cssWarnings = [];
-    /** @type {!Array<!tokenize_css.Token>} */
-    const tokenList = tokenize_css.tokenize(
-        cdata, this.getLineCol().getLine(), this.getLineCol().getCol(),
-        cssErrors);
-    /** @type {!CssParsingConfig} */
-    const cssParsingConfig = GenCssParsingConfig();
-    /** @type {!parse_css.Stylesheet} */
-    const stylesheet = parse_css.parseAStylesheet(
-        tokenList, cssParsingConfig.atRuleSpec, cssParsingConfig.defaultSpec,
-        cssErrors);
-
-    const maybeDocCssSpec = context.matchingDocCssSpec();
-
-    // We extract the urls from the stylesheet. As a side-effect, this can
-    // generate errors for url(…) functions with invalid parameters.
-    /** @type {!Array<!parse_css.ParsedCssUrl>} */
-    const parsedUrls = [];
-    parse_css.extractUrlsFromStylesheet(stylesheet, parsedUrls, cssErrors);
-    // Similarly we extract query types and features from @media rules.
-    for (const atRuleSpec of cssSpec.atRuleSpec) {
-      if (atRuleSpec.mediaQuerySpec !== null) {
-        asserts.assert(atRuleSpec.name === 'media');
-        const {mediaQuerySpec} = atRuleSpec;
-        const errorBuffer =
-            mediaQuerySpec.issuesAsError ? cssErrors : cssWarnings;
-        this.matchMediaQuery_(stylesheet, mediaQuerySpec, errorBuffer);
-        // There will be at most @media atRuleSpec
-        break;
-      }
-    }
-
-    if (cssSpec.selectorSpec !== null)
-      this.matchSelectors_(stylesheet, cssSpec.selectorSpec, cssErrors);
-
-    if (cssSpec.validateAmp4Ads) {
-      amp4ads.validateAmp4AdsCss(stylesheet, cssErrors);
-    }
-
-    if (cssSpec.validateKeyframes) {
-      keyframes.validateKeyframesCss(stylesheet, cssErrors);
-    }
-
-    // Add errors then warnings:
-    for (const errorToken of cssErrors) {
-      // Override the first parameter with the name of this style tag.
-      const {params} = errorToken;
-      // Override the first parameter with the name of this style tag.
-      params[0] = getTagDescriptiveName(this.tagSpec_);
-      context.addError(
-          errorToken.code, new LineCol(errorToken.line, errorToken.col), params,
-          /* url */ '', validationResult);
-    }
-    for (const errorToken of cssWarnings) {
-      // Override the first parameter with the name of this style tag.
-      const {params} = errorToken;
-      // Override the first parameter with the name of this style tag.
-      params[0] = getTagDescriptiveName(this.tagSpec_);
-      context.addWarning(
-          errorToken.code, new LineCol(errorToken.line, errorToken.col), params,
-          /* url */ '', validationResult);
-    }
-
-    // If `!important` is not allowed, record instances as errors.
-    if (!cssSpec.allowImportant) {
-      /** @type {!Array<!parse_css.Declaration>} */
-      let important = [];
-      parse_css.extractImportantDeclarations(stylesheet, important);
-      for (const decl of important) {
-        context.addError(
-            generated.ValidationError.Code.CSS_SYNTAX_DISALLOWED_IMPORTANT,
-            new LineCol(decl.important_line, decl.important_col),
-            /* params */[], context.getRules().getStylesSpecUrl(),
-            validationResult);
-      }
-    }
-
-    /** @type {number} */
-    let urlBytes = 0;
-    for (const url of parsedUrls) {
-      // Some CSS specs can choose to not count URLs against the byte limit,
-      // but data URLs are always counted (or in other words, they aren't
-      // considered URLs).
-      if (!isDataUrl(url.utf8Url)) {
-        urlBytes += htmlparser.byteLength(url.utf8Url);
-      }
-      if (maybeDocCssSpec !== null) {
-        const adapter = new UrlErrorInStylesheetAdapter(url.line, url.col);
-        validateUrlAndProtocol(
-            ((url.atRuleScope === 'font-face') ?
-                 maybeDocCssSpec.fontUrlSpec() :
-                 maybeDocCssSpec.imageUrlSpec()),
-            adapter, context, url.utf8Url, this.tagSpec_, validationResult);
-      }
-    }
-    // Validate the allowed CSS AT rules (eg: `@media`)
-    const invalidRuleVisitor = new InvalidRuleVisitor(
-        this.tagSpec_, cssSpec, context, validationResult);
-    stylesheet.accept(invalidRuleVisitor);
-
-    // Validate the allowed CSS declarations (eg: `background-color`)
-    if (maybeDocCssSpec !== null &&
-        !maybeDocCssSpec.spec().allowAllDeclarationInStyle) {
-      const invalidDeclVisitor = new InvalidDeclVisitor(
-          maybeDocCssSpec, context, getTagDescriptiveName(this.tagSpec_),
-          validationResult);
-      stylesheet.accept(invalidDeclVisitor);
-    }
-
-    return urlBytes;
-  }
-
-  /** @return {!LineCol} */
-  getLineCol() {
-    return this.lineCol_;
-  }
-}
-
-/**
- * @typedef {{ missingExtension: string,
- *             maybeError: ?generated.ValidationError }}
- */
-let ExtensionMissingError;
-
-/**
- * The extensions context keeps track of the extensions that the validator has
- * seen, as well as which have been used, which are required to be used, etc.
- * @private
- */
-class ExtensionsContext {
-  constructor() {
-    // |extensionsLoaded_| tracks the valid <script> tags loading
-    // amp extensions which were seen in the document's head. Most extensions
-    // are also added to |extensionsUnusedRequired_| when encountered in the
-    // head. When a tag is seen later in the document which makes use of an
-    // extension, that extension is recorded in |extensionsUsed_|.
-
-    /**
-     * Used as a set, based on key names.
-     * @type {!Object<string, boolean>}
-     * @private
-     */
-    this.extensionsLoaded_ = Object.create(null);
-
-    // AMP-AD is exempted to not require the respective extension
-    // javascript file for historical reasons. We still need to mark that
-    // the extension is used if we see the tags.
-    this.extensionsLoaded_['amp-ad'] = true;
-
-    /**
-     * @type {!Array<string>}
-     * @private
-     */
-    this.extensionsUnusedRequired_ = [];
-
-    /**
-     * Used as a set, based on key names.
-     * @type {!Object<string, boolean>}
-     * @private
-     */
-    this.extensionsUsed_ = Object.create(null);
-
-    /**
-     * @type {!Array<ExtensionMissingError>}
-     * @private
-     */
-    this.extensionMissingErrors_ = [];
-  }
-
-  /**
-   * Returns false if the named extension has not yet been loaded. Note that
-   * this assumes that all extensions will be loaded in the document earlier
-   * than their first usage. This is true for <amp-foo> tags, since the
-   * extension must be loaded in the head and <amp-foo> tags are not supported
-   * in the head as per HTML spec.
-   * @param {string} extension
-   * @return {boolean}
-   */
-  isExtensionLoaded(extension) {
-    return extension in this.extensionsLoaded_;
-  }
-
-  /**
-   * Record a possible error to report once we have collected all
-   * extensions in the document. If the given extension is missing,
-   * then report the given error.
-   * @param {!ParsedTagSpec} parsedTagSpec
-   * @param {!LineCol} lineCol
-   */
-  recordFutureErrorsIfMissing(parsedTagSpec, lineCol) {
-    const tagSpec = parsedTagSpec.getSpec();
-    for (const requiredExtension of tagSpec.requiresExtension) {
-      if (!this.isExtensionLoaded(requiredExtension)) {
-        const error = new generated.ValidationError();
-        error.severity = generated.ValidationError.Severity.ERROR;
-        error.code = generated.ValidationError.Code.MISSING_REQUIRED_EXTENSION;
-        error.params = [getTagDescriptiveName(tagSpec), requiredExtension];
-        error.line = lineCol.getLine();
-        error.col = lineCol.getCol();
-        error.specUrl = getTagSpecUrl(tagSpec);
-
-        this.extensionMissingErrors_.push(
-            {missingExtension: requiredExtension, maybeError: error});
-      }
-    }
-  }
-
-  /**
-   * Returns a list of errors accrued while processing the
-   * <head> for tags requiring an extension which was not found.
-   * @return {!Array<!generated.ValidationError>}
-   */
-  missingExtensionErrors() {
-    const out = [];
-    for (const err of this.extensionMissingErrors_) {
-      if (!this.isExtensionLoaded(err.missingExtension)) {
-        out.push(err.maybeError);
-      }
-    }
-
-    return out;
-  }
-
-  /**
-   * Records extensions that are used within the document.
-   * @param {!Array<string>} extensions
-   */
-  recordUsedExtensions(extensions) {
-    for (const extension of extensions) {
-      this.extensionsUsed_[extension] = true;
-    }
-  }
-
-  /**
-   * Returns a list of unused extensions which produce validation errors
-   * when unused.
-   * @return {!Array<string>}
-   */
-  unusedExtensionsRequired() {
-    // Compute Difference: extensionsUnusedRequired_ - extensionsUsed_
-    const out = [];
-    for (const extension of this.extensionsUnusedRequired_) {
-      if (!(extension in this.extensionsUsed_)) {
-        out.push(extension);
-      }
-    }
-    out.sort();
-    return out;
-  }
-
-  /**
-   * Update ExtensionContext state when we encounter an amp extension or
-   * tag using an extension.
-   * @param {!ValidateTagResult} result
-   */
-  updateFromTagResult(result) {
-    if (result.bestMatchTagSpec === null) {
-      return;
-    }
-    const parsedTagSpec = result.bestMatchTagSpec;
-    const tagSpec = parsedTagSpec.getSpec();
-
-    // Keep track of which extensions are loaded.
-    if (tagSpec.extensionSpec !== null) {
-      const {extensionSpec} = tagSpec;
-      // This is an always present field if extension spec is set.
-      const extensionName = /** @type{string} */ (extensionSpec.name);
-
-      // Record that we have encountered an extension 'load' tag. This will
-      // look like <script custom-element=amp-foo ...> or similar.
-      this.extensionsLoaded_[extensionName] = true;
-      switch (extensionSpec.requiresUsage) {
-        case generated.ExtensionSpec.ExtensionUsageRequirement
-            .EXEMPTED:  // Fallthrough intended:
-        case generated.ExtensionSpec.ExtensionUsageRequirement.NONE:
-          // This extension does not have usage demonstrated by a tag, for
-          // example: amp-dynamic-css-classes
-          break;
-        case generated.ExtensionSpec.ExtensionUsageRequirement.ERROR:
-        // TODO(powdercloud): Make enum proto defaults work in generated
-        // javascript.
-        default:  // Default is error
-          // Record that a loaded extension indicates a new requirement:
-          // namely that some tag must make use of this extension.
-          this.extensionsUnusedRequired_.push(extensionName);
-          break;
-      }
-    }
-
-    // Record presence of a tag, such as <amp-foo> which requires the usage
-    // of an amp extension.
-    this.recordUsedExtensions(tagSpec.requiresExtension);
-  }
-}
-
-/**
- * The Context keeps track of the line / column that the validator is
- * in, as well as the mandatory tag specs that have already been validated.
- * So, this constitutes the mutable state for the validator except for
- * the validation result itself.
- * @private
- */
-class Context {
-  /**
-   * @param {!ParsedValidatorRules} parsedRules
-   */
-  constructor(parsedRules) {
-    /**
-     * @type {!ParsedValidatorRules}
-     * @private
-     */
-    this.rules_ = parsedRules;
-    /**
-     * The mandatory alternatives that we've validated (a small list of ids).
-     * @type {!Array<number>}
-     * @private
-     */
-    this.mandatoryAlternativesSatisfied_ = [];
-    /**
-     * DocLocator object from the parser which gives us line/col numbers.
-     * @type {?parserInterface.DocLocator}
-     * @private
-     */
-    this.docLocator_ = null;
-
-    /**
-     * @type {!TagStack}
-     * @private
-     */
-    this.tagStack_ = new TagStack();
-
-    /**
-     * Set of tagSpec ids that have been validated.
-     * @type {!Array<boolean>}
-     * @private
-     */
-    this.tagspecsValidated_ = [];
-
-    /**
-     * Size of <style amp-custom>.
-     * @type {number}
-     * @private
-     */
-    this.styleTagByteSize_ = 0;
-
-    /**
-     * Size of all inline styles (style attribute) combined.
-     * @type {number}
-     * @private
-     */
-    this.inlineStyleByteSize_ = 0;
-
-    /**
-     * Set of type identifiers in this document.
-     * @type {!Array<string>}
-     * @private
-     */
-    this.typeIdentifiers_ = [];
-
-    /**
-     * All the value set provisions so far.
-     * @type {!Set<string>}
-     * @private
-     */
-    this.valueSetsProvided_ = new Set;
-
-    /**
-     * All the value set requirements so far.
-     * @type {!Map<string, !Array<!generated.ValidationError>>}
-     * @private
-     */
-    this.valueSetsRequired_ = new Map;
-
-    /**
-     * Set of conditions that we've satisfied.
-     * @type {!Array<boolean>}
-     * @private
-     */
-    this.conditionsSatisfied_ = [];
-
-    /**
-     * First tagspec seen (matched) which contains an URL.
-     * @type {?generated.TagSpec}
-     * @private
-     */
-    this.firstUrlSeenTag_ = null;
-
-    /**
-     * @type {?LineCol}
-     * @private
-     */
-    this.encounteredBodyLineCol_ = null;
-
-    /**
-     * @type {?Array<!Object>}
-     * @private
-     */
-    this.encounteredBodyAttrs_ = null;
-
-    /**
-     * Extension-specific context.
-     * @type {!ExtensionsContext}
-     * @private
-     */
-    this.extensions_ = new ExtensionsContext();
-
-    /**
-     * Which script release version is present first in the document.
-     * @type {!parserInterface.ScriptReleaseVersion}
-     * @private
-     */
-    this.scriptReleaseVersion_ = parserInterface.ScriptReleaseVersion.UNKNOWN;
-  }
-
-  /** @return {!ParsedValidatorRules} */
-  getRules() {
-    return this.rules_;
-  }
-
-  /**
-   * Callback before startDoc which gives us a document locator.
-   * @param {!parserInterface.DocLocator} locator
-   */
-  setDocLocator(locator) {
-    this.docLocator_ = locator;
-  }
-
-  /**
-   * Returns the document size from the document locator.
-   * @return {number}
-   */
-  getDocByteSize() {
-    return this.docLocator_.getDocByteSize();
-  }
-
-  /** @return {!LineCol} */
-  getLineCol() {
-    return new LineCol(this.docLocator_.getLine(), this.docLocator_.getCol());
-  }
-
-  /**
-   * @param {!generated.ValidationError} error
-   * @param {!generated.ValidationResult} validationResult
-   */
-  addBuiltError(error, validationResult) {
-    // If any of the errors amount to more than a WARNING, validation fails.
-    if (error.severity !== generated.ValidationError.Severity.WARNING) {
-      validationResult.status = generated.ValidationResult.Status.FAIL;
-    }
-    asserts.assert(validationResult.errors !== undefined);
-    validationResult.errors.push(error);
-  }
-
-  /**
-   * Add an error field to validationResult with severity WARNING.
-   * @param {!generated.ValidationError.Code} validationErrorCode Error code
-   * @param {!LineCol} lineCol a line / column pair.
-   * @param {!Array<string>} params
-   * @param {?string} specUrl a link (URL) to the amphtml spec
-   * @param {!generated.ValidationResult} validationResult
-   */
-  addWarning(validationErrorCode, lineCol, params, specUrl, validationResult) {
-    this.addBuiltError(
-        populateError(
-            generated.ValidationError.Severity.WARNING, validationErrorCode,
-            lineCol, params, specUrl),
-        validationResult);
-  }
-
-  /**
-   * Add an error field to validationResult with severity ERROR.
-   * @param {!generated.ValidationError.Code} validationErrorCode Error code
-   * @param {!LineCol} lineCol a line / column pair.
-   * @param {!Array<string>} params
-   * @param {?string} specUrl a link (URL) to the amphtml spec
-   * @param {!generated.ValidationResult} validationResult
-   */
-  addError(validationErrorCode, lineCol, params, specUrl, validationResult) {
-    this.addBuiltError(
-        populateError(
-            generated.ValidationError.Severity.ERROR, validationErrorCode,
-            lineCol, params, specUrl),
-        validationResult);
-    validationResult.status = generated.ValidationResult.Status.FAIL;
-  }
-
-  /**
-   * Given a tag result, update the Context state to affect
-   * later validation. Does not handle updating the tag stack.
-   * @param {!ValidateTagResult} result
-   * @private
-   */
-  updateFromTagResult_(result) {
-    if (result.bestMatchTagSpec === null) {
-      return;
-    }
-    const parsedTagSpec = result.bestMatchTagSpec;
-    const isPassing =
-        (result.validationResult.status ===
-         generated.ValidationResult.Status.PASS);
-
-    this.extensions_.updateFromTagResult(result);
-    // If this requires an extension and we are still in the document head,
-    // record that we may still need to emit a missing extension error at
-    // the end of the document head. We do this even for a tag failing
-    // validation since extensions are based on the tag name, and we're still
-    // pretty confident the user forgot to include the extension.
-    if (this.tagStack_.hasAncestor('HEAD')) {
-      this.extensions_.recordFutureErrorsIfMissing(
-          parsedTagSpec, this.getLineCol());
-    }
-    // We also want to satisfy conditions, to reduce errors seen elsewhere in
-    // the document.
-    this.satisfyConditionsFromTagSpec_(parsedTagSpec);
-    this.satisfyMandatoryAlternativesFromTagSpec_(parsedTagSpec);
-    this.recordValidatedFromTagSpec_(isPassing, parsedTagSpec);
-
-    const {validationResult} = result;
-    for (const provision of validationResult.valueSetProvisions)
-      this.valueSetsProvided_.add(this.keyFromValueSetProvision_(provision));
-    for (const requirement of validationResult.valueSetRequirements) {
-      if (!requirement.provision) continue;
-      const key = this.keyFromValueSetProvision_(requirement.provision);
-      let errors = this.valueSetsRequired_.get(key);
-      if (!errors) {
-        errors = [];
-        this.valueSetsRequired_.set(key, errors);
-      }
-      errors.push(requirement.errorIfUnsatisfied);
-    }
-
-    if (isPassing) {
-      // If the tag spec didn't match, we don't know that the tag actually
-      // contained a URL, so no need to complain about it.
-      this.markUrlSeenFromMatchingTagSpec_(parsedTagSpec);
-    }
-  }
-
-  /**
-   * Record the first script release version in the document.
-   * @param {!parserInterface.ParsedHtmlTag} parsedTag
-   * @private
-   */
-  recordScriptReleaseVersionFromTagResult_(parsedTag) {
-    if (this.getScriptReleaseVersion() ===
-            parserInterface.ScriptReleaseVersion.UNKNOWN &&
-        (parsedTag.isExtensionScript() || parsedTag.isAmpRuntimeScript())) {
-      this.scriptReleaseVersion_ = parsedTag.getScriptReleaseVersion();
-    }
-  }
-
-  /**
-   * @param {!generated.ValueSetProvision} provision
-   * @return {string} A key for valueSetsProvided_ and valueSetsRequired_.
-   * @private
-   */
-  keyFromValueSetProvision_(provision) {
-    return (provision.set || '') + '>' + (provision.value || '');
-  }
-
-  /**
-   * Given the tagResult from validating a single tag, update the overall
-   * result as well as the Context state to affect later validation.
-   * @param {!parserInterface.ParsedHtmlTag} encounteredTag
-   * @param {!ValidateTagResult} referencePointResult
-   * @param {!ValidateTagResult} tagResult
-   */
-  updateFromTagResults(encounteredTag, referencePointResult, tagResult) {
-    this.tagStack_.updateFromTagResults(
-        encounteredTag, referencePointResult, tagResult, this.getRules(),
-        this.getLineCol());
-
-    this.recordAttrRequiresExtension_(encounteredTag, referencePointResult);
-    this.recordAttrRequiresExtension_(encounteredTag, tagResult);
-    this.updateFromTagResult_(referencePointResult);
-    this.updateFromTagResult_(tagResult);
-    this.recordScriptReleaseVersionFromTagResult_(encounteredTag);
-    this.addInlineStyleByteSize(tagResult.inlineStyleCssBytes);
-  }
-
-  /**
-   * Record when an encountered tag's attribute that requires an extension
-   * that it also satisfies that the requied extension is used.
-   * @param {!parserInterface.ParsedHtmlTag} encounteredTag
-   * @param {!ValidateTagResult} tagResult
-   * @private
-   */
-  recordAttrRequiresExtension_(encounteredTag, tagResult) {
-    if (tagResult.bestMatchTagSpec === null) {
-      return;
-    }
-    const parsedTagSpec = tagResult.bestMatchTagSpec;
-    if (!parsedTagSpec.attrsCanSatisfyExtension()) {
-      return;
-    }
-    const attrsByName = parsedTagSpec.getAttrsByName();
-    const extensionsCtx = this.extensions_;
-    for (const attr of encounteredTag.attrs()) {
-      if (attr.name in attrsByName) {
-        const attrId = attrsByName[attr.name];
-        // negative attr ids are simple attrs (only name set).
-        if (attrId < 0) {
-          continue;
-        }
-        const parsedAttrSpec =
-            this.rules_.getParsedAttrSpecs().getByAttrSpecId(attrId);
-        if (parsedAttrSpec.getSpec().requiresExtension.length > 0) {
-          extensionsCtx.recordUsedExtensions(
-              parsedAttrSpec.getSpec().requiresExtension);
-        }
-      }
-    }
-  }
-
-  /**
-   * Record document-level conditions which have been satisfied.
-   * @param {!ParsedTagSpec} parsedTagSpec
-   * @private
-   */
-  satisfyConditionsFromTagSpec_(parsedTagSpec) {
-    for (const condition of parsedTagSpec.getSpec().satisfies) {
-      this.conditionsSatisfied_[condition] = true;
-    }
-  }
-
-  /**
-   * @param {number} condition
-   * @return {boolean}
-   */
-  satisfiesCondition(condition) {
-    return this.conditionsSatisfied_.hasOwnProperty(condition);
-  }
-
-  /**
-   * Records that a Tag was seen which contains an URL. Used to note issues
-   * with <base href> occurring in the document after an URL.
-   * @param {!ParsedTagSpec} parsedTagSpec
-   * @private
-   */
-  markUrlSeenFromMatchingTagSpec_(parsedTagSpec) {
-    if (!this.hasSeenUrl() && parsedTagSpec.containsUrl()) {
-      this.firstUrlSeenTag_ = parsedTagSpec.getSpec();
-    }
-  }
-
-  /**
-   * Returns true iff the current context has observed a tag which contains
-   * an URL. This is set by calling markUrlSeen_ above.
-   * @return {boolean}
-   */
-  hasSeenUrl() {
-    return this.firstUrlSeenTag_ !== null;
-  }
-
-  /**
-   * The TagSpecName of the first seen URL. Do not call unless HasSeenUrl
-   * returns true.
-   * @return {string}
-   */
-  firstSeenUrlTagName() {
-    return getTagSpecName(
-        /** @type {!generated.TagSpec} */ (this.firstUrlSeenTag_));
-  }
-
-  /**
-   * Records that this document contains a tag matching a particular tag spec.
-   * @param {boolean} isPassing
-   * @param {!ParsedTagSpec} parsedTagSpec
-   * @private
-   */
-  recordValidatedFromTagSpec_(isPassing, parsedTagSpec) {
-    const recordValidated = parsedTagSpec.shouldRecordTagspecValidated();
-    if (recordValidated == RecordValidated.ALWAYS) {
-      this.tagspecsValidated_[parsedTagSpec.id()] = true;
-    } else if (isPassing && (recordValidated == RecordValidated.IF_PASSING)) {
-      this.tagspecsValidated_[parsedTagSpec.id()] = true;
-    }
-  }
-
-  /**
-   * Returns the tag spec ids that have been validated. The return object
-   * should be treated as a set (the object keys), and the value should be
-   * ignored.
-   * @return {!Array<boolean>}
-   */
-  getTagspecsValidated() {
-    return this.tagspecsValidated_;
-  }
-
-  /**
-   * Records how much of the document is used towards <style amp-custom>.
-   * @param {number} byteSize
-   */
-  addStyleTagByteSize(byteSize) {
-    this.styleTagByteSize_ += byteSize;
-  }
-
-  /**
-   * Records how much of the document is used twoards inline style.
-   * @param {number} byteSize
-   */
-  addInlineStyleByteSize(byteSize) {
-    this.inlineStyleByteSize_ += byteSize;
-  }
-
-  /**
-   * Returns the size of <style amp-custom>.
-   * @return {number}
-   */
-  getStyleTagByteSize() {
-    return this.styleTagByteSize_;
-  }
-
-  /**
-   * Returns the size of inline styles.
-   * @return {number}
-   */
-  getInlineStyleByteSize() {
-    return this.inlineStyleByteSize_;
-  }
-
-  /**
-   * Record the type identifier in this document.
-   * @param {string} typeIdentifier
-   */
-  recordTypeIdentifier(typeIdentifier) {
-    this.typeIdentifiers_.push(typeIdentifier);
-  }
-
-  /**
-   * Returns the type identifiers in this document.
-   * @return {!Array<string>}
-   */
-  getTypeIdentifiers() {
-    return this.typeIdentifiers_;
-  }
-
-  /**
-   * Returns true iff `spec` should be used for the type identifiers recorded
-   * in this context, as seen in the document so far. If called before type
-   * identifiers have been recorded, will always return false.
-   * @param {!ParsedDocSpec} spec
-   * @return {boolean}
-   */
-  isDocSpecValidForTypeIdentifiers(spec) {
-    return isUsedForTypeIdentifiers(
-        this.getTypeIdentifiers(), spec.enabledBy(), spec.disabledBy());
-  }
-
-  /**
-   * Returns the first (there should be at most one) DocSpec which matches
-   * both the html format and type identifiers recorded so far in this
-   * context. If called before identifiers have been recorded, it may return
-   * an incorrect selection.
-   * @return {?ParsedDocSpec}
-   */
-  matchingDocSpec() {
-    // The specs are usually already filtered by HTML format, so this loop
-    // should be very short, often 1:
-    for (const spec of this.rules_.getDoc()) {
-      if (this.rules_.isDocSpecCorrectHtmlFormat_(spec.spec()) &&
-          this.isDocSpecValidForTypeIdentifiers(spec)) {
-        return spec;
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Returns true iff `spec` should be used for the type identifiers recorded
-   * in this context, as seen in the document so far. If called before type
-   * identifiers have been recorded, will always return false.
-   * @param {!ParsedDocCssSpec} spec
-   * @return {boolean}
-   */
-  isDocCssSpecValidForTypeIdentifiers(spec) {
-    return isUsedForTypeIdentifiers(
-        this.getTypeIdentifiers(), spec.enabledBy(), spec.disabledBy());
-  }
-
-  /**
-   * Returns the first (there should be at most one) DocCssSpec which matches
-   * both the html format and type identifiers recorded so far in this
-   * context. If called before identifiers have been recorded, it may return
-   * an incorrect selection.
-   * @return {?ParsedDocCssSpec}
-   */
-  matchingDocCssSpec() {
-    // The specs are usually already filtered by HTML format, so this loop
-    // should be very short, often 1:
-    for (const spec of this.rules_.getCss()) {
-      if (this.rules_.isDocCssSpecCorrectHtmlFormat_(spec.spec()) &&
-          this.isDocCssSpecValidForTypeIdentifiers(spec)) {
-        return spec;
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Returns true iff "transformed" is a type identifier in this document.
-   * @return {boolean}
-   */
-  isTransformed() {
-    return this.typeIdentifiers_.includes('transformed');
-  }
-
-  /**
-   * Returns true iff "data-ampdevmode" is a type identifier in this document.
-   * @return {boolean}
-   */
-  isDevMode() {
-    return this.typeIdentifiers_.includes('data-ampdevmode');
-  }
-
-  /**
-   * Returns all the value set provisions so far, as a set of derived keys, as
-   * computed by keyFromValueSetProvision_().
-   * @return {!Set<string>}
-   */
-  valueSetsProvided() {
-    return this.valueSetsProvided_;
-  }
-
-  /**
-   * Returns all the value set requirements so far, keyed by derived keys, as
-   * computed by getValueSetProvisionKey().
-   * @return {!Map<string, !Array<!generated.ValidationError>>}
-   */
-  valueSetsRequired() {
-    return this.valueSetsRequired_;
-  }
-
-  /**
-   * Record that this document contains a tag which is a member of a list
-   * of mandatory alternatives.
-   * @param {!ParsedTagSpec} parsedTagSpec
-   * @private
-   */
-  satisfyMandatoryAlternativesFromTagSpec_(parsedTagSpec) {
-    const tagSpec = parsedTagSpec.getSpec();
-    if (tagSpec.mandatoryAlternatives !== null) {
-      this.mandatoryAlternativesSatisfied_.push(tagSpec.mandatoryAlternatives);
-    }
-  }
-
-  /**
-   * The mandatory alternatives that we've satisfied. This may contain
-   * duplicates (we'd have to filter them in record... above if we cared).
-   * @return {!Array<number>}
-   */
-  getMandatoryAlternativesSatisfied() {
-    return this.mandatoryAlternativesSatisfied_;
-  }
-
-  /** @return {!TagStack} */
-  getTagStack() {
-    return this.tagStack_;
-  }
-
-  /** @return {!ExtensionsContext} */
-  getExtensions() {
-    return this.extensions_;
-  }
-
-  /** @param {!Array<!Object>} attrs */
-  recordBodyTag(attrs) {
-    // Must copy because parser reuses the attrs array.
-    this.encounteredBodyAttrs_ = attrs.slice();
-    this.encounteredBodyLineCol_ = this.getLineCol();
-  }
-
-  /** @return {?Array<!Object>} */
-  getEncounteredBodyAttrs() {
-    return this.encounteredBodyAttrs_;
-  }
-
-  /** @return {!LineCol} */
-  getEncounteredBodyLineCol() {
-    return /** @type {!LineCol} */ (this.encounteredBodyLineCol_);
-  }
-
-  /** @return {!parserInterface.ScriptReleaseVersion} */
-  getScriptReleaseVersion() {
-    return this.scriptReleaseVersion_;
-  }
-}
-
-/**
- * @private
- */
-class UrlErrorInStylesheetAdapter {
-  /**
-   * @param {number} line
-   * @param {number} col
-   */
-  constructor(line, col) {
-    /**
-     * @type {!LineCol}
-     * @private
-     */
-    this.lineCol_ = new LineCol(line, col);
-  }
-
-  /**
-   * @param {!Context} context
-   * @param {!generated.TagSpec} tagSpec
-   * @param {!generated.ValidationResult} result
-   */
-  missingUrl(context, tagSpec, result) {
-    context.addError(
-        generated.ValidationError.Code.CSS_SYNTAX_MISSING_URL, this.lineCol_,
-        /* params */[getTagDescriptiveName(tagSpec)], getTagSpecUrl(tagSpec),
-        result);
-  }
-
-  /**
-   * @param {!Context} context
-   * @param {string} url
-   * @param {!generated.TagSpec} tagSpec
-   * @param {!generated.ValidationResult} result
-   */
-  invalidUrl(context, url, tagSpec, result) {
-    context.addError(
-        generated.ValidationError.Code.CSS_SYNTAX_INVALID_URL, this.lineCol_,
-        /* params */[getTagDescriptiveName(tagSpec), url],
-        getTagSpecUrl(tagSpec), result);
-  }
-
-  /**
-   * @param {!Context} context
-   * @param {string} protocol
-   * @param {!generated.TagSpec} tagSpec
-   * @param {!generated.ValidationResult} result
-   */
-  invalidUrlProtocol(context, protocol, tagSpec, result) {
-    context.addError(
-        generated.ValidationError.Code.CSS_SYNTAX_INVALID_URL_PROTOCOL,
-        this.lineCol_,
-        /* params */[getTagDescriptiveName(tagSpec), protocol],
-        getTagSpecUrl(tagSpec), result);
-  }
-
-  /**
-   * @param {!Context} context
-   * @param {string} url
-   * @param {!generated.TagSpec} tagSpec
-   * @param {!generated.ValidationResult} result
-   */
-  disallowedRelativeUrl(context, url, tagSpec, result) {
-    context.addError(
-        generated.ValidationError.Code.CSS_SYNTAX_DISALLOWED_RELATIVE_URL,
-        this.lineCol_,
-        /* params */[getTagDescriptiveName(tagSpec), url],
-        getTagSpecUrl(tagSpec), result);
-  }
-}
-
-/** @private */
-class UrlErrorInAttrAdapter {
-  /**
-   * @param {string} attrName
-   */
-  constructor(attrName) {
-    this.attrName_ = attrName;
-  }
-
-  /**
-   * @param {!Context} context
-   * @param {!generated.TagSpec} tagSpec
-   * @param {!generated.ValidationResult} result
-   */
-  missingUrl(context, tagSpec, result) {
-    context.addError(
-        generated.ValidationError.Code.MISSING_URL, context.getLineCol(),
-        /* params */[this.attrName_, getTagDescriptiveName(tagSpec)],
-        getTagSpecUrl(tagSpec), result);
-  }
-
-  /**
-   * @param {!Context} context
-   * @param {string} url
-   * @param {!generated.TagSpec} tagSpec
-   * @param {!generated.ValidationResult} result
-   */
-  invalidUrl(context, url, tagSpec, result) {
-    context.addError(
-        generated.ValidationError.Code.INVALID_URL, context.getLineCol(),
-        /* params */[this.attrName_, getTagDescriptiveName(tagSpec), url],
-        getTagSpecUrl(tagSpec), result);
-  }
-
-  /**
-   * @param {!Context} context
-   * @param {string} protocol
-   * @param {!generated.TagSpec} tagSpec
-   * @param {!generated.ValidationResult} result
-   */
-  invalidUrlProtocol(context, protocol, tagSpec, result) {
-    context.addError(
-        generated.ValidationError.Code.INVALID_URL_PROTOCOL,
-        context.getLineCol(),
-        /* params */
-        [this.attrName_, getTagDescriptiveName(tagSpec), protocol],
-        getTagSpecUrl(tagSpec), result);
-  }
-
-  /**
-   * @param {!Context} context
-   * @param {string} url
-   * @param {!generated.TagSpec} tagSpec
-   * @param {!generated.ValidationResult} result
-   */
-  disallowedRelativeUrl(context, url, tagSpec, result) {
-    context.addError(
-        generated.ValidationError.Code.DISALLOWED_RELATIVE_URL,
-        context.getLineCol(),
-        /* params */[this.attrName_, getTagDescriptiveName(tagSpec), url],
-        getTagSpecUrl(tagSpec), result);
-  }
-}
-
-/**
- * Helper method for validateNonTemplateAttrValueAgainstSpec.
- * @param {ParsedAttrSpec} parsedAttrSpec
- * @param {!Context} context
- * @param {!parserInterface.ParsedAttr} attr
- * @param {!generated.TagSpec} tagSpec
- * @param {!generated.ValidationResult} result
- */
-function validateAttrValueUrl(parsedAttrSpec, context, attr, tagSpec, result) {
-  /** @type {!Array<string>} */
-  const maybeUris = [];
-  if (attr.name !== 'srcset') {
-    maybeUris.push(attr.value);
-  } else {
-    if (attr.value === '') {
-      context.addError(
-          generated.ValidationError.Code.MISSING_URL, context.getLineCol(),
-          /* params */[attr.name, getTagDescriptiveName(tagSpec)],
-          getTagSpecUrl(tagSpec), result);
-      return;
-    }
-    /** @type {!parse_srcset.SrcsetParsingResult} */
-    const parseResult = parse_srcset.parseSrcset(attr.value);
-    if (!parseResult.success) {
-      // DUPLICATE_DIMENSION only needs two parameters, it does not report
-      // on the attribute value.
-      if (parseResult.errorCode ===
-          generated.ValidationError.Code.DUPLICATE_DIMENSION) {
-        context.addError(
-            parseResult.errorCode, context.getLineCol(),
-            /* params */[attr.name, getTagDescriptiveName(tagSpec)],
-            getTagSpecUrl(tagSpec), result);
-      } else {
-        context.addError(
-            parseResult.errorCode, context.getLineCol(),
-            /* params */
-            [attr.name, getTagDescriptiveName(tagSpec), attr.value],
-            getTagSpecUrl(tagSpec), result);
-      }
-      return;
-    }
-    if (parseResult.srcsetImages !== null) {
-      for (const image of parseResult.srcsetImages) {
-        maybeUris.push(image.url);
-      }
-    }
-  }
-  if (maybeUris.length === 0) {
-    context.addError(
-        generated.ValidationError.Code.MISSING_URL, context.getLineCol(),
-        /* params */[attr.name, getTagDescriptiveName(tagSpec)],
-        getTagSpecUrl(tagSpec), result);
-    return;
-  }
-  sortAndUniquify(maybeUris);
-  const adapter = new UrlErrorInAttrAdapter(attr.name);
-  for (const maybeUri of maybeUris) {
-    const unescapedMaybeUri = googString.unescapeEntities(maybeUri);
-    validateUrlAndProtocol(
-        parsedAttrSpec.getValueUrlSpec(), adapter, context, unescapedMaybeUri,
-        tagSpec, result);
-    if (result.status === generated.ValidationResult.Status.FAIL) {
-      return;
-    }
-  }
-}
-
-/**
- * Returns the protocol of the input URL. Assumes https if relative. Accepts
- * both the original URL string and a parsed URL produced from it, to avoid
- * reparsing.
- * @param {string} urlStr original URL string
- * @param {!parse_url.URL} url parsed URL.
- * @return {string}
- */
-function urlProtocol(urlStr, url) {
-  // Technically, an URL such as "script :alert('foo')" is considered a
-  // relative URL, similar to "./script%20:alert(%27foo%27)" since space is
-  // not a legal character in a URL protocol. This is what URL will determine.
-  // However, some very old browsers will ignore whitespace in URL protocols
-  // and will treat this as javascript execution. We must be safe regardless
-  // of the client. This RE is much more aggressive at extracting a protcol
-  // than URL for this reason.
-  const re = /^([^:\/?#.]+):.*$/;
-  const match = re.exec(urlStr);
-  let protocol = '';
-  if (match !== null) {
-    protocol = match[1];
-    protocol = protocol.toLowerCase().trimLeft();
-  } else {
-    protocol = url.protocol;
-  }
-  return protocol;
-}
-
-/**
- * @param {!ParsedUrlSpec} parsedUrlSpec
- * @param {UrlErrorInAttrAdapter|UrlErrorInStylesheetAdapter} adapter
- * @param {!Context} context
- * @param {string} urlStr
- * @param {!generated.TagSpec} tagSpec
- * @param {!generated.ValidationResult} result
- */
-function validateUrlAndProtocol(
-    parsedUrlSpec, adapter, context, urlStr, tagSpec, result) {
-  const spec = parsedUrlSpec.getSpec();
-  const onlyWhitespaceRe = /^[\s\xa0]*$/;  // includes non-breaking space
-  if (urlStr.match(onlyWhitespaceRe) !== null &&
-      (spec.allowEmpty === null || spec.allowEmpty === false)) {
-    adapter.missingUrl(context, tagSpec, result);
-    return;
-  }
-  const url = new parse_url.URL(urlStr);
-  if (!url.isValid) {
-    adapter.invalidUrl(context, urlStr, tagSpec, result);
-    return;
-  }
-  const protocol = urlProtocol(urlStr, url);
-  if (protocol.length > 0 && !parsedUrlSpec.isAllowedProtocol(protocol)) {
-    adapter.invalidUrlProtocol(context, protocol, tagSpec, result);
-    return;
-  }
-  if (!spec.allowRelative && (!url.hasProtocol || url.protocol.length === 0)) {
-    adapter.disallowedRelativeUrl(context, urlStr, tagSpec, result);
-    return;
-  }
-}
-
-/**
- * Returns true iff the passed in URL is a data: protocol URL.
- * @param {string} urlStr
- * @return {boolean}
- */
-function isDataUrl(urlStr) {
-  const url = new parse_url.URL(urlStr);
-  return urlProtocol(urlStr, url) == 'data';
-}
-
-/**
- * Helper method for validateNonTemplateAttrValueAgainstSpec.
- * @param {ParsedValueProperties} parsedValueProperties
- * @param {!Context} context
- * @param {!parserInterface.ParsedAttr} attr
- * @param {!generated.TagSpec} tagSpec
- * @param {!generated.ValidationResult} result
- */
-function validateAttrValueProperties(
-    parsedValueProperties, context, attr, tagSpec, result) {
-  // TODO(johannes): Replace this hack with a parser.
-  const segments = attr.value.split(/[,;]/);
-  /** @type {!Object<string, string>} */
-  const properties = Object.create(null);
-  for (const segment of segments) {
-    const keyValue = segment.split('=');
-    if (keyValue.length < 2) {
-      continue;
-    }
-    properties[keyValue[0].trim().toLowerCase()] = keyValue[1];
-  }
-  // TODO(johannes): End hack.
-  const names = Object.keys(properties).sort();
-  for (const name of names) {
-    const value = properties[name];
-    const valuePropertyByName = parsedValueProperties.getValuePropertyByName();
-    if (!(name in valuePropertyByName)) {
-      context.addError(
-          generated.ValidationError.Code.DISALLOWED_PROPERTY_IN_ATTR_VALUE,
-          context.getLineCol(),
-          /* params */[name, attr.name, getTagDescriptiveName(tagSpec)],
-          getTagSpecUrl(tagSpec), result);
-      continue;
-    }
-    const propertySpec = valuePropertyByName[name];
-    if (propertySpec.value !== null) {
-      if (propertySpec.value !== value.trim().toLowerCase()) {
-        context.addError(
-            generated.ValidationError.Code.INVALID_PROPERTY_VALUE_IN_ATTR_VALUE,
-            context.getLineCol(),
-            /* params */
-            [name, attr.name, getTagDescriptiveName(tagSpec), value],
-            getTagSpecUrl(tagSpec), result);
-      }
-    } else if (propertySpec.valueDouble !== null) {
-      if (parseFloat(value) !== propertySpec.valueDouble) {
-        context.addError(
-            generated.ValidationError.Code.INVALID_PROPERTY_VALUE_IN_ATTR_VALUE,
-            context.getLineCol(),
-            /* params */
-            [name, attr.name, getTagDescriptiveName(tagSpec), value],
-            getTagSpecUrl(tagSpec), result);
-      }
-    }
-  }
-  const notSeen = subtractDiff(
-      parsedValueProperties.getMandatoryValuePropertyNames(), names);
-  for (const name of notSeen) {
-    context.addError(
-        generated.ValidationError.Code
-            .MANDATORY_PROPERTY_MISSING_FROM_ATTR_VALUE,
-        context.getLineCol(),
-        /* params */[name, attr.name, getTagDescriptiveName(tagSpec)],
-        getTagSpecUrl(tagSpec), result);
-  }
-}
-
-/**
- * This is the main validation procedure for attributes, operating with a
- * ParsedAttrSpec instance.
- * @param {ParsedAttrSpec} parsedAttrSpec
- * @param {!Context} context
- * @param {!parserInterface.ParsedAttr} attr
- * @param {!generated.TagSpec} tagSpec
- * @param {!generated.ValidationResult} result
- */
-function validateNonTemplateAttrValueAgainstSpec(
-    parsedAttrSpec, context, attr, tagSpec, result) {
-  // The value, value_regex, value_url, and value_properties fields are
-  // treated like a oneof, but we're not using oneof because it's a feature
-  // that was added after protobuf 2.5.0 (which our open-source version uses).
-  // begin oneof {
-  const spec = parsedAttrSpec.getSpec();
-  if (spec.addValueToSet !== null) {
-    let provision = new generated.ValueSetProvision;
-    provision.set = spec.addValueToSet;
-    provision.value = attr.value;
-    result.valueSetProvisions.push(provision);
-  }
-  if (spec.valueOneofSet !== null) {
-    let requirement = new generated.ValueSetRequirement;
-    requirement.provision = new generated.ValueSetProvision;
-    requirement.provision.set = spec.valueOneofSet;
-    requirement.provision.value = attr.value;
-    requirement.errorIfUnsatisfied = populateError(
-        generated.ValidationError.Severity.ERROR,
-        generated.ValidationError.Code.VALUE_SET_MISMATCH, context.getLineCol(),
-        /* params */[attr.name, getTagDescriptiveName(tagSpec)],
-        getTagSpecUrl(tagSpec));
-    result.valueSetRequirements.push(requirement);
-  }
-  if (spec.value.length > 0) {
-    for (const value of spec.value) {
-      if (attr.value === value) {
-        return;
-      }
-    }
-    context.addError(
-        generated.ValidationError.Code.INVALID_ATTR_VALUE, context.getLineCol(),
-        /* params */[attr.name, getTagDescriptiveName(tagSpec), attr.value],
-        getTagSpecUrl(tagSpec), result);
-  } else if (spec.valueCasei.length > 0) {
-    for (const value of spec.valueCasei) {
-      if (attr.value.toLowerCase() === value) {
-        return;
-      }
-    }
-    context.addError(
-        generated.ValidationError.Code.INVALID_ATTR_VALUE, context.getLineCol(),
-        /* params */[attr.name, getTagDescriptiveName(tagSpec), attr.value],
-        getTagSpecUrl(tagSpec), result);
-  } else if (spec.valueRegex !== null || spec.valueRegexCasei !== null) {
-    const valueRegex = (spec.valueRegex !== null) ?
-        context.getRules().getFullMatchRegex(spec.valueRegex) :
-        context.getRules().getFullMatchCaseiRegex(
-            /** @type {number} */ (spec.valueRegexCasei));
-    if (!valueRegex.test(attr.value)) {
-      context.addError(
-          generated.ValidationError.Code.INVALID_ATTR_VALUE,
-          context.getLineCol(),
-          /* params */[attr.name, getTagDescriptiveName(tagSpec), attr.value],
-          getTagSpecUrl(tagSpec), result);
-    }
-  } else if (spec.valueUrl !== null) {
-    validateAttrValueUrl(parsedAttrSpec, context, attr, tagSpec, result);
-  } else {
-    const valueProperties = parsedAttrSpec.getValuePropertiesOrNull();
-    if (valueProperties !== null) {
-      validateAttrValueProperties(
-          valueProperties, context, attr, tagSpec, result);
-    }
-  }
-  // } end oneof
-}
-
-/**
- * @param {!generated.AmpLayout.Layout} layout
- * @return {string}
- */
-function getLayoutClass(layout) {
-  return 'i-amphtml-layout-' + getLayoutName(layout);
-}
-
-/**
- * @param {!generated.AmpLayout.Layout} layout
- * @return {string}
- */
-function getLayoutName(layout) {
-  const idx = generated.AmpLayout.Layout_ValuesByIndex.indexOf(layout);
-  return generated.AmpLayout.Layout_NamesByIndex[idx].toLowerCase().replace(
-      '_', '-');
-}
-
-/**
- * @return {string}
- */
-function getLayoutSizeDefinedClass() {
-  return 'i-amphtml-layout-size-defined';
-}
-
-/**
- * @return {string}
- */
-function getLayoutAwaitingSizeClass() {
-  return 'i-amphtml-layout-awaiting-size';
-}
-
-/**
- * @param {!generated.AmpLayout.Layout} layout
- * @return {boolean}
- */
-function isLayoutSizeDefined(layout) {
-  return (
-      layout === generated.AmpLayout.Layout.FILL ||
-      layout === generated.AmpLayout.Layout.FIXED ||
-      layout === generated.AmpLayout.Layout.FIXED_HEIGHT ||
-      layout === generated.AmpLayout.Layout.FLEX_ITEM ||
-      layout === generated.AmpLayout.Layout.FLUID ||
-      layout === generated.AmpLayout.Layout.INTRINSIC ||
-      layout === generated.AmpLayout.Layout.RESPONSIVE);
-}
-
-/**
- * @param {!generated.AmpLayout.Layout} layout
- * @return {boolean}
- */
-function isLayoutAwaitingSize(layout) {
-  return layout === generated.AmpLayout.Layout.FLUID;
-}
-
-/**
- * @param {string} layout
- * @return {!generated.AmpLayout.Layout}
- */
-function parseLayout(layout) {
-  if (layout === undefined) {
-    return generated.AmpLayout.Layout.UNKNOWN;
-  }
-  const idx = generated.AmpLayout.Layout_NamesByIndex.findIndex((name) => {
-    return name.toLowerCase().replace('_', '-') === layout;
-  });
-  if (idx === -1) {
-    return generated.AmpLayout.Layout.UNKNOWN;
-  }
-  return generated.AmpLayout.Layout_ValuesByIndex[idx];
-}
-
-/**
- * Parses a width or height layout attribute, for the determining the layout
- * of AMP tags (e.g. <amp-img width="42px" etc.).
- */
-const CssLength = class {
-  /**
-   * @param {string|undefined} input The input attribute value to be parsed.
-   * @param {boolean} allowAuto Whether or not to allow the 'auto' value as
-   *    a value.
-   * @param {boolean} allowFluid whether or not to allow the 'fluid' value
-   *   as a value.
-   */
-  constructor(input, allowAuto, allowFluid) {
-    /**
-     * Whether the value or unit is invalid. Note that passing
-     * undefined as |input| is considered valid.
-     * @type {boolean}
-     */
-    this.isValid = false;
-    /**
-     * Whether the attribute value is set.
-     * @type {boolean}
-     */
-    this.isSet = false;
-    /**
-     * Whether the attribute value is 'auto'. This is a special value that
-     * indicates that the value gets derived from the context. In practice
-     * that's only ever the case for a width.
-     * @type {boolean}
-     */
-    this.isAuto = false;
-    /**
-     * Whether the attribute value is 'fluid'
-     * @type {boolean}
-     */
-    this.isFluid = false;
-    /**
-     * The numeric value.
-     * @type {number}
-     */
-    this.numeral = Number.NaN;
-    /**
-     * The unit, 'px' being the default in case it's absent.
-     * @type {string}
-     */
-    this.unit = 'px';
-
-    if (input === undefined) {
-      this.isValid = true;
-      return;
-    }
-    this.isSet = true;
-    if (input === 'auto') {
-      this.isAuto = true;
-      this.isValid = allowAuto;
-      return;
-    } else if (input === 'fluid') {
-      this.isFluid = true;
-      this.isValid = allowFluid;
-    }
-    const re = /^(\d+(?:\.\d+)?)(px|em|rem|vh|vw|vmin|vmax)?$/;
-    const match = re.exec(input);
-    if (match !== null) {
-      this.isValid = true;
-      this.numeral = parseFloat(match[1]);
-      this.unit = match[2] || 'px';
-    }
-  }
-};
-exports.CssLength = CssLength;
-
-/**
- * Calculates the effective width from the input layout, input width and tag.
- * For certain tags it uses explicit dimensions.
- * @param {!generated.AmpLayout.Layout} inputLayout
- * @param {!CssLength} inputWidth
- * @param {string} tagName
- * @return {!CssLength}
- */
-function CalculateWidthForTag(inputLayout, inputWidth, tagName) {
-  if ((inputLayout === generated.AmpLayout.Layout.UNKNOWN ||
-       inputLayout === generated.AmpLayout.Layout.FIXED) &&
-      !inputWidth.isSet) {
-    if (tagName === 'AMP-ANALYTICS' || tagName === 'AMP-PIXEL') {
-      return new CssLength(
-          '1px', /* allowAuto */ false, /* allowFluid */ false);
-    }
-    if (tagName === 'AMP-SOCIAL-SHARE') {
-      return new CssLength(
-          '60px', /* allowAuto */ false, /* allowFluid */ false);
-    }
-  }
-  return inputWidth;
-}
-
-/**
- * Calculates the effective width from the input layout and input width.
- * This involves considering that some elements, such as amp-audio and
- * amp-pixel, have natural dimensions (browser or implementation-specific
- * defaults for width / height).
- * @param {!generated.AmpLayout} spec
- * @param {!generated.AmpLayout.Layout} inputLayout
- * @param {!CssLength} inputWidth
- * @return {!CssLength}
- */
-function CalculateWidth(spec, inputLayout, inputWidth) {
-  if ((inputLayout === generated.AmpLayout.Layout.UNKNOWN ||
-       inputLayout === generated.AmpLayout.Layout.FIXED) &&
-      !inputWidth.isSet && spec.definesDefaultWidth) {
-    return new CssLength('1px', /* allowAuto */ false, /* allowFluid */ false);
-  }
-  return inputWidth;
-}
-
-/**
- * Calculates the effective height from the input layout, input height and
- * tag. For certain tags it uses explicit dimensions.
- * @param {!generated.AmpLayout.Layout} inputLayout
- * @param {!CssLength} inputHeight
- * @param {string} tagName
- * @return {!CssLength}
- */
-function CalculateHeightForTag(inputLayout, inputHeight, tagName) {
-  if ((inputLayout === generated.AmpLayout.Layout.UNKNOWN ||
-       inputLayout === generated.AmpLayout.Layout.FIXED ||
-       inputLayout === generated.AmpLayout.Layout.FIXED_HEIGHT) &&
-      !inputHeight.isSet) {
-    if (tagName === 'AMP-ANALYTICS' || tagName === 'AMP-PIXEL') {
-      return new CssLength(
-          '1px', /* allowAuto */ false, /* allowFluid */ false);
-    }
-    if (tagName === 'AMP-SOCIAL-SHARE') {
-      return new CssLength(
-          '44px', /* allowAuto */ false, /* allowFluid */ false);
-    }
-  }
-  return inputHeight;
-}
-
-/**
- * Calculates the effective height from input layout and input height.
- * @param {!generated.AmpLayout} spec
- * @param {!generated.AmpLayout.Layout} inputLayout
- * @param {!CssLength} inputHeight
- * @return {!CssLength}
- */
-function CalculateHeight(spec, inputLayout, inputHeight) {
-  if ((inputLayout === generated.AmpLayout.Layout.UNKNOWN ||
-       inputLayout === generated.AmpLayout.Layout.FIXED ||
-       inputLayout === generated.AmpLayout.Layout.FIXED_HEIGHT) &&
-      !inputHeight.isSet && spec.definesDefaultHeight) {
-    return new CssLength('1px', /* allowAuto */ false, /* allowFluid */ false);
-  }
-  return inputHeight;
-}
-
-/**
- * Calculates the layout; this depends on the width / height
- * calculation above. It happens last because web designers often make
- * fixed-sized mocks first and then the layout determines how things
- * will change for different viewports / devices / etc.
- * @param {!generated.AmpLayout.Layout} inputLayout
- * @param {!CssLength} width
- * @param {!CssLength} height
- * @param {?string} sizesAttr
- * @param {?string} heightsAttr
- * @return {!generated.AmpLayout.Layout}
- */
-function CalculateLayout(inputLayout, width, height, sizesAttr, heightsAttr) {
-  if (inputLayout !== generated.AmpLayout.Layout.UNKNOWN) {
-    return inputLayout;
-  } else if (!width.isSet && !height.isSet) {
-    return generated.AmpLayout.Layout.CONTAINER;
-  } else if (
-      (height.isSet && height.isFluid) || (width.isSet && width.isFluid)) {
-    return generated.AmpLayout.Layout.FLUID;
-  } else if (height.isSet && (!width.isSet || width.isAuto)) {
-    return generated.AmpLayout.Layout.FIXED_HEIGHT;
-  } else if (
-      height.isSet && width.isSet &&
-      ((sizesAttr !== undefined && sizesAttr !== '') ||
-       (heightsAttr !== undefined && heightsAttr !== ''))) {
-    return generated.AmpLayout.Layout.RESPONSIVE;
-  } else {
-    return generated.AmpLayout.Layout.FIXED;
-  }
-}
-
-
-/**
- *  DispatchKey represents a tuple of either 1-3 strings:
- *    - attribute name
- *    - attribute value (optional)
- *    - mandatory parent html tag (optional)
- *  A Dispatch key can be generated from some validator TagSpecs. One dispatch
- *  key per attribute can be generated from any HTML tag. If one of the
- *  dispatch keys for an HTML tag match that of a a TagSpec, we validate that
- *  HTML tag against only this one TagSpec. Otherwise, this TagSpec is not
- *  eligible for validation against this HTML tag.
- * @param {!generated.AttrSpec.DispatchKeyType} dispatchKeyType
- * @param {string} attrName
- * @param {string} attrValue
- * @param {string} mandatoryParent may be set to "$NOPARENT"
- * @return {string} dispatch key
- */
-function makeDispatchKey(
-    dispatchKeyType, attrName, attrValue, mandatoryParent) {
-  switch (dispatchKeyType) {
-    case generated.AttrSpec.DispatchKeyType.NAME_DISPATCH:
-      return attrName;
-    case generated.AttrSpec.DispatchKeyType.NAME_VALUE_DISPATCH:
-      return attrName + '\0' + attrValue;
-    case generated.AttrSpec.DispatchKeyType.NAME_VALUE_PARENT_DISPATCH:
-      return attrName + '\0' + attrValue + '\0' + mandatoryParent;
-    case generated.AttrSpec.DispatchKeyType.NONE_DISPATCH:
-    default:
-      asserts.assert(false);
-  }
-  return '';  // To make closure happy.
-}
-
-/**
- * Returns true if |value| contains mustache template syntax.
- * @param {string} value
- * @return {boolean}
- */
-function attrValueHasTemplateSyntax(value) {
-  // Mustache (https://mustache.github.io/mustache.5.html), our template
-  // system, supports replacement tags that start with {{ and end with }}.
-  // We relax attribute value rules if the value contains this syntax as we
-  // will validate the post-processed tag instead.
-  const mustacheTag = /{{.*}}/;
-  return mustacheTag.test(value);
-}
-
-/**
- * Returns true if |value| contains a mustache unescaped template syntax.
- * @param {string} value
- * @return {boolean}
- */
-function attrValueHasUnescapedTemplateSyntax(value) {
-  // Mustache (https://mustache.github.io/mustache.5.html), our template
-  // system, supports {{{unescaped}}} or {{{&unescaped}}} and there can
-  // be whitespace after the 2nd '{'. We disallow these in attribute Values.
-  const unescapedOpenTag = /{{\s*[&{]/;
-  return unescapedOpenTag.test(value);
-}
-
-/**
- * Returns true if |value| contains a mustache partials template syntax.
- * @param {string} value
- * @return {boolean}
- */
-function attrValueHasPartialsTemplateSyntax(value) {
-  // Mustache (https://mustache.github.io/mustache.5.html), our template
-  // system, supports 'partials' which include other Mustache templates
-  // in the format of {{>partial}} and there can be whitespace after the {{.
-  // We disallow partials in attribute values.
-  const partialsTag = /{{\s*>/;
-  return partialsTag.test(value);
-}
-
-/**
- * Validates whether the parent tag satisfied the spec (e.g., some
- * tags can only appear in head).
- * @param {!ParsedTagSpec} parsedTagSpec
- * @param {!Context} context
- * @param {!generated.ValidationResult} validationResult
- */
-function validateParentTag(parsedTagSpec, context, validationResult) {
-  const spec = parsedTagSpec.getSpec();
-  if (spec.mandatoryParent !== null &&
-      (spec.mandatoryParent !== context.getTagStack().parentTagName()) &&
-      (spec.mandatoryParent !== context.getTagStack().parentTagSpecName())) {
-    // Output a parent/child error using CSS Child Selector syntax which is
-    // both succinct and should be well understood by web developers.
-    context.addError(
-        generated.ValidationError.Code.WRONG_PARENT_TAG, context.getLineCol(),
-        /* params */
-        [
-          getTagDescriptiveName(spec),
-          context.getTagStack().parentTagName().toLowerCase(),
-          spec.mandatoryParent.toLowerCase(),
-        ],
-        getTagSpecUrl(spec), validationResult);
-  }
-}
-
-/**
- * Validates that this tag is an allowed descendant tag type.
- * Registers new descendent constraints if they are set.
- * @param {!parserInterface.ParsedHtmlTag} encounteredTag
- * @param {!ParsedTagSpec} parsedTagSpec
- * @param {!Context} context
- * @param {!generated.ValidationResult} validationResult
- */
-function validateDescendantTags(
-    encounteredTag, parsedTagSpec, context, validationResult) {
-  const tagStack = context.getTagStack();
-
-  for (let ii = 0; ii < tagStack.allowedDescendantsList().length; ++ii) {
-    const allowedDescendantsList = tagStack.allowedDescendantsList()[ii];
-    // If the tag we're validating is not allowlisted for a specific ancestor,
-    // then throw an error.
-    if (!allowedDescendantsList.allowedTags.includes(
-            encounteredTag.upperName())) {
-      context.addError(
-          generated.ValidationError.Code.DISALLOWED_TAG_ANCESTOR,
-          context.getLineCol(),
-          /* params */
-          [
-            encounteredTag.lowerName(),
-            allowedDescendantsList.tagName.toLowerCase(),
-          ],
-          getTagSpecUrl(parsedTagSpec), validationResult);
-      return;
-    }
-  }
-}
-
-/**
- * Validates if the 'no siblings allowed' rule exists.
- * @param {!ParsedTagSpec} parsedTagSpec
- * @param {!Context} context
- * @param {!generated.ValidationResult} validationResult
- */
-function validateNoSiblingsAllowedTags(
-    parsedTagSpec, context, validationResult) {
-  const spec = parsedTagSpec.getSpec();
-  const tagStack = context.getTagStack();
-
-  if (spec.siblingsDisallowed && tagStack.parentChildCount() > 0) {
-    context.addError(
-        generated.ValidationError.Code.TAG_NOT_ALLOWED_TO_HAVE_SIBLINGS,
-        context.getLineCol(),
-        /* params */
-        [spec.tagName.toLowerCase(), tagStack.parentTagName().toLowerCase()],
-        getTagSpecUrl(spec), validationResult);
-  }
-
-  if (tagStack.parentHasChildWithNoSiblingRule() &&
-      tagStack.parentChildCount() > 0) {
-    context.addError(
-        generated.ValidationError.Code.TAG_NOT_ALLOWED_TO_HAVE_SIBLINGS,
-        tagStack.parentOnlyChildErrorLineCol(),
-        /* params */
-        [
-          tagStack.parentOnlyChildTagName().toLowerCase(),
-          tagStack.parentTagName().toLowerCase(),
-        ],
-        getTagSpecUrl(spec), validationResult);
-  }
-}
-
-/**
- * Validates if the 'last child' rule exists.
- * @param {!Context} context
- * @param {!generated.ValidationResult} validationResult
- */
-function validateLastChildTags(context, validationResult) {
-  const tagStack = context.getTagStack();
-
-  if (tagStack.parentHasChildWithLastChildRule()) {
-    context.addError(
-        generated.ValidationError.Code.MANDATORY_LAST_CHILD_TAG,
-        tagStack.parentLastChildErrorLineCol(),
-        /* params */
-        [
-          tagStack.parentLastChildTagName().toLowerCase(),
-          tagStack.parentTagName().toLowerCase(),
-        ],
-        tagStack.parentLastChildUrl(), validationResult);
-  }
-}
-
-/**
- * If this tag requires an extension and we have processed all extensions,
- * report an error if that extension has not been loaded.
- * @param {!ParsedTagSpec} parsedTagSpec
- * @param {!Context} context
- * @param {!generated.ValidationResult} validationResult
- */
-function validateRequiredExtensions(parsedTagSpec, context, validationResult) {
-  const tagSpec = parsedTagSpec.getSpec();
-  const extensionsCtx = context.getExtensions();
-  for (const requiredExtension of tagSpec.requiresExtension) {
-    if (!extensionsCtx.isExtensionLoaded(requiredExtension)) {
-      context.addError(
-          generated.ValidationError.Code.MISSING_REQUIRED_EXTENSION,
-          context.getLineCol(),
-          /* params */
-          [getTagDescriptiveName(parsedTagSpec.getSpec()), requiredExtension],
-          getTagSpecUrl(parsedTagSpec), validationResult);
-    }
-  }
-}
-
-/**
- * If this attribute requires an extension and we have processed all
- * extensions, report an error if that extension has not been loaded.
- * @param {!ParsedAttrSpec} parsedAttrSpec
- * @param {!Context} context
- * @param {!generated.ValidationResult} validationResult
- */
-function validateAttrRequiredExtensions(
-    parsedAttrSpec, context, validationResult) {
-  const attrSpec = parsedAttrSpec.getSpec();
-  const extensionsCtx = context.getExtensions();
-  for (const requiredExtension of attrSpec.requiresExtension) {
-    if (!extensionsCtx.isExtensionLoaded(requiredExtension)) {
-      context.addError(
-          generated.ValidationError.Code.ATTR_MISSING_REQUIRED_EXTENSION,
-          context.getLineCol(),
-          /* params */
-          [attrSpec.name, requiredExtension],
-          /* specUrl */ '', validationResult);
-    }
-  }
-}
-
-/**
- * Check for duplicates of tags that should be unique, reporting errors for
- * the second instance of each unique tag.
- * @param {!ParsedTagSpec} parsedTagSpec
- * @param {!Context} context
- * @param {!generated.ValidationResult} validationResult
- */
-function validateUniqueness(parsedTagSpec, context, validationResult) {
-  const tagSpec = parsedTagSpec.getSpec();
-  if (tagSpec.unique &&
-      context.getTagspecsValidated().hasOwnProperty(parsedTagSpec.id())) {
-    context.addError(
-        generated.ValidationError.Code.DUPLICATE_UNIQUE_TAG,
-        context.getLineCol(),
-        /* params */[getTagDescriptiveName(tagSpec)],
-        getTagSpecUrl(parsedTagSpec), validationResult);
-  }
-}
-
-/**
- * Considering that reference points could be defined by both reference
- * points and regular tag specs, check that we don't have matchers assigned
- * from both, there can be only one.
- * @param {?ParsedTagSpec} refPointSpec
- * @param {?ParsedTagSpec} tagSpec
- * @param {!Context} context
- * @param {!generated.ValidationResult} validationResult
- */
-function checkForReferencePointCollision(
-    refPointSpec, tagSpec, context, validationResult) {
-  if (refPointSpec === null || !refPointSpec.hasReferencePoints()) {
-    return;
-  }
-  if (tagSpec === null || !tagSpec.hasReferencePoints()) {
-    return;
-  }
-  context.addError(
-      generated.ValidationError.Code.TAG_REFERENCE_POINT_CONFLICT,
-      context.getLineCol(),
-      /* params */
-      [
-        getTagDescriptiveName(tagSpec.getSpec()),
-        refPointSpec.getReferencePoints().parentTagSpecName(),
-      ],
-      refPointSpec.getReferencePoints().parentSpecUrl(), validationResult);
-}
-
-/**
- * Validates if the tag ancestors satisfied the spec.
- * @param {!ParsedTagSpec} parsedTagSpec
- * @param {!Context} context
- * @param {!generated.ValidationResult} validationResult
- */
-function validateAncestorTags(parsedTagSpec, context, validationResult) {
-  const spec = parsedTagSpec.getSpec();
-  if (spec.mandatoryAncestor !== null) {
-    const mandatoryAncestor = /** @type {string} */ (spec.mandatoryAncestor);
-    if (!context.getTagStack().hasAncestor(mandatoryAncestor)) {
-      if (spec.mandatoryAncestorSuggestedAlternative !== null) {
-        context.addError(
-            generated.ValidationError.Code.MANDATORY_TAG_ANCESTOR_WITH_HINT,
-            context.getLineCol(),
-            /* params */
-            [
-              getTagDescriptiveName(spec),
-              mandatoryAncestor.toLowerCase(),
-              spec.mandatoryAncestorSuggestedAlternative.toLowerCase(),
-            ],
-            getTagSpecUrl(spec), validationResult);
-      } else {
-        context.addError(
-            generated.ValidationError.Code.MANDATORY_TAG_ANCESTOR,
-            context.getLineCol(),
-            /* params */
-            [getTagDescriptiveName(spec), mandatoryAncestor.toLowerCase()],
-            getTagSpecUrl(spec), validationResult);
-      }
-      return;
-    }
-  }
-  for (const disallowedAncestor of spec.disallowedAncestor) {
-    if (context.getTagStack().hasAncestor(disallowedAncestor)) {
-      context.addError(
-          generated.ValidationError.Code.DISALLOWED_TAG_ANCESTOR,
-          context.getLineCol(),
-          /* params */
-          [getTagDescriptiveName(spec), disallowedAncestor.toLowerCase()],
-          getTagSpecUrl(spec), validationResult);
-      return;
-    }
-  }
-}
-
-/**
- * Helper method for validateLayout.
- * Validates the server-side rendering related attributes for the given
- * layout.
- * @param {!generated.TagSpec} spec
- * @param {!parserInterface.ParsedHtmlTag} encounteredTag
- * @param {!generated.AmpLayout.Layout} inputLayout
- * @param {!CssLength} inputWidth
- * @param {!CssLength} inputHeight
- * @param {string} sizesAttr
- * @param {string} heightsAttr
- * @param {!Context} context
- * @param {!generated.ValidationResult} result
- */
-function validateSsrLayout(
-    spec, encounteredTag, inputLayout, inputWidth, inputHeight, sizesAttr,
-    heightsAttr, context, result) {
-  // Only applies to transformed AMP and custom elements (<amp-...>).
-  if (!context.isTransformed() ||
-      !googString./*OK*/ startsWith(encounteredTag.lowerName(), 'amp-')) {
-    return;
-  }
-
-  // calculate effective ssr layout
-  const width =
-      CalculateWidthForTag(inputLayout, inputWidth, encounteredTag.upperName());
-  const height = CalculateHeightForTag(
-      inputLayout, inputHeight, encounteredTag.upperName());
-  const layout =
-      CalculateLayout(inputLayout, width, height, sizesAttr, heightsAttr);
-
-  const attrsByKey = encounteredTag.attrsByKey();
-
-  // class attribute
-  const classAttr = attrsByKey['class'];
-  if (classAttr !== undefined) {
-    // i-amphtml-layout-{layout_name}
-    const validInternalClasses = Object.create(null);
-    validInternalClasses[getLayoutClass(layout)] = 0;
-    if (isLayoutSizeDefined(layout)) {
-      // i-amphtml-layout-size-defined
-      validInternalClasses[getLayoutSizeDefinedClass()] = 0;
-    }
-    if (isLayoutAwaitingSize(layout)) {
-      // i-amphtml-layout-awaiting-size
-      validInternalClasses[getLayoutAwaitingSizeClass()] = 0;
-    }
-    const classes = classAttr.split(/[\s+]/);
-    for (const classToken of classes) {
-      if (googString./*OK*/ startsWith(classToken, 'i-amphtml-') &&
-          !(classToken in validInternalClasses)) {
-        context.addError(
-            generated.ValidationError.Code.INVALID_ATTR_VALUE,
-            context.getLineCol(),
-            /* params */['class', getTagDescriptiveName(spec), classAttr],
-            getTagSpecUrl(spec), result);
-      }
-    }
-  }
-
-  // i-amphtml-layout attribute
-  const ssrAttr = attrsByKey['i-amphtml-layout'];
-  if (ssrAttr !== undefined) {
-    const layoutName = getLayoutName(layout);
-    if (layoutName !== ssrAttr.toLowerCase()) {
-      context.addError(
-          generated.ValidationError.Code.ATTR_VALUE_REQUIRED_BY_LAYOUT,
-          context.getLineCol(),
-          /* params */
-          [
-            ssrAttr,
-            'i-amphtml-layout',
-            getTagDescriptiveName(spec),
-            layoutName.toUpperCase(),
-            layoutName,
-          ],
-          getTagSpecUrl(spec), result);
-    }
-  }
-}
-
-/**
- * Validates the layout for the given tag. This involves checking the
- * layout, width, height, sizes attributes with AMP specific logic.
- * @param {!ParsedTagSpec} parsedTagSpec
- * @param {!Context} context
- * @param {!parserInterface.ParsedHtmlTag} encounteredTag
- * @param {!generated.ValidationResult} result
- */
-function validateLayout(parsedTagSpec, context, encounteredTag, result) {
-  const spec = parsedTagSpec.getSpec();
-  asserts.assert(spec.ampLayout !== null);
-
-  const attrsByKey = encounteredTag.attrsByKey();
-  const layoutAttr = attrsByKey['layout'];
-  const widthAttr = attrsByKey['width'];
-  const heightAttr = attrsByKey['height'];
-  const sizesAttr = attrsByKey['sizes'];
-  const heightsAttr = attrsByKey['heights'];
-
-  // We disable validating layout for tags where one of the layout attributes
-  // contains mustache syntax.
-  const hasTemplateAncestor = context.getTagStack().hasAncestor('TEMPLATE');
-  if (hasTemplateAncestor &&
-      (attrValueHasTemplateSyntax(layoutAttr) ||
-       attrValueHasTemplateSyntax(widthAttr) ||
-       attrValueHasTemplateSyntax(heightAttr) ||
-       attrValueHasTemplateSyntax(sizesAttr) ||
-       attrValueHasTemplateSyntax(heightsAttr))) {
-    return;
-  }
-
-  // Parse the input layout attributes which we found for this tag.
-  const inputLayout = parseLayout(layoutAttr);
-  if (layoutAttr !== undefined &&
-      inputLayout === generated.AmpLayout.Layout.UNKNOWN) {
-    context.addError(
-        generated.ValidationError.Code.INVALID_ATTR_VALUE, context.getLineCol(),
-        /* params */['layout', getTagDescriptiveName(spec), layoutAttr],
-        getTagSpecUrl(spec), result);
-    return;
-  }
-  const inputWidth = new CssLength(
-      widthAttr, /* allowAuto */ true,
-      /* allowFluid */ inputLayout === generated.AmpLayout.Layout.FLUID);
-  if (!inputWidth.isValid) {
-    context.addError(
-        generated.ValidationError.Code.INVALID_ATTR_VALUE, context.getLineCol(),
-        /* params */['width', getTagDescriptiveName(spec), widthAttr],
-        getTagSpecUrl(spec), result);
-    return;
-  }
-  const inputHeight = new CssLength(
-      heightAttr, /* allowAuto */ true,
-      /* allowFluid */ inputLayout === generated.AmpLayout.Layout.FLUID);
-  if (!inputHeight.isValid) {
-    context.addError(
-        generated.ValidationError.Code.INVALID_ATTR_VALUE, context.getLineCol(),
-        /* params */['height', getTagDescriptiveName(spec), heightAttr],
-        getTagSpecUrl(spec), result);
-    return;
-  }
-
-  // Now calculate the effective layout attributes.
-  const width = CalculateWidth(spec.ampLayout, inputLayout, inputWidth);
-  const height = CalculateHeight(spec.ampLayout, inputLayout, inputHeight);
-  const layout =
-      CalculateLayout(inputLayout, width, height, sizesAttr, heightsAttr);
-
-  // Validate for transformed AMP the server-side rendering layout.
-  validateSsrLayout(
-      spec, encounteredTag, inputLayout, inputWidth, inputHeight, sizesAttr,
-      heightsAttr, context, result);
-
-  // Only FLEX_ITEM allows for height to be set to auto.
-  if (height.isAuto && layout !== generated.AmpLayout.Layout.FLEX_ITEM) {
-    context.addError(
-        generated.ValidationError.Code.INVALID_ATTR_VALUE, context.getLineCol(),
-        /* params */['height', getTagDescriptiveName(spec), heightAttr],
-        getTagSpecUrl(spec), result);
-    return;
-  }
-
-  // Does the tag support the computed layout?
-  if (spec.ampLayout.supportedLayouts.indexOf(layout) === -1) {
-    const code = layoutAttr === undefined ?
-        generated.ValidationError.Code.IMPLIED_LAYOUT_INVALID :
-        generated.ValidationError.Code.SPECIFIED_LAYOUT_INVALID;
-    // Special case. If no layout related attributes were provided, this
-    // implies the CONTAINER layout. However, telling the user that the
-    // implied layout is unsupported for this tag is confusing if all they
-    // need is to provide width and height in, for example, the common case of
-    // creating an AMP-IMG without specifying dimensions. In this case, we
-    // emit a less correct, but simpler error message that could be more
-    // useful to the average user.
-    if (code === generated.ValidationError.Code.IMPLIED_LAYOUT_INVALID &&
-        layout == generated.AmpLayout.Layout.CONTAINER &&
-        spec.ampLayout.supportedLayouts.indexOf(
-            generated.AmpLayout.Layout.RESPONSIVE) !== -1) {
-      context.addError(
-          generated.ValidationError.Code.MISSING_LAYOUT_ATTRIBUTES,
-          context.getLineCol(),
-          /*params=*/[getTagDescriptiveName(spec)], getTagSpecUrl(spec),
-          result);
-      return;
-    }
-    context.addError(
-        code, context.getLineCol(),
-        /* params */[layout, getTagDescriptiveName(spec)], getTagSpecUrl(spec),
-        result);
-    return;
-  }
-  // FIXED, FIXED_HEIGHT, INTRINSIC, RESPONSIVE must have height set.
-  if ((layout === generated.AmpLayout.Layout.FIXED ||
-       layout === generated.AmpLayout.Layout.FIXED_HEIGHT ||
-       layout === generated.AmpLayout.Layout.INTRINSIC ||
-       layout === generated.AmpLayout.Layout.RESPONSIVE) &&
-      !height.isSet) {
-    context.addError(
-        generated.ValidationError.Code.MANDATORY_ATTR_MISSING,
-        context.getLineCol(),
-        /* params */['height', getTagDescriptiveName(spec)],
-        getTagSpecUrl(spec), result);
-    return;
-  }
-  // For FIXED_HEIGHT if width is set it must be auto.
-  if (layout === generated.AmpLayout.Layout.FIXED_HEIGHT && width.isSet &&
-      !width.isAuto) {
-    context.addError(
-        generated.ValidationError.Code.ATTR_VALUE_REQUIRED_BY_LAYOUT,
-        context.getLineCol(),
-        /* params */
-        [
-          widthAttr, 'width', getTagDescriptiveName(spec), 'FIXED_HEIGHT',
-          'auto'
-        ],
-        getTagSpecUrl(spec), result);
-    return;
-  }
-  // FIXED, INTRINSIC, RESPONSIVE must have width set and not be auto.
-  if (layout === generated.AmpLayout.Layout.FIXED ||
-      layout === generated.AmpLayout.Layout.INTRINSIC ||
-      layout === generated.AmpLayout.Layout.RESPONSIVE) {
-    if (!width.isSet) {
-      context.addError(
-          generated.ValidationError.Code.MANDATORY_ATTR_MISSING,
-          context.getLineCol(),
-          /* params */['width', getTagDescriptiveName(spec)],
-          getTagSpecUrl(spec), result);
-      return;
-    } else if (width.isAuto) {
-      context.addError(
-          generated.ValidationError.Code.INVALID_ATTR_VALUE,
-          context.getLineCol(),
-          /* params */['width', getTagDescriptiveName(spec), 'auto'],
-          getTagSpecUrl(spec), result);
-      return;
-    }
-  }
-  // INTRINSIC, RESPONSIVE must have same units for height and width.
-  if ((layout === generated.AmpLayout.Layout.INTRINSIC ||
-       layout === generated.AmpLayout.Layout.RESPONSIVE) &&
-      width.unit !== height.unit) {
-    context.addError(
-        generated.ValidationError.Code.INCONSISTENT_UNITS_FOR_WIDTH_AND_HEIGHT,
-        context.getLineCol(),
-        /* params */[getTagDescriptiveName(spec), width.unit, height.unit],
-        getTagSpecUrl(spec), result);
-    return;
-  }
-  // heights attribute is only allowed for RESPONSIVE layout.
-  if (heightsAttr !== undefined &&
-      layout !== generated.AmpLayout.Layout.RESPONSIVE) {
-    const code = layoutAttr === undefined ?
-        generated.ValidationError.Code.ATTR_DISALLOWED_BY_IMPLIED_LAYOUT :
-        generated.ValidationError.Code.ATTR_DISALLOWED_BY_SPECIFIED_LAYOUT;
-    context.addError(
-        code, context.getLineCol(),
-        /* params */['heights', getTagDescriptiveName(spec), layout],
-        getTagSpecUrl(spec), result);
-    return;
-  }
-}
-
-/**
- * Helper method for validateAttributes, for when an attribute is
- * encountered which is not specified by the validator.protoascii
- * specification.
- * @param {!ParsedTagSpec} parsedTagSpec
- * @param {!Context} context
- * @param {string} attrName
- * @param {!generated.ValidationResult} result
- */
-function validateAttrNotFoundInSpec(parsedTagSpec, context, attrName, result) {
-  // For now, we just skip data- attributes in the validator, because
-  // our schema doesn't capture which ones would be ok or not. E.g.
-  // in practice, some type of ad or perhaps other custom elements require
-  // particular data attributes.
-  // http://www.w3.org/TR/html5/single-page.html#attr-data-*
-  // http://w3c.github.io/aria-in-html/
-  // However, to avoid parsing differences, we restrict the set of allowed
-  // characters in the document.
-  // If explicitAttrsOnly is true then do not allow data- attributes by
-  // default. They must be explicitly added to the tagSpec.
-  const dataAttrRe = /^data-[A-Za-z0-9-_:.]*$/;
-  if (!parsedTagSpec.getSpec().explicitAttrsOnly &&
-      (attrName.match(dataAttrRe) !== null)) {
-    return;
-  }
-
-  // At this point, it's an error either way, but we try to give a
-  // more specific error in the case of Mustache template characters.
-  if (attrName.indexOf('{{') !== -1) {
-    context.addError(
-        generated.ValidationError.Code.TEMPLATE_IN_ATTR_NAME,
-        context.getLineCol(),
-        /* params */
-        [attrName, getTagDescriptiveName(parsedTagSpec.getSpec())],
-        context.getRules().getTemplateSpecUrl(), result);
-  } else {
-    context.addError(
-        generated.ValidationError.Code.DISALLOWED_ATTR, context.getLineCol(),
-        /* params */
-        [attrName, getTagDescriptiveName(parsedTagSpec.getSpec())],
-        getTagSpecUrl(parsedTagSpec), result);
-  }
-}
-
-/**
- * Specific checks for attribute values descending from a template tag.
- * @param {!ParsedTagSpec} parsedTagSpec
- * @param {!Context} context
- * @param {!parserInterface.ParsedAttr} attr
- * @param {!generated.ValidationResult} result
- */
-function validateAttrValueBelowTemplateTag(
-    parsedTagSpec, context, attr, result) {
-  if (attrValueHasUnescapedTemplateSyntax(attr.value)) {
-    const spec = parsedTagSpec.getSpec();
-    context.addError(
-        generated.ValidationError.Code.UNESCAPED_TEMPLATE_IN_ATTR_VALUE,
-        context.getLineCol(),
-        /* params */[attr.name, getTagDescriptiveName(spec), attr.value],
-        context.getRules().getTemplateSpecUrl(), result);
-  } else if (attrValueHasPartialsTemplateSyntax(attr.value)) {
-    const spec = parsedTagSpec.getSpec();
-    context.addError(
-        generated.ValidationError.Code.TEMPLATE_PARTIAL_IN_ATTR_VALUE,
-        context.getLineCol(),
-        /* params */[attr.name, getTagDescriptiveName(spec), attr.value],
-        context.getRules().getTemplateSpecUrl(), result);
-  }
-}
-
-/**
- * Determines the name of the attribute where you find the name of this sort
- * of extension.  Typically, this will return 'custom-element'.
- *
- * @param {!generated.ExtensionSpec} extensionSpec
- * @return {string}
- */
-function getExtensionNameAttribute(extensionSpec) {
-  switch (extensionSpec.extensionType) {
-    case generated.ExtensionSpec.ExtensionType.CUSTOM_TEMPLATE:
-      return 'custom-template';
-    case generated.ExtensionSpec.ExtensionType.HOST_SERVICE:
-      return 'host-service';
-    default:
-      return 'custom-element';
-  }
-}
-
-/**
- * Validates whether an encountered attribute is validated by an
- * generated.ExtensionSpec. ExtensionSpec's validate the 'custom-element',
- * 'custom-template', and 'host-service' attributes. If an error is found, it
- * is added to the |result|. The return value indicates whether or not the
- * provided attribute is explained by this validation function.
- * @param {!generated.TagSpec} tagSpec
- * @param {!parserInterface.ParsedAttr} attr
- * @return {boolean}
- */
-function validateAttrInExtension(tagSpec, attr) {
-  asserts.assert(tagSpec.extensionSpec !== null);
-
-  const {extensionSpec} = tagSpec;
-  // TagSpecs with extensions will only be evaluated if their dispatch_key
-  // matches, which is based on this
-  // custom-element/custom-template/host-service field attribute value. The
-  // dispatch key matching is case-insensitive for faster lookups, so it still
-  // possible for the attribute value to not match if it contains upper-case
-  // letters.
-  if (extensionSpec !== null &&
-      getExtensionNameAttribute(extensionSpec) === attr.name) {
-    if (extensionSpec.name !== attr.value) {
-      asserts.assert(extensionSpec.name === attr.value.toLowerCase());
-      return false;
-    }
-    return true;
-  }
-  return false;
-}
-
-/**
- * Validates that the reserved `i-amphtml-` prefix is not used in a class
- * token.
- * @param {!parserInterface.ParsedAttr} attr
- * @param {!generated.TagSpec} tagSpec
- * @param {!Context} context
- * @param {!generated.ValidationResult} result
- */
-function validateClassAttr(attr, tagSpec, context, result) {
-  const re = /(^|[\t\n\f\r ])i-amphtml-/;
-  if (re.test(attr.value)) {
-    context.addError(
-        generated.ValidationError.Code.INVALID_ATTR_VALUE, context.getLineCol(),
-        /* params */[attr.name, getTagDescriptiveName(tagSpec), attr.value],
-        'https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/#disallowed-styles',
-        result);
-  }
-}
-
-/**
- * Validates the 'src' attribute for AMP JavaScript (Runtime and Extensions)
- * script tags. This validates:
- *  - the script is using an AMP domain
- *  - the script path is valid (for extensions only, runtime uses attrSpec)
- *  - that the same script release version is used for all script sources
- * @param {!parserInterface.ParsedHtmlTag} tag
- * @param {string} attrValue
- * @param {!generated.TagSpec} tagSpec
- * @param {!Context} context
- * @param {!generated.ValidationResult} result
- */
-function validateAmpScriptSrcAttr(tag, attrValue, tagSpec, context, result) {
-  if (!tag.isAmpDomain()) {
-    context.addError(
-        generated.ValidationError.Code.DISALLOWED_AMP_DOMAIN,
-        context.getLineCol(), /* params */[], /* spec_url*/ '', result);
-  }
-
-  if (tag.isExtensionScript() && tagSpec.extensionSpec !== null) {
-    const {extensionSpec} = tagSpec;
-    const extensionName = tag.getExtensionName();
-    const extensionVersion = tag.getExtensionVersion();
-
-    // If the path is invalid, then do not evaluate further.
-    if (!tag.hasValidAmpScriptPath()) {
-      // If path is not empty use invalid path error, otherwise use the invalid
-      // attribute value error. This is to avoid errors saying "has a path ''".
-      if (tag.getAmpScriptPath().length > 0) {
-        context.addError(
-            generated.ValidationError.Code.INVALID_EXTENSION_PATH,
-            context.getLineCol(),
-            /* params */[extensionSpec.name, tag.getAmpScriptPath()],
-            getTagSpecUrl(tagSpec), result);
-      } else {
-        context.addError(
-            generated.ValidationError.Code.INVALID_ATTR_VALUE,
-            context.getLineCol(),
-            /* params */['src', getTagDescriptiveName(tagSpec), attrValue],
-            getTagSpecUrl(tagSpec), result);
-      }
-      return;
-    }
-
-    if (extensionName === extensionSpec.name) {
-      // Validate deprecated version.
-      if (extensionSpec.deprecatedVersion.indexOf(extensionVersion) !== -1) {
-        context.addWarning(
-            generated.ValidationError.Code.WARNING_EXTENSION_DEPRECATED_VERSION,
-            context.getLineCol(),
-            /* params */[extensionSpec.name, extensionVersion],
-            getTagSpecUrl(tagSpec), result);
-      }
-      // Validate version.
-      if (extensionSpec.version.indexOf(extensionVersion) === -1) {
-        context.addError(
-            generated.ValidationError.Code.INVALID_EXTENSION_VERSION,
-            context.getLineCol(),
-            /* params */[extensionSpec.name, extensionVersion],
-            getTagSpecUrl(tagSpec), result);
-      }
-    } else {
-      // Extension name does not match extension spec name.
-      context.addError(
-          generated.ValidationError.Code.INVALID_ATTR_VALUE,
-          context.getLineCol(),
-          /* params */['src', getTagDescriptiveName(tagSpec), attrValue],
-          getTagSpecUrl(tagSpec), result);
-    }
-  }
-
-  // Only evaluate the script tag's release version if the first script tag's
-  // release version is not UNKNOWN.
-  if (context.getScriptReleaseVersion() !==
-      parserInterface.ScriptReleaseVersion.UNKNOWN) {
-    const scriptReleaseVersion = tag.getScriptReleaseVersion();
-    if (context.getScriptReleaseVersion() != scriptReleaseVersion) {
-      const specName = tagSpec.extensionSpec !== null ?
-          tagSpec.extensionSpec.name :
-          tagSpec.specName;
-
-      switch (context.getScriptReleaseVersion()) {
-        case parserInterface.ScriptReleaseVersion.LTS:
-          context.addError(
-              generated.ValidationError.Code.INCORRECT_SCRIPT_RELEASE_VERSION,
-              context.getLineCol(), /*params=*/
-              [
-                specName, scriptReleaseVersion,
-                context.getScriptReleaseVersion()
-              ],
-              'https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml#required-markup',
-              result);
-          break;
-        case parserInterface.ScriptReleaseVersion.MODULE_NOMODULE:
-          context.addError(
-              generated.ValidationError.Code.INCORRECT_SCRIPT_RELEASE_VERSION,
-              context.getLineCol(), /*params=*/
-              [
-                specName, scriptReleaseVersion,
-                context.getScriptReleaseVersion()
-              ],
-              'https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml#required-markup',
-              result);
-          break;
-        case parserInterface.ScriptReleaseVersion.MODULE_NOMODULE_LTS:
-          context.addError(
-              generated.ValidationError.Code.INCORRECT_SCRIPT_RELEASE_VERSION,
-              context.getLineCol(), /*params=*/
-              [
-                specName, scriptReleaseVersion,
-                context.getScriptReleaseVersion()
-              ],
-              'https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml#required-markup',
-              result);
-          break;
-        case parserInterface.ScriptReleaseVersion.STANDARD:
-          context.addError(
-              generated.ValidationError.Code.INCORRECT_SCRIPT_RELEASE_VERSION,
-              context.getLineCol(), /*params=*/
-              [
-                specName, scriptReleaseVersion,
-                context.getScriptReleaseVersion()
-              ],
-              'https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml#required-markup',
-              result);
-          break;
-        default:
-          break;
-      }
-    }
-  }
-}
-
-/**
- * Helper method for ValidateAttributes.
- * @param {!ParsedAttrSpec} parsedAttrSpec
- * @param {!Context} context
- * @param {!generated.TagSpec} tagSpec
- * @param {string} attrName
- * @param {string} attrValue
- * @param {!ValidateTagResult} result
- */
-function validateAttrCss(
-    parsedAttrSpec, context, tagSpec, attrName, attrValue, result) {
-  /** @type {number} */
-  const attrByteLen = htmlparser.byteLength(attrValue);
-  // Track the number of CSS bytes. If this tagspec is selected as the best
-  // match, this count will be added to the overall document inline style byte
-  // count for determining if that byte count has been exceeded.
-  /** @type {number} */
-  result.inlineStyleCssBytes = attrByteLen;
-
-  /** @type {!Array<!tokenize_css.ErrorToken>} */
-  const cssErrors = [];
-  // The line/col we are passing in here is not the actual start point in the
-  // text for the attribute string. It's the start point for the tag. This
-  // means that any line/col values for tokens are also similarly offset
-  // incorrectly. For error messages, this means we just use the line/col of
-  // the tag instead of the token so as to minimize confusion. This could be
-  // improved further.
-  // TODO(https://github.com/ampproject/amphtml/issues/27507): Compute
-  // attribute offsets for use in CSS error messages.
-  /** @type {!Array<!tokenize_css.Token>} */
-  const tokenList = tokenize_css.tokenize(
-      attrValue, context.getLineCol().getLine(), context.getLineCol().getCol(),
-      cssErrors);
-
-  /** @type {!Array<!parse_css.Declaration>} */
-  const declarations = parse_css.parseInlineStyle(tokenList, cssErrors);
-
-  for (const errorToken of cssErrors) {
-    // Override the first parameter with the name of this style tag.
-    const {params} = errorToken;
-    // Override the first parameter with the name of this style tag.
-    params[0] = getTagDescriptiveName(tagSpec);
-    context.addError(
-        errorToken.code, context.getLineCol(), params, /* url */ '',
-        result.validationResult);
-  }
-
-  // If there were errors parsing, exit from validating further.
-  if (cssErrors.length > 0) {
-    return;
-  }
-
-  /** @type {?ParsedDocCssSpec} */
-  const maybeDocCssSpec = context.matchingDocCssSpec();
-  if (maybeDocCssSpec !== null) {
-    // Determine if we've exceeded the maximum bytes per inline style
-    // requirements.
-    if (maybeDocCssSpec.spec().maxBytesPerInlineStyle >= 0 &&
-        attrByteLen > maybeDocCssSpec.spec().maxBytesPerInlineStyle) {
-      if (maybeDocCssSpec.spec().maxBytesIsWarning) {
-        context.addWarning(
-            generated.ValidationError.Code.INLINE_STYLE_TOO_LONG,
-            context.getLineCol(), /* params */
-            [
-              getTagDescriptiveName(tagSpec), attrByteLen.toString(),
-              maybeDocCssSpec.spec().maxBytesPerInlineStyle.toString()
-            ],
-            maybeDocCssSpec.spec().maxBytesSpecUrl, result.validationResult);
-      } else {
-        context.addError(
-            generated.ValidationError.Code.INLINE_STYLE_TOO_LONG,
-            context.getLineCol(), /* params */
-            [
-              getTagDescriptiveName(tagSpec), attrByteLen.toString(),
-              maybeDocCssSpec.spec().maxBytesPerInlineStyle.toString()
-            ],
-            maybeDocCssSpec.spec().maxBytesSpecUrl, result.validationResult);
-      }
-    }
-
-    // Loop over the declarations found in the document, verify that they are
-    // in the allowed list for this DocCssSpec, and have allowed values if
-    // relevant.
-    for (const declaration of declarations) {
-      const firstIdent = declaration.firstIdent();
-      // Validate declarations only when they are not all allowed.
-      if (!maybeDocCssSpec.spec().allowAllDeclarationInStyle) {
-        // Allowed declarations vary by context. SVG has its own set of CSS
-        // declarations not supported generally in HTML.
-        const cssDeclaration =
-            parsedAttrSpec.getSpec().valueDocSvgCss === true ?
-            maybeDocCssSpec.cssDeclarationSvgByName(declaration.name) :
-            maybeDocCssSpec.cssDeclarationByName(declaration.name);
-        // If there is no matching declaration in the rules, then this
-        // declaration is not allowed.
-        if (cssDeclaration === null) {
-          context.addError(
-              generated.ValidationError.Code.DISALLOWED_PROPERTY_IN_ATTR_VALUE,
-              context.getLineCol(), /* params */
-              [declaration.name, attrName, getTagDescriptiveName(tagSpec)],
-              context.getRules().getStylesSpecUrl(), result.validationResult);
-          // Don't emit additional errors for this declaration.
-          continue;
-        } else if (cssDeclaration.valueCasei.length > 0) {
-          let hasValidValue = false;
-          for (const value of cssDeclaration.valueCasei) {
-            if (firstIdent.toLowerCase() == value) {
-              hasValidValue = true;
-              break;
-            }
-          }
-          if (!hasValidValue) {
-            // Declaration value not allowed.
-            context.addError(
-                generated.ValidationError.Code
-                    .CSS_SYNTAX_DISALLOWED_PROPERTY_VALUE,
-                context.getLineCol(), /* params */
-                [getTagDescriptiveName(tagSpec), declaration.name, firstIdent],
-                context.getRules().getStylesSpecUrl(), result.validationResult);
-          }
-        } else if (cssDeclaration.valueRegexCasei != null) {
-          const valueRegex = context.getRules().getFullMatchCaseiRegex(
-              /** @type {number} */ (cssDeclaration.valueRegexCasei));
-          if (!valueRegex.test(firstIdent)) {
-            context.addError(
-                generated.ValidationError.Code
-                    .CSS_SYNTAX_DISALLOWED_PROPERTY_VALUE,
-                context.getLineCol(), /* params */
-                [getTagDescriptiveName(tagSpec), declaration.name, firstIdent],
-                context.getRules().getStylesSpecUrl(), result.validationResult);
-          }
-        }
-      }
-      if (declaration.name.indexOf('i-amphtml-') > -1) {
-        context.addError(
-            generated.ValidationError.Code.DISALLOWED_PROPERTY_IN_ATTR_VALUE,
-            context.getLineCol(), /* params */
-            [declaration.name, attrName, getTagDescriptiveName(tagSpec)],
-            context.getRules().getStylesSpecUrl(), result.validationResult);
-        // Don't emit additional errors for this declaration.
-        continue;
-      }
-      if (!maybeDocCssSpec.spec().allowImportant) {
-        if (declaration.important)
-          context.addError(
-              generated.ValidationError.Code.CSS_SYNTAX_DISALLOWED_IMPORTANT,
-              context.getLineCol(), /* params */[],
-              context.getRules().getStylesSpecUrl(), result.validationResult);
-      }
-      /** @type {!Array<!tokenize_css.ErrorToken>} */
-      let urlErrors = [];
-      /** @type {!Array<!parse_css.ParsedCssUrl>} */
-      let parsedUrls = [];
-      parse_css.extractUrlsFromDeclaration(declaration, parsedUrls, urlErrors);
-      for (const errorToken of urlErrors) {
-        // Override the first parameter with the name of the tag.
-        /** @type {!Array<string>} */
-        let params = errorToken.params;
-        params[0] = getTagDescriptiveName(tagSpec);
-        context.addError(
-            errorToken.code, context.getLineCol(), params, /* spec_url*/ '',
-            result.validationResult);
-      }
-      if (urlErrors.length > 0) continue;
-      for (const url of parsedUrls) {
-        // Validate that the URL itself matches the spec.
-        // Only image specs apply to inline styles. Fonts are only defined in
-        // @font-face rules which we require a full stylesheet to define.
-        if (maybeDocCssSpec.spec().imageUrlSpec !== null) {
-          const adapter = new UrlErrorInStylesheetAdapter(
-              context.getLineCol().getLine(), context.getLineCol().getCol());
-          validateUrlAndProtocol(
-              maybeDocCssSpec.imageUrlSpec(), adapter, context, url.utf8Url,
-              tagSpec, result.validationResult);
-        }
-        // Subtract off URL lengths from doc-level inline style bytes, if
-        // specified by the DocCssSpec.
-        if (!maybeDocCssSpec.spec().urlBytesIncluded && !isDataUrl(url.utf8Url))
-          result.inlineStyleCssBytes -= htmlparser.byteLength(url.utf8Url);
-      }
-    }
-  }
-}
-
-/**
- * Helper method for ValidateAttributes.
- * @param {!ParsedAttrSpec} parsedAttrSpec
- * @param {!Context} context
- * @param {string} tagSpecName
- * @param {string} attrName
- * @param {string} attrValue
- * @param {!generated.ValidationResult} validationResult
- */
-function validateAttrDeclaration(
-    parsedAttrSpec, context, tagSpecName, attrName, attrValue,
-    validationResult) {
-  /** @type {!Array<!tokenize_css.ErrorToken>} */
-  const cssErrors = [];
-  // The line/col we are passing in here is not the actual start point in the
-  // text for the attribute string. It's the start point for the tag. This
-  // means that any line/col values for tokens are also similarly offset
-  // incorrectly. For error messages, this means we just use the line/col of
-  // the tag instead of the token so as to minimize confusion. This could be
-  // improved further.
-  // TODO(https://github.com/ampproject/amphtml/issues/27507): Compute
-  // attribute offsets for use in CSS error messages.
-  /** @type {!Array<!tokenize_css.Token>} */
-  const tokenList = tokenize_css.tokenize(
-      attrValue, context.getLineCol().getLine(), context.getLineCol().getCol(),
-      cssErrors);
-
-  /** @type {!Array<!parse_css.Declaration>} */
-  const declarations = parse_css.parseInlineStyle(tokenList, cssErrors);
-
-  for (const errorToken of cssErrors) {
-    // Override the first parameter with the name of this style tag.
-    const {params} = errorToken;
-    // Override the first parameter with the name of this style tag.
-    params[0] = tagSpecName;
-    context.addError(
-        errorToken.code, context.getLineCol(), params, /* url */ '',
-        validationResult);
-  }
-
-  // If there were errors parsing, exit from validating further.
-  if (cssErrors.length > 0) {
-    return;
-  }
-
-  const cssDeclarationByName = parsedAttrSpec.getCssDeclarationByName();
-
-  for (const declaration of declarations) {
-    const firstIdent = declaration.firstIdent();
-    const declarationName =
-        parse_css.stripVendorPrefix(declaration.name.toLowerCase());
-    if (!(declarationName in cssDeclarationByName)) {
-      // Declaration not allowed.
-      context.addError(
-          generated.ValidationError.Code.DISALLOWED_PROPERTY_IN_ATTR_VALUE,
-          context.getLineCol(),
-          /* params */[declaration.name, attrName, tagSpecName],
-          context.getRules().getStylesSpecUrl(), validationResult);
-    } else {
-      const cssDeclaration = cssDeclarationByName[declarationName];
-      if (cssDeclaration.valueCasei.length > 0) {
-        let has_valid_value = false;
-        for (const value of cssDeclaration.valueCasei) {
-          if (firstIdent.toLowerCase() === value) {
-            has_valid_value = true;
-            break;
-          }
-        }
-        if (!has_valid_value) {
-          // Declaration value not allowed.
-          context.addError(
-              generated.ValidationError.Code
-                  .CSS_SYNTAX_DISALLOWED_PROPERTY_VALUE,
-              context.getLineCol(),
-              /* params */[tagSpecName, declaration.name, firstIdent],
-              context.getRules().getStylesSpecUrl(), validationResult);
-        }
-      } else if (cssDeclaration.valueRegexCasei != null) {
-        const valueRegex = context.getRules().getFullMatchCaseiRegex(
-            /** @type {number} */ (cssDeclaration.valueRegexCasei));
-        if (!valueRegex.test(firstIdent)) {
-          context.addError(
-              generated.ValidationError.Code
-                  .CSS_SYNTAX_DISALLOWED_PROPERTY_VALUE,
-              context.getLineCol(), /* params */
-              /* params */[tagSpecName, declaration.name, firstIdent],
-              context.getRules().getStylesSpecUrl(), validationResult);
-        }
-      }
-    }
-  }
-}
-
-/**
- * Returns true if errors reported on this tag should be suppressed, due to
- * data-ampdevmode annotations.
- * @param {!parserInterface.ParsedHtmlTag} encounteredTag
- * @param {!Context} context
- * @return {boolean}
- */
-function ShouldSuppressDevModeErrors(encounteredTag, context) {
-  if (!context.isDevMode()) return false;
-  // Cannot suppress errors on HTML tag. The "data-ampdevmode" here is a
-  // type identifier. Suppressing errors here would suppress all errors since
-  // HTML is the root of the document.
-  if (encounteredTag.upperName() === 'HTML') return false;
-  for (const attr of encounteredTag.attrs()) {
-    if (attr.name === 'data-ampdevmode') return true;
-  }
-  return context.getTagStack().isDevMode();
-}
-
-/**
- * Validates whether the attributes set on |encountered_tag| conform to this
- * tag specification. All mandatory attributes must appear. Only attributes
- * explicitly mentioned by this tag spec may appear.
- * Sets result->validation_result.status to FAIL if unsuccessful.
- * @param {!ParsedTagSpec} parsedTagSpec
- * @param {?ParsedTagSpec} bestMatchReferencePoint
- * @param {!Context} context
- * @param {!parserInterface.ParsedHtmlTag} encounteredTag
- * @param {!ValidateTagResult} result
- */
-function validateAttributes(
-    parsedTagSpec, bestMatchReferencePoint, context, encounteredTag, result) {
-  const spec = parsedTagSpec.getSpec();
-  if (spec.ampLayout !== null) {
-    validateLayout(
-        parsedTagSpec, context, encounteredTag, result.validationResult);
-  }
-  // For extension TagSpecs, we track if we've validated a src attribute.
-  // We must have done so for the extension to be valid.
-  let seenExtensionSrcAttr = false;
-  const hasTemplateAncestor = context.getTagStack().hasAncestor('TEMPLATE');
-  const isHtmlTag = encounteredTag.upperName() === 'HTML';
-  /** @type {!Array<boolean>} */
-  const mandatoryAttrsSeen = [];  // This is a set of attr ids.
-  /** @type {!Array<number>} */
-  const mandatoryOneofsSeen = [];  // This is small list of interned strings.
-  /** @type {!Array<number>} */
-  const mandatoryAnyofsSeen = [];  // This is small list of interned strings.
-  /** @type {!Array<!generated.AttrSpec>} */
-  const triggersToCheck = [];
-  /**
-   * If a tag has implicit attributes, we then add these attributes as
-   * validated. E.g. tag 'a' has implicit attributes 'role' and 'tabindex'.
-   * @type {!Array<?>}
-   */
-  const attrspecsValidated = [];
-  for (const implicit of parsedTagSpec.getImplicitAttrspecs()) {
-    attrspecsValidated[implicit] = 0;
-  }
-  // Our html parser delivers attributes as an array of alternating keys and
-  // values. We skip over this array 2 at a time to iterate over the keys.
-  const attrsByName = parsedTagSpec.getAttrsByName();
-  for (const attr of encounteredTag.attrs()) {
-    if (context.isTransformed()) {
-      // For transformed AMP, `i-amphtml-layout` is handled within
-      // validateSsrLayout, called by validateLayout above.
-      if (attr.name === 'i-amphtml-layout') {
-        continue;
-      }
-    } else if (attr.name === 'class') {
-      // For non-transformed AMP, `class` must not contain 'i-amphtml-'
-      // prefix.
-      validateClassAttr(attr, spec, context, result.validationResult);
-    }
-
-    // If 'src' attribute and an extension or runtime script, then validate the
-    // 'src' attribute by calling this method.
-    if (attr.name == 'src' &&
-        (encounteredTag.isExtensionScript() ||
-         encounteredTag.isAmpRuntimeScript())) {
-      validateAmpScriptSrcAttr(
-          encounteredTag, attr.value, spec, context, result.validationResult);
-      if (encounteredTag.isExtensionScript()) {
-        seenExtensionSrcAttr = true;
-        // Extension TagSpecs do not have an explicit 'src' attribute, while
-        // Runtime TagSpecs do. For Extension TagSpecs, continue.
-        continue;
-      }
-    }
-
-    if (!(attr.name in attrsByName)) {
-      // The HTML tag specifies type identifiers which are validated in
-      // validateHtmlTag(), so we skip them here.
-      if (isHtmlTag && context.getRules().isTypeIdentifier(attr.name)) {
-        continue;
-      }
-      // While validating a reference point, we skip attributes that
-      // we don't have a spec for. They will be validated when the
-      // TagSpec itself gets validated.
-      if (parsedTagSpec.isReferencePoint()) {
-        continue;
-      }
-      // On the other hand, if we did just validate a reference point for
-      // this tag, we check whether that reference point covers the attribute.
-      if (bestMatchReferencePoint !== null &&
-          bestMatchReferencePoint.hasAttrWithName(attr.name)) {
-        continue;
-      }
-
-      // If |spec| is an extension, then we ad-hoc validate 'custom-element',
-      // 'custom-template', and 'host-service' attributes by calling this
-      // method.
-      if (spec.extensionSpec !== null && validateAttrInExtension(spec, attr)) {
-        continue;
-      }
-      validateAttrNotFoundInSpec(
-          parsedTagSpec, context, attr.name, result.validationResult);
-      if (result.validationResult.status ===
-          generated.ValidationResult.Status.FAIL) {
-        continue;
-      }
-      if (hasTemplateAncestor) {
-        validateAttrValueBelowTemplateTag(
-            parsedTagSpec, context, attr, result.validationResult);
-        if (result.validationResult.status ===
-            generated.ValidationResult.Status.FAIL) {
-          continue;
-        }
-      }
-      continue;
-    }
-    if (hasTemplateAncestor) {
-      validateAttrValueBelowTemplateTag(
-          parsedTagSpec, context, attr, result.validationResult);
-      if (result.validationResult.status ===
-          generated.ValidationResult.Status.FAIL) {
-        continue;
-      }
-    }
-    const attrId = attrsByName[attr.name];
-    if (attrId < 0) {
-      attrspecsValidated[attrId] = 0;
-      continue;
-    }
-    const parsedAttrSpec =
-        context.getRules().getParsedAttrSpecs().getByAttrSpecId(attrId);
-    // If this attribute isn't used for these type identifiers, then error.
-    if (!parsedAttrSpec.isUsedForTypeIdentifiers(
-            context.getTypeIdentifiers())) {
-      context.addError(
-          generated.ValidationError.Code.DISALLOWED_ATTR, context.getLineCol(),
-          /* params */[attr.name, getTagDescriptiveName(spec)],
-          getTagSpecUrl(spec), result.validationResult);
-      continue;
-    }
-    const attrSpec = parsedAttrSpec.getSpec();
-    if (attrSpec.deprecation !== null) {
-      context.addWarning(
-          generated.ValidationError.Code.DEPRECATED_ATTR, context.getLineCol(),
-          /* params */
-          [attr.name, getTagDescriptiveName(spec), attrSpec.deprecation],
-          attrSpec.deprecationUrl, result.validationResult);
-      // Deprecation is only a warning, so we don't return.
-    }
-    if (attrSpec.requiresExtension.length > 0) {
-      validateAttrRequiredExtensions(
-          parsedAttrSpec, context, result.validationResult);
-    }
-    if (attrSpec.valueDocCss || attrSpec.valueDocSvgCss) {
-      validateAttrCss(
-          parsedAttrSpec, context, spec, attr.name, attr.value, result);
-    } else if (attrSpec.cssDeclaration.length > 0) {
-      validateAttrDeclaration(
-          parsedAttrSpec, context, getTagDescriptiveName(spec), attr.name,
-          attr.value, result.validationResult);
-    }
-    if (!hasTemplateAncestor || !attrValueHasTemplateSyntax(attr.value)) {
-      validateNonTemplateAttrValueAgainstSpec(
-          parsedAttrSpec, context, attr, spec, result.validationResult);
-      if (result.validationResult.status ===
-          generated.ValidationResult.Status.FAIL) {
-        continue;
-      }
-    }
-    if (attrSpec.disallowedValueRegex !== null) {
-      const regex = context.getRules().getPartialMatchCaseiRegex(
-          attrSpec.disallowedValueRegex);
-      if (regex.test(attr.value)) {
-        context.addError(
-            generated.ValidationError.Code.INVALID_ATTR_VALUE,
-            context.getLineCol(),
-            /* params */[attr.name, getTagDescriptiveName(spec), attr.value],
-            getTagSpecUrl(spec), result.validationResult);
-        continue;
-      }
-    }
-    if (attrSpec.mandatory) {
-      mandatoryAttrsSeen[parsedAttrSpec.getId()] = true;
-    }
-    if (parsedTagSpec.getSpec().tagName === 'BASE' && attr.name === 'href' &&
-        context.hasSeenUrl()) {
-      context.addError(
-          generated.ValidationError.Code.BASE_TAG_MUST_PRECEED_ALL_URLS,
-          context.getLineCol(),
-          /* params */[context.firstSeenUrlTagName()], getTagSpecUrl(spec),
-          result.validationResult);
-      continue;
-    }
-    const {mandatoryOneof} = attrSpec;
-    if (mandatoryOneof !== null) {
-      // The "at most 1" part of mandatory_oneof: mandatory_oneof
-      // wants exactly one of the alternatives, so here
-      // we check whether we already saw another alternative
-      if (mandatoryOneofsSeen.indexOf(mandatoryOneof) !== -1) {
-        context.addError(
-            generated.ValidationError.Code.MUTUALLY_EXCLUSIVE_ATTRS,
-            context.getLineCol(),
-            /* params */
-            [
-              getTagDescriptiveName(spec),
-              context.getRules().getInternedString(mandatoryOneof),
-            ],
-            getTagSpecUrl(spec), result.validationResult);
-        continue;
-      }
-      mandatoryOneofsSeen.push(mandatoryOneof);
-    }
-    if (attrSpec.requiresAncestor !== null) {
-      const markers = attrSpec.requiresAncestor.marker;
-      let matchesMarker = false;
-      for (const marker of markers) {
-        if (context.getTagStack().hasAncestorMarker(marker)) {
-          matchesMarker = true;
-          break;
-        }
-      }
-      if (!matchesMarker) {
-        context.addError(
-            generated.ValidationError.Code.DISALLOWED_ATTR,
-            context.getLineCol(),
-            /* params */
-            [
-              attr.name,
-              getTagDescriptiveName(spec),
-            ],
-            getTagSpecUrl(spec), result.validationResult);
-        continue;
-      }
-    }
-    const {mandatoryAnyof} = attrSpec;
-    if (mandatoryAnyof !== null) {
-      mandatoryAnyofsSeen.push(mandatoryAnyof);
-    }
-    attrspecsValidated[parsedAttrSpec.getId()] = 0;
-    // If the trigger does not have an if_value_regex, then proceed to add the
-    // spec. If it does have an if_value_regex, then test the regex to see
-    // if it should add the spec.
-    if (attrSpec.trigger === null) {
-      continue;
-    }
-    const {trigger} = attrSpec;
-    if (trigger.ifValueRegex === null ||
-        context.getRules()
-            .getFullMatchRegex(trigger.ifValueRegex)
-            .test(attr.value)) {
-      triggersToCheck.push(attrSpec);
-    }
-  }
-  if (result.validationResult.status ===
-      generated.ValidationResult.Status.FAIL) {
-    return;
-  }
-  // The "exactly 1" part of mandatory_oneof: If none of the
-  // alternatives were present, we report that an attribute is missing.
-  for (const mandatoryOneof of parsedTagSpec.getMandatoryOneofs()) {
-    if (mandatoryOneofsSeen.indexOf(mandatoryOneof) === -1) {
-      context.addError(
-          generated.ValidationError.Code.MANDATORY_ONEOF_ATTR_MISSING,
-          context.getLineCol(),
-          /* params */
-          [
-            getTagDescriptiveName(spec),
-            context.getRules().getInternedString(mandatoryOneof),
-          ],
-          getTagSpecUrl(spec), result.validationResult);
-    }
-  }
-  // The "at least 1" part of mandatory_anyof: If none of the
-  // alternatives were present, we report that an attribute is missing.
-  for (const mandatoryAnyof of parsedTagSpec.getMandatoryAnyofs()) {
-    if (mandatoryAnyofsSeen.indexOf(mandatoryAnyof) === -1) {
-      context.addError(
-          generated.ValidationError.Code.MANDATORY_ANYOF_ATTR_MISSING,
-          context.getLineCol(),
-          /* params */
-          [
-            getTagDescriptiveName(spec),
-            context.getRules().getInternedString(mandatoryAnyof),
-          ],
-          getTagSpecUrl(spec), result.validationResult);
-    }
-  }
-  for (const attrSpec of triggersToCheck) {
-    for (const alsoRequiresAttr of attrSpec.trigger.alsoRequiresAttr) {
-      if (!(alsoRequiresAttr in attrsByName)) {
-        continue;
-      }
-      const attrId = attrsByName[alsoRequiresAttr];
-      if (!attrspecsValidated.hasOwnProperty(attrId)) {
-        context.addError(
-            generated.ValidationError.Code.ATTR_REQUIRED_BUT_MISSING,
-            context.getLineCol(),
-            /* params */
-            [
-              context.getRules().getParsedAttrSpecs().getNameByAttrSpecId(
-                  attrId),
-              getTagDescriptiveName(spec),
-              attrSpec.name,
-            ],
-            getTagSpecUrl(spec), result.validationResult);
-      }
-    }
-  }
-  const missingAttrs = [];
-  for (const mandatory of parsedTagSpec.getMandatoryAttrIds()) {
-    if (!mandatoryAttrsSeen.hasOwnProperty(mandatory)) {
-      missingAttrs.push(
-          context.getRules().getParsedAttrSpecs().getNameByAttrSpecId(
-              mandatory));
-    }
-  }
-  // Sort this list for stability across implementations.
-  missingAttrs.sort();
-  for (const missingAttr of missingAttrs) {
-    context.addError(
-        generated.ValidationError.Code.MANDATORY_ATTR_MISSING,
-        context.getLineCol(),
-        /* params */[missingAttr, getTagDescriptiveName(spec)],
-        getTagSpecUrl(spec), result.validationResult);
-  }
-  // Extension specs mandate the 'src' attribute.
-  if (spec.extensionSpec !== null && !seenExtensionSrcAttr) {
-    context.addError(
-        generated.ValidationError.Code.MANDATORY_ATTR_MISSING,
-        context.getLineCol(),
-        /* params */['src', getTagDescriptiveName(spec)], getTagSpecUrl(spec),
-        result.validationResult);
-  }
-}
-
-/**
- * This small class (struct) stores the dispatch rules for all TagSpecs
- * with the same tag name.
- * @private
- */
-class TagSpecDispatch {
-  /** Creates an empty instance. */
-  constructor() {
-    /**
-     * TagSpec ids for a specific attribute dispatch key.
-     * @type {?Object<string, !Array<number>>}
-     * @private
-     */
-    this.tagSpecsByDispatch_ = null;
-    /**
-     * @type {!Array<number>}
-     * @private
-     */
-    this.allTagSpecs_ = [];
-  }
-
-  /**
-   * Registers a new dispatch key to match a tagspec id
-   * @param {string} dispatchKey
-   * @param {number} tagSpecId
-   * @public
-   */
-  registerDispatchKey(dispatchKey, tagSpecId) {
-    if (this.tagSpecsByDispatch_ === null) {
-      this.tagSpecsByDispatch_ = Object.create(null);
-    }
-    // Multiple TagSpecs may have the same dispatch key. These are added in
-    // the order in which they are found.
-    if (!(dispatchKey in this.tagSpecsByDispatch_)) {
-      this.tagSpecsByDispatch_[dispatchKey] = [tagSpecId];
-    } else {
-      this.tagSpecsByDispatch_[dispatchKey].push(tagSpecId);
-    }
-  }
-
-  /**
-   * Registers a new non dispatch key tagspec id.
-   * @param {number} tagSpecId
-   * @public
-   */
-  registerTagSpec(tagSpecId) {
-    this.allTagSpecs_.push(tagSpecId);
-  }
-
-  /**
-   * @return {boolean}
-   */
-  empty() {
-    return !this.hasDispatchKeys() && !this.hasTagSpecs();
-  }
-
-  /**
-   * @return {boolean}
-   */
-  hasDispatchKeys() {
-    return this.tagSpecsByDispatch_ !== null;
-  }
-
-  /**
-   * Looks up a dispatch key as previously registered, returning the
-   * corresponding tagSpecIds which are ordered by their specificity of match
-   * (e.g. Name/Value/Parent, then Name/Value, and then Name).
-   * @param {string} attrName
-   * @param {string} attrValue
-   * @param {string} mandatoryParent
-   * @return {!Array<number>}
-   */
-  matchingDispatchKey(attrName, attrValue, mandatoryParent) {
-    const tagSpecIds = [];
-    if (!this.hasDispatchKeys()) {
-      return tagSpecIds;
-    }
-
-    // Try first to find a key with the given parent.
-    const dispatchKey = makeDispatchKey(
-        generated.AttrSpec.DispatchKeyType.NAME_VALUE_PARENT_DISPATCH, attrName,
-        attrValue, mandatoryParent);
-    const match = this.tagSpecsByDispatch_[dispatchKey];
-    if (match !== undefined) {
-      tagSpecIds.push.apply(tagSpecIds, match);
-    }
-
-    // Try next to find a key that allows any parent.
-    const noParentKey = makeDispatchKey(
-        generated.AttrSpec.DispatchKeyType.NAME_VALUE_DISPATCH, attrName,
-        attrValue, '');
-    const noParentMatch = this.tagSpecsByDispatch_[noParentKey];
-    if (noParentMatch !== undefined) {
-      tagSpecIds.push.apply(tagSpecIds, noParentMatch);
-    }
-
-    // Try last to find a key that matches just this attribute name.
-    const noValueKey = makeDispatchKey(
-        generated.AttrSpec.DispatchKeyType.NAME_DISPATCH, attrName, '', '');
-    const noValueMatch = this.tagSpecsByDispatch_[noValueKey];
-    if (noValueMatch !== undefined) {
-      tagSpecIds.push.apply(tagSpecIds, noValueMatch);
-    }
-
-    // Special case for foo=foo. We consider this a match for a dispatch key
-    // of foo="" or just <tag foo>.
-    if (attrName === attrValue) {
-      tagSpecIds.push.apply(
-          tagSpecIds, this.matchingDispatchKey(attrName, '', mandatoryParent));
-    }
-
-    return tagSpecIds;
-  }
-
-  /**
-   * @return {boolean}
-   */
-  hasTagSpecs() {
-    return this.allTagSpecs_.length > 0;
-  }
-
-  /**
-   * @return {!Array<number>}
-   */
-  allTagSpecs() {
-    return this.allTagSpecs_;
-  }
-}
-
-/**
- *
- * Validates the provided |tagName| with respect to a single tag
- * specification.
- * @param {!ParsedTagSpec} parsedTagSpec
- * @param {?ParsedTagSpec} bestMatchReferencePoint
- * @param {!Context} context
- * @param {!parserInterface.ParsedHtmlTag} encounteredTag
- * @return {!ValidateTagResult}
- */
-function validateTagAgainstSpec(
-    parsedTagSpec, bestMatchReferencePoint, context, encounteredTag) {
-  /** @type {!ValidateTagResult} */
-  const attempt = {
-    validationResult: new generated.ValidationResult(),
-    bestMatchTagSpec: null,
-    inlineStyleCssBytes: 0,
-  };
-  attempt.validationResult.status = generated.ValidationResult.Status.PASS;
-  validateParentTag(parsedTagSpec, context, attempt.validationResult);
-  validateAncestorTags(parsedTagSpec, context, attempt.validationResult);
-  // Some parent tag specs also define allowed child tag names for the first
-  // child or all children. Validate that we aren't violating any of those
-  // rules either.
-  context.getTagStack().matchChildTagName(
-      encounteredTag, context, attempt.validationResult);
-  // Only validate attributes if we haven't yet found any errors. The
-  // Parent/Ancestor errors are informative without adding additional errors
-  // about attributes.
-  if (attempt.validationResult.status ===
-      generated.ValidationResult.Status.PASS) {
-    validateAttributes(
-        parsedTagSpec, bestMatchReferencePoint, context, encounteredTag,
-        attempt);
-  }
-  // Only validate that this is a valid descendant if it's not already
-  // invalid.
-  if (attempt.validationResult.status ===
-      generated.ValidationResult.Status.PASS) {
-    validateDescendantTags(
-        encounteredTag, parsedTagSpec, context, attempt.validationResult);
-  }
-  validateNoSiblingsAllowedTags(
-      parsedTagSpec, context, attempt.validationResult);
-  validateLastChildTags(context, attempt.validationResult);
-  // If we haven't reached the body element yet, we may not have seen the
-  // necessary extension. That case is handled elsewhere.
-  if (context.getTagStack().hasAncestor('BODY')) {
-    validateRequiredExtensions(
-        parsedTagSpec, context, attempt.validationResult);
-  }
-  // Only validate uniqueness if we haven't yet found any errors, as it's
-  // likely that this is not the correct tagspec if we have.
-  if (attempt.validationResult.status ===
-      generated.ValidationResult.Status.PASS) {
-    validateUniqueness(parsedTagSpec, context, attempt.validationResult);
-  }
-
-  // Append some warnings, only if no errors.
-  if (attempt.validationResult.status ===
-      generated.ValidationResult.Status.PASS) {
-    const tagSpec = parsedTagSpec.getSpec();
-    if (tagSpec.deprecation !== null) {
-      context.addWarning(
-          generated.ValidationError.Code.DEPRECATED_TAG, context.getLineCol(),
-          /* params */[getTagDescriptiveName(tagSpec), tagSpec.deprecation],
-          tagSpec.deprecationUrl, attempt.validationResult);
-    }
-    if (tagSpec.uniqueWarning &&
-        context.getTagspecsValidated().hasOwnProperty(parsedTagSpec.id())) {
-      context.addWarning(
-          generated.ValidationError.Code.DUPLICATE_UNIQUE_TAG_WARNING,
-          context.getLineCol(),
-          /* params */[getTagDescriptiveName(tagSpec)], getTagSpecUrl(tagSpec),
-          attempt.validationResult);
-    }
-  }
-  return attempt;
-}
-
-/**
- * Validates the provided |tagName| with respect to the tag
- * specifications in the validator's rules, resturning a ValidationResult
- * with errors for this tag and a PASS or FAIL status. At least one
- * specification must validate, or the result will have status FAIL.
- * Also passes back a reference to the tag spec which matched, if a match
- * was found.
- * Context is not mutated; instead, pending mutations are stored in the return
- * value, and are merged only if the tag spec is applied (pending some
- * reference point stuff).
- * @param {!parserInterface.ParsedHtmlTag} encounteredTag
- * @param {?ParsedTagSpec} bestMatchReferencePoint
- * @param {!Context} context
- * @return {ValidateTagResult}
- */
-function validateTag(encounteredTag, bestMatchReferencePoint, context) {
-  const tagSpecDispatch =
-      context.getRules().dispatchForTagName(encounteredTag.upperName());
-  // Filter TagSpecDispatch.AllTagSpecs by type identifiers.
-  const filteredTagSpecs = [];
-  if (tagSpecDispatch !== undefined) {
-    for (const tagSpecId of tagSpecDispatch.allTagSpecs()) {
-      const parsedTagSpec = context.getRules().getByTagSpecId(tagSpecId);
-      // Keep TagSpecs that are used for these type identifiers.
-      if (parsedTagSpec.isUsedForTypeIdentifiers(
-              context.getTypeIdentifiers())) {
-        filteredTagSpecs.push(parsedTagSpec);
-      }
-    }
-  }
-  // If there are no dispatch keys matching the tag name, ex: tag name is
-  // "foo", set a disallowed tag error.
-  if (tagSpecDispatch === undefined ||
-      (!tagSpecDispatch.hasDispatchKeys() && filteredTagSpecs.length === 0)) {
-    const result = new generated.ValidationResult();
-    let specUrl = '';
-    // Special case the spec_url for font tags to be slightly more useful.
-    if (encounteredTag.upperName() === 'FONT') {
-      specUrl = context.getRules().getStylesSpecUrl();
-    }
-    context.addError(
-        generated.ValidationError.Code.DISALLOWED_TAG, context.getLineCol(),
-        /* params */[encounteredTag.lowerName()], specUrl, result);
-    return {
-      validationResult: result,
-      bestMatchTagSpec: null,
-      inlineStyleCssBytes: 0
-    };
-  }
-
-  // At this point, we have dispatch keys, tagspecs, or both.
-  // The strategy is to look for a matching dispatch key first. A matching
-  // dispatch key does not guarantee that the dispatched tagspec will also
-  // match. If we find a matching dispatch key, we immediately return the
-  // result for that tagspec, success or fail.
-  // If we don't find a matching dispatch key, we must try all of the
-  // tagspecs to see if any of them match. If there are no tagspecs, we want
-  // to return a GENERAL_DISALLOWED_TAG error.
-  // calling HasDispatchKeys here is only an optimization to skip the loop
-  // over encountered attributes in the case where we have no dispatches.
-  if (tagSpecDispatch.hasDispatchKeys()) {
-    for (const attr of encounteredTag.attrs()) {
-      const tagSpecIds = tagSpecDispatch.matchingDispatchKey(
-          attr.name,
-          // Attribute values are case-sensitive by default, but we
-          // match dispatch keys in a case-insensitive manner and then
-          // validate using whatever the tagspec requests.
-          attr.value.toLowerCase(), context.getTagStack().parentTagName());
-      let bestAttempt = {
-        validationResult: new generated.ValidationResult(),
-        bestMatchTagSpec: null,
-        inlineStyleCssBytes: 0,
-      };
-      bestAttempt.validationResult.status =
-          generated.ValidationResult.Status.UNKNOWN;
-      for (const tagSpecId of tagSpecIds) {
-        const parsedTagSpec = context.getRules().getByTagSpecId(tagSpecId);
-        // Skip TagSpecs that aren't used for these type identifiers.
-        if (!parsedTagSpec.isUsedForTypeIdentifiers(
-                context.getTypeIdentifiers())) {
-          continue;
-        }
-        let attempt = validateTagAgainstSpec(
-            parsedTagSpec, bestMatchReferencePoint, context, encounteredTag);
-        if (context.getRules().betterValidationResultThan(
-                attempt.validationResult, bestAttempt.validationResult)) {
-          bestAttempt = attempt;
-          bestAttempt.bestMatchTagSpec = parsedTagSpec;
-          // Exit early on success
-          if (bestAttempt.validationResult.status ===
-              generated.ValidationResult.Status.PASS) {
-            return bestAttempt;
-          }
-        }
-      }
-      if (bestAttempt.validationResult.status !==
-          generated.ValidationResult.Status.UNKNOWN) {
-        return bestAttempt;
-      }
-    }
-  }
-  // None of the dispatch tagspecs matched and passed. If there are no
-  // non-dispatch tagspecs, consider this a 'generally' disallowed tag,
-  // which gives an error that reads "tag foo is disallowed except in
-  // specific forms".
-  if (filteredTagSpecs.length === 0) {
-    const result = new generated.ValidationResult();
-    if (encounteredTag.upperName() === 'SCRIPT') {
-      // Special case for <script> tags to produce better error messages.
-      context.addError(
-          generated.ValidationError.Code.DISALLOWED_SCRIPT_TAG,
-          context.getLineCol(),
-          /* params */[], context.getRules().getScriptSpecUrl(), result);
-    } else {
-      context.addError(
-          generated.ValidationError.Code.GENERAL_DISALLOWED_TAG,
-          context.getLineCol(),
-          /* params */[encounteredTag.lowerName()],
-          /* specUrl */ '', result);
-    }
-    return {
-      validationResult: result,
-      bestMatchTagSpec: null,
-      inlineStyleCssBytes: 0
-    };
-  }
-  // Validate against all remaining tagspecs. Each tagspec will produce a
-  // different set of errors. Even if none of them match, we only want to
-  // return errors from a single tagspec, not all of them. We keep around
-  // the 'best' attempt until we have found a matching TagSpec or have
-  // tried them all.
-  let bestAttempt = {
-    validationResult: new generated.ValidationResult(),
-    bestMatchTagSpec: null,
-    inlineStyleCssBytes: 0,
-  };
-  bestAttempt.validationResult.status =
-      generated.ValidationResult.Status.UNKNOWN;
-  for (const parsedTagSpec of filteredTagSpecs) {
-    const attempt = validateTagAgainstSpec(
-        parsedTagSpec, bestMatchReferencePoint, context, encounteredTag);
-    if (context.getRules().betterValidationResultThan(
-            attempt.validationResult, bestAttempt.validationResult)) {
-      bestAttempt = attempt;
-      bestAttempt.bestMatchTagSpec = parsedTagSpec;
-      // Exit early
-      if (bestAttempt.validationResult.status ===
-          generated.ValidationResult.Status.PASS) {
-        return bestAttempt;
-      }
-    }
-  }
-  return bestAttempt;
-}
-
-/**
- * This wrapper class provides access to the validation rules.
- * @private
- */
-class ParsedValidatorRules {
-  /**
-   * Creates a new instance and initializes it with
-   * generated.ValidatorRules.
-   * @param {string} htmlFormat
-   */
-  constructor(htmlFormat) {
-    /** @private @type {!generated.ValidatorRules} */
-    this.rules_ = createRules.createRules();
-
-    /**
-     * The HTML format
-     * @type {string}
-     * @private
-     */
-    this.htmlFormat_ = htmlFormat;
-
-    /**
-     * ParsedTagSpecs in id order.
-     * @type {!Array<!ParsedTagSpec>}
-     * @private
-     */
-    this.parsedTagSpecById_ = new Array(this.rules_.tags.length);
-    /**
-     * ParsedTagSpecs keyed by name
-     * @type {!Object<string, !TagSpecDispatch>}
-     * @private
-     */
-    this.tagSpecByTagName_ = Object.create(null);
-    /**
-     * Extension tagspec ids keyed by extension name
-     * @type {?Object<string, !Array<number>>}
-     * @private
-     */
-    this.extTagSpecIdsByExtName_ = Object.create(null);
-    /**
-     * Tag ids that are mandatory for a document to legally validate.
-     * @type {!Array<number>}
-     * @private
-     */
-    this.mandatoryTagSpecs_ = [];
-
-    /**
-     * A cache for regex istantiations.
-     * @type {!Array<!RegExp>}
-     * @private
-     */
-    this.fullMatchRegexes_ = [];
-    /**
-     * A cache for regex istantiations.
-     * @type {!Array<!RegExp>}
-     * @private
-     */
-    this.fullMatchCaseiRegexes_ = [];
-    /**
-     * A cache for regex istantiations.
-     * @type {!Array<!RegExp>}
-     * @private
-     */
-    this.partialMatchCaseiRegexes_ = [];
-
-    /**
-     * Sets type identifiers which are used to determine the set of validation
-     * rules to be applied.
-     * @type {!Object<string, number>}
-     * @private
-     */
-    this.typeIdentifiers_ = Object.create(null);
-    this.typeIdentifiers_['\u26a1'] = 0;
-    this.typeIdentifiers_['\u26a1\ufe0f'] = 0;
-    this.typeIdentifiers_['amp'] = 0;
-    this.typeIdentifiers_['\u26a14ads'] = 0;
-    this.typeIdentifiers_['\u26a1\ufe0f4ads'] = 0;
-    this.typeIdentifiers_['amp4ads'] = 0;
-    this.typeIdentifiers_['\u26a14email'] = 0;
-    this.typeIdentifiers_['\u26a1\ufe0f4email'] = 0;
-    this.typeIdentifiers_['amp4email'] = 0;
-    this.typeIdentifiers_['transformed'] = 0;
-    this.typeIdentifiers_['data-ampdevmode'] = 0;
-    this.typeIdentifiers_['data-css-strict'] = 0;
-
-    // For every tagspec that contains an ExtensionSpec, we add several
-    // TagSpec fields corresponding to the data found in the ExtensionSpec.
-    // The addition of module/nomodule extensions happens in
-    // validator_gen_js.py and are built as proper JavaScript classes. They
-    // will also be expanded by this method.
-    this.expandExtensionSpec_ = function() {
-      const numTags = this.rules_.tags.length;
-      for (let tagSpecId = 0; tagSpecId < numTags; ++tagSpecId) {
-        let tagSpec = this.rules_.tags[tagSpecId];
-        if (tagSpec.extensionSpec == null) continue;
-        let baseSpecName = tagSpec.extensionSpec.name;
-        if (tagSpec.extensionSpec.versionName !== null)
-          baseSpecName = tagSpec.extensionSpec.name + ' ' +
-              tagSpec.extensionSpec.versionName;
-        if (tagSpec.specName === null)
-          tagSpec.specName = baseSpecName + ' extension script';
-        if (tagSpec.descriptiveName === null)
-          tagSpec.descriptiveName = tagSpec.specName;
-        tagSpec.mandatoryParent = 'HEAD';
-        if (tagSpec.extensionSpec.deprecatedAllowDuplicates)
-          tagSpec.uniqueWarning = true;
-        else
-          tagSpec.unique = true;
-
-        if (VALIDATE_CSS) {
-          tagSpec.cdata = new generated.CdataSpec();
-          tagSpec.cdata.whitespaceOnly = true;
-        }
-      }
-    };
-    this.expandExtensionSpec_();
-
-    /**
-     * Returns true if `tagSpec` is usable for the HTML format these rules are
-     * built for.
-     * @type {function(!generated.TagSpec) : boolean}
-     * @private
-     */
-    this.isTagSpecCorrectHtmlFormat_ = function(tagSpec) {
-      const castedHtmlFormat =
-          /** @type {!generated.HtmlFormat.Code} */ (
-              /** @type {*} */ (htmlFormat));
-      return tagSpec.htmlFormat.indexOf(castedHtmlFormat) !== -1;
-    };
-
-    /**
-     * Returns true if `spec` is usable for the HTML format these rules are
-     * built for.
-     * @type {function(!generated.DocSpec) : boolean}
-     * @private
-     */
-    this.isDocSpecCorrectHtmlFormat_ = function(docSpec) {
-      const castedHtmlFormat =
-          /** @type {!generated.HtmlFormat.Code} */ (
-              /** @type {*} */ (htmlFormat));
-      return docSpec.htmlFormat == castedHtmlFormat;
-    };
-
-    /**
-     * Returns true if `spec` is usable for the HTML format these rules are
-     * built for.
-     * @type {function(!generated.DocCssSpec) : boolean}
-     * @private
-     */
-    this.isDocCssSpecCorrectHtmlFormat_ = function(docCssSpec) {
-      const castedHtmlFormat =
-          /** @type {!generated.HtmlFormat.Code} */ (
-              /** @type {*} */ (htmlFormat));
-      return docCssSpec.htmlFormat == castedHtmlFormat;
-    };
-
-    /**
-     * @type {!ParsedAttrSpecs}
-     * @private
-     */
-    this.parsedAttrSpecs_ = new ParsedAttrSpecs(this.rules_);
-
-    /**
-     * @type {!Array<!ParsedDocSpec>}
-     * @private
-     */
-    this.parsedDoc_ = [];
-    for (const docSpec of this.rules_.doc) {
-      this.parsedDoc_.push(new ParsedDocSpec(docSpec));
-    }
-
-    /**
-     * @type {!Array<!ParsedDocCssSpec>}
-     * @private
-     */
-    this.parsedCss_ = [];
-    for (const cssSpec of this.rules_.css) {
-      this.parsedCss_.push(
-          new ParsedDocCssSpec(cssSpec, this.rules_.declarationList));
-    }
-
-    /** @private @type {!Array<boolean>} */
-    this.tagSpecIdsToTrack_ = [];
-    const numTags = this.rules_.tags.length;
-    for (let tagSpecId = 0; tagSpecId < numTags; ++tagSpecId) {
-      const tag = this.rules_.tags[tagSpecId];
-      if (!this.isTagSpecCorrectHtmlFormat_(tag)) {
-        continue;
-      }
-      if (tag.alsoRequiresTagWarning.length > 0) {
-        this.tagSpecIdsToTrack_[tagSpecId] = true;
-      }
-      for (const otherTag of tag.alsoRequiresTagWarning) {
-        this.tagSpecIdsToTrack_[otherTag] = true;
-      }
-      const parsed = new ParsedTagSpec(
-          this.parsedAttrSpecs_,
-          shouldRecordTagspecValidated(tag, tagSpecId, this.tagSpecIdsToTrack_),
-          tag, tagSpecId);
-      this.parsedTagSpecById_[tagSpecId] = parsed;
-      if (tag.tagName !== '$REFERENCE_POINT') {
-        if (!(tag.tagName in this.tagSpecByTagName_)) {
-          this.tagSpecByTagName_[tag.tagName] = new TagSpecDispatch();
-        }
-        const tagnameDispatch = this.tagSpecByTagName_[tag.tagName];
-        if (tag.extensionSpec !== null) {
-          // This tag is an extension. Compute and register a dispatch key
-          // for it.
-          let dispatchKey;
-          dispatchKey = makeDispatchKey(
-              generated.AttrSpec.DispatchKeyType.NAME_VALUE_DISPATCH,
-              getExtensionNameAttribute(tag.extensionSpec),
-              /** @type {string} */ (tag.extensionSpec.name), '');
-          tagnameDispatch.registerDispatchKey(dispatchKey, tagSpecId);
-        } else {
-          const dispatchKeys = parsed.GetDispatchKeys();
-          if (dispatchKeys.length > 0) {
-            for (const dispatchKey of dispatchKeys)
-              tagnameDispatch.registerDispatchKey(dispatchKey, tagSpecId);
-          } else {
-            tagnameDispatch.registerTagSpec(tagSpecId);
-          }
-        }
-      }
-      if (tag.mandatory) {
-        this.mandatoryTagSpecs_.push(tagSpecId);
-      }
-      if (tag.extensionSpec !== null) {
-        if (!(tag.extensionSpec.name in this.extTagSpecIdsByExtName_)) {
-          this.extTagSpecIdsByExtName_[tag.extensionSpec.name] = [tagSpecId];
-        } else {
-          this.extTagSpecIdsByExtName_[tag.extensionSpec.name].push(tagSpecId);
-        }
-      }
-    }
-
-    /**
-     * @typedef {{ format: string, specificity: number }}
-     */
-    let ErrorCodeMetadata;
-
-    /**
-     * type {!Object<!generated.ValidationError.Code,
-     *               ErrorCodeMetadata>}
-     *  @private
-     */
-    this.errorCodes_ = Object.create(null);
-    for (let i = 0; i < this.rules_.errorFormats.length; ++i) {
-      const errorFormat = this.rules_.errorFormats[i];
-      asserts.assert(errorFormat !== null);
-      this.errorCodes_[errorFormat.code] = Object.create(null);
-      this.errorCodes_[errorFormat.code].format = errorFormat.format;
-    }
-    for (let i = 0; i < this.rules_.errorSpecificity.length; ++i) {
-      const errorSpecificity = this.rules_.errorSpecificity[i];
-      asserts.assert(errorSpecificity !== null);
-      this.errorCodes_[errorSpecificity.code].specificity =
-          errorSpecificity.specificity;
-    }
-  }
-
-  /**
-   * @param {number} internedStringId
-   * @return {!RegExp}
-   */
-  getFullMatchRegex(internedStringId) {
-    const idx = -1 - internedStringId;
-    if (this.fullMatchRegexes_.hasOwnProperty(idx)) {
-      return this.fullMatchRegexes_[idx];
-    }
-    const re = new RegExp('^(' + this.rules_.internedStrings[idx] + ')$');
-    this.fullMatchRegexes_[idx] = re;
-    return re;
-  }
-
-  /**
-   * @param {number} internedStringId
-   * @return {!RegExp}
-   */
-  getFullMatchCaseiRegex(internedStringId) {
-    const idx = -1 - internedStringId;
-    if (this.fullMatchCaseiRegexes_.hasOwnProperty(idx)) {
-      return this.fullMatchCaseiRegexes_[idx];
-    }
-    const re = new RegExp('^(' + this.rules_.internedStrings[idx] + ')$', 'i');
-    this.fullMatchCaseiRegexes_[idx] = re;
-    return re;
-  }
-
-  /**
-   * @param {number} internedStringId
-   * @return {!RegExp}
-   */
-  getPartialMatchCaseiRegex(internedStringId) {
-    const idx = -1 - internedStringId;
-    if (this.partialMatchCaseiRegexes_.hasOwnProperty(idx)) {
-      return this.partialMatchCaseiRegexes_[idx];
-    }
-    const re = new RegExp(this.rules_.internedStrings[idx], 'i');
-    this.partialMatchCaseiRegexes_[idx] = re;
-    return re;
-  }
-
-  /**
-   * @param {number} id
-   * @return {string}
-   */
-  getInternedString(id) {
-    return this.rules_.internedStrings[-1 - id];
-  }
-
-  /** @return {!generated.ValidatorRules} */
-  getRules() {
-    return this.rules_;
-  }
-
-  /**
-   * @param {!generated.ValidationError.Code} errorCode
-   * @return {string}
-   */
-  getFormatByCode(errorCode) {
-    return this.errorCodes_[errorCode].format;
-  }
-
-  /** @return {?string} */
-  getTemplateSpecUrl() {
-    return this.rules_.templateSpecUrl;
-  }
-
-  /** @return {?string} */
-  getStylesSpecUrl() {
-    return this.rules_.stylesSpecUrl;
-  }
-
-  /** @return {?string} */
-  getScriptSpecUrl() {
-    return this.rules_.scriptSpecUrl;
-  }
-
-  /**
-   * @param {string} maybeTypeIdentifier
-   * @return {boolean}
-   */
-  isTypeIdentifier(maybeTypeIdentifier) {
-    return maybeTypeIdentifier in this.typeIdentifiers_;
-  }
-
-  /**
-   * Validates type identifiers within a set of attributes, adding
-   * ValidationErrors as necessary, and sets type identifiers on
-   * ValidationResult.typeIdentifier.
-   * @param {!Array<!parserInterface.ParsedAttr>} attrs
-   * @param {!Array<string>} formatIdentifiers
-   * @param {!Context} context
-   * @param {!generated.ValidationResult} validationResult
-   */
-  validateTypeIdentifiers(attrs, formatIdentifiers, context, validationResult) {
-    let hasMandatoryTypeIdentifier = false;
-    let hasEmailTypeIdentifier = false;
-    let hasCssStrictTypeIdentifier = false;
-    // The named values should match up to `self` and AMP caches listed at
-    // https://cdn.ampproject.org/caches.json
-    const transformedValueRe = new RegExp(/^(bing|google|self);v=(\d+)$/);
-    for (const attr of attrs) {
-      // Verify this attribute is a type identifier. Other attributes are
-      // validated in validateAttributes.
-      if (this.isTypeIdentifier(attr.name)) {
-        // Verify this type identifier is allowed for this format.
-        if (formatIdentifiers.indexOf(attr.name) !== -1) {
-          // Only add the type identifier once per representation. That is,
-          // both "⚡" and "amp", which represent the same type identifier.
-          const typeIdentifier =
-              attr.name.replace('\u26a1\ufe0f', 'amp').replace('\u26a1', 'amp');
-          if (validationResult.typeIdentifier.indexOf(typeIdentifier) === -1) {
-            validationResult.typeIdentifier.push(typeIdentifier);
-            context.recordTypeIdentifier(typeIdentifier);
-          }
-          // The type identifier "transformed" is not considered mandatory
-          // unlike other type identifiers.
-          if (typeIdentifier !== 'transformed' &&
-              typeIdentifier !== 'data-ampdevmode' &&
-              typeIdentifier !== 'data-css-strict') {
-            hasMandatoryTypeIdentifier = true;
-          }
-          // The type identifier "transformed" has restrictions on it's value.
-          if ((typeIdentifier === 'transformed') && (attr.value !== '')) {
-            const reResult = transformedValueRe.exec(attr.value);
-            if (reResult !== null) {
-              validationResult.transformerVersion = parseInt(reResult[2], 10);
-            } else {
-              context.addError(
-                  generated.ValidationError.Code.INVALID_ATTR_VALUE,
-                  context.getLineCol(),
-                  /*params=*/[attr.name, 'html', attr.value],
-                  'https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml#required-markup',
-                  validationResult);
-            }
-          }
-          if (typeIdentifier === 'data-ampdevmode') {
-            // https://github.com/ampproject/amphtml/issues/20974
-            // We always emit an error for this type identifier, but it
-            // suppresses other errors later in the document.
-            context.addError(
-                generated.ValidationError.Code.DEV_MODE_ONLY,
-                context.getLineCol(),
-                /*params=*/[], /*url*/ '', validationResult);
-          }
-          if (typeIdentifier === 'amp4email') {
-            hasEmailTypeIdentifier = true;
-          }
-          if (typeIdentifier === 'data-css-strict') {
-            hasCssStrictTypeIdentifier = true;
-          }
-        } else {
-          context.addError(
-              generated.ValidationError.Code.DISALLOWED_ATTR,
-              context.getLineCol(),
-              /*params=*/[attr.name, 'html'],
-              'https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml#required-markup',
-              validationResult);
-        }
-      }
-    }
-    // If AMP Email format and not set to data-css-strict, then issue a
-    // warning that not having data-css-strict is deprecated. See b/179798751.
-    if (hasEmailTypeIdentifier && !hasCssStrictTypeIdentifier) {
-      context.addWarning(
-          generated.ValidationError.Code.AMP_EMAIL_MISSING_STRICT_CSS_ATTR,
-          context.getLineCol(), /*params=*/[],
-          'https://github.com/ampproject/amphtml/issues/32587',
-          validationResult);
-    }
-    if (!hasMandatoryTypeIdentifier) {
-      // Missing mandatory type identifier (any AMP variant but
-      // "transformed").
-      context.addError(
-          generated.ValidationError.Code.MANDATORY_ATTR_MISSING,
-          context.getLineCol(),
-          /*params=*/[formatIdentifiers[0], 'html'],
-          'https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml#required-markup',
-          validationResult);
-    }
-  }
-
-  /**
-   * Validates the HTML tag for type identifiers.
-   * @param {!parserInterface.ParsedHtmlTag} htmlTag
-   * @param {!Context} context
-   * @param {!generated.ValidationResult} validationResult
-   */
-  validateHtmlTag(htmlTag, context, validationResult) {
-    switch (this.htmlFormat_) {
-      case 'AMP':
-        this.validateTypeIdentifiers(
-            htmlTag.attrs(),
-            ['\u26a1', '\u26a1\ufe0f', 'amp', 'transformed', 'data-ampdevmode'],
-            context, validationResult);
-        break;
-      case 'AMP4ADS':
-        this.validateTypeIdentifiers(
-            htmlTag.attrs(),
-            ['\u26a14ads', '\u26a1\ufe0f4ads', 'amp4ads', 'data-ampdevmode'],
-            context, validationResult);
-        break;
-      case 'AMP4EMAIL':
-        this.validateTypeIdentifiers(
-            htmlTag.attrs(),
-            [
-              '\u26a14email', '\u26a1\ufe0f4email', 'amp4email',
-              'data-ampdevmode', 'data-css-strict'
-            ],
-            context, validationResult);
-        break;
-      default:
-        // fallthrough
-    }
-  }
-
-  /**
-   * @param {!generated.ValidationError.Code} error_code
-   * @return {number}
-   */
-  specificity(error_code) {
-    return this.errorCodes_[error_code].specificity;
-  }
-
-  /**
-   * A helper function which allows us to compare two candidate results
-   * in validateTag to report the results which have the most specific errors.
-   * @param {!Array<!generated.ValidationError>} errors
-   * @return {number} maximum value of specificity found in all errors.
-   */
-  maxSpecificity(errors) {
-    let max = 0;
-    for (const error of errors) {
-      asserts.assert(error.code !== null);
-      max = Math.max(this.specificity(error.code), max);
-    }
-    return max;
-  }
-
-  /**
-   * Returns true iff statusA is a better status than statusB
-   * @param {?generated.ValidationResult.Status} statusA
-   * @param {?generated.ValidationResult.Status} statusB
-   * @return {boolean}
-   * @private
-   */
-  betterValidationStatusThan_(statusA, statusB) {
-    // Equal, so not better than.
-    if (statusA === statusB) {
-      return false;
-    }
-
-    // PASS > FAIL > UNKNOWN
-    if (statusA === generated.ValidationResult.Status.PASS) {
-      return true;
-    }
-    if (statusB === generated.ValidationResult.Status.PASS) {
-      return false;
-    }
-    if (statusA === generated.ValidationResult.Status.FAIL) {
-      return true;
-    }
-    asserts.assert(statusA === generated.ValidationResult.Status.UNKNOWN);
-    return false;
-  }
-
-  /**
-   * Returns true iff the error codes in errorsB are a subset of the error
-   * codes in errorsA.
-   * @param {!Array<!generated.ValidationError>} errorsA
-   * @param {!Array<!generated.ValidationError>} errorsB
-   * @return {boolean}
-   * @private
-   */
-  isErrorSubset_(errorsA, errorsB) {
-    let codesA = {};
-    for (const error of errorsA) codesA[error.code] = 1;
-    let codesB = {};
-    for (const error of errorsB) {
-      codesB[error.code] = 1;
-      // If error is not in codesA, errorsB is not a subset of errorsA.
-      if (!codesA.hasOwnProperty(error.code)) {
-        return false;
-      }
-    }
-    // Every code in B is also in A. If they are the same, not a subset.
-    return Object.keys(codesA).length > Object.keys(codesB).length;
-  }
-
-  /**
-   * Returns true iff resultA is a better result than resultB.
-   * @param {!generated.ValidationResult} resultA
-   * @param {!generated.ValidationResult} resultB
-   * @return {boolean}
-   */
-  betterValidationResultThan(resultA, resultB) {
-    if (resultA.status !== resultB.status) {
-      return this.betterValidationStatusThan_(resultA.status, resultB.status);
-    }
-
-    // If one of the error sets by error.code is a subset of the other
-    // error set's error.codes, use the subset one. It's essentially saying,
-    // if you fix these errors that we both complain about, then you'd be
-    // passing for my tagspec, but not the other one, regardless of
-    // specificity.
-    if (this.isErrorSubset_(resultB.errors, resultA.errors)) {
-      return true;
-    }
-    if (this.isErrorSubset_(resultA.errors, resultB.errors)) {
-      return false;
-    }
-
-    // Prefer the most specific error found in either set.
-    if (this.maxSpecificity(resultA.errors) >
-        this.maxSpecificity(resultB.errors)) {
-      return true;
-    }
-    if (this.maxSpecificity(resultB.errors) >
-        this.maxSpecificity(resultA.errors)) {
-      return false;
-    }
-
-    // Prefer the attempt with the fewest errors if the most specific errors
-    // are the same.
-    if (resultA.errors.length < resultB.errors.length) {
-      return true;
-    }
-    if (resultB.errors.length < resultA.errors.length) {
-      return false;
-    }
-
-    // Equal, so not better than.
-    return false;
-  }
-
-  /**
-   * Emits errors for tags that are specified to be mandatory.
-   * @param {!Context} context
-   * @param {!generated.ValidationResult} validationResult
-   */
-  maybeEmitMandatoryTagValidationErrors(context, validationResult) {
-    for (const tagSpecId of this.mandatoryTagSpecs_) {
-      const parsedTagSpec = this.getByTagSpecId(tagSpecId);
-      // Skip TagSpecs that aren't used for these type identifiers.
-      if (!parsedTagSpec.isUsedForTypeIdentifiers(
-              context.getTypeIdentifiers())) {
-        continue;
-      }
-      if (!context.getTagspecsValidated().hasOwnProperty(tagSpecId)) {
-        const spec = parsedTagSpec.getSpec();
-        context.addError(
-            generated.ValidationError.Code.MANDATORY_TAG_MISSING,
-            context.getLineCol(),
-            /* params */[getTagDescriptiveName(spec)], getTagSpecUrl(spec),
-            validationResult);
-      }
-    }
-  }
-
-  /**
-   * Returns true if one of the alternative tagspec ids has been validated.
-   * @param {!Context} context
-   * @param {?string} extName
-   * @return {boolean}
-   */
-  hasValidatedAlternativeTagSpec(context, extName) {
-    if (extName === null) return false;
-    for (const alternativeTagSpecId of this.extTagSpecIdsByExtName_[extName]) {
-      if (context.getTagspecsValidated().hasOwnProperty(alternativeTagSpecId)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Emits errors for tags that specify that another tag is also required or
-   * a condition is required to be satisfied.
-   * Returns false iff context.Progress(result).complete.
-   * @param {!Context} context
-   * @param {!generated.ValidationResult} validationResult
-   */
-  maybeEmitRequiresOrExcludesValidationErrors(context, validationResult) {
-    /** @type {!Array<number>} */
-    const tagspecsValidated =
-        Object.keys(context.getTagspecsValidated()).map(Number);
-    googArray.sort(tagspecsValidated);
-    for (const tagSpecId of tagspecsValidated) {
-      const parsedTagSpec = this.getByTagSpecId(tagSpecId);
-      // Skip TagSpecs that aren't used for these type identifiers.
-      if (!parsedTagSpec.isUsedForTypeIdentifiers(
-              context.getTypeIdentifiers())) {
-        continue;
-      }
-      for (const condition of parsedTagSpec.requires()) {
-        if (!context.satisfiesCondition(condition)) {
-          context.addError(
-              generated.ValidationError.Code.TAG_REQUIRED_BY_MISSING,
-              context.getLineCol(),
-              /* params */
-              [
-                context.getRules().getInternedString(condition),
-                getTagDescriptiveName(parsedTagSpec.getSpec()),
-              ],
-              getTagSpecUrl(parsedTagSpec), validationResult);
-        }
-      }
-      for (const condition of parsedTagSpec.excludes()) {
-        if (context.satisfiesCondition(condition)) {
-          context.addError(
-              generated.ValidationError.Code.TAG_EXCLUDED_BY_TAG,
-              context.getLineCol(),
-              /* params */
-              [
-                getTagDescriptiveName(parsedTagSpec.getSpec()),
-                context.getRules().getInternedString(condition),
-              ],
-              getTagSpecUrl(parsedTagSpec), validationResult);
-        }
-      }
-      for (const tagspecId of parsedTagSpec.getAlsoRequiresTagWarning()) {
-        if (!context.getTagspecsValidated().hasOwnProperty(tagspecId)) {
-          const alsoRequiresTagspec = this.getByTagSpecId(tagspecId);
-          // If there is an alternative tagspec for extension script tagspecs
-          // that has been validated, then move on to the next
-          // alsoRequiresTagWarning.
-          if (alsoRequiresTagspec.getSpec().extensionSpec !== null &&
-              alsoRequiresTagspec.getSpec().specName.endsWith(
-                  'extension script') &&
-              this.hasValidatedAlternativeTagSpec(
-                  context, alsoRequiresTagspec.getSpec().extensionSpec.name)) {
-            continue;
-          }
-          context.addWarning(
-              generated.ValidationError.Code.WARNING_TAG_REQUIRED_BY_MISSING,
-              context.getLineCol(),
-              /* params */
-              [
-                getTagDescriptiveName(alsoRequiresTagspec.getSpec()),
-                getTagDescriptiveName(parsedTagSpec.getSpec()),
-              ],
-              getTagSpecUrl(parsedTagSpec), validationResult);
-        }
-      }
-    }
-
-    const extensionsCtx = context.getExtensions();
-    const unusedRequired = extensionsCtx.unusedExtensionsRequired();
-    for (const unusedExtensionName of unusedRequired) {
-      context.addError(
-          generated.ValidationError.Code.EXTENSION_UNUSED, context.getLineCol(),
-          /* params */[unusedExtensionName],
-          /* specUrl */ '', validationResult);
-    }
-  }
-
-  /**
-   * Emits errors for tags that are specified as mandatory alternatives.
-   * Returns false iff context.Progress(result).complete.
-   * @param {!Context} context
-   * @param {!generated.ValidationResult} validationResult
-   */
-  maybeEmitMandatoryAlternativesSatisfiedErrors(context, validationResult) {
-    const satisfied = context.getMandatoryAlternativesSatisfied();
-    /** @type {!Array<string>} */
-    const missing = [];
-    const specUrlsByMissing = Object.create(null);
-    for (const tagSpec of this.rules_.tags) {
-      if (tagSpec.mandatoryAlternatives === null ||
-          !this.isTagSpecCorrectHtmlFormat_(tagSpec)) {
-        continue;
-      }
-      const alternative = tagSpec.mandatoryAlternatives;
-      if (satisfied.indexOf(alternative) === -1) {
-        const alternativeName =
-            context.getRules().getInternedString(alternative);
-        missing.push(alternativeName);
-        specUrlsByMissing[alternativeName] = getTagSpecUrl(tagSpec);
-      }
-    }
-    sortAndUniquify(missing);
-    for (const tagMissing of missing) {
-      context.addError(
-          generated.ValidationError.Code.MANDATORY_TAG_MISSING,
-          context.getLineCol(),
-          /* params */[tagMissing],
-          /* specUrl */ specUrlsByMissing[tagMissing], validationResult);
-    }
-  }
-
-  /**
-   * Emits errors for doc size limitations across entire document.
-   * @param {!Context} context
-   * @param {!generated.ValidationResult} validationResult
-   */
-  maybeEmitDocSizeErrors(context, validationResult) {
-    const parsedDocSpec = context.matchingDocSpec();
-    if (parsedDocSpec !== null) {
-      const bytesUsed = context.getDocByteSize();
-      /** @type {!generated.DocSpec} */
-      const docSpec = parsedDocSpec.spec();
-      if (docSpec.maxBytes !== -2 && bytesUsed > docSpec.maxBytes) {
-        context.addError(
-            generated.ValidationError.Code.DOCUMENT_SIZE_LIMIT_EXCEEDED,
-            context.getLineCol(), /* params */
-            [docSpec.maxBytes.toString(), bytesUsed.toString()],
-            docSpec.maxBytesSpecUrl, validationResult);
-      }
-    }
-  }
-
-  /**
-   * Emits errors for css size limitations across entire document.
-   * @param {!Context} context
-   * @param {!generated.ValidationResult} validationResult
-   */
-  maybeEmitCssLengthSpecErrors(context, validationResult) {
-    const bytesUsed =
-        context.getInlineStyleByteSize() + context.getStyleTagByteSize();
-
-    const parsedCssSpec = context.matchingDocCssSpec();
-    if (parsedCssSpec !== null) {
-      /** @type {!generated.DocCssSpec} */
-      const cssSpec = parsedCssSpec.spec();
-      if (cssSpec.maxBytes !== -2 && bytesUsed > cssSpec.maxBytes) {
-        if (cssSpec.maxBytesIsWarning) {
-          context.addWarning(
-              generated.ValidationError.Code
-                  .STYLESHEET_AND_INLINE_STYLE_TOO_LONG,
-              context.getLineCol(), /* params */
-              [bytesUsed.toString(), cssSpec.maxBytes.toString()],
-              cssSpec.maxBytesSpecUrl, validationResult);
-        } else {
-          context.addError(
-              generated.ValidationError.Code
-                  .STYLESHEET_AND_INLINE_STYLE_TOO_LONG,
-              context.getLineCol(), /* params */
-              [bytesUsed.toString(), cssSpec.maxBytes.toString()],
-              cssSpec.maxBytesSpecUrl, validationResult);
-        }
-      }
-    }
-  }
-
-  /**
-   * Emits errors when there is a ValueSetRequirement with no matching
-   * ValueSetProvision in the document.
-   * @param {!Context} context
-   * @param {!generated.ValidationResult} validationResult
-   */
-  maybeEmitValueSetMismatchErrors(context, validationResult) {
-    const providedKeys = context.valueSetsProvided();
-    for (const [requiredKey, errors] of context.valueSetsRequired()) {
-      if (!providedKeys.has(/** @type {string} */ (requiredKey))) {
-        for (const error of errors)
-          context.addBuiltError(error, validationResult);
-      }
-    }
-  }
-
-  /**
-   * Emits any validation errors which require a global view
-   * (mandatory tags, tags required by other tags, mandatory alternatives).
-   * @param {!Context} context
-   * @param {!generated.ValidationResult} validationResult
-   */
-  maybeEmitGlobalTagValidationErrors(context, validationResult) {
-    this.maybeEmitMandatoryTagValidationErrors(context, validationResult);
-    this.maybeEmitRequiresOrExcludesValidationErrors(context, validationResult);
-    this.maybeEmitMandatoryAlternativesSatisfiedErrors(
-        context, validationResult);
-    this.maybeEmitDocSizeErrors(context, validationResult);
-    this.maybeEmitCssLengthSpecErrors(context, validationResult);
-    this.maybeEmitValueSetMismatchErrors(context, validationResult);
-  }
-
-  /**
-   * @param {number} id
-   * @return {!ParsedTagSpec}
-   */
-  getByTagSpecId(id) {
-    return this.parsedTagSpecById_[id];
-  }
-
-  /**
-   * @param {string} tagName
-   * @return {!TagSpecDispatch|undefined}
-   */
-  dispatchForTagName(tagName) {
-    return this.tagSpecByTagName_[tagName];
-  }
-
-  /**
-   * @return {!ParsedAttrSpecs}
-   */
-  getParsedAttrSpecs() {
-    return this.parsedAttrSpecs_;
-  }
-
-  /**
-   * @return {!Array<!generated.DescendantTagList>}
-   */
-  getDescendantTagLists() {
-    return this.rules_.descendantTagList;
-  }
-
-  /**
-   * @return {!Array<!ParsedDocSpec>}
-   */
-  getDoc() {
-    return this.parsedDoc_;
-  }
-
-  /**
-   * @return {!Array<!ParsedDocCssSpec>}
-   */
-  getCss() {
-    return this.parsedCss_;
-  }
-
-  /**
-   * Computes the name for a given reference point.
-   * Used in generating error strings.
-   * @param {!generated.ReferencePoint} referencePoint
-   * @return {string}
-   */
-  getReferencePointName(referencePoint) {
-    // tagSpecName here is actually a number, which was replaced in
-    // validator_gen_js.py from the name string, so this works.
-    const tagSpecId = /** @type {number} */ (referencePoint.tagSpecName);
-    const refPointSpec = this.getByTagSpecId(tagSpecId);
-    return getTagSpecName(refPointSpec.getSpec());
-  }
-}
-
-/** @type {!Object<string, !ParsedValidatorRules>} */
-const parsedValidatorRulesByFormat = Object.create(null);
-
-/**
- * @param {string} htmlFormat
- * @return {!ParsedValidatorRules}
- */
-function getParsedValidatorRules(htmlFormat) {
-  if (!(htmlFormat in parsedValidatorRulesByFormat)) {
-    const rules = new ParsedValidatorRules(htmlFormat);
-    parsedValidatorRulesByFormat[htmlFormat] = rules;
-    return rules;
-  }
-  return parsedValidatorRulesByFormat[htmlFormat];
-}
-
-/**
- * Validation Handler which accepts callbacks from HTML Parser
- */
-const ValidationHandler =
-    class extends parserInterface.HtmlSaxHandlerWithLocation {
-  /**
-   * Creates a new handler.
-   * @param {string} htmlFormat
-   */
-  constructor(htmlFormat) {
-    super();
-
-    this.validationResult_ = new generated.ValidationResult();
-    this.validationResult_.status = generated.ValidationResult.Status.UNKNOWN;
-    /**
-     * Rules from parsed JSON configuration.
-     * @type {!ParsedValidatorRules}
-     * @private
-     */
-    this.rules_ = getParsedValidatorRules(htmlFormat);
-    /**
-     * Validation Context.
-     * @type {!Context}
-     * @private
-     */
-    this.context_ = new Context(this.rules_);
-  }
-
-  /**
-   * @return {!generated.ValidationResult} Validation Result at the current
-   *     step.
-   */
-  Result() {
-    return this.validationResult_;
-  }
-
-  /**
-   * Callback before startDoc which gives us a document locator.
-   * @param {!parserInterface.DocLocator} locator
-   * @override
-   */
-  setDocLocator(locator) {
-    if (locator === null) {
-      asserts.fail('Null DocLocator set');
-    } else {
-      this.context_.setDocLocator(locator);
-    }
-  }
-
-  /**
-   * Callback for the start of a new HTML document.
-   * @override
-   */
-  startDoc() {
-    this.validationResult_ = new generated.ValidationResult();
-    this.validationResult_.status = generated.ValidationResult.Status.UNKNOWN;
-  }
-
-  /**
-   * Callback for the attributes from all the body tags encountered
-   * within the document.
-   * @override
-   */
-  effectiveBodyTag(attributes) {
-    const encounteredAttrs = this.context_.getEncounteredBodyAttrs();
-    // If we never recorded a body tag with attributes, it was manufactured.
-    // In which case we've already logged an error for that. Doing more here
-    // would be confusing.
-    if (encounteredAttrs === null) {
-      return;
-    }
-    // So now we compare the attributes from the tag that we encountered
-    // (htmlparser.HtmlParser sent us a startTag event for it earlier) with
-    // the attributes from the effective body tag that we're just receiving
-    // now, which contains all attributes on body tags within the doc. It's
-    // correct to think of this synthetic tag simply as a concatenation -
-    // there is in general no elimination of duplicate attributes or
-    // overriding behavior. Thus, if the second body tag has any
-    // attribute this will result in an error.
-    let differenceSeen = attributes.length !== encounteredAttrs.length;
-    if (!differenceSeen) {
-      for (let ii = 0; ii < attributes.length; ii++) {
-        if (attributes[ii] !== encounteredAttrs[ii]) {
-          differenceSeen = true;
-          break;
-        }
-      }
-    }
-    if (!differenceSeen) {
-      return;
-    }
-    this.context_.addError(
-        generated.ValidationError.Code.DUPLICATE_UNIQUE_TAG,
-        this.context_.getEncounteredBodyLineCol(),
-        /* params */['BODY'], /* url */ '', this.validationResult_);
-  }
-
-  /**
-   * Callback for the end of a new HTML document. Triggers validation of
-   * mandatory
-   * tag presence.
-   */
-  endDoc() {
-    this.rules_.maybeEmitGlobalTagValidationErrors(
-        this.context_, this.validationResult_);
-    if (this.validationResult_.status ===
-        generated.ValidationResult.Status.UNKNOWN) {
-      this.validationResult_.status = generated.ValidationResult.Status.PASS;
-    }
-    // As some errors can be inserted out of order, sort errors at the
-    // end based on their line/col numbers.
-    googArray.stableSort(this.validationResult_.errors, function(lhs, rhs) {
-      if (lhs.line != rhs.line) {
-        return lhs.line - rhs.line;
-      }
-      return lhs.col - rhs.col;
-    });
-  }
-
-  /**
-   * Callback for informing that the parser is manufacturing a <body> tag not
-   * actually found on the page. This will be followed by a startTag() with
-   * the actual body tag in question.
-   * @override
-   */
-  markManufacturedBody() {
-    this.context_.addError(
-        generated.ValidationError.Code.DISALLOWED_MANUFACTURED_BODY,
-        this.context_.getLineCol(),
-        /* params */[], /* url */ '', this.validationResult_);
-  }
-
-  /**
-   * While parsing the document HEAD, we may accumulate errors which depend
-   * on seeing later extension <script> tags.
-   */
-  emitMissingExtensionErrors() {
-    const extensionsCtx = this.context_.getExtensions();
-    for (const error of extensionsCtx.missingExtensionErrors()) {
-      this.context_.addBuiltError(error, this.validationResult_);
-    }
-  }
-
-  /**
-   * Currently, the Javascript HTML parser considers Doctype to be another
-   * HTML tag, which is not technically accurate. We have special handling for
-   * doctype in Javascript which applies to all AMP formats, as this is strict
-   * handling for all HTML in general. Specifically "attributes" are not
-   * allowed, even things like `data-foo`.
-   * @param {!parserInterface.ParsedHtmlTag} encounteredTag
-   * @param {!Context} context
-   * @param {!generated.ValidationResult} validationResult
-   */
-  validateDocType(encounteredTag, context, validationResult) {
-    // <!doctype html> - OK
-    if (encounteredTag.attrs().length === 1 &&
-        encounteredTag.attrs()[0].name === 'html')
-      return;
-    // <!doctype html lang=...> OK
-    // This is technically invalid. The 'correct' way to do this is to emit
-    // the lang attribute on the `<html>` tag. However, we observe a number of
-    // websites incorrectly emitting `lang` as part of doctype, so this
-    // specific attribute is allowed to avoid breaking existing pages.
-    if (encounteredTag.attrs().length === 2) {
-      if (encounteredTag.attrs()[0].name === 'html' &&
-          encounteredTag.attrs()[1].name === 'lang')
-        return;
-      if (encounteredTag.attrs()[0].name === 'lang' &&
-          encounteredTag.attrs()[1].name === 'html')
-        return;
-    }
-    if (encounteredTag.attrs().length !== 1 ||
-        encounteredTag.attrs()[0].name !== 'html') {
-      this.context_.addError(
-          generated.ValidationError.Code.INVALID_DOCTYPE_HTML,
-          this.context_.getLineCol(),
-          /* params */[],
-          /* specUrl */ 'https://amp.dev/documentation/' +
-              'guides-and-tutorials/start/create/basic_markup/',
-          this.validationResult_);
-    }
-  }
-
-  /**
-   * Callback for a start HTML tag.
-   * @param {!parserInterface.ParsedHtmlTag} encounteredTag
-   * @override
-   */
-  startTag(encounteredTag) {
-    if (encounteredTag.upperName() === 'HTML') {
-      this.context_.getRules().validateHtmlTag(
-          encounteredTag, this.context_, this.validationResult_);
-    }
-    if (encounteredTag.upperName() === '!DOCTYPE') {
-      this.validateDocType(
-          encounteredTag, this.context_, this.validationResult_);
-      // Even though validateDocType emits all necessary errors about the tag,
-      // we continue to process it further (validateTag and such) so that we
-      // can record the tag was present and record it as the root pseudo
-      // element for the document.
-    }
-    /** @type {?string} */
-    const maybeDuplicateAttrName = encounteredTag.hasDuplicateAttrs();
-    if (maybeDuplicateAttrName !== null) {
-      this.context_.addWarning(
-          generated.ValidationError.Code.DUPLICATE_ATTRIBUTE,
-          this.context_.getLineCol(),
-          /* params */[encounteredTag.lowerName(), maybeDuplicateAttrName],
-          /* specUrl */ '', this.validationResult_);
-      encounteredTag.dedupeAttrs();
-    }
-
-    if ('BODY' === encounteredTag.upperName()) {
-      this.context_.recordBodyTag(encounteredTag.attrs());
-      this.emitMissingExtensionErrors();
-    }
-
-    /** @type {ValidateTagResult} */
-    let resultForReferencePoint = {
-      bestMatchTagSpec: null,
-      validationResult: new generated.ValidationResult(),
-      devModeSuppress: false,
-      inlineStyleCssBytes: 0,
-    };
-    resultForReferencePoint.validationResult.status =
-        generated.ValidationResult.Status.UNKNOWN;
-    const referencePointMatcher =
-        this.context_.getTagStack().parentReferencePointMatcher();
-    // We must match the reference point before the TagSpec, as otherwise we
-    // will end up with "unexplained" attributes during tagspec matching
-    // which the reference point takes care of.
-    if (referencePointMatcher !== null) {
-      resultForReferencePoint =
-          referencePointMatcher.validateTag(encounteredTag, this.context_);
-    }
-
-    const resultForTag = validateTag(
-        encounteredTag, resultForReferencePoint.bestMatchTagSpec,
-        this.context_);
-    resultForTag.devModeSuppress =
-        ShouldSuppressDevModeErrors(encounteredTag, this.context_);
-    // Only merge in the reference point errors into the final result if the
-    // tag otherwise passes one of the TagSpecs. Otherwise, we end up with
-    // unnecessarily verbose errors.
-    if (referencePointMatcher !== null &&
-        resultForTag.validationResult.status ===
-            generated.ValidationResult.Status.PASS &&
-        !resultForTag.devModeSuppress) {
-      this.validationResult_.mergeFrom(
-          resultForReferencePoint.validationResult);
-    }
-
-
-    checkForReferencePointCollision(
-        resultForReferencePoint.bestMatchTagSpec, resultForTag.bestMatchTagSpec,
-        this.context_, resultForTag.validationResult);
-    if (!resultForTag.devModeSuppress)
-      this.validationResult_.mergeFrom(resultForTag.validationResult);
-
-    this.context_.updateFromTagResults(
-        encounteredTag, resultForReferencePoint, resultForTag);
-  }
-
-  /**
-   * Callback for an end HTML tag.
-   * @param {!parserInterface.ParsedHtmlTag} unused
-   * @override
-   */
-  endTag(unused) {
-    this.context_.getTagStack().exitTag(this.context_, this.validationResult_);
-  }
-
-  /**
-   * Callback for pcdata. I'm not sure what this is supposed to include, but
-   * it seems to be called for contents of <p> tags, looking at a few
-   * examples.
-   * @param {string} unused
-   * @override
-   */
-  pcdata(unused) {}
-
-  /**
-   * Callback for rcdata text. rcdata text includes contents of title or
-   * textarea
-   * tags. The validator has no specific rules regarding these text blobs.
-   * @param {string} unused
-   * @override
-   */
-  rcdata(unused) {}
-
-  /**
-   * Callback for cdata.
-   * @param {string} text
-   * @override
-   */
-  cdata(text) {
-    // Validate that JSON can be parsed.
-    if (!this.context_.getTagStack().hasAncestor('TEMPLATE') &&
-        this.context_.getTagStack().isScriptTypeJsonChild()) {
-      try {
-        JSON.parse(text);
-      } catch (e) {
-        this.context_.addWarning(
-            generated.ValidationError.Code.INVALID_JSON_CDATA,
-            this.context_.getLineCol(),
-            /* params */[], '', this.validationResult_);
-      }
-    }
-    const matcher = this.context_.getTagStack().cdataMatcher();
-    if (matcher !== null) {
-      matcher.match(text, this.context_, this.validationResult_);
-    }
-  }
-};
-exports.ValidationHandler = ValidationHandler;
-
-/**
- * Convenience function which informs caller if given ValidationError is
- * severity warning.
- *
- * WARNING: This is exported; htmlparser changes may break downstream users
- * like https://www.npmjs.com/package/amphtml-validator and
- * https://validator.amp.dev/.
- *
- * @param {!generated.ValidationError} error
- * @return {boolean}
- */
-const isSeverityWarning = function(error) {
-  return error.severity === generated.ValidationError.Severity.WARNING;
-};
-exports.isSeverityWarning = isSeverityWarning;
-
-/**
- * Validates a document input as a string.
- *
- * WARNING: This is exported; htmlparser changes may break downstream users
- * like https://www.npmjs.com/package/amphtml-validator and
- * https://validator.amp.dev/.
- *
- * @param {string} inputDocContents
- * @param {string=} opt_htmlFormat the allowed format. Defaults to 'AMP'.
- * @return {!generated.ValidationResult} Validation Result (status and
- *     errors)
- */
-const validateString = function(inputDocContents, opt_htmlFormat) {
-  asserts.assertString(inputDocContents, 'Input document is not a string');
-  let htmlFormat = 'AMP';
-  if (opt_htmlFormat) {
-    htmlFormat = opt_htmlFormat.toUpperCase();
-  }
-  const handler = new ValidationHandler(htmlFormat);
-  const parser = new htmlparser.HtmlParser();
-  parser.parse(handler, inputDocContents);
-
-  return handler.Result();
-};
-exports.validateString = validateString;
-
-/**
- * The terminal is an abstraction for the window.console object which
- * accomodates differences between console implementations and provides
- * a convenient way to capture what's being emitted to the terminal
- * in a unittest. Pass the optional parameter to the constructor
- * to observe the calls that would have gone to window.console otherwise.
- */
-const Terminal = class {
-  /**
-   * @param {!Array<string>=} opt_out an array into which the terminal will
-   *     emit one string per info / warn / error calls.
-   */
-  constructor(opt_out) {
-    this.out_ = opt_out || null;
-  }
-
-  /** @param {string} msg */
-  info(msg) {
-    if (this.out_) {
-      this.out_.push('I: ' + msg);
-    } else {
-      (console.info || console.log).call(console, msg);
-    }
-  }
-
-  /** @param {string} msg */
-  warn(msg) {
-    if (this.out_) {
-      this.out_.push('W: ' + msg);
-    } else if (console.warn) {
-      console.warn(msg);
-    } else {
-      console.log('WARNING: ' + msg);
-    }
-  }
-
-  /** @param {string} msg */
-  error(msg) {
-    if (this.out_) {
-      this.out_.push('E: ' + msg);
-    } else if (console.error) {
-      console.error(msg);
-    } else {
-      console.log('ERROR: ' + msg);
-    }
-  }
-};
-exports.Terminal = Terminal;
-
-/**
- * Emits this validation result to the terminal, distinguishing warnings and
- *   errors.
- * @this {!generated.ValidationResult}
- * @param {string} url
- * @param {!Terminal=} opt_terminal
- */
-generated.ValidationResult.prototype.outputToTerminal = function(
-    url, opt_terminal) {
-  const terminal = opt_terminal || new Terminal();
-
-  const {status} = this;
-  if (status === generated.ValidationResult.Status.PASS) {
-    terminal.info('AMP validation successful.');
-    terminal.info(
-        'Review our \'publishing checklist\' to ensure ' +
-        'successful AMP document distribution. See https://go.amp.dev/publishing-checklist');
-    if (this.errors.length === 0) {
-      return;
-    }
-  } else if (status !== generated.ValidationResult.Status.FAIL) {
-    terminal.error(
-        'AMP validation had unknown results. This indicates a validator ' +
-        'bug. Please report at ' +
-        'https://github.com/ampproject/amphtml/issues .');
-    return;
-  }
-  let errors;
-  if (status === generated.ValidationResult.Status.FAIL) {
-    terminal.error('AMP validation had errors:');
-  } else {
-    terminal.warn('AMP validation had warnings:');
-  }
-  errors = this.errors;
-  for (const error of errors) {
-    if (error.severity === generated.ValidationError.Severity.ERROR) {
-      terminal.error(errorLine(url, error));
-    } else {
-      terminal.warn(errorLine(url, error));
-    }
-  }
-  if (errors.length !== 0) {
-    terminal.info(
-        'See also https://validator.amp.dev/#url=' +
-        encodeURIComponent(uriUtils.removeFragment(url)));
-  }
-};
-
-/**
- * A regex for replacing any adjacent characters that are whitespace
- * with a single space (' ').
- * @private
- * @type {RegExp}
- */
-const matchWhitespaceRE = /\s+/g;
-
-/**
- * Applies the format to render the params in the provided error.
- * @param {string} format
- * @param {!generated.ValidationError} error
- * @return {string}
- */
-function applyFormat(format, error) {
-  let message = format;
-  for (let param = 1; param <= error.params.length; ++param) {
-    const value = error.params[param - 1].replace(matchWhitespaceRE, ' ');
-    message = message.replace(new RegExp('%' + param, 'g'), value);
-  }
-  return message.replace(new RegExp('%%', 'g'), '%');
-}
-
-/**
- * Renders the error message for a single error.
- *
- * WARNING: This is exported; htmlparser changes may break downstream users
- * like https://www.npmjs.com/package/amphtml-validator and
- * https://validator.amp.dev/.
- *
- * @param {!generated.ValidationError} error
- * @return {string}
- */
-const renderErrorMessage = function(error) {
-  asserts.assert(error.code !== null);
-  // TODO(powdercloud): It doesn't matter which ParsedValidatorRules
-  // instance we access here - all of them have all error message
-  // formats. We should probably refactor this a bit to keep the
-  // error message formats seperately, to avoid initializing the
-  // ParsedValidatorRules for AMP if we're really doing A4A.
-  const format = getParsedValidatorRules('AMP').getFormatByCode(error.code);
-  asserts.assert(format !== undefined);
-  return applyFormat(format, error);
-};
-exports.renderErrorMessage = renderErrorMessage;
-
-/**
- * Renders one line of error output.
- * @param {string} filenameOrUrl
- * @param {!generated.ValidationError} error
- * @return {string}
- */
-function errorLine(filenameOrUrl, error) {
-  const line = error.line || 1;
-  const col = error.col || 0;
-
-  let errorLine =
-      uriUtils.removeFragment(filenameOrUrl) + ':' + line + ':' + col + ' ';
-  errorLine += renderErrorMessage(error);
-  if (error.specUrl) {
-    errorLine += ' (see ' + error.specUrl + ')';
-  }
-  return errorLine;
-}
-
-/**
- * Renders the validation results into an array of human readable strings.
- * Careful when modifying this - it's called from
- * https://github.com/ampproject/amphtml/blob/main/test/integration/test-example-validation.js.
- *
- * WARNING: This is exported; htmlparser changes may break downstream users
- * like https://www.npmjs.com/package/amphtml-validator and
- * https://validator.amp.dev/.
- *
- * @param {!generated.ValidationResult} validationResult
- * @param {string} filename to use in rendering error messages.
- * @return {!Array<string>}
- */
-const renderValidationResult = function(validationResult, filename) {
-  const rendered = [];
-  rendered.push(validationResult.status);
-  for (const error of validationResult.errors) {
-    rendered.push(errorLine(filename, error));
-  }
-  return rendered;
-};
-exports.renderValidationResult = renderValidationResult;
-
-/**
- * Detects the author stylesheet based on the parameter name for it in
- * a ValidationError proto message.
- * @param {string} param
- * @return {boolean}
- */
-function isAuthorStylesheet(param) {
-  return googString./*OK*/ startsWith(param, 'style amp-custom');
-}
-exports.isAuthorStylesheet = isAuthorStylesheet;
-
-/**
- * This function was removed in October 2019. Older versions of the nodejs
- * amphtml-validator library still call this function, so this stub is left
- * in place for now so as not to break them. TODO(#25188): Delete this
- * function after most usage had moved to a newer version of the
- * amphtml-validator lib.
- *
- * WARNING: This is exported; htmlparser changes may break downstream users
- * like https://www.npmjs.com/package/amphtml-validator and
- * https://validator.amp.dev/.
- *
- * @param {!generated.ValidationError} error
- * @return {!generated.ErrorCategory.Code}
- */
-const categorizeError = function(error) {
-  return generated.ErrorCategory.Code.UNKNOWN;
-};
-exports.categorizeError = categorizeError;
-
-/**
- * Convenience function which calls |CategorizeError| for each error
- * in |result| and sets its category field accordingly.
- *
- * WARNING: This is exported; htmlparser changes may break downstream users
- * like https://www.npmjs.com/package/amphtml-validator and
- * https://validator.amp.dev/.
- *
- * @param {!generated.ValidationResult} result
- */
-const annotateWithErrorCategories = function(result) {
-  for (const error of result.errors) {
-    error.category = categorizeError(error);
-  }
-};
-exports.annotateWithErrorCategories = annotateWithErrorCategories;
-
-// The following are globals we want exposed to callers that include the
-// minified validator:
-goog.exportSymbol(
-    'amp.validator.ErrorCategory.Code', generated.ErrorCategory.Code);
-goog.exportSymbol('amp.validator.HtmlFormat.Code', generated.HtmlFormat.Code);
-goog.exportSymbol('amp.validator.validateString', validateString);
-goog.exportSymbol('amp.validator.ValidationError', generated.ValidationError);
-goog.exportSymbol(
-    'amp.validator.ValidationError.Code', generated.ValidationError.Code);
-goog.exportSymbol(
-    'amp.validator.ValidationError.Severity',
-    generated.ValidationError.Severity);
-goog.exportSymbol('amp.validator.ValidationResult', generated.ValidationResult);
-goog.exportSymbol(
-    'amp.validator.ValidationResult.Status', generated.ValidationResult.Status);
-goog.exportSymbol('amp.validator.renderErrorMessage', renderErrorMessage);
-goog.exportSymbol(
-    'amp.validator.renderValidationResult', renderValidationResult);
-goog.exportSymbol('amp.validator.categorizeError', categorizeError);
-goog.exportSymbol(
-    'amp.validator.annotateWithErrorCategories', annotateWithErrorCategories);
-goog.exportSymbol('amp.validator.isSeverityWarning', isSeverityWarning);
diff --git a/validator/js/engine/validator_test.js b/validator/js/engine/validator_test.js
deleted file mode 100644
index 8f894141637b..000000000000
--- a/validator/js/engine/validator_test.js
+++ /dev/null
@@ -1,1948 +0,0 @@
-goog.module('amp.validator.ValidatorTest');
-
-const asserts = goog.require('goog.asserts');
-const createRules = goog.require('amp.validator.createRules');
-const generated = goog.require('amp.validator.protogenerated');
-const htmlparser = goog.require('amp.htmlparser');
-const uriUtils = goog.require('goog.uri.utils');
-const validator = goog.require('amp.validator');
-
-/**
- * Returns the absolute path for a given test file, that is, a file
- * underneath a testdata directory. E.g., 'foo/bar/testdata/baz.html' =>
- * 'baz.html'.
- * @param {string} testFile
- * @return {string}
- */
-function absolutePathFor(testFile) {
-  for (const dir of process.env['TESTDATA_ROOTS'].split(':')) {
-    const candidate = path.join(dir, testFile);
-    if (fs.existsSync(candidate)) {
-      return candidate;
-    }
-  }
-  asserts.fail('Could not find ' + testFile);
-}
-
-/**
- * @param {string} dir
- * @return {!Array<string>}
- */
-function readdir(dir) {
-  const files = fs.readdirSync(dir);
-  asserts.assert(files != null, 'problem reading ' + dir);
-  return files;
-}
-
-/**
- * @param {string} dir
- * @return {boolean}
- */
-function isdir(dir) {
-  try {
-    return fs.lstatSync(dir).isDirectory();
-  } catch (e) {
-    return false;  // If there's neither a file nor a directory.
-  }
-}
-
-/**
- * @param {null|string} regex
- * @return {boolean}
- */
-function isValidRegex(regex) {
-  let testRegex = null;
-  try {
-    testRegex = new RegExp(regex);
-  } catch (e) {
-  }
-  return testRegex != null;
-}
-
-/**
- * Returns true if the regex has a group but is missing the corresponding
- * Unicode group. For now this tests only for word character group (\\w) which
- * must be followed by the Unicode equivalent group (\\p{L}\\p{N}_).
- * @param {null|string} regex
- * @return {boolean}
- */
-function isMissingUnicodeGroup(regex) {
-  const wordGroupRegex = new RegExp('\\\\w(?!\\\\p{L}\\\\p{N}_)');
-  return wordGroupRegex.test(regex);
-}
-
-/**
- * Returns all html files underneath the testdata roots. This looks
- * both for feature_tests/*.html and for tests in extension directories.
- * E.g.: extensions/amp-accordion/0.1/test/*.html,
- *       extensions/amp-sidebar/1.0/test/*.html, and
- *       testdata/feature_tests/amp_accordion.html.
- * @return {!Array<string>}
- */
-function findHtmlFilesRelativeToTestdata() {
-  const testSubdirs = [];
-  for (const root of process.env['TESTDATA_ROOTS'].split(':')) {
-    if (path.basename(root) === 'extensions') {
-      for (const extension of readdir(root)) {
-        const extensionFolder = path.join(root, extension);
-        if (!isdir(extensionFolder) || extension[0] === '.') {
-          // Skip if not a folder or if hidden folder
-          continue;
-        }
-        // Get all versions
-        for (const possibleVersion of readdir(extensionFolder)) {
-          const testPath = path.join(extension, possibleVersion, 'test');
-          // Skip if not a folder or if hidden folder
-          if (isdir(path.join(root, testPath)) && testPath[0] !== '.') {
-            testSubdirs.push({root, subdir: testPath});
-          }
-        }
-      }
-    } else {
-      for (const subdir of readdir(root)) {
-        // Skip if not a folder or if hidden folder
-        if (isdir(path.join(root, subdir)) && subdir[0] !== '.') {
-          testSubdirs.push({root, subdir});
-        }
-      }
-    }
-  }
-  const testFiles = [];
-  for (const entry of testSubdirs) {
-    for (const candidate of readdir(path.join(entry.root, entry.subdir))) {
-      if (candidate.match(/\.html$/)) {
-        testFiles.push(path.join(entry.subdir, candidate));
-      }
-    }
-  }
-  return testFiles;
-}
-
-/**
- * An AMP Validator test case. This constructor will load the AMP HTML file
- * and also find the adjacent .out file.
- * TODO(alabiaga): rid of htmlFormat property based on directory path as it
- * should be read from the ampHtmlFile. Also address nodejs validator changes.
- * @constructor
- * @param {string} ampHtmlFile
- * @param {string=} opt_ampUrl
- */
-const ValidatorTestCase = function(ampHtmlFile, opt_ampUrl) {
-  /** @type {string} */
-  this.name = ampHtmlFile;
-  /** @type {string} */
-  this.ampHtmlFile = ampHtmlFile;
-  /** @type {string} */
-  this.ampUrl = opt_ampUrl || ampHtmlFile;
-  /** @type {string} */
-  this.htmlFormat = 'AMP';
-  if (this.ampHtmlFile.indexOf('amp4ads_feature_tests/') != -1 ||
-      this.ampHtmlFile.indexOf('/validator-amp4ads-') != -1) {
-    this.htmlFormat = 'AMP4ADS';
-  }
-  if (this.ampHtmlFile.indexOf('amp4email_feature_tests/') != -1 ||
-      this.ampHtmlFile.indexOf('/validator-amp4email-') != -1) {
-    this.htmlFormat = 'AMP4EMAIL';
-  }
-  /**
-   * If set to false, output will be generated without inlining the input
-   * document.
-   * @type {boolean}
-   */
-  this.inlineOutput = true;
-  /**
-   * This field can be null, indicating that the expectedOutput did not
-   * come from a file.
-   * @type {?string}
-   */
-  this.expectedOutputFile = path.join(
-      path.dirname(ampHtmlFile), path.basename(ampHtmlFile, '.html') + '.out');
-  /** @type {string} */
-  this.ampHtmlFileContents =
-      fs.readFileSync(absolutePathFor(this.ampHtmlFile), 'utf8').trim();
-  // Reading in the file with BOM characters appears to strip them. Add them
-  // back.
-  if (this.ampHtmlFile === 'feature_tests/unprintable_chars.html') {
-    this.ampHtmlFileContents = '\ufeff\ufeff\ufeff' + this.ampHtmlFileContents;
-  }
-
-  // In the update_tests case, this file may not exist.
-  const fullOutputFile = path.join(
-      path.dirname(absolutePathFor(this.ampHtmlFile)),
-      path.basename(ampHtmlFile, '.html') + '.out');
-  /** @type {string} */
-  this.expectedOutput;
-  try {
-    this.expectedOutput = fs.readFileSync(fullOutputFile, 'utf8').trim();
-  } catch (err) {
-    // If the file doesn't exist and we're trying to update the file, create it.
-    if (process.env['UPDATE_VALIDATOR_TEST'] === '1') {
-      fs.writeFileSync(fullOutputFile, '');
-    } else {
-      throw err;
-    }
-  }
-};
-
-/**
- * Renders one line of error output.
- * @param {string} filenameOrUrl
- * @param {!generated.ValidationError} error
- * @return {string}
- */
-function renderErrorWithPosition(filenameOrUrl, error) {
-  const line = error.line || 1;
-  const col = error.col || 0;
-
-  let errorLine =
-      uriUtils.removeFragment(filenameOrUrl) + ':' + line + ':' + col + ' ';
-  errorLine += validator.renderErrorMessage(error);
-  if (error.specUrl) {
-    errorLine += ' (see ' + error.specUrl + ')';
-  }
-  return errorLine;
-}
-
-/**
- * Like validator.renderValidationResult, except inlines any error messages
- * into the input document.
- * @param {!Object} validationResult
- * @param {string} filename to use in rendering error messages.
- * @param {string} filecontents
- * @return {string}
- */
-function renderInlineResult(validationResult, filename, filecontents) {
-  let rendered = '';
-  rendered += validationResult.status;
-
-  const lines = filecontents.split('\n');
-  let linesEmitted = 0;
-  for (const error of validationResult.errors) {
-    // Emit all input lines up to and including the line containing the error,
-    // prefixed with '|  ' (or just '|' if the line is empty).
-    while (linesEmitted < error.line && linesEmitted < lines.length) {
-      rendered += '\n|';
-      if (lines[linesEmitted] !== '') {
-        rendered += '  ' + lines[linesEmitted];
-      }
-      linesEmitted++;
-    }
-    // Emit a carat showing the column of the following error.
-    rendered += '\n>>';
-    for (let i = 0; i < error.col + 1; ++i) {
-      rendered += ' ';
-    }
-    rendered += '^~~~~~~~~\n';
-    rendered += renderErrorWithPosition(filename, error);
-  }
-  while (linesEmitted < lines.length) {
-    rendered += '\n|';
-    if (lines[linesEmitted] !== '') {
-      rendered += '  ' + lines[linesEmitted];
-    }
-    linesEmitted++;
-  }
-  return rendered;
-}
-
-/**
- * Runs the test, by executing the AMP Validator, then comparing its output
- * against the golden file content.
- */
-ValidatorTestCase.prototype.run = function() {
-  const results =
-      validator.validateString(this.ampHtmlFileContents, this.htmlFormat);
-  const observed = this.inlineOutput ?
-      renderInlineResult(results, this.ampUrl, this.ampHtmlFileContents) :
-      validator.renderValidationResult(results, this.ampUrl).join('\n');
-
-  if (observed === this.expectedOutput) {
-    return;
-  }
-  if (process.env['UPDATE_VALIDATOR_TEST'] === '1') {
-    if (this.expectedOutputFile !== null) {
-      console /*OK*/.log('Updating ' + this.expectedOutputFile + ' ...');
-      fs.writeFileSync(absolutePathFor(this.expectedOutputFile), observed);
-    }
-    return;
-  }
-  let message = '';
-  if (this.expectedOutputFile !== null) {
-    message = '\n' + this.expectedOutputFile + ':1:0\n';
-  }
-  message += 'expected:\n' + this.expectedOutput + '\nsaw:\n' + observed;
-  if (this.expectedOutputFile !== null) {
-    message += '\n\nIf validator/' + absolutePathFor(this.expectedOutputFile) +
-        ' is incorrect, please run `amp validator --update_tests` to ' +
-        'regenerate it based on its corresponding .html file.';
-  }
-  asserts.fail(message);
-};
-
-/**
- * A strict comparison between two values.
- * Note: Unfortunately assert.strictEqual has some drawbacks, including that
- * it truncates the provided arguments (and it's not configurable) and
- * with the Closure compiler, it requires a message argument to which
- * we'd always have to pass undefined. Too messy, so we roll our own.
- * @param {*} expected
- * @param {*} saw
- */
-function assertStrictEqual(expected, saw) {
-  assert.ok(expected === saw, 'expected: ' + expected + ' saw: ' + saw);
-}
-
-describe('ValidatorFeatures', () => {
-  for (const htmlFile of findHtmlFilesRelativeToTestdata()) {
-    const test = new ValidatorTestCase(htmlFile);
-    it(test.name, () => {
-      test.run();
-    });
-  }
-});
-
-describe('ValidatorOutput', () => {
-  if (process.env['UPDATE_VALIDATOR_TEST'] === '1') {
-    return;
-  }
-  // What's tested here is that if a URL with #development=1 is passed
-  // (or any other hash), the validator output won't include the hash.
-  it('produces expected output with hash in the URL', () => {
-    const test = new ValidatorTestCase(
-        'feature_tests/no_custom_js.html',
-        'http://google.com/foo.html#development=1');
-    const results = validator.validateString(test.ampHtmlFileContents);
-    const observed =
-        validator.renderValidationResult(results, test.ampUrl).join('\n');
-    const expectedSubstr = 'http://google.com/foo.html:13:3';
-    if (observed.indexOf(expectedSubstr) === -1) {
-      asserts.fail(
-          'expectedSubstr:\n' + expectedSubstr + '\nsaw:\n' + observed);
-    }
-  });
-
-  it('validate amp format', () => {
-    const results = validator.validateString(
-        '<!doctype html><html ⚡><head><meta charset="utf-8">' +
-            '<link rel="canonical" href="self.html" />' +
-            '<meta name="viewport" content="width=device-width,minimum-scale=1">' +
-            '<style amp-boilerplate>body{-webkit-animation:-amp-start 8s ' +
-            'steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,' +
-            'end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 ' +
-            'normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@' +
-            '-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:' +
-            'visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visib' +
-            'ility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{' +
-            'visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}' +
-            'to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}' +
-            'to{visibility:visible}}</style><noscript><style amp-boilerplate>body' +
-            '{-webkit-animation:none;-moz-animation:none;-ms-animation:none;' +
-            'animation:none}</style></noscript>' +
-            '<script async src="https://cdn.ampproject.org/v0.js"></script>' +
-            '</head><body>Hello, AMP world.</body></html>',
-        'amp');
-    assertStrictEqual(results.status, 'PASS');
-  });
-
-  it('default to validating the amp format', () => {
-    const results = validator.validateString(
-        '<!doctype html><html ⚡><head><meta charset="utf-8">' +
-        '<link rel="canonical" href="self.html" />' +
-        '<meta name="viewport" content="width=device-width,minimum-scale=1">' +
-        '<style amp-boilerplate>body{-webkit-animation:-amp-start 8s ' +
-        'steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,' +
-        'end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 ' +
-        'normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@' +
-        '-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:' +
-        'visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visib' +
-        'ility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{' +
-        'visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}' +
-        'to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}' +
-        'to{visibility:visible}}</style><noscript><style amp-boilerplate>body' +
-        '{-webkit-animation:none;-moz-animation:none;-ms-animation:none;' +
-        'animation:none}</style></noscript>' +
-        '<script async src="https://cdn.ampproject.org/v0.js"></script>' +
-        '</head><body>Hello, AMP world.</body></html>');
-    assertStrictEqual(results.status, 'PASS');
-  });
-
-  it('validate amp4email format', () => {
-    const results = validator.validateString(
-        '<!doctype html><html ⚡4email data-css-strict><head>' +
-            '<meta charset="utf-8">' +
-            '<script async src="https://cdn.ampproject.org/v0.js"></script>' +
-            '<style amp4email-boilerplate>body{visibility:hidden}</style>' +
-            '</head><body>Hello, AMP4EMAIL world.</body></html>',
-        'amp4email');
-    assertStrictEqual(results.status, 'PASS');
-  });
-
-  it('validate amp4email format with error', () => {
-    const results = validator.validateString(
-        '<!doctype html><html ⚡4email data-css-strict><head>' +
-            '<meta charset="utf-8">' +
-            '<script async src="https://cdn.ampproject.org/v0.js"></script>' +
-            '</head><body>Hello, AMP4EMAIL world.</body></html>',
-        'amp4email');
-    assertStrictEqual(results.status, 'FAIL');
-    assertStrictEqual(
-        results.errors[0].params.toString(),
-        'style[amp-boilerplate],amphtml engine script');
-    assertStrictEqual(results.errors.length, 1);
-  });
-
-  it('validate amp4ads format', () => {
-    const results = validator.validateString(
-        '<!doctype html><html data-some-attribute ⚡4ads>' +
-            '<head><meta charset="utf-8">' +
-            '<meta name="viewport" content="width=device-width,minimum-scale=1">' +
-            '<style amp4ads-boilerplate>body{visibility:hidden}</style>' +
-            '<script async src="https://cdn.ampproject.org/amp4ads-v0.js">' +
-            '</script></head><body>Hello, AMP4ADS world.</body></html>',
-        'amp4ads');
-    assertStrictEqual(results.status, 'PASS');
-  });
-});
-
-describe('ValidationResultTransformerVersion', () => {
-  if (process.env['UPDATE_VALIDATOR_TEST'] === '1') {
-    return;
-  }
-  // Confirm that the transformer version in attribute "transformed" is
-  // set to ValidationResult.transformer_version.
-  it('produces expected output with hash in the URL', () => {
-    const test = new ValidatorTestCase(
-        'transformed_feature_tests/minimum_valid_amp.html');
-    const result =
-        validator.validateString(test.ampHtmlFileContents, test.htmlFormat);
-    assertStrictEqual(1, result.transformerVersion);
-  });
-});
-
-describe('Validator.DocSizeAmpEmail', () => {
-  if (process.env['UPDATE_VALIDATOR_TEST'] === '1') {
-    return;
-  }
-  // Rather than encoding some really long body in testcases, which would be
-  // difficult to read/verify that the testcase is valid, we modify a valid
-  // testcase (amp4email_feature_tests/doc_size.html) designed for this
-  // purpose in code.
-
-  // We use a blob of length 20 (both bytes and chars) to make it easy to
-  // construct body of any length that we want.
-  const validBlob = '<b>Hello, World</b>\n';
-  assertStrictEqual(20, validBlob.length);
-
-  it('accepts 200000 bytes in the test document', () => {
-    const body = Array(9975).join(validBlob);
-    const test = new ValidatorTestCase('amp4email_feature_tests/doc_size.html');
-    test.ampHtmlFileContents =
-        test.ampHtmlFileContents.replace('replace_body', body);
-    assertStrictEqual(200000, htmlparser.byteLength(test.ampHtmlFileContents));
-    test.inlineOutput = false;
-    test.expectedOutput = 'PASS';
-    test.run();
-  });
-
-  it('will not accept 200001 bytes in the test document', () => {
-    const body = Array(9975).join(validBlob) + ' ';
-    const test = new ValidatorTestCase('amp4email_feature_tests/doc_size.html');
-    test.ampHtmlFileContents =
-        test.ampHtmlFileContents.replace('replace_body', body);
-    assertStrictEqual(200001, htmlparser.byteLength(test.ampHtmlFileContents));
-    test.inlineOutput = false;
-    test.expectedOutputFile = null;
-    test.expectedOutput = 'FAIL\n' +
-        'amp4email_feature_tests/doc_size.html:9993:6 ' +
-        'Document exceeded 200000 bytes limit. Actual size 200001 bytes. ' +
-        '(see https://amp.dev/documentation/guides-and-tutorials/learn/' +
-        'email-spec/amp-email-format/?format=email)';
-    test.run();
-  });
-});
-
-describe('Validator.ScriptLength', () => {
-  if (process.env['UPDATE_VALIDATOR_TEST'] === '1') {
-    return;
-  }
-  // This string is 10 bytes of inline script.
-  const inlineScriptBlob = 'alert(\'\');';
-  assertStrictEqual(10, inlineScriptBlob.length);
-
-  it('accepts 10000 bytes of inline style', () => {
-    const inlineScript = Array(1001).join(inlineScriptBlob);
-    assertStrictEqual(10000, inlineScript.length);
-    const test =
-        new ValidatorTestCase('feature_tests/inline_script_length.html');
-    test.inlineOutput = false;
-    test.ampHtmlFileContents =
-        test.ampHtmlFileContents.replace('replace_inline_script', inlineScript);
-    test.expectedOutput = 'PASS';
-    test.run();
-  });
-
-  it('will not accept 10010 bytes in inline script', () => {
-    const inlineScript = Array(1001).join(inlineScriptBlob) + ' ';
-    assertStrictEqual(10001, inlineScript.length);
-    const test =
-        new ValidatorTestCase('feature_tests/inline_script_length.html');
-    test.inlineOutput = false;
-    test.ampHtmlFileContents =
-        test.ampHtmlFileContents.replace('replace_inline_script', inlineScript);
-    test.expectedOutputFile = null;
-    test.expectedOutput = 'FAIL\n' +
-        'feature_tests/inline_script_length.html:20:2 The inline script ' +
-        'is 10001 bytes, which exceeds the limit of 10000 bytes. ' +
-        '(see https://amp.dev/documentation/components/amp-script/#faq)';
-    test.run();
-  });
-});
-
-describe('Validator.CssLength', () => {
-  if (process.env['UPDATE_VALIDATOR_TEST'] === '1') {
-    return;
-  }
-  // Rather than encoding some really long author stylesheets in
-  // testcases, which would be difficult to read/verify that the
-  // testcase is valid, we modify a valid testcase
-  // (feature_tests/css_length.html) designed for this purpose in code.
-
-  // We use a blob of length 10 (both bytes and chars) to make it easy to
-  // construct stylesheets of any length that we want.
-  const validStyleBlob = 'h1{top:0}\n';
-  assertStrictEqual(10, validStyleBlob.length);
-  const validInlineStyleBlob = '<b style=\'width:1px;\'></b>';
-
-  it('accepts 75000 bytes in author stylesheet and 0 bytes in inline style',
-     () => {
-       const stylesheet = Array(7501).join(validStyleBlob);
-       assertStrictEqual(75000, stylesheet.length);
-       const test = new ValidatorTestCase('feature_tests/css_length.html');
-       test.inlineOutput = false;
-       test.ampHtmlFileContents =
-           test.ampHtmlFileContents
-               .replace('.replace_amp_custom {}', stylesheet)
-               .replace('replace_inline_style', '');
-       test.expectedOutput = 'PASS';
-       test.run();
-     });
-
-  it('will not accept 75001 bytes in author stylesheet and 0 bytes in ' +
-         'inline style',
-     () => {
-       const stylesheet = Array(7501).join(validStyleBlob) + ' ';
-       assertStrictEqual(75001, stylesheet.length);
-       const test = new ValidatorTestCase('feature_tests/css_length.html');
-       test.inlineOutput = false;
-       test.ampHtmlFileContents =
-           test.ampHtmlFileContents
-               .replace('.replace_amp_custom {}', stylesheet)
-               .replace('replace_inline_style', '');
-       test.expectedOutputFile = null;
-       test.expectedOutput = 'FAIL\n' +
-           'feature_tests/css_length.html:13:2 The author stylesheet ' +
-           'specified in tag \'style amp-custom\' is too long - document ' +
-           'contains 75001 bytes whereas the limit is 75000 bytes. ' +
-           '(see https://amp.dev/documentation/guides-and-tutorials/' +
-           'learn/spec/amphtml/#maximum-size)';
-       test.run();
-     });
-
-  it('knows utf8 and rejects file with 75002 bytes but 74999 characters ' +
-         'and 0 bytes in inline style',
-     () => {
-       const stylesheet = Array(7500).join(validStyleBlob) + 'h {a: 😺}';
-       assertStrictEqual(74999, stylesheet.length);  // character length
-       const test = new ValidatorTestCase('feature_tests/css_length.html');
-       test.inlineOutput = false;
-       test.ampHtmlFileContents =
-           test.ampHtmlFileContents
-               .replace('.replace_amp_custom {}', stylesheet)
-               .replace('replace_inline_style', '');
-       test.expectedOutputFile = null;
-       test.expectedOutput = 'FAIL\n' +
-           'feature_tests/css_length.html:13:2 The author stylesheet ' +
-           'specified in tag \'style amp-custom\' is too long - document ' +
-           'contains 75002 bytes whereas the limit is 75000 bytes. ' +
-           '(see https://amp.dev/documentation/guides-and-tutorials/' +
-           'learn/spec/amphtml/#maximum-size)';
-       test.run();
-     });
-
-  it('allows 0 bytes in author stylesheet and 75000 bytes in inline style',
-     () => {
-       const inlineStyle = Array(7501).join(validInlineStyleBlob);
-       const test = new ValidatorTestCase('feature_tests/css_length.html');
-       test.inlineOutput = false;
-       test.ampHtmlFileContents =
-           test.ampHtmlFileContents.replace('.replace_amp_custom {}', '')
-               .replace('replace_inline_style', inlineStyle);
-       test.expectedOutput = 'PASS';
-       test.run();
-     });
-
-  it('will not accept 0 bytes in author stylesheet and 75010 bytes in ' +
-         'inline style',
-     () => {
-       const inlineStyle = Array(7502).join(validInlineStyleBlob);
-       const test = new ValidatorTestCase('feature_tests/css_length.html');
-       test.inlineOutput = false;
-       test.ampHtmlFileContents =
-           test.ampHtmlFileContents.replace('.replace_amp_custom {}', '')
-               .replace('replace_inline_style', inlineStyle);
-       test.expectedOutputFile = null;
-       test.expectedOutput =
-           'FAIL\nfeature_tests/css_length.html:21:6 The author stylesheet specified in tag \'style amp-custom\' and the combined inline styles is too large - document contains 75010 bytes whereas the limit is 75000 bytes. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#maximum-size)';
-       test.run();
-     });
-
-  it('will not accept 75000 bytes in author stylesheet and 14 bytes in ' +
-         'inline style',
-     () => {
-       const stylesheet = Array(7501).join(validStyleBlob);
-       assertStrictEqual(75000, stylesheet.length);
-       const test = new ValidatorTestCase('feature_tests/css_length.html');
-       test.inlineOutput = false;
-       test.ampHtmlFileContents =
-           test.ampHtmlFileContents
-               .replace('.replace_amp_custom {}', stylesheet)
-               .replace('replace_inline_style', '<b style=display:block;></b>');
-       test.expectedOutput =
-           'FAIL\nfeature_tests/css_length.html:7521:6 The author stylesheet specified in tag \'style amp-custom\' and the combined inline styles is too large - document contains 75014 bytes whereas the limit is 75000 bytes. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#maximum-size)';
-       test.run();
-     });
-});
-
-describe('Validator.CssLengthAmpEmail', () => {
-  if (process.env['UPDATE_VALIDATOR_TEST'] === '1') {
-    return;
-  }
-  // Rather than encoding some really long author stylesheets in
-  // testcases, which would be difficult to read/verify that the
-  // testcase is valid, we modify a valid testcase
-  // (feature_tests/css_length.html) designed for this purpose in code.
-
-  // We use a blob of length 10 (both bytes and chars) to make it easy to
-  // construct stylesheets of any length that we want.
-  const validStyleBlob = 'h1{top:0}\n';
-  assertStrictEqual(10, validStyleBlob.length);
-  const validInlineStyleBlob = '<b style="width:1px;"></b>';
-
-  it('accepts 75000 bytes in author stylesheet and 0 bytes in inline style',
-     () => {
-       const stylesheet = Array(7501).join(validStyleBlob);
-       assertStrictEqual(75000, htmlparser.byteLength(stylesheet));
-       const test =
-           new ValidatorTestCase('amp4email_feature_tests/css_length.html');
-       test.inlineOutput = false;
-       test.ampHtmlFileContents =
-           test.ampHtmlFileContents
-               .replace('.replace_amp_custom {}', stylesheet)
-               .replace('replace_inline_style', '');
-       test.expectedOutput = 'PASS\n' +
-           'amp4email_feature_tests/css_length.html:8:0 Tag \'html\' ' +
-           'marked with attribute \'amp4email\' is missing the corresponding ' +
-           'attribute \'data-css-strict\' for enabling strict CSS ' +
-           'validation. This may become an error in the future. ' +
-           '(see https://github.com/ampproject/amphtml/issues/32587)';
-       test.run();
-     });
-
-  it('will not accept 75001 bytes in author stylesheet and 0 bytes in ' +
-         'inline style',
-     () => {
-       const stylesheet = Array(7501).join(validStyleBlob) + ' ';
-       assertStrictEqual(75001, stylesheet.length);
-       const test =
-           new ValidatorTestCase('amp4email_feature_tests/css_length.html');
-       test.inlineOutput = false;
-       test.ampHtmlFileContents =
-           test.ampHtmlFileContents
-               .replace('.replace_amp_custom {}', stylesheet)
-               .replace('replace_inline_style', '');
-       test.expectedOutputFile = null;
-       test.expectedOutput = 'FAIL\n' +
-           'amp4email_feature_tests/css_length.html:8:0 Tag \'html\' ' +
-           'marked with attribute \'amp4email\' is missing the corresponding ' +
-           'attribute \'data-css-strict\' for enabling strict CSS ' +
-           'validation. This may become an error in the future. ' +
-           '(see https://github.com/ampproject/amphtml/issues/32587)\n' +
-           'amp4email_feature_tests/css_length.html:13:2 The author stylesheet ' +
-           'specified in tag \'style amp-custom\' is too long - document ' +
-           'contains 75001 bytes whereas the limit is 75000 bytes. ' +
-           '(see https://amp.dev/documentation/guides-and-tutorials/' +
-           'learn/spec/amphtml/#maximum-size)';
-       test.run();
-     });
-
-  it('knows utf8 and rejects file with 75002 bytes but 74999 characters ' +
-         'and 0 bytes in inline style',
-     () => {
-       const stylesheet = Array(7500).join(validStyleBlob) + 'h {a: 😺}';
-       assertStrictEqual(74999, stylesheet.length);  // character length
-       const test =
-           new ValidatorTestCase('amp4email_feature_tests/css_length.html');
-       test.inlineOutput = false;
-       test.ampHtmlFileContents =
-           test.ampHtmlFileContents
-               .replace('.replace_amp_custom {}', stylesheet)
-               .replace('replace_inline_style', '');
-       test.expectedOutputFile = null;
-       test.expectedOutput = 'FAIL\n' +
-           'amp4email_feature_tests/css_length.html:8:0 Tag \'html\' ' +
-           'marked with attribute \'amp4email\' is missing the corresponding ' +
-           'attribute \'data-css-strict\' for enabling strict CSS ' +
-           'validation. This may become an error in the future. ' +
-           '(see https://github.com/ampproject/amphtml/issues/32587)\n' +
-           'amp4email_feature_tests/css_length.html:13:2 The author ' +
-           'stylesheet specified in tag \'style amp-custom\' is ' +
-           'too long - document contains 75002 bytes whereas the limit is ' +
-           '75000 bytes. (see ' +
-           'https://amp.dev/documentation/guides-and-tutorials/' +
-           'learn/spec/amphtml/#maximum-size)';
-       test.run();
-     });
-
-  it('allows 0 bytes in author stylesheet and 75000 bytes in inline style',
-     () => {
-       const inlineStyle = Array(7501).join(validInlineStyleBlob);
-       const test =
-           new ValidatorTestCase('amp4email_feature_tests/css_length.html');
-       test.inlineOutput = false;
-       test.ampHtmlFileContents =
-           test.ampHtmlFileContents.replace('.replace_amp_custom {}', '')
-               .replace('replace_inline_style', inlineStyle);
-       test.expectedOutput = 'PASS\n' +
-           'amp4email_feature_tests/css_length.html:8:0 Tag \'html\' ' +
-           'marked with attribute \'amp4email\' is missing the corresponding ' +
-           'attribute \'data-css-strict\' for enabling strict CSS ' +
-           'validation. This may become an error in the future. ' +
-           '(see https://github.com/ampproject/amphtml/issues/32587)';
-       test.run();
-     });
-
-  it('will not accept 0 bytes in author stylesheet and 75010 bytes in ' +
-         'inline style',
-     () => {
-       const inlineStyle = Array(7502).join(validInlineStyleBlob);
-       const test =
-           new ValidatorTestCase('amp4email_feature_tests/css_length.html');
-       test.inlineOutput = false;
-       test.ampHtmlFileContents =
-           test.ampHtmlFileContents.replace('.replace_amp_custom {}', '')
-               .replace('replace_inline_style', inlineStyle);
-       test.expectedOutputFile = null;
-       // TODO(gregable): This should not pass for the case when there are more
-       // than 75,000 bytes of inline style.
-       test.expectedOutput = 'PASS\n' +
-           'amp4email_feature_tests/css_length.html:8:0 Tag \'html\' ' +
-           'marked with attribute \'amp4email\' is missing the corresponding ' +
-           'attribute \'data-css-strict\' for enabling strict CSS ' +
-           'validation. This may become an error in the future. ' +
-           '(see https://github.com/ampproject/amphtml/issues/32587)\n' +
-           'amp4email_feature_tests/css_length.html:19:6 The author ' +
-           'stylesheet specified in tag \'style amp-custom\' and the ' +
-           'combined inline styles is too large - document contains 75010 ' +
-           'bytes whereas the limit is 75000 bytes. ' +
-           '(see https://amp.dev/documentation/guides-and-tutorials/learn/' +
-           'spec/amphtml/#maximum-size)';
-       test.run();
-     });
-
-  it('will not accept 75000 bytes in author stylesheet and 14 bytes in ' +
-         'inline style',
-     () => {
-       const stylesheet = Array(7501).join(validStyleBlob);
-       assertStrictEqual(75000, stylesheet.length);
-       const test =
-           new ValidatorTestCase('amp4email_feature_tests/css_length.html');
-       test.inlineOutput = false;
-       test.ampHtmlFileContents =
-           test.ampHtmlFileContents
-               .replace('.replace_amp_custom {}', stylesheet)
-               .replace('replace_inline_style', '<b style=display:block;></b>');
-       // TODO(gregable): This should not pass, as we have more than 75,000
-       // bytes of total style.
-       test.expectedOutput = 'PASS\n' +
-           'amp4email_feature_tests/css_length.html:8:0 Tag \'html\' ' +
-           'marked with attribute \'amp4email\' is missing the corresponding ' +
-           'attribute \'data-css-strict\' for enabling strict CSS ' +
-           'validation. This may become an error in the future. ' +
-           '(see https://github.com/ampproject/amphtml/issues/32587)\n' +
-           'amp4email_feature_tests/css_length.html:7519:6 The author ' +
-           'stylesheet specified in tag \'style amp-custom\' and the ' +
-           'combined inline styles is too large - document contains 75014 ' +
-           'bytes whereas the limit is 75000 bytes. (see https://amp.dev/' +
-           'documentation/guides-and-tutorials/learn/spec/amphtml/' +
-           '#maximum-size)';
-       test.run();
-     });
-});
-
-// Similar to ValidatorTransformedAmpvalidator.CssLengthWithUrls, but for
-// non-transformed AMP, to show that behavior should differ from non-transformed
-// in that URLs are not counted towards the URL length, unless they are data:
-// urls.
-describe('Validator.CssLengthWithUrls', () => {
-  if (process.env['UPDATE_VALIDATOR_TEST'] === '1') {
-    return;
-  }
-  // Rather than encoding some really long author stylesheets in
-  // testcases, which would be difficult to read/verify that the
-  // testcase is valid, we modify a valid testcase
-  // (feature_tests/css_length.html) designed for this purpose in code.
-
-  // We use a blob of length 10 (both bytes and chars) to make it easy to
-  // construct stylesheets of any length that we want.
-  const validStyleBlob = 'h1{top:0}\n';
-  assertStrictEqual(10, validStyleBlob.length);
-
-  it('will accept 75010 bytes in author stylesheet that includes an URL ' +
-         'of 19 bytes',
-     () => {
-       const url = 'http://example.com/';
-       assertStrictEqual(19, url.length);
-       const cssWithUrl = 'a{b:url(\'' + url + '\')';
-       assertStrictEqual(30, cssWithUrl.length);
-       const stylesheet = Array(7499).join(validStyleBlob) + cssWithUrl;
-       // 10 bytes over limit, 19 of which are the URL.
-       assertStrictEqual(75010, stylesheet.length);
-       const test = new ValidatorTestCase('feature_tests/css_length.html');
-       test.inlineOutput = false;
-       test.ampHtmlFileContents =
-           test.ampHtmlFileContents
-               .replace('.replace_amp_custom {}', stylesheet)
-               .replace('replace_inline_style', '');
-       test.expectedOutputFile = null;
-       test.expectedOutput = 'FAIL\n' +
-           'feature_tests/css_length.html:13:2 The author stylesheet ' +
-           'specified in tag \'style amp-custom\' is too long - document ' +
-           'contains 75010 bytes whereas the limit is 75000 bytes. ' +
-           '(see https://amp.dev/documentation/guides-and-tutorials/' +
-           'learn/spec/amphtml/#maximum-size)';
-       test.run();
-     });
-
-  it('will accept 75010 bytes in stylesheet that includes a relative URL ' +
-         'of 19 bytes',
-     () => {
-       const url = 'a-relative-url.html';
-       assertStrictEqual(19, url.length);
-       const cssWithUrl = 'a{b:url(\'' + url + '\')';
-       assertStrictEqual(30, cssWithUrl.length);
-       const stylesheet = Array(7499).join(validStyleBlob) + cssWithUrl;
-       // 10 bytes over limit, 19 of which are the URL.
-       assertStrictEqual(75010, stylesheet.length);
-       const test = new ValidatorTestCase('feature_tests/css_length.html');
-       test.inlineOutput = false;
-       test.ampHtmlFileContents =
-           test.ampHtmlFileContents
-               .replace('.replace_amp_custom {}', stylesheet)
-               .replace('replace_inline_style', '');
-       test.expectedOutputFile = null;
-       test.expectedOutput = 'FAIL\n' +
-           'feature_tests/css_length.html:13:2 The author stylesheet ' +
-           'specified in tag \'style amp-custom\' is too long - document ' +
-           'contains 75010 bytes whereas the limit is 75000 bytes. ' +
-           '(see https://amp.dev/documentation/guides-and-tutorials/' +
-           'learn/spec/amphtml/#maximum-size)';
-       test.run();
-     });
-
-  it('will accept 75010 bytes in stylesheet that includes a data URL ' +
-         'of 19 bytes',
-     () => {
-       const url = 'data:nineteen-bytes';
-       assertStrictEqual(19, url.length);
-       const cssWithUrl = 'a{b:url(\'' + url + '\')';
-       assertStrictEqual(30, cssWithUrl.length);
-       const stylesheet = Array(7499).join(validStyleBlob) + cssWithUrl;
-       // 10 bytes over limit, 19 of which are the URL.
-       assertStrictEqual(75010, stylesheet.length);
-       const test = new ValidatorTestCase('feature_tests/css_length.html');
-       test.inlineOutput = false;
-       test.ampHtmlFileContents =
-           test.ampHtmlFileContents
-               .replace('.replace_amp_custom {}', stylesheet)
-               .replace('replace_inline_style', '');
-       test.expectedOutputFile = null;
-       test.expectedOutput = 'FAIL\n' +
-           'feature_tests/css_length.html:13:2 The author stylesheet ' +
-           'specified in tag \'style amp-custom\' is too long - document ' +
-           'contains 75010 bytes whereas the limit is 75000 bytes. ' +
-           '(see https://amp.dev/documentation/guides-and-tutorials/' +
-           'learn/spec/amphtml/#maximum-size)';
-       test.run();
-     });
-
-  it(`will reject exactly 0 bytes in stylesheet and 75009 bytes inline style, including a relative URL of 19 bytes`,
-     () => {
-       // This string is 33 bytes of inline style inside a B tag.
-       const inline33Bytes =
-           '<b style="color: url(\'a-relative-url.html\')"></b>';
-       // 2273 x 33 = 75009
-       const inlineStyle = Array(2274).join(inline33Bytes);
-       const test = new ValidatorTestCase('feature_tests/css_length.html');
-       test.inlineOutput = false;
-       test.ampHtmlFileContents =
-           test.ampHtmlFileContents.replace('.replace_amp_custom {}', '')
-               .replace('replace_inline_style', inlineStyle);
-       test.expectedOutputFile = null;
-       test.expectedOutput = 'FAIL\n' +
-           'feature_tests/css_length.html:21:6 The author stylesheet specified in tag \'style amp-custom\' and the combined inline styles is too large - document contains 75009 bytes whereas the limit is 75000 bytes. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#maximum-size)';
-       test.run();
-     });
-
-  it(`will reject exactly 0 bytes in stylesheet and 75009 bytes inline style, including a data URL of 19 bytes`,
-     () => {
-       // This string is 33 bytes of inline style inside a B tag.
-       const inline33Bytes =
-           '<b style="color: url(\'data:nineteen-bytes\')"></b>';
-       // 2273 x 33 = 75009
-       const inlineStyle = Array(2274).join(inline33Bytes);
-       const test = new ValidatorTestCase('feature_tests/css_length.html');
-       test.inlineOutput = false;
-       test.ampHtmlFileContents =
-           test.ampHtmlFileContents.replace('.replace_amp_custom {}', '')
-               .replace('replace_inline_style', inlineStyle);
-       test.expectedOutputFile = null;
-       test.expectedOutput = 'FAIL\n' +
-           'feature_tests/css_length.html:21:6 The author stylesheet specified in tag \'style amp-custom\' and the combined inline styles is too large - document contains 75009 bytes whereas the limit is 75000 bytes. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#maximum-size)';
-       test.run();
-     });
-});
-
-describe('ValidatorTransformedAmp.CssLengthWithUrls', () => {
-  if (process.env['UPDATE_VALIDATOR_TEST'] === '1') {
-    return;
-  }
-  // Rather than encoding some really long author stylesheets in
-  // testcases, which would be difficult to read/verify that the
-  // testcase is valid, we modify a valid testcase
-  // (transformed_feature_tests/css_length.html) designed for this
-  // purpose in code.
-
-  // We use a blob of length 10 (both bytes and chars) to make it easy to
-  // construct stylesheets of any length that we want.
-  const validStyleBlob = 'h1{top:0}\n';
-  assertStrictEqual(10, validStyleBlob.length);
-
-  it('will accept 75010 bytes in author stylesheet that includes an URL ' +
-         'of 19 bytes',
-     () => {
-       const url = 'http://example.com/';
-       assertStrictEqual(19, url.length);
-       const cssWithUrl = 'a{b:url(\'' + url + '\')';
-       assertStrictEqual(30, cssWithUrl.length);
-       const stylesheet = Array(7499).join(validStyleBlob) + cssWithUrl;
-       // 10 bytes over limit, 19 of which are the URL.
-       assertStrictEqual(75010, stylesheet.length);
-       const test =
-           new ValidatorTestCase('transformed_feature_tests/css_length.html');
-       test.inlineOutput = false;
-       test.ampHtmlFileContents =
-           test.ampHtmlFileContents
-               .replace('.replace_amp_custom {}', stylesheet)
-               .replace('replace_inline_style', '');
-       test.expectedOutputFile = null;
-       test.expectedOutput = 'PASS';
-       test.run();
-     });
-
-  it('will accept 75010 bytes in stylesheet that includes a relative URL ' +
-         'of 19 bytes',
-     () => {
-       const url = 'a-relative-url.html';
-       assertStrictEqual(19, url.length);
-       const cssWithUrl = 'a{b:url(\'' + url + '\')';
-       assertStrictEqual(30, cssWithUrl.length);
-       const stylesheet = Array(7499).join(validStyleBlob) + cssWithUrl;
-       // 10 bytes over limit, 19 of which are the URL.
-       assertStrictEqual(75010, stylesheet.length);
-       const test =
-           new ValidatorTestCase('transformed_feature_tests/css_length.html');
-       test.inlineOutput = false;
-       test.ampHtmlFileContents =
-           test.ampHtmlFileContents
-               .replace('.replace_amp_custom {}', stylesheet)
-               .replace('replace_inline_style', '');
-       test.expectedOutputFile = null;
-       test.expectedOutput = 'PASS';
-       test.run();
-     });
-
-  it('will accept 75010 bytes in stylesheet that includes a data URL ' +
-         'of 19 bytes',
-     () => {
-       const url = 'data:nineteen-bytes';
-       assertStrictEqual(19, url.length);
-       const cssWithUrl = 'a{b:url(\'' + url + '\')';
-       assertStrictEqual(30, cssWithUrl.length);
-       const stylesheet = Array(7499).join(validStyleBlob) + cssWithUrl;
-       // 10 bytes over limit, 19 of which are the URL.
-       assertStrictEqual(75010, stylesheet.length);
-       const test =
-           new ValidatorTestCase('transformed_feature_tests/css_length.html');
-       test.inlineOutput = false;
-       test.ampHtmlFileContents =
-           test.ampHtmlFileContents
-               .replace('.replace_amp_custom {}', stylesheet)
-               .replace('replace_inline_style', '');
-       test.expectedOutputFile = null;
-       test.expectedOutput = 'FAIL\n' +
-           'transformed_feature_tests/css_length.html:14:2 The author ' +
-           'stylesheet specified in tag \'style amp-custom\' ' +
-           'is too long - document contains 75010 bytes whereas the limit ' +
-           'is 75000 bytes. ' +
-           '(see https://amp.dev/documentation/guides-and-tutorials/' +
-           'learn/spec/amphtml/#maximum-size)';
-       test.run();
-     });
-
-  it(`will reject exactly 0 bytes in stylesheet and 75009 bytes inline style, including a relative URL of 19 bytes`,
-     () => {
-       // This string is 33 bytes of inline style inside a B tag.
-       const inline33Bytes =
-           '<b style="color: url(\'a-relative-url.html\')"></b>';
-       // 2273 x 33 = 75009
-       const inlineStyle = Array(2274).join(inline33Bytes);
-       const test = new ValidatorTestCase('feature_tests/css_length.html');
-       test.inlineOutput = false;
-       test.ampHtmlFileContents =
-           test.ampHtmlFileContents.replace('.replace_amp_custom {}', '')
-               .replace('replace_inline_style', inlineStyle);
-       test.expectedOutputFile = null;
-       test.expectedOutput = 'FAIL\n' +
-           'feature_tests/css_length.html:21:6 The author stylesheet specified in tag \'style amp-custom\' and the combined inline styles is too large - document contains 75009 bytes whereas the limit is 75000 bytes. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#maximum-size)';
-       test.run();
-     });
-
-  it(`will reject exactly 0 bytes in stylesheet and 75009 bytes inline style, including a data URL of 19 bytes`,
-     () => {
-       // This string is 33 bytes of inline style inside a B tag.
-       const inline33Bytes =
-           '<b style="color: url(\'data:nineteen-bytes\')"></b>';
-       // 2273 x 33 = 75009
-       const inlineStyle = Array(2274).join(inline33Bytes);
-       const test = new ValidatorTestCase('feature_tests/css_length.html');
-       test.inlineOutput = false;
-       test.ampHtmlFileContents =
-           test.ampHtmlFileContents.replace('.replace_amp_custom {}', '')
-               .replace('replace_inline_style', inlineStyle);
-       test.expectedOutputFile = null;
-       test.expectedOutput = 'FAIL\n' +
-           'feature_tests/css_length.html:21:6 The author stylesheet specified in tag \'style amp-custom\' and the combined inline styles is too large - document contains 75009 bytes whereas the limit is 75000 bytes. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#maximum-size)';
-       test.run();
-     });
-});
-
-describe('validator.CssLength', () => {
-  if (process.env['UPDATE_VALIDATOR_TEST'] === '1') {
-    return;
-  }
-  it('parses a basic example', () => {
-    const parsed = new validator.CssLength(
-        '10.1em', /* allowAuto */ false, /* allowFluid */ false);
-
-    expect(parsed.isSet).toBe(true);
-    expect(parsed.isValid).toBe(true);
-    expect(parsed.numeral).toEqual(10.1);
-    expect(parsed.unit).toEqual('em');
-    expect(parsed.isAuto).toBe(false);
-  });
-
-  it('supports several units', () => {
-    for (const allowedUnit of ['px', 'em', 'rem', 'vh', 'vmin', 'vmax']) {
-      const example = '10' + allowedUnit;
-      const parsed = new validator.CssLength(
-          example, /* allowAuto */ false, /* allowFluid */ false);
-
-      expect(parsed.isSet).toBe(true);
-      expect(parsed.isValid).toBe(true);
-      expect(parsed.numeral).toEqual(10);
-      expect(parsed.unit).toEqual(allowedUnit);
-      expect(parsed.isAuto).toBe(false);
-    }
-  });
-
-  it('understands empty unit as "px"', () => {
-    const parsed = new validator.CssLength(
-        '10', /* allowAuto */ false, /* allowFluid */ false);
-
-    expect(parsed.isSet).toBe(true);
-    expect(parsed.isValid).toBe(true);
-    expect(parsed.numeral).toEqual(10);
-    expect(parsed.unit).toEqual('px');
-    expect(parsed.isAuto).toBe(false);
-  });
-
-  it('understands undefined input as valid (means attr is not set)', () => {
-    const parsed = new validator.CssLength(
-        undefined, /* allowAuto */ false, /* allowFluid */ false);
-
-    expect(parsed.isSet).toBe(false);
-    expect(parsed.isValid).toBe(true);
-    expect(parsed.unit).toEqual('px');
-    expect(parsed.isAuto).toBe(false);
-  });
-
-  it('understands empty string as invalid (means attr value is empty)', () => {
-    const parsed = new validator.CssLength(
-        '', /* allowAuto */ false, /* allowFluid */ false);
-
-    expect(parsed.isValid).toBe(false);
-  });
-
-  it('considers other garbage as invalid', () => {
-    expect(new validator
-               .CssLength('100%', /* allowAuto */ false, /* allowFluid */ false)
-               .isValid)
-        .toBe(false);
-
-    expect(
-        new validator
-            .CssLength(
-                'not a number', /* allowAuto */ false, /* allowFluid */ false)
-            .isValid)
-        .toBe(false);
-
-    expect(
-        new validator
-            .CssLength('1.1.1', /* allowAuto */ false, /* allowFluid */ false)
-            .isValid)
-        .toBe(false);
-
-    expect(new validator
-               .CssLength(
-                   '5 inches', /* allowAuto */ false, /* allowFluid */ false)
-               .isValid)
-        .toBe(false);
-
-    expect(new validator
-               .CssLength(
-                   'fahrenheit', /* allowAuto */ false, /* allowFluid */ false)
-               .isValid)
-        .toBe(false);
-
-    expect(new validator
-               .CssLength('px', /* allowAuto */ false, /* allowFluid */ false)
-               .isValid)
-        .toBe(false);
-
-    expect(new validator
-               .CssLength(  // screen size in ancient Rome.
-                   'ix unciae', /* allowAuto */ false, /* allowFluid */ false)
-               .isValid)
-        .toBe(false);
-  });
-
-  it('recognizes auto if allowed', () => {
-    {  // allow_auto = false with input != auto
-      const parsed = new validator.CssLength(
-          '1', /* allowAuto */ false, /* allowFluid */ false);
-
-      expect(parsed.isValid).toBe(true);
-      expect(parsed.isAuto).toBe(false);
-    } {// allow_auto = true with input != auto
-       const parsed = new validator.CssLength(
-           '1', /* allowAuto */ true, /* allowFluid */ false);
-
-       expect(parsed.isValid).toBe(true);
-       expect(parsed.isAuto)
-           .toBe(false);} {  // allow_auto = false with input = auto
-      const parsed = new validator.CssLength(
-          'auto', /* allowAuto */ false, /* allowFluid */ false);
-
-      expect(parsed.isValid).toBe(false);
-    } {// allow_auto = true with input = auto
-       const parsed = new validator.CssLength(
-           'auto', /* allowAuto */ true, /* allowFluid */ false);
-
-       expect(parsed.isValid).toBe(true); expect(parsed.isAuto).toBe(true);}
-  });
-
-  it('recognizes fluid if allowed', () => {
-    {  // allow_fluid = false with input != fluid
-      const parsed = new validator.CssLength(
-          '1', /* allowAuto */ false, /* allowFluid */ false);
-
-      expect(parsed.isValid).toBe(true);
-      expect(parsed.isFluid).toBe(false);
-    } {// allow_fluid = true with input != fluid
-       const parsed = new validator.CssLength(
-           '1', /* allowAuto */ false, /* allowFluid */ true);
-
-       expect(parsed.isValid).toBe(true);
-       expect(parsed.isFluid)
-           .toBe(false);} {  // allow_fluid = false with input = fluid
-      const parsed = new validator.CssLength(
-          'fluid', /* allowAuto */ false, /* allowFluid */ false);
-
-      expect(parsed.isValid).toBe(false);
-    } {// allow_fluid = true with input = fluid
-       const parsed = new validator.CssLength(
-           'fluid', /* allowAuto */ false, /* allowFluid */ true);
-
-       expect(parsed.isValid).toBe(true); expect(parsed.isFluid).toBe(true);}
-  });
-});
-
-/**
- * Helper for ValidatorRulesMakeSense.
- * @param {!generated.AttrSpec} attrSpec
- * @param {!generated.TagSpec} tagSpec
- * @param {!generated.ValidatorRules} rules
- */
-function attrRuleShouldMakeSense(attrSpec, tagSpec, rules) {
-  // name
-  it('attr_spec name defined', () => {
-    expect(attrSpec.name).toBeDefined();
-  });
-  it('attr_spec name is lower case', () => {
-    // Attribute Spec names are matched against lowercased attributes,
-    // so the rules *must* also be lower case or non-cased.
-    const attrSpecNameRegex = new RegExp('^[^A-Z]+$');
-
-    expect(attrSpecNameRegex.test(attrSpec.name)).toBe(true);
-  });
-  it('attr_spec name can not be [style]', () => {
-    expect(attrSpec.name).not.toEqual('[style]');
-  });
-  if (attrSpec.valueUrl !== null) {
-    const protocolRegex = new RegExp('[a-z-]+');
-    // UrlSpec protocol is matched against lowercased protocol names
-    // so the rules *must* also be lower case.
-    it('protocol must be lower case', () => {
-      for (const protocol of attrSpec.valueUrl.protocol) {
-        expect(protocolRegex.test(protocol)).toBe(true);
-      }
-    });
-    // If protocol is http then allow_relative should not be false
-    // except for `data-` attributes and email spec.
-    if (!attrSpec.name.startsWith('data-') &&
-        !tagSpec.htmlFormat.includes(generated.HtmlFormat.Code.AMP4EMAIL)) {
-      for (const protocol of attrSpec.valueUrl.protocol) {
-        if ((protocol === 'http') &&
-            (attrSpec.valueUrl.allowRelative !== null)) {
-          it('allow_relative can not be false if protocol is http: ' +
-                 attrSpec.name,
-             () => {
-               expect(attrSpec.valueUrl.allowRelative).toEqual(true);
-             });
-        }
-      }
-    }
-  }
-  if (attrSpec.valueRegex !== null) {
-    it('value_regex valid', () => {
-      const regex = rules.internedStrings[-1 - attrSpec.valueRegex];
-
-      expect(isValidRegex(regex)).toBe(true);
-    });
-    it('value_regex must have unicode named groups', () => {
-      const regex = rules.internedStrings[-1 - attrSpec.valueRegex];
-
-      expect(isMissingUnicodeGroup(regex)).toBe(false);
-    });
-  }
-  if (attrSpec.valueRegexCasei !== null) {
-    it('value_regex_casei valid', () => {
-      const regex = rules.internedStrings[-1 - attrSpec.valueRegexCasei];
-
-      expect(isValidRegex(regex)).toBe(true);
-    });
-    it('value_regex_casei must have unicode named groups', () => {
-      const regex = rules.internedStrings[-1 - attrSpec.valueRegexCasei];
-
-      expect(isMissingUnicodeGroup(regex)).toBe(false);
-    });
-  }
-  if (attrSpec.disallowedValueRegex !== null) {
-    it('disallowed_value_regex valid', () => {
-      const regex = rules.internedStrings[-1 - attrSpec.disallowedValueRegex];
-
-      expect(isValidRegex(regex)).toBe(true);
-    });
-    it('disallowed_value_regex must have unicode named groups', () => {
-      const regex = rules.internedStrings[-1 - attrSpec.disallowedValueRegex];
-
-      expect(isMissingUnicodeGroup(regex)).toBe(false);
-    });
-  }
-  // value_url must have at least one allowed protocol.
-  if (attrSpec.valueUrl !== null) {
-    it('value_url must have at least one protocol', () => {
-      expect(attrSpec.valueUrl.protocol.length).toBeGreaterThan(0);
-    });
-  }
-  // only has one of value set.
-  let numValues = 0;
-  if (attrSpec.value.length > 0) {
-    numValues += 1;
-  }
-  if (attrSpec.valueCasei.length > 0) {
-    numValues += 1;
-  }
-  if (attrSpec.valueRegex !== null) {
-    numValues += 1;
-  }
-  if (attrSpec.valueRegexCasei !== null) {
-    numValues += 1;
-  }
-  if (attrSpec.valueUrl !== null) {
-    numValues += 1;
-  }
-  if (attrSpec.valueProperties !== null) {
-    numValues += 1;
-  }
-  it('attr_spec only has one value set', () => {
-    expect(numValues).toBeLessThan(2);
-  });
-  // `id` attribute must have disallowed_value_regex set if no explicit values.
-  if ((attrSpec.name === 'id') && (numValues === 0)) {
-    it('"id" attribute must have disallowed_value_regex set', () => {
-      expect(attrSpec.disallowedValueRegex !== null).toBe(true);
-    });
-  }
-  // `name` attribute must have disallowed_value_regex set if no explicit
-  // values.
-  if ((attrSpec.name === 'name') && (numValues === 0)) {
-    it('"name" attribute must have disallowed_value_regex set', () => {
-      expect(attrSpec.disallowedValueRegex !== null).toBe(true);
-    });
-  }
-  // deprecation
-  if ((attrSpec.deprecation !== null) || (attrSpec.deprecationUrl !== null)) {
-    it('deprecation and deprecation_url must both be defined if one is defined',
-       () => {
-         expect(attrSpec.deprecation).toBeDefined();
-         expect(attrSpec.deprecationUrl).toBeDefined();
-       });
-  }
-  // dispatch_key
-  if (attrSpec.dispatchKey !== null && attrSpec.dispatchKey) {
-    it('mandatory must be true when dispatch_key is true', () => {
-      expect(attrSpec.mandatory === true || attrSpec.mandatoryOneof !== null)
-          .toBe(true);
-    });
-  }
-  // Value property names must be unique.
-  if (attrSpec.valueProperties !== null) {
-    const seenPropertySpecNames = {};
-    it('value_properties must be unique', () => {
-      for (const propertySpec of attrSpec.valueProperties.properties) {
-        expect(seenPropertySpecNames.hasOwnProperty(propertySpec.name))
-            .toBe(false);
-        seenPropertySpecNames[propertySpec.name] = 0;
-      }
-    });
-  }
-  // Transformed AMP does not allow `nonce` attributes, so it must have
-  // disabled_by: "transformed".
-  if ((attrSpec.name === 'nonce') &&
-      tagSpec.htmlFormat.includes(generated.HtmlFormat.Code.AMP)) {
-    it('nonce attributes must have `disabled_by: "transformed"`', () => {
-      expect(attrSpec.disabledBy.includes('transformed')).toBe(true);
-    });
-  }
-}
-
-/**
- * Helper for typeIdentifiersShouldMakeSense.
- * @param {!Object<string, number>} typeIdentifiers
- * @param {!Array<string>} specTypeIdentifiers
- * @param {string} fieldName
- * @param {string} specType
- * @param {string} specName
- */
-function typeIdentifiersAreValidAndUnique(
-    typeIdentifiers, specTypeIdentifiers, fieldName, specType, specName) {
-  const encounteredTypeIdentifiers = {};
-  for (const typeIdentifier of specTypeIdentifiers) {
-    it(specType + ' \'' + specName + '\' has ' + fieldName +
-           ' set to an invalid type identifier: \'' + typeIdentifier + '\'',
-       () => {
-         expect(typeIdentifiers.hasOwnProperty(typeIdentifier)).toBe(true);
-       });
-    it(specType + ' \'' + specName + '\' has duplicate ' + fieldName + ': \'' +
-           typeIdentifier + '\'.',
-       () => {
-         expect(encounteredTypeIdentifiers.hasOwnProperty(typeIdentifier))
-             .toBe(false);
-         encounteredTypeIdentifiers[typeIdentifier] = 0;
-       });
-  }
-}
-
-/**
- * Helper for ValidatorRulesMakeSense.
- * @param {!generated.TagSpec|!generated.AttrSpec} spec
- * @param {string} specType
- * @param {string} specName
- */
-function typeIdentifiersShouldMakeSense(spec, specType, specName) {
-  const typeIdentifiers = {
-    'amp': 0,
-    'amp4ads': 0,
-    'amp4email': 0,
-    'transformed': 0,
-    'data-css-strict': 0
-  };
-  // both enabled_by and disabled_by must not be set on the same spec.
-  it(specType + ' \'' + specName + '\' has both enabled_by and disabled_by' +
-         ' set and it must be one or the other, not both.',
-     () => {
-       expect((spec.enabledBy.length > 0) && (spec.disabledBy.length > 0))
-           .toBe(false);
-     });
-  // enabled_by must be a valid type identifier and each type identifier
-  // listed at most once.
-  typeIdentifiersAreValidAndUnique(
-      typeIdentifiers, spec.enabledBy, 'enabled_by', specType, specName);
-  // disabled_by must be a valid type identifier and each type identifier
-  // listed at most once.
-  typeIdentifiersAreValidAndUnique(
-      typeIdentifiers, spec.disabledBy, 'disabled_by', specType, specName);
-}
-
-// Test which verifies some constraints on the rules file which the validator
-// depends on, but which proto parser isn't robust enough to verify.
-describe('ValidatorRulesMakeSense', () => {
-  if (process.env['UPDATE_VALIDATOR_TEST'] === '1') {
-    return;
-  }
-  const rules = createRules.createRules();
-
-  // None of these should be empty.
-  it('tags defined', () => {
-    expect(rules.tags.length).toBeGreaterThan(0);
-  });
-
-  it('direct_attr_lists defined', () => {
-    expect(rules.directAttrLists.length).toBeGreaterThan(0);
-  });
-
-  it('global_attrs defined', () => {
-    expect(rules.globalAttrs.length).toBeGreaterThan(0);
-  });
-
-  it('amp_layout_attrs defined', () => {
-    expect(rules.ampLayoutAttrs.length).toBeGreaterThan(0);
-  });
-
-  for (const list of rules.directAttrLists) {
-    for (const index of list) {
-      if (index < 0) {
-        it('attr_spec name can not be [style]', () => {
-          expect(rules.internedStrings[-1 - index]).not.toEqual('[style]');
-        });
-      } else {
-        it('attr_spec name can not be [style]', () => {
-          expect(rules.attrs[index].name).not.toEqual('[style]');
-        });
-      }
-    }
-  }
-
-  for (const index of rules.globalAttrs) {
-    it('attr_spec name can not be [style]', () => {
-      expect(rules.internedStrings[-1 - index]).not.toEqual('[style]');
-    });
-  }
-
-  for (const index of rules.ampLayoutAttrs) {
-    it('attr_spec name can not be [style]', () => {
-      expect(rules.internedStrings[-1 - index]).not.toEqual('[style]');
-    });
-  }
-
-  it('template_spec_url is set', () => {
-    expect(rules.templateSpecUrl).not.toEqual(null);
-  });
-
-  // For verifying that all ReferencePoint::tag_spec_names will resolve to a
-  // generated.TagSpec that's marked REFERENCE_POINT.
-  const allReferencePoints = {};
-  for (const tagSpec of rules.tags) {
-    if (tagSpec.tagName === '$REFERENCE_POINT') {
-      allReferencePoints[tagSpec.specName] = 0;
-    }
-  }
-
-  // tag_specs
-  const specNameIsUnique = {};
-  const namedIdIsUnique = {};
-  const tagWithoutSpecNameIsUnique = {};
-  const tagNameRegex =
-      new RegExp('(!DOCTYPE|O:P|[A-Z0-9-]+|\\$REFERENCE_POINT)');
-  const disallowedAncestorRegex = new RegExp('[A-Z0-9-]+');
-  for (const tagSpec of rules.tags) {
-    // Helper for message output, set a tagspec_name in this order:
-    // 1. tagSpec.specName, 2. tagSpec.tagName, 3. UNKNOWN_TAGSPEC.
-    const tagSpecName =
-        tagSpec.specName || tagSpec.tagName || 'UNKNOWN_TAGSPEC';
-
-    // html_format must be set.
-    it('\'' + tagSpecName + '\' must have at least one htmlFormat set', () => {
-      expect(tagSpec.htmlFormat.length).toBeGreaterThan(0);
-    });
-    // html_format is never UNKNOWN_CODE.
-    it('tagSpec.htmlFormat should never contain UNKNOWN_CODE', () => {
-      expect(tagSpec.htmlFormat.indexOf(generated.HtmlFormat.Code.UNKNOWN_CODE))
-          .toEqual(-1);
-    });
-    // name
-    it('tag_name defined', () => {
-      expect(tagSpec.tagName).toBeDefined();
-      expect(tagNameRegex.test(tagSpec.tagName)).toBe(true);
-    });
-    // spec_name can't be empty and must be unique.
-    it('unique spec_name or if none then unique tag_name', () => {
-      if (tagSpec.specName !== null) {
-        expect(specNameIsUnique.hasOwnProperty(tagSpec.specName)).toBe(false);
-        specNameIsUnique[tagSpec.specName] = 0;
-      } else if (tagSpec.extensionSpec !== null) {
-        const specName = tagSpec.extensionSpec.name + ' ' +
-            tagSpec.extensionSpec.versionName + ' extension script';
-
-        expect(specNameIsUnique.hasOwnProperty(specName)).toBe(false);
-        specNameIsUnique[specName] = 0;
-      } else {
-        expect(tagWithoutSpecNameIsUnique.hasOwnProperty(tagSpec.tagName))
-            .toBe(false);
-        tagWithoutSpecNameIsUnique[tagSpec.tagName] = 0;
-      }
-    });
-    it('reference points must set descriptive_name', () => {
-      if (tagSpec.tagName == '$REFERENCE_POINT') {
-        expect(tagSpec.descriptiveName !== null);
-      }
-    });
-    if ((tagSpec.enabledBy.length > 0) || (tagSpec.disabledBy.length > 0)) {
-      typeIdentifiersShouldMakeSense(tagSpec, 'tag_spec', tagSpecName);
-    }
-    it('unique named_id if present', () => {
-      if (tagSpec.namedId !== null &&
-          tagSpec.namedId !== generated.TagSpec.NamedId.NOT_SET) {
-        expect(namedIdIsUnique.hasOwnProperty(tagSpec.namedId)).toBe(false);
-        namedIdIsUnique[tagSpec.namedId] = 0;
-      }
-    });
-    // Verify AMP4ADS extensions are approved.
-    if ((tagSpec.tagName.indexOf('SCRIPT') === 0) && tagSpec.extensionSpec &&
-        (tagSpec.htmlFormat.indexOf(generated.HtmlFormat.Code.AMP4ADS) !==
-         -1)) {
-      // AMP4ADS format lists approved extensions.
-      // https://github.com/ampproject/amphtml/blob/main/extensions/amp-a4a/amp-a4a-format.md#amp-extensions-and-builtins
-      // Changes to the following map must be approved by the Ads Working
-      // Group, @wg-monetization.
-      const approvedAmp4AdsExtensions = {
-        'amp-accordion': ['0.1', 'latest'],
-        'amp-ad-exit': ['0.1', 'latest'],
-        'amp-analytics': ['0.1', 'latest'],
-        'amp-anim': ['0.1', 'latest'],
-        'amp-animation': ['0.1', 'latest'],
-        'amp-audio': ['0.1', 'latest'],
-        'amp-bind': ['0.1', 'latest'],
-        'amp-carousel': ['0.1', '0.2', 'latest'],
-        'amp-fit-text': ['0.1', 'latest'],
-        'amp-font': ['0.1', 'latest'],
-        'amp-form': ['0.1', 'latest'],
-        'amp-gwd-animation': ['0.1', 'latest'],
-        'amp-img': ['0.1', 'latest'],
-        'amp-layout': ['0.1', 'latest'],
-        'amp-lightbox': ['0.1', 'latest'],
-        'amp-mraid': ['0.1', 'latest'],
-        'amp-mustache': ['0.1', '0.2', 'latest'],
-        'amp-pixel': ['0.1', 'latest'],
-        'amp-position-observer': ['0.1', 'latest'],
-        'amp-selector': ['0.1', 'latest'],
-        'amp-social-share': ['0.1', 'latest'],
-        'amp-video': ['0.1', 'latest'],
-      };
-      // Verify extension is approved.
-      const extension = tagSpec.extensionSpec.name;
-      it(extension + ' has html_format either explicitly or implicitly' +
-             ' set for AMP4ADS but ' + extension + ' is not approved' +
-             ' for AMP4ADS',
-         () => {
-           expect(approvedAmp4AdsExtensions.hasOwnProperty(extension))
-               .toBe(true);
-         });
-      // Extension is approved. Verify extension version is approved.
-      if (approvedAmp4AdsExtensions.hasOwnProperty(extension)) {
-        for (const version of tagSpec.extensionSpec.version) {
-          it(extension + ' has html_format either explicitly or implicitly' +
-                 ' set for AMP4ADS but ' + extension + ' version ' + version +
-                 ' is not approved for AMP4ADS. If this version is intended' +
-                 ' for AMP4ADS please get approval from @wg-monetization and then' +
-                 ' update this test. Otherwise remove the version for' +
-                 ' AMP4ADS from the tagspec',
-             () => {
-               expect(approvedAmp4AdsExtensions[extension].indexOf(version))
-                   .toBeGreaterThan(-1);
-             });
-        }
-      }
-    }
-    // Verify AMP4EMAIL extensions and their usage are approved.
-    if ((tagSpec.tagName.indexOf('AMP-') === 0) &&
-        (tagSpec.htmlFormat.indexOf(generated.HtmlFormat.Code.AMP4EMAIL) !==
-         -1)) {
-      // AMP4EMAIL format lists approved extensions.
-      // Changes to the following map must be approved by the AMP4Email
-      // Working Group, @wg-amp4email.
-      const approvedAmp4EmailExtensions = {
-        'AMP-ACCORDION': ['0.1'],
-        'AMP-AUTOCOMPLETE': ['0.1'],
-        'AMP-ANIM': ['0.1'],
-        'AMP-BIND-MACRO': ['0.1'],
-        'AMP-CAROUSEL': ['0.1'],
-        'AMP-FIT-TEXT': ['0.1'],
-        'AMP-IMG': ['0.1'],
-        'AMP-IMAGE-LIGHTBOX': ['0.1'],
-        'AMP-LAYOUT': ['0.1'],
-        'AMP-LIGHTBOX': ['0.1'],
-        'AMP-LIST': ['0.1'],
-        'AMP-SELECTOR': ['0.1'],
-        'AMP-SIDEBAR': ['0.1'],
-        'AMP-STATE': ['0.1'],
-        'AMP-TIMEAGO': ['0.1'],
-      };
-      // Verify extension and it's usage is approved.
-      it(tagSpec.tagName + ' has html_format either explicitly or implicitly' +
-             ' set for AMP4EMAIL but ' + tagSpec.tagName +
-             ' is not approved for AMP4EMAIL',
-         () => {
-           expect(approvedAmp4EmailExtensions.hasOwnProperty(tagSpec.tagName))
-               .toBe(true);
-         });
-      // Extension is approved. Verify extension version is approved.
-      // Only care about SCRIPT tags since only those are versioned.
-      if ((tagSpec.tagName.indexOf('SCRIPT') === 0) && tagSpec.extensionSpec &&
-          approvedAmp4EmailExtensions.hasOwnProperty(
-              tagSpec.extensionSpec.name)) {
-        const extension = tagSpec.extensionSpec.name;
-        for (const version of tagSpec.extensionSpec.version) {
-          it(extension + ' has html_format either explicitly or implicitly' +
-                 ' set for AMP4EMAIL but ' + extension + ' version ' + version +
-                 ' is not approved for AMP4EMAIL. If this version is intended' +
-                 ' for AMP4EMAIL please get approval from @wg-amp4email and' +
-                 ' then update this test. Otherwise remove the version for' +
-                 ' AMP4EMAIL from the tagspec',
-             () => {
-               expect(approvedAmp4EmailExtensions[extension].indexOf(version))
-                   .toBeGreaterThan(-1);
-             });
-        }
-      }
-    }
-    // disallowed_ancestor must be a upper case alphabetic name.
-    it('disallowed_ancestor defined and not equal to mandatory parent', () => {
-      for (const disallowedAncestor of tagSpec.disallowedAncestor) {
-        expect(disallowedAncestorRegex.test(disallowedAncestor)).toBe(true);
-        // Can't disallow an ancestor and require the same parent.
-        if (tagSpec.mandatoryParent !== null) {
-          expect(disallowedAncestor).not.toEqual(tagSpec.mandatoryParent);
-        }
-      }
-    });
-    // Can't have unique and unique_warning at the same time.
-    it('unique and unique_warning can not be defined at the same time', () => {
-      expect(tagSpec.unique && tagSpec.uniqueWarning).toBe(false);
-    });
-
-    // When explicit_attrs_only is true, then amp_layout must not be set.
-    if (tagSpec.explicitAttrsOnly) {
-      it('\'' + tagSpecName + '\' has explicit_attrs_only set to true ' +
-             'and must not have any amp_layouts',
-         () => {
-           expect(tagSpec.ampLayout === null).toBe(true);
-         });
-    }
-
-    // attr_specs within tag.
-    const attrNameIsUnique = {};
-    for (const attrSpecId of tagSpec.attrs) {
-      if (attrSpecId < 0) {
-        const attrName = rules.internedStrings[-1 - attrSpecId];
-        it('unique attr_name within tag_spec \'' + tagSpecName + '\'', () => {
-          expect(attrNameIsUnique.hasOwnProperty(attrName)).toBe(false);
-          attrNameIsUnique[attrName] = 0;
-        });
-        // Transformed AMP does not allow `nonce` attributes, so it must have
-        // disabled_by: "transformed" on the attrSpec or the tagSpec. Since this
-        // attribute does not have an attrSpec then it must be on the tagSpec.
-        // Verify that it is set on the tagSpec.
-        if ((attrName === 'nonce') &&
-            tagSpec.htmlFormat.includes(generated.HtmlFormat.Code.AMP)) {
-          it('nonce attributes must have `disabled_by: "transformed"`', () => {
-            expect(tagSpec.disabledBy.includes('transformed')).toBe(true);
-          });
-        }
-        continue;
-      }
-      const attrSpec = rules.attrs[attrSpecId];
-
-      // attr_name must be unique within tag_spec (no duplicates).
-      it('unique attr_spec within tag_spec', () => {
-        expect(attrSpec.name).toBeDefined();
-        expect(attrNameIsUnique.hasOwnProperty(attrSpec.name)).toBe(false);
-        attrNameIsUnique[attrSpec.name] = 0;
-      });
-      if ((attrSpec.enabledBy.length > 0) || (attrSpec.disabledBy.length > 0)) {
-        typeIdentifiersShouldMakeSense(attrSpec, 'attr_spec', attrSpec.name);
-      }
-      // Special check that every <script> tag with a src attribute has a
-      // allowlist check on the attribute value.
-      if (tagSpec.tagName === 'SCRIPT' && attrSpec.name === 'src') {
-        it('every <script> tag with a src attribute has a allowlist check',
-           () => {
-             expect(attrSpec.value.length > 0 || attrSpec.valueRegex !== null)
-                 .toBe(true);
-           });
-      }
-    }
-
-    // generated.TagSpecs with an ExtensionSpec are extensions. We have a few
-    // additional checks for these.
-    if (tagSpec.extensionSpec !== null) {
-      const {extensionSpec} = tagSpec;
-      const versionRegexp = /^(latest|[0-9]+[.][0-9]+)$/;
-      it('extension must have a name field value', () => {
-        expect(extensionSpec.name).toBeDefined();
-      });
-      // AMP4EMAIL extensions must support at least one version.
-      if (tagSpec.htmlFormat.includes(generated.HtmlFormat.Code.AMP4EMAIL)) {
-        it('extension ' + extensionSpec.name + ' must have at least one ' +
-               'version',
-           () => {
-             expect(extensionSpec.version.length).toBeGreaterThan(0);
-           });
-      }
-      it('extension ' + extensionSpec.name + ' versions must be `latest` ' +
-             'or a numeric value',
-         () => {
-           for (const versionString of extensionSpec.version) {
-             expect(versionString).toMatch(versionRegexp);
-           }
-           for (const versionString of extensionSpec.deprecatedVersion) {
-             expect(versionString).toMatch(versionRegexp);
-           }
-         });
-      it('extension ' + extensionSpec.name + ' deprecated_version must be ' +
-             'subset of version',
-         () => {
-           for (const versionString of extensionSpec.deprecatedVersion) {
-             expect(extensionSpec.version).toContain(versionString);
-           }
-         });
-      it('extension ' + extensionSpec.name + ' must include the ' +
-             'attr_list: "common-extension-attrs"` attr_list ',
-         () => {
-           expect(tagSpec.attrLists.length).toEqual(1);
-           // TODO: what we'd like to verify here is that this AttrList is named
-           // 'common-extension-attrs'.  Unfortunately that information isn't
-           // available to us: we just have an index into
-           // Context.rules_.parsedAttrSpecs_.
-           // getNameByAttrSpecId() looks like it would do what we want, but
-           // it's sufficiently wrapped in private context inside the validator
-           // that I don't see a way to call it.  For now just gold the current
-           // index.
-           expect(tagSpec.attrLists[0]).toEqual(17);
-         });
-    }
-
-    // cdata
-    if (tagSpec.cdata !== null) {
-      let usefulCdataSpec = false;
-      // max_bytes
-      it('max_bytes are greater than or equal to -2', () => {
-        expect(tagSpec.cdata.maxBytes).toBeGreaterThan(-3);
-      });
-      if (tagSpec.cdata.maxBytes >= 0) {
-        usefulCdataSpec = true;
-        it('max_bytes > 0 must have max_bytes_spec_url defined', () => {
-          expect(tagSpec.cdata.maxBytesSpecUrl).toBeDefined();
-        });
-      }
-      // disallowed_cdata_regex
-      for (const disallowedCdataRegex of tagSpec.cdata.disallowedCdataRegex) {
-        it('disallowed_cdata_regex valid and error_message defined', () => {
-          usefulCdataSpec = true;
-
-          expect(disallowedCdataRegex.regex).toBeDefined();
-          expect(isValidRegex(disallowedCdataRegex.regex)).toBe(true);
-          expect(disallowedCdataRegex.errorMessage).toBeDefined();
-        });
-        it('disallowed_cdata_regex must have unicode named groups', () => {
-          const regex = rules.internedStrings[-1 - disallowedCdataRegex.regex];
-
-          expect(isMissingUnicodeGroup(regex)).toBe(false);
-        });
-      }
-
-      // css_spec
-      if (tagSpec.cdata.cssSpec !== null) {
-        usefulCdataSpec = true;
-        const atRuleSpecNameIsUnique = {};
-        const atRuleSpecRegex = new RegExp('[a-z-_]*');
-        const parsingSpec = validator.GenCssParsingConfig().atRuleSpec;
-        for (const atRuleSpec of tagSpec.cdata.cssSpec.atRuleSpec) {
-          // Must be a lower case alphabetic name.
-          it('at_rule_spec must be lower case alphabetic', () => {
-            expect(atRuleSpecRegex.test(atRuleSpec.name)).toBe(true);
-          });
-          it('at_rule_spec must have matching css parsing spec', () => {
-            // If this fails, you probably need to update the mapping in
-            // GenCssParsingConfig to add support for your new at rule.
-            expect(parsingSpec[atRuleSpec.name]).toBeDefined();
-          });
-          if (atRuleSpec.mediaQuerySpec !== null) {
-            it('only media atrule contains mediaQuerySpec', () => {
-              expect(atRuleSpec.name === 'media');
-            });
-          }
-          it('unique at_rule_spec name', () => {
-            expect(atRuleSpecNameIsUnique.hasOwnProperty(atRuleSpec.name))
-                .toBe(false);
-            atRuleSpecNameIsUnique[atRuleSpec.name] = 0;
-          });
-        }
-      }
-
-      if (tagSpec.tagName === 'SCRIPT' || tagSpec.tagName === 'STYLE') {
-        it('script and style tags must have cdata rules', () => {
-          expect(
-              (tagSpec.cdata.disallowedCdataRegex.length > 0) ||
-              tagSpec.cdata.cdataRegex !== null ||
-              tagSpec.cdata.mandatoryCdata !== null ||
-              tagSpec.cdata.maxBytes === -1 ||
-              tagSpec.cdata.whitespaceOnly !== null ||
-              tagSpec.cdata.cssSpec.validateKeyframes)
-              .toBe(true);
-        });
-      }
-      // We want to be certain not to allow SCRIPT tagspecs which don't either
-      // define a src attribute OR define a JSON, OCTET-STREAM, or TEXT/PLAIN
-      // type. Note that OCTET-STREAM scripts can only be used during SwG
-      // Encryption (go/swg-encryption).
-      if (tagSpec.tagName === 'SCRIPT') {
-        let hasSrc = false;
-        let hasJson = false;
-        let hasTextPlain = false;
-        let hasOctetStream = false;
-        let hasCiphertext = false;
-        let hasAmpOnerror = false;
-        for (const attrSpecId of tagSpec.attrs) {
-          if (attrSpecId < 0) {
-            continue;
-          }
-          const attrSpec = rules.attrs[attrSpecId];
-          if (attrSpec.name === 'src') {
-            hasSrc = true;
-          }
-          if (attrSpec.name === 'ciphertext') {
-            hasCiphertext = true;
-          }
-          if (attrSpec.name === 'type' && attrSpec.valueCasei.length > 0) {
-            for (const value of attrSpec.valueCasei) {
-              if (value === 'application/ld+json' ||
-                  value === 'application/json') {
-                hasJson = true;
-              }
-              if (value === 'application/octet-stream') {
-                hasOctetStream = true;
-              }
-              if (value == 'text/plain') {
-                hasTextPlain = true;
-              }
-            }
-          }
-          if (attrSpec.name === 'amp-onerror') {
-            hasAmpOnerror = true;
-          }
-        }
-        it('script tags must have either a src attribute or type json, ' +
-               'octet-stream (during SwG encryption), or text/plain',
-           () => {
-             expect(
-                 hasSrc || hasJson || hasTextPlain ||
-                 (hasOctetStream && hasCiphertext) || hasAmpOnerror)
-                 .toBe(true);
-           });
-      }
-      // cdata_regex and mandatory_cdata
-      if ((tagSpec.cdata.cdataRegex !== null) ||
-          (tagSpec.cdata.mandatoryCdata !== null)) {
-        usefulCdataSpec = true;
-      }
-      it('a cdata spec must be defined', () => {
-        expect(usefulCdataSpec).toBeDefined();
-      });
-      it('cdata_regex must have unicode named groups', () => {
-        const regex = rules.internedStrings[-1 - tagSpec.cdata.cdataRegex];
-
-        expect(isMissingUnicodeGroup(regex)).toBe(false);
-      });
-
-      // reference_points
-      it('reference_point defined', () => {
-        for (const referencePoint of tagSpec.referencePoints) {
-          expect(allReferencePoints.hasOwnProperty(referencePoint.tagSpecName))
-              .toBe(true);
-        }
-      });
-    }
-    // attr_specs within each tag_spec within rules.
-    for (const attrSpecId of tagSpec.attrs) {
-      if (attrSpecId < 0) {
-        continue;
-      }
-      const attrSpec = rules.attrs[attrSpecId];
-      attrRuleShouldMakeSense(attrSpec, tagSpec, rules);
-    }
-  }
-
-  // satisfies needs to match up with requires and excludes
-  const allSatisfies = [];
-  const allRequiresAndExcludes = [];
-  for (const tagSpec of rules.tags) {
-    for (const condition of tagSpec.requires) {
-      allRequiresAndExcludes.push(condition);
-    }
-    for (const condition of tagSpec.excludes) {
-      allRequiresAndExcludes.push(condition);
-    }
-    for (const condition of tagSpec.satisfies) {
-      allSatisfies.push(condition);
-    }
-  }
-  validator.sortAndUniquify(allSatisfies);
-  validator.sortAndUniquify(allRequiresAndExcludes);
-  it('all conditions are both required and satisfied', () => {
-    expect(validator.subtractDiff(allSatisfies, allRequiresAndExcludes))
-        .toEqual([]);
-    expect(validator.subtractDiff(allRequiresAndExcludes, allSatisfies))
-        .toEqual([]);
-  });
-
-  // Verify that for every error code in our enum, we have exactly one format
-  // and specificity value in the rules.
-  const errorSpecificityIsUnique = {};
-  it('Two specificity rules found for same error code', () => {
-    for (const errorSpecificity of rules.errorSpecificity) {
-      expect(errorSpecificityIsUnique.hasOwnProperty(errorSpecificity.code))
-          .toBe(false);
-      errorSpecificityIsUnique[errorSpecificity.code] = 0;
-    }
-  });
-
-  const errorFormatIsUnique = {};
-  it('Two error format string rules found for same error code', () => {
-    for (const errorFormat of rules.errorFormats) {
-      expect(errorFormatIsUnique.hasOwnProperty(errorFormat.code)).toBe(false);
-      errorFormatIsUnique[errorFormat.code] = 0;
-    }
-  });
-});
diff --git a/validator/js/gulpjs/README.md b/validator/js/gulpjs/README.md
index 5764aab51778..69a4c55a6f17 100644
--- a/validator/js/gulpjs/README.md
+++ b/validator/js/gulpjs/README.md
@@ -56,7 +56,7 @@ To treat warnings as errors, replace the last line of the validation closure wit
 
 ### 1.0.3
 
--   Remove engine section from pacakge.json to allow any version of gulpjs.
+-   Remove engine section from package.json to allow any version of gulpjs.
 
 ### 1.0.2
 
diff --git a/validator/js/gulpjs/package-lock.json b/validator/js/gulpjs/package-lock.json
new file mode 100644
index 000000000000..9a278c2b1124
--- /dev/null
+++ b/validator/js/gulpjs/package-lock.json
@@ -0,0 +1,5161 @@
+{
+  "name": "gulp-amphtml-validator",
+  "version": "1.0.8",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "gulp-amphtml-validator",
+      "version": "1.0.8",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "amphtml-validator": "1.0.38",
+        "kleur": "4.1.5",
+        "through2": "4.0.2"
+      },
+      "devDependencies": {
+        "gulp": "4.0.2",
+        "mocha": "10.2.0"
+      }
+    },
+    "node_modules/amphtml-validator": {
+      "version": "1.0.38",
+      "resolved": "https://registry.npmjs.org/amphtml-validator/-/amphtml-validator-1.0.38.tgz",
+      "integrity": "sha512-TqGeHVRUEsMiJoaRvMhzZBv8oljLhhJgzkaPX/zT2eJFG5FLeaMehd6riNwsuMmi9e/5xsI0pocbTgN/u2sonQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "colors": "1.4.0",
+        "commander": "12.0.0",
+        "promise": "8.3.0"
+      },
+      "bin": {
+        "amphtml-validator": "cli.js"
+      }
+    },
+    "node_modules/ansi-colors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-wrap": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ansi-gray": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
+      "integrity": "sha512-HrgGIZUl8h2EHuZaU9hTR/cU5nhKxpVE1V6kdGsQ8e4zirElJ5fvtfc8N7Q1oq1aatO275i8pUFUCpNWCAnVWw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-wrap": "0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/ansi-wrap": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
+      "integrity": "sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/anymatch": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
+      }
+    },
+    "node_modules/anymatch/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/append-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz",
+      "integrity": "sha512-WLbYiXzD3y/ATLZFufV/rZvWdZOs+Z/+5v1rBZ463Jn398pa6kcde27cvozYnBoxXblGZTFfoPpsaEw0orU5BA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "buffer-equal": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/archy": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
+      "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "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,
+      "license": "Python-2.0"
+    },
+    "node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arr-filter": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz",
+      "integrity": "sha512-A2BETWCqhsecSvCkWAeVBFLH6sXEUGASuzkpjL3GR1SlL/PWL6M3J8EAAld2Uubmh39tvkJTqC9LeLHCUKmFXA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "make-iterator": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arr-map": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz",
+      "integrity": "sha512-tVqVTHt+Q5Xb09qRkbu+DidW1yYzz5izWS2Xm2yFm7qJnmUfz4HPzNxbHkdRJbz2lrqI7S+z17xNYdFcBBO8Hw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "make-iterator": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-each": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
+      "integrity": "sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-initial": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz",
+      "integrity": "sha512-BC4Yl89vneCYfpLrs5JU2aAu9/a+xWbeKhvISg9PT7eWFB9UlRvI+rKEtk6mgxWr3dSkk9gQ8hCrdqt06NXPdw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "array-slice": "^1.0.0",
+        "is-number": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-initial/node_modules/is-number": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+      "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-last": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz",
+      "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-number": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-last/node_modules/is-number": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+      "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-slice": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
+      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-sort": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz",
+      "integrity": "sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "default-compare": "^1.0.0",
+        "get-value": "^2.0.6",
+        "kind-of": "^5.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/asap": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+      "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==",
+      "license": "MIT"
+    },
+    "node_modules/assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/async-done": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz",
+      "integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.2",
+        "process-nextick-args": "^2.0.0",
+        "stream-exhaust": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/async-each": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.6.tgz",
+      "integrity": "sha512-c646jH1avxr+aVpndVMeAfYw7wAa6idufrlN3LPA4PmKS0QEGp6PIC9nwz0WQkkvBGAMEki3pFdtxaF39J9vvg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/async-settle": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz",
+      "integrity": "sha512-VPXfB4Vk49z1LHHodrEQ6Xf7W4gg1w0dAPROHngx7qgDjqmIQ+fXmwgGXTW/ITLai0YLSvWepJOP9EVpMnEAcw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "async-done": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+      "dev": true,
+      "license": "(MIT OR Apache-2.0)",
+      "bin": {
+        "atob": "bin/atob.js"
+      },
+      "engines": {
+        "node": ">= 4.5.0"
+      }
+    },
+    "node_modules/bach": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz",
+      "integrity": "sha512-bZOOfCb3gXBXbTFXq3OZtGR88LwGeJvzu6szttaIzymOTS4ZttBNOWSv7aLZja2EMycKtRYV0Oa8SNKH/zkxvg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "arr-filter": "^1.1.1",
+        "arr-flatten": "^1.0.1",
+        "arr-map": "^2.0.0",
+        "array-each": "^1.0.0",
+        "array-initial": "^1.0.0",
+        "array-last": "^1.1.1",
+        "async-done": "^1.2.2",
+        "async-settle": "^1.0.0",
+        "now-and-later": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "dev": true,
+      "license": "MIT",
+      "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"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/base/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/binary-extensions": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
+    "node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "license": "MIT",
+      "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"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/browser-stdout": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/buffer-equal": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.1.tgz",
+      "integrity": "sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "dev": true,
+      "license": "MIT",
+      "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"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/camelcase": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+      "integrity": "sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/chalk/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/chokidar": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+      "deprecated": "Chokidar 2 does not receive security updates since 2019. Upgrade to chokidar 3 with 15x fewer dependencies",
+      "dev": true,
+      "license": "MIT",
+      "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"
+      }
+    },
+    "node_modules/class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/is-descriptor": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/cliui": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+      "integrity": "sha512-0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wrap-ansi": "^2.0.0"
+      }
+    },
+    "node_modules/clone": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+      "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/clone-buffer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
+      "integrity": "sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/clone-stats": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
+      "integrity": "sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cloneable-readable": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
+      "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "process-nextick-args": "^2.0.0",
+        "readable-stream": "^2.3.5"
+      }
+    },
+    "node_modules/code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/collection-map": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz",
+      "integrity": "sha512-5D2XXSpkOnleOI21TG7p3T0bGAsZ/XknZpKBmGYyluO8pw4zA3K8ZlrBIbC4FXg3m6z/RNFiUFfT2sQK01+UHA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "arr-map": "^2.0.2",
+        "for-own": "^1.0.0",
+        "make-iterator": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/color-support": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
+      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "color-support": "bin.js"
+      }
+    },
+    "node_modules/colors": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.1.90"
+      }
+    },
+    "node_modules/commander": {
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-12.0.0.tgz",
+      "integrity": "sha512-MwVNWlYjDTtOjX5PiD7o5pK0UrFU/OYgcJfjjK4RaHZETNtjJqrZa9Y9ds88+A+f+d5lv+561eZ+yCKoS3gbAA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/component-emitter": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz",
+      "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "dev": true,
+      "engines": [
+        "node >= 0.8"
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      }
+    },
+    "node_modules/convert-source-map": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/copy-descriptor": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/copy-props": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.5.tgz",
+      "integrity": "sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "each-props": "^1.3.2",
+        "is-plain-object": "^5.0.0"
+      }
+    },
+    "node_modules/core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/d": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.2.tgz",
+      "integrity": "sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "es5-ext": "^0.10.64",
+        "type": "^2.7.2"
+      },
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/decode-uri-component": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/default-compare": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz",
+      "integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "kind-of": "^5.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/default-resolution": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz",
+      "integrity": "sha512-2xaP6GiwVwOEbXCGoJ4ufgC76m8cj805jrghScewJC2ZDsb9U0b4BIrba+xt/Uytyd0HvQ6+WymSRTfnYj59GQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/define-properties": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "define-data-property": "^1.0.1",
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/define-property": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/detect-file": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
+      "integrity": "sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/diff": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
+      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/duplexify": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "end-of-stream": "^1.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "node_modules/each-props": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz",
+      "integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-plain-object": "^2.0.1",
+        "object.defaults": "^1.1.0"
+      }
+    },
+    "node_modules/each-props/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/es-define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es5-ext": {
+      "version": "0.10.64",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.64.tgz",
+      "integrity": "sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "ISC",
+      "dependencies": {
+        "es6-iterator": "^2.0.3",
+        "es6-symbol": "^3.1.3",
+        "esniff": "^2.0.1",
+        "next-tick": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/es6-iterator": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+      "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "d": "1",
+        "es5-ext": "^0.10.35",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "node_modules/es6-symbol": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.4.tgz",
+      "integrity": "sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "d": "^1.0.2",
+        "ext": "^1.7.0"
+      },
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/es6-weak-map": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
+      "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "d": "1",
+        "es5-ext": "^0.10.46",
+        "es6-iterator": "^2.0.3",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
+      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "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==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/esniff": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz",
+      "integrity": "sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "d": "^1.0.1",
+        "es5-ext": "^0.10.62",
+        "event-emitter": "^0.3.5",
+        "type": "^2.7.2"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/event-emitter": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+      "integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "d": "1",
+        "es5-ext": "~0.10.14"
+      }
+    },
+    "node_modules/expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
+      "dev": true,
+      "license": "MIT",
+      "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"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/is-descriptor": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/expand-tilde": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
+      "integrity": "sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "homedir-polyfill": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ext": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz",
+      "integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "type": "^2.7.2"
+      }
+    },
+    "node_modules/extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "license": "MIT",
+      "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"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fancy-log": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
+      "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-gray": "^0.1.1",
+        "color-support": "^1.1.3",
+        "parse-node-version": "^1.0.0",
+        "time-stamp": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz",
+      "integrity": "sha512-Ia0sQNrMPXXkqVFt6w6M1n1oKo3NfKs+mvaV811Jwir7vAk9a6PVV9VPYf6X3BU97QiLEmuW3uXH9u87zDFfdw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "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==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/findup-sync": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
+      "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "detect-file": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "micromatch": "^3.0.4",
+        "resolve-dir": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/fined": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
+      "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "expand-tilde": "^2.0.2",
+        "is-plain-object": "^2.0.3",
+        "object.defaults": "^1.1.0",
+        "object.pick": "^1.2.0",
+        "parse-filepath": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/fined/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/flagged-respawn": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
+      "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "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,
+      "license": "BSD-3-Clause",
+      "bin": {
+        "flat": "cli.js"
+      }
+    },
+    "node_modules/flush-write-stream": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.3.6"
+      }
+    },
+    "node_modules/for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/for-own": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
+      "integrity": "sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "for-in": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fragment-cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "map-cache": "^0.2.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fs-mkdirp-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
+      "integrity": "sha512-+vSd9frUnapVC2RZYfL3FCB2p3g4TBhaUmrsWlSudsGdnxIuUvBB2QM1VZeBtc49QFwrp+wQLrDs3+xxDgI5gQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.1.11",
+        "through2": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/fs-mkdirp-stream/node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/fsevents": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+      "deprecated": "The v1 package contains DANGEROUS / INSECURE binaries. Upgrade to safe fsevents v2",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "dependencies": {
+        "bindings": "^1.5.0",
+        "nan": "^2.12.1"
+      },
+      "engines": {
+        "node": ">= 4.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "license": "ISC",
+      "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"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      }
+    },
+    "node_modules/glob-parent/node_modules/is-glob": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+      "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-stream": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz",
+      "integrity": "sha512-uMbLGAP3S2aDOHUDfdoYcdIePUCfysbAd0IAoWVZbeGU/oNQ8asHVSshLDJUPWxfzj8zsCG7/XeHPHTtow0nsw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "extend": "^3.0.0",
+        "glob": "^7.1.1",
+        "glob-parent": "^3.1.0",
+        "is-negated-glob": "^1.0.0",
+        "ordered-read-streams": "^1.0.0",
+        "pumpify": "^1.3.5",
+        "readable-stream": "^2.1.5",
+        "remove-trailing-separator": "^1.0.1",
+        "to-absolute-glob": "^2.0.0",
+        "unique-stream": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/glob-watcher": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.5.tgz",
+      "integrity": "sha512-zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "anymatch": "^2.0.0",
+        "async-done": "^1.2.0",
+        "chokidar": "^2.0.0",
+        "is-negated-glob": "^1.0.0",
+        "just-debounce": "^1.0.0",
+        "normalize-path": "^3.0.0",
+        "object.defaults": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/glob/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/glob/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/global-modules": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
+      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "global-prefix": "^1.0.1",
+        "is-windows": "^1.0.1",
+        "resolve-dir": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/global-prefix": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
+      "integrity": "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "expand-tilde": "^2.0.2",
+        "homedir-polyfill": "^1.0.1",
+        "ini": "^1.3.4",
+        "is-windows": "^1.0.1",
+        "which": "^1.2.14"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glogg": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
+      "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "sparkles": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "get-intrinsic": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/gulp": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz",
+      "integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "glob-watcher": "^5.0.3",
+        "gulp-cli": "^2.2.0",
+        "undertaker": "^1.2.1",
+        "vinyl-fs": "^3.0.0"
+      },
+      "bin": {
+        "gulp": "bin/gulp.js"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/gulp-cli": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz",
+      "integrity": "sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-colors": "^1.0.1",
+        "archy": "^1.0.0",
+        "array-sort": "^1.0.0",
+        "color-support": "^1.1.3",
+        "concat-stream": "^1.6.0",
+        "copy-props": "^2.0.1",
+        "fancy-log": "^1.3.2",
+        "gulplog": "^1.0.0",
+        "interpret": "^1.4.0",
+        "isobject": "^3.0.1",
+        "liftoff": "^3.1.0",
+        "matchdep": "^2.0.0",
+        "mute-stdout": "^1.0.0",
+        "pretty-hrtime": "^1.0.0",
+        "replace-homedir": "^1.0.0",
+        "semver-greatest-satisfied-range": "^1.1.0",
+        "v8flags": "^3.2.0",
+        "yargs": "^7.1.0"
+      },
+      "bin": {
+        "gulp": "bin/gulp.js"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/gulplog": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
+      "integrity": "sha512-hm6N8nrm3Y08jXie48jsC55eCZz9mnb4OirAStEk2deqeyhXU3C1otDVh+ccttMuc1sBi6RX6ZJ720hs9RCvgw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "glogg": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-define-property": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-proto": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
+      "dev": true,
+      "license": "MIT",
+      "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,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values/node_modules/kind-of": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+      "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "he": "bin/he"
+      }
+    },
+    "node_modules/homedir-polyfill": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
+      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "parse-passwd": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hosted-git-info": {
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "license": "ISC"
+    },
+    "node_modules/ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/interpret": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
+      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/invert-kv": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+      "integrity": "sha512-xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-absolute": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
+      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-relative": "^1.0.0",
+        "is-windows": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-accessor-descriptor": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz",
+      "integrity": "sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/is-binary-path": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+      "integrity": "sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "binary-extensions": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/is-core-module": {
+      "version": "2.15.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.0.tgz",
+      "integrity": "sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-data-descriptor": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz",
+      "integrity": "sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/is-descriptor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+      "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "number-is-nan": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-negated-glob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
+      "integrity": "sha512-czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-plain-obj": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-plain-object": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-relative": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
+      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-unc-path": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-unc-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
+      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "unc-path-regex": "^0.1.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-unicode-supported": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-utf8": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+      "integrity": "sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/is-valid-glob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
+      "integrity": "sha512-AhiROmoEFDSsjx8hW+5sGwgKVIORcXnrlAx/R0ZSeaPw70Vw0CqkGBBhHGL58Uox2eXnU1AnvXJl1XlyedO5bA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "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,
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "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==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/just-debounce": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.1.0.tgz",
+      "integrity": "sha512-qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/kind-of": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/kleur": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz",
+      "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/last-run": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
+      "integrity": "sha512-U/VxvpX4N/rFvPzr3qG5EtLKEnNI0emvIQB3/ecEwv+8GHaUKbIB8vxv1Oai5FAF0d0r7LXHhLLe5K/yChm5GQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "default-resolution": "^2.0.0",
+        "es6-weak-map": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/lazystream": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz",
+      "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "readable-stream": "^2.0.5"
+      },
+      "engines": {
+        "node": ">= 0.6.3"
+      }
+    },
+    "node_modules/lcid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+      "integrity": "sha512-YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "invert-kv": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/lead": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz",
+      "integrity": "sha512-IpSVCk9AYvLHo5ctcIXxOBpMWUe+4TKN3VPWAKUbJikkmsGp0VrSM8IttVc32D6J4WUsiPE6aEFRNmIoF/gdow==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "flush-write-stream": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/liftoff": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz",
+      "integrity": "sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "extend": "^3.0.0",
+        "findup-sync": "^3.0.0",
+        "fined": "^1.0.1",
+        "flagged-respawn": "^1.0.0",
+        "is-plain-object": "^2.0.4",
+        "object.map": "^1.0.0",
+        "rechoir": "^0.6.2",
+        "resolve": "^1.1.7"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/liftoff/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/load-json-file": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "integrity": "sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "strip-bom": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "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,
+      "license": "MIT",
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-symbols": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/make-iterator": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
+      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/make-iterator/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "object-visit": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
+      "integrity": "sha512-LFgVbaHIHMqCRuCZyfCtUOq9/Lnzhi7Z0KFUE2fhD54+JN2jLh3hC02RLkqauJ3U4soU6H1J3tfj/Byk7GoEjA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "findup-sync": "^2.0.0",
+        "micromatch": "^3.0.4",
+        "resolve": "^1.4.0",
+        "stack-trace": "0.0.10"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/findup-sync": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
+      "integrity": "sha512-vs+3unmJT45eczmcAZ6zMJtxN3l/QXeccaXQx5cu/MeJMhewVfoWZqibRkOxPnmoR59+Zy5hjabfQc6JLSah4g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "detect-file": "^1.0.0",
+        "is-glob": "^3.1.0",
+        "micromatch": "^3.0.4",
+        "resolve-dir": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/matchdep/node_modules/is-glob": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+      "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "license": "MIT",
+      "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"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/micromatch/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/micromatch/node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/micromatch/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/micromatch/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
+      "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/mixin-deep": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mixin-deep/node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mixin-deep/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mocha": {
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.2.0.tgz",
+      "integrity": "sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-colors": "4.1.1",
+        "browser-stdout": "1.3.1",
+        "chokidar": "3.5.3",
+        "debug": "4.3.4",
+        "diff": "5.0.0",
+        "escape-string-regexp": "4.0.0",
+        "find-up": "5.0.0",
+        "glob": "7.2.0",
+        "he": "1.2.0",
+        "js-yaml": "4.1.0",
+        "log-symbols": "4.1.0",
+        "minimatch": "5.0.1",
+        "ms": "2.1.3",
+        "nanoid": "3.3.3",
+        "serialize-javascript": "6.0.0",
+        "strip-json-comments": "3.1.1",
+        "supports-color": "8.1.1",
+        "workerpool": "6.2.1",
+        "yargs": "16.2.0",
+        "yargs-parser": "20.2.4",
+        "yargs-unparser": "2.0.0"
+      },
+      "bin": {
+        "_mocha": "bin/_mocha",
+        "mocha": "bin/mocha.js"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/mochajs"
+      }
+    },
+    "node_modules/mocha/node_modules/ansi-colors": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mocha/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/mocha/node_modules/anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/mocha/node_modules/binary-extensions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mocha/node_modules/braces": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fill-range": "^7.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/mocha/node_modules/chokidar": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.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"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/mocha/node_modules/cliui": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
+    "node_modules/mocha/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/mocha/node_modules/debug/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/mocha/node_modules/fill-range": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/mocha/node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/mocha/node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/mocha/node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/mocha/node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/mocha/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/mocha/node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/mocha/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/mocha/node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/mocha/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/mocha/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/mocha/node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/mocha/node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/mocha/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,
+      "license": "ISC",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/mocha/node_modules/yargs": {
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/mute-stdout": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz",
+      "integrity": "sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/nan": {
+      "version": "2.20.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz",
+      "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz",
+      "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/nanomatch": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+      "dev": true,
+      "license": "MIT",
+      "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"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/nanomatch/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/nanomatch/node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/nanomatch/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/nanomatch/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/next-tick": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
+      "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "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-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/now-and-later": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz",
+      "integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "once": "^1.3.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/is-descriptor": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object-copy/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "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,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
+      "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "has-symbols": "^1.0.3",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.defaults": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
+      "integrity": "sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "array-each": "^1.0.1",
+        "array-slice": "^1.0.0",
+        "for-own": "^1.0.0",
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.map": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
+      "integrity": "sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "for-own": "^1.0.0",
+        "make-iterator": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.reduce": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz",
+      "integrity": "sha512-naLhxxpUESbNkRqc35oQ2scZSJueHGQNUfMW/0U37IgN6tE2dgDWg3whf+NEliy3F/QysrO48XKUz/nGPe+AQw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "for-own": "^1.0.0",
+        "make-iterator": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/ordered-read-streams": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz",
+      "integrity": "sha512-Z87aSjx3r5c0ZB7bcJqIgIRX5bxR7A4aSzvIbaxd0oTkWBCOoKfuGHiKj60CHVUgg1Phm5yMZzBdt8XqRs73Mw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "readable-stream": "^2.0.1"
+      }
+    },
+    "node_modules/os-locale": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+      "integrity": "sha512-PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "lcid": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "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,
+      "license": "MIT",
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "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==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/parse-filepath": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
+      "integrity": "sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-absolute": "^1.0.0",
+        "map-cache": "^0.2.0",
+        "path-root": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "error-ex": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/parse-node-version": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
+      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/parse-passwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+      "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-dirname": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+      "integrity": "sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "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,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/path-root": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
+      "integrity": "sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-root-regex": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-root-regex": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
+      "integrity": "sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-type": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+      "integrity": "sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "pinkie": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pretty-hrtime": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
+      "integrity": "sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/promise": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/promise/-/promise-8.3.0.tgz",
+      "integrity": "sha512-rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg==",
+      "license": "MIT",
+      "dependencies": {
+        "asap": "~2.0.6"
+      }
+    },
+    "node_modules/pump": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/pumpify": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
+      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "duplexify": "^3.6.0",
+        "inherits": "^2.0.3",
+        "pump": "^2.0.0"
+      }
+    },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/read-pkg": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+      "integrity": "sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "load-json-file": "^1.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/read-pkg-up": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+      "integrity": "sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "find-up": "^1.0.0",
+        "read-pkg": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/find-up": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+      "integrity": "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-exists": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/path-exists": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+      "integrity": "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "dev": true,
+      "license": "MIT",
+      "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/readdirp": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.1.11",
+        "micromatch": "^3.1.10",
+        "readable-stream": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/rechoir": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
+      "integrity": "sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==",
+      "dev": true,
+      "dependencies": {
+        "resolve": "^1.1.6"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/regex-not/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/regex-not/node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/regex-not/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/remove-bom-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz",
+      "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-buffer": "^1.1.5",
+        "is-utf8": "^0.2.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/remove-bom-stream": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz",
+      "integrity": "sha512-wigO8/O08XHb8YPzpDDT+QmRANfW6vLqxfaXm1YXhnFf3AkSLyjfG3GEFg4McZkmgL7KvCj5u2KczkvSP6NfHA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "remove-bom-buffer": "^3.0.0",
+        "safe-buffer": "^5.1.0",
+        "through2": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/remove-bom-stream/node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/repeat-element": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
+      "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/replace-ext": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
+      "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/replace-homedir": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz",
+      "integrity": "sha512-CHPV/GAglbIB1tnQgaiysb8H2yCy8WQ7lcEwQ/eT+kLj0QHV8LnJW0zpqpE7RSkrMSRoa+EBoag86clf7WAgSg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "homedir-polyfill": "^1.0.1",
+        "is-absolute": "^1.0.0",
+        "remove-trailing-separator": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-main-filename": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+      "integrity": "sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/resolve": {
+      "version": "1.22.8",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-core-module": "^2.13.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/resolve-dir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
+      "integrity": "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "expand-tilde": "^2.0.0",
+        "global-modules": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/resolve-options": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz",
+      "integrity": "sha512-NYDgziiroVeDC29xq7bp/CacZERYsA9bXYd1ZmcJlF3BcrZv5pTb4NG7SjdyKDnXZ84aC4vo2u6sNKIA1LCu/A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "value-or-function": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==",
+      "deprecated": "https://github.com/lydell/resolve-url#deprecated",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "license": "MIT"
+    },
+    "node_modules/safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ret": "~0.1.10"
+      }
+    },
+    "node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/semver-greatest-satisfied-range": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz",
+      "integrity": "sha512-Ny/iyOzSSa8M5ML46IAx3iXc6tfOsYU2R4AXi2UpHk60Zrgyq6eqPj/xiOfS0rRl/iiQ/rdJkVjw/5cdUyCntQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "sver-compat": "^1.5.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/serialize-javascript": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
+      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/set-function-length": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/set-value": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/set-value/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "dev": true,
+      "license": "MIT",
+      "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"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.0",
+        "snapdragon-util": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-util": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "kind-of": "^3.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-util/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/is-descriptor": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-resolve": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+      "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
+      "dev": true,
+      "license": "MIT",
+      "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"
+      }
+    },
+    "node_modules/source-map-url": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
+      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
+      "deprecated": "See https://github.com/lydell/source-map-url#deprecated",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/sparkles": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
+      "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/spdx-correct": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
+      "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-exceptions": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
+      "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==",
+      "dev": true,
+      "license": "CC-BY-3.0"
+    },
+    "node_modules/spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-license-ids": {
+      "version": "3.0.18",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.18.tgz",
+      "integrity": "sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ==",
+      "dev": true,
+      "license": "CC0-1.0"
+    },
+    "node_modules/split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "extend-shallow": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/split-string/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/split-string/node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/split-string/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/stack-trace": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
+      "integrity": "sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/is-descriptor": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/stream-exhaust": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
+      "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/stream-shift": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.3.tgz",
+      "integrity": "sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+      "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "code-point-at": "^1.0.0",
+        "is-fullwidth-code-point": "^1.0.0",
+        "strip-ansi": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+      "integrity": "sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-utf8": "^0.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "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,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "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,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/sver-compat": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz",
+      "integrity": "sha512-aFTHfmjwizMNlNE6dsGmoAM4lHjL0CyiobWaFiXWSlD7cIxshW422Nb8KbXCmR6z+0ZEPY+daXJrDyh/vuwTyg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es6-iterator": "^2.0.1",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "node_modules/through2": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
+      "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
+      "license": "MIT",
+      "dependencies": {
+        "readable-stream": "3"
+      }
+    },
+    "node_modules/through2-filter": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
+      "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "through2": "~2.0.0",
+        "xtend": "~4.0.0"
+      }
+    },
+    "node_modules/through2-filter/node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/through2/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/time-stamp": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
+      "integrity": "sha512-gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-absolute-glob": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
+      "integrity": "sha512-rtwLUQEwT8ZeKQbyFJyomBRYXyE16U5VKuy0ftxLMK/PZb2fkOsg5r9kHdauuVDbsNdIBoC/HCthpidamQFXYA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-absolute": "^1.0.0",
+        "is-negated-glob": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-object-path/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "dev": true,
+      "license": "MIT",
+      "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": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-regex/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+      "dev": true,
+      "license": "MIT",
+      "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",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-regex/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-through": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz",
+      "integrity": "sha512-+QIz37Ly7acM4EMdw2PRN389OneM5+d844tirkGp4dPKzI5OE72V9OsbFp+CIYJDahZ41ZV05hNtcPAQUAm9/Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "through2": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/to-through/node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/type": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/type/-/type-2.7.3.tgz",
+      "integrity": "sha512-8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/unc-path-regex": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
+      "integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/undertaker": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.3.0.tgz",
+      "integrity": "sha512-/RXwi5m/Mu3H6IHQGww3GNt1PNXlbeCuclF2QYR14L/2CHPz3DFZkvB5hZ0N/QUkiXWCACML2jXViIQEQc2MLg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "arr-flatten": "^1.0.1",
+        "arr-map": "^2.0.0",
+        "bach": "^1.0.0",
+        "collection-map": "^1.0.0",
+        "es6-weak-map": "^2.0.1",
+        "fast-levenshtein": "^1.0.0",
+        "last-run": "^1.1.0",
+        "object.defaults": "^1.0.0",
+        "object.reduce": "^1.0.0",
+        "undertaker-registry": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/undertaker-registry": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz",
+      "integrity": "sha512-UR1khWeAjugW3548EfQmL9Z7pGMlBgXteQpr1IZeZBtnkCJQJIJ1Scj0mb9wQaPvUZ9Q17XqW6TIaPchJkyfqw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/union-value": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unique-stream": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
+      "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "through2-filter": "^3.0.0"
+      }
+    },
+    "node_modules/unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-value": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+      "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "get-value": "^2.0.3",
+        "has-values": "^0.1.4",
+        "isobject": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+      "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "isarray": "1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-values": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+      "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/upath": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
+      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4",
+        "yarn": "*"
+      }
+    },
+    "node_modules/urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==",
+      "deprecated": "Please see https://github.com/lydell/urix#deprecated",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "license": "MIT"
+    },
+    "node_modules/v8flags": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
+      "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "homedir-polyfill": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "node_modules/value-or-function": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz",
+      "integrity": "sha512-jdBB2FrWvQC/pnPtIqcLsMaQgjhdb6B7tk1MMyTKapox+tQZbdRP4uLxu/JY0t7fbfDCUMnuelzEYv5GsxHhdg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/vinyl": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
+      "integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "clone": "^2.1.1",
+        "clone-buffer": "^1.0.0",
+        "clone-stats": "^1.0.0",
+        "cloneable-readable": "^1.0.0",
+        "remove-trailing-separator": "^1.0.1",
+        "replace-ext": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/vinyl-fs": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz",
+      "integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fs-mkdirp-stream": "^1.0.0",
+        "glob-stream": "^6.1.0",
+        "graceful-fs": "^4.0.0",
+        "is-valid-glob": "^1.0.0",
+        "lazystream": "^1.0.0",
+        "lead": "^1.0.0",
+        "object.assign": "^4.0.4",
+        "pumpify": "^1.3.5",
+        "readable-stream": "^2.3.3",
+        "remove-bom-buffer": "^3.0.0",
+        "remove-bom-stream": "^1.2.0",
+        "resolve-options": "^1.1.0",
+        "through2": "^2.0.0",
+        "to-through": "^2.0.0",
+        "value-or-function": "^3.0.0",
+        "vinyl": "^2.0.0",
+        "vinyl-sourcemap": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/vinyl-fs/node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/vinyl-sourcemap": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz",
+      "integrity": "sha512-NiibMgt6VJGJmyw7vtzhctDcfKch4e4n9TBeoWlirb7FMg9/1Ov9k+A5ZRAtywBpRPiyECvQRQllYM8dECegVA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "append-buffer": "^1.0.2",
+        "convert-source-map": "^1.5.0",
+        "graceful-fs": "^4.1.6",
+        "normalize-path": "^2.1.1",
+        "now-and-later": "^2.0.0",
+        "remove-bom-buffer": "^3.0.0",
+        "vinyl": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/vinyl-sourcemap/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/which-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
+      "integrity": "sha512-F6+WgncZi/mJDrammbTuHe1q0R5hOXv/mBaiNA2TCNT/LTHusX0V+CJnj9XT8ki5ln2UZyyddDgHfCzyrOH7MQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/workerpool": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz",
+      "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/wrap-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "integrity": "sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "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,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
+    "node_modules/y18n": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
+      "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/yargs": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.2.tgz",
+      "integrity": "sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "camelcase": "^3.0.0",
+        "cliui": "^3.2.0",
+        "decamelize": "^1.1.1",
+        "get-caller-file": "^1.0.1",
+        "os-locale": "^1.4.0",
+        "read-pkg-up": "^1.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^1.0.1",
+        "set-blocking": "^2.0.0",
+        "string-width": "^1.0.2",
+        "which-module": "^1.0.0",
+        "y18n": "^3.2.1",
+        "yargs-parser": "^5.0.1"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "20.2.4",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
+      "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yargs-unparser": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
+      "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "camelcase": "^6.0.0",
+        "decamelize": "^4.0.0",
+        "flat": "^5.0.2",
+        "is-plain-obj": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yargs-unparser/node_modules/camelcase": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/yargs-unparser/node_modules/decamelize": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
+      "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/yargs/node_modules/yargs-parser": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.1.tgz",
+      "integrity": "sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "camelcase": "^3.0.0",
+        "object.assign": "^4.1.0"
+      }
+    },
+    "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,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    }
+  }
+}
diff --git a/validator/js/gulpjs/package.json b/validator/js/gulpjs/package.json
index 8d7c5c84f071..8f3f6bc73dbe 100644
--- a/validator/js/gulpjs/package.json
+++ b/validator/js/gulpjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gulp-amphtml-validator",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "Gulp plugin for the official AMP HTML validator (www.ampproject.org)",
   "keywords": [
     "gulpplugin",
@@ -17,12 +17,13 @@
     "url": "https://github.com/ampproject/amphtml/tree/main/validator/js/gulpjs"
   },
   "dependencies": {
-    "amphtml-validator": "1.0.35",
+    "amphtml-validator": "1.0.38",
+    "kleur": "4.1.5",
     "through2": "4.0.2"
   },
   "devDependencies": {
     "gulp": "4.0.2",
-    "mocha": "9.1.3"
+    "mocha": "10.2.0"
   },
   "scripts": {
     "test": " ./node_modules/mocha/bin/mocha",
diff --git a/validator/js/gulpjs/sample/gulpfile.js b/validator/js/gulpjs/sample/gulpfile.js
index a66c2db31fd3..f0f616205ef8 100644
--- a/validator/js/gulpjs/sample/gulpfile.js
+++ b/validator/js/gulpjs/sample/gulpfile.js
@@ -3,7 +3,7 @@ const gulpAmpHtmlValidator = require('gulp-amphtml-validator');
 
 gulp.task('amphtml:validate', () => {
   return gulp.src('../../testdata/feature_tests/*.html')
-  // Valide the input and attach the validation result to the "amp" property
+  // Validate the input and attach the validation result to the "amp" property
   // of the file object.
       .pipe(gulpAmpHtmlValidator.validate())
   // Print the validation results to the console.
diff --git a/validator/js/nodejs/README.md b/validator/js/nodejs/README.md
index a32d7309a4d3..3cd9479ac0e7 100644
--- a/validator/js/nodejs/README.md
+++ b/validator/js/nodejs/README.md
@@ -91,7 +91,7 @@ would allow applying the validator rules for `AMP4ADS` or `AMP4EMAIL` as well. `
 
 ### 1.0.30
 
--   Remove engine section from pacakge.json to allow any version of nodejs.
+-   Remove engine section from package.json to allow any version of nodejs.
 
 ### 1.0.29
 
diff --git a/validator/js/nodejs/index.js b/validator/js/nodejs/index.js
index 239dd7dd6ac6..6e09a7afe169 100755
--- a/validator/js/nodejs/index.js
+++ b/validator/js/nodejs/index.js
@@ -5,7 +5,7 @@ const fs = require('fs');
 const http = require('http');
 const https = require('https');
 const path = require('path');
-const program = require('commander');
+const { program } = require('commander');
 const Promise = require('promise');
 const util = require('util');
 const vm = require('vm');
diff --git a/validator/js/nodejs/package-lock.json b/validator/js/nodejs/package-lock.json
index 43d12e6f6c4e..36cba10e6d3f 100644
--- a/validator/js/nodejs/package-lock.json
+++ b/validator/js/nodejs/package-lock.json
@@ -1,29 +1,80 @@
 {
   "name": "amphtml-validator",
-  "version": "1.0.35",
-  "lockfileVersion": 2,
+  "version": "1.0.38",
+  "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "amphtml-validator",
-      "version": "1.0.35",
+      "version": "1.0.38",
       "license": "Apache-2.0",
       "dependencies": {
         "colors": "1.4.0",
-        "commander": "8.3.0",
-        "promise": "8.1.0"
+        "commander": "12.0.0",
+        "promise": "8.3.0"
       },
       "bin": {
         "amphtml-validator": "cli.js"
       },
       "devDependencies": {
-        "jasmine": "3.10.0"
+        "jasmine": "5.1.0"
+      }
+    },
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "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==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/asap": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
+      "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="
     },
     "node_modules/balanced-match": {
       "version": "1.0.2",
@@ -32,15 +83,32 @@
       "dev": true
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
     "node_modules/colors": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
@@ -50,252 +118,429 @@
       }
     },
     "node_modules/commander": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
-      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-12.0.0.tgz",
+      "integrity": "sha512-MwVNWlYjDTtOjX5PiD7o5pK0UrFU/OYgcJfjjK4RaHZETNtjJqrZa9Y9ds88+A+f+d5lv+561eZ+yCKoS3gbAA==",
       "engines": {
-        "node": ">= 12"
+        "node": ">=18"
       }
     },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "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/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+    "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/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+    "node_modules/foreground-child": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
+      "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
       "dev": true,
       "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"
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^4.0.1"
       },
       "engines": {
-        "node": "*"
+        "node": ">=14"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+    "node_modules/glob": {
+      "version": "10.3.12",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.12.tgz",
+      "integrity": "sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==",
       "dev": true,
       "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^2.3.6",
+        "minimatch": "^9.0.1",
+        "minipass": "^7.0.4",
+        "path-scurry": "^1.10.2"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "dev": true
     },
+    "node_modules/jackspeak": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz",
+      "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==",
+      "dev": true,
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
     "node_modules/jasmine": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.10.0.tgz",
-      "integrity": "sha512-2Y42VsC+3CQCTzTwJezOvji4qLORmKIE0kwowWC+934Krn6ZXNQYljiwK5st9V3PVx96BSiDYXSB60VVah3IlQ==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-5.1.0.tgz",
+      "integrity": "sha512-prmJlC1dbLhti4nE4XAPDWmfJesYO15sjGXVp7Cs7Ym5I9Xtwa/hUHxxJXjnpfLO72+ySttA0Ztf8g/RiVnUKw==",
       "dev": true,
       "dependencies": {
-        "glob": "^7.1.6",
-        "jasmine-core": "~3.10.0"
+        "glob": "^10.2.2",
+        "jasmine-core": "~5.1.0"
       },
       "bin": {
         "jasmine": "bin/jasmine.js"
       }
     },
     "node_modules/jasmine-core": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.10.1.tgz",
-      "integrity": "sha512-ooZWSDVAdh79Rrj4/nnfklL3NQVra0BcuhcuWoAwwi+znLDoUeH87AFfeX8s+YeYi6xlv5nveRyaA1v7CintfA==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.1.2.tgz",
+      "integrity": "sha512-2oIUMGn00FdUiqz6epiiJr7xcFyNYj3rDcfmnzfkBnHyBQ3cBQUs4mmyGsOb7TTLb9kxk7dBcmEmqhDKkBoDyA==",
       "dev": true
     },
+    "node_modules/lru-cache": {
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz",
+      "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==",
+      "dev": true,
+      "engines": {
+        "node": "14 || >=16.14"
+      }
+    },
     "node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
+      "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
       "dev": true,
       "dependencies": {
-        "brace-expansion": "^1.1.7"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": "*"
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+    "node_modules/minipass": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
+      "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
       "dev": true,
-      "dependencies": {
-        "wrappy": "1"
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
       }
     },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-scurry": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.2.tgz",
+      "integrity": "sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/promise": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/promise/-/promise-8.1.0.tgz",
-      "integrity": "sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q==",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/promise/-/promise-8.3.0.tgz",
+      "integrity": "sha512-rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg==",
       "dependencies": {
         "asap": "~2.0.6"
       }
     },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
-    }
-  },
-  "dependencies": {
-    "asap": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+    "node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
       "dev": true,
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "colors": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
-      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA=="
+    "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==",
+      "dev": true,
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
-    "commander": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
-      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww=="
+    "node_modules/string-width-cjs": {
+      "name": "string-width",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
+    "node_modules/string-width-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+    "node_modules/string-width-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
       "dev": true
     },
-    "glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+    "node_modules/string-width-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
       "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"
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+    "node_modules/strip-ansi-cjs": {
+      "name": "strip-ansi",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dev": true,
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
+    "node_modules/strip-ansi-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "jasmine": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.10.0.tgz",
-      "integrity": "sha512-2Y42VsC+3CQCTzTwJezOvji4qLORmKIE0kwowWC+934Krn6ZXNQYljiwK5st9V3PVx96BSiDYXSB60VVah3IlQ==",
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dev": true,
-      "requires": {
-        "glob": "^7.1.6",
-        "jasmine-core": "~3.10.0"
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
       }
     },
-    "jasmine-core": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.10.1.tgz",
-      "integrity": "sha512-ooZWSDVAdh79Rrj4/nnfklL3NQVra0BcuhcuWoAwwi+znLDoUeH87AFfeX8s+YeYi6xlv5nveRyaA1v7CintfA==",
-      "dev": true
+    "node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
     },
-    "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+    "node_modules/wrap-ansi-cjs": {
+      "name": "wrap-ansi",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "dev": true,
-      "requires": {
-        "brace-expansion": "^1.1.7"
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+    "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true,
-      "requires": {
-        "wrappy": "1"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+    "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
       "dev": true
     },
-    "promise": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/promise/-/promise-8.1.0.tgz",
-      "integrity": "sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q==",
-      "requires": {
-        "asap": "~2.0.6"
+    "node_modules/wrap-ansi-cjs/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
+    "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
     }
   }
 }
diff --git a/validator/js/nodejs/package.json b/validator/js/nodejs/package.json
index c9918e6bb981..0dc363c50159 100644
--- a/validator/js/nodejs/package.json
+++ b/validator/js/nodejs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amphtml-validator",
-  "version": "1.0.35",
+  "version": "1.0.38",
   "description": "Official validator for AMP HTML (www.ampproject.org)",
   "keywords": [
     "AMP",
@@ -20,10 +20,10 @@
   },
   "dependencies": {
     "colors": "1.4.0",
-    "commander": "8.3.0",
-    "promise": "8.1.0"
+    "commander": "12.0.0",
+    "promise": "8.3.0"
   },
   "devDependencies": {
-    "jasmine": "3.10.0"
+    "jasmine": "5.1.0"
   }
-}
+}
\ No newline at end of file
diff --git a/validator/js/webui/@polymer/webui-mainpage/webui-mainpage.html b/validator/js/webui/@polymer/webui-mainpage/webui-mainpage.html
index e12d03fce66a..48f5423039be 100644
--- a/validator/js/webui/@polymer/webui-mainpage/webui-mainpage.html
+++ b/validator/js/webui/@polymer/webui-mainpage/webui-mainpage.html
@@ -97,7 +97,7 @@
           // resources asynchronously.
           amp.validator.init().then(function() {
             isValidatorReady = true;
-            // In most times, the initilization of AMP validator is slower than
+            // In most times, the initialization of AMP validator is slower than
             // the code that fills the minimal valid JavaScript AMP doc as the
             // default value in the input box. The `refreshEditorAndErrors` call
             // triggered by input box default value returns early because
@@ -203,38 +203,6 @@
           editor.setCursorAndFocus(error.line - 1, error.col);
         });
 
-        // Fetches a doc with JSON from the local server (index.js) and
-        // puts it into the editor.
-        var input = document.getElementById('urlToFetch');
-        var button = document.getElementById('validateButton');
-        button.addEventListener('click', function() {
-          var urlToFetch = input.value.trim();
-          if (urlToFetch.length > 0) {
-            if (!(urlToFetch.indexOf('http://') == 0 ||
-                  urlToFetch.indexOf('https://') == 0)) {
-              urlToFetch = 'https://' + urlToFetch;
-              input.value = urlToFetch;
-            }
-            var params = getLocationHashParams();
-            params['url'] = urlToFetch;
-            setLocationHashParams(params);
-            var xmlHttp = new XMLHttpRequest();
-            xmlHttp.onreadystatechange = function() {
-              if (xmlHttp.readyState == 4) {
-                if (xmlHttp.status == 200) {
-                  editor.setEditorValue(JSON.parse(xmlHttp.responseText).Contents);
-                } else {
-                  urlForm.displayToast();
-                }
-              }
-            };
-            xmlHttp.open('POST', '/fetch', true);
-            xmlHttp.setRequestHeader('X-Requested-By', 'validator webui');
-            xmlHttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
-            xmlHttp.send('url=' + encodeURIComponent(urlToFetch));
-          }
-        });
-
         urlForm.addEventListener('webui-urlform-html-format-changes', function(e) {
           var editorValue = editor.getEditorValue();
           if (e.detail.htmlFormat === 'AMP4ADS') {
@@ -285,7 +253,7 @@
           // Extract doc from query param
           editor.setEditorValue(incomingDocStr);
         } else if (params.hasOwnProperty('url') && params['url']) {
-          // Load doc fromm url
+          // Load doc from url
           this.$.urlForm.setURLAndValidate(params['url']);
         } else {
           // Use minimal valid JavaScript AMP doc
diff --git a/validator/js/webui/@polymer/webui-urlform/webui-urlform.html b/validator/js/webui/@polymer/webui-urlform/webui-urlform.html
index 234586e8489c..fc4f82b12c39 100644
--- a/validator/js/webui/@polymer/webui-urlform/webui-urlform.html
+++ b/validator/js/webui/@polymer/webui-urlform/webui-urlform.html
@@ -15,27 +15,13 @@
     .flexchild {
       @apply(--layout-flex);
     }
-    #urlToast {
-      left: auto;
-      min-height: auto;
-      min-width: auto;
-      right: 0;
-    }
     #htmlFormatDropdown {
       min-width: 120px;
       max-width: 120px;
     }
   </style>
   <template>
-    <paper-toast id="urlToast" text="Could not fetch the given URL."></paper-toast>
     <div class="container flex-horizontal">
-      <paper-material elevation="0" class="flexchild">
-        <paper-input
-           auto-validate required pattern="[^ \s]+(://.*|\.[a-z]+($|(/.*)))"
-           error-message="Please enter a valid URL" on-focus="checkURL"
-           on-input="checkURL" on-keypress="keyPress" label="URL" id="urlToFetch">
-        </paper-input>
-      </paper-material>
       <paper-material elevation="0">
         <paper-dropdown-menu label="HTML Format" id="htmlFormatDropdown">
           <paper-listbox class="dropdown-content" selected="AMP"
@@ -47,43 +33,15 @@
           </paper-listbox>
         </paper-dropdown-menu>
       </paper-material>
-      <paper-material elevation="0">
-        <paper-button disabled$="{{!validURL}}" raised
-            id="validateButton">Validate</paper-button>
-      </paper-material>
     </div>
   </template>
   <script>
     Polymer({
       is: 'webui-urlform',
-      properties: {
-        validURL: {
-          type: Boolean,
-          value: false
-        }
-      },
       htmlFormatChange: function() {
         this.fire('webui-urlform-html-format-changes',
                   {'htmlFormat': this.$.htmlFormatSelector.selected});
       },
-      checkURL: function(e) {
-        this.validURL = !this.$.urlToFetch.invalid;
-      },
-      displayToast: function() {
-        this.$.urlToast.open();
-      },
-      keyPress: function(e) {
-        if (this.validURL && 13 === e.charCode) {
-          this.$.validateButton.click();
-          this.$.validateButton.getRipple().simulatedRipple();
-        }
-      },
-      setURLAndValidate: function(url) {
-        this.$.urlToFetch.value = url;
-        this.checkURL();
-        this.$.urlToFetch.validate();
-        this.$.validateButton.click();
-      },
       getHtmlFormat: function() {
         return this.$.htmlFormatSelector.selected;
       },
diff --git a/validator/js/webui/package-lock.json b/validator/js/webui/package-lock.json
index 883d50ef0601..e7167802b197 100644
--- a/validator/js/webui/package-lock.json
+++ b/validator/js/webui/package-lock.json
@@ -42,8 +42,8 @@
         "@polymer/paper-toast": "0.0.3",
         "@polymer/paper-toolbar": "0.0.3",
         "@polymer/polymer": "1.2.5-npm-test.2",
-        "codemirror": "5.15.2",
-        "vulcanize": "1.14.8",
+        "codemirror": "5.58.2",
+        "vulcanize": "1.14.12",
         "web-animations-js": "2.2.2",
         "webcomponents.js": "0.7.22"
       }
@@ -447,24 +447,6 @@
         "acorn": "^3.0.4"
       }
     },
-    "node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/babel-polyfill": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
@@ -489,48 +471,6 @@
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
       "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
     },
-    "node_modules/boxen": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/boxen/-/boxen-0.3.1.tgz",
-      "integrity": "sha1-p9iYJDrmIvertrtgTXQKdsalRhs=",
-      "optional": true,
-      "dependencies": {
-        "chalk": "^1.1.1",
-        "filled-array": "^1.0.0",
-        "object-assign": "^4.0.1",
-        "repeating": "^2.0.0",
-        "string-width": "^1.0.1",
-        "widest-line": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/capture-stack-trace": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz",
-      "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-      "optional": true,
-      "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"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/clone": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
@@ -539,39 +479,10 @@
         "node": ">=0.8"
       }
     },
-    "node_modules/code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/codemirror": {
-      "version": "5.15.2",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.15.2.tgz",
-      "integrity": "sha1-WLPccyxtENeq6Ab0x83VapuH/o8="
-    },
-    "node_modules/configstore": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz",
-      "integrity": "sha1-c3o6cDbpiGECqmCZ5HuzOrGroaE=",
-      "optional": true,
-      "dependencies": {
-        "dot-prop": "^3.0.0",
-        "graceful-fs": "^4.1.2",
-        "mkdirp": "^0.5.0",
-        "object-assign": "^4.0.1",
-        "os-tmpdir": "^1.0.0",
-        "osenv": "^0.1.0",
-        "uuid": "^2.0.1",
-        "write-file-atomic": "^1.1.2",
-        "xdg-basedir": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "version": "5.58.2",
+      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.58.2.tgz",
+      "integrity": "sha512-K/hOh24cCwRutd1Mk3uLtjWzNISOkm4fvXiMO7LucCrqbh6aJDdtqUziim3MZUI6wOY0rvY1SlL1Ork01uMy6w=="
     },
     "node_modules/core-js": {
       "version": "2.6.12",
@@ -580,33 +491,6 @@
       "deprecated": "core-js@<3.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Please, upgrade your dependencies to the actual version of core-js.",
       "hasInstallScript": true
     },
-    "node_modules/core-util-is": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
-      "optional": true
-    },
-    "node_modules/create-error-class": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
-      "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
-      "optional": true,
-      "dependencies": {
-        "capture-stack-trace": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/deep-extend": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "optional": true,
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
     "node_modules/deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
@@ -636,50 +520,11 @@
         "parse5": "^1.4.1"
       }
     },
-    "node_modules/dot-prop": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz",
-      "integrity": "sha1-G3CK8JSknJoOfbyteQq6U52sEXc=",
-      "optional": true,
-      "dependencies": {
-        "is-obj": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/duplexer2": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
-      "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
-      "optional": true,
-      "dependencies": {
-        "readable-stream": "^2.0.2"
-      }
-    },
-    "node_modules/error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "optional": true,
-      "dependencies": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
     "node_modules/es6-promise": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz",
       "integrity": "sha1-lu258v2wGZWCKyY92KratnSBgbw="
     },
-    "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "optional": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/escodegen": {
       "version": "1.14.3",
       "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
@@ -773,60 +618,6 @@
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
       "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
     },
-    "node_modules/filled-array": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz",
-      "integrity": "sha1-w8T2xmO5I0WamqKZEtLQMfFQf4Q=",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/got": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/got/-/got-5.6.0.tgz",
-      "integrity": "sha1-ux1+4WO3gIK7yOuDbz85UATqb78=",
-      "optional": true,
-      "dependencies": {
-        "create-error-class": "^3.0.1",
-        "duplexer2": "^0.1.4",
-        "is-plain-obj": "^1.0.0",
-        "is-redirect": "^1.0.0",
-        "is-retry-allowed": "^1.0.0",
-        "is-stream": "^1.0.0",
-        "lowercase-keys": "^1.0.0",
-        "node-status-codes": "^1.0.0",
-        "object-assign": "^4.0.1",
-        "parse-json": "^2.1.0",
-        "pinkie-promise": "^2.0.0",
-        "read-all-stream": "^3.0.0",
-        "readable-stream": "^2.0.5",
-        "timed-out": "^2.0.0",
-        "unzip-response": "^1.0.0",
-        "url-parse-lax": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/graceful-fs": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
-      "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==",
-      "optional": true
-    },
-    "node_modules/has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "optional": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/hydrolysis": {
       "version": "1.25.0",
       "resolved": "https://registry.npmjs.org/hydrolysis/-/hydrolysis-1.25.0.tgz",
@@ -850,128 +641,11 @@
         "parse5": "^1.4.1"
       }
     },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "optional": true,
-      "engines": {
-        "node": ">=0.8.19"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "optional": true
-    },
-    "node_modules/ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "optional": true
-    },
-    "node_modules/is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-      "optional": true
-    },
-    "node_modules/is-finite": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
-      "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-      "optional": true,
-      "dependencies": {
-        "number-is-nan": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-npm": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz",
-      "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ=",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-plain-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-redirect": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
-      "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-retry-allowed": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
-      "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/isarray": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
       "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
     },
-    "node_modules/latest-version": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz",
-      "integrity": "sha1-VvjWE5YghHuAF/jx9NeOIRMkFos=",
-      "optional": true,
-      "dependencies": {
-        "package-json": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/levn": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
@@ -984,42 +658,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/lowercase-keys": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-      "optional": true
-    },
-    "node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "optional": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/node-status-codes": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz",
-      "integrity": "sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8=",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/nopt": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
@@ -1031,24 +669,6 @@
         "nopt": "bin/nopt.js"
       }
     },
-    "node_modules/number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/optionator": {
       "version": "0.8.3",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
@@ -1065,61 +685,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/os-homedir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/osenv": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-      "optional": true,
-      "dependencies": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.0"
-      }
-    },
-    "node_modules/package-json": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz",
-      "integrity": "sha1-DRW9Z9HLvduyyiIv8u24a8sxqLs=",
-      "optional": true,
-      "dependencies": {
-        "got": "^5.0.0",
-        "registry-auth-token": "^3.0.1",
-        "registry-url": "^3.0.3",
-        "semver": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-      "optional": true,
-      "dependencies": {
-        "error-ex": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/parse5": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz",
@@ -1138,27 +703,6 @@
       "resolved": "https://registry.npmjs.org/path-posix/-/path-posix-1.0.0.tgz",
       "integrity": "sha1-BrJhE/Vr6rBCVFojv6iAA8ysJg8="
     },
-    "node_modules/pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "optional": true,
-      "dependencies": {
-        "pinkie": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/prelude-ls": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
@@ -1167,145 +711,11 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/prepend-http": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
-      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "optional": true
-    },
-    "node_modules/rc": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-      "optional": true,
-      "dependencies": {
-        "deep-extend": "^0.6.0",
-        "ini": "~1.3.0",
-        "minimist": "^1.2.0",
-        "strip-json-comments": "~2.0.1"
-      },
-      "bin": {
-        "rc": "cli.js"
-      }
-    },
-    "node_modules/read-all-stream": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz",
-      "integrity": "sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=",
-      "optional": true,
-      "dependencies": {
-        "pinkie-promise": "^2.0.0",
-        "readable-stream": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "optional": 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/readable-stream/node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-      "optional": true
-    },
     "node_modules/regenerator-runtime": {
       "version": "0.10.5",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
       "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg="
     },
-    "node_modules/registry-auth-token": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz",
-      "integrity": "sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==",
-      "optional": true,
-      "dependencies": {
-        "rc": "^1.1.6",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/registry-url": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz",
-      "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=",
-      "optional": true,
-      "dependencies": {
-        "rc": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/repeating": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-      "optional": true,
-      "dependencies": {
-        "is-finite": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "optional": true
-    },
-    "node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "optional": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/semver-diff": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz",
-      "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=",
-      "optional": true,
-      "dependencies": {
-        "semver": "^5.0.3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/slide": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz",
-      "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=",
-      "optional": true,
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -1315,134 +725,21 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "optional": true,
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "node_modules/string-width": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-      "optional": true,
-      "dependencies": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
-        "strip-ansi": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "optional": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-      "optional": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/timed-out": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz",
-      "integrity": "sha1-84sK6B03R9YoAB9B2vxlKs5nHAo=",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
       "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
       "dependencies": {
-        "prelude-ls": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/unzip-response": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz",
-      "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/update-notifier": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-0.6.3.tgz",
-      "integrity": "sha1-d23sjaoT6WKjQeih2YNUMGtnrgg=",
-      "optional": true,
-      "dependencies": {
-        "boxen": "^0.3.1",
-        "chalk": "^1.0.0",
-        "configstore": "^2.0.0",
-        "is-npm": "^1.0.0",
-        "latest-version": "^2.0.0",
-        "semver-diff": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/url-parse-lax": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
-      "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
-      "optional": true,
-      "dependencies": {
-        "prepend-http": "^1.0.1"
+        "prelude-ls": "~1.1.2"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "optional": true
-    },
-    "node_modules/uuid": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
-      "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
-      "optional": true
-    },
     "node_modules/vulcanize": {
-      "version": "1.14.8",
-      "resolved": "https://registry.npmjs.org/vulcanize/-/vulcanize-1.14.8.tgz",
-      "integrity": "sha1-PN1vgdm68sV5bd1tLSieRZdQhvc=",
+      "version": "1.14.12",
+      "resolved": "https://registry.npmjs.org/vulcanize/-/vulcanize-1.14.12.tgz",
+      "integrity": "sha1-TI6L0vIYo0xPgoC5uBnfUd3K3uA=",
       "dependencies": {
         "dom5": "^1.3.1",
         "es6-promise": "^2.1.0",
@@ -1452,9 +749,6 @@
       },
       "bin": {
         "vulcanize": "bin/vulcanize"
-      },
-      "optionalDependencies": {
-        "update-notifier": "^0.6.0"
       }
     },
     "node_modules/web-animations-js": {
@@ -1467,18 +761,6 @@
       "resolved": "https://registry.npmjs.org/webcomponents.js/-/webcomponents.js-0.7.22.tgz",
       "integrity": "sha1-EHt7P9MBYRAOjoXkAMMr7Rvyn+o="
     },
-    "node_modules/widest-line": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz",
-      "integrity": "sha1-DAnIXCqUaD0Nfq+O4JfVZL8OEFw=",
-      "optional": true,
-      "dependencies": {
-        "string-width": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
@@ -1486,29 +768,6 @@
       "engines": {
         "node": ">=0.10.0"
       }
-    },
-    "node_modules/write-file-atomic": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz",
-      "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=",
-      "optional": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.11",
-        "imurmurhash": "^0.1.4",
-        "slide": "^1.1.5"
-      }
-    },
-    "node_modules/xdg-basedir": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz",
-      "integrity": "sha1-7byQPMOF/ARSPZZqM1UEtVBNG9I=",
-      "optional": true,
-      "dependencies": {
-        "os-homedir": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
     }
   },
   "dependencies": {
@@ -1909,18 +1168,6 @@
         "acorn": "^3.0.4"
       }
     },
-    "ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "optional": true
-    },
-    "ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-      "optional": true
-    },
     "babel-polyfill": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
@@ -1947,98 +1194,21 @@
         }
       }
     },
-    "boxen": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/boxen/-/boxen-0.3.1.tgz",
-      "integrity": "sha1-p9iYJDrmIvertrtgTXQKdsalRhs=",
-      "optional": true,
-      "requires": {
-        "chalk": "^1.1.1",
-        "filled-array": "^1.0.0",
-        "object-assign": "^4.0.1",
-        "repeating": "^2.0.0",
-        "string-width": "^1.0.1",
-        "widest-line": "^1.0.0"
-      }
-    },
-    "capture-stack-trace": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz",
-      "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==",
-      "optional": true
-    },
-    "chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-      "optional": true,
-      "requires": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
-      }
-    },
     "clone": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
       "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4="
     },
-    "code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-      "optional": true
-    },
     "codemirror": {
-      "version": "5.15.2",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.15.2.tgz",
-      "integrity": "sha1-WLPccyxtENeq6Ab0x83VapuH/o8="
-    },
-    "configstore": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz",
-      "integrity": "sha1-c3o6cDbpiGECqmCZ5HuzOrGroaE=",
-      "optional": true,
-      "requires": {
-        "dot-prop": "^3.0.0",
-        "graceful-fs": "^4.1.2",
-        "mkdirp": "^0.5.0",
-        "object-assign": "^4.0.1",
-        "os-tmpdir": "^1.0.0",
-        "osenv": "^0.1.0",
-        "uuid": "^2.0.1",
-        "write-file-atomic": "^1.1.2",
-        "xdg-basedir": "^2.0.0"
-      }
+      "version": "5.58.2",
+      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.58.2.tgz",
+      "integrity": "sha512-K/hOh24cCwRutd1Mk3uLtjWzNISOkm4fvXiMO7LucCrqbh6aJDdtqUziim3MZUI6wOY0rvY1SlL1Ork01uMy6w=="
     },
     "core-js": {
       "version": "2.6.12",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
       "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
     },
-    "core-util-is": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
-      "optional": true
-    },
-    "create-error-class": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
-      "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
-      "optional": true,
-      "requires": {
-        "capture-stack-trace": "^1.0.0"
-      }
-    },
-    "deep-extend": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "optional": true
-    },
     "deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
@@ -2065,44 +1235,11 @@
         "parse5": "^1.4.1"
       }
     },
-    "dot-prop": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz",
-      "integrity": "sha1-G3CK8JSknJoOfbyteQq6U52sEXc=",
-      "optional": true,
-      "requires": {
-        "is-obj": "^1.0.0"
-      }
-    },
-    "duplexer2": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
-      "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
-      "optional": true,
-      "requires": {
-        "readable-stream": "^2.0.2"
-      }
-    },
-    "error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "optional": true,
-      "requires": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
     "es6-promise": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz",
       "integrity": "sha1-lu258v2wGZWCKyY92KratnSBgbw="
     },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "optional": true
-    },
     "escodegen": {
       "version": "1.14.3",
       "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
@@ -2163,51 +1300,6 @@
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
       "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
     },
-    "filled-array": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz",
-      "integrity": "sha1-w8T2xmO5I0WamqKZEtLQMfFQf4Q=",
-      "optional": true
-    },
-    "got": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/got/-/got-5.6.0.tgz",
-      "integrity": "sha1-ux1+4WO3gIK7yOuDbz85UATqb78=",
-      "optional": true,
-      "requires": {
-        "create-error-class": "^3.0.1",
-        "duplexer2": "^0.1.4",
-        "is-plain-obj": "^1.0.0",
-        "is-redirect": "^1.0.0",
-        "is-retry-allowed": "^1.0.0",
-        "is-stream": "^1.0.0",
-        "lowercase-keys": "^1.0.0",
-        "node-status-codes": "^1.0.0",
-        "object-assign": "^4.0.1",
-        "parse-json": "^2.1.0",
-        "pinkie-promise": "^2.0.0",
-        "read-all-stream": "^3.0.0",
-        "readable-stream": "^2.0.5",
-        "timed-out": "^2.0.0",
-        "unzip-response": "^1.0.0",
-        "url-parse-lax": "^1.0.0"
-      }
-    },
-    "graceful-fs": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
-      "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==",
-      "optional": true
-    },
-    "has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "optional": true,
-      "requires": {
-        "ansi-regex": "^2.0.0"
-      }
-    },
     "hydrolysis": {
       "version": "1.25.0",
       "resolved": "https://registry.npmjs.org/hydrolysis/-/hydrolysis-1.25.0.tgz",
@@ -2233,95 +1325,11 @@
         }
       }
     },
-    "imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "optional": true
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "optional": true
-    },
-    "ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "optional": true
-    },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-      "optional": true
-    },
-    "is-finite": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
-      "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
-      "optional": true
-    },
-    "is-fullwidth-code-point": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-      "optional": true,
-      "requires": {
-        "number-is-nan": "^1.0.0"
-      }
-    },
-    "is-npm": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz",
-      "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ=",
-      "optional": true
-    },
-    "is-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
-      "optional": true
-    },
-    "is-plain-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
-      "optional": true
-    },
-    "is-redirect": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
-      "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
-      "optional": true
-    },
-    "is-retry-allowed": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
-      "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==",
-      "optional": true
-    },
-    "is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-      "optional": true
-    },
     "isarray": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
       "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
     },
-    "latest-version": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz",
-      "integrity": "sha1-VvjWE5YghHuAF/jx9NeOIRMkFos=",
-      "optional": true,
-      "requires": {
-        "package-json": "^2.0.0"
-      }
-    },
     "levn": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
@@ -2331,33 +1339,6 @@
         "type-check": "~0.3.2"
       }
     },
-    "lowercase-keys": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
-      "optional": true
-    },
-    "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-      "optional": true
-    },
-    "mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "optional": true,
-      "requires": {
-        "minimist": "^1.2.5"
-      }
-    },
-    "node-status-codes": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz",
-      "integrity": "sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8=",
-      "optional": true
-    },
     "nopt": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
@@ -2366,18 +1347,6 @@
         "abbrev": "1"
       }
     },
-    "number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "optional": true
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "optional": true
-    },
     "optionator": {
       "version": "0.8.3",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
@@ -2391,49 +1360,6 @@
         "word-wrap": "~1.2.3"
       }
     },
-    "os-homedir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-      "optional": true
-    },
-    "os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "optional": true
-    },
-    "osenv": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-      "optional": true,
-      "requires": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.0"
-      }
-    },
-    "package-json": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz",
-      "integrity": "sha1-DRW9Z9HLvduyyiIv8u24a8sxqLs=",
-      "optional": true,
-      "requires": {
-        "got": "^5.0.0",
-        "registry-auth-token": "^3.0.1",
-        "registry-url": "^3.0.3",
-        "semver": "^5.1.0"
-      }
-    },
-    "parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-      "optional": true,
-      "requires": {
-        "error-ex": "^1.2.0"
-      }
-    },
     "parse5": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz",
@@ -2449,196 +1375,22 @@
       "resolved": "https://registry.npmjs.org/path-posix/-/path-posix-1.0.0.tgz",
       "integrity": "sha1-BrJhE/Vr6rBCVFojv6iAA8ysJg8="
     },
-    "pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-      "optional": true
-    },
-    "pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "optional": true,
-      "requires": {
-        "pinkie": "^2.0.0"
-      }
-    },
     "prelude-ls": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
       "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
     },
-    "prepend-http": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
-      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
-      "optional": true
-    },
-    "process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "optional": true
-    },
-    "rc": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-      "optional": true,
-      "requires": {
-        "deep-extend": "^0.6.0",
-        "ini": "~1.3.0",
-        "minimist": "^1.2.0",
-        "strip-json-comments": "~2.0.1"
-      }
-    },
-    "read-all-stream": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz",
-      "integrity": "sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=",
-      "optional": true,
-      "requires": {
-        "pinkie-promise": "^2.0.0",
-        "readable-stream": "^2.0.0"
-      }
-    },
-    "readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "optional": true,
-      "requires": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "optional": true
-        }
-      }
-    },
     "regenerator-runtime": {
       "version": "0.10.5",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
       "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg="
     },
-    "registry-auth-token": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz",
-      "integrity": "sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==",
-      "optional": true,
-      "requires": {
-        "rc": "^1.1.6",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "registry-url": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz",
-      "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=",
-      "optional": true,
-      "requires": {
-        "rc": "^1.0.1"
-      }
-    },
-    "repeating": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-      "optional": true,
-      "requires": {
-        "is-finite": "^1.0.0"
-      }
-    },
-    "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "optional": true
-    },
-    "semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "optional": true
-    },
-    "semver-diff": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz",
-      "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=",
-      "optional": true,
-      "requires": {
-        "semver": "^5.0.3"
-      }
-    },
-    "slide": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz",
-      "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=",
-      "optional": true
-    },
     "source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "optional": true
     },
-    "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "optional": true,
-      "requires": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "string-width": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-      "optional": true,
-      "requires": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
-        "strip-ansi": "^3.0.0"
-      }
-    },
-    "strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "optional": true,
-      "requires": {
-        "ansi-regex": "^2.0.0"
-      }
-    },
-    "strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-      "optional": true
-    },
-    "supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-      "optional": true
-    },
-    "timed-out": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz",
-      "integrity": "sha1-84sK6B03R9YoAB9B2vxlKs5nHAo=",
-      "optional": true
-    },
     "type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
@@ -2647,58 +1399,16 @@
         "prelude-ls": "~1.1.2"
       }
     },
-    "unzip-response": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz",
-      "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=",
-      "optional": true
-    },
-    "update-notifier": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-0.6.3.tgz",
-      "integrity": "sha1-d23sjaoT6WKjQeih2YNUMGtnrgg=",
-      "optional": true,
-      "requires": {
-        "boxen": "^0.3.1",
-        "chalk": "^1.0.0",
-        "configstore": "^2.0.0",
-        "is-npm": "^1.0.0",
-        "latest-version": "^2.0.0",
-        "semver-diff": "^2.0.0"
-      }
-    },
-    "url-parse-lax": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
-      "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
-      "optional": true,
-      "requires": {
-        "prepend-http": "^1.0.1"
-      }
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "optional": true
-    },
-    "uuid": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
-      "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
-      "optional": true
-    },
     "vulcanize": {
-      "version": "1.14.8",
-      "resolved": "https://registry.npmjs.org/vulcanize/-/vulcanize-1.14.8.tgz",
-      "integrity": "sha1-PN1vgdm68sV5bd1tLSieRZdQhvc=",
+      "version": "1.14.12",
+      "resolved": "https://registry.npmjs.org/vulcanize/-/vulcanize-1.14.12.tgz",
+      "integrity": "sha1-TI6L0vIYo0xPgoC5uBnfUd3K3uA=",
       "requires": {
         "dom5": "^1.3.1",
         "es6-promise": "^2.1.0",
         "hydrolysis": "^1.19.1",
         "nopt": "^3.0.1",
-        "path-posix": "^1.0.0",
-        "update-notifier": "^0.6.0"
+        "path-posix": "^1.0.0"
       }
     },
     "web-animations-js": {
@@ -2711,39 +1421,10 @@
       "resolved": "https://registry.npmjs.org/webcomponents.js/-/webcomponents.js-0.7.22.tgz",
       "integrity": "sha1-EHt7P9MBYRAOjoXkAMMr7Rvyn+o="
     },
-    "widest-line": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz",
-      "integrity": "sha1-DAnIXCqUaD0Nfq+O4JfVZL8OEFw=",
-      "optional": true,
-      "requires": {
-        "string-width": "^1.0.1"
-      }
-    },
     "word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
       "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
-    },
-    "write-file-atomic": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz",
-      "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=",
-      "optional": true,
-      "requires": {
-        "graceful-fs": "^4.1.11",
-        "imurmurhash": "^0.1.4",
-        "slide": "^1.1.5"
-      }
-    },
-    "xdg-basedir": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz",
-      "integrity": "sha1-7byQPMOF/ARSPZZqM1UEtVBNG9I=",
-      "optional": true,
-      "requires": {
-        "os-homedir": "^1.0.0"
-      }
     }
   }
 }
diff --git a/validator/js/webui/package.json b/validator/js/webui/package.json
index f302648bc10e..0ccf784b781e 100644
--- a/validator/js/webui/package.json
+++ b/validator/js/webui/package.json
@@ -44,8 +44,8 @@
     "@polymer/paper-toast": "0.0.3",
     "@polymer/paper-toolbar": "0.0.3",
     "@polymer/polymer": "1.2.5-npm-test.2",
-    "codemirror": "5.15.2",
-    "vulcanize": "1.14.8",
+    "codemirror": "5.58.2",
+    "vulcanize": "1.14.12",
     "webcomponents.js": "0.7.22",
     "web-animations-js": "2.2.2"
   }
diff --git a/validator/package-lock.json b/validator/package-lock.json
index 36608fdd088b..d44fa485ee8b 100644
--- a/validator/package-lock.json
+++ b/validator/package-lock.json
@@ -10,10 +10,65 @@
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "devDependencies": {
-        "jasmine": "3.10.0",
+        "google-closure-compiler-java": "20230802.0.0",
+        "jasmine": "5.1.0",
         "jasmine-console-reporter": "3.1.0"
       }
     },
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@isaacs/cliui/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==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
     "node_modules/ansi-regex": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
@@ -42,13 +97,12 @@
       "dev": true
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
       "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+        "balanced-match": "^1.0.0"
       }
     },
     "node_modules/chalk": {
@@ -119,11 +173,19 @@
       "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
       "dev": true
     },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
     },
     "node_modules/defaults": {
       "version": "1.0.3",
@@ -134,6 +196,18 @@
         "clone": "^1.0.2"
       }
     },
+    "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/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/escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@@ -143,32 +217,62 @@
         "node": ">=0.8.0"
       }
     },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
+    "node_modules/foreground-child": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
+      "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/foreground-child/node_modules/signal-exit": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.0.2.tgz",
+      "integrity": "sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
     },
     "node_modules/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+      "version": "10.2.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.2.6.tgz",
+      "integrity": "sha512-U/rnDpXJGF414QQQZv5uVsabTVxMSwzS5CH0p3DRCIV6ownl4f7PzGnkGmvlum2wB+9RlJWJZ6ACU1INnBqiPA==",
       "dev": true,
       "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"
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^2.0.3",
+        "minimatch": "^9.0.1",
+        "minipass": "^5.0.0 || ^6.0.2",
+        "path-scurry": "^1.7.0"
+      },
+      "bin": {
+        "glob": "dist/cjs/src/bin.js"
       },
       "engines": {
-        "node": "*"
+        "node": ">=16 || 14 >=14.17"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/google-closure-compiler-java": {
+      "version": "20230802.0.0",
+      "resolved": "https://registry.npmjs.org/google-closure-compiler-java/-/google-closure-compiler-java-20230802.0.0.tgz",
+      "integrity": "sha512-PWKLMLwj7pR/U0yYbiy649LLqAscu+F1gyY4Y/jK6CmSLb8cIJbL8BTJd00828TzTNfWnYwxbkcQw0y9C2YsGw==",
+      "dev": true
+    },
     "node_modules/has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
@@ -178,30 +282,47 @@
         "node": ">=4"
       }
     },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
       "dev": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "dev": true
     },
+    "node_modules/jackspeak": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.2.1.tgz",
+      "integrity": "sha512-MXbxovZ/Pm42f6cDIDkl3xpwv1AGwObKwfmjs2nQePiy85tP3fatofl3FC1aBsOtP/6fq5SbtgHwWcMsLP+bDw==",
+      "dev": true,
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
     "node_modules/jasmine": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.10.0.tgz",
-      "integrity": "sha512-2Y42VsC+3CQCTzTwJezOvji4qLORmKIE0kwowWC+934Krn6ZXNQYljiwK5st9V3PVx96BSiDYXSB60VVah3IlQ==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-5.1.0.tgz",
+      "integrity": "sha512-prmJlC1dbLhti4nE4XAPDWmfJesYO15sjGXVp7Cs7Ym5I9Xtwa/hUHxxJXjnpfLO72+ySttA0Ztf8g/RiVnUKw==",
       "dev": true,
       "dependencies": {
-        "glob": "^7.1.6",
-        "jasmine-core": "~3.10.0"
+        "glob": "^10.2.2",
+        "jasmine-core": "~5.1.0"
       },
       "bin": {
         "jasmine": "bin/jasmine.js"
@@ -228,9 +349,9 @@
       }
     },
     "node_modules/jasmine-core": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.10.1.tgz",
-      "integrity": "sha512-ooZWSDVAdh79Rrj4/nnfklL3NQVra0BcuhcuWoAwwi+znLDoUeH87AFfeX8s+YeYi6xlv5nveRyaA1v7CintfA==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.1.0.tgz",
+      "integrity": "sha512-bFMMwpKuTZXCuGd51yClFobw5SOtad1kmdWnYO8dNwYV8i01Xj0C2+nyQpSKl1EKxiPfyd1ZgBl/rsusL3aS6w==",
       "dev": true
     },
     "node_modules/lodash": {
@@ -251,6 +372,15 @@
         "node": ">=4"
       }
     },
+    "node_modules/lru-cache": {
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-9.1.2.tgz",
+      "integrity": "sha512-ERJq3FOzJTxBbFjZ7iDs+NiK4VI9Wz+RdrrAB8dio1oV+YvdPzUEE4QNiT2VD51DkIbCYRUUzCRkssXCHqSnKQ==",
+      "dev": true,
+      "engines": {
+        "node": "14 || >=16.14"
+      }
+    },
     "node_modules/mimic-fn": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
@@ -261,15 +391,27 @@
       }
     },
     "node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.1.tgz",
+      "integrity": "sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==",
       "dev": true,
       "dependencies": {
-        "brace-expansion": "^1.1.7"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": "*"
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/minipass": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-6.0.2.tgz",
+      "integrity": "sha512-MzWSV5nYVT7mVyWCwn2o7JH13w2TBRmmSqSRCKzTw+lmft9X4z+3wjvs06Tzijo5z4W/kahUCDpRXTF+ZrmF/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
       }
     },
     "node_modules/node-emoji": {
@@ -281,15 +423,6 @@
         "lodash": "^4.17.21"
       }
     },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
     "node_modules/onetime": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
@@ -319,13 +452,29 @@
         "node": ">=6"
       }
     },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-scurry": {
+      "version": "1.9.2",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.9.2.tgz",
+      "integrity": "sha512-qSDLy2aGFPm8i4rsbHd4MNyTcrzHFsLQykrtbuGRknZZCBBVXSv2tSCDN2Cg6Rt/GFRw8GoW9y9Ecw5rIPG1sg==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^9.1.1",
+        "minipass": "^5.0.0 || ^6.0.2"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/perfy": {
@@ -347,12 +496,119 @@
         "node": ">=4"
       }
     },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/signal-exit": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz",
       "integrity": "sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ==",
       "dev": true
     },
+    "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==",
+      "dev": true,
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/string-width-cjs": {
+      "name": "string-width",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/string-width-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width/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==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/string-width/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
     "node_modules/strip-ansi": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
@@ -365,6 +621,28 @@
         "node": ">=6"
       }
     },
+    "node_modules/strip-ansi-cjs": {
+      "name": "strip-ansi",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/supports-color": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -386,14 +664,209 @@
         "defaults": "^1.0.3"
       }
     },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs": {
+      "name": "wrap-ansi",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
       "dev": true
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi/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==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
     }
   },
   "dependencies": {
+    "@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "dev": true,
+      "requires": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
+      "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
+        },
+        "strip-ansi": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+          "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^6.0.1"
+          }
+        }
+      }
+    },
+    "@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "dev": true,
+      "optional": true
+    },
     "ansi-regex": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
@@ -416,13 +889,12 @@
       "dev": true
     },
     "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
       "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+        "balanced-match": "^1.0.0"
       }
     },
     "chalk": {
@@ -478,11 +950,16 @@
       "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
       "dev": true
     },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
+    "cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "requires": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      }
     },
     "defaults": {
       "version": "1.0.3",
@@ -493,62 +970,97 @@
         "clone": "^1.0.2"
       }
     },
+    "eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "dev": true
+    },
+    "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
+    },
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
       "dev": true
     },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
+    "foreground-child": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
+      "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^4.0.1"
+      },
+      "dependencies": {
+        "signal-exit": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.0.2.tgz",
+          "integrity": "sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q==",
+          "dev": true
+        }
+      }
     },
     "glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+      "version": "10.2.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.2.6.tgz",
+      "integrity": "sha512-U/rnDpXJGF414QQQZv5uVsabTVxMSwzS5CH0p3DRCIV6ownl4f7PzGnkGmvlum2wB+9RlJWJZ6ACU1INnBqiPA==",
       "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"
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^2.0.3",
+        "minimatch": "^9.0.1",
+        "minipass": "^5.0.0 || ^6.0.2",
+        "path-scurry": "^1.7.0"
       }
     },
+    "google-closure-compiler-java": {
+      "version": "20230802.0.0",
+      "resolved": "https://registry.npmjs.org/google-closure-compiler-java/-/google-closure-compiler-java-20230802.0.0.tgz",
+      "integrity": "sha512-PWKLMLwj7pR/U0yYbiy649LLqAscu+F1gyY4Y/jK6CmSLb8cIJbL8BTJd00828TzTNfWnYwxbkcQw0y9C2YsGw==",
+      "dev": true
+    },
     "has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
       "dev": true
     },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+    "is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "jackspeak": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.2.1.tgz",
+      "integrity": "sha512-MXbxovZ/Pm42f6cDIDkl3xpwv1AGwObKwfmjs2nQePiy85tP3fatofl3FC1aBsOtP/6fq5SbtgHwWcMsLP+bDw==",
       "dev": true,
       "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
+        "@isaacs/cliui": "^8.0.2",
+        "@pkgjs/parseargs": "^0.11.0"
       }
     },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
     "jasmine": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.10.0.tgz",
-      "integrity": "sha512-2Y42VsC+3CQCTzTwJezOvji4qLORmKIE0kwowWC+934Krn6ZXNQYljiwK5st9V3PVx96BSiDYXSB60VVah3IlQ==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-5.1.0.tgz",
+      "integrity": "sha512-prmJlC1dbLhti4nE4XAPDWmfJesYO15sjGXVp7Cs7Ym5I9Xtwa/hUHxxJXjnpfLO72+ySttA0Ztf8g/RiVnUKw==",
       "dev": true,
       "requires": {
-        "glob": "^7.1.6",
-        "jasmine-core": "~3.10.0"
+        "glob": "^10.2.2",
+        "jasmine-core": "~5.1.0"
       }
     },
     "jasmine-console-reporter": {
@@ -566,9 +1078,9 @@
       }
     },
     "jasmine-core": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.10.1.tgz",
-      "integrity": "sha512-ooZWSDVAdh79Rrj4/nnfklL3NQVra0BcuhcuWoAwwi+znLDoUeH87AFfeX8s+YeYi6xlv5nveRyaA1v7CintfA==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.1.0.tgz",
+      "integrity": "sha512-bFMMwpKuTZXCuGd51yClFobw5SOtad1kmdWnYO8dNwYV8i01Xj0C2+nyQpSKl1EKxiPfyd1ZgBl/rsusL3aS6w==",
       "dev": true
     },
     "lodash": {
@@ -586,6 +1098,12 @@
         "chalk": "^2.0.1"
       }
     },
+    "lru-cache": {
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-9.1.2.tgz",
+      "integrity": "sha512-ERJq3FOzJTxBbFjZ7iDs+NiK4VI9Wz+RdrrAB8dio1oV+YvdPzUEE4QNiT2VD51DkIbCYRUUzCRkssXCHqSnKQ==",
+      "dev": true
+    },
     "mimic-fn": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
@@ -593,14 +1111,20 @@
       "dev": true
     },
     "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.1.tgz",
+      "integrity": "sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==",
       "dev": true,
       "requires": {
-        "brace-expansion": "^1.1.7"
+        "brace-expansion": "^2.0.1"
       }
     },
+    "minipass": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-6.0.2.tgz",
+      "integrity": "sha512-MzWSV5nYVT7mVyWCwn2o7JH13w2TBRmmSqSRCKzTw+lmft9X4z+3wjvs06Tzijo5z4W/kahUCDpRXTF+ZrmF/w==",
+      "dev": true
+    },
     "node-emoji": {
       "version": "1.11.0",
       "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.11.0.tgz",
@@ -610,15 +1134,6 @@
         "lodash": "^4.17.21"
       }
     },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "requires": {
-        "wrappy": "1"
-      }
-    },
     "onetime": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
@@ -642,12 +1157,22 @@
         "wcwidth": "^1.0.1"
       }
     },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+    "path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "dev": true
     },
+    "path-scurry": {
+      "version": "1.9.2",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.9.2.tgz",
+      "integrity": "sha512-qSDLy2aGFPm8i4rsbHd4MNyTcrzHFsLQykrtbuGRknZZCBBVXSv2tSCDN2Cg6Rt/GFRw8GoW9y9Ecw5rIPG1sg==",
+      "dev": true,
+      "requires": {
+        "lru-cache": "^9.1.1",
+        "minipass": "^5.0.0 || ^6.0.2"
+      }
+    },
     "perfy": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/perfy/-/perfy-1.1.5.tgz",
@@ -664,12 +1189,89 @@
         "signal-exit": "^3.0.2"
       }
     },
+    "shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "requires": {
+        "shebang-regex": "^3.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true
+    },
     "signal-exit": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz",
       "integrity": "sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ==",
       "dev": 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==",
+      "dev": true,
+      "requires": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.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
+        },
+        "strip-ansi": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+          "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^6.0.1"
+          }
+        }
+      }
+    },
+    "string-width-cjs": {
+      "version": "npm:string-width@4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "requires": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+          "dev": true
+        },
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.1"
+          }
+        }
+      }
+    },
     "strip-ansi": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
@@ -679,6 +1281,23 @@
         "ansi-regex": "^4.1.0"
       }
     },
+    "strip-ansi-cjs": {
+      "version": "npm:strip-ansi@6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^5.0.1"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+          "dev": true
+        }
+      }
+    },
     "supports-color": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -697,11 +1316,117 @@
         "defaults": "^1.0.3"
       }
     },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
+    "which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.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
+        },
+        "ansi-styles": {
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+          "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+          "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^6.0.1"
+          }
+        }
+      }
+    },
+    "wrap-ansi-cjs": {
+      "version": "npm:wrap-ansi@7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "4.2.3",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.1"
+          }
+        },
+        "strip-ansi": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.1"
+          }
+        }
+      }
     }
   }
 }
diff --git a/validator/package.json b/validator/package.json
index 3f3d44edcf4f..fc98f64840b3 100644
--- a/validator/package.json
+++ b/validator/package.json
@@ -12,7 +12,8 @@
     "preinstall": "node ../build-system/common/check-package-manager.js"
   },
   "devDependencies": {
-    "jasmine": "3.10.0",
+    "google-closure-compiler-java": "20230802.0.0",
+    "jasmine": "5.1.0",
     "jasmine-console-reporter": "3.1.0"
   }
 }
diff --git a/validator/testdata/amp4ads_feature_tests/amp_pixel_ar.html b/validator/testdata/amp4ads_feature_tests/amp_pixel_ar.html
new file mode 100644
index 000000000000..4db96dd929d3
--- /dev/null
+++ b/validator/testdata/amp4ads_feature_tests/amp_pixel_ar.html
@@ -0,0 +1,18 @@
+<!--
+  Test Description:
+  Verify amp-pixel with Attribution Reporting API is valid.
+-->
+<!doctype html>
+<html ⚡4ads>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width,minimum-scale=1">
+  <style amp4ads-boilerplate>body{visibility:hidden}</style>
+  <script async src="https://cdn.ampproject.org/amp4ads-v0.js"></script>
+</head>
+<body>
+  Hello, world.
+  <amp-pixel src="https://pixel.me?yes=please" attributionsrc=""></amp-pixel>
+  <amp-pixel src="https://pixel.me?yes=please" attributionsrc="https://adtech.example"></amp-pixel>
+</body>
+</html>
diff --git a/validator/testdata/amp4ads_feature_tests/amp_pixel_ar.out b/validator/testdata/amp4ads_feature_tests/amp_pixel_ar.out
new file mode 100644
index 000000000000..edd16b978f2a
--- /dev/null
+++ b/validator/testdata/amp4ads_feature_tests/amp_pixel_ar.out
@@ -0,0 +1,19 @@
+PASS
+|  <!--
+|    Test Description:
+|    Verify amp-pixel with Attribution Reporting API is valid.
+|  -->
+|  <!doctype html>
+|  <html ⚡4ads>
+|  <head>
+|    <meta charset="utf-8">
+|    <meta name="viewport" content="width=device-width,minimum-scale=1">
+|    <style amp4ads-boilerplate>body{visibility:hidden}</style>
+|    <script async src="https://cdn.ampproject.org/amp4ads-v0.js"></script>
+|  </head>
+|  <body>
+|    Hello, world.
+|    <amp-pixel src="https://pixel.me?yes=please" attributionsrc=""></amp-pixel>
+|    <amp-pixel src="https://pixel.me?yes=please" attributionsrc="https://adtech.example"></amp-pixel>
+|  </body>
+|  </html>
\ No newline at end of file
diff --git a/validator/testdata/amp4ads_feature_tests/anchor_attribution_reporting.html b/validator/testdata/amp4ads_feature_tests/anchor_attribution_reporting.html
new file mode 100644
index 000000000000..4bd80f5d0db3
--- /dev/null
+++ b/validator/testdata/amp4ads_feature_tests/anchor_attribution_reporting.html
@@ -0,0 +1,19 @@
+<!--
+  Test Description:
+  Enable the attribution reporting API for anchor elements
+  https://github.com/WICG/attribution-reporting-api/blob/main/EVENT.md#api-overview
+-->
+<!doctype html>
+<html ⚡4ads>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width,minimum-scale=1">
+  <style amp4ads-boilerplate>body{visibility:hidden}</style>
+  <script async src="https://cdn.ampproject.org/amp4ads-v0.js"></script>
+</head>
+<body>
+  Hello, world.
+  <a attributionsrc></a>
+  <a attributionsrc="https://adtech.example"></a>
+</body>
+</html>
diff --git a/validator/testdata/amp4ads_feature_tests/anchor_attribution_reporting.out b/validator/testdata/amp4ads_feature_tests/anchor_attribution_reporting.out
new file mode 100644
index 000000000000..27f2ec28e7df
--- /dev/null
+++ b/validator/testdata/amp4ads_feature_tests/anchor_attribution_reporting.out
@@ -0,0 +1,20 @@
+PASS
+|  <!--
+|    Test Description:
+|    Enable the attribution reporting API for anchor elements
+|    https://github.com/WICG/attribution-reporting-api/blob/main/EVENT.md#api-overview
+|  -->
+|  <!doctype html>
+|  <html ⚡4ads>
+|  <head>
+|    <meta charset="utf-8">
+|    <meta name="viewport" content="width=device-width,minimum-scale=1">
+|    <style amp4ads-boilerplate>body{visibility:hidden}</style>
+|    <script async src="https://cdn.ampproject.org/amp4ads-v0.js"></script>
+|  </head>
+|  <body>
+|    Hello, world.
+|    <a attributionsrc></a>
+|    <a attributionsrc="https://adtech.example"></a>
+|  </body>
+|  </html>
\ No newline at end of file
diff --git a/validator/testdata/amp4ads_feature_tests/script_release_versions.out b/validator/testdata/amp4ads_feature_tests/script_release_versions.out
index f2d3be86ef2f..e19b90c91c47 100644
--- a/validator/testdata/amp4ads_feature_tests/script_release_versions.out
+++ b/validator/testdata/amp4ads_feature_tests/script_release_versions.out
@@ -42,14 +42,14 @@ amp4ads_feature_tests/script_release_versions.html:23:2 The attribute 'nomodule'
 >>   ^~~~~~~~~
 amp4ads_feature_tests/script_release_versions.html:26:2 The script version for 'amp-audio' is a module/nomodule LTS version which mismatches with the first script on the page using the module/nomodule version. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml#required-markup)
 >>   ^~~~~~~~~
-amp4ads_feature_tests/script_release_versions.html:26:2 The attribute 'type' in tag 'amp-audio extension script' is set to the invalid value 'module'. (see https://amp.dev/documentation/components/amp-audio)
+amp4ads_feature_tests/script_release_versions.html:26:2 The attribute 'type' in tag 'amp-audio v0.1 extension script' is set to the invalid value 'module'. (see https://amp.dev/documentation/components/amp-audio)
 |    <script async custom-element=amp-audio nomodule src=https://cdn.ampproject.org/lts/v0/amp-audio-0.1.js></script>
 >>   ^~~~~~~~~
-amp4ads_feature_tests/script_release_versions.html:27:2 The attribute 'nomodule' may not appear in tag 'amp-audio extension script'. (see https://amp.dev/documentation/components/amp-audio)
+amp4ads_feature_tests/script_release_versions.html:27:2 The attribute 'nomodule' may not appear in tag 'amp-audio v0.1 extension script'. (see https://amp.dev/documentation/components/amp-audio)
 >>   ^~~~~~~~~
 amp4ads_feature_tests/script_release_versions.html:27:2 The script version for 'amp-audio' is a module/nomodule LTS version which mismatches with the first script on the page using the module/nomodule version. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml#required-markup)
 |  </head>
 |  <body>
 |    Hello, world.
 |  </body>
-|  </html>
+|  </html>
\ No newline at end of file
diff --git a/validator/testdata/amp4email_feature_tests/css_declarations.html b/validator/testdata/amp4email_feature_tests/css_declarations.html
index 48129280046a..2d9dab1e5192 100644
--- a/validator/testdata/amp4email_feature_tests/css_declarations.html
+++ b/validator/testdata/amp4email_feature_tests/css_declarations.html
@@ -239,8 +239,7 @@
       pitch-range: foo;
       place-items: foo;
       pointer-events: foo;
-      /* position has special rules. Don't use `foo` */
-      position: initial;
+      position: foo;
       quotes: foo;
       resize: foo;
       richness: foo;
diff --git a/validator/testdata/amp4email_feature_tests/css_declarations.out b/validator/testdata/amp4email_feature_tests/css_declarations.out
index efcfacb3d1ef..d7adcd0c9d8a 100644
--- a/validator/testdata/amp4email_feature_tests/css_declarations.out
+++ b/validator/testdata/amp4email_feature_tests/css_declarations.out
@@ -242,8 +242,7 @@ amp4email_feature_tests/css_declarations.html:9:0 Tag 'html' marked with attribu
 |        pitch-range: foo;
 |        place-items: foo;
 |        pointer-events: foo;
-|        /* position has special rules. Don't use `foo` */
-|        position: initial;
+|        position: foo;
 |        quotes: foo;
 |        resize: foo;
 |        richness: foo;
diff --git a/validator/testdata/amp4email_feature_tests/css_i_amphtml.out b/validator/testdata/amp4email_feature_tests/css_i_amphtml.out
index 0c89e783eea0..a9e895a66304 100644
--- a/validator/testdata/amp4email_feature_tests/css_i_amphtml.out
+++ b/validator/testdata/amp4email_feature_tests/css_i_amphtml.out
@@ -11,7 +11,7 @@ FAIL
 |    <script async src="https://cdn.ampproject.org/v0.js"></script>
 |    <style amp-custom>
 >>   ^~~~~~~~~
-amp4email_feature_tests/css_i_amphtml.html:11:2 The text inside tag 'style amp-custom' contains 'CSS i-amphtml- name prefix', which is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_i_amphtml.html:11:2 The text inside tag 'style amp-custom' contains 'CSS i-amphtml- name prefix', which is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |      i-amphtml-sizer {}
 |      .i-amphtml-hidden {}
 |      #i-amphtml-wrapper {}
diff --git a/validator/testdata/amp4email_feature_tests/css_strict.html b/validator/testdata/amp4email_feature_tests/css_strict.html
index acc95fa0a5bc..e5644a8559eb 100644
--- a/validator/testdata/amp4email_feature_tests/css_strict.html
+++ b/validator/testdata/amp4email_feature_tests/css_strict.html
@@ -236,8 +236,7 @@
       pitch-range: foo;
       place-items: foo;
       pointer-events: foo;
-      /* position has special rules. Don't use `foo` */
-      position: initial;
+      position: foo;
       quotes: foo;
       resize: foo;
       richness: foo;
diff --git a/validator/testdata/amp4email_feature_tests/css_strict.out b/validator/testdata/amp4email_feature_tests/css_strict.out
index 36c73654084a..e1ee635e7dc8 100644
--- a/validator/testdata/amp4email_feature_tests/css_strict.out
+++ b/validator/testdata/amp4email_feature_tests/css_strict.out
@@ -20,42 +20,42 @@ FAIL
 |        align-self: foo;
 |        alignment-baseline: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:20:6 CSS syntax error in tag 'style amp-custom' - invalid property 'alignment-baseline'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:20:6 CSS syntax error in tag 'style amp-custom' - invalid property 'alignment-baseline'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        all: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:21:6 CSS syntax error in tag 'style amp-custom' - invalid property 'all'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:21:6 CSS syntax error in tag 'style amp-custom' - invalid property 'all'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        animation-delay: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:22:6 CSS syntax error in tag 'style amp-custom' - invalid property 'animation-delay'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:22:6 CSS syntax error in tag 'style amp-custom' - invalid property 'animation-delay'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        animation-direction: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:23:6 CSS syntax error in tag 'style amp-custom' - invalid property 'animation-direction'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:23:6 CSS syntax error in tag 'style amp-custom' - invalid property 'animation-direction'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        animation-duration: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:24:6 CSS syntax error in tag 'style amp-custom' - invalid property 'animation-duration'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:24:6 CSS syntax error in tag 'style amp-custom' - invalid property 'animation-duration'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        animation-fill-mode: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:25:6 CSS syntax error in tag 'style amp-custom' - invalid property 'animation-fill-mode'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:25:6 CSS syntax error in tag 'style amp-custom' - invalid property 'animation-fill-mode'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        animation-iteration-count: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:26:6 CSS syntax error in tag 'style amp-custom' - invalid property 'animation-iteration-count'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:26:6 CSS syntax error in tag 'style amp-custom' - invalid property 'animation-iteration-count'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        animation-name: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:27:6 CSS syntax error in tag 'style amp-custom' - invalid property 'animation-name'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:27:6 CSS syntax error in tag 'style amp-custom' - invalid property 'animation-name'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        animation-play-state: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:28:6 CSS syntax error in tag 'style amp-custom' - invalid property 'animation-play-state'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:28:6 CSS syntax error in tag 'style amp-custom' - invalid property 'animation-play-state'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        animation-timing-function: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:29:6 CSS syntax error in tag 'style amp-custom' - invalid property 'animation-timing-function'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:29:6 CSS syntax error in tag 'style amp-custom' - invalid property 'animation-timing-function'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        animation: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:30:6 CSS syntax error in tag 'style amp-custom' - invalid property 'animation'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:30:6 CSS syntax error in tag 'style amp-custom' - invalid property 'animation'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        appearance: foo;
 |        azimuth: foo;
 |        backface-visibility: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:33:6 CSS syntax error in tag 'style amp-custom' - invalid property 'backface-visibility'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:33:6 CSS syntax error in tag 'style amp-custom' - invalid property 'backface-visibility'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        background-attachment: foo;
 |        background-blend-mode: foo;
 |        background-clip: foo;
@@ -68,7 +68,7 @@ amp4email_feature_tests/css_strict.html:33:6 CSS syntax error in tag 'style amp-
 |        background: foo;
 |        baseline-shift: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:44:6 CSS syntax error in tag 'style amp-custom' - invalid property 'baseline-shift'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:44:6 CSS syntax error in tag 'style amp-custom' - invalid property 'baseline-shift'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        border-bottom-color: foo;
 |        border-bottom-left-radius: foo;
 |        border-bottom-right-radius: foo;
@@ -79,22 +79,22 @@ amp4email_feature_tests/css_strict.html:44:6 CSS syntax error in tag 'style amp-
 |        border-color: foo;
 |        border-image-outset: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:53:6 CSS syntax error in tag 'style amp-custom' - invalid property 'border-image-outset'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:53:6 CSS syntax error in tag 'style amp-custom' - invalid property 'border-image-outset'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        border-image-repeat: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:54:6 CSS syntax error in tag 'style amp-custom' - invalid property 'border-image-repeat'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:54:6 CSS syntax error in tag 'style amp-custom' - invalid property 'border-image-repeat'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        border-image-slice: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:55:6 CSS syntax error in tag 'style amp-custom' - invalid property 'border-image-slice'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:55:6 CSS syntax error in tag 'style amp-custom' - invalid property 'border-image-slice'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        border-image-source: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:56:6 CSS syntax error in tag 'style amp-custom' - invalid property 'border-image-source'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:56:6 CSS syntax error in tag 'style amp-custom' - invalid property 'border-image-source'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        border-image-width: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:57:6 CSS syntax error in tag 'style amp-custom' - invalid property 'border-image-width'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:57:6 CSS syntax error in tag 'style amp-custom' - invalid property 'border-image-width'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        border-image: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:58:6 CSS syntax error in tag 'style amp-custom' - invalid property 'border-image'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:58:6 CSS syntax error in tag 'style amp-custom' - invalid property 'border-image'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        border-left-color: foo;
 |        border-left-style: foo;
 |        border-left-width: foo;
@@ -117,7 +117,7 @@ amp4email_feature_tests/css_strict.html:58:6 CSS syntax error in tag 'style amp-
 |        bottom: foo;
 |        box-decoration-break: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:79:6 CSS syntax error in tag 'style amp-custom' - invalid property 'box-decoration-break'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:79:6 CSS syntax error in tag 'style amp-custom' - invalid property 'box-decoration-break'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        box-shadow: foo;
 |        box-sizing: foo;
 |        break-after: foo;
@@ -128,26 +128,26 @@ amp4email_feature_tests/css_strict.html:79:6 CSS syntax error in tag 'style amp-
 |        clear: foo;
 |        clip-path: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:88:6 CSS syntax error in tag 'style amp-custom' - invalid property 'clip-path'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:88:6 CSS syntax error in tag 'style amp-custom' - invalid property 'clip-path'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        clip-rule: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:89:6 CSS syntax error in tag 'style amp-custom' - invalid property 'clip-rule'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:89:6 CSS syntax error in tag 'style amp-custom' - invalid property 'clip-rule'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        clip: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:90:6 CSS syntax error in tag 'style amp-custom' - invalid property 'clip'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:90:6 CSS syntax error in tag 'style amp-custom' - invalid property 'clip'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        color-adjust: foo;
 |        color-interpolation-filters: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:92:6 CSS syntax error in tag 'style amp-custom' - invalid property 'color-interpolation-filters'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:92:6 CSS syntax error in tag 'style amp-custom' - invalid property 'color-interpolation-filters'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        color-interpolation: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:93:6 CSS syntax error in tag 'style amp-custom' - invalid property 'color-interpolation'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:93:6 CSS syntax error in tag 'style amp-custom' - invalid property 'color-interpolation'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        color-profile: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:94:6 CSS syntax error in tag 'style amp-custom' - invalid property 'color-profile'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:94:6 CSS syntax error in tag 'style amp-custom' - invalid property 'color-profile'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        color-rendering: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:95:6 CSS syntax error in tag 'style amp-custom' - invalid property 'color-rendering'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:95:6 CSS syntax error in tag 'style amp-custom' - invalid property 'color-rendering'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        color: foo;
 |        column-count: foo;
 |        column-fill: foo;
@@ -161,34 +161,34 @@ amp4email_feature_tests/css_strict.html:95:6 CSS syntax error in tag 'style amp-
 |        columns: foo;
 |        content: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:107:6 CSS syntax error in tag 'style amp-custom' - invalid property 'content'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:107:6 CSS syntax error in tag 'style amp-custom' - invalid property 'content'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        counter-increment: foo;
 |        counter-reset: foo;
 |        cursor: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:110:6 CSS syntax error in tag 'style amp-custom' - the property 'cursor' is set to the disallowed value 'foo'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:110:6 CSS syntax error in tag 'style amp-custom' - the property 'cursor' is set to the disallowed value 'foo'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        direction: foo;
 |        display: foo;
 |        dominant-baseline: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:113:6 CSS syntax error in tag 'style amp-custom' - invalid property 'dominant-baseline'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:113:6 CSS syntax error in tag 'style amp-custom' - invalid property 'dominant-baseline'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        elevation: foo;
 |        empty-cells: foo;
 |        enable-background: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:116:6 CSS syntax error in tag 'style amp-custom' - invalid property 'enable-background'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:116:6 CSS syntax error in tag 'style amp-custom' - invalid property 'enable-background'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        fill-opacity: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:117:6 CSS syntax error in tag 'style amp-custom' - invalid property 'fill-opacity'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:117:6 CSS syntax error in tag 'style amp-custom' - invalid property 'fill-opacity'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        fill-rule: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:118:6 CSS syntax error in tag 'style amp-custom' - invalid property 'fill-rule'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:118:6 CSS syntax error in tag 'style amp-custom' - invalid property 'fill-rule'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        fill: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:119:6 CSS syntax error in tag 'style amp-custom' - invalid property 'fill'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:119:6 CSS syntax error in tag 'style amp-custom' - invalid property 'fill'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        filter: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:120:6 CSS syntax error in tag 'style amp-custom' - the property 'filter' is set to the disallowed value 'foo'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:120:6 CSS syntax error in tag 'style amp-custom' - the property 'filter' is set to the disallowed value 'foo'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        flex-basis: foo;
 |        flex-direction: foo;
 |        flex-flow: foo;
@@ -199,16 +199,16 @@ amp4email_feature_tests/css_strict.html:120:6 CSS syntax error in tag 'style amp
 |        float: foo;
 |        flood-color: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:129:6 CSS syntax error in tag 'style amp-custom' - invalid property 'flood-color'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:129:6 CSS syntax error in tag 'style amp-custom' - invalid property 'flood-color'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        flood-opacity: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:130:6 CSS syntax error in tag 'style amp-custom' - invalid property 'flood-opacity'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:130:6 CSS syntax error in tag 'style amp-custom' - invalid property 'flood-opacity'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        font-family: foo;
 |        font-feature-settings: foo;
 |        font-kerning: foo;
 |        font-language-override: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:134:6 CSS syntax error in tag 'style amp-custom' - invalid property 'font-language-override'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:134:6 CSS syntax error in tag 'style amp-custom' - invalid property 'font-language-override'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        font-size-adjust: foo;
 |        font-size: foo;
 |        font-stretch: foo;
@@ -221,7 +221,7 @@ amp4email_feature_tests/css_strict.html:134:6 CSS syntax error in tag 'style amp
 |        font-variant-numeric: foo;
 |        font-variant-position: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:145:6 CSS syntax error in tag 'style amp-custom' - invalid property 'font-variant-position'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:145:6 CSS syntax error in tag 'style amp-custom' - invalid property 'font-variant-position'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        font-variant: foo;
 |        font-variation-settings: foo;
 |        font-weight: foo;
@@ -229,10 +229,10 @@ amp4email_feature_tests/css_strict.html:145:6 CSS syntax error in tag 'style amp
 |        gap: foo;
 |        glyph-orientation-horizontal: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:151:6 CSS syntax error in tag 'style amp-custom' - invalid property 'glyph-orientation-horizontal'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:151:6 CSS syntax error in tag 'style amp-custom' - invalid property 'glyph-orientation-horizontal'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        glyph-orientation-vertical: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:152:6 CSS syntax error in tag 'style amp-custom' - invalid property 'glyph-orientation-vertical'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:152:6 CSS syntax error in tag 'style amp-custom' - invalid property 'glyph-orientation-vertical'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        grid-area: foo;
 |        grid-auto-columns: foo;
 |        grid-auto-flow: foo;
@@ -240,16 +240,16 @@ amp4email_feature_tests/css_strict.html:152:6 CSS syntax error in tag 'style amp
 |        grid-column-end: foo;
 |        grid-column-gap: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:158:6 CSS syntax error in tag 'style amp-custom' - invalid property 'grid-column-gap'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:158:6 CSS syntax error in tag 'style amp-custom' - invalid property 'grid-column-gap'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        grid-column-start: foo;
 |        grid-column: foo;
 |        grid-gap: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:161:6 CSS syntax error in tag 'style amp-custom' - invalid property 'grid-gap'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:161:6 CSS syntax error in tag 'style amp-custom' - invalid property 'grid-gap'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        grid-row-end: foo;
 |        grid-row-gap: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:163:6 CSS syntax error in tag 'style amp-custom' - invalid property 'grid-row-gap'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:163:6 CSS syntax error in tag 'style amp-custom' - invalid property 'grid-row-gap'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        grid-row-start: foo;
 |        grid-row: foo;
 |        grid-template-areas: foo;
@@ -259,13 +259,13 @@ amp4email_feature_tests/css_strict.html:163:6 CSS syntax error in tag 'style amp
 |        grid: foo;
 |        hanging-punctuation: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:171:6 CSS syntax error in tag 'style amp-custom' - invalid property 'hanging-punctuation'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:171:6 CSS syntax error in tag 'style amp-custom' - invalid property 'hanging-punctuation'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        height: foo;
 |        hyphens: foo;
 |        image-orientation: foo;
 |        image-rendering: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:175:6 CSS syntax error in tag 'style amp-custom' - invalid property 'image-rendering'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:175:6 CSS syntax error in tag 'style amp-custom' - invalid property 'image-rendering'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        image-resolution: foo;
 |        inline-size: foo;
 |        isolation: foo;
@@ -274,17 +274,17 @@ amp4email_feature_tests/css_strict.html:175:6 CSS syntax error in tag 'style amp
 |        justify-self: foo;
 |        kerning: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:182:6 CSS syntax error in tag 'style amp-custom' - invalid property 'kerning'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:182:6 CSS syntax error in tag 'style amp-custom' - invalid property 'kerning'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        left: foo;
 |        letter-spacing: foo;
 |        lighting-color: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:185:6 CSS syntax error in tag 'style amp-custom' - invalid property 'lighting-color'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:185:6 CSS syntax error in tag 'style amp-custom' - invalid property 'lighting-color'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        line-break: foo;
 |        line-height: foo;
 |        list-style-image: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:188:6 CSS syntax error in tag 'style amp-custom' - invalid property 'list-style-image'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:188:6 CSS syntax error in tag 'style amp-custom' - invalid property 'list-style-image'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        list-style-position: foo;
 |        list-style-type: foo;
 |        list-style: foo;
@@ -295,19 +295,19 @@ amp4email_feature_tests/css_strict.html:188:6 CSS syntax error in tag 'style amp
 |        margin: foo;
 |        marker-end: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:197:6 CSS syntax error in tag 'style amp-custom' - invalid property 'marker-end'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:197:6 CSS syntax error in tag 'style amp-custom' - invalid property 'marker-end'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        marker-mid: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:198:6 CSS syntax error in tag 'style amp-custom' - invalid property 'marker-mid'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:198:6 CSS syntax error in tag 'style amp-custom' - invalid property 'marker-mid'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        marker-start: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:199:6 CSS syntax error in tag 'style amp-custom' - invalid property 'marker-start'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:199:6 CSS syntax error in tag 'style amp-custom' - invalid property 'marker-start'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        marker: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:200:6 CSS syntax error in tag 'style amp-custom' - invalid property 'marker'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:200:6 CSS syntax error in tag 'style amp-custom' - invalid property 'marker'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        mask: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:201:6 CSS syntax error in tag 'style amp-custom' - invalid property 'mask'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:201:6 CSS syntax error in tag 'style amp-custom' - invalid property 'mask'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        max-height: foo;
 |        max-width: foo;
 |        min-height: foo;
@@ -320,7 +320,7 @@ amp4email_feature_tests/css_strict.html:201:6 CSS syntax error in tag 'style amp
 |        order: foo;
 |        orphans: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:212:6 CSS syntax error in tag 'style amp-custom' - invalid property 'orphans'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:212:6 CSS syntax error in tag 'style amp-custom' - invalid property 'orphans'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        outline-color: foo;
 |        outline-offset: foo;
 |        outline-style: foo;
@@ -337,13 +337,13 @@ amp4email_feature_tests/css_strict.html:212:6 CSS syntax error in tag 'style amp
 |        padding: foo;
 |        page-break-after: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:227:6 CSS syntax error in tag 'style amp-custom' - invalid property 'page-break-after'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:227:6 CSS syntax error in tag 'style amp-custom' - invalid property 'page-break-after'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        page-break-before: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:228:6 CSS syntax error in tag 'style amp-custom' - invalid property 'page-break-before'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:228:6 CSS syntax error in tag 'style amp-custom' - invalid property 'page-break-before'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        page-break-inside: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:229:6 CSS syntax error in tag 'style amp-custom' - invalid property 'page-break-inside'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:229:6 CSS syntax error in tag 'style amp-custom' - invalid property 'page-break-inside'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        pause: foo;
 |        pause-after: foo;
 |        pause-before: foo;
@@ -354,9 +354,8 @@ amp4email_feature_tests/css_strict.html:229:6 CSS syntax error in tag 'style amp
 |        place-items: foo;
 |        pointer-events: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:238:6 CSS syntax error in tag 'style amp-custom' - invalid property 'pointer-events'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
-|        /* position has special rules. Don't use `foo` */
-|        position: initial;
+amp4email_feature_tests/css_strict.html:238:6 CSS syntax error in tag 'style amp-custom' - invalid property 'pointer-events'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
+|        position: foo;
 |        quotes: foo;
 |        resize: foo;
 |        richness: foo;
@@ -364,7 +363,7 @@ amp4email_feature_tests/css_strict.html:238:6 CSS syntax error in tag 'style amp
 |        row-gap: foo;
 |        shape-rendering: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:246:6 CSS syntax error in tag 'style amp-custom' - invalid property 'shape-rendering'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:245:6 CSS syntax error in tag 'style amp-custom' - invalid property 'shape-rendering'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        speak-header: foo;
 |        speak-numeral: foo;
 |        speak-punctuation: foo;
@@ -372,50 +371,50 @@ amp4email_feature_tests/css_strict.html:246:6 CSS syntax error in tag 'style amp
 |        speech-rate: foo;
 |        stop-color: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:252:6 CSS syntax error in tag 'style amp-custom' - invalid property 'stop-color'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:251:6 CSS syntax error in tag 'style amp-custom' - invalid property 'stop-color'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        stop-opacity: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:253:6 CSS syntax error in tag 'style amp-custom' - invalid property 'stop-opacity'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:252:6 CSS syntax error in tag 'style amp-custom' - invalid property 'stop-opacity'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        stress: foo;
 |        stroke-dasharray: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:255:6 CSS syntax error in tag 'style amp-custom' - invalid property 'stroke-dasharray'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:254:6 CSS syntax error in tag 'style amp-custom' - invalid property 'stroke-dasharray'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        stroke-dashoffset: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:256:6 CSS syntax error in tag 'style amp-custom' - invalid property 'stroke-dashoffset'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:255:6 CSS syntax error in tag 'style amp-custom' - invalid property 'stroke-dashoffset'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        stroke-linecap: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:257:6 CSS syntax error in tag 'style amp-custom' - invalid property 'stroke-linecap'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:256:6 CSS syntax error in tag 'style amp-custom' - invalid property 'stroke-linecap'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        stroke-linejoin: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:258:6 CSS syntax error in tag 'style amp-custom' - invalid property 'stroke-linejoin'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:257:6 CSS syntax error in tag 'style amp-custom' - invalid property 'stroke-linejoin'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        stroke-miterlimit: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:259:6 CSS syntax error in tag 'style amp-custom' - invalid property 'stroke-miterlimit'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:258:6 CSS syntax error in tag 'style amp-custom' - invalid property 'stroke-miterlimit'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        stroke-opacity: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:260:6 CSS syntax error in tag 'style amp-custom' - invalid property 'stroke-opacity'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:259:6 CSS syntax error in tag 'style amp-custom' - invalid property 'stroke-opacity'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        stroke-width: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:261:6 CSS syntax error in tag 'style amp-custom' - invalid property 'stroke-width'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:260:6 CSS syntax error in tag 'style amp-custom' - invalid property 'stroke-width'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        stroke: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:262:6 CSS syntax error in tag 'style amp-custom' - invalid property 'stroke'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:261:6 CSS syntax error in tag 'style amp-custom' - invalid property 'stroke'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        tab-size: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:263:6 CSS syntax error in tag 'style amp-custom' - invalid property 'tab-size'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:262:6 CSS syntax error in tag 'style amp-custom' - invalid property 'tab-size'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        table-layout: foo;
 |        text-align-last: foo;
 |        text-align: foo;
 |        text-anchor: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:267:6 CSS syntax error in tag 'style amp-custom' - invalid property 'text-anchor'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:266:6 CSS syntax error in tag 'style amp-custom' - invalid property 'text-anchor'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        text-combine-upright: foo;
 |        text-decoration-color: foo;
 |        text-decoration-line: foo;
 |        text-decoration-skip-ink: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:271:6 CSS syntax error in tag 'style amp-custom' - invalid property 'text-decoration-skip-ink'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:270:6 CSS syntax error in tag 'style amp-custom' - invalid property 'text-decoration-skip-ink'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        text-decoration-skip: foo;
 |        text-decoration-style: foo;
 |        text-decoration: foo;
@@ -425,24 +424,24 @@ amp4email_feature_tests/css_strict.html:271:6 CSS syntax error in tag 'style amp
 |        text-emphasis: foo;
 |        text-fill-color: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:279:6 CSS syntax error in tag 'style amp-custom' - invalid property 'text-fill-color'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:278:6 CSS syntax error in tag 'style amp-custom' - invalid property 'text-fill-color'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        text-indent: foo;
 |        text-justify: foo;
 |        text-orientation: foo;
 |        text-overflow: foo;
 |        text-rendering: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:284:6 CSS syntax error in tag 'style amp-custom' - invalid property 'text-rendering'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:283:6 CSS syntax error in tag 'style amp-custom' - invalid property 'text-rendering'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        text-shadow: foo;
 |        text-stroke-color: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:286:6 CSS syntax error in tag 'style amp-custom' - invalid property 'text-stroke-color'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:285:6 CSS syntax error in tag 'style amp-custom' - invalid property 'text-stroke-color'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        text-stroke-width: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:287:6 CSS syntax error in tag 'style amp-custom' - invalid property 'text-stroke-width'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:286:6 CSS syntax error in tag 'style amp-custom' - invalid property 'text-stroke-width'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        text-stroke: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:288:6 CSS syntax error in tag 'style amp-custom' - invalid property 'text-stroke'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:287:6 CSS syntax error in tag 'style amp-custom' - invalid property 'text-stroke'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        text-transform: foo;
 |        text-underline-position: foo;
 |        top: foo;
@@ -454,24 +453,24 @@ amp4email_feature_tests/css_strict.html:288:6 CSS syntax error in tag 'style amp
 |        transition-duration: foo;
 |        transition-property: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:298:6 CSS syntax error in tag 'style amp-custom' - the property 'transition-property' is set to the disallowed value 'foo'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:297:6 CSS syntax error in tag 'style amp-custom' - the property 'transition-property' is set to the disallowed value 'foo'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        transition-timing-function: foo;
 |        transition: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:300:6 CSS syntax error in tag 'style amp-custom' - the property 'transition' is set to the disallowed value 'foo'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:299:6 CSS syntax error in tag 'style amp-custom' - the property 'transition' is set to the disallowed value 'foo'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        unicode-bidi: foo;
 |        user-select: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:302:6 CSS syntax error in tag 'style amp-custom' - invalid property 'user-select'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:301:6 CSS syntax error in tag 'style amp-custom' - invalid property 'user-select'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        vertical-align: foo;
 |        visibility: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:304:6 CSS syntax error in tag 'style amp-custom' - the property 'visibility' is set to the disallowed value 'foo'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:303:6 CSS syntax error in tag 'style amp-custom' - the property 'visibility' is set to the disallowed value 'foo'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        voice-family: foo;
 |        white-space: foo;
 |        widows: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:307:6 CSS syntax error in tag 'style amp-custom' - invalid property 'widows'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:306:6 CSS syntax error in tag 'style amp-custom' - invalid property 'widows'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        width: foo;
 |        word-break: foo;
 |        word-spacing: foo;
@@ -479,22 +478,22 @@ amp4email_feature_tests/css_strict.html:307:6 CSS syntax error in tag 'style amp
 |        writing-mode: foo;
 |        z-index: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:313:6 CSS syntax error in tag 'style amp-custom' - the property 'z-index' is set to the disallowed value 'foo'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:312:6 CSS syntax error in tag 'style amp-custom' - the property 'z-index' is set to the disallowed value 'foo'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        z-index: auto;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:314:6 CSS syntax error in tag 'style amp-custom' - the property 'z-index' is set to the disallowed value 'auto'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:313:6 CSS syntax error in tag 'style amp-custom' - the property 'z-index' is set to the disallowed value 'auto'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        z-index: -1;
 |      }
 |      madeupdecls {
 |        amplitude: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:318:6 CSS syntax error in tag 'style amp-custom' - invalid property 'amplitude'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:317:6 CSS syntax error in tag 'style amp-custom' - invalid property 'amplitude'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        barometric-pressure: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:319:6 CSS syntax error in tag 'style amp-custom' - invalid property 'barometric-pressure'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:318:6 CSS syntax error in tag 'style amp-custom' - invalid property 'barometric-pressure'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |        degrees-celsius: foo;
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:320:6 CSS syntax error in tag 'style amp-custom' - invalid property 'degrees-celsius'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:319:6 CSS syntax error in tag 'style amp-custom' - invalid property 'degrees-celsius'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |      }
 |      /* valid media queries */
 |      @media all {}
@@ -515,44 +514,44 @@ amp4email_feature_tests/css_strict.html:320:6 CSS syntax error in tag 'style amp
 |      /* invalid media queries */
 |      @media invalid {}
 >>            ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:339:11 CSS syntax error in tag 'style amp-custom' - disallowed media type 'invalid'.
+amp4email_feature_tests/css_strict.html:338:11 CSS syntax error in tag 'style amp-custom' - disallowed media type 'invalid'.
 |      @media (invalid: foo) {}
 >>             ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:340:12 CSS syntax error in tag 'style amp-custom' - disallowed media feature 'invalid'.
+amp4email_feature_tests/css_strict.html:339:12 CSS syntax error in tag 'style amp-custom' - disallowed media feature 'invalid'.
 |
 |      /* all other @ rules are banned */
 |      @supports (display: flex) {}
 >>     ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:343:4 CSS syntax error in tag 'style amp-custom' - saw invalid at rule '@supports'.
+amp4email_feature_tests/css_strict.html:342:4 CSS syntax error in tag 'style amp-custom' - saw invalid at rule '@supports'.
 |      @font-face {}
 >>     ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:344:4 CSS syntax error in tag 'style amp-custom' - saw invalid at rule '@font-face'.
+amp4email_feature_tests/css_strict.html:343:4 CSS syntax error in tag 'style amp-custom' - saw invalid at rule '@font-face'.
 |      @keyframes slidein {}
 >>     ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:345:4 CSS syntax error in tag 'style amp-custom' - saw invalid at rule '@keyframes'.
+amp4email_feature_tests/css_strict.html:344:4 CSS syntax error in tag 'style amp-custom' - saw invalid at rule '@keyframes'.
 |      @notvalid {}
 >>     ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:346:4 CSS syntax error in tag 'style amp-custom' - saw invalid at rule '@notvalid'.
+amp4email_feature_tests/css_strict.html:345:4 CSS syntax error in tag 'style amp-custom' - saw invalid at rule '@notvalid'.
 |      @page {}
 >>     ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:347:4 CSS syntax error in tag 'style amp-custom' - saw invalid at rule '@page'.
+amp4email_feature_tests/css_strict.html:346:4 CSS syntax error in tag 'style amp-custom' - saw invalid at rule '@page'.
 |
 |      /* Since data-css-strict is specified, we apply selector rules. */
 |      .a[notvalid] {}
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:350:6 CSS error in tag 'style amp-custom' - disallowed attribute selector 'notvalid'.
+amp4email_feature_tests/css_strict.html:349:6 CSS error in tag 'style amp-custom' - disallowed attribute selector 'notvalid'.
 |      .a:notvalid {}
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:351:6 CSS error in tag 'style amp-custom' - disallowed pseudo class 'notvalid'.
+amp4email_feature_tests/css_strict.html:350:6 CSS error in tag 'style amp-custom' - disallowed pseudo class 'notvalid'.
 |      .a::notvalid {}
 >>       ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:352:6 CSS error in tag 'style amp-custom' - disallowed pseudo element 'notvalid'.
+amp4email_feature_tests/css_strict.html:351:6 CSS error in tag 'style amp-custom' - disallowed pseudo element 'notvalid'.
 |      :notvalid {}
 >>     ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:353:4 CSS error in tag 'style amp-custom' - disallowed pseudo class 'notvalid'.
+amp4email_feature_tests/css_strict.html:352:4 CSS error in tag 'style amp-custom' - disallowed pseudo class 'notvalid'.
 |      .a[id]:notvalid {}
 >>           ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:354:10 CSS error in tag 'style amp-custom' - disallowed pseudo class 'notvalid'.
+amp4email_feature_tests/css_strict.html:353:10 CSS error in tag 'style amp-custom' - disallowed pseudo class 'notvalid'.
 |
 |      .a[active] {}
 |      .a[alt] {}
@@ -625,7 +624,7 @@ amp4email_feature_tests/css_strict.html:354:10 CSS error in tag 'style amp-custo
 |      .a { margin: 1px; }
 |      .a { -webkit-margin: 1px; }
 >>          ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:425:9 CSS syntax error in tag 'style amp-custom' - invalid property '-webkit-margin'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:424:9 CSS syntax error in tag 'style amp-custom' - invalid property '-webkit-margin'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |
 |      /* Three specific prefixes are explicitly allowlisted */
 |      .a {
@@ -637,22 +636,20 @@ amp4email_feature_tests/css_strict.html:425:9 CSS syntax error in tag 'style amp
 |      /* Not all properties are automatically allowed */
 |      .a { invalid: 1px; }
 >>          ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:435:9 CSS syntax error in tag 'style amp-custom' - invalid property 'invalid'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:434:9 CSS syntax error in tag 'style amp-custom' - invalid property 'invalid'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |
 |      /* Some properties are allowed, but only certain values */
 |      .a { position: absolute; }
 |      .a { position: invalid; }
->>          ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:439:9 CSS syntax error in tag 'style amp-custom' - the property 'position' is set to the disallowed value 'invalid'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
 |      .a { z-index: -1; }
 |      .a { z-index: invalid; }
 >>          ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:441:9 CSS syntax error in tag 'style amp-custom' - the property 'z-index' is set to the disallowed value 'invalid'. (see https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css)
+amp4email_feature_tests/css_strict.html:440:9 CSS syntax error in tag 'style amp-custom' - the property 'z-index' is set to the disallowed value 'invalid'. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css)
 |
 |      /* Important is not allowed */
 |      .a { color: red !important; }
 >>                     ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:444:20 Usage of the !important CSS qualifier is not allowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:443:20 Usage of the !important CSS qualifier is not allowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |    </style>
 |  </head>
 |  <body>
@@ -665,42 +662,42 @@ amp4email_feature_tests/css_strict.html:444:20 Usage of the !important CSS quali
 |  <b style='align-self: foo'></b>
 |  <b style='alignment-baseline: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:455:0 The property 'alignment-baseline' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:454:0 The property 'alignment-baseline' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='all: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:456:0 The property 'all' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:455:0 The property 'all' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='animation-delay: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:457:0 The property 'animation-delay' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:456:0 The property 'animation-delay' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='animation-direction: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:458:0 The property 'animation-direction' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:457:0 The property 'animation-direction' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='animation-duration: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:459:0 The property 'animation-duration' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:458:0 The property 'animation-duration' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='animation-fill-mode: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:460:0 The property 'animation-fill-mode' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:459:0 The property 'animation-fill-mode' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='animation-iteration-count: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:461:0 The property 'animation-iteration-count' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:460:0 The property 'animation-iteration-count' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='animation-name: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:462:0 The property 'animation-name' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:461:0 The property 'animation-name' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='animation-play-state: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:463:0 The property 'animation-play-state' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:462:0 The property 'animation-play-state' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='animation-timing-function: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:464:0 The property 'animation-timing-function' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:463:0 The property 'animation-timing-function' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='animation: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:465:0 The property 'animation' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:464:0 The property 'animation' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='appearance: foo'></b>
 |  <b style='azimuth: foo'></b>
 |  <b style='backface-visibility: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:468:0 The property 'backface-visibility' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:467:0 The property 'backface-visibility' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='background-attachment: foo'></b>
 |  <b style='background-blend-mode: foo'></b>
 |  <b style='background-clip: foo'></b>
@@ -713,7 +710,7 @@ amp4email_feature_tests/css_strict.html:468:0 The property 'backface-visibility'
 |  <b style='background: foo'></b>
 |  <b style='baseline-shift: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:479:0 The property 'baseline-shift' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:478:0 The property 'baseline-shift' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='border-bottom-color: foo'></b>
 |  <b style='border-bottom-left-radius: foo'></b>
 |  <b style='border-bottom-right-radius: foo'></b>
@@ -724,22 +721,22 @@ amp4email_feature_tests/css_strict.html:479:0 The property 'baseline-shift' in a
 |  <b style='border-color: foo'></b>
 |  <b style='border-image-outset: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:488:0 The property 'border-image-outset' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:487:0 The property 'border-image-outset' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='border-image-repeat: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:489:0 The property 'border-image-repeat' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:488:0 The property 'border-image-repeat' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='border-image-slice: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:490:0 The property 'border-image-slice' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:489:0 The property 'border-image-slice' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='border-image-source: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:491:0 The property 'border-image-source' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:490:0 The property 'border-image-source' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='border-image-width: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:492:0 The property 'border-image-width' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:491:0 The property 'border-image-width' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='border-image: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:493:0 The property 'border-image' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:492:0 The property 'border-image' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='border-left-color: foo'></b>
 |  <b style='border-left-style: foo'></b>
 |  <b style='border-left-width: foo'></b>
@@ -762,7 +759,7 @@ amp4email_feature_tests/css_strict.html:493:0 The property 'border-image' in att
 |  <b style='bottom: foo'></b>
 |  <b style='box-decoration-break: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:514:0 The property 'box-decoration-break' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:513:0 The property 'box-decoration-break' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='box-shadow: foo'></b>
 |  <b style='box-sizing: foo'></b>
 |  <b style='break-after: foo'></b>
@@ -773,26 +770,26 @@ amp4email_feature_tests/css_strict.html:514:0 The property 'box-decoration-break
 |  <b style='clear: foo'></b>
 |  <b style='clip-path: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:523:0 The property 'clip-path' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:522:0 The property 'clip-path' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='clip-rule: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:524:0 The property 'clip-rule' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:523:0 The property 'clip-rule' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='clip: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:525:0 The property 'clip' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:524:0 The property 'clip' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='color-adjust: foo'></b>
 |  <b style='color-interpolation-filters: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:527:0 The property 'color-interpolation-filters' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:526:0 The property 'color-interpolation-filters' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='color-interpolation: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:528:0 The property 'color-interpolation' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:527:0 The property 'color-interpolation' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='color-profile: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:529:0 The property 'color-profile' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:528:0 The property 'color-profile' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='color-rendering: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:530:0 The property 'color-rendering' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:529:0 The property 'color-rendering' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='color: foo'></b>
 |  <b style='column-count: foo'></b>
 |  <b style='column-fill: foo'></b>
@@ -806,36 +803,36 @@ amp4email_feature_tests/css_strict.html:530:0 The property 'color-rendering' in
 |  <b style='columns: foo'></b>
 |  <b style='content: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:542:0 The property 'content' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:541:0 The property 'content' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='counter-increment: foo'></b>
 |  <b style='counter-reset: foo'></b>
 |  <b style='cursor: initial'></b>
 |  <b style='cursor: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:546:0 CSS syntax error in tag 'b' - the property 'cursor' is set to the disallowed value 'foo'. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:545:0 CSS syntax error in tag 'b' - the property 'cursor' is set to the disallowed value 'foo'. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='direction: foo'></b>
 |  <b style='display: foo'></b>
 |  <b style='dominant-baseline: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:549:0 The property 'dominant-baseline' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:548:0 The property 'dominant-baseline' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='elevation: foo'></b>
 |  <b style='empty-cells: foo'></b>
 |  <b style='enable-background: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:552:0 The property 'enable-background' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:551:0 The property 'enable-background' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='fill-opacity: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:553:0 The property 'fill-opacity' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:552:0 The property 'fill-opacity' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='fill-rule: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:554:0 The property 'fill-rule' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:553:0 The property 'fill-rule' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='fill: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:555:0 The property 'fill' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:554:0 The property 'fill' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='filter: blur(5px)'></b>
 |  <b style='filter: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:557:0 CSS syntax error in tag 'b' - the property 'filter' is set to the disallowed value 'foo'. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:556:0 CSS syntax error in tag 'b' - the property 'filter' is set to the disallowed value 'foo'. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='flex-basis: foo'></b>
 |  <b style='flex-direction: foo'></b>
 |  <b style='flex-flow: foo'></b>
@@ -846,16 +843,16 @@ amp4email_feature_tests/css_strict.html:557:0 CSS syntax error in tag 'b' - the
 |  <b style='float: foo'></b>
 |  <b style='flood-color: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:566:0 The property 'flood-color' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:565:0 The property 'flood-color' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='flood-opacity: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:567:0 The property 'flood-opacity' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:566:0 The property 'flood-opacity' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='font-family: foo'></b>
 |  <b style='font-feature-settings: foo'></b>
 |  <b style='font-kerning: foo'></b>
 |  <b style='font-language-override: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:571:0 The property 'font-language-override' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:570:0 The property 'font-language-override' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='font-size-adjust: foo'></b>
 |  <b style='font-size: foo'></b>
 |  <b style='font-stretch: foo'></b>
@@ -868,17 +865,17 @@ amp4email_feature_tests/css_strict.html:571:0 The property 'font-language-overri
 |  <b style='font-variant-numeric: foo'></b>
 |  <b style='font-variant-position: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:582:0 The property 'font-variant-position' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:581:0 The property 'font-variant-position' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='font-variant: foo'></b>
 |  <b style='font-variation-settings: foo'></b>
 |  <b style='font-weight: foo'></b>
 |  <b style='font: foo'></b>
 |  <b style='glyph-orientation-horizontal: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:587:0 The property 'glyph-orientation-horizontal' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:586:0 The property 'glyph-orientation-horizontal' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='glyph-orientation-vertical: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:588:0 The property 'glyph-orientation-vertical' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:587:0 The property 'glyph-orientation-vertical' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='grid-area: foo'></b>
 |  <b style='grid-auto-columns: foo'></b>
 |  <b style='grid-auto-flow: foo'></b>
@@ -886,16 +883,16 @@ amp4email_feature_tests/css_strict.html:588:0 The property 'glyph-orientation-ve
 |  <b style='grid-column-end: foo'></b>
 |  <b style='grid-column-gap: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:594:0 The property 'grid-column-gap' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:593:0 The property 'grid-column-gap' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='grid-column-start: foo'></b>
 |  <b style='grid-column: foo'></b>
 |  <b style='grid-gap: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:597:0 The property 'grid-gap' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:596:0 The property 'grid-gap' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='grid-row-end: foo'></b>
 |  <b style='grid-row-gap: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:599:0 The property 'grid-row-gap' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:598:0 The property 'grid-row-gap' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='grid-row-start: foo'></b>
 |  <b style='grid-row: foo'></b>
 |  <b style='grid-template-areas: foo'></b>
@@ -905,13 +902,13 @@ amp4email_feature_tests/css_strict.html:599:0 The property 'grid-row-gap' in att
 |  <b style='grid: foo'></b>
 |  <b style='hanging-punctuation: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:607:0 The property 'hanging-punctuation' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:606:0 The property 'hanging-punctuation' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='height: foo'></b>
 |  <b style='hyphens: foo'></b>
 |  <b style='image-orientation: foo'></b>
 |  <b style='image-rendering: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:611:0 The property 'image-rendering' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:610:0 The property 'image-rendering' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='image-resolution: foo'></b>
 |  <b style='inline-size: foo'></b>
 |  <b style='isolation: foo'></b>
@@ -920,17 +917,17 @@ amp4email_feature_tests/css_strict.html:611:0 The property 'image-rendering' in
 |  <b style='justify-self: foo'></b>
 |  <b style='kerning: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:618:0 The property 'kerning' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:617:0 The property 'kerning' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='left: foo'></b>
 |  <b style='letter-spacing: foo'></b>
 |  <b style='lighting-color: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:621:0 The property 'lighting-color' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:620:0 The property 'lighting-color' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='line-break: foo'></b>
 |  <b style='line-height: foo'></b>
 |  <b style='list-style-image: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:624:0 The property 'list-style-image' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:623:0 The property 'list-style-image' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='list-style-position: foo'></b>
 |  <b style='list-style-type: foo'></b>
 |  <b style='list-style: foo'></b>
@@ -941,19 +938,19 @@ amp4email_feature_tests/css_strict.html:624:0 The property 'list-style-image' in
 |  <b style='margin: foo'></b>
 |  <b style='marker-end: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:633:0 The property 'marker-end' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:632:0 The property 'marker-end' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='marker-mid: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:634:0 The property 'marker-mid' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:633:0 The property 'marker-mid' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='marker-start: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:635:0 The property 'marker-start' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:634:0 The property 'marker-start' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='marker: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:636:0 The property 'marker' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:635:0 The property 'marker' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='mask: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:637:0 The property 'mask' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:636:0 The property 'mask' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='max-height: foo'></b>
 |  <b style='max-width: foo'></b>
 |  <b style='min-height: foo'></b>
@@ -966,7 +963,7 @@ amp4email_feature_tests/css_strict.html:637:0 The property 'mask' in attribute '
 |  <b style='order: foo'></b>
 |  <b style='orphans: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:648:0 The property 'orphans' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:647:0 The property 'orphans' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='outline-color: foo'></b>
 |  <b style='outline-offset: foo'></b>
 |  <b style='outline-style: foo'></b>
@@ -983,13 +980,13 @@ amp4email_feature_tests/css_strict.html:648:0 The property 'orphans' in attribut
 |  <b style='padding: foo'></b>
 |  <b style='page-break-after: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:663:0 The property 'page-break-after' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:662:0 The property 'page-break-after' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='page-break-before: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:664:0 The property 'page-break-before' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:663:0 The property 'page-break-before' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='page-break-inside: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:665:0 The property 'page-break-inside' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:664:0 The property 'page-break-inside' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='pause: foo'></b>
 |  <b style='pause-after: foo'></b>
 |  <b style='pause-before: foo'></b>
@@ -1000,7 +997,7 @@ amp4email_feature_tests/css_strict.html:665:0 The property 'page-break-inside' i
 |  <b style='place-items: foo'></b>
 |  <b style='pointer-events: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:674:0 The property 'pointer-events' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:673:0 The property 'pointer-events' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <!-- position has special rules. Don't use `foo` -->
 |  <b style='position: initial'></b>
 |  <b style='quotes: foo'></b>
@@ -1010,7 +1007,7 @@ amp4email_feature_tests/css_strict.html:674:0 The property 'pointer-events' in a
 |  <b style='row-gap: foo'></b>
 |  <b style='shape-rendering: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:682:0 The property 'shape-rendering' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:681:0 The property 'shape-rendering' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='speak-header: foo'></b>
 |  <b style='speak-numeral: foo'></b>
 |  <b style='speak-punctuation: foo'></b>
@@ -1018,50 +1015,50 @@ amp4email_feature_tests/css_strict.html:682:0 The property 'shape-rendering' in
 |  <b style='speech-rate: foo'></b>
 |  <b style='stop-color: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:688:0 The property 'stop-color' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:687:0 The property 'stop-color' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='stop-opacity: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:689:0 The property 'stop-opacity' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:688:0 The property 'stop-opacity' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='stress: foo'></b>
 |  <b style='stroke-dasharray: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:691:0 The property 'stroke-dasharray' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:690:0 The property 'stroke-dasharray' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='stroke-dashoffset: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:692:0 The property 'stroke-dashoffset' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:691:0 The property 'stroke-dashoffset' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='stroke-linecap: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:693:0 The property 'stroke-linecap' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:692:0 The property 'stroke-linecap' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='stroke-linejoin: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:694:0 The property 'stroke-linejoin' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:693:0 The property 'stroke-linejoin' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='stroke-miterlimit: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:695:0 The property 'stroke-miterlimit' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:694:0 The property 'stroke-miterlimit' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='stroke-opacity: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:696:0 The property 'stroke-opacity' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:695:0 The property 'stroke-opacity' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='stroke-width: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:697:0 The property 'stroke-width' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:696:0 The property 'stroke-width' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='stroke: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:698:0 The property 'stroke' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:697:0 The property 'stroke' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='tab-size: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:699:0 The property 'tab-size' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:698:0 The property 'tab-size' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='table-layout: foo'></b>
 |  <b style='text-align-last: foo'></b>
 |  <b style='text-align: foo'></b>
 |  <b style='text-anchor: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:703:0 The property 'text-anchor' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:702:0 The property 'text-anchor' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='text-combine-upright: foo'></b>
 |  <b style='text-decoration-color: foo'></b>
 |  <b style='text-decoration-line: foo'></b>
 |  <b style='text-decoration-skip-ink: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:707:0 The property 'text-decoration-skip-ink' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:706:0 The property 'text-decoration-skip-ink' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='text-decoration-skip: foo'></b>
 |  <b style='text-decoration-style: foo'></b>
 |  <b style='text-decoration: foo'></b>
@@ -1071,24 +1068,24 @@ amp4email_feature_tests/css_strict.html:707:0 The property 'text-decoration-skip
 |  <b style='text-emphasis: foo'></b>
 |  <b style='text-fill-color: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:715:0 The property 'text-fill-color' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:714:0 The property 'text-fill-color' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='text-indent: foo'></b>
 |  <b style='text-justify: foo'></b>
 |  <b style='text-orientation: foo'></b>
 |  <b style='text-overflow: foo'></b>
 |  <b style='text-rendering: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:720:0 The property 'text-rendering' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:719:0 The property 'text-rendering' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='text-shadow: foo'></b>
 |  <b style='text-stroke-color: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:722:0 The property 'text-stroke-color' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:721:0 The property 'text-stroke-color' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='text-stroke-width: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:723:0 The property 'text-stroke-width' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:722:0 The property 'text-stroke-width' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='text-stroke: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:724:0 The property 'text-stroke' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:723:0 The property 'text-stroke' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='text-transform: foo'></b>
 |  <b style='text-underline-position: foo'></b>
 |  <b style='top: foo'></b>
@@ -1100,27 +1097,27 @@ amp4email_feature_tests/css_strict.html:724:0 The property 'text-stroke' in attr
 |  <b style='transition-duration: foo'></b>
 |  <b style='transition-property: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:734:0 CSS syntax error in tag 'b' - the property 'transition-property' is set to the disallowed value 'foo'. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:733:0 CSS syntax error in tag 'b' - the property 'transition-property' is set to the disallowed value 'foo'. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='transition-property: opacity, transform'></b>
 |  <b style='transition-timing-function: foo'></b>
 |  <b style='transition: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:737:0 CSS syntax error in tag 'b' - the property 'transition' is set to the disallowed value 'foo'. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:736:0 CSS syntax error in tag 'b' - the property 'transition' is set to the disallowed value 'foo'. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='transition: opacity 4s ease-in-out 1s;'></b>
 |  <b style='unicode-bidi: foo'></b>
 |  <b style='user-select: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:740:0 The property 'user-select' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:739:0 The property 'user-select' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='vertical-align: foo'></b>
 |  <b style='visibility: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:742:0 CSS syntax error in tag 'b' - the property 'visibility' is set to the disallowed value 'foo'. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:741:0 CSS syntax error in tag 'b' - the property 'visibility' is set to the disallowed value 'foo'. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='visibility: hidden'></b>
 |  <b style='voice-family: foo'></b>
 |  <b style='white-space: foo'></b>
 |  <b style='widows: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:746:0 The property 'widows' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:745:0 The property 'widows' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='width: foo'></b>
 |  <b style='word-break: foo'></b>
 |  <b style='word-spacing: foo'></b>
@@ -1128,25 +1125,25 @@ amp4email_feature_tests/css_strict.html:746:0 The property 'widows' in attribute
 |  <b style='writing-mode: foo'></b>
 |  <b style='z-index: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:752:0 CSS syntax error in tag 'b' - the property 'z-index' is set to the disallowed value 'foo'. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:751:0 CSS syntax error in tag 'b' - the property 'z-index' is set to the disallowed value 'foo'. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='z-index: auto'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:753:0 CSS syntax error in tag 'b' - the property 'z-index' is set to the disallowed value 'auto'. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:752:0 CSS syntax error in tag 'b' - the property 'z-index' is set to the disallowed value 'auto'. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='z-index: 0'></b>
 |  <b style='z-index: +1'></b>
 |  <b style='z-index: -10'></b>
 |  <b style='z-index: -1000'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:757:0 CSS syntax error in tag 'b' - the property 'z-index' is set to the disallowed value '-1000'. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:756:0 CSS syntax error in tag 'b' - the property 'z-index' is set to the disallowed value '-1000'. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <!-- Made-up decls -->
 |  <b style='amplitude: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:759:0 The property 'amplitude' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:758:0 The property 'amplitude' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='barometric-pressure: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:760:0 The property 'barometric-pressure' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:759:0 The property 'barometric-pressure' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  <b style='degrees-celsius: foo'></b>
 >> ^~~~~~~~~
-amp4email_feature_tests/css_strict.html:761:0 The property 'degrees-celsius' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
+amp4email_feature_tests/css_strict.html:760:0 The property 'degrees-celsius' in attribute 'style' in tag 'b' is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/)
 |  </body>
 |  </html>
diff --git a/validator/testdata/feature_tests/ads.html b/validator/testdata/feature_tests/ads.html
index 30dde67e165c..1099175781d8 100644
--- a/validator/testdata/feature_tests/ads.html
+++ b/validator/testdata/feature_tests/ads.html
@@ -124,6 +124,7 @@
         <option>ibillboard</option>
         <option>imobile</option>
         <option>imedia</option>
+        <option>incrementx</option>
         <option>industrybrains</option>
         <option>inmobi</option>
         <option>ix</option>
@@ -177,7 +178,6 @@
         <option>weborama</option>
         <option>widespace</option>
         <option>xlift</option>
-        <option>yahoo</option>
         <option>yahoojp</option>
         <option>yandex</option>
         <option>yieldbot</option>
@@ -804,6 +804,10 @@ <h2>Imedia</h2>
       data-positions='[{"id":"p1", "zoneId":"seznam.novinky.ikona2"}, {"id":"p2", "zoneId":"seznam.novinky.ikona"}]'>
   </amp-ad>
 
+  <h2>IncrementX</h2>
+  <amp-ad width="320" height="50" type="incrementx" data-vzid="PNXW125273VB49B96">
+  </amp-ad>
+
   <h2>Industrybrains</h2>
   <amp-ad width="300" height="250"
       type="industrybrains"
@@ -1077,12 +1081,13 @@ <h2>Rambler&Co</h2>
   </amp-ad>
 
   <h2>Relap</h2>
-  <amp-ad width="auto" height="750"
+  <amp-ad width="auto" height="790"
       type="relap"
       layout="fixed-height"
       data-token="D3UMgQWBqleq1tPW"
-      data-url="http://bigpicture.ru"
-      data-anchorid="i0xMMY1MoliiZWVl">
+      data-url="https://relap.mail.ru/"
+      data-anchorid="-FVV_OEgYpljt7e3"
+      data-version="v7">
   </amp-ad>
 
   <h2>Remixd</h2>
@@ -1261,14 +1266,6 @@ <h2>Xlift native ad</h2>
       data-mediaid="mamastar">
   </amp-ad>
 
-  <h2>Yahoo Display</h2>
-  <amp-ad width="316" height="264"
-      type="yahoo"
-      data-sid="954014446"
-      data-site="news"
-      data-sa='{"LREC":"300x250","secure":"true","content":"no_expandable;"}'>
-  </amp-ad>
-
   <h2>YahooJP YDN</h2>
   <amp-ad width="300" height="250"
       type="yahoojp"
diff --git a/validator/testdata/feature_tests/ads.out b/validator/testdata/feature_tests/ads.out
index 89dd18eeeba5..42ed43316774 100644
--- a/validator/testdata/feature_tests/ads.out
+++ b/validator/testdata/feature_tests/ads.out
@@ -125,6 +125,7 @@ PASS
 |          <option>ibillboard</option>
 |          <option>imobile</option>
 |          <option>imedia</option>
+|          <option>incrementx</option>
 |          <option>industrybrains</option>
 |          <option>inmobi</option>
 |          <option>ix</option>
@@ -178,7 +179,6 @@ PASS
 |          <option>weborama</option>
 |          <option>widespace</option>
 |          <option>xlift</option>
-|          <option>yahoo</option>
 |          <option>yahoojp</option>
 |          <option>yandex</option>
 |          <option>yieldbot</option>
@@ -805,6 +805,10 @@ PASS
 |        data-positions='[{"id":"p1", "zoneId":"seznam.novinky.ikona2"}, {"id":"p2", "zoneId":"seznam.novinky.ikona"}]'>
 |    </amp-ad>
 |
+|    <h2>IncrementX</h2>
+|    <amp-ad width="320" height="50" type="incrementx" data-vzid="PNXW125273VB49B96">
+|    </amp-ad>
+|
 |    <h2>Industrybrains</h2>
 |    <amp-ad width="300" height="250"
 |        type="industrybrains"
@@ -1078,12 +1082,13 @@ PASS
 |    </amp-ad>
 |
 |    <h2>Relap</h2>
-|    <amp-ad width="auto" height="750"
+|    <amp-ad width="auto" height="790"
 |        type="relap"
 |        layout="fixed-height"
 |        data-token="D3UMgQWBqleq1tPW"
-|        data-url="http://bigpicture.ru"
-|        data-anchorid="i0xMMY1MoliiZWVl">
+|        data-url="https://relap.mail.ru/"
+|        data-anchorid="-FVV_OEgYpljt7e3"
+|        data-version="v7">
 |    </amp-ad>
 |
 |    <h2>Remixd</h2>
@@ -1262,14 +1267,6 @@ PASS
 |        data-mediaid="mamastar">
 |    </amp-ad>
 |
-|    <h2>Yahoo Display</h2>
-|    <amp-ad width="316" height="264"
-|        type="yahoo"
-|        data-sid="954014446"
-|        data-site="news"
-|        data-sa='{"LREC":"300x250","secure":"true","content":"no_expandable;"}'>
-|    </amp-ad>
-|
 |    <h2>YahooJP YDN</h2>
 |    <amp-ad width="300" height="250"
 |        type="yahoojp"
diff --git a/validator/testdata/feature_tests/comment_tags.out b/validator/testdata/feature_tests/comment_tags.out
index 6da2e2b7e9db..d3bf553e2486 100644
--- a/validator/testdata/feature_tests/comment_tags.out
+++ b/validator/testdata/feature_tests/comment_tags.out
@@ -25,6 +25,6 @@ FAIL
 |         as closing the comment. -->
 |    <!-- --!><script></script>
 >>            ^~~~~~~~~
-feature_tests/comment_tags.html:25:11 Custom JavaScript is not allowed. (see https://amp.dev/documentation/guides-and-tutorials/learn/validation-workflow/validation_errors/#custom-javascript-is-not-allowed)
+feature_tests/comment_tags.html:25:11 The parent tag of tag 'amphtml engine script' is 'body', but it can only be 'head'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#required-markup)
 |  </body>
 |  </html>
diff --git a/validator/testdata/feature_tests/doctype_lang.out.cpponly b/validator/testdata/feature_tests/doctype_lang.out.cpponly
index 08cff67011d1..41a0167818fc 100644
--- a/validator/testdata/feature_tests/doctype_lang.out.cpponly
+++ b/validator/testdata/feature_tests/doctype_lang.out.cpponly
@@ -1,10 +1,12 @@
-PASS
+FAIL
 |  <!--
 |    Test Description:
 |    This tests what the validator outputs if the doctype uses a lang attribute.
 |    https://github.com/ampproject/amphtml/issues/25926
 |  -->
 |  <!doctype html lang=en>
+>>           ^~~~~~~~~
+feature_tests/doctype_lang.html:6:10 Invalid or missing doctype declaration. Should be '!doctype html'. (see https://amp.dev/documentation/guides-and-tutorials/start/create/basic_markup/)
 |  <html ⚡>
 |  <head>
 |    <meta charset="utf-8">
diff --git a/validator/testdata/feature_tests/duplicate_attribute.out b/validator/testdata/feature_tests/duplicate_attribute.out
index 9f77f9206be5..80c79a04385c 100644
--- a/validator/testdata/feature_tests/duplicate_attribute.out
+++ b/validator/testdata/feature_tests/duplicate_attribute.out
@@ -1,49 +1,49 @@
 FAIL
-|  <!--
-|    Test Description:
-|    This is the minimum valid AMP document; it includes all of the required
-|    fields from the spec, but nothing else.
-|  -->
-|  <!doctype html>
-|  <html ⚡>
-|  <head>
-|    <meta charset="utf-8">
-|    <link rel="canonical" href="./regular-html-version.html">
-|    <meta name="viewport" content="width=device-width,minimum-scale=1">
-|    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
-|    <script async src="https://cdn.ampproject.org/v0.js"></script>
-|    <!-- These two duplicate a custom-element attribute used as a dispatch key -->
-|    <script async custom-element="amp-image-lightbox" custom-element="duplicate" src="https://cdn.ampproject.org/v0/amp-image-lightbox-0.1.js"></script>
->>   ^~~~~~~~~
-feature_tests/duplicate_attribute.html:15:2 The tag 'script' contains the attribute 'custom-element' repeated multiple times.
-|    <script async custom-element="duplicate" custom-element="amp-youtube" src="https://cdn.ampproject.org/v0/amp-youtube-0.1.js"></script>
->>   ^~~~~~~~~
-feature_tests/duplicate_attribute.html:16:2 The tag 'script' contains the attribute 'custom-element' repeated multiple times.
->>   ^~~~~~~~~
-feature_tests/duplicate_attribute.html:16:2 Custom JavaScript is not allowed. (see https://amp.dev/documentation/guides-and-tutorials/learn/validation-workflow/validation_errors/#custom-javascript-is-not-allowed)
-|
-|  </head>
-|  <body>
-|
-|     <!-- 600 width is legal given the implied layout, but 100% is not -->
-|     <amp-img src="a.png" width='100%' width=600 height=800></amp-img>
->>    ^~~~~~~~~
-feature_tests/duplicate_attribute.html:22:3 The tag 'amp-img' contains the attribute 'width' repeated multiple times.
->>    ^~~~~~~~~
-feature_tests/duplicate_attribute.html:22:3 The attribute 'width' in tag 'amp-img' is set to the invalid value '100%'. (see https://amp.dev/documentation/components/amp-img/)
-|     <amp-img src="a.png" width=600 width='100%' height=800></amp-img>
->>    ^~~~~~~~~
-feature_tests/duplicate_attribute.html:23:3 The tag 'amp-img' contains the attribute 'width' repeated multiple times.
-|
-|     <!-- Let's make sure the script type can't be overridden -->
-|     <script type="application/ld+json" type="text/javascript">{}</script>
->>    ^~~~~~~~~
-feature_tests/duplicate_attribute.html:26:3 The tag 'script' contains the attribute 'type' repeated multiple times.
-|     <script type="text/javascript" type="application/ld+json">{}</script>
->>    ^~~~~~~~~
-feature_tests/duplicate_attribute.html:27:3 The tag 'script' contains the attribute 'type' repeated multiple times.
->>    ^~~~~~~~~
-feature_tests/duplicate_attribute.html:27:3 Custom JavaScript is not allowed. (see https://amp.dev/documentation/guides-and-tutorials/learn/validation-workflow/validation_errors/#custom-javascript-is-not-allowed)
-|
-|  </body>
-|  </html>
\ No newline at end of file
+    |  <!--
+    |    Test Description:
+    |    This is the minimum valid AMP document; it includes all of the required
+    |    fields from the spec, but nothing else.
+    |  -->
+    |  <!doctype html>
+    |  <html ⚡>
+    |  <head>
+    |    <meta charset="utf-8">
+    |    <link rel="canonical" href="./regular-html-version.html">
+    |    <meta name="viewport" content="width=device-width,minimum-scale=1">
+    |    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+    |    <script async src="https://cdn.ampproject.org/v0.js"></script>
+    |    <!-- These two duplicate a custom-element attribute used as a dispatch key -->
+    |    <script async custom-element="amp-image-lightbox" custom-element="duplicate" src="https://cdn.ampproject.org/v0/amp-image-lightbox-0.1.js"></script>
+    >>   ^~~~~~~~~
+    feature_tests/duplicate_attribute.html:15:2 The tag 'script' contains the attribute 'custom-element' repeated multiple times.
+    |    <script async custom-element="duplicate" custom-element="amp-youtube" src="https://cdn.ampproject.org/v0/amp-youtube-0.1.js"></script>
+    >>   ^~~~~~~~~
+    feature_tests/duplicate_attribute.html:16:2 The tag 'script' contains the attribute 'custom-element' repeated multiple times.
+    >>   ^~~~~~~~~
+    feature_tests/duplicate_attribute.html:16:2 The attribute 'custom-element' may not appear in tag 'amphtml engine script'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#required-markup)
+    |
+    |  </head>
+    |  <body>
+    |
+    |     <!-- 600 width is legal given the implied layout, but 100% is not -->
+    |     <amp-img src="a.png" width='100%' width=600 height=800></amp-img>
+    >>    ^~~~~~~~~
+    feature_tests/duplicate_attribute.html:22:3 The tag 'amp-img' contains the attribute 'width' repeated multiple times.
+    >>    ^~~~~~~~~
+    feature_tests/duplicate_attribute.html:22:3 The attribute 'width' in tag 'amp-img' is set to the invalid value '100%'. (see https://amp.dev/documentation/components/amp-img/)
+    |     <amp-img src="a.png" width=600 width='100%' height=800></amp-img>
+    >>    ^~~~~~~~~
+    feature_tests/duplicate_attribute.html:23:3 The tag 'amp-img' contains the attribute 'width' repeated multiple times.
+    |
+    |     <!-- Let's make sure the script type can't be overridden -->
+    |     <script type="application/ld+json" type="text/javascript">{}</script>
+    >>    ^~~~~~~~~
+    feature_tests/duplicate_attribute.html:26:3 The tag 'script' contains the attribute 'type' repeated multiple times.
+    |     <script type="text/javascript" type="application/ld+json">{}</script>
+    >>    ^~~~~~~~~
+    feature_tests/duplicate_attribute.html:27:3 The tag 'script' contains the attribute 'type' repeated multiple times.
+    >>    ^~~~~~~~~
+    feature_tests/duplicate_attribute.html:27:3 The parent tag of tag 'amphtml engine script' is 'body', but it can only be 'head'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#required-markup)
+    |
+    |  </body>
+    |  </html>
diff --git a/validator/testdata/feature_tests/duplicate_attribute.out.cpponly b/validator/testdata/feature_tests/duplicate_attribute.out.cpponly
index 77fb6e2ad6d3..860440c36a11 100644
--- a/validator/testdata/feature_tests/duplicate_attribute.out.cpponly
+++ b/validator/testdata/feature_tests/duplicate_attribute.out.cpponly
@@ -46,4 +46,4 @@ feature_tests/duplicate_attribute.html:27:3 The tag 'script' contains the attrib
 feature_tests/duplicate_attribute.html:27:3 The attribute 'type' in tag 'script type=application/ld+json' is set to the invalid value 'text/javascript'.
 |
 |  </body>
-|  </html>
+|  </html>
\ No newline at end of file
diff --git a/validator/testdata/feature_tests/forms.html b/validator/testdata/feature_tests/forms.html
index e4e9ca557049..95f3bfeaf4ed 100644
--- a/validator/testdata/feature_tests/forms.html
+++ b/validator/testdata/feature_tests/forms.html
@@ -120,9 +120,9 @@
     <option value="1">English</option>
   </select>
   <textarea name="comment"></textarea>
-  <!-- Invalid: input can not be type="image". -->
+  <!-- Valid: input can be type="image". -->
   <form method="post" action-xhr="https://example.com/subscribe" target="_blank">
-    <input type="image" name="image">
+    <input type="image" name="image" src="https://site.example/image.example">
   </form>
   <!-- Valid: input can be type="password" or type="file" in a post xhr form. -->
   <form method="post" action-xhr="https://example.com/subscribe" target="_blank">
diff --git a/validator/testdata/feature_tests/forms.out b/validator/testdata/feature_tests/forms.out
index 31275df78b9d..0b41a6732424 100644
--- a/validator/testdata/feature_tests/forms.out
+++ b/validator/testdata/feature_tests/forms.out
@@ -125,11 +125,9 @@ feature_tests/forms.html:114:2 The attribute 'target' in tag 'form' is set to th
 |      <option value="1">English</option>
 |    </select>
 |    <textarea name="comment"></textarea>
-|    <!-- Invalid: input can not be type="image". -->
+|    <!-- Valid: input can be type="image". -->
 |    <form method="post" action-xhr="https://example.com/subscribe" target="_blank">
-|      <input type="image" name="image">
->>     ^~~~~~~~~
-feature_tests/forms.html:125:4 The attribute 'type' in tag 'input' is set to the invalid value 'image'. (see https://amp.dev/documentation/components/amp-form/)
+|      <input type="image" name="image" src="https://site.example/image.example">
 |    </form>
 |    <!-- Valid: input can be type="password" or type="file" in a post xhr form. -->
 |    <form method="post" action-xhr="https://example.com/subscribe" target="_blank">
diff --git a/validator/testdata/feature_tests/img.html b/validator/testdata/feature_tests/img.html
new file mode 100644
index 000000000000..adad55fb73a1
--- /dev/null
+++ b/validator/testdata/feature_tests/img.html
@@ -0,0 +1,141 @@
+<!--
+  Test Description:
+  This is the minimum valid JavaScript AMP document; it includes all of the
+  required fields from the spec, but nothing else.
+-->
+<!doctype html>
+<html ⚡>
+<head>
+  <meta charset="utf-8">
+  <link rel="canonical" href="./regular-html-version.html">
+  <meta name="viewport" content="width=device-width">
+  <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+  <script async src="https://cdn.ampproject.org/v0.js"></script>
+</head>
+<body>
+  <!-- Valid -->
+  <img src="http://www.example.com/blah.jpg" width=92 height=10
+       alt="blah" decoding=async loading=lazy border="5px solid black" align="top"
+       hspace=10 vspace=20 importance="high" crossorigin="use-credentials" ismap="true"
+       referrerpolicy="same-origin" usemap="#blah" name="name">
+
+  <!-- Valid with fetchpriority -->
+  <img src="http://www.example.com/blah.jpg" width=92 height=10
+       alt="blah" decoding=async loading=lazy border="5px solid black" align="top"
+       hspace=10 vspace=20 fetchpriority="low" importance="high" crossorigin="use-credentials" ismap="true"
+       referrerpolicy="same-origin" usemap="#blah" name="name">
+
+  <!-- Valid with https -->
+  <img src="https://www.example.com/blah.jpg" width=92 height=10
+       alt="blah" decoding=async loading=lazy border="5px solid black" align="bottom"
+       hspace=10 vspace=20 importance="auto" crossorigin="anonymous" ismap="false"
+       referrerpolicy="no-referrer" usemap="#blah" name="name">
+
+  <!-- Valid with data -->
+  <img src=data:image/png:base64,foo width=100 height=10
+       alt="blah" decoding=async loading=lazy border="5px solid black" align="middle"
+       hspace=10 vspace=20 importance="high" crossorigin="use-credentials" ismap="true"
+       referrerpolicy="same-origin" usemap="#blah" name="name">
+
+  <!-- Valid with data-hero -->
+  <img src="http://www.example.com/blah.jpg" width=92 height=10
+       data-hero alt="blah" decoding=async border="5px solid black" align="left"
+       hspace=10 vspace=20 importance="high" crossorigin="use-credentials" ismap="false"
+       referrerpolicy="unsafe-url" usemap="#blah" name="name">
+
+  <!-- Valid with data-hero using srcset -->
+  <img src="http://www.example.com/blah.jpg" width=92 height=10
+       data-hero alt="blah" decoding=async border="5px solid black" align="left"
+       hspace=10 vspace=20 importance="high" crossorigin="use-credentials" ismap="false"
+       referrerpolicy="unsafe-url" usemap="#blah" name="name"
+       srcset="http://www.example.com/blah2.jpg 470w,
+               http://www.example.com/blah3.jpg 800w,
+               http://www.example.com/blah4.jpg 1200w"
+       sizes="470w,800w,1200w">
+
+  <!-- Invalid with wrong importance -->
+  <img src=data:image/png:base64,foo width=100 height=10
+       alt="blah" importance=none>
+
+  <!-- Invalid with wrong fetchpriority -->
+  <img src=data:image/png:base64,foo width=100 height=10
+       alt="blah" fetchpriority="wrongpriority">
+
+  <!-- Invalid with wrong crossorigin -->
+  <img src=data:image/png:base64,foo width=100 height=10
+       alt="blah" crossorigin="wrongcrossorigin">
+
+  <!-- Invalid with wrong referrerpolicy -->
+  <img src=data:image/png:base64,foo width=100 height=10
+       alt="blah" referrerpolicy="wrongreferrerpolicy">
+
+  <!-- Invalid with wrong decoding -->
+  <img src=data:image/png:base64,foo width=100 height=10
+       alt="blah" decoding=sync loading=lazy>
+
+  <!-- Invalid with wrong loading -->
+  <img src="https://www.example.com/blah.jpg" width=92 height=10
+       alt="blah" decoding=async loading=smart>
+
+  <!-- Invalid with data-hero loading -->
+  <img src="http://www.example.com/blah.jpg" width=92 height=10
+       data-hero alt="blah" decoding=async loading=lazy>
+
+  <!-- Valid: width is specified with px. -->
+  <img src="http://www.example.com/blah.jpg" width='92px      ' height=10  >
+
+  <!-- Valid: height is specified with auto -->
+  <img src="http://www.example.com/blah.jpg" width='92px      ' height=auto >
+
+  <!-- Valid: width is specified with incorrect trailing pixel specifier. -->
+  <img src="http://www.example.com/blah.jpg" width=92p height=10>
+
+  <!-- Valid: fragment -->
+  <img src="http://www.example.com/blah.jpg#fragment" width=92 height=10>"
+
+  <!-- Valid: server rendered image -->
+  <img src="http://www.example.com/blah.jpg" decoding=async loading=lazy>
+
+  <!-- Valid: no srcset -->
+  <img width=700 height=1067 src="http://www.example.com/i/trail-in.png">
+
+  <!-- Valid srcset with http -->
+  <img src="http://www.example.com/blah.jpg" width=400 height=10
+       srcset="http://www.example.com/blah2.jpg 470w,
+               http://www.example.com/blah3.jpg 800w,
+               http://www.example.com/blah4.jpg 1200w"
+       sizes="470w,800w,1200w">
+
+  <!-- Valid srcset with https -->
+  <img src="http://www.example.com/blah.jpg" width=400 height=10
+       srcset="https://www.example.com/blah2.jpg 470w,
+               https://www.example.com/blah3.jpg 800w,
+               https://www.example.com/blah4.jpg 1200w"
+       sizes="470w,800w,1200w">
+
+  <!-- Valid srcset without src -->
+  <img width=400 height=10
+       srcset="https://www.example.com/blah2.jpg 470w,
+               https://www.example.com/blah3.jpg 800w,
+               https://www.example.com/blah4.jpg 1200w">
+
+  <!-- Valid srcset without sizes -->
+  <img src="http://www.example.com/blah.jpg" width=400 height=10
+       srcset="https://www.example.com/blah2.jpg 470w,
+               https://www.example.com/blah3.jpg 800w,
+               https://www.example.com/blah4.jpg 1200w">
+
+  <!-- Invalid inside amp-story -->
+  <amp-story standalone
+           title=""
+           publisher=""
+           publisher-logo-src="logo"
+           poster-portrait-src="portrait">
+    <amp-story-page id=page1>
+      <amp-story-grid-layer template="vertical">
+        <img src="http://www.example.com/blah.jpg#fragment" width=92 height=10>"
+      </amp-story-grid-layer>
+    </amp-story-page>
+  </amp-story>
+</body>
+</html>
diff --git a/validator/testdata/feature_tests/img.out b/validator/testdata/feature_tests/img.out
new file mode 100644
index 000000000000..ebc2d639397b
--- /dev/null
+++ b/validator/testdata/feature_tests/img.out
@@ -0,0 +1,162 @@
+FAIL
+|  <!--
+|    Test Description:
+|    This is the minimum valid JavaScript AMP document; it includes all of the
+|    required fields from the spec, but nothing else.
+|  -->
+|  <!doctype html>
+|  <html ⚡>
+|  <head>
+|    <meta charset="utf-8">
+|    <link rel="canonical" href="./regular-html-version.html">
+|    <meta name="viewport" content="width=device-width">
+|    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+|    <script async src="https://cdn.ampproject.org/v0.js"></script>
+|  </head>
+|  <body>
+|    <!-- Valid -->
+|    <img src="http://www.example.com/blah.jpg" width=92 height=10
+|         alt="blah" decoding=async loading=lazy border="5px solid black" align="top"
+|         hspace=10 vspace=20 importance="high" crossorigin="use-credentials" ismap="true"
+|         referrerpolicy="same-origin" usemap="#blah" name="name">
+|
+|    <!-- Valid with fetchpriority -->
+|    <img src="http://www.example.com/blah.jpg" width=92 height=10
+|         alt="blah" decoding=async loading=lazy border="5px solid black" align="top"
+|         hspace=10 vspace=20 fetchpriority="low" importance="high" crossorigin="use-credentials" ismap="true"
+|         referrerpolicy="same-origin" usemap="#blah" name="name">
+|
+|    <!-- Valid with https -->
+|    <img src="https://www.example.com/blah.jpg" width=92 height=10
+|         alt="blah" decoding=async loading=lazy border="5px solid black" align="bottom"
+|         hspace=10 vspace=20 importance="auto" crossorigin="anonymous" ismap="false"
+|         referrerpolicy="no-referrer" usemap="#blah" name="name">
+|
+|    <!-- Valid with data -->
+|    <img src=data:image/png:base64,foo width=100 height=10
+|         alt="blah" decoding=async loading=lazy border="5px solid black" align="middle"
+|         hspace=10 vspace=20 importance="high" crossorigin="use-credentials" ismap="true"
+|         referrerpolicy="same-origin" usemap="#blah" name="name">
+|
+|    <!-- Valid with data-hero -->
+|    <img src="http://www.example.com/blah.jpg" width=92 height=10
+|         data-hero alt="blah" decoding=async border="5px solid black" align="left"
+|         hspace=10 vspace=20 importance="high" crossorigin="use-credentials" ismap="false"
+|         referrerpolicy="unsafe-url" usemap="#blah" name="name">
+|
+|    <!-- Valid with data-hero using srcset -->
+|    <img src="http://www.example.com/blah.jpg" width=92 height=10
+|         data-hero alt="blah" decoding=async border="5px solid black" align="left"
+|         hspace=10 vspace=20 importance="high" crossorigin="use-credentials" ismap="false"
+|         referrerpolicy="unsafe-url" usemap="#blah" name="name"
+|         srcset="http://www.example.com/blah2.jpg 470w,
+|                 http://www.example.com/blah3.jpg 800w,
+|                 http://www.example.com/blah4.jpg 1200w"
+|         sizes="470w,800w,1200w">
+|
+|    <!-- Invalid with wrong importance -->
+|    <img src=data:image/png:base64,foo width=100 height=10
+>>   ^~~~~~~~~
+feature_tests/img.html:57:2 The attribute 'importance' in tag 'img' is set to the invalid value 'none'.
+|         alt="blah" importance=none>
+|
+|    <!-- Invalid with wrong fetchpriority -->
+|    <img src=data:image/png:base64,foo width=100 height=10
+>>   ^~~~~~~~~
+feature_tests/img.html:61:2 The attribute 'fetchpriority' in tag 'img' is set to the invalid value 'wrongpriority'.
+|         alt="blah" fetchpriority="wrongpriority">
+|
+|    <!-- Invalid with wrong crossorigin -->
+|    <img src=data:image/png:base64,foo width=100 height=10
+>>   ^~~~~~~~~
+feature_tests/img.html:65:2 The attribute 'crossorigin' in tag 'img' is set to the invalid value 'wrongcrossorigin'.
+|         alt="blah" crossorigin="wrongcrossorigin">
+|
+|    <!-- Invalid with wrong referrerpolicy -->
+|    <img src=data:image/png:base64,foo width=100 height=10
+>>   ^~~~~~~~~
+feature_tests/img.html:69:2 The attribute 'referrerpolicy' in tag 'img' is set to the invalid value 'wrongreferrerpolicy'.
+|         alt="blah" referrerpolicy="wrongreferrerpolicy">
+|
+|    <!-- Invalid with wrong decoding -->
+|    <img src=data:image/png:base64,foo width=100 height=10
+>>   ^~~~~~~~~
+feature_tests/img.html:73:2 The attribute 'decoding' in tag 'img' is set to the invalid value 'sync'.
+|         alt="blah" decoding=sync loading=lazy>
+|
+|    <!-- Invalid with wrong loading -->
+|    <img src="https://www.example.com/blah.jpg" width=92 height=10
+>>   ^~~~~~~~~
+feature_tests/img.html:77:2 The attribute 'loading' in tag 'img' is set to the invalid value 'smart'.
+|         alt="blah" decoding=async loading=smart>
+|
+|    <!-- Invalid with data-hero loading -->
+|    <img src="http://www.example.com/blah.jpg" width=92 height=10
+|         data-hero alt="blah" decoding=async loading=lazy>
+|
+|    <!-- Valid: width is specified with px. -->
+|    <img src="http://www.example.com/blah.jpg" width='92px      ' height=10  >
+|
+|    <!-- Valid: height is specified with auto -->
+|    <img src="http://www.example.com/blah.jpg" width='92px      ' height=auto >
+|
+|    <!-- Valid: width is specified with incorrect trailing pixel specifier. -->
+|    <img src="http://www.example.com/blah.jpg" width=92p height=10>
+|
+|    <!-- Valid: fragment -->
+|    <img src="http://www.example.com/blah.jpg#fragment" width=92 height=10>"
+|
+|    <!-- Valid: server rendered image -->
+|    <img src="http://www.example.com/blah.jpg" decoding=async loading=lazy>
+|
+|    <!-- Valid: no srcset -->
+|    <img width=700 height=1067 src="http://www.example.com/i/trail-in.png">
+|
+|    <!-- Valid srcset with http -->
+|    <img src="http://www.example.com/blah.jpg" width=400 height=10
+|         srcset="http://www.example.com/blah2.jpg 470w,
+|                 http://www.example.com/blah3.jpg 800w,
+|                 http://www.example.com/blah4.jpg 1200w"
+|         sizes="470w,800w,1200w">
+|
+|    <!-- Valid srcset with https -->
+|    <img src="http://www.example.com/blah.jpg" width=400 height=10
+|         srcset="https://www.example.com/blah2.jpg 470w,
+|                 https://www.example.com/blah3.jpg 800w,
+|                 https://www.example.com/blah4.jpg 1200w"
+|         sizes="470w,800w,1200w">
+|
+|    <!-- Valid srcset without src -->
+|    <img width=400 height=10
+|         srcset="https://www.example.com/blah2.jpg 470w,
+|                 https://www.example.com/blah3.jpg 800w,
+|                 https://www.example.com/blah4.jpg 1200w">
+|
+|    <!-- Valid srcset without sizes -->
+|    <img src="http://www.example.com/blah.jpg" width=400 height=10
+|         srcset="https://www.example.com/blah2.jpg 470w,
+|                 https://www.example.com/blah3.jpg 800w,
+|                 https://www.example.com/blah4.jpg 1200w">
+|
+|    <!-- Invalid inside amp-story -->
+|    <amp-story standalone
+>>   ^~~~~~~~~
+feature_tests/img.html:129:2 Tag 'amp-story' is not allowed to have any sibling tags ('body' should only have 1 child). (see https://amp.dev/documentation/components/amp-story)
+>>   ^~~~~~~~~
+feature_tests/img.html:129:2 The tag 'amp-story' requires including the 'amp-story' extension JavaScript. (see https://amp.dev/documentation/components/amp-story)
+|             title=""
+|             publisher=""
+|             publisher-logo-src="logo"
+|             poster-portrait-src="portrait">
+|      <amp-story-page id=page1>
+>>     ^~~~~~~~~
+feature_tests/img.html:134:4 The tag 'amp-story-page' requires including the 'amp-story' extension JavaScript. (see https://amp.dev/documentation/components/amp-story)
+|        <amp-story-grid-layer template="vertical">
+|          <img src="http://www.example.com/blah.jpg#fragment" width=92 height=10>"
+>>         ^~~~~~~~~
+feature_tests/img.html:136:8 The tag 'img' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-img'? (see https://amp.dev/documentation/components/amp-img/)
+|        </amp-story-grid-layer>
+|      </amp-story-page>
+|    </amp-story>
+|  </body>
+|  </html>
diff --git a/validator/testdata/feature_tests/leaks.html b/validator/testdata/feature_tests/leaks.html
index 63678e259232..099891bf71af 100644
--- a/validator/testdata/feature_tests/leaks.html
+++ b/validator/testdata/feature_tests/leaks.html
@@ -35,6 +35,11 @@
 -->
 <meta http-equiv="refresh" content="10; url=http://leaking.via/meta-refresh">
 
+<!--
+%Redirects (empty attribute)
+-->
+<meta = http-equiv="refresh" content="10; url=http://leaking.via/meta-refresh">
+
 <!--
 %CSP
 -->
@@ -83,7 +88,10 @@
 <picture>
     <img srcset="https://leaking.via/picture-img-srcset">
 </picture>
+
+<!-- Warning: There are different results between JS and CPP validators for this -->
 <img srcset=",,,,,https://leaking.via/img-srcset">
+
 <img src="#" longdesc="https://leaking.via/img-longdesc">
 <!-- longdesc works on Firefox but requires right-click, "View Description" -->
 
diff --git a/validator/testdata/feature_tests/leaks.out b/validator/testdata/feature_tests/leaks.out
index bc0a7fc70091..1ad91364da13 100644
--- a/validator/testdata/feature_tests/leaks.out
+++ b/validator/testdata/feature_tests/leaks.out
@@ -53,6 +53,13 @@ feature_tests/leaks.html:30:4 CSS syntax error in tag 'style amp-custom' - saw i
 feature_tests/leaks.html:36:0 The attribute 'http-equiv' may not appear in tag 'meta'.
 |
 |  <!--
+|  %Redirects (empty attribute)
+|  -->
+|  <meta = http-equiv="refresh" content="10; url=http://leaking.via/meta-refresh">
+>> ^~~~~~~~~
+feature_tests/leaks.html:41:0 The attribute 'http-equiv' may not appear in tag 'meta'.
+|
+|  <!--
 |  %CSP
 |  -->
 |  <meta http-equiv="Content-Security-Policy" content="script-src 'self'; report-uri http://leaking.via/meta-csp-report-uri">
@@ -107,24 +114,18 @@ feature_tests/leaks.html:65:8 The attribute 'background' may not appear in tag '
 |  %Images
 |  -->
 |  <img src="https://leaking.via/img-src">
->> ^~~~~~~~~
-feature_tests/leaks.html:72:0 The tag 'img' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-img'? (see https://amp.dev/documentation/components/amp-img/)
 |  <img dynsrc="https://leaking.via/img-dynsrc">
 >> ^~~~~~~~~
-feature_tests/leaks.html:73:0 The tag 'img' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-img'? (see https://amp.dev/documentation/components/amp-img/)
+feature_tests/leaks.html:73:0 The attribute 'dynsrc' may not appear in tag 'img'.
 |  <img lowsrc="https://leaking.via/img-lowsrc">
 >> ^~~~~~~~~
-feature_tests/leaks.html:74:0 The tag 'img' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-img'? (see https://amp.dev/documentation/components/amp-img/)
+feature_tests/leaks.html:74:0 The attribute 'lowsrc' may not appear in tag 'img'.
 |  <img src="data:image/svg+xml,<svg%20xmlns='%68ttp:%2f/www.w3.org/2000/svg'%20xmlns:xlink='%68ttp:%2f/www.w3.org/1999/xlink'><image%20xlink:hr%65f='%68ttp:%2f/leaking.via/svg-via-data'></image></svg>">
->> ^~~~~~~~~
-feature_tests/leaks.html:75:0 The tag 'img' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-img'? (see https://amp.dev/documentation/components/amp-img/)
 |
 |  <image src="https://leaking.via/image-src"></image>
->> ^~~~~~~~~
-feature_tests/leaks.html:77:0 The tag 'image' may only appear as a descendant of tag 'svg'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#svg)
 |  <image href="https://leaking.via/image-href"></image>
 >> ^~~~~~~~~
-feature_tests/leaks.html:78:0 The tag 'image' may only appear as a descendant of tag 'svg'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#svg)
+feature_tests/leaks.html:78:0 The attribute 'href' may not appear in tag 'img'.
 |
 |  <picture>
 >> ^~~~~~~~~
@@ -135,15 +136,14 @@ feature_tests/leaks.html:80:0 The parent tag of tag 'picture' is 'body', but it
 >> ^~~~~~~~~
 feature_tests/leaks.html:83:0 The parent tag of tag 'picture' is 'body', but it can only be 'noscript'. (see https://amp.dev/documentation/components/amp-img/)
 |      <img srcset="https://leaking.via/picture-img-srcset">
->>     ^~~~~~~~~
-feature_tests/leaks.html:84:4 The tag 'img' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-img'? (see https://amp.dev/documentation/components/amp-img/)
 |  </picture>
+|
+|  <!-- Warning: There are different results between JS and CPP validators for this -->
 |  <img srcset=",,,,,https://leaking.via/img-srcset">
->> ^~~~~~~~~
-feature_tests/leaks.html:86:0 The tag 'img' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-img'? (see https://amp.dev/documentation/components/amp-img/)
+|
 |  <img src="#" longdesc="https://leaking.via/img-longdesc">
 >> ^~~~~~~~~
-feature_tests/leaks.html:87:0 The tag 'img' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-img'? (see https://amp.dev/documentation/components/amp-img/)
+feature_tests/leaks.html:90:0 The attribute 'longdesc' may not appear in tag 'img'.
 |  <!-- longdesc works on Firefox but requires right-click, "View Description" -->
 |
 |  <!--
@@ -151,92 +151,92 @@ feature_tests/leaks.html:87:0 The tag 'img' may only appear as a descendant of t
 |  -->
 |  <input type="image" src="https://leaking.via/input-src" name="test" value="test">
 >> ^~~~~~~~~
-feature_tests/leaks.html:93:0 The attribute 'src' may not appear in tag 'input'. (see https://amp.dev/documentation/components/amp-form/)
+feature_tests/leaks.html:96:0 The tag 'input' may only appear as a descendant of tag 'form [method=post]'. (see https://amp.dev/documentation/components/amp-form/)
 |  <isindex src="https://leaking.via/isindex-src" type="image">
 >> ^~~~~~~~~
-feature_tests/leaks.html:94:0 The tag 'isindex' is disallowed.
+feature_tests/leaks.html:97:0 The tag 'isindex' is disallowed.
 |  <isindex action="https://leaking.via/isindex-action"></isindex>
 >> ^~~~~~~~~
-feature_tests/leaks.html:95:0 The tag 'isindex' is disallowed.
+feature_tests/leaks.html:98:0 The tag 'isindex' is disallowed.
 |  <form id="test2"></form><isindex type="submit" formaction="https://leaking.via/isindex-formaction" form="test2"></isindex>
 >> ^~~~~~~~~
-feature_tests/leaks.html:96:0 The mandatory attribute 'action' is missing in tag 'form'. (see https://amp.dev/documentation/components/amp-form)
+feature_tests/leaks.html:99:0 The mandatory attribute 'action' is missing in tag 'form'. (see https://amp.dev/documentation/components/amp-form)
 >> ^~~~~~~~~
-feature_tests/leaks.html:96:0 The mandatory attribute 'target' is missing in tag 'form'. (see https://amp.dev/documentation/components/amp-form)
+feature_tests/leaks.html:99:0 The mandatory attribute 'target' is missing in tag 'form'. (see https://amp.dev/documentation/components/amp-form)
 >> ^~~~~~~~~
-feature_tests/leaks.html:96:0 The tag 'form' requires including the 'amp-form' extension JavaScript. (see https://amp.dev/documentation/components/amp-form)
+feature_tests/leaks.html:99:0 The tag 'form' requires including the 'amp-form' extension JavaScript. (see https://amp.dev/documentation/components/amp-form)
 >>                         ^~~~~~~~~
-feature_tests/leaks.html:96:24 The tag 'isindex' is disallowed.
+feature_tests/leaks.html:99:24 The tag 'isindex' is disallowed.
 |
 |  <!--
 |  %Media
 |  -->
 |  <bgsound src="https://leaking.via/bgsound-src"></bgsound>
 >> ^~~~~~~~~
-feature_tests/leaks.html:101:0 The tag 'bgsound' is disallowed.
+feature_tests/leaks.html:104:0 The tag 'bgsound' is disallowed.
 |  <video src="https://leaking.via/video-src">
 >> ^~~~~~~~~
-feature_tests/leaks.html:102:0 The tag 'video' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-video'? (see https://amp.dev/documentation/components/amp-video/)
+feature_tests/leaks.html:105:0 The tag 'video' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-video'? (see https://amp.dev/documentation/components/amp-video/)
 |    <track kind="subtitles" label="English subtitles" src="https://leaking.via/track-src" srclang="en" default></track>
 |  </video>
 |  <video controls>
 >> ^~~~~~~~~
-feature_tests/leaks.html:105:0 The tag 'video' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-video'? (see https://amp.dev/documentation/components/amp-video/)
+feature_tests/leaks.html:108:0 The tag 'video' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-video'? (see https://amp.dev/documentation/components/amp-video/)
 |    <source src="https://leaking.via/video-source-src" type="video/mp4">
 |  </video>
 |  <audio src="https://leaking.via/audio-src"></audio>
 >> ^~~~~~~~~
-feature_tests/leaks.html:108:0 The tag 'audio' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-audio'? (see https://amp.dev/documentation/components/amp-audio/)
+feature_tests/leaks.html:111:0 The tag 'audio' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-audio'? (see https://amp.dev/documentation/components/amp-audio/)
 |  <audio controls>
 >> ^~~~~~~~~
-feature_tests/leaks.html:109:0 The tag 'audio' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-audio'? (see https://amp.dev/documentation/components/amp-audio/)
+feature_tests/leaks.html:112:0 The tag 'audio' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-audio'? (see https://amp.dev/documentation/components/amp-audio/)
 |    <source src="https://leaking.via/audio-source-src" type="video/mp4">
 |  </audio>
 |  <video poster="https://leaking.via/video-poster" src="https://leaking.via/video-poster-2"></video>
 >> ^~~~~~~~~
-feature_tests/leaks.html:112:0 The tag 'video' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-video'? (see https://amp.dev/documentation/components/amp-video/)
+feature_tests/leaks.html:115:0 The tag 'video' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-video'? (see https://amp.dev/documentation/components/amp-video/)
 |
 |  <!--
 |  %Object & Embed
 |  -->
 |  <object data="https://leaking.via/object-data"></object>
 >> ^~~~~~~~~
-feature_tests/leaks.html:117:0 The tag 'object' is disallowed.
+feature_tests/leaks.html:120:0 The tag 'object' is disallowed.
 |  <object type="text/x-scriptlet" data="https://leaking.via/object-data-x-scriptlet"></object>
 >> ^~~~~~~~~
-feature_tests/leaks.html:118:0 The tag 'object' is disallowed.
+feature_tests/leaks.html:121:0 The tag 'object' is disallowed.
 |  <object movie="https://leaking.via/object-movie" type="application/x-shockwave-flash"></object>
 >> ^~~~~~~~~
-feature_tests/leaks.html:119:0 The tag 'object' is disallowed.
+feature_tests/leaks.html:122:0 The tag 'object' is disallowed.
 |  <object movie="https://leaking.via/object-movie">
 >> ^~~~~~~~~
-feature_tests/leaks.html:120:0 The tag 'object' is disallowed.
+feature_tests/leaks.html:123:0 The tag 'object' is disallowed.
 |      <param name="type" value="application/x-shockwave-flash"></param>
 >>     ^~~~~~~~~
-feature_tests/leaks.html:121:4 The tag 'param' is disallowed.
+feature_tests/leaks.html:124:4 The tag 'param' is disallowed.
 |  </object>
 |  <object codebase="https://leaking.via/object-codebase"></object>
 >> ^~~~~~~~~
-feature_tests/leaks.html:123:0 The tag 'object' is disallowed.
+feature_tests/leaks.html:126:0 The tag 'object' is disallowed.
 |  <embed src="https://leaking.via/embed-src"></embed>
 >> ^~~~~~~~~
-feature_tests/leaks.html:124:0 The tag 'embed' is disallowed.
+feature_tests/leaks.html:127:0 The tag 'embed' is disallowed.
 |  <embed code="https://leaking.via/embed-code"></embed>
 >> ^~~~~~~~~
-feature_tests/leaks.html:125:0 The tag 'embed' is disallowed.
+feature_tests/leaks.html:128:0 The tag 'embed' is disallowed.
 |  <object classid="clsid:333C7BC4-460F-11D0-BC04-0080C7055A83">
 >> ^~~~~~~~~
-feature_tests/leaks.html:126:0 The tag 'object' is disallowed.
+feature_tests/leaks.html:129:0 The tag 'object' is disallowed.
 |      <param name="DataURL" value="https://leaking.via/object-param-dataurl">
 >>     ^~~~~~~~~
-feature_tests/leaks.html:127:4 The tag 'param' is disallowed.
+feature_tests/leaks.html:130:4 The tag 'param' is disallowed.
 |  </object>
 |  <object classid="clsid:6BF52A52-394A-11d3-B153-00C04F79FAA6">
 >> ^~~~~~~~~
-feature_tests/leaks.html:129:0 The tag 'object' is disallowed.
+feature_tests/leaks.html:132:0 The tag 'object' is disallowed.
 |      <param name="URL" value="https://leaking.via/object-param-url">
 >>     ^~~~~~~~~
-feature_tests/leaks.html:130:4 The tag 'param' is disallowed.
+feature_tests/leaks.html:133:4 The tag 'param' is disallowed.
 |  </object>
 |
 |
@@ -245,16 +245,16 @@ feature_tests/leaks.html:130:4 The tag 'param' is disallowed.
 |  -->
 |  <script src="https://leaking.via/script-src"></script>
 >> ^~~~~~~~~
-feature_tests/leaks.html:137:0 Custom JavaScript is not allowed. (see https://amp.dev/documentation/guides-and-tutorials/learn/validation-workflow/validation_errors/#custom-javascript-is-not-allowed)
+feature_tests/leaks.html:140:0 Custom JavaScript is not allowed. (see https://amp.dev/documentation/guides-and-tutorials/learn/validation-workflow/validation_errors/#custom-javascript-is-not-allowed)
 |  <svg><script href="https://leaking.via/svg-script-href"></script></svg>
 >>      ^~~~~~~~~
-feature_tests/leaks.html:138:5 Custom JavaScript is not allowed. (see https://amp.dev/documentation/guides-and-tutorials/learn/validation-workflow/validation_errors/#custom-javascript-is-not-allowed)
+feature_tests/leaks.html:141:5 Custom JavaScript is not allowed. (see https://amp.dev/documentation/guides-and-tutorials/learn/validation-workflow/validation_errors/#custom-javascript-is-not-allowed)
 |  <svg><script xlink:href="https://leaking.via/svg-script-xlink-href"></script></svg>
 >>      ^~~~~~~~~
-feature_tests/leaks.html:139:5 Custom JavaScript is not allowed. (see https://amp.dev/documentation/guides-and-tutorials/learn/validation-workflow/validation_errors/#custom-javascript-is-not-allowed)
+feature_tests/leaks.html:142:5 Custom JavaScript is not allowed. (see https://amp.dev/documentation/guides-and-tutorials/learn/validation-workflow/validation_errors/#custom-javascript-is-not-allowed)
 |  <script>
 >> ^~~~~~~~~
-feature_tests/leaks.html:140:0 Custom JavaScript is not allowed. (see https://amp.dev/documentation/guides-and-tutorials/learn/validation-workflow/validation_errors/#custom-javascript-is-not-allowed)
+feature_tests/leaks.html:143:0 Custom JavaScript is not allowed. (see https://amp.dev/documentation/guides-and-tutorials/learn/validation-workflow/validation_errors/#custom-javascript-is-not-allowed)
 |  //# sourceMappingURL=https://leaking.via/javascript-source-map
 |  </script>
 |
@@ -263,38 +263,38 @@ feature_tests/leaks.html:140:0 Custom JavaScript is not allowed. (see https://am
 |  -->
 |  <iframe src="https://leaking.via/iframe-src"></iframe>
 >> ^~~~~~~~~
-feature_tests/leaks.html:147:0 The tag 'iframe' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-iframe'? (see https://amp.dev/documentation/components/amp-iframe/)
+feature_tests/leaks.html:150:0 The tag 'iframe' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-iframe'? (see https://amp.dev/documentation/components/amp-iframe/)
 |  <iframe src="data:image/svg+xml,<svg%20xmlns='%68ttp:%2f/www.w3.org/2000/svg'%20xmlns:xlink='%68ttp:%2f/www.w3.org/1999/xlink'><image%20xlink:hr%65f='%68ttps:%2f/leaking.via/svg-via-data'></image></svg>"></iframe>
 >> ^~~~~~~~~
-feature_tests/leaks.html:148:0 The tag 'iframe' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-iframe'? (see https://amp.dev/documentation/components/amp-iframe/)
+feature_tests/leaks.html:151:0 The tag 'iframe' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-iframe'? (see https://amp.dev/documentation/components/amp-iframe/)
 |  <iframe srcdoc="<img src=https://leaking.via/iframe-srcdoc-img-src>"></iframe>
 >> ^~~~~~~~~
-feature_tests/leaks.html:149:0 The tag 'iframe' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-iframe'? (see https://amp.dev/documentation/components/amp-iframe/)
+feature_tests/leaks.html:152:0 The tag 'iframe' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-iframe'? (see https://amp.dev/documentation/components/amp-iframe/)
 |  <iframe src="view-source:https://leaking.via/iframe-src-viewsource"></iframe>
 >> ^~~~~~~~~
-feature_tests/leaks.html:150:0 The tag 'iframe' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-iframe'? (see https://amp.dev/documentation/components/amp-iframe/)
+feature_tests/leaks.html:153:0 The tag 'iframe' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-iframe'? (see https://amp.dev/documentation/components/amp-iframe/)
 |  <iframe src="javascript:'&lt;img src=https://leaking.via/iframe-javascript-src&gt;'"></iframe>
 >> ^~~~~~~~~
-feature_tests/leaks.html:151:0 The tag 'iframe' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-iframe'? (see https://amp.dev/documentation/components/amp-iframe/)
+feature_tests/leaks.html:154:0 The tag 'iframe' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-iframe'? (see https://amp.dev/documentation/components/amp-iframe/)
 |  <iframe src="javascript:'&lt;iframe src=&quot;javascript:\&apos;&lt;img src=https://leaking.via/iframe-javascript-src-2&gt;\&apos;&quot;&gt;&lt;/iframe&gt;'"></iframe>
 >> ^~~~~~~~~
-feature_tests/leaks.html:152:0 The tag 'iframe' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-iframe'? (see https://amp.dev/documentation/components/amp-iframe/)
+feature_tests/leaks.html:155:0 The tag 'iframe' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-iframe'? (see https://amp.dev/documentation/components/amp-iframe/)
 |  <iframe src="javascript:atob('PGltZyBzcmM9Imh0dHBzOi8vbGVha2luZy52aWEvaWZyYW1lLWphdmFzY3JpcHQtc3JjLTMiPg==')"></iframe>
 >> ^~~~~~~~~
-feature_tests/leaks.html:153:0 The tag 'iframe' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-iframe'? (see https://amp.dev/documentation/components/amp-iframe/)
+feature_tests/leaks.html:156:0 The tag 'iframe' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-iframe'? (see https://amp.dev/documentation/components/amp-iframe/)
 |
 |  <!--
 |  %Menu
 |  -->
 |  <p contextmenu="a">Right Click</p>
 >> ^~~~~~~~~
-feature_tests/leaks.html:158:0 The attribute 'contextmenu' may not appear in tag 'p'.
+feature_tests/leaks.html:161:0 The attribute 'contextmenu' may not appear in tag 'p'.
 |  <menu type="context" id="a">
 >> ^~~~~~~~~
-feature_tests/leaks.html:159:0 The tag 'menu' is disallowed.
+feature_tests/leaks.html:162:0 The tag 'menu' is disallowed.
 |      <menuitem label="a" icon="https://leaking.via/menuitem-icon"></menuitem>
 >>     ^~~~~~~~~
-feature_tests/leaks.html:160:4 The tag 'menuitem' is disallowed.
+feature_tests/leaks.html:163:4 The tag 'menuitem' is disallowed.
 |  </menu>
 |
 |
@@ -303,26 +303,26 @@ feature_tests/leaks.html:160:4 The tag 'menuitem' is disallowed.
 |  -->
 |  <applet code="Test" codebase="https://leaking.via/applet-codebase"></applet>
 >> ^~~~~~~~~
-feature_tests/leaks.html:167:0 The tag 'applet' is disallowed.
+feature_tests/leaks.html:170:0 The tag 'applet' is disallowed.
 |  <applet code="Test" archive="https://leaking.via/applet-archive"></applet>
 >> ^~~~~~~~~
-feature_tests/leaks.html:168:0 The tag 'applet' is disallowed.
+feature_tests/leaks.html:171:0 The tag 'applet' is disallowed.
 |  <applet code="Test" object="https://leaking.via/applet-object"></applet>
 >> ^~~~~~~~~
-feature_tests/leaks.html:169:0 The tag 'applet' is disallowed.
+feature_tests/leaks.html:172:0 The tag 'applet' is disallowed.
 |
 |  <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 |      <image xmlns:xlink="http://www.w3.org/1999/xlink">
 |          <animate attributeName="xlink:href" begin="0s" from="#" to="https://leaking.via/svg-image-animate" />
 >>         ^~~~~~~~~
-feature_tests/leaks.html:173:8 The tag 'animate' is disallowed.
+feature_tests/leaks.html:176:8 The tag 'animate' is disallowed.
 |      </image>
 |  </svg>
 |
 |  <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 |      <feImage xlink:href="https://leaking.via/svg-feimage" />
 >>     ^~~~~~~~~
-feature_tests/leaks.html:178:4 The tag 'feimage' is disallowed.
+feature_tests/leaks.html:181:4 The tag 'feimage' is disallowed.
 |  </svg>
 |
 |  <!--
@@ -330,45 +330,45 @@ feature_tests/leaks.html:178:4 The tag 'feimage' is disallowed.
 |  -->
 |  <?xml-stylesheet type="text/xsl" href="https://leaking.via/xslt-stylesheet" ?>
 >> ^~~~~~~~~
-feature_tests/leaks.html:184:0 The tag '?xml-stylesheet' is disallowed.
+feature_tests/leaks.html:187:0 The tag '?xml-stylesheet' is disallowed.
 |
 |  <!--
 |  %Data Islands
 |  -->
 |  <xml src="https://leaking.via/xml-src" id="xml"></xml>
 >> ^~~~~~~~~
-feature_tests/leaks.html:189:0 The tag 'xml' is disallowed.
+feature_tests/leaks.html:192:0 The tag 'xml' is disallowed.
 |  <div datasrc="#xml" datafld="$text" dataformatas="html"></div>
 >> ^~~~~~~~~
-feature_tests/leaks.html:190:0 The attribute 'datafld' may not appear in tag 'div'.
+feature_tests/leaks.html:193:0 The attribute 'datafld' may not appear in tag 'div'.
 >> ^~~~~~~~~
-feature_tests/leaks.html:190:0 The attribute 'dataformatas' may not appear in tag 'div'.
+feature_tests/leaks.html:193:0 The attribute 'dataformatas' may not appear in tag 'div'.
 >> ^~~~~~~~~
-feature_tests/leaks.html:190:0 The attribute 'datasrc' may not appear in tag 'div'.
+feature_tests/leaks.html:193:0 The attribute 'datasrc' may not appear in tag 'div'.
 |
 |  <!--
 |  %VML
 |  -->
 |  <line xmlns="urn:schemas-microsoft-com:vml">
 >> ^~~~~~~~~
-feature_tests/leaks.html:195:0 The tag 'line' may only appear as a descendant of tag 'svg'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#svg)
+feature_tests/leaks.html:198:0 The tag 'line' may only appear as a descendant of tag 'svg'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#svg)
 |      <fill style="behavior:url(#default#vml)" src="https://leaking.via/vml-line-fill-src" />
 >>     ^~~~~~~~~
-feature_tests/leaks.html:196:4 The tag 'fill' is disallowed.
+feature_tests/leaks.html:199:4 The tag 'fill' is disallowed.
 |      <stroke style="behavior:url(#default#vml)" src="https://leaking.via/vml-line-stroke-src" />
 >>     ^~~~~~~~~
-feature_tests/leaks.html:197:4 The tag 'stroke' is disallowed.
+feature_tests/leaks.html:200:4 The tag 'stroke' is disallowed.
 |      <imageData style="behavior:url(#default#vml)" src="https://leaking.via/vml-line-imgdata-src" />
 >>     ^~~~~~~~~
-feature_tests/leaks.html:198:4 The tag 'imagedata' is disallowed.
+feature_tests/leaks.html:201:4 The tag 'imagedata' is disallowed.
 |  </line>
 |  <vmlframe
 >> ^~~~~~~~~
-feature_tests/leaks.html:200:0 The tag 'vmlframe' is disallowed.
+feature_tests/leaks.html:203:0 The tag 'vmlframe' is disallowed.
 |      xmlns="urn:schemas-microsoft-com:vml"
 |      style="behavior:url(#default#vml);position:absolute;width:100%;height:100%"
 |      src="https://leaking.via/vmlframe-src#xss">
 |  </vmlframe>
 |
 |  </body>
-|  </html>
\ No newline at end of file
+|  </html>
diff --git a/validator/testdata/feature_tests/leaks.out.cpponly b/validator/testdata/feature_tests/leaks.out.cpponly
index 8b7ca41fcd53..1db6fa16c687 100644
--- a/validator/testdata/feature_tests/leaks.out.cpponly
+++ b/validator/testdata/feature_tests/leaks.out.cpponly
@@ -51,39 +51,44 @@ feature_tests/leaks.html:30:4 CSS syntax error in tag 'style amp-custom' - saw i
 feature_tests/leaks.html:36:0 The attribute 'http-equiv' may not appear in tag 'meta'.
 |
 |  <!--
+|  %Redirects (empty attribute)
+|  -->
+|  <meta = http-equiv="refresh" content="10; url=http://leaking.via/meta-refresh">
+|
+|  <!--
 |  %CSP
 |  -->
 |  <meta http-equiv="Content-Security-Policy" content="script-src 'self'; report-uri http://leaking.via/meta-csp-report-uri">
 >> ^~~~~~~~~
-feature_tests/leaks.html:41:0 The attribute 'http-equiv' may not appear in tag 'meta'.
+feature_tests/leaks.html:46:0 The attribute 'http-equiv' may not appear in tag 'meta'.
 |  <meta http-equiv="Content-Security-Policy-Report-Only" content="script-src 'self'; report-uri http://leaking.via/meta-csp-report-uri-2">
 >> ^~~~~~~~~
-feature_tests/leaks.html:42:0 The attribute 'http-equiv' may not appear in tag 'meta'.
+feature_tests/leaks.html:47:0 The attribute 'http-equiv' may not appear in tag 'meta'.
 |
 |  <!--
 |  %Links
 |  -->
 |  <link rel="stylesheet" href="https://leaking.via/link-stylesheet" />
 >> ^~~~~~~~~
-feature_tests/leaks.html:47:0 The attribute 'href' in tag 'link rel=stylesheet for fonts' is set to the invalid value 'https://leaking.via/link-stylesheet'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#custom-fonts)
+feature_tests/leaks.html:52:0 The attribute 'href' in tag 'link rel=stylesheet for fonts' is set to the invalid value 'https://leaking.via/link-stylesheet'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#custom-fonts)
 |  <link rel="alternate stylesheet" href="https://leaking.via/link-alternate-stylesheet" />
 >> ^~~~~~~~~
-feature_tests/leaks.html:48:0 The attribute 'rel' in tag 'link' is set to the invalid value 'alternate stylesheet'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#html-tags)
+feature_tests/leaks.html:53:0 The attribute 'rel' in tag 'link' is set to the invalid value 'alternate stylesheet'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#html-tags)
 |  <link rel="import" href="https://leaking.via/link-import" />
 >> ^~~~~~~~~
-feature_tests/leaks.html:49:0 The attribute 'rel' in tag 'link' is set to the invalid value 'import'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#html-tags)
+feature_tests/leaks.html:54:0 The attribute 'rel' in tag 'link' is set to the invalid value 'import'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#html-tags)
 |  <link rel="subresource" href="https://leaking.via/link-subresource">
 >> ^~~~~~~~~
-feature_tests/leaks.html:50:0 The attribute 'rel' in tag 'link' is set to the invalid value 'subresource'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#html-tags)
+feature_tests/leaks.html:55:0 The attribute 'rel' in tag 'link' is set to the invalid value 'subresource'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#html-tags)
 |
 |  <!--
 |  %MSIE Imports
 |  -->
 |  <IMPORT namespace="myNS" implementation="https://leaking.via/import-implementation-2" /></IMPORT>
 >> ^~~~~~~~~
-feature_tests/leaks.html:55:0 Tag or text which is only allowed inside the body section found outside of the body section.
+feature_tests/leaks.html:60:0 Tag or text which is only allowed inside the body section found outside of the body section.
 >> ^~~~~~~~~
-feature_tests/leaks.html:55:0 The tag 'import' is disallowed.
+feature_tests/leaks.html:60:0 The tag 'import' is disallowed.
 |
 |  </head>
 |  <body>
@@ -93,11 +98,11 @@ feature_tests/leaks.html:55:0 The tag 'import' is disallowed.
 |  -->
 |  <table background="https://leaking.via/table-background">
 >> ^~~~~~~~~
-feature_tests/leaks.html:63:0 The attribute 'background' may not appear in tag 'table'.
+feature_tests/leaks.html:68:0 The attribute 'background' may not appear in tag 'table'.
 |      <tr>
 |          <td background="https://leaking.via/td-background"></td>
 >>         ^~~~~~~~~
-feature_tests/leaks.html:65:8 The attribute 'background' may not appear in tag 'td'.
+feature_tests/leaks.html:70:8 The attribute 'background' may not appear in tag 'td'.
 |      </tr>
 |  </table>
 |
@@ -105,43 +110,38 @@ feature_tests/leaks.html:65:8 The attribute 'background' may not appear in tag '
 |  %Images
 |  -->
 |  <img src="https://leaking.via/img-src">
->> ^~~~~~~~~
-feature_tests/leaks.html:72:0 The tag 'img' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-img'? (see https://amp.dev/documentation/components/amp-img/)
 |  <img dynsrc="https://leaking.via/img-dynsrc">
 >> ^~~~~~~~~
-feature_tests/leaks.html:73:0 The tag 'img' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-img'? (see https://amp.dev/documentation/components/amp-img/)
+feature_tests/leaks.html:78:0 The attribute 'dynsrc' may not appear in tag 'img'.
 |  <img lowsrc="https://leaking.via/img-lowsrc">
 >> ^~~~~~~~~
-feature_tests/leaks.html:74:0 The tag 'img' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-img'? (see https://amp.dev/documentation/components/amp-img/)
+feature_tests/leaks.html:79:0 The attribute 'lowsrc' may not appear in tag 'img'.
 |  <img src="data:image/svg+xml,<svg%20xmlns='%68ttp:%2f/www.w3.org/2000/svg'%20xmlns:xlink='%68ttp:%2f/www.w3.org/1999/xlink'><image%20xlink:hr%65f='%68ttp:%2f/leaking.via/svg-via-data'></image></svg>">
->> ^~~~~~~~~
-feature_tests/leaks.html:75:0 The tag 'img' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-img'? (see https://amp.dev/documentation/components/amp-img/)
 |
 |  <image src="https://leaking.via/image-src"></image>
->> ^~~~~~~~~
-feature_tests/leaks.html:77:0 The tag 'img' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-img'? (see https://amp.dev/documentation/components/amp-img/)
 |  <image href="https://leaking.via/image-href"></image>
 >> ^~~~~~~~~
-feature_tests/leaks.html:78:0 The tag 'img' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-img'? (see https://amp.dev/documentation/components/amp-img/)
+feature_tests/leaks.html:83:0 The attribute 'href' may not appear in tag 'img'.
 |
 |  <picture>
 >> ^~~~~~~~~
-feature_tests/leaks.html:80:0 The parent tag of tag 'picture' is 'body', but it can only be 'noscript'. (see https://amp.dev/documentation/components/amp-img/)
+feature_tests/leaks.html:85:0 The parent tag of tag 'picture' is 'body', but it can only be 'noscript'. (see https://amp.dev/documentation/components/amp-img/)
 |      <source srcset="https://leaking.via/picture-source-srcset">
 |  </picture>
 |  <picture>
 >> ^~~~~~~~~
-feature_tests/leaks.html:83:0 The parent tag of tag 'picture' is 'body', but it can only be 'noscript'. (see https://amp.dev/documentation/components/amp-img/)
+feature_tests/leaks.html:88:0 The parent tag of tag 'picture' is 'body', but it can only be 'noscript'. (see https://amp.dev/documentation/components/amp-img/)
 |      <img srcset="https://leaking.via/picture-img-srcset">
->>     ^~~~~~~~~
-feature_tests/leaks.html:84:4 The tag 'img' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-img'? (see https://amp.dev/documentation/components/amp-img/)
 |  </picture>
+|
+|  <!-- Warning: There are different results between JS and CPP validators for this -->
 |  <img srcset=",,,,,https://leaking.via/img-srcset">
 >> ^~~~~~~~~
-feature_tests/leaks.html:86:0 The tag 'img' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-img'? (see https://amp.dev/documentation/components/amp-img/)
+feature_tests/leaks.html:93:0 The attribute 'srcset' in tag 'img' is set to the invalid value ',,,,,https://leaking.via/img-srcset'.
+|
 |  <img src="#" longdesc="https://leaking.via/img-longdesc">
 >> ^~~~~~~~~
-feature_tests/leaks.html:87:0 The tag 'img' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-img'? (see https://amp.dev/documentation/components/amp-img/)
+feature_tests/leaks.html:95:0 The attribute 'longdesc' may not appear in tag 'img'.
 |  <!-- longdesc works on Firefox but requires right-click, "View Description" -->
 |
 |  <!--
@@ -149,92 +149,92 @@ feature_tests/leaks.html:87:0 The tag 'img' may only appear as a descendant of t
 |  -->
 |  <input type="image" src="https://leaking.via/input-src" name="test" value="test">
 >> ^~~~~~~~~
-feature_tests/leaks.html:93:0 The attribute 'src' may not appear in tag 'input'. (see https://amp.dev/documentation/components/amp-form/)
+feature_tests/leaks.html:101:0 The tag 'input' may only appear as a descendant of tag 'form [method=post]'. (see https://amp.dev/documentation/components/amp-form/)
 |  <isindex src="https://leaking.via/isindex-src" type="image">
 >> ^~~~~~~~~
-feature_tests/leaks.html:94:0 The tag 'isindex' is disallowed.
+feature_tests/leaks.html:102:0 The tag 'isindex' is disallowed.
 |  <isindex action="https://leaking.via/isindex-action"></isindex>
 >> ^~~~~~~~~
-feature_tests/leaks.html:95:0 The tag 'isindex' is disallowed.
+feature_tests/leaks.html:103:0 The tag 'isindex' is disallowed.
 |  <form id="test2"></form><isindex type="submit" formaction="https://leaking.via/isindex-formaction" form="test2"></isindex>
 >> ^~~~~~~~~
-feature_tests/leaks.html:96:0 The mandatory attribute 'action' is missing in tag 'form'. (see https://amp.dev/documentation/components/amp-form)
+feature_tests/leaks.html:104:0 The mandatory attribute 'action' is missing in tag 'form'. (see https://amp.dev/documentation/components/amp-form)
 >> ^~~~~~~~~
-feature_tests/leaks.html:96:0 The mandatory attribute 'target' is missing in tag 'form'. (see https://amp.dev/documentation/components/amp-form)
+feature_tests/leaks.html:104:0 The mandatory attribute 'target' is missing in tag 'form'. (see https://amp.dev/documentation/components/amp-form)
 >> ^~~~~~~~~
-feature_tests/leaks.html:96:0 The tag 'form' requires including the 'amp-form' extension JavaScript. (see https://amp.dev/documentation/components/amp-form)
+feature_tests/leaks.html:104:0 The tag 'form' requires including the 'amp-form' extension JavaScript. (see https://amp.dev/documentation/components/amp-form)
 >>                         ^~~~~~~~~
-feature_tests/leaks.html:96:24 The tag 'isindex' is disallowed.
+feature_tests/leaks.html:104:24 The tag 'isindex' is disallowed.
 |
 |  <!--
 |  %Media
 |  -->
 |  <bgsound src="https://leaking.via/bgsound-src"></bgsound>
 >> ^~~~~~~~~
-feature_tests/leaks.html:101:0 The tag 'bgsound' is disallowed.
+feature_tests/leaks.html:109:0 The tag 'bgsound' is disallowed.
 |  <video src="https://leaking.via/video-src">
 >> ^~~~~~~~~
-feature_tests/leaks.html:102:0 The tag 'video' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-video'? (see https://amp.dev/documentation/components/amp-video/)
+feature_tests/leaks.html:110:0 The tag 'video' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-video'? (see https://amp.dev/documentation/components/amp-video/)
 |    <track kind="subtitles" label="English subtitles" src="https://leaking.via/track-src" srclang="en" default></track>
 |  </video>
 |  <video controls>
 >> ^~~~~~~~~
-feature_tests/leaks.html:105:0 The tag 'video' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-video'? (see https://amp.dev/documentation/components/amp-video/)
+feature_tests/leaks.html:113:0 The tag 'video' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-video'? (see https://amp.dev/documentation/components/amp-video/)
 |    <source src="https://leaking.via/video-source-src" type="video/mp4">
 |  </video>
 |  <audio src="https://leaking.via/audio-src"></audio>
 >> ^~~~~~~~~
-feature_tests/leaks.html:108:0 The tag 'audio' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-audio'? (see https://amp.dev/documentation/components/amp-audio/)
+feature_tests/leaks.html:116:0 The tag 'audio' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-audio'? (see https://amp.dev/documentation/components/amp-audio/)
 |  <audio controls>
 >> ^~~~~~~~~
-feature_tests/leaks.html:109:0 The tag 'audio' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-audio'? (see https://amp.dev/documentation/components/amp-audio/)
+feature_tests/leaks.html:117:0 The tag 'audio' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-audio'? (see https://amp.dev/documentation/components/amp-audio/)
 |    <source src="https://leaking.via/audio-source-src" type="video/mp4">
 |  </audio>
 |  <video poster="https://leaking.via/video-poster" src="https://leaking.via/video-poster-2"></video>
 >> ^~~~~~~~~
-feature_tests/leaks.html:112:0 The tag 'video' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-video'? (see https://amp.dev/documentation/components/amp-video/)
+feature_tests/leaks.html:120:0 The tag 'video' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-video'? (see https://amp.dev/documentation/components/amp-video/)
 |
 |  <!--
 |  %Object & Embed
 |  -->
 |  <object data="https://leaking.via/object-data"></object>
 >> ^~~~~~~~~
-feature_tests/leaks.html:117:0 The tag 'object' is disallowed.
+feature_tests/leaks.html:125:0 The tag 'object' is disallowed.
 |  <object type="text/x-scriptlet" data="https://leaking.via/object-data-x-scriptlet"></object>
 >> ^~~~~~~~~
-feature_tests/leaks.html:118:0 The tag 'object' is disallowed.
+feature_tests/leaks.html:126:0 The tag 'object' is disallowed.
 |  <object movie="https://leaking.via/object-movie" type="application/x-shockwave-flash"></object>
 >> ^~~~~~~~~
-feature_tests/leaks.html:119:0 The tag 'object' is disallowed.
+feature_tests/leaks.html:127:0 The tag 'object' is disallowed.
 |  <object movie="https://leaking.via/object-movie">
 >> ^~~~~~~~~
-feature_tests/leaks.html:120:0 The tag 'object' is disallowed.
+feature_tests/leaks.html:128:0 The tag 'object' is disallowed.
 |      <param name="type" value="application/x-shockwave-flash"></param>
 >>     ^~~~~~~~~
-feature_tests/leaks.html:121:4 The tag 'param' is disallowed.
+feature_tests/leaks.html:129:4 The tag 'param' is disallowed.
 |  </object>
 |  <object codebase="https://leaking.via/object-codebase"></object>
 >> ^~~~~~~~~
-feature_tests/leaks.html:123:0 The tag 'object' is disallowed.
+feature_tests/leaks.html:131:0 The tag 'object' is disallowed.
 |  <embed src="https://leaking.via/embed-src"></embed>
 >> ^~~~~~~~~
-feature_tests/leaks.html:124:0 The tag 'embed' is disallowed.
+feature_tests/leaks.html:132:0 The tag 'embed' is disallowed.
 |  <embed code="https://leaking.via/embed-code"></embed>
 >> ^~~~~~~~~
-feature_tests/leaks.html:125:0 The tag 'embed' is disallowed.
+feature_tests/leaks.html:133:0 The tag 'embed' is disallowed.
 |  <object classid="clsid:333C7BC4-460F-11D0-BC04-0080C7055A83">
 >> ^~~~~~~~~
-feature_tests/leaks.html:126:0 The tag 'object' is disallowed.
+feature_tests/leaks.html:134:0 The tag 'object' is disallowed.
 |      <param name="DataURL" value="https://leaking.via/object-param-dataurl">
 >>     ^~~~~~~~~
-feature_tests/leaks.html:127:4 The tag 'param' is disallowed.
+feature_tests/leaks.html:135:4 The tag 'param' is disallowed.
 |  </object>
 |  <object classid="clsid:6BF52A52-394A-11d3-B153-00C04F79FAA6">
 >> ^~~~~~~~~
-feature_tests/leaks.html:129:0 The tag 'object' is disallowed.
+feature_tests/leaks.html:137:0 The tag 'object' is disallowed.
 |      <param name="URL" value="https://leaking.via/object-param-url">
 >>     ^~~~~~~~~
-feature_tests/leaks.html:130:4 The tag 'param' is disallowed.
+feature_tests/leaks.html:138:4 The tag 'param' is disallowed.
 |  </object>
 |
 |
@@ -243,16 +243,16 @@ feature_tests/leaks.html:130:4 The tag 'param' is disallowed.
 |  -->
 |  <script src="https://leaking.via/script-src"></script>
 >> ^~~~~~~~~
-feature_tests/leaks.html:137:0 Custom JavaScript is not allowed. (see https://amp.dev/documentation/guides-and-tutorials/learn/validation-workflow/validation_errors/#custom-javascript-is-not-allowed)
+feature_tests/leaks.html:145:0 The parent tag of tag 'amphtml engine script' is 'isindex', but it can only be 'head'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#required-markup)
 |  <svg><script href="https://leaking.via/svg-script-href"></script></svg>
 >>      ^~~~~~~~~
-feature_tests/leaks.html:138:5 Custom JavaScript is not allowed. (see https://amp.dev/documentation/guides-and-tutorials/learn/validation-workflow/validation_errors/#custom-javascript-is-not-allowed)
+feature_tests/leaks.html:146:5 The parent tag of tag 'amphtml engine script' is 'svg', but it can only be 'head'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#required-markup)
 |  <svg><script xlink:href="https://leaking.via/svg-script-xlink-href"></script></svg>
 >>      ^~~~~~~~~
-feature_tests/leaks.html:139:5 Custom JavaScript is not allowed. (see https://amp.dev/documentation/guides-and-tutorials/learn/validation-workflow/validation_errors/#custom-javascript-is-not-allowed)
+feature_tests/leaks.html:147:5 The parent tag of tag 'amphtml engine script' is 'svg', but it can only be 'head'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#required-markup)
 |  <script>
 >> ^~~~~~~~~
-feature_tests/leaks.html:140:0 Custom JavaScript is not allowed. (see https://amp.dev/documentation/guides-and-tutorials/learn/validation-workflow/validation_errors/#custom-javascript-is-not-allowed)
+feature_tests/leaks.html:148:0 The parent tag of tag 'amphtml engine script' is 'isindex', but it can only be 'head'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#required-markup)
 |  //# sourceMappingURL=https://leaking.via/javascript-source-map
 |  </script>
 |
@@ -261,38 +261,38 @@ feature_tests/leaks.html:140:0 Custom JavaScript is not allowed. (see https://am
 |  -->
 |  <iframe src="https://leaking.via/iframe-src"></iframe>
 >> ^~~~~~~~~
-feature_tests/leaks.html:147:0 The tag 'iframe' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-iframe'? (see https://amp.dev/documentation/components/amp-iframe/)
+feature_tests/leaks.html:155:0 The tag 'iframe' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-iframe'? (see https://amp.dev/documentation/components/amp-iframe/)
 |  <iframe src="data:image/svg+xml,<svg%20xmlns='%68ttp:%2f/www.w3.org/2000/svg'%20xmlns:xlink='%68ttp:%2f/www.w3.org/1999/xlink'><image%20xlink:hr%65f='%68ttps:%2f/leaking.via/svg-via-data'></image></svg>"></iframe>
 >> ^~~~~~~~~
-feature_tests/leaks.html:148:0 The tag 'iframe' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-iframe'? (see https://amp.dev/documentation/components/amp-iframe/)
+feature_tests/leaks.html:156:0 The tag 'iframe' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-iframe'? (see https://amp.dev/documentation/components/amp-iframe/)
 |  <iframe srcdoc="<img src=https://leaking.via/iframe-srcdoc-img-src>"></iframe>
 >> ^~~~~~~~~
-feature_tests/leaks.html:149:0 The tag 'iframe' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-iframe'? (see https://amp.dev/documentation/components/amp-iframe/)
+feature_tests/leaks.html:157:0 The tag 'iframe' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-iframe'? (see https://amp.dev/documentation/components/amp-iframe/)
 |  <iframe src="view-source:https://leaking.via/iframe-src-viewsource"></iframe>
 >> ^~~~~~~~~
-feature_tests/leaks.html:150:0 The tag 'iframe' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-iframe'? (see https://amp.dev/documentation/components/amp-iframe/)
+feature_tests/leaks.html:158:0 The tag 'iframe' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-iframe'? (see https://amp.dev/documentation/components/amp-iframe/)
 |  <iframe src="javascript:'&lt;img src=https://leaking.via/iframe-javascript-src&gt;'"></iframe>
 >> ^~~~~~~~~
-feature_tests/leaks.html:151:0 The tag 'iframe' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-iframe'? (see https://amp.dev/documentation/components/amp-iframe/)
+feature_tests/leaks.html:159:0 The tag 'iframe' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-iframe'? (see https://amp.dev/documentation/components/amp-iframe/)
 |  <iframe src="javascript:'&lt;iframe src=&quot;javascript:\&apos;&lt;img src=https://leaking.via/iframe-javascript-src-2&gt;\&apos;&quot;&gt;&lt;/iframe&gt;'"></iframe>
 >> ^~~~~~~~~
-feature_tests/leaks.html:152:0 The tag 'iframe' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-iframe'? (see https://amp.dev/documentation/components/amp-iframe/)
+feature_tests/leaks.html:160:0 The tag 'iframe' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-iframe'? (see https://amp.dev/documentation/components/amp-iframe/)
 |  <iframe src="javascript:atob('PGltZyBzcmM9Imh0dHBzOi8vbGVha2luZy52aWEvaWZyYW1lLWphdmFzY3JpcHQtc3JjLTMiPg==')"></iframe>
 >> ^~~~~~~~~
-feature_tests/leaks.html:153:0 The tag 'iframe' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-iframe'? (see https://amp.dev/documentation/components/amp-iframe/)
+feature_tests/leaks.html:161:0 The tag 'iframe' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-iframe'? (see https://amp.dev/documentation/components/amp-iframe/)
 |
 |  <!--
 |  %Menu
 |  -->
 |  <p contextmenu="a">Right Click</p>
 >> ^~~~~~~~~
-feature_tests/leaks.html:158:0 The attribute 'contextmenu' may not appear in tag 'p'.
+feature_tests/leaks.html:166:0 The attribute 'contextmenu' may not appear in tag 'p'.
 |  <menu type="context" id="a">
 >> ^~~~~~~~~
-feature_tests/leaks.html:159:0 The tag 'menu' is disallowed.
+feature_tests/leaks.html:167:0 The tag 'menu' is disallowed.
 |      <menuitem label="a" icon="https://leaking.via/menuitem-icon"></menuitem>
 >>     ^~~~~~~~~
-feature_tests/leaks.html:160:4 The tag 'menuitem' is disallowed.
+feature_tests/leaks.html:168:4 The tag 'menuitem' is disallowed.
 |  </menu>
 |
 |
@@ -301,26 +301,26 @@ feature_tests/leaks.html:160:4 The tag 'menuitem' is disallowed.
 |  -->
 |  <applet code="Test" codebase="https://leaking.via/applet-codebase"></applet>
 >> ^~~~~~~~~
-feature_tests/leaks.html:167:0 The tag 'applet' is disallowed.
+feature_tests/leaks.html:175:0 The tag 'applet' is disallowed.
 |  <applet code="Test" archive="https://leaking.via/applet-archive"></applet>
 >> ^~~~~~~~~
-feature_tests/leaks.html:168:0 The tag 'applet' is disallowed.
+feature_tests/leaks.html:176:0 The tag 'applet' is disallowed.
 |  <applet code="Test" object="https://leaking.via/applet-object"></applet>
 >> ^~~~~~~~~
-feature_tests/leaks.html:169:0 The tag 'applet' is disallowed.
+feature_tests/leaks.html:177:0 The tag 'applet' is disallowed.
 |
 |  <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 |      <image xmlns:xlink="http://www.w3.org/1999/xlink">
 |          <animate attributeName="xlink:href" begin="0s" from="#" to="https://leaking.via/svg-image-animate" />
 >>         ^~~~~~~~~
-feature_tests/leaks.html:173:8 The tag 'animate' is disallowed.
+feature_tests/leaks.html:181:8 The tag 'animate' is disallowed.
 |      </image>
 |  </svg>
 |
 |  <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 |      <feImage xlink:href="https://leaking.via/svg-feimage" />
 >>     ^~~~~~~~~
-feature_tests/leaks.html:178:4 The tag 'feimage' is disallowed.
+feature_tests/leaks.html:186:4 The tag 'feimage' is disallowed.
 |  </svg>
 |
 |  <!--
@@ -329,44 +329,44 @@ feature_tests/leaks.html:178:4 The tag 'feimage' is disallowed.
 |  <?xml-stylesheet type="text/xsl" href="https://leaking.via/xslt-stylesheet" ?>
 |
 >>   ^~~~~~~~~
-feature_tests/leaks.html:185:2 The tag '<?' is disallowed.
+feature_tests/leaks.html:193:2 The tag '<?' is disallowed.
 |  <!--
 |  %Data Islands
 |  -->
 |  <xml src="https://leaking.via/xml-src" id="xml"></xml>
 >> ^~~~~~~~~
-feature_tests/leaks.html:189:0 The tag 'xml' is disallowed.
+feature_tests/leaks.html:197:0 The tag 'xml' is disallowed.
 |  <div datasrc="#xml" datafld="$text" dataformatas="html"></div>
 >> ^~~~~~~~~
-feature_tests/leaks.html:190:0 The attribute 'datafld' may not appear in tag 'div'.
+feature_tests/leaks.html:198:0 The attribute 'datafld' may not appear in tag 'div'.
 >> ^~~~~~~~~
-feature_tests/leaks.html:190:0 The attribute 'dataformatas' may not appear in tag 'div'.
+feature_tests/leaks.html:198:0 The attribute 'dataformatas' may not appear in tag 'div'.
 >> ^~~~~~~~~
-feature_tests/leaks.html:190:0 The attribute 'datasrc' may not appear in tag 'div'.
+feature_tests/leaks.html:198:0 The attribute 'datasrc' may not appear in tag 'div'.
 |
 |  <!--
 |  %VML
 |  -->
 |  <line xmlns="urn:schemas-microsoft-com:vml">
 >> ^~~~~~~~~
-feature_tests/leaks.html:195:0 The tag 'line' may only appear as a descendant of tag 'svg'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#svg)
+feature_tests/leaks.html:203:0 The tag 'line' may only appear as a descendant of tag 'svg'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#svg)
 |      <fill style="behavior:url(#default#vml)" src="https://leaking.via/vml-line-fill-src" />
 >>     ^~~~~~~~~
-feature_tests/leaks.html:196:4 The tag 'fill' is disallowed.
+feature_tests/leaks.html:204:4 The tag 'fill' is disallowed.
 |      <stroke style="behavior:url(#default#vml)" src="https://leaking.via/vml-line-stroke-src" />
 >>     ^~~~~~~~~
-feature_tests/leaks.html:197:4 The tag 'stroke' is disallowed.
+feature_tests/leaks.html:205:4 The tag 'stroke' is disallowed.
 |      <imageData style="behavior:url(#default#vml)" src="https://leaking.via/vml-line-imgdata-src" />
 >>     ^~~~~~~~~
-feature_tests/leaks.html:198:4 The tag 'imagedata' is disallowed.
+feature_tests/leaks.html:206:4 The tag 'imagedata' is disallowed.
 |  </line>
 |  <vmlframe
 >> ^~~~~~~~~
-feature_tests/leaks.html:200:0 The tag 'vmlframe' is disallowed.
+feature_tests/leaks.html:208:0 The tag 'vmlframe' is disallowed.
 |      xmlns="urn:schemas-microsoft-com:vml"
 |      style="behavior:url(#default#vml);position:absolute;width:100%;height:100%"
 |      src="https://leaking.via/vmlframe-src#xss">
 |  </vmlframe>
 |
 |  </body>
-|  </html>
+|  </html>
\ No newline at end of file
diff --git a/validator/testdata/feature_tests/link_meta_values.html b/validator/testdata/feature_tests/link_meta_values.html
index 0e284cfa6d1a..d4eebfa7b660 100644
--- a/validator/testdata/feature_tests/link_meta_values.html
+++ b/validator/testdata/feature_tests/link_meta_values.html
@@ -15,7 +15,7 @@
   <link rel="manifest foo" href="foo">
   <link rel="preload" as="script" href="https://cdn.ampproject.org/v0.js">
   <link rel="shortcut icon" type="a" href="b" sizes="c">
-  <link rel="author" href="me">
+  <link rel="author" href="me" fetchpriority="blah">
   <link rel="DCTERMS.any" href="foo">
 
   <meta name="content-disposition" content="any">
diff --git a/validator/testdata/feature_tests/link_meta_values.out b/validator/testdata/feature_tests/link_meta_values.out
index f80429ca2722..523af20d9e2d 100644
--- a/validator/testdata/feature_tests/link_meta_values.out
+++ b/validator/testdata/feature_tests/link_meta_values.out
@@ -18,7 +18,9 @@ FAIL
 feature_tests/link_meta_values.html:15:2 The attribute 'rel' in tag 'link' is set to the invalid value 'manifest foo'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#html-tags)
 |    <link rel="preload" as="script" href="https://cdn.ampproject.org/v0.js">
 |    <link rel="shortcut icon" type="a" href="b" sizes="c">
-|    <link rel="author" href="me">
+|    <link rel="author" href="me" fetchpriority="blah">
+>>   ^~~~~~~~~
+feature_tests/link_meta_values.html:18:2 The attribute 'fetchpriority' in tag 'link' is set to the invalid value 'blah'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#html-tags)
 |    <link rel="DCTERMS.any" href="foo">
 |
 |    <meta name="content-disposition" content="any">
diff --git a/validator/testdata/feature_tests/no_custom_js.out b/validator/testdata/feature_tests/no_custom_js.out
index 56f3d98054d4..b39aa607294f 100644
--- a/validator/testdata/feature_tests/no_custom_js.out
+++ b/validator/testdata/feature_tests/no_custom_js.out
@@ -13,14 +13,16 @@ FAIL
 |     <script async src="https://cdn.ampproject.org/v0.js"></script>
 |     <script async src="https://example.com/v0-not-allowed.js"></script>
 >>    ^~~~~~~~~
-feature_tests/no_custom_js.html:13:3 Custom JavaScript is not allowed. (see https://amp.dev/documentation/guides-and-tutorials/learn/validation-workflow/validation_errors/#custom-javascript-is-not-allowed)
+feature_tests/no_custom_js.html:13:3 The attribute 'src' in tag 'amphtml engine script' is set to the invalid value 'https://example.com/v0-not-allowed.js'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#required-markup)
 |     <script async custom-element="amp-foo" src="https://example.com/v0/not-allowed.js"></script>
 >>    ^~~~~~~~~
-feature_tests/no_custom_js.html:14:3 Custom JavaScript is not allowed. (see https://amp.dev/documentation/guides-and-tutorials/learn/validation-workflow/validation_errors/#custom-javascript-is-not-allowed)
+feature_tests/no_custom_js.html:14:3 The attribute 'custom-element' may not appear in tag 'amphtml engine script'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#required-markup)
+>>    ^~~~~~~~~
+feature_tests/no_custom_js.html:14:3 The script version for 'amphtml engine script' is a unknown version which mismatches with the first script on the page using the standard version. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml#required-markup)
 |   </head>
 |   <body>
 |    <script>alert('Hello World!')</script>
 >>   ^~~~~~~~~
-feature_tests/no_custom_js.html:17:2 Custom JavaScript is not allowed. (see https://amp.dev/documentation/guides-and-tutorials/learn/validation-workflow/validation_errors/#custom-javascript-is-not-allowed)
+feature_tests/no_custom_js.html:17:2 The parent tag of tag 'amphtml engine script' is 'body', but it can only be 'head'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#required-markup)
 |   </body>
 |  </html>
diff --git a/validator/testdata/feature_tests/non-amp-cdn-js.html b/validator/testdata/feature_tests/non-amp-cdn-js.html
new file mode 100644
index 000000000000..8a573b70a60e
--- /dev/null
+++ b/validator/testdata/feature_tests/non-amp-cdn-js.html
@@ -0,0 +1,28 @@
+<!--
+  Test Description:
+  https://github.com/ampproject/amphtml/issues/25873
+  AMP Supports publishers loading the AMP Javascript from an alternative origin
+  to the AMP Cache domain (cdn.ampproject.org). This allows for self-hosting which
+  allows for improved performance on origin by avoiding an additional HTTPs connection.
+
+  This test demonstrates that an alternative origin for /v0.js and an .js extension both pass
+  when the document type is amp, not transformed.
+-->
+<!doctype html>
+<html ⚡>
+<head>
+  <meta charset="utf-8">
+  <link rel="canonical" href="./regular-html-version.html">
+  <meta name="viewport" content="width=device-width">
+  <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+
+  <!-- Should Pass Validation -->
+  <script async src="https://ampjs.org/v0.js"></script>
+  <script async custom-element='amp-analytics'
+     src='https://openjsf.org/v0/amp-analytics-0.1.js'></script>
+
+</head>
+<body>
+Hello, world.
+</body>
+</html>
diff --git a/validator/testdata/feature_tests/non-amp-cdn-js.out b/validator/testdata/feature_tests/non-amp-cdn-js.out
new file mode 100644
index 000000000000..9173f814a6de
--- /dev/null
+++ b/validator/testdata/feature_tests/non-amp-cdn-js.out
@@ -0,0 +1,29 @@
+PASS
+|  <!--
+|    Test Description:
+|    https://github.com/ampproject/amphtml/issues/25873
+|    AMP Supports publishers loading the AMP Javascript from an alternative origin
+|    to the AMP Cache domain (cdn.ampproject.org). This allows for self-hosting which
+|    allows for improved performance on origin by avoiding an additional HTTPs connection.
+|
+|    This test demonstrates that an alternative origin for /v0.js and an .js extension both pass
+|    when the document type is amp, not transformed.
+|  -->
+|  <!doctype html>
+|  <html ⚡>
+|  <head>
+|    <meta charset="utf-8">
+|    <link rel="canonical" href="./regular-html-version.html">
+|    <meta name="viewport" content="width=device-width">
+|    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+|
+|    <!-- Should Pass Validation -->
+|    <script async src="https://ampjs.org/v0.js"></script>
+|    <script async custom-element='amp-analytics'
+|       src='https://openjsf.org/v0/amp-analytics-0.1.js'></script>
+|
+|  </head>
+|  <body>
+|  Hello, world.
+|  </body>
+|  </html>
diff --git a/validator/testdata/feature_tests/non-amp-cdn-lts-js.html b/validator/testdata/feature_tests/non-amp-cdn-lts-js.html
new file mode 100644
index 000000000000..3d232770ab2f
--- /dev/null
+++ b/validator/testdata/feature_tests/non-amp-cdn-lts-js.html
@@ -0,0 +1,26 @@
+<!--
+  Test Description:
+  This test demonstrates that the standard version of an extension may not be used with the LTS
+  runtime.
+-->
+<!doctype html>
+<html ⚡>
+<head>
+  <meta charset="utf-8">
+  <link rel="canonical" href="./regular-html-version.html">
+  <meta name="viewport" content="width=device-width,minimum-scale=1">
+  <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+
+  <!-- Valid: First script is LTS runtime -->
+  <script async src="https://cdn.ampproject.org/lts/v0.js"></script>
+  <!-- Valid: LTS extension is included and used. -->
+  <script async custom-element='amp-font' src='https://ampjs.org/lts/v0/amp-font-0.1.js'></script>
+</head>
+<body>
+  <amp-font
+    layout="nodisplay"
+    font-family="Comic Amp"
+    timeout="3000">
+  </amp-font>
+</body>
+</html>
diff --git a/validator/testdata/feature_tests/non-amp-cdn-lts-js.out b/validator/testdata/feature_tests/non-amp-cdn-lts-js.out
new file mode 100644
index 000000000000..46cc3aedef93
--- /dev/null
+++ b/validator/testdata/feature_tests/non-amp-cdn-lts-js.out
@@ -0,0 +1,27 @@
+PASS
+|  <!--
+|    Test Description:
+|    This test demonstrates that the standard version of an extension may not be used with the LTS
+|    runtime.
+|  -->
+|  <!doctype html>
+|  <html ⚡>
+|  <head>
+|    <meta charset="utf-8">
+|    <link rel="canonical" href="./regular-html-version.html">
+|    <meta name="viewport" content="width=device-width,minimum-scale=1">
+|    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+|
+|    <!-- Valid: First script is LTS runtime -->
+|    <script async src="https://cdn.ampproject.org/lts/v0.js"></script>
+|    <!-- Valid: LTS extension is included and used. -->
+|    <script async custom-element='amp-font' src='https://ampjs.org/lts/v0/amp-font-0.1.js'></script>
+|  </head>
+|  <body>
+|    <amp-font
+|      layout="nodisplay"
+|      font-family="Comic Amp"
+|      timeout="3000">
+|    </amp-font>
+|  </body>
+|  </html>
diff --git a/validator/testdata/feature_tests/noscript.html b/validator/testdata/feature_tests/noscript.html
index 9a16ad773e3a..9f65e8f14d9b 100644
--- a/validator/testdata/feature_tests/noscript.html
+++ b/validator/testdata/feature_tests/noscript.html
@@ -44,8 +44,6 @@
   <audio controls>
     <source src="https://example.com/howl-of-the-lemur.mp3" type="audio/mpeg">
   </audio>
-  <!-- Invalid: img must be in a noscript tag -->
-  <img alt="Iconic Lemurs" height="200" src="https://example.com/lemurs.png" width="80">
   <!-- Invalid: video must be in a noscript tag -->
   <video controls height="480" width="640">
     <source src="https://example.com/island-of-lemurs.mp4" type="video/mp4">
diff --git a/validator/testdata/feature_tests/noscript.out b/validator/testdata/feature_tests/noscript.out
index d78676ff0e5c..67ff7160131d 100644
--- a/validator/testdata/feature_tests/noscript.out
+++ b/validator/testdata/feature_tests/noscript.out
@@ -45,7 +45,7 @@ feature_tests/noscript.html:36:6 The mandatory attribute 'type' is missing in ta
 |    <noscript>
 |      <img alt="Iconic Lemurs">
 >>     ^~~~~~~~~
-feature_tests/noscript.html:41:4 The mandatory attribute 'src' is missing in tag 'img'. (see https://amp.dev/documentation/components/amp-img/)
+feature_tests/noscript.html:41:4 The mandatory attribute 'src' is missing in tag 'img'.
 |    </noscript>
 |    <!-- Invalid: audio must be in a noscript tag -->
 |    <audio controls>
@@ -53,19 +53,15 @@ feature_tests/noscript.html:41:4 The mandatory attribute 'src' is missing in tag
 feature_tests/noscript.html:44:2 The tag 'audio' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-audio'? (see https://amp.dev/documentation/components/amp-audio/)
 |      <source src="https://example.com/howl-of-the-lemur.mp3" type="audio/mpeg">
 |    </audio>
-|    <!-- Invalid: img must be in a noscript tag -->
-|    <img alt="Iconic Lemurs" height="200" src="https://example.com/lemurs.png" width="80">
->>   ^~~~~~~~~
-feature_tests/noscript.html:48:2 The tag 'img' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-img'? (see https://amp.dev/documentation/components/amp-img/)
 |    <!-- Invalid: video must be in a noscript tag -->
 |    <video controls height="480" width="640">
 >>   ^~~~~~~~~
-feature_tests/noscript.html:50:2 The tag 'video' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-video'? (see https://amp.dev/documentation/components/amp-video/)
+feature_tests/noscript.html:48:2 The tag 'video' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-video'? (see https://amp.dev/documentation/components/amp-video/)
 |      <source src="https://example.com/island-of-lemurs.mp4" type="video/mp4">
 |    </video>
 |    <!-- Invalid: nested noscript tags don't correctly parse. -->
 |    <noscript> <noscript> </noscript> </noscript>
 >>              ^~~~~~~~~
-feature_tests/noscript.html:54:13 The parent tag of tag 'noscript' is 'noscript', but it can only be 'head'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amp-boilerplate/?format=websites)
+feature_tests/noscript.html:52:13 The parent tag of tag 'noscript' is 'noscript', but it can only be 'head'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amp-boilerplate/?format=websites)
 |  </body>
 |  </html>
diff --git a/validator/testdata/feature_tests/noscript_style.html b/validator/testdata/feature_tests/noscript_style.html
index 7084a4c63d4a..8fba61048234 100644
--- a/validator/testdata/feature_tests/noscript_style.html
+++ b/validator/testdata/feature_tests/noscript_style.html
@@ -12,7 +12,7 @@
   <script async src="https://cdn.ampproject.org/v0.js"></script>
   <noscript>
     <style amp-noscript>
-      .foo { color: red; }
+      .foo { color: red !important; }
     </style>
   </noscript>
 </head>
diff --git a/validator/testdata/feature_tests/noscript_style.out b/validator/testdata/feature_tests/noscript_style.out
index f5ea10fb157f..6a9d20eff224 100644
--- a/validator/testdata/feature_tests/noscript_style.out
+++ b/validator/testdata/feature_tests/noscript_style.out
@@ -13,7 +13,7 @@ PASS
 |    <script async src="https://cdn.ampproject.org/v0.js"></script>
 |    <noscript>
 |      <style amp-noscript>
-|        .foo { color: red; }
+|        .foo { color: red !important; }
 |      </style>
 |    </noscript>
 |  </head>
diff --git a/validator/testdata/feature_tests/regexps.html b/validator/testdata/feature_tests/regexps.html
index b12aea6213ac..3a2e0eb20701 100644
--- a/validator/testdata/feature_tests/regexps.html
+++ b/validator/testdata/feature_tests/regexps.html
@@ -62,6 +62,17 @@
         href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
   <link rel="stylesheet" type="text/css"
         href="https://maxcdn.bootstrapcdn.com/font-awesome/../bootstrap/3.3.7/css/bootstrap.min.class">
+
+  <!--
+    Regexp to allow font-awesome css from Cloudflare CDN.
+    The first two examples are valid, the 3rd one is not.
+  -->
+  <link rel="stylesheet" type="text/css"
+        href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.3.0/css/all.min.css">
+  <link rel="stylesheet" type="text/css"
+        href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.2/css/all.min.css">
+  <link rel="stylesheet" type="text/css"
+        href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/../bootstrap/3.3.7/all.min.css">
   <!--
     New Font Awesome url format the first five are valid the last two are not.
   -->
diff --git a/validator/testdata/feature_tests/regexps.out.cpponly b/validator/testdata/feature_tests/regexps.out.cpponly
new file mode 100644
index 000000000000..4facb7b8a0ba
--- /dev/null
+++ b/validator/testdata/feature_tests/regexps.out.cpponly
@@ -0,0 +1,209 @@
+FAIL
+|  <!--
+|    Test Description:
+|      This tests looks at specific errors related to positive and negative
+|      regexps used inside the validator.
+|  -->
+|  <!doctype html>
+|  <html ⚡>
+|  <head>
+|    <meta charset="utf-8">
+|    <link rel="canonical" href="./regular-html-version.html">
+|    <meta name="viewport" content="width=device-width,minimum-scale=1">
+|    <style>invalid body</style>
+>>   ^~~~~~~~~
+feature_tests/regexps.html:12:2 The mandatory attribute 'amp-custom' is missing in tag 'style amp-custom'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#stylesheets)
+|    <noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+|    <script async src="https://cdn.ampproject.org/v0.js"></script>
+|
+|    <!--
+|    src value_regex: "https://cdn\\.ampproject\\.org/v0/amp-vine-(latest|0\\.1).js"
+|    The first example is valid. The latter three examples are invalid.
+|    -->
+|    <script async custom-element="amp-vine" src="https://cdn.ampproject.org/v0/amp-vine-latest.js"> </script>
+|    <script async custom-element="amp-vine" src="https://cdn.ampproject.org/v0/amp-vine-0.1.js?foobar"></script>
+>>   ^~~~~~~~~
+feature_tests/regexps.html:21:2 The extension 'amp-vine' has a path 'https://cdn.ampproject.org/v0/amp-vine-0.1.js?foobar' which is invalid. Please use a valid path for this extension. (see https://amp.dev/documentation/components/amp-vine)
+|    <script async custom-element="amp-vine" src="http://xss.com/https://cdn.ampproject.org/v0/amp-vine-0.1.js?foobar"></script>
+>>   ^~~~~~~~~
+feature_tests/regexps.html:22:2 The extension 'amp-vine' has a path 'https://cdn.ampproject.org/v0/amp-vine-0.1.js?foobar' which is invalid. Please use a valid path for this extension. (see https://amp.dev/documentation/components/amp-vine)
+|    <script async custom-element="amp-hulu" src="https://cdn.ampproject.org/v0/amp-hulu-latest.js"> Only whitespace is allowed here. </script>
+>>   ^~~~~~~~~
+feature_tests/regexps.html:23:2 The tag 'amp-hulu extension script' contains text, which is disallowed. (see https://amp.dev/documentation/components/amp-hulu)
+|
+|    <!--
+|    href value_regex: "https://cdn\\.materialdesignicons\\.com/([0-9]+\\.?)+/css/materialdesignicons\\.min\\.css"
+|    The first example is valid, the second example is invalid.
+|    -->
+|    <link rel="stylesheet" type="text/css"
+|          href="https://cdn.materialdesignicons.com/2.0.46/css/materialdesignicons.min.css">
+|    <link rel="stylesheet" type="text/css"
+>>   ^~~~~~~~~
+feature_tests/regexps.html:31:2 The attribute 'href' in tag 'link rel=stylesheet for fonts' is set to the invalid value 'https://cdn.materialdesignicons.com/2.0.46/css/.../materialdesignicons.min.css'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#custom-fonts)
+|          href="https://cdn.materialdesignicons.com/2.0.46/css/.../materialdesignicons.min.css">
+|
+|    <!--
+|    href value_regex: "https://fonts\\.googleapis\\.com/css2?\\?.*|https://fast\\.fonts\\.net/.*"
+|    The first three examples are valid, the fourth example is invalid.
+|    -->
+|    <link rel="stylesheet" type="text/css"
+|          href="https://fonts.googleapis.com/css?foobar">
+|    <link rel="stylesheet" type="text/css"
+|          href="https://fonts.googleapis.com/css2?foobar">
+|    <link rel="stylesheet" type="text/css"
+|          href="https://cloud.typography.com/6256354/724768/css/fonts.css">
+|    <link rel="stylesheet" type="text/css"
+>>   ^~~~~~~~~
+feature_tests/regexps.html:44:2 The attribute 'href' in tag 'link rel=stylesheet for fonts' is set to the invalid value 'http://xss.com/https://fonts.googleapis.com/css?foobar'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#custom-fonts)
+|          href="http://xss.com/https://fonts.googleapis.com/css?foobar">
+|
+|    <!--
+|      Regexp to allow typekit fonts.
+|      href value_regex: "https://use\\.typekit\\.net/\\w+\\.css"
+|      The first example is valid, the second example is invalid.
+|    -->
+|    <link rel="stylesheet" type="text/css"
+|          href="https://use.typekit.net/oeg4hgb.css">
+|    <link rel="stylesheet" type="text/css"
+>>   ^~~~~~~~~
+feature_tests/regexps.html:54:2 The attribute 'href' in tag 'link rel=stylesheet for fonts' is set to the invalid value 'https://use.typekit.net/css/oeg4hgb.css'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#custom-fonts)
+|          href="https://use.typekit.net/css/oeg4hgb.css">
+|
+|    <!--
+|      Regexp to allow font-awesome css, but not path traversal.
+|      The first example is valid, the second is not.
+|    -->
+|    <link rel="stylesheet" type="text/css"
+|          href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
+|    <link rel="stylesheet" type="text/css"
+>>   ^~~~~~~~~
+feature_tests/regexps.html:63:2 The attribute 'href' in tag 'link rel=stylesheet for fonts' is set to the invalid value 'https://maxcdn.bootstrapcdn.com/font-awesome/../bootstrap/3.3.7/css/bootstrap.min.class'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#custom-fonts)
+|          href="https://maxcdn.bootstrapcdn.com/font-awesome/../bootstrap/3.3.7/css/bootstrap.min.class">
+|
+|    <!--
+|      Regexp to allow font-awesome css from Cloudflare CDN.
+|      The first two examples are valid, the 3rd one is not.
+|    -->
+|    <link rel="stylesheet" type="text/css"
+|          href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.3.0/css/all.min.css">
+|    <link rel="stylesheet" type="text/css"
+|          href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.2/css/all.min.css">
+|    <link rel="stylesheet" type="text/css"
+>>   ^~~~~~~~~
+feature_tests/regexps.html:74:2 The attribute 'href' in tag 'link rel=stylesheet for fonts' is set to the invalid value 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/../bootstrap/3.3.7/all.min.css'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#custom-fonts)
+|          href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/../bootstrap/3.3.7/all.min.css">
+|    <!--
+|      New Font Awesome url format the first five are valid the last two are not.
+|    -->
+|    <link href="https://use.fontawesome.com/releases/v5.0.8/css/all.css" rel="stylesheet">
+|    <link href="https://use.fontawesome.com/releases/v5.0.8/css/fontawesome.css" rel="stylesheet">
+|    <link href="https://use.fontawesome.com/releases/v5.0.8/css/brands.css" rel="stylesheet">
+|    <link href="https://use.fontawesome.com/releases/v5.0.8/css/solid.css"
+|    rel="stylesheet">
+|    <link href="https://use.fontawesome.com/releases/v5.11.1/css/v4-shims.css"
+|    rel="stylesheet">
+|    <!-- invalid -->
+|    <link href="https://use.fontawesome.com/releases/v5.0.8/css/other.css" rel="stylesheet">
+|    <link href="https://use.fontawesome.com/releases/v5.0.8/../css/solid.css" rel="stylesheet">
+>>   ^~~~~~~~~
+feature_tests/regexps.html:88:2 The attribute 'href' in tag 'link rel=stylesheet for fonts' is set to the invalid value 'https://use.fontawesome.com/releases/v5.0.8/../css/solid.css'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#custom-fonts)
+|    <!--
+|      Old Font Awesome url format. Valid.
+|    -->
+|    <link href="https://use.fontawesome.com/abcdefghij.css" rel="stylesheet">
+|
+|    <!--
+|    rel value_regex: lengthy, see protoascii
+|    The first three examples are valid. The latter three examples are invalid.
+|    -->
+|    <link rel="accessibility">
+|    <link rel="accessibility alternate">
+|    <link rel="accessibility alternate archives">
+|    <link rel="import">
+>>   ^~~~~~~~~
+feature_tests/regexps.html:101:2 The attribute 'rel' in tag 'link' is set to the invalid value 'import'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#html-tags)
+|    <link rel="accessibility subresource">
+>>   ^~~~~~~~~
+feature_tests/regexps.html:102:2 The attribute 'rel' in tag 'link' is set to the invalid value 'accessibility subresource'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#html-tags)
+|    <link rel="manifest accessibility">
+>>   ^~~~~~~~~
+feature_tests/regexps.html:103:2 The attribute 'rel' in tag 'link' is set to the invalid value 'manifest accessibility'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#html-tags)
+|
+|    <!--
+|    name disallowed_value_regex: "(^|\\s)(viewport|content-disposition|revisit-after)($|\\s)"
+|    The first two examples are valid. The latter two examples are invalid.
+|    -->
+|    <meta name="valid" content="">
+|    <meta name="validcontent-disposition" content="">
+|    <meta name="content-disposition" content="">
+>>   ^~~~~~~~~
+feature_tests/regexps.html:111:2 The attribute 'name' in tag 'meta' is set to the invalid value 'content-disposition'.
+|    <meta name="invalid content-disposition" content="">
+>>   ^~~~~~~~~
+feature_tests/regexps.html:112:2 The attribute 'name' in tag 'meta' is set to the invalid value 'invalid content-disposition'.
+|
+|    <!--
+|    css selector disallowed_value_regex: "(^|\\W)i-amphtml-"
+|    The first example is valid. The latter four are invalid.
+|    -->
+|    <style amp-custom>
+>>   ^~~~~~~~~
+feature_tests/regexps.html:118:2 The text inside tag 'style amp-custom' contains 'CSS i-amphtml- name prefix', which is disallowed. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#stylesheets)
+|      .comic-amp-font-loaded .comic-amp {
+|        font-family: 'Comic AMP', serif, sans-serif;
+|      }
+|      .i-amphtml-hidden {}
+|      #i-amphtml-wrapper {}
+|      i-amphtml-sizer {}
+|      [i-amphtml-section] {}
+|    </style>
+|
+|  </head>
+|  <body>
+|
+|    <!--
+|    class disallowed_value_regex: "(^|\\W)i-amphtml-"
+|    The first example is valid. The latter two are invalid.
+|    -->
+|    <div class="example-amp-font"></div>
+|    <div class="example-amp-font i-amphtml-hidden"></div>
+>>   ^~~~~~~~~
+feature_tests/regexps.html:136:2 The attribute 'class' in tag 'div' is set to the invalid value 'example-amp-font i-amphtml-hidden'. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/#disallowed-styles)
+|    <div class="i-amphtml-hidden example-amp-font"></div>
+>>   ^~~~~~~~~
+feature_tests/regexps.html:137:2 The attribute 'class' in tag 'div' is set to the invalid value 'i-amphtml-hidden example-amp-font'. (see https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages/#disallowed-styles)
+|
+|    <!--
+|    id disallowed_value_regex: lengthy, see protoascii
+|    The first example is valid. The latter two are invalid.
+|    -->
+|    <div id="exampe-amp-font"></div>
+|    <div id="i-amphtml-abc"></div>
+>>   ^~~~~~~~~
+feature_tests/regexps.html:144:2 The attribute 'id' in tag 'div' is set to the invalid value 'i-amphtml-abc'.
+|    <div id="AMP"></div>
+>>   ^~~~~~~~~
+feature_tests/regexps.html:145:2 The attribute 'id' in tag 'div' is set to the invalid value 'AMP'.
+|
+|    <!--
+|    name disallowed_value_regex: lengthy, see protoascii
+|    The first two examples are valid. The latter three are invalid.
+|    -->
+|    <input name="" />
+|    <input name="email" />
+|    <input name="innerHTML" />
+>>   ^~~~~~~~~
+feature_tests/regexps.html:153:2 The attribute 'name' in tag 'input' is set to the invalid value 'innerHTML'. (see https://amp.dev/documentation/components/amp-form/)
+|    <input name="__amp_source_origin" />
+>>   ^~~~~~~~~
+feature_tests/regexps.html:154:2 The attribute 'name' in tag 'input' is set to the invalid value '__amp_source_origin'. (see https://amp.dev/documentation/components/amp-form/)
+|    <input name="webkitRequestFullscreen" />
+>>   ^~~~~~~~~
+feature_tests/regexps.html:155:2 The attribute 'name' in tag 'input' is set to the invalid value 'webkitRequestFullscreen'. (see https://amp.dev/documentation/components/amp-form/)
+|
+|  </body>
+|  </html>
+>>       ^~~~~~~~~
+feature_tests/regexps.html:158:6 The tag 'style[amp-boilerplate]' is missing or incorrect, but required by 'amphtml engine script'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#required-markup)
+>>       ^~~~~~~~~
+feature_tests/regexps.html:158:6 The extension 'amp-hulu' was found on this page, but is unused. Please remove this extension.
\ No newline at end of file
diff --git a/validator/testdata/feature_tests/script_invalid_path.out b/validator/testdata/feature_tests/script_invalid_path.out
index f9b3a69f3020..4a201f7ab7d8 100644
--- a/validator/testdata/feature_tests/script_invalid_path.out
+++ b/validator/testdata/feature_tests/script_invalid_path.out
@@ -18,7 +18,7 @@ FAIL
 |    <!-- Invalid: the script src path is not valid for AMP -->
 |    <script async custom-element=amp-ad src=https://cdn.ampproject.org/v0/0xff-amp-ad-0.1-foo.js-bar></script>
 >>   ^~~~~~~~~
-feature_tests/script_invalid_path.html:18:2 The extension 'amp-ad' has a path 'v0/0xff-amp-ad-0.1-foo.js-bar' which is invalid. Please use a valid path for this extension. (see https://amp.dev/documentation/components/amp-ad)
+feature_tests/script_invalid_path.html:18:2 The extension 'amp-ad' has a path 'https://cdn.ampproject.org/v0/0xff-amp-ad-0.1-foo.js-bar' which is invalid. Please use a valid path for this extension. (see https://amp.dev/documentation/components/amp-ad)
 |  </head>
 |  <body>
 |  Hello, world.
diff --git a/validator/testdata/feature_tests/several_errors.out b/validator/testdata/feature_tests/several_errors.out
index 797d2a050703..2a6b99f74f5f 100644
--- a/validator/testdata/feature_tests/several_errors.out
+++ b/validator/testdata/feature_tests/several_errors.out
@@ -13,7 +13,7 @@ feature_tests/several_errors.html:8:2 The attribute 'charset' in tag 'meta chars
 |    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
 |    <script type='javascript'>
 >>   ^~~~~~~~~
-feature_tests/several_errors.html:11:2 Custom JavaScript is not allowed. (see https://amp.dev/documentation/guides-and-tutorials/learn/validation-workflow/validation_errors/#custom-javascript-is-not-allowed)
+feature_tests/several_errors.html:11:2 The attribute 'type' in tag 'amphtml engine script' is set to the invalid value 'javascript'. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#required-markup)
 |    // Let's go crazy. Uhm, no, hahaha.
 |    </script>
 |  </head>
diff --git a/validator/testdata/transformed_feature_tests/amp-img.html b/validator/testdata/transformed_feature_tests/amp-img.html
index c3af0af74cc3..7ddbd2c2c3f5 100644
--- a/validator/testdata/transformed_feature_tests/amp-img.html
+++ b/validator/testdata/transformed_feature_tests/amp-img.html
@@ -65,6 +65,12 @@
     <img loading="lazy" src="/img/canoe_900x600.jpg" alt="An image about canoeing" class="i-amphtml-fill-content i-amphtml-replaced-content" decoding="async">
   </amp-img>
 
+  <!-- Valid: amp-img[layout=responsive] > i-amphtml-sizer[slot="i-amphtml-svc"] fetchpriority="high" -->
+  <amp-img src="/img/canoe_900x600.jpg" alt="An image about canoeing" layout="responsive" width="900" height="600" i-amphtml-ssr>
+    <i-amphtml-sizer slot="i-amphtml-svc" style=display:block;padding-top:58.6667%;></i-amphtml-sizer>
+    <img loading="lazy" src="/img/canoe_900x600.jpg" alt="An image about canoeing" class="i-amphtml-fill-content i-amphtml-replaced-content" decoding="async" fetchpriority="high">
+  </amp-img>
+
   <!-- Invalid: amp-img[layout=intrinsic] > i-amphtml-sizer[slot!="i-amphtml-svc"] -->
   <amp-img src="/img/canoe_900x600.jpg" alt="An image about canoeing" layout="intrinsic" width="900" height="600" i-amphtml-layout="intrinsic" i-amphtml-ssr>
     <i-amphtml-sizer slot="asd" class="i-amphtml-sizer">
@@ -92,5 +98,11 @@
     <i-amphtml-sizer slot style=display:block;padding-top:58.6667%;></i-amphtml-sizer>
     <img loading="lazy" src="/img/canoe_900x600.jpg" alt="An image about canoeing" class="i-amphtml-fill-content i-amphtml-replaced-content" decoding="async">
   </amp-img>
+
+  <!-- Invalid: amp-img[layout=responsive] > i-amphtml-sizer[slot="i-amphtml-svc"] fetchpriority="bad" -->
+  <amp-img src="/img/canoe_900x600.jpg" alt="An image about canoeing" layout="responsive" width="900" height="600" fetchpriority="bad" i-amphtml-ssr>
+    <i-amphtml-sizer slot="i-amphtml-svc" style=display:block;padding-top:58.6667%;></i-amphtml-sizer>
+    <img loading="lazy" src="/img/canoe_900x600.jpg" alt="An image about canoeing" class="i-amphtml-fill-content i-amphtml-replaced-content" decoding="async">
+  </amp-img>
 </body>
 </html>
diff --git a/validator/testdata/transformed_feature_tests/amp-img.out b/validator/testdata/transformed_feature_tests/amp-img.out
index bccb5261cff7..cdcb41caa9ec 100644
--- a/validator/testdata/transformed_feature_tests/amp-img.out
+++ b/validator/testdata/transformed_feature_tests/amp-img.out
@@ -72,11 +72,17 @@ transformed_feature_tests/amp-img.html:45:4 The mandatory attribute 'class' is m
 |      <img loading="lazy" src="/img/canoe_900x600.jpg" alt="An image about canoeing" class="i-amphtml-fill-content i-amphtml-replaced-content" decoding="async">
 |    </amp-img>
 |
+|    <!-- Valid: amp-img[layout=responsive] > i-amphtml-sizer[slot="i-amphtml-svc"] fetchpriority="high" -->
+|    <amp-img src="/img/canoe_900x600.jpg" alt="An image about canoeing" layout="responsive" width="900" height="600" i-amphtml-ssr>
+|      <i-amphtml-sizer slot="i-amphtml-svc" style=display:block;padding-top:58.6667%;></i-amphtml-sizer>
+|      <img loading="lazy" src="/img/canoe_900x600.jpg" alt="An image about canoeing" class="i-amphtml-fill-content i-amphtml-replaced-content" decoding="async" fetchpriority="high">
+|    </amp-img>
+|
 |    <!-- Invalid: amp-img[layout=intrinsic] > i-amphtml-sizer[slot!="i-amphtml-svc"] -->
 |    <amp-img src="/img/canoe_900x600.jpg" alt="An image about canoeing" layout="intrinsic" width="900" height="600" i-amphtml-layout="intrinsic" i-amphtml-ssr>
 |      <i-amphtml-sizer slot="asd" class="i-amphtml-sizer">
 >>     ^~~~~~~~~
-transformed_feature_tests/amp-img.html:70:4 The attribute 'slot' in tag 'i-amphtml-sizer' is set to the invalid value 'asd'.
+transformed_feature_tests/amp-img.html:76:4 The attribute 'slot' in tag 'i-amphtml-sizer' is set to the invalid value 'asd'.
 |        <img alt aria-hidden="true" class="i-amphtml-intrinsic-sizer" role="presentation" src="data:image/svg+xml;charset=utf-8,<svg height=&quot;600&quot; width=&quot;900&quot; xmlns=&quot;http://www.w3.org/2000/svg&quot; version=&quot;1.1&quot;/>">
 |      </i-amphtml-sizer>
 |      <img src="/img/canoe_900x600.jpg" alt="An image about canoeing" class="i-amphtml-fill-content i-amphtml-replaced-content" decoding="async">
@@ -86,7 +92,7 @@ transformed_feature_tests/amp-img.html:70:4 The attribute 'slot' in tag 'i-ampht
 |    <amp-img src="/img/canoe_900x600.jpg" alt="An image about canoeing" layout="responsive" width="900" height="600" i-amphtml-ssr>
 |      <i-amphtml-sizer slot="asd" style=display:block;padding-top:58.6667%;></i-amphtml-sizer>
 >>     ^~~~~~~~~
-transformed_feature_tests/amp-img.html:78:4 The attribute 'slot' in tag 'i-amphtml-sizer' is set to the invalid value 'asd'.
+transformed_feature_tests/amp-img.html:84:4 The attribute 'slot' in tag 'i-amphtml-sizer' is set to the invalid value 'asd'.
 |      <img loading="lazy" src="/img/canoe_900x600.jpg" alt="An image about canoeing" class="i-amphtml-fill-content i-amphtml-replaced-content" decoding="async">
 |    </amp-img>
 |
@@ -94,7 +100,7 @@ transformed_feature_tests/amp-img.html:78:4 The attribute 'slot' in tag 'i-ampht
 |    <amp-img src="/img/canoe_900x600.jpg" alt="An image about canoeing" layout="intrinsic" width="900" height="600" i-amphtml-layout="intrinsic" i-amphtml-ssr>
 |      <i-amphtml-sizer slot class="i-amphtml-sizer">
 >>     ^~~~~~~~~
-transformed_feature_tests/amp-img.html:84:4 The attribute 'slot' in tag 'i-amphtml-sizer' is set to the invalid value ''.
+transformed_feature_tests/amp-img.html:90:4 The attribute 'slot' in tag 'i-amphtml-sizer' is set to the invalid value ''.
 |        <img alt aria-hidden="true" class="i-amphtml-intrinsic-sizer" role="presentation" src="data:image/svg+xml;charset=utf-8,<svg height=&quot;600&quot; width=&quot;900&quot; xmlns=&quot;http://www.w3.org/2000/svg&quot; version=&quot;1.1&quot;/>">
 |      </i-amphtml-sizer>
 |      <img src="/img/canoe_900x600.jpg" alt="An image about canoeing" class="i-amphtml-fill-content i-amphtml-replaced-content" decoding="async">
@@ -104,7 +110,15 @@ transformed_feature_tests/amp-img.html:84:4 The attribute 'slot' in tag 'i-ampht
 |    <amp-img src="/img/canoe_900x600.jpg" alt="An image about canoeing" layout="responsive" width="900" height="600" i-amphtml-ssr>
 |      <i-amphtml-sizer slot style=display:block;padding-top:58.6667%;></i-amphtml-sizer>
 >>     ^~~~~~~~~
-transformed_feature_tests/amp-img.html:92:4 The attribute 'slot' in tag 'i-amphtml-sizer' is set to the invalid value ''.
+transformed_feature_tests/amp-img.html:98:4 The attribute 'slot' in tag 'i-amphtml-sizer' is set to the invalid value ''.
+|      <img loading="lazy" src="/img/canoe_900x600.jpg" alt="An image about canoeing" class="i-amphtml-fill-content i-amphtml-replaced-content" decoding="async">
+|    </amp-img>
+|
+|    <!-- Invalid: amp-img[layout=responsive] > i-amphtml-sizer[slot="i-amphtml-svc"] fetchpriority="bad" -->
+|    <amp-img src="/img/canoe_900x600.jpg" alt="An image about canoeing" layout="responsive" width="900" height="600" fetchpriority="bad" i-amphtml-ssr>
+>>   ^~~~~~~~~
+transformed_feature_tests/amp-img.html:103:2 The attribute 'fetchpriority' in tag 'amp-img' is set to the invalid value 'bad'. (see https://amp.dev/documentation/components/amp-img/)
+|      <i-amphtml-sizer slot="i-amphtml-svc" style=display:block;padding-top:58.6667%;></i-amphtml-sizer>
 |      <img loading="lazy" src="/img/canoe_900x600.jpg" alt="An image about canoeing" class="i-amphtml-fill-content i-amphtml-replaced-content" decoding="async">
 |    </amp-img>
 |  </body>
diff --git a/validator/testdata/transformed_feature_tests/amp-story-css-link.html b/validator/testdata/transformed_feature_tests/amp-story-css-link.html
new file mode 100644
index 000000000000..6bb5b5b5d583
--- /dev/null
+++ b/validator/testdata/transformed_feature_tests/amp-story-css-link.html
@@ -0,0 +1,35 @@
+<!doctype html><html data-story-supports-landscape i-amphtml-layout transformed="google;v=1" ⚡><head><meta charset=utf-8><style amp-runtime i-amphtml-version=latest></style><link amp-extension=amp-story href=https://cdn.ampproject.org/v0/amp-story-1.0.css rel=stylesheet><link amp-extension=amp-story href=https://cdn.ampproject.org/lts/v0/amp-story-1.0.css rel=stylesheet><meta content="Get started with amp-story" name=description><meta content="width=device-width,minimum-scale=1,initial-scale=1" name=viewport><link as=script href=https://cdn.ampproject.org/v0.js rel=preload><script async src=https://cdn.ampproject.org/v0.js></script><link as=script href=https://cdn.ampproject.org/v0/amp-story-1.0.js rel=preload><script async custom-element=amp-story src=https://cdn.ampproject.org/v0/amp-story-1.0.js></script><style amp-custom>
+    body {
+      font-family: 'Roboto', sans-serif;
+    }
+    amp-story-page {
+      background: white;
+    }
+    .button {
+      font: bold 20px Arial;
+      text-decoration: none;
+      background-color: rgba(0, 240, 248, 0.63);
+      color: #333333;
+      padding: 2px 6px 2px 6px;
+      border-top: 1px solid #CCCCCC;
+      border-right: 1px solid #333333;
+      border-bottom: 1px solid #333333;
+      border-left: 1px solid #CCCCCC;
+      width: 100%;
+      height: 100%;
+      position: absolute;
+    }
+  </style><title>My Story</title><link href=https://amp-story-css-link_source.html.com/grid-layer-templates.html rel=canonical>
+  <script amp-story-dvh-polyfill>"use strict";if(!self.CSS||!CSS.supports||!CSS.supports("height:1dvh")){function e(){document.documentElement.style.setProperty("--story-dvh",innerHeight/100+"px","important")}addEventListener("resize",e,{passive:!0}),e()}</script>
+  <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript></head><body>
+  <amp-story class=i-amphtml-layout-container i-amphtml-layout=container poster-portrait-src=http://me.com/poster.jpg publisher=Me publisher-logo-src=http://me.com/logo.png standalone title="My Story">
+    <amp-story-page class=i-amphtml-layout-container i-amphtml-layout=container id=fill-template-title>
+      <amp-story-grid-layer class=i-amphtml-layout-container i-amphtml-layout=container template=vertical>
+        <h1>fill</h1>
+        <amp-img class="i-amphtml-layout-responsive i-amphtml-layout-size-defined" height=30 i-amphtml-layout=responsive layout=responsive src=https://amp--story--css--link_source-html-com.cdn.ampproject.org/i/s/amp-story-css-link_source.html.com/lemur.jpg width=40><i-amphtml-sizer style=display:block;padding-top:75.0000%;></i-amphtml-sizer></amp-img>
+      </amp-story-grid-layer>
+    </amp-story-page>
+  </amp-story>
+
+
+</body></html>
diff --git a/validator/testdata/transformed_feature_tests/amp-story-css-link.out b/validator/testdata/transformed_feature_tests/amp-story-css-link.out
new file mode 100644
index 000000000000..727db833c9b3
--- /dev/null
+++ b/validator/testdata/transformed_feature_tests/amp-story-css-link.out
@@ -0,0 +1,36 @@
+PASS
+|  <!doctype html><html data-story-supports-landscape i-amphtml-layout transformed="google;v=1" ⚡><head><meta charset=utf-8><style amp-runtime i-amphtml-version=latest></style><link amp-extension=amp-story href=https://cdn.ampproject.org/v0/amp-story-1.0.css rel=stylesheet><link amp-extension=amp-story href=https://cdn.ampproject.org/lts/v0/amp-story-1.0.css rel=stylesheet><meta content="Get started with amp-story" name=description><meta content="width=device-width,minimum-scale=1,initial-scale=1" name=viewport><link as=script href=https://cdn.ampproject.org/v0.js rel=preload><script async src=https://cdn.ampproject.org/v0.js></script><link as=script href=https://cdn.ampproject.org/v0/amp-story-1.0.js rel=preload><script async custom-element=amp-story src=https://cdn.ampproject.org/v0/amp-story-1.0.js></script><style amp-custom>
+|      body {
+|        font-family: 'Roboto', sans-serif;
+|      }
+|      amp-story-page {
+|        background: white;
+|      }
+|      .button {
+|        font: bold 20px Arial;
+|        text-decoration: none;
+|        background-color: rgba(0, 240, 248, 0.63);
+|        color: #333333;
+|        padding: 2px 6px 2px 6px;
+|        border-top: 1px solid #CCCCCC;
+|        border-right: 1px solid #333333;
+|        border-bottom: 1px solid #333333;
+|        border-left: 1px solid #CCCCCC;
+|        width: 100%;
+|        height: 100%;
+|        position: absolute;
+|      }
+|    </style><title>My Story</title><link href=https://amp-story-css-link_source.html.com/grid-layer-templates.html rel=canonical>
+|    <script amp-story-dvh-polyfill>"use strict";if(!self.CSS||!CSS.supports||!CSS.supports("height:1dvh")){function e(){document.documentElement.style.setProperty("--story-dvh",innerHeight/100+"px","important")}addEventListener("resize",e,{passive:!0}),e()}</script>
+|    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript></head><body>
+|    <amp-story class=i-amphtml-layout-container i-amphtml-layout=container poster-portrait-src=http://me.com/poster.jpg publisher=Me publisher-logo-src=http://me.com/logo.png standalone title="My Story">
+|      <amp-story-page class=i-amphtml-layout-container i-amphtml-layout=container id=fill-template-title>
+|        <amp-story-grid-layer class=i-amphtml-layout-container i-amphtml-layout=container template=vertical>
+|          <h1>fill</h1>
+|          <amp-img class="i-amphtml-layout-responsive i-amphtml-layout-size-defined" height=30 i-amphtml-layout=responsive layout=responsive src=https://amp--story--css--link_source-html-com.cdn.ampproject.org/i/s/amp-story-css-link_source.html.com/lemur.jpg width=40><i-amphtml-sizer style=display:block;padding-top:75.0000%;></i-amphtml-sizer></amp-img>
+|        </amp-story-grid-layer>
+|      </amp-story-page>
+|    </amp-story>
+|
+|
+|  </body></html>
diff --git a/validator/validator-css.protoascii b/validator/validator-css.protoascii
index 9128f391a820..a73c09538e6b 100644
--- a/validator/validator-css.protoascii
+++ b/validator/validator-css.protoascii
@@ -464,16 +464,7 @@ declaration_list {
   declaration: { name: "pitch" }
   declaration: { name: "pitch-range" }
   declaration: { name: "place-items" }
-  # CSS property `position` with values `fixed` and `sticky` are not allowed.
-  # From https://www.w3schools.com/cssref/pr_class_position.asp
-  declaration: {
-    name: "position"
-    value_casei: "absolute"
-    value_casei: "inherit"
-    value_casei: "initial"
-    value_casei: "relative"
-    value_casei: "static"
-  }
+  declaration: { name: "position" }
   declaration: { name: "quotes" }
   declaration: { name: "resize" }
   declaration: { name: "richness" }
@@ -635,7 +626,7 @@ css {
 css {
   html_format: AMP4EMAIL
   disabled_by: "data-css-strict"
-  spec_url: "https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css"
+  spec_url: "https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css"
 
   # Due to a bug, we allowed unlimited doc-level bytes for CSS in AMP4EMAIL
   # formats. To avoid breaking emails, this is temporarily set to a warning but
@@ -645,7 +636,7 @@ css {
   max_bytes_per_inline_style: 1000
 
   max_bytes_spec_url:
-  "https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#maximum-size"
+  "https://amp.dev/documentation/guides-and-tutorials/email/learn/spec/amphtml#maximum-size"
   url_bytes_included: true
 
   allow_all_declaration_in_style: true
@@ -662,15 +653,14 @@ css {
 css {
   html_format: AMP4EMAIL
   enabled_by: "data-css-strict"
-  spec_url: "https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css"
+  spec_url: "https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css"
 
   max_bytes_is_warning: false
   max_bytes: 75000
   max_bytes_per_inline_style: 1000
 
-  # TODO(b/162314127): add maximum size documentation to the email spec
   max_bytes_spec_url:
-  "https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#maximum-size"
+  "https://amp.dev/documentation/guides-and-tutorials/email/learn/spec/amphtml#maximum-size"
   url_bytes_included: true
 
   allow_all_declaration_in_style: false
@@ -933,7 +923,7 @@ tags: {  # <style amp-custom>, AMP4EMAIL, not data-css-strict
     doc_css_bytes: true
     max_bytes: 75000
     max_bytes_spec_url:
-    "https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#maximum-size"
+    "https://amp.dev/documentation/guides-and-tutorials/email/learn/spec/amphtml#maximum-size"
 
     css_spec: {
       at_rule_spec: {
@@ -969,7 +959,7 @@ tags: {  # <style amp-custom>, AMP4EMAIL, not data-css-strict
       error_message: "CSS i-amphtml- name prefix"
     }
   }
-  spec_url: "https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css"
+  spec_url: "https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css"
 }
 
 tags: {  # <style amp-custom>, AMP4EMAIL, data-css-strict
@@ -998,7 +988,7 @@ tags: {  # <style amp-custom>, AMP4EMAIL, data-css-strict
     doc_css_bytes: true
     max_bytes: 75000
     max_bytes_spec_url:
-    "https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#maximum-size"
+    "https://amp.dev/documentation/guides-and-tutorials/email/learn/spec/amphtml#maximum-size"
 
     css_spec: {
       at_rule_spec: {
@@ -1102,7 +1092,7 @@ tags: {  # <style amp-custom>, AMP4EMAIL, data-css-strict
       error_message: "CSS i-amphtml- name prefix"
     }
   }
-  spec_url: "https://amp.dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-css"
+  spec_url: "https://amp.dev/documentation/guides-and-tutorials/email/learn/email-spec/amp-email-css"
 }
 
 tags: {  # `<style amp-boilerplate>`, [AMP]
@@ -1110,7 +1100,7 @@ tags: {  # `<style amp-boilerplate>`, [AMP]
   tag_name: "STYLE"
   spec_name: "head > style[amp-boilerplate]"
   descriptive_name: "head > style[amp-boilerplate]"
-  satisfies: "style[amp-boilerplate]"
+  satisfies_condition: "style[amp-boilerplate]"
   unique: true
   mandatory_parent: "HEAD"
   attr_lists: "nonce-attr"
@@ -1134,7 +1124,7 @@ tags: {  # `<style amp4ads-boilerplate>`, AMP4ADS
   tag_name: "STYLE"
   spec_name: "head > style[amp4ads-boilerplate]"
   descriptive_name: "head > style[amp4ads-boilerplate]"
-  satisfies: "style[amp-boilerplate]"
+  satisfies_condition: "style[amp-boilerplate]"
   unique: true
   mandatory_parent: "HEAD"
   attr_lists: "nonce-attr"
@@ -1159,7 +1149,7 @@ tags: {  # `<style amp4email-boilerplate>`, AMP4EMAIL
   tag_name: "STYLE"
   spec_name: "head > style[amp4email-boilerplate]"
   descriptive_name: "head > style[amp4email-boilerplate]"
-  satisfies: "style[amp-boilerplate]"
+  satisfies_condition: "style[amp-boilerplate]"
   unique: true
   mandatory_parent: "HEAD"
   attrs: {
@@ -1182,7 +1172,7 @@ tags: {  # `<style amp-boilerplate>`, [AMP]
   tag_name: "STYLE"
   spec_name: "noscript > style[amp-boilerplate]"
   descriptive_name: "noscript > style[amp-boilerplate]"
-  satisfies: "noscript > style[amp-boilerplate]"
+  satisfies_condition: "noscript > style[amp-boilerplate]"
   unique: true
   mandatory_parent: "NOSCRIPT"
   mandatory_ancestor: "HEAD"
@@ -1364,6 +1354,7 @@ tags: {  # <style amp-noscript>, [AMP]
     "https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#maximum-size"
 
     css_spec: {
+      allow_important: true
       at_rule_spec: {
          name: 'media'
          media_query_spec: {
diff --git a/validator/validator-main.protoascii b/validator/validator-main.protoascii
index 2a81fc6bd6f7..2cbe832f1281 100644
--- a/validator/validator-main.protoascii
+++ b/validator/validator-main.protoascii
@@ -13,6 +13,8 @@ script_spec_url: "https://amp.dev/documentation/guides-and-tutorials/learn/valid
 # in the extensions/*/validator-*.protoascii files. This makes it
 # easy to organize the rules for extensions next to their Javascript
 # implementation.
+# Please read how the rules in this file works:
+# https://github.com/ampproject/amphtml/blob/fc447110e86db57e4391bf5c50de8dd2bf75e18f/docs/component-validator-rules.md
 
 # Rules for AMP HTML
 # https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml
@@ -158,6 +160,12 @@ attr_lists: {
   attrs: { name: "charset" value_casei: "utf-8" }
   attrs: { name: "color" }
   attrs: { name: "crossorigin" }
+  attrs: {
+    name: "fetchpriority"
+    value_casei: "high"
+    value_casei: "low"
+    value_casei: "auto"
+  }
   attrs: { name: "hreflang" }
   attrs: { name: "media" }
   attrs: { name: "sizes" }
@@ -239,7 +247,7 @@ tags: {
   spec_name: "link rel=manifest"
   descriptive_name: "link rel=manifest"
   mandatory_parent: "HEAD"
-  satisfies: "amp-app-banner data source"
+  satisfies_condition: "amp-app-banner data source"
   attrs: {
     name: "href"
     mandatory: true
@@ -313,6 +321,42 @@ tags: {
   attr_lists: "common-link-attrs"
   spec_url: "https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#html-tags"
 }
+# Allowlisted CSS provider
+tags: {
+  html_format: AMP
+  enabled_by: "transformed"
+  tag_name: "LINK"
+  spec_name: "link rel=stylesheet for amp-story-1.0 css"
+  descriptive_name: "link rel=stylesheet for amp-story-1.0 css"
+  mandatory_parent: "HEAD"
+  attr_lists: "nonce-attr"
+  attrs: { name: "crossorigin" }  # SRI attribute (https://www.w3.org/TR/SRI/)
+  attrs: {
+    name: "href"
+    mandatory: true
+    value: "https://cdn.ampproject.org/v0/amp-story-1.0.css"
+    value: "https://cdn.ampproject.org/lts/v0/amp-story-1.0.css"
+    value: "https://ampjs.org/v0/amp-story-1.0.css"
+    value: "https://ampjs.org/lts/v0/amp-story-1.0.css"
+  }
+  attrs: { name: "integrity" }  # SRI attribute (https://www.w3.org/TR/SRI/)
+  attrs: { name: "media" }
+  attrs: {
+    name: "rel"
+    mandatory: true
+    value_casei: "stylesheet"
+    dispatch_key: NAME_VALUE_DISPATCH
+  }
+  attrs: {
+    name: "type"
+    value_casei: "text/css"
+  }
+  attrs: {
+    name: "amp-extension"
+    mandatory: true
+    value_casei: "amp-story"
+  }
+}
 # Allowlisted font providers
 tags: {
   html_format: AMP
@@ -341,7 +385,10 @@ tags: {
                  "https://(use|pro|kit)\\.fontawesome\\.com/releases/v([0-9]+\\.?)+"
                  "/css/[0-9a-zA-Z-]+\\.css|"
                  "https://(use|pro|kit)\\.fontawesome\\.com/[0-9a-zA-Z-]+\\.css|"
-                 "https://use\\.typekit\\.net/[\\w\\p{L}\\p{N}_]+\\.css"
+                 "https://use\\.typekit\\.net/[\\w\\p{L}\\p{N}_]+\\.css|"
+                 "https://cdnjs\\.cloudflare\\.com/ajax/libs/font-awesome/"
+                 "([0-9]+\\.?)+/css/[0-9a-zA-Z-]+\\.min\\.css"
+
   }
   attrs: { name: "integrity" }  # SRI attribute (https://www.w3.org/TR/SRI/)
   attrs: { name: "media" }
@@ -496,7 +543,7 @@ tags: {
   tag_name: "META"
   spec_name: "meta name=apple-itunes-app"
   mandatory_parent: "HEAD"
-  satisfies: "amp-app-banner data source"
+  satisfies_condition: "amp-app-banner data source"
   attrs: {
     name: "content"
     mandatory: true
@@ -557,7 +604,7 @@ tags: {
   tag_name: "META"
   spec_name: "meta name=amp-consent-blocking"
   mandatory_parent: "HEAD"
-  satisfies: "meta name=amp-consent-blocking"
+  satisfies_condition: "meta name=amp-consent-blocking"
   unique: true
   attrs: {
     name: "content"
@@ -589,7 +636,7 @@ tags: {
   }
   # Disabled because there are no active origin experiments; uncomment when
   # there is at least one corresponding `requires` clause.
-  # satisfies: "amp-experiment-token"
+  # satisfies_condition: "amp-experiment-token"
 }
 # AMP metadata, name=amp-link-variable-allowed-origin
 # https://github.com/ampproject/amphtml/issues/8132
@@ -1311,6 +1358,13 @@ tags: {
   html_format: AMP
   html_format: AMP4ADS
   tag_name: "A"
+  attrs: {
+    name: "attributionsrc"
+    value_url: {
+      protocol: "https"
+      allow_empty: true
+    }
+  }
   attrs: { name: "border" }  # Not valid html5 but commonly used and supported.
   attrs: { name: "download" }
   attrs: {
@@ -1341,6 +1395,8 @@ tags: {
       protocol: "intent"
       # Line messenger (https://media.line.me/howto/en/)
       protocol: "line"
+      # (https://docs.microsoft.com/en-us/windows/uwp/launch-resume/launch-default-app#microsoft-edge-uri-scheme)
+      protocol: "microsoft-edge"
       protocol: "skype"
       protocol: "sms"
       protocol: "snapchat"
@@ -1435,14 +1491,14 @@ tags: {
       protocol: "tel"
       allow_relative: false
     }
-    # Openning doubly curly brackets {{ (these are mustache delimiters) can only
-    # appear at the beginnig of the attribute's value. Likewise closing doubly
+    # Opening doubly curly brackets {{ (these are mustache delimiters) can only
+    # appear at the beginning of the attribute's value. Likewise closing doubly
     # curly brackets }} can only appear at the end of the attribute's value.
     # Furthermore unbalanced delimiters are not allowed.
     # Additionally section mustache delimiters, i.e., {{#, {{^, {{/ are
     # disallowed.
     disallowed_value_regex: "__amp_source_origin|"
-        "(.|\\s){{|"    # Openning delimiter can only appear at the beginning.
+        "(.|\\s){{|"    # Opening delimiter can only appear at the beginning.
         "}}(.|\\s)|"    # Closing delimiter can only appear at the end.
         "^{{.*[^}][^}]$|"    # Delimiters must be balanced.
         "^[^{][^{].*}}$|"    # Delimiters must be balanced.
@@ -1737,6 +1793,165 @@ tags: {
 # the exception of tags inside of a <noscript> or <amp-story-player> ancestor
 # and transformed amp-img.
 # 4.7.1 The img element
+attr_lists: {
+  name: "img-attrs"
+  attrs: {
+    name: "align"
+    value_casei: "top"
+    value_casei: "middle"
+    value_casei: "bottom"
+    value_casei: "left"
+    value_casei: "right"
+  }
+  attrs: { name: "alt" }
+  attrs: { name: "border" }
+  attrs: {
+    name: "crossorigin"
+    value_casei: "anonymous"
+    value_casei: "use-credentials"
+  }
+  attrs: {
+    name: "fetchpriority"
+    value_casei: "high"
+    value_casei: "low"
+    value_casei: "auto"
+  }
+  attrs: { name: "height" }
+  attrs: { name: "hspace" }
+  # https://developers.google.com/web/updates/2019/02/priority-hints
+  attrs: {
+    name: "importance"
+    value_casei: "high"
+    value_casei: "low"
+    value_casei: "auto"
+  }
+  attrs: { name: "ismap" }
+  attrs: {
+    name: "loading"
+    value_casei: "lazy"
+  }  # Not yet part of the html spec
+  attrs: { name: "name" }
+  attrs: {
+    name: "referrerpolicy"
+    value_casei: "no-referrer"
+    value_casei: "no-referrer-when-downgrade"
+    value_casei: "origin"
+    value_casei: "origin-when-cross-origin"
+    value_casei: "same-origin"
+    value_casei: "strict-origin"
+    value_casei: "strict-origin-when-cross-origin"
+    value_casei: "unsafe-url"
+  }
+  attrs: { name: "usemap" }
+  attrs: { name: "vspace" }
+  attrs: { name: "width" }
+}
+tags: {
+  html_format: AMP
+  tag_name: "IMG"
+  spec_name: "Standard Img"
+  descriptive_name: "img"
+  disallowed_ancestor: "AMP-IMG"
+  disallowed_ancestor: "AMP-STORY"
+  attrs: {
+    name: "decoding"
+    value_casei: "async"
+  }
+  attr_lists: "img-attrs"
+  attr_lists: "mandatory-src-or-srcset"
+}
+tags: {
+  html_format: AMP
+  tag_name: "IMG"
+  spec_name: "Hero Img"
+  descriptive_name: "img"
+  disallowed_ancestor: "AMP-IMG"
+  disallowed_ancestor: "AMP-STORY"
+  attrs: {
+    name: "data-hero"
+    mandatory: true
+    dispatch_key: NAME_DISPATCH
+  }
+  attrs: {
+    name: "decoding"
+    value_casei: "async"
+  }
+  attrs: {
+    name: "sizes"
+  }
+  attr_lists: "img-attrs"
+  attr_lists: "mandatory-src-or-srcset"
+}
+tags: {
+  html_format: AMP
+  tag_name: "IMG"
+  spec_name: "Img using srcset"
+  descriptive_name: "img"
+  disallowed_ancestor: "AMP-IMG"
+  disallowed_ancestor: "AMP-STORY"
+  attrs: {
+    name: "decoding"
+    value_casei: "async"
+  }
+  attrs: {
+    name: "sizes"
+  }
+  attr_lists: "img-attrs"
+  attr_lists: "mandatory-src-or-srcset"
+}
+tags: {
+  html_format: AMP
+  tag_name: "IMAGE"
+  spec_name: "Standard Image"
+  descriptive_name: "img"
+  disallowed_ancestor: "AMP-IMG"
+  disallowed_ancestor: "AMP-STORY"
+  attrs: {
+    name: "decoding"
+    value_casei: "async"
+  }
+  attr_lists: "img-attrs"
+  attr_lists: "mandatory-src-or-srcset"
+}
+tags: {
+  html_format: AMP
+  tag_name: "IMAGE"
+  spec_name: "Hero Image"
+  descriptive_name: "img"
+  disallowed_ancestor: "AMP-IMG"
+  disallowed_ancestor: "AMP-STORY"
+  attrs: {
+    name: "data-hero"
+    mandatory: true
+    dispatch_key: NAME_DISPATCH
+  }
+  attrs: {
+    name: "decoding"
+    value_casei: "async"
+  }
+  attrs: {
+    name: "sizes"
+  }
+  attr_lists: "img-attrs"
+  attr_lists: "mandatory-src-or-srcset"
+}
+tags: {
+  html_format: AMP
+  tag_name: "IMAGE"
+  spec_name: "Image using srcset"
+  disallowed_ancestor: "AMP-IMG"
+  disallowed_ancestor: "AMP-STORY"
+  descriptive_name: "img"
+  attrs: {
+    name: "decoding"
+    value_casei: "async"
+  }
+  attr_lists: "img-attrs"
+  attr_lists: "mandatory-src-or-srcset"
+  attrs: {
+    name: "sizes"
+  }
+}
 tags: {
   html_format: AMP  # Disallowed in AMP4ADS because <noscript> is disallowed.
   tag_name: "IMG"
@@ -1744,30 +1959,16 @@ tags: {
   descriptive_name: "img"
   mandatory_ancestor: "NOSCRIPT"
   mandatory_ancestor_suggested_alternative: "AMP-IMG"
-  attrs: { name: "alt" }
   attrs: { name: "attribution" }
-  attrs: { name: "border" }  # Not valid html5 but commonly used and supported.
   attrs: {
     name: "decoding"
-    value: "async"
-    value: "auto"
-    value: "sync"
+    value_casei: "async"
+    value_casei: "auto"
+    value_casei: "sync"
   }
-  attrs: { name: "height" }  # Not valid html5 but commonly used and supported.
-  attrs: { name: "importance" }  # Not yet part of the html spec
-  attrs: { name: "ismap" }
   attrs: { name: "intrinsicsize" }  # Not yet part of the html spec
-  attrs: { name: "loading" }  # Not yet part of the html spec
-  attrs: {
-    name: "longdesc"
-    value_url: {
-      protocol: "http"
-      protocol: "https"
-    }
-    disallowed_value_regex: "__amp_source_origin"
-  }
   attrs: { name: "sizes" }
-  attrs: { name: "width" }  # Not valid html5 but commonly used and supported.
+  attr_lists: "img-attrs"
   attr_lists: "mandatory-src-or-srcset"
   spec_url: "https://amp.dev/documentation/components/amp-img/"
 }
@@ -1849,7 +2050,7 @@ tags: {
   spec_url: "https://amp.dev/documentation/components/amp-video/"
 }
 # 4.7.7 The audio element
-# Only allowed in noscript tags. Otherwise use amp-audio.
+# Allowed in noscript tags and inside amp-audio for server side rendering.
 tags: {
   html_format: AMP  # Disallowed in AMP4ADS because <noscript> is disallowed.
   tag_name: "AUDIO"
@@ -1871,6 +2072,14 @@ tags: {
   }
   spec_url: "https://amp.dev/documentation/components/amp-audio/"
 }
+tags: {
+  html_format: AMP  # Disallowed in AMP4ADS because <noscript> is disallowed.
+  tag_name: "AUDIO"
+  mandatory_ancestor: "AMP-AUDIO"
+  spec_name: "amp-audio > audio"
+  attrs: { name: "controls" }
+  spec_url: "https://amp.dev/documentation/components/amp-audio/"
+}
 # 4.7.7 The picture element
 # Only allowed in noscript tags which support img tags.
 tags: {
@@ -2351,6 +2560,7 @@ tags {  # <form method=GET ...>
     }
     disallowed_value_regex: "__amp_source_origin"
   }
+  attrs: { name: "xssi-prefix" }
   attr_lists: "form-name-attr"
 }
 tags {  # <form method=POST ...>
@@ -2402,6 +2612,7 @@ tags {  # <form method=POST ...>
     }
     disallowed_value_regex: "__amp_source_origin"
   }
+  attrs: { name: "xssi-prefix" }
   attr_lists: "form-name-attr"
 }
 # AMP4EMAIL allows action-xhr and disallows action attribute. It also disallows
@@ -2764,6 +2975,35 @@ tags: {
   mandatory_ancestor: "FORM [method=POST]"
   spec_url: "https://amp.dev/documentation/components/amp-form/"
 }
+tags: {
+  html_format: AMP
+  tag_name: "INPUT"
+  spec_name: "INPUT [type=image]"
+  attrs: {
+    name: "type"
+    value_casei: "image"
+    mandatory: true
+    dispatch_key: NAME_VALUE_DISPATCH
+  }
+  attrs: {
+    disabled_by: "amp4email"
+    name: "[type]"
+  }
+  attrs: {
+    name: "src"
+    mandatory: true
+    value_url: {
+      protocol: "data"
+      protocol: "http"
+      protocol: "https"
+    }
+    disallowed_value_regex: "__amp_source_origin"
+  }
+  attr_lists: "input-common-attr"
+  attr_lists: "name-attr"
+  mandatory_ancestor: "FORM [method=POST]"
+  spec_url: "https://amp.dev/documentation/components/amp-form/"
+}
 # 4.10.6 The button element
 tags: {
   html_format: AMP
@@ -2800,7 +3040,7 @@ tags: {
   html_format: AMP4ADS
   tag_name: "BUTTON"
   spec_name: "amp-app-banner button[open-button]"
-  satisfies: "amp-app-banner button[open-button]"
+  satisfies_condition: "amp-app-banner button[open-button]"
   mandatory_ancestor: "AMP-APP-BANNER"
   attrs: {
     name: "open-button"
@@ -3111,9 +3351,9 @@ tags: {
   tag_name: "SCRIPT"
   spec_name: "amphtml engine script"
   descriptive_name: "amphtml engine script"
-  satisfies: "amphtml javascript runtime (v0.js)"
-  requires: "style[amp-boilerplate]"
-  requires: "noscript > style[amp-boilerplate]"
+  satisfies_condition: "amphtml javascript runtime (v0.js)"
+  requires_condition: "style[amp-boilerplate]"
+  requires_condition: "noscript > style[amp-boilerplate]"
   unique: true
   mandatory_parent: "HEAD"
   attr_lists: "nonce-attr"
@@ -3122,7 +3362,7 @@ tags: {
     name: "src"
     mandatory: true
     value: "https://cdn.ampproject.org/v0.js"
-    dispatch_key: NAME_VALUE_DISPATCH
+    value: "https://ampjs.org/v0.js"
   }
   cdata: {
     disallowed_cdata_regex: {
@@ -3140,7 +3380,7 @@ tags: {
   tag_name: "SCRIPT"
   spec_name: "amphtml engine script (transformed)"
   descriptive_name: "amphtml engine script"
-  satisfies: "amphtml javascript runtime (v0.js)"
+  satisfies_condition: "amphtml javascript runtime (v0.js)"
   unique: true
   mandatory_parent: "HEAD"
   attr_lists: "nonce-attr"
@@ -3149,6 +3389,7 @@ tags: {
     name: "src"
     mandatory: true
     value: "https://cdn.ampproject.org/v0.js"
+    value: "https://ampjs.org/v0.js"
     dispatch_key: NAME_VALUE_DISPATCH
   }
   cdata: {
@@ -3165,9 +3406,9 @@ tags: {
   tag_name: "SCRIPT"
   spec_name: "amphtml engine script (LTS)"
   descriptive_name: "amphtml engine script"
-  satisfies: "amphtml javascript runtime (v0.js)"
-  requires: "style[amp-boilerplate]"
-  requires: "noscript > style[amp-boilerplate]"
+  satisfies_condition: "amphtml javascript runtime (v0.js)"
+  requires_condition: "style[amp-boilerplate]"
+  requires_condition: "noscript > style[amp-boilerplate]"
   unique: true
   mandatory_parent: "HEAD"
   attr_lists: "nonce-attr"
@@ -3176,6 +3417,7 @@ tags: {
     name: "src"
     mandatory: true
     value: "https://cdn.ampproject.org/lts/v0.js"
+    value: "https://ampjs.org/lts/v0.js"
     dispatch_key: NAME_VALUE_DISPATCH
   }
   cdata: {
@@ -3194,7 +3436,7 @@ tags: {
   tag_name: "SCRIPT"
   spec_name: "amphtml engine script (LTS) (transformed)"
   descriptive_name: "amphtml engine script"
-  satisfies: "amphtml javascript runtime (v0.js)"
+  satisfies_condition: "amphtml javascript runtime (v0.js)"
   unique: true
   mandatory_parent: "HEAD"
   attr_lists: "nonce-attr"
@@ -3203,6 +3445,7 @@ tags: {
     name: "src"
     mandatory: true
     value: "https://cdn.ampproject.org/lts/v0.js"
+    value: "https://ampjs.org/lts/v0.js"
     dispatch_key: NAME_VALUE_DISPATCH
   }
   cdata: {
@@ -3219,11 +3462,11 @@ tags: {
   tag_name: "SCRIPT"
   spec_name: "amphtml module engine script"
   descriptive_name: "amphtml module engine script"
-  satisfies: "amphtml javascript runtime (v0.js)"
+  satisfies_condition: "amphtml javascript runtime (v0.js)"
   unique: true
   mandatory_parent: "HEAD"
-  satisfies: "amphtml module engine script"
-  requires: "amphtml nomodule engine script"
+  satisfies_condition: "amphtml module engine script"
+  requires_condition: "amphtml nomodule engine script"
   attr_lists: "nonce-attr"
   attr_lists: "amphtml-module-engine-attrs"
   attrs: {
@@ -3244,11 +3487,11 @@ tags: {
   tag_name: "SCRIPT"
   spec_name: "amphtml nomodule engine script"
   descriptive_name: "amphtml nomodule engine script"
-  satisfies: "amphtml javascript runtime (v0.js)"
+  satisfies_condition: "amphtml javascript runtime (v0.js)"
   unique: true
   mandatory_parent: "HEAD"
-  satisfies: "amphtml nomodule engine script"
-  requires: "amphtml module engine script"
+  satisfies_condition: "amphtml nomodule engine script"
+  requires_condition: "amphtml module engine script"
   attr_lists: "nonce-attr"
   attr_lists: "amphtml-nomodule-engine-attrs"
   attrs: {
@@ -3269,17 +3512,18 @@ tags: {
   tag_name: "SCRIPT"
   spec_name: "amphtml module LTS engine script"
   descriptive_name: "amphtml module LTS engine script"
-  satisfies: "amphtml javascript runtime (v0.js)"
+  satisfies_condition: "amphtml javascript runtime (v0.js)"
   unique: true
   mandatory_parent: "HEAD"
-  satisfies: "amphtml module LTS engine script"
-  requires: "amphtml nomodule LTS engine script"
+  satisfies_condition: "amphtml module LTS engine script"
+  requires_condition: "amphtml nomodule LTS engine script"
   attr_lists: "nonce-attr"
   attr_lists: "amphtml-module-engine-attrs"
   attrs: {
     name: "src"
     mandatory: true
     value: "https://cdn.ampproject.org/lts/v0.mjs"
+    value: "https://ampjs.org/lts/v0.mjs"
     dispatch_key: NAME_VALUE_DISPATCH
   }
   cdata: {
@@ -3294,17 +3538,18 @@ tags: {
   tag_name: "SCRIPT"
   spec_name: "amphtml nomodule LTS engine script"
   descriptive_name: "amphtml nomdule LTS engine script"
-  satisfies: "amphtml javascript runtime (v0.js)"
+  satisfies_condition: "amphtml javascript runtime (v0.js)"
   unique: true
   mandatory_parent: "HEAD"
-  satisfies: "amphtml nomodule LTS engine script"
-  requires: "amphtml module LTS engine script"
+  satisfies_condition: "amphtml nomodule LTS engine script"
+  requires_condition: "amphtml module LTS engine script"
   attr_lists: "nonce-attr"
   attr_lists: "amphtml-nomodule-engine-attrs"
   attrs: {
     name: "src"
     mandatory: true
     value: "https://cdn.ampproject.org/lts/v0.js"
+    value: "https://ampjs.org/lts/v0.js"
     dispatch_key: NAME_VALUE_DISPATCH
   }
   cdata: {
@@ -3318,8 +3563,8 @@ tags: {
   tag_name: "SCRIPT"
   spec_name: "amphtml engine script [AMP4EMAIL]"
   descriptive_name: "amphtml engine script"
-  satisfies: "amphtml javascript runtime (v0.js)"
-  requires: "style[amp-boilerplate]"
+  satisfies_condition: "amphtml javascript runtime (v0.js)"
+  requires_condition: "style[amp-boilerplate]"
   mandatory: true
   unique: true
   mandatory_parent: "HEAD"
@@ -3344,8 +3589,8 @@ tags: {
   tag_name: "SCRIPT"
   spec_name: "amp4ads engine script"
   descriptive_name: "amphtml engine script"
-  satisfies: "amphtml javascript runtime (v0.js)"
-  requires: "style[amp-boilerplate]"
+  satisfies_condition: "amphtml javascript runtime (v0.js)"
+  requires_condition: "style[amp-boilerplate]"
   mandatory: true
   unique: true
   mandatory_parent: "HEAD"
@@ -3457,6 +3702,28 @@ tags: {
   }
 }
 
+# Dynamic Viewport (dvh) Polyfill when amp-story-1.0.css is Server Side Rendered.
+tags: {
+  html_format: AMP
+  enabled_by: "transformed"
+  tag_name: "SCRIPT"
+  spec_name: "script amp-story-dvh-polyfill"
+  descriptive_name: "script amp-story-dvh-polyfill"
+  unique: true
+  mandatory_parent: "HEAD"
+  attrs: {
+    name: "amp-story-dvh-polyfill"
+    value: ""
+    mandatory: true
+    dispatch_key: NAME_VALUE_DISPATCH
+  }
+  cdata: {
+    # Only valid if contents is exactly:
+    # "use strict";if(!self.CSS||!CSS.supports||!CSS.supports("height:1dvh")){function e(){document.documentElement.style.setProperty("--story-dvh",innerHeight/100+"px","important")}addEventListener("resize",e,{passive:!0}),e()}
+    cdata_regex: "\"use strict\";if\\(!self\\.CSS\\|\\|!CSS\\.supports\\|\\|!CSS\\.supports\\(\"height:1dvh\"\\)\\)\\{function e\\(\\)\\{document\\.documentElement\\.style\\.setProperty\\(\"--story-dvh\",innerHeight/100\\+\"px\",\"important\"\\)\\}addEventListener\\(\"resize\",e,\\{passive:!0\\}\\),e\\(\\)\\}"
+  }
+}
+
 # Enables early styling on fast failure to load v0.js. See GitHub #22543.
 tags: {
   html_format: AMP
@@ -3599,14 +3866,14 @@ attr_lists: {
       protocol: "https"
       allow_relative: false
     }
-    # Openning doubly curly brackets {{ (these are mustache delimiters) can only
-    # appear at the beginnig of the attribute's value. Likewise closing doubly
+    # Opening doubly curly brackets {{ (these are mustache delimiters) can only
+    # appear at the beginning of the attribute's value. Likewise closing doubly
     # curly brackets }} can only appear at the end of the attribute's value.
     # Furthermore unbalanced delimiters are not allowed.
     # Additionally section mustache delimiters, i.e., {{#, {{^, {{/ are
     # disallowed.
     disallowed_value_regex: "__amp_source_origin|"
-        "(.|\\s){{|"    # Openning delimiter can only appear at the beginning.
+        "(.|\\s){{|"    # Opening delimiter can only appear at the beginning.
         "}}(.|\\s)|"    # Closing delimiter can only appear at the end.
         "^{{.*[^}][^}]$|"    # Delimiters must be balanced.
         "^[^{][^{].*}}$|"    # Delimiters must be balanced.
@@ -3626,14 +3893,14 @@ attr_lists: {
       protocol: "https"
       allow_relative: false
     }
-    # Openning doubly curly brackets {{ (these are mustache delimiters) can only
-    # appear at the beginnig of the attribute's value. Likewise closing doubly
+    # Opening doubly curly brackets {{ (these are mustache delimiters) can only
+    # appear at the beginning of the attribute's value. Likewise closing doubly
     # curly brackets }} can only appear at the end of the attribute's value.
     # Furthermore unbalanced delimiters are not allowed.
     # Additionally section mustache delimiters, i.e., {{#, {{^, {{/ are
     # disallowed.
     disallowed_value_regex: "__amp_source_origin|"
-        "(.|\\s){{|"    # Openning delimiter can only appear at the beginning.
+        "(.|\\s){{|"    # Opening delimiter can only appear at the beginning.
         "}}(.|\\s)|"    # Closing delimiter can only appear at the end.
         "^{{.*[^}][^}]$|"    # Delimiters must be balanced.
         "^[^{][^{].*}}$|"    # Delimiters must be balanced.
@@ -3673,10 +3940,17 @@ tags: {  # <amp-img>
   tag_name: "AMP-IMG"
   # amp-img does not require a matching extension script, it's built in to v0.
   # js directly, so we explicitly list that dependency here.
-  requires: "amphtml javascript runtime (v0.js)"
+  requires_condition: "amphtml javascript runtime (v0.js)"
   attrs: { name: "alt" }
   attrs: { name: "attribution" }
   attrs: { name: "crossorigin" }
+  # https://developers.google.com/web/updates/2019/02/priority-hints
+  attrs: {
+    name: "importance"
+    value_casei: "high"
+    value_casei: "low"
+    value_casei: "auto"
+  }
   attrs: { name: "object-fit" }
   attrs: { name: "object-position" }
   attrs: { name: "placeholder" }
@@ -3708,7 +3982,7 @@ tags: {  # <amp-img i-amphtml-ssr>
   spec_name: "amp-img (transformed)"
   # amp-img does not require a matching extension script, it's built in to v0.
   # js directly, so we explicitly list that dependency here.
-  requires: "amphtml javascript runtime (v0.js)"
+  requires_condition: "amphtml javascript runtime (v0.js)"
   attrs: {
     dispatch_key: NAME_DISPATCH
     name: "i-amphtml-ssr"
@@ -3716,6 +3990,19 @@ tags: {  # <amp-img i-amphtml-ssr>
   }
   attrs: { name: "alt" }
   attrs: { name: "attribution" }
+  # https://developers.google.com/web/updates/2019/02/priority-hints
+  attrs: {
+    name: "importance"
+    value_casei: "high"
+    value_casei: "low"
+    value_casei: "auto"
+  }
+  attrs: {
+    name: "fetchpriority",
+    value_casei: "high"
+    value_casei: "low"
+    value_casei: "auto"
+  }
   attrs: { name: "object-fit" }
   attrs: { name: "object-position" }
   attrs: { name: "placeholder" }
@@ -3749,7 +4036,7 @@ tags: {  # <amp-img>
   # js directly, so we explicitly list that dependency here. This is redundant
   # for email since v0.js is still required, but we include to for consistency
   # and to future proof.
-  requires: "amphtml javascript runtime (v0.js)"
+  requires_condition: "amphtml javascript runtime (v0.js)"
   attrs: { name: "alt" }
   attrs: { name: "attribution" }
   attrs: { name: "placeholder" }
@@ -3776,7 +4063,7 @@ tags: {  # <amp-layout>
   tag_name: "AMP-LAYOUT"
   # amp-pixel does not require a matching extension script, it's built in to v0.
   # js directly, so we explicitly list that dependency here.
-  requires: "amphtml javascript runtime (v0.js)"
+  requires_condition: "amphtml javascript runtime (v0.js)"
   attr_lists: "extended-amp-global"
   spec_url: "https://amp.dev/documentation/components/amp-layout/"
   amp_layout: {
@@ -3796,7 +4083,7 @@ tags: {  # <amp-pixel>
   tag_name: "AMP-PIXEL"
   # amp-pixel does not require a matching extension script, it's built in to v0.
   # js directly, so we explicitly list that dependency here.
-  requires: "amphtml javascript runtime (v0.js)"
+  requires_condition: "amphtml javascript runtime (v0.js)"
   attrs: { name: "allow-ssr-img" }
   attrs: {
     name: "referrerpolicy"
@@ -3812,6 +4099,13 @@ tags: {  # <amp-pixel>
     }
     disallowed_value_regex: "__amp_source_origin"
   }
+  attrs: {
+    name: "attributionsrc"
+    value_url: {
+      protocol: "https"
+      allow_empty: true
+    }
+  }
   attr_lists: "extended-amp-global"
   spec_url: "https://amp.dev/documentation/components/amp-pixel/"
   amp_layout {
@@ -3916,6 +4210,19 @@ tags: {
   attrs: { name: "alt" }
   attrs: { name: "attribution" }
   attrs: { name: "height" }
+  # https://developers.google.com/web/updates/2019/02/priority-hints
+  attrs: {
+    name: "fetchpriority"
+    value_casei: "high"
+    value_casei: "low"
+    value_casei: "auto"
+  }
+  attrs: {
+    name: "importance"
+    value_casei: "high"
+    value_casei: "low"
+    value_casei: "auto"
+  }
   attrs: { name: "object-fit" }
   attrs: { name: "object-position" }
   attrs: { name: "referrerpolicy" }
@@ -4968,6 +5275,7 @@ attr_lists: {
   attrs: { name: "aria-labelledby" }
   attrs: { name: "aria-level" }
   attrs: { name: "aria-live" }
+  attrs: { name: "aria-modal" }
   attrs: { name: "aria-multiline" }
   attrs: { name: "aria-multiselectable" }
   attrs: { name: "aria-orientation" }
diff --git a/validator/validator.pb.go b/validator/validator.pb.go
index 991ff8513a37..eac45be01290 100644
--- a/validator/validator.pb.go
+++ b/validator/validator.pb.go
@@ -2247,7 +2247,7 @@ type CssSpec struct {
 	ValidateKeyframes *bool `protobuf:"varint,6,opt,name=validate_keyframes,json=validateKeyframes" json:"validate_keyframes,omitempty"`
 	// Any declaration listed here are allowed.
 	Declaration []string `protobuf:"bytes,7,rep,name=declaration" json:"declaration,omitempty"`
-	// If fase, declarations tagged with `!important` are considered errors.
+	// If false, declarations tagged with `!important` are considered errors.
 	// Most AMP stylesheets disallow `!important` to reserve this override
 	// for AMP's own styles.
 	AllowImportant *bool         `protobuf:"varint,8,opt,name=allow_important,json=allowImportant,def=0" json:"allow_important,omitempty"`
@@ -3028,14 +3028,14 @@ type TagSpec struct {
 	AlsoRequiresTagWarning []string `protobuf:"bytes,22,rep,name=also_requires_tag_warning,json=alsoRequiresTagWarning" json:"also_requires_tag_warning,omitempty"`
 	// Expresses a generic condition which is satisfied if this tag is found. Used
 	// in combination with the `requires` attribute on a different tag.
-	Satisfies []string `protobuf:"bytes,23,rep,name=satisfies" json:"satisfies,omitempty"`
+	SatisfiesCondition []string `protobuf:"bytes,23,rep,name=satisfies_condition" json:"satisfies_condition,omitempty"`
 	// Expresses a generic condition which must be satisfied if this tag is found.
 	// Used in combination with the `satisfies` attributes on a different tag.
-	Requires []string `protobuf:"bytes,24,rep,name=requires" json:"requires,omitempty"`
+	RequiresCondition []string `protobuf:"bytes,24,rep,name=requires_condition" json:"requires_condition,omitempty"`
 	// The excludes field is a generic condition, which must not be satisfied if
 	// this tag is found. Otherwise a TAG_EXCLUDED_BY_TAG error will be generated.
 	// Used in combination with the `satisfies` attributes on a different tag.
-	Excludes []string `protobuf:"bytes,32,rep,name=excludes" json:"excludes,omitempty"`
+	ExcludesCondition []string `protobuf:"bytes,32,rep,name=excludes_condition" json:"excludes_condition,omitempty"`
 	// If set, generates a DEPRECATED_TAG error with severity WARNING.
 	// The value of the deprecation field indicates what to use instead,
 	// e.g. the name of a tag.
@@ -3252,23 +3252,23 @@ func (x *TagSpec) GetAlsoRequiresTagWarning() []string {
 	return nil
 }
 
-func (x *TagSpec) GetSatisfies() []string {
+func (x *TagSpec) GetSatisfiesCondition() []string {
 	if x != nil {
-		return x.Satisfies
+		return x.SatisfiesCondition
 	}
 	return nil
 }
 
-func (x *TagSpec) GetRequires() []string {
+func (x *TagSpec) GetRequiresCondition() []string {
 	if x != nil {
-		return x.Requires
+		return x.RequiresCondition
 	}
 	return nil
 }
 
-func (x *TagSpec) GetExcludes() []string {
+func (x *TagSpec) GetExcludesCondition() []string {
 	if x != nil {
-		return x.Excludes
+		return x.ExcludesCondition
 	}
 	return nil
 }
diff --git a/validator/validator.proto b/validator/validator.proto
index db040b27758e..94784bbfa486 100644
--- a/validator/validator.proto
+++ b/validator/validator.proto
@@ -56,7 +56,7 @@ message UrlSpec {
   // Whether the empty string '' is allowed for this URL value.
   optional bool allow_empty = 3 [default = false];
 
-  // Deprecated fields, do not resuse.
+  // Deprecated fields, do not reuse.
   // reserved 4;
 }
 
@@ -288,7 +288,7 @@ message CssSpec {
   // Any declaration listed here are allowed.
   repeated string declaration = 7;
 
-  // If fase, declarations tagged with `!important` are considered errors.
+  // If false, declarations tagged with `!important` are considered errors.
   // Most AMP stylesheets disallow `!important` to reserve this override
   // for AMP's own styles.
   optional bool allow_important = 8 [default = false];
@@ -635,14 +635,14 @@ message TagSpec {
   repeated string also_requires_tag_warning = 22;
   // Expresses a generic condition which is satisfied if this tag is found. Used
   // in combination with the `requires` attribute on a different tag.
-  repeated string satisfies = 23;
+  repeated string satisfies_condition = 23;
   // Expresses a generic condition which must be satisfied if this tag is found.
   // Used in combination with the `satisfies` attributes on a different tag.
-  repeated string requires = 24;
+  repeated string requires_condition = 24;
   // The excludes field is a generic condition, which must not be satisfied if
   // this tag is found. Otherwise a TAG_EXCLUDED_BY_TAG error will be generated.
   // Used in combination with the `satisfies` attributes on a different tag.
-  repeated string excludes = 32;
+  repeated string excludes_condition = 32;
 
   // If set, generates a DEPRECATED_TAG error with severity WARNING.
   // The value of the deprecation field indicates what to use instead,
@@ -827,7 +827,9 @@ message ValidatorRules {
 // on this in new code.
 // TODO(#25188): Remove ErrorCategory completely.
 message ErrorCategory {
-  enum Code { UNKNOWN = 0; }
+  enum Code {
+    UNKNOWN = 0;
+  }
 }
 
 // We record validation errors in a structured form, so that they can be
diff --git a/validator/validator_gen_js.py b/validator/validator_gen_js.py
index afe3707da238..af52b68ac39a 100644
--- a/validator/validator_gen_js.py
+++ b/validator/validator_gen_js.py
@@ -365,9 +365,9 @@ def ValueToString(descriptor, field_desc, value):
     'amp.validator.CssDeclaration.value_regex_casei',
     'amp.validator.TagSpec.attrs',
     'amp.validator.TagSpec.mandatory_alternatives',
-    'amp.validator.TagSpec.requires',
-    'amp.validator.TagSpec.satisfies',
-    'amp.validator.TagSpec.excludes',
+    'amp.validator.TagSpec.requires_condition',
+    'amp.validator.TagSpec.satisfies_condition',
+    'amp.validator.TagSpec.excludes_condition',
 ]
 
 
@@ -781,7 +781,7 @@ def GenerateValidatorGeneratedJs(specfile, validator_pb2, generate_proto_only,
     for t in rules.tags:
       if t.extension_spec and t.extension_spec.name:
         # This is satisfied by any of the `v0.js` variants:
-        t.requires.extend(['amphtml javascript runtime (v0.js)'])
+        t.requires_condition.extend(['amphtml javascript runtime (v0.js)'])
         if validator_pb2.HtmlFormat.Code.Value('AMP') in t.html_format:
           tagspec = copy.deepcopy(t)
           # Reset html_format to AMP
@@ -822,15 +822,16 @@ def GenerateValidatorGeneratedJs(specfile, validator_pb2, generate_proto_only,
 
           # Module extension specifics
           # Add requires/satisfies pair for module/nomodule
-          module_tagspec.requires.extend([nomodule_tagspec.spec_name])
-          module_tagspec.satisfies.extend([module_tagspec.spec_name])
+          module_tagspec.requires_condition.extend([nomodule_tagspec.spec_name])
+          module_tagspec.satisfies_condition.extend([module_tagspec.spec_name])
           # Add attr specs
           module_tagspec.attrs.extend([crossorigin_attrspec, type_attrspec])
 
           # Nomodule extension specifics
           # Add requires/satisfies pair for module/nomodule
-          nomodule_tagspec.requires.extend([module_tagspec.spec_name])
-          nomodule_tagspec.satisfies.extend([nomodule_tagspec.spec_name])
+          nomodule_tagspec.requires_condition.extend([module_tagspec.spec_name])
+          nomodule_tagspec.satisfies_condition.extend(
+              [nomodule_tagspec.spec_name])
           # Add attr specs
           nomodule_tagspec.attrs.extend([nomodule_attrspec])
 
@@ -883,7 +884,7 @@ def GenerateValidatorGeneratedJs(specfile, validator_pb2, generate_proto_only,
 
     # We emit the attr lists as arrays of arrays of numbers (which are
     # the attr ids), and treat the globalAttrs and the ampLayoutAttrs
-    # seperately for fast access.
+    # separately for fast access.
     direct_attr_lists = []
     global_attrs = []
     amp_layout_attrs = []